From d05e75f6f9eb168beba5c812594352d1664adc89 Mon Sep 17 00:00:00 2001 From: Luke Street Date: Thu, 14 Jul 2022 01:48:03 -0400 Subject: [PATCH] Full deincbin --- asm/Collision/CCollidableAABox.s | 46 +- asm/Collision/CCollidableCollisionSurface.s | 2 +- asm/Collision/CCollidableSphere.s | 60 +- asm/Collision/CCollisionInfo.s | 12 +- asm/Collision/CCollisionPrimitive.s | 94 +- asm/Collision/CMRay.s | 4 +- asm/Collision/CMaterialFilter.s | 12 +- asm/Collision/CMaterialList.s | 8 +- asm/Collision/COBBox.s | 12 +- asm/Collision/CollisionUtil.s | 66 +- asm/Collision/InternalColliders.s | 2 +- asm/Dolphin/GBA/GBA.s | 68 +- asm/Dolphin/GBA/GBAKey.s | 8 +- asm/Dolphin/GBA/GBARead.s | 6 +- asm/Dolphin/GBA/GBAWrite.s | 8 +- asm/Dolphin/GBA/GBAXfer.s | 20 +- asm/Dolphin/ai.s | 58 +- asm/Dolphin/ar/ar.s | 98 +- asm/Dolphin/ar/arq.s | 20 +- asm/Dolphin/card/CARDBios.s | 70 +- asm/Dolphin/card/CARDBlock.s | 16 +- asm/Dolphin/card/CARDCheck.s | 18 +- asm/Dolphin/card/CARDCreate.s | 6 +- asm/Dolphin/card/CARDDelete.s | 8 +- asm/Dolphin/card/CARDDir.s | 12 +- asm/Dolphin/card/CARDFormat.s | 8 +- asm/Dolphin/card/CARDMount.s | 30 +- asm/Dolphin/card/CARDNet.s | 2 +- asm/Dolphin/card/CARDOpen.s | 26 +- asm/Dolphin/card/CARDRdwr.s | 12 +- asm/Dolphin/card/CARDRead.s | 8 +- asm/Dolphin/card/CARDRename.s | 2 +- asm/Dolphin/card/CARDStat.s | 6 +- asm/Dolphin/card/CARDUnlock.s | 103 +- asm/Dolphin/card/CARDWrite.s | 10 +- asm/Dolphin/db.s | 12 +- asm/Dolphin/dsp/dsp.s | 24 +- asm/Dolphin/dsp/dsp_debug.s | 2 +- asm/Dolphin/dsp/dsp_task.s | 40 +- asm/Dolphin/dtk.s | 56 +- asm/Dolphin/dvd/dvd.s | 307 +- asm/Dolphin/dvd/dvderror.s | 154 +- asm/Dolphin/dvd/dvdfatal.s | 35 +- asm/Dolphin/dvd/dvdfs.s | 60 +- asm/Dolphin/dvd/dvdidutils.s | 2 +- asm/Dolphin/dvd/dvdlow.s | 55 +- asm/Dolphin/dvd/dvdqueue.s | 12 +- asm/Dolphin/dvd/fstload.s | 34 +- asm/Dolphin/exi/EXIBios.s | 65 +- asm/Dolphin/exi/EXIUart.s | 4 +- asm/Dolphin/gx/GXAttr.s | 59 +- asm/Dolphin/gx/GXBump.s | 25 +- asm/Dolphin/gx/GXDisplayList.s | 2 +- asm/Dolphin/gx/GXFifo.s | 44 +- asm/Dolphin/gx/GXFrameBuf.s | 35 +- asm/Dolphin/gx/GXGeometry.s | 18 +- asm/Dolphin/gx/GXInit.s | 322 +- asm/Dolphin/gx/GXLight.s | 94 +- asm/Dolphin/gx/GXMisc.s | 48 +- asm/Dolphin/gx/GXPerf.s | 76 +- asm/Dolphin/gx/GXPixel.s | 72 +- asm/Dolphin/gx/GXStubs.s | 2 +- asm/Dolphin/gx/GXTev.s | 70 +- asm/Dolphin/gx/GXTexture.s | 285 +- asm/Dolphin/gx/GXTransform.s | 39 +- asm/Dolphin/mtx/mtx.s | 35 +- asm/Dolphin/mtx/mtx44.s | 20 +- asm/Dolphin/mtx/mtx44vec.s | 4 +- asm/Dolphin/mtx/psmtx.s | 2 +- asm/Dolphin/mtx/vec.s | 14 +- asm/Dolphin/os/OS.s | 34 +- asm/Dolphin/os/OSAlarm.s | 16 +- asm/Dolphin/os/OSArena.s | 17 +- asm/Dolphin/os/OSCache.s | 118 +- asm/Dolphin/os/OSContext.s | 34 +- asm/Dolphin/os/OSError.s | 26 +- asm/Dolphin/os/OSFatal.s | 61 +- asm/Dolphin/os/OSFont.s | 43 +- asm/Dolphin/os/OSInterrupt.s | 26 +- asm/Dolphin/os/OSLink.s | 18 +- asm/Dolphin/os/OSMemory.s | 44 +- asm/Dolphin/os/OSMutex.s | 2 +- asm/Dolphin/os/OSReboot.s | 14 +- asm/Dolphin/os/OSReset.s | 32 +- asm/Dolphin/os/OSResetSW.s | 6 +- asm/Dolphin/os/OSRtc.s | 36 +- asm/Dolphin/os/OSSync.s | 8 +- asm/Dolphin/os/OSThread.s | 47 +- asm/Dolphin/os/OSTime.s | 16 +- asm/Dolphin/pad/PadClamp.s | 15 +- asm/Dolphin/pad/pad.s | 64 +- asm/Dolphin/si/SIBios.s | 138 +- asm/Dolphin/si/SISamplingRate.s | 53 +- asm/Dolphin/thp/THPAudio.s | 6 +- asm/Dolphin/thp/THPDec.s | 62 +- asm/Dolphin/vi.s | 258 +- asm/GuiSys/CAuiEnergyBarT01.s | 28 +- asm/GuiSys/CAuiImagePane.s | 28 +- asm/GuiSys/CAuiMain.s | 2 +- asm/GuiSys/CAuiMeter.s | 30 +- asm/GuiSys/CGuiGroup.s | 154 +- asm/GuiSys/CGuiHeadWidget.s | 8 +- asm/GuiSys/CGuiLight.s | 10 +- asm/GuiSys/CGuiModel.s | 18 +- asm/GuiSys/CGuiObject.s | 50 +- asm/GuiSys/CGuiPane.s | 26 +- asm/GuiSys/CGuiSliderGroup.s | 34 +- asm/GuiSys/CGuiSys.s | 10 +- asm/GuiSys/CGuiTableGroup.s | 82 +- asm/GuiSys/CGuiTextPane.s | 28 +- asm/GuiSys/CGuiTextSupport.s | 136 +- asm/GuiSys/CGuiWidget.s | 62 +- asm/GuiSys/CGuiWidgetIdDB.s | 8 +- asm/GuiSys/CRepeatState.s | 2 +- asm/Kyoto/Alloc/CCircularBuffer.s | 16 +- asm/Kyoto/Alloc/CGameAllocator.s | 78 +- asm/Kyoto/Alloc/CMediumAllocPool.s | 42 +- asm/Kyoto/Alloc/CMemory.s | 48 +- asm/Kyoto/Alloc/CSmallAllocPool.s | 10 +- asm/Kyoto/Alloc/IAllocator.s | 2 +- asm/Kyoto/Animation/CAdditiveAnimPlayback.s | 14 +- asm/Kyoto/Animation/CAdvancementDeltas.s | 2 +- asm/Kyoto/Animation/CAllFormatsAnimSource.s | 20 +- asm/Kyoto/Animation/CAnimCharacterSet.s | 28 +- asm/Kyoto/Animation/CAnimMathUtils.s | 4 +- asm/Kyoto/Animation/CAnimPOIData.s | 50 +- asm/Kyoto/Animation/CAnimSource.s | 62 +- asm/Kyoto/Animation/CAnimSourceReader.s | 50 +- asm/Kyoto/Animation/CAnimSourceReaderBase.s | 96 +- .../Animation/CAnimTreeAnimReaderContainer.s | 82 +- asm/Kyoto/Animation/CAnimTreeBlend.s | 34 +- asm/Kyoto/Animation/CAnimTreeDoubleChild.s | 82 +- asm/Kyoto/Animation/CAnimTreeLoopIn.s | 92 +- asm/Kyoto/Animation/CAnimTreeNode.s | 8 +- asm/Kyoto/Animation/CAnimTreeSequence.s | 112 +- asm/Kyoto/Animation/CAnimTreeSingleChild.s | 62 +- asm/Kyoto/Animation/CAnimTreeTimeScale.s | 104 +- asm/Kyoto/Animation/CAnimTreeTransition.s | 54 +- asm/Kyoto/Animation/CAnimTreeTweenBase.s | 82 +- asm/Kyoto/Animation/CAnimationManager.s | 10 +- asm/Kyoto/Animation/CAnimationSet.s | 48 +- asm/Kyoto/Animation/CBoolPOINode.s | 2 +- asm/Kyoto/Animation/CCharAnimMemoryMetrics.s | 4 +- asm/Kyoto/Animation/CCharAnimTime.s | 34 +- asm/Kyoto/Animation/CCharLayoutInfo.s | 46 +- asm/Kyoto/Animation/CCharacterInfo.s | 84 +- asm/Kyoto/Animation/CCharacterSet.s | 20 +- asm/Kyoto/Animation/CFBStreamedAnimReader.s | 84 +- asm/Kyoto/Animation/CFBStreamedCompression.s | 20 +- asm/Kyoto/Animation/CHalfTransition.s | 2 +- asm/Kyoto/Animation/CHierarchyPoseBuilder.s | 18 +- asm/Kyoto/Animation/CInt32POINode.s | 4 +- asm/Kyoto/Animation/CMetaAnimBlend.s | 20 +- asm/Kyoto/Animation/CMetaAnimPhaseBlend.s | 22 +- asm/Kyoto/Animation/CMetaAnimPlay.s | 20 +- asm/Kyoto/Animation/CMetaAnimRandom.s | 20 +- asm/Kyoto/Animation/CMetaAnimSequence.s | 18 +- asm/Kyoto/Animation/CMetaTransMetaAnim.s | 10 +- asm/Kyoto/Animation/CMetaTransPhaseTrans.s | 16 +- asm/Kyoto/Animation/CMetaTransSnap.s | 6 +- asm/Kyoto/Animation/CMetaTransTrans.s | 8 +- asm/Kyoto/Animation/CPASAnimInfo.s | 8 +- asm/Kyoto/Animation/CPASAnimParm.s | 22 +- asm/Kyoto/Animation/CPASAnimState.s | 42 +- asm/Kyoto/Animation/CPASDatabase.s | 50 +- asm/Kyoto/Animation/CPASParmInfo.s | 2 +- asm/Kyoto/Animation/CPOINode.s | 8 +- asm/Kyoto/Animation/CParticlePOINode.s | 4 +- asm/Kyoto/Animation/CPoseAsTransforms.s | 18 +- asm/Kyoto/Animation/CSegIdList.s | 2 +- asm/Kyoto/Animation/CSegStatementSet.s | 6 +- asm/Kyoto/Animation/CSequenceHelper.s | 44 +- .../Animation/CSkinnedModelWithAvgNormals.s | 22 +- asm/Kyoto/Animation/CTimeScaleFunctions.s | 32 +- asm/Kyoto/Animation/CTreeUtils.s | 8 +- asm/Kyoto/Animation/CVertexMorphEffect.s | 4 +- asm/Kyoto/Animation/DolphinCSkinRules.s | 42 +- asm/Kyoto/Animation/DolphinCSkinnedModel.s | 54 +- asm/Kyoto/Animation/DolphinCVirtualBone.s | 24 +- asm/Kyoto/Animation/IAnimReader.s | 22 +- asm/Kyoto/Animation/IMetaAnim.s | 32 +- asm/Kyoto/Audio/CDSPStreamManager.s | 70 +- asm/Kyoto/Audio/CMidiManager.s | 42 +- asm/Kyoto/Audio/CSfxManager.s | 350 +- asm/Kyoto/Audio/CStaticAudioPlayer.s | 48 +- asm/Kyoto/Audio/CStreamAudioManager.s | 78 +- asm/Kyoto/Audio/DolphinCAudioGroupSet.s | 22 +- asm/Kyoto/Audio/DolphinCAudioSys.s | 158 +- asm/Kyoto/Audio/SDSPStream.s | 52 +- asm/Kyoto/Audio/g721.s | 26 +- asm/Kyoto/Basics/CBasics.s | 4 +- asm/Kyoto/Basics/CCallStackDolphin.s | 6 +- asm/Kyoto/Basics/COsContextDolphin.s | 10 +- asm/Kyoto/Basics/CSWDataDolphin.s | 2 +- asm/Kyoto/Basics/CStopwatch.s | 6 +- asm/Kyoto/Basics/RAssertDolphin.s | 4 +- asm/Kyoto/CARAMManager.s | 40 +- asm/Kyoto/CARAMToken.s | 36 +- asm/Kyoto/CDependencyGroup.s | 18 +- asm/Kyoto/CDvdRequest.s | 24 +- asm/Kyoto/CFactoryMgr.s | 50 +- asm/Kyoto/CFactoryStore.s | 2 +- asm/Kyoto/CFinalInput.s | 8 +- asm/Kyoto/CFrameDelayedKiller.s | 46 +- asm/Kyoto/CObjectReference.s | 44 +- asm/Kyoto/CPakFile.s | 94 +- asm/Kyoto/CRandom16.s | 18 +- asm/Kyoto/CResFactory.s | 74 +- asm/Kyoto/CResLoader.s | 74 +- asm/Kyoto/CSimplePool.s | 42 +- asm/Kyoto/CTimeProvider.s | 4 +- asm/Kyoto/CToken.s | 18 +- asm/Kyoto/DolphinCDvdFile.s | 52 +- asm/Kyoto/DolphinCMemoryCardSys.s | 132 +- asm/Kyoto/Graphics/CColor.s | 14 +- asm/Kyoto/Graphics/CCubeMaterial.s | 46 +- asm/Kyoto/Graphics/CCubeModel.s | 50 +- asm/Kyoto/Graphics/CCubeMoviePlayer.s | 110 +- asm/Kyoto/Graphics/CCubeSurface.s | 4 +- asm/Kyoto/Graphics/CGX.s | 90 +- asm/Kyoto/Graphics/CLight.s | 32 +- asm/Kyoto/Graphics/CTevCombiners.s | 18 +- asm/Kyoto/Graphics/DolphinCColor.s | 20 +- asm/Kyoto/Graphics/DolphinCGraphics.s | 182 +- asm/Kyoto/Graphics/DolphinCModel.s | 70 +- asm/Kyoto/Graphics/DolphinCPalette.s | 8 +- asm/Kyoto/Graphics/DolphinCTexture.s | 114 +- asm/Kyoto/IObj.s | 2 +- asm/Kyoto/Input/CDolphinController.s | 38 +- asm/Kyoto/Input/CRumbleGenerator.s | 12 +- asm/Kyoto/Input/CRumbleVoice.s | 30 +- asm/Kyoto/Input/DolphinIController.s | 4 +- asm/Kyoto/Input/RumbleAdsr.s | 10 +- asm/Kyoto/Math/CAABox.s | 50 +- asm/Kyoto/Math/CFrustumPlanes.s | 16 +- asm/Kyoto/Math/CMatrix3f.s | 24 +- asm/Kyoto/Math/CMatrix4f.s | 8 +- asm/Kyoto/Math/CPlane.s | 2 +- asm/Kyoto/Math/CQuaternion.s | 64 +- asm/Kyoto/Math/CTransform4f.s | 66 +- asm/Kyoto/Math/CUnitVector3f.s | 2 +- asm/Kyoto/Math/CVector2f.s | 36 +- asm/Kyoto/Math/CVector2i.s | 10 +- asm/Kyoto/Math/CVector3d.s | 20 +- asm/Kyoto/Math/CVector3f.s | 30 +- asm/Kyoto/Math/CloseEnough.s | 4 +- asm/Kyoto/Math/RMathUtils.s | 44 +- asm/Kyoto/PVS/CPVSVisOctree.s | 2 +- asm/Kyoto/PVS/CPVSVisSet.s | 20 +- asm/Kyoto/Particles/CColorElement.s | 124 +- asm/Kyoto/Particles/CEffectComponent.s | 2 +- asm/Kyoto/Particles/CElectricDescription.s | 34 +- asm/Kyoto/Particles/CElementGen.s | 1096 +- asm/Kyoto/Particles/CEmitterElement.s | 68 +- asm/Kyoto/Particles/CGenDescription.s | 10 +- asm/Kyoto/Particles/CParticleData.s | 4 +- asm/Kyoto/Particles/CParticleElectric.s | 264 +- .../Particles/CParticleElectricDataFactory.s | 16 +- asm/Kyoto/Particles/CParticleGlobals.s | 4 +- asm/Kyoto/Particles/CParticleSwoosh.s | 150 +- .../Particles/CParticleSwooshDataFactory.s | 14 +- asm/Kyoto/Particles/CRealElement.s | 440 +- .../Particles/CSpawnSystemKeyframeData.s | 44 +- asm/Kyoto/Particles/CSwooshDescription.s | 36 +- asm/Kyoto/Particles/CUVElement.s | 44 +- asm/Kyoto/Particles/CVectorElement.s | 262 +- asm/Kyoto/Particles/CWarp.s | 4 +- asm/Kyoto/Streams/CInputStream.s | 30 +- asm/Kyoto/Streams/CMemoryInStream.s | 6 +- asm/Kyoto/Streams/CMemoryStreamOut.s | 6 +- asm/Kyoto/Streams/COutputStream.s | 14 +- asm/Kyoto/Streams/CZipInputStream.s | 6 +- asm/Kyoto/Streams/CZipSupport.s | 2 +- asm/Kyoto/Text/CBlockInstruction.s | 24 +- asm/Kyoto/Text/CColorInstruction.s | 6 +- asm/Kyoto/Text/CColorOverrideInstruction.s | 6 +- asm/Kyoto/Text/CDrawStringOptions.s | 2 +- asm/Kyoto/Text/CFont.s | 8 +- asm/Kyoto/Text/CFontImageDef.s | 10 +- asm/Kyoto/Text/CFontInstruction.s | 10 +- asm/Kyoto/Text/CFontRenderState.s | 28 +- asm/Kyoto/Text/CImageInstruction.s | 10 +- asm/Kyoto/Text/CLineExtraSpaceInstruction.s | 8 +- asm/Kyoto/Text/CLineInstruction.s | 24 +- asm/Kyoto/Text/CLineSpacingInstruction.s | 6 +- asm/Kyoto/Text/CPopStateInstruction.s | 6 +- asm/Kyoto/Text/CPushStateInstruction.s | 8 +- asm/Kyoto/Text/CRasterFont.s | 70 +- .../Text/CRemoveColorOverrideInstruction.s | 8 +- asm/Kyoto/Text/CSavableState.s | 2 +- asm/Kyoto/Text/CStringTable.s | 14 +- asm/Kyoto/Text/CTextExecuteBuffer.s | 116 +- asm/Kyoto/Text/CTextInstruction.s | 10 +- asm/Kyoto/Text/CTextParser.s | 50 +- asm/Kyoto/Text/CTextRenderBuffer.s | 36 +- asm/Kyoto/Text/CWordBreakTables.s | 12 +- asm/Kyoto/Text/CWordInstruction.s | 6 +- asm/Kyoto/rstl/RstlExtras.s | 24 +- asm/Kyoto/rstl/rstl_map.s | 18 +- asm/Kyoto/rstl/rstl_strings.s | 58 +- asm/Kyoto/zlib/adler32.s | 2 +- asm/Kyoto/zlib/infblock.s | 46 +- asm/Kyoto/zlib/infcodes.s | 10 +- asm/Kyoto/zlib/inffast.s | 2 +- asm/Kyoto/zlib/inflate.s | 14 +- asm/Kyoto/zlib/inftrees.s | 20 +- asm/Kyoto/zlib/infutil.s | 10 +- asm/MetaRender/CCubeRenderer.s | 346 +- asm/MetroidPrime/BodyState/CABSAim.s | 10 +- asm/MetroidPrime/BodyState/CABSFlinch.s | 12 +- asm/MetroidPrime/BodyState/CABSIdle.s | 10 +- asm/MetroidPrime/BodyState/CABSReaction.s | 16 +- asm/MetroidPrime/BodyState/CBSAttack.s | 14 +- asm/MetroidPrime/BodyState/CBSCover.s | 18 +- asm/MetroidPrime/BodyState/CBSDie.s | 12 +- asm/MetroidPrime/BodyState/CBSFall.s | 12 +- asm/MetroidPrime/BodyState/CBSGenerate.s | 10 +- asm/MetroidPrime/BodyState/CBSGetup.s | 10 +- asm/MetroidPrime/BodyState/CBSGroundHit.s | 12 +- asm/MetroidPrime/BodyState/CBSHurled.s | 36 +- asm/MetroidPrime/BodyState/CBSJump.s | 38 +- asm/MetroidPrime/BodyState/CBSKnockBack.s | 12 +- asm/MetroidPrime/BodyState/CBSLieOnGround.s | 10 +- asm/MetroidPrime/BodyState/CBSLocomotion.s | 106 +- asm/MetroidPrime/BodyState/CBSLoopAttack.s | 12 +- asm/MetroidPrime/BodyState/CBSLoopReaction.s | 12 +- .../BodyState/CBSProjectileAttack.s | 12 +- asm/MetroidPrime/BodyState/CBSScripted.s | 14 +- asm/MetroidPrime/BodyState/CBSSlide.s | 14 +- asm/MetroidPrime/BodyState/CBSStep.s | 14 +- asm/MetroidPrime/BodyState/CBSTaunt.s | 10 +- asm/MetroidPrime/BodyState/CBSTurn.s | 26 +- asm/MetroidPrime/BodyState/CBSWallHang.s | 46 +- asm/MetroidPrime/BodyState/CBodyController.s | 88 +- asm/MetroidPrime/BodyState/CBodyStateCmdMgr.s | 32 +- asm/MetroidPrime/BodyState/CBodyStateInfo.s | 102 +- asm/MetroidPrime/CAABoxFilter.s | 4 +- asm/MetroidPrime/CActor.s | 164 +- asm/MetroidPrime/CActorLights.s | 58 +- asm/MetroidPrime/CActorParameters.s | 8 +- asm/MetroidPrime/CActorParticles.s | 310 +- asm/MetroidPrime/CAnimData.s | 384 +- asm/MetroidPrime/CAnimationDatabaseGame.s | 26 +- .../CArchMsgParmControllerStatus.s | 4 +- asm/MetroidPrime/CArchMsgParmInt32.s | 6 +- .../CArchMsgParmInt32Int32VoidPtr.s | 6 +- asm/MetroidPrime/CArchMsgParmNull.s | 6 +- asm/MetroidPrime/CArchMsgParmReal32.s | 4 +- asm/MetroidPrime/CArchitectureMessage.s | 2 +- asm/MetroidPrime/CArtifactDoll.s | 42 +- asm/MetroidPrime/CAudioStateWin.s | 4 +- asm/MetroidPrime/CAutoMapper.s | 314 +- asm/MetroidPrime/CAutoSave.s | 12 +- asm/MetroidPrime/CAxisAngle.s | 24 +- asm/MetroidPrime/CBallFilter.s | 2 +- asm/MetroidPrime/CBoneTracking.s | 20 +- asm/MetroidPrime/CCollisionActor.s | 76 +- asm/MetroidPrime/CCollisionActorManager.s | 38 +- asm/MetroidPrime/CConsoleOutputWindow.s | 8 +- asm/MetroidPrime/CControlMapper.s | 2 +- asm/MetroidPrime/CDamageInfo.s | 6 +- asm/MetroidPrime/CDamageVulnerability.s | 46 +- asm/MetroidPrime/CDecalManager.s | 46 +- asm/MetroidPrime/CEffect.s | 6 +- asm/MetroidPrime/CEntity.s | 30 +- asm/MetroidPrime/CEnvFxManager.s | 106 +- asm/MetroidPrime/CErrorOutputWindow.s | 20 +- asm/MetroidPrime/CEulerAngles.s | 8 +- asm/MetroidPrime/CExplosion.s | 64 +- asm/MetroidPrime/CFlameWarp.s | 26 +- asm/MetroidPrime/CFluidPlane.s | 24 +- asm/MetroidPrime/CFluidPlaneCPU.s | 32 +- asm/MetroidPrime/CFluidPlaneDoor.s | 16 +- asm/MetroidPrime/CFluidPlaneManager.s | 16 +- asm/MetroidPrime/CFluidPlaneRender.s | 50 +- asm/MetroidPrime/CFluidUVMotion.s | 4 +- asm/MetroidPrime/CFrontEndUI.s | 473 +- asm/MetroidPrime/CGBASupport.s | 28 +- asm/MetroidPrime/CGameArea.s | 330 +- asm/MetroidPrime/CGameCollision.s | 236 +- asm/MetroidPrime/CGameCubeDoll.s | 18 +- asm/MetroidPrime/CGameLight.s | 16 +- asm/MetroidPrime/CGameProjectile.s | 96 +- asm/MetroidPrime/CGroundMovement.s | 122 +- asm/MetroidPrime/CIOWin.s | 12 +- asm/MetroidPrime/CIOWinManager.s | 46 +- asm/MetroidPrime/CIkChain.s | 10 +- asm/MetroidPrime/CInGameGuiManager.s | 116 +- asm/MetroidPrime/CInGameTweakManager.s | 30 +- asm/MetroidPrime/CInputGenerator.s | 17 +- asm/MetroidPrime/CInstruction.s | 10 +- asm/MetroidPrime/CInventoryScreen.s | 68 +- asm/MetroidPrime/CLightParameters.s | 16 +- asm/MetroidPrime/CLogBookScreen.s | 118 +- asm/MetroidPrime/CMFGame.s | 52 +- asm/MetroidPrime/CMainFlow.s | 16 +- asm/MetroidPrime/CMapArea.s | 60 +- asm/MetroidPrime/CMapUniverse.s | 64 +- asm/MetroidPrime/CMapWorld.s | 128 +- asm/MetroidPrime/CMapWorldInfo.s | 50 +- asm/MetroidPrime/CMappableObject.s | 26 +- asm/MetroidPrime/CMemoryCardDriver.s | 140 +- asm/MetroidPrime/CMemoryDrawEnum.s | 2 +- asm/MetroidPrime/CMessageScreen.s | 10 +- asm/MetroidPrime/CModelData.s | 178 +- asm/MetroidPrime/CNESEmulator.s | 52 +- asm/MetroidPrime/CObjectList.s | 52 +- asm/MetroidPrime/CParticleDatabase.s | 200 +- asm/MetroidPrime/CParticleGenInfo.s | 18 +- asm/MetroidPrime/CParticleGenInfoGeneric.s | 72 +- asm/MetroidPrime/CPauseScreen.s | 202 +- asm/MetroidPrime/CPauseScreenBlur.s | 20 +- asm/MetroidPrime/CPauseScreenFrame.s | 182 +- asm/MetroidPrime/CPhysicsActor.s | 130 +- asm/MetroidPrime/CPlayMovie.s | 98 +- asm/MetroidPrime/CPreFrontEnd.s | 6 +- asm/MetroidPrime/CProjectedShadow.s | 20 +- asm/MetroidPrime/CRagDoll.s | 44 +- asm/MetroidPrime/CRainSplashGenerator.s | 44 +- asm/MetroidPrime/CRippleManager.s | 16 +- asm/MetroidPrime/CRumbleManager.s | 10 +- asm/MetroidPrime/CSWDataDolphin.s | 6 +- asm/MetroidPrime/CSamusDoll.s | 138 +- asm/MetroidPrime/CSaveGameScreen.s | 72 +- asm/MetroidPrime/CScriptMailbox.s | 24 +- asm/MetroidPrime/CSimpleShadow.s | 20 +- asm/MetroidPrime/CSlideShow.s | 170 +- asm/MetroidPrime/CSortedLists.s | 48 +- asm/MetroidPrime/CSplashScreen.s | 40 +- asm/MetroidPrime/CStateManager.s | 568 +- asm/MetroidPrime/CSteeringBehaviors.s | 34 +- asm/MetroidPrime/CTargetReticles.s | 202 +- asm/MetroidPrime/CTransitionDatabaseGame.s | 48 +- asm/MetroidPrime/CVisorFlare.s | 22 +- asm/MetroidPrime/CWeaponMgr.s | 14 +- asm/MetroidPrime/CWorld.s | 206 +- asm/MetroidPrime/CWorldShadow.s | 46 +- asm/MetroidPrime/CWorldTransManager.s | 90 +- asm/MetroidPrime/Cameras/CBallCamera.s | 162 +- .../Cameras/CBallCameraFailsafeState.s | 12 +- asm/MetroidPrime/Cameras/CCameraFilter.s | 142 +- asm/MetroidPrime/Cameras/CCameraHint.s | 4 +- asm/MetroidPrime/Cameras/CCameraManager.s | 175 +- asm/MetroidPrime/Cameras/CCameraShakeData.s | 52 +- asm/MetroidPrime/Cameras/CCinematicCamera.s | 52 +- asm/MetroidPrime/Cameras/CFirstPersonCamera.s | 30 +- asm/MetroidPrime/Cameras/CGameCamera.s | 74 +- .../Cameras/CInterpolationCamera.s | 30 +- asm/MetroidPrime/Cameras/CPathCamera.s | 24 +- asm/MetroidPrime/Clamp_int.s | 6 +- asm/MetroidPrime/Decode.s | 28 +- asm/MetroidPrime/Enemies/CActorContraption.s | 20 +- asm/MetroidPrime/Enemies/CAi.s | 322 +- asm/MetroidPrime/Enemies/CAmbientAI.s | 28 +- asm/MetroidPrime/Enemies/CAtomicAlpha.s | 40 +- asm/MetroidPrime/Enemies/CAtomicBeta.s | 50 +- asm/MetroidPrime/Enemies/CBabygoth.s | 330 +- asm/MetroidPrime/Enemies/CBeetle.s | 164 +- asm/MetroidPrime/Enemies/CBloodFlower.s | 92 +- asm/MetroidPrime/Enemies/CBouncyGrenade.s | 94 +- asm/MetroidPrime/Enemies/CBurrower.s | 108 +- asm/MetroidPrime/Enemies/CBurstFire.s | 12 +- asm/MetroidPrime/Enemies/CChozoGhost.s | 124 +- asm/MetroidPrime/Enemies/CDrone.s | 288 +- asm/MetroidPrime/Enemies/CElitePirate.s | 312 +- asm/MetroidPrime/Enemies/CEyeBall.s | 56 +- asm/MetroidPrime/Enemies/CFireFlea.s | 52 +- asm/MetroidPrime/Enemies/CFlaahgra.s | 258 +- asm/MetroidPrime/Enemies/CFlaahgraPlants.s | 38 +- asm/MetroidPrime/Enemies/CFlaahgraTentacle.s | 48 +- asm/MetroidPrime/Enemies/CFlickerBat.s | 54 +- asm/MetroidPrime/Enemies/CFlyingPirate.s | 418 +- asm/MetroidPrime/Enemies/CGrenadeLauncher.s | 62 +- asm/MetroidPrime/Enemies/CIceSheegoth.s | 422 +- asm/MetroidPrime/Enemies/CJellyZap.s | 54 +- .../Enemies/CKnockBackController.s | 88 +- asm/MetroidPrime/Enemies/CMagdolite.s | 102 +- asm/MetroidPrime/Enemies/CMetaree.s | 44 +- asm/MetroidPrime/Enemies/CMetroid.s | 274 +- asm/MetroidPrime/Enemies/CMetroidBeta.s | 312 +- .../Enemies/CMetroidPrimeEssence.s | 166 +- asm/MetroidPrime/Enemies/CMetroidPrimeExo.s | 466 +- .../Enemies/CMetroidPrimeProjectile.s | 12 +- asm/MetroidPrime/Enemies/CMetroidPrimeRelay.s | 44 +- asm/MetroidPrime/Enemies/CNewIntroBoss.s | 112 +- asm/MetroidPrime/Enemies/COmegaPirate.s | 226 +- asm/MetroidPrime/Enemies/CParasite.s | 158 +- asm/MetroidPrime/Enemies/CPatterned.s | 312 +- asm/MetroidPrime/Enemies/CPatternedInfo.s | 2 +- .../Enemies/CPhazonHealingNodule.s | 64 +- asm/MetroidPrime/Enemies/CPhazonPool.s | 76 +- asm/MetroidPrime/Enemies/CPuddleSpore.s | 108 +- asm/MetroidPrime/Enemies/CPuddleToadGamma.s | 68 +- asm/MetroidPrime/Enemies/CPuffer.s | 18 +- asm/MetroidPrime/Enemies/CRidley.s | 252 +- asm/MetroidPrime/Enemies/CRipper.s | 30 +- .../Enemies/CRipperControlledPlatform.s | 4 +- asm/MetroidPrime/Enemies/CSeedling.s | 36 +- asm/MetroidPrime/Enemies/CSnakeWeedSwarm.s | 126 +- asm/MetroidPrime/Enemies/CSpacePirate.s | 394 +- asm/MetroidPrime/Enemies/CSpankWeed.s | 62 +- asm/MetroidPrime/Enemies/CStateMachine.s | 34 +- asm/MetroidPrime/Enemies/CTeamAiMgr.s | 148 +- asm/MetroidPrime/Enemies/CThardus.s | 308 +- .../Enemies/CThardusRockProjectile.s | 100 +- asm/MetroidPrime/Enemies/CTryclops.s | 108 +- asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s | 174 +- asm/MetroidPrime/Enemies/CWallWalker.s | 22 +- asm/MetroidPrime/Enemies/CWarWasp.s | 176 +- asm/MetroidPrime/Enemies/PatternedCastTo.s | 50 +- asm/MetroidPrime/Enemies/SPositionHistory.s | 10 +- asm/MetroidPrime/Factories/CAssetFactory.s | 46 +- .../Factories/CCharacterFactory.s | 168 +- .../Factories/CSaveWorldFactory.s | 22 +- .../Factories/CScannableObjectInfo.s | 14 +- .../Factories/CStateMachineFactory.s | 16 +- asm/MetroidPrime/GameObjectLists.s | 32 +- asm/MetroidPrime/HUD/CHudBallInterface.s | 10 +- asm/MetroidPrime/HUD/CHudDecoInterface.s | 308 +- asm/MetroidPrime/HUD/CSamusHud.s | 276 +- asm/MetroidPrime/PathFinding/CPathFindArea.s | 74 +- .../PathFinding/CPathFindRegion.s | 28 +- .../PathFinding/CPathFindSearch.s | 14 +- .../Player/CFaceplateDecoration.s | 8 +- asm/MetroidPrime/Player/CFidget.s | 6 +- asm/MetroidPrime/Player/CGameHintInfo.s | 100 +- asm/MetroidPrime/Player/CGameOptions.s | 56 +- asm/MetroidPrime/Player/CGameState.s | 152 +- asm/MetroidPrime/Player/CGrappleArm.s | 166 +- asm/MetroidPrime/Player/CMorphBall.s | 584 +- asm/MetroidPrime/Player/CMorphBallShadow.s | 50 +- asm/MetroidPrime/Player/CPlayer.s | 368 +- asm/MetroidPrime/Player/CPlayerCameraBob.s | 38 +- asm/MetroidPrime/Player/CPlayerDynamics.s | 150 +- asm/MetroidPrime/Player/CPlayerEnergyDrain.s | 28 +- asm/MetroidPrime/Player/CPlayerGun.s | 380 +- asm/MetroidPrime/Player/CPlayerInputFilter.s | 24 +- asm/MetroidPrime/Player/CPlayerOrbit.s | 148 +- asm/MetroidPrime/Player/CPlayerState.s | 124 +- asm/MetroidPrime/Player/CPlayerVisor.s | 120 +- .../Player/CSamusFaceReflection.s | 12 +- asm/MetroidPrime/Player/CSaveWorld.s | 126 +- asm/MetroidPrime/Player/CScanDisplay.s | 68 +- asm/MetroidPrime/Player/CStaticInterference.s | 14 +- asm/MetroidPrime/Player/CWorldLayerState.s | 22 +- asm/MetroidPrime/ScriptLoader.s | 328 +- asm/MetroidPrime/ScriptObjects/CEnergyBall.s | 46 +- asm/MetroidPrime/ScriptObjects/CFire.s | 44 +- asm/MetroidPrime/ScriptObjects/CFishCloud.s | 162 +- .../ScriptObjects/CHUDBillboardEffect.s | 54 +- asm/MetroidPrime/ScriptObjects/CRepulsor.s | 8 +- asm/MetroidPrime/ScriptObjects/CScriptActor.s | 30 +- .../ScriptObjects/CScriptActorKeyframe.s | 16 +- .../ScriptObjects/CScriptActorRotate.s | 24 +- .../ScriptObjects/CScriptAiJumpPoint.s | 24 +- .../ScriptObjects/CScriptAreaAttributes.s | 8 +- .../ScriptObjects/CScriptBallTrigger.s | 18 +- asm/MetroidPrime/ScriptObjects/CScriptBeam.s | 18 +- .../ScriptObjects/CScriptCameraBlurKeyframe.s | 8 +- .../CScriptCameraFilterKeyframe.s | 8 +- .../ScriptObjects/CScriptCameraHint.s | 40 +- .../ScriptObjects/CScriptCameraHintTrigger.s | 14 +- .../ScriptObjects/CScriptCameraPitchVolume.s | 20 +- .../ScriptObjects/CScriptCameraShaker.s | 8 +- .../ScriptObjects/CScriptCameraWaypoint.s | 16 +- .../ScriptObjects/CScriptColorModulate.s | 24 +- .../ScriptObjects/CScriptControllerAction.s | 12 +- .../ScriptObjects/CScriptCounter.s | 10 +- .../ScriptObjects/CScriptCoverPoint.s | 44 +- .../ScriptObjects/CScriptDamageableTrigger.s | 54 +- .../ScriptObjects/CScriptDebris.s | 110 +- .../CScriptDebugCameraWaypoint.s | 6 +- .../ScriptObjects/CScriptDistanceFog.s | 8 +- asm/MetroidPrime/ScriptObjects/CScriptDock.s | 38 +- .../ScriptObjects/CScriptDockAreaChange.s | 8 +- asm/MetroidPrime/ScriptObjects/CScriptDoor.s | 34 +- .../ScriptObjects/CScriptEMPulse.s | 36 +- .../ScriptObjects/CScriptEffect.s | 152 +- .../ScriptObjects/CScriptGenerator.s | 16 +- .../ScriptObjects/CScriptGrapplePoint.s | 22 +- .../ScriptObjects/CScriptGunTurret.s | 322 +- .../ScriptObjects/CScriptHUDMemo.s | 12 +- .../ScriptObjects/CScriptMazeNode.s | 38 +- .../ScriptObjects/CScriptMemoryRelay.s | 8 +- asm/MetroidPrime/ScriptObjects/CScriptMidi.s | 18 +- .../ScriptObjects/CScriptPickup.s | 28 +- .../ScriptObjects/CScriptPickupGenerator.s | 20 +- .../ScriptObjects/CScriptPlatform.s | 116 +- .../ScriptObjects/CScriptPlayerActor.s | 52 +- .../ScriptObjects/CScriptPlayerHint.s | 28 +- .../ScriptObjects/CScriptPlayerStateChange.s | 8 +- .../ScriptObjects/CScriptPointOfInterest.s | 18 +- .../ScriptObjects/CScriptProjectedShadow.s | 16 +- .../ScriptObjects/CScriptRandomRelay.s | 18 +- asm/MetroidPrime/ScriptObjects/CScriptRelay.s | 12 +- .../ScriptObjects/CScriptRipple.s | 12 +- .../ScriptObjects/CScriptRoomAcoustics.s | 16 +- asm/MetroidPrime/ScriptObjects/CScriptSound.s | 24 +- .../ScriptObjects/CScriptSpawnPoint.s | 16 +- .../ScriptObjects/CScriptSpecialFunction.s | 98 +- .../CScriptSpiderBallAttractionSurface.s | 14 +- .../ScriptObjects/CScriptSpiderBallWaypoint.s | 32 +- .../ScriptObjects/CScriptSpindleCamera.s | 30 +- asm/MetroidPrime/ScriptObjects/CScriptSteam.s | 10 +- .../ScriptObjects/CScriptStreamedAudio.s | 42 +- .../ScriptObjects/CScriptSwitch.s | 8 +- .../ScriptObjects/CScriptTargetingPoint.s | 18 +- asm/MetroidPrime/ScriptObjects/CScriptTimer.s | 18 +- .../ScriptObjects/CScriptTrigger.s | 66 +- .../ScriptObjects/CScriptVisorFlare.s | 20 +- .../ScriptObjects/CScriptVisorGoo.s | 26 +- asm/MetroidPrime/ScriptObjects/CScriptWater.s | 106 +- .../ScriptObjects/CScriptWaypoint.s | 18 +- .../ScriptObjects/CScriptWorldTeleporter.s | 14 +- asm/MetroidPrime/TCastTo.s | 6316 ++++----- asm/MetroidPrime/TGameTypes.s | 2 +- asm/MetroidPrime/Tweaks/CTweakAutoMapper.s | 6 +- asm/MetroidPrime/Tweaks/CTweakBall.s | 6 +- asm/MetroidPrime/Tweaks/CTweakGame.s | 8 +- asm/MetroidPrime/Tweaks/CTweakGui.s | 18 +- asm/MetroidPrime/Tweaks/CTweakGuiColors.s | 6 +- asm/MetroidPrime/Tweaks/CTweakGunRes.s | 8 +- asm/MetroidPrime/Tweaks/CTweakParticle.s | 8 +- asm/MetroidPrime/Tweaks/CTweakPlayer.s | 8 +- asm/MetroidPrime/Tweaks/CTweakPlayerControl.s | 12 +- asm/MetroidPrime/Tweaks/CTweakPlayerGun.s | 26 +- asm/MetroidPrime/Tweaks/CTweakPlayerRes.s | 40 +- asm/MetroidPrime/Tweaks/CTweakSlideShow.s | 4 +- asm/MetroidPrime/Tweaks/CTweakTargeting.s | 22 +- asm/MetroidPrime/Tweaks/CTweaks.s | 172 +- asm/MetroidPrime/Weapons/CAuxWeapon.s | 60 +- asm/MetroidPrime/Weapons/CBeamProjectile.s | 18 +- asm/MetroidPrime/Weapons/CBomb.s | 56 +- .../Weapons/CElectricBeamProjectile.s | 58 +- asm/MetroidPrime/Weapons/CEnergyProjectile.s | 70 +- asm/MetroidPrime/Weapons/CFlameThrower.s | 84 +- asm/MetroidPrime/Weapons/CIceBeam.s | 74 +- asm/MetroidPrime/Weapons/CIceImpact.s | 94 +- asm/MetroidPrime/Weapons/CIceProjectile.s | 140 +- asm/MetroidPrime/Weapons/CNewFlameThrower.s | 232 +- asm/MetroidPrime/Weapons/CPhazonBeam.s | 66 +- asm/MetroidPrime/Weapons/CPlasmaBeam.s | 64 +- asm/MetroidPrime/Weapons/CPlasmaProjectile.s | 144 +- asm/MetroidPrime/Weapons/CPlayerGun.s | 288 +- asm/MetroidPrime/Weapons/CPowerBeam.s | 64 +- asm/MetroidPrime/Weapons/CPowerBomb.s | 32 +- asm/MetroidPrime/Weapons/CProjectileInfo.s | 14 +- asm/MetroidPrime/Weapons/CShockWave.s | 50 +- .../Weapons/CTargetableProjectile.s | 20 +- asm/MetroidPrime/Weapons/CWaveBeam.s | 70 +- asm/MetroidPrime/Weapons/CWaveBuster.s | 126 +- asm/MetroidPrime/Weapons/CWeapon.s | 18 +- .../Weapons/GunController/CGSComboFire.s | 4 +- .../Weapons/GunController/CGSFidget.s | 10 +- .../Weapons/GunController/CGSFreeLook.s | 6 +- .../Weapons/GunController/CGunController.s | 22 +- .../Weapons/GunController/CGunMotion.s | 18 +- asm/MetroidPrime/Weapons/WeaponTypes.s | 28 +- asm/MetroidPrime/main.s | 12 +- asm/MetroidPrime/text_80008894_80009144.s | 18 +- asm/Runtime/CPlusLibPPC.s | 6 +- asm/Runtime/FILE_POS.s | 16 +- asm/Runtime/Gecko_ExceptionPPC.s | 12 +- asm/Runtime/NMWException.s | 14 +- asm/Runtime/__init_cpp_exceptions.s | 6 +- asm/Runtime/__mem.s | 10 +- asm/Runtime/__va_arg.s | 2 +- asm/Runtime/abort_exit.s | 14 +- asm/Runtime/alloc.s | 37 +- asm/Runtime/ansi_files.s | 4 +- asm/Runtime/ansi_fp.s | 93 +- asm/Runtime/buffer_io.s | 6 +- asm/Runtime/ctype.s | 4 +- asm/Runtime/direct_io.s | 4 +- asm/Runtime/e_acos.s | 2 +- asm/Runtime/e_asin.s | 4 +- asm/Runtime/e_atan2.s | 2 +- asm/Runtime/e_exp.s | 21 +- asm/Runtime/e_fmod.s | 13 +- asm/Runtime/e_log.s | 6 +- asm/Runtime/e_pow.s | 19 +- asm/Runtime/e_rem_pio2.s | 108 +- asm/Runtime/file_io.s | 6 +- asm/Runtime/global_destructor_chain.s | 8 +- asm/Runtime/k_cos.s | 4 +- asm/Runtime/k_rem_pio2.s | 32 +- asm/Runtime/k_sin.s | 4 +- asm/Runtime/k_tan.s | 33 +- asm/Runtime/mbstring.s | 4 +- asm/Runtime/mem.s | 16 +- asm/Runtime/mem_funcs.s | 16 +- asm/Runtime/misc_io.s | 2 +- asm/Runtime/printf.s | 630 +- asm/Runtime/ptmf.s | 6 +- asm/Runtime/qsort.s | 6 +- asm/Runtime/rand.s | 4 +- asm/Runtime/runtime.s | 45 +- asm/Runtime/s_acos.s | 4 +- asm/Runtime/s_asin.s | 4 +- asm/Runtime/s_atan.s | 47 +- asm/Runtime/s_atan2.s | 4 +- asm/Runtime/s_copysign.s | 4 +- asm/Runtime/s_cos.s | 4 +- asm/Runtime/s_cosf.s | 4 +- asm/Runtime/s_exp.s | 4 +- asm/Runtime/s_floor.s | 4 +- asm/Runtime/s_fmod.s | 4 +- asm/Runtime/s_frexp.s | 4 +- asm/Runtime/s_ldexp.s | 4 +- asm/Runtime/s_log.s | 4 +- asm/Runtime/s_modf.s | 4 +- asm/Runtime/s_nextafter.s | 4 +- asm/Runtime/s_pow.s | 4 +- asm/Runtime/s_sin.s | 4 +- asm/Runtime/s_tan.s | 11 +- asm/Runtime/sdata.s | 48 +- asm/Runtime/sdata2.s | 908 +- asm/Runtime/sscanf.s | 10 +- asm/Runtime/string.s | 44 +- asm/Runtime/strtold.s | 93 +- asm/Runtime/uart_console_io.s | 4 +- asm/Runtime/widechar_io.s | 10 +- asm/Weapons/CCollisionResponseData.s | 68 +- asm/Weapons/CDecal.s | 66 +- asm/Weapons/CDecalDataFactory.s | 92 +- asm/Weapons/CDecalDescription.s | 2 +- asm/Weapons/CProjectileWeapon.s | 252 +- asm/Weapons/CProjectileWeaponDataFactory.s | 24 +- asm/Weapons/CWeaponDescription.s | 32 +- asm/Weapons/IWeaponRenderer.s | 10 +- asm/WorldFormat/CAreaBspTree.s | 2 +- asm/WorldFormat/CAreaOctTree.s | 20 +- asm/WorldFormat/CAreaOctTree_Tests.s | 20 +- asm/WorldFormat/CAreaRenderOctTree.s | 16 +- asm/WorldFormat/CCollidableOBBTree.s | 56 +- asm/WorldFormat/CCollidableOBBTreeGroup.s | 94 +- asm/WorldFormat/CCollisionSurface.s | 4 +- asm/WorldFormat/CMetroidAreaCollider.s | 104 +- asm/WorldFormat/CMetroidModelInstance.s | 4 +- asm/WorldFormat/COBBTree.s | 64 +- asm/WorldFormat/CPVSVisOctree.s | 10 +- asm/WorldFormat/CWorldLight.s | 4 +- asm/musyx/creverb_fx.s | 8 +- asm/musyx/delay_fx.s | 8 +- asm/musyx/hw_aramdma.s | 34 +- asm/musyx/hw_dolphin.s | 44 +- asm/musyx/hw_memory.s | 10 +- asm/musyx/reverb_fx.s | 8 +- asm/musyx/s_data.s | 28 +- asm/musyx/seq_api.s | 14 +- asm/musyx/snd_midictrl.s | 2 +- asm/musyx/snd_service.s | 26 +- asm/musyx/snd_synthapi.s | 28 +- asm/musyx/synth_vsamples.s | 12 +- asm/musyx/synthdata.s | 2 +- asm/musyx/synthvoice.s | 66 +- asm/os/__ppc_eabi_init.s | 6 +- asm/os/__ppc_eabi_init_text.s | 8 +- asm/rodata.s | 10606 +++++++++++++++- 759 files changed, 36342 insertions(+), 23974 deletions(-) diff --git a/asm/Collision/CCollidableAABox.s b/asm/Collision/CCollidableAABox.s index 47fe8045..3eacfe89 100644 --- a/asm/Collision/CCollidableAABox.s +++ b/asm/Collision/CCollidableAABox.s @@ -29,19 +29,19 @@ sTableIndex__16CCollidableAABox: .global lbl_80479498 lbl_80479498: .skip 0x48 - + .section .text, "ax" .global GetTableIndex__16CCollidableAABoxCFv GetTableIndex__16CCollidableAABoxCFv: /* 802CD4C8 002CA428 80 6D 9B 28 */ lwz r3, sTableIndex__16CCollidableAABox@sda21(r13) -/* 802CD4CC 002CA42C 4E 80 00 20 */ blr +/* 802CD4CC 002CA42C 4E 80 00 20 */ blr .global GetPrimType__16CCollidableAABoxCFv GetPrimType__16CCollidableAABoxCFv: /* 802CD4D0 002CA430 3C 60 41 41 */ lis r3, 0x41414258@ha /* 802CD4D4 002CA434 38 63 42 58 */ addi r3, r3, 0x41414258@l -/* 802CD4D8 002CA438 4E 80 00 20 */ blr +/* 802CD4D8 002CA438 4E 80 00 20 */ blr .global Transform__16CCollidableAABoxCFRC12CTransform4f Transform__16CCollidableAABoxCFRC12CTransform4f: @@ -75,7 +75,7 @@ Transform__16CCollidableAABoxCFRC12CTransform4f: /* 802CD548 002CA4A8 80 01 00 24 */ lwz r0, 0x24(r1) /* 802CD54C 002CA4AC 7C 08 03 A6 */ mtlr r0 /* 802CD550 002CA4B0 38 21 00 20 */ addi r1, r1, 0x20 -/* 802CD554 002CA4B4 4E 80 00 20 */ blr +/* 802CD554 002CA4B4 4E 80 00 20 */ blr .global CalculateAABox__16CCollidableAABoxCFRC12CTransform4f CalculateAABox__16CCollidableAABoxCFRC12CTransform4f: @@ -89,7 +89,7 @@ CalculateAABox__16CCollidableAABoxCFRC12CTransform4f: /* 802CD574 002CA4D4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802CD578 002CA4D8 7C 08 03 A6 */ mtlr r0 /* 802CD57C 002CA4DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CD580 002CA4E0 4E 80 00 20 */ blr +/* 802CD580 002CA4E0 4E 80 00 20 */ blr .global CalculateLocalAABox__16CCollidableAABoxCFv CalculateLocalAABox__16CCollidableAABoxCFv: @@ -105,7 +105,7 @@ CalculateLocalAABox__16CCollidableAABoxCFv: /* 802CD5A8 002CA508 D0 03 00 10 */ stfs f0, 0x10(r3) /* 802CD5AC 002CA50C C0 04 00 24 */ lfs f0, 0x24(r4) /* 802CD5B0 002CA510 D0 03 00 14 */ stfs f0, 0x14(r3) -/* 802CD5B4 002CA514 4E 80 00 20 */ blr +/* 802CD5B4 002CA514 4E 80 00 20 */ blr .global CastRayInternal__16CCollidableAABoxCFRC25CInternalRayCastStructure CastRayInternal__16CCollidableAABoxCFRC25CInternalRayCastStructure: @@ -132,7 +132,7 @@ CastRayInternal__16CCollidableAABoxCFRC25CInternalRayCastStructure: /* 802CD608 002CA568 83 C5 00 6C */ lwz r30, 0x6c(r5) /* 802CD60C 002CA56C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802CD610 002CA570 7D 89 03 A6 */ mtctr r12 -/* 802CD614 002CA574 4E 80 04 21 */ bctrl +/* 802CD614 002CA574 4E 80 04 21 */ bctrl /* 802CD618 002CA578 7C 64 1B 78 */ mr r4, r3 /* 802CD61C 002CA57C 7F C3 F3 78 */ mr r3, r30 /* 802CD620 002CA580 48 00 7D 2D */ bl Passes__15CMaterialFilterCFRC13CMaterialList @@ -274,7 +274,7 @@ lbl_802CD820: /* 802CD824 002CA784 81 9C 00 00 */ lwz r12, 0(r28) /* 802CD828 002CA788 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802CD82C 002CA78C 7D 89 03 A6 */ mtctr r12 -/* 802CD830 002CA790 4E 80 04 21 */ bctrl +/* 802CD830 002CA790 4E 80 04 21 */ bctrl /* 802CD834 002CA794 C0 C1 00 14 */ lfs f6, 0x14(r1) /* 802CD838 002CA798 38 00 00 01 */ li r0, 1 /* 802CD83C 002CA79C C0 41 00 58 */ lfs f2, 0x58(r1) @@ -343,7 +343,7 @@ lbl_802CD904: /* 802CD934 002CA894 83 81 01 30 */ lwz r28, 0x130(r1) /* 802CD938 002CA898 7C 08 03 A6 */ mtlr r0 /* 802CD93C 002CA89C 38 21 01 80 */ addi r1, r1, 0x180 -/* 802CD940 002CA8A0 4E 80 00 20 */ blr +/* 802CD940 002CA8A0 4E 80 00 20 */ blr .global CollideMovingSphere__16CCollidableAABoxFRC27CInternalCollisionStructureRC9CVector3fRdR14CCollisionInfo CollideMovingSphere__16CCollidableAABoxFRC27CInternalCollisionStructureRC9CVector3fRdR14CCollisionInfo: @@ -363,7 +363,7 @@ CollideMovingSphere__16CCollidableAABoxFRC27CInternalCollisionStructureRC9CVecto /* 802CD978 002CA8D8 7F A4 EB 78 */ mr r4, r29 /* 802CD97C 002CA8DC 81 8C 00 14 */ lwz r12, 0x14(r12) /* 802CD980 002CA8E0 7D 89 03 A6 */ mtctr r12 -/* 802CD984 002CA8E4 4E 80 04 21 */ bctrl +/* 802CD984 002CA8E4 4E 80 04 21 */ bctrl /* 802CD988 002CA8E8 C0 A1 00 60 */ lfs f5, 0x60(r1) /* 802CD98C 002CA8EC 7F C4 F3 78 */ mr r4, r30 /* 802CD990 002CA8F0 C0 81 00 64 */ lfs f4, 0x64(r1) @@ -453,13 +453,13 @@ CollideMovingSphere__16CCollidableAABoxFRC27CInternalCollisionStructureRC9CVecto /* 802CDAE0 002CAA40 81 9E 00 00 */ lwz r12, 0(r30) /* 802CDAE4 002CAA44 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802CDAE8 002CAA48 7D 89 03 A6 */ mtctr r12 -/* 802CDAEC 002CAA4C 4E 80 04 21 */ bctrl +/* 802CDAEC 002CAA4C 4E 80 04 21 */ bctrl /* 802CDAF0 002CAA50 7C 7E 1B 78 */ mr r30, r3 /* 802CDAF4 002CAA54 7F A3 EB 78 */ mr r3, r29 /* 802CDAF8 002CAA58 81 9D 00 00 */ lwz r12, 0(r29) /* 802CDAFC 002CAA5C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802CDB00 002CAA60 7D 89 03 A6 */ mtctr r12 -/* 802CDB04 002CAA64 4E 80 04 21 */ bctrl +/* 802CDB04 002CAA64 4E 80 04 21 */ bctrl /* 802CDB08 002CAA68 7C 65 1B 78 */ mr r5, r3 /* 802CDB0C 002CAA6C 7F C6 F3 78 */ mr r6, r30 /* 802CDB10 002CAA70 38 61 00 90 */ addi r3, r1, 0x90 @@ -519,7 +519,7 @@ lbl_802CDBDC: /* 802CDBE0 002CAB40 80 01 01 14 */ lwz r0, 0x114(r1) /* 802CDBE4 002CAB44 7C 08 03 A6 */ mtlr r0 /* 802CDBE8 002CAB48 38 21 01 10 */ addi r1, r1, 0x110 -/* 802CDBEC 002CAB4C 4E 80 00 20 */ blr +/* 802CDBEC 002CAB4C 4E 80 00 20 */ blr .global CollideMovingAABox__16CCollidableAABoxFRC27CInternalCollisionStructureRC9CVector3fRdR14CCollisionInfo CollideMovingAABox__16CCollidableAABoxFRC27CInternalCollisionStructureRC9CVector3fRdR14CCollisionInfo: @@ -606,13 +606,13 @@ CollideMovingAABox__16CCollidableAABoxFRC27CInternalCollisionStructureRC9CVector /* 802CDD30 002CAC90 81 9E 00 00 */ lwz r12, 0(r30) /* 802CDD34 002CAC94 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802CDD38 002CAC98 7D 89 03 A6 */ mtctr r12 -/* 802CDD3C 002CAC9C 4E 80 04 21 */ bctrl +/* 802CDD3C 002CAC9C 4E 80 04 21 */ bctrl /* 802CDD40 002CACA0 7C 7E 1B 78 */ mr r30, r3 /* 802CDD44 002CACA4 7F A3 EB 78 */ mr r3, r29 /* 802CDD48 002CACA8 81 9D 00 00 */ lwz r12, 0(r29) /* 802CDD4C 002CACAC 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802CDD50 002CACB0 7D 89 03 A6 */ mtctr r12 -/* 802CDD54 002CACB4 4E 80 04 21 */ bctrl +/* 802CDD54 002CACB4 4E 80 04 21 */ bctrl /* 802CDD58 002CACB8 7C 65 1B 78 */ mr r5, r3 /* 802CDD5C 002CACBC 7F C6 F3 78 */ mr r6, r30 /* 802CDD60 002CACC0 38 61 00 98 */ addi r3, r1, 0x98 @@ -673,7 +673,7 @@ lbl_802CDE30: /* 802CDE34 002CAD94 80 01 01 14 */ lwz r0, 0x114(r1) /* 802CDE38 002CAD98 7C 08 03 A6 */ mtlr r0 /* 802CDE3C 002CAD9C 38 21 01 10 */ addi r1, r1, 0x110 -/* 802CDE40 002CADA0 4E 80 00 20 */ blr +/* 802CDE40 002CADA0 4E 80 00 20 */ blr .global AABox_AABox__7CollideFRC27CInternalCollisionStructureR18CCollisionInfoList AABox_AABox__7CollideFRC27CInternalCollisionStructureR18CCollisionInfoList: @@ -724,13 +724,13 @@ AABox_AABox__7CollideFRC27CInternalCollisionStructureR18CCollisionInfoList: /* 802CDEF4 002CAE54 81 9F 00 00 */ lwz r12, 0(r31) /* 802CDEF8 002CAE58 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802CDEFC 002CAE5C 7D 89 03 A6 */ mtctr r12 -/* 802CDF00 002CAE60 4E 80 04 21 */ bctrl +/* 802CDF00 002CAE60 4E 80 04 21 */ bctrl /* 802CDF04 002CAE64 7C 7F 1B 78 */ mr r31, r3 /* 802CDF08 002CAE68 7F C3 F3 78 */ mr r3, r30 /* 802CDF0C 002CAE6C 81 9E 00 00 */ lwz r12, 0(r30) /* 802CDF10 002CAE70 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802CDF14 002CAE74 7D 89 03 A6 */ mtctr r12 -/* 802CDF18 002CAE78 4E 80 04 21 */ bctrl +/* 802CDF18 002CAE78 4E 80 04 21 */ bctrl /* 802CDF1C 002CAE7C 7C 64 1B 78 */ mr r4, r3 /* 802CDF20 002CAE80 7F E6 FB 78 */ mr r6, r31 /* 802CDF24 002CAE84 7F A7 EB 78 */ mr r7, r29 @@ -744,7 +744,7 @@ AABox_AABox__7CollideFRC27CInternalCollisionStructureR18CCollisionInfoList: /* 802CDF44 002CAEA4 83 81 00 70 */ lwz r28, 0x70(r1) /* 802CDF48 002CAEA8 7C 08 03 A6 */ mtlr r0 /* 802CDF4C 002CAEAC 38 21 00 80 */ addi r1, r1, 0x80 -/* 802CDF50 002CAEB0 4E 80 00 20 */ blr +/* 802CDF50 002CAEB0 4E 80 00 20 */ blr .global AABox_AABox_Bool__7CollideFRC27CInternalCollisionStructure AABox_AABox_Bool__7CollideFRC27CInternalCollisionStructure: @@ -795,7 +795,7 @@ AABox_AABox_Bool__7CollideFRC27CInternalCollisionStructure: /* 802CE004 002CAF64 83 C1 00 68 */ lwz r30, 0x68(r1) /* 802CE008 002CAF68 7C 08 03 A6 */ mtlr r0 /* 802CE00C 002CAF6C 38 21 00 70 */ addi r1, r1, 0x70 -/* 802CE010 002CAF70 4E 80 00 20 */ blr +/* 802CE010 002CAF70 4E 80 00 20 */ blr .global GetType__16CCollidableAABoxFv GetType__16CCollidableAABoxFv: @@ -805,12 +805,12 @@ GetType__16CCollidableAABoxFv: /* 802CE020 002CAF80 90 03 00 00 */ stw r0, 0(r3) /* 802CE024 002CAF84 38 04 69 E8 */ addi r0, r4, lbl_803D69E8@l /* 802CE028 002CAF88 90 03 00 04 */ stw r0, 4(r3) -/* 802CE02C 002CAF8C 4E 80 00 20 */ blr +/* 802CE02C 002CAF8C 4E 80 00 20 */ blr .global SetStaticTableIndex__16CCollidableAABoxFUi SetStaticTableIndex__16CCollidableAABoxFUi: /* 802CE030 002CAF90 90 6D 9B 28 */ stw r3, sTableIndex__16CCollidableAABox@sda21(r13) -/* 802CE034 002CAF94 4E 80 00 20 */ blr +/* 802CE034 002CAF94 4E 80 00 20 */ blr .global __sinit_CCollidableAABox_cpp __sinit_CCollidableAABox_cpp: @@ -836,4 +836,4 @@ __sinit_CCollidableAABox_cpp: /* 802CE084 002CAFE4 D0 23 00 3C */ stfs f1, 0x3c(r3) /* 802CE088 002CAFE8 D0 23 00 40 */ stfs f1, 0x40(r3) /* 802CE08C 002CAFEC D0 03 00 44 */ stfs f0, 0x44(r3) -/* 802CE090 002CAFF0 4E 80 00 20 */ blr +/* 802CE090 002CAFF0 4E 80 00 20 */ blr diff --git a/asm/Collision/CCollidableCollisionSurface.s b/asm/Collision/CCollidableCollisionSurface.s index 593ce6fa..fa5821d4 100644 --- a/asm/Collision/CCollidableCollisionSurface.s +++ b/asm/Collision/CCollidableCollisionSurface.s @@ -18,7 +18,7 @@ GetType__27CCollidableCollisionSurfaceFv: /* 802CE0A0 002CB000 90 03 00 00 */ stw r0, 0(r3) /* 802CE0A4 002CB004 38 04 6A 00 */ addi r0, r4, lbl_803D6A00@l /* 802CE0A8 002CB008 90 03 00 04 */ stw r0, 4(r3) -/* 802CE0AC 002CB00C 4E 80 00 20 */ blr +/* 802CE0AC 002CB00C 4E 80 00 20 */ blr .global SetStaticTableIndex__27CCollidableCollisionSurfaceFUi SetStaticTableIndex__27CCollidableCollisionSurfaceFUi: diff --git a/asm/Collision/CCollidableSphere.s b/asm/Collision/CCollidableSphere.s index 7308b0d1..4ec0c7c4 100644 --- a/asm/Collision/CCollidableSphere.s +++ b/asm/Collision/CCollidableSphere.s @@ -78,13 +78,13 @@ lbl_805A86F8: .global lbl_80479558 lbl_80479558: .skip 0x48 - + .section .text, "ax" .global GetTableIndex__17CCollidableSphereCFv GetTableIndex__17CCollidableSphereCFv: /* 802D3E70 002D0DD0 80 6D 9B 38 */ lwz r3, lbl_805A86F8@sda21(r13) -/* 802D3E74 002D0DD4 4E 80 00 20 */ blr +/* 802D3E74 002D0DD4 4E 80 00 20 */ blr .global CollideMovingSphere__17CCollidableSphereFRC27CInternalCollisionStructureRC9CVector3fRdR14CCollisionInfo CollideMovingSphere__17CCollidableSphereFRC27CInternalCollisionStructureRC9CVector3fRdR14CCollisionInfo: @@ -193,13 +193,13 @@ CollideMovingSphere__17CCollidableSphereFRC27CInternalCollisionStructureRC9CVect /* 802D4010 002D0F70 81 9E 00 00 */ lwz r12, 0(r30) /* 802D4014 002D0F74 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802D4018 002D0F78 7D 89 03 A6 */ mtctr r12 -/* 802D401C 002D0F7C 4E 80 04 21 */ bctrl +/* 802D401C 002D0F7C 4E 80 04 21 */ bctrl /* 802D4020 002D0F80 7C 7E 1B 78 */ mr r30, r3 /* 802D4024 002D0F84 7F A3 EB 78 */ mr r3, r29 /* 802D4028 002D0F88 81 9D 00 00 */ lwz r12, 0(r29) /* 802D402C 002D0F8C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802D4030 002D0F90 7D 89 03 A6 */ mtctr r12 -/* 802D4034 002D0F94 4E 80 04 21 */ bctrl +/* 802D4034 002D0F94 4E 80 04 21 */ bctrl /* 802D4038 002D0F98 7C 65 1B 78 */ mr r5, r3 /* 802D403C 002D0F9C 7F C6 F3 78 */ mr r6, r30 /* 802D4040 002D0FA0 38 61 00 78 */ addi r3, r1, 0x78 @@ -263,7 +263,7 @@ lbl_802D410C: /* 802D4120 002D1080 80 01 01 14 */ lwz r0, 0x114(r1) /* 802D4124 002D1084 7C 08 03 A6 */ mtlr r0 /* 802D4128 002D1088 38 21 01 10 */ addi r1, r1, 0x110 -/* 802D412C 002D108C 4E 80 00 20 */ blr +/* 802D412C 002D108C 4E 80 00 20 */ blr .global CollideMovingAABox__17CCollidableSphereFRC27CInternalCollisionStructureRC9CVector3fRdR14CCollisionInfo CollideMovingAABox__17CCollidableSphereFRC27CInternalCollisionStructureRC9CVector3fRdR14CCollisionInfo: @@ -283,7 +283,7 @@ CollideMovingAABox__17CCollidableSphereFRC27CInternalCollisionStructureRC9CVecto /* 802D4164 002D10C4 7F C4 F3 78 */ mr r4, r30 /* 802D4168 002D10C8 81 8C 00 14 */ lwz r12, 0x14(r12) /* 802D416C 002D10CC 7D 89 03 A6 */ mtctr r12 -/* 802D4170 002D10D0 4E 80 04 21 */ bctrl +/* 802D4170 002D10D0 4E 80 04 21 */ bctrl /* 802D4174 002D10D4 C0 A1 00 48 */ lfs f5, 0x48(r1) /* 802D4178 002D10D8 7F A4 EB 78 */ mr r4, r29 /* 802D417C 002D10DC C0 81 00 4C */ lfs f4, 0x4c(r1) @@ -339,13 +339,13 @@ CollideMovingAABox__17CCollidableSphereFRC27CInternalCollisionStructureRC9CVecto /* 802D4244 002D11A4 81 9E 00 00 */ lwz r12, 0(r30) /* 802D4248 002D11A8 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802D424C 002D11AC 7D 89 03 A6 */ mtctr r12 -/* 802D4250 002D11B0 4E 80 04 21 */ bctrl +/* 802D4250 002D11B0 4E 80 04 21 */ bctrl /* 802D4254 002D11B4 7C 7E 1B 78 */ mr r30, r3 /* 802D4258 002D11B8 7F A3 EB 78 */ mr r3, r29 /* 802D425C 002D11BC 81 9D 00 00 */ lwz r12, 0(r29) /* 802D4260 002D11C0 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802D4264 002D11C4 7D 89 03 A6 */ mtctr r12 -/* 802D4268 002D11C8 4E 80 04 21 */ bctrl +/* 802D4268 002D11C8 4E 80 04 21 */ bctrl /* 802D426C 002D11CC 7C 65 1B 78 */ mr r5, r3 /* 802D4270 002D11D0 7F C6 F3 78 */ mr r6, r30 /* 802D4274 002D11D4 38 61 00 78 */ addi r3, r1, 0x78 @@ -405,7 +405,7 @@ lbl_802D4340: /* 802D4344 002D12A4 80 01 00 F4 */ lwz r0, 0xf4(r1) /* 802D4348 002D12A8 7C 08 03 A6 */ mtlr r0 /* 802D434C 002D12AC 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 802D4350 002D12B0 4E 80 00 20 */ blr +/* 802D4350 002D12B0 4E 80 00 20 */ blr .global Transform__17CCollidableSphereCFRC12CTransform4f Transform__17CCollidableSphereCFRC12CTransform4f: @@ -435,13 +435,13 @@ Transform__17CCollidableSphereCFRC12CTransform4f: /* 802D43B0 002D1310 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802D43B4 002D1314 7C 08 03 A6 */ mtlr r0 /* 802D43B8 002D1318 38 21 00 30 */ addi r1, r1, 0x30 -/* 802D43BC 002D131C 4E 80 00 20 */ blr +/* 802D43BC 002D131C 4E 80 00 20 */ blr .global GetPrimType__17CCollidableSphereCFv GetPrimType__17CCollidableSphereCFv: /* 802D43C0 002D1320 3C 60 53 50 */ lis r3, 0x53504852@ha /* 802D43C4 002D1324 38 63 48 52 */ addi r3, r3, 0x53504852@l -/* 802D43C8 002D1328 4E 80 00 20 */ blr +/* 802D43C8 002D1328 4E 80 00 20 */ blr .global CalculateLocalAABox__17CCollidableSphereCFv CalculateLocalAABox__17CCollidableSphereCFv: @@ -470,7 +470,7 @@ CalculateLocalAABox__17CCollidableSphereCFv: /* 802D4424 002D1384 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D4428 002D1388 7C 08 03 A6 */ mtlr r0 /* 802D442C 002D138C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802D4430 002D1390 4E 80 00 20 */ blr +/* 802D4430 002D1390 4E 80 00 20 */ blr .global CalculateAABox__17CCollidableSphereCFRC12CTransform4f CalculateAABox__17CCollidableSphereCFRC12CTransform4f: @@ -512,7 +512,7 @@ CalculateAABox__17CCollidableSphereCFRC12CTransform4f: /* 802D44C0 002D1420 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 802D44C4 002D1424 7C 08 03 A6 */ mtlr r0 /* 802D44C8 002D1428 38 21 00 50 */ addi r1, r1, 0x50 -/* 802D44CC 002D142C 4E 80 00 20 */ blr +/* 802D44CC 002D142C 4E 80 00 20 */ blr .global CastRayInternal__17CCollidableSphereCFRC25CInternalRayCastStructure CastRayInternal__17CCollidableSphereCFRC25CInternalRayCastStructure: @@ -531,7 +531,7 @@ CastRayInternal__17CCollidableSphereCFRC25CInternalRayCastStructure: /* 802D4500 002D1460 83 E5 00 6C */ lwz r31, 0x6c(r5) /* 802D4504 002D1464 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802D4508 002D1468 7D 89 03 A6 */ mtctr r12 -/* 802D450C 002D146C 4E 80 04 21 */ bctrl +/* 802D450C 002D146C 4E 80 04 21 */ bctrl /* 802D4510 002D1470 7C 64 1B 78 */ mr r4, r3 /* 802D4514 002D1474 7F E3 FB 78 */ mr r3, r31 /* 802D4518 002D1478 48 00 0E 35 */ bl Passes__15CMaterialFilterCFRC13CMaterialList @@ -625,7 +625,7 @@ lbl_802D4668: /* 802D466C 002D15CC 81 9D 00 00 */ lwz r12, 0(r29) /* 802D4670 002D15D0 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802D4674 002D15D4 7D 89 03 A6 */ mtctr r12 -/* 802D4678 002D15D8 4E 80 04 21 */ bctrl +/* 802D4678 002D15D8 4E 80 04 21 */ bctrl /* 802D467C 002D15DC 7C 7F 1B 78 */ mr r31, r3 /* 802D4680 002D15E0 38 61 00 24 */ addi r3, r1, 0x24 /* 802D4684 002D15E4 38 81 00 4C */ addi r4, r1, 0x4c @@ -690,7 +690,7 @@ lbl_802D4758: /* 802D4768 002D16C8 83 81 00 70 */ lwz r28, 0x70(r1) /* 802D476C 002D16CC 7C 08 03 A6 */ mtlr r0 /* 802D4770 002D16D0 38 21 00 80 */ addi r1, r1, 0x80 -/* 802D4774 002D16D4 4E 80 00 20 */ blr +/* 802D4774 002D16D4 4E 80 00 20 */ blr .global Sphere_Sphere_Bool__7CollideFRC27CInternalCollisionStructure Sphere_Sphere_Bool__7CollideFRC27CInternalCollisionStructure: @@ -746,7 +746,7 @@ Sphere_Sphere_Bool__7CollideFRC27CInternalCollisionStructure: /* 802D483C 002D179C 80 01 00 54 */ lwz r0, 0x54(r1) /* 802D4840 002D17A0 7C 08 03 A6 */ mtlr r0 /* 802D4844 002D17A4 38 21 00 50 */ addi r1, r1, 0x50 -/* 802D4848 002D17A8 4E 80 00 20 */ blr +/* 802D4848 002D17A8 4E 80 00 20 */ blr .global Sphere_Sphere__7CollideFRC27CInternalCollisionStructureR18CCollisionInfoList Sphere_Sphere__7CollideFRC27CInternalCollisionStructureR18CCollisionInfoList: @@ -856,13 +856,13 @@ lbl_802D499C: /* 802D49E0 002D1940 81 9F 00 00 */ lwz r12, 0(r31) /* 802D49E4 002D1944 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802D49E8 002D1948 7D 89 03 A6 */ mtctr r12 -/* 802D49EC 002D194C 4E 80 04 21 */ bctrl +/* 802D49EC 002D194C 4E 80 04 21 */ bctrl /* 802D49F0 002D1950 7C 7F 1B 78 */ mr r31, r3 /* 802D49F4 002D1954 7F C3 F3 78 */ mr r3, r30 /* 802D49F8 002D1958 81 9E 00 00 */ lwz r12, 0(r30) /* 802D49FC 002D195C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802D4A00 002D1960 7D 89 03 A6 */ mtctr r12 -/* 802D4A04 002D1964 4E 80 04 21 */ bctrl +/* 802D4A04 002D1964 4E 80 04 21 */ bctrl /* 802D4A08 002D1968 7C 65 1B 78 */ mr r5, r3 /* 802D4A0C 002D196C 7F E6 FB 78 */ mr r6, r31 /* 802D4A10 002D1970 38 61 00 78 */ addi r3, r1, 0x78 @@ -893,7 +893,7 @@ lbl_802D4A3C: /* 802D4A6C 002D19CC 83 81 00 E0 */ lwz r28, 0xe0(r1) /* 802D4A70 002D19D0 7C 08 03 A6 */ mtlr r0 /* 802D4A74 002D19D4 38 21 01 30 */ addi r1, r1, 0x130 -/* 802D4A78 002D19D8 4E 80 00 20 */ blr +/* 802D4A78 002D19D8 4E 80 00 20 */ blr .global Sphere_AABox__7CollideFRC27CInternalCollisionStructureR18CCollisionInfoList Sphere_AABox__7CollideFRC27CInternalCollisionStructureR18CCollisionInfoList: @@ -1064,13 +1064,13 @@ lbl_802D4C44: /* 802D4CF8 002D1C58 81 9E 00 00 */ lwz r12, 0(r30) /* 802D4CFC 002D1C5C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802D4D00 002D1C60 7D 89 03 A6 */ mtctr r12 -/* 802D4D04 002D1C64 4E 80 04 21 */ bctrl +/* 802D4D04 002D1C64 4E 80 04 21 */ bctrl /* 802D4D08 002D1C68 7C 7E 1B 78 */ mr r30, r3 /* 802D4D0C 002D1C6C 7F A3 EB 78 */ mr r3, r29 /* 802D4D10 002D1C70 81 9D 00 00 */ lwz r12, 0(r29) /* 802D4D14 002D1C74 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802D4D18 002D1C78 7D 89 03 A6 */ mtctr r12 -/* 802D4D1C 002D1C7C 4E 80 04 21 */ bctrl +/* 802D4D1C 002D1C7C 4E 80 04 21 */ bctrl /* 802D4D20 002D1C80 7C 65 1B 78 */ mr r5, r3 /* 802D4D24 002D1C84 7F C6 F3 78 */ mr r6, r30 /* 802D4D28 002D1C88 38 61 01 30 */ addi r3, r1, 0x130 @@ -1104,7 +1104,7 @@ lbl_802D4D64: /* 802D4D90 002D1CF0 38 63 CB 20 */ addi r3, r3, lbl_803ECB20@l /* 802D4D94 002D1CF4 7C 03 00 2E */ lwzx r0, r3, r0 /* 802D4D98 002D1CF8 7C 09 03 A6 */ mtctr r0 -/* 802D4D9C 002D1CFC 4E 80 04 20 */ bctr +/* 802D4D9C 002D1CFC 4E 80 04 20 */ bctr .global lbl_802D4DA0 lbl_802D4DA0: /* 802D4DA0 002D1D00 C0 61 00 C4 */ lfs f3, 0xc4(r1) @@ -1344,13 +1344,13 @@ lbl_802D5044: /* 802D5078 002D1FD8 81 9E 00 00 */ lwz r12, 0(r30) /* 802D507C 002D1FDC 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802D5080 002D1FE0 7D 89 03 A6 */ mtctr r12 -/* 802D5084 002D1FE4 4E 80 04 21 */ bctrl +/* 802D5084 002D1FE4 4E 80 04 21 */ bctrl /* 802D5088 002D1FE8 7C 7E 1B 78 */ mr r30, r3 /* 802D508C 002D1FEC 7F A3 EB 78 */ mr r3, r29 /* 802D5090 002D1FF0 81 9D 00 00 */ lwz r12, 0(r29) /* 802D5094 002D1FF4 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802D5098 002D1FF8 7D 89 03 A6 */ mtctr r12 -/* 802D509C 002D1FFC 4E 80 04 21 */ bctrl +/* 802D509C 002D1FFC 4E 80 04 21 */ bctrl /* 802D50A0 002D2000 7C 65 1B 78 */ mr r5, r3 /* 802D50A4 002D2004 7F C6 F3 78 */ mr r6, r30 /* 802D50A8 002D2008 38 61 00 D0 */ addi r3, r1, 0xd0 @@ -1375,7 +1375,7 @@ lbl_802D50CC: /* 802D50F0 002D2050 83 A1 01 94 */ lwz r29, 0x194(r1) /* 802D50F4 002D2054 7C 08 03 A6 */ mtlr r0 /* 802D50F8 002D2058 38 21 01 D0 */ addi r1, r1, 0x1d0 -/* 802D50FC 002D205C 4E 80 00 20 */ blr +/* 802D50FC 002D205C 4E 80 00 20 */ blr .global Sphere_AABox_Bool__7CollideFRC27CInternalCollisionStructure Sphere_AABox_Bool__7CollideFRC27CInternalCollisionStructure: @@ -1441,7 +1441,7 @@ Sphere_AABox_Bool__7CollideFRC27CInternalCollisionStructure: /* 802D51EC 002D214C 83 E1 00 5C */ lwz r31, 0x5c(r1) /* 802D51F0 002D2150 7C 08 03 A6 */ mtlr r0 /* 802D51F4 002D2154 38 21 00 90 */ addi r1, r1, 0x90 -/* 802D51F8 002D2158 4E 80 00 20 */ blr +/* 802D51F8 002D2158 4E 80 00 20 */ blr .global Sphere_AABox_Bool__17CCollidableSphereFRC7CSphereRC6CAABox Sphere_AABox_Bool__17CCollidableSphereFRC7CSphereRC6CAABox: @@ -1502,7 +1502,7 @@ lbl_802D52AC: /* 802D52BC 002D221C 54 00 17 FE */ rlwinm r0, r0, 2, 0x1f, 0x1f /* 802D52C0 002D2220 7C 00 00 34 */ cntlzw r0, r0 /* 802D52C4 002D2224 54 03 D9 7E */ srwi r3, r0, 5 -/* 802D52C8 002D2228 4E 80 00 20 */ blr +/* 802D52C8 002D2228 4E 80 00 20 */ blr .global GetType__17CCollidableSphereFv GetType__17CCollidableSphereFv: @@ -1512,12 +1512,12 @@ GetType__17CCollidableSphereFv: /* 802D52D8 002D2238 90 03 00 00 */ stw r0, 0(r3) /* 802D52DC 002D223C 38 04 6A 90 */ addi r0, r4, lbl_803D6A90@l /* 802D52E0 002D2240 90 03 00 04 */ stw r0, 4(r3) -/* 802D52E4 002D2244 4E 80 00 20 */ blr +/* 802D52E4 002D2244 4E 80 00 20 */ blr .global SetStaticTableIndex__17CCollidableSphereFUi SetStaticTableIndex__17CCollidableSphereFUi: /* 802D52E8 002D2248 90 6D 9B 38 */ stw r3, lbl_805A86F8@sda21(r13) -/* 802D52EC 002D224C 4E 80 00 20 */ blr +/* 802D52EC 002D224C 4E 80 00 20 */ blr .global __sinit_CCollidableSphere_cpp __sinit_CCollidableSphere_cpp: diff --git a/asm/Collision/CCollisionInfo.s b/asm/Collision/CCollisionInfo.s index 92e26098..12263dc7 100644 --- a/asm/Collision/CCollisionInfo.s +++ b/asm/Collision/CCollisionInfo.s @@ -30,7 +30,7 @@ Swap__14CCollisionInfoFv: /* 802CE114 002CB074 90 03 00 38 */ stw r0, 0x38(r3) /* 802CE118 002CB078 90 C3 00 44 */ stw r6, 0x44(r3) /* 802CE11C 002CB07C 90 A3 00 40 */ stw r5, 0x40(r3) -/* 802CE120 002CB080 4E 80 00 20 */ blr +/* 802CE120 002CB080 4E 80 00 20 */ blr .global GetExtreme__14CCollisionInfoCFv GetExtreme__14CCollisionInfoCFv: @@ -58,7 +58,7 @@ GetExtreme__14CCollisionInfoCFv: /* 802CE178 002CB0D8 EC 02 08 2A */ fadds f0, f2, f1 /* 802CE17C 002CB0DC D0 63 00 04 */ stfs f3, 4(r3) /* 802CE180 002CB0E0 D0 03 00 08 */ stfs f0, 8(r3) -/* 802CE184 002CB0E4 4E 80 00 20 */ blr +/* 802CE184 002CB0E4 4E 80 00 20 */ blr .global __ct__14CCollisionInfoFQ214CCollisionInfo8EInvalid __ct__14CCollisionInfoFQ214CCollisionInfo8EInvalid: @@ -88,7 +88,7 @@ __ct__14CCollisionInfoFQ214CCollisionInfo8EInvalid: /* 802CE1E4 002CB144 D0 03 00 54 */ stfs f0, 0x54(r3) /* 802CE1E8 002CB148 D0 03 00 58 */ stfs f0, 0x58(r3) /* 802CE1EC 002CB14C D0 03 00 5C */ stfs f0, 0x5c(r3) -/* 802CE1F0 002CB150 4E 80 00 20 */ blr +/* 802CE1F0 002CB150 4E 80 00 20 */ blr .global GetSwapped__14CCollisionInfoCFv GetSwapped__14CCollisionInfoCFv: @@ -140,7 +140,7 @@ GetSwapped__14CCollisionInfoCFv: /* 802CE2A8 002CB208 D0 03 00 58 */ stfs f0, 0x58(r3) /* 802CE2AC 002CB20C C0 04 00 50 */ lfs f0, 0x50(r4) /* 802CE2B0 002CB210 D0 03 00 5C */ stfs f0, 0x5c(r3) -/* 802CE2B4 002CB214 4E 80 00 20 */ blr +/* 802CE2B4 002CB214 4E 80 00 20 */ blr .global __ct__14CCollisionInfoFRC6CAABoxRC13CMaterialListRC13CMaterialListRC9CVector3fRC9CVector3f __ct__14CCollisionInfoFRC6CAABoxRC13CMaterialListRC13CMaterialListRC9CVector3fRC9CVector3f: @@ -192,7 +192,7 @@ __ct__14CCollisionInfoFRC6CAABoxRC13CMaterialListRC13CMaterialListRC9CVector3fRC /* 802CE36C 002CB2CC D0 03 00 58 */ stfs f0, 0x58(r3) /* 802CE370 002CB2D0 C0 08 00 08 */ lfs f0, 8(r8) /* 802CE374 002CB2D4 D0 03 00 5C */ stfs f0, 0x5c(r3) -/* 802CE378 002CB2D8 4E 80 00 20 */ blr +/* 802CE378 002CB2D8 4E 80 00 20 */ blr .global __ct__14CCollisionInfoFRC9CVector3fRC13CMaterialListRC13CMaterialListRC9CVector3fRC9CVector3f __ct__14CCollisionInfoFRC9CVector3fRC13CMaterialListRC13CMaterialListRC9CVector3fRC9CVector3f: @@ -246,7 +246,7 @@ __ct__14CCollisionInfoFRC9CVector3fRC13CMaterialListRC13CMaterialListRC9CVector3 /* 802CE438 002CB398 D0 03 00 58 */ stfs f0, 0x58(r3) /* 802CE43C 002CB39C C0 08 00 08 */ lfs f0, 8(r8) /* 802CE440 002CB3A0 D0 03 00 5C */ stfs f0, 0x5c(r3) -/* 802CE444 002CB3A4 4E 80 00 20 */ blr +/* 802CE444 002CB3A4 4E 80 00 20 */ blr .global __ct__14CCollisionInfoFRC9CVector3fRC13CMaterialListRC13CMaterialListRC9CVector3f __ct__14CCollisionInfoFRC9CVector3fRC13CMaterialListRC13CMaterialListRC9CVector3f: diff --git a/asm/Collision/CCollisionPrimitive.s b/asm/Collision/CCollisionPrimitive.s index 43739995..fa78dbf8 100644 --- a/asm/Collision/CCollisionPrimitive.s +++ b/asm/Collision/CCollisionPrimitive.s @@ -47,7 +47,7 @@ lbl_805A9230: .global lbl_805A9234 lbl_805A9234: .skip 0x4 - + .section .text, "ax" .global InitAddMovingCollider__19CCollisionPrimitiveFPFRC27CInternalCollisionStructureRC9CVector3fRdR14CCollisionInfo_bPCcPCc @@ -63,7 +63,7 @@ InitAddMovingCollider__19CCollisionPrimitiveFPFRC27CInternalCollisionStructureRC /* 802CE6A4 002CB604 80 01 00 24 */ lwz r0, 0x24(r1) /* 802CE6A8 002CB608 7C 08 03 A6 */ mtlr r0 /* 802CE6AC 002CB60C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802CE6B0 002CB610 4E 80 00 20 */ blr +/* 802CE6B0 002CB610 4E 80 00 20 */ blr .global InitAddBooleanCollider__19CCollisionPrimitiveFPFRC27CInternalCollisionStructure_bPCcPCc InitAddBooleanCollider__19CCollisionPrimitiveFPFRC27CInternalCollisionStructure_bPCcPCc: @@ -78,7 +78,7 @@ InitAddBooleanCollider__19CCollisionPrimitiveFPFRC27CInternalCollisionStructure_ /* 802CE6D4 002CB634 80 01 00 24 */ lwz r0, 0x24(r1) /* 802CE6D8 002CB638 7C 08 03 A6 */ mtlr r0 /* 802CE6DC 002CB63C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802CE6E0 002CB640 4E 80 00 20 */ blr +/* 802CE6E0 002CB640 4E 80 00 20 */ blr .global InitAddCollider__19CCollisionPrimitiveFPFRC27CInternalCollisionStructureR18CCollisionInfoList_bPCcPCc InitAddCollider__19CCollisionPrimitiveFPFRC27CInternalCollisionStructureR18CCollisionInfoList_bPCcPCc: @@ -93,7 +93,7 @@ InitAddCollider__19CCollisionPrimitiveFPFRC27CInternalCollisionStructureR18CColl /* 802CE704 002CB664 80 01 00 24 */ lwz r0, 0x24(r1) /* 802CE708 002CB668 7C 08 03 A6 */ mtlr r0 /* 802CE70C 002CB66C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802CE710 002CB670 4E 80 00 20 */ blr +/* 802CE710 002CB670 4E 80 00 20 */ blr .global CollideMoving__19CCollisionPrimitiveFRCQ227CInternalCollisionStructure9CPrimDescRCQ227CInternalCollisionStructure9CPrimDescRC9CVector3fRdR14CCollisionInfo CollideMoving__19CCollisionPrimitiveFRCQ227CInternalCollisionStructure9CPrimDescRCQ227CInternalCollisionStructure9CPrimDescRC9CVector3fRdR14CCollisionInfo: @@ -135,7 +135,7 @@ CollideMoving__19CCollisionPrimitiveFRCQ227CInternalCollisionStructure9CPrimDesc /* 802CE7A0 002CB700 83 81 00 80 */ lwz r28, 0x80(r1) /* 802CE7A4 002CB704 7C 08 03 A6 */ mtlr r0 /* 802CE7A8 002CB708 38 21 00 90 */ addi r1, r1, 0x90 -/* 802CE7AC 002CB70C 4E 80 00 20 */ blr +/* 802CE7AC 002CB70C 4E 80 00 20 */ blr .global Collide__19CCollisionPrimitiveFRCQ227CInternalCollisionStructure9CPrimDescRCQ227CInternalCollisionStructure9CPrimDescR18CCollisionInfoList Collide__19CCollisionPrimitiveFRCQ227CInternalCollisionStructure9CPrimDescRCQ227CInternalCollisionStructure9CPrimDescR18CCollisionInfoList: @@ -169,7 +169,7 @@ Collide__19CCollisionPrimitiveFRCQ227CInternalCollisionStructure9CPrimDescRCQ227 /* 802CE81C 002CB77C 83 C1 00 78 */ lwz r30, 0x78(r1) /* 802CE820 002CB780 7C 08 03 A6 */ mtlr r0 /* 802CE824 002CB784 38 21 00 80 */ addi r1, r1, 0x80 -/* 802CE828 002CB788 4E 80 00 20 */ blr +/* 802CE828 002CB788 4E 80 00 20 */ blr .global CollideBoolean__19CCollisionPrimitiveFRCQ227CInternalCollisionStructure9CPrimDescRCQ227CInternalCollisionStructure9CPrimDesc CollideBoolean__19CCollisionPrimitiveFRCQ227CInternalCollisionStructure9CPrimDescRCQ227CInternalCollisionStructure9CPrimDesc: @@ -199,7 +199,7 @@ CollideBoolean__19CCollisionPrimitiveFRCQ227CInternalCollisionStructure9CPrimDes /* 802CE888 002CB7E8 83 E1 00 7C */ lwz r31, 0x7c(r1) /* 802CE88C 002CB7EC 7C 08 03 A6 */ mtlr r0 /* 802CE890 002CB7F0 38 21 00 80 */ addi r1, r1, 0x80 -/* 802CE894 002CB7F4 4E 80 00 20 */ blr +/* 802CE894 002CB7F4 4E 80 00 20 */ blr .global Uninitialize__19CCollisionPrimitiveFv Uninitialize__19CCollisionPrimitiveFv: @@ -257,7 +257,7 @@ lbl_802CE918: /* 802CE954 002CB8B4 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802CE958 002CB8B8 7C 08 03 A6 */ mtlr r0 /* 802CE95C 002CB8BC 38 21 00 20 */ addi r1, r1, 0x20 -/* 802CE960 002CB8C0 4E 80 00 20 */ blr +/* 802CE960 002CB8C0 4E 80 00 20 */ blr .global InternalCollideBoolean__19CCollisionPrimitiveFRC27CInternalCollisionStructure InternalCollideBoolean__19CCollisionPrimitiveFRC27CInternalCollisionStructure: @@ -274,13 +274,13 @@ InternalCollideBoolean__19CCollisionPrimitiveFRC27CInternalCollisionStructure: /* 802CE98C 002CB8EC 81 8C 00 08 */ lwz r12, 8(r12) /* 802CE990 002CB8F0 83 7A 00 3C */ lwz r27, 0x3c(r26) /* 802CE994 002CB8F4 7D 89 03 A6 */ mtctr r12 -/* 802CE998 002CB8F8 4E 80 04 21 */ bctrl +/* 802CE998 002CB8F8 4E 80 04 21 */ bctrl /* 802CE99C 002CB8FC 7C 7F 1B 78 */ mr r31, r3 /* 802CE9A0 002CB900 7F A3 EB 78 */ mr r3, r29 /* 802CE9A4 002CB904 81 9D 00 00 */ lwz r12, 0(r29) /* 802CE9A8 002CB908 81 8C 00 08 */ lwz r12, 8(r12) /* 802CE9AC 002CB90C 7D 89 03 A6 */ mtctr r12 -/* 802CE9B0 002CB910 4E 80 04 21 */ bctrl +/* 802CE9B0 002CB910 4E 80 04 21 */ bctrl /* 802CE9B4 002CB914 3C 1F 00 01 */ addis r0, r31, 1 /* 802CE9B8 002CB918 28 00 FF FF */ cmplwi r0, 0xffff /* 802CE9BC 002CB91C 41 82 00 10 */ beq lbl_802CE9CC @@ -307,7 +307,7 @@ lbl_802CE9F4: /* 802CEA04 002CB964 81 9D 00 00 */ lwz r12, 0(r29) /* 802CEA08 002CB968 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802CEA0C 002CB96C 7D 89 03 A6 */ mtctr r12 -/* 802CEA10 002CB970 4E 80 04 21 */ bctrl +/* 802CEA10 002CB970 4E 80 04 21 */ bctrl /* 802CEA14 002CB974 7C 64 1B 78 */ mr r4, r3 /* 802CEA18 002CB978 7F 83 E3 78 */ mr r3, r28 /* 802CEA1C 002CB97C 48 00 69 31 */ bl Passes__15CMaterialFilterCFRC13CMaterialList @@ -317,7 +317,7 @@ lbl_802CE9F4: /* 802CEA2C 002CB98C 81 9E 00 00 */ lwz r12, 0(r30) /* 802CEA30 002CB990 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802CEA34 002CB994 7D 89 03 A6 */ mtctr r12 -/* 802CEA38 002CB998 4E 80 04 21 */ bctrl +/* 802CEA38 002CB998 4E 80 04 21 */ bctrl /* 802CEA3C 002CB99C 7C 64 1B 78 */ mr r4, r3 /* 802CEA40 002CB9A0 7F 63 DB 78 */ mr r3, r27 /* 802CEA44 002CB9A4 48 00 69 09 */ bl Passes__15CMaterialFilterCFRC13CMaterialList @@ -330,7 +330,7 @@ lbl_802CEA58: /* 802CEA58 002CB9B8 7F 2C CB 78 */ mr r12, r25 /* 802CEA5C 002CB9BC 7F 43 D3 78 */ mr r3, r26 /* 802CEA60 002CB9C0 7D 89 03 A6 */ mtctr r12 -/* 802CEA64 002CB9C4 4E 80 04 21 */ bctrl +/* 802CEA64 002CB9C4 4E 80 04 21 */ bctrl /* 802CEA68 002CB9C8 48 00 01 A8 */ b lbl_802CEC10 lbl_802CEA6C: /* 802CEA6C 002CB9CC 3C 03 00 01 */ addis r0, r3, 1 @@ -359,7 +359,7 @@ lbl_802CEAAC: /* 802CEABC 002CBA1C 81 9D 00 00 */ lwz r12, 0(r29) /* 802CEAC0 002CBA20 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802CEAC4 002CBA24 7D 89 03 A6 */ mtctr r12 -/* 802CEAC8 002CBA28 4E 80 04 21 */ bctrl +/* 802CEAC8 002CBA28 4E 80 04 21 */ bctrl /* 802CEACC 002CBA2C 7C 64 1B 78 */ mr r4, r3 /* 802CEAD0 002CBA30 7F 83 E3 78 */ mr r3, r28 /* 802CEAD4 002CBA34 48 00 68 79 */ bl Passes__15CMaterialFilterCFRC13CMaterialList @@ -369,7 +369,7 @@ lbl_802CEAAC: /* 802CEAE4 002CBA44 81 9E 00 00 */ lwz r12, 0(r30) /* 802CEAE8 002CBA48 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802CEAEC 002CBA4C 7D 89 03 A6 */ mtctr r12 -/* 802CEAF0 002CBA50 4E 80 04 21 */ bctrl +/* 802CEAF0 002CBA50 4E 80 04 21 */ bctrl /* 802CEAF4 002CBA54 7C 64 1B 78 */ mr r4, r3 /* 802CEAF8 002CBA58 7F 63 DB 78 */ mr r3, r27 /* 802CEAFC 002CBA5C 48 00 68 51 */ bl Passes__15CMaterialFilterCFRC13CMaterialList @@ -411,7 +411,7 @@ lbl_802CEB10: /* 802CEB84 002CBAE4 7F EC FB 78 */ mr r12, r31 /* 802CEB88 002CBAE8 38 61 00 78 */ addi r3, r1, 0x78 /* 802CEB8C 002CBAEC 7D 89 03 A6 */ mtctr r12 -/* 802CEB90 002CBAF0 4E 80 04 21 */ bctrl +/* 802CEB90 002CBAF0 4E 80 04 21 */ bctrl /* 802CEB94 002CBAF4 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 802CEB98 002CBAF8 7C 03 00 D0 */ neg r0, r3 /* 802CEB9C 002CBAFC 7C 00 1B 78 */ or r0, r0, r3 @@ -453,7 +453,7 @@ lbl_802CEC10: /* 802CEC14 002CBB74 80 01 0D 14 */ lwz r0, 0xd14(r1) /* 802CEC18 002CBB78 7C 08 03 A6 */ mtlr r0 /* 802CEC1C 002CBB7C 38 21 0D 10 */ addi r1, r1, 0xd10 -/* 802CEC20 002CBB80 4E 80 00 20 */ blr +/* 802CEC20 002CBB80 4E 80 00 20 */ blr .global InternalCollideMoving__19CCollisionPrimitiveFRC27CInternalCollisionStructureRC9CVector3fRdR14CCollisionInfo InternalCollideMoving__19CCollisionPrimitiveFRC27CInternalCollisionStructureRC9CVector3fRdR14CCollisionInfo: @@ -473,13 +473,13 @@ InternalCollideMoving__19CCollisionPrimitiveFRC27CInternalCollisionStructureRC9C /* 802CEC58 002CBBB8 81 8C 00 08 */ lwz r12, 8(r12) /* 802CEC5C 002CBBBC 83 B9 00 3C */ lwz r29, 0x3c(r25) /* 802CEC60 002CBBC0 7D 89 03 A6 */ mtctr r12 -/* 802CEC64 002CBBC4 4E 80 04 21 */ bctrl +/* 802CEC64 002CBBC4 4E 80 04 21 */ bctrl /* 802CEC68 002CBBC8 7C 78 1B 78 */ mr r24, r3 /* 802CEC6C 002CBBCC 7E E3 BB 78 */ mr r3, r23 /* 802CEC70 002CBBD0 81 97 00 00 */ lwz r12, 0(r23) /* 802CEC74 002CBBD4 81 8C 00 08 */ lwz r12, 8(r12) /* 802CEC78 002CBBD8 7D 89 03 A6 */ mtctr r12 -/* 802CEC7C 002CBBDC 4E 80 04 21 */ bctrl +/* 802CEC7C 002CBBDC 4E 80 04 21 */ bctrl /* 802CEC80 002CBBE0 3C 18 00 01 */ addis r0, r24, 1 /* 802CEC84 002CBBE4 28 00 FF FF */ cmplwi r0, 0xffff /* 802CEC88 002CBBE8 41 82 00 10 */ beq lbl_802CEC98 @@ -506,7 +506,7 @@ lbl_802CECC0: /* 802CECD0 002CBC30 81 97 00 00 */ lwz r12, 0(r23) /* 802CECD4 002CBC34 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802CECD8 002CBC38 7D 89 03 A6 */ mtctr r12 -/* 802CECDC 002CBC3C 4E 80 04 21 */ bctrl +/* 802CECDC 002CBC3C 4E 80 04 21 */ bctrl /* 802CECE0 002CBC40 7C 64 1B 78 */ mr r4, r3 /* 802CECE4 002CBC44 7F C3 F3 78 */ mr r3, r30 /* 802CECE8 002CBC48 48 00 66 65 */ bl Passes__15CMaterialFilterCFRC13CMaterialList @@ -516,7 +516,7 @@ lbl_802CECC0: /* 802CECF8 002CBC58 81 9F 00 00 */ lwz r12, 0(r31) /* 802CECFC 002CBC5C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802CED00 002CBC60 7D 89 03 A6 */ mtctr r12 -/* 802CED04 002CBC64 4E 80 04 21 */ bctrl +/* 802CED04 002CBC64 4E 80 04 21 */ bctrl /* 802CED08 002CBC68 7C 64 1B 78 */ mr r4, r3 /* 802CED0C 002CBC6C 7F A3 EB 78 */ mr r3, r29 /* 802CED10 002CBC70 48 00 66 3D */ bl Passes__15CMaterialFilterCFRC13CMaterialList @@ -532,7 +532,7 @@ lbl_802CED24: /* 802CED30 002CBC90 7F 65 DB 78 */ mr r5, r27 /* 802CED34 002CBC94 7F 86 E3 78 */ mr r6, r28 /* 802CED38 002CBC98 7D 89 03 A6 */ mtctr r12 -/* 802CED3C 002CBC9C 4E 80 04 21 */ bctrl +/* 802CED3C 002CBC9C 4E 80 04 21 */ bctrl /* 802CED40 002CBCA0 48 00 00 08 */ b lbl_802CED48 lbl_802CED44: /* 802CED44 002CBCA4 38 60 00 00 */ li r3, 0 @@ -541,7 +541,7 @@ lbl_802CED48: /* 802CED4C 002CBCAC 80 01 00 34 */ lwz r0, 0x34(r1) /* 802CED50 002CBCB0 7C 08 03 A6 */ mtlr r0 /* 802CED54 002CBCB4 38 21 00 30 */ addi r1, r1, 0x30 -/* 802CED58 002CBCB8 4E 80 00 20 */ blr +/* 802CED58 002CBCB8 4E 80 00 20 */ blr .global InternalCollide__19CCollisionPrimitiveFRC27CInternalCollisionStructureR18CCollisionInfoList InternalCollide__19CCollisionPrimitiveFRC27CInternalCollisionStructureR18CCollisionInfoList: @@ -559,13 +559,13 @@ InternalCollide__19CCollisionPrimitiveFRC27CInternalCollisionStructureR18CCollis /* 802CED88 002CBCE8 81 8C 00 08 */ lwz r12, 8(r12) /* 802CED8C 002CBCEC 83 79 00 3C */ lwz r27, 0x3c(r25) /* 802CED90 002CBCF0 7D 89 03 A6 */ mtctr r12 -/* 802CED94 002CBCF4 4E 80 04 21 */ bctrl +/* 802CED94 002CBCF4 4E 80 04 21 */ bctrl /* 802CED98 002CBCF8 7C 7F 1B 78 */ mr r31, r3 /* 802CED9C 002CBCFC 7F A3 EB 78 */ mr r3, r29 /* 802CEDA0 002CBD00 81 9D 00 00 */ lwz r12, 0(r29) /* 802CEDA4 002CBD04 81 8C 00 08 */ lwz r12, 8(r12) /* 802CEDA8 002CBD08 7D 89 03 A6 */ mtctr r12 -/* 802CEDAC 002CBD0C 4E 80 04 21 */ bctrl +/* 802CEDAC 002CBD0C 4E 80 04 21 */ bctrl /* 802CEDB0 002CBD10 3C 1F 00 01 */ addis r0, r31, 1 /* 802CEDB4 002CBD14 28 00 FF FF */ cmplwi r0, 0xffff /* 802CEDB8 002CBD18 41 82 00 10 */ beq lbl_802CEDC8 @@ -592,7 +592,7 @@ lbl_802CEDF0: /* 802CEE00 002CBD60 81 9D 00 00 */ lwz r12, 0(r29) /* 802CEE04 002CBD64 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802CEE08 002CBD68 7D 89 03 A6 */ mtctr r12 -/* 802CEE0C 002CBD6C 4E 80 04 21 */ bctrl +/* 802CEE0C 002CBD6C 4E 80 04 21 */ bctrl /* 802CEE10 002CBD70 7C 64 1B 78 */ mr r4, r3 /* 802CEE14 002CBD74 7F 83 E3 78 */ mr r3, r28 /* 802CEE18 002CBD78 48 00 65 35 */ bl Passes__15CMaterialFilterCFRC13CMaterialList @@ -602,7 +602,7 @@ lbl_802CEDF0: /* 802CEE28 002CBD88 81 9E 00 00 */ lwz r12, 0(r30) /* 802CEE2C 002CBD8C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802CEE30 002CBD90 7D 89 03 A6 */ mtctr r12 -/* 802CEE34 002CBD94 4E 80 04 21 */ bctrl +/* 802CEE34 002CBD94 4E 80 04 21 */ bctrl /* 802CEE38 002CBD98 7C 64 1B 78 */ mr r4, r3 /* 802CEE3C 002CBD9C 7F 63 DB 78 */ mr r3, r27 /* 802CEE40 002CBDA0 48 00 65 0D */ bl Passes__15CMaterialFilterCFRC13CMaterialList @@ -616,7 +616,7 @@ lbl_802CEE54: /* 802CEE58 002CBDB8 7F 23 CB 78 */ mr r3, r25 /* 802CEE5C 002CBDBC 7F 44 D3 78 */ mr r4, r26 /* 802CEE60 002CBDC0 7D 89 03 A6 */ mtctr r12 -/* 802CEE64 002CBDC4 4E 80 04 21 */ bctrl +/* 802CEE64 002CBDC4 4E 80 04 21 */ bctrl /* 802CEE68 002CBDC8 48 00 01 7C */ b lbl_802CEFE4 lbl_802CEE6C: /* 802CEE6C 002CBDCC 3C 03 00 01 */ addis r0, r3, 1 @@ -645,7 +645,7 @@ lbl_802CEEAC: /* 802CEEBC 002CBE1C 81 9D 00 00 */ lwz r12, 0(r29) /* 802CEEC0 002CBE20 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802CEEC4 002CBE24 7D 89 03 A6 */ mtctr r12 -/* 802CEEC8 002CBE28 4E 80 04 21 */ bctrl +/* 802CEEC8 002CBE28 4E 80 04 21 */ bctrl /* 802CEECC 002CBE2C 7C 64 1B 78 */ mr r4, r3 /* 802CEED0 002CBE30 7F 83 E3 78 */ mr r3, r28 /* 802CEED4 002CBE34 48 00 64 79 */ bl Passes__15CMaterialFilterCFRC13CMaterialList @@ -655,7 +655,7 @@ lbl_802CEEAC: /* 802CEEE4 002CBE44 81 9E 00 00 */ lwz r12, 0(r30) /* 802CEEE8 002CBE48 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802CEEEC 002CBE4C 7D 89 03 A6 */ mtctr r12 -/* 802CEEF0 002CBE50 4E 80 04 21 */ bctrl +/* 802CEEF0 002CBE50 4E 80 04 21 */ bctrl /* 802CEEF4 002CBE54 7C 64 1B 78 */ mr r4, r3 /* 802CEEF8 002CBE58 7F 63 DB 78 */ mr r3, r27 /* 802CEEFC 002CBE5C 48 00 64 51 */ bl Passes__15CMaterialFilterCFRC13CMaterialList @@ -699,7 +699,7 @@ lbl_802CEF10: /* 802CEF8C 002CBEEC 38 61 00 78 */ addi r3, r1, 0x78 /* 802CEF90 002CBEF0 83 3A 00 00 */ lwz r25, 0(r26) /* 802CEF94 002CBEF4 7D 89 03 A6 */ mtctr r12 -/* 802CEF98 002CBEF8 4E 80 04 21 */ bctrl +/* 802CEF98 002CBEF8 4E 80 04 21 */ bctrl /* 802CEF9C 002CBEFC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802CEFA0 002CBF00 41 82 00 38 */ beq lbl_802CEFD8 /* 802CEFA4 002CBF04 1C 19 00 60 */ mulli r0, r25, 0x60 @@ -727,7 +727,7 @@ lbl_802CEFE4: /* 802CEFE8 002CBF48 80 01 01 14 */ lwz r0, 0x114(r1) /* 802CEFEC 002CBF4C 7C 08 03 A6 */ mtlr r0 /* 802CEFF0 002CBF50 38 21 01 10 */ addi r1, r1, 0x110 -/* 802CEFF4 002CBF54 4E 80 00 20 */ blr +/* 802CEFF4 002CBF54 4E 80 00 20 */ blr .global InitAddMovingCollider__19CCollisionPrimitiveFRCQ219CCollisionPrimitive16MovingComparison InitAddMovingCollider__19CCollisionPrimitiveFRCQ219CCollisionPrimitive16MovingComparison: @@ -821,7 +821,7 @@ lbl_802CF11C: /* 802CF120 002CC080 80 01 00 24 */ lwz r0, 0x24(r1) /* 802CF124 002CC084 7C 08 03 A6 */ mtlr r0 /* 802CF128 002CC088 38 21 00 20 */ addi r1, r1, 0x20 -/* 802CF12C 002CC08C 4E 80 00 20 */ blr +/* 802CF12C 002CC08C 4E 80 00 20 */ blr .global InitAddBooleanCollider__19CCollisionPrimitiveFRCQ219CCollisionPrimitive17BooleanComparison InitAddBooleanCollider__19CCollisionPrimitiveFRCQ219CCollisionPrimitive17BooleanComparison: @@ -915,7 +915,7 @@ lbl_802CF254: /* 802CF258 002CC1B8 80 01 00 24 */ lwz r0, 0x24(r1) /* 802CF25C 002CC1BC 7C 08 03 A6 */ mtlr r0 /* 802CF260 002CC1C0 38 21 00 20 */ addi r1, r1, 0x20 -/* 802CF264 002CC1C4 4E 80 00 20 */ blr +/* 802CF264 002CC1C4 4E 80 00 20 */ blr .global InitAddCollider__19CCollisionPrimitiveFRCQ219CCollisionPrimitive10Comparison InitAddCollider__19CCollisionPrimitiveFRCQ219CCollisionPrimitive10Comparison: @@ -1009,7 +1009,7 @@ lbl_802CF38C: /* 802CF390 002CC2F0 80 01 00 24 */ lwz r0, 0x24(r1) /* 802CF394 002CC2F4 7C 08 03 A6 */ mtlr r0 /* 802CF398 002CC2F8 38 21 00 20 */ addi r1, r1, 0x20 -/* 802CF39C 002CC2FC 4E 80 00 20 */ blr +/* 802CF39C 002CC2FC 4E 80 00 20 */ blr .global InitEndColliders__19CCollisionPrimitiveFv InitEndColliders__19CCollisionPrimitiveFv: @@ -1057,7 +1057,7 @@ lbl_802CF414: /* 802CF424 002CC384 98 6D A6 58 */ stb r3, lbl_805A9218@sda21(r13) /* 802CF428 002CC388 98 0D A6 57 */ stb r0, lbl_805A9217@sda21(r13) /* 802CF42C 002CC38C 98 0D A6 54 */ stb r0, lbl_805A9214@sda21(r13) -/* 802CF430 002CC390 4E 80 00 20 */ blr +/* 802CF430 002CC390 4E 80 00 20 */ blr .global InitBeginColliders__19CCollisionPrimitiveFv InitBeginColliders__19CCollisionPrimitiveFv: @@ -1117,7 +1117,7 @@ InitBeginColliders__19CCollisionPrimitiveFv: /* 802CF508 002CC468 83 C1 00 08 */ lwz r30, 8(r1) /* 802CF50C 002CC46C 7C 08 03 A6 */ mtlr r0 /* 802CF510 002CC470 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CF514 002CC474 4E 80 00 20 */ blr +/* 802CF514 002CC474 4E 80 00 20 */ blr .global InitEndTypes__19CCollisionPrimitiveFv InitEndTypes__19CCollisionPrimitiveFv: @@ -1275,7 +1275,7 @@ lbl_802CF720: /* 802CF728 002CC688 83 C1 00 38 */ lwz r30, 0x38(r1) /* 802CF72C 002CC68C 7C 08 03 A6 */ mtlr r0 /* 802CF730 002CC690 38 21 00 40 */ addi r1, r1, 0x40 -/* 802CF734 002CC694 4E 80 00 20 */ blr +/* 802CF734 002CC694 4E 80 00 20 */ blr .global InitAddType__19CCollisionPrimitiveFRCQ219CCollisionPrimitive4Type InitAddType__19CCollisionPrimitiveFRCQ219CCollisionPrimitive4Type: @@ -1289,7 +1289,7 @@ InitAddType__19CCollisionPrimitiveFRCQ219CCollisionPrimitive4Type: /* 802CF754 002CC6B4 81 9E 00 00 */ lwz r12, 0(r30) /* 802CF758 002CC6B8 80 63 00 04 */ lwz r3, 4(r3) /* 802CF75C 002CC6BC 7D 89 03 A6 */ mtctr r12 -/* 802CF760 002CC6C0 4E 80 04 21 */ bctrl +/* 802CF760 002CC6C0 4E 80 04 21 */ bctrl /* 802CF764 002CC6C4 80 6D A6 5C */ lwz r3, lbl_805A921C@sda21(r13) /* 802CF768 002CC6C8 80 83 00 04 */ lwz r4, 4(r3) /* 802CF76C 002CC6CC 38 84 00 01 */ addi r4, r4, 1 @@ -1325,7 +1325,7 @@ lbl_802CF7C4: /* 802CF7D8 002CC738 80 01 00 14 */ lwz r0, 0x14(r1) /* 802CF7DC 002CC73C 7C 08 03 A6 */ mtlr r0 /* 802CF7E0 002CC740 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CF7E4 002CC744 4E 80 00 20 */ blr +/* 802CF7E4 002CC744 4E 80 00 20 */ blr .global InitBeginTypes__19CCollisionPrimitiveFv InitBeginTypes__19CCollisionPrimitiveFv: @@ -1384,7 +1384,7 @@ lbl_802CF880: /* 802CF8A4 002CC804 83 C1 00 18 */ lwz r30, 0x18(r1) /* 802CF8A8 002CC808 7C 08 03 A6 */ mtlr r0 /* 802CF8AC 002CC80C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802CF8B0 002CC810 4E 80 00 20 */ blr +/* 802CF8B0 002CC810 4E 80 00 20 */ blr .global __ct__19CCollisionPrimitiveFRC13CMaterialList __ct__19CCollisionPrimitiveFRC13CMaterialList: @@ -1395,7 +1395,7 @@ __ct__19CCollisionPrimitiveFRC13CMaterialList: /* 802CF8C4 002CC824 80 84 00 04 */ lwz r4, 4(r4) /* 802CF8C8 002CC828 90 83 00 0C */ stw r4, 0xc(r3) /* 802CF8CC 002CC82C 90 03 00 08 */ stw r0, 8(r3) -/* 802CF8D0 002CC830 4E 80 00 20 */ blr +/* 802CF8D0 002CC830 4E 80 00 20 */ blr .global "reserve__Q24rstl63vectorFi" "reserve__Q24rstl63vectorFi": @@ -1468,7 +1468,7 @@ lbl_802CF9AC: /* 802CF9B8 002CC918 83 A1 00 24 */ lwz r29, 0x24(r1) /* 802CF9BC 002CC91C 7C 08 03 A6 */ mtlr r0 /* 802CF9C0 002CC920 38 21 00 30 */ addi r1, r1, 0x30 -/* 802CF9C4 002CC924 4E 80 00 20 */ blr +/* 802CF9C4 002CC924 4E 80 00 20 */ blr .global __sinit_CCollisionPrimitive_cpp __sinit_CCollisionPrimitive_cpp: @@ -1510,7 +1510,7 @@ __sinit_CCollisionPrimitive_cpp: /* 802CFA54 002CC9B4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802CFA58 002CC9B8 7C 08 03 A6 */ mtlr r0 /* 802CFA5C 002CC9BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CFA60 002CC9C0 4E 80 00 20 */ blr +/* 802CFA60 002CC9C0 4E 80 00 20 */ blr .global "__dt__Q24rstl78single_ptrFv" "__dt__Q24rstl78single_ptrFv": @@ -1535,7 +1535,7 @@ lbl_802CFA9C: /* 802CFAA8 002CCA08 83 C1 00 08 */ lwz r30, 8(r1) /* 802CFAAC 002CCA0C 7C 08 03 A6 */ mtlr r0 /* 802CFAB0 002CCA10 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CFAB4 002CCA14 4E 80 00 20 */ blr +/* 802CFAB4 002CCA14 4E 80 00 20 */ blr .global "__dt__Q24rstl47single_ptrFv" "__dt__Q24rstl47single_ptrFv": @@ -1560,7 +1560,7 @@ lbl_802CFAF0: /* 802CFAFC 002CCA5C 83 C1 00 08 */ lwz r30, 8(r1) /* 802CFB00 002CCA60 7C 08 03 A6 */ mtlr r0 /* 802CFB04 002CCA64 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CFB08 002CCA68 4E 80 00 20 */ blr +/* 802CFB08 002CCA68 4E 80 00 20 */ blr .global "__dt__Q24rstl68single_ptrFv" "__dt__Q24rstl68single_ptrFv": @@ -1585,7 +1585,7 @@ lbl_802CFB44: /* 802CFB50 002CCAB0 83 C1 00 08 */ lwz r30, 8(r1) /* 802CFB54 002CCAB4 7C 08 03 A6 */ mtlr r0 /* 802CFB58 002CCAB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CFB5C 002CCABC 4E 80 00 20 */ blr +/* 802CFB5C 002CCABC 4E 80 00 20 */ blr .global "__dt__Q24rstl84single_ptr>Fv" "__dt__Q24rstl84single_ptr>Fv": diff --git a/asm/Collision/CMRay.s b/asm/Collision/CMRay.s index ebd24964..1593c599 100644 --- a/asm/Collision/CMRay.s +++ b/asm/Collision/CMRay.s @@ -36,7 +36,7 @@ GetInvUnscaledTransformRay__5CMRayCFRC12CTransform4f: /* 802D605C 002D2FBC 83 C1 00 88 */ lwz r30, 0x88(r1) /* 802D6060 002D2FC0 7C 08 03 A6 */ mtlr r0 /* 802D6064 002D2FC4 38 21 00 90 */ addi r1, r1, 0x90 -/* 802D6068 002D2FC8 4E 80 00 20 */ blr +/* 802D6068 002D2FC8 4E 80 00 20 */ blr .global __ct__5CMRayFRC9CVector3fRC9CVector3ff __ct__5CMRayFRC9CVector3fRC9CVector3ff: @@ -83,7 +83,7 @@ __ct__5CMRayFRC9CVector3fRC9CVector3ff: /* 802D610C 002D306C D0 03 00 30 */ stfs f0, 0x30(r3) /* 802D6110 002D3070 C0 05 00 08 */ lfs f0, 8(r5) /* 802D6114 002D3074 D0 03 00 34 */ stfs f0, 0x34(r3) -/* 802D6118 002D3078 4E 80 00 20 */ blr +/* 802D6118 002D3078 4E 80 00 20 */ blr .global __ct__5CMRayFRC9CVector3fRC9CVector3fff __ct__5CMRayFRC9CVector3fRC9CVector3fff: diff --git a/asm/Collision/CMaterialFilter.s b/asm/Collision/CMaterialFilter.s index aa7b3545..75226dc7 100644 --- a/asm/Collision/CMaterialFilter.s +++ b/asm/Collision/CMaterialFilter.s @@ -18,7 +18,7 @@ lbl_802D536C: /* 802D5374 002D22D4 48 00 00 7C */ b lbl_802D53F0 lbl_802D5378: /* 802D5378 002D22D8 38 60 00 01 */ li r3, 1 -/* 802D537C 002D22DC 4E 80 00 20 */ blr +/* 802D537C 002D22DC 4E 80 00 20 */ blr lbl_802D5380: /* 802D5380 002D22E0 80 C3 00 00 */ lwz r6, 0(r3) /* 802D5384 002D22E4 38 A0 00 00 */ li r5, 0 @@ -32,10 +32,10 @@ lbl_802D5380: /* 802D53A4 002D2304 7C 60 03 79 */ or. r0, r3, r0 /* 802D53A8 002D2308 41 82 00 0C */ beq lbl_802D53B4 /* 802D53AC 002D230C 38 60 00 01 */ li r3, 1 -/* 802D53B0 002D2310 4E 80 00 20 */ blr +/* 802D53B0 002D2310 4E 80 00 20 */ blr lbl_802D53B4: /* 802D53B4 002D2314 38 60 00 00 */ li r3, 0 -/* 802D53B8 002D2318 4E 80 00 20 */ blr +/* 802D53B8 002D2318 4E 80 00 20 */ blr lbl_802D53BC: /* 802D53BC 002D231C 80 A4 00 00 */ lwz r5, 0(r4) /* 802D53C0 002D2320 38 00 00 00 */ li r0, 0 @@ -49,7 +49,7 @@ lbl_802D53BC: /* 802D53E0 002D2340 7C 03 1B 78 */ or r3, r0, r3 /* 802D53E4 002D2344 7C 63 00 34 */ cntlzw r3, r3 /* 802D53E8 002D2348 54 63 D9 7E */ srwi r3, r3, 5 -/* 802D53EC 002D234C 4E 80 00 20 */ blr +/* 802D53EC 002D234C 4E 80 00 20 */ blr lbl_802D53F0: /* 802D53F0 002D2350 80 03 00 00 */ lwz r0, 0(r3) /* 802D53F4 002D2354 38 C0 00 00 */ li r6, 0 @@ -82,10 +82,10 @@ lbl_802D5428: /* 802D5458 002D23B8 38 C0 00 01 */ li r6, 1 lbl_802D545C: /* 802D545C 002D23BC 7C C3 33 78 */ mr r3, r6 -/* 802D5460 002D23C0 4E 80 00 20 */ blr +/* 802D5460 002D23C0 4E 80 00 20 */ blr lbl_802D5464: /* 802D5464 002D23C4 38 60 00 01 */ li r3, 1 -/* 802D5468 002D23C8 4E 80 00 20 */ blr +/* 802D5468 002D23C8 4E 80 00 20 */ blr .global __sinit_CMaterialFilter_cpp __sinit_CMaterialFilter_cpp: diff --git a/asm/Collision/CMaterialList.s b/asm/Collision/CMaterialList.s index 8ee7b98e..db847d8c 100644 --- a/asm/Collision/CMaterialList.s +++ b/asm/Collision/CMaterialList.s @@ -18,7 +18,7 @@ lbl_802CFC20: /* 802CFC30 002CCB90 7C C5 2B 79 */ or. r5, r6, r5 /* 802CFC34 002CCB94 41 82 00 0C */ beq lbl_802CFC40 /* 802CFC38 002CCB98 7D 23 4B 78 */ mr r3, r9 -/* 802CFC3C 002CCB9C 4E 80 00 20 */ blr +/* 802CFC3C 002CCB9C 4E 80 00 20 */ blr lbl_802CFC40: /* 802CFC40 002CCBA0 54 84 F8 3E */ rotlwi r4, r4, 0x1f /* 802CFC44 002CCBA4 54 60 F8 7E */ srwi r0, r3, 1 @@ -31,7 +31,7 @@ lbl_802CFC40: /* 802CFC60 002CCBC0 7C C5 2B 79 */ or. r5, r6, r5 /* 802CFC64 002CCBC4 41 82 00 0C */ beq lbl_802CFC70 /* 802CFC68 002CCBC8 7D 23 4B 78 */ mr r3, r9 -/* 802CFC6C 002CCBCC 4E 80 00 20 */ blr +/* 802CFC6C 002CCBCC 4E 80 00 20 */ blr lbl_802CFC70: /* 802CFC70 002CCBD0 54 84 F8 3E */ rotlwi r4, r4, 0x1f /* 802CFC74 002CCBD4 39 29 00 01 */ addi r9, r9, 1 @@ -44,7 +44,7 @@ lbl_802CFC70: /* 802CFC90 002CCBF0 7C C5 2B 79 */ or. r5, r6, r5 /* 802CFC94 002CCBF4 41 82 00 0C */ beq lbl_802CFCA0 /* 802CFC98 002CCBF8 7D 23 4B 78 */ mr r3, r9 -/* 802CFC9C 002CCBFC 4E 80 00 20 */ blr +/* 802CFC9C 002CCBFC 4E 80 00 20 */ blr lbl_802CFCA0: /* 802CFCA0 002CCC00 54 84 F8 3E */ rotlwi r4, r4, 0x1f /* 802CFCA4 002CCC04 39 29 00 01 */ addi r9, r9, 1 @@ -57,7 +57,7 @@ lbl_802CFCA0: /* 802CFCC0 002CCC20 7C C5 2B 79 */ or. r5, r6, r5 /* 802CFCC4 002CCC24 41 82 00 0C */ beq lbl_802CFCD0 /* 802CFCC8 002CCC28 7D 23 4B 78 */ mr r3, r9 -/* 802CFCCC 002CCC2C 4E 80 00 20 */ blr +/* 802CFCCC 002CCC2C 4E 80 00 20 */ blr lbl_802CFCD0: /* 802CFCD0 002CCC30 54 84 F8 3E */ rotlwi r4, r4, 0x1f /* 802CFCD4 002CCC34 39 29 00 01 */ addi r9, r9, 1 diff --git a/asm/Collision/COBBox.s b/asm/Collision/COBBox.s index 995c3ce0..c66ad7b4 100644 --- a/asm/Collision/COBBox.s +++ b/asm/Collision/COBBox.s @@ -456,7 +456,7 @@ lbl_802D5ADC: /* 802D5B64 002D2AC4 E1 C1 00 88 */ psq_l f14, 136(r1), 0, qr0 /* 802D5B68 002D2AC8 C9 C1 00 80 */ lfd f14, 0x80(r1) /* 802D5B6C 002D2ACC 38 21 01 A0 */ addi r1, r1, 0x1a0 -/* 802D5B70 002D2AD0 4E 80 00 20 */ blr +/* 802D5B70 002D2AD0 4E 80 00 20 */ blr .global AABoxIntersectsBox__6COBBoxFRC6CAABox AABoxIntersectsBox__6COBBoxFRC6CAABox: @@ -476,7 +476,7 @@ AABoxIntersectsBox__6COBBoxFRC6CAABox: /* 802D5BA8 002D2B08 83 E1 00 4C */ lwz r31, 0x4c(r1) /* 802D5BAC 002D2B0C 7C 08 03 A6 */ mtlr r0 /* 802D5BB0 002D2B10 38 21 00 50 */ addi r1, r1, 0x50 -/* 802D5BB4 002D2B14 4E 80 00 20 */ blr +/* 802D5BB4 002D2B14 4E 80 00 20 */ blr .global LineIntersectsBox__6COBBoxCFRC5CMRayRf LineIntersectsBox__6COBBoxCFRC5CMRayRf: @@ -568,7 +568,7 @@ LineIntersectsBox__6COBBoxCFRC5CMRayRf: /* 802D5D0C 002D2C6C 83 A1 00 B4 */ lwz r29, 0xb4(r1) /* 802D5D10 002D2C70 7C 08 03 A6 */ mtlr r0 /* 802D5D14 002D2C74 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 802D5D18 002D2C78 4E 80 00 20 */ blr +/* 802D5D18 002D2C78 4E 80 00 20 */ blr .global FromAABox__6COBBoxFRC6CAABoxRC12CTransform4f FromAABox__6COBBoxFRC6CAABoxRC12CTransform4f: @@ -618,7 +618,7 @@ FromAABox__6COBBoxFRC6CAABoxRC12CTransform4f: /* 802D5DC8 002D2D28 83 A1 00 C4 */ lwz r29, 0xc4(r1) /* 802D5DCC 002D2D2C 7C 08 03 A6 */ mtlr r0 /* 802D5DD0 002D2D30 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 802D5DD4 002D2D34 4E 80 00 20 */ blr +/* 802D5DD4 002D2D34 4E 80 00 20 */ blr .global CalculateAABox__6COBBoxCFRC12CTransform4f CalculateAABox__6COBBoxCFRC12CTransform4f: @@ -721,7 +721,7 @@ lbl_802D5ECC: /* 802D5F3C 002D2E9C 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 802D5F40 002D2EA0 7C 08 03 A6 */ mtlr r0 /* 802D5F44 002D2EA4 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 802D5F48 002D2EA8 4E 80 00 20 */ blr +/* 802D5F48 002D2EA8 4E 80 00 20 */ blr .global __ct__6COBBoxFR12CInputStream __ct__6COBBoxFR12CInputStream: @@ -742,7 +742,7 @@ __ct__6COBBoxFR12CInputStream: /* 802D5F84 002D2EE4 83 C1 00 08 */ lwz r30, 8(r1) /* 802D5F88 002D2EE8 7C 08 03 A6 */ mtlr r0 /* 802D5F8C 002D2EEC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D5F90 002D2EF0 4E 80 00 20 */ blr +/* 802D5F90 002D2EF0 4E 80 00 20 */ blr .global __ct__6COBBoxFRC12CTransform4fRC9CVector3f __ct__6COBBoxFRC12CTransform4fRC9CVector3f: diff --git a/asm/Collision/CollisionUtil.s b/asm/Collision/CollisionUtil.s index 2edddd19..c6eb4ec6 100644 --- a/asm/Collision/CollisionUtil.s +++ b/asm/Collision/CollisionUtil.s @@ -5,7 +5,7 @@ .global lbl_80479510 lbl_80479510: .skip 0x48 - + .section .text, "ax" .global TriPointSqrDist__13CollisionUtilFRC9CVector3fRC9CVector3fRC9CVector3fRC9CVector3fPfPf @@ -379,7 +379,7 @@ lbl_802D0214: /* 802D0240 002CD1A0 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 802D0244 002CD1A4 7C 08 03 A6 */ mtlr r0 /* 802D0248 002CD1A8 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 802D024C 002CD1AC 4E 80 00 20 */ blr +/* 802D024C 002CD1AC 4E 80 00 20 */ blr .global TriSphereIntersection__13CollisionUtilFRC7CSphereRC9CVector3fRC9CVector3fRC9CVector3fR9CVector3fR9CVector3f TriSphereIntersection__13CollisionUtilFRC7CSphereRC9CVector3fRC9CVector3fRC9CVector3fR9CVector3fR9CVector3f: @@ -511,7 +511,7 @@ lbl_802D0424: /* 802D0430 002CD390 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 802D0434 002CD394 7C 08 03 A6 */ mtlr r0 /* 802D0438 002CD398 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 802D043C 002CD39C 4E 80 00 20 */ blr +/* 802D043C 002CD39C 4E 80 00 20 */ blr .global TriSphereOverlap__13CollisionUtilFRC7CSphereRC9CVector3fRC9CVector3fRC9CVector3f TriSphereOverlap__13CollisionUtilFRC7CSphereRC9CVector3fRC9CVector3fRC9CVector3f: @@ -534,7 +534,7 @@ TriSphereOverlap__13CollisionUtilFRC7CSphereRC9CVector3fRC9CVector3fRC9CVector3f /* 802D0480 002CD3E0 80 01 00 14 */ lwz r0, 0x14(r1) /* 802D0484 002CD3E4 7C 08 03 A6 */ mtlr r0 /* 802D0488 002CD3E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D048C 002CD3EC 4E 80 00 20 */ blr +/* 802D048C 002CD3EC 4E 80 00 20 */ blr .global MovingSphereAABox__13CollisionUtilFRC7CSphereRC6CAABoxRC9CVector3fRdR9CVector3fR9CVector3f MovingSphereAABox__13CollisionUtilFRC7CSphereRC6CAABoxRC9CVector3fRdR9CVector3fR9CVector3f: @@ -1516,7 +1516,7 @@ lbl_802D1318: /* 802D131C 002CE27C 80 01 01 C4 */ lwz r0, 0x1c4(r1) /* 802D1320 002CE280 7C 08 03 A6 */ mtlr r0 /* 802D1324 002CE284 38 21 01 C0 */ addi r1, r1, 0x1c0 -/* 802D1328 002CE288 4E 80 00 20 */ blr +/* 802D1328 002CE288 4E 80 00 20 */ blr .global LineCircleIntersection2d__13CollisionUtilFRC9CVector3fRC9CVector3fRC7CSphereiiRf LineCircleIntersection2d__13CollisionUtilFRC9CVector3fRC9CVector3fRC7CSphereiiRf: @@ -1634,7 +1634,7 @@ lbl_802D14AC: /* 802D14D0 002CE430 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 802D14D4 002CE434 7C 08 03 A6 */ mtlr r0 /* 802D14D8 002CE438 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 802D14DC 002CE43C 4E 80 00 20 */ blr +/* 802D14DC 002CE43C 4E 80 00 20 */ blr .global TriBoxOverlap__13CollisionUtilFRC9CVector3fRC9CVector3fRC9CVector3fRC9CVector3fRC9CVector3f TriBoxOverlap__13CollisionUtilFRC9CVector3fRC9CVector3fRC9CVector3fRC9CVector3fRC9CVector3f: @@ -2135,7 +2135,7 @@ lbl_802D1B30: /* 802D1B98 002CEAF8 E2 41 00 38 */ psq_l f18, 56(r1), 0, qr0 /* 802D1B9C 002CEAFC CA 41 00 30 */ lfd f18, 0x30(r1) /* 802D1BA0 002CEB00 38 21 01 10 */ addi r1, r1, 0x110 -/* 802D1BA4 002CEB04 4E 80 00 20 */ blr +/* 802D1BA4 002CEB04 4E 80 00 20 */ blr .global BoxLineTest__13CollisionUtilFRC6CAABoxRC9CVector3fRC9CVector3fRfRfRiRb BoxLineTest__13CollisionUtilFRC6CAABoxRC9CVector3fRC9CVector3fRfRfRiRb: @@ -2161,7 +2161,7 @@ lbl_802D1BCC: /* 802D1BF0 002CEB50 40 81 00 90 */ ble lbl_802D1C80 lbl_802D1BF4: /* 802D1BF4 002CEB54 38 60 00 00 */ li r3, 0 -/* 802D1BF8 002CEB58 4E 80 00 20 */ blr +/* 802D1BF8 002CEB58 4E 80 00 20 */ blr lbl_802D1BFC: /* 802D1BFC 002CEB5C C0 02 C4 BC */ lfs f0, lbl_805AE1DC@sda21(r2) /* 802D1C00 002CEB60 FC 04 10 40 */ fcmpo cr0, f4, f2 @@ -2212,7 +2212,7 @@ lbl_802D1C80: /* 802D1CA4 002CEC04 4C 40 13 82 */ cror 2, 0, 2 /* 802D1CA8 002CEC08 7C 00 00 26 */ mfcr r0 /* 802D1CAC 002CEC0C 54 03 1F FE */ rlwinm r3, r0, 3, 0x1f, 0x1f -/* 802D1CB0 002CEC10 4E 80 00 20 */ blr +/* 802D1CB0 002CEC10 4E 80 00 20 */ blr .global AABox_AABox_Moving__13CollisionUtilFRC6CAABoxRC6CAABoxRC9CVector3fRdR9CVector3fR9CVector3f AABox_AABox_Moving__13CollisionUtilFRC6CAABoxRC6CAABoxRC9CVector3fRdR9CVector3fR9CVector3f: @@ -2500,7 +2500,7 @@ lbl_802D20A0: /* 802D20A4 002CF004 80 01 00 54 */ lwz r0, 0x54(r1) /* 802D20A8 002CF008 7C 08 03 A6 */ mtlr r0 /* 802D20AC 002CF00C 38 21 00 50 */ addi r1, r1, 0x50 -/* 802D20B0 002CF010 4E 80 00 20 */ blr +/* 802D20B0 002CF010 4E 80 00 20 */ blr .global AddAverageToFront__13CollisionUtilFRC18CCollisionInfoListR18CCollisionInfoList AddAverageToFront__13CollisionUtilFRC18CCollisionInfoListR18CCollisionInfoList: @@ -2675,7 +2675,7 @@ lbl_802D2320: /* 802D2338 002CF298 83 81 00 A0 */ lwz r28, 0xa0(r1) /* 802D233C 002CF29C 7C 08 03 A6 */ mtlr r0 /* 802D2340 002CF2A0 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 802D2344 002CF2A4 4E 80 00 20 */ blr +/* 802D2344 002CF2A4 4E 80 00 20 */ blr .global FilterOutBackfaces__13CollisionUtilFRC9CVector3fRC18CCollisionInfoListR18CCollisionInfoList FilterOutBackfaces__13CollisionUtilFRC9CVector3fRC18CCollisionInfoListR18CCollisionInfoList: @@ -2751,7 +2751,7 @@ lbl_802D2418: /* 802D2448 002CF3A8 83 81 00 20 */ lwz r28, 0x20(r1) /* 802D244C 002CF3AC 7C 08 03 A6 */ mtlr r0 /* 802D2450 002CF3B0 38 21 00 70 */ addi r1, r1, 0x70 -/* 802D2454 002CF3B4 4E 80 00 20 */ blr +/* 802D2454 002CF3B4 4E 80 00 20 */ blr .global FilterByClosestNormal__13CollisionUtilFRC9CVector3fRC18CCollisionInfoListR18CCollisionInfoList FilterByClosestNormal__13CollisionUtilFRC9CVector3fRC18CCollisionInfoListR18CCollisionInfoList: @@ -2797,7 +2797,7 @@ lbl_802D24E4: /* 802D24E4 002CF444 80 01 00 14 */ lwz r0, 0x14(r1) /* 802D24E8 002CF448 7C 08 03 A6 */ mtlr r0 /* 802D24EC 002CF44C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D24F0 002CF450 4E 80 00 20 */ blr +/* 802D24F0 002CF450 4E 80 00 20 */ blr .global RayTriangleIntersection_Double__13CollisionUtilFRC9CVector3fRC9CVector3fPC9CVector3fRd RayTriangleIntersection_Double__13CollisionUtilFRC9CVector3fRC9CVector3fPC9CVector3fRd: @@ -2954,7 +2954,7 @@ lbl_802D270C: /* 802D272C 002CF68C 83 81 01 10 */ lwz r28, 0x110(r1) /* 802D2730 002CF690 7C 08 03 A6 */ mtlr r0 /* 802D2734 002CF694 38 21 01 40 */ addi r1, r1, 0x140 -/* 802D2738 002CF698 4E 80 00 20 */ blr +/* 802D2738 002CF698 4E 80 00 20 */ blr .global RayTriangleIntersection__13CollisionUtilFRC9CVector3fRC9CVector3fPC9CVector3fRf RayTriangleIntersection__13CollisionUtilFRC9CVector3fRC9CVector3fPC9CVector3fRf: @@ -3072,7 +3072,7 @@ lbl_802D28B0: /* 802D28D8 002CF838 E3 41 00 18 */ psq_l f26, 24(r1), 0, qr0 /* 802D28DC 002CF83C CB 41 00 10 */ lfd f26, 0x10(r1) /* 802D28E0 002CF840 38 21 00 70 */ addi r1, r1, 0x70 -/* 802D28E4 002CF844 4E 80 00 20 */ blr +/* 802D28E4 002CF844 4E 80 00 20 */ blr .global AABoxSphereIntersectionRadius__13CollisionUtilFRC6CAABoxRC7CSphere AABoxSphereIntersectionRadius__13CollisionUtilFRC6CAABoxRC7CSphere: @@ -3103,7 +3103,7 @@ lbl_802D2908: /* 802D2944 002CF8A4 48 00 00 50 */ b lbl_802D2994 lbl_802D2948: /* 802D2948 002CF8A8 C0 22 C4 C0 */ lfs f1, lbl_805AE1E0@sda21(r2) -/* 802D294C 002CF8AC 4E 80 00 20 */ blr +/* 802D294C 002CF8AC 4E 80 00 20 */ blr lbl_802D2950: /* 802D2950 002CF8B0 C0 67 00 00 */ lfs f3, 0(r7) /* 802D2954 002CF8B4 FC 02 18 40 */ fcmpo cr0, f2, f3 @@ -3122,7 +3122,7 @@ lbl_802D2950: /* 802D2988 002CF8E8 48 00 00 0C */ b lbl_802D2994 lbl_802D298C: /* 802D298C 002CF8EC C0 22 C4 C0 */ lfs f1, lbl_805AE1E0@sda21(r2) -/* 802D2990 002CF8F0 4E 80 00 20 */ blr +/* 802D2990 002CF8F0 4E 80 00 20 */ blr lbl_802D2994: /* 802D2994 002CF8F4 38 63 00 04 */ addi r3, r3, 4 /* 802D2998 002CF8F8 38 A5 00 04 */ addi r5, r5, 4 @@ -3131,13 +3131,13 @@ lbl_802D2994: /* 802D29A4 002CF904 39 08 00 02 */ addi r8, r8, 2 /* 802D29A8 002CF908 42 00 FF 60 */ bdnz lbl_802D2908 /* 802D29AC 002CF90C 2C 09 00 00 */ cmpwi r9, 0 -/* 802D29B0 002CF910 4D 82 00 20 */ beqlr +/* 802D29B0 002CF910 4D 82 00 20 */ beqlr /* 802D29B4 002CF914 C0 04 00 0C */ lfs f0, 0xc(r4) /* 802D29B8 002CF918 EC 00 00 32 */ fmuls f0, f0, f0 /* 802D29BC 002CF91C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 802D29C0 002CF920 4C 81 00 20 */ blelr +/* 802D29C0 002CF920 4C 81 00 20 */ blelr /* 802D29C4 002CF924 C0 22 C4 C0 */ lfs f1, lbl_805AE1E0@sda21(r2) -/* 802D29C8 002CF928 4E 80 00 20 */ blr +/* 802D29C8 002CF928 4E 80 00 20 */ blr .global AABoxSphereIntersection__13CollisionUtilFRC6CAABoxRC7CSphere AABoxSphereIntersection__13CollisionUtilFRC6CAABoxRC7CSphere: @@ -3168,7 +3168,7 @@ lbl_802D29EC: /* 802D2A28 002CF988 48 00 00 50 */ b lbl_802D2A78 lbl_802D2A2C: /* 802D2A2C 002CF98C 38 60 00 00 */ li r3, 0 -/* 802D2A30 002CF990 4E 80 00 20 */ blr +/* 802D2A30 002CF990 4E 80 00 20 */ blr lbl_802D2A34: /* 802D2A34 002CF994 C0 47 00 00 */ lfs f2, 0(r7) /* 802D2A38 002CF998 FC 01 10 40 */ fcmpo cr0, f1, f2 @@ -3187,7 +3187,7 @@ lbl_802D2A34: /* 802D2A6C 002CF9CC 48 00 00 0C */ b lbl_802D2A78 lbl_802D2A70: /* 802D2A70 002CF9D0 38 60 00 00 */ li r3, 0 -/* 802D2A74 002CF9D4 4E 80 00 20 */ blr +/* 802D2A74 002CF9D4 4E 80 00 20 */ blr lbl_802D2A78: /* 802D2A78 002CF9D8 38 63 00 04 */ addi r3, r3, 4 /* 802D2A7C 002CF9DC 38 A5 00 04 */ addi r5, r5, 4 @@ -3198,7 +3198,7 @@ lbl_802D2A78: /* 802D2A90 002CF9F0 2C 09 00 00 */ cmpwi r9, 0 /* 802D2A94 002CF9F4 40 82 00 0C */ bne lbl_802D2AA0 /* 802D2A98 002CF9F8 38 60 00 01 */ li r3, 1 -/* 802D2A9C 002CF9FC 4E 80 00 20 */ blr +/* 802D2A9C 002CF9FC 4E 80 00 20 */ blr lbl_802D2AA0: /* 802D2AA0 002CFA00 C0 04 00 0C */ lfs f0, 0xc(r4) /* 802D2AA4 002CFA04 EC 00 00 32 */ fmuls f0, f0, f0 @@ -3207,7 +3207,7 @@ lbl_802D2AA0: /* 802D2AB0 002CFA10 54 00 17 FE */ rlwinm r0, r0, 2, 0x1f, 0x1f /* 802D2AB4 002CFA14 7C 00 00 34 */ cntlzw r0, r0 /* 802D2AB8 002CFA18 54 03 D9 7E */ srwi r3, r0, 5 -/* 802D2ABC 002CFA1C 4E 80 00 20 */ blr +/* 802D2ABC 002CFA1C 4E 80 00 20 */ blr .global AABoxAABoxIntersection__13CollisionUtilFRC6CAABoxRC13CMaterialListRC6CAABoxRC13CMaterialListR18CCollisionInfoList AABoxAABoxIntersection__13CollisionUtilFRC6CAABoxRC13CMaterialListRC6CAABoxRC13CMaterialListR18CCollisionInfoList: @@ -3486,7 +3486,7 @@ lbl_802D2EA8: /* 802D2EAC 002CFE0C 80 01 02 24 */ lwz r0, 0x224(r1) /* 802D2EB0 002CFE10 7C 08 03 A6 */ mtlr r0 /* 802D2EB4 002CFE14 38 21 02 20 */ addi r1, r1, 0x220 -/* 802D2EB8 002CFE18 4E 80 00 20 */ blr +/* 802D2EB8 002CFE18 4E 80 00 20 */ blr .global AABoxAABoxIntersection__13CollisionUtilFRC6CAABoxRC6CAABox AABoxAABoxIntersection__13CollisionUtilFRC6CAABoxRC6CAABox: @@ -3549,10 +3549,10 @@ lbl_802D2F64: /* 802D2F6C 002CFECC 40 82 00 0C */ bne lbl_802D2F78 lbl_802D2F70: /* 802D2F70 002CFED0 38 60 00 00 */ li r3, 0 -/* 802D2F74 002CFED4 4E 80 00 20 */ blr +/* 802D2F74 002CFED4 4E 80 00 20 */ blr lbl_802D2F78: /* 802D2F78 002CFED8 38 60 00 01 */ li r3, 1 -/* 802D2F7C 002CFEDC 4E 80 00 20 */ blr +/* 802D2F7C 002CFEDC 4E 80 00 20 */ blr .global RayAABoxIntersection__13CollisionUtilFRC5CMRayRC6CAABoxRfRf RayAABoxIntersection__13CollisionUtilFRC5CMRayRC6CAABoxRfRf: @@ -3652,7 +3652,7 @@ lbl_802D30D4: /* 802D30D4 002D0034 38 60 00 00 */ li r3, 0 lbl_802D30D8: /* 802D30D8 002D0038 38 21 00 20 */ addi r1, r1, 0x20 -/* 802D30DC 002D003C 4E 80 00 20 */ blr +/* 802D30DC 002D003C 4E 80 00 20 */ blr .global RayAABoxIntersection_Double__13CollisionUtilFRC5CMRayRC6CAABoxR9CVector3fRd RayAABoxIntersection_Double__13CollisionUtilFRC5CMRayRC6CAABoxR9CVector3fRd: @@ -3985,7 +3985,7 @@ lbl_802D3564: /* 802D3580 002D04E0 80 01 00 F4 */ lwz r0, 0xf4(r1) /* 802D3584 002D04E4 7C 08 03 A6 */ mtlr r0 /* 802D3588 002D04E8 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 802D358C 002D04EC 4E 80 00 20 */ blr +/* 802D358C 002D04EC 4E 80 00 20 */ blr .global RayAABoxIntersection__13CollisionUtilFRC5CMRayRC6CAABoxR9CVector3fRf RayAABoxIntersection__13CollisionUtilFRC5CMRayRC6CAABoxR9CVector3fRf: @@ -4290,7 +4290,7 @@ lbl_802D39C0: /* 802D39C0 002D0920 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 802D39C4 002D0924 83 C1 00 38 */ lwz r30, 0x38(r1) /* 802D39C8 002D0928 38 21 00 40 */ addi r1, r1, 0x40 -/* 802D39CC 002D092C 4E 80 00 20 */ blr +/* 802D39CC 002D092C 4E 80 00 20 */ blr .global RaySphereIntersection_Double__13CollisionUtilFRC7CSphereRC9CVector3fRC9CVector3fRd RaySphereIntersection_Double__13CollisionUtilFRC7CSphereRC9CVector3fRC9CVector3fRd: @@ -4373,7 +4373,7 @@ lbl_802D3AE0: /* 802D3AF8 002D0A58 80 01 00 D4 */ lwz r0, 0xd4(r1) /* 802D3AFC 002D0A5C 7C 08 03 A6 */ mtlr r0 /* 802D3B00 002D0A60 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 802D3B04 002D0A64 4E 80 00 20 */ blr +/* 802D3B04 002D0A64 4E 80 00 20 */ blr .global RaySphereIntersection__13CollisionUtilFRC7CSphereRC9CVector3fRC9CVector3ffRfR9CVector3f RaySphereIntersection__13CollisionUtilFRC7CSphereRC9CVector3fRC9CVector3ffRfR9CVector3f: @@ -4485,7 +4485,7 @@ lbl_802D3C60: /* 802D3C90 002D0BF0 83 81 00 10 */ lwz r28, 0x10(r1) /* 802D3C94 002D0BF4 7C 08 03 A6 */ mtlr r0 /* 802D3C98 002D0BF8 38 21 00 60 */ addi r1, r1, 0x60 -/* 802D3C9C 002D0BFC 4E 80 00 20 */ blr +/* 802D3C9C 002D0BFC 4E 80 00 20 */ blr .global RayPlaneIntersection__13CollisionUtilFRC9CVector3fRC9CVector3fRC6CPlaneR9CVector3f RayPlaneIntersection__13CollisionUtilFRC9CVector3fRC9CVector3fRC6CPlaneR9CVector3f: @@ -4585,7 +4585,7 @@ lbl_802D3DE0: /* 802D3E04 002D0D64 83 A1 00 24 */ lwz r29, 0x24(r1) /* 802D3E08 002D0D68 7C 08 03 A6 */ mtlr r0 /* 802D3E0C 002D0D6C 38 21 00 60 */ addi r1, r1, 0x60 -/* 802D3E10 002D0D70 4E 80 00 20 */ blr +/* 802D3E10 002D0D70 4E 80 00 20 */ blr .global __sinit_CollisionUtil_cpp __sinit_CollisionUtil_cpp: diff --git a/asm/Collision/InternalColliders.s b/asm/Collision/InternalColliders.s index c44a329a..f77b93e3 100644 --- a/asm/Collision/InternalColliders.s +++ b/asm/Collision/InternalColliders.s @@ -73,7 +73,7 @@ AddColliders__17InternalCollidersFv: /* 802CE628 002CB588 80 01 00 14 */ lwz r0, 0x14(r1) /* 802CE62C 002CB58C 7C 08 03 A6 */ mtlr r0 /* 802CE630 002CB590 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CE634 002CB594 4E 80 00 20 */ blr +/* 802CE634 002CB594 4E 80 00 20 */ blr .global AddTypes__17InternalCollidersFv AddTypes__17InternalCollidersFv: diff --git a/asm/Dolphin/GBA/GBA.s b/asm/Dolphin/GBA/GBA.s index 34b14a5f..dfdb4bca 100644 --- a/asm/Dolphin/GBA/GBA.s +++ b/asm/Dolphin/GBA/GBA.s @@ -15,7 +15,7 @@ __GBA: .global __GBAReset __GBAReset: .skip 0x4 - + .section .data, "wa" lbl_803F7160: @@ -23,7 +23,7 @@ lbl_803F7160: .4byte 127 .4byte 0 .4byte 0 - + lbl_803F7170: .byte 0x18 .byte 0xFC @@ -53,7 +53,7 @@ lbl_803F7170: .byte 0x00 .byte 0x00 .byte 0x00 - + .section .text, "ax" @@ -65,7 +65,7 @@ ShortCommandProc: /* 803C9604 003C6564 7C 60 1A 14 */ add r3, r0, r3 /* 803C9608 003C6568 80 03 00 20 */ lwz r0, 0x20(r3) /* 803C960C 003C656C 2C 00 00 00 */ cmpwi r0, 0 -/* 803C9610 003C6570 4C 82 00 20 */ bnelr +/* 803C9610 003C6570 4C 82 00 20 */ bnelr /* 803C9614 003C6574 88 03 00 05 */ lbz r0, 5(r3) /* 803C9618 003C6578 28 00 00 00 */ cmplwi r0, 0 /* 803C961C 003C657C 40 82 00 10 */ bne lbl_803C962C @@ -75,13 +75,13 @@ ShortCommandProc: lbl_803C962C: /* 803C962C 003C658C 38 00 00 01 */ li r0, 1 /* 803C9630 003C6590 90 03 00 20 */ stw r0, 0x20(r3) -/* 803C9634 003C6594 4E 80 00 20 */ blr +/* 803C9634 003C6594 4E 80 00 20 */ blr lbl_803C9638: /* 803C9638 003C6598 88 03 00 07 */ lbz r0, 7(r3) /* 803C963C 003C659C 80 63 00 14 */ lwz r3, 0x14(r3) /* 803C9640 003C65A0 70 00 00 3A */ andi. r0, r0, 0x3a /* 803C9644 003C65A4 98 03 00 00 */ stb r0, 0(r3) -/* 803C9648 003C65A8 4E 80 00 20 */ blr +/* 803C9648 003C65A8 4E 80 00 20 */ blr .global GBAInit GBAInit: @@ -126,7 +126,7 @@ lbl_803C9698: /* 803C96E0 003C6640 80 01 00 24 */ lwz r0, 0x24(r1) /* 803C96E4 003C6644 38 21 00 20 */ addi r1, r1, 0x20 /* 803C96E8 003C6648 7C 08 03 A6 */ mtlr r0 -/* 803C96EC 003C664C 4E 80 00 20 */ blr +/* 803C96EC 003C664C 4E 80 00 20 */ blr .global GBAGetStatusAsync GBAGetStatusAsync: @@ -156,7 +156,7 @@ lbl_803C9744: /* 803C9744 003C66A4 80 01 00 0C */ lwz r0, 0xc(r1) /* 803C9748 003C66A8 38 21 00 08 */ addi r1, r1, 8 /* 803C974C 003C66AC 7C 08 03 A6 */ mtlr r0 -/* 803C9750 003C66B0 4E 80 00 20 */ blr +/* 803C9750 003C66B0 4E 80 00 20 */ blr .global GBAGetStatus GBAGetStatus: @@ -199,7 +199,7 @@ lbl_803C97D0: /* 803C97D4 003C6734 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 803C97D8 003C6738 38 21 00 20 */ addi r1, r1, 0x20 /* 803C97DC 003C673C 7C 08 03 A6 */ mtlr r0 -/* 803C97E0 003C6740 4E 80 00 20 */ blr +/* 803C97E0 003C6740 4E 80 00 20 */ blr .global GBAResetAsync GBAResetAsync: @@ -229,7 +229,7 @@ lbl_803C9838: /* 803C9838 003C6798 80 01 00 0C */ lwz r0, 0xc(r1) /* 803C983C 003C679C 38 21 00 08 */ addi r1, r1, 8 /* 803C9840 003C67A0 7C 08 03 A6 */ mtlr r0 -/* 803C9844 003C67A4 4E 80 00 20 */ blr +/* 803C9844 003C67A4 4E 80 00 20 */ blr .global GBAReset GBAReset: @@ -272,13 +272,13 @@ lbl_803C98C4: /* 803C98C8 003C6828 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 803C98CC 003C682C 38 21 00 20 */ addi r1, r1, 0x20 /* 803C98D0 003C6830 7C 08 03 A6 */ mtlr r0 -/* 803C98D4 003C6834 4E 80 00 20 */ blr +/* 803C98D4 003C6834 4E 80 00 20 */ blr OnReset: /* 803C98D8 003C6838 38 00 00 01 */ li r0, 1 /* 803C98DC 003C683C 90 0D B1 58 */ stw r0, __GBAReset@sda21(r13) /* 803C98E0 003C6840 38 60 00 01 */ li r3, 1 -/* 803C98E4 003C6844 4E 80 00 20 */ blr +/* 803C98E4 003C6844 4E 80 00 20 */ blr .global GBAGetProcessStatus GBAGetProcessStatus: @@ -379,7 +379,7 @@ lbl_803C9A3C: /* 803C9A4C 003C69AC 80 01 00 3C */ lwz r0, 0x3c(r1) /* 803C9A50 003C69B0 38 21 00 38 */ addi r1, r1, 0x38 /* 803C9A54 003C69B4 7C 08 03 A6 */ mtlr r0 -/* 803C9A58 003C69B8 4E 80 00 20 */ blr +/* 803C9A58 003C69B8 4E 80 00 20 */ blr .global GBAJoyBootAsync GBAJoyBootAsync: @@ -471,7 +471,7 @@ lbl_803C9B84: /* 803C9B88 003C6AE8 80 01 00 4C */ lwz r0, 0x4c(r1) /* 803C9B8C 003C6AEC 38 21 00 48 */ addi r1, r1, 0x48 /* 803C9B90 003C6AF0 7C 08 03 A6 */ mtlr r0 -/* 803C9B94 003C6AF4 4E 80 00 20 */ blr +/* 803C9B94 003C6AF4 4E 80 00 20 */ blr .global _F23 _F23: @@ -508,7 +508,7 @@ lbl_803C9BF0: /* 803C9C0C 003C6B6C 7D 88 03 A6 */ mtlr r12 /* 803C9C10 003C6B70 38 7C 00 00 */ addi r3, r28, 0 /* 803C9C14 003C6B74 38 9D 00 00 */ addi r4, r29, 0 -/* 803C9C18 003C6B78 4E 80 00 21 */ blrl +/* 803C9C18 003C6B78 4E 80 00 21 */ blrl lbl_803C9C1C: /* 803C9C1C 003C6B7C 93 BF 00 20 */ stw r29, 0x20(r31) /* 803C9C20 003C6B80 80 01 00 2C */ lwz r0, 0x2c(r1) @@ -518,7 +518,7 @@ lbl_803C9C1C: /* 803C9C30 003C6B90 83 81 00 18 */ lwz r28, 0x18(r1) /* 803C9C34 003C6B94 38 21 00 28 */ addi r1, r1, 0x28 /* 803C9C38 003C6B98 7C 08 03 A6 */ mtlr r0 -/* 803C9C3C 003C6B9C 4E 80 00 20 */ blr +/* 803C9C3C 003C6B9C 4E 80 00 20 */ blr .global _F25 _F25: @@ -566,7 +566,7 @@ lbl_803C9CC0: /* 803C9CDC 003C6C3C 7D 88 03 A6 */ mtlr r12 /* 803C9CE0 003C6C40 38 7C 00 00 */ addi r3, r28, 0 /* 803C9CE4 003C6C44 38 9D 00 00 */ addi r4, r29, 0 -/* 803C9CE8 003C6C48 4E 80 00 21 */ blrl +/* 803C9CE8 003C6C48 4E 80 00 21 */ blrl lbl_803C9CEC: /* 803C9CEC 003C6C4C 93 BF 00 20 */ stw r29, 0x20(r31) /* 803C9CF0 003C6C50 80 01 00 2C */ lwz r0, 0x2c(r1) @@ -576,7 +576,7 @@ lbl_803C9CEC: /* 803C9D00 003C6C60 83 81 00 18 */ lwz r28, 0x18(r1) /* 803C9D04 003C6C64 38 21 00 28 */ addi r1, r1, 0x28 /* 803C9D08 003C6C68 7C 08 03 A6 */ mtlr r0 -/* 803C9D0C 003C6C6C 4E 80 00 20 */ blr +/* 803C9D0C 003C6C6C 4E 80 00 20 */ blr .global _F27 _F27: @@ -624,7 +624,7 @@ lbl_803C9D90: /* 803C9DAC 003C6D0C 7D 88 03 A6 */ mtlr r12 /* 803C9DB0 003C6D10 38 7C 00 00 */ addi r3, r28, 0 /* 803C9DB4 003C6D14 38 9D 00 00 */ addi r4, r29, 0 -/* 803C9DB8 003C6D18 4E 80 00 21 */ blrl +/* 803C9DB8 003C6D18 4E 80 00 21 */ blrl lbl_803C9DBC: /* 803C9DBC 003C6D1C 93 BF 00 20 */ stw r29, 0x20(r31) /* 803C9DC0 003C6D20 80 01 00 2C */ lwz r0, 0x2c(r1) @@ -634,7 +634,7 @@ lbl_803C9DBC: /* 803C9DD0 003C6D30 83 81 00 18 */ lwz r28, 0x18(r1) /* 803C9DD4 003C6D34 38 21 00 28 */ addi r1, r1, 0x28 /* 803C9DD8 003C6D38 7C 08 03 A6 */ mtlr r0 -/* 803C9DDC 003C6D3C 4E 80 00 20 */ blr +/* 803C9DDC 003C6D3C 4E 80 00 20 */ blr .global _F29 _F29: @@ -663,7 +663,7 @@ lbl_803C9E1C: /* 803C9E34 003C6D94 90 04 00 14 */ stw r0, 0x14(r4) /* 803C9E38 003C6D98 7D 88 03 A6 */ mtlr r12 /* 803C9E3C 003C6D9C 38 9E 00 00 */ addi r4, r30, 0 -/* 803C9E40 003C6DA0 4E 80 00 21 */ blrl +/* 803C9E40 003C6DA0 4E 80 00 21 */ blrl lbl_803C9E44: /* 803C9E44 003C6DA4 93 DF 00 20 */ stw r30, 0x20(r31) /* 803C9E48 003C6DA8 80 01 00 24 */ lwz r0, 0x24(r1) @@ -671,7 +671,7 @@ lbl_803C9E44: /* 803C9E50 003C6DB0 83 C1 00 18 */ lwz r30, 0x18(r1) /* 803C9E54 003C6DB4 38 21 00 20 */ addi r1, r1, 0x20 /* 803C9E58 003C6DB8 7C 08 03 A6 */ mtlr r0 -/* 803C9E5C 003C6DBC 4E 80 00 20 */ blr +/* 803C9E5C 003C6DBC 4E 80 00 20 */ blr .global __GBAX01 __GBAX01: @@ -788,7 +788,7 @@ lbl_803C9FE4: /* 803CA008 003C6F68 7D 88 03 A6 */ mtlr r12 /* 803CA00C 003C6F6C 38 7D 00 00 */ addi r3, r29, 0 /* 803CA010 003C6F70 38 9C 00 00 */ addi r4, r28, 0 -/* 803CA014 003C6F74 4E 80 00 21 */ blrl +/* 803CA014 003C6F74 4E 80 00 21 */ blrl lbl_803CA018: /* 803CA018 003C6F78 93 9F 00 20 */ stw r28, 0x20(r31) /* 803CA01C 003C6F7C 80 01 00 2C */ lwz r0, 0x2c(r1) @@ -798,7 +798,7 @@ lbl_803CA018: /* 803CA02C 003C6F8C 83 81 00 18 */ lwz r28, 0x18(r1) /* 803CA030 003C6F90 38 21 00 28 */ addi r1, r1, 0x28 /* 803CA034 003C6F94 7C 08 03 A6 */ mtlr r0 -/* 803CA038 003C6F98 4E 80 00 20 */ blr +/* 803CA038 003C6F98 4E 80 00 20 */ blr .global _F31 _F31: @@ -1108,7 +1108,7 @@ lbl_803CA47C: /* 803CA4A0 003C7400 7D 88 03 A6 */ mtlr r12 /* 803CA4A4 003C7404 38 7D 00 00 */ addi r3, r29, 0 /* 803CA4A8 003C7408 38 9C 00 00 */ addi r4, r28, 0 -/* 803CA4AC 003C740C 4E 80 00 21 */ blrl +/* 803CA4AC 003C740C 4E 80 00 21 */ blrl lbl_803CA4B0: /* 803CA4B0 003C7410 93 9F 00 20 */ stw r28, 0x20(r31) /* 803CA4B4 003C7414 80 01 00 3C */ lwz r0, 0x3c(r1) @@ -1118,7 +1118,7 @@ lbl_803CA4B0: /* 803CA4C4 003C7424 83 81 00 28 */ lwz r28, 0x28(r1) /* 803CA4C8 003C7428 38 21 00 38 */ addi r1, r1, 0x38 /* 803CA4CC 003C742C 7C 08 03 A6 */ mtlr r0 -/* 803CA4D0 003C7430 4E 80 00 20 */ blr +/* 803CA4D0 003C7430 4E 80 00 20 */ blr .global _F33 _F33: @@ -1210,7 +1210,7 @@ lbl_803CA5F0: /* 803CA614 003C7574 7D 88 03 A6 */ mtlr r12 /* 803CA618 003C7578 38 7D 00 00 */ addi r3, r29, 0 /* 803CA61C 003C757C 38 9C 00 00 */ addi r4, r28, 0 -/* 803CA620 003C7580 4E 80 00 21 */ blrl +/* 803CA620 003C7580 4E 80 00 21 */ blrl lbl_803CA624: /* 803CA624 003C7584 93 9F 00 20 */ stw r28, 0x20(r31) /* 803CA628 003C7588 80 01 00 2C */ lwz r0, 0x2c(r1) @@ -1220,7 +1220,7 @@ lbl_803CA624: /* 803CA638 003C7598 83 81 00 18 */ lwz r28, 0x18(r1) /* 803CA63C 003C759C 38 21 00 28 */ addi r1, r1, 0x28 /* 803CA640 003C75A0 7C 08 03 A6 */ mtlr r0 -/* 803CA644 003C75A4 4E 80 00 20 */ blr +/* 803CA644 003C75A4 4E 80 00 20 */ blr .global _F35 _F35: @@ -1305,7 +1305,7 @@ lbl_803CA74C: /* 803CA770 003C76D0 7D 88 03 A6 */ mtlr r12 /* 803CA774 003C76D4 38 7D 00 00 */ addi r3, r29, 0 /* 803CA778 003C76D8 38 9C 00 00 */ addi r4, r28, 0 -/* 803CA77C 003C76DC 4E 80 00 21 */ blrl +/* 803CA77C 003C76DC 4E 80 00 21 */ blrl lbl_803CA780: /* 803CA780 003C76E0 93 9F 00 20 */ stw r28, 0x20(r31) /* 803CA784 003C76E4 80 01 00 2C */ lwz r0, 0x2c(r1) @@ -1315,7 +1315,7 @@ lbl_803CA780: /* 803CA794 003C76F4 83 81 00 18 */ lwz r28, 0x18(r1) /* 803CA798 003C76F8 38 21 00 28 */ addi r1, r1, 0x28 /* 803CA79C 003C76FC 7C 08 03 A6 */ mtlr r0 -/* 803CA7A0 003C7700 4E 80 00 20 */ blr +/* 803CA7A0 003C7700 4E 80 00 20 */ blr .global _F37 _F37: @@ -1374,7 +1374,7 @@ lbl_803CA848: /* 803CA86C 003C77CC 7D 88 03 A6 */ mtlr r12 /* 803CA870 003C77D0 38 7D 00 00 */ addi r3, r29, 0 /* 803CA874 003C77D4 38 9C 00 00 */ addi r4, r28, 0 -/* 803CA878 003C77D8 4E 80 00 21 */ blrl +/* 803CA878 003C77D8 4E 80 00 21 */ blrl lbl_803CA87C: /* 803CA87C 003C77DC 93 9F 00 20 */ stw r28, 0x20(r31) /* 803CA880 003C77E0 80 01 00 2C */ lwz r0, 0x2c(r1) @@ -1384,7 +1384,7 @@ lbl_803CA87C: /* 803CA890 003C77F0 83 81 00 18 */ lwz r28, 0x18(r1) /* 803CA894 003C77F4 38 21 00 28 */ addi r1, r1, 0x28 /* 803CA898 003C77F8 7C 08 03 A6 */ mtlr r0 -/* 803CA89C 003C77FC 4E 80 00 20 */ blr +/* 803CA89C 003C77FC 4E 80 00 20 */ blr .global _F39 _F39: @@ -1413,7 +1413,7 @@ lbl_803CA8DC: /* 803CA8F4 003C7854 90 05 00 14 */ stw r0, 0x14(r5) /* 803CA8F8 003C7858 7D 88 03 A6 */ mtlr r12 /* 803CA8FC 003C785C 38 9E 00 00 */ addi r4, r30, 0 -/* 803CA900 003C7860 4E 80 00 21 */ blrl +/* 803CA900 003C7860 4E 80 00 21 */ blrl lbl_803CA904: /* 803CA904 003C7864 93 DF 00 20 */ stw r30, 0x20(r31) /* 803CA908 003C7868 80 01 00 24 */ lwz r0, 0x24(r1) @@ -1421,4 +1421,4 @@ lbl_803CA904: /* 803CA910 003C7870 83 C1 00 18 */ lwz r30, 0x18(r1) /* 803CA914 003C7874 38 21 00 20 */ addi r1, r1, 0x20 /* 803CA918 003C7878 7C 08 03 A6 */ mtlr r0 -/* 803CA91C 003C787C 4E 80 00 20 */ blr +/* 803CA91C 003C787C 4E 80 00 20 */ blr diff --git a/asm/Dolphin/GBA/GBAKey.s b/asm/Dolphin/GBA/GBAKey.s index fb2d7c1e..184d389e 100644 --- a/asm/Dolphin/GBA/GBAKey.s +++ b/asm/Dolphin/GBA/GBAKey.s @@ -59,7 +59,7 @@ lbl_803F71A0: .byte 0, 8, 0,216, 0, 9, 0,155, 0, 32, 0,153, 0, 8, 0,135 .byte 0, 0, 2,191,128,139, 2,223, 0, 0, 0, 0, 0, 0, 0, 0 .byte 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 - + lbl_803F7520: .asciz "GBAKey.c" .balign 4 @@ -79,7 +79,7 @@ __GBASetDelay: /* 803CAF30 003C7E90 80 87 00 34 */ lwz r4, 0x34(r7) /* 803CAF34 003C7E94 90 C7 00 34 */ stw r6, 0x34(r7) /* 803CAF38 003C7E98 90 A7 00 30 */ stw r5, 0x30(r7) -/* 803CAF3C 003C7E9C 4E 80 00 20 */ blr +/* 803CAF3C 003C7E9C 4E 80 00 20 */ blr .global __GBADSPTaskInit __GBADSPTaskInit: @@ -144,7 +144,7 @@ lbl_803CAFFC: /* 803CB00C 003C7F6C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 803CB010 003C7F70 38 21 00 20 */ addi r1, r1, 0x20 /* 803CB014 003C7F74 7C 08 03 A6 */ mtlr r0 -/* 803CB018 003C7F78 4E 80 00 20 */ blr +/* 803CB018 003C7F78 4E 80 00 20 */ blr .global __GBADSPTaskDone __GBADSPTaskDone: @@ -194,7 +194,7 @@ lbl_803CB0A8: /* 803CB0B4 003C8014 80 01 00 0C */ lwz r0, 0xc(r1) /* 803CB0B8 003C8018 38 21 00 08 */ addi r1, r1, 8 /* 803CB0BC 003C801C 7C 08 03 A6 */ mtlr r0 -/* 803CB0C0 003C8020 4E 80 00 20 */ blr +/* 803CB0C0 003C8020 4E 80 00 20 */ blr .global __GBAX02 __GBAX02: diff --git a/asm/Dolphin/GBA/GBARead.s b/asm/Dolphin/GBA/GBARead.s index 0087f2d0..bbedd73c 100644 --- a/asm/Dolphin/GBA/GBARead.s +++ b/asm/Dolphin/GBA/GBARead.s @@ -28,7 +28,7 @@ lbl_803CA96C: /* 803CA970 003C78D0 83 E1 00 14 */ lwz r31, 0x14(r1) /* 803CA974 003C78D4 38 21 00 18 */ addi r1, r1, 0x18 /* 803CA978 003C78D8 7C 08 03 A6 */ mtlr r0 -/* 803CA97C 003C78DC 4E 80 00 20 */ blr +/* 803CA97C 003C78DC 4E 80 00 20 */ blr .global GBAReadAsync GBAReadAsync: @@ -60,7 +60,7 @@ lbl_803CA9DC: /* 803CA9DC 003C793C 80 01 00 0C */ lwz r0, 0xc(r1) /* 803CA9E0 003C7940 38 21 00 08 */ addi r1, r1, 8 /* 803CA9E4 003C7944 7C 08 03 A6 */ mtlr r0 -/* 803CA9E8 003C7948 4E 80 00 20 */ blr +/* 803CA9E8 003C7948 4E 80 00 20 */ blr .global GBARead GBARead: @@ -104,4 +104,4 @@ lbl_803CAA6C: /* 803CAA70 003C79D0 83 E1 00 24 */ lwz r31, 0x24(r1) /* 803CAA74 003C79D4 38 21 00 28 */ addi r1, r1, 0x28 /* 803CAA78 003C79D8 7C 08 03 A6 */ mtlr r0 -/* 803CAA7C 003C79DC 4E 80 00 20 */ blr +/* 803CAA7C 003C79DC 4E 80 00 20 */ blr diff --git a/asm/Dolphin/GBA/GBAWrite.s b/asm/Dolphin/GBA/GBAWrite.s index 88fa5acf..705a80ff 100644 --- a/asm/Dolphin/GBA/GBAWrite.s +++ b/asm/Dolphin/GBA/GBAWrite.s @@ -10,12 +10,12 @@ WriteProc: /* 803CAA8C 003C79EC 7C 60 1A 14 */ add r3, r0, r3 /* 803CAA90 003C79F0 80 03 00 20 */ lwz r0, 0x20(r3) /* 803CAA94 003C79F4 2C 00 00 00 */ cmpwi r0, 0 -/* 803CAA98 003C79F8 4C 82 00 20 */ bnelr +/* 803CAA98 003C79F8 4C 82 00 20 */ bnelr /* 803CAA9C 003C79FC 88 03 00 05 */ lbz r0, 5(r3) /* 803CAAA0 003C7A00 80 63 00 14 */ lwz r3, 0x14(r3) /* 803CAAA4 003C7A04 70 00 00 3A */ andi. r0, r0, 0x3a /* 803CAAA8 003C7A08 98 03 00 00 */ stb r0, 0(r3) -/* 803CAAAC 003C7A0C 4E 80 00 20 */ blr +/* 803CAAAC 003C7A0C 4E 80 00 20 */ blr .global GBAWriteAsync GBAWriteAsync: @@ -57,7 +57,7 @@ lbl_803CAB30: /* 803CAB34 003C7A94 80 01 00 34 */ lwz r0, 0x34(r1) /* 803CAB38 003C7A98 38 21 00 30 */ addi r1, r1, 0x30 /* 803CAB3C 003C7A9C 7C 08 03 A6 */ mtlr r0 -/* 803CAB40 003C7AA0 4E 80 00 20 */ blr +/* 803CAB40 003C7AA0 4E 80 00 20 */ blr .global GBAWrite GBAWrite: @@ -113,4 +113,4 @@ lbl_803CABE8: /* 803CABF8 003C7B58 83 81 00 20 */ lwz r28, 0x20(r1) /* 803CABFC 003C7B5C 38 21 00 30 */ addi r1, r1, 0x30 /* 803CAC00 003C7B60 7C 08 03 A6 */ mtlr r0 -/* 803CAC04 003C7B64 4E 80 00 20 */ blr +/* 803CAC04 003C7B64 4E 80 00 20 */ blr diff --git a/asm/Dolphin/GBA/GBAXfer.s b/asm/Dolphin/GBA/GBAXfer.s index 262f0397..bbc17c55 100644 --- a/asm/Dolphin/GBA/GBAXfer.s +++ b/asm/Dolphin/GBA/GBAXfer.s @@ -1,5 +1,5 @@ .include "macros.inc" - + .section .text, "ax" .global __GBAHandler @@ -35,7 +35,7 @@ lbl_803CAC60: /* 803CAC70 003C7BD0 7D 88 03 A6 */ mtlr r12 /* 803CAC74 003C7BD4 90 1F 00 38 */ stw r0, 0x38(r31) /* 803CAC78 003C7BD8 7F A3 EB 78 */ mr r3, r29 -/* 803CAC7C 003C7BDC 4E 80 00 21 */ blrl +/* 803CAC7C 003C7BDC 4E 80 00 21 */ blrl lbl_803CAC80: /* 803CAC80 003C7BE0 80 1F 00 1C */ lwz r0, 0x1c(r31) /* 803CAC84 003C7BE4 28 00 00 00 */ cmplwi r0, 0 @@ -50,7 +50,7 @@ lbl_803CAC80: /* 803CACA8 003C7C08 90 1F 00 1C */ stw r0, 0x1c(r31) /* 803CACAC 003C7C0C 7D 88 03 A6 */ mtlr r12 /* 803CACB0 003C7C10 80 9F 00 20 */ lwz r4, 0x20(r31) -/* 803CACB4 003C7C14 4E 80 00 21 */ blrl +/* 803CACB4 003C7C14 4E 80 00 21 */ blrl /* 803CACB8 003C7C18 38 61 00 18 */ addi r3, r1, 0x18 /* 803CACBC 003C7C1C 4B FB 49 59 */ bl OSClearContext /* 803CACC0 003C7C20 7F C3 F3 78 */ mr r3, r30 @@ -62,7 +62,7 @@ lbl_803CACC8: /* 803CACD4 003C7C34 83 A1 02 EC */ lwz r29, 0x2ec(r1) /* 803CACD8 003C7C38 38 21 02 F8 */ addi r1, r1, 0x2f8 /* 803CACDC 003C7C3C 7C 08 03 A6 */ mtlr r0 -/* 803CACE0 003C7C40 4E 80 00 20 */ blr +/* 803CACE0 003C7C40 4E 80 00 20 */ blr .global __GBASyncCallback __GBASyncCallback: @@ -78,7 +78,7 @@ __GBASyncCallback: /* 803CAD08 003C7C68 80 01 00 0C */ lwz r0, 0xc(r1) /* 803CAD0C 003C7C6C 38 21 00 08 */ addi r1, r1, 8 /* 803CAD10 003C7C70 7C 08 03 A6 */ mtlr r0 -/* 803CAD14 003C7C74 4E 80 00 20 */ blr +/* 803CAD14 003C7C74 4E 80 00 20 */ blr .global __GBASync __GBASync: @@ -110,7 +110,7 @@ lbl_803CAD50: /* 803CAD74 003C7CD4 83 C1 00 10 */ lwz r30, 0x10(r1) /* 803CAD78 003C7CD8 38 21 00 18 */ addi r1, r1, 0x18 /* 803CAD7C 003C7CDC 7C 08 03 A6 */ mtlr r0 -/* 803CAD80 003C7CE0 4E 80 00 20 */ blr +/* 803CAD80 003C7CE0 4E 80 00 20 */ blr .global TypeAndStatusCallback TypeAndStatusCallback: @@ -161,7 +161,7 @@ lbl_803CAE18: /* 803CAE28 003C7D88 7D 88 03 A6 */ mtlr r12 /* 803CAE2C 003C7D8C 90 1E 00 38 */ stw r0, 0x38(r30) /* 803CAE30 003C7D90 7F E3 FB 78 */ mr r3, r31 -/* 803CAE34 003C7D94 4E 80 00 21 */ blrl +/* 803CAE34 003C7D94 4E 80 00 21 */ blrl lbl_803CAE38: /* 803CAE38 003C7D98 80 1E 00 1C */ lwz r0, 0x1c(r30) /* 803CAE3C 003C7D9C 28 00 00 00 */ cmplwi r0, 0 @@ -178,7 +178,7 @@ lbl_803CAE38: /* 803CAE68 003C7DC8 90 1E 00 1C */ stw r0, 0x1c(r30) /* 803CAE6C 003C7DCC 7D 88 03 A6 */ mtlr r12 /* 803CAE70 003C7DD0 80 9E 00 20 */ lwz r4, 0x20(r30) -/* 803CAE74 003C7DD4 4E 80 00 21 */ blrl +/* 803CAE74 003C7DD4 4E 80 00 21 */ blrl /* 803CAE78 003C7DD8 38 61 00 10 */ addi r3, r1, 0x10 /* 803CAE7C 003C7DDC 4B FB 47 99 */ bl OSClearContext /* 803CAE80 003C7DE0 7F A3 EB 78 */ mr r3, r29 @@ -191,7 +191,7 @@ lbl_803CAE8C: /* 803CAE98 003C7DF8 83 A1 02 E4 */ lwz r29, 0x2e4(r1) /* 803CAE9C 003C7DFC 38 21 02 F0 */ addi r1, r1, 0x2f0 /* 803CAEA0 003C7E00 7C 08 03 A6 */ mtlr r0 -/* 803CAEA4 003C7E04 4E 80 00 20 */ blr +/* 803CAEA4 003C7E04 4E 80 00 20 */ blr .global __GBATransfer __GBATransfer: @@ -223,4 +223,4 @@ __GBATransfer: /* 803CAF0C 003C7E6C 80 01 00 34 */ lwz r0, 0x34(r1) /* 803CAF10 003C7E70 38 21 00 30 */ addi r1, r1, 0x30 /* 803CAF14 003C7E74 7C 08 03 A6 */ mtlr r0 -/* 803CAF18 003C7E78 4E 80 00 20 */ blr +/* 803CAF18 003C7E78 4E 80 00 20 */ blr diff --git a/asm/Dolphin/ai.s b/asm/Dolphin/ai.s index 8775725c..59e91843 100644 --- a/asm/Dolphin/ai.s +++ b/asm/Dolphin/ai.s @@ -6,7 +6,7 @@ AIVersion: .asciz "<< Dolphin SDK - AI\trelease build: Sep 5 2002 05:34:25 (0x2301) >>" .4byte 0 - + .section .sdata .global lbl_805A8A68 lbl_805A8A68: @@ -67,7 +67,7 @@ AIRegisterDMACallback: /* 8036CF70 00369ED0 83 C1 00 10 */ lwz r30, 0x10(r1) /* 8036CF74 00369ED4 38 21 00 18 */ addi r1, r1, 0x18 /* 8036CF78 00369ED8 7C 08 03 A6 */ mtlr r0 -/* 8036CF7C 00369EDC 4E 80 00 20 */ blr +/* 8036CF7C 00369EDC 4E 80 00 20 */ blr .global AIInitDMA AIInitDMA: @@ -104,7 +104,7 @@ AIInitDMA: /* 8036CFF8 00369F58 83 C1 00 10 */ lwz r30, 0x10(r1) /* 8036CFFC 00369F5C 38 21 00 18 */ addi r1, r1, 0x18 /* 8036D000 00369F60 7C 08 03 A6 */ mtlr r0 -/* 8036D004 00369F64 4E 80 00 20 */ blr +/* 8036D004 00369F64 4E 80 00 20 */ blr .global AIStartDMA AIStartDMA: @@ -113,7 +113,7 @@ AIStartDMA: /* 8036D010 00369F70 A0 03 00 36 */ lhz r0, 0x36(r3) /* 8036D014 00369F74 60 00 80 00 */ ori r0, r0, 0x8000 /* 8036D018 00369F78 B0 03 00 36 */ sth r0, 0x36(r3) -/* 8036D01C 00369F7C 4E 80 00 20 */ blr +/* 8036D01C 00369F7C 4E 80 00 20 */ blr .global AIStopDMA AIStopDMA: @@ -122,7 +122,7 @@ AIStopDMA: /* 8036D028 00369F88 A0 03 00 36 */ lhz r0, 0x36(r3) /* 8036D02C 00369F8C 54 00 04 5E */ rlwinm r0, r0, 0, 0x11, 0xf /* 8036D030 00369F90 B0 03 00 36 */ sth r0, 0x36(r3) -/* 8036D034 00369F94 4E 80 00 20 */ blr +/* 8036D034 00369F94 4E 80 00 20 */ blr .global AIGetDMAStartAddr AIGetDMAStartAddr: @@ -132,7 +132,7 @@ AIGetDMAStartAddr: /* 8036D044 00369FA4 A0 03 00 32 */ lhz r0, 0x32(r3) /* 8036D048 00369FA8 54 03 04 34 */ rlwinm r3, r0, 0, 0x10, 0x1a /* 8036D04C 00369FAC 50 83 81 9E */ rlwimi r3, r4, 0x10, 6, 0xf -/* 8036D050 00369FB0 4E 80 00 20 */ blr +/* 8036D050 00369FB0 4E 80 00 20 */ blr .global AIRegisterStreamCallback AIRegisterStreamCallback: @@ -152,7 +152,7 @@ AIRegisterStreamCallback: /* 8036D088 00369FE8 83 C1 00 10 */ lwz r30, 0x10(r1) /* 8036D08C 00369FEC 38 21 00 18 */ addi r1, r1, 0x18 /* 8036D090 00369FF0 7C 08 03 A6 */ mtlr r0 -/* 8036D094 00369FF4 4E 80 00 20 */ blr +/* 8036D094 00369FF4 4E 80 00 20 */ blr .global sub_8036d098 sub_8036d098: @@ -161,13 +161,13 @@ sub_8036d098: /* 8036D0A0 0036A000 54 00 06 F2 */ rlwinm r0, r0, 0, 0x1b, 0x19 /* 8036D0A4 0036A004 60 00 00 20 */ ori r0, r0, 0x20 /* 8036D0A8 0036A008 90 03 6C 00 */ stw r0, 0x6c00(r3) -/* 8036D0AC 0036A00C 4E 80 00 20 */ blr +/* 8036D0AC 0036A00C 4E 80 00 20 */ blr .global SetTRKConnected SetTRKConnected: /* 8036D0B0 0036A010 3C 80 CC 00 */ lis r4, 0xCC006C0C@ha /* 8036D0B4 0036A014 90 64 6C 0C */ stw r3, 0xCC006C0C@l(r4) -/* 8036D0B8 0036A018 4E 80 00 20 */ blr +/* 8036D0B8 0036A018 4E 80 00 20 */ blr .global AISetStreamPlayState AISetStreamPlayState: @@ -226,14 +226,14 @@ lbl_8036D178: /* 8036D184 0036A0E4 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8036D188 0036A0E8 38 21 00 20 */ addi r1, r1, 0x20 /* 8036D18C 0036A0EC 7C 08 03 A6 */ mtlr r0 -/* 8036D190 0036A0F0 4E 80 00 20 */ blr +/* 8036D190 0036A0F0 4E 80 00 20 */ blr .global AIGetStreamPlayState AIGetStreamPlayState: /* 8036D194 0036A0F4 3C 60 CC 00 */ lis r3, 0xCC006C00@ha /* 8036D198 0036A0F8 80 03 6C 00 */ lwz r0, 0xCC006C00@l(r3) /* 8036D19C 0036A0FC 54 03 07 FE */ clrlwi r3, r0, 0x1f -/* 8036D1A0 0036A100 4E 80 00 20 */ blr +/* 8036D1A0 0036A100 4E 80 00 20 */ blr .global AISetDSPSampleRate AISetDSPSampleRate: @@ -293,7 +293,7 @@ lbl_8036D270: /* 8036D274 0036A1D4 80 01 00 2C */ lwz r0, 0x2c(r1) /* 8036D278 0036A1D8 38 21 00 28 */ addi r1, r1, 0x28 /* 8036D27C 0036A1DC 7C 08 03 A6 */ mtlr r0 -/* 8036D280 0036A1E0 4E 80 00 20 */ blr +/* 8036D280 0036A1E0 4E 80 00 20 */ blr .global AIGetDSPSampleRate AIGetDSPSampleRate: @@ -301,7 +301,7 @@ AIGetDSPSampleRate: /* 8036D288 0036A1E8 80 03 6C 00 */ lwz r0, 0xCC006C00@l(r3) /* 8036D28C 0036A1EC 54 00 D7 FE */ rlwinm r0, r0, 0x1a, 0x1f, 0x1f /* 8036D290 0036A1F0 68 03 00 01 */ xori r3, r0, 1 -/* 8036D294 0036A1F4 4E 80 00 20 */ blr +/* 8036D294 0036A1F4 4E 80 00 20 */ blr .global __AI_set_stream_sample_rate __AI_set_stream_sample_rate: @@ -358,14 +358,14 @@ lbl_8036D358: /* 8036D35C 0036A2BC 80 01 00 34 */ lwz r0, 0x34(r1) /* 8036D360 0036A2C0 38 21 00 30 */ addi r1, r1, 0x30 /* 8036D364 0036A2C4 7C 08 03 A6 */ mtlr r0 -/* 8036D368 0036A2C8 4E 80 00 20 */ blr +/* 8036D368 0036A2C8 4E 80 00 20 */ blr .global AIGetStreamSampleRate AIGetStreamSampleRate: /* 8036D36C 0036A2CC 3C 60 CC 00 */ lis r3, 0xCC006C00@ha /* 8036D370 0036A2D0 80 03 6C 00 */ lwz r0, 0xCC006C00@l(r3) /* 8036D374 0036A2D4 54 03 FF FE */ rlwinm r3, r0, 0x1f, 0x1f, 0x1f -/* 8036D378 0036A2D8 4E 80 00 20 */ blr +/* 8036D378 0036A2D8 4E 80 00 20 */ blr .global AISetStreamVolLeft AISetStreamVolLeft: @@ -375,14 +375,14 @@ AISetStreamVolLeft: /* 8036D388 0036A2E8 54 00 00 2E */ rlwinm r0, r0, 0, 0, 0x17 /* 8036D38C 0036A2EC 50 60 06 3E */ rlwimi r0, r3, 0, 0x18, 0x1f /* 8036D390 0036A2F0 90 04 00 04 */ stw r0, 4(r4) -/* 8036D394 0036A2F4 4E 80 00 20 */ blr +/* 8036D394 0036A2F4 4E 80 00 20 */ blr .global AIGetStreamVolLeft AIGetStreamVolLeft: /* 8036D398 0036A2F8 3C 60 CC 00 */ lis r3, 0xCC006C04@ha /* 8036D39C 0036A2FC 80 03 6C 04 */ lwz r0, 0xCC006C04@l(r3) /* 8036D3A0 0036A300 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 8036D3A4 0036A304 4E 80 00 20 */ blr +/* 8036D3A4 0036A304 4E 80 00 20 */ blr .global AISetStreamVolRight AISetStreamVolRight: @@ -392,14 +392,14 @@ AISetStreamVolRight: /* 8036D3B4 0036A314 54 00 06 1E */ rlwinm r0, r0, 0, 0x18, 0xf /* 8036D3B8 0036A318 50 60 44 2E */ rlwimi r0, r3, 8, 0x10, 0x17 /* 8036D3BC 0036A31C 90 04 00 04 */ stw r0, 4(r4) -/* 8036D3C0 0036A320 4E 80 00 20 */ blr +/* 8036D3C0 0036A320 4E 80 00 20 */ blr .global AIGetStreamVolRight AIGetStreamVolRight: /* 8036D3C4 0036A324 3C 60 CC 00 */ lis r3, 0xCC006C04@ha /* 8036D3C8 0036A328 80 03 6C 04 */ lwz r0, 0xCC006C04@l(r3) /* 8036D3CC 0036A32C 54 03 C6 3E */ rlwinm r3, r0, 0x18, 0x18, 0x1f -/* 8036D3D0 0036A330 4E 80 00 20 */ blr +/* 8036D3D0 0036A330 4E 80 00 20 */ blr .global AIInit AIInit: @@ -461,11 +461,11 @@ AIInit: /* 8036D4B0 0036A410 80 A6 6C 04 */ lwz r5, 0x6c04(r6) /* 8036D4B4 0036A414 90 06 6C 00 */ stw r0, 0x6c00(r6) /* 8036D4B8 0036A418 54 A0 06 1E */ rlwinm r0, r5, 0, 0x18, 0xf -/* 8036D4BC 0036A41C 60 00 00 00 */ nop +/* 8036D4BC 0036A41C 60 00 00 00 */ nop /* 8036D4C0 0036A420 90 06 6C 04 */ stw r0, 0x6c04(r6) /* 8036D4C4 0036A424 80 06 6C 04 */ lwz r0, 0x6c04(r6) /* 8036D4C8 0036A428 54 00 00 2E */ rlwinm r0, r0, 0, 0, 0x17 -/* 8036D4CC 0036A42C 60 00 00 00 */ nop +/* 8036D4CC 0036A42C 60 00 00 00 */ nop /* 8036D4D0 0036A430 90 06 6C 04 */ stw r0, 0x6c04(r6) /* 8036D4D4 0036A434 93 E6 6C 0C */ stw r31, 0x6c0c(r6) /* 8036D4D8 0036A438 4B FF FD C1 */ bl __AI_set_stream_sample_rate @@ -494,7 +494,7 @@ lbl_8036D528: /* 8036D530 0036A490 83 C1 00 10 */ lwz r30, 0x10(r1) /* 8036D534 0036A494 38 21 00 18 */ addi r1, r1, 0x18 /* 8036D538 0036A498 7C 08 03 A6 */ mtlr r0 -/* 8036D53C 0036A49C 4E 80 00 20 */ blr +/* 8036D53C 0036A49C 4E 80 00 20 */ blr .global __AISHandler __AISHandler: @@ -518,7 +518,7 @@ __AISHandler: /* 8036D584 0036A4E4 38 7F 6C 00 */ addi r3, r31, 0x6c00 /* 8036D588 0036A4E8 7D 88 03 A6 */ mtlr r12 /* 8036D58C 0036A4EC 80 63 00 08 */ lwz r3, 8(r3) -/* 8036D590 0036A4F0 4E 80 00 21 */ blrl +/* 8036D590 0036A4F0 4E 80 00 21 */ blrl lbl_8036D594: /* 8036D594 0036A4F4 38 61 00 10 */ addi r3, r1, 0x10 /* 8036D598 0036A4F8 48 01 20 7D */ bl OSClearContext @@ -529,7 +529,7 @@ lbl_8036D594: /* 8036D5AC 0036A50C 83 C1 02 D8 */ lwz r30, 0x2d8(r1) /* 8036D5B0 0036A510 38 21 02 E0 */ addi r1, r1, 0x2e0 /* 8036D5B4 0036A514 7C 08 03 A6 */ mtlr r0 -/* 8036D5B8 0036A518 4E 80 00 20 */ blr +/* 8036D5B8 0036A518 4E 80 00 20 */ blr .global __AIDHandler __AIDHandler: @@ -565,7 +565,7 @@ __AIDHandler: lbl_8036D630: /* 8036D630 0036A590 39 83 00 00 */ addi r12, r3, 0 /* 8036D634 0036A594 7D 88 03 A6 */ mtlr r12 -/* 8036D638 0036A598 4E 80 00 21 */ blrl +/* 8036D638 0036A598 4E 80 00 21 */ blrl lbl_8036D63C: /* 8036D63C 0036A59C 38 00 00 00 */ li r0, 0 /* 8036D640 0036A5A0 90 0D AB 0C */ stw r0, lbl_805A96CC@sda21(r13) @@ -578,7 +578,7 @@ lbl_8036D644: /* 8036D658 0036A5B8 83 E1 02 DC */ lwz r31, 0x2dc(r1) /* 8036D65C 0036A5BC 38 21 02 E0 */ addi r1, r1, 0x2e0 /* 8036D660 0036A5C0 7C 08 03 A6 */ mtlr r0 -/* 8036D664 0036A5C4 4E 80 00 20 */ blr +/* 8036D664 0036A5C4 4E 80 00 20 */ blr .global __AICallbackStackSwitch __AICallbackStackSwitch: @@ -595,7 +595,7 @@ __AICallbackStackSwitch: /* 8036D690 0036A5F0 80 25 00 00 */ lwz r1, 0(r5) /* 8036D694 0036A5F4 38 21 FF F8 */ addi r1, r1, -8 /* 8036D698 0036A5F8 7F E8 03 A6 */ mtlr r31 -/* 8036D69C 0036A5FC 4E 80 00 21 */ blrl +/* 8036D69C 0036A5FC 4E 80 00 21 */ blrl /* 8036D6A0 0036A600 3C A0 80 5B */ lis r5, lbl_805A96C4@ha /* 8036D6A4 0036A604 38 A5 96 C4 */ addi r5, r5, lbl_805A96C4@l /* 8036D6A8 0036A608 80 25 00 00 */ lwz r1, 0(r5) @@ -603,7 +603,7 @@ __AICallbackStackSwitch: /* 8036D6B0 0036A610 83 E1 00 14 */ lwz r31, 0x14(r1) /* 8036D6B4 0036A614 38 21 00 18 */ addi r1, r1, 0x18 /* 8036D6B8 0036A618 7C 08 03 A6 */ mtlr r0 -/* 8036D6BC 0036A61C 4E 80 00 20 */ blr +/* 8036D6BC 0036A61C 4E 80 00 20 */ blr .global __AI_SRC_INIT __AI_SRC_INIT: @@ -739,5 +739,5 @@ lbl_8036D86C: /* 8036D894 0036A7F4 80 01 00 34 */ lwz r0, 0x34(r1) /* 8036D898 0036A7F8 38 21 00 30 */ addi r1, r1, 0x30 /* 8036D89C 0036A7FC 7C 08 03 A6 */ mtlr r0 -/* 8036D8A0 0036A800 4E 80 00 20 */ blr +/* 8036D8A0 0036A800 4E 80 00 20 */ blr diff --git a/asm/Dolphin/ar/ar.s b/asm/Dolphin/ar/ar.s index 798e80e5..cc12ff98 100644 --- a/asm/Dolphin/ar/ar.s +++ b/asm/Dolphin/ar/ar.s @@ -1,17 +1,17 @@ .include "macros.inc" -.section .data +.section .data .global ARVersionString ARVersionString: .asciz "<< Dolphin SDK - AR\trelease build: Sep 5 2002 05:34:27 (0x2301) >>" .4byte 0 - + .section .sdata .global lbl_805A8A70 lbl_805A8A70: .4byte ARVersionString .4byte 0 - + .section .sbss .global lbl_805A96F8 lbl_805A96F8: @@ -37,7 +37,7 @@ lbl_805A9710: .global lbl_805A9714 lbl_805A9714: .skip 0x4 - + .section .text, "ax" .global ARRegisterDMACallback @@ -58,7 +58,7 @@ ARRegisterDMACallback: /* 8036D8D8 0036A838 83 C1 00 10 */ lwz r30, 0x10(r1) /* 8036D8DC 0036A83C 38 21 00 18 */ addi r1, r1, 0x18 /* 8036D8E0 0036A840 7C 08 03 A6 */ mtlr r0 -/* 8036D8E4 0036A844 4E 80 00 20 */ blr +/* 8036D8E4 0036A844 4E 80 00 20 */ blr .global ARGetDMAStatus ARGetDMAStatus: @@ -76,7 +76,7 @@ ARGetDMAStatus: /* 8036D914 0036A874 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8036D918 0036A878 38 21 00 10 */ addi r1, r1, 0x10 /* 8036D91C 0036A87C 7C 08 03 A6 */ mtlr r0 -/* 8036D920 0036A880 4E 80 00 20 */ blr +/* 8036D920 0036A880 4E 80 00 20 */ blr .global ARStartDMA ARStartDMA: @@ -139,7 +139,7 @@ ARStartDMA: /* 8036DA04 0036A964 83 81 00 18 */ lwz r28, 0x18(r1) /* 8036DA08 0036A968 38 21 00 28 */ addi r1, r1, 0x28 /* 8036DA0C 0036A96C 7C 08 03 A6 */ mtlr r0 -/* 8036DA10 0036A970 4E 80 00 20 */ blr +/* 8036DA10 0036A970 4E 80 00 20 */ blr .global ARAlloc ARAlloc: @@ -168,7 +168,7 @@ ARAlloc: /* 8036DA6C 0036A9CC 83 C1 00 10 */ lwz r30, 0x10(r1) /* 8036DA70 0036A9D0 38 21 00 18 */ addi r1, r1, 0x18 /* 8036DA74 0036A9D4 7C 08 03 A6 */ mtlr r0 -/* 8036DA78 0036A9D8 4E 80 00 20 */ blr +/* 8036DA78 0036A9D8 4E 80 00 20 */ blr .global ARFree ARFree: @@ -201,7 +201,7 @@ lbl_8036DAB4: /* 8036DAE0 0036AA40 83 E1 00 14 */ lwz r31, 0x14(r1) /* 8036DAE4 0036AA44 38 21 00 18 */ addi r1, r1, 0x18 /* 8036DAE8 0036AA48 7C 08 03 A6 */ mtlr r0 -/* 8036DAEC 0036AA4C 4E 80 00 20 */ blr +/* 8036DAEC 0036AA4C 4E 80 00 20 */ blr .global ARInit ARInit: @@ -255,17 +255,17 @@ lbl_8036DB98: /* 8036DBA4 0036AB04 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8036DBA8 0036AB08 38 21 00 20 */ addi r1, r1, 0x20 /* 8036DBAC 0036AB0C 7C 08 03 A6 */ mtlr r0 -/* 8036DBB0 0036AB10 4E 80 00 20 */ blr +/* 8036DBB0 0036AB10 4E 80 00 20 */ blr .global ARGetBaseAddress ARGetBaseAddress: /* 8036DBB4 0036AB14 38 60 40 00 */ li r3, 0x4000 -/* 8036DBB8 0036AB18 4E 80 00 20 */ blr +/* 8036DBB8 0036AB18 4E 80 00 20 */ blr .global ARGetSize ARGetSize: /* 8036DBBC 0036AB1C 80 6D AB 3C */ lwz r3, lbl_805A96FC@sda21(r13) -/* 8036DBC0 0036AB20 4E 80 00 20 */ blr +/* 8036DBC0 0036AB20 4E 80 00 20 */ blr .global __ARHandler __ARHandler: @@ -289,7 +289,7 @@ __ARHandler: /* 8036DC08 0036AB68 28 0C 00 00 */ cmplwi r12, 0 /* 8036DC0C 0036AB6C 41 82 00 0C */ beq lbl_8036DC18 /* 8036DC10 0036AB70 7D 88 03 A6 */ mtlr r12 -/* 8036DC14 0036AB74 4E 80 00 21 */ blrl +/* 8036DC14 0036AB74 4E 80 00 21 */ blrl lbl_8036DC18: /* 8036DC18 0036AB78 38 61 00 10 */ addi r3, r1, 0x10 /* 8036DC1C 0036AB7C 48 01 19 F9 */ bl OSClearContext @@ -299,7 +299,7 @@ lbl_8036DC18: /* 8036DC2C 0036AB8C 83 E1 02 DC */ lwz r31, 0x2dc(r1) /* 8036DC30 0036AB90 38 21 02 E0 */ addi r1, r1, 0x2e0 /* 8036DC34 0036AB94 7C 08 03 A6 */ mtlr r0 -/* 8036DC38 0036AB98 4E 80 00 20 */ blr +/* 8036DC38 0036AB98 4E 80 00 20 */ blr .global __ARChecksize __ARChecksize: @@ -415,7 +415,7 @@ lbl_8036DC54: /* 8036DDEC 0036AD4C B0 17 50 28 */ sth r0, 0x5028(r23) /* 8036DDF0 0036AD50 A0 17 50 28 */ lhz r0, 0x5028(r23) /* 8036DDF4 0036AD54 54 00 00 2A */ rlwinm r0, r0, 0, 0, 0x15 -/* 8036DDF8 0036AD58 60 00 00 00 */ nop +/* 8036DDF8 0036AD58 60 00 00 00 */ nop /* 8036DDFC 0036AD5C B4 1E 00 28 */ sthu r0, 0x28(r30) /* 8036DE00 0036AD60 A0 17 50 2A */ lhz r0, 0x502a(r23) /* 8036DE04 0036AD64 54 00 06 DE */ rlwinm r0, r0, 0, 0x1b, 0xf @@ -459,7 +459,7 @@ lbl_8036DE10: /* 8036DE98 0036ADF8 B0 1E 00 00 */ sth r0, 0(r30) /* 8036DE9C 0036ADFC A0 1E 00 00 */ lhz r0, 0(r30) /* 8036DEA0 0036AE00 54 00 00 2A */ rlwinm r0, r0, 0, 0, 0x15 -/* 8036DEA4 0036AE04 60 00 00 00 */ nop +/* 8036DEA4 0036AE04 60 00 00 00 */ nop /* 8036DEA8 0036AE08 B0 1E 00 00 */ sth r0, 0(r30) /* 8036DEAC 0036AE0C A0 1D 00 00 */ lhz r0, 0(r29) /* 8036DEB0 0036AE10 54 00 06 DE */ rlwinm r0, r0, 0, 0x1b, 0xf @@ -508,7 +508,7 @@ lbl_8036DEBC: /* 8036DF58 0036AEB8 B0 1E 00 00 */ sth r0, 0(r30) /* 8036DF5C 0036AEBC A0 1E 00 00 */ lhz r0, 0(r30) /* 8036DF60 0036AEC0 54 00 00 2A */ rlwinm r0, r0, 0, 0, 0x15 -/* 8036DF64 0036AEC4 60 00 00 00 */ nop +/* 8036DF64 0036AEC4 60 00 00 00 */ nop /* 8036DF68 0036AEC8 B0 1E 00 00 */ sth r0, 0(r30) /* 8036DF6C 0036AECC A0 1D 00 00 */ lhz r0, 0(r29) /* 8036DF70 0036AED0 54 00 06 DE */ rlwinm r0, r0, 0, 0x1b, 0xf @@ -561,7 +561,7 @@ lbl_8036DF7C: /* 8036E028 0036AF88 B0 1E 00 00 */ sth r0, 0(r30) /* 8036E02C 0036AF8C A0 1E 00 00 */ lhz r0, 0(r30) /* 8036E030 0036AF90 54 00 00 2A */ rlwinm r0, r0, 0, 0, 0x15 -/* 8036E034 0036AF94 60 00 00 00 */ nop +/* 8036E034 0036AF94 60 00 00 00 */ nop /* 8036E038 0036AF98 B0 1E 00 00 */ sth r0, 0(r30) /* 8036E03C 0036AF9C A0 1D 00 00 */ lhz r0, 0(r29) /* 8036E040 0036AFA0 54 00 06 DE */ rlwinm r0, r0, 0, 0x1b, 0xf @@ -612,7 +612,7 @@ lbl_8036E04C: /* 8036E0F0 0036B050 B0 1E 00 00 */ sth r0, 0(r30) /* 8036E0F4 0036B054 A0 1E 00 00 */ lhz r0, 0(r30) /* 8036E0F8 0036B058 54 00 00 2A */ rlwinm r0, r0, 0, 0, 0x15 -/* 8036E0FC 0036B05C 60 00 00 00 */ nop +/* 8036E0FC 0036B05C 60 00 00 00 */ nop /* 8036E100 0036B060 B0 1E 00 00 */ sth r0, 0(r30) /* 8036E104 0036B064 A0 1D 00 00 */ lhz r0, 0(r29) /* 8036E108 0036B068 54 00 06 DE */ rlwinm r0, r0, 0, 0x1b, 0xf @@ -667,7 +667,7 @@ lbl_8036E114: /* 8036E1C8 0036B128 B0 1E 00 00 */ sth r0, 0(r30) /* 8036E1CC 0036B12C A0 1E 00 00 */ lhz r0, 0(r30) /* 8036E1D0 0036B130 54 00 00 2A */ rlwinm r0, r0, 0, 0, 0x15 -/* 8036E1D4 0036B134 60 00 00 00 */ nop +/* 8036E1D4 0036B134 60 00 00 00 */ nop /* 8036E1D8 0036B138 B0 1E 00 00 */ sth r0, 0(r30) /* 8036E1DC 0036B13C A0 1D 00 00 */ lhz r0, 0(r29) /* 8036E1E0 0036B140 54 00 06 DE */ rlwinm r0, r0, 0, 0x1b, 0xf @@ -722,7 +722,7 @@ lbl_8036E1EC: /* 8036E2A0 0036B200 B0 1E 00 00 */ sth r0, 0(r30) /* 8036E2A4 0036B204 A0 1E 00 00 */ lhz r0, 0(r30) /* 8036E2A8 0036B208 54 00 00 2A */ rlwinm r0, r0, 0, 0, 0x15 -/* 8036E2AC 0036B20C 60 00 00 00 */ nop +/* 8036E2AC 0036B20C 60 00 00 00 */ nop /* 8036E2B0 0036B210 B0 1E 00 00 */ sth r0, 0(r30) /* 8036E2B4 0036B214 A0 1D 00 00 */ lhz r0, 0(r29) /* 8036E2B8 0036B218 54 00 06 DE */ rlwinm r0, r0, 0, 0x1b, 0xf @@ -763,7 +763,7 @@ lbl_8036E2C4: /* 8036E340 0036B2A0 B0 1E 00 00 */ sth r0, 0(r30) /* 8036E344 0036B2A4 A0 1E 00 00 */ lhz r0, 0(r30) /* 8036E348 0036B2A8 54 00 00 2A */ rlwinm r0, r0, 0, 0, 0x15 -/* 8036E34C 0036B2AC 60 00 00 00 */ nop +/* 8036E34C 0036B2AC 60 00 00 00 */ nop /* 8036E350 0036B2B0 B0 1E 00 00 */ sth r0, 0(r30) /* 8036E354 0036B2B4 A0 1D 00 00 */ lhz r0, 0(r29) /* 8036E358 0036B2B8 54 00 06 DE */ rlwinm r0, r0, 0, 0x1b, 0xf @@ -801,7 +801,7 @@ lbl_8036E364: /* 8036E3D4 0036B334 B0 1E 00 00 */ sth r0, 0(r30) /* 8036E3D8 0036B338 A0 1E 00 00 */ lhz r0, 0(r30) /* 8036E3DC 0036B33C 54 00 00 2A */ rlwinm r0, r0, 0, 0, 0x15 -/* 8036E3E0 0036B340 60 00 00 00 */ nop +/* 8036E3E0 0036B340 60 00 00 00 */ nop /* 8036E3E4 0036B344 B0 1E 00 00 */ sth r0, 0(r30) /* 8036E3E8 0036B348 A0 1D 00 00 */ lhz r0, 0(r29) /* 8036E3EC 0036B34C 54 00 06 DE */ rlwinm r0, r0, 0, 0x1b, 0xf @@ -846,7 +846,7 @@ lbl_8036E3F8: /* 8036E484 0036B3E4 B0 1E 00 00 */ sth r0, 0(r30) /* 8036E488 0036B3E8 A0 1E 00 00 */ lhz r0, 0(r30) /* 8036E48C 0036B3EC 54 00 00 2A */ rlwinm r0, r0, 0, 0, 0x15 -/* 8036E490 0036B3F0 60 00 00 00 */ nop +/* 8036E490 0036B3F0 60 00 00 00 */ nop /* 8036E494 0036B3F4 B0 1E 00 00 */ sth r0, 0(r30) /* 8036E498 0036B3F8 A0 1D 00 00 */ lhz r0, 0(r29) /* 8036E49C 0036B3FC 54 00 06 DE */ rlwinm r0, r0, 0, 0x1b, 0xf @@ -889,7 +889,7 @@ lbl_8036E4A8: /* 8036E52C 0036B48C B0 1E 00 00 */ sth r0, 0(r30) /* 8036E530 0036B490 A0 1E 00 00 */ lhz r0, 0(r30) /* 8036E534 0036B494 54 00 00 2A */ rlwinm r0, r0, 0, 0, 0x15 -/* 8036E538 0036B498 60 00 00 00 */ nop +/* 8036E538 0036B498 60 00 00 00 */ nop /* 8036E53C 0036B49C B0 1E 00 00 */ sth r0, 0(r30) /* 8036E540 0036B4A0 A0 1D 00 00 */ lhz r0, 0(r29) /* 8036E544 0036B4A4 54 00 06 DE */ rlwinm r0, r0, 0, 0x1b, 0xf @@ -931,7 +931,7 @@ lbl_8036E580: /* 8036E5CC 0036B52C B0 1E 00 00 */ sth r0, 0(r30) /* 8036E5D0 0036B530 A0 1E 00 00 */ lhz r0, 0(r30) /* 8036E5D4 0036B534 54 00 00 2A */ rlwinm r0, r0, 0, 0, 0x15 -/* 8036E5D8 0036B538 60 00 00 00 */ nop +/* 8036E5D8 0036B538 60 00 00 00 */ nop /* 8036E5DC 0036B53C B0 1E 00 00 */ sth r0, 0(r30) /* 8036E5E0 0036B540 A0 1D 00 00 */ lhz r0, 0(r29) /* 8036E5E4 0036B544 54 00 06 DE */ rlwinm r0, r0, 0, 0x1b, 0xf @@ -969,7 +969,7 @@ lbl_8036E5F0: /* 8036E660 0036B5C0 B0 1E 00 00 */ sth r0, 0(r30) /* 8036E664 0036B5C4 A0 1E 00 00 */ lhz r0, 0(r30) /* 8036E668 0036B5C8 54 00 00 2A */ rlwinm r0, r0, 0, 0, 0x15 -/* 8036E66C 0036B5CC 60 00 00 00 */ nop +/* 8036E66C 0036B5CC 60 00 00 00 */ nop /* 8036E670 0036B5D0 B0 1E 00 00 */ sth r0, 0(r30) /* 8036E674 0036B5D4 A0 1D 00 00 */ lhz r0, 0(r29) /* 8036E678 0036B5D8 54 00 06 DE */ rlwinm r0, r0, 0, 0x1b, 0xf @@ -1014,7 +1014,7 @@ lbl_8036E684: /* 8036E710 0036B670 B0 1E 00 00 */ sth r0, 0(r30) /* 8036E714 0036B674 A0 1E 00 00 */ lhz r0, 0(r30) /* 8036E718 0036B678 54 00 00 2A */ rlwinm r0, r0, 0, 0, 0x15 -/* 8036E71C 0036B67C 60 00 00 00 */ nop +/* 8036E71C 0036B67C 60 00 00 00 */ nop /* 8036E720 0036B680 B0 1E 00 00 */ sth r0, 0(r30) /* 8036E724 0036B684 A0 1D 00 00 */ lhz r0, 0(r29) /* 8036E728 0036B688 54 00 06 DE */ rlwinm r0, r0, 0, 0x1b, 0xf @@ -1057,7 +1057,7 @@ lbl_8036E734: /* 8036E7B8 0036B718 B0 1E 00 00 */ sth r0, 0(r30) /* 8036E7BC 0036B71C A0 1E 00 00 */ lhz r0, 0(r30) /* 8036E7C0 0036B720 54 00 00 2A */ rlwinm r0, r0, 0, 0, 0x15 -/* 8036E7C4 0036B724 60 00 00 00 */ nop +/* 8036E7C4 0036B724 60 00 00 00 */ nop /* 8036E7C8 0036B728 B0 1E 00 00 */ sth r0, 0(r30) /* 8036E7CC 0036B72C A0 1D 00 00 */ lhz r0, 0(r29) /* 8036E7D0 0036B730 54 00 06 DE */ rlwinm r0, r0, 0, 0x1b, 0xf @@ -1095,7 +1095,7 @@ lbl_8036E7DC: /* 8036E84C 0036B7AC B0 1E 00 00 */ sth r0, 0(r30) /* 8036E850 0036B7B0 A0 1E 00 00 */ lhz r0, 0(r30) /* 8036E854 0036B7B4 54 00 00 2A */ rlwinm r0, r0, 0, 0, 0x15 -/* 8036E858 0036B7B8 60 00 00 00 */ nop +/* 8036E858 0036B7B8 60 00 00 00 */ nop /* 8036E85C 0036B7BC B0 1E 00 00 */ sth r0, 0(r30) /* 8036E860 0036B7C0 A0 1D 00 00 */ lhz r0, 0(r29) /* 8036E864 0036B7C4 54 00 06 DE */ rlwinm r0, r0, 0, 0x1b, 0xf @@ -1142,7 +1142,7 @@ lbl_8036E8AC: /* 8036E900 0036B860 B0 1E 00 00 */ sth r0, 0(r30) /* 8036E904 0036B864 A0 1E 00 00 */ lhz r0, 0(r30) /* 8036E908 0036B868 54 00 00 2A */ rlwinm r0, r0, 0, 0, 0x15 -/* 8036E90C 0036B86C 60 00 00 00 */ nop +/* 8036E90C 0036B86C 60 00 00 00 */ nop /* 8036E910 0036B870 B0 1E 00 00 */ sth r0, 0(r30) /* 8036E914 0036B874 A0 1D 00 00 */ lhz r0, 0(r29) /* 8036E918 0036B878 54 00 06 DE */ rlwinm r0, r0, 0, 0x1b, 0xf @@ -1180,7 +1180,7 @@ lbl_8036E924: /* 8036E994 0036B8F4 B0 1E 00 00 */ sth r0, 0(r30) /* 8036E998 0036B8F8 A0 1E 00 00 */ lhz r0, 0(r30) /* 8036E99C 0036B8FC 54 00 00 2A */ rlwinm r0, r0, 0, 0, 0x15 -/* 8036E9A0 0036B900 60 00 00 00 */ nop +/* 8036E9A0 0036B900 60 00 00 00 */ nop /* 8036E9A4 0036B904 B0 1E 00 00 */ sth r0, 0(r30) /* 8036E9A8 0036B908 A0 1D 00 00 */ lhz r0, 0(r29) /* 8036E9AC 0036B90C 54 00 06 DE */ rlwinm r0, r0, 0, 0x1b, 0xf @@ -1227,7 +1227,7 @@ lbl_8036E9B8: /* 8036EA4C 0036B9AC B0 1E 00 00 */ sth r0, 0(r30) /* 8036EA50 0036B9B0 A0 1E 00 00 */ lhz r0, 0(r30) /* 8036EA54 0036B9B4 54 00 00 2A */ rlwinm r0, r0, 0, 0, 0x15 -/* 8036EA58 0036B9B8 60 00 00 00 */ nop +/* 8036EA58 0036B9B8 60 00 00 00 */ nop /* 8036EA5C 0036B9BC B0 1E 00 00 */ sth r0, 0(r30) /* 8036EA60 0036B9C0 A0 1D 00 00 */ lhz r0, 0(r29) /* 8036EA64 0036B9C4 54 00 06 DE */ rlwinm r0, r0, 0, 0x1b, 0xf @@ -1270,7 +1270,7 @@ lbl_8036EA70: /* 8036EAF4 0036BA54 B0 1E 00 00 */ sth r0, 0(r30) /* 8036EAF8 0036BA58 A0 1E 00 00 */ lhz r0, 0(r30) /* 8036EAFC 0036BA5C 54 00 00 2A */ rlwinm r0, r0, 0, 0, 0x15 -/* 8036EB00 0036BA60 60 00 00 00 */ nop +/* 8036EB00 0036BA60 60 00 00 00 */ nop /* 8036EB04 0036BA64 B0 1E 00 00 */ sth r0, 0(r30) /* 8036EB08 0036BA68 A0 1D 00 00 */ lhz r0, 0(r29) /* 8036EB0C 0036BA6C 54 00 06 DE */ rlwinm r0, r0, 0, 0x1b, 0xf @@ -1308,7 +1308,7 @@ lbl_8036EB18: /* 8036EB88 0036BAE8 B0 1E 00 00 */ sth r0, 0(r30) /* 8036EB8C 0036BAEC A0 1E 00 00 */ lhz r0, 0(r30) /* 8036EB90 0036BAF0 54 00 00 2A */ rlwinm r0, r0, 0, 0, 0x15 -/* 8036EB94 0036BAF4 60 00 00 00 */ nop +/* 8036EB94 0036BAF4 60 00 00 00 */ nop /* 8036EB98 0036BAF8 B0 1E 00 00 */ sth r0, 0(r30) /* 8036EB9C 0036BAFC A0 1D 00 00 */ lhz r0, 0(r29) /* 8036EBA0 0036BB00 54 00 06 DE */ rlwinm r0, r0, 0, 0x1b, 0xf @@ -1346,7 +1346,7 @@ lbl_8036EBAC: /* 8036EC1C 0036BB7C B0 1E 00 00 */ sth r0, 0(r30) /* 8036EC20 0036BB80 A0 1E 00 00 */ lhz r0, 0(r30) /* 8036EC24 0036BB84 54 00 00 2A */ rlwinm r0, r0, 0, 0, 0x15 -/* 8036EC28 0036BB88 60 00 00 00 */ nop +/* 8036EC28 0036BB88 60 00 00 00 */ nop /* 8036EC2C 0036BB8C B0 1E 00 00 */ sth r0, 0(r30) /* 8036EC30 0036BB90 A0 1D 00 00 */ lhz r0, 0(r29) /* 8036EC34 0036BB94 54 00 06 DE */ rlwinm r0, r0, 0, 0x1b, 0xf @@ -1393,7 +1393,7 @@ lbl_8036EC7C: /* 8036ECD0 0036BC30 B0 1E 00 00 */ sth r0, 0(r30) /* 8036ECD4 0036BC34 A0 1E 00 00 */ lhz r0, 0(r30) /* 8036ECD8 0036BC38 54 00 00 2A */ rlwinm r0, r0, 0, 0, 0x15 -/* 8036ECDC 0036BC3C 60 00 00 00 */ nop +/* 8036ECDC 0036BC3C 60 00 00 00 */ nop /* 8036ECE0 0036BC40 B0 1E 00 00 */ sth r0, 0(r30) /* 8036ECE4 0036BC44 A0 1D 00 00 */ lhz r0, 0(r29) /* 8036ECE8 0036BC48 54 00 06 DE */ rlwinm r0, r0, 0, 0x1b, 0xf @@ -1431,7 +1431,7 @@ lbl_8036ECF4: /* 8036ED64 0036BCC4 B0 1E 00 00 */ sth r0, 0(r30) /* 8036ED68 0036BCC8 A0 1E 00 00 */ lhz r0, 0(r30) /* 8036ED6C 0036BCCC 54 00 00 2A */ rlwinm r0, r0, 0, 0, 0x15 -/* 8036ED70 0036BCD0 60 00 00 00 */ nop +/* 8036ED70 0036BCD0 60 00 00 00 */ nop /* 8036ED74 0036BCD4 B0 1E 00 00 */ sth r0, 0(r30) /* 8036ED78 0036BCD8 A0 1D 00 00 */ lhz r0, 0(r29) /* 8036ED7C 0036BCDC 54 00 06 DE */ rlwinm r0, r0, 0, 0x1b, 0xf @@ -1478,7 +1478,7 @@ lbl_8036ED88: /* 8036EE1C 0036BD7C B0 1E 00 00 */ sth r0, 0(r30) /* 8036EE20 0036BD80 A0 1E 00 00 */ lhz r0, 0(r30) /* 8036EE24 0036BD84 54 00 00 2A */ rlwinm r0, r0, 0, 0, 0x15 -/* 8036EE28 0036BD88 60 00 00 00 */ nop +/* 8036EE28 0036BD88 60 00 00 00 */ nop /* 8036EE2C 0036BD8C B0 1E 00 00 */ sth r0, 0(r30) /* 8036EE30 0036BD90 A0 1D 00 00 */ lhz r0, 0(r29) /* 8036EE34 0036BD94 54 00 06 DE */ rlwinm r0, r0, 0, 0x1b, 0xf @@ -1521,7 +1521,7 @@ lbl_8036EE40: /* 8036EEC4 0036BE24 B0 1E 00 00 */ sth r0, 0(r30) /* 8036EEC8 0036BE28 A0 1E 00 00 */ lhz r0, 0(r30) /* 8036EECC 0036BE2C 54 00 00 2A */ rlwinm r0, r0, 0, 0, 0x15 -/* 8036EED0 0036BE30 60 00 00 00 */ nop +/* 8036EED0 0036BE30 60 00 00 00 */ nop /* 8036EED4 0036BE34 B0 1E 00 00 */ sth r0, 0(r30) /* 8036EED8 0036BE38 A0 1D 00 00 */ lhz r0, 0(r29) /* 8036EEDC 0036BE3C 54 00 06 DE */ rlwinm r0, r0, 0, 0x1b, 0xf @@ -1559,7 +1559,7 @@ lbl_8036EEE8: /* 8036EF58 0036BEB8 B0 1E 00 00 */ sth r0, 0(r30) /* 8036EF5C 0036BEBC A0 1E 00 00 */ lhz r0, 0(r30) /* 8036EF60 0036BEC0 54 00 00 2A */ rlwinm r0, r0, 0, 0, 0x15 -/* 8036EF64 0036BEC4 60 00 00 00 */ nop +/* 8036EF64 0036BEC4 60 00 00 00 */ nop /* 8036EF68 0036BEC8 B0 1E 00 00 */ sth r0, 0(r30) /* 8036EF6C 0036BECC A0 1D 00 00 */ lhz r0, 0(r29) /* 8036EF70 0036BED0 54 00 06 DE */ rlwinm r0, r0, 0, 0x1b, 0xf @@ -1597,7 +1597,7 @@ lbl_8036EF7C: /* 8036EFEC 0036BF4C B0 1E 00 00 */ sth r0, 0(r30) /* 8036EFF0 0036BF50 A0 1E 00 00 */ lhz r0, 0(r30) /* 8036EFF4 0036BF54 54 00 00 2A */ rlwinm r0, r0, 0, 0, 0x15 -/* 8036EFF8 0036BF58 60 00 00 00 */ nop +/* 8036EFF8 0036BF58 60 00 00 00 */ nop /* 8036EFFC 0036BF5C B0 1E 00 00 */ sth r0, 0(r30) /* 8036F000 0036BF60 A0 1D 00 00 */ lhz r0, 0(r29) /* 8036F004 0036BF64 54 00 06 DE */ rlwinm r0, r0, 0, 0x1b, 0xf @@ -1637,7 +1637,7 @@ lbl_8036F010: /* 8036F088 0036BFE8 B0 1E 00 00 */ sth r0, 0(r30) /* 8036F08C 0036BFEC A0 1E 00 00 */ lhz r0, 0(r30) /* 8036F090 0036BFF0 54 00 00 2A */ rlwinm r0, r0, 0, 0, 0x15 -/* 8036F094 0036BFF4 60 00 00 00 */ nop +/* 8036F094 0036BFF4 60 00 00 00 */ nop /* 8036F098 0036BFF8 B0 1E 00 00 */ sth r0, 0(r30) /* 8036F09C 0036BFFC A0 1D 00 00 */ lhz r0, 0(r29) /* 8036F0A0 0036C000 54 00 06 DE */ rlwinm r0, r0, 0, 0x1b, 0xf @@ -1683,7 +1683,7 @@ lbl_8036F0E8: /* 8036F138 0036C098 B0 1E 00 00 */ sth r0, 0(r30) /* 8036F13C 0036C09C A0 1E 00 00 */ lhz r0, 0(r30) /* 8036F140 0036C0A0 54 00 00 2A */ rlwinm r0, r0, 0, 0, 0x15 -/* 8036F144 0036C0A4 60 00 00 00 */ nop +/* 8036F144 0036C0A4 60 00 00 00 */ nop /* 8036F148 0036C0A8 B0 1E 00 00 */ sth r0, 0(r30) /* 8036F14C 0036C0AC A0 1D 00 00 */ lhz r0, 0(r29) /* 8036F150 0036C0B0 54 00 06 DE */ rlwinm r0, r0, 0, 0x1b, 0xf @@ -1721,7 +1721,7 @@ lbl_8036F15C: /* 8036F1CC 0036C12C B0 1E 00 00 */ sth r0, 0(r30) /* 8036F1D0 0036C130 A0 1E 00 00 */ lhz r0, 0(r30) /* 8036F1D4 0036C134 54 00 00 2A */ rlwinm r0, r0, 0, 0, 0x15 -/* 8036F1D8 0036C138 60 00 00 00 */ nop +/* 8036F1D8 0036C138 60 00 00 00 */ nop /* 8036F1DC 0036C13C B0 1E 00 00 */ sth r0, 0(r30) /* 8036F1E0 0036C140 A0 1D 00 00 */ lhz r0, 0(r29) /* 8036F1E4 0036C144 54 00 06 DE */ rlwinm r0, r0, 0, 0x1b, 0xf @@ -1759,7 +1759,7 @@ lbl_8036F1F0: /* 8036F260 0036C1C0 B0 1E 00 00 */ sth r0, 0(r30) /* 8036F264 0036C1C4 A0 1E 00 00 */ lhz r0, 0(r30) /* 8036F268 0036C1C8 54 00 00 2A */ rlwinm r0, r0, 0, 0, 0x15 -/* 8036F26C 0036C1CC 60 00 00 00 */ nop +/* 8036F26C 0036C1CC 60 00 00 00 */ nop /* 8036F270 0036C1D0 B0 1E 00 00 */ sth r0, 0(r30) /* 8036F274 0036C1D4 A0 1D 00 00 */ lhz r0, 0(r29) /* 8036F278 0036C1D8 54 00 06 DE */ rlwinm r0, r0, 0, 0x1b, 0xf @@ -1799,7 +1799,7 @@ lbl_8036F284: /* 8036F2FC 0036C25C B0 1E 00 00 */ sth r0, 0(r30) /* 8036F300 0036C260 A0 1E 00 00 */ lhz r0, 0(r30) /* 8036F304 0036C264 54 00 00 2A */ rlwinm r0, r0, 0, 0, 0x15 -/* 8036F308 0036C268 60 00 00 00 */ nop +/* 8036F308 0036C268 60 00 00 00 */ nop /* 8036F30C 0036C26C B0 1E 00 00 */ sth r0, 0(r30) /* 8036F310 0036C270 A0 1D 00 00 */ lhz r0, 0(r29) /* 8036F314 0036C274 54 00 06 DE */ rlwinm r0, r0, 0, 0x1b, 0xf @@ -1839,7 +1839,7 @@ lbl_8036F320: /* 8036F398 0036C2F8 B0 1E 00 00 */ sth r0, 0(r30) /* 8036F39C 0036C2FC A0 1E 00 00 */ lhz r0, 0(r30) /* 8036F3A0 0036C300 54 00 00 2A */ rlwinm r0, r0, 0, 0, 0x15 -/* 8036F3A4 0036C304 60 00 00 00 */ nop +/* 8036F3A4 0036C304 60 00 00 00 */ nop /* 8036F3A8 0036C308 B0 1E 00 00 */ sth r0, 0(r30) /* 8036F3AC 0036C30C A0 1D 00 00 */ lhz r0, 0(r29) /* 8036F3B0 0036C310 54 00 06 DE */ rlwinm r0, r0, 0, 0x1b, 0xf @@ -1876,4 +1876,4 @@ lbl_8036F410: /* 8036F420 0036C380 B9 C1 02 78 */ lmw r14, 0x278(r1) /* 8036F424 0036C384 38 21 02 C0 */ addi r1, r1, 0x2c0 /* 8036F428 0036C388 7C 08 03 A6 */ mtlr r0 -/* 8036F42C 0036C38C 4E 80 00 20 */ blr +/* 8036F42C 0036C38C 4E 80 00 20 */ blr diff --git a/asm/Dolphin/ar/arq.s b/asm/Dolphin/ar/arq.s index bfa0ee96..722b6d27 100644 --- a/asm/Dolphin/ar/arq.s +++ b/asm/Dolphin/ar/arq.s @@ -5,14 +5,14 @@ ARQVersionString: .asciz "<< Dolphin SDK - ARQ\trelease build: Sep 5 2002 05:34:29 (0x2301) >>" .balign 4 - + .section .sdata .global lbl_805A8A78 lbl_805A8A78: .4byte ARQVersionString .4byte 0 - + .section .sbss .global lbl_805A9718 lbl_805A9718: @@ -119,11 +119,11 @@ lbl_8036F520: /* 8036F520 0036C480 80 01 00 0C */ lwz r0, 0xc(r1) /* 8036F524 0036C484 38 21 00 08 */ addi r1, r1, 8 /* 8036F528 0036C488 7C 08 03 A6 */ mtlr r0 -/* 8036F52C 0036C48C 4E 80 00 20 */ blr +/* 8036F52C 0036C48C 4E 80 00 20 */ blr .global __ARQCallbackHack __ARQCallbackHack: -/* 8036F530 0036C490 4E 80 00 20 */ blr +/* 8036F530 0036C490 4E 80 00 20 */ blr .global __ARQInterruptServiceRoutine __ARQInterruptServiceRoutine: @@ -135,7 +135,7 @@ __ARQInterruptServiceRoutine: /* 8036F548 0036C4A8 41 82 00 20 */ beq lbl_8036F568 /* 8036F54C 0036C4AC 80 6D AB 68 */ lwz r3, lbl_805A9728@sda21(r13) /* 8036F550 0036C4B0 7D 88 03 A6 */ mtlr r12 -/* 8036F554 0036C4B4 4E 80 00 21 */ blrl +/* 8036F554 0036C4B4 4E 80 00 21 */ blrl /* 8036F558 0036C4B8 38 00 00 00 */ li r0, 0 /* 8036F55C 0036C4BC 90 0D AB 68 */ stw r0, lbl_805A9728@sda21(r13) /* 8036F560 0036C4C0 90 0D AB 70 */ stw r0, lbl_805A9730@sda21(r13) @@ -146,7 +146,7 @@ lbl_8036F568: /* 8036F570 0036C4D0 41 82 00 1C */ beq lbl_8036F58C /* 8036F574 0036C4D4 80 6D AB 6C */ lwz r3, lbl_805A972C@sda21(r13) /* 8036F578 0036C4D8 7D 88 03 A6 */ mtlr r12 -/* 8036F57C 0036C4DC 4E 80 00 21 */ blrl +/* 8036F57C 0036C4DC 4E 80 00 21 */ blrl /* 8036F580 0036C4E0 38 00 00 00 */ li r0, 0 /* 8036F584 0036C4E4 90 0D AB 6C */ stw r0, lbl_805A972C@sda21(r13) /* 8036F588 0036C4E8 90 0D AB 74 */ stw r0, lbl_805A9734@sda21(r13) @@ -183,7 +183,7 @@ lbl_8036F5F0: /* 8036F5F0 0036C550 80 01 00 0C */ lwz r0, 0xc(r1) /* 8036F5F4 0036C554 38 21 00 08 */ addi r1, r1, 8 /* 8036F5F8 0036C558 7C 08 03 A6 */ mtlr r0 -/* 8036F5FC 0036C55C 4E 80 00 20 */ blr +/* 8036F5FC 0036C55C 4E 80 00 20 */ blr .global ARQInit ARQInit: @@ -215,7 +215,7 @@ lbl_8036F65C: /* 8036F660 0036C5C0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8036F664 0036C5C4 38 21 00 10 */ addi r1, r1, 0x10 /* 8036F668 0036C5C8 7C 08 03 A6 */ mtlr r0 -/* 8036F66C 0036C5CC 4E 80 00 20 */ blr +/* 8036F66C 0036C5CC 4E 80 00 20 */ blr .global ARQPostRequest ARQPostRequest: @@ -318,9 +318,9 @@ lbl_8036F7A8: /* 8036F7BC 0036C71C 83 A1 00 2C */ lwz r29, 0x2c(r1) /* 8036F7C0 0036C720 38 21 00 38 */ addi r1, r1, 0x38 /* 8036F7C4 0036C724 7C 08 03 A6 */ mtlr r0 -/* 8036F7C8 0036C728 4E 80 00 20 */ blr +/* 8036F7C8 0036C728 4E 80 00 20 */ blr .global ARQGetChunkSize ARQGetChunkSize: /* 8036F7CC 0036C72C 80 6D AB 78 */ lwz r3, __ARQChunkSize@sda21(r13) -/* 8036F7D0 0036C730 4E 80 00 20 */ blr +/* 8036F7D0 0036C730 4E 80 00 20 */ blr diff --git a/asm/Dolphin/card/CARDBios.s b/asm/Dolphin/card/CARDBios.s index fa708934..2c7d731e 100644 --- a/asm/Dolphin/card/CARDBios.s +++ b/asm/Dolphin/card/CARDBios.s @@ -4,7 +4,7 @@ .global lbl_80569A58 lbl_80569A58: .skip 0x220 - + .section .data, "wa" lbl_803F6C90: .asciz "<< Dolphin SDK - CARD\trelease build: Sep 5 2002 05:35:20 (0x2301) >>" @@ -23,18 +23,18 @@ lbl_803F6CD8: lbl_805A8BF0: .4byte lbl_803F6C90 .skip 4 - + .section .sbss, "wa" .balign 4 .global lbl_805A9BC8 lbl_805A9BC8: .skip 0x8 - + .section .text, "ax" .global __CARDDefaultApiCallback __CARDDefaultApiCallback: -/* 803B7E74 003B4DD4 4E 80 00 20 */ blr +/* 803B7E74 003B4DD4 4E 80 00 20 */ blr .global __CARDExtHandler __CARDExtHandler: @@ -67,7 +67,7 @@ __CARDExtHandler: /* 803B7EE0 003B4E40 7D 88 03 A6 */ mtlr r12 /* 803B7EE4 003B4E44 38 7D 00 00 */ addi r3, r29, 0 /* 803B7EE8 003B4E48 38 80 FF FD */ li r4, -3 -/* 803B7EEC 003B4E4C 4E 80 00 21 */ blrl +/* 803B7EEC 003B4E4C 4E 80 00 21 */ blrl lbl_803B7EF0: /* 803B7EF0 003B4E50 80 1E 00 04 */ lwz r0, 4(r30) /* 803B7EF4 003B4E54 2C 00 FF FF */ cmpwi r0, -1 @@ -86,7 +86,7 @@ lbl_803B7F04: /* 803B7F24 003B4E84 90 1E 00 C4 */ stw r0, 0xc4(r30) /* 803B7F28 003B4E88 38 7D 00 00 */ addi r3, r29, 0 /* 803B7F2C 003B4E8C 38 80 FF FD */ li r4, -3 -/* 803B7F30 003B4E90 4E 80 00 21 */ blrl +/* 803B7F30 003B4E90 4E 80 00 21 */ blrl lbl_803B7F34: /* 803B7F34 003B4E94 80 01 00 24 */ lwz r0, 0x24(r1) /* 803B7F38 003B4E98 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -94,7 +94,7 @@ lbl_803B7F34: /* 803B7F40 003B4EA0 83 A1 00 14 */ lwz r29, 0x14(r1) /* 803B7F44 003B4EA4 38 21 00 20 */ addi r1, r1, 0x20 /* 803B7F48 003B4EA8 7C 08 03 A6 */ mtlr r0 -/* 803B7F4C 003B4EAC 4E 80 00 20 */ blr +/* 803B7F4C 003B4EAC 4E 80 00 20 */ blr .global __CARDExiHandler __CARDExiHandler: @@ -165,7 +165,7 @@ lbl_803B8024: /* 803B803C 003B4F9C 90 1E 00 CC */ stw r0, 0xcc(r30) /* 803B8040 003B4FA0 38 7F 00 00 */ addi r3, r31, 0 /* 803B8044 003B4FA4 38 9D 00 00 */ addi r4, r29, 0 -/* 803B8048 003B4FA8 4E 80 00 21 */ blrl +/* 803B8048 003B4FA8 4E 80 00 21 */ blrl lbl_803B804C: /* 803B804C 003B4FAC 80 01 00 2C */ lwz r0, 0x2c(r1) /* 803B8050 003B4FB0 83 E1 00 24 */ lwz r31, 0x24(r1) @@ -173,7 +173,7 @@ lbl_803B804C: /* 803B8058 003B4FB8 83 A1 00 1C */ lwz r29, 0x1c(r1) /* 803B805C 003B4FBC 38 21 00 28 */ addi r1, r1, 0x28 /* 803B8060 003B4FC0 7C 08 03 A6 */ mtlr r0 -/* 803B8064 003B4FC4 4E 80 00 20 */ blr +/* 803B8064 003B4FC4 4E 80 00 20 */ blr .global __CARDTxHandler __CARDTxHandler: @@ -216,13 +216,13 @@ lbl_803B80EC: /* 803B80EC 003B504C 39 9C 00 00 */ addi r12, r28, 0 /* 803B80F0 003B5050 7D 88 03 A6 */ mtlr r12 /* 803B80F4 003B5054 38 7B 00 00 */ addi r3, r27, 0 -/* 803B80F8 003B5058 4E 80 00 21 */ blrl +/* 803B80F8 003B5058 4E 80 00 21 */ blrl lbl_803B80FC: /* 803B80FC 003B505C BB 61 00 14 */ lmw r27, 0x14(r1) /* 803B8100 003B5060 80 01 00 2C */ lwz r0, 0x2c(r1) /* 803B8104 003B5064 38 21 00 28 */ addi r1, r1, 0x28 /* 803B8108 003B5068 7C 08 03 A6 */ mtlr r0 -/* 803B810C 003B506C 4E 80 00 20 */ blr +/* 803B810C 003B506C 4E 80 00 20 */ blr .global __CARDUnlockedHandler __CARDUnlockedHandler: @@ -254,14 +254,14 @@ lbl_803B816C: /* 803B816C 003B50CC 39 9F 00 00 */ addi r12, r31, 0 /* 803B8170 003B50D0 7D 88 03 A6 */ mtlr r12 /* 803B8174 003B50D4 38 7E 00 00 */ addi r3, r30, 0 -/* 803B8178 003B50D8 4E 80 00 21 */ blrl +/* 803B8178 003B50D8 4E 80 00 21 */ blrl lbl_803B817C: /* 803B817C 003B50DC 80 01 00 1C */ lwz r0, 0x1c(r1) /* 803B8180 003B50E0 83 E1 00 14 */ lwz r31, 0x14(r1) /* 803B8184 003B50E4 83 C1 00 10 */ lwz r30, 0x10(r1) /* 803B8188 003B50E8 38 21 00 18 */ addi r1, r1, 0x18 /* 803B818C 003B50EC 7C 08 03 A6 */ mtlr r0 -/* 803B8190 003B50F0 4E 80 00 20 */ blr +/* 803B8190 003B50F0 4E 80 00 20 */ blr .global __CARDEnableInterrupt __CARDEnableInterrupt: @@ -317,7 +317,7 @@ lbl_803B823C: /* 803B8244 003B51A4 83 C1 00 18 */ lwz r30, 0x18(r1) /* 803B8248 003B51A8 38 21 00 20 */ addi r1, r1, 0x20 /* 803B824C 003B51AC 7C 08 03 A6 */ mtlr r0 -/* 803B8250 003B51B0 4E 80 00 20 */ blr +/* 803B8250 003B51B0 4E 80 00 20 */ blr .global __CARDReadStatus __CARDReadStatus: @@ -383,7 +383,7 @@ lbl_803B8328: /* 803B8334 003B5294 83 A1 00 1C */ lwz r29, 0x1c(r1) /* 803B8338 003B5298 38 21 00 28 */ addi r1, r1, 0x28 /* 803B833C 003B529C 7C 08 03 A6 */ mtlr r0 -/* 803B8340 003B52A0 4E 80 00 20 */ blr +/* 803B8340 003B52A0 4E 80 00 20 */ blr .global __CARDClearStatus __CARDClearStatus: @@ -432,7 +432,7 @@ lbl_803B83D8: /* 803B83E0 003B5340 83 C1 00 10 */ lwz r30, 0x10(r1) /* 803B83E4 003B5344 38 21 00 18 */ addi r1, r1, 0x18 /* 803B83E8 003B5348 7C 08 03 A6 */ mtlr r0 -/* 803B83EC 003B534C 4E 80 00 20 */ blr +/* 803B83EC 003B534C 4E 80 00 20 */ blr .global TimeoutHandler TimeoutHandler: @@ -471,14 +471,14 @@ lbl_803B843C: /* 803B846C 003B53CC 90 1E 00 CC */ stw r0, 0xcc(r30) /* 803B8470 003B53D0 38 7F 00 00 */ addi r3, r31, 0 /* 803B8474 003B53D4 38 80 FF FB */ li r4, -5 -/* 803B8478 003B53D8 4E 80 00 21 */ blrl +/* 803B8478 003B53D8 4E 80 00 21 */ blrl lbl_803B847C: /* 803B847C 003B53DC 80 01 00 1C */ lwz r0, 0x1c(r1) /* 803B8480 003B53E0 83 E1 00 14 */ lwz r31, 0x14(r1) /* 803B8484 003B53E4 83 C1 00 10 */ lwz r30, 0x10(r1) /* 803B8488 003B53E8 38 21 00 18 */ addi r1, r1, 0x18 /* 803B848C 003B53EC 7C 08 03 A6 */ mtlr r0 -/* 803B8490 003B53F0 4E 80 00 20 */ blr +/* 803B8490 003B53F0 4E 80 00 20 */ blr .global Retry Retry: @@ -632,7 +632,7 @@ lbl_803B86A8: /* 803B86B0 003B5610 83 C1 00 10 */ lwz r30, 0x10(r1) /* 803B86B4 003B5614 38 21 00 18 */ addi r1, r1, 0x18 /* 803B86B8 003B5618 7C 08 03 A6 */ mtlr r0 -/* 803B86BC 003B561C 4E 80 00 20 */ blr +/* 803B86BC 003B561C 4E 80 00 20 */ blr .global UnlockedCallback UnlockedCallback: @@ -692,7 +692,7 @@ lbl_803B8770: /* 803B8784 003B56E4 7D 88 03 A6 */ mtlr r12 /* 803B8788 003B56E8 90 1E 00 C8 */ stw r0, 0xc8(r30) /* 803B878C 003B56EC 7F E3 FB 78 */ mr r3, r31 -/* 803B8790 003B56F0 4E 80 00 21 */ blrl +/* 803B8790 003B56F0 4E 80 00 21 */ blrl /* 803B8794 003B56F4 48 00 00 24 */ b lbl_803B87B8 lbl_803B8798: /* 803B8798 003B56F8 81 9E 00 CC */ lwz r12, 0xcc(r30) @@ -702,14 +702,14 @@ lbl_803B8798: /* 803B87A8 003B5708 7D 88 03 A6 */ mtlr r12 /* 803B87AC 003B570C 90 1E 00 CC */ stw r0, 0xcc(r30) /* 803B87B0 003B5710 7F E3 FB 78 */ mr r3, r31 -/* 803B87B4 003B5714 4E 80 00 21 */ blrl +/* 803B87B4 003B5714 4E 80 00 21 */ blrl lbl_803B87B8: /* 803B87B8 003B5718 80 01 00 1C */ lwz r0, 0x1c(r1) /* 803B87BC 003B571C 83 E1 00 14 */ lwz r31, 0x14(r1) /* 803B87C0 003B5720 83 C1 00 10 */ lwz r30, 0x10(r1) /* 803B87C4 003B5724 38 21 00 18 */ addi r1, r1, 0x18 /* 803B87C8 003B5728 7C 08 03 A6 */ mtlr r0 -/* 803B87CC 003B572C 4E 80 00 20 */ blr +/* 803B87CC 003B572C 4E 80 00 20 */ blr .global __CARDStart __CARDStart: @@ -831,7 +831,7 @@ lbl_803B8964: /* 803B8974 003B58D4 80 01 00 34 */ lwz r0, 0x34(r1) /* 803B8978 003B58D8 38 21 00 30 */ addi r1, r1, 0x30 /* 803B897C 003B58DC 7C 08 03 A6 */ mtlr r0 -/* 803B8980 003B58E0 4E 80 00 20 */ blr +/* 803B8980 003B58E0 4E 80 00 20 */ blr .global __CARDReadSegment __CARDReadSegment: @@ -915,7 +915,7 @@ lbl_803B8AA0: /* 803B8AA8 003B5A08 83 C1 00 10 */ lwz r30, 0x10(r1) /* 803B8AAC 003B5A0C 38 21 00 18 */ addi r1, r1, 0x18 /* 803B8AB0 003B5A10 7C 08 03 A6 */ mtlr r0 -/* 803B8AB4 003B5A14 4E 80 00 20 */ blr +/* 803B8AB4 003B5A14 4E 80 00 20 */ blr .global __CARDWritePage __CARDWritePage: @@ -993,7 +993,7 @@ lbl_803B8BBC: /* 803B8BC4 003B5B24 83 C1 00 10 */ lwz r30, 0x10(r1) /* 803B8BC8 003B5B28 38 21 00 18 */ addi r1, r1, 0x18 /* 803B8BCC 003B5B2C 7C 08 03 A6 */ mtlr r0 -/* 803B8BD0 003B5B30 4E 80 00 20 */ blr +/* 803B8BD0 003B5B30 4E 80 00 20 */ blr .global __CARDEraseSector __CARDEraseSector: @@ -1056,7 +1056,7 @@ lbl_803B8C94: /* 803B8CA4 003B5C04 83 A1 00 1C */ lwz r29, 0x1c(r1) /* 803B8CA8 003B5C08 38 21 00 28 */ addi r1, r1, 0x28 /* 803B8CAC 003B5C0C 7C 08 03 A6 */ mtlr r0 -/* 803B8CB0 003B5C10 4E 80 00 20 */ blr +/* 803B8CB0 003B5C10 4E 80 00 20 */ blr .global CARDInit CARDInit: @@ -1105,12 +1105,12 @@ lbl_803B8D44: /* 803B8D50 003B5CB0 83 A1 00 0C */ lwz r29, 0xc(r1) /* 803B8D54 003B5CB4 38 21 00 18 */ addi r1, r1, 0x18 /* 803B8D58 003B5CB8 7C 08 03 A6 */ mtlr r0 -/* 803B8D5C 003B5CBC 4E 80 00 20 */ blr +/* 803B8D5C 003B5CBC 4E 80 00 20 */ blr .global __CARDGetFontEncode __CARDGetFontEncode: /* 803B8D60 003B5CC0 A0 6D B0 08 */ lhz r3, lbl_805A9BC8@sda21(r13) -/* 803B8D64 003B5CC4 4E 80 00 20 */ blr +/* 803B8D64 003B5CC4 4E 80 00 20 */ blr .global __CARDSetDiskID __CARDSetDiskID: @@ -1131,7 +1131,7 @@ lbl_803B8D94: /* 803B8D94 003B5CF4 38 64 02 20 */ addi r3, r4, 0x220 lbl_803B8D98: /* 803B8D98 003B5CF8 90 64 02 1C */ stw r3, 0x21c(r4) -/* 803B8D9C 003B5CFC 4E 80 00 20 */ blr +/* 803B8D9C 003B5CFC 4E 80 00 20 */ blr .global __CARDGetControlBlock __CARDGetControlBlock: @@ -1186,7 +1186,7 @@ lbl_803B8E3C: /* 803B8E48 003B5DA8 83 A1 00 14 */ lwz r29, 0x14(r1) /* 803B8E4C 003B5DAC 38 21 00 20 */ addi r1, r1, 0x20 /* 803B8E50 003B5DB0 7C 08 03 A6 */ mtlr r0 -/* 803B8E54 003B5DB4 4E 80 00 20 */ blr +/* 803B8E54 003B5DB4 4E 80 00 20 */ blr .global __CARDPutControlBlock __CARDPutControlBlock: @@ -1216,7 +1216,7 @@ lbl_803B8E9C: /* 803B8EAC 003B5E0C 83 C1 00 10 */ lwz r30, 0x10(r1) /* 803B8EB0 003B5E10 38 21 00 18 */ addi r1, r1, 0x18 /* 803B8EB4 003B5E14 7C 08 03 A6 */ mtlr r0 -/* 803B8EB8 003B5E18 4E 80 00 20 */ blr +/* 803B8EB8 003B5E18 4E 80 00 20 */ blr .global CARDGetResultCode CARDGetResultCode: @@ -1226,14 +1226,14 @@ CARDGetResultCode: /* 803B8EC8 003B5E28 41 80 00 0C */ blt lbl_803B8ED4 lbl_803B8ECC: /* 803B8ECC 003B5E2C 38 60 FF 80 */ li r3, -128 -/* 803B8ED0 003B5E30 4E 80 00 20 */ blr +/* 803B8ED0 003B5E30 4E 80 00 20 */ blr lbl_803B8ED4: /* 803B8ED4 003B5E34 1C 83 01 10 */ mulli r4, r3, 0x110 /* 803B8ED8 003B5E38 3C 60 80 57 */ lis r3, lbl_80569A58@ha /* 803B8EDC 003B5E3C 38 03 9A 58 */ addi r0, r3, lbl_80569A58@l /* 803B8EE0 003B5E40 7C 60 22 14 */ add r3, r0, r4 /* 803B8EE4 003B5E44 80 63 00 04 */ lwz r3, 4(r3) -/* 803B8EE8 003B5E48 4E 80 00 20 */ blr +/* 803B8EE8 003B5E48 4E 80 00 20 */ blr .global CARDFreeBlocks CARDFreeBlocks: @@ -1333,7 +1333,7 @@ lbl_803B9020: /* 803B902C 003B5F8C 83 A1 00 24 */ lwz r29, 0x24(r1) /* 803B9030 003B5F90 38 21 00 30 */ addi r1, r1, 0x30 /* 803B9034 003B5F94 7C 08 03 A6 */ mtlr r0 -/* 803B9038 003B5F98 4E 80 00 20 */ blr +/* 803B9038 003B5F98 4E 80 00 20 */ blr OnReset: /* 803B903C 003B5F9C 7C 08 02 A6 */ mflr r0 @@ -1358,4 +1358,4 @@ lbl_803B907C: /* 803B907C 003B5FDC 80 01 00 0C */ lwz r0, 0xc(r1) /* 803B9080 003B5FE0 38 21 00 08 */ addi r1, r1, 8 /* 803B9084 003B5FE4 7C 08 03 A6 */ mtlr r0 -/* 803B9088 003B5FE8 4E 80 00 20 */ blr +/* 803B9088 003B5FE8 4E 80 00 20 */ blr diff --git a/asm/Dolphin/card/CARDBlock.s b/asm/Dolphin/card/CARDBlock.s index 496a41a8..bc847006 100644 --- a/asm/Dolphin/card/CARDBlock.s +++ b/asm/Dolphin/card/CARDBlock.s @@ -5,7 +5,7 @@ .global __CARDGetFatBlock __CARDGetFatBlock: /* 803BA56C 003B74CC 80 63 00 88 */ lwz r3, 0x88(r3) -/* 803BA570 003B74D0 4E 80 00 20 */ blr +/* 803BA570 003B74D0 4E 80 00 20 */ blr WriteCallback: /* 803BA574 003B74D4 7C 08 02 A6 */ mflr r0 @@ -56,7 +56,7 @@ lbl_803BA604: /* 803BA61C 003B757C 90 1F 00 D8 */ stw r0, 0xd8(r31) /* 803BA620 003B7580 38 7D 00 00 */ addi r3, r29, 0 /* 803BA624 003B7584 38 9E 00 00 */ addi r4, r30, 0 -/* 803BA628 003B7588 4E 80 00 21 */ blrl +/* 803BA628 003B7588 4E 80 00 21 */ blrl lbl_803BA62C: /* 803BA62C 003B758C 80 01 00 24 */ lwz r0, 0x24(r1) /* 803BA630 003B7590 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -64,7 +64,7 @@ lbl_803BA62C: /* 803BA638 003B7598 83 A1 00 14 */ lwz r29, 0x14(r1) /* 803BA63C 003B759C 38 21 00 20 */ addi r1, r1, 0x20 /* 803BA640 003B75A0 7C 08 03 A6 */ mtlr r0 -/* 803BA644 003B75A4 4E 80 00 20 */ blr +/* 803BA644 003B75A4 4E 80 00 20 */ blr EraseCallback: /* 803BA648 003B75A8 7C 08 02 A6 */ mflr r0 @@ -111,7 +111,7 @@ lbl_803BA6CC: /* 803BA6E4 003B7644 90 1E 00 D8 */ stw r0, 0xd8(r30) /* 803BA6E8 003B7648 38 7F 00 00 */ addi r3, r31, 0 /* 803BA6EC 003B764C 38 9D 00 00 */ addi r4, r29, 0 -/* 803BA6F0 003B7650 4E 80 00 21 */ blrl +/* 803BA6F0 003B7650 4E 80 00 21 */ blrl lbl_803BA6F4: /* 803BA6F4 003B7654 80 01 00 2C */ lwz r0, 0x2c(r1) /* 803BA6F8 003B7658 83 E1 00 24 */ lwz r31, 0x24(r1) @@ -119,7 +119,7 @@ lbl_803BA6F4: /* 803BA700 003B7660 83 A1 00 1C */ lwz r29, 0x1c(r1) /* 803BA704 003B7664 38 21 00 28 */ addi r1, r1, 0x28 /* 803BA708 003B7668 7C 08 03 A6 */ mtlr r0 -/* 803BA70C 003B766C 4E 80 00 20 */ blr +/* 803BA70C 003B766C 4E 80 00 20 */ blr .global __CARDAllocBlock __CARDAllocBlock: @@ -202,7 +202,7 @@ lbl_803BA810: /* 803BA818 003B7778 83 C1 00 18 */ lwz r30, 0x18(r1) /* 803BA81C 003B777C 38 21 00 20 */ addi r1, r1, 0x20 /* 803BA820 003B7780 7C 08 03 A6 */ mtlr r0 -/* 803BA824 003B7784 4E 80 00 20 */ blr +/* 803BA824 003B7784 4E 80 00 20 */ blr .global __CARDFreeBlock __CARDFreeBlock: @@ -250,7 +250,7 @@ lbl_803BA8B4: /* 803BA8B4 003B7814 80 01 00 0C */ lwz r0, 0xc(r1) /* 803BA8B8 003B7818 38 21 00 08 */ addi r1, r1, 8 /* 803BA8BC 003B781C 7C 08 03 A6 */ mtlr r0 -/* 803BA8C0 003B7820 4E 80 00 20 */ blr +/* 803BA8C0 003B7820 4E 80 00 20 */ blr .global __CARDUpdateFatBlock __CARDUpdateFatBlock: @@ -296,4 +296,4 @@ __CARDUpdateFatBlock: /* 803BA960 003B78C0 83 81 00 18 */ lwz r28, 0x18(r1) /* 803BA964 003B78C4 38 21 00 28 */ addi r1, r1, 0x28 /* 803BA968 003B78C8 7C 08 03 A6 */ mtlr r0 -/* 803BA96C 003B78CC 4E 80 00 20 */ blr +/* 803BA96C 003B78CC 4E 80 00 20 */ blr diff --git a/asm/Dolphin/card/CARDCheck.s b/asm/Dolphin/card/CARDCheck.s index b9cb6d9b..2dda0db3 100644 --- a/asm/Dolphin/card/CARDCheck.s +++ b/asm/Dolphin/card/CARDCheck.s @@ -113,10 +113,10 @@ lbl_803BAD58: lbl_803BAD6C: /* 803BAD6C 003B7CCC A0 06 00 00 */ lhz r0, 0(r6) /* 803BAD70 003B7CD0 28 00 FF FF */ cmplwi r0, 0xffff -/* 803BAD74 003B7CD4 4C 82 00 20 */ bnelr +/* 803BAD74 003B7CD4 4C 82 00 20 */ bnelr /* 803BAD78 003B7CD8 38 00 00 00 */ li r0, 0 /* 803BAD7C 003B7CDC B0 06 00 00 */ sth r0, 0(r6) -/* 803BAD80 003B7CE0 4E 80 00 20 */ blr +/* 803BAD80 003B7CE0 4E 80 00 20 */ blr .global VerifyID VerifyID: @@ -294,7 +294,7 @@ lbl_803BAFF4: /* 803BAFF8 003B7F58 80 01 00 34 */ lwz r0, 0x34(r1) /* 803BAFFC 003B7F5C 38 21 00 30 */ addi r1, r1, 0x30 /* 803BB000 003B7F60 7C 08 03 A6 */ mtlr r0 -/* 803BB004 003B7F64 4E 80 00 20 */ blr +/* 803BB004 003B7F64 4E 80 00 20 */ blr .global VerifyDir VerifyDir: @@ -457,7 +457,7 @@ lbl_803BB228: /* 803BB238 003B8198 83 A1 00 2C */ lwz r29, 0x2c(r1) /* 803BB23C 003B819C 38 21 00 38 */ addi r1, r1, 0x38 /* 803BB240 003B81A0 7C 08 03 A6 */ mtlr r0 -/* 803BB244 003B81A4 4E 80 00 20 */ blr +/* 803BB244 003B81A4 4E 80 00 20 */ blr .global VerifyFAT VerifyFAT: @@ -641,7 +641,7 @@ lbl_803BB4AC: /* 803BB4BC 003B841C 83 A1 00 1C */ lwz r29, 0x1c(r1) /* 803BB4C0 003B8420 38 21 00 28 */ addi r1, r1, 0x28 /* 803BB4C4 003B8424 7C 08 03 A6 */ mtlr r0 -/* 803BB4C8 003B8428 4E 80 00 20 */ blr +/* 803BB4C8 003B8428 4E 80 00 20 */ blr .global __CARDVerify __CARDVerify: @@ -684,7 +684,7 @@ lbl_803BB540: /* 803BB548 003B84A8 83 C1 00 10 */ lwz r30, 0x10(r1) /* 803BB54C 003B84AC 38 21 00 18 */ addi r1, r1, 0x18 /* 803BB550 003B84B0 7C 08 03 A6 */ mtlr r0 -/* 803BB554 003B84B4 4E 80 00 20 */ blr +/* 803BB554 003B84B4 4E 80 00 20 */ blr .global CARDCheckExAsync CARDCheckExAsync: @@ -1067,7 +1067,7 @@ lbl_803BBA98: /* 803BBAB8 003B8A18 3B 43 00 00 */ addi r26, r3, 0 /* 803BBABC 003B8A1C 38 79 00 00 */ addi r3, r25, 0 /* 803BBAC0 003B8A20 38 80 00 00 */ li r4, 0 -/* 803BBAC4 003B8A24 4E 80 00 21 */ blrl +/* 803BBAC4 003B8A24 4E 80 00 21 */ blrl /* 803BBAC8 003B8A28 7F 43 D3 78 */ mr r3, r26 /* 803BBACC 003B8A2C 4B FC 5B BD */ bl OSRestoreInterrupts lbl_803BBAD0: @@ -1077,7 +1077,7 @@ lbl_803BBAD4: /* 803BBAD8 003B8A38 80 01 00 5C */ lwz r0, 0x5c(r1) /* 803BBADC 003B8A3C 38 21 00 58 */ addi r1, r1, 0x58 /* 803BBAE0 003B8A40 7C 08 03 A6 */ mtlr r0 -/* 803BBAE4 003B8A44 4E 80 00 20 */ blr +/* 803BBAE4 003B8A44 4E 80 00 20 */ blr .global CARDCheckAsync CARDCheckAsync: @@ -1090,4 +1090,4 @@ CARDCheckAsync: /* 803BBB00 003B8A60 80 01 00 1C */ lwz r0, 0x1c(r1) /* 803BBB04 003B8A64 38 21 00 18 */ addi r1, r1, 0x18 /* 803BBB08 003B8A68 7C 08 03 A6 */ mtlr r0 -/* 803BBB0C 003B8A6C 4E 80 00 20 */ blr +/* 803BBB0C 003B8A6C 4E 80 00 20 */ blr diff --git a/asm/Dolphin/card/CARDCreate.s b/asm/Dolphin/card/CARDCreate.s index 79025185..715039f8 100644 --- a/asm/Dolphin/card/CARDCreate.s +++ b/asm/Dolphin/card/CARDCreate.s @@ -74,13 +74,13 @@ lbl_803BD2B4: /* 803BD2CC 003BA22C 7D 88 03 A6 */ mtlr r12 /* 803BD2D0 003BA230 38 7C 00 00 */ addi r3, r28, 0 /* 803BD2D4 003BA234 38 9E 00 00 */ addi r4, r30, 0 -/* 803BD2D8 003BA238 4E 80 00 21 */ blrl +/* 803BD2D8 003BA238 4E 80 00 21 */ blrl lbl_803BD2DC: /* 803BD2DC 003BA23C BB 61 00 14 */ lmw r27, 0x14(r1) /* 803BD2E0 003BA240 80 01 00 2C */ lwz r0, 0x2c(r1) /* 803BD2E4 003BA244 38 21 00 28 */ addi r1, r1, 0x28 /* 803BD2E8 003BA248 7C 08 03 A6 */ mtlr r0 -/* 803BD2EC 003BA24C 4E 80 00 20 */ blr +/* 803BD2EC 003BA24C 4E 80 00 20 */ blr .global CARDCreateAsync CARDCreateAsync: @@ -233,4 +233,4 @@ lbl_803BD4FC: /* 803BD500 003BA460 80 01 00 4C */ lwz r0, 0x4c(r1) /* 803BD504 003BA464 38 21 00 48 */ addi r1, r1, 0x48 /* 803BD508 003BA468 7C 08 03 A6 */ mtlr r0 -/* 803BD50C 003BA46C 4E 80 00 20 */ blr +/* 803BD50C 003BA46C 4E 80 00 20 */ blr diff --git a/asm/Dolphin/card/CARDDelete.s b/asm/Dolphin/card/CARDDelete.s index a029041f..e28863dc 100644 --- a/asm/Dolphin/card/CARDDelete.s +++ b/asm/Dolphin/card/CARDDelete.s @@ -37,7 +37,7 @@ lbl_803BDCD0: /* 803BDCE8 003BAC48 7D 88 03 A6 */ mtlr r12 /* 803BDCEC 003BAC4C 38 7C 00 00 */ addi r3, r28, 0 /* 803BDCF0 003BAC50 38 9D 00 00 */ addi r4, r29, 0 -/* 803BDCF4 003BAC54 4E 80 00 21 */ blrl +/* 803BDCF4 003BAC54 4E 80 00 21 */ blrl lbl_803BDCF8: /* 803BDCF8 003BAC58 80 01 00 24 */ lwz r0, 0x24(r1) /* 803BDCFC 003BAC5C 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -46,7 +46,7 @@ lbl_803BDCF8: /* 803BDD08 003BAC68 83 81 00 10 */ lwz r28, 0x10(r1) /* 803BDD0C 003BAC6C 38 21 00 20 */ addi r1, r1, 0x20 /* 803BDD10 003BAC70 7C 08 03 A6 */ mtlr r0 -/* 803BDD14 003BAC74 4E 80 00 20 */ blr +/* 803BDD14 003BAC74 4E 80 00 20 */ blr .global CARDFastDeleteAsync CARDFastDeleteAsync: @@ -133,7 +133,7 @@ lbl_803BDE24: /* 803BDE34 003BAD94 83 81 00 18 */ lwz r28, 0x18(r1) /* 803BDE38 003BAD98 38 21 00 28 */ addi r1, r1, 0x28 /* 803BDE3C 003BAD9C 7C 08 03 A6 */ mtlr r0 -/* 803BDE40 003BADA0 4E 80 00 20 */ blr +/* 803BDE40 003BADA0 4E 80 00 20 */ blr .global CARDDeleteAsync CARDDeleteAsync: @@ -211,4 +211,4 @@ lbl_803BDF38: /* 803BDF44 003BAEA4 83 A1 00 24 */ lwz r29, 0x24(r1) /* 803BDF48 003BAEA8 38 21 00 30 */ addi r1, r1, 0x30 /* 803BDF4C 003BAEAC 7C 08 03 A6 */ mtlr r0 -/* 803BDF50 003BAEB0 4E 80 00 20 */ blr +/* 803BDF50 003BAEB0 4E 80 00 20 */ blr diff --git a/asm/Dolphin/card/CARDDir.s b/asm/Dolphin/card/CARDDir.s index 426a9ad4..debcdd1f 100644 --- a/asm/Dolphin/card/CARDDir.s +++ b/asm/Dolphin/card/CARDDir.s @@ -5,7 +5,7 @@ .global __CARDGetDirBlock __CARDGetDirBlock: /* 803BA970 003B78D0 80 63 00 84 */ lwz r3, 0x84(r3) -/* 803BA974 003B78D4 4E 80 00 20 */ blr +/* 803BA974 003B78D4 4E 80 00 20 */ blr WriteCallback: /* 803BA978 003B78D8 7C 08 02 A6 */ mflr r0 @@ -55,7 +55,7 @@ lbl_803BAA04: /* 803BAA1C 003B797C 90 1F 00 D8 */ stw r0, 0xd8(r31) /* 803BAA20 003B7980 38 7D 00 00 */ addi r3, r29, 0 /* 803BAA24 003B7984 38 9E 00 00 */ addi r4, r30, 0 -/* 803BAA28 003B7988 4E 80 00 21 */ blrl +/* 803BAA28 003B7988 4E 80 00 21 */ blrl lbl_803BAA2C: /* 803BAA2C 003B798C 80 01 00 24 */ lwz r0, 0x24(r1) /* 803BAA30 003B7990 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -63,7 +63,7 @@ lbl_803BAA2C: /* 803BAA38 003B7998 83 A1 00 14 */ lwz r29, 0x14(r1) /* 803BAA3C 003B799C 38 21 00 20 */ addi r1, r1, 0x20 /* 803BAA40 003B79A0 7C 08 03 A6 */ mtlr r0 -/* 803BAA44 003B79A4 4E 80 00 20 */ blr +/* 803BAA44 003B79A4 4E 80 00 20 */ blr .global EraseCallback EraseCallback: @@ -111,7 +111,7 @@ lbl_803BAACC: /* 803BAAE4 003B7A44 90 1E 00 D8 */ stw r0, 0xd8(r30) /* 803BAAE8 003B7A48 38 7F 00 00 */ addi r3, r31, 0 /* 803BAAEC 003B7A4C 38 9D 00 00 */ addi r4, r29, 0 -/* 803BAAF0 003B7A50 4E 80 00 21 */ blrl +/* 803BAAF0 003B7A50 4E 80 00 21 */ blrl lbl_803BAAF4: /* 803BAAF4 003B7A54 80 01 00 2C */ lwz r0, 0x2c(r1) /* 803BAAF8 003B7A58 83 E1 00 24 */ lwz r31, 0x24(r1) @@ -119,7 +119,7 @@ lbl_803BAAF4: /* 803BAB00 003B7A60 83 A1 00 1C */ lwz r29, 0x1c(r1) /* 803BAB04 003B7A64 38 21 00 28 */ addi r1, r1, 0x28 /* 803BAB08 003B7A68 7C 08 03 A6 */ mtlr r0 -/* 803BAB0C 003B7A6C 4E 80 00 20 */ blr +/* 803BAB0C 003B7A6C 4E 80 00 20 */ blr .global __CARDUpdateDir __CARDUpdateDir: @@ -173,4 +173,4 @@ lbl_803BABB4: /* 803BABC4 003B7B24 83 81 00 18 */ lwz r28, 0x18(r1) /* 803BABC8 003B7B28 38 21 00 28 */ addi r1, r1, 0x28 /* 803BABCC 003B7B2C 7C 08 03 A6 */ mtlr r0 -/* 803BABD0 003B7B30 4E 80 00 20 */ blr +/* 803BABD0 003B7B30 4E 80 00 20 */ blr diff --git a/asm/Dolphin/card/CARDFormat.s b/asm/Dolphin/card/CARDFormat.s index 32b9d48d..aac4e895 100644 --- a/asm/Dolphin/card/CARDFormat.s +++ b/asm/Dolphin/card/CARDFormat.s @@ -78,7 +78,7 @@ lbl_803BC680: /* 803BC69C 003B95FC 7D 88 03 A6 */ mtlr r12 /* 803BC6A0 003B9600 38 7E 00 00 */ addi r3, r30, 0 /* 803BC6A4 003B9604 38 9C 00 00 */ addi r4, r28, 0 -/* 803BC6A8 003B9608 4E 80 00 21 */ blrl +/* 803BC6A8 003B9608 4E 80 00 21 */ blrl lbl_803BC6AC: /* 803BC6AC 003B960C 80 01 00 24 */ lwz r0, 0x24(r1) /* 803BC6B0 003B9610 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -87,7 +87,7 @@ lbl_803BC6AC: /* 803BC6BC 003B961C 83 81 00 10 */ lwz r28, 0x10(r1) /* 803BC6C0 003B9620 38 21 00 20 */ addi r1, r1, 0x20 /* 803BC6C4 003B9624 7C 08 03 A6 */ mtlr r0 -/* 803BC6C8 003B9628 4E 80 00 20 */ blr +/* 803BC6C8 003B9628 4E 80 00 20 */ blr .global __CARDFormatRegionAsync __CARDFormatRegionAsync: @@ -511,7 +511,7 @@ lbl_803BCD10: /* 803BCD14 003B9C74 80 01 00 5C */ lwz r0, 0x5c(r1) /* 803BCD18 003B9C78 38 21 00 58 */ addi r1, r1, 0x58 /* 803BCD1C 003B9C7C 7C 08 03 A6 */ mtlr r0 -/* 803BCD20 003B9C80 4E 80 00 20 */ blr +/* 803BCD20 003B9C80 4E 80 00 20 */ blr .global CARDFormatAsync CARDFormatAsync: @@ -532,4 +532,4 @@ CARDFormatAsync: /* 803BCD5C 003B9CBC 83 C1 00 10 */ lwz r30, 0x10(r1) /* 803BCD60 003B9CC0 38 21 00 18 */ addi r1, r1, 0x18 /* 803BCD64 003B9CC4 7C 08 03 A6 */ mtlr r0 -/* 803BCD68 003B9CC8 4E 80 00 20 */ blr +/* 803BCD68 003B9CC8 4E 80 00 20 */ blr diff --git a/asm/Dolphin/card/CARDMount.s b/asm/Dolphin/card/CARDMount.s index 0ab44f79..4655fc03 100644 --- a/asm/Dolphin/card/CARDMount.s +++ b/asm/Dolphin/card/CARDMount.s @@ -12,7 +12,7 @@ lbl_803F6E60: .4byte 0x00040000 .4byte 0x00000000 .4byte 0x00000000 - + .global lbl_803F6E80 lbl_803F6E80: .4byte 0x00000004 @@ -29,7 +29,7 @@ lbl_803F6E80: lbl_805A8C00: .2byte 0xFFFF .balign 4 - + .section .text, "ax" .global IsCard @@ -44,12 +44,12 @@ IsCard: /* 803BBB2C 003B8A8C 40 82 00 0C */ bne lbl_803BBB38 lbl_803BBB30: /* 803BBB30 003B8A90 38 60 00 00 */ li r3, 0 -/* 803BBB34 003B8A94 4E 80 00 20 */ blr +/* 803BBB34 003B8A94 4E 80 00 20 */ blr lbl_803BBB38: /* 803BBB38 003B8A98 54 60 07 BF */ clrlwi. r0, r3, 0x1e /* 803BBB3C 003B8A9C 41 82 00 0C */ beq lbl_803BBB48 /* 803BBB40 003B8AA0 38 60 00 00 */ li r3, 0 -/* 803BBB44 003B8AA4 4E 80 00 20 */ blr +/* 803BBB44 003B8AA4 4E 80 00 20 */ blr lbl_803BBB48: /* 803BBB48 003B8AA8 54 65 06 3A */ rlwinm r5, r3, 0, 0x18, 0x1d /* 803BBB4C 003B8AAC 2C 05 00 20 */ cmpwi r5, 0x20 @@ -73,7 +73,7 @@ lbl_803BBB7C: /* 803BBB8C 003B8AEC 41 82 00 0C */ beq lbl_803BBB98 lbl_803BBB90: /* 803BBB90 003B8AF0 38 60 00 00 */ li r3, 0 -/* 803BBB94 003B8AF4 4E 80 00 20 */ blr +/* 803BBB94 003B8AF4 4E 80 00 20 */ blr lbl_803BBB98: /* 803BBB98 003B8AF8 3C 80 80 3F */ lis r4, lbl_803F6E60@ha /* 803BBB9C 003B8AFC 54 63 BE FA */ rlwinm r3, r3, 0x17, 0x1b, 0x1d @@ -83,17 +83,17 @@ lbl_803BBB98: /* 803BBBAC 003B8B0C 2C 03 00 00 */ cmpwi r3, 0 /* 803BBBB0 003B8B10 40 82 00 0C */ bne lbl_803BBBBC /* 803BBBB4 003B8B14 38 60 00 00 */ li r3, 0 -/* 803BBBB8 003B8B18 4E 80 00 20 */ blr +/* 803BBBB8 003B8B18 4E 80 00 20 */ blr lbl_803BBBBC: /* 803BBBBC 003B8B1C 54 A0 88 DC */ rlwinm r0, r5, 0x11, 3, 0xe /* 803BBBC0 003B8B20 7C 00 1B 96 */ divwu r0, r0, r3 /* 803BBBC4 003B8B24 28 00 00 08 */ cmplwi r0, 8 /* 803BBBC8 003B8B28 40 80 00 0C */ bge lbl_803BBBD4 /* 803BBBCC 003B8B2C 38 60 00 00 */ li r3, 0 -/* 803BBBD0 003B8B30 4E 80 00 20 */ blr +/* 803BBBD0 003B8B30 4E 80 00 20 */ blr lbl_803BBBD4: /* 803BBBD4 003B8B34 38 60 00 01 */ li r3, 1 -/* 803BBBD8 003B8B38 4E 80 00 20 */ blr +/* 803BBBD8 003B8B38 4E 80 00 20 */ blr .global CARDProbeEx CARDProbeEx: @@ -207,7 +207,7 @@ lbl_803BBD44: /* 803BBD48 003B8CA8 80 01 00 34 */ lwz r0, 0x34(r1) /* 803BBD4C 003B8CAC 38 21 00 30 */ addi r1, r1, 0x30 /* 803BBD50 003B8CB0 7C 08 03 A6 */ mtlr r0 -/* 803BBD54 003B8CB4 4E 80 00 20 */ blr +/* 803BBD54 003B8CB4 4E 80 00 20 */ blr .global DoMount DoMount: @@ -490,7 +490,7 @@ lbl_803BC148: /* 803BC158 003B90B8 83 81 00 20 */ lwz r28, 0x20(r1) /* 803BC15C 003B90BC 38 21 00 30 */ addi r1, r1, 0x30 /* 803BC160 003B90C0 7C 08 03 A6 */ mtlr r0 -/* 803BC164 003B90C4 4E 80 00 20 */ blr +/* 803BC164 003B90C4 4E 80 00 20 */ blr .global __CARDMountCallback __CARDMountCallback: @@ -569,7 +569,7 @@ lbl_803BC254: /* 803BC270 003B91D0 7D 88 03 A6 */ mtlr r12 /* 803BC274 003B91D4 38 7C 00 00 */ addi r3, r28, 0 /* 803BC278 003B91D8 38 9D 00 00 */ addi r4, r29, 0 -/* 803BC27C 003B91DC 4E 80 00 21 */ blrl +/* 803BC27C 003B91DC 4E 80 00 21 */ blrl lbl_803BC280: /* 803BC280 003B91E0 80 01 00 24 */ lwz r0, 0x24(r1) /* 803BC284 003B91E4 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -578,7 +578,7 @@ lbl_803BC280: /* 803BC290 003B91F0 83 81 00 10 */ lwz r28, 0x10(r1) /* 803BC294 003B91F4 38 21 00 20 */ addi r1, r1, 0x20 /* 803BC298 003B91F8 7C 08 03 A6 */ mtlr r0 -/* 803BC29C 003B91FC 4E 80 00 20 */ blr +/* 803BC29C 003B91FC 4E 80 00 20 */ blr .global CARDMountAsync CARDMountAsync: @@ -695,7 +695,7 @@ lbl_803BC42C: /* 803BC430 003B9390 80 01 00 34 */ lwz r0, 0x34(r1) /* 803BC434 003B9394 38 21 00 30 */ addi r1, r1, 0x30 /* 803BC438 003B9398 7C 08 03 A6 */ mtlr r0 -/* 803BC43C 003B939C 4E 80 00 20 */ blr +/* 803BC43C 003B939C 4E 80 00 20 */ blr .global DoUnmount DoUnmount: @@ -738,7 +738,7 @@ lbl_803BC4B4: /* 803BC4CC 003B942C 83 81 00 10 */ lwz r28, 0x10(r1) /* 803BC4D0 003B9430 38 21 00 20 */ addi r1, r1, 0x20 /* 803BC4D4 003B9434 7C 08 03 A6 */ mtlr r0 -/* 803BC4D8 003B9438 4E 80 00 20 */ blr +/* 803BC4D8 003B9438 4E 80 00 20 */ blr .global CARDUnmount CARDUnmount: @@ -787,4 +787,4 @@ lbl_803BC56C: /* 803BC578 003B94D8 83 A1 00 14 */ lwz r29, 0x14(r1) /* 803BC57C 003B94DC 38 21 00 20 */ addi r1, r1, 0x20 /* 803BC580 003B94E0 7C 08 03 A6 */ mtlr r0 -/* 803BC584 003B94E4 4E 80 00 20 */ blr +/* 803BC584 003B94E4 4E 80 00 20 */ blr diff --git a/asm/Dolphin/card/CARDNet.s b/asm/Dolphin/card/CARDNet.s index b68ac544..9bdf10da 100644 --- a/asm/Dolphin/card/CARDNet.s +++ b/asm/Dolphin/card/CARDNet.s @@ -56,4 +56,4 @@ lbl_803BE698: /* 803BE69C 003BB5FC 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 803BE6A0 003BB600 38 21 00 20 */ addi r1, r1, 0x20 /* 803BE6A4 003BB604 7C 08 03 A6 */ mtlr r0 -/* 803BE6A8 003BB608 4E 80 00 20 */ blr +/* 803BE6A8 003BB608 4E 80 00 20 */ blr diff --git a/asm/Dolphin/card/CARDOpen.s b/asm/Dolphin/card/CARDOpen.s index 4089f970..c83a901f 100644 --- a/asm/Dolphin/card/CARDOpen.s +++ b/asm/Dolphin/card/CARDOpen.s @@ -3,7 +3,7 @@ .section .bss lbl_80569C78: .skip 0x20 - + .section .text, "ax" .global __CARDCompareFileName @@ -21,12 +21,12 @@ lbl_803BCD78: /* 803BCD90 003B9CF0 7C 03 00 00 */ cmpw r3, r0 /* 803BCD94 003B9CF4 41 82 00 0C */ beq lbl_803BCDA0 /* 803BCD98 003B9CF8 38 60 00 00 */ li r3, 0 -/* 803BCD9C 003B9CFC 4E 80 00 20 */ blr +/* 803BCD9C 003B9CFC 4E 80 00 20 */ blr lbl_803BCDA0: /* 803BCDA0 003B9D00 7C C0 07 75 */ extsb. r0, r6 /* 803BCDA4 003B9D04 40 82 00 0C */ bne lbl_803BCDB0 /* 803BCDA8 003B9D08 38 60 00 01 */ li r3, 1 -/* 803BCDAC 003B9D0C 4E 80 00 20 */ blr +/* 803BCDAC 003B9D0C 4E 80 00 20 */ blr lbl_803BCDB0: /* 803BCDB0 003B9D10 34 E7 FF FF */ addic. r7, r7, -1 /* 803BCDB4 003B9D14 40 80 FF C4 */ bge lbl_803BCD78 @@ -34,10 +34,10 @@ lbl_803BCDB0: /* 803BCDBC 003B9D1C 7C 00 07 75 */ extsb. r0, r0 /* 803BCDC0 003B9D20 40 82 00 0C */ bne lbl_803BCDCC /* 803BCDC4 003B9D24 38 60 00 01 */ li r3, 1 -/* 803BCDC8 003B9D28 4E 80 00 20 */ blr +/* 803BCDC8 003B9D28 4E 80 00 20 */ blr lbl_803BCDCC: /* 803BCDCC 003B9D2C 38 60 00 00 */ li r3, 0 -/* 803BCDD0 003B9D30 4E 80 00 20 */ blr +/* 803BCDD0 003B9D30 4E 80 00 20 */ blr .global __CARDAccess __CARDAccess: @@ -82,7 +82,7 @@ lbl_803BCE54: /* 803BCE5C 003B9DBC 83 C1 00 10 */ lwz r30, 0x10(r1) /* 803BCE60 003B9DC0 38 21 00 18 */ addi r1, r1, 0x18 /* 803BCE64 003B9DC4 7C 08 03 A6 */ mtlr r0 -/* 803BCE68 003B9DC8 4E 80 00 20 */ blr +/* 803BCE68 003B9DC8 4E 80 00 20 */ blr .global sub_803bce6c sub_803bce6c: @@ -90,16 +90,16 @@ sub_803bce6c: /* 803BCE70 003B9DD0 28 00 00 FF */ cmplwi r0, 0xff /* 803BCE74 003B9DD4 40 82 00 0C */ bne lbl_803BCE80 /* 803BCE78 003B9DD8 38 60 FF FC */ li r3, -4 -/* 803BCE7C 003B9DDC 4E 80 00 20 */ blr +/* 803BCE7C 003B9DDC 4E 80 00 20 */ blr lbl_803BCE80: /* 803BCE80 003B9DE0 88 03 00 34 */ lbz r0, 0x34(r3) /* 803BCE84 003B9DE4 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d /* 803BCE88 003B9DE8 41 82 00 0C */ beq lbl_803BCE94 /* 803BCE8C 003B9DEC 38 60 00 00 */ li r3, 0 -/* 803BCE90 003B9DF0 4E 80 00 20 */ blr +/* 803BCE90 003B9DF0 4E 80 00 20 */ blr lbl_803BCE94: /* 803BCE94 003B9DF4 38 60 FF F6 */ li r3, -10 -/* 803BCE98 003B9DF8 4E 80 00 20 */ blr +/* 803BCE98 003B9DF8 4E 80 00 20 */ blr .global sub_803bce9c sub_803bce9c: @@ -199,7 +199,7 @@ lbl_803BCFD8: /* 803BCFDC 003B9F3C 80 01 00 34 */ lwz r0, 0x34(r1) /* 803BCFE0 003B9F40 38 21 00 30 */ addi r1, r1, 0x30 /* 803BCFE4 003B9F44 7C 08 03 A6 */ mtlr r0 -/* 803BCFE8 003B9F48 4E 80 00 20 */ blr +/* 803BCFE8 003B9F48 4E 80 00 20 */ blr .global CARDOpen CARDOpen: @@ -309,7 +309,7 @@ lbl_803BD150: /* 803BD154 003BA0B4 80 01 00 44 */ lwz r0, 0x44(r1) /* 803BD158 003BA0B8 38 21 00 40 */ addi r1, r1, 0x40 /* 803BD15C 003BA0BC 7C 08 03 A6 */ mtlr r0 -/* 803BD160 003BA0C0 4E 80 00 20 */ blr +/* 803BD160 003BA0C0 4E 80 00 20 */ blr .global CARDClose CARDClose: @@ -335,9 +335,9 @@ lbl_803BD1A4: /* 803BD1A8 003BA108 83 E1 00 14 */ lwz r31, 0x14(r1) /* 803BD1AC 003BA10C 38 21 00 18 */ addi r1, r1, 0x18 /* 803BD1B0 003BA110 7C 08 03 A6 */ mtlr r0 -/* 803BD1B4 003BA114 4E 80 00 20 */ blr +/* 803BD1B4 003BA114 4E 80 00 20 */ blr .global __CARDIsOpened __CARDIsOpened: /* 803BD1B8 003BA118 38 60 00 00 */ li r3, 0 -/* 803BD1BC 003BA11C 4E 80 00 20 */ blr +/* 803BD1BC 003BA11C 4E 80 00 20 */ blr diff --git a/asm/Dolphin/card/CARDRdwr.s b/asm/Dolphin/card/CARDRdwr.s index 70fdc0a2..7bf24dee 100644 --- a/asm/Dolphin/card/CARDRdwr.s +++ b/asm/Dolphin/card/CARDRdwr.s @@ -53,7 +53,7 @@ lbl_803BA384: /* 803BA39C 003B72FC 90 1E 00 D4 */ stw r0, 0xd4(r30) /* 803BA3A0 003B7300 38 7F 00 00 */ addi r3, r31, 0 /* 803BA3A4 003B7304 38 9D 00 00 */ addi r4, r29, 0 -/* 803BA3A8 003B7308 4E 80 00 21 */ blrl +/* 803BA3A8 003B7308 4E 80 00 21 */ blrl lbl_803BA3AC: /* 803BA3AC 003B730C 80 01 00 24 */ lwz r0, 0x24(r1) /* 803BA3B0 003B7310 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -61,7 +61,7 @@ lbl_803BA3AC: /* 803BA3B8 003B7318 83 A1 00 14 */ lwz r29, 0x14(r1) /* 803BA3BC 003B731C 38 21 00 20 */ addi r1, r1, 0x20 /* 803BA3C0 003B7320 7C 08 03 A6 */ mtlr r0 -/* 803BA3C4 003B7324 4E 80 00 20 */ blr +/* 803BA3C4 003B7324 4E 80 00 20 */ blr .global __CARDRead __CARDRead: @@ -91,7 +91,7 @@ lbl_803BA41C: /* 803BA41C 003B737C 80 01 00 0C */ lwz r0, 0xc(r1) /* 803BA420 003B7380 38 21 00 08 */ addi r1, r1, 8 /* 803BA424 003B7384 7C 08 03 A6 */ mtlr r0 -/* 803BA428 003B7388 4E 80 00 20 */ blr +/* 803BA428 003B7388 4E 80 00 20 */ blr .global BlockWriteCallback BlockWriteCallback: @@ -144,7 +144,7 @@ lbl_803BA4C4: /* 803BA4DC 003B743C 90 1E 00 D4 */ stw r0, 0xd4(r30) /* 803BA4E0 003B7440 38 7F 00 00 */ addi r3, r31, 0 /* 803BA4E4 003B7444 38 9D 00 00 */ addi r4, r29, 0 -/* 803BA4E8 003B7448 4E 80 00 21 */ blrl +/* 803BA4E8 003B7448 4E 80 00 21 */ blrl lbl_803BA4EC: /* 803BA4EC 003B744C 80 01 00 24 */ lwz r0, 0x24(r1) /* 803BA4F0 003B7450 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -152,7 +152,7 @@ lbl_803BA4EC: /* 803BA4F8 003B7458 83 A1 00 14 */ lwz r29, 0x14(r1) /* 803BA4FC 003B745C 38 21 00 20 */ addi r1, r1, 0x20 /* 803BA500 003B7460 7C 08 03 A6 */ mtlr r0 -/* 803BA504 003B7464 4E 80 00 20 */ blr +/* 803BA504 003B7464 4E 80 00 20 */ blr .global __CARDWrite __CARDWrite: @@ -182,4 +182,4 @@ lbl_803BA55C: /* 803BA55C 003B74BC 80 01 00 0C */ lwz r0, 0xc(r1) /* 803BA560 003B74C0 38 21 00 08 */ addi r1, r1, 8 /* 803BA564 003B74C4 7C 08 03 A6 */ mtlr r0 -/* 803BA568 003B74C8 4E 80 00 20 */ blr +/* 803BA568 003B74C8 4E 80 00 20 */ blr diff --git a/asm/Dolphin/card/CARDRead.s b/asm/Dolphin/card/CARDRead.s index 8c24ef47..d61e893b 100644 --- a/asm/Dolphin/card/CARDRead.s +++ b/asm/Dolphin/card/CARDRead.s @@ -124,7 +124,7 @@ lbl_803BD6A8: /* 803BD6B8 003BA618 83 81 00 20 */ lwz r28, 0x20(r1) /* 803BD6BC 003BA61C 38 21 00 30 */ addi r1, r1, 0x30 /* 803BD6C0 003BA620 7C 08 03 A6 */ mtlr r0 -/* 803BD6C4 003BA624 4E 80 00 20 */ blr +/* 803BD6C4 003BA624 4E 80 00 20 */ blr ReadCallback: /* 803BD6C8 003BA628 7C 08 02 A6 */ mflr r0 @@ -203,13 +203,13 @@ lbl_803BD7B8: /* 803BD7D4 003BA734 7D 88 03 A6 */ mtlr r12 /* 803BD7D8 003BA738 38 7D 00 00 */ addi r3, r29, 0 /* 803BD7DC 003BA73C 38 9E 00 00 */ addi r4, r30, 0 -/* 803BD7E0 003BA740 4E 80 00 21 */ blrl +/* 803BD7E0 003BA740 4E 80 00 21 */ blrl lbl_803BD7E4: /* 803BD7E4 003BA744 BB 61 00 14 */ lmw r27, 0x14(r1) /* 803BD7E8 003BA748 80 01 00 2C */ lwz r0, 0x2c(r1) /* 803BD7EC 003BA74C 38 21 00 28 */ addi r1, r1, 0x28 /* 803BD7F0 003BA750 7C 08 03 A6 */ mtlr r0 -/* 803BD7F4 003BA754 4E 80 00 20 */ blr +/* 803BD7F4 003BA754 4E 80 00 20 */ blr .global CARDReadAsync CARDReadAsync: @@ -304,4 +304,4 @@ lbl_803BD92C: /* 803BD930 003BA890 80 01 00 3C */ lwz r0, 0x3c(r1) /* 803BD934 003BA894 38 21 00 38 */ addi r1, r1, 0x38 /* 803BD938 003BA898 7C 08 03 A6 */ mtlr r0 -/* 803BD93C 003BA89C 4E 80 00 20 */ blr +/* 803BD93C 003BA89C 4E 80 00 20 */ blr diff --git a/asm/Dolphin/card/CARDRename.s b/asm/Dolphin/card/CARDRename.s index 61629d2c..38c4db23 100644 --- a/asm/Dolphin/card/CARDRename.s +++ b/asm/Dolphin/card/CARDRename.s @@ -143,4 +143,4 @@ lbl_803BE5D4: /* 803BE5D8 003BB538 80 01 00 4C */ lwz r0, 0x4c(r1) /* 803BE5DC 003BB53C 38 21 00 48 */ addi r1, r1, 0x48 /* 803BE5E0 003BB540 7C 08 03 A6 */ mtlr r0 -/* 803BE5E4 003BB544 4E 80 00 20 */ blr +/* 803BE5E4 003BB544 4E 80 00 20 */ blr diff --git a/asm/Dolphin/card/CARDStat.s b/asm/Dolphin/card/CARDStat.s index 9cc57224..154ec374 100644 --- a/asm/Dolphin/card/CARDStat.s +++ b/asm/Dolphin/card/CARDStat.s @@ -153,7 +153,7 @@ lbl_803BE13C: /* 803BE140 003BB0A0 90 04 00 64 */ stw r0, 0x64(r4) lbl_803BE144: /* 803BE144 003BB0A4 91 04 00 68 */ stw r8, 0x68(r4) -/* 803BE148 003BB0A8 4E 80 00 20 */ blr +/* 803BE148 003BB0A8 4E 80 00 20 */ blr .global CARDGetStatus CARDGetStatus: @@ -237,7 +237,7 @@ lbl_803BE25C: /* 803BE268 003BB1C8 83 A1 00 1C */ lwz r29, 0x1c(r1) /* 803BE26C 003BB1CC 38 21 00 28 */ addi r1, r1, 0x28 /* 803BE270 003BB1D0 7C 08 03 A6 */ mtlr r0 -/* 803BE274 003BB1D4 4E 80 00 20 */ blr +/* 803BE274 003BB1D4 4E 80 00 20 */ blr .global CARDSetStatusAsync CARDSetStatusAsync: @@ -341,5 +341,5 @@ lbl_803BE3CC: /* 803BE3DC 003BB33C 83 81 00 20 */ lwz r28, 0x20(r1) /* 803BE3E0 003BB340 38 21 00 30 */ addi r1, r1, 0x30 /* 803BE3E4 003BB344 7C 08 03 A6 */ mtlr r0 -/* 803BE3E8 003BB348 4E 80 00 20 */ blr +/* 803BE3E8 003BB348 4E 80 00 20 */ blr diff --git a/asm/Dolphin/card/CARDUnlock.s b/asm/Dolphin/card/CARDUnlock.s index 66644895..8730f543 100644 --- a/asm/Dolphin/card/CARDUnlock.s +++ b/asm/Dolphin/card/CARDUnlock.s @@ -4,7 +4,96 @@ .global lbl_803F6D00 lbl_803F6D00: - .incbin "baserom.dol", 0x3F3D00, 0x160 + # ROM: 0x3F3D00 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000021 + .4byte 0x02FF0021 + .4byte 0x13061203 + .4byte 0x12041305 + .4byte 0x009200FF + .4byte 0x0088FFFF + .4byte 0x0089FFFF + .4byte 0x008AFFFF + .4byte 0x008BFFFF + .4byte 0x8F0002BF + .4byte 0x008816FC + .4byte 0xDCD116FD + .4byte 0x000016FB + .4byte 0x000102BF + .4byte 0x008E25FF + .4byte 0x0380FF00 + .4byte 0x02940027 + .4byte 0x02BF008E + .4byte 0x1FDF24FF + .4byte 0x02400FFF + .4byte 0x00980400 + .4byte 0x009A0010 + .4byte 0x00990000 + .4byte 0x8E0002BF + .4byte 0x009402BF + .4byte 0x864402BF + .4byte 0x008816FC + .4byte 0xDCD116FD + .4byte 0x000316FB + .4byte 0x00018F00 + .4byte 0x02BF008E + .4byte 0x0380CDD1 + .4byte 0x02940048 + .4byte 0x27FF0380 + .4byte 0x00010295 + .4byte 0x005A0380 + .4byte 0x00020295 + .4byte 0x8000029F + .4byte 0x00480021 + .4byte 0x8E0002BF + .4byte 0x008E25FF + .4byte 0x02BF008E + .4byte 0x25FF02BF + .4byte 0x008E25FF + .4byte 0x02BF008E + .4byte 0x00C5FFFF + .4byte 0x03400FFF + .4byte 0x1C9F02BF + .4byte 0x008E00C7 + .4byte 0xFFFF02BF + .4byte 0x008E00C6 + .4byte 0xFFFF02BF + .4byte 0x008E00C0 + .4byte 0xFFFF02BF + .4byte 0x008E20FF + .4byte 0x03400FFF + .4byte 0x1F5F02BF + .4byte 0x008E21FF + .4byte 0x02BF008E + .4byte 0x23FF1205 + .4byte 0x1206029F + .4byte 0x80B50021 + .4byte 0x27FC03C0 + .4byte 0x8000029D + .4byte 0x008802DF + .4byte 0x27FE03C0 + .4byte 0x8000029C + .4byte 0x008E02DF + .4byte 0x2ECE2CCF + .4byte 0x00F8FFCD + .4byte 0x00F9FFC9 + .4byte 0x00FAFFCB + .4byte 0x26C902C0 + .4byte 0x0004029D + .4byte 0x009C02DF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .section .sdata, "wa" .global lbl_805A8BF8 @@ -118,7 +207,7 @@ lbl_803B91E8: /* 803B91E8 003B6148 39 08 00 01 */ addi r8, r8, 1 /* 803B91EC 003B614C 42 00 FE C0 */ bdnz lbl_803B90AC /* 803B91F0 003B6150 7C E3 3B 78 */ mr r3, r7 -/* 803B91F4 003B6154 4E 80 00 20 */ blr +/* 803B91F4 003B6154 4E 80 00 20 */ blr .global ReadArrayUnlock ReadArrayUnlock: @@ -207,7 +296,7 @@ lbl_803B9328: /* 803B932C 003B628C 80 01 00 44 */ lwz r0, 0x44(r1) /* 803B9330 003B6290 38 21 00 40 */ addi r1, r1, 0x40 /* 803B9334 003B6294 7C 08 03 A6 */ mtlr r0 -/* 803B9338 003B6298 4E 80 00 20 */ blr +/* 803B9338 003B6298 4E 80 00 20 */ blr .global DummyLen DummyLen: @@ -264,7 +353,7 @@ lbl_803B93E4: /* 803B93F0 003B6350 83 A1 00 1C */ lwz r29, 0x1c(r1) /* 803B93F4 003B6354 38 21 00 28 */ addi r1, r1, 0x28 /* 803B93F8 003B6358 7C 08 03 A6 */ mtlr r0 -/* 803B93FC 003B635C 4E 80 00 20 */ blr +/* 803B93FC 003B635C 4E 80 00 20 */ blr .global __CARDUnlock __CARDUnlock: @@ -1011,7 +1100,7 @@ lbl_803B9F44: /* 803B9F48 003B6EA8 80 01 01 24 */ lwz r0, 0x124(r1) /* 803B9F4C 003B6EAC 38 21 01 20 */ addi r1, r1, 0x120 /* 803B9F50 003B6EB0 7C 08 03 A6 */ mtlr r0 -/* 803B9F54 003B6EB4 4E 80 00 20 */ blr +/* 803B9F54 003B6EB4 4E 80 00 20 */ blr .global InitCallback InitCallback: @@ -1045,7 +1134,7 @@ lbl_803B9FA8: /* 803B9FB8 003B6F18 83 E1 00 14 */ lwz r31, 0x14(r1) /* 803B9FBC 003B6F1C 38 21 00 18 */ addi r1, r1, 0x18 /* 803B9FC0 003B6F20 7C 08 03 A6 */ mtlr r0 -/* 803B9FC4 003B6F24 4E 80 00 20 */ blr +/* 803B9FC4 003B6F24 4E 80 00 20 */ blr .global DoneCallback DoneCallback: @@ -1259,4 +1348,4 @@ lbl_803BA2CC: /* 803BA2DC 003B723C 83 81 00 78 */ lwz r28, 0x78(r1) /* 803BA2E0 003B7240 38 21 00 88 */ addi r1, r1, 0x88 /* 803BA2E4 003B7244 7C 08 03 A6 */ mtlr r0 -/* 803BA2E8 003B7248 4E 80 00 20 */ blr +/* 803BA2E8 003B7248 4E 80 00 20 */ blr diff --git a/asm/Dolphin/card/CARDWrite.s b/asm/Dolphin/card/CARDWrite.s index 401b697f..ab5a9230 100644 --- a/asm/Dolphin/card/CARDWrite.s +++ b/asm/Dolphin/card/CARDWrite.s @@ -92,7 +92,7 @@ lbl_803BDA64: /* 803BDA80 003BA9E0 7D 88 03 A6 */ mtlr r12 /* 803BDA84 003BA9E4 38 7E 00 00 */ addi r3, r30, 0 /* 803BDA88 003BA9E8 38 9C 00 00 */ addi r4, r28, 0 -/* 803BDA8C 003BA9EC 4E 80 00 21 */ blrl +/* 803BDA8C 003BA9EC 4E 80 00 21 */ blrl lbl_803BDA90: /* 803BDA90 003BA9F0 80 01 00 24 */ lwz r0, 0x24(r1) /* 803BDA94 003BA9F4 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -101,7 +101,7 @@ lbl_803BDA90: /* 803BDAA0 003BAA00 83 81 00 10 */ lwz r28, 0x10(r1) /* 803BDAA4 003BAA04 38 21 00 20 */ addi r1, r1, 0x20 /* 803BDAA8 003BAA08 7C 08 03 A6 */ mtlr r0 -/* 803BDAAC 003BAA0C 4E 80 00 20 */ blr +/* 803BDAAC 003BAA0C 4E 80 00 20 */ blr EraseCallback: /* 803BDAB0 003BAA10 7C 08 02 A6 */ mflr r0 @@ -140,7 +140,7 @@ lbl_803BDB14: /* 803BDB30 003BAA90 7D 88 03 A6 */ mtlr r12 /* 803BDB34 003BAA94 38 7C 00 00 */ addi r3, r28, 0 /* 803BDB38 003BAA98 38 9D 00 00 */ addi r4, r29, 0 -/* 803BDB3C 003BAA9C 4E 80 00 21 */ blrl +/* 803BDB3C 003BAA9C 4E 80 00 21 */ blrl lbl_803BDB40: /* 803BDB40 003BAAA0 80 01 00 24 */ lwz r0, 0x24(r1) /* 803BDB44 003BAAA4 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -149,7 +149,7 @@ lbl_803BDB40: /* 803BDB50 003BAAB0 83 81 00 10 */ lwz r28, 0x10(r1) /* 803BDB54 003BAAB4 38 21 00 20 */ addi r1, r1, 0x20 /* 803BDB58 003BAAB8 7C 08 03 A6 */ mtlr r0 -/* 803BDB5C 003BAABC 4E 80 00 20 */ blr +/* 803BDB5C 003BAABC 4E 80 00 20 */ blr .global CARDWriteAsync CARDWriteAsync: @@ -229,4 +229,4 @@ lbl_803BDC60: /* 803BDC64 003BABC4 80 01 00 3C */ lwz r0, 0x3c(r1) /* 803BDC68 003BABC8 38 21 00 38 */ addi r1, r1, 0x38 /* 803BDC6C 003BABCC 7C 08 03 A6 */ mtlr r0 -/* 803BDC70 003BABD0 4E 80 00 20 */ blr +/* 803BDC70 003BABD0 4E 80 00 20 */ blr diff --git a/asm/Dolphin/db.s b/asm/Dolphin/db.s index 2a0906ed..f9f69c07 100644 --- a/asm/Dolphin/db.s +++ b/asm/Dolphin/db.s @@ -6,12 +6,12 @@ lbl_805A9740: lbl_805A9744: .skip 0x4 - + .section .data .global lbl_803EF9B8 lbl_803EF9B8: .asciz "DBExceptionDestination\n" - + .section .text, "ax" .global DBInit @@ -25,7 +25,7 @@ DBInit: /* 8036F8E4 0036C844 90 04 00 48 */ stw r0, 0x48(r4) /* 8036F8E8 0036C848 38 00 00 01 */ li r0, 1 /* 8036F8EC 0036C84C 90 0D AB 84 */ stw r0, lbl_805A9744@sda21(r13) -/* 8036F8F0 0036C850 4E 80 00 20 */ blr +/* 8036F8F0 0036C850 4E 80 00 20 */ blr .global __DBExceptionDestinationAux __DBExceptionDestinationAux: @@ -46,7 +46,7 @@ __DBExceptionDestinationAux: /* 8036F92C 0036C88C 83 E1 00 14 */ lwz r31, 0x14(r1) /* 8036F930 0036C890 38 21 00 18 */ addi r1, r1, 0x18 /* 8036F934 0036C894 7C 08 03 A6 */ mtlr r0 -/* 8036F938 0036C898 4E 80 00 20 */ blr +/* 8036F938 0036C898 4E 80 00 20 */ blr .global __DBExceptionDestination __DBExceptionDestination: @@ -63,7 +63,7 @@ __DBIsExceptionMarked: /* 8036F958 0036C8B8 80 84 00 04 */ lwz r4, 4(r4) /* 8036F95C 0036C8BC 7C 60 00 30 */ slw r0, r3, r0 /* 8036F960 0036C8C0 7C 83 00 38 */ and r3, r4, r0 -/* 8036F964 0036C8C4 4E 80 00 20 */ blr +/* 8036F964 0036C8C4 4E 80 00 20 */ blr .global DBPrintf DBPrintf: @@ -87,4 +87,4 @@ lbl_8036F990: /* 8036F9A8 0036C908 91 21 00 20 */ stw r9, 0x20(r1) /* 8036F9AC 0036C90C 91 41 00 24 */ stw r10, 0x24(r1) /* 8036F9B0 0036C910 38 21 00 70 */ addi r1, r1, 0x70 -/* 8036F9B4 0036C914 4E 80 00 20 */ blr +/* 8036F9B4 0036C914 4E 80 00 20 */ blr diff --git a/asm/Dolphin/dsp/dsp.s b/asm/Dolphin/dsp/dsp.s index c4766a94..0e649f0d 100644 --- a/asm/Dolphin/dsp/dsp.s +++ b/asm/Dolphin/dsp/dsp.s @@ -5,12 +5,12 @@ __DSPVersion: .4byte __DSPVersionString .balign 8 - + .section .sbss .global __DSP_init_flag __DSP_init_flag: .skip 0x8 - + .section .data __DSPVersionString: .asciz "<< Dolphin SDK - DSP\trelease build: Sep 5 2002 05:35:13 (0x2301) >>" @@ -20,7 +20,7 @@ __DSPVersionString: .asciz "Sep 5 2002" .asciz "05:35:13" .balign 4 - + .section .text, "ax" .global DSPCheckMailToDSP @@ -28,14 +28,14 @@ DSPCheckMailToDSP: /* 8036F9B8 0036C918 3C 60 CC 00 */ lis r3, 0xCC005000@ha /* 8036F9BC 0036C91C A0 03 50 00 */ lhz r0, 0xCC005000@l(r3) /* 8036F9C0 0036C920 54 03 8F FE */ rlwinm r3, r0, 0x11, 0x1f, 0x1f -/* 8036F9C4 0036C924 4E 80 00 20 */ blr +/* 8036F9C4 0036C924 4E 80 00 20 */ blr .global DSPCheckMailFromDSP DSPCheckMailFromDSP: /* 8036F9C8 0036C928 3C 60 CC 00 */ lis r3, 0xCC005004@ha /* 8036F9CC 0036C92C A0 03 50 04 */ lhz r0, 0xCC005004@l(r3) /* 8036F9D0 0036C930 54 03 8F FE */ rlwinm r3, r0, 0x11, 0x1f, 0x1f -/* 8036F9D4 0036C934 4E 80 00 20 */ blr +/* 8036F9D4 0036C934 4E 80 00 20 */ blr .global DSPReadMailFromDSP DSPReadMailFromDSP: @@ -44,7 +44,7 @@ DSPReadMailFromDSP: /* 8036F9E0 0036C940 A0 03 00 04 */ lhz r0, 4(r3) /* 8036F9E4 0036C944 A0 63 00 06 */ lhz r3, 6(r3) /* 8036F9E8 0036C948 50 03 80 1E */ rlwimi r3, r0, 0x10, 0, 0xf -/* 8036F9EC 0036C94C 4E 80 00 20 */ blr +/* 8036F9EC 0036C94C 4E 80 00 20 */ blr .global DSPSendMailToDSP DSPSendMailToDSP: @@ -52,7 +52,7 @@ DSPSendMailToDSP: /* 8036F9F4 0036C954 54 60 84 3E */ srwi r0, r3, 0x10 /* 8036F9F8 0036C958 B0 04 50 00 */ sth r0, 0xCC005000@l(r4) /* 8036F9FC 0036C95C B0 64 50 02 */ sth r3, 0x5002(r4) -/* 8036FA00 0036C960 4E 80 00 20 */ blr +/* 8036FA00 0036C960 4E 80 00 20 */ blr .global DSPInit DSPInit: @@ -105,7 +105,7 @@ lbl_8036FAB4: /* 8036FAB8 0036CA18 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8036FABC 0036CA1C 38 21 00 10 */ addi r1, r1, 0x10 /* 8036FAC0 0036CA20 7C 08 03 A6 */ mtlr r0 -/* 8036FAC4 0036CA24 4E 80 00 20 */ blr +/* 8036FAC4 0036CA24 4E 80 00 20 */ blr .global DSPReset DSPReset: @@ -126,7 +126,7 @@ DSPReset: /* 8036FB00 0036CA60 80 01 00 0C */ lwz r0, 0xc(r1) /* 8036FB04 0036CA64 38 21 00 08 */ addi r1, r1, 8 /* 8036FB08 0036CA68 7C 08 03 A6 */ mtlr r0 -/* 8036FB0C 0036CA6C 4E 80 00 20 */ blr +/* 8036FB0C 0036CA6C 4E 80 00 20 */ blr .global DSPHalt DSPHalt: @@ -145,14 +145,14 @@ DSPHalt: /* 8036FB40 0036CAA0 80 01 00 0C */ lwz r0, 0xc(r1) /* 8036FB44 0036CAA4 38 21 00 08 */ addi r1, r1, 8 /* 8036FB48 0036CAA8 7C 08 03 A6 */ mtlr r0 -/* 8036FB4C 0036CAAC 4E 80 00 20 */ blr +/* 8036FB4C 0036CAAC 4E 80 00 20 */ blr .global DSPGetDMAStatus DSPGetDMAStatus: /* 8036FB50 0036CAB0 3C 60 CC 00 */ lis r3, 0xCC00500A@ha /* 8036FB54 0036CAB4 A0 03 50 0A */ lhz r0, 0xCC00500A@l(r3) /* 8036FB58 0036CAB8 54 03 05 AC */ rlwinm r3, r0, 0, 0x16, 0x16 -/* 8036FB5C 0036CABC 4E 80 00 20 */ blr +/* 8036FB5C 0036CABC 4E 80 00 20 */ blr .global DSPAddTask DSPAddTask: @@ -184,4 +184,4 @@ lbl_8036FBB4: /* 8036FBC0 0036CB20 83 C1 00 10 */ lwz r30, 0x10(r1) /* 8036FBC4 0036CB24 38 21 00 18 */ addi r1, r1, 0x18 /* 8036FBC8 0036CB28 7C 08 03 A6 */ mtlr r0 -/* 8036FBCC 0036CB2C 4E 80 00 20 */ blr +/* 8036FBCC 0036CB2C 4E 80 00 20 */ blr diff --git a/asm/Dolphin/dsp/dsp_debug.s b/asm/Dolphin/dsp/dsp_debug.s index 1023a0c4..ad7d11c6 100644 --- a/asm/Dolphin/dsp/dsp_debug.s +++ b/asm/Dolphin/dsp/dsp_debug.s @@ -24,4 +24,4 @@ lbl_8036FBF8: /* 8036FC10 0036CB70 91 21 00 20 */ stw r9, 0x20(r1) /* 8036FC14 0036CB74 91 41 00 24 */ stw r10, 0x24(r1) /* 8036FC18 0036CB78 38 21 00 70 */ addi r1, r1, 0x70 -/* 8036FC1C 0036CB7C 4E 80 00 20 */ blr +/* 8036FC1C 0036CB7C 4E 80 00 20 */ blr diff --git a/asm/Dolphin/dsp/dsp_task.s b/asm/Dolphin/dsp/dsp_task.s index b5e41556..655e6b4b 100644 --- a/asm/Dolphin/dsp/dsp_task.s +++ b/asm/Dolphin/dsp/dsp_task.s @@ -16,7 +16,7 @@ lbl_803EFA50: .asciz "__DSP_boot_task() : Start Vector : 0x%08X\n" .balign 4 .asciz "__DSP_add_task() : Added task : 0x%08X\n" - + .section .sbss .global __DSP_rude_task_pending @@ -96,7 +96,7 @@ lbl_8036FCCC: /* 8036FCDC 0036CC3C 28 0C 00 00 */ cmplwi r12, 0 /* 8036FCE0 0036CC40 41 82 03 40 */ beq lbl_80370020 /* 8036FCE4 0036CC44 7D 88 03 A6 */ mtlr r12 -/* 8036FCE8 0036CC48 4E 80 00 21 */ blrl +/* 8036FCE8 0036CC48 4E 80 00 21 */ blrl /* 8036FCEC 0036CC4C 48 00 03 34 */ b lbl_80370020 lbl_8036FCF0: /* 8036FCF0 0036CC50 38 00 00 01 */ li r0, 1 @@ -106,7 +106,7 @@ lbl_8036FCF0: /* 8036FD00 0036CC60 28 0C 00 00 */ cmplwi r12, 0 /* 8036FD04 0036CC64 41 82 03 1C */ beq lbl_80370020 /* 8036FD08 0036CC68 7D 88 03 A6 */ mtlr r12 -/* 8036FD0C 0036CC6C 4E 80 00 21 */ blrl +/* 8036FD0C 0036CC6C 4E 80 00 21 */ blrl /* 8036FD10 0036CC70 48 00 03 10 */ b lbl_80370020 lbl_8036FD14: /* 8036FD14 0036CC74 80 0D AB 90 */ lwz r0, __DSP_rude_task_pending@sda21(r13) @@ -130,7 +130,7 @@ lbl_8036FD38: /* 8036FD58 0036CCB8 28 0C 00 00 */ cmplwi r12, 0 /* 8036FD5C 0036CCBC 41 82 02 C4 */ beq lbl_80370020 /* 8036FD60 0036CCC0 7D 88 03 A6 */ mtlr r12 -/* 8036FD64 0036CCC4 4E 80 00 21 */ blrl +/* 8036FD64 0036CCC4 4E 80 00 21 */ blrl /* 8036FD68 0036CCC8 48 00 02 B8 */ b lbl_80370020 lbl_8036FD6C: /* 8036FD6C 0036CCCC 3C 60 CD D1 */ lis r3, 0xCDD10001@ha @@ -171,7 +171,7 @@ lbl_8036FDD8: /* 8036FDEC 0036CD4C 28 0C 00 00 */ cmplwi r12, 0 /* 8036FDF0 0036CD50 41 82 02 30 */ beq lbl_80370020 /* 8036FDF4 0036CD54 7D 88 03 A6 */ mtlr r12 -/* 8036FDF8 0036CD58 4E 80 00 21 */ blrl +/* 8036FDF8 0036CD58 4E 80 00 21 */ blrl /* 8036FDFC 0036CD5C 48 00 02 24 */ b lbl_80370020 lbl_8036FE00: /* 8036FE00 0036CD60 3C 60 CD D1 */ lis r3, 0xCDD10001@ha @@ -217,7 +217,7 @@ lbl_8036FE7C: /* 8036FE90 0036CDF0 41 82 00 10 */ beq lbl_8036FEA0 /* 8036FE94 0036CDF4 7D 88 03 A6 */ mtlr r12 /* 8036FE98 0036CDF8 38 65 00 00 */ addi r3, r5, 0 -/* 8036FE9C 0036CDFC 4E 80 00 21 */ blrl +/* 8036FE9C 0036CDFC 4E 80 00 21 */ blrl lbl_8036FEA0: /* 8036FEA0 0036CE00 3C 60 CD D1 */ lis r3, 0xCDD10001@ha /* 8036FEA4 0036CE04 38 63 00 01 */ addi r3, r3, 0xCDD10001@l @@ -249,7 +249,7 @@ lbl_8036FEE4: /* 8036FF04 0036CE64 41 82 00 10 */ beq lbl_8036FF14 /* 8036FF08 0036CE68 7D 88 03 A6 */ mtlr r12 /* 8036FF0C 0036CE6C 38 65 00 00 */ addi r3, r5, 0 -/* 8036FF10 0036CE70 4E 80 00 21 */ blrl +/* 8036FF10 0036CE70 4E 80 00 21 */ blrl lbl_8036FF14: /* 8036FF14 0036CE74 3C 60 CD D1 */ lis r3, 0xCDD10002@ha /* 8036FF18 0036CE78 38 63 00 02 */ addi r3, r3, 0xCDD10002@l @@ -270,7 +270,7 @@ lbl_8036FF44: /* 8036FF4C 0036CEAC 41 82 00 10 */ beq lbl_8036FF5C /* 8036FF50 0036CEB0 7D 88 03 A6 */ mtlr r12 /* 8036FF54 0036CEB4 38 65 00 00 */ addi r3, r5, 0 -/* 8036FF58 0036CEB8 4E 80 00 21 */ blrl +/* 8036FF58 0036CEB8 4E 80 00 21 */ blrl lbl_8036FF5C: /* 8036FF5C 0036CEBC 3C 60 CD D1 */ lis r3, 0xCDD10001@ha /* 8036FF60 0036CEC0 38 63 00 01 */ addi r3, r3, 0xCDD10001@l @@ -296,7 +296,7 @@ lbl_8036FFA0: /* 8036FFA8 0036CF08 41 82 00 10 */ beq lbl_8036FFB8 /* 8036FFAC 0036CF0C 7D 88 03 A6 */ mtlr r12 /* 8036FFB0 0036CF10 38 65 00 00 */ addi r3, r5, 0 -/* 8036FFB4 0036CF14 4E 80 00 21 */ blrl +/* 8036FFB4 0036CF14 4E 80 00 21 */ blrl lbl_8036FFB8: /* 8036FFB8 0036CF18 3C 60 CD D1 */ lis r3, 0xCDD10001@ha /* 8036FFBC 0036CF1C 38 63 00 01 */ addi r3, r3, 0xCDD10001@l @@ -325,7 +325,7 @@ lbl_80370008: /* 80370010 0036CF70 41 82 00 10 */ beq lbl_80370020 /* 80370014 0036CF74 7D 88 03 A6 */ mtlr r12 /* 80370018 0036CF78 38 65 00 00 */ addi r3, r5, 0 -/* 8037001C 0036CF7C 4E 80 00 21 */ blrl +/* 8037001C 0036CF7C 4E 80 00 21 */ blrl lbl_80370020: /* 80370020 0036CF80 38 61 00 10 */ addi r3, r1, 0x10 /* 80370024 0036CF84 48 00 F5 F1 */ bl OSClearContext @@ -335,7 +335,7 @@ lbl_80370020: /* 80370034 0036CF94 83 E1 02 E4 */ lwz r31, 0x2e4(r1) /* 80370038 0036CF98 38 21 02 E8 */ addi r1, r1, 0x2e8 /* 8037003C 0036CF9C 7C 08 03 A6 */ mtlr r0 -/* 80370040 0036CFA0 4E 80 00 20 */ blr +/* 80370040 0036CFA0 4E 80 00 20 */ blr .global __DSP_exec_task __DSP_exec_task: @@ -463,7 +463,7 @@ lbl_803701CC: /* 803701D4 0036D134 83 C1 00 10 */ lwz r30, 0x10(r1) /* 803701D8 0036D138 38 21 00 18 */ addi r1, r1, 0x18 /* 803701DC 0036D13C 7C 08 03 A6 */ mtlr r0 -/* 803701E0 0036D140 4E 80 00 20 */ blr +/* 803701E0 0036D140 4E 80 00 20 */ blr .global __DSP_boot_task __DSP_boot_task: @@ -576,7 +576,7 @@ lbl_803702EC: /* 80370360 0036D2C0 83 C1 00 10 */ lwz r30, 0x10(r1) /* 80370364 0036D2C4 38 21 00 18 */ addi r1, r1, 0x18 /* 80370368 0036D2C8 7C 08 03 A6 */ mtlr r0 -/* 8037036C 0036D2CC 4E 80 00 20 */ blr +/* 8037036C 0036D2CC 4E 80 00 20 */ blr .global __DSP_insert_task __DSP_insert_task: @@ -589,7 +589,7 @@ __DSP_insert_task: /* 80370388 0036D2E8 90 6D AB A0 */ stw r3, __DSP_first_task@sda21(r13) /* 8037038C 0036D2EC 90 03 00 3C */ stw r0, 0x3c(r3) /* 80370390 0036D2F0 90 03 00 38 */ stw r0, 0x38(r3) -/* 80370394 0036D2F4 4E 80 00 20 */ blr +/* 80370394 0036D2F4 4E 80 00 20 */ blr lbl_80370398: /* 80370398 0036D2F8 7C 05 03 78 */ mr r5, r0 /* 8037039C 0036D2FC 48 00 00 44 */ b lbl_803703E0 @@ -617,7 +617,7 @@ lbl_803703E0: /* 803703E4 0036D344 40 82 FF BC */ bne lbl_803703A0 lbl_803703E8: /* 803703E8 0036D348 28 05 00 00 */ cmplwi r5, 0 -/* 803703EC 0036D34C 4C 82 00 20 */ bnelr +/* 803703EC 0036D34C 4C 82 00 20 */ bnelr /* 803703F0 0036D350 80 8D AB 9C */ lwz r4, __DSP_last_task@sda21(r13) /* 803703F4 0036D354 38 00 00 00 */ li r0, 0 /* 803703F8 0036D358 90 64 00 38 */ stw r3, 0x38(r4) @@ -625,7 +625,7 @@ lbl_803703E8: /* 80370400 0036D360 80 0D AB 9C */ lwz r0, __DSP_last_task@sda21(r13) /* 80370404 0036D364 90 03 00 3C */ stw r0, 0x3c(r3) /* 80370408 0036D368 90 6D AB 9C */ stw r3, __DSP_last_task@sda21(r13) -/* 8037040C 0036D36C 4E 80 00 20 */ blr +/* 8037040C 0036D36C 4E 80 00 20 */ blr .global __DSP_remove_task __DSP_remove_task: @@ -642,12 +642,12 @@ __DSP_remove_task: /* 80370438 0036D398 90 0D AB A0 */ stw r0, __DSP_first_task@sda21(r13) /* 8037043C 0036D39C 80 63 00 38 */ lwz r3, 0x38(r3) /* 80370440 0036D3A0 90 83 00 3C */ stw r4, 0x3c(r3) -/* 80370444 0036D3A4 4E 80 00 20 */ blr +/* 80370444 0036D3A4 4E 80 00 20 */ blr lbl_80370448: /* 80370448 0036D3A8 90 8D AB A4 */ stw r4, __DSP_curr_task@sda21(r13) /* 8037044C 0036D3AC 90 8D AB 9C */ stw r4, __DSP_last_task@sda21(r13) /* 80370450 0036D3B0 90 8D AB A0 */ stw r4, __DSP_first_task@sda21(r13) -/* 80370454 0036D3B4 4E 80 00 20 */ blr +/* 80370454 0036D3B4 4E 80 00 20 */ blr lbl_80370458: /* 80370458 0036D3B8 80 0D AB 9C */ lwz r0, __DSP_last_task@sda21(r13) /* 8037045C 0036D3BC 7C 00 18 40 */ cmplw r0, r3 @@ -658,7 +658,7 @@ lbl_80370458: /* 80370470 0036D3D0 90 83 00 38 */ stw r4, 0x38(r3) /* 80370474 0036D3D4 80 0D AB A0 */ lwz r0, __DSP_first_task@sda21(r13) /* 80370478 0036D3D8 90 0D AB A4 */ stw r0, __DSP_curr_task@sda21(r13) -/* 8037047C 0036D3DC 4E 80 00 20 */ blr +/* 8037047C 0036D3DC 4E 80 00 20 */ blr lbl_80370480: /* 80370480 0036D3E0 80 03 00 38 */ lwz r0, 0x38(r3) /* 80370484 0036D3E4 90 0D AB A4 */ stw r0, __DSP_curr_task@sda21(r13) @@ -668,5 +668,5 @@ lbl_80370480: /* 80370494 0036D3F4 80 03 00 3C */ lwz r0, 0x3c(r3) /* 80370498 0036D3F8 80 63 00 38 */ lwz r3, 0x38(r3) /* 8037049C 0036D3FC 90 03 00 3C */ stw r0, 0x3c(r3) -/* 803704A0 0036D400 4E 80 00 20 */ blr +/* 803704A0 0036D400 4E 80 00 20 */ blr diff --git a/asm/Dolphin/dtk.s b/asm/Dolphin/dtk.s index ffaee414..ae6fc75f 100644 --- a/asm/Dolphin/dtk.s +++ b/asm/Dolphin/dtk.s @@ -22,7 +22,7 @@ lbl_805699F8: .global lbl_80569A28 lbl_80569A28: .skip 0x30 - + .section .sbss, "wa" .balign 4 .global lbl_805A9B98 @@ -64,18 +64,18 @@ lbl_805A9BC0: .global lbl_805A9BC4 lbl_805A9BC4: .skip 0x4 - + .section .text, "ax" .global sub_803b7518 sub_803b7518: /* 803B7518 003B4478 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 803B751C 003B447C 4C 82 00 20 */ bnelr +/* 803B751C 003B447C 4C 82 00 20 */ bnelr /* 803B7520 003B4480 38 00 00 01 */ li r0, 1 /* 803B7524 003B4484 90 0D B0 00 */ stw r0, lbl_805A9BC0@sda21(r13) /* 803B7528 003B4488 38 00 00 00 */ li r0, 0 /* 803B752C 003B448C 90 0D AF F0 */ stw r0, lbl_805A9BB0@sda21(r13) -/* 803B7530 003B4490 4E 80 00 20 */ blr +/* 803B7530 003B4490 4E 80 00 20 */ blr .global sub_803b7534 sub_803b7534: @@ -107,12 +107,12 @@ sub_803b7534: /* 803B7598 003B44F8 54 03 07 FF */ clrlwi. r3, r0, 0x1f /* 803B759C 003B44FC 41 82 00 0C */ beq lbl_803B75A8 /* 803B75A0 003B4500 7D 88 03 A6 */ mtlr r12 -/* 803B75A4 003B4504 4E 80 00 21 */ blrl +/* 803B75A4 003B4504 4E 80 00 21 */ blrl lbl_803B75A8: /* 803B75A8 003B4508 80 01 00 0C */ lwz r0, 0xc(r1) /* 803B75AC 003B450C 38 21 00 08 */ addi r1, r1, 8 /* 803B75B0 003B4510 7C 08 03 A6 */ mtlr r0 -/* 803B75B4 003B4514 4E 80 00 20 */ blr +/* 803B75B4 003B4514 4E 80 00 20 */ blr .global sub_803b75b8 sub_803b75b8: @@ -141,12 +141,12 @@ sub_803b75b8: /* 803B7610 003B4570 54 03 06 B5 */ rlwinm. r3, r0, 0, 0x1a, 0x1a /* 803B7614 003B4574 41 82 00 0C */ beq lbl_803B7620 /* 803B7618 003B4578 7D 88 03 A6 */ mtlr r12 -/* 803B761C 003B457C 4E 80 00 21 */ blrl +/* 803B761C 003B457C 4E 80 00 21 */ blrl lbl_803B7620: /* 803B7620 003B4580 80 01 00 0C */ lwz r0, 0xc(r1) /* 803B7624 003B4584 38 21 00 08 */ addi r1, r1, 8 /* 803B7628 003B4588 7C 08 03 A6 */ mtlr r0 -/* 803B762C 003B458C 4E 80 00 20 */ blr +/* 803B762C 003B458C 4E 80 00 20 */ blr .global sub_803b7630 sub_803b7630: @@ -169,7 +169,7 @@ sub_803b7630: /* 803B7670 003B45D0 54 03 06 F7 */ rlwinm. r3, r0, 0, 0x1b, 0x1b /* 803B7674 003B45D4 41 82 00 0C */ beq lbl_803B7680 /* 803B7678 003B45D8 7D 88 03 A6 */ mtlr r12 -/* 803B767C 003B45DC 4E 80 00 21 */ blrl +/* 803B767C 003B45DC 4E 80 00 21 */ blrl lbl_803B7680: /* 803B7680 003B45E0 38 00 00 03 */ li r0, 3 /* 803B7684 003B45E4 90 0D AF E4 */ stw r0, lbl_805A9BA4@sda21(r13) @@ -285,7 +285,7 @@ lbl_803B781C: /* 803B781C 003B477C 80 01 00 0C */ lwz r0, 0xc(r1) /* 803B7820 003B4780 38 21 00 08 */ addi r1, r1, 8 /* 803B7824 003B4784 7C 08 03 A6 */ mtlr r0 -/* 803B7828 003B4788 4E 80 00 20 */ blr +/* 803B7828 003B4788 4E 80 00 20 */ blr .global sub_803b782c sub_803b782c: @@ -307,7 +307,7 @@ lbl_803B7864: /* 803B7864 003B47C4 80 01 00 0C */ lwz r0, 0xc(r1) /* 803B7868 003B47C8 38 21 00 08 */ addi r1, r1, 8 /* 803B786C 003B47CC 7C 08 03 A6 */ mtlr r0 -/* 803B7870 003B47D0 4E 80 00 20 */ blr +/* 803B7870 003B47D0 4E 80 00 20 */ blr .global sub_803b7874 sub_803b7874: @@ -335,7 +335,7 @@ lbl_803B78A0: /* 803B78C0 003B4820 93 ED AF E4 */ stw r31, lbl_805A9BA4@sda21(r13) /* 803B78C4 003B4824 41 82 00 10 */ beq lbl_803B78D4 /* 803B78C8 003B4828 7D 88 03 A6 */ mtlr r12 -/* 803B78CC 003B482C 4E 80 00 21 */ blrl +/* 803B78CC 003B482C 4E 80 00 21 */ blrl /* 803B78D0 003B4830 93 ED B0 04 */ stw r31, lbl_805A9BC4@sda21(r13) lbl_803B78D4: /* 803B78D4 003B4834 38 00 00 00 */ li r0, 0 @@ -345,7 +345,7 @@ lbl_803B78D4: /* 803B78E4 003B4844 83 E1 00 14 */ lwz r31, 0x14(r1) /* 803B78E8 003B4848 38 21 00 18 */ addi r1, r1, 0x18 /* 803B78EC 003B484C 7C 08 03 A6 */ mtlr r0 -/* 803B78F0 003B4850 4E 80 00 20 */ blr +/* 803B78F0 003B4850 4E 80 00 20 */ blr .global sub_803b78f4 sub_803b78f4: @@ -362,14 +362,14 @@ sub_803b78f4: /* 803B791C 003B487C 54 03 07 BD */ rlwinm. r3, r0, 0, 0x1e, 0x1e /* 803B7920 003B4880 41 82 00 0C */ beq lbl_803B792C /* 803B7924 003B4884 7D 88 03 A6 */ mtlr r12 -/* 803B7928 003B4888 4E 80 00 21 */ blrl +/* 803B7928 003B4888 4E 80 00 21 */ blrl lbl_803B792C: /* 803B792C 003B488C 38 00 00 00 */ li r0, 0 /* 803B7930 003B4890 90 0D AF E4 */ stw r0, lbl_805A9BA4@sda21(r13) /* 803B7934 003B4894 80 01 00 0C */ lwz r0, 0xc(r1) /* 803B7938 003B4898 38 21 00 08 */ addi r1, r1, 8 /* 803B793C 003B489C 7C 08 03 A6 */ mtlr r0 -/* 803B7940 003B48A0 4E 80 00 20 */ blr +/* 803B7940 003B48A0 4E 80 00 20 */ blr .global sub_803b7944 sub_803b7944: @@ -395,7 +395,7 @@ lbl_803B7978: /* 803B798C 003B48EC 80 01 00 0C */ lwz r0, 0xc(r1) /* 803B7990 003B48F0 38 21 00 08 */ addi r1, r1, 8 /* 803B7994 003B48F4 7C 08 03 A6 */ mtlr r0 -/* 803B7998 003B48F8 4E 80 00 20 */ blr +/* 803B7998 003B48F8 4E 80 00 20 */ blr .global DTKInit DTKInit: @@ -428,7 +428,7 @@ DTKInit: /* 803B7A04 003B4964 80 01 00 0C */ lwz r0, 0xc(r1) /* 803B7A08 003B4968 38 21 00 08 */ addi r1, r1, 8 /* 803B7A0C 003B496C 7C 08 03 A6 */ mtlr r0 -/* 803B7A10 003B4970 4E 80 00 20 */ blr +/* 803B7A10 003B4970 4E 80 00 20 */ blr .global sub_803b7a14 sub_803b7a14: @@ -489,7 +489,7 @@ lbl_803B7AC0: /* 803B7ADC 003B4A3C 54 03 07 39 */ rlwinm. r3, r0, 0, 0x1c, 0x1c /* 803B7AE0 003B4A40 41 82 00 0C */ beq lbl_803B7AEC /* 803B7AE4 003B4A44 7D 88 03 A6 */ mtlr r12 -/* 803B7AE8 003B4A48 4E 80 00 21 */ blrl +/* 803B7AE8 003B4A48 4E 80 00 21 */ blrl lbl_803B7AEC: /* 803B7AEC 003B4A4C 28 1F 00 00 */ cmplwi r31, 0 /* 803B7AF0 003B4A50 41 82 00 28 */ beq lbl_803B7B18 @@ -509,7 +509,7 @@ lbl_803B7B1C: /* 803B7B20 003B4A80 80 01 00 34 */ lwz r0, 0x34(r1) /* 803B7B24 003B4A84 38 21 00 30 */ addi r1, r1, 0x30 /* 803B7B28 003B4A88 7C 08 03 A6 */ mtlr r0 -/* 803B7B2C 003B4A8C 4E 80 00 20 */ blr +/* 803B7B2C 003B4A8C 4E 80 00 20 */ blr .global DTKFlushTracks DTKFlushTracks: @@ -539,16 +539,16 @@ lbl_803B7B84: /* 803B7B84 003B4AE4 80 01 00 0C */ lwz r0, 0xc(r1) /* 803B7B88 003B4AE8 38 21 00 08 */ addi r1, r1, 8 /* 803B7B8C 003B4AEC 7C 08 03 A6 */ mtlr r0 -/* 803B7B90 003B4AF0 4E 80 00 20 */ blr +/* 803B7B90 003B4AF0 4E 80 00 20 */ blr .global DTKSetSampleRate DTKSetSampleRate: -/* 803B7B94 003B4AF4 4E 80 00 20 */ blr +/* 803B7B94 003B4AF4 4E 80 00 20 */ blr .global DTKSetRepeatMode DTKSetRepeatMode: /* 803B7B98 003B4AF8 90 6D AF EC */ stw r3, lbl_805A9BAC@sda21(r13) -/* 803B7B9C 003B4AFC 4E 80 00 20 */ blr +/* 803B7B9C 003B4AFC 4E 80 00 20 */ blr .global DTKSetState DTKSetState: @@ -618,7 +618,7 @@ lbl_803B7C34: /* 803B7C8C 003B4BEC 54 03 07 FF */ clrlwi. r3, r0, 0x1f /* 803B7C90 003B4BF0 41 82 00 48 */ beq lbl_803B7CD8 /* 803B7C94 003B4BF4 7D 88 03 A6 */ mtlr r12 -/* 803B7C98 003B4BF8 4E 80 00 21 */ blrl +/* 803B7C98 003B4BF8 4E 80 00 21 */ blrl /* 803B7C9C 003B4BFC 48 00 00 3C */ b lbl_803B7CD8 lbl_803B7CA0: /* 803B7CA0 003B4C00 80 8D AF D8 */ lwz r4, lbl_805A9B98@sda21(r13) @@ -678,12 +678,12 @@ lbl_803B7D44: /* 803B7D60 003B4CC0 54 03 07 7B */ rlwinm. r3, r0, 0, 0x1d, 0x1d /* 803B7D64 003B4CC4 41 82 00 0C */ beq lbl_803B7D70 /* 803B7D68 003B4CC8 7D 88 03 A6 */ mtlr r12 -/* 803B7D6C 003B4CCC 4E 80 00 21 */ blrl +/* 803B7D6C 003B4CCC 4E 80 00 21 */ blrl lbl_803B7D70: /* 803B7D70 003B4CD0 80 01 00 0C */ lwz r0, 0xc(r1) /* 803B7D74 003B4CD4 38 21 00 08 */ addi r1, r1, 8 /* 803B7D78 003B4CD8 7C 08 03 A6 */ mtlr r0 -/* 803B7D7C 003B4CDC 4E 80 00 20 */ blr +/* 803B7D7C 003B4CDC 4E 80 00 20 */ blr .global DTKNextTrack DTKNextTrack: @@ -730,12 +730,12 @@ lbl_803B7E14: /* 803B7E14 003B4D74 80 01 00 0C */ lwz r0, 0xc(r1) /* 803B7E18 003B4D78 38 21 00 08 */ addi r1, r1, 8 /* 803B7E1C 003B4D7C 7C 08 03 A6 */ mtlr r0 -/* 803B7E20 003B4D80 4E 80 00 20 */ blr +/* 803B7E20 003B4D80 4E 80 00 20 */ blr .global DTKGetState DTKGetState: /* 803B7E24 003B4D84 80 6D AF E4 */ lwz r3, lbl_805A9BA4@sda21(r13) -/* 803B7E28 003B4D88 4E 80 00 20 */ blr +/* 803B7E28 003B4D88 4E 80 00 20 */ blr .global DTKSetVolume DTKSetVolume: @@ -757,4 +757,4 @@ lbl_803B7E60: /* 803B7E64 003B4DC4 83 E1 00 14 */ lwz r31, 0x14(r1) /* 803B7E68 003B4DC8 38 21 00 18 */ addi r1, r1, 0x18 /* 803B7E6C 003B4DCC 7C 08 03 A6 */ mtlr r0 -/* 803B7E70 003B4DD0 4E 80 00 20 */ blr +/* 803B7E70 003B4DD0 4E 80 00 20 */ blr diff --git a/asm/Dolphin/dvd/dvd.s b/asm/Dolphin/dvd/dvd.s index d9390ed6..3061c986 100644 --- a/asm/Dolphin/dvd/dvd.s +++ b/asm/Dolphin/dvd/dvd.s @@ -4,20 +4,31 @@ .global lbl_805A8A98 lbl_805A8A98: - .incbin "baserom.dol", 0x3F6438, 0x4 + # ROM: 0x3F6438 + .4byte 0x803EFF80 + .global lbl_805A8A9C lbl_805A8A9C: - .incbin "baserom.dol", 0x3F643C, 0x4 + # ROM: 0x3F643C + .4byte 0x00000001 + .global lbl_805A8AA0 lbl_805A8AA0: - .incbin "baserom.dol", 0x3F6440, 0x4 + # ROM: 0x3F6440 + .4byte 0x80371BA0 + .global lbl_805A8AA4 lbl_805A8AA4: - .incbin "baserom.dol", 0x3F6444, 0x8 + # ROM: 0x3F6444 + .asciz "dvd.c" + .balign 4 + .global lbl_805A8AAC lbl_805A8AAC: - .incbin "baserom.dol", 0x3F644C, 0x4 - + # ROM: 0x3F644C + .4byte 0xFFFFFFFF + + .section .bss .global lbl_80540B60 lbl_80540B60: @@ -69,27 +80,95 @@ lbl_805A9814: .skip 0x4 lbl_805A9818: .skip 0x8 - + .section .data .balign 8 .global lbl_803EFFC8 lbl_803EFFC8: - .incbin "baserom.dol", 0x3ECFC8, 0xC + # ROM: 0x3ECFC8 + .asciz "load fst\n" + .balign 4 + .global lbl_803EFFD4 lbl_803EFFD4: - .incbin "baserom.dol", 0x3ECFD4, 0x30 + # ROM: 0x3ECFD4 + .4byte 0x44564443 + .4byte 0x68616E67 + .4byte 0x65446973 + .4byte 0x6B28293A + .4byte 0x20465354 + .4byte 0x20696E20 + .4byte 0x74686520 + .4byte 0x6E657720 + .4byte 0x64697363 + .4byte 0x20697320 + .4byte 0x746F6F20 + .4byte 0x6269672E + .global lbl_803F0004 lbl_803F0004: - .incbin "baserom.dol", 0x3ED004, 0x4 + # ROM: 0x3ED004 + .4byte 0x20202000 + .global lbl_803F0008 lbl_803F0008: - .incbin "baserom.dol", 0x3ED008, 0x90 + # ROM: 0x3ED008 + .4byte 0x803731D8 + .4byte 0x80372F4C + .4byte 0x80372FEC + .4byte 0x80373010 + .4byte 0x80372F4C + .4byte 0x80372F20 + .4byte 0x80373030 + .4byte 0x80373094 + .4byte 0x803730C0 + .4byte 0x803730F4 + .4byte 0x80373118 + .4byte 0x8037313C + .4byte 0x80373160 + .4byte 0x80373184 + .4byte 0x803731AC + .4byte 0x80373020 + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .asciz "DVDChangeDiskAsync(): You can't specify NULL to company name. \n" + .balign 4 + .global lbl_803F0098 lbl_803F0098: - .incbin "baserom.dol", 0x3ED098, 0x34 + # ROM: 0x3ED098 + .4byte 0x8037425C + .4byte 0x8037425C + .4byte 0x8037427C + .4byte 0x803742C0 + .4byte 0x8037430C + .4byte 0x80374388 + .4byte 0x80374388 + .4byte 0x80374388 + .4byte 0x80374388 + .4byte 0x80374454 + .4byte 0x80374454 + .4byte 0x8037425C + .4byte 0x80374388 + .global lbl_803F00CC lbl_803F00CC: - .incbin "baserom.dol", 0x3ED0CC, 0x34 + # ROM: 0x3ED0CC + .4byte 0x80374750 + .4byte 0x80374758 + .4byte 0x80374748 + .4byte 0x80374748 + .4byte 0x80374750 + .4byte 0x80374750 + .4byte 0x80374750 + .4byte 0x80374750 + .4byte 0x80374750 + .4byte 0x80374758 + .4byte 0x80374748 + .4byte 0x80374748 + .4byte 0x80374750 + .section .text, "ax" @@ -147,7 +226,7 @@ lbl_80371C5C: /* 80371C60 0036EBC0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80371C64 0036EBC4 38 21 00 10 */ addi r1, r1, 0x10 /* 80371C68 0036EBC8 7C 08 03 A6 */ mtlr r0 -/* 80371C6C 0036EBCC 4E 80 00 20 */ blr +/* 80371C6C 0036EBCC 4E 80 00 20 */ blr .global stateReadingFST stateReadingFST: @@ -188,7 +267,7 @@ lbl_80371CC4: /* 80371CF4 0036EC54 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80371CF8 0036EC58 38 21 00 10 */ addi r1, r1, 0x10 /* 80371CFC 0036EC5C 7C 08 03 A6 */ mtlr r0 -/* 80371D00 0036EC60 4E 80 00 20 */ blr +/* 80371D00 0036EC60 4E 80 00 20 */ blr .global cbForReadingFST cbForReadingFST: @@ -219,7 +298,7 @@ lbl_80371D30: /* 80371D60 0036ECC0 41 82 00 10 */ beq lbl_80371D70 /* 80371D64 0036ECC4 7D 88 03 A6 */ mtlr r12 /* 80371D68 0036ECC8 38 60 00 00 */ li r3, 0 -/* 80371D6C 0036ECCC 4E 80 00 21 */ blrl +/* 80371D6C 0036ECCC 4E 80 00 21 */ blrl lbl_80371D70: /* 80371D70 0036ECD0 48 00 0E 95 */ bl stateReady /* 80371D74 0036ECD4 48 00 00 08 */ b lbl_80371D7C @@ -230,7 +309,7 @@ lbl_80371D7C: /* 80371D80 0036ECE0 83 E1 00 14 */ lwz r31, 0x14(r1) /* 80371D84 0036ECE4 38 21 00 18 */ addi r1, r1, 0x18 /* 80371D88 0036ECE8 7C 08 03 A6 */ mtlr r0 -/* 80371D8C 0036ECEC 4E 80 00 20 */ blr +/* 80371D8C 0036ECEC 4E 80 00 20 */ blr .global cbForStateError cbForStateError: @@ -259,7 +338,7 @@ lbl_80371DBC: /* 80371DE4 0036ED44 7D 88 03 A6 */ mtlr r12 /* 80371DE8 0036ED48 38 9F 00 00 */ addi r4, r31, 0 /* 80371DEC 0036ED4C 38 60 FF FF */ li r3, -1 -/* 80371DF0 0036ED50 4E 80 00 21 */ blrl +/* 80371DF0 0036ED50 4E 80 00 21 */ blrl lbl_80371DF4: /* 80371DF4 0036ED54 80 0D AC 30 */ lwz r0, lbl_805A97F0@sda21(r13) /* 80371DF8 0036ED58 28 00 00 00 */ cmplwi r0, 0 @@ -272,7 +351,7 @@ lbl_80371DF4: /* 80371E14 0036ED74 7D 88 03 A6 */ mtlr r12 /* 80371E18 0036ED78 38 9F 00 00 */ addi r4, r31, 0 /* 80371E1C 0036ED7C 38 60 00 00 */ li r3, 0 -/* 80371E20 0036ED80 4E 80 00 21 */ blrl +/* 80371E20 0036ED80 4E 80 00 21 */ blrl lbl_80371E24: /* 80371E24 0036ED84 48 00 0D E1 */ bl stateReady lbl_80371E28: @@ -280,7 +359,7 @@ lbl_80371E28: /* 80371E2C 0036ED8C 83 E1 00 14 */ lwz r31, 0x14(r1) /* 80371E30 0036ED90 38 21 00 18 */ addi r1, r1, 0x18 /* 80371E34 0036ED94 7C 08 03 A6 */ mtlr r0 -/* 80371E38 0036ED98 4E 80 00 20 */ blr +/* 80371E38 0036ED98 4E 80 00 20 */ blr .global stateTimeout stateTimeout: @@ -296,7 +375,7 @@ stateTimeout: /* 80371E60 0036EDC0 80 01 00 0C */ lwz r0, 0xc(r1) /* 80371E64 0036EDC4 38 21 00 08 */ addi r1, r1, 8 /* 80371E68 0036EDC8 7C 08 03 A6 */ mtlr r0 -/* 80371E6C 0036EDCC 4E 80 00 20 */ blr +/* 80371E6C 0036EDCC 4E 80 00 20 */ blr .global stateGettingError stateGettingError: @@ -309,7 +388,7 @@ stateGettingError: /* 80371E88 0036EDE8 80 01 00 0C */ lwz r0, 0xc(r1) /* 80371E8C 0036EDEC 38 21 00 08 */ addi r1, r1, 8 /* 80371E90 0036EDF0 7C 08 03 A6 */ mtlr r0 -/* 80371E94 0036EDF4 4E 80 00 20 */ blr +/* 80371E94 0036EDF4 4E 80 00 20 */ blr .global CategorizeError CategorizeError: @@ -318,7 +397,7 @@ CategorizeError: /* 80371EA0 0036EE00 40 82 00 10 */ bne lbl_80371EB0 /* 80371EA4 0036EE04 90 6D AC 40 */ stw r3, lbl_805A9800@sda21(r13) /* 80371EA8 0036EE08 38 60 00 01 */ li r3, 1 -/* 80371EAC 0036EE0C 4E 80 00 20 */ blr +/* 80371EAC 0036EE0C 4E 80 00 20 */ blr lbl_80371EB0: /* 80371EB0 0036EE10 54 64 02 3E */ clrlwi r4, r3, 8 /* 80371EB4 0036EE14 3C 04 FF FA */ addis r0, r4, 0xfffa @@ -332,7 +411,7 @@ lbl_80371EB0: /* 80371ED4 0036EE34 40 82 00 0C */ bne lbl_80371EE0 lbl_80371ED8: /* 80371ED8 0036EE38 38 60 00 00 */ li r3, 0 -/* 80371EDC 0036EE3C 4E 80 00 20 */ blr +/* 80371EDC 0036EE3C 4E 80 00 20 */ blr lbl_80371EE0: /* 80371EE0 0036EE40 80 6D AC 44 */ lwz r3, lbl_805A9804@sda21(r13) /* 80371EE4 0036EE44 38 03 00 01 */ addi r0, r3, 1 @@ -345,11 +424,11 @@ lbl_80371EE0: /* 80371F00 0036EE60 40 82 00 10 */ bne lbl_80371F10 /* 80371F04 0036EE64 90 8D AC 40 */ stw r4, lbl_805A9800@sda21(r13) /* 80371F08 0036EE68 38 60 00 01 */ li r3, 1 -/* 80371F0C 0036EE6C 4E 80 00 20 */ blr +/* 80371F0C 0036EE6C 4E 80 00 20 */ blr lbl_80371F10: /* 80371F10 0036EE70 90 8D AC 40 */ stw r4, lbl_805A9800@sda21(r13) /* 80371F14 0036EE74 38 60 00 02 */ li r3, 2 -/* 80371F18 0036EE78 4E 80 00 20 */ blr +/* 80371F18 0036EE78 4E 80 00 20 */ blr lbl_80371F1C: /* 80371F1C 0036EE7C 3C 04 FF FD */ addis r0, r4, 0xfffd /* 80371F20 0036EE80 90 8D AC 40 */ stw r4, lbl_805A9800@sda21(r13) @@ -361,10 +440,10 @@ lbl_80371F1C: /* 80371F38 0036EE98 40 82 00 0C */ bne lbl_80371F44 lbl_80371F3C: /* 80371F3C 0036EE9C 38 60 00 02 */ li r3, 2 -/* 80371F40 0036EEA0 4E 80 00 20 */ blr +/* 80371F40 0036EEA0 4E 80 00 20 */ blr lbl_80371F44: /* 80371F44 0036EEA4 38 60 00 03 */ li r3, 3 -/* 80371F48 0036EEA8 4E 80 00 20 */ blr +/* 80371F48 0036EEA8 4E 80 00 20 */ blr .global cbForStateGettingError cbForStateGettingError: @@ -463,7 +542,7 @@ lbl_80372060: /* 8037209C 0036EFFC 7D 88 03 A6 */ mtlr r12 /* 803720A0 0036F000 38 9E 00 00 */ addi r4, r30, 0 /* 803720A4 0036F004 38 60 FF FD */ li r3, -3 -/* 803720A8 0036F008 4E 80 00 21 */ blrl +/* 803720A8 0036F008 4E 80 00 21 */ blrl lbl_803720AC: /* 803720AC 0036F00C 81 8D AC 34 */ lwz r12, lbl_805A97F4@sda21(r13) /* 803720B0 0036F010 28 0C 00 00 */ cmplwi r12, 0 @@ -471,7 +550,7 @@ lbl_803720AC: /* 803720B8 0036F018 7D 88 03 A6 */ mtlr r12 /* 803720BC 0036F01C 38 9E 00 00 */ addi r4, r30, 0 /* 803720C0 0036F020 38 60 00 00 */ li r3, 0 -/* 803720C4 0036F024 4E 80 00 21 */ blrl +/* 803720C4 0036F024 4E 80 00 21 */ blrl lbl_803720C8: /* 803720C8 0036F028 48 00 0B 3D */ bl stateReady /* 803720CC 0036F02C 38 00 00 01 */ li r0, 1 @@ -504,7 +583,7 @@ lbl_80372128: /* 80372128 0036F088 81 8D AC 58 */ lwz r12, lbl_805A9818@sda21(r13) /* 8037212C 0036F08C 80 6D AC 10 */ lwz r3, lbl_805A97D0@sda21(r13) /* 80372130 0036F090 7D 88 03 A6 */ mtlr r12 -/* 80372134 0036F094 4E 80 00 21 */ blrl +/* 80372134 0036F094 4E 80 00 21 */ blrl /* 80372138 0036F098 48 00 00 88 */ b lbl_803721C0 lbl_8037213C: /* 8037213C 0036F09C 3C 1C FF 00 */ addis r0, r28, 0xff00 @@ -551,7 +630,7 @@ lbl_803721C0: /* 803721D0 0036F130 83 81 00 10 */ lwz r28, 0x10(r1) /* 803721D4 0036F134 38 21 00 20 */ addi r1, r1, 0x20 /* 803721D8 0036F138 7C 08 03 A6 */ mtlr r0 -/* 803721DC 0036F13C 4E 80 00 20 */ blr +/* 803721DC 0036F13C 4E 80 00 20 */ blr .global cbForUnrecoveredError cbForUnrecoveredError: @@ -583,7 +662,7 @@ lbl_80372238: /* 80372238 0036F198 80 01 00 0C */ lwz r0, 0xc(r1) /* 8037223C 0036F19C 38 21 00 08 */ addi r1, r1, 8 /* 80372240 0036F1A0 7C 08 03 A6 */ mtlr r0 -/* 80372244 0036F1A4 4E 80 00 20 */ blr +/* 80372244 0036F1A4 4E 80 00 20 */ blr .global cbForUnrecoveredErrorRetry cbForUnrecoveredErrorRetry: @@ -627,7 +706,7 @@ lbl_803722D0: /* 803722D0 0036F230 80 01 00 0C */ lwz r0, 0xc(r1) /* 803722D4 0036F234 38 21 00 08 */ addi r1, r1, 8 /* 803722D8 0036F238 7C 08 03 A6 */ mtlr r0 -/* 803722DC 0036F23C 4E 80 00 20 */ blr +/* 803722DC 0036F23C 4E 80 00 20 */ blr .global stateGotToRetry stateGotToRetry: @@ -640,7 +719,7 @@ stateGotToRetry: /* 803722F8 0036F258 80 01 00 0C */ lwz r0, 0xc(r1) /* 803722FC 0036F25C 38 21 00 08 */ addi r1, r1, 8 /* 80372300 0036F260 7C 08 03 A6 */ mtlr r0 -/* 80372304 0036F264 4E 80 00 20 */ blr +/* 80372304 0036F264 4E 80 00 20 */ blr .global cbForStateGoToRetry cbForStateGoToRetry: @@ -711,7 +790,7 @@ lbl_803723B8: /* 803723F8 0036F358 7D 88 03 A6 */ mtlr r12 /* 803723FC 0036F35C 38 9F 00 00 */ addi r4, r31, 0 /* 80372400 0036F360 38 60 FF FD */ li r3, -3 -/* 80372404 0036F364 4E 80 00 21 */ blrl +/* 80372404 0036F364 4E 80 00 21 */ blrl lbl_80372408: /* 80372408 0036F368 81 8D AC 34 */ lwz r12, lbl_805A97F4@sda21(r13) /* 8037240C 0036F36C 28 0C 00 00 */ cmplwi r12, 0 @@ -719,7 +798,7 @@ lbl_80372408: /* 80372414 0036F374 7D 88 03 A6 */ mtlr r12 /* 80372418 0036F378 38 9F 00 00 */ addi r4, r31, 0 /* 8037241C 0036F37C 38 60 00 00 */ li r3, 0 -/* 80372420 0036F380 4E 80 00 21 */ blrl +/* 80372420 0036F380 4E 80 00 21 */ blrl lbl_80372424: /* 80372424 0036F384 48 00 07 E1 */ bl stateReady /* 80372428 0036F388 38 00 00 01 */ li r0, 1 @@ -738,7 +817,7 @@ lbl_8037244C: /* 80372450 0036F3B0 83 E1 00 14 */ lwz r31, 0x14(r1) /* 80372454 0036F3B4 38 21 00 18 */ addi r1, r1, 0x18 /* 80372458 0036F3B8 7C 08 03 A6 */ mtlr r0 -/* 8037245C 0036F3BC 4E 80 00 20 */ blr +/* 8037245C 0036F3BC 4E 80 00 20 */ blr .global stateCheckID stateCheckID: @@ -802,7 +881,7 @@ lbl_8037252C: /* 80372530 0036F490 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80372534 0036F494 38 21 00 10 */ addi r1, r1, 0x10 /* 80372538 0036F498 7C 08 03 A6 */ mtlr r0 -/* 8037253C 0036F49C 4E 80 00 20 */ blr +/* 8037253C 0036F49C 4E 80 00 20 */ blr .global stateCheckID3 stateCheckID3: @@ -818,7 +897,7 @@ stateCheckID3: /* 80372564 0036F4C4 80 01 00 0C */ lwz r0, 0xc(r1) /* 80372568 0036F4C8 38 21 00 08 */ addi r1, r1, 8 /* 8037256C 0036F4CC 7C 08 03 A6 */ mtlr r0 -/* 80372570 0036F4D0 4E 80 00 20 */ blr +/* 80372570 0036F4D0 4E 80 00 20 */ blr .global stateCheckID2a stateCheckID2a: @@ -834,7 +913,7 @@ stateCheckID2a: /* 80372598 0036F4F8 80 01 00 0C */ lwz r0, 0xc(r1) /* 8037259C 0036F4FC 38 21 00 08 */ addi r1, r1, 8 /* 803725A0 0036F500 7C 08 03 A6 */ mtlr r0 -/* 803725A4 0036F504 4E 80 00 20 */ blr +/* 803725A4 0036F504 4E 80 00 20 */ blr .global cbForStateCheckID2a cbForStateCheckID2a: @@ -869,7 +948,7 @@ lbl_8037260C: /* 8037260C 0036F56C 80 01 00 0C */ lwz r0, 0xc(r1) /* 80372610 0036F570 38 21 00 08 */ addi r1, r1, 8 /* 80372614 0036F574 7C 08 03 A6 */ mtlr r0 -/* 80372618 0036F578 4E 80 00 20 */ blr +/* 80372618 0036F578 4E 80 00 20 */ blr .global stateCheckID2 stateCheckID2: @@ -886,7 +965,7 @@ stateCheckID2: /* 80372644 0036F5A4 80 01 00 0C */ lwz r0, 0xc(r1) /* 80372648 0036F5A8 38 21 00 08 */ addi r1, r1, 8 /* 8037264C 0036F5AC 7C 08 03 A6 */ mtlr r0 -/* 80372650 0036F5B0 4E 80 00 20 */ blr +/* 80372650 0036F5B0 4E 80 00 20 */ blr .global cbForStateCheckID1 cbForStateCheckID1: @@ -940,7 +1019,7 @@ lbl_803726C4: /* 80372708 0036F668 7D 88 03 A6 */ mtlr r12 /* 8037270C 0036F66C 38 9F 00 00 */ addi r4, r31, 0 /* 80372710 0036F670 38 60 FF FD */ li r3, -3 -/* 80372714 0036F674 4E 80 00 21 */ blrl +/* 80372714 0036F674 4E 80 00 21 */ blrl lbl_80372718: /* 80372718 0036F678 81 8D AC 34 */ lwz r12, lbl_805A97F4@sda21(r13) /* 8037271C 0036F67C 28 0C 00 00 */ cmplwi r12, 0 @@ -948,7 +1027,7 @@ lbl_80372718: /* 80372724 0036F684 7D 88 03 A6 */ mtlr r12 /* 80372728 0036F688 38 9F 00 00 */ addi r4, r31, 0 /* 8037272C 0036F68C 38 60 00 00 */ li r3, 0 -/* 80372730 0036F690 4E 80 00 21 */ blrl +/* 80372730 0036F690 4E 80 00 21 */ blrl lbl_80372734: /* 80372734 0036F694 48 00 04 D1 */ bl stateReady /* 80372738 0036F698 38 80 00 01 */ li r4, 1 @@ -964,7 +1043,7 @@ lbl_80372754: /* 80372758 0036F6B8 83 E1 00 14 */ lwz r31, 0x14(r1) /* 8037275C 0036F6BC 38 21 00 18 */ addi r1, r1, 0x18 /* 80372760 0036F6C0 7C 08 03 A6 */ mtlr r0 -/* 80372764 0036F6C4 4E 80 00 20 */ blr +/* 80372764 0036F6C4 4E 80 00 20 */ blr .global cbForStateCheckID2 cbForStateCheckID2: @@ -1028,7 +1107,7 @@ lbl_80372838: /* 8037283C 0036F79C 83 E1 00 14 */ lwz r31, 0x14(r1) /* 80372840 0036F7A0 38 21 00 18 */ addi r1, r1, 0x18 /* 80372844 0036F7A4 7C 08 03 A6 */ mtlr r0 -/* 80372848 0036F7A8 4E 80 00 20 */ blr +/* 80372848 0036F7A8 4E 80 00 20 */ blr .global cbForStateCheckID3 cbForStateCheckID3: @@ -1070,7 +1149,7 @@ lbl_8037288C: /* 803728D4 0036F834 7D 88 03 A6 */ mtlr r12 /* 803728D8 0036F838 38 9F 00 00 */ addi r4, r31, 0 /* 803728DC 0036F83C 38 60 FF FD */ li r3, -3 -/* 803728E0 0036F840 4E 80 00 21 */ blrl +/* 803728E0 0036F840 4E 80 00 21 */ blrl lbl_803728E4: /* 803728E4 0036F844 81 8D AC 34 */ lwz r12, lbl_805A97F4@sda21(r13) /* 803728E8 0036F848 28 0C 00 00 */ cmplwi r12, 0 @@ -1078,7 +1157,7 @@ lbl_803728E4: /* 803728F0 0036F850 7D 88 03 A6 */ mtlr r12 /* 803728F4 0036F854 38 9F 00 00 */ addi r4, r31, 0 /* 803728F8 0036F858 38 60 00 00 */ li r3, 0 -/* 803728FC 0036F85C 4E 80 00 21 */ blrl +/* 803728FC 0036F85C 4E 80 00 21 */ blrl lbl_80372900: /* 80372900 0036F860 48 00 03 05 */ bl stateReady /* 80372904 0036F864 38 80 00 01 */ li r4, 1 @@ -1100,7 +1179,7 @@ lbl_80372934: /* 80372938 0036F898 83 E1 00 14 */ lwz r31, 0x14(r1) /* 8037293C 0036F89C 38 21 00 18 */ addi r1, r1, 0x18 /* 80372940 0036F8A0 7C 08 03 A6 */ mtlr r0 -/* 80372944 0036F8A4 4E 80 00 20 */ blr +/* 80372944 0036F8A4 4E 80 00 20 */ blr .global AlarmHandler_0 AlarmHandler_0: @@ -1120,7 +1199,7 @@ AlarmHandler_0: /* 8037297C 0036F8DC 80 01 00 0C */ lwz r0, 0xc(r1) /* 80372980 0036F8E0 38 21 00 08 */ addi r1, r1, 8 /* 80372984 0036F8E4 7C 08 03 A6 */ mtlr r0 -/* 80372988 0036F8E8 4E 80 00 20 */ blr +/* 80372988 0036F8E8 4E 80 00 20 */ blr .global stateCoverClosed stateCoverClosed: @@ -1153,7 +1232,7 @@ lbl_803729D4: /* 803729EC 0036F94C 41 82 00 10 */ beq lbl_803729FC /* 803729F0 0036F950 7D 88 03 A6 */ mtlr r12 /* 803729F4 0036F954 38 60 FF FC */ li r3, -4 -/* 803729F8 0036F958 4E 80 00 21 */ blrl +/* 803729F8 0036F958 4E 80 00 21 */ blrl lbl_803729FC: /* 803729FC 0036F95C 48 00 02 09 */ bl stateReady /* 80372A00 0036F960 48 00 00 44 */ b lbl_80372A44 @@ -1179,7 +1258,7 @@ lbl_80372A44: /* 80372A48 0036F9A8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80372A4C 0036F9AC 38 21 00 10 */ addi r1, r1, 0x10 /* 80372A50 0036F9B0 7C 08 03 A6 */ mtlr r0 -/* 80372A54 0036F9B4 4E 80 00 20 */ blr +/* 80372A54 0036F9B4 4E 80 00 20 */ blr .global stateCoverClosed_CMD stateCoverClosed_CMD: @@ -1194,7 +1273,7 @@ stateCoverClosed_CMD: /* 80372A78 0036F9D8 80 01 00 0C */ lwz r0, 0xc(r1) /* 80372A7C 0036F9DC 38 21 00 08 */ addi r1, r1, 8 /* 80372A80 0036F9E0 7C 08 03 A6 */ mtlr r0 -/* 80372A84 0036F9E4 4E 80 00 20 */ blr +/* 80372A84 0036F9E4 4E 80 00 20 */ blr .global cbForStateCoverClosed cbForStateCoverClosed: @@ -1228,7 +1307,7 @@ lbl_80372AE8: /* 80372AE8 0036FA48 80 01 00 0C */ lwz r0, 0xc(r1) /* 80372AEC 0036FA4C 38 21 00 08 */ addi r1, r1, 8 /* 80372AF0 0036FA50 7C 08 03 A6 */ mtlr r0 -/* 80372AF4 0036FA54 4E 80 00 20 */ blr +/* 80372AF4 0036FA54 4E 80 00 20 */ blr .global stateMotorStopped stateMotorStopped: @@ -1241,7 +1320,7 @@ stateMotorStopped: /* 80372B10 0036FA70 80 01 00 0C */ lwz r0, 0xc(r1) /* 80372B14 0036FA74 38 21 00 08 */ addi r1, r1, 8 /* 80372B18 0036FA78 7C 08 03 A6 */ mtlr r0 -/* 80372B1C 0036FA7C 4E 80 00 20 */ blr +/* 80372B1C 0036FA7C 4E 80 00 20 */ blr .global cbForStateMotorStopped cbForStateMotorStopped: @@ -1280,7 +1359,7 @@ lbl_80372B80: /* 80372B98 0036FAF8 41 82 00 10 */ beq lbl_80372BA8 /* 80372B9C 0036FAFC 7D 88 03 A6 */ mtlr r12 /* 80372BA0 0036FB00 38 60 FF FC */ li r3, -4 -/* 80372BA4 0036FB04 4E 80 00 21 */ blrl +/* 80372BA4 0036FB04 4E 80 00 21 */ blrl lbl_80372BA8: /* 80372BA8 0036FB08 48 00 00 5D */ bl stateReady /* 80372BAC 0036FB0C 48 00 00 44 */ b lbl_80372BF0 @@ -1306,7 +1385,7 @@ lbl_80372BF0: /* 80372BF4 0036FB54 83 E1 00 14 */ lwz r31, 0x14(r1) /* 80372BF8 0036FB58 38 21 00 18 */ addi r1, r1, 0x18 /* 80372BFC 0036FB5C 7C 08 03 A6 */ mtlr r0 -/* 80372C00 0036FB60 4E 80 00 20 */ blr +/* 80372C00 0036FB60 4E 80 00 20 */ blr .global stateReady stateReady: @@ -1348,7 +1427,7 @@ lbl_80372C54: /* 80372C88 0036FBE8 41 82 00 10 */ beq lbl_80372C98 /* 80372C8C 0036FBEC 7D 88 03 A6 */ mtlr r12 /* 80372C90 0036FBF0 38 60 FF FF */ li r3, -1 -/* 80372C94 0036FBF4 4E 80 00 21 */ blrl +/* 80372C94 0036FBF4 4E 80 00 21 */ blrl lbl_80372C98: /* 80372C98 0036FBF8 4B FF FF 6D */ bl stateReady /* 80372C9C 0036FBFC 48 00 02 30 */ b lbl_80372ECC @@ -1401,7 +1480,7 @@ lbl_80372D2C: /* 80372D44 0036FCA4 41 82 00 10 */ beq lbl_80372D54 /* 80372D48 0036FCA8 7D 88 03 A6 */ mtlr r12 /* 80372D4C 0036FCAC 38 60 FF FC */ li r3, -4 -/* 80372D50 0036FCB0 4E 80 00 21 */ blrl +/* 80372D50 0036FCB0 4E 80 00 21 */ blrl lbl_80372D54: /* 80372D54 0036FCB4 4B FF FE B1 */ bl stateReady /* 80372D58 0036FCB8 48 00 01 58 */ b lbl_80372EB0 @@ -1470,7 +1549,7 @@ lbl_80372E20: /* 80372E38 0036FD98 41 82 00 10 */ beq lbl_80372E48 /* 80372E3C 0036FD9C 7D 88 03 A6 */ mtlr r12 /* 80372E40 0036FDA0 38 60 FF FC */ li r3, -4 -/* 80372E44 0036FDA4 4E 80 00 21 */ blrl +/* 80372E44 0036FDA4 4E 80 00 21 */ blrl lbl_80372E48: /* 80372E48 0036FDA8 4B FF FD BD */ bl stateReady /* 80372E4C 0036FDAC 48 00 00 64 */ b lbl_80372EB0 @@ -1514,7 +1593,7 @@ lbl_80372ECC: /* 80372ED0 0036FE30 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80372ED4 0036FE34 38 21 00 10 */ addi r1, r1, 0x10 /* 80372ED8 0036FE38 7C 08 03 A6 */ mtlr r0 -/* 80372EDC 0036FE3C 4E 80 00 20 */ blr +/* 80372EDC 0036FE3C 4E 80 00 20 */ blr .global stateBusy stateBusy: @@ -1533,7 +1612,7 @@ stateBusy: /* 80372F10 0036FE70 54 00 10 3A */ slwi r0, r0, 2 /* 80372F14 0036FE74 7C 03 00 2E */ lwzx r0, r3, r0 /* 80372F18 0036FE78 7C 09 03 A6 */ mtctr r0 -/* 80372F1C 0036FE7C 4E 80 04 20 */ bctr +/* 80372F1C 0036FE7C 4E 80 04 20 */ bctr /* 80372F20 0036FE80 3C 60 CC 00 */ lis r3, 0xCC006004@ha /* 80372F24 0036FE84 80 03 60 04 */ lwz r0, 0xCC006004@l(r3) /* 80372F28 0036FE88 38 A3 60 00 */ addi r5, r3, 0x6000 @@ -1559,7 +1638,7 @@ stateBusy: /* 80372F78 0036FED8 41 82 00 10 */ beq lbl_80372F88 /* 80372F7C 0036FEDC 7D 88 03 A6 */ mtlr r12 /* 80372F80 0036FEE0 38 60 00 00 */ li r3, 0 -/* 80372F84 0036FEE4 4E 80 00 21 */ blrl +/* 80372F84 0036FEE4 4E 80 00 21 */ blrl lbl_80372F88: /* 80372F88 0036FEE8 4B FF FC 7D */ bl stateReady /* 80372F8C 0036FEEC 48 00 02 64 */ b lbl_803731F0 @@ -1719,12 +1798,12 @@ lbl_803731D8: /* 803731E0 00370140 38 83 32 00 */ addi r4, r3, cbForStateBusy@l /* 803731E4 00370144 7D 88 03 A6 */ mtlr r12 /* 803731E8 00370148 38 67 00 00 */ addi r3, r7, 0 -/* 803731EC 0037014C 4E 80 00 21 */ blrl +/* 803731EC 0037014C 4E 80 00 21 */ blrl lbl_803731F0: /* 803731F0 00370150 80 01 00 0C */ lwz r0, 0xc(r1) /* 803731F4 00370154 38 21 00 08 */ addi r1, r1, 8 /* 803731F8 00370158 7C 08 03 A6 */ mtlr r0 -/* 803731FC 0037015C 4E 80 00 20 */ blr +/* 803731FC 0037015C 4E 80 00 20 */ blr .global cbForStateBusy cbForStateBusy: @@ -1794,7 +1873,7 @@ lbl_803732B0: /* 803732EC 0037024C 7D 88 03 A6 */ mtlr r12 /* 803732F0 00370250 38 9E 00 00 */ addi r4, r30, 0 /* 803732F4 00370254 38 60 FF FD */ li r3, -3 -/* 803732F8 00370258 4E 80 00 21 */ blrl +/* 803732F8 00370258 4E 80 00 21 */ blrl lbl_803732FC: /* 803732FC 0037025C 81 8D AC 34 */ lwz r12, lbl_805A97F4@sda21(r13) /* 80373300 00370260 28 0C 00 00 */ cmplwi r12, 0 @@ -1802,7 +1881,7 @@ lbl_803732FC: /* 80373308 00370268 7D 88 03 A6 */ mtlr r12 /* 8037330C 0037026C 38 9E 00 00 */ addi r4, r30, 0 /* 80373310 00370270 38 60 00 00 */ li r3, 0 -/* 80373314 00370274 4E 80 00 21 */ blrl +/* 80373314 00370274 4E 80 00 21 */ blrl lbl_80373318: /* 80373318 00370278 4B FF F8 ED */ bl stateReady /* 8037331C 0037027C 38 00 00 01 */ li r0, 1 @@ -1867,7 +1946,7 @@ lbl_803733B8: /* 803733E8 00370348 7D 88 03 A6 */ mtlr r12 /* 803733EC 0037034C 38 9E 00 00 */ addi r4, r30, 0 /* 803733F0 00370350 38 60 FF FD */ li r3, -3 -/* 803733F4 00370354 4E 80 00 21 */ blrl +/* 803733F4 00370354 4E 80 00 21 */ blrl lbl_803733F8: /* 803733F8 00370358 81 8D AC 34 */ lwz r12, lbl_805A97F4@sda21(r13) /* 803733FC 0037035C 28 0C 00 00 */ cmplwi r12, 0 @@ -1875,7 +1954,7 @@ lbl_803733F8: /* 80373404 00370364 7D 88 03 A6 */ mtlr r12 /* 80373408 00370368 38 9E 00 00 */ addi r4, r30, 0 /* 8037340C 0037036C 38 60 00 00 */ li r3, 0 -/* 80373410 00370370 4E 80 00 21 */ blrl +/* 80373410 00370370 4E 80 00 21 */ blrl lbl_80373414: /* 80373414 00370374 4B FF F7 F1 */ bl stateReady /* 80373418 00370378 48 00 04 08 */ b lbl_80373820 @@ -1900,7 +1979,7 @@ lbl_8037341C: /* 80373460 003703C0 7D 88 03 A6 */ mtlr r12 /* 80373464 003703C4 38 9E 00 00 */ addi r4, r30, 0 /* 80373468 003703C8 38 60 FF FD */ li r3, -3 -/* 8037346C 003703CC 4E 80 00 21 */ blrl +/* 8037346C 003703CC 4E 80 00 21 */ blrl lbl_80373470: /* 80373470 003703D0 81 8D AC 34 */ lwz r12, lbl_805A97F4@sda21(r13) /* 80373474 003703D4 28 0C 00 00 */ cmplwi r12, 0 @@ -1908,7 +1987,7 @@ lbl_80373470: /* 8037347C 003703DC 7D 88 03 A6 */ mtlr r12 /* 80373480 003703E0 38 9E 00 00 */ addi r4, r30, 0 /* 80373484 003703E4 38 60 00 00 */ li r3, 0 -/* 80373488 003703E8 4E 80 00 21 */ blrl +/* 80373488 003703E8 4E 80 00 21 */ blrl lbl_8037348C: /* 8037348C 003703EC 4B FF F7 79 */ bl stateReady /* 80373490 003703F0 38 80 00 01 */ li r4, 1 @@ -1955,7 +2034,7 @@ lbl_80373500: /* 8037351C 0037047C 41 82 00 10 */ beq lbl_8037352C /* 80373520 00370480 80 64 00 20 */ lwz r3, 0x20(r4) /* 80373524 00370484 7D 88 03 A6 */ mtlr r12 -/* 80373528 00370488 4E 80 00 21 */ blrl +/* 80373528 00370488 4E 80 00 21 */ blrl lbl_8037352C: /* 8037352C 0037048C 4B FF F6 D9 */ bl stateReady /* 80373530 00370490 48 00 02 F0 */ b lbl_80373820 @@ -2015,7 +2094,7 @@ lbl_803735CC: /* 803735E4 00370544 28 0C 00 00 */ cmplwi r12, 0 /* 803735E8 00370548 41 82 00 0C */ beq lbl_803735F4 /* 803735EC 0037054C 7D 88 03 A6 */ mtlr r12 -/* 803735F0 00370550 4E 80 00 21 */ blrl +/* 803735F0 00370550 4E 80 00 21 */ blrl lbl_803735F4: /* 803735F4 00370554 4B FF F6 11 */ bl stateReady /* 803735F8 00370558 48 00 02 28 */ b lbl_80373820 @@ -2041,7 +2120,7 @@ lbl_803735FC: /* 80373644 003705A4 41 82 00 10 */ beq lbl_80373654 /* 80373648 003705A8 7D 88 03 A6 */ mtlr r12 /* 8037364C 003705AC 38 60 FF FE */ li r3, -2 -/* 80373650 003705B0 4E 80 00 21 */ blrl +/* 80373650 003705B0 4E 80 00 21 */ blrl lbl_80373654: /* 80373654 003705B4 4B FF F5 B1 */ bl stateReady /* 80373658 003705B8 48 00 01 C8 */ b lbl_80373820 @@ -2068,7 +2147,7 @@ lbl_8037368C: /* 803736A4 00370604 41 82 00 10 */ beq lbl_803736B4 /* 803736A8 00370608 7D 88 03 A6 */ mtlr r12 /* 803736AC 0037060C 38 60 00 00 */ li r3, 0 -/* 803736B0 00370610 4E 80 00 21 */ blrl +/* 803736B0 00370610 4E 80 00 21 */ blrl lbl_803736B4: /* 803736B4 00370614 4B FF F5 51 */ bl stateReady /* 803736B8 00370618 48 00 01 68 */ b lbl_80373820 @@ -2083,7 +2162,7 @@ lbl_803736BC: /* 803736D8 00370638 41 82 00 10 */ beq lbl_803736E8 /* 803736DC 0037063C 7D 88 03 A6 */ mtlr r12 /* 803736E0 00370640 38 60 00 00 */ li r3, 0 -/* 803736E4 00370644 4E 80 00 21 */ blrl +/* 803736E4 00370644 4E 80 00 21 */ blrl lbl_803736E8: /* 803736E8 00370648 4B FF F5 1D */ bl stateReady /* 803736EC 0037064C 48 00 01 34 */ b lbl_80373820 @@ -2136,7 +2215,7 @@ lbl_80373754: /* 8037379C 003706FC 7D 88 03 A6 */ mtlr r12 /* 803737A0 00370700 38 9E 00 00 */ addi r4, r30, 0 /* 803737A4 00370704 38 60 FF FD */ li r3, -3 -/* 803737A8 00370708 4E 80 00 21 */ blrl +/* 803737A8 00370708 4E 80 00 21 */ blrl lbl_803737AC: /* 803737AC 0037070C 81 8D AC 34 */ lwz r12, lbl_805A97F4@sda21(r13) /* 803737B0 00370710 28 0C 00 00 */ cmplwi r12, 0 @@ -2144,7 +2223,7 @@ lbl_803737AC: /* 803737B8 00370718 7D 88 03 A6 */ mtlr r12 /* 803737BC 0037071C 38 9E 00 00 */ addi r4, r30, 0 /* 803737C0 00370720 38 60 00 00 */ li r3, 0 -/* 803737C4 00370724 4E 80 00 21 */ blrl +/* 803737C4 00370724 4E 80 00 21 */ blrl lbl_803737C8: /* 803737C8 00370728 4B FF F4 3D */ bl stateReady /* 803737CC 0037072C 38 00 00 01 */ li r0, 1 @@ -2164,7 +2243,7 @@ lbl_803737D8: /* 803737FC 0037075C 41 82 00 10 */ beq lbl_8037380C /* 80373800 00370760 80 64 00 20 */ lwz r3, 0x20(r4) /* 80373804 00370764 7D 88 03 A6 */ mtlr r12 -/* 80373808 00370768 4E 80 00 21 */ blrl +/* 80373808 00370768 4E 80 00 21 */ blrl lbl_8037380C: /* 8037380C 0037076C 4B FF F3 F9 */ bl stateReady /* 80373810 00370770 48 00 00 10 */ b lbl_80373820 @@ -2178,7 +2257,7 @@ lbl_80373820: /* 80373828 00370788 83 C1 00 10 */ lwz r30, 0x10(r1) /* 8037382C 0037078C 38 21 00 18 */ addi r1, r1, 0x18 /* 80373830 00370790 7C 08 03 A6 */ mtlr r0 -/* 80373834 00370794 4E 80 00 20 */ blr +/* 80373834 00370794 4E 80 00 20 */ blr .global sub_80373838 sub_80373838: @@ -2231,7 +2310,7 @@ lbl_803738CC: /* 803738E4 00370844 83 A1 00 14 */ lwz r29, 0x14(r1) /* 803738E8 00370848 38 21 00 20 */ addi r1, r1, 0x20 /* 803738EC 0037084C 7C 08 03 A6 */ mtlr r0 -/* 803738F0 00370850 4E 80 00 20 */ blr +/* 803738F0 00370850 4E 80 00 20 */ blr .global DVDReadAbsAsyncPrio DVDReadAbsAsyncPrio: @@ -2292,7 +2371,7 @@ lbl_803739A8: /* 803739C0 00370920 83 A1 00 2C */ lwz r29, 0x2c(r1) /* 803739C4 00370924 38 21 00 38 */ addi r1, r1, 0x38 /* 803739C8 00370928 7C 08 03 A6 */ mtlr r0 -/* 803739CC 0037092C 4E 80 00 20 */ blr +/* 803739CC 0037092C 4E 80 00 20 */ blr .global DVDReadAbsAsyncForBS DVDReadAbsAsyncForBS: @@ -2350,7 +2429,7 @@ lbl_80373A7C: /* 80373A90 003709F0 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80373A94 003709F4 38 21 00 30 */ addi r1, r1, 0x30 /* 80373A98 003709F8 7C 08 03 A6 */ mtlr r0 -/* 80373A9C 003709FC 4E 80 00 20 */ blr +/* 80373A9C 003709FC 4E 80 00 20 */ blr .global DVDReadDiskID DVDReadDiskID: @@ -2409,7 +2488,7 @@ lbl_80373B50: /* 80373B64 00370AC4 83 C1 00 20 */ lwz r30, 0x20(r1) /* 80373B68 00370AC8 38 21 00 28 */ addi r1, r1, 0x28 /* 80373B6C 00370ACC 7C 08 03 A6 */ mtlr r0 -/* 80373B70 00370AD0 4E 80 00 20 */ blr +/* 80373B70 00370AD0 4E 80 00 20 */ blr .global sub_80373b74 sub_80373b74: @@ -2464,7 +2543,7 @@ lbl_80373C14: /* 80373C28 00370B88 83 C1 00 20 */ lwz r30, 0x20(r1) /* 80373C2C 00370B8C 38 21 00 28 */ addi r1, r1, 0x28 /* 80373C30 00370B90 7C 08 03 A6 */ mtlr r0 -/* 80373C34 00370B94 4E 80 00 20 */ blr +/* 80373C34 00370B94 4E 80 00 20 */ blr .global DVDCancelStreamAsync DVDCancelStreamAsync: @@ -2517,7 +2596,7 @@ lbl_80373CD0: /* 80373CE4 00370C44 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80373CE8 00370C48 38 21 00 20 */ addi r1, r1, 0x20 /* 80373CEC 00370C4C 7C 08 03 A6 */ mtlr r0 -/* 80373CF0 00370C50 4E 80 00 20 */ blr +/* 80373CF0 00370C50 4E 80 00 20 */ blr .global sub_80373cf4 sub_80373cf4: @@ -2566,7 +2645,7 @@ lbl_80373D7C: /* 80373D84 00370CE4 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80373D88 00370CE8 38 21 00 20 */ addi r1, r1, 0x20 /* 80373D8C 00370CEC 7C 08 03 A6 */ mtlr r0 -/* 80373D90 00370CF0 4E 80 00 20 */ blr +/* 80373D90 00370CF0 4E 80 00 20 */ blr .global sub_80373d94 sub_80373d94: @@ -2579,7 +2658,7 @@ sub_80373d94: /* 80373DAC 00370D0C 80 01 00 0C */ lwz r0, 0xc(r1) /* 80373DB0 00370D10 38 21 00 08 */ addi r1, r1, 8 /* 80373DB4 00370D14 7C 08 03 A6 */ mtlr r0 -/* 80373DB8 00370D18 4E 80 00 20 */ blr +/* 80373DB8 00370D18 4E 80 00 20 */ blr .global sub_80373dbc sub_80373dbc: @@ -2632,7 +2711,7 @@ lbl_80373E54: /* 80373E68 00370DC8 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80373E6C 00370DCC 38 21 00 20 */ addi r1, r1, 0x20 /* 80373E70 00370DD0 7C 08 03 A6 */ mtlr r0 -/* 80373E74 00370DD4 4E 80 00 20 */ blr +/* 80373E74 00370DD4 4E 80 00 20 */ blr .global sub_80373e78 sub_80373e78: @@ -2685,7 +2764,7 @@ lbl_80373F10: /* 80373F24 00370E84 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80373F28 00370E88 38 21 00 20 */ addi r1, r1, 0x20 /* 80373F2C 00370E8C 7C 08 03 A6 */ mtlr r0 -/* 80373F30 00370E90 4E 80 00 20 */ blr +/* 80373F30 00370E90 4E 80 00 20 */ blr .global sub_80373f34 sub_80373f34: @@ -2738,7 +2817,7 @@ lbl_80373FCC: /* 80373FE0 00370F40 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80373FE4 00370F44 38 21 00 20 */ addi r1, r1, 0x20 /* 80373FE8 00370F48 7C 08 03 A6 */ mtlr r0 -/* 80373FEC 00370F4C 4E 80 00 20 */ blr +/* 80373FEC 00370F4C 4E 80 00 20 */ blr .global DVDInquiryAsync DVDInquiryAsync: @@ -2796,7 +2875,7 @@ lbl_8037409C: /* 803740B0 00371010 83 C1 00 20 */ lwz r30, 0x20(r1) /* 803740B4 00371014 38 21 00 28 */ addi r1, r1, 0x28 /* 803740B8 00371018 7C 08 03 A6 */ mtlr r0 -/* 803740BC 0037101C 4E 80 00 20 */ blr +/* 803740BC 0037101C 4E 80 00 20 */ blr .global DVDReset DVDReset: @@ -2816,7 +2895,7 @@ DVDReset: /* 803740F4 00371054 80 01 00 0C */ lwz r0, 0xc(r1) /* 803740F8 00371058 38 21 00 08 */ addi r1, r1, 8 /* 803740FC 0037105C 7C 08 03 A6 */ mtlr r0 -/* 80374100 00371060 4E 80 00 20 */ blr +/* 80374100 00371060 4E 80 00 20 */ blr .global DVDGetCommandBlockStatus DVDGetCommandBlockStatus: @@ -2840,7 +2919,7 @@ lbl_80374134: /* 80374140 003710A0 83 E1 00 14 */ lwz r31, 0x14(r1) /* 80374144 003710A4 38 21 00 18 */ addi r1, r1, 0x18 /* 80374148 003710A8 7C 08 03 A6 */ mtlr r0 -/* 8037414C 003710AC 4E 80 00 20 */ blr +/* 8037414C 003710AC 4E 80 00 20 */ blr .global DVDGetDriveStatus DVDGetDriveStatus: @@ -2892,14 +2971,14 @@ lbl_803741D8: /* 803741EC 0037114C 83 C1 00 10 */ lwz r30, 0x10(r1) /* 803741F0 00371150 38 21 00 18 */ addi r1, r1, 0x18 /* 803741F4 00371154 7C 08 03 A6 */ mtlr r0 -/* 803741F8 00371158 4E 80 00 20 */ blr +/* 803741F8 00371158 4E 80 00 20 */ blr .global DVDSetAutoInvalidation DVDSetAutoInvalidation: /* 803741FC 0037115C 80 0D 9E DC */ lwz r0, lbl_805A8A9C@sda21(r13) /* 80374200 00371160 90 6D 9E DC */ stw r3, lbl_805A8A9C@sda21(r13) /* 80374204 00371164 7C 03 03 78 */ mr r3, r0 -/* 80374208 00371168 4E 80 00 20 */ blr +/* 80374208 00371168 4E 80 00 20 */ blr .global DVDCancelAsync DVDCancelAsync: @@ -2922,14 +3001,14 @@ DVDCancelAsync: /* 8037424C 003711AC 54 00 10 3A */ slwi r0, r0, 2 /* 80374250 003711B0 7C 03 00 2E */ lwzx r0, r3, r0 /* 80374254 003711B4 7C 09 03 A6 */ mtctr r0 -/* 80374258 003711B8 4E 80 04 20 */ bctr +/* 80374258 003711B8 4E 80 04 20 */ bctr /* 8037425C 003711BC 28 1E 00 00 */ cmplwi r30, 0 /* 80374260 003711C0 41 82 01 F4 */ beq lbl_80374454 /* 80374264 003711C4 39 9E 00 00 */ addi r12, r30, 0 /* 80374268 003711C8 7D 88 03 A6 */ mtlr r12 /* 8037426C 003711CC 38 9D 00 00 */ addi r4, r29, 0 /* 80374270 003711D0 38 60 00 00 */ li r3, 0 -/* 80374274 003711D4 4E 80 00 21 */ blrl +/* 80374274 003711D4 4E 80 00 21 */ blrl /* 80374278 003711D8 48 00 01 DC */ b lbl_80374454 /* 8037427C 003711DC 80 0D AC 30 */ lwz r0, lbl_805A97F0@sda21(r13) /* 80374280 003711E0 28 00 00 00 */ cmplwi r0, 0 @@ -2960,7 +3039,7 @@ lbl_803742B8: /* 803742DC 0037123C 7D 88 03 A6 */ mtlr r12 /* 803742E0 00371240 38 9D 00 00 */ addi r4, r29, 0 /* 803742E4 00371244 38 60 FF FD */ li r3, -3 -/* 803742E8 00371248 4E 80 00 21 */ blrl +/* 803742E8 00371248 4E 80 00 21 */ blrl lbl_803742EC: /* 803742EC 0037124C 28 1E 00 00 */ cmplwi r30, 0 /* 803742F0 00371250 41 82 01 64 */ beq lbl_80374454 @@ -2968,7 +3047,7 @@ lbl_803742EC: /* 803742F8 00371258 7D 88 03 A6 */ mtlr r12 /* 803742FC 0037125C 38 9D 00 00 */ addi r4, r29, 0 /* 80374300 00371260 38 60 00 00 */ li r3, 0 -/* 80374304 00371264 4E 80 00 21 */ blrl +/* 80374304 00371264 4E 80 00 21 */ blrl /* 80374308 00371268 48 00 01 4C */ b lbl_80374454 /* 8037430C 0037126C 80 1D 00 08 */ lwz r0, 8(r29) /* 80374310 00371270 2C 00 00 0D */ cmpwi r0, 0xd @@ -2990,7 +3069,7 @@ lbl_8037433C: /* 80374348 003712A8 7D 88 03 A6 */ mtlr r12 /* 8037434C 003712AC 38 9D 00 00 */ addi r4, r29, 0 /* 80374350 003712B0 38 60 00 00 */ li r3, 0 -/* 80374354 003712B4 4E 80 00 21 */ blrl +/* 80374354 003712B4 4E 80 00 21 */ blrl /* 80374358 003712B8 48 00 00 FC */ b lbl_80374454 lbl_8037435C: /* 8037435C 003712BC 80 0D AC 30 */ lwz r0, lbl_805A97F0@sda21(r13) @@ -3053,7 +3132,7 @@ lbl_80374410: /* 80374424 00371384 7D 88 03 A6 */ mtlr r12 /* 80374428 00371388 38 9D 00 00 */ addi r4, r29, 0 /* 8037442C 0037138C 38 60 FF FD */ li r3, -3 -/* 80374430 00371390 4E 80 00 21 */ blrl +/* 80374430 00371390 4E 80 00 21 */ blrl lbl_80374434: /* 80374434 00371394 28 1E 00 00 */ cmplwi r30, 0 /* 80374438 00371398 41 82 00 18 */ beq lbl_80374450 @@ -3061,7 +3140,7 @@ lbl_80374434: /* 80374440 003713A0 7D 88 03 A6 */ mtlr r12 /* 80374444 003713A4 38 9D 00 00 */ addi r4, r29, 0 /* 80374448 003713A8 38 60 00 00 */ li r3, 0 -/* 8037444C 003713AC 4E 80 00 21 */ blrl +/* 8037444C 003713AC 4E 80 00 21 */ blrl lbl_80374450: /* 80374450 003713B0 4B FF E7 B5 */ bl stateReady lbl_80374454: @@ -3075,7 +3154,7 @@ lbl_80374460: /* 8037446C 003713CC 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80374470 003713D0 38 21 00 20 */ addi r1, r1, 0x20 /* 80374474 003713D4 7C 08 03 A6 */ mtlr r0 -/* 80374478 003713D8 4E 80 00 20 */ blr +/* 80374478 003713D8 4E 80 00 20 */ blr .global DVDCancel DVDCancel: @@ -3126,7 +3205,7 @@ lbl_80374510: /* 80374518 00371478 83 C1 00 10 */ lwz r30, 0x10(r1) /* 8037451C 0037147C 38 21 00 18 */ addi r1, r1, 0x18 /* 80374520 00371480 7C 08 03 A6 */ mtlr r0 -/* 80374524 00371484 4E 80 00 20 */ blr +/* 80374524 00371484 4E 80 00 20 */ blr .global cbForCancelSync cbForCancelSync: @@ -3138,7 +3217,7 @@ cbForCancelSync: /* 8037453C 0037149C 80 01 00 0C */ lwz r0, 0xc(r1) /* 80374540 003714A0 38 21 00 08 */ addi r1, r1, 8 /* 80374544 003714A4 7C 08 03 A6 */ mtlr r0 -/* 80374548 003714A8 4E 80 00 20 */ blr +/* 80374548 003714A8 4E 80 00 20 */ blr .global sub_8037454c sub_8037454c: @@ -3228,7 +3307,7 @@ lbl_80374664: /* 80374674 003715D4 83 81 00 10 */ lwz r28, 0x10(r1) /* 80374678 003715D8 38 21 00 20 */ addi r1, r1, 0x20 /* 8037467C 003715DC 7C 08 03 A6 */ mtlr r0 -/* 80374680 003715E0 4E 80 00 20 */ blr +/* 80374680 003715E0 4E 80 00 20 */ blr .global sub_80374684 sub_80374684: @@ -3242,12 +3321,12 @@ sub_80374684: /* 803746A0 00371600 80 01 00 0C */ lwz r0, 0xc(r1) /* 803746A4 00371604 38 21 00 08 */ addi r1, r1, 8 /* 803746A8 00371608 7C 08 03 A6 */ mtlr r0 -/* 803746AC 0037160C 4E 80 00 20 */ blr +/* 803746AC 0037160C 4E 80 00 20 */ blr .global DVDGetCurrentDiskID DVDGetCurrentDiskID: /* 803746B0 00371610 3C 60 80 00 */ lis r3, 0x8000 -/* 803746B4 00371614 4E 80 00 20 */ blr +/* 803746B4 00371614 4E 80 00 20 */ blr .global DVDCheckDisk DVDCheckDisk: @@ -3291,7 +3370,7 @@ lbl_80374724: /* 80374738 00371698 54 00 10 3A */ slwi r0, r0, 2 /* 8037473C 0037169C 7C 04 00 2E */ lwzx r0, r4, r0 /* 80374740 003716A0 7C 09 03 A6 */ mtctr r0 -/* 80374744 003716A4 4E 80 04 20 */ bctr +/* 80374744 003716A4 4E 80 04 20 */ bctr /* 80374748 003716A8 3B E0 00 01 */ li r31, 1 /* 8037474C 003716AC 48 00 00 34 */ b lbl_80374780 /* 80374750 003716B0 3B E0 00 00 */ li r31, 0 @@ -3315,7 +3394,7 @@ lbl_80374780: /* 8037478C 003716EC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80374790 003716F0 38 21 00 10 */ addi r1, r1, 0x10 /* 80374794 003716F4 7C 08 03 A6 */ mtlr r0 -/* 80374798 003716F8 4E 80 00 20 */ blr +/* 80374798 003716F8 4E 80 00 20 */ blr .global __DVDPrepareResetAsync __DVDPrepareResetAsync: @@ -3373,7 +3452,7 @@ lbl_80374844: /* 80374850 003717B0 7D 88 03 A6 */ mtlr r12 /* 80374854 003717B4 38 60 00 00 */ li r3, 0 /* 80374858 003717B8 38 80 00 00 */ li r4, 0 -/* 8037485C 003717BC 4E 80 00 21 */ blrl +/* 8037485C 003717BC 4E 80 00 21 */ blrl lbl_80374860: /* 80374860 003717C0 48 00 CE 01 */ bl OSDisableInterrupts /* 80374864 003717C4 38 80 00 00 */ li r4, 0 @@ -3398,4 +3477,4 @@ lbl_80374894: /* 803748A8 00371808 83 A1 00 14 */ lwz r29, 0x14(r1) /* 803748AC 0037180C 38 21 00 20 */ addi r1, r1, 0x20 /* 803748B0 00371810 7C 08 03 A6 */ mtlr r0 -/* 803748B4 00371814 4E 80 00 20 */ blr +/* 803748B4 00371814 4E 80 00 20 */ blr diff --git a/asm/Dolphin/dvd/dvderror.s b/asm/Dolphin/dvd/dvderror.s index c330041c..85f36584 100644 --- a/asm/Dolphin/dvd/dvderror.s +++ b/asm/Dolphin/dvd/dvderror.s @@ -3,7 +3,135 @@ .section .data .global lbl_803F0100 lbl_803F0100: - .incbin "baserom.dol", 0x3ED100, 0x478 + # ROM: 0x3ED100 + .4byte 0 + .4byte 0x00023A00 + .4byte 0x00062800 + .4byte 0x00030200 + .4byte 0x00031100 + .4byte 0x00052000 + .4byte 0x00052001 + .4byte 0x00052100 + .4byte 0x00052400 + .4byte 0x00052401 + .4byte 0x00052402 + .4byte 0x000B5A01 + .4byte 0x00056300 + .4byte 0x00020401 + .4byte 0x00020400 + .4byte 0x00040800 + .4byte 0x00100007 + .4byte 0 + .4byte 0x0A0A0A83 + .4byte 0x47838981 + .4byte 0x5B82AA94 + .4byte 0xAD90B682 + .4byte 0xB582DC82 + .4byte 0xB582BD81 + .4byte 0x420A0A96 + .4byte 0x7B91CC82 + .4byte 0xCC837083 + .4byte 0x8F815B83 + .4byte 0x7B835E83 + .4byte 0x9382F089 + .4byte 0x9F82B582 + .4byte 0xC493648C + .4byte 0xB982F04F + .4byte 0x464682C9 + .4byte 0x82B58141 + .4byte 0x0A967B91 + .4byte 0xCC82CC8E + .4byte 0xE688B590 + .4byte 0xE096BE8F + .4byte 0x9182CC8E + .4byte 0x778EA682 + .4byte 0xC98F5D82 + .4byte 0xC182C482 + .4byte 0xAD82BE82 + .4byte 0xB382A281 + .4byte 0x42000000 + .asciz "\n\n\nAn error has occurred.\nTurn the power off and refer to the\nNintendo GameCube Instruction Booklet\nfor further instructions." + .balign 4 + .4byte 0x0A0A0A41 + .4byte 0x6E206572 + .4byte 0x726F7220 + .4byte 0x68617320 + .4byte 0x6F636375 + .4byte 0x72726564 + .4byte 0x2E0A5475 + .4byte 0x726E2074 + .4byte 0x68652070 + .4byte 0x6F776572 + .4byte 0x206F6666 + .4byte 0x20616E64 + .4byte 0x20726566 + .4byte 0x65722074 + .4byte 0x6F207468 + .4byte 0x650A4E69 + .4byte 0x6E74656E + .4byte 0x646F2047 + .4byte 0x616D6543 + .4byte 0x75626599 + .asciz " Instruction Booklet\nfor further instructions." + .balign 4 + .asciz "\n\n\nEin Fehler ist aufgetreten.\nBitte schalten Sie den NINTENDO GAMECUBE\naus und lesen Sie die Bedienungsanleitung,\num weitere Informationen zu erhalten." + .balign 4 + .4byte 0x0A0A0A55 + .4byte 0x6E652065 + .4byte 0x72726575 + .4byte 0x72206573 + .4byte 0x74207375 + .4byte 0x7276656E + .4byte 0x75652E0A + .4byte 0x45746569 + .4byte 0x676E657A + .4byte 0x206C6120 + .4byte 0x636F6E73 + .4byte 0x6F6C6520 + .4byte 0x65742072 + .4byte 0xE966E972 + .asciz "ez-vous au\nmanuel d'instructions NINTENDO GAMECUBE\npour de plus amples informations." + .balign 4 + .4byte 0x0A0A0A53 + .4byte 0x65206861 + .4byte 0x2070726F + .4byte 0x64756369 + .4byte 0x646F2075 + .4byte 0x6E206572 + .4byte 0x726F722E + .4byte 0x0A417061 + .4byte 0x6761206C + .4byte 0x6120636F + .4byte 0x6E736F6C + .4byte 0x61207920 + .4byte 0x636F6E73 + .4byte 0x756C7461 + .4byte 0x20656C20 + .4byte 0x6D616E75 + .4byte 0x616C0A64 + .4byte 0x6520696E + .4byte 0x73747275 + .4byte 0x6363696F + .4byte 0x6E657320 + .4byte 0x6465204E + .4byte 0x494E5445 + .4byte 0x4E444F20 + .4byte 0x47414D45 + .4byte 0x43554245 + .4byte 0x0A706172 + .4byte 0x61206F62 + .4byte 0x74656E65 + .4byte 0x72206DE1 + .4byte 0x7320696E + .4byte 0x666F726D + .4byte 0x616369F3 + .4byte 0x6E2E0000 + .4byte 0x0A0A0A53 + .4byte 0x6920E820 + .asciz "verificato un errore.\nSpegni (OFF) e controlla il manuale\nd'istruzioni del NINTENDO GAMECUBE\nper ulteriori indicazioni." + .asciz "\n\n\nEr is een fout opgetreden.\nZet de NINTENDO GAMECUBE uit en\nraadpleeg de handleiding van de\nNintendo GameCube voor nadere\ninstructies." + .balign 4 + .section .text, "ax" @@ -19,63 +147,63 @@ lbl_80374AC4: /* 80374AC8 00371A28 7C 03 00 40 */ cmplw r3, r0 /* 80374ACC 00371A2C 40 82 00 0C */ bne lbl_80374AD8 /* 80374AD0 00371A30 54 A3 06 3E */ clrlwi r3, r5, 0x18 -/* 80374AD4 00371A34 4E 80 00 20 */ blr +/* 80374AD4 00371A34 4E 80 00 20 */ blr lbl_80374AD8: /* 80374AD8 00371A38 84 04 00 04 */ lwzu r0, 4(r4) /* 80374ADC 00371A3C 38 A5 00 01 */ addi r5, r5, 1 /* 80374AE0 00371A40 7C 03 00 40 */ cmplw r3, r0 /* 80374AE4 00371A44 40 82 00 0C */ bne lbl_80374AF0 /* 80374AE8 00371A48 54 A3 06 3E */ clrlwi r3, r5, 0x18 -/* 80374AEC 00371A4C 4E 80 00 20 */ blr +/* 80374AEC 00371A4C 4E 80 00 20 */ blr lbl_80374AF0: /* 80374AF0 00371A50 84 04 00 04 */ lwzu r0, 4(r4) /* 80374AF4 00371A54 38 A5 00 01 */ addi r5, r5, 1 /* 80374AF8 00371A58 7C 03 00 40 */ cmplw r3, r0 /* 80374AFC 00371A5C 40 82 00 0C */ bne lbl_80374B08 /* 80374B00 00371A60 54 A3 06 3E */ clrlwi r3, r5, 0x18 -/* 80374B04 00371A64 4E 80 00 20 */ blr +/* 80374B04 00371A64 4E 80 00 20 */ blr lbl_80374B08: /* 80374B08 00371A68 84 04 00 04 */ lwzu r0, 4(r4) /* 80374B0C 00371A6C 38 A5 00 01 */ addi r5, r5, 1 /* 80374B10 00371A70 7C 03 00 40 */ cmplw r3, r0 /* 80374B14 00371A74 40 82 00 0C */ bne lbl_80374B20 /* 80374B18 00371A78 54 A3 06 3E */ clrlwi r3, r5, 0x18 -/* 80374B1C 00371A7C 4E 80 00 20 */ blr +/* 80374B1C 00371A7C 4E 80 00 20 */ blr lbl_80374B20: /* 80374B20 00371A80 84 04 00 04 */ lwzu r0, 4(r4) /* 80374B24 00371A84 38 A5 00 01 */ addi r5, r5, 1 /* 80374B28 00371A88 7C 03 00 40 */ cmplw r3, r0 /* 80374B2C 00371A8C 40 82 00 0C */ bne lbl_80374B38 /* 80374B30 00371A90 54 A3 06 3E */ clrlwi r3, r5, 0x18 -/* 80374B34 00371A94 4E 80 00 20 */ blr +/* 80374B34 00371A94 4E 80 00 20 */ blr lbl_80374B38: /* 80374B38 00371A98 84 04 00 04 */ lwzu r0, 4(r4) /* 80374B3C 00371A9C 38 A5 00 01 */ addi r5, r5, 1 /* 80374B40 00371AA0 7C 03 00 40 */ cmplw r3, r0 /* 80374B44 00371AA4 40 82 00 0C */ bne lbl_80374B50 /* 80374B48 00371AA8 54 A3 06 3E */ clrlwi r3, r5, 0x18 -/* 80374B4C 00371AAC 4E 80 00 20 */ blr +/* 80374B4C 00371AAC 4E 80 00 20 */ blr lbl_80374B50: /* 80374B50 00371AB0 84 04 00 04 */ lwzu r0, 4(r4) /* 80374B54 00371AB4 38 A5 00 01 */ addi r5, r5, 1 /* 80374B58 00371AB8 7C 03 00 40 */ cmplw r3, r0 /* 80374B5C 00371ABC 40 82 00 0C */ bne lbl_80374B68 /* 80374B60 00371AC0 54 A3 06 3E */ clrlwi r3, r5, 0x18 -/* 80374B64 00371AC4 4E 80 00 20 */ blr +/* 80374B64 00371AC4 4E 80 00 20 */ blr lbl_80374B68: /* 80374B68 00371AC8 84 04 00 04 */ lwzu r0, 4(r4) /* 80374B6C 00371ACC 38 A5 00 01 */ addi r5, r5, 1 /* 80374B70 00371AD0 7C 03 00 40 */ cmplw r3, r0 /* 80374B74 00371AD4 40 82 00 0C */ bne lbl_80374B80 /* 80374B78 00371AD8 54 A3 06 3E */ clrlwi r3, r5, 0x18 -/* 80374B7C 00371ADC 4E 80 00 20 */ blr +/* 80374B7C 00371ADC 4E 80 00 20 */ blr lbl_80374B80: /* 80374B80 00371AE0 84 04 00 04 */ lwzu r0, 4(r4) /* 80374B84 00371AE4 38 A5 00 01 */ addi r5, r5, 1 /* 80374B88 00371AE8 7C 03 00 40 */ cmplw r3, r0 /* 80374B8C 00371AEC 40 82 00 0C */ bne lbl_80374B98 /* 80374B90 00371AF0 54 A3 06 3E */ clrlwi r3, r5, 0x18 -/* 80374B94 00371AF4 4E 80 00 20 */ blr +/* 80374B94 00371AF4 4E 80 00 20 */ blr lbl_80374B98: /* 80374B98 00371AF8 38 84 00 04 */ addi r4, r4, 4 /* 80374B9C 00371AFC 38 A5 00 01 */ addi r5, r5, 1 @@ -87,10 +215,10 @@ lbl_80374B98: /* 80374BB4 00371B14 7C 03 00 40 */ cmplw r3, r0 /* 80374BB8 00371B18 41 81 00 0C */ bgt lbl_80374BC4 /* 80374BBC 00371B1C 38 60 00 11 */ li r3, 0x11 -/* 80374BC0 00371B20 4E 80 00 20 */ blr +/* 80374BC0 00371B20 4E 80 00 20 */ blr lbl_80374BC4: /* 80374BC4 00371B24 38 60 00 1D */ li r3, 0x1d -/* 80374BC8 00371B28 4E 80 00 20 */ blr +/* 80374BC8 00371B28 4E 80 00 20 */ blr .global __DVDStoreErrorCode __DVDStoreErrorCode: @@ -128,4 +256,4 @@ lbl_80374C24: /* 80374C38 00371B98 83 E1 00 14 */ lwz r31, 0x14(r1) /* 80374C3C 00371B9C 38 21 00 18 */ addi r1, r1, 0x18 /* 80374C40 00371BA0 7C 08 03 A6 */ mtlr r0 -/* 80374C44 00371BA4 4E 80 00 20 */ blr +/* 80374C44 00371BA4 4E 80 00 20 */ blr diff --git a/asm/Dolphin/dvd/dvdfatal.s b/asm/Dolphin/dvd/dvdfatal.s index 36f3beed..85b7d4d2 100644 --- a/asm/Dolphin/dvd/dvdfatal.s +++ b/asm/Dolphin/dvd/dvdfatal.s @@ -3,11 +3,15 @@ .section .sdata .global lbl_805A8AB0 lbl_805A8AB0: - .incbin "baserom.dol", 0x3F6450, 0x4 + # ROM: 0x3F6450 + .4byte 0x803F0148 + .global lbl_805A8AB4 lbl_805A8AB4: - .incbin "baserom.dol", 0x3F6454, 0x4 - + # ROM: 0x3F6454 + .4byte 0x803F01B8 + + .section .sbss .global lbl_805A9820 lbl_805A9820: @@ -16,14 +20,25 @@ lbl_805A9820: .section .sdata2 .global lbl_805AEB20 lbl_805AEB20: - .incbin "baserom.dol", 0x3FB3C0, 0x4 + # ROM: 0x3FB3C0 + .4byte 0 + .global lbl_805AEB24 lbl_805AEB24: - .incbin "baserom.dol", 0x3FB3C4, 0x4 + # ROM: 0x3FB3C4 + .4byte 0xFFFFFF00 + .section .rodata lbl_803D8570: - .incbin "baserom.dol", 0x3D5570, 0x18 + # ROM: 0x3D5570 + .4byte 0x803F0238 + .4byte 0x803F02B8 + .4byte 0x803F0354 + .4byte 0x803F03E4 + .4byte 0x803F046C + .4byte 0x803F04EC + .section .text, "ax" @@ -66,7 +81,7 @@ lbl_80374DA0: /* 80374DBC 00371D1C 80 01 00 1C */ lwz r0, 0x1c(r1) /* 80374DC0 00371D20 38 21 00 18 */ addi r1, r1, 0x18 /* 80374DC4 00371D24 7C 08 03 A6 */ mtlr r0 -/* 80374DC8 00371D28 4E 80 00 20 */ blr +/* 80374DC8 00371D28 4E 80 00 20 */ blr .global DVDSetAutoFatalMessaging DVDSetAutoFatalMessaging: @@ -101,7 +116,7 @@ lbl_80374E18: /* 80374E2C 00371D8C 83 C1 00 10 */ lwz r30, 0x10(r1) /* 80374E30 00371D90 38 21 00 18 */ addi r1, r1, 0x18 /* 80374E34 00371D94 7C 08 03 A6 */ mtlr r0 -/* 80374E38 00371D98 4E 80 00 20 */ blr +/* 80374E38 00371D98 4E 80 00 20 */ blr .global __DVDPrintFatalMessage __DVDPrintFatalMessage: @@ -112,9 +127,9 @@ __DVDPrintFatalMessage: /* 80374E4C 00371DAC 28 0C 00 00 */ cmplwi r12, 0 /* 80374E50 00371DB0 41 82 00 0C */ beq lbl_80374E5C /* 80374E54 00371DB4 7D 88 03 A6 */ mtlr r12 -/* 80374E58 00371DB8 4E 80 00 21 */ blrl +/* 80374E58 00371DB8 4E 80 00 21 */ blrl lbl_80374E5C: /* 80374E5C 00371DBC 80 01 00 0C */ lwz r0, 0xc(r1) /* 80374E60 00371DC0 38 21 00 08 */ addi r1, r1, 8 /* 80374E64 00371DC4 7C 08 03 A6 */ mtlr r0 -/* 80374E68 00371DC8 4E 80 00 20 */ blr +/* 80374E68 00371DC8 4E 80 00 20 */ blr diff --git a/asm/Dolphin/dvd/dvdfs.s b/asm/Dolphin/dvd/dvdfs.s index 1db5c504..9e94fe4a 100644 --- a/asm/Dolphin/dvd/dvdfs.s +++ b/asm/Dolphin/dvd/dvdfs.s @@ -23,8 +23,10 @@ lbl_805A97C4: .section .sdata .global lbl_805A8A90 lbl_805A8A90: - .incbin "baserom.dol", 0x3F6430, 0x8 - + # ROM: 0x3F6430 + .asciz "dvdfs.c" + + .section .data .balign 8 lbl_803EFB90: @@ -34,7 +36,27 @@ lbl_803EFC58: .asciz "Warning: DVDOpen(): file '%s' was not found under %s.\n" .balign 4 lbl_803EFC90: - .incbin "baserom.dol", 0x3ECC90, 0x338 + # ROM: 0x3ECC90 + .asciz "DVDReadAsync(): specified area is out of the file " + .asciz "DVDRead(): specified area is out of the file " + .balign 4 + .asciz "DVDSeek(): offset is out of the file " + .balign 4 + .asciz "Warning: DVDOpenDir(): file '%s' was not found under %s.\n" + .balign 4 + .asciz "DVDPrepareStreamAsync(): Specified start address (filestart(0x%x) + offset(0x%x)) is not 32KB aligned" + .balign 4 + .asciz "DVDPrepareStreamAsync(): Specified length (0x%x) is not a multiple of 32768(32*1024)" + .balign 4 + .asciz "DVDPrepareStreamAsync(): The area specified (offset(0x%x), length(0x%x)) is out of the file" + .asciz "DVDPrepareStream(): Specified start address (filestart(0x%x) + offset(0x%x)) is not 32KB aligned" + .balign 4 + .asciz "DVDPrepareStream(): Specified length (0x%x) is not a multiple of 32768(32*1024)" + .asciz "DVDPrepareStream(): The area specified (offset(0x%x), length(0x%x)) is out of the file" + .balign 4 + .asciz "<< Dolphin SDK - DVD\trelease build: Sep 5 2002 05:34:06 (0x2301) >>" + .balign 4 + .section .text, "ax" @@ -46,14 +68,14 @@ __DVDFSInit: /* 803712F0 0036E250 90 0D AB F4 */ stw r0, lbl_805A97B4@sda21(r13) /* 803712F4 0036E254 80 6D AB F4 */ lwz r3, lbl_805A97B4@sda21(r13) /* 803712F8 0036E258 28 03 00 00 */ cmplwi r3, 0 -/* 803712FC 0036E25C 4D 82 00 20 */ beqlr +/* 803712FC 0036E25C 4D 82 00 20 */ beqlr /* 80371300 0036E260 80 03 00 08 */ lwz r0, 8(r3) /* 80371304 0036E264 90 0D AB FC */ stw r0, lbl_805A97BC@sda21(r13) /* 80371308 0036E268 80 0D AB FC */ lwz r0, lbl_805A97BC@sda21(r13) /* 8037130C 0036E26C 1C 00 00 0C */ mulli r0, r0, 0xc /* 80371310 0036E270 7C 03 02 14 */ add r0, r3, r0 /* 80371314 0036E274 90 0D AB F8 */ stw r0, lbl_805A97B8@sda21(r13) -/* 80371318 0036E278 4E 80 00 20 */ blr +/* 80371318 0036E278 4E 80 00 20 */ blr .global DVDConvertPathToEntrynum DVDConvertPathToEntrynum: @@ -284,7 +306,7 @@ lbl_803715FC: /* 80371600 0036E560 80 01 00 4C */ lwz r0, 0x4c(r1) /* 80371604 0036E564 38 21 00 48 */ addi r1, r1, 0x48 /* 80371608 0036E568 7C 08 03 A6 */ mtlr r0 -/* 8037160C 0036E56C 4E 80 00 20 */ blr +/* 8037160C 0036E56C 4E 80 00 20 */ blr .global DVDFastOpen DVDFastOpen: @@ -307,7 +329,7 @@ lbl_80371644: /* 80371648 0036E5A8 41 82 00 0C */ beq lbl_80371654 lbl_8037164C: /* 8037164C 0036E5AC 38 60 00 00 */ li r3, 0 -/* 80371650 0036E5B0 4E 80 00 20 */ blr +/* 80371650 0036E5B0 4E 80 00 20 */ blr lbl_80371654: /* 80371654 0036E5B4 7C 63 32 14 */ add r3, r3, r6 /* 80371658 0036E5B8 80 A3 00 04 */ lwz r5, 4(r3) @@ -320,7 +342,7 @@ lbl_80371654: /* 80371674 0036E5D4 90 A4 00 34 */ stw r5, 0x34(r4) /* 80371678 0036E5D8 90 04 00 38 */ stw r0, 0x38(r4) /* 8037167C 0036E5DC 90 04 00 0C */ stw r0, 0xc(r4) -/* 80371680 0036E5E0 4E 80 00 20 */ blr +/* 80371680 0036E5E0 4E 80 00 20 */ blr .global DVDOpen DVDOpen: @@ -378,7 +400,7 @@ lbl_80371734: /* 8037173C 0036E69C 83 C1 00 90 */ lwz r30, 0x90(r1) /* 80371740 0036E6A0 38 21 00 98 */ addi r1, r1, 0x98 /* 80371744 0036E6A4 7C 08 03 A6 */ mtlr r0 -/* 80371748 0036E6A8 4E 80 00 20 */ blr +/* 80371748 0036E6A8 4E 80 00 20 */ blr .global DVDClose DVDClose: @@ -390,7 +412,7 @@ DVDClose: /* 80371760 0036E6C0 80 01 00 0C */ lwz r0, 0xc(r1) /* 80371764 0036E6C4 38 21 00 08 */ addi r1, r1, 8 /* 80371768 0036E6C8 7C 08 03 A6 */ mtlr r0 -/* 8037176C 0036E6CC 4E 80 00 20 */ blr +/* 8037176C 0036E6CC 4E 80 00 20 */ blr .global entryToPath entryToPath: @@ -493,7 +515,7 @@ lbl_803718B0: /* 803718C0 0036E820 83 81 00 20 */ lwz r28, 0x20(r1) /* 803718C4 0036E824 38 21 00 30 */ addi r1, r1, 0x30 /* 803718C8 0036E828 7C 08 03 A6 */ mtlr r0 -/* 803718CC 0036E82C 4E 80 00 20 */ blr +/* 803718CC 0036E82C 4E 80 00 20 */ blr .global DVDGetCurrentDir DVDGetCurrentDir: @@ -551,7 +573,7 @@ lbl_80371974: /* 80371984 0036E8E4 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80371988 0036E8E8 38 21 00 20 */ addi r1, r1, 0x20 /* 8037198C 0036E8EC 7C 08 03 A6 */ mtlr r0 -/* 80371990 0036E8F0 4E 80 00 20 */ blr +/* 80371990 0036E8F0 4E 80 00 20 */ blr .global DVDReadAsyncPrio DVDReadAsyncPrio: @@ -606,7 +628,7 @@ lbl_80371A14: /* 80371A44 0036E9A4 80 01 00 3C */ lwz r0, 0x3c(r1) /* 80371A48 0036E9A8 38 21 00 38 */ addi r1, r1, 0x38 /* 80371A4C 0036E9AC 7C 08 03 A6 */ mtlr r0 -/* 80371A50 0036E9B0 4E 80 00 20 */ blr +/* 80371A50 0036E9B0 4E 80 00 20 */ blr .global cbForReadAsync cbForReadAsync: @@ -617,12 +639,12 @@ cbForReadAsync: /* 80371A64 0036E9C4 28 0C 00 00 */ cmplwi r12, 0 /* 80371A68 0036E9C8 41 82 00 0C */ beq lbl_80371A74 /* 80371A6C 0036E9CC 7D 88 03 A6 */ mtlr r12 -/* 80371A70 0036E9D0 4E 80 00 21 */ blrl +/* 80371A70 0036E9D0 4E 80 00 21 */ blrl lbl_80371A74: /* 80371A74 0036E9D4 80 01 00 0C */ lwz r0, 0xc(r1) /* 80371A78 0036E9D8 38 21 00 08 */ addi r1, r1, 8 /* 80371A7C 0036E9DC 7C 08 03 A6 */ mtlr r0 -/* 80371A80 0036E9E0 4E 80 00 20 */ blr +/* 80371A80 0036E9E0 4E 80 00 20 */ blr .global DVDPrepareStreamAsync DVDPrepareStreamAsync: @@ -689,7 +711,7 @@ lbl_80371B3C: /* 80371B60 0036EAC0 80 01 00 3C */ lwz r0, 0x3c(r1) /* 80371B64 0036EAC4 38 21 00 38 */ addi r1, r1, 0x38 /* 80371B68 0036EAC8 7C 08 03 A6 */ mtlr r0 -/* 80371B6C 0036EACC 4E 80 00 20 */ blr +/* 80371B6C 0036EACC 4E 80 00 20 */ blr .global cbForPrepareStreamAsync cbForPrepareStreamAsync: @@ -700,14 +722,14 @@ cbForPrepareStreamAsync: /* 80371B80 0036EAE0 28 0C 00 00 */ cmplwi r12, 0 /* 80371B84 0036EAE4 41 82 00 0C */ beq lbl_80371B90 /* 80371B88 0036EAE8 7D 88 03 A6 */ mtlr r12 -/* 80371B8C 0036EAEC 4E 80 00 21 */ blrl +/* 80371B8C 0036EAEC 4E 80 00 21 */ blrl lbl_80371B90: /* 80371B90 0036EAF0 80 01 00 0C */ lwz r0, 0xc(r1) /* 80371B94 0036EAF4 38 21 00 08 */ addi r1, r1, 8 /* 80371B98 0036EAF8 7C 08 03 A6 */ mtlr r0 -/* 80371B9C 0036EAFC 4E 80 00 20 */ blr +/* 80371B9C 0036EAFC 4E 80 00 20 */ blr .global nullsub_62 nullsub_62: -/* 80371BA0 0036EB00 4E 80 00 20 */ blr +/* 80371BA0 0036EB00 4E 80 00 20 */ blr diff --git a/asm/Dolphin/dvd/dvdidutils.s b/asm/Dolphin/dvd/dvdidutils.s index ad9af2ed..a868620e 100644 --- a/asm/Dolphin/dvd/dvdidutils.s +++ b/asm/Dolphin/dvd/dvdidutils.s @@ -71,4 +71,4 @@ lbl_80374D28: /* 80374D30 00371C90 83 C1 00 10 */ lwz r30, 0x10(r1) /* 80374D34 00371C94 38 21 00 18 */ addi r1, r1, 0x18 /* 80374D38 00371C98 7C 08 03 A6 */ mtlr r0 -/* 80374D3C 00371C9C 4E 80 00 20 */ blr +/* 80374D3C 00371C9C 4E 80 00 20 */ blr diff --git a/asm/Dolphin/dvd/dvdlow.s b/asm/Dolphin/dvd/dvdlow.s index 93157124..85e74ad5 100644 --- a/asm/Dolphin/dvd/dvdlow.s +++ b/asm/Dolphin/dvd/dvdlow.s @@ -4,8 +4,11 @@ .global lbl_805A8A88 lbl_805A8A88: - .incbin "baserom.dol", 0x3F6428, 0x8 - + # ROM: 0x3F6428 + .4byte 0x00000001 + .4byte 0 + + .section .bss lbl_80540A80: @@ -66,7 +69,7 @@ lbl_805A97A8: .global lbl_805A97AC lbl_805A97AC: .skip 0x4 - + .section .text, "ax" .global __DVDInitWA @@ -86,7 +89,7 @@ __DVDInitWA: /* 803704D4 0036D434 80 01 00 0C */ lwz r0, 0xc(r1) /* 803704D8 0036D438 38 21 00 08 */ addi r1, r1, 8 /* 803704DC 0036D43C 7C 08 03 A6 */ mtlr r0 -/* 803704E0 0036D440 4E 80 00 20 */ blr +/* 803704E0 0036D440 4E 80 00 20 */ blr .global __DVDInterruptHandler __DVDInterruptHandler: @@ -184,7 +187,7 @@ lbl_803705AC: /* 8037063C 0036D59C 41 82 00 10 */ beq lbl_8037064C /* 80370640 0036D5A0 7D 88 03 A6 */ mtlr r12 /* 80370644 0036D5A4 38 60 00 04 */ li r3, 4 -/* 80370648 0036D5A8 4E 80 00 21 */ blrl +/* 80370648 0036D5A8 4E 80 00 21 */ blrl lbl_8037064C: /* 8037064C 0036D5AC 38 00 00 00 */ li r0, 0 /* 80370650 0036D5B0 90 0D AB B4 */ stw r0, lbl_805A9774@sda21(r13) @@ -279,7 +282,7 @@ lbl_80370760: /* 80370788 0036D6E8 41 82 00 10 */ beq lbl_80370798 /* 8037078C 0036D6EC 7D 88 03 A6 */ mtlr r12 /* 80370790 0036D6F0 38 7D 00 00 */ addi r3, r29, 0 -/* 80370794 0036D6F4 4E 80 00 21 */ blrl +/* 80370794 0036D6F4 4E 80 00 21 */ blrl lbl_80370798: /* 80370798 0036D6F8 38 00 00 00 */ li r0, 0 /* 8037079C 0036D6FC 90 0D AB C8 */ stw r0, lbl_805A9788@sda21(r13) @@ -293,7 +296,7 @@ lbl_803707B0: /* 803707B4 0036D714 80 01 02 F4 */ lwz r0, 0x2f4(r1) /* 803707B8 0036D718 38 21 02 F0 */ addi r1, r1, 0x2f0 /* 803707BC 0036D71C 7C 08 03 A6 */ mtlr r0 -/* 803707C0 0036D720 4E 80 00 20 */ blr +/* 803707C0 0036D720 4E 80 00 20 */ blr .global AlarmHandler AlarmHandler: @@ -331,7 +334,7 @@ lbl_80370838: /* 80370838 0036D798 80 01 00 0C */ lwz r0, 0xc(r1) /* 8037083C 0036D79C 38 21 00 08 */ addi r1, r1, 8 /* 80370840 0036D7A0 7C 08 03 A6 */ mtlr r0 -/* 80370844 0036D7A4 4E 80 00 20 */ blr +/* 80370844 0036D7A4 4E 80 00 20 */ blr .global AlarmHandlerForTimeout AlarmHandlerForTimeout: @@ -353,7 +356,7 @@ AlarmHandlerForTimeout: /* 80370884 0036D7E4 41 82 00 10 */ beq lbl_80370894 /* 80370888 0036D7E8 7D 88 03 A6 */ mtlr r12 /* 8037088C 0036D7EC 38 60 00 10 */ li r3, 0x10 -/* 80370890 0036D7F0 4E 80 00 21 */ blrl +/* 80370890 0036D7F0 4E 80 00 21 */ blrl lbl_80370894: /* 80370894 0036D7F4 38 61 00 10 */ addi r3, r1, 0x10 /* 80370898 0036D7F8 48 00 ED 7D */ bl OSClearContext @@ -363,7 +366,7 @@ lbl_80370894: /* 803708A8 0036D808 83 E1 02 DC */ lwz r31, 0x2dc(r1) /* 803708AC 0036D80C 38 21 02 E0 */ addi r1, r1, 0x2e0 /* 803708B0 0036D810 7C 08 03 A6 */ mtlr r0 -/* 803708B4 0036D814 4E 80 00 20 */ blr +/* 803708B4 0036D814 4E 80 00 20 */ blr .global Read Read: @@ -436,7 +439,7 @@ lbl_803709A8: /* 803709B8 0036D918 83 81 00 18 */ lwz r28, 0x18(r1) /* 803709BC 0036D91C 38 21 00 28 */ addi r1, r1, 0x28 /* 803709C0 0036D920 7C 08 03 A6 */ mtlr r0 -/* 803709C4 0036D924 4E 80 00 20 */ blr +/* 803709C4 0036D924 4E 80 00 20 */ blr .global SeekTwiceBeforeRead SeekTwiceBeforeRead: @@ -473,7 +476,7 @@ lbl_803709F4: /* 80370A38 0036D998 80 01 00 0C */ lwz r0, 0xc(r1) /* 80370A3C 0036D99C 38 21 00 08 */ addi r1, r1, 8 /* 80370A40 0036D9A0 7C 08 03 A6 */ mtlr r0 -/* 80370A44 0036D9A4 4E 80 00 20 */ blr +/* 80370A44 0036D9A4 4E 80 00 20 */ blr .global DVDLowRead DVDLowRead: @@ -656,7 +659,7 @@ lbl_80370CC8: /* 80370CD0 0036DC30 80 01 00 44 */ lwz r0, 0x44(r1) /* 80370CD4 0036DC34 38 21 00 40 */ addi r1, r1, 0x40 /* 80370CD8 0036DC38 7C 08 03 A6 */ mtlr r0 -/* 80370CDC 0036DC3C 4E 80 00 20 */ blr +/* 80370CDC 0036DC3C 4E 80 00 20 */ blr .global DVDLowSeek DVDLowSeek: @@ -696,7 +699,7 @@ DVDLowSeek: /* 80370D64 0036DCC4 83 C1 00 10 */ lwz r30, 0x10(r1) /* 80370D68 0036DCC8 38 21 00 18 */ addi r1, r1, 0x18 /* 80370D6C 0036DCCC 7C 08 03 A6 */ mtlr r0 -/* 80370D70 0036DCD0 4E 80 00 20 */ blr +/* 80370D70 0036DCD0 4E 80 00 20 */ blr .global DVDLowWaitCoverClose DVDLowWaitCoverClose: @@ -710,7 +713,7 @@ DVDLowWaitCoverClose: /* 80370D90 0036DCF0 38 00 00 02 */ li r0, 2 /* 80370D94 0036DCF4 38 60 00 01 */ li r3, 1 /* 80370D98 0036DCF8 90 04 00 04 */ stw r0, 4(r4) -/* 80370D9C 0036DCFC 4E 80 00 20 */ blr +/* 80370D9C 0036DCFC 4E 80 00 20 */ blr .global DVDLowReadDiskID DVDLowReadDiskID: @@ -754,7 +757,7 @@ DVDLowReadDiskID: /* 80370E34 0036DD94 83 C1 00 10 */ lwz r30, 0x10(r1) /* 80370E38 0036DD98 38 21 00 18 */ addi r1, r1, 0x18 /* 80370E3C 0036DD9C 7C 08 03 A6 */ mtlr r0 -/* 80370E40 0036DDA0 4E 80 00 20 */ blr +/* 80370E40 0036DDA0 4E 80 00 20 */ blr .global DVDLowStopMotor DVDLowStopMotor: @@ -792,7 +795,7 @@ DVDLowStopMotor: /* 80370EC0 0036DE20 83 C1 00 10 */ lwz r30, 0x10(r1) /* 80370EC4 0036DE24 38 21 00 18 */ addi r1, r1, 0x18 /* 80370EC8 0036DE28 7C 08 03 A6 */ mtlr r0 -/* 80370ECC 0036DE2C 4E 80 00 20 */ blr +/* 80370ECC 0036DE2C 4E 80 00 20 */ blr .global DVDLowRequestError DVDLowRequestError: @@ -830,7 +833,7 @@ DVDLowRequestError: /* 80370F4C 0036DEAC 83 C1 00 10 */ lwz r30, 0x10(r1) /* 80370F50 0036DEB0 38 21 00 18 */ addi r1, r1, 0x18 /* 80370F54 0036DEB4 7C 08 03 A6 */ mtlr r0 -/* 80370F58 0036DEB8 4E 80 00 20 */ blr +/* 80370F58 0036DEB8 4E 80 00 20 */ blr .global DVDLowInquiry DVDLowInquiry: @@ -872,7 +875,7 @@ DVDLowInquiry: /* 80370FE8 0036DF48 83 C1 00 10 */ lwz r30, 0x10(r1) /* 80370FEC 0036DF4C 38 21 00 18 */ addi r1, r1, 0x18 /* 80370FF0 0036DF50 7C 08 03 A6 */ mtlr r0 -/* 80370FF4 0036DF54 4E 80 00 20 */ blr +/* 80370FF4 0036DF54 4E 80 00 20 */ blr .global DVDLowAudioStream DVDLowAudioStream: @@ -913,7 +916,7 @@ DVDLowAudioStream: /* 80371080 0036DFE0 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80371084 0036DFE4 38 21 00 20 */ addi r1, r1, 0x20 /* 80371088 0036DFE8 7C 08 03 A6 */ mtlr r0 -/* 8037108C 0036DFEC 4E 80 00 20 */ blr +/* 8037108C 0036DFEC 4E 80 00 20 */ blr .global DVDLowRequestAudioStatus DVDLowRequestAudioStatus: @@ -951,7 +954,7 @@ DVDLowRequestAudioStatus: /* 8037110C 0036E06C 83 C1 00 10 */ lwz r30, 0x10(r1) /* 80371110 0036E070 38 21 00 18 */ addi r1, r1, 0x18 /* 80371114 0036E074 7C 08 03 A6 */ mtlr r0 -/* 80371118 0036E078 4E 80 00 20 */ blr +/* 80371118 0036E078 4E 80 00 20 */ blr .global DVDLowAudioBufferConfig DVDLowAudioBufferConfig: @@ -994,7 +997,7 @@ lbl_80371148: /* 803711A8 0036E108 83 C1 00 18 */ lwz r30, 0x18(r1) /* 803711AC 0036E10C 38 21 00 20 */ addi r1, r1, 0x20 /* 803711B0 0036E110 7C 08 03 A6 */ mtlr r0 -/* 803711B4 0036E114 4E 80 00 20 */ blr +/* 803711B4 0036E114 4E 80 00 20 */ blr .global DVDLowReset DVDLowReset: @@ -1045,7 +1048,7 @@ lbl_8037121C: /* 80371264 0036E1C4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80371268 0036E1C8 38 21 00 20 */ addi r1, r1, 0x20 /* 8037126C 0036E1CC 7C 08 03 A6 */ mtlr r0 -/* 80371270 0036E1D0 4E 80 00 20 */ blr +/* 80371270 0036E1D0 4E 80 00 20 */ blr .global DVDLowBreak DVDLowBreak: @@ -1053,7 +1056,7 @@ DVDLowBreak: /* 80371278 0036E1D8 90 0D AB A8 */ stw r0, lbl_805A9768@sda21(r13) /* 8037127C 0036E1DC 38 60 00 01 */ li r3, 1 /* 80371280 0036E1E0 90 0D AB C8 */ stw r0, lbl_805A9788@sda21(r13) -/* 80371284 0036E1E4 4E 80 00 20 */ blr +/* 80371284 0036E1E4 4E 80 00 20 */ blr .global DVDLowClearCallback DVDLowClearCallback: @@ -1062,7 +1065,7 @@ DVDLowClearCallback: /* 80371290 0036E1F0 90 03 60 04 */ stw r0, 0xCC006004@l(r3) /* 80371294 0036E1F4 80 6D AB B0 */ lwz r3, lbl_805A9770@sda21(r13) /* 80371298 0036E1F8 90 0D AB B0 */ stw r0, lbl_805A9770@sda21(r13) -/* 8037129C 0036E1FC 4E 80 00 20 */ blr +/* 8037129C 0036E1FC 4E 80 00 20 */ blr .global __DVDLowSetWAType __DVDLowSetWAType: @@ -1082,4 +1085,4 @@ __DVDLowSetWAType: /* 803712D4 0036E234 83 C1 00 10 */ lwz r30, 0x10(r1) /* 803712D8 0036E238 38 21 00 18 */ addi r1, r1, 0x18 /* 803712DC 0036E23C 7C 08 03 A6 */ mtlr r0 -/* 803712E0 0036E240 4E 80 00 20 */ blr +/* 803712E0 0036E240 4E 80 00 20 */ blr diff --git a/asm/Dolphin/dvd/dvdqueue.s b/asm/Dolphin/dvd/dvdqueue.s index 68fd9a3f..37e0a5f1 100644 --- a/asm/Dolphin/dvd/dvdqueue.s +++ b/asm/Dolphin/dvd/dvdqueue.s @@ -4,7 +4,7 @@ .global lbl_80540BF8 lbl_80540BF8: .skip 0x20 - + .section .text, "ax" .global __DVDClearWaitingQueue @@ -22,7 +22,7 @@ __DVDClearWaitingQueue: /* 803748E0 00371840 90 84 00 04 */ stw r4, 4(r4) /* 803748E4 00371844 90 63 00 00 */ stw r3, 0(r3) /* 803748E8 00371848 90 63 00 04 */ stw r3, 4(r3) -/* 803748EC 0037184C 4E 80 00 20 */ blr +/* 803748EC 0037184C 4E 80 00 20 */ blr .global __DVDPushWaitingQueue __DVDPushWaitingQueue: @@ -51,7 +51,7 @@ __DVDPushWaitingQueue: /* 80374948 003718A8 83 C1 00 10 */ lwz r30, 0x10(r1) /* 8037494C 003718AC 38 21 00 18 */ addi r1, r1, 0x18 /* 80374950 003718B0 7C 08 03 A6 */ mtlr r0 -/* 80374954 003718B4 4E 80 00 20 */ blr +/* 80374954 003718B4 4E 80 00 20 */ blr .global __DVDPopWaitingQueue __DVDPopWaitingQueue: @@ -97,7 +97,7 @@ lbl_803749E4: /* 803749E8 00371948 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803749EC 0037194C 38 21 00 10 */ addi r1, r1, 0x10 /* 803749F0 00371950 7C 08 03 A6 */ mtlr r0 -/* 803749F4 00371954 4E 80 00 20 */ blr +/* 803749F4 00371954 4E 80 00 20 */ blr .global __DVDCheckWaitingQueue __DVDCheckWaitingQueue: @@ -125,7 +125,7 @@ lbl_80374A40: /* 80374A40 003719A0 80 01 00 0C */ lwz r0, 0xc(r1) /* 80374A44 003719A4 38 21 00 08 */ addi r1, r1, 8 /* 80374A48 003719A8 7C 08 03 A6 */ mtlr r0 -/* 80374A4C 003719AC 4E 80 00 20 */ blr +/* 80374A4C 003719AC 4E 80 00 20 */ blr .global __DVDDequeueWaitingQueue __DVDDequeueWaitingQueue: @@ -155,4 +155,4 @@ lbl_80374A9C: /* 80374AA0 00371A00 83 E1 00 14 */ lwz r31, 0x14(r1) /* 80374AA4 00371A04 38 21 00 18 */ addi r1, r1, 0x18 /* 80374AA8 00371A08 7C 08 03 A6 */ mtlr r0 -/* 80374AAC 00371A0C 4E 80 00 20 */ blr +/* 80374AAC 00371A0C 4E 80 00 20 */ blr diff --git a/asm/Dolphin/dvd/fstload.s b/asm/Dolphin/dvd/fstload.s index caa1ddc8..4ff66850 100644 --- a/asm/Dolphin/dvd/fstload.s +++ b/asm/Dolphin/dvd/fstload.s @@ -12,24 +12,40 @@ lbl_805A982C: .skip 0x4 lbl_805A9830: .skip 0x8 - + .section .sdata .global lbl_805A8AB8 lbl_805A8AB8: - .incbin "baserom.dol", 0x3F6458, 0x4 + # ROM: 0x3F6458 + .4byte 0x0A000000 + .global lbl_805A8ABC lbl_805A8ABC: - .incbin "baserom.dol", 0x3F645C, 0x4 + # ROM: 0x3F645C + .4byte 0x4F464600 + .global lbl_805A8AC0 lbl_805A8AC0: - .incbin "baserom.dol", 0x3F6460, 0x8 - + # ROM: 0x3F6460 + .4byte 0x4F4E0000 + .4byte 0 + + .section .data .balign 8 lbl_803F0578: - .incbin "baserom.dol", 0x3ED578, 0xB4 - + # ROM: 0x3ED578 + .asciz " Game Name ... %c%c%c%c\n" + .balign 4 + .asciz " Company ..... %c%c\n" + .balign 4 + .asciz " Disk # ...... %d\n" + .asciz " Game ver .... %d\n" + .asciz " Streaming ... %s\n" + .asciz "<< Dolphin SDK - GX\trelease build: Sep 5 2002 05:33:28 (0x2301) >>" + + .section .text, "ax" cb: @@ -90,7 +106,7 @@ lbl_80374F30: /* 80374F34 00371E94 83 E1 00 14 */ lwz r31, 0x14(r1) /* 80374F38 00371E98 38 21 00 18 */ addi r1, r1, 0x18 /* 80374F3C 00371E9C 7C 08 03 A6 */ mtlr r0 -/* 80374F40 00371EA0 4E 80 00 20 */ blr +/* 80374F40 00371EA0 4E 80 00 20 */ blr .global __fstLoad __fstLoad: @@ -186,4 +202,4 @@ lbl_8037506C: /* 8037509C 00371FFC 83 A1 00 54 */ lwz r29, 0x54(r1) /* 803750A0 00372000 38 21 00 60 */ addi r1, r1, 0x60 /* 803750A4 00372004 7C 08 03 A6 */ mtlr r0 -/* 803750A8 00372008 4E 80 00 20 */ blr +/* 803750A8 00372008 4E 80 00 20 */ blr diff --git a/asm/Dolphin/exi/EXIBios.s b/asm/Dolphin/exi/EXIBios.s index 79dfd880..728e537f 100644 --- a/asm/Dolphin/exi/EXIBios.s +++ b/asm/Dolphin/exi/EXIBios.s @@ -4,13 +4,16 @@ .global lbl_80569E98 lbl_80569E98: .skip 0xC8 - + .section .sdata, "wa" .global lbl_805A8C10 lbl_805A8C10: - .incbin "baserom.dol", 0x3F65B0, 0x8 - + # ROM: 0x3F65B0 + .4byte 0x803F7050 + .4byte 0 + + .section .text, "ax" .global SetExiInterruptMask @@ -87,7 +90,7 @@ lbl_803C00F4: /* 803C00F8 003BD058 83 E1 00 14 */ lwz r31, 0x14(r1) /* 803C00FC 003BD05C 38 21 00 18 */ addi r1, r1, 0x18 /* 803C0100 003BD060 7C 08 03 A6 */ mtlr r0 -/* 803C0104 003BD064 4E 80 00 20 */ blr +/* 803C0104 003BD064 4E 80 00 20 */ blr .global EXIImm EXIImm: @@ -253,7 +256,7 @@ lbl_803C0350: /* 803C0354 003BD2B4 BB 21 00 24 */ lmw r25, 0x24(r1) /* 803C0358 003BD2B8 38 21 00 40 */ addi r1, r1, 0x40 /* 803C035C 003BD2BC 7C 08 03 A6 */ mtlr r0 -/* 803C0360 003BD2C0 4E 80 00 20 */ blr +/* 803C0360 003BD2C0 4E 80 00 20 */ blr .global EXIImmEx EXIImmEx: @@ -303,7 +306,7 @@ lbl_803C03F0: /* 803C03F4 003BD354 BB 61 00 1C */ lmw r27, 0x1c(r1) /* 803C03F8 003BD358 38 21 00 30 */ addi r1, r1, 0x30 /* 803C03FC 003BD35C 7C 08 03 A6 */ mtlr r0 -/* 803C0400 003BD360 4E 80 00 20 */ blr +/* 803C0400 003BD360 4E 80 00 20 */ blr .global EXIDma EXIDma: @@ -369,7 +372,7 @@ lbl_803C04DC: /* 803C04E0 003BD440 BB 21 00 24 */ lmw r25, 0x24(r1) /* 803C04E4 003BD444 38 21 00 40 */ addi r1, r1, 0x40 /* 803C04E8 003BD448 7C 08 03 A6 */ mtlr r0 -/* 803C04EC 003BD44C 4E 80 00 20 */ blr +/* 803C04EC 003BD44C 4E 80 00 20 */ blr .global sub_803c04f0 sub_803c04f0: @@ -525,7 +528,7 @@ lbl_803C0710: /* 803C0718 003BD678 BB 61 00 1C */ lmw r27, 0x1c(r1) /* 803C071C 003BD67C 38 21 00 30 */ addi r1, r1, 0x30 /* 803C0720 003BD680 7C 08 03 A6 */ mtlr r0 -/* 803C0724 003BD684 4E 80 00 20 */ blr +/* 803C0724 003BD684 4E 80 00 20 */ blr .global EXIClearInterrupts EXIClearInterrupts: @@ -549,7 +552,7 @@ lbl_803C075C: /* 803C0764 003BD6C4 60 00 08 00 */ ori r0, r0, 0x800 lbl_803C0768: /* 803C0768 003BD6C8 90 07 00 00 */ stw r0, 0(r7) -/* 803C076C 003BD6CC 4E 80 00 20 */ blr +/* 803C076C 003BD6CC 4E 80 00 20 */ blr .global EXISetExiCallback EXISetExiCallback: @@ -585,7 +588,7 @@ lbl_803C07CC: /* 803C07DC 003BD73C BB 41 00 10 */ lmw r26, 0x10(r1) /* 803C07E0 003BD740 38 21 00 28 */ addi r1, r1, 0x28 /* 803C07E4 003BD744 7C 08 03 A6 */ mtlr r0 -/* 803C07E8 003BD748 4E 80 00 20 */ blr +/* 803C07E8 003BD748 4E 80 00 20 */ blr .global __EXIProbe __EXIProbe: @@ -689,7 +692,7 @@ lbl_803C094C: /* 803C0950 003BD8B0 BB 61 00 14 */ lmw r27, 0x14(r1) /* 803C0954 003BD8B4 38 21 00 28 */ addi r1, r1, 0x28 /* 803C0958 003BD8B8 7C 08 03 A6 */ mtlr r0 -/* 803C095C 003BD8BC 4E 80 00 20 */ blr +/* 803C095C 003BD8BC 4E 80 00 20 */ blr .global EXIProbe EXIProbe: @@ -726,7 +729,7 @@ lbl_803C09C8: /* 803C09D0 003BD930 83 C1 00 10 */ lwz r30, 0x10(r1) /* 803C09D4 003BD934 38 21 00 18 */ addi r1, r1, 0x18 /* 803C09D8 003BD938 7C 08 03 A6 */ mtlr r0 -/* 803C09DC 003BD93C 4E 80 00 20 */ blr +/* 803C09DC 003BD93C 4E 80 00 20 */ blr .global EXIProbeEx EXIProbeEx: @@ -779,7 +782,7 @@ lbl_803C0A7C: /* 803C0A84 003BD9E4 83 C1 00 10 */ lwz r30, 0x10(r1) /* 803C0A88 003BD9E8 38 21 00 18 */ addi r1, r1, 0x18 /* 803C0A8C 003BD9EC 7C 08 03 A6 */ mtlr r0 -/* 803C0A90 003BD9F0 4E 80 00 20 */ blr +/* 803C0A90 003BD9F0 4E 80 00 20 */ blr .global EXIAttach EXIAttach: @@ -855,7 +858,7 @@ lbl_803C0B8C: /* 803C0B90 003BDAF0 BB 61 00 2C */ lmw r27, 0x2c(r1) /* 803C0B94 003BDAF4 38 21 00 40 */ addi r1, r1, 0x40 /* 803C0B98 003BDAF8 7C 08 03 A6 */ mtlr r0 -/* 803C0B9C 003BDAFC 4E 80 00 20 */ blr +/* 803C0B9C 003BDAFC 4E 80 00 20 */ blr .global EXIDetach EXIDetach: @@ -908,7 +911,7 @@ lbl_803C0C40: /* 803C0C4C 003BDBAC 83 A1 00 14 */ lwz r29, 0x14(r1) /* 803C0C50 003BDBB0 38 21 00 20 */ addi r1, r1, 0x20 /* 803C0C54 003BDBB4 7C 08 03 A6 */ mtlr r0 -/* 803C0C58 003BDBB8 4E 80 00 20 */ blr +/* 803C0C58 003BDBB8 4E 80 00 20 */ blr .global EXISelect EXISelect: @@ -993,7 +996,7 @@ lbl_803C0D74: /* 803C0D78 003BDCD8 BB 61 00 1C */ lmw r27, 0x1c(r1) /* 803C0D7C 003BDCDC 38 21 00 30 */ addi r1, r1, 0x30 /* 803C0D80 003BDCE0 7C 08 03 A6 */ mtlr r0 -/* 803C0D84 003BDCE4 4E 80 00 20 */ blr +/* 803C0D84 003BDCE4 4E 80 00 20 */ blr .global EXIDeselect EXIDeselect: @@ -1071,7 +1074,7 @@ lbl_803C0E78: /* 803C0E88 003BDDE8 83 81 00 10 */ lwz r28, 0x10(r1) /* 803C0E8C 003BDDEC 38 21 00 20 */ addi r1, r1, 0x20 /* 803C0E90 003BDDF0 7C 08 03 A6 */ mtlr r0 -/* 803C0E94 003BDDF4 4E 80 00 20 */ blr +/* 803C0E94 003BDDF4 4E 80 00 20 */ blr .global EXIIntrruptHandler EXIIntrruptHandler: @@ -1113,7 +1116,7 @@ EXIIntrruptHandler: /* 803C0F24 003BDE84 38 9F 00 00 */ addi r4, r31, 0 /* 803C0F28 003BDE88 39 9D 00 00 */ addi r12, r29, 0 /* 803C0F2C 003BDE8C 7D 88 03 A6 */ mtlr r12 -/* 803C0F30 003BDE90 4E 80 00 21 */ blrl +/* 803C0F30 003BDE90 4E 80 00 21 */ blrl /* 803C0F34 003BDE94 38 61 00 18 */ addi r3, r1, 0x18 /* 803C0F38 003BDE98 4B FB E6 DD */ bl OSClearContext /* 803C0F3C 003BDE9C 7F E3 FB 78 */ mr r3, r31 @@ -1125,7 +1128,7 @@ lbl_803C0F44: /* 803C0F50 003BDEB0 83 A1 02 EC */ lwz r29, 0x2ec(r1) /* 803C0F54 003BDEB4 38 21 02 F8 */ addi r1, r1, 0x2f8 /* 803C0F58 003BDEB8 7C 08 03 A6 */ mtlr r0 -/* 803C0F5C 003BDEBC 4E 80 00 20 */ blr +/* 803C0F5C 003BDEBC 4E 80 00 20 */ blr .global TCIntrruptHandler TCIntrruptHandler: @@ -1255,7 +1258,7 @@ lbl_803C1124: /* 803C1138 003BE098 38 9C 00 00 */ addi r4, r28, 0 /* 803C113C 003BE09C 39 9D 00 00 */ addi r12, r29, 0 /* 803C1140 003BE0A0 7D 88 03 A6 */ mtlr r12 -/* 803C1144 003BE0A4 4E 80 00 21 */ blrl +/* 803C1144 003BE0A4 4E 80 00 21 */ blrl /* 803C1148 003BE0A8 38 61 00 20 */ addi r3, r1, 0x20 /* 803C114C 003BE0AC 4B FB E4 C9 */ bl OSClearContext /* 803C1150 003BE0B0 7F 83 E3 78 */ mr r3, r28 @@ -1268,7 +1271,7 @@ lbl_803C1158: /* 803C1168 003BE0C8 83 81 02 E8 */ lwz r28, 0x2e8(r1) /* 803C116C 003BE0CC 38 21 02 F8 */ addi r1, r1, 0x2f8 /* 803C1170 003BE0D0 7C 08 03 A6 */ mtlr r0 -/* 803C1174 003BE0D4 4E 80 00 20 */ blr +/* 803C1174 003BE0D4 4E 80 00 20 */ blr .global EXTIntrruptHandler EXTIntrruptHandler: @@ -1311,7 +1314,7 @@ EXTIntrruptHandler: /* 803C1208 003BE168 38 9F 00 00 */ addi r4, r31, 0 /* 803C120C 003BE16C 39 9C 00 00 */ addi r12, r28, 0 /* 803C1210 003BE170 7D 88 03 A6 */ mtlr r12 -/* 803C1214 003BE174 4E 80 00 21 */ blrl +/* 803C1214 003BE174 4E 80 00 21 */ blrl /* 803C1218 003BE178 38 61 00 10 */ addi r3, r1, 0x10 /* 803C121C 003BE17C 4B FB E3 F9 */ bl OSClearContext /* 803C1220 003BE180 7F E3 FB 78 */ mr r3, r31 @@ -1324,7 +1327,7 @@ lbl_803C1228: /* 803C1238 003BE198 83 81 02 D8 */ lwz r28, 0x2d8(r1) /* 803C123C 003BE19C 38 21 02 E8 */ addi r1, r1, 0x2e8 /* 803C1240 003BE1A0 7C 08 03 A6 */ mtlr r0 -/* 803C1244 003BE1A4 4E 80 00 20 */ blr +/* 803C1244 003BE1A4 4E 80 00 20 */ blr .global EXIInit EXIInit: @@ -1399,7 +1402,7 @@ lbl_803C1344: /* 803C1354 003BE2B4 83 81 00 08 */ lwz r28, 8(r1) /* 803C1358 003BE2B8 38 21 00 18 */ addi r1, r1, 0x18 /* 803C135C 003BE2BC 7C 08 03 A6 */ mtlr r0 -/* 803C1360 003BE2C0 4E 80 00 20 */ blr +/* 803C1360 003BE2C0 4E 80 00 20 */ blr .global EXILock EXILock: @@ -1469,7 +1472,7 @@ lbl_803C1444: /* 803C1448 003BE3A8 BB 61 00 1C */ lmw r27, 0x1c(r1) /* 803C144C 003BE3AC 38 21 00 30 */ addi r1, r1, 0x30 /* 803C1450 003BE3B0 7C 08 03 A6 */ mtlr r0 -/* 803C1454 003BE3B4 4E 80 00 20 */ blr +/* 803C1454 003BE3B4 4E 80 00 20 */ blr .global EXIUnlock EXIUnlock: @@ -1518,7 +1521,7 @@ lbl_803C14F4: /* 803C14F8 003BE458 38 80 00 00 */ li r4, 0 /* 803C14FC 003BE45C 39 9D 00 00 */ addi r12, r29, 0 /* 803C1500 003BE460 7D 88 03 A6 */ mtlr r12 -/* 803C1504 003BE464 4E 80 00 21 */ blrl +/* 803C1504 003BE464 4E 80 00 21 */ blrl lbl_803C1508: /* 803C1508 003BE468 7F C3 F3 78 */ mr r3, r30 /* 803C150C 003BE46C 4B FC 01 7D */ bl OSRestoreInterrupts @@ -1531,7 +1534,7 @@ lbl_803C1514: /* 803C1524 003BE484 83 81 00 10 */ lwz r28, 0x10(r1) /* 803C1528 003BE488 38 21 00 20 */ addi r1, r1, 0x20 /* 803C152C 003BE48C 7C 08 03 A6 */ mtlr r0 -/* 803C1530 003BE490 4E 80 00 20 */ blr +/* 803C1530 003BE490 4E 80 00 20 */ blr .global EXIGetState EXIGetState: @@ -1540,7 +1543,7 @@ EXIGetState: /* 803C153C 003BE49C 38 03 9E 98 */ addi r0, r3, lbl_80569E98@l /* 803C1540 003BE4A0 7C 60 22 14 */ add r3, r0, r4 /* 803C1544 003BE4A4 80 63 00 0C */ lwz r3, 0xc(r3) -/* 803C1548 003BE4A8 4E 80 00 20 */ blr +/* 803C1548 003BE4A8 4E 80 00 20 */ blr .global UnlockedHandler UnlockedHandler: @@ -1553,7 +1556,7 @@ UnlockedHandler: /* 803C1564 003BE4C4 80 01 00 1C */ lwz r0, 0x1c(r1) /* 803C1568 003BE4C8 38 21 00 18 */ addi r1, r1, 0x18 /* 803C156C 003BE4CC 7C 08 03 A6 */ mtlr r0 -/* 803C1570 003BE4D0 4E 80 00 20 */ blr +/* 803C1570 003BE4D0 4E 80 00 20 */ blr .global EXIGetID EXIGetID: @@ -1730,7 +1733,7 @@ lbl_803C17E4: /* 803C17E8 003BE748 38 80 00 00 */ li r4, 0 /* 803C17EC 003BE74C 39 99 00 00 */ addi r12, r25, 0 /* 803C17F0 003BE750 7D 88 03 A6 */ mtlr r12 -/* 803C17F4 003BE754 4E 80 00 21 */ blrl +/* 803C17F4 003BE754 4E 80 00 21 */ blrl lbl_803C17F8: /* 803C17F8 003BE758 7F 03 C3 78 */ mr r3, r24 /* 803C17FC 003BE75C 4B FB FE 8D */ bl OSRestoreInterrupts @@ -1802,4 +1805,4 @@ lbl_803C18DC: /* 803C18E0 003BE840 BB 01 00 20 */ lmw r24, 0x20(r1) /* 803C18E4 003BE844 38 21 00 40 */ addi r1, r1, 0x40 /* 803C18E8 003BE848 7C 08 03 A6 */ mtlr r0 -/* 803C18EC 003BE84C 4E 80 00 20 */ blr +/* 803C18EC 003BE84C 4E 80 00 20 */ blr diff --git a/asm/Dolphin/exi/EXIUart.s b/asm/Dolphin/exi/EXIUart.s index 1374567a..2ab3fbfe 100644 --- a/asm/Dolphin/exi/EXIUart.s +++ b/asm/Dolphin/exi/EXIUart.s @@ -34,7 +34,7 @@ lbl_803C1950: /* 803C1950 003BE8B0 80 01 00 0C */ lwz r0, 0xc(r1) /* 803C1954 003BE8B4 38 21 00 08 */ addi r1, r1, 8 /* 803C1958 003BE8B8 7C 08 03 A6 */ mtlr r0 -/* 803C195C 003BE8BC 4E 80 00 20 */ blr +/* 803C195C 003BE8BC 4E 80 00 20 */ blr .global WriteUARTN WriteUARTN: @@ -185,5 +185,5 @@ lbl_803C1B4C: /* 803C1B50 003BEAB0 80 01 00 34 */ lwz r0, 0x34(r1) /* 803C1B54 003BEAB4 38 21 00 30 */ addi r1, r1, 0x30 /* 803C1B58 003BEAB8 7C 08 03 A6 */ mtlr r0 -/* 803C1B5C 003BEABC 4E 80 00 20 */ blr +/* 803C1B5C 003BEABC 4E 80 00 20 */ blr diff --git a/asm/Dolphin/gx/GXAttr.s b/asm/Dolphin/gx/GXAttr.s index df0724e6..984bf264 100644 --- a/asm/Dolphin/gx/GXAttr.s +++ b/asm/Dolphin/gx/GXAttr.s @@ -3,14 +3,21 @@ .section .sdata .global lbl_805A8AD0 lbl_805A8AD0: - .incbin "baserom.dol", 0x3F6470, 0x4 + # ROM: 0x3F6470 + .4byte 0x00040102 + .global lbl_805A8AD4 lbl_805A8AD4: - .incbin "baserom.dol", 0x3F6474, 0x4 + # ROM: 0x3F6474 + .4byte 0x00080102 + .global lbl_805A8AD8 lbl_805A8AD8: - .incbin "baserom.dol", 0x3F6478, 0x8 - + # ROM: 0x3F6478 + .4byte 0x000C0102 + .4byte 0 + + .section .text, "ax" .global __GXXfVtxSpecs @@ -123,7 +130,7 @@ lbl_80376EDC: /* 80376F08 00373E68 90 05 80 00 */ stw r0, 0xCC008000@l(r5) /* 80376F0C 00373E6C 38 00 00 01 */ li r0, 1 /* 80376F10 00373E70 B0 03 00 02 */ sth r0, 2(r3) -/* 80376F14 00373E74 4E 80 00 20 */ blr +/* 80376F14 00373E74 4E 80 00 20 */ blr .global GXSetVtxDesc GXSetVtxDesc: @@ -134,7 +141,7 @@ GXSetVtxDesc: /* 80376F28 00373E88 54 60 10 3A */ slwi r0, r3, 2 /* 80376F2C 00373E8C 7C 05 00 2E */ lwzx r0, r5, r0 /* 80376F30 00373E90 7C 09 03 A6 */ mtctr r0 -/* 80376F34 00373E94 4E 80 04 20 */ bctr +/* 80376F34 00373E94 4E 80 04 20 */ bctr /* 80376F38 00373E98 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) /* 80376F3C 00373E9C 84 03 00 14 */ lwzu r0, 0x14(r3) /* 80376F40 00373EA0 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e @@ -344,7 +351,7 @@ lbl_80377254: /* 80377258 003741B8 80 03 04 F4 */ lwz r0, 0x4f4(r3) /* 8037725C 003741BC 60 00 00 08 */ ori r0, r0, 8 /* 80377260 003741C0 90 03 04 F4 */ stw r0, 0x4f4(r3) -/* 80377264 003741C4 4E 80 00 20 */ blr +/* 80377264 003741C4 4E 80 00 20 */ blr .global GXSetVtxDescv GXSetVtxDescv: @@ -359,7 +366,7 @@ lbl_80377274: /* 80377284 003741E4 54 A5 10 3A */ slwi r5, r5, 2 /* 80377288 003741E8 7C A4 28 2E */ lwzx r5, r4, r5 /* 8037728C 003741EC 7C A9 03 A6 */ mtctr r5 -/* 80377290 003741F0 4E 80 04 20 */ bctr +/* 80377290 003741F0 4E 80 04 20 */ bctr /* 80377294 003741F4 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) /* 80377298 003741F8 38 C5 00 14 */ addi r6, r5, 0x14 /* 8037729C 003741FC 80 A5 00 14 */ lwz r5, 0x14(r5) @@ -576,7 +583,7 @@ lbl_803775C8: /* 803775CC 0037452C 80 03 04 F4 */ lwz r0, 0x4f4(r3) /* 803775D0 00374530 60 00 00 08 */ ori r0, r0, 8 /* 803775D4 00374534 90 03 04 F4 */ stw r0, 0x4f4(r3) -/* 803775D8 00374538 4E 80 00 20 */ blr +/* 803775D8 00374538 4E 80 00 20 */ blr .global __GXSetVCD __GXSetVCD: @@ -600,14 +607,14 @@ __GXSetVCD: /* 80377620 00374580 80 01 00 0C */ lwz r0, 0xc(r1) /* 80377624 00374584 38 21 00 08 */ addi r1, r1, 8 /* 80377628 00374588 7C 08 03 A6 */ mtlr r0 -/* 8037762C 0037458C 4E 80 00 20 */ blr +/* 8037762C 0037458C 4E 80 00 20 */ blr .global __GXCalculateVLim __GXCalculateVLim: /* 80377630 00374590 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) /* 80377634 00374594 A0 03 00 04 */ lhz r0, 4(r3) /* 80377638 00374598 28 00 00 00 */ cmplwi r0, 0 -/* 8037763C 0037459C 4D 82 00 20 */ beqlr +/* 8037763C 0037459C 4D 82 00 20 */ beqlr /* 80377640 003745A0 81 23 00 14 */ lwz r9, 0x14(r3) /* 80377644 003745A4 38 AD 9F 18 */ addi r5, r13, lbl_805A8AD8@sda21 /* 80377648 003745A8 81 03 00 1C */ lwz r8, 0x1c(r3) @@ -678,7 +685,7 @@ lbl_803776B8: /* 80377744 003746A4 7C 00 2A 14 */ add r0, r0, r5 /* 80377748 003746A8 7C 00 22 14 */ add r0, r0, r4 /* 8037774C 003746AC B0 03 00 06 */ sth r0, 6(r3) -/* 80377750 003746B0 4E 80 00 20 */ blr +/* 80377750 003746B0 4E 80 00 20 */ blr .global GXClearVtxDesc GXClearVtxDesc: @@ -695,7 +702,7 @@ GXClearVtxDesc: /* 8037777C 003746DC 80 03 04 F4 */ lwz r0, 0x4f4(r3) /* 80377780 003746E0 60 00 00 08 */ ori r0, r0, 8 /* 80377784 003746E4 90 03 04 F4 */ stw r0, 0x4f4(r3) -/* 80377788 003746E8 4E 80 00 20 */ blr +/* 80377788 003746E8 4E 80 00 20 */ blr .global GXSetVtxAttrFmt GXSetVtxAttrFmt: @@ -713,7 +720,7 @@ GXSetVtxAttrFmt: /* 803777B8 00374718 54 00 10 3A */ slwi r0, r0, 2 /* 803777BC 0037471C 7C 0A 00 2E */ lwzx r0, r10, r0 /* 803777C0 00374720 7C 09 03 A6 */ mtctr r0 -/* 803777C4 00374724 4E 80 04 20 */ bctr +/* 803777C4 00374724 4E 80 04 20 */ bctr /* 803777C8 00374728 80 04 00 00 */ lwz r0, 0(r4) /* 803777CC 0037472C 54 C6 08 3C */ slwi r6, r6, 1 /* 803777D0 00374730 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e @@ -914,7 +921,7 @@ lbl_80377AB4: /* 80377AD4 00374A34 88 65 04 F2 */ lbz r3, 0x4f2(r5) /* 80377AD8 00374A38 7C 60 03 78 */ or r0, r3, r0 /* 80377ADC 00374A3C 98 05 04 F2 */ stb r0, 0x4f2(r5) -/* 80377AE0 00374A40 4E 80 00 20 */ blr +/* 80377AE0 00374A40 4E 80 00 20 */ blr .global GXSetVtxAttrFmtv GXSetVtxAttrFmtv: @@ -938,7 +945,7 @@ lbl_80377B08: /* 80377B24 00374A84 55 6B 10 3A */ slwi r11, r11, 2 /* 80377B28 00374A88 7D 65 58 2E */ lwzx r11, r5, r11 /* 80377B2C 00374A8C 7D 69 03 A6 */ mtctr r11 -/* 80377B30 00374A90 4E 80 04 20 */ bctr +/* 80377B30 00374A90 4E 80 04 20 */ bctr /* 80377B34 00374A94 81 88 00 00 */ lwz r12, 0(r8) /* 80377B38 00374A98 54 CB 08 3C */ slwi r11, r6, 1 /* 80377B3C 00374A9C 54 E6 20 36 */ slwi r6, r7, 4 @@ -1143,7 +1150,7 @@ lbl_80377E20: /* 80377E4C 00374DAC 88 65 04 F2 */ lbz r3, 0x4f2(r5) /* 80377E50 00374DB0 7C 60 03 78 */ or r0, r3, r0 /* 80377E54 00374DB4 98 05 04 F2 */ stb r0, 0x4f2(r5) -/* 80377E58 00374DB8 4E 80 00 20 */ blr +/* 80377E58 00374DB8 4E 80 00 20 */ blr .global __GXSetVAT __GXSetVAT: @@ -1188,7 +1195,7 @@ lbl_80377EDC: /* 80377EE8 00374E48 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) /* 80377EEC 00374E4C 38 00 00 00 */ li r0, 0 /* 80377EF0 00374E50 98 03 04 F2 */ stb r0, 0x4f2(r3) -/* 80377EF4 00374E54 4E 80 00 20 */ blr +/* 80377EF4 00374E54 4E 80 00 20 */ blr .global GXSetArray GXSetArray: @@ -1221,21 +1228,21 @@ lbl_80377F44: /* 80377F58 00374EB8 98 03 80 00 */ stb r0, 0xCC008000@l(r3) /* 80377F5C 00374EBC 34 06 FF F4 */ addic. r0, r6, -12 /* 80377F60 00374EC0 90 83 80 00 */ stw r4, 0xCC008000@l(r3) -/* 80377F64 00374EC4 4D 80 00 20 */ bltlr +/* 80377F64 00374EC4 4D 80 00 20 */ bltlr /* 80377F68 00374EC8 2C 00 00 04 */ cmpwi r0, 4 -/* 80377F6C 00374ECC 4C 80 00 20 */ bgelr +/* 80377F6C 00374ECC 4C 80 00 20 */ bgelr /* 80377F70 00374ED0 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) /* 80377F74 00374ED4 54 00 10 3A */ slwi r0, r0, 2 /* 80377F78 00374ED8 7C 63 02 14 */ add r3, r3, r0 /* 80377F7C 00374EDC 90 83 00 98 */ stw r4, 0x98(r3) -/* 80377F80 00374EE0 4E 80 00 20 */ blr +/* 80377F80 00374EE0 4E 80 00 20 */ blr .global GXInvalidateVtxCache GXInvalidateVtxCache: /* 80377F84 00374EE4 38 00 00 48 */ li r0, 0x48 /* 80377F88 00374EE8 3C 60 CC 01 */ lis r3, 0xCC008000@ha /* 80377F8C 00374EEC 98 03 80 00 */ stb r0, 0xCC008000@l(r3) -/* 80377F90 00374EF0 4E 80 00 20 */ blr +/* 80377F90 00374EF0 4E 80 00 20 */ blr .global GXSetTexCoordGen2 GXSetTexCoordGen2: @@ -1252,7 +1259,7 @@ GXSetTexCoordGen2: /* 80377FBC 00374F1C 54 A0 10 3A */ slwi r0, r5, 2 /* 80377FC0 00374F20 7C 09 00 2E */ lwzx r0, r9, r0 /* 80377FC4 00374F24 7C 09 03 A6 */ mtctr r0 -/* 80377FC8 00374F28 4E 80 04 20 */ bctr +/* 80377FC8 00374F28 4E 80 04 20 */ bctr /* 80377FCC 00374F2C 39 40 00 00 */ li r10, 0 /* 80377FD0 00374F30 39 80 00 01 */ li r12, 1 /* 80377FD4 00374F34 48 00 00 74 */ b lbl_80378048 @@ -1360,7 +1367,7 @@ lbl_80378100: /* 80378148 003750A8 54 60 10 3A */ slwi r0, r3, 2 /* 8037814C 003750AC 7C 04 00 2E */ lwzx r0, r4, r0 /* 80378150 003750B0 7C 09 03 A6 */ mtctr r0 -/* 80378154 003750B4 4E 80 04 20 */ bctr +/* 80378154 003750B4 4E 80 04 20 */ bctr /* 80378158 003750B8 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) /* 8037815C 003750BC 54 C0 30 32 */ slwi r0, r6, 6 /* 80378160 003750C0 38 A4 00 80 */ addi r5, r4, 0x80 @@ -1429,7 +1436,7 @@ lbl_8037824C: /* 80378254 003751B4 80 01 00 0C */ lwz r0, 0xc(r1) /* 80378258 003751B8 38 21 00 08 */ addi r1, r1, 8 /* 8037825C 003751BC 7C 08 03 A6 */ mtlr r0 -/* 80378260 003751C0 4E 80 00 20 */ blr +/* 80378260 003751C0 4E 80 00 20 */ blr .global GXSetNumTexGens GXSetNumTexGens: @@ -1448,5 +1455,5 @@ GXSetNumTexGens: /* 80378294 003751F4 80 06 04 F4 */ lwz r0, 0x4f4(r6) /* 80378298 003751F8 60 00 00 04 */ ori r0, r0, 4 /* 8037829C 003751FC 90 06 04 F4 */ stw r0, 0x4f4(r6) -/* 803782A0 00375200 4E 80 00 20 */ blr +/* 803782A0 00375200 4E 80 00 20 */ blr diff --git a/asm/Dolphin/gx/GXBump.s b/asm/Dolphin/gx/GXBump.s index 611bda4c..6f9ebd48 100644 --- a/asm/Dolphin/gx/GXBump.s +++ b/asm/Dolphin/gx/GXBump.s @@ -3,8 +3,11 @@ .section .sdata2 .global lbl_805AEBB0 lbl_805AEBB0: - .incbin "baserom.dol", 0x3FB450, 0x8 - + # ROM: 0x3FB450 + .4byte 0x44800000 + .4byte 0 + + .section .text, "ax" .global GXSetTevIndirect @@ -47,7 +50,7 @@ GXSetTevIndirect: /* 8037AEB8 00377E18 38 00 00 00 */ li r0, 0 /* 8037AEBC 00377E1C B0 04 00 02 */ sth r0, 2(r4) /* 8037AEC0 00377E20 38 21 00 28 */ addi r1, r1, 0x28 -/* 8037AEC4 00377E24 4E 80 00 20 */ blr +/* 8037AEC4 00377E24 4E 80 00 20 */ blr .global GXSetIndTexMtx GXSetIndTexMtx: @@ -144,7 +147,7 @@ lbl_8037AF18: /* 8037B018 00377F78 90 89 80 00 */ stw r4, 0xCC008000@l(r9) /* 8037B01C 00377F7C B0 03 00 02 */ sth r0, 2(r3) /* 8037B020 00377F80 38 21 00 78 */ addi r1, r1, 0x78 -/* 8037B024 00377F84 4E 80 00 20 */ blr +/* 8037B024 00377F84 4E 80 00 20 */ blr .global GXSetIndTexCoordScale GXSetIndTexCoordScale: @@ -248,7 +251,7 @@ lbl_8037B194: /* 8037B194 003780F4 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) /* 8037B198 003780F8 38 00 00 00 */ li r0, 0 /* 8037B19C 003780FC B0 03 00 02 */ sth r0, 2(r3) -/* 8037B1A0 00378100 4E 80 00 20 */ blr +/* 8037B1A0 00378100 4E 80 00 20 */ blr .global GXSetIndTexOrder GXSetIndTexOrder: @@ -326,7 +329,7 @@ lbl_8037B288: /* 8037B2A8 00378208 60 63 00 03 */ ori r3, r3, 3 /* 8037B2AC 0037820C 90 64 04 F4 */ stw r3, 0x4f4(r4) /* 8037B2B0 00378210 B0 04 00 02 */ sth r0, 2(r4) -/* 8037B2B4 00378214 4E 80 00 20 */ blr +/* 8037B2B4 00378214 4E 80 00 20 */ blr .global GXSetNumIndStages GXSetNumIndStages: @@ -339,7 +342,7 @@ GXSetNumIndStages: /* 8037B2D0 00378230 80 04 04 F4 */ lwz r0, 0x4f4(r4) /* 8037B2D4 00378234 60 00 00 06 */ ori r0, r0, 6 /* 8037B2D8 00378238 90 04 04 F4 */ stw r0, 0x4f4(r4) -/* 8037B2DC 0037823C 4E 80 00 20 */ blr +/* 8037B2DC 0037823C 4E 80 00 20 */ blr .global GXSetTevDirect GXSetTevDirect: @@ -360,7 +363,7 @@ GXSetTevDirect: /* 8037B318 00378278 80 01 00 1C */ lwz r0, 0x1c(r1) /* 8037B31C 0037827C 38 21 00 18 */ addi r1, r1, 0x18 /* 8037B320 00378280 7C 08 03 A6 */ mtlr r0 -/* 8037B324 00378284 4E 80 00 20 */ blr +/* 8037B324 00378284 4E 80 00 20 */ blr .global __GXUpdateBPMask __GXUpdateBPMask: @@ -410,7 +413,7 @@ lbl_8037B3B0: /* 8037B3B4 00378314 80 63 01 24 */ lwz r3, 0x124(r3) /* 8037B3B8 00378318 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8037B3BC 0037831C 7C 00 30 40 */ cmplw r0, r6 -/* 8037B3C0 00378320 4D 82 00 20 */ beqlr +/* 8037B3C0 00378320 4D 82 00 20 */ beqlr /* 8037B3C4 00378324 54 60 00 2E */ rlwinm r0, r3, 0, 0, 0x17 /* 8037B3C8 00378328 7C 00 33 78 */ or r0, r0, r6 /* 8037B3CC 0037832C 90 04 00 00 */ stw r0, 0(r4) @@ -422,7 +425,7 @@ lbl_8037B3B0: /* 8037B3E4 00378344 80 64 01 24 */ lwz r3, 0x124(r4) /* 8037B3E8 00378348 90 65 80 00 */ stw r3, 0xCC008000@l(r5) /* 8037B3EC 0037834C B0 04 00 02 */ sth r0, 2(r4) -/* 8037B3F0 00378350 4E 80 00 20 */ blr +/* 8037B3F0 00378350 4E 80 00 20 */ blr .global __GXFlushTextureState __GXFlushTextureState: @@ -434,5 +437,5 @@ __GXFlushTextureState: /* 8037B408 00378368 80 64 01 24 */ lwz r3, 0x124(r4) /* 8037B40C 0037836C 90 65 80 00 */ stw r3, 0xCC008000@l(r5) /* 8037B410 00378370 B0 04 00 02 */ sth r0, 2(r4) -/* 8037B414 00378374 4E 80 00 20 */ blr +/* 8037B414 00378374 4E 80 00 20 */ blr diff --git a/asm/Dolphin/gx/GXDisplayList.s b/asm/Dolphin/gx/GXDisplayList.s index b841cf90..d2cf9087 100644 --- a/asm/Dolphin/gx/GXDisplayList.s +++ b/asm/Dolphin/gx/GXDisplayList.s @@ -33,4 +33,4 @@ lbl_8037C218: /* 8037C234 00379194 83 C1 00 10 */ lwz r30, 0x10(r1) /* 8037C238 00379198 38 21 00 18 */ addi r1, r1, 0x18 /* 8037C23C 0037919C 7C 08 03 A6 */ mtlr r0 -/* 8037C240 003791A0 4E 80 00 20 */ blr +/* 8037C240 003791A0 4E 80 00 20 */ blr diff --git a/asm/Dolphin/gx/GXFifo.s b/asm/Dolphin/gx/GXFifo.s index eff02e96..43bc5664 100644 --- a/asm/Dolphin/gx/GXFifo.s +++ b/asm/Dolphin/gx/GXFifo.s @@ -91,7 +91,7 @@ lbl_80376330: /* 8037637C 003732DC 48 00 90 A1 */ bl OSSetCurrentContext /* 80376380 003732E0 81 8D AC 9C */ lwz r12, lbl_805A985C@sda21(r13) /* 80376384 003732E4 7D 88 03 A6 */ mtlr r12 -/* 80376388 003732E8 4E 80 00 21 */ blrl +/* 80376388 003732E8 4E 80 00 21 */ blrl /* 8037638C 003732EC 38 61 00 10 */ addi r3, r1, 0x10 /* 80376390 003732F0 48 00 92 85 */ bl OSClearContext /* 80376394 003732F4 7F E3 FB 78 */ mr r3, r31 @@ -101,7 +101,7 @@ lbl_8037639C: /* 803763A0 00373300 83 E1 02 DC */ lwz r31, 0x2dc(r1) /* 803763A4 00373304 38 21 02 E0 */ addi r1, r1, 0x2e0 /* 803763A8 00373308 7C 08 03 A6 */ mtlr r0 -/* 803763AC 0037330C 4E 80 00 20 */ blr +/* 803763AC 0037330C 4E 80 00 20 */ blr .global GXInitFifoBase GXInitFifoBase: @@ -131,7 +131,7 @@ GXInitFifoBase: /* 8037640C 0037336C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80376410 00373370 38 21 00 20 */ addi r1, r1, 0x20 /* 80376414 00373374 7C 08 03 A6 */ mtlr r0 -/* 80376418 00373378 4E 80 00 20 */ blr +/* 80376418 00373378 4E 80 00 20 */ blr .global GXInitFifoPtrs GXInitFifoPtrs: @@ -163,13 +163,13 @@ lbl_8037646C: /* 8037647C 003733DC 83 A1 00 1C */ lwz r29, 0x1c(r1) /* 80376480 003733E0 38 21 00 28 */ addi r1, r1, 0x28 /* 80376484 003733E4 7C 08 03 A6 */ mtlr r0 -/* 80376488 003733E8 4E 80 00 20 */ blr +/* 80376488 003733E8 4E 80 00 20 */ blr .global GXInitFifoLimits GXInitFifoLimits: /* 8037648C 003733EC 90 83 00 0C */ stw r4, 0xc(r3) /* 80376490 003733F0 90 A3 00 10 */ stw r5, 0x10(r3) -/* 80376494 003733F4 4E 80 00 20 */ blr +/* 80376494 003733F4 4E 80 00 20 */ blr .global GXSetCPUFifo GXSetCPUFifo: @@ -243,7 +243,7 @@ lbl_80376584: /* 80376598 003734F8 83 C1 00 10 */ lwz r30, 0x10(r1) /* 8037659C 003734FC 38 21 00 18 */ addi r1, r1, 0x18 /* 803765A0 00373500 7C 08 03 A6 */ mtlr r0 -/* 803765A4 00373504 4E 80 00 20 */ blr +/* 803765A4 00373504 4E 80 00 20 */ blr .global GXSetGPFifo GXSetGPFifo: @@ -342,7 +342,7 @@ lbl_803766F0: /* 80376710 00373670 83 C1 00 10 */ lwz r30, 0x10(r1) /* 80376714 00373674 38 21 00 18 */ addi r1, r1, 0x18 /* 80376718 00373678 7C 08 03 A6 */ mtlr r0 -/* 8037671C 0037367C 4E 80 00 20 */ blr +/* 8037671C 0037367C 4E 80 00 20 */ blr .global __GXSaveCPUFifoAux __GXSaveCPUFifoAux: @@ -386,7 +386,7 @@ lbl_803767A4: /* 803767A8 00373708 90 04 00 00 */ stw r0, 0(r4) /* 803767AC 0037370C 80 03 00 18 */ lwz r0, 0x18(r3) /* 803767B0 00373710 90 05 00 00 */ stw r0, 0(r5) -/* 803767B4 00373714 4E 80 00 20 */ blr +/* 803767B4 00373714 4E 80 00 20 */ blr .global GXSetBreakPtCallback GXSetBreakPtCallback: @@ -406,7 +406,7 @@ GXSetBreakPtCallback: /* 803767EC 0037374C 83 C1 00 10 */ lwz r30, 0x10(r1) /* 803767F0 00373750 38 21 00 18 */ addi r1, r1, 0x18 /* 803767F4 00373754 7C 08 03 A6 */ mtlr r0 -/* 803767F8 00373758 4E 80 00 20 */ blr +/* 803767F8 00373758 4E 80 00 20 */ blr .global GXEnableBreakPt GXEnableBreakPt: @@ -445,7 +445,7 @@ GXEnableBreakPt: /* 8037687C 003737DC 83 C1 00 10 */ lwz r30, 0x10(r1) /* 80376880 003737E0 38 21 00 18 */ addi r1, r1, 0x18 /* 80376884 003737E4 7C 08 03 A6 */ mtlr r0 -/* 80376888 003737E8 4E 80 00 20 */ blr +/* 80376888 003737E8 4E 80 00 20 */ blr .global GXDisableBreakPt GXDisableBreakPt: @@ -469,7 +469,7 @@ GXDisableBreakPt: /* 803768D0 00373830 80 01 00 0C */ lwz r0, 0xc(r1) /* 803768D4 00373834 38 21 00 08 */ addi r1, r1, 8 /* 803768D8 00373838 7C 08 03 A6 */ mtlr r0 -/* 803768DC 0037383C 4E 80 00 20 */ blr +/* 803768DC 0037383C 4E 80 00 20 */ blr .global __GXFifoInit __GXFifoInit: @@ -491,7 +491,7 @@ __GXFifoInit: /* 8037691C 0037387C 80 01 00 0C */ lwz r0, 0xc(r1) /* 80376920 00373880 38 21 00 08 */ addi r1, r1, 8 /* 80376924 00373884 7C 08 03 A6 */ mtlr r0 -/* 80376928 00373888 4E 80 00 20 */ blr +/* 80376928 00373888 4E 80 00 20 */ blr .global __GXFifoReadEnable __GXFifoReadEnable: @@ -503,7 +503,7 @@ __GXFifoReadEnable: /* 80376940 003738A0 80 03 00 08 */ lwz r0, 8(r3) /* 80376944 003738A4 80 6D AC 7C */ lwz r3, lbl_805A983C@sda21(r13) /* 80376948 003738A8 B0 03 00 02 */ sth r0, 2(r3) -/* 8037694C 003738AC 4E 80 00 20 */ blr +/* 8037694C 003738AC 4E 80 00 20 */ blr .global __GXFifoReadDisable __GXFifoReadDisable: @@ -514,7 +514,7 @@ __GXFifoReadDisable: /* 80376960 003738C0 80 03 00 08 */ lwz r0, 8(r3) /* 80376964 003738C4 80 6D AC 7C */ lwz r3, lbl_805A983C@sda21(r13) /* 80376968 003738C8 B0 03 00 02 */ sth r0, 2(r3) -/* 8037696C 003738CC 4E 80 00 20 */ blr +/* 8037696C 003738CC 4E 80 00 20 */ blr .global __GXFifoLink __GXFifoLink: @@ -534,7 +534,7 @@ lbl_80376984: /* 8037699C 003738FC 80 04 00 08 */ lwz r0, 8(r4) /* 803769A0 00373900 80 6D AC 7C */ lwz r3, lbl_805A983C@sda21(r13) /* 803769A4 00373904 B0 03 00 02 */ sth r0, 2(r3) -/* 803769A8 00373908 4E 80 00 20 */ blr +/* 803769A8 00373908 4E 80 00 20 */ blr .global __GXWriteFifoIntEnable __GXWriteFifoIntEnable: @@ -552,7 +552,7 @@ __GXWriteFifoIntEnable: /* 803769D8 00373938 80 06 00 08 */ lwz r0, 8(r6) /* 803769DC 0037393C 80 6D AC 7C */ lwz r3, lbl_805A983C@sda21(r13) /* 803769E0 00373940 B0 03 00 02 */ sth r0, 2(r3) -/* 803769E4 00373944 4E 80 00 20 */ blr +/* 803769E4 00373944 4E 80 00 20 */ blr .global __GXWriteFifoIntReset __GXWriteFifoIntReset: @@ -570,7 +570,7 @@ __GXWriteFifoIntReset: /* 80376A14 00373974 80 06 00 10 */ lwz r0, 0x10(r6) /* 80376A18 00373978 80 6D AC 7C */ lwz r3, lbl_805A983C@sda21(r13) /* 80376A1C 0037397C B0 03 00 04 */ sth r0, 4(r3) -/* 80376A20 00373980 4E 80 00 20 */ blr +/* 80376A20 00373980 4E 80 00 20 */ blr .global __GXCleanGPFifo __GXCleanGPFifo: @@ -642,17 +642,17 @@ lbl_80376B08: /* 80376B14 00373A74 83 A1 00 9C */ lwz r29, 0x9c(r1) /* 80376B18 00373A78 38 21 00 A8 */ addi r1, r1, 0xa8 /* 80376B1C 00373A7C 7C 08 03 A6 */ mtlr r0 -/* 80376B20 00373A80 4E 80 00 20 */ blr +/* 80376B20 00373A80 4E 80 00 20 */ blr .global GXGetCPUFifo GXGetCPUFifo: /* 80376B24 00373A84 80 6D AC 88 */ lwz r3, lbl_805A9848@sda21(r13) -/* 80376B28 00373A88 4E 80 00 20 */ blr +/* 80376B28 00373A88 4E 80 00 20 */ blr .global GXGetGPFifo GXGetGPFifo: /* 80376B2C 00373A8C 80 6D AC 8C */ lwz r3, lbl_805A984C@sda21(r13) -/* 80376B30 00373A90 4E 80 00 20 */ blr +/* 80376B30 00373A90 4E 80 00 20 */ blr .global GXRedirectWriteGatherPipe GXRedirectWriteGatherPipe: @@ -718,7 +718,7 @@ lbl_80376BBC: /* 80376C18 00373B78 83 C1 00 10 */ lwz r30, 0x10(r1) /* 80376C1C 00373B7C 38 21 00 18 */ addi r1, r1, 0x18 /* 80376C20 00373B80 7C 08 03 A6 */ mtlr r0 -/* 80376C24 00373B84 4E 80 00 20 */ blr +/* 80376C24 00373B84 4E 80 00 20 */ blr .global GXRestoreWriteGatherPipe GXRestoreWriteGatherPipe: @@ -827,5 +827,5 @@ lbl_80376DA0: /* 80376DB0 00373D10 83 E1 00 14 */ lwz r31, 0x14(r1) /* 80376DB4 00373D14 38 21 00 18 */ addi r1, r1, 0x18 /* 80376DB8 00373D18 7C 08 03 A6 */ mtlr r0 -/* 80376DBC 00373D1C 4E 80 00 20 */ blr +/* 80376DBC 00373D1C 4E 80 00 20 */ blr diff --git a/asm/Dolphin/gx/GXFrameBuf.s b/asm/Dolphin/gx/GXFrameBuf.s index 11f97754..1c58ace2 100644 --- a/asm/Dolphin/gx/GXFrameBuf.s +++ b/asm/Dolphin/gx/GXFrameBuf.s @@ -3,8 +3,11 @@ .section .sdata2 .global lbl_805AEB50 lbl_805AEB50: - .incbin "baserom.dol", 0x3FB3F0, 0x8 - + # ROM: 0x3FB3F0 + .4byte 0x43800000 + .4byte 0 + + .section .text, "ax" .global GXAdjustForOverscan @@ -83,7 +86,7 @@ lbl_80378CF0: /* 80378D14 00375C74 A0 63 00 0C */ lhz r3, 0xc(r3) /* 80378D18 00375C78 7C 03 02 14 */ add r0, r3, r0 /* 80378D1C 00375C7C B0 04 00 0C */ sth r0, 0xc(r4) -/* 80378D20 00375C80 4E 80 00 20 */ blr +/* 80378D20 00375C80 4E 80 00 20 */ blr .global GXSetDispCopySrc GXSetDispCopySrc: @@ -122,7 +125,7 @@ GXSetDispCopySrc: /* 80378DA4 00375D04 54 00 02 3E */ clrlwi r0, r0, 8 /* 80378DA8 00375D08 64 00 4A 00 */ oris r0, r0, 0x4a00 /* 80378DAC 00375D0C 90 09 01 E4 */ stw r0, 0x1e4(r9) -/* 80378DB0 00375D10 4E 80 00 20 */ blr +/* 80378DB0 00375D10 4E 80 00 20 */ blr .global GXSetTexCopySrc GXSetTexCopySrc: @@ -161,7 +164,7 @@ GXSetTexCopySrc: /* 80378E34 00375D94 54 00 02 3E */ clrlwi r0, r0, 8 /* 80378E38 00375D98 64 00 4A 00 */ oris r0, r0, 0x4a00 /* 80378E3C 00375D9C 90 09 01 F4 */ stw r0, 0x1f4(r9) -/* 80378E40 00375DA0 4E 80 00 20 */ blr +/* 80378E40 00375DA0 4E 80 00 20 */ blr .global GXSetDispCopyDst GXSetDispCopyDst: @@ -179,7 +182,7 @@ GXSetDispCopyDst: /* 80378E70 00375DD0 54 00 02 3E */ clrlwi r0, r0, 8 /* 80378E74 00375DD4 64 00 4D 00 */ oris r0, r0, 0x4d00 /* 80378E78 00375DD8 90 05 00 00 */ stw r0, 0(r5) -/* 80378E7C 00375DDC 4E 80 00 20 */ blr +/* 80378E7C 00375DDC 4E 80 00 20 */ blr .global GXSetTexCopyDst GXSetTexCopyDst: @@ -271,7 +274,7 @@ lbl_80378F0C: /* 80378FC4 00375F24 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80378FC8 00375F28 38 21 00 30 */ addi r1, r1, 0x30 /* 80378FCC 00375F2C 7C 08 03 A6 */ mtlr r0 -/* 80378FD0 00375F30 4E 80 00 20 */ blr +/* 80378FD0 00375F30 4E 80 00 20 */ blr .global GXSetDispCopyFrame2Field GXSetDispCopyFrame2Field: @@ -284,7 +287,7 @@ GXSetDispCopyFrame2Field: /* 80378FEC 00375F4C 84 04 01 FC */ lwzu r0, 0x1fc(r4) /* 80378FF0 00375F50 54 00 05 22 */ rlwinm r0, r0, 0, 0x14, 0x11 /* 80378FF4 00375F54 90 04 00 00 */ stw r0, 0(r4) -/* 80378FF8 00375F58 4E 80 00 20 */ blr +/* 80378FF8 00375F58 4E 80 00 20 */ blr .global GXSetCopyClamp GXSetCopyClamp: @@ -313,7 +316,7 @@ GXSetCopyClamp: /* 80379054 00375FB4 54 00 07 FA */ rlwinm r0, r0, 0, 0x1f, 0x1d /* 80379058 00375FB8 7C 00 2B 78 */ or r0, r0, r5 /* 8037905C 00375FBC 90 06 01 FC */ stw r0, 0x1fc(r6) -/* 80379060 00375FC0 4E 80 00 20 */ blr +/* 80379060 00375FC0 4E 80 00 20 */ blr .global GXSetDispCopyYScale GXSetDispCopyYScale: @@ -370,7 +373,7 @@ lbl_8037911C: /* 8037911C 0037607C 80 01 00 0C */ lwz r0, 0xc(r1) /* 80379120 00376080 38 21 00 08 */ addi r1, r1, 8 /* 80379124 00376084 7C 08 03 A6 */ mtlr r0 -/* 80379128 00376088 4E 80 00 20 */ blr +/* 80379128 00376088 4E 80 00 20 */ blr .global GXSetCopyClear GXSetCopyClear: @@ -399,7 +402,7 @@ GXSetCopyClear: /* 80379184 003760E4 98 C5 80 00 */ stb r6, 0xCC008000@l(r5) /* 80379188 003760E8 90 E5 80 00 */ stw r7, 0xCC008000@l(r5) /* 8037918C 003760EC B0 04 00 02 */ sth r0, 2(r4) -/* 80379190 003760F0 4E 80 00 20 */ blr +/* 80379190 003760F0 4E 80 00 20 */ blr .global GXSetCopyFilter GXSetCopyFilter: @@ -544,7 +547,7 @@ lbl_8037938C: /* 803793AC 0037630C B0 03 00 02 */ sth r0, 2(r3) /* 803793B0 00376310 BA E1 00 2C */ lmw r23, 0x2c(r1) /* 803793B4 00376314 38 21 00 50 */ addi r1, r1, 0x50 -/* 803793B8 00376318 4E 80 00 20 */ blr +/* 803793B8 00376318 4E 80 00 20 */ blr .global GXSetDispCopyGamma GXSetDispCopyGamma: @@ -554,7 +557,7 @@ GXSetDispCopyGamma: /* 803793C8 00376328 54 63 06 6C */ rlwinm r3, r3, 0, 0x19, 0x16 /* 803793CC 0037632C 7C 60 03 78 */ or r0, r3, r0 /* 803793D0 00376330 90 04 00 00 */ stw r0, 0(r4) -/* 803793D4 00376334 4E 80 00 20 */ blr +/* 803793D4 00376334 4E 80 00 20 */ blr .global GXCopyDisp GXCopyDisp: @@ -649,7 +652,7 @@ lbl_80379524: /* 80379524 00376484 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) /* 80379528 00376488 38 00 00 00 */ li r0, 0 /* 8037952C 0037648C B0 03 00 02 */ sth r0, 2(r3) -/* 80379530 00376490 4E 80 00 20 */ blr +/* 80379530 00376490 4E 80 00 20 */ blr .global GXCopyTex GXCopyTex: @@ -754,7 +757,7 @@ lbl_803796A0: /* 803796A0 00376600 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) /* 803796A4 00376604 38 00 00 00 */ li r0, 0 /* 803796A8 00376608 B0 03 00 02 */ sth r0, 2(r3) -/* 803796AC 0037660C 4E 80 00 20 */ blr +/* 803796AC 0037660C 4E 80 00 20 */ blr .global GXClearBoundingBox GXClearBoundingBox: @@ -771,4 +774,4 @@ GXClearBoundingBox: /* 803796D8 00376638 38 00 00 00 */ li r0, 0 /* 803796DC 0037663C 90 85 80 00 */ stw r4, 0xCC008000@l(r5) /* 803796E0 00376640 B0 03 00 02 */ sth r0, 2(r3) -/* 803796E4 00376644 4E 80 00 20 */ blr +/* 803796E4 00376644 4E 80 00 20 */ blr diff --git a/asm/Dolphin/gx/GXGeometry.s b/asm/Dolphin/gx/GXGeometry.s index 54bb7f3f..d59d4dca 100644 --- a/asm/Dolphin/gx/GXGeometry.s +++ b/asm/Dolphin/gx/GXGeometry.s @@ -49,7 +49,7 @@ lbl_803788D8: /* 803788E4 00375844 80 01 00 0C */ lwz r0, 0xc(r1) /* 803788E8 00375848 38 21 00 08 */ addi r1, r1, 8 /* 803788EC 0037584C 7C 08 03 A6 */ mtlr r0 -/* 803788F0 00375850 4E 80 00 20 */ blr +/* 803788F0 00375850 4E 80 00 20 */ blr .global GXBegin GXBegin: @@ -120,7 +120,7 @@ lbl_803789B8: /* 803789D4 00375934 83 A1 00 1C */ lwz r29, 0x1c(r1) /* 803789D8 00375938 38 21 00 28 */ addi r1, r1, 0x28 /* 803789DC 0037593C 7C 08 03 A6 */ mtlr r0 -/* 803789E0 00375940 4E 80 00 20 */ blr +/* 803789E0 00375940 4E 80 00 20 */ blr .global __GXSendFlushPrim __GXSendFlushPrim: @@ -161,7 +161,7 @@ lbl_80378A5C: /* 80378A5C 003759BC 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) /* 80378A60 003759C0 38 00 00 01 */ li r0, 1 /* 80378A64 003759C4 B0 03 00 02 */ sth r0, 2(r3) -/* 80378A68 003759C8 4E 80 00 20 */ blr +/* 80378A68 003759C8 4E 80 00 20 */ blr .global GXSetLineWidth GXSetLineWidth: @@ -182,7 +182,7 @@ GXSetLineWidth: /* 80378AA4 00375A04 80 67 00 7C */ lwz r3, 0x7c(r7) /* 80378AA8 00375A08 90 64 80 00 */ stw r3, 0xCC008000@l(r4) /* 80378AAC 00375A0C B0 07 00 02 */ sth r0, 2(r7) -/* 80378AB0 00375A10 4E 80 00 20 */ blr +/* 80378AB0 00375A10 4E 80 00 20 */ blr .global GXSetPointSize GXSetPointSize: @@ -203,7 +203,7 @@ GXSetPointSize: /* 80378AEC 00375A4C 80 67 00 7C */ lwz r3, 0x7c(r7) /* 80378AF0 00375A50 90 64 80 00 */ stw r3, 0xCC008000@l(r4) /* 80378AF4 00375A54 B0 07 00 02 */ sth r0, 2(r7) -/* 80378AF8 00375A58 4E 80 00 20 */ blr +/* 80378AF8 00375A58 4E 80 00 20 */ blr .global GXEnableTexOffsets GXEnableTexOffsets: @@ -229,7 +229,7 @@ GXEnableTexOffsets: /* 80378B48 00375AA8 80 63 00 B8 */ lwz r3, 0xb8(r3) /* 80378B4C 00375AAC 90 64 80 00 */ stw r3, 0xCC008000@l(r4) /* 80378B50 00375AB0 B0 06 00 02 */ sth r0, 2(r6) -/* 80378B54 00375AB4 4E 80 00 20 */ blr +/* 80378B54 00375AB4 4E 80 00 20 */ blr .global GXSetCullMode GXSetCullMode: @@ -254,7 +254,7 @@ lbl_80378B7C: /* 80378B94 00375AF4 80 04 04 F4 */ lwz r0, 0x4f4(r4) /* 80378B98 00375AF8 60 00 00 04 */ ori r0, r0, 4 /* 80378B9C 00375AFC 90 04 04 F4 */ stw r0, 0x4f4(r4) -/* 80378BA0 00375B00 4E 80 00 20 */ blr +/* 80378BA0 00375B00 4E 80 00 20 */ blr .global GXSetCoPlanar GXSetCoPlanar: @@ -272,7 +272,7 @@ GXSetCoPlanar: /* 80378BD0 00375B30 98 83 80 00 */ stb r4, 0xCC008000@l(r3) /* 80378BD4 00375B34 80 06 02 04 */ lwz r0, 0x204(r6) /* 80378BD8 00375B38 90 03 80 00 */ stw r0, 0xCC008000@l(r3) -/* 80378BDC 00375B3C 4E 80 00 20 */ blr +/* 80378BDC 00375B3C 4E 80 00 20 */ blr .global __GXSetGenMode __GXSetGenMode: @@ -284,4 +284,4 @@ __GXSetGenMode: /* 80378BF4 00375B54 80 64 02 04 */ lwz r3, 0x204(r4) /* 80378BF8 00375B58 90 65 80 00 */ stw r3, 0xCC008000@l(r5) /* 80378BFC 00375B5C B0 04 00 02 */ sth r0, 2(r4) -/* 80378C00 00375B60 4E 80 00 20 */ blr +/* 80378C00 00375B60 4E 80 00 20 */ blr diff --git a/asm/Dolphin/gx/GXInit.s b/asm/Dolphin/gx/GXInit.s index 34330ec7..61d0aba7 100644 --- a/asm/Dolphin/gx/GXInit.s +++ b/asm/Dolphin/gx/GXInit.s @@ -22,73 +22,339 @@ lbl_805A9844: .section .sdata .global lbl_805A8AC8 lbl_805A8AC8: - .incbin "baserom.dol", 0x3F6468, 0x8 - + # ROM: 0x3F6468 + .4byte 0x803F05E8 + .4byte 0 + + .section .sdata2 .global lbl_805AEB28 lbl_805AEB28: - .incbin "baserom.dol", 0x3FB3C8, 0x4 + # ROM: 0x3FB3C8 + .4byte 0x80540C88 + .global lbl_805AEB2C lbl_805AEB2C: - .incbin "baserom.dol", 0x3FB3CC, 0x4 + # ROM: 0x3FB3CC + .4byte 0x404040FF + .global lbl_805AEB30 lbl_805AEB30: - .incbin "baserom.dol", 0x3FB3D0, 0x4 + # ROM: 0x3FB3D0 + .4byte 0 + .global lbl_805AEB34 lbl_805AEB34: - .incbin "baserom.dol", 0x3FB3D4, 0x4 + # ROM: 0x3FB3D4 + .4byte 0xFFFFFFFF + .global lbl_805AEB38 lbl_805AEB38: - .incbin "baserom.dol", 0x3FB3D8, 0x4 + # ROM: 0x3FB3D8 + .4byte 0x3F800000 + .global lbl_805AEB3C lbl_805AEB3C: - .incbin "baserom.dol", 0x3FB3DC, 0x4 + # ROM: 0x3FB3DC + .4byte 0 + .global lbl_805AEB40 lbl_805AEB40: - .incbin "baserom.dol", 0x3FB3E0, 0x8 + # ROM: 0x3FB3E0 + .4byte 0x3DCCCCCD + .4byte 0 + .global lbl_805AEB48 lbl_805AEB48: - .incbin "baserom.dol", 0x3FB3E8, 0x8 - + # ROM: 0x3FB3E8 + .4byte 0x43300000 + .4byte 0 + + .section .data .global lbl_803F062C lbl_803F062C: - .incbin "baserom.dol", 0x3ED62C, 0xD0 + # ROM: 0x3ED62C + .4byte 0x00000009 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0x0000000A + .4byte 0 + .4byte 0x00000004 + .4byte 0 + .4byte 0x0000000B + .4byte 0x00000001 + .4byte 0x00000005 + .4byte 0 + .4byte 0x0000000C + .4byte 0x00000001 + .4byte 0x00000005 + .4byte 0 + .4byte 0x0000000D + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0x0000000E + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0x0000000F + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0x00000010 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0x00000011 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0x00000012 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0x00000013 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0x00000014 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0 + .4byte 0x000000FF + .4byte 0 + .4byte 0 + .4byte 0 + .global lbl_803F06FC lbl_803F06FC: - .incbin "baserom.dol", 0x3ED6FC, 0x1C + # ROM: 0x3ED6FC + .4byte 0x3F800000 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0xBF800000 + .4byte 0xC0000000 + .4byte 0 + .global lbl_803F0718 lbl_803F0718: - .incbin "baserom.dol", 0x3ED718, 0x68 + # ROM: 0x3ED718 + .4byte 0x80376F38 + .4byte 0x80376F50 + .4byte 0x80376F70 + .4byte 0x80376F90 + .4byte 0x80376FB0 + .4byte 0x80376FD0 + .4byte 0x80376FF0 + .4byte 0x80377010 + .4byte 0x80377030 + .4byte 0x80377050 + .4byte 0x80377070 + .4byte 0x803770D8 + .4byte 0x803770F8 + .4byte 0x80377118 + .4byte 0x80377130 + .4byte 0x80377150 + .4byte 0x80377170 + .4byte 0x80377190 + .4byte 0x803771B0 + .4byte 0x803771D0 + .4byte 0x803771F0 + .4byte 0x8037720C + .4byte 0x8037720C + .4byte 0x8037720C + .4byte 0x8037720C + .4byte 0x803770A4 + .global lbl_803F0780 lbl_803F0780: - .incbin "baserom.dol", 0x3ED780, 0x68 + # ROM: 0x3ED780 + .4byte 0x80377294 + .4byte 0x803772B0 + .4byte 0x803772D0 + .4byte 0x803772F0 + .4byte 0x80377310 + .4byte 0x80377330 + .4byte 0x80377350 + .4byte 0x80377370 + .4byte 0x80377390 + .4byte 0x803773B0 + .4byte 0x803773D0 + .4byte 0x80377438 + .4byte 0x80377458 + .4byte 0x80377478 + .4byte 0x80377494 + .4byte 0x803774B4 + .4byte 0x803774D4 + .4byte 0x803774F4 + .4byte 0x80377514 + .4byte 0x80377534 + .4byte 0x80377554 + .4byte 0x80377570 + .4byte 0x80377570 + .4byte 0x80377570 + .4byte 0x80377570 + .4byte 0x80377404 + .global lbl_803F07E8 lbl_803F07E8: - .incbin "baserom.dol", 0x3ED7E8, 0x44 + # ROM: 0x3ED7E8 + .4byte 0x803777C8 + .4byte 0x80377804 + .4byte 0x80377868 + .4byte 0x80377894 + .4byte 0x803778C0 + .4byte 0x80377900 + .4byte 0x8037793C + .4byte 0x8037797C + .4byte 0x803779BC + .4byte 0x803779FC + .4byte 0x80377A3C + .4byte 0x80377A7C + .4byte 0x80377AB4 + .4byte 0x80377AB4 + .4byte 0x80377AB4 + .4byte 0x80377AB4 + .4byte 0x80377804 + .global lbl_803F082C lbl_803F082C: - .incbin "baserom.dol", 0x3ED82C, 0x44 + # ROM: 0x3ED82C + .4byte 0x80377B34 + .4byte 0x80377B70 + .4byte 0x80377BD4 + .4byte 0x80377C00 + .4byte 0x80377C2C + .4byte 0x80377C6C + .4byte 0x80377CA8 + .4byte 0x80377CE8 + .4byte 0x80377D28 + .4byte 0x80377D64 + .4byte 0x80377DA4 + .4byte 0x80377DE4 + .4byte 0x80377E1C + .4byte 0x80377E1C + .4byte 0x80377E1C + .4byte 0x80377E1C + .4byte 0x80377B70 + .global lbl_803F0870 lbl_803F0870: - .incbin "baserom.dol", 0x3ED870, 0x1C + # ROM: 0x3ED870 + .4byte 0x80378158 + .4byte 0x80378178 + .4byte 0x80378198 + .4byte 0x803781B8 + .4byte 0x803781D8 + .4byte 0x803781F0 + .4byte 0x80378210 + .global lbl_803F088C lbl_803F088C: - .incbin "baserom.dol", 0x3ED88C, 0x54 + # ROM: 0x3ED88C + .4byte 0x80377FCC + .4byte 0x80377FD8 + .4byte 0x80377FE4 + .4byte 0x80377FF0 + .4byte 0x8037800C + .4byte 0x80378014 + .4byte 0x8037801C + .4byte 0x80378024 + .4byte 0x8037802C + .4byte 0x80378034 + .4byte 0x8037803C + .4byte 0x80378044 + .4byte 0x80378048 + .4byte 0x80378048 + .4byte 0x80378048 + .4byte 0x80378048 + .4byte 0x80378048 + .4byte 0x80378048 + .4byte 0x80378048 + .4byte 0x80377FFC + .4byte 0x80378004 + .global lbl_803F08E0 lbl_803F08E0: - .incbin "baserom.dol", 0x3ED8E0, 0x3C + # ROM: 0x3ED8E0 + .4byte 0 + .4byte 0x028001E0 + .4byte 0x01E00028 + .4byte 0x00000280 + .4byte 0x01E00000 + .4byte 0x00000001 + .4byte 0x00000606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060808 + .4byte 0x0A0C0A08 + .4byte 0x08000000 + .global lbl_803F091C lbl_803F091C: - .incbin "baserom.dol", 0x3ED91C, 0x3C + # ROM: 0x3ED91C + .4byte 0x00000008 + .4byte 0x028001E0 + .4byte 0x01E00028 + .4byte 0x00000280 + .4byte 0x01E00000 + .4byte 0x00000001 + .4byte 0x00000606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060808 + .4byte 0x0A0C0A08 + .4byte 0x08000000 + .global lbl_803F0958 lbl_803F0958: - .incbin "baserom.dol", 0x3ED958, 0x3C + # ROM: 0x3ED958 + .4byte 0x00000004 + .4byte 0x02800210 + .4byte 0x02100028 + .4byte 0x00170280 + .4byte 0x02100000 + .4byte 0x00000001 + .4byte 0x00000606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060808 + .4byte 0x0A0C0A08 + .4byte 0x08000000 + .global lbl_803F0994 lbl_803F0994: - .incbin "baserom.dol", 0x3ED994, 0x3C - + # ROM: 0x3ED994 + .4byte 0x00000014 + .4byte 0x028001E0 + .4byte 0x01E00028 + .4byte 0x00000280 + .4byte 0x01E00000 + .4byte 0x00000001 + .4byte 0x00000606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060808 + .4byte 0x0A0C0A08 + .4byte 0x08000000 + + .section .text, "ax" .global __GXDefaultTexRegionCallback @@ -125,7 +391,7 @@ lbl_80375118: /* 80375118 00372078 80 01 00 0C */ lwz r0, 0xc(r1) /* 8037511C 0037207C 38 21 00 08 */ addi r1, r1, 8 /* 80375120 00372080 7C 08 03 A6 */ mtlr r0 -/* 80375124 00372084 4E 80 00 20 */ blr +/* 80375124 00372084 4E 80 00 20 */ blr .global __GXDefaultTlutRegionCallback __GXDefaultTlutRegionCallback: @@ -141,7 +407,7 @@ lbl_80375138: .global sub_80375148 sub_80375148: -/* 80375148 003720A8 4E 80 00 20 */ blr +/* 80375148 003720A8 4E 80 00 20 */ blr .global GXInit GXInit: @@ -704,7 +970,7 @@ lbl_803758E8: /* 803759A8 00372908 80 01 00 54 */ lwz r0, 0x54(r1) /* 803759AC 0037290C 38 21 00 50 */ addi r1, r1, 0x50 /* 803759B0 00372910 7C 08 03 A6 */ mtlr r0 -/* 803759B4 00372914 4E 80 00 20 */ blr +/* 803759B4 00372914 4E 80 00 20 */ blr .global __GXInitGX __GXInitGX: @@ -1289,4 +1555,4 @@ lbl_80376164: /* 8037626C 003731CC 83 A1 00 74 */ lwz r29, 0x74(r1) /* 80376270 003731D0 38 21 00 80 */ addi r1, r1, 0x80 /* 80376274 003731D4 7C 08 03 A6 */ mtlr r0 -/* 80376278 003731D8 4E 80 00 20 */ blr +/* 80376278 003731D8 4E 80 00 20 */ blr diff --git a/asm/Dolphin/gx/GXLight.s b/asm/Dolphin/gx/GXLight.s index 11c25067..f7e43df6 100644 --- a/asm/Dolphin/gx/GXLight.s +++ b/asm/Dolphin/gx/GXLight.s @@ -3,43 +3,75 @@ .section .sdata2 .global lbl_805AEB58 lbl_805AEB58: - .incbin "baserom.dol", 0x3FB3F8, 0x4 + # ROM: 0x3FB3F8 + .4byte 0 + .global lbl_805AEB5C lbl_805AEB5C: - .incbin "baserom.dol", 0x3FB3FC, 0x4 + # ROM: 0x3FB3FC + .4byte 0x42B40000 + .global lbl_805AEB60 lbl_805AEB60: - .incbin "baserom.dol", 0x3FB400, 0x4 + # ROM: 0x3FB400 + .4byte 0x40490FDB + .global lbl_805AEB64 lbl_805AEB64: - .incbin "baserom.dol", 0x3FB404, 0x4 + # ROM: 0x3FB404 + .4byte 0x43340000 + .global lbl_805AEB68 lbl_805AEB68: - .incbin "baserom.dol", 0x3FB408, 0x4 + # ROM: 0x3FB408 + .4byte 0xC47A0000 + .global lbl_805AEB6C lbl_805AEB6C: - .incbin "baserom.dol", 0x3FB40C, 0x4 + # ROM: 0x3FB40C + .4byte 0x447A0000 + .global lbl_805AEB70 lbl_805AEB70: - .incbin "baserom.dol", 0x3FB410, 0x4 + # ROM: 0x3FB410 + .4byte 0x3F800000 + .global lbl_805AEB74 lbl_805AEB74: - .incbin "baserom.dol", 0x3FB414, 0x4 + # ROM: 0x3FB414 + .4byte 0x40000000 + .global lbl_805AEB78 lbl_805AEB78: - .incbin "baserom.dol", 0x3FB418, 0x4 + # ROM: 0x3FB418 + .4byte 0xC0800000 + .global lbl_805AEB7C lbl_805AEB7C: - .incbin "baserom.dol", 0x3FB41C, 0x4 + # ROM: 0x3FB41C + .4byte 0x40800000 + .global lbl_805AEB80 lbl_805AEB80: - .incbin "baserom.dol", 0x3FB420, 0x8 - + # ROM: 0x3FB420 + .4byte 0xC0000000 + .4byte 0 + + .section .data .global lbl_803F09D0 lbl_803F09D0: - .incbin "baserom.dol", 0x3ED9D0, 0x20 - + # ROM: 0x3ED9D0 + .4byte 0x80379864 + .4byte 0x80379774 + .4byte 0x80379788 + .4byte 0x803797A8 + .4byte 0x803797C8 + .4byte 0x803797F4 + .4byte 0x80379828 + .4byte 0 + + .section .text, "ax" .global GXInitLightAttn @@ -50,7 +82,7 @@ GXInitLightAttn: /* 803796F4 00376654 D0 83 00 1C */ stfs f4, 0x1c(r3) /* 803796F8 00376658 D0 A3 00 20 */ stfs f5, 0x20(r3) /* 803796FC 0037665C D0 C3 00 24 */ stfs f6, 0x24(r3) -/* 80379700 00376660 4E 80 00 20 */ blr +/* 80379700 00376660 4E 80 00 20 */ blr .global GXInitLightSpot GXInitLightSpot: @@ -83,7 +115,7 @@ lbl_80379740: /* 80379764 003766C4 57 E0 10 3A */ slwi r0, r31, 2 /* 80379768 003766C8 7C 03 00 2E */ lwzx r0, r3, r0 /* 8037976C 003766CC 7C 09 03 A6 */ mtctr r0 -/* 80379770 003766D0 4E 80 04 20 */ bctr +/* 80379770 003766D0 4E 80 04 20 */ bctr /* 80379774 003766D4 C0 02 CE 48 */ lfs f0, lbl_805AEB68@sda21(r2) /* 80379778 003766D8 C0 82 CE 4C */ lfs f4, lbl_805AEB6C@sda21(r2) /* 8037977C 003766DC EC 60 00 72 */ fmuls f3, f0, f1 @@ -157,14 +189,14 @@ lbl_80379870: /* 80379884 003767E4 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80379888 003767E8 38 21 00 20 */ addi r1, r1, 0x20 /* 8037988C 003767EC 7C 08 03 A6 */ mtlr r0 -/* 80379890 003767F0 4E 80 00 20 */ blr +/* 80379890 003767F0 4E 80 00 20 */ blr .global GXInitLightPos GXInitLightPos: /* 80379894 003767F4 D0 23 00 28 */ stfs f1, 0x28(r3) /* 80379898 003767F8 D0 43 00 2C */ stfs f2, 0x2c(r3) /* 8037989C 003767FC D0 63 00 30 */ stfs f3, 0x30(r3) -/* 803798A0 00376800 4E 80 00 20 */ blr +/* 803798A0 00376800 4E 80 00 20 */ blr .global GXInitLightDir GXInitLightDir: @@ -174,13 +206,13 @@ GXInitLightDir: /* 803798B0 00376810 D0 83 00 34 */ stfs f4, 0x34(r3) /* 803798B4 00376814 D0 23 00 38 */ stfs f1, 0x38(r3) /* 803798B8 00376818 D0 03 00 3C */ stfs f0, 0x3c(r3) -/* 803798BC 0037681C 4E 80 00 20 */ blr +/* 803798BC 0037681C 4E 80 00 20 */ blr .global GXInitLightColor GXInitLightColor: /* 803798C0 00376820 80 04 00 00 */ lwz r0, 0(r4) /* 803798C4 00376824 90 03 00 0C */ stw r0, 0xc(r3) -/* 803798C8 00376828 4E 80 00 20 */ blr +/* 803798C8 00376828 4E 80 00 20 */ blr .global GXLoadLightObjImm GXLoadLightObjImm: @@ -214,7 +246,7 @@ GXLoadLightObjImm: /* 80379938 00376898 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) /* 8037993C 0037689C 38 00 00 01 */ li r0, 1 /* 80379940 003768A0 B0 03 00 02 */ sth r0, 2(r3) -/* 80379944 003768A4 4E 80 00 20 */ blr +/* 80379944 003768A4 4E 80 00 20 */ blr .global GXSetChanAmbColor GXSetChanAmbColor: @@ -226,11 +258,11 @@ GXSetChanAmbColor: /* 8037995C 003768BC 40 80 00 60 */ bge lbl_803799BC /* 80379960 003768C0 2C 03 00 00 */ cmpwi r3, 0 /* 80379964 003768C4 40 80 00 18 */ bge lbl_8037997C -/* 80379968 003768C8 4E 80 00 20 */ blr +/* 80379968 003768C8 4E 80 00 20 */ blr lbl_8037996C: /* 8037996C 003768CC 2C 03 00 05 */ cmpwi r3, 5 /* 80379970 003768D0 41 82 00 88 */ beq lbl_803799F8 -/* 80379974 003768D4 4C 80 00 20 */ bgelr +/* 80379974 003768D4 4C 80 00 20 */ bgelr /* 80379978 003768D8 48 00 00 74 */ b lbl_803799EC lbl_8037997C: /* 8037997C 003768DC 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) @@ -272,7 +304,7 @@ lbl_803799F8: /* 803799F8 00376958 80 E4 00 00 */ lwz r7, 0(r4) /* 803799FC 0037695C 38 A0 00 01 */ li r5, 1 /* 80379A00 00376960 48 00 00 08 */ b lbl_80379A08 -/* 80379A04 00376964 4E 80 00 20 */ blr +/* 80379A04 00376964 4E 80 00 20 */ blr lbl_80379A08: /* 80379A08 00376968 38 00 00 10 */ li r0, 0x10 /* 80379A0C 0037696C 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) @@ -286,7 +318,7 @@ lbl_80379A08: /* 80379A2C 0037698C 90 E6 80 00 */ stw r7, 0xCC008000@l(r6) /* 80379A30 00376990 B0 A4 00 02 */ sth r5, 2(r4) /* 80379A34 00376994 90 E3 00 A8 */ stw r7, 0xa8(r3) -/* 80379A38 00376998 4E 80 00 20 */ blr +/* 80379A38 00376998 4E 80 00 20 */ blr .global GXSetChanMatColor GXSetChanMatColor: @@ -298,11 +330,11 @@ GXSetChanMatColor: /* 80379A50 003769B0 40 80 00 60 */ bge lbl_80379AB0 /* 80379A54 003769B4 2C 03 00 00 */ cmpwi r3, 0 /* 80379A58 003769B8 40 80 00 18 */ bge lbl_80379A70 -/* 80379A5C 003769BC 4E 80 00 20 */ blr +/* 80379A5C 003769BC 4E 80 00 20 */ blr lbl_80379A60: /* 80379A60 003769C0 2C 03 00 05 */ cmpwi r3, 5 /* 80379A64 003769C4 41 82 00 88 */ beq lbl_80379AEC -/* 80379A68 003769C8 4C 80 00 20 */ bgelr +/* 80379A68 003769C8 4C 80 00 20 */ bgelr /* 80379A6C 003769CC 48 00 00 74 */ b lbl_80379AE0 lbl_80379A70: /* 80379A70 003769D0 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) @@ -344,7 +376,7 @@ lbl_80379AEC: /* 80379AEC 00376A4C 80 E4 00 00 */ lwz r7, 0(r4) /* 80379AF0 00376A50 38 A0 00 01 */ li r5, 1 /* 80379AF4 00376A54 48 00 00 08 */ b lbl_80379AFC -/* 80379AF8 00376A58 4E 80 00 20 */ blr +/* 80379AF8 00376A58 4E 80 00 20 */ blr lbl_80379AFC: /* 80379AFC 00376A5C 38 00 00 10 */ li r0, 0x10 /* 80379B00 00376A60 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) @@ -358,7 +390,7 @@ lbl_80379AFC: /* 80379B20 00376A80 90 E6 80 00 */ stw r7, 0xCC008000@l(r6) /* 80379B24 00376A84 B0 A4 00 02 */ sth r5, 2(r4) /* 80379B28 00376A88 90 E3 00 B0 */ stw r7, 0xb0(r3) -/* 80379B2C 00376A8C 4E 80 00 20 */ blr +/* 80379B2C 00376A8C 4E 80 00 20 */ blr .global GXSetNumChans GXSetNumChans: @@ -378,7 +410,7 @@ GXSetNumChans: /* 80379B64 00376AC4 80 06 04 F4 */ lwz r0, 0x4f4(r6) /* 80379B68 00376AC8 60 00 00 04 */ ori r0, r0, 4 /* 80379B6C 00376ACC 90 06 04 F4 */ stw r0, 0x4f4(r6) -/* 80379B70 00376AD0 4E 80 00 20 */ blr +/* 80379B70 00376AD0 4E 80 00 20 */ blr .global GXSetChanCtrl GXSetChanCtrl: @@ -435,4 +467,4 @@ lbl_80379C30: /* 80379C30 00376B90 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) /* 80379C34 00376B94 38 00 00 01 */ li r0, 1 /* 80379C38 00376B98 B0 03 00 02 */ sth r0, 2(r3) -/* 80379C3C 00376B9C 4E 80 00 20 */ blr +/* 80379C3C 00376B9C 4E 80 00 20 */ blr diff --git a/asm/Dolphin/gx/GXMisc.s b/asm/Dolphin/gx/GXMisc.s index dc7468d1..d17c2b79 100644 --- a/asm/Dolphin/gx/GXMisc.s +++ b/asm/Dolphin/gx/GXMisc.s @@ -21,9 +21,9 @@ lbl_805A9874: GXSetMisc: /* 803782A4 00375204 2C 03 00 01 */ cmpwi r3, 1 /* 803782A8 00375208 41 82 00 14 */ beq lbl_803782BC -/* 803782AC 0037520C 4D 80 00 20 */ bltlr +/* 803782AC 0037520C 4D 80 00 20 */ bltlr /* 803782B0 00375210 2C 03 00 03 */ cmpwi r3, 3 -/* 803782B4 00375214 4C 80 00 20 */ bgelr +/* 803782B4 00375214 4C 80 00 20 */ bgelr /* 803782B8 00375218 48 00 00 40 */ b lbl_803782F8 lbl_803782BC: /* 803782BC 0037521C 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) @@ -36,18 +36,18 @@ lbl_803782BC: /* 803782D8 00375238 B0 05 00 02 */ sth r0, 2(r5) /* 803782DC 0037523C A0 05 00 04 */ lhz r0, 4(r5) /* 803782E0 00375240 28 00 00 00 */ cmplwi r0, 0 -/* 803782E4 00375244 4D 82 00 20 */ beqlr +/* 803782E4 00375244 4D 82 00 20 */ beqlr /* 803782E8 00375248 80 05 04 F4 */ lwz r0, 0x4f4(r5) /* 803782EC 0037524C 60 00 00 08 */ ori r0, r0, 8 /* 803782F0 00375250 90 05 04 F4 */ stw r0, 0x4f4(r5) -/* 803782F4 00375254 4E 80 00 20 */ blr +/* 803782F4 00375254 4E 80 00 20 */ blr lbl_803782F8: /* 803782F8 00375258 7C 84 00 D0 */ neg r4, r4 /* 803782FC 0037525C 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) /* 80378300 00375260 30 04 FF FF */ addic r0, r4, -1 /* 80378304 00375264 7C 00 21 10 */ subfe r0, r0, r4 /* 80378308 00375268 98 03 04 F1 */ stb r0, 0x4f1(r3) -/* 8037830C 0037526C 4E 80 00 20 */ blr +/* 8037830C 0037526C 4E 80 00 20 */ blr .global GXFlush GXFlush: @@ -74,7 +74,7 @@ lbl_80378330: /* 8037835C 003752BC 80 01 00 0C */ lwz r0, 0xc(r1) /* 80378360 003752C0 38 21 00 08 */ addi r1, r1, 8 /* 80378364 003752C4 7C 08 03 A6 */ mtlr r0 -/* 80378368 003752C8 4E 80 00 20 */ blr +/* 80378368 003752C8 4E 80 00 20 */ blr .global sub_8037836c sub_8037836c: @@ -124,7 +124,7 @@ lbl_803783E4: /* 80378410 00375370 80 01 00 24 */ lwz r0, 0x24(r1) /* 80378414 00375374 38 21 00 20 */ addi r1, r1, 0x20 /* 80378418 00375378 7C 08 03 A6 */ mtlr r0 -/* 8037841C 0037537C 4E 80 00 20 */ blr +/* 8037841C 0037537C 4E 80 00 20 */ blr .global GXSetDrawSync GXSetDrawSync: @@ -174,13 +174,13 @@ lbl_80378484: /* 803784C8 00375428 83 C1 00 10 */ lwz r30, 0x10(r1) /* 803784CC 0037542C 38 21 00 18 */ addi r1, r1, 0x18 /* 803784D0 00375430 7C 08 03 A6 */ mtlr r0 -/* 803784D4 00375434 4E 80 00 20 */ blr +/* 803784D4 00375434 4E 80 00 20 */ blr .global GXReadDrawSync GXReadDrawSync: /* 803784D8 00375438 80 6D AC 80 */ lwz r3, lbl_805A9840@sda21(r13) /* 803784DC 0037543C A0 63 00 0E */ lhz r3, 0xe(r3) -/* 803784E0 00375440 4E 80 00 20 */ blr +/* 803784E0 00375440 4E 80 00 20 */ blr .global GXDrawDone GXDrawDone: @@ -217,7 +217,7 @@ lbl_8037853C: /* 80378554 003754B4 83 E1 00 14 */ lwz r31, 0x14(r1) /* 80378558 003754B8 38 21 00 18 */ addi r1, r1, 0x18 /* 8037855C 003754BC 7C 08 03 A6 */ mtlr r0 -/* 80378560 003754C0 4E 80 00 20 */ blr +/* 80378560 003754C0 4E 80 00 20 */ blr .global GXPixModeSync GXPixModeSync: @@ -229,7 +229,7 @@ GXPixModeSync: /* 80378578 003754D8 80 64 01 DC */ lwz r3, 0x1dc(r4) /* 8037857C 003754DC 90 65 80 00 */ stw r3, 0xCC008000@l(r5) /* 80378580 003754E0 B0 04 00 02 */ sth r0, 2(r4) -/* 80378584 003754E4 4E 80 00 20 */ blr +/* 80378584 003754E4 4E 80 00 20 */ blr .global GXPokeAlphaMode GXPokeAlphaMode: @@ -237,7 +237,7 @@ GXPokeAlphaMode: /* 8037858C 003754EC 54 80 06 3E */ clrlwi r0, r4, 0x18 /* 80378590 003754F0 50 60 40 2E */ rlwimi r0, r3, 8, 0, 0x17 /* 80378594 003754F4 B0 05 00 06 */ sth r0, 6(r5) -/* 80378598 003754F8 4E 80 00 20 */ blr +/* 80378598 003754F8 4E 80 00 20 */ blr .global GXPokeAlphaRead GXPokeAlphaRead: @@ -245,7 +245,7 @@ GXPokeAlphaRead: /* 803785A0 00375500 80 6D AC 80 */ lwz r3, lbl_805A9840@sda21(r13) /* 803785A4 00375504 60 00 00 04 */ ori r0, r0, 4 /* 803785A8 00375508 B0 03 00 08 */ sth r0, 8(r3) -/* 803785AC 0037550C 4E 80 00 20 */ blr +/* 803785AC 0037550C 4E 80 00 20 */ blr .global GXPokeAlphaUpdate GXPokeAlphaUpdate: @@ -255,7 +255,7 @@ GXPokeAlphaUpdate: /* 803785BC 0037551C 54 63 07 34 */ rlwinm r3, r3, 0, 0x1c, 0x1a /* 803785C0 00375520 7C 60 03 78 */ or r0, r3, r0 /* 803785C4 00375524 B0 04 00 00 */ sth r0, 0(r4) -/* 803785C8 00375528 4E 80 00 20 */ blr +/* 803785C8 00375528 4E 80 00 20 */ blr .global GXPokeBlendMode GXPokeBlendMode: @@ -293,7 +293,7 @@ lbl_803785F0: /* 80378644 003755A4 54 00 02 3E */ clrlwi r0, r0, 8 /* 80378648 003755A8 64 00 41 00 */ oris r0, r0, 0x4100 /* 8037864C 003755AC B0 0A 00 00 */ sth r0, 0(r10) -/* 80378650 003755B0 4E 80 00 20 */ blr +/* 80378650 003755B0 4E 80 00 20 */ blr .global GXPokeColorUpdate GXPokeColorUpdate: @@ -303,7 +303,7 @@ GXPokeColorUpdate: /* 80378660 003755C0 54 63 07 76 */ rlwinm r3, r3, 0, 0x1d, 0x1b /* 80378664 003755C4 7C 60 03 78 */ or r0, r3, r0 /* 80378668 003755C8 B0 04 00 00 */ sth r0, 0(r4) -/* 8037866C 003755CC 4E 80 00 20 */ blr +/* 8037866C 003755CC 4E 80 00 20 */ blr .global GXPokeDstAlpha GXPokeDstAlpha: @@ -311,7 +311,7 @@ GXPokeDstAlpha: /* 80378674 003755D4 54 60 44 2E */ rlwinm r0, r3, 8, 0x10, 0x17 /* 80378678 003755D8 50 80 06 3E */ rlwimi r0, r4, 0, 0x18, 0x1f /* 8037867C 003755DC B0 05 00 04 */ sth r0, 4(r5) -/* 80378680 003755E0 4E 80 00 20 */ blr +/* 80378680 003755E0 4E 80 00 20 */ blr .global GXPokeDither GXPokeDither: @@ -321,7 +321,7 @@ GXPokeDither: /* 80378690 003755F0 54 63 07 B8 */ rlwinm r3, r3, 0, 0x1e, 0x1c /* 80378694 003755F4 7C 60 03 78 */ or r0, r3, r0 /* 80378698 003755F8 B0 04 00 00 */ sth r0, 0(r4) -/* 8037869C 003755FC 4E 80 00 20 */ blr +/* 8037869C 003755FC 4E 80 00 20 */ blr .global GXPokeZMode GXPokeZMode: @@ -334,7 +334,7 @@ GXPokeZMode: /* 803786B8 00375618 54 A0 25 36 */ rlwinm r0, r5, 4, 0x14, 0x1b /* 803786BC 0037561C 7C 80 03 78 */ or r0, r4, r0 /* 803786C0 00375620 B0 03 00 00 */ sth r0, 0(r3) -/* 803786C4 00375624 4E 80 00 20 */ blr +/* 803786C4 00375624 4E 80 00 20 */ blr .global GXTokenInterruptHandler GXTokenInterruptHandler: @@ -356,7 +356,7 @@ GXTokenInterruptHandler: /* 80378704 00375664 81 8D AC A8 */ lwz r12, lbl_805A9868@sda21(r13) /* 80378708 00375668 38 7F 00 00 */ addi r3, r31, 0 /* 8037870C 0037566C 7D 88 03 A6 */ mtlr r12 -/* 80378710 00375670 4E 80 00 21 */ blrl +/* 80378710 00375670 4E 80 00 21 */ blrl /* 80378714 00375674 38 61 00 10 */ addi r3, r1, 0x10 /* 80378718 00375678 48 00 6E FD */ bl OSClearContext /* 8037871C 0037567C 7F C3 F3 78 */ mr r3, r30 @@ -372,7 +372,7 @@ lbl_80378724: /* 80378740 003756A0 83 C1 02 D8 */ lwz r30, 0x2d8(r1) /* 80378744 003756A4 38 21 02 E0 */ addi r1, r1, 0x2e0 /* 80378748 003756A8 7C 08 03 A6 */ mtlr r0 -/* 8037874C 003756AC 4E 80 00 20 */ blr +/* 8037874C 003756AC 4E 80 00 20 */ blr .global GXFinishInterruptHandler GXFinishInterruptHandler: @@ -397,7 +397,7 @@ GXFinishInterruptHandler: /* 80378798 003756F8 48 00 6C 85 */ bl OSSetCurrentContext /* 8037879C 003756FC 81 8D AC AC */ lwz r12, lbl_805A986C@sda21(r13) /* 803787A0 00375700 7D 88 03 A6 */ mtlr r12 -/* 803787A4 00375704 4E 80 00 21 */ blrl +/* 803787A4 00375704 4E 80 00 21 */ blrl /* 803787A8 00375708 38 61 00 10 */ addi r3, r1, 0x10 /* 803787AC 0037570C 48 00 6E 69 */ bl OSClearContext /* 803787B0 00375710 7F E3 FB 78 */ mr r3, r31 @@ -409,7 +409,7 @@ lbl_803787B8: /* 803787C4 00375724 83 E1 02 DC */ lwz r31, 0x2dc(r1) /* 803787C8 00375728 38 21 02 E0 */ addi r1, r1, 0x2e0 /* 803787CC 0037572C 7C 08 03 A6 */ mtlr r0 -/* 803787D0 00375730 4E 80 00 20 */ blr +/* 803787D0 00375730 4E 80 00 20 */ blr .global __GXPEInit __GXPEInit: @@ -444,4 +444,4 @@ __GXPEInit: /* 80378844 003757A4 80 01 00 0C */ lwz r0, 0xc(r1) /* 80378848 003757A8 38 21 00 08 */ addi r1, r1, 8 /* 8037884C 003757AC 7C 08 03 A6 */ mtlr r0 -/* 80378850 003757B0 4E 80 00 20 */ blr +/* 80378850 003757B0 4E 80 00 20 */ blr diff --git a/asm/Dolphin/gx/GXPerf.s b/asm/Dolphin/gx/GXPerf.s index 7dca0692..11927808 100644 --- a/asm/Dolphin/gx/GXPerf.s +++ b/asm/Dolphin/gx/GXPerf.s @@ -2,10 +2,72 @@ .section .data lbl_803F0CB0: - .incbin "baserom.dol", 0x3EDCB0, 0x5C + # ROM: 0x3EDCB0 + .4byte 0x8037CD4C + .4byte 0x8037CD68 + .4byte 0x8037CD84 + .4byte 0x8037CDA0 + .4byte 0x8037CDF4 + .4byte 0x8037CE10 + .4byte 0x8037CE2C + .4byte 0x8037CE48 + .4byte 0x8037CDBC + .4byte 0x8037CE64 + .4byte 0x8037CE94 + .4byte 0x8037CEC4 + .4byte 0x8037CEF4 + .4byte 0x8037CF24 + .4byte 0x8037CF54 + .4byte 0x8037CF84 + .4byte 0x8037CFB4 + .4byte 0x8037CFE4 + .4byte 0x8037CFF4 + .4byte 0x8037D004 + .4byte 0x8037D014 + .4byte 0x8037CDD8 + .4byte 0x8037D020 + lbl_803F0D0C: - .incbin "baserom.dol", 0x3EDD0C, 0x94 - + # ROM: 0x3EDD0C + .4byte 0x8037C920 + .4byte 0x8037C940 + .4byte 0x8037C960 + .4byte 0x8037C980 + .4byte 0x8037C9A0 + .4byte 0x8037C9C0 + .4byte 0x8037C9E0 + .4byte 0x8037CA00 + .4byte 0x8037CA20 + .4byte 0x8037CA40 + .4byte 0x8037CA80 + .4byte 0x8037CAA0 + .4byte 0x8037CABC + .4byte 0x8037CAD8 + .4byte 0x8037CAF4 + .4byte 0x8037CB10 + .4byte 0x8037CB2C + .4byte 0x8037CB48 + .4byte 0x8037CB64 + .4byte 0x8037CB80 + .4byte 0x8037CB9C + .4byte 0x8037CBB8 + .4byte 0x8037CBD4 + .4byte 0x8037CBF0 + .4byte 0x8037CC0C + .4byte 0x8037CC28 + .4byte 0x8037CC44 + .4byte 0x8037CC60 + .4byte 0x8037CC7C + .4byte 0x8037CC98 + .4byte 0x8037CCB4 + .4byte 0x8037CCD0 + .4byte 0x8037CCEC + .4byte 0x8037CD08 + .4byte 0x8037CA60 + .4byte 0x8037CD20 + .4byte 0 + + .section .text, "ax" .global GXSetGPMetric @@ -97,7 +159,7 @@ lbl_8037C8F4: /* 8037C910 00379870 54 00 10 3A */ slwi r0, r0, 2 /* 8037C914 00379874 7C 03 00 2E */ lwzx r0, r3, r0 /* 8037C918 00379878 7C 09 03 A6 */ mtctr r0 -/* 8037C91C 0037987C 4E 80 04 20 */ bctr +/* 8037C91C 0037987C 4E 80 04 20 */ bctr /* 8037C920 00379880 38 00 00 10 */ li r0, 0x10 /* 8037C924 00379884 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 8037C928 00379888 98 05 80 00 */ stb r0, 0xCC008000@l(r5) @@ -365,7 +427,7 @@ lbl_8037CD20: /* 8037CD3C 00379C9C 54 00 10 3A */ slwi r0, r0, 2 /* 8037CD40 00379CA0 7C 04 00 2E */ lwzx r0, r4, r0 /* 8037CD44 00379CA4 7C 09 03 A6 */ mtctr r0 -/* 8037CD48 00379CA8 4E 80 04 20 */ bctr +/* 8037CD48 00379CA8 4E 80 04 20 */ bctr /* 8037CD4C 00379CAC 38 00 00 61 */ li r0, 0x61 /* 8037CD50 00379CB0 3C 80 CC 01 */ lis r4, 0xCC008000@ha /* 8037CD54 00379CB4 3C 60 67 00 */ lis r3, 0x67000042@ha @@ -551,11 +613,11 @@ lbl_8037D020: /* 8037D020 00379F80 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) /* 8037D024 00379F84 38 00 00 00 */ li r0, 0 /* 8037D028 00379F88 B0 03 00 02 */ sth r0, 2(r3) -/* 8037D02C 00379F8C 4E 80 00 20 */ blr +/* 8037D02C 00379F8C 4E 80 00 20 */ blr .global GXClearGPMetric GXClearGPMetric: /* 8037D030 00379F90 80 6D AC 7C */ lwz r3, lbl_805A983C@sda21(r13) /* 8037D034 00379F94 38 00 00 04 */ li r0, 4 /* 8037D038 00379F98 B0 03 00 04 */ sth r0, 4(r3) -/* 8037D03C 00379F9C 4E 80 00 20 */ blr +/* 8037D03C 00379F9C 4E 80 00 20 */ blr diff --git a/asm/Dolphin/gx/GXPixel.s b/asm/Dolphin/gx/GXPixel.s index 5bd4ecd8..b26965ea 100644 --- a/asm/Dolphin/gx/GXPixel.s +++ b/asm/Dolphin/gx/GXPixel.s @@ -3,31 +3,59 @@ .section .sdata2 .global lbl_805AEBB8 lbl_805AEBB8: - .incbin "baserom.dol", 0x3FB458, 0x4 + # ROM: 0x3FB458 + .4byte 0 + .global lbl_805AEBBC lbl_805AEBBC: - .incbin "baserom.dol", 0x3FB45C, 0x4 + # ROM: 0x3FB45C + .4byte 0x3F000000 + .global lbl_805AEBC0 lbl_805AEBC0: - .incbin "baserom.dol", 0x3FB460, 0x8 + # ROM: 0x3FB460 + .4byte 0x3FF00000 + .4byte 0 + .global lbl_805AEBC8 lbl_805AEBC8: - .incbin "baserom.dol", 0x3FB468, 0x8 + # ROM: 0x3FB468 + .4byte 0x40000000 + .4byte 0 + .global lbl_805AEBD0 lbl_805AEBD0: - .incbin "baserom.dol", 0x3FB470, 0x8 + # ROM: 0x3FB470 + .4byte 0x3FE00000 + .4byte 0 + .global lbl_805AEBD8 lbl_805AEBD8: - .incbin "baserom.dol", 0x3FB478, 0x8 + # ROM: 0x3FB478 + .4byte 0x4B00001E + .4byte 0 + .global lbl_805AEBE0 lbl_805AEBE0: - .incbin "baserom.dol", 0x3FB480, 0x8 - + # ROM: 0x3FB480 + .4byte 0x43300000 + .4byte 0x80000000 + + .section .data .global lbl_803F0C90 lbl_803F0C90: - .incbin "baserom.dol", 0x3EDC90, 0x20 - + # ROM: 0x3EDC90 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0x00000005 + + .section .text, "ax" .global GXSetFog @@ -147,7 +175,7 @@ lbl_8037BCA0: /* 8037BD9C 00378CFC 83 A1 00 3C */ lwz r29, 0x3c(r1) /* 8037BDA0 00378D00 38 21 00 48 */ addi r1, r1, 0x48 /* 8037BDA4 00378D04 7C 08 03 A6 */ mtlr r0 -/* 8037BDA8 00378D08 4E 80 00 20 */ blr +/* 8037BDA8 00378D08 4E 80 00 20 */ blr .global GXSetFogRangeAdj GXSetFogRangeAdj: @@ -215,7 +243,7 @@ lbl_8037BE70: /* 8037BE9C 00378DFC 38 00 00 00 */ li r0, 0 /* 8037BEA0 00378E00 90 A3 80 00 */ stw r5, 0xCC008000@l(r3) /* 8037BEA4 00378E04 B0 04 00 02 */ sth r0, 2(r4) -/* 8037BEA8 00378E08 4E 80 00 20 */ blr +/* 8037BEA8 00378E08 4E 80 00 20 */ blr .global GXSetBlendMode GXSetBlendMode: @@ -239,7 +267,7 @@ GXSetBlendMode: /* 8037BEF0 00378E50 90 E3 80 00 */ stw r7, 0xCC008000@l(r3) /* 8037BEF4 00378E54 90 E8 01 D0 */ stw r7, 0x1d0(r8) /* 8037BEF8 00378E58 B0 08 00 02 */ sth r0, 2(r8) -/* 8037BEFC 00378E5C 4E 80 00 20 */ blr +/* 8037BEFC 00378E5C 4E 80 00 20 */ blr .global GXSetColorUpdate GXSetColorUpdate: @@ -253,7 +281,7 @@ GXSetColorUpdate: /* 8037BF1C 00378E7C 90 C4 80 00 */ stw r6, 0xCC008000@l(r4) /* 8037BF20 00378E80 90 C5 01 D0 */ stw r6, 0x1d0(r5) /* 8037BF24 00378E84 B0 05 00 02 */ sth r0, 2(r5) -/* 8037BF28 00378E88 4E 80 00 20 */ blr +/* 8037BF28 00378E88 4E 80 00 20 */ blr .global GXSetAlphaUpdate GXSetAlphaUpdate: @@ -267,7 +295,7 @@ GXSetAlphaUpdate: /* 8037BF48 00378EA8 90 C4 80 00 */ stw r6, 0xCC008000@l(r4) /* 8037BF4C 00378EAC 90 C5 01 D0 */ stw r6, 0x1d0(r5) /* 8037BF50 00378EB0 B0 05 00 02 */ sth r0, 2(r5) -/* 8037BF54 00378EB4 4E 80 00 20 */ blr +/* 8037BF54 00378EB4 4E 80 00 20 */ blr .global GXSetZMode GXSetZMode: @@ -283,7 +311,7 @@ GXSetZMode: /* 8037BF7C 00378EDC 38 00 00 00 */ li r0, 0 /* 8037BF80 00378EE0 90 E6 01 D8 */ stw r7, 0x1d8(r6) /* 8037BF84 00378EE4 B0 06 00 02 */ sth r0, 2(r6) -/* 8037BF88 00378EE8 4E 80 00 20 */ blr +/* 8037BF88 00378EE8 4E 80 00 20 */ blr .global GXSetZCompLoc GXSetZCompLoc: @@ -300,7 +328,7 @@ GXSetZCompLoc: /* 8037BFB4 00378F14 80 66 01 DC */ lwz r3, 0x1dc(r6) /* 8037BFB8 00378F18 90 64 80 00 */ stw r3, 0xCC008000@l(r4) /* 8037BFBC 00378F1C B0 06 00 02 */ sth r0, 2(r6) -/* 8037BFC0 00378F20 4E 80 00 20 */ blr +/* 8037BFC0 00378F20 4E 80 00 20 */ blr .global GXSetPixelFmt GXSetPixelFmt: @@ -365,7 +393,7 @@ lbl_8037C09C: /* 8037C09C 00378FFC 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) /* 8037C0A0 00379000 38 00 00 00 */ li r0, 0 /* 8037C0A4 00379004 B0 03 00 02 */ sth r0, 2(r3) -/* 8037C0A8 00379008 4E 80 00 20 */ blr +/* 8037C0A8 00379008 4E 80 00 20 */ blr .global GXSetDither GXSetDither: @@ -381,7 +409,7 @@ GXSetDither: /* 8037C0D0 00379030 38 00 00 00 */ li r0, 0 /* 8037C0D4 00379034 90 66 01 D0 */ stw r3, 0x1d0(r6) /* 8037C0D8 00379038 B0 06 00 02 */ sth r0, 2(r6) -/* 8037C0DC 0037903C 4E 80 00 20 */ blr +/* 8037C0DC 0037903C 4E 80 00 20 */ blr .global GXSetDstAlpha GXSetDstAlpha: @@ -399,7 +427,7 @@ GXSetDstAlpha: /* 8037C10C 0037906C 38 00 00 00 */ li r0, 0 /* 8037C110 00379070 90 66 01 D4 */ stw r3, 0x1d4(r6) /* 8037C114 00379074 B0 06 00 02 */ sth r0, 2(r6) -/* 8037C118 00379078 4E 80 00 20 */ blr +/* 8037C118 00379078 4E 80 00 20 */ blr .global GXSetFieldMask GXSetFieldMask: @@ -416,7 +444,7 @@ GXSetFieldMask: /* 8037C144 003790A4 38 00 00 00 */ li r0, 0 /* 8037C148 003790A8 90 A3 80 00 */ stw r5, 0xCC008000@l(r3) /* 8037C14C 003790AC B0 04 00 02 */ sth r0, 2(r4) -/* 8037C150 003790B0 4E 80 00 20 */ blr +/* 8037C150 003790B0 4E 80 00 20 */ blr .global GXSetFieldMode GXSetFieldMode: @@ -450,4 +478,4 @@ GXSetFieldMode: /* 8037C1C0 00379120 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8037C1C4 00379124 38 21 00 20 */ addi r1, r1, 0x20 /* 8037C1C8 00379128 7C 08 03 A6 */ mtlr r0 -/* 8037C1CC 0037912C 4E 80 00 20 */ blr +/* 8037C1CC 0037912C 4E 80 00 20 */ blr diff --git a/asm/Dolphin/gx/GXStubs.s b/asm/Dolphin/gx/GXStubs.s index 6d5b4d61..e4d94124 100644 --- a/asm/Dolphin/gx/GXStubs.s +++ b/asm/Dolphin/gx/GXStubs.s @@ -4,4 +4,4 @@ .global __GXSetRange __GXSetRange: -/* 8037C1D0 00379130 4E 80 00 20 */ blr +/* 8037C1D0 00379130 4E 80 00 20 */ blr diff --git a/asm/Dolphin/gx/GXTev.s b/asm/Dolphin/gx/GXTev.s index 5f2933ee..1b80a3ca 100644 --- a/asm/Dolphin/gx/GXTev.s +++ b/asm/Dolphin/gx/GXTev.s @@ -3,11 +3,43 @@ .section .data .global lbl_803F0C18 lbl_803F0C18: - .incbin "baserom.dol", 0x3EDC18, 0x50 + # ROM: 0x3EDC18 + .4byte 0xC008F8AF + .4byte 0xC008A89F + .4byte 0xC008AC8F + .4byte 0xC008FFF8 + .4byte 0xC008FFFA + .4byte 0xC008F80F + .4byte 0xC008089F + .4byte 0xC0080C8F + .4byte 0xC008FFF8 + .4byte 0xC008FFF0 + .4byte 0xC108F2F0 + .4byte 0xC108FFD0 + .4byte 0xC108F2F0 + .4byte 0xC108FFC0 + .4byte 0xC108FFD0 + .4byte 0xC108F070 + .4byte 0xC108FF80 + .4byte 0xC108F070 + .4byte 0xC108FFC0 + .4byte 0xC108FF80 + .global lbl_803F0C68 lbl_803F0C68: - .incbin "baserom.dol", 0x3EDC68, 0x28 - + # ROM: 0x3EDC68 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000007 + .4byte 0x00000005 + .4byte 0x00000006 + .4byte 0 + + .section .text, "ax" .global GXSetTevOp @@ -48,7 +80,7 @@ lbl_8037B44C: /* 8037B494 003783F4 91 04 80 00 */ stw r8, 0xCC008000@l(r4) /* 8037B498 003783F8 91 06 01 70 */ stw r8, 0x170(r6) /* 8037B49C 003783FC B0 07 00 02 */ sth r0, 2(r7) -/* 8037B4A0 00378400 4E 80 00 20 */ blr +/* 8037B4A0 00378400 4E 80 00 20 */ blr .global GXSetTevColorIn GXSetTevColorIn: @@ -68,7 +100,7 @@ GXSetTevColorIn: /* 8037B4D8 00378438 38 00 00 00 */ li r0, 0 /* 8037B4DC 0037843C 90 88 01 30 */ stw r4, 0x130(r8) /* 8037B4E0 00378440 B0 09 00 02 */ sth r0, 2(r9) -/* 8037B4E4 00378444 4E 80 00 20 */ blr +/* 8037B4E4 00378444 4E 80 00 20 */ blr .global GXSetTevAlphaIn GXSetTevAlphaIn: @@ -88,7 +120,7 @@ GXSetTevAlphaIn: /* 8037B51C 0037847C 38 00 00 00 */ li r0, 0 /* 8037B520 00378480 90 88 01 70 */ stw r4, 0x170(r8) /* 8037B524 00378484 B0 09 00 02 */ sth r0, 2(r9) -/* 8037B528 00378488 4E 80 00 20 */ blr +/* 8037B528 00378488 4E 80 00 20 */ blr .global GXSetTevColorOp GXSetTevColorOp: @@ -119,7 +151,7 @@ lbl_8037B564: /* 8037B584 003784E4 38 00 00 00 */ li r0, 0 /* 8037B588 003784E8 91 43 01 30 */ stw r10, 0x130(r3) /* 8037B58C 003784EC B0 04 00 02 */ sth r0, 2(r4) -/* 8037B590 003784F0 4E 80 00 20 */ blr +/* 8037B590 003784F0 4E 80 00 20 */ blr .global GXSetTevAlphaOp GXSetTevAlphaOp: @@ -150,7 +182,7 @@ lbl_8037B5CC: /* 8037B5EC 0037854C 38 00 00 00 */ li r0, 0 /* 8037B5F0 00378550 91 43 01 70 */ stw r10, 0x170(r3) /* 8037B5F4 00378554 B0 04 00 02 */ sth r0, 2(r4) -/* 8037B5F8 00378558 4E 80 00 20 */ blr +/* 8037B5F8 00378558 4E 80 00 20 */ blr .global GXSetTevColor GXSetTevColor: @@ -182,7 +214,7 @@ GXSetTevColor: /* 8037B660 003785C0 98 A4 80 00 */ stb r5, 0xCC008000@l(r4) /* 8037B664 003785C4 90 C4 80 00 */ stw r6, 0xCC008000@l(r4) /* 8037B668 003785C8 B0 03 00 02 */ sth r0, 2(r3) -/* 8037B66C 003785CC 4E 80 00 20 */ blr +/* 8037B66C 003785CC 4E 80 00 20 */ blr .global GXSetTevColorS10 GXSetTevColorS10: @@ -214,7 +246,7 @@ GXSetTevColorS10: /* 8037B6D4 00378634 98 A4 80 00 */ stb r5, 0xCC008000@l(r4) /* 8037B6D8 00378638 90 C4 80 00 */ stw r6, 0xCC008000@l(r4) /* 8037B6DC 0037863C B0 03 00 02 */ sth r0, 2(r3) -/* 8037B6E0 00378640 4E 80 00 20 */ blr +/* 8037B6E0 00378640 4E 80 00 20 */ blr .global GXSetTevKColor GXSetTevKColor: @@ -246,7 +278,7 @@ GXSetTevKColor: /* 8037B748 003786A8 90 04 80 00 */ stw r0, 0xCC008000@l(r4) /* 8037B74C 003786AC 38 00 00 00 */ li r0, 0 /* 8037B750 003786B0 B0 03 00 02 */ sth r0, 2(r3) -/* 8037B754 003786B4 4E 80 00 20 */ blr +/* 8037B754 003786B4 4E 80 00 20 */ blr .global GXSetTevKColorSel GXSetTevKColorSel: @@ -278,7 +310,7 @@ lbl_8037B7A0: /* 8037B7B4 00378714 80 87 00 00 */ lwz r4, 0(r7) /* 8037B7B8 00378718 90 85 80 00 */ stw r4, 0xCC008000@l(r5) /* 8037B7BC 0037871C B0 03 00 02 */ sth r0, 2(r3) -/* 8037B7C0 00378720 4E 80 00 20 */ blr +/* 8037B7C0 00378720 4E 80 00 20 */ blr .global GXSetTevKAlphaSel GXSetTevKAlphaSel: @@ -310,7 +342,7 @@ lbl_8037B80C: /* 8037B820 00378780 80 87 00 00 */ lwz r4, 0(r7) /* 8037B824 00378784 90 85 80 00 */ stw r4, 0xCC008000@l(r5) /* 8037B828 00378788 B0 03 00 02 */ sth r0, 2(r3) -/* 8037B82C 0037878C 4E 80 00 20 */ blr +/* 8037B82C 0037878C 4E 80 00 20 */ blr .global GXSetTevSwapMode GXSetTevSwapMode: @@ -334,7 +366,7 @@ GXSetTevSwapMode: /* 8037B874 003787D4 80 68 00 00 */ lwz r3, 0(r8) /* 8037B878 003787D8 90 64 80 00 */ stw r3, 0xCC008000@l(r4) /* 8037B87C 003787DC B0 07 00 02 */ sth r0, 2(r7) -/* 8037B880 003787E0 4E 80 00 20 */ blr +/* 8037B880 003787E0 4E 80 00 20 */ blr .global GXSetTevSwapModeTable GXSetTevSwapModeTable: @@ -375,7 +407,7 @@ GXSetTevSwapModeTable: /* 8037B90C 0037886C 80 6A 00 00 */ lwz r3, 0(r10) /* 8037B910 00378870 90 65 80 00 */ stw r3, 0xCC008000@l(r5) /* 8037B914 00378874 B0 09 00 02 */ sth r0, 2(r9) -/* 8037B918 00378878 4E 80 00 20 */ blr +/* 8037B918 00378878 4E 80 00 20 */ blr .global GXSetAlphaCompare GXSetAlphaCompare: @@ -399,7 +431,7 @@ GXSetAlphaCompare: /* 8037B960 003788C0 90 03 80 00 */ stw r0, 0xCC008000@l(r3) /* 8037B964 003788C4 38 00 00 00 */ li r0, 0 /* 8037B968 003788C8 B0 04 00 02 */ sth r0, 2(r4) -/* 8037B96C 003788CC 4E 80 00 20 */ blr +/* 8037B96C 003788CC 4E 80 00 20 */ blr .global GXSetZTexture GXSetZTexture: @@ -441,7 +473,7 @@ lbl_8037B9B8: /* 8037B9E4 00378944 38 00 00 00 */ li r0, 0 /* 8037B9E8 00378948 90 65 80 00 */ stw r3, 0xCC008000@l(r5) /* 8037B9EC 0037894C B0 04 00 02 */ sth r0, 2(r4) -/* 8037B9F0 00378950 4E 80 00 20 */ blr +/* 8037B9F0 00378950 4E 80 00 20 */ blr .global GXSetTevOrder GXSetTevOrder: @@ -574,7 +606,7 @@ lbl_8037BB9C: /* 8037BBBC 00378B1C 80 03 04 F4 */ lwz r0, 0x4f4(r3) /* 8037BBC0 00378B20 60 00 00 01 */ ori r0, r0, 1 /* 8037BBC4 00378B24 90 03 04 F4 */ stw r0, 0x4f4(r3) -/* 8037BBC8 00378B28 4E 80 00 20 */ blr +/* 8037BBC8 00378B28 4E 80 00 20 */ blr .global GXSetNumTevStages GXSetNumTevStages: @@ -589,4 +621,4 @@ GXSetNumTevStages: /* 8037BBEC 00378B4C 80 04 04 F4 */ lwz r0, 0x4f4(r4) /* 8037BBF0 00378B50 60 00 00 04 */ ori r0, r0, 4 /* 8037BBF4 00378B54 90 04 04 F4 */ stw r0, 0x4f4(r4) -/* 8037BBF8 00378B58 4E 80 00 20 */ blr +/* 8037BBF8 00378B58 4E 80 00 20 */ blr diff --git a/asm/Dolphin/gx/GXTexture.s b/asm/Dolphin/gx/GXTexture.s index b44dabb8..2301b274 100644 --- a/asm/Dolphin/gx/GXTexture.s +++ b/asm/Dolphin/gx/GXTexture.s @@ -3,67 +3,250 @@ .section .sdata .global lbl_805A8AE0 lbl_805A8AE0: - .incbin "baserom.dol", 0x3F6480, 0x8 + # ROM: 0x3F6480 + .4byte 0x80818283 + .4byte 0xA0A1A2A3 + .global lbl_805A8AE8 lbl_805A8AE8: - .incbin "baserom.dol", 0x3F6488, 0x8 + # ROM: 0x3F6488 + .4byte 0x84858687 + .4byte 0xA4A5A6A7 + .global lbl_805A8AF0 lbl_805A8AF0: - .incbin "baserom.dol", 0x3F6490, 0x8 + # ROM: 0x3F6490 + .4byte 0x88898A8B + .4byte 0xA8A9AAAB + .global lbl_805A8AF8 lbl_805A8AF8: - .incbin "baserom.dol", 0x3F6498, 0x8 + # ROM: 0x3F6498 + .4byte 0x8C8D8E8F + .4byte 0xACADAEAF + .global lbl_805A8B00 lbl_805A8B00: - .incbin "baserom.dol", 0x3F64A0, 0x8 + # ROM: 0x3F64A0 + .4byte 0x90919293 + .4byte 0xB0B1B2B3 + .global lbl_805A8B08 lbl_805A8B08: - .incbin "baserom.dol", 0x3F64A8, 0x8 + # ROM: 0x3F64A8 + .4byte 0x94959697 + .4byte 0xB4B5B6B7 + .global lbl_805A8B10 lbl_805A8B10: - .incbin "baserom.dol", 0x3F64B0, 0x8 + # ROM: 0x3F64B0 + .4byte 0x98999A9B + .4byte 0xB8B9BABB + .global lbl_805A8B18 lbl_805A8B18: - .incbin "baserom.dol", 0x3F64B8, 0x8 + # ROM: 0x3F64B8 + .4byte 0x00040105 + .4byte 0x02060000 + .section .sdata2 .global lbl_805AEB88 lbl_805AEB88: - .incbin "baserom.dol", 0x3FB428, 0x8 + # ROM: 0x3FB428 + .4byte 0x41800000 + .4byte 0 + .global lbl_805AEB90 lbl_805AEB90: - .incbin "baserom.dol", 0x3FB430, 0x8 + # ROM: 0x3FB430 + .4byte 0x43300000 + .4byte 0 + .global lbl_805AEB98 lbl_805AEB98: - .incbin "baserom.dol", 0x3FB438, 0x4 + # ROM: 0x3FB438 + .4byte 0xC0800000 + .global lbl_805AEB9C lbl_805AEB9C: - .incbin "baserom.dol", 0x3FB43C, 0x4 + # ROM: 0x3FB43C + .4byte 0x40800000 + .global lbl_805AEBA0 lbl_805AEBA0: - .incbin "baserom.dol", 0x3FB440, 0x4 + # ROM: 0x3FB440 + .4byte 0x407F5C29 + .global lbl_805AEBA4 lbl_805AEBA4: - .incbin "baserom.dol", 0x3FB444, 0x4 + # ROM: 0x3FB444 + .4byte 0x42000000 + .global lbl_805AEBA8 lbl_805AEBA8: - .incbin "baserom.dol", 0x3FB448, 0x4 + # ROM: 0x3FB448 + .4byte 0 + .global lbl_805AEBAC lbl_805AEBAC: - .incbin "baserom.dol", 0x3FB44C, 0x4 + # ROM: 0x3FB44C + .4byte 0x41200000 + .section .data .global lbl_803F09F0 lbl_803F09F0: - .incbin "baserom.dol", 0x3ED9F0, 0xF4 + # ROM: 0x3ED9F0 + .4byte 0x80379C68 + .4byte 0x80379C74 + .4byte 0x80379C74 + .4byte 0x80379C80 + .4byte 0x80379C80 + .4byte 0x80379C80 + .4byte 0x80379C80 + .4byte 0x80379C8C + .4byte 0x80379C68 + .4byte 0x80379C74 + .4byte 0x80379C80 + .4byte 0x80379C8C + .4byte 0x80379C8C + .4byte 0x80379C8C + .4byte 0x80379C68 + .4byte 0x80379C8C + .4byte 0x80379C8C + .4byte 0x80379C74 + .4byte 0x80379C8C + .4byte 0x80379C80 + .4byte 0x80379C8C + .4byte 0x80379C8C + .4byte 0x80379C80 + .4byte 0x80379C8C + .4byte 0x80379C8C + .4byte 0x80379C8C + .4byte 0x80379C8C + .4byte 0x80379C8C + .4byte 0x80379C8C + .4byte 0x80379C8C + .4byte 0x80379C8C + .4byte 0x80379C8C + .4byte 0x80379C68 + .4byte 0x80379C8C + .4byte 0x80379C74 + .4byte 0x80379C80 + .4byte 0x80379C8C + .4byte 0x80379C8C + .4byte 0x80379C8C + .4byte 0x80379C74 + .4byte 0x80379C74 + .4byte 0x80379C74 + .4byte 0x80379C74 + .4byte 0x80379C80 + .4byte 0x80379C80 + .4byte 0x80379C8C + .4byte 0x80379C8C + .4byte 0x80379C8C + .4byte 0x80379C68 + .4byte 0x80379C8C + .4byte 0x80379C8C + .4byte 0x80379C8C + .4byte 0x80379C8C + .4byte 0x80379C8C + .4byte 0x80379C8C + .4byte 0x80379C8C + .4byte 0x80379C8C + .4byte 0x80379C74 + .4byte 0x80379C74 + .4byte 0x80379C8C + .4byte 0x80379C80 + .global lbl_803F0AE4 lbl_803F0AE4: - .incbin "baserom.dol", 0x3EDAE4, 0xF4 + # ROM: 0x3EDAE4 + .4byte 0x80379DBC + .4byte 0x80379DC8 + .4byte 0x80379DC8 + .4byte 0x80379DD4 + .4byte 0x80379DD4 + .4byte 0x80379DD4 + .4byte 0x80379DD4 + .4byte 0x80379DE0 + .4byte 0x80379DBC + .4byte 0x80379DC8 + .4byte 0x80379DD4 + .4byte 0x80379DE0 + .4byte 0x80379DE0 + .4byte 0x80379DE0 + .4byte 0x80379DBC + .4byte 0x80379DE0 + .4byte 0x80379DE0 + .4byte 0x80379DC8 + .4byte 0x80379DE0 + .4byte 0x80379DD4 + .4byte 0x80379DE0 + .4byte 0x80379DE0 + .4byte 0x80379DD4 + .4byte 0x80379DE0 + .4byte 0x80379DE0 + .4byte 0x80379DE0 + .4byte 0x80379DE0 + .4byte 0x80379DE0 + .4byte 0x80379DE0 + .4byte 0x80379DE0 + .4byte 0x80379DE0 + .4byte 0x80379DE0 + .4byte 0x80379DBC + .4byte 0x80379DE0 + .4byte 0x80379DC8 + .4byte 0x80379DD4 + .4byte 0x80379DE0 + .4byte 0x80379DE0 + .4byte 0x80379DE0 + .4byte 0x80379DC8 + .4byte 0x80379DC8 + .4byte 0x80379DC8 + .4byte 0x80379DC8 + .4byte 0x80379DD4 + .4byte 0x80379DD4 + .4byte 0x80379DE0 + .4byte 0x80379DE0 + .4byte 0x80379DE0 + .4byte 0x80379DBC + .4byte 0x80379DE0 + .4byte 0x80379DE0 + .4byte 0x80379DE0 + .4byte 0x80379DE0 + .4byte 0x80379DE0 + .4byte 0x80379DE0 + .4byte 0x80379DE0 + .4byte 0x80379DE0 + .4byte 0x80379DC8 + .4byte 0x80379DC8 + .4byte 0x80379DE0 + .4byte 0x80379DD4 + .global lbl_803F0BD8 lbl_803F0BD8: - .incbin "baserom.dol", 0x3EDBD8, 0x40 - + # ROM: 0x3EDBD8 + .4byte 0x8037A00C + .4byte 0x8037A020 + .4byte 0x8037A020 + .4byte 0x8037A034 + .4byte 0x8037A034 + .4byte 0x8037A034 + .4byte 0x8037A048 + .4byte 0x8037A070 + .4byte 0x8037A00C + .4byte 0x8037A020 + .4byte 0x8037A034 + .4byte 0x8037A070 + .4byte 0x8037A070 + .4byte 0x8037A070 + .4byte 0x8037A05C + .4byte 0 + + .section .text, "ax" .global GXGetTexBufferSize @@ -77,7 +260,7 @@ GXGetTexBufferSize: /* 80379C58 00376BB8 54 A0 10 3A */ slwi r0, r5, 2 /* 80379C5C 00376BBC 7C 08 00 2E */ lwzx r0, r8, r0 /* 80379C60 00376BC0 7C 09 03 A6 */ mtctr r0 -/* 80379C64 00376BC4 4E 80 04 20 */ bctr +/* 80379C64 00376BC4 4E 80 04 20 */ bctr /* 80379C68 00376BC8 38 00 00 03 */ li r0, 3 /* 80379C6C 00376BCC 39 00 00 03 */ li r8, 3 /* 80379C70 00376BD0 48 00 00 24 */ b lbl_80379C94 @@ -167,7 +350,7 @@ lbl_80379D8C: /* 80379D8C 00376CEC 7F E3 FB 78 */ mr r3, r31 /* 80379D90 00376CF0 83 E1 00 24 */ lwz r31, 0x24(r1) /* 80379D94 00376CF4 38 21 00 28 */ addi r1, r1, 0x28 -/* 80379D98 00376CF8 4E 80 00 20 */ blr +/* 80379D98 00376CF8 4E 80 00 20 */ blr .global __GetImageTileCount __GetImageTileCount: @@ -178,7 +361,7 @@ __GetImageTileCount: /* 80379DAC 00376D0C 54 60 10 3A */ slwi r0, r3, 2 /* 80379DB0 00376D10 7C 09 00 2E */ lwzx r0, r9, r0 /* 80379DB4 00376D14 7C 09 03 A6 */ mtctr r0 -/* 80379DB8 00376D18 4E 80 04 20 */ bctr +/* 80379DB8 00376D18 4E 80 04 20 */ bctr /* 80379DBC 00376D1C 39 60 00 03 */ li r11, 3 /* 80379DC0 00376D20 39 80 00 03 */ li r12, 3 /* 80379DC4 00376D24 48 00 00 24 */ b lbl_80379DE8 @@ -227,7 +410,7 @@ lbl_80379E58: /* 80379E58 00376DB8 38 00 00 01 */ li r0, 1 lbl_80379E5C: /* 80379E5C 00376DBC 90 08 00 00 */ stw r0, 0(r8) -/* 80379E60 00376DC0 4E 80 00 20 */ blr +/* 80379E60 00376DC0 4E 80 00 20 */ blr .global GXInitTexObj GXInitTexObj: @@ -342,7 +525,7 @@ lbl_80379F8C: /* 80379FFC 00376F5C 54 E0 10 3A */ slwi r0, r7, 2 /* 8037A000 00376F60 7C 05 00 2E */ lwzx r0, r5, r0 /* 8037A004 00376F64 7C 09 03 A6 */ mtctr r0 -/* 8037A008 00376F68 4E 80 04 20 */ bctr +/* 8037A008 00376F68 4E 80 04 20 */ bctr /* 8037A00C 00376F6C 38 00 00 01 */ li r0, 1 /* 8037A010 00376F70 98 1F 00 1E */ stb r0, 0x1e(r31) /* 8037A014 00376F74 38 00 00 03 */ li r0, 3 @@ -395,7 +578,7 @@ lbl_8037A080: /* 8037A0C8 00377028 BB 01 00 40 */ lmw r24, 0x40(r1) /* 8037A0CC 0037702C 38 21 00 60 */ addi r1, r1, 0x60 /* 8037A0D0 00377030 7C 08 03 A6 */ mtlr r0 -/* 8037A0D4 00377034 4E 80 00 20 */ blr +/* 8037A0D4 00377034 4E 80 00 20 */ blr .global GXInitTexObjCI GXInitTexObjCI: @@ -416,7 +599,7 @@ GXInitTexObjCI: /* 8037A110 00377070 83 C1 00 28 */ lwz r30, 0x28(r1) /* 8037A114 00377074 38 21 00 30 */ addi r1, r1, 0x30 /* 8037A118 00377078 7C 08 03 A6 */ mtlr r0 -/* 8037A11C 0037707C 4E 80 00 20 */ blr +/* 8037A11C 0037707C 4E 80 00 20 */ blr .global GXInitTexObjLOD GXInitTexObjLOD: @@ -530,7 +713,7 @@ lbl_8037A278: /* 8037A2A4 00377204 50 04 44 2E */ rlwimi r4, r0, 8, 0x10, 0x17 /* 8037A2A8 00377208 90 83 00 04 */ stw r4, 4(r3) /* 8037A2AC 0037720C 38 21 00 38 */ addi r1, r1, 0x38 -/* 8037A2B0 00377210 4E 80 00 20 */ blr +/* 8037A2B0 00377210 4E 80 00 20 */ blr .global GXInitTexObjData GXInitTexObjData: @@ -539,7 +722,7 @@ GXInitTexObjData: /* 8037A2BC 0037721C 54 A4 00 14 */ rlwinm r4, r5, 0, 0, 0xa /* 8037A2C0 00377220 7C 80 03 78 */ or r0, r4, r0 /* 8037A2C4 00377224 90 03 00 0C */ stw r0, 0xc(r3) -/* 8037A2C8 00377228 4E 80 00 20 */ blr +/* 8037A2C8 00377228 4E 80 00 20 */ blr .global GXInitTexObjWrapMode GXInitTexObjWrapMode: @@ -552,12 +735,12 @@ GXInitTexObjWrapMode: /* 8037A2E4 00377244 54 84 07 B6 */ rlwinm r4, r4, 0, 0x1e, 0x1b /* 8037A2E8 00377248 7C 80 03 78 */ or r0, r4, r0 /* 8037A2EC 0037724C 90 03 00 00 */ stw r0, 0(r3) -/* 8037A2F0 00377250 4E 80 00 20 */ blr +/* 8037A2F0 00377250 4E 80 00 20 */ blr .global GXGetTexObjFmt GXGetTexObjFmt: /* 8037A2F4 00377254 80 63 00 14 */ lwz r3, 0x14(r3) -/* 8037A2F8 00377258 4E 80 00 20 */ blr +/* 8037A2F8 00377258 4E 80 00 20 */ blr .global GXLoadTexObjPreLoaded GXLoadTexObjPreLoaded: @@ -633,7 +816,7 @@ GXLoadTexObjPreLoaded: /* 8037A410 00377370 80 7C 00 18 */ lwz r3, 0x18(r28) /* 8037A414 00377374 81 84 04 14 */ lwz r12, 0x414(r4) /* 8037A418 00377378 7D 88 03 A6 */ mtlr r12 -/* 8037A41C 0037737C 4E 80 00 21 */ blrl +/* 8037A41C 0037737C 4E 80 00 21 */ blrl /* 8037A420 00377380 38 8D 9F 50 */ addi r4, r13, lbl_805A8B10@sda21 /* 8037A424 00377384 80 A3 00 04 */ lwz r5, 4(r3) /* 8037A428 00377388 7C 04 E8 AE */ lbzx r0, r4, r29 @@ -663,7 +846,7 @@ lbl_8037A444: /* 8037A484 003773E4 83 81 00 18 */ lwz r28, 0x18(r1) /* 8037A488 003773E8 38 21 00 28 */ addi r1, r1, 0x28 /* 8037A48C 003773EC 7C 08 03 A6 */ mtlr r0 -/* 8037A490 003773F0 4E 80 00 20 */ blr +/* 8037A490 003773F0 4E 80 00 20 */ blr .global GXLoadTexObj GXLoadTexObj: @@ -677,7 +860,7 @@ GXLoadTexObj: /* 8037A4B0 00377410 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) /* 8037A4B4 00377414 81 85 04 10 */ lwz r12, 0x410(r5) /* 8037A4B8 00377418 7D 88 03 A6 */ mtlr r12 -/* 8037A4BC 0037741C 4E 80 00 21 */ blrl +/* 8037A4BC 0037741C 4E 80 00 21 */ blrl /* 8037A4C0 00377420 38 83 00 00 */ addi r4, r3, 0 /* 8037A4C4 00377424 38 7E 00 00 */ addi r3, r30, 0 /* 8037A4C8 00377428 38 BF 00 00 */ addi r5, r31, 0 @@ -687,7 +870,7 @@ GXLoadTexObj: /* 8037A4D8 00377438 83 C1 00 10 */ lwz r30, 0x10(r1) /* 8037A4DC 0037743C 38 21 00 18 */ addi r1, r1, 0x18 /* 8037A4E0 00377440 7C 08 03 A6 */ mtlr r0 -/* 8037A4E4 00377444 4E 80 00 20 */ blr +/* 8037A4E4 00377444 4E 80 00 20 */ blr .global GXInitTlutObj GXInitTlutObj: @@ -708,7 +891,7 @@ GXInitTlutObj: /* 8037A520 00377480 64 00 64 00 */ oris r0, r0, 0x6400 /* 8037A524 00377484 90 03 00 04 */ stw r0, 4(r3) /* 8037A528 00377488 B0 C3 00 08 */ sth r6, 8(r3) -/* 8037A52C 0037748C 4E 80 00 20 */ blr +/* 8037A52C 0037748C 4E 80 00 20 */ blr .global GXLoadTlut GXLoadTlut: @@ -722,7 +905,7 @@ GXLoadTlut: /* 8037A54C 003774AC 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) /* 8037A550 003774B0 81 85 04 14 */ lwz r12, 0x414(r5) /* 8037A554 003774B4 7D 88 03 A6 */ mtlr r12 -/* 8037A558 003774B8 4E 80 00 21 */ blrl +/* 8037A558 003774B8 4E 80 00 21 */ blrl /* 8037A55C 003774BC 7C 7F 1B 78 */ mr r31, r3 /* 8037A560 003774C0 48 00 0E 95 */ bl __GXFlushTextureState /* 8037A564 003774C4 38 80 00 61 */ li r4, 0x61 @@ -750,7 +933,7 @@ GXLoadTlut: /* 8037A5BC 0037751C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8037A5C0 00377520 38 21 00 20 */ addi r1, r1, 0x20 /* 8037A5C4 00377524 7C 08 03 A6 */ mtlr r0 -/* 8037A5C8 00377528 4E 80 00 20 */ blr +/* 8037A5C8 00377528 4E 80 00 20 */ blr .global GXInitTexCacheRegion GXInitTexCacheRegion: @@ -836,7 +1019,7 @@ lbl_8037A698: /* 8037A6DC 0037763C 90 A3 00 04 */ stw r5, 4(r3) /* 8037A6E0 00377640 98 83 00 0C */ stb r4, 0xc(r3) /* 8037A6E4 00377644 98 03 00 0D */ stb r0, 0xd(r3) -/* 8037A6E8 00377648 4E 80 00 20 */ blr +/* 8037A6E8 00377648 4E 80 00 20 */ blr .global GXInitTlutRegion GXInitTlutRegion: @@ -857,7 +1040,7 @@ GXInitTlutRegion: /* 8037A724 00377684 54 00 02 3E */ clrlwi r0, r0, 8 /* 8037A728 00377688 64 00 65 00 */ oris r0, r0, 0x6500 /* 8037A72C 0037768C 90 03 00 00 */ stw r0, 0(r3) -/* 8037A730 00377690 4E 80 00 20 */ blr +/* 8037A730 00377690 4E 80 00 20 */ blr .global GXInvalidateTexRegion GXInvalidateTexRegion: @@ -935,7 +1118,7 @@ lbl_8037A820: /* 8037A830 00377790 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8037A834 00377794 38 21 00 20 */ addi r1, r1, 0x20 /* 8037A838 00377798 7C 08 03 A6 */ mtlr r0 -/* 8037A83C 0037779C 4E 80 00 20 */ blr +/* 8037A83C 0037779C 4E 80 00 20 */ blr .global GXInvalidateTexAll GXInvalidateTexAll: @@ -956,7 +1139,7 @@ GXInvalidateTexAll: /* 8037A878 003777D8 80 01 00 0C */ lwz r0, 0xc(r1) /* 8037A87C 003777DC 38 21 00 08 */ addi r1, r1, 8 /* 8037A880 003777E0 7C 08 03 A6 */ mtlr r0 -/* 8037A884 003777E4 4E 80 00 20 */ blr +/* 8037A884 003777E4 4E 80 00 20 */ blr .global GXSetTexRegionCallback GXSetTexRegionCallback: @@ -964,7 +1147,7 @@ GXSetTexRegionCallback: /* 8037A88C 003777EC 84 04 04 10 */ lwzu r0, 0x410(r4) /* 8037A890 003777F0 90 64 00 00 */ stw r3, 0(r4) /* 8037A894 003777F4 7C 03 03 78 */ mr r3, r0 -/* 8037A898 003777F8 4E 80 00 20 */ blr +/* 8037A898 003777F8 4E 80 00 20 */ blr .global GXSetTlutRegionCallback GXSetTlutRegionCallback: @@ -972,7 +1155,7 @@ GXSetTlutRegionCallback: /* 8037A8A0 00377800 84 04 04 14 */ lwzu r0, 0x414(r4) /* 8037A8A4 00377804 90 64 00 00 */ stw r3, 0(r4) /* 8037A8A8 00377808 7C 03 03 78 */ mr r3, r0 -/* 8037A8AC 0037780C 4E 80 00 20 */ blr +/* 8037A8AC 0037780C 4E 80 00 20 */ blr .global GXSetTexCoordCylWrap GXSetTexCoordCylWrap: @@ -985,7 +1168,7 @@ GXSetTexCoordCylWrap: /* 8037A8C8 00377828 7C 80 18 30 */ slw r0, r4, r3 /* 8037A8CC 0037782C 7C E0 03 78 */ or r0, r7, r0 /* 8037A8D0 00377830 90 08 04 DC */ stw r0, 0x4dc(r8) -/* 8037A8D4 00377834 4D 82 00 20 */ beqlr +/* 8037A8D4 00377834 4D 82 00 20 */ beqlr /* 8037A8D8 00377838 54 67 10 3A */ slwi r7, r3, 2 /* 8037A8DC 0037783C 7C 88 3A 14 */ add r4, r8, r7 /* 8037A8E0 00377840 80 64 00 B8 */ lwz r3, 0xb8(r4) @@ -1010,7 +1193,7 @@ GXSetTexCoordCylWrap: /* 8037A92C 0037788C 80 64 00 D8 */ lwz r3, 0xd8(r4) /* 8037A930 00377890 90 65 80 00 */ stw r3, 0xCC008000@l(r5) /* 8037A934 00377894 B0 08 00 02 */ sth r0, 2(r8) -/* 8037A938 00377898 4E 80 00 20 */ blr +/* 8037A938 00377898 4E 80 00 20 */ blr .global GXSetTexCoordBias GXSetTexCoordBias: @@ -1032,7 +1215,7 @@ GXSetTexCoordBias: /* 8037A978 003778D8 90 6A 00 D8 */ stw r3, 0xd8(r10) /* 8037A97C 003778DC 80 67 04 DC */ lwz r3, 0x4dc(r7) /* 8037A980 003778E0 7C 60 00 39 */ and. r0, r3, r0 -/* 8037A984 003778E4 4D 82 00 20 */ beqlr +/* 8037A984 003778E4 4D 82 00 20 */ beqlr /* 8037A988 003778E8 38 C0 00 61 */ li r6, 0x61 /* 8037A98C 003778EC 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 8037A990 003778F0 98 C5 80 00 */ stb r6, 0xCC008000@l(r5) @@ -1044,7 +1227,7 @@ GXSetTexCoordBias: /* 8037A9A8 00377908 80 64 00 D8 */ lwz r3, 0xd8(r4) /* 8037A9AC 0037790C 90 65 80 00 */ stw r3, 0xCC008000@l(r5) /* 8037A9B0 00377910 B0 07 00 02 */ sth r0, 2(r7) -/* 8037A9B4 00377914 4E 80 00 20 */ blr +/* 8037A9B4 00377914 4E 80 00 20 */ blr .global __SetSURegs __SetSURegs: @@ -1093,7 +1276,7 @@ __SetSURegs: /* 8037AA60 003779C0 80 64 00 D8 */ lwz r3, 0xd8(r4) /* 8037AA64 003779C4 90 66 80 00 */ stw r3, 0xCC008000@l(r6) /* 8037AA68 003779C8 B0 05 00 02 */ sth r0, 2(r5) -/* 8037AA6C 003779CC 4E 80 00 20 */ blr +/* 8037AA6C 003779CC 4E 80 00 20 */ blr .global __GXSetSUTexRegs __GXSetSUTexRegs: @@ -1206,7 +1389,7 @@ lbl_8037ABD8: /* 8037ABDC 00377B3C 80 01 00 2C */ lwz r0, 0x2c(r1) /* 8037ABE0 00377B40 38 21 00 28 */ addi r1, r1, 0x28 /* 8037ABE4 00377B44 7C 08 03 A6 */ mtlr r0 -/* 8037ABE8 00377B48 4E 80 00 20 */ blr +/* 8037ABE8 00377B48 4E 80 00 20 */ blr .global __GXSetTmemConfig __GXSetTmemConfig: @@ -1356,4 +1539,4 @@ lbl_8037AE1C: /* 8037AE1C 00377D7C 83 E1 00 14 */ lwz r31, 0x14(r1) /* 8037AE20 00377D80 83 C1 00 10 */ lwz r30, 0x10(r1) /* 8037AE24 00377D84 38 21 00 18 */ addi r1, r1, 0x18 -/* 8037AE28 00377D88 4E 80 00 20 */ blr +/* 8037AE28 00377D88 4E 80 00 20 */ blr diff --git a/asm/Dolphin/gx/GXTransform.s b/asm/Dolphin/gx/GXTransform.s index 0b849854..c2960afd 100644 --- a/asm/Dolphin/gx/GXTransform.s +++ b/asm/Dolphin/gx/GXTransform.s @@ -3,13 +3,20 @@ .section .sdata2 .global lbl_805AEBE8 lbl_805AEBE8: - .incbin "baserom.dol", 0x3FB488, 0x4 + # ROM: 0x3FB488 + .4byte 0x3F000000 + .global lbl_805AEBEC lbl_805AEBEC: - .incbin "baserom.dol", 0x3FB48C, 0x4 + # ROM: 0x3FB48C + .4byte 0x43AB0000 + .global lbl_805AEBF0 lbl_805AEBF0: - .incbin "baserom.dol", 0x3FB490, 0x8 + # ROM: 0x3FB490 + .4byte 0x4B7FFFFF + .4byte 0 + .section .text, "ax" @@ -62,7 +69,7 @@ lbl_8037C298: /* 8037C2E8 00379248 80 64 04 20 */ lwz r3, 0x420(r4) /* 8037C2EC 0037924C 90 65 80 00 */ stw r3, 0xCC008000@l(r5) /* 8037C2F0 00379250 B0 04 00 02 */ sth r0, 2(r4) -/* 8037C2F4 00379254 4E 80 00 20 */ blr +/* 8037C2F4 00379254 4E 80 00 20 */ blr .global GXSetProjectionv GXSetProjectionv: @@ -113,7 +120,7 @@ GXSetProjectionv: /* 8037C3A8 00379308 83 E1 00 14 */ lwz r31, 0x14(r1) /* 8037C3AC 0037930C 38 21 00 18 */ addi r1, r1, 0x18 /* 8037C3B0 00379310 7C 08 03 A6 */ mtlr r0 -/* 8037C3B4 00379314 4E 80 00 20 */ blr +/* 8037C3B4 00379314 4E 80 00 20 */ blr .global GXLoadPosMtxImm GXLoadPosMtxImm: @@ -136,7 +143,7 @@ GXLoadPosMtxImm: /* 8037C3F8 00379358 F0 44 00 00 */ psq_st f2, 0(r4), 0, qr0 /* 8037C3FC 0037935C F0 24 00 00 */ psq_st f1, 0(r4), 0, qr0 /* 8037C400 00379360 F0 04 00 00 */ psq_st f0, 0(r4), 0, qr0 -/* 8037C404 00379364 4E 80 00 20 */ blr +/* 8037C404 00379364 4E 80 00 20 */ blr .global GXLoadNrmMtxImm GXLoadNrmMtxImm: @@ -159,7 +166,7 @@ GXLoadNrmMtxImm: /* 8037C448 003793A8 D0 44 00 00 */ stfs f2, 0(r4) /* 8037C44C 003793AC F0 24 00 00 */ psq_st f1, 0(r4), 0, qr0 /* 8037C450 003793B0 D0 04 00 00 */ stfs f0, 0(r4) -/* 8037C454 003793B4 4E 80 00 20 */ blr +/* 8037C454 003793B4 4E 80 00 20 */ blr .global GXSetCurrentMtx GXSetCurrentMtx: @@ -176,7 +183,7 @@ GXSetCurrentMtx: /* 8037C480 003793E0 80 01 00 0C */ lwz r0, 0xc(r1) /* 8037C484 003793E4 38 21 00 08 */ addi r1, r1, 8 /* 8037C488 003793E8 7C 08 03 A6 */ mtlr r0 -/* 8037C48C 003793EC 4E 80 00 20 */ blr +/* 8037C48C 003793EC 4E 80 00 20 */ blr .global GXLoadTexMtxImm GXLoadTexMtxImm: @@ -218,7 +225,7 @@ lbl_8037C4C0: /* 8037C50C 0037946C F0 44 00 00 */ psq_st f2, 0(r4), 0, qr0 /* 8037C510 00379470 F0 24 00 00 */ psq_st f1, 0(r4), 0, qr0 /* 8037C514 00379474 F0 04 00 00 */ psq_st f0, 0(r4), 0, qr0 -/* 8037C518 00379478 4E 80 00 20 */ blr +/* 8037C518 00379478 4E 80 00 20 */ blr lbl_8037C51C: /* 8037C51C 0037947C 38 84 80 00 */ addi r4, r4, -32768 /* 8037C520 00379480 E0 63 00 00 */ psq_l f3, 0(r3), 0, qr0 @@ -229,7 +236,7 @@ lbl_8037C51C: /* 8037C534 00379494 F0 44 00 00 */ psq_st f2, 0(r4), 0, qr0 /* 8037C538 00379498 F0 24 00 00 */ psq_st f1, 0(r4), 0, qr0 /* 8037C53C 0037949C F0 04 00 00 */ psq_st f0, 0(r4), 0, qr0 -/* 8037C540 003794A0 4E 80 00 20 */ blr +/* 8037C540 003794A0 4E 80 00 20 */ blr .global GXSetViewportJitter GXSetViewportJitter: @@ -299,7 +306,7 @@ lbl_8037C5E4: /* 8037C638 00379598 CB 41 00 30 */ lfd f26, 0x30(r1) /* 8037C63C 0037959C 38 21 00 60 */ addi r1, r1, 0x60 /* 8037C640 003795A0 7C 08 03 A6 */ mtlr r0 -/* 8037C644 003795A4 4E 80 00 20 */ blr +/* 8037C644 003795A4 4E 80 00 20 */ blr .global GXSetViewport GXSetViewport: @@ -311,7 +318,7 @@ GXSetViewport: /* 8037C65C 003795BC 80 01 00 0C */ lwz r0, 0xc(r1) /* 8037C660 003795C0 38 21 00 08 */ addi r1, r1, 8 /* 8037C664 003795C4 7C 08 03 A6 */ mtlr r0 -/* 8037C668 003795C8 4E 80 00 20 */ blr +/* 8037C668 003795C8 4E 80 00 20 */ blr .global GXSetScissor GXSetScissor: @@ -350,7 +357,7 @@ GXSetScissor: /* 8037C6EC 0037964C 80 68 00 FC */ lwz r3, 0xfc(r8) /* 8037C6F0 00379650 90 64 80 00 */ stw r3, 0xCC008000@l(r4) /* 8037C6F4 00379654 B0 08 00 02 */ sth r0, 2(r8) -/* 8037C6F8 00379658 4E 80 00 20 */ blr +/* 8037C6F8 00379658 4E 80 00 20 */ blr .global GXSetScissorBoxOffset GXSetScissorBoxOffset: @@ -369,7 +376,7 @@ GXSetScissorBoxOffset: /* 8037C72C 0037968C 38 00 00 00 */ li r0, 0 /* 8037C730 00379690 90 A4 80 00 */ stw r5, 0xCC008000@l(r4) /* 8037C734 00379694 B0 03 00 02 */ sth r0, 2(r3) -/* 8037C738 00379698 4E 80 00 20 */ blr +/* 8037C738 00379698 4E 80 00 20 */ blr .global GXSetClipMode GXSetClipMode: @@ -382,7 +389,7 @@ GXSetClipMode: /* 8037C754 003796B4 90 A6 80 00 */ stw r5, 0xCC008000@l(r6) /* 8037C758 003796B8 90 66 80 00 */ stw r3, 0xCC008000@l(r6) /* 8037C75C 003796BC B0 04 00 02 */ sth r0, 2(r4) -/* 8037C760 003796C0 4E 80 00 20 */ blr +/* 8037C760 003796C0 4E 80 00 20 */ blr .global __GXSetMatrixIndex __GXSetMatrixIndex: @@ -420,5 +427,5 @@ lbl_8037C7D8: /* 8037C7D8 00379738 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) /* 8037C7DC 0037973C 38 00 00 01 */ li r0, 1 /* 8037C7E0 00379740 B0 03 00 02 */ sth r0, 2(r3) -/* 8037C7E4 00379744 4E 80 00 20 */ blr +/* 8037C7E4 00379744 4E 80 00 20 */ blr diff --git a/asm/Dolphin/mtx/mtx.s b/asm/Dolphin/mtx/mtx.s index eb69ee57..8574af13 100644 --- a/asm/Dolphin/mtx/mtx.s +++ b/asm/Dolphin/mtx/mtx.s @@ -4,16 +4,23 @@ .global lbl_805A8B20 lbl_805A8B20: - .incbin "baserom.dol", 0x3F64C0, 0x8 - + # ROM: 0x3F64C0 + .4byte 0 + .4byte 0x3F800000 + + .section .sdata2 .global lbl_805AEBF8 lbl_805AEBF8: - .incbin "baserom.dol", 0x3FB498, 0x4 + # ROM: 0x3FB498 + .4byte 0x3F800000 + .global lbl_805AEBFC lbl_805AEBFC: - .incbin "baserom.dol", 0x3FB49C, 0x4 - + # ROM: 0x3FB49C + .4byte 0 + + .section .text, "ax" .global PSMTXIdentity @@ -28,7 +35,7 @@ PSMTXIdentity: /* 8037D05C 00379FBC F0 43 00 10 */ psq_st f2, 16(r3), 0, qr0 /* 8037D060 00379FC0 F0 23 00 00 */ psq_st f1, 0(r3), 0, qr0 /* 8037D064 00379FC4 F0 23 00 28 */ psq_st f1, 40(r3), 0, qr0 -/* 8037D068 00379FC8 4E 80 00 20 */ blr +/* 8037D068 00379FC8 4E 80 00 20 */ blr .global PSMTXCopy PSMTXCopy: @@ -44,7 +51,7 @@ PSMTXCopy: /* 8037D090 00379FF0 F0 84 00 20 */ psq_st f4, 32(r4), 0, qr0 /* 8037D094 00379FF4 E0 A3 00 28 */ psq_l f5, 40(r3), 0, qr0 /* 8037D098 00379FF8 F0 A4 00 28 */ psq_st f5, 40(r4), 0, qr0 -/* 8037D09C 00379FFC 4E 80 00 20 */ blr +/* 8037D09C 00379FFC 4E 80 00 20 */ blr .global PSMTXConcat PSMTXConcat: @@ -98,7 +105,7 @@ PSMTXConcat: /* 8037D15C 0037A0BC F0 05 00 28 */ psq_st f0, 40(r5), 0, qr0 /* 8037D160 0037A0C0 CB E1 00 28 */ lfd f31, 0x28(r1) /* 8037D164 0037A0C4 38 21 00 40 */ addi r1, r1, 0x40 -/* 8037D168 0037A0C8 4E 80 00 20 */ blr +/* 8037D168 0037A0C8 4E 80 00 20 */ blr .global PSMTXInvXpose PSMTXInvXpose: @@ -130,7 +137,7 @@ PSMTXInvXpose: /* 8037D1D0 0037A130 10 07 08 40 */ ps_cmpo0 cr0, f7, f1 /* 8037D1D4 0037A134 40 82 00 0C */ bne lbl_8037D1E0 /* 8037D1D8 0037A138 38 60 00 00 */ li r3, 0 -/* 8037D1DC 0037A13C 4E 80 00 20 */ blr +/* 8037D1DC 0037A13C 4E 80 00 20 */ blr lbl_8037D1E0: /* 8037D1E0 0037A140 EC 00 38 30 */ fres f0, f7 /* 8037D1E4 0037A144 F0 24 80 0C */ psq_st f1, 12(r4), 1, qr0 @@ -152,7 +159,7 @@ lbl_8037D1E0: /* 8037D224 0037A184 38 60 00 01 */ li r3, 1 /* 8037D228 0037A188 F1 24 80 18 */ psq_st f9, 24(r4), 1, qr0 /* 8037D22C 0037A18C F1 04 80 28 */ psq_st f8, 40(r4), 1, qr0 -/* 8037D230 0037A190 4E 80 00 20 */ blr +/* 8037D230 0037A190 4E 80 00 20 */ blr .global PSMTXTrans PSMTXTrans: @@ -168,7 +175,7 @@ PSMTXTrans: /* 8037D258 0037A1B8 D0 83 00 28 */ stfs f4, 0x28(r3) /* 8037D25C 0037A1BC D0 63 00 2C */ stfs f3, 0x2c(r3) /* 8037D260 0037A1C0 D0 83 00 00 */ stfs f4, 0(r3) -/* 8037D264 0037A1C4 4E 80 00 20 */ blr +/* 8037D264 0037A1C4 4E 80 00 20 */ blr .global PSMTXScale PSMTXScale: @@ -181,7 +188,7 @@ PSMTXScale: /* 8037D280 0037A1E0 F0 03 00 20 */ psq_st f0, 32(r3), 0, qr0 /* 8037D284 0037A1E4 D0 63 00 28 */ stfs f3, 0x28(r3) /* 8037D288 0037A1E8 D0 03 00 2C */ stfs f0, 0x2c(r3) -/* 8037D28C 0037A1EC 4E 80 00 20 */ blr +/* 8037D28C 0037A1EC 4E 80 00 20 */ blr .global PSMTXScaleApply PSMTXScaleApply: @@ -206,7 +213,7 @@ PSMTXScaleApply: /* 8037D2D8 0037A238 F0 E4 00 18 */ psq_st f7, 24(r4), 0, qr0 /* 8037D2DC 0037A23C F1 04 00 20 */ psq_st f8, 32(r4), 0, qr0 /* 8037D2E0 0037A240 F0 44 00 28 */ psq_st f2, 40(r4), 0, qr0 -/* 8037D2E4 0037A244 4E 80 00 20 */ blr +/* 8037D2E4 0037A244 4E 80 00 20 */ blr .global C_MTXLookAt C_MTXLookAt: @@ -308,5 +315,5 @@ C_MTXLookAt: /* 8037D464 0037A3C4 83 A1 00 44 */ lwz r29, 0x44(r1) /* 8037D468 0037A3C8 38 21 00 50 */ addi r1, r1, 0x50 /* 8037D46C 0037A3CC 7C 08 03 A6 */ mtlr r0 -/* 8037D470 0037A3D0 4E 80 00 20 */ blr +/* 8037D470 0037A3D0 4E 80 00 20 */ blr diff --git a/asm/Dolphin/mtx/mtx44.s b/asm/Dolphin/mtx/mtx44.s index 96388308..832c0768 100644 --- a/asm/Dolphin/mtx/mtx44.s +++ b/asm/Dolphin/mtx/mtx44.s @@ -3,16 +3,24 @@ .section .sdata2 .global lbl_805AEC00 lbl_805AEC00: - .incbin "baserom.dol", 0x3FB4A0, 0x4 + # ROM: 0x3FB4A0 + .4byte 0x3F800000 + .global lbl_805AEC04 lbl_805AEC04: - .incbin "baserom.dol", 0x3FB4A4, 0x4 + # ROM: 0x3FB4A4 + .4byte 0x40000000 + .global lbl_805AEC08 lbl_805AEC08: - .incbin "baserom.dol", 0x3FB4A8, 0x4 + # ROM: 0x3FB4A8 + .4byte 0 + .global lbl_805AEC0C lbl_805AEC0C: - .incbin "baserom.dol", 0x3FB4AC, 0x4 + # ROM: 0x3FB4AC + .4byte 0xBF800000 + .section .text, "ax" @@ -56,7 +64,7 @@ C_MTXFrustum: /* 8037D5A8 0037A508 C0 02 CE EC */ lfs f0, lbl_805AEC0C@sda21(r2) /* 8037D5AC 0037A50C D0 03 00 38 */ stfs f0, 0x38(r3) /* 8037D5B0 0037A510 D0 83 00 3C */ stfs f4, 0x3c(r3) -/* 8037D5B4 0037A514 4E 80 00 20 */ blr +/* 8037D5B4 0037A514 4E 80 00 20 */ blr .global C_MTXOrtho C_MTXOrtho: @@ -97,4 +105,4 @@ C_MTXOrtho: /* 8037D640 0037A5A0 D0 63 00 34 */ stfs f3, 0x34(r3) /* 8037D644 0037A5A4 D0 63 00 38 */ stfs f3, 0x38(r3) /* 8037D648 0037A5A8 D1 23 00 3C */ stfs f9, 0x3c(r3) -/* 8037D64C 0037A5AC 4E 80 00 20 */ blr +/* 8037D64C 0037A5AC 4E 80 00 20 */ blr diff --git a/asm/Dolphin/mtx/mtx44vec.s b/asm/Dolphin/mtx/mtx44vec.s index e4eb16d9..8d281774 100644 --- a/asm/Dolphin/mtx/mtx44vec.s +++ b/asm/Dolphin/mtx/mtx44vec.s @@ -24,7 +24,7 @@ PSMTXMultVec: /* 8037D4B8 0037A418 10 A3 20 7A */ ps_madd f5, f3, f1, f4 /* 8037D4BC 0037A41C 10 C5 29 94 */ ps_sum0 f6, f5, f6, f5 /* 8037D4C0 0037A420 F0 C5 80 08 */ psq_st f6, 8(r5), 1, qr0 -/* 8037D4C4 0037A424 4E 80 00 20 */ blr +/* 8037D4C4 0037A424 4E 80 00 20 */ blr .global PSMTXMultVecSR PSMTXMultVecSR: @@ -48,4 +48,4 @@ PSMTXMultVecSR: /* 8037D50C 0037A46C F1 65 80 04 */ psq_st f11, 4(r5), 1, qr0 /* 8037D510 0037A470 11 A5 61 FA */ ps_madd f13, f5, f7, f12 /* 8037D514 0037A474 F1 A5 80 08 */ psq_st f13, 8(r5), 1, qr0 -/* 8037D518 0037A478 4E 80 00 20 */ blr +/* 8037D518 0037A478 4E 80 00 20 */ blr diff --git a/asm/Dolphin/mtx/psmtx.s b/asm/Dolphin/mtx/psmtx.s index a7f1c23b..600f1e73 100644 --- a/asm/Dolphin/mtx/psmtx.s +++ b/asm/Dolphin/mtx/psmtx.s @@ -22,4 +22,4 @@ PSMTXReorder: /* 8037D70C 0037A66C F1 04 00 18 */ psq_st f8, 24(r4), 0, qr0 /* 8037D710 0037A670 F1 24 00 20 */ psq_st f9, 32(r4), 0, qr0 /* 8037D714 0037A674 F1 44 00 28 */ psq_st f10, 40(r4), 0, qr0 -/* 8037D718 0037A678 4E 80 00 20 */ blr +/* 8037D718 0037A678 4E 80 00 20 */ blr diff --git a/asm/Dolphin/mtx/vec.s b/asm/Dolphin/mtx/vec.s index 4d8716f1..e94dfa02 100644 --- a/asm/Dolphin/mtx/vec.s +++ b/asm/Dolphin/mtx/vec.s @@ -3,11 +3,15 @@ .section .sdata2 .global lbl_805AEC10 lbl_805AEC10: - .incbin "baserom.dol", 0x3FB4B0, 0x4 + # ROM: 0x3FB4B0 + .4byte 0x3F000000 + .global lbl_805AEC14 lbl_805AEC14: - .incbin "baserom.dol", 0x3FB4B4, 0x4 - + # ROM: 0x3FB4B4 + .4byte 0x40400000 + + .section .text, "ax" .global C_VECNormalize @@ -28,7 +32,7 @@ C_VECNormalize: /* 8037D684 0037A5E4 F0 44 00 00 */ psq_st f2, 0(r4), 0, qr0 /* 8037D688 0037A5E8 10 63 01 58 */ ps_muls0 f3, f3, f5 /* 8037D68C 0037A5EC F0 64 80 08 */ psq_st f3, 8(r4), 1, qr0 -/* 8037D690 0037A5F0 4E 80 00 20 */ blr +/* 8037D690 0037A5F0 4E 80 00 20 */ blr .global C_VECCrossProduct C_VECCrossProduct: @@ -46,5 +50,5 @@ C_VECCrossProduct: /* 8037D6C0 0037A620 F1 25 80 00 */ psq_st f9, 0(r5), 1, qr0 /* 8037D6C4 0037A624 11 40 50 50 */ ps_neg f10, f10 /* 8037D6C8 0037A628 F1 45 00 04 */ psq_st f10, 4(r5), 0, qr0 -/* 8037D6CC 0037A62C 4E 80 00 20 */ blr +/* 8037D6CC 0037A62C 4E 80 00 20 */ blr diff --git a/asm/Dolphin/os/OS.s b/asm/Dolphin/os/OS.s index 95294567..615c9db4 100644 --- a/asm/Dolphin/os/OS.s +++ b/asm/Dolphin/os/OS.s @@ -36,7 +36,7 @@ __OSInIPL: .global __OSStartTime __OSStartTime: .skip 0x8 - + .section .data .global lbl_803F0DA0 lbl_803F0DA0: @@ -94,13 +94,13 @@ __OSExceptionLocations: .balign 4 .asciz "Exceptions initialized...\n" .balign 4 - + .section .sdata .global lbl_805A8B28 lbl_805A8B28: .4byte lbl_803F0DA0 - + .global lbl_805A8B2C lbl_805A8B2C: .asciz "%s\n" @@ -121,7 +121,7 @@ lbl_8037D734: /* 8037D738 0037A698 38 63 00 02 */ addi r3, r3, 0x10000002@l /* 8037D73C 0037A69C 48 00 00 04 */ b lbl_8037D740 lbl_8037D740: -/* 8037D740 0037A6A0 4E 80 00 20 */ blr +/* 8037D740 0037A6A0 4E 80 00 20 */ blr .global ClearArena ClearArena: @@ -202,7 +202,7 @@ lbl_8037D858: /* 8037D85C 0037A7BC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8037D860 0037A7C0 38 21 00 10 */ addi r1, r1, 0x10 /* 8037D864 0037A7C4 7C 08 03 A6 */ mtlr r0 -/* 8037D868 0037A7C8 4E 80 00 20 */ blr +/* 8037D868 0037A7C8 4E 80 00 20 */ blr .global InquiryCallback InquiryCallback: @@ -223,7 +223,7 @@ lbl_8037D898: /* 8037D89C 0037A7FC 3C 60 80 00 */ lis r3, 0x800030E6@ha /* 8037D8A0 0037A800 B0 03 30 E6 */ sth r0, 0x800030E6@l(r3) lbl_8037d8a4: -/* 8037D8A4 0037A804 4E 80 00 20 */ blr +/* 8037D8A4 0037A804 4E 80 00 20 */ blr .global OSInit OSInit: @@ -468,7 +468,7 @@ lbl_8037DC04: /* 8037DC10 0037AB70 83 A1 00 0C */ lwz r29, 0xc(r1) /* 8037DC14 0037AB74 38 21 00 18 */ addi r1, r1, 0x18 /* 8037DC18 0037AB78 7C 08 03 A6 */ mtlr r0 -/* 8037DC1C 0037AB7C 4E 80 00 20 */ blr +/* 8037DC1C 0037AB7C 4E 80 00 20 */ blr .global OSExceptionInit OSExceptionInit: @@ -648,7 +648,7 @@ lbl_8037DE70: /* 8037DE90 0037ADF0 80 01 00 3C */ lwz r0, 0x3c(r1) /* 8037DE94 0037ADF4 38 21 00 38 */ addi r1, r1, 0x38 /* 8037DE98 0037ADF8 7C 08 03 A6 */ mtlr r0 -/* 8037DE9C 0037ADFC 4E 80 00 20 */ blr +/* 8037DE9C 0037ADFC 4E 80 00 20 */ blr .global __OSDBIntegrator __OSDBIntegrator: @@ -660,7 +660,7 @@ __OSDBIntegrator: /* 8037DEB4 0037AE14 7C 68 03 A6 */ mtlr r3 /* 8037DEB8 0037AE18 38 60 00 30 */ li r3, 0x30 /* 8037DEBC 0037AE1C 7C 60 01 24 */ mtmsr r3 -/* 8037DEC0 0037AE20 4E 80 00 20 */ blr +/* 8037DEC0 0037AE20 4E 80 00 20 */ blr .global __OSDBJump __OSDBJump: @@ -678,7 +678,7 @@ __OSSetExceptionHandler: /* 8037DED4 0037AE34 7C A3 02 14 */ add r5, r3, r0 /* 8037DED8 0037AE38 80 65 00 00 */ lwz r3, 0(r5) /* 8037DEDC 0037AE3C 90 85 00 00 */ stw r4, 0(r5) -/* 8037DEE0 0037AE40 4E 80 00 20 */ blr +/* 8037DEE0 0037AE40 4E 80 00 20 */ blr .global __OSGetExceptionHandler __OSGetExceptionHandler: @@ -686,7 +686,7 @@ __OSGetExceptionHandler: /* 8037DEE8 0037AE48 80 6D AC D4 */ lwz r3, OSExceptionTable@sda21(r13) /* 8037DEEC 0037AE4C 54 00 10 3A */ slwi r0, r0, 2 /* 8037DEF0 0037AE50 7C 63 00 2E */ lwzx r3, r3, r0 -/* 8037DEF4 0037AE54 4E 80 00 20 */ blr +/* 8037DEF4 0037AE54 4E 80 00 20 */ blr .global OSExceptionVector OSExceptionVector: @@ -713,7 +713,7 @@ OSExceptionVector: /* 8037DF48 0037AEA8 90 64 01 9C */ stw r3, 0x19c(r4) /* 8037DF4C 0037AEAC 7C 65 1B 78 */ mr r5, r3 __DBVECTOR: -/* 8037DF50 0037AEB0 60 00 00 00 */ nop +/* 8037DF50 0037AEB0 60 00 00 00 */ nop /* 8037DF54 0037AEB4 7C 60 00 A6 */ mfmsr r3 /* 8037DF58 0037AEB8 60 63 00 30 */ ori r3, r3, 0x30 /* 8037DF5C 0037AEBC 7C 7B 03 A6 */ mtspr 0x1b, r3 @@ -725,12 +725,12 @@ lbl_8037DF60: /* 8037DF70 0037AED0 3C A0 80 38 */ lis r5, OSDefaultExceptionHandler@ha /* 8037DF74 0037AED4 38 A5 DF 94 */ addi r5, r5, OSDefaultExceptionHandler@l /* 8037DF78 0037AED8 7C BA 03 A6 */ mtspr 0x1a, r5 -/* 8037DF7C 0037AEDC 4C 00 00 64 */ rfi +/* 8037DF7C 0037AEDC 4C 00 00 64 */ rfi lbl_8037DF80: /* 8037DF80 0037AEE0 54 65 15 BA */ rlwinm r5, r3, 2, 0x16, 0x1d /* 8037DF84 0037AEE4 80 A5 30 00 */ lwz r5, 0x3000(r5) /* 8037DF88 0037AEE8 7C BA 03 A6 */ mtspr 0x1a, r5 -/* 8037DF8C 0037AEEC 4C 00 00 64 */ rfi +/* 8037DF8C 0037AEEC 4C 00 00 64 */ rfi lbl_8037DF90: /* 8037DF90 0037AEF0 60 00 00 00 */ nop @@ -774,7 +774,7 @@ __OSPSInit: /* 8037E014 0037AF74 80 01 00 0C */ lwz r0, 0xc(r1) /* 8037E018 0037AF78 38 21 00 08 */ addi r1, r1, 8 /* 8037E01C 0037AF7C 7C 08 03 A6 */ mtlr r0 -/* 8037E020 0037AF80 4E 80 00 20 */ blr +/* 8037E020 0037AF80 4E 80 00 20 */ blr .global __OSGetDIConfig __OSGetDIConfig: @@ -782,7 +782,7 @@ __OSGetDIConfig: /* 8037E028 0037AF88 38 63 60 00 */ addi r3, r3, 0xCC006000@l /* 8037E02C 0037AF8C 80 03 00 24 */ lwz r0, 0x24(r3) /* 8037E030 0037AF90 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 8037E034 0037AF94 4E 80 00 20 */ blr +/* 8037E034 0037AF94 4E 80 00 20 */ blr .global OSRegisterVersion OSRegisterVersion: @@ -796,4 +796,4 @@ OSRegisterVersion: /* 8037E054 0037AFB4 80 01 00 0C */ lwz r0, 0xc(r1) /* 8037E058 0037AFB8 38 21 00 08 */ addi r1, r1, 8 /* 8037E05C 0037AFBC 7C 08 03 A6 */ mtlr r0 -/* 8037E060 0037AFC0 4E 80 00 20 */ blr +/* 8037E060 0037AFC0 4E 80 00 20 */ blr diff --git a/asm/Dolphin/os/OSAlarm.s b/asm/Dolphin/os/OSAlarm.s index f7eb61f4..124cb4d0 100644 --- a/asm/Dolphin/os/OSAlarm.s +++ b/asm/Dolphin/os/OSAlarm.s @@ -28,14 +28,14 @@ lbl_8037E0A0: /* 8037E0A0 0037B000 80 01 00 0C */ lwz r0, 0xc(r1) /* 8037E0A4 0037B004 38 21 00 08 */ addi r1, r1, 8 /* 8037E0A8 0037B008 7C 08 03 A6 */ mtlr r0 -/* 8037E0AC 0037B00C 4E 80 00 20 */ blr +/* 8037E0AC 0037B00C 4E 80 00 20 */ blr .global OSCreateAlarm OSCreateAlarm: /* 8037E0B0 0037B010 38 00 00 00 */ li r0, 0 /* 8037E0B4 0037B014 90 03 00 00 */ stw r0, 0(r3) /* 8037E0B8 0037B018 90 03 00 04 */ stw r0, 4(r3) -/* 8037E0BC 0037B01C 4E 80 00 20 */ blr +/* 8037E0BC 0037B01C 4E 80 00 20 */ blr .global InsertAlarm InsertAlarm: @@ -197,7 +197,7 @@ lbl_8037E2FC: /* 8037E300 0037B260 80 01 00 44 */ lwz r0, 0x44(r1) /* 8037E304 0037B264 38 21 00 40 */ addi r1, r1, 0x40 /* 8037E308 0037B268 7C 08 03 A6 */ mtlr r0 -/* 8037E30C 0037B26C 4E 80 00 20 */ blr +/* 8037E30C 0037B26C 4E 80 00 20 */ blr .global OSSetAlarm OSSetAlarm: @@ -226,7 +226,7 @@ OSSetAlarm: /* 8037E368 0037B2C8 80 01 00 3C */ lwz r0, 0x3c(r1) /* 8037E36C 0037B2CC 38 21 00 38 */ addi r1, r1, 0x38 /* 8037E370 0037B2D0 7C 08 03 A6 */ mtlr r0 -/* 8037E374 0037B2D4 4E 80 00 20 */ blr +/* 8037E374 0037B2D4 4E 80 00 20 */ blr .global OSSetPeriodicAlarm OSSetPeriodicAlarm: @@ -260,7 +260,7 @@ OSSetPeriodicAlarm: /* 8037E3E4 0037B344 80 01 00 44 */ lwz r0, 0x44(r1) /* 8037E3E8 0037B348 38 21 00 40 */ addi r1, r1, 0x40 /* 8037E3EC 0037B34C 7C 08 03 A6 */ mtlr r0 -/* 8037E3F0 0037B350 4E 80 00 20 */ blr +/* 8037E3F0 0037B350 4E 80 00 20 */ blr .global OSCancelAlarm OSCancelAlarm: @@ -342,7 +342,7 @@ lbl_8037E4F4: /* 8037E500 0037B460 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8037E504 0037B464 38 21 00 20 */ addi r1, r1, 0x20 /* 8037E508 0037B468 7C 08 03 A6 */ mtlr r0 -/* 8037E50C 0037B46C 4E 80 00 20 */ blr +/* 8037E50C 0037B46C 4E 80 00 20 */ blr .global DecrementerExceptionCallback DecrementerExceptionCallback: @@ -480,7 +480,7 @@ lbl_8037E6D8: /* 8037E6F0 0037B650 7D 88 03 A6 */ mtlr r12 /* 8037E6F4 0037B654 38 7F 00 00 */ addi r3, r31, 0 /* 8037E6F8 0037B658 38 9D 00 00 */ addi r4, r29, 0 -/* 8037E6FC 0037B65C 4E 80 00 21 */ blrl +/* 8037E6FC 0037B65C 4E 80 00 21 */ blrl /* 8037E700 0037B660 38 61 00 18 */ addi r3, r1, 0x18 /* 8037E704 0037B664 48 00 0F 11 */ bl OSClearContext /* 8037E708 0037B668 7F A3 EB 78 */ mr r3, r29 @@ -496,7 +496,7 @@ lbl_8037E6D8: /* 8037E730 0037B690 83 81 02 E0 */ lwz r28, 0x2e0(r1) /* 8037E734 0037B694 38 21 02 F0 */ addi r1, r1, 0x2f0 /* 8037E738 0037B698 7C 08 03 A6 */ mtlr r0 -/* 8037E73C 0037B69C 4E 80 00 20 */ blr +/* 8037E73C 0037B69C 4E 80 00 20 */ blr .global DecrementerExceptionHandler DecrementerExceptionHandler: diff --git a/asm/Dolphin/os/OSArena.s b/asm/Dolphin/os/OSArena.s index 6ffe20f3..a851d844 100644 --- a/asm/Dolphin/os/OSArena.s +++ b/asm/Dolphin/os/OSArena.s @@ -3,34 +3,37 @@ .section .sdata .global lbl_805A8B30 lbl_805A8B30: - .incbin "baserom.dol", 0x3F64D0, 0x8 + # ROM: 0x3F64D0 + .4byte 0xFFFFFFFF + .4byte 0 + .section .sbss .global lbl_805A98B8 lbl_805A98B8: .skip 0x8 - + .section .text, "ax" .global OSGetArenaHi OSGetArenaHi: /* 8037E790 0037B6F0 80 6D AC F8 */ lwz r3, lbl_805A98B8@sda21(r13) -/* 8037E794 0037B6F4 4E 80 00 20 */ blr +/* 8037E794 0037B6F4 4E 80 00 20 */ blr .global OSGetArenaLo OSGetArenaLo: /* 8037E798 0037B6F8 80 6D 9F 70 */ lwz r3, lbl_805A8B30@sda21(r13) -/* 8037E79C 0037B6FC 4E 80 00 20 */ blr +/* 8037E79C 0037B6FC 4E 80 00 20 */ blr .global OSSetArenaHi OSSetArenaHi: /* 8037E7A0 0037B700 90 6D AC F8 */ stw r3, lbl_805A98B8@sda21(r13) -/* 8037E7A4 0037B704 4E 80 00 20 */ blr +/* 8037E7A4 0037B704 4E 80 00 20 */ blr .global OSSetArenaLo OSSetArenaLo: /* 8037E7A8 0037B708 90 6D 9F 70 */ stw r3, lbl_805A8B30@sda21(r13) -/* 8037E7AC 0037B70C 4E 80 00 20 */ blr +/* 8037E7AC 0037B70C 4E 80 00 20 */ blr .global OSAllocFromArenaLo OSAllocFromArenaLo: @@ -44,6 +47,6 @@ OSAllocFromArenaLo: /* 8037E7CC 0037B72C 7C A0 00 38 */ and r0, r5, r0 /* 8037E7D0 0037B730 90 0D 9F 70 */ stw r0, lbl_805A8B30@sda21(r13) /* 8037E7D4 0037B734 7C C3 33 78 */ mr r3, r6 -/* 8037E7D8 0037B738 4E 80 00 20 */ blr +/* 8037E7D8 0037B738 4E 80 00 20 */ blr diff --git a/asm/Dolphin/os/OSCache.s b/asm/Dolphin/os/OSCache.s index ffa05bf5..1576f570 100644 --- a/asm/Dolphin/os/OSCache.s +++ b/asm/Dolphin/os/OSCache.s @@ -30,7 +30,7 @@ lbl_803F1028: .asciz "L2 cache initialized\n" .balign 4 .asciz "Locked cache machine check handler installed\n" - + .section .text, "ax" .global DCEnable @@ -39,12 +39,12 @@ DCEnable: /* 8037EA74 0037B9D4 7C 70 FA A6 */ mfspr r3, 0x3f0 /* 8037EA78 0037B9D8 60 63 40 00 */ ori r3, r3, 0x4000 /* 8037EA7C 0037B9DC 7C 70 FB A6 */ mtspr 0x3f0, r3 -/* 8037EA80 0037B9E0 4E 80 00 20 */ blr +/* 8037EA80 0037B9E0 4E 80 00 20 */ blr .global DCInvalidateRange DCInvalidateRange: /* 8037EA84 0037B9E4 28 04 00 00 */ cmplwi r4, 0 -/* 8037EA88 0037B9E8 4C 81 00 20 */ blelr +/* 8037EA88 0037B9E8 4C 81 00 20 */ blelr /* 8037EA8C 0037B9EC 54 65 06 FE */ clrlwi r5, r3, 0x1b /* 8037EA90 0037B9F0 7C 84 2A 14 */ add r4, r4, r5 /* 8037EA94 0037B9F4 38 84 00 1F */ addi r4, r4, 0x1f @@ -54,12 +54,12 @@ lbl_8037EAA0: /* 8037EAA0 0037BA00 7C 00 1B AC */ dcbi 0, r3 /* 8037EAA4 0037BA04 38 63 00 20 */ addi r3, r3, 0x20 /* 8037EAA8 0037BA08 42 00 FF F8 */ bdnz lbl_8037EAA0 -/* 8037EAAC 0037BA0C 4E 80 00 20 */ blr +/* 8037EAAC 0037BA0C 4E 80 00 20 */ blr .global DCFlushRange DCFlushRange: /* 8037EAB0 0037BA10 28 04 00 00 */ cmplwi r4, 0 -/* 8037EAB4 0037BA14 4C 81 00 20 */ blelr +/* 8037EAB4 0037BA14 4C 81 00 20 */ blelr /* 8037EAB8 0037BA18 54 65 06 FE */ clrlwi r5, r3, 0x1b /* 8037EABC 0037BA1C 7C 84 2A 14 */ add r4, r4, r5 /* 8037EAC0 0037BA20 38 84 00 1F */ addi r4, r4, 0x1f @@ -69,13 +69,13 @@ lbl_8037EACC: /* 8037EACC 0037BA2C 7C 00 18 AC */ dcbf 0, r3 /* 8037EAD0 0037BA30 38 63 00 20 */ addi r3, r3, 0x20 /* 8037EAD4 0037BA34 42 00 FF F8 */ bdnz lbl_8037EACC -/* 8037EAD8 0037BA38 44 00 00 02 */ sc -/* 8037EADC 0037BA3C 4E 80 00 20 */ blr +/* 8037EAD8 0037BA38 44 00 00 02 */ sc +/* 8037EADC 0037BA3C 4E 80 00 20 */ blr .global DCStoreRange DCStoreRange: /* 8037EAE0 0037BA40 28 04 00 00 */ cmplwi r4, 0 -/* 8037EAE4 0037BA44 4C 81 00 20 */ blelr +/* 8037EAE4 0037BA44 4C 81 00 20 */ blelr /* 8037EAE8 0037BA48 54 65 06 FE */ clrlwi r5, r3, 0x1b /* 8037EAEC 0037BA4C 7C 84 2A 14 */ add r4, r4, r5 /* 8037EAF0 0037BA50 38 84 00 1F */ addi r4, r4, 0x1f @@ -85,13 +85,13 @@ lbl_8037EAFC: /* 8037EAFC 0037BA5C 7C 00 18 6C */ dcbst 0, r3 /* 8037EB00 0037BA60 38 63 00 20 */ addi r3, r3, 0x20 /* 8037EB04 0037BA64 42 00 FF F8 */ bdnz lbl_8037EAFC -/* 8037EB08 0037BA68 44 00 00 02 */ sc -/* 8037EB0C 0037BA6C 4E 80 00 20 */ blr +/* 8037EB08 0037BA68 44 00 00 02 */ sc +/* 8037EB0C 0037BA6C 4E 80 00 20 */ blr .global DCFlushRangeNoSync DCFlushRangeNoSync: /* 8037EB10 0037BA70 28 04 00 00 */ cmplwi r4, 0 -/* 8037EB14 0037BA74 4C 81 00 20 */ blelr +/* 8037EB14 0037BA74 4C 81 00 20 */ blelr /* 8037EB18 0037BA78 54 65 06 FE */ clrlwi r5, r3, 0x1b /* 8037EB1C 0037BA7C 7C 84 2A 14 */ add r4, r4, r5 /* 8037EB20 0037BA80 38 84 00 1F */ addi r4, r4, 0x1f @@ -101,12 +101,12 @@ lbl_8037EB2C: /* 8037EB2C 0037BA8C 7C 00 18 AC */ dcbf 0, r3 /* 8037EB30 0037BA90 38 63 00 20 */ addi r3, r3, 0x20 /* 8037EB34 0037BA94 42 00 FF F8 */ bdnz lbl_8037EB2C -/* 8037EB38 0037BA98 4E 80 00 20 */ blr +/* 8037EB38 0037BA98 4E 80 00 20 */ blr .global DCStoreRangeNoSync DCStoreRangeNoSync: /* 8037EB3C 0037BA9C 28 04 00 00 */ cmplwi r4, 0 -/* 8037EB40 0037BAA0 4C 81 00 20 */ blelr +/* 8037EB40 0037BAA0 4C 81 00 20 */ blelr /* 8037EB44 0037BAA4 54 65 06 FE */ clrlwi r5, r3, 0x1b /* 8037EB48 0037BAA8 7C 84 2A 14 */ add r4, r4, r5 /* 8037EB4C 0037BAAC 38 84 00 1F */ addi r4, r4, 0x1f @@ -116,12 +116,12 @@ lbl_8037EB58: /* 8037EB58 0037BAB8 7C 00 18 6C */ dcbst 0, r3 /* 8037EB5C 0037BABC 38 63 00 20 */ addi r3, r3, 0x20 /* 8037EB60 0037BAC0 42 00 FF F8 */ bdnz lbl_8037EB58 -/* 8037EB64 0037BAC4 4E 80 00 20 */ blr +/* 8037EB64 0037BAC4 4E 80 00 20 */ blr .global DCZeroRange DCZeroRange: /* 8037EB68 0037BAC8 28 04 00 00 */ cmplwi r4, 0 -/* 8037EB6C 0037BACC 4C 81 00 20 */ blelr +/* 8037EB6C 0037BACC 4C 81 00 20 */ blelr /* 8037EB70 0037BAD0 54 65 06 FE */ clrlwi r5, r3, 0x1b /* 8037EB74 0037BAD4 7C 84 2A 14 */ add r4, r4, r5 /* 8037EB78 0037BAD8 38 84 00 1F */ addi r4, r4, 0x1f @@ -134,12 +134,12 @@ lbl_8037EB84: .global sub_8037eb90 sub_8037eb90: -/* 8037EB90 0037BAF0 4E 80 00 20 */ blr +/* 8037EB90 0037BAF0 4E 80 00 20 */ blr .global ICInvalidateRange ICInvalidateRange: /* 8037EB94 0037BAF4 28 04 00 00 */ cmplwi r4, 0 -/* 8037EB98 0037BAF8 4C 81 00 20 */ blelr +/* 8037EB98 0037BAF8 4C 81 00 20 */ blelr /* 8037EB9C 0037BAFC 54 65 06 FE */ clrlwi r5, r3, 0x1b /* 8037EBA0 0037BB00 7C 84 2A 14 */ add r4, r4, r5 /* 8037EBA4 0037BB04 38 84 00 1F */ addi r4, r4, 0x1f @@ -150,23 +150,23 @@ lbl_8037EBB0: /* 8037EBB4 0037BB14 38 63 00 20 */ addi r3, r3, 0x20 /* 8037EBB8 0037BB18 42 00 FF F8 */ bdnz lbl_8037EBB0 /* 8037EBBC 0037BB1C 7C 00 04 AC */ sync 0 -/* 8037EBC0 0037BB20 4C 00 01 2C */ isync -/* 8037EBC4 0037BB24 4E 80 00 20 */ blr +/* 8037EBC0 0037BB20 4C 00 01 2C */ isync +/* 8037EBC4 0037BB24 4E 80 00 20 */ blr .global ICFlashInvalidate ICFlashInvalidate: /* 8037EBC8 0037BB28 7C 70 FA A6 */ mfspr r3, 0x3f0 /* 8037EBCC 0037BB2C 60 63 08 00 */ ori r3, r3, 0x800 /* 8037EBD0 0037BB30 7C 70 FB A6 */ mtspr 0x3f0, r3 -/* 8037EBD4 0037BB34 4E 80 00 20 */ blr +/* 8037EBD4 0037BB34 4E 80 00 20 */ blr .global ICEnable ICEnable: -/* 8037EBD8 0037BB38 4C 00 01 2C */ isync +/* 8037EBD8 0037BB38 4C 00 01 2C */ isync /* 8037EBDC 0037BB3C 7C 70 FA A6 */ mfspr r3, 0x3f0 /* 8037EBE0 0037BB40 60 63 80 00 */ ori r3, r3, 0x8000 /* 8037EBE4 0037BB44 7C 70 FB A6 */ mtspr 0x3f0, r3 -/* 8037EBE8 0037BB48 4E 80 00 20 */ blr +/* 8037EBE8 0037BB48 4E 80 00 20 */ blr .global __LCEnable __LCEnable: @@ -184,24 +184,24 @@ lbl_8037EC04: /* 8037EC14 0037BB74 7C 98 E2 A6 */ mfspr r4, 0x398 /* 8037EC18 0037BB78 64 84 10 0F */ oris r4, r4, 0x100f /* 8037EC1C 0037BB7C 7C 98 E3 A6 */ mtspr 0x398, r4 -/* 8037EC20 0037BB80 60 00 00 00 */ nop -/* 8037EC24 0037BB84 60 00 00 00 */ nop -/* 8037EC28 0037BB88 60 00 00 00 */ nop -/* 8037EC2C 0037BB8C 60 00 00 00 */ nop -/* 8037EC30 0037BB90 60 00 00 00 */ nop -/* 8037EC34 0037BB94 60 00 00 00 */ nop -/* 8037EC38 0037BB98 60 00 00 00 */ nop -/* 8037EC3C 0037BB9C 60 00 00 00 */ nop -/* 8037EC40 0037BBA0 60 00 00 00 */ nop -/* 8037EC44 0037BBA4 60 00 00 00 */ nop -/* 8037EC48 0037BBA8 60 00 00 00 */ nop -/* 8037EC4C 0037BBAC 60 00 00 00 */ nop +/* 8037EC20 0037BB80 60 00 00 00 */ nop +/* 8037EC24 0037BB84 60 00 00 00 */ nop +/* 8037EC28 0037BB88 60 00 00 00 */ nop +/* 8037EC2C 0037BB8C 60 00 00 00 */ nop +/* 8037EC30 0037BB90 60 00 00 00 */ nop +/* 8037EC34 0037BB94 60 00 00 00 */ nop +/* 8037EC38 0037BB98 60 00 00 00 */ nop +/* 8037EC3C 0037BB9C 60 00 00 00 */ nop +/* 8037EC40 0037BBA0 60 00 00 00 */ nop +/* 8037EC44 0037BBA4 60 00 00 00 */ nop +/* 8037EC48 0037BBA8 60 00 00 00 */ nop +/* 8037EC4C 0037BBAC 60 00 00 00 */ nop /* 8037EC50 0037BBB0 3C 60 E0 00 */ lis r3, 0xE0000002@h /* 8037EC54 0037BBB4 60 63 00 02 */ ori r3, r3, 0xE0000002@l /* 8037EC58 0037BBB8 7C 7F 83 A6 */ mtdbatl 3, r3 /* 8037EC5C 0037BBBC 60 63 01 FE */ ori r3, r3, 0x1fe /* 8037EC60 0037BBC0 7C 7E 83 A6 */ mtdbatu 3, r3 -/* 8037EC64 0037BBC4 4C 00 01 2C */ isync +/* 8037EC64 0037BBC4 4C 00 01 2C */ isync /* 8037EC68 0037BBC8 3C 60 E0 00 */ lis r3, 0xE0000020@ha /* 8037EC6C 0037BBCC 38 C0 02 00 */ li r6, 0x200 /* 8037EC70 0037BBD0 7C C9 03 A6 */ mtctr r6 @@ -210,19 +210,19 @@ lbl_8037EC78: /* 8037EC78 0037BBD8 10 06 1F EC */ dcbz_l r6, r3 /* 8037EC7C 0037BBDC 38 63 00 20 */ addi r3, r3, 0xE0000020@l /* 8037EC80 0037BBE0 42 00 FF F8 */ bdnz lbl_8037EC78 -/* 8037EC84 0037BBE4 60 00 00 00 */ nop -/* 8037EC88 0037BBE8 60 00 00 00 */ nop -/* 8037EC8C 0037BBEC 60 00 00 00 */ nop -/* 8037EC90 0037BBF0 60 00 00 00 */ nop -/* 8037EC94 0037BBF4 60 00 00 00 */ nop -/* 8037EC98 0037BBF8 60 00 00 00 */ nop -/* 8037EC9C 0037BBFC 60 00 00 00 */ nop -/* 8037ECA0 0037BC00 60 00 00 00 */ nop -/* 8037ECA4 0037BC04 60 00 00 00 */ nop -/* 8037ECA8 0037BC08 60 00 00 00 */ nop -/* 8037ECAC 0037BC0C 60 00 00 00 */ nop -/* 8037ECB0 0037BC10 60 00 00 00 */ nop -/* 8037ECB4 0037BC14 4E 80 00 20 */ blr +/* 8037EC84 0037BBE4 60 00 00 00 */ nop +/* 8037EC88 0037BBE8 60 00 00 00 */ nop +/* 8037EC8C 0037BBEC 60 00 00 00 */ nop +/* 8037EC90 0037BBF0 60 00 00 00 */ nop +/* 8037EC94 0037BBF4 60 00 00 00 */ nop +/* 8037EC98 0037BBF8 60 00 00 00 */ nop +/* 8037EC9C 0037BBFC 60 00 00 00 */ nop +/* 8037ECA0 0037BC00 60 00 00 00 */ nop +/* 8037ECA4 0037BC04 60 00 00 00 */ nop +/* 8037ECA8 0037BC08 60 00 00 00 */ nop +/* 8037ECAC 0037BC0C 60 00 00 00 */ nop +/* 8037ECB0 0037BC10 60 00 00 00 */ nop +/* 8037ECB4 0037BC14 4E 80 00 20 */ blr .global LCEnable LCEnable: @@ -239,7 +239,7 @@ LCEnable: /* 8037ECE0 0037BC40 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8037ECE4 0037BC44 38 21 00 10 */ addi r1, r1, 0x10 /* 8037ECE8 0037BC48 7C 08 03 A6 */ mtlr r0 -/* 8037ECEC 0037BC4C 4E 80 00 20 */ blr +/* 8037ECEC 0037BC4C 4E 80 00 20 */ blr .global LCDisable LCDisable: @@ -253,7 +253,7 @@ lbl_8037ECFC: /* 8037ED08 0037BC68 7C 98 E2 A6 */ mfspr r4, 0x398 /* 8037ED0C 0037BC6C 54 84 01 04 */ rlwinm r4, r4, 0, 4, 2 /* 8037ED10 0037BC70 7C 98 E3 A6 */ mtspr 0x398, r4 -/* 8037ED14 0037BC74 4E 80 00 20 */ blr +/* 8037ED14 0037BC74 4E 80 00 20 */ blr .global sub_8037ed18 sub_8037ed18: @@ -265,7 +265,7 @@ sub_8037ed18: /* 8037ED2C 0037BC8C 7C C6 1B 78 */ or r6, r6, r3 /* 8037ED30 0037BC90 60 C6 00 12 */ ori r6, r6, 0x12 /* 8037ED34 0037BC94 7C DB E3 A6 */ mtspr 0x39b, r6 -/* 8037ED38 0037BC98 4E 80 00 20 */ blr +/* 8037ED38 0037BC98 4E 80 00 20 */ blr .global LCStoreBlocks LCStoreBlocks: @@ -277,7 +277,7 @@ LCStoreBlocks: /* 8037ED50 0037BCB0 7C C6 23 78 */ or r6, r6, r4 /* 8037ED54 0037BCB4 60 C6 00 02 */ ori r6, r6, 2 /* 8037ED58 0037BCB8 7C DB E3 A6 */ mtspr 0x39b, r6 -/* 8037ED5C 0037BCBC 4E 80 00 20 */ blr +/* 8037ED5C 0037BCBC 4E 80 00 20 */ blr .global sub_8037ed60 sub_8037ed60: @@ -328,7 +328,7 @@ lbl_8037EDE0: /* 8037EDFC 0037BD5C 83 81 00 18 */ lwz r28, 0x18(r1) /* 8037EE00 0037BD60 38 21 00 28 */ addi r1, r1, 0x28 /* 8037EE04 0037BD64 7C 08 03 A6 */ mtlr r0 -/* 8037EE08 0037BD68 4E 80 00 20 */ blr +/* 8037EE08 0037BD68 4E 80 00 20 */ blr .global LCStoreData LCStoreData: @@ -379,13 +379,13 @@ lbl_8037EE8C: /* 8037EEA8 0037BE08 83 81 00 18 */ lwz r28, 0x18(r1) /* 8037EEAC 0037BE0C 38 21 00 28 */ addi r1, r1, 0x28 /* 8037EEB0 0037BE10 7C 08 03 A6 */ mtlr r0 -/* 8037EEB4 0037BE14 4E 80 00 20 */ blr +/* 8037EEB4 0037BE14 4E 80 00 20 */ blr .global LCQueueLength LCQueueLength: /* 8037EEB8 0037BE18 7C 98 E2 A6 */ mfspr r4, 0x398 /* 8037EEBC 0037BE1C 54 83 47 3E */ rlwinm r3, r4, 8, 0x1c, 0x1f -/* 8037EEC0 0037BE20 4E 80 00 20 */ blr +/* 8037EEC0 0037BE20 4E 80 00 20 */ blr .global LCQueueWait LCQueueWait: @@ -395,7 +395,7 @@ lbl_8037EEC8: /* 8037EECC 0037BE2C 54 84 47 3E */ rlwinm r4, r4, 8, 0x1c, 0x1f /* 8037EED0 0037BE30 7D 04 18 00 */ cmpw cr2, r4, r3 /* 8037EED4 0037BE34 40 88 FF F4 */ bge cr2, lbl_8037EEC8 -/* 8037EED8 0037BE38 4E 80 00 20 */ blr +/* 8037EED8 0037BE38 4E 80 00 20 */ blr .global L2GlobalInvalidate L2GlobalInvalidate: @@ -442,7 +442,7 @@ lbl_8037EF50: /* 8037EF64 0037BEC4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8037EF68 0037BEC8 38 21 00 10 */ addi r1, r1, 0x10 /* 8037EF6C 0037BECC 7C 08 03 A6 */ mtlr r0 -/* 8037EF70 0037BED0 4E 80 00 20 */ blr +/* 8037EF70 0037BED0 4E 80 00 20 */ blr .global DMAErrorHandler DMAErrorHandler: @@ -540,7 +540,7 @@ lbl_8037F0B0: /* 8037F0C4 0037C024 83 A1 00 74 */ lwz r29, 0x74(r1) /* 8037F0C8 0037C028 38 21 00 80 */ addi r1, r1, 0x80 /* 8037F0CC 0037C02C 7C 08 03 A6 */ mtlr r0 -/* 8037F0D0 0037C030 4E 80 00 20 */ blr +/* 8037F0D0 0037C030 4E 80 00 20 */ blr .global __OSCacheInit __OSCacheInit: @@ -607,4 +607,4 @@ lbl_8037F194: /* 8037F1B8 0037C118 83 C1 00 08 */ lwz r30, 8(r1) /* 8037F1BC 0037C11C 38 21 00 10 */ addi r1, r1, 0x10 /* 8037F1C0 0037C120 7C 08 03 A6 */ mtlr r0 -/* 8037F1C4 0037C124 4E 80 00 20 */ blr +/* 8037F1C4 0037C124 4E 80 00 20 */ blr diff --git a/asm/Dolphin/os/OSContext.s b/asm/Dolphin/os/OSContext.s index cba6fe3e..ca902df7 100644 --- a/asm/Dolphin/os/OSContext.s +++ b/asm/Dolphin/os/OSContext.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .data +.section .data .balign 8 lbl_803F1258: .asciz "------------------------- Context 0x%08x -------------------------\n" @@ -110,7 +110,7 @@ lbl_8037F268: /* 8037F2E0 0037C240 CB C4 01 80 */ lfd f30, 0x180(r4) /* 8037F2E4 0037C244 CB E4 01 88 */ lfd f31, 0x188(r4) lbl_8037f2e8: -/* 8037F2E8 0037C248 4E 80 00 20 */ blr +/* 8037F2E8 0037C248 4E 80 00 20 */ blr .global __OSSaveFPUContext __OSSaveFPUContext: @@ -190,7 +190,7 @@ __OSSaveFPUContext: .global sub_8037f410 sub_8037f410: -/* 8037F410 0037C370 4E 80 00 20 */ blr +/* 8037F410 0037C370 4E 80 00 20 */ blr .global OSSaveFPUContext OSSaveFPUContext: @@ -212,7 +212,7 @@ OSSetCurrentContext: /* 8037F444 0037C3A4 7C C0 00 A6 */ mfmsr r6 /* 8037F448 0037C3A8 60 C6 00 02 */ ori r6, r6, 2 /* 8037F44C 0037C3AC 7C C0 01 24 */ mtmsr r6 -/* 8037F450 0037C3B0 4E 80 00 20 */ blr +/* 8037F450 0037C3B0 4E 80 00 20 */ blr lbl_8037F454: /* 8037F454 0037C3B4 80 C3 01 9C */ lwz r6, 0x19c(r3) /* 8037F458 0037C3B8 54 C6 04 E2 */ rlwinm r6, r6, 0, 0x13, 0x11 @@ -221,14 +221,14 @@ lbl_8037F454: /* 8037F464 0037C3C4 54 C6 04 E2 */ rlwinm r6, r6, 0, 0x13, 0x11 /* 8037F468 0037C3C8 60 C6 00 02 */ ori r6, r6, 2 /* 8037F46C 0037C3CC 7C C0 01 24 */ mtmsr r6 -/* 8037F470 0037C3D0 4C 00 01 2C */ isync -/* 8037F474 0037C3D4 4E 80 00 20 */ blr +/* 8037F470 0037C3D0 4C 00 01 2C */ isync +/* 8037F474 0037C3D4 4E 80 00 20 */ blr .global OSGetCurrentContext OSGetCurrentContext: /* 8037F478 0037C3D8 3C 60 80 00 */ lis r3, 0x800000D4@ha /* 8037F47C 0037C3DC 80 63 00 D4 */ lwz r3, 0x800000D4@l(r3) -/* 8037F480 0037C3E0 4E 80 00 20 */ blr +/* 8037F480 0037C3E0 4E 80 00 20 */ blr .global OSSaveContext OSSaveContext: @@ -263,7 +263,7 @@ OSSaveContext: /* 8037F4F4 0037C454 38 00 00 01 */ li r0, 1 /* 8037F4F8 0037C458 90 03 00 0C */ stw r0, 0xc(r3) /* 8037F4FC 0037C45C 38 60 00 00 */ li r3, 0 -/* 8037F500 0037C460 4E 80 00 20 */ blr +/* 8037F500 0037C460 4E 80 00 20 */ blr .global OSLoadContext OSLoadContext: @@ -323,12 +323,12 @@ lbl_8037F558: /* 8037F5CC 0037C52C 7C 9B 03 A6 */ mtspr 0x1b, r4 /* 8037F5D0 0037C530 80 83 00 10 */ lwz r4, 0x10(r3) /* 8037F5D4 0037C534 80 63 00 0C */ lwz r3, 0xc(r3) -/* 8037F5D8 0037C538 4C 00 00 64 */ rfi +/* 8037F5D8 0037C538 4C 00 00 64 */ rfi .global OSGetStackPointer OSGetStackPointer: /* 8037F5DC 0037C53C 7C 23 0B 78 */ mr r3, r1 -/* 8037F5E0 0037C540 4E 80 00 20 */ blr +/* 8037F5E0 0037C540 4E 80 00 20 */ blr .global OSSwitchFiber OSSwitchFiber: @@ -338,12 +338,12 @@ OSSwitchFiber: /* 8037F5F0 0037C550 7C 81 23 78 */ mr r1, r4 /* 8037F5F4 0037C554 90 05 00 04 */ stw r0, 4(r5) /* 8037F5F8 0037C558 7C 68 03 A6 */ mtlr r3 -/* 8037F5FC 0037C55C 4E 80 00 21 */ blrl +/* 8037F5FC 0037C55C 4E 80 00 21 */ blrl /* 8037F600 0037C560 80 A1 00 00 */ lwz r5, 0(r1) /* 8037F604 0037C564 80 05 00 04 */ lwz r0, 4(r5) /* 8037F608 0037C568 7C 08 03 A6 */ mtlr r0 /* 8037F60C 0037C56C 7C A1 2B 78 */ mr r1, r5 -/* 8037F610 0037C570 4E 80 00 20 */ blr +/* 8037F610 0037C570 4E 80 00 20 */ blr .global OSClearContext OSClearContext: @@ -356,7 +356,7 @@ OSClearContext: /* 8037F62C 0037C58C 40 82 00 08 */ bne lbl_8037F634 /* 8037F630 0037C590 90 A4 00 D8 */ stw r5, 0xd8(r4) lbl_8037F634: -/* 8037F634 0037C594 4E 80 00 20 */ blr +/* 8037F634 0037C594 4E 80 00 20 */ blr .global OSDumpContext OSDumpContext: @@ -549,14 +549,14 @@ lbl_8037F8CC: /* 8037F8D0 0037C830 80 01 02 FC */ lwz r0, 0x2fc(r1) /* 8037F8D4 0037C834 38 21 02 F8 */ addi r1, r1, 0x2f8 /* 8037F8D8 0037C838 7C 08 03 A6 */ mtlr r0 -/* 8037F8DC 0037C83C 4E 80 00 20 */ blr +/* 8037F8DC 0037C83C 4E 80 00 20 */ blr .global OSSwitchFPUContext OSSwitchFPUContext: /* 8037F8E0 0037C840 7C A0 00 A6 */ mfmsr r5 /* 8037F8E4 0037C844 60 A5 20 00 */ ori r5, r5, 0x2000 /* 8037F8E8 0037C848 7C A0 01 24 */ mtmsr r5 -/* 8037F8EC 0037C84C 4C 00 01 2C */ isync +/* 8037F8EC 0037C84C 4C 00 01 2C */ isync /* 8037F8F0 0037C850 80 A4 01 9C */ lwz r5, 0x19c(r4) /* 8037F8F4 0037C854 60 A5 20 00 */ ori r5, r5, 0x2000 /* 8037F8F8 0037C858 7C BB 03 A6 */ mtspr 0x1b, r5 @@ -587,7 +587,7 @@ lbl_8037F920: /* 8037F954 0037C8B4 80 A4 00 14 */ lwz r5, 0x14(r4) /* 8037F958 0037C8B8 80 64 00 0C */ lwz r3, 0xc(r4) /* 8037F95C 0037C8BC 80 84 00 10 */ lwz r4, 0x10(r4) -/* 8037F960 0037C8C0 4C 00 00 64 */ rfi +/* 8037F960 0037C8C0 4C 00 00 64 */ rfi .global __OSContextInit __OSContextInit: @@ -608,4 +608,4 @@ __OSContextInit: /* 8037F99C 0037C8FC 80 01 00 0C */ lwz r0, 0xc(r1) /* 8037F9A0 0037C900 38 21 00 08 */ addi r1, r1, 8 /* 8037F9A4 0037C904 7C 08 03 A6 */ mtlr r0 -/* 8037F9A8 0037C908 4E 80 00 20 */ blr +/* 8037F9A8 0037C908 4E 80 00 20 */ blr diff --git a/asm/Dolphin/os/OSError.s b/asm/Dolphin/os/OSError.s index 13745e92..c4398aed 100644 --- a/asm/Dolphin/os/OSError.s +++ b/asm/Dolphin/os/OSError.s @@ -4,7 +4,7 @@ .global lbl_80541250 lbl_80541250: .skip 0x48 - + .section .data .balign 8 @@ -47,7 +47,7 @@ lbl_803F170C: .4byte lbl_8037FF7C .4byte lbl_8037FF94 .4byte lbl_80380024 - .4byte lbl_8037FFA8 + .4byte lbl_8037FFA8 .4byte lbl_8037FFC0 .4byte lbl_80380024 .4byte lbl_80380024 @@ -61,11 +61,15 @@ lbl_803F170C: .section .sdata .global lbl_805A8B38 lbl_805A8B38: - .incbin "baserom.dol", 0x3F64D8, 0x4 + # ROM: 0x3F64D8 + .4byte 0x000000F8 + .global lbl_805A8B3C lbl_805A8B3C: - .incbin "baserom.dol", 0x3F64DC, 0x4 - + # ROM: 0x3F64DC + .4byte 0x0A000000 + + .section .text, "ax" .global OSReport @@ -102,7 +106,7 @@ lbl_8037F9DC: /* 8037FA1C 0037C97C 80 01 00 7C */ lwz r0, 0x7c(r1) /* 8037FA20 0037C980 38 21 00 78 */ addi r1, r1, 0x78 /* 8037FA24 0037C984 7C 08 03 A6 */ mtlr r0 -/* 8037FA28 0037C988 4E 80 00 20 */ blr +/* 8037FA28 0037C988 4E 80 00 20 */ blr .global OSPanic OSPanic: @@ -184,7 +188,7 @@ lbl_8037FB34: /* 8037FB48 0037CAA8 83 81 00 80 */ lwz r28, 0x80(r1) /* 8037FB4C 0037CAAC 38 21 00 90 */ addi r1, r1, 0x90 /* 8037FB50 0037CAB0 7C 08 03 A6 */ mtlr r0 -/* 8037FB54 0037CAB4 4E 80 00 20 */ blr +/* 8037FB54 0037CAB4 4E 80 00 20 */ blr .global OSSetErrorHandler OSSetErrorHandler: @@ -330,7 +334,7 @@ lbl_8037FD44: /* 8037FD60 0037CCC0 83 81 00 20 */ lwz r28, 0x20(r1) /* 8037FD64 0037CCC4 38 21 00 30 */ addi r1, r1, 0x30 /* 8037FD68 0037CCC8 7C 08 03 A6 */ mtlr r0 -/* 8037FD6C 0037CCCC 4E 80 00 20 */ blr +/* 8037FD6C 0037CCCC 4E 80 00 20 */ blr .global __OSUnhandledException __OSUnhandledException: @@ -396,7 +400,7 @@ lbl_8037FE14: /* 8037FE54 0037CDB4 7D 88 03 A6 */ mtlr r12 /* 8037FE58 0037CDB8 38 DB 00 00 */ addi r6, r27, 0 /* 8037FE5C 0037CDBC 38 60 00 10 */ li r3, 0x10 -/* 8037FE60 0037CDC0 4E 80 00 21 */ blrl +/* 8037FE60 0037CDC0 4E 80 00 21 */ blrl /* 8037FE64 0037CDC4 80 79 01 9C */ lwz r3, 0x19c(r25) /* 8037FE68 0037CDC8 38 00 00 00 */ li r0, 0 /* 8037FE6C 0037CDCC 54 63 04 E2 */ rlwinm r3, r3, 0, 0x13, 0x11 @@ -432,7 +436,7 @@ lbl_8037FEAC: /* 8037FED8 0037CE38 7D 88 03 A6 */ mtlr r12 /* 8037FEDC 0037CE3C 38 BA 00 00 */ addi r5, r26, 0 /* 8037FEE0 0037CE40 38 DB 00 00 */ addi r6, r27, 0 -/* 8037FEE4 0037CE44 4E 80 00 21 */ blrl +/* 8037FEE4 0037CE44 4E 80 00 21 */ blrl /* 8037FEE8 0037CE48 48 00 47 39 */ bl OSEnableScheduler /* 8037FEEC 0037CE4C 48 00 4C 01 */ bl __OSReschedule /* 8037FEF0 0037CE50 7F 23 CB 78 */ mr r3, r25 @@ -533,4 +537,4 @@ lbl_80380024: /* 80380048 0037CFA8 80 01 00 44 */ lwz r0, 0x44(r1) /* 8038004C 0037CFAC 38 21 00 40 */ addi r1, r1, 0x40 /* 80380050 0037CFB0 7C 08 03 A6 */ mtlr r0 -/* 80380054 0037CFB4 4E 80 00 20 */ blr +/* 80380054 0037CFB4 4E 80 00 20 */ blr diff --git a/asm/Dolphin/os/OSFatal.s b/asm/Dolphin/os/OSFatal.s index 0aebb236..235b0c1a 100644 --- a/asm/Dolphin/os/OSFatal.s +++ b/asm/Dolphin/os/OSFatal.s @@ -9,46 +9,73 @@ lbl_80541298: .global lbl_805A8B40 lbl_805A8B40: - .incbin "baserom.dol", 0x3F64E0, 0x8 + # ROM: 0x3F64E0 + .4byte 0x25730A00 + .4byte 0 + .section .sdata2 .global lbl_805AEC18 lbl_805AEC18: - .incbin "baserom.dol", 0x3FB4B8, 0x4 + # ROM: 0x3FB4B8 + .4byte 0x3F000000 + .global lbl_805AEC1C lbl_805AEC1C: - .incbin "baserom.dol", 0x3FB4BC, 0x4 + # ROM: 0x3FB4BC + .4byte 0x41800000 + .global lbl_805AEC20 lbl_805AEC20: - .incbin "baserom.dol", 0x3FB4C0, 0x4 + # ROM: 0x3FB4C0 + .4byte 0x3DC8B439 + .global lbl_805AEC24 lbl_805AEC24: - .incbin "baserom.dol", 0x3FB4C4, 0x4 + # ROM: 0x3FB4C4 + .4byte 0x3E839581 + .global lbl_805AEC28 lbl_805AEC28: - .incbin "baserom.dol", 0x3FB4C8, 0x4 + # ROM: 0x3FB4C8 + .4byte 0x3F010625 + .global lbl_805AEC2C lbl_805AEC2C: - .incbin "baserom.dol", 0x3FB4CC, 0x4 + # ROM: 0x3FB4CC + .4byte 0x43000000 + .global lbl_805AEC30 lbl_805AEC30: - .incbin "baserom.dol", 0x3FB4D0, 0x4 + # ROM: 0x3FB4D0 + .4byte 0x3EE0C49C + .global lbl_805AEC34 lbl_805AEC34: - .incbin "baserom.dol", 0x3FB4D4, 0x4 + # ROM: 0x3FB4D4 + .4byte 0xBE178D50 + .global lbl_805AEC38 lbl_805AEC38: - .incbin "baserom.dol", 0x3FB4D8, 0x4 + # ROM: 0x3FB4D8 + .4byte 0x3E94FDF4 + .global lbl_805AEC3C lbl_805AEC3C: - .incbin "baserom.dol", 0x3FB4DC, 0x4 + # ROM: 0x3FB4DC + .4byte 0x3EBC6A7F + .global lbl_805AEC40 lbl_805AEC40: - .incbin "baserom.dol", 0x3FB4E0, 0x4 + # ROM: 0x3FB4E0 + .4byte 0x3D916873 + .global lbl_805AEC44 lbl_805AEC44: - .incbin "baserom.dol", 0x3FB4E4, 0x4 + # ROM: 0x3FB4E4 + .4byte 0x436B0000 + .section .text, "ax" @@ -313,7 +340,7 @@ lbl_80380420: /* 80380424 0037D384 80 01 01 A4 */ lwz r0, 0x1a4(r1) /* 80380428 0037D388 38 21 01 A0 */ addi r1, r1, 0x1a0 /* 8038042C 0037D38C 7C 08 03 A6 */ mtlr r0 -/* 80380430 0037D390 4E 80 00 20 */ blr +/* 80380430 0037D390 4E 80 00 20 */ blr .global ConfigureVideo ConfigureVideo: @@ -385,7 +412,7 @@ lbl_80380504: /* 80380520 0037D480 80 01 00 4C */ lwz r0, 0x4c(r1) /* 80380524 0037D484 38 21 00 48 */ addi r1, r1, 0x48 /* 80380528 0037D488 7C 08 03 A6 */ mtlr r0 -/* 8038052C 0037D48C 4E 80 00 20 */ blr +/* 8038052C 0037D48C 4E 80 00 20 */ blr .global OSFatal OSFatal: @@ -453,7 +480,7 @@ lbl_803805B0: /* 8038061C 0037D57C 80 01 00 34 */ lwz r0, 0x34(r1) /* 80380620 0037D580 38 21 00 30 */ addi r1, r1, 0x30 /* 80380624 0037D584 7C 08 03 A6 */ mtlr r0 -/* 80380628 0037D588 4E 80 00 20 */ blr +/* 80380628 0037D588 4E 80 00 20 */ blr .global Halt Halt: @@ -868,4 +895,4 @@ lbl_80380BEC: /* 80380C24 0037DB84 83 81 00 78 */ lwz r28, 0x78(r1) /* 80380C28 0037DB88 38 21 00 88 */ addi r1, r1, 0x88 /* 80380C2C 0037DB8C 7C 08 03 A6 */ mtlr r0 -/* 80380C30 0037DB90 4E 80 00 20 */ blr +/* 80380C30 0037DB90 4E 80 00 20 */ blr diff --git a/asm/Dolphin/os/OSFont.s b/asm/Dolphin/os/OSFont.s index f533fb37..cdadc30c 100644 --- a/asm/Dolphin/os/OSFont.s +++ b/asm/Dolphin/os/OSFont.s @@ -3,8 +3,11 @@ .section .sdata .global lbl_805A8B48 lbl_805A8B48: - .incbin "baserom.dol", 0x3F64E8, 0x8 - + # ROM: 0x3F64E8 + .4byte 0xFFFF0000 + .4byte 0 + + .section .sbss lbl_805A98C0: .skip 0x4 @@ -14,7 +17,7 @@ lbl_805A98C8: .skip 0x4 lbl_805A98CC: .skip 0x4 - + .section .data .balign 8 .global HankakuToCode @@ -115,7 +118,7 @@ HankakuToCode: .4byte 0x02A402A5 .4byte 0x02A602A7 .4byte 0x02A802A9 - + .global Zenkaku2Code Zenkaku2Code: @@ -735,16 +738,26 @@ Zenkaku2Code: .section .sdata2 .global lbl_805AEC48 lbl_805AEC48: - .incbin "baserom.dol", 0x3FB4E8, 0x8 + # ROM: 0x3FB4E8 + .4byte 0x43700000 + .4byte 0 + .global lbl_805AEC50 lbl_805AEC50: - .incbin "baserom.dol", 0x3FB4F0, 0x8 + # ROM: 0x3FB4F0 + .4byte 0x43300000 + .4byte 0 + .global lbl_805AEC58 lbl_805AEC58: - .incbin "baserom.dol", 0x3FB4F8, 0x4 + # ROM: 0x3FB4F8 + .4byte 0x2ABE003D + .global lbl_805AEC5C lbl_805AEC5C: - .incbin "baserom.dol", 0x3FB4FC, 0x4 + # ROM: 0x3FB4FC + .4byte 0x003D003D + .section .text, "ax" @@ -865,7 +878,7 @@ lbl_80380DBC: /* 80380DC0 0037DD20 83 E1 00 14 */ lwz r31, 0x14(r1) /* 80380DC4 0037DD24 38 21 00 18 */ addi r1, r1, 0x18 /* 80380DC8 0037DD28 7C 08 03 A6 */ mtlr r0 -/* 80380DCC 0037DD2C 4E 80 00 20 */ blr +/* 80380DCC 0037DD2C 4E 80 00 20 */ blr .global sub_80380dd0 sub_80380dd0: @@ -970,13 +983,13 @@ lbl_80380F20: /* 80380F34 0037DE94 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80380F38 0037DE98 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80380F3C 0037DE9C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80380F40 0037DEA0 4E 80 00 20 */ blr +/* 80380F40 0037DEA0 4E 80 00 20 */ blr .global OSGetFontEncode OSGetFontEncode: /* 80380F44 0037DEA4 A0 6D 9F 88 */ lhz r3, lbl_805A8B48@sda21(r13) /* 80380F48 0037DEA8 28 03 00 01 */ cmplwi r3, 1 -/* 80380F4C 0037DEAC 4C 81 00 20 */ blelr +/* 80380F4C 0037DEAC 4C 81 00 20 */ blelr /* 80380F50 0037DEB0 3C 60 80 00 */ lis r3, 0x800000CC@ha /* 80380F54 0037DEB4 80 03 00 CC */ lwz r0, 0x800000CC@l(r3) /* 80380F58 0037DEB8 2C 00 00 00 */ cmpwi r0, 0 @@ -1000,7 +1013,7 @@ lbl_80380F8C: /* 80380F90 0037DEF0 B0 0D 9F 88 */ sth r0, lbl_805A8B48@sda21(r13) lbl_80380F94: /* 80380F94 0037DEF4 A0 6D 9F 88 */ lhz r3, lbl_805A8B48@sda21(r13) -/* 80380F98 0037DEF8 4E 80 00 20 */ blr +/* 80380F98 0037DEF8 4E 80 00 20 */ blr .global sub_80380f9c sub_80380f9c: @@ -1043,7 +1056,7 @@ lbl_80381000: /* 80381018 0037DF78 83 81 00 18 */ lwz r28, 0x18(r1) /* 8038101C 0037DF7C 38 21 00 28 */ addi r1, r1, 0x28 /* 80381020 0037DF80 7C 08 03 A6 */ mtlr r0 -/* 80381024 0037DF84 4E 80 00 20 */ blr +/* 80381024 0037DF84 4E 80 00 20 */ blr .global sub_80381028 sub_80381028: @@ -1263,7 +1276,7 @@ lbl_8038133C: /* 8038134C 0037E2AC 83 A1 00 34 */ lwz r29, 0x34(r1) /* 80381350 0037E2B0 38 21 00 40 */ addi r1, r1, 0x40 /* 80381354 0037E2B4 7C 08 03 A6 */ mtlr r0 -/* 80381358 0037E2B8 4E 80 00 20 */ blr +/* 80381358 0037E2B8 4E 80 00 20 */ blr .global sub_8038135c sub_8038135c: @@ -1479,4 +1492,4 @@ lbl_8038164C: /* 80381650 0037E5B0 80 01 00 64 */ lwz r0, 0x64(r1) /* 80381654 0037E5B4 38 21 00 60 */ addi r1, r1, 0x60 /* 80381658 0037E5B8 7C 08 03 A6 */ mtlr r0 -/* 8038165C 0037E5BC 4E 80 00 20 */ blr +/* 8038165C 0037E5BC 4E 80 00 20 */ blr diff --git a/asm/Dolphin/os/OSInterrupt.s b/asm/Dolphin/os/OSInterrupt.s index 01e00f64..4c74e584 100644 --- a/asm/Dolphin/os/OSInterrupt.s +++ b/asm/Dolphin/os/OSInterrupt.s @@ -16,7 +16,7 @@ lbl_805A98E0: .global lbl_805A98E4 lbl_805A98E4: .skip 0x4 - + .section .data .balign 8 .global lbl_803F2260 @@ -33,7 +33,7 @@ lbl_803F2260: .4byte 0x00004000 .4byte 0xFFFFFFFF .4byte 0x00000000 - + .section .text, "ax" .global OSDisableInterrupts @@ -46,7 +46,7 @@ __RAS_OSDisableInterrupts_begin: .global __RAS_OSDisableInterrupts_end __RAS_OSDisableInterrupts_end: /* 8038166C 0037E5CC 54 63 8F FE */ rlwinm r3, r3, 0x11, 0x1f, 0x1f -/* 80381670 0037E5D0 4E 80 00 20 */ blr +/* 80381670 0037E5D0 4E 80 00 20 */ blr .global OSEnableInterrupts OSEnableInterrupts: @@ -54,7 +54,7 @@ OSEnableInterrupts: /* 80381678 0037E5D8 60 64 80 00 */ ori r4, r3, 0x8000 /* 8038167C 0037E5DC 7C 80 01 24 */ mtmsr r4 /* 80381680 0037E5E0 54 63 8F FE */ rlwinm r3, r3, 0x11, 0x1f, 0x1f -/* 80381684 0037E5E4 4E 80 00 20 */ blr +/* 80381684 0037E5E4 4E 80 00 20 */ blr .global OSRestoreInterrupts OSRestoreInterrupts: @@ -68,7 +68,7 @@ lbl_8038169C: lbl_803816A0: /* 803816A0 0037E600 7C A0 01 24 */ mtmsr r5 /* 803816A4 0037E604 54 83 8F FE */ rlwinm r3, r4, 0x11, 0x1f, 0x1f -/* 803816A8 0037E608 4E 80 00 20 */ blr +/* 803816A8 0037E608 4E 80 00 20 */ blr .global __OSSetInterruptHandler __OSSetInterruptHandler: @@ -78,7 +78,7 @@ __OSSetInterruptHandler: /* 803816B8 0037E618 7C A3 02 14 */ add r5, r3, r0 /* 803816BC 0037E61C 80 65 00 00 */ lwz r3, 0(r5) /* 803816C0 0037E620 90 85 00 00 */ stw r4, 0(r5) -/* 803816C4 0037E624 4E 80 00 20 */ blr +/* 803816C4 0037E624 4E 80 00 20 */ blr .global __OSGetInterruptHandler __OSGetInterruptHandler: @@ -86,7 +86,7 @@ __OSGetInterruptHandler: /* 803816CC 0037E62C 80 6D AD 10 */ lwz r3, lbl_805A98D0@sda21(r13) /* 803816D0 0037E630 54 00 10 3A */ slwi r0, r0, 2 /* 803816D4 0037E634 7C 63 00 2E */ lwzx r3, r3, r0 -/* 803816D8 0037E638 4E 80 00 20 */ blr +/* 803816D8 0037E638 4E 80 00 20 */ blr .global __OSInterruptInit __OSInterruptInit: @@ -118,7 +118,7 @@ __OSInterruptInit: /* 80381740 0037E6A0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80381744 0037E6A4 38 21 00 10 */ addi r1, r1, 0x10 /* 80381748 0037E6A8 7C 08 03 A6 */ mtlr r0 -/* 8038174C 0037E6AC 4E 80 00 20 */ blr +/* 8038174C 0037E6AC 4E 80 00 20 */ blr .global SetInterruptMask SetInterruptMask: @@ -340,7 +340,7 @@ lbl_80381A14: /* 80381A1C 0037E97C 90 A4 00 04 */ stw r5, 4(r4) /* 80381A20 0037E980 54 63 06 E0 */ rlwinm r3, r3, 0, 0x1b, 0x10 lbl_80381A24: -/* 80381A24 0037E984 4E 80 00 20 */ blr +/* 80381A24 0037E984 4E 80 00 20 */ blr .global __OSMaskInterrupts __OSMaskInterrupts: @@ -381,7 +381,7 @@ lbl_80381A80: /* 80381AA0 0037EA00 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80381AA4 0037EA04 38 21 00 20 */ addi r1, r1, 0x20 /* 80381AA8 0037EA08 7C 08 03 A6 */ mtlr r0 -/* 80381AAC 0037EA0C 4E 80 00 20 */ blr +/* 80381AAC 0037EA0C 4E 80 00 20 */ blr .global __OSUnmaskInterrupts __OSUnmaskInterrupts: @@ -422,7 +422,7 @@ lbl_80381B08: /* 80381B28 0037EA88 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80381B2C 0037EA8C 38 21 00 20 */ addi r1, r1, 0x20 /* 80381B30 0037EA90 7C 08 03 A6 */ mtlr r0 -/* 80381B34 0037EA94 4E 80 00 20 */ blr +/* 80381B34 0037EA94 4E 80 00 20 */ blr .global __OSDispatchInterrupt __OSDispatchInterrupt: @@ -655,7 +655,7 @@ lbl_80381E30: /* 80381E38 0037ED98 7F C4 F3 78 */ mr r4, r30 /* 80381E3C 0037ED9C 7F EC FB 78 */ mr r12, r31 /* 80381E40 0037EDA0 7D 88 03 A6 */ mtlr r12 -/* 80381E44 0037EDA4 4E 80 00 21 */ blrl +/* 80381E44 0037EDA4 4E 80 00 21 */ blrl /* 80381E48 0037EDA8 48 00 27 D9 */ bl OSEnableScheduler /* 80381E4C 0037EDAC 48 00 2C A1 */ bl __OSReschedule /* 80381E50 0037EDB0 7F C3 F3 78 */ mr r3, r30 @@ -669,7 +669,7 @@ lbl_80381E58: /* 80381E6C 0037EDCC 83 A1 00 1C */ lwz r29, 0x1c(r1) /* 80381E70 0037EDD0 38 21 00 28 */ addi r1, r1, 0x28 /* 80381E74 0037EDD4 7C 08 03 A6 */ mtlr r0 -/* 80381E78 0037EDD8 4E 80 00 20 */ blr +/* 80381E78 0037EDD8 4E 80 00 20 */ blr .global ExternalInterruptHandler ExternalInterruptHandler: diff --git a/asm/Dolphin/os/OSLink.s b/asm/Dolphin/os/OSLink.s index d3d355dd..8fb7d648 100644 --- a/asm/Dolphin/os/OSLink.s +++ b/asm/Dolphin/os/OSLink.s @@ -5,21 +5,21 @@ lbl_803F2290: .asciz "OSLink: unknown relocation type %3d\n" .balign 4 - + .global lbl_803F22B8 lbl_803F22B8: .asciz "OSUnlink: unknown relocation type %3d\n" .balign 4 - + .section .text, "ax" .global OSNotifyLink OSNotifyLink: -/* 80381ECC 0037EE2C 4E 80 00 20 */ blr +/* 80381ECC 0037EE2C 4E 80 00 20 */ blr .global OSNotifyUnlink OSNotifyUnlink: -/* 80381ED0 0037EE30 4E 80 00 20 */ blr +/* 80381ED0 0037EE30 4E 80 00 20 */ blr .global Relocate Relocate: @@ -228,7 +228,7 @@ lbl_8038217C: /* 80382180 0037F0E0 80 01 00 44 */ lwz r0, 0x44(r1) /* 80382184 0037F0E4 38 21 00 40 */ addi r1, r1, 0x40 /* 80382188 0037F0E8 7C 08 03 A6 */ mtlr r0 -/* 8038218C 0037F0EC 4E 80 00 20 */ blr +/* 8038218C 0037F0EC 4E 80 00 20 */ blr .global OSLink OSLink: @@ -401,7 +401,7 @@ lbl_803823D4: /* 803823DC 0037F33C 83 C1 00 10 */ lwz r30, 0x10(r1) /* 803823E0 0037F340 38 21 00 18 */ addi r1, r1, 0x18 /* 803823E4 0037F344 7C 08 03 A6 */ mtlr r0 -/* 803823E8 0037F348 4E 80 00 20 */ blr +/* 803823E8 0037F348 4E 80 00 20 */ blr .global Undo Undo: @@ -572,7 +572,7 @@ lbl_80382610: /* 80382614 0037F574 80 01 00 3C */ lwz r0, 0x3c(r1) /* 80382618 0037F578 38 21 00 38 */ addi r1, r1, 0x38 /* 8038261C 0037F57C 7C 08 03 A6 */ mtlr r0 -/* 80382620 0037F580 4E 80 00 20 */ blr +/* 80382620 0037F580 4E 80 00 20 */ blr .global OSUnlink OSUnlink: @@ -708,7 +708,7 @@ lbl_803827AC: /* 803827E8 0037F748 83 C1 00 10 */ lwz r30, 0x10(r1) /* 803827EC 0037F74C 38 21 00 18 */ addi r1, r1, 0x18 /* 803827F0 0037F750 7C 08 03 A6 */ mtlr r0 -/* 803827F4 0037F754 4E 80 00 20 */ blr +/* 803827F4 0037F754 4E 80 00 20 */ blr .global __OSModuleInit __OSModuleInit: @@ -717,4 +717,4 @@ __OSModuleInit: /* 80382800 0037F760 90 04 30 CC */ stw r0, 0x800030CC@l(r4) /* 80382804 0037F764 90 04 30 C8 */ stw r0, 0x30c8(r4) /* 80382808 0037F768 90 04 30 D0 */ stw r0, 0x30d0(r4) -/* 8038280C 0037F76C 4E 80 00 20 */ blr +/* 8038280C 0037F76C 4E 80 00 20 */ blr diff --git a/asm/Dolphin/os/OSMemory.s b/asm/Dolphin/os/OSMemory.s index 024c3bdf..67ef0866 100644 --- a/asm/Dolphin/os/OSMemory.s +++ b/asm/Dolphin/os/OSMemory.s @@ -6,7 +6,7 @@ lbl_803F22E0: .4byte 0x7f .4byte 0 .4byte 0 - + .section .text, "ax" .global sub_80382810 @@ -34,7 +34,7 @@ sub_80382810: /* 80382860 0037F7C0 83 A1 00 1C */ lwz r29, 0x1c(r1) /* 80382864 0037F7C4 38 21 00 28 */ addi r1, r1, 0x28 /* 80382868 0037F7C8 7C 08 03 A6 */ mtlr r0 -/* 8038286C 0037F7CC 4E 80 00 20 */ blr +/* 8038286C 0037F7CC 4E 80 00 20 */ blr .global sub_80382870 sub_80382870: @@ -91,7 +91,7 @@ lbl_80382918: /* 80382928 0037F888 83 81 00 18 */ lwz r28, 0x18(r1) /* 8038292C 0037F88C 38 21 00 28 */ addi r1, r1, 0x28 /* 80382930 0037F890 7C 08 03 A6 */ mtlr r0 -/* 80382934 0037F894 4E 80 00 20 */ blr +/* 80382934 0037F894 4E 80 00 20 */ blr .global sub_80382938 sub_80382938: @@ -154,7 +154,7 @@ lbl_803829F4: /* 80382A04 0037F964 83 81 00 18 */ lwz r28, 0x18(r1) /* 80382A08 0037F968 38 21 00 28 */ addi r1, r1, 0x28 /* 80382A0C 0037F96C 7C 08 03 A6 */ mtlr r0 -/* 80382A10 0037F970 4E 80 00 20 */ blr +/* 80382A10 0037F970 4E 80 00 20 */ blr OnReset: /* 80382A14 0037F974 7C 08 02 A6 */ mflr r0 @@ -172,7 +172,7 @@ lbl_80382A3C: /* 80382A40 0037F9A0 80 01 00 0C */ lwz r0, 0xc(r1) /* 80382A44 0037F9A4 38 21 00 08 */ addi r1, r1, 8 /* 80382A48 0037F9A8 7C 08 03 A6 */ mtlr r0 -/* 80382A4C 0037F9AC 4E 80 00 20 */ blr +/* 80382A4C 0037F9AC 4E 80 00 20 */ blr .global MEMIntrruptHandler MEMIntrruptHandler: @@ -195,7 +195,7 @@ MEMIntrruptHandler: /* 80382A90 0037F9F0 7D 88 03 A6 */ mtlr r12 /* 80382A94 0037F9F4 38 60 00 0F */ li r3, 0xf /* 80382A98 0037F9F8 4C C6 31 82 */ crclr 6 -/* 80382A9C 0037F9FC 4E 80 00 21 */ blrl +/* 80382A9C 0037F9FC 4E 80 00 21 */ blrl /* 80382AA0 0037FA00 48 00 00 0C */ b lbl_80382AAC lbl_80382AA4: /* 80382AA4 0037FA04 38 60 00 0F */ li r3, 0xf @@ -204,7 +204,7 @@ lbl_80382AAC: /* 80382AAC 0037FA0C 80 01 00 0C */ lwz r0, 0xc(r1) /* 80382AB0 0037FA10 38 21 00 08 */ addi r1, r1, 8 /* 80382AB4 0037FA14 7C 08 03 A6 */ mtlr r0 -/* 80382AB8 0037FA18 4E 80 00 20 */ blr +/* 80382AB8 0037FA18 4E 80 00 20 */ blr .global OSProtectRange OSProtectRange: @@ -258,7 +258,7 @@ lbl_80382B6C: /* 80382B70 0037FAD0 80 01 00 34 */ lwz r0, 0x34(r1) /* 80382B74 0037FAD4 38 21 00 30 */ addi r1, r1, 0x30 /* 80382B78 0037FAD8 7C 08 03 A6 */ mtlr r0 -/* 80382B7C 0037FADC 4E 80 00 20 */ blr +/* 80382B7C 0037FADC 4E 80 00 20 */ blr .global Config24MB Config24MB: @@ -271,29 +271,29 @@ Config24MB: /* 80382B98 0037FAF8 38 C6 00 02 */ addi r6, r6, 0x01000002@l /* 80382B9C 0037FAFC 3C A0 81 00 */ lis r5, 0x810000FF@ha /* 80382BA0 0037FB00 38 A5 00 FF */ addi r5, r5, 0x810000FF@l -/* 80382BA4 0037FB04 4C 00 01 2C */ isync +/* 80382BA4 0037FB04 4C 00 01 2C */ isync /* 80382BA8 0037FB08 7C F8 83 A6 */ mtdbatu 0, r7 /* 80382BAC 0037FB0C 7C 99 83 A6 */ mtdbatl 0, r4 /* 80382BB0 0037FB10 7C 78 83 A6 */ mtdbatu 0, r3 -/* 80382BB4 0037FB14 4C 00 01 2C */ isync +/* 80382BB4 0037FB14 4C 00 01 2C */ isync /* 80382BB8 0037FB18 7C F0 83 A6 */ mtibatu 0, r7 /* 80382BBC 0037FB1C 7C 91 83 A6 */ mtibatl 0, r4 /* 80382BC0 0037FB20 7C 70 83 A6 */ mtibatu 0, r3 -/* 80382BC4 0037FB24 4C 00 01 2C */ isync +/* 80382BC4 0037FB24 4C 00 01 2C */ isync /* 80382BC8 0037FB28 7C FC 83 A6 */ mtdbatu 2, r7 /* 80382BCC 0037FB2C 7C DD 83 A6 */ mtdbatl 2, r6 /* 80382BD0 0037FB30 7C BC 83 A6 */ mtdbatu 2, r5 -/* 80382BD4 0037FB34 4C 00 01 2C */ isync +/* 80382BD4 0037FB34 4C 00 01 2C */ isync /* 80382BD8 0037FB38 7C F4 83 A6 */ mtibatu 2, r7 /* 80382BDC 0037FB3C 7C D5 83 A6 */ mtibatl 2, r6 /* 80382BE0 0037FB40 7C B4 83 A6 */ mtibatu 2, r5 -/* 80382BE4 0037FB44 4C 00 01 2C */ isync +/* 80382BE4 0037FB44 4C 00 01 2C */ isync /* 80382BE8 0037FB48 7C 60 00 A6 */ mfmsr r3 /* 80382BEC 0037FB4C 60 63 00 30 */ ori r3, r3, 0x30 /* 80382BF0 0037FB50 7C 7B 03 A6 */ mtspr 0x1b, r3 /* 80382BF4 0037FB54 7C 68 02 A6 */ mflr r3 /* 80382BF8 0037FB58 7C 7A 03 A6 */ mtspr 0x1a, r3 -/* 80382BFC 0037FB5C 4C 00 00 64 */ rfi +/* 80382BFC 0037FB5C 4C 00 00 64 */ rfi .global Config48MB Config48MB: @@ -306,29 +306,29 @@ Config48MB: /* 80382C18 0037FB78 38 C6 00 02 */ addi r6, r6, 0x02000002@l /* 80382C1C 0037FB7C 3C A0 82 00 */ lis r5, 0x820001FF@ha /* 80382C20 0037FB80 38 A5 01 FF */ addi r5, r5, 0x820001FF@l -/* 80382C24 0037FB84 4C 00 01 2C */ isync +/* 80382C24 0037FB84 4C 00 01 2C */ isync /* 80382C28 0037FB88 7C F8 83 A6 */ mtdbatu 0, r7 /* 80382C2C 0037FB8C 7C 99 83 A6 */ mtdbatl 0, r4 /* 80382C30 0037FB90 7C 78 83 A6 */ mtdbatu 0, r3 -/* 80382C34 0037FB94 4C 00 01 2C */ isync +/* 80382C34 0037FB94 4C 00 01 2C */ isync /* 80382C38 0037FB98 7C F0 83 A6 */ mtibatu 0, r7 /* 80382C3C 0037FB9C 7C 91 83 A6 */ mtibatl 0, r4 /* 80382C40 0037FBA0 7C 70 83 A6 */ mtibatu 0, r3 -/* 80382C44 0037FBA4 4C 00 01 2C */ isync +/* 80382C44 0037FBA4 4C 00 01 2C */ isync /* 80382C48 0037FBA8 7C FC 83 A6 */ mtdbatu 2, r7 /* 80382C4C 0037FBAC 7C DD 83 A6 */ mtdbatl 2, r6 /* 80382C50 0037FBB0 7C BC 83 A6 */ mtdbatu 2, r5 -/* 80382C54 0037FBB4 4C 00 01 2C */ isync +/* 80382C54 0037FBB4 4C 00 01 2C */ isync /* 80382C58 0037FBB8 7C F4 83 A6 */ mtibatu 2, r7 /* 80382C5C 0037FBBC 7C D5 83 A6 */ mtibatl 2, r6 /* 80382C60 0037FBC0 7C B4 83 A6 */ mtibatu 2, r5 -/* 80382C64 0037FBC4 4C 00 01 2C */ isync +/* 80382C64 0037FBC4 4C 00 01 2C */ isync /* 80382C68 0037FBC8 7C 60 00 A6 */ mfmsr r3 /* 80382C6C 0037FBCC 60 63 00 30 */ ori r3, r3, 0x30 /* 80382C70 0037FBD0 7C 7B 03 A6 */ mtspr 0x1b, r3 /* 80382C74 0037FBD4 7C 68 02 A6 */ mflr r3 /* 80382C78 0037FBD8 7C 7A 03 A6 */ mtspr 0x1a, r3 -/* 80382C7C 0037FBDC 4C 00 00 64 */ rfi +/* 80382C7C 0037FBDC 4C 00 00 64 */ rfi .global RealMode RealMode: @@ -337,7 +337,7 @@ RealMode: /* 80382C88 0037FBE8 7C 60 00 A6 */ mfmsr r3 /* 80382C8C 0037FBEC 54 63 07 32 */ rlwinm r3, r3, 0, 0x1c, 0x19 /* 80382C90 0037FBF0 7C 7B 03 A6 */ mtspr 0x1b, r3 -/* 80382C94 0037FBF4 4C 00 00 64 */ rfi +/* 80382C94 0037FBF4 4C 00 00 64 */ rfi .global __OSInitMemoryProtection __OSInitMemoryProtection: @@ -415,4 +415,4 @@ lbl_80382D8C: /* 80382DA8 0037FD08 83 A1 00 3C */ lwz r29, 0x3c(r1) /* 80382DAC 0037FD0C 38 21 00 48 */ addi r1, r1, 0x48 /* 80382DB0 0037FD10 7C 08 03 A6 */ mtlr r0 -/* 80382DB4 0037FD14 4E 80 00 20 */ blr +/* 80382DB4 0037FD14 4E 80 00 20 */ blr diff --git a/asm/Dolphin/os/OSMutex.s b/asm/Dolphin/os/OSMutex.s index 8cc03c0c..aea38d65 100644 --- a/asm/Dolphin/os/OSMutex.s +++ b/asm/Dolphin/os/OSMutex.s @@ -35,4 +35,4 @@ lbl_80382E04: /* 80382E18 0037FD78 83 C1 00 10 */ lwz r30, 0x10(r1) /* 80382E1C 0037FD7C 38 21 00 18 */ addi r1, r1, 0x18 /* 80382E20 0037FD80 7C 08 03 A6 */ mtlr r0 -/* 80382E24 0037FD84 4E 80 00 20 */ blr +/* 80382E24 0037FD84 4E 80 00 20 */ blr diff --git a/asm/Dolphin/os/OSReboot.s b/asm/Dolphin/os/OSReboot.s index 1f0b029b..1b62c22a 100644 --- a/asm/Dolphin/os/OSReboot.s +++ b/asm/Dolphin/os/OSReboot.s @@ -12,19 +12,19 @@ SaveEnd: .skip 0x4 Prepared: .skip 0x8 - + .section .text, "ax" Run: /* 80382E28 0037FD88 7C 00 04 AC */ sync 0 -/* 80382E2C 0037FD8C 4C 00 01 2C */ isync +/* 80382E2C 0037FD8C 4C 00 01 2C */ isync /* 80382E30 0037FD90 7C 68 03 A6 */ mtlr r3 -/* 80382E34 0037FD94 4E 80 00 20 */ blr +/* 80382E34 0037FD94 4E 80 00 20 */ blr Callback: /* 80382E38 0037FD98 38 00 00 01 */ li r0, 1 /* 80382E3C 0037FD9C 90 0D AD 30 */ stw r0, Prepared@sda21(r13) -/* 80382E40 0037FDA0 4E 80 00 20 */ blr +/* 80382E40 0037FDA0 4E 80 00 20 */ blr .global __OSReboot __OSReboot: @@ -156,13 +156,13 @@ lbl_80382FD8: /* 80382FFC 0037FF5C 83 C1 03 38 */ lwz r30, 0x338(r1) /* 80383000 0037FF60 38 21 03 40 */ addi r1, r1, 0x340 /* 80383004 0037FF64 7C 08 03 A6 */ mtlr r0 -/* 80383008 0037FF68 4E 80 00 20 */ blr +/* 80383008 0037FF68 4E 80 00 20 */ blr .global OSSetSaveRegion OSSetSaveRegion: /* 8038300C 0037FF6C 90 6D AD 28 */ stw r3, SaveStart@sda21(r13) /* 80383010 0037FF70 90 8D AD 2C */ stw r4, SaveEnd@sda21(r13) -/* 80383014 0037FF74 4E 80 00 20 */ blr +/* 80383014 0037FF74 4E 80 00 20 */ blr .global OSGetSaveRegion OSGetSaveRegion: @@ -170,4 +170,4 @@ OSGetSaveRegion: /* 8038301C 0037FF7C 90 03 00 00 */ stw r0, 0(r3) /* 80383020 0037FF80 80 0D AC D8 */ lwz r0, __OSSavedRegionEnd@sda21(r13) /* 80383024 0037FF84 90 04 00 00 */ stw r0, 0(r4) -/* 80383028 0037FF88 4E 80 00 20 */ blr +/* 80383028 0037FF88 4E 80 00 20 */ blr diff --git a/asm/Dolphin/os/OSReset.s b/asm/Dolphin/os/OSReset.s index 955c70ca..36fe075e 100644 --- a/asm/Dolphin/os/OSReset.s +++ b/asm/Dolphin/os/OSReset.s @@ -3,7 +3,7 @@ .section .sbss ResetFunctionQueue: .skip 0x8 - + .section .text, "ax" .global OSRegisterResetFunction @@ -35,7 +35,7 @@ lbl_80383074: /* 80383078 0037FFD8 38 00 00 00 */ li r0, 0 /* 8038307C 0037FFDC 90 03 00 08 */ stw r0, 8(r3) /* 80383080 0037FFE0 90 65 00 00 */ stw r3, 0(r5) -/* 80383084 0037FFE4 4E 80 00 20 */ blr +/* 80383084 0037FFE4 4E 80 00 20 */ blr lbl_80383088: /* 80383088 0037FFE8 90 A3 00 08 */ stw r5, 8(r3) /* 8038308C 0037FFEC 80 85 00 0C */ lwz r4, 0xc(r5) @@ -44,10 +44,10 @@ lbl_80383088: /* 80383098 0037FFF8 90 83 00 0C */ stw r4, 0xc(r3) /* 8038309C 0037FFFC 40 82 00 0C */ bne lbl_803830A8 /* 803830A0 00380000 90 6D AD 38 */ stw r3, ResetFunctionQueue@sda21(r13) -/* 803830A4 00380004 4E 80 00 20 */ blr +/* 803830A4 00380004 4E 80 00 20 */ blr lbl_803830A8: /* 803830A8 00380008 90 64 00 08 */ stw r3, 8(r4) -/* 803830AC 0038000C 4E 80 00 20 */ blr +/* 803830AC 0038000C 4E 80 00 20 */ blr .global __OSCallResetFunctions __OSCallResetFunctions: @@ -65,7 +65,7 @@ lbl_803830D8: /* 803830D8 00380038 81 9F 00 00 */ lwz r12, 0(r31) /* 803830DC 0038003C 38 7D 00 00 */ addi r3, r29, 0 /* 803830E0 00380040 7D 88 03 A6 */ mtlr r12 -/* 803830E4 00380044 4E 80 00 21 */ blrl +/* 803830E4 00380044 4E 80 00 21 */ blrl /* 803830E8 00380048 7C 60 00 34 */ cntlzw r0, r3 /* 803830EC 0038004C 83 FF 00 08 */ lwz r31, 8(r31) /* 803830F0 00380050 54 00 D9 7E */ srwi r0, r0, 5 @@ -89,7 +89,7 @@ lbl_80383120: /* 8038312C 0038008C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80383130 00380090 38 21 00 20 */ addi r1, r1, 0x20 /* 80383134 00380094 7C 08 03 A6 */ mtlr r0 -/* 80383138 00380098 4E 80 00 20 */ blr +/* 80383138 00380098 4E 80 00 20 */ blr Reset: /* 8038313C 0038009C 48 00 00 20 */ b lbl_8038315C @@ -97,9 +97,9 @@ lbl_80383140: /* 80383140 003800A0 7D 10 FA A6 */ mfspr r8, 0x3f0 /* 80383144 003800A4 61 08 00 08 */ ori r8, r8, 8 /* 80383148 003800A8 7D 10 FB A6 */ mtspr 0x3f0, r8 -/* 8038314C 003800AC 4C 00 01 2C */ isync +/* 8038314C 003800AC 4C 00 01 2C */ isync /* 80383150 003800B0 7C 00 04 AC */ sync 0 -/* 80383154 003800B4 60 00 00 00 */ nop +/* 80383154 003800B4 60 00 00 00 */ nop /* 80383158 003800B8 48 00 00 08 */ b lbl_80383160 lbl_8038315C: /* 8038315C 003800BC 48 00 00 20 */ b lbl_8038317C @@ -110,7 +110,7 @@ lbl_80383164: /* 80383168 003800C8 7C E5 30 50 */ subf r7, r5, r6 /* 8038316C 003800CC 28 07 11 24 */ cmplwi r7, 0x1124 /* 80383170 003800D0 41 80 FF F4 */ blt lbl_80383164 -/* 80383174 003800D4 60 00 00 00 */ nop +/* 80383174 003800D4 60 00 00 00 */ nop /* 80383178 003800D8 48 00 00 08 */ b lbl_80383180 lbl_8038317C: /* 8038317C 003800DC 48 00 00 20 */ b lbl_8038319C @@ -120,12 +120,12 @@ lbl_80383180: /* 80383188 003800E8 38 80 00 03 */ li r4, 3 /* 8038318C 003800EC 90 88 00 24 */ stw r4, 0x24(r8) /* 80383190 003800F0 90 68 00 24 */ stw r3, 0x24(r8) -/* 80383194 003800F4 60 00 00 00 */ nop +/* 80383194 003800F4 60 00 00 00 */ nop /* 80383198 003800F8 48 00 00 08 */ b lbl_803831A0 lbl_8038319C: /* 8038319C 003800FC 48 00 00 0C */ b lbl_803831A8 lbl_803831A0: -/* 803831A0 00380100 60 00 00 00 */ nop +/* 803831A0 00380100 60 00 00 00 */ nop /* 803831A4 00380104 4B FF FF FC */ b lbl_803831A0 lbl_803831A8: /* 803831A8 00380108 4B FF FF 98 */ b lbl_80383140 @@ -149,7 +149,7 @@ __OSDoHotReset: /* 803831E4 00380144 83 E1 00 14 */ lwz r31, 0x14(r1) /* 803831E8 00380148 38 21 00 18 */ addi r1, r1, 0x18 /* 803831EC 0038014C 7C 08 03 A6 */ mtlr r0 -/* 803831F0 00380150 4E 80 00 20 */ blr +/* 803831F0 00380150 4E 80 00 20 */ blr .global OSResetSystem OSResetSystem: @@ -183,7 +183,7 @@ lbl_80383248: /* 80383248 003801A8 38 60 00 00 */ li r3, 0 /* 8038324C 003801AC 81 9B 00 00 */ lwz r12, 0(r27) /* 80383250 003801B0 7D 88 03 A6 */ mtlr r12 -/* 80383254 003801B4 4E 80 00 21 */ blrl +/* 80383254 003801B4 4E 80 00 21 */ blrl /* 80383258 003801B8 7C 60 00 34 */ cntlzw r0, r3 /* 8038325C 003801BC 83 7B 00 08 */ lwz r27, 8(r27) /* 80383260 003801C0 54 00 D9 7E */ srwi r0, r0, 5 @@ -234,7 +234,7 @@ lbl_803832F0: /* 803832F0 00380250 38 60 00 01 */ li r3, 1 /* 803832F4 00380254 81 9C 00 00 */ lwz r12, 0(r28) /* 803832F8 00380258 7D 88 03 A6 */ mtlr r12 -/* 803832FC 0038025C 4E 80 00 21 */ blrl +/* 803832FC 0038025C 4E 80 00 21 */ blrl /* 80383300 00380260 7C 60 00 34 */ cntlzw r0, r3 /* 80383304 00380264 83 9C 00 08 */ lwz r28, 8(r28) /* 80383308 00380268 54 00 D9 7E */ srwi r0, r0, 5 @@ -340,7 +340,7 @@ lbl_803833E4: /* 8038345C 003803BC 80 01 00 44 */ lwz r0, 0x44(r1) /* 80383460 003803C0 38 21 00 40 */ addi r1, r1, 0x40 /* 80383464 003803C4 7C 08 03 A6 */ mtlr r0 -/* 80383468 003803C8 4E 80 00 20 */ blr +/* 80383468 003803C8 4E 80 00 20 */ blr .global OSGetResetCode OSGetResetCode: @@ -357,4 +357,4 @@ lbl_80383484: /* 80383490 003803F0 54 00 00 38 */ rlwinm r0, r0, 0, 0, 0x1c /* 80383494 003803F4 54 03 E8 FE */ srwi r3, r0, 3 lbl_80383498: -/* 80383498 003803F8 4E 80 00 20 */ blr +/* 80383498 003803F8 4E 80 00 20 */ blr diff --git a/asm/Dolphin/os/OSResetSW.s b/asm/Dolphin/os/OSResetSW.s index ac3ac690..0a58f138 100644 --- a/asm/Dolphin/os/OSResetSW.s +++ b/asm/Dolphin/os/OSResetSW.s @@ -80,7 +80,7 @@ lbl_80383528: /* 80383558 003804B8 38 00 00 00 */ li r0, 0 /* 8038355C 003804BC 7D 88 03 A6 */ mtlr r12 /* 80383560 003804C0 90 0D AD 40 */ stw r0, lbl_805A9900@sda21(r13) -/* 80383564 003804C4 4E 80 00 21 */ blrl +/* 80383564 003804C4 4E 80 00 21 */ blrl lbl_80383568: /* 80383568 003804C8 38 00 00 02 */ li r0, 2 /* 8038356C 003804CC 3C 60 CC 00 */ lis r3, 0xCC003000@ha @@ -91,7 +91,7 @@ lbl_80383568: /* 80383580 003804E0 83 A1 00 1C */ lwz r29, 0x1c(r1) /* 80383584 003804E4 38 21 00 28 */ addi r1, r1, 0x28 /* 80383588 003804E8 7C 08 03 A6 */ mtlr r0 -/* 8038358C 003804EC 4E 80 00 20 */ blr +/* 8038358C 003804EC 4E 80 00 20 */ blr .global OSGetResetButtonState OSGetResetButtonState: @@ -273,4 +273,4 @@ lbl_80383800: /* 80383818 00380778 83 A1 00 0C */ lwz r29, 0xc(r1) /* 8038381C 0038077C 38 21 00 18 */ addi r1, r1, 0x18 /* 80383820 00380780 7C 08 03 A6 */ mtlr r0 -/* 80383824 00380784 4E 80 00 20 */ blr +/* 80383824 00380784 4E 80 00 20 */ blr diff --git a/asm/Dolphin/os/OSRtc.s b/asm/Dolphin/os/OSRtc.s index fa502dbb..c5e84464 100644 --- a/asm/Dolphin/os/OSRtc.s +++ b/asm/Dolphin/os/OSRtc.s @@ -3,7 +3,7 @@ .section .bss Scb: .skip 0x58 - + .section .text, "ax" .global WriteSramCallback @@ -32,7 +32,7 @@ lbl_80383870: /* 80383878 003807D8 83 C1 00 10 */ lwz r30, 0x10(r1) /* 8038387C 003807DC 38 21 00 18 */ addi r1, r1, 0x18 /* 80383880 003807E0 7C 08 03 A6 */ mtlr r0 -/* 80383884 003807E4 4E 80 00 20 */ blr +/* 80383884 003807E4 4E 80 00 20 */ blr .global WriteSram WriteSram: @@ -108,7 +108,7 @@ lbl_80383984: /* 80383990 003808F0 83 A1 00 1C */ lwz r29, 0x1c(r1) /* 80383994 003808F4 38 21 00 28 */ addi r1, r1, 0x28 /* 80383998 003808F8 7C 08 03 A6 */ mtlr r0 -/* 8038399C 003808FC 4E 80 00 20 */ blr +/* 8038399C 003808FC 4E 80 00 20 */ blr .global __OSInitSram __OSInitSram: @@ -191,7 +191,7 @@ lbl_80383AB0: /* 80383AC4 00380A24 83 C1 00 10 */ lwz r30, 0x10(r1) /* 80383AC8 00380A28 38 21 00 18 */ addi r1, r1, 0x18 /* 80383ACC 00380A2C 7C 08 03 A6 */ mtlr r0 -/* 80383AD0 00380A30 4E 80 00 20 */ blr +/* 80383AD0 00380A30 4E 80 00 20 */ blr .global __OSLockSram __OSLockSram: @@ -219,7 +219,7 @@ lbl_80383B18: /* 80383B20 00380A80 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80383B24 00380A84 38 21 00 10 */ addi r1, r1, 0x10 /* 80383B28 00380A88 7C 08 03 A6 */ mtlr r0 -/* 80383B2C 00380A8C 4E 80 00 20 */ blr +/* 80383B2C 00380A8C 4E 80 00 20 */ blr .global __OSLockSramEx __OSLockSramEx: @@ -247,7 +247,7 @@ lbl_80383B78: /* 80383B7C 00380ADC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80383B80 00380AE0 38 21 00 10 */ addi r1, r1, 0x10 /* 80383B84 00380AE4 7C 08 03 A6 */ mtlr r0 -/* 80383B88 00380AE8 4E 80 00 20 */ blr +/* 80383B88 00380AE8 4E 80 00 20 */ blr .global UnlockSram UnlockSram: @@ -454,7 +454,7 @@ lbl_80383E6C: /* 80383E84 00380DE4 80 01 00 34 */ lwz r0, 0x34(r1) /* 80383E88 00380DE8 38 21 00 30 */ addi r1, r1, 0x30 /* 80383E8C 00380DEC 7C 08 03 A6 */ mtlr r0 -/* 80383E90 00380DF0 4E 80 00 20 */ blr +/* 80383E90 00380DF0 4E 80 00 20 */ blr .global __OSUnlockSram __OSUnlockSram: @@ -466,7 +466,7 @@ __OSUnlockSram: /* 80383EA8 00380E08 80 01 00 0C */ lwz r0, 0xc(r1) /* 80383EAC 00380E0C 38 21 00 08 */ addi r1, r1, 8 /* 80383EB0 00380E10 7C 08 03 A6 */ mtlr r0 -/* 80383EB4 00380E14 4E 80 00 20 */ blr +/* 80383EB4 00380E14 4E 80 00 20 */ blr .global __OSUnlockSramEx __OSUnlockSramEx: @@ -478,14 +478,14 @@ __OSUnlockSramEx: /* 80383ECC 00380E2C 80 01 00 0C */ lwz r0, 0xc(r1) /* 80383ED0 00380E30 38 21 00 08 */ addi r1, r1, 8 /* 80383ED4 00380E34 7C 08 03 A6 */ mtlr r0 -/* 80383ED8 00380E38 4E 80 00 20 */ blr +/* 80383ED8 00380E38 4E 80 00 20 */ blr .global __OSSyncSram __OSSyncSram: /* 80383EDC 00380E3C 3C 60 80 54 */ lis r3, Scb@ha /* 80383EE0 00380E40 38 63 15 A0 */ addi r3, r3, Scb@l /* 80383EE4 00380E44 80 63 00 4C */ lwz r3, 0x4c(r3) -/* 80383EE8 00380E48 4E 80 00 20 */ blr +/* 80383EE8 00380E48 4E 80 00 20 */ blr .global sub_80383eec sub_80383eec: @@ -564,7 +564,7 @@ lbl_80383FF4: /* 80384000 00380F60 83 A1 00 1C */ lwz r29, 0x1c(r1) /* 80384004 00380F64 38 21 00 28 */ addi r1, r1, 0x28 /* 80384008 00380F68 7C 08 03 A6 */ mtlr r0 -/* 8038400C 00380F6C 4E 80 00 20 */ blr +/* 8038400C 00380F6C 4E 80 00 20 */ blr .global OSGetSoundMode OSGetSoundMode: @@ -603,7 +603,7 @@ lbl_8038406C: /* 80384080 00380FE0 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80384084 00380FE4 38 21 00 20 */ addi r1, r1, 0x20 /* 80384088 00380FE8 7C 08 03 A6 */ mtlr r0 -/* 8038408C 00380FEC 4E 80 00 20 */ blr +/* 8038408C 00380FEC 4E 80 00 20 */ blr .global OSSetSoundMode OSSetSoundMode: @@ -651,7 +651,7 @@ lbl_8038411C: /* 80384124 00381084 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80384128 00381088 38 21 00 20 */ addi r1, r1, 0x20 /* 8038412C 0038108C 7C 08 03 A6 */ mtlr r0 -/* 80384130 00381090 4E 80 00 20 */ blr +/* 80384130 00381090 4E 80 00 20 */ blr .global OSGetProgressiveMode OSGetProgressiveMode: @@ -684,7 +684,7 @@ lbl_80384178: /* 80384194 003810F4 83 E1 00 14 */ lwz r31, 0x14(r1) /* 80384198 003810F8 38 21 00 18 */ addi r1, r1, 0x18 /* 8038419C 003810FC 7C 08 03 A6 */ mtlr r0 -/* 803841A0 00381100 4E 80 00 20 */ blr +/* 803841A0 00381100 4E 80 00 20 */ blr .global sub_803841a4 sub_803841a4: @@ -732,7 +732,7 @@ lbl_80384230: /* 80384238 00381198 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8038423C 0038119C 38 21 00 20 */ addi r1, r1, 0x20 /* 80384240 003811A0 7C 08 03 A6 */ mtlr r0 -/* 80384244 003811A4 4E 80 00 20 */ blr +/* 80384244 003811A4 4E 80 00 20 */ blr .global OSGetLanguage OSGetLanguage: @@ -764,7 +764,7 @@ lbl_8038428C: /* 803842A4 00381204 83 E1 00 14 */ lwz r31, 0x14(r1) /* 803842A8 00381208 38 21 00 18 */ addi r1, r1, 0x18 /* 803842AC 0038120C 7C 08 03 A6 */ mtlr r0 -/* 803842B0 00381210 4E 80 00 20 */ blr +/* 803842B0 00381210 4E 80 00 20 */ blr .global OSGetWirelessID OSGetWirelessID: @@ -802,7 +802,7 @@ lbl_80384304: /* 80384328 00381288 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8038432C 0038128C 38 21 00 20 */ addi r1, r1, 0x20 /* 80384330 00381290 7C 08 03 A6 */ mtlr r0 -/* 80384334 00381294 4E 80 00 20 */ blr +/* 80384334 00381294 4E 80 00 20 */ blr .global OSSetWirelessID OSSetWirelessID: @@ -852,4 +852,4 @@ lbl_803843C8: /* 803843D4 00381334 83 A1 00 1C */ lwz r29, 0x1c(r1) /* 803843D8 00381338 38 21 00 28 */ addi r1, r1, 0x28 /* 803843DC 0038133C 7C 08 03 A6 */ mtlr r0 -/* 803843E0 00381340 4E 80 00 20 */ blr +/* 803843E0 00381340 4E 80 00 20 */ blr diff --git a/asm/Dolphin/os/OSSync.s b/asm/Dolphin/os/OSSync.s index b277cd3a..7bbfa2f1 100644 --- a/asm/Dolphin/os/OSSync.s +++ b/asm/Dolphin/os/OSSync.s @@ -8,12 +8,12 @@ SystemCallVector: /* 803843E4 00381344 7D 30 FA A6 */ mfspr r9, 0x3f0 /* 803843E8 00381348 61 2A 00 08 */ ori r10, r9, 8 /* 803843EC 0038134C 7D 50 FB A6 */ mtspr 0x3f0, r10 -/* 803843F0 00381350 4C 00 01 2C */ isync +/* 803843F0 00381350 4C 00 01 2C */ isync /* 803843F4 00381354 7C 00 04 AC */ sync 0 /* 803843F8 00381358 7D 30 FB A6 */ mtspr 0x3f0, r9 -/* 803843FC 0038135C 4C 00 00 64 */ rfi +/* 803843FC 0038135C 4C 00 00 64 */ rfi __OSSystemCallVectorEnd: -/* 80384400 00381360 60 00 00 00 */ nop +/* 80384400 00381360 60 00 00 00 */ nop .global __OSInitSystemCall __OSInitSystemCall: @@ -41,4 +41,4 @@ __OSInitSystemCall: /* 80384458 003813B8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8038445C 003813BC 38 21 00 10 */ addi r1, r1, 0x10 /* 80384460 003813C0 7C 08 03 A6 */ mtlr r0 -/* 80384464 003813C4 4E 80 00 20 */ blr +/* 80384464 003813C4 4E 80 00 20 */ blr diff --git a/asm/Dolphin/os/OSThread.s b/asm/Dolphin/os/OSThread.s index 8fa22c77..2dc92366 100644 --- a/asm/Dolphin/os/OSThread.s +++ b/asm/Dolphin/os/OSThread.s @@ -16,13 +16,16 @@ lbl_805A9928: .global lbl_805A8B50 lbl_805A8B50: - .incbin "baserom.dol", 0x3F64F0, 0x8 + # ROM: 0x3F64F0 + .4byte 0x80384468 + .4byte 0 + .section .text, "ax" .global DefaultSwitchThreadCallback DefaultSwitchThreadCallback: -/* 80384468 003813C8 4E 80 00 20 */ blr +/* 80384468 003813C8 4E 80 00 20 */ blr .global __OSThreadInit __OSThreadInit: @@ -72,7 +75,7 @@ __OSThreadInit: /* 80384518 00381478 81 8D 9F 90 */ lwz r12, lbl_805A8B50@sda21(r13) /* 8038451C 0038147C 80 7E 00 E4 */ lwz r3, 0xe4(r30) /* 80384520 00381480 7D 88 03 A6 */ mtlr r12 -/* 80384524 00381484 4E 80 00 21 */ blrl +/* 80384524 00381484 4E 80 00 21 */ blrl /* 80384528 00381488 93 FE 00 E4 */ stw r31, 0xe4(r30) /* 8038452C 0038148C 38 60 00 00 */ li r3, 0 /* 80384530 00381490 48 00 0D CD */ bl OSClearStack @@ -114,20 +117,20 @@ lbl_80384588: /* 803845B4 00381514 83 81 00 08 */ lwz r28, 8(r1) /* 803845B8 00381518 38 21 00 18 */ addi r1, r1, 0x18 /* 803845BC 0038151C 7C 08 03 A6 */ mtlr r0 -/* 803845C0 00381520 4E 80 00 20 */ blr +/* 803845C0 00381520 4E 80 00 20 */ blr .global OSInitThreadQueue OSInitThreadQueue: /* 803845C4 00381524 38 00 00 00 */ li r0, 0 /* 803845C8 00381528 90 03 00 04 */ stw r0, 4(r3) /* 803845CC 0038152C 90 03 00 00 */ stw r0, 0(r3) -/* 803845D0 00381530 4E 80 00 20 */ blr +/* 803845D0 00381530 4E 80 00 20 */ blr .global OSGetCurrentThread OSGetCurrentThread: /* 803845D4 00381534 3C 60 80 00 */ lis r3, 0x800000E4@ha /* 803845D8 00381538 80 63 00 E4 */ lwz r3, 0x800000E4@l(r3) -/* 803845DC 0038153C 4E 80 00 20 */ blr +/* 803845DC 0038153C 4E 80 00 20 */ blr .global OSDisableScheduler OSDisableScheduler: @@ -146,7 +149,7 @@ OSDisableScheduler: /* 80384610 00381570 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80384614 00381574 38 21 00 10 */ addi r1, r1, 0x10 /* 80384618 00381578 7C 08 03 A6 */ mtlr r0 -/* 8038461C 0038157C 4E 80 00 20 */ blr +/* 8038461C 0038157C 4E 80 00 20 */ blr .global OSEnableScheduler OSEnableScheduler: @@ -165,7 +168,7 @@ OSEnableScheduler: /* 80384650 003815B0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80384654 003815B4 38 21 00 10 */ addi r1, r1, 0x10 /* 80384658 003815B8 7C 08 03 A6 */ mtlr r0 -/* 8038465C 003815BC 4E 80 00 20 */ blr +/* 8038465C 003815BC 4E 80 00 20 */ blr .global UnsetRun UnsetRun: @@ -199,7 +202,7 @@ lbl_80384694: lbl_803846BC: /* 803846BC 0038161C 38 00 00 00 */ li r0, 0 /* 803846C0 00381620 90 03 02 DC */ stw r0, 0x2dc(r3) -/* 803846C4 00381624 4E 80 00 20 */ blr +/* 803846C4 00381624 4E 80 00 20 */ blr .global __OSGetEffectivePriority __OSGetEffectivePriority: @@ -220,7 +223,7 @@ lbl_803846F4: /* 803846F4 00381654 28 05 00 00 */ cmplwi r5, 0 /* 803846F8 00381658 40 82 FF DC */ bne lbl_803846D4 /* 803846FC 0038165C 7C 83 23 78 */ mr r3, r4 -/* 80384700 00381660 4E 80 00 20 */ blr +/* 80384700 00381660 4E 80 00 20 */ blr .global SetEffectivePriority SetEffectivePriority: @@ -355,7 +358,7 @@ lbl_803848AC: /* 803848B4 00381814 83 C1 00 10 */ lwz r30, 0x10(r1) /* 803848B8 00381818 38 21 00 18 */ addi r1, r1, 0x18 /* 803848BC 0038181C 7C 08 03 A6 */ mtlr r0 -/* 803848C0 00381820 4E 80 00 20 */ blr +/* 803848C0 00381820 4E 80 00 20 */ blr .global SelectThread SelectThread: @@ -440,7 +443,7 @@ lbl_803849D8: /* 803849E0 00381940 80 7E 00 E4 */ lwz r3, 0x800000E4@l(r30) /* 803849E4 00381944 38 80 00 00 */ li r4, 0 /* 803849E8 00381948 7D 88 03 A6 */ mtlr r12 -/* 803849EC 0038194C 4E 80 00 21 */ blrl +/* 803849EC 0038194C 4E 80 00 21 */ blrl /* 803849F0 00381950 80 0D AD 60 */ lwz r0, lbl_805A9920@sda21(r13) /* 803849F4 00381954 38 60 00 00 */ li r3, 0 /* 803849F8 00381958 90 7E 00 E4 */ stw r3, 0xe4(r30) @@ -497,7 +500,7 @@ lbl_80384A94: /* 80384AAC 00381A0C 81 8D 9F 90 */ lwz r12, lbl_805A8B50@sda21(r13) /* 80384AB0 00381A10 80 7F 00 E4 */ lwz r3, 0x800000E4@l(r31) /* 80384AB4 00381A14 7D 88 03 A6 */ mtlr r12 -/* 80384AB8 00381A18 4E 80 00 21 */ blrl +/* 80384AB8 00381A18 4E 80 00 21 */ blrl /* 80384ABC 00381A1C 93 DF 00 E4 */ stw r30, 0xe4(r31) /* 80384AC0 00381A20 7F C3 F3 78 */ mr r3, r30 /* 80384AC4 00381A24 4B FF A9 59 */ bl OSSetCurrentContext @@ -510,7 +513,7 @@ lbl_80384AD4: /* 80384ADC 00381A3C 83 C1 00 10 */ lwz r30, 0x10(r1) /* 80384AE0 00381A40 38 21 00 18 */ addi r1, r1, 0x18 /* 80384AE4 00381A44 7C 08 03 A6 */ mtlr r0 -/* 80384AE8 00381A48 4E 80 00 20 */ blr +/* 80384AE8 00381A48 4E 80 00 20 */ blr .global __OSReschedule __OSReschedule: @@ -526,7 +529,7 @@ lbl_80384B0C: /* 80384B0C 00381A6C 80 01 00 0C */ lwz r0, 0xc(r1) /* 80384B10 00381A70 38 21 00 08 */ addi r1, r1, 8 /* 80384B14 00381A74 7C 08 03 A6 */ mtlr r0 -/* 80384B18 00381A78 4E 80 00 20 */ blr +/* 80384B18 00381A78 4E 80 00 20 */ blr .global OSYieldThread OSYieldThread: @@ -544,7 +547,7 @@ OSYieldThread: /* 80384B48 00381AA8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80384B4C 00381AAC 38 21 00 10 */ addi r1, r1, 0x10 /* 80384B50 00381AB0 7C 08 03 A6 */ mtlr r0 -/* 80384B54 00381AB4 4E 80 00 20 */ blr +/* 80384B54 00381AB4 4E 80 00 20 */ blr .global OSCancelThread OSCancelThread: @@ -677,7 +680,7 @@ lbl_80384CF8: /* 80384D04 00381C64 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80384D08 00381C68 38 21 00 20 */ addi r1, r1, 0x20 /* 80384D0C 00381C6C 7C 08 03 A6 */ mtlr r0 -/* 80384D10 00381C70 4E 80 00 20 */ blr +/* 80384D10 00381C70 4E 80 00 20 */ blr .global OSResumeThread OSResumeThread: @@ -868,7 +871,7 @@ lbl_80384F74: /* 80384F8C 00381EEC 83 A1 00 1C */ lwz r29, 0x1c(r1) /* 80384F90 00381EF0 38 21 00 28 */ addi r1, r1, 0x28 /* 80384F94 00381EF4 7C 08 03 A6 */ mtlr r0 -/* 80384F98 00381EF8 4E 80 00 20 */ blr +/* 80384F98 00381EF8 4E 80 00 20 */ blr .global OSSuspendThread OSSuspendThread: @@ -976,7 +979,7 @@ lbl_803850E4: /* 803850FC 0038205C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80385100 00382060 38 21 00 20 */ addi r1, r1, 0x20 /* 80385104 00382064 7C 08 03 A6 */ mtlr r0 -/* 80385108 00382068 4E 80 00 20 */ blr +/* 80385108 00382068 4E 80 00 20 */ blr .global OSSleepThread OSSleepThread: @@ -1047,7 +1050,7 @@ lbl_803851D8: /* 803851E8 00382148 83 C1 00 10 */ lwz r30, 0x10(r1) /* 803851EC 0038214C 38 21 00 18 */ addi r1, r1, 0x18 /* 803851F0 00382150 7C 08 03 A6 */ mtlr r0 -/* 803851F4 00382154 4E 80 00 20 */ blr +/* 803851F4 00382154 4E 80 00 20 */ blr .global OSWakeupThread OSWakeupThread: @@ -1122,7 +1125,7 @@ lbl_803852DC: /* 803852EC 0038224C 83 C1 00 10 */ lwz r30, 0x10(r1) /* 803852F0 00382250 38 21 00 18 */ addi r1, r1, 0x18 /* 803852F4 00382254 7C 08 03 A6 */ mtlr r0 -/* 803852F8 00382258 4E 80 00 20 */ blr +/* 803852F8 00382258 4E 80 00 20 */ blr .global OSClearStack OSClearStack: @@ -1172,4 +1175,4 @@ lbl_80385394: /* 80385398 003822F8 83 E1 00 14 */ lwz r31, 0x14(r1) /* 8038539C 003822FC 38 21 00 18 */ addi r1, r1, 0x18 /* 803853A0 00382300 7C 08 03 A6 */ mtlr r0 -/* 803853A4 00382304 4E 80 00 20 */ blr +/* 803853A4 00382304 4E 80 00 20 */ blr diff --git a/asm/Dolphin/os/OSTime.s b/asm/Dolphin/os/OSTime.s index be580a68..42d1dec0 100644 --- a/asm/Dolphin/os/OSTime.s +++ b/asm/Dolphin/os/OSTime.s @@ -16,7 +16,7 @@ YearDays: .4byte 0x00000111 .4byte 0x00000130 .4byte 0x0000014E - + .global lbl_803F2320 lbl_803F2320: .4byte 0x00000000 @@ -31,7 +31,7 @@ lbl_803F2320: .4byte 0x00000112 .4byte 0x00000131 .4byte 0x0000014F - + .section .text, "ax" .global OSGetTime @@ -41,12 +41,12 @@ OSGetTime: /* 803853B0 00382310 7C AD 42 E6 */ mftbu r5 /* 803853B4 00382314 7C 03 28 00 */ cmpw r3, r5 /* 803853B8 00382318 40 82 FF F0 */ bne OSGetTime -/* 803853BC 0038231C 4E 80 00 20 */ blr +/* 803853BC 0038231C 4E 80 00 20 */ blr .global OSGetTick OSGetTick: /* 803853C0 00382320 7C 6C 42 E6 */ mftb r3, 0x10c -/* 803853C4 00382324 4E 80 00 20 */ blr +/* 803853C4 00382324 4E 80 00 20 */ blr .global __OSGetSystemTime __OSGetSystemTime: @@ -74,7 +74,7 @@ __OSGetSystemTime: /* 8038541C 0038237C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80385420 00382380 38 21 00 20 */ addi r1, r1, 0x20 /* 80385424 00382384 7C 08 03 A6 */ mtlr r0 -/* 80385428 00382388 4E 80 00 20 */ blr +/* 80385428 00382388 4E 80 00 20 */ blr .global __OSTimeToSystemTime __OSTimeToSystemTime: @@ -99,7 +99,7 @@ __OSTimeToSystemTime: /* 80385474 003823D4 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80385478 003823D8 38 21 00 20 */ addi r1, r1, 0x20 /* 8038547C 003823DC 7C 08 03 A6 */ mtlr r0 -/* 80385480 003823E0 4E 80 00 20 */ blr +/* 80385480 003823E0 4E 80 00 20 */ blr .global GetDates GetDates: @@ -217,7 +217,7 @@ lbl_803855F4: /* 80385610 00382570 7C 63 00 50 */ subf r3, r3, r0 /* 80385614 00382574 38 03 00 01 */ addi r0, r3, 1 /* 80385618 00382578 90 04 00 0C */ stw r0, 0xc(r4) -/* 8038561C 0038257C 4E 80 00 20 */ blr +/* 8038561C 0038257C 4E 80 00 20 */ blr .global OSTicksToCalendarTime OSTicksToCalendarTime: @@ -351,4 +351,4 @@ lbl_803857A0: /* 80385814 00382774 80 01 00 3C */ lwz r0, 0x3c(r1) /* 80385818 00382778 38 21 00 38 */ addi r1, r1, 0x38 /* 8038581C 0038277C 7C 08 03 A6 */ mtlr r0 -/* 80385820 00382780 4E 80 00 20 */ blr +/* 80385820 00382780 4E 80 00 20 */ blr diff --git a/asm/Dolphin/pad/PadClamp.s b/asm/Dolphin/pad/PadClamp.s index 79507bc8..79e8b72d 100644 --- a/asm/Dolphin/pad/PadClamp.s +++ b/asm/Dolphin/pad/PadClamp.s @@ -3,8 +3,13 @@ .section .rodata lbl_803D8588: - .incbin "baserom.dol", 0x3D5588, 0x10 - + # ROM: 0x3D5588 + .4byte 0x1EB40F48 + .4byte 0x280F3B1F + .4byte 0x382C0000 + .4byte 0 + + .section .text, "ax" .global ClampStick @@ -51,7 +56,7 @@ lbl_80385924: /* 80385934 00382894 38 00 00 00 */ li r0, 0 /* 80385938 00382898 98 04 00 00 */ stb r0, 0(r4) /* 8038593C 0038289C 98 03 00 00 */ stb r0, 0(r3) -/* 80385940 003828A0 4E 80 00 20 */ blr +/* 80385940 003828A0 4E 80 00 20 */ blr lbl_80385944: /* 80385944 003828A4 7C C6 07 74 */ extsb r6, r6 /* 80385948 003828A8 7D 26 61 D6 */ mullw r9, r6, r12 @@ -95,7 +100,7 @@ lbl_803859D4: /* 803859D8 00382938 7C 08 61 D6 */ mullw r0, r8, r12 /* 803859DC 0038293C 98 A3 00 00 */ stb r5, 0(r3) /* 803859E0 00382940 98 04 00 00 */ stb r0, 0(r4) -/* 803859E4 00382944 4E 80 00 20 */ blr +/* 803859E4 00382944 4E 80 00 20 */ blr .global PADClamp PADClamp: @@ -174,4 +179,4 @@ lbl_80385ACC: /* 80385AEC 00382A4C 83 81 00 10 */ lwz r28, 0x10(r1) /* 80385AF0 00382A50 38 21 00 20 */ addi r1, r1, 0x20 /* 80385AF4 00382A54 7C 08 03 A6 */ mtlr r0 -/* 80385AF8 00382A58 4E 80 00 20 */ blr +/* 80385AF8 00382A58 4E 80 00 20 */ blr diff --git a/asm/Dolphin/pad/pad.s b/asm/Dolphin/pad/pad.s index 79ef72f0..8a65db66 100644 --- a/asm/Dolphin/pad/pad.s +++ b/asm/Dolphin/pad/pad.s @@ -5,7 +5,7 @@ lbl_80541FF0: .skip 0x10 lbl_80542000: .skip 0x40 - + .section .sbss .balign 4 @@ -40,11 +40,11 @@ SamplingCallback: .global __PADSpec __PADSpec: .skip 0x4 - + .section .data, "wa" PAD_VERSION_STR: .asciz "<< Dolphin SDK - PAD\trelease build: Sep 5 2002 05:34:02 (0x2301) >>" - + .balign 4 .global lbl_803F2398 lbl_803F2398: @@ -57,25 +57,25 @@ lbl_803F2398: __PADVersion: .4byte PAD_VERSION_STR - + ResettingChan: .4byte 0x00000020 - + XPatchBits: .4byte 0xF0000000 - + AnalogMode: .4byte 0x00000300 - + lbl_805A8B68: .4byte 00000005 - + MakeStatus: .4byte SPEC2_MakeStatus - + CmdReadOrigin: .4byte 0x41000000 - + .global CmdCalibrate CmdCalibrate: .4byte 0x42000000 @@ -196,7 +196,7 @@ lbl_80385C8C: /* 80385C90 00382BF0 83 E1 00 14 */ lwz r31, 0x14(r1) /* 80385C94 00382BF4 38 21 00 18 */ addi r1, r1, 0x18 /* 80385C98 00382BF8 7C 08 03 A6 */ mtlr r0 -/* 80385C9C 00382BFC 4E 80 00 20 */ blr +/* 80385C9C 00382BFC 4E 80 00 20 */ blr .global PADOriginCallback PADOriginCallback: @@ -250,7 +250,7 @@ lbl_80385D50: /* 80385D54 00382CB4 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 80385D58 00382CB8 38 21 00 30 */ addi r1, r1, 0x30 /* 80385D5C 00382CBC 7C 08 03 A6 */ mtlr r0 -/* 80385D60 00382CC0 4E 80 00 20 */ blr +/* 80385D60 00382CC0 4E 80 00 20 */ blr .global sub_80385d64 sub_80385d64: @@ -303,7 +303,7 @@ lbl_80385E08: /* 80385E14 00382D74 83 A1 00 1C */ lwz r29, 0x1c(r1) /* 80385E18 00382D78 38 21 00 28 */ addi r1, r1, 0x28 /* 80385E1C 00382D7C 7C 08 03 A6 */ mtlr r0 -/* 80385E20 00382D80 4E 80 00 20 */ blr +/* 80385E20 00382D80 4E 80 00 20 */ blr .global PADProbeCallback PADProbeCallback: @@ -362,7 +362,7 @@ lbl_80385EE4: /* 80385EEC 00382E4C 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80385EF0 00382E50 38 21 00 30 */ addi r1, r1, 0x30 /* 80385EF4 00382E54 7C 08 03 A6 */ mtlr r0 -/* 80385EF8 00382E58 4E 80 00 20 */ blr +/* 80385EF8 00382E58 4E 80 00 20 */ blr .global PADTypeAndStatusCallback PADTypeAndStatusCallback: @@ -578,7 +578,7 @@ lbl_80386208: /* 80386218 00383178 83 81 00 30 */ lwz r28, 0x30(r1) /* 8038621C 0038317C 38 21 00 40 */ addi r1, r1, 0x40 /* 80386220 00383180 7C 08 03 A6 */ mtlr r0 -/* 80386224 00383184 4E 80 00 20 */ blr +/* 80386224 00383184 4E 80 00 20 */ blr .global sub_80386228 sub_80386228: @@ -660,7 +660,7 @@ lbl_80386340: /* 8038634C 003832AC 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80386350 003832B0 38 21 00 20 */ addi r1, r1, 0x20 /* 80386354 003832B4 7C 08 03 A6 */ mtlr r0 -/* 80386358 003832B8 4E 80 00 20 */ blr +/* 80386358 003832B8 4E 80 00 20 */ blr .global PADReset PADReset: @@ -729,7 +729,7 @@ lbl_80386438: /* 8038644C 003833AC 83 C1 00 10 */ lwz r30, 0x10(r1) /* 80386450 003833B0 38 21 00 18 */ addi r1, r1, 0x18 /* 80386454 003833B4 7C 08 03 A6 */ mtlr r0 -/* 80386458 003833B8 4E 80 00 20 */ blr +/* 80386458 003833B8 4E 80 00 20 */ blr .global PADRecalibrate PADRecalibrate: @@ -799,7 +799,7 @@ lbl_8038653C: /* 80386550 003834B0 83 C1 00 10 */ lwz r30, 0x10(r1) /* 80386554 003834B4 38 21 00 18 */ addi r1, r1, 0x18 /* 80386558 003834B8 7C 08 03 A6 */ mtlr r0 -/* 8038655C 003834BC 4E 80 00 20 */ blr +/* 8038655C 003834BC 4E 80 00 20 */ blr .global PADInit PADInit: @@ -942,7 +942,7 @@ lbl_80386764: /* 80386768 003836C8 80 01 00 3C */ lwz r0, 0x3c(r1) /* 8038676C 003836CC 38 21 00 38 */ addi r1, r1, 0x38 /* 80386770 003836D0 7C 08 03 A6 */ mtlr r0 -/* 80386774 003836D4 4E 80 00 20 */ blr +/* 80386774 003836D4 4E 80 00 20 */ blr .global PADRead PADRead: @@ -1156,7 +1156,7 @@ lbl_80386A78: /* 80386A80 003839E0 38 9F 00 00 */ addi r4, r31, 0 /* 80386A84 003839E4 7D 88 03 A6 */ mtlr r12 /* 80386A88 003839E8 38 A1 00 14 */ addi r5, r1, 0x14 -/* 80386A8C 003839EC 4E 80 00 21 */ blrl +/* 80386A8C 003839EC 4E 80 00 21 */ blrl /* 80386A90 003839F0 A0 1F 00 00 */ lhz r0, 0(r31) /* 80386A94 003839F4 54 00 04 A5 */ rlwinm. r0, r0, 0, 0x12, 0x12 /* 80386A98 003839F8 41 82 00 44 */ beq lbl_80386ADC @@ -1195,7 +1195,7 @@ lbl_80386AF0: /* 80386B14 00383A74 80 01 00 54 */ lwz r0, 0x54(r1) /* 80386B18 00383A78 38 21 00 50 */ addi r1, r1, 0x50 /* 80386B1C 00383A7C 7C 08 03 A6 */ mtlr r0 -/* 80386B20 00383A80 4E 80 00 20 */ blr +/* 80386B20 00383A80 4E 80 00 20 */ blr .global PADControlAllMotors PADControlAllMotors: @@ -1248,7 +1248,7 @@ lbl_80386BC0: /* 80386BCC 00383B2C 80 01 00 2C */ lwz r0, 0x2c(r1) /* 80386BD0 00383B30 38 21 00 28 */ addi r1, r1, 0x28 /* 80386BD4 00383B34 7C 08 03 A6 */ mtlr r0 -/* 80386BD8 00383B38 4E 80 00 20 */ blr +/* 80386BD8 00383B38 4E 80 00 20 */ blr .global PADControlMotor PADControlMotor: @@ -1294,7 +1294,7 @@ lbl_80386C5C: /* 80386C70 00383BD0 83 A1 00 1C */ lwz r29, 0x1c(r1) /* 80386C74 00383BD4 38 21 00 28 */ addi r1, r1, 0x28 /* 80386C78 00383BD8 7C 08 03 A6 */ mtlr r0 -/* 80386C7C 00383BDC 4E 80 00 20 */ blr +/* 80386C7C 00383BDC 4E 80 00 20 */ blr .global PADSetSpec PADSetSpec: @@ -1326,7 +1326,7 @@ lbl_80386CCC: /* 80386CD4 00383C34 90 0D 9F AC */ stw r0, MakeStatus@sda21(r13) lbl_80386CD8: /* 80386CD8 00383C38 90 6D 9F A8 */ stw r3, lbl_805A8B68@sda21(r13) -/* 80386CDC 00383C3C 4E 80 00 20 */ blr +/* 80386CDC 00383C3C 4E 80 00 20 */ blr .global SPEC0_MakeStatus SPEC0_MakeStatus: @@ -1433,7 +1433,7 @@ lbl_80386E20: /* 80386E44 00383DA4 88 64 00 05 */ lbz r3, 5(r4) /* 80386E48 00383DA8 38 03 FF 80 */ addi r0, r3, -128 /* 80386E4C 00383DAC 98 04 00 05 */ stb r0, 5(r4) -/* 80386E50 00383DB0 4E 80 00 20 */ blr +/* 80386E50 00383DB0 4E 80 00 20 */ blr .global SPEC1_MakeStatus SPEC1_MakeStatus: @@ -1540,7 +1540,7 @@ lbl_80386F94: /* 80386FB8 00383F18 88 64 00 05 */ lbz r3, 5(r4) /* 80386FBC 00383F1C 38 03 FF 80 */ addi r0, r3, -128 /* 80386FC0 00383F20 98 04 00 05 */ stb r0, 5(r4) -/* 80386FC4 00383F24 4E 80 00 20 */ blr +/* 80386FC4 00383F24 4E 80 00 20 */ blr .global SPEC2_MakeStatus SPEC2_MakeStatus: @@ -1816,7 +1816,7 @@ lbl_80387398: lbl_803873B4: /* 803873B4 00384314 7C 60 18 50 */ subf r3, r0, r3 /* 803873B8 00384318 98 64 00 07 */ stb r3, 7(r4) -/* 803873BC 0038431C 4E 80 00 20 */ blr +/* 803873BC 0038431C 4E 80 00 20 */ blr OnReset: /* 803873C0 00384320 7C 08 02 A6 */ mflr r0 @@ -1927,7 +1927,7 @@ lbl_8038753C: /* 80387544 003844A4 83 C1 00 20 */ lwz r30, 0x20(r1) /* 80387548 003844A8 38 21 00 28 */ addi r1, r1, 0x28 /* 8038754C 003844AC 7C 08 03 A6 */ mtlr r0 -/* 80387550 003844B0 4E 80 00 20 */ blr +/* 80387550 003844B0 4E 80 00 20 */ blr .global SamplingHandler SamplingHandler: @@ -1945,7 +1945,7 @@ SamplingHandler: /* 80387580 003844E0 4B FF 7E 9D */ bl OSSetCurrentContext /* 80387584 003844E4 81 8D AD 8C */ lwz r12, SamplingCallback@sda21(r13) /* 80387588 003844E8 7D 88 03 A6 */ mtlr r12 -/* 8038758C 003844EC 4E 80 00 21 */ blrl +/* 8038758C 003844EC 4E 80 00 21 */ blrl /* 80387590 003844F0 38 61 00 10 */ addi r3, r1, 0x10 /* 80387594 003844F4 4B FF 80 81 */ bl OSClearContext /* 80387598 003844F8 7F E3 FB 78 */ mr r3, r31 @@ -1955,7 +1955,7 @@ lbl_803875A0: /* 803875A4 00384504 83 E1 02 DC */ lwz r31, 0x2dc(r1) /* 803875A8 00384508 38 21 02 E0 */ addi r1, r1, 0x2e0 /* 803875AC 0038450C 7C 08 03 A6 */ mtlr r0 -/* 803875B0 00384510 4E 80 00 20 */ blr +/* 803875B0 00384510 4E 80 00 20 */ blr .global PADSetSamplingCallback PADSetSamplingCallback: @@ -1981,7 +1981,7 @@ lbl_803875F0: /* 803875F8 00384558 83 E1 00 14 */ lwz r31, 0x14(r1) /* 803875FC 0038455C 38 21 00 18 */ addi r1, r1, 0x18 /* 80387600 00384560 7C 08 03 A6 */ mtlr r0 -/* 80387604 00384564 4E 80 00 20 */ blr +/* 80387604 00384564 4E 80 00 20 */ blr .global __PADDisableRecalibration __PADDisableRecalibration: @@ -2018,4 +2018,4 @@ lbl_80387664: /* 80387674 003845D4 83 C1 00 10 */ lwz r30, 0x10(r1) /* 80387678 003845D8 38 21 00 18 */ addi r1, r1, 0x18 /* 8038767C 003845DC 7C 08 03 A6 */ mtlr r0 -/* 80387680 003845E0 4E 80 00 20 */ blr +/* 80387680 003845E0 4E 80 00 20 */ blr diff --git a/asm/Dolphin/si/SIBios.s b/asm/Dolphin/si/SIBios.s index 9b3b262f..5ade674a 100644 --- a/asm/Dolphin/si/SIBios.s +++ b/asm/Dolphin/si/SIBios.s @@ -28,21 +28,51 @@ lbl_803F6EA0: .asciz "<< Dolphin SDK - SI\trelease build: Sep 5 2002 05:33:08 (0x2301) >>" .balign 4 - + .global Si Si: - .incbin "baserom.dol", 0x3F3EE4, 0x14 - + # ROM: 0x3F3EE4 + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + + .global Type Type: - .incbin "baserom.dol", 0x3F3EF8, 0xC0 + # ROM: 0x3F3EF8 + .4byte 0x00000008 + .4byte 0x00000008 + .4byte 0x00000008 + .4byte 0x00000008 + .asciz "No response" + .asciz "N64 controller" + .balign 4 + .asciz "N64 microphone" + .balign 4 + .asciz "N64 keyboard" + .balign 4 + .asciz "N64 mouse" + .balign 4 + .asciz "GameBoy Advance" + .asciz "Standard controller" + .asciz "Wireless receiver" + .balign 4 + .asciz "WaveBird controller" + .asciz "Keyboard" + .balign 4 + .asciz "Steering" + .balign 4 + .4byte 0 + .section .sdata, "wa" .global __SIVersion __SIVersion: .4byte lbl_803F6EA0 .skip 4 - + .section .sbss, "wa" .balign 4 .global lbl_805A9BD0 @@ -69,7 +99,7 @@ lbl_805A9BF0: .global lbl_805A9BF4 lbl_805A9BF4: .skip 0xC - + .section .text, "ax" .global SIBusy @@ -79,10 +109,10 @@ SIBusy: /* 803BE6B4 003BB614 2C 00 FF FF */ cmpwi r0, -1 /* 803BE6B8 003BB618 41 82 00 0C */ beq lbl_803BE6C4 /* 803BE6BC 003BB61C 38 60 00 01 */ li r3, 1 -/* 803BE6C0 003BB620 4E 80 00 20 */ blr +/* 803BE6C0 003BB620 4E 80 00 20 */ blr lbl_803BE6C4: /* 803BE6C4 003BB624 38 60 00 00 */ li r3, 0 -/* 803BE6C8 003BB628 4E 80 00 20 */ blr +/* 803BE6C8 003BB628 4E 80 00 20 */ blr .global SIIsChanBusy SIIsChanBusy: @@ -101,7 +131,7 @@ SIIsChanBusy: /* 803BE6FC 003BB65C 38 A0 00 00 */ li r5, 0 lbl_803BE700: /* 803BE700 003BB660 7C A3 2B 78 */ mr r3, r5 -/* 803BE704 003BB664 4E 80 00 20 */ blr +/* 803BE704 003BB664 4E 80 00 20 */ blr .global CompleteTransfer CompleteTransfer: @@ -309,7 +339,7 @@ lbl_803BE9E4: /* 803BE9F4 003BB954 83 81 00 10 */ lwz r28, 0x10(r1) /* 803BE9F8 003BB958 38 21 00 20 */ addi r1, r1, 0x20 /* 803BE9FC 003BB95C 7C 08 03 A6 */ mtlr r0 -/* 803BEA00 003BB960 4E 80 00 20 */ blr +/* 803BEA00 003BB960 4E 80 00 20 */ blr .global SIInterruptHandler SIInterruptHandler: @@ -386,7 +416,7 @@ lbl_803BEB00: /* 803BEB10 003BBA70 38 77 00 00 */ addi r3, r23, 0 /* 803BEB14 003BBA74 38 96 00 00 */ addi r4, r22, 0 /* 803BEB18 003BBA78 38 BF 00 00 */ addi r5, r31, 0 -/* 803BEB1C 003BBA7C 4E 80 00 21 */ blrl +/* 803BEB1C 003BBA7C 4E 80 00 21 */ blrl lbl_803BEB20: /* 803BEB20 003BBA80 3C 60 CC 00 */ lis r3, 0xCC006400@ha /* 803BEB24 003BBA84 38 83 64 00 */ addi r4, r3, 0xCC006400@l @@ -525,7 +555,7 @@ lbl_803BED08: /* 803BED14 003BBC74 7D 88 03 A6 */ mtlr r12 /* 803BED18 003BBC78 38 7E 00 00 */ addi r3, r30, 0 /* 803BED1C 003BBC7C 38 9F 00 00 */ addi r4, r31, 0 -/* 803BED20 003BBC80 4E 80 00 21 */ blrl +/* 803BED20 003BBC80 4E 80 00 21 */ blrl lbl_803BED24: /* 803BED24 003BBC84 3A D6 00 01 */ addi r22, r22, 1 /* 803BED28 003BBC88 2C 16 00 04 */ cmpwi r22, 4 @@ -536,7 +566,7 @@ lbl_803BED34: /* 803BED38 003BBC98 80 01 00 4C */ lwz r0, 0x4c(r1) /* 803BED3C 003BBC9C 38 21 00 48 */ addi r1, r1, 0x48 /* 803BED40 003BBCA0 7C 08 03 A6 */ mtlr r0 -/* 803BED44 003BBCA4 4E 80 00 20 */ blr +/* 803BED44 003BBCA4 4E 80 00 20 */ blr .global SIEnablePollingInterrupt SIEnablePollingInterrupt: @@ -581,7 +611,7 @@ lbl_803BEDB4: /* 803BEDD0 003BBD30 83 A1 00 24 */ lwz r29, 0x24(r1) /* 803BEDD4 003BBD34 38 21 00 30 */ addi r1, r1, 0x30 /* 803BEDD8 003BBD38 7C 08 03 A6 */ mtlr r0 -/* 803BEDDC 003BBD3C 4E 80 00 20 */ blr +/* 803BEDDC 003BBD3C 4E 80 00 20 */ blr .global SIRegisterPollingHandler SIRegisterPollingHandler: @@ -640,7 +670,7 @@ lbl_803BEE94: /* 803BEE9C 003BBDFC 83 C1 00 10 */ lwz r30, 0x10(r1) /* 803BEEA0 003BBE00 38 21 00 18 */ addi r1, r1, 0x18 /* 803BEEA4 003BBE04 7C 08 03 A6 */ mtlr r0 -/* 803BEEA8 003BBE08 4E 80 00 20 */ blr +/* 803BEEA8 003BBE08 4E 80 00 20 */ blr .global SIUnregisterPollingHandler SIUnregisterPollingHandler: @@ -709,7 +739,7 @@ lbl_803BEF88: /* 803BEF90 003BBEF0 83 C1 00 10 */ lwz r30, 0x10(r1) /* 803BEF94 003BBEF4 38 21 00 18 */ addi r1, r1, 0x18 /* 803BEF98 003BBEF8 7C 08 03 A6 */ mtlr r0 -/* 803BEF9C 003BBEFC 4E 80 00 20 */ blr +/* 803BEF9C 003BBEFC 4E 80 00 20 */ blr .global SIInit SIInit: @@ -758,7 +788,7 @@ lbl_803BEFF0: /* 803BF044 003BBFA4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803BF048 003BBFA8 38 21 00 10 */ addi r1, r1, 0x10 /* 803BF04C 003BBFAC 7C 08 03 A6 */ mtlr r0 -/* 803BF050 003BBFB0 4E 80 00 20 */ blr +/* 803BF050 003BBFB0 4E 80 00 20 */ blr .global __SITransfer __SITransfer: @@ -905,7 +935,7 @@ lbl_803BF24C: /* 803BF250 003BC1B0 80 01 00 4C */ lwz r0, 0x4c(r1) /* 803BF254 003BC1B4 38 21 00 48 */ addi r1, r1, 0x48 /* 803BF258 003BC1B8 7C 08 03 A6 */ mtlr r0 -/* 803BF25C 003BC1BC 4E 80 00 20 */ blr +/* 803BF25C 003BC1BC 4E 80 00 20 */ blr .global SIGetStatus SIGetStatus: @@ -940,7 +970,7 @@ lbl_803BF2BC: /* 803BF2CC 003BC22C 83 C1 00 10 */ lwz r30, 0x10(r1) /* 803BF2D0 003BC230 38 21 00 18 */ addi r1, r1, 0x18 /* 803BF2D4 003BC234 7C 08 03 A6 */ mtlr r0 -/* 803BF2D8 003BC238 4E 80 00 20 */ blr +/* 803BF2D8 003BC238 4E 80 00 20 */ blr .global SISetCommand SISetCommand: @@ -948,14 +978,14 @@ SISetCommand: /* 803BF2E0 003BC240 3C 60 CC 00 */ lis r3, 0xCC006400@ha /* 803BF2E4 003BC244 38 63 64 00 */ addi r3, r3, 0xCC006400@l /* 803BF2E8 003BC248 7C 83 01 2E */ stwx r4, r3, r0 -/* 803BF2EC 003BC24C 4E 80 00 20 */ blr +/* 803BF2EC 003BC24C 4E 80 00 20 */ blr .global SITransferCommands SITransferCommands: /* 803BF2F0 003BC250 3C 60 CC 00 */ lis r3, 0xCC006438@ha /* 803BF2F4 003BC254 3C 00 80 00 */ lis r0, 0x8000 /* 803BF2F8 003BC258 90 03 64 38 */ stw r0, 0xCC006438@l(r3) -/* 803BF2FC 003BC25C 4E 80 00 20 */ blr +/* 803BF2FC 003BC25C 4E 80 00 20 */ blr .global SISetXY SISetXY: @@ -985,7 +1015,7 @@ SISetXY: /* 803BF35C 003BC2BC 83 E1 00 14 */ lwz r31, 0x14(r1) /* 803BF360 003BC2C0 38 21 00 18 */ addi r1, r1, 0x18 /* 803BF364 003BC2C4 7C 08 03 A6 */ mtlr r0 -/* 803BF368 003BC2C8 4E 80 00 20 */ blr +/* 803BF368 003BC2C8 4E 80 00 20 */ blr .global SIEnablePolling SIEnablePolling: @@ -1029,7 +1059,7 @@ lbl_803BF3F4: /* 803BF3F8 003BC358 83 E1 00 14 */ lwz r31, 0x14(r1) /* 803BF3FC 003BC35C 38 21 00 18 */ addi r1, r1, 0x18 /* 803BF400 003BC360 7C 08 03 A6 */ mtlr r0 -/* 803BF404 003BC364 4E 80 00 20 */ blr +/* 803BF404 003BC364 4E 80 00 20 */ blr .global SIDisablePolling SIDisablePolling: @@ -1061,7 +1091,7 @@ lbl_803BF460: /* 803BF464 003BC3C4 83 E1 00 14 */ lwz r31, 0x14(r1) /* 803BF468 003BC3C8 38 21 00 18 */ addi r1, r1, 0x18 /* 803BF46C 003BC3CC 7C 08 03 A6 */ mtlr r0 -/* 803BF470 003BC3D0 4E 80 00 20 */ blr +/* 803BF470 003BC3D0 4E 80 00 20 */ blr .global SIGetResponseRaw SIGetResponseRaw: @@ -1120,7 +1150,7 @@ lbl_803BF52C: /* 803BF538 003BC498 83 A1 00 1C */ lwz r29, 0x1c(r1) /* 803BF53C 003BC49C 38 21 00 28 */ addi r1, r1, 0x28 /* 803BF540 003BC4A0 7C 08 03 A6 */ mtlr r0 -/* 803BF544 003BC4A4 4E 80 00 20 */ blr +/* 803BF544 003BC4A4 4E 80 00 20 */ blr .global SIGetResponse SIGetResponse: @@ -1174,7 +1204,7 @@ lbl_803BF5EC: /* 803BF5FC 003BC55C 80 01 00 2C */ lwz r0, 0x2c(r1) /* 803BF600 003BC560 38 21 00 28 */ addi r1, r1, 0x28 /* 803BF604 003BC564 7C 08 03 A6 */ mtlr r0 -/* 803BF608 003BC568 4E 80 00 20 */ blr +/* 803BF608 003BC568 4E 80 00 20 */ blr AlarmHandler: /* 803BF60C 003BC56C 7C 08 02 A6 */ mflr r0 @@ -1212,7 +1242,7 @@ lbl_803BF684: /* 803BF688 003BC5E8 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 803BF68C 003BC5EC 38 21 00 20 */ addi r1, r1, 0x20 /* 803BF690 003BC5F0 7C 08 03 A6 */ mtlr r0 -/* 803BF694 003BC5F4 4E 80 00 20 */ blr +/* 803BF694 003BC5F4 4E 80 00 20 */ blr .global SITransfer SITransfer: @@ -1313,7 +1343,7 @@ lbl_803BF7F0: /* 803BF7F4 003BC754 80 01 00 64 */ lwz r0, 0x64(r1) /* 803BF7F8 003BC758 38 21 00 60 */ addi r1, r1, 0x60 /* 803BF7FC 003BC75C 7C 08 03 A6 */ mtlr r0 -/* 803BF800 003BC760 4E 80 00 20 */ blr +/* 803BF800 003BC760 4E 80 00 20 */ blr .global GetTypeCallback GetTypeCallback: @@ -1375,7 +1405,7 @@ lbl_803BF8C8: /* 803BF8D8 003BC838 7D 88 03 A6 */ mtlr r12 /* 803BF8DC 003BC83C 38 7B 00 00 */ addi r3, r27, 0 /* 803BF8E0 003BC840 38 9E 00 00 */ addi r4, r30, 0 -/* 803BF8E4 003BC844 4E 80 00 21 */ blrl +/* 803BF8E4 003BC844 4E 80 00 21 */ blrl lbl_803BF8E8: /* 803BF8E8 003BC848 3B BD 00 01 */ addi r29, r29, 1 /* 803BF8EC 003BC84C 2C 1D 00 04 */ cmpwi r29, 4 @@ -1483,7 +1513,7 @@ lbl_803BFA58: /* 803BFA68 003BC9C8 7D 88 03 A6 */ mtlr r12 /* 803BFA6C 003BC9CC 38 7B 00 00 */ addi r3, r27, 0 /* 803BFA70 003BC9D0 38 9E 00 00 */ addi r4, r30, 0 -/* 803BFA74 003BC9D4 4E 80 00 21 */ blrl +/* 803BFA74 003BC9D4 4E 80 00 21 */ blrl lbl_803BFA78: /* 803BFA78 003BC9D8 3B BD 00 01 */ addi r29, r29, 1 /* 803BFA7C 003BC9DC 2C 1D 00 04 */ cmpwi r29, 4 @@ -1494,7 +1524,7 @@ lbl_803BFA88: /* 803BFA8C 003BC9EC 80 01 00 34 */ lwz r0, 0x34(r1) /* 803BFA90 003BC9F0 38 21 00 30 */ addi r1, r1, 0x30 /* 803BFA94 003BC9F4 7C 08 03 A6 */ mtlr r0 -/* 803BFA98 003BC9F8 4E 80 00 20 */ blr +/* 803BFA98 003BC9F8 4E 80 00 20 */ blr .global SIGetType SIGetType: @@ -1616,7 +1646,7 @@ lbl_803BFC4C: /* 803BFC50 003BCBB0 80 01 00 2C */ lwz r0, 0x2c(r1) /* 803BFC54 003BCBB4 38 21 00 28 */ addi r1, r1, 0x28 /* 803BFC58 003BCBB8 7C 08 03 A6 */ mtlr r0 -/* 803BFC5C 003BCBBC 4E 80 00 20 */ blr +/* 803BFC5C 003BCBBC 4E 80 00 20 */ blr .global SIGetTypeAsync SIGetTypeAsync: @@ -1691,7 +1721,7 @@ lbl_803BFD5C: /* 803BFD60 003BCCC0 7D 88 03 A6 */ mtlr r12 /* 803BFD64 003BCCC4 38 7C 00 00 */ addi r3, r28, 0 /* 803BFD68 003BCCC8 38 9D 00 00 */ addi r4, r29, 0 -/* 803BFD6C 003BCCCC 4E 80 00 21 */ blrl +/* 803BFD6C 003BCCCC 4E 80 00 21 */ blrl lbl_803BFD70: /* 803BFD70 003BCCD0 7F C3 F3 78 */ mr r3, r30 /* 803BFD74 003BCCD4 4B FC 19 15 */ bl OSRestoreInterrupts @@ -1703,7 +1733,7 @@ lbl_803BFD70: /* 803BFD8C 003BCCEC 83 81 00 10 */ lwz r28, 0x10(r1) /* 803BFD90 003BCCF0 38 21 00 20 */ addi r1, r1, 0x20 /* 803BFD94 003BCCF4 7C 08 03 A6 */ mtlr r0 -/* 803BFD98 003BCCF8 4E 80 00 20 */ blr +/* 803BFD98 003BCCF8 4E 80 00 20 */ blr .global SIDecodeType SIDecodeType: @@ -1712,76 +1742,76 @@ SIDecodeType: /* 803BFDA4 003BCD04 54 65 00 2E */ rlwinm r5, r3, 0, 0, 0x17 /* 803BFDA8 003BCD08 41 82 00 0C */ beq lbl_803BFDB4 /* 803BFDAC 003BCD0C 38 60 00 08 */ li r3, 8 -/* 803BFDB0 003BCD10 4E 80 00 20 */ blr +/* 803BFDB0 003BCD10 4E 80 00 20 */ blr lbl_803BFDB4: /* 803BFDB4 003BCD14 70 80 00 47 */ andi. r0, r4, 0x47 /* 803BFDB8 003BCD18 41 82 00 0C */ beq lbl_803BFDC4 /* 803BFDBC 003BCD1C 38 60 00 40 */ li r3, 0x40 -/* 803BFDC0 003BCD20 4E 80 00 20 */ blr +/* 803BFDC0 003BCD20 4E 80 00 20 */ blr lbl_803BFDC4: /* 803BFDC4 003BCD24 28 04 00 00 */ cmplwi r4, 0 /* 803BFDC8 003BCD28 41 82 00 0C */ beq lbl_803BFDD4 /* 803BFDCC 003BCD2C 38 60 00 80 */ li r3, 0x80 -/* 803BFDD0 003BCD30 4E 80 00 20 */ blr +/* 803BFDD0 003BCD30 4E 80 00 20 */ blr lbl_803BFDD4: /* 803BFDD4 003BCD34 54 A3 00 C9 */ rlwinm. r3, r5, 0, 3, 4 /* 803BFDD8 003BCD38 40 82 00 64 */ bne lbl_803BFE3C /* 803BFDDC 003BCD3C 54 A3 00 1E */ rlwinm r3, r5, 0, 0, 0xf /* 803BFDE0 003BCD40 3C 00 00 04 */ lis r0, 4 /* 803BFDE4 003BCD44 7C 03 00 00 */ cmpw r3, r0 -/* 803BFDE8 003BCD48 4D 82 00 20 */ beqlr +/* 803BFDE8 003BCD48 4D 82 00 20 */ beqlr /* 803BFDEC 003BCD4C 40 80 00 24 */ bge lbl_803BFE10 /* 803BFDF0 003BCD50 3C 00 00 02 */ lis r0, 2 /* 803BFDF4 003BCD54 7C 03 00 00 */ cmpw r3, r0 -/* 803BFDF8 003BCD58 4D 82 00 20 */ beqlr +/* 803BFDF8 003BCD58 4D 82 00 20 */ beqlr /* 803BFDFC 003BCD5C 40 80 00 38 */ bge lbl_803BFE34 /* 803BFE00 003BCD60 3C 00 00 01 */ lis r0, 1 /* 803BFE04 003BCD64 7C 03 00 00 */ cmpw r3, r0 -/* 803BFE08 003BCD68 4D 82 00 20 */ beqlr +/* 803BFE08 003BCD68 4D 82 00 20 */ beqlr /* 803BFE0C 003BCD6C 48 00 00 28 */ b lbl_803BFE34 lbl_803BFE10: /* 803BFE10 003BCD70 3C 00 05 00 */ lis r0, 0x500 /* 803BFE14 003BCD74 7C 03 00 00 */ cmpw r3, r0 -/* 803BFE18 003BCD78 4D 82 00 20 */ beqlr +/* 803BFE18 003BCD78 4D 82 00 20 */ beqlr /* 803BFE1C 003BCD7C 40 80 00 18 */ bge lbl_803BFE34 /* 803BFE20 003BCD80 3C 00 02 00 */ lis r0, 0x200 /* 803BFE24 003BCD84 7C 03 00 00 */ cmpw r3, r0 -/* 803BFE28 003BCD88 4D 82 00 20 */ beqlr +/* 803BFE28 003BCD88 4D 82 00 20 */ beqlr /* 803BFE2C 003BCD8C 48 00 00 08 */ b lbl_803BFE34 .global sub_803bfe30 sub_803bfe30: -/* 803BFE30 003BCD90 4E 80 00 20 */ blr +/* 803BFE30 003BCD90 4E 80 00 20 */ blr lbl_803BFE34: /* 803BFE34 003BCD94 38 60 00 40 */ li r3, 0x40 -/* 803BFE38 003BCD98 4E 80 00 20 */ blr +/* 803BFE38 003BCD98 4E 80 00 20 */ blr lbl_803BFE3C: /* 803BFE3C 003BCD9C 3C 03 F8 00 */ addis r0, r3, 0xf800 /* 803BFE40 003BCDA0 28 00 00 00 */ cmplwi r0, 0 /* 803BFE44 003BCDA4 41 82 00 0C */ beq lbl_803BFE50 /* 803BFE48 003BCDA8 38 60 00 40 */ li r3, 0x40 -/* 803BFE4C 003BCDAC 4E 80 00 20 */ blr +/* 803BFE4C 003BCDAC 4E 80 00 20 */ blr lbl_803BFE50: /* 803BFE50 003BCDB0 54 A3 00 1E */ rlwinm r3, r5, 0, 0, 0xf /* 803BFE54 003BCDB4 3C 00 09 00 */ lis r0, 0x900 /* 803BFE58 003BCDB8 7C 03 00 00 */ cmpw r3, r0 -/* 803BFE5C 003BCDBC 4D 82 00 20 */ beqlr +/* 803BFE5C 003BCDBC 4D 82 00 20 */ beqlr /* 803BFE60 003BCDC0 40 80 00 18 */ bge lbl_803BFE78 /* 803BFE64 003BCDC4 3C 00 08 00 */ lis r0, 0x800 /* 803BFE68 003BCDC8 7C 03 00 00 */ cmpw r3, r0 -/* 803BFE6C 003BCDCC 4D 82 00 20 */ beqlr +/* 803BFE6C 003BCDCC 4D 82 00 20 */ beqlr /* 803BFE70 003BCDD0 48 00 00 08 */ b lbl_803BFE78 .global sub_803bfe74 sub_803bfe74: -/* 803BFE74 003BCDD4 4E 80 00 20 */ blr +/* 803BFE74 003BCDD4 4E 80 00 20 */ blr lbl_803BFE78: /* 803BFE78 003BCDD8 54 A3 00 14 */ rlwinm r3, r5, 0, 0, 0xa /* 803BFE7C 003BCDDC 3C 03 F7 E0 */ addis r0, r3, 0xf7e0 /* 803BFE80 003BCDE0 28 00 00 00 */ cmplwi r0, 0 /* 803BFE84 003BCDE4 40 82 00 0C */ bne lbl_803BFE90 /* 803BFE88 003BCDE8 3C 60 08 20 */ lis r3, 0x820 -/* 803BFE8C 003BCDEC 4E 80 00 20 */ blr +/* 803BFE8C 003BCDEC 4E 80 00 20 */ blr lbl_803BFE90: /* 803BFE90 003BCDF0 54 A0 00 01 */ rlwinm. r0, r5, 0, 0, 0 /* 803BFE94 003BCDF4 41 82 00 34 */ beq lbl_803BFEC8 @@ -1792,22 +1822,22 @@ lbl_803BFE90: /* 803BFEA8 003BCE08 28 00 00 00 */ cmplwi r0, 0 /* 803BFEAC 003BCE0C 40 82 00 0C */ bne lbl_803BFEB8 /* 803BFEB0 003BCE10 3C 60 8B 10 */ lis r3, 0x8b10 -/* 803BFEB4 003BCE14 4E 80 00 20 */ blr +/* 803BFEB4 003BCE14 4E 80 00 20 */ blr lbl_803BFEB8: /* 803BFEB8 003BCE18 54 A0 01 8D */ rlwinm. r0, r5, 0, 6, 6 /* 803BFEBC 003BCE1C 40 82 00 0C */ bne lbl_803BFEC8 /* 803BFEC0 003BCE20 3C 60 88 00 */ lis r3, 0x8800 -/* 803BFEC4 003BCE24 4E 80 00 20 */ blr +/* 803BFEC4 003BCE24 4E 80 00 20 */ blr lbl_803BFEC8: /* 803BFEC8 003BCE28 74 A3 09 00 */ andis. r3, r5, 0x900 /* 803BFECC 003BCE2C 3C 03 F7 00 */ addis r0, r3, 0xf700 /* 803BFED0 003BCE30 28 00 00 00 */ cmplwi r0, 0 /* 803BFED4 003BCE34 40 82 00 0C */ bne lbl_803BFEE0 /* 803BFED8 003BCE38 3C 60 09 00 */ lis r3, 0x900 -/* 803BFEDC 003BCE3C 4E 80 00 20 */ blr +/* 803BFEDC 003BCE3C 4E 80 00 20 */ blr lbl_803BFEE0: /* 803BFEE0 003BCE40 38 60 00 40 */ li r3, 0x40 -/* 803BFEE4 003BCE44 4E 80 00 20 */ blr +/* 803BFEE4 003BCE44 4E 80 00 20 */ blr .global SIProbe SIProbe: @@ -1819,4 +1849,4 @@ SIProbe: /* 803BFEFC 003BCE5C 80 01 00 0C */ lwz r0, 0xc(r1) /* 803BFF00 003BCE60 38 21 00 08 */ addi r1, r1, 8 /* 803BFF04 003BCE64 7C 08 03 A6 */ mtlr r0 -/* 803BFF08 003BCE68 4E 80 00 20 */ blr +/* 803BFF08 003BCE68 4E 80 00 20 */ blr diff --git a/asm/Dolphin/si/SISamplingRate.s b/asm/Dolphin/si/SISamplingRate.s index 3efa2778..84489fe9 100644 --- a/asm/Dolphin/si/SISamplingRate.s +++ b/asm/Dolphin/si/SISamplingRate.s @@ -4,8 +4,53 @@ .global lbl_803F6FB8 lbl_803F6FB8: - .incbin "baserom.dol", 0x3F3FB8, 0x168 - + # ROM: 0x3F3FB8 + .4byte 0x00F60200 + .4byte 0x000F1200 + .4byte 0x001E0900 + .4byte 0x002C0600 + .4byte 0x00340500 + .4byte 0x00410400 + .4byte 0x00570300 + .4byte 0x00570300 + .4byte 0x00570300 + .4byte 0x00830200 + .4byte 0x00830200 + .4byte 0x00830200 + .4byte 0x01280200 + .4byte 0x000F1500 + .4byte 0x001D0B00 + .4byte 0x002D0700 + .4byte 0x00340600 + .4byte 0x003F0500 + .4byte 0x004E0400 + .4byte 0x00680300 + .4byte 0x00680300 + .4byte 0x00680300 + .4byte 0x00680300 + .4byte 0x009C0200 + .asciz "SISetSamplingRate: unknown TV format. Use default." + .balign 4 + .4byte 0 + .asciz "<< Dolphin SDK - EXI\trelease build: Sep 5 2002 05:33:04 (0x2301) >>" + .balign 4 + .asciz "Memory Card 59" + .balign 4 + .asciz "Memory Card 123" + .asciz "Memory Card 251" + .asciz "Memory Card 507" + .asciz "USB Adapter" + .asciz "Net Card" + .balign 4 + .asciz "Artist Ether" + .balign 4 + .asciz "Stream Hanger" + .balign 4 + .asciz "IS Viewer" + .balign 4 + .4byte 0 + + .section .text, "ax" .global SISetSamplingRate @@ -74,7 +119,7 @@ lbl_803BFFB4: /* 803BFFE0 003BCF40 83 A1 00 14 */ lwz r29, 0x14(r1) /* 803BFFE4 003BCF44 38 21 00 20 */ addi r1, r1, 0x20 /* 803BFFE8 003BCF48 7C 08 03 A6 */ mtlr r0 -/* 803BFFEC 003BCF4C 4E 80 00 20 */ blr +/* 803BFFEC 003BCF4C 4E 80 00 20 */ blr .global SIRefreshSamplingRate SIRefreshSamplingRate: @@ -86,4 +131,4 @@ SIRefreshSamplingRate: /* 803C0004 003BCF64 80 01 00 0C */ lwz r0, 0xc(r1) /* 803C0008 003BCF68 38 21 00 08 */ addi r1, r1, 8 /* 803C000C 003BCF6C 7C 08 03 A6 */ mtlr r0 -/* 803C0010 003BCF70 4E 80 00 20 */ blr +/* 803C0010 003BCF70 4E 80 00 20 */ blr diff --git a/asm/Dolphin/thp/THPAudio.s b/asm/Dolphin/thp/THPAudio.s index 7fc7662d..97112856 100644 --- a/asm/Dolphin/thp/THPAudio.s +++ b/asm/Dolphin/thp/THPAudio.s @@ -309,7 +309,7 @@ lbl_803C9518: /* 803C951C 003C647C 80 01 00 5C */ lwz r0, 0x5c(r1) /* 803C9520 003C6480 38 21 00 58 */ addi r1, r1, 0x58 /* 803C9524 003C6484 7C 08 03 A6 */ mtlr r0 -/* 803C9528 003C6488 4E 80 00 20 */ blr +/* 803C9528 003C6488 4E 80 00 20 */ blr .global __THPAudioGetNewSample __THPAudioGetNewSample: @@ -351,7 +351,7 @@ lbl_803C95A8: /* 803C95AC 003C650C 38 04 00 01 */ addi r0, r4, 1 /* 803C95B0 003C6510 90 03 00 04 */ stw r0, 4(r3) /* 803C95B4 003C6514 7C A3 2B 78 */ mr r3, r5 -/* 803C95B8 003C6518 4E 80 00 20 */ blr +/* 803C95B8 003C6518 4E 80 00 20 */ blr .global __THPAudioInitialize __THPAudioInitialize: @@ -369,4 +369,4 @@ __THPAudioInitialize: /* 803C95E8 003C6548 80 83 00 00 */ lwz r4, 0(r3) /* 803C95EC 003C654C 38 04 00 01 */ addi r0, r4, 1 /* 803C95F0 003C6550 90 03 00 00 */ stw r0, 0(r3) -/* 803C95F4 003C6554 4E 80 00 20 */ blr +/* 803C95F4 003C6554 4E 80 00 20 */ blr diff --git a/asm/Dolphin/thp/THPDec.s b/asm/Dolphin/thp/THPDec.s index d2dd5e39..0d4f5d80 100644 --- a/asm/Dolphin/thp/THPDec.s +++ b/asm/Dolphin/thp/THPDec.s @@ -40,12 +40,12 @@ __THPAANScaleFactor: # local object .double 0.5411961078643799 .double 0.27589938044548035 - + .section .sdata2, "wa" .global lbl_805AF440 lbl_805AF440: .double 4.503599627370496E15 - + .global lbl_805AF448 lbl_805AF448: .float 1.4142135 @@ -61,7 +61,7 @@ lbl_805AF454: .global lbl_805AF458 lbl_805AF458: .float 1024.0 - + .section .sbss, "wa" .balign 32 Ydchuff: @@ -106,16 +106,16 @@ __THPInfo: .skip 4 __THPInitFlag: .skip 4 - + .section .data, "wa" THPVersionStr: .asciz "<< Dolphin SDK - THP\trelease build: Aug 27 2002 20:42:01 >>" .skip 4 - + .section .sdata, "wa" THPVersion: .4byte THPVersionStr - + .section .text, "ax" .global THPVideoDecode @@ -285,7 +285,7 @@ lbl_803C1D90: /* 803C1D94 003BECF4 80 01 00 3C */ lwz r0, 0x3c(r1) /* 803C1D98 003BECF8 38 21 00 38 */ addi r1, r1, 0x38 /* 803C1D9C 003BECFC 7C 08 03 A6 */ mtlr r0 -/* 803C1DA0 003BED00 4E 80 00 20 */ blr +/* 803C1DA0 003BED00 4E 80 00 20 */ blr __THPSetupBuffers: # local func /* 803C1DA4 003BED04 80 8D B1 4C */ lwz r4, __THPWorkArea@sda21(r13) @@ -304,7 +304,7 @@ __THPSetupBuffers: # local func /* 803C1DD8 003BED38 90 85 00 0C */ stw r4, 0xc(r5) /* 803C1DDC 003BED3C 90 65 00 10 */ stw r3, 0x10(r5) /* 803C1DE0 003BED40 90 05 00 14 */ stw r0, 0x14(r5) -/* 803C1DE4 003BED44 4E 80 00 20 */ blr +/* 803C1DE4 003BED44 4E 80 00 20 */ blr __THPReadFrameHeader: # local func /* 803C1DE8 003BED48 80 8D B1 50 */ lwz r4, __THPInfo@sda21(r13) @@ -319,7 +319,7 @@ __THPReadFrameHeader: # local func /* 803C1E0C 003BED6C 28 00 00 08 */ cmplwi r0, 8 /* 803C1E10 003BED70 41 82 00 0C */ beq lbl_803C1E1C /* 803C1E14 003BED74 38 60 00 0A */ li r3, 0xa -/* 803C1E18 003BED78 4E 80 00 20 */ blr +/* 803C1E18 003BED78 4E 80 00 20 */ blr lbl_803C1E1C: /* 803C1E1C 003BED7C 80 AD B1 50 */ lwz r5, __THPInfo@sda21(r13) /* 803C1E20 003BED80 80 85 06 9C */ lwz r4, 0x69c(r5) @@ -349,7 +349,7 @@ lbl_803C1E1C: /* 803C1E80 003BEDE0 28 00 00 03 */ cmplwi r0, 3 /* 803C1E84 003BEDE4 41 82 00 0C */ beq lbl_803C1E90 /* 803C1E88 003BEDE8 38 60 00 0C */ li r3, 0xc -/* 803C1E8C 003BEDEC 4E 80 00 20 */ blr +/* 803C1E8C 003BEDEC 4E 80 00 20 */ blr lbl_803C1E90: /* 803C1E90 003BEDF0 38 E0 00 00 */ li r7, 0 /* 803C1E94 003BEDF4 38 C0 00 00 */ li r6, 0 @@ -375,7 +375,7 @@ lbl_803C1ED0: /* 803C1EDC 003BEE3C 41 82 00 0C */ beq lbl_803C1EE8 lbl_803C1EE0: /* 803C1EE0 003BEE40 38 60 00 13 */ li r3, 0x13 -/* 803C1EE4 003BEE44 4E 80 00 20 */ blr +/* 803C1EE4 003BEE44 4E 80 00 20 */ blr lbl_803C1EE8: /* 803C1EE8 003BEE48 80 AD B1 50 */ lwz r5, __THPInfo@sda21(r13) /* 803C1EEC 003BEE4C 38 06 06 80 */ addi r0, r6, 0x680 @@ -392,7 +392,7 @@ lbl_803C1F10: /* 803C1F14 003BEE74 28 00 00 03 */ cmplwi r0, 3 /* 803C1F18 003BEE78 41 80 FF 84 */ blt lbl_803C1E9C /* 803C1F1C 003BEE7C 38 60 00 00 */ li r3, 0 -/* 803C1F20 003BEE80 4E 80 00 20 */ blr +/* 803C1F20 003BEE80 4E 80 00 20 */ blr __THPReadScaneHeader: # local func /* 803C1F24 003BEE84 80 8D B1 50 */ lwz r4, __THPInfo@sda21(r13) @@ -407,7 +407,7 @@ __THPReadScaneHeader: # local func /* 803C1F48 003BEEA8 28 00 00 03 */ cmplwi r0, 3 /* 803C1F4C 003BEEAC 41 82 00 0C */ beq lbl_803C1F58 /* 803C1F50 003BEEB0 38 60 00 0C */ li r3, 0xc -/* 803C1F54 003BEEB4 4E 80 00 20 */ blr +/* 803C1F54 003BEEB4 4E 80 00 20 */ blr lbl_803C1F58: /* 803C1F58 003BEEB8 39 20 00 00 */ li r9, 0 /* 803C1F5C 003BEEBC 39 00 00 00 */ li r8, 0 @@ -437,14 +437,14 @@ lbl_803C1F64: /* 803C1FB8 003BEF18 7C 80 00 39 */ and. r0, r4, r0 /* 803C1FBC 003BEF1C 40 82 00 0C */ bne lbl_803C1FC8 /* 803C1FC0 003BEF20 38 60 00 0F */ li r3, 0xf -/* 803C1FC4 003BEF24 4E 80 00 20 */ blr +/* 803C1FC4 003BEF24 4E 80 00 20 */ blr lbl_803C1FC8: /* 803C1FC8 003BEF28 38 07 00 01 */ addi r0, r7, 1 /* 803C1FCC 003BEF2C 7C 60 00 30 */ slw r0, r3, r0 /* 803C1FD0 003BEF30 7C 80 00 39 */ and. r0, r4, r0 /* 803C1FD4 003BEF34 40 82 00 0C */ bne lbl_803C1FE0 /* 803C1FD8 003BEF38 38 60 00 0F */ li r3, 0xf -/* 803C1FDC 003BEF3C 4E 80 00 20 */ blr +/* 803C1FDC 003BEF3C 4E 80 00 20 */ blr lbl_803C1FE0: /* 803C1FE0 003BEF40 39 08 00 06 */ addi r8, r8, 6 /* 803C1FE4 003BEF44 39 29 00 01 */ addi r9, r9, 1 @@ -470,7 +470,7 @@ lbl_803C1FE8: /* 803C2030 003BEF90 B0 04 06 8A */ sth r0, 0x68a(r4) /* 803C2034 003BEF94 80 8D B1 50 */ lwz r4, __THPInfo@sda21(r13) /* 803C2038 003BEF98 B0 04 06 90 */ sth r0, 0x690(r4) -/* 803C203C 003BEF9C 4E 80 00 20 */ blr +/* 803C203C 003BEF9C 4E 80 00 20 */ blr .global __THPReadQuantizationTable __THPReadQuantizationTable: @@ -717,7 +717,7 @@ lbl_803C23D4: /* 803C23EC 003BF34C 38 60 00 00 */ li r3, 0 /* 803C23F0 003BF350 BA A1 01 5C */ lmw r21, 0x15c(r1) /* 803C23F4 003BF354 38 21 01 88 */ addi r1, r1, 0x188 -/* 803C23F8 003BF358 4E 80 00 20 */ blr +/* 803C23F8 003BF358 4E 80 00 20 */ blr .global __THPReadHuffmanTableSpecification __THPReadHuffmanTableSpecification: @@ -843,7 +843,7 @@ lbl_803C2550: /* 803C25CC 003BF52C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 803C25D0 003BF530 38 21 00 20 */ addi r1, r1, 0x20 /* 803C25D4 003BF534 7C 08 03 A6 */ mtlr r0 -/* 803C25D8 003BF538 4E 80 00 20 */ blr +/* 803C25D8 003BF538 4E 80 00 20 */ blr .global __THPHuffGenerateSizeTable __THPHuffGenerateSizeTable: @@ -911,7 +911,7 @@ lbl_803C26B0: /* 803C26BC 003BF61C 80 6D B0 E8 */ lwz r3, __THPHuffmanSizeTab@sda21(r13) /* 803C26C0 003BF620 38 00 00 00 */ li r0, 0 /* 803C26C4 003BF624 7C 03 31 AE */ stbx r0, r3, r6 -/* 803C26C8 003BF628 4E 80 00 20 */ blr +/* 803C26C8 003BF628 4E 80 00 20 */ blr .global __THPHuffGenerateCodeTable __THPHuffGenerateCodeTable: @@ -947,7 +947,7 @@ lbl_803C2720: .global sub_803c2730 sub_803c2730: -/* 803C2730 003BF690 4E 80 00 20 */ blr +/* 803C2730 003BF690 4E 80 00 20 */ blr .global __THPHuffGenerateDecoderTables __THPHuffGenerateDecoderTables: @@ -1070,7 +1070,7 @@ lbl_803C28D4: /* 803C28E0 003BF840 3C 60 00 10 */ lis r3, 0x000FFFFF@ha /* 803C28E4 003BF844 38 03 FF FF */ addi r0, r3, 0x000FFFFF@l /* 803C28E8 003BF848 90 07 00 88 */ stw r0, 0x88(r7) -/* 803C28EC 003BF84C 4E 80 00 20 */ blr +/* 803C28EC 003BF84C 4E 80 00 20 */ blr .global __THPRestartDefinition __THPRestartDefinition: @@ -1094,7 +1094,7 @@ __THPRestartDefinition: /* 803C2934 003BF894 80 6D B1 50 */ lwz r3, __THPInfo@sda21(r13) /* 803C2938 003BF898 A0 03 06 AA */ lhz r0, 0x6aa(r3) /* 803C293C 003BF89C B0 03 06 AC */ sth r0, 0x6ac(r3) -/* 803C2940 003BF8A0 4E 80 00 20 */ blr +/* 803C2940 003BF8A0 4E 80 00 20 */ blr .global __THPPrepBitStream __THPPrepBitStream: @@ -1255,7 +1255,7 @@ lbl_803C2AD4: /* 803C2B80 003BFAE0 90 0D B0 E0 */ stw r0, Vachuff@sda21(r13) /* 803C2B84 003BFAE4 83 E1 00 14 */ lwz r31, 0x14(r1) /* 803C2B88 003BFAE8 38 21 00 18 */ addi r1, r1, 0x18 -/* 803C2B8C 003BFAEC 4E 80 00 20 */ blr +/* 803C2B8C 003BFAEC 4E 80 00 20 */ blr .global __THPDecompressYUV __THPDecompressYUV: @@ -1333,7 +1333,7 @@ lbl_803C2C74: /* 803C2C8C 003BFBEC 83 C1 00 18 */ lwz r30, 0x18(r1) /* 803C2C90 003BFBF0 38 21 00 20 */ addi r1, r1, 0x20 /* 803C2C94 003BFBF4 7C 08 03 A6 */ mtlr r0 -/* 803C2C98 003BFBF8 4E 80 00 20 */ blr +/* 803C2C98 003BFBF8 4E 80 00 20 */ blr .global __THPDecompressiMCURow512x448 __THPDecompressiMCURow512x448: @@ -3080,7 +3080,7 @@ lbl_803C467C: /* 803C4714 003C1674 83 C1 00 08 */ lwz r30, 8(r1) /* 803C4718 003C1678 38 21 00 38 */ addi r1, r1, 0x38 /* 803C471C 003C167C 7C 08 03 A6 */ mtlr r0 -/* 803C4720 003C1680 4E 80 00 20 */ blr +/* 803C4720 003C1680 4E 80 00 20 */ blr .global __THPDecompressiMCURow640x480 __THPDecompressiMCURow640x480: @@ -4828,7 +4828,7 @@ lbl_803C6108: /* 803C61A0 003C3100 83 C1 00 08 */ lwz r30, 8(r1) /* 803C61A4 003C3104 38 21 00 38 */ addi r1, r1, 0x38 /* 803C61A8 003C3108 7C 08 03 A6 */ mtlr r0 -/* 803C61AC 003C310C 4E 80 00 20 */ blr +/* 803C61AC 003C310C 4E 80 00 20 */ blr .global __THPDecompressiMCURowNxN __THPDecompressiMCURowNxN: @@ -6584,7 +6584,7 @@ lbl_803C7BA0: /* 803C7C4C 003C4BAC 83 81 00 08 */ lwz r28, 8(r1) /* 803C7C50 003C4BB0 38 21 00 40 */ addi r1, r1, 0x40 /* 803C7C54 003C4BB4 7C 08 03 A6 */ mtlr r0 -/* 803C7C58 003C4BB8 4E 80 00 20 */ blr +/* 803C7C58 003C4BB8 4E 80 00 20 */ blr __THPHuffDecodeDCTCompY: #local func /* 803C7C5C 003C4BBC 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -7049,7 +7049,7 @@ lbl_803C82BC: /* 803C82C8 003C5228 83 C1 00 18 */ lwz r30, 0x18(r1) /* 803C82CC 003C522C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 803C82D0 003C5230 38 21 00 20 */ addi r1, r1, 0x20 -/* 803C82D4 003C5234 4E 80 00 20 */ blr +/* 803C82D4 003C5234 4E 80 00 20 */ blr __THPHuffDecodeDCTCompU: # local func /* 803C82D8 003C5238 94 21 FF E8 */ stwu r1, -0x18(r1) @@ -7526,7 +7526,7 @@ lbl_803C8970: /* 803C8970 003C58D0 83 E1 00 14 */ lwz r31, 0x14(r1) /* 803C8974 003C58D4 83 C1 00 10 */ lwz r30, 0x10(r1) /* 803C8978 003C58D8 38 21 00 18 */ addi r1, r1, 0x18 -/* 803C897C 003C58DC 4E 80 00 20 */ blr +/* 803C897C 003C58DC 4E 80 00 20 */ blr __THPHuffDecodeDCTCompV: # local func /* 803C8980 003C58E0 94 21 FF E8 */ stwu r1, -0x18(r1) @@ -8003,7 +8003,7 @@ lbl_803C9018: /* 803C9018 003C5F78 83 E1 00 14 */ lwz r31, 0x14(r1) /* 803C901C 003C5F7C 83 C1 00 10 */ lwz r30, 0x10(r1) /* 803C9020 003C5F80 38 21 00 18 */ addi r1, r1, 0x18 -/* 803C9024 003C5F84 4E 80 00 20 */ blr +/* 803C9024 003C5F84 4E 80 00 20 */ blr .global THPInit THPInit: @@ -8046,5 +8046,5 @@ THPInit: /* 803C90B8 003C6018 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803C90BC 003C601C 38 21 00 10 */ addi r1, r1, 0x10 /* 803C90C0 003C6020 7C 08 03 A6 */ mtlr r0 -/* 803C90C4 003C6024 4E 80 00 20 */ blr +/* 803C90C4 003C6024 4E 80 00 20 */ blr diff --git a/asm/Dolphin/vi.s b/asm/Dolphin/vi.s index 5a9df743..cb83f82d 100644 --- a/asm/Dolphin/vi.s +++ b/asm/Dolphin/vi.s @@ -5,26 +5,192 @@ lbl_80542040: .skip 0xF0 lbl_80542130: .skip 0x58 - + .section .data, "wa" .global lbl_803F23A8 lbl_803F23A8: - .incbin "baserom.dol", 0x3EF3A8, 0x1F4 + # ROM: 0x3EF3A8 + .asciz "<< Dolphin SDK - VI\trelease build: Sep 5 2002 05:33:13 (0x2301) >>" + .4byte 0x060000F0 + .4byte 0x00180019 + .4byte 0x00030002 + .4byte 0x0C0D0C0D + .4byte 0x02080207 + .4byte 0x02080207 + .4byte 0x020D01AD + .4byte 0x404769A2 + .4byte 0x01757A00 + .4byte 0x019C0600 + .4byte 0x00F00018 + .4byte 0x00180004 + .4byte 0x00040C0C + .4byte 0x0C0C0208 + .4byte 0x02080208 + .4byte 0x0208020E + .4byte 0x01AD4047 + .4byte 0x69A20175 + .4byte 0x7A00019C + .4byte 0x0500011F + .4byte 0x00230024 + .4byte 0x00010000 + .4byte 0x0D0C0B0A + .4byte 0x026B026A + .4byte 0x0269026C + .4byte 0x027101B0 + .4byte 0x404B6AAC + .4byte 0x017C8500 + .4byte 0x01A40500 + .4byte 0x011F0021 + .4byte 0x00210002 + .4byte 0x00020D0B + .4byte 0x0D0B026B + .4byte 0x026D026B + .4byte 0x026D0270 + .4byte 0x01B0404B + .4byte 0x6AAC017C + .4byte 0x850001A4 + .4byte 0x060000F0 + .4byte 0x00180019 + .4byte 0x00030002 + .4byte 0x100F0E0D + .4byte 0x02060205 + .4byte 0x02040207 + .4byte 0x020D01AD + .4byte 0x404E70A2 + .4byte 0x01757A00 + .4byte 0x019C0600 + .4byte 0x00F00018 + .4byte 0x00180004 + .4byte 0x0004100E + .4byte 0x100E0206 + .4byte 0x02080206 + .4byte 0x0208020E + .4byte 0x01AD404E + .4byte 0x70A20175 + .4byte 0x7A00019C + .4byte 0x0C0001E0 + .4byte 0x00300030 + .4byte 0x00060006 + .4byte 0x18181818 + .4byte 0x040E040E + .4byte 0x040E040E + .4byte 0x041A01AD + .4byte 0x404769A2 + .4byte 0x01757A00 + .4byte 0x019C0C00 + .4byte 0x01E0002C + .4byte 0x002C000A + .4byte 0x000A1818 + .4byte 0x1818040E + .4byte 0x040E040E + .4byte 0x040E041A + .4byte 0x01AD4047 + .4byte 0x69A8017B + .4byte 0x7A00019C + .4byte 0x060000F1 + .4byte 0x00180019 + .4byte 0x00010000 + .4byte 0x0C0D0C0D + .4byte 0x02080207 + .4byte 0x02080207 + .4byte 0x020D01AD + .4byte 0x4047699F + .4byte 0x01727A00 + .4byte 0x019C0C00 + .4byte 0x01E00030 + .4byte 0x00300006 + .4byte 0x00061818 + .4byte 0x1818040E + .4byte 0x040E040E + .4byte 0x040E041A + .4byte 0x01AD4047 + .4byte 0x69B40187 + .4byte 0x7A00019C + .4byte 0x01F001DC + .4byte 0x01AE0174 + .4byte 0x012900DB + .4byte 0x008E0046 + .4byte 0x000C00E2 + .4byte 0x00CB00C0 + .4byte 0x00C400CF + .4byte 0x00DE00EC + .4byte 0x00FC0008 + .4byte 0x000F0013 + .4byte 0x0013000F + .4byte 0x000C0008 + .4byte 0x00010000 + .global lbl_803F259C lbl_803F259C: - .incbin "baserom.dol", 0x3EF59C, 0x1C0 + # ROM: 0x3EF59C + .4byte 0x80387964 + .4byte 0x8038796C + .4byte 0x803879A4 + .4byte 0x803879AC + .4byte 0x80387974 + .4byte 0x8038797C + .4byte 0x803879D4 + .4byte 0x803879D4 + .4byte 0x80387994 + .4byte 0x8038799C + .4byte 0x803879D4 + .4byte 0x803879D4 + .4byte 0x803879D4 + .4byte 0x803879D4 + .4byte 0x803879D4 + .4byte 0x803879D4 + .4byte 0x803879B4 + .4byte 0x803879BC + .4byte 0x803879D4 + .4byte 0x803879D4 + .4byte 0x80387984 + .4byte 0x8038798C + .4byte 0x803879D4 + .4byte 0x803879D4 + .4byte 0x803879C4 + .4byte 0x803879D4 + .4byte 0x803879CC + .asciz "***************************************\n" + .balign 4 + .asciz " ! ! ! C A U T I O N ! ! ! \n" + .balign 4 + .asciz "This TV format \"DEBUG_PAL\" is only for \n" + .balign 4 + .asciz "temporary solution until PAL DAC board \n" + .balign 4 + .asciz "is available. Please do NOT use this \n" + .balign 4 + .asciz "mode in real games!!! \n" + .balign 4 + .asciz "VIConfigure(): Tried to change mode from (%d) to (%d), which is forbidden\n" + .balign 4 + .global lbl_803F275C lbl_803F275C: - .incbin "baserom.dol", 0x3EF75C, 0x1C + # ROM: 0x3EF75C + .4byte 0x80389510 + .4byte 0x80389518 + .4byte 0x80389520 + .4byte 0x80389510 + .4byte 0x80389518 + .4byte 0x80389520 + .4byte 0x80389510 + .section .sdata .global lbl_805A8B78 lbl_805A8B78: - .incbin "baserom.dol", 0x3F6518, 0x4 + # ROM: 0x3F6518 + .4byte 0x803F23A8 + .global lbl_805A8B7C lbl_805A8B7C: - .incbin "baserom.dol", 0x3F651C, 0xC + # ROM: 0x3F651C + .asciz "vi.c" + .balign 4 + .4byte 0 + .section .sbss, "wa" .balign 4 @@ -70,7 +236,7 @@ lbl_805A99A8: .skip 0x4 lbl_805A99AC: .skip 0x4 - + .section .text, "ax" .global __VIRetraceHandler @@ -137,7 +303,7 @@ lbl_80387734: /* 80387758 003846B8 41 82 00 10 */ beq lbl_80387768 /* 8038775C 003846BC 80 6D AD 9C */ lwz r3, lbl_805A995C@sda21(r13) /* 80387760 003846C0 7D 88 03 A6 */ mtlr r12 -/* 80387764 003846C4 4E 80 00 21 */ blrl +/* 80387764 003846C4 4E 80 00 21 */ blrl lbl_80387768: /* 80387768 003846C8 80 0D AD A0 */ lwz r0, lbl_805A9960@sda21(r13) /* 8038776C 003846CC 28 00 00 00 */ cmplwi r0, 0 @@ -218,7 +384,7 @@ lbl_80387864: /* 80387878 003847D8 81 8D AD B0 */ lwz r12, lbl_805A9970@sda21(r13) /* 8038787C 003847DC 80 6D AD 9C */ lwz r3, lbl_805A995C@sda21(r13) /* 80387880 003847E0 7D 88 03 A6 */ mtlr r12 -/* 80387884 003847E4 4E 80 00 21 */ blrl +/* 80387884 003847E4 4E 80 00 21 */ blrl lbl_80387888: /* 80387888 003847E8 38 6D AD A4 */ addi r3, r13, lbl_805A9964@sda21 /* 8038788C 003847EC 4B FF D9 6D */ bl OSWakeupThread @@ -231,7 +397,7 @@ lbl_803878A0: /* 803878A4 00384804 80 01 02 FC */ lwz r0, 0x2fc(r1) /* 803878A8 00384808 38 21 02 F8 */ addi r1, r1, 0x2f8 /* 803878AC 0038480C 7C 08 03 A6 */ mtlr r0 -/* 803878B0 00384810 4E 80 00 20 */ blr +/* 803878B0 00384810 4E 80 00 20 */ blr .global VISetPreRetraceCallback VISetPreRetraceCallback: @@ -251,7 +417,7 @@ VISetPreRetraceCallback: /* 803878E8 00384848 83 C1 00 10 */ lwz r30, 0x10(r1) /* 803878EC 0038484C 38 21 00 18 */ addi r1, r1, 0x18 /* 803878F0 00384850 7C 08 03 A6 */ mtlr r0 -/* 803878F4 00384854 4E 80 00 20 */ blr +/* 803878F4 00384854 4E 80 00 20 */ blr .global VISetPostRetraceCallback VISetPostRetraceCallback: @@ -271,7 +437,7 @@ VISetPostRetraceCallback: /* 8038792C 0038488C 83 C1 00 10 */ lwz r30, 0x10(r1) /* 80387930 00384890 38 21 00 18 */ addi r1, r1, 0x18 /* 80387934 00384894 7C 08 03 A6 */ mtlr r0 -/* 80387938 00384898 4E 80 00 20 */ blr +/* 80387938 00384898 4E 80 00 20 */ blr .global getTiming getTiming: @@ -284,38 +450,38 @@ getTiming: /* 80387954 003848B4 54 60 10 3A */ slwi r0, r3, 2 /* 80387958 003848B8 7C 04 00 2E */ lwzx r0, r4, r0 /* 8038795C 003848BC 7C 09 03 A6 */ mtctr r0 -/* 80387960 003848C0 4E 80 04 20 */ bctr +/* 80387960 003848C0 4E 80 04 20 */ bctr /* 80387964 003848C4 38 65 00 44 */ addi r3, r5, 0x44 -/* 80387968 003848C8 4E 80 00 20 */ blr +/* 80387968 003848C8 4E 80 00 20 */ blr /* 8038796C 003848CC 38 65 00 6A */ addi r3, r5, 0x6a -/* 80387970 003848D0 4E 80 00 20 */ blr +/* 80387970 003848D0 4E 80 00 20 */ blr /* 80387974 003848D4 38 65 00 90 */ addi r3, r5, 0x90 -/* 80387978 003848D8 4E 80 00 20 */ blr +/* 80387978 003848D8 4E 80 00 20 */ blr /* 8038797C 003848DC 38 65 00 B6 */ addi r3, r5, 0xb6 -/* 80387980 003848E0 4E 80 00 20 */ blr +/* 80387980 003848E0 4E 80 00 20 */ blr /* 80387984 003848E4 38 65 00 44 */ addi r3, r5, 0x44 -/* 80387988 003848E8 4E 80 00 20 */ blr +/* 80387988 003848E8 4E 80 00 20 */ blr /* 8038798C 003848EC 38 65 00 6A */ addi r3, r5, 0x6a -/* 80387990 003848F0 4E 80 00 20 */ blr +/* 80387990 003848F0 4E 80 00 20 */ blr /* 80387994 003848F4 38 65 00 DC */ addi r3, r5, 0xdc -/* 80387998 003848F8 4E 80 00 20 */ blr +/* 80387998 003848F8 4E 80 00 20 */ blr /* 8038799C 003848FC 38 65 01 02 */ addi r3, r5, 0x102 -/* 803879A0 00384900 4E 80 00 20 */ blr +/* 803879A0 00384900 4E 80 00 20 */ blr /* 803879A4 00384904 38 65 01 28 */ addi r3, r5, 0x128 -/* 803879A8 00384908 4E 80 00 20 */ blr +/* 803879A8 00384908 4E 80 00 20 */ blr /* 803879AC 0038490C 38 65 01 4E */ addi r3, r5, 0x14e -/* 803879B0 00384910 4E 80 00 20 */ blr +/* 803879B0 00384910 4E 80 00 20 */ blr /* 803879B4 00384914 38 65 00 90 */ addi r3, r5, 0x90 -/* 803879B8 00384918 4E 80 00 20 */ blr +/* 803879B8 00384918 4E 80 00 20 */ blr /* 803879BC 0038491C 38 65 00 B6 */ addi r3, r5, 0xb6 -/* 803879C0 00384920 4E 80 00 20 */ blr +/* 803879C0 00384920 4E 80 00 20 */ blr /* 803879C4 00384924 38 65 01 74 */ addi r3, r5, 0x174 -/* 803879C8 00384928 4E 80 00 20 */ blr +/* 803879C8 00384928 4E 80 00 20 */ blr /* 803879CC 0038492C 38 65 01 9A */ addi r3, r5, 0x19a -/* 803879D0 00384930 4E 80 00 20 */ blr +/* 803879D0 00384930 4E 80 00 20 */ blr lbl_803879D4: /* 803879D4 00384934 38 60 00 00 */ li r3, 0 -/* 803879D8 00384938 4E 80 00 20 */ blr +/* 803879D8 00384938 4E 80 00 20 */ blr .global __VIInit __VIInit: @@ -451,7 +617,7 @@ lbl_80387BC0: /* 80387BCC 00384B2C 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80387BD0 00384B30 38 21 00 30 */ addi r1, r1, 0x30 /* 80387BD4 00384B34 7C 08 03 A6 */ mtlr r0 -/* 80387BD8 00384B38 4E 80 00 20 */ blr +/* 80387BD8 00384B38 4E 80 00 20 */ blr .global VIInit VIInit: @@ -776,7 +942,7 @@ lbl_8038806C: /* 8038807C 00384FDC 83 81 00 08 */ lwz r28, 8(r1) /* 80388080 00384FE0 38 21 00 18 */ addi r1, r1, 0x18 /* 80388084 00384FE4 7C 08 03 A6 */ mtlr r0 -/* 80388088 00384FE8 4E 80 00 20 */ blr +/* 80388088 00384FE8 4E 80 00 20 */ blr .global VIWaitForRetrace VIWaitForRetrace: @@ -801,7 +967,7 @@ lbl_803880AC: /* 803880D0 00385030 83 C1 00 08 */ lwz r30, 8(r1) /* 803880D4 00385034 38 21 00 10 */ addi r1, r1, 0x10 /* 803880D8 00385038 7C 08 03 A6 */ mtlr r0 -/* 803880DC 0038503C 4E 80 00 20 */ blr +/* 803880DC 0038503C 4E 80 00 20 */ blr .global setFbbRegs setFbbRegs: @@ -996,7 +1162,7 @@ lbl_8038828C: lbl_803883A8: /* 803883A8 00385308 83 E1 00 44 */ lwz r31, 0x44(r1) /* 803883AC 0038530C 38 21 00 48 */ addi r1, r1, 0x48 -/* 803883B0 00385310 4E 80 00 20 */ blr +/* 803883B0 00385310 4E 80 00 20 */ blr .global setVerticalRegs setVerticalRegs: @@ -1108,7 +1274,7 @@ lbl_803884A8: /* 80388544 003854A4 83 C1 00 20 */ lwz r30, 0x20(r1) /* 80388548 003854A8 83 A1 00 1C */ lwz r29, 0x1c(r1) /* 8038854C 003854AC 38 21 00 28 */ addi r1, r1, 0x28 -/* 80388550 003854B0 4E 80 00 20 */ blr +/* 80388550 003854B0 4E 80 00 20 */ blr .global VIConfigure VIConfigure: @@ -1687,7 +1853,7 @@ lbl_80388D34: /* 80388D6C 00385CCC 80 01 00 7C */ lwz r0, 0x7c(r1) /* 80388D70 00385CD0 38 21 00 78 */ addi r1, r1, 0x78 /* 80388D74 00385CD4 7C 08 03 A6 */ mtlr r0 -/* 80388D78 00385CD8 4E 80 00 20 */ blr +/* 80388D78 00385CD8 4E 80 00 20 */ blr .global VIConfigurePan VIConfigurePan: @@ -1947,7 +2113,7 @@ lbl_803890C8: /* 80389100 00386060 80 01 00 54 */ lwz r0, 0x54(r1) /* 80389104 00386064 38 21 00 50 */ addi r1, r1, 0x50 /* 80389108 00386068 7C 08 03 A6 */ mtlr r0 -/* 8038910C 0038606C 4E 80 00 20 */ blr +/* 8038910C 0038606C 4E 80 00 20 */ blr .global VIFlush VIFlush: @@ -2030,7 +2196,7 @@ lbl_803891EC: /* 80389230 00386190 83 81 00 10 */ lwz r28, 0x10(r1) /* 80389234 00386194 38 21 00 20 */ addi r1, r1, 0x20 /* 80389238 00386198 7C 08 03 A6 */ mtlr r0 -/* 8038923C 0038619C 4E 80 00 20 */ blr +/* 8038923C 0038619C 4E 80 00 20 */ blr .global VISetNextFrameBuffer VISetNextFrameBuffer: @@ -2060,7 +2226,7 @@ VISetNextFrameBuffer: /* 8038929C 003861FC 83 C1 00 10 */ lwz r30, 0x10(r1) /* 803892A0 00386200 38 21 00 18 */ addi r1, r1, 0x18 /* 803892A4 00386204 7C 08 03 A6 */ mtlr r0 -/* 803892A8 00386208 4E 80 00 20 */ blr +/* 803892A8 00386208 4E 80 00 20 */ blr .global VISetBlack VISetBlack: @@ -2094,12 +2260,12 @@ VISetBlack: /* 80389318 00386278 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8038931C 0038627C 38 21 00 20 */ addi r1, r1, 0x20 /* 80389320 00386280 7C 08 03 A6 */ mtlr r0 -/* 80389324 00386284 4E 80 00 20 */ blr +/* 80389324 00386284 4E 80 00 20 */ blr .global VIGetRetraceCount VIGetRetraceCount: /* 80389328 00386288 80 6D AD 9C */ lwz r3, lbl_805A995C@sda21(r13) -/* 8038932C 0038628C 4E 80 00 20 */ blr +/* 8038932C 0038628C 4E 80 00 20 */ blr .global getCurrentFieldEvenOdd getCurrentFieldEvenOdd: @@ -2127,10 +2293,10 @@ lbl_80389344: /* 80389380 003862E0 7C 03 00 40 */ cmplw r3, r0 /* 80389384 003862E4 40 80 00 0C */ bge lbl_80389390 /* 80389388 003862E8 38 60 00 01 */ li r3, 1 -/* 8038938C 003862EC 4E 80 00 20 */ blr +/* 8038938C 003862EC 4E 80 00 20 */ blr lbl_80389390: /* 80389390 003862F0 38 60 00 00 */ li r3, 0 -/* 80389394 003862F4 4E 80 00 20 */ blr +/* 80389394 003862F4 4E 80 00 20 */ blr .global VIGetNextField VIGetNextField: @@ -2178,7 +2344,7 @@ lbl_80389410: /* 80389430 00386390 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80389434 00386394 38 21 00 20 */ addi r1, r1, 0x20 /* 80389438 00386398 7C 08 03 A6 */ mtlr r0 -/* 8038943C 0038639C 4E 80 00 20 */ blr +/* 8038943C 0038639C 4E 80 00 20 */ blr .global VIGetCurrentLine VIGetCurrentLine: @@ -2221,7 +2387,7 @@ lbl_803894BC: /* 803894C8 00386428 83 C1 00 08 */ lwz r30, 8(r1) /* 803894CC 0038642C 38 21 00 10 */ addi r1, r1, 0x10 /* 803894D0 00386430 7C 08 03 A6 */ mtlr r0 -/* 803894D4 00386434 4E 80 00 20 */ blr +/* 803894D4 00386434 4E 80 00 20 */ blr .global VIGetTvFormat VIGetTvFormat: @@ -2238,7 +2404,7 @@ VIGetTvFormat: /* 80389500 00386460 54 A0 10 3A */ slwi r0, r5, 2 /* 80389504 00386464 7C 04 00 2E */ lwzx r0, r4, r0 /* 80389508 00386468 7C 09 03 A6 */ mtctr r0 -/* 8038950C 0038646C 4E 80 04 20 */ bctr +/* 8038950C 0038646C 4E 80 04 20 */ bctr /* 80389510 00386470 3B E0 00 00 */ li r31, 0 /* 80389514 00386474 48 00 00 10 */ b lbl_80389524 /* 80389518 00386478 3B E0 00 01 */ li r31, 1 @@ -2251,7 +2417,7 @@ lbl_80389524: /* 80389530 00386490 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80389534 00386494 38 21 00 10 */ addi r1, r1, 0x10 /* 80389538 00386498 7C 08 03 A6 */ mtlr r0 -/* 8038953C 0038649C 4E 80 00 20 */ blr +/* 8038953C 0038649C 4E 80 00 20 */ blr .global VIGetDTVStatus VIGetDTVStatus: @@ -2269,4 +2435,4 @@ VIGetDTVStatus: /* 8038956C 003864CC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80389570 003864D0 38 21 00 10 */ addi r1, r1, 0x10 /* 80389574 003864D4 7C 08 03 A6 */ mtlr r0 -/* 80389578 003864D8 4E 80 00 20 */ blr +/* 80389578 003864D8 4E 80 00 20 */ blr diff --git a/asm/GuiSys/CAuiEnergyBarT01.s b/asm/GuiSys/CAuiEnergyBarT01.s index 1f1685e5..08212111 100644 --- a/asm/GuiSys/CAuiEnergyBarT01.s +++ b/asm/GuiSys/CAuiEnergyBarT01.s @@ -40,17 +40,17 @@ lbl_805A86DC: GetWidgetTypeID__16CAuiEnergyBarT01CFv: /* 802CB1D0 002C8130 3C 60 45 4E */ lis r3, 0x454E5247@ha /* 802CB1D4 002C8134 38 63 52 47 */ addi r3, r3, 0x454E5247@l -/* 802CB1D8 002C8138 4E 80 00 20 */ blr +/* 802CB1D8 002C8138 4E 80 00 20 */ blr .global GetActualFraction__16CAuiEnergyBarT01CFv GetActualFraction__16CAuiEnergyBarT01CFv: /* 802CB1DC 002C813C C0 22 C4 20 */ lfs f1, lbl_805AE140@sda21(r2) /* 802CB1E0 002C8140 C0 43 00 E0 */ lfs f2, 0xe0(r3) /* 802CB1E4 002C8144 FC 01 10 00 */ fcmpu cr0, f1, f2 -/* 802CB1E8 002C8148 4D 82 00 20 */ beqlr +/* 802CB1E8 002C8148 4D 82 00 20 */ beqlr /* 802CB1EC 002C814C C0 03 00 F4 */ lfs f0, 0xf4(r3) /* 802CB1F0 002C8150 EC 20 10 24 */ fdivs f1, f0, f2 -/* 802CB1F4 002C8154 4E 80 00 20 */ blr +/* 802CB1F4 002C8154 4E 80 00 20 */ blr .global Draw__16CAuiEnergyBarT01CFRC19CGuiWidgetDrawParms Draw__16CAuiEnergyBarT01CFRC19CGuiWidgetDrawParms: @@ -239,7 +239,7 @@ lbl_802CB450: /* 802CB498 002C83F8 FC 20 D8 90 */ fmr f1, f27 /* 802CB49C 002C83FC 38 61 00 60 */ addi r3, r1, 0x60 /* 802CB4A0 002C8400 7D 89 03 A6 */ mtctr r12 -/* 802CB4A4 002C8404 4E 80 04 21 */ bctrl +/* 802CB4A4 002C8404 4E 80 04 21 */ bctrl /* 802CB4A8 002C8408 C0 A1 00 60 */ lfs f5, 0x60(r1) /* 802CB4AC 002C840C C0 81 00 64 */ lfs f4, 0x64(r1) /* 802CB4B0 002C8410 C0 61 00 68 */ lfs f3, 0x68(r1) @@ -273,7 +273,7 @@ lbl_802CB4DC: /* 802CB51C 002C847C FC 20 E0 90 */ fmr f1, f28 /* 802CB520 002C8480 38 61 00 48 */ addi r3, r1, 0x48 /* 802CB524 002C8484 7D 89 03 A6 */ mtctr r12 -/* 802CB528 002C8488 4E 80 04 21 */ bctrl +/* 802CB528 002C8488 4E 80 04 21 */ bctrl /* 802CB52C 002C848C 80 E1 00 48 */ lwz r7, 0x48(r1) /* 802CB530 002C8490 FC 20 E0 90 */ fmr f1, f28 /* 802CB534 002C8494 80 C1 00 4C */ lwz r6, 0x4c(r1) @@ -302,7 +302,7 @@ lbl_802CB588: /* 802CB58C 002C84EC FC 20 D8 90 */ fmr f1, f27 /* 802CB590 002C84F0 38 61 00 30 */ addi r3, r1, 0x30 /* 802CB594 002C84F4 7D 89 03 A6 */ mtctr r12 -/* 802CB598 002C84F8 4E 80 04 21 */ bctrl +/* 802CB598 002C84F8 4E 80 04 21 */ bctrl /* 802CB59C 002C84FC 80 E1 00 30 */ lwz r7, 0x30(r1) /* 802CB5A0 002C8500 80 C1 00 34 */ lwz r6, 0x34(r1) /* 802CB5A4 002C8504 80 A1 00 38 */ lwz r5, 0x38(r1) @@ -342,7 +342,7 @@ lbl_802CB5F4: /* 802CB620 002C8580 80 01 01 14 */ lwz r0, 0x114(r1) /* 802CB624 002C8584 7C 08 03 A6 */ mtlr r0 /* 802CB628 002C8588 38 21 01 10 */ addi r1, r1, 0x110 -/* 802CB62C 002C858C 4E 80 00 20 */ blr +/* 802CB62C 002C858C 4E 80 00 20 */ blr .global DownloadBarCoordFunc__16CAuiEnergyBarT01Ff DownloadBarCoordFunc__16CAuiEnergyBarT01Ff: @@ -358,7 +358,7 @@ DownloadBarCoordFunc__16CAuiEnergyBarT01Ff: /* 802CB654 002C85B4 D0 63 00 0C */ stfs f3, 0xc(r3) /* 802CB658 002C85B8 D0 43 00 10 */ stfs f2, 0x10(r3) /* 802CB65C 002C85BC D0 03 00 14 */ stfs f0, 0x14(r3) -/* 802CB660 002C85C0 4E 80 00 20 */ blr +/* 802CB660 002C85C0 4E 80 00 20 */ blr .global Update__16CAuiEnergyBarT01Ff Update__16CAuiEnergyBarT01Ff: @@ -534,7 +534,7 @@ lbl_802CB89C: /* 802CB8B8 002C8818 83 C1 00 28 */ lwz r30, 0x28(r1) /* 802CB8BC 002C881C 7C 08 03 A6 */ mtlr r0 /* 802CB8C0 002C8820 38 21 00 40 */ addi r1, r1, 0x40 -/* 802CB8C4 002C8824 4E 80 00 20 */ blr +/* 802CB8C4 002C8824 4E 80 00 20 */ blr .global SetCurrEnergy__16CAuiEnergyBarT01Ffb SetCurrEnergy__16CAuiEnergyBarT01Ffb: @@ -580,7 +580,7 @@ lbl_802CB950: /* 802CB958 002C88B8 83 C1 00 18 */ lwz r30, 0x18(r1) /* 802CB95C 002C88BC 7C 08 03 A6 */ mtlr r0 /* 802CB960 002C88C0 38 21 00 20 */ addi r1, r1, 0x20 -/* 802CB964 002C88C4 4E 80 00 20 */ blr +/* 802CB964 002C88C4 4E 80 00 20 */ blr .global SetMaxEnergy__16CAuiEnergyBarT01Ff SetMaxEnergy__16CAuiEnergyBarT01Ff: @@ -618,7 +618,7 @@ lbl_802CB9CC: lbl_802CB9D0: /* 802CB9D0 002C8930 C0 04 00 00 */ lfs f0, 0(r4) /* 802CB9D4 002C8934 D0 03 00 FC */ stfs f0, 0xfc(r3) -/* 802CB9D8 002C8938 4E 80 00 20 */ blr +/* 802CB9D8 002C8938 4E 80 00 20 */ blr .global __dt__16CAuiEnergyBarT01Fv __dt__16CAuiEnergyBarT01Fv: @@ -662,7 +662,7 @@ lbl_802CBA58: /* 802CBA64 002C89C4 83 C1 00 08 */ lwz r30, 8(r1) /* 802CBA68 002C89C8 7C 08 03 A6 */ mtlr r0 /* 802CBA6C 002C89CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CBA70 002C89D0 4E 80 00 20 */ blr +/* 802CBA70 002C89D0 4E 80 00 20 */ blr .global __ct__16CAuiEnergyBarT01FRCQ210CGuiWidget15CGuiWidgetParmsUi __ct__16CAuiEnergyBarT01FRCQ210CGuiWidget15CGuiWidgetParmsUi: @@ -722,7 +722,7 @@ __ct__16CAuiEnergyBarT01FRCQ210CGuiWidget15CGuiWidgetParmsUi: /* 802CBB48 002C8AA8 81 9D 00 00 */ lwz r12, 0(r29) /* 802CBB4C 002C8AAC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802CBB50 002C8AB0 7D 89 03 A6 */ mtctr r12 -/* 802CBB54 002C8AB4 4E 80 04 21 */ bctrl +/* 802CBB54 002C8AB4 4E 80 04 21 */ bctrl /* 802CBB58 002C8AB8 38 61 00 18 */ addi r3, r1, 0x18 /* 802CBB5C 002C8ABC 38 81 00 08 */ addi r4, r1, 8 /* 802CBB60 002C8AC0 48 07 53 49 */ bl __ct__6CTokenFRC6CToken @@ -766,7 +766,7 @@ lbl_802CBBD8: /* 802CBBE8 002C8B48 83 A1 00 34 */ lwz r29, 0x34(r1) /* 802CBBEC 002C8B4C 7C 08 03 A6 */ mtlr r0 /* 802CBBF0 002C8B50 38 21 00 40 */ addi r1, r1, 0x40 -/* 802CBBF4 002C8B54 4E 80 00 20 */ blr +/* 802CBBF4 002C8B54 4E 80 00 20 */ blr .global Create__16CAuiEnergyBarT01FP9CGuiFrameR12CInputStreamb Create__16CAuiEnergyBarT01FP9CGuiFrameR12CInputStreamb: diff --git a/asm/GuiSys/CAuiImagePane.s b/asm/GuiSys/CAuiImagePane.s index 3a2d799a..7fb9234d 100644 --- a/asm/GuiSys/CAuiImagePane.s +++ b/asm/GuiSys/CAuiImagePane.s @@ -130,13 +130,13 @@ lbl_802CBE1C: /* 802CBE28 002C8D88 83 C1 00 08 */ lwz r30, 8(r1) /* 802CBE2C 002C8D8C 7C 08 03 A6 */ mtlr r0 /* 802CBE30 002C8D90 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CBE34 002C8D94 4E 80 00 20 */ blr +/* 802CBE34 002C8D94 4E 80 00 20 */ blr .global GetWidgetTypeID__13CAuiImagePaneCFv GetWidgetTypeID__13CAuiImagePaneCFv: /* 802CBE38 002C8D98 3C 60 49 4D */ lis r3, 0x494D4750@ha /* 802CBE3C 002C8D9C 38 63 47 50 */ addi r3, r3, 0x494D4750@l -/* 802CBE40 002C8DA0 4E 80 00 20 */ blr +/* 802CBE40 002C8DA0 4E 80 00 20 */ blr .global GetIsFinishedLoadingWidgetSpecific__13CAuiImagePaneCFv GetIsFinishedLoadingWidgetSpecific__13CAuiImagePaneCFv: @@ -177,7 +177,7 @@ lbl_802CBEB8: /* 802CBEBC 002C8E1C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802CBEC0 002C8E20 7C 08 03 A6 */ mtlr r0 /* 802CBEC4 002C8E24 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CBEC8 002C8E28 4E 80 00 20 */ blr +/* 802CBEC8 002C8E28 4E 80 00 20 */ blr .global SetTextureID0__13CAuiImagePaneFUib SetTextureID0__13CAuiImagePaneFUib: @@ -204,7 +204,7 @@ SetTextureID0__13CAuiImagePaneFUib: /* 802CBF1C 002C8E7C 81 84 00 00 */ lwz r12, 0(r4) /* 802CBF20 002C8E80 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802CBF24 002C8E84 7D 89 03 A6 */ mtctr r12 -/* 802CBF28 002C8E88 4E 80 04 21 */ bctrl +/* 802CBF28 002C8E88 4E 80 04 21 */ bctrl /* 802CBF2C 002C8E8C 38 61 00 28 */ addi r3, r1, 0x28 /* 802CBF30 002C8E90 38 81 00 08 */ addi r4, r1, 8 /* 802CBF34 002C8E94 48 07 4F 75 */ bl __ct__6CTokenFRC6CToken @@ -301,7 +301,7 @@ lbl_802CC06C: /* 802CC074 002C8FD4 83 C1 00 38 */ lwz r30, 0x38(r1) /* 802CC078 002C8FD8 7C 08 03 A6 */ mtlr r0 /* 802CC07C 002C8FDC 38 21 00 40 */ addi r1, r1, 0x40 -/* 802CC080 002C8FE0 4E 80 00 20 */ blr +/* 802CC080 002C8FE0 4E 80 00 20 */ blr .global DoDrawImagePane__13CAuiImagePaneCF6CColorRC8CTextureifb DoDrawImagePane__13CAuiImagePaneCF6CColorRC8CTextureifb: @@ -824,7 +824,7 @@ lbl_802CC7F8: /* 802CC824 002C9784 80 01 01 54 */ lwz r0, 0x154(r1) /* 802CC828 002C9788 7C 08 03 A6 */ mtlr r0 /* 802CC82C 002C978C 38 21 01 50 */ addi r1, r1, 0x150 -/* 802CC830 002C9790 4E 80 00 20 */ blr +/* 802CC830 002C9790 4E 80 00 20 */ blr .global Draw__13CAuiImagePaneCFRC19CGuiWidgetDrawParms Draw__13CAuiImagePaneCFRC19CGuiWidgetDrawParms: @@ -848,7 +848,7 @@ Draw__13CAuiImagePaneCFRC19CGuiWidgetDrawParms: /* 802CC878 002C97D8 81 9D 00 00 */ lwz r12, 0(r29) /* 802CC87C 002C97DC 81 8C 00 20 */ lwz r12, 0x20(r12) /* 802CC880 002C97E0 7D 89 03 A6 */ mtctr r12 -/* 802CC884 002C97E4 4E 80 04 21 */ bctrl +/* 802CC884 002C97E4 4E 80 04 21 */ bctrl /* 802CC888 002C97E8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802CC88C 002C97EC 41 82 04 BC */ beq lbl_802CCD48 /* 802CC890 002C97F0 88 1D 00 C4 */ lbz r0, 0xc4(r29) @@ -860,7 +860,7 @@ lbl_802CC8A0: /* 802CC8A4 002C9804 81 9D 00 00 */ lwz r12, 0(r29) /* 802CC8A8 002C9808 81 8C 00 30 */ lwz r12, 0x30(r12) /* 802CC8AC 002C980C 7D 89 03 A6 */ mtctr r12 -/* 802CC8B0 002C9810 4E 80 04 21 */ bctrl +/* 802CC8B0 002C9810 4E 80 04 21 */ bctrl /* 802CC8B4 002C9814 83 FD 00 C0 */ lwz r31, 0xc0(r29) /* 802CC8B8 002C9818 28 1F 00 00 */ cmplwi r31, 0 /* 802CC8BC 002C981C 41 82 04 8C */ beq lbl_802CCD48 @@ -1181,7 +1181,7 @@ lbl_802CCD48: /* 802CCD6C 002C9CCC 80 01 00 D4 */ lwz r0, 0xd4(r1) /* 802CCD70 002C9CD0 7C 08 03 A6 */ mtlr r0 /* 802CCD74 002C9CD4 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 802CCD78 002C9CD8 4E 80 00 20 */ blr +/* 802CCD78 002C9CD8 4E 80 00 20 */ blr .global Update__13CAuiImagePaneFf Update__13CAuiImagePaneFf: @@ -1260,7 +1260,7 @@ lbl_802CCE80: /* 802CCE98 002C9DF8 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 802CCE9C 002C9DFC 7C 08 03 A6 */ mtlr r0 /* 802CCEA0 002C9E00 38 21 00 50 */ addi r1, r1, 0x50 -/* 802CCEA4 002C9E04 4E 80 00 20 */ blr +/* 802CCEA4 002C9E04 4E 80 00 20 */ blr .global SetAnimationParms__13CAuiImagePaneFRC9CVector2fff SetAnimationParms__13CAuiImagePaneFRC9CVector2fff: @@ -1272,7 +1272,7 @@ SetAnimationParms__13CAuiImagePaneFRC9CVector2fff: /* 802CCEBC 002C9E1C D0 23 01 40 */ stfs f1, 0x140(r3) /* 802CCEC0 002C9E20 D0 03 01 44 */ stfs f0, 0x144(r3) /* 802CCEC4 002C9E24 D0 43 01 48 */ stfs f2, 0x148(r3) -/* 802CCEC8 002C9E28 4E 80 00 20 */ blr +/* 802CCEC8 002C9E28 4E 80 00 20 */ blr .global "__ct__13CAuiImagePaneFRCQ210CGuiWidget15CGuiWidgetParmsUiUiRCQ24rstl29reserved_vector<9CVector3f,4>RCQ24rstl29reserved_vector<9CVector2f,4>b" "__ct__13CAuiImagePaneFRCQ210CGuiWidget15CGuiWidgetParmsUiUiRCQ24rstl29reserved_vector<9CVector3f,4>RCQ24rstl29reserved_vector<9CVector2f,4>b": @@ -1368,7 +1368,7 @@ lbl_802CD00C: /* 802CD014 002C9F74 80 01 00 34 */ lwz r0, 0x34(r1) /* 802CD018 002C9F78 7C 08 03 A6 */ mtlr r0 /* 802CD01C 002C9F7C 38 21 00 30 */ addi r1, r1, 0x30 -/* 802CD020 002C9F80 4E 80 00 20 */ blr +/* 802CD020 002C9F80 4E 80 00 20 */ blr .global WriteData__13CAuiImagePaneCFR13COutputStreamb WriteData__13CAuiImagePaneCFR13COutputStreamb: @@ -1436,7 +1436,7 @@ lbl_802CD0EC: /* 802CD110 002CA070 83 81 00 20 */ lwz r28, 0x20(r1) /* 802CD114 002CA074 7C 08 03 A6 */ mtlr r0 /* 802CD118 002CA078 38 21 00 30 */ addi r1, r1, 0x30 -/* 802CD11C 002CA07C 4E 80 00 20 */ blr +/* 802CD11C 002CA07C 4E 80 00 20 */ blr .global "StreamObjects__4rstlFR13COutputStreamRCPC9CVector2fRCPC9CVector2fi" "StreamObjects__4rstlFR13COutputStreamRCPC9CVector2fRCPC9CVector2fi": @@ -1493,7 +1493,7 @@ lbl_802CD1CC: /* 802CD1E0 002CA140 83 A1 00 24 */ lwz r29, 0x24(r1) /* 802CD1E4 002CA144 7C 08 03 A6 */ mtlr r0 /* 802CD1E8 002CA148 38 21 00 30 */ addi r1, r1, 0x30 -/* 802CD1EC 002CA14C 4E 80 00 20 */ blr +/* 802CD1EC 002CA14C 4E 80 00 20 */ blr .global Create__13CAuiImagePaneFP9CGuiFrameR12CInputStreamb Create__13CAuiImagePaneFP9CGuiFrameR12CInputStreamb: diff --git a/asm/GuiSys/CAuiMain.s b/asm/GuiSys/CAuiMain.s index 0557e69c..6c17f3f5 100644 --- a/asm/GuiSys/CAuiMain.s +++ b/asm/GuiSys/CAuiMain.s @@ -4,4 +4,4 @@ .global InitializeApplicationUI__FR7CGuiSys InitializeApplicationUI__FR7CGuiSys: -/* 802C0BF4 002BDB54 4E 80 00 20 */ blr +/* 802C0BF4 002BDB54 4E 80 00 20 */ blr diff --git a/asm/GuiSys/CAuiMeter.s b/asm/GuiSys/CAuiMeter.s index 7d8b92fc..a9a88b48 100644 --- a/asm/GuiSys/CAuiMeter.s +++ b/asm/GuiSys/CAuiMeter.s @@ -96,26 +96,26 @@ lbl_802C0C9C: /* 802C0CA8 002BDC08 83 C1 00 18 */ lwz r30, 0x18(r1) /* 802C0CAC 002BDC0C 7C 08 03 A6 */ mtlr r0 /* 802C0CB0 002BDC10 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C0CB4 002BDC14 4E 80 00 20 */ blr +/* 802C0CB4 002BDC14 4E 80 00 20 */ blr .global GetWidgetTypeID__9CAuiMeterCFv GetWidgetTypeID__9CAuiMeterCFv: /* 802C0CB8 002BDC18 3C 60 4D 45 */ lis r3, 0x4D455452@ha /* 802C0CBC 002BDC1C 38 63 54 52 */ addi r3, r3, 0x4D455452@l -/* 802C0CC0 002BDC20 4E 80 00 20 */ blr +/* 802C0CC0 002BDC20 4E 80 00 20 */ blr .global Initialize__10CGuiWidgetFv Initialize__10CGuiWidgetFv: -/* 802C0CC4 002BDC24 4E 80 00 20 */ blr +/* 802C0CC4 002BDC24 4E 80 00 20 */ blr .global Touch__10CGuiWidgetCFv Touch__10CGuiWidgetCFv: -/* 802C0CC8 002BDC28 4E 80 00 20 */ blr +/* 802C0CC8 002BDC28 4E 80 00 20 */ blr .global GetIsFinishedLoadingWidgetSpecific__10CGuiWidgetCFv GetIsFinishedLoadingWidgetSpecific__10CGuiWidgetCFv: /* 802C0CCC 002BDC2C 38 60 00 01 */ li r3, 1 -/* 802C0CD0 002BDC30 4E 80 00 20 */ blr +/* 802C0CD0 002BDC30 4E 80 00 20 */ blr .global UpdateMeterWorkers__9CAuiMeterFv UpdateMeterWorkers__9CAuiMeterFv: @@ -209,14 +209,14 @@ lbl_802C0E04: /* 802C0E1C 002BDD7C 81 9A 00 00 */ lwz r12, 0(r26) /* 802C0E20 002BDD80 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 802C0E24 002BDD84 7D 89 03 A6 */ mtctr r12 -/* 802C0E28 002BDD88 4E 80 04 21 */ bctrl +/* 802C0E28 002BDD88 4E 80 04 21 */ bctrl /* 802C0E2C 002BDD8C 81 9A 00 00 */ lwz r12, 0(r26) /* 802C0E30 002BDD90 7C 7B 1B 78 */ mr r27, r3 /* 802C0E34 002BDD94 7F 43 D3 78 */ mr r3, r26 /* 802C0E38 002BDD98 38 80 00 01 */ li r4, 1 /* 802C0E3C 002BDD9C 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 802C0E40 002BDDA0 7D 89 03 A6 */ mtctr r12 -/* 802C0E44 002BDDA4 4E 80 04 21 */ bctrl +/* 802C0E44 002BDDA4 4E 80 04 21 */ bctrl /* 802C0E48 002BDDA8 7C 18 E0 00 */ cmpw r24, r28 /* 802C0E4C 002BDDAC 7C 7A 1B 78 */ mr r26, r3 /* 802C0E50 002BDDB0 40 80 00 30 */ bge lbl_802C0E80 @@ -269,7 +269,7 @@ lbl_802C0EE4: /* 802C0EF0 002BDE50 80 01 00 84 */ lwz r0, 0x84(r1) /* 802C0EF4 002BDE54 7C 08 03 A6 */ mtlr r0 /* 802C0EF8 002BDE58 38 21 00 80 */ addi r1, r1, 0x80 -/* 802C0EFC 002BDE5C 4E 80 00 20 */ blr +/* 802C0EFC 002BDE5C 4E 80 00 20 */ blr .global OnVisible__9CAuiMeterFv OnVisible__9CAuiMeterFv: @@ -281,7 +281,7 @@ OnVisible__9CAuiMeterFv: /* 802C0F14 002BDE74 81 83 00 00 */ lwz r12, 0(r3) /* 802C0F18 002BDE78 81 8C 00 20 */ lwz r12, 0x20(r12) /* 802C0F1C 002BDE7C 7D 89 03 A6 */ mtctr r12 -/* 802C0F20 002BDE80 4E 80 04 21 */ bctrl +/* 802C0F20 002BDE80 4E 80 04 21 */ bctrl /* 802C0F24 002BDE84 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802C0F28 002BDE88 41 82 00 0C */ beq lbl_802C0F34 /* 802C0F2C 002BDE8C 7F E3 FB 78 */ mr r3, r31 @@ -291,7 +291,7 @@ lbl_802C0F34: /* 802C0F38 002BDE98 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802C0F3C 002BDE9C 7C 08 03 A6 */ mtlr r0 /* 802C0F40 002BDEA0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C0F44 002BDEA4 4E 80 00 20 */ blr +/* 802C0F44 002BDEA4 4E 80 00 20 */ blr .global SetRemainder__9CAuiMeteri SetRemainder__9CAuiMeteri: @@ -313,7 +313,7 @@ SetRemainder__9CAuiMeteri: /* 802C0F84 002BDEE4 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802C0F88 002BDEE8 7C 08 03 A6 */ mtlr r0 /* 802C0F8C 002BDEEC 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C0F90 002BDEF0 4E 80 00 20 */ blr +/* 802C0F90 002BDEF0 4E 80 00 20 */ blr .global SetCapacity__9CAuiMeterFi SetCapacity__9CAuiMeterFi: @@ -346,7 +346,7 @@ lbl_802C0FE0: /* 802C0FF4 002BDF54 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802C0FF8 002BDF58 7C 08 03 A6 */ mtlr r0 /* 802C0FFC 002BDF5C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C1000 002BDF60 4E 80 00 20 */ blr +/* 802C1000 002BDF60 4E 80 00 20 */ blr .global SetMaxCapacity__9CAuiMeterFi SetMaxCapacity__9CAuiMeterFi: @@ -388,14 +388,14 @@ lbl_802C1070: /* 802C107C 002BDFDC 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C1080 002BDFE0 7C 08 03 A6 */ mtlr r0 /* 802C1084 002BDFE4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C1088 002BDFE8 4E 80 00 20 */ blr +/* 802C1088 002BDFE8 4E 80 00 20 */ blr .global GetWorkerWidget__9CAuiMeterFi GetWorkerWidget__9CAuiMeterFi: /* 802C108C 002BDFEC 80 63 00 E0 */ lwz r3, 0xe0(r3) /* 802C1090 002BDFF0 54 80 10 3A */ slwi r0, r4, 2 /* 802C1094 002BDFF4 7C 63 00 2E */ lwzx r3, r3, r0 -/* 802C1098 002BDFF8 4E 80 00 20 */ blr +/* 802C1098 002BDFF8 4E 80 00 20 */ blr .global AddWorkerWidget__9CAuiMeterFP10CGuiWidget AddWorkerWidget__9CAuiMeterFP10CGuiWidget: @@ -449,7 +449,7 @@ lbl_802C112C: /* 802C1140 002BE0A0 80 01 00 24 */ lwz r0, 0x24(r1) /* 802C1144 002BE0A4 7C 08 03 A6 */ mtlr r0 /* 802C1148 002BE0A8 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C114C 002BE0AC 4E 80 00 20 */ blr +/* 802C114C 002BE0AC 4E 80 00 20 */ blr .global __ct__9CAuiMeterFRCQ210CGuiWidget15CGuiWidgetParmsbii __ct__9CAuiMeterFRCQ210CGuiWidget15CGuiWidgetParmsbii: diff --git a/asm/GuiSys/CGuiGroup.s b/asm/GuiSys/CGuiGroup.s index 09302be6..7f60c746 100644 --- a/asm/GuiSys/CGuiGroup.s +++ b/asm/GuiSys/CGuiGroup.s @@ -78,7 +78,7 @@ lbl_803EC7C8: .4byte OnVisible__18CGuiCompoundWidgetFv .4byte OnActivate__9CGuiGroupFv .4byte GetWorkerWidget__18CGuiCompoundWidgetFi - + .section .text, "ax" .global __dt__9CGuiGroupFv @@ -107,7 +107,7 @@ lbl_802C122C: /* 802C1238 002BE198 83 C1 00 08 */ lwz r30, 8(r1) /* 802C123C 002BE19C 7C 08 03 A6 */ mtlr r0 /* 802C1240 002BE1A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C1244 002BE1A4 4E 80 00 20 */ blr +/* 802C1244 002BE1A4 4E 80 00 20 */ blr .global Create__9CAuiMeterFP9CGuiFrameR12CInputStreamb Create__9CAuiMeterFP9CGuiFrameR12CInputStreamb: @@ -179,7 +179,7 @@ lbl_802C132C: /* 802C1348 002BE2A8 80 01 00 54 */ lwz r0, 0x54(r1) /* 802C134C 002BE2AC 7C 08 03 A6 */ mtlr r0 /* 802C1350 002BE2B0 38 21 00 50 */ addi r1, r1, 0x50 -/* 802C1354 002BE2B4 4E 80 00 20 */ blr +/* 802C1354 002BE2B4 4E 80 00 20 */ blr .global "reserve__Q24rstl46vectorFi" "reserve__Q24rstl46vectorFi": @@ -250,7 +250,7 @@ lbl_802C1428: /* 802C1434 002BE394 83 A1 00 24 */ lwz r29, 0x24(r1) /* 802C1438 002BE398 7C 08 03 A6 */ mtlr r0 /* 802C143C 002BE39C 38 21 00 30 */ addi r1, r1, 0x30 -/* 802C1440 002BE3A0 4E 80 00 20 */ blr +/* 802C1440 002BE3A0 4E 80 00 20 */ blr .global __dt__10CGuiCameraFv __dt__10CGuiCameraFv: @@ -278,18 +278,18 @@ lbl_802C1488: /* 802C1494 002BE3F4 83 C1 00 08 */ lwz r30, 8(r1) /* 802C1498 002BE3F8 7C 08 03 A6 */ mtlr r0 /* 802C149C 002BE3FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C14A0 002BE400 4E 80 00 20 */ blr +/* 802C14A0 002BE400 4E 80 00 20 */ blr .global GetWidgetTypeID__10CGuiCameraCFv GetWidgetTypeID__10CGuiCameraCFv: /* 802C14A4 002BE404 3C 60 43 41 */ lis r3, 0x43414D52@ha /* 802C14A8 002BE408 38 63 4D 52 */ addi r3, r3, 0x43414D52@l -/* 802C14AC 002BE40C 4E 80 00 20 */ blr +/* 802C14AC 002BE40C 4E 80 00 20 */ blr .global AddWorkerWidget__10CGuiWidgetFP10CGuiWidget AddWorkerWidget__10CGuiWidgetFP10CGuiWidget: /* 802C14B0 002BE410 38 60 00 00 */ li r3, 0 -/* 802C14B4 002BE414 4E 80 00 20 */ blr +/* 802C14B4 002BE414 4E 80 00 20 */ blr .global ConvertToScreenSpace__10CGuiCameraCFRC9CVector3f ConvertToScreenSpace__10CGuiCameraCFRC9CVector3f: @@ -384,7 +384,7 @@ lbl_802C15F0: /* 802C1608 002BE568 83 C1 00 A8 */ lwz r30, 0xa8(r1) /* 802C160C 002BE56C 7C 08 03 A6 */ mtlr r0 /* 802C1610 002BE570 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 802C1614 002BE574 4E 80 00 20 */ blr +/* 802C1614 002BE574 4E 80 00 20 */ blr .global Draw__10CGuiCameraCFRC19CGuiWidgetDrawParms Draw__10CGuiCameraCFRC19CGuiWidgetDrawParms: @@ -430,7 +430,7 @@ lbl_802C1674: /* 802C16AC 002BE60C 83 C1 00 68 */ lwz r30, 0x68(r1) /* 802C16B0 002BE610 7C 08 03 A6 */ mtlr r0 /* 802C16B4 002BE614 38 21 00 70 */ addi r1, r1, 0x70 -/* 802C16B8 002BE618 4E 80 00 20 */ blr +/* 802C16B8 002BE618 4E 80 00 20 */ blr .global __ct__10CGuiCameraFRCQ210CGuiWidget15CGuiWidgetParmsffff __ct__10CGuiCameraFRCQ210CGuiWidget15CGuiWidgetParmsffff: @@ -466,7 +466,7 @@ __ct__10CGuiCameraFRCQ210CGuiWidget15CGuiWidgetParmsffff: /* 802C1730 002BE690 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802C1734 002BE694 7C 08 03 A6 */ mtlr r0 /* 802C1738 002BE698 38 21 00 40 */ addi r1, r1, 0x40 -/* 802C173C 002BE69C 4E 80 00 20 */ blr +/* 802C173C 002BE69C 4E 80 00 20 */ blr .global __ct__10CGuiCameraFRCQ210CGuiWidget15CGuiWidgetParmsffffff __ct__10CGuiCameraFRCQ210CGuiWidget15CGuiWidgetParmsffffff: @@ -517,7 +517,7 @@ __ct__10CGuiCameraFRCQ210CGuiWidget15CGuiWidgetParmsffffff: /* 802C17F0 002BE750 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802C17F4 002BE754 7C 08 03 A6 */ mtlr r0 /* 802C17F8 002BE758 38 21 00 60 */ addi r1, r1, 0x60 -/* 802C17FC 002BE75C 4E 80 00 20 */ blr +/* 802C17FC 002BE75C 4E 80 00 20 */ blr .global Create__10CGuiCameraFP9CGuiFrameR12CInputStreamb Create__10CGuiCameraFP9CGuiFrameR12CInputStreamb: @@ -648,12 +648,12 @@ lbl_802C19A8: /* 802C19E0 002BE940 83 A1 00 44 */ lwz r29, 0x44(r1) /* 802C19E4 002BE944 7C 08 03 A6 */ mtlr r0 /* 802C19E8 002BE948 38 21 00 80 */ addi r1, r1, 0x80 -/* 802C19EC 002BE94C 4E 80 00 20 */ blr +/* 802C19EC 002BE94C 4E 80 00 20 */ blr .global GetWidgetTypeID__18CGuiCompoundWidgetCFv GetWidgetTypeID__18CGuiCompoundWidgetCFv: /* 802C19F0 002BE950 38 60 FF FF */ li r3, -1 -/* 802C19F4 002BE954 4E 80 00 20 */ blr +/* 802C19F4 002BE954 4E 80 00 20 */ blr .global OnVisible__18CGuiCompoundWidgetFv OnVisible__18CGuiCompoundWidgetFv: @@ -671,7 +671,7 @@ lbl_802C1A1C: /* 802C1A20 002BE980 81 9E 00 00 */ lwz r12, 0(r30) /* 802C1A24 002BE984 81 8C 00 20 */ lwz r12, 0x20(r12) /* 802C1A28 002BE988 7D 89 03 A6 */ mtctr r12 -/* 802C1A2C 002BE98C 4E 80 04 21 */ bctrl +/* 802C1A2C 002BE98C 4E 80 04 21 */ bctrl /* 802C1A30 002BE990 7C 64 1B 78 */ mr r4, r3 /* 802C1A34 002BE994 7F E3 FB 78 */ mr r3, r31 /* 802C1A38 002BE998 48 00 8B F5 */ bl SetIsVisible__10CGuiWidgetFb @@ -688,7 +688,7 @@ lbl_802C1A48: /* 802C1A60 002BE9C0 83 C1 00 08 */ lwz r30, 8(r1) /* 802C1A64 002BE9C4 7C 08 03 A6 */ mtlr r0 /* 802C1A68 002BE9C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C1A6C 002BE9CC 4E 80 00 20 */ blr +/* 802C1A6C 002BE9CC 4E 80 00 20 */ blr .global OnActivate__18CGuiCompoundWidgetFb OnActivate__18CGuiCompoundWidgetFb: @@ -706,7 +706,7 @@ lbl_802C1A94: /* 802C1A98 002BE9F8 81 9E 00 00 */ lwz r12, 0(r30) /* 802C1A9C 002BE9FC 81 8C 00 24 */ lwz r12, 0x24(r12) /* 802C1AA0 002BEA00 7D 89 03 A6 */ mtctr r12 -/* 802C1AA4 002BEA04 4E 80 04 21 */ bctrl +/* 802C1AA4 002BEA04 4E 80 04 21 */ bctrl /* 802C1AA8 002BEA08 7C 64 1B 78 */ mr r4, r3 /* 802C1AAC 002BEA0C 7F E3 FB 78 */ mr r3, r31 /* 802C1AB0 002BEA10 48 00 8B 35 */ bl SetIsActive__10CGuiWidgetFb @@ -723,7 +723,7 @@ lbl_802C1AC0: /* 802C1AD8 002BEA38 83 C1 00 08 */ lwz r30, 8(r1) /* 802C1ADC 002BEA3C 7C 08 03 A6 */ mtlr r0 /* 802C1AE0 002BEA40 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C1AE4 002BEA44 4E 80 00 20 */ blr +/* 802C1AE4 002BEA44 4E 80 00 20 */ blr .global GetWorkerWidget__18CGuiCompoundWidgetFi GetWorkerWidget__18CGuiCompoundWidgetFi: @@ -747,7 +747,7 @@ lbl_802C1B1C: /* 802C1B20 002BEA80 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802C1B24 002BEA84 7C 08 03 A6 */ mtlr r0 /* 802C1B28 002BEA88 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C1B2C 002BEA8C 4E 80 00 20 */ blr +/* 802C1B2C 002BEA8C 4E 80 00 20 */ blr .global __dt__18CGuiCompoundWidgetFv __dt__18CGuiCompoundWidgetFv: @@ -775,7 +775,7 @@ lbl_802C1B74: /* 802C1B80 002BEAE0 83 C1 00 08 */ lwz r30, 8(r1) /* 802C1B84 002BEAE4 7C 08 03 A6 */ mtlr r0 /* 802C1B88 002BEAE8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C1B8C 002BEAEC 4E 80 00 20 */ blr +/* 802C1B8C 002BEAEC 4E 80 00 20 */ blr .global __ct__18CGuiCompoundWidgetFRCQ210CGuiWidget15CGuiWidgetParms __ct__18CGuiCompoundWidgetFRCQ210CGuiWidget15CGuiWidgetParms: @@ -793,7 +793,7 @@ __ct__18CGuiCompoundWidgetFRCQ210CGuiWidget15CGuiWidgetParms: /* 802C1BBC 002BEB1C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C1BC0 002BEB20 7C 08 03 A6 */ mtlr r0 /* 802C1BC4 002BEB24 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C1BC8 002BEB28 4E 80 00 20 */ blr +/* 802C1BC8 002BEB28 4E 80 00 20 */ blr .global FGuiWidgetFactoryInGame__FUiP9CGuiFrameR12CInputStreamb FGuiWidgetFactoryInGame__FUiP9CGuiFrameR12CInputStreamb: @@ -954,7 +954,7 @@ lbl_802C1DE4: /* 802C1DE4 002BED44 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C1DE8 002BED48 7C 08 03 A6 */ mtlr r0 /* 802C1DEC 002BED4C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C1DF0 002BED50 4E 80 00 20 */ blr +/* 802C1DF0 002BED50 4E 80 00 20 */ blr .global RGuiFrameFactoryInGame__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer RGuiFrameFactoryInGame__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer: @@ -1000,7 +1000,7 @@ RGuiFrameFactoryInGame__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer: /* 802C1E90 002BEDF0 38 80 00 01 */ li r4, 1 /* 802C1E94 002BEDF4 81 8C 00 08 */ lwz r12, 8(r12) /* 802C1E98 002BEDF8 7D 89 03 A6 */ mtctr r12 -/* 802C1E9C 002BEDFC 4E 80 04 21 */ bctrl +/* 802C1E9C 002BEDFC 4E 80 04 21 */ bctrl lbl_802C1EA0: /* 802C1EA0 002BEE00 88 01 00 0C */ lbz r0, 0xc(r1) /* 802C1EA4 002BEE04 28 00 00 00 */ cmplwi r0, 0 @@ -1015,7 +1015,7 @@ lbl_802C1EB8: /* 802C1EC4 002BEE24 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 802C1EC8 002BEE28 7C 08 03 A6 */ mtlr r0 /* 802C1ECC 002BEE2C 38 21 00 30 */ addi r1, r1, 0x30 -/* 802C1ED0 002BEE30 4E 80 00 20 */ blr +/* 802C1ED0 002BEE30 4E 80 00 20 */ blr .global "__dt__36TObjOwnerDerivedFromIObj<9CGuiFrame>Fv" "__dt__36TObjOwnerDerivedFromIObj<9CGuiFrame>Fv": @@ -1057,7 +1057,7 @@ lbl_802C1F48: /* 802C1F54 002BEEB4 83 C1 00 08 */ lwz r30, 8(r1) /* 802C1F58 002BEEB8 7C 08 03 A6 */ mtlr r0 /* 802C1F5C 002BEEBC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C1F60 002BEEC0 4E 80 00 20 */ blr +/* 802C1F60 002BEEC0 4E 80 00 20 */ blr .global "GetIObjObjectFor__18TToken<9CGuiFrame>FRCQ24rstl20auto_ptr<9CGuiFrame>" "GetIObjObjectFor__18TToken<9CGuiFrame>FRCQ24rstl20auto_ptr<9CGuiFrame>": @@ -1071,7 +1071,7 @@ lbl_802C1F48: /* 802C1F80 002BEEE0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802C1F84 002BEEE4 7C 08 03 A6 */ mtlr r0 /* 802C1F88 002BEEE8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C1F8C 002BEEEC 4E 80 00 20 */ blr +/* 802C1F8C 002BEEEC 4E 80 00 20 */ blr .global "GetNewDerivedObject__36TObjOwnerDerivedFromIObj<9CGuiFrame>FRCQ24rstl20auto_ptr<9CGuiFrame>" "GetNewDerivedObject__36TObjOwnerDerivedFromIObj<9CGuiFrame>FRCQ24rstl20auto_ptr<9CGuiFrame>": @@ -1114,7 +1114,7 @@ lbl_802C2000: /* 802C201C 002BEF7C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C2020 002BEF80 7C 08 03 A6 */ mtlr r0 /* 802C2024 002BEF84 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C2028 002BEF88 4E 80 00 20 */ blr +/* 802C2028 002BEF88 4E 80 00 20 */ blr .global __sinit_CGuiFeeHelper_cpp __sinit_CGuiFeeHelper_cpp: @@ -1187,14 +1187,14 @@ __sinit_CGuiFeeHelper_cpp: /* 802C2134 002BF094 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C2138 002BF098 7C 08 03 A6 */ mtlr r0 /* 802C213C 002BF09C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C2140 002BF0A0 4E 80 00 20 */ blr +/* 802C2140 002BF0A0 4E 80 00 20 */ blr .global GetFrameLight__9CGuiFrameFi GetFrameLight__9CGuiFrameFi: /* 802C2144 002BF0A4 80 63 00 48 */ lwz r3, 0x48(r3) /* 802C2148 002BF0A8 54 80 10 3A */ slwi r0, r4, 2 /* 802C214C 002BF0AC 7C 63 00 2E */ lwzx r3, r3, r0 -/* 802C2150 002BF0B0 4E 80 00 20 */ blr +/* 802C2150 002BF0B0 4E 80 00 20 */ blr .global FindWidget__9CGuiFrameCFPCc FindWidget__9CGuiFrameCFPCc: @@ -1216,17 +1216,17 @@ FindWidget__9CGuiFrameCFPCc: /* 802C2190 002BF0F0 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802C2194 002BF0F4 7C 08 03 A6 */ mtlr r0 /* 802C2198 002BF0F8 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C219C 002BF0FC 4E 80 00 20 */ blr +/* 802C219C 002BF0FC 4E 80 00 20 */ blr .global SetFrameCamera__9CGuiFrameFP10CGuiCamera SetFrameCamera__9CGuiFrameFP10CGuiCamera: /* 802C21A0 002BF100 90 83 00 14 */ stw r4, 0x14(r3) -/* 802C21A4 002BF104 4E 80 00 20 */ blr +/* 802C21A4 002BF104 4E 80 00 20 */ blr .global SetHeadWidget__9CGuiFrameFP14CGuiHeadWidget SetHeadWidget__9CGuiFrameFP14CGuiHeadWidget: /* 802C21A8 002BF108 90 83 00 0C */ stw r4, 0xc(r3) -/* 802C21AC 002BF10C 4E 80 00 20 */ blr +/* 802C21AC 002BF10C 4E 80 00 20 */ blr .global FindWidget__9CGuiFrameCFs FindWidget__9CGuiFrameCFs: @@ -1238,7 +1238,7 @@ FindWidget__9CGuiFrameCFs: /* 802C21C4 002BF124 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C21C8 002BF128 7C 08 03 A6 */ mtlr r0 /* 802C21CC 002BF12C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C21D0 002BF130 4E 80 00 20 */ blr +/* 802C21D0 002BF130 4E 80 00 20 */ blr .global "FindWidget__9CGuiFrameCFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" "FindWidget__9CGuiFrameCFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>": @@ -1263,7 +1263,7 @@ lbl_802C2210: /* 802C2214 002BF174 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802C2218 002BF178 7C 08 03 A6 */ mtlr r0 /* 802C221C 002BF17C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C2220 002BF180 4E 80 00 20 */ blr +/* 802C2220 002BF180 4E 80 00 20 */ blr .global sub_802c2224 sub_802c2224: @@ -1301,7 +1301,7 @@ lbl_802C2290: /* 802C2290 002BF1F0 80 01 00 24 */ lwz r0, 0x24(r1) /* 802C2294 002BF1F4 7C 08 03 A6 */ mtlr r0 /* 802C2298 002BF1F8 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C229C 002BF1FC 4E 80 00 20 */ blr +/* 802C229C 002BF1FC 4E 80 00 20 */ blr .global sub_802c22a0 sub_802c22a0: @@ -1323,7 +1323,7 @@ sub_802c22a0: /* 802C22DC 002BF23C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802C22E0 002BF240 7C 08 03 A6 */ mtlr r0 /* 802C22E4 002BF244 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C22E8 002BF248 4E 80 00 20 */ blr +/* 802C22E8 002BF248 4E 80 00 20 */ blr .global sub_802c22ec sub_802c22ec: @@ -1368,7 +1368,7 @@ lbl_802C2354: /* 802C2370 002BF2D0 80 05 00 00 */ lwz r0, 0(r5) /* 802C2374 002BF2D4 90 03 00 00 */ stw r0, 0(r3) /* 802C2378 002BF2D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C237C 002BF2DC 4E 80 00 20 */ blr +/* 802C237C 002BF2DC 4E 80 00 20 */ blr .global SortDrawOrder__9CGuiFrameFv SortDrawOrder__9CGuiFrameFv: @@ -1393,7 +1393,7 @@ SortDrawOrder__9CGuiFrameFv: /* 802C23C8 002BF328 80 01 00 24 */ lwz r0, 0x24(r1) /* 802C23CC 002BF32C 7C 08 03 A6 */ mtlr r0 /* 802C23D0 002BF330 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C23D4 002BF334 4E 80 00 20 */ blr +/* 802C23D4 002BF334 4E 80 00 20 */ blr .global EnableLights__9CGuiFrameCFUi EnableLights__9CGuiFrameCFUi: @@ -1424,7 +1424,7 @@ lbl_802C2410: /* 802C2434 002BF394 81 9A 00 00 */ lwz r12, 0(r26) /* 802C2438 002BF398 81 8C 00 20 */ lwz r12, 0x20(r12) /* 802C243C 002BF39C 7D 89 03 A6 */ mtctr r12 -/* 802C2440 002BF3A0 4E 80 04 21 */ bctrl +/* 802C2440 002BF3A0 4E 80 04 21 */ bctrl /* 802C2444 002BF3A4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802C2448 002BF3A8 41 82 00 6C */ beq lbl_802C24B4 /* 802C244C 002BF3AC 88 1A 00 A8 */ lbz r0, 0xa8(r26) @@ -1475,7 +1475,7 @@ lbl_802C24E4: /* 802C24E8 002BF448 80 01 00 84 */ lwz r0, 0x84(r1) /* 802C24EC 002BF44C 7C 08 03 A6 */ mtlr r0 /* 802C24F0 002BF450 38 21 00 80 */ addi r1, r1, 0x80 -/* 802C24F4 002BF454 4E 80 00 20 */ blr +/* 802C24F4 002BF454 4E 80 00 20 */ blr .global DisableLights__9CGuiFrameCFv DisableLights__9CGuiFrameCFv: @@ -1486,7 +1486,7 @@ DisableLights__9CGuiFrameCFv: /* 802C2508 002BF468 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C250C 002BF46C 7C 08 03 A6 */ mtlr r0 /* 802C2510 002BF470 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C2514 002BF474 4E 80 00 20 */ blr +/* 802C2514 002BF474 4E 80 00 20 */ blr .global RemoveLight__9CGuiFrameFP9CGuiLight RemoveLight__9CGuiFrameFP9CGuiLight: @@ -1495,10 +1495,10 @@ RemoveLight__9CGuiFrameFP9CGuiLight: /* 802C2520 002BF480 54 03 10 3A */ slwi r3, r0, 2 /* 802C2524 002BF484 7C 05 18 2E */ lwzx r0, r5, r3 /* 802C2528 002BF488 7C 00 20 40 */ cmplw r0, r4 -/* 802C252C 002BF48C 4C 82 00 20 */ bnelr +/* 802C252C 002BF48C 4C 82 00 20 */ bnelr /* 802C2530 002BF490 38 00 00 00 */ li r0, 0 /* 802C2534 002BF494 7C 05 19 2E */ stwx r0, r5, r3 -/* 802C2538 002BF498 4E 80 00 20 */ blr +/* 802C2538 002BF498 4E 80 00 20 */ blr .global AddLight__9CGuiFrameFP9CGuiLight AddLight__9CGuiFrameFP9CGuiLight: @@ -1506,7 +1506,7 @@ AddLight__9CGuiFrameFP9CGuiLight: /* 802C2540 002BF4A0 80 63 00 48 */ lwz r3, 0x48(r3) /* 802C2544 002BF4A4 54 00 10 3A */ slwi r0, r0, 2 /* 802C2548 002BF4A8 7C 83 01 2E */ stwx r4, r3, r0 -/* 802C254C 002BF4AC 4E 80 00 20 */ blr +/* 802C254C 002BF4AC 4E 80 00 20 */ blr .global GetIsFinishedLoading__9CGuiFrameCFv GetIsFinishedLoading__9CGuiFrameCFv: @@ -1554,7 +1554,7 @@ lbl_802C25D8: /* 802C25E0 002BF540 83 C1 00 08 */ lwz r30, 8(r1) /* 802C25E4 002BF544 7C 08 03 A6 */ mtlr r0 /* 802C25E8 002BF548 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C25EC 002BF54C 4E 80 00 20 */ blr +/* 802C25EC 002BF54C 4E 80 00 20 */ blr .global Touch__9CGuiFrameCFv Touch__9CGuiFrameCFv: @@ -1571,7 +1571,7 @@ lbl_802C2610: /* 802C2614 002BF574 81 83 00 00 */ lwz r12, 0(r3) /* 802C2618 002BF578 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 802C261C 002BF57C 7D 89 03 A6 */ mtctr r12 -/* 802C2620 002BF580 4E 80 04 21 */ bctrl +/* 802C2620 002BF580 4E 80 04 21 */ bctrl /* 802C2624 002BF584 3B FF 00 04 */ addi r31, r31, 4 lbl_802C2628: /* 802C2628 002BF588 80 1E 00 30 */ lwz r0, 0x30(r30) @@ -1585,7 +1585,7 @@ lbl_802C2628: /* 802C2648 002BF5A8 83 C1 00 08 */ lwz r30, 8(r1) /* 802C264C 002BF5AC 7C 08 03 A6 */ mtlr r0 /* 802C2650 002BF5B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C2654 002BF5B4 4E 80 00 20 */ blr +/* 802C2654 002BF5B4 4E 80 00 20 */ blr .global ProcessUserInput__9CGuiFrameFRC11CFinalInput ProcessUserInput__9CGuiFrameFRC11CFinalInput: @@ -1609,7 +1609,7 @@ lbl_802C2690: /* 802C2698 002BF5F8 81 9E 00 00 */ lwz r12, 0(r30) /* 802C269C 002BF5FC 81 8C 00 24 */ lwz r12, 0x24(r12) /* 802C26A0 002BF600 7D 89 03 A6 */ mtctr r12 -/* 802C26A4 002BF604 4E 80 04 21 */ bctrl +/* 802C26A4 002BF604 4E 80 04 21 */ bctrl /* 802C26A8 002BF608 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802C26AC 002BF60C 41 82 00 1C */ beq lbl_802C26C8 /* 802C26B0 002BF610 7F C3 F3 78 */ mr r3, r30 @@ -1617,7 +1617,7 @@ lbl_802C2690: /* 802C26B8 002BF618 81 9E 00 00 */ lwz r12, 0(r30) /* 802C26BC 002BF61C 81 8C 00 18 */ lwz r12, 0x18(r12) /* 802C26C0 002BF620 7D 89 03 A6 */ mtctr r12 -/* 802C26C4 002BF624 4E 80 04 21 */ bctrl +/* 802C26C4 002BF624 4E 80 04 21 */ bctrl lbl_802C26C8: /* 802C26C8 002BF628 3B FF 00 04 */ addi r31, r31, 4 lbl_802C26CC: @@ -1635,7 +1635,7 @@ lbl_802C26E4: /* 802C26F4 002BF654 83 81 00 10 */ lwz r28, 0x10(r1) /* 802C26F8 002BF658 7C 08 03 A6 */ mtlr r0 /* 802C26FC 002BF65C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C2700 002BF660 4E 80 00 20 */ blr +/* 802C2700 002BF660 4E 80 00 20 */ blr .global Update__9CGuiFrameFf Update__9CGuiFrameFf: @@ -1646,11 +1646,11 @@ Update__9CGuiFrameFf: /* 802C2714 002BF674 81 83 00 00 */ lwz r12, 0(r3) /* 802C2718 002BF678 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802C271C 002BF67C 7D 89 03 A6 */ mtctr r12 -/* 802C2720 002BF680 4E 80 04 21 */ bctrl +/* 802C2720 002BF680 4E 80 04 21 */ bctrl /* 802C2724 002BF684 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C2728 002BF688 7C 08 03 A6 */ mtlr r0 /* 802C272C 002BF68C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C2730 002BF690 4E 80 00 20 */ blr +/* 802C2730 002BF690 4E 80 00 20 */ blr .global Draw__9CGuiFrameCFRC19CGuiWidgetDrawParms Draw__9CGuiFrameCFRC19CGuiWidgetDrawParms: @@ -1675,7 +1675,7 @@ Draw__9CGuiFrameCFRC19CGuiWidgetDrawParms: /* 802C277C 002BF6DC 81 83 00 00 */ lwz r12, 0(r3) /* 802C2780 002BF6E0 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802C2784 002BF6E4 7D 89 03 A6 */ mtctr r12 -/* 802C2788 002BF6E8 4E 80 04 21 */ bctrl +/* 802C2788 002BF6E8 4E 80 04 21 */ bctrl /* 802C278C 002BF6EC 3C 80 80 5A */ lis r4, lbl_805A5EBC@ha /* 802C2790 002BF6F0 38 60 00 00 */ li r3, 0 /* 802C2794 002BF6F4 38 84 5E BC */ addi r4, r4, lbl_805A5EBC@l @@ -1693,7 +1693,7 @@ lbl_802C27B8: /* 802C27C0 002BF720 81 9E 00 00 */ lwz r12, 0(r30) /* 802C27C4 002BF724 81 8C 00 20 */ lwz r12, 0x20(r12) /* 802C27C8 002BF728 7D 89 03 A6 */ mtctr r12 -/* 802C27CC 002BF72C 4E 80 04 21 */ bctrl +/* 802C27CC 002BF72C 4E 80 04 21 */ bctrl /* 802C27D0 002BF730 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802C27D4 002BF734 41 82 00 1C */ beq lbl_802C27F0 /* 802C27D8 002BF738 7F C3 F3 78 */ mr r3, r30 @@ -1701,7 +1701,7 @@ lbl_802C27B8: /* 802C27E0 002BF740 81 9E 00 00 */ lwz r12, 0(r30) /* 802C27E4 002BF744 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802C27E8 002BF748 7D 89 03 A6 */ mtctr r12 -/* 802C27EC 002BF74C 4E 80 04 21 */ bctrl +/* 802C27EC 002BF74C 4E 80 04 21 */ bctrl lbl_802C27F0: /* 802C27F0 002BF750 3B FF 00 04 */ addi r31, r31, 4 lbl_802C27F4: @@ -1720,7 +1720,7 @@ lbl_802C27F4: /* 802C2824 002BF784 83 81 00 10 */ lwz r28, 0x10(r1) /* 802C2828 002BF788 7C 08 03 A6 */ mtlr r0 /* 802C282C 002BF78C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C2830 002BF790 4E 80 00 20 */ blr +/* 802C2830 002BF790 4E 80 00 20 */ blr .global Initialize__9CGuiFrameFv Initialize__9CGuiFrameFv: @@ -1740,7 +1740,7 @@ Initialize__9CGuiFrameFv: /* 802C2868 002BF7C8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802C286C 002BF7CC 7C 08 03 A6 */ mtlr r0 /* 802C2870 002BF7D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C2874 002BF7D4 4E 80 00 20 */ blr +/* 802C2874 002BF7D4 4E 80 00 20 */ blr .global LoadWidgetsInGame__9CGuiFrameFR12CInputStream LoadWidgetsInGame__9CGuiFrameFR12CInputStream: @@ -1773,7 +1773,7 @@ lbl_802C28C0: /* 802C28DC 002BF83C 7C 7A 1B 78 */ mr r26, r3 /* 802C28E0 002BF840 81 8C 00 28 */ lwz r12, 0x28(r12) /* 802C28E4 002BF844 7D 89 03 A6 */ mtctr r12 -/* 802C28E8 002BF848 4E 80 04 21 */ bctrl +/* 802C28E8 002BF848 4E 80 04 21 */ bctrl /* 802C28EC 002BF84C 3C 03 BC BF */ addis r0, r3, 0xbcbf /* 802C28F0 002BF850 28 00 4D 52 */ cmplwi r0, 0x4d52 /* 802C28F4 002BF854 41 82 00 90 */ beq lbl_802C2984 @@ -1781,7 +1781,7 @@ lbl_802C28C0: /* 802C28FC 002BF85C 81 9A 00 00 */ lwz r12, 0(r26) /* 802C2900 002BF860 81 8C 00 28 */ lwz r12, 0x28(r12) /* 802C2904 002BF864 7D 89 03 A6 */ mtctr r12 -/* 802C2908 002BF868 4E 80 04 21 */ bctrl +/* 802C2908 002BF868 4E 80 04 21 */ bctrl /* 802C290C 002BF86C 3C 03 B3 B7 */ addis r0, r3, 0xb3b7 /* 802C2910 002BF870 28 00 54 45 */ cmplwi r0, 0x5445 /* 802C2914 002BF874 41 82 00 70 */ beq lbl_802C2984 @@ -1789,7 +1789,7 @@ lbl_802C28C0: /* 802C291C 002BF87C 81 9A 00 00 */ lwz r12, 0(r26) /* 802C2920 002BF880 81 8C 00 28 */ lwz r12, 0x28(r12) /* 802C2924 002BF884 7D 89 03 A6 */ mtctr r12 -/* 802C2928 002BF888 4E 80 04 21 */ bctrl +/* 802C2928 002BF888 4E 80 04 21 */ bctrl /* 802C292C 002BF88C 3C 03 BD B9 */ addis r0, r3, 0xbdb9 /* 802C2930 002BF890 28 00 4E 44 */ cmplwi r0, 0x4e44 /* 802C2934 002BF894 41 82 00 50 */ beq lbl_802C2984 @@ -1827,13 +1827,13 @@ lbl_802C2988: /* 802C29A0 002BF900 80 01 00 24 */ lwz r0, 0x24(r1) /* 802C29A4 002BF904 7C 08 03 A6 */ mtlr r0 /* 802C29A8 002BF908 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C29AC 002BF90C 4E 80 00 20 */ blr +/* 802C29AC 002BF90C 4E 80 00 20 */ blr .global GetWidgetTypeID__10CGuiWidgetCFv GetWidgetTypeID__10CGuiWidgetCFv: /* 802C29B0 002BF910 3C 60 42 57 */ lis r3, 0x42574947@ha /* 802C29B4 002BF914 38 63 49 47 */ addi r3, r3, 0x42574947@l -/* 802C29B8 002BF918 4E 80 00 20 */ blr +/* 802C29B8 002BF918 4E 80 00 20 */ blr .global CreateFrame__9CGuiFrameFUiR7CGuiSysR12CInputStreami CreateFrame__9CGuiFrameFUiR7CGuiSysR12CInputStreami: @@ -1885,7 +1885,7 @@ lbl_802C2A50: /* 802C2A6C 002BF9CC 80 01 00 34 */ lwz r0, 0x34(r1) /* 802C2A70 002BF9D0 7C 08 03 A6 */ mtlr r0 /* 802C2A74 002BF9D4 38 21 00 30 */ addi r1, r1, 0x30 -/* 802C2A78 002BF9D8 4E 80 00 20 */ blr +/* 802C2A78 002BF9D8 4E 80 00 20 */ blr .global __dt__9CGuiFrameFv __dt__9CGuiFrameFv: @@ -1905,7 +1905,7 @@ __dt__9CGuiFrameFv: /* 802C2AB0 002BFA10 38 80 00 01 */ li r4, 1 /* 802C2AB4 002BFA14 81 8C 00 08 */ lwz r12, 8(r12) /* 802C2AB8 002BFA18 7D 89 03 A6 */ mtctr r12 -/* 802C2ABC 002BFA1C 4E 80 04 21 */ bctrl +/* 802C2ABC 002BFA1C 4E 80 04 21 */ bctrl lbl_802C2AC0: /* 802C2AC0 002BFA20 34 1E 00 3C */ addic. r0, r30, 0x3c /* 802C2AC4 002BFA24 41 82 00 44 */ beq lbl_802C2B08 @@ -1963,7 +1963,7 @@ lbl_802C2B6C: /* 802C2B78 002BFAD8 83 C1 00 28 */ lwz r30, 0x28(r1) /* 802C2B7C 002BFADC 7C 08 03 A6 */ mtlr r0 /* 802C2B80 002BFAE0 38 21 00 30 */ addi r1, r1, 0x30 -/* 802C2B84 002BFAE4 4E 80 00 20 */ blr +/* 802C2B84 002BFAE4 4E 80 00 20 */ blr .global sub_802c2b88 sub_802c2b88: @@ -2015,7 +2015,7 @@ lbl_802C2C14: /* 802C2C28 002BFB88 83 81 00 20 */ lwz r28, 0x20(r1) /* 802C2C2C 002BFB8C 7C 08 03 A6 */ mtlr r0 /* 802C2C30 002BFB90 38 21 00 30 */ addi r1, r1, 0x30 -/* 802C2C34 002BFB94 4E 80 00 20 */ blr +/* 802C2C34 002BFB94 4E 80 00 20 */ blr .global __ct__9CGuiFrameFUiR7CGuiSysiiii __ct__9CGuiFrameFUiR7CGuiSysiiii: @@ -2203,7 +2203,7 @@ lbl_802C2EA4: /* 802C2EBC 002BFE1C 83 81 00 50 */ lwz r28, 0x50(r1) /* 802C2EC0 002BFE20 7C 08 03 A6 */ mtlr r0 /* 802C2EC4 002BFE24 38 21 00 60 */ addi r1, r1, 0x60 -/* 802C2EC8 002BFE28 4E 80 00 20 */ blr +/* 802C2EC8 002BFE28 4E 80 00 20 */ blr .global "sort,Q24rstl17rmemory_allocator>,Q24rstl24CWidgetFartherFromCamera>__4rstlFQ24rstl116pointer_iterator,Q24rstl17rmemory_allocator>Q24rstl116pointer_iterator,Q24rstl17rmemory_allocator>Q24rstl24CWidgetFartherFromCamera" "sort,Q24rstl17rmemory_allocator>,Q24rstl24CWidgetFartherFromCamera>__4rstlFQ24rstl116pointer_iterator,Q24rstl17rmemory_allocator>Q24rstl116pointer_iterator,Q24rstl17rmemory_allocator>Q24rstl24CWidgetFartherFromCamera": @@ -2354,7 +2354,7 @@ lbl_802C30EC: /* 802C30F0 002C0050 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 802C30F4 002C0054 7C 08 03 A6 */ mtlr r0 /* 802C30F8 002C0058 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 802C30FC 002C005C 4E 80 00 20 */ blr +/* 802C30FC 002C005C 4E 80 00 20 */ blr .global "reserve__Q24rstl48vectorFi" "reserve__Q24rstl48vectorFi": @@ -2425,7 +2425,7 @@ lbl_802C31D0: /* 802C31DC 002C013C 83 A1 00 24 */ lwz r29, 0x24(r1) /* 802C31E0 002C0140 7C 08 03 A6 */ mtlr r0 /* 802C31E4 002C0144 38 21 00 30 */ addi r1, r1, 0x30 -/* 802C31E8 002C0148 4E 80 00 20 */ blr +/* 802C31E8 002C0148 4E 80 00 20 */ blr .global sub_802c31ec sub_802c31ec: @@ -2492,7 +2492,7 @@ lbl_802C32C4: /* 802C32D0 002C0230 80 01 00 84 */ lwz r0, 0x84(r1) /* 802C32D4 002C0234 7C 08 03 A6 */ mtlr r0 /* 802C32D8 002C0238 38 21 00 80 */ addi r1, r1, 0x80 -/* 802C32DC 002C023C 4E 80 00 20 */ blr +/* 802C32DC 002C023C 4E 80 00 20 */ blr .global sub_802c32e0 sub_802c32e0: @@ -2552,13 +2552,13 @@ lbl_802C3390: /* 802C33A0 002C0300 80 01 00 64 */ lwz r0, 0x64(r1) /* 802C33A4 002C0304 7C 08 03 A6 */ mtlr r0 /* 802C33A8 002C0308 38 21 00 60 */ addi r1, r1, 0x60 -/* 802C33AC 002C030C 4E 80 00 20 */ blr +/* 802C33AC 002C030C 4E 80 00 20 */ blr .global GetWidgetTypeID__9CGuiGroupCFv GetWidgetTypeID__9CGuiGroupCFv: /* 802C33B0 002C0310 3C 60 47 52 */ lis r3, 0x47525550@ha /* 802C33B4 002C0314 38 63 55 50 */ addi r3, r3, 0x47525550@l -/* 802C33B8 002C0318 4E 80 00 20 */ blr +/* 802C33B8 002C0318 4E 80 00 20 */ blr .global GetSelectedWidget__9CGuiGroupFv GetSelectedWidget__9CGuiGroupFv: @@ -2569,11 +2569,11 @@ GetSelectedWidget__9CGuiGroupFv: /* 802C33CC 002C032C 80 83 00 BC */ lwz r4, 0xbc(r3) /* 802C33D0 002C0330 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 802C33D4 002C0334 7D 89 03 A6 */ mtctr r12 -/* 802C33D8 002C0338 4E 80 04 21 */ bctrl +/* 802C33D8 002C0338 4E 80 04 21 */ bctrl /* 802C33DC 002C033C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C33E0 002C0340 7C 08 03 A6 */ mtlr r0 /* 802C33E4 002C0344 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C33E8 002C0348 4E 80 00 20 */ blr +/* 802C33E8 002C0348 4E 80 00 20 */ blr .global AddWorkerWidget__9CGuiGroupFP10CGuiWidget AddWorkerWidget__9CGuiGroupFP10CGuiWidget: @@ -2581,7 +2581,7 @@ AddWorkerWidget__9CGuiGroupFP10CGuiWidget: /* 802C33F0 002C0350 38 04 00 01 */ addi r0, r4, 1 /* 802C33F4 002C0354 90 03 00 B8 */ stw r0, 0xb8(r3) /* 802C33F8 002C0358 38 60 00 01 */ li r3, 1 -/* 802C33FC 002C035C 4E 80 00 20 */ blr +/* 802C33FC 002C035C 4E 80 00 20 */ blr .global OnActivate__9CGuiGroupFv OnActivate__9CGuiGroupFv: @@ -2598,7 +2598,7 @@ OnActivate__9CGuiGroupFv: /* 802C3428 002C0388 81 9E 00 00 */ lwz r12, 0(r30) /* 802C342C 002C038C 81 8C 00 24 */ lwz r12, 0x24(r12) /* 802C3430 002C0390 7D 89 03 A6 */ mtctr r12 -/* 802C3434 002C0394 4E 80 04 21 */ bctrl +/* 802C3434 002C0394 4E 80 04 21 */ bctrl /* 802C3438 002C0398 7C 64 1B 78 */ mr r4, r3 /* 802C343C 002C039C 7F E3 FB 78 */ mr r3, r31 /* 802C3440 002C03A0 48 00 71 A5 */ bl SetIsActive__10CGuiWidgetFb @@ -2608,7 +2608,7 @@ lbl_802C3444: /* 802C344C 002C03AC 83 C1 00 08 */ lwz r30, 8(r1) /* 802C3450 002C03B0 7C 08 03 A6 */ mtlr r0 /* 802C3454 002C03B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C3458 002C03B8 4E 80 00 20 */ blr +/* 802C3458 002C03B8 4E 80 00 20 */ blr .global __ct__9CGuiGroupFRCQ210CGuiWidget15CGuiWidgetParmsib __ct__9CGuiGroupFRCQ210CGuiWidget15CGuiWidgetParmsib: @@ -2636,7 +2636,7 @@ __ct__9CGuiGroupFRCQ210CGuiWidget15CGuiWidgetParmsib: /* 802C34B0 002C0410 80 01 00 24 */ lwz r0, 0x24(r1) /* 802C34B4 002C0414 7C 08 03 A6 */ mtlr r0 /* 802C34B8 002C0418 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C34BC 002C041C 4E 80 00 20 */ blr +/* 802C34BC 002C041C 4E 80 00 20 */ blr .global Create__9CGuiGroupFP9CGuiFrameR12CInputStreamb Create__9CGuiGroupFP9CGuiFrameR12CInputStreamb: diff --git a/asm/GuiSys/CGuiHeadWidget.s b/asm/GuiSys/CGuiHeadWidget.s index 475551c8..b55f5554 100644 --- a/asm/GuiSys/CGuiHeadWidget.s +++ b/asm/GuiSys/CGuiHeadWidget.s @@ -40,7 +40,7 @@ __ct__14CGuiHeadWidgetFRCQ210CGuiWidget15CGuiWidgetParms: /* 802C35E4 002C0544 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C35E8 002C0548 7C 08 03 A6 */ mtlr r0 /* 802C35EC 002C054C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C35F0 002C0550 4E 80 00 20 */ blr +/* 802C35F0 002C0550 4E 80 00 20 */ blr .global Create__14CGuiHeadWidgetFP9CGuiFrameR12CInputStreamb Create__14CGuiHeadWidgetFP9CGuiFrameR12CInputStreamb: @@ -100,7 +100,7 @@ lbl_802C369C: /* 802C36C4 002C0624 80 01 00 54 */ lwz r0, 0x54(r1) /* 802C36C8 002C0628 7C 08 03 A6 */ mtlr r0 /* 802C36CC 002C062C 38 21 00 50 */ addi r1, r1, 0x50 -/* 802C36D0 002C0630 4E 80 00 20 */ blr +/* 802C36D0 002C0630 4E 80 00 20 */ blr .global __dt__14CGuiHeadWidgetFv __dt__14CGuiHeadWidgetFv: @@ -128,10 +128,10 @@ lbl_802C3718: /* 802C3724 002C0684 83 C1 00 08 */ lwz r30, 8(r1) /* 802C3728 002C0688 7C 08 03 A6 */ mtlr r0 /* 802C372C 002C068C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C3730 002C0690 4E 80 00 20 */ blr +/* 802C3730 002C0690 4E 80 00 20 */ blr .global GetWidgetTypeID__14CGuiHeadWidgetCFv GetWidgetTypeID__14CGuiHeadWidgetCFv: /* 802C3734 002C0694 3C 60 48 57 */ lis r3, 0x48574947@ha /* 802C3738 002C0698 38 63 49 47 */ addi r3, r3, 0x48574947@l -/* 802C373C 002C069C 4E 80 00 20 */ blr +/* 802C373C 002C069C 4E 80 00 20 */ blr diff --git a/asm/GuiSys/CGuiLight.s b/asm/GuiSys/CGuiLight.s index 1a0a6641..8a32386e 100644 --- a/asm/GuiSys/CGuiLight.s +++ b/asm/GuiSys/CGuiLight.s @@ -28,7 +28,7 @@ lbl_803EC848: GetWidgetTypeID__9CGuiLightCFv: /* 802C3740 002C06A0 3C 60 4C 49 */ lis r3, 0x4C495445@ha /* 802C3744 002C06A4 38 63 54 45 */ addi r3, r3, 0x4C495445@l -/* 802C3748 002C06A8 4E 80 00 20 */ blr +/* 802C3748 002C06A8 4E 80 00 20 */ blr .global BuildLight__9CGuiLightCFv BuildLight__9CGuiLightCFv: @@ -295,7 +295,7 @@ lbl_802C3B00: /* 802C3B44 002C0AA4 83 C1 02 18 */ lwz r30, 0x218(r1) /* 802C3B48 002C0AA8 7C 08 03 A6 */ mtlr r0 /* 802C3B4C 002C0AAC 38 21 02 20 */ addi r1, r1, 0x220 -/* 802C3B50 002C0AB0 4E 80 00 20 */ blr +/* 802C3B50 002C0AB0 4E 80 00 20 */ blr .global SetIsVisible__9CGuiLightFb SetIsVisible__9CGuiLightFb: @@ -325,7 +325,7 @@ lbl_802C3B94: /* 802C3BA8 002C0B08 83 C1 00 08 */ lwz r30, 8(r1) /* 802C3BAC 002C0B0C 7C 08 03 A6 */ mtlr r0 /* 802C3BB0 002C0B10 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C3BB4 002C0B14 4E 80 00 20 */ blr +/* 802C3BB4 002C0B14 4E 80 00 20 */ blr .global __dt__9CGuiLightFv __dt__9CGuiLightFv: @@ -357,7 +357,7 @@ lbl_802C3C0C: /* 802C3C18 002C0B78 83 C1 00 08 */ lwz r30, 8(r1) /* 802C3C1C 002C0B7C 7C 08 03 A6 */ mtlr r0 /* 802C3C20 002C0B80 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C3C24 002C0B84 4E 80 00 20 */ blr +/* 802C3C24 002C0B84 4E 80 00 20 */ blr .global __ct__9CGuiLightFRCQ210CGuiWidget15CGuiWidgetParmsRC6CLight __ct__9CGuiLightFRCQ210CGuiWidget15CGuiWidgetParmsRC6CLight: @@ -399,7 +399,7 @@ __ct__9CGuiLightFRCQ210CGuiWidget15CGuiWidgetParmsRC6CLight: /* 802C3CB4 002C0C14 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C3CB8 002C0C18 7C 08 03 A6 */ mtlr r0 /* 802C3CBC 002C0C1C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C3CC0 002C0C20 4E 80 00 20 */ blr +/* 802C3CC0 002C0C20 4E 80 00 20 */ blr .global Create__9CGuiLightFP9CGuiFrameR12CInputStreamb Create__9CGuiLightFP9CGuiFrameR12CInputStreamb: diff --git a/asm/GuiSys/CGuiModel.s b/asm/GuiSys/CGuiModel.s index dc321081..ccfc7863 100644 --- a/asm/GuiSys/CGuiModel.s +++ b/asm/GuiSys/CGuiModel.s @@ -28,7 +28,7 @@ lbl_803EC888: GetWidgetTypeID__9CGuiModelCFv: /* 802C3F64 002C0EC4 3C 60 4D 4F */ lis r3, 0x4D4F444C@ha /* 802C3F68 002C0EC8 38 63 44 4C */ addi r3, r3, 0x4D4F444C@l -/* 802C3F6C 002C0ECC 4E 80 00 20 */ blr +/* 802C3F6C 002C0ECC 4E 80 00 20 */ blr .global GetModelAssets__9CGuiModelCFv GetModelAssets__9CGuiModelCFv: @@ -66,7 +66,7 @@ lbl_802C3FD8: /* 802C3FE0 002C0F40 83 C1 00 08 */ lwz r30, 8(r1) /* 802C3FE4 002C0F44 7C 08 03 A6 */ mtlr r0 /* 802C3FE8 002C0F48 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C3FEC 002C0F4C 4E 80 00 20 */ blr +/* 802C3FEC 002C0F4C 4E 80 00 20 */ blr .global GetIsFinishedLoadingWidgetSpecific__9CGuiModelCFv GetIsFinishedLoadingWidgetSpecific__9CGuiModelCFv: @@ -116,7 +116,7 @@ lbl_802C4084: /* 802C408C 002C0FEC 83 C1 00 08 */ lwz r30, 8(r1) /* 802C4090 002C0FF0 7C 08 03 A6 */ mtlr r0 /* 802C4094 002C0FF4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C4098 002C0FF8 4E 80 00 20 */ blr +/* 802C4098 002C0FF8 4E 80 00 20 */ blr .global Touch__9CGuiModelCFv Touch__9CGuiModelCFv: @@ -135,7 +135,7 @@ lbl_802C40C8: /* 802C40C8 002C1028 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C40CC 002C102C 7C 08 03 A6 */ mtlr r0 /* 802C40D0 002C1030 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C40D4 002C1034 4E 80 00 20 */ blr +/* 802C40D4 002C1034 4E 80 00 20 */ blr .global Draw__9CGuiModelCFRC19CGuiWidgetDrawParms Draw__9CGuiModelCFRC19CGuiWidgetDrawParms: @@ -163,7 +163,7 @@ Draw__9CGuiModelCFRC19CGuiWidgetDrawParms: /* 802C412C 002C108C 81 9A 00 00 */ lwz r12, 0(r26) /* 802C4130 002C1090 81 8C 00 20 */ lwz r12, 0x20(r12) /* 802C4134 002C1094 7D 89 03 A6 */ mtctr r12 -/* 802C4138 002C1098 4E 80 04 21 */ bctrl +/* 802C4138 002C1098 4E 80 04 21 */ bctrl /* 802C413C 002C109C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802C4140 002C10A0 41 82 03 00 */ beq lbl_802C4440 /* 802C4144 002C10A4 88 7A 00 AB */ lbz r3, 0xab(r26) @@ -382,7 +382,7 @@ lbl_802C444C: /* 802C4458 002C13B8 80 01 00 84 */ lwz r0, 0x84(r1) /* 802C445C 002C13BC 7C 08 03 A6 */ mtlr r0 /* 802C4460 002C13C0 38 21 00 80 */ addi r1, r1, 0x80 -/* 802C4464 002C13C4 4E 80 00 20 */ blr +/* 802C4464 002C13C4 4E 80 00 20 */ blr .global __dt__9CGuiModelFv __dt__9CGuiModelFv: @@ -426,7 +426,7 @@ lbl_802C44E4: /* 802C44F0 002C1450 83 C1 00 08 */ lwz r30, 8(r1) /* 802C44F4 002C1454 7C 08 03 A6 */ mtlr r0 /* 802C44F8 002C1458 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C44FC 002C145C 4E 80 00 20 */ blr +/* 802C44FC 002C145C 4E 80 00 20 */ blr .global __ct__9CGuiModelFRCQ210CGuiWidget15CGuiWidgetParmsUiUib __ct__9CGuiModelFRCQ210CGuiWidget15CGuiWidgetParmsUiUib: @@ -467,7 +467,7 @@ __ct__9CGuiModelFRCQ210CGuiWidget15CGuiWidgetParmsUiUib: /* 802C4588 002C14E8 81 9B 00 00 */ lwz r12, 0(r27) /* 802C458C 002C14EC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802C4590 002C14F0 7D 89 03 A6 */ mtctr r12 -/* 802C4594 002C14F4 4E 80 04 21 */ bctrl +/* 802C4594 002C14F4 4E 80 04 21 */ bctrl /* 802C4598 002C14F8 38 61 00 18 */ addi r3, r1, 0x18 /* 802C459C 002C14FC 38 81 00 08 */ addi r4, r1, 8 /* 802C45A0 002C1500 48 07 C9 09 */ bl __ct__6CTokenFRC6CToken @@ -509,7 +509,7 @@ lbl_802C4618: /* 802C4620 002C1580 80 01 00 44 */ lwz r0, 0x44(r1) /* 802C4624 002C1584 7C 08 03 A6 */ mtlr r0 /* 802C4628 002C1588 38 21 00 40 */ addi r1, r1, 0x40 -/* 802C462C 002C158C 4E 80 00 20 */ blr +/* 802C462C 002C158C 4E 80 00 20 */ blr .global Create__9CGuiModelFP9CGuiFrameR12CInputStreamb Create__9CGuiModelFP9CGuiFrameR12CInputStreamb: diff --git a/asm/GuiSys/CGuiObject.s b/asm/GuiSys/CGuiObject.s index 79ad5de0..a67d261d 100644 --- a/asm/GuiSys/CGuiObject.s +++ b/asm/GuiSys/CGuiObject.s @@ -45,7 +45,7 @@ SetO2WTransform__10CGuiObjectFRC12CTransform4f: /* 802C47A0 002C1700 83 C1 00 C8 */ lwz r30, 0xc8(r1) /* 802C47A4 002C1704 7C 08 03 A6 */ mtlr r0 /* 802C47A8 002C1708 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 802C47AC 002C170C 4E 80 00 20 */ blr +/* 802C47AC 002C170C 4E 80 00 20 */ blr .global sub_802c47b0 sub_802c47b0: @@ -62,7 +62,7 @@ sub_802c47b0: /* 802C47D8 002C1738 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802C47DC 002C173C 7C 08 03 A6 */ mtlr r0 /* 802C47E0 002C1740 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C47E4 002C1744 4E 80 00 20 */ blr +/* 802C47E4 002C1744 4E 80 00 20 */ blr .global RecalculateTransforms__10CGuiObjectFv RecalculateTransforms__10CGuiObjectFv: @@ -443,12 +443,12 @@ lbl_802C4CF8: /* 802C4D08 002C1C68 83 81 02 E0 */ lwz r28, 0x2e0(r1) /* 802C4D0C 002C1C6C 7C 08 03 A6 */ mtlr r0 /* 802C4D10 002C1C70 38 21 02 F0 */ addi r1, r1, 0x2f0 -/* 802C4D14 002C1C74 4E 80 00 20 */ blr +/* 802C4D14 002C1C74 4E 80 00 20 */ blr .global GetParent__10CGuiObjectFv GetParent__10CGuiObjectFv: /* 802C4D18 002C1C78 80 63 00 64 */ lwz r3, 0x64(r3) -/* 802C4D1C 002C1C7C 4E 80 00 20 */ blr +/* 802C4D1C 002C1C7C 4E 80 00 20 */ blr .global GetNextSibling__10CGuiObjectFv GetNextSibling__10CGuiObjectFv: @@ -458,17 +458,17 @@ GetNextSibling__10CGuiObjectFv: .global GetNextSibling__18CGuiCompoundWidgetFv GetNextSibling__18CGuiCompoundWidgetFv: /* 802C4D28 002C1C88 80 63 00 6C */ lwz r3, 0x6c(r3) -/* 802C4D2C 002C1C8C 4E 80 00 20 */ blr +/* 802C4D2C 002C1C8C 4E 80 00 20 */ blr .global GetChildObject__10CGuiObjectFv GetChildObject__10CGuiObjectFv: /* 802C4D30 002C1C90 80 63 00 68 */ lwz r3, 0x68(r3) -/* 802C4D34 002C1C94 4E 80 00 20 */ blr +/* 802C4D34 002C1C94 4E 80 00 20 */ blr .global GetChildObject__18CGuiCompoundWidgetFv GetChildObject__18CGuiCompoundWidgetFv: /* 802C4D38 002C1C98 80 63 00 68 */ lwz r3, 0x68(r3) -/* 802C4D3C 002C1C9C 4E 80 00 20 */ blr +/* 802C4D3C 002C1C9C 4E 80 00 20 */ blr .global AddChildObject__10CGuiObjectFP10CGuiObjectbb AddChildObject__10CGuiObjectFP10CGuiObjectbb: @@ -663,7 +663,7 @@ lbl_802C4FF4: /* 802C5018 002C1F78 83 A1 01 94 */ lwz r29, 0x194(r1) /* 802C501C 002C1F7C 7C 08 03 A6 */ mtlr r0 /* 802C5020 002C1F80 38 21 01 C0 */ addi r1, r1, 0x1c0 -/* 802C5024 002C1F84 4E 80 00 20 */ blr +/* 802C5024 002C1F84 4E 80 00 20 */ blr .global MultiplyO2P__10CGuiObjectFRC12CTransform4f MultiplyO2P__10CGuiObjectFRC12CTransform4f: @@ -684,7 +684,7 @@ MultiplyO2P__10CGuiObjectFRC12CTransform4f: /* 802C5060 002C1FC0 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 802C5064 002C1FC4 7C 08 03 A6 */ mtlr r0 /* 802C5068 002C1FC8 38 21 00 40 */ addi r1, r1, 0x40 -/* 802C506C 002C1FCC 4E 80 00 20 */ blr +/* 802C506C 002C1FCC 4E 80 00 20 */ blr .global RotateTranslateW2O__10CGuiObjectCFRC9CVector3f RotateTranslateW2O__10CGuiObjectCFRC9CVector3f: @@ -720,7 +720,7 @@ RotateTranslateW2O__10CGuiObjectCFRC9CVector3f: /* 802C50E4 002C2044 80 01 00 34 */ lwz r0, 0x34(r1) /* 802C50E8 002C2048 7C 08 03 A6 */ mtlr r0 /* 802C50EC 002C204C 38 21 00 30 */ addi r1, r1, 0x30 -/* 802C50F0 002C2050 4E 80 00 20 */ blr +/* 802C50F0 002C2050 4E 80 00 20 */ blr .global RotateO2P__10CGuiObjectCFRC9CVector3f RotateO2P__10CGuiObjectCFRC9CVector3f: @@ -742,7 +742,7 @@ RotateO2P__10CGuiObjectCFRC9CVector3f: /* 802C5130 002C2090 80 01 00 24 */ lwz r0, 0x24(r1) /* 802C5134 002C2094 7C 08 03 A6 */ mtlr r0 /* 802C5138 002C2098 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C513C 002C209C 4E 80 00 20 */ blr +/* 802C513C 002C209C 4E 80 00 20 */ blr .global RotateReset__10CGuiObjectFv RotateReset__10CGuiObjectFv: @@ -779,7 +779,7 @@ RotateReset__10CGuiObjectFv: /* 802C51B8 002C2118 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802C51BC 002C211C 7C 08 03 A6 */ mtlr r0 /* 802C51C0 002C2120 38 21 00 40 */ addi r1, r1, 0x40 -/* 802C51C4 002C2124 4E 80 00 20 */ blr +/* 802C51C4 002C2124 4E 80 00 20 */ blr .global SetLocalPosition__10CGuiObjectFRC9CVector3f SetLocalPosition__10CGuiObjectFRC9CVector3f: @@ -803,7 +803,7 @@ SetLocalPosition__10CGuiObjectFRC9CVector3f: /* 802C520C 002C216C 80 01 00 24 */ lwz r0, 0x24(r1) /* 802C5210 002C2170 7C 08 03 A6 */ mtlr r0 /* 802C5214 002C2174 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C5218 002C2178 4E 80 00 20 */ blr +/* 802C5218 002C2178 4E 80 00 20 */ blr .global GetLocalPosition__10CGuiObjectCFv GetLocalPosition__10CGuiObjectCFv: @@ -813,7 +813,7 @@ GetLocalPosition__10CGuiObjectCFv: /* 802C5228 002C2188 D0 03 00 00 */ stfs f0, 0(r3) /* 802C522C 002C218C D0 23 00 04 */ stfs f1, 4(r3) /* 802C5230 002C2190 D0 43 00 08 */ stfs f2, 8(r3) -/* 802C5234 002C2194 4E 80 00 20 */ blr +/* 802C5234 002C2194 4E 80 00 20 */ blr .global GetWorldPosition__10CGuiObjectCFv GetWorldPosition__10CGuiObjectCFv: @@ -823,7 +823,7 @@ GetWorldPosition__10CGuiObjectCFv: /* 802C5244 002C21A4 D0 03 00 00 */ stfs f0, 0(r3) /* 802C5248 002C21A8 D0 23 00 04 */ stfs f1, 4(r3) /* 802C524C 002C21AC D0 43 00 08 */ stfs f2, 8(r3) -/* 802C5250 002C21B0 4E 80 00 20 */ blr +/* 802C5250 002C21B0 4E 80 00 20 */ blr .global MoveInWorld__10CGuiObjectFRC9CVector3f MoveInWorld__10CGuiObjectFRC9CVector3f: @@ -867,7 +867,7 @@ lbl_802C52A4: /* 802C52E4 002C2244 83 C1 00 28 */ lwz r30, 0x28(r1) /* 802C52E8 002C2248 7C 08 03 A6 */ mtlr r0 /* 802C52EC 002C224C 38 21 00 30 */ addi r1, r1, 0x30 -/* 802C52F0 002C2250 4E 80 00 20 */ blr +/* 802C52F0 002C2250 4E 80 00 20 */ blr .global Draw__10CGuiObjectCFRC19CGuiWidgetDrawParms Draw__10CGuiObjectCFRC19CGuiWidgetDrawParms: @@ -884,7 +884,7 @@ Draw__10CGuiObjectCFRC19CGuiWidgetDrawParms: /* 802C531C 002C227C 81 83 00 00 */ lwz r12, 0(r3) /* 802C5320 002C2280 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802C5324 002C2284 7D 89 03 A6 */ mtctr r12 -/* 802C5328 002C2288 4E 80 04 21 */ bctrl +/* 802C5328 002C2288 4E 80 04 21 */ bctrl lbl_802C532C: /* 802C532C 002C228C 80 7E 00 6C */ lwz r3, 0x6c(r30) /* 802C5330 002C2290 28 03 00 00 */ cmplwi r3, 0 @@ -893,14 +893,14 @@ lbl_802C532C: /* 802C533C 002C229C 7F E4 FB 78 */ mr r4, r31 /* 802C5340 002C22A0 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802C5344 002C22A4 7D 89 03 A6 */ mtctr r12 -/* 802C5348 002C22A8 4E 80 04 21 */ bctrl +/* 802C5348 002C22A8 4E 80 04 21 */ bctrl lbl_802C534C: /* 802C534C 002C22AC 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C5350 002C22B0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802C5354 002C22B4 83 C1 00 08 */ lwz r30, 8(r1) /* 802C5358 002C22B8 7C 08 03 A6 */ mtlr r0 /* 802C535C 002C22BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C5360 002C22C0 4E 80 00 20 */ blr +/* 802C5360 002C22C0 4E 80 00 20 */ blr .global Update__10CGuiObjectFf Update__10CGuiObjectFf: @@ -917,7 +917,7 @@ Update__10CGuiObjectFf: /* 802C538C 002C22EC 81 83 00 00 */ lwz r12, 0(r3) /* 802C5390 002C22F0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802C5394 002C22F4 7D 89 03 A6 */ mtctr r12 -/* 802C5398 002C22F8 4E 80 04 21 */ bctrl +/* 802C5398 002C22F8 4E 80 04 21 */ bctrl lbl_802C539C: /* 802C539C 002C22FC 80 7F 00 6C */ lwz r3, 0x6c(r31) /* 802C53A0 002C2300 28 03 00 00 */ cmplwi r3, 0 @@ -926,14 +926,14 @@ lbl_802C539C: /* 802C53AC 002C230C FC 20 F8 90 */ fmr f1, f31 /* 802C53B0 002C2310 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802C53B4 002C2314 7D 89 03 A6 */ mtctr r12 -/* 802C53B8 002C2318 4E 80 04 21 */ bctrl +/* 802C53B8 002C2318 4E 80 04 21 */ bctrl lbl_802C53BC: /* 802C53BC 002C231C 80 01 00 24 */ lwz r0, 0x24(r1) /* 802C53C0 002C2320 CB E1 00 18 */ lfd f31, 0x18(r1) /* 802C53C4 002C2324 83 E1 00 14 */ lwz r31, 0x14(r1) /* 802C53C8 002C2328 7C 08 03 A6 */ mtlr r0 /* 802C53CC 002C232C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C53D0 002C2330 4E 80 00 20 */ blr +/* 802C53D0 002C2330 4E 80 00 20 */ blr .global __dt__10CGuiObjectFv __dt__10CGuiObjectFv: @@ -955,7 +955,7 @@ __dt__10CGuiObjectFv: /* 802C5410 002C2370 38 80 00 01 */ li r4, 1 /* 802C5414 002C2374 81 8C 00 08 */ lwz r12, 8(r12) /* 802C5418 002C2378 7D 89 03 A6 */ mtctr r12 -/* 802C541C 002C237C 4E 80 04 21 */ bctrl +/* 802C541C 002C237C 4E 80 04 21 */ bctrl lbl_802C5420: /* 802C5420 002C2380 38 00 00 00 */ li r0, 0 /* 802C5424 002C2384 90 1E 00 68 */ stw r0, 0x68(r30) @@ -966,7 +966,7 @@ lbl_802C5420: /* 802C5438 002C2398 38 80 00 01 */ li r4, 1 /* 802C543C 002C239C 81 8C 00 08 */ lwz r12, 8(r12) /* 802C5440 002C23A0 7D 89 03 A6 */ mtctr r12 -/* 802C5444 002C23A4 4E 80 04 21 */ bctrl +/* 802C5444 002C23A4 4E 80 04 21 */ bctrl lbl_802C5448: /* 802C5448 002C23A8 38 60 00 00 */ li r3, 0 /* 802C544C 002C23AC 7F E0 07 35 */ extsh. r0, r31 @@ -981,7 +981,7 @@ lbl_802C5460: /* 802C546C 002C23CC 83 C1 00 08 */ lwz r30, 8(r1) /* 802C5470 002C23D0 7C 08 03 A6 */ mtlr r0 /* 802C5474 002C23D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C5478 002C23D8 4E 80 00 20 */ blr +/* 802C5478 002C23D8 4E 80 00 20 */ blr .global __ct__10CGuiObjectFv __ct__10CGuiObjectFv: diff --git a/asm/GuiSys/CGuiPane.s b/asm/GuiSys/CGuiPane.s index 30235a68..73ba63f8 100644 --- a/asm/GuiSys/CGuiPane.s +++ b/asm/GuiSys/CGuiPane.s @@ -32,7 +32,7 @@ lbl_803EC8E0: GetWidgetTypeID__8CGuiPaneCFv: /* 802C54E4 002C2444 3C 60 50 41 */ lis r3, 0x50414E45@ha /* 802C54E8 002C2448 38 63 4E 45 */ addi r3, r3, 0x50414E45@l -/* 802C54EC 002C244C 4E 80 00 20 */ blr +/* 802C54EC 002C244C 4E 80 00 20 */ blr .global GetDimensions__8CGuiPaneCFv GetDimensions__8CGuiPaneCFv: @@ -45,7 +45,7 @@ GetDimensions__8CGuiPaneCFv: /* 802C5508 002C2468 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C550C 002C246C 7C 08 03 A6 */ mtlr r0 /* 802C5510 002C2470 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C5514 002C2474 4E 80 00 20 */ blr +/* 802C5514 002C2474 4E 80 00 20 */ blr .global SetDimensions__8CGuiPaneFRC9CVector2fb SetDimensions__8CGuiPaneFRC9CVector2fb: @@ -61,12 +61,12 @@ SetDimensions__8CGuiPaneFRC9CVector2fb: /* 802C553C 002C249C 81 83 00 00 */ lwz r12, 0(r3) /* 802C5540 002C24A0 81 8C 00 48 */ lwz r12, 0x48(r12) /* 802C5544 002C24A4 7D 89 03 A6 */ mtctr r12 -/* 802C5548 002C24A8 4E 80 04 21 */ bctrl +/* 802C5548 002C24A8 4E 80 04 21 */ bctrl lbl_802C554C: /* 802C554C 002C24AC 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C5550 002C24B0 7C 08 03 A6 */ mtlr r0 /* 802C5554 002C24B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C5558 002C24B8 4E 80 00 20 */ blr +/* 802C5558 002C24B8 4E 80 00 20 */ blr .global InitializeBuffers__8CGuiPaneFv InitializeBuffers__8CGuiPaneFv: @@ -137,7 +137,7 @@ lbl_802C559C: /* 802C5658 002C25B8 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C565C 002C25BC 7C 08 03 A6 */ mtlr r0 /* 802C5660 002C25C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C5664 002C25C4 4E 80 00 20 */ blr +/* 802C5664 002C25C4 4E 80 00 20 */ blr .global ScaleDimensions__8CGuiPaneFRC9CVector3f ScaleDimensions__8CGuiPaneFRC9CVector3f: @@ -151,7 +151,7 @@ ScaleDimensions__8CGuiPaneFRC9CVector3f: /* 802C5684 002C25E4 81 83 00 00 */ lwz r12, 0(r3) /* 802C5688 002C25E8 81 8C 00 48 */ lwz r12, 0x48(r12) /* 802C568C 002C25EC 7D 89 03 A6 */ mtctr r12 -/* 802C5690 002C25F0 4E 80 04 21 */ bctrl +/* 802C5690 002C25F0 4E 80 04 21 */ bctrl /* 802C5694 002C25F4 3C 60 55 55 */ lis r3, 0x55555556@ha /* 802C5698 002C25F8 38 DE 00 C8 */ addi r6, r30, 0xc8 /* 802C569C 002C25FC 38 83 55 56 */ addi r4, r3, 0x55555556@l @@ -189,7 +189,7 @@ lbl_802C56FC: /* 802C5714 002C2674 83 C1 00 08 */ lwz r30, 8(r1) /* 802C5718 002C2678 7C 08 03 A6 */ mtlr r0 /* 802C571C 002C267C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C5720 002C2680 4E 80 00 20 */ blr +/* 802C5720 002C2680 4E 80 00 20 */ blr .global Draw__8CGuiPaneCFRC19CGuiWidgetDrawParms Draw__8CGuiPaneCFRC19CGuiWidgetDrawParms: @@ -215,7 +215,7 @@ Draw__8CGuiPaneCFRC19CGuiWidgetDrawParms: /* 802C5770 002C26D0 81 9E 00 00 */ lwz r12, 0(r30) /* 802C5774 002C26D4 81 8C 00 20 */ lwz r12, 0x20(r12) /* 802C5778 002C26D8 7D 89 03 A6 */ mtctr r12 -/* 802C577C 002C26DC 4E 80 04 21 */ bctrl +/* 802C577C 002C26DC 4E 80 04 21 */ bctrl /* 802C5780 002C26E0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802C5784 002C26E4 41 82 00 74 */ beq lbl_802C57F8 /* 802C5788 002C26E8 80 8D 9C 68 */ lwz r4, lbl_805A8828@sda21(r13) @@ -257,7 +257,7 @@ lbl_802C57F8: /* 802C5814 002C2774 83 C1 00 88 */ lwz r30, 0x88(r1) /* 802C5818 002C2778 7C 08 03 A6 */ mtlr r0 /* 802C581C 002C277C 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 802C5820 002C2780 4E 80 00 20 */ blr +/* 802C5820 002C2780 4E 80 00 20 */ blr .global __dt__8CGuiPaneFv __dt__8CGuiPaneFv: @@ -292,7 +292,7 @@ lbl_802C5880: /* 802C588C 002C27EC 83 C1 00 08 */ lwz r30, 8(r1) /* 802C5890 002C27F0 7C 08 03 A6 */ mtlr r0 /* 802C5894 002C27F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C5898 002C27F8 4E 80 00 20 */ blr +/* 802C5898 002C27F8 4E 80 00 20 */ blr .global __ct__8CGuiPaneFRCQ210CGuiWidget15CGuiWidgetParmsffRC9CVector3f __ct__8CGuiPaneFRCQ210CGuiWidget15CGuiWidgetParmsffRC9CVector3f: @@ -329,7 +329,7 @@ __ct__8CGuiPaneFRCQ210CGuiWidget15CGuiWidgetParmsffRC9CVector3f: /* 802C5914 002C2874 81 9E 00 00 */ lwz r12, 0(r30) /* 802C5918 002C2878 81 8C 00 48 */ lwz r12, 0x48(r12) /* 802C591C 002C287C 7D 89 03 A6 */ mtctr r12 -/* 802C5920 002C2880 4E 80 04 21 */ bctrl +/* 802C5920 002C2880 4E 80 04 21 */ bctrl /* 802C5924 002C2884 7F C3 F3 78 */ mr r3, r30 /* 802C5928 002C2888 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 802C592C 002C288C CB E1 00 20 */ lfd f31, 0x20(r1) @@ -340,7 +340,7 @@ __ct__8CGuiPaneFRCQ210CGuiWidget15CGuiWidgetParmsffRC9CVector3f: /* 802C5940 002C28A0 83 C1 00 08 */ lwz r30, 8(r1) /* 802C5944 002C28A4 7C 08 03 A6 */ mtlr r0 /* 802C5948 002C28A8 38 21 00 30 */ addi r1, r1, 0x30 -/* 802C594C 002C28AC 4E 80 00 20 */ blr +/* 802C594C 002C28AC 4E 80 00 20 */ blr .global WriteData__8CGuiPaneCFR13COutputStreamb WriteData__8CGuiPaneCFR13COutputStreamb: @@ -406,7 +406,7 @@ WriteData__8CGuiPaneCFR13COutputStreamb: /* 802C5A3C 002C299C 83 C1 00 38 */ lwz r30, 0x38(r1) /* 802C5A40 002C29A0 7C 08 03 A6 */ mtlr r0 /* 802C5A44 002C29A4 38 21 00 40 */ addi r1, r1, 0x40 -/* 802C5A48 002C29A8 4E 80 00 20 */ blr +/* 802C5A48 002C29A8 4E 80 00 20 */ blr .global Create__8CGuiPaneFP9CGuiFrameR12CInputStreamb Create__8CGuiPaneFP9CGuiFrameR12CInputStreamb: diff --git a/asm/GuiSys/CGuiSliderGroup.s b/asm/GuiSys/CGuiSliderGroup.s index c6277c01..7ae36307 100644 --- a/asm/GuiSys/CGuiSliderGroup.s +++ b/asm/GuiSys/CGuiSliderGroup.s @@ -21,7 +21,7 @@ lbl_803EC930: .4byte OnVisible__18CGuiCompoundWidgetFv .4byte OnActivate__18CGuiCompoundWidgetFb .4byte GetWorkerWidget__15CGuiSliderGroupFi - + .section .text, "ax" @@ -80,13 +80,13 @@ lbl_802C5C38: /* 802C5C44 002C2BA4 83 C1 00 08 */ lwz r30, 8(r1) /* 802C5C48 002C2BA8 7C 08 03 A6 */ mtlr r0 /* 802C5C4C 002C2BAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C5C50 002C2BB0 4E 80 00 20 */ blr +/* 802C5C50 002C2BB0 4E 80 00 20 */ blr .global GetWidgetTypeID__15CGuiSliderGroupCFv GetWidgetTypeID__15CGuiSliderGroupCFv: /* 802C5C54 002C2BB4 3C 60 53 4C */ lis r3, 0x534C4750@ha /* 802C5C58 002C2BB8 38 63 47 50 */ addi r3, r3, 0x534C4750@l -/* 802C5C5C 002C2BBC 4E 80 00 20 */ blr +/* 802C5C5C 002C2BBC 4E 80 00 20 */ blr .global "SetSelectionChangedCallback__15CGuiSliderGroupFRC33TFunctor2" "SetSelectionChangedCallback__15CGuiSliderGroupFRC33TFunctor2": @@ -102,7 +102,7 @@ GetWidgetTypeID__15CGuiSliderGroupCFv: /* 802C5C84 002C2BE4 80 04 00 14 */ lwz r0, 0x14(r4) /* 802C5C88 002C2BE8 90 A3 00 E8 */ stw r5, 0xe8(r3) /* 802C5C8C 002C2BEC 90 03 00 EC */ stw r0, 0xec(r3) -/* 802C5C90 002C2BF0 4E 80 00 20 */ blr +/* 802C5C90 002C2BF0 4E 80 00 20 */ blr .global StartDecreasing__15CGuiSliderGroupFv StartDecreasing__15CGuiSliderGroupFv: @@ -112,7 +112,7 @@ StartDecreasing__15CGuiSliderGroupFv: /* 802C5CA0 002C2C00 50 80 3E 30 */ rlwimi r0, r4, 7, 0x18, 0x18 /* 802C5CA4 002C2C04 98 03 00 F4 */ stb r0, 0xf4(r3) /* 802C5CA8 002C2C08 38 60 00 01 */ li r3, 1 -/* 802C5CAC 002C2C0C 4E 80 00 20 */ blr +/* 802C5CAC 002C2C0C 4E 80 00 20 */ blr .global StartIncreasing__15CGuiSliderGroupFv StartIncreasing__15CGuiSliderGroupFv: @@ -123,12 +123,12 @@ StartIncreasing__15CGuiSliderGroupFv: /* 802C5CC0 002C2C20 50 80 3E 30 */ rlwimi r0, r4, 7, 0x18, 0x18 /* 802C5CC4 002C2C24 98 03 00 F4 */ stb r0, 0xf4(r3) /* 802C5CC8 002C2C28 38 60 00 01 */ li r3, 1 -/* 802C5CCC 002C2C2C 4E 80 00 20 */ blr +/* 802C5CCC 002C2C2C 4E 80 00 20 */ blr .global SetIncrement__15CGuiSliderGroupFf SetIncrement__15CGuiSliderGroupFf: /* 802C5CD0 002C2C30 D0 23 00 C8 */ stfs f1, 0xc8(r3) -/* 802C5CD4 002C2C34 4E 80 00 20 */ blr +/* 802C5CD4 002C2C34 4E 80 00 20 */ blr .global SetMinVal__15CGuiSliderGroupFf SetMinVal__15CGuiSliderGroupFf: @@ -141,7 +141,7 @@ SetMinVal__15CGuiSliderGroupFf: /* 802C5CF0 002C2C50 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C5CF4 002C2C54 7C 08 03 A6 */ mtlr r0 /* 802C5CF8 002C2C58 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C5CFC 002C2C5C 4E 80 00 20 */ blr +/* 802C5CFC 002C2C5C 4E 80 00 20 */ blr .global SetMaxVal__15CGuiSliderGroupFf SetMaxVal__15CGuiSliderGroupFf: @@ -154,7 +154,7 @@ SetMaxVal__15CGuiSliderGroupFf: /* 802C5D18 002C2C78 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C5D1C 002C2C7C 7C 08 03 A6 */ mtlr r0 /* 802C5D20 002C2C80 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C5D24 002C2C84 4E 80 00 20 */ blr +/* 802C5D24 002C2C84 4E 80 00 20 */ blr .global SetCurVal__15CGuiSliderGroupFf SetCurVal__15CGuiSliderGroupFf: @@ -176,7 +176,7 @@ SetCurVal__15CGuiSliderGroupFf: /* 802C5D64 002C2CC4 80 01 00 24 */ lwz r0, 0x24(r1) /* 802C5D68 002C2CC8 7C 08 03 A6 */ mtlr r0 /* 802C5D6C 002C2CCC 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C5D70 002C2CD0 4E 80 00 20 */ blr +/* 802C5D70 002C2CD0 4E 80 00 20 */ blr .global Update__15CGuiSliderGroupFf Update__15CGuiSliderGroupFf: @@ -385,7 +385,7 @@ lbl_802C6018: /* 802C6028 002C2F88 38 9F 00 E0 */ addi r4, r31, 0xe0 /* 802C602C 002C2F8C 80 7F 00 DC */ lwz r3, 0xdc(r31) /* 802C6030 002C2F90 7D 89 03 A6 */ mtctr r12 -/* 802C6034 002C2F94 4E 80 04 21 */ bctrl +/* 802C6034 002C2F94 4E 80 04 21 */ bctrl lbl_802C6038: /* 802C6038 002C2F98 C0 1F 00 BC */ lfs f0, 0xbc(r31) /* 802C603C 002C2F9C C0 5F 00 B8 */ lfs f2, 0xb8(r31) @@ -445,7 +445,7 @@ lbl_802C6060: /* 802C610C 002C306C 83 A1 00 54 */ lwz r29, 0x54(r1) /* 802C6110 002C3070 7C 08 03 A6 */ mtlr r0 /* 802C6114 002C3074 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 802C6118 002C3078 4E 80 00 20 */ blr +/* 802C6118 002C3078 4E 80 00 20 */ blr .global ProcessUserInput__15CGuiSliderGroupFRC11CFinalInput ProcessUserInput__15CGuiSliderGroupFRC11CFinalInput: @@ -493,7 +493,7 @@ lbl_802C61A8: /* 802C61A8 002C3108 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C61AC 002C310C 7C 08 03 A6 */ mtlr r0 /* 802C61B0 002C3110 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C61B4 002C3114 4E 80 00 20 */ blr +/* 802C61B4 002C3114 4E 80 00 20 */ blr .global AddWorkerWidget__15CGuiSliderGroupFP10CGuiWidget AddWorkerWidget__15CGuiSliderGroupFP10CGuiWidget: @@ -507,7 +507,7 @@ AddWorkerWidget__15CGuiSliderGroupFP10CGuiWidget: /* 802C61D4 002C3134 90 83 00 D0 */ stw r4, 0xd0(r3) lbl_802C61D8: /* 802C61D8 002C3138 38 60 00 01 */ li r3, 1 -/* 802C61DC 002C313C 4E 80 00 20 */ blr +/* 802C61DC 002C313C 4E 80 00 20 */ blr .global __ct__15CGuiSliderGroupFv __ct__15CGuiSliderGroupFv: @@ -561,7 +561,7 @@ lbl_802C6254: /* 802C6294 002C31F4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802C6298 002C31F8 7C 08 03 A6 */ mtlr r0 /* 802C629C 002C31FC 38 21 00 30 */ addi r1, r1, 0x30 -/* 802C62A0 002C3200 4E 80 00 20 */ blr +/* 802C62A0 002C3200 4E 80 00 20 */ blr .global GetWorkerWidget__15CGuiSliderGroupFi GetWorkerWidget__15CGuiSliderGroupFi: @@ -572,10 +572,10 @@ GetWorkerWidget__15CGuiSliderGroupFi: /* 802C62B4 002C3214 54 80 10 3A */ slwi r0, r4, 2 /* 802C62B8 002C3218 7C 63 02 14 */ add r3, r3, r0 /* 802C62BC 002C321C 80 63 00 D0 */ lwz r3, 0xd0(r3) -/* 802C62C0 002C3220 4E 80 00 20 */ blr +/* 802C62C0 002C3220 4E 80 00 20 */ blr lbl_802C62C4: /* 802C62C4 002C3224 38 60 00 00 */ li r3, 0 -/* 802C62C8 002C3228 4E 80 00 20 */ blr +/* 802C62C8 002C3228 4E 80 00 20 */ blr .global Create__15CGuiSliderGroupFP9CGuiFrameR12CInputStreamb Create__15CGuiSliderGroupFP9CGuiFrameR12CInputStreamb: diff --git a/asm/GuiSys/CGuiSys.s b/asm/GuiSys/CGuiSys.s index c4968c03..59645942 100644 --- a/asm/GuiSys/CGuiSys.s +++ b/asm/GuiSys/CGuiSys.s @@ -10,7 +10,7 @@ lbl_805A9200: .global nullsub_7 nullsub_7: -/* 802C63E0 002C3340 4E 80 00 20 */ blr +/* 802C63E0 002C3340 4E 80 00 20 */ blr .global CreateWidgetInGame__7CGuiSysFUiR12CInputStreamP9CGuiFrame CreateWidgetInGame__7CGuiSysFUiR12CInputStreamP9CGuiFrame: @@ -24,7 +24,7 @@ CreateWidgetInGame__7CGuiSysFUiR12CInputStreamP9CGuiFrame: /* 802C6400 002C3360 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C6404 002C3364 7C 08 03 A6 */ mtlr r0 /* 802C6408 002C3368 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C640C 002C336C 4E 80 00 20 */ blr +/* 802C640C 002C336C 4E 80 00 20 */ blr .global sub_802c6410 sub_802c6410: @@ -55,7 +55,7 @@ lbl_802C645C: /* 802C6468 002C33C8 83 C1 00 08 */ lwz r30, 8(r1) /* 802C646C 002C33CC 7C 08 03 A6 */ mtlr r0 /* 802C6470 002C33D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C6474 002C33D4 4E 80 00 20 */ blr +/* 802C6474 002C33D4 4E 80 00 20 */ blr .global sub_802c6478 sub_802c6478: @@ -81,7 +81,7 @@ lbl_802C64B4: /* 802C64C0 002C3420 83 C1 00 08 */ lwz r30, 8(r1) /* 802C64C4 002C3424 7C 08 03 A6 */ mtlr r0 /* 802C64C8 002C3428 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C64CC 002C342C 4E 80 00 20 */ blr +/* 802C64CC 002C342C 4E 80 00 20 */ blr .global __ct__7CGuiSysFP8IFactoryP11CSimplePoolQ27CGuiSys10EUsageMode __ct__7CGuiSysFP8IFactoryP11CSimplePoolQ27CGuiSys10EUsageMode: @@ -138,7 +138,7 @@ lbl_802C6564: /* 802C6590 002C34F0 80 01 00 24 */ lwz r0, 0x24(r1) /* 802C6594 002C34F4 7C 08 03 A6 */ mtlr r0 /* 802C6598 002C34F8 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C659C 002C34FC 4E 80 00 20 */ blr +/* 802C659C 002C34FC 4E 80 00 20 */ blr .global sub_802c65a0 sub_802c65a0: diff --git a/asm/GuiSys/CGuiTableGroup.s b/asm/GuiSys/CGuiTableGroup.s index d76557cb..e90c60ff 100644 --- a/asm/GuiSys/CGuiTableGroup.s +++ b/asm/GuiSys/CGuiTableGroup.s @@ -41,13 +41,13 @@ lbl_805A86C4: .global AddWorkerWidget__14CGuiTableGroupFP10CGuiWidget AddWorkerWidget__14CGuiTableGroupFP10CGuiWidget: /* 802C65E8 002C3548 38 60 00 01 */ li r3, 1 -/* 802C65EC 002C354C 4E 80 00 20 */ blr +/* 802C65EC 002C354C 4E 80 00 20 */ blr .global GetWidgetTypeID__14CGuiTableGroupCFv GetWidgetTypeID__14CGuiTableGroupCFv: /* 802C65F0 002C3550 3C 60 54 42 */ lis r3, 0x54424750@ha /* 802C65F4 002C3554 38 63 47 50 */ addi r3, r3, 0x54424750@l -/* 802C65F8 002C3558 4E 80 00 20 */ blr +/* 802C65F8 002C3558 4E 80 00 20 */ blr .global SetColors__14CGuiTableGroupCFRC6CColorRC6CColor SetColors__14CGuiTableGroupCFRC6CColorRC6CColor: @@ -66,7 +66,7 @@ lbl_802C6620: /* 802C6628 002C3588 81 9B 00 00 */ lwz r12, 0(r27) /* 802C662C 002C358C 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 802C6630 002C3590 7D 89 03 A6 */ mtctr r12 -/* 802C6634 002C3594 4E 80 04 21 */ bctrl +/* 802C6634 002C3594 4E 80 04 21 */ bctrl /* 802C6638 002C3598 28 03 00 00 */ cmplwi r3, 0 /* 802C663C 002C359C 41 82 00 24 */ beq lbl_802C6660 /* 802C6640 002C35A0 7C 1E F8 00 */ cmpw r30, r31 @@ -84,7 +84,7 @@ lbl_802C6660: /* 802C6664 002C35C4 80 01 00 24 */ lwz r0, 0x24(r1) /* 802C6668 002C35C8 7C 08 03 A6 */ mtlr r0 /* 802C666C 002C35CC 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C6670 002C35D0 4E 80 00 20 */ blr +/* 802C6670 002C35D0 4E 80 00 20 */ blr .global DecrementSelectedRow__14CGuiTableGroupFv DecrementSelectedRow__14CGuiTableGroupFv: @@ -111,10 +111,10 @@ lbl_802C66A8: /* 802C66BC 002C361C 38 80 00 02 */ li r4, 2 lbl_802C66C0: /* 802C66C0 002C3620 7C 83 23 78 */ mr r3, r4 -/* 802C66C4 002C3624 4E 80 00 20 */ blr +/* 802C66C4 002C3624 4E 80 00 20 */ blr lbl_802C66C8: /* 802C66C8 002C3628 38 60 00 00 */ li r3, 0 -/* 802C66CC 002C362C 4E 80 00 20 */ blr +/* 802C66CC 002C362C 4E 80 00 20 */ blr .global IncrementSelectedRow__14CGuiTableGroupFv IncrementSelectedRow__14CGuiTableGroupFv: @@ -142,10 +142,10 @@ lbl_802C6708: /* 802C671C 002C367C 38 80 00 02 */ li r4, 2 lbl_802C6720: /* 802C6720 002C3680 7C 83 23 78 */ mr r3, r4 -/* 802C6724 002C3684 4E 80 00 20 */ blr +/* 802C6724 002C3684 4E 80 00 20 */ blr lbl_802C6728: /* 802C6728 002C3688 38 60 00 00 */ li r3, 0 -/* 802C672C 002C368C 4E 80 00 20 */ blr +/* 802C672C 002C368C 4E 80 00 20 */ blr .global DeactivateWorker__14CGuiTableGroupFP10CGuiWidget DeactivateWorker__14CGuiTableGroupFP10CGuiWidget: @@ -158,7 +158,7 @@ DeactivateWorker__14CGuiTableGroupFP10CGuiWidget: /* 802C6748 002C36A8 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C674C 002C36AC 7C 08 03 A6 */ mtlr r0 /* 802C6750 002C36B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C6754 002C36B4 4E 80 00 20 */ blr +/* 802C6754 002C36B4 4E 80 00 20 */ blr .global ActivateWorker__14CGuiTableGroupFP10CGuiWidget ActivateWorker__14CGuiTableGroupFP10CGuiWidget: @@ -171,7 +171,7 @@ ActivateWorker__14CGuiTableGroupFP10CGuiWidget: /* 802C6770 002C36D0 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C6774 002C36D4 7C 08 03 A6 */ mtlr r0 /* 802C6778 002C36D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C677C 002C36DC 4E 80 00 20 */ blr +/* 802C677C 002C36DC 4E 80 00 20 */ blr .global OnActivate__14CGuiTableGroupFb OnActivate__14CGuiTableGroupFb: @@ -187,13 +187,13 @@ OnActivate__14CGuiTableGroupFb: /* 802C67A4 002C3704 81 9E 00 00 */ lwz r12, 0(r30) /* 802C67A8 002C3708 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 802C67AC 002C370C 7D 89 03 A6 */ mtctr r12 -/* 802C67B0 002C3710 4E 80 04 21 */ bctrl +/* 802C67B0 002C3710 4E 80 04 21 */ bctrl /* 802C67B4 002C3714 81 9E 00 00 */ lwz r12, 0(r30) /* 802C67B8 002C3718 7C 7F 1B 78 */ mr r31, r3 /* 802C67BC 002C371C 7F C3 F3 78 */ mr r3, r30 /* 802C67C0 002C3720 81 8C 00 24 */ lwz r12, 0x24(r12) /* 802C67C4 002C3724 7D 89 03 A6 */ mtctr r12 -/* 802C67C8 002C3728 4E 80 04 21 */ bctrl +/* 802C67C8 002C3728 4E 80 04 21 */ bctrl /* 802C67CC 002C372C 7C 64 1B 78 */ mr r4, r3 /* 802C67D0 002C3730 7F E3 FB 78 */ mr r3, r31 /* 802C67D4 002C3734 48 00 3E 11 */ bl SetIsActive__10CGuiWidgetFb @@ -202,7 +202,7 @@ OnActivate__14CGuiTableGroupFb: /* 802C67E0 002C3740 83 C1 00 08 */ lwz r30, 8(r1) /* 802C67E4 002C3744 7C 08 03 A6 */ mtlr r0 /* 802C67E8 002C3748 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C67EC 002C374C 4E 80 00 20 */ blr +/* 802C67EC 002C374C 4E 80 00 20 */ blr .global "SetMenuSelectionChangeCallback__14CGuiTableGroupFRC35TFunctor3" "SetMenuSelectionChangeCallback__14CGuiTableGroupFRC35TFunctor3": @@ -218,7 +218,7 @@ OnActivate__14CGuiTableGroupFb: /* 802C6814 002C3774 80 04 00 14 */ lwz r0, 0x14(r4) /* 802C6818 002C3778 90 A3 01 14 */ stw r5, 0x114(r3) /* 802C681C 002C377C 90 03 01 18 */ stw r0, 0x118(r3) -/* 802C6820 002C3780 4E 80 00 20 */ blr +/* 802C6820 002C3780 4E 80 00 20 */ blr .global "SetMenuCancelCallback__14CGuiTableGroupFRC29TFunctor1" "SetMenuCancelCallback__14CGuiTableGroupFRC29TFunctor1": @@ -234,7 +234,7 @@ OnActivate__14CGuiTableGroupFb: /* 802C6848 002C37A8 80 04 00 14 */ lwz r0, 0x14(r4) /* 802C684C 002C37AC 90 A3 00 FC */ stw r5, 0xfc(r3) /* 802C6850 002C37B0 90 03 01 00 */ stw r0, 0x100(r3) -/* 802C6854 002C37B4 4E 80 00 20 */ blr +/* 802C6854 002C37B4 4E 80 00 20 */ blr .global "SetMenuAdvanceCallback__14CGuiTableGroupFRC29TFunctor1" "SetMenuAdvanceCallback__14CGuiTableGroupFRC29TFunctor1": @@ -250,7 +250,7 @@ OnActivate__14CGuiTableGroupFb: /* 802C687C 002C37DC 80 04 00 14 */ lwz r0, 0x14(r4) /* 802C6880 002C37E0 90 A3 00 E4 */ stw r5, 0xe4(r3) /* 802C6884 002C37E4 90 03 00 E8 */ stw r0, 0xe8(r3) -/* 802C6888 002C37E8 4E 80 00 20 */ blr +/* 802C6888 002C37E8 4E 80 00 20 */ blr .global DoCancel__14CGuiTableGroupFv DoCancel__14CGuiTableGroupFv: @@ -328,13 +328,13 @@ lbl_802C6970: /* 802C6980 002C38E0 38 83 00 F4 */ addi r4, r3, 0xf4 /* 802C6984 002C38E4 80 63 00 F0 */ lwz r3, 0xf0(r3) /* 802C6988 002C38E8 7D 89 03 A6 */ mtctr r12 -/* 802C698C 002C38EC 4E 80 04 21 */ bctrl +/* 802C698C 002C38EC 4E 80 04 21 */ bctrl lbl_802C6990: /* 802C6990 002C38F0 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C6994 002C38F4 38 60 00 01 */ li r3, 1 /* 802C6998 002C38F8 7C 08 03 A6 */ mtlr r0 /* 802C699C 002C38FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C69A0 002C3900 4E 80 00 20 */ blr +/* 802C69A0 002C3900 4E 80 00 20 */ blr .global DoAdvance__14CGuiTableGroupFv DoAdvance__14CGuiTableGroupFv: @@ -412,13 +412,13 @@ lbl_802C6A88: /* 802C6A98 002C39F8 38 83 00 DC */ addi r4, r3, 0xdc /* 802C6A9C 002C39FC 80 63 00 D8 */ lwz r3, 0xd8(r3) /* 802C6AA0 002C3A00 7D 89 03 A6 */ mtctr r12 -/* 802C6AA4 002C3A04 4E 80 04 21 */ bctrl +/* 802C6AA4 002C3A04 4E 80 04 21 */ bctrl lbl_802C6AA8: /* 802C6AA8 002C3A08 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C6AAC 002C3A0C 38 60 00 01 */ li r3, 1 /* 802C6AB0 002C3A10 7C 08 03 A6 */ mtlr r0 /* 802C6AB4 002C3A14 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C6AB8 002C3A18 4E 80 00 20 */ blr +/* 802C6AB8 002C3A18 4E 80 00 20 */ blr .global SelectWorker__14CGuiTableGroupFi SelectWorker__14CGuiTableGroupFi: @@ -463,7 +463,7 @@ lbl_802C6B38: /* 802C6B40 002C3AA0 83 C1 00 18 */ lwz r30, 0x18(r1) /* 802C6B44 002C3AA4 7C 08 03 A6 */ mtlr r0 /* 802C6B48 002C3AA8 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C6B4C 002C3AAC 4E 80 00 20 */ blr +/* 802C6B4C 002C3AAC 4E 80 00 20 */ blr .global PreDecrement__14CGuiTableGroupFv PreDecrement__14CGuiTableGroupFv: @@ -543,7 +543,7 @@ lbl_802C6C44: /* 802C6C4C 002C3BAC 83 C1 00 18 */ lwz r30, 0x18(r1) /* 802C6C50 002C3BB0 7C 08 03 A6 */ mtlr r0 /* 802C6C54 002C3BB4 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C6C58 002C3BB8 4E 80 00 20 */ blr +/* 802C6C58 002C3BB8 4E 80 00 20 */ blr .global DoDecrement__14CGuiTableGroupFv DoDecrement__14CGuiTableGroupFv: @@ -629,7 +629,7 @@ lbl_802C6D5C: /* 802C6D70 002C3CD0 38 9E 01 0C */ addi r4, r30, 0x10c /* 802C6D74 002C3CD4 80 7E 01 08 */ lwz r3, 0x108(r30) /* 802C6D78 002C3CD8 7D 89 03 A6 */ mtctr r12 -/* 802C6D7C 002C3CDC 4E 80 04 21 */ bctrl +/* 802C6D7C 002C3CDC 4E 80 04 21 */ bctrl lbl_802C6D80: /* 802C6D80 002C3CE0 38 60 00 01 */ li r3, 1 /* 802C6D84 002C3CE4 48 00 00 08 */ b lbl_802C6D8C @@ -641,7 +641,7 @@ lbl_802C6D8C: /* 802C6D94 002C3CF4 83 C1 00 08 */ lwz r30, 8(r1) /* 802C6D98 002C3CF8 7C 08 03 A6 */ mtlr r0 /* 802C6D9C 002C3CFC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C6DA0 002C3D00 4E 80 00 20 */ blr +/* 802C6DA0 002C3D00 4E 80 00 20 */ blr .global PreIncrement__14CGuiTableGroupFv PreIncrement__14CGuiTableGroupFv: @@ -722,7 +722,7 @@ lbl_802C6E98: /* 802C6EA0 002C3E00 83 C1 00 18 */ lwz r30, 0x18(r1) /* 802C6EA4 002C3E04 7C 08 03 A6 */ mtlr r0 /* 802C6EA8 002C3E08 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C6EAC 002C3E0C 4E 80 00 20 */ blr +/* 802C6EAC 002C3E0C 4E 80 00 20 */ blr .global IsWorkerSelectable__14CGuiTableGroupFi IsWorkerSelectable__14CGuiTableGroupFi: @@ -732,7 +732,7 @@ IsWorkerSelectable__14CGuiTableGroupFi: /* 802C6EBC 002C3E1C 81 83 00 00 */ lwz r12, 0(r3) /* 802C6EC0 002C3E20 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 802C6EC4 002C3E24 7D 89 03 A6 */ mtctr r12 -/* 802C6EC8 002C3E28 4E 80 04 21 */ bctrl +/* 802C6EC8 002C3E28 4E 80 04 21 */ bctrl /* 802C6ECC 002C3E2C 28 03 00 00 */ cmplwi r3, 0 /* 802C6ED0 002C3E30 41 82 00 10 */ beq lbl_802C6EE0 /* 802C6ED4 002C3E34 88 03 00 B6 */ lbz r0, 0xb6(r3) @@ -744,7 +744,7 @@ lbl_802C6EE4: /* 802C6EE4 002C3E44 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C6EE8 002C3E48 7C 08 03 A6 */ mtlr r0 /* 802C6EEC 002C3E4C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C6EF0 002C3E50 4E 80 00 20 */ blr +/* 802C6EF0 002C3E50 4E 80 00 20 */ blr .global DoIncrement__14CGuiTableGroupFv DoIncrement__14CGuiTableGroupFv: @@ -830,7 +830,7 @@ lbl_802C6FF4: /* 802C7008 002C3F68 38 9E 01 0C */ addi r4, r30, 0x10c /* 802C700C 002C3F6C 80 7E 01 08 */ lwz r3, 0x108(r30) /* 802C7010 002C3F70 7D 89 03 A6 */ mtctr r12 -/* 802C7014 002C3F74 4E 80 04 21 */ bctrl +/* 802C7014 002C3F74 4E 80 04 21 */ bctrl lbl_802C7018: /* 802C7018 002C3F78 38 60 00 01 */ li r3, 1 /* 802C701C 002C3F7C 48 00 00 08 */ b lbl_802C7024 @@ -842,7 +842,7 @@ lbl_802C7024: /* 802C702C 002C3F8C 83 C1 00 08 */ lwz r30, 8(r1) /* 802C7030 002C3F90 7C 08 03 A6 */ mtlr r0 /* 802C7034 002C3F94 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C7038 002C3F98 4E 80 00 20 */ blr +/* 802C7038 002C3F98 4E 80 00 20 */ blr .global DoSelectPrevRow__14CGuiTableGroupFv DoSelectPrevRow__14CGuiTableGroupFv: @@ -857,7 +857,7 @@ DoSelectPrevRow__14CGuiTableGroupFv: /* 802C705C 002C3FBC 81 9F 00 00 */ lwz r12, 0(r31) /* 802C7060 002C3FC0 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 802C7064 002C3FC4 7D 89 03 A6 */ mtctr r12 -/* 802C7068 002C3FC8 4E 80 04 21 */ bctrl +/* 802C7068 002C3FC8 4E 80 04 21 */ bctrl /* 802C706C 002C3FCC 7C 64 1B 78 */ mr r4, r3 /* 802C7070 002C3FD0 7F E3 FB 78 */ mr r3, r31 /* 802C7074 002C3FD4 4B FF F6 BD */ bl DeactivateWorker__14CGuiTableGroupFP10CGuiWidget @@ -866,7 +866,7 @@ DoSelectPrevRow__14CGuiTableGroupFv: /* 802C7080 002C3FE0 81 9F 00 00 */ lwz r12, 0(r31) /* 802C7084 002C3FE4 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 802C7088 002C3FE8 7D 89 03 A6 */ mtctr r12 -/* 802C708C 002C3FEC 4E 80 04 21 */ bctrl +/* 802C708C 002C3FEC 4E 80 04 21 */ bctrl /* 802C7090 002C3FF0 7C 64 1B 78 */ mr r4, r3 /* 802C7094 002C3FF4 7F E3 FB 78 */ mr r3, r31 /* 802C7098 002C3FF8 4B FF F6 C1 */ bl ActivateWorker__14CGuiTableGroupFP10CGuiWidget @@ -874,7 +874,7 @@ DoSelectPrevRow__14CGuiTableGroupFv: /* 802C70A0 002C4000 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802C70A4 002C4004 7C 08 03 A6 */ mtlr r0 /* 802C70A8 002C4008 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C70AC 002C400C 4E 80 00 20 */ blr +/* 802C70AC 002C400C 4E 80 00 20 */ blr .global DoSelectNextRow__14CGuiTableGroupFv DoSelectNextRow__14CGuiTableGroupFv: @@ -889,7 +889,7 @@ DoSelectNextRow__14CGuiTableGroupFv: /* 802C70D0 002C4030 81 9F 00 00 */ lwz r12, 0(r31) /* 802C70D4 002C4034 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 802C70D8 002C4038 7D 89 03 A6 */ mtctr r12 -/* 802C70DC 002C403C 4E 80 04 21 */ bctrl +/* 802C70DC 002C403C 4E 80 04 21 */ bctrl /* 802C70E0 002C4040 7C 64 1B 78 */ mr r4, r3 /* 802C70E4 002C4044 7F E3 FB 78 */ mr r3, r31 /* 802C70E8 002C4048 4B FF F6 49 */ bl DeactivateWorker__14CGuiTableGroupFP10CGuiWidget @@ -898,7 +898,7 @@ DoSelectNextRow__14CGuiTableGroupFv: /* 802C70F4 002C4054 81 9F 00 00 */ lwz r12, 0(r31) /* 802C70F8 002C4058 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 802C70FC 002C405C 7D 89 03 A6 */ mtctr r12 -/* 802C7100 002C4060 4E 80 04 21 */ bctrl +/* 802C7100 002C4060 4E 80 04 21 */ bctrl /* 802C7104 002C4064 7C 64 1B 78 */ mr r4, r3 /* 802C7108 002C4068 7F E3 FB 78 */ mr r3, r31 /* 802C710C 002C406C 4B FF F6 4D */ bl ActivateWorker__14CGuiTableGroupFP10CGuiWidget @@ -906,7 +906,7 @@ DoSelectNextRow__14CGuiTableGroupFv: /* 802C7114 002C4074 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802C7118 002C4078 7C 08 03 A6 */ mtlr r0 /* 802C711C 002C407C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C7120 002C4080 4E 80 00 20 */ blr +/* 802C7120 002C4080 4E 80 00 20 */ blr .global sub_802c7124 sub_802c7124: @@ -923,7 +923,7 @@ sub_802c7124: /* 802C714C 002C40AC 80 83 00 C8 */ lwz r4, 0xc8(r3) /* 802C7150 002C40B0 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 802C7154 002C40B4 7D 89 03 A6 */ mtctr r12 -/* 802C7158 002C40B8 4E 80 04 21 */ bctrl +/* 802C7158 002C40B8 4E 80 04 21 */ bctrl /* 802C715C 002C40BC 7C 64 1B 78 */ mr r4, r3 /* 802C7160 002C40C0 7F E3 FB 78 */ mr r3, r31 /* 802C7164 002C40C4 4B FF F5 CD */ bl DeactivateWorker__14CGuiTableGroupFP10CGuiWidget @@ -932,7 +932,7 @@ sub_802c7124: /* 802C7170 002C40D0 81 9F 00 00 */ lwz r12, 0(r31) /* 802C7174 002C40D4 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 802C7178 002C40D8 7D 89 03 A6 */ mtctr r12 -/* 802C717C 002C40DC 4E 80 04 21 */ bctrl +/* 802C717C 002C40DC 4E 80 04 21 */ bctrl /* 802C7180 002C40E0 7C 64 1B 78 */ mr r4, r3 /* 802C7184 002C40E4 7F E3 FB 78 */ mr r3, r31 /* 802C7188 002C40E8 4B FF F5 D1 */ bl ActivateWorker__14CGuiTableGroupFP10CGuiWidget @@ -940,7 +940,7 @@ sub_802c7124: /* 802C7190 002C40F0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802C7194 002C40F4 7C 08 03 A6 */ mtlr r0 /* 802C7198 002C40F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C719C 002C40FC 4E 80 00 20 */ blr +/* 802C719C 002C40FC 4E 80 00 20 */ blr .global __dt__14CGuiTableGroupCFv __dt__14CGuiTableGroupCFv: @@ -968,7 +968,7 @@ lbl_802C71E4: /* 802C71F0 002C4150 83 C1 00 08 */ lwz r30, 8(r1) /* 802C71F4 002C4154 7C 08 03 A6 */ mtlr r0 /* 802C71F8 002C4158 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C71FC 002C415C 4E 80 00 20 */ blr +/* 802C71FC 002C415C 4E 80 00 20 */ blr .global __ct__14CGuiTableGroupFRCQ210CGuiWidget15CGuiWidgetParmsiiQ214CGuiTableGroup16ETableGroupModesiibbffbfR14CGuiVirtualBox __ct__14CGuiTableGroupFRCQ210CGuiWidget15CGuiWidgetParmsiiQ214CGuiTableGroup16ETableGroupModesiibbffbfR14CGuiVirtualBox: @@ -1027,7 +1027,7 @@ __ct__14CGuiTableGroupFRCQ210CGuiWidget15CGuiWidgetParmsiiQ214CGuiTableGroup16ET /* 802C72D0 002C4230 83 81 00 10 */ lwz r28, 0x10(r1) /* 802C72D4 002C4234 7C 08 03 A6 */ mtlr r0 /* 802C72D8 002C4238 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C72DC 002C423C 4E 80 00 20 */ blr +/* 802C72DC 002C423C 4E 80 00 20 */ blr .global Create__14CGuiTableGroupFP9CGuiFrameR12CInputStreamb Create__14CGuiTableGroupFP9CGuiFrameR12CInputStreamb: @@ -1123,7 +1123,7 @@ lbl_802C7424: /* 802C7440 002C43A0 80 01 00 54 */ lwz r0, 0x54(r1) /* 802C7444 002C43A4 7C 08 03 A6 */ mtlr r0 /* 802C7448 002C43A8 38 21 00 50 */ addi r1, r1, 0x50 -/* 802C744C 002C43AC 4E 80 00 20 */ blr +/* 802C744C 002C43AC 4E 80 00 20 */ blr .global ProcessUserInput__14CGuiTableGroupCFRC11CFinalInput ProcessUserInput__14CGuiTableGroupCFRC11CFinalInput: diff --git a/asm/GuiSys/CGuiTextPane.s b/asm/GuiSys/CGuiTextPane.s index 7df93c4e..fc125962 100644 --- a/asm/GuiSys/CGuiTextPane.s +++ b/asm/GuiSys/CGuiTextPane.s @@ -34,7 +34,7 @@ lbl_803EC9B8: GetWidgetTypeID__12CGuiTextPaneCFv: /* 802C75C4 002C4524 3C 60 54 58 */ lis r3, 0x5458504E@ha /* 802C75C8 002C4528 38 63 50 4E */ addi r3, r3, 0x5458504E@l -/* 802C75CC 002C452C 4E 80 00 20 */ blr +/* 802C75CC 002C452C 4E 80 00 20 */ blr .global Update__12CGuiTextPaneFf Update__12CGuiTextPaneFf: @@ -54,7 +54,7 @@ Update__12CGuiTextPaneFf: /* 802C7604 002C4564 83 E1 00 14 */ lwz r31, 0x14(r1) /* 802C7608 002C4568 7C 08 03 A6 */ mtlr r0 /* 802C760C 002C456C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C7610 002C4570 4E 80 00 20 */ blr +/* 802C7610 002C4570 4E 80 00 20 */ blr .global GetIsFinishedLoadingWidgetSpecific__12CGuiTextPaneCFv GetIsFinishedLoadingWidgetSpecific__12CGuiTextPaneCFv: @@ -66,7 +66,7 @@ GetIsFinishedLoadingWidgetSpecific__12CGuiTextPaneCFv: /* 802C7628 002C4588 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C762C 002C458C 7C 08 03 A6 */ mtlr r0 /* 802C7630 002C4590 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C7634 002C4594 4E 80 00 20 */ blr +/* 802C7634 002C4594 4E 80 00 20 */ blr .global sub_802c7638 sub_802c7638: @@ -103,7 +103,7 @@ lbl_802C769C: /* 802C76A4 002C4604 83 C1 00 08 */ lwz r30, 8(r1) /* 802C76A8 002C4608 7C 08 03 A6 */ mtlr r0 /* 802C76AC 002C460C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C76B0 002C4610 4E 80 00 20 */ blr +/* 802C76B0 002C4610 4E 80 00 20 */ blr .global SetDimensions__12CGuiTextPaneFRC9CVector2fb SetDimensions__12CGuiTextPaneFRC9CVector2fb: @@ -121,18 +121,18 @@ SetDimensions__12CGuiTextPaneFRC9CVector2fb: /* 802C76E0 002C4640 81 9E 00 00 */ lwz r12, 0(r30) /* 802C76E4 002C4644 81 8C 00 48 */ lwz r12, 0x48(r12) /* 802C76E8 002C4648 7D 89 03 A6 */ mtctr r12 -/* 802C76EC 002C464C 4E 80 04 21 */ bctrl +/* 802C76EC 002C464C 4E 80 04 21 */ bctrl lbl_802C76F0: /* 802C76F0 002C4650 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C76F4 002C4654 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802C76F8 002C4658 83 C1 00 08 */ lwz r30, 8(r1) /* 802C76FC 002C465C 7C 08 03 A6 */ mtlr r0 /* 802C7700 002C4660 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C7704 002C4664 4E 80 00 20 */ blr +/* 802C7704 002C4664 4E 80 00 20 */ blr .global ScaleDimensions__12CGuiTextPaneFRC9CVector3f ScaleDimensions__12CGuiTextPaneFRC9CVector3f: -/* 802C7708 002C4668 4E 80 00 20 */ blr +/* 802C7708 002C4668 4E 80 00 20 */ blr .global Draw__12CGuiTextPaneCFRC19CGuiWidgetDrawParms Draw__12CGuiTextPaneCFRC19CGuiWidgetDrawParms: @@ -149,7 +149,7 @@ Draw__12CGuiTextPaneCFRC19CGuiWidgetDrawParms: /* 802C7734 002C4694 7C 9D 23 78 */ mr r29, r4 /* 802C7738 002C4698 81 8C 00 20 */ lwz r12, 0x20(r12) /* 802C773C 002C469C 7D 89 03 A6 */ mtctr r12 -/* 802C7740 002C46A0 4E 80 04 21 */ bctrl +/* 802C7740 002C46A0 4E 80 04 21 */ bctrl /* 802C7744 002C46A4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802C7748 002C46A8 41 82 02 88 */ beq lbl_802C79D0 /* 802C774C 002C46AC 7F E4 FB 78 */ mr r4, r31 @@ -158,7 +158,7 @@ Draw__12CGuiTextPaneCFRC19CGuiWidgetDrawParms: /* 802C7758 002C46B8 83 DF 00 C0 */ lwz r30, 0xc0(r31) /* 802C775C 002C46BC 81 8C 00 44 */ lwz r12, 0x44(r12) /* 802C7760 002C46C0 7D 89 03 A6 */ mtctr r12 -/* 802C7764 002C46C4 4E 80 04 21 */ bctrl +/* 802C7764 002C46C4 4E 80 04 21 */ bctrl /* 802C7768 002C46C8 80 1F 01 08 */ lwz r0, 0x108(r31) /* 802C776C 002C46CC C0 41 00 1C */ lfs f2, 0x1c(r1) /* 802C7770 002C46D0 2C 00 00 00 */ cmpwi r0, 0 @@ -331,7 +331,7 @@ lbl_802C79D0: /* 802C79E4 002C4944 83 A1 01 84 */ lwz r29, 0x184(r1) /* 802C79E8 002C4948 7C 08 03 A6 */ mtlr r0 /* 802C79EC 002C494C 38 21 01 A0 */ addi r1, r1, 0x1a0 -/* 802C79F0 002C4950 4E 80 00 20 */ blr +/* 802C79F0 002C4950 4E 80 00 20 */ blr .global __dt__12CGuiTextPaneFv __dt__12CGuiTextPaneFv: @@ -363,7 +363,7 @@ lbl_802C7A48: /* 802C7A54 002C49B4 83 C1 00 08 */ lwz r30, 8(r1) /* 802C7A58 002C49B8 7C 08 03 A6 */ mtlr r0 /* 802C7A5C 002C49BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C7A60 002C49C0 4E 80 00 20 */ blr +/* 802C7A60 002C49C0 4E 80 00 20 */ blr .global __ct__12CGuiTextPaneFRCQ210CGuiWidget15CGuiWidgetParmsP11CSimplePoolRC9CVector2fRC9CVector3fUiRC18CGuiTextPropertiesRC6CColorRC6CColorii __ct__12CGuiTextPaneFRCQ210CGuiWidget15CGuiWidgetParmsP11CSimplePoolRC9CVector2fRC9CVector3fUiRC18CGuiTextPropertiesRC6CColorRC6CColorii: @@ -400,7 +400,7 @@ __ct__12CGuiTextPaneFRCQ210CGuiWidget15CGuiWidgetParmsP11CSimplePoolRC9CVector2f /* 802C7ADC 002C4A3C 80 01 00 34 */ lwz r0, 0x34(r1) /* 802C7AE0 002C4A40 7C 08 03 A6 */ mtlr r0 /* 802C7AE4 002C4A44 38 21 00 30 */ addi r1, r1, 0x30 -/* 802C7AE8 002C4A48 4E 80 00 20 */ blr +/* 802C7AE8 002C4A48 4E 80 00 20 */ blr .global Create__12CGuiTextPaneFP9CGuiFrameR12CInputStreamb Create__12CGuiTextPaneFP9CGuiFrameR12CInputStreamb: @@ -517,7 +517,7 @@ lbl_802C7C88: /* 802C7CA0 002C4C00 81 9A 00 00 */ lwz r12, 0(r26) /* 802C7CA4 002C4C04 81 8C 00 48 */ lwz r12, 0x48(r12) /* 802C7CA8 002C4C08 7D 89 03 A6 */ mtctr r12 -/* 802C7CAC 002C4C0C 4E 80 04 21 */ bctrl +/* 802C7CAC 002C4C0C 4E 80 04 21 */ bctrl /* 802C7CB0 002C4C10 3C 80 80 3D */ lis r4, lbl_803D68D8@ha /* 802C7CB4 002C4C14 38 61 00 18 */ addi r3, r1, 0x18 /* 802C7CB8 002C4C18 38 84 68 D8 */ addi r4, r4, lbl_803D68D8@l @@ -536,4 +536,4 @@ lbl_802C7C88: /* 802C7CEC 002C4C4C 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 802C7CF0 002C4C50 7C 08 03 A6 */ mtlr r0 /* 802C7CF4 002C4C54 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 802C7CF8 002C4C58 4E 80 00 20 */ blr +/* 802C7CF8 002C4C58 4E 80 00 20 */ blr diff --git a/asm/GuiSys/CGuiTextSupport.s b/asm/GuiSys/CGuiTextSupport.s index 57424c82..cf8c0902 100644 --- a/asm/GuiSys/CGuiTextSupport.s +++ b/asm/GuiSys/CGuiTextSupport.s @@ -56,7 +56,7 @@ lbl_802C7D28: /* 802C7D3C 002C4C9C 83 C1 00 08 */ lwz r30, 8(r1) /* 802C7D40 002C4CA0 7C 08 03 A6 */ mtlr r0 /* 802C7D44 002C4CA4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C7D48 002C4CA8 4E 80 00 20 */ blr +/* 802C7D48 002C4CA8 4E 80 00 20 */ blr .global sub_802c7d4c sub_802c7d4c: @@ -68,7 +68,7 @@ sub_802c7d4c: /* 802C7D60 002C4CC0 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C7D64 002C4CC4 7C 08 03 A6 */ mtlr r0 /* 802C7D68 002C4CC8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C7D6C 002C4CCC 4E 80 00 20 */ blr +/* 802C7D6C 002C4CCC 4E 80 00 20 */ blr .global GetBounds__15CGuiTextSupportFv GetBounds__15CGuiTextSupportFv: @@ -83,7 +83,7 @@ GetBounds__15CGuiTextSupportFv: /* 802C7D90 002C4CF0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802C7D94 002C4CF4 7C 08 03 A6 */ mtlr r0 /* 802C7D98 002C4CF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C7D9C 002C4CFC 4E 80 00 20 */ blr +/* 802C7D9C 002C4CFC 4E 80 00 20 */ blr .global GetCurrentPageRenderBuffer__15CGuiTextSupportFv GetCurrentPageRenderBuffer__15CGuiTextSupportFv: @@ -94,7 +94,7 @@ GetCurrentPageRenderBuffer__15CGuiTextSupportFv: /* 802C7DB0 002C4D10 28 00 00 00 */ cmplwi r0, 0 /* 802C7DB4 002C4D14 40 82 00 0C */ bne lbl_802C7DC0 /* 802C7DB8 002C4D18 38 63 00 60 */ addi r3, r3, 0x60 -/* 802C7DBC 002C4D1C 4E 80 00 20 */ blr +/* 802C7DBC 002C4D1C 4E 80 00 20 */ blr lbl_802C7DC0: /* 802C7DC0 002C4D20 88 03 03 08 */ lbz r0, 0x308(r3) /* 802C7DC4 002C4D24 28 00 00 00 */ cmplwi r0, 0 @@ -109,14 +109,14 @@ lbl_802C7DE4: /* 802C7DE4 002C4D44 7C 05 20 00 */ cmpw r5, r4 /* 802C7DE8 002C4D48 40 82 00 0C */ bne lbl_802C7DF4 /* 802C7DEC 002C4D4C 38 63 00 08 */ addi r3, r3, 8 -/* 802C7DF0 002C4D50 4E 80 00 20 */ blr +/* 802C7DF0 002C4D50 4E 80 00 20 */ blr lbl_802C7DF4: /* 802C7DF4 002C4D54 80 63 00 04 */ lwz r3, 4(r3) /* 802C7DF8 002C4D58 38 A5 00 01 */ addi r5, r5, 1 /* 802C7DFC 002C4D5C 4B FF FF E8 */ b lbl_802C7DE4 lbl_802C7E00: /* 802C7E00 002C4D60 38 60 00 00 */ li r3, 0 -/* 802C7E04 002C4D64 4E 80 00 20 */ blr +/* 802C7E04 002C4D64 4E 80 00 20 */ blr .global SetPage__15CGuiTextSupportFi SetPage__15CGuiTextSupportFi: @@ -141,7 +141,7 @@ lbl_802C7E38: /* 802C7E48 002C4DA8 90 03 00 44 */ stw r0, 0x44(r3) /* 802C7E4C 002C4DAC D0 03 00 3C */ stfs f0, 0x3c(r3) /* 802C7E50 002C4DB0 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C7E54 002C4DB4 4E 80 00 20 */ blr +/* 802C7E54 002C4DB4 4E 80 00 20 */ blr .global GetTotalPageCount__15CGuiTextSupportFv GetTotalPageCount__15CGuiTextSupportFv: @@ -162,7 +162,7 @@ lbl_802C7E84: /* 802C7E88 002C4DE8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802C7E8C 002C4DEC 7C 08 03 A6 */ mtlr r0 /* 802C7E90 002C4DF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C7E94 002C4DF4 4E 80 00 20 */ blr +/* 802C7E94 002C4DF4 4E 80 00 20 */ blr .global GetCurrentAnimationOverAge__15CGuiTextSupportFv GetCurrentAnimationOverAge__15CGuiTextSupportFv: @@ -240,7 +240,7 @@ lbl_802C7F94: /* 802C7F9C 002C4EFC 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 802C7FA0 002C4F00 7C 08 03 A6 */ mtlr r0 /* 802C7FA4 002C4F04 38 21 00 30 */ addi r1, r1, 0x30 -/* 802C7FA8 002C4F08 4E 80 00 20 */ blr +/* 802C7FA8 002C4F08 4E 80 00 20 */ blr .global GetNumCharsTotal__15CGuiTextSupportCFv GetNumCharsTotal__15CGuiTextSupportCFv: @@ -271,7 +271,7 @@ lbl_802C8000: /* 802C8004 002C4F64 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802C8008 002C4F68 7C 08 03 A6 */ mtlr r0 /* 802C800C 002C4F6C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C8010 002C4F70 4E 80 00 20 */ blr +/* 802C8010 002C4F70 4E 80 00 20 */ blr .global GetNumCharactersPrinted__15CGuiTextSupportCFv GetNumCharactersPrinted__15CGuiTextSupportCFv: @@ -315,7 +315,7 @@ lbl_802C8094: /* 802C8098 002C4FF8 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802C809C 002C4FFC 7C 08 03 A6 */ mtlr r0 /* 802C80A0 002C5000 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C80A4 002C5004 4E 80 00 20 */ blr +/* 802C80A4 002C5004 4E 80 00 20 */ blr .global GetTotalAnimationTime__15CGuiTextSupportCFv GetTotalAnimationTime__15CGuiTextSupportCFv: @@ -348,7 +348,7 @@ lbl_802C8104: /* 802C8108 002C5068 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802C810C 002C506C 7C 08 03 A6 */ mtlr r0 /* 802C8110 002C5070 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C8114 002C5074 4E 80 00 20 */ blr +/* 802C8114 002C5074 4E 80 00 20 */ blr .global SetTypeWriteEffectOptions__15CGuiTextSupportFbff SetTypeWriteEffectOptions__15CGuiTextSupportFbff: @@ -379,7 +379,7 @@ lbl_802C8168: /* 802C8168 002C50C8 C0 04 00 00 */ lfs f0, 0(r4) /* 802C816C 002C50CC D0 03 00 58 */ stfs f0, 0x58(r3) /* 802C8170 002C50D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C8174 002C50D4 4E 80 00 20 */ blr +/* 802C8174 002C50D4 4E 80 00 20 */ blr .global Update__15CGuiTextSupportFf Update__15CGuiTextSupportFf: @@ -516,7 +516,7 @@ lbl_802C8308: /* 802C8354 002C52B4 83 A1 00 44 */ lwz r29, 0x44(r1) /* 802C8358 002C52B8 7C 08 03 A6 */ mtlr r0 /* 802C835C 002C52BC 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 802C8360 002C52C0 4E 80 00 20 */ blr +/* 802C8360 002C52C0 4E 80 00 20 */ blr .global ClearRenderBuffer__15CGuiTextSupportFv ClearRenderBuffer__15CGuiTextSupportFv: @@ -544,7 +544,7 @@ ClearRenderBuffer__15CGuiTextSupportFv: /* 802C83B8 002C5318 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 802C83BC 002C531C 7C 08 03 A6 */ mtlr r0 /* 802C83C0 002C5320 38 21 00 30 */ addi r1, r1, 0x30 -/* 802C83C4 002C5324 4E 80 00 20 */ blr +/* 802C83C4 002C5324 4E 80 00 20 */ blr .global "__as__Q24rstl25list<17CTextRenderBuffer>FvFRCQ24rstl25list<17CTextRenderBuffer>Fv" "__as__Q24rstl25list<17CTextRenderBuffer>FvFRCQ24rstl25list<17CTextRenderBuffer>Fv": @@ -591,7 +591,7 @@ lbl_802C844C: /* 802C8458 002C53B8 83 A1 00 24 */ lwz r29, 0x24(r1) /* 802C845C 002C53BC 7C 08 03 A6 */ mtlr r0 /* 802C8460 002C53C0 38 21 00 30 */ addi r1, r1, 0x30 -/* 802C8464 002C53C4 4E 80 00 20 */ blr +/* 802C8464 002C53C4 4E 80 00 20 */ blr .global sub_802c8468 sub_802c8468: @@ -625,7 +625,7 @@ lbl_802C84B0: /* 802C84CC 002C542C 83 81 00 10 */ lwz r28, 0x10(r1) /* 802C84D0 002C5430 7C 08 03 A6 */ mtlr r0 /* 802C84D4 002C5434 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C84D8 002C5438 4E 80 00 20 */ blr +/* 802C84D8 002C5438 4E 80 00 20 */ blr .global sub_802c84dc sub_802c84dc: @@ -644,7 +644,7 @@ sub_802c84dc: /* 802C850C 002C546C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802C8510 002C5470 7C 08 03 A6 */ mtlr r0 /* 802C8514 002C5474 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C8518 002C5478 4E 80 00 20 */ blr +/* 802C8518 002C5478 4E 80 00 20 */ blr .global sub_802c851c sub_802c851c: @@ -676,7 +676,7 @@ lbl_802C8558: /* 802C857C 002C54DC 83 C1 00 08 */ lwz r30, 8(r1) /* 802C8580 002C54E0 7C 08 03 A6 */ mtlr r0 /* 802C8584 002C54E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C8588 002C54E8 4E 80 00 20 */ blr +/* 802C8588 002C54E8 4E 80 00 20 */ blr .global sub_802c858c sub_802c858c: @@ -714,7 +714,7 @@ lbl_802C85EC: /* 802C8600 002C5560 83 81 00 10 */ lwz r28, 0x10(r1) /* 802C8604 002C5564 7C 08 03 A6 */ mtlr r0 /* 802C8608 002C5568 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C860C 002C556C 4E 80 00 20 */ blr +/* 802C860C 002C556C 4E 80 00 20 */ blr .global __as__17CTextRenderBufferFRC17CTextRenderBuffer __as__17CTextRenderBufferFRC17CTextRenderBuffer: @@ -902,7 +902,7 @@ lbl_802C887C: /* 802C888C 002C57EC 80 01 00 24 */ lwz r0, 0x24(r1) /* 802C8890 002C57F0 7C 08 03 A6 */ mtlr r0 /* 802C8894 002C57F4 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C8898 002C57F8 4E 80 00 20 */ blr +/* 802C8898 002C57F8 4E 80 00 20 */ blr .global sub_802c889c sub_802c889c: @@ -952,7 +952,7 @@ lbl_802C892C: /* 802C8938 002C5898 83 C1 00 08 */ lwz r30, 8(r1) /* 802C893C 002C589C 7C 08 03 A6 */ mtlr r0 /* 802C8940 002C58A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C8944 002C58A4 4E 80 00 20 */ blr +/* 802C8944 002C58A4 4E 80 00 20 */ blr .global sub_802c8948 sub_802c8948: @@ -986,7 +986,7 @@ lbl_802C8990: /* 802C89AC 002C590C 83 81 00 10 */ lwz r28, 0x10(r1) /* 802C89B0 002C5910 7C 08 03 A6 */ mtlr r0 /* 802C89B4 002C5914 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C89B8 002C5918 4E 80 00 20 */ blr +/* 802C89B8 002C5918 4E 80 00 20 */ blr .global sub_802c89bc sub_802c89bc: @@ -1000,7 +1000,7 @@ lbl_802C89D4: /* 802C89D4 002C5934 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C89D8 002C5938 7C 08 03 A6 */ mtlr r0 /* 802C89DC 002C593C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C89E0 002C5940 4E 80 00 20 */ blr +/* 802C89E0 002C5940 4E 80 00 20 */ blr .global sub_802c89e4 sub_802c89e4: @@ -1067,7 +1067,7 @@ lbl_802C8AA0: /* 802C8AB8 002C5A18 80 01 00 24 */ lwz r0, 0x24(r1) /* 802C8ABC 002C5A1C 7C 08 03 A6 */ mtlr r0 /* 802C8AC0 002C5A20 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C8AC4 002C5A24 4E 80 00 20 */ blr +/* 802C8AC4 002C5A24 4E 80 00 20 */ blr .global sub_802c8ac8 sub_802c8ac8: @@ -1087,7 +1087,7 @@ lbl_802C8AEC: /* 802C8AF8 002C5A58 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802C8AFC 002C5A5C 7C 08 03 A6 */ mtlr r0 /* 802C8B00 002C5A60 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C8B04 002C5A64 4E 80 00 20 */ blr +/* 802C8B04 002C5A64 4E 80 00 20 */ blr .global sub_802c8b08 sub_802c8b08: @@ -1099,7 +1099,7 @@ sub_802c8b08: /* 802C8B1C 002C5A7C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C8B20 002C5A80 7C 08 03 A6 */ mtlr r0 /* 802C8B24 002C5A84 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C8B28 002C5A88 4E 80 00 20 */ blr +/* 802C8B28 002C5A88 4E 80 00 20 */ blr .global CheckAndRebuildRenderBuffer__15CGuiTextSupportFv CheckAndRebuildRenderBuffer__15CGuiTextSupportFv: @@ -1218,7 +1218,7 @@ lbl_802C8CB4: /* 802C8CC0 002C5C20 83 A1 02 B4 */ lwz r29, 0x2b4(r1) /* 802C8CC4 002C5C24 7C 08 03 A6 */ mtlr r0 /* 802C8CC8 002C5C28 38 21 02 C0 */ addi r1, r1, 0x2c0 -/* 802C8CCC 002C5C2C 4E 80 00 20 */ blr +/* 802C8CCC 002C5C2C 4E 80 00 20 */ blr .global sub_802c8cd0 sub_802c8cd0: @@ -1233,7 +1233,7 @@ sub_802c8cd0: /* 802C8CF0 002C5C50 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802C8CF4 002C5C54 7C 08 03 A6 */ mtlr r0 /* 802C8CF8 002C5C58 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C8CFC 002C5C5C 4E 80 00 20 */ blr +/* 802C8CFC 002C5C5C 4E 80 00 20 */ blr .global sub_802c8d00 sub_802c8d00: @@ -1256,7 +1256,7 @@ lbl_802C8D34: /* 802C8D38 002C5C98 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802C8D3C 002C5C9C 7C 08 03 A6 */ mtlr r0 /* 802C8D40 002C5CA0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C8D44 002C5CA4 4E 80 00 20 */ blr +/* 802C8D44 002C5CA4 4E 80 00 20 */ blr .global sub_802c8d48 sub_802c8d48: @@ -1347,7 +1347,7 @@ lbl_802C8E6C: /* 802C8E7C 002C5DDC 80 01 00 24 */ lwz r0, 0x24(r1) /* 802C8E80 002C5DE0 7C 08 03 A6 */ mtlr r0 /* 802C8E84 002C5DE4 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C8E88 002C5DE8 4E 80 00 20 */ blr +/* 802C8E88 002C5DE8 4E 80 00 20 */ blr .global sub_802c8e8c sub_802c8e8c: @@ -1422,7 +1422,7 @@ lbl_802C8F6C: /* 802C8F74 002C5ED4 83 C1 00 18 */ lwz r30, 0x18(r1) /* 802C8F78 002C5ED8 7C 08 03 A6 */ mtlr r0 /* 802C8F7C 002C5EDC 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C8F80 002C5EE0 4E 80 00 20 */ blr +/* 802C8F80 002C5EE0 4E 80 00 20 */ blr .global sub_802c8f84 sub_802c8f84: @@ -1496,7 +1496,7 @@ lbl_802C9060: /* 802C9068 002C5FC8 83 C1 00 18 */ lwz r30, 0x18(r1) /* 802C906C 002C5FCC 7C 08 03 A6 */ mtlr r0 /* 802C9070 002C5FD0 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C9074 002C5FD4 4E 80 00 20 */ blr +/* 802C9074 002C5FD4 4E 80 00 20 */ blr .global sub_802c9078 sub_802c9078: @@ -1544,7 +1544,7 @@ lbl_802C9100: /* 802C9108 002C6068 83 C1 00 08 */ lwz r30, 8(r1) /* 802C910C 002C606C 7C 08 03 A6 */ mtlr r0 /* 802C9110 002C6070 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C9114 002C6074 4E 80 00 20 */ blr +/* 802C9114 002C6074 4E 80 00 20 */ blr .global sub_802c9118 sub_802c9118: @@ -1574,7 +1574,7 @@ lbl_802C9154: /* 802C916C 002C60CC 83 A1 00 14 */ lwz r29, 0x14(r1) /* 802C9170 002C60D0 7C 08 03 A6 */ mtlr r0 /* 802C9174 002C60D4 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C9178 002C60D8 4E 80 00 20 */ blr +/* 802C9178 002C60D8 4E 80 00 20 */ blr .global sub_802c917c sub_802c917c: @@ -1601,7 +1601,7 @@ sub_802c917c: /* 802C91CC 002C612C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802C91D0 002C6130 7C 08 03 A6 */ mtlr r0 /* 802C91D4 002C6134 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C91D8 002C6138 4E 80 00 20 */ blr +/* 802C91D8 002C6138 4E 80 00 20 */ blr .global sub_802c91dc sub_802c91dc: @@ -1680,7 +1680,7 @@ lbl_802C92CC: /* 802C92D0 002C6230 80 01 00 34 */ lwz r0, 0x34(r1) /* 802C92D4 002C6234 7C 08 03 A6 */ mtlr r0 /* 802C92D8 002C6238 38 21 00 30 */ addi r1, r1, 0x30 -/* 802C92DC 002C623C 4E 80 00 20 */ blr +/* 802C92DC 002C623C 4E 80 00 20 */ blr .global sub_802c92e0 sub_802c92e0: @@ -1694,7 +1694,7 @@ lbl_802C92F8: /* 802C92F8 002C6258 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C92FC 002C625C 7C 08 03 A6 */ mtlr r0 /* 802C9300 002C6260 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C9304 002C6264 4E 80 00 20 */ blr +/* 802C9304 002C6264 4E 80 00 20 */ blr .global CheckAndRebuildTextBuffer__15CGuiTextSupportFv CheckAndRebuildTextBuffer__15CGuiTextSupportFv: @@ -1841,7 +1841,7 @@ lbl_802C94FC: /* 802C9534 002C6494 83 E1 00 AC */ lwz r31, 0xac(r1) /* 802C9538 002C6498 7C 08 03 A6 */ mtlr r0 /* 802C953C 002C649C 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 802C9540 002C64A0 4E 80 00 20 */ blr +/* 802C9540 002C64A0 4E 80 00 20 */ blr .global Render__15CGuiTextSupportFv Render__15CGuiTextSupportFv: @@ -1883,7 +1883,7 @@ lbl_802C95C0: /* 802C95CC 002C652C 83 E1 00 AC */ lwz r31, 0xac(r1) /* 802C95D0 002C6530 7C 08 03 A6 */ mtlr r0 /* 802C95D4 002C6534 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 802C95D8 002C6538 4E 80 00 20 */ blr +/* 802C95D8 002C6538 4E 80 00 20 */ blr .global "SetScanStates__15CGuiTextSupportFPCQ24rstl20vector<10SScanState>" "SetScanStates__15CGuiTextSupportFPCQ24rstl20vector<10SScanState>": @@ -1899,13 +1899,13 @@ lbl_802C95FC: /* 802C95FC 002C655C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C9600 002C6560 7C 08 03 A6 */ mtlr r0 /* 802C9604 002C6564 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C9608 002C6568 4E 80 00 20 */ blr +/* 802C9608 002C6568 4E 80 00 20 */ blr .global SetGeometryColor__15CGuiTextSupportFRC6CColor SetGeometryColor__15CGuiTextSupportFRC6CColor: /* 802C960C 002C656C 80 04 00 00 */ lwz r0, 0(r4) /* 802C9610 002C6570 90 03 00 2C */ stw r0, 0x2c(r3) -/* 802C9614 002C6574 4E 80 00 20 */ blr +/* 802C9614 002C6574 4E 80 00 20 */ blr .global SetOutlineColor__15CGuiTextSupportFRC6CColor SetOutlineColor__15CGuiTextSupportFRC6CColor: @@ -1929,7 +1929,7 @@ lbl_802C9650: /* 802C9658 002C65B8 83 C1 00 08 */ lwz r30, 8(r1) /* 802C965C 002C65BC 7C 08 03 A6 */ mtlr r0 /* 802C9660 002C65C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C9664 002C65C4 4E 80 00 20 */ blr +/* 802C9664 002C65C4 4E 80 00 20 */ blr .global SetFontColor__15CGuiTextSupportFRC6CColor SetFontColor__15CGuiTextSupportFRC6CColor: @@ -1953,7 +1953,7 @@ lbl_802C96A0: /* 802C96A8 002C6608 83 C1 00 08 */ lwz r30, 8(r1) /* 802C96AC 002C660C 7C 08 03 A6 */ mtlr r0 /* 802C96B0 002C6610 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C96B4 002C6614 4E 80 00 20 */ blr +/* 802C96B4 002C6614 4E 80 00 20 */ blr .global SetVerticalJustification__15CGuiTextSupportF22EVerticalJustification SetVerticalJustification__15CGuiTextSupportF22EVerticalJustification: @@ -1969,7 +1969,7 @@ lbl_802C96D8: /* 802C96D8 002C6638 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C96DC 002C663C 7C 08 03 A6 */ mtlr r0 /* 802C96E0 002C6640 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C96E4 002C6644 4E 80 00 20 */ blr +/* 802C96E4 002C6644 4E 80 00 20 */ blr .global SetJustification__15CGuiTextSupportF14EJustification SetJustification__15CGuiTextSupportF14EJustification: @@ -1985,7 +1985,7 @@ lbl_802C9708: /* 802C9708 002C6668 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C970C 002C666C 7C 08 03 A6 */ mtlr r0 /* 802C9710 002C6670 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C9714 002C6674 4E 80 00 20 */ blr +/* 802C9714 002C6674 4E 80 00 20 */ blr .global SetImageBaseline__15CGuiTextSupportFb SetImageBaseline__15CGuiTextSupportFb: @@ -2002,7 +2002,7 @@ lbl_802C973C: /* 802C973C 002C669C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C9740 002C66A0 7C 08 03 A6 */ mtlr r0 /* 802C9744 002C66A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C9748 002C66A8 4E 80 00 20 */ blr +/* 802C9748 002C66A8 4E 80 00 20 */ blr .global sub_802c974c sub_802c974c: @@ -2019,7 +2019,7 @@ lbl_802C9770: /* 802C9770 002C66D0 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C9774 002C66D4 7C 08 03 A6 */ mtlr r0 /* 802C9778 002C66D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C977C 002C66DC 4E 80 00 20 */ blr +/* 802C977C 002C66DC 4E 80 00 20 */ blr .global AddText__15CGuiTextSupportFQ24rstl7wstring AddText__15CGuiTextSupportFQ24rstl7wstring: @@ -2093,7 +2093,7 @@ lbl_802C984C: /* 802C9874 002C67D4 83 A1 00 14 */ lwz r29, 0x14(r1) /* 802C9878 002C67D8 7C 08 03 A6 */ mtlr r0 /* 802C987C 002C67DC 38 21 00 30 */ addi r1, r1, 0x30 -/* 802C9880 002C67E0 4E 80 00 20 */ blr +/* 802C9880 002C67E0 4E 80 00 20 */ blr .global "SetText__15CGuiTextSupportFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" "SetText__15CGuiTextSupportFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>": @@ -2142,7 +2142,7 @@ lbl_802C9914: /* 802C9920 002C6880 83 A1 00 24 */ lwz r29, 0x24(r1) /* 802C9924 002C6884 7C 08 03 A6 */ mtlr r0 /* 802C9928 002C6888 38 21 00 30 */ addi r1, r1, 0x30 -/* 802C992C 002C688C 4E 80 00 20 */ blr +/* 802C992C 002C688C 4E 80 00 20 */ blr .global sub_802c9930 sub_802c9930: @@ -2156,7 +2156,7 @@ sub_802c9930: /* 802C994C 002C68AC 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C9950 002C68B0 7C 08 03 A6 */ mtlr r0 /* 802C9954 002C68B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C9958 002C68B8 4E 80 00 20 */ blr +/* 802C9958 002C68B8 4E 80 00 20 */ blr .global sub_802c995c sub_802c995c: @@ -2190,7 +2190,7 @@ sub_802c995c: /* 802C99C8 002C6928 80 01 00 54 */ lwz r0, 0x54(r1) /* 802C99CC 002C692C 7C 08 03 A6 */ mtlr r0 /* 802C99D0 002C6930 38 21 00 50 */ addi r1, r1, 0x50 -/* 802C99D4 002C6934 4E 80 00 20 */ blr +/* 802C99D4 002C6934 4E 80 00 20 */ blr .global sub_802c99d8 sub_802c99d8: @@ -2284,7 +2284,7 @@ lbl_802C9AF8: lbl_802C9AFC: /* 802C9AFC 002C6A5C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802C9B00 002C6A60 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C9B04 002C6A64 4E 80 00 20 */ blr +/* 802C9B04 002C6A64 4E 80 00 20 */ blr .global "SetText__15CGuiTextSupportFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" "SetText__15CGuiTextSupportFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>": @@ -2313,7 +2313,7 @@ lbl_802C9AFC: /* 802C9B60 002C6AC0 83 C1 00 28 */ lwz r30, 0x28(r1) /* 802C9B64 002C6AC4 7C 08 03 A6 */ mtlr r0 /* 802C9B68 002C6AC8 38 21 00 30 */ addi r1, r1, 0x30 -/* 802C9B6C 002C6ACC 4E 80 00 20 */ blr +/* 802C9B6C 002C6ACC 4E 80 00 20 */ blr .global _GetIsTextSupportFinishedLoading__15CGuiTextSupportCFv _GetIsTextSupportFinishedLoading__15CGuiTextSupportCFv: @@ -2384,7 +2384,7 @@ lbl_802C9C48: /* 802C9C54 002C6BB4 83 A1 00 24 */ lwz r29, 0x24(r1) /* 802C9C58 002C6BB8 7C 08 03 A6 */ mtlr r0 /* 802C9C5C 002C6BBC 38 21 00 30 */ addi r1, r1, 0x30 -/* 802C9C60 002C6BC0 4E 80 00 20 */ blr +/* 802C9C60 002C6BC0 4E 80 00 20 */ blr .global GetIsTextSupportFinishedLoading__15CGuiTextSupportCFv GetIsTextSupportFinishedLoading__15CGuiTextSupportCFv: @@ -2400,7 +2400,7 @@ GetIsTextSupportFinishedLoading__15CGuiTextSupportCFv: /* 802C9C88 002C6BE8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802C9C8C 002C6BEC 7C 08 03 A6 */ mtlr r0 /* 802C9C90 002C6BF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C9C94 002C6BF4 4E 80 00 20 */ blr +/* 802C9C94 002C6BF4 4E 80 00 20 */ blr .global __dt__15CGuiTextSupportFv __dt__15CGuiTextSupportFv: @@ -2498,7 +2498,7 @@ lbl_802C9DC8: /* 802C9DDC 002C6D3C 83 81 00 30 */ lwz r28, 0x30(r1) /* 802C9DE0 002C6D40 7C 08 03 A6 */ mtlr r0 /* 802C9DE4 002C6D44 38 21 00 40 */ addi r1, r1, 0x40 -/* 802C9DE8 002C6D48 4E 80 00 20 */ blr +/* 802C9DE8 002C6D48 4E 80 00 20 */ blr .global sub_802c9dec sub_802c9dec: @@ -2522,7 +2522,7 @@ lbl_802C9E20: /* 802C9E2C 002C6D8C 83 C1 00 08 */ lwz r30, 8(r1) /* 802C9E30 002C6D90 7C 08 03 A6 */ mtlr r0 /* 802C9E34 002C6D94 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C9E38 002C6D98 4E 80 00 20 */ blr +/* 802C9E38 002C6D98 4E 80 00 20 */ blr .global __ct__15CGuiTextSupportFv __ct__15CGuiTextSupportFv: @@ -2613,7 +2613,7 @@ __ct__15CGuiTextSupportFv: /* 802C9F8C 002C6EEC 81 9F 00 00 */ lwz r12, 0(r31) /* 802C9F90 002C6EF0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802C9F94 002C6EF4 7D 89 03 A6 */ mtctr r12 -/* 802C9F98 002C6EF8 4E 80 04 21 */ bctrl +/* 802C9F98 002C6EF8 4E 80 04 21 */ bctrl /* 802C9F9C 002C6EFC 3B E1 00 28 */ addi r31, r1, 0x28 /* 802C9FA0 002C6F00 38 81 00 08 */ addi r4, r1, 8 /* 802C9FA4 002C6F04 7F E3 FB 78 */ mr r3, r31 @@ -2659,7 +2659,7 @@ lbl_802CA028: /* 802CA034 002C6F94 83 C1 00 38 */ lwz r30, 0x38(r1) /* 802CA038 002C6F98 7C 08 03 A6 */ mtlr r0 /* 802CA03C 002C6F9C 38 21 00 40 */ addi r1, r1, 0x40 -/* 802CA040 002C6FA0 4E 80 00 20 */ blr +/* 802CA040 002C6FA0 4E 80 00 20 */ blr .global __ct__18CGuiTextPropertiesFv __ct__18CGuiTextPropertiesFv: @@ -2668,7 +2668,7 @@ __ct__18CGuiTextPropertiesFv: /* 802CA04C 002C6FAC 90 C3 00 04 */ stw r6, 4(r3) /* 802CA050 002C6FB0 90 E3 00 08 */ stw r7, 8(r3) /* 802CA054 002C6FB4 91 03 00 0C */ stw r8, 0xc(r3) -/* 802CA058 002C6FB8 4E 80 00 20 */ blr +/* 802CA058 002C6FB8 4E 80 00 20 */ blr .global sub_802ca05c sub_802ca05c: @@ -2710,7 +2710,7 @@ lbl_802CA0C4: /* 802CA0E0 002C7040 80 01 00 24 */ lwz r0, 0x24(r1) /* 802CA0E4 002C7044 7C 08 03 A6 */ mtlr r0 /* 802CA0E8 002C7048 38 21 00 20 */ addi r1, r1, 0x20 -/* 802CA0EC 002C704C 4E 80 00 20 */ blr +/* 802CA0EC 002C704C 4E 80 00 20 */ blr .global "__dt__Q24rstl25list<17CTextRenderBuffer>Fv" "__dt__Q24rstl25list<17CTextRenderBuffer>Fv": @@ -2753,7 +2753,7 @@ lbl_802CA160: /* 802CA174 002C70D4 83 81 00 10 */ lwz r28, 0x10(r1) /* 802CA178 002C70D8 7C 08 03 A6 */ mtlr r0 /* 802CA17C 002C70DC 38 21 00 20 */ addi r1, r1, 0x20 -/* 802CA180 002C70E0 4E 80 00 20 */ blr +/* 802CA180 002C70E0 4E 80 00 20 */ blr .global sub_802ca184 sub_802ca184: @@ -2827,7 +2827,7 @@ lbl_802CA264: /* 802CA268 002C71C8 80 01 00 34 */ lwz r0, 0x34(r1) /* 802CA26C 002C71CC 7C 08 03 A6 */ mtlr r0 /* 802CA270 002C71D0 38 21 00 30 */ addi r1, r1, 0x30 -/* 802CA274 002C71D4 4E 80 00 20 */ blr +/* 802CA274 002C71D4 4E 80 00 20 */ blr .global sub_802ca278 sub_802ca278: @@ -2886,7 +2886,7 @@ lbl_802CA32C: /* 802CA338 002C7298 83 A1 00 24 */ lwz r29, 0x24(r1) /* 802CA33C 002C729C 7C 08 03 A6 */ mtlr r0 /* 802CA340 002C72A0 38 21 00 30 */ addi r1, r1, 0x30 -/* 802CA344 002C72A4 4E 80 00 20 */ blr +/* 802CA344 002C72A4 4E 80 00 20 */ blr .global sub_802ca348 sub_802ca348: @@ -2910,7 +2910,7 @@ lbl_802CA374: /* 802CA384 002C72E4 83 C1 00 08 */ lwz r30, 8(r1) /* 802CA388 002C72E8 7C 08 03 A6 */ mtlr r0 /* 802CA38C 002C72EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CA390 002C72F0 4E 80 00 20 */ blr +/* 802CA390 002C72F0 4E 80 00 20 */ blr .global sub_802ca394 sub_802ca394: @@ -2941,7 +2941,7 @@ lbl_802CA3D0: /* 802CA3EC 002C734C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 802CA3F0 002C7350 7C 08 03 A6 */ mtlr r0 /* 802CA3F4 002C7354 38 21 00 20 */ addi r1, r1, 0x20 -/* 802CA3F8 002C7358 4E 80 00 20 */ blr +/* 802CA3F8 002C7358 4E 80 00 20 */ blr .global "reserve__Q24rstl37vectorFi" "reserve__Q24rstl37vectorFi": @@ -3012,7 +3012,7 @@ lbl_802CA4CC: /* 802CA4D8 002C7438 83 A1 00 24 */ lwz r29, 0x24(r1) /* 802CA4DC 002C743C 7C 08 03 A6 */ mtlr r0 /* 802CA4E0 002C7440 38 21 00 30 */ addi r1, r1, 0x30 -/* 802CA4E4 002C7444 4E 80 00 20 */ blr +/* 802CA4E4 002C7444 4E 80 00 20 */ blr .global sub_802ca4e8 sub_802ca4e8: diff --git a/asm/GuiSys/CGuiWidget.s b/asm/GuiSys/CGuiWidget.s index f713bd97..90fafda4 100644 --- a/asm/GuiSys/CGuiWidget.s +++ b/asm/GuiSys/CGuiWidget.s @@ -21,17 +21,17 @@ lbl_803ECA10: .4byte OnVisible__10CGuiWidgetFv .4byte OnActivate__10CGuiWidgetFv .4byte 0 - + .section .text, "ax" .global OnActivate__10CGuiWidgetFv OnActivate__10CGuiWidgetFv: -/* 802CA5DC 002C753C 4E 80 00 20 */ blr +/* 802CA5DC 002C753C 4E 80 00 20 */ blr .global OnVisible__10CGuiWidgetFv OnVisible__10CGuiWidgetFv: -/* 802CA5E0 002C7540 4E 80 00 20 */ blr +/* 802CA5E0 002C7540 4E 80 00 20 */ blr .global SetIsActive__10CGuiWidgetFb SetIsActive__10CGuiWidgetFb: @@ -48,12 +48,12 @@ SetIsActive__10CGuiWidgetFb: /* 802CA60C 002C756C 81 83 00 00 */ lwz r12, 0(r3) /* 802CA610 002C7570 81 8C 00 38 */ lwz r12, 0x38(r12) /* 802CA614 002C7574 7D 89 03 A6 */ mtctr r12 -/* 802CA618 002C7578 4E 80 04 21 */ bctrl +/* 802CA618 002C7578 4E 80 04 21 */ bctrl lbl_802CA61C: /* 802CA61C 002C757C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802CA620 002C7580 7C 08 03 A6 */ mtlr r0 /* 802CA624 002C7584 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CA628 002C7588 4E 80 00 20 */ blr +/* 802CA628 002C7588 4E 80 00 20 */ blr .global SetIsVisible__10CGuiWidgetFb SetIsVisible__10CGuiWidgetFb: @@ -66,11 +66,11 @@ SetIsVisible__10CGuiWidgetFb: /* 802CA644 002C75A4 81 83 00 00 */ lwz r12, 0(r3) /* 802CA648 002C75A8 81 8C 00 34 */ lwz r12, 0x34(r12) /* 802CA64C 002C75AC 7D 89 03 A6 */ mtctr r12 -/* 802CA650 002C75B0 4E 80 04 21 */ bctrl +/* 802CA650 002C75B0 4E 80 04 21 */ bctrl /* 802CA654 002C75B4 80 01 00 14 */ lwz r0, 0x14(r1) /* 802CA658 002C75B8 7C 08 03 A6 */ mtlr r0 /* 802CA65C 002C75BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CA660 002C75C0 4E 80 00 20 */ blr +/* 802CA660 002C75C0 4E 80 00 20 */ blr .global ReapplyXform__10CGuiWidgetFv ReapplyXform__10CGuiWidgetFv: @@ -91,7 +91,7 @@ ReapplyXform__10CGuiWidgetFv: /* 802CA69C 002C75FC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802CA6A0 002C7600 7C 08 03 A6 */ mtlr r0 /* 802CA6A4 002C7604 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CA6A8 002C7608 4E 80 00 20 */ blr +/* 802CA6A8 002C7608 4E 80 00 20 */ blr .global GetIdlePosition__10CGuiWidgetFv GetIdlePosition__10CGuiWidgetFv: @@ -101,7 +101,7 @@ GetIdlePosition__10CGuiWidgetFv: /* 802CA6B8 002C7618 D0 03 00 00 */ stfs f0, 0(r3) /* 802CA6BC 002C761C D0 43 00 04 */ stfs f2, 4(r3) /* 802CA6C0 002C7620 D0 23 00 08 */ stfs f1, 8(r3) -/* 802CA6C4 002C7624 4E 80 00 20 */ blr +/* 802CA6C4 002C7624 4E 80 00 20 */ blr .global AddChildWidget__10CGuiWidgetFP10CGuiWidgetbb AddChildWidget__10CGuiWidgetFP10CGuiWidgetbb: @@ -112,7 +112,7 @@ AddChildWidget__10CGuiWidgetFP10CGuiWidgetbb: /* 802CA6D8 002C7638 80 01 00 14 */ lwz r0, 0x14(r1) /* 802CA6DC 002C763C 7C 08 03 A6 */ mtlr r0 /* 802CA6E0 002C7640 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CA6E4 002C7644 4E 80 00 20 */ blr +/* 802CA6E4 002C7644 4E 80 00 20 */ blr .global SetVisibility__10CGuiWidgetFb14ETraversalMode SetVisibility__10CGuiWidgetFb14ETraversalMode: @@ -168,7 +168,7 @@ lbl_802CA788: /* 802CA79C 002C76FC 83 C1 00 08 */ lwz r30, 8(r1) /* 802CA7A0 002C7700 7C 08 03 A6 */ mtlr r0 /* 802CA7A4 002C7704 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CA7A8 002C7708 4E 80 00 20 */ blr +/* 802CA7A8 002C7708 4E 80 00 20 */ blr .global RecalcWidgetColor__10CGuiWidgetF14ETraversalMode RecalcWidgetColor__10CGuiWidgetF14ETraversalMode: @@ -224,7 +224,7 @@ lbl_802CA854: /* 802CA85C 002C77BC 83 C1 00 18 */ lwz r30, 0x18(r1) /* 802CA860 002C77C0 7C 08 03 A6 */ mtlr r0 /* 802CA864 002C77C4 38 21 00 20 */ addi r1, r1, 0x20 -/* 802CA868 002C77C8 4E 80 00 20 */ blr +/* 802CA868 002C77C8 4E 80 00 20 */ blr .global SetColor__10CGuiWidgetFRC6CColor SetColor__10CGuiWidgetFRC6CColor: @@ -238,7 +238,7 @@ SetColor__10CGuiWidgetFRC6CColor: /* 802CA888 002C77E8 80 01 00 14 */ lwz r0, 0x14(r1) /* 802CA88C 002C77EC 7C 08 03 A6 */ mtlr r0 /* 802CA890 002C77F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CA894 002C77F4 4E 80 00 20 */ blr +/* 802CA894 002C77F4 4E 80 00 20 */ blr .global FindWidget__10CGuiWidgetFs FindWidget__10CGuiWidgetFs: @@ -285,7 +285,7 @@ lbl_802CA920: /* 802CA928 002C7888 83 C1 00 08 */ lwz r30, 8(r1) /* 802CA92C 002C788C 7C 08 03 A6 */ mtlr r0 /* 802CA930 002C7890 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CA934 002C7894 4E 80 00 20 */ blr +/* 802CA934 002C7894 4E 80 00 20 */ blr .global GetIsFinishedLoading__10CGuiWidgetCFv GetIsFinishedLoading__10CGuiWidgetCFv: @@ -295,11 +295,11 @@ GetIsFinishedLoading__10CGuiWidgetCFv: /* 802CA944 002C78A4 81 83 00 00 */ lwz r12, 0(r3) /* 802CA948 002C78A8 81 8C 00 30 */ lwz r12, 0x30(r12) /* 802CA94C 002C78AC 7D 89 03 A6 */ mtctr r12 -/* 802CA950 002C78B0 4E 80 04 21 */ bctrl +/* 802CA950 002C78B0 4E 80 04 21 */ bctrl /* 802CA954 002C78B4 80 01 00 14 */ lwz r0, 0x14(r1) /* 802CA958 002C78B8 7C 08 03 A6 */ mtlr r0 /* 802CA95C 002C78BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CA960 002C78C0 4E 80 00 20 */ blr +/* 802CA960 002C78C0 4E 80 00 20 */ blr .global DispatchInitialize__10CGuiWidgetFv DispatchInitialize__10CGuiWidgetFv: @@ -311,7 +311,7 @@ DispatchInitialize__10CGuiWidgetFv: /* 802CA978 002C78D8 81 83 00 00 */ lwz r12, 0(r3) /* 802CA97C 002C78DC 81 8C 00 14 */ lwz r12, 0x14(r12) /* 802CA980 002C78E0 7D 89 03 A6 */ mtctr r12 -/* 802CA984 002C78E4 4E 80 04 21 */ bctrl +/* 802CA984 002C78E4 4E 80 04 21 */ bctrl /* 802CA988 002C78E8 7F E3 FB 78 */ mr r3, r31 /* 802CA98C 002C78EC 4B FF A3 A5 */ bl GetChildObject__10CGuiObjectFv /* 802CA990 002C78F0 28 03 00 00 */ cmplwi r3, 0 @@ -332,7 +332,7 @@ lbl_802CA9C0: /* 802CA9C4 002C7924 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802CA9C8 002C7928 7C 08 03 A6 */ mtlr r0 /* 802CA9CC 002C792C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CA9D0 002C7930 4E 80 00 20 */ blr +/* 802CA9D0 002C7930 4E 80 00 20 */ blr .global Update__10CGuiWidgetFf Update__10CGuiWidgetFf: @@ -352,7 +352,7 @@ Update__10CGuiWidgetFf: /* 802CAA08 002C7968 FC 20 F8 90 */ fmr f1, f31 /* 802CAA0C 002C796C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802CAA10 002C7970 7D 89 03 A6 */ mtctr r12 -/* 802CAA14 002C7974 4E 80 04 21 */ bctrl +/* 802CAA14 002C7974 4E 80 04 21 */ bctrl lbl_802CAA18: /* 802CAA18 002C7978 7F E3 FB 78 */ mr r3, r31 /* 802CAA1C 002C797C 4B FF A3 05 */ bl GetNextSibling__10CGuiObjectFv @@ -364,22 +364,22 @@ lbl_802CAA18: /* 802CAA34 002C7994 FC 20 F8 90 */ fmr f1, f31 /* 802CAA38 002C7998 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802CAA3C 002C799C 7D 89 03 A6 */ mtctr r12 -/* 802CAA40 002C79A0 4E 80 04 21 */ bctrl +/* 802CAA40 002C79A0 4E 80 04 21 */ bctrl lbl_802CAA44: /* 802CAA44 002C79A4 80 01 00 24 */ lwz r0, 0x24(r1) /* 802CAA48 002C79A8 CB E1 00 18 */ lfd f31, 0x18(r1) /* 802CAA4C 002C79AC 83 E1 00 14 */ lwz r31, 0x14(r1) /* 802CAA50 002C79B0 7C 08 03 A6 */ mtlr r0 /* 802CAA54 002C79B4 38 21 00 20 */ addi r1, r1, 0x20 -/* 802CAA58 002C79B8 4E 80 00 20 */ blr +/* 802CAA58 002C79B8 4E 80 00 20 */ blr .global ProcessUserInput__10CGuiWidgetFRC11CFinalInput ProcessUserInput__10CGuiWidgetFRC11CFinalInput: -/* 802CAA5C 002C79BC 4E 80 00 20 */ blr +/* 802CAA5C 002C79BC 4E 80 00 20 */ blr .global Draw__10CGuiWidgetCFRC19CGuiWidgetDrawParms Draw__10CGuiWidgetCFRC19CGuiWidgetDrawParms: -/* 802CAA60 002C79C0 4E 80 00 20 */ blr +/* 802CAA60 002C79C0 4E 80 00 20 */ blr .global ReadUnusedThing__10CGuiWidgetFR12CInputStream ReadUnusedThing__10CGuiWidgetFR12CInputStream: @@ -391,7 +391,7 @@ ReadUnusedThing__10CGuiWidgetFR12CInputStream: /* 802CAA78 002C79D8 80 01 00 14 */ lwz r0, 0x14(r1) /* 802CAA7C 002C79DC 7C 08 03 A6 */ mtlr r0 /* 802CAA80 002C79E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CAA84 002C79E4 4E 80 00 20 */ blr +/* 802CAA84 002C79E4 4E 80 00 20 */ blr .global ParseBaseInfo__10CGuiWidgetFP9CGuiFrameR12CInputStreamRCQ210CGuiWidget15CGuiWidgetParms ParseBaseInfo__10CGuiWidgetFP9CGuiFrameR12CInputStreamRCQ210CGuiWidget15CGuiWidgetParms: @@ -449,7 +449,7 @@ lbl_802CAAE4: /* 802CAB50 002C7AB0 81 9E 00 00 */ lwz r12, 0(r30) /* 802CAB54 002C7AB4 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 802CAB58 002C7AB8 7D 89 03 A6 */ mtctr r12 -/* 802CAB5C 002C7ABC 4E 80 04 21 */ bctrl +/* 802CAB5C 002C7ABC 4E 80 04 21 */ bctrl /* 802CAB60 002C7AC0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802CAB64 002C7AC4 40 82 00 1C */ bne lbl_802CAB80 /* 802CAB68 002C7AC8 3C 60 80 3D */ lis r3, lbl_803D68F8@ha @@ -471,7 +471,7 @@ lbl_802CAB80: /* 802CABA4 002C7B04 83 81 00 80 */ lwz r28, 0x80(r1) /* 802CABA8 002C7B08 7C 08 03 A6 */ mtlr r0 /* 802CABAC 002C7B0C 38 21 00 90 */ addi r1, r1, 0x90 -/* 802CABB0 002C7B10 4E 80 00 20 */ blr +/* 802CABB0 002C7B10 4E 80 00 20 */ blr .global __dt__10CGuiWidgetFv __dt__10CGuiWidgetFv: @@ -503,7 +503,7 @@ lbl_802CAC08: /* 802CAC14 002C7B74 83 C1 00 08 */ lwz r30, 8(r1) /* 802CAC18 002C7B78 7C 08 03 A6 */ mtlr r0 /* 802CAC1C 002C7B7C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CAC20 002C7B80 4E 80 00 20 */ blr +/* 802CAC20 002C7B80 4E 80 00 20 */ blr .global __ct__10CGuiWidgetFRCQ210CGuiWidget15CGuiWidgetParms __ct__10CGuiWidgetFRCQ210CGuiWidget15CGuiWidgetParms: @@ -581,7 +581,7 @@ __ct__10CGuiWidgetFRCQ210CGuiWidget15CGuiWidgetParms: /* 802CAD40 002C7CA0 83 C1 00 08 */ lwz r30, 8(r1) /* 802CAD44 002C7CA4 7C 08 03 A6 */ mtlr r0 /* 802CAD48 002C7CA8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CAD4C 002C7CAC 4E 80 00 20 */ blr +/* 802CAD4C 002C7CAC 4E 80 00 20 */ blr .global ReadWidgetHeader__10CGuiWidgetFP9CGuiFrameR12CInputStreamb ReadWidgetHeader__10CGuiWidgetFP9CGuiFrameR12CInputStreamb: @@ -650,7 +650,7 @@ ReadWidgetHeader__10CGuiWidgetFP9CGuiFrameR12CInputStreamb: /* 802CAE48 002C7DA8 80 01 00 74 */ lwz r0, 0x74(r1) /* 802CAE4C 002C7DAC 7C 08 03 A6 */ mtlr r0 /* 802CAE50 002C7DB0 38 21 00 70 */ addi r1, r1, 0x70 -/* 802CAE54 002C7DB4 4E 80 00 20 */ blr +/* 802CAE54 002C7DB4 4E 80 00 20 */ blr .global Create__10CGuiWidgetFP9CGuiFrameR12CInputStreamb Create__10CGuiWidgetFP9CGuiFrameR12CInputStreamb: @@ -708,7 +708,7 @@ lbl_802CAF04: /* 802CAF20 002C7E80 80 01 00 54 */ lwz r0, 0x54(r1) /* 802CAF24 002C7E84 7C 08 03 A6 */ mtlr r0 /* 802CAF28 002C7E88 38 21 00 50 */ addi r1, r1, 0x50 -/* 802CAF2C 002C7E8C 4E 80 00 20 */ blr +/* 802CAF2C 002C7E8C 4E 80 00 20 */ blr .global __ct__Q210CGuiWidget15CGuiWidgetParmsFP9CGuiFramebssbbbRC6CColorQ210CGuiWidget18EGuiModelDrawFlagsbb __ct__Q210CGuiWidget15CGuiWidgetParmsFP9CGuiFramebssbbbRC6CColorQ210CGuiWidget18EGuiModelDrawFlagsbb: @@ -728,4 +728,4 @@ __ct__Q210CGuiWidget15CGuiWidgetParmsFP9CGuiFramebssbbbRC6CColorQ210CGuiWidget18 /* 802CAF64 002C7EC4 80 06 00 00 */ lwz r0, 0(r6) /* 802CAF68 002C7EC8 90 03 00 10 */ stw r0, 0x10(r3) /* 802CAF6C 002C7ECC 90 A3 00 14 */ stw r5, 0x14(r3) -/* 802CAF70 002C7ED0 4E 80 00 20 */ blr +/* 802CAF70 002C7ED0 4E 80 00 20 */ blr diff --git a/asm/GuiSys/CGuiWidgetIdDB.s b/asm/GuiSys/CGuiWidgetIdDB.s index fa6aa252..6680898d 100644 --- a/asm/GuiSys/CGuiWidgetIdDB.s +++ b/asm/GuiSys/CGuiWidgetIdDB.s @@ -41,7 +41,7 @@ lbl_802CAFDC: /* 802CAFEC 002C7F4C 83 81 00 10 */ lwz r28, 0x10(r1) /* 802CAFF0 002C7F50 7C 08 03 A6 */ mtlr r0 /* 802CAFF4 002C7F54 38 21 00 20 */ addi r1, r1, 0x20 -/* 802CAFF8 002C7F58 4E 80 00 20 */ blr +/* 802CAFF8 002C7F58 4E 80 00 20 */ blr .global "AddWidget__14CGuiWidgetIdDBFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" "AddWidget__14CGuiWidgetIdDBFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>": @@ -90,7 +90,7 @@ lbl_802CB088: /* 802CB094 002C7FF4 83 C1 00 08 */ lwz r30, 8(r1) /* 802CB098 002C7FF8 7C 08 03 A6 */ mtlr r0 /* 802CB09C 002C7FFC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CB0A0 002C8000 4E 80 00 20 */ blr +/* 802CB0A0 002C8000 4E 80 00 20 */ blr .global sub_802cb0a4 sub_802cb0a4: @@ -103,7 +103,7 @@ sub_802cb0a4: /* 802CB0BC 002C801C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802CB0C0 002C8020 7C 08 03 A6 */ mtlr r0 /* 802CB0C4 002C8024 38 21 00 10 */ addi r1, r1, 0x10 -/* 802CB0C8 002C8028 4E 80 00 20 */ blr +/* 802CB0C8 002C8028 4E 80 00 20 */ blr .global __ct__14CGuiWidgetIdDBFv __ct__14CGuiWidgetIdDBFv: @@ -163,4 +163,4 @@ __ct__14CGuiWidgetIdDBFv: /* 802CB1A0 002C8100 83 E1 00 4C */ lwz r31, 0x4c(r1) /* 802CB1A4 002C8104 7C 08 03 A6 */ mtlr r0 /* 802CB1A8 002C8108 38 21 00 50 */ addi r1, r1, 0x50 -/* 802CB1AC 002C810C 4E 80 00 20 */ blr +/* 802CB1AC 002C810C 4E 80 00 20 */ blr diff --git a/asm/GuiSys/CRepeatState.s b/asm/GuiSys/CRepeatState.s index e656c113..a2a558fe 100644 --- a/asm/GuiSys/CRepeatState.s +++ b/asm/GuiSys/CRepeatState.s @@ -38,4 +38,4 @@ lbl_802CD4B4: sub_802cd4bc: /* 802CD4BC 002CA41C C0 02 C4 70 */ lfs f0, lbl_805AE190@sda21(r2) /* 802CD4C0 002CA420 D0 03 00 00 */ stfs f0, 0(r3) -/* 802CD4C4 002CA424 4E 80 00 20 */ blr +/* 802CD4C4 002CA424 4E 80 00 20 */ blr diff --git a/asm/Kyoto/Alloc/CCircularBuffer.s b/asm/Kyoto/Alloc/CCircularBuffer.s index cbb4a7ca..e6136b72 100644 --- a/asm/Kyoto/Alloc/CCircularBuffer.s +++ b/asm/Kyoto/Alloc/CCircularBuffer.s @@ -15,7 +15,7 @@ GetAllocatedAmount__15CCircularBufferCFv: /* 80315680 003125E0 7C 84 02 14 */ add r4, r4, r0 lbl_80315684: /* 80315684 003125E4 7C 83 23 78 */ mr r3, r4 -/* 80315688 003125E8 4E 80 00 20 */ blr +/* 80315688 003125E8 4E 80 00 20 */ blr .global Free__15CCircularBufferFPvi Free__15CCircularBufferFPvi: @@ -40,15 +40,15 @@ lbl_803156C0: lbl_803156CC: /* 803156CC 0031262C 80 03 00 14 */ lwz r0, 0x14(r3) /* 803156D0 00312630 2C 00 FF FF */ cmpwi r0, -1 -/* 803156D4 00312634 4C 82 00 20 */ bnelr +/* 803156D4 00312634 4C 82 00 20 */ bnelr /* 803156D8 00312638 80 83 00 0C */ lwz r4, 0xc(r3) /* 803156DC 0031263C 80 03 00 10 */ lwz r0, 0x10(r3) /* 803156E0 00312640 7C 04 00 00 */ cmpw r4, r0 -/* 803156E4 00312644 4C 82 00 20 */ bnelr +/* 803156E4 00312644 4C 82 00 20 */ bnelr /* 803156E8 00312648 38 00 00 00 */ li r0, 0 /* 803156EC 0031264C 90 03 00 10 */ stw r0, 0x10(r3) /* 803156F0 00312650 90 03 00 0C */ stw r0, 0xc(r3) -/* 803156F4 00312654 4E 80 00 20 */ blr +/* 803156F4 00312654 4E 80 00 20 */ blr .global Alloc__15CCircularBufferFi Alloc__15CCircularBufferFi: @@ -99,7 +99,7 @@ lbl_80315794: /* 8031579C 003126FC 83 C1 00 08 */ lwz r30, 8(r1) /* 803157A0 00312700 7C 08 03 A6 */ mtlr r0 /* 803157A4 00312704 38 21 00 10 */ addi r1, r1, 0x10 -/* 803157A8 00312708 4E 80 00 20 */ blr +/* 803157A8 00312708 4E 80 00 20 */ blr .global IsWrappedMemory__15CCircularBufferFii IsWrappedMemory__15CCircularBufferFii: @@ -112,10 +112,10 @@ IsWrappedMemory__15CCircularBufferFii: /* 803157C4 00312724 7C 03 00 00 */ cmpw r3, r0 /* 803157C8 00312728 40 80 00 0C */ bge lbl_803157D4 /* 803157CC 0031272C 38 60 00 01 */ li r3, 1 -/* 803157D0 00312730 4E 80 00 20 */ blr +/* 803157D0 00312730 4E 80 00 20 */ blr lbl_803157D4: /* 803157D4 00312734 38 60 00 00 */ li r3, 0 -/* 803157D8 00312738 4E 80 00 20 */ blr +/* 803157D8 00312738 4E 80 00 20 */ blr .global __ct__15CCircularBufferFPviQ215CCircularBuffer10EOwnership __ct__15CCircularBufferFPviQ215CCircularBuffer10EOwnership: @@ -131,6 +131,6 @@ __ct__15CCircularBufferFPviQ215CCircularBuffer10EOwnership: /* 80315800 00312760 90 E3 00 0C */ stw r7, 0xc(r3) /* 80315804 00312764 90 E3 00 10 */ stw r7, 0x10(r3) /* 80315808 00312768 90 03 00 14 */ stw r0, 0x14(r3) -/* 8031580C 0031276C 4C 82 00 20 */ bnelr +/* 8031580C 0031276C 4C 82 00 20 */ bnelr /* 80315810 00312770 98 E3 00 00 */ stb r7, 0(r3) /* 80315814 00312774 4E 80 00 20 */ blr diff --git a/asm/Kyoto/Alloc/CGameAllocator.s b/asm/Kyoto/Alloc/CGameAllocator.s index 38cb49af..d7bb6584 100644 --- a/asm/Kyoto/Alloc/CGameAllocator.s +++ b/asm/Kyoto/Alloc/CGameAllocator.s @@ -50,7 +50,7 @@ OffsetFakeStatics__14CGameAllocatorFi: /* 80351138 0034E098 80 03 00 B8 */ lwz r0, 0xb8(r3) /* 8035113C 0034E09C 7C 00 22 14 */ add r0, r0, r4 /* 80351140 0034E0A0 90 03 00 B8 */ stw r0, 0xb8(r3) -/* 80351144 0034E0A4 4E 80 00 20 */ blr +/* 80351144 0034E0A4 4E 80 00 20 */ blr .global GetLargestFreeChunk__14CGameAllocatorCFv GetLargestFreeChunk__14CGameAllocatorCFv: @@ -71,7 +71,7 @@ lbl_80351170: lbl_80351178: /* 80351178 0034E0D8 28 04 00 00 */ cmplwi r4, 0 /* 8035117C 0034E0DC 40 82 FF D8 */ bne lbl_80351154 -/* 80351180 0034E0E0 4E 80 00 20 */ blr +/* 80351180 0034E0E0 4E 80 00 20 */ blr .global DumpAllocations__14CGameAllocatorCFv DumpAllocations__14CGameAllocatorCFv: @@ -106,7 +106,7 @@ lbl_803511D8: /* 803511E8 0034E148 83 C1 00 08 */ lwz r30, 8(r1) /* 803511EC 0034E14C 7C 08 03 A6 */ mtlr r0 /* 803511F0 0034E150 38 21 00 10 */ addi r1, r1, 0x10 -/* 803511F4 0034E154 4E 80 00 20 */ blr +/* 803511F4 0034E154 4E 80 00 20 */ blr .global RemoveFreeEntryFromFreeList__14CGameAllocatorFPQ214CGameAllocator12SGameMemInfo RemoveFreeEntryFromFreeList__14CGameAllocatorFPQ214CGameAllocator12SGameMemInfo: @@ -155,7 +155,7 @@ lbl_80351284: /* 8035128C 0034E1EC 83 C1 00 08 */ lwz r30, 8(r1) /* 80351290 0034E1F0 7C 08 03 A6 */ mtlr r0 /* 80351294 0034E1F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80351298 0034E1F8 4E 80 00 20 */ blr +/* 80351298 0034E1F8 4E 80 00 20 */ blr .global AddFreeEntryToFreeList__14CGameAllocatorFPQ214CGameAllocator12SGameMemInfo AddFreeEntryToFreeList__14CGameAllocatorFPQ214CGameAllocator12SGameMemInfo: @@ -182,7 +182,7 @@ AddFreeEntryToFreeList__14CGameAllocatorFPQ214CGameAllocator12SGameMemInfo: /* 803512EC 0034E24C 83 C1 00 08 */ lwz r30, 8(r1) /* 803512F0 0034E250 7C 08 03 A6 */ mtlr r0 /* 803512F4 0034E254 38 21 00 10 */ addi r1, r1, 0x10 -/* 803512F8 0034E258 4E 80 00 20 */ blr +/* 803512F8 0034E258 4E 80 00 20 */ blr .global GetFreeBinEntryForSize__14CGameAllocatorFUi GetFreeBinEntryForSize__14CGameAllocatorFUi: @@ -194,7 +194,7 @@ lbl_8035130C: /* 8035130C 0034E26C 7C 03 20 40 */ cmplw r3, r4 /* 80351310 0034E270 40 80 00 0C */ bge lbl_8035131C /* 80351314 0034E274 7C A3 2B 78 */ mr r3, r5 -/* 80351318 0034E278 4E 80 00 20 */ blr +/* 80351318 0034E278 4E 80 00 20 */ blr lbl_8035131C: /* 8035131C 0034E27C 54 84 08 3C */ slwi r4, r4, 1 /* 80351320 0034E280 38 A5 00 01 */ addi r5, r5, 1 @@ -202,7 +202,7 @@ lbl_80351324: /* 80351324 0034E284 7C 04 00 40 */ cmplw r4, r0 /* 80351328 0034E288 41 80 FF E4 */ blt lbl_8035130C /* 8035132C 0034E28C 38 60 00 0F */ li r3, 0xf -/* 80351330 0034E290 4E 80 00 20 */ blr +/* 80351330 0034E290 4E 80 00 20 */ blr .global EnumAllocations__14CGameAllocatorCFPFRCQ210IAllocator10SAllocInfoPCv_CbPCvb EnumAllocations__14CGameAllocatorCFPFRCQ210IAllocator10SAllocInfoPCv_CbPCvb: @@ -251,7 +251,7 @@ lbl_80351394: /* 803513D0 0034E330 91 01 00 14 */ stw r8, 0x14(r1) /* 803513D4 0034E334 91 21 00 18 */ stw r9, 0x18(r1) /* 803513D8 0034E338 7D 89 03 A6 */ mtctr r12 -/* 803513DC 0034E33C 4E 80 04 21 */ bctrl +/* 803513DC 0034E33C 4E 80 04 21 */ bctrl /* 803513E0 0034E340 7F EA FB 78 */ mr r10, r31 /* 803513E4 0034E344 3B DE 00 01 */ addi r30, r30, 1 lbl_803513E8: @@ -266,7 +266,7 @@ lbl_803513F4: /* 80351404 0034E364 83 81 00 20 */ lwz r28, 0x20(r1) /* 80351408 0034E368 7C 08 03 A6 */ mtlr r0 /* 8035140C 0034E36C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80351410 0034E370 4E 80 00 20 */ blr +/* 80351410 0034E370 4E 80 00 20 */ blr .global GetMetrics__14CGameAllocatorCFv GetMetrics__14CGameAllocatorCFv: @@ -382,7 +382,7 @@ lbl_803514F4: /* 80351590 0034E4F0 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 80351594 0034E4F4 7C 08 03 A6 */ mtlr r0 /* 80351598 0034E4F8 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 8035159C 0034E4FC 4E 80 00 20 */ blr +/* 8035159C 0034E4FC 4E 80 00 20 */ blr .global GetAllocInfo__14CGameAllocatorCFPCv GetAllocInfo__14CGameAllocatorCFPCv: @@ -410,17 +410,17 @@ GetAllocInfo__14CGameAllocatorCFPCv: /* 803515F4 0034E554 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803515F8 0034E558 7C 08 03 A6 */ mtlr r0 /* 803515FC 0034E55C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80351600 0034E560 4E 80 00 20 */ blr +/* 80351600 0034E560 4E 80 00 20 */ blr .global SetOutOfMemoryCallback__14CGameAllocatorFPFPCvUi_CbPCv SetOutOfMemoryCallback__14CGameAllocatorFPFPCvUi_CbPCv: /* 80351604 0034E564 90 83 00 58 */ stw r4, 0x58(r3) /* 80351608 0034E568 90 A3 00 5C */ stw r5, 0x5c(r3) -/* 8035160C 0034E56C 4E 80 00 20 */ blr +/* 8035160C 0034E56C 4E 80 00 20 */ blr .global ReleaseAllSecondary__14CGameAllocatorFv ReleaseAllSecondary__14CGameAllocatorFv: -/* 80351610 0034E570 4E 80 00 20 */ blr +/* 80351610 0034E570 4E 80 00 20 */ blr .global FreeSecondary__14CGameAllocatorFPCv FreeSecondary__14CGameAllocatorFPCv: @@ -430,11 +430,11 @@ FreeSecondary__14CGameAllocatorFPCv: /* 80351620 0034E580 81 83 00 00 */ lwz r12, 0(r3) /* 80351624 0034E584 81 8C 00 18 */ lwz r12, 0x18(r12) /* 80351628 0034E588 7D 89 03 A6 */ mtctr r12 -/* 8035162C 0034E58C 4E 80 04 21 */ bctrl +/* 8035162C 0034E58C 4E 80 04 21 */ bctrl /* 80351630 0034E590 80 01 00 14 */ lwz r0, 0x14(r1) /* 80351634 0034E594 7C 08 03 A6 */ mtlr r0 /* 80351638 0034E598 38 21 00 10 */ addi r1, r1, 0x10 -/* 8035163C 0034E59C 4E 80 00 20 */ blr +/* 8035163C 0034E59C 4E 80 00 20 */ blr .global AllocSecondary__14CGameAllocatorFUlQ210IAllocator5EHintQ210IAllocator6EScopeQ210IAllocator5ETypeRC10CCallStack AllocSecondary__14CGameAllocatorFUlQ210IAllocator5EHintQ210IAllocator6EScopeQ210IAllocator5ETypeRC10CCallStack: @@ -444,11 +444,11 @@ AllocSecondary__14CGameAllocatorFUlQ210IAllocator5EHintQ210IAllocator6EScopeQ210 /* 8035164C 0034E5AC 81 83 00 00 */ lwz r12, 0(r3) /* 80351650 0034E5B0 81 8C 00 14 */ lwz r12, 0x14(r12) /* 80351654 0034E5B4 7D 89 03 A6 */ mtctr r12 -/* 80351658 0034E5B8 4E 80 04 21 */ bctrl +/* 80351658 0034E5B8 4E 80 04 21 */ bctrl /* 8035165C 0034E5BC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80351660 0034E5C0 7C 08 03 A6 */ mtlr r0 /* 80351664 0034E5C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80351668 0034E5C8 4E 80 00 20 */ blr +/* 80351668 0034E5C8 4E 80 00 20 */ blr .global ReleaseAll__14CGameAllocatorFv ReleaseAll__14CGameAllocatorFv: @@ -492,7 +492,7 @@ lbl_803516D4: /* 803516F0 0034E650 80 01 00 14 */ lwz r0, 0x14(r1) /* 803516F4 0034E654 7C 08 03 A6 */ mtlr r0 /* 803516F8 0034E658 38 21 00 10 */ addi r1, r1, 0x10 -/* 803516FC 0034E65C 4E 80 00 20 */ blr +/* 803516FC 0034E65C 4E 80 00 20 */ blr .global FreeNormalAllocation__14CGameAllocatorFPCv FreeNormalAllocation__14CGameAllocatorFPCv: @@ -614,7 +614,7 @@ lbl_803518A8: /* 803518B0 0034E810 80 01 00 34 */ lwz r0, 0x34(r1) /* 803518B4 0034E814 7C 08 03 A6 */ mtlr r0 /* 803518B8 0034E818 38 21 00 30 */ addi r1, r1, 0x30 -/* 803518BC 0034E81C 4E 80 00 20 */ blr +/* 803518BC 0034E81C 4E 80 00 20 */ blr .global Free__14CGameAllocatorFPCv Free__14CGameAllocatorFPCv: @@ -663,7 +663,7 @@ lbl_80351950: /* 80351958 0034E8B8 83 C1 00 08 */ lwz r30, 8(r1) /* 8035195C 0034E8BC 7C 08 03 A6 */ mtlr r0 /* 80351960 0034E8C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80351964 0034E8C4 4E 80 00 20 */ blr +/* 80351964 0034E8C4 4E 80 00 20 */ blr .global UpdateAllocDebugStats__14CGameAllocatorFUiUiUi UpdateAllocDebugStats__14CGameAllocatorFUiUiUi: @@ -713,11 +713,11 @@ lbl_803519F0: /* 80351A04 0034E964 7C 04 02 14 */ add r0, r4, r0 /* 80351A08 0034E968 7C 00 33 96 */ divwu r0, r0, r6 /* 80351A0C 0034E96C 90 03 00 A4 */ stw r0, 0xa4(r3) -/* 80351A10 0034E970 4D 81 00 20 */ bgtlr +/* 80351A10 0034E970 4D 81 00 20 */ bgtlr /* 80351A14 0034E974 80 83 00 A8 */ lwz r4, 0xa8(r3) /* 80351A18 0034E978 38 04 00 01 */ addi r0, r4, 1 /* 80351A1C 0034E97C 90 03 00 A8 */ stw r0, 0xa8(r3) -/* 80351A20 0034E980 4E 80 00 20 */ blr +/* 80351A20 0034E980 4E 80 00 20 */ blr .global FixupAllocPtrs__14CGameAllocatorFPQ214CGameAllocator12SGameMemInfoUiUiQ210IAllocator5EHintRC10CCallStack FixupAllocPtrs__14CGameAllocatorFPQ214CGameAllocator12SGameMemInfoUiUiQ210IAllocator5EHintRC10CCallStack: @@ -861,7 +861,7 @@ lbl_80351C00: /* 80351C30 0034EB90 80 01 00 74 */ lwz r0, 0x74(r1) /* 80351C34 0034EB94 7C 08 03 A6 */ mtlr r0 /* 80351C38 0034EB98 38 21 00 70 */ addi r1, r1, 0x70 -/* 80351C3C 0034EB9C 4E 80 00 20 */ blr +/* 80351C3C 0034EB9C 4E 80 00 20 */ blr .global FindFreeBlockFromTopOfHeap__14CGameAllocatorFUi FindFreeBlockFromTopOfHeap__14CGameAllocatorFUi: @@ -894,7 +894,7 @@ lbl_80351C88: /* 80351C98 0034EBF8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80351C9C 0034EBFC 7C 08 03 A6 */ mtlr r0 /* 80351CA0 0034EC00 38 21 00 10 */ addi r1, r1, 0x10 -/* 80351CA4 0034EC04 4E 80 00 20 */ blr +/* 80351CA4 0034EC04 4E 80 00 20 */ blr .global FindFreeBlock__14CGameAllocatorFUi FindFreeBlock__14CGameAllocatorFUi: @@ -980,7 +980,7 @@ lbl_80351DB0: /* 80351DC0 0034ED20 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80351DC4 0034ED24 7C 08 03 A6 */ mtlr r0 /* 80351DC8 0034ED28 38 21 00 20 */ addi r1, r1, 0x20 -/* 80351DCC 0034ED2C 4E 80 00 20 */ blr +/* 80351DCC 0034ED2C 4E 80 00 20 */ blr .global Alloc__14CGameAllocatorFUlQ210IAllocator5EHintQ210IAllocator6EScopeQ210IAllocator5ETypeRC10CCallStack Alloc__14CGameAllocatorFUlQ210IAllocator5EHintQ210IAllocator6EScopeQ210IAllocator5ETypeRC10CCallStack: @@ -1104,7 +1104,7 @@ lbl_80351F38: /* 80351F84 0034EEE4 38 C0 00 01 */ li r6, 1 /* 80351F88 0034EEE8 38 E0 00 00 */ li r7, 0 /* 80351F8C 0034EEEC 7D 89 03 A6 */ mtctr r12 -/* 80351F90 0034EEF0 4E 80 04 21 */ bctrl +/* 80351F90 0034EEF0 4E 80 04 21 */ bctrl /* 80351F94 0034EEF4 7C 60 1B 78 */ mr r0, r3 /* 80351F98 0034EEF8 80 7F 00 74 */ lwz r3, 0x74(r31) /* 80351F9C 0034EEFC 7C 05 03 78 */ mr r5, r0 @@ -1163,7 +1163,7 @@ lbl_80352040: /* 80352058 0034EFB8 7F 44 D3 78 */ mr r4, r26 /* 8035205C 0034EFBC 80 7F 00 5C */ lwz r3, 0x5c(r31) /* 80352060 0034EFC0 7D 89 03 A6 */ mtctr r12 -/* 80352064 0034EFC4 4E 80 04 21 */ bctrl +/* 80352064 0034EFC4 4E 80 04 21 */ bctrl /* 80352068 0034EFC8 88 0D AA 2A */ lbz r0, lbl_805A95EA@sda21(r13) /* 8035206C 0034EFCC 7C 00 07 75 */ extsb. r0, r0 /* 80352070 0034EFD0 40 82 00 14 */ bne lbl_80352084 @@ -1186,7 +1186,7 @@ lbl_80352084: /* 803520B0 0034F010 7F C8 F3 78 */ mr r8, r30 /* 803520B4 0034F014 81 8C 00 14 */ lwz r12, 0x14(r12) /* 803520B8 0034F018 7D 89 03 A6 */ mtctr r12 -/* 803520BC 0034F01C 4E 80 04 21 */ bctrl +/* 803520BC 0034F01C 4E 80 04 21 */ bctrl /* 803520C0 0034F020 38 00 00 00 */ li r0, 0 /* 803520C4 0034F024 98 0D AA 29 */ stb r0, lbl_805A95E9@sda21(r13) /* 803520C8 0034F028 48 00 00 0C */ b lbl_803520D4 @@ -1237,7 +1237,7 @@ lbl_80352164: /* 80352168 0034F0C8 80 01 00 44 */ lwz r0, 0x44(r1) /* 8035216C 0034F0CC 7C 08 03 A6 */ mtlr r0 /* 80352170 0034F0D0 38 21 00 40 */ addi r1, r1, 0x40 -/* 80352174 0034F0D4 4E 80 00 20 */ blr +/* 80352174 0034F0D4 4E 80 00 20 */ blr .global Shutdown__14CGameAllocatorFv Shutdown__14CGameAllocatorFv: @@ -1249,7 +1249,7 @@ Shutdown__14CGameAllocatorFv: /* 8035218C 0034F0EC 81 83 00 00 */ lwz r12, 0(r3) /* 80352190 0034F0F0 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80352194 0034F0F4 7D 89 03 A6 */ mtctr r12 -/* 80352198 0034F0F8 4E 80 04 21 */ bctrl +/* 80352198 0034F0F8 4E 80 04 21 */ bctrl /* 8035219C 0034F0FC 38 00 00 00 */ li r0, 0 /* 803521A0 0034F100 98 1F 00 04 */ stb r0, 4(r31) /* 803521A4 0034F104 90 1F 00 54 */ stw r0, 0x54(r31) @@ -1257,7 +1257,7 @@ Shutdown__14CGameAllocatorFv: /* 803521AC 0034F10C 80 01 00 14 */ lwz r0, 0x14(r1) /* 803521B0 0034F110 7C 08 03 A6 */ mtlr r0 /* 803521B4 0034F114 38 21 00 10 */ addi r1, r1, 0x10 -/* 803521B8 0034F118 4E 80 00 20 */ blr +/* 803521B8 0034F118 4E 80 00 20 */ blr .global Initialize__14CGameAllocatorFR10COsContext Initialize__14CGameAllocatorFR10COsContext: @@ -1386,7 +1386,7 @@ Initialize__14CGameAllocatorFR10COsContext: /* 803523A4 0034F304 38 C0 00 01 */ li r6, 1 /* 803523A8 0034F308 38 E0 00 00 */ li r7, 0 /* 803523AC 0034F30C 7D 89 03 A6 */ mtctr r12 -/* 803523B0 0034F310 4E 80 04 21 */ bctrl +/* 803523B0 0034F310 4E 80 04 21 */ bctrl /* 803523B4 0034F314 3C 80 80 3E */ lis r4, lbl_803D8248@ha /* 803523B8 0034F318 90 7F 00 64 */ stw r3, 0x64(r31) /* 803523BC 0034F31C 38 C4 82 48 */ addi r6, r4, lbl_803D8248@l @@ -1405,7 +1405,7 @@ Initialize__14CGameAllocatorFR10COsContext: /* 803523F0 0034F350 38 C0 00 01 */ li r6, 1 /* 803523F4 0034F354 38 E0 00 00 */ li r7, 0 /* 803523F8 0034F358 7D 89 03 A6 */ mtctr r12 -/* 803523FC 0034F35C 4E 80 04 21 */ bctrl +/* 803523FC 0034F35C 4E 80 04 21 */ bctrl /* 80352400 0034F360 3C 80 80 3E */ lis r4, lbl_803D8248@ha /* 80352404 0034F364 90 7F 00 68 */ stw r3, 0x68(r31) /* 80352408 0034F368 38 C4 82 48 */ addi r6, r4, lbl_803D8248@l @@ -1423,7 +1423,7 @@ Initialize__14CGameAllocatorFR10COsContext: /* 80352438 0034F398 38 C0 00 01 */ li r6, 1 /* 8035243C 0034F39C 38 E0 00 00 */ li r7, 0 /* 80352440 0034F3A0 7D 89 03 A6 */ mtctr r12 -/* 80352444 0034F3A4 4E 80 04 21 */ bctrl +/* 80352444 0034F3A4 4E 80 04 21 */ bctrl /* 80352448 0034F3A8 7C 60 1B 79 */ or. r0, r3, r3 /* 8035244C 0034F3AC 41 82 00 1C */ beq lbl_80352468 /* 80352450 0034F3B0 3C 80 00 03 */ lis r4, 0x0002C000@ha @@ -1450,7 +1450,7 @@ lbl_80352468: /* 803524A0 0034F400 38 C0 00 01 */ li r6, 1 /* 803524A4 0034F404 38 E0 00 00 */ li r7, 0 /* 803524A8 0034F408 7D 89 03 A6 */ mtctr r12 -/* 803524AC 0034F40C 4E 80 04 21 */ bctrl +/* 803524AC 0034F40C 4E 80 04 21 */ bctrl /* 803524B0 0034F410 7C 60 1B 79 */ or. r0, r3, r3 /* 803524B4 0034F414 41 82 00 0C */ beq lbl_803524C0 /* 803524B8 0034F418 4B FF E8 AD */ bl __ct__16CMediumAllocPoolFv @@ -1474,7 +1474,7 @@ lbl_803524C0: /* 803524FC 0034F45C 38 C0 00 01 */ li r6, 1 /* 80352500 0034F460 38 E0 00 00 */ li r7, 0 /* 80352504 0034F464 7D 89 03 A6 */ mtctr r12 -/* 80352508 0034F468 4E 80 04 21 */ bctrl +/* 80352508 0034F468 4E 80 04 21 */ bctrl /* 8035250C 0034F46C 90 7F 00 78 */ stw r3, 0x78(r31) /* 80352510 0034F470 3C 60 00 0C */ lis r3, 0x000C6000@ha /* 80352514 0034F474 38 03 60 00 */ addi r0, r3, 0x000C6000@l @@ -1488,7 +1488,7 @@ lbl_803524C0: /* 80352534 0034F494 80 01 00 84 */ lwz r0, 0x84(r1) /* 80352538 0034F498 7C 08 03 A6 */ mtlr r0 /* 8035253C 0034F49C 38 21 00 80 */ addi r1, r1, 0x80 -/* 80352540 0034F4A0 4E 80 00 20 */ blr +/* 80352540 0034F4A0 4E 80 00 20 */ blr .global __dt__14CGameAllocatorFv __dt__14CGameAllocatorFv: @@ -1527,7 +1527,7 @@ lbl_803525B0: /* 803525BC 0034F51C 83 C1 00 08 */ lwz r30, 8(r1) /* 803525C0 0034F520 7C 08 03 A6 */ mtlr r0 /* 803525C4 0034F524 38 21 00 10 */ addi r1, r1, 0x10 -/* 803525C8 0034F528 4E 80 00 20 */ blr +/* 803525C8 0034F528 4E 80 00 20 */ blr .global __ct__14CGameAllocatorFv __ct__14CGameAllocatorFv: @@ -1567,7 +1567,7 @@ __ct__14CGameAllocatorFv: /* 80352650 0034F5B0 90 03 00 B4 */ stw r0, 0xb4(r3) /* 80352654 0034F5B4 90 03 00 B8 */ stw r0, 0xb8(r3) /* 80352658 0034F5B8 90 03 00 BC */ stw r0, 0xbc(r3) -/* 8035265C 0034F5BC 4E 80 00 20 */ blr +/* 8035265C 0034F5BC 4E 80 00 20 */ blr .global GetMemInfoFromBlockPtr__14CGameAllocatorCFPCv GetMemInfoFromBlockPtr__14CGameAllocatorCFPCv: diff --git a/asm/Kyoto/Alloc/CMediumAllocPool.s b/asm/Kyoto/Alloc/CMediumAllocPool.s index 5054f1b9..a6b72bb9 100644 --- a/asm/Kyoto/Alloc/CMediumAllocPool.s +++ b/asm/Kyoto/Alloc/CMediumAllocPool.s @@ -22,10 +22,10 @@ lbl_8035056C: /* 80350574 0034D4D4 28 00 00 01 */ cmplwi r0, 1 /* 80350578 0034D4D8 98 83 00 00 */ stb r4, 0(r3) /* 8035057C 0034D4DC 54 84 06 3E */ clrlwi r4, r4, 0x18 -/* 80350580 0034D4E0 4C 81 00 20 */ blelr +/* 80350580 0034D4E0 4C 81 00 20 */ blelr /* 80350584 0034D4E4 7C 63 02 14 */ add r3, r3, r0 /* 80350588 0034D4E8 98 83 FF FF */ stb r4, -1(r3) -/* 8035058C 0034D4EC 4E 80 00 20 */ blr +/* 8035058C 0034D4EC 4E 80 00 20 */ blr lbl_80350590: /* 80350590 0034D4F0 54 80 C6 3E */ rlwinm r0, r4, 0x18, 0x18, 0x1f /* 80350594 0034D4F4 7C A3 2A 14 */ add r5, r3, r5 @@ -34,7 +34,7 @@ lbl_80350590: /* 803505A0 0034D500 98 83 00 01 */ stb r4, 1(r3) /* 803505A4 0034D504 98 85 FF FE */ stb r4, -2(r5) /* 803505A8 0034D508 98 05 FF FF */ stb r0, -1(r5) -/* 803505AC 0034D50C 4E 80 00 20 */ blr +/* 803505AC 0034D50C 4E 80 00 20 */ blr .global sub_803505b0 sub_803505b0: @@ -52,7 +52,7 @@ lbl_803505C8: /* 803505D4 0034D534 7C 63 02 14 */ add r3, r3, r0 /* 803505D8 0034D538 54 60 04 65 */ rlwinm. r0, r3, 0, 0x11, 0x12 /* 803505DC 0034D53C 54 63 04 3E */ clrlwi r3, r3, 0x10 -/* 803505E0 0034D540 4D 82 00 20 */ beqlr +/* 803505E0 0034D540 4D 82 00 20 */ beqlr /* 803505E4 0034D544 28 00 60 00 */ cmplwi r0, 0x6000 /* 803505E8 0034D548 40 82 00 0C */ bne lbl_803505F4 /* 803505EC 0034D54C 38 00 00 03 */ li r0, 3 @@ -64,7 +64,7 @@ lbl_803505F4: /* 80350600 0034D560 38 03 00 01 */ addi r0, r3, 1 lbl_80350604: /* 80350604 0034D564 54 03 04 3E */ clrlwi r3, r0, 0x10 -/* 80350608 0034D568 4E 80 00 20 */ blr +/* 80350608 0034D568 4E 80 00 20 */ blr .global sub_8035060c sub_8035060c: @@ -155,7 +155,7 @@ lbl_80350734: /* 80350738 0034D698 80 01 00 24 */ lwz r0, 0x24(r1) /* 8035073C 0034D69C 7C 08 03 A6 */ mtlr r0 /* 80350740 0034D6A0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80350744 0034D6A4 4E 80 00 20 */ blr +/* 80350744 0034D6A4 4E 80 00 20 */ blr .global sub_80350748 sub_80350748: @@ -224,7 +224,7 @@ lbl_80350814: /* 80350818 0034D778 80 01 00 24 */ lwz r0, 0x24(r1) /* 8035081C 0034D77C 7C 08 03 A6 */ mtlr r0 /* 80350820 0034D780 38 21 00 20 */ addi r1, r1, 0x20 -/* 80350824 0034D784 4E 80 00 20 */ blr +/* 80350824 0034D784 4E 80 00 20 */ blr .global FindFree__16CMediumAllocPoolFi FindFree__16CMediumAllocPoolFi: @@ -261,7 +261,7 @@ lbl_80350890: /* 80350898 0034D7F8 83 C1 00 08 */ lwz r30, 8(r1) /* 8035089C 0034D7FC 7C 08 03 A6 */ mtlr r0 /* 803508A0 0034D800 38 21 00 10 */ addi r1, r1, 0x10 -/* 803508A4 0034D804 4E 80 00 20 */ blr +/* 803508A4 0034D804 4E 80 00 20 */ blr .global __dt__18SMediumAllocPuddleFv __dt__18SMediumAllocPuddleFv: @@ -291,7 +291,7 @@ lbl_803508F0: /* 803508FC 0034D85C 83 C1 00 08 */ lwz r30, 8(r1) /* 80350900 0034D860 7C 08 03 A6 */ mtlr r0 /* 80350904 0034D864 38 21 00 10 */ addi r1, r1, 0x10 -/* 80350908 0034D868 4E 80 00 20 */ blr +/* 80350908 0034D868 4E 80 00 20 */ blr .global __ct__18SMediumAllocPuddleFUiPvPv __ct__18SMediumAllocPuddleFUiPvPv: @@ -327,7 +327,7 @@ __ct__18SMediumAllocPuddleFUiPvPv: /* 80350980 0034D8E0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80350984 0034D8E4 7C 08 03 A6 */ mtlr r0 /* 80350988 0034D8E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8035098C 0034D8EC 4E 80 00 20 */ blr +/* 8035098C 0034D8EC 4E 80 00 20 */ blr .global AddPuddle__16CMediumAllocPoolFUiPvPvi AddPuddle__16CMediumAllocPoolFUiPvPvi: @@ -353,7 +353,7 @@ AddPuddle__16CMediumAllocPoolFUiPvPvi: /* 803509DC 0034D93C 80 01 00 44 */ lwz r0, 0x44(r1) /* 803509E0 0034D940 7C 08 03 A6 */ mtlr r0 /* 803509E4 0034D944 38 21 00 40 */ addi r1, r1, 0x40 -/* 803509E8 0034D948 4E 80 00 20 */ blr +/* 803509E8 0034D948 4E 80 00 20 */ blr .global sub_803509ec sub_803509ec: @@ -366,7 +366,7 @@ sub_803509ec: /* 80350A04 0034D964 80 01 00 14 */ lwz r0, 0x14(r1) /* 80350A08 0034D968 7C 08 03 A6 */ mtlr r0 /* 80350A0C 0034D96C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80350A10 0034D970 4E 80 00 20 */ blr +/* 80350A10 0034D970 4E 80 00 20 */ blr .global "do_insert_before__Q24rstl53list<18SMediumAllocPuddle,Q24rstl17rmemory_allocator>FPQ34rstl53list<18SMediumAllocPuddle,Q24rstl17rmemory_allocator>4nodeRC18SMediumAllocPuddle" "do_insert_before__Q24rstl53list<18SMediumAllocPuddle,Q24rstl17rmemory_allocator>FPQ34rstl53list<18SMediumAllocPuddle,Q24rstl17rmemory_allocator>4nodeRC18SMediumAllocPuddle": @@ -433,7 +433,7 @@ lbl_80350ACC: /* 80350AF8 0034DA58 83 81 00 10 */ lwz r28, 0x10(r1) /* 80350AFC 0034DA5C 7C 08 03 A6 */ mtlr r0 /* 80350B00 0034DA60 38 21 00 20 */ addi r1, r1, 0x20 -/* 80350B04 0034DA64 4E 80 00 20 */ blr +/* 80350B04 0034DA64 4E 80 00 20 */ blr .global GetNumBlocksAvailable__16CMediumAllocPoolFv GetNumBlocksAvailable__16CMediumAllocPoolFv: @@ -449,7 +449,7 @@ lbl_80350B24: /* 80350B24 0034DA84 7C 04 18 40 */ cmplw r4, r3 /* 80350B28 0034DA88 40 82 FF F0 */ bne lbl_80350B18 /* 80350B2C 0034DA8C 7C A3 2B 78 */ mr r3, r5 -/* 80350B30 0034DA90 4E 80 00 20 */ blr +/* 80350B30 0034DA90 4E 80 00 20 */ blr .global GetTotalEntries__16CMediumAllocPoolFv GetTotalEntries__16CMediumAllocPoolFv: @@ -465,7 +465,7 @@ lbl_80350B50: /* 80350B50 0034DAB0 7C 04 18 40 */ cmplw r4, r3 /* 80350B54 0034DAB4 40 82 FF F0 */ bne lbl_80350B44 /* 80350B58 0034DAB8 7C A3 2B 78 */ mr r3, r5 -/* 80350B5C 0034DABC 4E 80 00 20 */ blr +/* 80350B5C 0034DABC 4E 80 00 20 */ blr .global GetNumAllocs__16CMediumAllocPoolFv GetNumAllocs__16CMediumAllocPoolFv: @@ -481,7 +481,7 @@ lbl_80350B7C: /* 80350B7C 0034DADC 7C 04 18 40 */ cmplw r4, r3 /* 80350B80 0034DAE0 40 82 FF F0 */ bne lbl_80350B70 /* 80350B84 0034DAE4 7C A3 2B 78 */ mr r3, r5 -/* 80350B88 0034DAE8 4E 80 00 20 */ blr +/* 80350B88 0034DAE8 4E 80 00 20 */ blr .global Free__16CMediumAllocPoolFPCv Free__16CMediumAllocPoolFPCv: @@ -533,7 +533,7 @@ lbl_80350C20: /* 80350C28 0034DB88 83 C1 00 08 */ lwz r30, 8(r1) /* 80350C2C 0034DB8C 7C 08 03 A6 */ mtlr r0 /* 80350C30 0034DB90 38 21 00 10 */ addi r1, r1, 0x10 -/* 80350C34 0034DB94 4E 80 00 20 */ blr +/* 80350C34 0034DB94 4E 80 00 20 */ blr .global Alloc__16CMediumAllocPoolFUi Alloc__16CMediumAllocPoolFUi: @@ -582,7 +582,7 @@ lbl_80350CC0: /* 80350CCC 0034DC2C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80350CD0 0034DC30 7C 08 03 A6 */ mtlr r0 /* 80350CD4 0034DC34 38 21 00 20 */ addi r1, r1, 0x20 -/* 80350CD8 0034DC38 4E 80 00 20 */ blr +/* 80350CD8 0034DC38 4E 80 00 20 */ blr .global sub_80350cdc sub_80350cdc: @@ -590,7 +590,7 @@ sub_80350cdc: /* 80350CE0 0034DC40 7C 03 00 D0 */ neg r0, r3 /* 80350CE4 0034DC44 7C 00 1B 78 */ or r0, r0, r3 /* 80350CE8 0034DC48 54 03 0F FE */ srwi r3, r0, 0x1f -/* 80350CEC 0034DC4C 4E 80 00 20 */ blr +/* 80350CEC 0034DC4C 4E 80 00 20 */ blr .global ClearPuddles__16CMediumAllocPoolFv ClearPuddles__16CMediumAllocPoolFv: @@ -626,7 +626,7 @@ lbl_80350D3C: /* 80350D54 0034DCB4 83 C1 00 08 */ lwz r30, 8(r1) /* 80350D58 0034DCB8 7C 08 03 A6 */ mtlr r0 /* 80350D5C 0034DCBC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80350D60 0034DCC0 4E 80 00 20 */ blr +/* 80350D60 0034DCC0 4E 80 00 20 */ blr .global __ct__16CMediumAllocPoolFv __ct__16CMediumAllocPoolFv: @@ -640,7 +640,7 @@ __ct__16CMediumAllocPoolFv: /* 80350D80 0034DCE0 80 03 00 04 */ lwz r0, 4(r3) /* 80350D84 0034DCE4 90 03 00 18 */ stw r0, 0x18(r3) /* 80350D88 0034DCE8 90 6D AA 18 */ stw r3, lbl_805A95D8@sda21(r13) -/* 80350D8C 0034DCEC 4E 80 00 20 */ blr +/* 80350D8C 0034DCEC 4E 80 00 20 */ blr .global "erase__Q24rstl53list<18SMediumAllocPuddle,Q24rstl17rmemory_allocator>FRCQ34rstl53list<18SMediumAllocPuddle,Q24rstl17rmemory_allocator>8iteratorRCQ34rstl53list<18SMediumAllocPuddle,Q24rstl17rmemory_allocator>8iterator" "erase__Q24rstl53list<18SMediumAllocPuddle,Q24rstl17rmemory_allocator>FRCQ34rstl53list<18SMediumAllocPuddle,Q24rstl17rmemory_allocator>8iteratorRCQ34rstl53list<18SMediumAllocPuddle,Q24rstl17rmemory_allocator>8iterator": diff --git a/asm/Kyoto/Alloc/CMemory.s b/asm/Kyoto/Alloc/CMemory.s index f4d74ee3..447d31ce 100644 --- a/asm/Kyoto/Alloc/CMemory.s +++ b/asm/Kyoto/Alloc/CMemory.s @@ -8,7 +8,7 @@ lbl_804BFD58: .global lbl_804BFD64 lbl_804BFD64: .skip 0xC4 - + .section .sdata .global lbl_805A8868 @@ -53,7 +53,7 @@ __nwa__FUlPCcPCc: /* 8031585C 003127BC 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80315860 003127C0 7C 08 03 A6 */ mtlr r0 /* 80315864 003127C4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80315868 003127C8 4E 80 00 20 */ blr +/* 80315868 003127C8 4E 80 00 20 */ blr .global __nw__FUlPCcPCc __nw__FUlPCcPCc: @@ -77,7 +77,7 @@ __nw__FUlPCcPCc: /* 803158B0 00312810 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 803158B4 00312814 7C 08 03 A6 */ mtlr r0 /* 803158B8 00312818 38 21 00 20 */ addi r1, r1, 0x20 -/* 803158BC 0031281C 4E 80 00 20 */ blr +/* 803158BC 0031281C 4E 80 00 20 */ blr .global OffsetFakeStatics__7CMemoryFi OffsetFakeStatics__7CMemoryFi: @@ -89,11 +89,11 @@ OffsetFakeStatics__7CMemoryFi: /* 803158D4 00312834 81 83 00 00 */ lwz r12, 0(r3) /* 803158D8 00312838 81 8C 00 38 */ lwz r12, 0x38(r12) /* 803158DC 0031283C 7D 89 03 A6 */ mtctr r12 -/* 803158E0 00312840 4E 80 04 21 */ bctrl +/* 803158E0 00312840 4E 80 04 21 */ bctrl /* 803158E4 00312844 80 01 00 14 */ lwz r0, 0x14(r1) /* 803158E8 00312848 7C 08 03 A6 */ mtlr r0 /* 803158EC 0031284C 38 21 00 10 */ addi r1, r1, 0x10 -/* 803158F0 00312850 4E 80 00 20 */ blr +/* 803158F0 00312850 4E 80 00 20 */ blr .global SetOutOfMemoryCallback__7CMemoryFPFPCvUi_CbPCv SetOutOfMemoryCallback__7CMemoryFPFPCvUi_CbPCv: @@ -107,11 +107,11 @@ SetOutOfMemoryCallback__7CMemoryFPFPCvUi_CbPCv: /* 80315910 00312870 81 83 00 00 */ lwz r12, 0(r3) /* 80315914 00312874 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80315918 00312878 7D 89 03 A6 */ mtctr r12 -/* 8031591C 0031287C 4E 80 04 21 */ bctrl +/* 8031591C 0031287C 4E 80 04 21 */ bctrl /* 80315920 00312880 80 01 00 14 */ lwz r0, 0x14(r1) /* 80315924 00312884 7C 08 03 A6 */ mtlr r0 /* 80315928 00312888 38 21 00 10 */ addi r1, r1, 0x10 -/* 8031592C 0031288C 4E 80 00 20 */ blr +/* 8031592C 0031288C 4E 80 00 20 */ blr .global Free__7CMemoryFPCv Free__7CMemoryFPCv: @@ -132,7 +132,7 @@ Free__7CMemoryFPCv: /* 80315968 003128C8 81 83 00 00 */ lwz r12, 0(r3) /* 8031596C 003128CC 81 8C 00 18 */ lwz r12, 0x18(r12) /* 80315970 003128D0 7D 89 03 A6 */ mtctr r12 -/* 80315974 003128D4 4E 80 04 21 */ bctrl +/* 80315974 003128D4 4E 80 04 21 */ bctrl lbl_80315978: /* 80315978 003128D8 88 61 00 08 */ lbz r3, 8(r1) /* 8031597C 003128DC 48 06 BD 0D */ bl OSRestoreInterrupts @@ -140,7 +140,7 @@ lbl_80315978: /* 80315984 003128E4 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80315988 003128E8 7C 08 03 A6 */ mtlr r0 /* 8031598C 003128EC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80315990 003128F0 4E 80 00 20 */ blr +/* 80315990 003128F0 4E 80 00 20 */ blr .global Alloc__7CMemoryFUlQ210IAllocator5EHintQ210IAllocator6EScopeQ210IAllocator5ETypeRC10CCallStack Alloc__7CMemoryFUlQ210IAllocator5EHintQ210IAllocator6EScopeQ210IAllocator5ETypeRC10CCallStack: @@ -167,7 +167,7 @@ Alloc__7CMemoryFUlQ210IAllocator5EHintQ210IAllocator6EScopeQ210IAllocator5ETypeR /* 803159E4 00312944 81 8C 00 14 */ lwz r12, 0x14(r12) /* 803159E8 00312948 98 01 00 08 */ stb r0, 8(r1) /* 803159EC 0031294C 7D 89 03 A6 */ mtctr r12 -/* 803159F0 00312950 4E 80 04 21 */ bctrl +/* 803159F0 00312950 4E 80 04 21 */ bctrl /* 803159F4 00312954 7C 7F 1B 79 */ or. r31, r3, r3 /* 803159F8 00312958 40 82 00 18 */ bne lbl_80315A10 /* 803159FC 0031295C 3C 60 80 3D */ lis r3, lbl_803D7808@ha @@ -183,7 +183,7 @@ lbl_80315A10: /* 80315A20 00312980 80 01 00 34 */ lwz r0, 0x34(r1) /* 80315A24 00312984 7C 08 03 A6 */ mtlr r0 /* 80315A28 00312988 38 21 00 30 */ addi r1, r1, 0x30 -/* 80315A2C 0031298C 4E 80 00 20 */ blr +/* 80315A2C 0031298C 4E 80 00 20 */ blr .global Shutdown__7CMemoryFv Shutdown__7CMemoryFv: @@ -197,7 +197,7 @@ Shutdown__7CMemoryFv: /* 80315A4C 003129AC 81 84 00 00 */ lwz r12, 0(r4) /* 80315A50 003129B0 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 80315A54 003129B4 7D 89 03 A6 */ mtctr r12 -/* 80315A58 003129B8 4E 80 04 21 */ bctrl +/* 80315A58 003129B8 4E 80 04 21 */ bctrl /* 80315A5C 003129BC 80 01 00 10 */ lwz r0, 0x10(r1) /* 80315A60 003129C0 28 00 00 00 */ cmplwi r0, 0 /* 80315A64 003129C4 41 82 00 34 */ beq lbl_80315A98 @@ -212,17 +212,17 @@ Shutdown__7CMemoryFv: /* 80315A88 003129E8 81 83 00 00 */ lwz r12, 0(r3) /* 80315A8C 003129EC 81 8C 00 30 */ lwz r12, 0x30(r12) /* 80315A90 003129F0 7D 89 03 A6 */ mtctr r12 -/* 80315A94 003129F4 4E 80 04 21 */ bctrl +/* 80315A94 003129F4 4E 80 04 21 */ bctrl lbl_80315A98: /* 80315A98 003129F8 80 6D 9C A8 */ lwz r3, lbl_805A8868@sda21(r13) /* 80315A9C 003129FC 81 83 00 00 */ lwz r12, 0(r3) /* 80315AA0 00312A00 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80315AA4 00312A04 7D 89 03 A6 */ mtctr r12 -/* 80315AA8 00312A08 4E 80 04 21 */ bctrl +/* 80315AA8 00312A08 4E 80 04 21 */ bctrl /* 80315AAC 00312A0C 80 01 00 64 */ lwz r0, 0x64(r1) /* 80315AB0 00312A10 7C 08 03 A6 */ mtlr r0 /* 80315AB4 00312A14 38 21 00 60 */ addi r1, r1, 0x60 -/* 80315AB8 00312A18 4E 80 00 20 */ blr +/* 80315AB8 00312A18 4E 80 00 20 */ blr .global cmemory_enum_alloc_cb__FRCQ210IAllocator10SAllocInfoPCv cmemory_enum_alloc_cb__FRCQ210IAllocator10SAllocInfoPCv: @@ -241,7 +241,7 @@ cmemory_enum_alloc_cb__FRCQ210IAllocator10SAllocInfoPCv: /* 80315AEC 00312A4C 90 0D A8 A8 */ stw r0, lbl_805A9468@sda21(r13) lbl_80315AF0: /* 80315AF0 00312A50 38 60 00 01 */ li r3, 1 -/* 80315AF4 00312A54 4E 80 00 20 */ blr +/* 80315AF4 00312A54 4E 80 00 20 */ blr .global SetAllocator__7CMemoryFR10COsContextR10IAllocator SetAllocator__7CMemoryFR10COsContextR10IAllocator: @@ -261,7 +261,7 @@ SetAllocator__7CMemoryFR10COsContextR10IAllocator: /* 80315B2C 00312A8C 81 83 00 00 */ lwz r12, 0(r3) /* 80315B30 00312A90 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80315B34 00312A94 7D 89 03 A6 */ mtctr r12 -/* 80315B38 00312A98 4E 80 04 21 */ bctrl +/* 80315B38 00312A98 4E 80 04 21 */ bctrl lbl_80315B3C: /* 80315B3C 00312A9C 93 ED 9C A8 */ stw r31, lbl_805A8868@sda21(r13) /* 80315B40 00312AA0 7F E3 FB 78 */ mr r3, r31 @@ -269,14 +269,14 @@ lbl_80315B3C: /* 80315B48 00312AA8 81 9F 00 00 */ lwz r12, 0(r31) /* 80315B4C 00312AAC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80315B50 00312AB0 7D 89 03 A6 */ mtctr r12 -/* 80315B54 00312AB4 4E 80 04 21 */ bctrl +/* 80315B54 00312AB4 4E 80 04 21 */ bctrl lbl_80315B58: /* 80315B58 00312AB8 80 01 00 14 */ lwz r0, 0x14(r1) /* 80315B5C 00312ABC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80315B60 00312AC0 83 C1 00 08 */ lwz r30, 8(r1) /* 80315B64 00312AC4 7C 08 03 A6 */ mtlr r0 /* 80315B68 00312AC8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80315B6C 00312ACC 4E 80 00 20 */ blr +/* 80315B6C 00312ACC 4E 80 00 20 */ blr .global Startup__7CMemoryFR10COsContext Startup__7CMemoryFR10COsContext: @@ -288,18 +288,18 @@ Startup__7CMemoryFR10COsContext: /* 80315B84 00312AE4 81 83 00 00 */ lwz r12, 0(r3) /* 80315B88 00312AE8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80315B8C 00312AEC 7D 89 03 A6 */ mtctr r12 -/* 80315B90 00312AF0 4E 80 04 21 */ bctrl +/* 80315B90 00312AF0 4E 80 04 21 */ bctrl /* 80315B94 00312AF4 98 6D A8 A0 */ stb r3, lbl_805A9460@sda21(r13) /* 80315B98 00312AF8 80 01 00 14 */ lwz r0, 0x14(r1) /* 80315B9C 00312AFC 7C 08 03 A6 */ mtlr r0 /* 80315BA0 00312B00 38 21 00 10 */ addi r1, r1, 0x10 -/* 80315BA4 00312B04 4E 80 00 20 */ blr +/* 80315BA4 00312B04 4E 80 00 20 */ blr .global GetGameAllocator__10CMemorySysFv GetGameAllocator__10CMemorySysFv: /* 80315BA8 00312B08 3C 60 80 4C */ lis r3, lbl_804BFD64@ha /* 80315BAC 00312B0C 38 63 FD 64 */ addi r3, r3, lbl_804BFD64@l -/* 80315BB0 00312B10 4E 80 00 20 */ blr +/* 80315BB0 00312B10 4E 80 00 20 */ blr .global __dt__10CMemorySysFv __dt__10CMemorySysFv: @@ -323,7 +323,7 @@ lbl_80315BE8: /* 80315BF4 00312B54 83 C1 00 08 */ lwz r30, 8(r1) /* 80315BF8 00312B58 7C 08 03 A6 */ mtlr r0 /* 80315BFC 00312B5C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80315C00 00312B60 4E 80 00 20 */ blr +/* 80315C00 00312B60 4E 80 00 20 */ blr .global __ct__10CMemorySysFR10COsContextR10IAllocator __ct__10CMemorySysFR10COsContextR10IAllocator: @@ -348,7 +348,7 @@ __ct__10CMemorySysFR10COsContextR10IAllocator: /* 80315C4C 00312BAC 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80315C50 00312BB0 7C 08 03 A6 */ mtlr r0 /* 80315C54 00312BB4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80315C58 00312BB8 4E 80 00 20 */ blr +/* 80315C58 00312BB8 4E 80 00 20 */ blr .global __sinit_CMemory_cpp __sinit_CMemory_cpp: diff --git a/asm/Kyoto/Alloc/CSmallAllocPool.s b/asm/Kyoto/Alloc/CSmallAllocPool.s index c89870fe..f0dc85b5 100644 --- a/asm/Kyoto/Alloc/CSmallAllocPool.s +++ b/asm/Kyoto/Alloc/CSmallAllocPool.s @@ -43,7 +43,7 @@ lbl_80350EA8: /* 80350EA8 0034DE08 2C 05 00 00 */ cmpwi r5, 0 /* 80350EAC 0034DE0C 40 82 FF F0 */ bne lbl_80350E9C /* 80350EB0 0034DE10 38 60 00 01 */ li r3, 1 -/* 80350EB4 0034DE14 4E 80 00 20 */ blr +/* 80350EB4 0034DE14 4E 80 00 20 */ blr .global Alloc__15CSmallAllocPoolFUi Alloc__15CSmallAllocPoolFUi: @@ -124,7 +124,7 @@ lbl_80350FB8: /* 80350FC0 0034DF20 83 C1 00 08 */ lwz r30, 8(r1) /* 80350FC4 0034DF24 7C 08 03 A6 */ mtlr r0 /* 80350FC8 0034DF28 38 21 00 10 */ addi r1, r1, 0x10 -/* 80350FCC 0034DF2C 4E 80 00 20 */ blr +/* 80350FCC 0034DF2C 4E 80 00 20 */ blr .global FindFree__15CSmallAllocPoolFi FindFree__15CSmallAllocPoolFi: @@ -188,12 +188,12 @@ lbl_80351090: /* 80351090 0034DFF0 91 23 00 0C */ stw r9, 0xc(r3) lbl_80351094: /* 80351094 0034DFF4 7D 23 4B 78 */ mr r3, r9 -/* 80351098 0034DFF8 4E 80 00 20 */ blr +/* 80351098 0034DFF8 4E 80 00 20 */ blr lbl_8035109C: /* 8035109C 0034DFFC 7C 0A 38 40 */ cmplw r10, r7 /* 803510A0 0034E000 40 82 00 0C */ bne lbl_803510AC /* 803510A4 0034E004 38 60 00 00 */ li r3, 0 -/* 803510A8 0034E008 4E 80 00 20 */ blr +/* 803510A8 0034E008 4E 80 00 20 */ blr lbl_803510AC: /* 803510AC 0034E00C 7C 0A 40 40 */ cmplw r10, r8 /* 803510B0 0034E010 40 82 00 0C */ bne lbl_803510BC @@ -205,7 +205,7 @@ lbl_803510C0: /* 803510C0 0034E020 7C 09 38 40 */ cmplw r9, r7 /* 803510C4 0034E024 40 82 FF 44 */ bne lbl_80351008 /* 803510C8 0034E028 38 60 00 00 */ li r3, 0 -/* 803510CC 0034E02C 4E 80 00 20 */ blr +/* 803510CC 0034E02C 4E 80 00 20 */ blr .global __ct__15CSmallAllocPoolFUiPvPv __ct__15CSmallAllocPoolFUiPvPv: diff --git a/asm/Kyoto/Alloc/IAllocator.s b/asm/Kyoto/Alloc/IAllocator.s index 66b9851a..86c00cb4 100644 --- a/asm/Kyoto/Alloc/IAllocator.s +++ b/asm/Kyoto/Alloc/IAllocator.s @@ -44,7 +44,7 @@ lbl_80315CC8: /* 80315CD0 00312C30 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80315CD4 00312C34 7C 08 03 A6 */ mtlr r0 /* 80315CD8 00312C38 38 21 00 10 */ addi r1, r1, 0x10 -/* 80315CDC 00312C3C 4E 80 00 20 */ blr +/* 80315CDC 00312C3C 4E 80 00 20 */ blr .global __ct__Q210IAllocator8SMetricsFUiUiUiUiUiUiUiUiUiUiUiUiUiUiUiUiUiUiUiUiUiUi __ct__Q210IAllocator8SMetricsFUiUiUiUiUiUiUiUiUiUiUiUiUiUiUiUiUiUiUiUiUiUi: diff --git a/asm/Kyoto/Animation/CAdditiveAnimPlayback.s b/asm/Kyoto/Animation/CAdditiveAnimPlayback.s index eeab6256..041776da 100644 --- a/asm/Kyoto/Animation/CAdditiveAnimPlayback.s +++ b/asm/Kyoto/Animation/CAdditiveAnimPlayback.s @@ -49,7 +49,7 @@ AddToSegStatementSet__21CAdditiveAnimPlaybackCFRC10CSegIdListRC15CCharLayoutInfo /* 8035DB48 0035AAA8 81 83 00 00 */ lwz r12, 0(r3) /* 8035DB4C 0035AAAC 81 8C 00 44 */ lwz r12, 0x44(r12) /* 8035DB50 0035AAB0 7D 89 03 A6 */ mtctr r12 -/* 8035DB54 0035AAB4 4E 80 04 21 */ bctrl +/* 8035DB54 0035AAB4 4E 80 04 21 */ bctrl /* 8035DB58 0035AAB8 83 DA 00 04 */ lwz r30, 4(r26) /* 8035DB5C 0035AABC 3B A0 00 00 */ li r29, 0 /* 8035DB60 0035AAC0 3B E0 00 01 */ li r31, 1 @@ -91,7 +91,7 @@ lbl_8035DBB8: /* 8035DBE8 0035AB48 80 01 00 44 */ lwz r0, 0x44(r1) /* 8035DBEC 0035AB4C 7C 08 03 A6 */ mtlr r0 /* 8035DBF0 0035AB50 38 21 00 40 */ addi r1, r1, 0x40 -/* 8035DBF4 0035AB54 4E 80 00 20 */ blr +/* 8035DBF4 0035AB54 4E 80 00 20 */ blr .global Update__21CAdditiveAnimPlaybackFf Update__21CAdditiveAnimPlaybackFf: @@ -173,7 +173,7 @@ lbl_8035DCE0: /* 8035DD04 0035AC64 90 03 00 1C */ stw r0, 0x1c(r3) lbl_8035DD08: /* 8035DD08 0035AC68 38 21 00 20 */ addi r1, r1, 0x20 -/* 8035DD0C 0035AC6C 4E 80 00 20 */ blr +/* 8035DD0C 0035AC6C 4E 80 00 20 */ blr .global FadeOut__21CAdditiveAnimPlaybackFv FadeOut__21CAdditiveAnimPlaybackFv: @@ -202,12 +202,12 @@ lbl_8035DD50: /* 8035DD5C 0035ACBC 40 81 00 10 */ ble lbl_8035DD6C /* 8035DD60 0035ACC0 38 00 00 02 */ li r0, 2 /* 8035DD64 0035ACC4 90 03 00 1C */ stw r0, 0x1c(r3) -/* 8035DD68 0035ACC8 4E 80 00 20 */ blr +/* 8035DD68 0035ACC8 4E 80 00 20 */ blr lbl_8035DD6C: /* 8035DD6C 0035ACCC 38 00 00 04 */ li r0, 4 /* 8035DD70 0035ACD0 90 03 00 1C */ stw r0, 0x1c(r3) /* 8035DD74 0035ACD4 D0 03 00 10 */ stfs f0, 0x10(r3) -/* 8035DD78 0035ACD8 4E 80 00 20 */ blr +/* 8035DD78 0035ACD8 4E 80 00 20 */ blr .global SetWeight__21CAdditiveAnimPlaybackFf SetWeight__21CAdditiveAnimPlaybackFf: @@ -271,7 +271,7 @@ lbl_8035DE34: /* 8035DE38 0035AD98 D0 03 00 10 */ stfs f0, 0x10(r3) lbl_8035DE3C: /* 8035DE3C 0035AD9C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8035DE40 0035ADA0 4E 80 00 20 */ blr +/* 8035DE40 0035ADA0 4E 80 00 20 */ blr .global "__ct__21CAdditiveAnimPlaybackFRCQ24rstl25ncrc_ptr<13CAnimTreeNode>fbRC22CAdditiveAnimationInfob" "__ct__21CAdditiveAnimPlaybackFRCQ24rstl25ncrc_ptr<13CAnimTreeNode>fbRC22CAdditiveAnimationInfob": @@ -321,4 +321,4 @@ lbl_8035DEA8: lbl_8035DEE0: /* 8035DEE0 0035AE40 98 83 00 20 */ stb r4, 0x20(r3) /* 8035DEE4 0035AE44 38 21 00 10 */ addi r1, r1, 0x10 -/* 8035DEE8 0035AE48 4E 80 00 20 */ blr +/* 8035DEE8 0035AE48 4E 80 00 20 */ blr diff --git a/asm/Kyoto/Animation/CAdvancementDeltas.s b/asm/Kyoto/Animation/CAdvancementDeltas.s index 304ded43..d0c2f7f4 100644 --- a/asm/Kyoto/Animation/CAdvancementDeltas.s +++ b/asm/Kyoto/Animation/CAdvancementDeltas.s @@ -53,7 +53,7 @@ Blend__18CAdvancementDeltasFRC18CAdvancementDeltasRC18CAdvancementDeltasf: /* 802EB5B4 002E8514 83 A1 00 24 */ lwz r29, 0x24(r1) /* 802EB5B8 002E8518 7C 08 03 A6 */ mtlr r0 /* 802EB5BC 002E851C 38 21 00 40 */ addi r1, r1, 0x40 -/* 802EB5C0 002E8520 4E 80 00 20 */ blr +/* 802EB5C0 002E8520 4E 80 00 20 */ blr .global Interpolate__18CAdvancementDeltasFRC18CAdvancementDeltasRC18CAdvancementDeltasff Interpolate__18CAdvancementDeltasFRC18CAdvancementDeltasRC18CAdvancementDeltasff: diff --git a/asm/Kyoto/Animation/CAllFormatsAnimSource.s b/asm/Kyoto/Animation/CAllFormatsAnimSource.s index d86daa56..81991489 100644 --- a/asm/Kyoto/Animation/CAllFormatsAnimSource.s +++ b/asm/Kyoto/Animation/CAllFormatsAnimSource.s @@ -35,7 +35,7 @@ lbl_802FDF54: /* 802FDF60 002FAEC0 83 C1 00 08 */ lwz r30, 8(r1) /* 802FDF64 002FAEC4 7C 08 03 A6 */ mtlr r0 /* 802FDF68 002FAEC8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FDF6C 002FAECC 4E 80 00 20 */ blr +/* 802FDF6C 002FAECC 4E 80 00 20 */ blr .global "GetNewReader__21CAllFormatsAnimSourceFRC37TLockedToken<21CAllFormatsAnimSource>RC13CCharAnimTime" "GetNewReader__21CAllFormatsAnimSourceFRC37TLockedToken<21CAllFormatsAnimSource>RC13CCharAnimTime": @@ -184,7 +184,7 @@ lbl_802FE184: /* 802FE188 002FB0E8 80 01 00 64 */ lwz r0, 0x64(r1) /* 802FE18C 002FB0EC 7C 08 03 A6 */ mtlr r0 /* 802FE190 002FB0F0 38 21 00 60 */ addi r1, r1, 0x60 -/* 802FE194 002FB0F4 4E 80 00 20 */ blr +/* 802FE194 002FB0F4 4E 80 00 20 */ blr .global AnimSourceFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer AnimSourceFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer: @@ -246,7 +246,7 @@ lbl_802FE214: /* 802FE270 002FB1D0 38 80 00 01 */ li r4, 1 /* 802FE274 002FB1D4 81 8C 00 08 */ lwz r12, 8(r12) /* 802FE278 002FB1D8 7D 89 03 A6 */ mtctr r12 -/* 802FE27C 002FB1DC 4E 80 04 21 */ bctrl +/* 802FE27C 002FB1DC 4E 80 04 21 */ bctrl lbl_802FE280: /* 802FE280 002FB1E0 88 01 00 0C */ lbz r0, 0xc(r1) /* 802FE284 002FB1E4 28 00 00 00 */ cmplwi r0, 0 @@ -264,7 +264,7 @@ lbl_802FE298: /* 802FE2B0 002FB210 83 81 00 20 */ lwz r28, 0x20(r1) /* 802FE2B4 002FB214 7C 08 03 A6 */ mtlr r0 /* 802FE2B8 002FB218 38 21 00 30 */ addi r1, r1, 0x30 -/* 802FE2BC 002FB21C 4E 80 00 20 */ blr +/* 802FE2BC 002FB21C 4E 80 00 20 */ blr .global "__dt__49TObjOwnerDerivedFromIObj<21CAllFormatsAnimSource>Fv" "__dt__49TObjOwnerDerivedFromIObj<21CAllFormatsAnimSource>Fv": @@ -306,7 +306,7 @@ lbl_802FE334: /* 802FE340 002FB2A0 83 C1 00 08 */ lwz r30, 8(r1) /* 802FE344 002FB2A4 7C 08 03 A6 */ mtlr r0 /* 802FE348 002FB2A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FE34C 002FB2AC 4E 80 00 20 */ blr +/* 802FE34C 002FB2AC 4E 80 00 20 */ blr .global "GetIObjObjectFor__31TToken<21CAllFormatsAnimSource>FRCQ24rstl33auto_ptr<21CAllFormatsAnimSource>" "GetIObjObjectFor__31TToken<21CAllFormatsAnimSource>FRCQ24rstl33auto_ptr<21CAllFormatsAnimSource>": @@ -320,7 +320,7 @@ lbl_802FE334: /* 802FE36C 002FB2CC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802FE370 002FB2D0 7C 08 03 A6 */ mtlr r0 /* 802FE374 002FB2D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FE378 002FB2D8 4E 80 00 20 */ blr +/* 802FE378 002FB2D8 4E 80 00 20 */ blr .global "GetNewDerivedObject__49TObjOwnerDerivedFromIObj<21CAllFormatsAnimSource>FRCQ24rstl33auto_ptr<21CAllFormatsAnimSource>" "GetNewDerivedObject__49TObjOwnerDerivedFromIObj<21CAllFormatsAnimSource>FRCQ24rstl33auto_ptr<21CAllFormatsAnimSource>": @@ -363,7 +363,7 @@ lbl_802FE3EC: /* 802FE408 002FB368 80 01 00 14 */ lwz r0, 0x14(r1) /* 802FE40C 002FB36C 7C 08 03 A6 */ mtlr r0 /* 802FE410 002FB370 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FE414 002FB374 4E 80 00 20 */ blr +/* 802FE414 002FB374 4E 80 00 20 */ blr .global __ct__21CAllFormatsAnimSourceFR12CInputStreamR12IObjectStoreRC10SObjectTag __ct__21CAllFormatsAnimSourceFR12CInputStreamR12IObjectStoreRC10SObjectTag: @@ -389,7 +389,7 @@ __ct__21CAllFormatsAnimSourceFR12CInputStreamR12IObjectStoreRC10SObjectTag: /* 802FE464 002FB3C4 80 01 00 14 */ lwz r0, 0x14(r1) /* 802FE468 002FB3C8 7C 08 03 A6 */ mtlr r0 /* 802FE46C 002FB3CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FE470 002FB3D0 4E 80 00 20 */ blr +/* 802FE470 002FB3D0 4E 80 00 20 */ blr .global SubConstruct__16CAnimFormatUnionFPUcUiR12CInputStreamR12IObjectStore SubConstruct__16CAnimFormatUnionFPUcUiR12CInputStreamR12IObjectStore: @@ -423,7 +423,7 @@ lbl_802FE4D0: /* 802FE4D0 002FB430 80 01 00 14 */ lwz r0, 0x14(r1) /* 802FE4D4 002FB434 7C 08 03 A6 */ mtlr r0 /* 802FE4D8 002FB438 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FE4DC 002FB43C 4E 80 00 20 */ blr +/* 802FE4DC 002FB43C 4E 80 00 20 */ blr .global __dt__16CAnimFormatUnionFv __dt__16CAnimFormatUnionFv: @@ -467,7 +467,7 @@ lbl_802FE554: /* 802FE560 002FB4C0 83 C1 00 08 */ lwz r30, 8(r1) /* 802FE564 002FB4C4 7C 08 03 A6 */ mtlr r0 /* 802FE568 002FB4C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FE56C 002FB4CC 4E 80 00 20 */ blr +/* 802FE56C 002FB4CC 4E 80 00 20 */ blr .global __ct__16CAnimFormatUnionFR12CInputStreamR12IObjectStore __ct__16CAnimFormatUnionFR12CInputStreamR12IObjectStore: diff --git a/asm/Kyoto/Animation/CAnimCharacterSet.s b/asm/Kyoto/Animation/CAnimCharacterSet.s index f7de4448..4bed8ea7 100644 --- a/asm/Kyoto/Animation/CAnimCharacterSet.s +++ b/asm/Kyoto/Animation/CAnimCharacterSet.s @@ -39,7 +39,7 @@ lbl_802D80FC: /* 802D810C 002D506C 83 C1 00 08 */ lwz r30, 8(r1) /* 802D8110 002D5070 7C 08 03 A6 */ mtlr r0 /* 802D8114 002D5074 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D8118 002D5078 4E 80 00 20 */ blr +/* 802D8118 002D5078 4E 80 00 20 */ blr .global sub_802d811c sub_802d811c: @@ -74,7 +74,7 @@ sub_802d811c: /* 802D818C 002D50EC 38 80 00 01 */ li r4, 1 /* 802D8190 002D50F0 81 8C 00 08 */ lwz r12, 8(r12) /* 802D8194 002D50F4 7D 89 03 A6 */ mtctr r12 -/* 802D8198 002D50F8 4E 80 04 21 */ bctrl +/* 802D8198 002D50F8 4E 80 04 21 */ bctrl lbl_802D819C: /* 802D819C 002D50FC 38 61 00 10 */ addi r3, r1, 0x10 /* 802D81A0 002D5100 38 80 FF FF */ li r4, -1 @@ -84,7 +84,7 @@ lbl_802D819C: /* 802D81B0 002D5110 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802D81B4 002D5114 7C 08 03 A6 */ mtlr r0 /* 802D81B8 002D5118 38 21 00 20 */ addi r1, r1, 0x20 -/* 802D81BC 002D511C 4E 80 00 20 */ blr +/* 802D81BC 002D511C 4E 80 00 20 */ blr .global sub_802d81c0 sub_802d81c0: @@ -126,7 +126,7 @@ lbl_802D8234: /* 802D8240 002D51A0 83 C1 00 08 */ lwz r30, 8(r1) /* 802D8244 002D51A4 7C 08 03 A6 */ mtlr r0 /* 802D8248 002D51A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D824C 002D51AC 4E 80 00 20 */ blr +/* 802D824C 002D51AC 4E 80 00 20 */ blr .global sub_802d8250 sub_802d8250: @@ -155,7 +155,7 @@ lbl_802D8298: /* 802D82A4 002D5204 83 C1 00 08 */ lwz r30, 8(r1) /* 802D82A8 002D5208 7C 08 03 A6 */ mtlr r0 /* 802D82AC 002D520C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D82B0 002D5210 4E 80 00 20 */ blr +/* 802D82B0 002D5210 4E 80 00 20 */ blr .global sub_802d82b4 sub_802d82b4: @@ -181,7 +181,7 @@ lbl_802D82F0: /* 802D82FC 002D525C 83 C1 00 08 */ lwz r30, 8(r1) /* 802D8300 002D5260 7C 08 03 A6 */ mtlr r0 /* 802D8304 002D5264 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D8308 002D5268 4E 80 00 20 */ blr +/* 802D8308 002D5268 4E 80 00 20 */ blr .global sub_802d830c sub_802d830c: @@ -221,7 +221,7 @@ lbl_802D837C: /* 802D8388 002D52E8 83 C1 00 18 */ lwz r30, 0x18(r1) /* 802D838C 002D52EC 7C 08 03 A6 */ mtlr r0 /* 802D8390 002D52F0 38 21 00 20 */ addi r1, r1, 0x20 -/* 802D8394 002D52F4 4E 80 00 20 */ blr +/* 802D8394 002D52F4 4E 80 00 20 */ blr .global sub_802d8398 sub_802d8398: @@ -246,7 +246,7 @@ lbl_802D83C4: /* 802D83D8 002D5338 83 C1 00 08 */ lwz r30, 8(r1) /* 802D83DC 002D533C 7C 08 03 A6 */ mtlr r0 /* 802D83E0 002D5340 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D83E4 002D5344 4E 80 00 20 */ blr +/* 802D83E4 002D5344 4E 80 00 20 */ blr .global sub_802d83e8 sub_802d83e8: @@ -258,7 +258,7 @@ sub_802d83e8: /* 802D83FC 002D535C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802D8400 002D5360 7C 08 03 A6 */ mtlr r0 /* 802D8404 002D5364 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D8408 002D5368 4E 80 00 20 */ blr +/* 802D8408 002D5368 4E 80 00 20 */ blr .global __dt__13CAnimationSetFv __dt__13CAnimationSetFv: @@ -284,7 +284,7 @@ lbl_802D8448: /* 802D8454 002D53B4 83 C1 00 08 */ lwz r30, 8(r1) /* 802D8458 002D53B8 7C 08 03 A6 */ mtlr r0 /* 802D845C 002D53BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D8460 002D53C0 4E 80 00 20 */ blr +/* 802D8460 002D53C0 4E 80 00 20 */ blr .global sub_802d8464 sub_802d8464: @@ -363,7 +363,7 @@ lbl_802D8558: /* 802D8564 002D54C4 83 C1 00 28 */ lwz r30, 0x28(r1) /* 802D8568 002D54C8 7C 08 03 A6 */ mtlr r0 /* 802D856C 002D54CC 38 21 00 30 */ addi r1, r1, 0x30 -/* 802D8570 002D54D0 4E 80 00 20 */ blr +/* 802D8570 002D54D0 4E 80 00 20 */ blr .global sub_802d8574 sub_802d8574: @@ -377,7 +377,7 @@ sub_802d8574: /* 802D8590 002D54F0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802D8594 002D54F4 7C 08 03 A6 */ mtlr r0 /* 802D8598 002D54F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D859C 002D54FC 4E 80 00 20 */ blr +/* 802D859C 002D54FC 4E 80 00 20 */ blr .global sub_802d85a0 sub_802d85a0: @@ -420,7 +420,7 @@ lbl_802D8610: /* 802D862C 002D558C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802D8630 002D5590 7C 08 03 A6 */ mtlr r0 /* 802D8634 002D5594 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D8638 002D5598 4E 80 00 20 */ blr +/* 802D8638 002D5598 4E 80 00 20 */ blr .global sub_802d863c sub_802d863c: @@ -450,7 +450,7 @@ lbl_802D8684: /* 802D8690 002D55F0 83 C1 00 08 */ lwz r30, 8(r1) /* 802D8694 002D55F4 7C 08 03 A6 */ mtlr r0 /* 802D8698 002D55F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D869C 002D55FC 4E 80 00 20 */ blr +/* 802D869C 002D55FC 4E 80 00 20 */ blr .global __ct__17CAnimCharacterSetFR12CInputStream __ct__17CAnimCharacterSetFR12CInputStream: diff --git a/asm/Kyoto/Animation/CAnimMathUtils.s b/asm/Kyoto/Animation/CAnimMathUtils.s index 0eacdd18..8ff92c27 100644 --- a/asm/Kyoto/Animation/CAnimMathUtils.s +++ b/asm/Kyoto/Animation/CAnimMathUtils.s @@ -60,7 +60,7 @@ lbl_802EB758: /* 802EB788 002E86E8 83 C1 00 38 */ lwz r30, 0x38(r1) /* 802EB78C 002E86EC 7C 08 03 A6 */ mtlr r0 /* 802EB790 002E86F0 38 21 00 50 */ addi r1, r1, 0x50 -/* 802EB794 002E86F4 4E 80 00 20 */ blr +/* 802EB794 002E86F4 4E 80 00 20 */ blr .global Slerp__14CAnimMathUtilsFRC11CQuaternionRC11CQuaternionf Slerp__14CAnimMathUtilsFRC11CQuaternionRC11CQuaternionf: @@ -220,7 +220,7 @@ lbl_802EB9BC: /* 802EB9E8 002E8948 83 A1 00 14 */ lwz r29, 0x14(r1) /* 802EB9EC 002E894C 7C 08 03 A6 */ mtlr r0 /* 802EB9F0 002E8950 38 21 00 60 */ addi r1, r1, 0x60 -/* 802EB9F4 002E8954 4E 80 00 20 */ blr +/* 802EB9F4 002E8954 4E 80 00 20 */ blr .global "__ct__Q24rstl48vector<11CQuaternion,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl17rmemory_allocator" "__ct__Q24rstl48vector<11CQuaternion,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl17rmemory_allocator": diff --git a/asm/Kyoto/Animation/CAnimPOIData.s b/asm/Kyoto/Animation/CAnimPOIData.s index c5177f96..866709ac 100644 --- a/asm/Kyoto/Animation/CAnimPOIData.s +++ b/asm/Kyoto/Animation/CAnimPOIData.s @@ -66,7 +66,7 @@ lbl_802EBB34: /* 802EBB44 002E8AA4 83 C1 00 08 */ lwz r30, 8(r1) /* 802EBB48 002E8AA8 7C 08 03 A6 */ mtlr r0 /* 802EBB4C 002E8AAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EBB50 002E8AB0 4E 80 00 20 */ blr +/* 802EBB50 002E8AB0 4E 80 00 20 */ blr .global "__ct<12CAnimPOIData>__16CFactoryFnReturnFP12CAnimPOIData" "__ct<12CAnimPOIData>__16CFactoryFnReturnFP12CAnimPOIData": @@ -101,7 +101,7 @@ lbl_802EBB34: /* 802EBBC4 002E8B24 38 80 00 01 */ li r4, 1 /* 802EBBC8 002E8B28 81 8C 00 08 */ lwz r12, 8(r12) /* 802EBBCC 002E8B2C 7D 89 03 A6 */ mtctr r12 -/* 802EBBD0 002E8B30 4E 80 04 21 */ bctrl +/* 802EBBD0 002E8B30 4E 80 04 21 */ bctrl lbl_802EBBD4: /* 802EBBD4 002E8B34 38 61 00 10 */ addi r3, r1, 0x10 /* 802EBBD8 002E8B38 38 80 FF FF */ li r4, -1 @@ -111,7 +111,7 @@ lbl_802EBBD4: /* 802EBBE8 002E8B48 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802EBBEC 002E8B4C 7C 08 03 A6 */ mtlr r0 /* 802EBBF0 002E8B50 38 21 00 20 */ addi r1, r1, 0x20 -/* 802EBBF4 002E8B54 4E 80 00 20 */ blr +/* 802EBBF4 002E8B54 4E 80 00 20 */ blr .global sub_802ebbf8 sub_802ebbf8: @@ -153,7 +153,7 @@ lbl_802EBC6C: /* 802EBC78 002E8BD8 83 C1 00 08 */ lwz r30, 8(r1) /* 802EBC7C 002E8BDC 7C 08 03 A6 */ mtlr r0 /* 802EBC80 002E8BE0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EBC84 002E8BE4 4E 80 00 20 */ blr +/* 802EBC84 002E8BE4 4E 80 00 20 */ blr .global sub_802ebc88 sub_802ebc88: @@ -184,7 +184,7 @@ lbl_802EBCDC: /* 802EBCE4 002E8C44 81 9C 00 00 */ lwz r12, 0(r28) /* 802EBCE8 002E8C48 81 8C 00 08 */ lwz r12, 8(r12) /* 802EBCEC 002E8C4C 7D 89 03 A6 */ mtctr r12 -/* 802EBCF0 002E8C50 4E 80 04 21 */ bctrl +/* 802EBCF0 002E8C50 4E 80 04 21 */ bctrl /* 802EBCF4 002E8C54 3B 9C 00 44 */ addi r28, r28, 0x44 lbl_802EBCF8: /* 802EBCF8 002E8C58 7C 1C E8 40 */ cmplw r28, r29 @@ -211,7 +211,7 @@ lbl_802EBD3C: /* 802EBD44 002E8CA4 81 9C 00 00 */ lwz r12, 0(r28) /* 802EBD48 002E8CA8 81 8C 00 08 */ lwz r12, 8(r12) /* 802EBD4C 002E8CAC 7D 89 03 A6 */ mtctr r12 -/* 802EBD50 002E8CB0 4E 80 04 21 */ bctrl +/* 802EBD50 002E8CB0 4E 80 04 21 */ bctrl /* 802EBD54 002E8CB4 3B 9C 00 5C */ addi r28, r28, 0x5c lbl_802EBD58: /* 802EBD58 002E8CB8 7C 1C E8 40 */ cmplw r28, r29 @@ -238,7 +238,7 @@ lbl_802EBD9C: /* 802EBDA4 002E8D04 81 9C 00 00 */ lwz r12, 0(r28) /* 802EBDA8 002E8D08 81 8C 00 08 */ lwz r12, 8(r12) /* 802EBDAC 002E8D0C 7D 89 03 A6 */ mtctr r12 -/* 802EBDB0 002E8D10 4E 80 04 21 */ bctrl +/* 802EBDB0 002E8D10 4E 80 04 21 */ bctrl /* 802EBDB4 002E8D14 3B 9C 00 4C */ addi r28, r28, 0x4c lbl_802EBDB8: /* 802EBDB8 002E8D18 7C 1C E8 40 */ cmplw r28, r29 @@ -265,7 +265,7 @@ lbl_802EBDFC: /* 802EBE04 002E8D64 81 9C 00 00 */ lwz r12, 0(r28) /* 802EBE08 002E8D68 81 8C 00 08 */ lwz r12, 8(r12) /* 802EBE0C 002E8D6C 7D 89 03 A6 */ mtctr r12 -/* 802EBE10 002E8D70 4E 80 04 21 */ bctrl +/* 802EBE10 002E8D70 4E 80 04 21 */ bctrl /* 802EBE14 002E8D74 3B 9C 00 3C */ addi r28, r28, 0x3c lbl_802EBE18: /* 802EBE18 002E8D78 7C 1C E8 40 */ cmplw r28, r29 @@ -288,7 +288,7 @@ lbl_802EBE40: /* 802EBE54 002E8DB4 83 81 00 50 */ lwz r28, 0x50(r1) /* 802EBE58 002E8DB8 7C 08 03 A6 */ mtlr r0 /* 802EBE5C 002E8DBC 38 21 00 60 */ addi r1, r1, 0x60 -/* 802EBE60 002E8DC0 4E 80 00 20 */ blr +/* 802EBE60 002E8DC0 4E 80 00 20 */ blr .global "GetIObjObjectFor__22TToken<12CAnimPOIData>FRCQ24rstl24auto_ptr<12CAnimPOIData>" "GetIObjObjectFor__22TToken<12CAnimPOIData>FRCQ24rstl24auto_ptr<12CAnimPOIData>": @@ -302,7 +302,7 @@ lbl_802EBE40: /* 802EBE80 002E8DE0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802EBE84 002E8DE4 7C 08 03 A6 */ mtlr r0 /* 802EBE88 002E8DE8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EBE8C 002E8DEC 4E 80 00 20 */ blr +/* 802EBE8C 002E8DEC 4E 80 00 20 */ blr .global "__ct__40TObjOwnerDerivedFromIObj<12CAnimPOIData>FRCQ24rstl24auto_ptr<12CAnimPOIData>" "__ct__40TObjOwnerDerivedFromIObj<12CAnimPOIData>FRCQ24rstl24auto_ptr<12CAnimPOIData>": @@ -345,7 +345,7 @@ lbl_802EBF00: /* 802EBF1C 002E8E7C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802EBF20 002E8E80 7C 08 03 A6 */ mtlr r0 /* 802EBF24 002E8E84 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EBF28 002E8E88 4E 80 00 20 */ blr +/* 802EBF28 002E8E88 4E 80 00 20 */ blr .global __dt__12CAnimPOIDataFv __dt__12CAnimPOIDataFv: @@ -375,7 +375,7 @@ lbl_802EBF74: /* 802EBF80 002E8EE0 83 C1 00 08 */ lwz r30, 8(r1) /* 802EBF84 002E8EE4 7C 08 03 A6 */ mtlr r0 /* 802EBF88 002E8EE8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EBF8C 002E8EEC 4E 80 00 20 */ blr +/* 802EBF8C 002E8EEC 4E 80 00 20 */ blr .global __ct__12CAnimPOIDataFR12CInputStream __ct__12CAnimPOIDataFR12CInputStream: @@ -431,7 +431,7 @@ lbl_802EC048: /* 802EC050 002E8FB0 81 9E 00 00 */ lwz r12, 0(r30) /* 802EC054 002E8FB4 81 8C 00 08 */ lwz r12, 8(r12) /* 802EC058 002E8FB8 7D 89 03 A6 */ mtctr r12 -/* 802EC05C 002E8FBC 4E 80 04 21 */ bctrl +/* 802EC05C 002E8FBC 4E 80 04 21 */ bctrl /* 802EC060 002E8FC0 3B DE 00 44 */ addi r30, r30, 0x44 lbl_802EC064: /* 802EC064 002E8FC4 7C 1E F8 40 */ cmplw r30, r31 @@ -448,7 +448,7 @@ lbl_802EC07C: /* 802EC08C 002E8FEC 83 A1 00 44 */ lwz r29, 0x44(r1) /* 802EC090 002E8FF0 7C 08 03 A6 */ mtlr r0 /* 802EC094 002E8FF4 38 21 00 50 */ addi r1, r1, 0x50 -/* 802EC098 002E8FF8 4E 80 00 20 */ blr +/* 802EC098 002E8FF8 4E 80 00 20 */ blr .global "__ct__Q24rstl50vector<13CSoundPOINode,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl17rmemory_allocator" "__ct__Q24rstl50vector<13CSoundPOINode,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl17rmemory_allocator": @@ -502,7 +502,7 @@ lbl_802EC13C: /* 802EC14C 002E90AC 80 01 00 74 */ lwz r0, 0x74(r1) /* 802EC150 002E90B0 7C 08 03 A6 */ mtlr r0 /* 802EC154 002E90B4 38 21 00 70 */ addi r1, r1, 0x70 -/* 802EC158 002E90B8 4E 80 00 20 */ blr +/* 802EC158 002E90B8 4E 80 00 20 */ blr .global "Get<13CSoundPOINode>__12CInputStreamFRC22TType<13CSoundPOINode>" "Get<13CSoundPOINode>__12CInputStreamFRC22TType<13CSoundPOINode>": @@ -520,7 +520,7 @@ lbl_802EC13C: /* 802EC188 002E90E8 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802EC18C 002E90EC 7C 08 03 A6 */ mtlr r0 /* 802EC190 002E90F0 38 21 00 20 */ addi r1, r1, 0x20 -/* 802EC194 002E90F4 4E 80 00 20 */ blr +/* 802EC194 002E90F4 4E 80 00 20 */ blr .global __ct__13CSoundPOINodeFR12CInputStream __ct__13CSoundPOINodeFR12CInputStream: @@ -550,7 +550,7 @@ __ct__13CSoundPOINodeFR12CInputStream: /* 802EC1F4 002E9154 83 C1 00 08 */ lwz r30, 8(r1) /* 802EC1F8 002E9158 7C 08 03 A6 */ mtlr r0 /* 802EC1FC 002E915C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EC200 002E9160 4E 80 00 20 */ blr +/* 802EC200 002E9160 4E 80 00 20 */ blr .global "__ct__Q24rstl53vector<16CParticlePOINode,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl17rmemory_allocator" "__ct__Q24rstl53vector<16CParticlePOINode,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl17rmemory_allocator": @@ -613,7 +613,7 @@ lbl_802EC2C4: /* 802EC2D4 002E9234 80 01 00 94 */ lwz r0, 0x94(r1) /* 802EC2D8 002E9238 7C 08 03 A6 */ mtlr r0 /* 802EC2DC 002E923C 38 21 00 90 */ addi r1, r1, 0x90 -/* 802EC2E0 002E9240 4E 80 00 20 */ blr +/* 802EC2E0 002E9240 4E 80 00 20 */ blr .global "Get<16CParticlePOINode>__12CInputStreamFRC25TType<16CParticlePOINode>" "Get<16CParticlePOINode>__12CInputStreamFRC25TType<16CParticlePOINode>": @@ -631,7 +631,7 @@ lbl_802EC2C4: /* 802EC310 002E9270 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802EC314 002E9274 7C 08 03 A6 */ mtlr r0 /* 802EC318 002E9278 38 21 00 20 */ addi r1, r1, 0x20 -/* 802EC31C 002E927C 4E 80 00 20 */ blr +/* 802EC31C 002E927C 4E 80 00 20 */ blr .global "cinput_stream_helper<16CParticlePOINode>__FRC25TType<16CParticlePOINode>R12CInputStream" "cinput_stream_helper<16CParticlePOINode>__FRC25TType<16CParticlePOINode>R12CInputStream": @@ -643,7 +643,7 @@ lbl_802EC2C4: /* 802EC334 002E9294 80 01 00 14 */ lwz r0, 0x14(r1) /* 802EC338 002E9298 7C 08 03 A6 */ mtlr r0 /* 802EC33C 002E929C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EC340 002E92A0 4E 80 00 20 */ blr +/* 802EC340 002E92A0 4E 80 00 20 */ blr .global "__ct__Q24rstl50vector<13CInt32POINode,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl17rmemory_allocator" "__ct__Q24rstl50vector<13CInt32POINode,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl17rmemory_allocator": @@ -753,7 +753,7 @@ lbl_802EC4B4: /* 802EC4C4 002E9424 80 01 00 84 */ lwz r0, 0x84(r1) /* 802EC4C8 002E9428 7C 08 03 A6 */ mtlr r0 /* 802EC4CC 002E942C 38 21 00 80 */ addi r1, r1, 0x80 -/* 802EC4D0 002E9430 4E 80 00 20 */ blr +/* 802EC4D0 002E9430 4E 80 00 20 */ blr .global "Get<13CInt32POINode>__12CInputStreamFRC22TType<13CInt32POINode>" "Get<13CInt32POINode>__12CInputStreamFRC22TType<13CInt32POINode>": @@ -771,7 +771,7 @@ lbl_802EC4B4: /* 802EC500 002E9460 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802EC504 002E9464 7C 08 03 A6 */ mtlr r0 /* 802EC508 002E9468 38 21 00 20 */ addi r1, r1, 0x20 -/* 802EC50C 002E946C 4E 80 00 20 */ blr +/* 802EC50C 002E946C 4E 80 00 20 */ blr .global "cinput_stream_helper<13CInt32POINode>__FRC22TType<13CInt32POINode>R12CInputStream" "cinput_stream_helper<13CInt32POINode>__FRC22TType<13CInt32POINode>R12CInputStream": @@ -783,7 +783,7 @@ lbl_802EC4B4: /* 802EC524 002E9484 80 01 00 14 */ lwz r0, 0x14(r1) /* 802EC528 002E9488 7C 08 03 A6 */ mtlr r0 /* 802EC52C 002E948C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EC530 002E9490 4E 80 00 20 */ blr +/* 802EC530 002E9490 4E 80 00 20 */ blr .global "__ct__Q24rstl49vector<12CBoolPOINode,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl17rmemory_allocator" "__ct__Q24rstl49vector<12CBoolPOINode,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl17rmemory_allocator": @@ -884,7 +884,7 @@ lbl_802EC684: /* 802EC694 002E95F4 80 01 00 74 */ lwz r0, 0x74(r1) /* 802EC698 002E95F8 7C 08 03 A6 */ mtlr r0 /* 802EC69C 002E95FC 38 21 00 70 */ addi r1, r1, 0x70 -/* 802EC6A0 002E9600 4E 80 00 20 */ blr +/* 802EC6A0 002E9600 4E 80 00 20 */ blr .global "Get<12CBoolPOINode>__12CInputStreamFRC21TType<12CBoolPOINode>" "Get<12CBoolPOINode>__12CInputStreamFRC21TType<12CBoolPOINode>": @@ -902,7 +902,7 @@ lbl_802EC684: /* 802EC6D0 002E9630 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802EC6D4 002E9634 7C 08 03 A6 */ mtlr r0 /* 802EC6D8 002E9638 38 21 00 20 */ addi r1, r1, 0x20 -/* 802EC6DC 002E963C 4E 80 00 20 */ blr +/* 802EC6DC 002E963C 4E 80 00 20 */ blr .global "cinput_stream_helper<12CBoolPOINode>__FRC21TType<12CBoolPOINode>R12CInputStream" "cinput_stream_helper<12CBoolPOINode>__FRC21TType<12CBoolPOINode>R12CInputStream": diff --git a/asm/Kyoto/Animation/CAnimSource.s b/asm/Kyoto/Animation/CAnimSource.s index 7c862176..86efada5 100644 --- a/asm/Kyoto/Animation/CAnimSource.s +++ b/asm/Kyoto/Animation/CAnimSource.s @@ -315,35 +315,35 @@ lbl_802ECB4C: /* 802ECB70 002E9AD0 80 01 00 84 */ lwz r0, 0x84(r1) /* 802ECB74 002E9AD4 7C 08 03 A6 */ mtlr r0 /* 802ECB78 002E9AD8 38 21 00 80 */ addi r1, r1, 0x80 -/* 802ECB7C 002E9ADC 4E 80 00 20 */ blr +/* 802ECB7C 002E9ADC 4E 80 00 20 */ blr .global GetSoundPOIStream__11CAnimSourceCFv GetSoundPOIStream__11CAnimSourceCFv: /* 802ECB80 002E9AE0 80 63 00 5C */ lwz r3, 0x5c(r3) /* 802ECB84 002E9AE4 80 63 00 08 */ lwz r3, 8(r3) /* 802ECB88 002E9AE8 38 63 00 34 */ addi r3, r3, 0x34 -/* 802ECB8C 002E9AEC 4E 80 00 20 */ blr +/* 802ECB8C 002E9AEC 4E 80 00 20 */ blr .global GetParticlePOIStream__11CAnimSourceCFv GetParticlePOIStream__11CAnimSourceCFv: /* 802ECB90 002E9AF0 80 63 00 5C */ lwz r3, 0x5c(r3) /* 802ECB94 002E9AF4 80 63 00 08 */ lwz r3, 8(r3) /* 802ECB98 002E9AF8 38 63 00 24 */ addi r3, r3, 0x24 -/* 802ECB9C 002E9AFC 4E 80 00 20 */ blr +/* 802ECB9C 002E9AFC 4E 80 00 20 */ blr .global GetInt32POIStream__11CAnimSourceCFv GetInt32POIStream__11CAnimSourceCFv: /* 802ECBA0 002E9B00 80 63 00 5C */ lwz r3, 0x5c(r3) /* 802ECBA4 002E9B04 80 63 00 08 */ lwz r3, 8(r3) /* 802ECBA8 002E9B08 38 63 00 14 */ addi r3, r3, 0x14 -/* 802ECBAC 002E9B0C 4E 80 00 20 */ blr +/* 802ECBAC 002E9B0C 4E 80 00 20 */ blr .global GetBoolPOIStream__11CAnimSourceCFv GetBoolPOIStream__11CAnimSourceCFv: /* 802ECBB0 002E9B10 80 63 00 5C */ lwz r3, 0x5c(r3) /* 802ECBB4 002E9B14 80 63 00 08 */ lwz r3, 8(r3) /* 802ECBB8 002E9B18 38 63 00 04 */ addi r3, r3, 4 -/* 802ECBBC 002E9B1C 4E 80 00 20 */ blr +/* 802ECBBC 002E9B1C 4E 80 00 20 */ blr .global CalcAverageVelocity__11CAnimSourceFv CalcAverageVelocity__11CAnimSourceFv: @@ -438,7 +438,7 @@ lbl_802ECCD4: /* 802ECD14 002E9C74 83 A1 00 24 */ lwz r29, 0x24(r1) /* 802ECD18 002E9C78 7C 08 03 A6 */ mtlr r0 /* 802ECD1C 002E9C7C 38 21 00 70 */ addi r1, r1, 0x70 -/* 802ECD20 002E9C80 4E 80 00 20 */ blr +/* 802ECD20 002E9C80 4E 80 00 20 */ blr .global GetRotation__11CAnimSourceCFRC6CSegIdRC13CCharAnimTime GetRotation__11CAnimSourceCFRC6CSegIdRC13CCharAnimTime: @@ -534,7 +534,7 @@ lbl_802ECE54: /* 802ECE7C 002E9DDC 83 81 00 10 */ lwz r28, 0x10(r1) /* 802ECE80 002E9DE0 7C 08 03 A6 */ mtlr r0 /* 802ECE84 002E9DE4 38 21 00 50 */ addi r1, r1, 0x50 -/* 802ECE88 002E9DE8 4E 80 00 20 */ blr +/* 802ECE88 002E9DE8 4E 80 00 20 */ blr .global GetOffset__11CAnimSourceCFRC6CSegIdRC13CCharAnimTime GetOffset__11CAnimSourceCFRC6CSegIdRC13CCharAnimTime: @@ -649,7 +649,7 @@ lbl_802ED008: /* 802ED030 002E9F90 83 81 00 10 */ lwz r28, 0x10(r1) /* 802ED034 002E9F94 7C 08 03 A6 */ mtlr r0 /* 802ED038 002E9F98 38 21 00 50 */ addi r1, r1, 0x50 -/* 802ED03C 002E9F9C 4E 80 00 20 */ blr +/* 802ED03C 002E9F9C 4E 80 00 20 */ blr .global HasOffset__11CAnimSourceCFRC6CSegId HasOffset__11CAnimSourceCFRC6CSegId: @@ -662,7 +662,7 @@ HasOffset__11CAnimSourceCFRC6CSegId: /* 802ED058 002E9FB8 7C 00 07 74 */ extsb r0, r0 /* 802ED05C 002E9FBC 54 00 0F FE */ srwi r0, r0, 0x1f /* 802ED060 002E9FC0 68 03 00 01 */ xori r3, r0, 1 -/* 802ED064 002E9FC4 4E 80 00 20 */ blr +/* 802ED064 002E9FC4 4E 80 00 20 */ blr .global __dt__11CAnimSourceFv __dt__11CAnimSourceFv: @@ -765,7 +765,7 @@ lbl_802ED1B0: /* 802ED1C0 002EA120 83 A1 00 34 */ lwz r29, 0x34(r1) /* 802ED1C4 002EA124 7C 08 03 A6 */ mtlr r0 /* 802ED1C8 002EA128 38 21 00 40 */ addi r1, r1, 0x40 -/* 802ED1CC 002EA12C 4E 80 00 20 */ blr +/* 802ED1CC 002EA12C 4E 80 00 20 */ blr .global __ct__11CAnimSourceFR12CInputStreamR12IObjectStore __ct__11CAnimSourceFR12CInputStreamR12IObjectStore: @@ -908,7 +908,7 @@ lbl_802ED32C: /* 802ED3C8 002EA328 81 9F 00 00 */ lwz r12, 0(r31) /* 802ED3CC 002EA32C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802ED3D0 002EA330 7D 89 03 A6 */ mtctr r12 -/* 802ED3D4 002EA334 4E 80 04 21 */ bctrl +/* 802ED3D4 002EA334 4E 80 04 21 */ bctrl /* 802ED3D8 002EA338 7F 83 E3 78 */ mr r3, r28 /* 802ED3DC 002EA33C 38 81 00 10 */ addi r4, r1, 0x10 /* 802ED3E0 002EA340 3B C0 00 01 */ li r30, 1 @@ -987,7 +987,7 @@ lbl_802ED4A8: /* 802ED4E8 002EA448 80 01 00 64 */ lwz r0, 0x64(r1) /* 802ED4EC 002EA44C 7C 08 03 A6 */ mtlr r0 /* 802ED4F0 002EA450 38 21 00 60 */ addi r1, r1, 0x60 -/* 802ED4F4 002EA454 4E 80 00 20 */ blr +/* 802ED4F4 002EA454 4E 80 00 20 */ blr .global __dt__Q224RotationAndOffsetStorage25CRotationAndOffsetVectorsFv __dt__Q224RotationAndOffsetStorage25CRotationAndOffsetVectorsFv: @@ -1052,7 +1052,7 @@ lbl_802ED5B8: /* 802ED5C4 002EA524 83 C1 00 28 */ lwz r30, 0x28(r1) /* 802ED5C8 002EA528 7C 08 03 A6 */ mtlr r0 /* 802ED5CC 002EA52C 38 21 00 30 */ addi r1, r1, 0x30 -/* 802ED5D0 002EA530 4E 80 00 20 */ blr +/* 802ED5D0 002EA530 4E 80 00 20 */ blr .global __ct__Q224RotationAndOffsetStorage25CRotationAndOffsetVectorsFR12CInputStream __ct__Q224RotationAndOffsetStorage25CRotationAndOffsetVectorsFR12CInputStream: @@ -1122,7 +1122,7 @@ lbl_802ED6A0: /* 802ED6BC 002EA61C 83 81 00 20 */ lwz r28, 0x20(r1) /* 802ED6C0 002EA620 7C 08 03 A6 */ mtlr r0 /* 802ED6C4 002EA624 38 21 00 30 */ addi r1, r1, 0x30 -/* 802ED6C8 002EA628 4E 80 00 20 */ blr +/* 802ED6C8 002EA628 4E 80 00 20 */ blr .global GetFrameSizeInBytes__24RotationAndOffsetStorageCFv GetFrameSizeInBytes__24RotationAndOffsetStorageCFv: @@ -1131,7 +1131,7 @@ GetFrameSizeInBytes__24RotationAndOffsetStorageCFv: /* 802ED6D4 002EA634 1C 00 00 0C */ mulli r0, r0, 0xc /* 802ED6D8 002EA638 54 63 20 36 */ slwi r3, r3, 4 /* 802ED6DC 002EA63C 7C 63 02 14 */ add r3, r3, r0 -/* 802ED6E0 002EA640 4E 80 00 20 */ blr +/* 802ED6E0 002EA640 4E 80 00 20 */ blr .global "CopyRotationsAndOffsets__24RotationAndOffsetStorageFRCQ24rstl48vector<11CQuaternion,Q24rstl17rmemory_allocator>RCQ24rstl45vector<9CVector3f,Q24rstl17rmemory_allocator>UiPf" "CopyRotationsAndOffsets__24RotationAndOffsetStorageFRCQ24rstl48vector<11CQuaternion,Q24rstl17rmemory_allocator>RCQ24rstl45vector<9CVector3f,Q24rstl17rmemory_allocator>UiPf": @@ -1306,7 +1306,7 @@ lbl_802ED958: /* 802ED95C 002EA8BC 41 80 FD A8 */ blt lbl_802ED704 /* 802ED960 002EA8C0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802ED964 002EA8C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802ED968 002EA8C8 4E 80 00 20 */ blr +/* 802ED968 002EA8C8 4E 80 00 20 */ blr .global "GetRotationsAndOffsets__24RotationAndOffsetStorageFRCQ24rstl48vector<11CQuaternion,Q24rstl17rmemory_allocator>RCQ24rstl45vector<9CVector3f,Q24rstl17rmemory_allocator>Ui" "GetRotationsAndOffsets__24RotationAndOffsetStorageFRCQ24rstl48vector<11CQuaternion,Q24rstl17rmemory_allocator>RCQ24rstl45vector<9CVector3f,Q24rstl17rmemory_allocator>Ui": @@ -1366,7 +1366,7 @@ lbl_802EDA2C: /* 802EDA3C 002EA99C 83 81 00 10 */ lwz r28, 0x10(r1) /* 802EDA40 002EA9A0 7C 08 03 A6 */ mtlr r0 /* 802EDA44 002EA9A4 38 21 00 20 */ addi r1, r1, 0x20 -/* 802EDA48 002EA9A8 4E 80 00 20 */ blr +/* 802EDA48 002EA9A8 4E 80 00 20 */ blr .global __ct__24RotationAndOffsetStorageFRCQ224RotationAndOffsetStorage25CRotationAndOffsetVectorsUi __ct__24RotationAndOffsetStorageFRCQ224RotationAndOffsetStorage25CRotationAndOffsetVectorsUi: @@ -1408,7 +1408,7 @@ lbl_802EDAA8: /* 802EDAD4 002EAA34 80 01 00 24 */ lwz r0, 0x24(r1) /* 802EDAD8 002EAA38 7C 08 03 A6 */ mtlr r0 /* 802EDADC 002EAA3C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802EDAE0 002EAA40 4E 80 00 20 */ blr +/* 802EDAE0 002EAA40 4E 80 00 20 */ blr .global DataSizeInBytes__24RotationAndOffsetStorageFUiUiUi DataSizeInBytes__24RotationAndOffsetStorageFUiUiUi: @@ -1416,7 +1416,7 @@ DataSizeInBytes__24RotationAndOffsetStorageFUiUiUi: /* 802EDAE8 002EAA48 54 63 20 36 */ slwi r3, r3, 4 /* 802EDAEC 002EAA4C 7C 03 02 14 */ add r0, r3, r0 /* 802EDAF0 002EAA50 7C 65 01 D6 */ mullw r3, r5, r0 -/* 802EDAF4 002EAA54 4E 80 00 20 */ blr +/* 802EDAF4 002EAA54 4E 80 00 20 */ blr .global clamp_zero_to_one__Ff clamp_zero_to_one__Ff: @@ -1426,7 +1426,7 @@ clamp_zero_to_one__Ff: /* 802EDB04 002EAA64 EC 21 10 28 */ fsubs f1, f1, f2 /* 802EDB08 002EAA68 FC 01 00 AE */ fsel f0, f1, f2, f0 /* 802EDB0C 002EAA6C FC 20 00 90 */ fmr f1, f0 -/* 802EDB10 002EAA70 4E 80 00 20 */ blr +/* 802EDB10 002EAA70 4E 80 00 20 */ blr .global "copy_from__Q24rstl451red_black_tree,Q24rstl17rmemory_allocator>,i>,Q24rstl83pair,Q24rstl17rmemory_allocator>,i>,0,Q24rstl102identity,Q24rstl17rmemory_allocator>,i>>,Q24rstl98less,Q24rstl17rmemory_allocator>,i>>,Q24rstl17rmemory_allocator>FPQ34rstl451red_black_tree,Q24rstl17rmemory_allocator>,i>,Q24rstl83pair,Q24rstl17rmemory_allocator>,i>,0,Q24rstl102identity,Q24rstl17rmemory_allocator>,i>>,Q24rstl98less,Q24rstl17rmemory_allocator>,i>>,Q24rstl17rmemory_allocator>FPQ34rstl451red_black_tree,Q24rstl17rmemory_allocator>,b>,Q24rstl17rmemory_allocator>Fv" "__dt__Q24rstl127vector,Q24rstl17rmemory_allocator>,b>,Q24rstl17rmemory_allocator>Fv": @@ -1903,7 +1903,7 @@ lbl_802EE174: /* 802EE188 002EB0E8 83 81 00 20 */ lwz r28, 0x20(r1) /* 802EE18C 002EB0EC 7C 08 03 A6 */ mtlr r0 /* 802EE190 002EB0F0 38 21 00 30 */ addi r1, r1, 0x30 -/* 802EE194 002EB0F4 4E 80 00 20 */ blr +/* 802EE194 002EB0F4 4E 80 00 20 */ blr .global "__dt__Q24rstl127vector,Q24rstl17rmemory_allocator>,i>,Q24rstl17rmemory_allocator>Fv" "__dt__Q24rstl127vector,Q24rstl17rmemory_allocator>,i>,Q24rstl17rmemory_allocator>Fv": @@ -1955,7 +1955,7 @@ lbl_802EE224: /* 802EE238 002EB198 83 81 00 20 */ lwz r28, 0x20(r1) /* 802EE23C 002EB19C 7C 08 03 A6 */ mtlr r0 /* 802EE240 002EB1A0 38 21 00 30 */ addi r1, r1, 0x30 -/* 802EE244 002EB1A4 4E 80 00 20 */ blr +/* 802EE244 002EB1A4 4E 80 00 20 */ blr .global "__dt__Q24rstl159vector,Q24rstl17rmemory_allocator>,Q213CParticleData13EParentedMode>,Q24rstl17rmemory_allocator>Fv" "__dt__Q24rstl159vector,Q24rstl17rmemory_allocator>,Q213CParticleData13EParentedMode>,Q24rstl17rmemory_allocator>Fv": diff --git a/asm/Kyoto/Animation/CAnimSourceReader.s b/asm/Kyoto/Animation/CAnimSourceReader.s index 8ece189b..499d33e2 100644 --- a/asm/Kyoto/Animation/CAnimSourceReader.s +++ b/asm/Kyoto/Animation/CAnimSourceReader.s @@ -57,7 +57,7 @@ lbl_803ECFE4: .4byte 0 .4byte 0 .4byte sub_802ee0a0 - + .section .sdata .global lbl_805A8788 @@ -323,12 +323,12 @@ lbl_802EE68C: /* 802EE6BC 002EB61C 83 81 01 40 */ lwz r28, 0x140(r1) /* 802EE6C0 002EB620 7C 08 03 A6 */ mtlr r0 /* 802EE6C4 002EB624 38 21 01 90 */ addi r1, r1, 0x190 -/* 802EE6C8 002EB628 4E 80 00 20 */ blr +/* 802EE6C8 002EB628 4E 80 00 20 */ blr .global VSupportsReverseView__17CAnimSourceReaderCFv VSupportsReverseView__17CAnimSourceReaderCFv: /* 802EE6CC 002EB62C 38 60 00 01 */ li r3, 1 -/* 802EE6D0 002EB630 4E 80 00 20 */ blr +/* 802EE6D0 002EB630 4E 80 00 20 */ blr .global VSetPhase__17CAnimSourceReaderFf VSetPhase__17CAnimSourceReaderFf: @@ -391,7 +391,7 @@ lbl_802EE7A0: /* 802EE7B0 002EB710 83 C1 00 38 */ lwz r30, 0x38(r1) /* 802EE7B4 002EB714 7C 08 03 A6 */ mtlr r0 /* 802EE7B8 002EB718 38 21 00 50 */ addi r1, r1, 0x50 -/* 802EE7BC 002EB71C 4E 80 00 20 */ blr +/* 802EE7BC 002EB71C 4E 80 00 20 */ blr .global VReverseView__17CAnimSourceReaderFRC13CCharAnimTime VReverseView__17CAnimSourceReaderFRC13CCharAnimTime: @@ -643,7 +643,7 @@ lbl_802EEB50: /* 802EEB80 002EBAE0 83 81 01 40 */ lwz r28, 0x140(r1) /* 802EEB84 002EBAE4 7C 08 03 A6 */ mtlr r0 /* 802EEB88 002EBAE8 38 21 01 90 */ addi r1, r1, 0x190 -/* 802EEB8C 002EBAEC 4E 80 00 20 */ blr +/* 802EEB8C 002EBAEC 4E 80 00 20 */ blr .global sub_802eeb90 sub_802eeb90: @@ -688,7 +688,7 @@ lbl_802EEC08: /* 802EEC24 002EBB84 83 C1 00 18 */ lwz r30, 0x18(r1) /* 802EEC28 002EBB88 7C 08 03 A6 */ mtlr r0 /* 802EEC2C 002EBB8C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802EEC30 002EBB90 4E 80 00 20 */ blr +/* 802EEC30 002EBB90 4E 80 00 20 */ blr .global sub_802eec34 sub_802eec34: @@ -759,7 +759,7 @@ lbl_802EECD4: /* 802EED30 002EBC90 38 80 00 01 */ li r4, 1 /* 802EED34 002EBC94 81 8C 00 20 */ lwz r12, 0x20(r12) /* 802EED38 002EBC98 7D 89 03 A6 */ mtctr r12 -/* 802EED3C 002EBC9C 4E 80 04 21 */ bctrl +/* 802EED3C 002EBC9C 4E 80 04 21 */ bctrl lbl_802EED40: /* 802EED40 002EBCA0 3C 60 80 3F */ lis r3, lbl_803ECF58@ha /* 802EED44 002EBCA4 3A 93 00 54 */ addi r20, r19, 0x54 @@ -791,7 +791,7 @@ lbl_802EED40: /* 802EEDAC 002EBD0C 80 01 00 54 */ lwz r0, 0x54(r1) /* 802EEDB0 002EBD10 7C 08 03 A6 */ mtlr r0 /* 802EEDB4 002EBD14 38 21 00 50 */ addi r1, r1, 0x50 -/* 802EEDB8 002EBD18 4E 80 00 20 */ blr +/* 802EEDB8 002EBD18 4E 80 00 20 */ blr .global sub_802eedbc sub_802eedbc: @@ -972,7 +972,7 @@ lbl_802EF018: /* 802EF020 002EBF80 80 01 00 34 */ lwz r0, 0x34(r1) /* 802EF024 002EBF84 7C 08 03 A6 */ mtlr r0 /* 802EF028 002EBF88 38 21 00 30 */ addi r1, r1, 0x30 -/* 802EF02C 002EBF8C 4E 80 00 20 */ blr +/* 802EF02C 002EBF8C 4E 80 00 20 */ blr .global VGetSegStatementSet__17CAnimSourceReaderCFRC10CSegIdListR16CSegStatementSetRC13CCharAnimTime VGetSegStatementSet__17CAnimSourceReaderCFRC10CSegIdListR16CSegStatementSetRC13CCharAnimTime: @@ -984,7 +984,7 @@ VGetSegStatementSet__17CAnimSourceReaderCFRC10CSegIdListR16CSegStatementSetRC13C /* 802EF044 002EBFA4 80 01 00 14 */ lwz r0, 0x14(r1) /* 802EF048 002EBFA8 7C 08 03 A6 */ mtlr r0 /* 802EF04C 002EBFAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EF050 002EBFB0 4E 80 00 20 */ blr +/* 802EF050 002EBFB0 4E 80 00 20 */ blr .global VGetSegStatementSet__17CAnimSourceReaderCFRC10CSegIdListR16CSegStatementSet VGetSegStatementSet__17CAnimSourceReaderCFRC10CSegIdListR16CSegStatementSet: @@ -998,7 +998,7 @@ VGetSegStatementSet__17CAnimSourceReaderCFRC10CSegIdListR16CSegStatementSet: /* 802EF070 002EBFD0 80 01 00 14 */ lwz r0, 0x14(r1) /* 802EF074 002EBFD4 7C 08 03 A6 */ mtlr r0 /* 802EF078 002EBFD8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EF07C 002EBFDC 4E 80 00 20 */ blr +/* 802EF07C 002EBFDC 4E 80 00 20 */ blr .global VGetRotation__17CAnimSourceReaderCFRC6CSegId VGetRotation__17CAnimSourceReaderCFRC6CSegId: @@ -1015,7 +1015,7 @@ VGetRotation__17CAnimSourceReaderCFRC6CSegId: /* 802EF0A8 002EC008 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802EF0AC 002EC00C 7C 08 03 A6 */ mtlr r0 /* 802EF0B0 002EC010 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EF0B4 002EC014 4E 80 00 20 */ blr +/* 802EF0B4 002EC014 4E 80 00 20 */ blr .global VGetOffset__17CAnimSourceReaderCFRC6CSegIdRC13CCharAnimTime VGetOffset__17CAnimSourceReaderCFRC6CSegIdRC13CCharAnimTime: @@ -1030,7 +1030,7 @@ VGetOffset__17CAnimSourceReaderCFRC6CSegIdRC13CCharAnimTime: /* 802EF0D8 002EC038 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802EF0DC 002EC03C 7C 08 03 A6 */ mtlr r0 /* 802EF0E0 002EC040 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EF0E4 002EC044 4E 80 00 20 */ blr +/* 802EF0E4 002EC044 4E 80 00 20 */ blr .global VGetOffset__17CAnimSourceReaderCFRC6CSegId VGetOffset__17CAnimSourceReaderCFRC6CSegId: @@ -1047,7 +1047,7 @@ VGetOffset__17CAnimSourceReaderCFRC6CSegId: /* 802EF110 002EC070 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802EF114 002EC074 7C 08 03 A6 */ mtlr r0 /* 802EF118 002EC078 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EF11C 002EC07C 4E 80 00 20 */ blr +/* 802EF11C 002EC07C 4E 80 00 20 */ blr .global VHasOffset__17CAnimSourceReaderCFRC6CSegId VHasOffset__17CAnimSourceReaderCFRC6CSegId: @@ -1059,7 +1059,7 @@ VHasOffset__17CAnimSourceReaderCFRC6CSegId: /* 802EF134 002EC094 80 01 00 14 */ lwz r0, 0x14(r1) /* 802EF138 002EC098 7C 08 03 A6 */ mtlr r0 /* 802EF13C 002EC09C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EF140 002EC0A0 4E 80 00 20 */ blr +/* 802EF140 002EC0A0 4E 80 00 20 */ blr .global VGetSteadyStateAnimInfo__17CAnimSourceReaderCFv VGetSteadyStateAnimInfo__17CAnimSourceReaderCFv: @@ -1075,7 +1075,7 @@ VGetSteadyStateAnimInfo__17CAnimSourceReaderCFv: /* 802EF168 002EC0C8 D0 03 00 10 */ stfs f0, 0x10(r3) /* 802EF16C 002EC0CC 88 04 00 78 */ lbz r0, 0x78(r4) /* 802EF170 002EC0D0 98 03 00 14 */ stb r0, 0x14(r3) -/* 802EF174 002EC0D4 4E 80 00 20 */ blr +/* 802EF174 002EC0D4 4E 80 00 20 */ blr .global VGetTimeRemaining__17CAnimSourceReaderCFv VGetTimeRemaining__17CAnimSourceReaderCFv: @@ -1092,7 +1092,7 @@ VGetTimeRemaining__17CAnimSourceReaderCFv: /* 802EF1A0 002EC100 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802EF1A4 002EC104 7C 08 03 A6 */ mtlr r0 /* 802EF1A8 002EC108 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EF1AC 002EC10C 4E 80 00 20 */ blr +/* 802EF1AC 002EC10C 4E 80 00 20 */ blr .global VAdvanceView__17CAnimSourceReaderFRC13CCharAnimTime VAdvanceView__17CAnimSourceReaderFRC13CCharAnimTime: @@ -1349,7 +1349,7 @@ lbl_802EF550: /* 802EF580 002EC4E0 83 81 01 30 */ lwz r28, 0x130(r1) /* 802EF584 002EC4E4 7C 08 03 A6 */ mtlr r0 /* 802EF588 002EC4E8 38 21 01 80 */ addi r1, r1, 0x180 -/* 802EF58C 002EC4EC 4E 80 00 20 */ blr +/* 802EF58C 002EC4EC 4E 80 00 20 */ blr .global "__ct__17CAnimSourceReaderFRC32TSubAnimTypeToken<11CAnimSource>RC13CCharAnimTime" "__ct__17CAnimSourceReaderFRC32TSubAnimTypeToken<11CAnimSource>RC13CCharAnimTime": @@ -1422,7 +1422,7 @@ lbl_802EF610: /* 802EF694 002EC5F4 38 80 00 01 */ li r4, 1 /* 802EF698 002EC5F8 81 8C 00 20 */ lwz r12, 0x20(r12) /* 802EF69C 002EC5FC 7D 89 03 A6 */ mtctr r12 -/* 802EF6A0 002EC600 4E 80 04 21 */ bctrl +/* 802EF6A0 002EC600 4E 80 04 21 */ bctrl lbl_802EF6A4: /* 802EF6A4 002EC604 3C 60 80 3F */ lis r3, lbl_803ECF58@ha /* 802EF6A8 002EC608 3B 7C 00 54 */ addi r27, r28, 0x54 @@ -1513,7 +1513,7 @@ lbl_802EF7D4: /* 802EF7E0 002EC740 83 C1 00 08 */ lwz r30, 8(r1) /* 802EF7E4 002EC744 7C 08 03 A6 */ mtlr r0 /* 802EF7E8 002EC748 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EF7EC 002EC74C 4E 80 00 20 */ blr +/* 802EF7EC 002EC74C 4E 80 00 20 */ blr .global HasPOIData__15CAnimSourceInfoCFv HasPOIData__15CAnimSourceInfoCFv: @@ -1522,7 +1522,7 @@ HasPOIData__15CAnimSourceInfoCFv: /* 802EF7F8 002EC758 7C 03 00 D0 */ neg r0, r3 /* 802EF7FC 002EC75C 7C 00 1B 78 */ or r0, r0, r3 /* 802EF800 002EC760 54 03 0F FE */ srwi r3, r0, 0x1f -/* 802EF804 002EC764 4E 80 00 20 */ blr +/* 802EF804 002EC764 4E 80 00 20 */ blr .global GetBoolPOIStream__15CAnimSourceInfoCFv GetBoolPOIStream__15CAnimSourceInfoCFv: @@ -1534,7 +1534,7 @@ GetBoolPOIStream__15CAnimSourceInfoCFv: /* 802EF81C 002EC77C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802EF820 002EC780 7C 08 03 A6 */ mtlr r0 /* 802EF824 002EC784 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EF828 002EC788 4E 80 00 20 */ blr +/* 802EF828 002EC788 4E 80 00 20 */ blr .global GetInt32POIStream__15CAnimSourceInfoCFv GetInt32POIStream__15CAnimSourceInfoCFv: @@ -1546,7 +1546,7 @@ GetInt32POIStream__15CAnimSourceInfoCFv: /* 802EF840 002EC7A0 80 01 00 14 */ lwz r0, 0x14(r1) /* 802EF844 002EC7A4 7C 08 03 A6 */ mtlr r0 /* 802EF848 002EC7A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EF84C 002EC7AC 4E 80 00 20 */ blr +/* 802EF84C 002EC7AC 4E 80 00 20 */ blr .global GetParticlePOIStream__15CAnimSourceInfoCFv GetParticlePOIStream__15CAnimSourceInfoCFv: @@ -1558,7 +1558,7 @@ GetParticlePOIStream__15CAnimSourceInfoCFv: /* 802EF864 002EC7C4 80 01 00 14 */ lwz r0, 0x14(r1) /* 802EF868 002EC7C8 7C 08 03 A6 */ mtlr r0 /* 802EF86C 002EC7CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EF870 002EC7D0 4E 80 00 20 */ blr +/* 802EF870 002EC7D0 4E 80 00 20 */ blr .global GetSoundPOIStream__15CAnimSourceInfoCFv GetSoundPOIStream__15CAnimSourceInfoCFv: @@ -1570,7 +1570,7 @@ GetSoundPOIStream__15CAnimSourceInfoCFv: /* 802EF888 002EC7E8 80 01 00 14 */ lwz r0, 0x14(r1) /* 802EF88C 002EC7EC 7C 08 03 A6 */ mtlr r0 /* 802EF890 002EC7F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EF894 002EC7F4 4E 80 00 20 */ blr +/* 802EF894 002EC7F4 4E 80 00 20 */ blr .global GetAnimationDuration__15CAnimSourceInfoCFv GetAnimationDuration__15CAnimSourceInfoCFv: diff --git a/asm/Kyoto/Animation/CAnimSourceReaderBase.s b/asm/Kyoto/Animation/CAnimSourceReaderBase.s index 839c0c93..ed959d8b 100644 --- a/asm/Kyoto/Animation/CAnimSourceReaderBase.s +++ b/asm/Kyoto/Animation/CAnimSourceReaderBase.s @@ -82,7 +82,7 @@ PostConstruct__21CAnimSourceReaderBaseFRC13CCharAnimTime: /* 802EF8E4 002EC844 7F 63 DB 78 */ mr r3, r27 /* 802EF8E8 002EC848 81 8C 00 08 */ lwz r12, 8(r12) /* 802EF8EC 002EC84C 7D 89 03 A6 */ mtctr r12 -/* 802EF8F0 002EC850 4E 80 04 21 */ bctrl +/* 802EF8F0 002EC850 4E 80 04 21 */ bctrl /* 802EF8F4 002EC854 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802EF8F8 002EC858 41 82 05 14 */ beq lbl_802EFE0C /* 802EF8FC 002EC85C 7F E4 FB 78 */ mr r4, r31 @@ -462,7 +462,7 @@ lbl_802EFE30: /* 802EFE3C 002ECD9C 38 A1 00 08 */ addi r5, r1, 8 /* 802EFE40 002ECDA0 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802EFE44 002ECDA4 7D 89 03 A6 */ mtctr r12 -/* 802EFE48 002ECDA8 4E 80 04 21 */ bctrl +/* 802EFE48 002ECDA8 4E 80 04 21 */ bctrl /* 802EFE4C 002ECDAC C0 01 01 60 */ lfs f0, 0x160(r1) /* 802EFE50 002ECDB0 80 01 01 64 */ lwz r0, 0x164(r1) /* 802EFE54 002ECDB4 D0 01 00 08 */ stfs f0, 8(r1) @@ -478,7 +478,7 @@ lbl_802EFE70: /* 802EFE74 002ECDD4 81 9B 00 00 */ lwz r12, 0(r27) /* 802EFE78 002ECDD8 81 8C 00 08 */ lwz r12, 8(r12) /* 802EFE7C 002ECDDC 7D 89 03 A6 */ mtctr r12 -/* 802EFE80 002ECDE0 4E 80 04 21 */ bctrl +/* 802EFE80 002ECDE0 4E 80 04 21 */ bctrl /* 802EFE84 002ECDE4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802EFE88 002ECDE8 41 82 00 30 */ beq lbl_802EFEB8 /* 802EFE8C 002ECDEC 7F E3 FB 78 */ mr r3, r31 @@ -497,7 +497,7 @@ lbl_802EFEB8: /* 802EFEBC 002ECE1C 80 01 01 B4 */ lwz r0, 0x1b4(r1) /* 802EFEC0 002ECE20 7C 08 03 A6 */ mtlr r0 /* 802EFEC4 002ECE24 38 21 01 B0 */ addi r1, r1, 0x1b0 -/* 802EFEC8 002ECE28 4E 80 00 20 */ blr +/* 802EFEC8 002ECE28 4E 80 00 20 */ blr .global sub_802efecc sub_802efecc: @@ -565,7 +565,7 @@ lbl_802EFF98: /* 802EFF9C 002ECEFC 80 01 00 34 */ lwz r0, 0x34(r1) /* 802EFFA0 002ECF00 7C 08 03 A6 */ mtlr r0 /* 802EFFA4 002ECF04 38 21 00 30 */ addi r1, r1, 0x30 -/* 802EFFA8 002ECF08 4E 80 00 20 */ blr +/* 802EFFA8 002ECF08 4E 80 00 20 */ blr .global sub_802effac sub_802effac: @@ -633,7 +633,7 @@ lbl_802F0078: /* 802F007C 002ECFDC 80 01 00 34 */ lwz r0, 0x34(r1) /* 802F0080 002ECFE0 7C 08 03 A6 */ mtlr r0 /* 802F0084 002ECFE4 38 21 00 30 */ addi r1, r1, 0x30 -/* 802F0088 002ECFE8 4E 80 00 20 */ blr +/* 802F0088 002ECFE8 4E 80 00 20 */ blr .global sub_802f008c sub_802f008c: @@ -701,7 +701,7 @@ lbl_802F0158: /* 802F015C 002ED0BC 80 01 00 34 */ lwz r0, 0x34(r1) /* 802F0160 002ED0C0 7C 08 03 A6 */ mtlr r0 /* 802F0164 002ED0C4 38 21 00 30 */ addi r1, r1, 0x30 -/* 802F0168 002ED0C8 4E 80 00 20 */ blr +/* 802F0168 002ED0C8 4E 80 00 20 */ blr .global GetUniqueParticlePOIs__21CAnimSourceReaderBaseCFv GetUniqueParticlePOIs__21CAnimSourceReaderBaseCFv: @@ -714,7 +714,7 @@ GetUniqueParticlePOIs__21CAnimSourceReaderBaseCFv: /* 802F0184 002ED0E4 81 83 00 00 */ lwz r12, 0(r3) /* 802F0188 002ED0E8 81 8C 00 14 */ lwz r12, 0x14(r12) /* 802F018C 002ED0EC 7D 89 03 A6 */ mtctr r12 -/* 802F0190 002ED0F0 4E 80 04 21 */ bctrl +/* 802F0190 002ED0F0 4E 80 04 21 */ bctrl /* 802F0194 002ED0F4 7C 7E 1B 78 */ mr r30, r3 /* 802F0198 002ED0F8 83 A3 00 04 */ lwz r29, 4(r3) /* 802F019C 002ED0FC 3B 60 00 00 */ li r27, 0 @@ -804,7 +804,7 @@ lbl_802F02AC: /* 802F02C4 002ED224 80 01 00 64 */ lwz r0, 0x64(r1) /* 802F02C8 002ED228 7C 08 03 A6 */ mtlr r0 /* 802F02CC 002ED22C 38 21 00 60 */ addi r1, r1, 0x60 -/* 802F02D0 002ED230 4E 80 00 20 */ blr +/* 802F02D0 002ED230 4E 80 00 20 */ blr .global GetUniqueInt32POIs__21CAnimSourceReaderBaseCFv GetUniqueInt32POIs__21CAnimSourceReaderBaseCFv: @@ -817,7 +817,7 @@ GetUniqueInt32POIs__21CAnimSourceReaderBaseCFv: /* 802F02EC 002ED24C 81 83 00 00 */ lwz r12, 0(r3) /* 802F02F0 002ED250 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802F02F4 002ED254 7D 89 03 A6 */ mtctr r12 -/* 802F02F8 002ED258 4E 80 04 21 */ bctrl +/* 802F02F8 002ED258 4E 80 04 21 */ bctrl /* 802F02FC 002ED25C 7C 7E 1B 78 */ mr r30, r3 /* 802F0300 002ED260 83 A3 00 04 */ lwz r29, 4(r3) /* 802F0304 002ED264 3B 60 00 00 */ li r27, 0 @@ -907,7 +907,7 @@ lbl_802F0414: /* 802F042C 002ED38C 80 01 00 64 */ lwz r0, 0x64(r1) /* 802F0430 002ED390 7C 08 03 A6 */ mtlr r0 /* 802F0434 002ED394 38 21 00 60 */ addi r1, r1, 0x60 -/* 802F0438 002ED398 4E 80 00 20 */ blr +/* 802F0438 002ED398 4E 80 00 20 */ blr .global GetUniqueBoolPOIs__21CAnimSourceReaderBaseCFv GetUniqueBoolPOIs__21CAnimSourceReaderBaseCFv: @@ -920,7 +920,7 @@ GetUniqueBoolPOIs__21CAnimSourceReaderBaseCFv: /* 802F0454 002ED3B4 81 83 00 00 */ lwz r12, 0(r3) /* 802F0458 002ED3B8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802F045C 002ED3BC 7D 89 03 A6 */ mtctr r12 -/* 802F0460 002ED3C0 4E 80 04 21 */ bctrl +/* 802F0460 002ED3C0 4E 80 04 21 */ bctrl /* 802F0464 002ED3C4 7C 7E 1B 78 */ mr r30, r3 /* 802F0468 002ED3C8 83 A3 00 04 */ lwz r29, 4(r3) /* 802F046C 002ED3CC 3B 60 00 00 */ li r27, 0 @@ -1010,7 +1010,7 @@ lbl_802F057C: /* 802F0594 002ED4F4 80 01 00 64 */ lwz r0, 0x64(r1) /* 802F0598 002ED4F8 7C 08 03 A6 */ mtlr r0 /* 802F059C 002ED4FC 38 21 00 60 */ addi r1, r1, 0x60 -/* 802F05A0 002ED500 4E 80 00 20 */ blr +/* 802F05A0 002ED500 4E 80 00 20 */ blr .global UpdatePOIStates__21CAnimSourceReaderBaseFv UpdatePOIStates__21CAnimSourceReaderBaseFv: @@ -1024,25 +1024,25 @@ UpdatePOIStates__21CAnimSourceReaderBaseFv: /* 802F05C0 002ED520 7F 03 C3 78 */ mr r3, r24 /* 802F05C4 002ED524 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802F05C8 002ED528 7D 89 03 A6 */ mtctr r12 -/* 802F05CC 002ED52C 4E 80 04 21 */ bctrl +/* 802F05CC 002ED52C 4E 80 04 21 */ bctrl /* 802F05D0 002ED530 7C 7C 1B 78 */ mr r28, r3 /* 802F05D4 002ED534 7F 03 C3 78 */ mr r3, r24 /* 802F05D8 002ED538 81 98 00 00 */ lwz r12, 0(r24) /* 802F05DC 002ED53C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802F05E0 002ED540 7D 89 03 A6 */ mtctr r12 -/* 802F05E4 002ED544 4E 80 04 21 */ bctrl +/* 802F05E4 002ED544 4E 80 04 21 */ bctrl /* 802F05E8 002ED548 7C 7D 1B 78 */ mr r29, r3 /* 802F05EC 002ED54C 7F 03 C3 78 */ mr r3, r24 /* 802F05F0 002ED550 81 98 00 00 */ lwz r12, 0(r24) /* 802F05F4 002ED554 81 8C 00 14 */ lwz r12, 0x14(r12) /* 802F05F8 002ED558 7D 89 03 A6 */ mtctr r12 -/* 802F05FC 002ED55C 4E 80 04 21 */ bctrl +/* 802F05FC 002ED55C 4E 80 04 21 */ bctrl /* 802F0600 002ED560 7C 7E 1B 78 */ mr r30, r3 /* 802F0604 002ED564 7F 03 C3 78 */ mr r3, r24 /* 802F0608 002ED568 81 98 00 00 */ lwz r12, 0(r24) /* 802F060C 002ED56C 81 8C 00 18 */ lwz r12, 0x18(r12) /* 802F0610 002ED570 7D 89 03 A6 */ mtctr r12 -/* 802F0614 002ED574 4E 80 04 21 */ bctrl +/* 802F0614 002ED574 4E 80 04 21 */ bctrl /* 802F0618 002ED578 7C 7F 1B 78 */ mr r31, r3 /* 802F061C 002ED57C 83 7C 00 04 */ lwz r27, 4(r28) /* 802F0620 002ED580 83 5D 00 04 */ lwz r26, 4(r29) @@ -1193,7 +1193,7 @@ lbl_802F0830: /* 802F0834 002ED794 80 01 00 84 */ lwz r0, 0x84(r1) /* 802F0838 002ED798 7C 08 03 A6 */ mtlr r0 /* 802F083C 002ED79C 38 21 00 80 */ addi r1, r1, 0x80 -/* 802F0840 002ED7A0 4E 80 00 20 */ blr +/* 802F0840 002ED7A0 4E 80 00 20 */ blr .global VGetParticlePOIState__21CAnimSourceReaderBaseCFPCc VGetParticlePOIState__21CAnimSourceReaderBaseCFPCc: @@ -1231,7 +1231,7 @@ lbl_802F08AC: /* 802F08B0 002ED810 80 01 00 24 */ lwz r0, 0x24(r1) /* 802F08B4 002ED814 7C 08 03 A6 */ mtlr r0 /* 802F08B8 002ED818 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F08BC 002ED81C 4E 80 00 20 */ blr +/* 802F08BC 002ED81C 4E 80 00 20 */ blr .global AreStringsEqual__21CAnimSourceReaderBaseFPCcPCc AreStringsEqual__21CAnimSourceReaderBaseFPCcPCc: @@ -1245,7 +1245,7 @@ AreStringsEqual__21CAnimSourceReaderBaseFPCcPCc: /* 802F08DC 002ED83C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F08E0 002ED840 7C 08 03 A6 */ mtlr r0 /* 802F08E4 002ED844 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F08E8 002ED848 4E 80 00 20 */ blr +/* 802F08E8 002ED848 4E 80 00 20 */ blr .global VGetInt32POIState__21CAnimSourceReaderBaseCFPCc VGetInt32POIState__21CAnimSourceReaderBaseCFPCc: @@ -1283,7 +1283,7 @@ lbl_802F0954: /* 802F0958 002ED8B8 80 01 00 24 */ lwz r0, 0x24(r1) /* 802F095C 002ED8BC 7C 08 03 A6 */ mtlr r0 /* 802F0960 002ED8C0 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F0964 002ED8C4 4E 80 00 20 */ blr +/* 802F0964 002ED8C4 4E 80 00 20 */ blr .global VGetBoolPOIState__21CAnimSourceReaderBaseCFPCc VGetBoolPOIState__21CAnimSourceReaderBaseCFPCc: @@ -1321,7 +1321,7 @@ lbl_802F09D0: /* 802F09D4 002ED934 80 01 00 24 */ lwz r0, 0x24(r1) /* 802F09D8 002ED938 7C 08 03 A6 */ mtlr r0 /* 802F09DC 002ED93C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F09E0 002ED940 4E 80 00 20 */ blr +/* 802F09E0 002ED940 4E 80 00 20 */ blr .global VGetSoundPOIList__21CAnimSourceReaderBaseCFRC13CCharAnimTimeP13CSoundPOINodeUiUii VGetSoundPOIList__21CAnimSourceReaderBaseCFRC13CCharAnimTimeP13CSoundPOINodeUiUii: @@ -1339,7 +1339,7 @@ VGetSoundPOIList__21CAnimSourceReaderBaseCFRC13CCharAnimTimeP13CSoundPOINodeUiUi /* 802F0A10 002ED970 81 83 00 00 */ lwz r12, 0(r3) /* 802F0A14 002ED974 81 8C 00 08 */ lwz r12, 8(r12) /* 802F0A18 002ED978 7D 89 03 A6 */ mtctr r12 -/* 802F0A1C 002ED97C 4E 80 04 21 */ bctrl +/* 802F0A1C 002ED97C 4E 80 04 21 */ bctrl /* 802F0A20 002ED980 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802F0A24 002ED984 41 82 00 4C */ beq lbl_802F0A70 /* 802F0A28 002ED988 83 F9 00 04 */ lwz r31, 4(r25) @@ -1347,7 +1347,7 @@ VGetSoundPOIList__21CAnimSourceReaderBaseCFRC13CCharAnimTimeP13CSoundPOINodeUiUi /* 802F0A30 002ED990 81 9F 00 00 */ lwz r12, 0(r31) /* 802F0A34 002ED994 81 8C 00 18 */ lwz r12, 0x18(r12) /* 802F0A38 002ED998 7D 89 03 A6 */ mtctr r12 -/* 802F0A3C 002ED99C 4E 80 04 21 */ bctrl +/* 802F0A3C 002ED99C 4E 80 04 21 */ bctrl /* 802F0A40 002ED9A0 80 19 00 20 */ lwz r0, 0x20(r25) /* 802F0A44 002ED9A4 7C 68 1B 78 */ mr r8, r3 /* 802F0A48 002ED9A8 7F 43 D3 78 */ mr r3, r26 @@ -1367,7 +1367,7 @@ lbl_802F0A74: /* 802F0A78 002ED9D8 80 01 00 34 */ lwz r0, 0x34(r1) /* 802F0A7C 002ED9DC 7C 08 03 A6 */ mtlr r0 /* 802F0A80 002ED9E0 38 21 00 30 */ addi r1, r1, 0x30 -/* 802F0A84 002ED9E4 4E 80 00 20 */ blr +/* 802F0A84 002ED9E4 4E 80 00 20 */ blr .global VGetParticlePOIList__21CAnimSourceReaderBaseCFRC13CCharAnimTimeP16CParticlePOINodeUiUii VGetParticlePOIList__21CAnimSourceReaderBaseCFRC13CCharAnimTimeP16CParticlePOINodeUiUii: @@ -1385,7 +1385,7 @@ VGetParticlePOIList__21CAnimSourceReaderBaseCFRC13CCharAnimTimeP16CParticlePOINo /* 802F0AB4 002EDA14 81 83 00 00 */ lwz r12, 0(r3) /* 802F0AB8 002EDA18 81 8C 00 08 */ lwz r12, 8(r12) /* 802F0ABC 002EDA1C 7D 89 03 A6 */ mtctr r12 -/* 802F0AC0 002EDA20 4E 80 04 21 */ bctrl +/* 802F0AC0 002EDA20 4E 80 04 21 */ bctrl /* 802F0AC4 002EDA24 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802F0AC8 002EDA28 41 82 00 4C */ beq lbl_802F0B14 /* 802F0ACC 002EDA2C 83 F9 00 04 */ lwz r31, 4(r25) @@ -1393,7 +1393,7 @@ VGetParticlePOIList__21CAnimSourceReaderBaseCFRC13CCharAnimTimeP16CParticlePOINo /* 802F0AD4 002EDA34 81 9F 00 00 */ lwz r12, 0(r31) /* 802F0AD8 002EDA38 81 8C 00 14 */ lwz r12, 0x14(r12) /* 802F0ADC 002EDA3C 7D 89 03 A6 */ mtctr r12 -/* 802F0AE0 002EDA40 4E 80 04 21 */ bctrl +/* 802F0AE0 002EDA40 4E 80 04 21 */ bctrl /* 802F0AE4 002EDA44 80 19 00 1C */ lwz r0, 0x1c(r25) /* 802F0AE8 002EDA48 7C 68 1B 78 */ mr r8, r3 /* 802F0AEC 002EDA4C 7F 43 D3 78 */ mr r3, r26 @@ -1413,7 +1413,7 @@ lbl_802F0B18: /* 802F0B1C 002EDA7C 80 01 00 34 */ lwz r0, 0x34(r1) /* 802F0B20 002EDA80 7C 08 03 A6 */ mtlr r0 /* 802F0B24 002EDA84 38 21 00 30 */ addi r1, r1, 0x30 -/* 802F0B28 002EDA88 4E 80 00 20 */ blr +/* 802F0B28 002EDA88 4E 80 00 20 */ blr .global VGetInt32POIList__21CAnimSourceReaderBaseCFRC13CCharAnimTimeP13CInt32POINodeUiUii VGetInt32POIList__21CAnimSourceReaderBaseCFRC13CCharAnimTimeP13CInt32POINodeUiUii: @@ -1431,7 +1431,7 @@ VGetInt32POIList__21CAnimSourceReaderBaseCFRC13CCharAnimTimeP13CInt32POINodeUiUi /* 802F0B58 002EDAB8 81 83 00 00 */ lwz r12, 0(r3) /* 802F0B5C 002EDABC 81 8C 00 08 */ lwz r12, 8(r12) /* 802F0B60 002EDAC0 7D 89 03 A6 */ mtctr r12 -/* 802F0B64 002EDAC4 4E 80 04 21 */ bctrl +/* 802F0B64 002EDAC4 4E 80 04 21 */ bctrl /* 802F0B68 002EDAC8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802F0B6C 002EDACC 41 82 00 4C */ beq lbl_802F0BB8 /* 802F0B70 002EDAD0 83 F9 00 04 */ lwz r31, 4(r25) @@ -1439,7 +1439,7 @@ VGetInt32POIList__21CAnimSourceReaderBaseCFRC13CCharAnimTimeP13CInt32POINodeUiUi /* 802F0B78 002EDAD8 81 9F 00 00 */ lwz r12, 0(r31) /* 802F0B7C 002EDADC 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802F0B80 002EDAE0 7D 89 03 A6 */ mtctr r12 -/* 802F0B84 002EDAE4 4E 80 04 21 */ bctrl +/* 802F0B84 002EDAE4 4E 80 04 21 */ bctrl /* 802F0B88 002EDAE8 80 19 00 18 */ lwz r0, 0x18(r25) /* 802F0B8C 002EDAEC 7C 68 1B 78 */ mr r8, r3 /* 802F0B90 002EDAF0 7F 43 D3 78 */ mr r3, r26 @@ -1459,7 +1459,7 @@ lbl_802F0BBC: /* 802F0BC0 002EDB20 80 01 00 34 */ lwz r0, 0x34(r1) /* 802F0BC4 002EDB24 7C 08 03 A6 */ mtlr r0 /* 802F0BC8 002EDB28 38 21 00 30 */ addi r1, r1, 0x30 -/* 802F0BCC 002EDB2C 4E 80 00 20 */ blr +/* 802F0BCC 002EDB2C 4E 80 00 20 */ blr .global VGetBoolPOIList__21CAnimSourceReaderBaseCFRC13CCharAnimTimeP12CBoolPOINodeUiUii VGetBoolPOIList__21CAnimSourceReaderBaseCFRC13CCharAnimTimeP12CBoolPOINodeUiUii: @@ -1477,7 +1477,7 @@ VGetBoolPOIList__21CAnimSourceReaderBaseCFRC13CCharAnimTimeP12CBoolPOINodeUiUii: /* 802F0BFC 002EDB5C 81 83 00 00 */ lwz r12, 0(r3) /* 802F0C00 002EDB60 81 8C 00 08 */ lwz r12, 8(r12) /* 802F0C04 002EDB64 7D 89 03 A6 */ mtctr r12 -/* 802F0C08 002EDB68 4E 80 04 21 */ bctrl +/* 802F0C08 002EDB68 4E 80 04 21 */ bctrl /* 802F0C0C 002EDB6C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802F0C10 002EDB70 41 82 00 4C */ beq lbl_802F0C5C /* 802F0C14 002EDB74 83 F9 00 04 */ lwz r31, 4(r25) @@ -1485,7 +1485,7 @@ VGetBoolPOIList__21CAnimSourceReaderBaseCFRC13CCharAnimTimeP12CBoolPOINodeUiUii: /* 802F0C1C 002EDB7C 81 9F 00 00 */ lwz r12, 0(r31) /* 802F0C20 002EDB80 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802F0C24 002EDB84 7D 89 03 A6 */ mtctr r12 -/* 802F0C28 002EDB88 4E 80 04 21 */ bctrl +/* 802F0C28 002EDB88 4E 80 04 21 */ bctrl /* 802F0C2C 002EDB8C 80 19 00 14 */ lwz r0, 0x14(r25) /* 802F0C30 002EDB90 7C 68 1B 78 */ mr r8, r3 /* 802F0C34 002EDB94 7F 43 D3 78 */ mr r3, r26 @@ -1505,7 +1505,7 @@ lbl_802F0C60: /* 802F0C64 002EDBC4 80 01 00 34 */ lwz r0, 0x34(r1) /* 802F0C68 002EDBC8 7C 08 03 A6 */ mtlr r0 /* 802F0C6C 002EDBCC 38 21 00 30 */ addi r1, r1, 0x30 -/* 802F0C70 002EDBD0 4E 80 00 20 */ blr +/* 802F0C70 002EDBD0 4E 80 00 20 */ blr .global "_getPOIList<12CBoolPOINode>__FRC13CCharAnimTimeP12CBoolPOINodeUiUiiRCQ24rstl49vector<12CBoolPOINode,Q24rstl17rmemory_allocator>RC13CCharAnimTimeRC15IAnimSourceInfoi" "_getPOIList<12CBoolPOINode>__FRC13CCharAnimTimeP12CBoolPOINodeUiUiiRCQ24rstl49vector<12CBoolPOINode,Q24rstl17rmemory_allocator>RC13CCharAnimTimeRC15IAnimSourceInfoi": @@ -1526,7 +1526,7 @@ lbl_802F0C60: /* 802F0CAC 002EDC0C 81 9A 00 00 */ lwz r12, 0(r26) /* 802F0CB0 002EDC10 81 8C 00 08 */ lwz r12, 8(r12) /* 802F0CB4 002EDC14 7D 89 03 A6 */ mtctr r12 -/* 802F0CB8 002EDC18 4E 80 04 21 */ bctrl +/* 802F0CB8 002EDC18 4E 80 04 21 */ bctrl /* 802F0CBC 002EDC1C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802F0CC0 002EDC20 41 82 01 AC */ beq lbl_802F0E6C /* 802F0CC4 002EDC24 83 F8 00 04 */ lwz r31, 4(r24) @@ -1537,7 +1537,7 @@ lbl_802F0C60: /* 802F0CD8 002EDC38 81 9A 00 00 */ lwz r12, 0(r26) /* 802F0CDC 002EDC3C 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 802F0CE0 002EDC40 7D 89 03 A6 */ mtctr r12 -/* 802F0CE4 002EDC44 4E 80 04 21 */ bctrl +/* 802F0CE4 002EDC44 4E 80 04 21 */ bctrl /* 802F0CE8 002EDC48 7F 24 CB 78 */ mr r4, r25 /* 802F0CEC 002EDC4C 7F A5 EB 78 */ mr r5, r29 /* 802F0CF0 002EDC50 3B 41 00 10 */ addi r26, r1, 0x10 @@ -1647,7 +1647,7 @@ lbl_802F0E6C: /* 802F0E74 002EDDD4 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 802F0E78 002EDDD8 7C 08 03 A6 */ mtlr r0 /* 802F0E7C 002EDDDC 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 802F0E80 002EDDE0 4E 80 00 20 */ blr +/* 802F0E80 002EDDE0 4E 80 00 20 */ blr .global "_getPOIList<13CInt32POINode>__FRC13CCharAnimTimeP13CInt32POINodeUiUiiRCQ24rstl50vector<13CInt32POINode,Q24rstl17rmemory_allocator>RC13CCharAnimTimeRC15IAnimSourceInfoi" "_getPOIList<13CInt32POINode>__FRC13CCharAnimTimeP13CInt32POINodeUiUiiRCQ24rstl50vector<13CInt32POINode,Q24rstl17rmemory_allocator>RC13CCharAnimTimeRC15IAnimSourceInfoi": @@ -1668,7 +1668,7 @@ lbl_802F0E6C: /* 802F0EBC 002EDE1C 81 99 00 00 */ lwz r12, 0(r25) /* 802F0EC0 002EDE20 81 8C 00 08 */ lwz r12, 8(r12) /* 802F0EC4 002EDE24 7D 89 03 A6 */ mtctr r12 -/* 802F0EC8 002EDE28 4E 80 04 21 */ bctrl +/* 802F0EC8 002EDE28 4E 80 04 21 */ bctrl /* 802F0ECC 002EDE2C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802F0ED0 002EDE30 41 82 01 CC */ beq lbl_802F109C /* 802F0ED4 002EDE34 83 F7 00 04 */ lwz r31, 4(r23) @@ -1679,7 +1679,7 @@ lbl_802F0E6C: /* 802F0EE8 002EDE48 81 99 00 00 */ lwz r12, 0(r25) /* 802F0EEC 002EDE4C 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 802F0EF0 002EDE50 7D 89 03 A6 */ mtctr r12 -/* 802F0EF4 002EDE54 4E 80 04 21 */ bctrl +/* 802F0EF4 002EDE54 4E 80 04 21 */ bctrl /* 802F0EF8 002EDE58 7F 04 C3 78 */ mr r4, r24 /* 802F0EFC 002EDE5C 7F 85 E3 78 */ mr r5, r28 /* 802F0F00 002EDE60 3B 21 00 10 */ addi r25, r1, 0x10 @@ -1798,7 +1798,7 @@ lbl_802F109C: /* 802F10A4 002EE004 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 802F10A8 002EE008 7C 08 03 A6 */ mtlr r0 /* 802F10AC 002EE00C 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 802F10B0 002EE010 4E 80 00 20 */ blr +/* 802F10B0 002EE010 4E 80 00 20 */ blr .global "_getPOIList<16CParticlePOINode>__FRC13CCharAnimTimeP16CParticlePOINodeUiUiiRCQ24rstl53vector<16CParticlePOINode,Q24rstl17rmemory_allocator>RC13CCharAnimTimeRC15IAnimSourceInfoi" "_getPOIList<16CParticlePOINode>__FRC13CCharAnimTimeP16CParticlePOINodeUiUiiRCQ24rstl53vector<16CParticlePOINode,Q24rstl17rmemory_allocator>RC13CCharAnimTimeRC15IAnimSourceInfoi": @@ -1819,7 +1819,7 @@ lbl_802F109C: /* 802F10EC 002EE04C 81 9A 00 00 */ lwz r12, 0(r26) /* 802F10F0 002EE050 81 8C 00 08 */ lwz r12, 8(r12) /* 802F10F4 002EE054 7D 89 03 A6 */ mtctr r12 -/* 802F10F8 002EE058 4E 80 04 21 */ bctrl +/* 802F10F8 002EE058 4E 80 04 21 */ bctrl /* 802F10FC 002EE05C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802F1100 002EE060 41 82 01 F4 */ beq lbl_802F12F4 /* 802F1104 002EE064 83 F6 00 04 */ lwz r31, 4(r22) @@ -1830,7 +1830,7 @@ lbl_802F109C: /* 802F1118 002EE078 81 9A 00 00 */ lwz r12, 0(r26) /* 802F111C 002EE07C 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 802F1120 002EE080 7D 89 03 A6 */ mtctr r12 -/* 802F1124 002EE084 4E 80 04 21 */ bctrl +/* 802F1124 002EE084 4E 80 04 21 */ bctrl /* 802F1128 002EE088 7E E4 BB 78 */ mr r4, r23 /* 802F112C 002EE08C 7F 65 DB 78 */ mr r5, r27 /* 802F1130 002EE090 3B 41 00 10 */ addi r26, r1, 0x10 @@ -1959,7 +1959,7 @@ lbl_802F12F4: /* 802F12FC 002EE25C 80 01 00 D4 */ lwz r0, 0xd4(r1) /* 802F1300 002EE260 7C 08 03 A6 */ mtlr r0 /* 802F1304 002EE264 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 802F1308 002EE268 4E 80 00 20 */ blr +/* 802F1308 002EE268 4E 80 00 20 */ blr .global "_getPOIList<13CSoundPOINode>__FRC13CCharAnimTimeP13CSoundPOINodeUiUiiRCQ24rstl50vector<13CSoundPOINode,Q24rstl17rmemory_allocator>RC13CCharAnimTimeRC15IAnimSourceInfoi" "_getPOIList<13CSoundPOINode>__FRC13CCharAnimTimeP13CSoundPOINodeUiUiiRCQ24rstl50vector<13CSoundPOINode,Q24rstl17rmemory_allocator>RC13CCharAnimTimeRC15IAnimSourceInfoi": @@ -1980,7 +1980,7 @@ lbl_802F12F4: /* 802F1344 002EE2A4 81 9A 00 00 */ lwz r12, 0(r26) /* 802F1348 002EE2A8 81 8C 00 08 */ lwz r12, 8(r12) /* 802F134C 002EE2AC 7D 89 03 A6 */ mtctr r12 -/* 802F1350 002EE2B0 4E 80 04 21 */ bctrl +/* 802F1350 002EE2B0 4E 80 04 21 */ bctrl /* 802F1354 002EE2B4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802F1358 002EE2B8 41 82 01 BC */ beq lbl_802F1514 /* 802F135C 002EE2BC 83 F8 00 04 */ lwz r31, 4(r24) @@ -1991,7 +1991,7 @@ lbl_802F12F4: /* 802F1370 002EE2D0 81 9A 00 00 */ lwz r12, 0(r26) /* 802F1374 002EE2D4 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 802F1378 002EE2D8 7D 89 03 A6 */ mtctr r12 -/* 802F137C 002EE2DC 4E 80 04 21 */ bctrl +/* 802F137C 002EE2DC 4E 80 04 21 */ bctrl /* 802F1380 002EE2E0 7F 24 CB 78 */ mr r4, r25 /* 802F1384 002EE2E4 7F A5 EB 78 */ mr r5, r29 /* 802F1388 002EE2E8 3B 41 00 10 */ addi r26, r1, 0x10 @@ -2105,7 +2105,7 @@ lbl_802F1514: /* 802F151C 002EE47C 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 802F1520 002EE480 7C 08 03 A6 */ mtlr r0 /* 802F1524 002EE484 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 802F1528 002EE488 4E 80 00 20 */ blr +/* 802F1528 002EE488 4E 80 00 20 */ blr .global "reserve__Q24rstl127vector,Q24rstl17rmemory_allocator>,b>,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl127vector,Q24rstl17rmemory_allocator>,b>,Q24rstl17rmemory_allocator>Fi": @@ -2183,7 +2183,7 @@ lbl_802F161C: /* 802F1620 002EE580 80 01 00 34 */ lwz r0, 0x34(r1) /* 802F1624 002EE584 7C 08 03 A6 */ mtlr r0 /* 802F1628 002EE588 38 21 00 30 */ addi r1, r1, 0x30 -/* 802F162C 002EE58C 4E 80 00 20 */ blr +/* 802F162C 002EE58C 4E 80 00 20 */ blr .global "reserve__Q24rstl127vector,Q24rstl17rmemory_allocator>,i>,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl127vector,Q24rstl17rmemory_allocator>,i>,Q24rstl17rmemory_allocator>Fi": @@ -2261,7 +2261,7 @@ lbl_802F1720: /* 802F1724 002EE684 80 01 00 34 */ lwz r0, 0x34(r1) /* 802F1728 002EE688 7C 08 03 A6 */ mtlr r0 /* 802F172C 002EE68C 38 21 00 30 */ addi r1, r1, 0x30 -/* 802F1730 002EE690 4E 80 00 20 */ blr +/* 802F1730 002EE690 4E 80 00 20 */ blr .global "reserve__Q24rstl159vector,Q24rstl17rmemory_allocator>,Q213CParticleData13EParentedMode>,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl159vector,Q24rstl17rmemory_allocator>,Q213CParticleData13EParentedMode>,Q24rstl17rmemory_allocator>Fi": diff --git a/asm/Kyoto/Animation/CAnimTreeAnimReaderContainer.s b/asm/Kyoto/Animation/CAnimTreeAnimReaderContainer.s index 48f20b68..c97defd4 100644 --- a/asm/Kyoto/Animation/CAnimTreeAnimReaderContainer.s +++ b/asm/Kyoto/Animation/CAnimTreeAnimReaderContainer.s @@ -61,7 +61,7 @@ __dt__28CAnimTreeAnimReaderContainerFv: /* 802F1888 002EE7E8 38 80 00 01 */ li r4, 1 /* 802F188C 002EE7EC 81 8C 00 08 */ lwz r12, 8(r12) /* 802F1890 002EE7F0 7D 89 03 A6 */ mtctr r12 -/* 802F1894 002EE7F4 4E 80 04 21 */ bctrl +/* 802F1894 002EE7F4 4E 80 04 21 */ bctrl lbl_802F1898: /* 802F1898 002EE7F8 28 1E 00 00 */ cmplwi r30, 0 /* 802F189C 002EE7FC 41 82 00 38 */ beq lbl_802F18D4 @@ -91,17 +91,17 @@ lbl_802F18E4: /* 802F18F0 002EE850 83 C1 00 08 */ lwz r30, 8(r1) /* 802F18F4 002EE854 7C 08 03 A6 */ mtlr r0 /* 802F18F8 002EE858 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F18FC 002EE85C 4E 80 00 20 */ blr +/* 802F18FC 002EE85C 4E 80 00 20 */ blr .global Depth__28CAnimTreeAnimReaderContainerCFv Depth__28CAnimTreeAnimReaderContainerCFv: /* 802F1900 002EE860 38 60 00 01 */ li r3, 1 -/* 802F1904 002EE864 4E 80 00 20 */ blr +/* 802F1904 002EE864 4E 80 00 20 */ blr .global VGetNumChildren__28CAnimTreeAnimReaderContainerCFv VGetNumChildren__28CAnimTreeAnimReaderContainerCFv: /* 802F1908 002EE868 38 60 00 00 */ li r3, 0 -/* 802F190C 002EE86C 4E 80 00 20 */ blr +/* 802F190C 002EE86C 4E 80 00 20 */ blr .global "VGetWeightedReaders__28CAnimTreeAnimReaderContainerFfRQ24rstl48reserved_vector>" "VGetWeightedReaders__28CAnimTreeAnimReaderContainerFfRQ24rstl48reserved_vector>": @@ -117,7 +117,7 @@ lbl_802F1930: /* 802F1930 002EE890 80 64 00 00 */ lwz r3, 0(r4) /* 802F1934 002EE894 38 03 00 01 */ addi r0, r3, 1 /* 802F1938 002EE898 90 04 00 00 */ stw r0, 0(r4) -/* 802F193C 002EE89C 4E 80 00 20 */ blr +/* 802F193C 002EE89C 4E 80 00 20 */ blr .global VGetBestUnblendedChild__28CAnimTreeAnimReaderContainerCFv VGetBestUnblendedChild__28CAnimTreeAnimReaderContainerCFv: @@ -127,7 +127,7 @@ VGetBestUnblendedChild__28CAnimTreeAnimReaderContainerCFv: /* 802F194C 002EE8AC 80 64 00 04 */ lwz r3, 4(r4) /* 802F1950 002EE8B0 38 03 00 01 */ addi r0, r3, 1 /* 802F1954 002EE8B4 90 04 00 04 */ stw r0, 4(r4) -/* 802F1958 002EE8B8 4E 80 00 20 */ blr +/* 802F1958 002EE8B8 4E 80 00 20 */ blr .global VGetAdvancementResults__28CAnimTreeAnimReaderContainerCFRC13CCharAnimTimeRC13CCharAnimTime VGetAdvancementResults__28CAnimTreeAnimReaderContainerCFRC13CCharAnimTimeRC13CCharAnimTime: @@ -140,12 +140,12 @@ VGetAdvancementResults__28CAnimTreeAnimReaderContainerCFRC13CCharAnimTimeRC13CCh /* 802F1974 002EE8D4 81 84 00 00 */ lwz r12, 0(r4) /* 802F1978 002EE8D8 81 8C 00 58 */ lwz r12, 0x58(r12) /* 802F197C 002EE8DC 7D 89 03 A6 */ mtctr r12 -/* 802F1980 002EE8E0 4E 80 04 21 */ bctrl +/* 802F1980 002EE8E0 4E 80 04 21 */ bctrl /* 802F1984 002EE8E4 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F1988 002EE8E8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802F198C 002EE8EC 7C 08 03 A6 */ mtlr r0 /* 802F1990 002EE8F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F1994 002EE8F4 4E 80 00 20 */ blr +/* 802F1994 002EE8F4 4E 80 00 20 */ blr .global VSetPhase__28CAnimTreeAnimReaderContainerFf VSetPhase__28CAnimTreeAnimReaderContainerFf: @@ -156,17 +156,17 @@ VSetPhase__28CAnimTreeAnimReaderContainerFf: /* 802F19A8 002EE908 81 83 00 00 */ lwz r12, 0(r3) /* 802F19AC 002EE90C 81 8C 00 54 */ lwz r12, 0x54(r12) /* 802F19B0 002EE910 7D 89 03 A6 */ mtctr r12 -/* 802F19B4 002EE914 4E 80 04 21 */ bctrl +/* 802F19B4 002EE914 4E 80 04 21 */ bctrl /* 802F19B8 002EE918 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F19BC 002EE91C 7C 08 03 A6 */ mtlr r0 /* 802F19C0 002EE920 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F19C4 002EE924 4E 80 00 20 */ blr +/* 802F19C4 002EE924 4E 80 00 20 */ blr .global VSimplified__28CAnimTreeAnimReaderContainerFv VSimplified__28CAnimTreeAnimReaderContainerFv: /* 802F19C8 002EE928 38 00 00 00 */ li r0, 0 /* 802F19CC 002EE92C 98 03 00 08 */ stb r0, 8(r3) -/* 802F19D0 002EE930 4E 80 00 20 */ blr +/* 802F19D0 002EE930 4E 80 00 20 */ blr .global VGetContributionOfHighestInfluence__28CAnimTreeAnimReaderContainerCFv VGetContributionOfHighestInfluence__28CAnimTreeAnimReaderContainerCFv: @@ -184,13 +184,13 @@ VGetContributionOfHighestInfluence__28CAnimTreeAnimReaderContainerCFv: /* 802F1A00 002EE960 81 84 00 00 */ lwz r12, 0(r4) /* 802F1A04 002EE964 81 8C 00 14 */ lwz r12, 0x14(r12) /* 802F1A08 002EE968 7D 89 03 A6 */ mtctr r12 -/* 802F1A0C 002EE96C 4E 80 04 21 */ bctrl +/* 802F1A0C 002EE96C 4E 80 04 21 */ bctrl /* 802F1A10 002EE970 80 9E 00 14 */ lwz r4, 0x14(r30) /* 802F1A14 002EE974 38 61 00 10 */ addi r3, r1, 0x10 /* 802F1A18 002EE978 81 84 00 00 */ lwz r12, 0(r4) /* 802F1A1C 002EE97C 81 8C 00 18 */ lwz r12, 0x18(r12) /* 802F1A20 002EE980 7D 89 03 A6 */ mtctr r12 -/* 802F1A24 002EE984 4E 80 04 21 */ bctrl +/* 802F1A24 002EE984 4E 80 04 21 */ bctrl /* 802F1A28 002EE988 C0 02 C6 80 */ lfs f0, lbl_805AE3A0@sda21(r2) /* 802F1A2C 002EE98C 38 7D 00 04 */ addi r3, r29, 4 /* 802F1A30 002EE990 38 9E 00 04 */ addi r4, r30, 4 @@ -219,7 +219,7 @@ VGetContributionOfHighestInfluence__28CAnimTreeAnimReaderContainerCFv: /* 802F1A8C 002EE9EC 83 A1 00 34 */ lwz r29, 0x34(r1) /* 802F1A90 002EE9F0 7C 08 03 A6 */ mtlr r0 /* 802F1A94 002EE9F4 38 21 00 40 */ addi r1, r1, 0x40 -/* 802F1A98 002EE9F8 4E 80 00 20 */ blr +/* 802F1A98 002EE9F8 4E 80 00 20 */ blr .global VClone__28CAnimTreeAnimReaderContainerCFv VClone__28CAnimTreeAnimReaderContainerCFv: @@ -275,13 +275,13 @@ lbl_802F1B24: /* 802F1B5C 002EEABC 38 80 00 01 */ li r4, 1 /* 802F1B60 002EEAC0 81 8C 00 08 */ lwz r12, 8(r12) /* 802F1B64 002EEAC4 7D 89 03 A6 */ mtctr r12 -/* 802F1B68 002EEAC8 4E 80 04 21 */ bctrl +/* 802F1B68 002EEAC8 4E 80 04 21 */ bctrl lbl_802F1B6C: /* 802F1B6C 002EEACC BB 61 00 1C */ lmw r27, 0x1c(r1) /* 802F1B70 002EEAD0 80 01 00 34 */ lwz r0, 0x34(r1) /* 802F1B74 002EEAD4 7C 08 03 A6 */ mtlr r0 /* 802F1B78 002EEAD8 38 21 00 30 */ addi r1, r1, 0x30 -/* 802F1B7C 002EEADC 4E 80 00 20 */ blr +/* 802F1B7C 002EEADC 4E 80 00 20 */ blr .global VGetSegStatementSet__28CAnimTreeAnimReaderContainerCFRC10CSegIdListR16CSegStatementSetRC13CCharAnimTime VGetSegStatementSet__28CAnimTreeAnimReaderContainerCFRC10CSegIdListR16CSegStatementSetRC13CCharAnimTime: @@ -292,11 +292,11 @@ VGetSegStatementSet__28CAnimTreeAnimReaderContainerCFRC10CSegIdListR16CSegStatem /* 802F1B90 002EEAF0 81 83 00 00 */ lwz r12, 0(r3) /* 802F1B94 002EEAF4 81 8C 00 48 */ lwz r12, 0x48(r12) /* 802F1B98 002EEAF8 7D 89 03 A6 */ mtctr r12 -/* 802F1B9C 002EEAFC 4E 80 04 21 */ bctrl +/* 802F1B9C 002EEAFC 4E 80 04 21 */ bctrl /* 802F1BA0 002EEB00 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F1BA4 002EEB04 7C 08 03 A6 */ mtlr r0 /* 802F1BA8 002EEB08 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F1BAC 002EEB0C 4E 80 00 20 */ blr +/* 802F1BAC 002EEB0C 4E 80 00 20 */ blr .global VGetSegStatementSet__28CAnimTreeAnimReaderContainerCFRC10CSegIdListR16CSegStatementSet VGetSegStatementSet__28CAnimTreeAnimReaderContainerCFRC10CSegIdListR16CSegStatementSet: @@ -307,11 +307,11 @@ VGetSegStatementSet__28CAnimTreeAnimReaderContainerCFRC10CSegIdListR16CSegStatem /* 802F1BC0 002EEB20 81 83 00 00 */ lwz r12, 0(r3) /* 802F1BC4 002EEB24 81 8C 00 44 */ lwz r12, 0x44(r12) /* 802F1BC8 002EEB28 7D 89 03 A6 */ mtctr r12 -/* 802F1BCC 002EEB2C 4E 80 04 21 */ bctrl +/* 802F1BCC 002EEB2C 4E 80 04 21 */ bctrl /* 802F1BD0 002EEB30 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F1BD4 002EEB34 7C 08 03 A6 */ mtlr r0 /* 802F1BD8 002EEB38 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F1BDC 002EEB3C 4E 80 00 20 */ blr +/* 802F1BDC 002EEB3C 4E 80 00 20 */ blr .global VGetParticlePOIState__28CAnimTreeAnimReaderContainerCFPCc VGetParticlePOIState__28CAnimTreeAnimReaderContainerCFPCc: @@ -322,11 +322,11 @@ VGetParticlePOIState__28CAnimTreeAnimReaderContainerCFPCc: /* 802F1BF0 002EEB50 81 83 00 00 */ lwz r12, 0(r3) /* 802F1BF4 002EEB54 81 8C 00 40 */ lwz r12, 0x40(r12) /* 802F1BF8 002EEB58 7D 89 03 A6 */ mtctr r12 -/* 802F1BFC 002EEB5C 4E 80 04 21 */ bctrl +/* 802F1BFC 002EEB5C 4E 80 04 21 */ bctrl /* 802F1C00 002EEB60 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F1C04 002EEB64 7C 08 03 A6 */ mtlr r0 /* 802F1C08 002EEB68 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F1C0C 002EEB6C 4E 80 00 20 */ blr +/* 802F1C0C 002EEB6C 4E 80 00 20 */ blr .global VGetInt32POIState__28CAnimTreeAnimReaderContainerCFPCc VGetInt32POIState__28CAnimTreeAnimReaderContainerCFPCc: @@ -337,11 +337,11 @@ VGetInt32POIState__28CAnimTreeAnimReaderContainerCFPCc: /* 802F1C20 002EEB80 81 83 00 00 */ lwz r12, 0(r3) /* 802F1C24 002EEB84 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 802F1C28 002EEB88 7D 89 03 A6 */ mtctr r12 -/* 802F1C2C 002EEB8C 4E 80 04 21 */ bctrl +/* 802F1C2C 002EEB8C 4E 80 04 21 */ bctrl /* 802F1C30 002EEB90 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F1C34 002EEB94 7C 08 03 A6 */ mtlr r0 /* 802F1C38 002EEB98 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F1C3C 002EEB9C 4E 80 00 20 */ blr +/* 802F1C3C 002EEB9C 4E 80 00 20 */ blr .global VGetBoolPOIState__28CAnimTreeAnimReaderContainerCFPCc VGetBoolPOIState__28CAnimTreeAnimReaderContainerCFPCc: @@ -352,11 +352,11 @@ VGetBoolPOIState__28CAnimTreeAnimReaderContainerCFPCc: /* 802F1C50 002EEBB0 81 83 00 00 */ lwz r12, 0(r3) /* 802F1C54 002EEBB4 81 8C 00 38 */ lwz r12, 0x38(r12) /* 802F1C58 002EEBB8 7D 89 03 A6 */ mtctr r12 -/* 802F1C5C 002EEBBC 4E 80 04 21 */ bctrl +/* 802F1C5C 002EEBBC 4E 80 04 21 */ bctrl /* 802F1C60 002EEBC0 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F1C64 002EEBC4 7C 08 03 A6 */ mtlr r0 /* 802F1C68 002EEBC8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F1C6C 002EEBCC 4E 80 00 20 */ blr +/* 802F1C6C 002EEBCC 4E 80 00 20 */ blr .global VGetSoundPOIList__28CAnimTreeAnimReaderContainerCFRC13CCharAnimTimeP13CSoundPOINodeUiUii VGetSoundPOIList__28CAnimTreeAnimReaderContainerCFRC13CCharAnimTimeP13CSoundPOINodeUiUii: @@ -368,7 +368,7 @@ VGetSoundPOIList__28CAnimTreeAnimReaderContainerCFRC13CCharAnimTimeP13CSoundPOIN /* 802F1C84 002EEBE4 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F1C88 002EEBE8 7C 08 03 A6 */ mtlr r0 /* 802F1C8C 002EEBEC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F1C90 002EEBF0 4E 80 00 20 */ blr +/* 802F1C90 002EEBF0 4E 80 00 20 */ blr .global VGetParticlePOIList__28CAnimTreeAnimReaderContainerCFRC13CCharAnimTimeP16CParticlePOINodeUiUii VGetParticlePOIList__28CAnimTreeAnimReaderContainerCFRC13CCharAnimTimeP16CParticlePOINodeUiUii: @@ -380,7 +380,7 @@ VGetParticlePOIList__28CAnimTreeAnimReaderContainerCFRC13CCharAnimTimeP16CPartic /* 802F1CA8 002EEC08 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F1CAC 002EEC0C 7C 08 03 A6 */ mtlr r0 /* 802F1CB0 002EEC10 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F1CB4 002EEC14 4E 80 00 20 */ blr +/* 802F1CB4 002EEC14 4E 80 00 20 */ blr .global VGetInt32POIList__28CAnimTreeAnimReaderContainerCFRC13CCharAnimTimeP13CInt32POINodeUiUii VGetInt32POIList__28CAnimTreeAnimReaderContainerCFRC13CCharAnimTimeP13CInt32POINodeUiUii: @@ -392,7 +392,7 @@ VGetInt32POIList__28CAnimTreeAnimReaderContainerCFRC13CCharAnimTimeP13CInt32POIN /* 802F1CCC 002EEC2C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F1CD0 002EEC30 7C 08 03 A6 */ mtlr r0 /* 802F1CD4 002EEC34 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F1CD8 002EEC38 4E 80 00 20 */ blr +/* 802F1CD8 002EEC38 4E 80 00 20 */ blr .global VGetBoolPOIList__28CAnimTreeAnimReaderContainerCFRC13CCharAnimTimeP12CBoolPOINodeUiUii VGetBoolPOIList__28CAnimTreeAnimReaderContainerCFRC13CCharAnimTimeP12CBoolPOINodeUiUii: @@ -404,7 +404,7 @@ VGetBoolPOIList__28CAnimTreeAnimReaderContainerCFRC13CCharAnimTimeP12CBoolPOINod /* 802F1CF0 002EEC50 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F1CF4 002EEC54 7C 08 03 A6 */ mtlr r0 /* 802F1CF8 002EEC58 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F1CFC 002EEC5C 4E 80 00 20 */ blr +/* 802F1CFC 002EEC5C 4E 80 00 20 */ blr .global VGetRotation__28CAnimTreeAnimReaderContainerCFRC6CSegId VGetRotation__28CAnimTreeAnimReaderContainerCFRC6CSegId: @@ -417,12 +417,12 @@ VGetRotation__28CAnimTreeAnimReaderContainerCFRC6CSegId: /* 802F1D18 002EEC78 81 84 00 00 */ lwz r12, 0(r4) /* 802F1D1C 002EEC7C 81 8C 00 24 */ lwz r12, 0x24(r12) /* 802F1D20 002EEC80 7D 89 03 A6 */ mtctr r12 -/* 802F1D24 002EEC84 4E 80 04 21 */ bctrl +/* 802F1D24 002EEC84 4E 80 04 21 */ bctrl /* 802F1D28 002EEC88 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F1D2C 002EEC8C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802F1D30 002EEC90 7C 08 03 A6 */ mtlr r0 /* 802F1D34 002EEC94 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F1D38 002EEC98 4E 80 00 20 */ blr +/* 802F1D38 002EEC98 4E 80 00 20 */ blr .global VGetOffset__28CAnimTreeAnimReaderContainerCFRC6CSegId VGetOffset__28CAnimTreeAnimReaderContainerCFRC6CSegId: @@ -435,12 +435,12 @@ VGetOffset__28CAnimTreeAnimReaderContainerCFRC6CSegId: /* 802F1D54 002EECB4 81 84 00 00 */ lwz r12, 0(r4) /* 802F1D58 002EECB8 81 8C 00 20 */ lwz r12, 0x20(r12) /* 802F1D5C 002EECBC 7D 89 03 A6 */ mtctr r12 -/* 802F1D60 002EECC0 4E 80 04 21 */ bctrl +/* 802F1D60 002EECC0 4E 80 04 21 */ bctrl /* 802F1D64 002EECC4 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F1D68 002EECC8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802F1D6C 002EECCC 7C 08 03 A6 */ mtlr r0 /* 802F1D70 002EECD0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F1D74 002EECD4 4E 80 00 20 */ blr +/* 802F1D74 002EECD4 4E 80 00 20 */ blr .global VHasOffset__28CAnimTreeAnimReaderContainerCFRC6CSegId VHasOffset__28CAnimTreeAnimReaderContainerCFRC6CSegId: @@ -451,11 +451,11 @@ VHasOffset__28CAnimTreeAnimReaderContainerCFRC6CSegId: /* 802F1D88 002EECE8 81 83 00 00 */ lwz r12, 0(r3) /* 802F1D8C 002EECEC 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 802F1D90 002EECF0 7D 89 03 A6 */ mtctr r12 -/* 802F1D94 002EECF4 4E 80 04 21 */ bctrl +/* 802F1D94 002EECF4 4E 80 04 21 */ bctrl /* 802F1D98 002EECF8 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F1D9C 002EECFC 7C 08 03 A6 */ mtlr r0 /* 802F1DA0 002EED00 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F1DA4 002EED04 4E 80 00 20 */ blr +/* 802F1DA4 002EED04 4E 80 00 20 */ blr .global VGetSteadyStateAnimInfo__28CAnimTreeAnimReaderContainerCFv VGetSteadyStateAnimInfo__28CAnimTreeAnimReaderContainerCFv: @@ -468,12 +468,12 @@ VGetSteadyStateAnimInfo__28CAnimTreeAnimReaderContainerCFv: /* 802F1DC0 002EED20 81 84 00 00 */ lwz r12, 0(r4) /* 802F1DC4 002EED24 81 8C 00 18 */ lwz r12, 0x18(r12) /* 802F1DC8 002EED28 7D 89 03 A6 */ mtctr r12 -/* 802F1DCC 002EED2C 4E 80 04 21 */ bctrl +/* 802F1DCC 002EED2C 4E 80 04 21 */ bctrl /* 802F1DD0 002EED30 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F1DD4 002EED34 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802F1DD8 002EED38 7C 08 03 A6 */ mtlr r0 /* 802F1DDC 002EED3C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F1DE0 002EED40 4E 80 00 20 */ blr +/* 802F1DE0 002EED40 4E 80 00 20 */ blr .global VGetTimeRemaining__28CAnimTreeAnimReaderContainerCFv VGetTimeRemaining__28CAnimTreeAnimReaderContainerCFv: @@ -486,12 +486,12 @@ VGetTimeRemaining__28CAnimTreeAnimReaderContainerCFv: /* 802F1DFC 002EED5C 81 84 00 00 */ lwz r12, 0(r4) /* 802F1E00 002EED60 81 8C 00 14 */ lwz r12, 0x14(r12) /* 802F1E04 002EED64 7D 89 03 A6 */ mtctr r12 -/* 802F1E08 002EED68 4E 80 04 21 */ bctrl +/* 802F1E08 002EED68 4E 80 04 21 */ bctrl /* 802F1E0C 002EED6C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F1E10 002EED70 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802F1E14 002EED74 7C 08 03 A6 */ mtlr r0 /* 802F1E18 002EED78 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F1E1C 002EED7C 4E 80 00 20 */ blr +/* 802F1E1C 002EED7C 4E 80 00 20 */ blr .global VAdvanceView__28CAnimTreeAnimReaderContainerFRC13CCharAnimTime VAdvanceView__28CAnimTreeAnimReaderContainerFRC13CCharAnimTime: @@ -504,7 +504,7 @@ VAdvanceView__28CAnimTreeAnimReaderContainerFRC13CCharAnimTime: /* 802F1E38 002EED98 81 84 00 00 */ lwz r12, 0(r4) /* 802F1E3C 002EED9C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802F1E40 002EEDA0 7D 89 03 A6 */ mtctr r12 -/* 802F1E44 002EEDA4 4E 80 04 21 */ bctrl +/* 802F1E44 002EEDA4 4E 80 04 21 */ bctrl /* 802F1E48 002EEDA8 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F1E4C 002EEDAC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802F1E50 002EEDB0 7C 08 03 A6 */ mtlr r0 diff --git a/asm/Kyoto/Animation/CAnimTreeBlend.s b/asm/Kyoto/Animation/CAnimTreeBlend.s index 012924c4..0e5bdea1 100644 --- a/asm/Kyoto/Animation/CAnimTreeBlend.s +++ b/asm/Kyoto/Animation/CAnimTreeBlend.s @@ -80,14 +80,14 @@ Depth__20CAnimTreeDoubleChildCFv: /* 802F1ED8 002EEE38 81 83 00 00 */ lwz r12, 0(r3) /* 802F1EDC 002EEE3C 81 8C 00 5C */ lwz r12, 0x5c(r12) /* 802F1EE0 002EEE40 7D 89 03 A6 */ mtctr r12 -/* 802F1EE4 002EEE44 4E 80 04 21 */ bctrl +/* 802F1EE4 002EEE44 4E 80 04 21 */ bctrl /* 802F1EE8 002EEE48 90 61 00 08 */ stw r3, 8(r1) /* 802F1EEC 002EEE4C 80 7F 00 14 */ lwz r3, 0x14(r31) /* 802F1EF0 002EEE50 80 63 00 00 */ lwz r3, 0(r3) /* 802F1EF4 002EEE54 81 83 00 00 */ lwz r12, 0(r3) /* 802F1EF8 002EEE58 81 8C 00 5C */ lwz r12, 0x5c(r12) /* 802F1EFC 002EEE5C 7D 89 03 A6 */ mtctr r12 -/* 802F1F00 002EEE60 4E 80 04 21 */ bctrl +/* 802F1F00 002EEE60 4E 80 04 21 */ bctrl /* 802F1F04 002EEE64 80 01 00 08 */ lwz r0, 8(r1) /* 802F1F08 002EEE68 38 81 00 0C */ addi r4, r1, 0xc /* 802F1F0C 002EEE6C 90 61 00 0C */ stw r3, 0xc(r1) @@ -101,7 +101,7 @@ lbl_802F1F1C: /* 802F1F28 002EEE88 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802F1F2C 002EEE8C 7C 08 03 A6 */ mtlr r0 /* 802F1F30 002EEE90 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F1F34 002EEE94 4E 80 00 20 */ blr +/* 802F1F34 002EEE94 4E 80 00 20 */ blr .global VAdvanceView__14CAnimTreeBlendFRC13CCharAnimTime VAdvanceView__14CAnimTreeBlendFRC13CCharAnimTime: @@ -126,7 +126,7 @@ VAdvanceView__14CAnimTreeBlendFRC13CCharAnimTime: /* 802F1F80 002EEEE0 81 84 00 00 */ lwz r12, 0(r4) /* 802F1F84 002EEEE4 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802F1F88 002EEEE8 7D 89 03 A6 */ mtctr r12 -/* 802F1F8C 002EEEEC 4E 80 04 21 */ bctrl +/* 802F1F8C 002EEEEC 4E 80 04 21 */ bctrl /* 802F1F90 002EEEF0 C0 E1 00 50 */ lfs f7, 0x50(r1) /* 802F1F94 002EEEF4 7F C5 F3 78 */ mr r5, r30 /* 802F1F98 002EEEF8 80 01 00 54 */ lwz r0, 0x54(r1) @@ -153,7 +153,7 @@ VAdvanceView__14CAnimTreeBlendFRC13CCharAnimTime: /* 802F1FEC 002EEF4C 81 84 00 00 */ lwz r12, 0(r4) /* 802F1FF0 002EEF50 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802F1FF4 002EEF54 7D 89 03 A6 */ mtctr r12 -/* 802F1FF8 002EEF58 4E 80 04 21 */ bctrl +/* 802F1FF8 002EEF58 4E 80 04 21 */ bctrl /* 802F1FFC 002EEF5C 80 6D A7 40 */ lwz r3, lbl_805A9300@sda21(r13) /* 802F2000 002EEF60 3B C1 00 7C */ addi r30, r1, 0x7c /* 802F2004 002EEF64 C0 E1 00 2C */ lfs f7, 0x2c(r1) @@ -263,12 +263,12 @@ lbl_802F2178: /* 802F2190 002EF0F0 83 81 00 C0 */ lwz r28, 0xc0(r1) /* 802F2194 002EF0F4 7C 08 03 A6 */ mtlr r0 /* 802F2198 002EF0F8 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 802F219C 002EF0FC 4E 80 00 20 */ blr +/* 802F219C 002EF0FC 4E 80 00 20 */ blr .global SetBlendingWeight__14CAnimTreeBlendFf SetBlendingWeight__14CAnimTreeBlendFf: /* 802F21A0 002EF100 D0 23 00 24 */ stfs f1, 0x24(r3) -/* 802F21A4 002EF104 4E 80 00 20 */ blr +/* 802F21A4 002EF104 4E 80 00 20 */ blr .global "CreatePrimitiveName__14CAnimTreeBlendFRCQ24rstl25ncrc_ptr<13CAnimTreeNode>RCQ24rstl25ncrc_ptr<13CAnimTreeNode>f" "CreatePrimitiveName__14CAnimTreeBlendFRCQ24rstl25ncrc_ptr<13CAnimTreeNode>RCQ24rstl25ncrc_ptr<13CAnimTreeNode>f": @@ -284,7 +284,7 @@ SetBlendingWeight__14CAnimTreeBlendFf: /* 802F21CC 002EF12C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802F21D0 002EF130 7C 08 03 A6 */ mtlr r0 /* 802F21D4 002EF134 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F21D8 002EF138 4E 80 00 20 */ blr +/* 802F21D8 002EF138 4E 80 00 20 */ blr .global VGetSteadyStateAnimInfo__14CAnimTreeBlendCFv VGetSteadyStateAnimInfo__14CAnimTreeBlendCFv: @@ -319,7 +319,7 @@ VGetSteadyStateAnimInfo__14CAnimTreeBlendCFv: /* 802F224C 002EF1AC 81 84 00 00 */ lwz r12, 0(r4) /* 802F2250 002EF1B0 81 8C 00 18 */ lwz r12, 0x18(r12) /* 802F2254 002EF1B4 7D 89 03 A6 */ mtctr r12 -/* 802F2258 002EF1B8 4E 80 04 21 */ bctrl +/* 802F2258 002EF1B8 4E 80 04 21 */ bctrl /* 802F225C 002EF1BC 80 9D 00 18 */ lwz r4, 0x18(r29) /* 802F2260 002EF1C0 38 61 00 38 */ addi r3, r1, 0x38 /* 802F2264 002EF1C4 80 A1 00 54 */ lwz r5, 0x54(r1) @@ -337,7 +337,7 @@ VGetSteadyStateAnimInfo__14CAnimTreeBlendCFv: /* 802F2294 002EF1F4 D0 01 00 90 */ stfs f0, 0x90(r1) /* 802F2298 002EF1F8 98 01 00 94 */ stb r0, 0x94(r1) /* 802F229C 002EF1FC 7D 89 03 A6 */ mtctr r12 -/* 802F22A0 002EF200 4E 80 04 21 */ bctrl +/* 802F22A0 002EF200 4E 80 04 21 */ bctrl /* 802F22A4 002EF204 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 802F22A8 002EF208 38 61 00 30 */ addi r3, r1, 0x30 /* 802F22AC 002EF20C 83 C1 00 84 */ lwz r30, 0x84(r1) @@ -457,7 +457,7 @@ lbl_802F23F0: /* 802F2464 002EF3C4 83 81 00 A0 */ lwz r28, 0xa0(r1) /* 802F2468 002EF3C8 7C 08 03 A6 */ mtlr r0 /* 802F246C 002EF3CC 38 21 01 30 */ addi r1, r1, 0x130 -/* 802F2470 002EF3D0 4E 80 00 20 */ blr +/* 802F2470 002EF3D0 4E 80 00 20 */ blr .global VGetTimeRemaining__14CAnimTreeBlendCFv VGetTimeRemaining__14CAnimTreeBlendCFv: @@ -474,14 +474,14 @@ VGetTimeRemaining__14CAnimTreeBlendCFv: /* 802F249C 002EF3FC 81 84 00 00 */ lwz r12, 0(r4) /* 802F24A0 002EF400 81 8C 00 14 */ lwz r12, 0x14(r12) /* 802F24A4 002EF404 7D 89 03 A6 */ mtctr r12 -/* 802F24A8 002EF408 4E 80 04 21 */ bctrl +/* 802F24A8 002EF408 4E 80 04 21 */ bctrl /* 802F24AC 002EF40C 80 9F 00 14 */ lwz r4, 0x14(r31) /* 802F24B0 002EF410 38 61 00 10 */ addi r3, r1, 0x10 /* 802F24B4 002EF414 80 84 00 00 */ lwz r4, 0(r4) /* 802F24B8 002EF418 81 84 00 00 */ lwz r12, 0(r4) /* 802F24BC 002EF41C 81 8C 00 14 */ lwz r12, 0x14(r12) /* 802F24C0 002EF420 7D 89 03 A6 */ mtctr r12 -/* 802F24C4 002EF424 4E 80 04 21 */ bctrl +/* 802F24C4 002EF424 4E 80 04 21 */ bctrl /* 802F24C8 002EF428 38 61 00 10 */ addi r3, r1, 0x10 /* 802F24CC 002EF42C 38 81 00 08 */ addi r4, r1, 8 /* 802F24D0 002EF430 48 05 67 6D */ bl __lt__13CCharAnimTimeCFRC13CCharAnimTime @@ -499,12 +499,12 @@ lbl_802F24E4: /* 802F24FC 002EF45C 80 01 00 24 */ lwz r0, 0x24(r1) /* 802F2500 002EF460 7C 08 03 A6 */ mtlr r0 /* 802F2504 002EF464 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F2508 002EF468 4E 80 00 20 */ blr +/* 802F2508 002EF468 4E 80 00 20 */ blr .global VGetBlendingWeight__14CAnimTreeBlendCFv VGetBlendingWeight__14CAnimTreeBlendCFv: /* 802F250C 002EF46C C0 23 00 24 */ lfs f1, 0x24(r3) -/* 802F2510 002EF470 4E 80 00 20 */ blr +/* 802F2510 002EF470 4E 80 00 20 */ blr .global VClone__14CAnimTreeBlendCFv VClone__14CAnimTreeBlendCFv: @@ -590,7 +590,7 @@ lbl_802F2624: /* 802F2648 002EF5A8 38 80 00 01 */ li r4, 1 /* 802F264C 002EF5AC 81 8C 00 08 */ lwz r12, 8(r12) /* 802F2650 002EF5B0 7D 89 03 A6 */ mtctr r12 -/* 802F2654 002EF5B4 4E 80 04 21 */ bctrl +/* 802F2654 002EF5B4 4E 80 04 21 */ bctrl lbl_802F2658: /* 802F2658 002EF5B8 7F 80 07 75 */ extsb. r0, r28 /* 802F265C 002EF5BC 41 82 00 0C */ beq lbl_802F2668 @@ -609,7 +609,7 @@ lbl_802F2668: /* 802F268C 002EF5EC 38 80 00 01 */ li r4, 1 /* 802F2690 002EF5F0 81 8C 00 08 */ lwz r12, 8(r12) /* 802F2694 002EF5F4 7D 89 03 A6 */ mtctr r12 -/* 802F2698 002EF5F8 4E 80 04 21 */ bctrl +/* 802F2698 002EF5F8 4E 80 04 21 */ bctrl lbl_802F269C: /* 802F269C 002EF5FC E3 E1 00 48 */ psq_l f31, 72(r1), 0, qr0 /* 802F26A0 002EF600 CB E1 00 40 */ lfd f31, 0x40(r1) diff --git a/asm/Kyoto/Animation/CAnimTreeDoubleChild.s b/asm/Kyoto/Animation/CAnimTreeDoubleChild.s index 1c4882ad..6d64865b 100644 --- a/asm/Kyoto/Animation/CAnimTreeDoubleChild.s +++ b/asm/Kyoto/Animation/CAnimTreeDoubleChild.s @@ -76,7 +76,7 @@ lbl_805A87B4: /* 802F27B4 002EF714 81 83 00 00 */ lwz r12, 0(r3) /* 802F27B8 002EF718 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 802F27BC 002EF71C 7D 89 03 A6 */ mtctr r12 -/* 802F27C0 002EF720 4E 80 04 21 */ bctrl +/* 802F27C0 002EF720 4E 80 04 21 */ bctrl /* 802F27C4 002EF724 80 7E 00 18 */ lwz r3, 0x18(r30) /* 802F27C8 002EF728 FC 20 F8 90 */ fmr f1, f31 /* 802F27CC 002EF72C 7F E4 FB 78 */ mr r4, r31 @@ -84,14 +84,14 @@ lbl_805A87B4: /* 802F27D4 002EF734 81 83 00 00 */ lwz r12, 0(r3) /* 802F27D8 002EF738 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 802F27DC 002EF73C 7D 89 03 A6 */ mtctr r12 -/* 802F27E0 002EF740 4E 80 04 21 */ bctrl +/* 802F27E0 002EF740 4E 80 04 21 */ bctrl /* 802F27E4 002EF744 80 01 00 24 */ lwz r0, 0x24(r1) /* 802F27E8 002EF748 CB E1 00 18 */ lfd f31, 0x18(r1) /* 802F27EC 002EF74C 83 E1 00 14 */ lwz r31, 0x14(r1) /* 802F27F0 002EF750 83 C1 00 10 */ lwz r30, 0x10(r1) /* 802F27F4 002EF754 7C 08 03 A6 */ mtlr r0 /* 802F27F8 002EF758 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F27FC 002EF75C 4E 80 00 20 */ blr +/* 802F27FC 002EF75C 4E 80 00 20 */ blr .global VGetBestUnblendedChild__20CAnimTreeDoubleChildCFv VGetBestUnblendedChild__20CAnimTreeDoubleChildCFv: @@ -106,7 +106,7 @@ VGetBestUnblendedChild__20CAnimTreeDoubleChildCFv: /* 802F2820 002EF780 81 9F 00 00 */ lwz r12, 0(r31) /* 802F2824 002EF784 81 8C 00 70 */ lwz r12, 0x70(r12) /* 802F2828 002EF788 7D 89 03 A6 */ mtctr r12 -/* 802F282C 002EF78C 4E 80 04 21 */ bctrl +/* 802F282C 002EF78C 4E 80 04 21 */ bctrl /* 802F2830 002EF790 C0 02 C6 90 */ lfs f0, lbl_805AE3B0@sda21(r2) /* 802F2834 002EF794 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 802F2838 002EF798 40 81 00 0C */ ble lbl_802F2844 @@ -173,7 +173,7 @@ lbl_802F2910: /* 802F2918 002EF878 83 C1 00 18 */ lwz r30, 0x18(r1) /* 802F291C 002EF87C 7C 08 03 A6 */ mtlr r0 /* 802F2920 002EF880 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F2924 002EF884 4E 80 00 20 */ blr +/* 802F2924 002EF884 4E 80 00 20 */ blr .global VGetAdvancementResults__20CAnimTreeDoubleChildCFRC13CCharAnimTimeRC13CCharAnimTime VGetAdvancementResults__20CAnimTreeDoubleChildCFRC13CCharAnimTimeRC13CCharAnimTime: @@ -194,7 +194,7 @@ VGetAdvancementResults__20CAnimTreeDoubleChildCFRC13CCharAnimTimeRC13CCharAnimTi /* 802F2960 002EF8C0 81 84 00 00 */ lwz r12, 0(r4) /* 802F2964 002EF8C4 81 8C 00 58 */ lwz r12, 0x58(r12) /* 802F2968 002EF8C8 7D 89 03 A6 */ mtctr r12 -/* 802F296C 002EF8CC 4E 80 04 21 */ bctrl +/* 802F296C 002EF8CC 4E 80 04 21 */ bctrl /* 802F2970 002EF8D0 C0 E1 00 2C */ lfs f7, 0x2c(r1) /* 802F2974 002EF8D4 7F C5 F3 78 */ mr r5, r30 /* 802F2978 002EF8D8 80 01 00 30 */ lwz r0, 0x30(r1) @@ -221,7 +221,7 @@ VGetAdvancementResults__20CAnimTreeDoubleChildCFRC13CCharAnimTimeRC13CCharAnimTi /* 802F29CC 002EF92C 81 84 00 00 */ lwz r12, 0(r4) /* 802F29D0 002EF930 81 8C 00 58 */ lwz r12, 0x58(r12) /* 802F29D4 002EF934 7D 89 03 A6 */ mtctr r12 -/* 802F29D8 002EF938 4E 80 04 21 */ bctrl +/* 802F29D8 002EF938 4E 80 04 21 */ bctrl /* 802F29DC 002EF93C C0 E1 00 08 */ lfs f7, 8(r1) /* 802F29E0 002EF940 38 61 00 74 */ addi r3, r1, 0x74 /* 802F29E4 002EF944 80 01 00 0C */ lwz r0, 0xc(r1) @@ -273,7 +273,7 @@ lbl_802F2A40: /* 802F2A98 002EF9F8 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 802F2A9C 002EF9FC 7C 08 03 A6 */ mtlr r0 /* 802F2AA0 002EFA00 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 802F2AA4 002EFA04 4E 80 00 20 */ blr +/* 802F2AA4 002EFA04 4E 80 00 20 */ blr .global VSetPhase__20CAnimTreeDoubleChildFf VSetPhase__20CAnimTreeDoubleChildFf: @@ -289,20 +289,20 @@ VSetPhase__20CAnimTreeDoubleChildFf: /* 802F2ACC 002EFA2C 81 83 00 00 */ lwz r12, 0(r3) /* 802F2AD0 002EFA30 81 8C 00 54 */ lwz r12, 0x54(r12) /* 802F2AD4 002EFA34 7D 89 03 A6 */ mtctr r12 -/* 802F2AD8 002EFA38 4E 80 04 21 */ bctrl +/* 802F2AD8 002EFA38 4E 80 04 21 */ bctrl /* 802F2ADC 002EFA3C 80 7F 00 18 */ lwz r3, 0x18(r31) /* 802F2AE0 002EFA40 FC 20 F8 90 */ fmr f1, f31 /* 802F2AE4 002EFA44 80 63 00 00 */ lwz r3, 0(r3) /* 802F2AE8 002EFA48 81 83 00 00 */ lwz r12, 0(r3) /* 802F2AEC 002EFA4C 81 8C 00 54 */ lwz r12, 0x54(r12) /* 802F2AF0 002EFA50 7D 89 03 A6 */ mtctr r12 -/* 802F2AF4 002EFA54 4E 80 04 21 */ bctrl +/* 802F2AF4 002EFA54 4E 80 04 21 */ bctrl /* 802F2AF8 002EFA58 80 01 00 24 */ lwz r0, 0x24(r1) /* 802F2AFC 002EFA5C CB E1 00 18 */ lfd f31, 0x18(r1) /* 802F2B00 002EFA60 83 E1 00 14 */ lwz r31, 0x14(r1) /* 802F2B04 002EFA64 7C 08 03 A6 */ mtlr r0 /* 802F2B08 002EFA68 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F2B0C 002EFA6C 4E 80 00 20 */ blr +/* 802F2B0C 002EFA6C 4E 80 00 20 */ blr .global AdvanceViewBothChildren__20CAnimTreeDoubleChildFRC13CCharAnimTimebb AdvanceViewBothChildren__20CAnimTreeDoubleChildFRC13CCharAnimTimebb: @@ -361,7 +361,7 @@ lbl_802F2BCC: /* 802F2BD8 002EFB38 81 84 00 00 */ lwz r12, 0(r4) /* 802F2BDC 002EFB3C 81 8C 00 14 */ lwz r12, 0x14(r12) /* 802F2BE0 002EFB40 7D 89 03 A6 */ mtctr r12 -/* 802F2BE4 002EFB44 4E 80 04 21 */ bctrl +/* 802F2BE4 002EFB44 4E 80 04 21 */ bctrl /* 802F2BE8 002EFB48 38 A1 00 18 */ addi r5, r1, 0x18 lbl_802F2BEC: /* 802F2BEC 002EFB4C C0 05 00 00 */ lfs f0, 0(r5) @@ -408,7 +408,7 @@ lbl_802F2C7C: /* 802F2C8C 002EFBEC 81 84 00 00 */ lwz r12, 0(r4) /* 802F2C90 002EFBF0 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802F2C94 002EFBF4 7D 89 03 A6 */ mtctr r12 -/* 802F2C98 002EFBF8 4E 80 04 21 */ bctrl +/* 802F2C98 002EFBF8 4E 80 04 21 */ bctrl /* 802F2C9C 002EFBFC C0 E1 01 6C */ lfs f7, 0x16c(r1) /* 802F2CA0 002EFC00 38 61 00 74 */ addi r3, r1, 0x74 /* 802F2CA4 002EFC04 80 01 01 70 */ lwz r0, 0x170(r1) @@ -459,7 +459,7 @@ lbl_802F2D24: /* 802F2D54 002EFCB4 38 80 00 01 */ li r4, 1 /* 802F2D58 002EFCB8 81 8C 00 08 */ lwz r12, 8(r12) /* 802F2D5C 002EFCBC 7D 89 03 A6 */ mtctr r12 -/* 802F2D60 002EFCC0 4E 80 04 21 */ bctrl +/* 802F2D60 002EFCC0 4E 80 04 21 */ bctrl lbl_802F2D64: /* 802F2D64 002EFCC4 88 01 00 B4 */ lbz r0, 0xb4(r1) /* 802F2D68 002EFCC8 38 60 00 00 */ li r3, 0 @@ -526,7 +526,7 @@ lbl_802F2DBC: /* 802F2E54 002EFDB4 81 84 00 00 */ lwz r12, 0(r4) /* 802F2E58 002EFDB8 81 8C 00 14 */ lwz r12, 0x14(r12) /* 802F2E5C 002EFDBC 7D 89 03 A6 */ mtctr r12 -/* 802F2E60 002EFDC0 4E 80 04 21 */ bctrl +/* 802F2E60 002EFDC0 4E 80 04 21 */ bctrl /* 802F2E64 002EFDC4 C0 01 00 10 */ lfs f0, 0x10(r1) /* 802F2E68 002EFDC8 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F2E6C 002EFDCC D0 01 00 38 */ stfs f0, 0x38(r1) @@ -551,7 +551,7 @@ lbl_802F2E74: /* 802F2EB4 002EFE14 38 80 00 01 */ li r4, 1 /* 802F2EB8 002EFE18 81 8C 00 08 */ lwz r12, 8(r12) /* 802F2EBC 002EFE1C 7D 89 03 A6 */ mtctr r12 -/* 802F2EC0 002EFE20 4E 80 04 21 */ bctrl +/* 802F2EC0 002EFE20 4E 80 04 21 */ bctrl lbl_802F2EC4: /* 802F2EC4 002EFE24 38 00 00 00 */ li r0, 0 /* 802F2EC8 002EFE28 98 01 00 B4 */ stb r0, 0xb4(r1) @@ -590,7 +590,7 @@ lbl_802F2F30: /* 802F2F40 002EFEA0 81 84 00 00 */ lwz r12, 0(r4) /* 802F2F44 002EFEA4 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802F2F48 002EFEA8 7D 89 03 A6 */ mtctr r12 -/* 802F2F4C 002EFEAC 4E 80 04 21 */ bctrl +/* 802F2F4C 002EFEAC 4E 80 04 21 */ bctrl /* 802F2F50 002EFEB0 C0 E1 01 48 */ lfs f7, 0x148(r1) /* 802F2F54 002EFEB4 38 61 00 68 */ addi r3, r1, 0x68 /* 802F2F58 002EFEB8 80 01 01 4C */ lwz r0, 0x14c(r1) @@ -641,7 +641,7 @@ lbl_802F2FD8: /* 802F3008 002EFF68 38 80 00 01 */ li r4, 1 /* 802F300C 002EFF6C 81 8C 00 08 */ lwz r12, 8(r12) /* 802F3010 002EFF70 7D 89 03 A6 */ mtctr r12 -/* 802F3014 002EFF74 4E 80 04 21 */ bctrl +/* 802F3014 002EFF74 4E 80 04 21 */ bctrl lbl_802F3018: /* 802F3018 002EFF78 88 01 00 98 */ lbz r0, 0x98(r1) /* 802F301C 002EFF7C 38 60 00 00 */ li r3, 0 @@ -719,7 +719,7 @@ lbl_802F3070: /* 802F3134 002F0094 38 80 00 01 */ li r4, 1 /* 802F3138 002F0098 81 8C 00 08 */ lwz r12, 8(r12) /* 802F313C 002F009C 7D 89 03 A6 */ mtctr r12 -/* 802F3140 002F00A0 4E 80 04 21 */ bctrl +/* 802F3140 002F00A0 4E 80 04 21 */ bctrl lbl_802F3144: /* 802F3144 002F00A4 38 00 00 00 */ li r0, 0 /* 802F3148 002F00A8 98 01 00 98 */ stb r0, 0x98(r1) @@ -784,7 +784,7 @@ lbl_802F3170: /* 802F322C 002F018C 83 81 01 E0 */ lwz r28, 0x1e0(r1) /* 802F3230 002F0190 7C 08 03 A6 */ mtlr r0 /* 802F3234 002F0194 38 21 02 70 */ addi r1, r1, 0x270 -/* 802F3238 002F0198 4E 80 00 20 */ blr +/* 802F3238 002F0198 4E 80 00 20 */ blr .global __ct__Q220CAnimTreeDoubleChild29CDoubleChildAdvancementResultFRC13CCharAnimTimeRC18SAdvancementDeltasRC18SAdvancementDeltas __ct__Q220CAnimTreeDoubleChild29CDoubleChildAdvancementResultFRC13CCharAnimTimeRC18SAdvancementDeltasRC18SAdvancementDeltas: @@ -820,7 +820,7 @@ __ct__Q220CAnimTreeDoubleChild29CDoubleChildAdvancementResultFRC13CCharAnimTimeR /* 802F32B0 002F0210 D0 03 00 38 */ stfs f0, 0x38(r3) /* 802F32B4 002F0214 C0 06 00 18 */ lfs f0, 0x18(r6) /* 802F32B8 002F0218 D0 03 00 3C */ stfs f0, 0x3c(r3) -/* 802F32BC 002F021C 4E 80 00 20 */ blr +/* 802F32BC 002F021C 4E 80 00 20 */ blr .global VGetNumChildren__20CAnimTreeDoubleChildCFv VGetNumChildren__20CAnimTreeDoubleChildCFv: @@ -834,21 +834,21 @@ VGetNumChildren__20CAnimTreeDoubleChildCFv: /* 802F32DC 002F023C 81 83 00 00 */ lwz r12, 0(r3) /* 802F32E0 002F0240 81 8C 00 64 */ lwz r12, 0x64(r12) /* 802F32E4 002F0244 7D 89 03 A6 */ mtctr r12 -/* 802F32E8 002F0248 4E 80 04 21 */ bctrl +/* 802F32E8 002F0248 4E 80 04 21 */ bctrl /* 802F32EC 002F024C 80 9F 00 14 */ lwz r4, 0x14(r31) /* 802F32F0 002F0250 7C 7F 1B 78 */ mr r31, r3 /* 802F32F4 002F0254 80 64 00 00 */ lwz r3, 0(r4) /* 802F32F8 002F0258 81 83 00 00 */ lwz r12, 0(r3) /* 802F32FC 002F025C 81 8C 00 64 */ lwz r12, 0x64(r12) /* 802F3300 002F0260 7D 89 03 A6 */ mtctr r12 -/* 802F3304 002F0264 4E 80 04 21 */ bctrl +/* 802F3304 002F0264 4E 80 04 21 */ bctrl /* 802F3308 002F0268 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F330C 002F026C 7C 63 FA 14 */ add r3, r3, r31 /* 802F3310 002F0270 38 63 00 02 */ addi r3, r3, 2 /* 802F3314 002F0274 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802F3318 002F0278 7C 08 03 A6 */ mtlr r0 /* 802F331C 002F027C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F3320 002F0280 4E 80 00 20 */ blr +/* 802F3320 002F0280 4E 80 00 20 */ blr .global VGetContributionOfHighestInfluence__20CAnimTreeDoubleChildCFv VGetContributionOfHighestInfluence__20CAnimTreeDoubleChildCFv: @@ -932,7 +932,7 @@ lbl_802F344C: /* 802F3450 002F03B0 81 9B 00 00 */ lwz r12, 0(r27) /* 802F3454 002F03B4 81 8C 00 70 */ lwz r12, 0x70(r12) /* 802F3458 002F03B8 7D 89 03 A6 */ mtctr r12 -/* 802F345C 002F03BC 4E 80 04 21 */ bctrl +/* 802F345C 002F03BC 4E 80 04 21 */ bctrl /* 802F3460 002F03C0 C0 02 C6 9C */ lfs f0, lbl_805AE3BC@sda21(r2) /* 802F3464 002F03C4 7F 63 DB 78 */ mr r3, r27 /* 802F3468 002F03C8 81 9B 00 00 */ lwz r12, 0(r27) @@ -941,7 +941,7 @@ lbl_802F344C: /* 802F3474 002F03D4 81 8C 00 70 */ lwz r12, 0x70(r12) /* 802F3478 002F03D8 EF E0 00 72 */ fmuls f31, f0, f1 /* 802F347C 002F03DC 7D 89 03 A6 */ mtctr r12 -/* 802F3480 002F03E0 4E 80 04 21 */ bctrl +/* 802F3480 002F03E0 4E 80 04 21 */ bctrl /* 802F3484 002F03E4 C0 01 00 E8 */ lfs f0, 0xe8(r1) /* 802F3488 002F03E8 3B 80 00 00 */ li r28, 0 /* 802F348C 002F03EC 3B 20 00 00 */ li r25, 0 @@ -1050,7 +1050,7 @@ lbl_802F3604: /* 802F3610 002F0570 80 01 01 94 */ lwz r0, 0x194(r1) /* 802F3614 002F0574 7C 08 03 A6 */ mtlr r0 /* 802F3618 002F0578 38 21 01 90 */ addi r1, r1, 0x190 -/* 802F361C 002F057C 4E 80 00 20 */ blr +/* 802F361C 002F057C 4E 80 00 20 */ blr .global VGetParticlePOIState__20CAnimTreeDoubleChildCFPCc VGetParticlePOIState__20CAnimTreeDoubleChildCFPCc: @@ -1062,11 +1062,11 @@ VGetParticlePOIState__20CAnimTreeDoubleChildCFPCc: /* 802F3634 002F0594 81 83 00 00 */ lwz r12, 0(r3) /* 802F3638 002F0598 81 8C 00 40 */ lwz r12, 0x40(r12) /* 802F363C 002F059C 7D 89 03 A6 */ mtctr r12 -/* 802F3640 002F05A0 4E 80 04 21 */ bctrl +/* 802F3640 002F05A0 4E 80 04 21 */ bctrl /* 802F3644 002F05A4 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F3648 002F05A8 7C 08 03 A6 */ mtlr r0 /* 802F364C 002F05AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F3650 002F05B0 4E 80 00 20 */ blr +/* 802F3650 002F05B0 4E 80 00 20 */ blr .global VGetInt32POIState__20CAnimTreeDoubleChildCFPCc VGetInt32POIState__20CAnimTreeDoubleChildCFPCc: @@ -1078,11 +1078,11 @@ VGetInt32POIState__20CAnimTreeDoubleChildCFPCc: /* 802F3668 002F05C8 81 83 00 00 */ lwz r12, 0(r3) /* 802F366C 002F05CC 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 802F3670 002F05D0 7D 89 03 A6 */ mtctr r12 -/* 802F3674 002F05D4 4E 80 04 21 */ bctrl +/* 802F3674 002F05D4 4E 80 04 21 */ bctrl /* 802F3678 002F05D8 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F367C 002F05DC 7C 08 03 A6 */ mtlr r0 /* 802F3680 002F05E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F3684 002F05E4 4E 80 00 20 */ blr +/* 802F3684 002F05E4 4E 80 00 20 */ blr .global VGetBoolPOIState__20CAnimTreeDoubleChildCFPCc VGetBoolPOIState__20CAnimTreeDoubleChildCFPCc: @@ -1094,11 +1094,11 @@ VGetBoolPOIState__20CAnimTreeDoubleChildCFPCc: /* 802F369C 002F05FC 81 83 00 00 */ lwz r12, 0(r3) /* 802F36A0 002F0600 81 8C 00 38 */ lwz r12, 0x38(r12) /* 802F36A4 002F0604 7D 89 03 A6 */ mtctr r12 -/* 802F36A8 002F0608 4E 80 04 21 */ bctrl +/* 802F36A8 002F0608 4E 80 04 21 */ bctrl /* 802F36AC 002F060C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F36B0 002F0610 7C 08 03 A6 */ mtlr r0 /* 802F36B4 002F0614 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F36B8 002F0618 4E 80 00 20 */ blr +/* 802F36B8 002F0618 4E 80 00 20 */ blr .global VGetSoundPOIList__20CAnimTreeDoubleChildCFRC13CCharAnimTimeP13CSoundPOINodeUiUii VGetSoundPOIList__20CAnimTreeDoubleChildCFRC13CCharAnimTimeP13CSoundPOINodeUiUii: @@ -1140,7 +1140,7 @@ lbl_802F3724: /* 802F3744 002F06A4 80 01 00 24 */ lwz r0, 0x24(r1) /* 802F3748 002F06A8 7C 08 03 A6 */ mtlr r0 /* 802F374C 002F06AC 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F3750 002F06B0 4E 80 00 20 */ blr +/* 802F3750 002F06B0 4E 80 00 20 */ blr .global VGetParticlePOIList__20CAnimTreeDoubleChildCFRC13CCharAnimTimeP16CParticlePOINodeUiUii VGetParticlePOIList__20CAnimTreeDoubleChildCFRC13CCharAnimTimeP16CParticlePOINodeUiUii: @@ -1182,7 +1182,7 @@ lbl_802F37BC: /* 802F37DC 002F073C 80 01 00 24 */ lwz r0, 0x24(r1) /* 802F37E0 002F0740 7C 08 03 A6 */ mtlr r0 /* 802F37E4 002F0744 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F37E8 002F0748 4E 80 00 20 */ blr +/* 802F37E8 002F0748 4E 80 00 20 */ blr .global VGetInt32POIList__20CAnimTreeDoubleChildCFRC13CCharAnimTimeP13CInt32POINodeUiUii VGetInt32POIList__20CAnimTreeDoubleChildCFRC13CCharAnimTimeP13CInt32POINodeUiUii: @@ -1224,7 +1224,7 @@ lbl_802F3854: /* 802F3874 002F07D4 80 01 00 24 */ lwz r0, 0x24(r1) /* 802F3878 002F07D8 7C 08 03 A6 */ mtlr r0 /* 802F387C 002F07DC 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F3880 002F07E0 4E 80 00 20 */ blr +/* 802F3880 002F07E0 4E 80 00 20 */ blr .global VGetBoolPOIList__20CAnimTreeDoubleChildCFRC13CCharAnimTimeP12CBoolPOINodeUiUii VGetBoolPOIList__20CAnimTreeDoubleChildCFRC13CCharAnimTimeP12CBoolPOINodeUiUii: @@ -1266,7 +1266,7 @@ lbl_802F38EC: /* 802F390C 002F086C 80 01 00 24 */ lwz r0, 0x24(r1) /* 802F3910 002F0870 7C 08 03 A6 */ mtlr r0 /* 802F3914 002F0874 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F3918 002F0878 4E 80 00 20 */ blr +/* 802F3918 002F0878 4E 80 00 20 */ blr .global __dt__20CAnimTreeDoubleChildFv __dt__20CAnimTreeDoubleChildFv: @@ -1326,7 +1326,7 @@ lbl_802F39D0: /* 802F39DC 002F093C 83 C1 00 08 */ lwz r30, 8(r1) /* 802F39E0 002F0940 7C 08 03 A6 */ mtlr r0 /* 802F39E4 002F0944 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F39E8 002F0948 4E 80 00 20 */ blr +/* 802F39E8 002F0948 4E 80 00 20 */ blr .global VAdvanceView__20CAnimTreeDoubleChildFRC13CCharAnimTime VAdvanceView__20CAnimTreeDoubleChildFRC13CCharAnimTime: @@ -1345,7 +1345,7 @@ VAdvanceView__20CAnimTreeDoubleChildFRC13CCharAnimTime: /* 802F3A1C 002F097C 81 84 00 00 */ lwz r12, 0(r4) /* 802F3A20 002F0980 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802F3A24 002F0984 7D 89 03 A6 */ mtctr r12 -/* 802F3A28 002F0988 4E 80 04 21 */ bctrl +/* 802F3A28 002F0988 4E 80 04 21 */ bctrl /* 802F3A2C 002F098C C0 E1 00 2C */ lfs f7, 0x2c(r1) /* 802F3A30 002F0990 7F E5 FB 78 */ mr r5, r31 /* 802F3A34 002F0994 80 01 00 30 */ lwz r0, 0x30(r1) @@ -1371,7 +1371,7 @@ VAdvanceView__20CAnimTreeDoubleChildFRC13CCharAnimTime: /* 802F3A84 002F09E4 81 84 00 00 */ lwz r12, 0(r4) /* 802F3A88 002F09E8 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802F3A8C 002F09EC 7D 89 03 A6 */ mtctr r12 -/* 802F3A90 002F09F0 4E 80 04 21 */ bctrl +/* 802F3A90 002F09F0 4E 80 04 21 */ bctrl /* 802F3A94 002F09F4 C0 E1 00 08 */ lfs f7, 8(r1) /* 802F3A98 002F09F8 38 61 00 74 */ addi r3, r1, 0x74 /* 802F3A9C 002F09FC 80 01 00 0C */ lwz r0, 0xc(r1) @@ -1422,7 +1422,7 @@ lbl_802F3AF8: /* 802F3B4C 002F0AAC 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 802F3B50 002F0AB0 7C 08 03 A6 */ mtlr r0 /* 802F3B54 002F0AB4 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 802F3B58 002F0AB8 4E 80 00 20 */ blr +/* 802F3B58 002F0AB8 4E 80 00 20 */ blr .global "__ct__20CAnimTreeDoubleChildFRCQ24rstl25ncrc_ptr<13CAnimTreeNode>RCQ24rstl25ncrc_ptr<13CAnimTreeNode>RCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" "__ct__20CAnimTreeDoubleChildFRCQ24rstl25ncrc_ptr<13CAnimTreeNode>RCQ24rstl25ncrc_ptr<13CAnimTreeNode>RCQ24rstl66basic_string,Q24rstl17rmemory_allocator>": diff --git a/asm/Kyoto/Animation/CAnimTreeLoopIn.s b/asm/Kyoto/Animation/CAnimTreeLoopIn.s index 462f7596..fa0f2306 100644 --- a/asm/Kyoto/Animation/CAnimTreeLoopIn.s +++ b/asm/Kyoto/Animation/CAnimTreeLoopIn.s @@ -116,7 +116,7 @@ lbl_802D87F4: /* 802D8800 002D5760 83 C1 00 08 */ lwz r30, 8(r1) /* 802D8804 002D5764 7C 08 03 A6 */ mtlr r0 /* 802D8808 002D5768 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D880C 002D576C 4E 80 00 20 */ blr +/* 802D880C 002D576C 4E 80 00 20 */ blr .global sub_802d8810 sub_802d8810: @@ -147,7 +147,7 @@ lbl_802D8864: /* 802D886C 002D57CC 81 9C 00 00 */ lwz r12, 0(r28) /* 802D8870 002D57D0 81 8C 00 08 */ lwz r12, 8(r12) /* 802D8874 002D57D4 7D 89 03 A6 */ mtctr r12 -/* 802D8878 002D57D8 4E 80 04 21 */ bctrl +/* 802D8878 002D57D8 4E 80 04 21 */ bctrl /* 802D887C 002D57DC 3B 9C 00 44 */ addi r28, r28, 0x44 lbl_802D8880: /* 802D8880 002D57E0 7C 1C E8 40 */ cmplw r28, r29 @@ -174,7 +174,7 @@ lbl_802D88C4: /* 802D88CC 002D582C 81 9C 00 00 */ lwz r12, 0(r28) /* 802D88D0 002D5830 81 8C 00 08 */ lwz r12, 8(r12) /* 802D88D4 002D5834 7D 89 03 A6 */ mtctr r12 -/* 802D88D8 002D5838 4E 80 04 21 */ bctrl +/* 802D88D8 002D5838 4E 80 04 21 */ bctrl /* 802D88DC 002D583C 3B 9C 00 5C */ addi r28, r28, 0x5c lbl_802D88E0: /* 802D88E0 002D5840 7C 1C E8 40 */ cmplw r28, r29 @@ -201,7 +201,7 @@ lbl_802D8924: /* 802D892C 002D588C 81 9C 00 00 */ lwz r12, 0(r28) /* 802D8930 002D5890 81 8C 00 08 */ lwz r12, 8(r12) /* 802D8934 002D5894 7D 89 03 A6 */ mtctr r12 -/* 802D8938 002D5898 4E 80 04 21 */ bctrl +/* 802D8938 002D5898 4E 80 04 21 */ bctrl /* 802D893C 002D589C 3B 9C 00 4C */ addi r28, r28, 0x4c lbl_802D8940: /* 802D8940 002D58A0 7C 1C E8 40 */ cmplw r28, r29 @@ -228,7 +228,7 @@ lbl_802D8984: /* 802D898C 002D58EC 81 9C 00 00 */ lwz r12, 0(r28) /* 802D8990 002D58F0 81 8C 00 08 */ lwz r12, 8(r12) /* 802D8994 002D58F4 7D 89 03 A6 */ mtctr r12 -/* 802D8998 002D58F8 4E 80 04 21 */ bctrl +/* 802D8998 002D58F8 4E 80 04 21 */ bctrl /* 802D899C 002D58FC 3B 9C 00 3C */ addi r28, r28, 0x3c lbl_802D89A0: /* 802D89A0 002D5900 7C 1C E8 40 */ cmplw r28, r29 @@ -251,7 +251,7 @@ lbl_802D89C8: /* 802D89DC 002D593C 83 81 00 50 */ lwz r28, 0x50(r1) /* 802D89E0 002D5940 7C 08 03 A6 */ mtlr r0 /* 802D89E4 002D5944 38 21 00 60 */ addi r1, r1, 0x60 -/* 802D89E8 002D5948 4E 80 00 20 */ blr +/* 802D89E8 002D5948 4E 80 00 20 */ blr .global Depth__20CAnimTreeSingleChildCFv Depth__20CAnimTreeSingleChildCFv: @@ -263,12 +263,12 @@ Depth__20CAnimTreeSingleChildCFv: /* 802D8A00 002D5960 81 83 00 00 */ lwz r12, 0(r3) /* 802D8A04 002D5964 81 8C 00 5C */ lwz r12, 0x5c(r12) /* 802D8A08 002D5968 7D 89 03 A6 */ mtctr r12 -/* 802D8A0C 002D596C 4E 80 04 21 */ bctrl +/* 802D8A0C 002D596C 4E 80 04 21 */ bctrl /* 802D8A10 002D5970 80 01 00 14 */ lwz r0, 0x14(r1) /* 802D8A14 002D5974 38 63 00 01 */ addi r3, r3, 1 /* 802D8A18 002D5978 7C 08 03 A6 */ mtlr r0 /* 802D8A1C 002D597C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D8A20 002D5980 4E 80 00 20 */ blr +/* 802D8A20 002D5980 4E 80 00 20 */ blr .global "CreatePrimitiveName__15CAnimTreeLoopInFRCQ24rstl25ncrc_ptr<13CAnimTreeNode>RCQ24rstl25ncrc_ptr<13CAnimTreeNode>RCQ24rstl25ncrc_ptr<13CAnimTreeNode>" "CreatePrimitiveName__15CAnimTreeLoopInFRCQ24rstl25ncrc_ptr<13CAnimTreeNode>RCQ24rstl25ncrc_ptr<13CAnimTreeNode>RCQ24rstl25ncrc_ptr<13CAnimTreeNode>": @@ -284,7 +284,7 @@ Depth__20CAnimTreeSingleChildCFv: /* 802D8A48 002D59A8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802D8A4C 002D59AC 7C 08 03 A6 */ mtlr r0 /* 802D8A50 002D59B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D8A54 002D59B4 4E 80 00 20 */ blr +/* 802D8A54 002D59B4 4E 80 00 20 */ blr .global VGetContributionOfHighestInfluence__15CAnimTreeLoopInCFv VGetContributionOfHighestInfluence__15CAnimTreeLoopInCFv: @@ -300,12 +300,12 @@ VGetContributionOfHighestInfluence__15CAnimTreeLoopInCFv: /* 802D8A7C 002D59DC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802D8A80 002D59E0 7C 08 03 A6 */ mtlr r0 /* 802D8A84 002D59E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D8A88 002D59E8 4E 80 00 20 */ blr +/* 802D8A88 002D59E8 4E 80 00 20 */ blr .global VSupportsReverseView__15CAnimTreeLoopInCFv VSupportsReverseView__15CAnimTreeLoopInCFv: /* 802D8A8C 002D59EC 38 60 00 00 */ li r3, 0 -/* 802D8A90 002D59F0 4E 80 00 20 */ blr +/* 802D8A90 002D59F0 4E 80 00 20 */ blr .global VSimplified__15CAnimTreeLoopInFv VSimplified__15CAnimTreeLoopInFv: @@ -322,7 +322,7 @@ VSimplified__15CAnimTreeLoopInFv: /* 802D8ABC 002D5A1C 81 84 00 00 */ lwz r12, 0(r4) /* 802D8AC0 002D5A20 81 8C 00 14 */ lwz r12, 0x14(r12) /* 802D8AC4 002D5A24 7D 89 03 A6 */ mtctr r12 -/* 802D8AC8 002D5A28 4E 80 04 21 */ bctrl +/* 802D8AC8 002D5A28 4E 80 04 21 */ bctrl /* 802D8ACC 002D5A2C C0 01 00 20 */ lfs f0, 0x20(r1) /* 802D8AD0 002D5A30 38 61 00 28 */ addi r3, r1, 0x28 /* 802D8AD4 002D5A34 80 01 00 24 */ lwz r0, 0x24(r1) @@ -375,7 +375,7 @@ lbl_802D8B5C: /* 802D8B8C 002D5AEC 38 80 00 01 */ li r4, 1 /* 802D8B90 002D5AF0 81 8C 00 08 */ lwz r12, 8(r12) /* 802D8B94 002D5AF4 7D 89 03 A6 */ mtctr r12 -/* 802D8B98 002D5AF8 4E 80 04 21 */ bctrl +/* 802D8B98 002D5AF8 4E 80 04 21 */ bctrl lbl_802D8B9C: /* 802D8B9C 002D5AFC 88 01 00 44 */ lbz r0, 0x44(r1) /* 802D8BA0 002D5B00 38 60 00 00 */ li r3, 0 @@ -416,7 +416,7 @@ lbl_802D8BF4: /* 802D8C24 002D5B84 38 80 00 01 */ li r4, 1 /* 802D8C28 002D5B88 81 8C 00 08 */ lwz r12, 8(r12) /* 802D8C2C 002D5B8C 7D 89 03 A6 */ mtctr r12 -/* 802D8C30 002D5B90 4E 80 04 21 */ bctrl +/* 802D8C30 002D5B90 4E 80 04 21 */ bctrl lbl_802D8C34: /* 802D8C34 002D5B94 38 00 00 00 */ li r0, 0 /* 802D8C38 002D5B98 38 61 00 0C */ addi r3, r1, 0xc @@ -433,7 +433,7 @@ lbl_802D8C48: /* 802D8C60 002D5BC0 81 84 00 00 */ lwz r12, 0(r4) /* 802D8C64 002D5BC4 81 8C 00 14 */ lwz r12, 0x14(r12) /* 802D8C68 002D5BC8 7D 89 03 A6 */ mtctr r12 -/* 802D8C6C 002D5BCC 4E 80 04 21 */ bctrl +/* 802D8C6C 002D5BCC 4E 80 04 21 */ bctrl /* 802D8C70 002D5BD0 38 61 00 18 */ addi r3, r1, 0x18 /* 802D8C74 002D5BD4 48 06 F7 3D */ bl EqualsZero__13CCharAnimTimeCFv /* 802D8C78 002D5BD8 54 60 06 3F */ clrlwi. r0, r3, 0x18 @@ -463,7 +463,7 @@ lbl_802D8CB8: /* 802D8CD4 002D5C34 38 80 00 01 */ li r4, 1 /* 802D8CD8 002D5C38 81 8C 00 08 */ lwz r12, 8(r12) /* 802D8CDC 002D5C3C 7D 89 03 A6 */ mtctr r12 -/* 802D8CE0 002D5C40 4E 80 04 21 */ bctrl +/* 802D8CE0 002D5C40 4E 80 04 21 */ bctrl /* 802D8CE4 002D5C44 48 00 00 0C */ b lbl_802D8CF0 lbl_802D8CE8: /* 802D8CE8 002D5C48 38 00 00 00 */ li r0, 0 @@ -474,7 +474,7 @@ lbl_802D8CF0: /* 802D8CF8 002D5C58 83 C1 00 48 */ lwz r30, 0x48(r1) /* 802D8CFC 002D5C5C 7C 08 03 A6 */ mtlr r0 /* 802D8D00 002D5C60 38 21 00 50 */ addi r1, r1, 0x50 -/* 802D8D04 002D5C64 4E 80 00 20 */ blr +/* 802D8D04 002D5C64 4E 80 00 20 */ blr .global VGetBestUnblendedChild__15CAnimTreeLoopInCFv VGetBestUnblendedChild__15CAnimTreeLoopInCFv: @@ -559,7 +559,7 @@ lbl_802D8E10: /* 802D8E34 002D5D94 38 80 00 01 */ li r4, 1 /* 802D8E38 002D5D98 81 8C 00 08 */ lwz r12, 8(r12) /* 802D8E3C 002D5D9C 7D 89 03 A6 */ mtctr r12 -/* 802D8E40 002D5DA0 4E 80 04 21 */ bctrl +/* 802D8E40 002D5DA0 4E 80 04 21 */ bctrl lbl_802D8E44: /* 802D8E44 002D5DA4 38 61 00 10 */ addi r3, r1, 0x10 /* 802D8E48 002D5DA8 4B D5 81 59 */ bl sub_80030fa0 @@ -577,7 +577,7 @@ lbl_802D8E6C: /* 802D8E70 002D5DD0 80 01 00 44 */ lwz r0, 0x44(r1) /* 802D8E74 002D5DD4 7C 08 03 A6 */ mtlr r0 /* 802D8E78 002D5DD8 38 21 00 40 */ addi r1, r1, 0x40 -/* 802D8E7C 002D5DDC 4E 80 00 20 */ blr +/* 802D8E7C 002D5DDC 4E 80 00 20 */ blr .global GetBestUnblendedChild__13CAnimTreeNodeCFv GetBestUnblendedChild__13CAnimTreeNodeCFv: @@ -589,12 +589,12 @@ GetBestUnblendedChild__13CAnimTreeNodeCFv: /* 802D8E94 002D5DF4 81 84 00 00 */ lwz r12, 0(r4) /* 802D8E98 002D5DF8 81 8C 00 68 */ lwz r12, 0x68(r12) /* 802D8E9C 002D5DFC 7D 89 03 A6 */ mtctr r12 -/* 802D8EA0 002D5E00 4E 80 04 21 */ bctrl +/* 802D8EA0 002D5E00 4E 80 04 21 */ bctrl /* 802D8EA4 002D5E04 80 01 00 14 */ lwz r0, 0x14(r1) /* 802D8EA8 002D5E08 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802D8EAC 002D5E0C 7C 08 03 A6 */ mtlr r0 /* 802D8EB0 002D5E10 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D8EB4 002D5E14 4E 80 00 20 */ blr +/* 802D8EB4 002D5E14 4E 80 00 20 */ blr .global VClone__15CAnimTreeLoopInCFv VClone__15CAnimTreeLoopInCFv: @@ -656,13 +656,13 @@ lbl_802D8F68: /* 802D8F8C 002D5EEC 38 80 00 01 */ li r4, 1 /* 802D8F90 002D5EF0 81 8C 00 08 */ lwz r12, 8(r12) /* 802D8F94 002D5EF4 7D 89 03 A6 */ mtctr r12 -/* 802D8F98 002D5EF8 4E 80 04 21 */ bctrl +/* 802D8F98 002D5EF8 4E 80 04 21 */ bctrl lbl_802D8F9C: /* 802D8F9C 002D5EFC BB 61 00 1C */ lmw r27, 0x1c(r1) /* 802D8FA0 002D5F00 80 01 00 34 */ lwz r0, 0x34(r1) /* 802D8FA4 002D5F04 7C 08 03 A6 */ mtlr r0 /* 802D8FA8 002D5F08 38 21 00 30 */ addi r1, r1, 0x30 -/* 802D8FAC 002D5F0C 4E 80 00 20 */ blr +/* 802D8FAC 002D5F0C 4E 80 00 20 */ blr .global VGetSoundPOIList__15CAnimTreeLoopInCFRC13CCharAnimTimeP13CSoundPOINodeUiUii VGetSoundPOIList__15CAnimTreeLoopInCFRC13CCharAnimTimeP13CSoundPOINodeUiUii: @@ -681,7 +681,7 @@ VGetSoundPOIList__15CAnimTreeLoopInCFRC13CCharAnimTimeP13CSoundPOINodeUiUii: /* 802D8FE0 002D5F40 80 01 00 14 */ lwz r0, 0x14(r1) /* 802D8FE4 002D5F44 7C 08 03 A6 */ mtlr r0 /* 802D8FE8 002D5F48 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D8FEC 002D5F4C 4E 80 00 20 */ blr +/* 802D8FEC 002D5F4C 4E 80 00 20 */ blr .global VGetParticlePOIList__15CAnimTreeLoopInCFRC13CCharAnimTimeP16CParticlePOINodeUiUii VGetParticlePOIList__15CAnimTreeLoopInCFRC13CCharAnimTimeP16CParticlePOINodeUiUii: @@ -700,7 +700,7 @@ VGetParticlePOIList__15CAnimTreeLoopInCFRC13CCharAnimTimeP16CParticlePOINodeUiUi /* 802D9020 002D5F80 80 01 00 14 */ lwz r0, 0x14(r1) /* 802D9024 002D5F84 7C 08 03 A6 */ mtlr r0 /* 802D9028 002D5F88 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D902C 002D5F8C 4E 80 00 20 */ blr +/* 802D902C 002D5F8C 4E 80 00 20 */ blr .global VGetInt32POIList__15CAnimTreeLoopInCFRC13CCharAnimTimeP13CInt32POINodeUiUii VGetInt32POIList__15CAnimTreeLoopInCFRC13CCharAnimTimeP13CInt32POINodeUiUii: @@ -719,7 +719,7 @@ VGetInt32POIList__15CAnimTreeLoopInCFRC13CCharAnimTimeP13CInt32POINodeUiUii: /* 802D9060 002D5FC0 80 01 00 14 */ lwz r0, 0x14(r1) /* 802D9064 002D5FC4 7C 08 03 A6 */ mtlr r0 /* 802D9068 002D5FC8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D906C 002D5FCC 4E 80 00 20 */ blr +/* 802D906C 002D5FCC 4E 80 00 20 */ blr .global VGetBoolPOIList__15CAnimTreeLoopInCFRC13CCharAnimTimeP12CBoolPOINodeUiUii VGetBoolPOIList__15CAnimTreeLoopInCFRC13CCharAnimTimeP12CBoolPOINodeUiUii: @@ -738,7 +738,7 @@ VGetBoolPOIList__15CAnimTreeLoopInCFRC13CCharAnimTimeP12CBoolPOINodeUiUii: /* 802D90A0 002D6000 80 01 00 14 */ lwz r0, 0x14(r1) /* 802D90A4 002D6004 7C 08 03 A6 */ mtlr r0 /* 802D90A8 002D6008 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D90AC 002D600C 4E 80 00 20 */ blr +/* 802D90AC 002D600C 4E 80 00 20 */ blr .global VGetSteadyStateAnimInfo__15CAnimTreeLoopInCFv VGetSteadyStateAnimInfo__15CAnimTreeLoopInCFv: @@ -754,7 +754,7 @@ VGetSteadyStateAnimInfo__15CAnimTreeLoopInCFv: /* 802D90D4 002D6034 D0 03 00 10 */ stfs f0, 0x10(r3) /* 802D90D8 002D6038 88 04 00 44 */ lbz r0, 0x44(r4) /* 802D90DC 002D603C 98 03 00 14 */ stb r0, 0x14(r3) -/* 802D90E0 002D6040 4E 80 00 20 */ blr +/* 802D90E0 002D6040 4E 80 00 20 */ blr .global VGetTimeRemaining__15CAnimTreeLoopInCFv VGetTimeRemaining__15CAnimTreeLoopInCFv: @@ -776,7 +776,7 @@ VGetTimeRemaining__15CAnimTreeLoopInCFv: /* 802D9120 002D6080 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802D9124 002D6084 7C 08 03 A6 */ mtlr r0 /* 802D9128 002D6088 38 21 00 20 */ addi r1, r1, 0x20 -/* 802D912C 002D608C 4E 80 00 20 */ blr +/* 802D912C 002D608C 4E 80 00 20 */ blr .global VAdvanceView__15CAnimTreeLoopInFRC13CCharAnimTime VAdvanceView__15CAnimTreeLoopInFRC13CCharAnimTime: @@ -801,7 +801,7 @@ VAdvanceView__15CAnimTreeLoopInFRC13CCharAnimTime: /* 802D9178 002D60D8 81 84 00 00 */ lwz r12, 0(r4) /* 802D917C 002D60DC 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802D9180 002D60E0 7D 89 03 A6 */ mtctr r12 -/* 802D9184 002D60E4 4E 80 04 21 */ bctrl +/* 802D9184 002D60E4 4E 80 04 21 */ bctrl /* 802D9188 002D60E8 C0 E1 00 2C */ lfs f7, 0x2c(r1) /* 802D918C 002D60EC 7F 84 E3 78 */ mr r4, r28 /* 802D9190 002D60F0 83 A1 00 30 */ lwz r29, 0x30(r1) @@ -835,7 +835,7 @@ VAdvanceView__15CAnimTreeLoopInFRC13CCharAnimTime: /* 802D9200 002D6160 81 84 00 00 */ lwz r12, 0(r4) /* 802D9204 002D6164 81 8C 00 14 */ lwz r12, 0x14(r12) /* 802D9208 002D6168 7D 89 03 A6 */ mtctr r12 -/* 802D920C 002D616C 4E 80 04 21 */ bctrl +/* 802D920C 002D616C 4E 80 04 21 */ bctrl /* 802D9210 002D6170 C0 01 00 14 */ lfs f0, 0x14(r1) /* 802D9214 002D6174 C0 62 C5 98 */ lfs f3, lbl_805AE2B8@sda21(r2) /* 802D9218 002D6178 C0 42 C5 9C */ lfs f2, lbl_805AE2BC@sda21(r2) @@ -910,7 +910,7 @@ lbl_802D92C4: /* 802D9320 002D6280 83 81 00 80 */ lwz r28, 0x80(r1) /* 802D9324 002D6284 7C 08 03 A6 */ mtlr r0 /* 802D9328 002D6288 38 21 00 90 */ addi r1, r1, 0x90 -/* 802D932C 002D628C 4E 80 00 20 */ blr +/* 802D932C 002D628C 4E 80 00 20 */ blr .global "__ct__15CAnimTreeLoopInFRCQ24rstl25ncrc_ptr<13CAnimTreeNode>RCQ24rstl25ncrc_ptr<13CAnimTreeNode>bRC15CAnimSysContextRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC21CSequenceFundamentalsRC13CCharAnimTime" "__ct__15CAnimTreeLoopInFRCQ24rstl25ncrc_ptr<13CAnimTreeNode>RCQ24rstl25ncrc_ptr<13CAnimTreeNode>bRC15CAnimSysContextRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC21CSequenceFundamentalsRC13CCharAnimTime": @@ -972,7 +972,7 @@ lbl_802D92C4: /* 802D940C 002D636C 80 01 00 34 */ lwz r0, 0x34(r1) /* 802D9410 002D6370 7C 08 03 A6 */ mtlr r0 /* 802D9414 002D6374 38 21 00 30 */ addi r1, r1, 0x30 -/* 802D9418 002D6378 4E 80 00 20 */ blr +/* 802D9418 002D6378 4E 80 00 20 */ blr .global sub_802d941c sub_802d941c: @@ -1013,7 +1013,7 @@ sub_802d941c: /* 802D94A4 002D6404 83 C1 00 08 */ lwz r30, 8(r1) /* 802D94A8 002D6408 7C 08 03 A6 */ mtlr r0 /* 802D94AC 002D640C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D94B0 002D6410 4E 80 00 20 */ blr +/* 802D94B0 002D6410 4E 80 00 20 */ blr .global sub_802d94b4 sub_802d94b4: @@ -1106,7 +1106,7 @@ lbl_802D95E8: /* 802D95F0 002D6550 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D95F4 002D6554 7C 08 03 A6 */ mtlr r0 /* 802D95F8 002D6558 38 21 00 20 */ addi r1, r1, 0x20 -/* 802D95FC 002D655C 4E 80 00 20 */ blr +/* 802D95FC 002D655C 4E 80 00 20 */ blr .global sub_802d9600 sub_802d9600: @@ -1157,7 +1157,7 @@ lbl_802D9694: /* 802D96A0 002D6600 83 C1 00 08 */ lwz r30, 8(r1) /* 802D96A4 002D6604 7C 08 03 A6 */ mtlr r0 /* 802D96A8 002D6608 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D96AC 002D660C 4E 80 00 20 */ blr +/* 802D96AC 002D660C 4E 80 00 20 */ blr .global sub_802d96b0 sub_802d96b0: @@ -1231,7 +1231,7 @@ lbl_802D9794: /* 802D97B0 002D6710 83 81 00 10 */ lwz r28, 0x10(r1) /* 802D97B4 002D6714 7C 08 03 A6 */ mtlr r0 /* 802D97B8 002D6718 38 21 00 20 */ addi r1, r1, 0x20 -/* 802D97BC 002D671C 4E 80 00 20 */ blr +/* 802D97BC 002D671C 4E 80 00 20 */ blr .global "__ct__Q24rstl50vector<13CInt32POINode,Q24rstl17rmemory_allocator>FRCQ24rstl50vector<13CInt32POINode,Q24rstl17rmemory_allocator>" "__ct__Q24rstl50vector<13CInt32POINode,Q24rstl17rmemory_allocator>FRCQ24rstl50vector<13CInt32POINode,Q24rstl17rmemory_allocator>": @@ -1323,7 +1323,7 @@ lbl_802D98F0: /* 802D98F8 002D6858 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D98FC 002D685C 7C 08 03 A6 */ mtlr r0 /* 802D9900 002D6860 38 21 00 20 */ addi r1, r1, 0x20 -/* 802D9904 002D6864 4E 80 00 20 */ blr +/* 802D9904 002D6864 4E 80 00 20 */ blr .global "__ct__Q24rstl49vector<12CBoolPOINode,Q24rstl17rmemory_allocator>FRCQ24rstl49vector<12CBoolPOINode,Q24rstl17rmemory_allocator>" "__ct__Q24rstl49vector<12CBoolPOINode,Q24rstl17rmemory_allocator>FRCQ24rstl49vector<12CBoolPOINode,Q24rstl17rmemory_allocator>": @@ -1412,7 +1412,7 @@ lbl_802D9A2C: /* 802D9A34 002D6994 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D9A38 002D6998 7C 08 03 A6 */ mtlr r0 /* 802D9A3C 002D699C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802D9A40 002D69A0 4E 80 00 20 */ blr +/* 802D9A40 002D69A0 4E 80 00 20 */ blr .global __dt__20CAnimTreeSingleChildFv __dt__20CAnimTreeSingleChildFv: @@ -1462,7 +1462,7 @@ lbl_802D9AD4: /* 802D9AE0 002D6A40 83 C1 00 08 */ lwz r30, 8(r1) /* 802D9AE4 002D6A44 7C 08 03 A6 */ mtlr r0 /* 802D9AE8 002D6A48 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D9AEC 002D6A4C 4E 80 00 20 */ blr +/* 802D9AEC 002D6A4C 4E 80 00 20 */ blr .global "__ct__15CAnimTreeLoopInFRCQ24rstl25ncrc_ptr<13CAnimTreeNode>RCQ24rstl25ncrc_ptr<13CAnimTreeNode>RCQ24rstl25ncrc_ptr<13CAnimTreeNode>RC15CAnimSysContextRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" "__ct__15CAnimTreeLoopInFRCQ24rstl25ncrc_ptr<13CAnimTreeNode>RCQ24rstl25ncrc_ptr<13CAnimTreeNode>RCQ24rstl25ncrc_ptr<13CAnimTreeNode>RC15CAnimSysContextRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>": @@ -1607,7 +1607,7 @@ lbl_802D9CE8: /* 802D9CF4 002D6C54 83 C1 00 18 */ lwz r30, 0x18(r1) /* 802D9CF8 002D6C58 7C 08 03 A6 */ mtlr r0 /* 802D9CFC 002D6C5C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802D9D00 002D6C60 4E 80 00 20 */ blr +/* 802D9D00 002D6C60 4E 80 00 20 */ blr .global sub_802d9d04 sub_802d9d04: @@ -1659,7 +1659,7 @@ lbl_802D9D90: /* 802D9DA4 002D6D04 83 81 00 20 */ lwz r28, 0x20(r1) /* 802D9DA8 002D6D08 7C 08 03 A6 */ mtlr r0 /* 802D9DAC 002D6D0C 38 21 00 30 */ addi r1, r1, 0x30 -/* 802D9DB0 002D6D10 4E 80 00 20 */ blr +/* 802D9DB0 002D6D10 4E 80 00 20 */ blr .global "_getPOIList<12CBoolPOINode>__FRC13CCharAnimTimeP12CBoolPOINodeUiUiiRCQ24rstl49vector<12CBoolPOINode,Q24rstl17rmemory_allocator>RC13CCharAnimTime" "_getPOIList<12CBoolPOINode>__FRC13CCharAnimTimeP12CBoolPOINodeUiUiiRCQ24rstl49vector<12CBoolPOINode,Q24rstl17rmemory_allocator>RC13CCharAnimTime": @@ -1845,7 +1845,7 @@ lbl_802DA060: /* 802DA068 002D6FC8 80 01 01 24 */ lwz r0, 0x124(r1) /* 802DA06C 002D6FCC 7C 08 03 A6 */ mtlr r0 /* 802DA070 002D6FD0 38 21 01 20 */ addi r1, r1, 0x120 -/* 802DA074 002D6FD4 4E 80 00 20 */ blr +/* 802DA074 002D6FD4 4E 80 00 20 */ blr .global "_getPOIList<13CInt32POINode>__FRC13CCharAnimTimeP13CInt32POINodeUiUiiRCQ24rstl50vector<13CInt32POINode,Q24rstl17rmemory_allocator>RC13CCharAnimTime" "_getPOIList<13CInt32POINode>__FRC13CCharAnimTimeP13CInt32POINodeUiUiiRCQ24rstl50vector<13CInt32POINode,Q24rstl17rmemory_allocator>RC13CCharAnimTime": @@ -2068,7 +2068,7 @@ lbl_802DA3A8: /* 802DA3B0 002D7310 80 01 01 54 */ lwz r0, 0x154(r1) /* 802DA3B4 002D7314 7C 08 03 A6 */ mtlr r0 /* 802DA3B8 002D7318 38 21 01 50 */ addi r1, r1, 0x150 -/* 802DA3BC 002D731C 4E 80 00 20 */ blr +/* 802DA3BC 002D731C 4E 80 00 20 */ blr .global "_getPOIList<16CParticlePOINode>__FRC13CCharAnimTimeP16CParticlePOINodeUiUiiRCQ24rstl53vector<16CParticlePOINode,Q24rstl17rmemory_allocator>RC13CCharAnimTime" "_getPOIList<16CParticlePOINode>__FRC13CCharAnimTimeP16CParticlePOINodeUiUiiRCQ24rstl53vector<16CParticlePOINode,Q24rstl17rmemory_allocator>RC13CCharAnimTime": @@ -2327,7 +2327,7 @@ lbl_802DA780: /* 802DA788 002D76E8 80 01 01 94 */ lwz r0, 0x194(r1) /* 802DA78C 002D76EC 7C 08 03 A6 */ mtlr r0 /* 802DA790 002D76F0 38 21 01 90 */ addi r1, r1, 0x190 -/* 802DA794 002D76F4 4E 80 00 20 */ blr +/* 802DA794 002D76F4 4E 80 00 20 */ blr .global "_getPOIList<13CSoundPOINode>__FRC13CCharAnimTimeP13CSoundPOINodeUiUiiRCQ24rstl50vector<13CSoundPOINode,Q24rstl17rmemory_allocator>RC13CCharAnimTime" "_getPOIList<13CSoundPOINode>__FRC13CCharAnimTimeP13CSoundPOINodeUiUiiRCQ24rstl50vector<13CSoundPOINode,Q24rstl17rmemory_allocator>RC13CCharAnimTime": @@ -2525,7 +2525,7 @@ lbl_802DAA74: /* 802DAA7C 002D79DC 80 01 01 34 */ lwz r0, 0x134(r1) /* 802DAA80 002D79E0 7C 08 03 A6 */ mtlr r0 /* 802DAA84 002D79E4 38 21 01 30 */ addi r1, r1, 0x130 -/* 802DAA88 002D79E8 4E 80 00 20 */ blr +/* 802DAA88 002D79E8 4E 80 00 20 */ blr .global CopyNodeMinusStartTime__13CSoundPOINodeFRC13CSoundPOINodeRC13CCharAnimTime CopyNodeMinusStartTime__13CSoundPOINodeFRC13CSoundPOINodeRC13CCharAnimTime: diff --git a/asm/Kyoto/Animation/CAnimTreeNode.s b/asm/Kyoto/Animation/CAnimTreeNode.s index 87581bc3..16fbf2f6 100644 --- a/asm/Kyoto/Animation/CAnimTreeNode.s +++ b/asm/Kyoto/Animation/CAnimTreeNode.s @@ -39,7 +39,7 @@ lbl_803ED1D0: .global IsCAnimTreeNode__13CAnimTreeNodeCFv IsCAnimTreeNode__13CAnimTreeNodeCFv: /* 802F3BF0 002F0B50 38 60 00 01 */ li r3, 1 -/* 802F3BF4 002F0B54 4E 80 00 20 */ blr +/* 802F3BF4 002F0B54 4E 80 00 20 */ blr .global "Cast__FRCQ24rstl33ownership_transfer<11IAnimReader>" "Cast__FRCQ24rstl33ownership_transfer<11IAnimReader>": @@ -56,7 +56,7 @@ IsCAnimTreeNode__13CAnimTreeNodeCFv: /* 802F3C20 002F0B80 7F E3 FB 78 */ mr r3, r31 /* 802F3C24 002F0B84 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802F3C28 002F0B88 7D 89 03 A6 */ mtctr r12 -/* 802F3C2C 002F0B8C 4E 80 04 21 */ bctrl +/* 802F3C2C 002F0B8C 4E 80 04 21 */ bctrl /* 802F3C30 002F0B90 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802F3C34 002F0B94 41 82 00 34 */ beq lbl_802F3C68 /* 802F3C38 002F0B98 3C 80 80 3D */ lis r4, lbl_803D6E00@ha @@ -92,14 +92,14 @@ lbl_802F3C68: /* 802F3CA8 002F0C08 81 9F 00 00 */ lwz r12, 0(r31) /* 802F3CAC 002F0C0C 81 8C 00 08 */ lwz r12, 8(r12) /* 802F3CB0 002F0C10 7D 89 03 A6 */ mtctr r12 -/* 802F3CB4 002F0C14 4E 80 04 21 */ bctrl +/* 802F3CB4 002F0C14 4E 80 04 21 */ bctrl lbl_802F3CB8: /* 802F3CB8 002F0C18 80 01 00 24 */ lwz r0, 0x24(r1) /* 802F3CBC 002F0C1C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802F3CC0 002F0C20 83 C1 00 18 */ lwz r30, 0x18(r1) /* 802F3CC4 002F0C24 7C 08 03 A6 */ mtlr r0 /* 802F3CC8 002F0C28 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F3CCC 002F0C2C 4E 80 00 20 */ blr +/* 802F3CCC 002F0C2C 4E 80 00 20 */ blr .global "__ct__13CAnimTreeNodeFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" "__ct__13CAnimTreeNodeFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>": diff --git a/asm/Kyoto/Animation/CAnimTreeSequence.s b/asm/Kyoto/Animation/CAnimTreeSequence.s index 22442a46..0f7dc93e 100644 --- a/asm/Kyoto/Animation/CAnimTreeSequence.s +++ b/asm/Kyoto/Animation/CAnimTreeSequence.s @@ -150,7 +150,7 @@ lbl_802DAC74: /* 802DAC88 002D7BE8 83 81 00 20 */ lwz r28, 0x20(r1) /* 802DAC8C 002D7BEC 7C 08 03 A6 */ mtlr r0 /* 802DAC90 002D7BF0 38 21 00 30 */ addi r1, r1, 0x30 -/* 802DAC94 002D7BF4 4E 80 00 20 */ blr +/* 802DAC94 002D7BF4 4E 80 00 20 */ blr .global sub_802dac98 sub_802dac98: @@ -166,7 +166,7 @@ sub_802dac98: /* 802DACBC 002D7C1C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802DACC0 002D7C20 7C 08 03 A6 */ mtlr r0 /* 802DACC4 002D7C24 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DACC8 002D7C28 4E 80 00 20 */ blr +/* 802DACC8 002D7C28 4E 80 00 20 */ blr .global VGetContributionOfHighestInfluence__17CAnimTreeSequenceCFv VGetContributionOfHighestInfluence__17CAnimTreeSequenceCFv: @@ -182,12 +182,12 @@ VGetContributionOfHighestInfluence__17CAnimTreeSequenceCFv: /* 802DACF0 002D7C50 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802DACF4 002D7C54 7C 08 03 A6 */ mtlr r0 /* 802DACF8 002D7C58 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DACFC 002D7C5C 4E 80 00 20 */ blr +/* 802DACFC 002D7C5C 4E 80 00 20 */ blr .global VSupportsReverseView__17CAnimTreeSequenceCFv VSupportsReverseView__17CAnimTreeSequenceCFv: /* 802DAD00 002D7C60 38 60 00 00 */ li r3, 0 -/* 802DAD04 002D7C64 4E 80 00 20 */ blr +/* 802DAD04 002D7C64 4E 80 00 20 */ blr .global VGetBestUnblendedChild__17CAnimTreeSequenceCFv VGetBestUnblendedChild__17CAnimTreeSequenceCFv: @@ -272,7 +272,7 @@ lbl_802DAE10: /* 802DAE34 002D7D94 38 80 00 01 */ li r4, 1 /* 802DAE38 002D7D98 81 8C 00 08 */ lwz r12, 8(r12) /* 802DAE3C 002D7D9C 7D 89 03 A6 */ mtctr r12 -/* 802DAE40 002D7DA0 4E 80 04 21 */ bctrl +/* 802DAE40 002D7DA0 4E 80 04 21 */ bctrl lbl_802DAE44: /* 802DAE44 002D7DA4 38 61 00 10 */ addi r3, r1, 0x10 /* 802DAE48 002D7DA8 4B D5 61 59 */ bl sub_80030fa0 @@ -290,7 +290,7 @@ lbl_802DAE6C: /* 802DAE70 002D7DD0 80 01 00 44 */ lwz r0, 0x44(r1) /* 802DAE74 002D7DD4 7C 08 03 A6 */ mtlr r0 /* 802DAE78 002D7DD8 38 21 00 40 */ addi r1, r1, 0x40 -/* 802DAE7C 002D7DDC 4E 80 00 20 */ blr +/* 802DAE7C 002D7DDC 4E 80 00 20 */ blr .global VClone__17CAnimTreeSequenceCFv VClone__17CAnimTreeSequenceCFv: @@ -352,13 +352,13 @@ lbl_802DAF30: /* 802DAF54 002D7EB4 38 80 00 01 */ li r4, 1 /* 802DAF58 002D7EB8 81 8C 00 08 */ lwz r12, 8(r12) /* 802DAF5C 002D7EBC 7D 89 03 A6 */ mtctr r12 -/* 802DAF60 002D7EC0 4E 80 04 21 */ bctrl +/* 802DAF60 002D7EC0 4E 80 04 21 */ bctrl lbl_802DAF64: /* 802DAF64 002D7EC4 BB 61 00 1C */ lmw r27, 0x1c(r1) /* 802DAF68 002D7EC8 80 01 00 34 */ lwz r0, 0x34(r1) /* 802DAF6C 002D7ECC 7C 08 03 A6 */ mtlr r0 /* 802DAF70 002D7ED0 38 21 00 30 */ addi r1, r1, 0x30 -/* 802DAF74 002D7ED4 4E 80 00 20 */ blr +/* 802DAF74 002D7ED4 4E 80 00 20 */ blr .global VGetSoundPOIList__17CAnimTreeSequenceCFRC13CCharAnimTimeP13CSoundPOINodeUiUii VGetSoundPOIList__17CAnimTreeSequenceCFRC13CCharAnimTimeP13CSoundPOINodeUiUii: @@ -399,7 +399,7 @@ lbl_802DAFF4: /* 802DAFFC 002D7F5C 81 9D 00 00 */ lwz r12, 0(r29) /* 802DB000 002D7F60 81 8C 00 08 */ lwz r12, 8(r12) /* 802DB004 002D7F64 7D 89 03 A6 */ mtctr r12 -/* 802DB008 002D7F68 4E 80 04 21 */ bctrl +/* 802DB008 002D7F68 4E 80 04 21 */ bctrl /* 802DB00C 002D7F6C 3B BD 00 44 */ addi r29, r29, 0x44 lbl_802DB010: /* 802DB010 002D7F70 7C 1D F8 40 */ cmplw r29, r31 @@ -414,7 +414,7 @@ lbl_802DB028: /* 802DB030 002D7F90 80 01 00 44 */ lwz r0, 0x44(r1) /* 802DB034 002D7F94 7C 08 03 A6 */ mtlr r0 /* 802DB038 002D7F98 38 21 00 40 */ addi r1, r1, 0x40 -/* 802DB03C 002D7F9C 4E 80 00 20 */ blr +/* 802DB03C 002D7F9C 4E 80 00 20 */ blr .global VGetParticlePOIList__17CAnimTreeSequenceCFRC13CCharAnimTimeP16CParticlePOINodeUiUii VGetParticlePOIList__17CAnimTreeSequenceCFRC13CCharAnimTimeP16CParticlePOINodeUiUii: @@ -455,7 +455,7 @@ lbl_802DB0BC: /* 802DB0C4 002D8024 81 9D 00 00 */ lwz r12, 0(r29) /* 802DB0C8 002D8028 81 8C 00 08 */ lwz r12, 8(r12) /* 802DB0CC 002D802C 7D 89 03 A6 */ mtctr r12 -/* 802DB0D0 002D8030 4E 80 04 21 */ bctrl +/* 802DB0D0 002D8030 4E 80 04 21 */ bctrl /* 802DB0D4 002D8034 3B BD 00 5C */ addi r29, r29, 0x5c lbl_802DB0D8: /* 802DB0D8 002D8038 7C 1D F8 40 */ cmplw r29, r31 @@ -470,7 +470,7 @@ lbl_802DB0F0: /* 802DB0F8 002D8058 80 01 00 44 */ lwz r0, 0x44(r1) /* 802DB0FC 002D805C 7C 08 03 A6 */ mtlr r0 /* 802DB100 002D8060 38 21 00 40 */ addi r1, r1, 0x40 -/* 802DB104 002D8064 4E 80 00 20 */ blr +/* 802DB104 002D8064 4E 80 00 20 */ blr .global VGetInt32POIList__17CAnimTreeSequenceCFRC13CCharAnimTimeP13CInt32POINodeUiUii VGetInt32POIList__17CAnimTreeSequenceCFRC13CCharAnimTimeP13CInt32POINodeUiUii: @@ -511,7 +511,7 @@ lbl_802DB184: /* 802DB18C 002D80EC 81 9D 00 00 */ lwz r12, 0(r29) /* 802DB190 002D80F0 81 8C 00 08 */ lwz r12, 8(r12) /* 802DB194 002D80F4 7D 89 03 A6 */ mtctr r12 -/* 802DB198 002D80F8 4E 80 04 21 */ bctrl +/* 802DB198 002D80F8 4E 80 04 21 */ bctrl /* 802DB19C 002D80FC 3B BD 00 4C */ addi r29, r29, 0x4c lbl_802DB1A0: /* 802DB1A0 002D8100 7C 1D F8 40 */ cmplw r29, r31 @@ -526,7 +526,7 @@ lbl_802DB1B8: /* 802DB1C0 002D8120 80 01 00 44 */ lwz r0, 0x44(r1) /* 802DB1C4 002D8124 7C 08 03 A6 */ mtlr r0 /* 802DB1C8 002D8128 38 21 00 40 */ addi r1, r1, 0x40 -/* 802DB1CC 002D812C 4E 80 00 20 */ blr +/* 802DB1CC 002D812C 4E 80 00 20 */ blr .global VGetBoolPOIList__17CAnimTreeSequenceCFRC13CCharAnimTimeP12CBoolPOINodeUiUii VGetBoolPOIList__17CAnimTreeSequenceCFRC13CCharAnimTimeP12CBoolPOINodeUiUii: @@ -567,7 +567,7 @@ lbl_802DB24C: /* 802DB254 002D81B4 81 9D 00 00 */ lwz r12, 0(r29) /* 802DB258 002D81B8 81 8C 00 08 */ lwz r12, 8(r12) /* 802DB25C 002D81BC 7D 89 03 A6 */ mtctr r12 -/* 802DB260 002D81C0 4E 80 04 21 */ bctrl +/* 802DB260 002D81C0 4E 80 04 21 */ bctrl /* 802DB264 002D81C4 3B BD 00 3C */ addi r29, r29, 0x3c lbl_802DB268: /* 802DB268 002D81C8 7C 1D F8 40 */ cmplw r29, r31 @@ -582,7 +582,7 @@ lbl_802DB280: /* 802DB288 002D81E8 80 01 00 44 */ lwz r0, 0x44(r1) /* 802DB28C 002D81EC 7C 08 03 A6 */ mtlr r0 /* 802DB290 002D81F0 38 21 00 40 */ addi r1, r1, 0x40 -/* 802DB294 002D81F4 4E 80 00 20 */ blr +/* 802DB294 002D81F4 4E 80 00 20 */ blr .global VGetSteadyStateAnimInfo__17CAnimTreeSequenceCFv VGetSteadyStateAnimInfo__17CAnimTreeSequenceCFv: @@ -598,7 +598,7 @@ VGetSteadyStateAnimInfo__17CAnimTreeSequenceCFv: /* 802DB2BC 002D821C D0 03 00 10 */ stfs f0, 0x10(r3) /* 802DB2C0 002D8220 88 04 00 50 */ lbz r0, 0x50(r4) /* 802DB2C4 002D8224 98 03 00 14 */ stb r0, 0x14(r3) -/* 802DB2C8 002D8228 4E 80 00 20 */ blr +/* 802DB2C8 002D8228 4E 80 00 20 */ blr .global VGetTimeRemaining__17CAnimTreeSequenceCFv VGetTimeRemaining__17CAnimTreeSequenceCFv: @@ -618,7 +618,7 @@ VGetTimeRemaining__17CAnimTreeSequenceCFv: /* 802DB300 002D8260 81 84 00 00 */ lwz r12, 0(r4) /* 802DB304 002D8264 81 8C 00 14 */ lwz r12, 0x14(r12) /* 802DB308 002D8268 7D 89 03 A6 */ mtctr r12 -/* 802DB30C 002D826C 4E 80 04 21 */ bctrl +/* 802DB30C 002D826C 4E 80 04 21 */ bctrl /* 802DB310 002D8270 48 00 00 24 */ b lbl_802DB334 lbl_802DB314: /* 802DB314 002D8274 80 06 00 40 */ lwz r0, 0x40(r6) @@ -634,7 +634,7 @@ lbl_802DB334: /* 802DB338 002D8298 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802DB33C 002D829C 7C 08 03 A6 */ mtlr r0 /* 802DB340 002D82A0 38 21 00 20 */ addi r1, r1, 0x20 -/* 802DB344 002D82A4 4E 80 00 20 */ blr +/* 802DB344 002D82A4 4E 80 00 20 */ blr .global VAdvanceView__17CAnimTreeSequenceFRC13CCharAnimTime VAdvanceView__17CAnimTreeSequenceFRC13CCharAnimTime: @@ -689,7 +689,7 @@ VAdvanceView__17CAnimTreeSequenceFRC13CCharAnimTime: /* 802DB408 002D8368 81 84 00 00 */ lwz r12, 0(r4) /* 802DB40C 002D836C 81 8C 00 14 */ lwz r12, 0x14(r12) /* 802DB410 002D8370 7D 89 03 A6 */ mtctr r12 -/* 802DB414 002D8374 4E 80 04 21 */ bctrl +/* 802DB414 002D8374 4E 80 04 21 */ bctrl /* 802DB418 002D8378 38 61 00 48 */ addi r3, r1, 0x48 /* 802DB41C 002D837C 48 06 CF 95 */ bl EqualsZero__13CCharAnimTimeCFv /* 802DB420 002D8380 54 60 06 3F */ clrlwi. r0, r3, 0x18 @@ -730,7 +730,7 @@ VAdvanceView__17CAnimTreeSequenceFRC13CCharAnimTime: /* 802DB4AC 002D840C 81 84 00 00 */ lwz r12, 0(r4) /* 802DB4B0 002D8410 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802DB4B4 002D8414 7D 89 03 A6 */ mtctr r12 -/* 802DB4B8 002D8418 4E 80 04 21 */ bctrl +/* 802DB4B8 002D8418 4E 80 04 21 */ bctrl /* 802DB4BC 002D841C 38 61 00 14 */ addi r3, r1, 0x14 /* 802DB4C0 002D8420 38 81 00 24 */ addi r4, r1, 0x24 /* 802DB4C4 002D8424 38 A1 00 18 */ addi r5, r1, 0x18 @@ -789,7 +789,7 @@ lbl_802DB57C: /* 802DB588 002D84E8 81 84 00 00 */ lwz r12, 0(r4) /* 802DB58C 002D84EC 81 8C 00 14 */ lwz r12, 0x14(r12) /* 802DB590 002D84F0 7D 89 03 A6 */ mtctr r12 -/* 802DB594 002D84F4 4E 80 04 21 */ bctrl +/* 802DB594 002D84F4 4E 80 04 21 */ bctrl /* 802DB598 002D84F8 C0 01 00 38 */ lfs f0, 0x38(r1) /* 802DB59C 002D84FC 38 61 00 58 */ addi r3, r1, 0x58 /* 802DB5A0 002D8500 80 01 00 3C */ lwz r0, 0x3c(r1) @@ -817,7 +817,7 @@ lbl_802DB57C: /* 802DB5F8 002D8558 81 84 00 00 */ lwz r12, 0(r4) /* 802DB5FC 002D855C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802DB600 002D8560 7D 89 03 A6 */ mtctr r12 -/* 802DB604 002D8564 4E 80 04 21 */ bctrl +/* 802DB604 002D8564 4E 80 04 21 */ bctrl /* 802DB608 002D8568 38 61 00 0C */ addi r3, r1, 0xc /* 802DB60C 002D856C 38 81 00 24 */ addi r4, r1, 0x24 /* 802DB610 002D8570 38 A1 00 10 */ addi r5, r1, 0x10 @@ -877,7 +877,7 @@ lbl_802DB6BC: /* 802DB6D8 002D8638 81 84 00 00 */ lwz r12, 0(r4) /* 802DB6DC 002D863C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802DB6E0 002D8640 7D 89 03 A6 */ mtctr r12 -/* 802DB6E4 002D8644 4E 80 04 21 */ bctrl +/* 802DB6E4 002D8644 4E 80 04 21 */ bctrl /* 802DB6E8 002D8648 C0 E1 00 A8 */ lfs f7, 0xa8(r1) /* 802DB6EC 002D864C 38 61 00 80 */ addi r3, r1, 0x80 /* 802DB6F0 002D8650 80 01 00 AC */ lwz r0, 0xac(r1) @@ -928,7 +928,7 @@ lbl_802DB770: /* 802DB7A0 002D8700 38 80 00 01 */ li r4, 1 /* 802DB7A4 002D8704 81 8C 00 08 */ lwz r12, 8(r12) /* 802DB7A8 002D8708 7D 89 03 A6 */ mtctr r12 -/* 802DB7AC 002D870C 4E 80 04 21 */ bctrl +/* 802DB7AC 002D870C 4E 80 04 21 */ bctrl lbl_802DB7B0: /* 802DB7B0 002D8710 88 01 00 94 */ lbz r0, 0x94(r1) /* 802DB7B4 002D8714 38 60 00 00 */ li r3, 0 @@ -1025,7 +1025,7 @@ lbl_802DB860: /* 802DB914 002D8874 38 80 00 01 */ li r4, 1 /* 802DB918 002D8878 81 8C 00 08 */ lwz r12, 8(r12) /* 802DB91C 002D887C 7D 89 03 A6 */ mtctr r12 -/* 802DB920 002D8880 4E 80 04 21 */ bctrl +/* 802DB920 002D8880 4E 80 04 21 */ bctrl lbl_802DB924: /* 802DB924 002D8884 38 00 00 00 */ li r0, 0 /* 802DB928 002D8888 98 01 00 94 */ stb r0, 0x94(r1) @@ -1080,7 +1080,7 @@ lbl_802DB948: /* 802DB9E4 002D8944 80 01 03 14 */ lwz r0, 0x314(r1) /* 802DB9E8 002D8948 7C 08 03 A6 */ mtlr r0 /* 802DB9EC 002D894C 38 21 03 10 */ addi r1, r1, 0x310 -/* 802DB9F0 002D8950 4E 80 00 20 */ blr +/* 802DB9F0 002D8950 4E 80 00 20 */ blr .global sub_802db9f4 sub_802db9f4: @@ -1121,7 +1121,7 @@ sub_802db9f4: /* 802DBA7C 002D89DC 83 C1 00 08 */ lwz r30, 8(r1) /* 802DBA80 002D89E0 7C 08 03 A6 */ mtlr r0 /* 802DBA84 002D89E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DBA88 002D89E8 4E 80 00 20 */ blr +/* 802DBA88 002D89E8 4E 80 00 20 */ blr .global sub_802dba8c sub_802dba8c: @@ -1150,7 +1150,7 @@ lbl_802DBAD4: /* 802DBADC 002D8A3C 81 9B 00 00 */ lwz r12, 0(r27) /* 802DBAE0 002D8A40 81 8C 00 08 */ lwz r12, 8(r12) /* 802DBAE4 002D8A44 7D 89 03 A6 */ mtctr r12 -/* 802DBAE8 002D8A48 4E 80 04 21 */ bctrl +/* 802DBAE8 002D8A48 4E 80 04 21 */ bctrl /* 802DBAEC 002D8A4C 3B 7B 00 44 */ addi r27, r27, 0x44 lbl_802DBAF0: /* 802DBAF0 002D8A50 7C 1B F8 40 */ cmplw r27, r31 @@ -1230,7 +1230,7 @@ lbl_802DBBF8: /* 802DBBFC 002D8B5C 80 01 00 34 */ lwz r0, 0x34(r1) /* 802DBC00 002D8B60 7C 08 03 A6 */ mtlr r0 /* 802DBC04 002D8B64 38 21 00 30 */ addi r1, r1, 0x30 -/* 802DBC08 002D8B68 4E 80 00 20 */ blr +/* 802DBC08 002D8B68 4E 80 00 20 */ blr .global sub_802dbc0c sub_802dbc0c: @@ -1262,7 +1262,7 @@ lbl_802DBC60: /* 802DBC68 002D8BC8 81 9E 00 00 */ lwz r12, 0(r30) /* 802DBC6C 002D8BCC 81 8C 00 08 */ lwz r12, 8(r12) /* 802DBC70 002D8BD0 7D 89 03 A6 */ mtctr r12 -/* 802DBC74 002D8BD4 4E 80 04 21 */ bctrl +/* 802DBC74 002D8BD4 4E 80 04 21 */ bctrl /* 802DBC78 002D8BD8 3B DE 00 5C */ addi r30, r30, 0x5c lbl_802DBC7C: /* 802DBC7C 002D8BDC 7C 1E F8 40 */ cmplw r30, r31 @@ -1303,7 +1303,7 @@ lbl_802DBCE8: /* 802DBCF8 002D8C58 83 81 00 20 */ lwz r28, 0x20(r1) /* 802DBCFC 002D8C5C 7C 08 03 A6 */ mtlr r0 /* 802DBD00 002D8C60 38 21 00 30 */ addi r1, r1, 0x30 -/* 802DBD04 002D8C64 4E 80 00 20 */ blr +/* 802DBD04 002D8C64 4E 80 00 20 */ blr .global sub_802dbd08 sub_802dbd08: @@ -1373,7 +1373,7 @@ lbl_802DBDE0: /* 802DBDF8 002D8D58 83 A1 00 14 */ lwz r29, 0x14(r1) /* 802DBDFC 002D8D5C 7C 08 03 A6 */ mtlr r0 /* 802DBE00 002D8D60 38 21 00 20 */ addi r1, r1, 0x20 -/* 802DBE04 002D8D64 4E 80 00 20 */ blr +/* 802DBE04 002D8D64 4E 80 00 20 */ blr .global sub_802dbe08 sub_802dbe08: @@ -1402,7 +1402,7 @@ lbl_802DBE50: /* 802DBE58 002D8DB8 81 9B 00 00 */ lwz r12, 0(r27) /* 802DBE5C 002D8DBC 81 8C 00 08 */ lwz r12, 8(r12) /* 802DBE60 002D8DC0 7D 89 03 A6 */ mtctr r12 -/* 802DBE64 002D8DC4 4E 80 04 21 */ bctrl +/* 802DBE64 002D8DC4 4E 80 04 21 */ bctrl /* 802DBE68 002D8DC8 3B 7B 00 4C */ addi r27, r27, 0x4c lbl_802DBE6C: /* 802DBE6C 002D8DCC 7C 1B F8 40 */ cmplw r27, r31 @@ -1481,7 +1481,7 @@ lbl_802DBF70: /* 802DBF74 002D8ED4 80 01 00 34 */ lwz r0, 0x34(r1) /* 802DBF78 002D8ED8 7C 08 03 A6 */ mtlr r0 /* 802DBF7C 002D8EDC 38 21 00 30 */ addi r1, r1, 0x30 -/* 802DBF80 002D8EE0 4E 80 00 20 */ blr +/* 802DBF80 002D8EE0 4E 80 00 20 */ blr .global sub_802dbf84 sub_802dbf84: @@ -1510,7 +1510,7 @@ lbl_802DBFCC: /* 802DBFD4 002D8F34 81 9B 00 00 */ lwz r12, 0(r27) /* 802DBFD8 002D8F38 81 8C 00 08 */ lwz r12, 8(r12) /* 802DBFDC 002D8F3C 7D 89 03 A6 */ mtctr r12 -/* 802DBFE0 002D8F40 4E 80 04 21 */ bctrl +/* 802DBFE0 002D8F40 4E 80 04 21 */ bctrl /* 802DBFE4 002D8F44 3B 7B 00 3C */ addi r27, r27, 0x3c lbl_802DBFE8: /* 802DBFE8 002D8F48 7C 1B F8 40 */ cmplw r27, r31 @@ -1586,7 +1586,7 @@ lbl_802DC0E0: /* 802DC0E4 002D9044 80 01 00 34 */ lwz r0, 0x34(r1) /* 802DC0E8 002D9048 7C 08 03 A6 */ mtlr r0 /* 802DC0EC 002D904C 38 21 00 30 */ addi r1, r1, 0x30 -/* 802DC0F0 002D9050 4E 80 00 20 */ blr +/* 802DC0F0 002D9050 4E 80 00 20 */ blr .global "__ct__17CAnimTreeSequenceFRCQ24rstl25ncrc_ptr<13CAnimTreeNode>RCQ24rstl62vector,Q24rstl17rmemory_allocator>RC15CAnimSysContextiRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC21CSequenceFundamentalsRC13CCharAnimTime" "__ct__17CAnimTreeSequenceFRCQ24rstl25ncrc_ptr<13CAnimTreeNode>RCQ24rstl62vector,Q24rstl17rmemory_allocator>RC15CAnimSysContextiRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC21CSequenceFundamentalsRC13CCharAnimTime": @@ -1691,13 +1691,13 @@ lbl_802DC238: /* 802DC264 002D91C4 81 84 00 00 */ lwz r12, 0(r4) /* 802DC268 002D91C8 81 8C 00 14 */ lwz r12, 0x14(r12) /* 802DC26C 002D91CC 7D 89 03 A6 */ mtctr r12 -/* 802DC270 002D91D0 4E 80 04 21 */ bctrl +/* 802DC270 002D91D0 4E 80 04 21 */ bctrl /* 802DC274 002D91D4 7F 43 D3 78 */ mr r3, r26 /* 802DC278 002D91D8 BA E1 00 1C */ lmw r23, 0x1c(r1) /* 802DC27C 002D91DC 80 01 00 44 */ lwz r0, 0x44(r1) /* 802DC280 002D91E0 7C 08 03 A6 */ mtlr r0 /* 802DC284 002D91E4 38 21 00 40 */ addi r1, r1, 0x40 -/* 802DC288 002D91E8 4E 80 00 20 */ blr +/* 802DC288 002D91E8 4E 80 00 20 */ blr .global "__ct__17CAnimTreeSequenceFRCQ24rstl62vector,Q24rstl17rmemory_allocator>RC15CAnimSysContextRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" "__ct__17CAnimTreeSequenceFRCQ24rstl62vector,Q24rstl17rmemory_allocator>RC15CAnimSysContextRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>": @@ -1723,7 +1723,7 @@ lbl_802DC238: /* 802DC2D8 002D9238 81 84 00 00 */ lwz r12, 0(r4) /* 802DC2DC 002D923C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802DC2E0 002D9240 7D 89 03 A6 */ mtctr r12 -/* 802DC2E4 002D9244 4E 80 04 21 */ bctrl +/* 802DC2E4 002D9244 4E 80 04 21 */ bctrl /* 802DC2E8 002D9248 7F A3 EB 78 */ mr r3, r29 /* 802DC2EC 002D924C 7F 84 E3 78 */ mr r4, r28 /* 802DC2F0 002D9250 48 01 79 E1 */ bl "__ct__13CAnimTreeNodeFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" @@ -1833,7 +1833,7 @@ lbl_802DC410: /* 802DC478 002D93D8 83 81 01 20 */ lwz r28, 0x120(r1) /* 802DC47C 002D93DC 7C 08 03 A6 */ mtlr r0 /* 802DC480 002D93E0 38 21 01 30 */ addi r1, r1, 0x130 -/* 802DC484 002D93E4 4E 80 00 20 */ blr +/* 802DC484 002D93E4 4E 80 00 20 */ blr .global sub_802dc488 sub_802dc488: @@ -2020,7 +2020,7 @@ lbl_802DC734: /* 802DC73C 002D969C 80 01 01 24 */ lwz r0, 0x124(r1) /* 802DC740 002D96A0 7C 08 03 A6 */ mtlr r0 /* 802DC744 002D96A4 38 21 01 20 */ addi r1, r1, 0x120 -/* 802DC748 002D96A8 4E 80 00 20 */ blr +/* 802DC748 002D96A8 4E 80 00 20 */ blr .global sub_802dc74c sub_802dc74c: @@ -2242,7 +2242,7 @@ lbl_802DCA74: /* 802DCA7C 002D99DC 80 01 01 54 */ lwz r0, 0x154(r1) /* 802DCA80 002D99E0 7C 08 03 A6 */ mtlr r0 /* 802DCA84 002D99E4 38 21 01 50 */ addi r1, r1, 0x150 -/* 802DCA88 002D99E8 4E 80 00 20 */ blr +/* 802DCA88 002D99E8 4E 80 00 20 */ blr .global sub_802dca8c sub_802dca8c: @@ -2501,7 +2501,7 @@ lbl_802DCE48: /* 802DCE50 002D9DB0 80 01 01 84 */ lwz r0, 0x184(r1) /* 802DCE54 002D9DB4 7C 08 03 A6 */ mtlr r0 /* 802DCE58 002D9DB8 38 21 01 80 */ addi r1, r1, 0x180 -/* 802DCE5C 002D9DBC 4E 80 00 20 */ blr +/* 802DCE5C 002D9DBC 4E 80 00 20 */ blr .global "_getPOIList<13CSoundPOINode>__FRC13CCharAnimTimeP13CSoundPOINodeUiUiiQ24rstl50vector<13CSoundPOINode,Q24rstl17rmemory_allocator>RC13CCharAnimTime" "_getPOIList<13CSoundPOINode>__FRC13CCharAnimTimeP13CSoundPOINodeUiUiiQ24rstl50vector<13CSoundPOINode,Q24rstl17rmemory_allocator>RC13CCharAnimTime": @@ -2700,7 +2700,7 @@ lbl_802DD13C: /* 802DD144 002DA0A4 80 01 01 34 */ lwz r0, 0x134(r1) /* 802DD148 002DA0A8 7C 08 03 A6 */ mtlr r0 /* 802DD14C 002DA0AC 38 21 01 30 */ addi r1, r1, 0x130 -/* 802DD150 002DA0B0 4E 80 00 20 */ blr +/* 802DD150 002DA0B0 4E 80 00 20 */ blr .global sub_802dd154 sub_802dd154: @@ -2750,7 +2750,7 @@ lbl_802DD1EC: /* 802DD1F4 002DA154 81 9B 00 00 */ lwz r12, 0(r27) /* 802DD1F8 002DA158 81 8C 00 08 */ lwz r12, 8(r12) /* 802DD1FC 002DA15C 7D 89 03 A6 */ mtctr r12 -/* 802DD200 002DA160 4E 80 04 21 */ bctrl +/* 802DD200 002DA160 4E 80 04 21 */ bctrl /* 802DD204 002DA164 3B 7B 00 3C */ addi r27, r27, 0x3c lbl_802DD208: /* 802DD208 002DA168 7C 1B E0 40 */ cmplw r27, r28 @@ -2767,7 +2767,7 @@ lbl_802DD228: /* 802DD22C 002DA18C 80 01 00 34 */ lwz r0, 0x34(r1) /* 802DD230 002DA190 7C 08 03 A6 */ mtlr r0 /* 802DD234 002DA194 38 21 00 30 */ addi r1, r1, 0x30 -/* 802DD238 002DA198 4E 80 00 20 */ blr +/* 802DD238 002DA198 4E 80 00 20 */ blr .global sub_802dd23c sub_802dd23c: @@ -2827,7 +2827,7 @@ lbl_802DD2E8: /* 802DD304 002DA264 83 A1 00 14 */ lwz r29, 0x14(r1) /* 802DD308 002DA268 7C 08 03 A6 */ mtlr r0 /* 802DD30C 002DA26C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802DD310 002DA270 4E 80 00 20 */ blr +/* 802DD310 002DA270 4E 80 00 20 */ blr .global "reserve__Q24rstl50vector<13CInt32POINode,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl50vector<13CInt32POINode,Q24rstl17rmemory_allocator>Fi": @@ -2877,7 +2877,7 @@ lbl_802DD3AC: /* 802DD3B4 002DA314 81 9B 00 00 */ lwz r12, 0(r27) /* 802DD3B8 002DA318 81 8C 00 08 */ lwz r12, 8(r12) /* 802DD3BC 002DA31C 7D 89 03 A6 */ mtctr r12 -/* 802DD3C0 002DA320 4E 80 04 21 */ bctrl +/* 802DD3C0 002DA320 4E 80 04 21 */ bctrl /* 802DD3C4 002DA324 3B 7B 00 4C */ addi r27, r27, 0x4c lbl_802DD3C8: /* 802DD3C8 002DA328 7C 1B E0 40 */ cmplw r27, r28 @@ -2894,7 +2894,7 @@ lbl_802DD3E8: /* 802DD3EC 002DA34C 80 01 00 34 */ lwz r0, 0x34(r1) /* 802DD3F0 002DA350 7C 08 03 A6 */ mtlr r0 /* 802DD3F4 002DA354 38 21 00 30 */ addi r1, r1, 0x30 -/* 802DD3F8 002DA358 4E 80 00 20 */ blr +/* 802DD3F8 002DA358 4E 80 00 20 */ blr .global sub_802dd3fc sub_802dd3fc: @@ -2957,7 +2957,7 @@ lbl_802DD4B4: /* 802DD4D0 002DA430 83 A1 00 14 */ lwz r29, 0x14(r1) /* 802DD4D4 002DA434 7C 08 03 A6 */ mtlr r0 /* 802DD4D8 002DA438 38 21 00 20 */ addi r1, r1, 0x20 -/* 802DD4DC 002DA43C 4E 80 00 20 */ blr +/* 802DD4DC 002DA43C 4E 80 00 20 */ blr .global "reserve__Q24rstl53vector<16CParticlePOINode,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl53vector<16CParticlePOINode,Q24rstl17rmemory_allocator>Fi": @@ -3007,7 +3007,7 @@ lbl_802DD578: /* 802DD580 002DA4E0 81 9B 00 00 */ lwz r12, 0(r27) /* 802DD584 002DA4E4 81 8C 00 08 */ lwz r12, 8(r12) /* 802DD588 002DA4E8 7D 89 03 A6 */ mtctr r12 -/* 802DD58C 002DA4EC 4E 80 04 21 */ bctrl +/* 802DD58C 002DA4EC 4E 80 04 21 */ bctrl /* 802DD590 002DA4F0 3B 7B 00 5C */ addi r27, r27, 0x5c lbl_802DD594: /* 802DD594 002DA4F4 7C 1B E0 40 */ cmplw r27, r28 @@ -3024,7 +3024,7 @@ lbl_802DD5B4: /* 802DD5B8 002DA518 80 01 00 34 */ lwz r0, 0x34(r1) /* 802DD5BC 002DA51C 7C 08 03 A6 */ mtlr r0 /* 802DD5C0 002DA520 38 21 00 30 */ addi r1, r1, 0x30 -/* 802DD5C4 002DA524 4E 80 00 20 */ blr +/* 802DD5C4 002DA524 4E 80 00 20 */ blr .global sub_802dd5c8 sub_802dd5c8: @@ -3095,7 +3095,7 @@ lbl_802DD6A0: /* 802DD6BC 002DA61C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 802DD6C0 002DA620 7C 08 03 A6 */ mtlr r0 /* 802DD6C4 002DA624 38 21 00 20 */ addi r1, r1, 0x20 -/* 802DD6C8 002DA628 4E 80 00 20 */ blr +/* 802DD6C8 002DA628 4E 80 00 20 */ blr .global "reserve__Q24rstl50vector<13CSoundPOINode,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl50vector<13CSoundPOINode,Q24rstl17rmemory_allocator>Fi": @@ -3145,7 +3145,7 @@ lbl_802DD764: /* 802DD76C 002DA6CC 81 9B 00 00 */ lwz r12, 0(r27) /* 802DD770 002DA6D0 81 8C 00 08 */ lwz r12, 8(r12) /* 802DD774 002DA6D4 7D 89 03 A6 */ mtctr r12 -/* 802DD778 002DA6D8 4E 80 04 21 */ bctrl +/* 802DD778 002DA6D8 4E 80 04 21 */ bctrl /* 802DD77C 002DA6DC 3B 7B 00 44 */ addi r27, r27, 0x44 lbl_802DD780: /* 802DD780 002DA6E0 7C 1B E0 40 */ cmplw r27, r28 @@ -3162,7 +3162,7 @@ lbl_802DD7A0: /* 802DD7A4 002DA704 80 01 00 34 */ lwz r0, 0x34(r1) /* 802DD7A8 002DA708 7C 08 03 A6 */ mtlr r0 /* 802DD7AC 002DA70C 38 21 00 30 */ addi r1, r1, 0x30 -/* 802DD7B0 002DA710 4E 80 00 20 */ blr +/* 802DD7B0 002DA710 4E 80 00 20 */ blr .global sub_802dd7b4 sub_802dd7b4: diff --git a/asm/Kyoto/Animation/CAnimTreeSingleChild.s b/asm/Kyoto/Animation/CAnimTreeSingleChild.s index 7987a20a..3879053c 100644 --- a/asm/Kyoto/Animation/CAnimTreeSingleChild.s +++ b/asm/Kyoto/Animation/CAnimTreeSingleChild.s @@ -46,11 +46,11 @@ lbl_803ED240: /* 802F3D30 002F0C90 81 83 00 00 */ lwz r12, 0(r3) /* 802F3D34 002F0C94 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 802F3D38 002F0C98 7D 89 03 A6 */ mtctr r12 -/* 802F3D3C 002F0C9C 4E 80 04 21 */ bctrl +/* 802F3D3C 002F0C9C 4E 80 04 21 */ bctrl /* 802F3D40 002F0CA0 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F3D44 002F0CA4 7C 08 03 A6 */ mtlr r0 /* 802F3D48 002F0CA8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F3D4C 002F0CAC 4E 80 00 20 */ blr +/* 802F3D4C 002F0CAC 4E 80 00 20 */ blr .global VGetAdvancementResults__20CAnimTreeSingleChildCFRC13CCharAnimTimeRC13CCharAnimTime VGetAdvancementResults__20CAnimTreeSingleChildCFRC13CCharAnimTimeRC13CCharAnimTime: @@ -64,12 +64,12 @@ VGetAdvancementResults__20CAnimTreeSingleChildCFRC13CCharAnimTimeRC13CCharAnimTi /* 802F3D6C 002F0CCC 81 84 00 00 */ lwz r12, 0(r4) /* 802F3D70 002F0CD0 81 8C 00 58 */ lwz r12, 0x58(r12) /* 802F3D74 002F0CD4 7D 89 03 A6 */ mtctr r12 -/* 802F3D78 002F0CD8 4E 80 04 21 */ bctrl +/* 802F3D78 002F0CD8 4E 80 04 21 */ bctrl /* 802F3D7C 002F0CDC 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F3D80 002F0CE0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802F3D84 002F0CE4 7C 08 03 A6 */ mtlr r0 /* 802F3D88 002F0CE8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F3D8C 002F0CEC 4E 80 00 20 */ blr +/* 802F3D8C 002F0CEC 4E 80 00 20 */ blr .global VSetPhase__20CAnimTreeSingleChildFf VSetPhase__20CAnimTreeSingleChildFf: @@ -81,11 +81,11 @@ VSetPhase__20CAnimTreeSingleChildFf: /* 802F3DA4 002F0D04 81 83 00 00 */ lwz r12, 0(r3) /* 802F3DA8 002F0D08 81 8C 00 54 */ lwz r12, 0x54(r12) /* 802F3DAC 002F0D0C 7D 89 03 A6 */ mtctr r12 -/* 802F3DB0 002F0D10 4E 80 04 21 */ bctrl +/* 802F3DB0 002F0D10 4E 80 04 21 */ bctrl /* 802F3DB4 002F0D14 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F3DB8 002F0D18 7C 08 03 A6 */ mtlr r0 /* 802F3DBC 002F0D1C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F3DC0 002F0D20 4E 80 00 20 */ blr +/* 802F3DC0 002F0D20 4E 80 00 20 */ blr .global VGetNumChildren__20CAnimTreeSingleChildCFv VGetNumChildren__20CAnimTreeSingleChildCFv: @@ -97,12 +97,12 @@ VGetNumChildren__20CAnimTreeSingleChildCFv: /* 802F3DD8 002F0D38 81 83 00 00 */ lwz r12, 0(r3) /* 802F3DDC 002F0D3C 81 8C 00 64 */ lwz r12, 0x64(r12) /* 802F3DE0 002F0D40 7D 89 03 A6 */ mtctr r12 -/* 802F3DE4 002F0D44 4E 80 04 21 */ bctrl +/* 802F3DE4 002F0D44 4E 80 04 21 */ bctrl /* 802F3DE8 002F0D48 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F3DEC 002F0D4C 38 63 00 01 */ addi r3, r3, 1 /* 802F3DF0 002F0D50 7C 08 03 A6 */ mtlr r0 /* 802F3DF4 002F0D54 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F3DF8 002F0D58 4E 80 00 20 */ blr +/* 802F3DF8 002F0D58 4E 80 00 20 */ blr .global VGetParticlePOIState__20CAnimTreeSingleChildCFPCc VGetParticlePOIState__20CAnimTreeSingleChildCFPCc: @@ -114,11 +114,11 @@ VGetParticlePOIState__20CAnimTreeSingleChildCFPCc: /* 802F3E10 002F0D70 81 83 00 00 */ lwz r12, 0(r3) /* 802F3E14 002F0D74 81 8C 00 40 */ lwz r12, 0x40(r12) /* 802F3E18 002F0D78 7D 89 03 A6 */ mtctr r12 -/* 802F3E1C 002F0D7C 4E 80 04 21 */ bctrl +/* 802F3E1C 002F0D7C 4E 80 04 21 */ bctrl /* 802F3E20 002F0D80 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F3E24 002F0D84 7C 08 03 A6 */ mtlr r0 /* 802F3E28 002F0D88 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F3E2C 002F0D8C 4E 80 00 20 */ blr +/* 802F3E2C 002F0D8C 4E 80 00 20 */ blr .global VGetInt32POIState__20CAnimTreeSingleChildCFPCc VGetInt32POIState__20CAnimTreeSingleChildCFPCc: @@ -130,11 +130,11 @@ VGetInt32POIState__20CAnimTreeSingleChildCFPCc: /* 802F3E44 002F0DA4 81 83 00 00 */ lwz r12, 0(r3) /* 802F3E48 002F0DA8 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 802F3E4C 002F0DAC 7D 89 03 A6 */ mtctr r12 -/* 802F3E50 002F0DB0 4E 80 04 21 */ bctrl +/* 802F3E50 002F0DB0 4E 80 04 21 */ bctrl /* 802F3E54 002F0DB4 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F3E58 002F0DB8 7C 08 03 A6 */ mtlr r0 /* 802F3E5C 002F0DBC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F3E60 002F0DC0 4E 80 00 20 */ blr +/* 802F3E60 002F0DC0 4E 80 00 20 */ blr .global VGetBoolPOIState__20CAnimTreeSingleChildCFPCc VGetBoolPOIState__20CAnimTreeSingleChildCFPCc: @@ -146,11 +146,11 @@ VGetBoolPOIState__20CAnimTreeSingleChildCFPCc: /* 802F3E78 002F0DD8 81 83 00 00 */ lwz r12, 0(r3) /* 802F3E7C 002F0DDC 81 8C 00 38 */ lwz r12, 0x38(r12) /* 802F3E80 002F0DE0 7D 89 03 A6 */ mtctr r12 -/* 802F3E84 002F0DE4 4E 80 04 21 */ bctrl +/* 802F3E84 002F0DE4 4E 80 04 21 */ bctrl /* 802F3E88 002F0DE8 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F3E8C 002F0DEC 7C 08 03 A6 */ mtlr r0 /* 802F3E90 002F0DF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F3E94 002F0DF4 4E 80 00 20 */ blr +/* 802F3E94 002F0DF4 4E 80 00 20 */ blr .global VGetSoundPOIList__20CAnimTreeSingleChildCFRC13CCharAnimTimeP13CSoundPOINodeUiUii VGetSoundPOIList__20CAnimTreeSingleChildCFRC13CCharAnimTimeP13CSoundPOINodeUiUii: @@ -163,7 +163,7 @@ VGetSoundPOIList__20CAnimTreeSingleChildCFRC13CCharAnimTimeP13CSoundPOINodeUiUii /* 802F3EB0 002F0E10 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F3EB4 002F0E14 7C 08 03 A6 */ mtlr r0 /* 802F3EB8 002F0E18 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F3EBC 002F0E1C 4E 80 00 20 */ blr +/* 802F3EBC 002F0E1C 4E 80 00 20 */ blr .global VGetParticlePOIList__20CAnimTreeSingleChildCFRC13CCharAnimTimeP16CParticlePOINodeUiUii VGetParticlePOIList__20CAnimTreeSingleChildCFRC13CCharAnimTimeP16CParticlePOINodeUiUii: @@ -176,7 +176,7 @@ VGetParticlePOIList__20CAnimTreeSingleChildCFRC13CCharAnimTimeP16CParticlePOINod /* 802F3ED8 002F0E38 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F3EDC 002F0E3C 7C 08 03 A6 */ mtlr r0 /* 802F3EE0 002F0E40 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F3EE4 002F0E44 4E 80 00 20 */ blr +/* 802F3EE4 002F0E44 4E 80 00 20 */ blr .global VGetInt32POIList__20CAnimTreeSingleChildCFRC13CCharAnimTimeP13CInt32POINodeUiUii VGetInt32POIList__20CAnimTreeSingleChildCFRC13CCharAnimTimeP13CInt32POINodeUiUii: @@ -189,7 +189,7 @@ VGetInt32POIList__20CAnimTreeSingleChildCFRC13CCharAnimTimeP13CInt32POINodeUiUii /* 802F3F00 002F0E60 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F3F04 002F0E64 7C 08 03 A6 */ mtlr r0 /* 802F3F08 002F0E68 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F3F0C 002F0E6C 4E 80 00 20 */ blr +/* 802F3F0C 002F0E6C 4E 80 00 20 */ blr .global VGetBoolPOIList__20CAnimTreeSingleChildCFRC13CCharAnimTimeP12CBoolPOINodeUiUii VGetBoolPOIList__20CAnimTreeSingleChildCFRC13CCharAnimTimeP12CBoolPOINodeUiUii: @@ -202,7 +202,7 @@ VGetBoolPOIList__20CAnimTreeSingleChildCFRC13CCharAnimTimeP12CBoolPOINodeUiUii: /* 802F3F28 002F0E88 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F3F2C 002F0E8C 7C 08 03 A6 */ mtlr r0 /* 802F3F30 002F0E90 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F3F34 002F0E94 4E 80 00 20 */ blr +/* 802F3F34 002F0E94 4E 80 00 20 */ blr .global VGetSegStatementSet__20CAnimTreeSingleChildCFRC10CSegIdListR16CSegStatementSetRC13CCharAnimTime VGetSegStatementSet__20CAnimTreeSingleChildCFRC10CSegIdListR16CSegStatementSetRC13CCharAnimTime: @@ -214,11 +214,11 @@ VGetSegStatementSet__20CAnimTreeSingleChildCFRC10CSegIdListR16CSegStatementSetRC /* 802F3F4C 002F0EAC 81 83 00 00 */ lwz r12, 0(r3) /* 802F3F50 002F0EB0 81 8C 00 48 */ lwz r12, 0x48(r12) /* 802F3F54 002F0EB4 7D 89 03 A6 */ mtctr r12 -/* 802F3F58 002F0EB8 4E 80 04 21 */ bctrl +/* 802F3F58 002F0EB8 4E 80 04 21 */ bctrl /* 802F3F5C 002F0EBC 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F3F60 002F0EC0 7C 08 03 A6 */ mtlr r0 /* 802F3F64 002F0EC4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F3F68 002F0EC8 4E 80 00 20 */ blr +/* 802F3F68 002F0EC8 4E 80 00 20 */ blr .global VGetSegStatementSet__20CAnimTreeSingleChildCFRC10CSegIdListR16CSegStatementSet VGetSegStatementSet__20CAnimTreeSingleChildCFRC10CSegIdListR16CSegStatementSet: @@ -230,11 +230,11 @@ VGetSegStatementSet__20CAnimTreeSingleChildCFRC10CSegIdListR16CSegStatementSet: /* 802F3F80 002F0EE0 81 83 00 00 */ lwz r12, 0(r3) /* 802F3F84 002F0EE4 81 8C 00 44 */ lwz r12, 0x44(r12) /* 802F3F88 002F0EE8 7D 89 03 A6 */ mtctr r12 -/* 802F3F8C 002F0EEC 4E 80 04 21 */ bctrl +/* 802F3F8C 002F0EEC 4E 80 04 21 */ bctrl /* 802F3F90 002F0EF0 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F3F94 002F0EF4 7C 08 03 A6 */ mtlr r0 /* 802F3F98 002F0EF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F3F9C 002F0EFC 4E 80 00 20 */ blr +/* 802F3F9C 002F0EFC 4E 80 00 20 */ blr .global VGetRotation__20CAnimTreeSingleChildCFRC6CSegId VGetRotation__20CAnimTreeSingleChildCFRC6CSegId: @@ -248,12 +248,12 @@ VGetRotation__20CAnimTreeSingleChildCFRC6CSegId: /* 802F3FBC 002F0F1C 81 84 00 00 */ lwz r12, 0(r4) /* 802F3FC0 002F0F20 81 8C 00 24 */ lwz r12, 0x24(r12) /* 802F3FC4 002F0F24 7D 89 03 A6 */ mtctr r12 -/* 802F3FC8 002F0F28 4E 80 04 21 */ bctrl +/* 802F3FC8 002F0F28 4E 80 04 21 */ bctrl /* 802F3FCC 002F0F2C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F3FD0 002F0F30 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802F3FD4 002F0F34 7C 08 03 A6 */ mtlr r0 /* 802F3FD8 002F0F38 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F3FDC 002F0F3C 4E 80 00 20 */ blr +/* 802F3FDC 002F0F3C 4E 80 00 20 */ blr .global VGetOffset__20CAnimTreeSingleChildCFRC6CSegId VGetOffset__20CAnimTreeSingleChildCFRC6CSegId: @@ -267,12 +267,12 @@ VGetOffset__20CAnimTreeSingleChildCFRC6CSegId: /* 802F3FFC 002F0F5C 81 84 00 00 */ lwz r12, 0(r4) /* 802F4000 002F0F60 81 8C 00 20 */ lwz r12, 0x20(r12) /* 802F4004 002F0F64 7D 89 03 A6 */ mtctr r12 -/* 802F4008 002F0F68 4E 80 04 21 */ bctrl +/* 802F4008 002F0F68 4E 80 04 21 */ bctrl /* 802F400C 002F0F6C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F4010 002F0F70 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802F4014 002F0F74 7C 08 03 A6 */ mtlr r0 /* 802F4018 002F0F78 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F401C 002F0F7C 4E 80 00 20 */ blr +/* 802F401C 002F0F7C 4E 80 00 20 */ blr .global VHasOffset__20CAnimTreeSingleChildCFRC6CSegId VHasOffset__20CAnimTreeSingleChildCFRC6CSegId: @@ -284,11 +284,11 @@ VHasOffset__20CAnimTreeSingleChildCFRC6CSegId: /* 802F4034 002F0F94 81 83 00 00 */ lwz r12, 0(r3) /* 802F4038 002F0F98 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 802F403C 002F0F9C 7D 89 03 A6 */ mtctr r12 -/* 802F4040 002F0FA0 4E 80 04 21 */ bctrl +/* 802F4040 002F0FA0 4E 80 04 21 */ bctrl /* 802F4044 002F0FA4 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F4048 002F0FA8 7C 08 03 A6 */ mtlr r0 /* 802F404C 002F0FAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F4050 002F0FB0 4E 80 00 20 */ blr +/* 802F4050 002F0FB0 4E 80 00 20 */ blr .global VGetTimeRemaining__20CAnimTreeSingleChildCFv VGetTimeRemaining__20CAnimTreeSingleChildCFv: @@ -302,12 +302,12 @@ VGetTimeRemaining__20CAnimTreeSingleChildCFv: /* 802F4070 002F0FD0 81 84 00 00 */ lwz r12, 0(r4) /* 802F4074 002F0FD4 81 8C 00 14 */ lwz r12, 0x14(r12) /* 802F4078 002F0FD8 7D 89 03 A6 */ mtctr r12 -/* 802F407C 002F0FDC 4E 80 04 21 */ bctrl +/* 802F407C 002F0FDC 4E 80 04 21 */ bctrl /* 802F4080 002F0FE0 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F4084 002F0FE4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802F4088 002F0FE8 7C 08 03 A6 */ mtlr r0 /* 802F408C 002F0FEC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F4090 002F0FF0 4E 80 00 20 */ blr +/* 802F4090 002F0FF0 4E 80 00 20 */ blr .global VAdvanceView__20CAnimTreeSingleChildFRC13CCharAnimTime VAdvanceView__20CAnimTreeSingleChildFRC13CCharAnimTime: @@ -321,7 +321,7 @@ VAdvanceView__20CAnimTreeSingleChildFRC13CCharAnimTime: /* 802F40B0 002F1010 81 84 00 00 */ lwz r12, 0(r4) /* 802F40B4 002F1014 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802F40B8 002F1018 7D 89 03 A6 */ mtctr r12 -/* 802F40BC 002F101C 4E 80 04 21 */ bctrl +/* 802F40BC 002F101C 4E 80 04 21 */ bctrl /* 802F40C0 002F1020 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F40C4 002F1024 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802F40C8 002F1028 7C 08 03 A6 */ mtlr r0 diff --git a/asm/Kyoto/Animation/CAnimTreeTimeScale.s b/asm/Kyoto/Animation/CAnimTreeTimeScale.s index 19dca93a..37b7b550 100644 --- a/asm/Kyoto/Animation/CAnimTreeTimeScale.s +++ b/asm/Kyoto/Animation/CAnimTreeTimeScale.s @@ -71,7 +71,7 @@ lbl_805A87C4: /* 802F40F4 002F1054 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F40F8 002F1058 7C 08 03 A6 */ mtlr r0 /* 802F40FC 002F105C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F4100 002F1060 4E 80 00 20 */ blr +/* 802F4100 002F1060 4E 80 00 20 */ blr .global GetRealLifeTime__18CAnimTreeTimeScaleCFRC13CCharAnimTime GetRealLifeTime__18CAnimTreeTimeScaleCFRC13CCharAnimTime: @@ -90,7 +90,7 @@ GetRealLifeTime__18CAnimTreeTimeScaleCFRC13CCharAnimTime: /* 802F4134 002F1094 81 84 00 00 */ lwz r12, 0(r4) /* 802F4138 002F1098 81 8C 00 14 */ lwz r12, 0x14(r12) /* 802F413C 002F109C 7D 89 03 A6 */ mtctr r12 -/* 802F4140 002F10A0 4E 80 04 21 */ bctrl +/* 802F4140 002F10A0 4E 80 04 21 */ bctrl /* 802F4144 002F10A4 C0 21 00 58 */ lfs f1, 0x58(r1) /* 802F4148 002F10A8 C0 1F 00 00 */ lfs f0, 0(r31) /* 802F414C 002F10AC D0 21 00 20 */ stfs f1, 0x20(r1) @@ -141,7 +141,7 @@ lbl_802F4168: /* 802F41F8 002F1158 81 83 00 00 */ lwz r12, 0(r3) /* 802F41FC 002F115C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802F4200 002F1160 7D 89 03 A6 */ mtctr r12 -/* 802F4204 002F1164 4E 80 04 21 */ bctrl +/* 802F4204 002F1164 4E 80 04 21 */ bctrl /* 802F4208 002F1168 7F A3 EB 78 */ mr r3, r29 /* 802F420C 002F116C 48 05 4B E1 */ bl __ct__13CCharAnimTimeFf /* 802F4210 002F1170 48 00 00 E8 */ b lbl_802F42F8 @@ -156,7 +156,7 @@ lbl_802F4214: /* 802F4230 002F1190 81 83 00 00 */ lwz r12, 0(r3) /* 802F4234 002F1194 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802F4238 002F1198 7D 89 03 A6 */ mtctr r12 -/* 802F423C 002F119C 4E 80 04 21 */ bctrl +/* 802F423C 002F119C 4E 80 04 21 */ bctrl /* 802F4240 002F11A0 38 61 00 38 */ addi r3, r1, 0x38 /* 802F4244 002F11A4 48 05 4B A9 */ bl __ct__13CCharAnimTimeFf /* 802F4248 002F11A8 C0 01 00 38 */ lfs f0, 0x38(r1) @@ -178,7 +178,7 @@ lbl_802F4214: /* 802F4288 002F11E8 81 83 00 00 */ lwz r12, 0(r3) /* 802F428C 002F11EC 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802F4290 002F11F0 7D 89 03 A6 */ mtctr r12 -/* 802F4294 002F11F4 4E 80 04 21 */ bctrl +/* 802F4294 002F11F4 4E 80 04 21 */ bctrl /* 802F4298 002F11F8 38 61 00 30 */ addi r3, r1, 0x30 /* 802F429C 002F11FC 48 05 4B 51 */ bl __ct__13CCharAnimTimeFf /* 802F42A0 002F1200 C0 01 00 30 */ lfs f0, 0x30(r1) @@ -212,7 +212,7 @@ lbl_802F42F8: /* 802F4304 002F1264 83 A1 00 84 */ lwz r29, 0x84(r1) /* 802F4308 002F1268 7C 08 03 A6 */ mtlr r0 /* 802F430C 002F126C 38 21 00 90 */ addi r1, r1, 0x90 -/* 802F4310 002F1270 4E 80 00 20 */ blr +/* 802F4310 002F1270 4E 80 00 20 */ blr .global VSetPhase__18CAnimTreeTimeScaleFf VSetPhase__18CAnimTreeTimeScaleFf: @@ -224,11 +224,11 @@ VSetPhase__18CAnimTreeTimeScaleFf: /* 802F4328 002F1288 81 83 00 00 */ lwz r12, 0(r3) /* 802F432C 002F128C 81 8C 00 54 */ lwz r12, 0x54(r12) /* 802F4330 002F1290 7D 89 03 A6 */ mtctr r12 -/* 802F4334 002F1294 4E 80 04 21 */ bctrl +/* 802F4334 002F1294 4E 80 04 21 */ bctrl /* 802F4338 002F1298 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F433C 002F129C 7C 08 03 A6 */ mtlr r0 /* 802F4340 002F12A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F4344 002F12A4 4E 80 00 20 */ blr +/* 802F4344 002F12A4 4E 80 00 20 */ blr .global VSimplified__18CAnimTreeTimeScaleFv VSimplified__18CAnimTreeTimeScaleFv: @@ -270,7 +270,7 @@ lbl_802F43A0: /* 802F43D0 002F1330 38 80 00 01 */ li r4, 1 /* 802F43D4 002F1334 81 8C 00 08 */ lwz r12, 8(r12) /* 802F43D8 002F1338 7D 89 03 A6 */ mtctr r12 -/* 802F43DC 002F133C 4E 80 04 21 */ bctrl +/* 802F43DC 002F133C 4E 80 04 21 */ bctrl lbl_802F43E0: /* 802F43E0 002F1340 88 01 00 38 */ lbz r0, 0x38(r1) /* 802F43E4 002F1344 38 60 00 00 */ li r3, 0 @@ -351,7 +351,7 @@ lbl_802F44EC: /* 802F4508 002F1468 38 80 00 01 */ li r4, 1 /* 802F450C 002F146C 81 8C 00 08 */ lwz r12, 8(r12) /* 802F4510 002F1470 7D 89 03 A6 */ mtctr r12 -/* 802F4514 002F1474 4E 80 04 21 */ bctrl +/* 802F4514 002F1474 4E 80 04 21 */ bctrl lbl_802F4518: /* 802F4518 002F1478 7F 60 07 75 */ extsb. r0, r27 /* 802F451C 002F147C 41 82 00 0C */ beq lbl_802F4528 @@ -381,7 +381,7 @@ lbl_802F4544: /* 802F4574 002F14D4 38 80 00 01 */ li r4, 1 /* 802F4578 002F14D8 81 8C 00 08 */ lwz r12, 8(r12) /* 802F457C 002F14DC 7D 89 03 A6 */ mtctr r12 -/* 802F4580 002F14E0 4E 80 04 21 */ bctrl +/* 802F4580 002F14E0 4E 80 04 21 */ bctrl lbl_802F4584: /* 802F4584 002F14E4 38 00 00 00 */ li r0, 0 /* 802F4588 002F14E8 98 01 00 38 */ stb r0, 0x38(r1) @@ -417,7 +417,7 @@ lbl_802F45DC: /* 802F45F8 002F1558 38 80 00 01 */ li r4, 1 /* 802F45FC 002F155C 81 8C 00 08 */ lwz r12, 8(r12) /* 802F4600 002F1560 7D 89 03 A6 */ mtctr r12 -/* 802F4604 002F1564 4E 80 04 21 */ bctrl +/* 802F4604 002F1564 4E 80 04 21 */ bctrl lbl_802F4608: /* 802F4608 002F1568 88 01 00 38 */ lbz r0, 0x38(r1) /* 802F460C 002F156C 28 00 00 00 */ cmplwi r0, 0 @@ -434,7 +434,7 @@ lbl_802F4608: /* 802F4638 002F1598 38 80 00 01 */ li r4, 1 /* 802F463C 002F159C 81 8C 00 08 */ lwz r12, 8(r12) /* 802F4640 002F15A0 7D 89 03 A6 */ mtctr r12 -/* 802F4644 002F15A4 4E 80 04 21 */ bctrl +/* 802F4644 002F15A4 4E 80 04 21 */ bctrl lbl_802F4648: /* 802F4648 002F15A8 38 00 00 00 */ li r0, 0 /* 802F464C 002F15AC 98 01 00 38 */ stb r0, 0x38(r1) @@ -457,7 +457,7 @@ lbl_802F4654: /* 802F468C 002F15EC 38 80 00 01 */ li r4, 1 /* 802F4690 002F15F0 81 8C 00 08 */ lwz r12, 8(r12) /* 802F4694 002F15F4 7D 89 03 A6 */ mtctr r12 -/* 802F4698 002F15F8 4E 80 04 21 */ bctrl +/* 802F4698 002F15F8 4E 80 04 21 */ bctrl lbl_802F469C: /* 802F469C 002F15FC 38 00 00 00 */ li r0, 0 /* 802F46A0 002F1600 98 01 00 38 */ stb r0, 0x38(r1) @@ -466,7 +466,7 @@ lbl_802F46A4: /* 802F46A8 002F1608 80 01 00 64 */ lwz r0, 0x64(r1) /* 802F46AC 002F160C 7C 08 03 A6 */ mtlr r0 /* 802F46B0 002F1610 38 21 00 60 */ addi r1, r1, 0x60 -/* 802F46B4 002F1614 4E 80 00 20 */ blr +/* 802F46B4 002F1614 4E 80 00 20 */ blr .global Clone__26IVaryingAnimationTimeScaleCFv Clone__26IVaryingAnimationTimeScaleCFv: @@ -478,12 +478,12 @@ Clone__26IVaryingAnimationTimeScaleCFv: /* 802F46CC 002F162C 81 84 00 00 */ lwz r12, 0(r4) /* 802F46D0 002F1630 81 8C 00 14 */ lwz r12, 0x14(r12) /* 802F46D4 002F1634 7D 89 03 A6 */ mtctr r12 -/* 802F46D8 002F1638 4E 80 04 21 */ bctrl +/* 802F46D8 002F1638 4E 80 04 21 */ bctrl /* 802F46DC 002F163C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F46E0 002F1640 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802F46E4 002F1644 7C 08 03 A6 */ mtlr r0 /* 802F46E8 002F1648 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F46EC 002F164C 4E 80 00 20 */ blr +/* 802F46EC 002F164C 4E 80 00 20 */ blr .global VGetParticlePOIState__18CAnimTreeTimeScaleCFPCc VGetParticlePOIState__18CAnimTreeTimeScaleCFPCc: @@ -495,11 +495,11 @@ VGetParticlePOIState__18CAnimTreeTimeScaleCFPCc: /* 802F4704 002F1664 81 83 00 00 */ lwz r12, 0(r3) /* 802F4708 002F1668 81 8C 00 40 */ lwz r12, 0x40(r12) /* 802F470C 002F166C 7D 89 03 A6 */ mtctr r12 -/* 802F4710 002F1670 4E 80 04 21 */ bctrl +/* 802F4710 002F1670 4E 80 04 21 */ bctrl /* 802F4714 002F1674 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F4718 002F1678 7C 08 03 A6 */ mtlr r0 /* 802F471C 002F167C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F4720 002F1680 4E 80 00 20 */ blr +/* 802F4720 002F1680 4E 80 00 20 */ blr .global VGetInt32POIState__18CAnimTreeTimeScaleCFPCc VGetInt32POIState__18CAnimTreeTimeScaleCFPCc: @@ -511,11 +511,11 @@ VGetInt32POIState__18CAnimTreeTimeScaleCFPCc: /* 802F4738 002F1698 81 83 00 00 */ lwz r12, 0(r3) /* 802F473C 002F169C 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 802F4740 002F16A0 7D 89 03 A6 */ mtctr r12 -/* 802F4744 002F16A4 4E 80 04 21 */ bctrl +/* 802F4744 002F16A4 4E 80 04 21 */ bctrl /* 802F4748 002F16A8 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F474C 002F16AC 7C 08 03 A6 */ mtlr r0 /* 802F4750 002F16B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F4754 002F16B4 4E 80 00 20 */ blr +/* 802F4754 002F16B4 4E 80 00 20 */ blr .global VGetBoolPOIState__18CAnimTreeTimeScaleCFPCc VGetBoolPOIState__18CAnimTreeTimeScaleCFPCc: @@ -527,11 +527,11 @@ VGetBoolPOIState__18CAnimTreeTimeScaleCFPCc: /* 802F476C 002F16CC 81 83 00 00 */ lwz r12, 0(r3) /* 802F4770 002F16D0 81 8C 00 38 */ lwz r12, 0x38(r12) /* 802F4774 002F16D4 7D 89 03 A6 */ mtctr r12 -/* 802F4778 002F16D8 4E 80 04 21 */ bctrl +/* 802F4778 002F16D8 4E 80 04 21 */ bctrl /* 802F477C 002F16DC 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F4780 002F16E0 7C 08 03 A6 */ mtlr r0 /* 802F4784 002F16E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F4788 002F16E8 4E 80 00 20 */ blr +/* 802F4788 002F16E8 4E 80 00 20 */ blr .global VGetSoundPOIList__18CAnimTreeTimeScaleCFRC13CCharAnimTimeP13CSoundPOINodeUiUii VGetSoundPOIList__18CAnimTreeTimeScaleCFRC13CCharAnimTimeP13CSoundPOINodeUiUii: @@ -560,7 +560,7 @@ VGetSoundPOIList__18CAnimTreeTimeScaleCFRC13CCharAnimTimeP13CSoundPOINodeUiUii: /* 802F47E4 002F1744 81 84 00 00 */ lwz r12, 0(r4) /* 802F47E8 002F1748 81 8C 00 14 */ lwz r12, 0x14(r12) /* 802F47EC 002F174C 7D 89 03 A6 */ mtctr r12 -/* 802F47F0 002F1750 4E 80 04 21 */ bctrl +/* 802F47F0 002F1750 4E 80 04 21 */ bctrl /* 802F47F4 002F1754 39 21 00 20 */ addi r9, r1, 0x20 /* 802F47F8 002F1758 48 00 00 18 */ b lbl_802F4810 lbl_802F47FC: @@ -619,7 +619,7 @@ lbl_802F48B4: /* 802F48BC 002F181C 80 01 00 64 */ lwz r0, 0x64(r1) /* 802F48C0 002F1820 7C 08 03 A6 */ mtlr r0 /* 802F48C4 002F1824 38 21 00 60 */ addi r1, r1, 0x60 -/* 802F48C8 002F1828 4E 80 00 20 */ blr +/* 802F48C8 002F1828 4E 80 00 20 */ blr .global VGetParticlePOIList__18CAnimTreeTimeScaleCFRC13CCharAnimTimeP16CParticlePOINodeUiUii VGetParticlePOIList__18CAnimTreeTimeScaleCFRC13CCharAnimTimeP16CParticlePOINodeUiUii: @@ -648,7 +648,7 @@ VGetParticlePOIList__18CAnimTreeTimeScaleCFRC13CCharAnimTimeP16CParticlePOINodeU /* 802F4924 002F1884 81 84 00 00 */ lwz r12, 0(r4) /* 802F4928 002F1888 81 8C 00 14 */ lwz r12, 0x14(r12) /* 802F492C 002F188C 7D 89 03 A6 */ mtctr r12 -/* 802F4930 002F1890 4E 80 04 21 */ bctrl +/* 802F4930 002F1890 4E 80 04 21 */ bctrl /* 802F4934 002F1894 39 21 00 20 */ addi r9, r1, 0x20 /* 802F4938 002F1898 48 00 00 18 */ b lbl_802F4950 lbl_802F493C: @@ -707,7 +707,7 @@ lbl_802F49F4: /* 802F49FC 002F195C 80 01 00 64 */ lwz r0, 0x64(r1) /* 802F4A00 002F1960 7C 08 03 A6 */ mtlr r0 /* 802F4A04 002F1964 38 21 00 60 */ addi r1, r1, 0x60 -/* 802F4A08 002F1968 4E 80 00 20 */ blr +/* 802F4A08 002F1968 4E 80 00 20 */ blr .global VGetInt32POIList__18CAnimTreeTimeScaleCFRC13CCharAnimTimeP13CInt32POINodeUiUii VGetInt32POIList__18CAnimTreeTimeScaleCFRC13CCharAnimTimeP13CInt32POINodeUiUii: @@ -736,7 +736,7 @@ VGetInt32POIList__18CAnimTreeTimeScaleCFRC13CCharAnimTimeP13CInt32POINodeUiUii: /* 802F4A64 002F19C4 81 84 00 00 */ lwz r12, 0(r4) /* 802F4A68 002F19C8 81 8C 00 14 */ lwz r12, 0x14(r12) /* 802F4A6C 002F19CC 7D 89 03 A6 */ mtctr r12 -/* 802F4A70 002F19D0 4E 80 04 21 */ bctrl +/* 802F4A70 002F19D0 4E 80 04 21 */ bctrl /* 802F4A74 002F19D4 39 21 00 20 */ addi r9, r1, 0x20 /* 802F4A78 002F19D8 48 00 00 18 */ b lbl_802F4A90 lbl_802F4A7C: @@ -795,7 +795,7 @@ lbl_802F4B34: /* 802F4B3C 002F1A9C 80 01 00 64 */ lwz r0, 0x64(r1) /* 802F4B40 002F1AA0 7C 08 03 A6 */ mtlr r0 /* 802F4B44 002F1AA4 38 21 00 60 */ addi r1, r1, 0x60 -/* 802F4B48 002F1AA8 4E 80 00 20 */ blr +/* 802F4B48 002F1AA8 4E 80 00 20 */ blr .global VGetBoolPOIList__18CAnimTreeTimeScaleCFRC13CCharAnimTimeP12CBoolPOINodeUiUii VGetBoolPOIList__18CAnimTreeTimeScaleCFRC13CCharAnimTimeP12CBoolPOINodeUiUii: @@ -824,7 +824,7 @@ VGetBoolPOIList__18CAnimTreeTimeScaleCFRC13CCharAnimTimeP12CBoolPOINodeUiUii: /* 802F4BA4 002F1B04 81 84 00 00 */ lwz r12, 0(r4) /* 802F4BA8 002F1B08 81 8C 00 14 */ lwz r12, 0x14(r12) /* 802F4BAC 002F1B0C 7D 89 03 A6 */ mtctr r12 -/* 802F4BB0 002F1B10 4E 80 04 21 */ bctrl +/* 802F4BB0 002F1B10 4E 80 04 21 */ bctrl /* 802F4BB4 002F1B14 39 21 00 20 */ addi r9, r1, 0x20 /* 802F4BB8 002F1B18 48 00 00 18 */ b lbl_802F4BD0 lbl_802F4BBC: @@ -883,7 +883,7 @@ lbl_802F4C74: /* 802F4C7C 002F1BDC 80 01 00 64 */ lwz r0, 0x64(r1) /* 802F4C80 002F1BE0 7C 08 03 A6 */ mtlr r0 /* 802F4C84 002F1BE4 38 21 00 60 */ addi r1, r1, 0x60 -/* 802F4C88 002F1BE8 4E 80 00 20 */ blr +/* 802F4C88 002F1BE8 4E 80 00 20 */ blr .global VGetContributionOfHighestInfluence__18CAnimTreeTimeScaleCFv VGetContributionOfHighestInfluence__18CAnimTreeTimeScaleCFv: @@ -945,7 +945,7 @@ lbl_802F4D4C: /* 802F4D64 002F1CC4 81 9D 00 00 */ lwz r12, 0(r29) /* 802F4D68 002F1CC8 81 8C 00 18 */ lwz r12, 0x18(r12) /* 802F4D6C 002F1CCC 7D 89 03 A6 */ mtctr r12 -/* 802F4D70 002F1CD0 4E 80 04 21 */ bctrl +/* 802F4D70 002F1CD0 4E 80 04 21 */ bctrl /* 802F4D74 002F1CD4 7F A4 EB 78 */ mr r4, r29 /* 802F4D78 002F1CD8 80 A1 00 2C */ lwz r5, 0x2c(r1) /* 802F4D7C 002F1CDC 81 9D 00 00 */ lwz r12, 0(r29) @@ -962,7 +962,7 @@ lbl_802F4D4C: /* 802F4DA8 002F1D08 D0 01 00 50 */ stfs f0, 0x50(r1) /* 802F4DAC 002F1D0C 98 01 00 54 */ stb r0, 0x54(r1) /* 802F4DB0 002F1D10 7D 89 03 A6 */ mtctr r12 -/* 802F4DB4 002F1D14 4E 80 04 21 */ bctrl +/* 802F4DB4 002F1D14 4E 80 04 21 */ bctrl /* 802F4DB8 002F1D18 80 01 00 0C */ lwz r0, 0xc(r1) /* 802F4DBC 002F1D1C 38 7C 00 04 */ addi r3, r28, 4 /* 802F4DC0 002F1D20 C3 A1 00 08 */ lfs f29, 8(r1) @@ -1006,7 +1006,7 @@ lbl_802F4E2C: /* 802F4E54 002F1DB4 83 81 00 D0 */ lwz r28, 0xd0(r1) /* 802F4E58 002F1DB8 7C 08 03 A6 */ mtlr r0 /* 802F4E5C 002F1DBC 38 21 01 10 */ addi r1, r1, 0x110 -/* 802F4E60 002F1DC0 4E 80 00 20 */ blr +/* 802F4E60 002F1DC0 4E 80 00 20 */ blr .global VGetBestUnblendedChild__18CAnimTreeTimeScaleCFv VGetBestUnblendedChild__18CAnimTreeTimeScaleCFv: @@ -1117,7 +1117,7 @@ lbl_802F4FD4: /* 802F4FF8 002F1F58 38 80 00 01 */ li r4, 1 /* 802F4FFC 002F1F5C 81 8C 00 08 */ lwz r12, 8(r12) /* 802F5000 002F1F60 7D 89 03 A6 */ mtctr r12 -/* 802F5004 002F1F64 4E 80 04 21 */ bctrl +/* 802F5004 002F1F64 4E 80 04 21 */ bctrl lbl_802F5008: /* 802F5008 002F1F68 7F 80 07 75 */ extsb. r0, r28 /* 802F500C 002F1F6C 41 82 00 18 */ beq lbl_802F5024 @@ -1143,7 +1143,7 @@ lbl_802F504C: /* 802F5050 002F1FB0 80 01 00 44 */ lwz r0, 0x44(r1) /* 802F5054 002F1FB4 7C 08 03 A6 */ mtlr r0 /* 802F5058 002F1FB8 38 21 00 40 */ addi r1, r1, 0x40 -/* 802F505C 002F1FBC 4E 80 00 20 */ blr +/* 802F505C 002F1FBC 4E 80 00 20 */ blr .global VClone__18CAnimTreeTimeScaleCFv VClone__18CAnimTreeTimeScaleCFv: @@ -1231,7 +1231,7 @@ lbl_802F5178: /* 802F519C 002F20FC 38 80 00 01 */ li r4, 1 /* 802F51A0 002F2100 81 8C 00 08 */ lwz r12, 8(r12) /* 802F51A4 002F2104 7D 89 03 A6 */ mtctr r12 -/* 802F51A8 002F2108 4E 80 04 21 */ bctrl +/* 802F51A8 002F2108 4E 80 04 21 */ bctrl lbl_802F51AC: /* 802F51AC 002F210C 7F 80 07 75 */ extsb. r0, r28 /* 802F51B0 002F2110 41 82 00 18 */ beq lbl_802F51C8 @@ -1245,7 +1245,7 @@ lbl_802F51C8: /* 802F51CC 002F212C 80 01 00 44 */ lwz r0, 0x44(r1) /* 802F51D0 002F2130 7C 08 03 A6 */ mtlr r0 /* 802F51D4 002F2134 38 21 00 40 */ addi r1, r1, 0x40 -/* 802F51D8 002F2138 4E 80 00 20 */ blr +/* 802F51D8 002F2138 4E 80 00 20 */ blr .global VGetSteadyStateAnimInfo__18CAnimTreeTimeScaleCFv VGetSteadyStateAnimInfo__18CAnimTreeTimeScaleCFv: @@ -1264,7 +1264,7 @@ VGetSteadyStateAnimInfo__18CAnimTreeTimeScaleCFv: /* 802F520C 002F216C 81 84 00 00 */ lwz r12, 0(r4) /* 802F5210 002F2170 81 8C 00 18 */ lwz r12, 0x18(r12) /* 802F5214 002F2174 7D 89 03 A6 */ mtctr r12 -/* 802F5218 002F2178 4E 80 04 21 */ bctrl +/* 802F5218 002F2178 4E 80 04 21 */ bctrl /* 802F521C 002F217C 80 C1 00 74 */ lwz r6, 0x74(r1) /* 802F5220 002F2180 38 7E 00 28 */ addi r3, r30, 0x28 /* 802F5224 002F2184 C0 61 00 78 */ lfs f3, 0x78(r1) @@ -1294,7 +1294,7 @@ VGetSteadyStateAnimInfo__18CAnimTreeTimeScaleCFv: /* 802F5284 002F21E4 81 83 00 00 */ lwz r12, 0(r3) /* 802F5288 002F21E8 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802F528C 002F21EC 7D 89 03 A6 */ mtctr r12 -/* 802F5290 002F21F0 4E 80 04 21 */ bctrl +/* 802F5290 002F21F0 4E 80 04 21 */ bctrl /* 802F5294 002F21F4 38 61 00 40 */ addi r3, r1, 0x40 /* 802F5298 002F21F8 48 05 3B 55 */ bl __ct__13CCharAnimTimeFf /* 802F529C 002F21FC 80 01 00 44 */ lwz r0, 0x44(r1) @@ -1326,7 +1326,7 @@ lbl_802F52D4: /* 802F5300 002F2260 81 83 00 00 */ lwz r12, 0(r3) /* 802F5304 002F2264 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802F5308 002F2268 7D 89 03 A6 */ mtctr r12 -/* 802F530C 002F226C 4E 80 04 21 */ bctrl +/* 802F530C 002F226C 4E 80 04 21 */ bctrl /* 802F5310 002F2270 38 61 00 38 */ addi r3, r1, 0x38 /* 802F5314 002F2274 48 05 3A D9 */ bl __ct__13CCharAnimTimeFf /* 802F5318 002F2278 38 A1 00 38 */ addi r5, r1, 0x38 @@ -1347,7 +1347,7 @@ lbl_802F5334: /* 802F534C 002F22AC 81 9E 00 00 */ lwz r12, 0(r30) /* 802F5350 002F22B0 81 8C 00 14 */ lwz r12, 0x14(r12) /* 802F5354 002F22B4 7D 89 03 A6 */ mtctr r12 -/* 802F5358 002F22B8 4E 80 04 21 */ bctrl +/* 802F5358 002F22B8 4E 80 04 21 */ bctrl /* 802F535C 002F22BC C0 01 00 28 */ lfs f0, 0x28(r1) /* 802F5360 002F22C0 38 61 00 18 */ addi r3, r1, 0x18 /* 802F5364 002F22C4 80 01 00 2C */ lwz r0, 0x2c(r1) @@ -1381,7 +1381,7 @@ lbl_802F53C0: /* 802F53D0 002F2330 83 C1 00 A8 */ lwz r30, 0xa8(r1) /* 802F53D4 002F2334 7C 08 03 A6 */ mtlr r0 /* 802F53D8 002F2338 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 802F53DC 002F233C 4E 80 00 20 */ blr +/* 802F53DC 002F233C 4E 80 00 20 */ blr .global VGetTimeRemaining__18CAnimTreeTimeScaleCFv VGetTimeRemaining__18CAnimTreeTimeScaleCFv: @@ -1398,7 +1398,7 @@ VGetTimeRemaining__18CAnimTreeTimeScaleCFv: /* 802F5408 002F2368 81 84 00 00 */ lwz r12, 0(r4) /* 802F540C 002F236C 81 8C 00 14 */ lwz r12, 0x14(r12) /* 802F5410 002F2370 7D 89 03 A6 */ mtctr r12 -/* 802F5414 002F2374 4E 80 04 21 */ bctrl +/* 802F5414 002F2374 4E 80 04 21 */ bctrl /* 802F5418 002F2378 C0 21 00 28 */ lfs f1, 0x28(r1) /* 802F541C 002F237C 38 7F 00 28 */ addi r3, r31, 0x28 /* 802F5420 002F2380 80 A1 00 2C */ lwz r5, 0x2c(r1) @@ -1422,7 +1422,7 @@ VGetTimeRemaining__18CAnimTreeTimeScaleCFv: /* 802F5468 002F23C8 81 83 00 00 */ lwz r12, 0(r3) /* 802F546C 002F23CC 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802F5470 002F23D0 7D 89 03 A6 */ mtctr r12 -/* 802F5474 002F23D4 4E 80 04 21 */ bctrl +/* 802F5474 002F23D4 4E 80 04 21 */ bctrl /* 802F5478 002F23D8 38 61 00 10 */ addi r3, r1, 0x10 /* 802F547C 002F23DC 48 05 39 71 */ bl __ct__13CCharAnimTimeFf /* 802F5480 002F23E0 38 61 00 18 */ addi r3, r1, 0x18 @@ -1446,7 +1446,7 @@ lbl_802F54B8: /* 802F54C0 002F2420 83 C1 00 48 */ lwz r30, 0x48(r1) /* 802F54C4 002F2424 7C 08 03 A6 */ mtlr r0 /* 802F54C8 002F2428 38 21 00 50 */ addi r1, r1, 0x50 -/* 802F54CC 002F242C 4E 80 00 20 */ blr +/* 802F54CC 002F242C 4E 80 00 20 */ blr .global VAdvanceView__18CAnimTreeTimeScaleFRC13CCharAnimTime VAdvanceView__18CAnimTreeTimeScaleFRC13CCharAnimTime: @@ -1493,7 +1493,7 @@ VAdvanceView__18CAnimTreeTimeScaleFRC13CCharAnimTime: /* 802F5570 002F24D0 81 84 00 00 */ lwz r12, 0(r4) /* 802F5574 002F24D4 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802F5578 002F24D8 7D 89 03 A6 */ mtctr r12 -/* 802F557C 002F24DC 4E 80 04 21 */ bctrl +/* 802F557C 002F24DC 4E 80 04 21 */ bctrl /* 802F5580 002F24E0 48 00 03 D4 */ b lbl_802F5954 lbl_802F5584: /* 802F5584 002F24E4 C0 1F 00 20 */ lfs f0, 0x20(r31) @@ -1523,7 +1523,7 @@ lbl_802F5584: /* 802F55E4 002F2544 81 83 00 00 */ lwz r12, 0(r3) /* 802F55E8 002F2548 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802F55EC 002F254C 7D 89 03 A6 */ mtctr r12 -/* 802F55F0 002F2550 4E 80 04 21 */ bctrl +/* 802F55F0 002F2550 4E 80 04 21 */ bctrl /* 802F55F4 002F2554 38 61 00 68 */ addi r3, r1, 0x68 /* 802F55F8 002F2558 48 05 37 F5 */ bl __ct__13CCharAnimTimeFf /* 802F55FC 002F255C C0 01 00 68 */ lfs f0, 0x68(r1) @@ -1537,7 +1537,7 @@ lbl_802F5584: /* 802F561C 002F257C 81 84 00 00 */ lwz r12, 0(r4) /* 802F5620 002F2580 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802F5624 002F2584 7D 89 03 A6 */ mtctr r12 -/* 802F5628 002F2588 4E 80 04 21 */ bctrl +/* 802F5628 002F2588 4E 80 04 21 */ bctrl /* 802F562C 002F258C C0 E1 00 DC */ lfs f7, 0xdc(r1) /* 802F5630 002F2590 38 61 01 24 */ addi r3, r1, 0x124 /* 802F5634 002F2594 80 01 00 E0 */ lwz r0, 0xe0(r1) @@ -1599,7 +1599,7 @@ lbl_802F56E4: /* 802F5710 002F2670 81 83 00 00 */ lwz r12, 0(r3) /* 802F5714 002F2674 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802F5718 002F2678 7D 89 03 A6 */ mtctr r12 -/* 802F571C 002F267C 4E 80 04 21 */ bctrl +/* 802F571C 002F267C 4E 80 04 21 */ bctrl /* 802F5720 002F2680 38 61 00 58 */ addi r3, r1, 0x58 /* 802F5724 002F2684 48 05 36 C9 */ bl __ct__13CCharAnimTimeFf /* 802F5728 002F2688 C0 01 00 58 */ lfs f0, 0x58(r1) @@ -1649,7 +1649,7 @@ lbl_802F57B8: /* 802F57D4 002F2734 81 83 00 00 */ lwz r12, 0(r3) /* 802F57D8 002F2738 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802F57DC 002F273C 7D 89 03 A6 */ mtctr r12 -/* 802F57E0 002F2740 4E 80 04 21 */ bctrl +/* 802F57E0 002F2740 4E 80 04 21 */ bctrl /* 802F57E4 002F2744 38 61 00 38 */ addi r3, r1, 0x38 /* 802F57E8 002F2748 48 05 36 05 */ bl __ct__13CCharAnimTimeFf /* 802F57EC 002F274C C0 01 00 38 */ lfs f0, 0x38(r1) @@ -1692,7 +1692,7 @@ lbl_802F57B8: /* 802F5880 002F27E0 81 84 00 00 */ lwz r12, 0(r4) /* 802F5884 002F27E4 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802F5888 002F27E8 7D 89 03 A6 */ mtctr r12 -/* 802F588C 002F27EC 4E 80 04 21 */ bctrl +/* 802F588C 002F27EC 4E 80 04 21 */ bctrl /* 802F5890 002F27F0 81 41 00 B8 */ lwz r10, 0xb8(r1) /* 802F5894 002F27F4 81 21 00 BC */ lwz r9, 0xbc(r1) /* 802F5898 002F27F8 81 01 00 C0 */ lwz r8, 0xc0(r1) diff --git a/asm/Kyoto/Animation/CAnimTreeTransition.s b/asm/Kyoto/Animation/CAnimTreeTransition.s index c1b43a7b..fdca2e9a 100644 --- a/asm/Kyoto/Animation/CAnimTreeTransition.s +++ b/asm/Kyoto/Animation/CAnimTreeTransition.s @@ -105,7 +105,7 @@ lbl_802F5A5C: /* 802F5A60 002F29C0 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802F5A64 002F29C4 7C 08 03 A6 */ mtlr r0 /* 802F5A68 002F29C8 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F5A6C 002F29CC 4E 80 00 20 */ blr +/* 802F5A6C 002F29CC 4E 80 00 20 */ blr .global SetBlendingWeight__19CAnimTreeTransitionFf SetBlendingWeight__19CAnimTreeTransitionFf: @@ -122,13 +122,13 @@ SetBlendingWeight__19CAnimTreeTransitionFf: /* 802F5A98 002F29F8 81 83 00 00 */ lwz r12, 0(r3) /* 802F5A9C 002F29FC 81 8C 00 74 */ lwz r12, 0x74(r12) /* 802F5AA0 002F2A00 7D 89 03 A6 */ mtctr r12 -/* 802F5AA4 002F2A04 4E 80 04 21 */ bctrl +/* 802F5AA4 002F2A04 4E 80 04 21 */ bctrl /* 802F5AA8 002F2A08 38 61 00 08 */ addi r3, r1, 8 /* 802F5AAC 002F2A0C 4B D3 B4 F5 */ bl sub_80030fa0 /* 802F5AB0 002F2A10 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F5AB4 002F2A14 7C 08 03 A6 */ mtlr r0 /* 802F5AB8 002F2A18 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F5ABC 002F2A1C 4E 80 00 20 */ blr +/* 802F5ABC 002F2A1C 4E 80 00 20 */ blr .global "CreatePrimitiveName__19CAnimTreeTransitionFRCQ24rstl25ncrc_ptr<13CAnimTreeNode>RCQ24rstl25ncrc_ptr<13CAnimTreeNode>f" "CreatePrimitiveName__19CAnimTreeTransitionFRCQ24rstl25ncrc_ptr<13CAnimTreeNode>RCQ24rstl25ncrc_ptr<13CAnimTreeNode>f": @@ -144,7 +144,7 @@ SetBlendingWeight__19CAnimTreeTransitionFf: /* 802F5AE4 002F2A44 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802F5AE8 002F2A48 7C 08 03 A6 */ mtlr r0 /* 802F5AEC 002F2A4C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F5AF0 002F2A50 4E 80 00 20 */ blr +/* 802F5AF0 002F2A50 4E 80 00 20 */ blr .global VGetSteadyStateAnimInfo__19CAnimTreeTransitionCFv VGetSteadyStateAnimInfo__19CAnimTreeTransitionCFv: @@ -167,7 +167,7 @@ VGetSteadyStateAnimInfo__19CAnimTreeTransitionCFv: /* 802F5B34 002F2A94 81 84 00 00 */ lwz r12, 0(r4) /* 802F5B38 002F2A98 81 8C 00 18 */ lwz r12, 0x18(r12) /* 802F5B3C 002F2A9C 7D 89 03 A6 */ mtctr r12 -/* 802F5B40 002F2AA0 4E 80 04 21 */ bctrl +/* 802F5B40 002F2AA0 4E 80 04 21 */ bctrl /* 802F5B44 002F2AA4 80 A1 00 14 */ lwz r5, 0x14(r1) /* 802F5B48 002F2AA8 38 7F 00 24 */ addi r3, r31, 0x24 /* 802F5B4C 002F2AAC C3 A1 00 18 */ lfs f29, 0x18(r1) @@ -211,7 +211,7 @@ lbl_802F5B98: /* 802F5BDC 002F2B3C 83 C1 00 48 */ lwz r30, 0x48(r1) /* 802F5BE0 002F2B40 7C 08 03 A6 */ mtlr r0 /* 802F5BE4 002F2B44 38 21 00 80 */ addi r1, r1, 0x80 -/* 802F5BE8 002F2B48 4E 80 00 20 */ blr +/* 802F5BE8 002F2B48 4E 80 00 20 */ blr .global VGetTimeRemaining__19CAnimTreeTransitionCFv VGetTimeRemaining__19CAnimTreeTransitionCFv: @@ -232,7 +232,7 @@ VGetTimeRemaining__19CAnimTreeTransitionCFv: /* 802F5C24 002F2B84 81 84 00 00 */ lwz r12, 0(r4) /* 802F5C28 002F2B88 81 8C 00 14 */ lwz r12, 0x14(r12) /* 802F5C2C 002F2B8C 7D 89 03 A6 */ mtctr r12 -/* 802F5C30 002F2B90 4E 80 04 21 */ bctrl +/* 802F5C30 002F2B90 4E 80 04 21 */ bctrl /* 802F5C34 002F2B94 38 61 00 10 */ addi r3, r1, 0x10 /* 802F5C38 002F2B98 38 81 00 08 */ addi r4, r1, 8 /* 802F5C3C 002F2B9C 48 05 30 01 */ bl __lt__13CCharAnimTimeCFRC13CCharAnimTime @@ -250,7 +250,7 @@ lbl_802F5C50: /* 802F5C68 002F2BC8 80 01 00 24 */ lwz r0, 0x24(r1) /* 802F5C6C 002F2BCC 7C 08 03 A6 */ mtlr r0 /* 802F5C70 002F2BD0 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F5C74 002F2BD4 4E 80 00 20 */ blr +/* 802F5C74 002F2BD4 4E 80 00 20 */ blr .global VGetBlendingWeight__19CAnimTreeTransitionCFv VGetBlendingWeight__19CAnimTreeTransitionCFv: @@ -276,7 +276,7 @@ lbl_802F5CB8: /* 802F5CBC 002F2C1C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802F5CC0 002F2C20 7C 08 03 A6 */ mtlr r0 /* 802F5CC4 002F2C24 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F5CC8 002F2C28 4E 80 00 20 */ blr +/* 802F5CC8 002F2C28 4E 80 00 20 */ blr .global VClone__19CAnimTreeTransitionCFv VClone__19CAnimTreeTransitionCFv: @@ -361,7 +361,7 @@ lbl_802F5DD8: /* 802F5DFC 002F2D5C 38 80 00 01 */ li r4, 1 /* 802F5E00 002F2D60 81 8C 00 08 */ lwz r12, 8(r12) /* 802F5E04 002F2D64 7D 89 03 A6 */ mtctr r12 -/* 802F5E08 002F2D68 4E 80 04 21 */ bctrl +/* 802F5E08 002F2D68 4E 80 04 21 */ bctrl lbl_802F5E0C: /* 802F5E0C 002F2D6C 7F A0 07 75 */ extsb. r0, r29 /* 802F5E10 002F2D70 41 82 00 0C */ beq lbl_802F5E1C @@ -380,13 +380,13 @@ lbl_802F5E1C: /* 802F5E40 002F2DA0 38 80 00 01 */ li r4, 1 /* 802F5E44 002F2DA4 81 8C 00 08 */ lwz r12, 8(r12) /* 802F5E48 002F2DA8 7D 89 03 A6 */ mtctr r12 -/* 802F5E4C 002F2DAC 4E 80 04 21 */ bctrl +/* 802F5E4C 002F2DAC 4E 80 04 21 */ bctrl lbl_802F5E50: /* 802F5E50 002F2DB0 BB 21 00 34 */ lmw r25, 0x34(r1) /* 802F5E54 002F2DB4 80 01 00 54 */ lwz r0, 0x54(r1) /* 802F5E58 002F2DB8 7C 08 03 A6 */ mtlr r0 /* 802F5E5C 002F2DBC 38 21 00 50 */ addi r1, r1, 0x50 -/* 802F5E60 002F2DC0 4E 80 00 20 */ blr +/* 802F5E60 002F2DC0 4E 80 00 20 */ blr .global VAdvanceView__19CAnimTreeTransitionFRC13CCharAnimTime VAdvanceView__19CAnimTreeTransitionFRC13CCharAnimTime: @@ -427,7 +427,7 @@ VAdvanceView__19CAnimTreeTransitionFRC13CCharAnimTime: /* 802F5EEC 002F2E4C 81 84 00 00 */ lwz r12, 0(r4) /* 802F5EF0 002F2E50 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802F5EF4 002F2E54 7D 89 03 A6 */ mtctr r12 -/* 802F5EF8 002F2E58 4E 80 04 21 */ bctrl +/* 802F5EF8 002F2E58 4E 80 04 21 */ bctrl /* 802F5EFC 002F2E5C 88 1E 00 34 */ lbz r0, 0x34(r30) /* 802F5F00 002F2E60 28 00 00 00 */ cmplwi r0, 0 /* 802F5F04 002F2E64 41 82 00 24 */ beq lbl_802F5F28 @@ -438,7 +438,7 @@ VAdvanceView__19CAnimTreeTransitionFRC13CCharAnimTime: /* 802F5F18 002F2E78 81 84 00 00 */ lwz r12, 0(r4) /* 802F5F1C 002F2E7C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802F5F20 002F2E80 7D 89 03 A6 */ mtctr r12 -/* 802F5F24 002F2E84 4E 80 04 21 */ bctrl +/* 802F5F24 002F2E84 4E 80 04 21 */ bctrl lbl_802F5F28: /* 802F5F28 002F2E88 80 6D A7 40 */ lwz r3, lbl_805A9300@sda21(r13) /* 802F5F2C 002F2E8C 38 03 FF FF */ addi r0, r3, -1 @@ -663,7 +663,7 @@ lbl_802F623C: /* 802F6280 002F31E0 83 A1 01 24 */ lwz r29, 0x124(r1) /* 802F6284 002F31E4 7C 08 03 A6 */ mtlr r0 /* 802F6288 002F31E8 38 21 01 A0 */ addi r1, r1, 0x1a0 -/* 802F628C 002F31EC 4E 80 00 20 */ blr +/* 802F628C 002F31EC 4E 80 00 20 */ blr .global AdvanceViewForTransitionalPeriod__19CAnimTreeTransitionFRC13CCharAnimTime AdvanceViewForTransitionalPeriod__19CAnimTreeTransitionFRC13CCharAnimTime: @@ -805,7 +805,7 @@ lbl_802F647C: /* 802F6498 002F33F8 83 A1 00 B4 */ lwz r29, 0xb4(r1) /* 802F649C 002F33FC 7C 08 03 A6 */ mtlr r0 /* 802F64A0 002F3400 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 802F64A4 002F3404 4E 80 00 20 */ blr +/* 802F64A4 002F3404 4E 80 00 20 */ blr .global __ct__Q220CAnimTreeDoubleChild29CDoubleChildAdvancementResultFRCQ220CAnimTreeDoubleChild29CDoubleChildAdvancementResult __ct__Q220CAnimTreeDoubleChild29CDoubleChildAdvancementResultFRCQ220CAnimTreeDoubleChild29CDoubleChildAdvancementResult: @@ -841,7 +841,7 @@ __ct__Q220CAnimTreeDoubleChild29CDoubleChildAdvancementResultFRCQ220CAnimTreeDou /* 802F651C 002F347C D0 03 00 38 */ stfs f0, 0x38(r3) /* 802F6520 002F3480 C0 04 00 3C */ lfs f0, 0x3c(r4) /* 802F6524 002F3484 D0 03 00 3C */ stfs f0, 0x3c(r3) -/* 802F6528 002F3488 4E 80 00 20 */ blr +/* 802F6528 002F3488 4E 80 00 20 */ blr .global VReverseSimplified__19CAnimTreeTransitionFv VReverseSimplified__19CAnimTreeTransitionFv: @@ -885,7 +885,7 @@ lbl_802F65A0: /* 802F65BC 002F351C 38 80 00 01 */ li r4, 1 /* 802F65C0 002F3520 81 8C 00 08 */ lwz r12, 8(r12) /* 802F65C4 002F3524 7D 89 03 A6 */ mtctr r12 -/* 802F65C8 002F3528 4E 80 04 21 */ bctrl +/* 802F65C8 002F3528 4E 80 04 21 */ bctrl /* 802F65CC 002F352C 48 00 00 10 */ b lbl_802F65DC lbl_802F65D0: /* 802F65D0 002F3530 7F C3 F3 78 */ mr r3, r30 @@ -897,7 +897,7 @@ lbl_802F65DC: /* 802F65E4 002F3544 83 C1 00 18 */ lwz r30, 0x18(r1) /* 802F65E8 002F3548 7C 08 03 A6 */ mtlr r0 /* 802F65EC 002F354C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F65F0 002F3550 4E 80 00 20 */ blr +/* 802F65F0 002F3550 4E 80 00 20 */ blr .global VSimplified__19CAnimTreeTransitionFv VSimplified__19CAnimTreeTransitionFv: @@ -948,7 +948,7 @@ lbl_802F6670: /* 802F66A0 002F3600 38 80 00 01 */ li r4, 1 /* 802F66A4 002F3604 81 8C 00 08 */ lwz r12, 8(r12) /* 802F66A8 002F3608 7D 89 03 A6 */ mtctr r12 -/* 802F66AC 002F360C 4E 80 04 21 */ bctrl +/* 802F66AC 002F360C 4E 80 04 21 */ bctrl lbl_802F66B0: /* 802F66B0 002F3610 88 01 00 24 */ lbz r0, 0x24(r1) /* 802F66B4 002F3614 38 80 00 00 */ li r4, 0 @@ -980,7 +980,7 @@ lbl_802F66E8: /* 802F6718 002F3678 38 80 00 01 */ li r4, 1 /* 802F671C 002F367C 81 8C 00 08 */ lwz r12, 8(r12) /* 802F6720 002F3680 7D 89 03 A6 */ mtctr r12 -/* 802F6724 002F3684 4E 80 04 21 */ bctrl +/* 802F6724 002F3684 4E 80 04 21 */ bctrl lbl_802F6728: /* 802F6728 002F3688 38 00 00 00 */ li r0, 0 /* 802F672C 002F368C 98 01 00 24 */ stb r0, 0x24(r1) @@ -1011,7 +1011,7 @@ lbl_802F676C: /* 802F6788 002F36E8 38 80 00 01 */ li r4, 1 /* 802F678C 002F36EC 81 8C 00 08 */ lwz r12, 8(r12) /* 802F6790 002F36F0 7D 89 03 A6 */ mtctr r12 -/* 802F6794 002F36F4 4E 80 04 21 */ bctrl +/* 802F6794 002F36F4 4E 80 04 21 */ bctrl lbl_802F6798: /* 802F6798 002F36F8 88 01 00 24 */ lbz r0, 0x24(r1) /* 802F679C 002F36FC 28 00 00 00 */ cmplwi r0, 0 @@ -1028,7 +1028,7 @@ lbl_802F6798: /* 802F67C8 002F3728 38 80 00 01 */ li r4, 1 /* 802F67CC 002F372C 81 8C 00 08 */ lwz r12, 8(r12) /* 802F67D0 002F3730 7D 89 03 A6 */ mtctr r12 -/* 802F67D4 002F3734 4E 80 04 21 */ bctrl +/* 802F67D4 002F3734 4E 80 04 21 */ bctrl lbl_802F67D8: /* 802F67D8 002F3738 38 00 00 00 */ li r0, 0 /* 802F67DC 002F373C 98 01 00 24 */ stb r0, 0x24(r1) @@ -1043,7 +1043,7 @@ lbl_802F67F0: /* 802F67F8 002F3758 83 C1 00 28 */ lwz r30, 0x28(r1) /* 802F67FC 002F375C 7C 08 03 A6 */ mtlr r0 /* 802F6800 002F3760 38 21 00 30 */ addi r1, r1, 0x30 -/* 802F6804 002F3764 4E 80 00 20 */ blr +/* 802F6804 002F3764 4E 80 00 20 */ blr .global __dt__19CAnimTreeTransitionFv __dt__19CAnimTreeTransitionFv: @@ -1075,7 +1075,7 @@ lbl_802F685C: /* 802F6868 002F37C8 83 C1 00 08 */ lwz r30, 8(r1) /* 802F686C 002F37CC 7C 08 03 A6 */ mtlr r0 /* 802F6870 002F37D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F6874 002F37D4 4E 80 00 20 */ blr +/* 802F6874 002F37D4 4E 80 00 20 */ blr .global "__ct__19CAnimTreeTransitionFbRCQ24rstl25ncrc_ptr<13CAnimTreeNode>RCQ24rstl25ncrc_ptr<13CAnimTreeNode>RC13CCharAnimTimeRC13CCharAnimTimebbiRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>b" "__ct__19CAnimTreeTransitionFbRCQ24rstl25ncrc_ptr<13CAnimTreeNode>RCQ24rstl25ncrc_ptr<13CAnimTreeNode>RC13CCharAnimTimeRC13CCharAnimTimebbiRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>b": @@ -1116,7 +1116,7 @@ lbl_802F685C: /* 802F6900 002F3860 80 01 00 24 */ lwz r0, 0x24(r1) /* 802F6904 002F3864 7C 08 03 A6 */ mtlr r0 /* 802F6908 002F3868 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F690C 002F386C 4E 80 00 20 */ blr +/* 802F690C 002F386C 4E 80 00 20 */ blr .global "__ct__19CAnimTreeTransitionFbRCQ24rstl25ncrc_ptr<13CAnimTreeNode>RCQ24rstl25ncrc_ptr<13CAnimTreeNode>RC13CCharAnimTimebiRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" "__ct__19CAnimTreeTransitionFbRCQ24rstl25ncrc_ptr<13CAnimTreeNode>RCQ24rstl25ncrc_ptr<13CAnimTreeNode>RC13CCharAnimTimebiRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>": @@ -1153,7 +1153,7 @@ lbl_802F685C: /* 802F6988 002F38E8 81 83 00 00 */ lwz r12, 0(r3) /* 802F698C 002F38EC 81 8C 00 38 */ lwz r12, 0x38(r12) /* 802F6990 002F38F0 7D 89 03 A6 */ mtctr r12 -/* 802F6994 002F38F4 4E 80 04 21 */ bctrl +/* 802F6994 002F38F4 4E 80 04 21 */ bctrl /* 802F6998 002F38F8 98 7C 00 35 */ stb r3, 0x35(r28) /* 802F699C 002F38FC 38 00 00 00 */ li r0, 0 /* 802F69A0 002F3900 38 60 00 13 */ li r3, 0x13 diff --git a/asm/Kyoto/Animation/CAnimTreeTweenBase.s b/asm/Kyoto/Animation/CAnimTreeTweenBase.s index e458e691..61ae8074 100644 --- a/asm/Kyoto/Animation/CAnimTreeTweenBase.s +++ b/asm/Kyoto/Animation/CAnimTreeTweenBase.s @@ -83,7 +83,7 @@ lbl_805A9310: /* 802F6A24 002F3984 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 802F6A28 002F3988 EC 3E 00 32 */ fmuls f1, f30, f0 /* 802F6A2C 002F398C 7D 89 03 A6 */ mtctr r12 -/* 802F6A30 002F3990 4E 80 04 21 */ bctrl +/* 802F6A30 002F3990 4E 80 04 21 */ bctrl /* 802F6A34 002F3994 80 7E 00 18 */ lwz r3, 0x18(r30) /* 802F6A38 002F3998 EC 3E 07 F2 */ fmuls f1, f30, f31 /* 802F6A3C 002F399C 7F E4 FB 78 */ mr r4, r31 @@ -91,7 +91,7 @@ lbl_805A9310: /* 802F6A44 002F39A4 81 83 00 00 */ lwz r12, 0(r3) /* 802F6A48 002F39A8 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 802F6A4C 002F39AC 7D 89 03 A6 */ mtctr r12 -/* 802F6A50 002F39B0 4E 80 04 21 */ bctrl +/* 802F6A50 002F39B0 4E 80 04 21 */ bctrl /* 802F6A54 002F39B4 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 802F6A58 002F39B8 CB E1 00 20 */ lfd f31, 0x20(r1) /* 802F6A5C 002F39BC E3 C1 00 18 */ psq_l f30, 24(r1), 0, qr0 @@ -101,7 +101,7 @@ lbl_805A9310: /* 802F6A6C 002F39CC 83 C1 00 08 */ lwz r30, 8(r1) /* 802F6A70 002F39D0 7C 08 03 A6 */ mtlr r0 /* 802F6A74 002F39D4 38 21 00 30 */ addi r1, r1, 0x30 -/* 802F6A78 002F39D8 4E 80 00 20 */ blr +/* 802F6A78 002F39D8 4E 80 00 20 */ blr .global VReverseSimplified__18CAnimTreeTweenBaseFv VReverseSimplified__18CAnimTreeTweenBaseFv: @@ -115,7 +115,7 @@ VReverseSimplified__18CAnimTreeTweenBaseFv: /* 802F6A98 002F39F8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802F6A9C 002F39FC 7C 08 03 A6 */ mtlr r0 /* 802F6AA0 002F3A00 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F6AA4 002F3A04 4E 80 00 20 */ blr +/* 802F6AA4 002F3A04 4E 80 00 20 */ blr .global VSimplified__18CAnimTreeTweenBaseFv VSimplified__18CAnimTreeTweenBaseFv: @@ -165,7 +165,7 @@ lbl_802F6B20: /* 802F6B50 002F3AB0 38 80 00 01 */ li r4, 1 /* 802F6B54 002F3AB4 81 8C 00 08 */ lwz r12, 8(r12) /* 802F6B58 002F3AB8 7D 89 03 A6 */ mtctr r12 -/* 802F6B5C 002F3ABC 4E 80 04 21 */ bctrl +/* 802F6B5C 002F3ABC 4E 80 04 21 */ bctrl lbl_802F6B60: /* 802F6B60 002F3AC0 38 00 00 00 */ li r0, 0 /* 802F6B64 002F3AC4 38 61 00 38 */ addi r3, r1, 0x38 @@ -201,7 +201,7 @@ lbl_802F6BA8: /* 802F6BD8 002F3B38 38 80 00 01 */ li r4, 1 /* 802F6BDC 002F3B3C 81 8C 00 08 */ lwz r12, 8(r12) /* 802F6BE0 002F3B40 7D 89 03 A6 */ mtctr r12 -/* 802F6BE4 002F3B44 4E 80 04 21 */ bctrl +/* 802F6BE4 002F3B44 4E 80 04 21 */ bctrl lbl_802F6BE8: /* 802F6BE8 002F3B48 8B A1 00 64 */ lbz r29, 0x64(r1) /* 802F6BEC 002F3B4C 38 60 00 00 */ li r3, 0 @@ -227,7 +227,7 @@ lbl_802F6BE8: /* 802F6C3C 002F3B9C 38 80 00 01 */ li r4, 1 /* 802F6C40 002F3BA0 81 8C 00 08 */ lwz r12, 8(r12) /* 802F6C44 002F3BA4 7D 89 03 A6 */ mtctr r12 -/* 802F6C48 002F3BA8 4E 80 04 21 */ bctrl +/* 802F6C48 002F3BA8 4E 80 04 21 */ bctrl lbl_802F6C4C: /* 802F6C4C 002F3BAC 88 01 00 64 */ lbz r0, 0x64(r1) /* 802F6C50 002F3BB0 38 60 00 00 */ li r3, 0 @@ -246,7 +246,7 @@ lbl_802F6C4C: /* 802F6C84 002F3BE4 38 80 00 01 */ li r4, 1 /* 802F6C88 002F3BE8 81 8C 00 08 */ lwz r12, 8(r12) /* 802F6C8C 002F3BEC 7D 89 03 A6 */ mtctr r12 -/* 802F6C90 002F3BF0 4E 80 04 21 */ bctrl +/* 802F6C90 002F3BF0 4E 80 04 21 */ bctrl lbl_802F6C94: /* 802F6C94 002F3BF4 38 00 00 00 */ li r0, 0 /* 802F6C98 002F3BF8 98 01 00 64 */ stb r0, 0x64(r1) @@ -265,7 +265,7 @@ lbl_802F6CA0: /* 802F6CC8 002F3C28 81 9F 00 00 */ lwz r12, 0(r31) /* 802F6CCC 002F3C2C 81 8C 00 08 */ lwz r12, 8(r12) /* 802F6CD0 002F3C30 7D 89 03 A6 */ mtctr r12 -/* 802F6CD4 002F3C34 4E 80 04 21 */ bctrl +/* 802F6CD4 002F3C34 4E 80 04 21 */ bctrl lbl_802F6CD8: /* 802F6CD8 002F3C38 28 1D 00 00 */ cmplwi r29, 0 /* 802F6CDC 002F3C3C 41 82 00 70 */ beq lbl_802F6D4C @@ -355,7 +355,7 @@ lbl_802F6DF4: /* 802F6E10 002F3D70 38 80 00 01 */ li r4, 1 /* 802F6E14 002F3D74 81 8C 00 08 */ lwz r12, 8(r12) /* 802F6E18 002F3D78 7D 89 03 A6 */ mtctr r12 -/* 802F6E1C 002F3D7C 4E 80 04 21 */ bctrl +/* 802F6E1C 002F3D7C 4E 80 04 21 */ bctrl lbl_802F6E20: /* 802F6E20 002F3D80 88 01 00 58 */ lbz r0, 0x58(r1) /* 802F6E24 002F3D84 28 00 00 00 */ cmplwi r0, 0 @@ -372,7 +372,7 @@ lbl_802F6E20: /* 802F6E50 002F3DB0 38 80 00 01 */ li r4, 1 /* 802F6E54 002F3DB4 81 8C 00 08 */ lwz r12, 8(r12) /* 802F6E58 002F3DB8 7D 89 03 A6 */ mtctr r12 -/* 802F6E5C 002F3DBC 4E 80 04 21 */ bctrl +/* 802F6E5C 002F3DBC 4E 80 04 21 */ bctrl lbl_802F6E60: /* 802F6E60 002F3DC0 88 01 00 64 */ lbz r0, 0x64(r1) /* 802F6E64 002F3DC4 38 60 00 00 */ li r3, 0 @@ -391,7 +391,7 @@ lbl_802F6E60: /* 802F6E98 002F3DF8 38 80 00 01 */ li r4, 1 /* 802F6E9C 002F3DFC 81 8C 00 08 */ lwz r12, 8(r12) /* 802F6EA0 002F3E00 7D 89 03 A6 */ mtctr r12 -/* 802F6EA4 002F3E04 4E 80 04 21 */ bctrl +/* 802F6EA4 002F3E04 4E 80 04 21 */ bctrl lbl_802F6EA8: /* 802F6EA8 002F3E08 38 00 00 00 */ li r0, 0 /* 802F6EAC 002F3E0C 98 01 00 64 */ stb r0, 0x64(r1) @@ -445,7 +445,7 @@ lbl_802F6F40: /* 802F6F5C 002F3EBC 38 80 00 01 */ li r4, 1 /* 802F6F60 002F3EC0 81 8C 00 08 */ lwz r12, 8(r12) /* 802F6F64 002F3EC4 7D 89 03 A6 */ mtctr r12 -/* 802F6F68 002F3EC8 4E 80 04 21 */ bctrl +/* 802F6F68 002F3EC8 4E 80 04 21 */ bctrl lbl_802F6F6C: /* 802F6F6C 002F3ECC 38 61 00 14 */ addi r3, r1, 0x14 /* 802F6F70 002F3ED0 4B D3 A0 31 */ bl sub_80030fa0 @@ -474,7 +474,7 @@ lbl_802F6FA8: /* 802F6FC4 002F3F24 38 80 00 01 */ li r4, 1 /* 802F6FC8 002F3F28 81 8C 00 08 */ lwz r12, 8(r12) /* 802F6FCC 002F3F2C 7D 89 03 A6 */ mtctr r12 -/* 802F6FD0 002F3F30 4E 80 04 21 */ bctrl +/* 802F6FD0 002F3F30 4E 80 04 21 */ bctrl lbl_802F6FD4: /* 802F6FD4 002F3F34 38 61 00 14 */ addi r3, r1, 0x14 /* 802F6FD8 002F3F38 4B D3 9F C9 */ bl sub_80030fa0 @@ -486,7 +486,7 @@ lbl_802F6FDC: /* 802F6FEC 002F3F4C 83 81 00 70 */ lwz r28, 0x70(r1) /* 802F6FF0 002F3F50 7C 08 03 A6 */ mtlr r0 /* 802F6FF4 002F3F54 38 21 00 80 */ addi r1, r1, 0x80 -/* 802F6FF8 002F3F58 4E 80 00 20 */ blr +/* 802F6FF8 002F3F58 4E 80 00 20 */ blr .global ShouldCullTree__18CAnimTreeTweenBaseFv ShouldCullTree__18CAnimTreeTweenBaseFv: @@ -496,7 +496,7 @@ ShouldCullTree__18CAnimTreeTweenBaseFv: /* 802F7008 002F3F68 7C A4 FE 70 */ srawi r4, r5, 0x1f /* 802F700C 002F3F6C 7C 00 28 10 */ subfc r0, r0, r5 /* 802F7010 002F3F70 7C 64 19 14 */ adde r3, r4, r3 -/* 802F7014 002F3F74 4E 80 00 20 */ blr +/* 802F7014 002F3F74 4E 80 00 20 */ blr .global GetBlendingWeight__18CAnimTreeTweenBaseCFv GetBlendingWeight__18CAnimTreeTweenBaseCFv: @@ -506,11 +506,11 @@ GetBlendingWeight__18CAnimTreeTweenBaseCFv: /* 802F7024 002F3F84 81 83 00 00 */ lwz r12, 0(r3) /* 802F7028 002F3F88 81 8C 00 7C */ lwz r12, 0x7c(r12) /* 802F702C 002F3F8C 7D 89 03 A6 */ mtctr r12 -/* 802F7030 002F3F90 4E 80 04 21 */ bctrl +/* 802F7030 002F3F90 4E 80 04 21 */ bctrl /* 802F7034 002F3F94 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F7038 002F3F98 7C 08 03 A6 */ mtlr r0 /* 802F703C 002F3F9C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F7040 002F3FA0 4E 80 00 20 */ blr +/* 802F7040 002F3FA0 4E 80 00 20 */ blr .global VGetRightChildWeight__18CAnimTreeTweenBaseCFv VGetRightChildWeight__18CAnimTreeTweenBaseCFv: @@ -521,7 +521,7 @@ VGetRightChildWeight__18CAnimTreeTweenBaseCFv: /* 802F7054 002F3FB4 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F7058 002F3FB8 7C 08 03 A6 */ mtlr r0 /* 802F705C 002F3FBC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F7060 002F3FC0 4E 80 00 20 */ blr +/* 802F7060 002F3FC0 4E 80 00 20 */ blr .global VGetSegStatementSet__18CAnimTreeTweenBaseCFRC10CSegIdListR16CSegStatementSetRC13CCharAnimTime VGetSegStatementSet__18CAnimTreeTweenBaseCFRC10CSegIdListR16CSegStatementSetRC13CCharAnimTime: @@ -565,7 +565,7 @@ lbl_802F70C4: /* 802F70F4 002F4054 81 83 00 00 */ lwz r12, 0(r3) /* 802F70F8 002F4058 81 8C 00 48 */ lwz r12, 0x48(r12) /* 802F70FC 002F405C 7D 89 03 A6 */ mtctr r12 -/* 802F7100 002F4060 4E 80 04 21 */ bctrl +/* 802F7100 002F4060 4E 80 04 21 */ bctrl /* 802F7104 002F4064 48 00 02 20 */ b lbl_802F7324 lbl_802F7108: /* 802F7108 002F4068 2C 00 00 03 */ cmpwi r0, 3 @@ -612,7 +612,7 @@ lbl_802F718C: /* 802F71A0 002F4100 81 83 00 00 */ lwz r12, 0(r3) /* 802F71A4 002F4104 81 8C 00 48 */ lwz r12, 0x48(r12) /* 802F71A8 002F4108 7D 89 03 A6 */ mtctr r12 -/* 802F71AC 002F410C 4E 80 04 21 */ bctrl +/* 802F71AC 002F410C 4E 80 04 21 */ bctrl /* 802F71B0 002F4110 38 61 00 10 */ addi r3, r1, 0x10 /* 802F71B4 002F4114 4B D3 9D ED */ bl sub_80030fa0 /* 802F71B8 002F4118 48 00 01 6C */ b lbl_802F7324 @@ -627,7 +627,7 @@ lbl_802F71BC: /* 802F71D8 002F4138 81 83 00 00 */ lwz r12, 0(r3) /* 802F71DC 002F413C 81 8C 00 48 */ lwz r12, 0x48(r12) /* 802F71E0 002F4140 7D 89 03 A6 */ mtctr r12 -/* 802F71E4 002F4144 4E 80 04 21 */ bctrl +/* 802F71E4 002F4144 4E 80 04 21 */ bctrl /* 802F71E8 002F4148 38 61 00 14 */ addi r3, r1, 0x14 /* 802F71EC 002F414C 48 00 61 81 */ bl __ct__21CStackSegStatementSetFv /* 802F71F0 002F4150 80 7F 00 18 */ lwz r3, 0x18(r31) @@ -638,7 +638,7 @@ lbl_802F71BC: /* 802F7204 002F4164 81 83 00 00 */ lwz r12, 0(r3) /* 802F7208 002F4168 81 8C 00 48 */ lwz r12, 0x48(r12) /* 802F720C 002F416C 7D 89 03 A6 */ mtctr r12 -/* 802F7210 002F4170 4E 80 04 21 */ bctrl +/* 802F7210 002F4170 4E 80 04 21 */ bctrl /* 802F7214 002F4174 C0 02 C6 C0 */ lfs f0, lbl_805AE3E0@sda21(r2) /* 802F7218 002F4178 3B C0 00 00 */ li r30, 0 /* 802F721C 002F417C 83 FC 00 04 */ lwz r31, 4(r28) @@ -725,7 +725,7 @@ lbl_802F7324: /* 802F7350 002F42B0 83 81 00 40 */ lwz r28, 0x40(r1) /* 802F7354 002F42B4 7C 08 03 A6 */ mtlr r0 /* 802F7358 002F42B8 38 21 00 70 */ addi r1, r1, 0x70 -/* 802F735C 002F42BC 4E 80 00 20 */ blr +/* 802F735C 002F42BC 4E 80 00 20 */ blr .global VGetSegStatementSet__18CAnimTreeTweenBaseCFRC10CSegIdListR16CSegStatementSet VGetSegStatementSet__18CAnimTreeTweenBaseCFRC10CSegIdListR16CSegStatementSet: @@ -769,7 +769,7 @@ lbl_802F73C4: /* 802F73F0 002F4350 81 83 00 00 */ lwz r12, 0(r3) /* 802F73F4 002F4354 81 8C 00 44 */ lwz r12, 0x44(r12) /* 802F73F8 002F4358 7D 89 03 A6 */ mtctr r12 -/* 802F73FC 002F435C 4E 80 04 21 */ bctrl +/* 802F73FC 002F435C 4E 80 04 21 */ bctrl /* 802F7400 002F4360 48 00 02 80 */ b lbl_802F7680 lbl_802F7404: /* 802F7404 002F4364 2C 00 00 03 */ cmpwi r0, 3 @@ -815,7 +815,7 @@ lbl_802F7488: /* 802F7498 002F43F8 81 83 00 00 */ lwz r12, 0(r3) /* 802F749C 002F43FC 81 8C 00 44 */ lwz r12, 0x44(r12) /* 802F74A0 002F4400 7D 89 03 A6 */ mtctr r12 -/* 802F74A4 002F4404 4E 80 04 21 */ bctrl +/* 802F74A4 002F4404 4E 80 04 21 */ bctrl /* 802F74A8 002F4408 38 61 00 10 */ addi r3, r1, 0x10 /* 802F74AC 002F440C 4B D3 9A F5 */ bl sub_80030fa0 /* 802F74B0 002F4410 48 00 01 D0 */ b lbl_802F7680 @@ -829,7 +829,7 @@ lbl_802F74B4: /* 802F74CC 002F442C 81 83 00 00 */ lwz r12, 0(r3) /* 802F74D0 002F4430 81 8C 00 44 */ lwz r12, 0x44(r12) /* 802F74D4 002F4434 7D 89 03 A6 */ mtctr r12 -/* 802F74D8 002F4438 4E 80 04 21 */ bctrl +/* 802F74D8 002F4438 4E 80 04 21 */ bctrl /* 802F74DC 002F443C 38 61 00 14 */ addi r3, r1, 0x14 /* 802F74E0 002F4440 48 00 5E 8D */ bl __ct__21CStackSegStatementSetFv /* 802F74E4 002F4444 80 7E 00 18 */ lwz r3, 0x18(r30) @@ -839,7 +839,7 @@ lbl_802F74B4: /* 802F74F4 002F4454 81 83 00 00 */ lwz r12, 0(r3) /* 802F74F8 002F4458 81 8C 00 44 */ lwz r12, 0x44(r12) /* 802F74FC 002F445C 7D 89 03 A6 */ mtctr r12 -/* 802F7500 002F4460 4E 80 04 21 */ bctrl +/* 802F7500 002F4460 4E 80 04 21 */ bctrl /* 802F7504 002F4464 C0 02 C6 C0 */ lfs f0, lbl_805AE3E0@sda21(r2) /* 802F7508 002F4468 3B C0 00 00 */ li r30, 0 /* 802F750C 002F446C 83 FC 00 04 */ lwz r31, 4(r28) @@ -956,7 +956,7 @@ lbl_802F7680: /* 802F76B4 002F4614 83 81 00 40 */ lwz r28, 0x40(r1) /* 802F76B8 002F4618 7C 08 03 A6 */ mtlr r0 /* 802F76BC 002F461C 38 21 00 80 */ addi r1, r1, 0x80 -/* 802F76C0 002F4620 4E 80 00 20 */ blr +/* 802F76C0 002F4620 4E 80 00 20 */ blr .global VGetRotation__18CAnimTreeTweenBaseCFRC6CSegId VGetRotation__18CAnimTreeTweenBaseCFRC6CSegId: @@ -985,7 +985,7 @@ VGetRotation__18CAnimTreeTweenBaseCFRC6CSegId: /* 802F771C 002F467C 81 84 00 00 */ lwz r12, 0(r4) /* 802F7720 002F4680 81 8C 00 24 */ lwz r12, 0x24(r12) /* 802F7724 002F4684 7D 89 03 A6 */ mtctr r12 -/* 802F7728 002F4688 4E 80 04 21 */ bctrl +/* 802F7728 002F4688 4E 80 04 21 */ bctrl /* 802F772C 002F468C 48 00 00 98 */ b lbl_802F77C4 lbl_802F7730: /* 802F7730 002F4690 80 9E 00 14 */ lwz r4, 0x14(r30) @@ -995,7 +995,7 @@ lbl_802F7730: /* 802F7740 002F46A0 81 84 00 00 */ lwz r12, 0(r4) /* 802F7744 002F46A4 81 8C 00 24 */ lwz r12, 0x24(r12) /* 802F7748 002F46A8 7D 89 03 A6 */ mtctr r12 -/* 802F774C 002F46AC 4E 80 04 21 */ bctrl +/* 802F774C 002F46AC 4E 80 04 21 */ bctrl /* 802F7750 002F46B0 C0 61 00 18 */ lfs f3, 0x18(r1) /* 802F7754 002F46B4 7F E5 FB 78 */ mr r5, r31 /* 802F7758 002F46B8 C0 41 00 1C */ lfs f2, 0x1c(r1) @@ -1011,7 +1011,7 @@ lbl_802F7730: /* 802F7780 002F46E0 81 84 00 00 */ lwz r12, 0(r4) /* 802F7784 002F46E4 81 8C 00 24 */ lwz r12, 0x24(r12) /* 802F7788 002F46E8 7D 89 03 A6 */ mtctr r12 -/* 802F778C 002F46EC 4E 80 04 21 */ bctrl +/* 802F778C 002F46EC 4E 80 04 21 */ bctrl /* 802F7790 002F46F0 C0 81 00 08 */ lfs f4, 8(r1) /* 802F7794 002F46F4 FC 20 F8 90 */ fmr f1, f31 /* 802F7798 002F46F8 C0 61 00 0C */ lfs f3, 0xc(r1) @@ -1034,7 +1034,7 @@ lbl_802F77C4: /* 802F77D8 002F4738 83 A1 00 54 */ lwz r29, 0x54(r1) /* 802F77DC 002F473C 7C 08 03 A6 */ mtlr r0 /* 802F77E0 002F4740 38 21 00 70 */ addi r1, r1, 0x70 -/* 802F77E4 002F4744 4E 80 00 20 */ blr +/* 802F77E4 002F4744 4E 80 00 20 */ blr .global VGetOffset__18CAnimTreeTweenBaseCFRC6CSegId VGetOffset__18CAnimTreeTweenBaseCFRC6CSegId: @@ -1069,7 +1069,7 @@ VGetOffset__18CAnimTreeTweenBaseCFRC6CSegId: /* 802F7858 002F47B8 81 84 00 00 */ lwz r12, 0(r4) /* 802F785C 002F47BC 81 8C 00 20 */ lwz r12, 0x20(r12) /* 802F7860 002F47C0 7D 89 03 A6 */ mtctr r12 -/* 802F7864 002F47C4 4E 80 04 21 */ bctrl +/* 802F7864 002F47C4 4E 80 04 21 */ bctrl /* 802F7868 002F47C8 48 00 00 88 */ b lbl_802F78F0 lbl_802F786C: /* 802F786C 002F47CC 80 9E 00 14 */ lwz r4, 0x14(r30) @@ -1079,7 +1079,7 @@ lbl_802F786C: /* 802F787C 002F47DC 81 84 00 00 */ lwz r12, 0(r4) /* 802F7880 002F47E0 81 8C 00 20 */ lwz r12, 0x20(r12) /* 802F7884 002F47E4 7D 89 03 A6 */ mtctr r12 -/* 802F7888 002F47E8 4E 80 04 21 */ bctrl +/* 802F7888 002F47E8 4E 80 04 21 */ bctrl /* 802F788C 002F47EC 80 9E 00 18 */ lwz r4, 0x18(r30) /* 802F7890 002F47F0 7F E5 FB 78 */ mr r5, r31 /* 802F7894 002F47F4 38 61 00 08 */ addi r3, r1, 8 @@ -1090,7 +1090,7 @@ lbl_802F786C: /* 802F78A8 002F4808 C3 81 00 1C */ lfs f28, 0x1c(r1) /* 802F78AC 002F480C 81 8C 00 20 */ lwz r12, 0x20(r12) /* 802F78B0 002F4810 7D 89 03 A6 */ mtctr r12 -/* 802F78B4 002F4814 4E 80 04 21 */ bctrl +/* 802F78B4 002F4814 4E 80 04 21 */ bctrl /* 802F78B8 002F4818 C0 22 C6 C0 */ lfs f1, lbl_805AE3E0@sda21(r2) /* 802F78BC 002F481C C0 01 00 08 */ lfs f0, 8(r1) /* 802F78C0 002F4820 C0 41 00 0C */ lfs f2, 0xc(r1) @@ -1120,7 +1120,7 @@ lbl_802F78F0: /* 802F791C 002F487C 83 A1 00 24 */ lwz r29, 0x24(r1) /* 802F7920 002F4880 7C 08 03 A6 */ mtlr r0 /* 802F7924 002F4884 38 21 00 70 */ addi r1, r1, 0x70 -/* 802F7928 002F4888 4E 80 00 20 */ blr +/* 802F7928 002F4888 4E 80 00 20 */ blr .global VHasOffset__18CAnimTreeTweenBaseCFRC6CSegId VHasOffset__18CAnimTreeTweenBaseCFRC6CSegId: @@ -1138,7 +1138,7 @@ VHasOffset__18CAnimTreeTweenBaseCFRC6CSegId: /* 802F7958 002F48B8 81 83 00 00 */ lwz r12, 0(r3) /* 802F795C 002F48BC 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 802F7960 002F48C0 7D 89 03 A6 */ mtctr r12 -/* 802F7964 002F48C4 4E 80 04 21 */ bctrl +/* 802F7964 002F48C4 4E 80 04 21 */ bctrl /* 802F7968 002F48C8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802F796C 002F48CC 41 82 00 2C */ beq lbl_802F7998 /* 802F7970 002F48D0 80 7D 00 18 */ lwz r3, 0x18(r29) @@ -1147,7 +1147,7 @@ VHasOffset__18CAnimTreeTweenBaseCFRC6CSegId: /* 802F797C 002F48DC 81 83 00 00 */ lwz r12, 0(r3) /* 802F7980 002F48E0 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 802F7984 002F48E4 7D 89 03 A6 */ mtctr r12 -/* 802F7988 002F48E8 4E 80 04 21 */ bctrl +/* 802F7988 002F48E8 4E 80 04 21 */ bctrl /* 802F798C 002F48EC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802F7990 002F48F0 41 82 00 08 */ beq lbl_802F7998 /* 802F7994 002F48F4 3B E0 00 01 */ li r31, 1 @@ -1159,7 +1159,7 @@ lbl_802F7998: /* 802F79A8 002F4908 83 A1 00 14 */ lwz r29, 0x14(r1) /* 802F79AC 002F490C 7C 08 03 A6 */ mtlr r0 /* 802F79B0 002F4910 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F79B4 002F4914 4E 80 00 20 */ blr +/* 802F79B4 002F4914 4E 80 00 20 */ blr .global __dt__18CAnimTreeTweenBaseFv __dt__18CAnimTreeTweenBaseFv: @@ -1191,7 +1191,7 @@ lbl_802F7A0C: /* 802F7A18 002F4978 83 C1 00 08 */ lwz r30, 8(r1) /* 802F7A1C 002F497C 7C 08 03 A6 */ mtlr r0 /* 802F7A20 002F4980 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F7A24 002F4984 4E 80 00 20 */ blr +/* 802F7A24 002F4984 4E 80 00 20 */ blr .global "__ct__18CAnimTreeTweenBaseFbRCQ24rstl25ncrc_ptr<13CAnimTreeNode>RCQ24rstl25ncrc_ptr<13CAnimTreeNode>iRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" "__ct__18CAnimTreeTweenBaseFbRCQ24rstl25ncrc_ptr<13CAnimTreeNode>RCQ24rstl25ncrc_ptr<13CAnimTreeNode>iRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>": diff --git a/asm/Kyoto/Animation/CAnimationManager.s b/asm/Kyoto/Animation/CAnimationManager.s index f62ca9e1..a20ca056 100644 --- a/asm/Kyoto/Animation/CAnimationManager.s +++ b/asm/Kyoto/Animation/CAnimationManager.s @@ -11,7 +11,7 @@ /* 802D6E00 002D3D60 80 01 00 14 */ lwz r0, 0x14(r1) /* 802D6E04 002D3D64 7C 08 03 A6 */ mtlr r0 /* 802D6E08 002D3D68 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D6E0C 002D3D6C 4E 80 00 20 */ blr +/* 802D6E0C 002D3D6C 4E 80 00 20 */ blr .global GetMetaAnimation__17CAnimationManagerCFUi GetMetaAnimation__17CAnimationManagerCFUi: @@ -31,7 +31,7 @@ GetMetaAnimation__17CAnimationManagerCFUi: /* 802D6E44 002D3DA4 81 83 00 00 */ lwz r12, 0(r3) /* 802D6E48 002D3DA8 81 8C 00 08 */ lwz r12, 8(r12) /* 802D6E4C 002D3DAC 7D 89 03 A6 */ mtctr r12 -/* 802D6E50 002D3DB0 4E 80 04 21 */ bctrl +/* 802D6E50 002D3DB0 4E 80 04 21 */ bctrl /* 802D6E54 002D3DB4 80 03 00 00 */ lwz r0, 0(r3) /* 802D6E58 002D3DB8 38 61 00 08 */ addi r3, r1, 8 /* 802D6E5C 002D3DBC 38 80 00 00 */ li r4, 0 @@ -46,7 +46,7 @@ GetMetaAnimation__17CAnimationManagerCFUi: /* 802D6E80 002D3DE0 83 C1 00 18 */ lwz r30, 0x18(r1) /* 802D6E84 002D3DE4 7C 08 03 A6 */ mtlr r0 /* 802D6E88 002D3DE8 38 21 00 20 */ addi r1, r1, 0x20 -/* 802D6E8C 002D3DEC 4E 80 00 20 */ blr +/* 802D6E8C 002D3DEC 4E 80 00 20 */ blr .global GetAnimationTree__17CAnimationManagerCFUiRC24CMetaAnimTreeBuildOrders GetAnimationTree__17CAnimationManagerCFUiRC24CMetaAnimTreeBuildOrders: @@ -70,7 +70,7 @@ GetAnimationTree__17CAnimationManagerCFUiRC24CMetaAnimTreeBuildOrders: /* 802D6ED4 002D3E34 81 83 00 00 */ lwz r12, 0(r3) /* 802D6ED8 002D3E38 81 8C 00 08 */ lwz r12, 8(r12) /* 802D6EDC 002D3E3C 7D 89 03 A6 */ mtctr r12 -/* 802D6EE0 002D3E40 4E 80 04 21 */ bctrl +/* 802D6EE0 002D3E40 4E 80 04 21 */ bctrl /* 802D6EE4 002D3E44 7C 7F 1B 78 */ mr r31, r3 /* 802D6EE8 002D3E48 38 61 00 08 */ addi r3, r1, 8 /* 802D6EEC 002D3E4C 38 80 00 00 */ li r4, 0 @@ -83,7 +83,7 @@ GetAnimationTree__17CAnimationManagerCFUiRC24CMetaAnimTreeBuildOrders: /* 802D6F08 002D3E68 81 84 00 00 */ lwz r12, 0(r4) /* 802D6F0C 002D3E6C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802D6F10 002D3E70 7D 89 03 A6 */ mtctr r12 -/* 802D6F14 002D3E74 4E 80 04 21 */ bctrl +/* 802D6F14 002D3E74 4E 80 04 21 */ bctrl /* 802D6F18 002D3E78 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D6F1C 002D3E7C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802D6F20 002D3E80 83 C1 00 18 */ lwz r30, 0x18(r1) diff --git a/asm/Kyoto/Animation/CAnimationSet.s b/asm/Kyoto/Animation/CAnimationSet.s index 45aa426b..636599a4 100644 --- a/asm/Kyoto/Animation/CAnimationSet.s +++ b/asm/Kyoto/Animation/CAnimationSet.s @@ -47,7 +47,7 @@ lbl_802D6F70: /* 802D6F70 002D3ED0 80 01 00 14 */ lwz r0, 0x14(r1) /* 802D6F74 002D3ED4 7C 08 03 A6 */ mtlr r0 /* 802D6F78 002D3ED8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D6F7C 002D3EDC 4E 80 00 20 */ blr +/* 802D6F7C 002D3EDC 4E 80 00 20 */ blr .global "__ct__Q24rstl52vector,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl17rmemory_allocator" "__ct__Q24rstl52vector,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl17rmemory_allocator": @@ -108,7 +108,7 @@ lbl_802D7034: /* 802D7044 002D3FA4 80 01 00 24 */ lwz r0, 0x24(r1) /* 802D7048 002D3FA8 7C 08 03 A6 */ mtlr r0 /* 802D704C 002D3FAC 38 21 00 20 */ addi r1, r1, 0x20 -/* 802D7050 002D3FB0 4E 80 00 20 */ blr +/* 802D7050 002D3FB0 4E 80 00 20 */ blr .global StreamHalfTransitions__13CAnimationSetFUsR12CInputStream StreamHalfTransitions__13CAnimationSetFUsR12CInputStream: @@ -131,7 +131,7 @@ lbl_802D708C: /* 802D708C 002D3FEC 80 01 00 14 */ lwz r0, 0x14(r1) /* 802D7090 002D3FF0 7C 08 03 A6 */ mtlr r0 /* 802D7094 002D3FF4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D7098 002D3FF8 4E 80 00 20 */ blr +/* 802D7098 002D3FF8 4E 80 00 20 */ blr .global "__ct__Q24rstl52vector<15CHalfTransition,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl17rmemory_allocator" "__ct__Q24rstl52vector<15CHalfTransition,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl17rmemory_allocator": @@ -205,7 +205,7 @@ lbl_802D7180: /* 802D7190 002D40F0 80 01 00 34 */ lwz r0, 0x34(r1) /* 802D7194 002D40F4 7C 08 03 A6 */ mtlr r0 /* 802D7198 002D40F8 38 21 00 30 */ addi r1, r1, 0x30 -/* 802D719C 002D40FC 4E 80 00 20 */ blr +/* 802D719C 002D40FC 4E 80 00 20 */ blr .global "Get<15CHalfTransition>__12CInputStreamFRC24TType<15CHalfTransition>" "Get<15CHalfTransition>__12CInputStreamFRC24TType<15CHalfTransition>": @@ -223,7 +223,7 @@ lbl_802D7180: /* 802D71CC 002D412C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802D71D0 002D4130 7C 08 03 A6 */ mtlr r0 /* 802D71D4 002D4134 38 21 00 20 */ addi r1, r1, 0x20 -/* 802D71D8 002D4138 4E 80 00 20 */ blr +/* 802D71D8 002D4138 4E 80 00 20 */ blr .global "cinput_stream_helper<15CHalfTransition>__FRC24TType<15CHalfTransition>R12CInputStream" "cinput_stream_helper<15CHalfTransition>__FRC24TType<15CHalfTransition>R12CInputStream": @@ -235,7 +235,7 @@ lbl_802D7180: /* 802D71F0 002D4150 80 01 00 14 */ lwz r0, 0x14(r1) /* 802D71F4 002D4154 7C 08 03 A6 */ mtlr r0 /* 802D71F8 002D4158 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D71FC 002D415C 4E 80 00 20 */ blr +/* 802D71FC 002D415C 4E 80 00 20 */ blr .global StreamDefaultAdditiveAnimInfo__13CAnimationSetFUsR12CInputStream StreamDefaultAdditiveAnimInfo__13CAnimationSetFUsR12CInputStream: @@ -266,7 +266,7 @@ lbl_802D7250: /* 802D7258 002D41B8 83 C1 00 08 */ lwz r30, 8(r1) /* 802D725C 002D41BC 7C 08 03 A6 */ mtlr r0 /* 802D7260 002D41C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D7264 002D41C4 4E 80 00 20 */ blr +/* 802D7264 002D41C4 4E 80 00 20 */ blr .global StreamAdditiveAnimInfoList__13CAnimationSetFUsR12CInputStream StreamAdditiveAnimInfoList__13CAnimationSetFUsR12CInputStream: @@ -289,7 +289,7 @@ lbl_802D72A0: /* 802D72A0 002D4200 80 01 00 14 */ lwz r0, 0x14(r1) /* 802D72A4 002D4204 7C 08 03 A6 */ mtlr r0 /* 802D72A8 002D4208 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D72AC 002D420C 4E 80 00 20 */ blr +/* 802D72AC 002D420C 4E 80 00 20 */ blr .global "__ct__Q24rstl77vector,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl17rmemory_allocator" "__ct__Q24rstl77vector,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl17rmemory_allocator": @@ -355,7 +355,7 @@ lbl_802D7378: /* 802D7388 002D42E8 80 01 00 34 */ lwz r0, 0x34(r1) /* 802D738C 002D42EC 7C 08 03 A6 */ mtlr r0 /* 802D7390 002D42F0 38 21 00 30 */ addi r1, r1, 0x30 -/* 802D7394 002D42F4 4E 80 00 20 */ blr +/* 802D7394 002D42F4 4E 80 00 20 */ blr .global "Get>__12CInputStreamFRC49TType>" "Get>__12CInputStreamFRC49TType>": @@ -384,7 +384,7 @@ lbl_802D7378: /* 802D73F0 002D4350 83 C1 00 18 */ lwz r30, 0x18(r1) /* 802D73F4 002D4354 7C 08 03 A6 */ mtlr r0 /* 802D73F8 002D4358 38 21 00 20 */ addi r1, r1, 0x20 -/* 802D73FC 002D435C 4E 80 00 20 */ blr +/* 802D73FC 002D435C 4E 80 00 20 */ blr .global __ct__13CAnimationSetFR12CInputStream __ct__13CAnimationSetFR12CInputStream: @@ -626,7 +626,7 @@ lbl_802D7740: /* 802D774C 002D46AC 83 C1 00 78 */ lwz r30, 0x78(r1) /* 802D7750 002D46B0 7C 08 03 A6 */ mtlr r0 /* 802D7754 002D46B4 38 21 00 80 */ addi r1, r1, 0x80 -/* 802D7758 002D46B8 4E 80 00 20 */ blr +/* 802D7758 002D46B8 4E 80 00 20 */ blr .global "__dt__Q24rstl52vector<15CHalfTransition,Q24rstl17rmemory_allocator>Fv" "__dt__Q24rstl52vector<15CHalfTransition,Q24rstl17rmemory_allocator>Fv": @@ -679,7 +679,7 @@ lbl_802D77EC: /* 802D7800 002D4760 83 81 00 20 */ lwz r28, 0x20(r1) /* 802D7804 002D4764 7C 08 03 A6 */ mtlr r0 /* 802D7808 002D4768 38 21 00 30 */ addi r1, r1, 0x30 -/* 802D780C 002D476C 4E 80 00 20 */ blr +/* 802D780C 002D476C 4E 80 00 20 */ blr .global sub_802d7810 sub_802d7810: @@ -732,7 +732,7 @@ lbl_802D78A0: /* 802D78B4 002D4814 83 81 00 20 */ lwz r28, 0x20(r1) /* 802D78B8 002D4818 7C 08 03 A6 */ mtlr r0 /* 802D78BC 002D481C 38 21 00 30 */ addi r1, r1, 0x30 -/* 802D78C0 002D4820 4E 80 00 20 */ blr +/* 802D78C0 002D4820 4E 80 00 20 */ blr .global "__ct__Q24rstl48vector<11CTransition,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl17rmemory_allocator" "__ct__Q24rstl48vector<11CTransition,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl17rmemory_allocator": @@ -810,7 +810,7 @@ lbl_802D79B8: /* 802D79C8 002D4928 80 01 00 44 */ lwz r0, 0x44(r1) /* 802D79CC 002D492C 7C 08 03 A6 */ mtlr r0 /* 802D79D0 002D4930 38 21 00 40 */ addi r1, r1, 0x40 -/* 802D79D4 002D4934 4E 80 00 20 */ blr +/* 802D79D4 002D4934 4E 80 00 20 */ blr .global "Get<11CTransition>__12CInputStreamFRC20TType<11CTransition>" "Get<11CTransition>__12CInputStreamFRC20TType<11CTransition>": @@ -828,7 +828,7 @@ lbl_802D79B8: /* 802D7A04 002D4964 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802D7A08 002D4968 7C 08 03 A6 */ mtlr r0 /* 802D7A0C 002D496C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802D7A10 002D4970 4E 80 00 20 */ blr +/* 802D7A10 002D4970 4E 80 00 20 */ blr .global "cinput_stream_helper<11CTransition>__FRC20TType<11CTransition>R12CInputStream" "cinput_stream_helper<11CTransition>__FRC20TType<11CTransition>R12CInputStream": @@ -840,7 +840,7 @@ lbl_802D79B8: /* 802D7A28 002D4988 80 01 00 14 */ lwz r0, 0x14(r1) /* 802D7A2C 002D498C 7C 08 03 A6 */ mtlr r0 /* 802D7A30 002D4990 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D7A34 002D4994 4E 80 00 20 */ blr +/* 802D7A34 002D4994 4E 80 00 20 */ blr .global sub_802d7a38 sub_802d7a38: @@ -898,7 +898,7 @@ lbl_802D7AD8: /* 802D7AEC 002D4A4C 83 81 00 20 */ lwz r28, 0x20(r1) /* 802D7AF0 002D4A50 7C 08 03 A6 */ mtlr r0 /* 802D7AF4 002D4A54 38 21 00 30 */ addi r1, r1, 0x30 -/* 802D7AF8 002D4A58 4E 80 00 20 */ blr +/* 802D7AF8 002D4A58 4E 80 00 20 */ blr .global "__ct__Q24rstl47vector<10CAnimation,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl17rmemory_allocator" "__ct__Q24rstl47vector<10CAnimation,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl17rmemory_allocator": @@ -975,7 +975,7 @@ lbl_802D7BEC: /* 802D7BFC 002D4B5C 80 01 00 44 */ lwz r0, 0x44(r1) /* 802D7C00 002D4B60 7C 08 03 A6 */ mtlr r0 /* 802D7C04 002D4B64 38 21 00 40 */ addi r1, r1, 0x40 -/* 802D7C08 002D4B68 4E 80 00 20 */ blr +/* 802D7C08 002D4B68 4E 80 00 20 */ blr .global "Get<10CAnimation>__12CInputStreamFRC19TType<10CAnimation>" "Get<10CAnimation>__12CInputStreamFRC19TType<10CAnimation>": @@ -993,7 +993,7 @@ lbl_802D7BEC: /* 802D7C38 002D4B98 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802D7C3C 002D4B9C 7C 08 03 A6 */ mtlr r0 /* 802D7C40 002D4BA0 38 21 00 20 */ addi r1, r1, 0x20 -/* 802D7C44 002D4BA4 4E 80 00 20 */ blr +/* 802D7C44 002D4BA4 4E 80 00 20 */ blr .global "cinput_stream_helper<10CAnimation>__FRC19TType<10CAnimation>R12CInputStream" "cinput_stream_helper<10CAnimation>__FRC19TType<10CAnimation>R12CInputStream": @@ -1005,7 +1005,7 @@ lbl_802D7BEC: /* 802D7C5C 002D4BBC 80 01 00 14 */ lwz r0, 0x14(r1) /* 802D7C60 002D4BC0 7C 08 03 A6 */ mtlr r0 /* 802D7C64 002D4BC4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D7C68 002D4BC8 4E 80 00 20 */ blr +/* 802D7C68 002D4BC8 4E 80 00 20 */ blr .global "reserve__Q24rstl47vector<10CAnimation,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl47vector<10CAnimation,Q24rstl17rmemory_allocator>Fi": @@ -1092,7 +1092,7 @@ lbl_802D7D7C: /* 802D7D80 002D4CE0 80 01 00 34 */ lwz r0, 0x34(r1) /* 802D7D84 002D4CE4 7C 08 03 A6 */ mtlr r0 /* 802D7D88 002D4CE8 38 21 00 30 */ addi r1, r1, 0x30 -/* 802D7D8C 002D4CEC 4E 80 00 20 */ blr +/* 802D7D8C 002D4CEC 4E 80 00 20 */ blr .global "reserve__Q24rstl48vector<11CTransition,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl48vector<11CTransition,Q24rstl17rmemory_allocator>Fi": @@ -1176,7 +1176,7 @@ lbl_802D7E98: /* 802D7E9C 002D4DFC 80 01 00 34 */ lwz r0, 0x34(r1) /* 802D7EA0 002D4E00 7C 08 03 A6 */ mtlr r0 /* 802D7EA4 002D4E04 38 21 00 30 */ addi r1, r1, 0x30 -/* 802D7EA8 002D4E08 4E 80 00 20 */ blr +/* 802D7EA8 002D4E08 4E 80 00 20 */ blr .global "reserve__Q24rstl52vector<15CHalfTransition,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl52vector<15CHalfTransition,Q24rstl17rmemory_allocator>Fi": @@ -1256,7 +1256,7 @@ lbl_802D7FA4: /* 802D7FA8 002D4F08 80 01 00 34 */ lwz r0, 0x34(r1) /* 802D7FAC 002D4F0C 7C 08 03 A6 */ mtlr r0 /* 802D7FB0 002D4F10 38 21 00 30 */ addi r1, r1, 0x30 -/* 802D7FB4 002D4F14 4E 80 00 20 */ blr +/* 802D7FB4 002D4F14 4E 80 00 20 */ blr .global "reserve__Q24rstl77vector,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl77vector,Q24rstl17rmemory_allocator>Fi": @@ -1332,5 +1332,5 @@ lbl_802D809C: /* 802D80A8 002D5008 83 A1 00 24 */ lwz r29, 0x24(r1) /* 802D80AC 002D500C 7C 08 03 A6 */ mtlr r0 /* 802D80B0 002D5010 38 21 00 30 */ addi r1, r1, 0x30 -/* 802D80B4 002D5014 4E 80 00 20 */ blr +/* 802D80B4 002D5014 4E 80 00 20 */ blr diff --git a/asm/Kyoto/Animation/CBoolPOINode.s b/asm/Kyoto/Animation/CBoolPOINode.s index 16bed248..cc95d182 100644 --- a/asm/Kyoto/Animation/CBoolPOINode.s +++ b/asm/Kyoto/Animation/CBoolPOINode.s @@ -43,7 +43,7 @@ CopyNodeMinusStartTime__12CBoolPOINodeFRC12CBoolPOINodeRC13CCharAnimTime: /* 802F7B44 002F4AA4 83 81 00 30 */ lwz r28, 0x30(r1) /* 802F7B48 002F4AA8 7C 08 03 A6 */ mtlr r0 /* 802F7B4C 002F4AAC 38 21 00 40 */ addi r1, r1, 0x40 -/* 802F7B50 002F4AB0 4E 80 00 20 */ blr +/* 802F7B50 002F4AB0 4E 80 00 20 */ blr .global __ct__12CBoolPOINodeFR12CInputStream __ct__12CBoolPOINodeFR12CInputStream: diff --git a/asm/Kyoto/Animation/CCharAnimMemoryMetrics.s b/asm/Kyoto/Animation/CCharAnimMemoryMetrics.s index b7d71999..46bd70af 100644 --- a/asm/Kyoto/Animation/CCharAnimMemoryMetrics.s +++ b/asm/Kyoto/Animation/CCharAnimMemoryMetrics.s @@ -13,14 +13,14 @@ SubtractFromTotalSize__22CCharAnimMemoryMetricsFUiQ222CCharAnimMemoryMetrics14EA /* 802F7BA8 002F4B08 80 0D A7 58 */ lwz r0, lbl_805A9318@sda21(r13) /* 802F7BAC 002F4B0C 7C 03 00 50 */ subf r0, r3, r0 /* 802F7BB0 002F4B10 90 0D A7 58 */ stw r0, lbl_805A9318@sda21(r13) -/* 802F7BB4 002F4B14 4E 80 00 20 */ blr +/* 802F7BB4 002F4B14 4E 80 00 20 */ blr .global AddToTotalSize__22CCharAnimMemoryMetricsFUiQ222CCharAnimMemoryMetrics14EAnimSubSystem AddToTotalSize__22CCharAnimMemoryMetricsFUiQ222CCharAnimMemoryMetrics14EAnimSubSystem: /* 802F7BB8 002F4B18 80 0D A7 58 */ lwz r0, lbl_805A9318@sda21(r13) /* 802F7BBC 002F4B1C 7C 00 1A 14 */ add r0, r0, r3 /* 802F7BC0 002F4B20 90 0D A7 58 */ stw r0, lbl_805A9318@sda21(r13) -/* 802F7BC4 002F4B24 4E 80 00 20 */ blr +/* 802F7BC4 002F4B24 4E 80 00 20 */ blr .global sub_802f7bc8 sub_802f7bc8: diff --git a/asm/Kyoto/Animation/CCharAnimTime.s b/asm/Kyoto/Animation/CCharAnimTime.s index 92236147..06b8a2d2 100644 --- a/asm/Kyoto/Animation/CCharAnimTime.s +++ b/asm/Kyoto/Animation/CCharAnimTime.s @@ -76,7 +76,7 @@ PutTo__13CCharAnimTimeCFR13COutputStream: /* 803483A0 00345300 83 C1 00 18 */ lwz r30, 0x18(r1) /* 803483A4 00345304 7C 08 03 A6 */ mtlr r0 /* 803483A8 00345308 38 21 00 20 */ addi r1, r1, 0x20 -/* 803483AC 0034530C 4E 80 00 20 */ blr +/* 803483AC 0034530C 4E 80 00 20 */ blr .global EqualsZero__13CCharAnimTimeCFv EqualsZero__13CCharAnimTimeCFv: @@ -96,7 +96,7 @@ lbl_803483E0: /* 803483E0 00345340 38 00 00 01 */ li r0, 1 lbl_803483E4: /* 803483E4 00345344 7C 03 03 78 */ mr r3, r0 -/* 803483E8 00345348 4E 80 00 20 */ blr +/* 803483E8 00345348 4E 80 00 20 */ blr .global GreaterThanZero__13CCharAnimTimeCFv GreaterThanZero__13CCharAnimTimeCFv: @@ -121,7 +121,7 @@ lbl_80348428: /* 8034842C 0034538C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80348430 00345390 7C 08 03 A6 */ mtlr r0 /* 80348434 00345394 38 21 00 10 */ addi r1, r1, 0x10 -/* 80348438 00345398 4E 80 00 20 */ blr +/* 80348438 00345398 4E 80 00 20 */ blr .global __ge__13CCharAnimTimeCFRC13CCharAnimTime __ge__13CCharAnimTimeCFRC13CCharAnimTime: @@ -152,7 +152,7 @@ lbl_80348484: /* 80348494 003453F4 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80348498 003453F8 7C 08 03 A6 */ mtlr r0 /* 8034849C 003453FC 38 21 00 20 */ addi r1, r1, 0x20 -/* 803484A0 00345400 4E 80 00 20 */ blr +/* 803484A0 00345400 4E 80 00 20 */ blr .global __le__13CCharAnimTimeCFRC13CCharAnimTime __le__13CCharAnimTimeCFRC13CCharAnimTime: @@ -183,7 +183,7 @@ lbl_803484EC: /* 803484FC 0034545C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80348500 00345460 7C 08 03 A6 */ mtlr r0 /* 80348504 00345464 38 21 00 20 */ addi r1, r1, 0x20 -/* 80348508 00345468 4E 80 00 20 */ blr +/* 80348508 00345468 4E 80 00 20 */ blr .global __ami__13CCharAnimTimeFRC13CCharAnimTime __ami__13CCharAnimTimeFRC13CCharAnimTime: @@ -205,7 +205,7 @@ __ami__13CCharAnimTimeFRC13CCharAnimTime: /* 80348548 003454A8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8034854C 003454AC 7C 08 03 A6 */ mtlr r0 /* 80348550 003454B0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80348554 003454B4 4E 80 00 20 */ blr +/* 80348554 003454B4 4E 80 00 20 */ blr .global __apl__13CCharAnimTimeFRC13CCharAnimTime __apl__13CCharAnimTimeFRC13CCharAnimTime: @@ -227,7 +227,7 @@ __apl__13CCharAnimTimeFRC13CCharAnimTime: /* 80348594 003454F4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80348598 003454F8 7C 08 03 A6 */ mtlr r0 /* 8034859C 003454FC 38 21 00 20 */ addi r1, r1, 0x20 -/* 803485A0 00345500 4E 80 00 20 */ blr +/* 803485A0 00345500 4E 80 00 20 */ blr .global __pl__13CCharAnimTimeCFRC13CCharAnimTime __pl__13CCharAnimTimeCFRC13CCharAnimTime: @@ -361,7 +361,7 @@ lbl_80348748: /* 80348754 003456B4 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80348758 003456B8 7C 08 03 A6 */ mtlr r0 /* 8034875C 003456BC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80348760 003456C0 4E 80 00 20 */ blr +/* 80348760 003456C0 4E 80 00 20 */ blr .global __mi__13CCharAnimTimeCFRC13CCharAnimTime __mi__13CCharAnimTimeCFRC13CCharAnimTime: @@ -480,7 +480,7 @@ lbl_803488D8: /* 803488E4 00345844 83 A1 00 14 */ lwz r29, 0x14(r1) /* 803488E8 00345848 7C 08 03 A6 */ mtlr r0 /* 803488EC 0034584C 38 21 00 20 */ addi r1, r1, 0x20 -/* 803488F0 00345850 4E 80 00 20 */ blr +/* 803488F0 00345850 4E 80 00 20 */ blr .global __ml__13CCharAnimTimeCFRCf __ml__13CCharAnimTimeCFRCf: @@ -567,7 +567,7 @@ lbl_803489FC: /* 80348A08 00345968 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80348A0C 0034596C 7C 08 03 A6 */ mtlr r0 /* 80348A10 00345970 38 21 00 20 */ addi r1, r1, 0x20 -/* 80348A14 00345974 4E 80 00 20 */ blr +/* 80348A14 00345974 4E 80 00 20 */ blr .global __dv__13CCharAnimTimeCFRC13CCharAnimTime __dv__13CCharAnimTimeCFRC13CCharAnimTime: @@ -593,7 +593,7 @@ lbl_80348A54: /* 80348A5C 003459BC 83 C1 00 08 */ lwz r30, 8(r1) /* 80348A60 003459C0 7C 08 03 A6 */ mtlr r0 /* 80348A64 003459C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80348A68 003459C8 4E 80 00 20 */ blr +/* 80348A68 003459C8 4E 80 00 20 */ blr .global __gt__13CCharAnimTimeCFRC13CCharAnimTime __gt__13CCharAnimTimeCFRC13CCharAnimTime: @@ -623,7 +623,7 @@ lbl_80348AB4: /* 80348AC4 00345A24 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80348AC8 00345A28 7C 08 03 A6 */ mtlr r0 /* 80348ACC 00345A2C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80348AD0 00345A30 4E 80 00 20 */ blr +/* 80348AD0 00345A30 4E 80 00 20 */ blr .global __ne__13CCharAnimTimeCFRC13CCharAnimTime __ne__13CCharAnimTimeCFRC13CCharAnimTime: @@ -637,7 +637,7 @@ __ne__13CCharAnimTimeCFRC13CCharAnimTime: /* 80348AF0 00345A50 80 01 00 14 */ lwz r0, 0x14(r1) /* 80348AF4 00345A54 7C 08 03 A6 */ mtlr r0 /* 80348AF8 00345A58 38 21 00 10 */ addi r1, r1, 0x10 -/* 80348AFC 00345A5C 4E 80 00 20 */ blr +/* 80348AFC 00345A5C 4E 80 00 20 */ blr .global __eq__13CCharAnimTimeCFRC13CCharAnimTime __eq__13CCharAnimTimeCFRC13CCharAnimTime: @@ -731,7 +731,7 @@ lbl_80348C24: /* 80348C2C 00345B8C 83 C1 00 08 */ lwz r30, 8(r1) /* 80348C30 00345B90 7C 08 03 A6 */ mtlr r0 /* 80348C34 00345B94 38 21 00 10 */ addi r1, r1, 0x10 -/* 80348C38 00345B98 4E 80 00 20 */ blr +/* 80348C38 00345B98 4E 80 00 20 */ blr .global __lt__13CCharAnimTimeCFRC13CCharAnimTime __lt__13CCharAnimTimeCFRC13CCharAnimTime: @@ -857,7 +857,7 @@ lbl_80348DD4: /* 80348DDC 00345D3C 83 C1 00 08 */ lwz r30, 8(r1) /* 80348DE0 00345D40 7C 08 03 A6 */ mtlr r0 /* 80348DE4 00345D44 38 21 00 10 */ addi r1, r1, 0x10 -/* 80348DE8 00345D48 4E 80 00 20 */ blr +/* 80348DE8 00345D48 4E 80 00 20 */ blr .global __ct__13CCharAnimTimeFf __ct__13CCharAnimTimeFf: @@ -867,11 +867,11 @@ __ct__13CCharAnimTimeFf: /* 80348DF8 00345D58 40 82 00 10 */ bne lbl_80348E08 /* 80348DFC 00345D5C 38 00 00 02 */ li r0, 2 /* 80348E00 00345D60 90 03 00 04 */ stw r0, 4(r3) -/* 80348E04 00345D64 4E 80 00 20 */ blr +/* 80348E04 00345D64 4E 80 00 20 */ blr lbl_80348E08: /* 80348E08 00345D68 38 00 00 00 */ li r0, 0 /* 80348E0C 00345D6C 90 03 00 04 */ stw r0, 4(r3) -/* 80348E10 00345D70 4E 80 00 20 */ blr +/* 80348E10 00345D70 4E 80 00 20 */ blr .global __ct__13CCharAnimTimeFR12CInputStream __ct__13CCharAnimTimeFR12CInputStream: diff --git a/asm/Kyoto/Animation/CCharLayoutInfo.s b/asm/Kyoto/Animation/CCharLayoutInfo.s index c9bf6ef5..ae0b75e0 100644 --- a/asm/Kyoto/Animation/CCharLayoutInfo.s +++ b/asm/Kyoto/Animation/CCharLayoutInfo.s @@ -91,7 +91,7 @@ lbl_802F7CCC: /* 802F7CD4 002F4C34 83 C1 00 18 */ lwz r30, 0x18(r1) /* 802F7CD8 002F4C38 7C 08 03 A6 */ mtlr r0 /* 802F7CDC 002F4C3C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F7CE0 002F4C40 4E 80 00 20 */ blr +/* 802F7CE0 002F4C40 4E 80 00 20 */ blr .global "find__Q24rstl430red_black_tree,Q24rstl17rmemory_allocator>,Q24rstl89pair,Q24rstl17rmemory_allocator>,6CSegId>,0,Q24rstl109select1st,Q24rstl17rmemory_allocator>,6CSegId>>,Q24rstl81less,Q24rstl17rmemory_allocator>>,Q24rstl17rmemory_allocator>CFRCQ24rstl66basic_string,Q24rstl17rme" "find__Q24rstl430red_black_tree,Q24rstl17rmemory_allocator>,Q24rstl89pair,Q24rstl17rmemory_allocator>,6CSegId>,0,Q24rstl109select1st,Q24rstl17rmemory_allocator>,6CSegId>>,Q24rstl81less,Q24rstl17rmemory_allocator>>,Q24rstl17rmemory_allocator>CFRCQ24rstl66basic_string,Q24rstl17rme": @@ -113,7 +113,7 @@ lbl_802F7CCC: /* 802F7D20 002F4C80 83 C1 00 08 */ lwz r30, 8(r1) /* 802F7D24 002F4C84 7C 08 03 A6 */ mtlr r0 /* 802F7D28 002F4C88 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F7D2C 002F4C8C 4E 80 00 20 */ blr +/* 802F7D2C 002F4C8C 4E 80 00 20 */ blr .global "find_node__Q24rstl430red_black_tree,Q24rstl17rmemory_allocator>,Q24rstl89pair,Q24rstl17rmemory_allocator>,6CSegId>,0,Q24rstl109select1st,Q24rstl17rmemory_allocator>,6CSegId>>,Q24rstl81less,Q24rstl17rmemory_allocator>>,Q24rstl17rmemory_allocator>CFRCQ24rstl66basic_string,Q24rstl" "find_node__Q24rstl430red_black_tree,Q24rstl17rmemory_allocator>,Q24rstl89pair,Q24rstl17rmemory_allocator>,6CSegId>,0,Q24rstl109select1st,Q24rstl17rmemory_allocator>,6CSegId>>,Q24rstl81less,Q24rstl17rmemory_allocator>>,Q24rstl17rmemory_allocator>CFRCQ24rstl66basic_string,Q24rstl": @@ -170,7 +170,7 @@ lbl_802F7DCC: /* 802F7DDC 002F4D3C 83 81 00 10 */ lwz r28, 0x10(r1) /* 802F7DE0 002F4D40 7C 08 03 A6 */ mtlr r0 /* 802F7DE4 002F4D44 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F7DE8 002F4D48 4E 80 00 20 */ blr +/* 802F7DE8 002F4D48 4E 80 00 20 */ blr .global __ct__15CCharLayoutInfoFR12CInputStream __ct__15CCharLayoutInfoFR12CInputStream: @@ -218,7 +218,7 @@ lbl_802F7E5C: /* 802F7E88 002F4DE8 83 C1 00 18 */ lwz r30, 0x18(r1) /* 802F7E8C 002F4DEC 7C 08 03 A6 */ mtlr r0 /* 802F7E90 002F4DF0 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F7E94 002F4DF4 4E 80 00 20 */ blr +/* 802F7E94 002F4DF4 4E 80 00 20 */ blr .global "__ct__Q24rstl206map,Q24rstl17rmemory_allocator>,6CSegId,Q24rstl81less,Q24rstl17rmemory_allocator>>,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl81less,Q24rstl17rmemory_allocator>>RCQ24rstl17rmemory_allocator" "__ct__Q24rstl206map,Q24rstl17rmemory_allocator>,6CSegId,Q24rstl81less,Q24rstl17rmemory_allocator>>,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl81less,Q24rstl17rmemory_allocator>>RCQ24rstl17rmemory_allocator": @@ -237,7 +237,7 @@ lbl_802F7E5C: /* 802F7EC8 002F4E28 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802F7ECC 002F4E2C 7C 08 03 A6 */ mtlr r0 /* 802F7ED0 002F4E30 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F7ED4 002F4E34 4E 80 00 20 */ blr +/* 802F7ED4 002F4E34 4E 80 00 20 */ blr .global "__ct__Q24rstl430red_black_tree,Q24rstl17rmemory_allocator>,Q24rstl89pair,Q24rstl17rmemory_allocator>,6CSegId>,0,Q24rstl109select1st,Q24rstl17rmemory_allocator>,6CSegId>>,Q24rstl81less,Q24rstl17rmemory_allocator>>,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl109select1st,Q24rstl17rmemory_allocator>,Q24rstl89pair,Q24rstl17rmemory_allocator>,6CSegId>,0,Q24rstl109select1st,Q24rstl17rmemory_allocator>,6CSegId>>,Q24rstl81less,Q24rstl17rmemory_allocator>>,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl109select1st,Q24rstl17rmemory_allocator>,6CSegId>>__12CInputStreamFRC105TType,Q24rstl17rmemory_allocator>,6CSegId>>" "Get,Q24rstl17rmemory_allocator>,6CSegId>>__12CInputStreamFRC105TType,Q24rstl17rmemory_allocator>,6CSegId>>": @@ -303,7 +303,7 @@ lbl_802F7F64: /* 802F7FB0 002F4F10 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802F7FB4 002F4F14 7C 08 03 A6 */ mtlr r0 /* 802F7FB8 002F4F18 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F7FBC 002F4F1C 4E 80 00 20 */ blr +/* 802F7FBC 002F4F1C 4E 80 00 20 */ blr .global "cinput_stream_helper,Q24rstl17rmemory_allocator>,6CSegId>>__FRC105TType,Q24rstl17rmemory_allocator>,6CSegId>>R12CInputStream" "cinput_stream_helper,Q24rstl17rmemory_allocator>,6CSegId>>__FRC105TType,Q24rstl17rmemory_allocator>,6CSegId>>R12CInputStream": @@ -334,7 +334,7 @@ lbl_802F7F64: /* 802F8020 002F4F80 83 C1 00 28 */ lwz r30, 0x28(r1) /* 802F8024 002F4F84 7C 08 03 A6 */ mtlr r0 /* 802F8028 002F4F88 38 21 00 30 */ addi r1, r1, 0x30 -/* 802F802C 002F4F8C 4E 80 00 20 */ blr +/* 802F802C 002F4F8C 4E 80 00 20 */ blr .global "__ct__Q24rstl89pair,Q24rstl17rmemory_allocator>,6CSegId>FR12CInputStream" "__ct__Q24rstl89pair,Q24rstl17rmemory_allocator>,6CSegId>FR12CInputStream": @@ -352,7 +352,7 @@ lbl_802F7F64: /* 802F805C 002F4FBC 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802F8060 002F4FC0 7C 08 03 A6 */ mtlr r0 /* 802F8064 002F4FC4 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F8068 002F4FC8 4E 80 00 20 */ blr +/* 802F8068 002F4FC8 4E 80 00 20 */ blr .global __ct__15CCharLayoutNodeFR12CInputStream __ct__15CCharLayoutNodeFR12CInputStream: @@ -379,7 +379,7 @@ __ct__15CCharLayoutNodeFR12CInputStream: /* 802F80BC 002F501C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 802F80C0 002F5020 7C 08 03 A6 */ mtlr r0 /* 802F80C4 002F5024 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F80C8 002F5028 4E 80 00 20 */ blr +/* 802F80C8 002F5028 4E 80 00 20 */ blr .global "__ct__Q24rstl42vector<6CSegId,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl17rmemory_allocator" "__ct__Q24rstl42vector<6CSegId,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl17rmemory_allocator": @@ -435,7 +435,7 @@ lbl_802F816C: /* 802F817C 002F50DC 80 01 00 24 */ lwz r0, 0x24(r1) /* 802F8180 002F50E0 7C 08 03 A6 */ mtlr r0 /* 802F8184 002F50E4 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F8188 002F50E8 4E 80 00 20 */ blr +/* 802F8188 002F50E8 4E 80 00 20 */ blr .global FCharLayoutInfo__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer FCharLayoutInfo__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer: @@ -464,7 +464,7 @@ lbl_802F81D0: /* 802F81E0 002F5140 83 C1 00 08 */ lwz r30, 8(r1) /* 802F81E4 002F5144 7C 08 03 A6 */ mtlr r0 /* 802F81E8 002F5148 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F81EC 002F514C 4E 80 00 20 */ blr +/* 802F81EC 002F514C 4E 80 00 20 */ blr .global sub_802f81f0 sub_802f81f0: @@ -499,7 +499,7 @@ sub_802f81f0: /* 802F8260 002F51C0 38 80 00 01 */ li r4, 1 /* 802F8264 002F51C4 81 8C 00 08 */ lwz r12, 8(r12) /* 802F8268 002F51C8 7D 89 03 A6 */ mtctr r12 -/* 802F826C 002F51CC 4E 80 04 21 */ bctrl +/* 802F826C 002F51CC 4E 80 04 21 */ bctrl lbl_802F8270: /* 802F8270 002F51D0 38 61 00 10 */ addi r3, r1, 0x10 /* 802F8274 002F51D4 38 80 FF FF */ li r4, -1 @@ -551,7 +551,7 @@ lbl_802F8308: /* 802F8314 002F5274 83 C1 00 08 */ lwz r30, 8(r1) /* 802F8318 002F5278 7C 08 03 A6 */ mtlr r0 /* 802F831C 002F527C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F8320 002F5280 4E 80 00 20 */ blr +/* 802F8320 002F5280 4E 80 00 20 */ blr .global sub_802f8324 sub_802f8324: @@ -599,7 +599,7 @@ lbl_802F83AC: /* 802F83B8 002F5318 83 C1 00 08 */ lwz r30, 8(r1) /* 802F83BC 002F531C 7C 08 03 A6 */ mtlr r0 /* 802F83C0 002F5320 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F83C4 002F5324 4E 80 00 20 */ blr +/* 802F83C4 002F5324 4E 80 00 20 */ blr .global sub_802f83c8 sub_802f83c8: @@ -613,7 +613,7 @@ sub_802f83c8: /* 802F83E4 002F5344 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802F83E8 002F5348 7C 08 03 A6 */ mtlr r0 /* 802F83EC 002F534C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F83F0 002F5350 4E 80 00 20 */ blr +/* 802F83F0 002F5350 4E 80 00 20 */ blr .global sub_802f83f4 sub_802f83f4: @@ -656,7 +656,7 @@ lbl_802F8464: /* 802F8480 002F53E0 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F8484 002F53E4 7C 08 03 A6 */ mtlr r0 /* 802F8488 002F53E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F848C 002F53EC 4E 80 00 20 */ blr +/* 802F848C 002F53EC 4E 80 00 20 */ blr .global sub_802f8490 sub_802f8490: @@ -828,7 +828,7 @@ lbl_802F86AC: /* 802F86D0 002F5630 83 81 00 40 */ lwz r28, 0x40(r1) /* 802F86D4 002F5634 7C 08 03 A6 */ mtlr r0 /* 802F86D8 002F5638 38 21 00 50 */ addi r1, r1, 0x50 -/* 802F86DC 002F563C 4E 80 00 20 */ blr +/* 802F86DC 002F563C 4E 80 00 20 */ blr .global "reserve__Q24rstl42vector<6CSegId,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl42vector<6CSegId,Q24rstl17rmemory_allocator>Fi": @@ -899,7 +899,7 @@ lbl_802F87B0: /* 802F87BC 002F571C 83 A1 00 24 */ lwz r29, 0x24(r1) /* 802F87C0 002F5720 7C 08 03 A6 */ mtlr r0 /* 802F87C4 002F5724 38 21 00 30 */ addi r1, r1, 0x30 -/* 802F87C8 002F5728 4E 80 00 20 */ blr +/* 802F87C8 002F5728 4E 80 00 20 */ blr .global sub_802f87cc sub_802f87cc: @@ -940,7 +940,7 @@ lbl_802F883C: /* 802F8844 002F57A4 83 C1 00 08 */ lwz r30, 8(r1) /* 802F8848 002F57A8 7C 08 03 A6 */ mtlr r0 /* 802F884C 002F57AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F8850 002F57B0 4E 80 00 20 */ blr +/* 802F8850 002F57B0 4E 80 00 20 */ blr .global sub_802f8854 sub_802f8854: @@ -1102,7 +1102,7 @@ lbl_802F8A90: /* 802F8A94 002F59F4 80 01 00 24 */ lwz r0, 0x24(r1) /* 802F8A98 002F59F8 7C 08 03 A6 */ mtlr r0 /* 802F8A9C 002F59FC 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F8AA0 002F5A00 4E 80 00 20 */ blr +/* 802F8AA0 002F5A00 4E 80 00 20 */ blr .global "insert__28TSegIdMap<15CCharLayoutNode>FRC6CSegIdRC15CCharLayoutNode" "insert__28TSegIdMap<15CCharLayoutNode>FRC6CSegIdRC15CCharLayoutNode": @@ -1137,7 +1137,7 @@ lbl_802F8AE0: /* 802F8B10 002F5A70 83 C1 00 08 */ lwz r30, 8(r1) /* 802F8B14 002F5A74 7C 08 03 A6 */ mtlr r0 /* 802F8B18 002F5A78 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F8B1C 002F5A7C 4E 80 00 20 */ blr +/* 802F8B1C 002F5A7C 4E 80 00 20 */ blr .global __ct__15CCharLayoutNodeFRC15CCharLayoutNode __ct__15CCharLayoutNodeFRC15CCharLayoutNode: @@ -1205,7 +1205,7 @@ lbl_802F8BF0: /* 802F8BFC 002F5B5C 83 C1 00 08 */ lwz r30, 8(r1) /* 802F8C00 002F5B60 7C 08 03 A6 */ mtlr r0 /* 802F8C04 002F5B64 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F8C08 002F5B68 4E 80 00 20 */ blr +/* 802F8C08 002F5B68 4E 80 00 20 */ blr .global sub_802f8c0c sub_802f8c0c: diff --git a/asm/Kyoto/Animation/CCharacterInfo.s b/asm/Kyoto/Animation/CCharacterInfo.s index 075ca94c..5b7c1cf2 100644 --- a/asm/Kyoto/Animation/CCharacterInfo.s +++ b/asm/Kyoto/Animation/CCharacterInfo.s @@ -112,7 +112,7 @@ lbl_802DD8F8: /* 802DD904 002DA864 83 A1 00 14 */ lwz r29, 0x14(r1) /* 802DD908 002DA868 7C 08 03 A6 */ mtlr r0 /* 802DD90C 002DA86C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802DD910 002DA870 4E 80 00 20 */ blr +/* 802DD910 002DA870 4E 80 00 20 */ blr .global sub_802dd914 sub_802dd914: @@ -137,7 +137,7 @@ lbl_802DD940: /* 802DD954 002DA8B4 83 C1 00 08 */ lwz r30, 8(r1) /* 802DD958 002DA8B8 7C 08 03 A6 */ mtlr r0 /* 802DD95C 002DA8BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DD960 002DA8C0 4E 80 00 20 */ blr +/* 802DD960 002DA8C0 4E 80 00 20 */ blr .global sub_802dd964 sub_802dd964: @@ -149,7 +149,7 @@ sub_802dd964: /* 802DD978 002DA8D8 80 01 00 14 */ lwz r0, 0x14(r1) /* 802DD97C 002DA8DC 7C 08 03 A6 */ mtlr r0 /* 802DD980 002DA8E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DD984 002DA8E4 4E 80 00 20 */ blr +/* 802DD984 002DA8E4 4E 80 00 20 */ blr .global sub_802dd988 sub_802dd988: @@ -163,7 +163,7 @@ lbl_802DD9A0: /* 802DD9A0 002DA900 80 01 00 14 */ lwz r0, 0x14(r1) /* 802DD9A4 002DA904 7C 08 03 A6 */ mtlr r0 /* 802DD9A8 002DA908 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DD9AC 002DA90C 4E 80 00 20 */ blr +/* 802DD9AC 002DA90C 4E 80 00 20 */ blr .global __ct__14CCharacterInfoFR12CInputStream __ct__14CCharacterInfoFR12CInputStream: @@ -337,7 +337,7 @@ lbl_802DDC14: /* 802DDC1C 002DAB7C 80 01 00 94 */ lwz r0, 0x94(r1) /* 802DDC20 002DAB80 7C 08 03 A6 */ mtlr r0 /* 802DDC24 002DAB84 38 21 00 90 */ addi r1, r1, 0x90 -/* 802DDC28 002DAB88 4E 80 00 20 */ blr +/* 802DDC28 002DAB88 4E 80 00 20 */ blr .global sub_802ddc2c sub_802ddc2c: @@ -385,7 +385,7 @@ lbl_802DDCB4: /* 802DDCBC 002DAC1C 83 C1 00 08 */ lwz r30, 8(r1) /* 802DDCC0 002DAC20 7C 08 03 A6 */ mtlr r0 /* 802DDCC4 002DAC24 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DDCC8 002DAC28 4E 80 00 20 */ blr +/* 802DDCC8 002DAC28 4E 80 00 20 */ blr .global sub_802ddccc sub_802ddccc: @@ -415,7 +415,7 @@ lbl_802DDD08: /* 802DDD20 002DAC80 83 A1 00 14 */ lwz r29, 0x14(r1) /* 802DDD24 002DAC84 7C 08 03 A6 */ mtlr r0 /* 802DDD28 002DAC88 38 21 00 20 */ addi r1, r1, 0x20 -/* 802DDD2C 002DAC8C 4E 80 00 20 */ blr +/* 802DDD2C 002DAC8C 4E 80 00 20 */ blr .global sub_802ddd30 sub_802ddd30: @@ -442,7 +442,7 @@ sub_802ddd30: /* 802DDD80 002DACE0 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802DDD84 002DACE4 7C 08 03 A6 */ mtlr r0 /* 802DDD88 002DACE8 38 21 00 20 */ addi r1, r1, 0x20 -/* 802DDD8C 002DACEC 4E 80 00 20 */ blr +/* 802DDD8C 002DACEC 4E 80 00 20 */ blr .global "__ct__Q24rstl189vector,Q24rstl17rmemory_allocator>,Q24rstl53vector<16CEffectComponent,Q24rstl17rmemory_allocator>>,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl17rmemory_allocator" "__ct__Q24rstl189vector,Q24rstl17rmemory_allocator>,Q24rstl53vector<16CEffectComponent,Q24rstl17rmemory_allocator>>,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl17rmemory_allocator": @@ -487,7 +487,7 @@ lbl_802DDE10: /* 802DDE20 002DAD80 80 01 00 54 */ lwz r0, 0x54(r1) /* 802DDE24 002DAD84 7C 08 03 A6 */ mtlr r0 /* 802DDE28 002DAD88 38 21 00 50 */ addi r1, r1, 0x50 -/* 802DDE2C 002DAD8C 4E 80 00 20 */ blr +/* 802DDE2C 002DAD8C 4E 80 00 20 */ blr .global sub_802dde30 sub_802dde30: @@ -523,7 +523,7 @@ lbl_802DDE70: /* 802DDE9C 002DADFC 80 01 00 14 */ lwz r0, 0x14(r1) /* 802DDEA0 002DAE00 7C 08 03 A6 */ mtlr r0 /* 802DDEA4 002DAE04 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DDEA8 002DAE08 4E 80 00 20 */ blr +/* 802DDEA8 002DAE08 4E 80 00 20 */ blr .global "Get,Q24rstl17rmemory_allocator>,Q24rstl53vector<16CEffectComponent,Q24rstl17rmemory_allocator>>>__12CInputStreamFRC161TType,Q24rstl17rmemory_allocator>,Q24rstl53vector<16CEffectComponent,Q24rstl17rmemory_allocator>>>" "Get,Q24rstl17rmemory_allocator>,Q24rstl53vector<16CEffectComponent,Q24rstl17rmemory_allocator>>>__12CInputStreamFRC161TType,Q24rstl17rmemory_allocator>,Q24rstl53vector<16CEffectComponent,Q24rstl17rmemory_allocator>>>": @@ -541,7 +541,7 @@ lbl_802DDE70: /* 802DDED8 002DAE38 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802DDEDC 002DAE3C 7C 08 03 A6 */ mtlr r0 /* 802DDEE0 002DAE40 38 21 00 20 */ addi r1, r1, 0x20 -/* 802DDEE4 002DAE44 4E 80 00 20 */ blr +/* 802DDEE4 002DAE44 4E 80 00 20 */ blr .global "cinput_stream_helper,Q24rstl17rmemory_allocator>,Q24rstl53vector<16CEffectComponent,Q24rstl17rmemory_allocator>>>__FRC161TType,Q24rstl17rmemory_allocator>,Q24rstl53vector<16CEffectComponent,Q24rstl17rmemory_allocator>>>R12CInputStream" "cinput_stream_helper,Q24rstl17rmemory_allocator>,Q24rstl53vector<16CEffectComponent,Q24rstl17rmemory_allocator>>>__FRC161TType,Q24rstl17rmemory_allocator>,Q24rstl53vector<16CEffectComponent,Q24rstl17rmemory_allocator>>>R12CInputStream": @@ -553,7 +553,7 @@ lbl_802DDE70: /* 802DDEFC 002DAE5C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802DDF00 002DAE60 7C 08 03 A6 */ mtlr r0 /* 802DDF04 002DAE64 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DDF08 002DAE68 4E 80 00 20 */ blr +/* 802DDF08 002DAE68 4E 80 00 20 */ blr .global "__ct__Q24rstl144pair,Q24rstl17rmemory_allocator>,Q24rstl53vector<16CEffectComponent,Q24rstl17rmemory_allocator>>FR12CInputStream" "__ct__Q24rstl144pair,Q24rstl17rmemory_allocator>,Q24rstl53vector<16CEffectComponent,Q24rstl17rmemory_allocator>>FR12CInputStream": @@ -592,7 +592,7 @@ lbl_802DDE70: /* 802DDF8C 002DAEEC 83 C1 00 38 */ lwz r30, 0x38(r1) /* 802DDF90 002DAEF0 7C 08 03 A6 */ mtlr r0 /* 802DDF94 002DAEF4 38 21 00 40 */ addi r1, r1, 0x40 -/* 802DDF98 002DAEF8 4E 80 00 20 */ blr +/* 802DDF98 002DAEF8 4E 80 00 20 */ blr .global "Get>__12CInputStreamFRC69TType>" "Get>__12CInputStreamFRC69TType>": @@ -610,7 +610,7 @@ lbl_802DDE70: /* 802DDFC8 002DAF28 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802DDFCC 002DAF2C 7C 08 03 A6 */ mtlr r0 /* 802DDFD0 002DAF30 38 21 00 20 */ addi r1, r1, 0x20 -/* 802DDFD4 002DAF34 4E 80 00 20 */ blr +/* 802DDFD4 002DAF34 4E 80 00 20 */ blr .global "cinput_stream_helper>__FRC69TType>R12CInputStream" "cinput_stream_helper>__FRC69TType>R12CInputStream": @@ -623,7 +623,7 @@ lbl_802DDE70: /* 802DDFF0 002DAF50 80 01 00 14 */ lwz r0, 0x14(r1) /* 802DDFF4 002DAF54 7C 08 03 A6 */ mtlr r0 /* 802DDFF8 002DAF58 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DDFFC 002DAF5C 4E 80 00 20 */ blr +/* 802DDFFC 002DAF5C 4E 80 00 20 */ blr .global "__ct__Q24rstl53vector<16CEffectComponent,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl17rmemory_allocator" "__ct__Q24rstl53vector<16CEffectComponent,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl17rmemory_allocator": @@ -707,7 +707,7 @@ lbl_802DE10C: /* 802DE11C 002DB07C 80 01 00 64 */ lwz r0, 0x64(r1) /* 802DE120 002DB080 7C 08 03 A6 */ mtlr r0 /* 802DE124 002DB084 38 21 00 60 */ addi r1, r1, 0x60 -/* 802DE128 002DB088 4E 80 00 20 */ blr +/* 802DE128 002DB088 4E 80 00 20 */ blr .global "Get<16CEffectComponent>__12CInputStreamFRC25TType<16CEffectComponent>" "Get<16CEffectComponent>__12CInputStreamFRC25TType<16CEffectComponent>": @@ -725,7 +725,7 @@ lbl_802DE10C: /* 802DE158 002DB0B8 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802DE15C 002DB0BC 7C 08 03 A6 */ mtlr r0 /* 802DE160 002DB0C0 38 21 00 20 */ addi r1, r1, 0x20 -/* 802DE164 002DB0C4 4E 80 00 20 */ blr +/* 802DE164 002DB0C4 4E 80 00 20 */ blr .global "cinput_stream_helper<16CEffectComponent>__FRC25TType<16CEffectComponent>R12CInputStream" "cinput_stream_helper<16CEffectComponent>__FRC25TType<16CEffectComponent>R12CInputStream": @@ -737,7 +737,7 @@ lbl_802DE10C: /* 802DE17C 002DB0DC 80 01 00 14 */ lwz r0, 0x14(r1) /* 802DE180 002DB0E0 7C 08 03 A6 */ mtlr r0 /* 802DE184 002DB0E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DE188 002DB0E8 4E 80 00 20 */ blr +/* 802DE188 002DB0E8 4E 80 00 20 */ blr .global sub_802de18c sub_802de18c: @@ -755,7 +755,7 @@ sub_802de18c: /* 802DE1B8 002DB118 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802DE1BC 002DB11C 7C 08 03 A6 */ mtlr r0 /* 802DE1C0 002DB120 38 21 00 20 */ addi r1, r1, 0x20 -/* 802DE1C4 002DB124 4E 80 00 20 */ blr +/* 802DE1C4 002DB124 4E 80 00 20 */ blr .global "__ct__Q24rstl133vector,Q24rstl17rmemory_allocator>,6CAABox>,Q24rstl17rmemory_allocator>FRCQ24rstl133vector,Q24rstl17rmemory_allocator>,6CAABox>,Q24rstl17rmemory_allocator>" "__ct__Q24rstl133vector,Q24rstl17rmemory_allocator>,6CAABox>,Q24rstl17rmemory_allocator>FRCQ24rstl133vector,Q24rstl17rmemory_allocator>,6CAABox>,Q24rstl17rmemory_allocator>": @@ -846,7 +846,7 @@ lbl_802DE2E8: /* 802DE2EC 002DB24C 80 01 00 34 */ lwz r0, 0x34(r1) /* 802DE2F0 002DB250 7C 08 03 A6 */ mtlr r0 /* 802DE2F4 002DB254 38 21 00 30 */ addi r1, r1, 0x30 -/* 802DE2F8 002DB258 4E 80 00 20 */ blr +/* 802DE2F8 002DB258 4E 80 00 20 */ blr .global "Get,Q24rstl17rmemory_allocator>,6CAABox>>__12CInputStreamFRC105TType,Q24rstl17rmemory_allocator>,6CAABox>>" "Get,Q24rstl17rmemory_allocator>,6CAABox>>__12CInputStreamFRC105TType,Q24rstl17rmemory_allocator>,6CAABox>>": @@ -923,7 +923,7 @@ lbl_802DE3F0: /* 802DE400 002DB360 80 01 00 54 */ lwz r0, 0x54(r1) /* 802DE404 002DB364 7C 08 03 A6 */ mtlr r0 /* 802DE408 002DB368 38 21 00 50 */ addi r1, r1, 0x50 -/* 802DE40C 002DB36C 4E 80 00 20 */ blr +/* 802DE40C 002DB36C 4E 80 00 20 */ blr .global "cinput_stream_helper,Q24rstl17rmemory_allocator>,6CAABox>>__FRC105TType,Q24rstl17rmemory_allocator>,6CAABox>>R12CInputStream" "cinput_stream_helper,Q24rstl17rmemory_allocator>,6CAABox>>__FRC105TType,Q24rstl17rmemory_allocator>,6CAABox>>R12CInputStream": @@ -941,7 +941,7 @@ lbl_802DE3F0: /* 802DE43C 002DB39C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802DE440 002DB3A0 7C 08 03 A6 */ mtlr r0 /* 802DE444 002DB3A4 38 21 00 20 */ addi r1, r1, 0x20 -/* 802DE448 002DB3A8 4E 80 00 20 */ blr +/* 802DE448 002DB3A8 4E 80 00 20 */ blr .global "__ct__Q24rstl89pair,Q24rstl17rmemory_allocator>,6CAABox>FR12CInputStream" "__ct__Q24rstl89pair,Q24rstl17rmemory_allocator>,6CAABox>FR12CInputStream": @@ -984,7 +984,7 @@ lbl_802DE3F0: /* 802DE4DC 002DB43C 83 C1 00 38 */ lwz r30, 0x38(r1) /* 802DE4E0 002DB440 7C 08 03 A6 */ mtlr r0 /* 802DE4E4 002DB444 38 21 00 40 */ addi r1, r1, 0x40 -/* 802DE4E8 002DB448 4E 80 00 20 */ blr +/* 802DE4E8 002DB448 4E 80 00 20 */ blr .global "Get<12CPASDatabase>__12CInputStreamFRC21TType<12CPASDatabase>" "Get<12CPASDatabase>__12CInputStreamFRC21TType<12CPASDatabase>": @@ -1002,7 +1002,7 @@ lbl_802DE3F0: /* 802DE518 002DB478 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802DE51C 002DB47C 7C 08 03 A6 */ mtlr r0 /* 802DE520 002DB480 38 21 00 20 */ addi r1, r1, 0x20 -/* 802DE524 002DB484 4E 80 00 20 */ blr +/* 802DE524 002DB484 4E 80 00 20 */ blr .global "cinput_stream_helper<12CPASDatabase>__FRC21TType<12CPASDatabase>R12CInputStream" "cinput_stream_helper<12CPASDatabase>__FRC21TType<12CPASDatabase>R12CInputStream": @@ -1014,7 +1014,7 @@ lbl_802DE3F0: /* 802DE53C 002DB49C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802DE540 002DB4A0 7C 08 03 A6 */ mtlr r0 /* 802DE544 002DB4A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DE548 002DB4A8 4E 80 00 20 */ blr +/* 802DE548 002DB4A8 4E 80 00 20 */ blr .global "_ct__Q24rstl220vector,Q24rstl17rmemory_allocator>,Q24rstl66basic_string,Q24rstl17rmemory_allocator>>>,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl17rmemory_allocator" "_ct__Q24rstl220vector,Q24rstl17rmemory_allocator>,Q24rstl66basic_string,Q24rstl17rmemory_allocator>>>,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl17rmemory_allocator": @@ -1097,7 +1097,7 @@ lbl_802DE650: /* 802DE660 002DB5C0 80 01 00 54 */ lwz r0, 0x54(r1) /* 802DE664 002DB5C4 7C 08 03 A6 */ mtlr r0 /* 802DE668 002DB5C8 38 21 00 50 */ addi r1, r1, 0x50 -/* 802DE66C 002DB5CC 4E 80 00 20 */ blr +/* 802DE66C 002DB5CC 4E 80 00 20 */ blr .global "Get,Q24rstl17rmemory_allocator>,Q24rstl66basic_string,Q24rstl17rmemory_allocator>>>>__12CInputStreamFRC192TType,Q24rstl17rmemory_allocator>,Q24rstl66basic_string,Q24rstl17rmemory_allocator>>>>" "Get,Q24rstl17rmemory_allocator>,Q24rstl66basic_string,Q24rstl17rmemory_allocator>>>>__12CInputStreamFRC192TType,Q24rstl17rmemory_allocator>,Q24rstl66basic_string,Q24rstl17rmemory_allocator>>>>": @@ -1115,7 +1115,7 @@ lbl_802DE650: /* 802DE69C 002DB5FC 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802DE6A0 002DB600 7C 08 03 A6 */ mtlr r0 /* 802DE6A4 002DB604 38 21 00 20 */ addi r1, r1, 0x20 -/* 802DE6A8 002DB608 4E 80 00 20 */ blr +/* 802DE6A8 002DB608 4E 80 00 20 */ blr .global "cinput_stream_helper,Q24rstl17rmemory_allocator>,Q24rstl66basic_string,Q24rstl17rmemory_allocator>>>>__FRC192TType,Q24rstl17rmemory_allocator>,Q24rstl66basic_string,Q24rstl17rmemory_allocator>>>>R12CInputStream" "cinput_stream_helper,Q24rstl17rmemory_allocator>,Q24rstl66basic_string,Q24rstl17rmemory_allocator>>>>__FRC192TType,Q24rstl17rmemory_allocator>,Q24rstl66basic_string,Q24rstl17rmemory_allocator>>>>R12CInputStream": @@ -1127,7 +1127,7 @@ lbl_802DE650: /* 802DE6C0 002DB620 80 01 00 14 */ lwz r0, 0x14(r1) /* 802DE6C4 002DB624 7C 08 03 A6 */ mtlr r0 /* 802DE6C8 002DB628 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DE6CC 002DB62C 4E 80 00 20 */ blr +/* 802DE6CC 002DB62C 4E 80 00 20 */ blr .global "__ct__Q24rstl175pair,Q24rstl17rmemory_allocator>,Q24rstl66basic_string,Q24rstl17rmemory_allocator>>>FR12CInputStream" "__ct__Q24rstl175pair,Q24rstl17rmemory_allocator>,Q24rstl66basic_string,Q24rstl17rmemory_allocator>>>FR12CInputStream": @@ -1170,7 +1170,7 @@ lbl_802DE744: /* 802DE75C 002DB6BC 83 A1 00 34 */ lwz r29, 0x34(r1) /* 802DE760 002DB6C0 7C 08 03 A6 */ mtlr r0 /* 802DE764 002DB6C4 38 21 00 40 */ addi r1, r1, 0x40 -/* 802DE768 002DB6C8 4E 80 00 20 */ blr +/* 802DE768 002DB6C8 4E 80 00 20 */ blr .global "Get,Q24rstl17rmemory_allocator>,Q24rstl66basic_string,Q24rstl17rmemory_allocator>>>__12CInputStreamFRC174TType,Q24rstl17rmemory_allocator>,Q24rstl66basic_string,Q24rstl17rmemory_allocator>>>" "Get,Q24rstl17rmemory_allocator>,Q24rstl66basic_string,Q24rstl17rmemory_allocator>>>__12CInputStreamFRC174TType,Q24rstl17rmemory_allocator>,Q24rstl66basic_string,Q24rstl17rmemory_allocator>>>": @@ -1188,7 +1188,7 @@ lbl_802DE744: /* 802DE798 002DB6F8 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802DE79C 002DB6FC 7C 08 03 A6 */ mtlr r0 /* 802DE7A0 002DB700 38 21 00 20 */ addi r1, r1, 0x20 -/* 802DE7A4 002DB704 4E 80 00 20 */ blr +/* 802DE7A4 002DB704 4E 80 00 20 */ blr .global "cinput_stream_helper,Q24rstl17rmemory_allocator>,Q24rstl66basic_string,Q24rstl17rmemory_allocator>>>__FRC174TType,Q24rstl17rmemory_allocator>,Q24rstl66basic_string,Q24rstl17rmemory_allocator>>>R12CInputStream" "cinput_stream_helper,Q24rstl17rmemory_allocator>,Q24rstl66basic_string,Q24rstl17rmemory_allocator>>>__FRC174TType,Q24rstl17rmemory_allocator>,Q24rstl66basic_string,Q24rstl17rmemory_allocator>>>R12CInputStream": @@ -1227,7 +1227,7 @@ lbl_802DE744: /* 802DE828 002DB788 83 C1 00 38 */ lwz r30, 0x38(r1) /* 802DE82C 002DB78C 7C 08 03 A6 */ mtlr r0 /* 802DE830 002DB790 38 21 00 40 */ addi r1, r1, 0x40 -/* 802DE834 002DB794 4E 80 00 20 */ blr +/* 802DE834 002DB794 4E 80 00 20 */ blr .global sub_802de838 sub_802de838: @@ -1303,7 +1303,7 @@ lbl_802DE920: /* 802DE930 002DB890 80 01 00 44 */ lwz r0, 0x44(r1) /* 802DE934 002DB894 7C 08 03 A6 */ mtlr r0 /* 802DE938 002DB898 38 21 00 40 */ addi r1, r1, 0x40 -/* 802DE93C 002DB89C 4E 80 00 20 */ blr +/* 802DE93C 002DB89C 4E 80 00 20 */ blr .global __ct__Q214CCharacterInfo16CParticleResDataFR12CInputStreamUs __ct__Q214CCharacterInfo16CParticleResDataFR12CInputStreamUs: @@ -1529,7 +1529,7 @@ lbl_802DEC4C: /* 802DEC54 002DBBB4 80 01 00 94 */ lwz r0, 0x94(r1) /* 802DEC58 002DBBB8 7C 08 03 A6 */ mtlr r0 /* 802DEC5C 002DBBBC 38 21 00 90 */ addi r1, r1, 0x90 -/* 802DEC60 002DBBC0 4E 80 00 20 */ blr +/* 802DEC60 002DBBC0 4E 80 00 20 */ blr .global "distance,Q24rstl8less,Q24rstl17rmemory_allocator>14const_iterator>__4rstlFQ34rstl89red_black_tree,Q24rstl8less,Q24rstl17rmemory_allocator>14const_iteratorQ34rstl89red_black_tree,Q24rstl8less,Q24rstl17rmemory_allocator>14const_iterator" "distance,Q24rstl8less,Q24rstl17rmemory_allocator>14const_iterator>__4rstlFQ34rstl89red_black_tree,Q24rstl8less,Q24rstl17rmemory_allocator>14const_iteratorQ34rstl89red_black_tree,Q24rstl8less,Q24rstl17rmemory_allocator>14const_iterator": @@ -1553,7 +1553,7 @@ lbl_802DEC4C: /* 802DECA8 002DBC08 80 01 00 24 */ lwz r0, 0x24(r1) /* 802DECAC 002DBC0C 7C 08 03 A6 */ mtlr r0 /* 802DECB0 002DBC10 38 21 00 20 */ addi r1, r1, 0x20 -/* 802DECB4 002DBC14 4E 80 00 20 */ blr +/* 802DECB4 002DBC14 4E 80 00 20 */ blr .global "__distance,Q24rstl8less,Q24rstl17rmemory_allocator>14const_iterator>__4rstlFQ34rstl89red_black_tree,Q24rstl8less,Q24rstl17rmemory_allocator>14const_iteratorQ34rstl89red_black_tree,Q24rstl8less,Q24rstl17rmemory_allocator>14const_iteratorQ24rstl20forward_iterator_tag" "__distance,Q24rstl8less,Q24rstl17rmemory_allocator>14const_iterator>__4rstlFQ34rstl89red_black_tree,Q24rstl8less,Q24rstl17rmemory_allocator>14const_iteratorQ34rstl89red_black_tree,Q24rstl8less,Q24rstl17rmemory_allocator>14const_iteratorQ24rstl20forward_iterator_tag": @@ -1594,7 +1594,7 @@ lbl_802DED18: /* 802DED30 002DBC90 83 A1 00 14 */ lwz r29, 0x14(r1) /* 802DED34 002DBC94 7C 08 03 A6 */ mtlr r0 /* 802DED38 002DBC98 38 21 00 20 */ addi r1, r1, 0x20 -/* 802DED3C 002DBC9C 4E 80 00 20 */ blr +/* 802DED3C 002DBC9C 4E 80 00 20 */ blr .global "reserve__Q24rstl53vector<16CEffectComponent,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl53vector<16CEffectComponent,Q24rstl17rmemory_allocator>Fi": @@ -1688,7 +1688,7 @@ lbl_802DEE6C: /* 802DEE70 002DBDD0 80 01 00 34 */ lwz r0, 0x34(r1) /* 802DEE74 002DBDD4 7C 08 03 A6 */ mtlr r0 /* 802DEE78 002DBDD8 38 21 00 30 */ addi r1, r1, 0x30 -/* 802DEE7C 002DBDDC 4E 80 00 20 */ blr +/* 802DEE7C 002DBDDC 4E 80 00 20 */ blr .global "reserve__Q24rstl220vector,Q24rstl17rmemory_allocator>,Q24rstl66basic_string,Q24rstl17rmemory_allocator>>>,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl220vector,Q24rstl17rmemory_allocator>,Q24rstl66basic_string,Q24rstl17rmemory_allocator>>>,Q24rstl17rmemory_allocator>Fi": @@ -1776,7 +1776,7 @@ lbl_802DEF94: /* 802DEF98 002DBEF8 80 01 00 44 */ lwz r0, 0x44(r1) /* 802DEF9C 002DBEFC 7C 08 03 A6 */ mtlr r0 /* 802DEFA0 002DBF00 38 21 00 40 */ addi r1, r1, 0x40 -/* 802DEFA4 002DBF04 4E 80 00 20 */ blr +/* 802DEFA4 002DBF04 4E 80 00 20 */ blr .global "reserve__Q24rstl133vector,Q24rstl17rmemory_allocator>,6CAABox>,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl133vector,Q24rstl17rmemory_allocator>,6CAABox>,Q24rstl17rmemory_allocator>Fi": @@ -1863,7 +1863,7 @@ lbl_802DF0BC: /* 802DF0C0 002DC020 80 01 00 34 */ lwz r0, 0x34(r1) /* 802DF0C4 002DC024 7C 08 03 A6 */ mtlr r0 /* 802DF0C8 002DC028 38 21 00 30 */ addi r1, r1, 0x30 -/* 802DF0CC 002DC02C 4E 80 00 20 */ blr +/* 802DF0CC 002DC02C 4E 80 00 20 */ blr .global "reserve__Q24rstl189vector,Q24rstl17rmemory_allocator>,Q24rstl53vector<16CEffectComponent,Q24rstl17rmemory_allocator>>,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl189vector,Q24rstl17rmemory_allocator>,Q24rstl53vector<16CEffectComponent,Q24rstl17rmemory_allocator>>,Q24rstl17rmemory_allocator>Fi": @@ -1921,7 +1921,7 @@ lbl_802DF180: /* 802DF18C 002DC0EC 83 A1 00 24 */ lwz r29, 0x24(r1) /* 802DF190 002DC0F0 7C 08 03 A6 */ mtlr r0 /* 802DF194 002DC0F4 38 21 00 30 */ addi r1, r1, 0x30 -/* 802DF198 002DC0F8 4E 80 00 20 */ blr +/* 802DF198 002DC0F8 4E 80 00 20 */ blr .global sub_802df19c sub_802df19c: @@ -1945,7 +1945,7 @@ lbl_802DF1C8: /* 802DF1D8 002DC138 83 C1 00 08 */ lwz r30, 8(r1) /* 802DF1DC 002DC13C 7C 08 03 A6 */ mtlr r0 /* 802DF1E0 002DC140 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DF1E4 002DC144 4E 80 00 20 */ blr +/* 802DF1E4 002DC144 4E 80 00 20 */ blr .global sub_802df1e8 sub_802df1e8: @@ -1976,7 +1976,7 @@ lbl_802DF224: /* 802DF240 002DC1A0 83 A1 00 14 */ lwz r29, 0x14(r1) /* 802DF244 002DC1A4 7C 08 03 A6 */ mtlr r0 /* 802DF248 002DC1A8 38 21 00 20 */ addi r1, r1, 0x20 -/* 802DF24C 002DC1AC 4E 80 00 20 */ blr +/* 802DF24C 002DC1AC 4E 80 00 20 */ blr .global sub_802df250 sub_802df250: @@ -2008,7 +2008,7 @@ lbl_802DF2A0: /* 802DF2A8 002DC208 83 C1 00 08 */ lwz r30, 8(r1) /* 802DF2AC 002DC20C 7C 08 03 A6 */ mtlr r0 /* 802DF2B0 002DC210 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DF2B4 002DC214 4E 80 00 20 */ blr +/* 802DF2B4 002DC214 4E 80 00 20 */ blr .global "insert_into__Q24rstl89red_black_tree,Q24rstl8less,Q24rstl17rmemory_allocator>FPQ34rstl89red_black_tree,Q24rstl8less,Q24rstl17rmemory_allocator>4nodeRCUi" "insert_into__Q24rstl89red_black_tree,Q24rstl8less,Q24rstl17rmemory_allocator>FPQ34rstl89red_black_tree,Q24rstl8less,Q24rstl17rmemory_allocator>4nodeRCUi": diff --git a/asm/Kyoto/Animation/CCharacterSet.s b/asm/Kyoto/Animation/CCharacterSet.s index 49704d61..f4d51502 100644 --- a/asm/Kyoto/Animation/CCharacterSet.s +++ b/asm/Kyoto/Animation/CCharacterSet.s @@ -50,7 +50,7 @@ lbl_802DF55C: /* 802DF578 002DC4D8 83 81 00 D0 */ lwz r28, 0xd0(r1) /* 802DF57C 002DC4DC 7C 08 03 A6 */ mtlr r0 /* 802DF580 002DC4E0 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 802DF584 002DC4E4 4E 80 00 20 */ blr +/* 802DF584 002DC4E4 4E 80 00 20 */ blr .global sub_802df588 sub_802df588: @@ -86,7 +86,7 @@ lbl_802DF5C8: /* 802DF5F4 002DC554 80 01 00 14 */ lwz r0, 0x14(r1) /* 802DF5F8 002DC558 7C 08 03 A6 */ mtlr r0 /* 802DF5FC 002DC55C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DF600 002DC560 4E 80 00 20 */ blr +/* 802DF600 002DC560 4E 80 00 20 */ blr .global "__ct__Q34rstl150red_black_tree,0,Q24rstl44select1st>,Q24rstl7less,Q24rstl17rmemory_allocator>6headerFv" "__ct__Q34rstl150red_black_tree,0,Q24rstl44select1st>,Q24rstl7less,Q24rstl17rmemory_allocator>6headerFv": @@ -100,7 +100,7 @@ lbl_802DF61C: /* 802DF61C 002DC57C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802DF620 002DC580 7C 08 03 A6 */ mtlr r0 /* 802DF624 002DC584 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DF628 002DC588 4E 80 00 20 */ blr +/* 802DF628 002DC588 4E 80 00 20 */ blr .global "Get>__12CInputStreamFRC40TType>" "Get>__12CInputStreamFRC40TType>": @@ -119,7 +119,7 @@ lbl_802DF61C: /* 802DF65C 002DC5BC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802DF660 002DC5C0 7C 08 03 A6 */ mtlr r0 /* 802DF664 002DC5C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DF668 002DC5C8 4E 80 00 20 */ blr +/* 802DF668 002DC5C8 4E 80 00 20 */ blr .global "__ct__Q24rstl66map,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl7lessRCQ24rstl17rmemory_allocator" "__ct__Q24rstl66map,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl7lessRCQ24rstl17rmemory_allocator": @@ -151,7 +151,7 @@ lbl_802DF61C: /* 802DF6D0 002DC630 83 C1 00 D8 */ lwz r30, 0xd8(r1) /* 802DF6D4 002DC634 7C 08 03 A6 */ mtlr r0 /* 802DF6D8 002DC638 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 802DF6DC 002DC63C 4E 80 00 20 */ blr +/* 802DF6DC 002DC63C 4E 80 00 20 */ blr .global "Get<14CCharacterInfo>__12CInputStreamFRC23TType<14CCharacterInfo>" "Get<14CCharacterInfo>__12CInputStreamFRC23TType<14CCharacterInfo>": @@ -169,7 +169,7 @@ lbl_802DF61C: /* 802DF70C 002DC66C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802DF710 002DC670 7C 08 03 A6 */ mtlr r0 /* 802DF714 002DC674 38 21 00 20 */ addi r1, r1, 0x20 -/* 802DF718 002DC678 4E 80 00 20 */ blr +/* 802DF718 002DC678 4E 80 00 20 */ blr .global "cinput_stream_helper<14CCharacterInfo>__FRC23TType<14CCharacterInfo>R12CInputStream" "cinput_stream_helper<14CCharacterInfo>__FRC23TType<14CCharacterInfo>R12CInputStream": @@ -181,7 +181,7 @@ lbl_802DF61C: /* 802DF730 002DC690 80 01 00 14 */ lwz r0, 0x14(r1) /* 802DF734 002DC694 7C 08 03 A6 */ mtlr r0 /* 802DF738 002DC698 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DF73C 002DC69C 4E 80 00 20 */ blr +/* 802DF73C 002DC69C 4E 80 00 20 */ blr .global sub_802df740 sub_802df740: @@ -193,7 +193,7 @@ sub_802df740: /* 802DF754 002DC6B4 80 01 00 14 */ lwz r0, 0x14(r1) /* 802DF758 002DC6B8 7C 08 03 A6 */ mtlr r0 /* 802DF75C 002DC6BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DF760 002DC6C0 4E 80 00 20 */ blr +/* 802DF760 002DC6C0 4E 80 00 20 */ blr .global sub_802df764 sub_802df764: @@ -252,7 +252,7 @@ lbl_802DF818: /* 802DF824 002DC784 83 A1 00 24 */ lwz r29, 0x24(r1) /* 802DF828 002DC788 7C 08 03 A6 */ mtlr r0 /* 802DF82C 002DC78C 38 21 00 30 */ addi r1, r1, 0x30 -/* 802DF830 002DC790 4E 80 00 20 */ blr +/* 802DF830 002DC790 4E 80 00 20 */ blr .global sub_802df834 sub_802df834: @@ -276,7 +276,7 @@ lbl_802DF860: /* 802DF870 002DC7D0 83 C1 00 08 */ lwz r30, 8(r1) /* 802DF874 002DC7D4 7C 08 03 A6 */ mtlr r0 /* 802DF878 002DC7D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DF87C 002DC7DC 4E 80 00 20 */ blr +/* 802DF87C 002DC7DC 4E 80 00 20 */ blr .global "__ct__Q24rstl150red_black_tree,0,Q24rstl44select1st>,Q24rstl7less,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl44select1st>RCQ24rstl7lessRCQ24rstl17rmemory_allocator" "__ct__Q24rstl150red_black_tree,0,Q24rstl44select1st>,Q24rstl7less,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl44select1st>RCQ24rstl7lessRCQ24rstl17rmemory_allocator": diff --git a/asm/Kyoto/Animation/CFBStreamedAnimReader.s b/asm/Kyoto/Animation/CFBStreamedAnimReader.s index f5c970fb..0f7be529 100644 --- a/asm/Kyoto/Animation/CFBStreamedAnimReader.s +++ b/asm/Kyoto/Animation/CFBStreamedAnimReader.s @@ -329,7 +329,7 @@ lbl_802F9038: /* 802F90D4 002F6034 D0 C1 00 C4 */ stfs f6, 0xc4(r1) /* 802F90D8 002F6038 D0 A1 00 C8 */ stfs f5, 0xc8(r1) /* 802F90DC 002F603C 7D 89 03 A6 */ mtctr r12 -/* 802F90E0 002F6040 4E 80 04 21 */ bctrl +/* 802F90E0 002F6040 4E 80 04 21 */ bctrl /* 802F90E4 002F6044 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802F90E8 002F6048 41 82 00 88 */ beq lbl_802F9170 /* 802F90EC 002F604C C0 41 00 B8 */ lfs f2, 0xb8(r1) @@ -400,7 +400,7 @@ lbl_802F91D0: /* 802F91E8 002F6148 83 81 01 10 */ lwz r28, 0x110(r1) /* 802F91EC 002F614C 7C 08 03 A6 */ mtlr r0 /* 802F91F0 002F6150 38 21 01 30 */ addi r1, r1, 0x130 -/* 802F91F4 002F6154 4E 80 00 20 */ blr +/* 802F91F4 002F6154 4E 80 00 20 */ blr .global sub_802f91f8 sub_802f91f8: @@ -546,7 +546,7 @@ lbl_802F93C0: /* 802F93F4 002F6354 80 01 00 94 */ lwz r0, 0x94(r1) /* 802F93F8 002F6358 7C 08 03 A6 */ mtlr r0 /* 802F93FC 002F635C 38 21 00 90 */ addi r1, r1, 0x90 -/* 802F9400 002F6360 4E 80 00 20 */ blr +/* 802F9400 002F6360 4E 80 00 20 */ blr .global sub_802f9404 sub_802f9404: @@ -679,7 +679,7 @@ lbl_802F95C8: /* 802F95C8 002F6528 C0 04 00 00 */ lfs f0, 0(r4) /* 802F95CC 002F652C D0 03 00 14 */ stfs f0, 0x14(r3) /* 802F95D0 002F6530 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F95D4 002F6534 4E 80 00 20 */ blr +/* 802F95D4 002F6534 4E 80 00 20 */ blr .global sub_802f95d8 sub_802f95d8: @@ -729,7 +729,7 @@ lbl_802F9644: /* 802F967C 002F65DC 83 C1 00 08 */ lwz r30, 8(r1) /* 802F9680 002F65E0 7C 08 03 A6 */ mtlr r0 /* 802F9684 002F65E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F9688 002F65E8 4E 80 00 20 */ blr +/* 802F9688 002F65E8 4E 80 00 20 */ blr .global sub_802f968c sub_802f968c: @@ -745,7 +745,7 @@ sub_802f968c: /* 802F96B0 002F6610 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F96B4 002F6614 7C 08 03 A6 */ mtlr r0 /* 802F96B8 002F6618 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F96BC 002F661C 4E 80 00 20 */ blr +/* 802F96BC 002F661C 4E 80 00 20 */ blr .global VGetSegStatementSet__21CFBStreamedAnimReaderCFRC10CSegIdListR16CSegStatementSetRC13CCharAnimTime VGetSegStatementSet__21CFBStreamedAnimReaderCFRC10CSegIdListR16CSegStatementSetRC13CCharAnimTime: @@ -824,7 +824,7 @@ lbl_802F9798: /* 802F97B0 002F6710 83 81 00 10 */ lwz r28, 0x10(r1) /* 802F97B4 002F6714 7C 08 03 A6 */ mtlr r0 /* 802F97B8 002F6718 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F97BC 002F671C 4E 80 00 20 */ blr +/* 802F97BC 002F671C 4E 80 00 20 */ blr .global VGetSegStatementSet__21CFBStreamedAnimReaderCFRC10CSegIdListR16CSegStatementSet VGetSegStatementSet__21CFBStreamedAnimReaderCFRC10CSegIdListR16CSegStatementSet: @@ -903,7 +903,7 @@ lbl_802F9898: /* 802F98B0 002F6810 83 81 00 10 */ lwz r28, 0x10(r1) /* 802F98B4 002F6814 7C 08 03 A6 */ mtlr r0 /* 802F98B8 002F6818 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F98BC 002F681C 4E 80 00 20 */ blr +/* 802F98BC 002F681C 4E 80 00 20 */ blr .global VSetPhase__21CFBStreamedAnimReaderFf VSetPhase__21CFBStreamedAnimReaderFf: @@ -943,7 +943,7 @@ lbl_802F993C: /* 802F9940 002F68A0 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802F9944 002F68A4 7C 08 03 A6 */ mtlr r0 /* 802F9948 002F68A8 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F994C 002F68AC 4E 80 00 20 */ blr +/* 802F994C 002F68AC 4E 80 00 20 */ blr .global VAdvanceView__21CFBStreamedAnimReaderFRC13CCharAnimTime VAdvanceView__21CFBStreamedAnimReaderFRC13CCharAnimTime: @@ -1203,7 +1203,7 @@ lbl_802F9C48: /* 802F9CE4 002F6C44 D0 C1 00 B4 */ stfs f6, 0xb4(r1) /* 802F9CE8 002F6C48 D0 A1 00 B8 */ stfs f5, 0xb8(r1) /* 802F9CEC 002F6C4C 7D 89 03 A6 */ mtctr r12 -/* 802F9CF0 002F6C50 4E 80 04 21 */ bctrl +/* 802F9CF0 002F6C50 4E 80 04 21 */ bctrl /* 802F9CF4 002F6C54 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802F9CF8 002F6C58 41 82 00 88 */ beq lbl_802F9D80 /* 802F9CFC 002F6C5C C0 41 00 A8 */ lfs f2, 0xa8(r1) @@ -1271,7 +1271,7 @@ lbl_802F9DD4: /* 802F9DEC 002F6D4C 83 81 01 00 */ lwz r28, 0x100(r1) /* 802F9DF0 002F6D50 7C 08 03 A6 */ mtlr r0 /* 802F9DF4 002F6D54 38 21 01 20 */ addi r1, r1, 0x120 -/* 802F9DF8 002F6D58 4E 80 00 20 */ blr +/* 802F9DF8 002F6D58 4E 80 00 20 */ blr .global VReverseView__21CFBStreamedAnimReaderFRC13CCharAnimTime VReverseView__21CFBStreamedAnimReaderFRC13CCharAnimTime: @@ -1298,12 +1298,12 @@ VReverseView__21CFBStreamedAnimReaderFRC13CCharAnimTime: /* 802F9E4C 002F6DAC D0 C3 00 1C */ stfs f6, 0x1c(r3) /* 802F9E50 002F6DB0 D0 E3 00 20 */ stfs f7, 0x20(r3) /* 802F9E54 002F6DB4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F9E58 002F6DB8 4E 80 00 20 */ blr +/* 802F9E58 002F6DB8 4E 80 00 20 */ blr .global VSupportsReverseView__21CFBStreamedAnimReaderCFv VSupportsReverseView__21CFBStreamedAnimReaderCFv: /* 802F9E5C 002F6DBC 38 60 00 00 */ li r3, 0 -/* 802F9E60 002F6DC0 4E 80 00 20 */ blr +/* 802F9E60 002F6DC0 4E 80 00 20 */ blr .global VGetRotation__21CFBStreamedAnimReaderCFRC6CSegId VGetRotation__21CFBStreamedAnimReaderCFRC6CSegId: @@ -1375,7 +1375,7 @@ lbl_802F9F40: /* 802F9F50 002F6EB0 83 81 00 10 */ lwz r28, 0x10(r1) /* 802F9F54 002F6EB4 7C 08 03 A6 */ mtlr r0 /* 802F9F58 002F6EB8 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F9F5C 002F6EBC 4E 80 00 20 */ blr +/* 802F9F5C 002F6EBC 4E 80 00 20 */ blr .global VGetOffset__21CFBStreamedAnimReaderCFRC6CSegId VGetOffset__21CFBStreamedAnimReaderCFRC6CSegId: @@ -1455,7 +1455,7 @@ lbl_802FA060: /* 802FA06C 002F6FCC 83 A1 00 14 */ lwz r29, 0x14(r1) /* 802FA070 002F6FD0 7C 08 03 A6 */ mtlr r0 /* 802FA074 002F6FD4 38 21 00 20 */ addi r1, r1, 0x20 -/* 802FA078 002F6FD8 4E 80 00 20 */ blr +/* 802FA078 002F6FD8 4E 80 00 20 */ blr .global VHasOffset__21CFBStreamedAnimReaderCFRC6CSegId VHasOffset__21CFBStreamedAnimReaderCFRC6CSegId: @@ -1467,7 +1467,7 @@ VHasOffset__21CFBStreamedAnimReaderCFRC6CSegId: /* 802FA090 002F6FF0 28 00 FF FF */ cmplwi r0, 0xffff /* 802FA094 002F6FF4 40 82 00 0C */ bne lbl_802FA0A0 /* 802FA098 002F6FF8 38 60 00 00 */ li r3, 0 -/* 802FA09C 002F6FFC 4E 80 00 20 */ blr +/* 802FA09C 002F6FFC 4E 80 00 20 */ blr lbl_802FA0A0: /* 802FA0A0 002F7000 88 03 00 8C */ lbz r0, 0x8c(r3) /* 802FA0A4 002F7004 28 00 00 00 */ cmplwi r0, 0 @@ -1479,7 +1479,7 @@ lbl_802FA0B4: lbl_802FA0B8: /* 802FA0B8 002F7018 80 63 00 08 */ lwz r3, 8(r3) /* 802FA0BC 002F701C 7C 63 20 AE */ lbzx r3, r3, r4 -/* 802FA0C0 002F7020 4E 80 00 20 */ blr +/* 802FA0C0 002F7020 4E 80 00 20 */ blr .global VGetSteadyStateAnimInfo__21CFBStreamedAnimReaderCFv VGetSteadyStateAnimInfo__21CFBStreamedAnimReaderCFv: @@ -1495,7 +1495,7 @@ VGetSteadyStateAnimInfo__21CFBStreamedAnimReaderCFv: /* 802FA0E8 002F7048 D0 03 00 10 */ stfs f0, 0x10(r3) /* 802FA0EC 002F704C 88 04 00 78 */ lbz r0, 0x78(r4) /* 802FA0F0 002F7050 98 03 00 14 */ stb r0, 0x14(r3) -/* 802FA0F4 002F7054 4E 80 00 20 */ blr +/* 802FA0F4 002F7054 4E 80 00 20 */ blr .global VGetTimeRemaining__21CFBStreamedAnimReaderCFv VGetTimeRemaining__21CFBStreamedAnimReaderCFv: @@ -1518,7 +1518,7 @@ VGetTimeRemaining__21CFBStreamedAnimReaderCFv: /* 802FA138 002F7098 83 C1 00 18 */ lwz r30, 0x18(r1) /* 802FA13C 002F709C 7C 08 03 A6 */ mtlr r0 /* 802FA140 002F70A0 38 21 00 20 */ addi r1, r1, 0x20 -/* 802FA144 002F70A4 4E 80 00 20 */ blr +/* 802FA144 002F70A4 4E 80 00 20 */ blr .global VClone__21CFBStreamedAnimReaderCFv VClone__21CFBStreamedAnimReaderCFv: @@ -1556,7 +1556,7 @@ lbl_802FA1A4: /* 802FA1C0 002F7120 83 C1 00 18 */ lwz r30, 0x18(r1) /* 802FA1C4 002F7124 7C 08 03 A6 */ mtlr r0 /* 802FA1C8 002F7128 38 21 00 20 */ addi r1, r1, 0x20 -/* 802FA1CC 002F712C 4E 80 00 20 */ blr +/* 802FA1CC 002F712C 4E 80 00 20 */ blr .global __dt__21CFBStreamedAnimReaderFv __dt__21CFBStreamedAnimReaderFv: @@ -1616,7 +1616,7 @@ lbl_802FA28C: /* 802FA298 002F71F8 83 C1 00 08 */ lwz r30, 8(r1) /* 802FA29C 002F71FC 7C 08 03 A6 */ mtlr r0 /* 802FA2A0 002F7200 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FA2A4 002F7204 4E 80 00 20 */ blr +/* 802FA2A4 002F7204 4E 80 00 20 */ blr .global "__ct__21CFBStreamedAnimReaderFRC43TSubAnimTypeToken<22CFBStreamedCompression>13CCharAnimTime" "__ct__21CFBStreamedAnimReaderFRC43TSubAnimTypeToken<22CFBStreamedCompression>13CCharAnimTime": @@ -1689,7 +1689,7 @@ lbl_802FA328: /* 802FA3AC 002F730C 38 80 00 01 */ li r4, 1 /* 802FA3B0 002F7310 81 8C 00 20 */ lwz r12, 0x20(r12) /* 802FA3B4 002F7314 7D 89 03 A6 */ mtctr r12 -/* 802FA3B8 002F7318 4E 80 04 21 */ bctrl +/* 802FA3B8 002F7318 4E 80 04 21 */ bctrl lbl_802FA3BC: /* 802FA3BC 002F731C 3C 60 80 3F */ lis r3, lbl_803ED430@ha /* 802FA3C0 002F7320 3A DC 00 54 */ addi r22, r28, 0x54 @@ -1939,7 +1939,7 @@ lbl_802FA730: /* 802FA750 002F76B0 80 01 00 64 */ lwz r0, 0x64(r1) /* 802FA754 002F76B4 7C 08 03 A6 */ mtlr r0 /* 802FA758 002F76B8 38 21 00 60 */ addi r1, r1, 0x60 -/* 802FA75C 002F76BC 4E 80 00 20 */ blr +/* 802FA75C 002F76BC 4E 80 00 20 */ blr .global "IncrementInto__27CFBStreamedAnimReaderTotalsFR47CBitLevelLoader<28CMemoryInputToBitLevelLoader>RC22CFBStreamedCompressionR27CFBStreamedAnimReaderTotals" "IncrementInto__27CFBStreamedAnimReaderTotalsFR47CBitLevelLoader<28CMemoryInputToBitLevelLoader>RC22CFBStreamedCompressionR27CFBStreamedAnimReaderTotals": @@ -2424,12 +2424,12 @@ lbl_802FAE24: /* 802FAE2C 002F7D8C 90 06 00 1C */ stw r0, 0x1c(r6) /* 802FAE30 002F7D90 BB 61 00 4C */ lmw r27, 0x4c(r1) /* 802FAE34 002F7D94 38 21 00 60 */ addi r1, r1, 0x60 -/* 802FAE38 002F7D98 4E 80 00 20 */ blr +/* 802FAE38 002F7D98 4E 80 00 20 */ blr .global sub_802fae3c sub_802fae3c: /* 802FAE3C 002F7D9C C0 23 00 78 */ lfs f1, 0x78(r3) -/* 802FAE40 002F7DA0 4E 80 00 20 */ blr +/* 802FAE40 002F7DA0 4E 80 00 20 */ blr .global sub_802fae44 sub_802fae44: @@ -2459,7 +2459,7 @@ lbl_802FAE8C: /* 802FAE90 002F7DF0 80 01 00 14 */ lwz r0, 0x14(r1) /* 802FAE94 002F7DF4 7C 08 03 A6 */ mtlr r0 /* 802FAE98 002F7DF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FAE9C 002F7DFC 4E 80 00 20 */ blr +/* 802FAE9C 002F7DFC 4E 80 00 20 */ blr .global sub_802faea0 sub_802faea0: @@ -2629,7 +2629,7 @@ lbl_802FB0D4: /* 802FB0D8 002F8038 80 01 00 54 */ lwz r0, 0x54(r1) /* 802FB0DC 002F803C 7C 08 03 A6 */ mtlr r0 /* 802FB0E0 002F8040 38 21 00 50 */ addi r1, r1, 0x50 -/* 802FB0E4 002F8044 4E 80 00 20 */ blr +/* 802FB0E4 002F8044 4E 80 00 20 */ blr .global sub_802fb0e8 sub_802fb0e8: @@ -2637,7 +2637,7 @@ sub_802fb0e8: /* 802FB0EC 002F804C 38 64 00 04 */ addi r3, r4, 4 /* 802FB0F0 002F8050 7C 09 03 A6 */ mtctr r0 /* 802FB0F4 002F8054 2C 00 00 00 */ cmpwi r0, 0 -/* 802FB0F8 002F8058 4C 81 00 20 */ blelr +/* 802FB0F8 002F8058 4C 81 00 20 */ blelr lbl_802FB0FC: /* 802FB0FC 002F805C A0 03 00 04 */ lhz r0, 4(r3) /* 802FB100 002F8060 28 00 00 00 */ cmplwi r0, 0 @@ -2656,7 +2656,7 @@ lbl_802FB128: /* 802FB128 002F8088 38 63 00 0B */ addi r3, r3, 0xb lbl_802FB12C: /* 802FB12C 002F808C 42 00 FF D0 */ bdnz lbl_802FB0FC -/* 802FB130 002F8090 4E 80 00 20 */ blr +/* 802FB130 002F8090 4E 80 00 20 */ blr .global "__ct__23CFBStreamedPairOfTotalsFRC43TSubAnimTypeToken<22CFBStreamedCompression>" "__ct__23CFBStreamedPairOfTotalsFRC43TSubAnimTypeToken<22CFBStreamedCompression>": @@ -2746,7 +2746,7 @@ lbl_802FB21C: /* 802FB278 002F81D8 80 01 00 54 */ lwz r0, 0x54(r1) /* 802FB27C 002F81DC 7C 08 03 A6 */ mtlr r0 /* 802FB280 002F81E0 38 21 00 50 */ addi r1, r1, 0x50 -/* 802FB284 002F81E4 4E 80 00 20 */ blr +/* 802FB284 002F81E4 4E 80 00 20 */ blr .global CalculateDown__27CFBStreamedAnimReaderTotalsFv CalculateDown__27CFBStreamedAnimReaderTotalsFv: @@ -2867,7 +2867,7 @@ lbl_802FB408: /* 802FB43C 002F839C 83 81 00 30 */ lwz r28, 0x30(r1) /* 802FB440 002F83A0 7C 08 03 A6 */ mtlr r0 /* 802FB444 002F83A4 38 21 00 60 */ addi r1, r1, 0x60 -/* 802FB448 002F83A8 4E 80 00 20 */ blr +/* 802FB448 002F83A8 4E 80 00 20 */ blr .global sub_802fb44c sub_802fb44c: @@ -2894,7 +2894,7 @@ lbl_802FB478: /* 802FB498 002F83F8 81 23 00 04 */ lwz r9, 4(r3) /* 802FB49C 002F83FC 7C 09 03 A6 */ mtctr r0 /* 802FB4A0 002F8400 2C 00 00 00 */ cmpwi r0, 0 -/* 802FB4A4 002F8404 4D 82 00 20 */ beqlr +/* 802FB4A4 002F8404 4D 82 00 20 */ beqlr lbl_802FB4A8: /* 802FB4A8 002F8408 80 07 00 00 */ lwz r0, 0(r7) /* 802FB4AC 002F840C 39 40 00 00 */ li r10, 0 @@ -3004,7 +3004,7 @@ lbl_802FB5FC: /* 802FB5FC 002F855C 39 08 00 02 */ addi r8, r8, 2 /* 802FB600 002F8560 38 84 00 01 */ addi r4, r4, 1 /* 802FB604 002F8564 42 00 FE A4 */ bdnz lbl_802FB4A8 -/* 802FB608 002F8568 4E 80 00 20 */ blr +/* 802FB608 002F8568 4E 80 00 20 */ blr .global sub_802fb60c sub_802fb60c: @@ -3032,7 +3032,7 @@ lbl_802FB64C: /* 802FB658 002F85B8 83 C1 00 08 */ lwz r30, 8(r1) /* 802FB65C 002F85BC 7C 08 03 A6 */ mtlr r0 /* 802FB660 002F85C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FB664 002F85C4 4E 80 00 20 */ blr +/* 802FB664 002F85C4 4E 80 00 20 */ blr .global sub_802fb668 sub_802fb668: @@ -3090,7 +3090,7 @@ sub_802fb668: /* 802FB734 002F8694 80 01 00 24 */ lwz r0, 0x24(r1) /* 802FB738 002F8698 7C 08 03 A6 */ mtlr r0 /* 802FB73C 002F869C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802FB740 002F86A0 4E 80 00 20 */ blr +/* 802FB740 002F86A0 4E 80 00 20 */ blr .global __ct__27CFBStreamedAnimReaderTotalsFRC22CFBStreamedCompression __ct__27CFBStreamedAnimReaderTotalsFRC22CFBStreamedCompression: @@ -3140,7 +3140,7 @@ lbl_802FB7B8: /* 802FB7EC 002F874C 83 C1 00 08 */ lwz r30, 8(r1) /* 802FB7F0 002F8750 7C 08 03 A6 */ mtlr r0 /* 802FB7F4 002F8754 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FB7F8 002F8758 4E 80 00 20 */ blr +/* 802FB7F8 002F8758 4E 80 00 20 */ blr .global "__dt__41TAnimSourceInfo<22CFBStreamedCompression>Fv" "__dt__41TAnimSourceInfo<22CFBStreamedCompression>Fv": @@ -3182,7 +3182,7 @@ lbl_802FB870: /* 802FB87C 002F87DC 83 C1 00 08 */ lwz r30, 8(r1) /* 802FB880 002F87E0 7C 08 03 A6 */ mtlr r0 /* 802FB884 002F87E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FB888 002F87E8 4E 80 00 20 */ blr +/* 802FB888 002F87E8 4E 80 00 20 */ blr .global "HasPOIData__41TAnimSourceInfo<22CFBStreamedCompression>CFv" "HasPOIData__41TAnimSourceInfo<22CFBStreamedCompression>CFv": @@ -3191,7 +3191,7 @@ lbl_802FB870: /* 802FB894 002F87F4 7C 03 00 D0 */ neg r0, r3 /* 802FB898 002F87F8 7C 00 1B 78 */ or r0, r0, r3 /* 802FB89C 002F87FC 54 03 0F FE */ srwi r3, r0, 0x1f -/* 802FB8A0 002F8800 4E 80 00 20 */ blr +/* 802FB8A0 002F8800 4E 80 00 20 */ blr .global "GetAnimationDuration__41TAnimSourceInfo<22CFBStreamedCompression>CFv" "GetAnimationDuration__41TAnimSourceInfo<22CFBStreamedCompression>CFv": @@ -3206,7 +3206,7 @@ lbl_802FB870: /* 802FB8C4 002F8824 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802FB8C8 002F8828 7C 08 03 A6 */ mtlr r0 /* 802FB8CC 002F882C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FB8D0 002F8830 4E 80 00 20 */ blr +/* 802FB8D0 002F8830 4E 80 00 20 */ blr .global "GetSoundPOIStream__41TAnimSourceInfo<22CFBStreamedCompression>CFv" "GetSoundPOIStream__41TAnimSourceInfo<22CFBStreamedCompression>CFv": @@ -3214,7 +3214,7 @@ lbl_802FB870: /* 802FB8D8 002F8838 80 63 00 08 */ lwz r3, 8(r3) /* 802FB8DC 002F883C 80 63 00 08 */ lwz r3, 8(r3) /* 802FB8E0 002F8840 38 63 00 34 */ addi r3, r3, 0x34 -/* 802FB8E4 002F8844 4E 80 00 20 */ blr +/* 802FB8E4 002F8844 4E 80 00 20 */ blr .global "GetParticlePOIStream__41TAnimSourceInfo<22CFBStreamedCompression>CFv" "GetParticlePOIStream__41TAnimSourceInfo<22CFBStreamedCompression>CFv": @@ -3222,7 +3222,7 @@ lbl_802FB870: /* 802FB8EC 002F884C 80 63 00 08 */ lwz r3, 8(r3) /* 802FB8F0 002F8850 80 63 00 08 */ lwz r3, 8(r3) /* 802FB8F4 002F8854 38 63 00 24 */ addi r3, r3, 0x24 -/* 802FB8F8 002F8858 4E 80 00 20 */ blr +/* 802FB8F8 002F8858 4E 80 00 20 */ blr .global "GetInt32POIStream__41TAnimSourceInfo<22CFBStreamedCompression>CFv" "GetInt32POIStream__41TAnimSourceInfo<22CFBStreamedCompression>CFv": @@ -3230,7 +3230,7 @@ lbl_802FB870: /* 802FB900 002F8860 80 63 00 08 */ lwz r3, 8(r3) /* 802FB904 002F8864 80 63 00 08 */ lwz r3, 8(r3) /* 802FB908 002F8868 38 63 00 14 */ addi r3, r3, 0x14 -/* 802FB90C 002F886C 4E 80 00 20 */ blr +/* 802FB90C 002F886C 4E 80 00 20 */ blr .global "GetBoolPOIStream__41TAnimSourceInfo<22CFBStreamedCompression>CFv" "GetBoolPOIStream__41TAnimSourceInfo<22CFBStreamedCompression>CFv": diff --git a/asm/Kyoto/Animation/CFBStreamedCompression.s b/asm/Kyoto/Animation/CFBStreamedCompression.s index 5352361a..687e083c 100644 --- a/asm/Kyoto/Animation/CFBStreamedCompression.s +++ b/asm/Kyoto/Animation/CFBStreamedCompression.s @@ -16,7 +16,7 @@ GetAnimationDuration__22CFBStreamedCompressionCFv: /* 802FB948 002F88A8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802FB94C 002F88AC 7C 08 03 A6 */ mtlr r0 /* 802FB950 002F88B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FB954 002F88B4 4E 80 00 20 */ blr +/* 802FB954 002F88B4 4E 80 00 20 */ blr .global __dt__22CFBStreamedCompressionFv __dt__22CFBStreamedCompressionFv: @@ -59,7 +59,7 @@ lbl_802FB9C8: /* 802FB9D8 002F8938 83 A1 00 14 */ lwz r29, 0x14(r1) /* 802FB9DC 002F893C 7C 08 03 A6 */ mtlr r0 /* 802FB9E0 002F8940 38 21 00 20 */ addi r1, r1, 0x20 -/* 802FB9E4 002F8944 4E 80 00 20 */ blr +/* 802FB9E4 002F8944 4E 80 00 20 */ blr .global __ct__22CFBStreamedCompressionFR12CInputStreamR12IObjectStore __ct__22CFBStreamedCompressionFR12CInputStreamR12IObjectStore: @@ -132,7 +132,7 @@ lbl_802FBA90: /* 802FBAEC 002F8A4C 81 9C 00 00 */ lwz r12, 0(r28) /* 802FBAF0 002F8A50 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802FBAF4 002F8A54 7D 89 03 A6 */ mtctr r12 -/* 802FBAF8 002F8A58 4E 80 04 21 */ bctrl +/* 802FBAF8 002F8A58 4E 80 04 21 */ bctrl /* 802FBAFC 002F8A5C 7F E3 FB 78 */ mr r3, r31 /* 802FBB00 002F8A60 38 81 00 14 */ addi r4, r1, 0x14 /* 802FBB04 002F8A64 3B 60 00 01 */ li r27, 1 @@ -326,7 +326,7 @@ lbl_802FBD3C: /* 802FBDA0 002F8D00 80 01 00 F4 */ lwz r0, 0xf4(r1) /* 802FBDA4 002F8D04 7C 08 03 A6 */ mtlr r0 /* 802FBDA8 002F8D08 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 802FBDAC 002F8D0C 4E 80 00 20 */ blr +/* 802FBDAC 002F8D0C 4E 80 00 20 */ blr .global GetRotationsAndOffsets__22CFBStreamedCompressionFUiR12CInputStream GetRotationsAndOffsets__22CFBStreamedCompressionFUiR12CInputStream: @@ -459,7 +459,7 @@ lbl_802FBF64: /* 802FBF68 002F8EC8 80 01 00 34 */ lwz r0, 0x34(r1) /* 802FBF6C 002F8ECC 7C 08 03 A6 */ mtlr r0 /* 802FBF70 002F8ED0 38 21 00 30 */ addi r1, r1, 0x30 -/* 802FBF74 002F8ED4 4E 80 00 20 */ blr +/* 802FBF74 002F8ED4 4E 80 00 20 */ blr .global sub_802fbf78 sub_802fbf78: @@ -468,7 +468,7 @@ sub_802fbf78: /* 802FBF80 002F8EE0 38 60 00 00 */ li r3, 0 /* 802FBF84 002F8EE4 7C 09 03 A6 */ mtctr r0 /* 802FBF88 002F8EE8 2C 00 00 00 */ cmpwi r0, 0 -/* 802FBF8C 002F8EEC 4D 82 00 20 */ beqlr +/* 802FBF8C 002F8EEC 4D 82 00 20 */ beqlr lbl_802FBF90: /* 802FBF90 002F8EF0 A0 08 00 04 */ lhz r0, 4(r8) /* 802FBF94 002F8EF4 28 00 00 00 */ cmplwi r0, 0 @@ -568,7 +568,7 @@ lbl_802FC0C4: /* 802FC0C4 002F9024 39 04 00 0B */ addi r8, r4, 0xb lbl_802FC0C8: /* 802FC0C8 002F9028 42 00 FE C8 */ bdnz lbl_802FBF90 -/* 802FC0CC 002F902C 4E 80 00 20 */ blr +/* 802FC0CC 002F902C 4E 80 00 20 */ blr .global sub_802fc0d0 sub_802fc0d0: @@ -583,7 +583,7 @@ sub_802fc0d0: /* 802FC0F0 002F9050 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802FC0F4 002F9054 7C 08 03 A6 */ mtlr r0 /* 802FC0F8 002F9058 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FC0FC 002F905C 4E 80 00 20 */ blr +/* 802FC0FC 002F905C 4E 80 00 20 */ blr .global sub_802fc100 sub_802fc100: @@ -632,7 +632,7 @@ lbl_802FC17C: /* 802FC18C 002F90EC 80 01 00 24 */ lwz r0, 0x24(r1) /* 802FC190 002F90F0 7C 08 03 A6 */ mtlr r0 /* 802FC194 002F90F4 38 21 00 20 */ addi r1, r1, 0x20 -/* 802FC198 002F90F8 4E 80 00 20 */ blr +/* 802FC198 002F90F8 4E 80 00 20 */ blr .global sub_802fc19c sub_802fc19c: @@ -713,7 +713,7 @@ lbl_802FC290: /* 802FC2A4 002F9204 83 81 00 10 */ lwz r28, 0x10(r1) /* 802FC2A8 002F9208 7C 08 03 A6 */ mtlr r0 /* 802FC2AC 002F920C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802FC2B0 002F9210 4E 80 00 20 */ blr +/* 802FC2B0 002F9210 4E 80 00 20 */ blr .global __ct__26CStandardMultiFormatHeaderFR12CInputStream __ct__26CStandardMultiFormatHeaderFR12CInputStream: diff --git a/asm/Kyoto/Animation/CHalfTransition.s b/asm/Kyoto/Animation/CHalfTransition.s index 738097f6..7460e9d4 100644 --- a/asm/Kyoto/Animation/CHalfTransition.s +++ b/asm/Kyoto/Animation/CHalfTransition.s @@ -31,4 +31,4 @@ __ct__15CHalfTransitionFR12CInputStream: /* 803667A8 00363708 83 C1 00 18 */ lwz r30, 0x18(r1) /* 803667AC 0036370C 7C 08 03 A6 */ mtlr r0 /* 803667B0 00363710 38 21 00 20 */ addi r1, r1, 0x20 -/* 803667B4 00363714 4E 80 00 20 */ blr +/* 803667B4 00363714 4E 80 00 20 */ blr diff --git a/asm/Kyoto/Animation/CHierarchyPoseBuilder.s b/asm/Kyoto/Animation/CHierarchyPoseBuilder.s index d8dd83fe..bbc0aac9 100644 --- a/asm/Kyoto/Animation/CHierarchyPoseBuilder.s +++ b/asm/Kyoto/Animation/CHierarchyPoseBuilder.s @@ -30,7 +30,7 @@ sub_802fc358: /* 802FC358 002F92B8 80 63 00 08 */ lwz r3, 8(r3) /* 802FC35C 002F92BC 80 03 00 0C */ lwz r0, 0xc(r3) /* 802FC360 002F92C0 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 802FC364 002F92C4 4E 80 00 20 */ blr +/* 802FC364 002F92C4 4E 80 00 20 */ blr .global BuildTransform__21CHierarchyPoseBuilderCFRC6CSegIdR12CTransform4f BuildTransform__21CHierarchyPoseBuilderCFRC6CSegIdR12CTransform4f: @@ -223,7 +223,7 @@ lbl_802FC5E4: /* 802FC618 002F9578 80 01 01 F4 */ lwz r0, 0x1f4(r1) /* 802FC61C 002F957C 7C 08 03 A6 */ mtlr r0 /* 802FC620 002F9580 38 21 01 F0 */ addi r1, r1, 0x1f0 -/* 802FC624 002F9584 4E 80 00 20 */ blr +/* 802FC624 002F9584 4E 80 00 20 */ blr .global RecursivelyBuildNoScale__21CHierarchyPoseBuilderCFRC6CSegIdRCQ221CHierarchyPoseBuilder9CTreeNodeR17CPoseAsTransformsRC11CQuaternionRC9CMatrix3fRC9CVector3f RecursivelyBuildNoScale__21CHierarchyPoseBuilderCFRC6CSegIdRCQ221CHierarchyPoseBuilder9CTreeNodeR17CPoseAsTransformsRC11CQuaternionRC9CMatrix3fRC9CVector3f: @@ -303,7 +303,7 @@ lbl_802FC738: /* 802FC744 002F96A4 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 802FC748 002F96A8 7C 08 03 A6 */ mtlr r0 /* 802FC74C 002F96AC 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 802FC750 002F96B0 4E 80 00 20 */ blr +/* 802FC750 002F96B0 4E 80 00 20 */ blr .global RecursivelyBuild__21CHierarchyPoseBuilderCFRC6CSegIdRCQ221CHierarchyPoseBuilder9CTreeNodeR17CPoseAsTransformsRC11CQuaternionRC9CMatrix3fRC9CVector3f RecursivelyBuild__21CHierarchyPoseBuilderCFRC6CSegIdRCQ221CHierarchyPoseBuilder9CTreeNodeR17CPoseAsTransformsRC11CQuaternionRC9CMatrix3fRC9CVector3f: @@ -423,7 +423,7 @@ lbl_802FC8F4: /* 802FC900 002F9860 80 01 01 64 */ lwz r0, 0x164(r1) /* 802FC904 002F9864 7C 08 03 A6 */ mtlr r0 /* 802FC908 002F9868 38 21 01 60 */ addi r1, r1, 0x160 -/* 802FC90C 002F986C 4E 80 00 20 */ blr +/* 802FC90C 002F986C 4E 80 00 20 */ blr .global BuildNoScale__21CHierarchyPoseBuilderFR17CPoseAsTransforms BuildNoScale__21CHierarchyPoseBuilderFR17CPoseAsTransforms: @@ -460,7 +460,7 @@ BuildNoScale__21CHierarchyPoseBuilderFR17CPoseAsTransforms: /* 802FC988 002F98E8 83 C1 00 18 */ lwz r30, 0x18(r1) /* 802FC98C 002F98EC 7C 08 03 A6 */ mtlr r0 /* 802FC990 002F98F0 38 21 00 20 */ addi r1, r1, 0x20 -/* 802FC994 002F98F4 4E 80 00 20 */ blr +/* 802FC994 002F98F4 4E 80 00 20 */ blr .global sub_802fc998 sub_802fc998: @@ -592,7 +592,7 @@ lbl_802FCB68: /* 802FCB78 002F9AD8 83 81 00 70 */ lwz r28, 0x70(r1) /* 802FCB7C 002F9ADC 7C 08 03 A6 */ mtlr r0 /* 802FCB80 002F9AE0 38 21 00 80 */ addi r1, r1, 0x80 -/* 802FCB84 002F9AE4 4E 80 00 20 */ blr +/* 802FCB84 002F9AE4 4E 80 00 20 */ blr .global __ct__21CHierarchyPoseBuilderFRC18CLayoutDescription __ct__21CHierarchyPoseBuilderFRC18CLayoutDescription: @@ -721,7 +721,7 @@ lbl_802FCD18: /* 802FCD34 002F9C94 80 01 00 34 */ lwz r0, 0x34(r1) /* 802FCD38 002F9C98 7C 08 03 A6 */ mtlr r0 /* 802FCD3C 002F9C9C 38 21 00 30 */ addi r1, r1, 0x30 -/* 802FCD40 002F9CA0 4E 80 00 20 */ blr +/* 802FCD40 002F9CA0 4E 80 00 20 */ blr .global sub_802fcd44 sub_802fcd44: @@ -778,7 +778,7 @@ lbl_802FCDF8: /* 802FCE08 002F9D68 83 A1 00 14 */ lwz r29, 0x14(r1) /* 802FCE0C 002F9D6C 7C 08 03 A6 */ mtlr r0 /* 802FCE10 002F9D70 38 21 00 20 */ addi r1, r1, 0x20 -/* 802FCE14 002F9D74 4E 80 00 20 */ blr +/* 802FCE14 002F9D74 4E 80 00 20 */ blr .global sub_802fce18 sub_802fce18: @@ -818,4 +818,4 @@ lbl_802FCE7C: /* 802FCE98 002F9DF8 88 83 00 00 */ lbz r4, 0(r3) /* 802FCE9C 002F9DFC 38 04 00 01 */ addi r0, r4, 1 /* 802FCEA0 002F9E00 98 03 00 00 */ stb r0, 0(r3) -/* 802FCEA4 002F9E04 4E 80 00 20 */ blr +/* 802FCEA4 002F9E04 4E 80 00 20 */ blr diff --git a/asm/Kyoto/Animation/CInt32POINode.s b/asm/Kyoto/Animation/CInt32POINode.s index c02be5d4..e7fd3207 100644 --- a/asm/Kyoto/Animation/CInt32POINode.s +++ b/asm/Kyoto/Animation/CInt32POINode.s @@ -45,7 +45,7 @@ CopyNodeMinusStartTime__13CInt32POINodeFRC13CInt32POINodeRC13CCharAnimTime: /* 802FCF40 002F9EA0 83 81 00 30 */ lwz r28, 0x30(r1) /* 802FCF44 002F9EA4 7C 08 03 A6 */ mtlr r0 /* 802FCF48 002F9EA8 38 21 00 40 */ addi r1, r1, 0x40 -/* 802FCF4C 002F9EAC 4E 80 00 20 */ blr +/* 802FCF4C 002F9EAC 4E 80 00 20 */ blr .global __ct__13CInt32POINodeFR12CInputStream __ct__13CInt32POINodeFR12CInputStream: @@ -73,4 +73,4 @@ __ct__13CInt32POINodeFR12CInputStream: /* 802FCFA4 002F9F04 83 C1 00 18 */ lwz r30, 0x18(r1) /* 802FCFA8 002F9F08 7C 08 03 A6 */ mtlr r0 /* 802FCFAC 002F9F0C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802FCFB0 002F9F10 4E 80 00 20 */ blr +/* 802FCFB0 002F9F10 4E 80 00 20 */ blr diff --git a/asm/Kyoto/Animation/CMetaAnimBlend.s b/asm/Kyoto/Animation/CMetaAnimBlend.s index adb5ba2f..be41fed3 100644 --- a/asm/Kyoto/Animation/CMetaAnimBlend.s +++ b/asm/Kyoto/Animation/CMetaAnimBlend.s @@ -13,7 +13,7 @@ lbl_803ECCD0: .4byte GetType__14CMetaAnimBlendCFv .4byte WriteAnimData__14CMetaAnimBlendCFR13COutputStream .4byte VGetAnimationTree__14CMetaAnimBlendCFRC15CAnimSysContextRC24CMetaAnimTreeBuildOrders - + .section .text, "ax" @@ -57,12 +57,12 @@ lbl_802DF958: /* 802DF964 002DC8C4 83 C1 00 08 */ lwz r30, 8(r1) /* 802DF968 002DC8C8 7C 08 03 A6 */ mtlr r0 /* 802DF96C 002DC8CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DF970 002DC8D0 4E 80 00 20 */ blr +/* 802DF970 002DC8D0 4E 80 00 20 */ blr .global GetType__14CMetaAnimBlendCFv GetType__14CMetaAnimBlendCFv: /* 802DF974 002DC8D4 38 60 00 01 */ li r3, 1 -/* 802DF978 002DC8D8 4E 80 00 20 */ blr +/* 802DF978 002DC8D8 4E 80 00 20 */ blr .global WriteAnimData__14CMetaAnimBlendCFR13COutputStream WriteAnimData__14CMetaAnimBlendCFR13COutputStream: @@ -116,7 +116,7 @@ lbl_802DFA0C: /* 802DFA34 002DC994 80 01 00 24 */ lwz r0, 0x24(r1) /* 802DFA38 002DC998 7C 08 03 A6 */ mtlr r0 /* 802DFA3C 002DC99C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802DFA40 002DC9A0 4E 80 00 20 */ blr +/* 802DFA40 002DC9A0 4E 80 00 20 */ blr .global "GetUniquePrimitives__14CMetaAnimBlendCFRQ24rstl72set<10CPrimitive,Q24rstl18less<10CPrimitive>,Q24rstl17rmemory_allocator>" "GetUniquePrimitives__14CMetaAnimBlendCFRQ24rstl72set<10CPrimitive,Q24rstl18less<10CPrimitive>,Q24rstl17rmemory_allocator>": @@ -132,20 +132,20 @@ lbl_802DFA0C: /* 802DFA68 002DC9C8 81 83 00 00 */ lwz r12, 0(r3) /* 802DFA6C 002DC9CC 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802DFA70 002DC9D0 7D 89 03 A6 */ mtctr r12 -/* 802DFA74 002DC9D4 4E 80 04 21 */ bctrl +/* 802DFA74 002DC9D4 4E 80 04 21 */ bctrl /* 802DFA78 002DC9D8 80 7E 00 08 */ lwz r3, 8(r30) /* 802DFA7C 002DC9DC 7F E4 FB 78 */ mr r4, r31 /* 802DFA80 002DC9E0 80 63 00 00 */ lwz r3, 0(r3) /* 802DFA84 002DC9E4 81 83 00 00 */ lwz r12, 0(r3) /* 802DFA88 002DC9E8 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802DFA8C 002DC9EC 7D 89 03 A6 */ mtctr r12 -/* 802DFA90 002DC9F0 4E 80 04 21 */ bctrl +/* 802DFA90 002DC9F0 4E 80 04 21 */ bctrl /* 802DFA94 002DC9F4 80 01 00 14 */ lwz r0, 0x14(r1) /* 802DFA98 002DC9F8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802DFA9C 002DC9FC 83 C1 00 08 */ lwz r30, 8(r1) /* 802DFAA0 002DCA00 7C 08 03 A6 */ mtlr r0 /* 802DFAA4 002DCA04 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DFAA8 002DCA08 4E 80 00 20 */ blr +/* 802DFAA8 002DCA08 4E 80 00 20 */ blr .global VGetAnimationTree__14CMetaAnimBlendCFRC15CAnimSysContextRC24CMetaAnimTreeBuildOrders VGetAnimationTree__14CMetaAnimBlendCFRC15CAnimSysContextRC24CMetaAnimTreeBuildOrders: @@ -359,7 +359,7 @@ lbl_802DFDB4: /* 802DFDC8 002DCD28 81 84 00 00 */ lwz r12, 0(r4) /* 802DFDCC 002DCD2C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802DFDD0 002DCD30 7D 89 03 A6 */ mtctr r12 -/* 802DFDD4 002DCD34 4E 80 04 21 */ bctrl +/* 802DFDD4 002DCD34 4E 80 04 21 */ bctrl /* 802DFDD8 002DCD38 80 A1 00 0C */ lwz r5, 0xc(r1) /* 802DFDDC 002DCD3C 38 61 00 0C */ addi r3, r1, 0xc /* 802DFDE0 002DCD40 90 A1 00 14 */ stw r5, 0x14(r1) @@ -375,7 +375,7 @@ lbl_802DFDB4: /* 802DFE08 002DCD68 81 84 00 00 */ lwz r12, 0(r4) /* 802DFE0C 002DCD6C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802DFE10 002DCD70 7D 89 03 A6 */ mtctr r12 -/* 802DFE14 002DCD74 4E 80 04 21 */ bctrl +/* 802DFE14 002DCD74 4E 80 04 21 */ bctrl /* 802DFE18 002DCD78 80 A1 00 08 */ lwz r5, 8(r1) /* 802DFE1C 002DCD7C 38 61 00 08 */ addi r3, r1, 8 /* 802DFE20 002DCD80 90 A1 00 10 */ stw r5, 0x10(r1) @@ -444,7 +444,7 @@ lbl_802DFEE0: /* 802DFF10 002DCE70 80 01 03 14 */ lwz r0, 0x314(r1) /* 802DFF14 002DCE74 7C 08 03 A6 */ mtlr r0 /* 802DFF18 002DCE78 38 21 03 10 */ addi r1, r1, 0x310 -/* 802DFF1C 002DCE7C 4E 80 00 20 */ blr +/* 802DFF1C 002DCE7C 4E 80 00 20 */ blr .global __ct__14CMetaAnimBlendFR12CInputStream __ct__14CMetaAnimBlendFR12CInputStream: diff --git a/asm/Kyoto/Animation/CMetaAnimPhaseBlend.s b/asm/Kyoto/Animation/CMetaAnimPhaseBlend.s index 2b2ee953..9b4a2f79 100644 --- a/asm/Kyoto/Animation/CMetaAnimPhaseBlend.s +++ b/asm/Kyoto/Animation/CMetaAnimPhaseBlend.s @@ -90,12 +90,12 @@ lbl_802E02B0: /* 802E02BC 002DD21C 83 C1 00 08 */ lwz r30, 8(r1) /* 802E02C0 002DD220 7C 08 03 A6 */ mtlr r0 /* 802E02C4 002DD224 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E02C8 002DD228 4E 80 00 20 */ blr +/* 802E02C8 002DD228 4E 80 00 20 */ blr .global GetType__19CMetaAnimPhaseBlendCFv GetType__19CMetaAnimPhaseBlendCFv: /* 802E02CC 002DD22C 38 60 00 02 */ li r3, 2 -/* 802E02D0 002DD230 4E 80 00 20 */ blr +/* 802E02D0 002DD230 4E 80 00 20 */ blr .global WriteAnimData__19CMetaAnimPhaseBlendCFR13COutputStream WriteAnimData__19CMetaAnimPhaseBlendCFR13COutputStream: @@ -149,7 +149,7 @@ lbl_802E0364: /* 802E038C 002DD2EC 80 01 00 24 */ lwz r0, 0x24(r1) /* 802E0390 002DD2F0 7C 08 03 A6 */ mtlr r0 /* 802E0394 002DD2F4 38 21 00 20 */ addi r1, r1, 0x20 -/* 802E0398 002DD2F8 4E 80 00 20 */ blr +/* 802E0398 002DD2F8 4E 80 00 20 */ blr .global "GetUniquePrimitives__19CMetaAnimPhaseBlendCFRQ24rstl72set<10CPrimitive,Q24rstl18less<10CPrimitive>,Q24rstl17rmemory_allocator>" "GetUniquePrimitives__19CMetaAnimPhaseBlendCFRQ24rstl72set<10CPrimitive,Q24rstl18less<10CPrimitive>,Q24rstl17rmemory_allocator>": @@ -165,20 +165,20 @@ lbl_802E0364: /* 802E03C0 002DD320 81 83 00 00 */ lwz r12, 0(r3) /* 802E03C4 002DD324 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802E03C8 002DD328 7D 89 03 A6 */ mtctr r12 -/* 802E03CC 002DD32C 4E 80 04 21 */ bctrl +/* 802E03CC 002DD32C 4E 80 04 21 */ bctrl /* 802E03D0 002DD330 80 7E 00 08 */ lwz r3, 8(r30) /* 802E03D4 002DD334 7F E4 FB 78 */ mr r4, r31 /* 802E03D8 002DD338 80 63 00 00 */ lwz r3, 0(r3) /* 802E03DC 002DD33C 81 83 00 00 */ lwz r12, 0(r3) /* 802E03E0 002DD340 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802E03E4 002DD344 7D 89 03 A6 */ mtctr r12 -/* 802E03E8 002DD348 4E 80 04 21 */ bctrl +/* 802E03E8 002DD348 4E 80 04 21 */ bctrl /* 802E03EC 002DD34C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802E03F0 002DD350 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802E03F4 002DD354 83 C1 00 08 */ lwz r30, 8(r1) /* 802E03F8 002DD358 7C 08 03 A6 */ mtlr r0 /* 802E03FC 002DD35C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E0400 002DD360 4E 80 00 20 */ blr +/* 802E0400 002DD360 4E 80 00 20 */ blr .global VGetAnimationTree__19CMetaAnimPhaseBlendCFRC15CAnimSysContextRC24CMetaAnimTreeBuildOrders VGetAnimationTree__19CMetaAnimPhaseBlendCFRC15CAnimSysContextRC24CMetaAnimTreeBuildOrders: @@ -209,7 +209,7 @@ VGetAnimationTree__19CMetaAnimPhaseBlendCFRC15CAnimSysContextRC24CMetaAnimTreeBu /* 802E0464 002DD3C4 38 C1 02 20 */ addi r6, r1, 0x220 /* 802E0468 002DD3C8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802E046C 002DD3CC 7D 89 03 A6 */ mtctr r12 -/* 802E0470 002DD3D0 4E 80 04 21 */ bctrl +/* 802E0470 002DD3D0 4E 80 04 21 */ bctrl /* 802E0474 002DD3D4 38 00 00 00 */ li r0, 0 /* 802E0478 002DD3D8 98 01 02 A4 */ stb r0, 0x2a4(r1) /* 802E047C 002DD3DC 98 01 02 60 */ stb r0, 0x260(r1) @@ -225,7 +225,7 @@ lbl_802E0484: /* 802E04A0 002DD400 81 84 00 00 */ lwz r12, 0(r4) /* 802E04A4 002DD404 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802E04A8 002DD408 7D 89 03 A6 */ mtctr r12 -/* 802E04AC 002DD40C 4E 80 04 21 */ bctrl +/* 802E04AC 002DD40C 4E 80 04 21 */ bctrl /* 802E04B0 002DD410 80 A1 00 0C */ lwz r5, 0xc(r1) /* 802E04B4 002DD414 38 61 00 0C */ addi r3, r1, 0xc /* 802E04B8 002DD418 90 A1 00 1C */ stw r5, 0x1c(r1) @@ -246,7 +246,7 @@ lbl_802E0484: /* 802E04F4 002DD454 81 84 00 00 */ lwz r12, 0(r4) /* 802E04F8 002DD458 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802E04FC 002DD45C 7D 89 03 A6 */ mtctr r12 -/* 802E0500 002DD460 4E 80 04 21 */ bctrl +/* 802E0500 002DD460 4E 80 04 21 */ bctrl /* 802E0504 002DD464 80 A1 00 08 */ lwz r5, 8(r1) /* 802E0508 002DD468 38 61 00 08 */ addi r3, r1, 8 /* 802E050C 002DD46C 90 A1 00 18 */ stw r5, 0x18(r1) @@ -459,7 +459,7 @@ lbl_802E07F8: /* 802E0818 002DD778 83 81 02 B0 */ lwz r28, 0x2b0(r1) /* 802E081C 002DD77C 7C 08 03 A6 */ mtlr r0 /* 802E0820 002DD780 38 21 02 E0 */ addi r1, r1, 0x2e0 -/* 802E0824 002DD784 4E 80 00 20 */ blr +/* 802E0824 002DD784 4E 80 00 20 */ blr .global "__ct__18CAnimTreeTimeScaleFRCQ24rstl25ncrc_ptr<13CAnimTreeNode>fRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" "__ct__18CAnimTreeTimeScaleFRCQ24rstl25ncrc_ptr<13CAnimTreeNode>fRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>": @@ -528,7 +528,7 @@ lbl_802E08CC: /* 802E091C 002DD87C 83 A1 00 24 */ lwz r29, 0x24(r1) /* 802E0920 002DD880 7C 08 03 A6 */ mtlr r0 /* 802E0924 002DD884 38 21 00 40 */ addi r1, r1, 0x40 -/* 802E0928 002DD888 4E 80 00 20 */ blr +/* 802E0928 002DD888 4E 80 00 20 */ blr .global __ct__19CMetaAnimPhaseBlendFR12CInputStream __ct__19CMetaAnimPhaseBlendFR12CInputStream: diff --git a/asm/Kyoto/Animation/CMetaAnimPlay.s b/asm/Kyoto/Animation/CMetaAnimPlay.s index fff42060..69a96c21 100644 --- a/asm/Kyoto/Animation/CMetaAnimPlay.s +++ b/asm/Kyoto/Animation/CMetaAnimPlay.s @@ -70,12 +70,12 @@ lbl_802E0A4C: /* 802E0A58 002DD9B8 83 C1 00 08 */ lwz r30, 8(r1) /* 802E0A5C 002DD9BC 7C 08 03 A6 */ mtlr r0 /* 802E0A60 002DD9C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E0A64 002DD9C4 4E 80 00 20 */ blr +/* 802E0A64 002DD9C4 4E 80 00 20 */ blr .global GetType__13CMetaAnimPlayCFv GetType__13CMetaAnimPlayCFv: /* 802E0A68 002DD9C8 38 60 00 00 */ li r3, 0 -/* 802E0A6C 002DD9CC 4E 80 00 20 */ blr +/* 802E0A6C 002DD9CC 4E 80 00 20 */ blr .global WriteAnimData__13CMetaAnimPlayCFR13COutputStream WriteAnimData__13CMetaAnimPlayCFR13COutputStream: @@ -96,7 +96,7 @@ WriteAnimData__13CMetaAnimPlayCFR13COutputStream: /* 802E0AA8 002DDA08 83 C1 00 08 */ lwz r30, 8(r1) /* 802E0AAC 002DDA0C 7C 08 03 A6 */ mtlr r0 /* 802E0AB0 002DDA10 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E0AB4 002DDA14 4E 80 00 20 */ blr +/* 802E0AB4 002DDA14 4E 80 00 20 */ blr .global "GetUniquePrimitives__13CMetaAnimPlayCFRQ24rstl72set<10CPrimitive,Q24rstl18less<10CPrimitive>,Q24rstl17rmemory_allocator>" "GetUniquePrimitives__13CMetaAnimPlayCFRQ24rstl72set<10CPrimitive,Q24rstl18less<10CPrimitive>,Q24rstl17rmemory_allocator>": @@ -111,7 +111,7 @@ WriteAnimData__13CMetaAnimPlayCFR13COutputStream: /* 802E0AD8 002DDA38 80 01 00 24 */ lwz r0, 0x24(r1) /* 802E0ADC 002DDA3C 7C 08 03 A6 */ mtlr r0 /* 802E0AE0 002DDA40 38 21 00 20 */ addi r1, r1, 0x20 -/* 802E0AE4 002DDA44 4E 80 00 20 */ blr +/* 802E0AE4 002DDA44 4E 80 00 20 */ blr .global VGetAnimationTree__13CMetaAnimPlayCFRC15CAnimSysContextRC24CMetaAnimTreeBuildOrders VGetAnimationTree__13CMetaAnimPlayCFRC15CAnimSysContextRC24CMetaAnimTreeBuildOrders: @@ -138,7 +138,7 @@ VGetAnimationTree__13CMetaAnimPlayCFRC15CAnimSysContextRC24CMetaAnimTreeBuildOrd /* 802E0B38 002DDA98 38 C1 00 34 */ addi r6, r1, 0x34 /* 802E0B3C 002DDA9C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802E0B40 002DDAA0 7D 89 03 A6 */ mtctr r12 -/* 802E0B44 002DDAA4 4E 80 04 21 */ bctrl +/* 802E0B44 002DDAA4 4E 80 04 21 */ bctrl /* 802E0B48 002DDAA8 38 00 00 00 */ li r0, 0 /* 802E0B4C 002DDAAC 98 01 00 B8 */ stb r0, 0xb8(r1) /* 802E0B50 002DDAB0 98 01 00 74 */ stb r0, 0x74(r1) @@ -155,7 +155,7 @@ lbl_802E0B58: /* 802E0B78 002DDAD8 81 84 00 00 */ lwz r12, 0(r4) /* 802E0B7C 002DDADC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802E0B80 002DDAE0 7D 89 03 A6 */ mtctr r12 -/* 802E0B84 002DDAE4 4E 80 04 21 */ bctrl +/* 802E0B84 002DDAE4 4E 80 04 21 */ bctrl /* 802E0B88 002DDAE8 3B 81 00 28 */ addi r28, r1, 0x28 /* 802E0B8C 002DDAEC 38 81 00 10 */ addi r4, r1, 0x10 /* 802E0B90 002DDAF0 7F 83 E3 78 */ mr r3, r28 @@ -183,7 +183,7 @@ lbl_802E0B58: /* 802E0BE8 002DDB48 38 80 00 01 */ li r4, 1 /* 802E0BEC 002DDB4C 81 8C 00 08 */ lwz r12, 8(r12) /* 802E0BF0 002DDB50 7D 89 03 A6 */ mtctr r12 -/* 802E0BF4 002DDB54 4E 80 04 21 */ bctrl +/* 802E0BF4 002DDB54 4E 80 04 21 */ bctrl lbl_802E0BF8: /* 802E0BF8 002DDB58 3C 80 80 3D */ lis r4, lbl_803D6D70@ha /* 802E0BFC 002DDB5C 38 60 00 20 */ li r3, 0x20 @@ -229,7 +229,7 @@ lbl_802E0C74: /* 802E0C94 002DDBF4 38 80 00 01 */ li r4, 1 /* 802E0C98 002DDBF8 81 8C 00 08 */ lwz r12, 8(r12) /* 802E0C9C 002DDBFC 7D 89 03 A6 */ mtctr r12 -/* 802E0CA0 002DDC00 4E 80 04 21 */ bctrl +/* 802E0CA0 002DDC00 4E 80 04 21 */ bctrl lbl_802E0CA4: /* 802E0CA4 002DDC04 38 61 00 28 */ addi r3, r1, 0x28 /* 802E0CA8 002DDC08 38 80 00 00 */ li r4, 0 @@ -242,7 +242,7 @@ lbl_802E0CB0: /* 802E0CC0 002DDC20 83 81 00 C0 */ lwz r28, 0xc0(r1) /* 802E0CC4 002DDC24 7C 08 03 A6 */ mtlr r0 /* 802E0CC8 002DDC28 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 802E0CCC 002DDC2C 4E 80 00 20 */ blr +/* 802E0CCC 002DDC2C 4E 80 00 20 */ blr .global "insert_into__Q24rstl130red_black_tree<10CPrimitive,10CPrimitive,0,Q24rstl22identity<10CPrimitive>,Q24rstl18less<10CPrimitive>,Q24rstl17rmemory_allocator>FPQ34rstl130red_black_tree<10CPrimitive,10CPrimitive,0,Q24rstl22identity<10CPrimitive>,Q24rstl18less<10CPrimitive>,Q24rstl17rmemory_allocator>4nodeRC10CPrimitive" "insert_into__Q24rstl130red_black_tree<10CPrimitive,10CPrimitive,0,Q24rstl22identity<10CPrimitive>,Q24rstl18less<10CPrimitive>,Q24rstl17rmemory_allocator>FPQ34rstl130red_black_tree<10CPrimitive,10CPrimitive,0,Q24rstl22identity<10CPrimitive>,Q24rstl18less<10CPrimitive>,Q24rstl17rmemory_allocator>4nodeRC10CPrimitive": @@ -408,4 +408,4 @@ lbl_802E0F1C: /* 802E0F20 002DDE80 80 01 00 34 */ lwz r0, 0x34(r1) /* 802E0F24 002DDE84 7C 08 03 A6 */ mtlr r0 /* 802E0F28 002DDE88 38 21 00 30 */ addi r1, r1, 0x30 -/* 802E0F2C 002DDE8C 4E 80 00 20 */ blr +/* 802E0F2C 002DDE8C 4E 80 00 20 */ blr diff --git a/asm/Kyoto/Animation/CMetaAnimRandom.s b/asm/Kyoto/Animation/CMetaAnimRandom.s index ae4a8493..ec8d22fe 100644 --- a/asm/Kyoto/Animation/CMetaAnimRandom.s +++ b/asm/Kyoto/Animation/CMetaAnimRandom.s @@ -49,7 +49,7 @@ lbl_802E0F8C: /* 802E0F98 002DDEF8 83 C1 00 08 */ lwz r30, 8(r1) /* 802E0F9C 002DDEFC 7C 08 03 A6 */ mtlr r0 /* 802E0FA0 002DDF00 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E0FA4 002DDF04 4E 80 00 20 */ blr +/* 802E0FA4 002DDF04 4E 80 00 20 */ blr .global sub_802e0fa8 sub_802e0fa8: @@ -101,12 +101,12 @@ lbl_802E1034: /* 802E1048 002DDFA8 83 81 00 20 */ lwz r28, 0x20(r1) /* 802E104C 002DDFAC 7C 08 03 A6 */ mtlr r0 /* 802E1050 002DDFB0 38 21 00 30 */ addi r1, r1, 0x30 -/* 802E1054 002DDFB4 4E 80 00 20 */ blr +/* 802E1054 002DDFB4 4E 80 00 20 */ blr .global GetType__15CMetaAnimRandomCFv GetType__15CMetaAnimRandomCFv: /* 802E1058 002DDFB8 38 60 00 03 */ li r3, 3 -/* 802E105C 002DDFBC 4E 80 00 20 */ blr +/* 802E105C 002DDFBC 4E 80 00 20 */ blr .global CreateRandomData__15CMetaAnimRandomFR12CInputStream CreateRandomData__15CMetaAnimRandomFR12CInputStream: @@ -246,7 +246,7 @@ lbl_802E122C: /* 802E1248 002DE1A8 83 81 00 30 */ lwz r28, 0x30(r1) /* 802E124C 002DE1AC 7C 08 03 A6 */ mtlr r0 /* 802E1250 002DE1B0 38 21 00 40 */ addi r1, r1, 0x40 -/* 802E1254 002DE1B4 4E 80 00 20 */ blr +/* 802E1254 002DE1B4 4E 80 00 20 */ blr .global WriteAnimData__15CMetaAnimRandomCFR13COutputStream WriteAnimData__15CMetaAnimRandomCFR13COutputStream: @@ -301,7 +301,7 @@ lbl_802E12F8: /* 802E1310 002DE270 83 81 00 20 */ lwz r28, 0x20(r1) /* 802E1314 002DE274 7C 08 03 A6 */ mtlr r0 /* 802E1318 002DE278 38 21 00 30 */ addi r1, r1, 0x30 -/* 802E131C 002DE27C 4E 80 00 20 */ blr +/* 802E131C 002DE27C 4E 80 00 20 */ blr .global "GetUniquePrimitives__15CMetaAnimRandomCFRQ24rstl72set<10CPrimitive,Q24rstl18less<10CPrimitive>,Q24rstl17rmemory_allocator>" "GetUniquePrimitives__15CMetaAnimRandomCFRQ24rstl72set<10CPrimitive,Q24rstl18less<10CPrimitive>,Q24rstl17rmemory_allocator>": @@ -324,7 +324,7 @@ lbl_802E1350: /* 802E135C 002DE2BC 81 83 00 00 */ lwz r12, 0(r3) /* 802E1360 002DE2C0 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802E1364 002DE2C4 7D 89 03 A6 */ mtctr r12 -/* 802E1368 002DE2C8 4E 80 04 21 */ bctrl +/* 802E1368 002DE2C8 4E 80 04 21 */ bctrl /* 802E136C 002DE2CC 3B DE 00 08 */ addi r30, r30, 8 lbl_802E1370: /* 802E1370 002DE2D0 7C 1E F8 40 */ cmplw r30, r31 @@ -335,7 +335,7 @@ lbl_802E1370: /* 802E1384 002DE2E4 83 A1 00 14 */ lwz r29, 0x14(r1) /* 802E1388 002DE2E8 7C 08 03 A6 */ mtlr r0 /* 802E138C 002DE2EC 38 21 00 20 */ addi r1, r1, 0x20 -/* 802E1390 002DE2F0 4E 80 00 20 */ blr +/* 802E1390 002DE2F0 4E 80 00 20 */ blr .global VGetAnimationTree__15CMetaAnimRandomCFRC15CAnimSysContextRC24CMetaAnimTreeBuildOrders VGetAnimationTree__15CMetaAnimRandomCFRC15CAnimSysContextRC24CMetaAnimTreeBuildOrders: @@ -377,7 +377,7 @@ lbl_802E13F8: /* 802E1414 002DE374 81 84 00 00 */ lwz r12, 0(r4) /* 802E1418 002DE378 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802E141C 002DE37C 7D 89 03 A6 */ mtctr r12 -/* 802E1420 002DE380 4E 80 04 21 */ bctrl +/* 802E1420 002DE380 4E 80 04 21 */ bctrl /* 802E1424 002DE384 80 01 00 08 */ lwz r0, 8(r1) /* 802E1428 002DE388 38 61 00 08 */ addi r3, r1, 8 /* 802E142C 002DE38C 90 1C 00 00 */ stw r0, 0(r28) @@ -393,7 +393,7 @@ lbl_802E13F8: /* 802E1454 002DE3B4 83 81 00 10 */ lwz r28, 0x10(r1) /* 802E1458 002DE3B8 7C 08 03 A6 */ mtlr r0 /* 802E145C 002DE3BC 38 21 00 20 */ addi r1, r1, 0x20 -/* 802E1460 002DE3C0 4E 80 00 20 */ blr +/* 802E1460 002DE3C0 4E 80 00 20 */ blr .global __ct__15CMetaAnimRandomFR12CInputStream __ct__15CMetaAnimRandomFR12CInputStream: @@ -467,7 +467,7 @@ lbl_802E1544: /* 802E1558 002DE4B8 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802E155C 002DE4BC 7C 08 03 A6 */ mtlr r0 /* 802E1560 002DE4C0 38 21 00 20 */ addi r1, r1, 0x20 -/* 802E1564 002DE4C4 4E 80 00 20 */ blr +/* 802E1564 002DE4C4 4E 80 00 20 */ blr .global "reserve__Q24rstl79vector,i>,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl79vector,i>,Q24rstl17rmemory_allocator>Fi": diff --git a/asm/Kyoto/Animation/CMetaAnimSequence.s b/asm/Kyoto/Animation/CMetaAnimSequence.s index e3e54c65..c43d08a2 100644 --- a/asm/Kyoto/Animation/CMetaAnimSequence.s +++ b/asm/Kyoto/Animation/CMetaAnimSequence.s @@ -76,12 +76,12 @@ lbl_802E1720: /* 802E1734 002DE694 83 81 00 20 */ lwz r28, 0x20(r1) /* 802E1738 002DE698 7C 08 03 A6 */ mtlr r0 /* 802E173C 002DE69C 38 21 00 30 */ addi r1, r1, 0x30 -/* 802E1740 002DE6A0 4E 80 00 20 */ blr +/* 802E1740 002DE6A0 4E 80 00 20 */ blr .global sub_802e1744 sub_802e1744: /* 802E1744 002DE6A4 38 60 00 04 */ li r3, 4 -/* 802E1748 002DE6A8 4E 80 00 20 */ blr +/* 802E1748 002DE6A8 4E 80 00 20 */ blr .global CreateSequence__17CMetaAnimSequenceFR12CInputStream CreateSequence__17CMetaAnimSequenceFR12CInputStream: @@ -228,7 +228,7 @@ lbl_802E1930: /* 802E1940 002DE8A0 83 81 00 30 */ lwz r28, 0x30(r1) /* 802E1944 002DE8A4 7C 08 03 A6 */ mtlr r0 /* 802E1948 002DE8A8 38 21 00 40 */ addi r1, r1, 0x40 -/* 802E194C 002DE8AC 4E 80 00 20 */ blr +/* 802E194C 002DE8AC 4E 80 00 20 */ blr .global WriteAnimData__17CMetaAnimSequenceCFR13COutputStream WriteAnimData__17CMetaAnimSequenceCFR13COutputStream: @@ -266,7 +266,7 @@ lbl_802E19B0: /* 802E19C4 002DE924 83 A1 00 14 */ lwz r29, 0x14(r1) /* 802E19C8 002DE928 7C 08 03 A6 */ mtlr r0 /* 802E19CC 002DE92C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802E19D0 002DE930 4E 80 00 20 */ blr +/* 802E19D0 002DE930 4E 80 00 20 */ blr .global "GetUniquePrimitives__17CMetaAnimSequenceCFRQ24rstl72set<10CPrimitive,Q24rstl18less<10CPrimitive>,Q24rstl17rmemory_allocator>" "GetUniquePrimitives__17CMetaAnimSequenceCFRQ24rstl72set<10CPrimitive,Q24rstl18less<10CPrimitive>,Q24rstl17rmemory_allocator>": @@ -289,7 +289,7 @@ lbl_802E1A04: /* 802E1A10 002DE970 81 83 00 00 */ lwz r12, 0(r3) /* 802E1A14 002DE974 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802E1A18 002DE978 7D 89 03 A6 */ mtctr r12 -/* 802E1A1C 002DE97C 4E 80 04 21 */ bctrl +/* 802E1A1C 002DE97C 4E 80 04 21 */ bctrl /* 802E1A20 002DE980 3B DE 00 04 */ addi r30, r30, 4 lbl_802E1A24: /* 802E1A24 002DE984 7C 1E F8 40 */ cmplw r30, r31 @@ -300,7 +300,7 @@ lbl_802E1A24: /* 802E1A38 002DE998 83 A1 00 14 */ lwz r29, 0x14(r1) /* 802E1A3C 002DE99C 7C 08 03 A6 */ mtlr r0 /* 802E1A40 002DE9A0 38 21 00 20 */ addi r1, r1, 0x20 -/* 802E1A44 002DE9A4 4E 80 00 20 */ blr +/* 802E1A44 002DE9A4 4E 80 00 20 */ blr .global VGetAnimationTree__17CMetaAnimSequenceCFRC15CAnimSysContextRC24CMetaAnimTreeBuildOrders VGetAnimationTree__17CMetaAnimSequenceCFRC15CAnimSysContextRC24CMetaAnimTreeBuildOrders: @@ -325,7 +325,7 @@ VGetAnimationTree__17CMetaAnimSequenceCFRC15CAnimSysContextRC24CMetaAnimTreeBuil /* 802E1A90 002DE9F0 38 C1 00 44 */ addi r6, r1, 0x44 /* 802E1A94 002DE9F4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802E1A98 002DE9F8 7D 89 03 A6 */ mtctr r12 -/* 802E1A9C 002DE9FC 4E 80 04 21 */ bctrl +/* 802E1A9C 002DE9FC 4E 80 04 21 */ bctrl /* 802E1AA0 002DEA00 38 00 00 00 */ li r0, 0 /* 802E1AA4 002DEA04 98 01 00 C8 */ stb r0, 0xc8(r1) /* 802E1AA8 002DEA08 98 01 00 84 */ stb r0, 0x84(r1) @@ -359,7 +359,7 @@ lbl_802E1AE8: /* 802E1B10 002DEA70 81 84 00 00 */ lwz r12, 0(r4) /* 802E1B14 002DEA74 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802E1B18 002DEA78 7D 89 03 A6 */ mtctr r12 -/* 802E1B1C 002DEA7C 4E 80 04 21 */ bctrl +/* 802E1B1C 002DEA7C 4E 80 04 21 */ bctrl /* 802E1B20 002DEA80 80 A1 00 18 */ lwz r5, 0x18(r1) /* 802E1B24 002DEA84 38 61 00 18 */ addi r3, r1, 0x18 /* 802E1B28 002DEA88 90 A1 00 1C */ stw r5, 0x1c(r1) @@ -465,7 +465,7 @@ lbl_802E1C88: /* 802E1C8C 002DEBEC 80 01 00 F4 */ lwz r0, 0xf4(r1) /* 802E1C90 002DEBF0 7C 08 03 A6 */ mtlr r0 /* 802E1C94 002DEBF4 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 802E1C98 002DEBF8 4E 80 00 20 */ blr +/* 802E1C98 002DEBF8 4E 80 00 20 */ blr .global __ct__17CMetaAnimSequenceFR12CInputStream __ct__17CMetaAnimSequenceFR12CInputStream: diff --git a/asm/Kyoto/Animation/CMetaTransMetaAnim.s b/asm/Kyoto/Animation/CMetaTransMetaAnim.s index 07d991ae..301a6b33 100644 --- a/asm/Kyoto/Animation/CMetaTransMetaAnim.s +++ b/asm/Kyoto/Animation/CMetaTransMetaAnim.s @@ -49,12 +49,12 @@ lbl_802E203C: /* 802E2048 002DEFA8 83 C1 00 08 */ lwz r30, 8(r1) /* 802E204C 002DEFAC 7C 08 03 A6 */ mtlr r0 /* 802E2050 002DEFB0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E2054 002DEFB4 4E 80 00 20 */ blr +/* 802E2054 002DEFB4 4E 80 00 20 */ blr .global GetType__18CMetaTransMetaAnimCFv GetType__18CMetaTransMetaAnimCFv: /* 802E2058 002DEFB8 38 60 00 00 */ li r3, 0 -/* 802E205C 002DEFBC 4E 80 00 20 */ blr +/* 802E205C 002DEFBC 4E 80 00 20 */ blr .global WriteTransData__18CMetaTransMetaAnimCFR13COutputStream WriteTransData__18CMetaTransMetaAnimCFR13COutputStream: @@ -67,7 +67,7 @@ WriteTransData__18CMetaTransMetaAnimCFR13COutputStream: /* 802E2078 002DEFD8 80 01 00 14 */ lwz r0, 0x14(r1) /* 802E207C 002DEFDC 7C 08 03 A6 */ mtlr r0 /* 802E2080 002DEFE0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E2084 002DEFE4 4E 80 00 20 */ blr +/* 802E2084 002DEFE4 4E 80 00 20 */ blr .global "VGetTransitionTree__18CMetaTransMetaAnimCFRCQ24rstl25ncrc_ptr<13CAnimTreeNode>RCQ24rstl25ncrc_ptr<13CAnimTreeNode>RC15CAnimSysContext" "VGetTransitionTree__18CMetaTransMetaAnimCFRCQ24rstl25ncrc_ptr<13CAnimTreeNode>RCQ24rstl25ncrc_ptr<13CAnimTreeNode>RC15CAnimSysContext": @@ -90,7 +90,7 @@ WriteTransData__18CMetaTransMetaAnimCFR13COutputStream: /* 802E20C8 002DF028 81 84 00 00 */ lwz r12, 0(r4) /* 802E20CC 002DF02C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802E20D0 002DF030 7D 89 03 A6 */ mtctr r12 -/* 802E20D4 002DF034 4E 80 04 21 */ bctrl +/* 802E20D4 002DF034 4E 80 04 21 */ bctrl /* 802E20D8 002DF038 80 A1 00 08 */ lwz r5, 8(r1) /* 802E20DC 002DF03C 38 61 00 08 */ addi r3, r1, 8 /* 802E20E0 002DF040 90 A1 00 0C */ stw r5, 0xc(r1) @@ -147,7 +147,7 @@ lbl_802E2194: /* 802E21A0 002DF100 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 802E21A4 002DF104 7C 08 03 A6 */ mtlr r0 /* 802E21A8 002DF108 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 802E21AC 002DF10C 4E 80 00 20 */ blr +/* 802E21AC 002DF10C 4E 80 00 20 */ blr .global __ct__18CMetaTransMetaAnimFR12CInputStream __ct__18CMetaTransMetaAnimFR12CInputStream: diff --git a/asm/Kyoto/Animation/CMetaTransPhaseTrans.s b/asm/Kyoto/Animation/CMetaTransPhaseTrans.s index cec7896a..7402a829 100644 --- a/asm/Kyoto/Animation/CMetaTransPhaseTrans.s +++ b/asm/Kyoto/Animation/CMetaTransPhaseTrans.s @@ -62,12 +62,12 @@ lbl_802E2260: /* 802E2268 002DF1C8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802E226C 002DF1CC 7C 08 03 A6 */ mtlr r0 /* 802E2270 002DF1D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E2274 002DF1D4 4E 80 00 20 */ blr +/* 802E2274 002DF1D4 4E 80 00 20 */ blr .global GetType__20CMetaTransPhaseTransCFv GetType__20CMetaTransPhaseTransCFv: /* 802E2278 002DF1D8 38 60 00 02 */ li r3, 2 -/* 802E227C 002DF1DC 4E 80 00 20 */ blr +/* 802E227C 002DF1DC 4E 80 00 20 */ blr .global WriteTransData__20CMetaTransPhaseTransCFR13COutputStream WriteTransData__20CMetaTransPhaseTransCFR13COutputStream: @@ -137,7 +137,7 @@ lbl_802E2328: /* 802E2374 002DF2D4 83 A1 00 14 */ lwz r29, 0x14(r1) /* 802E2378 002DF2D8 7C 08 03 A6 */ mtlr r0 /* 802E237C 002DF2DC 38 21 00 20 */ addi r1, r1, 0x20 -/* 802E2380 002DF2E0 4E 80 00 20 */ blr +/* 802E2380 002DF2E0 4E 80 00 20 */ blr .global "VGetTransitionTree__20CMetaTransPhaseTransCFRCQ24rstl25ncrc_ptr<13CAnimTreeNode>RCQ24rstl25ncrc_ptr<13CAnimTreeNode>RC15CAnimSysContext" "VGetTransitionTree__20CMetaTransPhaseTransCFRCQ24rstl25ncrc_ptr<13CAnimTreeNode>RCQ24rstl25ncrc_ptr<13CAnimTreeNode>RC15CAnimSysContext": @@ -287,7 +287,7 @@ lbl_802E2598: /* 802E25A4 002DF504 81 83 00 00 */ lwz r12, 0(r3) /* 802E25A8 002DF508 81 8C 00 54 */ lwz r12, 0x54(r12) /* 802E25AC 002DF50C 7D 89 03 A6 */ mtctr r12 -/* 802E25B0 002DF510 4E 80 04 21 */ bctrl +/* 802E25B0 002DF510 4E 80 04 21 */ bctrl /* 802E25B4 002DF514 3C 80 80 3D */ lis r4, lbl_803D6D98@ha /* 802E25B8 002DF518 38 60 00 14 */ li r3, 0x14 /* 802E25BC 002DF51C 38 84 6D 98 */ addi r4, r4, lbl_803D6D98@l @@ -541,7 +541,7 @@ lbl_802E2930: /* 802E2964 002DF8C4 80 01 02 54 */ lwz r0, 0x254(r1) /* 802E2968 002DF8C8 7C 08 03 A6 */ mtlr r0 /* 802E296C 002DF8CC 38 21 02 50 */ addi r1, r1, 0x250 -/* 802E2970 002DF8D0 4E 80 00 20 */ blr +/* 802E2970 002DF8D0 4E 80 00 20 */ blr .global "__ct__18CAnimTreeTimeScaleFRCQ24rstl25ncrc_ptr<13CAnimTreeNode>RCQ24rstl48ownership_transfer<26IVaryingAnimationTimeScale>RC13CCharAnimTimeRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" "__ct__18CAnimTreeTimeScaleFRCQ24rstl25ncrc_ptr<13CAnimTreeNode>RCQ24rstl48ownership_transfer<26IVaryingAnimationTimeScale>RC13CCharAnimTimeRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>": @@ -586,14 +586,14 @@ lbl_802E2930: /* 802E2A0C 002DF96C 81 84 00 00 */ lwz r12, 0(r4) /* 802E2A10 002DF970 81 8C 00 14 */ lwz r12, 0x14(r12) /* 802E2A14 002DF974 7D 89 03 A6 */ mtctr r12 -/* 802E2A18 002DF978 4E 80 04 21 */ bctrl +/* 802E2A18 002DF978 4E 80 04 21 */ bctrl /* 802E2A1C 002DF97C 80 9F 00 00 */ lwz r4, 0(r31) /* 802E2A20 002DF980 38 61 00 20 */ addi r3, r1, 0x20 /* 802E2A24 002DF984 80 84 00 00 */ lwz r4, 0(r4) /* 802E2A28 002DF988 81 84 00 00 */ lwz r12, 0(r4) /* 802E2A2C 002DF98C 81 8C 00 18 */ lwz r12, 0x18(r12) /* 802E2A30 002DF990 7D 89 03 A6 */ mtctr r12 -/* 802E2A34 002DF994 4E 80 04 21 */ bctrl +/* 802E2A34 002DF994 4E 80 04 21 */ bctrl /* 802E2A38 002DF998 C0 01 00 20 */ lfs f0, 0x20(r1) /* 802E2A3C 002DF99C 38 61 00 18 */ addi r3, r1, 0x18 /* 802E2A40 002DF9A0 80 01 00 24 */ lwz r0, 0x24(r1) @@ -611,7 +611,7 @@ lbl_802E2930: /* 802E2A70 002DF9D0 80 01 00 54 */ lwz r0, 0x54(r1) /* 802E2A74 002DF9D4 7C 08 03 A6 */ mtlr r0 /* 802E2A78 002DF9D8 38 21 00 50 */ addi r1, r1, 0x50 -/* 802E2A7C 002DF9DC 4E 80 00 20 */ blr +/* 802E2A7C 002DF9DC 4E 80 00 20 */ blr .global __ct__20CMetaTransPhaseTransFR12CInputStream __ct__20CMetaTransPhaseTransFR12CInputStream: diff --git a/asm/Kyoto/Animation/CMetaTransSnap.s b/asm/Kyoto/Animation/CMetaTransSnap.s index 2c162120..14996a99 100644 --- a/asm/Kyoto/Animation/CMetaTransSnap.s +++ b/asm/Kyoto/Animation/CMetaTransSnap.s @@ -40,16 +40,16 @@ lbl_802E2B50: /* 802E2B58 002DFAB8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802E2B5C 002DFABC 7C 08 03 A6 */ mtlr r0 /* 802E2B60 002DFAC0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E2B64 002DFAC4 4E 80 00 20 */ blr +/* 802E2B64 002DFAC4 4E 80 00 20 */ blr .global GetType__14CMetaTransSnapCFv GetType__14CMetaTransSnapCFv: /* 802E2B68 002DFAC8 38 60 00 03 */ li r3, 3 -/* 802E2B6C 002DFACC 4E 80 00 20 */ blr +/* 802E2B6C 002DFACC 4E 80 00 20 */ blr .global WriteTransData__14CMetaTransSnapCFR13COutputStream WriteTransData__14CMetaTransSnapCFR13COutputStream: -/* 802E2B70 002DFAD0 4E 80 00 20 */ blr +/* 802E2B70 002DFAD0 4E 80 00 20 */ blr .global "VGetTransitionTree__14CMetaTransSnapCFRCQ24rstl25ncrc_ptr<13CAnimTreeNode>RCQ24rstl25ncrc_ptr<13CAnimTreeNode>RC15CAnimSysContext" "VGetTransitionTree__14CMetaTransSnapCFRCQ24rstl25ncrc_ptr<13CAnimTreeNode>RCQ24rstl25ncrc_ptr<13CAnimTreeNode>RC15CAnimSysContext": diff --git a/asm/Kyoto/Animation/CMetaTransTrans.s b/asm/Kyoto/Animation/CMetaTransTrans.s index 9d8d2e9e..6aeec1db 100644 --- a/asm/Kyoto/Animation/CMetaTransTrans.s +++ b/asm/Kyoto/Animation/CMetaTransTrans.s @@ -40,12 +40,12 @@ lbl_802E2BD4: /* 802E2BDC 002DFB3C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802E2BE0 002DFB40 7C 08 03 A6 */ mtlr r0 /* 802E2BE4 002DFB44 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E2BE8 002DFB48 4E 80 00 20 */ blr +/* 802E2BE8 002DFB48 4E 80 00 20 */ blr .global GetType__15CMetaTransTransCFv GetType__15CMetaTransTransCFv: /* 802E2BEC 002DFB4C 38 60 00 01 */ li r3, 1 -/* 802E2BF0 002DFB50 4E 80 00 20 */ blr +/* 802E2BF0 002DFB50 4E 80 00 20 */ blr .global WriteTransData__15CMetaTransTransCFR13COutputStream WriteTransData__15CMetaTransTransCFR13COutputStream: @@ -115,7 +115,7 @@ lbl_802E2C9C: /* 802E2CE8 002DFC48 83 A1 00 14 */ lwz r29, 0x14(r1) /* 802E2CEC 002DFC4C 7C 08 03 A6 */ mtlr r0 /* 802E2CF0 002DFC50 38 21 00 20 */ addi r1, r1, 0x20 -/* 802E2CF4 002DFC54 4E 80 00 20 */ blr +/* 802E2CF4 002DFC54 4E 80 00 20 */ blr .global "VGetTransitionTree__15CMetaTransTransCFRCQ24rstl25ncrc_ptr<13CAnimTreeNode>RCQ24rstl25ncrc_ptr<13CAnimTreeNode>RC15CAnimSysContext" "VGetTransitionTree__15CMetaTransTransCFRCQ24rstl25ncrc_ptr<13CAnimTreeNode>RCQ24rstl25ncrc_ptr<13CAnimTreeNode>RC15CAnimSysContext": @@ -174,7 +174,7 @@ lbl_802E2DB8: /* 802E2DBC 002DFD1C 80 01 00 34 */ lwz r0, 0x34(r1) /* 802E2DC0 002DFD20 7C 08 03 A6 */ mtlr r0 /* 802E2DC4 002DFD24 38 21 00 30 */ addi r1, r1, 0x30 -/* 802E2DC8 002DFD28 4E 80 00 20 */ blr +/* 802E2DC8 002DFD28 4E 80 00 20 */ blr .global __ct__15CMetaTransTransFR12CInputStream __ct__15CMetaTransTransFR12CInputStream: diff --git a/asm/Kyoto/Animation/CPASAnimInfo.s b/asm/Kyoto/Animation/CPASAnimInfo.s index 443fff8f..3490da24 100644 --- a/asm/Kyoto/Animation/CPASAnimInfo.s +++ b/asm/Kyoto/Animation/CPASAnimInfo.s @@ -7,7 +7,7 @@ GetAnimParmValue__12CPASAnimInfoCFUi: /* 802E2E58 002DFDB8 54 80 10 3A */ slwi r0, r4, 2 /* 802E2E5C 002DFDBC 7C 63 02 14 */ add r3, r3, r0 /* 802E2E60 002DFDC0 38 63 00 08 */ addi r3, r3, 8 -/* 802E2E64 002DFDC4 4E 80 00 20 */ blr +/* 802E2E64 002DFDC4 4E 80 00 20 */ blr .global GetAnimParmData__12CPASAnimInfoCFUiQ212CPASAnimParm9EParmType GetAnimParmData__12CPASAnimInfoCFUiQ212CPASAnimParm9EParmType: @@ -58,7 +58,7 @@ lbl_802E2EF4: /* 802E2EF8 002DFE58 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802E2EFC 002DFE5C 7C 08 03 A6 */ mtlr r0 /* 802E2F00 002DFE60 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E2F04 002DFE64 4E 80 00 20 */ blr +/* 802E2F04 002DFE64 4E 80 00 20 */ blr .global "__ct__12CPASAnimInfoFiRCQ24rstl47reserved_vector" "__ct__12CPASAnimInfoFiRCQ24rstl47reserved_vector": @@ -70,7 +70,7 @@ lbl_802E2EF4: /* 802E2F1C 002DFE7C 80 03 00 04 */ lwz r0, 4(r3) /* 802E2F20 002DFE80 7C 09 03 A6 */ mtctr r0 /* 802E2F24 002DFE84 2C 00 00 00 */ cmpwi r0, 0 -/* 802E2F28 002DFE88 4C 81 00 20 */ blelr +/* 802E2F28 002DFE88 4C 81 00 20 */ blelr lbl_802E2F2C: /* 802E2F2C 002DFE8C 28 04 00 00 */ cmplwi r4, 0 /* 802E2F30 002DFE90 41 82 00 0C */ beq lbl_802E2F3C @@ -87,4 +87,4 @@ __ct__12CPASAnimInfoFi: /* 802E2F4C 002DFEAC 90 83 00 00 */ stw r4, 0(r3) /* 802E2F50 002DFEB0 38 00 00 00 */ li r0, 0 /* 802E2F54 002DFEB4 90 03 00 04 */ stw r0, 4(r3) -/* 802E2F58 002DFEB8 4E 80 00 20 */ blr +/* 802E2F58 002DFEB8 4E 80 00 20 */ blr diff --git a/asm/Kyoto/Animation/CPASAnimParm.s b/asm/Kyoto/Animation/CPASAnimParm.s index 057c10e1..896e9d39 100644 --- a/asm/Kyoto/Animation/CPASAnimParm.s +++ b/asm/Kyoto/Animation/CPASAnimParm.s @@ -5,27 +5,27 @@ .global GetEnumValue__12CPASAnimParmCFv GetEnumValue__12CPASAnimParmCFv: /* 802E2F5C 002DFEBC 80 63 00 00 */ lwz r3, 0(r3) -/* 802E2F60 002DFEC0 4E 80 00 20 */ blr +/* 802E2F60 002DFEC0 4E 80 00 20 */ blr .global GetBoolValue__12CPASAnimParmCFv GetBoolValue__12CPASAnimParmCFv: /* 802E2F64 002DFEC4 88 63 00 00 */ lbz r3, 0(r3) -/* 802E2F68 002DFEC8 4E 80 00 20 */ blr +/* 802E2F68 002DFEC8 4E 80 00 20 */ blr .global GetReal32Value__12CPASAnimParmCFv GetReal32Value__12CPASAnimParmCFv: /* 802E2F6C 002DFECC C0 23 00 00 */ lfs f1, 0(r3) -/* 802E2F70 002DFED0 4E 80 00 20 */ blr +/* 802E2F70 002DFED0 4E 80 00 20 */ blr .global GetUint32Value__12CPASAnimParmCFv GetUint32Value__12CPASAnimParmCFv: /* 802E2F74 002DFED4 80 63 00 00 */ lwz r3, 0(r3) -/* 802E2F78 002DFED8 4E 80 00 20 */ blr +/* 802E2F78 002DFED8 4E 80 00 20 */ blr .global GetInt32Value__12CPASAnimParmCFv GetInt32Value__12CPASAnimParmCFv: /* 802E2F7C 002DFEDC 80 63 00 00 */ lwz r3, 0(r3) -/* 802E2F80 002DFEE0 4E 80 00 20 */ blr +/* 802E2F80 002DFEE0 4E 80 00 20 */ blr .global FromEnum__12CPASAnimParmFi FromEnum__12CPASAnimParmFi: @@ -40,7 +40,7 @@ FromEnum__12CPASAnimParmFi: /* 802E2FA4 002DFF04 80 01 00 14 */ lwz r0, 0x14(r1) /* 802E2FA8 002DFF08 7C 08 03 A6 */ mtlr r0 /* 802E2FAC 002DFF0C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E2FB0 002DFF10 4E 80 00 20 */ blr +/* 802E2FB0 002DFF10 4E 80 00 20 */ blr .global FromBool__12CPASAnimParmFb FromBool__12CPASAnimParmFb: @@ -56,7 +56,7 @@ FromBool__12CPASAnimParmFb: /* 802E2FD8 002DFF38 80 01 00 14 */ lwz r0, 0x14(r1) /* 802E2FDC 002DFF3C 7C 08 03 A6 */ mtlr r0 /* 802E2FE0 002DFF40 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E2FE4 002DFF44 4E 80 00 20 */ blr +/* 802E2FE4 002DFF44 4E 80 00 20 */ blr .global FromReal32__12CPASAnimParmFf FromReal32__12CPASAnimParmFf: @@ -72,7 +72,7 @@ FromReal32__12CPASAnimParmFf: /* 802E300C 002DFF6C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802E3010 002DFF70 7C 08 03 A6 */ mtlr r0 /* 802E3014 002DFF74 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E3018 002DFF78 4E 80 00 20 */ blr +/* 802E3018 002DFF78 4E 80 00 20 */ blr .global FromUint32__12CPASAnimParmFUi FromUint32__12CPASAnimParmFUi: @@ -87,7 +87,7 @@ FromUint32__12CPASAnimParmFUi: /* 802E303C 002DFF9C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802E3040 002DFFA0 7C 08 03 A6 */ mtlr r0 /* 802E3044 002DFFA4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E3048 002DFFA8 4E 80 00 20 */ blr +/* 802E3048 002DFFA8 4E 80 00 20 */ blr .global FromInt32__12CPASAnimParmFi FromInt32__12CPASAnimParmFi: @@ -102,7 +102,7 @@ FromInt32__12CPASAnimParmFi: /* 802E306C 002DFFCC 80 01 00 14 */ lwz r0, 0x14(r1) /* 802E3070 002DFFD0 7C 08 03 A6 */ mtlr r0 /* 802E3074 002DFFD4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E3078 002DFFD8 4E 80 00 20 */ blr +/* 802E3078 002DFFD8 4E 80 00 20 */ blr .global NoParameter__12CPASAnimParmFv NoParameter__12CPASAnimParmFv: @@ -118,7 +118,7 @@ NoParameter__12CPASAnimParmFv: /* 802E30A0 002E0000 80 01 00 14 */ lwz r0, 0x14(r1) /* 802E30A4 002E0004 7C 08 03 A6 */ mtlr r0 /* 802E30A8 002E0008 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E30AC 002E000C 4E 80 00 20 */ blr +/* 802E30AC 002E000C 4E 80 00 20 */ blr .global __ct__12CPASAnimParmFQ212CPASAnimParm10UParmValueQ212CPASAnimParm9EParmType __ct__12CPASAnimParmFQ212CPASAnimParm10UParmValueQ212CPASAnimParm9EParmType: diff --git a/asm/Kyoto/Animation/CPASAnimState.s b/asm/Kyoto/Animation/CPASAnimState.s index de29e75d..821c57d4 100644 --- a/asm/Kyoto/Animation/CPASAnimState.s +++ b/asm/Kyoto/Animation/CPASAnimState.s @@ -62,7 +62,7 @@ lbl_802E3154: /* 802E315C 002E00BC 83 C1 00 18 */ lwz r30, 0x18(r1) /* 802E3160 002E00C0 7C 08 03 A6 */ mtlr r0 /* 802E3164 002E00C4 38 21 00 20 */ addi r1, r1, 0x20 -/* 802E3168 002E00C8 4E 80 00 20 */ blr +/* 802E3168 002E00C8 4E 80 00 20 */ blr .global ComputeAngularPercentErrorWeight__13CPASAnimStateCFUiRC12CPASAnimParmQ212CPASAnimParm10UParmValue ComputeAngularPercentErrorWeight__13CPASAnimStateCFUiRC12CPASAnimParmQ212CPASAnimParm10UParmValue: @@ -257,7 +257,7 @@ lbl_802E3408: /* 802E3414 002E0374 83 E1 00 4C */ lwz r31, 0x4c(r1) /* 802E3418 002E0378 7C 08 03 A6 */ mtlr r0 /* 802E341C 002E037C 38 21 00 60 */ addi r1, r1, 0x60 -/* 802E3420 002E0380 4E 80 00 20 */ blr +/* 802E3420 002E0380 4E 80 00 20 */ blr .global ComputePercentErrorWeight__13CPASAnimStateCFUiRC12CPASAnimParmQ212CPASAnimParm10UParmValue ComputePercentErrorWeight__13CPASAnimStateCFUiRC12CPASAnimParmQ212CPASAnimParm10UParmValue: @@ -442,7 +442,7 @@ lbl_802E36A8: /* 802E36B8 002E0618 83 C1 00 38 */ lwz r30, 0x38(r1) /* 802E36BC 002E061C 7C 08 03 A6 */ mtlr r0 /* 802E36C0 002E0620 38 21 00 50 */ addi r1, r1, 0x50 -/* 802E36C4 002E0624 4E 80 00 20 */ blr +/* 802E36C4 002E0624 4E 80 00 20 */ blr .global ComputeExactMatchWeight__13CPASAnimStateCFUiRC12CPASAnimParmQ212CPASAnimParm10UParmValue ComputeExactMatchWeight__13CPASAnimStateCFUiRC12CPASAnimParmQ212CPASAnimParm10UParmValue: @@ -537,7 +537,7 @@ lbl_802E37E4: /* 802E37E8 002E0748 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802E37EC 002E074C 7C 08 03 A6 */ mtlr r0 /* 802E37F0 002E0750 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E37F4 002E0754 4E 80 00 20 */ blr +/* 802E37F4 002E0754 4E 80 00 20 */ blr .global "FindBestAnimation__13CPASAnimStateCFRCQ24rstl33reserved_vector<12CPASAnimParm,8>R9CRandom16i" "FindBestAnimation__13CPASAnimStateCFRCQ24rstl33reserved_vector<12CPASAnimParm,8>R9CRandom16i": @@ -755,7 +755,7 @@ lbl_802E3AAC: /* 802E3ADC 002E0A3C 80 01 00 94 */ lwz r0, 0x94(r1) /* 802E3AE0 002E0A40 7C 08 03 A6 */ mtlr r0 /* 802E3AE4 002E0A44 38 21 00 90 */ addi r1, r1, 0x90 -/* 802E3AE8 002E0A48 4E 80 00 20 */ blr +/* 802E3AE8 002E0A48 4E 80 00 20 */ blr .global "insert__Q24rstl49vector<12CPASAnimInfo,Q24rstl17rmemory_allocator>FQ24rstl118pointer_iterator<12CPASAnimInfo,Q24rstl49vector<12CPASAnimInfo,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>RC12CPASAnimInfo" "insert__Q24rstl49vector<12CPASAnimInfo,Q24rstl17rmemory_allocator>FQ24rstl118pointer_iterator<12CPASAnimInfo,Q24rstl49vector<12CPASAnimInfo,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>RC12CPASAnimInfo": @@ -797,7 +797,7 @@ lbl_802E3AAC: /* 802E3B78 002E0AD8 83 A1 00 24 */ lwz r29, 0x24(r1) /* 802E3B7C 002E0ADC 7C 08 03 A6 */ mtlr r0 /* 802E3B80 002E0AE0 38 21 00 30 */ addi r1, r1, 0x30 -/* 802E3B84 002E0AE4 4E 80 00 20 */ blr +/* 802E3B84 002E0AE4 4E 80 00 20 */ blr .global "insert_into>__Q24rstl49vector<12CPASAnimInfo,Q24rstl17rmemory_allocator>FQ24rstl118pointer_iterator<12CPASAnimInfo,Q24rstl49vector<12CPASAnimInfo,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>iQ24rstl39const_counting_iterator<12CPASAnimInfo>" "insert_into>__Q24rstl49vector<12CPASAnimInfo,Q24rstl17rmemory_allocator>FQ24rstl118pointer_iterator<12CPASAnimInfo,Q24rstl49vector<12CPASAnimInfo,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>iQ24rstl39const_counting_iterator<12CPASAnimInfo>": @@ -1128,7 +1128,7 @@ lbl_802E3FE0: /* 802E3FE4 002E0F44 80 01 00 34 */ lwz r0, 0x34(r1) /* 802E3FE8 002E0F48 7C 08 03 A6 */ mtlr r0 /* 802E3FEC 002E0F4C 38 21 00 30 */ addi r1, r1, 0x30 -/* 802E3FF0 002E0F50 4E 80 00 20 */ blr +/* 802E3FF0 002E0F50 4E 80 00 20 */ blr .global GetAnimParmData__13CPASAnimStateCFiUi GetAnimParmData__13CPASAnimStateCFiUi: @@ -1227,7 +1227,7 @@ lbl_802E4134: /* 802E4140 002E10A0 83 A1 00 54 */ lwz r29, 0x54(r1) /* 802E4144 002E10A4 7C 08 03 A6 */ mtlr r0 /* 802E4148 002E10A8 38 21 00 60 */ addi r1, r1, 0x60 -/* 802E414C 002E10AC 4E 80 00 20 */ blr +/* 802E414C 002E10AC 4E 80 00 20 */ blr .global __ct__13CPASAnimStateFR12CInputStream __ct__13CPASAnimStateFR12CInputStream: @@ -1494,7 +1494,7 @@ lbl_802E44D4: /* 802E44E4 002E1444 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 802E44E8 002E1448 7C 08 03 A6 */ mtlr r0 /* 802E44EC 002E144C 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 802E44F0 002E1450 4E 80 00 20 */ blr +/* 802E44F0 002E1450 4E 80 00 20 */ blr .global __ct__13CPASAnimStateFi __ct__13CPASAnimStateFi: @@ -1509,7 +1509,7 @@ __ct__13CPASAnimStateFi: /* 802E4514 002E1474 90 03 00 28 */ stw r0, 0x28(r3) /* 802E4518 002E1478 90 03 00 2C */ stw r0, 0x2c(r3) /* 802E451C 002E147C 90 03 00 30 */ stw r0, 0x30(r3) -/* 802E4520 002E1480 4E 80 00 20 */ blr +/* 802E4520 002E1480 4E 80 00 20 */ blr .global "lower_bound,Q24rstl17rmemory_allocator>,12CPASAnimInfo>__4rstlFQ24rstl118pointer_iterator<12CPASAnimInfo,Q24rstl49vector<12CPASAnimInfo,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl118pointer_iterator<12CPASAnimInfo,Q24rstl49vector<12CPASAnimInfo,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>RC12CPASAnimInfo" "lower_bound,Q24rstl17rmemory_allocator>,12CPASAnimInfo>__4rstlFQ24rstl118pointer_iterator<12CPASAnimInfo,Q24rstl49vector<12CPASAnimInfo,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl118pointer_iterator<12CPASAnimInfo,Q24rstl49vector<12CPASAnimInfo,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>RC12CPASAnimInfo": @@ -1563,7 +1563,7 @@ lbl_802E45C0: /* 802E45D4 002E1534 80 01 00 34 */ lwz r0, 0x34(r1) /* 802E45D8 002E1538 7C 08 03 A6 */ mtlr r0 /* 802E45DC 002E153C 38 21 00 30 */ addi r1, r1, 0x30 -/* 802E45E0 002E1540 4E 80 00 20 */ blr +/* 802E45E0 002E1540 4E 80 00 20 */ blr .global "lower_bound,Q24rstl17rmemory_allocator>,12CPASAnimInfo>__4rstlFQ24rstl124const_pointer_iterator<12CPASAnimInfo,Q24rstl49vector<12CPASAnimInfo,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl124const_pointer_iterator<12CPASAnimInfo,Q24rstl49vector<12CPASAnimInfo,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>RC12CPASAnimInfo" "lower_bound,Q24rstl17rmemory_allocator>,12CPASAnimInfo>__4rstlFQ24rstl124const_pointer_iterator<12CPASAnimInfo,Q24rstl49vector<12CPASAnimInfo,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl124const_pointer_iterator<12CPASAnimInfo,Q24rstl49vector<12CPASAnimInfo,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>RC12CPASAnimInfo": @@ -1617,7 +1617,7 @@ lbl_802E4680: /* 802E4694 002E15F4 80 01 00 34 */ lwz r0, 0x34(r1) /* 802E4698 002E15F8 7C 08 03 A6 */ mtlr r0 /* 802E469C 002E15FC 38 21 00 30 */ addi r1, r1, 0x30 -/* 802E46A0 002E1600 4E 80 00 20 */ blr +/* 802E46A0 002E1600 4E 80 00 20 */ blr .global "reserve__Q24rstl49vector<12CPASParmInfo,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl49vector<12CPASParmInfo,Q24rstl17rmemory_allocator>Fi": @@ -1697,7 +1697,7 @@ lbl_802E4798: /* 802E47A4 002E1704 83 A1 00 24 */ lwz r29, 0x24(r1) /* 802E47A8 002E1708 7C 08 03 A6 */ mtlr r0 /* 802E47AC 002E170C 38 21 00 30 */ addi r1, r1, 0x30 -/* 802E47B0 002E1710 4E 80 00 20 */ blr +/* 802E47B0 002E1710 4E 80 00 20 */ blr .global "reserve__Q24rstl49vector<12CPASAnimInfo,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl49vector<12CPASAnimInfo,Q24rstl17rmemory_allocator>Fi": @@ -1817,7 +1817,7 @@ lbl_802E492C: /* 802E4938 002E1898 83 A1 00 24 */ lwz r29, 0x24(r1) /* 802E493C 002E189C 7C 08 03 A6 */ mtlr r0 /* 802E4940 002E18A0 38 21 00 30 */ addi r1, r1, 0x30 -/* 802E4944 002E18A4 4E 80 00 20 */ blr +/* 802E4944 002E18A4 4E 80 00 20 */ blr .global "advance,Q24rstl17rmemory_allocator>,i>__4rstlFRQ24rstl118pointer_iterator<12CPASAnimInfo,Q24rstl49vector<12CPASAnimInfo,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>i" "advance,Q24rstl17rmemory_allocator>,i>__4rstlFRQ24rstl118pointer_iterator<12CPASAnimInfo,Q24rstl49vector<12CPASAnimInfo,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>i": @@ -1831,7 +1831,7 @@ lbl_802E492C: /* 802E4964 002E18C4 80 01 00 14 */ lwz r0, 0x14(r1) /* 802E4968 002E18C8 7C 08 03 A6 */ mtlr r0 /* 802E496C 002E18CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E4970 002E18D0 4E 80 00 20 */ blr +/* 802E4970 002E18D0 4E 80 00 20 */ blr .global "advance,Q24rstl17rmemory_allocator>,i>__4rstlFRQ24rstl124const_pointer_iterator<12CPASAnimInfo,Q24rstl49vector<12CPASAnimInfo,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>i" "advance,Q24rstl17rmemory_allocator>,i>__4rstlFRQ24rstl124const_pointer_iterator<12CPASAnimInfo,Q24rstl49vector<12CPASAnimInfo,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>i": @@ -1845,7 +1845,7 @@ lbl_802E492C: /* 802E4990 002E18F0 80 01 00 14 */ lwz r0, 0x14(r1) /* 802E4994 002E18F4 7C 08 03 A6 */ mtlr r0 /* 802E4998 002E18F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E499C 002E18FC 4E 80 00 20 */ blr +/* 802E499C 002E18FC 4E 80 00 20 */ blr .global "__advance,Q24rstl17rmemory_allocator>,i>__4rstlFRQ24rstl124const_pointer_iterator<12CPASAnimInfo,Q24rstl49vector<12CPASAnimInfo,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>iQ24rstl26random_access_iterator_tag" "__advance,Q24rstl17rmemory_allocator>,i>__4rstlFRQ24rstl124const_pointer_iterator<12CPASAnimInfo,Q24rstl49vector<12CPASAnimInfo,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>iQ24rstl26random_access_iterator_tag": @@ -1853,7 +1853,7 @@ lbl_802E492C: /* 802E49A4 002E1904 80 83 00 00 */ lwz r4, 0(r3) /* 802E49A8 002E1908 7C 04 02 14 */ add r0, r4, r0 /* 802E49AC 002E190C 90 03 00 00 */ stw r0, 0(r3) -/* 802E49B0 002E1910 4E 80 00 20 */ blr +/* 802E49B0 002E1910 4E 80 00 20 */ blr .global "__advance,Q24rstl17rmemory_allocator>,i>__4rstlFRQ24rstl118pointer_iterator<12CPASAnimInfo,Q24rstl49vector<12CPASAnimInfo,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>iQ24rstl26random_access_iterator_tag" "__advance,Q24rstl17rmemory_allocator>,i>__4rstlFRQ24rstl118pointer_iterator<12CPASAnimInfo,Q24rstl49vector<12CPASAnimInfo,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>iQ24rstl26random_access_iterator_tag": @@ -1861,7 +1861,7 @@ lbl_802E492C: /* 802E49B8 002E1918 80 83 00 00 */ lwz r4, 0(r3) /* 802E49BC 002E191C 7C 04 02 14 */ add r0, r4, r0 /* 802E49C0 002E1920 90 03 00 00 */ stw r0, 0(r3) -/* 802E49C4 002E1924 4E 80 00 20 */ blr +/* 802E49C4 002E1924 4E 80 00 20 */ blr .global "distance,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl118pointer_iterator<12CPASAnimInfo,Q24rstl49vector<12CPASAnimInfo,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl118pointer_iterator<12CPASAnimInfo,Q24rstl49vector<12CPASAnimInfo,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>" "distance,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl118pointer_iterator<12CPASAnimInfo,Q24rstl49vector<12CPASAnimInfo,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl118pointer_iterator<12CPASAnimInfo,Q24rstl49vector<12CPASAnimInfo,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>": @@ -1881,7 +1881,7 @@ lbl_802E492C: /* 802E49FC 002E195C 80 01 00 24 */ lwz r0, 0x24(r1) /* 802E4A00 002E1960 7C 08 03 A6 */ mtlr r0 /* 802E4A04 002E1964 38 21 00 20 */ addi r1, r1, 0x20 -/* 802E4A08 002E1968 4E 80 00 20 */ blr +/* 802E4A08 002E1968 4E 80 00 20 */ blr .global "distance,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl124const_pointer_iterator<12CPASAnimInfo,Q24rstl49vector<12CPASAnimInfo,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl124const_pointer_iterator<12CPASAnimInfo,Q24rstl49vector<12CPASAnimInfo,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>" "distance,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl124const_pointer_iterator<12CPASAnimInfo,Q24rstl49vector<12CPASAnimInfo,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl124const_pointer_iterator<12CPASAnimInfo,Q24rstl49vector<12CPASAnimInfo,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>": @@ -1901,7 +1901,7 @@ lbl_802E492C: /* 802E4A40 002E19A0 80 01 00 24 */ lwz r0, 0x24(r1) /* 802E4A44 002E19A4 7C 08 03 A6 */ mtlr r0 /* 802E4A48 002E19A8 38 21 00 20 */ addi r1, r1, 0x20 -/* 802E4A4C 002E19AC 4E 80 00 20 */ blr +/* 802E4A4C 002E19AC 4E 80 00 20 */ blr .global "__distance,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl118pointer_iterator<12CPASAnimInfo,Q24rstl49vector<12CPASAnimInfo,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl118pointer_iterator<12CPASAnimInfo,Q24rstl49vector<12CPASAnimInfo,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl26random_access_iterator_tag" "__distance,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl118pointer_iterator<12CPASAnimInfo,Q24rstl49vector<12CPASAnimInfo,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl118pointer_iterator<12CPASAnimInfo,Q24rstl49vector<12CPASAnimInfo,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl26random_access_iterator_tag": @@ -1914,7 +1914,7 @@ lbl_802E492C: /* 802E4A68 002E19C8 7C 00 26 70 */ srawi r0, r0, 4 /* 802E4A6C 002E19CC 54 03 0F FE */ srwi r3, r0, 0x1f /* 802E4A70 002E19D0 7C 60 1A 14 */ add r3, r0, r3 -/* 802E4A74 002E19D4 4E 80 00 20 */ blr +/* 802E4A74 002E19D4 4E 80 00 20 */ blr .global "__distance,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl124const_pointer_iterator<12CPASAnimInfo,Q24rstl49vector<12CPASAnimInfo,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl124const_pointer_iterator<12CPASAnimInfo,Q24rstl49vector<12CPASAnimInfo,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl26random_access_iterator_tag" "__distance,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl124const_pointer_iterator<12CPASAnimInfo,Q24rstl49vector<12CPASAnimInfo,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl124const_pointer_iterator<12CPASAnimInfo,Q24rstl49vector<12CPASAnimInfo,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl26random_access_iterator_tag": diff --git a/asm/Kyoto/Animation/CPASDatabase.s b/asm/Kyoto/Animation/CPASDatabase.s index d6b0a37a..fc64b290 100644 --- a/asm/Kyoto/Animation/CPASDatabase.s +++ b/asm/Kyoto/Animation/CPASDatabase.s @@ -60,7 +60,7 @@ AddAnimState__12CPASDatabaseFRC13CPASAnimState: /* 802E4B1C 002E1A7C 83 C1 00 28 */ lwz r30, 0x28(r1) /* 802E4B20 002E1A80 7C 08 03 A6 */ mtlr r0 /* 802E4B24 002E1A84 38 21 00 30 */ addi r1, r1, 0x30 -/* 802E4B28 002E1A88 4E 80 00 20 */ blr +/* 802E4B28 002E1A88 4E 80 00 20 */ blr .global "insert__Q24rstl50vector<13CPASAnimState,Q24rstl17rmemory_allocator>FQ24rstl120pointer_iterator<13CPASAnimState,Q24rstl50vector<13CPASAnimState,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>RC13CPASAnimState" "insert__Q24rstl50vector<13CPASAnimState,Q24rstl17rmemory_allocator>FQ24rstl120pointer_iterator<13CPASAnimState,Q24rstl50vector<13CPASAnimState,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>RC13CPASAnimState": @@ -102,7 +102,7 @@ AddAnimState__12CPASDatabaseFRC13CPASAnimState: /* 802E4BB8 002E1B18 83 A1 00 24 */ lwz r29, 0x24(r1) /* 802E4BBC 002E1B1C 7C 08 03 A6 */ mtlr r0 /* 802E4BC0 002E1B20 38 21 00 30 */ addi r1, r1, 0x30 -/* 802E4BC4 002E1B24 4E 80 00 20 */ blr +/* 802E4BC4 002E1B24 4E 80 00 20 */ blr .global "insert_into>__Q24rstl50vector<13CPASAnimState,Q24rstl17rmemory_allocator>FQ24rstl120pointer_iterator<13CPASAnimState,Q24rstl50vector<13CPASAnimState,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>iQ24rstl40const_counting_iterator<13CPASAnimState>" "insert_into>__Q24rstl50vector<13CPASAnimState,Q24rstl17rmemory_allocator>FQ24rstl120pointer_iterator<13CPASAnimState,Q24rstl50vector<13CPASAnimState,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>iQ24rstl40const_counting_iterator<13CPASAnimState>": @@ -270,7 +270,7 @@ lbl_802E4E00: /* 802E4E04 002E1D64 80 01 00 44 */ lwz r0, 0x44(r1) /* 802E4E08 002E1D68 7C 08 03 A6 */ mtlr r0 /* 802E4E0C 002E1D6C 38 21 00 40 */ addi r1, r1, 0x40 -/* 802E4E10 002E1D70 4E 80 00 20 */ blr +/* 802E4E10 002E1D70 4E 80 00 20 */ blr .global "allocate<13CPASAnimState>__Q24rstl17rmemory_allocatorFRP13CPASAnimStatei" "allocate<13CPASAnimState>__Q24rstl17rmemory_allocatorFRP13CPASAnimStatei": @@ -294,7 +294,7 @@ lbl_802E4E40: /* 802E4E50 002E1DB0 83 C1 00 08 */ lwz r30, 8(r1) /* 802E4E54 002E1DB4 7C 08 03 A6 */ mtlr r0 /* 802E4E58 002E1DB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E4E5C 002E1DBC 4E 80 00 20 */ blr +/* 802E4E5C 002E1DBC 4E 80 00 20 */ blr .global sub_802e4e60 sub_802e4e60: @@ -306,7 +306,7 @@ sub_802e4e60: /* 802E4E74 002E1DD4 80 01 00 14 */ lwz r0, 0x14(r1) /* 802E4E78 002E1DD8 7C 08 03 A6 */ mtlr r0 /* 802E4E7C 002E1DDC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E4E80 002E1DE0 4E 80 00 20 */ blr +/* 802E4E80 002E1DE0 4E 80 00 20 */ blr .global "__ml__Q24rstl39const_counting_iterator<12CPASAnimInfo>CFv" "__ml__Q24rstl39const_counting_iterator<12CPASAnimInfo>CFv": @@ -320,19 +320,19 @@ lbl_802E4E9C: /* 802E4E9C 002E1DFC 80 01 00 14 */ lwz r0, 0x14(r1) /* 802E4EA0 002E1E00 7C 08 03 A6 */ mtlr r0 /* 802E4EA4 002E1E04 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E4EA8 002E1E08 4E 80 00 20 */ blr +/* 802E4EA8 002E1E08 4E 80 00 20 */ blr .global SetDefaultState__12CPASDatabaseFi SetDefaultState__12CPASDatabaseFi: /* 802E4EAC 002E1E0C 90 83 00 10 */ stw r4, 0x10(r3) -/* 802E4EB0 002E1E10 4E 80 00 20 */ blr +/* 802E4EB0 002E1E10 4E 80 00 20 */ blr .global GetAnimStateByIndex__12CPASDatabaseCFi GetAnimStateByIndex__12CPASDatabaseCFi: /* 802E4EB4 002E1E14 1C 04 00 34 */ mulli r0, r4, 0x34 /* 802E4EB8 002E1E18 80 63 00 0C */ lwz r3, 0xc(r3) /* 802E4EBC 002E1E1C 7C 63 02 14 */ add r3, r3, r0 -/* 802E4EC0 002E1E20 4E 80 00 20 */ blr +/* 802E4EC0 002E1E20 4E 80 00 20 */ blr .global GetAnimState__12CPASDatabaseCFi GetAnimState__12CPASDatabaseCFi: @@ -383,7 +383,7 @@ lbl_802E4F54: /* 802E4F6C 002E1ECC 83 E1 00 5C */ lwz r31, 0x5c(r1) /* 802E4F70 002E1ED0 7C 08 03 A6 */ mtlr r0 /* 802E4F74 002E1ED4 38 21 00 60 */ addi r1, r1, 0x60 -/* 802E4F78 002E1ED8 4E 80 00 20 */ blr +/* 802E4F78 002E1ED8 4E 80 00 20 */ blr .global HasState__12CPASDatabaseCFi HasState__12CPASDatabaseCFi: @@ -443,12 +443,12 @@ lbl_802E5010: /* 802E5048 002E1FA8 80 01 00 64 */ lwz r0, 0x64(r1) /* 802E504C 002E1FAC 7C 08 03 A6 */ mtlr r0 /* 802E5050 002E1FB0 38 21 00 60 */ addi r1, r1, 0x60 -/* 802E5054 002E1FB4 4E 80 00 20 */ blr +/* 802E5054 002E1FB4 4E 80 00 20 */ blr .global GetNumAnimStates__12CPASDatabaseCFv GetNumAnimStates__12CPASDatabaseCFv: /* 802E5058 002E1FB8 80 63 00 04 */ lwz r3, 4(r3) -/* 802E505C 002E1FBC 4E 80 00 20 */ blr +/* 802E505C 002E1FBC 4E 80 00 20 */ blr .global FindBestAnimation__12CPASDatabaseCFRC16CPASAnimParmDataR9CRandom16i FindBestAnimation__12CPASDatabaseCFRC16CPASAnimParmDataR9CRandom16i: @@ -522,7 +522,7 @@ lbl_802E5158: /* 802E515C 002E20BC 80 01 00 74 */ lwz r0, 0x74(r1) /* 802E5160 002E20C0 7C 08 03 A6 */ mtlr r0 /* 802E5164 002E20C4 38 21 00 70 */ addi r1, r1, 0x70 -/* 802E5168 002E20C8 4E 80 00 20 */ blr +/* 802E5168 002E20C8 4E 80 00 20 */ blr .global FindBestAnimation__12CPASDatabaseCFRC16CPASAnimParmDatai FindBestAnimation__12CPASDatabaseCFRC16CPASAnimParmDatai: @@ -598,7 +598,7 @@ lbl_802E526C: /* 802E5270 002E21D0 80 01 00 84 */ lwz r0, 0x84(r1) /* 802E5274 002E21D4 7C 08 03 A6 */ mtlr r0 /* 802E5278 002E21D8 38 21 00 80 */ addi r1, r1, 0x80 -/* 802E527C 002E21DC 4E 80 00 20 */ blr +/* 802E527C 002E21DC 4E 80 00 20 */ blr .global __ct__12CPASDatabaseFR12CInputStream __ct__12CPASDatabaseFR12CInputStream: @@ -652,7 +652,7 @@ lbl_802E5328: /* 802E5330 002E2290 80 01 00 64 */ lwz r0, 0x64(r1) /* 802E5334 002E2294 7C 08 03 A6 */ mtlr r0 /* 802E5338 002E2298 38 21 00 60 */ addi r1, r1, 0x60 -/* 802E533C 002E229C 4E 80 00 20 */ blr +/* 802E533C 002E229C 4E 80 00 20 */ blr .global "lower_bound,Q24rstl17rmemory_allocator>,13CPASAnimState>__4rstlFQ24rstl126const_pointer_iterator<13CPASAnimState,Q24rstl50vector<13CPASAnimState,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl126const_pointer_iterator<13CPASAnimState,Q24rstl50vector<13CPASAnimState,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>RC13CPASAnimState" "lower_bound,Q24rstl17rmemory_allocator>,13CPASAnimState>__4rstlFQ24rstl126const_pointer_iterator<13CPASAnimState,Q24rstl50vector<13CPASAnimState,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl126const_pointer_iterator<13CPASAnimState,Q24rstl50vector<13CPASAnimState,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>RC13CPASAnimState": @@ -706,7 +706,7 @@ lbl_802E53DC: /* 802E53F0 002E2350 80 01 00 34 */ lwz r0, 0x34(r1) /* 802E53F4 002E2354 7C 08 03 A6 */ mtlr r0 /* 802E53F8 002E2358 38 21 00 30 */ addi r1, r1, 0x30 -/* 802E53FC 002E235C 4E 80 00 20 */ blr +/* 802E53FC 002E235C 4E 80 00 20 */ blr .global "lower_bound,Q24rstl17rmemory_allocator>,13CPASAnimState>__4rstlFQ24rstl120pointer_iterator<13CPASAnimState,Q24rstl50vector<13CPASAnimState,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl120pointer_iterator<13CPASAnimState,Q24rstl50vector<13CPASAnimState,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>RC13CPASAnimState" "lower_bound,Q24rstl17rmemory_allocator>,13CPASAnimState>__4rstlFQ24rstl120pointer_iterator<13CPASAnimState,Q24rstl50vector<13CPASAnimState,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl120pointer_iterator<13CPASAnimState,Q24rstl50vector<13CPASAnimState,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>RC13CPASAnimState": @@ -760,7 +760,7 @@ lbl_802E549C: /* 802E54B0 002E2410 80 01 00 34 */ lwz r0, 0x34(r1) /* 802E54B4 002E2414 7C 08 03 A6 */ mtlr r0 /* 802E54B8 002E2418 38 21 00 30 */ addi r1, r1, 0x30 -/* 802E54BC 002E241C 4E 80 00 20 */ blr +/* 802E54BC 002E241C 4E 80 00 20 */ blr .global "reserve__Q24rstl50vector<13CPASAnimState,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl50vector<13CPASAnimState,Q24rstl17rmemory_allocator>Fi": @@ -819,7 +819,7 @@ lbl_802E5574: /* 802E5580 002E24E0 83 A1 00 24 */ lwz r29, 0x24(r1) /* 802E5584 002E24E4 7C 08 03 A6 */ mtlr r0 /* 802E5588 002E24E8 38 21 00 30 */ addi r1, r1, 0x30 -/* 802E558C 002E24EC 4E 80 00 20 */ blr +/* 802E558C 002E24EC 4E 80 00 20 */ blr .global "construct<13CPASAnimState>__4rstlFPvRC13CPASAnimState" "construct<13CPASAnimState>__4rstlFPvRC13CPASAnimState": @@ -850,7 +850,7 @@ lbl_802E55CC: /* 802E55E8 002E2548 83 A1 00 14 */ lwz r29, 0x14(r1) /* 802E55EC 002E254C 7C 08 03 A6 */ mtlr r0 /* 802E55F0 002E2550 38 21 00 20 */ addi r1, r1, 0x20 -/* 802E55F4 002E2554 4E 80 00 20 */ blr +/* 802E55F4 002E2554 4E 80 00 20 */ blr .global "advance,Q24rstl17rmemory_allocator>,i>__4rstlFRQ24rstl126const_pointer_iterator<13CPASAnimState,Q24rstl50vector<13CPASAnimState,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>i" "advance,Q24rstl17rmemory_allocator>,i>__4rstlFRQ24rstl126const_pointer_iterator<13CPASAnimState,Q24rstl50vector<13CPASAnimState,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>i": @@ -864,7 +864,7 @@ lbl_802E55CC: /* 802E5614 002E2574 80 01 00 14 */ lwz r0, 0x14(r1) /* 802E5618 002E2578 7C 08 03 A6 */ mtlr r0 /* 802E561C 002E257C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E5620 002E2580 4E 80 00 20 */ blr +/* 802E5620 002E2580 4E 80 00 20 */ blr .global "advance,Q24rstl17rmemory_allocator>,i>__4rstlFRQ24rstl120pointer_iterator<13CPASAnimState,Q24rstl50vector<13CPASAnimState,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>i" "advance,Q24rstl17rmemory_allocator>,i>__4rstlFRQ24rstl120pointer_iterator<13CPASAnimState,Q24rstl50vector<13CPASAnimState,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>i": @@ -878,7 +878,7 @@ lbl_802E55CC: /* 802E5640 002E25A0 80 01 00 14 */ lwz r0, 0x14(r1) /* 802E5644 002E25A4 7C 08 03 A6 */ mtlr r0 /* 802E5648 002E25A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E564C 002E25AC 4E 80 00 20 */ blr +/* 802E564C 002E25AC 4E 80 00 20 */ blr .global "__advance,Q24rstl17rmemory_allocator>,i>__4rstlFRQ24rstl120pointer_iterator<13CPASAnimState,Q24rstl50vector<13CPASAnimState,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>iQ24rstl26random_access_iterator_tag" "__advance,Q24rstl17rmemory_allocator>,i>__4rstlFRQ24rstl120pointer_iterator<13CPASAnimState,Q24rstl50vector<13CPASAnimState,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>iQ24rstl26random_access_iterator_tag": @@ -886,7 +886,7 @@ lbl_802E55CC: /* 802E5654 002E25B4 80 83 00 00 */ lwz r4, 0(r3) /* 802E5658 002E25B8 7C 04 02 14 */ add r0, r4, r0 /* 802E565C 002E25BC 90 03 00 00 */ stw r0, 0(r3) -/* 802E5660 002E25C0 4E 80 00 20 */ blr +/* 802E5660 002E25C0 4E 80 00 20 */ blr .global "__advance,Q24rstl17rmemory_allocator>,i>__4rstlFRQ24rstl126const_pointer_iterator<13CPASAnimState,Q24rstl50vector<13CPASAnimState,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>iQ24rstl26random_access_iterator_tag" "__advance,Q24rstl17rmemory_allocator>,i>__4rstlFRQ24rstl126const_pointer_iterator<13CPASAnimState,Q24rstl50vector<13CPASAnimState,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>iQ24rstl26random_access_iterator_tag": @@ -894,7 +894,7 @@ lbl_802E55CC: /* 802E5668 002E25C8 80 83 00 00 */ lwz r4, 0(r3) /* 802E566C 002E25CC 7C 04 02 14 */ add r0, r4, r0 /* 802E5670 002E25D0 90 03 00 00 */ stw r0, 0(r3) -/* 802E5674 002E25D4 4E 80 00 20 */ blr +/* 802E5674 002E25D4 4E 80 00 20 */ blr .global "distance,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl126const_pointer_iterator<13CPASAnimState,Q24rstl50vector<13CPASAnimState,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl126const_pointer_iterator<13CPASAnimState,Q24rstl50vector<13CPASAnimState,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>" "distance,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl126const_pointer_iterator<13CPASAnimState,Q24rstl50vector<13CPASAnimState,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl126const_pointer_iterator<13CPASAnimState,Q24rstl50vector<13CPASAnimState,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>": @@ -914,7 +914,7 @@ lbl_802E55CC: /* 802E56AC 002E260C 80 01 00 24 */ lwz r0, 0x24(r1) /* 802E56B0 002E2610 7C 08 03 A6 */ mtlr r0 /* 802E56B4 002E2614 38 21 00 20 */ addi r1, r1, 0x20 -/* 802E56B8 002E2618 4E 80 00 20 */ blr +/* 802E56B8 002E2618 4E 80 00 20 */ blr .global "distance,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl120pointer_iterator<13CPASAnimState,Q24rstl50vector<13CPASAnimState,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl120pointer_iterator<13CPASAnimState,Q24rstl50vector<13CPASAnimState,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>" "distance,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl120pointer_iterator<13CPASAnimState,Q24rstl50vector<13CPASAnimState,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl120pointer_iterator<13CPASAnimState,Q24rstl50vector<13CPASAnimState,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>": @@ -934,7 +934,7 @@ lbl_802E55CC: /* 802E56F0 002E2650 80 01 00 24 */ lwz r0, 0x24(r1) /* 802E56F4 002E2654 7C 08 03 A6 */ mtlr r0 /* 802E56F8 002E2658 38 21 00 20 */ addi r1, r1, 0x20 -/* 802E56FC 002E265C 4E 80 00 20 */ blr +/* 802E56FC 002E265C 4E 80 00 20 */ blr .global "__distance,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl120pointer_iterator<13CPASAnimState,Q24rstl50vector<13CPASAnimState,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl120pointer_iterator<13CPASAnimState,Q24rstl50vector<13CPASAnimState,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl26random_access_iterator_tag" "__distance,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl120pointer_iterator<13CPASAnimState,Q24rstl50vector<13CPASAnimState,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl120pointer_iterator<13CPASAnimState,Q24rstl50vector<13CPASAnimState,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl26random_access_iterator_tag": @@ -947,7 +947,7 @@ lbl_802E55CC: /* 802E5718 002E2678 7C 00 26 70 */ srawi r0, r0, 4 /* 802E571C 002E267C 54 03 0F FE */ srwi r3, r0, 0x1f /* 802E5720 002E2680 7C 60 1A 14 */ add r3, r0, r3 -/* 802E5724 002E2684 4E 80 00 20 */ blr +/* 802E5724 002E2684 4E 80 00 20 */ blr .global "__distance,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl126const_pointer_iterator<13CPASAnimState,Q24rstl50vector<13CPASAnimState,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl126const_pointer_iterator<13CPASAnimState,Q24rstl50vector<13CPASAnimState,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl26random_access_iterator_tag" "__distance,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl126const_pointer_iterator<13CPASAnimState,Q24rstl50vector<13CPASAnimState,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl126const_pointer_iterator<13CPASAnimState,Q24rstl50vector<13CPASAnimState,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl26random_access_iterator_tag": diff --git a/asm/Kyoto/Animation/CPASParmInfo.s b/asm/Kyoto/Animation/CPASParmInfo.s index 5810060f..da07eb56 100644 --- a/asm/Kyoto/Animation/CPASParmInfo.s +++ b/asm/Kyoto/Animation/CPASParmInfo.s @@ -96,7 +96,7 @@ lbl_802E5888: /* 802E5898 002E27F8 83 A1 00 24 */ lwz r29, 0x24(r1) /* 802E589C 002E27FC 7C 08 03 A6 */ mtlr r0 /* 802E58A0 002E2800 38 21 00 30 */ addi r1, r1, 0x30 -/* 802E58A4 002E2804 4E 80 00 20 */ blr +/* 802E58A4 002E2804 4E 80 00 20 */ blr .global PutTo__10CPrimitiveCFR13COutputStream PutTo__10CPrimitiveCFR13COutputStream: diff --git a/asm/Kyoto/Animation/CPOINode.s b/asm/Kyoto/Animation/CPOINode.s index 9c66c274..4011fce1 100644 --- a/asm/Kyoto/Animation/CPOINode.s +++ b/asm/Kyoto/Animation/CPOINode.s @@ -30,7 +30,7 @@ lbl_802FD0F4: /* 802FD0FC 002FA05C 83 C1 00 08 */ lwz r30, 8(r1) /* 802FD100 002FA060 7C 08 03 A6 */ mtlr r0 /* 802FD104 002FA064 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FD108 002FA068 4E 80 00 20 */ blr +/* 802FD108 002FA068 4E 80 00 20 */ blr .global __lt__8CPOINodeCFRC8CPOINode __lt__8CPOINodeCFRC8CPOINode: @@ -43,7 +43,7 @@ __lt__8CPOINodeCFRC8CPOINode: /* 802FD124 002FA084 80 01 00 14 */ lwz r0, 0x14(r1) /* 802FD128 002FA088 7C 08 03 A6 */ mtlr r0 /* 802FD12C 002FA08C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FD130 002FA090 4E 80 00 20 */ blr +/* 802FD130 002FA090 4E 80 00 20 */ blr .global __gt__8CPOINodeCFRC8CPOINode __gt__8CPOINodeCFRC8CPOINode: @@ -56,7 +56,7 @@ __gt__8CPOINodeCFRC8CPOINode: /* 802FD14C 002FA0AC 80 01 00 14 */ lwz r0, 0x14(r1) /* 802FD150 002FA0B0 7C 08 03 A6 */ mtlr r0 /* 802FD154 002FA0B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FD158 002FA0B8 4E 80 00 20 */ blr +/* 802FD158 002FA0B8 4E 80 00 20 */ blr .global __ct__8CPOINodeFR12CInputStream __ct__8CPOINodeFR12CInputStream: @@ -104,7 +104,7 @@ __ct__8CPOINodeFR12CInputStream: /* 802FD200 002FA160 83 C1 00 18 */ lwz r30, 0x18(r1) /* 802FD204 002FA164 7C 08 03 A6 */ mtlr r0 /* 802FD208 002FA168 38 21 00 20 */ addi r1, r1, 0x20 -/* 802FD20C 002FA16C 4E 80 00 20 */ blr +/* 802FD20C 002FA16C 4E 80 00 20 */ blr .global "__ct__8CPOINodeFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>UsRC13CCharAnimTimeibfii" "__ct__8CPOINodeFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>UsRC13CCharAnimTimeibfii": diff --git a/asm/Kyoto/Animation/CParticlePOINode.s b/asm/Kyoto/Animation/CParticlePOINode.s index c9b7132b..2b1908b3 100644 --- a/asm/Kyoto/Animation/CParticlePOINode.s +++ b/asm/Kyoto/Animation/CParticlePOINode.s @@ -43,7 +43,7 @@ CopyNodeMinusStartTime__16CParticlePOINodeFRC16CParticlePOINodeRC13CCharAnimTime /* 802FD044 002F9FA4 83 81 00 30 */ lwz r28, 0x30(r1) /* 802FD048 002F9FA8 7C 08 03 A6 */ mtlr r0 /* 802FD04C 002F9FAC 38 21 00 40 */ addi r1, r1, 0x40 -/* 802FD050 002F9FB0 4E 80 00 20 */ blr +/* 802FD050 002F9FB0 4E 80 00 20 */ blr .global __ct__16CParticlePOINodeFR12CInputStream __ct__16CParticlePOINodeFR12CInputStream: @@ -67,4 +67,4 @@ __ct__16CParticlePOINodeFR12CInputStream: /* 802FD098 002F9FF8 83 C1 00 08 */ lwz r30, 8(r1) /* 802FD09C 002F9FFC 7C 08 03 A6 */ mtlr r0 /* 802FD0A0 002FA000 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FD0A4 002FA004 4E 80 00 20 */ blr +/* 802FD0A4 002FA004 4E 80 00 20 */ blr diff --git a/asm/Kyoto/Animation/CPoseAsTransforms.s b/asm/Kyoto/Animation/CPoseAsTransforms.s index 4ddecb02..3578c691 100644 --- a/asm/Kyoto/Animation/CPoseAsTransforms.s +++ b/asm/Kyoto/Animation/CPoseAsTransforms.s @@ -43,7 +43,7 @@ Clear__17CPoseAsTransformsFv: /* 80368EB4 00365E14 80 01 00 14 */ lwz r0, 0x14(r1) /* 80368EB8 00365E18 7C 08 03 A6 */ mtlr r0 /* 80368EBC 00365E1C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80368EC0 00365E20 4E 80 00 20 */ blr +/* 80368EC0 00365E20 4E 80 00 20 */ blr .global ContainsDataFor__17CPoseAsTransformsCFRC6CSegId ContainsDataFor__17CPoseAsTransformsCFRC6CSegId: @@ -67,7 +67,7 @@ lbl_80368F04: /* 80368F04 00365E64 38 80 00 01 */ li r4, 1 lbl_80368F08: /* 80368F08 00365E68 7C 83 23 78 */ mr r3, r4 -/* 80368F0C 00365E6C 4E 80 00 20 */ blr +/* 80368F0C 00365E6C 4E 80 00 20 */ blr .global AccumulateScaledTransform__17CPoseAsTransformsCFRC6CSegIdR9CMatrix3ff AccumulateScaledTransform__17CPoseAsTransformsCFRC6CSegIdR9CMatrix3ff: @@ -88,7 +88,7 @@ AccumulateScaledTransform__17CPoseAsTransformsCFRC6CSegIdR9CMatrix3ff: /* 80368F48 00365EA8 83 E1 00 14 */ lwz r31, 0x14(r1) /* 80368F4C 00365EAC 7C 08 03 A6 */ mtlr r0 /* 80368F50 00365EB0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80368F54 00365EB4 4E 80 00 20 */ blr +/* 80368F54 00365EB4 4E 80 00 20 */ blr .global GetOffset__17CPoseAsTransformsCFRC6CSegId GetOffset__17CPoseAsTransformsCFRC6CSegId: @@ -100,7 +100,7 @@ GetOffset__17CPoseAsTransformsCFRC6CSegId: /* 80368F6C 00365ECC 1C 60 00 30 */ mulli r3, r0, 0x30 /* 80368F70 00365ED0 38 63 00 24 */ addi r3, r3, 0x24 /* 80368F74 00365ED4 7C 64 1A 14 */ add r3, r4, r3 -/* 80368F78 00365ED8 4E 80 00 20 */ blr +/* 80368F78 00365ED8 4E 80 00 20 */ blr .global GetTransformMinusOffset__17CPoseAsTransformsCFRC6CSegId GetTransformMinusOffset__17CPoseAsTransformsCFRC6CSegId: @@ -111,7 +111,7 @@ GetTransformMinusOffset__17CPoseAsTransformsCFRC6CSegId: /* 80368F8C 00365EEC 88 03 00 09 */ lbz r0, 9(r3) /* 80368F90 00365EF0 1C 00 00 30 */ mulli r0, r0, 0x30 /* 80368F94 00365EF4 7C 64 02 14 */ add r3, r4, r0 -/* 80368F98 00365EF8 4E 80 00 20 */ blr +/* 80368F98 00365EF8 4E 80 00 20 */ blr .global GetRotation__17CPoseAsTransformsCFRC6CSegId GetRotation__17CPoseAsTransformsCFRC6CSegId: @@ -122,7 +122,7 @@ GetRotation__17CPoseAsTransformsCFRC6CSegId: /* 80368FAC 00365F0C 88 03 00 09 */ lbz r0, 9(r3) /* 80368FB0 00365F10 1C 00 00 30 */ mulli r0, r0, 0x30 /* 80368FB4 00365F14 7C 64 02 14 */ add r3, r4, r0 -/* 80368FB8 00365F18 4E 80 00 20 */ blr +/* 80368FB8 00365F18 4E 80 00 20 */ blr .global Insert__17CPoseAsTransformsFRC6CSegIdRC9CMatrix3fRC9CVector3f Insert__17CPoseAsTransformsFRC6CSegIdRC9CMatrix3fRC9CVector3f: @@ -154,7 +154,7 @@ Insert__17CPoseAsTransformsFRC6CSegIdRC9CMatrix3fRC9CVector3f: /* 80369020 00365F80 83 A1 00 44 */ lwz r29, 0x44(r1) /* 80369024 00365F84 7C 08 03 A6 */ mtlr r0 /* 80369028 00365F88 38 21 00 50 */ addi r1, r1, 0x50 -/* 8036902C 00365F8C 4E 80 00 20 */ blr +/* 8036902C 00365F8C 4E 80 00 20 */ blr .global __ct__17CPoseAsTransformsFUc __ct__17CPoseAsTransformsFUc: @@ -244,7 +244,7 @@ lbl_80369114: /* 80369150 003660B0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80369154 003660B4 7C 08 03 A6 */ mtlr r0 /* 80369158 003660B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8036915C 003660BC 4E 80 00 20 */ blr +/* 8036915C 003660BC 4E 80 00 20 */ blr .global "Insert__58TSegIdMapVariableSizeFRC6CSegIdRCQ217CPoseAsTransforms12CElementType" "Insert__58TSegIdMapVariableSizeFRC6CSegIdRCQ217CPoseAsTransforms12CElementType": @@ -291,7 +291,7 @@ lbl_803691C4: /* 803691FC 0036615C 83 81 00 10 */ lwz r28, 0x10(r1) /* 80369200 00366160 7C 08 03 A6 */ mtlr r0 /* 80369204 00366164 38 21 00 20 */ addi r1, r1, 0x20 -/* 80369208 00366168 4E 80 00 20 */ blr +/* 80369208 00366168 4E 80 00 20 */ blr .global "Clear__58TSegIdMapVariableSizeFv" "Clear__58TSegIdMapVariableSizeFv": diff --git a/asm/Kyoto/Animation/CSegIdList.s b/asm/Kyoto/Animation/CSegIdList.s index a29fc633..fa9867bc 100644 --- a/asm/Kyoto/Animation/CSegIdList.s +++ b/asm/Kyoto/Animation/CSegIdList.s @@ -19,4 +19,4 @@ __ct__10CSegIdListFR12CInputStream: /* 80348E94 00345DF4 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80348E98 00345DF8 7C 08 03 A6 */ mtlr r0 /* 80348E9C 00345DFC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80348EA0 00345E00 4E 80 00 20 */ blr +/* 80348EA0 00345E00 4E 80 00 20 */ blr diff --git a/asm/Kyoto/Animation/CSegStatementSet.s b/asm/Kyoto/Animation/CSegStatementSet.s index 2eaddb8a..00dc6416 100644 --- a/asm/Kyoto/Animation/CSegStatementSet.s +++ b/asm/Kyoto/Animation/CSegStatementSet.s @@ -79,7 +79,7 @@ lbl_802FD350: /* 802FD35C 002FA2BC 83 C1 00 08 */ lwz r30, 8(r1) /* 802FD360 002FA2C0 7C 08 03 A6 */ mtlr r0 /* 802FD364 002FA2C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FD368 002FA2C8 4E 80 00 20 */ blr +/* 802FD368 002FA2C8 4E 80 00 20 */ blr .global __ct__21CStackSegStatementSetFv __ct__21CStackSegStatementSetFv: @@ -137,7 +137,7 @@ lbl_802FD40C: /* 802FD428 002FA388 80 01 00 24 */ lwz r0, 0x24(r1) /* 802FD42C 002FA38C 7C 08 03 A6 */ mtlr r0 /* 802FD430 002FA390 38 21 00 20 */ addi r1, r1, 0x20 -/* 802FD434 002FA394 4E 80 00 20 */ blr +/* 802FD434 002FA394 4E 80 00 20 */ blr .global Add__16CSegStatementSetFRC10CSegIdListRC15CCharLayoutInfoRC16CSegStatementSetf Add__16CSegStatementSetFRC10CSegIdListRC15CCharLayoutInfoRC16CSegStatementSetf: @@ -250,7 +250,7 @@ lbl_802FD5C0: /* 802FD5D4 002FA534 80 01 00 94 */ lwz r0, 0x94(r1) /* 802FD5D8 002FA538 7C 08 03 A6 */ mtlr r0 /* 802FD5DC 002FA53C 38 21 00 90 */ addi r1, r1, 0x90 -/* 802FD5E0 002FA540 4E 80 00 20 */ blr +/* 802FD5E0 002FA540 4E 80 00 20 */ blr .global __ct__16CSegStatementSetFPv __ct__16CSegStatementSetFPv: diff --git a/asm/Kyoto/Animation/CSequenceHelper.s b/asm/Kyoto/Animation/CSequenceHelper.s index 0cc5036e..f91998b5 100644 --- a/asm/Kyoto/Animation/CSequenceHelper.s +++ b/asm/Kyoto/Animation/CSequenceHelper.s @@ -109,7 +109,7 @@ ComputeSequenceFundamentals__15CSequenceHelperCFv: /* 802E5AC8 002E2A28 38 80 00 01 */ li r4, 1 /* 802E5ACC 002E2A2C 81 8C 00 08 */ lwz r12, 8(r12) /* 802E5AD0 002E2A30 7D 89 03 A6 */ mtctr r12 -/* 802E5AD4 002E2A34 4E 80 04 21 */ bctrl +/* 802E5AD4 002E2A34 4E 80 04 21 */ bctrl lbl_802E5AD8: /* 802E5AD8 002E2A38 3C C0 80 03 */ lis r6, __dt__12CBoolPOINodeFv@ha /* 802E5ADC 002E2A3C 3C A0 80 03 */ lis r5, __dt__13CInt32POINodeFv@ha @@ -411,7 +411,7 @@ lbl_802E5F2C: /* 802E5F40 002E2EA0 81 84 00 00 */ lwz r12, 0(r4) /* 802E5F44 002E2EA4 81 8C 00 14 */ lwz r12, 0x14(r12) /* 802E5F48 002E2EA8 7D 89 03 A6 */ mtctr r12 -/* 802E5F4C 002E2EAC 4E 80 04 21 */ bctrl +/* 802E5F4C 002E2EAC 4E 80 04 21 */ bctrl /* 802E5F50 002E2EB0 38 61 00 EC */ addi r3, r1, 0xec /* 802E5F54 002E2EB4 38 81 00 7C */ addi r4, r1, 0x7c /* 802E5F58 002E2EB8 48 06 26 01 */ bl __apl__13CCharAnimTimeFRC13CCharAnimTime @@ -421,7 +421,7 @@ lbl_802E5F2C: /* 802E5F68 002E2EC8 81 84 00 00 */ lwz r12, 0(r4) /* 802E5F6C 002E2ECC 81 8C 00 14 */ lwz r12, 0x14(r12) /* 802E5F70 002E2ED0 7D 89 03 A6 */ mtctr r12 -/* 802E5F74 002E2ED4 4E 80 04 21 */ bctrl +/* 802E5F74 002E2ED4 4E 80 04 21 */ bctrl /* 802E5F78 002E2ED8 C0 01 00 74 */ lfs f0, 0x74(r1) /* 802E5F7C 002E2EDC 80 01 00 78 */ lwz r0, 0x78(r1) /* 802E5F80 002E2EE0 D0 01 00 E4 */ stfs f0, 0xe4(r1) @@ -439,7 +439,7 @@ lbl_802E5F8C: /* 802E5FAC 002E2F0C 81 84 00 00 */ lwz r12, 0(r4) /* 802E5FB0 002E2F10 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802E5FB4 002E2F14 7D 89 03 A6 */ mtctr r12 -/* 802E5FB8 002E2F18 4E 80 04 21 */ bctrl +/* 802E5FB8 002E2F18 4E 80 04 21 */ bctrl /* 802E5FBC 002E2F1C C0 E1 01 7C */ lfs f7, 0x17c(r1) /* 802E5FC0 002E2F20 38 61 00 FC */ addi r3, r1, 0xfc /* 802E5FC4 002E2F24 80 01 01 80 */ lwz r0, 0x180(r1) @@ -490,7 +490,7 @@ lbl_802E6044: /* 802E6074 002E2FD4 38 80 00 01 */ li r4, 1 /* 802E6078 002E2FD8 81 8C 00 08 */ lwz r12, 8(r12) /* 802E607C 002E2FDC 7D 89 03 A6 */ mtctr r12 -/* 802E6080 002E2FE0 4E 80 04 21 */ bctrl +/* 802E6080 002E2FE0 4E 80 04 21 */ bctrl lbl_802E6084: /* 802E6084 002E2FE4 88 01 01 20 */ lbz r0, 0x120(r1) /* 802E6088 002E2FE8 38 60 00 00 */ li r3, 0 @@ -557,7 +557,7 @@ lbl_802E612C: /* 802E6170 002E30D0 38 80 00 01 */ li r4, 1 /* 802E6174 002E30D4 81 8C 00 08 */ lwz r12, 8(r12) /* 802E6178 002E30D8 7D 89 03 A6 */ mtctr r12 -/* 802E617C 002E30DC 4E 80 04 21 */ bctrl +/* 802E617C 002E30DC 4E 80 04 21 */ bctrl lbl_802E6180: /* 802E6180 002E30E0 38 00 00 00 */ li r0, 0 /* 802E6184 002E30E4 98 01 01 20 */ stb r0, 0x120(r1) @@ -620,7 +620,7 @@ lbl_802E6230: /* 802E625C 002E31BC 38 80 00 01 */ li r4, 1 /* 802E6260 002E31C0 81 8C 00 08 */ lwz r12, 8(r12) /* 802E6264 002E31C4 7D 89 03 A6 */ mtctr r12 -/* 802E6268 002E31C8 4E 80 04 21 */ bctrl +/* 802E6268 002E31C8 4E 80 04 21 */ bctrl lbl_802E626C: /* 802E626C 002E31CC 7F 64 DB 78 */ mr r4, r27 /* 802E6270 002E31D0 38 61 01 C4 */ addi r3, r1, 0x1c4 @@ -680,7 +680,7 @@ lbl_802E6334: /* 802E633C 002E329C 81 90 00 00 */ lwz r12, 0(r16) /* 802E6340 002E32A0 81 8C 00 08 */ lwz r12, 8(r12) /* 802E6344 002E32A4 7D 89 03 A6 */ mtctr r12 -/* 802E6348 002E32A8 4E 80 04 21 */ bctrl +/* 802E6348 002E32A8 4E 80 04 21 */ bctrl /* 802E634C 002E32AC 3A 10 00 44 */ addi r16, r16, 0x44 lbl_802E6350: /* 802E6350 002E32B0 7C 10 78 40 */ cmplw r16, r15 @@ -705,7 +705,7 @@ lbl_802E638C: /* 802E6394 002E32F4 81 90 00 00 */ lwz r12, 0(r16) /* 802E6398 002E32F8 81 8C 00 08 */ lwz r12, 8(r12) /* 802E639C 002E32FC 7D 89 03 A6 */ mtctr r12 -/* 802E63A0 002E3300 4E 80 04 21 */ bctrl +/* 802E63A0 002E3300 4E 80 04 21 */ bctrl /* 802E63A4 002E3304 3A 10 00 5C */ addi r16, r16, 0x5c lbl_802E63A8: /* 802E63A8 002E3308 7C 10 78 40 */ cmplw r16, r15 @@ -730,7 +730,7 @@ lbl_802E63E4: /* 802E63EC 002E334C 81 90 00 00 */ lwz r12, 0(r16) /* 802E63F0 002E3350 81 8C 00 08 */ lwz r12, 8(r12) /* 802E63F4 002E3354 7D 89 03 A6 */ mtctr r12 -/* 802E63F8 002E3358 4E 80 04 21 */ bctrl +/* 802E63F8 002E3358 4E 80 04 21 */ bctrl /* 802E63FC 002E335C 3A 10 00 4C */ addi r16, r16, 0x4c lbl_802E6400: /* 802E6400 002E3360 7C 10 78 40 */ cmplw r16, r15 @@ -755,7 +755,7 @@ lbl_802E643C: /* 802E6444 002E33A4 81 90 00 00 */ lwz r12, 0(r16) /* 802E6448 002E33A8 81 8C 00 08 */ lwz r12, 8(r12) /* 802E644C 002E33AC 7D 89 03 A6 */ mtctr r12 -/* 802E6450 002E33B0 4E 80 04 21 */ bctrl +/* 802E6450 002E33B0 4E 80 04 21 */ bctrl /* 802E6454 002E33B4 3A 10 00 3C */ addi r16, r16, 0x3c lbl_802E6458: /* 802E6458 002E33B8 7C 10 78 40 */ cmplw r16, r15 @@ -793,7 +793,7 @@ lbl_802E6470: /* 802E64D4 002E3434 80 01 4C 94 */ lwz r0, 0x4c94(r1) /* 802E64D8 002E3438 7C 08 03 A6 */ mtlr r0 /* 802E64DC 002E343C 38 21 4C 90 */ addi r1, r1, 0x4c90 -/* 802E64E0 002E3440 4E 80 00 20 */ blr +/* 802E64E0 002E3440 4E 80 00 20 */ blr .global "__ct__21CSequenceFundamentalsFRC20CSteadyStateAnimInfoRCQ24rstl49vector<12CBoolPOINode,Q24rstl17rmemory_allocator>RCQ24rstl50vector<13CInt32POINode,Q24rstl17rmemory_allocator>RCQ24rstl53vector<16CParticlePOINode,Q24rstl17rmemory_allocator>RCQ24rstl50vector<13CSoundPOINode,Q24rstl17rmemory_allocator>" "__ct__21CSequenceFundamentalsFRC20CSteadyStateAnimInfoRCQ24rstl49vector<12CBoolPOINode,Q24rstl17rmemory_allocator>RCQ24rstl50vector<13CInt32POINode,Q24rstl17rmemory_allocator>RCQ24rstl53vector<16CParticlePOINode,Q24rstl17rmemory_allocator>RCQ24rstl50vector<13CSoundPOINode,Q24rstl17rmemory_allocator>": @@ -840,7 +840,7 @@ lbl_802E6470: /* 802E6584 002E34E4 83 81 00 10 */ lwz r28, 0x10(r1) /* 802E6588 002E34E8 7C 08 03 A6 */ mtlr r0 /* 802E658C 002E34EC 38 21 00 20 */ addi r1, r1, 0x20 -/* 802E6590 002E34F0 4E 80 00 20 */ blr +/* 802E6590 002E34F0 4E 80 00 20 */ blr .global "push_back__Q24rstl50vector<13CSoundPOINode,Q24rstl17rmemory_allocator>FRC13CSoundPOINode" "push_back__Q24rstl50vector<13CSoundPOINode,Q24rstl17rmemory_allocator>FRC13CSoundPOINode": @@ -911,7 +911,7 @@ lbl_802E6670: /* 802E6688 002E35E8 80 01 00 24 */ lwz r0, 0x24(r1) /* 802E668C 002E35EC 7C 08 03 A6 */ mtlr r0 /* 802E6690 002E35F0 38 21 00 20 */ addi r1, r1, 0x20 -/* 802E6694 002E35F4 4E 80 00 20 */ blr +/* 802E6694 002E35F4 4E 80 00 20 */ blr .global __defctor__13CSoundPOINodeFv __defctor__13CSoundPOINodeFv: @@ -952,7 +952,7 @@ __defctor__13CSoundPOINodeFv: /* 802E6720 002E3680 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 802E6724 002E3684 7C 08 03 A6 */ mtlr r0 /* 802E6728 002E3688 38 21 00 40 */ addi r1, r1, 0x40 -/* 802E672C 002E368C 4E 80 00 20 */ blr +/* 802E672C 002E368C 4E 80 00 20 */ blr .global "push_back__Q24rstl53vector<16CParticlePOINode,Q24rstl17rmemory_allocator>FRC16CParticlePOINode" "push_back__Q24rstl53vector<16CParticlePOINode,Q24rstl17rmemory_allocator>FRC16CParticlePOINode": @@ -1030,7 +1030,7 @@ lbl_802E6828: /* 802E6840 002E37A0 80 01 00 24 */ lwz r0, 0x24(r1) /* 802E6844 002E37A4 7C 08 03 A6 */ mtlr r0 /* 802E6848 002E37A8 38 21 00 20 */ addi r1, r1, 0x20 -/* 802E684C 002E37AC 4E 80 00 20 */ blr +/* 802E684C 002E37AC 4E 80 00 20 */ blr .global __defctor__16CParticlePOINodeFv __defctor__16CParticlePOINodeFv: @@ -1093,7 +1093,7 @@ lbl_802E6910: /* 802E692C 002E388C 83 C1 00 68 */ lwz r30, 0x68(r1) /* 802E6930 002E3890 7C 08 03 A6 */ mtlr r0 /* 802E6934 002E3894 38 21 00 70 */ addi r1, r1, 0x70 -/* 802E6938 002E3898 4E 80 00 20 */ blr +/* 802E6938 002E3898 4E 80 00 20 */ blr .global __defctor__13CInt32POINodeFv __defctor__13CInt32POINodeFv: @@ -1139,7 +1139,7 @@ __defctor__13CInt32POINodeFv: /* 802E69D8 002E3938 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 802E69DC 002E393C 7C 08 03 A6 */ mtlr r0 /* 802E69E0 002E3940 38 21 00 40 */ addi r1, r1, 0x40 -/* 802E69E4 002E3944 4E 80 00 20 */ blr +/* 802E69E4 002E3944 4E 80 00 20 */ blr .global __defctor__12CBoolPOINodeFv __defctor__12CBoolPOINodeFv: @@ -1178,7 +1178,7 @@ __defctor__12CBoolPOINodeFv: /* 802E6A68 002E39C8 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 802E6A6C 002E39CC 7C 08 03 A6 */ mtlr r0 /* 802E6A70 002E39D0 38 21 00 40 */ addi r1, r1, 0x40 -/* 802E6A74 002E39D4 4E 80 00 20 */ blr +/* 802E6A74 002E39D4 4E 80 00 20 */ blr .global "__ct__15CSequenceHelperFRCQ24rstl62vector,Q24rstl17rmemory_allocator>RC15CAnimSysContext" "__ct__15CSequenceHelperFRCQ24rstl62vector,Q24rstl17rmemory_allocator>RC15CAnimSysContext": @@ -1228,7 +1228,7 @@ lbl_802E6B04: /* 802E6B20 002E3A80 81 84 00 00 */ lwz r12, 0(r4) /* 802E6B24 002E3A84 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802E6B28 002E3A88 7D 89 03 A6 */ mtctr r12 -/* 802E6B2C 002E3A8C 4E 80 04 21 */ bctrl +/* 802E6B2C 002E3A8C 4E 80 04 21 */ bctrl /* 802E6B30 002E3A90 80 1B 00 14 */ lwz r0, 0x14(r27) /* 802E6B34 002E3A94 80 BB 00 18 */ lwz r5, 0x18(r27) /* 802E6B38 002E3A98 7C 00 28 00 */ cmpw r0, r5 @@ -1274,7 +1274,7 @@ lbl_802E6BB4: /* 802E6BC4 002E3B24 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 802E6BC8 002E3B28 7C 08 03 A6 */ mtlr r0 /* 802E6BCC 002E3B2C 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 802E6BD0 002E3B30 4E 80 00 20 */ blr +/* 802E6BD0 002E3B30 4E 80 00 20 */ blr .global "__ct__15CSequenceHelperFRCQ24rstl25ncrc_ptr<13CAnimTreeNode>RCQ24rstl25ncrc_ptr<13CAnimTreeNode>RC15CAnimSysContext" "__ct__15CSequenceHelperFRCQ24rstl25ncrc_ptr<13CAnimTreeNode>RCQ24rstl25ncrc_ptr<13CAnimTreeNode>RC15CAnimSysContext": @@ -1367,7 +1367,7 @@ lbl_802E6D00: /* 802E6D14 002E3C74 80 01 00 24 */ lwz r0, 0x24(r1) /* 802E6D18 002E3C78 7C 08 03 A6 */ mtlr r0 /* 802E6D1C 002E3C7C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802E6D20 002E3C80 4E 80 00 20 */ blr +/* 802E6D20 002E3C80 4E 80 00 20 */ blr .global "reserve__Q24rstl69vector,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl69vector,Q24rstl17rmemory_allocator>Fi": diff --git a/asm/Kyoto/Animation/CSkinnedModelWithAvgNormals.s b/asm/Kyoto/Animation/CSkinnedModelWithAvgNormals.s index 0bb14b20..5ac3d681 100644 --- a/asm/Kyoto/Animation/CSkinnedModelWithAvgNormals.s +++ b/asm/Kyoto/Animation/CSkinnedModelWithAvgNormals.s @@ -242,7 +242,7 @@ lbl_80357CE0: /* 80357CF0 00354C50 80 01 00 D4 */ lwz r0, 0xd4(r1) /* 80357CF4 00354C54 7C 08 03 A6 */ mtlr r0 /* 80357CF8 00354C58 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 80357CFC 00354C5C 4E 80 00 20 */ blr +/* 80357CFC 00354C5C 4E 80 00 20 */ blr .global sub_80357d00 sub_80357d00: @@ -278,7 +278,7 @@ lbl_80357D40: /* 80357D6C 00354CCC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80357D70 00354CD0 7C 08 03 A6 */ mtlr r0 /* 80357D74 00354CD4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80357D78 00354CD8 4E 80 00 20 */ blr +/* 80357D78 00354CD8 4E 80 00 20 */ blr .global sub_80357d7c sub_80357d7c: @@ -292,7 +292,7 @@ lbl_80357D94: /* 80357D94 00354CF4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80357D98 00354CF8 7C 08 03 A6 */ mtlr r0 /* 80357D9C 00354CFC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80357DA0 00354D00 4E 80 00 20 */ blr +/* 80357DA0 00354D00 4E 80 00 20 */ blr .global sub_80357da4 sub_80357da4: @@ -316,7 +316,7 @@ sub_80357da4: /* 80357DE8 00354D48 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80357DEC 00354D4C 7C 08 03 A6 */ mtlr r0 /* 80357DF0 00354D50 38 21 00 10 */ addi r1, r1, 0x10 -/* 80357DF4 00354D54 4E 80 00 20 */ blr +/* 80357DF4 00354D54 4E 80 00 20 */ blr .global sub_80357df8 sub_80357df8: @@ -357,7 +357,7 @@ sub_80357df8: /* 80357E80 00354DE0 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 80357E84 00354DE4 7C 08 03 A6 */ mtlr r0 /* 80357E88 00354DE8 38 21 00 30 */ addi r1, r1, 0x30 -/* 80357E8C 00354DEC 4E 80 00 20 */ blr +/* 80357E8C 00354DEC 4E 80 00 20 */ blr .global sub_80357e90 sub_80357e90: @@ -410,7 +410,7 @@ lbl_80357F24: /* 80357F34 00354E94 80 01 00 34 */ lwz r0, 0x34(r1) /* 80357F38 00354E98 7C 08 03 A6 */ mtlr r0 /* 80357F3C 00354E9C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80357F40 00354EA0 4E 80 00 20 */ blr +/* 80357F40 00354EA0 4E 80 00 20 */ blr .global sub_80357f44 sub_80357f44: @@ -452,7 +452,7 @@ lbl_80357FAC: /* 80357FC0 00354F20 83 81 00 10 */ lwz r28, 0x10(r1) /* 80357FC4 00354F24 7C 08 03 A6 */ mtlr r0 /* 80357FC8 00354F28 38 21 00 20 */ addi r1, r1, 0x20 -/* 80357FCC 00354F2C 4E 80 00 20 */ blr +/* 80357FCC 00354F2C 4E 80 00 20 */ blr .global sub_80357fd0 sub_80357fd0: @@ -475,7 +475,7 @@ sub_80357fd0: /* 80358010 00354F70 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80358014 00354F74 7C 08 03 A6 */ mtlr r0 /* 80358018 00354F78 38 21 00 10 */ addi r1, r1, 0x10 -/* 8035801C 00354F7C 4E 80 00 20 */ blr +/* 8035801C 00354F7C 4E 80 00 20 */ blr .global sub_80358020 sub_80358020: @@ -511,7 +511,7 @@ lbl_80358074: /* 8035808C 00354FEC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80358090 00354FF0 7C 08 03 A6 */ mtlr r0 /* 80358094 00354FF4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80358098 00354FF8 4E 80 00 20 */ blr +/* 80358098 00354FF8 4E 80 00 20 */ blr .global sub_8035809c sub_8035809c: @@ -547,7 +547,7 @@ lbl_803580F4: /* 80358104 00355064 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80358108 00355068 7C 08 03 A6 */ mtlr r0 /* 8035810C 0035506C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80358110 00355070 4E 80 00 20 */ blr +/* 80358110 00355070 4E 80 00 20 */ blr .global "reserve__Q24rstl105vector>,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl105vector>,Q24rstl17rmemory_allocator>Fi": @@ -613,7 +613,7 @@ lbl_803581E0: /* 803581E4 00355144 80 01 00 34 */ lwz r0, 0x34(r1) /* 803581E8 00355148 7C 08 03 A6 */ mtlr r0 /* 803581EC 0035514C 38 21 00 30 */ addi r1, r1, 0x30 -/* 803581F0 00355150 4E 80 00 20 */ blr +/* 803581F0 00355150 4E 80 00 20 */ blr .global sub_803581f4 sub_803581f4: diff --git a/asm/Kyoto/Animation/CTimeScaleFunctions.s b/asm/Kyoto/Animation/CTimeScaleFunctions.s index b9b4613d..47d0229f 100644 --- a/asm/Kyoto/Animation/CTimeScaleFunctions.s +++ b/asm/Kyoto/Animation/CTimeScaleFunctions.s @@ -30,7 +30,7 @@ lbl_803ED4EC: .global GetType__25CLinearAnimationTimeScaleCFv GetType__25CLinearAnimationTimeScaleCFv: /* 802FD6DC 002FA63C 38 60 00 01 */ li r3, 1 -/* 802FD6E0 002FA640 4E 80 00 20 */ blr +/* 802FD6E0 002FA640 4E 80 00 20 */ blr .global VGetFunctionMirrored__25CLinearAnimationTimeScaleCFRCf VGetFunctionMirrored__25CLinearAnimationTimeScaleCFRCf: @@ -129,7 +129,7 @@ lbl_802FD804: /* 802FD850 002FA7B0 83 C1 00 28 */ lwz r30, 0x28(r1) /* 802FD854 002FA7B4 7C 08 03 A6 */ mtlr r0 /* 802FD858 002FA7B8 38 21 00 90 */ addi r1, r1, 0x90 -/* 802FD85C 002FA7BC 4E 80 00 20 */ blr +/* 802FD85C 002FA7BC 4E 80 00 20 */ blr .global VClone__25CLinearAnimationTimeScaleCFv VClone__25CLinearAnimationTimeScaleCFv: @@ -220,7 +220,7 @@ lbl_802FD964: /* 802FD9AC 002FA90C 83 A1 00 34 */ lwz r29, 0x34(r1) /* 802FD9B0 002FA910 7C 08 03 A6 */ mtlr r0 /* 802FD9B4 002FA914 38 21 00 90 */ addi r1, r1, 0x90 -/* 802FD9B8 002FA918 4E 80 00 20 */ blr +/* 802FD9B8 002FA918 4E 80 00 20 */ blr .global VFindUpperLimit__25CLinearAnimationTimeScaleCFRCfRCf VFindUpperLimit__25CLinearAnimationTimeScaleCFRCfRCf: @@ -232,7 +232,7 @@ VFindUpperLimit__25CLinearAnimationTimeScaleCFRCfRCf: /* 802FD9D0 002FA930 80 01 00 14 */ lwz r0, 0x14(r1) /* 802FD9D4 002FA934 7C 08 03 A6 */ mtlr r0 /* 802FD9D8 002FA938 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FD9DC 002FA93C 4E 80 00 20 */ blr +/* 802FD9DC 002FA93C 4E 80 00 20 */ blr .global FindUpperLimitFromRoot__25CLinearAnimationTimeScaleFRCQ225CLinearAnimationTimeScale20CFunctionDescriptionRCfRCf FindUpperLimitFromRoot__25CLinearAnimationTimeScaleFRCQ225CLinearAnimationTimeScale20CFunctionDescriptionRCfRCf: @@ -263,7 +263,7 @@ lbl_802FDA1C: /* 802FDA3C 002FA99C FC 40 1A 10 */ fabs f2, f3 /* 802FDA40 002FA9A0 EC 21 18 28 */ fsubs f1, f1, f3 /* 802FDA44 002FA9A4 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 802FDA48 002FA9A8 4D 80 00 20 */ bltlr +/* 802FDA48 002FA9A8 4D 80 00 20 */ bltlr /* 802FDA4C 002FA9AC EC A7 00 72 */ fmuls f5, f7, f1 /* 802FDA50 002FA9B0 EC 68 00 72 */ fmuls f3, f8, f1 /* 802FDA54 002FA9B4 EC 46 40 7A */ fmadds f2, f6, f1, f8 @@ -274,7 +274,7 @@ lbl_802FDA1C: /* 802FDA68 002FA9C8 FC 40 1A 10 */ fabs f2, f3 /* 802FDA6C 002FA9CC EC 21 18 28 */ fsubs f1, f1, f3 /* 802FDA70 002FA9D0 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 802FDA74 002FA9D4 4D 80 00 20 */ bltlr +/* 802FDA74 002FA9D4 4D 80 00 20 */ bltlr /* 802FDA78 002FA9D8 EC A7 00 72 */ fmuls f5, f7, f1 /* 802FDA7C 002FA9DC EC 68 00 72 */ fmuls f3, f8, f1 /* 802FDA80 002FA9E0 EC 46 40 7A */ fmadds f2, f6, f1, f8 @@ -285,7 +285,7 @@ lbl_802FDA1C: /* 802FDA94 002FA9F4 FC 40 1A 10 */ fabs f2, f3 /* 802FDA98 002FA9F8 EC 21 18 28 */ fsubs f1, f1, f3 /* 802FDA9C 002FA9FC FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 802FDAA0 002FAA00 4D 80 00 20 */ bltlr +/* 802FDAA0 002FAA00 4D 80 00 20 */ bltlr /* 802FDAA4 002FAA04 EC A7 00 72 */ fmuls f5, f7, f1 /* 802FDAA8 002FAA08 EC 68 00 72 */ fmuls f3, f8, f1 /* 802FDAAC 002FAA0C EC 46 40 7A */ fmadds f2, f6, f1, f8 @@ -296,7 +296,7 @@ lbl_802FDA1C: /* 802FDAC0 002FAA20 FC 40 1A 10 */ fabs f2, f3 /* 802FDAC4 002FAA24 EC 21 18 28 */ fsubs f1, f1, f3 /* 802FDAC8 002FAA28 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 802FDACC 002FAA2C 4D 80 00 20 */ bltlr +/* 802FDACC 002FAA2C 4D 80 00 20 */ bltlr /* 802FDAD0 002FAA30 EC A7 00 72 */ fmuls f5, f7, f1 /* 802FDAD4 002FAA34 EC 68 00 72 */ fmuls f3, f8, f1 /* 802FDAD8 002FAA38 EC 46 40 7A */ fmadds f2, f6, f1, f8 @@ -307,11 +307,11 @@ lbl_802FDA1C: /* 802FDAEC 002FAA4C FC 40 1A 10 */ fabs f2, f3 /* 802FDAF0 002FAA50 EC 21 18 28 */ fsubs f1, f1, f3 /* 802FDAF4 002FAA54 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 802FDAF8 002FAA58 4D 80 00 20 */ bltlr +/* 802FDAF8 002FAA58 4D 80 00 20 */ bltlr /* 802FDAFC 002FAA5C 38 C6 00 04 */ addi r6, r6, 4 /* 802FDB00 002FAA60 42 00 FF 1C */ bdnz lbl_802FDA1C /* 802FDB04 002FAA64 C0 22 C7 28 */ lfs f1, lbl_805AE448@sda21(r2) -/* 802FDB08 002FAA68 4E 80 00 20 */ blr +/* 802FDB08 002FAA68 4E 80 00 20 */ blr .global VTimeScaleIntegral__25CLinearAnimationTimeScaleCFRCfRCf VTimeScaleIntegral__25CLinearAnimationTimeScaleCFRCfRCf: @@ -337,7 +337,7 @@ lbl_802FDB50: /* 802FDB50 002FAAB0 80 01 00 14 */ lwz r0, 0x14(r1) /* 802FDB54 002FAAB4 7C 08 03 A6 */ mtlr r0 /* 802FDB58 002FAAB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FDB5C 002FAABC 4E 80 00 20 */ blr +/* 802FDB5C 002FAABC 4E 80 00 20 */ blr .global TimeScaleIntegralWithSortedLimits__25CLinearAnimationTimeScaleFRCQ225CLinearAnimationTimeScale20CFunctionDescriptionRCfRCf TimeScaleIntegralWithSortedLimits__25CLinearAnimationTimeScaleFRCQ225CLinearAnimationTimeScale20CFunctionDescriptionRCfRCf: @@ -352,7 +352,7 @@ TimeScaleIntegralWithSortedLimits__25CLinearAnimationTimeScaleFRCQ225CLinearAnim /* 802FDB80 002FAAE0 EC 01 00 2A */ fadds f0, f1, f0 /* 802FDB84 002FAAE4 EC 02 00 32 */ fmuls f0, f2, f0 /* 802FDB88 002FAAE8 EC 23 00 32 */ fmuls f1, f3, f0 -/* 802FDB8C 002FAAEC 4E 80 00 20 */ blr +/* 802FDB8C 002FAAEC 4E 80 00 20 */ blr .global VGetFunctionMirrored__27CConstantAnimationTimeScaleCFRCf VGetFunctionMirrored__27CConstantAnimationTimeScaleCFRCf: @@ -366,7 +366,7 @@ VGetFunctionMirrored__27CConstantAnimationTimeScaleCFRCf: /* 802FDBAC 002FAB0C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802FDBB0 002FAB10 7C 08 03 A6 */ mtlr r0 /* 802FDBB4 002FAB14 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FDBB8 002FAB18 4E 80 00 20 */ blr +/* 802FDBB8 002FAB18 4E 80 00 20 */ blr .global VClone__27CConstantAnimationTimeScaleCFv VClone__27CConstantAnimationTimeScaleCFv: @@ -404,7 +404,7 @@ lbl_802FDC18: /* 802FDC34 002FAB94 80 01 00 14 */ lwz r0, 0x14(r1) /* 802FDC38 002FAB98 7C 08 03 A6 */ mtlr r0 /* 802FDC3C 002FAB9C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FDC40 002FABA0 4E 80 00 20 */ blr +/* 802FDC40 002FABA0 4E 80 00 20 */ blr .global VFindUpperLimit__27CConstantAnimationTimeScaleCFRCfRCf VFindUpperLimit__27CConstantAnimationTimeScaleCFRCfRCf: @@ -413,7 +413,7 @@ VFindUpperLimit__27CConstantAnimationTimeScaleCFRCfRCf: /* 802FDC4C 002FABAC C0 44 00 00 */ lfs f2, 0(r4) /* 802FDC50 002FABB0 EC 01 00 24 */ fdivs f0, f1, f0 /* 802FDC54 002FABB4 EC 22 00 2A */ fadds f1, f2, f0 -/* 802FDC58 002FABB8 4E 80 00 20 */ blr +/* 802FDC58 002FABB8 4E 80 00 20 */ blr .global VTimeScaleIntegral__27CConstantAnimationTimeScaleCFRCfRCf VTimeScaleIntegral__27CConstantAnimationTimeScaleCFRCfRCf: @@ -422,7 +422,7 @@ VTimeScaleIntegral__27CConstantAnimationTimeScaleCFRCfRCf: /* 802FDC64 002FABC4 C0 43 00 04 */ lfs f2, 4(r3) /* 802FDC68 002FABC8 EC 01 00 28 */ fsubs f0, f1, f0 /* 802FDC6C 002FABCC EC 22 00 32 */ fmuls f1, f2, f0 -/* 802FDC70 002FABD0 4E 80 00 20 */ blr +/* 802FDC70 002FABD0 4E 80 00 20 */ blr .global GetType__27CConstantAnimationTimeScaleCFv GetType__27CConstantAnimationTimeScaleCFv: diff --git a/asm/Kyoto/Animation/CTreeUtils.s b/asm/Kyoto/Animation/CTreeUtils.s index 3e5ec81f..f0eff24c 100644 --- a/asm/Kyoto/Animation/CTreeUtils.s +++ b/asm/Kyoto/Animation/CTreeUtils.s @@ -93,7 +93,7 @@ lbl_802E7014: /* 802E703C 002E3F9C 81 83 00 00 */ lwz r12, 0(r3) /* 802E7040 002E3FA0 81 8C 00 08 */ lwz r12, 8(r12) /* 802E7044 002E3FA4 7D 89 03 A6 */ mtctr r12 -/* 802E7048 002E3FA8 4E 80 04 21 */ bctrl +/* 802E7048 002E3FA8 4E 80 04 21 */ bctrl /* 802E704C 002E3FAC 7C 7A 1B 78 */ mr r26, r3 /* 802E7050 002E3FB0 38 61 00 08 */ addi r3, r1, 8 /* 802E7054 002E3FB4 38 80 00 00 */ li r4, 0 @@ -119,7 +119,7 @@ lbl_802E7098: /* 802E709C 002E3FFC 80 01 01 14 */ lwz r0, 0x114(r1) /* 802E70A0 002E4000 7C 08 03 A6 */ mtlr r0 /* 802E70A4 002E4004 38 21 01 10 */ addi r1, r1, 0x110 -/* 802E70A8 002E4008 4E 80 00 20 */ blr +/* 802E70A8 002E4008 4E 80 00 20 */ blr .global "GetTransitionTree__10IMetaTransCFRCQ24rstl25ncrc_ptr<13CAnimTreeNode>RCQ24rstl25ncrc_ptr<13CAnimTreeNode>RC15CAnimSysContext" "GetTransitionTree__10IMetaTransCFRCQ24rstl25ncrc_ptr<13CAnimTreeNode>RCQ24rstl25ncrc_ptr<13CAnimTreeNode>RC15CAnimSysContext": @@ -131,12 +131,12 @@ lbl_802E7098: /* 802E70C0 002E4020 81 84 00 00 */ lwz r12, 0(r4) /* 802E70C4 002E4024 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802E70C8 002E4028 7D 89 03 A6 */ mtctr r12 -/* 802E70CC 002E402C 4E 80 04 21 */ bctrl +/* 802E70CC 002E402C 4E 80 04 21 */ bctrl /* 802E70D0 002E4030 80 01 00 14 */ lwz r0, 0x14(r1) /* 802E70D4 002E4034 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802E70D8 002E4038 7C 08 03 A6 */ mtlr r0 /* 802E70DC 002E403C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E70E0 002E4040 4E 80 00 20 */ blr +/* 802E70E0 002E4040 4E 80 00 20 */ blr .global "NonConstCopy__29TToken<19CTransitionDatabase>CFv" "NonConstCopy__29TToken<19CTransitionDatabase>CFv": diff --git a/asm/Kyoto/Animation/CVertexMorphEffect.s b/asm/Kyoto/Animation/CVertexMorphEffect.s index 0a4e3ff3..142afc86 100644 --- a/asm/Kyoto/Animation/CVertexMorphEffect.s +++ b/asm/Kyoto/Animation/CVertexMorphEffect.s @@ -53,7 +53,7 @@ lbl_80357580: /* 80357588 003544E8 38 00 00 00 */ li r0, 0 /* 8035758C 003544EC 90 03 00 3C */ stw r0, 0x3c(r3) /* 80357590 003544F0 38 21 00 30 */ addi r1, r1, 0x30 -/* 80357594 003544F4 4E 80 00 20 */ blr +/* 80357594 003544F4 4E 80 00 20 */ blr .global "MorphVertices__18CVertexMorphEffectCFP9CVector3fPC9CVector3fRC26TLockedToken<10CSkinRules>RC17CPoseAsTransformsUi" "MorphVertices__18CVertexMorphEffectCFP9CVector3fPC9CVector3fRC26TLockedToken<10CSkinRules>RC17CPoseAsTransformsUi": @@ -315,7 +315,7 @@ lbl_80357948: /* 8035795C 003548BC 80 01 00 64 */ lwz r0, 0x64(r1) /* 80357960 003548C0 7C 08 03 A6 */ mtlr r0 /* 80357964 003548C4 38 21 00 60 */ addi r1, r1, 0x60 -/* 80357968 003548C8 4E 80 00 20 */ blr +/* 80357968 003548C8 4E 80 00 20 */ blr .global Update__18CVertexMorphEffectFf Update__18CVertexMorphEffectFf: diff --git a/asm/Kyoto/Animation/DolphinCSkinRules.s b/asm/Kyoto/Animation/DolphinCSkinRules.s index f9f43ebf..4d6c2c45 100644 --- a/asm/Kyoto/Animation/DolphinCSkinRules.s +++ b/asm/Kyoto/Animation/DolphinCSkinRules.s @@ -142,7 +142,7 @@ lbl_803539DC: /* 803539E0 00350940 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 803539E4 00350944 7C 08 03 A6 */ mtlr r0 /* 803539E8 00350948 38 21 00 20 */ addi r1, r1, 0x20 -/* 803539EC 0035094C 4E 80 00 20 */ blr +/* 803539EC 0035094C 4E 80 00 20 */ blr .global ProcessingPoints__10CSkinRulesFiPPUs ProcessingPoints__10CSkinRulesFiPPUs: @@ -213,7 +213,7 @@ lbl_80353AD8: /* 80353ADC 00350A3C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80353AE0 00350A40 7C 08 03 A6 */ mtlr r0 /* 80353AE4 00350A44 38 21 00 20 */ addi r1, r1, 0x20 -/* 80353AE8 00350A48 4E 80 00 20 */ blr +/* 80353AE8 00350A48 4E 80 00 20 */ blr .global WaitForQueue__Fv WaitForQueue__Fv: @@ -229,7 +229,7 @@ lbl_80353B0C: /* 80353B0C 00350A6C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80353B10 00350A70 7C 08 03 A6 */ mtlr r0 /* 80353B14 00350A74 38 21 00 10 */ addi r1, r1, 0x10 -/* 80353B18 00350A78 4E 80 00 20 */ blr +/* 80353B18 00350A78 4E 80 00 20 */ blr .global StartNextTransaction__10CSkinRulesFv StartNextTransaction__10CSkinRulesFv: @@ -300,7 +300,7 @@ lbl_80353C00: /* 80353C04 00350B64 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80353C08 00350B68 7C 08 03 A6 */ mtlr r0 /* 80353C0C 00350B6C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80353C10 00350B70 4E 80 00 20 */ blr +/* 80353C10 00350B70 4E 80 00 20 */ blr .global InitLockedCacheState__10CSkinRulesFRC10CSkinRules InitLockedCacheState__10CSkinRulesFRC10CSkinRules: @@ -323,7 +323,7 @@ InitLockedCacheState__10CSkinRulesFRC10CSkinRules: /* 80353C54 00350BB4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80353C58 00350BB8 7C 08 03 A6 */ mtlr r0 /* 80353C5C 00350BBC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80353C60 00350BC0 4E 80 00 20 */ blr +/* 80353C60 00350BC0 4E 80 00 20 */ blr .global FSkinRulesFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer FSkinRulesFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer: @@ -371,7 +371,7 @@ lbl_80353CA8: /* 80353D04 00350C64 38 80 00 01 */ li r4, 1 /* 80353D08 00350C68 81 8C 00 08 */ lwz r12, 8(r12) /* 80353D0C 00350C6C 7D 89 03 A6 */ mtctr r12 -/* 80353D10 00350C70 4E 80 04 21 */ bctrl +/* 80353D10 00350C70 4E 80 04 21 */ bctrl lbl_80353D14: /* 80353D14 00350C74 88 01 00 08 */ lbz r0, 8(r1) /* 80353D18 00350C78 28 00 00 00 */ cmplwi r0, 0 @@ -385,7 +385,7 @@ lbl_80353D2C: /* 80353D34 00350C94 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80353D38 00350C98 7C 08 03 A6 */ mtlr r0 /* 80353D3C 00350C9C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80353D40 00350CA0 4E 80 00 20 */ blr +/* 80353D40 00350CA0 4E 80 00 20 */ blr .global "__dt__20TToken<10CSkinRules>Fv" "__dt__20TToken<10CSkinRules>Fv": @@ -427,7 +427,7 @@ lbl_80353DB8: /* 80353DC4 00350D24 83 C1 00 08 */ lwz r30, 8(r1) /* 80353DC8 00350D28 7C 08 03 A6 */ mtlr r0 /* 80353DCC 00350D2C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80353DD0 00350D30 4E 80 00 20 */ blr +/* 80353DD0 00350D30 4E 80 00 20 */ blr .global "GetIObjObjectFor__20TToken<10CSkinRules>FRCQ24rstl22auto_ptr<10CSkinRules>" "GetIObjObjectFor__20TToken<10CSkinRules>FRCQ24rstl22auto_ptr<10CSkinRules>": @@ -441,7 +441,7 @@ lbl_80353DB8: /* 80353DF0 00350D50 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80353DF4 00350D54 7C 08 03 A6 */ mtlr r0 /* 80353DF8 00350D58 38 21 00 10 */ addi r1, r1, 0x10 -/* 80353DFC 00350D5C 4E 80 00 20 */ blr +/* 80353DFC 00350D5C 4E 80 00 20 */ blr .global "GetNewDerivedObject__38TObjOwnerDerivedFromIObj<10CSkinRules>FRCQ24rstl22auto_ptr<10CSkinRules>" "GetNewDerivedObject__38TObjOwnerDerivedFromIObj<10CSkinRules>FRCQ24rstl22auto_ptr<10CSkinRules>": @@ -484,7 +484,7 @@ lbl_80353E70: /* 80353E8C 00350DEC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80353E90 00350DF0 7C 08 03 A6 */ mtlr r0 /* 80353E94 00350DF4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80353E98 00350DF8 4E 80 00 20 */ blr +/* 80353E98 00350DF8 4E 80 00 20 */ blr .global BuildNormalsFrom__10CSkinRulesCFPC9CVector3fP9CVector3f BuildNormalsFrom__10CSkinRulesCFPC9CVector3fP9CVector3f: @@ -519,7 +519,7 @@ lbl_80353EF4: /* 80353F04 00350E64 80 01 00 34 */ lwz r0, 0x34(r1) /* 80353F08 00350E68 7C 08 03 A6 */ mtlr r0 /* 80353F0C 00350E6C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80353F10 00350E70 4E 80 00 20 */ blr +/* 80353F10 00350E70 4E 80 00 20 */ blr .global BuildNormals__10CSkinRulesCFPVv BuildNormals__10CSkinRulesCFPVv: @@ -565,7 +565,7 @@ lbl_80353F90: /* 80353FA0 00350F00 80 01 00 34 */ lwz r0, 0x34(r1) /* 80353FA4 00350F04 7C 08 03 A6 */ mtlr r0 /* 80353FA8 00350F08 38 21 00 30 */ addi r1, r1, 0x30 -/* 80353FAC 00350F0C 4E 80 00 20 */ blr +/* 80353FAC 00350F0C 4E 80 00 20 */ blr .global BuildPoints__10CSkinRulesCFPVv BuildPoints__10CSkinRulesCFPVv: @@ -611,7 +611,7 @@ lbl_8035402C: /* 8035403C 00350F9C 80 01 00 34 */ lwz r0, 0x34(r1) /* 80354040 00350FA0 7C 08 03 A6 */ mtlr r0 /* 80354044 00350FA4 38 21 00 30 */ addi r1, r1, 0x30 -/* 80354048 00350FA8 4E 80 00 20 */ blr +/* 80354048 00350FA8 4E 80 00 20 */ blr .global BuildAccumulatedTransforms__10CSkinRulesCFRC17CPoseAsTransformsRC15CCharLayoutInfo BuildAccumulatedTransforms__10CSkinRulesCFRC17CPoseAsTransformsRC15CCharLayoutInfo: @@ -694,7 +694,7 @@ lbl_80354154: /* 80354164 003510C4 80 01 04 E4 */ lwz r0, 0x4e4(r1) /* 80354168 003510C8 7C 08 03 A6 */ mtlr r0 /* 8035416C 003510CC 38 21 04 E0 */ addi r1, r1, 0x4e0 -/* 80354170 003510D0 4E 80 00 20 */ blr +/* 80354170 003510D0 4E 80 00 20 */ blr .global __dt__10CSkinRulesFv __dt__10CSkinRulesFv: @@ -725,7 +725,7 @@ lbl_803541C4: /* 803541D0 00351130 83 C1 00 08 */ lwz r30, 8(r1) /* 803541D4 00351134 7C 08 03 A6 */ mtlr r0 /* 803541D8 00351138 38 21 00 10 */ addi r1, r1, 0x10 -/* 803541DC 0035113C 4E 80 00 20 */ blr +/* 803541DC 0035113C 4E 80 00 20 */ blr .global sub_803541e0 sub_803541e0: @@ -797,7 +797,7 @@ lbl_803542B4: /* 803542C0 00351220 83 C1 00 18 */ lwz r30, 0x18(r1) /* 803542C4 00351224 7C 08 03 A6 */ mtlr r0 /* 803542C8 00351228 38 21 00 20 */ addi r1, r1, 0x20 -/* 803542CC 0035122C 4E 80 00 20 */ blr +/* 803542CC 0035122C 4E 80 00 20 */ blr .global __ct__10CSkinRulesFR12CInputStream __ct__10CSkinRulesFR12CInputStream: @@ -828,7 +828,7 @@ __ct__10CSkinRulesFR12CInputStream: /* 80354330 00351290 80 01 00 24 */ lwz r0, 0x24(r1) /* 80354334 00351294 7C 08 03 A6 */ mtlr r0 /* 80354338 00351298 38 21 00 20 */ addi r1, r1, 0x20 -/* 8035433C 0035129C 4E 80 00 20 */ blr +/* 8035433C 0035129C 4E 80 00 20 */ blr .global "__ct__Q24rstl49vector<12CVirtualBone,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl17rmemory_allocator" "__ct__Q24rstl49vector<12CVirtualBone,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl17rmemory_allocator": @@ -946,7 +946,7 @@ lbl_803544BC: /* 803544CC 0035142C 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 803544D0 00351430 7C 08 03 A6 */ mtlr r0 /* 803544D4 00351434 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 803544D8 00351438 4E 80 00 20 */ blr +/* 803544D8 00351438 4E 80 00 20 */ blr .global "Get<12CVirtualBone>__12CInputStreamFRC21TType<12CVirtualBone>" "Get<12CVirtualBone>__12CInputStreamFRC21TType<12CVirtualBone>": @@ -964,7 +964,7 @@ lbl_803544BC: /* 80354508 00351468 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8035450C 0035146C 7C 08 03 A6 */ mtlr r0 /* 80354510 00351470 38 21 00 20 */ addi r1, r1, 0x20 -/* 80354514 00351474 4E 80 00 20 */ blr +/* 80354514 00351474 4E 80 00 20 */ blr .global "cinput_stream_helper<12CVirtualBone>__FRC21TType<12CVirtualBone>R12CInputStream" "cinput_stream_helper<12CVirtualBone>__FRC21TType<12CVirtualBone>R12CInputStream": @@ -976,7 +976,7 @@ lbl_803544BC: /* 8035452C 0035148C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80354530 00351490 7C 08 03 A6 */ mtlr r0 /* 80354534 00351494 38 21 00 10 */ addi r1, r1, 0x10 -/* 80354538 00351498 4E 80 00 20 */ blr +/* 80354538 00351498 4E 80 00 20 */ blr .global sub_8035453c sub_8035453c: @@ -1020,7 +1020,7 @@ lbl_803545B8: /* 803545BC 0035151C 80 01 03 34 */ lwz r0, 0x334(r1) /* 803545C0 00351520 7C 08 03 A6 */ mtlr r0 /* 803545C4 00351524 38 21 03 30 */ addi r1, r1, 0x330 -/* 803545C8 00351528 4E 80 00 20 */ blr +/* 803545C8 00351528 4E 80 00 20 */ blr .global sub_803545cc sub_803545cc: diff --git a/asm/Kyoto/Animation/DolphinCSkinnedModel.s b/asm/Kyoto/Animation/DolphinCSkinnedModel.s index 427ea6ad..1d1fa71f 100644 --- a/asm/Kyoto/Animation/DolphinCSkinnedModel.s +++ b/asm/Kyoto/Animation/DolphinCSkinnedModel.s @@ -42,7 +42,7 @@ lbl_805A9600: .global lbl_805A9601 lbl_805A9601: .skip 0x7 - + .section .text, "ax" .global sub_80352668 @@ -87,19 +87,19 @@ lbl_803526EC: /* 803526F8 0034F658 83 A1 00 14 */ lwz r29, 0x14(r1) /* 803526FC 0034F65C 7C 08 03 A6 */ mtlr r0 /* 80352700 0034F660 38 21 00 20 */ addi r1, r1, 0x20 -/* 80352704 0034F664 4E 80 00 20 */ blr +/* 80352704 0034F664 4E 80 00 20 */ blr .global ClearPointGeneratorFunc__13CSkinnedModelFv ClearPointGeneratorFunc__13CSkinnedModelFv: /* 80352708 0034F668 38 00 00 00 */ li r0, 0 /* 8035270C 0034F66C 90 0D AA 30 */ stw r0, lbl_805A95F0@sda21(r13) -/* 80352710 0034F670 4E 80 00 20 */ blr +/* 80352710 0034F670 4E 80 00 20 */ blr .global SetPointGeneratorFunc__13CSkinnedModelFUiPFUiPC9CVector3fPC9CVector3fi_v SetPointGeneratorFunc__13CSkinnedModelFUiPFUiPC9CVector3fPC9CVector3fi_v: /* 80352714 0034F674 90 8D AA 30 */ stw r4, lbl_805A95F0@sda21(r13) /* 80352718 0034F678 90 6D AA 34 */ stw r3, lbl_805A95F4@sda21(r13) -/* 8035271C 0034F67C 4E 80 00 20 */ blr +/* 8035271C 0034F67C 4E 80 00 20 */ blr .global sub_80352720 sub_80352720: @@ -110,7 +110,7 @@ sub_80352720: /* 80352730 0034F690 80 01 00 14 */ lwz r0, 0x14(r1) /* 80352734 0034F694 7C 08 03 A6 */ mtlr r0 /* 80352738 0034F698 38 21 00 10 */ addi r1, r1, 0x10 -/* 8035273C 0034F69C 4E 80 00 20 */ blr +/* 8035273C 0034F69C 4E 80 00 20 */ blr .global sub_80352740 sub_80352740: @@ -121,7 +121,7 @@ sub_80352740: /* 80352750 0034F6B0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80352754 0034F6B4 7C 08 03 A6 */ mtlr r0 /* 80352758 0034F6B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8035275C 0034F6BC 4E 80 00 20 */ blr +/* 8035275C 0034F6BC 4E 80 00 20 */ blr .global sub_80352760 sub_80352760: @@ -198,7 +198,7 @@ lbl_80352858: /* 8035285C 0034F7BC 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80352860 0034F7C0 7C 08 03 A6 */ mtlr r0 /* 80352864 0034F7C4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80352868 0034F7C8 4E 80 00 20 */ blr +/* 80352868 0034F7C8 4E 80 00 20 */ blr .global AllocateStorage__13CSkinnedModelFv AllocateStorage__13CSkinnedModelFv: @@ -306,7 +306,7 @@ lbl_803529D0: /* 803529DC 0034F93C 83 A1 00 24 */ lwz r29, 0x24(r1) /* 803529E0 0034F940 7C 08 03 A6 */ mtlr r0 /* 803529E4 0034F944 38 21 00 30 */ addi r1, r1, 0x30 -/* 803529E8 0034F948 4E 80 00 20 */ blr +/* 803529E8 0034F948 4E 80 00 20 */ blr .global EnsureAllocation__13CSkinnedModelFi EnsureAllocation__13CSkinnedModelFi: @@ -414,7 +414,7 @@ lbl_80352B34: /* 80352B60 0034FAC0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80352B64 0034FAC4 7C 08 03 A6 */ mtlr r0 /* 80352B68 0034FAC8 38 21 00 20 */ addi r1, r1, 0x20 -/* 80352B6C 0034FACC 4E 80 00 20 */ blr +/* 80352B6C 0034FACC 4E 80 00 20 */ blr .global TickAllocations__13CSkinnedModelFv TickAllocations__13CSkinnedModelFv: @@ -464,7 +464,7 @@ lbl_80352BFC: /* 80352C08 0034FB68 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80352C0C 0034FB6C 7C 08 03 A6 */ mtlr r0 /* 80352C10 0034FB70 38 21 00 20 */ addi r1, r1, 0x20 -/* 80352C14 0034FB74 4E 80 00 20 */ blr +/* 80352C14 0034FB74 4E 80 00 20 */ blr .global CalculateDefault__13CSkinnedModelFv CalculateDefault__13CSkinnedModelFv: @@ -529,7 +529,7 @@ lbl_80352CE4: /* 80352CE8 0034FC48 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80352CEC 0034FC4C 7C 08 03 A6 */ mtlr r0 /* 80352CF0 0034FC50 38 21 00 20 */ addi r1, r1, 0x20 -/* 80352CF4 0034FC54 4E 80 00 20 */ blr +/* 80352CF4 0034FC54 4E 80 00 20 */ blr .global "Calculate__13CSkinnedModelFRC17CPoseAsTransformsRCQ24rstl37optional_object<18CVertexMorphEffect>PCfPf" "Calculate__13CSkinnedModelFRC17CPoseAsTransformsRCQ24rstl37optional_object<18CVertexMorphEffect>PCfPf": @@ -656,7 +656,7 @@ lbl_80352E9C: /* 80352EB8 0034FE18 1C 06 00 0C */ mulli r0, r6, 0xc /* 80352EBC 0034FE1C 7C BD 02 14 */ add r5, r29, r0 /* 80352EC0 0034FE20 7D 89 03 A6 */ mtctr r12 -/* 80352EC4 0034FE24 4E 80 04 21 */ bctrl +/* 80352EC4 0034FE24 4E 80 04 21 */ bctrl /* 80352EC8 0034FE28 7F A3 EB 78 */ mr r3, r29 /* 80352ECC 0034FE2C 7F C4 F3 78 */ mr r4, r30 /* 80352ED0 0034FE30 48 02 BB B5 */ bl DCInvalidateRange @@ -665,7 +665,7 @@ lbl_80352ED4: /* 80352ED8 0034FE38 80 01 00 34 */ lwz r0, 0x34(r1) /* 80352EDC 0034FE3C 7C 08 03 A6 */ mtlr r0 /* 80352EE0 0034FE40 38 21 00 30 */ addi r1, r1, 0x30 -/* 80352EE4 0034FE44 4E 80 00 20 */ blr +/* 80352EE4 0034FE44 4E 80 00 20 */ blr .global sub_80352ee8 sub_80352ee8: @@ -682,7 +682,7 @@ sub_80352ee8: /* 80352F10 0034FE70 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80352F14 0034FE74 7C 08 03 A6 */ mtlr r0 /* 80352F18 0034FE78 38 21 00 10 */ addi r1, r1, 0x10 -/* 80352F1C 0034FE7C 4E 80 00 20 */ blr +/* 80352F1C 0034FE7C 4E 80 00 20 */ blr .global DoDrawCallback__13CSkinnedModelF14FCustomDrawCPv DoDrawCallback__13CSkinnedModelF14FCustomDrawCPv: @@ -720,7 +720,7 @@ DoDrawCallback__13CSkinnedModelF14FCustomDrawCPv: /* 80352F9C 0034FEFC 7F C4 F3 78 */ mr r4, r30 /* 80352FA0 0034FF00 7F A5 EB 78 */ mr r5, r29 /* 80352FA4 0034FF04 7D 89 03 A6 */ mtctr r12 -/* 80352FA8 0034FF08 4E 80 04 21 */ bctrl +/* 80352FA8 0034FF08 4E 80 04 21 */ bctrl /* 80352FAC 0034FF0C 38 61 00 38 */ addi r3, r1, 0x38 /* 80352FB0 0034FF10 4B FB 96 31 */ bl SetModelMatrix__9CGraphicsFRC12CTransform4f /* 80352FB4 0034FF14 48 00 00 90 */ b lbl_80353044 @@ -737,13 +737,13 @@ lbl_80352FB8: /* 80352FDC 0034FF3C 7F C4 F3 78 */ mr r4, r30 /* 80352FE0 0034FF40 7F A5 EB 78 */ mr r5, r29 /* 80352FE4 0034FF44 7D 89 03 A6 */ mtctr r12 -/* 80352FE8 0034FF48 4E 80 04 21 */ bctrl +/* 80352FE8 0034FF48 4E 80 04 21 */ bctrl /* 80352FEC 0034FF4C 48 00 00 58 */ b lbl_80353044 lbl_80352FF0: /* 80352FF0 0034FF50 7F 8C E3 78 */ mr r12, r28 /* 80352FF4 0034FF54 80 9F 00 34 */ lwz r4, 0x34(r31) /* 80352FF8 0034FF58 7D 89 03 A6 */ mtctr r12 -/* 80352FFC 0034FF5C 4E 80 04 21 */ bctrl +/* 80352FFC 0034FF5C 4E 80 04 21 */ bctrl /* 80353000 0034FF60 80 9F 00 18 */ lwz r4, 0x18(r31) /* 80353004 0034FF64 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 80353008 0034FF68 80 04 00 10 */ lwz r0, 0x10(r4) @@ -769,7 +769,7 @@ lbl_80353044: /* 80353054 0034FFB4 83 81 00 70 */ lwz r28, 0x70(r1) /* 80353058 0034FFB8 7C 08 03 A6 */ mtlr r0 /* 8035305C 0034FFBC 38 21 00 80 */ addi r1, r1, 0x80 -/* 80353060 0034FFC0 4E 80 00 20 */ blr +/* 80353060 0034FFC0 4E 80 00 20 */ blr .global sub_80353064 sub_80353064: @@ -822,7 +822,7 @@ lbl_80353108: /* 80353110 00350070 83 C1 00 68 */ lwz r30, 0x68(r1) /* 80353114 00350074 7C 08 03 A6 */ mtlr r0 /* 80353118 00350078 38 21 00 70 */ addi r1, r1, 0x70 -/* 8035311C 0035007C 4E 80 00 20 */ blr +/* 8035311C 0035007C 4E 80 00 20 */ blr .global sub_80353120 sub_80353120: @@ -919,7 +919,7 @@ lbl_80353264: /* 8035326C 003501CC 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80353270 003501D0 7C 08 03 A6 */ mtlr r0 /* 80353274 003501D4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80353278 003501D8 4E 80 00 20 */ blr +/* 80353278 003501D8 4E 80 00 20 */ blr .global __dt__13CSkinnedModelFv __dt__13CSkinnedModelFv: @@ -986,7 +986,7 @@ lbl_80353348: /* 80353354 003502B4 83 C1 00 08 */ lwz r30, 8(r1) /* 80353358 003502B8 7C 08 03 A6 */ mtlr r0 /* 8035335C 003502BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80353360 003502C0 4E 80 00 20 */ blr +/* 80353360 003502C0 4E 80 00 20 */ blr .global __ct__13CSkinnedModelFRC13CSkinnedModel __ct__13CSkinnedModelFRC13CSkinnedModel: @@ -1042,7 +1042,7 @@ __ct__13CSkinnedModelFRC13CSkinnedModel: /* 80353428 00350388 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8035342C 0035038C 7C 08 03 A6 */ mtlr r0 /* 80353430 00350390 38 21 00 20 */ addi r1, r1, 0x20 -/* 80353434 00350394 4E 80 00 20 */ blr +/* 80353434 00350394 4E 80 00 20 */ blr .global "__ct__13CSkinnedModelFRC21TLockedToken<6CModel>RC26TLockedToken<10CSkinRules>RC31TLockedToken<15CCharLayoutInfo>Q213CSkinnedModel14EDataOwnership" "__ct__13CSkinnedModelFRC21TLockedToken<6CModel>RC26TLockedToken<10CSkinRules>RC31TLockedToken<15CCharLayoutInfo>Q213CSkinnedModel14EDataOwnership": @@ -1098,7 +1098,7 @@ __ct__13CSkinnedModelFRC13CSkinnedModel: /* 803534FC 0035045C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80353500 00350460 7C 08 03 A6 */ mtlr r0 /* 80353504 00350464 38 21 00 20 */ addi r1, r1, 0x20 -/* 80353508 00350468 4E 80 00 20 */ blr +/* 80353508 00350468 4E 80 00 20 */ blr .global sub_8035350c sub_8035350c: @@ -1145,7 +1145,7 @@ lbl_80353594: /* 8035359C 003504FC 83 C1 00 08 */ lwz r30, 8(r1) /* 803535A0 00350500 7C 08 03 A6 */ mtlr r0 /* 803535A4 00350504 38 21 00 10 */ addi r1, r1, 0x10 -/* 803535A8 00350508 4E 80 00 20 */ blr +/* 803535A8 00350508 4E 80 00 20 */ blr .global sub_803535ac sub_803535ac: @@ -1241,7 +1241,7 @@ lbl_803536E0: /* 803536F0 00350650 80 01 00 34 */ lwz r0, 0x34(r1) /* 803536F4 00350654 7C 08 03 A6 */ mtlr r0 /* 803536F8 00350658 38 21 00 30 */ addi r1, r1, 0x30 -/* 803536FC 0035065C 4E 80 00 20 */ blr +/* 803536FC 0035065C 4E 80 00 20 */ blr .global sub_80353700 sub_80353700: @@ -1277,7 +1277,7 @@ lbl_80353754: /* 8035376C 003506CC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80353770 003506D0 7C 08 03 A6 */ mtlr r0 /* 80353774 003506D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80353778 003506D8 4E 80 00 20 */ blr +/* 80353778 003506D8 4E 80 00 20 */ blr .global __sinit_DolphinCSkinnedModel_cpp __sinit_DolphinCSkinnedModel_cpp: @@ -1348,7 +1348,7 @@ lbl_80353854: /* 80353864 003507C4 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80353868 003507C8 7C 08 03 A6 */ mtlr r0 /* 8035386C 003507CC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80353870 003507D0 4E 80 00 20 */ blr +/* 80353870 003507D0 4E 80 00 20 */ blr .global "__dt__Q24rstl34optional_object<15CCircularBuffer>Fv" "__dt__Q24rstl34optional_object<15CCircularBuffer>Fv": diff --git a/asm/Kyoto/Animation/DolphinCVirtualBone.s b/asm/Kyoto/Animation/DolphinCVirtualBone.s index 9af64eaa..68bb7d33 100644 --- a/asm/Kyoto/Animation/DolphinCVirtualBone.s +++ b/asm/Kyoto/Animation/DolphinCVirtualBone.s @@ -60,7 +60,7 @@ lbl_803547A8: /* 803547C4 00351724 83 A1 00 14 */ lwz r29, 0x14(r1) /* 803547C8 00351728 7C 08 03 A6 */ mtlr r0 /* 803547CC 0035172C 38 21 00 20 */ addi r1, r1, 0x20 -/* 803547D0 00351730 4E 80 00 20 */ blr +/* 803547D0 00351730 4E 80 00 20 */ blr .global PSMTXROMultVecArrayGathered PSMTXROMultVecArrayGathered: @@ -136,7 +136,7 @@ lbl_803548D4: /* 803548E0 00351840 CA 21 00 20 */ lfd f17, 0x20(r1) /* 803548E4 00351844 CA 41 00 28 */ lfd f18, 0x28(r1) /* 803548E8 00351848 38 21 00 40 */ addi r1, r1, 0x40 -/* 803548EC 0035184C 4E 80 00 20 */ blr +/* 803548EC 0035184C 4E 80 00 20 */ blr .global sub_803548f0 sub_803548f0: @@ -171,7 +171,7 @@ lbl_8035494C: /* 80354958 003518B8 80 01 00 34 */ lwz r0, 0x34(r1) /* 8035495C 003518BC 7C 08 03 A6 */ mtlr r0 /* 80354960 003518C0 38 21 00 30 */ addi r1, r1, 0x30 -/* 80354964 003518C4 4E 80 00 20 */ blr +/* 80354964 003518C4 4E 80 00 20 */ blr .global BuildNormals__12CVirtualBoneCFPCUsPVvi BuildNormals__12CVirtualBoneCFPCUsPVvi: @@ -228,7 +228,7 @@ lbl_80354A1C: /* 80354A20 00351980 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 80354A24 00351984 7C 08 03 A6 */ mtlr r0 /* 80354A28 00351988 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 80354A2C 0035198C 4E 80 00 20 */ blr +/* 80354A2C 0035198C 4E 80 00 20 */ blr .global BuildPoints__12CVirtualBoneCFPCUsPVvi BuildPoints__12CVirtualBoneCFPCUsPVvi: @@ -277,7 +277,7 @@ lbl_80354AC4: /* 80354AC8 00351A28 80 01 00 64 */ lwz r0, 0x64(r1) /* 80354ACC 00351A2C 7C 08 03 A6 */ mtlr r0 /* 80354AD0 00351A30 38 21 00 60 */ addi r1, r1, 0x60 -/* 80354AD4 00351A34 4E 80 00 20 */ blr +/* 80354AD4 00351A34 4E 80 00 20 */ blr .global sub_80354ad8 sub_80354ad8: @@ -300,7 +300,7 @@ sub_80354ad8: /* 80354B18 00351A78 83 C1 00 08 */ lwz r30, 8(r1) /* 80354B1C 00351A7C 7C 08 03 A6 */ mtlr r0 /* 80354B20 00351A80 38 21 00 10 */ addi r1, r1, 0x10 -/* 80354B24 00351A84 4E 80 00 20 */ blr +/* 80354B24 00351A84 4E 80 00 20 */ blr .global sub_80354b28 sub_80354b28: @@ -459,7 +459,7 @@ lbl_80354D54: /* 80354D70 00351CD0 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 80354D74 00351CD4 7C 08 03 A6 */ mtlr r0 /* 80354D78 00351CD8 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 80354D7C 00351CDC 4E 80 00 20 */ blr +/* 80354D7C 00351CDC 4E 80 00 20 */ blr .global Transform2FromMatrixData Transform2FromMatrixData: @@ -505,7 +505,7 @@ Transform2FromMatrixData: /* 80354E1C 00351D7C F0 63 00 18 */ psq_st f3, 24(r3), 0, qr0 /* 80354E20 00351D80 F0 83 00 20 */ psq_st f4, 32(r3), 0, qr0 /* 80354E24 00351D84 F0 A3 00 28 */ psq_st f5, 40(r3), 0, qr0 -/* 80354E28 00351D88 4E 80 00 20 */ blr +/* 80354E28 00351D88 4E 80 00 20 */ blr .global TransformFromMatrixData TransformFromMatrixData: @@ -526,11 +526,11 @@ TransformFromMatrixData: /* 80354E64 00351DC4 F0 63 00 18 */ psq_st f3, 24(r3), 0, qr0 /* 80354E68 00351DC8 F0 83 00 20 */ psq_st f4, 32(r3), 0, qr0 /* 80354E6C 00351DCC F0 A3 00 28 */ psq_st f5, 40(r3), 0, qr0 -/* 80354E70 00351DD0 4E 80 00 20 */ blr +/* 80354E70 00351DD0 4E 80 00 20 */ blr .global nullsub_22 nullsub_22: -/* 80354E74 00351DD4 4E 80 00 20 */ blr +/* 80354E74 00351DD4 4E 80 00 20 */ blr .global __ct__12CVirtualBoneFR12CInputStream __ct__12CVirtualBoneFR12CInputStream: @@ -605,7 +605,7 @@ lbl_80354F2C: /* 80354F6C 00351ECC 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80354F70 00351ED0 7C 08 03 A6 */ mtlr r0 /* 80354F74 00351ED4 38 21 00 30 */ addi r1, r1, 0x30 -/* 80354F78 00351ED8 4E 80 00 20 */ blr +/* 80354F78 00351ED8 4E 80 00 20 */ blr .global StreamInSkinWeighting__FR12CInputStream StreamInSkinWeighting__FR12CInputStream: @@ -729,4 +729,4 @@ lbl_80355104: /* 80355110 00352070 80 01 00 44 */ lwz r0, 0x44(r1) /* 80355114 00352074 7C 08 03 A6 */ mtlr r0 /* 80355118 00352078 38 21 00 40 */ addi r1, r1, 0x40 -/* 8035511C 0035207C 4E 80 00 20 */ blr +/* 8035511C 0035207C 4E 80 00 20 */ blr diff --git a/asm/Kyoto/Animation/IAnimReader.s b/asm/Kyoto/Animation/IAnimReader.s index 86e93bd7..f0ed92ea 100644 --- a/asm/Kyoto/Animation/IAnimReader.s +++ b/asm/Kyoto/Animation/IAnimReader.s @@ -35,7 +35,7 @@ lbl_803ED508: .global IsCAnimTreeNode__11IAnimReaderCFv IsCAnimTreeNode__11IAnimReaderCFv: /* 802FDC7C 002FABDC 38 60 00 00 */ li r3, 0 -/* 802FDC80 002FABE0 4E 80 00 20 */ blr +/* 802FDC80 002FABE0 4E 80 00 20 */ blr .global GetSoundPOIList__11IAnimReaderCFRC13CCharAnimTimeP13CSoundPOINodeUiUii GetSoundPOIList__11IAnimReaderCFRC13CCharAnimTimeP13CSoundPOINodeUiUii: @@ -62,7 +62,7 @@ GetSoundPOIList__11IAnimReaderCFRC13CCharAnimTimeP13CSoundPOINodeUiUii: /* 802FDCD4 002FAC34 81 8C 00 34 */ lwz r12, 0x34(r12) /* 802FDCD8 002FAC38 7F E8 FB 78 */ mr r8, r31 /* 802FDCDC 002FAC3C 7D 89 03 A6 */ mtctr r12 -/* 802FDCE0 002FAC40 4E 80 04 21 */ bctrl +/* 802FDCE0 002FAC40 4E 80 04 21 */ bctrl /* 802FDCE4 002FAC44 48 00 00 08 */ b lbl_802FDCEC lbl_802FDCE8: /* 802FDCE8 002FAC48 38 60 00 00 */ li r3, 0 @@ -71,7 +71,7 @@ lbl_802FDCEC: /* 802FDCF0 002FAC50 80 01 00 24 */ lwz r0, 0x24(r1) /* 802FDCF4 002FAC54 7C 08 03 A6 */ mtlr r0 /* 802FDCF8 002FAC58 38 21 00 20 */ addi r1, r1, 0x20 -/* 802FDCFC 002FAC5C 4E 80 00 20 */ blr +/* 802FDCFC 002FAC5C 4E 80 00 20 */ blr .global GetParticlePOIList__11IAnimReaderCFRC13CCharAnimTimeP16CParticlePOINodeUiUii GetParticlePOIList__11IAnimReaderCFRC13CCharAnimTimeP16CParticlePOINodeUiUii: @@ -98,7 +98,7 @@ GetParticlePOIList__11IAnimReaderCFRC13CCharAnimTimeP16CParticlePOINodeUiUii: /* 802FDD50 002FACB0 81 8C 00 30 */ lwz r12, 0x30(r12) /* 802FDD54 002FACB4 7F E8 FB 78 */ mr r8, r31 /* 802FDD58 002FACB8 7D 89 03 A6 */ mtctr r12 -/* 802FDD5C 002FACBC 4E 80 04 21 */ bctrl +/* 802FDD5C 002FACBC 4E 80 04 21 */ bctrl /* 802FDD60 002FACC0 48 00 00 08 */ b lbl_802FDD68 lbl_802FDD64: /* 802FDD64 002FACC4 38 60 00 00 */ li r3, 0 @@ -107,7 +107,7 @@ lbl_802FDD68: /* 802FDD6C 002FACCC 80 01 00 24 */ lwz r0, 0x24(r1) /* 802FDD70 002FACD0 7C 08 03 A6 */ mtlr r0 /* 802FDD74 002FACD4 38 21 00 20 */ addi r1, r1, 0x20 -/* 802FDD78 002FACD8 4E 80 00 20 */ blr +/* 802FDD78 002FACD8 4E 80 00 20 */ blr .global GetInt32POIList__11IAnimReaderCFRC13CCharAnimTimeP13CInt32POINodeUiUii GetInt32POIList__11IAnimReaderCFRC13CCharAnimTimeP13CInt32POINodeUiUii: @@ -134,7 +134,7 @@ GetInt32POIList__11IAnimReaderCFRC13CCharAnimTimeP13CInt32POINodeUiUii: /* 802FDDCC 002FAD2C 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 802FDDD0 002FAD30 7F E8 FB 78 */ mr r8, r31 /* 802FDDD4 002FAD34 7D 89 03 A6 */ mtctr r12 -/* 802FDDD8 002FAD38 4E 80 04 21 */ bctrl +/* 802FDDD8 002FAD38 4E 80 04 21 */ bctrl /* 802FDDDC 002FAD3C 48 00 00 08 */ b lbl_802FDDE4 lbl_802FDDE0: /* 802FDDE0 002FAD40 38 60 00 00 */ li r3, 0 @@ -143,7 +143,7 @@ lbl_802FDDE4: /* 802FDDE8 002FAD48 80 01 00 24 */ lwz r0, 0x24(r1) /* 802FDDEC 002FAD4C 7C 08 03 A6 */ mtlr r0 /* 802FDDF0 002FAD50 38 21 00 20 */ addi r1, r1, 0x20 -/* 802FDDF4 002FAD54 4E 80 00 20 */ blr +/* 802FDDF4 002FAD54 4E 80 00 20 */ blr .global GetBoolPOIList__11IAnimReaderCFRC13CCharAnimTimeP12CBoolPOINodeUiUii GetBoolPOIList__11IAnimReaderCFRC13CCharAnimTimeP12CBoolPOINodeUiUii: @@ -170,7 +170,7 @@ GetBoolPOIList__11IAnimReaderCFRC13CCharAnimTimeP12CBoolPOINodeUiUii: /* 802FDE48 002FADA8 81 8C 00 28 */ lwz r12, 0x28(r12) /* 802FDE4C 002FADAC 7F E8 FB 78 */ mr r8, r31 /* 802FDE50 002FADB0 7D 89 03 A6 */ mtctr r12 -/* 802FDE54 002FADB4 4E 80 04 21 */ bctrl +/* 802FDE54 002FADB4 4E 80 04 21 */ bctrl /* 802FDE58 002FADB8 48 00 00 08 */ b lbl_802FDE60 lbl_802FDE5C: /* 802FDE5C 002FADBC 38 60 00 00 */ li r3, 0 @@ -179,7 +179,7 @@ lbl_802FDE60: /* 802FDE64 002FADC4 80 01 00 24 */ lwz r0, 0x24(r1) /* 802FDE68 002FADC8 7C 08 03 A6 */ mtlr r0 /* 802FDE6C 002FADCC 38 21 00 20 */ addi r1, r1, 0x20 -/* 802FDE70 002FADD0 4E 80 00 20 */ blr +/* 802FDE70 002FADD0 4E 80 00 20 */ blr .global VGetAdvancementResults__11IAnimReaderCFRC13CCharAnimTimeRC13CCharAnimTime VGetAdvancementResults__11IAnimReaderCFRC13CCharAnimTimeRC13CCharAnimTime: @@ -203,13 +203,13 @@ VGetAdvancementResults__11IAnimReaderCFRC13CCharAnimTimeRC13CCharAnimTime: /* 802FDEB8 002FAE18 D0 03 00 1C */ stfs f0, 0x1c(r3) /* 802FDEBC 002FAE1C C0 04 00 0C */ lfs f0, 0xc(r4) /* 802FDEC0 002FAE20 D0 03 00 20 */ stfs f0, 0x20(r3) -/* 802FDEC4 002FAE24 4E 80 00 20 */ blr +/* 802FDEC4 002FAE24 4E 80 00 20 */ blr .global VSimplified__11IAnimReaderFv VSimplified__11IAnimReaderFv: /* 802FDEC8 002FAE28 38 00 00 00 */ li r0, 0 /* 802FDECC 002FAE2C 98 03 00 08 */ stb r0, 8(r3) -/* 802FDED0 002FAE30 4E 80 00 20 */ blr +/* 802FDED0 002FAE30 4E 80 00 20 */ blr .global __dt__11IAnimReaderFv __dt__11IAnimReaderFv: diff --git a/asm/Kyoto/Animation/IMetaAnim.s b/asm/Kyoto/Animation/IMetaAnim.s index 128f886b..891c5816 100644 --- a/asm/Kyoto/Animation/IMetaAnim.s +++ b/asm/Kyoto/Animation/IMetaAnim.s @@ -47,7 +47,7 @@ lbl_802E712C: /* 802E7138 002E4098 38 A1 00 10 */ addi r5, r1, 0x10 /* 802E713C 002E409C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802E7140 002E40A0 7D 89 03 A6 */ mtctr r12 -/* 802E7144 002E40A4 4E 80 04 21 */ bctrl +/* 802E7144 002E40A4 4E 80 04 21 */ bctrl /* 802E7148 002E40A8 C0 E1 00 18 */ lfs f7, 0x18(r1) /* 802E714C 002E40AC 80 01 00 1C */ lwz r0, 0x1c(r1) /* 802E7150 002E40B0 C0 C1 00 20 */ lfs f6, 0x20(r1) @@ -82,7 +82,7 @@ lbl_802E7198: /* 802E71C0 002E4120 83 E1 00 6C */ lwz r31, 0x6c(r1) /* 802E71C4 002E4124 7C 08 03 A6 */ mtlr r0 /* 802E71C8 002E4128 38 21 00 70 */ addi r1, r1, 0x70 -/* 802E71CC 002E412C 4E 80 00 20 */ blr +/* 802E71CC 002E412C 4E 80 00 20 */ blr .global GetTime__9IMetaAnimFRC20CPreAdvanceIndicatorRC11IAnimReader GetTime__9IMetaAnimFRC20CPreAdvanceIndicatorRC11IAnimReader: @@ -121,7 +121,7 @@ lbl_802E7218: /* 802E724C 002E41AC 38 61 00 08 */ addi r3, r1, 8 /* 802E7250 002E41B0 81 8C 00 14 */ lwz r12, 0x14(r12) /* 802E7254 002E41B4 7D 89 03 A6 */ mtctr r12 -/* 802E7258 002E41B8 4E 80 04 21 */ bctrl +/* 802E7258 002E41B8 4E 80 04 21 */ bctrl /* 802E725C 002E41BC 7F 63 DB 78 */ mr r3, r27 /* 802E7260 002E41C0 38 81 00 08 */ addi r4, r1, 8 /* 802E7264 002E41C4 38 A1 00 10 */ addi r5, r1, 0x10 @@ -174,7 +174,7 @@ lbl_802E730C: /* 802E7310 002E4270 80 01 0F 34 */ lwz r0, 0xf34(r1) /* 802E7314 002E4274 7C 08 03 A6 */ mtlr r0 /* 802E7318 002E4278 38 21 0F 30 */ addi r1, r1, 0xf30 -/* 802E731C 002E427C 4E 80 00 20 */ blr +/* 802E731C 002E427C 4E 80 00 20 */ blr .global PutTo__9IMetaAnimCFR13COutputStream PutTo__9IMetaAnimCFR13COutputStream: @@ -188,7 +188,7 @@ PutTo__9IMetaAnimCFR13COutputStream: /* 802E733C 002E429C 81 83 00 00 */ lwz r12, 0(r3) /* 802E7340 002E42A0 81 8C 00 14 */ lwz r12, 0x14(r12) /* 802E7344 002E42A4 7D 89 03 A6 */ mtctr r12 -/* 802E7348 002E42A8 4E 80 04 21 */ bctrl +/* 802E7348 002E42A8 4E 80 04 21 */ bctrl /* 802E734C 002E42AC 90 61 00 08 */ stw r3, 8(r1) /* 802E7350 002E42B0 7F E3 FB 78 */ mr r3, r31 /* 802E7354 002E42B4 48 05 81 65 */ bl FlushShiftRegister__13COutputStreamFv @@ -201,13 +201,13 @@ PutTo__9IMetaAnimCFR13COutputStream: /* 802E7370 002E42D0 81 9E 00 00 */ lwz r12, 0(r30) /* 802E7374 002E42D4 81 8C 00 18 */ lwz r12, 0x18(r12) /* 802E7378 002E42D8 7D 89 03 A6 */ mtctr r12 -/* 802E737C 002E42DC 4E 80 04 21 */ bctrl +/* 802E737C 002E42DC 4E 80 04 21 */ bctrl /* 802E7380 002E42E0 80 01 00 24 */ lwz r0, 0x24(r1) /* 802E7384 002E42E4 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802E7388 002E42E8 83 C1 00 18 */ lwz r30, 0x18(r1) /* 802E738C 002E42EC 7C 08 03 A6 */ mtlr r0 /* 802E7390 002E42F0 38 21 00 20 */ addi r1, r1, 0x20 -/* 802E7394 002E42F4 4E 80 00 20 */ blr +/* 802E7394 002E42F4 4E 80 00 20 */ blr .global GetAnimationTree__9IMetaAnimCFRC15CAnimSysContextRC24CMetaAnimTreeBuildOrders GetAnimationTree__9IMetaAnimCFRC15CAnimSysContextRC24CMetaAnimTreeBuildOrders: @@ -234,7 +234,7 @@ GetAnimationTree__9IMetaAnimCFRC15CAnimSysContextRC24CMetaAnimTreeBuildOrders: /* 802E73E8 002E4348 38 C1 01 38 */ addi r6, r1, 0x138 /* 802E73EC 002E434C 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 802E73F0 002E4350 7D 89 03 A6 */ mtctr r12 -/* 802E73F4 002E4354 4E 80 04 21 */ bctrl +/* 802E73F4 002E4354 4E 80 04 21 */ bctrl /* 802E73F8 002E4358 80 A1 00 0C */ lwz r5, 0xc(r1) /* 802E73FC 002E435C 38 61 00 0C */ addi r3, r1, 0xc /* 802E7400 002E4360 90 A1 00 14 */ stw r5, 0x14(r1) @@ -286,7 +286,7 @@ lbl_802E7488: /* 802E74AC 002E440C 38 C1 00 B0 */ addi r6, r1, 0xb0 /* 802E74B0 002E4410 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 802E74B4 002E4414 7D 89 03 A6 */ mtctr r12 -/* 802E74B8 002E4418 4E 80 04 21 */ bctrl +/* 802E74B8 002E4418 4E 80 04 21 */ bctrl /* 802E74BC 002E441C 80 A1 00 08 */ lwz r5, 8(r1) /* 802E74C0 002E4420 38 61 00 08 */ addi r3, r1, 8 /* 802E74C4 002E4424 90 A1 00 10 */ stw r5, 0x10(r1) @@ -335,7 +335,7 @@ lbl_802E754C: /* 802E7564 002E44C4 38 C1 00 28 */ addi r6, r1, 0x28 /* 802E7568 002E44C8 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 802E756C 002E44CC 7D 89 03 A6 */ mtctr r12 -/* 802E7570 002E44D0 4E 80 04 21 */ bctrl +/* 802E7570 002E44D0 4E 80 04 21 */ bctrl /* 802E7574 002E44D4 38 00 00 00 */ li r0, 0 /* 802E7578 002E44D8 98 01 00 AC */ stb r0, 0xac(r1) /* 802E757C 002E44DC 98 01 00 68 */ stb r0, 0x68(r1) @@ -347,7 +347,7 @@ lbl_802E7580: /* 802E7590 002E44F0 83 81 01 C0 */ lwz r28, 0x1c0(r1) /* 802E7594 002E44F4 7C 08 03 A6 */ mtlr r0 /* 802E7598 002E44F8 38 21 01 D0 */ addi r1, r1, 0x1d0 -/* 802E759C 002E44FC 4E 80 00 20 */ blr +/* 802E759C 002E44FC 4E 80 00 20 */ blr .global PreAdvanceForAll__24CMetaAnimTreeBuildOrdersFRC20CPreAdvanceIndicator PreAdvanceForAll__24CMetaAnimTreeBuildOrdersFRC20CPreAdvanceIndicator: @@ -513,19 +513,19 @@ lbl_802E7800: /* 802E7808 002E4768 98 01 00 8C */ stb r0, 0x8c(r1) /* 802E780C 002E476C 98 01 00 48 */ stb r0, 0x48(r1) /* 802E7810 002E4770 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 802E7814 002E4774 4E 80 00 20 */ blr +/* 802E7814 002E4774 4E 80 00 20 */ blr .global NoSpecialOrders__24CMetaAnimTreeBuildOrdersFv NoSpecialOrders__24CMetaAnimTreeBuildOrdersFv: /* 802E7818 002E4778 38 00 00 00 */ li r0, 0 /* 802E781C 002E477C 98 03 00 40 */ stb r0, 0x40(r3) /* 802E7820 002E4780 98 03 00 84 */ stb r0, 0x84(r3) -/* 802E7824 002E4784 4E 80 00 20 */ blr +/* 802E7824 002E4784 4E 80 00 20 */ blr .global GetString__20CPreAdvanceIndicatorCFv GetString__20CPreAdvanceIndicatorCFv: /* 802E7828 002E4788 38 63 00 0C */ addi r3, r3, 0xc -/* 802E782C 002E478C 4E 80 00 20 */ blr +/* 802E782C 002E478C 4E 80 00 20 */ blr .global IsString__20CPreAdvanceIndicatorCFv IsString__20CPreAdvanceIndicatorCFv: @@ -539,12 +539,12 @@ IsString__20CPreAdvanceIndicatorCFv: /* 802E784C 002E47AC 80 01 00 14 */ lwz r0, 0x14(r1) /* 802E7850 002E47B0 7C 08 03 A6 */ mtlr r0 /* 802E7854 002E47B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E7858 002E47B8 4E 80 00 20 */ blr +/* 802E7858 002E47B8 4E 80 00 20 */ blr .global GetTime__20CPreAdvanceIndicatorCFv GetTime__20CPreAdvanceIndicatorCFv: /* 802E785C 002E47BC 38 63 00 04 */ addi r3, r3, 4 -/* 802E7860 002E47C0 4E 80 00 20 */ blr +/* 802E7860 002E47C0 4E 80 00 20 */ blr .global IsTime__20CPreAdvanceIndicatorCFv IsTime__20CPreAdvanceIndicatorCFv: diff --git a/asm/Kyoto/Audio/CDSPStreamManager.s b/asm/Kyoto/Audio/CDSPStreamManager.s index 603489a6..e8a9910c 100644 --- a/asm/Kyoto/Audio/CDSPStreamManager.s +++ b/asm/Kyoto/Audio/CDSPStreamManager.s @@ -6,19 +6,19 @@ .global lbl_80540004 lbl_80540004: - .skip 0xC + .skip 0xC .global lbl_80540010 lbl_80540010: - .skip 0x10 + .skip 0x10 .global lbl_80540020 lbl_80540020: .skip 0x500 .global lbl_80540520 lbl_80540520: - .skip 0x30 + .skip 0x30 .global lbl_80540550 lbl_80540550: - .skip 0x30 + .skip 0x30 .global lbl_80540580 lbl_80540580: .skip 0x64 @@ -40,7 +40,7 @@ lbl_80540A2C: .global lbl_805A9678 lbl_805A9678: .skip 0x8 - + .section .text, "ax" .global AllocateStream__17CDSPStreamManagerFv @@ -196,7 +196,7 @@ lbl_80363714: /* 8036371C 0036067C 80 0A 00 04 */ lwz r0, 4(r10) /* 80363720 00360680 7C 08 03 A6 */ mtlr r0 /* 80363724 00360684 7D 41 53 78 */ mr r1, r10 -/* 80363728 00360688 4E 80 00 20 */ blr +/* 80363728 00360688 4E 80 00 20 */ blr .global sub_8036372c sub_8036372c: @@ -224,7 +224,7 @@ lbl_8036376C: /* 80363778 003606D8 83 C1 00 08 */ lwz r30, 8(r1) /* 8036377C 003606DC 7C 08 03 A6 */ mtlr r0 /* 80363780 003606E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80363784 003606E4 4E 80 00 20 */ blr +/* 80363784 003606E4 4E 80 00 20 */ blr .global HeaderReadComplete__17CDSPStreamManagerFiP11DVDFileInfo HeaderReadComplete__17CDSPStreamManagerFiP11DVDFileInfo: @@ -365,7 +365,7 @@ lbl_80363958: /* 8036396C 003608CC 83 8A FF F0 */ lwz r28, -0x10(r10) /* 80363970 003608D0 7C 08 03 A6 */ mtlr r0 /* 80363974 003608D4 7D 41 53 78 */ mr r1, r10 -/* 80363978 003608D8 4E 80 00 20 */ blr +/* 80363978 003608D8 4E 80 00 20 */ blr .global GetStreamState__17CDSPStreamManagerFi GetStreamState__17CDSPStreamManagerFi: @@ -426,7 +426,7 @@ lbl_80363A38: /* 80363A3C 0036099C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80363A40 003609A0 7C 08 03 A6 */ mtlr r0 /* 80363A44 003609A4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80363A48 003609A8 4E 80 00 20 */ blr +/* 80363A48 003609A8 4E 80 00 20 */ blr .global CanStop__17CDSPStreamManagerFi CanStop__17CDSPStreamManagerFi: @@ -483,7 +483,7 @@ lbl_80363B00: /* 80363B04 00360A64 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80363B08 00360A68 7C 08 03 A6 */ mtlr r0 /* 80363B0C 00360A6C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80363B10 00360A70 4E 80 00 20 */ blr +/* 80363B10 00360A70 4E 80 00 20 */ blr .global IsStreamAvailable__17CDSPStreamManagerFi IsStreamAvailable__17CDSPStreamManagerFi: @@ -538,7 +538,7 @@ lbl_80363BC0: /* 80363BC4 00360B24 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80363BC8 00360B28 7C 08 03 A6 */ mtlr r0 /* 80363BCC 00360B2C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80363BD0 00360B30 4E 80 00 20 */ blr +/* 80363BD0 00360B30 4E 80 00 20 */ blr .global UpdateVolume__17CDSPStreamManagerFic UpdateVolume__17CDSPStreamManagerFic: @@ -582,7 +582,7 @@ lbl_80363C54: /* 80363C5C 00360BBC 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80363C60 00360BC0 7C 08 03 A6 */ mtlr r0 /* 80363C64 00360BC4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80363C68 00360BC8 4E 80 00 20 */ blr +/* 80363C68 00360BC8 4E 80 00 20 */ blr .global __ct__14SDSPStreamInfoFRC17CDSPStreamManager __ct__14SDSPStreamInfoFRC17CDSPStreamManager: @@ -661,7 +661,7 @@ lbl_80363CF4: /* 80363D80 00360CE0 80 01 00 54 */ lwz r0, 0x54(r1) /* 80363D84 00360CE4 7C 08 03 A6 */ mtlr r0 /* 80363D88 00360CE8 38 21 00 50 */ addi r1, r1, 0x50 -/* 80363D8C 00360CEC 4E 80 00 20 */ blr +/* 80363D8C 00360CEC 4E 80 00 20 */ blr .global StopStreaming__17CDSPStreamManagerFi StopStreaming__17CDSPStreamManagerFi: @@ -748,7 +748,7 @@ lbl_80363EAC: /* 80363EB8 00360E18 83 CA FF F8 */ lwz r30, -8(r10) /* 80363EBC 00360E1C 7C 08 03 A6 */ mtlr r0 /* 80363EC0 00360E20 7D 41 53 78 */ mr r1, r10 -/* 80363EC4 00360E24 4E 80 00 20 */ blr +/* 80363EC4 00360E24 4E 80 00 20 */ blr .global FindClaimedStreamIdx__17CDSPStreamManagerFi FindClaimedStreamIdx__17CDSPStreamManagerFi: @@ -761,7 +761,7 @@ FindClaimedStreamIdx__17CDSPStreamManagerFi: /* 80363EE0 00360E40 7C 03 00 00 */ cmpw r3, r0 /* 80363EE4 00360E44 40 82 00 0C */ bne lbl_80363EF0 /* 80363EE8 00360E48 38 60 00 00 */ li r3, 0 -/* 80363EEC 00360E4C 4E 80 00 20 */ blr +/* 80363EEC 00360E4C 4E 80 00 20 */ blr lbl_80363EF0: /* 80363EF0 00360E50 38 84 00 C0 */ addi r4, r4, 0xc0 /* 80363EF4 00360E54 88 04 00 70 */ lbz r0, 0x70(r4) @@ -771,7 +771,7 @@ lbl_80363EF0: /* 80363F04 00360E64 7C 03 00 00 */ cmpw r3, r0 /* 80363F08 00360E68 40 82 00 0C */ bne lbl_80363F14 /* 80363F0C 00360E6C 38 60 00 01 */ li r3, 1 -/* 80363F10 00360E70 4E 80 00 20 */ blr +/* 80363F10 00360E70 4E 80 00 20 */ blr lbl_80363F14: /* 80363F14 00360E74 88 04 01 30 */ lbz r0, 0x130(r4) /* 80363F18 00360E78 38 84 00 C0 */ addi r4, r4, 0xc0 @@ -781,7 +781,7 @@ lbl_80363F14: /* 80363F28 00360E88 7C 03 00 00 */ cmpw r3, r0 /* 80363F2C 00360E8C 40 82 00 0C */ bne lbl_80363F38 /* 80363F30 00360E90 38 60 00 02 */ li r3, 2 -/* 80363F34 00360E94 4E 80 00 20 */ blr +/* 80363F34 00360E94 4E 80 00 20 */ blr lbl_80363F38: /* 80363F38 00360E98 88 04 01 30 */ lbz r0, 0x130(r4) /* 80363F3C 00360E9C 38 84 00 C0 */ addi r4, r4, 0xc0 @@ -791,10 +791,10 @@ lbl_80363F38: /* 80363F4C 00360EAC 7C 03 00 00 */ cmpw r3, r0 /* 80363F50 00360EB0 40 82 00 0C */ bne lbl_80363F5C /* 80363F54 00360EB4 38 60 00 03 */ li r3, 3 -/* 80363F58 00360EB8 4E 80 00 20 */ blr +/* 80363F58 00360EB8 4E 80 00 20 */ blr lbl_80363F5C: /* 80363F5C 00360EBC 38 60 FF FF */ li r3, -1 -/* 80363F60 00360EC0 4E 80 00 20 */ blr +/* 80363F60 00360EC0 4E 80 00 20 */ blr .global GetFreeHandleId__17CDSPStreamManagerFv GetFreeHandleId__17CDSPStreamManagerFv: @@ -866,7 +866,7 @@ lbl_80364038: /* 80364050 00360FB0 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80364054 00360FB4 7C 08 03 A6 */ mtlr r0 /* 80364058 00360FB8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8036405C 00360FBC 4E 80 00 20 */ blr +/* 8036405C 00360FBC 4E 80 00 20 */ blr .global FindUnclaimedStereoPair__17CDSPStreamManagerFRiRi FindUnclaimedStereoPair__17CDSPStreamManagerFRiRi: @@ -933,7 +933,7 @@ lbl_80364134: /* 8036413C 0036109C 83 C1 00 08 */ lwz r30, 8(r1) /* 80364140 003610A0 7C 08 03 A6 */ mtlr r0 /* 80364144 003610A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80364148 003610A8 4E 80 00 20 */ blr +/* 80364148 003610A8 4E 80 00 20 */ blr .global FindUnclaimedStreamIdx__17CDSPStreamManagerFv FindUnclaimedStreamIdx__17CDSPStreamManagerFv: @@ -943,30 +943,30 @@ FindUnclaimedStreamIdx__17CDSPStreamManagerFv: /* 80364158 003610B8 54 00 CF FF */ rlwinm. r0, r0, 0x19, 0x1f, 0x1f /* 8036415C 003610BC 41 82 00 0C */ beq lbl_80364168 /* 80364160 003610C0 38 60 00 00 */ li r3, 0 -/* 80364164 003610C4 4E 80 00 20 */ blr +/* 80364164 003610C4 4E 80 00 20 */ blr lbl_80364168: /* 80364168 003610C8 38 63 00 C0 */ addi r3, r3, 0xc0 /* 8036416C 003610CC 88 03 00 70 */ lbz r0, 0x70(r3) /* 80364170 003610D0 54 00 CF FF */ rlwinm. r0, r0, 0x19, 0x1f, 0x1f /* 80364174 003610D4 41 82 00 0C */ beq lbl_80364180 /* 80364178 003610D8 38 60 00 01 */ li r3, 1 -/* 8036417C 003610DC 4E 80 00 20 */ blr +/* 8036417C 003610DC 4E 80 00 20 */ blr lbl_80364180: /* 80364180 003610E0 88 03 01 30 */ lbz r0, 0x130(r3) /* 80364184 003610E4 38 63 00 C0 */ addi r3, r3, 0xc0 /* 80364188 003610E8 54 00 CF FF */ rlwinm. r0, r0, 0x19, 0x1f, 0x1f /* 8036418C 003610EC 41 82 00 0C */ beq lbl_80364198 /* 80364190 003610F0 38 60 00 02 */ li r3, 2 -/* 80364194 003610F4 4E 80 00 20 */ blr +/* 80364194 003610F4 4E 80 00 20 */ blr lbl_80364198: /* 80364198 003610F8 88 03 01 30 */ lbz r0, 0x130(r3) /* 8036419C 003610FC 54 00 CF FF */ rlwinm. r0, r0, 0x19, 0x1f, 0x1f /* 803641A0 00361100 41 82 00 0C */ beq lbl_803641AC /* 803641A4 00361104 38 60 00 03 */ li r3, 3 -/* 803641A8 00361108 4E 80 00 20 */ blr +/* 803641A8 00361108 4E 80 00 20 */ blr lbl_803641AC: /* 803641AC 0036110C 38 60 FF FF */ li r3, -1 -/* 803641B0 00361110 4E 80 00 20 */ blr +/* 803641B0 00361110 4E 80 00 20 */ blr .global StartStreaming__17CDSPStreamManagerFRCQ24rstl6stringcb StartStreaming__17CDSPStreamManagerFRCQ24rstl6stringcb: @@ -1251,7 +1251,7 @@ lbl_803645A0: /* 803645B4 00361514 83 8A FF F0 */ lwz r28, -0x10(r10) /* 803645B8 00361518 7C 08 03 A6 */ mtlr r0 /* 803645BC 0036151C 7D 41 53 78 */ mr r1, r10 -/* 803645C0 00361520 4E 80 00 20 */ blr +/* 803645C0 00361520 4E 80 00 20 */ blr .global Shutdown__17CDSPStreamManagerFv Shutdown__17CDSPStreamManagerFv: @@ -1292,7 +1292,7 @@ lbl_80364624: /* 80364644 003615A4 83 AA FF F4 */ lwz r29, -0xc(r10) /* 80364648 003615A8 7C 08 03 A6 */ mtlr r0 /* 8036464C 003615AC 7D 41 53 78 */ mr r1, r10 -/* 80364650 003615B0 4E 80 00 20 */ blr +/* 80364650 003615B0 4E 80 00 20 */ blr .global Initialize__17CDSPStreamManagerFv Initialize__17CDSPStreamManagerFv: @@ -1333,7 +1333,7 @@ lbl_803646B4: /* 803646D4 00361634 83 AA FF F4 */ lwz r29, -0xc(r10) /* 803646D8 00361638 7C 08 03 A6 */ mtlr r0 /* 803646DC 0036163C 7D 41 53 78 */ mr r1, r10 -/* 803646E0 00361640 4E 80 00 20 */ blr +/* 803646E0 00361640 4E 80 00 20 */ blr .global __as__17CDSPStreamManagerFRC17CDSPStreamManager __as__17CDSPStreamManagerFRC17CDSPStreamManager: @@ -1416,7 +1416,7 @@ lbl_803647FC: /* 80364808 00361768 83 C1 00 08 */ lwz r30, 8(r1) /* 8036480C 0036176C 7C 08 03 A6 */ mtlr r0 /* 80364810 00361770 38 21 00 10 */ addi r1, r1, 0x10 -/* 80364814 00361774 4E 80 00 20 */ blr +/* 80364814 00361774 4E 80 00 20 */ blr .global WaitForReadCompletion__17CDSPStreamManagerFv WaitForReadCompletion__17CDSPStreamManagerFv: @@ -1443,7 +1443,7 @@ lbl_80364840: /* 80364860 003617C0 83 C1 00 08 */ lwz r30, 8(r1) /* 80364864 003617C4 7C 08 03 A6 */ mtlr r0 /* 80364868 003617C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8036486C 003617CC 4E 80 00 20 */ blr +/* 8036486C 003617CC 4E 80 00 20 */ blr .global sub_80364870 sub_80364870: @@ -1451,7 +1451,7 @@ sub_80364870: /* 80364874 003617D4 20 00 7D 00 */ subfic r0, r0, 0x7d00 /* 80364878 003617D8 7C 00 00 34 */ cntlzw r0, r0 /* 8036487C 003617DC 54 03 D9 7E */ srwi r3, r0, 5 -/* 80364880 003617E0 4E 80 00 20 */ blr +/* 80364880 003617E0 4E 80 00 20 */ blr .global StartHeaderRead__17CDSPStreamManagerF11DVDCallback StartHeaderRead__17CDSPStreamManagerF11DVDCallback: @@ -1508,7 +1508,7 @@ lbl_80364934: /* 8036493C 0036189C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80364940 003618A0 7C 08 03 A6 */ mtlr r0 /* 80364944 003618A4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80364948 003618A8 4E 80 00 20 */ blr +/* 80364948 003618A8 4E 80 00 20 */ blr .global __ct__17CDSPStreamManagerFv __ct__17CDSPStreamManagerFv: @@ -1548,7 +1548,7 @@ __ct__17CDSPStreamManagerFv: /* 803649D0 00361930 80 01 00 24 */ lwz r0, 0x24(r1) /* 803649D4 00361934 7C 08 03 A6 */ mtlr r0 /* 803649D8 00361938 38 21 00 20 */ addi r1, r1, 0x20 -/* 803649DC 0036193C 4E 80 00 20 */ blr +/* 803649DC 0036193C 4E 80 00 20 */ blr .global __ct__17CDSPStreamManagerFRCQ24rstl6stringicc __ct__17CDSPStreamManagerFRCQ24rstl6stringicc: @@ -1597,7 +1597,7 @@ lbl_80364A7C: /* 80364A80 003619E0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80364A84 003619E4 7C 08 03 A6 */ mtlr r0 /* 80364A88 003619E8 38 21 00 20 */ addi r1, r1, 0x20 -/* 80364A8C 003619EC 4E 80 00 20 */ blr +/* 80364A8C 003619EC 4E 80 00 20 */ blr .global __sinit_CDSPStreamManager_cpp __sinit_CDSPStreamManager_cpp: diff --git a/asm/Kyoto/Audio/CMidiManager.s b/asm/Kyoto/Audio/CMidiManager.s index c4d51c68..9335d1dd 100644 --- a/asm/Kyoto/Audio/CMidiManager.s +++ b/asm/Kyoto/Audio/CMidiManager.s @@ -39,7 +39,7 @@ lbl_80358BA8: /* 80358BB8 00355B18 83 C1 00 08 */ lwz r30, 8(r1) /* 80358BBC 00355B1C 7C 08 03 A6 */ mtlr r0 /* 80358BC0 00355B20 38 21 00 10 */ addi r1, r1, 0x10 -/* 80358BC4 00355B24 4E 80 00 20 */ blr +/* 80358BC4 00355B24 4E 80 00 20 */ blr .global "__ct__16CFactoryFnReturnFPQ212CMidiManager9CMidiData" "__ct__16CFactoryFnReturnFPQ212CMidiManager9CMidiData": @@ -75,7 +75,7 @@ lbl_80358BA8: /* 80358C3C 00355B9C 38 80 00 01 */ li r4, 1 /* 80358C40 00355BA0 81 8C 00 08 */ lwz r12, 8(r12) /* 80358C44 00355BA4 7D 89 03 A6 */ mtctr r12 -/* 80358C48 00355BA8 4E 80 04 21 */ bctrl +/* 80358C48 00355BA8 4E 80 04 21 */ bctrl lbl_80358C4C: /* 80358C4C 00355BAC 88 01 00 10 */ lbz r0, 0x10(r1) /* 80358C50 00355BB0 28 00 00 00 */ cmplwi r0, 0 @@ -100,7 +100,7 @@ lbl_80358C88: /* 80358C94 00355BF4 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80358C98 00355BF8 7C 08 03 A6 */ mtlr r0 /* 80358C9C 00355BFC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80358CA0 00355C00 4E 80 00 20 */ blr +/* 80358CA0 00355C00 4E 80 00 20 */ blr .global sub_80358ca4 sub_80358ca4: @@ -153,7 +153,7 @@ lbl_80358D3C: /* 80358D4C 00355CAC 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80358D50 00355CB0 7C 08 03 A6 */ mtlr r0 /* 80358D54 00355CB4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80358D58 00355CB8 4E 80 00 20 */ blr +/* 80358D58 00355CB8 4E 80 00 20 */ blr .global "GetIObjObjectFor__34TTokenFRCQ24rstl36auto_ptr" "GetIObjObjectFor__34TTokenFRCQ24rstl36auto_ptr": @@ -167,7 +167,7 @@ lbl_80358D3C: /* 80358D78 00355CD8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80358D7C 00355CDC 7C 08 03 A6 */ mtlr r0 /* 80358D80 00355CE0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80358D84 00355CE4 4E 80 00 20 */ blr +/* 80358D84 00355CE4 4E 80 00 20 */ blr .global "GetNewDerivedObject__52TObjOwnerDerivedFromIObjFRCQ24rstl36auto_ptr" "GetNewDerivedObject__52TObjOwnerDerivedFromIObjFRCQ24rstl36auto_ptr": @@ -210,7 +210,7 @@ lbl_80358DF8: /* 80358E14 00355D74 80 01 00 14 */ lwz r0, 0x14(r1) /* 80358E18 00355D78 7C 08 03 A6 */ mtlr r0 /* 80358E1C 00355D7C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80358E20 00355D80 4E 80 00 20 */ blr +/* 80358E20 00355D80 4E 80 00 20 */ blr .global __ct__Q212CMidiManager9CMidiDataFR12CInputStream __ct__Q212CMidiManager9CMidiDataFR12CInputStream: @@ -286,7 +286,7 @@ lbl_80358F0C: /* 80358F2C 00355E8C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80358F30 00355E90 7C 08 03 A6 */ mtlr r0 /* 80358F34 00355E94 38 21 00 20 */ addi r1, r1, 0x20 -/* 80358F38 00355E98 4E 80 00 20 */ blr +/* 80358F38 00355E98 4E 80 00 20 */ blr .global LocateHandle__12CMidiManagerFv LocateHandle__12CMidiManagerFv: @@ -352,7 +352,7 @@ lbl_8035900C: /* 80359010 00355F70 80 01 00 34 */ lwz r0, 0x34(r1) /* 80359014 00355F74 7C 08 03 A6 */ mtlr r0 /* 80359018 00355F78 38 21 00 30 */ addi r1, r1, 0x30 -/* 8035901C 00355F7C 4E 80 00 20 */ blr +/* 8035901C 00355F7C 4E 80 00 20 */ blr .global StopAll__12CMidiManagerFv StopAll__12CMidiManagerFv: @@ -389,7 +389,7 @@ lbl_80359074: /* 8035908C 00355FEC 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80359090 00355FF0 7C 08 03 A6 */ mtlr r0 /* 80359094 00355FF4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80359098 00355FF8 4E 80 00 20 */ blr +/* 80359098 00355FF8 4E 80 00 20 */ blr .global Stop__12CMidiManagerFRC10CSfxHandleUs Stop__12CMidiManagerFRC10CSfxHandleUs: @@ -443,7 +443,7 @@ lbl_80359140: /* 8035914C 003560AC 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80359150 003560B0 7C 08 03 A6 */ mtlr r0 /* 80359154 003560B4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80359158 003560B8 4E 80 00 20 */ blr +/* 80359158 003560B8 4E 80 00 20 */ blr .global Play__12CMidiManagerFRCQ212CMidiManager9CMidiDataUsbs Play__12CMidiManagerFRCQ212CMidiManager9CMidiDataUsbs: @@ -565,48 +565,48 @@ lbl_803592FC: /* 80359300 00356260 80 01 00 44 */ lwz r0, 0x44(r1) /* 80359304 00356264 7C 08 03 A6 */ mtlr r0 /* 80359308 00356268 38 21 00 40 */ addi r1, r1, 0x40 -/* 8035930C 0035626C 4E 80 00 20 */ blr +/* 8035930C 0035626C 4E 80 00 20 */ blr .global SetSongId__Q212CMidiManager12CMidiWrapperFs SetSongId__Q212CMidiManager12CMidiWrapperFs: /* 80359310 00356270 B0 83 00 08 */ sth r4, 8(r3) -/* 80359314 00356274 4E 80 00 20 */ blr +/* 80359314 00356274 4E 80 00 20 */ blr .global SetMidiHandle__Q212CMidiManager12CMidiWrapperFRC10CSfxHandle SetMidiHandle__Q212CMidiManager12CMidiWrapperFRC10CSfxHandle: /* 80359318 00356278 80 04 00 00 */ lwz r0, 0(r4) /* 8035931C 0035627C 90 03 00 04 */ stw r0, 4(r3) -/* 80359320 00356280 4E 80 00 20 */ blr +/* 80359320 00356280 4E 80 00 20 */ blr .global SetAudioSysHandle__Q212CMidiManager12CMidiWrapperFUl SetAudioSysHandle__Q212CMidiManager12CMidiWrapperFUl: /* 80359324 00356284 90 83 00 00 */ stw r4, 0(r3) -/* 80359328 00356288 4E 80 00 20 */ blr +/* 80359328 00356288 4E 80 00 20 */ blr .global SetAvailable__Q212CMidiManager12CMidiWrapperFb SetAvailable__Q212CMidiManager12CMidiWrapperFb: /* 8035932C 0035628C 98 83 00 0A */ stb r4, 0xa(r3) -/* 80359330 00356290 4E 80 00 20 */ blr +/* 80359330 00356290 4E 80 00 20 */ blr .global GetSongId__Q212CMidiManager12CMidiWrapperCFv GetSongId__Q212CMidiManager12CMidiWrapperCFv: /* 80359334 00356294 A8 63 00 08 */ lha r3, 8(r3) -/* 80359338 00356298 4E 80 00 20 */ blr +/* 80359338 00356298 4E 80 00 20 */ blr .global IsAvailable__Q212CMidiManager12CMidiWrapperCFv IsAvailable__Q212CMidiManager12CMidiWrapperCFv: /* 8035933C 0035629C 88 63 00 0A */ lbz r3, 0xa(r3) -/* 80359340 003562A0 4E 80 00 20 */ blr +/* 80359340 003562A0 4E 80 00 20 */ blr .global GetAudioSysHandle__Q212CMidiManager12CMidiWrapperCFv GetAudioSysHandle__Q212CMidiManager12CMidiWrapperCFv: /* 80359344 003562A4 80 63 00 00 */ lwz r3, 0(r3) -/* 80359348 003562A8 4E 80 00 20 */ blr +/* 80359348 003562A8 4E 80 00 20 */ blr .global GetManagerHandle__Q212CMidiManager12CMidiWrapperCFv GetManagerHandle__Q212CMidiManager12CMidiWrapperCFv: /* 8035934C 003562AC 38 63 00 04 */ addi r3, r3, 4 -/* 80359350 003562B0 4E 80 00 20 */ blr +/* 80359350 003562B0 4E 80 00 20 */ blr .global __ct__Q212CMidiManager12CMidiWrapperFv __ct__Q212CMidiManager12CMidiWrapperFv: @@ -615,7 +615,7 @@ __ct__Q212CMidiManager12CMidiWrapperFv: /* 8035935C 003562BC 90 83 00 00 */ stw r4, 0(r3) /* 80359360 003562C0 90 83 00 04 */ stw r4, 4(r3) /* 80359364 003562C4 98 03 00 0A */ stb r0, 0xa(r3) -/* 80359368 003562C8 4E 80 00 20 */ blr +/* 80359368 003562C8 4E 80 00 20 */ blr .global __sinit_CMidiManager_cpp __sinit_CMidiManager_cpp: @@ -633,7 +633,7 @@ __sinit_CMidiManager_cpp: /* 80359398 003562F8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8035939C 003562FC 7C 08 03 A6 */ mtlr r0 /* 803593A0 00356300 38 21 00 10 */ addi r1, r1, 0x10 -/* 803593A4 00356304 4E 80 00 20 */ blr +/* 803593A4 00356304 4E 80 00 20 */ blr .global "__dt__Q24rstl49reserved_vectorFv" "__dt__Q24rstl49reserved_vectorFv": diff --git a/asm/Kyoto/Audio/CSfxManager.s b/asm/Kyoto/Audio/CSfxManager.s index fe707067..3f465770 100644 --- a/asm/Kyoto/Audio/CSfxManager.s +++ b/asm/Kyoto/Audio/CSfxManager.s @@ -183,7 +183,7 @@ lbl_802E78CC: /* 802E78D4 002E4834 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802E78D8 002E4838 7C 08 03 A6 */ mtlr r0 /* 802E78DC 002E483C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E78E0 002E4840 4E 80 00 20 */ blr +/* 802E78E0 002E4840 4E 80 00 20 */ blr .global FAudioTranslationTableFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer FAudioTranslationTableFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer: @@ -250,7 +250,7 @@ lbl_802E79AC: /* 802E79BC 002E491C 80 01 00 24 */ lwz r0, 0x24(r1) /* 802E79C0 002E4920 7C 08 03 A6 */ mtlr r0 /* 802E79C4 002E4924 38 21 00 20 */ addi r1, r1, 0x20 -/* 802E79C8 002E4928 4E 80 00 20 */ blr +/* 802E79C8 002E4928 4E 80 00 20 */ blr .global sub_802e79cc sub_802e79cc: @@ -286,7 +286,7 @@ sub_802e79cc: /* 802E7A40 002E49A0 38 80 00 01 */ li r4, 1 /* 802E7A44 002E49A4 81 8C 00 08 */ lwz r12, 8(r12) /* 802E7A48 002E49A8 7D 89 03 A6 */ mtctr r12 -/* 802E7A4C 002E49AC 4E 80 04 21 */ bctrl +/* 802E7A4C 002E49AC 4E 80 04 21 */ bctrl lbl_802E7A50: /* 802E7A50 002E49B0 88 01 00 20 */ lbz r0, 0x20(r1) /* 802E7A54 002E49B4 28 00 00 00 */ cmplwi r0, 0 @@ -322,7 +322,7 @@ lbl_802E7AB0: /* 802E7ABC 002E4A1C 83 C1 00 28 */ lwz r30, 0x28(r1) /* 802E7AC0 002E4A20 7C 08 03 A6 */ mtlr r0 /* 802E7AC4 002E4A24 38 21 00 30 */ addi r1, r1, 0x30 -/* 802E7AC8 002E4A28 4E 80 00 20 */ blr +/* 802E7AC8 002E4A28 4E 80 00 20 */ blr .global "__dt__71TObjOwnerDerivedFromIObj>Fv" "__dt__71TObjOwnerDerivedFromIObj>Fv": @@ -386,7 +386,7 @@ lbl_802E7B88: /* 802E7B98 002E4AF8 83 A1 00 24 */ lwz r29, 0x24(r1) /* 802E7B9C 002E4AFC 7C 08 03 A6 */ mtlr r0 /* 802E7BA0 002E4B00 38 21 00 30 */ addi r1, r1, 0x30 -/* 802E7BA4 002E4B04 4E 80 00 20 */ blr +/* 802E7BA4 002E4B04 4E 80 00 20 */ blr .global "GetIObjObjectFor__53TToken>FRCQ24rstl55auto_ptr>" "GetIObjObjectFor__53TToken>FRCQ24rstl55auto_ptr>": @@ -400,7 +400,7 @@ lbl_802E7B88: /* 802E7BC4 002E4B24 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802E7BC8 002E4B28 7C 08 03 A6 */ mtlr r0 /* 802E7BCC 002E4B2C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E7BD0 002E4B30 4E 80 00 20 */ blr +/* 802E7BD0 002E4B30 4E 80 00 20 */ blr .global "GetNewDerivedObject__71TObjOwnerDerivedFromIObj>FRCQ24rstl55auto_ptr>" "GetNewDerivedObject__71TObjOwnerDerivedFromIObj>FRCQ24rstl55auto_ptr>": @@ -443,7 +443,7 @@ lbl_802E7C44: /* 802E7C60 002E4BC0 80 01 00 14 */ lwz r0, 0x14(r1) /* 802E7C64 002E4BC4 7C 08 03 A6 */ mtlr r0 /* 802E7C68 002E4BC8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E7C6C 002E4BCC 4E 80 00 20 */ blr +/* 802E7C6C 002E4BCC 4E 80 00 20 */ blr .global DisableAuxCallback__11CSfxManagerFv DisableAuxCallback__11CSfxManagerFv: @@ -498,7 +498,7 @@ lbl_802E7D10: /* 802E7D18 002E4C78 80 01 00 14 */ lwz r0, 0x14(r1) /* 802E7D1C 002E4C7C 7C 08 03 A6 */ mtlr r0 /* 802E7D20 002E4C80 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E7D24 002E4C84 4E 80 00 20 */ blr +/* 802E7D24 002E4C84 4E 80 00 20 */ blr .global EnableAuxCallback__11CSfxManagerFv EnableAuxCallback__11CSfxManagerFv: @@ -719,7 +719,7 @@ lbl_802E8050: /* 802E8054 002E4FB4 80 01 00 54 */ lwz r0, 0x54(r1) /* 802E8058 002E4FB8 7C 08 03 A6 */ mtlr r0 /* 802E805C 002E4FBC 38 21 00 50 */ addi r1, r1, 0x50 -/* 802E8060 002E4FC0 4E 80 00 20 */ blr +/* 802E8060 002E4FC0 4E 80 00 20 */ blr .global PrepareDelayCallback__11CSfxManagerFRC13SND_AUX_DELAY PrepareDelayCallback__11CSfxManagerFRC13SND_AUX_DELAY: @@ -791,7 +791,7 @@ lbl_802E8160: /* 802E8164 002E50C4 80 01 00 54 */ lwz r0, 0x54(r1) /* 802E8168 002E50C8 7C 08 03 A6 */ mtlr r0 /* 802E816C 002E50CC 38 21 00 50 */ addi r1, r1, 0x50 -/* 802E8170 002E50D0 4E 80 00 20 */ blr +/* 802E8170 002E50D0 4E 80 00 20 */ blr .global PrepareReverbStdCallback__11CSfxManagerFRC17SND_AUX_REVERBSTD PrepareReverbStdCallback__11CSfxManagerFRC17SND_AUX_REVERBSTD: @@ -841,7 +841,7 @@ lbl_802E8214: /* 802E8218 002E5178 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802E821C 002E517C 7C 08 03 A6 */ mtlr r0 /* 802E8220 002E5180 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E8224 002E5184 4E 80 00 20 */ blr +/* 802E8224 002E5184 4E 80 00 20 */ blr .global PrepareChorusCallback__11CSfxManagerFRC14SND_AUX_CHORUS PrepareChorusCallback__11CSfxManagerFRC14SND_AUX_CHORUS: @@ -883,7 +883,7 @@ lbl_802E82A8: /* 802E82AC 002E520C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802E82B0 002E5210 7C 08 03 A6 */ mtlr r0 /* 802E82B4 002E5214 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E82B8 002E5218 4E 80 00 20 */ blr +/* 802E82B8 002E5218 4E 80 00 20 */ blr .global PrepareReverbHiCallback__11CSfxManagerFRC16SND_AUX_REVERBHI PrepareReverbHiCallback__11CSfxManagerFRC16SND_AUX_REVERBHI: @@ -935,7 +935,7 @@ lbl_802E8364: /* 802E8368 002E52C8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802E836C 002E52CC 7C 08 03 A6 */ mtlr r0 /* 802E8370 002E52D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E8374 002E52D4 4E 80 00 20 */ blr +/* 802E8374 002E52D4 4E 80 00 20 */ blr .global ApplyReverb__11CSfxManagerFv ApplyReverb__11CSfxManagerFv: @@ -964,7 +964,7 @@ lbl_802E83BC: /* 802E83CC 002E532C 7F E4 07 74 */ extsb r4, r31 /* 802E83D0 002E5330 81 8C 00 60 */ lwz r12, 0x60(r12) /* 802E83D4 002E5334 7D 89 03 A6 */ mtctr r12 -/* 802E83D8 002E5338 4E 80 04 21 */ bctrl +/* 802E83D8 002E5338 4E 80 04 21 */ bctrl lbl_802E83DC: /* 802E83DC 002E533C 3B DE 00 04 */ addi r30, r30, 4 /* 802E83E0 002E5340 3B 9C 00 01 */ addi r28, r28, 1 @@ -979,7 +979,7 @@ lbl_802E83E4: /* 802E8400 002E5360 83 81 00 10 */ lwz r28, 0x10(r1) /* 802E8404 002E5364 7C 08 03 A6 */ mtlr r0 /* 802E8408 002E5368 38 21 00 20 */ addi r1, r1, 0x20 -/* 802E840C 002E536C 4E 80 00 20 */ blr +/* 802E840C 002E536C 4E 80 00 20 */ blr .global GetReverbAmount__11CSfxManagerFv GetReverbAmount__11CSfxManagerFv: @@ -990,12 +990,12 @@ GetReverbAmount__11CSfxManagerFv: /* 802E8420 002E5380 F0 41 D0 08 */ psq_st f2, 8(r1), 1, qr5 /* 802E8424 002E5384 A8 61 00 08 */ lha r3, 8(r1) /* 802E8428 002E5388 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E842C 002E538C 4E 80 00 20 */ blr +/* 802E842C 002E538C 4E 80 00 20 */ blr .global IsAuxProcessingEnabled__11CSfxManagerFv IsAuxProcessingEnabled__11CSfxManagerFv: /* 802E8430 002E5390 88 6D A7 18 */ lbz r3, lbl_805A92D8@sda21(r13) -/* 802E8434 002E5394 4E 80 00 20 */ blr +/* 802E8434 002E5394 4E 80 00 20 */ blr .global DisableAuxProcessing__11CSfxManagerFv DisableAuxProcessing__11CSfxManagerFv: @@ -1003,7 +1003,7 @@ DisableAuxProcessing__11CSfxManagerFv: /* 802E843C 002E539C 38 00 00 00 */ li r0, 0 /* 802E8440 002E53A0 90 6D 9B B4 */ stw r3, lbl_805A8774@sda21(r13) /* 802E8444 002E53A4 98 0D A7 18 */ stb r0, lbl_805A92D8@sda21(r13) -/* 802E8448 002E53A8 4E 80 00 20 */ blr +/* 802E8448 002E53A8 4E 80 00 20 */ blr .global AllocateCSfxWrapper__11CSfxManagerFRCQ211CSfxManager11CSfxWrapper AllocateCSfxWrapper__11CSfxManagerFRCQ211CSfxManager11CSfxWrapper: @@ -1110,7 +1110,7 @@ lbl_802E85BC: /* 802E85C4 002E5524 80 01 00 24 */ lwz r0, 0x24(r1) /* 802E85C8 002E5528 7C 08 03 A6 */ mtlr r0 /* 802E85CC 002E552C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802E85D0 002E5530 4E 80 00 20 */ blr +/* 802E85D0 002E5530 4E 80 00 20 */ blr .global sub_802e85d4 sub_802e85d4: @@ -1210,7 +1210,7 @@ lbl_802E872C: /* 802E8734 002E5694 80 01 00 24 */ lwz r0, 0x24(r1) /* 802E8738 002E5698 7C 08 03 A6 */ mtlr r0 /* 802E873C 002E569C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802E8740 002E56A0 4E 80 00 20 */ blr +/* 802E8740 002E56A0 4E 80 00 20 */ blr .global sub_802e8744 sub_802e8744: @@ -1231,7 +1231,7 @@ sub_802e8744: /* 802E877C 002E56DC 80 01 00 14 */ lwz r0, 0x14(r1) /* 802E8780 002E56E0 7C 08 03 A6 */ mtlr r0 /* 802E8784 002E56E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E8788 002E56E8 4E 80 00 20 */ blr +/* 802E8788 002E56E8 4E 80 00 20 */ blr .global sub_802e878c sub_802e878c: @@ -1245,7 +1245,7 @@ lbl_802E87A4: /* 802E87A4 002E5704 80 01 00 14 */ lwz r0, 0x14(r1) /* 802E87A8 002E5708 7C 08 03 A6 */ mtlr r0 /* 802E87AC 002E570C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E87B0 002E5710 4E 80 00 20 */ blr +/* 802E87B0 002E5710 4E 80 00 20 */ blr .global sub_802e87b4 sub_802e87b4: @@ -1307,7 +1307,7 @@ sub_802e87b4: /* 802E8890 002E57F0 98 03 00 54 */ stb r0, 0x54(r3) /* 802E8894 002E57F4 88 04 00 55 */ lbz r0, 0x55(r4) /* 802E8898 002E57F8 98 03 00 55 */ stb r0, 0x55(r3) -/* 802E889C 002E57FC 4E 80 00 20 */ blr +/* 802E889C 002E57FC 4E 80 00 20 */ blr .global "SetActiveAreas__11CSfxManagerFRCQ24rstl21reserved_vector" "SetActiveAreas__11CSfxManagerFRCQ24rstl21reserved_vector": @@ -1334,7 +1334,7 @@ lbl_802E88E0: /* 802E88EC 002E584C 81 83 00 00 */ lwz r12, 0(r3) /* 802E88F0 002E5850 81 8C 00 38 */ lwz r12, 0x38(r12) /* 802E88F4 002E5854 7D 89 03 A6 */ mtctr r12 -/* 802E88F8 002E5858 4E 80 04 21 */ bctrl +/* 802E88F8 002E5858 4E 80 04 21 */ bctrl /* 802E88FC 002E585C 2C 03 FF FF */ cmpwi r3, -1 /* 802E8900 002E5860 40 82 00 20 */ bne lbl_802E8920 /* 802E8904 002E5864 80 7F 00 00 */ lwz r3, 0(r31) @@ -1342,7 +1342,7 @@ lbl_802E88E0: /* 802E890C 002E586C 81 83 00 00 */ lwz r12, 0(r3) /* 802E8910 002E5870 81 8C 00 18 */ lwz r12, 0x18(r12) /* 802E8914 002E5874 7D 89 03 A6 */ mtctr r12 -/* 802E8918 002E5878 4E 80 04 21 */ bctrl +/* 802E8918 002E5878 4E 80 04 21 */ bctrl /* 802E891C 002E587C 48 00 00 5C */ b lbl_802E8978 lbl_802E8920: /* 802E8920 002E5880 80 1C 00 00 */ lwz r0, 0(r28) @@ -1369,7 +1369,7 @@ lbl_802E8950: /* 802E8968 002E58C8 81 83 00 00 */ lwz r12, 0(r3) /* 802E896C 002E58CC 81 8C 00 18 */ lwz r12, 0x18(r12) /* 802E8970 002E58D0 7D 89 03 A6 */ mtctr r12 -/* 802E8974 002E58D4 4E 80 04 21 */ bctrl +/* 802E8974 002E58D4 4E 80 04 21 */ bctrl lbl_802E8978: /* 802E8978 002E58D8 3B FF 00 04 */ addi r31, r31, 4 /* 802E897C 002E58DC 3B BD 00 01 */ addi r29, r29, 1 @@ -1385,7 +1385,7 @@ lbl_802E8980: /* 802E89A0 002E5900 83 81 00 10 */ lwz r28, 0x10(r1) /* 802E89A4 002E5904 7C 08 03 A6 */ mtlr r0 /* 802E89A8 002E5908 38 21 00 20 */ addi r1, r1, 0x20 -/* 802E89AC 002E590C 4E 80 00 20 */ blr +/* 802E89AC 002E590C 4E 80 00 20 */ blr .global TranslateSFXID__11CSfxManagerFUs TranslateSFXID__11CSfxManagerFUs: @@ -1399,7 +1399,7 @@ TranslateSFXID__11CSfxManagerFUs: lbl_802E89CC: /* 802E89CC 002E592C 3C 60 00 01 */ lis r3, 0x0000FFFF@ha /* 802E89D0 002E5930 38 63 FF FF */ addi r3, r3, 0x0000FFFF@l -/* 802E89D4 002E5934 4E 80 00 20 */ blr +/* 802E89D4 002E5934 4E 80 00 20 */ blr lbl_802E89D8: /* 802E89D8 002E5938 80 84 00 0C */ lwz r4, 0xc(r4) /* 802E89DC 002E593C 54 60 08 3C */ slwi r0, r3, 1 @@ -1407,9 +1407,9 @@ lbl_802E89D8: /* 802E89E4 002E5944 7C 84 02 AE */ lhax r4, r4, r0 /* 802E89E8 002E5948 38 63 FF FF */ addi r3, r3, 0x0000FFFF@l /* 802E89EC 002E594C 7C 80 07 35 */ extsh. r0, r4 -/* 802E89F0 002E5950 4D 80 00 20 */ bltlr +/* 802E89F0 002E5950 4D 80 00 20 */ bltlr /* 802E89F4 002E5954 54 83 04 3E */ clrlwi r3, r4, 0x10 -/* 802E89F8 002E5958 4E 80 00 20 */ blr +/* 802E89F8 002E5958 4E 80 00 20 */ blr .global LoadTranslationTable__11CSfxManagerFP11CSimplePoolPC10SObjectTag LoadTranslationTable__11CSfxManagerFP11CSimplePoolPC10SObjectTag: @@ -1468,7 +1468,7 @@ lbl_802E8A84: /* 802E8AB8 002E5A18 38 61 00 20 */ addi r3, r1, 0x20 /* 802E8ABC 002E5A1C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802E8AC0 002E5A20 7D 89 03 A6 */ mtctr r12 -/* 802E8AC4 002E5A24 4E 80 04 21 */ bctrl +/* 802E8AC4 002E5A24 4E 80 04 21 */ bctrl /* 802E8AC8 002E5A28 7F E3 FB 78 */ mr r3, r31 /* 802E8ACC 002E5A2C 38 81 00 20 */ addi r4, r1, 0x20 /* 802E8AD0 002E5A30 3B 80 00 01 */ li r28, 1 @@ -1524,7 +1524,7 @@ lbl_802E8B70: /* 802E8B80 002E5AE0 83 81 00 30 */ lwz r28, 0x30(r1) /* 802E8B84 002E5AE4 7C 08 03 A6 */ mtlr r0 /* 802E8B88 002E5AE8 38 21 00 40 */ addi r1, r1, 0x40 -/* 802E8B8C 002E5AEC 4E 80 00 20 */ blr +/* 802E8B8C 002E5AEC 4E 80 00 20 */ blr .global sub_802e8b90 sub_802e8b90: @@ -1554,7 +1554,7 @@ lbl_802E8BD8: /* 802E8BE4 002E5B44 83 C1 00 08 */ lwz r30, 8(r1) /* 802E8BE8 002E5B48 7C 08 03 A6 */ mtlr r0 /* 802E8BEC 002E5B4C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E8BF0 002E5B50 4E 80 00 20 */ blr +/* 802E8BF0 002E5B50 4E 80 00 20 */ blr .global GetRank__11CSfxManagerFPQ211CSfxManager15CBaseSfxWrapper GetRank__11CSfxManagerFPQ211CSfxManager15CBaseSfxWrapper: @@ -1573,7 +1573,7 @@ GetRank__11CSfxManagerFPQ211CSfxManager15CBaseSfxWrapper: /* 802E8C24 002E5B84 81 8C 00 28 */ lwz r12, 0x28(r12) /* 802E8C28 002E5B88 7F E0 22 14 */ add r31, r0, r4 /* 802E8C2C 002E5B8C 7D 89 03 A6 */ mtctr r12 -/* 802E8C30 002E5B90 4E 80 04 21 */ bctrl +/* 802E8C30 002E5B90 4E 80 04 21 */ bctrl /* 802E8C34 002E5B94 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802E8C38 002E5B98 40 82 00 0C */ bne lbl_802E8C44 /* 802E8C3C 002E5B9C 38 60 00 00 */ li r3, 0 @@ -1583,13 +1583,13 @@ lbl_802E8C44: /* 802E8C48 002E5BA8 81 9D 00 00 */ lwz r12, 0(r29) /* 802E8C4C 002E5BAC 81 8C 00 34 */ lwz r12, 0x34(r12) /* 802E8C50 002E5BB0 7D 89 03 A6 */ mtctr r12 -/* 802E8C54 002E5BB4 4E 80 04 21 */ bctrl +/* 802E8C54 002E5BB4 4E 80 04 21 */ bctrl /* 802E8C58 002E5BB8 7C 7E 16 70 */ srawi r30, r3, 2 /* 802E8C5C 002E5BBC 7F A3 EB 78 */ mr r3, r29 /* 802E8C60 002E5BC0 81 9D 00 00 */ lwz r12, 0(r29) /* 802E8C64 002E5BC4 81 8C 00 20 */ lwz r12, 0x20(r12) /* 802E8C68 002E5BC8 7D 89 03 A6 */ mtctr r12 -/* 802E8C6C 002E5BCC 4E 80 04 21 */ bctrl +/* 802E8C6C 002E5BCC 4E 80 04 21 */ bctrl /* 802E8C70 002E5BD0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802E8C74 002E5BD4 41 82 00 08 */ beq lbl_802E8C7C /* 802E8C78 002E5BD8 3B DE 00 01 */ addi r30, r30, 1 @@ -1598,7 +1598,7 @@ lbl_802E8C7C: /* 802E8C80 002E5BE0 81 9D 00 00 */ lwz r12, 0(r29) /* 802E8C84 002E5BE4 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 802E8C88 002E5BE8 7D 89 03 A6 */ mtctr r12 -/* 802E8C8C 002E5BEC 4E 80 04 21 */ bctrl +/* 802E8C8C 002E5BEC 4E 80 04 21 */ bctrl /* 802E8C90 002E5BF0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802E8C94 002E5BF4 41 82 00 08 */ beq lbl_802E8C9C /* 802E8C98 002E5BF8 3B DE FF FE */ addi r30, r30, -2 @@ -1607,14 +1607,14 @@ lbl_802E8C9C: /* 802E8CA0 002E5C00 81 9D 00 00 */ lwz r12, 0(r29) /* 802E8CA4 002E5C04 81 8C 00 48 */ lwz r12, 0x48(r12) /* 802E8CA8 002E5C08 7D 89 03 A6 */ mtctr r12 -/* 802E8CAC 002E5C0C 4E 80 04 21 */ bctrl +/* 802E8CAC 002E5C0C 4E 80 04 21 */ bctrl /* 802E8CB0 002E5C10 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802E8CB4 002E5C14 41 82 00 24 */ beq lbl_802E8CD8 /* 802E8CB8 002E5C18 7F A3 EB 78 */ mr r3, r29 /* 802E8CBC 002E5C1C 81 9D 00 00 */ lwz r12, 0(r29) /* 802E8CC0 002E5C20 81 8C 00 20 */ lwz r12, 0x20(r12) /* 802E8CC4 002E5C24 7D 89 03 A6 */ mtctr r12 -/* 802E8CC8 002E5C28 4E 80 04 21 */ bctrl +/* 802E8CC8 002E5C28 4E 80 04 21 */ bctrl /* 802E8CCC 002E5C2C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802E8CD0 002E5C30 40 82 00 08 */ bne lbl_802E8CD8 /* 802E8CD4 002E5C34 3B DE 00 03 */ addi r30, r30, 3 @@ -1627,7 +1627,7 @@ lbl_802E8CD8: /* 802E8CEC 002E5C4C 81 9D 00 00 */ lwz r12, 0(r29) /* 802E8CF0 002E5C50 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 802E8CF4 002E5C54 7D 89 03 A6 */ mtctr r12 -/* 802E8CF8 002E5C58 4E 80 04 21 */ bctrl +/* 802E8CF8 002E5C58 4E 80 04 21 */ bctrl /* 802E8CFC 002E5C5C 7C 60 07 35 */ extsh. r0, r3 /* 802E8D00 002E5C60 40 82 00 0C */ bne lbl_802E8D0C /* 802E8D04 002E5C64 3B C0 00 00 */ li r30, 0 @@ -1644,7 +1644,7 @@ lbl_802E8D18: /* 802E8D24 002E5C84 83 A1 00 14 */ lwz r29, 0x14(r1) /* 802E8D28 002E5C88 7C 08 03 A6 */ mtlr r0 /* 802E8D2C 002E5C8C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802E8D30 002E5C90 4E 80 00 20 */ blr +/* 802E8D30 002E5C90 4E 80 00 20 */ blr .global IsHandleValid__11CSfxManagerF10CSfxHandle IsHandleValid__11CSfxManagerF10CSfxHandle: @@ -1677,7 +1677,7 @@ lbl_802E8D7C: /* 802E8D94 002E5CF4 38 61 00 08 */ addi r3, r1, 8 /* 802E8D98 002E5CF8 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 802E8D9C 002E5CFC 7D 89 03 A6 */ mtctr r12 -/* 802E8DA0 002E5D00 4E 80 04 21 */ bctrl +/* 802E8DA0 002E5D00 4E 80 04 21 */ bctrl /* 802E8DA4 002E5D04 80 7F 00 00 */ lwz r3, 0(r31) /* 802E8DA8 002E5D08 80 01 00 08 */ lwz r0, 8(r1) /* 802E8DAC 002E5D0C 7C 03 00 40 */ cmplw r3, r0 @@ -1692,7 +1692,7 @@ lbl_802E8DC0: /* 802E8DC4 002E5D24 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802E8DC8 002E5D28 7C 08 03 A6 */ mtlr r0 /* 802E8DCC 002E5D2C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802E8DD0 002E5D30 4E 80 00 20 */ blr +/* 802E8DD0 002E5D30 4E 80 00 20 */ blr .global IsPlaying__11CSfxManagerF10CSfxHandle IsPlaying__11CSfxManagerF10CSfxHandle: @@ -1727,7 +1727,7 @@ lbl_802E8E20: /* 802E8E3C 002E5D9C 81 9F 00 00 */ lwz r12, 0(r31) /* 802E8E40 002E5DA0 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 802E8E44 002E5DA4 7D 89 03 A6 */ mtctr r12 -/* 802E8E48 002E5DA8 4E 80 04 21 */ bctrl +/* 802E8E48 002E5DA8 4E 80 04 21 */ bctrl /* 802E8E4C 002E5DAC 80 7E 00 00 */ lwz r3, 0(r30) /* 802E8E50 002E5DB0 80 01 00 08 */ lwz r0, 8(r1) /* 802E8E54 002E5DB4 7C 03 00 40 */ cmplw r3, r0 @@ -1736,7 +1736,7 @@ lbl_802E8E20: /* 802E8E60 002E5DC0 81 9F 00 00 */ lwz r12, 0(r31) /* 802E8E64 002E5DC4 81 8C 00 20 */ lwz r12, 0x20(r12) /* 802E8E68 002E5DC8 7D 89 03 A6 */ mtctr r12 -/* 802E8E6C 002E5DCC 4E 80 04 21 */ bctrl +/* 802E8E6C 002E5DCC 4E 80 04 21 */ bctrl /* 802E8E70 002E5DD0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802E8E74 002E5DD4 40 82 00 0C */ bne lbl_802E8E80 lbl_802E8E78: @@ -1747,14 +1747,14 @@ lbl_802E8E80: /* 802E8E84 002E5DE4 81 9F 00 00 */ lwz r12, 0(r31) /* 802E8E88 002E5DE8 81 8C 00 20 */ lwz r12, 0x20(r12) /* 802E8E8C 002E5DEC 7D 89 03 A6 */ mtctr r12 -/* 802E8E90 002E5DF0 4E 80 04 21 */ bctrl +/* 802E8E90 002E5DF0 4E 80 04 21 */ bctrl lbl_802E8E94: /* 802E8E94 002E5DF4 80 01 00 24 */ lwz r0, 0x24(r1) /* 802E8E98 002E5DF8 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802E8E9C 002E5DFC 83 C1 00 18 */ lwz r30, 0x18(r1) /* 802E8EA0 002E5E00 7C 08 03 A6 */ mtlr r0 /* 802E8EA4 002E5E04 38 21 00 20 */ addi r1, r1, 0x20 -/* 802E8EA8 002E5E08 4E 80 00 20 */ blr +/* 802E8EA8 002E5E08 4E 80 00 20 */ blr .global PitchBend__11CSfxManagerF10CSfxHandlei PitchBend__11CSfxManagerF10CSfxHandlei: @@ -1782,7 +1782,7 @@ PitchBend__11CSfxManagerF10CSfxHandlei: /* 802E8F00 002E5E60 81 9F 00 00 */ lwz r12, 0(r31) /* 802E8F04 002E5E64 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 802E8F08 002E5E68 7D 89 03 A6 */ mtctr r12 -/* 802E8F0C 002E5E6C 4E 80 04 21 */ bctrl +/* 802E8F0C 002E5E6C 4E 80 04 21 */ bctrl /* 802E8F10 002E5E70 80 7D 00 00 */ lwz r3, 0(r29) /* 802E8F14 002E5E74 80 01 00 08 */ lwz r0, 8(r1) /* 802E8F18 002E5E78 7C 03 00 40 */ cmplw r3, r0 @@ -1793,7 +1793,7 @@ lbl_802E8F24: /* 802E8F28 002E5E88 81 9F 00 00 */ lwz r12, 0(r31) /* 802E8F2C 002E5E8C 81 8C 00 20 */ lwz r12, 0x20(r12) /* 802E8F30 002E5E90 7D 89 03 A6 */ mtctr r12 -/* 802E8F34 002E5E94 4E 80 04 21 */ bctrl +/* 802E8F34 002E5E94 4E 80 04 21 */ bctrl /* 802E8F38 002E5E98 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802E8F3C 002E5E9C 40 82 00 0C */ bne lbl_802E8F48 /* 802E8F40 002E5EA0 C0 22 C6 04 */ lfs f1, lbl_805AE324@sda21(r2) @@ -1803,7 +1803,7 @@ lbl_802E8F48: /* 802E8F4C 002E5EAC 81 9F 00 00 */ lwz r12, 0(r31) /* 802E8F50 002E5EB0 81 8C 00 20 */ lwz r12, 0x20(r12) /* 802E8F54 002E5EB4 7D 89 03 A6 */ mtctr r12 -/* 802E8F58 002E5EB8 4E 80 04 21 */ bctrl +/* 802E8F58 002E5EB8 4E 80 04 21 */ bctrl /* 802E8F5C 002E5EBC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802E8F60 002E5EC0 41 82 00 28 */ beq lbl_802E8F88 /* 802E8F64 002E5EC4 38 00 00 01 */ li r0, 1 @@ -1812,7 +1812,7 @@ lbl_802E8F48: /* 802E8F70 002E5ED0 81 9F 00 00 */ lwz r12, 0(r31) /* 802E8F74 002E5ED4 81 8C 00 50 */ lwz r12, 0x50(r12) /* 802E8F78 002E5ED8 7D 89 03 A6 */ mtctr r12 -/* 802E8F7C 002E5EDC 4E 80 04 21 */ bctrl +/* 802E8F7C 002E5EDC 4E 80 04 21 */ bctrl /* 802E8F80 002E5EE0 57 C4 04 3E */ clrlwi r4, r30, 0x10 /* 802E8F84 002E5EE4 48 06 25 BD */ bl SfxPitchBend__9CAudioSysFUlUs lbl_802E8F88: @@ -1822,7 +1822,7 @@ lbl_802E8F88: /* 802E8F94 002E5EF4 83 A1 00 14 */ lwz r29, 0x14(r1) /* 802E8F98 002E5EF8 7C 08 03 A6 */ mtlr r0 /* 802E8F9C 002E5EFC 38 21 00 20 */ addi r1, r1, 0x20 -/* 802E8FA0 002E5F00 4E 80 00 20 */ blr +/* 802E8FA0 002E5F00 4E 80 00 20 */ blr .global Update__11CSfxManagerFf Update__11CSfxManagerFf: @@ -1852,7 +1852,7 @@ lbl_802E8FF0: /* 802E8FFC 002E5F5C 81 83 00 00 */ lwz r12, 0(r3) /* 802E9000 002E5F60 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 802E9004 002E5F64 7D 89 03 A6 */ mtctr r12 -/* 802E9008 002E5F68 4E 80 04 21 */ bctrl +/* 802E9008 002E5F68 4E 80 04 21 */ bctrl /* 802E900C 002E5F6C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802E9010 002E5F70 40 82 00 44 */ bne lbl_802E9054 /* 802E9014 002E5F74 80 7A 00 00 */ lwz r3, 0(r26) @@ -1868,7 +1868,7 @@ lbl_802E8FF0: /* 802E903C 002E5F9C 81 83 00 00 */ lwz r12, 0(r3) /* 802E9040 002E5FA0 81 8C 00 44 */ lwz r12, 0x44(r12) /* 802E9044 002E5FA4 7D 89 03 A6 */ mtctr r12 -/* 802E9048 002E5FA8 4E 80 04 21 */ bctrl +/* 802E9048 002E5FA8 4E 80 04 21 */ bctrl /* 802E904C 002E5FAC 38 00 00 01 */ li r0, 1 /* 802E9050 002E5FB0 98 0D A7 04 */ stb r0, lbl_805A92C4@sda21(r13) lbl_802E9054: @@ -1899,7 +1899,7 @@ lbl_802E9088: /* 802E90AC 002E600C 81 83 00 00 */ lwz r12, 0(r3) /* 802E90B0 002E6010 81 8C 00 14 */ lwz r12, 0x14(r12) /* 802E90B4 002E6014 7D 89 03 A6 */ mtctr r12 -/* 802E90B8 002E6018 4E 80 04 21 */ bctrl +/* 802E90B8 002E6018 4E 80 04 21 */ bctrl lbl_802E90BC: /* 802E90BC 002E601C 3B DE 00 04 */ addi r30, r30, 4 /* 802E90C0 002E6020 3A F7 00 01 */ addi r23, r23, 1 @@ -1926,13 +1926,13 @@ lbl_802E90F4: /* 802E9108 002E6068 81 83 00 00 */ lwz r12, 0(r3) /* 802E910C 002E606C 81 8C 00 30 */ lwz r12, 0x30(r12) /* 802E9110 002E6070 7D 89 03 A6 */ mtctr r12 -/* 802E9114 002E6074 4E 80 04 21 */ bctrl +/* 802E9114 002E6074 4E 80 04 21 */ bctrl /* 802E9118 002E6078 7C 7A 1B 78 */ mr r26, r3 /* 802E911C 002E607C 7C 7D F8 2E */ lwzx r3, r29, r31 /* 802E9120 002E6080 81 83 00 00 */ lwz r12, 0(r3) /* 802E9124 002E6084 81 8C 00 30 */ lwz r12, 0x30(r12) /* 802E9128 002E6088 7D 89 03 A6 */ mtctr r12 -/* 802E912C 002E608C 4E 80 04 21 */ bctrl +/* 802E912C 002E608C 4E 80 04 21 */ bctrl /* 802E9130 002E6090 7C 03 D0 00 */ cmpw r3, r26 /* 802E9134 002E6094 40 80 00 18 */ bge lbl_802E914C /* 802E9138 002E6098 A0 79 00 00 */ lhz r3, 0(r25) @@ -1966,7 +1966,7 @@ lbl_802E9180: /* 802E9194 002E60F4 81 83 00 00 */ lwz r12, 0(r3) /* 802E9198 002E60F8 81 8C 00 20 */ lwz r12, 0x20(r12) /* 802E919C 002E60FC 7D 89 03 A6 */ mtctr r12 -/* 802E91A0 002E6100 4E 80 04 21 */ bctrl +/* 802E91A0 002E6100 4E 80 04 21 */ bctrl /* 802E91A4 002E6104 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802E91A8 002E6108 41 82 00 20 */ beq lbl_802E91C8 /* 802E91AC 002E610C A0 18 00 00 */ lhz r0, 0(r24) @@ -1975,7 +1975,7 @@ lbl_802E9180: /* 802E91B8 002E6118 81 83 00 00 */ lwz r12, 0(r3) /* 802E91BC 002E611C 81 8C 00 44 */ lwz r12, 0x44(r12) /* 802E91C0 002E6120 7D 89 03 A6 */ mtctr r12 -/* 802E91C4 002E6124 4E 80 04 21 */ bctrl +/* 802E91C4 002E6124 4E 80 04 21 */ bctrl lbl_802E91C8: /* 802E91C8 002E6128 3B 18 00 02 */ addi r24, r24, 2 /* 802E91CC 002E612C 3B 39 00 01 */ addi r25, r25, 1 @@ -1995,7 +1995,7 @@ lbl_802E91E8: /* 802E91FC 002E615C 81 83 00 00 */ lwz r12, 0(r3) /* 802E9200 002E6160 81 8C 00 20 */ lwz r12, 0x20(r12) /* 802E9204 002E6164 7D 89 03 A6 */ mtctr r12 -/* 802E9208 002E6168 4E 80 04 21 */ bctrl +/* 802E9208 002E6168 4E 80 04 21 */ bctrl /* 802E920C 002E616C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802E9210 002E6170 41 82 00 44 */ beq lbl_802E9254 /* 802E9214 002E6174 A0 18 00 00 */ lhz r0, 0(r24) @@ -2004,7 +2004,7 @@ lbl_802E91E8: /* 802E9220 002E6180 81 83 00 00 */ lwz r12, 0(r3) /* 802E9224 002E6184 81 8C 00 28 */ lwz r12, 0x28(r12) /* 802E9228 002E6188 7D 89 03 A6 */ mtctr r12 -/* 802E922C 002E618C 4E 80 04 21 */ bctrl +/* 802E922C 002E618C 4E 80 04 21 */ bctrl /* 802E9230 002E6190 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802E9234 002E6194 40 82 00 20 */ bne lbl_802E9254 /* 802E9238 002E6198 A0 18 00 00 */ lhz r0, 0(r24) @@ -2013,7 +2013,7 @@ lbl_802E91E8: /* 802E9244 002E61A4 81 83 00 00 */ lwz r12, 0(r3) /* 802E9248 002E61A8 81 8C 00 44 */ lwz r12, 0x44(r12) /* 802E924C 002E61AC 7D 89 03 A6 */ mtctr r12 -/* 802E9250 002E61B0 4E 80 04 21 */ bctrl +/* 802E9250 002E61B0 4E 80 04 21 */ bctrl lbl_802E9254: /* 802E9254 002E61B4 3B 18 00 02 */ addi r24, r24, 2 /* 802E9258 002E61B8 3B 39 00 01 */ addi r25, r25, 1 @@ -2040,7 +2040,7 @@ lbl_802E928C: /* 802E92A0 002E6200 81 83 00 00 */ lwz r12, 0(r3) /* 802E92A4 002E6204 81 8C 00 20 */ lwz r12, 0x20(r12) /* 802E92A8 002E6208 7D 89 03 A6 */ mtctr r12 -/* 802E92AC 002E620C 4E 80 04 21 */ bctrl +/* 802E92AC 002E620C 4E 80 04 21 */ bctrl /* 802E92B0 002E6210 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802E92B4 002E6214 41 82 00 0C */ beq lbl_802E92C0 /* 802E92B8 002E6218 3B 9C FF FF */ addi r28, r28, -1 @@ -2052,7 +2052,7 @@ lbl_802E92C0: /* 802E92CC 002E622C 81 83 00 00 */ lwz r12, 0(r3) /* 802E92D0 002E6230 81 8C 00 48 */ lwz r12, 0x48(r12) /* 802E92D4 002E6234 7D 89 03 A6 */ mtctr r12 -/* 802E92D8 002E6238 4E 80 04 21 */ bctrl +/* 802E92D8 002E6238 4E 80 04 21 */ bctrl /* 802E92DC 002E623C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802E92E0 002E6240 41 82 00 48 */ beq lbl_802E9328 /* 802E92E4 002E6244 A0 1F 00 00 */ lhz r0, 0(r31) @@ -2061,7 +2061,7 @@ lbl_802E92C0: /* 802E92F0 002E6250 81 83 00 00 */ lwz r12, 0(r3) /* 802E92F4 002E6254 81 8C 00 28 */ lwz r12, 0x28(r12) /* 802E92F8 002E6258 7D 89 03 A6 */ mtctr r12 -/* 802E92FC 002E625C 4E 80 04 21 */ bctrl +/* 802E92FC 002E625C 4E 80 04 21 */ bctrl /* 802E9300 002E6260 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802E9304 002E6264 41 82 00 24 */ beq lbl_802E9328 /* 802E9308 002E6268 A0 1F 00 00 */ lhz r0, 0(r31) @@ -2070,7 +2070,7 @@ lbl_802E92C0: /* 802E9314 002E6274 81 83 00 00 */ lwz r12, 0(r3) /* 802E9318 002E6278 81 8C 00 40 */ lwz r12, 0x40(r12) /* 802E931C 002E627C 7D 89 03 A6 */ mtctr r12 -/* 802E9320 002E6280 4E 80 04 21 */ bctrl +/* 802E9320 002E6280 4E 80 04 21 */ bctrl /* 802E9324 002E6284 3B 9C FF FF */ addi r28, r28, -1 lbl_802E9328: /* 802E9328 002E6288 3B FF 00 02 */ addi r31, r31, 2 @@ -2093,14 +2093,14 @@ lbl_802E9350: /* 802E935C 002E62BC 81 83 00 00 */ lwz r12, 0(r3) /* 802E9360 002E62C0 81 8C 00 20 */ lwz r12, 0x20(r12) /* 802E9364 002E62C4 7D 89 03 A6 */ mtctr r12 -/* 802E9368 002E62C8 4E 80 04 21 */ bctrl +/* 802E9368 002E62C8 4E 80 04 21 */ bctrl /* 802E936C 002E62CC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802E9370 002E62D0 40 82 00 38 */ bne lbl_802E93A8 /* 802E9374 002E62D4 80 7D 00 00 */ lwz r3, 0(r29) /* 802E9378 002E62D8 81 83 00 00 */ lwz r12, 0(r3) /* 802E937C 002E62DC 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 802E9380 002E62E0 7D 89 03 A6 */ mtctr r12 -/* 802E9384 002E62E4 4E 80 04 21 */ bctrl +/* 802E9384 002E62E4 4E 80 04 21 */ bctrl /* 802E9388 002E62E8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802E938C 002E62EC 40 82 00 1C */ bne lbl_802E93A8 /* 802E9390 002E62F0 80 7D 00 00 */ lwz r3, 0(r29) @@ -2303,7 +2303,7 @@ lbl_802E963C: /* 802E9650 002E65B0 80 01 01 04 */ lwz r0, 0x104(r1) /* 802E9654 002E65B4 7C 08 03 A6 */ mtlr r0 /* 802E9658 002E65B8 38 21 01 00 */ addi r1, r1, 0x100 -/* 802E965C 002E65BC 4E 80 00 20 */ blr +/* 802E965C 002E65BC 4E 80 00 20 */ blr .global LocateHandle__11CSfxManagerFs LocateHandle__11CSfxManagerFs: @@ -2355,7 +2355,7 @@ lbl_802E96FC: /* 802E96FC 002E665C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802E9700 002E6660 7C 08 03 A6 */ mtlr r0 /* 802E9704 002E6664 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E9708 002E6668 4E 80 00 20 */ blr +/* 802E9708 002E6668 4E 80 00 20 */ blr .global TurnOnChannel__11CSfxManagerFQ211CSfxManager12ESfxChannels TurnOnChannel__11CSfxManagerFQ211CSfxManager12ESfxChannels: @@ -2385,7 +2385,7 @@ lbl_802E9758: /* 802E9764 002E66C4 81 83 00 00 */ lwz r12, 0(r3) /* 802E9768 002E66C8 81 8C 00 5C */ lwz r12, 0x5c(r12) /* 802E976C 002E66CC 7D 89 03 A6 */ mtctr r12 -/* 802E9770 002E66D0 4E 80 04 21 */ bctrl +/* 802E9770 002E66D0 4E 80 04 21 */ bctrl lbl_802E9774: /* 802E9774 002E66D4 3B FF 00 04 */ addi r31, r31, 4 /* 802E9778 002E66D8 3B BD 00 01 */ addi r29, r29, 1 @@ -2400,7 +2400,7 @@ lbl_802E9788: /* 802E9794 002E66F4 83 A1 00 14 */ lwz r29, 0x14(r1) /* 802E9798 002E66F8 7C 08 03 A6 */ mtlr r0 /* 802E979C 002E66FC 38 21 00 20 */ addi r1, r1, 0x20 -/* 802E97A0 002E6700 4E 80 00 20 */ blr +/* 802E97A0 002E6700 4E 80 00 20 */ blr .global TurnOffChannel__11CSfxManagerFi TurnOffChannel__11CSfxManagerFi: @@ -2426,21 +2426,21 @@ lbl_802E97E0: /* 802E97EC 002E674C 81 83 00 00 */ lwz r12, 0(r3) /* 802E97F0 002E6750 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 802E97F4 002E6754 7D 89 03 A6 */ mtctr r12 -/* 802E97F8 002E6758 4E 80 04 21 */ bctrl +/* 802E97F8 002E6758 4E 80 04 21 */ bctrl /* 802E97FC 002E675C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802E9800 002E6760 41 82 00 1C */ beq lbl_802E981C /* 802E9804 002E6764 80 7F 00 00 */ lwz r3, 0(r31) /* 802E9808 002E6768 81 83 00 00 */ lwz r12, 0(r3) /* 802E980C 002E676C 81 8C 00 58 */ lwz r12, 0x58(r12) /* 802E9810 002E6770 7D 89 03 A6 */ mtctr r12 -/* 802E9814 002E6774 4E 80 04 21 */ bctrl +/* 802E9814 002E6774 4E 80 04 21 */ bctrl /* 802E9818 002E6778 48 00 00 18 */ b lbl_802E9830 lbl_802E981C: /* 802E981C 002E677C 80 7F 00 00 */ lwz r3, 0(r31) /* 802E9820 002E6780 81 83 00 00 */ lwz r12, 0(r3) /* 802E9824 002E6784 81 8C 00 44 */ lwz r12, 0x44(r12) /* 802E9828 002E6788 7D 89 03 A6 */ mtctr r12 -/* 802E982C 002E678C 4E 80 04 21 */ bctrl +/* 802E982C 002E678C 4E 80 04 21 */ bctrl lbl_802E9830: /* 802E9830 002E6790 3B FF 00 04 */ addi r31, r31, 4 /* 802E9834 002E6794 3B 9C 00 01 */ addi r28, r28, 1 @@ -2458,7 +2458,7 @@ lbl_802E9850: /* 802E985C 002E67BC 81 83 00 00 */ lwz r12, 0(r3) /* 802E9860 002E67C0 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 802E9864 002E67C4 7D 89 03 A6 */ mtctr r12 -/* 802E9868 002E67C8 4E 80 04 21 */ bctrl +/* 802E9868 002E67C8 4E 80 04 21 */ bctrl /* 802E986C 002E67CC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802E9870 002E67D0 40 82 00 10 */ bne lbl_802E9880 /* 802E9874 002E67D4 80 7E 00 00 */ lwz r3, 0(r30) @@ -2478,7 +2478,7 @@ lbl_802E9888: /* 802E98A4 002E6804 83 81 00 10 */ lwz r28, 0x10(r1) /* 802E98A8 002E6808 7C 08 03 A6 */ mtlr r0 /* 802E98AC 002E680C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802E98B0 002E6810 4E 80 00 20 */ blr +/* 802E98B0 002E6810 4E 80 00 20 */ blr .global SetChannel__11CSfxManagerFQ211CSfxManager12ESfxChannels SetChannel__11CSfxManagerFQ211CSfxManager12ESfxChannels: @@ -2503,7 +2503,7 @@ lbl_802E98F0: /* 802E98F4 002E6854 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802E98F8 002E6858 7C 08 03 A6 */ mtlr r0 /* 802E98FC 002E685C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E9900 002E6860 4E 80 00 20 */ blr +/* 802E9900 002E6860 4E 80 00 20 */ blr .global SetDuration__10CSfxHandleFf SetDuration__10CSfxHandleFf: @@ -2538,7 +2538,7 @@ lbl_802E9954: /* 802E9970 002E68D0 81 9F 00 00 */ lwz r12, 0(r31) /* 802E9974 002E68D4 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 802E9978 002E68D8 7D 89 03 A6 */ mtctr r12 -/* 802E997C 002E68DC 4E 80 04 21 */ bctrl +/* 802E997C 002E68DC 4E 80 04 21 */ bctrl /* 802E9980 002E68E0 80 7E 00 00 */ lwz r3, 0(r30) /* 802E9984 002E68E4 80 01 00 08 */ lwz r0, 8(r1) /* 802E9988 002E68E8 7C 03 00 40 */ cmplw r3, r0 @@ -2555,7 +2555,7 @@ lbl_802E99A0: /* 802E99AC 002E690C 83 C1 00 10 */ lwz r30, 0x10(r1) /* 802E99B0 002E6910 7C 08 03 A6 */ mtlr r0 /* 802E99B4 002E6914 38 21 00 20 */ addi r1, r1, 0x20 -/* 802E99B8 002E6918 4E 80 00 20 */ blr +/* 802E99B8 002E6918 4E 80 00 20 */ blr .global StopSound__11CSfxManagerFRC10CSfxHandle StopSound__11CSfxManagerFRC10CSfxHandle: @@ -2589,7 +2589,7 @@ lbl_802E9A08: /* 802E9A24 002E6984 81 9E 00 00 */ lwz r12, 0(r30) /* 802E9A28 002E6988 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 802E9A2C 002E698C 7D 89 03 A6 */ mtctr r12 -/* 802E9A30 002E6990 4E 80 04 21 */ bctrl +/* 802E9A30 002E6990 4E 80 04 21 */ bctrl /* 802E9A34 002E6994 80 7D 00 00 */ lwz r3, 0(r29) /* 802E9A38 002E6998 80 01 00 08 */ lwz r0, 8(r1) /* 802E9A3C 002E699C 7C 03 00 40 */ cmplw r3, r0 @@ -2602,14 +2602,14 @@ lbl_802E9A48: /* 802E9A54 002E69B4 81 9E 00 00 */ lwz r12, 0(r30) /* 802E9A58 002E69B8 81 8C 00 20 */ lwz r12, 0x20(r12) /* 802E9A5C 002E69BC 7D 89 03 A6 */ mtctr r12 -/* 802E9A60 002E69C0 4E 80 04 21 */ bctrl +/* 802E9A60 002E69C0 4E 80 04 21 */ bctrl /* 802E9A64 002E69C4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802E9A68 002E69C8 41 82 00 18 */ beq lbl_802E9A80 /* 802E9A6C 002E69CC 7F C3 F3 78 */ mr r3, r30 /* 802E9A70 002E69D0 81 9E 00 00 */ lwz r12, 0(r30) /* 802E9A74 002E69D4 81 8C 00 44 */ lwz r12, 0x44(r12) /* 802E9A78 002E69D8 7D 89 03 A6 */ mtctr r12 -/* 802E9A7C 002E69DC 4E 80 04 21 */ bctrl +/* 802E9A7C 002E69DC 4E 80 04 21 */ bctrl lbl_802E9A80: /* 802E9A80 002E69E0 7F C3 F3 78 */ mr r3, r30 /* 802E9A84 002E69E4 48 00 15 41 */ bl Release__Q211CSfxManager15CBaseSfxWrapperFv @@ -2624,7 +2624,7 @@ lbl_802E9A98: /* 802E9AA4 002E6A04 83 A1 00 14 */ lwz r29, 0x14(r1) /* 802E9AA8 002E6A08 7C 08 03 A6 */ mtlr r0 /* 802E9AAC 002E6A0C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802E9AB0 002E6A10 4E 80 00 20 */ blr +/* 802E9AB0 002E6A10 4E 80 00 20 */ blr .global KillAll__11CSfxManagerFQ211CSfxManager12ESfxChannels KillAll__11CSfxManagerFQ211CSfxManager12ESfxChannels: @@ -2650,14 +2650,14 @@ lbl_802E9AEC: /* 802E9AFC 002E6A5C 81 9C 00 00 */ lwz r12, 0(r28) /* 802E9B00 002E6A60 81 8C 00 20 */ lwz r12, 0x20(r12) /* 802E9B04 002E6A64 7D 89 03 A6 */ mtctr r12 -/* 802E9B08 002E6A68 4E 80 04 21 */ bctrl +/* 802E9B08 002E6A68 4E 80 04 21 */ bctrl /* 802E9B0C 002E6A6C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802E9B10 002E6A70 41 82 00 18 */ beq lbl_802E9B28 /* 802E9B14 002E6A74 7F 83 E3 78 */ mr r3, r28 /* 802E9B18 002E6A78 81 9C 00 00 */ lwz r12, 0(r28) /* 802E9B1C 002E6A7C 81 8C 00 44 */ lwz r12, 0x44(r12) /* 802E9B20 002E6A80 7D 89 03 A6 */ mtctr r12 -/* 802E9B24 002E6A84 4E 80 04 21 */ bctrl +/* 802E9B24 002E6A84 4E 80 04 21 */ bctrl lbl_802E9B28: /* 802E9B28 002E6A88 28 1C 00 00 */ cmplwi r28, 0 /* 802E9B2C 002E6A8C 41 82 00 0C */ beq lbl_802E9B38 @@ -2679,7 +2679,7 @@ lbl_802E9B48: /* 802E9B64 002E6AC4 83 81 00 10 */ lwz r28, 0x10(r1) /* 802E9B68 002E6AC8 7C 08 03 A6 */ mtlr r0 /* 802E9B6C 002E6ACC 38 21 00 20 */ addi r1, r1, 0x20 -/* 802E9B70 002E6AD0 4E 80 00 20 */ blr +/* 802E9B70 002E6AD0 4E 80 00 20 */ blr .global SfxSpan__11CSfxManagerF10CSfxHandleUc SfxSpan__11CSfxManagerF10CSfxHandleUc: @@ -2714,7 +2714,7 @@ lbl_802E9BC4: /* 802E9BE0 002E6B40 81 9F 00 00 */ lwz r12, 0(r31) /* 802E9BE4 002E6B44 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 802E9BE8 002E6B48 7D 89 03 A6 */ mtctr r12 -/* 802E9BEC 002E6B4C 4E 80 04 21 */ bctrl +/* 802E9BEC 002E6B4C 4E 80 04 21 */ bctrl /* 802E9BF0 002E6B50 80 7D 00 00 */ lwz r3, 0(r29) /* 802E9BF4 002E6B54 80 01 00 08 */ lwz r0, 8(r1) /* 802E9BF8 002E6B58 7C 03 00 40 */ cmplw r3, r0 @@ -2725,14 +2725,14 @@ lbl_802E9C04: /* 802E9C08 002E6B68 81 9F 00 00 */ lwz r12, 0(r31) /* 802E9C0C 002E6B6C 81 8C 00 20 */ lwz r12, 0x20(r12) /* 802E9C10 002E6B70 7D 89 03 A6 */ mtctr r12 -/* 802E9C14 002E6B74 4E 80 04 21 */ bctrl +/* 802E9C14 002E6B74 4E 80 04 21 */ bctrl /* 802E9C18 002E6B78 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802E9C1C 002E6B7C 41 82 00 20 */ beq lbl_802E9C3C /* 802E9C20 002E6B80 7F E3 FB 78 */ mr r3, r31 /* 802E9C24 002E6B84 81 9F 00 00 */ lwz r12, 0(r31) /* 802E9C28 002E6B88 81 8C 00 50 */ lwz r12, 0x50(r12) /* 802E9C2C 002E6B8C 7D 89 03 A6 */ mtctr r12 -/* 802E9C30 002E6B90 4E 80 04 21 */ bctrl +/* 802E9C30 002E6B90 4E 80 04 21 */ bctrl /* 802E9C34 002E6B94 7F C4 F3 78 */ mr r4, r30 /* 802E9C38 002E6B98 48 06 19 61 */ bl SfxSpan__9CAudioSysFUlUc lbl_802E9C3C: @@ -2742,7 +2742,7 @@ lbl_802E9C3C: /* 802E9C48 002E6BA8 83 A1 00 14 */ lwz r29, 0x14(r1) /* 802E9C4C 002E6BAC 7C 08 03 A6 */ mtlr r0 /* 802E9C50 002E6BB0 38 21 00 20 */ addi r1, r1, 0x20 -/* 802E9C54 002E6BB4 4E 80 00 20 */ blr +/* 802E9C54 002E6BB4 4E 80 00 20 */ blr .global SfxVolume__11CSfxManagerF10CSfxHandleUc SfxVolume__11CSfxManagerF10CSfxHandleUc: @@ -2777,7 +2777,7 @@ lbl_802E9CA8: /* 802E9CC4 002E6C24 81 9F 00 00 */ lwz r12, 0(r31) /* 802E9CC8 002E6C28 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 802E9CCC 002E6C2C 7D 89 03 A6 */ mtctr r12 -/* 802E9CD0 002E6C30 4E 80 04 21 */ bctrl +/* 802E9CD0 002E6C30 4E 80 04 21 */ bctrl /* 802E9CD4 002E6C34 80 7D 00 00 */ lwz r3, 0(r29) /* 802E9CD8 002E6C38 80 01 00 08 */ lwz r0, 8(r1) /* 802E9CDC 002E6C3C 7C 03 00 40 */ cmplw r3, r0 @@ -2791,14 +2791,14 @@ lbl_802E9CE8: /* 802E9CF8 002E6C58 81 9F 00 00 */ lwz r12, 0(r31) /* 802E9CFC 002E6C5C 81 8C 00 20 */ lwz r12, 0x20(r12) /* 802E9D00 002E6C60 7D 89 03 A6 */ mtctr r12 -/* 802E9D04 002E6C64 4E 80 04 21 */ bctrl +/* 802E9D04 002E6C64 4E 80 04 21 */ bctrl /* 802E9D08 002E6C68 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802E9D0C 002E6C6C 41 82 00 20 */ beq lbl_802E9D2C /* 802E9D10 002E6C70 7F E3 FB 78 */ mr r3, r31 /* 802E9D14 002E6C74 81 9F 00 00 */ lwz r12, 0(r31) /* 802E9D18 002E6C78 81 8C 00 50 */ lwz r12, 0x50(r12) /* 802E9D1C 002E6C7C 7D 89 03 A6 */ mtctr r12 -/* 802E9D20 002E6C80 4E 80 04 21 */ bctrl +/* 802E9D20 002E6C80 4E 80 04 21 */ bctrl /* 802E9D24 002E6C84 7F C4 F3 78 */ mr r4, r30 /* 802E9D28 002E6C88 48 06 18 45 */ bl SfxVolume__9CAudioSysFUlUc lbl_802E9D2C: @@ -2808,7 +2808,7 @@ lbl_802E9D2C: /* 802E9D38 002E6C98 83 A1 00 14 */ lwz r29, 0x14(r1) /* 802E9D3C 002E6C9C 7C 08 03 A6 */ mtlr r0 /* 802E9D40 002E6CA0 38 21 00 20 */ addi r1, r1, 0x20 -/* 802E9D44 002E6CA4 4E 80 00 20 */ blr +/* 802E9D44 002E6CA4 4E 80 00 20 */ blr .global SfxStop__11CSfxManagerFRC10CSfxHandle SfxStop__11CSfxManagerFRC10CSfxHandle: @@ -2822,7 +2822,7 @@ SfxStop__11CSfxManagerFRC10CSfxHandle: /* 802E9D64 002E6CC4 80 01 00 14 */ lwz r0, 0x14(r1) /* 802E9D68 002E6CC8 7C 08 03 A6 */ mtlr r0 /* 802E9D6C 002E6CCC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E9D70 002E6CD0 4E 80 00 20 */ blr +/* 802E9D70 002E6CD0 4E 80 00 20 */ blr .global SfxStart__11CSfxManagerFUsssbsbi SfxStart__11CSfxManagerFUsssbsbi: @@ -2897,7 +2897,7 @@ lbl_802E9E70: /* 802E9E74 002E6DD4 80 01 00 74 */ lwz r0, 0x74(r1) /* 802E9E78 002E6DD8 7C 08 03 A6 */ mtlr r0 /* 802E9E7C 002E6DDC 38 21 00 70 */ addi r1, r1, 0x70 -/* 802E9E80 002E6DE0 4E 80 00 20 */ blr +/* 802E9E80 002E6DE0 4E 80 00 20 */ blr .global RemoveEmitter__11CSfxManagerFRC10CSfxHandle RemoveEmitter__11CSfxManagerFRC10CSfxHandle: @@ -2911,7 +2911,7 @@ RemoveEmitter__11CSfxManagerFRC10CSfxHandle: /* 802E9EA0 002E6E00 80 01 00 14 */ lwz r0, 0x14(r1) /* 802E9EA4 002E6E04 7C 08 03 A6 */ mtlr r0 /* 802E9EA8 002E6E08 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E9EAC 002E6E0C 4E 80 00 20 */ blr +/* 802E9EAC 002E6E0C 4E 80 00 20 */ blr .global UpdateEmitter__11CSfxManagerF10CSfxHandleRC9CVector3fRC9CVector3fUc UpdateEmitter__11CSfxManagerF10CSfxHandleRC9CVector3fRC9CVector3fUc: @@ -2946,7 +2946,7 @@ lbl_802E9F00: /* 802E9F1C 002E6E7C 81 9D 00 00 */ lwz r12, 0(r29) /* 802E9F20 002E6E80 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 802E9F24 002E6E84 7D 89 03 A6 */ mtctr r12 -/* 802E9F28 002E6E88 4E 80 04 21 */ bctrl +/* 802E9F28 002E6E88 4E 80 04 21 */ bctrl /* 802E9F2C 002E6E8C 80 7E 00 00 */ lwz r3, 0(r30) /* 802E9F30 002E6E90 80 01 00 08 */ lwz r0, 8(r1) /* 802E9F34 002E6E94 7C 03 00 40 */ cmplw r3, r0 @@ -2955,7 +2955,7 @@ lbl_802E9F00: /* 802E9F40 002E6EA0 81 9D 00 00 */ lwz r12, 0(r29) /* 802E9F44 002E6EA4 81 8C 00 20 */ lwz r12, 0x20(r12) /* 802E9F48 002E6EA8 7D 89 03 A6 */ mtctr r12 -/* 802E9F4C 002E6EAC 4E 80 04 21 */ bctrl +/* 802E9F4C 002E6EAC 4E 80 04 21 */ bctrl /* 802E9F50 002E6EB0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802E9F54 002E6EB4 40 82 00 08 */ bne lbl_802E9F5C /* 802E9F58 002E6EB8 48 00 00 74 */ b lbl_802E9FCC @@ -2993,7 +2993,7 @@ lbl_802E9FCC: /* 802E9FD0 002E6F30 80 01 00 34 */ lwz r0, 0x34(r1) /* 802E9FD4 002E6F34 7C 08 03 A6 */ mtlr r0 /* 802E9FD8 002E6F38 38 21 00 30 */ addi r1, r1, 0x30 -/* 802E9FDC 002E6F3C 4E 80 00 20 */ blr +/* 802E9FDC 002E6F3C 4E 80 00 20 */ blr .global AddEmitter__11CSfxManagerFRQ29CAudioSys18C3DEmitterParmDatabsbi AddEmitter__11CSfxManagerFRQ29CAudioSys18C3DEmitterParmDatabsbi: @@ -3096,7 +3096,7 @@ lbl_802EA148: /* 802EA14C 002E70AC 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 802EA150 002E70B0 7C 08 03 A6 */ mtlr r0 /* 802EA154 002E70B4 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 802EA158 002E70B8 4E 80 00 20 */ blr +/* 802EA158 002E70B8 4E 80 00 20 */ blr .global __dt__Q211CSfxManager18CSfxEmitterWrapperFv __dt__Q211CSfxManager18CSfxEmitterWrapperFv: @@ -3124,7 +3124,7 @@ lbl_802EA1A0: /* 802EA1A8 002E7108 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802EA1AC 002E710C 7C 08 03 A6 */ mtlr r0 /* 802EA1B0 002E7110 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EA1B4 002E7114 4E 80 00 20 */ blr +/* 802EA1B4 002E7114 4E 80 00 20 */ blr .global AddEmitter__11CSfxManagerFUsRC9CVector3fRC9CVector3fUcbbsi AddEmitter__11CSfxManagerFUsRC9CVector3fRC9CVector3fUcbbsi: @@ -3190,7 +3190,7 @@ lbl_802EA228: /* 802EA2A0 002E7200 83 A1 00 44 */ lwz r29, 0x44(r1) /* 802EA2A4 002E7204 7C 08 03 A6 */ mtlr r0 /* 802EA2A8 002E7208 38 21 00 50 */ addi r1, r1, 0x50 -/* 802EA2AC 002E720C 4E 80 00 20 */ blr +/* 802EA2AC 002E720C 4E 80 00 20 */ blr .global AddEmitter__11CSfxManagerFUsRC9CVector3fRC9CVector3fbbsi AddEmitter__11CSfxManagerFUsRC9CVector3fRC9CVector3fbbsi: @@ -3251,7 +3251,7 @@ AddEmitter__11CSfxManagerFUsRC9CVector3fRC9CVector3fbbsi: /* 802EA388 002E72E8 83 81 00 40 */ lwz r28, 0x40(r1) /* 802EA38C 002E72EC 7C 08 03 A6 */ mtlr r0 /* 802EA390 002E72F0 38 21 00 50 */ addi r1, r1, 0x50 -/* 802EA394 002E72F4 4E 80 00 20 */ blr +/* 802EA394 002E72F4 4E 80 00 20 */ blr .global UpdateListener__11CSfxManagerFRC9CVector3fRC9CVector3fRC9CVector3fRC9CVector3fUc UpdateListener__11CSfxManagerFRC9CVector3fRC9CVector3fRC9CVector3fRC9CVector3fUc: @@ -3294,7 +3294,7 @@ UpdateListener__11CSfxManagerFRC9CVector3fRC9CVector3fRC9CVector3fRC9CVector3fUc /* 802EA428 002E7388 80 01 00 14 */ lwz r0, 0x14(r1) /* 802EA42C 002E738C 7C 08 03 A6 */ mtlr r0 /* 802EA430 002E7390 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EA434 002E7394 4E 80 00 20 */ blr +/* 802EA434 002E7394 4E 80 00 20 */ blr .global AddListener__11CSfxManagerFQ211CSfxManager12ESfxChannelsRC9CVector3fRC9CVector3fRC9CVector3fRC9CVector3ffffUiUc AddListener__11CSfxManagerFQ211CSfxManager12ESfxChannelsRC9CVector3fRC9CVector3fRC9CVector3fRC9CVector3ffffUiUc: @@ -3402,7 +3402,7 @@ AddListener__11CSfxManagerFQ211CSfxManager12ESfxChannelsRC9CVector3fRC9CVector3f /* 802EA5CC 002E752C 80 01 00 84 */ lwz r0, 0x84(r1) /* 802EA5D0 002E7530 7C 08 03 A6 */ mtlr r0 /* 802EA5D4 002E7534 38 21 00 80 */ addi r1, r1, 0x80 -/* 802EA5D8 002E7538 4E 80 00 20 */ blr +/* 802EA5D8 002E7538 4E 80 00 20 */ blr .global StopAndRemoveAllEmitters__11CSfxManagerFv StopAndRemoveAllEmitters__11CSfxManagerFv: @@ -3425,14 +3425,14 @@ lbl_802EA608: /* 802EA614 002E7574 81 83 00 00 */ lwz r12, 0(r3) /* 802EA618 002E7578 81 8C 00 20 */ lwz r12, 0x20(r12) /* 802EA61C 002E757C 7D 89 03 A6 */ mtctr r12 -/* 802EA620 002E7580 4E 80 04 21 */ bctrl +/* 802EA620 002E7580 4E 80 04 21 */ bctrl /* 802EA624 002E7584 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802EA628 002E7588 41 82 00 18 */ beq lbl_802EA640 /* 802EA62C 002E758C 80 7E 00 00 */ lwz r3, 0(r30) /* 802EA630 002E7590 81 83 00 00 */ lwz r12, 0(r3) /* 802EA634 002E7594 81 8C 00 44 */ lwz r12, 0x44(r12) /* 802EA638 002E7598 7D 89 03 A6 */ mtctr r12 -/* 802EA63C 002E759C 4E 80 04 21 */ bctrl +/* 802EA63C 002E759C 4E 80 04 21 */ bctrl lbl_802EA640: /* 802EA640 002E75A0 80 7E 00 00 */ lwz r3, 0(r30) /* 802EA644 002E75A4 48 00 09 81 */ bl Release__Q211CSfxManager15CBaseSfxWrapperFv @@ -3452,7 +3452,7 @@ lbl_802EA654: /* 802EA674 002E75D4 80 01 00 24 */ lwz r0, 0x24(r1) /* 802EA678 002E75D8 7C 08 03 A6 */ mtlr r0 /* 802EA67C 002E75DC 38 21 00 20 */ addi r1, r1, 0x20 -/* 802EA680 002E75E0 4E 80 00 20 */ blr +/* 802EA680 002E75E0 4E 80 00 20 */ blr .global Shutdown__11CSfxManagerFv Shutdown__11CSfxManagerFv: @@ -3497,7 +3497,7 @@ lbl_802EA704: /* 802EA708 002E7668 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802EA70C 002E766C 7C 08 03 A6 */ mtlr r0 /* 802EA710 002E7670 38 21 00 20 */ addi r1, r1, 0x20 -/* 802EA714 002E7674 4E 80 00 20 */ blr +/* 802EA714 002E7674 4E 80 00 20 */ blr .global UpdateEmitter__Q211CSfxManager11CSfxWrapperFv UpdateEmitter__Q211CSfxManager11CSfxWrapperFv: @@ -3511,7 +3511,7 @@ UpdateEmitter__Q211CSfxManager11CSfxWrapperFv: /* 802EA734 002E7694 80 01 00 14 */ lwz r0, 0x14(r1) /* 802EA738 002E7698 7C 08 03 A6 */ mtlr r0 /* 802EA73C 002E769C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EA740 002E76A0 4E 80 00 20 */ blr +/* 802EA740 002E76A0 4E 80 00 20 */ blr .global UpdateEmitterSilent__Q211CSfxManager11CSfxWrapperFv UpdateEmitterSilent__Q211CSfxManager11CSfxWrapperFv: @@ -3524,22 +3524,22 @@ UpdateEmitterSilent__Q211CSfxManager11CSfxWrapperFv: /* 802EA75C 002E76BC 80 01 00 14 */ lwz r0, 0x14(r1) /* 802EA760 002E76C0 7C 08 03 A6 */ mtlr r0 /* 802EA764 002E76C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EA768 002E76C8 4E 80 00 20 */ blr +/* 802EA768 002E76C8 4E 80 00 20 */ blr .global SetVolume__Q211CSfxManager11CSfxWrapperFs SetVolume__Q211CSfxManager11CSfxWrapperFs: /* 802EA76C 002E76CC B0 83 00 20 */ sth r4, 0x20(r3) -/* 802EA770 002E76D0 4E 80 00 20 */ blr +/* 802EA770 002E76D0 4E 80 00 20 */ blr .global GetVoice__Q211CSfxManager11CSfxWrapperCFv GetVoice__Q211CSfxManager11CSfxWrapperCFv: /* 802EA774 002E76D4 80 63 00 1C */ lwz r3, 0x1c(r3) -/* 802EA778 002E76D8 4E 80 00 20 */ blr +/* 802EA778 002E76D8 4E 80 00 20 */ blr .global GetAudible__Q211CSfxManager11CSfxWrapperFRC9CVector3f GetAudible__Q211CSfxManager11CSfxWrapperFRC9CVector3f: /* 802EA77C 002E76DC 38 60 00 03 */ li r3, 3 -/* 802EA780 002E76E0 4E 80 00 20 */ blr +/* 802EA780 002E76E0 4E 80 00 20 */ blr .global Ready__Q211CSfxManager11CSfxWrapperFv Ready__Q211CSfxManager11CSfxWrapperFv: @@ -3553,7 +3553,7 @@ Ready__Q211CSfxManager11CSfxWrapperFv: /* 802EA7A0 002E7700 81 83 00 00 */ lwz r12, 0(r3) /* 802EA7A4 002E7704 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 802EA7A8 002E7708 7D 89 03 A6 */ mtctr r12 -/* 802EA7AC 002E770C 4E 80 04 21 */ bctrl +/* 802EA7AC 002E770C 4E 80 04 21 */ bctrl /* 802EA7B0 002E7710 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802EA7B4 002E7714 40 82 00 10 */ bne lbl_802EA7C4 /* 802EA7B8 002E7718 88 1E 00 24 */ lbz r0, 0x24(r30) @@ -3568,7 +3568,7 @@ lbl_802EA7C8: /* 802EA7D4 002E7734 83 C1 00 08 */ lwz r30, 8(r1) /* 802EA7D8 002E7738 7C 08 03 A6 */ mtlr r0 /* 802EA7DC 002E773C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EA7E0 002E7740 4E 80 00 20 */ blr +/* 802EA7E0 002E7740 4E 80 00 20 */ blr .global IsPlaying__Q211CSfxManager11CSfxWrapperCFv IsPlaying__Q211CSfxManager11CSfxWrapperCFv: @@ -3595,7 +3595,7 @@ lbl_802EA824: /* 802EA830 002E7790 83 C1 00 08 */ lwz r30, 8(r1) /* 802EA834 002E7794 7C 08 03 A6 */ mtlr r0 /* 802EA838 002E7798 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EA83C 002E779C 4E 80 00 20 */ blr +/* 802EA83C 002E779C 4E 80 00 20 */ blr .global Stop__Q211CSfxManager11CSfxWrapperFv Stop__Q211CSfxManager11CSfxWrapperFv: @@ -3614,7 +3614,7 @@ Stop__Q211CSfxManager11CSfxWrapperFv: /* 802EA870 002E77D0 81 9F 00 00 */ lwz r12, 0(r31) /* 802EA874 002E77D4 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802EA878 002E77D8 7D 89 03 A6 */ mtctr r12 -/* 802EA87C 002E77DC 4E 80 04 21 */ bctrl +/* 802EA87C 002E77DC 4E 80 04 21 */ bctrl /* 802EA880 002E77E0 38 00 FF FF */ li r0, -1 /* 802EA884 002E77E4 90 1F 00 1C */ stw r0, 0x1c(r31) lbl_802EA888: @@ -3622,12 +3622,12 @@ lbl_802EA888: /* 802EA88C 002E77EC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802EA890 002E77F0 7C 08 03 A6 */ mtlr r0 /* 802EA894 002E77F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EA898 002E77F8 4E 80 00 20 */ blr +/* 802EA898 002E77F8 4E 80 00 20 */ blr .global GetSFXId__Q211CSfxManager11CSfxWrapperCFv GetSFXId__Q211CSfxManager11CSfxWrapperCFv: /* 802EA89C 002E77FC A0 63 00 18 */ lhz r3, 0x18(r3) -/* 802EA8A0 002E7800 4E 80 00 20 */ blr +/* 802EA8A0 002E7800 4E 80 00 20 */ blr .global Play__Q211CSfxManager11CSfxWrapperFv Play__Q211CSfxManager11CSfxWrapperFv: @@ -3655,7 +3655,7 @@ Play__Q211CSfxManager11CSfxWrapperFv: /* 802EA8F8 002E7858 81 9F 00 00 */ lwz r12, 0(r31) /* 802EA8FC 002E785C 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 802EA900 002E7860 7D 89 03 A6 */ mtctr r12 -/* 802EA904 002E7864 4E 80 04 21 */ bctrl +/* 802EA904 002E7864 4E 80 04 21 */ bctrl /* 802EA908 002E7868 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802EA90C 002E786C 41 82 00 1C */ beq lbl_802EA928 /* 802EA910 002E7870 4B FF DB 01 */ bl GetReverbAmount__11CSfxManagerFv @@ -3670,7 +3670,7 @@ lbl_802EA928: /* 802EA930 002E7890 81 9F 00 00 */ lwz r12, 0(r31) /* 802EA934 002E7894 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802EA938 002E7898 7D 89 03 A6 */ mtctr r12 -/* 802EA93C 002E789C 4E 80 04 21 */ bctrl +/* 802EA93C 002E789C 4E 80 04 21 */ bctrl lbl_802EA940: /* 802EA940 002E78A0 38 00 00 00 */ li r0, 0 /* 802EA944 002E78A4 98 1F 00 24 */ stb r0, 0x24(r31) @@ -3678,7 +3678,7 @@ lbl_802EA940: /* 802EA94C 002E78AC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802EA950 002E78B0 7C 08 03 A6 */ mtlr r0 /* 802EA954 002E78B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EA958 002E78B8 4E 80 00 20 */ blr +/* 802EA958 002E78B8 4E 80 00 20 */ blr .global SetReverb__Q211CSfxManager11CSfxWrapperFc SetReverb__Q211CSfxManager11CSfxWrapperFc: @@ -3696,7 +3696,7 @@ SetReverb__Q211CSfxManager11CSfxWrapperFc: /* 802EA988 002E78E8 81 9E 00 00 */ lwz r12, 0(r30) /* 802EA98C 002E78EC 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 802EA990 002E78F0 7D 89 03 A6 */ mtctr r12 -/* 802EA994 002E78F4 4E 80 04 21 */ bctrl +/* 802EA994 002E78F4 4E 80 04 21 */ bctrl /* 802EA998 002E78F8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802EA99C 002E78FC 41 82 00 14 */ beq lbl_802EA9B0 /* 802EA9A0 002E7900 80 7E 00 1C */ lwz r3, 0x1c(r30) @@ -3709,7 +3709,7 @@ lbl_802EA9B0: /* 802EA9B8 002E7918 83 C1 00 08 */ lwz r30, 8(r1) /* 802EA9BC 002E791C 7C 08 03 A6 */ mtlr r0 /* 802EA9C0 002E7920 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EA9C4 002E7924 4E 80 00 20 */ blr +/* 802EA9C4 002E7924 4E 80 00 20 */ blr .global __ct__Q211CSfxManager11CSfxWrapperFbsUsss10CSfxHandlebi __ct__Q211CSfxManager11CSfxWrapperFbsUsss10CSfxHandlebi: @@ -3749,7 +3749,7 @@ __ct__Q211CSfxManager11CSfxWrapperFbsUsss10CSfxHandlebi: /* 802EAA4C 002E79AC 83 81 00 10 */ lwz r28, 0x10(r1) /* 802EAA50 002E79B0 7C 08 03 A6 */ mtlr r0 /* 802EAA54 002E79B4 38 21 00 20 */ addi r1, r1, 0x20 -/* 802EAA58 002E79B8 4E 80 00 20 */ blr +/* 802EAA58 002E79B8 4E 80 00 20 */ blr .global UpdateEmitter__Q211CSfxManager18CSfxEmitterWrapperFv UpdateEmitter__Q211CSfxManager18CSfxEmitterWrapperFv: @@ -3765,7 +3765,7 @@ UpdateEmitter__Q211CSfxManager18CSfxEmitterWrapperFv: /* 802EAA80 002E79E0 80 01 00 14 */ lwz r0, 0x14(r1) /* 802EAA84 002E79E4 7C 08 03 A6 */ mtlr r0 /* 802EAA88 002E79E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EAA8C 002E79EC 4E 80 00 20 */ blr +/* 802EAA8C 002E79EC 4E 80 00 20 */ blr .global UpdateEmitterSilent__Q211CSfxManager18CSfxEmitterWrapperFv UpdateEmitterSilent__Q211CSfxManager18CSfxEmitterWrapperFv: @@ -3782,7 +3782,7 @@ UpdateEmitterSilent__Q211CSfxManager18CSfxEmitterWrapperFv: /* 802EAAB8 002E7A18 80 01 00 14 */ lwz r0, 0x14(r1) /* 802EAABC 002E7A1C 7C 08 03 A6 */ mtlr r0 /* 802EAAC0 002E7A20 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EAAC4 002E7A24 4E 80 00 20 */ blr +/* 802EAAC4 002E7A24 4E 80 00 20 */ blr .global GetVoice__Q211CSfxManager18CSfxEmitterWrapperCFv GetVoice__Q211CSfxManager18CSfxEmitterWrapperCFv: @@ -3794,7 +3794,7 @@ GetVoice__Q211CSfxManager18CSfxEmitterWrapperCFv: /* 802EAADC 002E7A3C 81 83 00 00 */ lwz r12, 0(r3) /* 802EAAE0 002E7A40 81 8C 00 20 */ lwz r12, 0x20(r12) /* 802EAAE4 002E7A44 7D 89 03 A6 */ mtctr r12 -/* 802EAAE8 002E7A48 4E 80 04 21 */ bctrl +/* 802EAAE8 002E7A48 4E 80 04 21 */ bctrl /* 802EAAEC 002E7A4C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802EAAF0 002E7A50 41 82 00 10 */ beq lbl_802EAB00 /* 802EAAF4 002E7A54 80 7F 00 50 */ lwz r3, 0x50(r31) @@ -3807,7 +3807,7 @@ lbl_802EAB04: /* 802EAB08 002E7A68 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802EAB0C 002E7A6C 7C 08 03 A6 */ mtlr r0 /* 802EAB10 002E7A70 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EAB14 002E7A74 4E 80 00 20 */ blr +/* 802EAB14 002E7A74 4E 80 00 20 */ blr .global GetAudible__Q211CSfxManager18CSfxEmitterWrapperFRC9CVector3f GetAudible__Q211CSfxManager18CSfxEmitterWrapperFRC9CVector3f: @@ -3851,7 +3851,7 @@ lbl_802EAB98: /* 802EABA4 002E7B04 7C 03 07 34 */ extsh r3, r0 lbl_802EABA8: /* 802EABA8 002E7B08 38 21 00 20 */ addi r1, r1, 0x20 -/* 802EABAC 002E7B0C 4E 80 00 20 */ blr +/* 802EABAC 002E7B0C 4E 80 00 20 */ blr .global Ready__Q211CSfxManager18CSfxEmitterWrapperFv Ready__Q211CSfxManager18CSfxEmitterWrapperFv: @@ -3865,7 +3865,7 @@ Ready__Q211CSfxManager18CSfxEmitterWrapperFv: /* 802EABCC 002E7B2C 81 83 00 00 */ lwz r12, 0(r3) /* 802EABD0 002E7B30 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 802EABD4 002E7B34 7D 89 03 A6 */ mtctr r12 -/* 802EABD8 002E7B38 4E 80 04 21 */ bctrl +/* 802EABD8 002E7B38 4E 80 04 21 */ bctrl /* 802EABDC 002E7B3C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802EABE0 002E7B40 40 82 00 10 */ bne lbl_802EABF0 /* 802EABE4 002E7B44 88 1E 00 54 */ lbz r0, 0x54(r30) @@ -3880,7 +3880,7 @@ lbl_802EABF4: /* 802EAC00 002E7B60 83 C1 00 08 */ lwz r30, 8(r1) /* 802EAC04 002E7B64 7C 08 03 A6 */ mtlr r0 /* 802EAC08 002E7B68 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EAC0C 002E7B6C 4E 80 00 20 */ blr +/* 802EAC0C 002E7B6C 4E 80 00 20 */ blr .global IsPlaying__Q211CSfxManager18CSfxEmitterWrapperCFv IsPlaying__Q211CSfxManager18CSfxEmitterWrapperCFv: @@ -3893,7 +3893,7 @@ IsPlaying__Q211CSfxManager18CSfxEmitterWrapperCFv: /* 802EAC28 002E7B88 81 83 00 00 */ lwz r12, 0(r3) /* 802EAC2C 002E7B8C 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 802EAC30 002E7B90 7D 89 03 A6 */ mtctr r12 -/* 802EAC34 002E7B94 4E 80 04 21 */ bctrl +/* 802EAC34 002E7B94 4E 80 04 21 */ bctrl /* 802EAC38 002E7B98 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802EAC3C 002E7B9C 41 82 00 10 */ beq lbl_802EAC4C /* 802EAC40 002E7BA0 7F C3 F3 78 */ mr r3, r30 @@ -3918,17 +3918,17 @@ lbl_802EAC78: /* 802EAC80 002E7BE0 83 C1 00 08 */ lwz r30, 8(r1) /* 802EAC84 002E7BE4 7C 08 03 A6 */ mtlr r0 /* 802EAC88 002E7BE8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EAC8C 002E7BEC 4E 80 00 20 */ blr +/* 802EAC8C 002E7BEC 4E 80 00 20 */ blr .global GetHandle__Q211CSfxManager18CSfxEmitterWrapperCFv GetHandle__Q211CSfxManager18CSfxEmitterWrapperCFv: /* 802EAC90 002E7BF0 80 63 00 50 */ lwz r3, 0x50(r3) -/* 802EAC94 002E7BF4 4E 80 00 20 */ blr +/* 802EAC94 002E7BF4 4E 80 00 20 */ blr .global GetEmitter__Q211CSfxManager18CSfxEmitterWrapperFv GetEmitter__Q211CSfxManager18CSfxEmitterWrapperFv: /* 802EAC98 002E7BF8 38 63 00 24 */ addi r3, r3, 0x24 -/* 802EAC9C 002E7BFC 4E 80 00 20 */ blr +/* 802EAC9C 002E7BFC 4E 80 00 20 */ blr .global Stop__Q211CSfxManager18CSfxEmitterWrapperFv Stop__Q211CSfxManager18CSfxEmitterWrapperFv: @@ -3947,7 +3947,7 @@ Stop__Q211CSfxManager18CSfxEmitterWrapperFv: /* 802EACD0 002E7C30 81 9F 00 00 */ lwz r12, 0(r31) /* 802EACD4 002E7C34 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802EACD8 002E7C38 7D 89 03 A6 */ mtctr r12 -/* 802EACDC 002E7C3C 4E 80 04 21 */ bctrl +/* 802EACDC 002E7C3C 4E 80 04 21 */ bctrl /* 802EACE0 002E7C40 38 00 FF FF */ li r0, -1 /* 802EACE4 002E7C44 90 1F 00 50 */ stw r0, 0x50(r31) lbl_802EACE8: @@ -3955,12 +3955,12 @@ lbl_802EACE8: /* 802EACEC 002E7C4C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802EACF0 002E7C50 7C 08 03 A6 */ mtlr r0 /* 802EACF4 002E7C54 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EACF8 002E7C58 4E 80 00 20 */ blr +/* 802EACF8 002E7C58 4E 80 00 20 */ blr .global GetSfxId__Q211CSfxManager18CSfxEmitterWrapperFv GetSfxId__Q211CSfxManager18CSfxEmitterWrapperFv: /* 802EACFC 002E7C5C A0 63 00 48 */ lhz r3, 0x48(r3) -/* 802EAD00 002E7C60 4E 80 00 20 */ blr +/* 802EAD00 002E7C60 4E 80 00 20 */ blr .global Play__Q211CSfxManager18CSfxEmitterWrapperFv Play__Q211CSfxManager18CSfxEmitterWrapperFv: @@ -3982,7 +3982,7 @@ Play__Q211CSfxManager18CSfxEmitterWrapperFv: /* 802EAD40 002E7CA0 81 9F 00 00 */ lwz r12, 0(r31) /* 802EAD44 002E7CA4 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 802EAD48 002E7CA8 7D 89 03 A6 */ mtctr r12 -/* 802EAD4C 002E7CAC 4E 80 04 21 */ bctrl +/* 802EAD4C 002E7CAC 4E 80 04 21 */ bctrl /* 802EAD50 002E7CB0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802EAD54 002E7CB4 41 82 00 10 */ beq lbl_802EAD64 /* 802EAD58 002E7CB8 4B FF D6 B9 */ bl GetReverbAmount__11CSfxManagerFv @@ -3997,7 +3997,7 @@ lbl_802EAD6C: /* 802EAD74 002E7CD4 81 9F 00 00 */ lwz r12, 0(r31) /* 802EAD78 002E7CD8 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 802EAD7C 002E7CDC 7D 89 03 A6 */ mtctr r12 -/* 802EAD80 002E7CE0 4E 80 04 21 */ bctrl +/* 802EAD80 002E7CE0 4E 80 04 21 */ bctrl /* 802EAD84 002E7CE4 80 01 00 08 */ lwz r0, 8(r1) /* 802EAD88 002E7CE8 38 7F 00 24 */ addi r3, r31, 0x24 /* 802EAD8C 002E7CEC 38 BF 00 1C */ addi r5, r31, 0x1c @@ -4013,7 +4013,7 @@ lbl_802EAD6C: /* 802EADB4 002E7D14 81 9F 00 00 */ lwz r12, 0(r31) /* 802EADB8 002E7D18 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802EADBC 002E7D1C 7D 89 03 A6 */ mtctr r12 -/* 802EADC0 002E7D20 4E 80 04 21 */ bctrl +/* 802EADC0 002E7D20 4E 80 04 21 */ bctrl lbl_802EADC4: /* 802EADC4 002E7D24 38 00 00 00 */ li r0, 0 /* 802EADC8 002E7D28 98 1F 00 54 */ stb r0, 0x54(r31) @@ -4021,7 +4021,7 @@ lbl_802EADC4: /* 802EADD0 002E7D30 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802EADD4 002E7D34 7C 08 03 A6 */ mtlr r0 /* 802EADD8 002E7D38 38 21 00 20 */ addi r1, r1, 0x20 -/* 802EADDC 002E7D3C 4E 80 00 20 */ blr +/* 802EADDC 002E7D3C 4E 80 00 20 */ blr .global SetReverb__Q211CSfxManager18CSfxEmitterWrapperFc SetReverb__Q211CSfxManager18CSfxEmitterWrapperFc: @@ -4039,7 +4039,7 @@ SetReverb__Q211CSfxManager18CSfxEmitterWrapperFc: /* 802EAE0C 002E7D6C 81 9E 00 00 */ lwz r12, 0(r30) /* 802EAE10 002E7D70 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 802EAE14 002E7D74 7D 89 03 A6 */ mtctr r12 -/* 802EAE18 002E7D78 4E 80 04 21 */ bctrl +/* 802EAE18 002E7D78 4E 80 04 21 */ bctrl /* 802EAE1C 002E7D7C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802EAE20 002E7D80 41 82 00 08 */ beq lbl_802EAE28 /* 802EAE24 002E7D84 9B FE 00 1A */ stb r31, 0x1a(r30) @@ -4049,7 +4049,7 @@ lbl_802EAE28: /* 802EAE30 002E7D90 83 C1 00 08 */ lwz r30, 8(r1) /* 802EAE34 002E7D94 7C 08 03 A6 */ mtlr r0 /* 802EAE38 002E7D98 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EAE3C 002E7D9C 4E 80 00 20 */ blr +/* 802EAE3C 002E7D9C 4E 80 00 20 */ blr .global __ct__Q211CSfxManager18CSfxEmitterWrapperFbsRQ29CAudioSys18C3DEmitterParmData10CSfxHandlebi __ct__Q211CSfxManager18CSfxEmitterWrapperFbsRQ29CAudioSys18C3DEmitterParmData10CSfxHandlebi: @@ -4107,94 +4107,94 @@ __ct__Q211CSfxManager18CSfxEmitterWrapperFbsRQ29CAudioSys18C3DEmitterParmData10C /* 802EAF0C 002E7E6C 80 01 00 24 */ lwz r0, 0x24(r1) /* 802EAF10 002E7E70 7C 08 03 A6 */ mtlr r0 /* 802EAF14 002E7E74 38 21 00 20 */ addi r1, r1, 0x20 -/* 802EAF18 002E7E78 4E 80 00 20 */ blr +/* 802EAF18 002E7E78 4E 80 00 20 */ blr .global GetArea__Q211CSfxManager15CBaseSfxWrapperCFv GetArea__Q211CSfxManager15CBaseSfxWrapperCFv: /* 802EAF1C 002E7E7C 80 63 00 10 */ lwz r3, 0x10(r3) -/* 802EAF20 002E7E80 4E 80 00 20 */ blr +/* 802EAF20 002E7E80 4E 80 00 20 */ blr .global GetSfxHandle__Q211CSfxManager15CBaseSfxWrapperCFv GetSfxHandle__Q211CSfxManager15CBaseSfxWrapperCFv: /* 802EAF24 002E7E84 80 04 00 0C */ lwz r0, 0xc(r4) /* 802EAF28 002E7E88 90 03 00 00 */ stw r0, 0(r3) -/* 802EAF2C 002E7E8C 4E 80 00 20 */ blr +/* 802EAF2C 002E7E8C 4E 80 00 20 */ blr .global GetPriority__Q211CSfxManager15CBaseSfxWrapperCFv GetPriority__Q211CSfxManager15CBaseSfxWrapperCFv: /* 802EAF30 002E7E90 A8 63 00 0A */ lha r3, 0xa(r3) -/* 802EAF34 002E7E94 4E 80 00 20 */ blr +/* 802EAF34 002E7E94 4E 80 00 20 */ blr .global GetRank__Q211CSfxManager15CBaseSfxWrapperCFv GetRank__Q211CSfxManager15CBaseSfxWrapperCFv: /* 802EAF38 002E7E98 A8 63 00 08 */ lha r3, 8(r3) -/* 802EAF3C 002E7E9C 4E 80 00 20 */ blr +/* 802EAF3C 002E7E9C 4E 80 00 20 */ blr .global UseAcoustics__Q211CSfxManager15CBaseSfxWrapperCFv UseAcoustics__Q211CSfxManager15CBaseSfxWrapperCFv: /* 802EAF40 002E7EA0 88 03 00 14 */ lbz r0, 0x14(r3) /* 802EAF44 002E7EA4 54 03 F7 FE */ rlwinm r3, r0, 0x1e, 0x1f, 0x1f -/* 802EAF48 002E7EA8 4E 80 00 20 */ blr +/* 802EAF48 002E7EA8 4E 80 00 20 */ blr .global IsActive__Q211CSfxManager15CBaseSfxWrapperCFv IsActive__Q211CSfxManager15CBaseSfxWrapperCFv: /* 802EAF4C 002E7EAC 88 03 00 14 */ lbz r0, 0x14(r3) /* 802EAF50 002E7EB0 54 03 CF FE */ rlwinm r3, r0, 0x19, 0x1f, 0x1f -/* 802EAF54 002E7EB4 4E 80 00 20 */ blr +/* 802EAF54 002E7EB4 4E 80 00 20 */ blr .global IsPlaying__Q211CSfxManager15CBaseSfxWrapperCFv IsPlaying__Q211CSfxManager15CBaseSfxWrapperCFv: /* 802EAF58 002E7EB8 88 03 00 14 */ lbz r0, 0x14(r3) /* 802EAF5C 002E7EBC 54 03 D7 FE */ rlwinm r3, r0, 0x1a, 0x1f, 0x1f -/* 802EAF60 002E7EC0 4E 80 00 20 */ blr +/* 802EAF60 002E7EC0 4E 80 00 20 */ blr .global IsInArea__Q211CSfxManager15CBaseSfxWrapperCFv IsInArea__Q211CSfxManager15CBaseSfxWrapperCFv: /* 802EAF64 002E7EC4 88 03 00 14 */ lbz r0, 0x14(r3) /* 802EAF68 002E7EC8 54 03 E7 FE */ rlwinm r3, r0, 0x1c, 0x1f, 0x1f -/* 802EAF6C 002E7ECC 4E 80 00 20 */ blr +/* 802EAF6C 002E7ECC 4E 80 00 20 */ blr .global IsLooped__Q211CSfxManager15CBaseSfxWrapperCFv IsLooped__Q211CSfxManager15CBaseSfxWrapperCFv: /* 802EAF70 002E7ED0 88 03 00 14 */ lbz r0, 0x14(r3) /* 802EAF74 002E7ED4 54 03 DF FE */ rlwinm r3, r0, 0x1b, 0x1f, 0x1f -/* 802EAF78 002E7ED8 4E 80 00 20 */ blr +/* 802EAF78 002E7ED8 4E 80 00 20 */ blr .global SetRank__Q211CSfxManager15CBaseSfxWrapperFs SetRank__Q211CSfxManager15CBaseSfxWrapperFs: /* 802EAF7C 002E7EDC B0 83 00 08 */ sth r4, 8(r3) -/* 802EAF80 002E7EE0 4E 80 00 20 */ blr +/* 802EAF80 002E7EE0 4E 80 00 20 */ blr .global SetInArea__Q211CSfxManager15CBaseSfxWrapperFb SetInArea__Q211CSfxManager15CBaseSfxWrapperFb: /* 802EAF84 002E7EE4 88 03 00 14 */ lbz r0, 0x14(r3) /* 802EAF88 002E7EE8 50 80 26 F6 */ rlwimi r0, r4, 4, 0x1b, 0x1b /* 802EAF8C 002E7EEC 98 03 00 14 */ stb r0, 0x14(r3) -/* 802EAF90 002E7EF0 4E 80 00 20 */ blr +/* 802EAF90 002E7EF0 4E 80 00 20 */ blr .global SetPlaying__Q211CSfxManager15CBaseSfxWrapperFb SetPlaying__Q211CSfxManager15CBaseSfxWrapperFb: /* 802EAF94 002E7EF4 88 03 00 14 */ lbz r0, 0x14(r3) /* 802EAF98 002E7EF8 50 80 36 72 */ rlwimi r0, r4, 6, 0x19, 0x19 /* 802EAF9C 002E7EFC 98 03 00 14 */ stb r0, 0x14(r3) -/* 802EAFA0 002E7F00 4E 80 00 20 */ blr +/* 802EAFA0 002E7F00 4E 80 00 20 */ blr .global SetActive__Q211CSfxManager15CBaseSfxWrapperFb SetActive__Q211CSfxManager15CBaseSfxWrapperFb: /* 802EAFA4 002E7F04 88 03 00 14 */ lbz r0, 0x14(r3) /* 802EAFA8 002E7F08 50 80 3E 30 */ rlwimi r0, r4, 7, 0x18, 0x18 /* 802EAFAC 002E7F0C 98 03 00 14 */ stb r0, 0x14(r3) -/* 802EAFB0 002E7F10 4E 80 00 20 */ blr +/* 802EAFB0 002E7F10 4E 80 00 20 */ blr .global SetTimeRemaining__Q211CSfxManager15CBaseSfxWrapperFf SetTimeRemaining__Q211CSfxManager15CBaseSfxWrapperFf: /* 802EAFB4 002E7F14 D0 23 00 04 */ stfs f1, 4(r3) -/* 802EAFB8 002E7F18 4E 80 00 20 */ blr +/* 802EAFB8 002E7F18 4E 80 00 20 */ blr .global GetTimeRemaining__Q211CSfxManager15CBaseSfxWrapperFv GetTimeRemaining__Q211CSfxManager15CBaseSfxWrapperFv: /* 802EAFBC 002E7F1C C0 23 00 04 */ lfs f1, 4(r3) -/* 802EAFC0 002E7F20 4E 80 00 20 */ blr +/* 802EAFC0 002E7F20 4E 80 00 20 */ blr .global Release__Q211CSfxManager15CBaseSfxWrapperFv Release__Q211CSfxManager15CBaseSfxWrapperFv: @@ -4204,13 +4204,13 @@ Release__Q211CSfxManager15CBaseSfxWrapperFv: /* 802EAFD0 002E7F30 C0 02 C6 24 */ lfs f0, lbl_805AE344@sda21(r2) /* 802EAFD4 002E7F34 98 03 00 14 */ stb r0, 0x14(r3) /* 802EAFD8 002E7F38 D0 03 00 04 */ stfs f0, 4(r3) -/* 802EAFDC 002E7F3C 4E 80 00 20 */ blr +/* 802EAFDC 002E7F3C 4E 80 00 20 */ blr .global Available__Q211CSfxManager15CBaseSfxWrapperCFv Available__Q211CSfxManager15CBaseSfxWrapperCFv: /* 802EAFE0 002E7F40 88 03 00 14 */ lbz r0, 0x14(r3) /* 802EAFE4 002E7F44 54 03 EF FE */ rlwinm r3, r0, 0x1d, 0x1f, 0x1f -/* 802EAFE8 002E7F48 4E 80 00 20 */ blr +/* 802EAFE8 002E7F48 4E 80 00 20 */ blr .global __ct__Q211CSfxManager15CBaseSfxWrapperFbs10CSfxHandlebi __ct__Q211CSfxManager15CBaseSfxWrapperFbs10CSfxHandlebi: @@ -4244,7 +4244,7 @@ __ct__Q211CSfxManager15CBaseSfxWrapperFbs10CSfxHandlebi: /* 802EB058 002E7FB8 88 03 00 14 */ lbz r0, 0x14(r3) /* 802EB05C 002E7FBC 50 E0 17 7A */ rlwimi r0, r7, 2, 0x1d, 0x1d /* 802EB060 002E7FC0 98 03 00 14 */ stb r0, 0x14(r3) -/* 802EB064 002E7FC4 4E 80 00 20 */ blr +/* 802EB064 002E7FC4 4E 80 00 20 */ blr .global "reserve__Q24rstl36vectorFi" "reserve__Q24rstl36vectorFi": @@ -4315,7 +4315,7 @@ lbl_802EB138: /* 802EB144 002E80A4 83 A1 00 24 */ lwz r29, 0x24(r1) /* 802EB148 002E80A8 7C 08 03 A6 */ mtlr r0 /* 802EB14C 002E80AC 38 21 00 30 */ addi r1, r1, 0x30 -/* 802EB150 002E80B0 4E 80 00 20 */ blr +/* 802EB150 002E80B0 4E 80 00 20 */ blr .global __sinit_CSfxManager_cpp __sinit_CSfxManager_cpp: @@ -4366,7 +4366,7 @@ __sinit_CSfxManager_cpp: /* 802EB204 002E8164 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802EB208 002E8168 7C 08 03 A6 */ mtlr r0 /* 802EB20C 002E816C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EB210 002E8170 4E 80 00 20 */ blr +/* 802EB210 002E8170 4E 80 00 20 */ blr .global "__dt__Q24rstl49reserved_vectorFv" "__dt__Q24rstl49reserved_vectorFv": @@ -4389,7 +4389,7 @@ lbl_802EB248: /* 802EB250 002E81B0 81 9E 00 00 */ lwz r12, 0(r30) /* 802EB254 002E81B4 81 8C 00 08 */ lwz r12, 8(r12) /* 802EB258 002E81B8 7D 89 03 A6 */ mtctr r12 -/* 802EB25C 002E81BC 4E 80 04 21 */ bctrl +/* 802EB25C 002E81BC 4E 80 04 21 */ bctrl /* 802EB260 002E81C0 3B DE 00 28 */ addi r30, r30, 0x28 /* 802EB264 002E81C4 3B FF 00 01 */ addi r31, r31, 1 lbl_802EB268: @@ -4411,7 +4411,7 @@ lbl_802EB28C: /* 802EB2A0 002E8200 83 81 00 10 */ lwz r28, 0x10(r1) /* 802EB2A4 002E8204 7C 08 03 A6 */ mtlr r0 /* 802EB2A8 002E8208 38 21 00 20 */ addi r1, r1, 0x20 -/* 802EB2AC 002E820C 4E 80 00 20 */ blr +/* 802EB2AC 002E820C 4E 80 00 20 */ blr .global "__dt__Q24rstl56reserved_vectorFv" "__dt__Q24rstl56reserved_vectorFv": @@ -4434,7 +4434,7 @@ lbl_802EB2E4: /* 802EB2EC 002E824C 81 9E 00 00 */ lwz r12, 0(r30) /* 802EB2F0 002E8250 81 8C 00 08 */ lwz r12, 8(r12) /* 802EB2F4 002E8254 7D 89 03 A6 */ mtctr r12 -/* 802EB2F8 002E8258 4E 80 04 21 */ bctrl +/* 802EB2F8 002E8258 4E 80 04 21 */ bctrl /* 802EB2FC 002E825C 3B DE 00 58 */ addi r30, r30, 0x58 /* 802EB300 002E8260 3B FF 00 01 */ addi r31, r31, 1 lbl_802EB304: @@ -4456,7 +4456,7 @@ lbl_802EB328: /* 802EB33C 002E829C 83 81 00 10 */ lwz r28, 0x10(r1) /* 802EB340 002E82A0 7C 08 03 A6 */ mtlr r0 /* 802EB344 002E82A4 38 21 00 20 */ addi r1, r1, 0x20 -/* 802EB348 002E82A8 4E 80 00 20 */ blr +/* 802EB348 002E82A8 4E 80 00 20 */ blr .global __arraydtor$2309 __arraydtor$2309: @@ -4473,7 +4473,7 @@ __arraydtor$2309: /* 802EB374 002E82D4 80 01 00 14 */ lwz r0, 0x14(r1) /* 802EB378 002E82D8 7C 08 03 A6 */ mtlr r0 /* 802EB37C 002E82DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EB380 002E82E0 4E 80 00 20 */ blr +/* 802EB380 002E82E0 4E 80 00 20 */ blr .global __dt__Q211CSfxManager11CSfxChannelFv __dt__Q211CSfxManager11CSfxChannelFv: @@ -4521,7 +4521,7 @@ lbl_802EB408: /* 802EB410 002E8370 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802EB414 002E8374 7C 08 03 A6 */ mtlr r0 /* 802EB418 002E8378 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EB41C 002E837C 4E 80 00 20 */ blr +/* 802EB41C 002E837C 4E 80 00 20 */ blr .global __ct__Q211CSfxManager11CSfxChannelFv __ct__Q211CSfxManager11CSfxChannelFv: diff --git a/asm/Kyoto/Audio/CStaticAudioPlayer.s b/asm/Kyoto/Audio/CStaticAudioPlayer.s index c6a5f97f..e679477b 100644 --- a/asm/Kyoto/Audio/CStaticAudioPlayer.s +++ b/asm/Kyoto/Audio/CStaticAudioPlayer.s @@ -26,7 +26,7 @@ lbl_8036BC44: /* 8036BC4C 00368BAC 38 85 81 10 */ addi r4, r5, lbl_803D8110@l /* 8036BC50 00368BB0 7C 04 02 2E */ lhzx r0, r4, r0 /* 8036BC54 00368BB4 B0 03 00 C0 */ sth r0, 0xc0(r3) -/* 8036BC58 00368BB8 4E 80 00 20 */ blr +/* 8036BC58 00368BB8 4E 80 00 20 */ blr .global DecodeMonoAndMix__18CStaticAudioPlayerCFv DecodeMonoAndMix__18CStaticAudioPlayerCFv: @@ -142,7 +142,7 @@ lbl_8036BDD4: /* 8036BDE0 00368D40 80 01 00 54 */ lwz r0, 0x54(r1) /* 8036BDE4 00368D44 7C 08 03 A6 */ mtlr r0 /* 8036BDE8 00368D48 38 21 00 50 */ addi r1, r1, 0x50 -/* 8036BDEC 00368D4C 4E 80 00 20 */ blr +/* 8036BDEC 00368D4C 4E 80 00 20 */ blr .global Decode__18CStaticAudioPlayerFv Decode__18CStaticAudioPlayerFv: @@ -221,7 +221,7 @@ lbl_8036BEF8: /* 8036BF04 00368E64 80 01 00 44 */ lwz r0, 0x44(r1) /* 8036BF08 00368E68 7C 08 03 A6 */ mtlr r0 /* 8036BF0C 00368E6C 38 21 00 40 */ addi r1, r1, 0x40 -/* 8036BF10 00368E70 4E 80 00 20 */ blr +/* 8036BF10 00368E70 4E 80 00 20 */ blr .global DoMix__18CStaticAudioPlayer DoMix__18CStaticAudioPlayer: @@ -274,7 +274,7 @@ lbl_8036BF88: /* 8036BFC0 00368F20 83 81 00 10 */ lwz r28, 0x10(r1) /* 8036BFC4 00368F24 7C 08 03 A6 */ mtlr r0 /* 8036BFC8 00368F28 38 21 00 20 */ addi r1, r1, 0x20 -/* 8036BFCC 00368F2C 4E 80 00 20 */ blr +/* 8036BFCC 00368F2C 4E 80 00 20 */ blr .global MixCallback__18CStaticAudioPlayerFv MixCallback__18CStaticAudioPlayerFv: @@ -286,7 +286,7 @@ MixCallback__18CStaticAudioPlayerFv: /* 8036BFE4 00368F44 80 01 00 14 */ lwz r0, 0x14(r1) /* 8036BFE8 00368F48 7C 08 03 A6 */ mtlr r0 /* 8036BFEC 00368F4C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8036BFF0 00368F50 4E 80 00 20 */ blr +/* 8036BFF0 00368F50 4E 80 00 20 */ blr .global StopMixOut__18CStaticAudioPlayerFv StopMixOut__18CStaticAudioPlayerFv: @@ -305,7 +305,7 @@ lbl_8036C020: /* 8036C020 00368F80 80 01 00 14 */ lwz r0, 0x14(r1) /* 8036C024 00368F84 7C 08 03 A6 */ mtlr r0 /* 8036C028 00368F88 38 21 00 10 */ addi r1, r1, 0x10 -/* 8036C02C 00368F8C 4E 80 00 20 */ blr +/* 8036C02C 00368F8C 4E 80 00 20 */ blr .global StartMixOut__18CStaticAudioPlayerFv StartMixOut__18CStaticAudioPlayerFv: @@ -341,7 +341,7 @@ lbl_8036C07C: /* 8036C0A0 00369000 38 80 00 01 */ li r4, 1 /* 8036C0A4 00369004 81 8C 00 08 */ lwz r12, 8(r12) /* 8036C0A8 00369008 7D 89 03 A6 */ mtctr r12 -/* 8036C0AC 0036900C 4E 80 04 21 */ bctrl +/* 8036C0AC 0036900C 4E 80 04 21 */ bctrl lbl_8036C0B0: /* 8036C0B0 00369010 3B DE 00 08 */ addi r30, r30, 8 lbl_8036C0B4: @@ -365,7 +365,7 @@ lbl_8036C0E8: /* 8036C0F4 00369054 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8036C0F8 00369058 7C 08 03 A6 */ mtlr r0 /* 8036C0FC 0036905C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8036C100 00369060 4E 80 00 20 */ blr +/* 8036C100 00369060 4E 80 00 20 */ blr .global IsReady__18CStaticAudioPlayer IsReady__18CStaticAudioPlayer: @@ -383,7 +383,7 @@ IsReady__18CStaticAudioPlayer: /* 8036C130 00369090 81 83 00 00 */ lwz r12, 0(r3) /* 8036C134 00369094 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8036C138 00369098 7D 89 03 A6 */ mtctr r12 -/* 8036C13C 0036909C 4E 80 04 21 */ bctrl +/* 8036C13C 0036909C 4E 80 04 21 */ bctrl /* 8036C140 003690A0 48 00 00 08 */ b lbl_8036C148 lbl_8036C144: /* 8036C144 003690A4 38 60 00 01 */ li r3, 1 @@ -391,7 +391,7 @@ lbl_8036C148: /* 8036C148 003690A8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8036C14C 003690AC 7C 08 03 A6 */ mtlr r0 /* 8036C150 003690B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8036C154 003690B4 4E 80 00 20 */ blr +/* 8036C154 003690B4 4E 80 00 20 */ blr .global __dt__18CStaticAudioPlayer __dt__18CStaticAudioPlayer: @@ -442,7 +442,7 @@ lbl_8036C1EC: /* 8036C1F8 00369158 83 C1 00 08 */ lwz r30, 8(r1) /* 8036C1FC 0036915C 7C 08 03 A6 */ mtlr r0 /* 8036C200 00369160 38 21 00 10 */ addi r1, r1, 0x10 -/* 8036C204 00369164 4E 80 00 20 */ blr +/* 8036C204 00369164 4E 80 00 20 */ blr .global sub_8036c208 sub_8036c208: @@ -478,7 +478,7 @@ lbl_8036C254: /* 8036C278 003691D8 38 80 00 01 */ li r4, 1 /* 8036C27C 003691DC 81 8C 00 08 */ lwz r12, 8(r12) /* 8036C280 003691E0 7D 89 03 A6 */ mtctr r12 -/* 8036C284 003691E4 4E 80 04 21 */ bctrl +/* 8036C284 003691E4 4E 80 04 21 */ bctrl lbl_8036C288: /* 8036C288 003691E8 3B DE 00 08 */ addi r30, r30, 8 lbl_8036C28C: @@ -502,7 +502,7 @@ lbl_8036C2B4: /* 8036C2C8 00369228 83 81 00 20 */ lwz r28, 0x20(r1) /* 8036C2CC 0036922C 7C 08 03 A6 */ mtlr r0 /* 8036C2D0 00369230 38 21 00 30 */ addi r1, r1, 0x30 -/* 8036C2D4 00369234 4E 80 00 20 */ blr +/* 8036C2D4 00369234 4E 80 00 20 */ blr .global __ct__18CStaticAudioPlayerFRCQ24rstl12basic_stringii __ct__18CStaticAudioPlayerFRCQ24rstl12basic_stringii: @@ -691,7 +691,7 @@ lbl_8036C568: /* 8036C590 003694F0 38 80 00 01 */ li r4, 1 /* 8036C594 003694F4 81 8C 00 08 */ lwz r12, 8(r12) /* 8036C598 003694F8 7D 89 03 A6 */ mtctr r12 -/* 8036C59C 003694FC 4E 80 04 21 */ bctrl +/* 8036C59C 003694FC 4E 80 04 21 */ bctrl lbl_8036C5A0: /* 8036C5A0 00369500 88 01 00 28 */ lbz r0, 0x28(r1) /* 8036C5A4 00369504 28 00 00 00 */ cmplwi r0, 0 @@ -711,7 +711,7 @@ lbl_8036C5B8: /* 8036C5D4 00369534 80 01 00 74 */ lwz r0, 0x74(r1) /* 8036C5D8 00369538 7C 08 03 A6 */ mtlr r0 /* 8036C5DC 0036953C 38 21 00 70 */ addi r1, r1, 0x70 -/* 8036C5E0 00369540 4E 80 00 20 */ blr +/* 8036C5E0 00369540 4E 80 00 20 */ blr .global sub_8036c5e4 sub_8036c5e4: @@ -778,7 +778,7 @@ lbl_8036C698: /* 8036C6BC 0036961C 38 80 00 01 */ li r4, 1 /* 8036C6C0 00369620 81 8C 00 08 */ lwz r12, 8(r12) /* 8036C6C4 00369624 7D 89 03 A6 */ mtctr r12 -/* 8036C6C8 00369628 4E 80 04 21 */ bctrl +/* 8036C6C8 00369628 4E 80 04 21 */ bctrl lbl_8036C6CC: /* 8036C6CC 0036962C 3B 7B 00 08 */ addi r27, r27, 8 lbl_8036C6D0: @@ -796,7 +796,7 @@ lbl_8036C6F0: /* 8036C6F4 00369654 80 01 00 34 */ lwz r0, 0x34(r1) /* 8036C6F8 00369658 7C 08 03 A6 */ mtlr r0 /* 8036C6FC 0036965C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8036C700 00369660 4E 80 00 20 */ blr +/* 8036C700 00369660 4E 80 00 20 */ blr .global sub_8036c704 sub_8036c704: @@ -859,7 +859,7 @@ lbl_8036C7BC: /* 8036C7CC 0036972C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8036C7D0 00369730 7C 08 03 A6 */ mtlr r0 /* 8036C7D4 00369734 38 21 00 20 */ addi r1, r1, 0x20 -/* 8036C7D8 00369738 4E 80 00 20 */ blr +/* 8036C7D8 00369738 4E 80 00 20 */ blr .global RunDMACallback__18CStaticAudioPlayerFv RunDMACallback__18CStaticAudioPlayerFv: @@ -907,7 +907,7 @@ lbl_8036C85C: /* 8036C86C 003697CC 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8036C870 003697D0 7C 08 03 A6 */ mtlr r0 /* 8036C874 003697D4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8036C878 003697D8 4E 80 00 20 */ blr +/* 8036C878 003697D8 4E 80 00 20 */ blr .global sub_8036c87c sub_8036c87c: @@ -919,7 +919,7 @@ sub_8036c87c: /* 8036C890 003697F0 93 A1 00 14 */ stw r29, 0x14(r1) /* 8036C894 003697F4 81 8D AA EC */ lwz r12, lbl_805A96AC@sda21(r13) /* 8036C898 003697F8 7D 89 03 A6 */ mtctr r12 -/* 8036C89C 003697FC 4E 80 04 21 */ bctrl +/* 8036C89C 003697FC 4E 80 04 21 */ bctrl /* 8036C8A0 00369800 3C 60 80 54 */ lis r3, lbl_80540A2C@ha /* 8036C8A4 00369804 3B A0 00 00 */ li r29, 0 /* 8036C8A8 00369808 3B E3 0A 2C */ addi r31, r3, lbl_80540A2C@l @@ -928,7 +928,7 @@ sub_8036c87c: lbl_8036C8B4: /* 8036C8B4 00369814 81 9E 00 00 */ lwz r12, 0(r30) /* 8036C8B8 00369818 7D 89 03 A6 */ mtctr r12 -/* 8036C8BC 0036981C 4E 80 04 21 */ bctrl +/* 8036C8BC 0036981C 4E 80 04 21 */ bctrl /* 8036C8C0 00369820 3B DE 00 04 */ addi r30, r30, 4 /* 8036C8C4 00369824 3B BD 00 01 */ addi r29, r29, 1 lbl_8036C8C8: @@ -941,7 +941,7 @@ lbl_8036C8C8: /* 8036C8E0 00369840 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8036C8E4 00369844 7C 08 03 A6 */ mtlr r0 /* 8036C8E8 00369848 38 21 00 20 */ addi r1, r1, 0x20 -/* 8036C8EC 0036984C 4E 80 00 20 */ blr +/* 8036C8EC 0036984C 4E 80 00 20 */ blr .global sub_8036c8f0 sub_8036c8f0: @@ -987,7 +987,7 @@ lbl_8036C978: /* 8036C984 003698E4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8036C988 003698E8 7C 08 03 A6 */ mtlr r0 /* 8036C98C 003698EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8036C990 003698F0 4E 80 00 20 */ blr +/* 8036C990 003698F0 4E 80 00 20 */ blr .global __sinit_CStaticAudioPlayer_cpp __sinit_CStaticAudioPlayer_cpp: @@ -1050,4 +1050,4 @@ lbl_8036CA4C: /* 8036CA54 003699B4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8036CA58 003699B8 7C 08 03 A6 */ mtlr r0 /* 8036CA5C 003699BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8036CA60 003699C0 4E 80 00 20 */ blr +/* 8036CA60 003699C0 4E 80 00 20 */ blr diff --git a/asm/Kyoto/Audio/CStreamAudioManager.s b/asm/Kyoto/Audio/CStreamAudioManager.s index b59fd91d..2b383746 100644 --- a/asm/Kyoto/Audio/CStreamAudioManager.s +++ b/asm/Kyoto/Audio/CStreamAudioManager.s @@ -61,7 +61,7 @@ lbl_80365414: /* 80365414 00362374 38 00 00 04 */ li r0, 4 /* 80365418 00362378 D0 0D AA C4 */ stfs f0, lbl_805A9684@sda21(r13) /* 8036541C 0036237C 90 0D 9E 70 */ stw r0, lbl_805A8A30@sda21(r13) -/* 80365420 00362380 4E 80 00 20 */ blr +/* 80365420 00362380 4E 80 00 20 */ blr .global sub_80365424 sub_80365424: @@ -77,7 +77,7 @@ lbl_80365440: /* 80365440 003623A0 38 00 00 06 */ li r0, 6 /* 80365444 003623A4 D0 4D AA C8 */ stfs f2, lbl_805A9688@sda21(r13) /* 80365448 003623A8 90 0D 9E 70 */ stw r0, lbl_805A8A30@sda21(r13) -/* 8036544C 003623AC 4E 80 00 20 */ blr +/* 8036544C 003623AC 4E 80 00 20 */ blr .global sub_80365450 sub_80365450: @@ -135,7 +135,7 @@ lbl_8036550C: /* 80365514 00362474 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80365518 00362478 7C 08 03 A6 */ mtlr r0 /* 8036551C 0036247C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80365520 00362480 4E 80 00 20 */ blr +/* 80365520 00362480 4E 80 00 20 */ blr .global sub_80365524 sub_80365524: @@ -149,7 +149,7 @@ sub_80365524: /* 80365540 003624A0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80365544 003624A4 7C 08 03 A6 */ mtlr r0 /* 80365548 003624A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8036554C 003624AC 4E 80 00 20 */ blr +/* 8036554C 003624AC 4E 80 00 20 */ blr .global InternalSetVolume__19CStreamAudioManagerFf InternalSetVolume__19CStreamAudioManagerFf: @@ -182,7 +182,7 @@ lbl_803655B4: /* 803655B4 00362514 80 01 00 24 */ lwz r0, 0x24(r1) /* 803655B8 00362518 7C 08 03 A6 */ mtlr r0 /* 803655BC 0036251C 38 21 00 20 */ addi r1, r1, 0x20 -/* 803655C0 00362520 4E 80 00 20 */ blr +/* 803655C0 00362520 4E 80 00 20 */ blr .global HandleMusicUnmute__19CStreamAudioManagerFv HandleMusicUnmute__19CStreamAudioManagerFv: @@ -195,7 +195,7 @@ HandleMusicUnmute__19CStreamAudioManagerFv: /* 803655DC 0036253C 80 01 00 14 */ lwz r0, 0x14(r1) /* 803655E0 00362540 7C 08 03 A6 */ mtlr r0 /* 803655E4 00362544 38 21 00 10 */ addi r1, r1, 0x10 -/* 803655E8 00362548 4E 80 00 20 */ blr +/* 803655E8 00362548 4E 80 00 20 */ blr .global StopAllStreams__19CStreamAudioManagerFv StopAllStreams__19CStreamAudioManagerFv: @@ -266,7 +266,7 @@ lbl_80365618: /* 803656E8 00362648 83 A1 00 64 */ lwz r29, 0x64(r1) /* 803656EC 0036264C 7C 08 03 A6 */ mtlr r0 /* 803656F0 00362650 38 21 00 70 */ addi r1, r1, 0x70 -/* 803656F4 00362654 4E 80 00 20 */ blr +/* 803656F4 00362654 4E 80 00 20 */ blr .global sub_803656f8 sub_803656f8: @@ -292,7 +292,7 @@ lbl_80365730: /* 8036573C 0036269C 83 C1 00 08 */ lwz r30, 8(r1) /* 80365740 003626A0 7C 08 03 A6 */ mtlr r0 /* 80365744 003626A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80365748 003626A8 4E 80 00 20 */ blr +/* 80365748 003626A8 4E 80 00 20 */ blr .global HandleMusicMute__19CStreamAudioManagerFv HandleMusicMute__19CStreamAudioManagerFv: @@ -323,7 +323,7 @@ lbl_803657A8: /* 803657A8 00362708 80 01 00 24 */ lwz r0, 0x24(r1) /* 803657AC 0036270C 7C 08 03 A6 */ mtlr r0 /* 803657B0 00362710 38 21 00 20 */ addi r1, r1, 0x20 -/* 803657B4 00362714 4E 80 00 20 */ blr +/* 803657B4 00362714 4E 80 00 20 */ blr .global StopOneShot__19CStreamAudioManagerFv StopOneShot__19CStreamAudioManagerFv: @@ -385,7 +385,7 @@ StopOneShot__19CStreamAudioManagerFv: /* 80365894 003627F4 80 01 00 64 */ lwz r0, 0x64(r1) /* 80365898 003627F8 7C 08 03 A6 */ mtlr r0 /* 8036589C 003627FC 38 21 00 60 */ addi r1, r1, 0x60 -/* 803658A0 00362800 4E 80 00 20 */ blr +/* 803658A0 00362800 4E 80 00 20 */ blr .global StopAll__19CStreamAudioManagerFv StopAll__19CStreamAudioManagerFv: @@ -397,7 +397,7 @@ StopAll__19CStreamAudioManagerFv: /* 803658B8 00362818 80 01 00 14 */ lwz r0, 0x14(r1) /* 803658BC 0036281C 7C 08 03 A6 */ mtlr r0 /* 803658C0 00362820 38 21 00 10 */ addi r1, r1, 0x10 -/* 803658C4 00362824 4E 80 00 20 */ blr +/* 803658C4 00362824 4E 80 00 20 */ blr .global SetMusicUnmute__19CStreamAudioManagerFb SetMusicUnmute__19CStreamAudioManagerFb: @@ -419,7 +419,7 @@ lbl_803658FC: /* 803658FC 0036285C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80365900 00362860 7C 08 03 A6 */ mtlr r0 /* 80365904 00362864 38 21 00 10 */ addi r1, r1, 0x10 -/* 80365908 00362868 4E 80 00 20 */ blr +/* 80365908 00362868 4E 80 00 20 */ blr .global sub_8036590c sub_8036590c: @@ -482,7 +482,7 @@ lbl_803659DC: /* 803659DC 0036293C 80 01 00 24 */ lwz r0, 0x24(r1) /* 803659E0 00362940 7C 08 03 A6 */ mtlr r0 /* 803659E4 00362944 38 21 00 20 */ addi r1, r1, 0x20 -/* 803659E8 00362948 4E 80 00 20 */ blr +/* 803659E8 00362948 4E 80 00 20 */ blr .global AreStringsNotEqual__21CStreamedAudioManagerFPCcPCc AreStringsNotEqual__21CStreamedAudioManagerFPCcPCc: @@ -497,16 +497,16 @@ AreStringsNotEqual__21CStreamedAudioManagerFPCcPCc: /* 80365A0C 0036296C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80365A10 00362970 7C 08 03 A6 */ mtlr r0 /* 80365A14 00362974 38 21 00 10 */ addi r1, r1, 0x10 -/* 80365A18 00362978 4E 80 00 20 */ blr +/* 80365A18 00362978 4E 80 00 20 */ blr .global SetSfxVolume__21CStreamedAudioManagerFUc SetSfxVolume__21CStreamedAudioManagerFUc: /* 80365A1C 0036297C 2C 03 00 7F */ cmpwi r3, 0x7f /* 80365A20 00362980 90 6D 9E 7C */ stw r3, lbl_805A8A3C@sda21(r13) -/* 80365A24 00362984 4C 81 00 20 */ blelr +/* 80365A24 00362984 4C 81 00 20 */ blelr /* 80365A28 00362988 38 00 00 7F */ li r0, 0x7f /* 80365A2C 0036298C 90 0D 9E 7C */ stw r0, lbl_805A8A3C@sda21(r13) -/* 80365A30 00362990 4E 80 00 20 */ blr +/* 80365A30 00362990 4E 80 00 20 */ blr .global SetMusicVolume__19CStreamAudioManagerFi SetMusicVolume__19CStreamAudioManagerFi: @@ -524,7 +524,7 @@ lbl_80365A54: /* 80365A5C 003629BC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80365A60 003629C0 7C 08 03 A6 */ mtlr r0 /* 80365A64 003629C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80365A68 003629C8 4E 80 00 20 */ blr +/* 80365A68 003629C8 4E 80 00 20 */ blr .global "SetCurrentAudio__19CStreamAudioManagerFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>fUc" "SetCurrentAudio__19CStreamAudioManagerFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>fUc": @@ -617,7 +617,7 @@ lbl_80365B90: /* 80365BA8 00362B08 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80365BAC 00362B0C 7C 08 03 A6 */ mtlr r0 /* 80365BB0 00362B10 38 21 00 40 */ addi r1, r1, 0x40 -/* 80365BB4 00362B14 4E 80 00 20 */ blr +/* 80365BB4 00362B14 4E 80 00 20 */ blr .global "SetDefaultAudio__19CStreamAudioManagerFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>fUc" "SetDefaultAudio__19CStreamAudioManagerFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>fUc": @@ -648,7 +648,7 @@ lbl_80365B90: /* 80365C18 00362B78 83 C1 00 08 */ lwz r30, 8(r1) /* 80365C1C 00362B7C 7C 08 03 A6 */ mtlr r0 /* 80365C20 00362B80 38 21 00 20 */ addi r1, r1, 0x20 -/* 80365C24 00362B84 4E 80 00 20 */ blr +/* 80365C24 00362B84 4E 80 00 20 */ blr .global Update__19CStreamAudioManagerFf Update__19CStreamAudioManagerFf: @@ -747,7 +747,7 @@ lbl_80365D60: /* 80365D70 00362CD0 CB E1 00 10 */ lfd f31, 0x10(r1) /* 80365D74 00362CD4 7C 08 03 A6 */ mtlr r0 /* 80365D78 00362CD8 38 21 00 20 */ addi r1, r1, 0x20 -/* 80365D7C 00362CDC 4E 80 00 20 */ blr +/* 80365D7C 00362CDC 4E 80 00 20 */ blr .global Start__19CStreamAudioManagerFiRCQ24rstl6stringib Start__19CStreamAudioManagerFiRCQ24rstl6stringib: @@ -901,7 +901,7 @@ lbl_80365FA0: /* 80365FB4 00362F14 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 80365FB8 00362F18 7C 08 03 A6 */ mtlr r0 /* 80365FBC 00362F1C 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 80365FC0 00362F20 4E 80 00 20 */ blr +/* 80365FC0 00362F20 4E 80 00 20 */ blr .global Stop__19CStreamAudioManagerFiRCQ24rstl6string Stop__19CStreamAudioManagerFiRCQ24rstl6string: @@ -982,7 +982,7 @@ lbl_803660CC: /* 803660DC 0036303C 83 81 00 40 */ lwz r28, 0x40(r1) /* 803660E0 00363040 7C 08 03 A6 */ mtlr r0 /* 803660E4 00363044 38 21 00 50 */ addi r1, r1, 0x50 -/* 803660E8 00363048 4E 80 00 20 */ blr +/* 803660E8 00363048 4E 80 00 20 */ blr .global FadeBackIn__19CStreamAudioManagerFif FadeBackIn__19CStreamAudioManagerFif: @@ -992,13 +992,13 @@ FadeBackIn__19CStreamAudioManagerFif: /* 803660F8 00363058 7C 60 22 14 */ add r3, r0, r4 /* 803660FC 0036305C 80 03 00 10 */ lwz r0, 0x10(r3) /* 80366100 00363060 2C 00 00 02 */ cmpwi r0, 2 -/* 80366104 00363064 4D 82 00 20 */ beqlr +/* 80366104 00363064 4D 82 00 20 */ beqlr /* 80366108 00363068 2C 00 00 00 */ cmpwi r0, 0 -/* 8036610C 0036306C 4D 82 00 20 */ beqlr +/* 8036610C 0036306C 4D 82 00 20 */ beqlr /* 80366110 00363070 D0 23 00 18 */ stfs f1, 0x18(r3) /* 80366114 00363074 38 00 00 01 */ li r0, 1 /* 80366118 00363078 90 03 00 10 */ stw r0, 0x10(r3) -/* 8036611C 0036307C 4E 80 00 20 */ blr +/* 8036611C 0036307C 4E 80 00 20 */ blr .global TemporaryFadeOut__19CStreamAudioManagerFif TemporaryFadeOut__19CStreamAudioManagerFif: @@ -1008,18 +1008,18 @@ TemporaryFadeOut__19CStreamAudioManagerFif: /* 8036612C 0036308C 7C 60 22 14 */ add r3, r0, r4 /* 80366130 00363090 80 03 00 10 */ lwz r0, 0x10(r3) /* 80366134 00363094 2C 00 00 03 */ cmpwi r0, 3 -/* 80366138 00363098 4D 82 00 20 */ beqlr +/* 80366138 00363098 4D 82 00 20 */ beqlr /* 8036613C 0036309C 2C 00 00 00 */ cmpwi r0, 0 /* 80366140 003630A0 40 82 00 08 */ bne lbl_80366148 .global sub_80366144 sub_80366144: -/* 80366144 003630A4 4E 80 00 20 */ blr +/* 80366144 003630A4 4E 80 00 20 */ blr lbl_80366148: /* 80366148 003630A8 D0 23 00 1C */ stfs f1, 0x1c(r3) /* 8036614C 003630AC 38 00 00 04 */ li r0, 4 /* 80366150 003630B0 90 03 00 10 */ stw r0, 0x10(r3) -/* 80366154 003630B4 4E 80 00 20 */ blr +/* 80366154 003630B4 4E 80 00 20 */ blr .global UpdateDSPStreamers__19CStreamAudioManagerFf UpdateDSPStreamers__19CStreamAudioManagerFf: @@ -1037,7 +1037,7 @@ UpdateDSPStreamers__19CStreamAudioManagerFf: /* 80366184 003630E4 CB E1 00 08 */ lfd f31, 8(r1) /* 80366188 003630E8 7C 08 03 A6 */ mtlr r0 /* 8036618C 003630EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80366190 003630F0 4E 80 00 20 */ blr +/* 80366190 003630F0 4E 80 00 20 */ blr .global StopStreaming__19CStreamAudioManagerFi StopStreaming__19CStreamAudioManagerFi: @@ -1061,7 +1061,7 @@ StopStreaming__19CStreamAudioManagerFi: /* 803661D8 00363138 80 01 00 14 */ lwz r0, 0x14(r1) /* 803661DC 0036313C 7C 08 03 A6 */ mtlr r0 /* 803661E0 00363140 38 21 00 10 */ addi r1, r1, 0x10 -/* 803661E4 00363144 4E 80 00 20 */ blr +/* 803661E4 00363144 4E 80 00 20 */ blr .global UpdateDSP__19CStreamAudioManagerFif UpdateDSP__19CStreamAudioManagerFif: @@ -1227,7 +1227,7 @@ lbl_8036641C: /* 80366434 00363394 83 C1 00 48 */ lwz r30, 0x48(r1) /* 80366438 00363398 7C 08 03 A6 */ mtlr r0 /* 8036643C 0036339C 38 21 00 70 */ addi r1, r1, 0x70 -/* 80366440 003633A0 4E 80 00 20 */ blr +/* 80366440 003633A0 4E 80 00 20 */ blr .global GetTargetDSPVolume__19CStreamAudioManagerFcb GetTargetDSPVolume__19CStreamAudioManagerFcb: @@ -1245,10 +1245,10 @@ GetTargetDSPVolume__19CStreamAudioManagerFcb: /* 80366470 003633D0 7C 00 36 70 */ srawi r0, r0, 6 /* 80366474 003633D4 54 03 0F FE */ srwi r3, r0, 0x1f /* 80366478 003633D8 7C 60 1A 14 */ add r3, r0, r3 -/* 8036647C 003633DC 4E 80 00 20 */ blr +/* 8036647C 003633DC 4E 80 00 20 */ blr lbl_80366480: /* 80366480 003633E0 38 60 00 00 */ li r3, 0 -/* 80366484 003633E4 4E 80 00 20 */ blr +/* 80366484 003633E4 4E 80 00 20 */ blr lbl_80366488: /* 80366488 003633E8 88 0D 9E 81 */ lbz r0, lbl_805A8A41@sda21(r13) /* 8036648C 003633EC 28 00 00 00 */ cmplwi r0, 0 @@ -1262,10 +1262,10 @@ lbl_80366488: /* 803664AC 0036340C 7C 00 36 70 */ srawi r0, r0, 6 /* 803664B0 00363410 54 03 0F FE */ srwi r3, r0, 0x1f /* 803664B4 00363414 7C 60 1A 14 */ add r3, r0, r3 -/* 803664B8 00363418 4E 80 00 20 */ blr +/* 803664B8 00363418 4E 80 00 20 */ blr lbl_803664BC: /* 803664BC 0036341C 38 60 00 00 */ li r3, 0 -/* 803664C0 00363420 4E 80 00 20 */ blr +/* 803664C0 00363420 4E 80 00 20 */ blr .global __ct__20SDSPStreamCacheEntryFiRCQ24rstl6stringiffib __ct__20SDSPStreamCacheEntryFiRCQ24rstl6stringiffib: @@ -1303,7 +1303,7 @@ __ct__20SDSPStreamCacheEntryFiRCQ24rstl6stringiffib: /* 80366540 003634A0 80 01 00 44 */ lwz r0, 0x44(r1) /* 80366544 003634A4 7C 08 03 A6 */ mtlr r0 /* 80366548 003634A8 38 21 00 40 */ addi r1, r1, 0x40 -/* 8036654C 003634AC 4E 80 00 20 */ blr +/* 8036654C 003634AC 4E 80 00 20 */ blr .global __ct__20SDSPStreamCacheEntryFv __ct__20SDSPStreamCacheEntryFv: @@ -1337,7 +1337,7 @@ __ct__20SDSPStreamCacheEntryFv: /* 803665BC 0036351C 80 01 00 24 */ lwz r0, 0x24(r1) /* 803665C0 00363520 7C 08 03 A6 */ mtlr r0 /* 803665C4 00363524 38 21 00 20 */ addi r1, r1, 0x20 -/* 803665C8 00363528 4E 80 00 20 */ blr +/* 803665C8 00363528 4E 80 00 20 */ blr .global __sinit_CStreamAudioManager_cpp __sinit_CStreamAudioManager_cpp: @@ -1407,7 +1407,7 @@ __sinit_CStreamAudioManager_cpp: /* 803666C8 00363628 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803666CC 0036362C 7C 08 03 A6 */ mtlr r0 /* 803666D0 00363630 38 21 00 10 */ addi r1, r1, 0x10 -/* 803666D4 00363634 4E 80 00 20 */ blr +/* 803666D4 00363634 4E 80 00 20 */ blr .global sub_803666d8 sub_803666d8: @@ -1424,7 +1424,7 @@ sub_803666d8: /* 80366700 00363660 80 01 00 14 */ lwz r0, 0x14(r1) /* 80366704 00363664 7C 08 03 A6 */ mtlr r0 /* 80366708 00363668 38 21 00 10 */ addi r1, r1, 0x10 -/* 8036670C 0036366C 4E 80 00 20 */ blr +/* 8036670C 0036366C 4E 80 00 20 */ blr .global sub_80366710 sub_80366710: diff --git a/asm/Kyoto/Audio/DolphinCAudioGroupSet.s b/asm/Kyoto/Audio/DolphinCAudioGroupSet.s index f0576ab2..bdadd75d 100644 --- a/asm/Kyoto/Audio/DolphinCAudioGroupSet.s +++ b/asm/Kyoto/Audio/DolphinCAudioGroupSet.s @@ -43,7 +43,7 @@ lbl_8034A074: /* 8034A088 00346FE8 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8034A08C 00346FEC 7C 08 03 A6 */ mtlr r0 /* 8034A090 00346FF0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8034A094 00346FF4 4E 80 00 20 */ blr +/* 8034A094 00346FF4 4E 80 00 20 */ blr .global sub_8034a098 sub_8034a098: @@ -79,7 +79,7 @@ sub_8034a098: /* 8034A10C 0034706C 38 80 00 01 */ li r4, 1 /* 8034A110 00347070 81 8C 00 08 */ lwz r12, 8(r12) /* 8034A114 00347074 7D 89 03 A6 */ mtctr r12 -/* 8034A118 00347078 4E 80 04 21 */ bctrl +/* 8034A118 00347078 4E 80 04 21 */ bctrl lbl_8034A11C: /* 8034A11C 0034707C 88 01 00 10 */ lbz r0, 0x10(r1) /* 8034A120 00347080 28 00 00 00 */ cmplwi r0, 0 @@ -122,7 +122,7 @@ lbl_8034A194: /* 8034A1A0 00347100 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8034A1A4 00347104 7C 08 03 A6 */ mtlr r0 /* 8034A1A8 00347108 38 21 00 20 */ addi r1, r1, 0x20 -/* 8034A1AC 0034710C 4E 80 00 20 */ blr +/* 8034A1AC 0034710C 4E 80 00 20 */ blr .global sub_8034a1b0 sub_8034a1b0: @@ -193,7 +193,7 @@ lbl_8034A284: /* 8034A294 003471F4 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8034A298 003471F8 7C 08 03 A6 */ mtlr r0 /* 8034A29C 003471FC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8034A2A0 00347200 4E 80 00 20 */ blr +/* 8034A2A0 00347200 4E 80 00 20 */ blr .global sub_8034a2a4 sub_8034a2a4: @@ -207,7 +207,7 @@ sub_8034a2a4: /* 8034A2C0 00347220 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8034A2C4 00347224 7C 08 03 A6 */ mtlr r0 /* 8034A2C8 00347228 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034A2CC 0034722C 4E 80 00 20 */ blr +/* 8034A2CC 0034722C 4E 80 00 20 */ blr .global sub_8034a2d0 sub_8034a2d0: @@ -250,7 +250,7 @@ lbl_8034A340: /* 8034A35C 003472BC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8034A360 003472C0 7C 08 03 A6 */ mtlr r0 /* 8034A364 003472C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034A368 003472C8 4E 80 00 20 */ blr +/* 8034A368 003472C8 4E 80 00 20 */ blr .global sub_8034a36c sub_8034a36c: @@ -290,7 +290,7 @@ lbl_8034A3D8: /* 8034A3E4 00347344 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8034A3E8 00347348 7C 08 03 A6 */ mtlr r0 /* 8034A3EC 0034734C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8034A3F0 00347350 4E 80 00 20 */ blr +/* 8034A3F0 00347350 4E 80 00 20 */ blr .global __ct__15CAudioGrpSetLocFR12CInputStream __ct__15CAudioGrpSetLocFR12CInputStream: @@ -448,7 +448,7 @@ lbl_8034A5C0: /* 8034A644 003475A4 80 01 00 94 */ lwz r0, 0x94(r1) /* 8034A648 003475A8 7C 08 03 A6 */ mtlr r0 /* 8034A64C 003475AC 38 21 00 90 */ addi r1, r1, 0x90 -/* 8034A650 003475B0 4E 80 00 20 */ blr +/* 8034A650 003475B0 4E 80 00 20 */ blr .global FreeSampleBuffer__14CAudioGroupSetFv FreeSampleBuffer__14CAudioGroupSetFv: @@ -460,11 +460,11 @@ FreeSampleBuffer__14CAudioGroupSetFv: /* 8034A668 003475C8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8034A66C 003475CC 7C 08 03 A6 */ mtlr r0 /* 8034A670 003475D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034A674 003475D4 4E 80 00 20 */ blr +/* 8034A674 003475D4 4E 80 00 20 */ blr .global Reload__14CAudioGroupSetFv Reload__14CAudioGroupSetFv: -/* 8034A678 003475D8 4E 80 00 20 */ blr +/* 8034A678 003475D8 4E 80 00 20 */ blr .global __dt__14CAudioGroupSetFv __dt__14CAudioGroupSetFv: @@ -512,7 +512,7 @@ lbl_8034A700: /* 8034A70C 0034766C 83 C1 00 08 */ lwz r30, 8(r1) /* 8034A710 00347670 7C 08 03 A6 */ mtlr r0 /* 8034A714 00347674 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034A718 00347678 4E 80 00 20 */ blr +/* 8034A718 00347678 4E 80 00 20 */ blr .global "__ct__14CAudioGroupSetFRC31TLockedToken<15CAudioGrpSetLoc>" "__ct__14CAudioGroupSetFRC31TLockedToken<15CAudioGrpSetLoc>": diff --git a/asm/Kyoto/Audio/DolphinCAudioSys.s b/asm/Kyoto/Audio/DolphinCAudioSys.s index 46de462c..3e640dfe 100644 --- a/asm/Kyoto/Audio/DolphinCAudioSys.s +++ b/asm/Kyoto/Audio/DolphinCAudioSys.s @@ -120,13 +120,13 @@ lbl_805A95B8: .global lbl_805A95BC lbl_805A95BC: .skip 0x4 - + .section .text, "ax" .global sub_8034a7a4 sub_8034a7a4: /* 8034A7A4 00347704 88 6D 9D DE */ lbz r3, lbl_805A899E@sda21(r13) -/* 8034A7A8 00347708 4E 80 00 20 */ blr +/* 8034A7A8 00347708 4E 80 00 20 */ blr .global sub_8034a7ac sub_8034a7ac: @@ -151,27 +151,27 @@ lbl_8034A7EC: /* 8034A7EC 0034774C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8034A7F0 00347750 7C 08 03 A6 */ mtlr r0 /* 8034A7F4 00347754 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034A7F8 00347758 4E 80 00 20 */ blr +/* 8034A7F8 00347758 4E 80 00 20 */ blr .global GetDefaultVolumeScale__9CAudioSysFv GetDefaultVolumeScale__9CAudioSysFv: /* 8034A7FC 0034775C A8 6D 9D DC */ lha r3, lbl_805A899C@sda21(r13) -/* 8034A800 00347760 4E 80 00 20 */ blr +/* 8034A800 00347760 4E 80 00 20 */ blr .global SetDefaultVolumeScale__9CAudioSysFs SetDefaultVolumeScale__9CAudioSysFs: /* 8034A804 00347764 B0 6D 9D DC */ sth r3, lbl_805A899C@sda21(r13) -/* 8034A808 00347768 4E 80 00 20 */ blr +/* 8034A808 00347768 4E 80 00 20 */ blr .global SetVolumeScale__9CAudioSysFs SetVolumeScale__9CAudioSysFs: /* 8034A80C 0034776C B0 6D 9D DA */ sth r3, lbl_805A899A@sda21(r13) -/* 8034A810 00347770 4E 80 00 20 */ blr +/* 8034A810 00347770 4E 80 00 20 */ blr .global sub_8034a814 sub_8034a814: /* 8034A814 00347774 88 6D A9 D2 */ lbz r3, lbl_805A9592@sda21(r13) -/* 8034A818 00347778 4E 80 00 20 */ blr +/* 8034A818 00347778 4E 80 00 20 */ blr .global SetSurroundMode__9CAudioSysFQ29CAudioSys14ESurroundModes SetSurroundMode__9CAudioSysFQ29CAudioSys14ESurroundModes: @@ -209,7 +209,7 @@ lbl_8034A87C: /* 8034A884 003477E4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8034A888 003477E8 7C 08 03 A6 */ mtlr r0 /* 8034A88C 003477EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034A890 003477F0 4E 80 00 20 */ blr +/* 8034A890 003477F0 4E 80 00 20 */ blr .global SetStereoMode__9CAudioSysFb SetStereoMode__9CAudioSysFb: @@ -232,7 +232,7 @@ lbl_8034A8CC: /* 8034A8CC 0034782C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8034A8D0 00347830 7C 08 03 A6 */ mtlr r0 /* 8034A8D4 00347834 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034A8D8 00347838 4E 80 00 20 */ blr +/* 8034A8D8 00347838 4E 80 00 20 */ blr .global SeqVolume__9CAudioSysFUcUsUlUc SeqVolume__9CAudioSysFUcUsUlUc: @@ -246,7 +246,7 @@ SeqVolume__9CAudioSysFUcUsUlUc: /* 8034A8F8 00347858 80 01 00 14 */ lwz r0, 0x14(r1) /* 8034A8FC 0034785C 7C 08 03 A6 */ mtlr r0 /* 8034A900 00347860 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034A904 00347864 4E 80 00 20 */ blr +/* 8034A904 00347864 4E 80 00 20 */ blr .global SeqStop__9CAudioSysFUl SeqStop__9CAudioSysFUl: @@ -257,7 +257,7 @@ SeqStop__9CAudioSysFUl: /* 8034A918 00347878 80 01 00 14 */ lwz r0, 0x14(r1) /* 8034A91C 0034787C 7C 08 03 A6 */ mtlr r0 /* 8034A920 00347880 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034A924 00347884 4E 80 00 20 */ blr +/* 8034A924 00347884 4E 80 00 20 */ blr .global SeqPlayEx__9CAudioSysFUsUsPvP12SND_PLAYPARAUc SeqPlayEx__9CAudioSysFUsUsPvP12SND_PLAYPARAUc: @@ -271,7 +271,7 @@ SeqPlayEx__9CAudioSysFUsUsPvP12SND_PLAYPARAUc: /* 8034A944 003478A4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8034A948 003478A8 7C 08 03 A6 */ mtlr r0 /* 8034A94C 003478AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034A950 003478B0 4E 80 00 20 */ blr +/* 8034A950 003478B0 4E 80 00 20 */ blr .global S3dFindLowerPriorityHandle__9CAudioSysFUi S3dFindLowerPriorityHandle__9CAudioSysFUi: @@ -313,7 +313,7 @@ lbl_8034A9C8: /* 8034A9D0 00347930 83 C1 00 08 */ lwz r30, 8(r1) /* 8034A9D4 00347934 7C 08 03 A6 */ mtlr r0 /* 8034A9D8 00347938 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034A9DC 0034793C 4E 80 00 20 */ blr +/* 8034A9DC 0034793C 4E 80 00 20 */ blr .global S3dFindUnusedHandle__9CAudioSysFv S3dFindUnusedHandle__9CAudioSysFv: @@ -331,9 +331,9 @@ lbl_8034A9F0: /* 8034AA08 00347968 41 80 FF E8 */ blt lbl_8034A9F0 lbl_8034AA0C: /* 8034AA0C 0034796C 7C 03 28 00 */ cmpw r3, r5 -/* 8034AA10 00347970 4D 80 00 20 */ bltlr +/* 8034AA10 00347970 4D 80 00 20 */ bltlr /* 8034AA14 00347974 38 60 FF FF */ li r3, -1 -/* 8034AA18 00347978 4E 80 00 20 */ blr +/* 8034AA18 00347978 4E 80 00 20 */ blr .global S3dEmitterVoiceID__9CAudioSysFUi S3dEmitterVoiceID__9CAudioSysFUi: @@ -361,7 +361,7 @@ lbl_8034AA64: /* 8034AA64 003479C4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8034AA68 003479C8 7C 08 03 A6 */ mtlr r0 /* 8034AA6C 003479CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034AA70 003479D0 4E 80 00 20 */ blr +/* 8034AA70 003479D0 4E 80 00 20 */ blr .global S3dCheckEmitter__9CAudioSysFUi S3dCheckEmitter__9CAudioSysFUi: @@ -389,7 +389,7 @@ lbl_8034AABC: /* 8034AABC 00347A1C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8034AAC0 00347A20 7C 08 03 A6 */ mtlr r0 /* 8034AAC4 00347A24 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034AAC8 00347A28 4E 80 00 20 */ blr +/* 8034AAC8 00347A28 4E 80 00 20 */ blr .global S3dFlushUnusedEmitters__9CAudioSysFv S3dFlushUnusedEmitters__9CAudioSysFv: @@ -431,7 +431,7 @@ lbl_8034AB28: /* 8034AB4C 00347AAC 83 C1 00 08 */ lwz r30, 8(r1) /* 8034AB50 00347AB0 7C 08 03 A6 */ mtlr r0 /* 8034AB54 00347AB4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034AB58 00347AB8 4E 80 00 20 */ blr +/* 8034AB58 00347AB8 4E 80 00 20 */ blr .global S3dFlushAllEmitters__9CAudioSysFv S3dFlushAllEmitters__9CAudioSysFv: @@ -468,7 +468,7 @@ lbl_8034AB9C: /* 8034ABC8 00347B28 83 C1 00 08 */ lwz r30, 8(r1) /* 8034ABCC 00347B2C 7C 08 03 A6 */ mtlr r0 /* 8034ABD0 00347B30 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034ABD4 00347B34 4E 80 00 20 */ blr +/* 8034ABD4 00347B34 4E 80 00 20 */ blr .global S3dRemoveEmitter__9CAudioSysFUi S3dRemoveEmitter__9CAudioSysFUi: @@ -500,7 +500,7 @@ lbl_8034AC30: /* 8034AC30 00347B90 80 01 00 14 */ lwz r0, 0x14(r1) /* 8034AC34 00347B94 7C 08 03 A6 */ mtlr r0 /* 8034AC38 00347B98 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034AC3C 00347B9C 4E 80 00 20 */ blr +/* 8034AC3C 00347B9C 4E 80 00 20 */ blr .global S3dUpdateEmitter__9CAudioSysFUiRC9CVector3fRC9CVector3fUc S3dUpdateEmitter__9CAudioSysFUiRC9CVector3fRC9CVector3fUc: @@ -538,7 +538,7 @@ lbl_8034ACB4: /* 8034ACB4 00347C14 80 01 00 24 */ lwz r0, 0x24(r1) /* 8034ACB8 00347C18 7C 08 03 A6 */ mtlr r0 /* 8034ACBC 00347C1C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8034ACC0 00347C20 4E 80 00 20 */ blr +/* 8034ACC0 00347C20 4E 80 00 20 */ blr .global S3dAddEmitterParaEx__9CAudioSysFRCQ29CAudioSys18C3DEmitterParmDataUsP18SND_PARAMETER_INFO S3dAddEmitterParaEx__9CAudioSysFRCQ29CAudioSys18C3DEmitterParmDataUsP18SND_PARAMETER_INFO: @@ -639,7 +639,7 @@ lbl_8034AE24: /* 8034AE28 00347D88 80 01 00 44 */ lwz r0, 0x44(r1) /* 8034AE2C 00347D8C 7C 08 03 A6 */ mtlr r0 /* 8034AE30 00347D90 38 21 00 40 */ addi r1, r1, 0x40 -/* 8034AE34 00347D94 4E 80 00 20 */ blr +/* 8034AE34 00347D94 4E 80 00 20 */ blr .global S3dRemoveListener__9CAudioSysFv S3dRemoveListener__9CAudioSysFv: @@ -660,7 +660,7 @@ lbl_8034AE68: /* 8034AE68 00347DC8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8034AE6C 00347DCC 7C 08 03 A6 */ mtlr r0 /* 8034AE70 00347DD0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034AE74 00347DD4 4E 80 00 20 */ blr +/* 8034AE74 00347DD4 4E 80 00 20 */ blr .global S3dUpdateListener__9CAudioSysFRC9CVector3fRC9CVector3fRC9CVector3fRC9CVector3fUc S3dUpdateListener__9CAudioSysFRC9CVector3fRC9CVector3fRC9CVector3fRC9CVector3fUc: @@ -710,7 +710,7 @@ lbl_8034AF1C: /* 8034AF1C 00347E7C 80 01 00 44 */ lwz r0, 0x44(r1) /* 8034AF20 00347E80 7C 08 03 A6 */ mtlr r0 /* 8034AF24 00347E84 38 21 00 40 */ addi r1, r1, 0x40 -/* 8034AF28 00347E88 4E 80 00 20 */ blr +/* 8034AF28 00347E88 4E 80 00 20 */ blr .global S3dAddListener__9CAudioSysFRC9CVector3fRC9CVector3fRC9CVector3fRC9CVector3ffffUiUc S3dAddListener__9CAudioSysFRC9CVector3fRC9CVector3fRC9CVector3fRC9CVector3ffffUiUc: @@ -790,7 +790,7 @@ lbl_8034AF90: /* 8034B04C 00347FAC 80 01 00 94 */ lwz r0, 0x94(r1) /* 8034B050 00347FB0 7C 08 03 A6 */ mtlr r0 /* 8034B054 00347FB4 38 21 00 90 */ addi r1, r1, 0x90 -/* 8034B058 00347FB8 4E 80 00 20 */ blr +/* 8034B058 00347FB8 4E 80 00 20 */ blr .global "FindTrack__9CAudioSysFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" "FindTrack__9CAudioSysFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>": @@ -850,7 +850,7 @@ lbl_8034B118: /* 8034B11C 0034807C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8034B120 00348080 7C 08 03 A6 */ mtlr r0 /* 8034B124 00348084 38 21 00 20 */ addi r1, r1, 0x20 -/* 8034B128 00348088 4E 80 00 20 */ blr +/* 8034B128 00348088 4E 80 00 20 */ blr .global sub_8034b12c sub_8034b12c: @@ -872,7 +872,7 @@ sub_8034b12c: /* 8034B168 003480C8 83 C1 00 08 */ lwz r30, 8(r1) /* 8034B16C 003480CC 7C 08 03 A6 */ mtlr r0 /* 8034B170 003480D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034B174 003480D4 4E 80 00 20 */ blr +/* 8034B174 003480D4 4E 80 00 20 */ blr .global sub_8034b178 sub_8034b178: @@ -929,7 +929,7 @@ lbl_8034B214: /* 8034B224 00348184 83 81 00 10 */ lwz r28, 0x10(r1) /* 8034B228 00348188 7C 08 03 A6 */ mtlr r0 /* 8034B22C 0034818C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8034B230 00348190 4E 80 00 20 */ blr +/* 8034B230 00348190 4E 80 00 20 */ blr .global TrkNextTrack__9CAudioSysFv TrkNextTrack__9CAudioSysFv: @@ -940,7 +940,7 @@ TrkNextTrack__9CAudioSysFv: /* 8034B244 003481A4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8034B248 003481A8 7C 08 03 A6 */ mtlr r0 /* 8034B24C 003481AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034B250 003481B0 4E 80 00 20 */ blr +/* 8034B250 003481B0 4E 80 00 20 */ blr .global TrkSetVolume__9CAudioSysFUcUc TrkSetVolume__9CAudioSysFUcUc: @@ -953,7 +953,7 @@ TrkSetVolume__9CAudioSysFUcUc: /* 8034B26C 003481CC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8034B270 003481D0 7C 08 03 A6 */ mtlr r0 /* 8034B274 003481D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034B278 003481D8 4E 80 00 20 */ blr +/* 8034B278 003481D8 4E 80 00 20 */ blr .global TrkGetState__9CAudioSysFv TrkGetState__9CAudioSysFv: @@ -964,7 +964,7 @@ TrkGetState__9CAudioSysFv: /* 8034B28C 003481EC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8034B290 003481F0 7C 08 03 A6 */ mtlr r0 /* 8034B294 003481F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034B298 003481F8 4E 80 00 20 */ blr +/* 8034B298 003481F8 4E 80 00 20 */ blr .global TrkSetState__9CAudioSysF13ETRKPlayState TrkSetState__9CAudioSysF13ETRKPlayState: @@ -975,7 +975,7 @@ TrkSetState__9CAudioSysF13ETRKPlayState: /* 8034B2AC 0034820C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8034B2B0 00348210 7C 08 03 A6 */ mtlr r0 /* 8034B2B4 00348214 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034B2B8 00348218 4E 80 00 20 */ blr +/* 8034B2B8 00348218 4E 80 00 20 */ blr .global TrkSetRepeatMode__9CAudioSysF14ETRKRepeatMode TrkSetRepeatMode__9CAudioSysF14ETRKRepeatMode: @@ -986,7 +986,7 @@ TrkSetRepeatMode__9CAudioSysF14ETRKRepeatMode: /* 8034B2CC 0034822C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8034B2D0 00348230 7C 08 03 A6 */ mtlr r0 /* 8034B2D4 00348234 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034B2D8 00348238 4E 80 00 20 */ blr +/* 8034B2D8 00348238 4E 80 00 20 */ blr .global TrkSetSampleRate__9CAudioSysF14ETRKSampleRate TrkSetSampleRate__9CAudioSysF14ETRKSampleRate: @@ -997,7 +997,7 @@ TrkSetSampleRate__9CAudioSysF14ETRKSampleRate: /* 8034B2EC 0034824C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8034B2F0 00348250 7C 08 03 A6 */ mtlr r0 /* 8034B2F4 00348254 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034B2F8 00348258 4E 80 00 20 */ blr +/* 8034B2F8 00348258 4E 80 00 20 */ blr .global TrkFlushTracks__9CAudioSysFv TrkFlushTracks__9CAudioSysFv: @@ -1028,7 +1028,7 @@ lbl_8034B350: /* 8034B354 003482B4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8034B358 003482B8 7C 08 03 A6 */ mtlr r0 /* 8034B35C 003482BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034B360 003482C0 4E 80 00 20 */ blr +/* 8034B360 003482C0 4E 80 00 20 */ blr .global "TrkQueueTrack__9CAudioSysFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>PFUl_vUi" "TrkQueueTrack__9CAudioSysFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>PFUl_vUi": @@ -1149,7 +1149,7 @@ lbl_8034B500: /* 8034B510 00348470 83 81 00 40 */ lwz r28, 0x40(r1) /* 8034B514 00348474 7C 08 03 A6 */ mtlr r0 /* 8034B518 00348478 38 21 00 50 */ addi r1, r1, 0x50 -/* 8034B51C 0034847C 4E 80 00 20 */ blr +/* 8034B51C 0034847C 4E 80 00 20 */ blr .global SfxCtrl__9CAudioSysFUlUcUc SfxCtrl__9CAudioSysFUlUcUc: @@ -1160,7 +1160,7 @@ SfxCtrl__9CAudioSysFUlUcUc: /* 8034B530 00348490 80 01 00 14 */ lwz r0, 0x14(r1) /* 8034B534 00348494 7C 08 03 A6 */ mtlr r0 /* 8034B538 00348498 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034B53C 0034849C 4E 80 00 20 */ blr +/* 8034B53C 0034849C 4E 80 00 20 */ blr .global SfxPitchBend__9CAudioSysFUlUs SfxPitchBend__9CAudioSysFUlUs: @@ -1174,7 +1174,7 @@ SfxPitchBend__9CAudioSysFUlUs: /* 8034B55C 003484BC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8034B560 003484C0 7C 08 03 A6 */ mtlr r0 /* 8034B564 003484C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034B568 003484C8 4E 80 00 20 */ blr +/* 8034B568 003484C8 4E 80 00 20 */ blr .global SfxVolume__9CAudioSysFUlUc SfxVolume__9CAudioSysFUlUc: @@ -1188,7 +1188,7 @@ SfxVolume__9CAudioSysFUlUc: /* 8034B588 003484E8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8034B58C 003484EC 7C 08 03 A6 */ mtlr r0 /* 8034B590 003484F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034B594 003484F4 4E 80 00 20 */ blr +/* 8034B594 003484F4 4E 80 00 20 */ blr .global SfxSpan__9CAudioSysFUlUc SfxSpan__9CAudioSysFUlUc: @@ -1202,7 +1202,7 @@ SfxSpan__9CAudioSysFUlUc: /* 8034B5B4 00348514 80 01 00 14 */ lwz r0, 0x14(r1) /* 8034B5B8 00348518 7C 08 03 A6 */ mtlr r0 /* 8034B5BC 0034851C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034B5C0 00348520 4E 80 00 20 */ blr +/* 8034B5C0 00348520 4E 80 00 20 */ blr .global SfxCheck__9CAudioSysFUl SfxCheck__9CAudioSysFUl: @@ -1213,7 +1213,7 @@ SfxCheck__9CAudioSysFUl: /* 8034B5D4 00348534 80 01 00 14 */ lwz r0, 0x14(r1) /* 8034B5D8 00348538 7C 08 03 A6 */ mtlr r0 /* 8034B5DC 0034853C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034B5E0 00348540 4E 80 00 20 */ blr +/* 8034B5E0 00348540 4E 80 00 20 */ blr .global SfxStop__9CAudioSysFUl SfxStop__9CAudioSysFUl: @@ -1224,7 +1224,7 @@ SfxStop__9CAudioSysFUl: /* 8034B5F4 00348554 80 01 00 14 */ lwz r0, 0x14(r1) /* 8034B5F8 00348558 7C 08 03 A6 */ mtlr r0 /* 8034B5FC 0034855C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034B600 00348560 4E 80 00 20 */ blr +/* 8034B600 00348560 4E 80 00 20 */ blr .global SfxStart__9CAudioSysFUsUcUcUc SfxStart__9CAudioSysFUsUcUcUc: @@ -1254,7 +1254,7 @@ lbl_8034B62C: /* 8034B65C 003485BC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8034B660 003485C0 7C 08 03 A6 */ mtlr r0 /* 8034B664 003485C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034B668 003485C8 4E 80 00 20 */ blr +/* 8034B668 003485C8 4E 80 00 20 */ blr .global "FindGroupSet__9CAudioSysFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" "FindGroupSet__9CAudioSysFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>": @@ -1314,7 +1314,7 @@ lbl_8034B728: /* 8034B72C 0034868C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8034B730 00348690 7C 08 03 A6 */ mtlr r0 /* 8034B734 00348694 38 21 00 20 */ addi r1, r1, 0x20 -/* 8034B738 00348698 4E 80 00 20 */ blr +/* 8034B738 00348698 4E 80 00 20 */ blr .global sub_8034b73c sub_8034b73c: @@ -1336,7 +1336,7 @@ sub_8034b73c: /* 8034B778 003486D8 83 C1 00 08 */ lwz r30, 8(r1) /* 8034B77C 003486DC 7C 08 03 A6 */ mtlr r0 /* 8034B780 003486E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034B784 003486E4 4E 80 00 20 */ blr +/* 8034B784 003486E4 4E 80 00 20 */ blr .global sub_8034b788 sub_8034b788: @@ -1393,7 +1393,7 @@ lbl_8034B824: /* 8034B834 00348794 83 81 00 10 */ lwz r28, 0x10(r1) /* 8034B838 00348798 7C 08 03 A6 */ mtlr r0 /* 8034B83C 0034879C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8034B840 003487A0 4E 80 00 20 */ blr +/* 8034B840 003487A0 4E 80 00 20 */ blr .global SysGetGroupSetName__9CAudioSysFUi SysGetGroupSetName__9CAudioSysFUi: @@ -1449,7 +1449,7 @@ lbl_8034B8E0: /* 8034B8E4 00348844 38 63 67 CC */ addi r3, r3, lbl_805A67CC@l lbl_8034B8E8: /* 8034B8E8 00348848 38 21 00 20 */ addi r1, r1, 0x20 -/* 8034B8EC 0034884C 4E 80 00 20 */ blr +/* 8034B8EC 0034884C 4E 80 00 20 */ blr .global SysPopGroupFromARAM__9CAudioSysFv SysPopGroupFromARAM__9CAudioSysFv: @@ -1460,7 +1460,7 @@ SysPopGroupFromARAM__9CAudioSysFv: /* 8034B900 00348860 80 01 00 14 */ lwz r0, 0x14(r1) /* 8034B904 00348864 7C 08 03 A6 */ mtlr r0 /* 8034B908 00348868 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034B90C 0034886C 4E 80 00 20 */ blr +/* 8034B90C 0034886C 4E 80 00 20 */ blr .global "SysPushGroupIntoARAM__9CAudioSysFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>Uc" "SysPushGroupIntoARAM__9CAudioSysFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>Uc": @@ -1519,7 +1519,7 @@ lbl_8034B9D4: /* 8034B9D8 00348938 80 01 10 54 */ lwz r0, 0x1054(r1) /* 8034B9DC 0034893C 7C 08 03 A6 */ mtlr r0 /* 8034B9E0 00348940 38 21 10 50 */ addi r1, r1, 0x1050 -/* 8034B9E4 00348944 4E 80 00 20 */ blr +/* 8034B9E4 00348944 4E 80 00 20 */ blr .global sub_8034b9e8 sub_8034b9e8: @@ -1556,7 +1556,7 @@ lbl_8034BA24: /* 8034BA58 003489B8 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8034BA5C 003489BC 7C 08 03 A6 */ mtlr r0 /* 8034BA60 003489C0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8034BA64 003489C4 4E 80 00 20 */ blr +/* 8034BA64 003489C4 4E 80 00 20 */ blr .global "SysUnloadGroupSet__9CAudioSysFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" "SysUnloadGroupSet__9CAudioSysFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>": @@ -1671,7 +1671,7 @@ lbl_8034BBE8: /* 8034BBF4 00348B54 83 A1 00 34 */ lwz r29, 0x34(r1) /* 8034BBF8 00348B58 7C 08 03 A6 */ mtlr r0 /* 8034BBFC 00348B5C 38 21 00 40 */ addi r1, r1, 0x40 -/* 8034BC00 00348B60 4E 80 00 20 */ blr +/* 8034BC00 00348B60 4E 80 00 20 */ blr .global sub_8034bc04 sub_8034bc04: @@ -1742,7 +1742,7 @@ lbl_8034BCE4: /* 8034BCF4 00348C54 80 01 00 84 */ lwz r0, 0x84(r1) /* 8034BCF8 00348C58 7C 08 03 A6 */ mtlr r0 /* 8034BCFC 00348C5C 38 21 00 80 */ addi r1, r1, 0x80 -/* 8034BD00 00348C60 4E 80 00 20 */ blr +/* 8034BD00 00348C60 4E 80 00 20 */ blr .global sub_8034bd04 sub_8034bd04: @@ -1798,7 +1798,7 @@ lbl_8034BD90: /* 8034BDBC 00348D1C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8034BDC0 00348D20 7C 08 03 A6 */ mtlr r0 /* 8034BDC4 00348D24 38 21 00 20 */ addi r1, r1, 0x20 -/* 8034BDC8 00348D28 4E 80 00 20 */ blr +/* 8034BDC8 00348D28 4E 80 00 20 */ blr .global sub_8034bdcc sub_8034bdcc: @@ -1831,7 +1831,7 @@ sub_8034bdcc: /* 8034BE34 00348D94 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8034BE38 00348D98 7C 08 03 A6 */ mtlr r0 /* 8034BE3C 00348D9C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8034BE40 00348DA0 4E 80 00 20 */ blr +/* 8034BE40 00348DA0 4E 80 00 20 */ blr .global sub_8034be44 sub_8034be44: @@ -1853,7 +1853,7 @@ sub_8034be44: /* 8034BE80 00348DE0 83 C1 00 08 */ lwz r30, 8(r1) /* 8034BE84 00348DE4 7C 08 03 A6 */ mtlr r0 /* 8034BE88 00348DE8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034BE8C 00348DEC 4E 80 00 20 */ blr +/* 8034BE8C 00348DEC 4E 80 00 20 */ blr .global sub_8034be90 sub_8034be90: @@ -1892,7 +1892,7 @@ lbl_8034BEE8: /* 8034BF04 00348E64 83 81 00 10 */ lwz r28, 0x10(r1) /* 8034BF08 00348E68 7C 08 03 A6 */ mtlr r0 /* 8034BF0C 00348E6C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8034BF10 00348E70 4E 80 00 20 */ blr +/* 8034BF10 00348E70 4E 80 00 20 */ blr .global sub_8034bf14 sub_8034bf14: @@ -1914,7 +1914,7 @@ sub_8034bf14: /* 8034BF50 00348EB0 83 C1 00 08 */ lwz r30, 8(r1) /* 8034BF54 00348EB4 7C 08 03 A6 */ mtlr r0 /* 8034BF58 00348EB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034BF5C 00348EBC 4E 80 00 20 */ blr +/* 8034BF5C 00348EBC 4E 80 00 20 */ blr .global sub_8034bf60 sub_8034bf60: @@ -1953,7 +1953,7 @@ lbl_8034BFB8: /* 8034BFD4 00348F34 83 81 00 10 */ lwz r28, 0x10(r1) /* 8034BFD8 00348F38 7C 08 03 A6 */ mtlr r0 /* 8034BFDC 00348F3C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8034BFE0 00348F40 4E 80 00 20 */ blr +/* 8034BFE0 00348F40 4E 80 00 20 */ blr .global "SysUnloadSampleData__9CAudioSysFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" "SysUnloadSampleData__9CAudioSysFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>": @@ -1987,7 +1987,7 @@ lbl_8034C048: /* 8034C048 00348FA8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8034C04C 00348FAC 7C 08 03 A6 */ mtlr r0 /* 8034C050 00348FB0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034C054 00348FB4 4E 80 00 20 */ blr +/* 8034C054 00348FB4 4E 80 00 20 */ blr .global "SysIsGroupSetLoaded__9CAudioSysFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" "SysIsGroupSetLoaded__9CAudioSysFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>": @@ -2010,7 +2010,7 @@ lbl_8034C048: /* 8034C098 00348FF8 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8034C09C 00348FFC 7C 08 03 A6 */ mtlr r0 /* 8034C0A0 00349000 38 21 00 20 */ addi r1, r1, 0x20 -/* 8034C0A4 00349004 4E 80 00 20 */ blr +/* 8034C0A4 00349004 4E 80 00 20 */ blr .global "SysLoadGroupSet__9CAudioSysF30TLockedToken<14CAudioGroupSet>Q24rstl6stringUi" "SysLoadGroupSet__9CAudioSysF30TLockedToken<14CAudioGroupSet>Q24rstl6stringUi": @@ -2151,7 +2151,7 @@ lbl_8034C290: /* 8034C2A0 00349200 83 81 00 60 */ lwz r28, 0x60(r1) /* 8034C2A4 00349204 7C 08 03 A6 */ mtlr r0 /* 8034C2A8 00349208 38 21 00 70 */ addi r1, r1, 0x70 -/* 8034C2AC 0034920C 4E 80 00 20 */ blr +/* 8034C2AC 0034920C 4E 80 00 20 */ blr .global SysLoadGroupSet__9CAudioSysFP11CSimplePoolUi SysLoadGroupSet__9CAudioSysFP11CSimplePoolUi: @@ -2190,7 +2190,7 @@ SysLoadGroupSet__9CAudioSysFP11CSimplePoolUi: /* 8034C330 00349290 81 9D 00 00 */ lwz r12, 0(r29) /* 8034C334 00349294 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8034C338 00349298 7D 89 03 A6 */ mtctr r12 -/* 8034C33C 0034929C 4E 80 04 21 */ bctrl +/* 8034C33C 0034929C 4E 80 04 21 */ bctrl /* 8034C340 003492A0 3B A1 00 3C */ addi r29, r1, 0x3c /* 8034C344 003492A4 38 81 00 14 */ addi r4, r1, 0x14 /* 8034C348 003492A8 7F A3 EB 78 */ mr r3, r29 @@ -2304,7 +2304,7 @@ lbl_8034C4D0: /* 8034C4DC 0034943C 83 A1 00 74 */ lwz r29, 0x74(r1) /* 8034C4E0 00349440 7C 08 03 A6 */ mtlr r0 /* 8034C4E4 00349444 38 21 00 80 */ addi r1, r1, 0x80 -/* 8034C4E8 00349448 4E 80 00 20 */ blr +/* 8034C4E8 00349448 4E 80 00 20 */ blr .global SysSetSfxVolume__9CAudioSysFUcUsUcUc SysSetSfxVolume__9CAudioSysFUcUsUcUc: @@ -2319,7 +2319,7 @@ SysSetSfxVolume__9CAudioSysFUcUsUcUc: /* 8034C50C 0034946C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8034C510 00349470 7C 08 03 A6 */ mtlr r0 /* 8034C514 00349474 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034C518 00349478 4E 80 00 20 */ blr +/* 8034C518 00349478 4E 80 00 20 */ blr .global SysSetVolume__9CAudioSysFUcUsUc SysSetVolume__9CAudioSysFUcUsUc: @@ -2333,7 +2333,7 @@ SysSetVolume__9CAudioSysFUcUsUc: /* 8034C538 00349498 80 01 00 14 */ lwz r0, 0x14(r1) /* 8034C53C 0034949C 7C 08 03 A6 */ mtlr r0 /* 8034C540 003494A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034C544 003494A4 4E 80 00 20 */ blr +/* 8034C544 003494A4 4E 80 00 20 */ blr .global __dt__9CAudioSysFv __dt__9CAudioSysFv: @@ -2456,7 +2456,7 @@ lbl_8034C6D0: /* 8034C6E0 00349640 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8034C6E4 00349644 7C 08 03 A6 */ mtlr r0 /* 8034C6E8 00349648 38 21 00 30 */ addi r1, r1, 0x30 -/* 8034C6EC 0034964C 4E 80 00 20 */ blr +/* 8034C6EC 0034964C 4E 80 00 20 */ blr .global __ct__9CAudioSysFUcUcUcUcUi __ct__9CAudioSysFUcUcUcUcUi: @@ -2638,7 +2638,7 @@ lbl_8034C968: /* 8034C974 003498D4 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 8034C978 003498D8 7C 08 03 A6 */ mtlr r0 /* 8034C97C 003498DC 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8034C980 003498E0 4E 80 00 20 */ blr +/* 8034C980 003498E0 4E 80 00 20 */ blr .global DoFree__FPv DoFree__FPv: @@ -2652,7 +2652,7 @@ lbl_8034C99C: /* 8034C99C 003498FC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8034C9A0 00349900 7C 08 03 A6 */ mtlr r0 /* 8034C9A4 00349904 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034C9A8 00349908 4E 80 00 20 */ blr +/* 8034C9A8 00349908 4E 80 00 20 */ blr .global DoMalloc__FUl DoMalloc__FUl: @@ -2666,7 +2666,7 @@ DoMalloc__FUl: /* 8034C9C8 00349928 80 01 00 14 */ lwz r0, 0x14(r1) /* 8034C9CC 0034992C 7C 08 03 A6 */ mtlr r0 /* 8034C9D0 00349930 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034C9D4 00349934 4E 80 00 20 */ blr +/* 8034C9D4 00349934 4E 80 00 20 */ blr .global sub_8034c9d8 sub_8034c9d8: @@ -2693,7 +2693,7 @@ lbl_8034CA20: /* 8034CA24 00349984 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8034CA28 00349988 7C 08 03 A6 */ mtlr r0 /* 8034CA2C 0034998C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034CA30 00349990 4E 80 00 20 */ blr +/* 8034CA30 00349990 4E 80 00 20 */ blr .global sub_8034ca34 sub_8034ca34: @@ -2740,7 +2740,7 @@ lbl_8034CAB8: /* 8034CAC0 00349A20 83 C1 00 08 */ lwz r30, 8(r1) /* 8034CAC4 00349A24 7C 08 03 A6 */ mtlr r0 /* 8034CAC8 00349A28 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034CACC 00349A2C 4E 80 00 20 */ blr +/* 8034CACC 00349A2C 4E 80 00 20 */ blr .global sub_8034cad0 sub_8034cad0: @@ -2780,7 +2780,7 @@ lbl_8034CB3C: /* 8034CB44 00349AA4 83 C1 00 08 */ lwz r30, 8(r1) /* 8034CB48 00349AA8 7C 08 03 A6 */ mtlr r0 /* 8034CB4C 00349AAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034CB50 00349AB0 4E 80 00 20 */ blr +/* 8034CB50 00349AB0 4E 80 00 20 */ blr .global sub_8034cb54 sub_8034cb54: @@ -2827,7 +2827,7 @@ lbl_8034CBD8: /* 8034CBE0 00349B40 83 C1 00 08 */ lwz r30, 8(r1) /* 8034CBE4 00349B44 7C 08 03 A6 */ mtlr r0 /* 8034CBE8 00349B48 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034CBEC 00349B4C 4E 80 00 20 */ blr +/* 8034CBEC 00349B4C 4E 80 00 20 */ blr .global sub_8034cbf0 sub_8034cbf0: @@ -2851,7 +2851,7 @@ sub_8034cbf0: /* 8034CC34 00349B94 80 01 00 24 */ lwz r0, 0x24(r1) /* 8034CC38 00349B98 7C 08 03 A6 */ mtlr r0 /* 8034CC3C 00349B9C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8034CC40 00349BA0 4E 80 00 20 */ blr +/* 8034CC40 00349BA0 4E 80 00 20 */ blr .global sub_8034cc44 sub_8034cc44: @@ -2892,7 +2892,7 @@ lbl_8034CCA4: /* 8034CCBC 00349C1C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8034CCC0 00349C20 7C 08 03 A6 */ mtlr r0 /* 8034CCC4 00349C24 38 21 00 20 */ addi r1, r1, 0x20 -/* 8034CCC8 00349C28 4E 80 00 20 */ blr +/* 8034CCC8 00349C28 4E 80 00 20 */ blr .global "insert_into__Q24rstl488red_black_tree,Q24rstl17rmemory_allocator>,Q24rstl117pair,Q24rstl17rmemory_allocator>,Q24rstl26ncrc_ptr<14CAudioGroupSet>>,0,Q24rstl138select1st,Q24rstl17rmemory_allocator>,Q24rstl26ncrc_ptr<14CAudioGroupSet>>>,Q24rstl81less,Q24rstl17rmemory_allocator>>,Q24rstl17rmemory_allocator" "insert_into__Q24rstl488red_black_tree,Q24rstl17rmemory_allocator>,Q24rstl117pair,Q24rstl17rmemory_allocator>,Q24rstl26ncrc_ptr<14CAudioGroupSet>>,0,Q24rstl138select1st,Q24rstl17rmemory_allocator>,Q24rstl26ncrc_ptr<14CAudioGroupSet>>>,Q24rstl81less,Q24rstl17rmemory_allocator>>,Q24rstl17rmemory_allocator": @@ -3066,7 +3066,7 @@ lbl_8034CF38: /* 8034CF3C 00349E9C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8034CF40 00349EA0 7C 08 03 A6 */ mtlr r0 /* 8034CF44 00349EA4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8034CF48 00349EA8 4E 80 00 20 */ blr +/* 8034CF48 00349EA8 4E 80 00 20 */ blr .global "insert_into__Q24rstl273red_black_tree,Q24rstl17rmemory_allocator>>,0,Q24rstl104select1st,Q24rstl17rmemory_allocator>>>,Q24rstl8less,Q24rstl17rmemory_allocator>FPQ34rstl273red_black_tree,Q24rstl17rmemory_allocator>>,0,Q24rstl104select1st,Q24" "insert_into__Q24rstl273red_black_tree,Q24rstl17rmemory_allocator>>,0,Q24rstl104select1st,Q24rstl17rmemory_allocator>>>,Q24rstl8less,Q24rstl17rmemory_allocator>FPQ34rstl273red_black_tree,Q24rstl17rmemory_allocator>>,0,Q24rstl104select1st,Q24": @@ -3222,7 +3222,7 @@ lbl_8034D170: /* 8034D174 0034A0D4 80 01 00 24 */ lwz r0, 0x24(r1) /* 8034D178 0034A0D8 7C 08 03 A6 */ mtlr r0 /* 8034D17C 0034A0DC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8034D180 0034A0E0 4E 80 00 20 */ blr +/* 8034D180 0034A0E0 4E 80 00 20 */ blr .global sub_8034d184 sub_8034d184: @@ -3396,7 +3396,7 @@ lbl_8034D3F0: /* 8034D3F4 0034A354 80 01 00 24 */ lwz r0, 0x24(r1) /* 8034D3F8 0034A358 7C 08 03 A6 */ mtlr r0 /* 8034D3FC 0034A35C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8034D400 0034A360 4E 80 00 20 */ blr +/* 8034D400 0034A360 4E 80 00 20 */ blr .global sub_8034d404 sub_8034d404: @@ -3433,7 +3433,7 @@ lbl_8034D468: /* 8034D470 0034A3D0 83 C1 00 08 */ lwz r30, 8(r1) /* 8034D474 0034A3D4 7C 08 03 A6 */ mtlr r0 /* 8034D478 0034A3D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034D47C 0034A3DC 4E 80 00 20 */ blr +/* 8034D47C 0034A3DC 4E 80 00 20 */ blr .global __sinit_DolphinCAudioSys_cpp __sinit_DolphinCAudioSys_cpp: diff --git a/asm/Kyoto/Audio/SDSPStream.s b/asm/Kyoto/Audio/SDSPStream.s index 9077ddc5..42782729 100644 --- a/asm/Kyoto/Audio/SDSPStream.s +++ b/asm/Kyoto/Audio/SDSPStream.s @@ -172,7 +172,7 @@ lbl_8036A444: /* 8036A448 003673A8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8036A44C 003673AC 7C 08 03 A6 */ mtlr r0 /* 8036A450 003673B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8036A454 003673B4 4E 80 00 20 */ blr +/* 8036A454 003673B4 4E 80 00 20 */ blr .global InitializeStream__10SDSPStreamFv InitializeStream__10SDSPStreamFv: @@ -228,7 +228,7 @@ lbl_8036A50C: /* 8036A510 00367470 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8036A514 00367474 7C 08 03 A6 */ mtlr r0 /* 8036A518 00367478 38 21 00 10 */ addi r1, r1, 0x10 -/* 8036A51C 0036747C 4E 80 00 20 */ blr +/* 8036A51C 0036747C 4E 80 00 20 */ blr .global UpdateStream__10SDSPStreamFPviPvii UpdateStream__10SDSPStreamFPviPvii: @@ -268,7 +268,7 @@ lbl_8036A590: /* 8036A594 003674F4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8036A598 003674F8 7C 08 03 A6 */ mtlr r0 /* 8036A59C 003674FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8036A5A0 00367500 4E 80 00 20 */ blr +/* 8036A5A0 00367500 4E 80 00 20 */ blr .global BufferStream__10SDSPStreamFv BufferStream__10SDSPStreamFv: @@ -404,7 +404,7 @@ lbl_8036A758: /* 8036A770 003676D0 80 01 00 24 */ lwz r0, 0x24(r1) /* 8036A774 003676D4 7C 08 03 A6 */ mtlr r0 /* 8036A778 003676D8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8036A77C 003676DC 4E 80 00 20 */ blr +/* 8036A77C 003676DC 4E 80 00 20 */ blr .global StopStream__10SDSPStreamFv StopStream__10SDSPStreamFv: @@ -428,7 +428,7 @@ lbl_8036A7B8: /* 8036A7BC 0036771C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8036A7C0 00367720 7C 08 03 A6 */ mtlr r0 /* 8036A7C4 00367724 38 21 00 10 */ addi r1, r1, 0x10 -/* 8036A7C8 00367728 4E 80 00 20 */ blr +/* 8036A7C8 00367728 4E 80 00 20 */ blr .global IsStreamAvailable__10SDSPStreamFi IsStreamAvailable__10SDSPStreamFi: @@ -463,7 +463,7 @@ lbl_8036A824: /* 8036A838 00367798 83 C1 00 08 */ lwz r30, 8(r1) /* 8036A83C 0036779C 7C 08 03 A6 */ mtlr r0 /* 8036A840 003677A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8036A844 003677A4 4E 80 00 20 */ blr +/* 8036A844 003677A4 4E 80 00 20 */ blr .global IsStreamActive__10SDSPStreamFi IsStreamActive__10SDSPStreamFi: @@ -498,7 +498,7 @@ lbl_8036A8A0: /* 8036A8B4 00367814 83 C1 00 08 */ lwz r30, 8(r1) /* 8036A8B8 00367818 7C 08 03 A6 */ mtlr r0 /* 8036A8BC 0036781C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8036A8C0 00367820 4E 80 00 20 */ blr +/* 8036A8C0 00367820 4E 80 00 20 */ blr .global UpdateVolume__10SDSPStreamFi UpdateVolume__10SDSPStreamFi: @@ -545,7 +545,7 @@ lbl_8036A948: /* 8036A95C 003678BC 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8036A960 003678C0 7C 08 03 A6 */ mtlr r0 /* 8036A964 003678C4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8036A968 003678C8 4E 80 00 20 */ blr +/* 8036A968 003678C8 4E 80 00 20 */ blr .global UpdateStreamVolume__10SDSPStreamFi UpdateStreamVolume__10SDSPStreamFi: @@ -571,7 +571,7 @@ lbl_8036A9B4: /* 8036A9B4 00367914 80 01 00 14 */ lwz r0, 0x14(r1) /* 8036A9B8 00367918 7C 08 03 A6 */ mtlr r0 /* 8036A9BC 0036791C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8036A9C0 00367920 4E 80 00 20 */ blr +/* 8036A9C0 00367920 4E 80 00 20 */ blr .global Silence__10SDSPStreamFv Silence__10SDSPStreamFv: @@ -617,7 +617,7 @@ lbl_8036AA48: /* 8036AA58 003679B8 83 C1 00 08 */ lwz r30, 8(r1) /* 8036AA5C 003679BC 7C 08 03 A6 */ mtlr r0 /* 8036AA60 003679C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8036AA64 003679C4 4E 80 00 20 */ blr +/* 8036AA64 003679C4 4E 80 00 20 */ blr .global SilenceStream__10SDSPStreamFv SilenceStream__10SDSPStreamFv: @@ -646,7 +646,7 @@ lbl_8036AAB8: /* 8036AABC 00367A1C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8036AAC0 00367A20 7C 08 03 A6 */ mtlr r0 /* 8036AAC4 00367A24 38 21 00 10 */ addi r1, r1, 0x10 -/* 8036AAC8 00367A28 4E 80 00 20 */ blr +/* 8036AAC8 00367A28 4E 80 00 20 */ blr .global AllocateStereo__10SDSPStreamFRC11SStreamInfoRC11SStreamInfoci AllocateStereo__10SDSPStreamFRC11SStreamInfoRC11SStreamInfoci: @@ -732,7 +732,7 @@ lbl_8036ABF8: /* 8036ABFC 00367B5C 80 01 00 34 */ lwz r0, 0x34(r1) /* 8036AC00 00367B60 7C 08 03 A6 */ mtlr r0 /* 8036AC04 00367B64 38 21 00 30 */ addi r1, r1, 0x30 -/* 8036AC08 00367B68 4E 80 00 20 */ blr +/* 8036AC08 00367B68 4E 80 00 20 */ blr .global DeallocateStream__10SDSPStreamFv DeallocateStream__10SDSPStreamFv: @@ -778,7 +778,7 @@ lbl_8036AC98: /* 8036AC9C 00367BFC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8036ACA0 00367C00 7C 08 03 A6 */ mtlr r0 /* 8036ACA4 00367C04 38 21 00 10 */ addi r1, r1, 0x10 -/* 8036ACA8 00367C08 4E 80 00 20 */ blr +/* 8036ACA8 00367C08 4E 80 00 20 */ blr .global AllocateMono__10SDSPStreamFRC11SStreamInfocci AllocateMono__10SDSPStreamFRC11SStreamInfocci: @@ -831,7 +831,7 @@ lbl_8036AD58: /* 8036AD5C 00367CBC 80 01 00 34 */ lwz r0, 0x34(r1) /* 8036AD60 00367CC0 7C 08 03 A6 */ mtlr r0 /* 8036AD64 00367CC4 38 21 00 30 */ addi r1, r1, 0x30 -/* 8036AD68 00367CC8 4E 80 00 20 */ blr +/* 8036AD68 00367CC8 4E 80 00 20 */ blr .global AllocateStream__10SDSPStreamFi AllocateStream__10SDSPStreamFi: @@ -927,7 +927,7 @@ lbl_8036AEA8: /* 8036AEC0 00367E20 80 01 00 24 */ lwz r0, 0x24(r1) /* 8036AEC4 00367E24 7C 08 03 A6 */ mtlr r0 /* 8036AEC8 00367E28 38 21 00 20 */ addi r1, r1, 0x20 -/* 8036AECC 00367E2C 4E 80 00 20 */ blr +/* 8036AECC 00367E2C 4E 80 00 20 */ blr .global FreeAllStreams__10SDSPStreamFi FreeAllStreams__10SDSPStreamFi: @@ -953,7 +953,7 @@ lbl_8036AEF0: /* 8036AF18 00367E78 83 C1 00 08 */ lwz r30, 8(r1) /* 8036AF1C 00367E7C 7C 08 03 A6 */ mtlr r0 /* 8036AF20 00367E80 38 21 00 10 */ addi r1, r1, 0x10 -/* 8036AF24 00367E84 4E 80 00 20 */ blr +/* 8036AF24 00367E84 4E 80 00 20 */ blr .global Initialize__10SDSPStreamFv Initialize__10SDSPStreamFv: @@ -999,7 +999,7 @@ lbl_8036AF90: /* 8036AFB8 00367F18 80 01 00 34 */ lwz r0, 0x34(r1) /* 8036AFBC 00367F1C 7C 08 03 A6 */ mtlr r0 /* 8036AFC0 00367F20 38 21 00 30 */ addi r1, r1, 0x30 -/* 8036AFC4 00367F24 4E 80 00 20 */ blr +/* 8036AFC4 00367F24 4E 80 00 20 */ blr .global DoAllocateStream__10SDSPStreamFi DoAllocateStream__10SDSPStreamFi: @@ -1048,7 +1048,7 @@ DoAllocateStream__10SDSPStreamFi: /* 8036B070 00367FD0 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8036B074 00367FD4 7C 08 03 A6 */ mtlr r0 /* 8036B078 00367FD8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8036B07C 00367FDC 4E 80 00 20 */ blr +/* 8036B07C 00367FDC 4E 80 00 20 */ blr .global FindStreamIdx__10SDSPStreamFi FindStreamIdx__10SDSPStreamFi: @@ -1060,7 +1060,7 @@ FindStreamIdx__10SDSPStreamFi: /* 8036B094 00367FF4 7C 03 00 40 */ cmplw r3, r0 /* 8036B098 00367FF8 40 82 00 0C */ bne lbl_8036B0A4 /* 8036B09C 00367FFC 38 60 00 00 */ li r3, 0 -/* 8036B0A0 00368000 4E 80 00 20 */ blr +/* 8036B0A0 00368000 4E 80 00 20 */ blr lbl_8036B0A4: /* 8036B0A4 00368004 8C 04 00 F4 */ lbzu r0, 0xf4(r4) /* 8036B0A8 00368008 28 00 00 00 */ cmplwi r0, 0 @@ -1069,7 +1069,7 @@ lbl_8036B0A4: /* 8036B0B4 00368014 7C 03 00 40 */ cmplw r3, r0 /* 8036B0B8 00368018 40 82 00 0C */ bne lbl_8036B0C4 /* 8036B0BC 0036801C 38 60 00 01 */ li r3, 1 -/* 8036B0C0 00368020 4E 80 00 20 */ blr +/* 8036B0C0 00368020 4E 80 00 20 */ blr lbl_8036B0C4: /* 8036B0C4 00368024 8C 04 00 F4 */ lbzu r0, 0xf4(r4) /* 8036B0C8 00368028 28 00 00 00 */ cmplwi r0, 0 @@ -1078,7 +1078,7 @@ lbl_8036B0C4: /* 8036B0D4 00368034 7C 03 00 40 */ cmplw r3, r0 /* 8036B0D8 00368038 40 82 00 0C */ bne lbl_8036B0E4 /* 8036B0DC 0036803C 38 60 00 02 */ li r3, 2 -/* 8036B0E0 00368040 4E 80 00 20 */ blr +/* 8036B0E0 00368040 4E 80 00 20 */ blr lbl_8036B0E4: /* 8036B0E4 00368044 8C 04 00 F4 */ lbzu r0, 0xf4(r4) /* 8036B0E8 00368048 28 00 00 00 */ cmplwi r0, 0 @@ -1087,10 +1087,10 @@ lbl_8036B0E4: /* 8036B0F4 00368054 7C 03 00 40 */ cmplw r3, r0 /* 8036B0F8 00368058 40 82 00 0C */ bne lbl_8036B104 /* 8036B0FC 0036805C 38 60 00 03 */ li r3, 3 -/* 8036B100 00368060 4E 80 00 20 */ blr +/* 8036B100 00368060 4E 80 00 20 */ blr lbl_8036B104: /* 8036B104 00368064 38 60 FF FF */ li r3, -1 -/* 8036B108 00368068 4E 80 00 20 */ blr +/* 8036B108 00368068 4E 80 00 20 */ blr .global PickFreeStream__10SDSPStreamFi PickFreeStream__10SDSPStreamFi: @@ -1171,13 +1171,13 @@ lbl_8036B1E8: /* 8036B214 00368174 90 04 00 0C */ stw r0, 0xc(r4) /* 8036B218 00368178 90 83 00 00 */ stw r4, 0(r3) /* 8036B21C 0036817C 7D 23 4B 78 */ mr r3, r9 -/* 8036B220 00368180 4E 80 00 20 */ blr +/* 8036B220 00368180 4E 80 00 20 */ blr lbl_8036B224: /* 8036B224 00368184 38 A5 00 F4 */ addi r5, r5, 0xf4 /* 8036B228 00368188 39 08 00 01 */ addi r8, r8, 1 /* 8036B22C 0036818C 42 00 FE F8 */ bdnz lbl_8036B124 /* 8036B230 00368190 38 60 FF FF */ li r3, -1 -/* 8036B234 00368194 4E 80 00 20 */ blr +/* 8036B234 00368194 4E 80 00 20 */ blr .global CloseFiles__10SDSPStreamFv CloseFiles__10SDSPStreamFv: @@ -1194,7 +1194,7 @@ CloseFiles__10SDSPStreamFv: /* 8036B260 003681C0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8036B264 003681C4 7C 08 03 A6 */ mtlr r0 /* 8036B268 003681C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8036B26C 003681CC 4E 80 00 20 */ blr +/* 8036B26C 003681CC 4E 80 00 20 */ blr .global OpenFiles__10SDSPStreamFPCc OpenFiles__10SDSPStreamFPCc: diff --git a/asm/Kyoto/Audio/g721.s b/asm/Kyoto/Audio/g721.s index 104fb030..8112a3a4 100644 --- a/asm/Kyoto/Audio/g721.s +++ b/asm/Kyoto/Audio/g721.s @@ -103,7 +103,7 @@ lbl_8036B33C: /* 8036B37C 003682DC 80 01 00 34 */ lwz r0, 0x34(r1) /* 8036B380 003682E0 7C 08 03 A6 */ mtlr r0 /* 8036B384 003682E4 38 21 00 30 */ addi r1, r1, 0x30 -/* 8036B388 003682E8 4E 80 00 20 */ blr +/* 8036B388 003682E8 4E 80 00 20 */ blr .global update__FiiiiiiiP10g72x_state update__FiiiiiiiP10g72x_state: @@ -514,7 +514,7 @@ lbl_8036B914: /* 8036B918 00368878 80 01 00 34 */ lwz r0, 0x34(r1) /* 8036B91C 0036887C 7C 08 03 A6 */ mtlr r0 /* 8036B920 00368880 38 21 00 30 */ addi r1, r1, 0x30 -/* 8036B924 00368884 4E 80 00 20 */ blr +/* 8036B924 00368884 4E 80 00 20 */ blr .global reconstruct__Fiii reconstruct__Fiii: @@ -527,7 +527,7 @@ reconstruct__Fiii: /* 8036B940 003688A0 7C 83 1B 78 */ or r3, r4, r3 /* 8036B944 003688A4 7C 63 FE 70 */ srawi r3, r3, 0x1f /* 8036B948 003688A8 7C 03 18 38 */ and r3, r0, r3 -/* 8036B94C 003688AC 4E 80 00 20 */ blr +/* 8036B94C 003688AC 4E 80 00 20 */ blr lbl_8036B950: /* 8036B950 003688B0 54 04 06 7E */ clrlwi r4, r0, 0x19 /* 8036B954 003688B4 54 00 CF 3E */ rlwinm r0, r0, 0x19, 0x1c, 0x1f @@ -539,9 +539,9 @@ lbl_8036B950: /* 8036B96C 003688CC 20 00 00 0E */ subfic r0, r0, 0xe /* 8036B970 003688D0 7C 60 06 30 */ sraw r0, r3, r0 /* 8036B974 003688D4 7C 03 07 34 */ extsh r3, r0 -/* 8036B978 003688D8 4D 82 00 20 */ beqlr +/* 8036B978 003688D8 4D 82 00 20 */ beqlr /* 8036B97C 003688DC 38 63 80 00 */ addi r3, r3, -32768 -/* 8036B980 003688E0 4E 80 00 20 */ blr +/* 8036B980 003688E0 4E 80 00 20 */ blr .global step_size__FP10g72x_state step_size__FP10g72x_state: @@ -549,7 +549,7 @@ step_size__FP10g72x_state: /* 8036B988 003688E8 2C 05 01 00 */ cmpwi r5, 0x100 /* 8036B98C 003688EC 41 80 00 0C */ blt lbl_8036B998 /* 8036B990 003688F0 A8 63 00 04 */ lha r3, 4(r3) -/* 8036B994 003688F4 4E 80 00 20 */ blr +/* 8036B994 003688F4 4E 80 00 20 */ blr lbl_8036B998: /* 8036B998 003688F8 80 83 00 00 */ lwz r4, 0(r3) /* 8036B99C 003688FC A8 03 00 04 */ lha r0, 4(r3) @@ -560,14 +560,14 @@ lbl_8036B998: /* 8036B9B0 00368910 7C 00 21 D6 */ mullw r0, r0, r4 /* 8036B9B4 00368914 7C 00 36 70 */ srawi r0, r0, 6 /* 8036B9B8 00368918 7C 63 02 14 */ add r3, r3, r0 -/* 8036B9BC 0036891C 4E 80 00 20 */ blr +/* 8036B9BC 0036891C 4E 80 00 20 */ blr lbl_8036B9C0: -/* 8036B9C0 00368920 4C 80 00 20 */ bgelr +/* 8036B9C0 00368920 4C 80 00 20 */ bgelr /* 8036B9C4 00368924 7C 80 21 D6 */ mullw r4, r0, r4 /* 8036B9C8 00368928 38 04 00 3F */ addi r0, r4, 0x3f /* 8036B9CC 0036892C 7C 00 36 70 */ srawi r0, r0, 6 /* 8036B9D0 00368930 7C 63 02 14 */ add r3, r3, r0 -/* 8036B9D4 00368934 4E 80 00 20 */ blr +/* 8036B9D4 00368934 4E 80 00 20 */ blr .global predictor_pole__FP10g72x_state predictor_pole__FP10g72x_state: @@ -592,7 +592,7 @@ predictor_pole__FP10g72x_state: /* 8036BA20 00368980 83 C1 00 08 */ lwz r30, 8(r1) /* 8036BA24 00368984 7C 08 03 A6 */ mtlr r0 /* 8036BA28 00368988 38 21 00 10 */ addi r1, r1, 0x10 -/* 8036BA2C 0036898C 4E 80 00 20 */ blr +/* 8036BA2C 0036898C 4E 80 00 20 */ blr .global predictor_zero__FP10g72x_state predictor_zero__FP10g72x_state: @@ -627,7 +627,7 @@ lbl_8036BA68: /* 8036BA9C 003689FC 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8036BAA0 00368A00 7C 08 03 A6 */ mtlr r0 /* 8036BAA4 00368A04 38 21 00 20 */ addi r1, r1, 0x20 -/* 8036BAA8 00368A08 4E 80 00 20 */ blr +/* 8036BAA8 00368A08 4E 80 00 20 */ blr .global g72x_init_state__FP10g72x_state g72x_init_state__FP10g72x_state: @@ -660,7 +660,7 @@ g72x_init_state__FP10g72x_state: /* 8036BB14 00368A74 B0 83 00 1A */ sth r4, 0x1a(r3) /* 8036BB18 00368A78 B0 03 00 2A */ sth r0, 0x2a(r3) /* 8036BB1C 00368A7C 98 83 00 30 */ stb r4, 0x30(r3) -/* 8036BB20 00368A80 4E 80 00 20 */ blr +/* 8036BB20 00368A80 4E 80 00 20 */ blr .global fmult__Fii fmult__Fii: @@ -724,7 +724,7 @@ lbl_8036BBE8: /* 8036BBF4 00368B54 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8036BBF8 00368B58 7C 08 03 A6 */ mtlr r0 /* 8036BBFC 00368B5C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8036BC00 00368B60 4E 80 00 20 */ blr +/* 8036BC00 00368B60 4E 80 00 20 */ blr .global quan__FiPsi quan__FiPsi: diff --git a/asm/Kyoto/Basics/CBasics.s b/asm/Kyoto/Basics/CBasics.s index 665cee62..813a1e3c 100644 --- a/asm/Kyoto/Basics/CBasics.s +++ b/asm/Kyoto/Basics/CBasics.s @@ -5,7 +5,7 @@ .global lbl_804795A0 lbl_804795A0: .skip 0x200 - + .section .text, "ax" .global Stringize__7CBasicsFPCce @@ -55,4 +55,4 @@ lbl_802D61EC: /* 802D6254 002D31B4 83 A1 00 84 */ lwz r29, 0x84(r1) /* 802D6258 002D31B8 7C 08 03 A6 */ mtlr r0 /* 802D625C 002D31BC 38 21 00 90 */ addi r1, r1, 0x90 -/* 802D6260 002D31C0 4E 80 00 20 */ blr +/* 802D6260 002D31C0 4E 80 00 20 */ blr diff --git a/asm/Kyoto/Basics/CCallStackDolphin.s b/asm/Kyoto/Basics/CCallStackDolphin.s index 11f57d0d..d45384be 100644 --- a/asm/Kyoto/Basics/CCallStackDolphin.s +++ b/asm/Kyoto/Basics/CCallStackDolphin.s @@ -5,15 +5,15 @@ .global GetTypeText__10CCallStackCFv GetTypeText__10CCallStackCFv: /* 802D63C4 002D3324 80 63 00 04 */ lwz r3, 4(r3) -/* 802D63C8 002D3328 4E 80 00 20 */ blr +/* 802D63C8 002D3328 4E 80 00 20 */ blr .global GetFileAndLineText__10CCallStackCFv GetFileAndLineText__10CCallStackCFv: /* 802D63CC 002D332C 80 63 00 00 */ lwz r3, 0(r3) -/* 802D63D0 002D3330 4E 80 00 20 */ blr +/* 802D63D0 002D3330 4E 80 00 20 */ blr .global __ct__10CCallStackFUiPCcPCc __ct__10CCallStackFUiPCcPCc: /* 802D63D4 002D3334 90 A3 00 00 */ stw r5, 0(r3) /* 802D63D8 002D3338 90 C3 00 04 */ stw r6, 4(r3) -/* 802D63DC 002D333C 4E 80 00 20 */ blr +/* 802D63DC 002D333C 4E 80 00 20 */ blr diff --git a/asm/Kyoto/Basics/COsContextDolphin.s b/asm/Kyoto/Basics/COsContextDolphin.s index 718a6f1b..c1b0ac02 100644 --- a/asm/Kyoto/Basics/COsContextDolphin.s +++ b/asm/Kyoto/Basics/COsContextDolphin.s @@ -26,7 +26,7 @@ sub_802d63e0: /* 802D642C 002D338C 83 C1 00 08 */ lwz r30, 8(r1) /* 802D6430 002D3390 7C 08 03 A6 */ mtlr r0 /* 802D6434 002D3394 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D6438 002D3398 4E 80 00 20 */ blr +/* 802D6438 002D3398 4E 80 00 20 */ blr .global OpenWindow__10COsContextFPCciiiib OpenWindow__10COsContextFPCciiiib: @@ -150,7 +150,7 @@ lbl_802D65D0: /* 802D65F0 002D3550 83 81 00 10 */ lwz r28, 0x10(r1) /* 802D65F4 002D3554 7C 08 03 A6 */ mtlr r0 /* 802D65F8 002D3558 38 21 00 20 */ addi r1, r1, 0x20 -/* 802D65FC 002D355C 4E 80 00 20 */ blr +/* 802D65FC 002D355C 4E 80 00 20 */ blr .global GetOsKeyState__10COsContextCFi GetOsKeyState__10COsContextCFi: @@ -168,12 +168,12 @@ GetOsKeyState__10COsContextCFi: /* 802D662C 002D358C A8 03 00 04 */ lha r0, 4(r3) /* 802D6630 002D3590 50 80 64 E6 */ rlwimi r0, r4, 0xc, 0x13, 0x13 /* 802D6634 002D3594 B0 03 00 04 */ sth r0, 4(r3) -/* 802D6638 002D3598 4E 80 00 20 */ blr +/* 802D6638 002D3598 4E 80 00 20 */ blr .global Update__10COsContextFv Update__10COsContextFv: /* 802D663C 002D359C 38 60 00 01 */ li r3, 1 -/* 802D6640 002D35A0 4E 80 00 20 */ blr +/* 802D6640 002D35A0 4E 80 00 20 */ blr .global __dt__10COsContextFv __dt__10COsContextFv: @@ -192,7 +192,7 @@ lbl_802D6668: /* 802D6670 002D35D0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802D6674 002D35D4 7C 08 03 A6 */ mtlr r0 /* 802D6678 002D35D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D667C 002D35DC 4E 80 00 20 */ blr +/* 802D667C 002D35DC 4E 80 00 20 */ blr .global __ct__10COsContextFbb __ct__10COsContextFbb: diff --git a/asm/Kyoto/Basics/CSWDataDolphin.s b/asm/Kyoto/Basics/CSWDataDolphin.s index 73f7fe58..547ad191 100644 --- a/asm/Kyoto/Basics/CSWDataDolphin.s +++ b/asm/Kyoto/Basics/CSWDataDolphin.s @@ -34,7 +34,7 @@ Initialize__Q210CStopwatch7CSWDataFv: /* 802D6788 002D36E8 80 01 00 14 */ lwz r0, 0x14(r1) /* 802D678C 002D36EC 7C 08 03 A6 */ mtlr r0 /* 802D6790 002D36F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D6794 002D36F4 4E 80 00 20 */ blr +/* 802D6794 002D36F4 4E 80 00 20 */ blr .global Wait__Q210CStopwatch7CSWDataCFf Wait__Q210CStopwatch7CSWDataCFf: diff --git a/asm/Kyoto/Basics/CStopwatch.s b/asm/Kyoto/Basics/CStopwatch.s index 392bb819..43d67173 100644 --- a/asm/Kyoto/Basics/CStopwatch.s +++ b/asm/Kyoto/Basics/CStopwatch.s @@ -14,7 +14,7 @@ lbl_805A923C: .global GetGlobalTimerObj__10CStopwatchFv GetGlobalTimerObj__10CStopwatchFv: /* 802D6264 002D31C4 38 6D A6 78 */ addi r3, r13, lbl_805A9238@sda21 -/* 802D6268 002D31C8 4E 80 00 20 */ blr +/* 802D6268 002D31C8 4E 80 00 20 */ blr .global Wait__10CStopwatchFf Wait__10CStopwatchFf: @@ -38,7 +38,7 @@ lbl_802D62A8: /* 802D62A8 002D3208 80 01 00 14 */ lwz r0, 0x14(r1) /* 802D62AC 002D320C 7C 08 03 A6 */ mtlr r0 /* 802D62B0 002D3210 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D62B4 002D3214 4E 80 00 20 */ blr +/* 802D62B4 002D3214 4E 80 00 20 */ blr .global InitGlobalTimer__10CStopwatchFv InitGlobalTimer__10CStopwatchFv: @@ -62,7 +62,7 @@ lbl_802D62E8: /* 802D62F8 002D3258 80 01 00 14 */ lwz r0, 0x14(r1) /* 802D62FC 002D325C 7C 08 03 A6 */ mtlr r0 /* 802D6300 002D3260 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D6304 002D3264 4E 80 00 20 */ blr +/* 802D6304 002D3264 4E 80 00 20 */ blr .global __sinit_CStopwatch_cpp __sinit_CStopwatch_cpp: diff --git a/asm/Kyoto/Basics/RAssertDolphin.s b/asm/Kyoto/Basics/RAssertDolphin.s index f8e55ad3..f75eeb1f 100644 --- a/asm/Kyoto/Basics/RAssertDolphin.s +++ b/asm/Kyoto/Basics/RAssertDolphin.s @@ -71,7 +71,7 @@ lbl_802D6868: /* 802D68EC 002D384C 83 A1 03 44 */ lwz r29, 0x344(r1) /* 802D68F0 002D3850 7C 08 03 A6 */ mtlr r0 /* 802D68F4 002D3854 38 21 03 50 */ addi r1, r1, 0x350 -/* 802D68F8 002D3858 4E 80 00 20 */ blr +/* 802D68F8 002D3858 4E 80 00 20 */ blr .global SetErrorHandlers SetErrorHandlers: @@ -97,7 +97,7 @@ SetErrorHandlers: /* 802D6948 002D38A8 80 01 00 14 */ lwz r0, 0x14(r1) /* 802D694C 002D38AC 7C 08 03 A6 */ mtlr r0 /* 802D6950 002D38B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D6954 002D38B4 4E 80 00 20 */ blr +/* 802D6954 002D38B4 4E 80 00 20 */ blr .global ErrorHandler ErrorHandler: diff --git a/asm/Kyoto/CARAMManager.s b/asm/Kyoto/CARAMManager.s index bdb0bf4c..c7519d68 100644 --- a/asm/Kyoto/CARAMManager.s +++ b/asm/Kyoto/CARAMManager.s @@ -49,7 +49,7 @@ CollectGarbage__12CARAMManagerFv: /* 803445F8 00341558 80 01 00 14 */ lwz r0, 0x14(r1) /* 803445FC 0034155C 7C 08 03 A6 */ mtlr r0 /* 80344600 00341560 38 21 00 10 */ addi r1, r1, 0x10 -/* 80344604 00341564 4E 80 00 20 */ blr +/* 80344604 00341564 4E 80 00 20 */ blr .global RefreshActiveDMAList__12CARAMManagerFv RefreshActiveDMAList__12CARAMManagerFv: @@ -84,7 +84,7 @@ lbl_80344658: /* 8034466C 003415CC 83 C1 00 08 */ lwz r30, 8(r1) /* 80344670 003415D0 7C 08 03 A6 */ mtlr r0 /* 80344674 003415D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80344678 003415D8 4E 80 00 20 */ blr +/* 80344678 003415D8 4E 80 00 20 */ blr .global AramManagerDMACallback__12CARAMManagerFUl AramManagerDMACallback__12CARAMManagerFUl: @@ -104,7 +104,7 @@ lbl_803446AC: /* 803446AC 0034160C 80 01 00 14 */ lwz r0, 0x14(r1) /* 803446B0 00341610 7C 08 03 A6 */ mtlr r0 /* 803446B4 00341614 38 21 00 10 */ addi r1, r1, 0x10 -/* 803446B8 00341618 4E 80 00 20 */ blr +/* 803446B8 00341618 4E 80 00 20 */ blr .global CancelDMA__12CARAMManagerFUi CancelDMA__12CARAMManagerFUi: @@ -122,14 +122,14 @@ lbl_803446D0: /* 803446E4 00341644 7C 03 00 D0 */ neg r0, r3 /* 803446E8 00341648 7C 00 1B 78 */ or r0, r0, r3 /* 803446EC 0034164C 54 03 0F FE */ srwi r3, r0, 0x1f -/* 803446F0 00341650 4E 80 00 20 */ blr +/* 803446F0 00341650 4E 80 00 20 */ blr lbl_803446F4: /* 803446F4 00341654 80 A5 00 04 */ lwz r5, 4(r5) lbl_803446F8: /* 803446F8 00341658 7C 05 20 40 */ cmplw r5, r4 /* 803446FC 0034165C 40 82 FF D4 */ bne lbl_803446D0 /* 80344700 00341660 38 60 00 01 */ li r3, 1 -/* 80344704 00341664 4E 80 00 20 */ blr +/* 80344704 00341664 4E 80 00 20 */ blr .global WaitForAllDMAsToComplete__12CARAMManagerFv WaitForAllDMAsToComplete__12CARAMManagerFv: @@ -150,7 +150,7 @@ lbl_80344728: /* 80344738 00341698 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8034473C 0034169C 7C 08 03 A6 */ mtlr r0 /* 80344740 003416A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80344744 003416A4 4E 80 00 20 */ blr +/* 80344744 003416A4 4E 80 00 20 */ blr .global WaitForDMACompletion__12CARAMManagerFUi WaitForDMACompletion__12CARAMManagerFUi: @@ -189,7 +189,7 @@ lbl_803447B0: /* 803447B4 00341714 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803447B8 00341718 7C 08 03 A6 */ mtlr r0 /* 803447BC 0034171C 38 21 00 10 */ addi r1, r1, 0x10 -/* 803447C0 00341720 4E 80 00 20 */ blr +/* 803447C0 00341720 4E 80 00 20 */ blr .global IsDMACompleted__12CARAMManagerFUi IsDMACompleted__12CARAMManagerFUi: @@ -232,7 +232,7 @@ lbl_8034483C: /* 80344840 003417A0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80344844 003417A4 7C 08 03 A6 */ mtlr r0 /* 80344848 003417A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034484C 003417AC 4E 80 00 20 */ blr +/* 8034484C 003417AC 4E 80 00 20 */ blr .global DMAToMRAM__12CARAMManagerFPvPvUiQ212CARAMManager12EDMAPriority DMAToMRAM__12CARAMManagerFPvPvUiQ212CARAMManager12EDMAPriority: @@ -317,7 +317,7 @@ lbl_80344970: /* 80344978 003418D8 80 01 00 34 */ lwz r0, 0x34(r1) /* 8034497C 003418DC 7C 08 03 A6 */ mtlr r0 /* 80344980 003418E0 38 21 00 30 */ addi r1, r1, 0x30 -/* 80344984 003418E4 4E 80 00 20 */ blr +/* 80344984 003418E4 4E 80 00 20 */ blr .global DMAToARAM__12CARAMManagerFPvPvUiQ212CARAMManager12EDMAPriority DMAToARAM__12CARAMManagerFPvPvUiQ212CARAMManager12EDMAPriority: @@ -401,7 +401,7 @@ lbl_80344AA4: /* 80344AAC 00341A0C 80 01 00 34 */ lwz r0, 0x34(r1) /* 80344AB0 00341A10 7C 08 03 A6 */ mtlr r0 /* 80344AB4 00341A14 38 21 00 30 */ addi r1, r1, 0x30 -/* 80344AB8 00341A18 4E 80 00 20 */ blr +/* 80344AB8 00341A18 4E 80 00 20 */ blr .global Free__12CARAMManagerFPCv Free__12CARAMManagerFPCv: @@ -409,7 +409,7 @@ Free__12CARAMManagerFPCv: /* 80344AC0 00341A20 7C 00 18 40 */ cmplw r0, r3 /* 80344AC4 00341A24 40 82 00 0C */ bne lbl_80344AD0 /* 80344AC8 00341A28 38 60 00 00 */ li r3, 0 -/* 80344ACC 00341A2C 4E 80 00 20 */ blr +/* 80344ACC 00341A2C 4E 80 00 20 */ blr lbl_80344AD0: /* 80344AD0 00341A30 80 8D A9 64 */ lwz r4, lbl_805A9524@sda21(r13) /* 80344AD4 00341A34 38 A0 00 00 */ li r5, 0 @@ -464,7 +464,7 @@ lbl_80344B80: /* 80344B8C 00341AEC 42 00 FF F4 */ bdnz lbl_80344B80 lbl_80344B90: /* 80344B90 00341AF0 38 60 00 01 */ li r3, 1 -/* 80344B94 00341AF4 4E 80 00 20 */ blr +/* 80344B94 00341AF4 4E 80 00 20 */ blr .global FindFreeBlocks__12CARAMManagerFUiUiUi FindFreeBlocks__12CARAMManagerFUiUiUi: @@ -476,7 +476,7 @@ lbl_80344BA0: /* 80344BA8 00341B08 28 00 00 00 */ cmplwi r0, 0 /* 80344BAC 00341B0C 40 82 00 68 */ bne lbl_80344C14 /* 80344BB0 00341B10 28 05 00 01 */ cmplwi r5, 1 -/* 80344BB4 00341B14 4D 82 00 20 */ beqlr +/* 80344BB4 00341B14 4D 82 00 20 */ beqlr /* 80344BB8 00341B18 38 63 00 01 */ addi r3, r3, 1 /* 80344BBC 00341B1C 39 00 00 01 */ li r8, 1 /* 80344BC0 00341B20 54 66 10 3A */ slwi r6, r3, 2 @@ -497,7 +497,7 @@ lbl_80344BEC: /* 80344BF4 00341B54 40 82 00 10 */ bne lbl_80344C04 /* 80344BF8 00341B58 38 05 FF FF */ addi r0, r5, -1 /* 80344BFC 00341B5C 7C 60 18 50 */ subf r3, r0, r3 -/* 80344C00 00341B60 4E 80 00 20 */ blr +/* 80344C00 00341B60 4E 80 00 20 */ blr lbl_80344C04: /* 80344C04 00341B64 38 C6 00 04 */ addi r6, r6, 4 /* 80344C08 00341B68 38 63 00 01 */ addi r3, r3, 1 @@ -509,7 +509,7 @@ lbl_80344C18: /* 80344C18 00341B78 7C 03 20 40 */ cmplw r3, r4 /* 80344C1C 00341B7C 41 80 FF 84 */ blt lbl_80344BA0 /* 80344C20 00341B80 38 60 FF FF */ li r3, -1 -/* 80344C24 00341B84 4E 80 00 20 */ blr +/* 80344C24 00341B84 4E 80 00 20 */ blr .global Alloc__12CARAMManagerFUi Alloc__12CARAMManagerFUi: @@ -555,7 +555,7 @@ lbl_80344CB0: /* 80344CB4 00341C14 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80344CB8 00341C18 7C 08 03 A6 */ mtlr r0 /* 80344CBC 00341C1C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80344CC0 00341C20 4E 80 00 20 */ blr +/* 80344CC0 00341C20 4E 80 00 20 */ blr .global Shutdown__12CARAMManagerFv Shutdown__12CARAMManagerFv: @@ -578,7 +578,7 @@ Shutdown__12CARAMManagerFv: /* 80344D04 00341C64 80 01 00 14 */ lwz r0, 0x14(r1) /* 80344D08 00341C68 7C 08 03 A6 */ mtlr r0 /* 80344D0C 00341C6C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80344D10 00341C70 4E 80 00 20 */ blr +/* 80344D10 00341C70 4E 80 00 20 */ blr .global Initialize__12CARAMManagerFUi Initialize__12CARAMManagerFUi: @@ -677,7 +677,7 @@ lbl_80344E58: /* 80344E74 00341DD4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80344E78 00341DD8 7C 08 03 A6 */ mtlr r0 /* 80344E7C 00341DDC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80344E80 00341DE0 4E 80 00 20 */ blr +/* 80344E80 00341DE0 4E 80 00 20 */ blr .global sub_80344e84 sub_80344e84: @@ -713,7 +713,7 @@ lbl_80344ED8: /* 80344EF0 00341E50 80 01 00 14 */ lwz r0, 0x14(r1) /* 80344EF4 00341E54 7C 08 03 A6 */ mtlr r0 /* 80344EF8 00341E58 38 21 00 10 */ addi r1, r1, 0x10 -/* 80344EFC 00341E5C 4E 80 00 20 */ blr +/* 80344EFC 00341E5C 4E 80 00 20 */ blr .global __sinit_CARAMManager_cpp __sinit_CARAMManager_cpp: @@ -737,7 +737,7 @@ __sinit_CARAMManager_cpp: /* 80344F44 00341EA4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80344F48 00341EA8 7C 08 03 A6 */ mtlr r0 /* 80344F4C 00341EAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80344F50 00341EB0 4E 80 00 20 */ blr +/* 80344F50 00341EB0 4E 80 00 20 */ blr .global "__dt__Q24rstl67listFv" "__dt__Q24rstl67listFv": diff --git a/asm/Kyoto/CARAMToken.s b/asm/Kyoto/CARAMToken.s index 927e58dc..2394c6e9 100644 --- a/asm/Kyoto/CARAMToken.s +++ b/asm/Kyoto/CARAMToken.s @@ -27,7 +27,7 @@ lbl_80358374: /* 80358378 003552D8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8035837C 003552DC 7C 08 03 A6 */ mtlr r0 /* 80358380 003552E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80358384 003552E4 4E 80 00 20 */ blr +/* 80358384 003552E4 4E 80 00 20 */ blr .global sub_80358388 sub_80358388: @@ -50,7 +50,7 @@ lbl_803583C0: /* 803583C4 00355324 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803583C8 00355328 7C 08 03 A6 */ mtlr r0 /* 803583CC 0035532C 38 21 00 10 */ addi r1, r1, 0x10 -/* 803583D0 00355330 4E 80 00 20 */ blr +/* 803583D0 00355330 4E 80 00 20 */ blr .global sub_803583d4 sub_803583d4: @@ -69,7 +69,7 @@ sub_803583d4: /* 80358404 00355364 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80358408 00355368 7C 08 03 A6 */ mtlr r0 /* 8035840C 0035536C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80358410 00355370 4E 80 00 20 */ blr +/* 80358410 00355370 4E 80 00 20 */ blr .global MakeInvalid__10CARAMTokenFv MakeInvalid__10CARAMTokenFv: @@ -91,7 +91,7 @@ MakeInvalid__10CARAMTokenFv: /* 80358450 003553B0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80358454 003553B4 7C 08 03 A6 */ mtlr r0 /* 80358458 003553B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8035845C 003553BC 4E 80 00 20 */ blr +/* 8035845C 003553BC 4E 80 00 20 */ blr .global RemoveFromList__10CARAMTokenFv RemoveFromList__10CARAMTokenFv: @@ -111,10 +111,10 @@ lbl_80358488: lbl_80358490: /* 80358490 003553F0 80 83 00 18 */ lwz r4, 0x18(r3) /* 80358494 003553F4 28 04 00 00 */ cmplwi r4, 0 -/* 80358498 003553F8 4D 82 00 20 */ beqlr +/* 80358498 003553F8 4D 82 00 20 */ beqlr /* 8035849C 003553FC 80 03 00 14 */ lwz r0, 0x14(r3) /* 803584A0 00355400 90 04 00 14 */ stw r0, 0x14(r4) -/* 803584A4 00355404 4E 80 00 20 */ blr +/* 803584A4 00355404 4E 80 00 20 */ blr .global MoveToList__10CARAMTokenFQ210CARAMToken7EStatus MoveToList__10CARAMTokenFQ210CARAMToken7EStatus: @@ -138,7 +138,7 @@ lbl_803584E0: /* 803584E8 00355448 83 C1 00 08 */ lwz r30, 8(r1) /* 803584EC 0035544C 7C 08 03 A6 */ mtlr r0 /* 803584F0 00355450 38 21 00 10 */ addi r1, r1, 0x10 -/* 803584F4 00355454 4E 80 00 20 */ blr +/* 803584F4 00355454 4E 80 00 20 */ blr .global InitiallyMoveToList__10CARAMTokenFv InitiallyMoveToList__10CARAMTokenFv: @@ -155,9 +155,9 @@ InitiallyMoveToList__10CARAMTokenFv: /* 80358520 00355480 7C 64 01 2E */ stwx r3, r4, r0 /* 80358524 00355484 80 83 00 18 */ lwz r4, 0x18(r3) /* 80358528 00355488 28 04 00 00 */ cmplwi r4, 0 -/* 8035852C 0035548C 4D 82 00 20 */ beqlr +/* 8035852C 0035548C 4D 82 00 20 */ beqlr /* 80358530 00355490 90 64 00 14 */ stw r3, 0x14(r4) -/* 80358534 00355494 4E 80 00 20 */ blr +/* 80358534 00355494 4E 80 00 20 */ blr .global UpdateAllDMAs__10CARAMTokenFv UpdateAllDMAs__10CARAMTokenFv: @@ -191,7 +191,7 @@ lbl_80358574: /* 80358598 003554F8 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8035859C 003554FC 7C 08 03 A6 */ mtlr r0 /* 803585A0 00355500 38 21 00 20 */ addi r1, r1, 0x20 -/* 803585A4 00355504 4E 80 00 20 */ blr +/* 803585A4 00355504 4E 80 00 20 */ blr .global RefreshStatus__10CARAMTokenFv RefreshStatus__10CARAMTokenFv: @@ -254,7 +254,7 @@ lbl_80358664: /* 80358668 003555C8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8035866C 003555CC 7C 08 03 A6 */ mtlr r0 /* 80358670 003555D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80358674 003555D4 4E 80 00 20 */ blr +/* 80358674 003555D4 4E 80 00 20 */ blr .global LoadToARAM__10CARAMTokenFv LoadToARAM__10CARAMTokenFv: @@ -328,7 +328,7 @@ lbl_80358758: /* 8035875C 003556BC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80358760 003556C0 7C 08 03 A6 */ mtlr r0 /* 80358764 003556C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80358768 003556C8 4E 80 00 20 */ blr +/* 80358768 003556C8 4E 80 00 20 */ blr .global LoadToMRAM__10CARAMTokenFv LoadToMRAM__10CARAMTokenFv: @@ -405,7 +405,7 @@ lbl_80358860: /* 80358864 003557C4 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80358868 003557C8 7C 08 03 A6 */ mtlr r0 /* 8035886C 003557CC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80358870 003557D0 4E 80 00 20 */ blr +/* 80358870 003557D0 4E 80 00 20 */ blr .global __as__10CARAMTokenFRC10CARAMToken __as__10CARAMTokenFRC10CARAMToken: @@ -435,7 +435,7 @@ lbl_803588BC: /* 803588C4 00355824 83 C1 00 08 */ lwz r30, 8(r1) /* 803588C8 00355828 7C 08 03 A6 */ mtlr r0 /* 803588CC 0035582C 38 21 00 10 */ addi r1, r1, 0x10 -/* 803588D0 00355830 4E 80 00 20 */ blr +/* 803588D0 00355830 4E 80 00 20 */ blr .global PostConstruct__10CARAMTokenFPvUi PostConstruct__10CARAMTokenFPvUi: @@ -466,7 +466,7 @@ PostConstruct__10CARAMTokenFPvUi: /* 80358934 00355894 80 01 00 24 */ lwz r0, 0x24(r1) /* 80358938 00355898 7C 08 03 A6 */ mtlr r0 /* 8035893C 0035589C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80358940 003558A0 4E 80 00 20 */ blr +/* 80358940 003558A0 4E 80 00 20 */ blr .global __dt__10CARAMTokenFv __dt__10CARAMTokenFv: @@ -505,7 +505,7 @@ lbl_803589B0: /* 803589BC 0035591C 83 C1 00 08 */ lwz r30, 8(r1) /* 803589C0 00355920 7C 08 03 A6 */ mtlr r0 /* 803589C4 00355924 38 21 00 10 */ addi r1, r1, 0x10 -/* 803589C8 00355928 4E 80 00 20 */ blr +/* 803589C8 00355928 4E 80 00 20 */ blr .global __ct__10CARAMTokenFRC10CARAMToken __ct__10CARAMTokenFRC10CARAMToken: @@ -540,7 +540,7 @@ __ct__10CARAMTokenFRC10CARAMToken: /* 80358A3C 0035599C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80358A40 003559A0 7C 08 03 A6 */ mtlr r0 /* 80358A44 003559A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80358A48 003559A8 4E 80 00 20 */ blr +/* 80358A48 003559A8 4E 80 00 20 */ blr .global __ct__10CARAMTokenFPvUi __ct__10CARAMTokenFPvUi: @@ -588,7 +588,7 @@ lbl_80358AE4: /* 80358AEC 00355A4C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80358AF0 00355A50 7C 08 03 A6 */ mtlr r0 /* 80358AF4 00355A54 38 21 00 10 */ addi r1, r1, 0x10 -/* 80358AF8 00355A58 4E 80 00 20 */ blr +/* 80358AF8 00355A58 4E 80 00 20 */ blr .global __ct__10CARAMTokenFv __ct__10CARAMTokenFv: diff --git a/asm/Kyoto/CDependencyGroup.s b/asm/Kyoto/CDependencyGroup.s index b2e56378..aa427847 100644 --- a/asm/Kyoto/CDependencyGroup.s +++ b/asm/Kyoto/CDependencyGroup.s @@ -39,7 +39,7 @@ lbl_80364F98: /* 80364FA8 00361F08 83 C1 00 08 */ lwz r30, 8(r1) /* 80364FAC 00361F0C 7C 08 03 A6 */ mtlr r0 /* 80364FB0 00361F10 38 21 00 10 */ addi r1, r1, 0x10 -/* 80364FB4 00361F14 4E 80 00 20 */ blr +/* 80364FB4 00361F14 4E 80 00 20 */ blr .global sub_80364fb8 sub_80364fb8: @@ -74,7 +74,7 @@ sub_80364fb8: /* 80365028 00361F88 38 80 00 01 */ li r4, 1 /* 8036502C 00361F8C 81 8C 00 08 */ lwz r12, 8(r12) /* 80365030 00361F90 7D 89 03 A6 */ mtctr r12 -/* 80365034 00361F94 4E 80 04 21 */ bctrl +/* 80365034 00361F94 4E 80 04 21 */ bctrl lbl_80365038: /* 80365038 00361F98 38 61 00 10 */ addi r3, r1, 0x10 /* 8036503C 00361F9C 38 80 FF FF */ li r4, -1 @@ -84,7 +84,7 @@ lbl_80365038: /* 8036504C 00361FAC 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80365050 00361FB0 7C 08 03 A6 */ mtlr r0 /* 80365054 00361FB4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80365058 00361FB8 4E 80 00 20 */ blr +/* 80365058 00361FB8 4E 80 00 20 */ blr .global sub_8036505c sub_8036505c: @@ -149,7 +149,7 @@ lbl_8036511C: /* 8036512C 0036208C 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80365130 00362090 7C 08 03 A6 */ mtlr r0 /* 80365134 00362094 38 21 00 30 */ addi r1, r1, 0x30 -/* 80365138 00362098 4E 80 00 20 */ blr +/* 80365138 00362098 4E 80 00 20 */ blr .global sub_8036513c sub_8036513c: @@ -163,7 +163,7 @@ sub_8036513c: /* 80365158 003620B8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8036515C 003620BC 7C 08 03 A6 */ mtlr r0 /* 80365160 003620C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80365164 003620C4 4E 80 00 20 */ blr +/* 80365164 003620C4 4E 80 00 20 */ blr .global sub_80365168 sub_80365168: @@ -206,7 +206,7 @@ lbl_803651D8: /* 803651F4 00362154 80 01 00 14 */ lwz r0, 0x14(r1) /* 803651F8 00362158 7C 08 03 A6 */ mtlr r0 /* 803651FC 0036215C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80365200 00362160 4E 80 00 20 */ blr +/* 80365200 00362160 4E 80 00 20 */ blr .global sub_80365204 sub_80365204: @@ -260,7 +260,7 @@ lbl_8036529C: /* 803652AC 0036220C 83 A1 00 24 */ lwz r29, 0x24(r1) /* 803652B0 00362210 7C 08 03 A6 */ mtlr r0 /* 803652B4 00362214 38 21 00 30 */ addi r1, r1, 0x30 -/* 803652B8 00362218 4E 80 00 20 */ blr +/* 803652B8 00362218 4E 80 00 20 */ blr .global sub_803652bc sub_803652bc: @@ -281,7 +281,7 @@ lbl_803652E8: /* 803652E8 00362248 7C 05 18 40 */ cmplw r5, r3 /* 803652EC 0036224C 40 82 FF E8 */ bne lbl_803652D4 /* 803652F0 00362250 7C C3 33 78 */ mr r3, r6 -/* 803652F4 00362254 4E 80 00 20 */ blr +/* 803652F4 00362254 4E 80 00 20 */ blr .global ReadFromStream__16CDependencyGroupFR12CInputStream ReadFromStream__16CDependencyGroupFR12CInputStream: @@ -337,7 +337,7 @@ lbl_8036539C: /* 803653A8 00362308 80 01 00 24 */ lwz r0, 0x24(r1) /* 803653AC 0036230C 7C 08 03 A6 */ mtlr r0 /* 803653B0 00362310 38 21 00 20 */ addi r1, r1, 0x20 -/* 803653B4 00362314 4E 80 00 20 */ blr +/* 803653B4 00362314 4E 80 00 20 */ blr .global __ct__16CDependencyGroupFR12CInputStream __ct__16CDependencyGroupFR12CInputStream: diff --git a/asm/Kyoto/CDvdRequest.s b/asm/Kyoto/CDvdRequest.s index 06145fd5..479abeee 100644 --- a/asm/Kyoto/CDvdRequest.s +++ b/asm/Kyoto/CDvdRequest.s @@ -58,16 +58,16 @@ lbl_802FE618: /* 802FE620 002FB580 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802FE624 002FB584 7C 08 03 A6 */ mtlr r0 /* 802FE628 002FB588 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FE62C 002FB58C 4E 80 00 20 */ blr +/* 802FE62C 002FB58C 4E 80 00 20 */ blr .global GetMediaType__15CARAMDvdRequestCFv GetMediaType__15CARAMDvdRequestCFv: /* 802FE630 002FB590 38 60 00 00 */ li r3, 0 -/* 802FE634 002FB594 4E 80 00 20 */ blr +/* 802FE634 002FB594 4E 80 00 20 */ blr .global PostCancelRequest__15CARAMDvdRequestFv PostCancelRequest__15CARAMDvdRequestFv: -/* 802FE638 002FB598 4E 80 00 20 */ blr +/* 802FE638 002FB598 4E 80 00 20 */ blr .global IsComplete__15CARAMDvdRequestFv IsComplete__15CARAMDvdRequestFv: @@ -95,7 +95,7 @@ lbl_802FE680: /* 802FE684 002FB5E4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802FE688 002FB5E8 7C 08 03 A6 */ mtlr r0 /* 802FE68C 002FB5EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FE690 002FB5F0 4E 80 00 20 */ blr +/* 802FE690 002FB5F0 4E 80 00 20 */ blr .global WaitUntilComplete__15CARAMDvdRequestFv WaitUntilComplete__15CARAMDvdRequestFv: @@ -116,12 +116,12 @@ lbl_802FE6C4: /* 802FE6C8 002FB628 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802FE6CC 002FB62C 7C 08 03 A6 */ mtlr r0 /* 802FE6D0 002FB630 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FE6D4 002FB634 4E 80 00 20 */ blr +/* 802FE6D4 002FB634 4E 80 00 20 */ blr .global GetMediaType__15CRealDvdRequestCFv GetMediaType__15CRealDvdRequestCFv: /* 802FE6D8 002FB638 38 60 00 01 */ li r3, 1 -/* 802FE6DC 002FB63C 4E 80 00 20 */ blr +/* 802FE6DC 002FB63C 4E 80 00 20 */ blr .global PostCancelRequest__15CRealDvdRequestFv PostCancelRequest__15CRealDvdRequestFv: @@ -134,7 +134,7 @@ PostCancelRequest__15CRealDvdRequestFv: /* 802FE6F8 002FB658 80 01 00 14 */ lwz r0, 0x14(r1) /* 802FE6FC 002FB65C 7C 08 03 A6 */ mtlr r0 /* 802FE700 002FB660 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FE704 002FB664 4E 80 00 20 */ blr +/* 802FE704 002FB664 4E 80 00 20 */ blr .global IsComplete__15CRealDvdRequestFv IsComplete__15CRealDvdRequestFv: @@ -155,7 +155,7 @@ lbl_802FE734: /* 802FE738 002FB698 80 01 00 14 */ lwz r0, 0x14(r1) /* 802FE73C 002FB69C 7C 08 03 A6 */ mtlr r0 /* 802FE740 002FB6A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FE744 002FB6A4 4E 80 00 20 */ blr +/* 802FE744 002FB6A4 4E 80 00 20 */ blr .global WaitUntilComplete__15CRealDvdRequestFv WaitUntilComplete__15CRealDvdRequestFv: @@ -173,7 +173,7 @@ lbl_802FE75C: /* 802FE770 002FB6D0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802FE774 002FB6D4 7C 08 03 A6 */ mtlr r0 /* 802FE778 002FB6D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FE77C 002FB6DC 4E 80 00 20 */ blr +/* 802FE77C 002FB6DC 4E 80 00 20 */ blr .global __dt__15CRealDvdRequestFv __dt__15CRealDvdRequestFv: @@ -191,19 +191,19 @@ __dt__15CRealDvdRequestFv: /* 802FE7AC 002FB70C 81 83 00 00 */ lwz r12, 0(r3) /* 802FE7B0 002FB710 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802FE7B4 002FB714 7D 89 03 A6 */ mtctr r12 -/* 802FE7B8 002FB718 4E 80 04 21 */ bctrl +/* 802FE7B8 002FB718 4E 80 04 21 */ bctrl /* 802FE7BC 002FB71C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802FE7C0 002FB720 40 82 00 2C */ bne lbl_802FE7EC /* 802FE7C4 002FB724 7F C3 F3 78 */ mr r3, r30 /* 802FE7C8 002FB728 81 9E 00 00 */ lwz r12, 0(r30) /* 802FE7CC 002FB72C 81 8C 00 14 */ lwz r12, 0x14(r12) /* 802FE7D0 002FB730 7D 89 03 A6 */ mtctr r12 -/* 802FE7D4 002FB734 4E 80 04 21 */ bctrl +/* 802FE7D4 002FB734 4E 80 04 21 */ bctrl /* 802FE7D8 002FB738 7F C3 F3 78 */ mr r3, r30 /* 802FE7DC 002FB73C 81 9E 00 00 */ lwz r12, 0(r30) /* 802FE7E0 002FB740 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802FE7E4 002FB744 7D 89 03 A6 */ mtctr r12 -/* 802FE7E8 002FB748 4E 80 04 21 */ bctrl +/* 802FE7E8 002FB748 4E 80 04 21 */ bctrl lbl_802FE7EC: /* 802FE7EC 002FB74C 38 7E 00 04 */ addi r3, r30, 4 /* 802FE7F0 002FB750 48 07 2F 5D */ bl DVDClose diff --git a/asm/Kyoto/CFactoryMgr.s b/asm/Kyoto/CFactoryMgr.s index c9fbbea0..460e2e16 100644 --- a/asm/Kyoto/CFactoryMgr.s +++ b/asm/Kyoto/CFactoryMgr.s @@ -119,7 +119,7 @@ lbl_803386C0: /* 803386CC 0033562C 38 60 FF FF */ li r3, -1 lbl_803386D0: /* 803386D0 00335630 38 21 00 10 */ addi r1, r1, 0x10 -/* 803386D4 00335634 4E 80 00 20 */ blr +/* 803386D4 00335634 4E 80 00 20 */ blr .global TypeIdxToFourCC__11CFactoryMgrFUi TypeIdxToFourCC__11CFactoryMgrFUi: @@ -127,7 +127,7 @@ TypeIdxToFourCC__11CFactoryMgrFUi: /* 803386DC 0033563C 54 60 10 3A */ slwi r0, r3, 2 /* 803386E0 00335640 38 64 79 88 */ addi r3, r4, lbl_803D7988@l /* 803386E4 00335644 7C 63 00 2E */ lwzx r3, r3, r0 -/* 803386E8 00335648 4E 80 00 20 */ blr +/* 803386E8 00335648 4E 80 00 20 */ blr .global MakeObjectFromMemory__11CFactoryMgrFRC10SObjectTagPvibRC15CVParamTransfer MakeObjectFromMemory__11CFactoryMgrFRC10SObjectTagPvibRC15CVParamTransfer: @@ -236,7 +236,7 @@ lbl_803387DC: /* 80338860 003357C0 38 80 00 01 */ li r4, 1 /* 80338864 003357C4 81 8C 00 08 */ lwz r12, 8(r12) /* 80338868 003357C8 7D 89 03 A6 */ mtctr r12 -/* 8033886C 003357CC 4E 80 04 21 */ bctrl +/* 8033886C 003357CC 4E 80 04 21 */ bctrl lbl_80338870: /* 80338870 003357D0 80 81 00 54 */ lwz r4, 0x54(r1) /* 80338874 003357D4 7F 45 D3 78 */ mr r5, r26 @@ -252,7 +252,7 @@ lbl_80338870: /* 8033889C 003357FC 38 61 00 28 */ addi r3, r1, 0x28 /* 803388A0 00335800 38 A1 00 50 */ addi r5, r1, 0x50 /* 803388A4 00335804 7D 89 03 A6 */ mtctr r12 -/* 803388A8 00335808 4E 80 04 21 */ bctrl +/* 803388A8 00335808 4E 80 04 21 */ bctrl /* 803388AC 0033580C 88 61 00 28 */ lbz r3, 0x28(r1) /* 803388B0 00335810 38 00 00 00 */ li r0, 0 /* 803388B4 00335814 98 7D 00 00 */ stb r3, 0(r29) @@ -265,7 +265,7 @@ lbl_80338870: /* 803388D0 00335830 38 80 00 01 */ li r4, 1 /* 803388D4 00335834 81 8C 00 08 */ lwz r12, 8(r12) /* 803388D8 00335838 7D 89 03 A6 */ mtctr r12 -/* 803388DC 0033583C 4E 80 04 21 */ bctrl +/* 803388DC 0033583C 4E 80 04 21 */ bctrl lbl_803388E0: /* 803388E0 00335840 88 01 00 50 */ lbz r0, 0x50(r1) /* 803388E4 00335844 28 00 00 00 */ cmplwi r0, 0 @@ -283,7 +283,7 @@ lbl_803388F4: /* 80338910 00335870 38 80 00 01 */ li r4, 1 /* 80338914 00335874 81 8C 00 08 */ lwz r12, 8(r12) /* 80338918 00335878 7D 89 03 A6 */ mtctr r12 -/* 8033891C 0033587C 4E 80 04 21 */ bctrl +/* 8033891C 0033587C 4E 80 04 21 */ bctrl /* 80338920 00335880 48 00 02 4C */ b lbl_80338B6C lbl_80338924: /* 80338924 00335884 7C 1A 00 D0 */ neg r0, r26 @@ -298,7 +298,7 @@ lbl_80338924: /* 80338948 003358A8 38 A1 00 48 */ addi r5, r1, 0x48 /* 8033894C 003358AC 93 41 00 4C */ stw r26, 0x4c(r1) /* 80338950 003358B0 7D 89 03 A6 */ mtctr r12 -/* 80338954 003358B4 4E 80 04 21 */ bctrl +/* 80338954 003358B4 4E 80 04 21 */ bctrl /* 80338958 003358B8 88 61 00 20 */ lbz r3, 0x20(r1) /* 8033895C 003358BC 38 00 00 00 */ li r0, 0 /* 80338960 003358C0 98 7D 00 00 */ stb r3, 0(r29) @@ -311,7 +311,7 @@ lbl_80338924: /* 8033897C 003358DC 38 80 00 01 */ li r4, 1 /* 80338980 003358E0 81 8C 00 08 */ lwz r12, 8(r12) /* 80338984 003358E4 7D 89 03 A6 */ mtctr r12 -/* 80338988 003358E8 4E 80 04 21 */ bctrl +/* 80338988 003358E8 4E 80 04 21 */ bctrl lbl_8033898C: /* 8033898C 003358EC 88 01 00 48 */ lbz r0, 0x48(r1) /* 80338990 003358F0 28 00 00 00 */ cmplwi r0, 0 @@ -385,7 +385,7 @@ lbl_80338A3C: /* 80338A80 003359E0 38 80 00 01 */ li r4, 1 /* 80338A84 003359E4 81 8C 00 08 */ lwz r12, 8(r12) /* 80338A88 003359E8 7D 89 03 A6 */ mtctr r12 -/* 80338A8C 003359EC 4E 80 04 21 */ bctrl +/* 80338A8C 003359EC 4E 80 04 21 */ bctrl lbl_80338A90: /* 80338A90 003359F0 7F 2C CB 78 */ mr r12, r25 /* 80338A94 003359F4 7F C4 F3 78 */ mr r4, r30 @@ -393,7 +393,7 @@ lbl_80338A90: /* 80338A9C 003359FC 38 61 00 10 */ addi r3, r1, 0x10 /* 80338AA0 00335A00 38 A1 00 84 */ addi r5, r1, 0x84 /* 80338AA4 00335A04 7D 89 03 A6 */ mtctr r12 -/* 80338AA8 00335A08 4E 80 04 21 */ bctrl +/* 80338AA8 00335A08 4E 80 04 21 */ bctrl /* 80338AAC 00335A0C 88 61 00 10 */ lbz r3, 0x10(r1) /* 80338AB0 00335A10 38 00 00 00 */ li r0, 0 /* 80338AB4 00335A14 98 7D 00 00 */ stb r3, 0(r29) @@ -406,7 +406,7 @@ lbl_80338A90: /* 80338AD0 00335A30 38 80 00 01 */ li r4, 1 /* 80338AD4 00335A34 81 8C 00 08 */ lwz r12, 8(r12) /* 80338AD8 00335A38 7D 89 03 A6 */ mtctr r12 -/* 80338ADC 00335A3C 4E 80 04 21 */ bctrl +/* 80338ADC 00335A3C 4E 80 04 21 */ bctrl lbl_80338AE0: /* 80338AE0 00335A40 38 61 00 84 */ addi r3, r1, 0x84 /* 80338AE4 00335A44 38 80 FF FF */ li r4, -1 @@ -424,7 +424,7 @@ lbl_80338AF0: /* 80338B10 00335A70 38 61 00 08 */ addi r3, r1, 8 /* 80338B14 00335A74 38 A1 00 60 */ addi r5, r1, 0x60 /* 80338B18 00335A78 7D 89 03 A6 */ mtctr r12 -/* 80338B1C 00335A7C 4E 80 04 21 */ bctrl +/* 80338B1C 00335A7C 4E 80 04 21 */ bctrl /* 80338B20 00335A80 88 61 00 08 */ lbz r3, 8(r1) /* 80338B24 00335A84 38 00 00 00 */ li r0, 0 /* 80338B28 00335A88 98 7D 00 00 */ stb r3, 0(r29) @@ -437,7 +437,7 @@ lbl_80338AF0: /* 80338B44 00335AA4 38 80 00 01 */ li r4, 1 /* 80338B48 00335AA8 81 8C 00 08 */ lwz r12, 8(r12) /* 80338B4C 00335AAC 7D 89 03 A6 */ mtctr r12 -/* 80338B50 00335AB0 4E 80 04 21 */ bctrl +/* 80338B50 00335AB0 4E 80 04 21 */ bctrl lbl_80338B54: /* 80338B54 00335AB4 3C 80 80 3F */ lis r4, __vt__15CMemoryInStream@ha /* 80338B58 00335AB8 38 61 00 60 */ addi r3, r1, 0x60 @@ -450,7 +450,7 @@ lbl_80338B6C: /* 80338B70 00335AD0 80 01 01 14 */ lwz r0, 0x114(r1) /* 80338B74 00335AD4 7C 08 03 A6 */ mtlr r0 /* 80338B78 00335AD8 38 21 01 10 */ addi r1, r1, 0x110 -/* 80338B7C 00335ADC 4E 80 00 20 */ blr +/* 80338B7C 00335ADC 4E 80 00 20 */ blr .global MakeObject__11CFactoryMgrFRC10SObjectTagR12CInputStreamRC15CVParamTransfer MakeObject__11CFactoryMgrFRC10SObjectTagR12CInputStreamRC15CVParamTransfer: @@ -494,7 +494,7 @@ lbl_80338BF4: lbl_80338C00: /* 80338C00 00335B60 81 89 00 14 */ lwz r12, 0x14(r9) /* 80338C04 00335B64 7D 89 03 A6 */ mtctr r12 -/* 80338C08 00335B68 4E 80 04 21 */ bctrl +/* 80338C08 00335B68 4E 80 04 21 */ bctrl /* 80338C0C 00335B6C 88 61 00 08 */ lbz r3, 8(r1) /* 80338C10 00335B70 38 00 00 00 */ li r0, 0 /* 80338C14 00335B74 98 7F 00 00 */ stb r3, 0(r31) @@ -507,13 +507,13 @@ lbl_80338C00: /* 80338C30 00335B90 38 80 00 01 */ li r4, 1 /* 80338C34 00335B94 81 8C 00 08 */ lwz r12, 8(r12) /* 80338C38 00335B98 7D 89 03 A6 */ mtctr r12 -/* 80338C3C 00335B9C 4E 80 04 21 */ bctrl +/* 80338C3C 00335B9C 4E 80 04 21 */ bctrl lbl_80338C40: /* 80338C40 00335BA0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80338C44 00335BA4 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80338C48 00335BA8 7C 08 03 A6 */ mtlr r0 /* 80338C4C 00335BAC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80338C50 00335BB0 4E 80 00 20 */ blr +/* 80338C50 00335BB0 4E 80 00 20 */ blr .global CanMakeMemory__11CFactoryMgrFRC10SObjectTag CanMakeMemory__11CFactoryMgrFRC10SObjectTag: @@ -559,7 +559,7 @@ lbl_80338CD4: /* 80338CD4 00335C34 38 60 00 01 */ li r3, 1 lbl_80338CD8: /* 80338CD8 00335C38 38 21 00 10 */ addi r1, r1, 0x10 -/* 80338CDC 00335C3C 4E 80 00 20 */ blr +/* 80338CDC 00335C3C 4E 80 00 20 */ blr .global "AddFactory__11CFactoryMgrFUiPFRC10SObjectTagRCQ24rstl12auto_ptriRC15CVParamTransfer_C16CFactoryFnReturn" "AddFactory__11CFactoryMgrFUiPFRC10SObjectTagRCQ24rstl12auto_ptriRC15CVParamTransfer_C16CFactoryFnReturn": @@ -619,7 +619,7 @@ lbl_80338D90: /* 80338D90 00335CF0 80 01 00 34 */ lwz r0, 0x34(r1) /* 80338D94 00335CF4 7C 08 03 A6 */ mtlr r0 /* 80338D98 00335CF8 38 21 00 30 */ addi r1, r1, 0x30 -/* 80338D9C 00335CFC 4E 80 00 20 */ blr +/* 80338D9C 00335CFC 4E 80 00 20 */ blr .global AddFactory__11CFactoryMgrFUiPFRC10SObjectTagR12CInputStreamRC15CVParamTransfer_C16CFactoryFnReturn AddFactory__11CFactoryMgrFUiPFRC10SObjectTagR12CInputStreamRC15CVParamTransfer_C16CFactoryFnReturn: @@ -679,7 +679,7 @@ lbl_80338E50: /* 80338E50 00335DB0 80 01 00 34 */ lwz r0, 0x34(r1) /* 80338E54 00335DB4 7C 08 03 A6 */ mtlr r0 /* 80338E58 00335DB8 38 21 00 30 */ addi r1, r1, 0x30 -/* 80338E5C 00335DBC 4E 80 00 20 */ blr +/* 80338E5C 00335DBC 4E 80 00 20 */ blr .global sub_80338e60 sub_80338e60: @@ -733,7 +733,7 @@ lbl_80338EFC: /* 80338F08 00335E68 83 C1 00 08 */ lwz r30, 8(r1) /* 80338F0C 00335E6C 7C 08 03 A6 */ mtlr r0 /* 80338F10 00335E70 38 21 00 10 */ addi r1, r1, 0x10 -/* 80338F14 00335E74 4E 80 00 20 */ blr +/* 80338F14 00335E74 4E 80 00 20 */ blr .global __ct__11CFactoryMgrFv __ct__11CFactoryMgrFv: @@ -756,7 +756,7 @@ __ct__11CFactoryMgrFv: /* 80338F58 00335EB8 90 A3 00 20 */ stw r5, 0x20(r3) /* 80338F5C 00335EBC 90 A3 00 24 */ stw r5, 0x24(r3) /* 80338F60 00335EC0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80338F64 00335EC4 4E 80 00 20 */ blr +/* 80338F64 00335EC4 4E 80 00 20 */ blr .global sub_80338f68 sub_80338f68: @@ -788,7 +788,7 @@ lbl_80338FB8: /* 80338FC0 00335F20 83 C1 00 08 */ lwz r30, 8(r1) /* 80338FC4 00335F24 7C 08 03 A6 */ mtlr r0 /* 80338FC8 00335F28 38 21 00 10 */ addi r1, r1, 0x10 -/* 80338FCC 00335F2C 4E 80 00 20 */ blr +/* 80338FCC 00335F2C 4E 80 00 20 */ blr .global sub_80338fd0 sub_80338fd0: @@ -944,7 +944,7 @@ lbl_803391F4: /* 803391F8 00336158 80 01 00 24 */ lwz r0, 0x24(r1) /* 803391FC 0033615C 7C 08 03 A6 */ mtlr r0 /* 80339200 00336160 38 21 00 20 */ addi r1, r1, 0x20 -/* 80339204 00336164 4E 80 00 20 */ blr +/* 80339204 00336164 4E 80 00 20 */ blr .global sub_80339208 sub_80339208: @@ -976,7 +976,7 @@ lbl_80339258: /* 80339260 003361C0 83 C1 00 08 */ lwz r30, 8(r1) /* 80339264 003361C4 7C 08 03 A6 */ mtlr r0 /* 80339268 003361C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033926C 003361CC 4E 80 00 20 */ blr +/* 8033926C 003361CC 4E 80 00 20 */ blr .global sub_80339270 sub_80339270: diff --git a/asm/Kyoto/CFactoryStore.s b/asm/Kyoto/CFactoryStore.s index 5b4efd25..3b5414a0 100644 --- a/asm/Kyoto/CFactoryStore.s +++ b/asm/Kyoto/CFactoryStore.s @@ -41,4 +41,4 @@ lbl_8033FA9C: /* 8033FAA4 0033CA04 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8033FAA8 0033CA08 7C 08 03 A6 */ mtlr r0 /* 8033FAAC 0033CA0C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033FAB0 0033CA10 4E 80 00 20 */ blr +/* 8033FAB0 0033CA10 4E 80 00 20 */ blr diff --git a/asm/Kyoto/CFinalInput.s b/asm/Kyoto/CFinalInput.s index d9502dc0..9af322d6 100644 --- a/asm/Kyoto/CFinalInput.s +++ b/asm/Kyoto/CFinalInput.s @@ -206,7 +206,7 @@ ScaleAnalogueSticks__11CFinalInputCFff: /* 80349050 00345FB0 80 01 00 D4 */ lwz r0, 0xd4(r1) /* 80349054 00345FB4 7C 08 03 A6 */ mtlr r0 /* 80349058 00345FB8 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 8034905C 00345FBC 4E 80 00 20 */ blr +/* 8034905C 00345FBC 4E 80 00 20 */ blr .global __ct__11CFinalInputFifRC10COsContext __ct__11CFinalInputFifRC10COsContext: @@ -621,7 +621,7 @@ lbl_80349678: /* 80349690 003465F0 83 C1 00 C8 */ lwz r30, 0xc8(r1) /* 80349694 003465F4 7C 08 03 A6 */ mtlr r0 /* 80349698 003465F8 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 8034969C 003465FC 4E 80 00 20 */ blr +/* 8034969C 003465FC 4E 80 00 20 */ blr .global InitializeAnalog__11CFinalInputFff InitializeAnalog__11CFinalInputFff: @@ -991,7 +991,7 @@ lbl_80349BE8: /* 80349BFC 00346B5C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80349C00 00346B60 7C 08 03 A6 */ mtlr r0 /* 80349C04 00346B64 38 21 00 40 */ addi r1, r1, 0x40 -/* 80349C08 00346B68 4E 80 00 20 */ blr +/* 80349C08 00346B68 4E 80 00 20 */ blr .global __ct__11CFinalInputFifRC22CControllerGamepadDataff __ct__11CFinalInputFifRC22CControllerGamepadDataff: @@ -1127,7 +1127,7 @@ __ct__11CFinalInputFifRC22CControllerGamepadDataff: /* 80349E10 00346D70 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80349E14 00346D74 7C 08 03 A6 */ mtlr r0 /* 80349E18 00346D78 38 21 00 10 */ addi r1, r1, 0x10 -/* 80349E1C 00346D7C 4E 80 00 20 */ blr +/* 80349E1C 00346D7C 4E 80 00 20 */ blr .global __ct__11CFinalInputFv __ct__11CFinalInputFv: diff --git a/asm/Kyoto/CFrameDelayedKiller.s b/asm/Kyoto/CFrameDelayedKiller.s index 0ec8c6f2..6293f058 100644 --- a/asm/Kyoto/CFrameDelayedKiller.s +++ b/asm/Kyoto/CFrameDelayedKiller.s @@ -14,7 +14,7 @@ lbl_80540A4C: .global lbl_805A96B0 lbl_805A96B0: .skip 0x8 - + .section .text, "ax" .global sub_8036ca64 @@ -26,7 +26,7 @@ sub_8036ca64: /* 8036CA74 003699D4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8036CA78 003699D8 7C 08 03 A6 */ mtlr r0 /* 8036CA7C 003699DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8036CA80 003699E0 4E 80 00 20 */ blr +/* 8036CA80 003699E0 4E 80 00 20 */ blr .global __nw__FUlPCcPCc_0 __nw__FUlPCcPCc_0: @@ -37,18 +37,18 @@ __nw__FUlPCcPCc_0: /* 8036CA94 003699F4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8036CA98 003699F8 7C 08 03 A6 */ mtlr r0 /* 8036CA9C 003699FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8036CAA0 00369A00 4E 80 00 20 */ blr +/* 8036CAA0 00369A00 4E 80 00 20 */ blr .global sub_8036caa4 sub_8036caa4: /* 8036CAA4 00369A04 80 63 00 08 */ lwz r3, 8(r3) -/* 8036CAA8 00369A08 4E 80 00 20 */ blr +/* 8036CAA8 00369A08 4E 80 00 20 */ blr .global sub_8036caac sub_8036caac: /* 8036CAAC 00369A0C 80 03 00 04 */ lwz r0, 4(r3) /* 8036CAB0 00369A10 54 03 10 3A */ slwi r3, r0, 2 -/* 8036CAB4 00369A14 4E 80 00 20 */ blr +/* 8036CAB4 00369A14 4E 80 00 20 */ blr .global sub_8036cab8 sub_8036cab8: @@ -59,18 +59,18 @@ sub_8036cab8: /* 8036CAC8 00369A28 40 81 00 10 */ ble lbl_8036CAD8 /* 8036CACC 00369A2C 38 00 00 00 */ li r0, 0 /* 8036CAD0 00369A30 90 03 00 04 */ stw r0, 4(r3) -/* 8036CAD4 00369A34 4E 80 00 20 */ blr +/* 8036CAD4 00369A34 4E 80 00 20 */ blr lbl_8036CAD8: /* 8036CAD8 00369A38 7C 04 00 50 */ subf r0, r4, r0 /* 8036CADC 00369A3C 90 03 00 04 */ stw r0, 4(r3) -/* 8036CAE0 00369A40 4E 80 00 20 */ blr +/* 8036CAE0 00369A40 4E 80 00 20 */ blr .global sub_8036cae4 sub_8036cae4: /* 8036CAE4 00369A44 80 83 00 08 */ lwz r4, 8(r3) /* 8036CAE8 00369A48 38 04 FF FF */ addi r0, r4, -1 /* 8036CAEC 00369A4C 90 03 00 08 */ stw r0, 8(r3) -/* 8036CAF0 00369A50 4E 80 00 20 */ blr +/* 8036CAF0 00369A50 4E 80 00 20 */ blr .global sub_8036caf4 sub_8036caf4: @@ -86,7 +86,7 @@ sub_8036caf4: /* 8036CB18 00369A78 38 04 00 01 */ addi r0, r4, 1 /* 8036CB1C 00369A7C 90 03 00 08 */ stw r0, 8(r3) /* 8036CB20 00369A80 7C A3 2B 78 */ mr r3, r5 -/* 8036CB24 00369A84 4E 80 00 20 */ blr +/* 8036CB24 00369A84 4E 80 00 20 */ blr .global sub_8036cb28 sub_8036cb28: @@ -99,7 +99,7 @@ sub_8036cb28: /* 8036CB40 00369AA0 7C 00 00 34 */ cntlzw r0, r0 /* 8036CB44 00369AA4 7C 60 00 30 */ slw r0, r3, r0 /* 8036CB48 00369AA8 54 03 0F FE */ srwi r3, r0, 0x1f -/* 8036CB4C 00369AAC 4E 80 00 20 */ blr +/* 8036CB4C 00369AAC 4E 80 00 20 */ blr .global sub_8036cb50 sub_8036cb50: @@ -112,7 +112,7 @@ sub_8036cb50: /* 8036CB68 00369AC8 7C 00 00 34 */ cntlzw r0, r0 /* 8036CB6C 00369ACC 7C 60 00 30 */ slw r0, r3, r0 /* 8036CB70 00369AD0 54 03 0F FE */ srwi r3, r0, 0x1f -/* 8036CB74 00369AD4 4E 80 00 20 */ blr +/* 8036CB74 00369AD4 4E 80 00 20 */ blr .global sub_8036cb78 sub_8036cb78: @@ -121,7 +121,7 @@ sub_8036cb78: /* 8036CB80 00369AE0 90 83 00 00 */ stw r4, 0(r3) /* 8036CB84 00369AE4 90 03 00 04 */ stw r0, 4(r3) /* 8036CB88 00369AE8 90 03 00 08 */ stw r0, 8(r3) -/* 8036CB8C 00369AEC 4E 80 00 20 */ blr +/* 8036CB8C 00369AEC 4E 80 00 20 */ blr .global sub_8036cb90 sub_8036cb90: @@ -163,7 +163,7 @@ lbl_8036CBF8: /* 8036CC0C 00369B6C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8036CC10 00369B70 7C 08 03 A6 */ mtlr r0 /* 8036CC14 00369B74 38 21 00 20 */ addi r1, r1, 0x20 -/* 8036CC18 00369B78 4E 80 00 20 */ blr +/* 8036CC18 00369B78 4E 80 00 20 */ blr .global sub_8036cc1c sub_8036cc1c: @@ -226,7 +226,7 @@ lbl_8036CCB4: /* 8036CCEC 00369C4C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8036CCF0 00369C50 7C 08 03 A6 */ mtlr r0 /* 8036CCF4 00369C54 38 21 00 20 */ addi r1, r1, 0x20 -/* 8036CCF8 00369C58 4E 80 00 20 */ blr +/* 8036CCF8 00369C58 4E 80 00 20 */ blr .global sub_8036ccfc sub_8036ccfc: @@ -238,7 +238,7 @@ sub_8036ccfc: /* 8036CD10 00369C70 80 01 00 14 */ lwz r0, 0x14(r1) /* 8036CD14 00369C74 7C 08 03 A6 */ mtlr r0 /* 8036CD18 00369C78 38 21 00 10 */ addi r1, r1, 0x10 -/* 8036CD1C 00369C7C 4E 80 00 20 */ blr +/* 8036CD1C 00369C7C 4E 80 00 20 */ blr .global sub_8036cd20 sub_8036cd20: @@ -256,7 +256,7 @@ lbl_8036CD34: /* 8036CD48 00369CA8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8036CD4C 00369CAC 7C 08 03 A6 */ mtlr r0 /* 8036CD50 00369CB0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8036CD54 00369CB4 4E 80 00 20 */ blr +/* 8036CD54 00369CB4 4E 80 00 20 */ blr .global sub_8036cd58 sub_8036cd58: @@ -267,7 +267,7 @@ sub_8036cd58: /* 8036CD68 00369CC8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8036CD6C 00369CCC 7C 08 03 A6 */ mtlr r0 /* 8036CD70 00369CD0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8036CD74 00369CD4 4E 80 00 20 */ blr +/* 8036CD74 00369CD4 4E 80 00 20 */ blr .global sub_8036cd78 sub_8036cd78: @@ -278,7 +278,7 @@ sub_8036cd78: /* 8036CD88 00369CE8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8036CD8C 00369CEC 7C 08 03 A6 */ mtlr r0 /* 8036CD90 00369CF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8036CD94 00369CF4 4E 80 00 20 */ blr +/* 8036CD94 00369CF4 4E 80 00 20 */ blr .global sub_8036cd98 sub_8036cd98: @@ -314,7 +314,7 @@ lbl_8036CDEC: /* 8036CE04 00369D64 80 01 00 14 */ lwz r0, 0x14(r1) /* 8036CE08 00369D68 7C 08 03 A6 */ mtlr r0 /* 8036CE0C 00369D6C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8036CE10 00369D70 4E 80 00 20 */ blr +/* 8036CE10 00369D70 4E 80 00 20 */ blr .global __sinit_CFrameDelayedKiller_cpp __sinit_CFrameDelayedKiller_cpp: @@ -339,7 +339,7 @@ __sinit_CFrameDelayedKiller_cpp: /* 8036CE5C 00369DBC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8036CE60 00369DC0 7C 08 03 A6 */ mtlr r0 /* 8036CE64 00369DC4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8036CE68 00369DC8 4E 80 00 20 */ blr +/* 8036CE68 00369DC8 4E 80 00 20 */ blr .global sub_8036ce6c sub_8036ce6c: @@ -375,7 +375,7 @@ lbl_8036CEC4: /* 8036CED4 00369E34 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8036CED8 00369E38 7C 08 03 A6 */ mtlr r0 /* 8036CEDC 00369E3C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8036CEE0 00369E40 4E 80 00 20 */ blr +/* 8036CEE0 00369E40 4E 80 00 20 */ blr .global __arraydtor$381 __arraydtor$381: @@ -392,7 +392,7 @@ __arraydtor$381: /* 8036CF0C 00369E6C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8036CF10 00369E70 7C 08 03 A6 */ mtlr r0 /* 8036CF14 00369E74 38 21 00 10 */ addi r1, r1, 0x10 -/* 8036CF18 00369E78 4E 80 00 20 */ blr +/* 8036CF18 00369E78 4E 80 00 20 */ blr .global sub_8036cf1c sub_8036cf1c: @@ -403,5 +403,5 @@ sub_8036cf1c: /* 8036CF2C 00369E8C 90 83 00 0C */ stw r4, 0xc(r3) /* 8036CF30 00369E90 90 83 00 10 */ stw r4, 0x10(r3) /* 8036CF34 00369E94 90 03 00 14 */ stw r0, 0x14(r3) -/* 8036CF38 00369E98 4E 80 00 20 */ blr +/* 8036CF38 00369E98 4E 80 00 20 */ blr diff --git a/asm/Kyoto/CObjectReference.s b/asm/Kyoto/CObjectReference.s index 6c6cc5e3..449272cf 100644 --- a/asm/Kyoto/CObjectReference.s +++ b/asm/Kyoto/CObjectReference.s @@ -16,7 +16,7 @@ IsLoading__16CObjectReferenceCFv: /* 8033FAD8 0033CA38 38 80 00 01 */ li r4, 1 lbl_8033FADC: /* 8033FADC 0033CA3C 7C 83 23 78 */ mr r3, r4 -/* 8033FAE0 0033CA40 4E 80 00 20 */ blr +/* 8033FAE0 0033CA40 4E 80 00 20 */ blr .global Unlock__16CObjectReferenceFv Unlock__16CObjectReferenceFv: @@ -56,7 +56,7 @@ lbl_8033FB5C: /* 8033FB60 0033CAC0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8033FB64 0033CAC4 7C 08 03 A6 */ mtlr r0 /* 8033FB68 0033CAC8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033FB6C 0033CACC 4E 80 00 20 */ blr +/* 8033FB6C 0033CACC 4E 80 00 20 */ blr .global RemoveReference__16CObjectReferenceFv RemoveReference__16CObjectReferenceFv: @@ -90,14 +90,14 @@ lbl_8033FBC4: /* 8033FBD4 0033CB34 38 9F 00 04 */ addi r4, r31, 4 /* 8033FBD8 0033CB38 81 8C 00 28 */ lwz r12, 0x28(r12) /* 8033FBDC 0033CB3C 7D 89 03 A6 */ mtctr r12 -/* 8033FBE0 0033CB40 4E 80 04 21 */ bctrl +/* 8033FBE0 0033CB40 4E 80 04 21 */ bctrl lbl_8033FBE4: /* 8033FBE4 0033CB44 80 01 00 14 */ lwz r0, 0x14(r1) /* 8033FBE8 0033CB48 A8 7F 00 00 */ lha r3, 0(r31) /* 8033FBEC 0033CB4C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8033FBF0 0033CB50 7C 08 03 A6 */ mtlr r0 /* 8033FBF4 0033CB54 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033FBF8 0033CB58 4E 80 00 20 */ blr +/* 8033FBF8 0033CB58 4E 80 00 20 */ blr .global CancelLoad__16CObjectReferenceFv CancelLoad__16CObjectReferenceFv: @@ -116,12 +116,12 @@ CancelLoad__16CObjectReferenceFv: /* 8033FC2C 0033CB8C 81 83 00 00 */ lwz r12, 0(r3) /* 8033FC30 0033CB90 81 8C 00 20 */ lwz r12, 0x20(r12) /* 8033FC34 0033CB94 7D 89 03 A6 */ mtctr r12 -/* 8033FC38 0033CB98 4E 80 04 21 */ bctrl +/* 8033FC38 0033CB98 4E 80 04 21 */ bctrl /* 8033FC3C 0033CB9C 81 83 00 00 */ lwz r12, 0(r3) /* 8033FC40 0033CBA0 38 9F 00 04 */ addi r4, r31, 4 /* 8033FC44 0033CBA4 81 8C 00 14 */ lwz r12, 0x14(r12) /* 8033FC48 0033CBA8 7D 89 03 A6 */ mtctr r12 -/* 8033FC4C 0033CBAC 4E 80 04 21 */ bctrl +/* 8033FC4C 0033CBAC 4E 80 04 21 */ bctrl /* 8033FC50 0033CBB0 88 1F 00 03 */ lbz r0, 3(r31) /* 8033FC54 0033CBB4 38 60 00 00 */ li r3, 0 /* 8033FC58 0033CBB8 50 60 07 FE */ rlwimi r0, r3, 0, 0x1f, 0x1f @@ -131,7 +131,7 @@ lbl_8033FC60: /* 8033FC64 0033CBC4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8033FC68 0033CBC8 7C 08 03 A6 */ mtlr r0 /* 8033FC6C 0033CBCC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033FC70 0033CBD0 4E 80 00 20 */ blr +/* 8033FC70 0033CBD0 4E 80 00 20 */ blr .global Unload__16CObjectReferenceFv Unload__16CObjectReferenceFv: @@ -147,7 +147,7 @@ Unload__16CObjectReferenceFv: /* 8033FC98 0033CBF8 38 80 00 01 */ li r4, 1 /* 8033FC9C 0033CBFC 81 8C 00 08 */ lwz r12, 8(r12) /* 8033FCA0 0033CC00 7D 89 03 A6 */ mtctr r12 -/* 8033FCA4 0033CC04 4E 80 04 21 */ bctrl +/* 8033FCA4 0033CC04 4E 80 04 21 */ bctrl lbl_8033FCA8: /* 8033FCA8 0033CC08 38 60 00 00 */ li r3, 0 /* 8033FCAC 0033CC0C 90 7F 00 10 */ stw r3, 0x10(r31) @@ -158,7 +158,7 @@ lbl_8033FCA8: /* 8033FCC0 0033CC20 80 01 00 14 */ lwz r0, 0x14(r1) /* 8033FCC4 0033CC24 7C 08 03 A6 */ mtlr r0 /* 8033FCC8 0033CC28 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033FCCC 0033CC2C 4E 80 00 20 */ blr +/* 8033FCCC 0033CC2C 4E 80 00 20 */ blr .global GetObject__16CObjectReferenceFv GetObject__16CObjectReferenceFv: @@ -174,7 +174,7 @@ GetObject__16CObjectReferenceFv: /* 8033FCF4 0033CC54 81 83 00 00 */ lwz r12, 0(r3) /* 8033FCF8 0033CC58 81 8C 00 20 */ lwz r12, 0x20(r12) /* 8033FCFC 0033CC5C 7D 89 03 A6 */ mtctr r12 -/* 8033FD00 0033CC60 4E 80 04 21 */ bctrl +/* 8033FD00 0033CC60 4E 80 04 21 */ bctrl /* 8033FD04 0033CC64 7C 64 1B 78 */ mr r4, r3 /* 8033FD08 0033CC68 38 61 00 08 */ addi r3, r1, 8 /* 8033FD0C 0033CC6C 81 84 00 00 */ lwz r12, 0(r4) @@ -182,7 +182,7 @@ GetObject__16CObjectReferenceFv: /* 8033FD14 0033CC74 38 DF 00 14 */ addi r6, r31, 0x14 /* 8033FD18 0033CC78 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8033FD1C 0033CC7C 7D 89 03 A6 */ mtctr r12 -/* 8033FD20 0033CC80 4E 80 04 21 */ bctrl +/* 8033FD20 0033CC80 4E 80 04 21 */ bctrl /* 8033FD24 0033CC84 38 00 00 00 */ li r0, 0 /* 8033FD28 0033CC88 80 61 00 0C */ lwz r3, 0xc(r1) /* 8033FD2C 0033CC8C 98 01 00 08 */ stb r0, 8(r1) @@ -197,7 +197,7 @@ GetObject__16CObjectReferenceFv: /* 8033FD50 0033CCB0 38 80 00 01 */ li r4, 1 /* 8033FD54 0033CCB4 81 8C 00 08 */ lwz r12, 8(r12) /* 8033FD58 0033CCB8 7D 89 03 A6 */ mtctr r12 -/* 8033FD5C 0033CCBC 4E 80 04 21 */ bctrl +/* 8033FD5C 0033CCBC 4E 80 04 21 */ bctrl lbl_8033FD60: /* 8033FD60 0033CCC0 88 1F 00 03 */ lbz r0, 3(r31) /* 8033FD64 0033CCC4 38 60 00 00 */ li r3, 0 @@ -208,7 +208,7 @@ lbl_8033FD60: /* 8033FD78 0033CCD8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8033FD7C 0033CCDC 7C 08 03 A6 */ mtlr r0 /* 8033FD80 0033CCE0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8033FD84 0033CCE4 4E 80 00 20 */ blr +/* 8033FD84 0033CCE4 4E 80 00 20 */ blr .global Lock__16CObjectReferenceFv Lock__16CObjectReferenceFv: @@ -235,14 +235,14 @@ Lock__16CObjectReferenceFv: /* 8033FDD8 0033CD38 81 83 00 00 */ lwz r12, 0(r3) /* 8033FDDC 0033CD3C 81 8C 00 20 */ lwz r12, 0x20(r12) /* 8033FDE0 0033CD40 7D 89 03 A6 */ mtctr r12 -/* 8033FDE4 0033CD44 4E 80 04 21 */ bctrl +/* 8033FDE4 0033CD44 4E 80 04 21 */ bctrl /* 8033FDE8 0033CD48 81 83 00 00 */ lwz r12, 0(r3) /* 8033FDEC 0033CD4C 38 9F 00 04 */ addi r4, r31, 4 /* 8033FDF0 0033CD50 38 BF 00 14 */ addi r5, r31, 0x14 /* 8033FDF4 0033CD54 38 DF 00 10 */ addi r6, r31, 0x10 /* 8033FDF8 0033CD58 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8033FDFC 0033CD5C 7D 89 03 A6 */ mtctr r12 -/* 8033FE00 0033CD60 4E 80 04 21 */ bctrl +/* 8033FE00 0033CD60 4E 80 04 21 */ bctrl /* 8033FE04 0033CD64 88 1F 00 03 */ lbz r0, 3(r31) /* 8033FE08 0033CD68 38 60 00 01 */ li r3, 1 /* 8033FE0C 0033CD6C 50 60 07 FE */ rlwimi r0, r3, 0, 0x1f, 0x1f @@ -252,7 +252,7 @@ lbl_8033FE14: /* 8033FE18 0033CD78 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8033FE1C 0033CD7C 7C 08 03 A6 */ mtlr r0 /* 8033FE20 0033CD80 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033FE24 0033CD84 4E 80 00 20 */ blr +/* 8033FE24 0033CD84 4E 80 00 20 */ blr .global __dt__16CObjectReferenceFv __dt__16CObjectReferenceFv: @@ -272,7 +272,7 @@ __dt__16CObjectReferenceFv: /* 8033FE5C 0033CDBC 38 80 00 01 */ li r4, 1 /* 8033FE60 0033CDC0 81 8C 00 08 */ lwz r12, 8(r12) /* 8033FE64 0033CDC4 7D 89 03 A6 */ mtctr r12 -/* 8033FE68 0033CDC8 4E 80 04 21 */ bctrl +/* 8033FE68 0033CDC8 4E 80 04 21 */ bctrl /* 8033FE6C 0033CDCC 48 00 00 40 */ b lbl_8033FEAC lbl_8033FE70: /* 8033FE70 0033CDD0 88 1E 00 03 */ lbz r0, 3(r30) @@ -284,12 +284,12 @@ lbl_8033FE70: /* 8033FE88 0033CDE8 81 83 00 00 */ lwz r12, 0(r3) /* 8033FE8C 0033CDEC 81 8C 00 20 */ lwz r12, 0x20(r12) /* 8033FE90 0033CDF0 7D 89 03 A6 */ mtctr r12 -/* 8033FE94 0033CDF4 4E 80 04 21 */ bctrl +/* 8033FE94 0033CDF4 4E 80 04 21 */ bctrl /* 8033FE98 0033CDF8 81 83 00 00 */ lwz r12, 0(r3) /* 8033FE9C 0033CDFC 38 9E 00 04 */ addi r4, r30, 4 /* 8033FEA0 0033CE00 81 8C 00 14 */ lwz r12, 0x14(r12) /* 8033FEA4 0033CE04 7D 89 03 A6 */ mtctr r12 -/* 8033FEA8 0033CE08 4E 80 04 21 */ bctrl +/* 8033FEA8 0033CE08 4E 80 04 21 */ bctrl lbl_8033FEAC: /* 8033FEAC 0033CE0C 34 1E 00 14 */ addic. r0, r30, 0x14 /* 8033FEB0 0033CE10 41 82 00 14 */ beq lbl_8033FEC4 @@ -309,7 +309,7 @@ lbl_8033FED4: /* 8033FEE0 0033CE40 83 C1 00 08 */ lwz r30, 8(r1) /* 8033FEE4 0033CE44 7C 08 03 A6 */ mtlr r0 /* 8033FEE8 0033CE48 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033FEEC 0033CE4C 4E 80 00 20 */ blr +/* 8033FEEC 0033CE4C 4E 80 00 20 */ blr .global "__ct__16CObjectReferenceFRCQ24rstl15auto_ptr<4IObj>" "__ct__16CObjectReferenceFRCQ24rstl15auto_ptr<4IObj>": @@ -347,7 +347,7 @@ lbl_8033FED4: /* 8033FF6C 0033CECC 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8033FF70 0033CED0 7C 08 03 A6 */ mtlr r0 /* 8033FF74 0033CED4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8033FF78 0033CED8 4E 80 00 20 */ blr +/* 8033FF78 0033CED8 4E 80 00 20 */ blr .global "__ct__16CObjectReferenceFR12IObjectStoreRCQ24rstl15auto_ptr<4IObj>RC10SObjectTag15CVParamTransfer" "__ct__16CObjectReferenceFR12IObjectStoreRCQ24rstl15auto_ptr<4IObj>RC10SObjectTag15CVParamTransfer": @@ -375,4 +375,4 @@ lbl_8033FED4: /* 8033FFD0 0033CF30 80 85 00 04 */ lwz r4, 4(r5) /* 8033FFD4 0033CF34 38 04 00 01 */ addi r0, r4, 1 /* 8033FFD8 0033CF38 90 05 00 04 */ stw r0, 4(r5) -/* 8033FFDC 0033CF3C 4E 80 00 20 */ blr +/* 8033FFDC 0033CF3C 4E 80 00 20 */ blr diff --git a/asm/Kyoto/CPakFile.s b/asm/Kyoto/CPakFile.s index 8fcddf2d..ca7b7bb8 100644 --- a/asm/Kyoto/CPakFile.s +++ b/asm/Kyoto/CPakFile.s @@ -182,7 +182,7 @@ lbl_8036740C: /* 8036741C 0036437C 83 81 00 20 */ lwz r28, 0x20(r1) /* 80367420 00364380 7C 08 03 A6 */ mtlr r0 /* 80367424 00364384 38 21 00 30 */ addi r1, r1, 0x30 -/* 80367428 00364388 4E 80 00 20 */ blr +/* 80367428 00364388 4E 80 00 20 */ blr .global sub_8036742c sub_8036742c: @@ -253,7 +253,7 @@ lbl_80367510: /* 80367514 00364474 83 E1 00 4C */ lwz r31, 0x4c(r1) /* 80367518 00364478 7C 08 03 A6 */ mtlr r0 /* 8036751C 0036447C 38 21 00 50 */ addi r1, r1, 0x50 -/* 80367520 00364480 4E 80 00 20 */ blr +/* 80367520 00364480 4E 80 00 20 */ blr .global sub_80367524 sub_80367524: @@ -331,7 +331,7 @@ lbl_80367610: /* 80367618 00364578 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8036761C 0036457C 7C 08 03 A6 */ mtlr r0 /* 80367620 00364580 38 21 00 20 */ addi r1, r1, 0x20 -/* 80367624 00364584 4E 80 00 20 */ blr +/* 80367624 00364584 4E 80 00 20 */ blr .global GetDepList__8CPakFileCFv GetDepList__8CPakFileCFv: @@ -339,10 +339,10 @@ GetDepList__8CPakFileCFv: /* 8036762C 0036458C 2C 00 00 00 */ cmpwi r0, 0 /* 80367630 00364590 41 82 00 0C */ beq lbl_8036763C /* 80367634 00364594 38 63 00 64 */ addi r3, r3, 0x64 -/* 80367638 00364598 4E 80 00 20 */ blr +/* 80367638 00364598 4E 80 00 20 */ blr lbl_8036763C: /* 8036763C 0036459C 38 60 00 00 */ li r3, 0 -/* 80367640 003645A0 4E 80 00 20 */ blr +/* 80367640 003645A0 4E 80 00 20 */ blr .global GetResIdByName__8CPakFileCFPCc GetResIdByName__8CPakFileCFPCc: @@ -393,7 +393,7 @@ lbl_803676D0: /* 803676E0 00364640 83 81 00 20 */ lwz r28, 0x20(r1) /* 803676E4 00364644 7C 08 03 A6 */ mtlr r0 /* 803676E8 00364648 38 21 00 30 */ addi r1, r1, 0x30 -/* 803676EC 0036464C 4E 80 00 20 */ blr +/* 803676EC 0036464C 4E 80 00 20 */ blr .global GetResInfoForLoadPreferForward__8CPakFileCFUi GetResInfoForLoadPreferForward__8CPakFileCFUi: @@ -501,7 +501,7 @@ lbl_80367858: /* 8036785C 003647BC 80 01 00 54 */ lwz r0, 0x54(r1) /* 80367860 003647C0 7C 08 03 A6 */ mtlr r0 /* 80367864 003647C4 38 21 00 50 */ addi r1, r1, 0x50 -/* 80367868 003647C8 4E 80 00 20 */ blr +/* 80367868 003647C8 4E 80 00 20 */ blr .global GetResInfoForLoadDirectionless__8CPakFileCFUi GetResInfoForLoadDirectionless__8CPakFileCFUi: @@ -600,7 +600,7 @@ lbl_803679B8: /* 803679BC 0036491C 80 01 00 54 */ lwz r0, 0x54(r1) /* 803679C0 00364920 7C 08 03 A6 */ mtlr r0 /* 803679C4 00364924 38 21 00 50 */ addi r1, r1, 0x50 -/* 803679C8 00364928 4E 80 00 20 */ blr +/* 803679C8 00364928 4E 80 00 20 */ blr .global GetResInfo__8CPakFileCFUi GetResInfo__8CPakFileCFUi: @@ -664,7 +664,7 @@ lbl_80367A98: /* 80367AA0 00364A00 83 C1 00 38 */ lwz r30, 0x38(r1) /* 80367AA4 00364A04 7C 08 03 A6 */ mtlr r0 /* 80367AA8 00364A08 38 21 00 40 */ addi r1, r1, 0x40 -/* 80367AAC 00364A0C 4E 80 00 20 */ blr +/* 80367AAC 00364A0C 4E 80 00 20 */ blr .global GetFakeStaticSize__8CPakFileCFv GetFakeStaticSize__8CPakFileCFv: @@ -673,7 +673,7 @@ GetFakeStaticSize__8CPakFileCFv: /* 80367AB8 00364A18 1C 00 00 0A */ mulli r0, r0, 0xa /* 80367ABC 00364A1C 54 63 10 3A */ slwi r3, r3, 2 /* 80367AC0 00364A20 7C 63 02 14 */ add r3, r3, r0 -/* 80367AC4 00364A24 4E 80 00 20 */ blr +/* 80367AC4 00364A24 4E 80 00 20 */ blr .global LoadResourceTable__8CPakFileFR15CMemoryInStream LoadResourceTable__8CPakFileFR15CMemoryInStream: @@ -810,7 +810,7 @@ lbl_80367C58: /* 80367CA4 00364C04 80 01 00 54 */ lwz r0, 0x54(r1) /* 80367CA8 00364C08 7C 08 03 A6 */ mtlr r0 /* 80367CAC 00364C0C 38 21 00 50 */ addi r1, r1, 0x50 -/* 80367CB0 00364C10 4E 80 00 20 */ blr +/* 80367CB0 00364C10 4E 80 00 20 */ blr .global DataLoad__8CPakFileFv DataLoad__8CPakFileFv: @@ -837,7 +837,7 @@ DataLoad__8CPakFileFv: /* 80367D04 00364C64 38 80 00 01 */ li r4, 1 /* 80367D08 00364C68 81 8C 00 08 */ lwz r12, 8(r12) /* 80367D0C 00364C6C 7D 89 03 A6 */ mtctr r12 -/* 80367D10 00364C70 4E 80 04 21 */ bctrl +/* 80367D10 00364C70 4E 80 04 21 */ bctrl lbl_80367D14: /* 80367D14 00364C74 88 61 00 18 */ lbz r3, 0x18(r1) /* 80367D18 00364C78 38 00 00 00 */ li r0, 0 @@ -856,7 +856,7 @@ lbl_80367D2C: /* 80367D48 00364CA8 38 80 00 01 */ li r4, 1 /* 80367D4C 00364CAC 81 8C 00 08 */ lwz r12, 8(r12) /* 80367D50 00364CB0 7D 89 03 A6 */ mtctr r12 -/* 80367D54 00364CB4 4E 80 04 21 */ bctrl +/* 80367D54 00364CB4 4E 80 04 21 */ bctrl lbl_80367D58: /* 80367D58 00364CB8 80 9F 00 44 */ lwz r4, 0x44(r31) /* 80367D5C 00364CBC 38 61 00 30 */ addi r3, r1, 0x30 @@ -923,7 +923,7 @@ lbl_80367E14: /* 80367E44 00364DA4 83 C1 00 58 */ lwz r30, 0x58(r1) /* 80367E48 00364DA8 7C 08 03 A6 */ mtlr r0 /* 80367E4C 00364DAC 38 21 00 60 */ addi r1, r1, 0x60 -/* 80367E50 00364DB0 4E 80 00 20 */ blr +/* 80367E50 00364DB0 4E 80 00 20 */ blr .global InitialHeaderLoad__8CPakFileFv InitialHeaderLoad__8CPakFileFv: @@ -953,7 +953,7 @@ InitialHeaderLoad__8CPakFileFv: /* 80367EB0 00364E10 38 80 00 01 */ li r4, 1 /* 80367EB4 00364E14 81 8C 00 08 */ lwz r12, 8(r12) /* 80367EB8 00364E18 7D 89 03 A6 */ mtctr r12 -/* 80367EBC 00364E1C 4E 80 04 21 */ bctrl +/* 80367EBC 00364E1C 4E 80 04 21 */ bctrl lbl_80367EC0: /* 80367EC0 00364E20 88 61 00 10 */ lbz r3, 0x10(r1) /* 80367EC4 00364E24 38 00 00 00 */ li r0, 0 @@ -972,7 +972,7 @@ lbl_80367ED8: /* 80367EF4 00364E54 38 80 00 01 */ li r4, 1 /* 80367EF8 00364E58 81 8C 00 08 */ lwz r12, 8(r12) /* 80367EFC 00364E5C 7D 89 03 A6 */ mtctr r12 -/* 80367F00 00364E60 4E 80 04 21 */ bctrl +/* 80367F00 00364E60 4E 80 04 21 */ bctrl lbl_80367F04: /* 80367F04 00364E64 38 61 00 50 */ addi r3, r1, 0x50 /* 80367F08 00364E68 4B FD 6D 7D */ bl ReadLong__12CInputStreamFv @@ -1108,7 +1108,7 @@ lbl_80368044: /* 803680F8 00365058 38 80 00 01 */ li r4, 1 /* 803680FC 0036505C 81 8C 00 08 */ lwz r12, 8(r12) /* 80368100 00365060 7D 89 03 A6 */ mtctr r12 -/* 80368104 00365064 4E 80 04 21 */ bctrl +/* 80368104 00365064 4E 80 04 21 */ bctrl lbl_80368108: /* 80368108 00365068 88 61 00 08 */ lbz r3, 8(r1) /* 8036810C 0036506C 38 00 00 00 */ li r0, 0 @@ -1127,7 +1127,7 @@ lbl_80368120: /* 8036813C 0036509C 38 80 00 01 */ li r4, 1 /* 80368140 003650A0 81 8C 00 08 */ lwz r12, 8(r12) /* 80368144 003650A4 7D 89 03 A6 */ mtctr r12 -/* 80368148 003650A8 4E 80 04 21 */ bctrl +/* 80368148 003650A8 4E 80 04 21 */ bctrl /* 8036814C 003650AC 48 00 00 0C */ b lbl_80368158 lbl_80368150: /* 80368150 003650B0 7F E3 FB 78 */ mr r3, r31 @@ -1144,7 +1144,7 @@ lbl_80368170: /* 80368174 003650D4 80 01 01 94 */ lwz r0, 0x194(r1) /* 80368178 003650D8 7C 08 03 A6 */ mtlr r0 /* 8036817C 003650DC 38 21 01 90 */ addi r1, r1, 0x190 -/* 80368180 003650E0 4E 80 00 20 */ blr +/* 80368180 003650E0 4E 80 00 20 */ blr .global sub_80368184 sub_80368184: @@ -1201,7 +1201,7 @@ lbl_80368228: /* 80368234 00365194 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80368238 00365198 7C 08 03 A6 */ mtlr r0 /* 8036823C 0036519C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80368240 003651A0 4E 80 00 20 */ blr +/* 80368240 003651A0 4E 80 00 20 */ blr .global Warmup__8CPakFileFv Warmup__8CPakFileFv: @@ -1247,7 +1247,7 @@ lbl_80368278: /* 803682DC 0036523C 38 80 00 01 */ li r4, 1 /* 803682E0 00365240 81 8C 00 08 */ lwz r12, 8(r12) /* 803682E4 00365244 7D 89 03 A6 */ mtctr r12 -/* 803682E8 00365248 4E 80 04 21 */ bctrl +/* 803682E8 00365248 4E 80 04 21 */ bctrl lbl_803682EC: /* 803682EC 0036524C 88 61 00 0C */ lbz r3, 0xc(r1) /* 803682F0 00365250 38 00 00 00 */ li r0, 0 @@ -1266,7 +1266,7 @@ lbl_80368304: /* 80368320 00365280 38 80 00 01 */ li r4, 1 /* 80368324 00365284 81 8C 00 08 */ lwz r12, 8(r12) /* 80368328 00365288 7D 89 03 A6 */ mtctr r12 -/* 8036832C 0036528C 4E 80 04 21 */ bctrl +/* 8036832C 0036528C 4E 80 04 21 */ bctrl lbl_80368330: /* 80368330 00365290 38 00 00 01 */ li r0, 1 /* 80368334 00365294 90 1F 00 2C */ stw r0, 0x2c(r31) @@ -1275,7 +1275,7 @@ lbl_80368330: /* 80368340 003652A0 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80368344 003652A4 7C 08 03 A6 */ mtlr r0 /* 80368348 003652A8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8036834C 003652AC 4E 80 00 20 */ blr +/* 8036834C 003652AC 4E 80 00 20 */ blr .global AsyncIdle__8CPakFileFv AsyncIdle__8CPakFileFv: @@ -1296,7 +1296,7 @@ AsyncIdle__8CPakFileFv: /* 80368388 003652E8 81 83 00 00 */ lwz r12, 0(r3) /* 8036838C 003652EC 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80368390 003652F0 7D 89 03 A6 */ mtctr r12 -/* 80368394 003652F4 4E 80 04 21 */ bctrl +/* 80368394 003652F4 4E 80 04 21 */ bctrl /* 80368398 003652F8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8036839C 003652FC 41 82 00 4C */ beq lbl_803683E8 lbl_803683A0: @@ -1327,7 +1327,7 @@ lbl_803683E8: /* 803683EC 0036534C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803683F0 00365350 7C 08 03 A6 */ mtlr r0 /* 803683F4 00365354 38 21 00 10 */ addi r1, r1, 0x10 -/* 803683F8 00365358 4E 80 00 20 */ blr +/* 803683F8 00365358 4E 80 00 20 */ blr .global __dt__8CPakFileFv __dt__8CPakFileFv: @@ -1428,7 +1428,7 @@ lbl_80368524: /* 80368548 003654A8 38 80 00 01 */ li r4, 1 /* 8036854C 003654AC 81 8C 00 08 */ lwz r12, 8(r12) /* 80368550 003654B0 7D 89 03 A6 */ mtctr r12 -/* 80368554 003654B4 4E 80 04 21 */ bctrl +/* 80368554 003654B4 4E 80 04 21 */ bctrl lbl_80368558: /* 80368558 003654B8 7F C3 F3 78 */ mr r3, r30 /* 8036855C 003654BC 38 80 FF FF */ li r4, -1 @@ -1444,7 +1444,7 @@ lbl_80368574: /* 80368580 003654E0 83 C1 00 38 */ lwz r30, 0x38(r1) /* 80368584 003654E4 7C 08 03 A6 */ mtlr r0 /* 80368588 003654E8 38 21 00 40 */ addi r1, r1, 0x40 -/* 8036858C 003654EC 4E 80 00 20 */ blr +/* 8036858C 003654EC 4E 80 00 20 */ blr .global "__ct__8CPakFileFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>b" "__ct__8CPakFileFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>b": @@ -1501,7 +1501,7 @@ lbl_80368574: /* 80368658 003655B8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8036865C 003655BC 7C 08 03 A6 */ mtlr r0 /* 80368660 003655C0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80368664 003655C4 4E 80 00 20 */ blr +/* 80368664 003655C4 4E 80 00 20 */ blr .global IsCompressed__Q28CPakFile8SResInfoCFv IsCompressed__Q28CPakFile8SResInfoCFv: @@ -1510,7 +1510,7 @@ IsCompressed__Q28CPakFile8SResInfoCFv: /* 80368670 003655D0 7C 03 00 D0 */ neg r0, r3 /* 80368674 003655D4 7C 00 1B 78 */ or r0, r0, r3 /* 80368678 003655D8 54 03 0F FE */ srwi r3, r0, 0x1f -/* 8036867C 003655DC 4E 80 00 20 */ blr +/* 8036867C 003655DC 4E 80 00 20 */ blr .global GetSize__Q28CPakFile8SResInfoCFv GetSize__Q28CPakFile8SResInfoCFv: @@ -1521,7 +1521,7 @@ GetSize__Q28CPakFile8SResInfoCFv: /* 80368690 003655F0 50 04 0D FC */ rlwimi r4, r0, 1, 0x17, 0x1e /* 80368694 003655F4 50 64 4B EC */ rlwimi r4, r3, 9, 0xf, 0x16 /* 80368698 003655F8 54 83 28 34 */ slwi r3, r4, 5 -/* 8036869C 003655FC 4E 80 00 20 */ blr +/* 8036869C 003655FC 4E 80 00 20 */ blr .global GetOffset__Q28CPakFile8SResInfoCFv GetOffset__Q28CPakFile8SResInfoCFv: @@ -1531,7 +1531,7 @@ GetOffset__Q28CPakFile8SResInfoCFv: /* 803686AC 0036560C 50 04 44 2E */ rlwimi r4, r0, 8, 0x10, 0x17 /* 803686B0 00365610 50 64 82 1E */ rlwimi r4, r3, 0x10, 8, 0xf /* 803686B4 00365614 54 83 29 34 */ rlwinm r3, r4, 5, 4, 0x1a -/* 803686B8 00365618 4E 80 00 20 */ blr +/* 803686B8 00365618 4E 80 00 20 */ blr .global GetType__Q28CPakFile8SResInfoCFv GetType__Q28CPakFile8SResInfoCFv: @@ -1544,7 +1544,7 @@ GetType__Q28CPakFile8SResInfoCFv: /* 803686D4 00365634 80 01 00 14 */ lwz r0, 0x14(r1) /* 803686D8 00365638 7C 08 03 A6 */ mtlr r0 /* 803686DC 0036563C 38 21 00 10 */ addi r1, r1, 0x10 -/* 803686E0 00365640 4E 80 00 20 */ blr +/* 803686E0 00365640 4E 80 00 20 */ blr .global __ct__Q28CPakFile8SResInfoFUiUiUiUi __ct__Q28CPakFile8SResInfoFUiUiUiUi: @@ -1589,7 +1589,7 @@ __ct__Q28CPakFile8SResInfoFUiUiUiUi: /* 8036877C 003656DC 83 81 00 10 */ lwz r28, 0x10(r1) /* 80368780 003656E0 7C 08 03 A6 */ mtlr r0 /* 80368784 003656E4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80368788 003656E8 4E 80 00 20 */ blr +/* 80368788 003656E8 4E 80 00 20 */ blr .global sub_8036878c sub_8036878c: @@ -1722,7 +1722,7 @@ lbl_80368958: /* 80368968 003658C8 83 81 00 50 */ lwz r28, 0x50(r1) /* 8036896C 003658CC 7C 08 03 A6 */ mtlr r0 /* 80368970 003658D0 38 21 00 60 */ addi r1, r1, 0x60 -/* 80368974 003658D4 4E 80 00 20 */ blr +/* 80368974 003658D4 4E 80 00 20 */ blr .global sub_80368978 sub_80368978: @@ -1776,7 +1776,7 @@ lbl_80368A14: /* 80368A28 00365988 80 01 00 34 */ lwz r0, 0x34(r1) /* 80368A2C 0036598C 7C 08 03 A6 */ mtlr r0 /* 80368A30 00365990 38 21 00 30 */ addi r1, r1, 0x30 -/* 80368A34 00365994 4E 80 00 20 */ blr +/* 80368A34 00365994 4E 80 00 20 */ blr .global sub_80368a38 sub_80368a38: @@ -1830,7 +1830,7 @@ lbl_80368AD4: /* 80368AE8 00365A48 80 01 00 34 */ lwz r0, 0x34(r1) /* 80368AEC 00365A4C 7C 08 03 A6 */ mtlr r0 /* 80368AF0 00365A50 38 21 00 30 */ addi r1, r1, 0x30 -/* 80368AF4 00365A54 4E 80 00 20 */ blr +/* 80368AF4 00365A54 4E 80 00 20 */ blr .global sub_80368af8 sub_80368af8: @@ -1907,7 +1907,7 @@ lbl_80368BE0: /* 80368BEC 00365B4C 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80368BF0 00365B50 7C 08 03 A6 */ mtlr r0 /* 80368BF4 00365B54 38 21 00 30 */ addi r1, r1, 0x30 -/* 80368BF8 00365B58 4E 80 00 20 */ blr +/* 80368BF8 00365B58 4E 80 00 20 */ blr .global sub_80368bfc sub_80368bfc: @@ -1921,7 +1921,7 @@ sub_80368bfc: /* 80368C18 00365B78 80 01 00 14 */ lwz r0, 0x14(r1) /* 80368C1C 00365B7C 7C 08 03 A6 */ mtlr r0 /* 80368C20 00365B80 38 21 00 10 */ addi r1, r1, 0x10 -/* 80368C24 00365B84 4E 80 00 20 */ blr +/* 80368C24 00365B84 4E 80 00 20 */ blr .global sub_80368c28 sub_80368c28: @@ -1935,7 +1935,7 @@ sub_80368c28: /* 80368C44 00365BA4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80368C48 00365BA8 7C 08 03 A6 */ mtlr r0 /* 80368C4C 00365BAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80368C50 00365BB0 4E 80 00 20 */ blr +/* 80368C50 00365BB0 4E 80 00 20 */ blr .global sub_80368c54 sub_80368c54: @@ -1943,7 +1943,7 @@ sub_80368c54: /* 80368C58 00365BB8 80 83 00 00 */ lwz r4, 0(r3) /* 80368C5C 00365BBC 7C 04 02 14 */ add r0, r4, r0 /* 80368C60 00365BC0 90 03 00 00 */ stw r0, 0(r3) -/* 80368C64 00365BC4 4E 80 00 20 */ blr +/* 80368C64 00365BC4 4E 80 00 20 */ blr .global sub_80368c68 sub_80368c68: @@ -1951,7 +1951,7 @@ sub_80368c68: /* 80368C6C 00365BCC 80 83 00 00 */ lwz r4, 0(r3) /* 80368C70 00365BD0 7C 04 02 14 */ add r0, r4, r0 /* 80368C74 00365BD4 90 03 00 00 */ stw r0, 0(r3) -/* 80368C78 00365BD8 4E 80 00 20 */ blr +/* 80368C78 00365BD8 4E 80 00 20 */ blr .global sub_80368c7c sub_80368c7c: @@ -1971,7 +1971,7 @@ sub_80368c7c: /* 80368CB0 00365C10 80 01 00 24 */ lwz r0, 0x24(r1) /* 80368CB4 00365C14 7C 08 03 A6 */ mtlr r0 /* 80368CB8 00365C18 38 21 00 20 */ addi r1, r1, 0x20 -/* 80368CBC 00365C1C 4E 80 00 20 */ blr +/* 80368CBC 00365C1C 4E 80 00 20 */ blr .global sub_80368cc0 sub_80368cc0: @@ -1991,7 +1991,7 @@ sub_80368cc0: /* 80368CF4 00365C54 80 01 00 24 */ lwz r0, 0x24(r1) /* 80368CF8 00365C58 7C 08 03 A6 */ mtlr r0 /* 80368CFC 00365C5C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80368D00 00365C60 4E 80 00 20 */ blr +/* 80368D00 00365C60 4E 80 00 20 */ blr .global sub_80368d04 sub_80368d04: @@ -2004,7 +2004,7 @@ sub_80368d04: /* 80368D1C 00365C7C 7C 00 16 70 */ srawi r0, r0, 2 /* 80368D20 00365C80 54 03 0F FE */ srwi r3, r0, 0x1f /* 80368D24 00365C84 7C 60 1A 14 */ add r3, r0, r3 -/* 80368D28 00365C88 4E 80 00 20 */ blr +/* 80368D28 00365C88 4E 80 00 20 */ blr .global sub_80368d2c sub_80368d2c: @@ -2017,7 +2017,7 @@ sub_80368d2c: /* 80368D44 00365CA4 7C 00 16 70 */ srawi r0, r0, 2 /* 80368D48 00365CA8 54 03 0F FE */ srwi r3, r0, 0x1f /* 80368D4C 00365CAC 7C 60 1A 14 */ add r3, r0, r3 -/* 80368D50 00365CB0 4E 80 00 20 */ blr +/* 80368D50 00365CB0 4E 80 00 20 */ blr .global sub_80368d54 sub_80368d54: @@ -2070,7 +2070,7 @@ lbl_80368DFC: /* 80368E04 00365D64 B0 C4 00 08 */ sth r6, 8(r4) lbl_80368E08: /* 80368E08 00365D68 38 21 00 20 */ addi r1, r1, 0x20 -/* 80368E0C 00365D6C 4E 80 00 20 */ blr +/* 80368E0C 00365D6C 4E 80 00 20 */ blr .global sub_80368e10 sub_80368e10: @@ -2115,4 +2115,4 @@ lbl_80368E90: /* 80368E94 00365DF4 7C 06 00 40 */ cmplw r6, r0 /* 80368E98 00365DF8 41 80 FF 88 */ blt lbl_80368E20 /* 80368E9C 00365DFC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80368EA0 00365E00 4E 80 00 20 */ blr +/* 80368EA0 00365E00 4E 80 00 20 */ blr diff --git a/asm/Kyoto/CRandom16.s b/asm/Kyoto/CRandom16.s index d7ddb83d..8ab7537a 100644 --- a/asm/Kyoto/CRandom16.s +++ b/asm/Kyoto/CRandom16.s @@ -29,7 +29,7 @@ Float__9CRandom16Fv: /* 80312510 0030F470 80 01 00 14 */ lwz r0, 0x14(r1) /* 80312514 0030F474 7C 08 03 A6 */ mtlr r0 /* 80312518 0030F478 38 21 00 10 */ addi r1, r1, 0x10 -/* 8031251C 0030F47C 4E 80 00 20 */ blr +/* 8031251C 0030F47C 4E 80 00 20 */ blr .global Next__9CRandom16Fv Next__9CRandom16Fv: @@ -41,7 +41,7 @@ Next__9CRandom16Fv: /* 80312534 0030F494 90 03 00 00 */ stw r0, 0(r3) /* 80312538 0030F498 80 03 00 00 */ lwz r0, 0(r3) /* 8031253C 0030F49C 54 03 84 3E */ srwi r3, r0, 0x10 -/* 80312540 0030F4A0 4E 80 00 20 */ blr +/* 80312540 0030F4A0 4E 80 00 20 */ blr .global Range__9CRandom16Fff Range__9CRandom16Fff: @@ -64,7 +64,7 @@ Range__9CRandom16Fff: /* 80312584 0030F4E4 CB C1 00 10 */ lfd f30, 0x10(r1) /* 80312588 0030F4E8 7C 08 03 A6 */ mtlr r0 /* 8031258C 0030F4EC 38 21 00 30 */ addi r1, r1, 0x30 -/* 80312590 0030F4F0 4E 80 00 20 */ blr +/* 80312590 0030F4F0 4E 80 00 20 */ blr .global Range__9CRandom16Fii Range__9CRandom16Fii: @@ -87,27 +87,27 @@ Range__9CRandom16Fii: /* 803125D4 0030F534 80 01 00 14 */ lwz r0, 0x14(r1) /* 803125D8 0030F538 7C 08 03 A6 */ mtlr r0 /* 803125DC 0030F53C 38 21 00 10 */ addi r1, r1, 0x10 -/* 803125E0 0030F540 4E 80 00 20 */ blr +/* 803125E0 0030F540 4E 80 00 20 */ blr .global SetSeed__9CRandom16FUi SetSeed__9CRandom16FUi: /* 803125E4 0030F544 90 83 00 00 */ stw r4, 0(r3) -/* 803125E8 0030F548 4E 80 00 20 */ blr +/* 803125E8 0030F548 4E 80 00 20 */ blr .global __ct__9CRandom16FUi __ct__9CRandom16FUi: /* 803125EC 0030F54C 90 83 00 00 */ stw r4, 0(r3) -/* 803125F0 0030F550 4E 80 00 20 */ blr +/* 803125F0 0030F550 4E 80 00 20 */ blr .global _SetRandomNumber__9CRandom16FP9CRandom16 _SetRandomNumber__9CRandom16FP9CRandom16: /* 803125F4 0030F554 90 6D A8 90 */ stw r3, lbl_805A9450@sda21(r13) -/* 803125F8 0030F558 4E 80 00 20 */ blr +/* 803125F8 0030F558 4E 80 00 20 */ blr .global GetRandomNumber__9CRandom16Fv GetRandomNumber__9CRandom16Fv: /* 803125FC 0030F55C 80 6D A8 90 */ lwz r3, lbl_805A9450@sda21(r13) -/* 80312600 0030F560 4E 80 00 20 */ blr +/* 80312600 0030F560 4E 80 00 20 */ blr .global __dt__13CGlobalRandomFv __dt__13CGlobalRandomFv: @@ -144,7 +144,7 @@ lbl_80312664: /* 80312670 0030F5D0 83 C1 00 08 */ lwz r30, 8(r1) /* 80312674 0030F5D4 7C 08 03 A6 */ mtlr r0 /* 80312678 0030F5D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8031267C 0030F5DC 4E 80 00 20 */ blr +/* 8031267C 0030F5DC 4E 80 00 20 */ blr .global __ct__13CGlobalRandomFR9CRandom16 __ct__13CGlobalRandomFR9CRandom16: diff --git a/asm/Kyoto/CResFactory.s b/asm/Kyoto/CResFactory.s index c67fad77..81b21042 100644 --- a/asm/Kyoto/CResFactory.s +++ b/asm/Kyoto/CResFactory.s @@ -303,7 +303,7 @@ lbl_8033986C: /* 80339870 003367D0 80 01 00 74 */ lwz r0, 0x74(r1) /* 80339874 003367D4 7C 08 03 A6 */ mtlr r0 /* 80339878 003367D8 38 21 00 70 */ addi r1, r1, 0x70 -/* 8033987C 003367DC 4E 80 00 20 */ blr +/* 8033987C 003367DC 4E 80 00 20 */ blr .global sub_80339880 sub_80339880: @@ -364,7 +364,7 @@ lbl_80339920: /* 80339944 003368A4 38 80 00 01 */ li r4, 1 /* 80339948 003368A8 81 8C 00 08 */ lwz r12, 8(r12) /* 8033994C 003368AC 7D 89 03 A6 */ mtctr r12 -/* 80339950 003368B0 4E 80 04 21 */ bctrl +/* 80339950 003368B0 4E 80 04 21 */ bctrl lbl_80339954: /* 80339954 003368B4 7F E0 07 35 */ extsh. r0, r31 /* 80339958 003368B8 40 81 00 0C */ ble lbl_80339964 @@ -377,7 +377,7 @@ lbl_80339964: /* 80339970 003368D0 83 C1 00 08 */ lwz r30, 8(r1) /* 80339974 003368D4 7C 08 03 A6 */ mtlr r0 /* 80339978 003368D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033997C 003368DC 4E 80 00 20 */ blr +/* 8033997C 003368DC 4E 80 00 20 */ blr .global sub_80339980 sub_80339980: @@ -413,7 +413,7 @@ sub_80339980: /* 803399F4 00336954 90 05 00 04 */ stw r0, 4(r5) /* 803399F8 00336958 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803399FC 0033695C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80339A00 00336960 4E 80 00 20 */ blr +/* 80339A00 00336960 4E 80 00 20 */ blr .global PumpResource__11CResFactoryFR12SLoadingData PumpResource__11CResFactoryFR12SLoadingData: @@ -431,7 +431,7 @@ PumpResource__11CResFactoryFR12SLoadingData: /* 80339A30 00336990 81 83 00 00 */ lwz r12, 0(r3) /* 80339A34 00336994 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80339A38 00336998 7D 89 03 A6 */ mtctr r12 -/* 80339A3C 0033699C 4E 80 04 21 */ bctrl +/* 80339A3C 0033699C 4E 80 04 21 */ bctrl /* 80339A40 003369A0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80339A44 003369A4 41 82 00 D4 */ beq lbl_80339B18 /* 80339A48 003369A8 80 7E 00 00 */ lwz r3, 0(r30) @@ -481,7 +481,7 @@ lbl_80339A74: /* 80339AF4 00336A54 38 80 00 01 */ li r4, 1 /* 80339AF8 00336A58 81 8C 00 08 */ lwz r12, 8(r12) /* 80339AFC 00336A5C 7D 89 03 A6 */ mtctr r12 -/* 80339B00 00336A60 4E 80 04 21 */ bctrl +/* 80339B00 00336A60 4E 80 04 21 */ bctrl lbl_80339B04: /* 80339B04 00336A64 38 61 00 10 */ addi r3, r1, 0x10 /* 80339B08 00336A68 38 80 FF FF */ li r4, -1 @@ -497,7 +497,7 @@ lbl_80339B1C: /* 80339B28 00336A88 83 A1 00 54 */ lwz r29, 0x54(r1) /* 80339B2C 00336A8C 7C 08 03 A6 */ mtlr r0 /* 80339B30 00336A90 38 21 00 60 */ addi r1, r1, 0x60 -/* 80339B34 00336A94 4E 80 00 20 */ blr +/* 80339B34 00336A94 4E 80 00 20 */ blr .global sub_80339b38 sub_80339b38: @@ -538,7 +538,7 @@ sub_80339b38: /* 80339BC0 00336B20 80 85 00 04 */ lwz r4, 4(r5) /* 80339BC4 00336B24 38 04 00 01 */ addi r0, r4, 1 /* 80339BC8 00336B28 90 05 00 04 */ stw r0, 4(r5) -/* 80339BCC 00336B2C 4E 80 00 20 */ blr +/* 80339BCC 00336B2C 4E 80 00 20 */ blr .global AsyncIdle__11CResFactoryFUl AsyncIdle__11CResFactoryFUl: @@ -561,7 +561,7 @@ lbl_80339C00: /* 80339C0C 00336B6C 81 83 00 00 */ lwz r12, 0(r3) /* 80339C10 00336B70 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80339C14 00336B74 7D 89 03 A6 */ mtctr r12 -/* 80339C18 00336B78 4E 80 04 21 */ bctrl +/* 80339C18 00336B78 4E 80 04 21 */ bctrl /* 80339C1C 00336B7C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80339C20 00336B80 41 82 00 10 */ beq lbl_80339C30 /* 80339C24 00336B84 7F 24 CB 78 */ mr r4, r25 @@ -620,7 +620,7 @@ lbl_80339CD4: /* 80339CE0 00336C40 80 01 00 34 */ lwz r0, 0x34(r1) /* 80339CE4 00336C44 7C 08 03 A6 */ mtlr r0 /* 80339CE8 00336C48 38 21 00 30 */ addi r1, r1, 0x30 -/* 80339CEC 00336C4C 4E 80 00 20 */ blr +/* 80339CEC 00336C4C 4E 80 00 20 */ blr .global CancelBuild__11CResFactoryFRC10SObjectTag CancelBuild__11CResFactoryFRC10SObjectTag: @@ -644,7 +644,7 @@ CancelBuild__11CResFactoryFRC10SObjectTag: /* 80339D34 00336C94 81 83 00 00 */ lwz r12, 0(r3) /* 80339D38 00336C98 81 8C 00 14 */ lwz r12, 0x14(r12) /* 80339D3C 00336C9C 7D 89 03 A6 */ mtctr r12 -/* 80339D40 00336CA0 4E 80 04 21 */ bctrl +/* 80339D40 00336CA0 4E 80 04 21 */ bctrl /* 80339D44 00336CA4 7F E4 FB 78 */ mr r4, r31 /* 80339D48 00336CA8 38 7E 00 B0 */ addi r3, r30, 0xb0 /* 80339D4C 00336CAC 48 00 00 29 */ bl sub_80339d74 @@ -657,7 +657,7 @@ lbl_80339D5C: /* 80339D64 00336CC4 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80339D68 00336CC8 7C 08 03 A6 */ mtlr r0 /* 80339D6C 00336CCC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80339D70 00336CD0 4E 80 00 20 */ blr +/* 80339D70 00336CD0 4E 80 00 20 */ blr .global sub_80339d74 sub_80339d74: @@ -670,7 +670,7 @@ sub_80339d74: /* 80339D8C 00336CEC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80339D90 00336CF0 7C 08 03 A6 */ mtlr r0 /* 80339D94 00336CF4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80339D98 00336CF8 4E 80 00 20 */ blr +/* 80339D98 00336CF8 4E 80 00 20 */ blr .global sub_80339d9c sub_80339d9c: @@ -702,7 +702,7 @@ lbl_80339DD8: /* 80339DFC 00336D5C 83 C1 00 08 */ lwz r30, 8(r1) /* 80339E00 00336D60 7C 08 03 A6 */ mtlr r0 /* 80339E04 00336D64 38 21 00 10 */ addi r1, r1, 0x10 -/* 80339E08 00336D68 4E 80 00 20 */ blr +/* 80339E08 00336D68 4E 80 00 20 */ blr .global sub_80339e0c sub_80339e0c: @@ -740,7 +740,7 @@ lbl_80339E6C: /* 80339E80 00336DE0 83 81 00 10 */ lwz r28, 0x10(r1) /* 80339E84 00336DE4 7C 08 03 A6 */ mtlr r0 /* 80339E88 00336DE8 38 21 00 20 */ addi r1, r1, 0x20 -/* 80339E8C 00336DEC 4E 80 00 20 */ blr +/* 80339E8C 00336DEC 4E 80 00 20 */ blr .global BuildAsync__11CResFactoryFRC10SObjectTagRC15CVParamTransferPP4IObj BuildAsync__11CResFactoryFRC10SObjectTagRC15CVParamTransferPP4IObj: @@ -798,7 +798,7 @@ BuildAsync__11CResFactoryFRC10SObjectTagRC15CVParamTransferPP4IObj: /* 80339F5C 00336EBC 80 01 00 74 */ lwz r0, 0x74(r1) /* 80339F60 00336EC0 7C 08 03 A6 */ mtlr r0 /* 80339F64 00336EC4 38 21 00 70 */ addi r1, r1, 0x70 -/* 80339F68 00336EC8 4E 80 00 20 */ blr +/* 80339F68 00336EC8 4E 80 00 20 */ blr .global BuildSync__11CResFactoryFRC10SObjectTagRC15CVParamTransfer BuildSync__11CResFactoryFRC10SObjectTagRC15CVParamTransfer: @@ -861,7 +861,7 @@ lbl_80339FF8: /* 8033A048 00336FA8 38 80 00 01 */ li r4, 1 /* 8033A04C 00336FAC 81 8C 00 08 */ lwz r12, 8(r12) /* 8033A050 00336FB0 7D 89 03 A6 */ mtctr r12 -/* 8033A054 00336FB4 4E 80 04 21 */ bctrl +/* 8033A054 00336FB4 4E 80 04 21 */ bctrl lbl_8033A058: /* 8033A058 00336FB8 28 1F 00 00 */ cmplwi r31, 0 /* 8033A05C 00336FBC 41 82 00 1C */ beq lbl_8033A078 @@ -870,7 +870,7 @@ lbl_8033A058: /* 8033A068 00336FC8 81 9F 00 00 */ lwz r12, 0(r31) /* 8033A06C 00336FCC 81 8C 00 08 */ lwz r12, 8(r12) /* 8033A070 00336FD0 7D 89 03 A6 */ mtctr r12 -/* 8033A074 00336FD4 4E 80 04 21 */ bctrl +/* 8033A074 00336FD4 4E 80 04 21 */ bctrl lbl_8033A078: /* 8033A078 00336FD8 88 81 00 18 */ lbz r4, 0x18(r1) /* 8033A07C 00336FDC 38 00 00 00 */ li r0, 0 @@ -884,7 +884,7 @@ lbl_8033A078: /* 8033A09C 00336FFC 38 80 00 01 */ li r4, 1 /* 8033A0A0 00337000 81 8C 00 08 */ lwz r12, 8(r12) /* 8033A0A4 00337004 7D 89 03 A6 */ mtctr r12 -/* 8033A0A8 00337008 4E 80 04 21 */ bctrl +/* 8033A0A8 00337008 4E 80 04 21 */ bctrl lbl_8033A0AC: /* 8033A0AC 0033700C 80 01 00 34 */ lwz r0, 0x34(r1) /* 8033A0B0 00337010 83 E1 00 2C */ lwz r31, 0x2c(r1) @@ -893,7 +893,7 @@ lbl_8033A0AC: /* 8033A0BC 0033701C 83 81 00 20 */ lwz r28, 0x20(r1) /* 8033A0C0 00337020 7C 08 03 A6 */ mtlr r0 /* 8033A0C4 00337024 38 21 00 30 */ addi r1, r1, 0x30 -/* 8033A0C8 00337028 4E 80 00 20 */ blr +/* 8033A0C8 00337028 4E 80 00 20 */ blr .global Build__11CResFactoryFRC10SObjectTagRC15CVParamTransfer Build__11CResFactoryFRC10SObjectTagRC15CVParamTransfer: @@ -948,7 +948,7 @@ lbl_8033A16C: /* 8033A17C 003370DC 83 81 00 10 */ lwz r28, 0x10(r1) /* 8033A180 003370E0 7C 08 03 A6 */ mtlr r0 /* 8033A184 003370E4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8033A188 003370E8 4E 80 00 20 */ blr +/* 8033A188 003370E8 4E 80 00 20 */ blr .global sub_8033a18c sub_8033a18c: @@ -1031,7 +1031,7 @@ lbl_8033A290: /* 8033A294 003371F4 90 03 00 00 */ stw r0, 0(r3) lbl_8033A298: /* 8033A298 003371F8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8033A29C 003371FC 4E 80 00 20 */ blr +/* 8033A29C 003371FC 4E 80 00 20 */ blr .global sub_8033a2a0 sub_8033a2a0: @@ -1054,7 +1054,7 @@ sub_8033a2a0: /* 8033A2E0 00337240 83 C1 00 08 */ lwz r30, 8(r1) /* 8033A2E4 00337244 7C 08 03 A6 */ mtlr r0 /* 8033A2E8 00337248 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033A2EC 0033724C 4E 80 00 20 */ blr +/* 8033A2EC 0033724C 4E 80 00 20 */ blr .global sub_8033a2f0 sub_8033a2f0: @@ -1135,7 +1135,7 @@ lbl_8033A3F4: /* 8033A404 00337364 80 01 00 74 */ lwz r0, 0x74(r1) /* 8033A408 00337368 7C 08 03 A6 */ mtlr r0 /* 8033A40C 0033736C 38 21 00 70 */ addi r1, r1, 0x70 -/* 8033A410 00337370 4E 80 00 20 */ blr +/* 8033A410 00337370 4E 80 00 20 */ blr .global sub_8033a414 sub_8033a414: @@ -1207,7 +1207,7 @@ lbl_8033A4E0: /* 8033A4F0 00337450 90 03 00 04 */ stw r0, 4(r3) /* 8033A4F4 00337454 91 03 00 08 */ stw r8, 8(r3) /* 8033A4F8 00337458 91 43 00 0C */ stw r10, 0xc(r3) -/* 8033A4FC 0033745C 4E 80 00 20 */ blr +/* 8033A4FC 0033745C 4E 80 00 20 */ blr .global sub_8033a500 sub_8033a500: @@ -1224,7 +1224,7 @@ sub_8033a500: /* 8033A528 00337488 81 83 00 00 */ lwz r12, 0(r3) /* 8033A52C 0033748C 81 8C 00 18 */ lwz r12, 0x18(r12) /* 8033A530 00337490 7D 89 03 A6 */ mtctr r12 -/* 8033A534 00337494 4E 80 04 21 */ bctrl +/* 8033A534 00337494 4E 80 04 21 */ bctrl /* 8033A538 00337498 2C 03 00 00 */ cmpwi r3, 0 /* 8033A53C 0033749C 40 82 00 48 */ bne lbl_8033A584 /* 8033A540 003374A0 80 1E 00 88 */ lwz r0, 0x88(r30) @@ -1235,7 +1235,7 @@ lbl_8033A54C: /* 8033A550 003374B0 81 83 00 00 */ lwz r12, 0(r3) /* 8033A554 003374B4 81 8C 00 18 */ lwz r12, 0x18(r12) /* 8033A558 003374B8 7D 89 03 A6 */ mtctr r12 -/* 8033A55C 003374BC 4E 80 04 21 */ bctrl +/* 8033A55C 003374BC 4E 80 04 21 */ bctrl /* 8033A560 003374C0 2C 03 00 01 */ cmpwi r3, 1 /* 8033A564 003374C4 41 82 00 20 */ beq lbl_8033A584 /* 8033A568 003374C8 80 61 00 0C */ lwz r3, 0xc(r1) @@ -1268,7 +1268,7 @@ lbl_8033A584: /* 8033A5CC 0033752C 83 C1 00 28 */ lwz r30, 0x28(r1) /* 8033A5D0 00337530 7C 08 03 A6 */ mtlr r0 /* 8033A5D4 00337534 38 21 00 30 */ addi r1, r1, 0x30 -/* 8033A5D8 00337538 4E 80 00 20 */ blr +/* 8033A5D8 00337538 4E 80 00 20 */ blr .global sub_8033a5dc sub_8033a5dc: @@ -1287,7 +1287,7 @@ sub_8033a5dc: /* 8033A60C 0033756C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8033A610 00337570 7C 08 03 A6 */ mtlr r0 /* 8033A614 00337574 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033A618 00337578 4E 80 00 20 */ blr +/* 8033A618 00337578 4E 80 00 20 */ blr .global __dt__11CResFactoryFv __dt__11CResFactoryFv: @@ -1347,7 +1347,7 @@ lbl_8033A6D4: /* 8033A6E0 00337640 83 C1 00 08 */ lwz r30, 8(r1) /* 8033A6E4 00337644 7C 08 03 A6 */ mtlr r0 /* 8033A6E8 00337648 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033A6EC 0033764C 4E 80 00 20 */ blr +/* 8033A6EC 0033764C 4E 80 00 20 */ blr .global __ct__11CResFactoryFv __ct__11CResFactoryFv: @@ -1392,7 +1392,7 @@ __ct__11CResFactoryFv: /* 8033A788 003376E8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8033A78C 003376EC 7C 08 03 A6 */ mtlr r0 /* 8033A790 003376F0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8033A794 003376F4 4E 80 00 20 */ blr +/* 8033A794 003376F4 4E 80 00 20 */ blr .global sub_8033a798 sub_8033a798: @@ -1424,7 +1424,7 @@ lbl_8033A7E8: /* 8033A7F0 00337750 83 C1 00 08 */ lwz r30, 8(r1) /* 8033A7F4 00337754 7C 08 03 A6 */ mtlr r0 /* 8033A7F8 00337758 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033A7FC 0033775C 4E 80 00 20 */ blr +/* 8033A7FC 0033775C 4E 80 00 20 */ blr .global sub_8033a800 sub_8033a800: @@ -1448,7 +1448,7 @@ sub_8033a800: /* 8033A844 003377A4 80 01 00 24 */ lwz r0, 0x24(r1) /* 8033A848 003377A8 7C 08 03 A6 */ mtlr r0 /* 8033A84C 003377AC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8033A850 003377B0 4E 80 00 20 */ blr +/* 8033A850 003377B0 4E 80 00 20 */ blr .global sub_8033a854 sub_8033a854: @@ -1489,7 +1489,7 @@ lbl_8033A8B4: /* 8033A8CC 0033782C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8033A8D0 00337830 7C 08 03 A6 */ mtlr r0 /* 8033A8D4 00337834 38 21 00 20 */ addi r1, r1, 0x20 -/* 8033A8D8 00337838 4E 80 00 20 */ blr +/* 8033A8D8 00337838 4E 80 00 20 */ blr .global sub_8033a8dc sub_8033a8dc: @@ -1531,7 +1531,7 @@ lbl_8033A944: /* 8033A960 003378C0 80 01 00 24 */ lwz r0, 0x24(r1) /* 8033A964 003378C4 7C 08 03 A6 */ mtlr r0 /* 8033A968 003378C8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8033A96C 003378CC 4E 80 00 20 */ blr +/* 8033A96C 003378CC 4E 80 00 20 */ blr .global sub_8033a970 sub_8033a970: @@ -1574,7 +1574,7 @@ lbl_8033A9E0: /* 8033A9F4 00337954 83 81 00 10 */ lwz r28, 0x10(r1) /* 8033A9F8 00337958 7C 08 03 A6 */ mtlr r0 /* 8033A9FC 0033795C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8033AA00 00337960 4E 80 00 20 */ blr +/* 8033AA00 00337960 4E 80 00 20 */ blr .global sub_8033aa04 sub_8033aa04: @@ -1763,4 +1763,4 @@ lbl_8033AC9C: /* 8033ACA0 00337C00 80 01 00 24 */ lwz r0, 0x24(r1) /* 8033ACA4 00337C04 7C 08 03 A6 */ mtlr r0 /* 8033ACA8 00337C08 38 21 00 20 */ addi r1, r1, 0x20 -/* 8033ACAC 00337C0C 4E 80 00 20 */ blr +/* 8033ACAC 00337C0C 4E 80 00 20 */ blr diff --git a/asm/Kyoto/CResLoader.s b/asm/Kyoto/CResLoader.s index 04f54c84..2e002a8d 100644 --- a/asm/Kyoto/CResLoader.s +++ b/asm/Kyoto/CResLoader.s @@ -61,7 +61,7 @@ lbl_8033AD24: /* 8033AD28 00337C88 42 00 FF FC */ bdnz lbl_8033AD24 lbl_8033AD2C: /* 8033AD2C 00337C8C 80 65 00 0C */ lwz r3, 0xc(r5) -/* 8033AD30 00337C90 4E 80 00 20 */ blr +/* 8033AD30 00337C90 4E 80 00 20 */ blr lbl_8033AD34: /* 8033AD34 00337C94 7C 80 20 51 */ subf. r4, r0, r4 /* 8033AD38 00337C98 80 A3 00 1C */ lwz r5, 0x1c(r3) @@ -96,14 +96,14 @@ lbl_8033AD9C: /* 8033ADA0 00337D00 42 00 FF FC */ bdnz lbl_8033AD9C lbl_8033ADA4: /* 8033ADA4 00337D04 80 65 00 0C */ lwz r3, 0xc(r5) -/* 8033ADA8 00337D08 4E 80 00 20 */ blr +/* 8033ADA8 00337D08 4E 80 00 20 */ blr .global GetPakCount__10CResLoaderCFv GetPakCount__10CResLoaderCFv: /* 8033ADAC 00337D0C 80 83 00 14 */ lwz r4, 0x14(r3) /* 8033ADB0 00337D10 80 03 00 2C */ lwz r0, 0x2c(r3) /* 8033ADB4 00337D14 7C 64 02 14 */ add r3, r4, r0 -/* 8033ADB8 00337D18 4E 80 00 20 */ blr +/* 8033ADB8 00337D18 4E 80 00 20 */ blr .global sub_8033adbc sub_8033adbc: @@ -257,7 +257,7 @@ lbl_8033AFB4: /* 8033AFC4 00337F24 80 01 00 54 */ lwz r0, 0x54(r1) /* 8033AFC8 00337F28 7C 08 03 A6 */ mtlr r0 /* 8033AFCC 00337F2C 38 21 00 50 */ addi r1, r1, 0x50 -/* 8033AFD0 00337F30 4E 80 00 20 */ blr +/* 8033AFD0 00337F30 4E 80 00 20 */ blr .global sub_8033afd4 sub_8033afd4: @@ -285,7 +285,7 @@ sub_8033afd4: /* 8033B028 00337F88 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8033B02C 00337F8C 7C 08 03 A6 */ mtlr r0 /* 8033B030 00337F90 38 21 00 20 */ addi r1, r1, 0x20 -/* 8033B034 00337F94 4E 80 00 20 */ blr +/* 8033B034 00337F94 4E 80 00 20 */ blr .global sub_8033b038 sub_8033b038: @@ -508,7 +508,7 @@ lbl_8033B328: /* 8033B32C 0033828C 80 01 00 44 */ lwz r0, 0x44(r1) /* 8033B330 00338290 7C 08 03 A6 */ mtlr r0 /* 8033B334 00338294 38 21 00 40 */ addi r1, r1, 0x40 -/* 8033B338 00338298 4E 80 00 20 */ blr +/* 8033B338 00338298 4E 80 00 20 */ blr .global "GetTagListForFile__10CResLoaderCFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" "GetTagListForFile__10CResLoaderCFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>": @@ -572,7 +572,7 @@ lbl_8033B408: /* 8033B40C 0033836C 80 01 00 54 */ lwz r0, 0x54(r1) /* 8033B410 00338370 7C 08 03 A6 */ mtlr r0 /* 8033B414 00338374 38 21 00 50 */ addi r1, r1, 0x50 -/* 8033B418 00338378 4E 80 00 20 */ blr +/* 8033B418 00338378 4E 80 00 20 */ blr .global sub_8033b41c sub_8033b41c: @@ -665,7 +665,7 @@ lbl_8033B548: /* 8033B54C 003384AC 80 01 00 54 */ lwz r0, 0x54(r1) /* 8033B550 003384B0 7C 08 03 A6 */ mtlr r0 /* 8033B554 003384B4 38 21 00 50 */ addi r1, r1, 0x50 -/* 8033B558 003384B8 4E 80 00 20 */ blr +/* 8033B558 003384B8 4E 80 00 20 */ blr .global "AddPakFileAsync__10CResLoaderFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>b" "AddPakFileAsync__10CResLoaderFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>b": @@ -758,7 +758,7 @@ lbl_8033B68C: /* 8033B6A0 00338600 83 A1 00 34 */ lwz r29, 0x34(r1) /* 8033B6A4 00338604 7C 08 03 A6 */ mtlr r0 /* 8033B6A8 00338608 38 21 00 40 */ addi r1, r1, 0x40 -/* 8033B6AC 0033860C 4E 80 00 20 */ blr +/* 8033B6AC 0033860C 4E 80 00 20 */ blr .global LoadNewResourcePartSync__10CResLoaderFRC10SObjectTagiiPc LoadNewResourcePartSync__10CResLoaderFRC10SObjectTagiiPc: @@ -822,7 +822,7 @@ lbl_8033B780: /* 8033B788 003386E8 80 01 00 34 */ lwz r0, 0x34(r1) /* 8033B78C 003386EC 7C 08 03 A6 */ mtlr r0 /* 8033B790 003386F0 38 21 00 30 */ addi r1, r1, 0x30 -/* 8033B794 003386F4 4E 80 00 20 */ blr +/* 8033B794 003386F4 4E 80 00 20 */ blr .global LoadMemResourceSync__10CResLoaderFRC10SObjectTagPPcPi LoadMemResourceSync__10CResLoaderFRC10SObjectTagPPcPi: @@ -871,7 +871,7 @@ LoadMemResourceSync__10CResLoaderFRC10SObjectTagPPcPi: /* 8033B840 003387A0 80 01 00 34 */ lwz r0, 0x34(r1) /* 8033B844 003387A4 7C 08 03 A6 */ mtlr r0 /* 8033B848 003387A8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8033B84C 003387AC 4E 80 00 20 */ blr +/* 8033B84C 003387AC 4E 80 00 20 */ blr .global LoadResourceFromMemorySync__10CResLoaderFRC10SObjectTagPCv LoadResourceFromMemorySync__10CResLoaderFRC10SObjectTagPCv: @@ -936,7 +936,7 @@ lbl_8033B90C: /* 8033B930 00338890 38 80 00 01 */ li r4, 1 /* 8033B934 00338894 81 8C 00 08 */ lwz r12, 8(r12) /* 8033B938 00338898 7D 89 03 A6 */ mtctr r12 -/* 8033B93C 0033889C 4E 80 04 21 */ bctrl +/* 8033B93C 0033889C 4E 80 04 21 */ bctrl lbl_8033B940: /* 8033B940 003388A0 7F C3 F3 78 */ mr r3, r30 /* 8033B944 003388A4 48 00 00 08 */ b lbl_8033B94C @@ -949,7 +949,7 @@ lbl_8033B94C: /* 8033B958 003388B8 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8033B95C 003388BC 7C 08 03 A6 */ mtlr r0 /* 8033B960 003388C0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8033B964 003388C4 4E 80 00 20 */ blr +/* 8033B964 003388C4 4E 80 00 20 */ blr .global LoadNewResourceSync__10CResLoaderFRC10SObjectTagPc LoadNewResourceSync__10CResLoaderFRC10SObjectTagPc: @@ -1049,7 +1049,7 @@ lbl_8033BAA8: /* 8033BACC 00338A2C 38 80 00 01 */ li r4, 1 /* 8033BAD0 00338A30 81 8C 00 08 */ lwz r12, 8(r12) /* 8033BAD4 00338A34 7D 89 03 A6 */ mtctr r12 -/* 8033BAD8 00338A38 4E 80 04 21 */ bctrl +/* 8033BAD8 00338A38 4E 80 04 21 */ bctrl lbl_8033BADC: /* 8033BADC 00338A3C 7F A3 EB 78 */ mr r3, r29 /* 8033BAE0 00338A40 48 00 00 08 */ b lbl_8033BAE8 @@ -1060,7 +1060,7 @@ lbl_8033BAE8: /* 8033BAEC 00338A4C 80 01 00 34 */ lwz r0, 0x34(r1) /* 8033BAF0 00338A50 7C 08 03 A6 */ mtlr r0 /* 8033BAF4 00338A54 38 21 00 30 */ addi r1, r1, 0x30 -/* 8033BAF8 00338A58 4E 80 00 20 */ blr +/* 8033BAF8 00338A58 4E 80 00 20 */ blr .global LoadResourcePartAsync__10CResLoaderFRC10SObjectTagiiPc LoadResourcePartAsync__10CResLoaderFRC10SObjectTagiiPc: @@ -1094,7 +1094,7 @@ LoadResourcePartAsync__10CResLoaderFRC10SObjectTagiiPc: /* 8033BB68 00338AC8 83 81 00 10 */ lwz r28, 0x10(r1) /* 8033BB6C 00338ACC 7C 08 03 A6 */ mtlr r0 /* 8033BB70 00338AD0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8033BB74 00338AD4 4E 80 00 20 */ blr +/* 8033BB74 00338AD4 4E 80 00 20 */ blr .global LoadResourceAsync__10CResLoaderFRC10SObjectTagPc LoadResourceAsync__10CResLoaderFRC10SObjectTagPc: @@ -1129,7 +1129,7 @@ LoadResourceAsync__10CResLoaderFRC10SObjectTagPc: /* 8033BBE8 00338B48 83 81 00 10 */ lwz r28, 0x10(r1) /* 8033BBEC 00338B4C 7C 08 03 A6 */ mtlr r0 /* 8033BBF0 00338B50 38 21 00 20 */ addi r1, r1, 0x20 -/* 8033BBF4 00338B54 4E 80 00 20 */ blr +/* 8033BBF4 00338B54 4E 80 00 20 */ blr .global GetResourceCompression__10CResLoaderCFRC10SObjectTag GetResourceCompression__10CResLoaderCFRC10SObjectTag: @@ -1156,7 +1156,7 @@ lbl_8033BC3C: /* 8033BC40 00338BA0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8033BC44 00338BA4 7C 08 03 A6 */ mtlr r0 /* 8033BC48 00338BA8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033BC4C 00338BAC 4E 80 00 20 */ blr +/* 8033BC4C 00338BAC 4E 80 00 20 */ blr .global ResourceSize__10CResLoaderCFRC10SObjectTag ResourceSize__10CResLoaderCFRC10SObjectTag: @@ -1179,7 +1179,7 @@ lbl_8033BC84: /* 8033BC88 00338BE8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8033BC8C 00338BEC 7C 08 03 A6 */ mtlr r0 /* 8033BC90 00338BF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033BC94 00338BF4 4E 80 00 20 */ blr +/* 8033BC94 00338BF4 4E 80 00 20 */ blr .global ResourceExists__10CResLoaderCFRC10SObjectTag ResourceExists__10CResLoaderCFRC10SObjectTag: @@ -1195,7 +1195,7 @@ ResourceExists__10CResLoaderCFRC10SObjectTag: /* 8033BCBC 00338C1C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8033BCC0 00338C20 7C 08 03 A6 */ mtlr r0 /* 8033BCC4 00338C24 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033BCC8 00338C28 4E 80 00 20 */ blr +/* 8033BCC8 00338C28 4E 80 00 20 */ blr .global GetResourceTypeById__10CResLoaderCFUi GetResourceTypeById__10CResLoaderCFUi: @@ -1217,7 +1217,7 @@ lbl_8033BCFC: /* 8033BD00 00338C60 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8033BD04 00338C64 7C 08 03 A6 */ mtlr r0 /* 8033BD08 00338C68 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033BD0C 00338C6C 4E 80 00 20 */ blr +/* 8033BD0C 00338C6C 4E 80 00 20 */ blr .global GetResourceIdByName__10CResLoaderCFPCc GetResourceIdByName__10CResLoaderCFPCc: @@ -1267,14 +1267,14 @@ lbl_8033BD94: /* 8033BDA0 00338D00 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8033BDA4 00338D04 7C 08 03 A6 */ mtlr r0 /* 8033BDA8 00338D08 38 21 00 20 */ addi r1, r1, 0x20 -/* 8033BDAC 00338D0C 4E 80 00 20 */ blr +/* 8033BDAC 00338D0C 4E 80 00 20 */ blr .global AreAllPaksLoaded__10CResLoaderCFv AreAllPaksLoaded__10CResLoaderCFv: /* 8033BDB0 00338D10 80 03 00 44 */ lwz r0, 0x44(r3) /* 8033BDB4 00338D14 7C 00 00 34 */ cntlzw r0, r0 /* 8033BDB8 00338D18 54 03 D9 7E */ srwi r3, r0, 5 -/* 8033BDBC 00338D1C 4E 80 00 20 */ blr +/* 8033BDBC 00338D1C 4E 80 00 20 */ blr .global AsyncIdlePakLoading__10CResLoaderFv AsyncIdlePakLoading__10CResLoaderFv: @@ -1322,7 +1322,7 @@ lbl_8033BE3C: /* 8033BE4C 00338DAC 80 01 00 24 */ lwz r0, 0x24(r1) /* 8033BE50 00338DB0 7C 08 03 A6 */ mtlr r0 /* 8033BE54 00338DB4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8033BE58 00338DB8 4E 80 00 20 */ blr +/* 8033BE58 00338DB8 4E 80 00 20 */ blr .global sub_8033be5c sub_8033be5c: @@ -1332,7 +1332,7 @@ sub_8033be5c: /* 8033BE68 00338DC8 90 A3 00 48 */ stw r5, 0x48(r3) /* 8033BE6C 00338DCC 90 83 00 4C */ stw r4, 0x4c(r3) /* 8033BE70 00338DD0 90 03 00 50 */ stw r0, 0x50(r3) -/* 8033BE74 00338DD4 4E 80 00 20 */ blr +/* 8033BE74 00338DD4 4E 80 00 20 */ blr .global FindResource__10CResLoaderCFUi FindResource__10CResLoaderCFUi: @@ -1408,7 +1408,7 @@ lbl_8033BF5C: /* 8033BF68 00338EC8 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8033BF6C 00338ECC 7C 08 03 A6 */ mtlr r0 /* 8033BF70 00338ED0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8033BF74 00338ED4 4E 80 00 20 */ blr +/* 8033BF74 00338ED4 4E 80 00 20 */ blr .global FindResource__10CResLoaderCFRC10SObjectTag FindResource__10CResLoaderCFRC10SObjectTag: @@ -1426,7 +1426,7 @@ FindResource__10CResLoaderCFRC10SObjectTag: /* 8033BFA4 00338F04 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8033BFA8 00338F08 7C 08 03 A6 */ mtlr r0 /* 8033BFAC 00338F0C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033BFB0 00338F10 4E 80 00 20 */ blr +/* 8033BFB0 00338F10 4E 80 00 20 */ blr .global FindResourceForLoad__10CResLoaderFUi FindResourceForLoad__10CResLoaderFUi: @@ -1502,7 +1502,7 @@ lbl_8033C098: /* 8033C0A8 00339008 83 81 00 10 */ lwz r28, 0x10(r1) /* 8033C0AC 0033900C 7C 08 03 A6 */ mtlr r0 /* 8033C0B0 00339010 38 21 00 20 */ addi r1, r1, 0x20 -/* 8033C0B4 00339014 4E 80 00 20 */ blr +/* 8033C0B4 00339014 4E 80 00 20 */ blr .global FindResourceForLoad__10CResLoaderFRC10SObjectTag FindResourceForLoad__10CResLoaderFRC10SObjectTag: @@ -1514,7 +1514,7 @@ FindResourceForLoad__10CResLoaderFRC10SObjectTag: /* 8033C0CC 0033902C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8033C0D0 00339030 7C 08 03 A6 */ mtlr r0 /* 8033C0D4 00339034 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033C0D8 00339038 4E 80 00 20 */ blr +/* 8033C0D8 00339038 4E 80 00 20 */ blr .global CacheFromPakForLoad__10CResLoaderFR8CPakFileUi CacheFromPakForLoad__10CResLoaderFR8CPakFileUi: @@ -1555,7 +1555,7 @@ lbl_8033C14C: /* 8033C154 003390B4 83 C1 00 08 */ lwz r30, 8(r1) /* 8033C158 003390B8 7C 08 03 A6 */ mtlr r0 /* 8033C15C 003390BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033C160 003390C0 4E 80 00 20 */ blr +/* 8033C160 003390C0 4E 80 00 20 */ blr .global CacheFromPak__10CResLoaderCFRC8CPakFileUi CacheFromPak__10CResLoaderCFRC8CPakFileUi: @@ -1583,7 +1583,7 @@ lbl_8033C1A8: /* 8033C1B0 00339110 83 C1 00 08 */ lwz r30, 8(r1) /* 8033C1B4 00339114 7C 08 03 A6 */ mtlr r0 /* 8033C1B8 00339118 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033C1BC 0033911C 4E 80 00 20 */ blr +/* 8033C1BC 0033911C 4E 80 00 20 */ blr .global "MoveToCorrectLoadedList__10CResLoaderFRCQ24rstl19auto_ptr<8CPakFile>" "MoveToCorrectLoadedList__10CResLoaderFRCQ24rstl19auto_ptr<8CPakFile>": @@ -1676,7 +1676,7 @@ lbl_8033C2E8: /* 8033C2F8 00339258 83 81 00 10 */ lwz r28, 0x10(r1) /* 8033C2FC 0033925C 7C 08 03 A6 */ mtlr r0 /* 8033C300 00339260 38 21 00 20 */ addi r1, r1, 0x20 -/* 8033C304 00339264 4E 80 00 20 */ blr +/* 8033C304 00339264 4E 80 00 20 */ blr .global __dt__10CResLoaderFv __dt__10CResLoaderFv: @@ -1729,7 +1729,7 @@ lbl_8033C398: /* 8033C3AC 0033930C 83 81 00 10 */ lwz r28, 0x10(r1) /* 8033C3B0 00339310 7C 08 03 A6 */ mtlr r0 /* 8033C3B4 00339314 38 21 00 20 */ addi r1, r1, 0x20 -/* 8033C3B8 00339318 4E 80 00 20 */ blr +/* 8033C3B8 00339318 4E 80 00 20 */ blr .global __ct__10CResLoaderFv __ct__10CResLoaderFv: @@ -1758,7 +1758,7 @@ __ct__10CResLoaderFv: /* 8033C414 00339374 90 03 00 4C */ stw r0, 0x4c(r3) /* 8033C418 00339378 90 A3 00 50 */ stw r5, 0x50(r3) /* 8033C41C 0033937C 98 A3 00 54 */ stb r5, 0x54(r3) -/* 8033C420 00339380 4E 80 00 20 */ blr +/* 8033C420 00339380 4E 80 00 20 */ blr .global "distance,Q24rstl17rmemory_allocator>,10SObjectTag>,Q24rstl138vector,Q24rstl17rmemory_allocator>,10SObjectTag>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl303const_pointer_iterator,Q24rstl17rmemory_allocator>,10SObjectTag>,Q24rstl138vector,Q24rstl17rmemory_allocator>,10SObjectTag>,Q24rstl138vector,Q24rstl17rmemory_allocator>,10SObjectTag>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl303const_pointer_iterator,Q24rstl17rmemory_allocator>,10SObjectTag>,Q24rstl138vector,Q24rstl17rmemory_allocator>,10SObjectTag>,Q24rstl138vector,Q24rstl17rmemory_allocator>,10SObjectTag>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl303const_pointer_iterator,Q24rstl17rmemory_allocator>,10SObjectTag>,Q24rstl138vector,Q24rstl17rmemory_allocator>,10SObjectTag>,Q24rstl138vector,Q24rstl17rmemory_allocator>,10SObjectTag>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl303const_pointer_iterator,Q24rstl17rmemory_allocator>,10SObjectTag>,Q24rstl138vectorFi" "reserve__Q24rstl47vector<10SObjectTag,Q24rstl17rmemory_allocator>Fi": @@ -858,7 +858,7 @@ lbl_80340A5C: /* 80340A68 0033D9C8 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80340A6C 0033D9CC 7C 08 03 A6 */ mtlr r0 /* 80340A70 0033D9D0 38 21 00 30 */ addi r1, r1, 0x30 -/* 80340A74 0033D9D4 4E 80 00 20 */ blr +/* 80340A74 0033D9D4 4E 80 00 20 */ blr .global sub_80340a78 sub_80340a78: @@ -1019,4 +1019,4 @@ lbl_80340CB0: /* 80340CB4 0033DC14 80 01 00 24 */ lwz r0, 0x24(r1) /* 80340CB8 0033DC18 7C 08 03 A6 */ mtlr r0 /* 80340CBC 0033DC1C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80340CC0 0033DC20 4E 80 00 20 */ blr +/* 80340CC0 0033DC20 4E 80 00 20 */ blr diff --git a/asm/Kyoto/CTimeProvider.s b/asm/Kyoto/CTimeProvider.s index 7d7d831c..06f2690f 100644 --- a/asm/Kyoto/CTimeProvider.s +++ b/asm/Kyoto/CTimeProvider.s @@ -42,7 +42,7 @@ lbl_803582B8: /* 803582C4 00355224 83 C1 00 08 */ lwz r30, 8(r1) /* 803582C8 00355228 7C 08 03 A6 */ mtlr r0 /* 803582CC 0035522C 38 21 00 10 */ addi r1, r1, 0x10 -/* 803582D0 00355230 4E 80 00 20 */ blr +/* 803582D0 00355230 4E 80 00 20 */ blr .global __ct__13CTimeProviderFRCf __ct__13CTimeProviderFRCf: @@ -70,4 +70,4 @@ lbl_80358310: /* 80358324 00355284 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80358328 00355288 7C 08 03 A6 */ mtlr r0 /* 8035832C 0035528C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80358330 00355290 4E 80 00 20 */ blr +/* 80358330 00355290 4E 80 00 20 */ blr diff --git a/asm/Kyoto/CToken.s b/asm/Kyoto/CToken.s index bafc204f..6fcf2429 100644 --- a/asm/Kyoto/CToken.s +++ b/asm/Kyoto/CToken.s @@ -37,7 +37,7 @@ lbl_80340D28: /* 80340D30 0033DC90 83 C1 00 08 */ lwz r30, 8(r1) /* 80340D34 0033DC94 7C 08 03 A6 */ mtlr r0 /* 80340D38 0033DC98 38 21 00 10 */ addi r1, r1, 0x10 -/* 80340D3C 0033DC9C 4E 80 00 20 */ blr +/* 80340D3C 0033DC9C 4E 80 00 20 */ blr .global Unlock__6CTokenFv Unlock__6CTokenFv: @@ -58,7 +58,7 @@ lbl_80340D70: /* 80340D74 0033DCD4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80340D78 0033DCD8 7C 08 03 A6 */ mtlr r0 /* 80340D7C 0033DCDC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80340D80 0033DCE0 4E 80 00 20 */ blr +/* 80340D80 0033DCE0 4E 80 00 20 */ blr .global Lock__6CTokenFv Lock__6CTokenFv: @@ -79,7 +79,7 @@ lbl_80340DB4: /* 80340DB8 0033DD18 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80340DBC 0033DD1C 7C 08 03 A6 */ mtlr r0 /* 80340DC0 0033DD20 38 21 00 10 */ addi r1, r1, 0x10 -/* 80340DC4 0033DD24 4E 80 00 20 */ blr +/* 80340DC4 0033DD24 4E 80 00 20 */ blr .global RemoveRef__6CTokenFv RemoveRef__6CTokenFv: @@ -100,7 +100,7 @@ lbl_80340DF8: /* 80340DFC 0033DD5C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80340E00 0033DD60 7C 08 03 A6 */ mtlr r0 /* 80340E04 0033DD64 38 21 00 10 */ addi r1, r1, 0x10 -/* 80340E08 0033DD68 4E 80 00 20 */ blr +/* 80340E08 0033DD68 4E 80 00 20 */ blr .global GetObj__6CTokenFv GetObj__6CTokenFv: @@ -116,7 +116,7 @@ GetObj__6CTokenFv: /* 80340E30 0033DD90 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80340E34 0033DD94 7C 08 03 A6 */ mtlr r0 /* 80340E38 0033DD98 38 21 00 10 */ addi r1, r1, 0x10 -/* 80340E3C 0033DD9C 4E 80 00 20 */ blr +/* 80340E3C 0033DD9C 4E 80 00 20 */ blr .global __dt__6CTokenFv __dt__6CTokenFv: @@ -147,7 +147,7 @@ lbl_80340E8C: /* 80340E98 0033DDF8 83 C1 00 08 */ lwz r30, 8(r1) /* 80340E9C 0033DDFC 7C 08 03 A6 */ mtlr r0 /* 80340EA0 0033DE00 38 21 00 10 */ addi r1, r1, 0x10 -/* 80340EA4 0033DE04 4E 80 00 20 */ blr +/* 80340EA4 0033DE04 4E 80 00 20 */ blr .global __ct__6CTokenFRC6CToken __ct__6CTokenFRC6CToken: @@ -174,7 +174,7 @@ lbl_80340EEC: /* 80340EF4 0033DE54 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80340EF8 0033DE58 7C 08 03 A6 */ mtlr r0 /* 80340EFC 0033DE5C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80340F00 0033DE60 4E 80 00 20 */ blr +/* 80340F00 0033DE60 4E 80 00 20 */ blr .global __ct__6CTokenFP4IObj __ct__6CTokenFP4IObj: @@ -218,7 +218,7 @@ lbl_80340F6C: /* 80340F94 0033DEF4 38 80 00 01 */ li r4, 1 /* 80340F98 0033DEF8 81 8C 00 08 */ lwz r12, 8(r12) /* 80340F9C 0033DEFC 7D 89 03 A6 */ mtctr r12 -/* 80340FA0 0033DF00 4E 80 04 21 */ bctrl +/* 80340FA0 0033DF00 4E 80 04 21 */ bctrl lbl_80340FA4: /* 80340FA4 0033DF04 38 00 00 00 */ li r0, 0 /* 80340FA8 0033DF08 7F C3 F3 78 */ mr r3, r30 @@ -235,7 +235,7 @@ lbl_80340FA4: /* 80340FD4 0033DF34 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80340FD8 0033DF38 7C 08 03 A6 */ mtlr r0 /* 80340FDC 0033DF3C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80340FE0 0033DF40 4E 80 00 20 */ blr +/* 80340FE0 0033DF40 4E 80 00 20 */ blr .global __ct__6CTokenFP16CObjectReference __ct__6CTokenFP16CObjectReference: diff --git a/asm/Kyoto/DolphinCDvdFile.s b/asm/Kyoto/DolphinCDvdFile.s index ad6be331..ddc13657 100644 --- a/asm/Kyoto/DolphinCDvdFile.s +++ b/asm/Kyoto/DolphinCDvdFile.s @@ -36,9 +36,9 @@ UpdateFilePos__8CDvdFileFi: /* 8034F8E4 0034C844 80 83 00 14 */ lwz r4, 0x14(r3) /* 8034F8E8 0034C848 80 03 00 10 */ lwz r0, 0x10(r3) /* 8034F8EC 0034C84C 7C 00 20 00 */ cmpw r0, r4 -/* 8034F8F0 0034C850 4C 81 00 20 */ blelr +/* 8034F8F0 0034C850 4C 81 00 20 */ blelr /* 8034F8F4 0034C854 90 83 00 10 */ stw r4, 0x10(r3) -/* 8034F8F8 0034C858 4E 80 00 20 */ blr +/* 8034F8F8 0034C858 4E 80 00 20 */ blr .global CalcFileOffset__8CDvdFileFi11ESeekOrigin CalcFileOffset__8CDvdFileFi11ESeekOrigin: @@ -47,28 +47,28 @@ CalcFileOffset__8CDvdFileFi11ESeekOrigin: /* 8034F904 0034C864 40 80 00 10 */ bge lbl_8034F914 /* 8034F908 0034C868 2C 05 00 00 */ cmpwi r5, 0 /* 8034F90C 0034C86C 40 80 00 14 */ bge lbl_8034F920 -/* 8034F910 0034C870 4E 80 00 20 */ blr +/* 8034F910 0034C870 4E 80 00 20 */ blr lbl_8034F914: /* 8034F914 0034C874 2C 05 00 03 */ cmpwi r5, 3 -/* 8034F918 0034C878 4C 80 00 20 */ bgelr +/* 8034F918 0034C878 4C 80 00 20 */ bgelr /* 8034F91C 0034C87C 48 00 00 1C */ b lbl_8034F938 lbl_8034F920: /* 8034F920 0034C880 90 83 00 10 */ stw r4, 0x10(r3) -/* 8034F924 0034C884 4E 80 00 20 */ blr +/* 8034F924 0034C884 4E 80 00 20 */ blr lbl_8034F928: /* 8034F928 0034C888 80 03 00 10 */ lwz r0, 0x10(r3) /* 8034F92C 0034C88C 7C 00 22 14 */ add r0, r0, r4 /* 8034F930 0034C890 90 03 00 10 */ stw r0, 0x10(r3) -/* 8034F934 0034C894 4E 80 00 20 */ blr +/* 8034F934 0034C894 4E 80 00 20 */ blr lbl_8034F938: /* 8034F938 0034C898 80 03 00 14 */ lwz r0, 0x14(r3) /* 8034F93C 0034C89C 7C 04 02 14 */ add r0, r4, r0 /* 8034F940 0034C8A0 90 03 00 10 */ stw r0, 0x10(r3) -/* 8034F944 0034C8A4 4E 80 00 20 */ blr +/* 8034F944 0034C8A4 4E 80 00 20 */ blr .global internalCallback__8CDvdFileFlP11DVDFileInfo internalCallback__8CDvdFileFlP11DVDFileInfo: -/* 8034F948 0034C8A8 4E 80 00 20 */ blr +/* 8034F948 0034C8A8 4E 80 00 20 */ blr .global FileExists__8CDvdFileFPCc FileExists__8CDvdFileFPCc: @@ -84,7 +84,7 @@ FileExists__8CDvdFileFPCc: /* 8034F970 0034C8D0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8034F974 0034C8D4 7C 08 03 A6 */ mtlr r0 /* 8034F978 0034C8D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034F97C 0034C8DC 4E 80 00 20 */ blr +/* 8034F97C 0034C8DC 4E 80 00 20 */ blr .global CloseFile__8CDvdFileFv CloseFile__8CDvdFileFv: @@ -104,7 +104,7 @@ lbl_8034F9AC: /* 8034F9B0 0034C910 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8034F9B4 0034C914 7C 08 03 A6 */ mtlr r0 /* 8034F9B8 0034C918 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034F9BC 0034C91C 4E 80 00 20 */ blr +/* 8034F9BC 0034C91C 4E 80 00 20 */ blr .global AsyncSeekRead__8CDvdFileFPvUi11ESeekOrigini AsyncSeekRead__8CDvdFileFPvUi11ESeekOrigini: @@ -192,7 +192,7 @@ lbl_8034FAE0: /* 8034FAF4 0034CA54 80 01 00 24 */ lwz r0, 0x24(r1) /* 8034FAF8 0034CA58 7C 08 03 A6 */ mtlr r0 /* 8034FAFC 0034CA5C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8034FB00 0034CA60 4E 80 00 20 */ blr +/* 8034FB00 0034CA60 4E 80 00 20 */ blr .global SyncSeekRead__8CDvdFileFPvUi11ESeekOrigini SyncSeekRead__8CDvdFileFPvUi11ESeekOrigini: @@ -255,7 +255,7 @@ lbl_8034FBC8: /* 8034FBD8 0034CB38 80 01 00 64 */ lwz r0, 0x64(r1) /* 8034FBDC 0034CB3C 7C 08 03 A6 */ mtlr r0 /* 8034FBE0 0034CB40 38 21 00 60 */ addi r1, r1, 0x60 -/* 8034FBE4 0034CB44 4E 80 00 20 */ blr +/* 8034FBE4 0034CB44 4E 80 00 20 */ blr .global SyncRead__8CDvdFileFPvUi SyncRead__8CDvdFileFPvUi: @@ -268,7 +268,7 @@ SyncRead__8CDvdFileFPvUi: /* 8034FC00 0034CB60 80 01 00 14 */ lwz r0, 0x14(r1) /* 8034FC04 0034CB64 7C 08 03 A6 */ mtlr r0 /* 8034FC08 0034CB68 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034FC0C 0034CB6C 4E 80 00 20 */ blr +/* 8034FC0C 0034CB6C 4E 80 00 20 */ blr .global __dt__8CDvdFileFv __dt__8CDvdFileFv: @@ -326,7 +326,7 @@ lbl_8034FCB8: /* 8034FCC0 0034CC20 80 01 00 24 */ lwz r0, 0x24(r1) /* 8034FCC4 0034CC24 7C 08 03 A6 */ mtlr r0 /* 8034FCC8 0034CC28 38 21 00 20 */ addi r1, r1, 0x20 -/* 8034FCCC 0034CC2C 4E 80 00 20 */ blr +/* 8034FCCC 0034CC2C 4E 80 00 20 */ blr .global __ct__8CDvdFileFPCc __ct__8CDvdFileFPCc: @@ -378,7 +378,7 @@ lbl_8034FD6C: /* 8034FD7C 0034CCDC 83 A1 00 54 */ lwz r29, 0x54(r1) /* 8034FD80 0034CCE0 7C 08 03 A6 */ mtlr r0 /* 8034FD84 0034CCE4 38 21 00 60 */ addi r1, r1, 0x60 -/* 8034FD88 0034CCE8 4E 80 00 20 */ blr +/* 8034FD88 0034CCE8 4E 80 00 20 */ blr .global StallForARAMFile__8CDvdFileFv StallForARAMFile__8CDvdFileFv: @@ -398,7 +398,7 @@ lbl_8034FDA8: /* 8034FDB8 0034CD18 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8034FDBC 0034CD1C 7C 08 03 A6 */ mtlr r0 /* 8034FDC0 0034CD20 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034FDC4 0034CD24 4E 80 00 20 */ blr +/* 8034FDC4 0034CD24 4E 80 00 20 */ blr .global StartARAMFileLoad__8CDvdFileFv StartARAMFileLoad__8CDvdFileFv: @@ -516,7 +516,7 @@ lbl_8034FF1C: /* 8034FF6C 0034CECC 83 81 00 30 */ lwz r28, 0x30(r1) /* 8034FF70 0034CED0 7C 08 03 A6 */ mtlr r0 /* 8034FF74 0034CED4 38 21 00 40 */ addi r1, r1, 0x40 -/* 8034FF78 0034CED8 4E 80 00 20 */ blr +/* 8034FF78 0034CED8 4E 80 00 20 */ blr .global sub_8034ff7c sub_8034ff7c: @@ -580,7 +580,7 @@ lbl_80350030: /* 80350040 0034CFA0 83 81 00 10 */ lwz r28, 0x10(r1) /* 80350044 0034CFA4 7C 08 03 A6 */ mtlr r0 /* 80350048 0034CFA8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8035004C 0034CFAC 4E 80 00 20 */ blr +/* 8035004C 0034CFAC 4E 80 00 20 */ blr .global PopARAMFileLoad__8CDvdFileFv PopARAMFileLoad__8CDvdFileFv: @@ -609,7 +609,7 @@ lbl_80350094: /* 803500A4 0034D004 83 C1 00 08 */ lwz r30, 8(r1) /* 803500A8 0034D008 7C 08 03 A6 */ mtlr r0 /* 803500AC 0034D00C 38 21 00 10 */ addi r1, r1, 0x10 -/* 803500B0 0034D010 4E 80 00 20 */ blr +/* 803500B0 0034D010 4E 80 00 20 */ blr .global PushARAMFileLoad__8CDvdFileFv PushARAMFileLoad__8CDvdFileFv: @@ -651,7 +651,7 @@ lbl_8035011C: /* 8035012C 0034D08C 83 C1 00 08 */ lwz r30, 8(r1) /* 80350130 0034D090 7C 08 03 A6 */ mtlr r0 /* 80350134 0034D094 38 21 00 10 */ addi r1, r1, 0x10 -/* 80350138 0034D098 4E 80 00 20 */ blr +/* 80350138 0034D098 4E 80 00 20 */ blr .global TryARAMFile__8CDvdFileFv TryARAMFile__8CDvdFileFv: @@ -733,7 +733,7 @@ lbl_80350248: /* 8035024C 0034D1AC 80 01 00 24 */ lwz r0, 0x24(r1) /* 80350250 0034D1B0 7C 08 03 A6 */ mtlr r0 /* 80350254 0034D1B4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80350258 0034D1B8 4E 80 00 20 */ blr +/* 80350258 0034D1B8 4E 80 00 20 */ blr .global PingARAMTransfer__8CDvdFileFv PingARAMTransfer__8CDvdFileFv: @@ -830,7 +830,7 @@ lbl_8035039C: /* 803503AC 0034D30C 83 81 00 10 */ lwz r28, 0x10(r1) /* 803503B0 0034D310 7C 08 03 A6 */ mtlr r0 /* 803503B4 0034D314 38 21 00 20 */ addi r1, r1, 0x20 -/* 803503B8 0034D318 4E 80 00 20 */ blr +/* 803503B8 0034D318 4E 80 00 20 */ blr .global HandleDVDInterrupt__8CDvdFileFv HandleDVDInterrupt__8CDvdFileFv: @@ -861,7 +861,7 @@ lbl_80350408: /* 80350418 0034D378 83 C1 00 08 */ lwz r30, 8(r1) /* 8035041C 0034D37C 7C 08 03 A6 */ mtlr r0 /* 80350420 0034D380 38 21 00 10 */ addi r1, r1, 0x10 -/* 80350424 0034D384 4E 80 00 20 */ blr +/* 80350424 0034D384 4E 80 00 20 */ blr .global HandleARAMInterrupt__8CDvdFileFv HandleARAMInterrupt__8CDvdFileFv: @@ -892,7 +892,7 @@ lbl_80350474: /* 80350484 0034D3E4 83 C1 00 08 */ lwz r30, 8(r1) /* 80350488 0034D3E8 7C 08 03 A6 */ mtlr r0 /* 8035048C 0034D3EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80350490 0034D3F0 4E 80 00 20 */ blr +/* 80350490 0034D3F0 4E 80 00 20 */ blr .global ARAMARAMXferCallback__8CDvdFileFUl ARAMARAMXferCallback__8CDvdFileFUl: @@ -904,7 +904,7 @@ ARAMARAMXferCallback__8CDvdFileFUl: /* 803504A8 0034D408 80 01 00 14 */ lwz r0, 0x14(r1) /* 803504AC 0034D40C 7C 08 03 A6 */ mtlr r0 /* 803504B0 0034D410 38 21 00 10 */ addi r1, r1, 0x10 -/* 803504B4 0034D414 4E 80 00 20 */ blr +/* 803504B4 0034D414 4E 80 00 20 */ blr .global DVDARAMXferCallback__8CDvdFileFlP11DVDFileInfo DVDARAMXferCallback__8CDvdFileFlP11DVDFileInfo: @@ -921,7 +921,7 @@ DVDARAMXferCallback__8CDvdFileFlP11DVDFileInfo: /* 803504E0 0034D440 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803504E4 0034D444 7C 08 03 A6 */ mtlr r0 /* 803504E8 0034D448 38 21 00 10 */ addi r1, r1, 0x10 -/* 803504EC 0034D44C 4E 80 00 20 */ blr +/* 803504EC 0034D44C 4E 80 00 20 */ blr .global DecodeARAMFile__FPCc DecodeARAMFile__FPCc: diff --git a/asm/Kyoto/DolphinCMemoryCardSys.s b/asm/Kyoto/DolphinCMemoryCardSys.s index 33922c43..f7ff18b4 100644 --- a/asm/Kyoto/DolphinCMemoryCardSys.s +++ b/asm/Kyoto/DolphinCMemoryCardSys.s @@ -40,7 +40,7 @@ lbl_805A95C0: .global lbl_805A95C1 lbl_805A95C1: .skip 0x7 - + .section .text, "ax" .global FreeCardWorkArea__14CMemoryCardSysFQ214CMemoryCardSys15EMemoryCardPort @@ -73,7 +73,7 @@ lbl_8034D534: /* 8034D538 0034A498 80 01 00 34 */ lwz r0, 0x34(r1) /* 8034D53C 0034A49C 7C 08 03 A6 */ mtlr r0 /* 8034D540 0034A4A0 38 21 00 30 */ addi r1, r1, 0x30 -/* 8034D544 0034A4A4 4E 80 00 20 */ blr +/* 8034D544 0034A4A4 4E 80 00 20 */ blr .global "__dt__Q24rstl36vectorFv" "__dt__Q24rstl36vectorFv": @@ -145,7 +145,7 @@ lbl_8034D620: /* 8034D628 0034A588 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8034D62C 0034A58C 7C 08 03 A6 */ mtlr r0 /* 8034D630 0034A590 38 21 00 20 */ addi r1, r1, 0x20 -/* 8034D634 0034A594 4E 80 00 20 */ blr +/* 8034D634 0034A594 4E 80 00 20 */ blr .global sub_8034d638 sub_8034d638: @@ -183,7 +183,7 @@ lbl_8034D69C: /* 8034D6A8 0034A608 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8034D6AC 0034A60C 7C 08 03 A6 */ mtlr r0 /* 8034D6B0 0034A610 38 21 00 20 */ addi r1, r1, 0x20 -/* 8034D6B4 0034A614 4E 80 00 20 */ blr +/* 8034D6B4 0034A614 4E 80 00 20 */ blr .global AllocCardWorkArea__14CMemoryCardSysFQ214CMemoryCardSys15EMemoryCardPort AllocCardWorkArea__14CMemoryCardSysFQ214CMemoryCardSys15EMemoryCardPort: @@ -208,7 +208,7 @@ AllocCardWorkArea__14CMemoryCardSysFQ214CMemoryCardSys15EMemoryCardPort: /* 8034D700 0034A660 83 C1 00 08 */ lwz r30, 8(r1) /* 8034D704 0034A664 7C 08 03 A6 */ mtlr r0 /* 8034D708 0034A668 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034D70C 0034A66C 4E 80 00 20 */ blr +/* 8034D70C 0034A66C 4E 80 00 20 */ blr .global "resize__Q24rstl36vectorFiRCc" "resize__Q24rstl36vectorFiRCc": @@ -265,7 +265,7 @@ lbl_8034D7B4: /* 8034D7C0 0034A720 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8034D7C4 0034A724 7C 08 03 A6 */ mtlr r0 /* 8034D7C8 0034A728 38 21 00 30 */ addi r1, r1, 0x30 -/* 8034D7CC 0034A72C 4E 80 00 20 */ blr +/* 8034D7CC 0034A72C 4E 80 00 20 */ blr .global WorkAreaVector__14CMemoryCardSysFQ214CMemoryCardSys15EMemoryCardPort WorkAreaVector__14CMemoryCardSysFQ214CMemoryCardSys15EMemoryCardPort: @@ -278,15 +278,15 @@ WorkAreaVector__14CMemoryCardSysFQ214CMemoryCardSys15EMemoryCardPort: lbl_8034D7E8: /* 8034D7E8 0034A748 3C 60 80 5A */ lis r3, lbl_805A67DC@ha /* 8034D7EC 0034A74C 38 63 67 DC */ addi r3, r3, lbl_805A67DC@l -/* 8034D7F0 0034A750 4E 80 00 20 */ blr +/* 8034D7F0 0034A750 4E 80 00 20 */ blr lbl_8034D7F4: /* 8034D7F4 0034A754 3C 60 80 5A */ lis r3, lbl_805A67FC@ha /* 8034D7F8 0034A758 38 63 67 FC */ addi r3, r3, lbl_805A67FC@l -/* 8034D7FC 0034A75C 4E 80 00 20 */ blr +/* 8034D7FC 0034A75C 4E 80 00 20 */ blr lbl_8034D800: /* 8034D800 0034A760 3C 60 80 5A */ lis r3, lbl_805A67DC@ha /* 8034D804 0034A764 38 63 67 DC */ addi r3, r3, lbl_805A67DC@l -/* 8034D808 0034A768 4E 80 00 20 */ blr +/* 8034D808 0034A768 4E 80 00 20 */ blr .global SetStatus__14CMemoryCardSysFiiPC8CARDStat SetStatus__14CMemoryCardSysFiiPC8CARDStat: @@ -298,7 +298,7 @@ SetStatus__14CMemoryCardSysFiiPC8CARDStat: /* 8034D820 0034A780 80 01 00 14 */ lwz r0, 0x14(r1) /* 8034D824 0034A784 7C 08 03 A6 */ mtlr r0 /* 8034D828 0034A788 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034D82C 0034A78C 4E 80 00 20 */ blr +/* 8034D82C 0034A78C 4E 80 00 20 */ blr .global GetStatus__14CMemoryCardSysFiiP8CARDStat GetStatus__14CMemoryCardSysFiiP8CARDStat: @@ -325,7 +325,7 @@ lbl_8034D85C: /* 8034D87C 0034A7DC 83 E1 00 7C */ lwz r31, 0x7c(r1) /* 8034D880 0034A7E0 7C 08 03 A6 */ mtlr r0 /* 8034D884 0034A7E4 38 21 00 80 */ addi r1, r1, 0x80 -/* 8034D888 0034A7E8 4E 80 00 20 */ blr +/* 8034D888 0034A7E8 4E 80 00 20 */ blr .global GetSerialNo__14CMemoryCardSysFiRx GetSerialNo__14CMemoryCardSysFiRx: @@ -336,7 +336,7 @@ GetSerialNo__14CMemoryCardSysFiRx: /* 8034D89C 0034A7FC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8034D8A0 0034A800 7C 08 03 A6 */ mtlr r0 /* 8034D8A4 0034A804 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034D8A8 0034A808 4E 80 00 20 */ blr +/* 8034D8A8 0034A808 4E 80 00 20 */ blr .global TryFileRead__19SMemoryCardFileInfoFv TryFileRead__19SMemoryCardFileInfoFv: @@ -358,7 +358,7 @@ lbl_8034D8DC: /* 8034D8E0 0034A840 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8034D8E4 0034A844 7C 08 03 A6 */ mtlr r0 /* 8034D8E8 0034A848 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034D8EC 0034A84C 4E 80 00 20 */ blr +/* 8034D8EC 0034A84C 4E 80 00 20 */ blr .global StartRead__19SMemoryCardFileInfoFv StartRead__19SMemoryCardFileInfoFv: @@ -428,7 +428,7 @@ lbl_8034D9D0: /* 8034D9D8 0034A938 83 C1 00 98 */ lwz r30, 0x98(r1) /* 8034D9DC 0034A93C 7C 08 03 A6 */ mtlr r0 /* 8034D9E0 0034A940 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8034D9E4 0034A944 4E 80 00 20 */ blr +/* 8034D9E4 0034A944 4E 80 00 20 */ blr .global sub_8034d9e8 sub_8034d9e8: @@ -497,7 +497,7 @@ lbl_8034DAAC: /* 8034DAC4 0034AA24 83 81 00 20 */ lwz r28, 0x20(r1) /* 8034DAC8 0034AA28 7C 08 03 A6 */ mtlr r0 /* 8034DACC 0034AA2C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8034DAD0 0034AA30 4E 80 00 20 */ blr +/* 8034DAD0 0034AA30 4E 80 00 20 */ blr .global GetStatus__13CCardFileInfoFP8CARDStat GetStatus__13CCardFileInfoFP8CARDStat: @@ -589,7 +589,7 @@ lbl_8034DBF4: /* 8034DC04 0034AB64 83 81 00 10 */ lwz r28, 0x10(r1) /* 8034DC08 0034AB68 7C 08 03 A6 */ mtlr r0 /* 8034DC0C 0034AB6C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8034DC10 0034AB70 4E 80 00 20 */ blr +/* 8034DC10 0034AB70 4E 80 00 20 */ blr .global PumpCardTransfer__13CCardFileInfoFv PumpCardTransfer__13CCardFileInfoFv: @@ -681,7 +681,7 @@ lbl_8034DD3C: /* 8034DD44 0034ACA4 83 C1 00 98 */ lwz r30, 0x98(r1) /* 8034DD48 0034ACA8 7C 08 03 A6 */ mtlr r0 /* 8034DD4C 0034ACAC 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8034DD50 0034ACB0 4E 80 00 20 */ blr +/* 8034DD50 0034ACB0 4E 80 00 20 */ blr .global sub_8034dd54 sub_8034dd54: @@ -753,7 +753,7 @@ lbl_8034DE2C: /* 8034DE34 0034AD94 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8034DE38 0034AD98 7C 08 03 A6 */ mtlr r0 /* 8034DE3C 0034AD9C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8034DE40 0034ADA0 4E 80 00 20 */ blr +/* 8034DE40 0034ADA0 4E 80 00 20 */ blr .global Write__14CMemoryCardSysFRQ214CMemoryCardSys13CCardFileInfoPCvUlUl Write__14CMemoryCardSysFRQ214CMemoryCardSys13CCardFileInfoPCvUlUl: @@ -784,7 +784,7 @@ Write__14CMemoryCardSysFRQ214CMemoryCardSys13CCardFileInfoPCvUlUl: /* 8034DEA4 0034AE04 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8034DEA8 0034AE08 7C 08 03 A6 */ mtlr r0 /* 8034DEAC 0034AE0C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8034DEB0 0034AE10 4E 80 00 20 */ blr +/* 8034DEB0 0034AE10 4E 80 00 20 */ blr .global CheckCard__14CMemoryCardSysFv CheckCard__14CMemoryCardSysFv: @@ -796,7 +796,7 @@ CheckCard__14CMemoryCardSysFv: /* 8034DEC8 0034AE28 80 01 00 14 */ lwz r0, 0x14(r1) /* 8034DECC 0034AE2C 7C 08 03 A6 */ mtlr r0 /* 8034DED0 0034AE30 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034DED4 0034AE34 4E 80 00 20 */ blr +/* 8034DED4 0034AE34 4E 80 00 20 */ blr .global Rename__14CMemoryCardSysFiPCcPCc Rename__14CMemoryCardSysFiPCcPCc: @@ -810,7 +810,7 @@ Rename__14CMemoryCardSysFiPCcPCc: /* 8034DEF4 0034AE54 80 01 00 14 */ lwz r0, 0x14(r1) /* 8034DEF8 0034AE58 7C 08 03 A6 */ mtlr r0 /* 8034DEFC 0034AE5C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034DF00 0034AE60 4E 80 00 20 */ blr +/* 8034DF00 0034AE60 4E 80 00 20 */ blr .global Close__13CCardFileInfoFv Close__13CCardFileInfoFv: @@ -830,7 +830,7 @@ Close__13CCardFileInfoFv: /* 8034DF38 0034AE98 83 C1 00 08 */ lwz r30, 8(r1) /* 8034DF3C 0034AE9C 7C 08 03 A6 */ mtlr r0 /* 8034DF40 0034AEA0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034DF44 0034AEA4 4E 80 00 20 */ blr +/* 8034DF44 0034AEA4 4E 80 00 20 */ blr .global Close__19SMemoryCardFileInfo Close__19SMemoryCardFileInfo: @@ -850,7 +850,7 @@ Close__19SMemoryCardFileInfo: /* 8034DF7C 0034AEDC 83 C1 00 08 */ lwz r30, 8(r1) /* 8034DF80 0034AEE0 7C 08 03 A6 */ mtlr r0 /* 8034DF84 0034AEE4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034DF88 0034AEE8 4E 80 00 20 */ blr +/* 8034DF88 0034AEE8 4E 80 00 20 */ blr .global FastDeleteFile__14CMemoryCardSysFii FastDeleteFile__14CMemoryCardSysFii: @@ -862,7 +862,7 @@ FastDeleteFile__14CMemoryCardSysFii: /* 8034DFA0 0034AF00 80 01 00 14 */ lwz r0, 0x14(r1) /* 8034DFA4 0034AF04 7C 08 03 A6 */ mtlr r0 /* 8034DFA8 0034AF08 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034DFAC 0034AF0C 4E 80 00 20 */ blr +/* 8034DFAC 0034AF0C 4E 80 00 20 */ blr .global DeleteFile__14CMemoryCardSysFiPCc DeleteFile__14CMemoryCardSysFiPCc: @@ -875,7 +875,7 @@ DeleteFile__14CMemoryCardSysFiPCc: /* 8034DFC8 0034AF28 80 01 00 14 */ lwz r0, 0x14(r1) /* 8034DFCC 0034AF2C 7C 08 03 A6 */ mtlr r0 /* 8034DFD0 0034AF30 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034DFD4 0034AF34 4E 80 00 20 */ blr +/* 8034DFD4 0034AF34 4E 80 00 20 */ blr .global "CreateFile__14CMemoryCardSysFQ214CMemoryCardSys15EMemoryCardPortRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>UiRQ214CMemoryCardSys13CCardFileInfo" "CreateFile__14CMemoryCardSysFQ214CMemoryCardSys15EMemoryCardPortRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>UiRQ214CMemoryCardSys13CCardFileInfo": @@ -900,7 +900,7 @@ DeleteFile__14CMemoryCardSysFiPCc: /* 8034E020 0034AF80 83 C1 00 08 */ lwz r30, 8(r1) /* 8034E024 0034AF84 7C 08 03 A6 */ mtlr r0 /* 8034E028 0034AF88 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034E02C 0034AF8C 4E 80 00 20 */ blr +/* 8034E02C 0034AF8C 4E 80 00 20 */ blr .global "OpenFile__14CMemoryCardSysFQ214CMemoryCardSys15EMemoryCardPortRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RQ214CMemoryCardSys13CCardFileInfo" "OpenFile__14CMemoryCardSysFQ214CMemoryCardSys15EMemoryCardPortRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RQ214CMemoryCardSys13CCardFileInfo": @@ -917,7 +917,7 @@ DeleteFile__14CMemoryCardSysFiPCc: /* 8034E058 0034AFB8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8034E05C 0034AFBC 7C 08 03 A6 */ mtlr r0 /* 8034E060 0034AFC0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034E064 0034AFC4 4E 80 00 20 */ blr +/* 8034E064 0034AFC4 4E 80 00 20 */ blr .global LockIconToken__13CCardFileInfoFiiR11CSimplePool LockIconToken__13CCardFileInfoFiiR11CSimplePool: @@ -962,7 +962,7 @@ lbl_8034E0F0: /* 8034E0F8 0034B058 83 C1 00 28 */ lwz r30, 0x28(r1) /* 8034E0FC 0034B05C 7C 08 03 A6 */ mtlr r0 /* 8034E100 0034B060 38 21 00 30 */ addi r1, r1, 0x30 -/* 8034E104 0034B064 4E 80 00 20 */ blr +/* 8034E104 0034B064 4E 80 00 20 */ blr .global LockBannerToken__13CCardFileInfoFiR11CSimplePool LockBannerToken__13CCardFileInfoFiR11CSimplePool: @@ -984,7 +984,7 @@ LockBannerToken__13CCardFileInfoFiR11CSimplePool: /* 8034E144 0034B0A4 81 84 00 00 */ lwz r12, 0(r4) /* 8034E148 0034B0A8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8034E14C 0034B0AC 7D 89 03 A6 */ mtctr r12 -/* 8034E150 0034B0B0 4E 80 04 21 */ bctrl +/* 8034E150 0034B0B0 4E 80 04 21 */ bctrl /* 8034E154 0034B0B4 3B E1 00 18 */ addi r31, r1, 0x18 /* 8034E158 0034B0B8 38 81 00 08 */ addi r4, r1, 8 /* 8034E15C 0034B0BC 7F E3 FB 78 */ mr r3, r31 @@ -1028,7 +1028,7 @@ lbl_8034E1C8: /* 8034E1E8 0034B148 83 C1 00 28 */ lwz r30, 0x28(r1) /* 8034E1EC 0034B14C 7C 08 03 A6 */ mtlr r0 /* 8034E1F0 0034B150 38 21 00 30 */ addi r1, r1, 0x30 -/* 8034E1F4 0034B154 4E 80 00 20 */ blr +/* 8034E1F4 0034B154 4E 80 00 20 */ blr .global __ct__13CCardFileInfoFRCQ24rstl6string __ct__13CCardFileInfoFRCQ24rstl6string: @@ -1068,7 +1068,7 @@ __ct__13CCardFileInfoFRCQ24rstl6string: /* 8034E27C 0034B1DC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8034E280 0034B1E0 7C 08 03 A6 */ mtlr r0 /* 8034E284 0034B1E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034E288 0034B1E8 4E 80 00 20 */ blr +/* 8034E288 0034B1E8 4E 80 00 20 */ blr .global __ct__19SMemoryCardFileInfoFiRCQ24rstl6string __ct__19SMemoryCardFileInfoFiRCQ24rstl6string: @@ -1098,7 +1098,7 @@ __ct__19SMemoryCardFileInfoFiRCQ24rstl6string: /* 8034E2E8 0034B248 80 01 00 14 */ lwz r0, 0x14(r1) /* 8034E2EC 0034B24C 7C 08 03 A6 */ mtlr r0 /* 8034E2F0 0034B250 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034E2F4 0034B254 4E 80 00 20 */ blr +/* 8034E2F4 0034B254 4E 80 00 20 */ blr .global GetNumFreeBytes__14CMemoryCardSysFQ214CMemoryCardSys15EMemoryCardPortRUi GetNumFreeBytes__14CMemoryCardSysFQ214CMemoryCardSys15EMemoryCardPortRUi: @@ -1121,7 +1121,7 @@ GetNumFreeBytes__14CMemoryCardSysFQ214CMemoryCardSys15EMemoryCardPortRUi: /* 8034E338 0034B298 80 01 00 24 */ lwz r0, 0x24(r1) /* 8034E33C 0034B29C 7C 08 03 A6 */ mtlr r0 /* 8034E340 0034B2A0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8034E344 0034B2A4 4E 80 00 20 */ blr +/* 8034E344 0034B2A4 4E 80 00 20 */ blr .global FormatCard__14CMemoryCardSysFQ214CMemoryCardSys15EMemoryCardPort FormatCard__14CMemoryCardSysFQ214CMemoryCardSys15EMemoryCardPort: @@ -1133,7 +1133,7 @@ FormatCard__14CMemoryCardSysFQ214CMemoryCardSys15EMemoryCardPort: /* 8034E35C 0034B2BC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8034E360 0034B2C0 7C 08 03 A6 */ mtlr r0 /* 8034E364 0034B2C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034E368 0034B2C8 4E 80 00 20 */ blr +/* 8034E368 0034B2C8 4E 80 00 20 */ blr .global UnmountCard__14CMemoryCardSysFQ214CMemoryCardSys15EMemoryCardPort UnmountCard__14CMemoryCardSysFQ214CMemoryCardSys15EMemoryCardPort: @@ -1152,7 +1152,7 @@ UnmountCard__14CMemoryCardSysFQ214CMemoryCardSys15EMemoryCardPort: /* 8034E39C 0034B2FC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8034E3A0 0034B300 7C 08 03 A6 */ mtlr r0 /* 8034E3A4 0034B304 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034E3A8 0034B308 4E 80 00 20 */ blr +/* 8034E3A8 0034B308 4E 80 00 20 */ blr .global MountCard__14CMemoryCardSysFQ214CMemoryCardSys15EMemoryCardPort MountCard__14CMemoryCardSysFQ214CMemoryCardSys15EMemoryCardPort: @@ -1171,7 +1171,7 @@ MountCard__14CMemoryCardSysFQ214CMemoryCardSys15EMemoryCardPort: /* 8034E3DC 0034B33C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8034E3E0 0034B340 7C 08 03 A6 */ mtlr r0 /* 8034E3E4 0034B344 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034E3E8 0034B348 4E 80 00 20 */ blr +/* 8034E3E8 0034B348 4E 80 00 20 */ blr .global GetResultCode__14CMemoryCardSysFi GetResultCode__14CMemoryCardSysFi: @@ -1182,7 +1182,7 @@ GetResultCode__14CMemoryCardSysFi: /* 8034E3FC 0034B35C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8034E400 0034B360 7C 08 03 A6 */ mtlr r0 /* 8034E404 0034B364 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034E408 0034B368 4E 80 00 20 */ blr +/* 8034E408 0034B368 4E 80 00 20 */ blr .global IsMemoryCardInserted__14CMemoryCardSysFQ214CMemoryCardSys15EMemoryCardPort IsMemoryCardInserted__14CMemoryCardSysFQ214CMemoryCardSys15EMemoryCardPort: @@ -1205,7 +1205,7 @@ IsMemoryCardInserted__14CMemoryCardSysFQ214CMemoryCardSys15EMemoryCardPort: /* 8034E44C 0034B3AC 80 01 00 24 */ lwz r0, 0x24(r1) /* 8034E450 0034B3B0 7C 08 03 A6 */ mtlr r0 /* 8034E454 0034B3B4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8034E458 0034B3B8 4E 80 00 20 */ blr +/* 8034E458 0034B3B8 4E 80 00 20 */ blr .global sub_8034e45c sub_8034e45c: @@ -1234,7 +1234,7 @@ lbl_8034E4A4: /* 8034E4B0 0034B410 83 C1 00 08 */ lwz r30, 8(r1) /* 8034E4B4 0034B414 7C 08 03 A6 */ mtlr r0 /* 8034E4B8 0034B418 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034E4BC 0034B41C 4E 80 00 20 */ blr +/* 8034E4BC 0034B41C 4E 80 00 20 */ blr .global Initialize__14CMemoryCardSysFv Initialize__14CMemoryCardSysFv: @@ -1257,7 +1257,7 @@ lbl_8034E4EC: /* 8034E4FC 0034B45C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8034E500 0034B460 7C 08 03 A6 */ mtlr r0 /* 8034E504 0034B464 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034E508 0034B468 4E 80 00 20 */ blr +/* 8034E508 0034B468 4E 80 00 20 */ blr .global SetComment__13CCardFileInfoFv SetComment__13CCardFileInfoFv: @@ -1269,17 +1269,17 @@ SetComment__13CCardFileInfoFv: /* 8034E520 0034B480 80 01 00 14 */ lwz r0, 0x14(r1) /* 8034E524 0034B484 7C 08 03 A6 */ mtlr r0 /* 8034E528 0034B488 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034E52C 0034B48C 4E 80 00 20 */ blr +/* 8034E52C 0034B48C 4E 80 00 20 */ blr .global SetCommentAddr__8CARDStatFi SetCommentAddr__8CARDStatFi: /* 8034E530 0034B490 90 83 00 38 */ stw r4, 0x38(r3) -/* 8034E534 0034B494 4E 80 00 20 */ blr +/* 8034E534 0034B494 4E 80 00 20 */ blr .global SetIconAddr__8CARDStatFi SetIconAddr__8CARDStatFi: /* 8034E538 0034B498 90 83 00 30 */ stw r4, 0x30(r3) -/* 8034E53C 0034B49C 4E 80 00 20 */ blr +/* 8034E53C 0034B49C 4E 80 00 20 */ blr .global SetIconSpeed__8CARDStatFii SetIconSpeed__8CARDStatFii: @@ -1291,7 +1291,7 @@ SetIconSpeed__8CARDStatFii: /* 8034E554 0034B4B4 7C C4 28 78 */ andc r4, r6, r5 /* 8034E558 0034B4B8 7C 80 03 78 */ or r0, r4, r0 /* 8034E55C 0034B4BC B0 03 00 36 */ sth r0, 0x36(r3) -/* 8034E560 0034B4C0 4E 80 00 20 */ blr +/* 8034E560 0034B4C0 4E 80 00 20 */ blr .global SetIconFormat__8CARDStatFii SetIconFormat__8CARDStatFii: @@ -1303,7 +1303,7 @@ SetIconFormat__8CARDStatFii: /* 8034E578 0034B4D8 7C C4 28 78 */ andc r4, r6, r5 /* 8034E57C 0034B4DC 7C 80 03 78 */ or r0, r4, r0 /* 8034E580 0034B4E0 B0 03 00 34 */ sth r0, 0x34(r3) -/* 8034E584 0034B4E4 4E 80 00 20 */ blr +/* 8034E584 0034B4E4 4E 80 00 20 */ blr .global SetBannerFormat__8CARDStatFi SetBannerFormat__8CARDStatFi: @@ -1311,12 +1311,12 @@ SetBannerFormat__8CARDStatFi: /* 8034E58C 0034B4EC 54 00 00 3A */ rlwinm r0, r0, 0, 0, 0x1d /* 8034E590 0034B4F0 7C 00 23 78 */ or r0, r0, r4 /* 8034E594 0034B4F4 98 03 00 2E */ stb r0, 0x2e(r3) -/* 8034E598 0034B4F8 4E 80 00 20 */ blr +/* 8034E598 0034B4F8 4E 80 00 20 */ blr .global GetCommentAddr__8CARDStatFv GetCommentAddr__8CARDStatFv: /* 8034E59C 0034B4FC 80 63 00 38 */ lwz r3, 0x38(r3) -/* 8034E5A0 0034B500 4E 80 00 20 */ blr +/* 8034E5A0 0034B500 4E 80 00 20 */ blr .global GetIconFormat__8CARDStatFi GetIconFormat__8CARDStatFi: @@ -1324,23 +1324,23 @@ GetIconFormat__8CARDStatFi: /* 8034E5A8 0034B508 54 80 08 3C */ slwi r0, r4, 1 /* 8034E5AC 0034B50C 7C 60 06 30 */ sraw r0, r3, r0 /* 8034E5B0 0034B510 54 03 07 BE */ clrlwi r3, r0, 0x1e -/* 8034E5B4 0034B514 4E 80 00 20 */ blr +/* 8034E5B4 0034B514 4E 80 00 20 */ blr .global GetBannerFormat__8CARDStatFv GetBannerFormat__8CARDStatFv: /* 8034E5B8 0034B518 88 03 00 2E */ lbz r0, 0x2e(r3) /* 8034E5BC 0034B51C 54 03 07 BE */ clrlwi r3, r0, 0x1e -/* 8034E5C0 0034B520 4E 80 00 20 */ blr +/* 8034E5C0 0034B520 4E 80 00 20 */ blr .global GetTime__8CARDStatFv GetTime__8CARDStatFv: /* 8034E5C4 0034B524 80 63 00 24 */ lwz r3, 0x24(r3) -/* 8034E5C8 0034B528 4E 80 00 20 */ blr +/* 8034E5C8 0034B528 4E 80 00 20 */ blr .global GetFileLength__8CARDStatFv GetFileLength__8CARDStatFv: /* 8034E5CC 0034B52C 80 63 00 20 */ lwz r3, 0x20(r3) -/* 8034E5D0 0034B530 4E 80 00 20 */ blr +/* 8034E5D0 0034B530 4E 80 00 20 */ blr .global CalculateBannerDataSize__13CCardFileInfoFv CalculateBannerDataSize__13CCardFileInfoFv: @@ -1383,7 +1383,7 @@ lbl_8034E644: /* 8034E64C 0034B5AC 38 A5 02 00 */ addi r5, r5, 0x200 lbl_8034E650: /* 8034E650 0034B5B0 7C A3 2B 78 */ mr r3, r5 -/* 8034E654 0034B5B4 4E 80 00 20 */ blr +/* 8034E654 0034B5B4 4E 80 00 20 */ blr .global CalculateTotalDataSize__13CCardFileInfoFv CalculateTotalDataSize__13CCardFileInfoFv: @@ -1400,7 +1400,7 @@ CalculateTotalDataSize__13CCardFileInfoFv: /* 8034E680 0034B5E0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8034E684 0034B5E4 7C 08 03 A6 */ mtlr r0 /* 8034E688 0034B5E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034E68C 0034B5EC 4E 80 00 20 */ blr +/* 8034E68C 0034B5EC 4E 80 00 20 */ blr .global BuildCardBuffer__13CCardFileInfoFv BuildCardBuffer__13CCardFileInfoFv: @@ -1497,7 +1497,7 @@ lbl_8034E7DC: /* 8034E7EC 0034B74C 83 81 01 00 */ lwz r28, 0x100(r1) /* 8034E7F0 0034B750 7C 08 03 A6 */ mtlr r0 /* 8034E7F4 0034B754 38 21 01 10 */ addi r1, r1, 0x110 -/* 8034E7F8 0034B758 4E 80 00 20 */ blr +/* 8034E7F8 0034B758 4E 80 00 20 */ blr .global WriteIconData__13CCardFileInfoFv WriteIconData__13CCardFileInfoFv: @@ -1553,7 +1553,7 @@ lbl_8034E8A8: /* 8034E8AC 0034B80C 80 01 00 34 */ lwz r0, 0x34(r1) /* 8034E8B0 0034B810 7C 08 03 A6 */ mtlr r0 /* 8034E8B4 0034B814 38 21 00 30 */ addi r1, r1, 0x30 -/* 8034E8B8 0034B818 4E 80 00 20 */ blr +/* 8034E8B8 0034B818 4E 80 00 20 */ blr .global WriteBannerData__13CCardFileInfoFv WriteBannerData__13CCardFileInfoFv: @@ -1598,7 +1598,7 @@ lbl_8034E948: /* 8034E94C 0034B8AC 80 01 00 24 */ lwz r0, 0x24(r1) /* 8034E950 0034B8B0 7C 08 03 A6 */ mtlr r0 /* 8034E954 0034B8B4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8034E958 0034B8B8 4E 80 00 20 */ blr +/* 8034E958 0034B8B8 4E 80 00 20 */ blr .global GetSaveDataOffset__19SMemoryCardFileInfoFRPv GetSaveDataOffset__19SMemoryCardFileInfoFRPv: @@ -1688,27 +1688,27 @@ lbl_8034EA78: /* 8034EA84 0034B9E4 83 A1 00 84 */ lwz r29, 0x84(r1) /* 8034EA88 0034B9E8 7C 08 03 A6 */ mtlr r0 /* 8034EA8C 0034B9EC 38 21 00 90 */ addi r1, r1, 0x90 -/* 8034EA90 0034B9F0 4E 80 00 20 */ blr +/* 8034EA90 0034B9F0 4E 80 00 20 */ blr .global GetFileNo__13CCardFileInfoFv GetFileNo__13CCardFileInfoFv: /* 8034EA94 0034B9F4 80 63 00 08 */ lwz r3, 8(r3) -/* 8034EA98 0034B9F8 4E 80 00 20 */ blr +/* 8034EA98 0034B9F8 4E 80 00 20 */ blr .global GetCardPort__13CCardFileInfoFv GetCardPort__13CCardFileInfoFv: /* 8034EA9C 0034B9FC 80 63 00 04 */ lwz r3, 4(r3) -/* 8034EAA0 0034BA00 4E 80 00 20 */ blr +/* 8034EAA0 0034BA00 4E 80 00 20 */ blr .global GetFileNo__19SMemoryCardFileInfoFv GetFileNo__19SMemoryCardFileInfoFv: /* 8034EAA4 0034BA04 80 63 00 04 */ lwz r3, 4(r3) -/* 8034EAA8 0034BA08 4E 80 00 20 */ blr +/* 8034EAA8 0034BA08 4E 80 00 20 */ blr .global GetFileCardPort__19SMemoryCardFileInfoFv GetFileCardPort__19SMemoryCardFileInfoFv: /* 8034EAAC 0034BA0C 80 63 00 00 */ lwz r3, 0(r3) -/* 8034EAB0 0034BA10 4E 80 00 20 */ blr +/* 8034EAB0 0034BA10 4E 80 00 20 */ blr .global sub_8034eab4 sub_8034eab4: @@ -1730,7 +1730,7 @@ sub_8034eab4: /* 8034EAF0 0034BA50 81 86 00 00 */ lwz r12, 0(r6) /* 8034EAF4 0034BA54 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8034EAF8 0034BA58 7D 89 03 A6 */ mtctr r12 -/* 8034EAFC 0034BA5C 4E 80 04 21 */ bctrl +/* 8034EAFC 0034BA5C 4E 80 04 21 */ bctrl /* 8034EB00 0034BA60 3B FE 00 08 */ addi r31, r30, 8 /* 8034EB04 0034BA64 38 81 00 08 */ addi r4, r1, 8 /* 8034EB08 0034BA68 7F E3 FB 78 */ mr r3, r31 @@ -1748,7 +1748,7 @@ sub_8034eab4: /* 8034EB38 0034BA98 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8034EB3C 0034BA9C 7C 08 03 A6 */ mtlr r0 /* 8034EB40 0034BAA0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8034EB44 0034BAA4 4E 80 00 20 */ blr +/* 8034EB44 0034BAA4 4E 80 00 20 */ blr .global FileRead__19SMemoryCardFileInfoFv FileRead__19SMemoryCardFileInfoFv: @@ -1885,7 +1885,7 @@ lbl_8034ED1C: /* 8034ED20 0034BC80 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 8034ED24 0034BC84 7C 08 03 A6 */ mtlr r0 /* 8034ED28 0034BC88 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 8034ED2C 0034BC8C 4E 80 00 20 */ blr +/* 8034ED2C 0034BC8C 4E 80 00 20 */ blr .global sub_8034ed30 sub_8034ed30: @@ -1962,7 +1962,7 @@ lbl_8034EE1C: /* 8034EE28 0034BD88 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8034EE2C 0034BD8C 7C 08 03 A6 */ mtlr r0 /* 8034EE30 0034BD90 38 21 00 30 */ addi r1, r1, 0x30 -/* 8034EE34 0034BD94 4E 80 00 20 */ blr +/* 8034EE34 0034BD94 4E 80 00 20 */ blr .global "reserve__Q24rstl36vectorFi" "reserve__Q24rstl36vectorFi": @@ -2039,7 +2039,7 @@ lbl_8034EF24: /* 8034EF30 0034BE90 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8034EF34 0034BE94 7C 08 03 A6 */ mtlr r0 /* 8034EF38 0034BE98 38 21 00 30 */ addi r1, r1, 0x30 -/* 8034EF3C 0034BE9C 4E 80 00 20 */ blr +/* 8034EF3C 0034BE9C 4E 80 00 20 */ blr .global __sinit_DolphinCMemoryCardSys_cpp __sinit_DolphinCMemoryCardSys_cpp: diff --git a/asm/Kyoto/Graphics/CColor.s b/asm/Kyoto/Graphics/CColor.s index 34587ea2..ee72e5d2 100644 --- a/asm/Kyoto/Graphics/CColor.s +++ b/asm/Kyoto/Graphics/CColor.s @@ -35,37 +35,37 @@ lbl_805A9588: .global Orange__6CColorFv Orange__6CColorFv: /* 80349F84 00346EE4 38 6D A9 C8 */ addi r3, r13, lbl_805A9588@sda21 -/* 80349F88 00346EE8 4E 80 00 20 */ blr +/* 80349F88 00346EE8 4E 80 00 20 */ blr .global Yellow__6CColorFv Yellow__6CColorFv: /* 80349F8C 00346EEC 38 6D A9 C0 */ addi r3, r13, lbl_805A9580@sda21 -/* 80349F90 00346EF0 4E 80 00 20 */ blr +/* 80349F90 00346EF0 4E 80 00 20 */ blr .global Blue__6CColorFv Blue__6CColorFv: /* 80349F94 00346EF4 38 6D A9 BC */ addi r3, r13, lbl_805A957C@sda21 -/* 80349F98 00346EF8 4E 80 00 20 */ blr +/* 80349F98 00346EF8 4E 80 00 20 */ blr .global Red__6CColorFv Red__6CColorFv: /* 80349F9C 00346EFC 38 6D A9 B4 */ addi r3, r13, lbl_805A9574@sda21 -/* 80349FA0 00346F00 4E 80 00 20 */ blr +/* 80349FA0 00346F00 4E 80 00 20 */ blr .global Grey__6CColorFv Grey__6CColorFv: /* 80349FA4 00346F04 38 6D A9 B0 */ addi r3, r13, lbl_805A9570@sda21 -/* 80349FA8 00346F08 4E 80 00 20 */ blr +/* 80349FA8 00346F08 4E 80 00 20 */ blr .global White__6CColorFv White__6CColorFv: /* 80349FAC 00346F0C 38 6D A9 AC */ addi r3, r13, lbl_805A956C@sda21 -/* 80349FB0 00346F10 4E 80 00 20 */ blr +/* 80349FB0 00346F10 4E 80 00 20 */ blr .global Black__6CColorFv Black__6CColorFv: /* 80349FB4 00346F14 38 6D A9 A8 */ addi r3, r13, lbl_805A9568@sda21 -/* 80349FB8 00346F18 4E 80 00 20 */ blr +/* 80349FB8 00346F18 4E 80 00 20 */ blr .global __sinit_CColor_cpp __sinit_CColor_cpp: diff --git a/asm/Kyoto/Graphics/CCubeMaterial.s b/asm/Kyoto/Graphics/CCubeMaterial.s index 348f65f0..c26f2639 100644 --- a/asm/Kyoto/Graphics/CCubeMaterial.s +++ b/asm/Kyoto/Graphics/CCubeMaterial.s @@ -99,7 +99,7 @@ lbl_805A9560: .global lbl_805A9561 lbl_805A9561: .skip 0x7 - + .section .text, "ax" .global GetCompressedBlend__13CCubeMaterialCFv @@ -118,13 +118,13 @@ GetCompressedBlend__13CCubeMaterialCFv: /* 80345778 003426D8 7C A5 02 14 */ add r5, r5, r0 lbl_8034577C: /* 8034577C 003426DC 80 65 00 00 */ lwz r3, 0(r5) -/* 80345780 003426E0 4E 80 00 20 */ blr +/* 80345780 003426E0 4E 80 00 20 */ blr .global DisableShadowMaps__10CCubeModelFv DisableShadowMaps__10CCubeModelFv: /* 80345784 003426E4 38 00 00 00 */ li r0, 0 /* 80345788 003426E8 98 0D A9 9A */ stb r0, lbl_805A955A@sda21(r13) -/* 8034578C 003426EC 4E 80 00 20 */ blr +/* 8034578C 003426EC 4E 80 00 20 */ blr .global EnableShadowMaps__10CCubeModelFPC8CTextureRC12CTransform4fUcUc EnableShadowMaps__10CCubeModelFPC8CTextureRC12CTransform4fUcUc: @@ -149,14 +149,14 @@ EnableShadowMaps__10CCubeModelFPC8CTextureRC12CTransform4fUcUc: /* 803457D8 00342738 83 C1 00 08 */ lwz r30, 8(r1) /* 803457DC 0034273C 7C 08 03 A6 */ mtlr r0 /* 803457E0 00342740 38 21 00 10 */ addi r1, r1, 0x10 -/* 803457E4 00342744 4E 80 00 20 */ blr +/* 803457E4 00342744 4E 80 00 20 */ blr .global SetRenderModelBlack__10CCubeModelFb SetRenderModelBlack__10CCubeModelFb: /* 803457E8 00342748 38 00 00 00 */ li r0, 0 /* 803457EC 0034274C 98 6D A9 98 */ stb r3, lbl_805A9558@sda21(r13) /* 803457F0 00342750 98 0D A9 99 */ stb r0, lbl_805A9559@sda21(r13) -/* 803457F4 00342754 4E 80 00 20 */ blr +/* 803457F4 00342754 4E 80 00 20 */ blr .global SetNewPlayerPositionAndTime__10CCubeModelFRC9CVector3fRC10CStopwatch SetNewPlayerPositionAndTime__10CCubeModelFRC9CVector3fRC10CStopwatch: @@ -228,7 +228,7 @@ SetNewPlayerPositionAndTime__10CCubeModelFRC9CVector3fRC10CStopwatch: /* 803458FC 0034285C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80345900 00342860 7C 08 03 A6 */ mtlr r0 /* 80345904 00342864 38 21 00 20 */ addi r1, r1, 0x20 -/* 80345908 00342868 4E 80 00 20 */ blr +/* 80345908 00342868 4E 80 00 20 */ blr .global ResetCachedMaterials__13CCubeMaterialFv ResetCachedMaterials__13CCubeMaterialFv: @@ -244,13 +244,13 @@ ResetCachedMaterials__13CCubeMaterialFv: /* 80345930 00342890 80 01 00 14 */ lwz r0, 0x14(r1) /* 80345934 00342894 7C 08 03 A6 */ mtlr r0 /* 80345938 00342898 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034593C 0034289C 4E 80 00 20 */ blr +/* 8034593C 0034289C 4E 80 00 20 */ blr .global KillCachedViewDepState__13CCubeMaterialFv KillCachedViewDepState__13CCubeMaterialFv: /* 80345940 003428A0 38 00 00 00 */ li r0, 0 /* 80345944 003428A4 90 0D A9 84 */ stw r0, lbl_805A9544@sda21(r13) -/* 80345948 003428A8 4E 80 00 20 */ blr +/* 80345948 003428A8 4E 80 00 20 */ blr .global EnsureViewDepStateCached__13CCubeMaterialFPC12CCubeSurface EnsureViewDepStateCached__13CCubeMaterialFPC12CCubeSurface: @@ -587,7 +587,7 @@ lbl_80345E2C: /* 80345E4C 00342DAC 83 C1 01 48 */ lwz r30, 0x148(r1) /* 80345E50 00342DB0 7C 08 03 A6 */ mtlr r0 /* 80345E54 00342DB4 38 21 01 80 */ addi r1, r1, 0x180 -/* 80345E58 00342DB8 4E 80 00 20 */ blr +/* 80345E58 00342DB8 4E 80 00 20 */ blr .global SetCurrent__13CCubeMaterialCFRC11CModelFlagsRC12CCubeSurfaceRC10CCubeModel SetCurrent__13CCubeMaterialCFRC11CModelFlagsRC12CCubeSurfaceRC10CCubeModel: @@ -1116,7 +1116,7 @@ lbl_803465BC: /* 803465C0 00343520 80 01 00 84 */ lwz r0, 0x84(r1) /* 803465C4 00343524 7C 08 03 A6 */ mtlr r0 /* 803465C8 00343528 38 21 00 80 */ addi r1, r1, 0x80 -/* 803465CC 0034352C 4E 80 00 20 */ blr +/* 803465CC 0034352C 4E 80 00 20 */ blr .global DoPassthru__FUi DoPassthru__FUi: @@ -1182,7 +1182,7 @@ lbl_8034669C: /* 803466AC 0034360C 83 C1 00 08 */ lwz r30, 8(r1) /* 803466B0 00343610 7C 08 03 A6 */ mtlr r0 /* 803466B4 00343614 38 21 00 10 */ addi r1, r1, 0x10 -/* 803466B8 00343618 4E 80 00 20 */ blr +/* 803466B8 00343618 4E 80 00 20 */ blr .global HandleDepth__FUiUi HandleDepth__FUiUi: @@ -1245,7 +1245,7 @@ lbl_8034677C: /* 8034677C 003436DC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80346780 003436E0 7C 08 03 A6 */ mtlr r0 /* 80346784 003436E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80346788 003436E8 4E 80 00 20 */ blr +/* 80346788 003436E8 4E 80 00 20 */ blr .global HandleColorChannels__FUiUi HandleColorChannels__FUiUi: @@ -1456,7 +1456,7 @@ lbl_80346A74: /* 80346A80 003439E0 83 A1 00 34 */ lwz r29, 0x34(r1) /* 80346A84 003439E4 7C 08 03 A6 */ mtlr r0 /* 80346A88 003439E8 38 21 00 40 */ addi r1, r1, 0x40 -/* 80346A8C 003439EC 4E 80 00 20 */ blr +/* 80346A8C 003439EC 4E 80 00 20 */ blr .global SetCurrentBlack__13CCubeMaterialCFv SetCurrentBlack__13CCubeMaterialCFv: @@ -1628,7 +1628,7 @@ lbl_80346CEC: /* 80346CF4 00343C54 83 C1 00 08 */ lwz r30, 8(r1) /* 80346CF8 00343C58 7C 08 03 A6 */ mtlr r0 /* 80346CFC 00343C5C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80346D00 00343C60 4E 80 00 20 */ blr +/* 80346D00 00343C60 4E 80 00 20 */ blr .global EnsureTevsDirect__13CCubeMaterialFv EnsureTevsDirect__13CCubeMaterialFv: @@ -1667,7 +1667,7 @@ lbl_80346D78: /* 80346D78 00343CD8 80 01 00 14 */ lwz r0, 0x14(r1) /* 80346D7C 00343CDC 7C 08 03 A6 */ mtlr r0 /* 80346D80 00343CE0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80346D84 00343CE4 4E 80 00 20 */ blr +/* 80346D84 00343CE4 4E 80 00 20 */ blr .global HandleReflection__13CCubeMaterialFb11_GXTexMapIDiUiUiUiUiRUiRUi HandleReflection__13CCubeMaterialFb11_GXTexMapIDiUiUiUiUiRUiRUi: @@ -1939,7 +1939,7 @@ lbl_80347160: /* 80347168 003440C8 80 01 00 44 */ lwz r0, 0x44(r1) /* 8034716C 003440CC 7C 08 03 A6 */ mtlr r0 /* 80347170 003440D0 38 21 00 40 */ addi r1, r1, 0x40 -/* 80347174 003440D4 4E 80 00 20 */ blr +/* 80347174 003440D4 4E 80 00 20 */ blr .global SetTevIndWarp__3CGXF13_GXTevStageID16_GXIndTexStageIDUcUc14_GXIndTexMtxID SetTevIndWarp__3CGXF13_GXTevStageID16_GXIndTexStageIDUcUc14_GXIndTexMtxID: @@ -1989,7 +1989,7 @@ lbl_80347214: /* 80347214 00344174 80 01 00 14 */ lwz r0, 0x14(r1) /* 80347218 00344178 7C 08 03 A6 */ mtlr r0 /* 8034721C 0034417C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80347220 00344180 4E 80 00 20 */ blr +/* 80347220 00344180 4E 80 00 20 */ blr .global DoModelShadow__FUiUi DoModelShadow__FUiUi: @@ -2222,7 +2222,7 @@ lbl_80347578: /* 8034757C 003444DC 80 01 00 64 */ lwz r0, 0x64(r1) /* 80347580 003444E0 7C 08 03 A6 */ mtlr r0 /* 80347584 003444E4 38 21 00 60 */ addi r1, r1, 0x60 -/* 80347588 003444E8 4E 80 00 20 */ blr +/* 80347588 003444E8 4E 80 00 20 */ blr .global HandleTransparency__FUiUiRC11CModelFlagsRUiRUi HandleTransparency__FUiUiRC11CModelFlagsRUiRUi: @@ -2530,7 +2530,7 @@ lbl_803479D8: /* 803479DC 0034493C 80 01 00 34 */ lwz r0, 0x34(r1) /* 803479E0 00344940 7C 08 03 A6 */ mtlr r0 /* 803479E4 00344944 38 21 00 30 */ addi r1, r1, 0x30 -/* 803479E8 00344948 4E 80 00 20 */ blr +/* 803479E8 00344948 4E 80 00 20 */ blr .global HandleAnimatedUV__FPCUi9_GXTexMtx11_GXPTTexMtx HandleAnimatedUV__FPCUi9_GXTexMtx11_GXPTTexMtx: @@ -2561,7 +2561,7 @@ HandleAnimatedUV__FPCUi9_GXTexMtx11_GXPTTexMtx: /* 80347A4C 003449AC 38 63 F6 40 */ addi r3, r3, lbl_803EF640@l /* 80347A50 003449B0 7C 03 00 2E */ lwzx r0, r3, r0 /* 80347A54 003449B4 7C 09 03 A6 */ mtctr r0 -/* 80347A58 003449B8 4E 80 04 20 */ bctr +/* 80347A58 003449B8 4E 80 04 20 */ bctr .global lbl_80347A5C lbl_80347A5C: /* 80347A5C 003449BC 3C 80 80 5A */ lis r4, lbl_805A61D4@ha @@ -2948,7 +2948,7 @@ lbl_80347FE4: /* 80348010 00344F70 80 01 03 44 */ lwz r0, 0x344(r1) /* 80348014 00344F74 7C 08 03 A6 */ mtlr r0 /* 80348018 00344F78 38 21 03 40 */ addi r1, r1, 0x340 -/* 8034801C 00344F7C 4E 80 00 20 */ blr +/* 8034801C 00344F7C 4E 80 00 20 */ blr .global HandleTev__FiPCUiPCUib HandleTev__FiPCUiPCUib: @@ -3015,7 +3015,7 @@ lbl_803480F0: /* 803480FC 0034505C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80348100 00345060 7C 08 03 A6 */ mtlr r0 /* 80348104 00345064 38 21 00 20 */ addi r1, r1, 0x20 -/* 80348108 00345068 4E 80 00 20 */ blr +/* 80348108 00345068 4E 80 00 20 */ blr .global SetupBlendMode__13CCubeMaterialFUiRC11CModelFlagsb SetupBlendMode__13CCubeMaterialFUiRC11CModelFlagsb: @@ -3108,7 +3108,7 @@ lbl_8034823C: /* 8034824C 003451AC 83 81 00 10 */ lwz r28, 0x10(r1) /* 80348250 003451B0 7C 08 03 A6 */ mtlr r0 /* 80348254 003451B4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80348258 003451B8 4E 80 00 20 */ blr +/* 80348258 003451B8 4E 80 00 20 */ blr .global __sinit_CCubeMaterial_cpp __sinit_CCubeMaterial_cpp: diff --git a/asm/Kyoto/Graphics/CCubeModel.s b/asm/Kyoto/Graphics/CCubeModel.s index 0d1e9919..fca76025 100644 --- a/asm/Kyoto/Graphics/CCubeModel.s +++ b/asm/Kyoto/Graphics/CCubeModel.s @@ -147,7 +147,7 @@ lbl_803067C8: /* 803067E0 00303740 80 01 00 24 */ lwz r0, 0x24(r1) /* 803067E4 00303744 7C 08 03 A6 */ mtlr r0 /* 803067E8 00303748 38 21 00 20 */ addi r1, r1, 0x20 -/* 803067EC 0030374C 4E 80 00 20 */ blr +/* 803067EC 0030374C 4E 80 00 20 */ blr .global "RemapMaterialData__10CCubeModelFPCvPQ24rstl60vector<23TCachedToken<8CTexture>,Q24rstl17rmemory_allocator>" "RemapMaterialData__10CCubeModelFPCvPQ24rstl60vector<23TCachedToken<8CTexture>,Q24rstl17rmemory_allocator>": @@ -157,7 +157,7 @@ lbl_803067C8: /* 803067FC 0030375C 88 03 00 40 */ lbz r0, 0x40(r3) /* 80306800 00303760 50 80 3E 30 */ rlwimi r0, r4, 7, 0x18, 0x18 /* 80306804 00303764 98 03 00 40 */ stb r0, 0x40(r3) -/* 80306808 00303768 4E 80 00 20 */ blr +/* 80306808 00303768 4E 80 00 20 */ blr .global UnlockTextures__10CCubeModelCFv UnlockTextures__10CCubeModelCFv: @@ -195,17 +195,17 @@ lbl_80306848: /* 80306880 003037E0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80306884 003037E4 7C 08 03 A6 */ mtlr r0 /* 80306888 003037E8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8030688C 003037EC 4E 80 00 20 */ blr +/* 8030688C 003037EC 4E 80 00 20 */ blr .global SetModelWireframe__10CCubeModelFb SetModelWireframe__10CCubeModelFb: /* 80306890 003037F0 98 6D A7 81 */ stb r3, lbl_805A9341@sda21(r13) -/* 80306894 003037F4 4E 80 00 20 */ blr +/* 80306894 003037F4 4E 80 00 20 */ blr .global SetDrawingOccluders__10CCubeModelFb SetDrawingOccluders__10CCubeModelFb: /* 80306898 003037F8 98 6D A7 80 */ stb r3, lbl_805A9340@sda21(r13) -/* 8030689C 003037FC 4E 80 00 20 */ blr +/* 8030689C 003037FC 4E 80 00 20 */ blr .global DrawAlpha__10CCubeModelCFRC11CModelFlags DrawAlpha__10CCubeModelCFRC11CModelFlags: @@ -227,7 +227,7 @@ DrawAlpha__10CCubeModelCFRC11CModelFlags: /* 803068DC 0030383C 83 C1 00 08 */ lwz r30, 8(r1) /* 803068E0 00303840 7C 08 03 A6 */ mtlr r0 /* 803068E4 00303844 38 21 00 10 */ addi r1, r1, 0x10 -/* 803068E8 00303848 4E 80 00 20 */ blr +/* 803068E8 00303848 4E 80 00 20 */ blr .global DrawNormal__10CCubeModelCFRC11CModelFlags DrawNormal__10CCubeModelCFRC11CModelFlags: @@ -249,7 +249,7 @@ DrawNormal__10CCubeModelCFRC11CModelFlags: /* 80306928 00303888 83 C1 00 08 */ lwz r30, 8(r1) /* 8030692C 0030388C 7C 08 03 A6 */ mtlr r0 /* 80306930 00303890 38 21 00 10 */ addi r1, r1, 0x10 -/* 80306934 00303894 4E 80 00 20 */ blr +/* 80306934 00303894 4E 80 00 20 */ blr .global Draw__10CCubeModelCFPCfPCfRC11CModelFlags Draw__10CCubeModelCFPCfPCfRC11CModelFlags: @@ -279,7 +279,7 @@ Draw__10CCubeModelCFPCfPCfRC11CModelFlags: /* 80306994 003038F4 83 81 00 10 */ lwz r28, 0x10(r1) /* 80306998 003038F8 7C 08 03 A6 */ mtlr r0 /* 8030699C 003038FC 38 21 00 20 */ addi r1, r1, 0x20 -/* 803069A0 00303900 4E 80 00 20 */ blr +/* 803069A0 00303900 4E 80 00 20 */ blr .global Draw__10CCubeModelCFRC11CModelFlags Draw__10CCubeModelCFRC11CModelFlags: @@ -301,7 +301,7 @@ Draw__10CCubeModelCFRC11CModelFlags: /* 803069E0 00303940 83 C1 00 08 */ lwz r30, 8(r1) /* 803069E4 00303944 7C 08 03 A6 */ mtlr r0 /* 803069E8 00303948 38 21 00 10 */ addi r1, r1, 0x10 -/* 803069EC 0030394C 4E 80 00 20 */ blr +/* 803069EC 0030394C 4E 80 00 20 */ blr .global DrawFlat__10CCubeModelCFPCfPCf17ESurfaceSelection DrawFlat__10CCubeModelCFPCfPCf17ESurfaceSelection: @@ -394,7 +394,7 @@ lbl_80306B1C: /* 80306B20 00303A80 80 01 00 34 */ lwz r0, 0x34(r1) /* 80306B24 00303A84 7C 08 03 A6 */ mtlr r0 /* 80306B28 00303A88 38 21 00 30 */ addi r1, r1, 0x30 -/* 80306B2C 00303A8C 4E 80 00 20 */ blr +/* 80306B2C 00303A8C 4E 80 00 20 */ blr .global DrawAlphaSurfaces__10CCubeModelCFRC11CModelFlags DrawAlphaSurfaces__10CCubeModelCFRC11CModelFlags: @@ -448,7 +448,7 @@ lbl_80306BCC: /* 80306BD4 00303B34 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80306BD8 00303B38 7C 08 03 A6 */ mtlr r0 /* 80306BDC 00303B3C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80306BE0 00303B40 4E 80 00 20 */ blr +/* 80306BE0 00303B40 4E 80 00 20 */ blr .global DrawNormalSurfaces__10CCubeModelCFRC11CModelFlags DrawNormalSurfaces__10CCubeModelCFRC11CModelFlags: @@ -502,7 +502,7 @@ lbl_80306C80: /* 80306C88 00303BE8 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80306C8C 00303BEC 7C 08 03 A6 */ mtlr r0 /* 80306C90 00303BF0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80306C94 00303BF4 4E 80 00 20 */ blr +/* 80306C94 00303BF4 4E 80 00 20 */ blr .global DrawSurfaces__10CCubeModelCFRC11CModelFlags DrawSurfaces__10CCubeModelCFRC11CModelFlags: @@ -589,7 +589,7 @@ lbl_80306DA4: /* 80306DAC 00303D0C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80306DB0 00303D10 7C 08 03 A6 */ mtlr r0 /* 80306DB4 00303D14 38 21 00 20 */ addi r1, r1, 0x20 -/* 80306DB8 00303D18 4E 80 00 20 */ blr +/* 80306DB8 00303D18 4E 80 00 20 */ blr .global TryLockTextures__10CCubeModelCFv TryLockTextures__10CCubeModelCFv: @@ -671,7 +671,7 @@ lbl_80306EB0: /* 80306EC8 00303E28 80 01 00 24 */ lwz r0, 0x24(r1) /* 80306ECC 00303E2C 7C 08 03 A6 */ mtlr r0 /* 80306ED0 00303E30 38 21 00 20 */ addi r1, r1, 0x20 -/* 80306ED4 00303E34 4E 80 00 20 */ blr +/* 80306ED4 00303E34 4E 80 00 20 */ blr .global DrawSurfaceWireframe__10CCubeModelCFRC12CCubeSurface DrawSurfaceWireframe__10CCubeModelCFRC12CCubeSurface: @@ -1050,7 +1050,7 @@ lbl_80307430: /* 80307434 00304394 80 01 00 84 */ lwz r0, 0x84(r1) /* 80307438 00304398 7C 08 03 A6 */ mtlr r0 /* 8030743C 0030439C 38 21 00 80 */ addi r1, r1, 0x80 -/* 80307440 003043A0 4E 80 00 20 */ blr +/* 80307440 003043A0 4E 80 00 20 */ blr .global DrawSurface__10CCubeModelCFRC12CCubeSurfaceRC11CModelFlags DrawSurface__10CCubeModelCFRC12CCubeSurfaceRC11CModelFlags: @@ -1106,7 +1106,7 @@ lbl_803074F0: /* 803074FC 0030445C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80307500 00304460 7C 08 03 A6 */ mtlr r0 /* 80307504 00304464 38 21 00 20 */ addi r1, r1, 0x20 -/* 80307508 00304468 4E 80 00 20 */ blr +/* 80307508 00304468 4E 80 00 20 */ blr .global GetMaterialByIndex__10CCubeModelCFi GetMaterialByIndex__10CCubeModelCFi: @@ -1129,7 +1129,7 @@ lbl_80307544: /* 80307548 003044A8 7C E7 02 14 */ add r7, r7, r0 /* 8030754C 003044AC 7C E7 42 14 */ add r7, r7, r8 /* 80307550 003044B0 90 E3 00 00 */ stw r7, 0(r3) -/* 80307554 003044B4 4E 80 00 20 */ blr +/* 80307554 003044B4 4E 80 00 20 */ blr .global SetUsingPackedLightmaps__10CCubeModelCFb SetUsingPackedLightmaps__10CCubeModelCFb: @@ -1169,7 +1169,7 @@ lbl_803075D4: /* 803075D4 00304534 80 01 00 14 */ lwz r0, 0x14(r1) /* 803075D8 00304538 7C 08 03 A6 */ mtlr r0 /* 803075DC 0030453C 38 21 00 10 */ addi r1, r1, 0x10 -/* 803075E0 00304540 4E 80 00 20 */ blr +/* 803075E0 00304540 4E 80 00 20 */ blr .global SetSkinningArraysCurrent__10CCubeModelCFPCfPCf SetSkinningArraysCurrent__10CCubeModelCFPCfPCf: @@ -1187,7 +1187,7 @@ SetSkinningArraysCurrent__10CCubeModelCFPCfPCf: /* 80307610 00304570 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80307614 00304574 7C 08 03 A6 */ mtlr r0 /* 80307618 00304578 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030761C 0030457C 4E 80 00 20 */ blr +/* 8030761C 0030457C 4E 80 00 20 */ blr .global SetArraysCurrent__10CCubeModelCFv SetArraysCurrent__10CCubeModelCFv: @@ -1233,7 +1233,7 @@ lbl_803076A4: /* 803076B0 00304610 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803076B4 00304614 7C 08 03 A6 */ mtlr r0 /* 803076B8 00304618 38 21 00 10 */ addi r1, r1, 0x10 -/* 803076BC 0030461C 4E 80 00 20 */ blr +/* 803076BC 0030461C 4E 80 00 20 */ blr .global SetStaticArraysCurrent__10CCubeModelCFv SetStaticArraysCurrent__10CCubeModelCFv: @@ -1323,7 +1323,7 @@ lbl_803077E0: /* 803077F0 00304750 83 A1 00 14 */ lwz r29, 0x14(r1) /* 803077F4 00304754 7C 08 03 A6 */ mtlr r0 /* 803077F8 00304758 38 21 00 20 */ addi r1, r1, 0x20 -/* 803077FC 0030475C 4E 80 00 20 */ blr +/* 803077FC 0030475C 4E 80 00 20 */ blr .global "MakeTexturesFromMats__10CCubeModelFPCvRQ24rstl60vector<23TCachedToken<8CTexture>,Q24rstl17rmemory_allocator>R12IObjectStoreb" "MakeTexturesFromMats__10CCubeModelFPCvRQ24rstl60vector<23TCachedToken<8CTexture>,Q24rstl17rmemory_allocator>R12IObjectStoreb": @@ -1355,7 +1355,7 @@ lbl_80307848: /* 80307860 003047C0 81 9B 00 00 */ lwz r12, 0(r27) /* 80307864 003047C4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80307868 003047C8 7D 89 03 A6 */ mtctr r12 -/* 8030786C 003047CC 4E 80 04 21 */ bctrl +/* 8030786C 003047CC 4E 80 04 21 */ bctrl /* 80307870 003047D0 38 61 00 18 */ addi r3, r1, 0x18 /* 80307874 003047D4 38 81 00 08 */ addi r4, r1, 8 /* 80307878 003047D8 48 03 96 31 */ bl __ct__6CTokenFRC6CToken @@ -1417,7 +1417,7 @@ lbl_80307938: /* 80307944 003048A4 80 01 00 54 */ lwz r0, 0x54(r1) /* 80307948 003048A8 7C 08 03 A6 */ mtlr r0 /* 8030794C 003048AC 38 21 00 50 */ addi r1, r1, 0x50 -/* 80307950 003048B0 4E 80 00 20 */ blr +/* 80307950 003048B0 4E 80 00 20 */ blr .global "__ct__10CCubeModelFPQ24rstl37vectorPQ24rstl60vector<23TCachedToken<8CTexture>,Q24rstl17rmemory_allocator>PCvPCvPCvPCvPCvPCvRC6CAABoxUcb" "__ct__10CCubeModelFPQ24rstl37vectorPQ24rstl60vector<23TCachedToken<8CTexture>,Q24rstl17rmemory_allocator>PCvPCvPCvPCvPCvPCvRC6CAABoxUcb": @@ -1515,7 +1515,7 @@ lbl_80307A98: /* 80307AA8 00304A08 80 01 00 34 */ lwz r0, 0x34(r1) /* 80307AAC 00304A0C 7C 08 03 A6 */ mtlr r0 /* 80307AB0 00304A10 38 21 00 30 */ addi r1, r1, 0x30 -/* 80307AB4 00304A14 4E 80 00 20 */ blr +/* 80307AB4 00304A14 4E 80 00 20 */ blr .global "reserve__Q24rstl60vector<23TCachedToken<8CTexture>,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl60vector<23TCachedToken<8CTexture>,Q24rstl17rmemory_allocator>Fi": @@ -1593,4 +1593,4 @@ lbl_80307BA8: /* 80307BAC 00304B0C 80 01 00 34 */ lwz r0, 0x34(r1) /* 80307BB0 00304B10 7C 08 03 A6 */ mtlr r0 /* 80307BB4 00304B14 38 21 00 30 */ addi r1, r1, 0x30 -/* 80307BB8 00304B18 4E 80 00 20 */ blr +/* 80307BB8 00304B18 4E 80 00 20 */ blr diff --git a/asm/Kyoto/Graphics/CCubeMoviePlayer.s b/asm/Kyoto/Graphics/CCubeMoviePlayer.s index bdef0522..9ad9358a 100644 --- a/asm/Kyoto/Graphics/CCubeMoviePlayer.s +++ b/asm/Kyoto/Graphics/CCubeMoviePlayer.s @@ -60,27 +60,27 @@ lbl_8035B5FC: /* 8035B5FC 0035855C 88 03 00 00 */ lbz r0, 0(r3) /* 8035B600 00358560 98 0D 9E 29 */ stb r0, lbl_805A89E9@sda21(r13) /* 8035B604 00358564 38 21 00 10 */ addi r1, r1, 0x10 -/* 8035B608 00358568 4E 80 00 20 */ blr +/* 8035B608 00358568 4E 80 00 20 */ blr .global sub_8035b60c sub_8035b60c: /* 8035B60C 0035856C 88 6D 9E 28 */ lbz r3, lbl_805A89E8@sda21(r13) -/* 8035B610 00358570 4E 80 00 20 */ blr +/* 8035B610 00358570 4E 80 00 20 */ blr .global sub_8035b614 sub_8035b614: /* 8035B614 00358574 98 6D 9E 28 */ stb r3, lbl_805A89E8@sda21(r13) -/* 8035B618 00358578 4E 80 00 20 */ blr +/* 8035B618 00358578 4E 80 00 20 */ blr .global sub_8035b61c sub_8035b61c: /* 8035B61C 0035857C 80 63 00 70 */ lwz r3, 0x70(r3) -/* 8035B620 00358580 4E 80 00 20 */ blr +/* 8035B620 00358580 4E 80 00 20 */ blr .global sub_8035b624 sub_8035b624: /* 8035B624 00358584 80 63 00 6C */ lwz r3, 0x6c(r3) -/* 8035B628 00358588 4E 80 00 20 */ blr +/* 8035B628 00358588 4E 80 00 20 */ blr .global VerifyCallbackStatus__12CMoviePlayerFv VerifyCallbackStatus__12CMoviePlayerFv: @@ -102,7 +102,7 @@ lbl_8035B660: /* 8035B660 003585C0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8035B664 003585C4 7C 08 03 A6 */ mtlr r0 /* 8035B668 003585C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8035B66C 003585CC 4E 80 00 20 */ blr +/* 8035B66C 003585CC 4E 80 00 20 */ blr .global MixAudio__12CMoviePlayerFPsPCsUl MixAudio__12CMoviePlayerFPsPCsUl: @@ -258,7 +258,7 @@ lbl_8035B870: /* 8035B874 003587D4 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8035B878 003587D8 7C 08 03 A6 */ mtlr r0 /* 8035B87C 003587DC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8035B880 003587E0 4E 80 00 20 */ blr +/* 8035B880 003587E0 4E 80 00 20 */ blr .global StaticMyAudioCallback__12CMoviePlayerFv StaticMyAudioCallback__12CMoviePlayerFv: @@ -311,7 +311,7 @@ lbl_8035B92C: /* 8035B934 00358894 83 C1 00 08 */ lwz r30, 8(r1) /* 8035B938 00358898 7C 08 03 A6 */ mtlr r0 /* 8035B93C 0035889C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8035B940 003588A0 4E 80 00 20 */ blr +/* 8035B940 003588A0 4E 80 00 20 */ blr .global Rewind__12CMoviePlayerFv Rewind__12CMoviePlayerFv: @@ -326,7 +326,7 @@ Rewind__12CMoviePlayerFv: /* 8035B964 003588C4 81 83 00 00 */ lwz r12, 0(r3) /* 8035B968 003588C8 81 8C 00 14 */ lwz r12, 0x14(r12) /* 8035B96C 003588CC 7D 89 03 A6 */ mtctr r12 -/* 8035B970 003588D0 4E 80 04 21 */ bctrl +/* 8035B970 003588D0 4E 80 04 21 */ bctrl /* 8035B974 003588D4 80 7F 00 98 */ lwz r3, 0x98(r31) /* 8035B978 003588D8 28 03 00 00 */ cmplwi r3, 0 /* 8035B97C 003588DC 41 82 00 18 */ beq lbl_8035B994 @@ -334,7 +334,7 @@ Rewind__12CMoviePlayerFv: /* 8035B984 003588E4 38 80 00 01 */ li r4, 1 /* 8035B988 003588E8 81 8C 00 08 */ lwz r12, 8(r12) /* 8035B98C 003588EC 7D 89 03 A6 */ mtctr r12 -/* 8035B990 003588F0 4E 80 04 21 */ bctrl +/* 8035B990 003588F0 4E 80 04 21 */ bctrl lbl_8035B994: /* 8035B994 003588F4 38 00 00 00 */ li r0, 0 /* 8035B998 003588F8 90 1F 00 98 */ stw r0, 0x98(r31) @@ -391,7 +391,7 @@ lbl_8035B9F8: /* 8035BA54 003589B4 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8035BA58 003589B8 7C 08 03 A6 */ mtlr r0 /* 8035BA5C 003589BC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8035BA60 003589C0 4E 80 00 20 */ blr +/* 8035BA60 003589C0 4E 80 00 20 */ blr .global "clear__Q24rstl67vectorFv" "clear__Q24rstl67vectorFv": @@ -418,7 +418,7 @@ lbl_8035B9F8: /* 8035BAB4 00358A14 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8035BAB8 00358A18 7C 08 03 A6 */ mtlr r0 /* 8035BABC 00358A1C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8035BAC0 00358A20 4E 80 00 20 */ blr +/* 8035BAC0 00358A20 4E 80 00 20 */ blr .global "destroy,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl154pointer_iterator,Q24rstl17rmemory_allocator>Q24rstl154pointer_iterator,Q24rstl17rmemory_allocator>" "destroy,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl154pointer_iterator,Q24rstl17rmemory_allocator>Q24rstl154pointer_iterator,Q24rstl17rmemory_allocator>": @@ -475,7 +475,7 @@ lbl_8035BB60: /* 8035BB74 00358AD4 83 C1 00 08 */ lwz r30, 8(r1) /* 8035BB78 00358AD8 7C 08 03 A6 */ mtlr r0 /* 8035BB7C 00358ADC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8035BB80 00358AE0 4E 80 00 20 */ blr +/* 8035BB80 00358AE0 4E 80 00 20 */ blr .global GetIsMovieFinishedPlaying__12CMoviePlayerCFv GetIsMovieFinishedPlaying__12CMoviePlayerCFv: @@ -490,7 +490,7 @@ GetIsMovieFinishedPlaying__12CMoviePlayerCFv: /* 8035BBA4 00358B04 38 A0 00 01 */ li r5, 1 lbl_8035BBA8: /* 8035BBA8 00358B08 7C A3 2B 78 */ mr r3, r5 -/* 8035BBAC 00358B0C 4E 80 00 20 */ blr +/* 8035BBAC 00358B0C 4E 80 00 20 */ blr .global GetIsFullyCached__12CMoviePlayerCFv GetIsFullyCached__12CMoviePlayerCFv: @@ -500,24 +500,24 @@ GetIsFullyCached__12CMoviePlayerCFv: /* 8035BBBC 00358B1C 54 03 0F FE */ srwi r3, r0, 0x1f /* 8035BBC0 00358B20 7C 00 28 10 */ subfc r0, r0, r5 /* 8035BBC4 00358B24 7C 64 19 14 */ adde r3, r4, r3 -/* 8035BBC8 00358B28 4E 80 00 20 */ blr +/* 8035BBC8 00358B28 4E 80 00 20 */ blr .global GetPlayedSeconds__12CMoviePlayerCFv GetPlayedSeconds__12CMoviePlayerCFv: /* 8035BBCC 00358B2C C0 23 00 E8 */ lfs f1, 0xe8(r3) /* 8035BBD0 00358B30 C0 03 00 DC */ lfs f0, 0xdc(r3) /* 8035BBD4 00358B34 EC 21 00 2A */ fadds f1, f1, f0 -/* 8035BBD8 00358B38 4E 80 00 20 */ blr +/* 8035BBD8 00358B38 4E 80 00 20 */ blr .global GetTotalSeconds__12CMoviePlayerCFv GetTotalSeconds__12CMoviePlayerCFv: /* 8035BBDC 00358B3C C0 23 00 E4 */ lfs f1, 0xe4(r3) -/* 8035BBE0 00358B40 4E 80 00 20 */ blr +/* 8035BBE0 00358B40 4E 80 00 20 */ blr .global SetPlayMode__12CMoviePlayerFQ212CMoviePlayer9EPlayMode SetPlayMode__12CMoviePlayerFQ212CMoviePlayer9EPlayMode: /* 8035BBE4 00358B44 90 83 00 E0 */ stw r4, 0xe0(r3) -/* 8035BBE8 00358B48 4E 80 00 20 */ blr +/* 8035BBE8 00358B48 4E 80 00 20 */ blr .global DrawFrame__12CMoviePlayerFRC9CVector3fRC9CVector3fRC9CVector3fRC9CVector3f DrawFrame__12CMoviePlayerFRC9CVector3fRC9CVector3fRC9CVector3fRC9CVector3f: @@ -615,7 +615,7 @@ lbl_8035BD4C: /* 8035BD50 00358CB0 80 01 00 34 */ lwz r0, 0x34(r1) /* 8035BD54 00358CB4 7C 08 03 A6 */ mtlr r0 /* 8035BD58 00358CB8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8035BD5C 00358CBC 4E 80 00 20 */ blr +/* 8035BD5C 00358CBC 4E 80 00 20 */ blr .global Update__12CMoviePlayerFf Update__12CMoviePlayerFf: @@ -642,7 +642,7 @@ Update__12CMoviePlayerFf: /* 8035BDB0 00358D10 81 83 00 00 */ lwz r12, 0(r3) /* 8035BDB4 00358D14 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8035BDB8 00358D18 7D 89 03 A6 */ mtctr r12 -/* 8035BDBC 00358D1C 4E 80 04 21 */ bctrl +/* 8035BDBC 00358D1C 4E 80 04 21 */ bctrl /* 8035BDC0 00358D20 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8035BDC4 00358D24 41 82 00 F0 */ beq lbl_8035BEB4 /* 8035BDC8 00358D28 7F E3 FB 78 */ mr r3, r31 @@ -676,7 +676,7 @@ lbl_8035BE30: /* 8035BE30 00358D90 81 83 00 00 */ lwz r12, 0(r3) /* 8035BE34 00358D94 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8035BE38 00358D98 7D 89 03 A6 */ mtctr r12 -/* 8035BE3C 00358D9C 4E 80 04 21 */ bctrl +/* 8035BE3C 00358D9C 4E 80 04 21 */ bctrl /* 8035BE40 00358DA0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8035BE44 00358DA4 41 82 00 70 */ beq lbl_8035BEB4 /* 8035BE48 00358DA8 80 1F 00 D8 */ lwz r0, 0xd8(r31) @@ -865,7 +865,7 @@ lbl_8035C0C8: /* 8035C0E8 00359048 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8035C0EC 0035904C 7C 08 03 A6 */ mtlr r0 /* 8035C0F0 00359050 38 21 00 50 */ addi r1, r1, 0x50 -/* 8035C0F4 00359054 4E 80 00 20 */ blr +/* 8035C0F4 00359054 4E 80 00 20 */ blr .global DecodeFromRead__12CMoviePlayerFPCv DecodeFromRead__12CMoviePlayerFPCv: @@ -945,7 +945,7 @@ lbl_8035C200: /* 8035C204 00359164 80 01 10 54 */ lwz r0, 0x1054(r1) /* 8035C208 00359168 7C 08 03 A6 */ mtlr r0 /* 8035C20C 0035916C 38 21 10 50 */ addi r1, r1, 0x1050 -/* 8035C210 00359170 4E 80 00 20 */ blr +/* 8035C210 00359170 4E 80 00 20 */ blr .global ReadCompleted__12CMoviePlayerFv ReadCompleted__12CMoviePlayerFv: @@ -961,7 +961,7 @@ ReadCompleted__12CMoviePlayerFv: /* 8035C238 00359198 38 80 00 01 */ li r4, 1 /* 8035C23C 0035919C 81 8C 00 08 */ lwz r12, 8(r12) /* 8035C240 003591A0 7D 89 03 A6 */ mtctr r12 -/* 8035C244 003591A4 4E 80 04 21 */ bctrl +/* 8035C244 003591A4 4E 80 04 21 */ bctrl lbl_8035C248: /* 8035C248 003591A8 38 00 00 00 */ li r0, 0 /* 8035C24C 003591AC 90 1F 00 98 */ stw r0, 0x98(r31) @@ -1049,7 +1049,7 @@ lbl_8035C374: /* 8035C378 003592D8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8035C37C 003592DC 7C 08 03 A6 */ mtlr r0 /* 8035C380 003592E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8035C384 003592E4 4E 80 00 20 */ blr +/* 8035C384 003592E4 4E 80 00 20 */ blr .global PostDVDReadRequestIfNeeded__12CMoviePlayerFv PostDVDReadRequestIfNeeded__12CMoviePlayerFv: @@ -1119,7 +1119,7 @@ lbl_8035C448: /* 8035C478 003593D8 81 83 00 00 */ lwz r12, 0(r3) /* 8035C47C 003593DC 81 8C 00 08 */ lwz r12, 8(r12) /* 8035C480 003593E0 7D 89 03 A6 */ mtctr r12 -/* 8035C484 003593E4 4E 80 04 21 */ bctrl +/* 8035C484 003593E4 4E 80 04 21 */ bctrl lbl_8035C488: /* 8035C488 003593E8 93 DF 00 98 */ stw r30, 0x98(r31) lbl_8035C48C: @@ -1128,7 +1128,7 @@ lbl_8035C48C: /* 8035C494 003593F4 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8035C498 003593F8 7C 08 03 A6 */ mtlr r0 /* 8035C49C 003593FC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8035C4A0 00359400 4E 80 00 20 */ blr +/* 8035C4A0 00359400 4E 80 00 20 */ blr .global InitializeTextures__12CMoviePlayerFv InitializeTextures__12CMoviePlayerFv: @@ -1337,7 +1337,7 @@ lbl_8035C780: /* 8035C7A8 00359708 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 8035C7AC 0035970C 7C 08 03 A6 */ mtlr r0 /* 8035C7B0 00359710 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8035C7B4 00359714 4E 80 00 20 */ blr +/* 8035C7B4 00359714 4E 80 00 20 */ blr .global __dt__12CMoviePlayerFv __dt__12CMoviePlayerFv: @@ -1379,7 +1379,7 @@ lbl_8035C824: /* 8035C83C 0035979C 38 80 00 01 */ li r4, 1 /* 8035C840 003597A0 81 8C 00 08 */ lwz r12, 8(r12) /* 8035C844 003597A4 7D 89 03 A6 */ mtctr r12 -/* 8035C848 003597A8 4E 80 04 21 */ bctrl +/* 8035C848 003597A8 4E 80 04 21 */ bctrl lbl_8035C84C: /* 8035C84C 003597AC 34 1E 00 04 */ addic. r0, r30, 4 /* 8035C850 003597B0 41 82 00 24 */ beq lbl_8035C874 @@ -1390,7 +1390,7 @@ lbl_8035C84C: /* 8035C864 003597C4 38 80 00 01 */ li r4, 1 /* 8035C868 003597C8 81 8C 00 08 */ lwz r12, 8(r12) /* 8035C86C 003597CC 7D 89 03 A6 */ mtctr r12 -/* 8035C870 003597D0 4E 80 04 21 */ bctrl +/* 8035C870 003597D0 4E 80 04 21 */ bctrl lbl_8035C874: /* 8035C874 003597D4 28 1E 00 00 */ cmplwi r30, 0 /* 8035C878 003597D8 41 82 00 24 */ beq lbl_8035C89C @@ -1401,7 +1401,7 @@ lbl_8035C874: /* 8035C88C 003597EC 38 80 00 01 */ li r4, 1 /* 8035C890 003597F0 81 8C 00 08 */ lwz r12, 8(r12) /* 8035C894 003597F4 7D 89 03 A6 */ mtctr r12 -/* 8035C898 003597F8 4E 80 04 21 */ bctrl +/* 8035C898 003597F8 4E 80 04 21 */ bctrl lbl_8035C89C: /* 8035C89C 003597FC 7F C3 F3 78 */ mr r3, r30 /* 8035C8A0 00359800 4B FB 90 91 */ bl Free__7CMemoryFPCv @@ -1418,7 +1418,7 @@ lbl_8035C8A4: /* 8035C8C8 00359828 38 80 00 01 */ li r4, 1 /* 8035C8CC 0035982C 81 8C 00 08 */ lwz r12, 8(r12) /* 8035C8D0 00359830 7D 89 03 A6 */ mtctr r12 -/* 8035C8D4 00359834 4E 80 04 21 */ bctrl +/* 8035C8D4 00359834 4E 80 04 21 */ bctrl lbl_8035C8D8: /* 8035C8D8 00359838 34 1F 00 90 */ addic. r0, r31, 0x90 /* 8035C8DC 0035983C 41 82 00 18 */ beq lbl_8035C8F4 @@ -1446,7 +1446,7 @@ lbl_8035C91C: /* 8035C92C 0035988C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8035C930 00359890 7C 08 03 A6 */ mtlr r0 /* 8035C934 00359894 38 21 00 20 */ addi r1, r1, 0x20 -/* 8035C938 00359898 4E 80 00 20 */ blr +/* 8035C938 00359898 4E 80 00 20 */ blr .global "__dt__Q24rstl67vectorFv" "__dt__Q24rstl67vectorFv": @@ -1486,7 +1486,7 @@ lbl_8035C9AC: /* 8035C9B8 00359918 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8035C9BC 0035991C 7C 08 03 A6 */ mtlr r0 /* 8035C9C0 00359920 38 21 00 20 */ addi r1, r1, 0x20 -/* 8035C9C4 00359924 4E 80 00 20 */ blr +/* 8035C9C4 00359924 4E 80 00 20 */ blr .global "__dt__Q24rstl56vector,Q24rstl17rmemory_allocator>Fv" "__dt__Q24rstl56vector,Q24rstl17rmemory_allocator>Fv": @@ -1540,7 +1540,7 @@ lbl_8035CA5C: /* 8035CA70 003599D0 83 81 00 20 */ lwz r28, 0x20(r1) /* 8035CA74 003599D4 7C 08 03 A6 */ mtlr r0 /* 8035CA78 003599D8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8035CA7C 003599DC 4E 80 00 20 */ blr +/* 8035CA7C 003599DC 4E 80 00 20 */ blr .global PumpIndexLoad__12CMoviePlayerFv PumpIndexLoad__12CMoviePlayerFv: @@ -1572,7 +1572,7 @@ lbl_8035CAD4: /* 8035CAD8 00359A38 81 83 00 00 */ lwz r12, 0(r3) /* 8035CADC 00359A3C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8035CAE0 00359A40 7D 89 03 A6 */ mtctr r12 -/* 8035CAE4 00359A44 4E 80 04 21 */ bctrl +/* 8035CAE4 00359A44 4E 80 04 21 */ bctrl /* 8035CAE8 00359A48 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8035CAEC 00359A4C 41 82 00 6C */ beq lbl_8035CB58 /* 8035CAF0 00359A50 7F E4 FB 78 */ mr r4, r31 @@ -1594,7 +1594,7 @@ lbl_8035CAD4: /* 8035CB30 00359A90 38 80 00 01 */ li r4, 1 /* 8035CB34 00359A94 81 8C 00 08 */ lwz r12, 8(r12) /* 8035CB38 00359A98 7D 89 03 A6 */ mtctr r12 -/* 8035CB3C 00359A9C 4E 80 04 21 */ bctrl +/* 8035CB3C 00359A9C 4E 80 04 21 */ bctrl lbl_8035CB40: /* 8035CB40 00359AA0 93 9D 00 00 */ stw r28, 0(r29) /* 8035CB44 00359AA4 80 9E 00 AC */ lwz r4, 0xac(r30) @@ -1611,7 +1611,7 @@ lbl_8035CB60: /* 8035CB68 00359AC8 81 83 00 00 */ lwz r12, 0(r3) /* 8035CB6C 00359ACC 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8035CB70 00359AD0 7D 89 03 A6 */ mtctr r12 -/* 8035CB74 00359AD4 4E 80 04 21 */ bctrl +/* 8035CB74 00359AD4 4E 80 04 21 */ bctrl /* 8035CB78 00359AD8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8035CB7C 00359ADC 41 82 01 3C */ beq lbl_8035CCB8 /* 8035CB80 00359AE0 7F E4 FB 78 */ mr r4, r31 @@ -1626,7 +1626,7 @@ lbl_8035CB60: /* 8035CBA4 00359B04 38 80 00 01 */ li r4, 1 /* 8035CBA8 00359B08 81 8C 00 08 */ lwz r12, 8(r12) /* 8035CBAC 00359B0C 7D 89 03 A6 */ mtctr r12 -/* 8035CBB0 00359B10 4E 80 04 21 */ bctrl +/* 8035CBB0 00359B10 4E 80 04 21 */ bctrl lbl_8035CBB4: /* 8035CBB4 00359B14 38 00 00 00 */ li r0, 0 /* 8035CBB8 00359B18 3B 7F 00 20 */ addi r27, r31, 0x20 @@ -1660,7 +1660,7 @@ lbl_8035CBF0: /* 8035CC20 00359B80 38 80 00 01 */ li r4, 1 /* 8035CC24 00359B84 81 8C 00 08 */ lwz r12, 8(r12) /* 8035CC28 00359B88 7D 89 03 A6 */ mtctr r12 -/* 8035CC2C 00359B8C 4E 80 04 21 */ bctrl +/* 8035CC2C 00359B8C 4E 80 04 21 */ bctrl lbl_8035CC30: /* 8035CC30 00359B90 93 BC 00 04 */ stw r29, 4(r28) /* 8035CC34 00359B94 3B 5A 00 08 */ addi r26, r26, 8 @@ -1681,7 +1681,7 @@ lbl_8035CC3C: /* 8035CC6C 00359BCC 38 80 00 01 */ li r4, 1 /* 8035CC70 00359BD0 81 8C 00 08 */ lwz r12, 8(r12) /* 8035CC74 00359BD4 7D 89 03 A6 */ mtctr r12 -/* 8035CC78 00359BD8 4E 80 04 21 */ bctrl +/* 8035CC78 00359BD8 4E 80 04 21 */ bctrl lbl_8035CC7C: /* 8035CC7C 00359BDC 93 BC 00 08 */ stw r29, 8(r28) /* 8035CC80 00359BE0 38 60 00 01 */ li r3, 1 @@ -1718,7 +1718,7 @@ lbl_8035CCC0: /* 8035CCEC 00359C4C 81 83 00 00 */ lwz r12, 0(r3) /* 8035CCF0 00359C50 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8035CCF4 00359C54 7D 89 03 A6 */ mtctr r12 -/* 8035CCF8 00359C58 4E 80 04 21 */ bctrl +/* 8035CCF8 00359C58 4E 80 04 21 */ bctrl /* 8035CCFC 00359C5C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8035CD00 00359C60 40 82 00 08 */ bne lbl_8035CD08 /* 8035CD04 00359C64 3B 20 00 00 */ li r25, 0 @@ -1730,7 +1730,7 @@ lbl_8035CD08: /* 8035CD18 00359C78 81 83 00 00 */ lwz r12, 0(r3) /* 8035CD1C 00359C7C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8035CD20 00359C80 7D 89 03 A6 */ mtctr r12 -/* 8035CD24 00359C84 4E 80 04 21 */ bctrl +/* 8035CD24 00359C84 4E 80 04 21 */ bctrl /* 8035CD28 00359C88 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8035CD2C 00359C8C 40 82 00 08 */ bne lbl_8035CD34 /* 8035CD30 00359C90 3B 20 00 00 */ li r25, 0 @@ -1771,7 +1771,7 @@ lbl_8035CD90: /* 8035CDA8 00359D08 38 80 00 01 */ li r4, 1 /* 8035CDAC 00359D0C 81 8C 00 08 */ lwz r12, 8(r12) /* 8035CDB0 00359D10 7D 89 03 A6 */ mtctr r12 -/* 8035CDB4 00359D14 4E 80 04 21 */ bctrl +/* 8035CDB4 00359D14 4E 80 04 21 */ bctrl lbl_8035CDB8: /* 8035CDB8 00359D18 34 1C 00 04 */ addic. r0, r28, 4 /* 8035CDBC 00359D1C 41 82 00 24 */ beq lbl_8035CDE0 @@ -1782,7 +1782,7 @@ lbl_8035CDB8: /* 8035CDD0 00359D30 38 80 00 01 */ li r4, 1 /* 8035CDD4 00359D34 81 8C 00 08 */ lwz r12, 8(r12) /* 8035CDD8 00359D38 7D 89 03 A6 */ mtctr r12 -/* 8035CDDC 00359D3C 4E 80 04 21 */ bctrl +/* 8035CDDC 00359D3C 4E 80 04 21 */ bctrl lbl_8035CDE0: /* 8035CDE0 00359D40 28 1C 00 00 */ cmplwi r28, 0 /* 8035CDE4 00359D44 41 82 00 24 */ beq lbl_8035CE08 @@ -1793,7 +1793,7 @@ lbl_8035CDE0: /* 8035CDF8 00359D58 38 80 00 01 */ li r4, 1 /* 8035CDFC 00359D5C 81 8C 00 08 */ lwz r12, 8(r12) /* 8035CE00 00359D60 7D 89 03 A6 */ mtctr r12 -/* 8035CE04 00359D64 4E 80 04 21 */ bctrl +/* 8035CE04 00359D64 4E 80 04 21 */ bctrl lbl_8035CE08: /* 8035CE08 00359D68 7F 83 E3 78 */ mr r3, r28 /* 8035CE0C 00359D6C 4B FB 8B 25 */ bl Free__7CMemoryFPCv @@ -1871,7 +1871,7 @@ lbl_8035CF08: /* 8035CF0C 00359E6C 80 01 00 44 */ lwz r0, 0x44(r1) /* 8035CF10 00359E70 7C 08 03 A6 */ mtlr r0 /* 8035CF14 00359E74 38 21 00 40 */ addi r1, r1, 0x40 -/* 8035CF18 00359E78 4E 80 00 20 */ blr +/* 8035CF18 00359E78 4E 80 00 20 */ blr .global __ct__12CMoviePlayerFPCcfb __ct__12CMoviePlayerFPCcfb: @@ -1994,7 +1994,7 @@ lbl_8035D0A4: /* 8035D0E0 0035A040 38 80 00 01 */ li r4, 1 /* 8035D0E4 0035A044 81 8C 00 08 */ lwz r12, 8(r12) /* 8035D0E8 0035A048 7D 89 03 A6 */ mtctr r12 -/* 8035D0EC 0035A04C 4E 80 04 21 */ bctrl +/* 8035D0EC 0035A04C 4E 80 04 21 */ bctrl lbl_8035D0F0: /* 8035D0F0 0035A050 93 DC 00 00 */ stw r30, 0(r28) /* 8035D0F4 0035A054 7F A3 EB 78 */ mr r3, r29 @@ -2007,7 +2007,7 @@ lbl_8035D0F0: /* 8035D110 0035A070 83 81 00 10 */ lwz r28, 0x10(r1) /* 8035D114 0035A074 7C 08 03 A6 */ mtlr r0 /* 8035D118 0035A078 38 21 00 30 */ addi r1, r1, 0x30 -/* 8035D11C 0035A07C 4E 80 00 20 */ blr +/* 8035D11C 0035A07C 4E 80 00 20 */ blr .global MyTHPYuv2RgbTextureSetup__FPvPvPvUsUs MyTHPYuv2RgbTextureSetup__FPvPvPvUsUs: @@ -2103,7 +2103,7 @@ MyTHPYuv2RgbTextureSetup__FPvPvPvUsUs: /* 8035D284 0035A1E4 83 81 00 70 */ lwz r28, 0x70(r1) /* 8035D288 0035A1E8 7C 08 03 A6 */ mtlr r0 /* 8035D28C 0035A1EC 38 21 00 80 */ addi r1, r1, 0x80 -/* 8035D290 0035A1F0 4E 80 00 20 */ blr +/* 8035D290 0035A1F0 4E 80 00 20 */ blr .global MyTHPGXYuv2RgbSetup__Fb MyTHPGXYuv2RgbSetup__Fb: @@ -2437,7 +2437,7 @@ lbl_8035D4C4: /* 8035D7A0 0035A700 83 A1 00 84 */ lwz r29, 0x84(r1) /* 8035D7A4 0035A704 7C 08 03 A6 */ mtlr r0 /* 8035D7A8 0035A708 38 21 00 90 */ addi r1, r1, 0x90 -/* 8035D7AC 0035A70C 4E 80 00 20 */ blr +/* 8035D7AC 0035A70C 4E 80 00 20 */ blr .global MyTHPGXRestore__Fv MyTHPGXRestore__Fv: @@ -2473,7 +2473,7 @@ MyTHPGXRestore__Fv: /* 8035D824 0035A784 80 01 00 14 */ lwz r0, 0x14(r1) /* 8035D828 0035A788 7C 08 03 A6 */ mtlr r0 /* 8035D82C 0035A78C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8035D830 0035A790 4E 80 00 20 */ blr +/* 8035D830 0035A790 4E 80 00 20 */ blr .global "reserve__Q24rstl67vectorFi" "reserve__Q24rstl67vectorFi": @@ -2567,7 +2567,7 @@ lbl_8035D964: /* 8035D968 0035A8C8 80 01 00 34 */ lwz r0, 0x34(r1) /* 8035D96C 0035A8CC 7C 08 03 A6 */ mtlr r0 /* 8035D970 0035A8D0 38 21 00 30 */ addi r1, r1, 0x30 -/* 8035D974 0035A8D4 4E 80 00 20 */ blr +/* 8035D974 0035A8D4 4E 80 00 20 */ blr .global "construct__4rstlFPvRCQ212CMoviePlayer14CTHPTextureSet" "construct__4rstlFPvRCQ212CMoviePlayer14CTHPTextureSet": @@ -2609,7 +2609,7 @@ lbl_8035D9F4: /* 8035D9F8 0035A958 7C 06 00 40 */ cmplw r6, r0 /* 8035D9FC 0035A95C 40 82 FF 84 */ bne lbl_8035D980 /* 8035DA00 0035A960 7C A3 2B 78 */ mr r3, r5 -/* 8035DA04 0035A964 4E 80 00 20 */ blr +/* 8035DA04 0035A964 4E 80 00 20 */ blr .global "reserve__Q24rstl56vector,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl56vector,Q24rstl17rmemory_allocator>Fi": @@ -2688,4 +2688,4 @@ lbl_8035DAFC: /* 8035DB00 0035AA60 80 01 00 34 */ lwz r0, 0x34(r1) /* 8035DB04 0035AA64 7C 08 03 A6 */ mtlr r0 /* 8035DB08 0035AA68 38 21 00 30 */ addi r1, r1, 0x30 -/* 8035DB0C 0035AA6C 4E 80 00 20 */ blr +/* 8035DB0C 0035AA6C 4E 80 00 20 */ blr diff --git a/asm/Kyoto/Graphics/CCubeSurface.s b/asm/Kyoto/Graphics/CCubeSurface.s index 08dd5e35..4bfc76aa 100644 --- a/asm/Kyoto/Graphics/CCubeSurface.s +++ b/asm/Kyoto/Graphics/CCubeSurface.s @@ -31,7 +31,7 @@ lbl_80348308: /* 80348308 00345268 80 01 00 14 */ lwz r0, 0x14(r1) /* 8034830C 0034526C 7C 08 03 A6 */ mtlr r0 /* 80348310 00345270 38 21 00 10 */ addi r1, r1, 0x10 -/* 80348314 00345274 4E 80 00 20 */ blr +/* 80348314 00345274 4E 80 00 20 */ blr .global __sinit_CCubeSurface_cpp __sinit_CCubeSurface_cpp: @@ -41,4 +41,4 @@ __sinit_CCubeSurface_cpp: /* 80348324 00345284 D4 23 67 C0 */ stfsu f1, lbl_805A67C0@l(r3) /* 80348328 00345288 D0 03 00 04 */ stfs f0, 4(r3) /* 8034832C 0034528C D0 03 00 08 */ stfs f0, 8(r3) -/* 80348330 00345290 4E 80 00 20 */ blr +/* 80348330 00345290 4E 80 00 20 */ blr diff --git a/asm/Kyoto/Graphics/CGX.s b/asm/Kyoto/Graphics/CGX.s index 36b98ac7..68af603b 100644 --- a/asm/Kyoto/Graphics/CGX.s +++ b/asm/Kyoto/Graphics/CGX.s @@ -52,12 +52,12 @@ lbl_80307C1C: /* 80307C30 00304B90 D0 07 00 00 */ stfs f0, 0(r7) lbl_80307C34: /* 80307C34 00304B94 28 08 00 00 */ cmplwi r8, 0 -/* 80307C38 00304B98 4D 82 00 20 */ beqlr +/* 80307C38 00304B98 4D 82 00 20 */ beqlr /* 80307C3C 00304B9C 3C 60 80 5A */ lis r3, lbl_805A53EC@ha /* 80307C40 00304BA0 38 63 53 EC */ addi r3, r3, lbl_805A53EC@l /* 80307C44 00304BA4 80 03 02 5C */ lwz r0, 0x25c(r3) /* 80307C48 00304BA8 90 08 00 00 */ stw r0, 0(r8) -/* 80307C4C 00304BAC 4E 80 00 20 */ blr +/* 80307C4C 00304BAC 4E 80 00 20 */ blr .global SetStandardTevColorAlphaOp__3CGXF13_GXTevStageID SetStandardTevColorAlphaOp__3CGXF13_GXTevStageID: @@ -100,7 +100,7 @@ lbl_80307CD4: /* 80307CD8 00304C38 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80307CDC 00304C3C 7C 08 03 A6 */ mtlr r0 /* 80307CE0 00304C40 38 21 00 10 */ addi r1, r1, 0x10 -/* 80307CE4 00304C44 4E 80 00 20 */ blr +/* 80307CE4 00304C44 4E 80 00 20 */ blr .global SetStandardDirectTev_Compressed__3CGXF13_GXTevStageIDUiUiUiUi SetStandardDirectTev_Compressed__3CGXF13_GXTevStageIDUiUiUiUi: @@ -190,7 +190,7 @@ lbl_80307E14: /* 80307E18 00304D78 80 01 00 24 */ lwz r0, 0x24(r1) /* 80307E1C 00304D7C 7C 08 03 A6 */ mtlr r0 /* 80307E20 00304D80 38 21 00 20 */ addi r1, r1, 0x20 -/* 80307E24 00304D84 4E 80 00 20 */ blr +/* 80307E24 00304D84 4E 80 00 20 */ blr .global SetVtxDescv__3CGXFPC14_GXVtxDescList SetVtxDescv__3CGXFPC14_GXVtxDescList: @@ -216,7 +216,7 @@ lbl_80307E58: /* 80307E6C 00304DCC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80307E70 00304DD0 7C 08 03 A6 */ mtlr r0 /* 80307E74 00304DD4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80307E78 00304DD8 4E 80 00 20 */ blr +/* 80307E78 00304DD8 4E 80 00 20 */ blr .global SetIndexedPositionVtxFmt__14CFluidPlaneCPUFv SetIndexedPositionVtxFmt__14CFluidPlaneCPUFv: @@ -229,7 +229,7 @@ SetIndexedPositionVtxFmt__14CFluidPlaneCPUFv: /* 80307E94 00304DF4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80307E98 00304DF8 7C 08 03 A6 */ mtlr r0 /* 80307E9C 00304DFC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80307EA0 00304E00 4E 80 00 20 */ blr +/* 80307EA0 00304E00 4E 80 00 20 */ blr .global SetAttrFmt__11CFluidPlaneF6GXAttr10GXAttrType SetAttrFmt__11CFluidPlaneF6GXAttr10GXAttrType: @@ -255,7 +255,7 @@ lbl_80307EEC: /* 80307EEC 00304E4C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80307EF0 00304E50 7C 08 03 A6 */ mtlr r0 /* 80307EF4 00304E54 38 21 00 10 */ addi r1, r1, 0x10 -/* 80307EF8 00304E58 4E 80 00 20 */ blr +/* 80307EF8 00304E58 4E 80 00 20 */ blr .global SetVtxDescv_Compressed__3CGXFUi SetVtxDescv_Compressed__3CGXFUi: @@ -308,7 +308,7 @@ lbl_80307FA0: /* 80307FA8 00304F08 83 C1 00 08 */ lwz r30, 8(r1) /* 80307FAC 00304F0C 7C 08 03 A6 */ mtlr r0 /* 80307FB0 00304F10 38 21 00 10 */ addi r1, r1, 0x10 -/* 80307FB4 00304F14 4E 80 00 20 */ blr +/* 80307FB4 00304F14 4E 80 00 20 */ blr .global SetIndTexMtxSTPointFive__3CGXF14_GXIndTexMtxIDSc SetIndTexMtxSTPointFive__3CGXF14_GXIndTexMtxIDSc: @@ -322,7 +322,7 @@ SetIndTexMtxSTPointFive__3CGXF14_GXIndTexMtxIDSc: /* 80307FD4 00304F34 80 01 00 14 */ lwz r0, 0x14(r1) /* 80307FD8 00304F38 7C 08 03 A6 */ mtlr r0 /* 80307FDC 00304F3C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80307FE0 00304F40 4E 80 00 20 */ blr +/* 80307FE0 00304F40 4E 80 00 20 */ blr .global FlushState__3CGXFv FlushState__3CGXFv: @@ -388,7 +388,7 @@ lbl_803080B4: /* 803080C4 00305024 83 C1 00 08 */ lwz r30, 8(r1) /* 803080C8 00305028 7C 08 03 A6 */ mtlr r0 /* 803080CC 0030502C 38 21 00 10 */ addi r1, r1, 0x10 -/* 803080D0 00305030 4E 80 00 20 */ blr +/* 803080D0 00305030 4E 80 00 20 */ blr .global sub_803080d4 sub_803080d4: @@ -404,7 +404,7 @@ lbl_803080F0: /* 803080F4 00305054 80 01 00 14 */ lwz r0, 0x14(r1) /* 803080F8 00305058 7C 08 03 A6 */ mtlr r0 /* 803080FC 0030505C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80308100 00305060 4E 80 00 20 */ blr +/* 80308100 00305060 4E 80 00 20 */ blr .global ResetGXStates__3CGXFv ResetGXStates__3CGXFv: @@ -514,7 +514,7 @@ lbl_80308254: /* 8030828C 003051EC 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80308290 003051F0 7C 08 03 A6 */ mtlr r0 /* 80308294 003051F4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80308298 003051F8 4E 80 00 20 */ blr +/* 80308298 003051F8 4E 80 00 20 */ blr .global __ct__Q23CGX8SGXStateFv __ct__Q23CGX8SGXStateFv: @@ -637,13 +637,13 @@ __ct__Q23CGX8SGXStateFv: /* 8030846C 003053CC 80 01 00 34 */ lwz r0, 0x34(r1) /* 80308470 003053D0 7C 08 03 A6 */ mtlr r0 /* 80308474 003053D4 38 21 00 30 */ addi r1, r1, 0x30 -/* 80308478 003053D8 4E 80 00 20 */ blr +/* 80308478 003053D8 4E 80 00 20 */ blr .global __ct__Q23CGX9STexStateFv __ct__Q23CGX9STexStateFv: /* 8030847C 003053DC 38 00 00 00 */ li r0, 0 /* 80308480 003053E0 90 03 00 00 */ stw r0, 0(r3) -/* 80308484 003053E4 4E 80 00 20 */ blr +/* 80308484 003053E4 4E 80 00 20 */ blr .global __ct__Q23CGX9STevStateFv __ct__Q23CGX9STevStateFv: @@ -658,7 +658,7 @@ __ct__Q23CGX9STevStateFv: /* 803084A8 00305408 90 83 00 14 */ stw r4, 0x14(r3) /* 803084AC 0030540C 98 03 00 18 */ stb r0, 0x18(r3) /* 803084B0 00305410 98 03 00 19 */ stb r0, 0x19(r3) -/* 803084B4 00305414 4E 80 00 20 */ blr +/* 803084B4 00305414 4E 80 00 20 */ blr .global SetLineWidth__3CGXFUc12_GXTexOffset SetLineWidth__3CGXFUc12_GXTexOffset: @@ -679,7 +679,7 @@ lbl_803084EC: /* 803084EC 0030544C 80 01 00 14 */ lwz r0, 0x14(r1) /* 803084F0 00305450 7C 08 03 A6 */ mtlr r0 /* 803084F4 00305454 38 21 00 10 */ addi r1, r1, 0x10 -/* 803084F8 00305458 4E 80 00 20 */ blr +/* 803084F8 00305458 4E 80 00 20 */ blr .global SetFog__3CGXF10_GXFogTypeffffRC8_GXColor SetFog__3CGXF10_GXFogTypeffffRC8_GXColor: @@ -717,11 +717,11 @@ lbl_8030854C: /* 80308570 003054D0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80308574 003054D4 7C 08 03 A6 */ mtlr r0 /* 80308578 003054D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030857C 003054DC 4E 80 00 20 */ blr +/* 8030857C 003054DC 4E 80 00 20 */ blr .global End__3CGXFv End__3CGXFv: -/* 80308580 003054E0 4E 80 00 20 */ blr +/* 80308580 003054E0 4E 80 00 20 */ blr .global Begin__3CGXF12_GXPrimitive9_GXVtxFmtUs Begin__3CGXF12_GXPrimitive9_GXVtxFmtUs: @@ -751,7 +751,7 @@ lbl_803085C0: /* 803085DC 0030553C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 803085E0 00305540 7C 08 03 A6 */ mtlr r0 /* 803085E4 00305544 38 21 00 20 */ addi r1, r1, 0x20 -/* 803085E8 00305548 4E 80 00 20 */ blr +/* 803085E8 00305548 4E 80 00 20 */ blr .global CallDisplayList__3CGXFPCvUl CallDisplayList__3CGXFPCvUl: @@ -777,7 +777,7 @@ lbl_80308620: /* 80308634 00305594 83 C1 00 08 */ lwz r30, 8(r1) /* 80308638 00305598 7C 08 03 A6 */ mtlr r0 /* 8030863C 0030559C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80308640 003055A0 4E 80 00 20 */ blr +/* 80308640 003055A0 4E 80 00 20 */ blr .global SetArray__3CGXF7_GXAttrPCvUc SetArray__3CGXF7_GXAttrPCvUc: @@ -801,7 +801,7 @@ lbl_80308680: /* 80308680 003055E0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80308684 003055E4 7C 08 03 A6 */ mtlr r0 /* 80308688 003055E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030868C 003055EC 4E 80 00 20 */ blr +/* 8030868C 003055EC 4E 80 00 20 */ blr .global SetNumIndStages__3CGXFUc SetNumIndStages__3CGXFUc: @@ -820,7 +820,7 @@ lbl_803086BC: /* 803086BC 0030561C 80 01 00 14 */ lwz r0, 0x14(r1) /* 803086C0 00305620 7C 08 03 A6 */ mtlr r0 /* 803086C4 00305624 38 21 00 10 */ addi r1, r1, 0x10 -/* 803086C8 00305628 4E 80 00 20 */ blr +/* 803086C8 00305628 4E 80 00 20 */ blr .global SetTexCoordGen__3CGXF13_GXTexCoordID13_GXTexGenType12_GXTexGenSrc9_GXTexMtxUc11_GXPTTexMtx SetTexCoordGen__3CGXF13_GXTexCoordID13_GXTexGenType12_GXTexGenSrc9_GXTexMtxUc11_GXPTTexMtx: @@ -854,7 +854,7 @@ lbl_80308730: /* 80308734 00305694 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80308738 00305698 7C 08 03 A6 */ mtlr r0 /* 8030873C 0030569C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80308740 003056A0 4E 80 00 20 */ blr +/* 80308740 003056A0 4E 80 00 20 */ blr .global SetTevDirect__3CGXF13_GXTevStageID SetTevDirect__3CGXF13_GXTevStageID: @@ -876,7 +876,7 @@ lbl_8030877C: /* 8030877C 003056DC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80308780 003056E0 7C 08 03 A6 */ mtlr r0 /* 80308784 003056E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80308788 003056E8 4E 80 00 20 */ blr +/* 80308788 003056E8 4E 80 00 20 */ blr .global SetTevIndirect__3CGXF13_GXTevStageID16_GXIndTexStageID15_GXIndTexFormat16_GXIndTexBiasSel14_GXIndTexMtxID13_GXIndTexWrap13_GXIndTexWrapUcUc17_GXIndTexAlphaSel SetTevIndirect__3CGXF13_GXTevStageID16_GXIndTexStageID15_GXIndTexFormat16_GXIndTexBiasSel14_GXIndTexMtxID13_GXIndTexWrap13_GXIndTexWrapUcUc17_GXIndTexAlphaSel: @@ -914,7 +914,7 @@ lbl_803087FC: /* 80308804 00305764 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80308808 00305768 7C 08 03 A6 */ mtlr r0 /* 8030880C 0030576C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80308810 00305770 4E 80 00 20 */ blr +/* 80308810 00305770 4E 80 00 20 */ blr .global SetAlphaCompare__3CGXF10_GXCompareUc10_GXAlphaOp10_GXCompareUc SetAlphaCompare__3CGXF10_GXCompareUc10_GXAlphaOp10_GXCompareUc: @@ -944,7 +944,7 @@ lbl_80308868: /* 8030886C 003057CC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80308870 003057D0 7C 08 03 A6 */ mtlr r0 /* 80308874 003057D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80308878 003057D8 4E 80 00 20 */ blr +/* 80308878 003057D8 4E 80 00 20 */ blr .global SetZMode__3CGXFb10_GXCompareb SetZMode__3CGXFb10_GXCompareb: @@ -969,7 +969,7 @@ lbl_803088C0: /* 803088C0 00305820 80 01 00 14 */ lwz r0, 0x14(r1) /* 803088C4 00305824 7C 08 03 A6 */ mtlr r0 /* 803088C8 00305828 38 21 00 10 */ addi r1, r1, 0x10 -/* 803088CC 0030582C 4E 80 00 20 */ blr +/* 803088CC 0030582C 4E 80 00 20 */ blr .global SetBlendMode__3CGXF12_GXBlendMode14_GXBlendFactor14_GXBlendFactor10_GXLogicOp SetBlendMode__3CGXF12_GXBlendMode14_GXBlendFactor14_GXBlendFactor10_GXLogicOp: @@ -1004,7 +1004,7 @@ lbl_80308938: /* 8030893C 0030589C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80308940 003058A0 7C 08 03 A6 */ mtlr r0 /* 80308944 003058A4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80308948 003058A8 4E 80 00 20 */ blr +/* 80308948 003058A8 4E 80 00 20 */ blr .global SetTevOrder__3CGXF13_GXTevStageID13_GXTexCoordID11_GXTexMapID12_GXChannelID SetTevOrder__3CGXF13_GXTevStageID13_GXTexCoordID11_GXTexMapID12_GXChannelID: @@ -1028,7 +1028,7 @@ lbl_8030898C: /* 8030898C 003058EC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80308990 003058F0 7C 08 03 A6 */ mtlr r0 /* 80308994 003058F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80308998 003058F8 4E 80 00 20 */ blr +/* 80308998 003058F8 4E 80 00 20 */ blr .global SetTevKAlphaSel__3CGXF13_GXTevStageID15_GXTevKAlphaSel SetTevKAlphaSel__3CGXF13_GXTevStageID15_GXTevKAlphaSel: @@ -1049,7 +1049,7 @@ lbl_803089D0: /* 803089D0 00305930 80 01 00 14 */ lwz r0, 0x14(r1) /* 803089D4 00305934 7C 08 03 A6 */ mtlr r0 /* 803089D8 00305938 38 21 00 10 */ addi r1, r1, 0x10 -/* 803089DC 0030593C 4E 80 00 20 */ blr +/* 803089DC 0030593C 4E 80 00 20 */ blr .global SetTevKColorSel__3CGXF13_GXTevStageID15_GXTevKColorSel SetTevKColorSel__3CGXF13_GXTevStageID15_GXTevKColorSel: @@ -1070,7 +1070,7 @@ lbl_80308A14: /* 80308A14 00305974 80 01 00 14 */ lwz r0, 0x14(r1) /* 80308A18 00305978 7C 08 03 A6 */ mtlr r0 /* 80308A1C 0030597C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80308A20 00305980 4E 80 00 20 */ blr +/* 80308A20 00305980 4E 80 00 20 */ blr .global SetTevAlphaOp_Compressed__3CGXF13_GXTevStageIDUi SetTevAlphaOp_Compressed__3CGXF13_GXTevStageIDUi: @@ -1097,7 +1097,7 @@ lbl_80308A70: /* 80308A70 003059D0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80308A74 003059D4 7C 08 03 A6 */ mtlr r0 /* 80308A78 003059D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80308A7C 003059DC 4E 80 00 20 */ blr +/* 80308A7C 003059DC 4E 80 00 20 */ blr .global SetTevAlphaOp__3CGXF13_GXTevStageID8_GXTevOp10_GXTevBias11_GXTevScaleUc11_GXTevRegID SetTevAlphaOp__3CGXF13_GXTevStageID8_GXTevOp10_GXTevBias11_GXTevScaleUc11_GXTevRegID: @@ -1124,7 +1124,7 @@ lbl_80308ACC: /* 80308ACC 00305A2C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80308AD0 00305A30 7C 08 03 A6 */ mtlr r0 /* 80308AD4 00305A34 38 21 00 10 */ addi r1, r1, 0x10 -/* 80308AD8 00305A38 4E 80 00 20 */ blr +/* 80308AD8 00305A38 4E 80 00 20 */ blr .global SetTevColorOp_Compressed__3CGXF13_GXTevStageIDUi SetTevColorOp_Compressed__3CGXF13_GXTevStageIDUi: @@ -1151,7 +1151,7 @@ lbl_80308B28: /* 80308B28 00305A88 80 01 00 14 */ lwz r0, 0x14(r1) /* 80308B2C 00305A8C 7C 08 03 A6 */ mtlr r0 /* 80308B30 00305A90 38 21 00 10 */ addi r1, r1, 0x10 -/* 80308B34 00305A94 4E 80 00 20 */ blr +/* 80308B34 00305A94 4E 80 00 20 */ blr .global SetTevColorOp__3CGXF13_GXTevStageID8_GXTevOp10_GXTevBias11_GXTevScaleUc11_GXTevRegID SetTevColorOp__3CGXF13_GXTevStageID8_GXTevOp10_GXTevBias11_GXTevScaleUc11_GXTevRegID: @@ -1178,7 +1178,7 @@ lbl_80308B84: /* 80308B84 00305AE4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80308B88 00305AE8 7C 08 03 A6 */ mtlr r0 /* 80308B8C 00305AEC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80308B90 00305AF0 4E 80 00 20 */ blr +/* 80308B90 00305AF0 4E 80 00 20 */ blr .global SetTevAlphaIn__3CGXF13_GXTevStageID14_GXTevAlphaArg14_GXTevAlphaArg14_GXTevAlphaArg14_GXTevAlphaArg SetTevAlphaIn__3CGXF13_GXTevStageID14_GXTevAlphaArg14_GXTevAlphaArg14_GXTevAlphaArg14_GXTevAlphaArg: @@ -1204,7 +1204,7 @@ lbl_80308BDC: /* 80308BDC 00305B3C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80308BE0 00305B40 7C 08 03 A6 */ mtlr r0 /* 80308BE4 00305B44 38 21 00 10 */ addi r1, r1, 0x10 -/* 80308BE8 00305B48 4E 80 00 20 */ blr +/* 80308BE8 00305B48 4E 80 00 20 */ blr .global SetTevColorIn__3CGXF13_GXTevStageID14_GXTevColorArg14_GXTevColorArg14_GXTevColorArg14_GXTevColorArg SetTevColorIn__3CGXF13_GXTevStageID14_GXTevColorArg14_GXTevColorArg14_GXTevColorArg14_GXTevColorArg: @@ -1230,7 +1230,7 @@ lbl_80308C34: /* 80308C34 00305B94 80 01 00 14 */ lwz r0, 0x14(r1) /* 80308C38 00305B98 7C 08 03 A6 */ mtlr r0 /* 80308C3C 00305B9C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80308C40 00305BA0 4E 80 00 20 */ blr +/* 80308C40 00305BA0 4E 80 00 20 */ blr .global SetTevKColor__3CGXF14_GXTevKColorIDRC8_GXColor SetTevKColor__3CGXF14_GXTevKColorIDRC8_GXColor: @@ -1253,7 +1253,7 @@ lbl_80308C80: /* 80308C80 00305BE0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80308C84 00305BE4 7C 08 03 A6 */ mtlr r0 /* 80308C88 00305BE8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80308C8C 00305BEC 4E 80 00 20 */ blr +/* 80308C8C 00305BEC 4E 80 00 20 */ blr .global SetNumTevStages__3CGXFUc SetNumTevStages__3CGXFUc: @@ -1272,7 +1272,7 @@ lbl_80308CBC: /* 80308CBC 00305C1C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80308CC0 00305C20 7C 08 03 A6 */ mtlr r0 /* 80308CC4 00305C24 38 21 00 10 */ addi r1, r1, 0x10 -/* 80308CC8 00305C28 4E 80 00 20 */ blr +/* 80308CC8 00305C28 4E 80 00 20 */ blr .global SetChanCtrl__3CGXFQ23CGX10EChannelIdUc11_GXColorSrc11_GXColorSrc10_GXLightID12_GXDiffuseFn9_GXAttnFn SetChanCtrl__3CGXFQ23CGX10EChannelIdUc11_GXColorSrc11_GXColorSrc10_GXLightID12_GXDiffuseFn9_GXAttnFn: @@ -1312,7 +1312,7 @@ lbl_80308CF8: /* 80308D4C 00305CAC 98 0A 00 4C */ stb r0, 0x4c(r10) /* 80308D50 00305CB0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80308D54 00305CB4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80308D58 00305CB8 4E 80 00 20 */ blr +/* 80308D58 00305CB8 4E 80 00 20 */ blr .global SetChanMatColor__3CGXFQ23CGX10EChannelIdRC8_GXColor SetChanMatColor__3CGXFQ23CGX10EChannelIdRC8_GXColor: @@ -1336,7 +1336,7 @@ lbl_80308D9C: /* 80308D9C 00305CFC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80308DA0 00305D00 7C 08 03 A6 */ mtlr r0 /* 80308DA4 00305D04 38 21 00 10 */ addi r1, r1, 0x10 -/* 80308DA8 00305D08 4E 80 00 20 */ blr +/* 80308DA8 00305D08 4E 80 00 20 */ blr .global GetChanAmbColor__3CGXFQ23CGX10EChannelId GetChanAmbColor__3CGXFQ23CGX10EChannelId: @@ -1345,7 +1345,7 @@ GetChanAmbColor__3CGXFQ23CGX10EChannelId: /* 80308DB4 00305D14 38 64 53 EC */ addi r3, r4, lbl_805A53EC@l /* 80308DB8 00305D18 7C 63 02 14 */ add r3, r3, r0 /* 80308DBC 00305D1C 80 63 00 38 */ lwz r3, 0x38(r3) -/* 80308DC0 00305D20 4E 80 00 20 */ blr +/* 80308DC0 00305D20 4E 80 00 20 */ blr .global SetChanAmbColor__3CGXFQ23CGX10EChannelIdRC8_GXColor SetChanAmbColor__3CGXFQ23CGX10EChannelIdRC8_GXColor: @@ -1369,7 +1369,7 @@ lbl_80308E04: /* 80308E04 00305D64 80 01 00 14 */ lwz r0, 0x14(r1) /* 80308E08 00305D68 7C 08 03 A6 */ mtlr r0 /* 80308E0C 00305D6C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80308E10 00305D70 4E 80 00 20 */ blr +/* 80308E10 00305D70 4E 80 00 20 */ blr .global SetNumTexGens__3CGXFUc SetNumTexGens__3CGXFUc: @@ -1388,7 +1388,7 @@ lbl_80308E40: /* 80308E40 00305DA0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80308E44 00305DA4 7C 08 03 A6 */ mtlr r0 /* 80308E48 00305DA8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80308E4C 00305DAC 4E 80 00 20 */ blr +/* 80308E4C 00305DAC 4E 80 00 20 */ blr .global SetNumChans__3CGXFUc SetNumChans__3CGXFUc: @@ -1403,7 +1403,7 @@ SetNumChans__3CGXFUc: /* 80308E70 00305DD0 98 67 00 4E */ stb r3, 0x4e(r7) /* 80308E74 00305DD4 50 80 0F FE */ rlwimi r0, r4, 1, 0x1f, 0x1f /* 80308E78 00305DD8 98 07 00 4C */ stb r0, 0x4c(r7) -/* 80308E7C 00305DDC 4E 80 00 20 */ blr +/* 80308E7C 00305DDC 4E 80 00 20 */ blr .global __sinit_CGX_cpp __sinit_CGX_cpp: diff --git a/asm/Kyoto/Graphics/CLight.s b/asm/Kyoto/Graphics/CLight.s index 5c2f24bd..6db0f1d0 100644 --- a/asm/Kyoto/Graphics/CLight.s +++ b/asm/Kyoto/Graphics/CLight.s @@ -105,7 +105,7 @@ lbl_80306124: /* 80306144 003030A4 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80306148 003030A8 7C 08 03 A6 */ mtlr r0 /* 8030614C 003030AC 38 21 00 50 */ addi r1, r1, 0x50 -/* 80306150 003030B0 4E 80 00 20 */ blr +/* 80306150 003030B0 4E 80 00 20 */ blr .global GetIntensity__6CLightCFv GetIntensity__6CLightCFv: @@ -153,7 +153,7 @@ lbl_803061D8: lbl_803061E4: /* 803061E4 00303144 C0 23 00 48 */ lfs f1, 0x48(r3) /* 803061E8 00303148 38 21 00 20 */ addi r1, r1, 0x20 -/* 803061EC 0030314C 4E 80 00 20 */ blr +/* 803061EC 0030314C 4E 80 00 20 */ blr .global CalculateLightRadius__6CLightCFv CalculateLightRadius__6CLightCFv: @@ -221,7 +221,7 @@ lbl_803062C0: /* 803062C4 00303224 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803062C8 00303228 7C 08 03 A6 */ mtlr r0 /* 803062CC 0030322C 38 21 00 10 */ addi r1, r1, 0x10 -/* 803062D0 00303230 4E 80 00 20 */ blr +/* 803062D0 00303230 4E 80 00 20 */ blr .global GetRadius__6CLightCFv GetRadius__6CLightCFv: @@ -245,7 +245,7 @@ lbl_8030630C: /* 80306314 00303274 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80306318 00303278 7C 08 03 A6 */ mtlr r0 /* 8030631C 0030327C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80306320 00303280 4E 80 00 20 */ blr +/* 80306320 00303280 4E 80 00 20 */ blr .global SetDirection__6CLightFRC9CVector3f SetDirection__6CLightFRC9CVector3f: @@ -255,7 +255,7 @@ SetDirection__6CLightFRC9CVector3f: /* 80306330 00303290 D0 03 00 10 */ stfs f0, 0x10(r3) /* 80306334 00303294 C0 04 00 08 */ lfs f0, 8(r4) /* 80306338 00303298 D0 03 00 14 */ stfs f0, 0x14(r3) -/* 8030633C 0030329C 4E 80 00 20 */ blr +/* 8030633C 0030329C 4E 80 00 20 */ blr .global SetPosition__6CLightFRC9CVector3f SetPosition__6CLightFRC9CVector3f: @@ -265,7 +265,7 @@ SetPosition__6CLightFRC9CVector3f: /* 8030634C 003032AC D0 03 00 04 */ stfs f0, 4(r3) /* 80306350 003032B0 C0 04 00 08 */ lfs f0, 8(r4) /* 80306354 003032B4 D0 03 00 08 */ stfs f0, 8(r3) -/* 80306358 003032B8 4E 80 00 20 */ blr +/* 80306358 003032B8 4E 80 00 20 */ blr .global SetColor__6CLightFRC6CColor SetColor__6CLightFRC6CColor: @@ -278,7 +278,7 @@ SetColor__6CLightFRC6CColor: /* 80306374 003032D4 88 03 00 4C */ lbz r0, 0x4c(r3) /* 80306378 003032D8 50 80 3E 30 */ rlwimi r0, r4, 7, 0x18, 0x18 /* 8030637C 003032DC 98 03 00 4C */ stb r0, 0x4c(r3) -/* 80306380 003032E0 4E 80 00 20 */ blr +/* 80306380 003032E0 4E 80 00 20 */ blr .global SetAngleAttenuation__6CLightFfff SetAngleAttenuation__6CLightFfff: @@ -292,7 +292,7 @@ SetAngleAttenuation__6CLightFfff: /* 803063A0 00303300 88 03 00 4C */ lbz r0, 0x4c(r3) /* 803063A4 00303304 50 80 3E 30 */ rlwimi r0, r4, 7, 0x18, 0x18 /* 803063A8 00303308 98 03 00 4C */ stb r0, 0x4c(r3) -/* 803063AC 0030330C 4E 80 00 20 */ blr +/* 803063AC 0030330C 4E 80 00 20 */ blr .global SetAttenuation__6CLightFfff SetAttenuation__6CLightFfff: @@ -306,7 +306,7 @@ SetAttenuation__6CLightFfff: /* 803063CC 0030332C 88 03 00 4C */ lbz r0, 0x4c(r3) /* 803063D0 00303330 50 80 3E 30 */ rlwimi r0, r4, 7, 0x18, 0x18 /* 803063D4 00303334 98 03 00 4C */ stb r0, 0x4c(r3) -/* 803063D8 00303338 4E 80 00 20 */ blr +/* 803063D8 00303338 4E 80 00 20 */ blr .global BuildCustom__6CLightFRC9CVector3fRC9CVector3fRC6CColorffffff BuildCustom__6CLightFRC9CVector3fRC9CVector3fRC6CColorffffff: @@ -317,7 +317,7 @@ BuildCustom__6CLightFRC9CVector3fRC9CVector3fRC6CColorffffff: /* 803063EC 0030334C 80 01 00 14 */ lwz r0, 0x14(r1) /* 803063F0 00303350 7C 08 03 A6 */ mtlr r0 /* 803063F4 00303354 38 21 00 10 */ addi r1, r1, 0x10 -/* 803063F8 00303358 4E 80 00 20 */ blr +/* 803063F8 00303358 4E 80 00 20 */ blr .global BuildSpot__6CLightFRC9CVector3fRC9CVector3fRC6CColorf BuildSpot__6CLightFRC9CVector3fRC9CVector3fRC6CColorf: @@ -334,7 +334,7 @@ BuildSpot__6CLightFRC9CVector3fRC9CVector3fRC6CColorf: /* 80306424 00303384 80 01 00 14 */ lwz r0, 0x14(r1) /* 80306428 00303388 7C 08 03 A6 */ mtlr r0 /* 8030642C 0030338C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80306430 00303390 4E 80 00 20 */ blr +/* 80306430 00303390 4E 80 00 20 */ blr .global BuildPoint__6CLightFRC9CVector3fRC6CColor BuildPoint__6CLightFRC9CVector3fRC6CColor: @@ -351,7 +351,7 @@ BuildPoint__6CLightFRC9CVector3fRC6CColor: /* 8030645C 003033BC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80306460 003033C0 7C 08 03 A6 */ mtlr r0 /* 80306464 003033C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80306468 003033C8 4E 80 00 20 */ blr +/* 80306468 003033C8 4E 80 00 20 */ blr .global BuildDirectional__6CLightFRC9CVector3fRC6CColor BuildDirectional__6CLightFRC9CVector3fRC6CColor: @@ -368,7 +368,7 @@ BuildDirectional__6CLightFRC9CVector3fRC6CColor: /* 80306494 003033F4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80306498 003033F8 7C 08 03 A6 */ mtlr r0 /* 8030649C 003033FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 803064A0 00303400 4E 80 00 20 */ blr +/* 803064A0 00303400 4E 80 00 20 */ blr .global BuildLocalAmbient__6CLightFRC9CVector3fRC6CColor BuildLocalAmbient__6CLightFRC9CVector3fRC6CColor: @@ -385,7 +385,7 @@ BuildLocalAmbient__6CLightFRC9CVector3fRC6CColor: /* 803064CC 0030342C 80 01 00 14 */ lwz r0, 0x14(r1) /* 803064D0 00303430 7C 08 03 A6 */ mtlr r0 /* 803064D4 00303434 38 21 00 10 */ addi r1, r1, 0x10 -/* 803064D8 00303438 4E 80 00 20 */ blr +/* 803064D8 00303438 4E 80 00 20 */ blr .global __ct__6CLightFRC9CVector3fRC9CVector3fRC6CColorffffff __ct__6CLightFRC9CVector3fRC9CVector3fRC6CColorffffff: @@ -425,7 +425,7 @@ __ct__6CLightFRC9CVector3fRC9CVector3fRC6CColorffffff: /* 80306560 003034C0 88 03 00 4C */ lbz r0, 0x4c(r3) /* 80306564 003034C4 50 E0 36 72 */ rlwimi r0, r7, 6, 0x19, 0x19 /* 80306568 003034C8 98 03 00 4C */ stb r0, 0x4c(r3) -/* 8030656C 003034CC 4E 80 00 20 */ blr +/* 8030656C 003034CC 4E 80 00 20 */ blr .global __ct__6CLightF10ELightTypeRC9CVector3fRC9CVector3fRC6CColorf __ct__6CLightF10ELightTypeRC9CVector3fRC9CVector3fRC6CColorf: @@ -465,7 +465,7 @@ __ct__6CLightF10ELightTypeRC9CVector3fRC9CVector3fRC6CColorf: /* 803065F4 00303554 88 03 00 4C */ lbz r0, 0x4c(r3) /* 803065F8 00303558 51 00 36 72 */ rlwimi r0, r8, 6, 0x19, 0x19 /* 803065FC 0030355C 98 03 00 4C */ stb r0, 0x4c(r3) -/* 80306600 00303560 4E 80 00 20 */ blr +/* 80306600 00303560 4E 80 00 20 */ blr .global __sinit_CLight_cpp __sinit_CLight_cpp: diff --git a/asm/Kyoto/Graphics/CTevCombiners.s b/asm/Kyoto/Graphics/CTevCombiners.s index 211ba9d7..1eea2124 100644 --- a/asm/Kyoto/Graphics/CTevCombiners.s +++ b/asm/Kyoto/Graphics/CTevCombiners.s @@ -51,7 +51,7 @@ ResetStates__13CTevCombinersFv: /* 80308EE4 00305E44 80 01 00 14 */ lwz r0, 0x14(r1) /* 80308EE8 00305E48 7C 08 03 A6 */ mtlr r0 /* 80308EEC 00305E4C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80308EF0 00305E50 4E 80 00 20 */ blr +/* 80308EF0 00305E50 4E 80 00 20 */ blr .global Execute__Q213CTevCombiners8CTevPassCFi Execute__Q213CTevCombiners8CTevPassCFi: @@ -99,7 +99,7 @@ Execute__Q213CTevCombiners8CTevPassCFi: /* 80308F98 00305EF8 83 C1 00 08 */ lwz r30, 8(r1) /* 80308F9C 00305EFC 7C 08 03 A6 */ mtlr r0 /* 80308FA0 00305F00 38 21 00 10 */ addi r1, r1, 0x10 -/* 80308FA4 00305F04 4E 80 00 20 */ blr +/* 80308FA4 00305F04 4E 80 00 20 */ blr .global SetPassCombiners__13CTevCombinersFiRCQ213CTevCombiners8CTevPass SetPassCombiners__13CTevCombinersFiRCQ213CTevCombiners8CTevPass: @@ -114,7 +114,7 @@ SetPassCombiners__13CTevCombinersFiRCQ213CTevCombiners8CTevPass: /* 80308FC8 00305F28 38 60 00 01 */ li r3, 1 /* 80308FCC 00305F2C 7C 08 03 A6 */ mtlr r0 /* 80308FD0 00305F30 38 21 00 10 */ addi r1, r1, 0x10 -/* 80308FD4 00305F34 4E 80 00 20 */ blr +/* 80308FD4 00305F34 4E 80 00 20 */ blr .global SetupPass__13CTevCombinersFiRCQ213CTevCombiners8CTevPass SetupPass__13CTevCombinersFiRCQ213CTevCombiners8CTevPass: @@ -142,7 +142,7 @@ lbl_80309020: /* 80309024 00305F84 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80309028 00305F88 7C 08 03 A6 */ mtlr r0 /* 8030902C 00305F8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80309030 00305F90 4E 80 00 20 */ blr +/* 80309030 00305F90 4E 80 00 20 */ blr .global DeletePass__13CTevCombinersFi DeletePass__13CTevCombinersFi: @@ -162,7 +162,7 @@ DeletePass__13CTevCombinersFi: /* 80309068 00305FC8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8030906C 00305FCC 7C 08 03 A6 */ mtlr r0 /* 80309070 00305FD0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80309074 00305FD4 4E 80 00 20 */ blr +/* 80309074 00305FD4 4E 80 00 20 */ blr .global Init__13CTevCombinersFv Init__13CTevCombinersFv: @@ -193,7 +193,7 @@ lbl_803090A8: /* 803090D4 00306034 83 C1 00 08 */ lwz r30, 8(r1) /* 803090D8 00306038 7C 08 03 A6 */ mtlr r0 /* 803090DC 0030603C 38 21 00 10 */ addi r1, r1, 0x10 -/* 803090E0 00306040 4E 80 00 20 */ blr +/* 803090E0 00306040 4E 80 00 20 */ blr .global RecomputePasses__13CTevCombinersFv RecomputePasses__13CTevCombinersFv: @@ -212,17 +212,17 @@ RecomputePasses__13CTevCombinersFv: /* 80309114 00306074 80 01 00 14 */ lwz r0, 0x14(r1) /* 80309118 00306078 7C 08 03 A6 */ mtlr r0 /* 8030911C 0030607C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80309120 00306080 4E 80 00 20 */ blr +/* 80309120 00306080 4E 80 00 20 */ blr .global __ct__Q213CTevCombiners8ColorVarFQ213CTevCombiners9EColorSrc __ct__Q213CTevCombiners8ColorVarFQ213CTevCombiners9EColorSrc: /* 80309124 00306084 90 83 00 00 */ stw r4, 0(r3) -/* 80309128 00306088 4E 80 00 20 */ blr +/* 80309128 00306088 4E 80 00 20 */ blr .global __ct__Q213CTevCombiners8AlphaVarFQ213CTevCombiners9EAlphaSrc __ct__Q213CTevCombiners8AlphaVarFQ213CTevCombiners9EAlphaSrc: /* 8030912C 0030608C 90 83 00 00 */ stw r4, 0(r3) -/* 80309130 00306090 4E 80 00 20 */ blr +/* 80309130 00306090 4E 80 00 20 */ blr .global __sinit_CTevCombiners_cpp __sinit_CTevCombiners_cpp: diff --git a/asm/Kyoto/Graphics/DolphinCColor.s b/asm/Kyoto/Graphics/DolphinCColor.s index a91d6011..2f058077 100644 --- a/asm/Kyoto/Graphics/DolphinCColor.s +++ b/asm/Kyoto/Graphics/DolphinCColor.s @@ -36,13 +36,13 @@ ToRGB5A3__6CColorCFv: /* 80363088 0035FFE8 28 04 00 FF */ cmplwi r4, 0xff /* 8036308C 0035FFEC 50 E0 3C 6A */ rlwimi r0, r7, 7, 0x11, 0x15 /* 80363090 0035FFF0 54 03 04 3E */ clrlwi r3, r0, 0x10 -/* 80363094 0035FFF4 4D 82 00 20 */ beqlr +/* 80363094 0035FFF4 4D 82 00 20 */ beqlr /* 80363098 0035FFF8 54 A0 E7 3E */ rlwinm r0, r5, 0x1c, 0x1c, 0x1f /* 8036309C 0035FFFC 50 80 3C 66 */ rlwimi r0, r4, 7, 0x11, 0x13 /* 803630A0 00360000 50 C0 06 36 */ rlwimi r0, r6, 0, 0x18, 0x1b /* 803630A4 00360004 50 E0 25 2E */ rlwimi r0, r7, 4, 0x14, 0x17 /* 803630A8 00360008 54 03 04 3E */ clrlwi r3, r0, 0x10 -/* 803630AC 0036000C 4E 80 00 20 */ blr +/* 803630AC 0036000C 4E 80 00 20 */ blr .global Add__6CColorFRC6CColorRC6CColor Add__6CColorFRC6CColorRC6CColor: @@ -99,7 +99,7 @@ lbl_8036315C: /* 80363168 003600C8 99 03 00 02 */ stb r8, 2(r3) /* 8036316C 003600CC 99 23 00 03 */ stb r9, 3(r3) /* 80363170 003600D0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80363174 003600D4 4E 80 00 20 */ blr +/* 80363174 003600D4 4E 80 00 20 */ blr .global Modulate__6CColorFRC6CColorRC6CColor Modulate__6CColorFRC6CColorRC6CColor: @@ -141,7 +141,7 @@ Modulate__6CColorFRC6CColorRC6CColor: /* 80363204 00360164 98 A3 00 01 */ stb r5, 1(r3) /* 80363208 00360168 98 E3 00 02 */ stb r7, 2(r3) /* 8036320C 0036016C 99 03 00 03 */ stb r8, 3(r3) -/* 80363210 00360170 4E 80 00 20 */ blr +/* 80363210 00360170 4E 80 00 20 */ blr .global Lerp__6CColorFUiUif Lerp__6CColorFUiUif: @@ -182,7 +182,7 @@ Lerp__6CColorFUiUif: /* 8036329C 003601FC 80 01 00 14 */ lwz r0, 0x14(r1) /* 803632A0 00360200 7C 08 03 A6 */ mtlr r0 /* 803632A4 00360204 38 21 00 10 */ addi r1, r1, 0x10 -/* 803632A8 00360208 4E 80 00 20 */ blr +/* 803632A8 00360208 4E 80 00 20 */ blr .global Lerp__6CColorFRC6CColorRC6CColorf Lerp__6CColorFRC6CColorRC6CColorf: @@ -220,7 +220,7 @@ Lerp__6CColorFRC6CColorRC6CColorf: /* 80363328 00360288 80 01 00 14 */ lwz r0, 0x14(r1) /* 8036332C 0036028C 7C 08 03 A6 */ mtlr r0 /* 80363330 00360290 38 21 00 10 */ addi r1, r1, 0x10 -/* 80363334 00360294 4E 80 00 20 */ blr +/* 80363334 00360294 4E 80 00 20 */ blr .global Get__6CColorCFRfRfRf Get__6CColorCFRfRfRf: @@ -234,7 +234,7 @@ Get__6CColorCFRfRfRf: /* 80363354 003602B4 E0 03 A0 02 */ psq_l f0, 2(r3), 1, qr2 /* 80363358 003602B8 EC 01 00 32 */ fmuls f0, f1, f0 /* 8036335C 003602BC D0 06 00 00 */ stfs f0, 0(r6) -/* 80363360 003602C0 4E 80 00 20 */ blr +/* 80363360 003602C0 4E 80 00 20 */ blr .global Get__6CColorCFRfRfRfRf Get__6CColorCFRfRfRfRf: @@ -251,7 +251,7 @@ Get__6CColorCFRfRfRfRf: /* 8036338C 003602EC E0 03 A0 03 */ psq_l f0, 3(r3), 1, qr2 /* 80363390 003602F0 EC 01 00 32 */ fmuls f0, f1, f0 /* 80363394 003602F4 D0 07 00 00 */ stfs f0, 0(r7) -/* 80363398 003602F8 4E 80 00 20 */ blr +/* 80363398 003602F8 4E 80 00 20 */ blr .global Set__6CColorFffff Set__6CColorFffff: @@ -274,7 +274,7 @@ Set__6CColorFffff: /* 803633DC 0036033C 88 01 00 08 */ lbz r0, 8(r1) /* 803633E0 00360340 98 03 00 03 */ stb r0, 3(r3) /* 803633E4 00360344 38 21 00 10 */ addi r1, r1, 0x10 -/* 803633E8 00360348 4E 80 00 20 */ blr +/* 803633E8 00360348 4E 80 00 20 */ blr .global __ct__6CColorFffff __ct__6CColorFffff: @@ -301,7 +301,7 @@ __ct__6CColorFffff: /* 8036343C 0036039C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80363440 003603A0 98 03 00 03 */ stb r0, 3(r3) /* 80363444 003603A4 38 21 00 30 */ addi r1, r1, 0x30 -/* 80363448 003603A8 4E 80 00 20 */ blr +/* 80363448 003603A8 4E 80 00 20 */ blr .global __ct__6CColorFR12CInputStream __ct__6CColorFR12CInputStream: diff --git a/asm/Kyoto/Graphics/DolphinCGraphics.s b/asm/Kyoto/Graphics/DolphinCGraphics.s index b49f63e3..e187e24c 100644 --- a/asm/Kyoto/Graphics/DolphinCGraphics.s +++ b/asm/Kyoto/Graphics/DolphinCGraphics.s @@ -248,7 +248,7 @@ lbl_805A941C: .global lbl_805A9420 lbl_805A9420: .skip 0x8 - + .section .text, "ax" .global sub_80309254 @@ -293,7 +293,7 @@ sub_80309254: /* 803092E8 00306248 90 03 00 44 */ stw r0, 0x44(r3) /* 803092EC 0030624C 80 07 00 10 */ lwz r0, 0x10(r7) /* 803092F0 00306250 90 03 00 48 */ stw r0, 0x48(r3) -/* 803092F4 00306254 4E 80 00 20 */ blr +/* 803092F4 00306254 4E 80 00 20 */ blr .global ResetFlushAll__Q29CGraphics12CRenderStateFv ResetFlushAll__Q29CGraphics12CRenderStateFv: @@ -325,7 +325,7 @@ lbl_8030932C: /* 80309358 003062B8 83 C1 00 08 */ lwz r30, 8(r1) /* 8030935C 003062BC 7C 08 03 A6 */ mtlr r0 /* 80309360 003062C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80309364 003062C4 4E 80 00 20 */ blr +/* 80309364 003062C4 4E 80 00 20 */ blr .global SetVtxState__Q29CGraphics12CRenderStateFPCfPCfPCUi SetVtxState__Q29CGraphics12CRenderStateFPCfPCfPCUi: @@ -361,18 +361,18 @@ lbl_803093CC: /* 803093D4 00306334 83 C1 00 08 */ lwz r30, 8(r1) /* 803093D8 00306338 7C 08 03 A6 */ mtlr r0 /* 803093DC 0030633C 38 21 00 10 */ addi r1, r1, 0x10 -/* 803093E0 00306340 4E 80 00 20 */ blr +/* 803093E0 00306340 4E 80 00 20 */ blr .global Flush__Q29CGraphics12CRenderStateFv Flush__Q29CGraphics12CRenderStateFv: -/* 803093E4 00306344 4E 80 00 20 */ blr +/* 803093E4 00306344 4E 80 00 20 */ blr .global __ct__Q29CGraphics12CRenderStateFv __ct__Q29CGraphics12CRenderStateFv: /* 803093E8 00306348 38 00 00 00 */ li r0, 0 /* 803093EC 0030634C 90 03 00 00 */ stw r0, 0(r3) /* 803093F0 00306350 90 03 00 04 */ stw r0, 4(r3) -/* 803093F4 00306354 4E 80 00 20 */ blr +/* 803093F4 00306354 4E 80 00 20 */ blr .global __dt__12CGraphicsSysFv __dt__12CGraphicsSysFv: @@ -402,7 +402,7 @@ lbl_80309440: /* 8030944C 003063AC 83 C1 00 08 */ lwz r30, 8(r1) /* 80309450 003063B0 7C 08 03 A6 */ mtlr r0 /* 80309454 003063B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80309458 003063B8 4E 80 00 20 */ blr +/* 80309458 003063B8 4E 80 00 20 */ blr .global __ct__12CGraphicsSysFRC10COsContextRC10CMemorySysUiPv __ct__12CGraphicsSysFRC10COsContextRC10CMemorySysUiPv: @@ -425,12 +425,12 @@ lbl_80309490: /* 80309498 003063F8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8030949C 003063FC 7C 08 03 A6 */ mtlr r0 /* 803094A0 00306400 38 21 00 10 */ addi r1, r1, 0x10 -/* 803094A4 00306404 4E 80 00 20 */ blr +/* 803094A4 00306404 4E 80 00 20 */ blr .global SetIsBeginSceneClearFb__9CGraphicsFb SetIsBeginSceneClearFb__9CGraphicsFb: /* 803094A8 00306408 98 6D 9C 6C */ stb r3, lbl_805A882C@sda21(r13) -/* 803094AC 0030640C 4E 80 00 20 */ blr +/* 803094AC 0030640C 4E 80 00 20 */ blr .global sub_803094b0 sub_803094b0: @@ -480,7 +480,7 @@ lbl_80309548: /* 80309554 003064B4 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80309558 003064B8 7C 08 03 A6 */ mtlr r0 /* 8030955C 003064BC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80309560 003064C0 4E 80 00 20 */ blr +/* 80309560 003064C0 4E 80 00 20 */ blr .global sub_80309564 sub_80309564: @@ -495,10 +495,10 @@ lbl_80309574: /* 80309580 003064E0 90 04 00 00 */ stw r0, 0(r4) lbl_80309584: /* 80309584 003064E4 28 05 00 00 */ cmplwi r5, 0 -/* 80309588 003064E8 4D 82 00 20 */ beqlr +/* 80309588 003064E8 4D 82 00 20 */ beqlr /* 8030958C 003064EC 80 0D A8 50 */ lwz r0, lbl_805A9410@sda21(r13) /* 80309590 003064F0 90 05 00 00 */ stw r0, 0(r5) -/* 80309594 003064F4 4E 80 00 20 */ blr +/* 80309594 003064F4 4E 80 00 20 */ blr .global GetProgressiveDefault__9CGraphicsFv GetProgressiveDefault__9CGraphicsFv: @@ -512,7 +512,7 @@ GetProgressiveDefault__9CGraphicsFv: /* 803095B4 00306514 80 01 00 14 */ lwz r0, 0x14(r1) /* 803095B8 00306518 7C 08 03 A6 */ mtlr r0 /* 803095BC 0030651C 38 21 00 10 */ addi r1, r1, 0x10 -/* 803095C0 00306520 4E 80 00 20 */ blr +/* 803095C0 00306520 4E 80 00 20 */ blr .global CanSetProgressiveMode__9CGraphicsFv CanSetProgressiveMode__9CGraphicsFv: @@ -526,7 +526,7 @@ CanSetProgressiveMode__9CGraphicsFv: /* 803095E0 00306540 80 01 00 14 */ lwz r0, 0x14(r1) /* 803095E4 00306544 7C 08 03 A6 */ mtlr r0 /* 803095E8 00306548 38 21 00 10 */ addi r1, r1, 0x10 -/* 803095EC 0030654C 4E 80 00 20 */ blr +/* 803095EC 0030654C 4E 80 00 20 */ blr .global GetProgressiveMode__9CGraphicsFv GetProgressiveMode__9CGraphicsFv: @@ -535,7 +535,7 @@ GetProgressiveMode__9CGraphicsFv: /* 803095F8 00306558 20 00 00 02 */ subfic r0, r0, 2 /* 803095FC 0030655C 7C 00 00 34 */ cntlzw r0, r0 /* 80309600 00306560 54 03 D9 7E */ srwi r3, r0, 5 -/* 80309604 00306564 4E 80 00 20 */ blr +/* 80309604 00306564 4E 80 00 20 */ blr .global SetProgressiveMode__9CGraphicsFb SetProgressiveMode__9CGraphicsFb: @@ -633,7 +633,7 @@ lbl_80309754: /* 8030975C 003066BC 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80309760 003066C0 7C 08 03 A6 */ mtlr r0 /* 80309764 003066C4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80309768 003066C8 4E 80 00 20 */ blr +/* 80309768 003066C8 4E 80 00 20 */ blr .global ProjectPoint__9CGraphicsFRC9CVector3f ProjectPoint__9CGraphicsFRC9CVector3f: @@ -672,17 +672,17 @@ ProjectPoint__9CGraphicsFRC9CVector3f: /* 803097EC 0030674C 83 C1 00 68 */ lwz r30, 0x68(r1) /* 803097F0 00306750 7C 08 03 A6 */ mtlr r0 /* 803097F4 00306754 38 21 00 70 */ addi r1, r1, 0x70 -/* 803097F8 00306758 4E 80 00 20 */ blr +/* 803097F8 00306758 4E 80 00 20 */ blr .global GetFrameCounter__9CGraphicsFv GetFrameCounter__9CGraphicsFv: /* 803097FC 0030675C 80 6D A8 00 */ lwz r3, lbl_805A93C0@sda21(r13) -/* 80309800 00306760 4E 80 00 20 */ blr +/* 80309800 00306760 4E 80 00 20 */ blr .global GetUseVideoFilter__9CGraphicsFv GetUseVideoFilter__9CGraphicsFv: /* 80309804 00306764 88 6D 9C 82 */ lbz r3, lbl_805A8842@sda21(r13) -/* 80309808 00306768 4E 80 00 20 */ blr +/* 80309808 00306768 4E 80 00 20 */ blr .global SetUseVideoFilter__9CGraphicsFb SetUseVideoFilter__9CGraphicsFb: @@ -703,7 +703,7 @@ SetUseVideoFilter__9CGraphicsFb: /* 80309844 003067A4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80309848 003067A8 7C 08 03 A6 */ mtlr r0 /* 8030984C 003067AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80309850 003067B0 4E 80 00 20 */ blr +/* 80309850 003067B0 4E 80 00 20 */ blr .global GetFPS__9CGraphicsFv GetFPS__9CGraphicsFv: @@ -730,7 +730,7 @@ lbl_80309888: /* 8030989C 003067FC CB E1 00 10 */ lfd f31, 0x10(r1) /* 803098A0 00306800 7C 08 03 A6 */ mtlr r0 /* 803098A4 00306804 38 21 00 20 */ addi r1, r1, 0x20 -/* 803098A8 00306808 4E 80 00 20 */ blr +/* 803098A8 00306808 4E 80 00 20 */ blr .global ClipScreenRectFromMS__9CGraphicsFRC9CVector3fRC9CVector3f12ETexelFormat ClipScreenRectFromMS__9CGraphicsFRC9CVector3fRC9CVector3f12ETexelFormat: @@ -801,7 +801,7 @@ ClipScreenRectFromMS__9CGraphicsFRC9CVector3fRC9CVector3f12ETexelFormat: /* 803099AC 0030690C 83 81 00 50 */ lwz r28, 0x50(r1) /* 803099B0 00306910 7C 08 03 A6 */ mtlr r0 /* 803099B4 00306914 38 21 00 60 */ addi r1, r1, 0x60 -/* 803099B8 00306918 4E 80 00 20 */ blr +/* 803099B8 00306918 4E 80 00 20 */ blr .global ClipScreenRectFromVS__9CGraphicsFRC9CVector3fRC9CVector3f12ETexelFormat ClipScreenRectFromVS__9CGraphicsFRC9CVector3fRC9CVector3f12ETexelFormat: @@ -1104,7 +1104,7 @@ lbl_80309DE0: /* 80309DF0 00306D50 83 81 00 60 */ lwz r28, 0x60(r1) /* 80309DF4 00306D54 7C 08 03 A6 */ mtlr r0 /* 80309DF8 00306D58 38 21 00 70 */ addi r1, r1, 0x70 -/* 80309DFC 00306D5C 4E 80 00 20 */ blr +/* 80309DFC 00306D5C 4E 80 00 20 */ blr .global SetProjectionState__9CGraphicsFRCQ29CGraphics16CProjectionState SetProjectionState__9CGraphicsFRCQ29CGraphics16CProjectionState: @@ -1130,13 +1130,13 @@ SetProjectionState__9CGraphicsFRCQ29CGraphics16CProjectionState: /* 80309E4C 00306DAC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80309E50 00306DB0 7C 08 03 A6 */ mtlr r0 /* 80309E54 00306DB4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80309E58 00306DB8 4E 80 00 20 */ blr +/* 80309E58 00306DB8 4E 80 00 20 */ blr .global GetProjectionState__9CGraphicsFv GetProjectionState__9CGraphicsFv: /* 80309E5C 00306DBC 3C 60 80 5A */ lis r3, lbl_805A61B8@ha /* 80309E60 00306DC0 38 63 61 B8 */ addi r3, r3, lbl_805A61B8@l -/* 80309E64 00306DC4 4E 80 00 20 */ blr +/* 80309E64 00306DC4 4E 80 00 20 */ blr .global FlushProjection__9CGraphicsFv FlushProjection__9CGraphicsFv: @@ -1169,12 +1169,12 @@ lbl_80309EC8: /* 80309EC8 00306E28 80 01 00 94 */ lwz r0, 0x94(r1) /* 80309ECC 00306E2C 7C 08 03 A6 */ mtlr r0 /* 80309ED0 00306E30 38 21 00 90 */ addi r1, r1, 0x90 -/* 80309ED4 00306E34 4E 80 00 20 */ blr +/* 80309ED4 00306E34 4E 80 00 20 */ blr .global SetExternalTimeProvider__9CGraphicsFP13CTimeProvider SetExternalTimeProvider__9CGraphicsFP13CTimeProvider: /* 80309ED8 00306E38 90 6D A8 44 */ stw r3, lbl_805A9404@sda21(r13) -/* 80309EDC 00306E3C 4E 80 00 20 */ blr +/* 80309EDC 00306E3C 4E 80 00 20 */ blr .global GetSecondsMod900__9CGraphicsFv GetSecondsMod900__9CGraphicsFv: @@ -1183,10 +1183,10 @@ GetSecondsMod900__9CGraphicsFv: /* 80309EE8 00306E48 41 82 00 10 */ beq lbl_80309EF8 /* 80309EEC 00306E4C 80 63 00 00 */ lwz r3, 0(r3) /* 80309EF0 00306E50 C0 23 00 00 */ lfs f1, 0(r3) -/* 80309EF4 00306E54 4E 80 00 20 */ blr +/* 80309EF4 00306E54 4E 80 00 20 */ blr lbl_80309EF8: /* 80309EF8 00306E58 C0 2D A8 40 */ lfs f1, lbl_805A9400@sda21(r13) -/* 80309EFC 00306E5C 4E 80 00 20 */ blr +/* 80309EFC 00306E5C 4E 80 00 20 */ blr .global TickRenderTimings__9CGraphicsFv TickRenderTimings__9CGraphicsFv: @@ -1215,7 +1215,7 @@ TickRenderTimings__9CGraphicsFv: /* 80309F58 00306EB8 EC 01 00 24 */ fdivs f0, f1, f0 /* 80309F5C 00306EBC D0 0D A8 40 */ stfs f0, lbl_805A9400@sda21(r13) /* 80309F60 00306EC0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80309F64 00306EC4 4E 80 00 20 */ blr +/* 80309F64 00306EC4 4E 80 00 20 */ blr .global LoadDolphinSpareTexture__9CGraphicsFii11_GXCITexFmt7_GXTlutPv11_GXTexMapID LoadDolphinSpareTexture__9CGraphicsFii11_GXCITexFmt7_GXTlutPv11_GXTexMapID: @@ -1267,7 +1267,7 @@ lbl_8030A00C: /* 8030A010 00306F70 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 8030A014 00306F74 7C 08 03 A6 */ mtlr r0 /* 8030A018 00306F78 38 21 00 40 */ addi r1, r1, 0x40 -/* 8030A01C 00306F7C 4E 80 00 20 */ blr +/* 8030A01C 00306F7C 4E 80 00 20 */ blr .global LoadDolphinSpareTexture__9CGraphicsFii9_GXTexFmtPv11_GXTexMapID LoadDolphinSpareTexture__9CGraphicsFii9_GXTexFmtPv11_GXTexMapID: @@ -1318,7 +1318,7 @@ lbl_8030A0C0: /* 8030A0C4 00307024 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8030A0C8 00307028 7C 08 03 A6 */ mtlr r0 /* 8030A0CC 0030702C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8030A0D0 00307030 4E 80 00 20 */ blr +/* 8030A0D0 00307030 4E 80 00 20 */ blr .global SetDefaultVtxAttrFmt__9CGraphicsFv SetDefaultVtxAttrFmt__9CGraphicsFv: @@ -1428,13 +1428,13 @@ lbl_8030A20C: /* 8030A26C 003071CC 83 C1 00 08 */ lwz r30, 8(r1) /* 8030A270 003071D0 7C 08 03 A6 */ mtlr r0 /* 8030A274 003071D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030A278 003071D8 4E 80 00 20 */ blr +/* 8030A278 003071D8 4E 80 00 20 */ blr .global ResetGfxStates__9CGraphicsFv ResetGfxStates__9CGraphicsFv: /* 8030A27C 003071DC 38 00 00 00 */ li r0, 0 /* 8030A280 003071E0 90 0D A7 B8 */ stw r0, lbl_805A9378@sda21(r13) -/* 8030A284 003071E4 4E 80 00 20 */ blr +/* 8030A284 003071E4 4E 80 00 20 */ blr .global SetFog__9CGraphicsF11ERglFogModeffRC6CColor SetFog__9CGraphicsF11ERglFogModeffRC6CColor: @@ -1449,7 +1449,7 @@ SetFog__9CGraphicsF11ERglFogModeffRC6CColor: /* 8030A2A8 00307208 80 01 00 14 */ lwz r0, 0x14(r1) /* 8030A2AC 0030720C 7C 08 03 A6 */ mtlr r0 /* 8030A2B0 00307210 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030A2B4 00307214 4E 80 00 20 */ blr +/* 8030A2B4 00307214 4E 80 00 20 */ blr .global SetTevOp__9CGraphicsF12ERglTevStageRCQ213CTevCombiners8CTevPass SetTevOp__9CGraphicsF12ERglTevStageRCQ213CTevCombiners8CTevPass: @@ -1542,7 +1542,7 @@ lbl_8030A3CC: /* 8030A3D0 00307330 80 01 00 14 */ lwz r0, 0x14(r1) /* 8030A3D4 00307334 7C 08 03 A6 */ mtlr r0 /* 8030A3D8 00307338 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030A3DC 0030733C 4E 80 00 20 */ blr +/* 8030A3DC 0030733C 4E 80 00 20 */ blr .global SetDepthRange__9CGraphicsFff SetDepthRange__9CGraphicsFff: @@ -1585,7 +1585,7 @@ SetDepthRange__9CGraphicsFff: /* 8030A470 003073D0 80 01 00 34 */ lwz r0, 0x34(r1) /* 8030A474 003073D4 7C 08 03 A6 */ mtlr r0 /* 8030A478 003073D8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8030A47C 003073DC 4E 80 00 20 */ blr +/* 8030A47C 003073DC 4E 80 00 20 */ blr .global FullRender__9CGraphicsFv FullRender__9CGraphicsFv: @@ -1607,7 +1607,7 @@ FullRender__9CGraphicsFv: /* 8030A4BC 0030741C 38 63 D9 48 */ addi r3, r3, lbl_803ED948@l /* 8030A4C0 00307420 7C 03 00 2E */ lwzx r0, r3, r0 /* 8030A4C4 00307424 7C 09 03 A6 */ mtctr r0 -/* 8030A4C8 00307428 4E 80 04 20 */ bctr +/* 8030A4C8 00307428 4E 80 04 20 */ bctr .global lbl_8030A4CC lbl_8030A4CC: /* 8030A4CC 0030742C 80 CD A7 FC */ lwz r6, lbl_805A93BC@sda21(r13) @@ -2289,7 +2289,7 @@ lbl_8030AEBC: /* 8030AEC0 00307E20 80 01 00 14 */ lwz r0, 0x14(r1) /* 8030AEC4 00307E24 7C 08 03 A6 */ mtlr r0 /* 8030AEC8 00307E28 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030AECC 00307E2C 4E 80 00 20 */ blr +/* 8030AECC 00307E2C 4E 80 00 20 */ blr .global SetTevStates__9CGraphicsFUc SetTevStates__9CGraphicsFUc: @@ -2389,7 +2389,7 @@ lbl_8030B004: /* 8030B024 00307F84 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8030B028 00307F88 7C 08 03 A6 */ mtlr r0 /* 8030B02C 00307F8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030B030 00307F90 4E 80 00 20 */ blr +/* 8030B030 00307F90 4E 80 00 20 */ blr .global FlushStream__9CGraphicsFv FlushStream__9CGraphicsFv: @@ -2454,7 +2454,7 @@ lbl_8030B0E0: /* 8030B110 00308070 83 E1 00 8C */ lwz r31, 0x8c(r1) /* 8030B114 00308074 7C 08 03 A6 */ mtlr r0 /* 8030B118 00308078 38 21 00 90 */ addi r1, r1, 0x90 -/* 8030B11C 0030807C 4E 80 00 20 */ blr +/* 8030B11C 0030807C 4E 80 00 20 */ blr .global ResetVertexDataStream__9CGraphicsFb ResetVertexDataStream__9CGraphicsFb: @@ -2556,7 +2556,7 @@ lbl_8030B280: /* 8030B284 003081E4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8030B288 003081E8 7C 08 03 A6 */ mtlr r0 /* 8030B28C 003081EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030B290 003081F0 4E 80 00 20 */ blr +/* 8030B290 003081F0 4E 80 00 20 */ blr .global UpdateVertexDataStream__9CGraphicsFv UpdateVertexDataStream__9CGraphicsFv: @@ -2644,7 +2644,7 @@ lbl_8030B3C8: /* 8030B3C8 00308328 80 01 00 14 */ lwz r0, 0x14(r1) /* 8030B3CC 0030832C 7C 08 03 A6 */ mtlr r0 /* 8030B3D0 00308330 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030B3D4 00308334 4E 80 00 20 */ blr +/* 8030B3D4 00308334 4E 80 00 20 */ blr .global SetLineWidth__9CGraphicsFf13ERglTexOffset SetLineWidth__9CGraphicsFf13ERglTexOffset: @@ -2661,7 +2661,7 @@ SetLineWidth__9CGraphicsFf13ERglTexOffset: /* 8030B400 00308360 80 01 00 14 */ lwz r0, 0x14(r1) /* 8030B404 00308364 7C 08 03 A6 */ mtlr r0 /* 8030B408 00308368 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030B40C 0030836C 4E 80 00 20 */ blr +/* 8030B40C 0030836C 4E 80 00 20 */ blr .global StreamEnd__9CGraphicsFv StreamEnd__9CGraphicsFv: @@ -2686,7 +2686,7 @@ lbl_8030B42C: /* 8030B454 003083B4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8030B458 003083B8 7C 08 03 A6 */ mtlr r0 /* 8030B45C 003083BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030B460 003083C0 4E 80 00 20 */ blr +/* 8030B460 003083C0 4E 80 00 20 */ blr .global StreamTexcoord__9CGraphicsFff StreamTexcoord__9CGraphicsFff: @@ -2701,7 +2701,7 @@ StreamTexcoord__9CGraphicsFff: /* 8030B484 003083E4 D0 45 00 1C */ stfs f2, 0x1c(r5) /* 8030B488 003083E8 98 65 00 2E */ stb r3, 0x2e(r5) /* 8030B48C 003083EC B0 05 00 2C */ sth r0, 0x2c(r5) -/* 8030B490 003083F0 4E 80 00 20 */ blr +/* 8030B490 003083F0 4E 80 00 20 */ blr .global StreamTexcoord__9CGraphicsFRC9CVector2f StreamTexcoord__9CGraphicsFRC9CVector2f: @@ -2718,7 +2718,7 @@ StreamTexcoord__9CGraphicsFRC9CVector2f: /* 8030B4BC 0030841C D0 06 00 1C */ stfs f0, 0x1c(r6) /* 8030B4C0 00308420 98 66 00 2E */ stb r3, 0x2e(r6) /* 8030B4C4 00308424 B0 06 00 2C */ sth r0, 0x2c(r6) -/* 8030B4C8 00308428 4E 80 00 20 */ blr +/* 8030B4C8 00308428 4E 80 00 20 */ blr .global StreamColor__9CGraphicsFffff StreamColor__9CGraphicsFffff: @@ -2752,7 +2752,7 @@ StreamColor__9CGraphicsFffff: /* 8030B538 00308498 50 60 06 3E */ rlwimi r0, r3, 0, 0x18, 0x1f /* 8030B53C 0030849C 90 04 00 28 */ stw r0, 0x28(r4) /* 8030B540 003084A0 38 21 00 30 */ addi r1, r1, 0x30 -/* 8030B544 003084A4 4E 80 00 20 */ blr +/* 8030B544 003084A4 4E 80 00 20 */ blr .global StreamColor__9CGraphicsFRC6CColor StreamColor__9CGraphicsFRC6CColor: @@ -2764,7 +2764,7 @@ StreamColor__9CGraphicsFRC6CColor: /* 8030B55C 003084BC 90 A4 00 28 */ stw r5, 0x28(r4) /* 8030B560 003084C0 7C 60 03 78 */ or r0, r3, r0 /* 8030B564 003084C4 98 04 00 2E */ stb r0, 0x2e(r4) -/* 8030B568 003084C8 4E 80 00 20 */ blr +/* 8030B568 003084C8 4E 80 00 20 */ blr .global StreamColor__9CGraphicsFUi StreamColor__9CGraphicsFUi: @@ -2775,7 +2775,7 @@ StreamColor__9CGraphicsFUi: /* 8030B57C 003084DC 90 65 00 28 */ stw r3, 0x28(r5) /* 8030B580 003084E0 7C 80 03 78 */ or r0, r4, r0 /* 8030B584 003084E4 98 05 00 2E */ stb r0, 0x2e(r5) -/* 8030B588 003084E8 4E 80 00 20 */ blr +/* 8030B588 003084E8 4E 80 00 20 */ blr .global StreamNormal__9CGraphicsFPCf StreamNormal__9CGraphicsFPCf: @@ -2791,7 +2791,7 @@ StreamNormal__9CGraphicsFPCf: /* 8030B5B0 00308510 D0 25 00 10 */ stfs f1, 0x10(r5) /* 8030B5B4 00308514 D0 05 00 14 */ stfs f0, 0x14(r5) /* 8030B5B8 00308518 98 05 00 2E */ stb r0, 0x2e(r5) -/* 8030B5BC 0030851C 4E 80 00 20 */ blr +/* 8030B5BC 0030851C 4E 80 00 20 */ blr .global StreamVertex__9CGraphicsFRC9CVector3f StreamVertex__9CGraphicsFRC9CVector3f: @@ -2809,7 +2809,7 @@ StreamVertex__9CGraphicsFRC9CVector3f: /* 8030B5EC 0030854C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8030B5F0 00308550 7C 08 03 A6 */ mtlr r0 /* 8030B5F4 00308554 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030B5F8 00308558 4E 80 00 20 */ blr +/* 8030B5F8 00308558 4E 80 00 20 */ blr .global StreamVertex__9CGraphicsFPCf StreamVertex__9CGraphicsFPCf: @@ -2827,7 +2827,7 @@ StreamVertex__9CGraphicsFPCf: /* 8030B628 00308588 80 01 00 14 */ lwz r0, 0x14(r1) /* 8030B62C 0030858C 7C 08 03 A6 */ mtlr r0 /* 8030B630 00308590 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030B634 00308594 4E 80 00 20 */ blr +/* 8030B634 00308594 4E 80 00 20 */ blr .global StreamVertex__9CGraphicsFfff StreamVertex__9CGraphicsFfff: @@ -2842,7 +2842,7 @@ StreamVertex__9CGraphicsFfff: /* 8030B658 003085B8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8030B65C 003085BC 7C 08 03 A6 */ mtlr r0 /* 8030B660 003085C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030B664 003085C4 4E 80 00 20 */ blr +/* 8030B664 003085C4 4E 80 00 20 */ blr .global StreamBegin__9CGraphicsF13ERglPrimitive StreamBegin__9CGraphicsF13ERglPrimitive: @@ -2872,7 +2872,7 @@ StreamBegin__9CGraphicsF13ERglPrimitive: /* 8030B6C4 00308624 80 01 00 14 */ lwz r0, 0x14(r1) /* 8030B6C8 00308628 7C 08 03 A6 */ mtlr r0 /* 8030B6CC 0030862C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030B6D0 00308630 4E 80 00 20 */ blr +/* 8030B6D0 00308630 4E 80 00 20 */ blr .global DrawPrimitive__9CGraphicsF13ERglPrimitivePCfRC9CVector3fRC6CColori DrawPrimitive__9CGraphicsF13ERglPrimitivePCfRC9CVector3fRC6CColori: @@ -2911,7 +2911,7 @@ lbl_8030B730: /* 8030B74C 003086AC 83 81 00 10 */ lwz r28, 0x10(r1) /* 8030B750 003086B0 7C 08 03 A6 */ mtlr r0 /* 8030B754 003086B4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8030B758 003086B8 4E 80 00 20 */ blr +/* 8030B758 003086B8 4E 80 00 20 */ blr .global Render2D__9CGraphicsFRC8CTextureiiiiRC6CColor Render2D__9CGraphicsFRC8CTextureiiiiRC6CColor: @@ -3095,7 +3095,7 @@ lbl_8030B9D4: /* 8030BA18 00308978 80 01 01 24 */ lwz r0, 0x124(r1) /* 8030BA1C 0030897C 7C 08 03 A6 */ mtlr r0 /* 8030BA20 00308980 38 21 01 20 */ addi r1, r1, 0x120 -/* 8030BA24 00308984 4E 80 00 20 */ blr +/* 8030BA24 00308984 4E 80 00 20 */ blr .global SetAlphaCompare__9CGraphicsF13ERglAlphaFuncUc11ERglAlphaOp13ERglAlphaFuncUc SetAlphaCompare__9CGraphicsF13ERglAlphaFuncUc11ERglAlphaOp13ERglAlphaFuncUc: @@ -3108,7 +3108,7 @@ SetAlphaCompare__9CGraphicsF13ERglAlphaFuncUc11ERglAlphaOp13ERglAlphaFuncUc: /* 8030BA40 003089A0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8030BA44 003089A4 7C 08 03 A6 */ mtlr r0 /* 8030BA48 003089A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030BA4C 003089AC 4E 80 00 20 */ blr +/* 8030BA4C 003089AC 4E 80 00 20 */ blr .global SetBlendMode__9CGraphicsF13ERglBlendMode15ERglBlendFactor15ERglBlendFactor11ERglLogicOp SetBlendMode__9CGraphicsF13ERglBlendMode15ERglBlendFactor15ERglBlendFactor11ERglLogicOp: @@ -3119,7 +3119,7 @@ SetBlendMode__9CGraphicsF13ERglBlendMode15ERglBlendFactor15ERglBlendFactor11ERgl /* 8030BA60 003089C0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8030BA64 003089C4 7C 08 03 A6 */ mtlr r0 /* 8030BA68 003089C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030BA6C 003089CC 4E 80 00 20 */ blr +/* 8030BA6C 003089CC 4E 80 00 20 */ blr .global SetCullMode__9CGraphicsF12ERglCullMode SetCullMode__9CGraphicsF12ERglCullMode: @@ -3131,7 +3131,7 @@ SetCullMode__9CGraphicsF12ERglCullMode: /* 8030BA84 003089E4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8030BA88 003089E8 7C 08 03 A6 */ mtlr r0 /* 8030BA8C 003089EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030BA90 003089F0 4E 80 00 20 */ blr +/* 8030BA90 003089F0 4E 80 00 20 */ blr .global SetDepthWriteMode__9CGraphicsFb8ERglEnumb SetDepthWriteMode__9CGraphicsFb8ERglEnumb: @@ -3145,7 +3145,7 @@ SetDepthWriteMode__9CGraphicsFb8ERglEnumb: /* 8030BAB0 00308A10 80 01 00 14 */ lwz r0, 0x14(r1) /* 8030BAB4 00308A14 7C 08 03 A6 */ mtlr r0 /* 8030BAB8 00308A18 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030BABC 00308A1C 4E 80 00 20 */ blr +/* 8030BABC 00308A1C 4E 80 00 20 */ blr .global EndScene__9CGraphicsFv EndScene__9CGraphicsFv: @@ -3308,7 +3308,7 @@ lbl_8030BB40: /* 8030BD24 00308C84 83 A1 00 94 */ lwz r29, 0x94(r1) /* 8030BD28 00308C88 7C 08 03 A6 */ mtlr r0 /* 8030BD2C 00308C8C 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8030BD30 00308C90 4E 80 00 20 */ blr +/* 8030BD30 00308C90 4E 80 00 20 */ blr .global VideoPostCallback__9CGraphicsFUl VideoPostCallback__9CGraphicsFUl: @@ -3364,7 +3364,7 @@ lbl_8030BDEC: /* 8030BDF0 00308D50 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8030BDF4 00308D54 7C 08 03 A6 */ mtlr r0 /* 8030BDF8 00308D58 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030BDFC 00308D5C 4E 80 00 20 */ blr +/* 8030BDFC 00308D5C 4E 80 00 20 */ blr .global VideoPreCallback__9CGraphicsFUl VideoPreCallback__9CGraphicsFUl: @@ -3401,7 +3401,7 @@ lbl_8030BE6C: /* 8030BE6C 00308DCC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8030BE70 00308DD0 7C 08 03 A6 */ mtlr r0 /* 8030BE74 00308DD4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030BE78 00308DD8 4E 80 00 20 */ blr +/* 8030BE78 00308DD8 4E 80 00 20 */ blr .global SwapBuffers__9CGraphicsFv SwapBuffers__9CGraphicsFv: @@ -3414,7 +3414,7 @@ SwapBuffers__9CGraphicsFv: /* 8030BE94 00308DF4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8030BE98 00308DF8 7C 08 03 A6 */ mtlr r0 /* 8030BE9C 00308DFC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030BEA0 00308E00 4E 80 00 20 */ blr +/* 8030BEA0 00308E00 4E 80 00 20 */ blr .global BeginScene__9CGraphicsFv BeginScene__9CGraphicsFv: @@ -3425,7 +3425,7 @@ BeginScene__9CGraphicsFv: /* 8030BEB4 00308E14 80 01 00 14 */ lwz r0, 0x14(r1) /* 8030BEB8 00308E18 7C 08 03 A6 */ mtlr r0 /* 8030BEBC 00308E1C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030BEC0 00308E20 4E 80 00 20 */ blr +/* 8030BEC0 00308E20 4E 80 00 20 */ blr .global ClearBackAndDepthBuffers__9CGraphicsFv ClearBackAndDepthBuffers__9CGraphicsFv: @@ -3482,7 +3482,7 @@ lbl_8030BF80: /* 8030BF84 00308EE4 80 01 00 24 */ lwz r0, 0x24(r1) /* 8030BF88 00308EE8 7C 08 03 A6 */ mtlr r0 /* 8030BF8C 00308EEC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8030BF90 00308EF0 4E 80 00 20 */ blr +/* 8030BF90 00308EF0 4E 80 00 20 */ blr .global SetClearColor__9CGraphicsFRC6CColor SetClearColor__9CGraphicsFRC6CColor: @@ -3498,7 +3498,7 @@ SetClearColor__9CGraphicsFRC6CColor: /* 8030BFB8 00308F18 80 01 00 14 */ lwz r0, 0x14(r1) /* 8030BFBC 00308F1C 7C 08 03 A6 */ mtlr r0 /* 8030BFC0 00308F20 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030BFC4 00308F24 4E 80 00 20 */ blr +/* 8030BFC4 00308F24 4E 80 00 20 */ blr .global SetCopyClear__9CGraphicsFRC6CColorf SetCopyClear__9CGraphicsFRC6CColorf: @@ -3522,7 +3522,7 @@ SetCopyClear__9CGraphicsFRC6CColorf: /* 8030C00C 00308F6C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8030C010 00308F70 7C 08 03 A6 */ mtlr r0 /* 8030C014 00308F74 38 21 00 20 */ addi r1, r1, 0x20 -/* 8030C018 00308F78 4E 80 00 20 */ blr +/* 8030C018 00308F78 4E 80 00 20 */ blr .global SetAmbientColor__9CGraphicsFRC6CColor SetAmbientColor__9CGraphicsFRC6CColor: @@ -3541,7 +3541,7 @@ SetAmbientColor__9CGraphicsFRC6CColor: /* 8030C04C 00308FAC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8030C050 00308FB0 7C 08 03 A6 */ mtlr r0 /* 8030C054 00308FB4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030C058 00308FB8 4E 80 00 20 */ blr +/* 8030C058 00308FB8 4E 80 00 20 */ blr .global SetScissor__9CGraphicsFiiii SetScissor__9CGraphicsFiiii: @@ -3557,7 +3557,7 @@ SetScissor__9CGraphicsFiiii: /* 8030C080 00308FE0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8030C084 00308FE4 7C 08 03 A6 */ mtlr r0 /* 8030C088 00308FE8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030C08C 00308FEC 4E 80 00 20 */ blr +/* 8030C08C 00308FEC 4E 80 00 20 */ blr .global SetViewport__9CGraphicsFiiii SetViewport__9CGraphicsFiiii: @@ -3622,7 +3622,7 @@ SetViewport__9CGraphicsFiiii: /* 8030C178 003090D8 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 8030C17C 003090DC 7C 08 03 A6 */ mtlr r0 /* 8030C180 003090E0 38 21 00 40 */ addi r1, r1, 0x40 -/* 8030C184 003090E4 4E 80 00 20 */ blr +/* 8030C184 003090E4 4E 80 00 20 */ blr .global CalculatePerspectiveMatrix__9CGraphicsFffff CalculatePerspectiveMatrix__9CGraphicsFffff: @@ -3731,7 +3731,7 @@ CalculatePerspectiveMatrix__9CGraphicsFffff: /* 8030C320 00309280 83 E1 00 6C */ lwz r31, 0x6c(r1) /* 8030C324 00309284 7C 08 03 A6 */ mtlr r0 /* 8030C328 00309288 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8030C32C 0030928C 4E 80 00 20 */ blr +/* 8030C32C 0030928C 4E 80 00 20 */ blr .global GetPerspectiveProjectionMatrix__9CGraphicsFv GetPerspectiveProjectionMatrix__9CGraphicsFv: @@ -3822,7 +3822,7 @@ GetPerspectiveProjectionMatrix__9CGraphicsFv: /* 8030C480 003093E0 83 E1 00 6C */ lwz r31, 0x6c(r1) /* 8030C484 003093E4 7C 08 03 A6 */ mtlr r0 /* 8030C488 003093E8 38 21 00 80 */ addi r1, r1, 0x80 -/* 8030C48C 003093EC 4E 80 00 20 */ blr +/* 8030C48C 003093EC 4E 80 00 20 */ blr .global SetPerspective__9CGraphicsFffff SetPerspective__9CGraphicsFffff: @@ -3874,7 +3874,7 @@ SetPerspective__9CGraphicsFffff: /* 8030C544 003094A4 CB A1 00 10 */ lfd f29, 0x10(r1) /* 8030C548 003094A8 7C 08 03 A6 */ mtlr r0 /* 8030C54C 003094AC 38 21 00 40 */ addi r1, r1, 0x40 -/* 8030C550 003094B0 4E 80 00 20 */ blr +/* 8030C550 003094B0 4E 80 00 20 */ blr .global SetOrtho__9CGraphicsFffffff SetOrtho__9CGraphicsFffffff: @@ -3894,7 +3894,7 @@ SetOrtho__9CGraphicsFffffff: /* 8030C588 003094E8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8030C58C 003094EC 7C 08 03 A6 */ mtlr r0 /* 8030C590 003094F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030C594 003094F4 4E 80 00 20 */ blr +/* 8030C594 003094F4 4E 80 00 20 */ blr .global SetIdentityModelMatrix__9CGraphicsFv SetIdentityModelMatrix__9CGraphicsFv: @@ -3916,7 +3916,7 @@ lbl_8030C5D0: /* 8030C5D0 00309530 80 01 00 14 */ lwz r0, 0x14(r1) /* 8030C5D4 00309534 7C 08 03 A6 */ mtlr r0 /* 8030C5D8 00309538 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030C5DC 0030953C 4E 80 00 20 */ blr +/* 8030C5DC 0030953C 4E 80 00 20 */ blr .global SetModelMatrix__9CGraphicsFRC12CTransform4f SetModelMatrix__9CGraphicsFRC12CTransform4f: @@ -3978,7 +3978,7 @@ lbl_8030C6B0: /* 8030C6B4 00309614 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8030C6B8 00309618 7C 08 03 A6 */ mtlr r0 /* 8030C6BC 0030961C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030C6C0 00309620 4E 80 00 20 */ blr +/* 8030C6C0 00309620 4E 80 00 20 */ blr .global SetIdentityViewPointMatrix__9CGraphicsFv SetIdentityViewPointMatrix__9CGraphicsFv: @@ -4015,7 +4015,7 @@ SetIdentityViewPointMatrix__9CGraphicsFv: /* 8030C73C 0030969C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8030C740 003096A0 7C 08 03 A6 */ mtlr r0 /* 8030C744 003096A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030C748 003096A8 4E 80 00 20 */ blr +/* 8030C748 003096A8 4E 80 00 20 */ blr .global SetViewPointMatrix__9CGraphicsFRC12CTransform4f SetViewPointMatrix__9CGraphicsFRC12CTransform4f: @@ -4066,7 +4066,7 @@ SetViewPointMatrix__9CGraphicsFRC12CTransform4f: /* 8030C7FC 0030975C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8030C800 00309760 7C 08 03 A6 */ mtlr r0 /* 8030C804 00309764 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030C808 00309768 4E 80 00 20 */ blr +/* 8030C808 00309768 4E 80 00 20 */ blr .global SetViewMatrix__9CGraphicsFv SetViewMatrix__9CGraphicsFv: @@ -4120,7 +4120,7 @@ lbl_8030C894: /* 8030C8C0 00309820 80 01 00 74 */ lwz r0, 0x74(r1) /* 8030C8C4 00309824 7C 08 03 A6 */ mtlr r0 /* 8030C8C8 00309828 38 21 00 70 */ addi r1, r1, 0x70 -/* 8030C8CC 0030982C 4E 80 00 20 */ blr +/* 8030C8CC 0030982C 4E 80 00 20 */ blr .global SetLightState__9CGraphicsFUc SetLightState__9CGraphicsFUc: @@ -4168,7 +4168,7 @@ lbl_8030C904: /* 8030C96C 003098CC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8030C970 003098D0 7C 08 03 A6 */ mtlr r0 /* 8030C974 003098D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030C978 003098D8 4E 80 00 20 */ blr +/* 8030C978 003098D8 4E 80 00 20 */ blr .global DisableAllLights__9CGraphicsFv DisableAllLights__9CGraphicsFv: @@ -4189,7 +4189,7 @@ DisableAllLights__9CGraphicsFv: /* 8030C9B4 00309914 80 01 00 14 */ lwz r0, 0x14(r1) /* 8030C9B8 00309918 7C 08 03 A6 */ mtlr r0 /* 8030C9BC 0030991C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030C9C0 00309920 4E 80 00 20 */ blr +/* 8030C9C0 00309920 4E 80 00 20 */ blr .global LoadLight__9CGraphicsF9ERglLightRC6CLight LoadLight__9CGraphicsF9ERglLightRC6CLight: @@ -4425,7 +4425,7 @@ lbl_8030CCCC: /* 8030CD20 00309C80 80 01 00 44 */ lwz r0, 0x44(r1) /* 8030CD24 00309C84 7C 08 03 A6 */ mtlr r0 /* 8030CD28 00309C88 38 21 00 40 */ addi r1, r1, 0x40 -/* 8030CD2C 00309C8C 4E 80 00 20 */ blr +/* 8030CD2C 00309C8C 4E 80 00 20 */ blr .global EnableLight__9CGraphicsF9ERglLight EnableLight__9CGraphicsF9ERglLight: @@ -4461,7 +4461,7 @@ lbl_8030CD94: /* 8030CDA0 00309D00 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8030CDA4 00309D04 7C 08 03 A6 */ mtlr r0 /* 8030CDA8 00309D08 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030CDAC 00309D0C 4E 80 00 20 */ blr +/* 8030CDAC 00309D0C 4E 80 00 20 */ blr .global ConfigureFrameBuffer__9CGraphicsFRC10COsContext ConfigureFrameBuffer__9CGraphicsFRC10COsContext: @@ -4603,7 +4603,7 @@ lbl_8030CF84: /* 8030CFC4 00309F24 80 01 00 64 */ lwz r0, 0x64(r1) /* 8030CFC8 00309F28 7C 08 03 A6 */ mtlr r0 /* 8030CFCC 00309F2C 38 21 00 60 */ addi r1, r1, 0x60 -/* 8030CFD0 00309F30 4E 80 00 20 */ blr +/* 8030CFD0 00309F30 4E 80 00 20 */ blr .global InitGraphicsDefaults__9CGraphicsFv InitGraphicsDefaults__9CGraphicsFv: @@ -4641,7 +4641,7 @@ InitGraphicsDefaults__9CGraphicsFv: /* 8030D050 00309FB0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8030D054 00309FB4 7C 08 03 A6 */ mtlr r0 /* 8030D058 00309FB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030D05C 00309FBC 4E 80 00 20 */ blr +/* 8030D05C 00309FBC 4E 80 00 20 */ blr .global Shutdown__9CGraphicsFv Shutdown__9CGraphicsFv: @@ -4653,7 +4653,7 @@ Shutdown__9CGraphicsFv: /* 8030D074 00309FD4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8030D078 00309FD8 7C 08 03 A6 */ mtlr r0 /* 8030D07C 00309FDC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030D080 00309FE0 4E 80 00 20 */ blr +/* 8030D080 00309FE0 4E 80 00 20 */ blr .global InitGraphicsVariables__9CGraphicsFv InitGraphicsVariables__9CGraphicsFv: @@ -4733,7 +4733,7 @@ InitGraphicsVariables__9CGraphicsFv: /* 8030D1A8 0030A108 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8030D1AC 0030A10C 7C 08 03 A6 */ mtlr r0 /* 8030D1B0 0030A110 38 21 00 30 */ addi r1, r1, 0x30 -/* 8030D1B4 0030A114 4E 80 00 20 */ blr +/* 8030D1B4 0030A114 4E 80 00 20 */ blr .global TexRegionCallback__9CGraphicsFP9_GXTexObj11_GXTexMapID TexRegionCallback__9CGraphicsFP9_GXTexObj11_GXTexMapID: @@ -4795,7 +4795,7 @@ lbl_8030D27C: /* 8030D27C 0030A1DC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8030D280 0030A1E0 7C 08 03 A6 */ mtlr r0 /* 8030D284 0030A1E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030D288 0030A1E8 4E 80 00 20 */ blr +/* 8030D288 0030A1E8 4E 80 00 20 */ blr .global Startup__9CGraphicsFRC10COsContextUiPv Startup__9CGraphicsFRC10COsContextUiPv: @@ -4898,7 +4898,7 @@ lbl_8030D38C: /* 8030D404 0030A364 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 8030D408 0030A368 7C 08 03 A6 */ mtlr r0 /* 8030D40C 0030A36C 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8030D410 0030A370 4E 80 00 20 */ blr +/* 8030D410 0030A370 4E 80 00 20 */ blr .global __sinit_DolphinCGraphics_cpp __sinit_DolphinCGraphics_cpp: diff --git a/asm/Kyoto/Graphics/DolphinCModel.s b/asm/Kyoto/Graphics/DolphinCModel.s index 4f54de03..2a2e9a8a 100644 --- a/asm/Kyoto/Graphics/DolphinCModel.s +++ b/asm/Kyoto/Graphics/DolphinCModel.s @@ -51,7 +51,7 @@ UpdateLastFrame__6CModelFv: /* 80355140 003520A0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80355144 003520A4 7C 08 03 A6 */ mtlr r0 /* 80355148 003520A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8035514C 003520AC 4E 80 00 20 */ blr +/* 8035514C 003520AC 4E 80 00 20 */ blr .global sub_80355150 sub_80355150: @@ -194,7 +194,7 @@ lbl_80355328: /* 80355340 003522A0 80 01 00 74 */ lwz r0, 0x74(r1) /* 80355344 003522A4 7C 08 03 A6 */ mtlr r0 /* 80355348 003522A8 38 21 00 70 */ addi r1, r1, 0x70 -/* 8035534C 003522AC 4E 80 00 20 */ blr +/* 8035534C 003522AC 4E 80 00 20 */ blr .global sub_80355350 sub_80355350: @@ -204,24 +204,24 @@ sub_80355350: /* 8035535C 003522BC 54 00 0F FE */ srwi r0, r0, 0x1f /* 80355360 003522C0 98 03 00 00 */ stb r0, 0(r3) /* 80355364 003522C4 90 83 00 04 */ stw r4, 4(r3) -/* 80355368 003522C8 4E 80 00 20 */ blr +/* 80355368 003522C8 4E 80 00 20 */ blr .global sub_8035536c sub_8035536c: /* 8035536C 003522CC 80 63 00 04 */ lwz r3, 4(r3) -/* 80355370 003522D0 4E 80 00 20 */ blr +/* 80355370 003522D0 4E 80 00 20 */ blr .global EnableTextureTimeout__6CModelFv EnableTextureTimeout__6CModelFv: /* 80355374 003522D4 38 00 00 01 */ li r0, 1 /* 80355378 003522D8 98 0D 9E 10 */ stb r0, lbl_805A89D0@sda21(r13) -/* 8035537C 003522DC 4E 80 00 20 */ blr +/* 8035537C 003522DC 4E 80 00 20 */ blr .global DisableTextureTimeout__6CModelFv DisableTextureTimeout__6CModelFv: /* 80355380 003522E0 38 00 00 00 */ li r0, 0 /* 80355384 003522E4 98 0D 9E 10 */ stb r0, lbl_805A89D0@sda21(r13) -/* 80355388 003522E8 4E 80 00 20 */ blr +/* 80355388 003522E8 4E 80 00 20 */ blr .global FrameDone__6CModelFv FrameDone__6CModelFv: @@ -282,7 +282,7 @@ lbl_80355440: /* 80355450 003523B0 83 81 00 10 */ lwz r28, 0x10(r1) /* 80355454 003523B4 7C 08 03 A6 */ mtlr r0 /* 80355458 003523B8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8035545C 003523BC 4E 80 00 20 */ blr +/* 8035545C 003523BC 4E 80 00 20 */ blr .global UnlockTextures__Q26CModel7SShaderFv UnlockTextures__Q26CModel7SShaderFv: @@ -314,7 +314,7 @@ lbl_80355498: /* 803554BC 0035241C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 803554C0 00352420 7C 08 03 A6 */ mtlr r0 /* 803554C4 00352424 38 21 00 20 */ addi r1, r1, 0x20 -/* 803554C8 00352428 4E 80 00 20 */ blr +/* 803554C8 00352428 4E 80 00 20 */ blr .global RemoveFromList__6CModelCFv RemoveFromList__6CModelCFv: @@ -354,7 +354,7 @@ lbl_8035553C: /* 8035553C 0035249C 38 00 00 00 */ li r0, 0 /* 80355540 003524A0 90 03 00 30 */ stw r0, 0x30(r3) /* 80355544 003524A4 90 03 00 34 */ stw r0, 0x34(r3) -/* 80355548 003524A8 4E 80 00 20 */ blr +/* 80355548 003524A8 4E 80 00 20 */ blr .global MoveToThisFrameList__6CModelCFv MoveToThisFrameList__6CModelCFv: @@ -382,7 +382,7 @@ lbl_80355594: /* 80355598 003524F8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8035559C 003524FC 7C 08 03 A6 */ mtlr r0 /* 803555A0 00352500 38 21 00 10 */ addi r1, r1, 0x10 -/* 803555A4 00352504 4E 80 00 20 */ blr +/* 803555A4 00352504 4E 80 00 20 */ blr .global IsLoaded__6CModelCFi IsLoaded__6CModelCFi: @@ -426,7 +426,7 @@ lbl_80355620: /* 80355624 00352584 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80355628 00352588 7C 08 03 A6 */ mtlr r0 /* 8035562C 0035258C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80355630 00352590 4E 80 00 20 */ blr +/* 80355630 00352590 4E 80 00 20 */ blr .global Touch__6CModelCFi Touch__6CModelCFi: @@ -469,19 +469,19 @@ lbl_803556AC: /* 803556B4 00352614 83 C1 00 08 */ lwz r30, 8(r1) /* 803556B8 00352618 7C 08 03 A6 */ mtlr r0 /* 803556BC 0035261C 38 21 00 10 */ addi r1, r1, 0x10 -/* 803556C0 00352620 4E 80 00 20 */ blr +/* 803556C0 00352620 4E 80 00 20 */ blr .global GetNormals__6CModelCFv GetNormals__6CModelCFv: /* 803556C4 00352624 80 63 00 28 */ lwz r3, 0x28(r3) /* 803556C8 00352628 80 63 00 0C */ lwz r3, 0xc(r3) -/* 803556CC 0035262C 4E 80 00 20 */ blr +/* 803556CC 0035262C 4E 80 00 20 */ blr .global GetPositions__6CModelCFv GetPositions__6CModelCFv: /* 803556D0 00352630 80 63 00 28 */ lwz r3, 0x28(r3) /* 803556D4 00352634 80 63 00 08 */ lwz r3, 8(r3) -/* 803556D8 00352638 4E 80 00 20 */ blr +/* 803556D8 00352638 4E 80 00 20 */ blr .global "FModelFactory__FRC10SObjectTagRCQ24rstl12auto_ptriRC15CVParamTransfer" "FModelFactory__FRC10SObjectTagRCQ24rstl12auto_ptriRC15CVParamTransfer": @@ -543,7 +543,7 @@ lbl_80355758: /* 803557B4 00352714 38 80 00 01 */ li r4, 1 /* 803557B8 00352718 81 8C 00 08 */ lwz r12, 8(r12) /* 803557BC 0035271C 7D 89 03 A6 */ mtctr r12 -/* 803557C0 00352720 4E 80 04 21 */ bctrl +/* 803557C0 00352720 4E 80 04 21 */ bctrl lbl_803557C4: /* 803557C4 00352724 88 01 00 0C */ lbz r0, 0xc(r1) /* 803557C8 00352728 28 00 00 00 */ cmplwi r0, 0 @@ -561,7 +561,7 @@ lbl_803557DC: /* 803557F4 00352754 83 81 00 20 */ lwz r28, 0x20(r1) /* 803557F8 00352758 7C 08 03 A6 */ mtlr r0 /* 803557FC 0035275C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80355800 00352760 4E 80 00 20 */ blr +/* 80355800 00352760 4E 80 00 20 */ blr .global "__dt__15TToken<6CModel>Fv" "__dt__15TToken<6CModel>Fv": @@ -603,7 +603,7 @@ lbl_80355878: /* 80355884 003527E4 83 C1 00 08 */ lwz r30, 8(r1) /* 80355888 003527E8 7C 08 03 A6 */ mtlr r0 /* 8035588C 003527EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80355890 003527F0 4E 80 00 20 */ blr +/* 80355890 003527F0 4E 80 00 20 */ blr .global "GetIObjObjectFor__15TToken<6CModel>FRCQ24rstl17auto_ptr<6CModel>" "GetIObjObjectFor__15TToken<6CModel>FRCQ24rstl17auto_ptr<6CModel>": @@ -617,7 +617,7 @@ lbl_80355878: /* 803558B0 00352810 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803558B4 00352814 7C 08 03 A6 */ mtlr r0 /* 803558B8 00352818 38 21 00 10 */ addi r1, r1, 0x10 -/* 803558BC 0035281C 4E 80 00 20 */ blr +/* 803558BC 0035281C 4E 80 00 20 */ blr .global "GetNewDerivedObject__33TObjOwnerDerivedFromIObj<6CModel>FRCQ24rstl17auto_ptr<6CModel>" "GetNewDerivedObject__33TObjOwnerDerivedFromIObj<6CModel>FRCQ24rstl17auto_ptr<6CModel>": @@ -660,7 +660,7 @@ lbl_80355930: /* 8035594C 003528AC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80355950 003528B0 7C 08 03 A6 */ mtlr r0 /* 80355954 003528B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80355958 003528B8 4E 80 00 20 */ blr +/* 80355958 003528B8 4E 80 00 20 */ blr .global VerifyCurrentShader__6CModelCFi VerifyCurrentShader__6CModelCFi: @@ -728,7 +728,7 @@ lbl_80355A28: /* 80355A38 00352998 83 81 00 10 */ lwz r28, 0x10(r1) /* 80355A3C 0035299C 7C 08 03 A6 */ mtlr r0 /* 80355A40 003529A0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80355A44 003529A4 4E 80 00 20 */ blr +/* 80355A44 003529A4 4E 80 00 20 */ blr .global Draw__6CModelCFPCfPCfRC11CModelFlags Draw__6CModelCFPCfPCfRC11CModelFlags: @@ -769,7 +769,7 @@ lbl_80355A8C: /* 80355ACC 00352A2C 83 81 00 10 */ lwz r28, 0x10(r1) /* 80355AD0 00352A30 7C 08 03 A6 */ mtlr r0 /* 80355AD4 00352A34 38 21 00 20 */ addi r1, r1, 0x20 -/* 80355AD8 00352A38 4E 80 00 20 */ blr +/* 80355AD8 00352A38 4E 80 00 20 */ blr .global DrawSortedParts__6CModelCFRC11CModelFlags DrawSortedParts__6CModelCFRC11CModelFlags: @@ -804,7 +804,7 @@ lbl_80355B18: /* 80355B48 00352AA8 83 C1 00 08 */ lwz r30, 8(r1) /* 80355B4C 00352AAC 7C 08 03 A6 */ mtlr r0 /* 80355B50 00352AB0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80355B54 00352AB4 4E 80 00 20 */ blr +/* 80355B54 00352AB4 4E 80 00 20 */ blr .global DrawUnsortedParts__6CModelCFRC11CModelFlags DrawUnsortedParts__6CModelCFRC11CModelFlags: @@ -839,7 +839,7 @@ lbl_80355B94: /* 80355BC4 00352B24 83 C1 00 08 */ lwz r30, 8(r1) /* 80355BC8 00352B28 7C 08 03 A6 */ mtlr r0 /* 80355BCC 00352B2C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80355BD0 00352B30 4E 80 00 20 */ blr +/* 80355BD0 00352B30 4E 80 00 20 */ blr .global Draw__6CModelCFRC11CModelFlags Draw__6CModelCFRC11CModelFlags: @@ -874,7 +874,7 @@ lbl_80355C10: /* 80355C40 00352BA0 83 C1 00 08 */ lwz r30, 8(r1) /* 80355C44 00352BA4 7C 08 03 A6 */ mtlr r0 /* 80355C48 00352BA8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80355C4C 00352BAC 4E 80 00 20 */ blr +/* 80355C4C 00352BAC 4E 80 00 20 */ blr .global __dt__6CModelFv __dt__6CModelFv: @@ -956,7 +956,7 @@ lbl_80355D50: /* 80355D5C 00352CBC 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80355D60 00352CC0 7C 08 03 A6 */ mtlr r0 /* 80355D64 00352CC4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80355D68 00352CC8 4E 80 00 20 */ blr +/* 80355D68 00352CC8 4E 80 00 20 */ blr .global sub_80355d6c sub_80355d6c: @@ -996,7 +996,7 @@ lbl_80355DDC: /* 80355DE8 00352D48 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80355DEC 00352D4C 7C 08 03 A6 */ mtlr r0 /* 80355DF0 00352D50 38 21 00 20 */ addi r1, r1, 0x20 -/* 80355DF4 00352D54 4E 80 00 20 */ blr +/* 80355DF4 00352D54 4E 80 00 20 */ blr .global sub_80355df8 sub_80355df8: @@ -1021,7 +1021,7 @@ lbl_80355E24: /* 80355E38 00352D98 83 C1 00 08 */ lwz r30, 8(r1) /* 80355E3C 00352D9C 7C 08 03 A6 */ mtlr r0 /* 80355E40 00352DA0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80355E44 00352DA4 4E 80 00 20 */ blr +/* 80355E44 00352DA4 4E 80 00 20 */ blr .global sub_80355e48 sub_80355e48: @@ -1033,7 +1033,7 @@ sub_80355e48: /* 80355E5C 00352DBC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80355E60 00352DC0 7C 08 03 A6 */ mtlr r0 /* 80355E64 00352DC4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80355E68 00352DC8 4E 80 00 20 */ blr +/* 80355E68 00352DC8 4E 80 00 20 */ blr .global sub_80355e6c sub_80355e6c: @@ -1058,7 +1058,7 @@ lbl_80355EA4: /* 80355EB0 00352E10 83 C1 00 08 */ lwz r30, 8(r1) /* 80355EB4 00352E14 7C 08 03 A6 */ mtlr r0 /* 80355EB8 00352E18 38 21 00 10 */ addi r1, r1, 0x10 -/* 80355EBC 00352E1C 4E 80 00 20 */ blr +/* 80355EBC 00352E1C 4E 80 00 20 */ blr .global "__ct__6CModelFRCQ24rstl12auto_ptriR12IObjectStore" "__ct__6CModelFRCQ24rstl12auto_ptriR12IObjectStore": @@ -1274,7 +1274,7 @@ lbl_8035619C: /* 803561D4 00353134 80 01 00 74 */ lwz r0, 0x74(r1) /* 803561D8 00353138 7C 08 03 A6 */ mtlr r0 /* 803561DC 0035313C 38 21 00 70 */ addi r1, r1, 0x70 -/* 803561E0 00353140 4E 80 00 20 */ blr +/* 803561E0 00353140 4E 80 00 20 */ blr .global sub_803561e4 sub_803561e4: @@ -1310,7 +1310,7 @@ lbl_80356224: /* 80356250 003531B0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80356254 003531B4 7C 08 03 A6 */ mtlr r0 /* 80356258 003531B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8035625C 003531BC 4E 80 00 20 */ blr +/* 8035625C 003531BC 4E 80 00 20 */ blr .global sub_80356260 sub_80356260: @@ -1377,7 +1377,7 @@ lbl_8035632C: /* 80356330 00353290 80 01 00 24 */ lwz r0, 0x24(r1) /* 80356334 00353294 7C 08 03 A6 */ mtlr r0 /* 80356338 00353298 38 21 00 20 */ addi r1, r1, 0x20 -/* 8035633C 0035329C 4E 80 00 20 */ blr +/* 8035633C 0035329C 4E 80 00 20 */ blr .global advanceSectionInfo advanceSectionInfo: @@ -1397,7 +1397,7 @@ lbl_8035635C: /* 8035636C 003532CC 80 A4 00 00 */ lwz r5, 0(r4) /* 80356370 003532D0 38 05 00 04 */ addi r0, r5, 4 /* 80356374 003532D4 90 04 00 00 */ stw r0, 0(r4) -/* 80356378 003532D8 4E 80 00 20 */ blr +/* 80356378 003532D8 4E 80 00 20 */ blr .global sub_8035637c sub_8035637c: @@ -1456,7 +1456,7 @@ lbl_80356430: /* 8035643C 0035339C 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80356440 003533A0 7C 08 03 A6 */ mtlr r0 /* 80356444 003533A4 38 21 00 30 */ addi r1, r1, 0x30 -/* 80356448 003533A8 4E 80 00 20 */ blr +/* 80356448 003533A8 4E 80 00 20 */ blr .global sub_8035644c sub_8035644c: @@ -1480,7 +1480,7 @@ lbl_80356478: /* 80356488 003533E8 83 C1 00 08 */ lwz r30, 8(r1) /* 8035648C 003533EC 7C 08 03 A6 */ mtlr r0 /* 80356490 003533F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80356494 003533F4 4E 80 00 20 */ blr +/* 80356494 003533F4 4E 80 00 20 */ blr .global sub_80356498 sub_80356498: diff --git a/asm/Kyoto/Graphics/DolphinCPalette.s b/asm/Kyoto/Graphics/DolphinCPalette.s index 8fdbd6f2..2ffc9cdc 100644 --- a/asm/Kyoto/Graphics/DolphinCPalette.s +++ b/asm/Kyoto/Graphics/DolphinCPalette.s @@ -35,7 +35,7 @@ UnLock__16CGraphicsPaletteFv: /* 8030DEB4 0030AE14 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8030DEB8 0030AE18 7C 08 03 A6 */ mtlr r0 /* 8030DEBC 0030AE1C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030DEC0 0030AE20 4E 80 00 20 */ blr +/* 8030DEC0 0030AE20 4E 80 00 20 */ blr .global Load__16CGraphicsPaletteCFv Load__16CGraphicsPaletteCFv: @@ -53,7 +53,7 @@ Load__16CGraphicsPaletteCFv: /* 8030DEF0 0030AE50 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8030DEF4 0030AE54 7C 08 03 A6 */ mtlr r0 /* 8030DEF8 0030AE58 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030DEFC 0030AE5C 4E 80 00 20 */ blr +/* 8030DEFC 0030AE5C 4E 80 00 20 */ blr .global __dt__16CGraphicsPaletteFv __dt__16CGraphicsPaletteFv: @@ -93,7 +93,7 @@ lbl_8030DF6C: /* 8030DF78 0030AED8 83 C1 00 08 */ lwz r30, 8(r1) /* 8030DF7C 0030AEDC 7C 08 03 A6 */ mtlr r0 /* 8030DF80 0030AEE0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030DF84 0030AEE4 4E 80 00 20 */ blr +/* 8030DF84 0030AEE4 4E 80 00 20 */ blr .global __ct__16CGraphicsPaletteFR12CInputStream __ct__16CGraphicsPaletteFR12CInputStream: @@ -155,7 +155,7 @@ __ct__16CGraphicsPaletteFR12CInputStream: /* 8030E064 0030AFC4 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8030E068 0030AFC8 7C 08 03 A6 */ mtlr r0 /* 8030E06C 0030AFCC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8030E070 0030AFD0 4E 80 00 20 */ blr +/* 8030E070 0030AFD0 4E 80 00 20 */ blr .global __ct__16CGraphicsPaletteF14EPaletteFormati __ct__16CGraphicsPaletteF14EPaletteFormati: diff --git a/asm/Kyoto/Graphics/DolphinCTexture.s b/asm/Kyoto/Graphics/DolphinCTexture.s index 325a9e03..a53349b1 100644 --- a/asm/Kyoto/Graphics/DolphinCTexture.s +++ b/asm/Kyoto/Graphics/DolphinCTexture.s @@ -50,7 +50,7 @@ lbl_805A9434: .global lbl_805A9438 lbl_805A9438: .skip 0x8 - + .section .text, "ax" .global sub_8030e10c @@ -70,7 +70,7 @@ lbl_8030E138: /* 8030E138 0030B098 80 01 00 14 */ lwz r0, 0x14(r1) /* 8030E13C 0030B09C 7C 08 03 A6 */ mtlr r0 /* 8030E140 0030B0A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030E144 0030B0A4 4E 80 00 20 */ blr +/* 8030E144 0030B0A4 4E 80 00 20 */ blr .global InvalidateTexmap__8CTextureF11_GXTexMapID InvalidateTexmap__8CTextureF11_GXTexMapID: @@ -79,13 +79,13 @@ InvalidateTexmap__8CTextureF11_GXTexMapID: /* 8030E150 0030B0B0 38 64 FD 10 */ addi r3, r4, lbl_804BFD10@l /* 8030E154 0030B0B4 38 80 00 00 */ li r4, 0 /* 8030E158 0030B0B8 7C 83 01 2E */ stwx r4, r3, r0 -/* 8030E15C 0030B0BC 4E 80 00 20 */ blr +/* 8030E15C 0030B0BC 4E 80 00 20 */ blr .global UncountMemory__8CTextureCFv UncountMemory__8CTextureCFv: /* 8030E160 0030B0C0 88 83 00 0A */ lbz r4, 0xa(r3) /* 8030E164 0030B0C4 54 80 EF FF */ rlwinm. r0, r4, 0x1d, 0x1f, 0x1f -/* 8030E168 0030B0C8 4D 82 00 20 */ beqlr +/* 8030E168 0030B0C8 4D 82 00 20 */ beqlr /* 8030E16C 0030B0CC 38 00 00 00 */ li r0, 0 /* 8030E170 0030B0D0 50 04 1F 38 */ rlwimi r4, r0, 3, 0x1c, 0x1c /* 8030E174 0030B0D4 80 0D A8 74 */ lwz r0, lbl_805A9434@sda21(r13) @@ -93,13 +93,13 @@ UncountMemory__8CTextureCFv: /* 8030E17C 0030B0DC 80 63 00 0C */ lwz r3, 0xc(r3) /* 8030E180 0030B0E0 7C 03 00 50 */ subf r0, r3, r0 /* 8030E184 0030B0E4 90 0D A8 74 */ stw r0, lbl_805A9434@sda21(r13) -/* 8030E188 0030B0E8 4E 80 00 20 */ blr +/* 8030E188 0030B0E8 4E 80 00 20 */ blr .global CountMemory__8CTextureCFv CountMemory__8CTextureCFv: /* 8030E18C 0030B0EC 88 A3 00 0A */ lbz r5, 0xa(r3) /* 8030E190 0030B0F0 54 A0 EF FF */ rlwinm. r0, r5, 0x1d, 0x1f, 0x1f -/* 8030E194 0030B0F4 4C 82 00 20 */ bnelr +/* 8030E194 0030B0F4 4C 82 00 20 */ bnelr /* 8030E198 0030B0F8 38 00 00 01 */ li r0, 1 /* 8030E19C 0030B0FC 80 8D A8 74 */ lwz r4, lbl_805A9434@sda21(r13) /* 8030E1A0 0030B100 50 05 1F 38 */ rlwimi r5, r0, 3, 0x1c, 0x1c @@ -107,17 +107,17 @@ CountMemory__8CTextureCFv: /* 8030E1A8 0030B108 80 03 00 0C */ lwz r0, 0xc(r3) /* 8030E1AC 0030B10C 7C 04 02 14 */ add r0, r4, r0 /* 8030E1B0 0030B110 90 0D A8 74 */ stw r0, lbl_805A9434@sda21(r13) -/* 8030E1B4 0030B114 4E 80 00 20 */ blr +/* 8030E1B4 0030B114 4E 80 00 20 */ blr .global MakeSwappable__8CTextureCFv MakeSwappable__8CTextureCFv: /* 8030E1B8 0030B118 88 83 00 0A */ lbz r4, 0xa(r3) /* 8030E1BC 0030B11C 54 80 E7 FF */ rlwinm. r0, r4, 0x1c, 0x1f, 0x1f -/* 8030E1C0 0030B120 4D 82 00 20 */ beqlr +/* 8030E1C0 0030B120 4D 82 00 20 */ beqlr /* 8030E1C4 0030B124 38 00 00 00 */ li r0, 0 /* 8030E1C8 0030B128 50 04 26 F6 */ rlwimi r4, r0, 4, 0x1b, 0x1b /* 8030E1CC 0030B12C 98 83 00 0A */ stb r4, 0xa(r3) -/* 8030E1D0 0030B130 4E 80 00 20 */ blr +/* 8030E1D0 0030B130 4E 80 00 20 */ blr .global MangleMipmap__8CTextureFi MangleMipmap__8CTextureFi: @@ -394,7 +394,7 @@ lbl_8030E5C0: /* 8030E5C4 0030B524 80 01 00 54 */ lwz r0, 0x54(r1) /* 8030E5C8 0030B528 7C 08 03 A6 */ mtlr r0 /* 8030E5CC 0030B52C 38 21 00 50 */ addi r1, r1, 0x50 -/* 8030E5D0 0030B530 4E 80 00 20 */ blr +/* 8030E5D0 0030B530 4E 80 00 20 */ blr .global GetBitMapData__8CTextureFi GetBitMapData__8CTextureFi: @@ -405,7 +405,7 @@ GetBitMapData__8CTextureFi: /* 8030E5E4 0030B544 80 01 00 14 */ lwz r0, 0x14(r1) /* 8030E5E8 0030B548 7C 08 03 A6 */ mtlr r0 /* 8030E5EC 0030B54C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030E5F0 0030B550 4E 80 00 20 */ blr +/* 8030E5F0 0030B550 4E 80 00 20 */ blr .global GetConstBitMapData__8CTextureCFi GetConstBitMapData__8CTextureCFi: @@ -506,7 +506,7 @@ lbl_8030E74C: /* 8030E75C 0030B6BC 80 01 00 44 */ lwz r0, 0x44(r1) /* 8030E760 0030B6C0 7C 08 03 A6 */ mtlr r0 /* 8030E764 0030B6C4 38 21 00 40 */ addi r1, r1, 0x40 -/* 8030E768 0030B6C8 4E 80 00 20 */ blr +/* 8030E768 0030B6C8 4E 80 00 20 */ blr .global FTextureFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer FTextureFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer: @@ -556,7 +556,7 @@ lbl_8030E7B8: /* 8030E814 0030B774 38 80 00 01 */ li r4, 1 /* 8030E818 0030B778 81 8C 00 08 */ lwz r12, 8(r12) /* 8030E81C 0030B77C 7D 89 03 A6 */ mtctr r12 -/* 8030E820 0030B780 4E 80 04 21 */ bctrl +/* 8030E820 0030B780 4E 80 04 21 */ bctrl lbl_8030E824: /* 8030E824 0030B784 88 01 00 08 */ lbz r0, 8(r1) /* 8030E828 0030B788 28 00 00 00 */ cmplwi r0, 0 @@ -570,7 +570,7 @@ lbl_8030E83C: /* 8030E844 0030B7A4 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8030E848 0030B7A8 7C 08 03 A6 */ mtlr r0 /* 8030E84C 0030B7AC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8030E850 0030B7B0 4E 80 00 20 */ blr +/* 8030E850 0030B7B0 4E 80 00 20 */ blr .global "GetIObjObjectFor__17TToken<8CTexture>FRCQ24rstl19auto_ptr<8CTexture>" "GetIObjObjectFor__17TToken<8CTexture>FRCQ24rstl19auto_ptr<8CTexture>": @@ -584,7 +584,7 @@ lbl_8030E83C: /* 8030E870 0030B7D0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8030E874 0030B7D4 7C 08 03 A6 */ mtlr r0 /* 8030E878 0030B7D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030E87C 0030B7DC 4E 80 00 20 */ blr +/* 8030E87C 0030B7DC 4E 80 00 20 */ blr .global "GetNewDerivedObject__35TObjOwnerDerivedFromIObj<8CTexture>FRCQ24rstl19auto_ptr<8CTexture>" "GetNewDerivedObject__35TObjOwnerDerivedFromIObj<8CTexture>FRCQ24rstl19auto_ptr<8CTexture>": @@ -627,7 +627,7 @@ lbl_8030E8F0: /* 8030E90C 0030B86C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8030E910 0030B870 7C 08 03 A6 */ mtlr r0 /* 8030E914 0030B874 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030E918 0030B878 4E 80 00 20 */ blr +/* 8030E918 0030B878 4E 80 00 20 */ blr .global UnLock__8CTextureFv UnLock__8CTextureFv: @@ -651,7 +651,7 @@ UnLock__8CTextureFv: /* 8030E960 0030B8C0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8030E964 0030B8C4 7C 08 03 A6 */ mtlr r0 /* 8030E968 0030B8C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030E96C 0030B8CC 4E 80 00 20 */ blr +/* 8030E96C 0030B8CC 4E 80 00 20 */ blr .global InitBitmapBuffers__8CTextureF12ETexelFormatssi InitBitmapBuffers__8CTextureF12ETexelFormatssi: @@ -667,7 +667,7 @@ InitBitmapBuffers__8CTextureF12ETexelFormatssi: /* 8030E994 0030B8F4 38 63 D9 68 */ addi r3, r3, lbl_803ED968@l /* 8030E998 0030B8F8 7C 03 00 2E */ lwzx r0, r3, r0 /* 8030E99C 0030B8FC 7C 09 03 A6 */ mtctr r0 -/* 8030E9A0 0030B900 4E 80 04 20 */ bctr +/* 8030E9A0 0030B900 4E 80 04 20 */ bctr .global lbl_8030E9A4 lbl_8030E9A4: /* 8030E9A4 0030B904 38 00 00 08 */ li r0, 8 @@ -783,7 +783,7 @@ lbl_8030EA94: /* 8030EAF4 0030BA54 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8030EAF8 0030BA58 7C 08 03 A6 */ mtlr r0 /* 8030EAFC 0030BA5C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8030EB00 0030BA60 4E 80 00 20 */ blr +/* 8030EB00 0030BA60 4E 80 00 20 */ blr .global TexelFormatBitsPerPixel__8CTextureF12ETexelFormat TexelFormatBitsPerPixel__8CTextureF12ETexelFormat: @@ -794,26 +794,26 @@ TexelFormatBitsPerPixel__8CTextureF12ETexelFormat: /* 8030EB14 0030BA74 38 64 D9 94 */ addi r3, r4, lbl_803ED994@l /* 8030EB18 0030BA78 7C 03 00 2E */ lwzx r0, r3, r0 /* 8030EB1C 0030BA7C 7C 09 03 A6 */ mtctr r0 -/* 8030EB20 0030BA80 4E 80 04 20 */ bctr +/* 8030EB20 0030BA80 4E 80 04 20 */ bctr .global lbl_8030EB24 lbl_8030EB24: /* 8030EB24 0030BA84 38 60 00 04 */ li r3, 4 -/* 8030EB28 0030BA88 4E 80 00 20 */ blr +/* 8030EB28 0030BA88 4E 80 00 20 */ blr .global lbl_8030EB2C lbl_8030EB2C: /* 8030EB2C 0030BA8C 38 60 00 08 */ li r3, 8 -/* 8030EB30 0030BA90 4E 80 00 20 */ blr +/* 8030EB30 0030BA90 4E 80 00 20 */ blr .global lbl_8030EB34 lbl_8030EB34: /* 8030EB34 0030BA94 38 60 00 10 */ li r3, 0x10 -/* 8030EB38 0030BA98 4E 80 00 20 */ blr +/* 8030EB38 0030BA98 4E 80 00 20 */ blr .global lbl_8030EB3C lbl_8030EB3C: /* 8030EB3C 0030BA9C 38 60 00 20 */ li r3, 0x20 -/* 8030EB40 0030BAA0 4E 80 00 20 */ blr +/* 8030EB40 0030BAA0 4E 80 00 20 */ blr lbl_8030EB44: /* 8030EB44 0030BAA4 38 60 00 00 */ li r3, 0 -/* 8030EB48 0030BAA8 4E 80 00 20 */ blr +/* 8030EB48 0030BAA8 4E 80 00 20 */ blr .global IsARAMTransferInProgress__8CTextureCFv IsARAMTransferInProgress__8CTextureCFv: @@ -821,16 +821,16 @@ IsARAMTransferInProgress__8CTextureCFv: /* 8030EB50 0030BAB0 54 00 E7 FF */ rlwinm. r0, r0, 0x1c, 0x1f, 0x1f /* 8030EB54 0030BAB4 41 82 00 0C */ beq lbl_8030EB60 /* 8030EB58 0030BAB8 38 60 00 00 */ li r3, 0 -/* 8030EB5C 0030BABC 4E 80 00 20 */ blr +/* 8030EB5C 0030BABC 4E 80 00 20 */ blr lbl_8030EB60: /* 8030EB60 0030BAC0 80 03 00 44 */ lwz r0, 0x44(r3) /* 8030EB64 0030BAC4 38 60 00 00 */ li r3, 0 /* 8030EB68 0030BAC8 2C 00 00 02 */ cmpwi r0, 2 -/* 8030EB6C 0030BACC 4D 80 00 20 */ bltlr +/* 8030EB6C 0030BACC 4D 80 00 20 */ bltlr /* 8030EB70 0030BAD0 2C 00 00 05 */ cmpwi r0, 5 -/* 8030EB74 0030BAD4 4D 81 00 20 */ bgtlr +/* 8030EB74 0030BAD4 4D 81 00 20 */ bgtlr /* 8030EB78 0030BAD8 38 60 00 01 */ li r3, 1 -/* 8030EB7C 0030BADC 4E 80 00 20 */ blr +/* 8030EB7C 0030BADC 4E 80 00 20 */ blr .global LoadToARAM__8CTextureCFv LoadToARAM__8CTextureCFv: @@ -880,7 +880,7 @@ lbl_8030EC10: /* 8030EC18 0030BB78 83 C1 00 08 */ lwz r30, 8(r1) /* 8030EC1C 0030BB7C 7C 08 03 A6 */ mtlr r0 /* 8030EC20 0030BB80 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030EC24 0030BB84 4E 80 00 20 */ blr +/* 8030EC24 0030BB84 4E 80 00 20 */ blr .global LoadToMRAM__8CTextureCFv LoadToMRAM__8CTextureCFv: @@ -905,7 +905,7 @@ lbl_8030EC64: /* 8030EC68 0030BBC8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8030EC6C 0030BBCC 7C 08 03 A6 */ mtlr r0 /* 8030EC70 0030BBD0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030EC74 0030BBD4 4E 80 00 20 */ blr +/* 8030EC74 0030BBD4 4E 80 00 20 */ blr .global TryBuildReloadedBitmapData__Q28CTexture25CDumpedBitmapDataReloaderFR11CResFactory TryBuildReloadedBitmapData__Q28CTexture25CDumpedBitmapDataReloaderFR11CResFactory: @@ -919,7 +919,7 @@ TryBuildReloadedBitmapData__Q28CTexture25CDumpedBitmapDataReloaderFR11CResFactor /* 8030EC94 0030BBF4 81 83 00 00 */ lwz r12, 0(r3) /* 8030EC98 0030BBF8 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8030EC9C 0030BBFC 7D 89 03 A6 */ mtctr r12 -/* 8030ECA0 0030BC00 4E 80 04 21 */ bctrl +/* 8030ECA0 0030BC00 4E 80 04 21 */ bctrl /* 8030ECA4 0030BC04 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8030ECA8 0030BC08 41 82 02 B0 */ beq lbl_8030EF58 /* 8030ECAC 0030BC0C 38 00 00 02 */ li r0, 2 @@ -931,7 +931,7 @@ TryBuildReloadedBitmapData__Q28CTexture25CDumpedBitmapDataReloaderFR11CResFactor /* 8030ECC4 0030BC24 38 80 00 01 */ li r4, 1 /* 8030ECC8 0030BC28 81 8C 00 08 */ lwz r12, 8(r12) /* 8030ECCC 0030BC2C 7D 89 03 A6 */ mtctr r12 -/* 8030ECD0 0030BC30 4E 80 04 21 */ bctrl +/* 8030ECD0 0030BC30 4E 80 04 21 */ bctrl lbl_8030ECD4: /* 8030ECD4 0030BC34 38 00 00 00 */ li r0, 0 /* 8030ECD8 0030BC38 3C 60 54 58 */ lis r3, 0x54585452@ha @@ -1102,7 +1102,7 @@ lbl_8030EF14: /* 8030EF40 0030BEA0 38 80 00 01 */ li r4, 1 /* 8030EF44 0030BEA4 81 8C 00 08 */ lwz r12, 8(r12) /* 8030EF48 0030BEA8 7D 89 03 A6 */ mtctr r12 -/* 8030EF4C 0030BEAC 4E 80 04 21 */ bctrl +/* 8030EF4C 0030BEAC 4E 80 04 21 */ bctrl lbl_8030EF50: /* 8030EF50 0030BEB0 7F 83 E3 78 */ mr r3, r28 /* 8030EF54 0030BEB4 48 00 00 08 */ b lbl_8030EF5C @@ -1113,7 +1113,7 @@ lbl_8030EF5C: /* 8030EF60 0030BEC0 80 01 00 64 */ lwz r0, 0x64(r1) /* 8030EF64 0030BEC4 7C 08 03 A6 */ mtlr r0 /* 8030EF68 0030BEC8 38 21 00 60 */ addi r1, r1, 0x60 -/* 8030EF6C 0030BECC 4E 80 00 20 */ blr +/* 8030EF6C 0030BECC 4E 80 00 20 */ blr .global BeginReloadBitmapData__Q28CTexture25CDumpedBitmapDataReloaderFR11CResFactory BeginReloadBitmapData__Q28CTexture25CDumpedBitmapDataReloaderFR11CResFactory: @@ -1167,7 +1167,7 @@ BeginReloadBitmapData__Q28CTexture25CDumpedBitmapDataReloaderFR11CResFactory: /* 8030F02C 0030BF8C 81 83 00 00 */ lwz r12, 0(r3) /* 8030F030 0030BF90 81 8C 00 08 */ lwz r12, 8(r12) /* 8030F034 0030BF94 7D 89 03 A6 */ mtctr r12 -/* 8030F038 0030BF98 4E 80 04 21 */ bctrl +/* 8030F038 0030BF98 4E 80 04 21 */ bctrl lbl_8030F03C: /* 8030F03C 0030BF9C 93 FD 00 14 */ stw r31, 0x14(r29) /* 8030F040 0030BFA0 38 00 00 01 */ li r0, 1 @@ -1179,7 +1179,7 @@ lbl_8030F048: /* 8030F054 0030BFB4 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8030F058 0030BFB8 7C 08 03 A6 */ mtlr r0 /* 8030F05C 0030BFBC 38 21 00 30 */ addi r1, r1, 0x30 -/* 8030F060 0030BFC0 4E 80 00 20 */ blr +/* 8030F060 0030BFC0 4E 80 00 20 */ blr .global __ct__Q28CTexture25CDumpedBitmapDataReloaderFUiUib __ct__Q28CTexture25CDumpedBitmapDataReloaderFUiUib: @@ -1191,7 +1191,7 @@ __ct__Q28CTexture25CDumpedBitmapDataReloaderFUiUib: /* 8030F078 0030BFD8 98 C3 00 10 */ stb r6, 0x10(r3) /* 8030F07C 0030BFDC 90 03 00 14 */ stw r0, 0x14(r3) /* 8030F080 0030BFE0 90 03 00 18 */ stw r0, 0x18(r3) -/* 8030F084 0030BFE4 4E 80 00 20 */ blr +/* 8030F084 0030BFE4 4E 80 00 20 */ blr .global sub_8030f088 sub_8030f088: @@ -1201,9 +1201,9 @@ sub_8030f088: /* 8030F094 0030BFF4 80 04 00 00 */ lwz r0, 0(r4) /* 8030F098 0030BFF8 38 60 00 05 */ li r3, 5 /* 8030F09C 0030BFFC 2C 00 00 00 */ cmpwi r0, 0 -/* 8030F0A0 0030C000 4C 82 00 20 */ bnelr +/* 8030F0A0 0030C000 4C 82 00 20 */ bnelr /* 8030F0A4 0030C004 38 60 00 02 */ li r3, 2 -/* 8030F0A8 0030C008 4E 80 00 20 */ blr +/* 8030F0A8 0030C008 4E 80 00 20 */ blr lbl_8030F0AC: /* 8030F0AC 0030C00C 80 03 00 44 */ lwz r0, 0x44(r3) /* 8030F0B0 0030C010 2C 00 00 02 */ cmpwi r0, 2 @@ -1220,19 +1220,19 @@ lbl_8030F0CC: /* 8030F0D8 0030C038 48 00 00 1C */ b lbl_8030F0F4 lbl_8030F0DC: /* 8030F0DC 0030C03C 38 60 00 01 */ li r3, 1 -/* 8030F0E0 0030C040 4E 80 00 20 */ blr +/* 8030F0E0 0030C040 4E 80 00 20 */ blr lbl_8030F0E4: /* 8030F0E4 0030C044 38 60 00 00 */ li r3, 0 -/* 8030F0E8 0030C048 4E 80 00 20 */ blr +/* 8030F0E8 0030C048 4E 80 00 20 */ blr lbl_8030F0EC: /* 8030F0EC 0030C04C 38 60 00 03 */ li r3, 3 -/* 8030F0F0 0030C050 4E 80 00 20 */ blr +/* 8030F0F0 0030C050 4E 80 00 20 */ blr lbl_8030F0F4: /* 8030F0F4 0030C054 38 60 00 04 */ li r3, 4 -/* 8030F0F8 0030C058 4E 80 00 20 */ blr +/* 8030F0F8 0030C058 4E 80 00 20 */ blr lbl_8030F0FC: /* 8030F0FC 0030C05C 38 60 FF FF */ li r3, -1 -/* 8030F100 0030C060 4E 80 00 20 */ blr +/* 8030F100 0030C060 4E 80 00 20 */ blr .global TryReloadBitmapData__8CTextureCFR11CResFactory TryReloadBitmapData__8CTextureCFR11CResFactory: @@ -1275,7 +1275,7 @@ lbl_8030F174: /* 8030F18C 0030C0EC 38 80 00 01 */ li r4, 1 /* 8030F190 0030C0F0 81 8C 00 08 */ lwz r12, 8(r12) /* 8030F194 0030C0F4 7D 89 03 A6 */ mtctr r12 -/* 8030F198 0030C0F8 4E 80 04 21 */ bctrl +/* 8030F198 0030C0F8 4E 80 04 21 */ bctrl lbl_8030F19C: /* 8030F19C 0030C0FC 7F C3 F3 78 */ mr r3, r30 /* 8030F1A0 0030C100 48 00 67 91 */ bl Free__7CMemoryFPCv @@ -1306,7 +1306,7 @@ lbl_8030F1E4: /* 8030F1F4 0030C154 83 81 00 10 */ lwz r28, 0x10(r1) /* 8030F1F8 0030C158 7C 08 03 A6 */ mtlr r0 /* 8030F1FC 0030C15C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8030F200 0030C160 4E 80 00 20 */ blr +/* 8030F200 0030C160 4E 80 00 20 */ blr .global UnloadBitmapData__8CTextureCFUi UnloadBitmapData__8CTextureCFUi: @@ -1350,7 +1350,7 @@ lbl_8030F278: /* 8030F290 0030C1F0 38 80 00 01 */ li r4, 1 /* 8030F294 0030C1F4 81 8C 00 08 */ lwz r12, 8(r12) /* 8030F298 0030C1F8 7D 89 03 A6 */ mtctr r12 -/* 8030F29C 0030C1FC 4E 80 04 21 */ bctrl +/* 8030F29C 0030C1FC 4E 80 04 21 */ bctrl lbl_8030F2A0: /* 8030F2A0 0030C200 7F C3 F3 78 */ mr r3, r30 /* 8030F2A4 0030C204 48 00 66 8D */ bl Free__7CMemoryFPCv @@ -1412,7 +1412,7 @@ lbl_8030F350: /* 8030F368 0030C2C8 38 80 00 01 */ li r4, 1 /* 8030F36C 0030C2CC 81 8C 00 08 */ lwz r12, 8(r12) /* 8030F370 0030C2D0 7D 89 03 A6 */ mtctr r12 -/* 8030F374 0030C2D4 4E 80 04 21 */ bctrl +/* 8030F374 0030C2D4 4E 80 04 21 */ bctrl lbl_8030F378: /* 8030F378 0030C2D8 7F C3 F3 78 */ mr r3, r30 /* 8030F37C 0030C2DC 48 00 65 B5 */ bl Free__7CMemoryFPCv @@ -1423,7 +1423,7 @@ lbl_8030F384: /* 8030F388 0030C2E8 80 01 00 44 */ lwz r0, 0x44(r1) /* 8030F38C 0030C2EC 7C 08 03 A6 */ mtlr r0 /* 8030F390 0030C2F0 38 21 00 40 */ addi r1, r1, 0x40 -/* 8030F394 0030C2F4 4E 80 00 20 */ blr +/* 8030F394 0030C2F4 4E 80 00 20 */ blr .global LoadMipLevel__8CTextureCFi11_GXTexMapIDQ28CTexture10EClampMode LoadMipLevel__8CTextureCFi11_GXTexMapIDQ28CTexture10EClampMode: @@ -1664,7 +1664,7 @@ lbl_8030F700: /* 8030F72C 0030C68C 80 01 00 44 */ lwz r0, 0x44(r1) /* 8030F730 0030C690 7C 08 03 A6 */ mtlr r0 /* 8030F734 0030C694 38 21 00 40 */ addi r1, r1, 0x40 -/* 8030F738 0030C698 4E 80 00 20 */ blr +/* 8030F738 0030C698 4E 80 00 20 */ blr .global Load__8CTextureCF11_GXTexMapIDQ28CTexture10EClampMode Load__8CTextureCF11_GXTexMapIDQ28CTexture10EClampMode: @@ -1734,7 +1734,7 @@ lbl_8030F81C: /* 8030F820 0030C780 80 01 00 24 */ lwz r0, 0x24(r1) /* 8030F824 0030C784 7C 08 03 A6 */ mtlr r0 /* 8030F828 0030C788 38 21 00 20 */ addi r1, r1, 0x20 -/* 8030F82C 0030C78C 4E 80 00 20 */ blr +/* 8030F82C 0030C78C 4E 80 00 20 */ blr .global InitTextureObjects__8CTextureFv InitTextureObjects__8CTextureFv: @@ -1860,7 +1860,7 @@ lbl_8030F9D4: /* 8030F9E8 0030C948 80 01 00 34 */ lwz r0, 0x34(r1) /* 8030F9EC 0030C94C 7C 08 03 A6 */ mtlr r0 /* 8030F9F0 0030C950 38 21 00 30 */ addi r1, r1, 0x30 -/* 8030F9F4 0030C954 4E 80 00 20 */ blr +/* 8030F9F4 0030C954 4E 80 00 20 */ blr .global __dt__8CTextureFv __dt__8CTextureFv: @@ -1896,7 +1896,7 @@ lbl_8030FA50: /* 8030FA68 0030C9C8 38 80 00 01 */ li r4, 1 /* 8030FA6C 0030C9CC 81 8C 00 08 */ lwz r12, 8(r12) /* 8030FA70 0030C9D0 7D 89 03 A6 */ mtctr r12 -/* 8030FA74 0030C9D4 4E 80 04 21 */ bctrl +/* 8030FA74 0030C9D4 4E 80 04 21 */ bctrl lbl_8030FA78: /* 8030FA78 0030C9D8 7F E3 FB 78 */ mr r3, r31 /* 8030FA7C 0030C9DC 48 00 5E B5 */ bl Free__7CMemoryFPCv @@ -1919,7 +1919,7 @@ lbl_8030FAA4: /* 8030FAB4 0030CA14 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8030FAB8 0030CA18 7C 08 03 A6 */ mtlr r0 /* 8030FABC 0030CA1C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8030FAC0 0030CA20 4E 80 00 20 */ blr +/* 8030FAC0 0030CA20 4E 80 00 20 */ blr .global __ct__8CTextureFR12CInputStreamQ28CTexture11EAutoMipmapQ28CTexture9EBlackKey __ct__8CTextureFR12CInputStreamQ28CTexture11EAutoMipmapQ28CTexture9EBlackKey: @@ -2155,7 +2155,7 @@ lbl_8030FE08: /* 8030FE1C 0030CD7C 80 01 00 34 */ lwz r0, 0x34(r1) /* 8030FE20 0030CD80 7C 08 03 A6 */ mtlr r0 /* 8030FE24 0030CD84 38 21 00 30 */ addi r1, r1, 0x30 -/* 8030FE28 0030CD88 4E 80 00 20 */ blr +/* 8030FE28 0030CD88 4E 80 00 20 */ blr .global __ct__8CTextureF12ETexelFormatssi __ct__8CTextureF12ETexelFormatssi: @@ -2220,4 +2220,4 @@ __ct__8CTextureF12ETexelFormatssi: /* 8030FF14 0030CE74 80 01 00 24 */ lwz r0, 0x24(r1) /* 8030FF18 0030CE78 7C 08 03 A6 */ mtlr r0 /* 8030FF1C 0030CE7C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8030FF20 0030CE80 4E 80 00 20 */ blr +/* 8030FF20 0030CE80 4E 80 00 20 */ blr diff --git a/asm/Kyoto/IObj.s b/asm/Kyoto/IObj.s index 40b1129e..948926da 100644 --- a/asm/Kyoto/IObj.s +++ b/asm/Kyoto/IObj.s @@ -90,7 +90,7 @@ lbl_803410F0: /* 80341100 0033E060 98 05 00 00 */ stb r0, 0(r5) lbl_80341104: /* 80341104 0033E064 38 6D A9 58 */ addi r3, r13, lbl_805A9518@sda21 -/* 80341108 0033E068 4E 80 00 20 */ blr +/* 80341108 0033E068 4E 80 00 20 */ blr .global __sinit_IObj_cpp __sinit_IObj_cpp: diff --git a/asm/Kyoto/Input/CDolphinController.s b/asm/Kyoto/Input/CDolphinController.s index 4dcc95db..02ea1626 100644 --- a/asm/Kyoto/Input/CDolphinController.s +++ b/asm/Kyoto/Input/CDolphinController.s @@ -39,13 +39,13 @@ lbl_8034F074: /* 8034F07C 0034BFDC 48 00 00 0C */ b lbl_8034F088 lbl_8034F080: /* 8034F080 0034BFE0 C0 22 CC 70 */ lfs f1, lbl_805AE990@sda21(r2) -/* 8034F084 0034BFE4 4E 80 00 20 */ blr +/* 8034F084 0034BFE4 4E 80 00 20 */ blr lbl_8034F088: /* 8034F088 0034BFE8 C0 22 CC 74 */ lfs f1, lbl_805AE994@sda21(r2) -/* 8034F08C 0034BFEC 4E 80 00 20 */ blr +/* 8034F08C 0034BFEC 4E 80 00 20 */ blr lbl_8034F090: /* 8034F090 0034BFF0 C0 22 CC 78 */ lfs f1, lbl_805AE998@sda21(r2) -/* 8034F094 0034BFF4 4E 80 00 20 */ blr +/* 8034F094 0034BFF4 4E 80 00 20 */ blr .global SetMotorState__18CDolphinControllerF7EIOPort11EMotorState SetMotorState__18CDolphinControllerF7EIOPort11EMotorState: @@ -60,14 +60,14 @@ SetMotorState__18CDolphinControllerF7EIOPort11EMotorState: /* 8034F0B8 0034C018 80 01 00 14 */ lwz r0, 0x14(r1) /* 8034F0BC 0034C01C 7C 08 03 A6 */ mtlr r0 /* 8034F0C0 0034C020 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034F0C4 0034C024 4E 80 00 20 */ blr +/* 8034F0C4 0034C024 4E 80 00 20 */ blr .global GetControllerType__18CDolphinControllerFi GetControllerType__18CDolphinControllerFi: /* 8034F0C8 0034C028 54 80 10 3A */ slwi r0, r4, 2 /* 8034F0CC 0034C02C 7C 63 02 14 */ add r3, r3, r0 /* 8034F0D0 0034C030 80 63 01 A4 */ lwz r3, 0x1a4(r3) -/* 8034F0D4 0034C034 4E 80 00 20 */ blr +/* 8034F0D4 0034C034 4E 80 00 20 */ blr .global GetGamepadData__18CDolphinControllerFi GetGamepadData__18CDolphinControllerFi: @@ -75,12 +75,12 @@ GetGamepadData__18CDolphinControllerFi: /* 8034F0DC 0034C03C 7C 60 1B 78 */ mr r0, r3 /* 8034F0E0 0034C040 38 64 00 34 */ addi r3, r4, 0x34 /* 8034F0E4 0034C044 7C 60 1A 14 */ add r3, r0, r3 -/* 8034F0E8 0034C048 4E 80 00 20 */ blr +/* 8034F0E8 0034C048 4E 80 00 20 */ blr .global GetDeviceCount__18CDolphinControllerCFv GetDeviceCount__18CDolphinControllerCFv: /* 8034F0EC 0034C04C 38 60 00 04 */ li r3, 4 -/* 8034F0F0 0034C050 4E 80 00 20 */ blr +/* 8034F0F0 0034C050 4E 80 00 20 */ blr .global ProcessAnalogButton__18CDolphinControllerFfR15CControllerAxis ProcessAnalogButton__18CDolphinControllerFfR15CControllerAxis: @@ -100,7 +100,7 @@ lbl_8034F10C: lbl_8034F124: /* 8034F124 0034C084 D0 04 00 00 */ stfs f0, 0(r4) /* 8034F128 0034C088 D0 64 00 04 */ stfs f3, 4(r4) -/* 8034F12C 0034C08C 4E 80 00 20 */ blr +/* 8034F12C 0034C08C 4E 80 00 20 */ blr .global ProcessDigitalButton__18CDolphinControllerFiR17CControllerButtonUs ProcessDigitalButton__18CDolphinControllerFiR17CControllerButtonUs: @@ -129,7 +129,7 @@ ProcessDigitalButton__18CDolphinControllerFiR17CControllerButtonUs: /* 8034F188 0034C0E8 54 00 DE 3E */ rlwinm r0, r0, 0x1b, 0x18, 0x1f /* 8034F18C 0034C0EC 98 05 00 02 */ stb r0, 2(r5) /* 8034F190 0034C0F0 98 65 00 00 */ stb r3, 0(r5) -/* 8034F194 0034C0F4 4E 80 00 20 */ blr +/* 8034F194 0034C0F4 4E 80 00 20 */ blr .global ProcessButtons__18CDolphinControllerFi ProcessButtons__18CDolphinControllerFi: @@ -185,7 +185,7 @@ lbl_8034F1CC: /* 8034F258 0034C1B8 80 01 00 34 */ lwz r0, 0x34(r1) /* 8034F25C 0034C1BC 7C 08 03 A6 */ mtlr r0 /* 8034F260 0034C1C0 38 21 00 30 */ addi r1, r1, 0x30 -/* 8034F264 0034C1C4 4E 80 00 20 */ blr +/* 8034F264 0034C1C4 4E 80 00 20 */ blr .global ProcessAxis__18CDolphinControllerFi8EJoyAxis ProcessAxis__18CDolphinControllerFi8EJoyAxis: @@ -305,7 +305,7 @@ lbl_8034F3F0: /* 8034F404 0034C364 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8034F408 0034C368 7C 08 03 A6 */ mtlr r0 /* 8034F40C 0034C36C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8034F410 0034C370 4E 80 00 20 */ blr +/* 8034F410 0034C370 4E 80 00 20 */ blr .global ProcessInputData__18CDolphinControllerFv ProcessInputData__18CDolphinControllerFv: @@ -352,7 +352,7 @@ lbl_8034F490: /* 8034F4AC 0034C40C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8034F4B0 0034C410 7C 08 03 A6 */ mtlr r0 /* 8034F4B4 0034C414 38 21 00 20 */ addi r1, r1, 0x20 -/* 8034F4B8 0034C418 4E 80 00 20 */ blr +/* 8034F4B8 0034C418 4E 80 00 20 */ blr .global ReadDevices__18CDolphinControllerFv ReadDevices__18CDolphinControllerFv: @@ -466,7 +466,7 @@ lbl_8034F638: /* 8034F63C 0034C59C 80 01 00 54 */ lwz r0, 0x54(r1) /* 8034F640 0034C5A0 7C 08 03 A6 */ mtlr r0 /* 8034F644 0034C5A4 38 21 00 50 */ addi r1, r1, 0x50 -/* 8034F648 0034C5A8 4E 80 00 20 */ blr +/* 8034F648 0034C5A8 4E 80 00 20 */ blr .global Poll__18CDolphinControllerFv Poll__18CDolphinControllerFv: @@ -482,7 +482,7 @@ Poll__18CDolphinControllerFv: /* 8034F670 0034C5D0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8034F674 0034C5D4 7C 08 03 A6 */ mtlr r0 /* 8034F678 0034C5D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034F67C 0034C5DC 4E 80 00 20 */ blr +/* 8034F67C 0034C5DC 4E 80 00 20 */ blr .global Initialize__18CDolphinControllerFv Initialize__18CDolphinControllerFv: @@ -521,13 +521,13 @@ Initialize__18CDolphinControllerFv: /* 8034F700 0034C660 81 9F 00 00 */ lwz r12, 0(r31) /* 8034F704 0034C664 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8034F708 0034C668 7D 89 03 A6 */ mtctr r12 -/* 8034F70C 0034C66C 4E 80 04 21 */ bctrl +/* 8034F70C 0034C66C 4E 80 04 21 */ bctrl /* 8034F710 0034C670 80 01 00 14 */ lwz r0, 0x14(r1) /* 8034F714 0034C674 38 60 00 01 */ li r3, 1 /* 8034F718 0034C678 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8034F71C 0034C67C 7C 08 03 A6 */ mtlr r0 /* 8034F720 0034C680 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034F724 0034C684 4E 80 00 20 */ blr +/* 8034F724 0034C684 4E 80 00 20 */ blr .global __dt__18CDolphinControllerFv __dt__18CDolphinControllerFv: @@ -555,7 +555,7 @@ lbl_8034F76C: /* 8034F778 0034C6D8 83 C1 00 08 */ lwz r30, 8(r1) /* 8034F77C 0034C6DC 7C 08 03 A6 */ mtlr r0 /* 8034F780 0034C6E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034F784 0034C6E4 4E 80 00 20 */ blr +/* 8034F784 0034C6E4 4E 80 00 20 */ blr .global __ct__18CDolphinControllerFv __ct__18CDolphinControllerFv: @@ -636,7 +636,7 @@ __ct__22CControllerGamepadDataFv: /* 8034F89C 0034C7FC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8034F8A0 0034C800 7C 08 03 A6 */ mtlr r0 /* 8034F8A4 0034C804 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034F8A8 0034C808 4E 80 00 20 */ blr +/* 8034F8A8 0034C808 4E 80 00 20 */ blr .global __ct__17CControllerButtonFv __ct__17CControllerButtonFv: @@ -644,7 +644,7 @@ __ct__17CControllerButtonFv: /* 8034F8B0 0034C810 98 03 00 00 */ stb r0, 0(r3) /* 8034F8B4 0034C814 98 03 00 01 */ stb r0, 1(r3) /* 8034F8B8 0034C818 98 03 00 02 */ stb r0, 2(r3) -/* 8034F8BC 0034C81C 4E 80 00 20 */ blr +/* 8034F8BC 0034C81C 4E 80 00 20 */ blr .global __ct__15CControllerAxisFv __ct__15CControllerAxisFv: diff --git a/asm/Kyoto/Input/CRumbleGenerator.s b/asm/Kyoto/Input/CRumbleGenerator.s index bcb059d3..0c27a301 100644 --- a/asm/Kyoto/Input/CRumbleGenerator.s +++ b/asm/Kyoto/Input/CRumbleGenerator.s @@ -23,7 +23,7 @@ lbl_80369D28: /* 80369D3C 00366C9C 83 C1 00 08 */ lwz r30, 8(r1) /* 80369D40 00366CA0 7C 08 03 A6 */ mtlr r0 /* 80369D44 00366CA4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80369D48 00366CA8 4E 80 00 20 */ blr +/* 80369D48 00366CA8 4E 80 00 20 */ blr .global HardStopAll__16CRumbleGeneratorFv HardStopAll__16CRumbleGeneratorFv: @@ -64,7 +64,7 @@ lbl_80369D84: /* 80369DD0 00366D30 83 81 00 10 */ lwz r28, 0x10(r1) /* 80369DD4 00366D34 7C 08 03 A6 */ mtlr r0 /* 80369DD8 00366D38 38 21 00 30 */ addi r1, r1, 0x30 -/* 80369DDC 00366D3C 4E 80 00 20 */ blr +/* 80369DDC 00366D3C 4E 80 00 20 */ blr .global Update__16CRumbleGeneratorFf Update__16CRumbleGeneratorFf: @@ -164,7 +164,7 @@ lbl_80369F28: /* 80369F3C 00366E9C 80 01 00 44 */ lwz r0, 0x44(r1) /* 80369F40 00366EA0 7C 08 03 A6 */ mtlr r0 /* 80369F44 00366EA4 38 21 00 40 */ addi r1, r1, 0x40 -/* 80369F48 00366EA8 4E 80 00 20 */ blr +/* 80369F48 00366EA8 4E 80 00 20 */ blr .global Rumble__16CRumbleGeneratorFRC9SAdsrDataf15ERumblePriority7EIOPort Rumble__16CRumbleGeneratorFRC9SAdsrDataf15ERumblePriority7EIOPort: @@ -211,7 +211,7 @@ lbl_80369FD8: /* 80369FE4 00366F44 80 01 00 34 */ lwz r0, 0x34(r1) /* 80369FE8 00366F48 7C 08 03 A6 */ mtlr r0 /* 80369FEC 00366F4C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80369FF0 00366F50 4E 80 00 20 */ blr +/* 80369FF0 00366F50 4E 80 00 20 */ blr .global __dt__16CRumbleGeneratorFv __dt__16CRumbleGeneratorFv: @@ -241,7 +241,7 @@ lbl_8036A040: /* 8036A04C 00366FAC 83 C1 00 08 */ lwz r30, 8(r1) /* 8036A050 00366FB0 7C 08 03 A6 */ mtlr r0 /* 8036A054 00366FB4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8036A058 00366FB8 4E 80 00 20 */ blr +/* 8036A058 00366FB8 4E 80 00 20 */ blr .global __dt__12CRumbleVoiceFv __dt__12CRumbleVoiceFv: @@ -334,7 +334,7 @@ lbl_8036A178: /* 8036A184 003670E4 83 C1 00 28 */ lwz r30, 0x28(r1) /* 8036A188 003670E8 7C 08 03 A6 */ mtlr r0 /* 8036A18C 003670EC 38 21 00 30 */ addi r1, r1, 0x30 -/* 8036A190 003670F0 4E 80 00 20 */ blr +/* 8036A190 003670F0 4E 80 00 20 */ blr .global __ct__16CRumbleGeneratorFv __ct__16CRumbleGeneratorFv: diff --git a/asm/Kyoto/Input/CRumbleVoice.s b/asm/Kyoto/Input/CRumbleVoice.s index 68dc53ad..6cbfbe81 100644 --- a/asm/Kyoto/Input/CRumbleVoice.s +++ b/asm/Kyoto/Input/CRumbleVoice.s @@ -31,7 +31,7 @@ lbl_80369270: /* 8036928C 003661EC 7C 00 23 78 */ or r0, r0, r4 /* 80369290 003661F0 54 00 04 3E */ clrlwi r0, r0, 0x10 /* 80369294 003661F4 7C 03 07 34 */ extsh r3, r0 -/* 80369298 003661F8 4E 80 00 20 */ blr +/* 80369298 003661F8 4E 80 00 20 */ blr .global OwnsSustained__12CRumbleVoiceCFs OwnsSustained__12CRumbleVoiceCFs: @@ -46,10 +46,10 @@ OwnsSustained__12CRumbleVoiceCFs: /* 803692BC 0036621C 7C 04 00 50 */ subf r0, r4, r0 /* 803692C0 00366220 7C 00 00 34 */ cntlzw r0, r0 /* 803692C4 00366224 54 03 D9 7E */ srwi r3, r0, 5 -/* 803692C8 00366228 4E 80 00 20 */ blr +/* 803692C8 00366228 4E 80 00 20 */ blr lbl_803692CC: /* 803692CC 0036622C 38 60 00 00 */ li r3, 0 -/* 803692D0 00366230 4E 80 00 20 */ blr +/* 803692D0 00366230 4E 80 00 20 */ blr .global GetIntensity__12CRumbleVoiceCFv GetIntensity__12CRumbleVoiceCFv: @@ -72,9 +72,9 @@ lbl_803692FC: lbl_8036930C: /* 8036930C 0036626C C0 22 CD D8 */ lfs f1, lbl_805AEAF8@sda21(r2) /* 80369310 00366270 FC 02 08 40 */ fcmpo cr0, f2, f1 -/* 80369314 00366274 4D 81 00 20 */ bgtlr +/* 80369314 00366274 4D 81 00 20 */ bgtlr /* 80369318 00366278 FC 20 10 90 */ fmr f1, f2 -/* 8036931C 0036627C 4E 80 00 20 */ blr +/* 8036931C 0036627C 4E 80 00 20 */ blr .global GetFreeChannel__12CRumbleVoiceCFv GetFreeChannel__12CRumbleVoiceCFv: @@ -88,7 +88,7 @@ lbl_8036932C: /* 80369338 00366298 7C C0 00 39 */ and. r0, r6, r0 /* 8036933C 0036629C 40 82 00 0C */ bne lbl_80369348 /* 80369340 003662A0 7C 83 23 78 */ mr r3, r4 -/* 80369344 003662A4 4E 80 00 20 */ blr +/* 80369344 003662A4 4E 80 00 20 */ blr lbl_80369348: /* 80369348 003662A8 38 E7 00 01 */ addi r7, r7, 1 lbl_8036934C: @@ -96,7 +96,7 @@ lbl_8036934C: /* 80369350 003662B0 28 00 00 04 */ cmplwi r0, 4 /* 80369354 003662B4 41 80 FF D8 */ blt lbl_8036932C /* 80369358 003662B8 38 60 00 00 */ li r3, 0 -/* 8036935C 003662BC 4E 80 00 20 */ blr +/* 8036935C 003662BC 4E 80 00 20 */ blr .global Update__12CRumbleVoiceFf Update__12CRumbleVoiceFf: @@ -179,7 +179,7 @@ lbl_80369464: /* 8036947C 003663DC 83 81 00 30 */ lwz r28, 0x30(r1) /* 80369480 003663E0 7C 08 03 A6 */ mtlr r0 /* 80369484 003663E4 38 21 00 50 */ addi r1, r1, 0x50 -/* 80369488 003663E8 4E 80 00 20 */ blr +/* 80369488 003663E8 4E 80 00 20 */ blr .global UpdateChannel__12CRumbleVoiceFR10SAdsrDeltaRC9SAdsrDataf UpdateChannel__12CRumbleVoiceFR10SAdsrDeltaRC9SAdsrDataf: @@ -286,7 +286,7 @@ lbl_803695E8: /* 803695F4 00366554 38 00 00 00 */ li r0, 0 /* 803695F8 00366558 38 60 00 01 */ li r3, 1 /* 803695FC 0036655C 90 04 00 20 */ stw r0, 0x20(r4) -/* 80369600 00366560 4E 80 00 20 */ blr +/* 80369600 00366560 4E 80 00 20 */ blr lbl_80369604: /* 80369604 00366564 88 05 00 18 */ lbz r0, 0x18(r5) /* 80369608 00366568 54 00 CF FF */ rlwinm. r0, r0, 0x19, 0x1f, 0x1f @@ -323,7 +323,7 @@ lbl_80369668: /* 80369674 003665D4 38 00 00 00 */ li r0, 0 /* 80369678 003665D8 38 60 00 01 */ li r3, 1 /* 8036967C 003665DC 90 04 00 20 */ stw r0, 0x20(r4) -/* 80369680 003665E0 4E 80 00 20 */ blr +/* 80369680 003665E0 4E 80 00 20 */ blr lbl_80369684: /* 80369684 003665E4 88 05 00 18 */ lbz r0, 0x18(r5) /* 80369688 003665E8 54 00 D7 FF */ rlwinm. r0, r0, 0x1a, 0x1f, 0x1f @@ -343,7 +343,7 @@ lbl_803696AC: /* 803696BC 0036661C 90 04 00 20 */ stw r0, 0x20(r4) lbl_803696C0: /* 803696C0 00366620 38 60 00 00 */ li r3, 0 -/* 803696C4 00366624 4E 80 00 20 */ blr +/* 803696C4 00366624 4E 80 00 20 */ blr .global HardReset__12CRumbleVoiceFv HardReset__12CRumbleVoiceFv: @@ -398,7 +398,7 @@ lbl_80369768: /* 80369780 003666E0 83 A1 00 34 */ lwz r29, 0x34(r1) /* 80369784 003666E4 7C 08 03 A6 */ mtlr r0 /* 80369788 003666E8 38 21 00 40 */ addi r1, r1, 0x40 -/* 8036978C 003666EC 4E 80 00 20 */ blr +/* 8036978C 003666EC 4E 80 00 20 */ blr .global Deactivate__12CRumbleVoiceFsb Deactivate__12CRumbleVoiceFsb: @@ -434,7 +434,7 @@ lbl_803697F4: /* 803697FC 0036675C 83 C1 00 08 */ lwz r30, 8(r1) /* 80369800 00366760 7C 08 03 A6 */ mtlr r0 /* 80369804 00366764 38 21 00 10 */ addi r1, r1, 0x10 -/* 80369808 00366768 4E 80 00 20 */ blr +/* 80369808 00366768 4E 80 00 20 */ blr .global Activate__12CRumbleVoiceFRC9SAdsrDatasf15ERumblePriority Activate__12CRumbleVoiceFRC9SAdsrDatasf15ERumblePriority: @@ -530,7 +530,7 @@ lbl_8036995C: /* 80369968 003668C8 80 01 00 64 */ lwz r0, 0x64(r1) /* 8036996C 003668CC 7C 08 03 A6 */ mtlr r0 /* 80369970 003668D0 38 21 00 60 */ addi r1, r1, 0x60 -/* 80369974 003668D4 4E 80 00 20 */ blr +/* 80369974 003668D4 4E 80 00 20 */ blr .global __ct__12CRumbleVoiceFv __ct__12CRumbleVoiceFv: @@ -699,4 +699,4 @@ lbl_80369BB4: /* 80369BC8 00366B28 80 01 00 54 */ lwz r0, 0x54(r1) /* 80369BCC 00366B2C 7C 08 03 A6 */ mtlr r0 /* 80369BD0 00366B30 38 21 00 50 */ addi r1, r1, 0x50 -/* 80369BD4 00366B34 4E 80 00 20 */ blr +/* 80369BD4 00366B34 4E 80 00 20 */ blr diff --git a/asm/Kyoto/Input/DolphinIController.s b/asm/Kyoto/Input/DolphinIController.s index b0e87254..0745e038 100644 --- a/asm/Kyoto/Input/DolphinIController.s +++ b/asm/Kyoto/Input/DolphinIController.s @@ -48,7 +48,7 @@ lbl_8034EFE8: /* 8034EFF8 0034BF58 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8034EFFC 0034BF5C 7C 08 03 A6 */ mtlr r0 /* 8034F000 0034BF60 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034F004 0034BF64 4E 80 00 20 */ blr +/* 8034F004 0034BF64 4E 80 00 20 */ blr .global __dt__11IControllerFv __dt__11IControllerFv: @@ -70,7 +70,7 @@ lbl_8034F038: /* 8034F040 0034BFA0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8034F044 0034BFA4 7C 08 03 A6 */ mtlr r0 /* 8034F048 0034BFA8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8034F04C 0034BFAC 4E 80 00 20 */ blr +/* 8034F04C 0034BFAC 4E 80 00 20 */ blr .global __ct__11IControllerFv __ct__11IControllerFv: diff --git a/asm/Kyoto/Input/RumbleAdsr.s b/asm/Kyoto/Input/RumbleAdsr.s index 531e64c5..0b080d84 100644 --- a/asm/Kyoto/Input/RumbleAdsr.s +++ b/asm/Kyoto/Input/RumbleAdsr.s @@ -16,7 +16,7 @@ __ct__9SAdsrDataFffffffbb: /* 80369BFC 00366B5C 88 03 00 18 */ lbz r0, 0x18(r3) /* 80369C00 00366B60 50 A0 36 72 */ rlwimi r0, r5, 6, 0x19, 0x19 /* 80369C04 00366B64 98 03 00 18 */ stb r0, 0x18(r3) -/* 80369C08 00366B68 4E 80 00 20 */ blr +/* 80369C08 00366B68 4E 80 00 20 */ blr .global __ct__9SAdsrDataFv __ct__9SAdsrDataFv: @@ -34,7 +34,7 @@ __ct__9SAdsrDataFv: /* 80369C38 00366B98 88 03 00 18 */ lbz r0, 0x18(r3) /* 80369C3C 00366B9C 50 80 36 72 */ rlwimi r0, r4, 6, 0x19, 0x19 /* 80369C40 00366BA0 98 03 00 18 */ stb r0, 0x18(r3) -/* 80369C44 00366BA4 4E 80 00 20 */ blr +/* 80369C44 00366BA4 4E 80 00 20 */ blr .global __ct__10SAdsrDeltaFQ210SAdsrDelta6EPhase15ERumblePriority __ct__10SAdsrDeltaFQ210SAdsrDelta6EPhase15ERumblePriority: @@ -53,7 +53,7 @@ lbl_80369C5C: /* 80369C70 00366BD0 D0 03 00 10 */ stfs f0, 0x10(r3) /* 80369C74 00366BD4 90 A3 00 1C */ stw r5, 0x1c(r3) /* 80369C78 00366BD8 90 83 00 20 */ stw r4, 0x20(r3) -/* 80369C7C 00366BDC 4E 80 00 20 */ blr +/* 80369C7C 00366BDC 4E 80 00 20 */ blr .global __ct__10SAdsrDeltaFQ210SAdsrDelta6EPhase __ct__10SAdsrDeltaFQ210SAdsrDelta6EPhase: @@ -66,7 +66,7 @@ __ct__10SAdsrDeltaFQ210SAdsrDelta6EPhase: /* 80369C98 00366BF8 D0 03 00 10 */ stfs f0, 0x10(r3) /* 80369C9C 00366BFC 90 03 00 1C */ stw r0, 0x1c(r3) /* 80369CA0 00366C00 90 83 00 20 */ stw r4, 0x20(r3) -/* 80369CA4 00366C04 4E 80 00 20 */ blr +/* 80369CA4 00366C04 4E 80 00 20 */ blr .global Stopped__10SAdsrDeltaFv Stopped__10SAdsrDeltaFv: @@ -78,7 +78,7 @@ Stopped__10SAdsrDeltaFv: /* 80369CBC 00366C1C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80369CC0 00366C20 7C 08 03 A6 */ mtlr r0 /* 80369CC4 00366C24 38 21 00 10 */ addi r1, r1, 0x10 -/* 80369CC8 00366C28 4E 80 00 20 */ blr +/* 80369CC8 00366C28 4E 80 00 20 */ blr .global Start__10SAdsrDeltaF15ERumblePriorityb Start__10SAdsrDeltaF15ERumblePriorityb: diff --git a/asm/Kyoto/Math/CAABox.s b/asm/Kyoto/Math/CAABox.s index 4f146866..658164b2 100644 --- a/asm/Kyoto/Math/CAABox.s +++ b/asm/Kyoto/Math/CAABox.s @@ -58,7 +58,7 @@ ClosestPointAlongVector__6CAABoxCFRC9CVector3f: /* 8033720C 0033416C FC 00 10 6E */ fsel f0, f0, f1, f2 /* 80337210 00334170 D0 63 00 04 */ stfs f3, 4(r3) /* 80337214 00334174 D0 03 00 08 */ stfs f0, 8(r3) -/* 80337218 00334178 4E 80 00 20 */ blr +/* 80337218 00334178 4E 80 00 20 */ blr .global FurthestPointAlongVector__6CAABoxCFRC9CVector3f FurthestPointAlongVector__6CAABoxCFRC9CVector3f: @@ -77,7 +77,7 @@ FurthestPointAlongVector__6CAABoxCFRC9CVector3f: /* 8033724C 003341AC FC 00 10 6E */ fsel f0, f0, f1, f2 /* 80337250 003341B0 D0 63 00 04 */ stfs f3, 4(r3) /* 80337254 003341B4 D0 03 00 08 */ stfs f0, 8(r3) -/* 80337258 003341B8 4E 80 00 20 */ blr +/* 80337258 003341B8 4E 80 00 20 */ blr .global DistanceBetween__6CAABoxFRC6CAABoxRC6CAABox DistanceBetween__6CAABoxFRC6CAABoxRC6CAABox: @@ -189,7 +189,7 @@ lbl_803373C0: /* 803373D0 00334330 38 63 E3 18 */ addi r3, r3, lbl_803EE318@l /* 803373D4 00334334 7C 03 00 2E */ lwzx r0, r3, r0 /* 803373D8 00334338 7C 09 03 A6 */ mtctr r0 -/* 803373DC 0033433C 4E 80 04 20 */ bctr +/* 803373DC 0033433C 4E 80 04 20 */ bctr .global lbl_803373E0 lbl_803373E0: /* 803373E0 00334340 FC 80 F0 18 */ frsp f4, f30 @@ -292,7 +292,7 @@ lbl_80337508: /* 80337524 00334484 83 E1 00 6C */ lwz r31, 0x6c(r1) /* 80337528 00334488 7C 08 03 A6 */ mtlr r0 /* 8033752C 0033448C 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 80337530 00334490 4E 80 00 20 */ blr +/* 80337530 00334490 4E 80 00 20 */ blr .global PointInside__6CAABoxCFRC9CVector3f PointInside__6CAABoxCFRC9CVector3f: @@ -327,7 +327,7 @@ PointInside__6CAABoxCFRC9CVector3f: /* 803375A4 00334504 38 00 00 01 */ li r0, 1 lbl_803375A8: /* 803375A8 00334508 7C 03 03 78 */ mr r3, r0 -/* 803375AC 0033450C 4E 80 00 20 */ blr +/* 803375AC 0033450C 4E 80 00 20 */ blr .global GetPoint__6CAABoxCFi GetPoint__6CAABoxCFi: @@ -353,7 +353,7 @@ GetPoint__6CAABoxCFi: /* 803375FC 0033455C D0 43 00 04 */ stfs f2, 4(r3) /* 80337600 00334560 D0 23 00 08 */ stfs f1, 8(r3) /* 80337604 00334564 38 21 00 10 */ addi r1, r1, 0x10 -/* 80337608 00334568 4E 80 00 20 */ blr +/* 80337608 00334568 4E 80 00 20 */ blr .global GetCenterPoint__6CAABoxCFv GetCenterPoint__6CAABoxCFv: @@ -373,7 +373,7 @@ GetCenterPoint__6CAABoxCFv: /* 80337640 003345A0 EC 04 00 72 */ fmuls f0, f4, f1 /* 80337644 003345A4 D0 43 00 04 */ stfs f2, 4(r3) /* 80337648 003345A8 D0 03 00 08 */ stfs f0, 8(r3) -/* 8033764C 003345AC 4E 80 00 20 */ blr +/* 8033764C 003345AC 4E 80 00 20 */ blr .global GetVolume__6CAABoxCFv GetVolume__6CAABoxCFv: @@ -388,7 +388,7 @@ GetVolume__6CAABoxCFv: /* 80337670 003345D0 EC 23 08 28 */ fsubs f1, f3, f1 /* 80337674 003345D4 EC 02 00 32 */ fmuls f0, f2, f0 /* 80337678 003345D8 EC 21 00 32 */ fmuls f1, f1, f0 -/* 8033767C 003345DC 4E 80 00 20 */ blr +/* 8033767C 003345DC 4E 80 00 20 */ blr .global Invalid__6CAABoxCFv Invalid__6CAABoxCFv: @@ -435,7 +435,7 @@ lbl_80337710: /* 80337714 00334674 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80337718 00334678 7C 08 03 A6 */ mtlr r0 /* 8033771C 0033467C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80337720 00334680 4E 80 00 20 */ blr +/* 80337720 00334680 4E 80 00 20 */ blr .global GetBooleanIntersection__6CAABoxCFRC6CAABox GetBooleanIntersection__6CAABoxCFRC6CAABox: @@ -527,7 +527,7 @@ lbl_80337840: /* 80337864 003347C4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80337868 003347C8 7C 08 03 A6 */ mtlr r0 /* 8033786C 003347CC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80337870 003347D0 4E 80 00 20 */ blr +/* 80337870 003347D0 4E 80 00 20 */ blr .global ClampToBox__6CAABoxCFRC9CVector3f ClampToBox__6CAABoxCFRC9CVector3f: @@ -573,7 +573,7 @@ lbl_803378EC: /* 803378EC 0033484C D0 63 00 00 */ stfs f3, 0(r3) /* 803378F0 00334850 D0 43 00 04 */ stfs f2, 4(r3) /* 803378F4 00334854 D0 23 00 08 */ stfs f1, 8(r3) -/* 803378F8 00334858 4E 80 00 20 */ blr +/* 803378F8 00334858 4E 80 00 20 */ blr .global GetTransformedAABox__6CAABoxCFRC12CTransform4f GetTransformedAABox__6CAABoxCFRC12CTransform4f: @@ -656,7 +656,7 @@ lbl_80337A14: /* 80337A14 00334974 80 01 00 24 */ lwz r0, 0x24(r1) /* 80337A18 00334978 7C 08 03 A6 */ mtlr r0 /* 80337A1C 0033497C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80337A20 00334980 4E 80 00 20 */ blr +/* 80337A20 00334980 4E 80 00 20 */ blr .global InsidePlane__6CAABoxCFRC6CPlane InsidePlane__6CAABoxCFRC6CPlane: @@ -682,7 +682,7 @@ InsidePlane__6CAABoxCFRC6CPlane: /* 80337A70 003349D0 54 00 1F FE */ rlwinm r0, r0, 3, 0x1f, 0x1f /* 80337A74 003349D4 7C 00 00 34 */ cntlzw r0, r0 /* 80337A78 003349D8 54 03 D9 7E */ srwi r3, r0, 5 -/* 80337A7C 003349DC 4E 80 00 20 */ blr +/* 80337A7C 003349DC 4E 80 00 20 */ blr .global Inside__6CAABoxCFRC6CAABox Inside__6CAABoxCFRC6CAABox: @@ -717,10 +717,10 @@ Inside__6CAABoxCFRC6CAABox: /* 80337AF0 00334A50 4C 40 13 82 */ cror 2, 0, 2 /* 80337AF4 00334A54 40 82 00 0C */ bne lbl_80337B00 /* 80337AF8 00334A58 38 60 00 01 */ li r3, 1 -/* 80337AFC 00334A5C 4E 80 00 20 */ blr +/* 80337AFC 00334A5C 4E 80 00 20 */ blr lbl_80337B00: /* 80337B00 00334A60 38 60 00 00 */ li r3, 0 -/* 80337B04 00334A64 4E 80 00 20 */ blr +/* 80337B04 00334A64 4E 80 00 20 */ blr .global AccumulateBounds__6CAABoxFRC9CVector3f AccumulateBounds__6CAABoxFRC9CVector3f: @@ -757,9 +757,9 @@ lbl_80337B6C: /* 80337B6C 00334ACC C0 24 00 08 */ lfs f1, 8(r4) /* 80337B70 00334AD0 C0 03 00 14 */ lfs f0, 0x14(r3) /* 80337B74 00334AD4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80337B78 00334AD8 4C 81 00 20 */ blelr +/* 80337B78 00334AD8 4C 81 00 20 */ blelr /* 80337B7C 00334ADC D0 23 00 14 */ stfs f1, 0x14(r3) -/* 80337B80 00334AE0 4E 80 00 20 */ blr +/* 80337B80 00334AE0 4E 80 00 20 */ blr .global DoBoundsOverlap__6CAABoxCFRC6CAABox DoBoundsOverlap__6CAABoxCFRC6CAABox: @@ -789,10 +789,10 @@ DoBoundsOverlap__6CAABoxCFRC6CAABox: /* 80337BE0 00334B40 40 81 00 0C */ ble lbl_80337BEC lbl_80337BE4: /* 80337BE4 00334B44 38 60 00 00 */ li r3, 0 -/* 80337BE8 00334B48 4E 80 00 20 */ blr +/* 80337BE8 00334B48 4E 80 00 20 */ blr lbl_80337BEC: /* 80337BEC 00334B4C 38 60 00 01 */ li r3, 1 -/* 80337BF0 00334B50 4E 80 00 20 */ blr +/* 80337BF0 00334B50 4E 80 00 20 */ blr .global GetTri__6CAABoxCFQ26CAABox10EBoxFaceIdi GetTri__6CAABoxCFQ26CAABox10EBoxFaceIdi: @@ -974,7 +974,7 @@ lbl_80337DD4: /* 80337E90 00334DF0 80 01 00 64 */ lwz r0, 0x64(r1) /* 80337E94 00334DF4 7C 08 03 A6 */ mtlr r0 /* 80337E98 00334DF8 38 21 00 60 */ addi r1, r1, 0x60 -/* 80337E9C 00334DFC 4E 80 00 20 */ blr +/* 80337E9C 00334DFC 4E 80 00 20 */ blr .global GetEdge__6CAABoxCFQ26CAABox10EBoxEdgeId GetEdge__6CAABoxCFQ26CAABox10EBoxEdgeId: @@ -998,7 +998,7 @@ GetEdge__6CAABoxCFQ26CAABox10EBoxEdgeId: /* 80337EE4 00334E44 38 63 E3 38 */ addi r3, r3, lbl_803EE338@l /* 80337EE8 00334E48 7C 03 00 2E */ lwzx r0, r3, r0 /* 80337EEC 00334E4C 7C 09 03 A6 */ mtctr r0 -/* 80337EF0 00334E50 4E 80 04 20 */ bctr +/* 80337EF0 00334E50 4E 80 04 20 */ bctr .global lbl_80337EF4 lbl_80337EF4: /* 80337EF4 00334E54 C3 A4 00 04 */ lfs f29, 4(r4) @@ -1413,7 +1413,7 @@ lbl_803384D4: /* 803384F8 00335458 83 E1 01 EC */ lwz r31, 0x1ec(r1) /* 803384FC 0033545C 7C 08 03 A6 */ mtlr r0 /* 80338500 00335460 38 21 02 30 */ addi r1, r1, 0x230 -/* 80338504 00335464 4E 80 00 20 */ blr +/* 80338504 00335464 4E 80 00 20 */ blr .global __ct__6CAABoxFRC9CVector3fRC9CVector3f __ct__6CAABoxFRC9CVector3fRC9CVector3f: @@ -1429,7 +1429,7 @@ __ct__6CAABoxFRC9CVector3fRC9CVector3f: /* 8033852C 0033548C D0 03 00 10 */ stfs f0, 0x10(r3) /* 80338530 00335490 C0 05 00 08 */ lfs f0, 8(r5) /* 80338534 00335494 D0 03 00 14 */ stfs f0, 0x14(r3) -/* 80338538 00335498 4E 80 00 20 */ blr +/* 80338538 00335498 4E 80 00 20 */ blr .global __ct__6CAABoxFR12CInputStream __ct__6CAABoxFR12CInputStream: @@ -1450,7 +1450,7 @@ __ct__6CAABoxFR12CInputStream: /* 80338574 003354D4 83 C1 00 08 */ lwz r30, 8(r1) /* 80338578 003354D8 7C 08 03 A6 */ mtlr r0 /* 8033857C 003354DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80338580 003354E0 4E 80 00 20 */ blr +/* 80338580 003354E0 4E 80 00 20 */ blr .global __sinit_CAABox_cpp __sinit_CAABox_cpp: @@ -1471,4 +1471,4 @@ __sinit_CAABox_cpp: /* 803385BC 0033551C D0 03 00 0C */ stfs f0, 0xc(r3) /* 803385C0 00335520 D0 03 00 10 */ stfs f0, 0x10(r3) /* 803385C4 00335524 D0 03 00 14 */ stfs f0, 0x14(r3) -/* 803385C8 00335528 4E 80 00 20 */ blr +/* 803385C8 00335528 4E 80 00 20 */ blr diff --git a/asm/Kyoto/Math/CFrustumPlanes.s b/asm/Kyoto/Math/CFrustumPlanes.s index 397cf937..5766dfef 100644 --- a/asm/Kyoto/Math/CFrustumPlanes.s +++ b/asm/Kyoto/Math/CFrustumPlanes.s @@ -24,13 +24,13 @@ lbl_80344FE0: /* 8034500C 00341F6C 4C 41 13 82 */ cror 2, 1, 2 /* 80345010 00341F70 40 82 00 0C */ bne lbl_8034501C /* 80345014 00341F74 38 60 00 00 */ li r3, 0 -/* 80345018 00341F78 4E 80 00 20 */ blr +/* 80345018 00341F78 4E 80 00 20 */ blr lbl_8034501C: /* 8034501C 00341F7C 38 63 00 10 */ addi r3, r3, 0x10 /* 80345020 00341F80 42 00 FF C0 */ bdnz lbl_80344FE0 lbl_80345024: /* 80345024 00341F84 38 60 00 01 */ li r3, 1 -/* 80345028 00341F88 4E 80 00 20 */ blr +/* 80345028 00341F88 4E 80 00 20 */ blr .global SphereInFrustumPlanes__14CFrustumPlanesCFRC7CSphere SphereInFrustumPlanes__14CFrustumPlanesCFRC7CSphere: @@ -57,13 +57,13 @@ lbl_80345054: /* 80345078 00341FD8 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8034507C 00341FDC 40 81 00 0C */ ble lbl_80345088 /* 80345080 00341FE0 38 60 00 00 */ li r3, 0 -/* 80345084 00341FE4 4E 80 00 20 */ blr +/* 80345084 00341FE4 4E 80 00 20 */ blr lbl_80345088: /* 80345088 00341FE8 38 63 00 10 */ addi r3, r3, 0x10 /* 8034508C 00341FEC 42 00 FF C8 */ bdnz lbl_80345054 lbl_80345090: /* 80345090 00341FF0 38 60 00 01 */ li r3, 1 -/* 80345094 00341FF4 4E 80 00 20 */ blr +/* 80345094 00341FF4 4E 80 00 20 */ blr .global sub_80345098 sub_80345098: @@ -131,7 +131,7 @@ lbl_80345174: /* 80345178 003420D8 80 01 00 44 */ lwz r0, 0x44(r1) /* 8034517C 003420DC 7C 08 03 A6 */ mtlr r0 /* 80345180 003420E0 38 21 00 40 */ addi r1, r1, 0x40 -/* 80345184 003420E4 4E 80 00 20 */ blr +/* 80345184 003420E4 4E 80 00 20 */ blr .global "BoxInFrustumPlanes__14CFrustumPlanesCFRCQ24rstl24optional_object<6CAABox>" "BoxInFrustumPlanes__14CFrustumPlanesCFRCQ24rstl24optional_object<6CAABox>": @@ -155,7 +155,7 @@ lbl_803451C0: /* 803451C0 00342120 80 01 00 14 */ lwz r0, 0x14(r1) /* 803451C4 00342124 7C 08 03 A6 */ mtlr r0 /* 803451C8 00342128 38 21 00 10 */ addi r1, r1, 0x10 -/* 803451CC 0034212C 4E 80 00 20 */ blr +/* 803451CC 0034212C 4E 80 00 20 */ blr .global BoxInFrustumPlanes__14CFrustumPlanesCFRC6CAABox BoxInFrustumPlanes__14CFrustumPlanesCFRC6CAABox: @@ -195,7 +195,7 @@ lbl_80345234: /* 80345244 003421A4 83 81 00 10 */ lwz r28, 0x10(r1) /* 80345248 003421A8 7C 08 03 A6 */ mtlr r0 /* 8034524C 003421AC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80345250 003421B0 4E 80 00 20 */ blr +/* 80345250 003421B0 4E 80 00 20 */ blr .global __ct__14CFrustumPlanesFRC12CTransform4ffffbf __ct__14CFrustumPlanesFRC12CTransform4ffffbf: @@ -484,7 +484,7 @@ lbl_80345660: /* 803456A0 00342600 80 01 01 84 */ lwz r0, 0x184(r1) /* 803456A4 00342604 7C 08 03 A6 */ mtlr r0 /* 803456A8 00342608 38 21 01 80 */ addi r1, r1, 0x180 -/* 803456AC 0034260C 4E 80 00 20 */ blr +/* 803456AC 0034260C 4E 80 00 20 */ blr .global sub_803456b0 sub_803456b0: diff --git a/asm/Kyoto/Math/CMatrix3f.s b/asm/Kyoto/Math/CMatrix3f.s index 68935dff..1c24e2df 100644 --- a/asm/Kyoto/Math/CMatrix3f.s +++ b/asm/Kyoto/Math/CMatrix3f.s @@ -14,7 +14,7 @@ __as__9CMatrix3fFRC9CMatrix3f: /* 80310014 0030CF74 C0 24 00 20 */ lfs f1, 0x20(r4) /* 80310018 0030CF78 D8 03 00 18 */ stfd f0, 0x18(r3) /* 8031001C 0030CF7C D0 23 00 20 */ stfs f1, 0x20(r3) -/* 80310020 0030CF80 4E 80 00 20 */ blr +/* 80310020 0030CF80 4E 80 00 20 */ blr .global __ct__9CMatrix3fFRC9CMatrix3f __ct__9CMatrix3fFRC9CMatrix3f: @@ -28,7 +28,7 @@ __ct__9CMatrix3fFRC9CMatrix3f: /* 80310040 0030CFA0 C0 24 00 20 */ lfs f1, 0x20(r4) /* 80310044 0030CFA4 D8 03 00 18 */ stfd f0, 0x18(r3) /* 80310048 0030CFA8 D0 23 00 20 */ stfs f1, 0x20(r3) -/* 8031004C 0030CFAC 4E 80 00 20 */ blr +/* 8031004C 0030CFAC 4E 80 00 20 */ blr .global AddScaledMatrix__9CMatrix3fFRC9CMatrix3ff AddScaledMatrix__9CMatrix3fFRC9CMatrix3ff: @@ -68,7 +68,7 @@ AddScaledMatrix__9CMatrix3fFRC9CMatrix3ff: /* 803100D4 0030D034 C0 03 00 20 */ lfs f0, 0x20(r3) /* 803100D8 0030D038 EC 02 00 7A */ fmadds f0, f2, f1, f0 /* 803100DC 0030D03C D0 03 00 20 */ stfs f0, 0x20(r3) -/* 803100E0 0030D040 4E 80 00 20 */ blr +/* 803100E0 0030D040 4E 80 00 20 */ blr .global Determinant__9CMatrix3fCFv Determinant__9CMatrix3fCFv: @@ -90,7 +90,7 @@ Determinant__9CMatrix3fCFv: /* 80310120 0030D080 EC 29 22 38 */ fmsubs f1, f9, f8, f4 /* 80310124 0030D084 EC 03 00 BA */ fmadds f0, f3, f2, f0 /* 80310128 0030D088 EC 25 00 7A */ fmadds f1, f5, f1, f0 -/* 8031012C 0030D08C 4E 80 00 20 */ blr +/* 8031012C 0030D08C 4E 80 00 20 */ blr .global __ml__9CMatrix3fCFRC9CMatrix3f __ml__9CMatrix3fCFRC9CMatrix3f: @@ -182,7 +182,7 @@ __ml__9CMatrix3fCFRC9CMatrix3f: /* 80310284 0030D1E4 E3 01 00 18 */ psq_l f24, 24(r1), 0, qr0 /* 80310288 0030D1E8 CB 01 00 10 */ lfd f24, 0x10(r1) /* 8031028C 0030D1EC 38 21 00 90 */ addi r1, r1, 0x90 -/* 80310290 0030D1F0 4E 80 00 20 */ blr +/* 80310290 0030D1F0 4E 80 00 20 */ blr .global __ml__9CMatrix3fCFRC9CVector3f __ml__9CMatrix3fCFRC9CVector3f: @@ -210,7 +210,7 @@ __ml__9CMatrix3fCFRC9CVector3f: /* 803102E8 0030D248 EC 08 09 3A */ fmadds f0, f8, f4, f1 /* 803102EC 0030D24C D0 43 00 04 */ stfs f2, 4(r3) /* 803102F0 0030D250 D0 03 00 08 */ stfs f0, 8(r3) -/* 803102F4 0030D254 4E 80 00 20 */ blr +/* 803102F4 0030D254 4E 80 00 20 */ blr .global Orthonormalized__9CMatrix3fCFv Orthonormalized__9CMatrix3fCFv: @@ -281,7 +281,7 @@ Orthonormalized__9CMatrix3fCFv: /* 803103F8 0030D358 83 C1 00 38 */ lwz r30, 0x38(r1) /* 803103FC 0030D35C 7C 08 03 A6 */ mtlr r0 /* 80310400 0030D360 38 21 00 40 */ addi r1, r1, 0x40 -/* 80310404 0030D364 4E 80 00 20 */ blr +/* 80310404 0030D364 4E 80 00 20 */ blr .global RotateZ__9CMatrix3fFRC9CRelAngle RotateZ__9CMatrix3fFRC9CRelAngle: @@ -319,7 +319,7 @@ RotateZ__9CMatrix3fFRC9CRelAngle: /* 80310484 0030D3E4 83 C1 00 08 */ lwz r30, 8(r1) /* 80310488 0030D3E8 7C 08 03 A6 */ mtlr r0 /* 8031048C 0030D3EC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80310490 0030D3F0 4E 80 00 20 */ blr +/* 80310490 0030D3F0 4E 80 00 20 */ blr .global RotateY__9CMatrix3fFRC9CRelAngle RotateY__9CMatrix3fFRC9CRelAngle: @@ -357,7 +357,7 @@ RotateY__9CMatrix3fFRC9CRelAngle: /* 80310510 0030D470 83 C1 00 08 */ lwz r30, 8(r1) /* 80310514 0030D474 7C 08 03 A6 */ mtlr r0 /* 80310518 0030D478 38 21 00 20 */ addi r1, r1, 0x20 -/* 8031051C 0030D47C 4E 80 00 20 */ blr +/* 8031051C 0030D47C 4E 80 00 20 */ blr .global __ct__9CMatrix3fFR12CInputStream __ct__9CMatrix3fFR12CInputStream: @@ -401,7 +401,7 @@ __ct__9CMatrix3fFR12CInputStream: /* 803105B4 0030D514 83 C1 00 08 */ lwz r30, 8(r1) /* 803105B8 0030D518 7C 08 03 A6 */ mtlr r0 /* 803105BC 0030D51C 38 21 00 10 */ addi r1, r1, 0x10 -/* 803105C0 0030D520 4E 80 00 20 */ blr +/* 803105C0 0030D520 4E 80 00 20 */ blr .global __ct__9CMatrix3fFRC9CMatrix3ffRC9CMatrix3ff __ct__9CMatrix3fFRC9CMatrix3ffRC9CMatrix3ff: @@ -450,7 +450,7 @@ __ct__9CMatrix3fFRC9CMatrix3ffRC9CMatrix3ff: /* 8031066C 0030D5CC EC 00 00 B2 */ fmuls f0, f0, f2 /* 80310670 0030D5D0 EC 03 00 7A */ fmadds f0, f3, f1, f0 /* 80310674 0030D5D4 D0 03 00 20 */ stfs f0, 0x20(r3) -/* 80310678 0030D5D8 4E 80 00 20 */ blr +/* 80310678 0030D5D8 4E 80 00 20 */ blr .global __ct__9CMatrix3fFRC9CVector3fRC9CVector3fRC9CVector3f __ct__9CMatrix3fFRC9CVector3fRC9CVector3fRC9CVector3f: @@ -472,7 +472,7 @@ __ct__9CMatrix3fFRC9CVector3fRC9CVector3fRC9CVector3f: /* 803106B8 0030D618 D0 03 00 1C */ stfs f0, 0x1c(r3) /* 803106BC 0030D61C C0 06 00 08 */ lfs f0, 8(r6) /* 803106C0 0030D620 D0 03 00 20 */ stfs f0, 0x20(r3) -/* 803106C4 0030D624 4E 80 00 20 */ blr +/* 803106C4 0030D624 4E 80 00 20 */ blr .global __sinit_CMatrix3f_cpp __sinit_CMatrix3f_cpp: diff --git a/asm/Kyoto/Math/CMatrix4f.s b/asm/Kyoto/Math/CMatrix4f.s index 35334c45..0fe0974e 100644 --- a/asm/Kyoto/Math/CMatrix4f.s +++ b/asm/Kyoto/Math/CMatrix4f.s @@ -15,7 +15,7 @@ MultiplyGetW__9CMatrix4fCFRC9CVector3f: /* 80310740 0030D6A0 C0 23 00 3C */ lfs f1, 0x3c(r3) /* 80310744 0030D6A4 EC 04 00 FA */ fmadds f0, f4, f3, f0 /* 80310748 0030D6A8 EC 21 00 2A */ fadds f1, f1, f0 -/* 8031074C 0030D6AC 4E 80 00 20 */ blr +/* 8031074C 0030D6AC 4E 80 00 20 */ blr .global MultiplyOneOverW__9CMatrix4fCFRC9CVector3f MultiplyOneOverW__9CMatrix4fCFRC9CVector3f: @@ -62,7 +62,7 @@ MultiplyOneOverW__9CMatrix4fCFRC9CVector3f: /* 803107F0 0030D750 EC 00 03 72 */ fmuls f0, f0, f13 /* 803107F4 0030D754 D0 23 00 04 */ stfs f1, 4(r3) /* 803107F8 0030D758 D0 03 00 08 */ stfs f0, 8(r3) -/* 803107FC 0030D75C 4E 80 00 20 */ blr +/* 803107FC 0030D75C 4E 80 00 20 */ blr .global __ml__9CMatrix4fCFRC9CVector3f __ml__9CMatrix4fCFRC9CVector3f: @@ -96,7 +96,7 @@ __ml__9CMatrix4fCFRC9CVector3f: /* 8031086C 0030D7CC EC 04 08 2A */ fadds f0, f4, f1 /* 80310870 0030D7D0 D0 43 00 04 */ stfs f2, 4(r3) /* 80310874 0030D7D4 D0 03 00 08 */ stfs f0, 8(r3) -/* 80310878 0030D7D8 4E 80 00 20 */ blr +/* 80310878 0030D7D8 4E 80 00 20 */ blr .global __ct__9CMatrix4fFffffffffffffffff __ct__9CMatrix4fFffffffffffffffff: @@ -124,7 +124,7 @@ __ct__9CMatrix4fFffffffffffffffff: /* 803108D0 0030D830 D0 43 00 34 */ stfs f2, 0x34(r3) /* 803108D4 0030D834 D0 23 00 38 */ stfs f1, 0x38(r3) /* 803108D8 0030D838 D0 03 00 3C */ stfs f0, 0x3c(r3) -/* 803108DC 0030D83C 4E 80 00 20 */ blr +/* 803108DC 0030D83C 4E 80 00 20 */ blr .global __sinit_CMatrix4f_cpp __sinit_CMatrix4f_cpp: diff --git a/asm/Kyoto/Math/CPlane.s b/asm/Kyoto/Math/CPlane.s index b732cc46..6117179f 100644 --- a/asm/Kyoto/Math/CPlane.s +++ b/asm/Kyoto/Math/CPlane.s @@ -45,7 +45,7 @@ lbl_8033709C: /* 8033709C 00333FFC FC 20 00 90 */ fmr f1, f0 lbl_803370A0: /* 803370A0 00334000 38 21 00 20 */ addi r1, r1, 0x20 -/* 803370A4 00334004 4E 80 00 20 */ blr +/* 803370A4 00334004 4E 80 00 20 */ blr .global __ct__6CPlaneFRC9CVector3fRC9CVector3fRC9CVector3f __ct__6CPlaneFRC9CVector3fRC9CVector3fRC9CVector3f: diff --git a/asm/Kyoto/Math/CQuaternion.s b/asm/Kyoto/Math/CQuaternion.s index 185a589d..df240532 100644 --- a/asm/Kyoto/Math/CQuaternion.s +++ b/asm/Kyoto/Math/CQuaternion.s @@ -76,7 +76,7 @@ FromNUQuaternion__11CQuaternionFRC13CNUQuaternion: /* 80310A28 0030D988 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80310A2C 0030D98C 7C 08 03 A6 */ mtlr r0 /* 80310A30 0030D990 38 21 00 20 */ addi r1, r1, 0x20 -/* 80310A34 0030D994 4E 80 00 20 */ blr +/* 80310A34 0030D994 4E 80 00 20 */ blr .global __ml__FfRC13CNUQuaternion __ml__FfRC13CNUQuaternion: @@ -102,7 +102,7 @@ __ml__FfRC13CNUQuaternion: /* 80310A84 0030D9E4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80310A88 0030D9E8 7C 08 03 A6 */ mtlr r0 /* 80310A8C 0030D9EC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80310A90 0030D9F0 4E 80 00 20 */ blr +/* 80310A90 0030D9F0 4E 80 00 20 */ blr .global __ml__FRC13CNUQuaternionf __ml__FRC13CNUQuaternionf: @@ -128,7 +128,7 @@ __ml__FRC13CNUQuaternionf: /* 80310AE0 0030DA40 80 01 00 24 */ lwz r0, 0x24(r1) /* 80310AE4 0030DA44 7C 08 03 A6 */ mtlr r0 /* 80310AE8 0030DA48 38 21 00 20 */ addi r1, r1, 0x20 -/* 80310AEC 0030DA4C 4E 80 00 20 */ blr +/* 80310AEC 0030DA4C 4E 80 00 20 */ blr .global BuildFromMatrix3f__13CNUQuaternionFRC9CMatrix3f BuildFromMatrix3f__13CNUQuaternionFRC9CMatrix3f: @@ -277,7 +277,7 @@ lbl_80310CFC: /* 80310D04 0030DC64 83 C1 00 08 */ lwz r30, 8(r1) /* 80310D08 0030DC68 7C 08 03 A6 */ mtlr r0 /* 80310D0C 0030DC6C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80310D10 0030DC70 4E 80 00 20 */ blr +/* 80310D10 0030DC70 4E 80 00 20 */ blr .global BuildFromQuaternion__13CNUQuaternionFRC11CQuaternion BuildFromQuaternion__13CNUQuaternionFRC11CQuaternion: @@ -290,7 +290,7 @@ BuildFromQuaternion__13CNUQuaternionFRC11CQuaternion: /* 80310D2C 0030DC8C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80310D30 0030DC90 7C 08 03 A6 */ mtlr r0 /* 80310D34 0030DC94 38 21 00 10 */ addi r1, r1, 0x10 -/* 80310D38 0030DC98 4E 80 00 20 */ blr +/* 80310D38 0030DC98 4E 80 00 20 */ blr .global BuildFromAxisAngle__13CNUQuaternionFRC9CVector3ff BuildFromAxisAngle__13CNUQuaternionFRC9CVector3ff: @@ -336,7 +336,7 @@ BuildFromAxisAngle__13CNUQuaternionFRC9CVector3ff: /* 80310DD8 0030DD38 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80310DDC 0030DD3C 7C 08 03 A6 */ mtlr r0 /* 80310DE0 0030DD40 38 21 00 50 */ addi r1, r1, 0x50 -/* 80310DE4 0030DD44 4E 80 00 20 */ blr +/* 80310DE4 0030DD44 4E 80 00 20 */ blr .global AsNormalized__13CNUQuaternionCFv AsNormalized__13CNUQuaternionCFv: @@ -381,7 +381,7 @@ AsNormalized__13CNUQuaternionCFv: /* 80310E80 0030DDE0 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80310E84 0030DDE4 7C 08 03 A6 */ mtlr r0 /* 80310E88 0030DDE8 38 21 00 30 */ addi r1, r1, 0x30 -/* 80310E8C 0030DDEC 4E 80 00 20 */ blr +/* 80310E8C 0030DDEC 4E 80 00 20 */ blr .global __apl__13CNUQuaternionFRC13CNUQuaternion __apl__13CNUQuaternionFRC13CNUQuaternion: @@ -401,7 +401,7 @@ __apl__13CNUQuaternionFRC13CNUQuaternion: /* 80310EC4 0030DE24 C0 04 00 0C */ lfs f0, 0xc(r4) /* 80310EC8 0030DE28 EC 01 00 2A */ fadds f0, f1, f0 /* 80310ECC 0030DE2C D0 03 00 0C */ stfs f0, 0xc(r3) -/* 80310ED0 0030DE30 4E 80 00 20 */ blr +/* 80310ED0 0030DE30 4E 80 00 20 */ blr .global __ml__13CNUQuaternionCFRC13CNUQuaternion __ml__13CNUQuaternionCFRC13CNUQuaternion: @@ -474,7 +474,7 @@ __ml__13CNUQuaternionCFRC13CNUQuaternion: /* 80310FDC 0030DF3C CB 81 00 50 */ lfd f28, 0x50(r1) /* 80310FE0 0030DF40 7C 08 03 A6 */ mtlr r0 /* 80310FE4 0030DF44 38 21 00 90 */ addi r1, r1, 0x90 -/* 80310FE8 0030DF48 4E 80 00 20 */ blr +/* 80310FE8 0030DF48 4E 80 00 20 */ blr .global __ct__13CNUQuaternionFffff __ct__13CNUQuaternionFffff: @@ -482,7 +482,7 @@ __ct__13CNUQuaternionFffff: /* 80310FF0 0030DF50 D0 43 00 04 */ stfs f2, 4(r3) /* 80310FF4 0030DF54 D0 63 00 08 */ stfs f3, 8(r3) /* 80310FF8 0030DF58 D0 83 00 0C */ stfs f4, 0xc(r3) -/* 80310FFC 0030DF5C 4E 80 00 20 */ blr +/* 80310FFC 0030DF5C 4E 80 00 20 */ blr .global __ct__13CNUQuaternionFfRC9CVector3f __ct__13CNUQuaternionFfRC9CVector3f: @@ -493,7 +493,7 @@ __ct__13CNUQuaternionFfRC9CVector3f: /* 80311010 0030DF70 D0 03 00 08 */ stfs f0, 8(r3) /* 80311014 0030DF74 C0 04 00 08 */ lfs f0, 8(r4) /* 80311018 0030DF78 D0 03 00 0C */ stfs f0, 0xc(r3) -/* 8031101C 0030DF7C 4E 80 00 20 */ blr +/* 8031101C 0030DF7C 4E 80 00 20 */ blr .global ClampedRotateTo__11CQuaternionFRC10UnitVectorRC10UnitVectorRC9CRelAngle ClampedRotateTo__11CQuaternionFRC10UnitVectorRC10UnitVectorRC9CRelAngle: @@ -552,7 +552,7 @@ lbl_803110D4: /* 803110E8 0030E048 83 A1 00 44 */ lwz r29, 0x44(r1) /* 803110EC 0030E04C 7C 08 03 A6 */ mtlr r0 /* 803110F0 0030E050 38 21 00 60 */ addi r1, r1, 0x60 -/* 803110F4 0030E054 4E 80 00 20 */ blr +/* 803110F4 0030E054 4E 80 00 20 */ blr .global ZRotation__11CQuaternionFRC9CRelAngle ZRotation__11CQuaternionFRC9CRelAngle: @@ -569,7 +569,7 @@ ZRotation__11CQuaternionFRC9CRelAngle: /* 80311120 0030E080 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80311124 0030E084 7C 08 03 A6 */ mtlr r0 /* 80311128 0030E088 38 21 00 10 */ addi r1, r1, 0x10 -/* 8031112C 0030E08C 4E 80 00 20 */ blr +/* 8031112C 0030E08C 4E 80 00 20 */ blr .global YRotation__11CQuaternionFRC9CRelAngle YRotation__11CQuaternionFRC9CRelAngle: @@ -586,7 +586,7 @@ YRotation__11CQuaternionFRC9CRelAngle: /* 80311158 0030E0B8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8031115C 0030E0BC 7C 08 03 A6 */ mtlr r0 /* 80311160 0030E0C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80311164 0030E0C4 4E 80 00 20 */ blr +/* 80311164 0030E0C4 4E 80 00 20 */ blr .global XRotation__11CQuaternionFRC9CRelAngle XRotation__11CQuaternionFRC9CRelAngle: @@ -603,7 +603,7 @@ XRotation__11CQuaternionFRC9CRelAngle: /* 80311190 0030E0F0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80311194 0030E0F4 7C 08 03 A6 */ mtlr r0 /* 80311198 0030E0F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8031119C 0030E0FC 4E 80 00 20 */ blr +/* 8031119C 0030E0FC 4E 80 00 20 */ blr .global __ml__11CQuaternionCFRC11CQuaternion __ml__11CQuaternionCFRC11CQuaternion: @@ -655,7 +655,7 @@ __ml__11CQuaternionCFRC11CQuaternion: /* 80311254 0030E1B4 E3 A1 00 18 */ psq_l f29, 24(r1), 0, qr0 /* 80311258 0030E1B8 CB A1 00 10 */ lfd f29, 0x10(r1) /* 8031125C 0030E1BC 38 21 00 40 */ addi r1, r1, 0x40 -/* 80311260 0030E1C0 4E 80 00 20 */ blr +/* 80311260 0030E1C0 4E 80 00 20 */ blr .global Transform__11CQuaternionCFRC9CVector3f Transform__11CQuaternionCFRC9CVector3f: @@ -694,7 +694,7 @@ Transform__11CQuaternionCFRC9CVector3f: /* 803112E4 0030E244 EC 08 01 7A */ fmadds f0, f8, f5, f0 /* 803112E8 0030E248 D0 23 00 04 */ stfs f1, 4(r3) /* 803112EC 0030E24C D0 03 00 08 */ stfs f0, 8(r3) -/* 803112F0 0030E250 4E 80 00 20 */ blr +/* 803112F0 0030E250 4E 80 00 20 */ blr .global AxisAngle__11CQuaternionFRC13CUnitVector3fRC9CRelAngle AxisAngle__11CQuaternionFRC13CUnitVector3fRC9CRelAngle: @@ -739,7 +739,7 @@ AxisAngle__11CQuaternionFRC13CUnitVector3fRC9CRelAngle: /* 8031138C 0030E2EC 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80311390 0030E2F0 7C 08 03 A6 */ mtlr r0 /* 80311394 0030E2F4 38 21 00 30 */ addi r1, r1, 0x30 -/* 80311398 0030E2F8 4E 80 00 20 */ blr +/* 80311398 0030E2F8 4E 80 00 20 */ blr .global BuildNormalized__11CQuaternionCFv BuildNormalized__11CQuaternionCFv: @@ -779,7 +779,7 @@ BuildNormalized__11CQuaternionCFv: /* 80311420 0030E380 83 C1 00 08 */ lwz r30, 8(r1) /* 80311424 0030E384 7C 08 03 A6 */ mtlr r0 /* 80311428 0030E388 38 21 00 10 */ addi r1, r1, 0x10 -/* 8031142C 0030E38C 4E 80 00 20 */ blr +/* 8031142C 0030E38C 4E 80 00 20 */ blr .global BuildEquivalent__11CQuaternionCFv BuildEquivalent__11CQuaternionCFv: @@ -848,7 +848,7 @@ lbl_80311504: /* 80311514 0030E474 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80311518 0030E478 7C 08 03 A6 */ mtlr r0 /* 8031151C 0030E47C 38 21 00 40 */ addi r1, r1, 0x40 -/* 80311520 0030E480 4E 80 00 20 */ blr +/* 80311520 0030E480 4E 80 00 20 */ blr .global AngleFrom__11CQuaternionCFRC11CQuaternion AngleFrom__11CQuaternionCFRC11CQuaternion: @@ -891,7 +891,7 @@ lbl_80311598: /* 803115A8 0030E508 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 803115AC 0030E50C 7C 08 03 A6 */ mtlr r0 /* 803115B0 0030E510 38 21 00 20 */ addi r1, r1, 0x20 -/* 803115B4 0030E514 4E 80 00 20 */ blr +/* 803115B4 0030E514 4E 80 00 20 */ blr .global SlerpLocal__11CQuaternionFRC11CQuaternionRC11CQuaternionf SlerpLocal__11CQuaternionFRC11CQuaternionRC11CQuaternionf: @@ -951,7 +951,7 @@ lbl_80311654: /* 80311684 0030E5E4 83 C1 00 38 */ lwz r30, 0x38(r1) /* 80311688 0030E5E8 7C 08 03 A6 */ mtlr r0 /* 8031168C 0030E5EC 38 21 00 50 */ addi r1, r1, 0x50 -/* 80311690 0030E5F0 4E 80 00 20 */ blr +/* 80311690 0030E5F0 4E 80 00 20 */ blr .global LookAt__11CQuaternionFRC13CUnitVector3fRC13CUnitVector3fRC9CRelAngle LookAt__11CQuaternionFRC13CUnitVector3fRC13CUnitVector3fRC9CRelAngle: @@ -1238,7 +1238,7 @@ lbl_80311A7C: /* 80311AA8 0030EA08 83 A1 00 E4 */ lwz r29, 0xe4(r1) /* 80311AAC 0030EA0C 7C 08 03 A6 */ mtlr r0 /* 80311AB0 0030EA10 38 21 01 30 */ addi r1, r1, 0x130 -/* 80311AB4 0030EA14 4E 80 00 20 */ blr +/* 80311AB4 0030EA14 4E 80 00 20 */ blr .global ShortestRotationArc__11CQuaternionFRC9CVector3fRC9CVector3f ShortestRotationArc__11CQuaternionFRC9CVector3fRC9CVector3f: @@ -1395,7 +1395,7 @@ lbl_80311CE4: /* 80311CE8 0030EC48 83 E1 00 4C */ lwz r31, 0x4c(r1) /* 80311CEC 0030EC4C 7C 08 03 A6 */ mtlr r0 /* 80311CF0 0030EC50 38 21 00 50 */ addi r1, r1, 0x50 -/* 80311CF4 0030EC54 4E 80 00 20 */ blr +/* 80311CF4 0030EC54 4E 80 00 20 */ blr .global Slerp__11CQuaternionFRC11CQuaternionRC11CQuaternionf Slerp__11CQuaternionFRC11CQuaternionRC11CQuaternionf: @@ -1516,7 +1516,7 @@ lbl_80311E80: /* 80311EAC 0030EE0C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80311EB0 0030EE10 7C 08 03 A6 */ mtlr r0 /* 80311EB4 0030EE14 38 21 00 60 */ addi r1, r1, 0x60 -/* 80311EB8 0030EE18 4E 80 00 20 */ blr +/* 80311EB8 0030EE18 4E 80 00 20 */ blr .global BuildTransform4f__11CQuaternionCFRC9CVector3f BuildTransform4f__11CQuaternionCFRC9CVector3f: @@ -1582,7 +1582,7 @@ BuildTransform4f__11CQuaternionCFRC9CVector3f: /* 80311FA8 0030EF08 E3 81 00 18 */ psq_l f28, 24(r1), 0, qr0 /* 80311FAC 0030EF0C CB 81 00 10 */ lfd f28, 0x10(r1) /* 80311FB0 0030EF10 38 21 00 50 */ addi r1, r1, 0x50 -/* 80311FB4 0030EF14 4E 80 00 20 */ blr +/* 80311FB4 0030EF14 4E 80 00 20 */ blr .global BuildTransform4f__11CQuaternionCFv BuildTransform4f__11CQuaternionCFv: @@ -1638,7 +1638,7 @@ BuildTransform4f__11CQuaternionCFv: /* 8031207C 0030EFDC E3 C1 00 18 */ psq_l f30, 24(r1), 0, qr0 /* 80312080 0030EFE0 CB C1 00 10 */ lfd f30, 0x10(r1) /* 80312084 0030EFE4 38 21 00 30 */ addi r1, r1, 0x30 -/* 80312088 0030EFE8 4E 80 00 20 */ blr +/* 80312088 0030EFE8 4E 80 00 20 */ blr .global BuildTransform__11CQuaternionCFv BuildTransform__11CQuaternionCFv: @@ -1680,7 +1680,7 @@ BuildTransform__11CQuaternionCFv: /* 80312118 0030F078 D0 43 00 18 */ stfs f2, 0x18(r3) /* 8031211C 0030F07C D0 23 00 1C */ stfs f1, 0x1c(r3) /* 80312120 0030F080 D0 03 00 20 */ stfs f0, 0x20(r3) -/* 80312124 0030F084 4E 80 00 20 */ blr +/* 80312124 0030F084 4E 80 00 20 */ blr .global FromMatrix__11CQuaternionFRC12CTransform4f FromMatrix__11CQuaternionFRC12CTransform4f: @@ -1705,7 +1705,7 @@ FromMatrix__11CQuaternionFRC12CTransform4f: /* 80312170 0030F0D0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80312174 0030F0D4 7C 08 03 A6 */ mtlr r0 /* 80312178 0030F0D8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8031217C 0030F0DC 4E 80 00 20 */ blr +/* 8031217C 0030F0DC 4E 80 00 20 */ blr .global FromMatrix__11CQuaternionFRC9CMatrix3f FromMatrix__11CQuaternionFRC9CMatrix3f: @@ -1730,7 +1730,7 @@ FromMatrix__11CQuaternionFRC9CMatrix3f: /* 803121C8 0030F128 80 01 00 24 */ lwz r0, 0x24(r1) /* 803121CC 0030F12C 7C 08 03 A6 */ mtlr r0 /* 803121D0 0030F130 38 21 00 20 */ addi r1, r1, 0x20 -/* 803121D4 0030F134 4E 80 00 20 */ blr +/* 803121D4 0030F134 4E 80 00 20 */ blr .global FromMatrixRows__11CQuaternionFRC9CVector3fRC9CVector3fRC9CVector3f FromMatrixRows__11CQuaternionFRC9CVector3fRC9CVector3fRC9CVector3f: @@ -1891,7 +1891,7 @@ lbl_80312410: /* 80312420 0030F380 83 81 00 10 */ lwz r28, 0x10(r1) /* 80312424 0030F384 7C 08 03 A6 */ mtlr r0 /* 80312428 0030F388 38 21 00 20 */ addi r1, r1, 0x20 -/* 8031242C 0030F38C 4E 80 00 20 */ blr +/* 8031242C 0030F38C 4E 80 00 20 */ blr .global __ct__11CQuaternionFR12CInputStream __ct__11CQuaternionFR12CInputStream: @@ -1914,7 +1914,7 @@ __ct__11CQuaternionFR12CInputStream: /* 80312470 0030F3D0 83 C1 00 08 */ lwz r30, 8(r1) /* 80312474 0030F3D4 7C 08 03 A6 */ mtlr r0 /* 80312478 0030F3D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8031247C 0030F3DC 4E 80 00 20 */ blr +/* 8031247C 0030F3DC 4E 80 00 20 */ blr .global __sinit_CQuaternion_cpp __sinit_CQuaternion_cpp: diff --git a/asm/Kyoto/Math/CTransform4f.s b/asm/Kyoto/Math/CTransform4f.s index be88c54a..13bb4f22 100644 --- a/asm/Kyoto/Math/CTransform4f.s +++ b/asm/Kyoto/Math/CTransform4f.s @@ -159,7 +159,7 @@ GetInverse__12CTransform4fCFv: /* 80312940 0030F8A0 E3 C1 00 18 */ psq_l f30, 24(r1), 0, qr0 /* 80312944 0030F8A4 CB C1 00 10 */ lfd f30, 0x10(r1) /* 80312948 0030F8A8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8031294C 0030F8AC 4E 80 00 20 */ blr +/* 8031294C 0030F8AC 4E 80 00 20 */ blr .global __ml__12CTransform4fCFRC12CTransform4f __ml__12CTransform4fCFRC12CTransform4f: @@ -215,7 +215,7 @@ __ml__12CTransform4fCFRC12CTransform4f: /* 80312A14 0030F974 11 43 50 2A */ ps_add f10, f3, f10 /* 80312A18 0030F978 F0 03 00 20 */ psq_st f0, 32(r3), 0, qr0 /* 80312A1C 0030F97C F1 43 00 28 */ psq_st f10, 40(r3), 0, qr0 -/* 80312A20 0030F980 4E 80 00 20 */ blr +/* 80312A20 0030F980 4E 80 00 20 */ blr .global TransposeRotate__12CTransform4fCFRC9CVector3f TransposeRotate__12CTransform4fCFRC9CVector3f: @@ -241,7 +241,7 @@ TransposeRotate__12CTransform4fCFRC9CVector3f: /* 80312A70 0030F9D0 EC 02 01 3A */ fmadds f0, f2, f4, f0 /* 80312A74 0030F9D4 D0 23 00 04 */ stfs f1, 4(r3) /* 80312A78 0030F9D8 D0 03 00 08 */ stfs f0, 8(r3) -/* 80312A7C 0030F9DC 4E 80 00 20 */ blr +/* 80312A7C 0030F9DC 4E 80 00 20 */ blr .global Rotate__12CTransform4fCFRC9CVector3f Rotate__12CTransform4fCFRC9CVector3f: @@ -270,7 +270,7 @@ Rotate__12CTransform4fCFRC9CVector3f: /* 80312AD8 0030FA38 D0 23 00 04 */ stfs f1, 4(r3) /* 80312ADC 0030FA3C 10 46 10 9E */ ps_madds1 f2, f6, f2, f2 /* 80312AE0 0030FA40 D0 43 00 08 */ stfs f2, 8(r3) -/* 80312AE4 0030FA44 4E 80 00 20 */ blr +/* 80312AE4 0030FA44 4E 80 00 20 */ blr .global __ml__12CTransform4fCFRC9CVector3f __ml__12CTransform4fCFRC9CVector3f: @@ -295,7 +295,7 @@ __ml__12CTransform4fCFRC9CVector3f: /* 80312B30 0030FA90 10 46 10 9E */ ps_madds1 f2, f6, f2, f2 /* 80312B34 0030FA94 D0 23 00 04 */ stfs f1, 4(r3) /* 80312B38 0030FA98 D0 43 00 08 */ stfs f2, 8(r3) -/* 80312B3C 0030FA9C 4E 80 00 20 */ blr +/* 80312B3C 0030FA9C 4E 80 00 20 */ blr .global __as__12CTransform4fFRC12CTransform4f __as__12CTransform4fFRC12CTransform4f: @@ -311,7 +311,7 @@ __as__12CTransform4fFRC12CTransform4f: /* 80312B64 0030FAC4 D8 03 00 18 */ stfd f0, 0x18(r3) /* 80312B68 0030FAC8 D8 23 00 20 */ stfd f1, 0x20(r3) /* 80312B6C 0030FACC D8 43 00 28 */ stfd f2, 0x28(r3) -/* 80312B70 0030FAD0 4E 80 00 20 */ blr +/* 80312B70 0030FAD0 4E 80 00 20 */ blr .global __ct__12CTransform4fFRC12CTransform4f __ct__12CTransform4fFRC12CTransform4f: @@ -327,7 +327,7 @@ __ct__12CTransform4fFRC12CTransform4f: /* 80312B98 0030FAF8 D8 03 00 18 */ stfd f0, 0x18(r3) /* 80312B9C 0030FAFC D8 23 00 20 */ stfd f1, 0x20(r3) /* 80312BA0 0030FB00 D8 43 00 28 */ stfd f2, 0x28(r3) -/* 80312BA4 0030FB04 4E 80 00 20 */ blr +/* 80312BA4 0030FB04 4E 80 00 20 */ blr .global SetRotation__12CTransform4fFRC12CTransform4f SetRotation__12CTransform4fFRC12CTransform4f: @@ -349,7 +349,7 @@ SetRotation__12CTransform4fFRC12CTransform4f: /* 80312BE4 0030FB44 D0 03 00 24 */ stfs f0, 0x24(r3) /* 80312BE8 0030FB48 C0 04 00 28 */ lfs f0, 0x28(r4) /* 80312BEC 0030FB4C D0 03 00 28 */ stfs f0, 0x28(r3) -/* 80312BF0 0030FB50 4E 80 00 20 */ blr +/* 80312BF0 0030FB50 4E 80 00 20 */ blr .global SetRotation__12CTransform4fFRC9CMatrix3f SetRotation__12CTransform4fFRC9CMatrix3f: @@ -371,7 +371,7 @@ SetRotation__12CTransform4fFRC9CMatrix3f: /* 80312C30 0030FB90 D0 03 00 24 */ stfs f0, 0x24(r3) /* 80312C34 0030FB94 C0 04 00 20 */ lfs f0, 0x20(r4) /* 80312C38 0030FB98 D0 03 00 28 */ stfs f0, 0x28(r3) -/* 80312C3C 0030FB9C 4E 80 00 20 */ blr +/* 80312C3C 0030FB9C 4E 80 00 20 */ blr .global GetRotation__12CTransform4fCFv GetRotation__12CTransform4fCFv: @@ -397,7 +397,7 @@ GetRotation__12CTransform4fCFv: /* 80312C8C 0030FBEC D1 03 00 24 */ stfs f8, 0x24(r3) /* 80312C90 0030FBF0 D1 23 00 28 */ stfs f9, 0x28(r3) /* 80312C94 0030FBF4 D0 03 00 2C */ stfs f0, 0x2c(r3) -/* 80312C98 0030FBF8 4E 80 00 20 */ blr +/* 80312C98 0030FBF8 4E 80 00 20 */ blr .global GetQuickInverse__12CTransform4fCFv GetQuickInverse__12CTransform4fCFv: @@ -435,7 +435,7 @@ GetQuickInverse__12CTransform4fCFv: /* 80312D18 0030FC78 D0 A3 00 24 */ stfs f5, 0x24(r3) /* 80312D1C 0030FC7C D0 83 00 28 */ stfs f4, 0x28(r3) /* 80312D20 0030FC80 D0 03 00 2C */ stfs f0, 0x2c(r3) -/* 80312D24 0030FC84 4E 80 00 20 */ blr +/* 80312D24 0030FC84 4E 80 00 20 */ blr .global sub_80312d28 sub_80312d28: @@ -491,7 +491,7 @@ sub_80312d28: /* 80312DEC 0030FD4C 38 00 00 01 */ li r0, 1 lbl_80312DF0: /* 80312DF0 0030FD50 7C 03 03 78 */ mr r3, r0 -/* 80312DF4 0030FD54 4E 80 00 20 */ blr +/* 80312DF4 0030FD54 4E 80 00 20 */ blr .global FromColumns__12CTransform4fFRC9CVector3fRC9CVector3fRC9CVector3fRC9CVector3f FromColumns__12CTransform4fFRC9CVector3fRC9CVector3fRC9CVector3fRC9CVector3f: @@ -519,7 +519,7 @@ FromColumns__12CTransform4fFRC9CVector3fRC9CVector3fRC9CVector3fRC9CVector3f: /* 80312E4C 0030FDAC D0 63 00 24 */ stfs f3, 0x24(r3) /* 80312E50 0030FDB0 D0 43 00 28 */ stfs f2, 0x28(r3) /* 80312E54 0030FDB4 D0 23 00 2C */ stfs f1, 0x2c(r3) -/* 80312E58 0030FDB8 4E 80 00 20 */ blr +/* 80312E58 0030FDB8 4E 80 00 20 */ blr .global __ct__12CTransform4fFRC9CVector3fRC9CVector3fRC9CVector3fRC9CVector3f_0 __ct__12CTransform4fFRC9CVector3fRC9CVector3fRC9CVector3fRC9CVector3f_0: @@ -547,7 +547,7 @@ __ct__12CTransform4fFRC9CVector3fRC9CVector3fRC9CVector3fRC9CVector3f_0: /* 80312EB0 0030FE10 D0 63 00 24 */ stfs f3, 0x24(r3) /* 80312EB4 0030FE14 D0 43 00 28 */ stfs f2, 0x28(r3) /* 80312EB8 0030FE18 D0 23 00 2C */ stfs f1, 0x2c(r3) -/* 80312EBC 0030FE1C 4E 80 00 20 */ blr +/* 80312EBC 0030FE1C 4E 80 00 20 */ blr .global ScaleBy__12CTransform4fFf ScaleBy__12CTransform4fFf: @@ -578,7 +578,7 @@ ScaleBy__12CTransform4fFf: /* 80312F20 0030FE80 C0 03 00 28 */ lfs f0, 0x28(r3) /* 80312F24 0030FE84 EC 00 00 72 */ fmuls f0, f0, f1 /* 80312F28 0030FE88 D0 03 00 28 */ stfs f0, 0x28(r3) -/* 80312F2C 0030FE8C 4E 80 00 20 */ blr +/* 80312F2C 0030FE8C 4E 80 00 20 */ blr .global MultiplyIgnoreTranslation__12CTransform4fCFRC12CTransform4f MultiplyIgnoreTranslation__12CTransform4fCFRC12CTransform4f: @@ -694,7 +694,7 @@ MultiplyIgnoreTranslation__12CTransform4fCFRC12CTransform4f: /* 803130E4 00310044 E2 A1 00 18 */ psq_l f21, 24(r1), 0, qr0 /* 803130E8 00310048 CA A1 00 10 */ lfd f21, 0x10(r1) /* 803130EC 0031004C 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 803130F0 00310050 4E 80 00 20 */ blr +/* 803130F0 00310050 4E 80 00 20 */ blr .global BuildMatrix3f__12CTransform4fCFv BuildMatrix3f__12CTransform4fCFv: @@ -716,7 +716,7 @@ BuildMatrix3f__12CTransform4fCFv: /* 80313130 00310090 D0 C3 00 18 */ stfs f6, 0x18(r3) /* 80313134 00310094 D0 E3 00 1C */ stfs f7, 0x1c(r3) /* 80313138 00310098 D1 03 00 20 */ stfs f8, 0x20(r3) -/* 8031313C 0031009C 4E 80 00 20 */ blr +/* 8031313C 0031009C 4E 80 00 20 */ blr .global Translate__12CTransform4fFRC9CVector3f Translate__12CTransform4fFRC9CVector3f: @@ -737,7 +737,7 @@ Translate__12CTransform4fFRC9CVector3f: /* 80313178 003100D8 D0 03 00 24 */ stfs f0, 0x24(r3) /* 8031317C 003100DC D0 23 00 28 */ stfs f1, 0x28(r3) /* 80313180 003100E0 D0 43 00 2C */ stfs f2, 0x2c(r3) -/* 80313184 003100E4 4E 80 00 20 */ blr +/* 80313184 003100E4 4E 80 00 20 */ blr .global Translate__12CTransform4fFfff Translate__12CTransform4fFfff: @@ -755,7 +755,7 @@ Translate__12CTransform4fFfff: /* 803131B4 00310114 D0 03 00 24 */ stfs f0, 0x24(r3) /* 803131B8 00310118 D0 83 00 28 */ stfs f4, 0x28(r3) /* 803131BC 0031011C D0 63 00 2C */ stfs f3, 0x2c(r3) -/* 803131C0 00310120 4E 80 00 20 */ blr +/* 803131C0 00310120 4E 80 00 20 */ blr .global Scale__12CTransform4fFRC9CVector3f Scale__12CTransform4fFRC9CVector3f: @@ -775,7 +775,7 @@ Scale__12CTransform4fFRC9CVector3f: /* 803131F8 00310158 D0 03 00 24 */ stfs f0, 0x24(r3) /* 803131FC 0031015C D0 43 00 28 */ stfs f2, 0x28(r3) /* 80313200 00310160 D0 03 00 2C */ stfs f0, 0x2c(r3) -/* 80313204 00310164 4E 80 00 20 */ blr +/* 80313204 00310164 4E 80 00 20 */ blr .global Scale__12CTransform4fFfff Scale__12CTransform4fFfff: @@ -792,7 +792,7 @@ Scale__12CTransform4fFfff: /* 80313230 00310190 D0 03 00 24 */ stfs f0, 0x24(r3) /* 80313234 00310194 D0 63 00 28 */ stfs f3, 0x28(r3) /* 80313238 00310198 D0 03 00 2C */ stfs f0, 0x2c(r3) -/* 8031323C 0031019C 4E 80 00 20 */ blr +/* 8031323C 0031019C 4E 80 00 20 */ blr .global Scale__12CTransform4fFf Scale__12CTransform4fFf: @@ -809,7 +809,7 @@ Scale__12CTransform4fFf: /* 80313268 003101C8 D0 03 00 24 */ stfs f0, 0x24(r3) /* 8031326C 003101CC D0 23 00 28 */ stfs f1, 0x28(r3) /* 80313270 003101D0 D0 03 00 2C */ stfs f0, 0x2c(r3) -/* 80313274 003101D4 4E 80 00 20 */ blr +/* 80313274 003101D4 4E 80 00 20 */ blr .global __ct__12CTransform4fFRC9CMatrix3fRC9CVector3f __ct__12CTransform4fFRC9CMatrix3fRC9CVector3f: @@ -837,7 +837,7 @@ __ct__12CTransform4fFRC9CMatrix3fRC9CVector3f: /* 803132CC 0031022C D0 03 00 28 */ stfs f0, 0x28(r3) /* 803132D0 00310230 C0 05 00 08 */ lfs f0, 8(r5) /* 803132D4 00310234 D0 03 00 2C */ stfs f0, 0x2c(r3) -/* 803132D8 00310238 4E 80 00 20 */ blr +/* 803132D8 00310238 4E 80 00 20 */ blr .global __ct__12CTransform4fFR12CInputStream __ct__12CTransform4fFR12CInputStream: @@ -890,7 +890,7 @@ __ct__12CTransform4fFR12CInputStream: /* 80313394 003102F4 83 C1 00 08 */ lwz r30, 8(r1) /* 80313398 003102F8 7C 08 03 A6 */ mtlr r0 /* 8031339C 003102FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 803133A0 00310300 4E 80 00 20 */ blr +/* 803133A0 00310300 4E 80 00 20 */ blr .global Orthonormalize__12CTransform4fFv Orthonormalize__12CTransform4fFv: @@ -963,7 +963,7 @@ Orthonormalize__12CTransform4fFv: /* 803134AC 0031040C 83 E1 00 4C */ lwz r31, 0x4c(r1) /* 803134B0 00310410 7C 08 03 A6 */ mtlr r0 /* 803134B4 00310414 38 21 00 80 */ addi r1, r1, 0x80 -/* 803134B8 00310418 4E 80 00 20 */ blr +/* 803134B8 00310418 4E 80 00 20 */ blr .global RotateLocalZ__12CTransform4fFRC9CRelAngle RotateLocalZ__12CTransform4fFRC9CRelAngle: @@ -1037,7 +1037,7 @@ RotateLocalZ__12CTransform4fFRC9CRelAngle: /* 803135C8 00310528 83 C1 00 08 */ lwz r30, 8(r1) /* 803135CC 0031052C 7C 08 03 A6 */ mtlr r0 /* 803135D0 00310530 38 21 00 20 */ addi r1, r1, 0x20 -/* 803135D4 00310534 4E 80 00 20 */ blr +/* 803135D4 00310534 4E 80 00 20 */ blr .global RotateLocalY__12CTransform4fFRC9CRelAngle RotateLocalY__12CTransform4fFRC9CRelAngle: @@ -1111,7 +1111,7 @@ RotateLocalY__12CTransform4fFRC9CRelAngle: /* 803136E4 00310644 83 C1 00 08 */ lwz r30, 8(r1) /* 803136E8 00310648 7C 08 03 A6 */ mtlr r0 /* 803136EC 0031064C 38 21 00 20 */ addi r1, r1, 0x20 -/* 803136F0 00310650 4E 80 00 20 */ blr +/* 803136F0 00310650 4E 80 00 20 */ blr .global RotateLocalX__12CTransform4fFRC9CRelAngle RotateLocalX__12CTransform4fFRC9CRelAngle: @@ -1185,7 +1185,7 @@ RotateLocalX__12CTransform4fFRC9CRelAngle: /* 80313800 00310760 83 C1 00 08 */ lwz r30, 8(r1) /* 80313804 00310764 7C 08 03 A6 */ mtlr r0 /* 80313808 00310768 38 21 00 20 */ addi r1, r1, 0x20 -/* 8031380C 0031076C 4E 80 00 20 */ blr +/* 8031380C 0031076C 4E 80 00 20 */ blr .global RotateZ__12CTransform4fFRC9CRelAngle RotateZ__12CTransform4fFRC9CRelAngle: @@ -1226,7 +1226,7 @@ RotateZ__12CTransform4fFRC9CRelAngle: /* 80313898 003107F8 83 C1 00 08 */ lwz r30, 8(r1) /* 8031389C 003107FC 7C 08 03 A6 */ mtlr r0 /* 803138A0 00310800 38 21 00 20 */ addi r1, r1, 0x20 -/* 803138A4 00310804 4E 80 00 20 */ blr +/* 803138A4 00310804 4E 80 00 20 */ blr .global RotateY__12CTransform4fFRC9CRelAngle RotateY__12CTransform4fFRC9CRelAngle: @@ -1267,7 +1267,7 @@ RotateY__12CTransform4fFRC9CRelAngle: /* 80313930 00310890 83 C1 00 08 */ lwz r30, 8(r1) /* 80313934 00310894 7C 08 03 A6 */ mtlr r0 /* 80313938 00310898 38 21 00 20 */ addi r1, r1, 0x20 -/* 8031393C 0031089C 4E 80 00 20 */ blr +/* 8031393C 0031089C 4E 80 00 20 */ blr .global RotateX__12CTransform4fFRC9CRelAngle RotateX__12CTransform4fFRC9CRelAngle: @@ -1308,7 +1308,7 @@ RotateX__12CTransform4fFRC9CRelAngle: /* 803139C8 00310928 83 C1 00 08 */ lwz r30, 8(r1) /* 803139CC 0031092C 7C 08 03 A6 */ mtlr r0 /* 803139D0 00310930 38 21 00 20 */ addi r1, r1, 0x20 -/* 803139D4 00310934 4E 80 00 20 */ blr +/* 803139D4 00310934 4E 80 00 20 */ blr .global MakeRotationsBasedOnY__12CTransform4fFRC13CUnitVector3f MakeRotationsBasedOnY__12CTransform4fFRC13CUnitVector3f: @@ -1393,7 +1393,7 @@ lbl_80313A38: /* 80313B00 00310A60 83 C1 00 38 */ lwz r30, 0x38(r1) /* 80313B04 00310A64 7C 08 03 A6 */ mtlr r0 /* 80313B08 00310A68 38 21 00 40 */ addi r1, r1, 0x40 -/* 80313B0C 00310A6C 4E 80 00 20 */ blr +/* 80313B0C 00310A6C 4E 80 00 20 */ blr .global LookAt__12CTransform4fFRC9CVector3fRC9CVector3fRC9CVector3f LookAt__12CTransform4fFRC9CVector3fRC9CVector3fRC9CVector3f: @@ -1560,7 +1560,7 @@ lbl_80313CE8: /* 80313D80 00310CE0 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80313D84 00310CE4 7C 08 03 A6 */ mtlr r0 /* 80313D88 00310CE8 38 21 00 30 */ addi r1, r1, 0x30 -/* 80313D8C 00310CEC 4E 80 00 20 */ blr +/* 80313D8C 00310CEC 4E 80 00 20 */ blr .global __sinit_CTransform4f_cpp __sinit_CTransform4f_cpp: diff --git a/asm/Kyoto/Math/CUnitVector3f.s b/asm/Kyoto/Math/CUnitVector3f.s index 584e6d12..df926cae 100644 --- a/asm/Kyoto/Math/CUnitVector3f.s +++ b/asm/Kyoto/Math/CUnitVector3f.s @@ -44,4 +44,4 @@ lbl_80313E34: /* 80313E54 00310DB4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80313E58 00310DB8 7C 08 03 A6 */ mtlr r0 /* 80313E5C 00310DBC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80313E60 00310DC0 4E 80 00 20 */ blr +/* 80313E60 00310DC0 4E 80 00 20 */ blr diff --git a/asm/Kyoto/Math/CVector2f.s b/asm/Kyoto/Math/CVector2f.s index 68c1eceb..b88191f1 100644 --- a/asm/Kyoto/Math/CVector2f.s +++ b/asm/Kyoto/Math/CVector2f.s @@ -24,7 +24,7 @@ __dv__FRC9CVector2fRCf: /* 80313E90 00310DF0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80313E94 00310DF4 7C 08 03 A6 */ mtlr r0 /* 80313E98 00310DF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80313E9C 00310DFC 4E 80 00 20 */ blr +/* 80313E9C 00310DFC 4E 80 00 20 */ blr .global __ml__FRCfRC9CVector2f __ml__FRCfRC9CVector2f: @@ -40,7 +40,7 @@ __ml__FRCfRC9CVector2f: /* 80313EC4 00310E24 80 01 00 14 */ lwz r0, 0x14(r1) /* 80313EC8 00310E28 7C 08 03 A6 */ mtlr r0 /* 80313ECC 00310E2C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80313ED0 00310E30 4E 80 00 20 */ blr +/* 80313ED0 00310E30 4E 80 00 20 */ blr .global __ml__FRC9CVector2fRCf __ml__FRC9CVector2fRCf: @@ -56,7 +56,7 @@ __ml__FRC9CVector2fRCf: /* 80313EF8 00310E58 80 01 00 14 */ lwz r0, 0x14(r1) /* 80313EFC 00310E5C 7C 08 03 A6 */ mtlr r0 /* 80313F00 00310E60 38 21 00 10 */ addi r1, r1, 0x10 -/* 80313F04 00310E64 4E 80 00 20 */ blr +/* 80313F04 00310E64 4E 80 00 20 */ blr .global __eq__FRC9CVector2fRC9CVector2f __eq__FRC9CVector2fRC9CVector2f: @@ -72,7 +72,7 @@ __eq__FRC9CVector2fRC9CVector2f: /* 80313F2C 00310E8C 38 00 00 01 */ li r0, 1 lbl_80313F30: /* 80313F30 00310E90 7C 03 03 78 */ mr r3, r0 -/* 80313F34 00310E94 4E 80 00 20 */ blr +/* 80313F34 00310E94 4E 80 00 20 */ blr .global __mi__FRC9CVector2fRC9CVector2f __mi__FRC9CVector2fRC9CVector2f: @@ -89,7 +89,7 @@ __mi__FRC9CVector2fRC9CVector2f: /* 80313F60 00310EC0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80313F64 00310EC4 7C 08 03 A6 */ mtlr r0 /* 80313F68 00310EC8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80313F6C 00310ECC 4E 80 00 20 */ blr +/* 80313F6C 00310ECC 4E 80 00 20 */ blr .global __pl__FRC9CVector2fRC9CVector2f __pl__FRC9CVector2fRC9CVector2f: @@ -106,7 +106,7 @@ __pl__FRC9CVector2fRC9CVector2f: /* 80313F98 00310EF8 80 01 00 14 */ lwz r0, 0x14(r1) /* 80313F9C 00310EFC 7C 08 03 A6 */ mtlr r0 /* 80313FA0 00310F00 38 21 00 10 */ addi r1, r1, 0x10 -/* 80313FA4 00310F04 4E 80 00 20 */ blr +/* 80313FA4 00310F04 4E 80 00 20 */ blr .global Dot__9CVector2fFRC9CVector2fRC9CVector2f Dot__9CVector2fFRC9CVector2fRC9CVector2f: @@ -116,7 +116,7 @@ Dot__9CVector2fFRC9CVector2fRC9CVector2f: /* 80313FB4 00310F14 EC 01 00 32 */ fmuls f0, f1, f0 /* 80313FB8 00310F18 C0 24 00 00 */ lfs f1, 0(r4) /* 80313FBC 00310F1C EC 22 00 7A */ fmadds f1, f2, f1, f0 -/* 80313FC0 00310F20 4E 80 00 20 */ blr +/* 80313FC0 00310F20 4E 80 00 20 */ blr .global GetAngleDiff__9CVector2fFRC9CVector2fRC9CVector2f GetAngleDiff__9CVector2fFRC9CVector2fRC9CVector2f: @@ -169,7 +169,7 @@ lbl_80314058: /* 80314070 00310FD0 83 C1 00 08 */ lwz r30, 8(r1) /* 80314074 00310FD4 7C 08 03 A6 */ mtlr r0 /* 80314078 00310FD8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8031407C 00310FDC 4E 80 00 20 */ blr +/* 8031407C 00310FDC 4E 80 00 20 */ blr .global AsNormalized__9CVector2fCFv AsNormalized__9CVector2fCFv: @@ -195,7 +195,7 @@ AsNormalized__9CVector2fCFv: /* 803140CC 0031102C 83 C1 00 08 */ lwz r30, 8(r1) /* 803140D0 00311030 7C 08 03 A6 */ mtlr r0 /* 803140D4 00311034 38 21 00 10 */ addi r1, r1, 0x10 -/* 803140D8 00311038 4E 80 00 20 */ blr +/* 803140D8 00311038 4E 80 00 20 */ blr .global MagSquared__9CVector2fCFv MagSquared__9CVector2fCFv: @@ -204,7 +204,7 @@ MagSquared__9CVector2fCFv: /* 803140E4 00311044 EC 20 00 32 */ fmuls f1, f0, f0 /* 803140E8 00311048 EC 02 00 B2 */ fmuls f0, f2, f2 /* 803140EC 0031104C EC 21 00 2A */ fadds f1, f1, f0 -/* 803140F0 00311050 4E 80 00 20 */ blr +/* 803140F0 00311050 4E 80 00 20 */ blr .global Magnitude__9CVector2fCFv Magnitude__9CVector2fCFv: @@ -220,7 +220,7 @@ Magnitude__9CVector2fCFv: /* 80314118 00311078 80 01 00 14 */ lwz r0, 0x14(r1) /* 8031411C 0031107C 7C 08 03 A6 */ mtlr r0 /* 80314120 00311080 38 21 00 10 */ addi r1, r1, 0x10 -/* 80314124 00311084 4E 80 00 20 */ blr +/* 80314124 00311084 4E 80 00 20 */ blr .global sub_80314128 sub_80314128: @@ -232,7 +232,7 @@ sub_80314128: /* 8031413C 0031109C C0 03 00 04 */ lfs f0, 4(r3) /* 80314140 003110A0 EC 00 00 72 */ fmuls f0, f0, f1 /* 80314144 003110A4 D0 03 00 04 */ stfs f0, 4(r3) -/* 80314148 003110A8 4E 80 00 20 */ blr +/* 80314148 003110A8 4E 80 00 20 */ blr .global __amu__9CVector2fFf __amu__9CVector2fFf: @@ -242,7 +242,7 @@ __amu__9CVector2fFf: /* 80314158 003110B8 C0 03 00 04 */ lfs f0, 4(r3) /* 8031415C 003110BC EC 00 00 72 */ fmuls f0, f0, f1 /* 80314160 003110C0 D0 03 00 04 */ stfs f0, 4(r3) -/* 80314164 003110C4 4E 80 00 20 */ blr +/* 80314164 003110C4 4E 80 00 20 */ blr .global sub_80314168 sub_80314168: @@ -254,7 +254,7 @@ sub_80314168: /* 8031417C 003110DC C0 04 00 04 */ lfs f0, 4(r4) /* 80314180 003110E0 EC 01 00 28 */ fsubs f0, f1, f0 /* 80314184 003110E4 D0 03 00 04 */ stfs f0, 4(r3) -/* 80314188 003110E8 4E 80 00 20 */ blr +/* 80314188 003110E8 4E 80 00 20 */ blr .global __apl__9CVector2fFRC9CVector2f __apl__9CVector2fFRC9CVector2f: @@ -266,7 +266,7 @@ __apl__9CVector2fFRC9CVector2f: /* 803141A0 00311100 C0 04 00 04 */ lfs f0, 4(r4) /* 803141A4 00311104 EC 01 00 2A */ fadds f0, f1, f0 /* 803141A8 00311108 D0 03 00 04 */ stfs f0, 4(r3) -/* 803141AC 0031110C 4E 80 00 20 */ blr +/* 803141AC 0031110C 4E 80 00 20 */ blr .global Normalize__9CVector2fFv Normalize__9CVector2fFv: @@ -289,13 +289,13 @@ Normalize__9CVector2fFv: /* 803141F0 00311150 80 01 00 14 */ lwz r0, 0x14(r1) /* 803141F4 00311154 7C 08 03 A6 */ mtlr r0 /* 803141F8 00311158 38 21 00 10 */ addi r1, r1, 0x10 -/* 803141FC 0031115C 4E 80 00 20 */ blr +/* 803141FC 0031115C 4E 80 00 20 */ blr .global __ct__9CVector2fFff __ct__9CVector2fFff: /* 80314200 00311160 D0 23 00 00 */ stfs f1, 0(r3) /* 80314204 00311164 D0 43 00 04 */ stfs f2, 4(r3) -/* 80314208 00311168 4E 80 00 20 */ blr +/* 80314208 00311168 4E 80 00 20 */ blr .global __sinit_CVector2f_cpp __sinit_CVector2f_cpp: @@ -314,4 +314,4 @@ __sinit_CVector2f_cpp: /* 8031423C 0031119C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80314240 003111A0 7C 08 03 A6 */ mtlr r0 /* 80314244 003111A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80314248 003111A8 4E 80 00 20 */ blr +/* 80314248 003111A8 4E 80 00 20 */ blr diff --git a/asm/Kyoto/Math/CVector2i.s b/asm/Kyoto/Math/CVector2i.s index 8e4247f7..79c3335d 100644 --- a/asm/Kyoto/Math/CVector2i.s +++ b/asm/Kyoto/Math/CVector2i.s @@ -15,7 +15,7 @@ __dv__FRC9CVector2ii: /* 8031426C 003111CC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80314270 003111D0 7C 08 03 A6 */ mtlr r0 /* 80314274 003111D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80314278 003111D8 4E 80 00 20 */ blr +/* 80314278 003111D8 4E 80 00 20 */ blr .global __ml__FRC9CVector2ii __ml__FRC9CVector2ii: @@ -30,7 +30,7 @@ __ml__FRC9CVector2ii: /* 8031429C 003111FC 80 01 00 14 */ lwz r0, 0x14(r1) /* 803142A0 00311200 7C 08 03 A6 */ mtlr r0 /* 803142A4 00311204 38 21 00 10 */ addi r1, r1, 0x10 -/* 803142A8 00311208 4E 80 00 20 */ blr +/* 803142A8 00311208 4E 80 00 20 */ blr .global __eq__FRC9CVector2iRC9CVector2i __eq__FRC9CVector2iRC9CVector2i: @@ -46,7 +46,7 @@ __eq__FRC9CVector2iRC9CVector2i: /* 803142D0 00311230 38 C0 00 01 */ li r6, 1 lbl_803142D4: /* 803142D4 00311234 7C C3 33 78 */ mr r3, r6 -/* 803142D8 00311238 4E 80 00 20 */ blr +/* 803142D8 00311238 4E 80 00 20 */ blr .global __mi__FRC9CVector2iRC9CVector2i __mi__FRC9CVector2iRC9CVector2i: @@ -63,7 +63,7 @@ __mi__FRC9CVector2iRC9CVector2i: /* 80314304 00311264 80 01 00 14 */ lwz r0, 0x14(r1) /* 80314308 00311268 7C 08 03 A6 */ mtlr r0 /* 8031430C 0031126C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80314310 00311270 4E 80 00 20 */ blr +/* 80314310 00311270 4E 80 00 20 */ blr .global __pl__FRC9CVector2iRC9CVector2i __pl__FRC9CVector2iRC9CVector2i: @@ -80,7 +80,7 @@ __pl__FRC9CVector2iRC9CVector2i: /* 8031433C 0031129C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80314340 003112A0 7C 08 03 A6 */ mtlr r0 /* 80314344 003112A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80314348 003112A8 4E 80 00 20 */ blr +/* 80314348 003112A8 4E 80 00 20 */ blr .global __ct__9CVector2iFii __ct__9CVector2iFii: diff --git a/asm/Kyoto/Math/CVector3d.s b/asm/Kyoto/Math/CVector3d.s index 74907499..94ee5cea 100644 --- a/asm/Kyoto/Math/CVector3d.s +++ b/asm/Kyoto/Math/CVector3d.s @@ -18,7 +18,7 @@ __ml__FdRC9CVector3d: /* 80314384 003112E4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80314388 003112E8 7C 08 03 A6 */ mtlr r0 /* 8031438C 003112EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80314390 003112F0 4E 80 00 20 */ blr +/* 80314390 003112F0 4E 80 00 20 */ blr .global __mi__FRC9CVector3dRC9CVector3d __mi__FRC9CVector3dRC9CVector3d: @@ -38,7 +38,7 @@ __mi__FRC9CVector3dRC9CVector3d: /* 803143C8 00311328 80 01 00 14 */ lwz r0, 0x14(r1) /* 803143CC 0031132C 7C 08 03 A6 */ mtlr r0 /* 803143D0 00311330 38 21 00 10 */ addi r1, r1, 0x10 -/* 803143D4 00311334 4E 80 00 20 */ blr +/* 803143D4 00311334 4E 80 00 20 */ blr .global __pl__FRC9CVector3dRC9CVector3d __pl__FRC9CVector3dRC9CVector3d: @@ -58,7 +58,7 @@ __pl__FRC9CVector3dRC9CVector3d: /* 8031440C 0031136C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80314410 00311370 7C 08 03 A6 */ mtlr r0 /* 80314414 00311374 38 21 00 10 */ addi r1, r1, 0x10 -/* 80314418 00311378 4E 80 00 20 */ blr +/* 80314418 00311378 4E 80 00 20 */ blr .global Cross__9CVector3dFRC9CVector3dRC9CVector3d Cross__9CVector3dFRC9CVector3dRC9CVector3d: @@ -81,7 +81,7 @@ Cross__9CVector3dFRC9CVector3dRC9CVector3d: /* 8031445C 003113BC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80314460 003113C0 7C 08 03 A6 */ mtlr r0 /* 80314464 003113C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80314468 003113C8 4E 80 00 20 */ blr +/* 80314468 003113C8 4E 80 00 20 */ blr .global Dot__9CVector3dFRC9CVector3dRC9CVector3d Dot__9CVector3dFRC9CVector3dRC9CVector3d: @@ -94,7 +94,7 @@ Dot__9CVector3dFRC9CVector3dRC9CVector3d: /* 80314484 003113E4 C8 04 00 10 */ lfd f0, 0x10(r4) /* 80314488 003113E8 FC 24 08 FA */ fmadd f1, f4, f3, f1 /* 8031448C 003113EC FC 22 08 3A */ fmadd f1, f2, f0, f1 -/* 80314490 003113F0 4E 80 00 20 */ blr +/* 80314490 003113F0 4E 80 00 20 */ blr .global AsCVector3f__9CVector3dCFv AsCVector3f__9CVector3dCFv: @@ -107,7 +107,7 @@ AsCVector3f__9CVector3dCFv: /* 803144AC 0031140C D0 03 00 00 */ stfs f0, 0(r3) /* 803144B0 00311410 D0 43 00 04 */ stfs f2, 4(r3) /* 803144B4 00311414 D0 23 00 08 */ stfs f1, 8(r3) -/* 803144B8 00311418 4E 80 00 20 */ blr +/* 803144B8 00311418 4E 80 00 20 */ blr .global AsNormalized__9CVector3dCFv AsNormalized__9CVector3dCFv: @@ -135,7 +135,7 @@ AsNormalized__9CVector3dCFv: /* 80314510 00311470 83 C1 00 08 */ lwz r30, 8(r1) /* 80314514 00311474 7C 08 03 A6 */ mtlr r0 /* 80314518 00311478 38 21 00 10 */ addi r1, r1, 0x10 -/* 8031451C 0031147C 4E 80 00 20 */ blr +/* 8031451C 0031147C 4E 80 00 20 */ blr .global MagSquared__9CVector3dCFv MagSquared__9CVector3dCFv: @@ -147,7 +147,7 @@ MagSquared__9CVector3dCFv: /* 80314534 00311494 FC 00 00 32 */ fmul f0, f0, f0 /* 80314538 00311498 FC 21 10 2A */ fadd f1, f1, f2 /* 8031453C 0031149C FC 21 00 2A */ fadd f1, f1, f0 -/* 80314540 003114A0 4E 80 00 20 */ blr +/* 80314540 003114A0 4E 80 00 20 */ blr .global Magnitude__9CVector3dCFv Magnitude__9CVector3dCFv: @@ -166,7 +166,7 @@ Magnitude__9CVector3dCFv: /* 80314574 003114D4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80314578 003114D8 7C 08 03 A6 */ mtlr r0 /* 8031457C 003114DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80314580 003114E0 4E 80 00 20 */ blr +/* 80314580 003114E0 4E 80 00 20 */ blr .global __ct__9CVector3dFRC9CVector3f __ct__9CVector3dFRC9CVector3f: @@ -176,7 +176,7 @@ __ct__9CVector3dFRC9CVector3f: /* 80314590 003114F0 D8 03 00 08 */ stfd f0, 8(r3) /* 80314594 003114F4 C0 04 00 08 */ lfs f0, 8(r4) /* 80314598 003114F8 D8 03 00 10 */ stfd f0, 0x10(r3) -/* 8031459C 003114FC 4E 80 00 20 */ blr +/* 8031459C 003114FC 4E 80 00 20 */ blr .global __ct__9CVector3dFddd __ct__9CVector3dFddd: diff --git a/asm/Kyoto/Math/CVector3f.s b/asm/Kyoto/Math/CVector3f.s index 045cdfae..dc200976 100644 --- a/asm/Kyoto/Math/CVector3f.s +++ b/asm/Kyoto/Math/CVector3f.s @@ -37,7 +37,7 @@ lbl_803145FC: /* 80314624 00311584 38 A0 00 01 */ li r5, 1 lbl_80314628: /* 80314628 00311588 7C A3 2B 78 */ mr r3, r5 -/* 8031462C 0031158C 4E 80 00 20 */ blr +/* 8031462C 0031158C 4E 80 00 20 */ blr .global GetAngleDiff__9CVector3fFRC9CVector3fRC9CVector3f GetAngleDiff__9CVector3fFRC9CVector3fRC9CVector3f: @@ -93,7 +93,7 @@ lbl_803146D4: /* 803146E8 00311648 83 C1 00 08 */ lwz r30, 8(r1) /* 803146EC 0031164C 7C 08 03 A6 */ mtlr r0 /* 803146F0 00311650 38 21 00 20 */ addi r1, r1, 0x20 -/* 803146F4 00311654 4E 80 00 20 */ blr +/* 803146F4 00311654 4E 80 00 20 */ blr .global CanBeNormalized__9CVector3fCFv CanBeNormalized__9CVector3fCFv: @@ -114,7 +114,7 @@ CanBeNormalized__9CVector3fCFv: /* 80314730 00311690 40 82 00 0C */ bne lbl_8031473C lbl_80314734: /* 80314734 00311694 38 60 00 00 */ li r3, 0 -/* 80314738 00311698 4E 80 00 20 */ blr +/* 80314738 00311698 4E 80 00 20 */ blr lbl_8031473C: /* 8031473C 0031169C C0 03 00 00 */ lfs f0, 0(r3) /* 80314740 003116A0 C0 22 C9 14 */ lfs f1, lbl_805AE634@sda21(r2) @@ -133,10 +133,10 @@ lbl_8031473C: /* 80314774 003116D4 FC 00 08 40 */ fcmpo cr0, f0, f1 /* 80314778 003116D8 40 80 00 0C */ bge lbl_80314784 /* 8031477C 003116DC 38 60 00 00 */ li r3, 0 -/* 80314780 003116E0 4E 80 00 20 */ blr +/* 80314780 003116E0 4E 80 00 20 */ blr lbl_80314784: /* 80314784 003116E4 38 60 00 01 */ li r3, 1 -/* 80314788 003116E8 4E 80 00 20 */ blr +/* 80314788 003116E8 4E 80 00 20 */ blr .global IsMagnitudeSafe__9CVector3fCFv IsMagnitudeSafe__9CVector3fCFv: @@ -170,7 +170,7 @@ lbl_803147E8: /* 803147F4 00311754 83 C1 00 08 */ lwz r30, 8(r1) /* 803147F8 00311758 7C 08 03 A6 */ mtlr r0 /* 803147FC 0031175C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80314800 00311760 4E 80 00 20 */ blr +/* 80314800 00311760 4E 80 00 20 */ blr .global IsNotInf__9CVector3fCFv IsNotInf__9CVector3fCFv: @@ -191,10 +191,10 @@ IsNotInf__9CVector3fCFv: /* 8031483C 0031179C 40 82 00 0C */ bne lbl_80314848 lbl_80314840: /* 80314840 003117A0 38 60 00 00 */ li r3, 0 -/* 80314844 003117A4 4E 80 00 20 */ blr +/* 80314844 003117A4 4E 80 00 20 */ blr lbl_80314848: /* 80314848 003117A8 38 60 00 01 */ li r3, 1 -/* 8031484C 003117AC 4E 80 00 20 */ blr +/* 8031484C 003117AC 4E 80 00 20 */ blr .global AsNormalized__9CVector3fCFv AsNormalized__9CVector3fCFv: @@ -223,7 +223,7 @@ AsNormalized__9CVector3fCFv: /* 803148A8 00311808 83 C1 00 08 */ lwz r30, 8(r1) /* 803148AC 0031180C 7C 08 03 A6 */ mtlr r0 /* 803148B0 00311810 38 21 00 10 */ addi r1, r1, 0x10 -/* 803148B4 00311814 4E 80 00 20 */ blr +/* 803148B4 00311814 4E 80 00 20 */ blr .global Magnitude__9CVector3fCFv Magnitude__9CVector3fCFv: @@ -242,7 +242,7 @@ Magnitude__9CVector3fCFv: /* 803148E8 00311848 80 01 00 14 */ lwz r0, 0x14(r1) /* 803148EC 0031184C 7C 08 03 A6 */ mtlr r0 /* 803148F0 00311850 38 21 00 10 */ addi r1, r1, 0x10 -/* 803148F4 00311854 4E 80 00 20 */ blr +/* 803148F4 00311854 4E 80 00 20 */ blr .global Normalize__9CVector3fFv Normalize__9CVector3fFv: @@ -268,7 +268,7 @@ Normalize__9CVector3fFv: /* 80314944 003118A4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80314948 003118A8 7C 08 03 A6 */ mtlr r0 /* 8031494C 003118AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80314950 003118B0 4E 80 00 20 */ blr +/* 80314950 003118B0 4E 80 00 20 */ blr .global Slerp__9CVector3fFRC9CVector3fRC9CVector3fRC9CRelAngle Slerp__9CVector3fFRC9CVector3fRC9CVector3fRC9CRelAngle: @@ -370,7 +370,7 @@ Slerp__9CVector3fFRC9CVector3fRC9CVector3fRC9CRelAngle: /* 80314AD0 00311A30 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80314AD4 00311A34 7C 08 03 A6 */ mtlr r0 /* 80314AD8 00311A38 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 80314ADC 00311A3C 4E 80 00 20 */ blr +/* 80314ADC 00311A3C 4E 80 00 20 */ blr .global PutTo__9CVector3fCFR13COutputStream PutTo__9CVector3fCFR13COutputStream: @@ -416,7 +416,7 @@ PutTo__9CVector3fCFR13COutputStream: /* 80314B7C 00311ADC 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80314B80 00311AE0 7C 08 03 A6 */ mtlr r0 /* 80314B84 00311AE4 38 21 00 30 */ addi r1, r1, 0x30 -/* 80314B88 00311AE8 4E 80 00 20 */ blr +/* 80314B88 00311AE8 4E 80 00 20 */ blr .global __ct__9CVector3fFR12CInputStream __ct__9CVector3fFR12CInputStream: @@ -434,7 +434,7 @@ __ct__9CVector3fFR12CInputStream: /* 80314BB8 00311B18 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80314BBC 00311B1C 7C 08 03 A6 */ mtlr r0 /* 80314BC0 00311B20 38 21 00 10 */ addi r1, r1, 0x10 -/* 80314BC4 00311B24 4E 80 00 20 */ blr +/* 80314BC4 00311B24 4E 80 00 20 */ blr .global __sinit_CVector3f_cpp __sinit_CVector3f_cpp: @@ -469,7 +469,7 @@ __sinit_CVector3f_cpp: /* 80314C38 00311B98 D0 44 00 08 */ stfs f2, 8(r4) /* 80314C3C 00311B9C D0 03 00 04 */ stfs f0, 4(r3) /* 80314C40 00311BA0 D0 43 00 08 */ stfs f2, 8(r3) -/* 80314C44 00311BA4 4E 80 00 20 */ blr +/* 80314C44 00311BA4 4E 80 00 20 */ blr .global __ct__9CVector3iFiii __ct__9CVector3iFiii: diff --git a/asm/Kyoto/Math/CloseEnough.s b/asm/Kyoto/Math/CloseEnough.s index fdf6068e..ca1edc61 100644 --- a/asm/Kyoto/Math/CloseEnough.s +++ b/asm/Kyoto/Math/CloseEnough.s @@ -26,7 +26,7 @@ close_enough__FRC9CVector2fRC9CVector2ff: /* 8030FF58 0030CEB8 38 00 00 01 */ li r0, 1 lbl_8030FF5C: /* 8030FF5C 0030CEBC 7C 03 03 78 */ mr r3, r0 -/* 8030FF60 0030CEC0 4E 80 00 20 */ blr +/* 8030FF60 0030CEC0 4E 80 00 20 */ blr .global close_enough__FRC9CVector3fRC9CVector3ff close_enough__FRC9CVector3fRC9CVector3ff: @@ -57,7 +57,7 @@ lbl_8030FFA0: /* 8030FFC0 0030CF20 38 A0 00 01 */ li r5, 1 lbl_8030FFC4: /* 8030FFC4 0030CF24 7C A3 2B 78 */ mr r3, r5 -/* 8030FFC8 0030CF28 4E 80 00 20 */ blr +/* 8030FFC8 0030CF28 4E 80 00 20 */ blr .global __sinit_CloseEnough_cpp __sinit_CloseEnough_cpp: diff --git a/asm/Kyoto/Math/RMathUtils.s b/asm/Kyoto/Math/RMathUtils.s index 191f7c5b..ae13a92a 100644 --- a/asm/Kyoto/Math/RMathUtils.s +++ b/asm/Kyoto/Math/RMathUtils.s @@ -7,7 +7,7 @@ FloorPowerOfTwo__5CMathFi: /* 80314C58 00311BB8 2C 03 00 00 */ cmpwi r3, 0 /* 80314C5C 00311BBC 40 82 00 0C */ bne lbl_80314C68 /* 80314C60 00311BC0 38 60 00 00 */ li r3, 0 -/* 80314C64 00311BC4 4E 80 00 20 */ blr +/* 80314C64 00311BC4 4E 80 00 20 */ blr lbl_80314C68: /* 80314C68 00311BC8 3C A0 00 01 */ lis r5, 0x0000FFFF@ha /* 80314C6C 00311BCC 38 80 00 01 */ li r4, 1 @@ -35,7 +35,7 @@ lbl_80314C68: /* 80314CC4 00311C24 7C 00 1A 14 */ add r0, r0, r3 /* 80314CC8 00311C28 7C 05 02 14 */ add r0, r5, r0 /* 80314CCC 00311C2C 7C 83 00 30 */ slw r3, r4, r0 -/* 80314CD0 00311C30 4E 80 00 20 */ blr +/* 80314CD0 00311C30 4E 80 00 20 */ blr .global FastArcCosR__5CMathFf FastArcCosR__5CMathFf: @@ -68,7 +68,7 @@ lbl_80314D34: /* 80314D34 00311C94 80 01 00 14 */ lwz r0, 0x14(r1) /* 80314D38 00311C98 7C 08 03 A6 */ mtlr r0 /* 80314D3C 00311C9C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80314D40 00311CA0 4E 80 00 20 */ blr +/* 80314D40 00311CA0 4E 80 00 20 */ blr .global FastCosR__5CMathFf FastCosR__5CMathFf: @@ -116,7 +116,7 @@ lbl_80314DB4: /* 80314DE0 00311D40 EC A5 01 32 */ fmuls f5, f5, f4 /* 80314DE4 00311D44 EC 25 08 3A */ fmadds f1, f5, f0, f1 /* 80314DE8 00311D48 38 21 00 20 */ addi r1, r1, 0x20 -/* 80314DEC 00311D4C 4E 80 00 20 */ blr +/* 80314DEC 00311D4C 4E 80 00 20 */ blr .global FastSinR__5CMathFf FastSinR__5CMathFf: @@ -164,7 +164,7 @@ lbl_80314E60: /* 80314E8C 00311DEC EC A1 28 3A */ fmadds f5, f1, f0, f5 /* 80314E90 00311DF0 FC 20 28 90 */ fmr f1, f5 /* 80314E94 00311DF4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80314E98 00311DF8 4E 80 00 20 */ blr +/* 80314E98 00311DF8 4E 80 00 20 */ blr .global BaryToWorld__5CMathFRC9CVector3fRC9CVector3fRC9CVector3fRC9CVector3f BaryToWorld__5CMathFRC9CVector3fRC9CVector3fRC9CVector3fRC9CVector3f: @@ -198,7 +198,7 @@ BaryToWorld__5CMathFRC9CVector3fRC9CVector3fRC9CVector3fRC9CVector3f: /* 80314F08 00311E68 EC 03 08 2A */ fadds f0, f3, f1 /* 80314F0C 00311E6C D0 43 00 04 */ stfs f2, 4(r3) /* 80314F10 00311E70 D0 03 00 08 */ stfs f0, 8(r3) -/* 80314F14 00311E74 4E 80 00 20 */ blr +/* 80314F14 00311E74 4E 80 00 20 */ blr .global GetBezierPoint__5CMathFRC9CVector3fRC9CVector3fRC9CVector3fRC9CVector3ff GetBezierPoint__5CMathFRC9CVector3fRC9CVector3fRC9CVector3fRC9CVector3ff: @@ -265,7 +265,7 @@ GetBezierPoint__5CMathFRC9CVector3fRC9CVector3fRC9CVector3fRC9CVector3ff: /* 80315008 00311F68 E3 C1 00 18 */ psq_l f30, 24(r1), 0, qr0 /* 8031500C 00311F6C CB C1 00 10 */ lfd f30, 0x10(r1) /* 80315010 00311F70 38 21 00 30 */ addi r1, r1, 0x30 -/* 80315014 00311F74 4E 80 00 20 */ blr +/* 80315014 00311F74 4E 80 00 20 */ blr .global GetCatmullRomSplinePoint__5CMathFfffff GetCatmullRomSplinePoint__5CMathFfffff: @@ -274,14 +274,14 @@ GetCatmullRomSplinePoint__5CMathFfffff: /* 80315020 00311F80 4C 40 13 82 */ cror 2, 0, 2 /* 80315024 00311F84 40 82 00 0C */ bne lbl_80315030 /* 80315028 00311F88 FC 20 10 90 */ fmr f1, f2 -/* 8031502C 00311F8C 4E 80 00 20 */ blr +/* 8031502C 00311F8C 4E 80 00 20 */ blr lbl_80315030: /* 80315030 00311F90 C1 82 C9 90 */ lfs f12, lbl_805AE6B0@sda21(r2) /* 80315034 00311F94 FC 05 60 40 */ fcmpo cr0, f5, f12 /* 80315038 00311F98 4C 41 13 82 */ cror 2, 1, 2 /* 8031503C 00311F9C 40 82 00 0C */ bne lbl_80315048 /* 80315040 00311FA0 FC 20 18 90 */ fmr f1, f3 -/* 80315044 00311FA4 4E 80 00 20 */ blr +/* 80315044 00311FA4 4E 80 00 20 */ blr lbl_80315048: /* 80315048 00311FA8 C0 C2 C9 A8 */ lfs f6, lbl_805AE6C8@sda21(r2) /* 8031504C 00311FAC EC E5 01 72 */ fmuls f7, f5, f5 @@ -313,7 +313,7 @@ lbl_80315048: /* 803150B4 00312014 EC 01 01 BA */ fmadds f0, f1, f6, f0 /* 803150B8 00312018 EC 03 00 BA */ fmadds f0, f3, f2, f0 /* 803150BC 0031201C EC 24 01 7A */ fmadds f1, f4, f5, f0 -/* 803150C0 00312020 4E 80 00 20 */ blr +/* 803150C0 00312020 4E 80 00 20 */ blr .global GetCatmullRomSplinePoint__5CMathFRC9CVector3fRC9CVector3fRC9CVector3fRC9CVector3ff GetCatmullRomSplinePoint__5CMathFRC9CVector3fRC9CVector3fRC9CVector3fRC9CVector3ff: @@ -418,7 +418,7 @@ lbl_80315230: /* 80315240 003121A0 E3 A1 00 18 */ psq_l f29, 24(r1), 0, qr0 /* 80315244 003121A4 CB A1 00 10 */ lfd f29, 0x10(r1) /* 80315248 003121A8 38 21 00 40 */ addi r1, r1, 0x40 -/* 8031524C 003121AC 4E 80 00 20 */ blr +/* 8031524C 003121AC 4E 80 00 20 */ blr .global CeilingF__5CMathFf CeilingF__5CMathFf: @@ -442,7 +442,7 @@ lbl_80315284: /* 8031528C 003121EC CB E1 00 10 */ lfd f31, 0x10(r1) /* 80315290 003121F0 7C 08 03 A6 */ mtlr r0 /* 80315294 003121F4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80315298 003121F8 4E 80 00 20 */ blr +/* 80315298 003121F8 4E 80 00 20 */ blr .global FloorF__5CMathFf FloorF__5CMathFf: @@ -454,7 +454,7 @@ FloorF__5CMathFf: /* 803152B0 00312210 FC 20 08 18 */ frsp f1, f1 /* 803152B4 00312214 7C 08 03 A6 */ mtlr r0 /* 803152B8 00312218 38 21 00 10 */ addi r1, r1, 0x10 -/* 803152BC 0031221C 4E 80 00 20 */ blr +/* 803152BC 0031221C 4E 80 00 20 */ blr .global SlowTangentR__5CMathFf SlowTangentR__5CMathFf: @@ -466,7 +466,7 @@ SlowTangentR__5CMathFf: /* 803152D4 00312234 FC 20 08 18 */ frsp f1, f1 /* 803152D8 00312238 7C 08 03 A6 */ mtlr r0 /* 803152DC 0031223C 38 21 00 10 */ addi r1, r1, 0x10 -/* 803152E0 00312240 4E 80 00 20 */ blr +/* 803152E0 00312240 4E 80 00 20 */ blr .global SlowCosineR__5CMathFf SlowCosineR__5CMathFf: @@ -478,7 +478,7 @@ SlowCosineR__5CMathFf: /* 803152F8 00312258 FC 20 08 18 */ frsp f1, f1 /* 803152FC 0031225C 7C 08 03 A6 */ mtlr r0 /* 80315300 00312260 38 21 00 10 */ addi r1, r1, 0x10 -/* 80315304 00312264 4E 80 00 20 */ blr +/* 80315304 00312264 4E 80 00 20 */ blr .global SlowSineR__5CMathFf SlowSineR__5CMathFf: @@ -490,7 +490,7 @@ SlowSineR__5CMathFf: /* 8031531C 0031227C FC 20 08 18 */ frsp f1, f1 /* 80315320 00312280 7C 08 03 A6 */ mtlr r0 /* 80315324 00312284 38 21 00 10 */ addi r1, r1, 0x10 -/* 80315328 00312288 4E 80 00 20 */ blr +/* 80315328 00312288 4E 80 00 20 */ blr .global PowF__5CMathFff PowF__5CMathFff: @@ -509,7 +509,7 @@ PowF__5CMathFff: /* 8031535C 003122BC CB E1 00 10 */ lfd f31, 0x10(r1) /* 80315360 003122C0 7C 08 03 A6 */ mtlr r0 /* 80315364 003122C4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80315368 003122C8 4E 80 00 20 */ blr +/* 80315368 003122C8 4E 80 00 20 */ blr .global ArcTangentR__5CMathFf ArcTangentR__5CMathFf: @@ -521,7 +521,7 @@ ArcTangentR__5CMathFf: /* 80315380 003122E0 FC 20 08 18 */ frsp f1, f1 /* 80315384 003122E4 7C 08 03 A6 */ mtlr r0 /* 80315388 003122E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8031538C 003122EC 4E 80 00 20 */ blr +/* 8031538C 003122EC 4E 80 00 20 */ blr .global ArcCosineR__5CMathFf ArcCosineR__5CMathFf: @@ -533,7 +533,7 @@ ArcCosineR__5CMathFf: /* 803153A4 00312304 FC 20 08 18 */ frsp f1, f1 /* 803153A8 00312308 7C 08 03 A6 */ mtlr r0 /* 803153AC 0031230C 38 21 00 10 */ addi r1, r1, 0x10 -/* 803153B0 00312310 4E 80 00 20 */ blr +/* 803153B0 00312310 4E 80 00 20 */ blr .global ArcSineR__5CMathFf ArcSineR__5CMathFf: @@ -545,7 +545,7 @@ ArcSineR__5CMathFf: /* 803153C8 00312328 FC 20 08 18 */ frsp f1, f1 /* 803153CC 0031232C 7C 08 03 A6 */ mtlr r0 /* 803153D0 00312330 38 21 00 10 */ addi r1, r1, 0x10 -/* 803153D4 00312334 4E 80 00 20 */ blr +/* 803153D4 00312334 4E 80 00 20 */ blr .global InvSqrtF__5CMathFf InvSqrtF__5CMathFf: @@ -590,7 +590,7 @@ lbl_80315460: /* 80315460 003123C0 C8 02 C9 C8 */ lfd f0, lbl_805AE6E8@sda21(r2) /* 80315464 003123C4 FC 20 10 24 */ fdiv f1, f0, f2 /* 80315468 003123C8 FC 20 08 18 */ frsp f1, f1 -/* 8031546C 003123CC 4E 80 00 20 */ blr +/* 8031546C 003123CC 4E 80 00 20 */ blr .global SqrtD__5CMathFd SqrtD__5CMathFd: @@ -633,7 +633,7 @@ lbl_803154F0: /* 803154F4 00312454 C0 03 8B A4 */ lfs f0, lbl_805A8BA4@l(r3) lbl_803154F8: /* 803154F8 00312458 FC 20 00 90 */ fmr f1, f0 -/* 803154FC 0031245C 4E 80 00 20 */ blr +/* 803154FC 0031245C 4E 80 00 20 */ blr .global SqrtF__5CMathFf SqrtF__5CMathFf: diff --git a/asm/Kyoto/PVS/CPVSVisOctree.s b/asm/Kyoto/PVS/CPVSVisOctree.s index 86468a7e..14430378 100644 --- a/asm/Kyoto/PVS/CPVSVisOctree.s +++ b/asm/Kyoto/PVS/CPVSVisOctree.s @@ -8,7 +8,7 @@ GetNumChildren__13CPVSVisOctreeCFUc: /* 80315D7C 00312CDC 54 80 16 FA */ rlwinm r0, r4, 2, 0x1b, 0x1d /* 80315D80 00312CE0 38 63 78 20 */ addi r3, r3, lbl_803D7820@l /* 80315D84 00312CE4 7C 63 00 2E */ lwzx r3, r3, r0 -/* 80315D88 00312CE8 4E 80 00 20 */ blr +/* 80315D88 00312CE8 4E 80 00 20 */ blr .global IterateSearch__13CPVSVisOctreeCFUcRC9CVector3f IterateSearch__13CPVSVisOctreeCFUcRC9CVector3f: diff --git a/asm/Kyoto/PVS/CPVSVisSet.s b/asm/Kyoto/PVS/CPVSVisSet.s index 668f6f41..893dd819 100644 --- a/asm/Kyoto/PVS/CPVSVisSet.s +++ b/asm/Kyoto/PVS/CPVSVisSet.s @@ -157,7 +157,7 @@ lbl_80316190: /* 80316194 003130F4 80 01 00 34 */ lwz r0, 0x34(r1) /* 80316198 003130F8 7C 08 03 A6 */ mtlr r0 /* 8031619C 003130FC 38 21 00 30 */ addi r1, r1, 0x30 -/* 803161A0 00313100 4E 80 00 20 */ blr +/* 803161A0 00313100 4E 80 00 20 */ blr .global MakePVSVisOctree__13CPVSVisOctreeFPCci MakePVSVisOctree__13CPVSVisOctreeFPCci: @@ -203,7 +203,7 @@ MakePVSVisOctree__13CPVSVisOctreeFPCci: /* 80316240 003131A0 83 81 00 50 */ lwz r28, 0x50(r1) /* 80316244 003131A4 7C 08 03 A6 */ mtlr r0 /* 80316248 003131A8 38 21 00 60 */ addi r1, r1, 0x60 -/* 8031624C 003131AC 4E 80 00 20 */ blr +/* 8031624C 003131AC 4E 80 00 20 */ blr .global __ct__13CPVSVisOctreeFRC6CAABoxiiPCc __ct__13CPVSVisOctreeFRC6CAABoxiiPCc: @@ -240,7 +240,7 @@ __ct__13CPVSVisOctreeFRC6CAABoxiiPCc: /* 803162C8 00313228 C0 03 00 14 */ lfs f0, 0x14(r3) /* 803162CC 0031322C D0 03 00 40 */ stfs f0, 0x40(r3) /* 803162D0 00313230 98 03 00 20 */ stb r0, 0x20(r3) -/* 803162D4 00313234 4E 80 00 20 */ blr +/* 803162D4 00313234 4E 80 00 20 */ blr .global GetVisible__10CPVSVisSetCFi GetVisible__10CPVSVisSetCFi: @@ -248,7 +248,7 @@ GetVisible__10CPVSVisSetCFi: /* 803162DC 0031323C 2C 00 00 01 */ cmpwi r0, 1 /* 803162E0 00313240 41 82 00 0C */ beq lbl_803162EC /* 803162E4 00313244 7C 03 03 78 */ mr r3, r0 -/* 803162E8 00313248 4E 80 00 20 */ blr +/* 803162E8 00313248 4E 80 00 20 */ blr lbl_803162EC: /* 803162EC 0031324C 80 A3 00 08 */ lwz r5, 8(r3) /* 803162F0 00313250 80 03 00 04 */ lwz r0, 4(r3) @@ -264,9 +264,9 @@ lbl_803162EC: /* 80316318 00313278 7C 60 00 30 */ slw r0, r3, r0 /* 8031631C 0031327C 38 60 00 00 */ li r3, 0 /* 80316320 00313280 7C 80 00 39 */ and. r0, r4, r0 -/* 80316324 00313284 4D 82 00 20 */ beqlr +/* 80316324 00313284 4D 82 00 20 */ beqlr /* 80316328 00313288 38 60 00 02 */ li r3, 2 -/* 8031632C 0031328C 4E 80 00 20 */ blr +/* 8031632C 0031328C 4E 80 00 20 */ blr lbl_80316330: /* 80316330 00313290 7C 00 20 50 */ subf r0, r0, r4 /* 80316334 00313294 80 63 00 10 */ lwz r3, 0x10(r3) @@ -282,13 +282,13 @@ lbl_80316330: /* 8031635C 003132BC 7C 00 20 30 */ slw r0, r0, r4 /* 80316360 003132C0 7C 60 00 38 */ and r0, r3, r0 /* 80316364 003132C4 7C 03 26 30 */ sraw r3, r0, r4 -/* 80316368 003132C8 4E 80 00 20 */ blr +/* 80316368 003132C8 4E 80 00 20 */ blr lbl_8031636C: /* 8031636C 003132CC 88 03 00 01 */ lbz r0, 1(r3) /* 80316370 003132D0 88 83 00 00 */ lbz r4, 0(r3) /* 80316374 003132D4 54 03 0F BC */ rlwinm r3, r0, 1, 0x1e, 0x1e /* 80316378 003132D8 50 83 CF FE */ rlwimi r3, r4, 0x19, 0x1f, 0x1f -/* 8031637C 003132DC 4E 80 00 20 */ blr +/* 8031637C 003132DC 4E 80 00 20 */ blr .global Reset__10CPVSVisSetFi Reset__10CPVSVisSetFi: @@ -298,7 +298,7 @@ Reset__10CPVSVisSetFi: /* 8031638C 003132EC 90 03 00 08 */ stw r0, 8(r3) /* 80316390 003132F0 98 03 00 0C */ stb r0, 0xc(r3) /* 80316394 003132F4 90 03 00 10 */ stw r0, 0x10(r3) -/* 80316398 003132F8 4E 80 00 20 */ blr +/* 80316398 003132F8 4E 80 00 20 */ blr .global SetFromMemory__10CPVSVisSetFiiPCc SetFromMemory__10CPVSVisSetFiiPCc: @@ -312,4 +312,4 @@ SetFromMemory__10CPVSVisSetFiiPCc: /* 803163B8 00313318 80 86 00 04 */ lwz r4, 4(r6) /* 803163BC 0031331C 90 83 00 10 */ stw r4, 0x10(r3) /* 803163C0 00313320 98 06 00 00 */ stb r0, 0(r6) -/* 803163C4 00313324 4E 80 00 20 */ blr +/* 803163C4 00313324 4E 80 00 20 */ blr diff --git a/asm/Kyoto/Particles/CColorElement.s b/asm/Kyoto/Particles/CColorElement.s index 18dad682..8b2e90e3 100644 --- a/asm/Kyoto/Particles/CColorElement.s +++ b/asm/Kyoto/Particles/CColorElement.s @@ -181,7 +181,7 @@ lbl_80316420: /* 80316428 00313388 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8031642C 0031338C 7C 08 03 A6 */ mtlr r0 /* 80316430 00313390 38 21 00 10 */ addi r1, r1, 0x10 -/* 80316434 00313394 4E 80 00 20 */ blr +/* 80316434 00313394 4E 80 00 20 */ blr .global GetValue__16CCEParticleColor GetValue__16CCEParticleColor: @@ -189,7 +189,7 @@ GetValue__16CCEParticleColor: /* 8031643C 0031339C 38 60 00 00 */ li r3, 0 /* 80316440 003133A0 80 04 00 34 */ lwz r0, 0x34(r4) /* 80316444 003133A4 90 05 00 00 */ stw r0, 0(r5) -/* 80316448 003133A8 4E 80 00 20 */ blr +/* 80316448 003133A8 4E 80 00 20 */ blr .global GetValue__18CCEKeyframeEmitterCFiR6CColor GetValue__18CCEKeyframeEmitterCFiR6CColor: @@ -272,7 +272,7 @@ lbl_80316558: /* 8031655C 003134BC 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80316560 003134C0 7C 08 03 A6 */ mtlr r0 /* 80316564 003134C4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80316568 003134C8 4E 80 00 20 */ blr +/* 80316568 003134C8 4E 80 00 20 */ blr .global __dt__18CCEKeyframeEmitterFv __dt__18CCEKeyframeEmitterFv: @@ -330,7 +330,7 @@ lbl_80316618: /* 80316624 00313584 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80316628 00313588 7C 08 03 A6 */ mtlr r0 /* 8031662C 0031358C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80316630 00313590 4E 80 00 20 */ blr +/* 80316630 00313590 4E 80 00 20 */ blr .global __ct__18CCEKeyframeEmitterFR12CInputStream __ct__18CCEKeyframeEmitterFR12CInputStream: @@ -429,7 +429,7 @@ lbl_80316778: /* 8031678C 003136EC 83 81 00 10 */ lwz r28, 0x10(r1) /* 80316790 003136F0 7C 08 03 A6 */ mtlr r0 /* 80316794 003136F4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80316798 003136F8 4E 80 00 20 */ blr +/* 80316798 003136F8 4E 80 00 20 */ blr .global GetValue__8CCEPulseCFiR6CColor GetValue__8CCEPulseCFiR6CColor: @@ -447,14 +447,14 @@ GetValue__8CCEPulseCFiR6CColor: /* 803167C8 00313728 81 83 00 00 */ lwz r12, 0(r3) /* 803167CC 0031372C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803167D0 00313730 7D 89 03 A6 */ mtctr r12 -/* 803167D4 00313734 4E 80 04 21 */ bctrl +/* 803167D4 00313734 4E 80 04 21 */ bctrl /* 803167D8 00313738 80 7D 00 08 */ lwz r3, 8(r29) /* 803167DC 0031373C 7F C4 F3 78 */ mr r4, r30 /* 803167E0 00313740 38 A1 00 08 */ addi r5, r1, 8 /* 803167E4 00313744 81 83 00 00 */ lwz r12, 0(r3) /* 803167E8 00313748 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803167EC 0031374C 7D 89 03 A6 */ mtctr r12 -/* 803167F0 00313750 4E 80 04 21 */ bctrl +/* 803167F0 00313750 4E 80 04 21 */ bctrl /* 803167F4 00313754 80 61 00 08 */ lwz r3, 8(r1) /* 803167F8 00313758 80 81 00 0C */ lwz r4, 0xc(r1) /* 803167FC 0031375C 38 A3 00 01 */ addi r5, r3, 1 @@ -475,7 +475,7 @@ lbl_8031680C: /* 80316834 00313794 81 83 00 00 */ lwz r12, 0(r3) /* 80316838 00313798 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031683C 0031379C 7D 89 03 A6 */ mtctr r12 -/* 80316840 003137A0 4E 80 04 21 */ bctrl +/* 80316840 003137A0 4E 80 04 21 */ bctrl /* 80316844 003137A4 48 00 00 40 */ b lbl_80316884 lbl_80316848: /* 80316848 003137A8 80 7D 00 0C */ lwz r3, 0xc(r29) @@ -484,7 +484,7 @@ lbl_80316848: /* 80316854 003137B4 81 83 00 00 */ lwz r12, 0(r3) /* 80316858 003137B8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031685C 003137BC 7D 89 03 A6 */ mtctr r12 -/* 80316860 003137C0 4E 80 04 21 */ bctrl +/* 80316860 003137C0 4E 80 04 21 */ bctrl /* 80316864 003137C4 48 00 00 20 */ b lbl_80316884 lbl_80316868: /* 80316868 003137C8 80 7D 00 0C */ lwz r3, 0xc(r29) @@ -493,7 +493,7 @@ lbl_80316868: /* 80316874 003137D4 81 83 00 00 */ lwz r12, 0(r3) /* 80316878 003137D8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031687C 003137DC 7D 89 03 A6 */ mtctr r12 -/* 80316880 003137E0 4E 80 04 21 */ bctrl +/* 80316880 003137E0 4E 80 04 21 */ bctrl lbl_80316884: /* 80316884 003137E4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80316888 003137E8 38 60 00 00 */ li r3, 0 @@ -502,7 +502,7 @@ lbl_80316884: /* 80316894 003137F4 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80316898 003137F8 7C 08 03 A6 */ mtlr r0 /* 8031689C 003137FC 38 21 00 20 */ addi r1, r1, 0x20 -/* 803168A0 00313800 4E 80 00 20 */ blr +/* 803168A0 00313800 4E 80 00 20 */ blr .global __dt__8CCEPulseFv __dt__8CCEPulseFv: @@ -524,7 +524,7 @@ __dt__8CCEPulseFv: /* 803168E0 00313840 38 80 00 01 */ li r4, 1 /* 803168E4 00313844 81 8C 00 08 */ lwz r12, 8(r12) /* 803168E8 00313848 7D 89 03 A6 */ mtctr r12 -/* 803168EC 0031384C 4E 80 04 21 */ bctrl +/* 803168EC 0031384C 4E 80 04 21 */ bctrl lbl_803168F0: /* 803168F0 00313850 80 7E 00 08 */ lwz r3, 8(r30) /* 803168F4 00313854 28 03 00 00 */ cmplwi r3, 0 @@ -533,7 +533,7 @@ lbl_803168F0: /* 80316900 00313860 38 80 00 01 */ li r4, 1 /* 80316904 00313864 81 8C 00 08 */ lwz r12, 8(r12) /* 80316908 00313868 7D 89 03 A6 */ mtctr r12 -/* 8031690C 0031386C 4E 80 04 21 */ bctrl +/* 8031690C 0031386C 4E 80 04 21 */ bctrl lbl_80316910: /* 80316910 00313870 80 7E 00 0C */ lwz r3, 0xc(r30) /* 80316914 00313874 28 03 00 00 */ cmplwi r3, 0 @@ -542,7 +542,7 @@ lbl_80316910: /* 80316920 00313880 38 80 00 01 */ li r4, 1 /* 80316924 00313884 81 8C 00 08 */ lwz r12, 8(r12) /* 80316928 00313888 7D 89 03 A6 */ mtctr r12 -/* 8031692C 0031388C 4E 80 04 21 */ bctrl +/* 8031692C 0031388C 4E 80 04 21 */ bctrl lbl_80316930: /* 80316930 00313890 80 7E 00 10 */ lwz r3, 0x10(r30) /* 80316934 00313894 28 03 00 00 */ cmplwi r3, 0 @@ -551,7 +551,7 @@ lbl_80316930: /* 80316940 003138A0 38 80 00 01 */ li r4, 1 /* 80316944 003138A4 81 8C 00 08 */ lwz r12, 8(r12) /* 80316948 003138A8 7D 89 03 A6 */ mtctr r12 -/* 8031694C 003138AC 4E 80 04 21 */ bctrl +/* 8031694C 003138AC 4E 80 04 21 */ bctrl lbl_80316950: /* 80316950 003138B0 28 1E 00 00 */ cmplwi r30, 0 /* 80316954 003138B4 41 82 00 20 */ beq lbl_80316974 @@ -575,7 +575,7 @@ lbl_80316988: /* 80316994 003138F4 83 C1 00 08 */ lwz r30, 8(r1) /* 80316998 003138F8 7C 08 03 A6 */ mtlr r0 /* 8031699C 003138FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 803169A0 00313900 4E 80 00 20 */ blr +/* 803169A0 00313900 4E 80 00 20 */ blr .global __ct__8CCEPulseFP11CIntElementP11CIntElementP13CColorElementP13CColorElement __ct__8CCEPulseFP11CIntElementP11CIntElementP13CColorElementP13CColorElement: @@ -592,7 +592,7 @@ __ct__8CCEPulseFP11CIntElementP11CIntElementP13CColorElementP13CColorElement: /* 803169CC 0031392C 90 A3 00 08 */ stw r5, 8(r3) /* 803169D0 00313930 90 C3 00 0C */ stw r6, 0xc(r3) /* 803169D4 00313934 90 E3 00 10 */ stw r7, 0x10(r3) -/* 803169D8 00313938 4E 80 00 20 */ blr +/* 803169D8 00313938 4E 80 00 20 */ blr .global GetValue__12CCETimeChainCFiR6CColor GetValue__12CCETimeChainCFiR6CColor: @@ -610,7 +610,7 @@ GetValue__12CCETimeChainCFiR6CColor: /* 80316A08 00313968 81 83 00 00 */ lwz r12, 0(r3) /* 80316A0C 0031396C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80316A10 00313970 7D 89 03 A6 */ mtctr r12 -/* 80316A14 00313974 4E 80 04 21 */ bctrl +/* 80316A14 00313974 4E 80 04 21 */ bctrl /* 80316A18 00313978 80 01 00 08 */ lwz r0, 8(r1) /* 80316A1C 0031397C 7C 1E 00 00 */ cmpw r30, r0 /* 80316A20 00313980 40 80 00 24 */ bge lbl_80316A44 @@ -620,7 +620,7 @@ GetValue__12CCETimeChainCFiR6CColor: /* 80316A30 00313990 81 83 00 00 */ lwz r12, 0(r3) /* 80316A34 00313994 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80316A38 00313998 7D 89 03 A6 */ mtctr r12 -/* 80316A3C 0031399C 4E 80 04 21 */ bctrl +/* 80316A3C 0031399C 4E 80 04 21 */ bctrl /* 80316A40 003139A0 48 00 00 20 */ b lbl_80316A60 lbl_80316A44: /* 80316A44 003139A4 80 7D 00 08 */ lwz r3, 8(r29) @@ -629,7 +629,7 @@ lbl_80316A44: /* 80316A50 003139B0 81 83 00 00 */ lwz r12, 0(r3) /* 80316A54 003139B4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80316A58 003139B8 7D 89 03 A6 */ mtctr r12 -/* 80316A5C 003139BC 4E 80 04 21 */ bctrl +/* 80316A5C 003139BC 4E 80 04 21 */ bctrl lbl_80316A60: /* 80316A60 003139C0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80316A64 003139C4 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -637,7 +637,7 @@ lbl_80316A60: /* 80316A6C 003139CC 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80316A70 003139D0 7C 08 03 A6 */ mtlr r0 /* 80316A74 003139D4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80316A78 003139D8 4E 80 00 20 */ blr +/* 80316A78 003139D8 4E 80 00 20 */ blr .global __dt__12CCETimeChainFv __dt__12CCETimeChainFv: @@ -659,7 +659,7 @@ __dt__12CCETimeChainFv: /* 80316AB8 00313A18 38 80 00 01 */ li r4, 1 /* 80316ABC 00313A1C 81 8C 00 08 */ lwz r12, 8(r12) /* 80316AC0 00313A20 7D 89 03 A6 */ mtctr r12 -/* 80316AC4 00313A24 4E 80 04 21 */ bctrl +/* 80316AC4 00313A24 4E 80 04 21 */ bctrl lbl_80316AC8: /* 80316AC8 00313A28 80 7E 00 08 */ lwz r3, 8(r30) /* 80316ACC 00313A2C 28 03 00 00 */ cmplwi r3, 0 @@ -668,7 +668,7 @@ lbl_80316AC8: /* 80316AD8 00313A38 38 80 00 01 */ li r4, 1 /* 80316ADC 00313A3C 81 8C 00 08 */ lwz r12, 8(r12) /* 80316AE0 00313A40 7D 89 03 A6 */ mtctr r12 -/* 80316AE4 00313A44 4E 80 04 21 */ bctrl +/* 80316AE4 00313A44 4E 80 04 21 */ bctrl lbl_80316AE8: /* 80316AE8 00313A48 80 7E 00 0C */ lwz r3, 0xc(r30) /* 80316AEC 00313A4C 28 03 00 00 */ cmplwi r3, 0 @@ -677,7 +677,7 @@ lbl_80316AE8: /* 80316AF8 00313A58 38 80 00 01 */ li r4, 1 /* 80316AFC 00313A5C 81 8C 00 08 */ lwz r12, 8(r12) /* 80316B00 00313A60 7D 89 03 A6 */ mtctr r12 -/* 80316B04 00313A64 4E 80 04 21 */ bctrl +/* 80316B04 00313A64 4E 80 04 21 */ bctrl lbl_80316B08: /* 80316B08 00313A68 28 1E 00 00 */ cmplwi r30, 0 /* 80316B0C 00313A6C 41 82 00 20 */ beq lbl_80316B2C @@ -701,7 +701,7 @@ lbl_80316B40: /* 80316B4C 00313AAC 83 C1 00 08 */ lwz r30, 8(r1) /* 80316B50 00313AB0 7C 08 03 A6 */ mtlr r0 /* 80316B54 00313AB4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80316B58 00313AB8 4E 80 00 20 */ blr +/* 80316B58 00313AB8 4E 80 00 20 */ blr .global __ct__12CCETimeChainFP13CColorElementP13CColorElementP11CIntElement __ct__12CCETimeChainFP13CColorElementP13CColorElementP11CIntElement: @@ -717,7 +717,7 @@ __ct__12CCETimeChainFP13CColorElementP13CColorElementP11CIntElement: /* 80316B80 00313AE0 90 83 00 04 */ stw r4, 4(r3) /* 80316B84 00313AE4 90 A3 00 08 */ stw r5, 8(r3) /* 80316B88 00313AE8 90 C3 00 0C */ stw r6, 0xc(r3) -/* 80316B8C 00313AEC 4E 80 00 20 */ blr +/* 80316B8C 00313AEC 4E 80 00 20 */ blr .global GetValue__10CCEFadeEndCFiR6CColor GetValue__10CCEFadeEndCFiR6CColor: @@ -737,7 +737,7 @@ GetValue__10CCEFadeEndCFiR6CColor: /* 80316BC4 00313B24 81 83 00 00 */ lwz r12, 0(r3) /* 80316BC8 00313B28 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80316BCC 00313B2C 7D 89 03 A6 */ mtctr r12 -/* 80316BD0 00313B30 4E 80 04 21 */ bctrl +/* 80316BD0 00313B30 4E 80 04 21 */ bctrl /* 80316BD4 00313B34 6F C3 80 00 */ xoris r3, r30, 0x8000 /* 80316BD8 00313B38 3C 00 43 30 */ lis r0, 0x4330 /* 80316BDC 00313B3C 90 61 00 44 */ stw r3, 0x44(r1) @@ -754,7 +754,7 @@ GetValue__10CCEFadeEndCFiR6CColor: /* 80316C08 00313B68 81 83 00 00 */ lwz r12, 0(r3) /* 80316C0C 00313B6C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80316C10 00313B70 7D 89 03 A6 */ mtctr r12 -/* 80316C14 00313B74 4E 80 04 21 */ bctrl +/* 80316C14 00313B74 4E 80 04 21 */ bctrl /* 80316C18 00313B78 38 60 00 00 */ li r3, 0 /* 80316C1C 00313B7C 48 00 01 20 */ b lbl_80316D3C lbl_80316C20: @@ -764,7 +764,7 @@ lbl_80316C20: /* 80316C2C 00313B8C 81 83 00 00 */ lwz r12, 0(r3) /* 80316C30 00313B90 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80316C34 00313B94 7D 89 03 A6 */ mtctr r12 -/* 80316C38 00313B98 4E 80 04 21 */ bctrl +/* 80316C38 00313B98 4E 80 04 21 */ bctrl /* 80316C3C 00313B9C 38 C0 00 FF */ li r6, 0xff /* 80316C40 00313BA0 38 00 00 00 */ li r0, 0 /* 80316C44 00313BA4 98 C1 00 30 */ stb r6, 0x30(r1) @@ -781,14 +781,14 @@ lbl_80316C20: /* 80316C70 00313BD0 81 83 00 00 */ lwz r12, 0(r3) /* 80316C74 00313BD4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80316C78 00313BD8 7D 89 03 A6 */ mtctr r12 -/* 80316C7C 00313BDC 4E 80 04 21 */ bctrl +/* 80316C7C 00313BDC 4E 80 04 21 */ bctrl /* 80316C80 00313BE0 80 7D 00 08 */ lwz r3, 8(r29) /* 80316C84 00313BE4 7F C4 F3 78 */ mr r4, r30 /* 80316C88 00313BE8 38 A1 00 2C */ addi r5, r1, 0x2c /* 80316C8C 00313BEC 81 83 00 00 */ lwz r12, 0(r3) /* 80316C90 00313BF0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80316C94 00313BF4 7D 89 03 A6 */ mtctr r12 -/* 80316C98 00313BF8 4E 80 04 21 */ bctrl +/* 80316C98 00313BF8 4E 80 04 21 */ bctrl /* 80316C9C 00313BFC 38 61 00 30 */ addi r3, r1, 0x30 /* 80316CA0 00313C00 38 81 00 28 */ addi r4, r1, 0x28 /* 80316CA4 00313C04 38 A1 00 24 */ addi r5, r1, 0x24 @@ -838,7 +838,7 @@ lbl_80316D3C: /* 80316D50 00313CB0 83 A1 00 54 */ lwz r29, 0x54(r1) /* 80316D54 00313CB4 7C 08 03 A6 */ mtlr r0 /* 80316D58 00313CB8 38 21 00 70 */ addi r1, r1, 0x70 -/* 80316D5C 00313CBC 4E 80 00 20 */ blr +/* 80316D5C 00313CBC 4E 80 00 20 */ blr .global __dt__10CCEFadeEndFv __dt__10CCEFadeEndFv: @@ -860,7 +860,7 @@ __dt__10CCEFadeEndFv: /* 80316D9C 00313CFC 38 80 00 01 */ li r4, 1 /* 80316DA0 00313D00 81 8C 00 08 */ lwz r12, 8(r12) /* 80316DA4 00313D04 7D 89 03 A6 */ mtctr r12 -/* 80316DA8 00313D08 4E 80 04 21 */ bctrl +/* 80316DA8 00313D08 4E 80 04 21 */ bctrl lbl_80316DAC: /* 80316DAC 00313D0C 80 7E 00 08 */ lwz r3, 8(r30) /* 80316DB0 00313D10 28 03 00 00 */ cmplwi r3, 0 @@ -869,7 +869,7 @@ lbl_80316DAC: /* 80316DBC 00313D1C 38 80 00 01 */ li r4, 1 /* 80316DC0 00313D20 81 8C 00 08 */ lwz r12, 8(r12) /* 80316DC4 00313D24 7D 89 03 A6 */ mtctr r12 -/* 80316DC8 00313D28 4E 80 04 21 */ bctrl +/* 80316DC8 00313D28 4E 80 04 21 */ bctrl lbl_80316DCC: /* 80316DCC 00313D2C 80 7E 00 0C */ lwz r3, 0xc(r30) /* 80316DD0 00313D30 28 03 00 00 */ cmplwi r3, 0 @@ -878,7 +878,7 @@ lbl_80316DCC: /* 80316DDC 00313D3C 38 80 00 01 */ li r4, 1 /* 80316DE0 00313D40 81 8C 00 08 */ lwz r12, 8(r12) /* 80316DE4 00313D44 7D 89 03 A6 */ mtctr r12 -/* 80316DE8 00313D48 4E 80 04 21 */ bctrl +/* 80316DE8 00313D48 4E 80 04 21 */ bctrl lbl_80316DEC: /* 80316DEC 00313D4C 80 7E 00 10 */ lwz r3, 0x10(r30) /* 80316DF0 00313D50 28 03 00 00 */ cmplwi r3, 0 @@ -887,7 +887,7 @@ lbl_80316DEC: /* 80316DFC 00313D5C 38 80 00 01 */ li r4, 1 /* 80316E00 00313D60 81 8C 00 08 */ lwz r12, 8(r12) /* 80316E04 00313D64 7D 89 03 A6 */ mtctr r12 -/* 80316E08 00313D68 4E 80 04 21 */ bctrl +/* 80316E08 00313D68 4E 80 04 21 */ bctrl lbl_80316E0C: /* 80316E0C 00313D6C 28 1E 00 00 */ cmplwi r30, 0 /* 80316E10 00313D70 41 82 00 20 */ beq lbl_80316E30 @@ -911,7 +911,7 @@ lbl_80316E44: /* 80316E50 00313DB0 83 C1 00 08 */ lwz r30, 8(r1) /* 80316E54 00313DB4 7C 08 03 A6 */ mtlr r0 /* 80316E58 00313DB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80316E5C 00313DBC 4E 80 00 20 */ blr +/* 80316E5C 00313DBC 4E 80 00 20 */ blr .global __ct__10CCEFadeEndFP13CColorElementP13CColorElementP12CRealElementP12CRealElement __ct__10CCEFadeEndFP13CColorElementP13CColorElementP12CRealElementP12CRealElement: @@ -928,7 +928,7 @@ __ct__10CCEFadeEndFP13CColorElementP13CColorElementP12CRealElementP12CRealElemen /* 80316E88 00313DE8 90 A3 00 08 */ stw r5, 8(r3) /* 80316E8C 00313DEC 90 C3 00 0C */ stw r6, 0xc(r3) /* 80316E90 00313DF0 90 E3 00 10 */ stw r7, 0x10(r3) -/* 80316E94 00313DF4 4E 80 00 20 */ blr +/* 80316E94 00313DF4 4E 80 00 20 */ blr .global GetValue__7CCEFadeCFiR6CColor GetValue__7CCEFadeCFiR6CColor: @@ -948,7 +948,7 @@ GetValue__7CCEFadeCFiR6CColor: /* 80316ECC 00313E2C 81 83 00 00 */ lwz r12, 0(r3) /* 80316ED0 00313E30 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80316ED4 00313E34 7D 89 03 A6 */ mtctr r12 -/* 80316ED8 00313E38 4E 80 04 21 */ bctrl +/* 80316ED8 00313E38 4E 80 04 21 */ bctrl /* 80316EDC 00313E3C C0 22 C9 D8 */ lfs f1, lbl_805AE6F8@sda21(r2) /* 80316EE0 00313E40 6F C3 80 00 */ xoris r3, r30, 0x8000 /* 80316EE4 00313E44 C0 01 00 34 */ lfs f0, 0x34(r1) @@ -969,7 +969,7 @@ GetValue__7CCEFadeCFiR6CColor: /* 80316F20 00313E80 81 83 00 00 */ lwz r12, 0(r3) /* 80316F24 00313E84 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80316F28 00313E88 7D 89 03 A6 */ mtctr r12 -/* 80316F2C 00313E8C 4E 80 04 21 */ bctrl +/* 80316F2C 00313E8C 4E 80 04 21 */ bctrl /* 80316F30 00313E90 48 00 00 EC */ b lbl_8031701C lbl_80316F34: /* 80316F34 00313E94 38 C0 00 FF */ li r6, 0xff @@ -988,14 +988,14 @@ lbl_80316F34: /* 80316F68 00313EC8 81 83 00 00 */ lwz r12, 0(r3) /* 80316F6C 00313ECC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80316F70 00313ED0 7D 89 03 A6 */ mtctr r12 -/* 80316F74 00313ED4 4E 80 04 21 */ bctrl +/* 80316F74 00313ED4 4E 80 04 21 */ bctrl /* 80316F78 00313ED8 80 7D 00 08 */ lwz r3, 8(r29) /* 80316F7C 00313EDC 7F C4 F3 78 */ mr r4, r30 /* 80316F80 00313EE0 38 A1 00 2C */ addi r5, r1, 0x2c /* 80316F84 00313EE4 81 83 00 00 */ lwz r12, 0(r3) /* 80316F88 00313EE8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80316F8C 00313EEC 7D 89 03 A6 */ mtctr r12 -/* 80316F90 00313EF0 4E 80 04 21 */ bctrl +/* 80316F90 00313EF0 4E 80 04 21 */ bctrl /* 80316F94 00313EF4 38 61 00 30 */ addi r3, r1, 0x30 /* 80316F98 00313EF8 38 81 00 28 */ addi r4, r1, 0x28 /* 80316F9C 00313EFC 38 A1 00 24 */ addi r5, r1, 0x24 @@ -1040,7 +1040,7 @@ lbl_8031701C: /* 80317034 00313F94 83 A1 00 44 */ lwz r29, 0x44(r1) /* 80317038 00313F98 7C 08 03 A6 */ mtlr r0 /* 8031703C 00313F9C 38 21 00 60 */ addi r1, r1, 0x60 -/* 80317040 00313FA0 4E 80 00 20 */ blr +/* 80317040 00313FA0 4E 80 00 20 */ blr .global __dt__7CCEFadeFv __dt__7CCEFadeFv: @@ -1062,7 +1062,7 @@ __dt__7CCEFadeFv: /* 80317080 00313FE0 38 80 00 01 */ li r4, 1 /* 80317084 00313FE4 81 8C 00 08 */ lwz r12, 8(r12) /* 80317088 00313FE8 7D 89 03 A6 */ mtctr r12 -/* 8031708C 00313FEC 4E 80 04 21 */ bctrl +/* 8031708C 00313FEC 4E 80 04 21 */ bctrl lbl_80317090: /* 80317090 00313FF0 80 7E 00 08 */ lwz r3, 8(r30) /* 80317094 00313FF4 28 03 00 00 */ cmplwi r3, 0 @@ -1071,7 +1071,7 @@ lbl_80317090: /* 803170A0 00314000 38 80 00 01 */ li r4, 1 /* 803170A4 00314004 81 8C 00 08 */ lwz r12, 8(r12) /* 803170A8 00314008 7D 89 03 A6 */ mtctr r12 -/* 803170AC 0031400C 4E 80 04 21 */ bctrl +/* 803170AC 0031400C 4E 80 04 21 */ bctrl lbl_803170B0: /* 803170B0 00314010 80 7E 00 0C */ lwz r3, 0xc(r30) /* 803170B4 00314014 28 03 00 00 */ cmplwi r3, 0 @@ -1080,7 +1080,7 @@ lbl_803170B0: /* 803170C0 00314020 38 80 00 01 */ li r4, 1 /* 803170C4 00314024 81 8C 00 08 */ lwz r12, 8(r12) /* 803170C8 00314028 7D 89 03 A6 */ mtctr r12 -/* 803170CC 0031402C 4E 80 04 21 */ bctrl +/* 803170CC 0031402C 4E 80 04 21 */ bctrl lbl_803170D0: /* 803170D0 00314030 28 1E 00 00 */ cmplwi r30, 0 /* 803170D4 00314034 41 82 00 20 */ beq lbl_803170F4 @@ -1104,7 +1104,7 @@ lbl_80317108: /* 80317114 00314074 83 C1 00 08 */ lwz r30, 8(r1) /* 80317118 00314078 7C 08 03 A6 */ mtlr r0 /* 8031711C 0031407C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80317120 00314080 4E 80 00 20 */ blr +/* 80317120 00314080 4E 80 00 20 */ blr .global __ct__7CCEFadeFP13CColorElementP13CColorElementP12CRealElement __ct__7CCEFadeFP13CColorElementP13CColorElementP12CRealElement: @@ -1120,14 +1120,14 @@ __ct__7CCEFadeFP13CColorElementP13CColorElementP12CRealElement: /* 80317148 003140A8 90 83 00 04 */ stw r4, 4(r3) /* 8031714C 003140AC 90 A3 00 08 */ stw r5, 8(r3) /* 80317150 003140B0 90 C3 00 0C */ stw r6, 0xc(r3) -/* 80317154 003140B4 4E 80 00 20 */ blr +/* 80317154 003140B4 4E 80 00 20 */ blr .global GetValue__15CCEFastConstantCFiR6CColor GetValue__15CCEFastConstantCFiR6CColor: /* 80317158 003140B8 80 03 00 04 */ lwz r0, 4(r3) /* 8031715C 003140BC 38 60 00 00 */ li r3, 0 /* 80317160 003140C0 90 05 00 00 */ stw r0, 0(r5) -/* 80317164 003140C4 4E 80 00 20 */ blr +/* 80317164 003140C4 4E 80 00 20 */ blr .global __dt__15CCEFastConstantFv __dt__15CCEFastConstantFv: @@ -1160,7 +1160,7 @@ lbl_803171C0: /* 803171C8 00314128 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803171CC 0031412C 7C 08 03 A6 */ mtlr r0 /* 803171D0 00314130 38 21 00 10 */ addi r1, r1, 0x10 -/* 803171D4 00314134 4E 80 00 20 */ blr +/* 803171D4 00314134 4E 80 00 20 */ blr .global __ct__15CCEFastConstantFffff __ct__15CCEFastConstantFffff: @@ -1230,7 +1230,7 @@ __ct__15CCEFastConstantFffff: /* 803172D4 00314234 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 803172D8 00314238 7C 08 03 A6 */ mtlr r0 /* 803172DC 0031423C 38 21 00 50 */ addi r1, r1, 0x50 -/* 803172E0 00314240 4E 80 00 20 */ blr +/* 803172E0 00314240 4E 80 00 20 */ blr .global GetValue__11CCEConstantCFiR6CColor GetValue__11CCEConstantCFiR6CColor: @@ -1248,7 +1248,7 @@ GetValue__11CCEConstantCFiR6CColor: /* 80317310 00314270 81 83 00 00 */ lwz r12, 0(r3) /* 80317314 00314274 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80317318 00314278 7D 89 03 A6 */ mtctr r12 -/* 8031731C 0031427C 4E 80 04 21 */ bctrl +/* 8031731C 0031427C 4E 80 04 21 */ bctrl /* 80317320 00314280 38 81 00 14 */ addi r4, r1, 0x14 /* 80317324 00314284 38 6D 9C B0 */ addi r3, r13, lbl_805A8870@sda21 /* 80317328 00314288 38 AD 9C B4 */ addi r5, r13, lbl_805A8874@sda21 @@ -1261,7 +1261,7 @@ GetValue__11CCEConstantCFiR6CColor: /* 80317344 003142A4 81 83 00 00 */ lwz r12, 0(r3) /* 80317348 003142A8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031734C 003142AC 7D 89 03 A6 */ mtctr r12 -/* 80317350 003142B0 4E 80 04 21 */ bctrl +/* 80317350 003142B0 4E 80 04 21 */ bctrl /* 80317354 003142B4 38 81 00 10 */ addi r4, r1, 0x10 /* 80317358 003142B8 38 6D 9C B8 */ addi r3, r13, lbl_805A8878@sda21 /* 8031735C 003142BC 38 AD 9C BC */ addi r5, r13, lbl_805A887C@sda21 @@ -1274,7 +1274,7 @@ GetValue__11CCEConstantCFiR6CColor: /* 80317378 003142D8 81 83 00 00 */ lwz r12, 0(r3) /* 8031737C 003142DC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80317380 003142E0 7D 89 03 A6 */ mtctr r12 -/* 80317384 003142E4 4E 80 04 21 */ bctrl +/* 80317384 003142E4 4E 80 04 21 */ bctrl /* 80317388 003142E8 38 81 00 0C */ addi r4, r1, 0xc /* 8031738C 003142EC 38 6D 9C C0 */ addi r3, r13, lbl_805A8880@sda21 /* 80317390 003142F0 38 AD 9C C4 */ addi r5, r13, lbl_805A8884@sda21 @@ -1287,7 +1287,7 @@ GetValue__11CCEConstantCFiR6CColor: /* 803173AC 0031430C 81 83 00 00 */ lwz r12, 0(r3) /* 803173B0 00314310 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803173B4 00314314 7D 89 03 A6 */ mtctr r12 -/* 803173B8 00314318 4E 80 04 21 */ bctrl +/* 803173B8 00314318 4E 80 04 21 */ bctrl /* 803173BC 0031431C 38 81 00 08 */ addi r4, r1, 8 /* 803173C0 00314320 38 6D 9C C8 */ addi r3, r13, lbl_805A8888@sda21 /* 803173C4 00314324 38 AD 9C CC */ addi r5, r13, lbl_805A888C@sda21 @@ -1306,7 +1306,7 @@ GetValue__11CCEConstantCFiR6CColor: /* 803173F8 00314358 83 A1 00 24 */ lwz r29, 0x24(r1) /* 803173FC 0031435C 7C 08 03 A6 */ mtlr r0 /* 80317400 00314360 38 21 00 30 */ addi r1, r1, 0x30 -/* 80317404 00314364 4E 80 00 20 */ blr +/* 80317404 00314364 4E 80 00 20 */ blr .global __dt__11CCEConstantFv __dt__11CCEConstantFv: @@ -1328,7 +1328,7 @@ __dt__11CCEConstantFv: /* 80317444 003143A4 38 80 00 01 */ li r4, 1 /* 80317448 003143A8 81 8C 00 08 */ lwz r12, 8(r12) /* 8031744C 003143AC 7D 89 03 A6 */ mtctr r12 -/* 80317450 003143B0 4E 80 04 21 */ bctrl +/* 80317450 003143B0 4E 80 04 21 */ bctrl lbl_80317454: /* 80317454 003143B4 80 7E 00 08 */ lwz r3, 8(r30) /* 80317458 003143B8 28 03 00 00 */ cmplwi r3, 0 @@ -1337,7 +1337,7 @@ lbl_80317454: /* 80317464 003143C4 38 80 00 01 */ li r4, 1 /* 80317468 003143C8 81 8C 00 08 */ lwz r12, 8(r12) /* 8031746C 003143CC 7D 89 03 A6 */ mtctr r12 -/* 80317470 003143D0 4E 80 04 21 */ bctrl +/* 80317470 003143D0 4E 80 04 21 */ bctrl lbl_80317474: /* 80317474 003143D4 80 7E 00 0C */ lwz r3, 0xc(r30) /* 80317478 003143D8 28 03 00 00 */ cmplwi r3, 0 @@ -1346,7 +1346,7 @@ lbl_80317474: /* 80317484 003143E4 38 80 00 01 */ li r4, 1 /* 80317488 003143E8 81 8C 00 08 */ lwz r12, 8(r12) /* 8031748C 003143EC 7D 89 03 A6 */ mtctr r12 -/* 80317490 003143F0 4E 80 04 21 */ bctrl +/* 80317490 003143F0 4E 80 04 21 */ bctrl lbl_80317494: /* 80317494 003143F4 80 7E 00 10 */ lwz r3, 0x10(r30) /* 80317498 003143F8 28 03 00 00 */ cmplwi r3, 0 @@ -1355,7 +1355,7 @@ lbl_80317494: /* 803174A4 00314404 38 80 00 01 */ li r4, 1 /* 803174A8 00314408 81 8C 00 08 */ lwz r12, 8(r12) /* 803174AC 0031440C 7D 89 03 A6 */ mtctr r12 -/* 803174B0 00314410 4E 80 04 21 */ bctrl +/* 803174B0 00314410 4E 80 04 21 */ bctrl lbl_803174B4: /* 803174B4 00314414 28 1E 00 00 */ cmplwi r30, 0 /* 803174B8 00314418 41 82 00 20 */ beq lbl_803174D8 @@ -1379,7 +1379,7 @@ lbl_803174EC: /* 803174F8 00314458 83 C1 00 08 */ lwz r30, 8(r1) /* 803174FC 0031445C 7C 08 03 A6 */ mtlr r0 /* 80317500 00314460 38 21 00 10 */ addi r1, r1, 0x10 -/* 80317504 00314464 4E 80 00 20 */ blr +/* 80317504 00314464 4E 80 00 20 */ blr .global __ct__11CCEConstantFP12CRealElementP12CRealElementP12CRealElementP12CRealElement __ct__11CCEConstantFP12CRealElementP12CRealElementP12CRealElementP12CRealElement: @@ -1396,7 +1396,7 @@ __ct__11CCEConstantFP12CRealElementP12CRealElementP12CRealElementP12CRealElement /* 80317530 00314490 90 A3 00 08 */ stw r5, 8(r3) /* 80317534 00314494 90 C3 00 0C */ stw r6, 0xc(r3) /* 80317538 00314498 90 E3 00 10 */ stw r7, 0x10(r3) -/* 8031753C 0031449C 4E 80 00 20 */ blr +/* 8031753C 0031449C 4E 80 00 20 */ blr .global "reserve__Q24rstl42vector<6CColor,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl42vector<6CColor,Q24rstl17rmemory_allocator>Fi": diff --git a/asm/Kyoto/Particles/CEffectComponent.s b/asm/Kyoto/Particles/CEffectComponent.s index 20bf63a2..43c41a32 100644 --- a/asm/Kyoto/Particles/CEffectComponent.s +++ b/asm/Kyoto/Particles/CEffectComponent.s @@ -25,7 +25,7 @@ GetSObjectTagFromStream__16CEffectComponentFR12CInputStream: /* 80357360 003542C0 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80357364 003542C4 7C 08 03 A6 */ mtlr r0 /* 80357368 003542C8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8035736C 003542CC 4E 80 00 20 */ blr +/* 8035736C 003542CC 4E 80 00 20 */ blr .global __ct__16CEffectComponentFR12CInputStream __ct__16CEffectComponentFR12CInputStream: diff --git a/asm/Kyoto/Particles/CElectricDescription.s b/asm/Kyoto/Particles/CElectricDescription.s index ce995546..10504278 100644 --- a/asm/Kyoto/Particles/CElectricDescription.s +++ b/asm/Kyoto/Particles/CElectricDescription.s @@ -19,7 +19,7 @@ __dt__20CElectricDescriptionFv: /* 803667E8 00363748 38 80 00 01 */ li r4, 1 /* 803667EC 0036374C 81 8C 00 08 */ lwz r12, 8(r12) /* 803667F0 00363750 7D 89 03 A6 */ mtctr r12 -/* 803667F4 00363754 4E 80 04 21 */ bctrl +/* 803667F4 00363754 4E 80 04 21 */ bctrl lbl_803667F8: /* 803667F8 00363758 80 7F 00 04 */ lwz r3, 4(r31) /* 803667FC 0036375C 28 03 00 00 */ cmplwi r3, 0 @@ -28,7 +28,7 @@ lbl_803667F8: /* 80366808 00363768 38 80 00 01 */ li r4, 1 /* 8036680C 0036376C 81 8C 00 08 */ lwz r12, 8(r12) /* 80366810 00363770 7D 89 03 A6 */ mtctr r12 -/* 80366814 00363774 4E 80 04 21 */ bctrl +/* 80366814 00363774 4E 80 04 21 */ bctrl lbl_80366818: /* 80366818 00363778 80 7F 00 08 */ lwz r3, 8(r31) /* 8036681C 0036377C 28 03 00 00 */ cmplwi r3, 0 @@ -37,7 +37,7 @@ lbl_80366818: /* 80366828 00363788 38 80 00 01 */ li r4, 1 /* 8036682C 0036378C 81 8C 00 08 */ lwz r12, 8(r12) /* 80366830 00363790 7D 89 03 A6 */ mtctr r12 -/* 80366834 00363794 4E 80 04 21 */ bctrl +/* 80366834 00363794 4E 80 04 21 */ bctrl lbl_80366838: /* 80366838 00363798 80 7F 00 0C */ lwz r3, 0xc(r31) /* 8036683C 0036379C 28 03 00 00 */ cmplwi r3, 0 @@ -46,7 +46,7 @@ lbl_80366838: /* 80366848 003637A8 38 80 00 01 */ li r4, 1 /* 8036684C 003637AC 81 8C 00 08 */ lwz r12, 8(r12) /* 80366850 003637B0 7D 89 03 A6 */ mtctr r12 -/* 80366854 003637B4 4E 80 04 21 */ bctrl +/* 80366854 003637B4 4E 80 04 21 */ bctrl lbl_80366858: /* 80366858 003637B8 80 7F 00 10 */ lwz r3, 0x10(r31) /* 8036685C 003637BC 28 03 00 00 */ cmplwi r3, 0 @@ -55,7 +55,7 @@ lbl_80366858: /* 80366868 003637C8 38 80 00 01 */ li r4, 1 /* 8036686C 003637CC 81 8C 00 08 */ lwz r12, 8(r12) /* 80366870 003637D0 7D 89 03 A6 */ mtctr r12 -/* 80366874 003637D4 4E 80 04 21 */ bctrl +/* 80366874 003637D4 4E 80 04 21 */ bctrl lbl_80366878: /* 80366878 003637D8 80 7F 00 14 */ lwz r3, 0x14(r31) /* 8036687C 003637DC 28 03 00 00 */ cmplwi r3, 0 @@ -64,7 +64,7 @@ lbl_80366878: /* 80366888 003637E8 38 80 00 01 */ li r4, 1 /* 8036688C 003637EC 81 8C 00 08 */ lwz r12, 8(r12) /* 80366890 003637F0 7D 89 03 A6 */ mtctr r12 -/* 80366894 003637F4 4E 80 04 21 */ bctrl +/* 80366894 003637F4 4E 80 04 21 */ bctrl lbl_80366898: /* 80366898 003637F8 80 7F 00 18 */ lwz r3, 0x18(r31) /* 8036689C 003637FC 28 03 00 00 */ cmplwi r3, 0 @@ -73,7 +73,7 @@ lbl_80366898: /* 803668A8 00363808 38 80 00 01 */ li r4, 1 /* 803668AC 0036380C 81 8C 00 08 */ lwz r12, 8(r12) /* 803668B0 00363810 7D 89 03 A6 */ mtctr r12 -/* 803668B4 00363814 4E 80 04 21 */ bctrl +/* 803668B4 00363814 4E 80 04 21 */ bctrl lbl_803668B8: /* 803668B8 00363818 80 7F 00 1C */ lwz r3, 0x1c(r31) /* 803668BC 0036381C 28 03 00 00 */ cmplwi r3, 0 @@ -82,7 +82,7 @@ lbl_803668B8: /* 803668C8 00363828 38 80 00 01 */ li r4, 1 /* 803668CC 0036382C 81 8C 00 08 */ lwz r12, 8(r12) /* 803668D0 00363830 7D 89 03 A6 */ mtctr r12 -/* 803668D4 00363834 4E 80 04 21 */ bctrl +/* 803668D4 00363834 4E 80 04 21 */ bctrl lbl_803668D8: /* 803668D8 00363838 80 7F 00 20 */ lwz r3, 0x20(r31) /* 803668DC 0036383C 28 03 00 00 */ cmplwi r3, 0 @@ -91,7 +91,7 @@ lbl_803668D8: /* 803668E8 00363848 38 80 00 01 */ li r4, 1 /* 803668EC 0036384C 81 8C 00 08 */ lwz r12, 8(r12) /* 803668F0 00363850 7D 89 03 A6 */ mtctr r12 -/* 803668F4 00363854 4E 80 04 21 */ bctrl +/* 803668F4 00363854 4E 80 04 21 */ bctrl lbl_803668F8: /* 803668F8 00363858 80 7F 00 24 */ lwz r3, 0x24(r31) /* 803668FC 0036385C 28 03 00 00 */ cmplwi r3, 0 @@ -100,7 +100,7 @@ lbl_803668F8: /* 80366908 00363868 38 80 00 01 */ li r4, 1 /* 8036690C 0036386C 81 8C 00 08 */ lwz r12, 8(r12) /* 80366910 00363870 7D 89 03 A6 */ mtctr r12 -/* 80366914 00363874 4E 80 04 21 */ bctrl +/* 80366914 00363874 4E 80 04 21 */ bctrl lbl_80366918: /* 80366918 00363878 80 7F 00 28 */ lwz r3, 0x28(r31) /* 8036691C 0036387C 28 03 00 00 */ cmplwi r3, 0 @@ -109,7 +109,7 @@ lbl_80366918: /* 80366928 00363888 38 80 00 01 */ li r4, 1 /* 8036692C 0036388C 81 8C 00 08 */ lwz r12, 8(r12) /* 80366930 00363890 7D 89 03 A6 */ mtctr r12 -/* 80366934 00363894 4E 80 04 21 */ bctrl +/* 80366934 00363894 4E 80 04 21 */ bctrl lbl_80366938: /* 80366938 00363898 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 8036693C 0036389C 28 03 00 00 */ cmplwi r3, 0 @@ -118,7 +118,7 @@ lbl_80366938: /* 80366948 003638A8 38 80 00 01 */ li r4, 1 /* 8036694C 003638AC 81 8C 00 08 */ lwz r12, 8(r12) /* 80366950 003638B0 7D 89 03 A6 */ mtctr r12 -/* 80366954 003638B4 4E 80 04 21 */ bctrl +/* 80366954 003638B4 4E 80 04 21 */ bctrl lbl_80366958: /* 80366958 003638B8 80 7F 00 30 */ lwz r3, 0x30(r31) /* 8036695C 003638BC 28 03 00 00 */ cmplwi r3, 0 @@ -127,7 +127,7 @@ lbl_80366958: /* 80366968 003638C8 38 80 00 01 */ li r4, 1 /* 8036696C 003638CC 81 8C 00 08 */ lwz r12, 8(r12) /* 80366970 003638D0 7D 89 03 A6 */ mtctr r12 -/* 80366974 003638D4 4E 80 04 21 */ bctrl +/* 80366974 003638D4 4E 80 04 21 */ bctrl lbl_80366978: /* 80366978 003638D8 80 7F 00 34 */ lwz r3, 0x34(r31) /* 8036697C 003638DC 28 03 00 00 */ cmplwi r3, 0 @@ -136,7 +136,7 @@ lbl_80366978: /* 80366988 003638E8 38 80 00 01 */ li r4, 1 /* 8036698C 003638EC 81 8C 00 08 */ lwz r12, 8(r12) /* 80366990 003638F0 7D 89 03 A6 */ mtctr r12 -/* 80366994 003638F4 4E 80 04 21 */ bctrl +/* 80366994 003638F4 4E 80 04 21 */ bctrl lbl_80366998: /* 80366998 003638F8 80 7F 00 38 */ lwz r3, 0x38(r31) /* 8036699C 003638FC 28 03 00 00 */ cmplwi r3, 0 @@ -145,7 +145,7 @@ lbl_80366998: /* 803669A8 00363908 38 80 00 01 */ li r4, 1 /* 803669AC 0036390C 81 8C 00 08 */ lwz r12, 8(r12) /* 803669B0 00363910 7D 89 03 A6 */ mtctr r12 -/* 803669B4 00363914 4E 80 04 21 */ bctrl +/* 803669B4 00363914 4E 80 04 21 */ bctrl lbl_803669B8: /* 803669B8 00363918 80 7F 00 3C */ lwz r3, 0x3c(r31) /* 803669BC 0036391C 28 03 00 00 */ cmplwi r3, 0 @@ -154,7 +154,7 @@ lbl_803669B8: /* 803669C8 00363928 38 80 00 01 */ li r4, 1 /* 803669CC 0036392C 81 8C 00 08 */ lwz r12, 8(r12) /* 803669D0 00363930 7D 89 03 A6 */ mtctr r12 -/* 803669D4 00363934 4E 80 04 21 */ bctrl +/* 803669D4 00363934 4E 80 04 21 */ bctrl lbl_803669D8: /* 803669D8 00363938 34 1F 00 60 */ addic. r0, r31, 0x60 /* 803669DC 0036393C 41 82 00 30 */ beq lbl_80366A0C @@ -212,7 +212,7 @@ lbl_80366A84: /* 80366A90 003639F0 83 C1 00 08 */ lwz r30, 8(r1) /* 80366A94 003639F4 7C 08 03 A6 */ mtlr r0 /* 80366A98 003639F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80366A9C 003639FC 4E 80 00 20 */ blr +/* 80366A9C 003639FC 4E 80 00 20 */ blr .global __ct__20CElectricDescriptionFv __ct__20CElectricDescriptionFv: diff --git a/asm/Kyoto/Particles/CElementGen.s b/asm/Kyoto/Particles/CElementGen.s index 450e2d6c..fbe140d3 100644 --- a/asm/Kyoto/Particles/CElementGen.s +++ b/asm/Kyoto/Particles/CElementGen.s @@ -428,23 +428,23 @@ lbl_805A9488: .global lbl_805A948C lbl_805A948C: .skip 0x4 - + .section .text, "ax" .global GetGlobalTranslation__11CElementGenCFv GetGlobalTranslation__11CElementGenCFv: /* 8031762C 0031458C 38 63 00 E8 */ addi r3, r3, 0xe8 -/* 80317630 00314590 4E 80 00 20 */ blr +/* 80317630 00314590 4E 80 00 20 */ blr .global GetGlobalOrientation__11CElementGenCFv GetGlobalOrientation__11CElementGenCFv: /* 80317634 00314594 38 63 02 2C */ addi r3, r3, 0x22c -/* 80317638 00314598 4E 80 00 20 */ blr +/* 80317638 00314598 4E 80 00 20 */ blr .global GetParticleEmission__11CElementGenCFv GetParticleEmission__11CElementGenCFv: /* 8031763C 0031459C 88 63 00 88 */ lbz r3, 0x88(r3) -/* 80317640 003145A0 4E 80 00 20 */ blr +/* 80317640 003145A0 4E 80 00 20 */ blr .global IsIndirectTextured__11CElementGenCFv IsIndirectTextured__11CElementGenCFv: @@ -452,49 +452,49 @@ IsIndirectTextured__11CElementGenCFv: /* 80317648 003145A8 38 60 00 00 */ li r3, 0 /* 8031764C 003145AC 80 04 00 40 */ lwz r0, 0x40(r4) /* 80317650 003145B0 28 00 00 00 */ cmplwi r0, 0 -/* 80317654 003145B4 4D 82 00 20 */ beqlr +/* 80317654 003145B4 4D 82 00 20 */ beqlr /* 80317658 003145B8 80 04 00 44 */ lwz r0, 0x44(r4) /* 8031765C 003145BC 28 00 00 00 */ cmplwi r0, 0 -/* 80317660 003145C0 4D 82 00 20 */ beqlr +/* 80317660 003145C0 4D 82 00 20 */ beqlr /* 80317664 003145C4 38 60 00 01 */ li r3, 1 -/* 80317668 003145C8 4E 80 00 20 */ blr +/* 80317668 003145C8 4E 80 00 20 */ blr .global GetCEXTValue__11CElementGenCFi GetCEXTValue__11CElementGenCFi: /* 8031766C 003145CC 54 80 10 3A */ slwi r0, r4, 2 /* 80317670 003145D0 7C 63 02 14 */ add r3, r3, r0 /* 80317674 003145D4 C0 23 00 9C */ lfs f1, 0x9c(r3) -/* 80317678 003145D8 4E 80 00 20 */ blr +/* 80317678 003145D8 4E 80 00 20 */ blr .global SetCEXTValue__11CElementGenFif SetCEXTValue__11CElementGenFif: /* 8031767C 003145DC 54 80 10 3A */ slwi r0, r4, 2 /* 80317680 003145E0 7C 63 02 14 */ add r3, r3, r0 /* 80317684 003145E4 D0 23 00 9C */ stfs f1, 0x9c(r3) -/* 80317688 003145E8 4E 80 00 20 */ blr +/* 80317688 003145E8 4E 80 00 20 */ blr .global GetActiveChildParticle__11CElementGenCFi GetActiveChildParticle__11CElementGenCFi: /* 8031768C 003145EC 80 63 02 9C */ lwz r3, 0x29c(r3) /* 80317690 003145F0 54 80 10 3A */ slwi r0, r4, 2 /* 80317694 003145F4 7C 63 00 2E */ lwzx r3, r3, r0 -/* 80317698 003145F8 4E 80 00 20 */ blr +/* 80317698 003145F8 4E 80 00 20 */ blr .global GetNumActiveChildParticles__11CElementGenCFv GetNumActiveChildParticles__11CElementGenCFv: /* 8031769C 003145FC 80 63 02 94 */ lwz r3, 0x294(r3) -/* 803176A0 00314600 4E 80 00 20 */ blr +/* 803176A0 00314600 4E 80 00 20 */ blr .global Get4CharId__11CElementGenCF Get4CharId__11CElementGenCF: /* 803176A4 00314604 3C 60 50 41 */ lis r3, 0x50415254@ha /* 803176A8 00314608 38 63 52 54 */ addi r3, r3, 0x50415254@l -/* 803176AC 0031460C 4E 80 00 20 */ blr +/* 803176AC 0031460C 4E 80 00 20 */ blr .global GetGeneratorRate__11CElementGenCFv GetGeneratorRate__11CElementGenCFv: /* 803176B0 00314610 C0 23 00 98 */ lfs f1, 0x98(r3) -/* 803176B4 00314614 4E 80 00 20 */ blr +/* 803176B4 00314614 4E 80 00 20 */ blr .global SetGeneratorRate__11CElementGenFf SetGeneratorRate__11CElementGenFf: @@ -525,7 +525,7 @@ lbl_80317704: /* 8031770C 0031466C 81 9E 00 00 */ lwz r12, 0(r30) /* 80317710 00314670 81 8C 00 74 */ lwz r12, 0x74(r12) /* 80317714 00314674 7D 89 03 A6 */ mtctr r12 -/* 80317718 00314678 4E 80 04 21 */ bctrl +/* 80317718 00314678 4E 80 04 21 */ bctrl /* 8031771C 0031467C 3C 03 AF BF */ addis r0, r3, 0xafbf /* 80317720 00314680 28 00 52 54 */ cmplwi r0, 0x5254 /* 80317724 00314684 40 82 00 1C */ bne lbl_80317740 @@ -534,7 +534,7 @@ lbl_80317704: /* 80317730 00314690 81 9E 00 00 */ lwz r12, 0(r30) /* 80317734 00314694 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80317738 00314698 7D 89 03 A6 */ mtctr r12 -/* 8031773C 0031469C 4E 80 04 21 */ bctrl +/* 8031773C 0031469C 4E 80 04 21 */ bctrl lbl_80317740: /* 80317740 003146A0 3B FF 00 04 */ addi r31, r31, 4 lbl_80317744: @@ -550,7 +550,7 @@ lbl_80317744: /* 80317768 003146C8 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8031776C 003146CC 7C 08 03 A6 */ mtlr r0 /* 80317770 003146D0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80317774 003146D4 4E 80 00 20 */ blr +/* 80317774 003146D4 4E 80 00 20 */ blr .global GetLight__11CElementGenCFv GetLight__11CElementGenCFv: @@ -695,7 +695,7 @@ lbl_80317954: /* 80317960 003148C0 83 A1 00 E4 */ lwz r29, 0xe4(r1) /* 80317964 003148C4 7C 08 03 A6 */ mtlr r0 /* 80317968 003148C8 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 8031796C 003148CC 4E 80 00 20 */ blr +/* 8031796C 003148CC 4E 80 00 20 */ blr .global SystemHasLight__11CElementGenCFv SystemHasLight__11CElementGenCFv: @@ -703,12 +703,12 @@ SystemHasLight__11CElementGenCFv: /* 80317974 003148D4 7C 03 00 D0 */ neg r0, r3 /* 80317978 003148D8 7C 00 1B 78 */ or r0, r0, r3 /* 8031797C 003148DC 54 03 0F FE */ srwi r3, r0, 0x1f -/* 80317980 003148E0 4E 80 00 20 */ blr +/* 80317980 003148E0 4E 80 00 20 */ blr .global GetEmitterTime__11CElementGenFv GetEmitterTime__11CElementGenFv: /* 80317984 003148E4 80 63 00 74 */ lwz r3, 0x74(r3) -/* 80317988 003148E8 4E 80 00 20 */ blr +/* 80317988 003148E8 4E 80 00 20 */ blr .global GetBounds__11CElementGenCFv GetBounds__11CElementGenCFv: @@ -749,7 +749,7 @@ lbl_80317A04: /* 80317A0C 0031496C 83 C1 00 08 */ lwz r30, 8(r1) /* 80317A10 00314970 7C 08 03 A6 */ mtlr r0 /* 80317A14 00314974 38 21 00 10 */ addi r1, r1, 0x10 -/* 80317A18 00314978 4E 80 00 20 */ blr +/* 80317A18 00314978 4E 80 00 20 */ blr .global BuildParticleSystemBounds__11CElementGenFv BuildParticleSystemBounds__11CElementGenFv: @@ -788,7 +788,7 @@ lbl_80317A90: /* 80317A98 003149F8 81 84 00 00 */ lwz r12, 0(r4) /* 80317A9C 003149FC 81 8C 00 5C */ lwz r12, 0x5c(r12) /* 80317AA0 00314A00 7D 89 03 A6 */ mtctr r12 -/* 80317AA4 00314A04 4E 80 04 21 */ bctrl +/* 80317AA4 00314A04 4E 80 04 21 */ bctrl /* 80317AA8 00314A08 88 01 00 98 */ lbz r0, 0x98(r1) /* 80317AAC 00314A0C 28 00 00 00 */ cmplwi r0, 0 /* 80317AB0 00314A10 98 01 00 B4 */ stb r0, 0xb4(r1) @@ -839,7 +839,7 @@ lbl_80317B30: /* 80317B58 00314AB8 81 9C 00 00 */ lwz r12, 0(r28) /* 80317B5C 00314ABC 81 8C 00 60 */ lwz r12, 0x60(r12) /* 80317B60 00314AC0 7D 89 03 A6 */ mtctr r12 -/* 80317B64 00314AC4 4E 80 04 21 */ bctrl +/* 80317B64 00314AC4 4E 80 04 21 */ bctrl /* 80317B68 00314AC8 2C 03 00 00 */ cmpwi r3, 0 /* 80317B6C 00314ACC 40 81 01 28 */ ble lbl_80317C94 /* 80317B70 00314AD0 C0 7C 02 EC */ lfs f3, 0x2ec(r28) @@ -950,7 +950,7 @@ lbl_80317CEC: /* 80317D08 00314C68 80 01 01 84 */ lwz r0, 0x184(r1) /* 80317D0C 00314C6C 7C 08 03 A6 */ mtlr r0 /* 80317D10 00314C70 38 21 01 80 */ addi r1, r1, 0x180 -/* 80317D14 00314C74 4E 80 00 20 */ blr +/* 80317D14 00314C74 4E 80 00 20 */ blr .global AccumulateBounds__11CElementGenFRC9CVector3ff AccumulateBounds__11CElementGenFRC9CVector3ff: @@ -989,9 +989,9 @@ lbl_80317D74: lbl_80317D84: /* 80317D84 00314CE4 C0 03 02 EC */ lfs f0, 0x2ec(r3) /* 80317D88 00314CE8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80317D8C 00314CEC 4C 81 00 20 */ blelr +/* 80317D8C 00314CEC 4C 81 00 20 */ blelr /* 80317D90 00314CF0 D0 23 02 EC */ stfs f1, 0x2ec(r3) -/* 80317D94 00314CF4 4E 80 00 20 */ blr +/* 80317D94 00314CF4 4E 80 00 20 */ blr .global GetSystemCount__11CElementGenFv GetSystemCount__11CElementGenFv: @@ -1016,7 +1016,7 @@ lbl_80317DD4: /* 80317DDC 00314D3C 81 9D 00 00 */ lwz r12, 0(r29) /* 80317DE0 00314D40 81 8C 00 74 */ lwz r12, 0x74(r12) /* 80317DE4 00314D44 7D 89 03 A6 */ mtctr r12 -/* 80317DE8 00314D48 4E 80 04 21 */ bctrl +/* 80317DE8 00314D48 4E 80 04 21 */ bctrl /* 80317DEC 00314D4C 3C 03 AF BF */ addis r0, r3, 0xafbf /* 80317DF0 00314D50 28 00 52 54 */ cmplwi r0, 0x5254 /* 80317DF4 00314D54 40 82 00 14 */ bne lbl_80317E08 @@ -1044,7 +1044,7 @@ lbl_80317E14: /* 80317E40 00314DA0 83 81 00 10 */ lwz r28, 0x10(r1) /* 80317E44 00314DA4 7C 08 03 A6 */ mtlr r0 /* 80317E48 00314DA8 38 21 00 20 */ addi r1, r1, 0x20 -/* 80317E4C 00314DAC 4E 80 00 20 */ blr +/* 80317E4C 00314DAC 4E 80 00 20 */ blr .global GetParticleCountAllInternal__11CElementGenCFv GetParticleCountAllInternal__11CElementGenCFv: @@ -1065,7 +1065,7 @@ lbl_80317E7C: /* 80317E84 00314DE4 81 9D 00 00 */ lwz r12, 0(r29) /* 80317E88 00314DE8 81 8C 00 74 */ lwz r12, 0x74(r12) /* 80317E8C 00314DEC 7D 89 03 A6 */ mtctr r12 -/* 80317E90 00314DF0 4E 80 04 21 */ bctrl +/* 80317E90 00314DF0 4E 80 04 21 */ bctrl /* 80317E94 00314DF4 3C 03 AF BF */ addis r0, r3, 0xafbf /* 80317E98 00314DF8 28 00 52 54 */ cmplwi r0, 0x5254 /* 80317E9C 00314DFC 40 82 00 10 */ bne lbl_80317EAC @@ -1089,12 +1089,12 @@ lbl_80317EB0: /* 80317EDC 00314E3C 83 81 00 10 */ lwz r28, 0x10(r1) /* 80317EE0 00314E40 7C 08 03 A6 */ mtlr r0 /* 80317EE4 00314E44 38 21 00 20 */ addi r1, r1, 0x20 -/* 80317EE8 00314E48 4E 80 00 20 */ blr +/* 80317EE8 00314E48 4E 80 00 20 */ blr .global GetParticleCountAll__11CElementGenCFv GetParticleCountAll__11CElementGenCFv: /* 80317EEC 00314E4C 80 63 02 64 */ lwz r3, 0x264(r3) -/* 80317EF0 00314E50 4E 80 00 20 */ blr +/* 80317EF0 00314E50 4E 80 00 20 */ blr .global RenderModels__11CElementGenFv RenderModels__11CElementGenFv: @@ -1206,7 +1206,7 @@ lbl_80318054: /* 80318080 00314FE0 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80318084 00314FE4 7C A5 00 50 */ subf r5, r5, r0 /* 80318088 00314FE8 7D 89 03 A6 */ mtctr r12 -/* 8031808C 00314FEC 4E 80 04 21 */ bctrl +/* 8031808C 00314FEC 4E 80 04 21 */ bctrl /* 80318090 00314FF0 38 61 00 60 */ addi r3, r1, 0x60 /* 80318094 00314FF4 38 81 00 BC */ addi r4, r1, 0xbc /* 80318098 00314FF8 48 02 8E 11 */ bl __ct__6CTokenFRC6CToken @@ -1293,13 +1293,13 @@ lbl_803181B8: /* 803181D4 00315134 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803181D8 00315138 7C 84 00 50 */ subf r4, r4, r0 /* 803181DC 0031513C 7D 89 03 A6 */ mtctr r12 -/* 803181E0 00315140 4E 80 04 21 */ bctrl +/* 803181E0 00315140 4E 80 04 21 */ bctrl /* 803181E4 00315144 80 7E 00 28 */ lwz r3, 0x28(r30) /* 803181E8 00315148 80 63 00 40 */ lwz r3, 0x40(r3) /* 803181EC 0031514C 81 83 00 00 */ lwz r12, 0(r3) /* 803181F0 00315150 81 8C 00 18 */ lwz r12, 0x18(r12) /* 803181F4 00315154 7D 89 03 A6 */ mtctr r12 -/* 803181F8 00315158 4E 80 04 21 */ bctrl +/* 803181F8 00315158 4E 80 04 21 */ bctrl /* 803181FC 0031515C 38 61 00 60 */ addi r3, r1, 0x60 /* 80318200 00315160 38 80 00 00 */ li r4, 0 /* 80318204 00315164 48 02 8C 3D */ bl __dt__6CTokenFv @@ -1343,7 +1343,7 @@ lbl_80318260: /* 80318290 003151F0 81 83 00 00 */ lwz r12, 0(r3) /* 80318294 003151F4 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80318298 003151F8 7D 89 03 A6 */ mtctr r12 -/* 8031829C 003151FC 4E 80 04 21 */ bctrl +/* 8031829C 003151FC 4E 80 04 21 */ bctrl /* 803182A0 00315200 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 803182A4 00315204 41 82 00 08 */ beq lbl_803182AC /* 803182A8 00315208 3B A0 00 01 */ li r29, 1 @@ -1376,7 +1376,7 @@ lbl_803182AC: /* 80318310 00315270 81 83 00 00 */ lwz r12, 0(r3) /* 80318314 00315274 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80318318 00315278 7D 89 03 A6 */ mtctr r12 -/* 8031831C 0031527C 4E 80 04 21 */ bctrl +/* 8031831C 0031527C 4E 80 04 21 */ bctrl /* 80318320 00315280 C0 22 C9 F4 */ lfs f1, lbl_805AE714@sda21(r2) /* 80318324 00315284 38 61 03 84 */ addi r3, r1, 0x384 /* 80318328 00315288 C0 01 00 E8 */ lfs f0, 0xe8(r1) @@ -1452,7 +1452,7 @@ lbl_8031841C: /* 80318434 00315394 38 A1 00 EC */ addi r5, r1, 0xec /* 80318438 00315398 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031843C 0031539C 7D 89 03 A6 */ mtctr r12 -/* 80318440 003153A0 4E 80 04 21 */ bctrl +/* 80318440 003153A0 4E 80 04 21 */ bctrl lbl_80318444: /* 80318444 003153A4 C0 3C 00 08 */ lfs f1, 8(r28) /* 80318448 003153A8 38 61 03 24 */ addi r3, r1, 0x324 @@ -1570,7 +1570,7 @@ lbl_803185D4: /* 803185FC 0031555C 81 83 00 00 */ lwz r12, 0(r3) /* 80318600 00315560 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80318604 00315564 7D 89 03 A6 */ mtctr r12 -/* 80318608 00315568 4E 80 04 21 */ bctrl +/* 80318608 00315568 4E 80 04 21 */ bctrl /* 8031860C 0031556C C0 22 C9 F4 */ lfs f1, lbl_805AE714@sda21(r2) /* 80318610 00315570 38 61 02 C4 */ addi r3, r1, 0x2c4 /* 80318614 00315574 C0 01 00 DC */ lfs f0, 0xdc(r1) @@ -1629,7 +1629,7 @@ lbl_803186B8: /* 803186E0 00315640 81 83 00 00 */ lwz r12, 0(r3) /* 803186E4 00315644 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803186E8 00315648 7D 89 03 A6 */ mtctr r12 -/* 803186EC 0031564C 4E 80 04 21 */ bctrl +/* 803186EC 0031564C 4E 80 04 21 */ bctrl /* 803186F0 00315650 C0 21 00 C8 */ lfs f1, 0xc8(r1) /* 803186F4 00315654 38 61 02 64 */ addi r3, r1, 0x264 /* 803186F8 00315658 C0 41 00 CC */ lfs f2, 0xcc(r1) @@ -1652,7 +1652,7 @@ lbl_80318720: /* 80318738 00315698 38 A1 00 24 */ addi r5, r1, 0x24 /* 8031873C 0031569C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80318740 003156A0 7D 89 03 A6 */ mtctr r12 -/* 80318744 003156A4 4E 80 04 21 */ bctrl +/* 80318744 003156A4 4E 80 04 21 */ bctrl /* 80318748 003156A8 38 61 00 08 */ addi r3, r1, 8 /* 8031874C 003156AC 38 81 00 24 */ addi r4, r1, 0x24 /* 80318750 003156B0 38 BE 03 38 */ addi r5, r30, 0x338 @@ -1895,7 +1895,7 @@ lbl_80318A9C: /* 80318ADC 00315A3C 80 01 05 44 */ lwz r0, 0x544(r1) /* 80318AE0 00315A40 7C 08 03 A6 */ mtlr r0 /* 80318AE4 00315A44 38 21 05 40 */ addi r1, r1, 0x540 -/* 80318AE8 00315A48 4E 80 00 20 */ blr +/* 80318AE8 00315A48 4E 80 00 20 */ blr .global RenderLines__11CElementGenFv RenderLines__11CElementGenFv: @@ -2013,7 +2013,7 @@ lbl_80318C70: /* 80318CA0 00315C00 81 83 00 00 */ lwz r12, 0(r3) /* 80318CA4 00315C04 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80318CA8 00315C08 7D 89 03 A6 */ mtctr r12 -/* 80318CAC 00315C0C 4E 80 04 21 */ bctrl +/* 80318CAC 00315C0C 4E 80 04 21 */ bctrl /* 80318CB0 00315C10 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80318CB4 00315C14 41 82 00 08 */ beq lbl_80318CBC /* 80318CB8 00315C18 3B E0 00 01 */ li r31, 1 @@ -2030,7 +2030,7 @@ lbl_80318CBC: /* 80318CE0 00315C40 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80318CE4 00315C44 7C A5 00 50 */ subf r5, r5, r0 /* 80318CE8 00315C48 7D 89 03 A6 */ mtctr r12 -/* 80318CEC 00315C4C 4E 80 04 21 */ bctrl +/* 80318CEC 00315C4C 4E 80 04 21 */ bctrl /* 80318CF0 00315C50 38 61 00 30 */ addi r3, r1, 0x30 /* 80318CF4 00315C54 38 81 00 88 */ addi r4, r1, 0x88 /* 80318CF8 00315C58 48 02 81 B1 */ bl __ct__6CTokenFRC6CToken @@ -2134,13 +2134,13 @@ lbl_80318E58: /* 80318E74 00315DD4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80318E78 00315DD8 7C 84 00 50 */ subf r4, r4, r0 /* 80318E7C 00315DDC 7D 89 03 A6 */ mtctr r12 -/* 80318E80 00315DE0 4E 80 04 21 */ bctrl +/* 80318E80 00315DE0 4E 80 04 21 */ bctrl /* 80318E84 00315DE4 80 7C 00 28 */ lwz r3, 0x28(r28) /* 80318E88 00315DE8 80 63 00 40 */ lwz r3, 0x40(r3) /* 80318E8C 00315DEC 81 83 00 00 */ lwz r12, 0(r3) /* 80318E90 00315DF0 81 8C 00 18 */ lwz r12, 0x18(r12) /* 80318E94 00315DF4 7D 89 03 A6 */ mtctr r12 -/* 80318E98 00315DF8 4E 80 04 21 */ bctrl +/* 80318E98 00315DF8 4E 80 04 21 */ bctrl /* 80318E9C 00315DFC 7C 60 1B 78 */ mr r0, r3 /* 80318EA0 00315E00 38 61 00 30 */ addi r3, r1, 0x30 /* 80318EA4 00315E04 7C 19 03 78 */ mr r25, r0 @@ -2216,7 +2216,7 @@ lbl_80318F34: /* 80318FAC 00315F0C 81 83 00 00 */ lwz r12, 0(r3) /* 80318FB0 00315F10 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80318FB4 00315F14 7D 89 03 A6 */ mtctr r12 -/* 80318FB8 00315F18 4E 80 04 21 */ bctrl +/* 80318FB8 00315F18 4E 80 04 21 */ bctrl /* 80318FBC 00315F1C C0 21 00 2C */ lfs f1, 0x2c(r1) /* 80318FC0 00315F20 C0 02 C9 E8 */ lfs f0, lbl_805AE708@sda21(r2) /* 80318FC4 00315F24 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -2261,7 +2261,7 @@ lbl_80319028: /* 80319050 00315FB0 7C 84 00 50 */ subf r4, r4, r0 /* 80319054 00315FB4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80319058 00315FB8 7D 89 03 A6 */ mtctr r12 -/* 8031905C 00315FBC 4E 80 04 21 */ bctrl +/* 8031905C 00315FBC 4E 80 04 21 */ bctrl lbl_80319060: /* 80319060 00315FC0 C0 39 00 08 */ lfs f1, 8(r25) /* 80319064 00315FC4 C0 19 00 14 */ lfs f0, 0x14(r25) @@ -2426,7 +2426,7 @@ lbl_80319270: /* 803192C4 00316224 80 01 03 04 */ lwz r0, 0x304(r1) /* 803192C8 00316228 7C 08 03 A6 */ mtlr r0 /* 803192CC 0031622C 38 21 03 00 */ addi r1, r1, 0x300 -/* 803192D0 00316230 4E 80 00 20 */ blr +/* 803192D0 00316230 4E 80 00 20 */ blr .global RenderParticlesIndirectTexture__11CElementGenFv RenderParticlesIndirectTexture__11CElementGenFv: @@ -2548,7 +2548,7 @@ lbl_80319454: /* 80319498 003163F8 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8031949C 003163FC 7C A5 00 50 */ subf r5, r5, r0 /* 803194A0 00316400 7D 89 03 A6 */ mtctr r12 -/* 803194A4 00316404 4E 80 04 21 */ bctrl +/* 803194A4 00316404 4E 80 04 21 */ bctrl /* 803194A8 00316408 38 7F 00 2C */ addi r3, r31, 0x2c /* 803194AC 0031640C 38 9F 00 D0 */ addi r4, r31, 0xd0 /* 803194B0 00316410 48 02 79 F9 */ bl __ct__6CTokenFRC6CToken @@ -2569,7 +2569,7 @@ lbl_80319454: /* 803194EC 0031644C 81 83 00 00 */ lwz r12, 0(r3) /* 803194F0 00316450 81 8C 00 14 */ lwz r12, 0x14(r12) /* 803194F4 00316454 7D 89 03 A6 */ mtctr r12 -/* 803194F8 00316458 4E 80 04 21 */ bctrl +/* 803194F8 00316458 4E 80 04 21 */ bctrl /* 803194FC 0031645C 80 DE 00 28 */ lwz r6, 0x28(r30) /* 80319500 00316460 7C 74 1B 78 */ mr r20, r3 /* 80319504 00316464 80 9E 00 3C */ lwz r4, 0x3c(r30) @@ -2581,13 +2581,13 @@ lbl_80319454: /* 8031951C 0031647C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80319520 00316480 7C 84 00 50 */ subf r4, r4, r0 /* 80319524 00316484 7D 89 03 A6 */ mtctr r12 -/* 80319528 00316488 4E 80 04 21 */ bctrl +/* 80319528 00316488 4E 80 04 21 */ bctrl /* 8031952C 0031648C 80 7E 00 28 */ lwz r3, 0x28(r30) /* 80319530 00316490 80 63 00 40 */ lwz r3, 0x40(r3) /* 80319534 00316494 81 83 00 00 */ lwz r12, 0(r3) /* 80319538 00316498 81 8C 00 18 */ lwz r12, 0x18(r12) /* 8031953C 0031649C 7D 89 03 A6 */ mtctr r12 -/* 80319540 003164A0 4E 80 04 21 */ bctrl +/* 80319540 003164A0 4E 80 04 21 */ bctrl /* 80319544 003164A4 80 9E 00 28 */ lwz r4, 0x28(r30) /* 80319548 003164A8 7C 70 1B 78 */ mr r16, r3 /* 8031954C 003164AC 80 BE 00 3C */ lwz r5, 0x3c(r30) @@ -2599,7 +2599,7 @@ lbl_80319454: /* 80319564 003164C4 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80319568 003164C8 7C A5 00 50 */ subf r5, r5, r0 /* 8031956C 003164CC 7D 89 03 A6 */ mtctr r12 -/* 80319570 003164D0 4E 80 04 21 */ bctrl +/* 80319570 003164D0 4E 80 04 21 */ bctrl /* 80319574 003164D4 38 7F 00 24 */ addi r3, r31, 0x24 /* 80319578 003164D8 38 9F 00 C4 */ addi r4, r31, 0xc4 /* 8031957C 003164DC 48 02 79 2D */ bl __ct__6CTokenFRC6CToken @@ -2620,14 +2620,14 @@ lbl_80319454: /* 803195B8 00316518 81 83 00 00 */ lwz r12, 0(r3) /* 803195BC 0031651C 81 8C 00 14 */ lwz r12, 0x14(r12) /* 803195C0 00316520 7D 89 03 A6 */ mtctr r12 -/* 803195C4 00316524 4E 80 04 21 */ bctrl +/* 803195C4 00316524 4E 80 04 21 */ bctrl /* 803195C8 00316528 80 9E 00 28 */ lwz r4, 0x28(r30) /* 803195CC 0031652C 7C 6F 1B 78 */ mr r15, r3 /* 803195D0 00316530 80 64 00 44 */ lwz r3, 0x44(r4) /* 803195D4 00316534 81 83 00 00 */ lwz r12, 0(r3) /* 803195D8 00316538 81 8C 00 18 */ lwz r12, 0x18(r12) /* 803195DC 0031653C 7D 89 03 A6 */ mtctr r12 -/* 803195E0 00316540 4E 80 04 21 */ bctrl +/* 803195E0 00316540 4E 80 04 21 */ bctrl /* 803195E4 00316544 80 DE 00 28 */ lwz r6, 0x28(r30) /* 803195E8 00316548 7C 6E 1B 78 */ mr r14, r3 /* 803195EC 0031654C 80 9E 00 3C */ lwz r4, 0x3c(r30) @@ -2639,7 +2639,7 @@ lbl_80319454: /* 80319604 00316564 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80319608 00316568 7C 84 00 50 */ subf r4, r4, r0 /* 8031960C 0031656C 7D 89 03 A6 */ mtctr r12 -/* 80319610 00316570 4E 80 04 21 */ bctrl +/* 80319610 00316570 4E 80 04 21 */ bctrl /* 80319614 00316574 38 60 00 03 */ li r3, 3 /* 80319618 00316578 4B FE F7 FD */ bl SetNumTexGens__3CGXFUc /* 8031961C 0031657C 38 60 00 00 */ li r3, 0 @@ -2914,7 +2914,7 @@ lbl_80319990: /* 80319A30 00316990 7C A5 00 50 */ subf r5, r5, r0 /* 80319A34 00316994 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80319A38 00316998 7D 89 03 A6 */ mtctr r12 -/* 80319A3C 0031699C 4E 80 04 21 */ bctrl +/* 80319A3C 0031699C 4E 80 04 21 */ bctrl /* 80319A40 003169A0 38 7F 00 1C */ addi r3, r31, 0x1c /* 80319A44 003169A4 38 9F 00 58 */ addi r4, r31, 0x58 /* 80319A48 003169A8 48 02 74 61 */ bl __ct__6CTokenFRC6CToken @@ -2951,7 +2951,7 @@ lbl_80319A9C: /* 80319ABC 00316A1C 7C A5 00 50 */ subf r5, r5, r0 /* 80319AC0 00316A20 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80319AC4 00316A24 7D 89 03 A6 */ mtctr r12 -/* 80319AC8 00316A28 4E 80 04 21 */ bctrl +/* 80319AC8 00316A28 4E 80 04 21 */ bctrl /* 80319ACC 00316A2C 38 7F 00 14 */ addi r3, r31, 0x14 /* 80319AD0 00316A30 38 9F 00 4C */ addi r4, r31, 0x4c /* 80319AD4 00316A34 48 02 73 D5 */ bl __ct__6CTokenFRC6CToken @@ -2990,7 +2990,7 @@ lbl_80319B28: /* 80319B50 00316AB0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80319B54 00316AB4 7C 84 00 50 */ subf r4, r4, r0 /* 80319B58 00316AB8 7D 89 03 A6 */ mtctr r12 -/* 80319B5C 00316ABC 4E 80 04 21 */ bctrl +/* 80319B5C 00316ABC 4E 80 04 21 */ bctrl lbl_80319B60: /* 80319B60 00316AC0 28 0E 00 00 */ cmplwi r14, 0 /* 80319B64 00316AC4 40 82 00 34 */ bne lbl_80319B98 @@ -3005,7 +3005,7 @@ lbl_80319B60: /* 80319B88 00316AE8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80319B8C 00316AEC 7C 84 00 50 */ subf r4, r4, r0 /* 80319B90 00316AF0 7D 89 03 A6 */ mtctr r12 -/* 80319B94 00316AF4 4E 80 04 21 */ bctrl +/* 80319B94 00316AF4 4E 80 04 21 */ bctrl lbl_80319B98: /* 80319B98 00316AF8 C0 19 00 2C */ lfs f0, 0x2c(r25) /* 80319B9C 00316AFC 38 7F 01 14 */ addi r3, r31, 0x114 @@ -3177,7 +3177,7 @@ lbl_80319DA0: /* 80319E2C 00316D8C 80 0A 00 04 */ lwz r0, 4(r10) /* 80319E30 00316D90 7D 41 53 78 */ mr r1, r10 /* 80319E34 00316D94 7C 08 03 A6 */ mtlr r0 -/* 80319E38 00316D98 4E 80 00 20 */ blr +/* 80319E38 00316D98 4E 80 00 20 */ blr .global sub_80319e3c sub_80319e3c: @@ -3254,7 +3254,7 @@ lbl_80319F3C: /* 80319F50 00316EB0 81 84 00 00 */ lwz r12, 0(r4) /* 80319F54 00316EB4 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80319F58 00316EB8 7D 89 03 A6 */ mtctr r12 -/* 80319F5C 00316EBC 4E 80 04 21 */ bctrl +/* 80319F5C 00316EBC 4E 80 04 21 */ bctrl /* 80319F60 00316EC0 80 7F 00 50 */ lwz r3, 0x50(r31) /* 80319F64 00316EC4 7E 24 8B 78 */ mr r4, r17 /* 80319F68 00316EC8 38 A0 00 01 */ li r5, 1 @@ -3348,7 +3348,7 @@ lbl_8031A0B8: /* 8031A0BC 0031701C 81 83 00 00 */ lwz r12, 0(r3) /* 8031A0C0 00317020 81 8C 00 60 */ lwz r12, 0x60(r12) /* 8031A0C4 00317024 7D 89 03 A6 */ mtctr r12 -/* 8031A0C8 00317028 4E 80 04 21 */ bctrl +/* 8031A0C8 00317028 4E 80 04 21 */ bctrl /* 8031A0CC 0031702C 7E 31 1A 14 */ add r17, r17, r3 /* 8031A0D0 00317030 3A 10 00 04 */ addi r16, r16, 4 /* 8031A0D4 00317034 3A 52 00 01 */ addi r18, r18, 1 @@ -3372,7 +3372,7 @@ lbl_8031A10C: /* 8031A114 00317074 81 95 00 00 */ lwz r12, 0(r21) /* 8031A118 00317078 81 8C 00 60 */ lwz r12, 0x60(r12) /* 8031A11C 0031707C 7D 89 03 A6 */ mtctr r12 -/* 8031A120 00317080 4E 80 04 21 */ bctrl +/* 8031A120 00317080 4E 80 04 21 */ bctrl /* 8031A124 00317084 C3 D5 00 80 */ lfs f30, 0x80(r21) /* 8031A128 00317088 7C 71 1B 78 */ mr r17, r3 /* 8031A12C 0031708C 7F 5C D3 78 */ mr r28, r26 @@ -3526,7 +3526,7 @@ lbl_8031A31C: /* 8031A358 003172B8 81 83 00 00 */ lwz r12, 0(r3) /* 8031A35C 003172BC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031A360 003172C0 7D 89 03 A6 */ mtctr r12 -/* 8031A364 003172C4 4E 80 04 21 */ bctrl +/* 8031A364 003172C4 4E 80 04 21 */ bctrl /* 8031A368 003172C8 38 60 00 80 */ li r3, 0x80 /* 8031A36C 003172CC 38 80 00 06 */ li r4, 6 /* 8031A370 003172D0 38 A0 00 04 */ li r5, 4 @@ -3637,7 +3637,7 @@ lbl_8031A4B8: /* 8031A50C 0031746C 80 0A 00 04 */ lwz r0, 4(r10) /* 8031A510 00317470 7D 41 53 78 */ mr r1, r10 /* 8031A514 00317474 7C 08 03 A6 */ mtlr r0 -/* 8031A518 00317478 4E 80 00 20 */ blr +/* 8031A518 00317478 4E 80 00 20 */ blr .global RenderParticles__11CElementGenFv RenderParticles__11CElementGenFv: @@ -3698,7 +3698,7 @@ lbl_8031A5E0: /* 8031A5F0 00317550 81 83 00 00 */ lwz r12, 0(r3) /* 8031A5F4 00317554 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8031A5F8 00317558 7D 89 03 A6 */ mtctr r12 -/* 8031A5FC 0031755C 4E 80 04 21 */ bctrl +/* 8031A5FC 0031755C 4E 80 04 21 */ bctrl /* 8031A600 00317560 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8031A604 00317564 41 82 00 84 */ beq lbl_8031A688 /* 8031A608 00317568 C0 02 C9 F0 */ lfs f0, lbl_805AE710@sda21(r2) @@ -3710,7 +3710,7 @@ lbl_8031A5E0: /* 8031A620 00317580 81 83 00 00 */ lwz r12, 0(r3) /* 8031A624 00317584 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031A628 00317588 7D 89 03 A6 */ mtctr r12 -/* 8031A62C 0031758C 4E 80 04 21 */ bctrl +/* 8031A62C 0031758C 4E 80 04 21 */ bctrl /* 8031A630 00317590 C0 22 C9 E8 */ lfs f1, lbl_805AE708@sda21(r2) /* 8031A634 00317594 C0 1F 00 3C */ lfs f0, 0x3c(r31) /* 8031A638 00317598 FC 01 00 00 */ fcmpu cr0, f1, f0 @@ -3724,7 +3724,7 @@ lbl_8031A5E0: /* 8031A658 003175B8 81 83 00 00 */ lwz r12, 0(r3) /* 8031A65C 003175BC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031A660 003175C0 7D 89 03 A6 */ mtctr r12 -/* 8031A664 003175C4 4E 80 04 21 */ bctrl +/* 8031A664 003175C4 4E 80 04 21 */ bctrl /* 8031A668 003175C8 C0 22 C9 E8 */ lfs f1, lbl_805AE708@sda21(r2) /* 8031A66C 003175CC C0 1F 00 3C */ lfs f0, 0x3c(r31) /* 8031A670 003175D0 FC 01 00 00 */ fcmpu cr0, f1, f0 @@ -3820,7 +3820,7 @@ lbl_8031A780: /* 8031A7CC 0031772C 81 83 00 00 */ lwz r12, 0(r3) /* 8031A7D0 00317730 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8031A7D4 00317734 7D 89 03 A6 */ mtctr r12 -/* 8031A7D8 00317738 4E 80 04 21 */ bctrl +/* 8031A7D8 00317738 4E 80 04 21 */ bctrl /* 8031A7DC 0031773C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8031A7E0 00317740 41 82 00 78 */ beq lbl_8031A858 /* 8031A7E4 00317744 C0 02 C9 F0 */ lfs f0, lbl_805AE710@sda21(r2) @@ -3832,7 +3832,7 @@ lbl_8031A780: /* 8031A7FC 0031775C 81 83 00 00 */ lwz r12, 0(r3) /* 8031A800 00317760 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031A804 00317764 7D 89 03 A6 */ mtctr r12 -/* 8031A808 00317768 4E 80 04 21 */ bctrl +/* 8031A808 00317768 4E 80 04 21 */ bctrl /* 8031A80C 0031776C C0 22 C9 E8 */ lfs f1, lbl_805AE708@sda21(r2) /* 8031A810 00317770 C0 1F 00 38 */ lfs f0, 0x38(r31) /* 8031A814 00317774 FC 01 00 00 */ fcmpu cr0, f1, f0 @@ -3846,7 +3846,7 @@ lbl_8031A780: /* 8031A834 00317794 81 83 00 00 */ lwz r12, 0(r3) /* 8031A838 00317798 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031A83C 0031779C 7D 89 03 A6 */ mtctr r12 -/* 8031A840 003177A0 4E 80 04 21 */ bctrl +/* 8031A840 003177A0 4E 80 04 21 */ bctrl /* 8031A844 003177A4 C0 22 C9 E8 */ lfs f1, lbl_805AE708@sda21(r2) /* 8031A848 003177A8 C0 1F 00 38 */ lfs f0, 0x38(r31) /* 8031A84C 003177AC FC 01 00 00 */ fcmpu cr0, f1, f0 @@ -3865,7 +3865,7 @@ lbl_8031A858: /* 8031A87C 003177DC 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8031A880 003177E0 7C A5 00 50 */ subf r5, r5, r0 /* 8031A884 003177E4 7D 89 03 A6 */ mtctr r12 -/* 8031A888 003177E8 4E 80 04 21 */ bctrl +/* 8031A888 003177E8 4E 80 04 21 */ bctrl /* 8031A88C 003177EC 38 7F 00 40 */ addi r3, r31, 0x40 /* 8031A890 003177F0 38 9F 01 1C */ addi r4, r31, 0x11c /* 8031A894 003177F4 48 02 66 15 */ bl __ct__6CTokenFRC6CToken @@ -3969,13 +3969,13 @@ lbl_8031A9F4: /* 8031AA10 00317970 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031AA14 00317974 7C 84 00 50 */ subf r4, r4, r0 /* 8031AA18 00317978 7D 89 03 A6 */ mtctr r12 -/* 8031AA1C 0031797C 4E 80 04 21 */ bctrl +/* 8031AA1C 0031797C 4E 80 04 21 */ bctrl /* 8031AA20 00317980 80 7E 00 28 */ lwz r3, 0x28(r30) /* 8031AA24 00317984 80 63 00 40 */ lwz r3, 0x40(r3) /* 8031AA28 00317988 81 83 00 00 */ lwz r12, 0(r3) /* 8031AA2C 0031798C 81 8C 00 18 */ lwz r12, 0x18(r12) /* 8031AA30 00317990 7D 89 03 A6 */ mtctr r12 -/* 8031AA34 00317994 4E 80 04 21 */ bctrl +/* 8031AA34 00317994 4E 80 04 21 */ bctrl /* 8031AA38 00317998 7C 60 1B 78 */ mr r0, r3 /* 8031AA3C 0031799C 38 7F 00 40 */ addi r3, r31, 0x40 /* 8031AA40 003179A0 7C 1C 03 78 */ mr r28, r0 @@ -4399,7 +4399,7 @@ lbl_8031AFA8: /* 8031B068 00317FC8 81 83 00 00 */ lwz r12, 0(r3) /* 8031B06C 00317FCC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031B070 00317FD0 7D 89 03 A6 */ mtctr r12 -/* 8031B074 00317FD4 4E 80 04 21 */ bctrl +/* 8031B074 00317FD4 4E 80 04 21 */ bctrl /* 8031B078 00317FD8 57 A0 06 3F */ clrlwi. r0, r29, 0x18 /* 8031B07C 00317FDC 41 82 00 B4 */ beq lbl_8031B130 /* 8031B080 00317FE0 C0 22 C9 F8 */ lfs f1, lbl_805AE718@sda21(r2) @@ -4797,7 +4797,7 @@ lbl_8031B620: /* 8031B65C 003185BC 81 83 00 00 */ lwz r12, 0(r3) /* 8031B660 003185C0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031B664 003185C4 7D 89 03 A6 */ mtctr r12 -/* 8031B668 003185C8 4E 80 04 21 */ bctrl +/* 8031B668 003185C8 4E 80 04 21 */ bctrl /* 8031B66C 003185CC C0 C2 C9 F8 */ lfs f6, lbl_805AE718@sda21(r2) /* 8031B670 003185D0 3C 60 CC 01 */ lis r3, 0xCC008000@ha /* 8031B674 003185D4 C0 BF 01 34 */ lfs f5, 0x134(r31) @@ -5015,7 +5015,7 @@ lbl_8031B8EC: /* 8031B9B0 00318910 81 83 00 00 */ lwz r12, 0(r3) /* 8031B9B4 00318914 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031B9B8 00318918 7D 89 03 A6 */ mtctr r12 -/* 8031B9BC 0031891C 4E 80 04 21 */ bctrl +/* 8031B9BC 0031891C 4E 80 04 21 */ bctrl /* 8031B9C0 00318920 57 A0 06 3F */ clrlwi. r0, r29, 0x18 /* 8031B9C4 00318924 41 82 01 08 */ beq lbl_8031BACC /* 8031B9C8 00318928 C3 C2 C9 F8 */ lfs f30, lbl_805AE718@sda21(r2) @@ -5366,7 +5366,7 @@ lbl_8031BE68: /* 8031BEEC 00318E4C 80 0A 00 04 */ lwz r0, 4(r10) /* 8031BEF0 00318E50 7D 41 53 78 */ mr r1, r10 /* 8031BEF4 00318E54 7C 08 03 A6 */ mtlr r0 -/* 8031BEF8 00318E58 4E 80 00 20 */ blr +/* 8031BEF8 00318E58 4E 80 00 20 */ blr .global RenderBasicParticlesRotNoTS__11CElementGenFRC10CTransform RenderBasicParticlesRotNoTS__11CElementGenFRC10CTransform: @@ -5504,7 +5504,7 @@ lbl_8031C0B0: /* 8031C100 00319060 80 01 00 D4 */ lwz r0, 0xd4(r1) /* 8031C104 00319064 7C 08 03 A6 */ mtlr r0 /* 8031C108 00319068 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 8031C10C 0031906C 4E 80 00 20 */ blr +/* 8031C10C 0031906C 4E 80 00 20 */ blr .global RenderBasicParticlesNoRotNoTS__11CElementGenFRC10CTransform RenderBasicParticlesNoRotNoTS__11CElementGenFRC10CTransform: @@ -5603,7 +5603,7 @@ lbl_8031C260: /* 8031C278 003191D8 80 01 00 64 */ lwz r0, 0x64(r1) /* 8031C27C 003191DC 7C 08 03 A6 */ mtlr r0 /* 8031C280 003191E0 38 21 00 60 */ addi r1, r1, 0x60 -/* 8031C284 003191E4 4E 80 00 20 */ blr +/* 8031C284 003191E4 4E 80 00 20 */ blr .global RenderBasicParticlesRotTS__11CElementGenFRC10CTransform RenderBasicParticlesRotTS__11CElementGenFRC10CTransform: @@ -5716,7 +5716,7 @@ lbl_8031C3D8: /* 8031C428 00319388 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 8031C42C 0031938C 7C 08 03 A6 */ mtlr r0 /* 8031C430 00319390 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 8031C434 00319394 4E 80 00 20 */ blr +/* 8031C434 00319394 4E 80 00 20 */ blr .global RenderBasicParticlesNoRotTS__11CElementGenFRC10CTransform RenderBasicParticlesNoRotTS__11CElementGenFRC10CTransform: @@ -5790,7 +5790,7 @@ lbl_8031C524: /* 8031C53C 0031949C 80 01 00 44 */ lwz r0, 0x44(r1) /* 8031C540 003194A0 7C 08 03 A6 */ mtlr r0 /* 8031C544 003194A4 38 21 00 40 */ addi r1, r1, 0x40 -/* 8031C548 003194A8 4E 80 00 20 */ blr +/* 8031C548 003194A8 4E 80 00 20 */ blr .global Render__11CElementGenFv Render__11CElementGenFv: @@ -5815,7 +5815,7 @@ lbl_8031C58C: /* 8031C590 003194F0 81 83 00 00 */ lwz r12, 0(r3) /* 8031C594 003194F4 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8031C598 003194F8 7D 89 03 A6 */ mtctr r12 -/* 8031C59C 003194FC 4E 80 04 21 */ bctrl +/* 8031C59C 003194FC 4E 80 04 21 */ bctrl /* 8031C5A0 00319500 3B 9C 00 04 */ addi r28, r28, 4 lbl_8031C5A4: /* 8031C5A4 00319504 80 1D 02 94 */ lwz r0, 0x294(r29) @@ -5877,7 +5877,7 @@ lbl_8031C660: /* 8031C670 003195D0 83 81 00 20 */ lwz r28, 0x20(r1) /* 8031C674 003195D4 7C 08 03 A6 */ mtlr r0 /* 8031C678 003195D8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8031C67C 003195DC 4E 80 00 20 */ blr +/* 8031C67C 003195DC 4E 80 00 20 */ blr .global IsSystemDeletable__11CElementGenCFv IsSystemDeletable__11CElementGenCFv: @@ -5894,7 +5894,7 @@ lbl_8031C6A0: /* 8031C6A4 00319604 81 83 00 00 */ lwz r12, 0(r3) /* 8031C6A8 00319608 81 8C 00 58 */ lwz r12, 0x58(r12) /* 8031C6AC 0031960C 7D 89 03 A6 */ mtctr r12 -/* 8031C6B0 00319610 4E 80 04 21 */ bctrl +/* 8031C6B0 00319610 4E 80 04 21 */ bctrl /* 8031C6B4 00319614 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8031C6B8 00319618 40 82 00 0C */ bne lbl_8031C6C4 /* 8031C6BC 0031961C 38 60 00 00 */ li r3, 0 @@ -5925,7 +5925,7 @@ lbl_8031C708: /* 8031C710 00319670 83 C1 00 08 */ lwz r30, 8(r1) /* 8031C714 00319674 7C 08 03 A6 */ mtlr r0 /* 8031C718 00319678 38 21 00 10 */ addi r1, r1, 0x10 -/* 8031C71C 0031967C 4E 80 00 20 */ blr +/* 8031C71C 0031967C 4E 80 00 20 */ blr .global DestroyParticles__11CElementGenFv DestroyParticles__11CElementGenFv: @@ -5982,7 +5982,7 @@ lbl_8031C7CC: /* 8031C7D0 00319730 81 83 00 00 */ lwz r12, 0(r3) /* 8031C7D4 00319734 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 8031C7D8 00319738 7D 89 03 A6 */ mtctr r12 -/* 8031C7DC 0031973C 4E 80 04 21 */ bctrl +/* 8031C7DC 0031973C 4E 80 04 21 */ bctrl /* 8031C7E0 00319740 3B DE 00 04 */ addi r30, r30, 4 lbl_8031C7E4: /* 8031C7E4 00319744 80 1F 02 94 */ lwz r0, 0x294(r31) @@ -5996,7 +5996,7 @@ lbl_8031C7E4: /* 8031C804 00319764 83 C1 00 28 */ lwz r30, 0x28(r1) /* 8031C808 00319768 7C 08 03 A6 */ mtlr r0 /* 8031C80C 0031976C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8031C810 00319770 4E 80 00 20 */ blr +/* 8031C810 00319770 4E 80 00 20 */ blr .global EndLifetime__11CElementGenFv EndLifetime__11CElementGenFv: @@ -6017,7 +6017,7 @@ lbl_8031C840: /* 8031C848 003197A8 81 9E 00 00 */ lwz r12, 0(r30) /* 8031C84C 003197AC 81 8C 00 74 */ lwz r12, 0x74(r12) /* 8031C850 003197B0 7D 89 03 A6 */ mtctr r12 -/* 8031C854 003197B4 4E 80 04 21 */ bctrl +/* 8031C854 003197B4 4E 80 04 21 */ bctrl /* 8031C858 003197B8 3C 03 AF BF */ addis r0, r3, 0xafbf /* 8031C85C 003197BC 28 00 52 54 */ cmplwi r0, 0x5254 /* 8031C860 003197C0 40 82 00 10 */ bne lbl_8031C870 @@ -6030,7 +6030,7 @@ lbl_8031C870: /* 8031C878 003197D8 81 9E 00 00 */ lwz r12, 0(r30) /* 8031C87C 003197DC 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8031C880 003197E0 7D 89 03 A6 */ mtctr r12 -/* 8031C884 003197E4 4E 80 04 21 */ bctrl +/* 8031C884 003197E4 4E 80 04 21 */ bctrl lbl_8031C888: /* 8031C888 003197E8 3B FF 00 04 */ addi r31, r31, 4 lbl_8031C88C: @@ -6046,7 +6046,7 @@ lbl_8031C88C: /* 8031C8B0 00319810 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8031C8B4 00319814 7C 08 03 A6 */ mtlr r0 /* 8031C8B8 00319818 38 21 00 20 */ addi r1, r1, 0x20 -/* 8031C8BC 0031981C 4E 80 00 20 */ blr +/* 8031C8BC 0031981C 4E 80 00 20 */ blr .global ForceParticleCreation__11CElementGenFi ForceParticleCreation__11CElementGenFi: @@ -6080,7 +6080,7 @@ lbl_8031C920: /* 8031C928 00319888 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8031C92C 0031988C 7C 08 03 A6 */ mtlr r0 /* 8031C930 00319890 38 21 00 20 */ addi r1, r1, 0x20 -/* 8031C934 00319894 4E 80 00 20 */ blr +/* 8031C934 00319894 4E 80 00 20 */ blr .global SetParticleEmission__11CElementGenFb SetParticleEmission__11CElementGenFb: @@ -6101,7 +6101,7 @@ lbl_8031C964: /* 8031C96C 003198CC 81 83 00 00 */ lwz r12, 0(r3) /* 8031C970 003198D0 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8031C974 003198D4 7D 89 03 A6 */ mtctr r12 -/* 8031C978 003198D8 4E 80 04 21 */ bctrl +/* 8031C978 003198D8 4E 80 04 21 */ bctrl /* 8031C97C 003198DC 3B FF 00 04 */ addi r31, r31, 4 lbl_8031C980: /* 8031C980 003198E0 80 1D 02 94 */ lwz r0, 0x294(r29) @@ -6116,7 +6116,7 @@ lbl_8031C980: /* 8031C9A4 00319904 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8031C9A8 00319908 7C 08 03 A6 */ mtlr r0 /* 8031C9AC 0031990C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8031C9B0 00319910 4E 80 00 20 */ blr +/* 8031C9B0 00319910 4E 80 00 20 */ blr .global UpdateChildParticleSystems__11CElementGenFd UpdateChildParticleSystems__11CElementGenFd: @@ -6159,7 +6159,7 @@ UpdateChildParticleSystems__11CElementGenFd: /* 8031CA44 003199A4 80 9F 00 74 */ lwz r4, 0x74(r31) /* 8031CA48 003199A8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031CA4C 003199AC 7D 89 03 A6 */ mtctr r12 -/* 8031CA50 003199B0 4E 80 04 21 */ bctrl +/* 8031CA50 003199B0 4E 80 04 21 */ bctrl lbl_8031CA54: /* 8031CA54 003199B4 80 81 00 18 */ lwz r4, 0x18(r1) /* 8031CA58 003199B8 38 7F 02 90 */ addi r3, r31, 0x290 @@ -6437,7 +6437,7 @@ lbl_8031CDF4: /* 8031CE40 00319DA0 38 80 00 00 */ li r4, 0 /* 8031CE44 00319DA4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031CE48 00319DA8 7D 89 03 A6 */ mtctr r12 -/* 8031CE4C 00319DAC 4E 80 04 21 */ bctrl +/* 8031CE4C 00319DAC 4E 80 04 21 */ bctrl lbl_8031CE50: /* 8031CE50 00319DB0 80 81 00 14 */ lwz r4, 0x14(r1) /* 8031CE54 00319DB4 38 7F 02 90 */ addi r3, r31, 0x290 @@ -6550,19 +6550,19 @@ lbl_8031CFD4: /* 8031CFDC 00319F3C 81 98 00 00 */ lwz r12, 0(r24) /* 8031CFE0 00319F40 81 8C 00 20 */ lwz r12, 0x20(r12) /* 8031CFE4 00319F44 7D 89 03 A6 */ mtctr r12 -/* 8031CFE8 00319F48 4E 80 04 21 */ bctrl +/* 8031CFE8 00319F48 4E 80 04 21 */ bctrl /* 8031CFEC 00319F4C 7F 03 C3 78 */ mr r3, r24 /* 8031CFF0 00319F50 38 9F 01 00 */ addi r4, r31, 0x100 /* 8031CFF4 00319F54 81 98 00 00 */ lwz r12, 0(r24) /* 8031CFF8 00319F58 81 8C 00 24 */ lwz r12, 0x24(r12) /* 8031CFFC 00319F5C 7D 89 03 A6 */ mtctr r12 -/* 8031D000 00319F60 4E 80 04 21 */ bctrl +/* 8031D000 00319F60 4E 80 04 21 */ bctrl /* 8031D004 00319F64 7F 03 C3 78 */ mr r3, r24 /* 8031D008 00319F68 38 9F 01 6C */ addi r4, r31, 0x16c /* 8031D00C 00319F6C 81 98 00 00 */ lwz r12, 0(r24) /* 8031D010 00319F70 81 8C 00 28 */ lwz r12, 0x28(r12) /* 8031D014 00319F74 7D 89 03 A6 */ mtctr r12 -/* 8031D018 00319F78 4E 80 04 21 */ bctrl +/* 8031D018 00319F78 4E 80 04 21 */ bctrl /* 8031D01C 00319F7C C0 3F 00 E0 */ lfs f1, 0xe0(r31) /* 8031D020 00319F80 7F 03 C3 78 */ mr r3, r24 /* 8031D024 00319F84 C0 1F 02 B4 */ lfs f0, 0x2b4(r31) @@ -6580,19 +6580,19 @@ lbl_8031CFD4: /* 8031D054 00319FB4 81 98 00 00 */ lwz r12, 0(r24) /* 8031D058 00319FB8 81 8C 00 18 */ lwz r12, 0x18(r12) /* 8031D05C 00319FBC 7D 89 03 A6 */ mtctr r12 -/* 8031D060 00319FC0 4E 80 04 21 */ bctrl +/* 8031D060 00319FC0 4E 80 04 21 */ bctrl /* 8031D064 00319FC4 7F 03 C3 78 */ mr r3, r24 /* 8031D068 00319FC8 38 9F 01 D8 */ addi r4, r31, 0x1d8 /* 8031D06C 00319FCC 81 98 00 00 */ lwz r12, 0(r24) /* 8031D070 00319FD0 81 8C 00 14 */ lwz r12, 0x14(r12) /* 8031D074 00319FD4 7D 89 03 A6 */ mtctr r12 -/* 8031D078 00319FD8 4E 80 04 21 */ bctrl +/* 8031D078 00319FD8 4E 80 04 21 */ bctrl /* 8031D07C 00319FDC 81 98 00 00 */ lwz r12, 0(r24) /* 8031D080 00319FE0 7F 03 C3 78 */ mr r3, r24 /* 8031D084 00319FE4 88 9F 00 88 */ lbz r4, 0x88(r31) /* 8031D088 00319FE8 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8031D08C 00319FEC 7D 89 03 A6 */ mtctr r12 -/* 8031D090 00319FF0 4E 80 04 21 */ bctrl +/* 8031D090 00319FF0 4E 80 04 21 */ bctrl /* 8031D094 00319FF4 80 9F 02 94 */ lwz r4, 0x294(r31) /* 8031D098 00319FF8 38 7F 02 90 */ addi r3, r31, 0x290 /* 8031D09C 00319FFC 38 84 00 01 */ addi r4, r4, 1 @@ -6660,19 +6660,19 @@ lbl_8031D174: /* 8031D17C 0031A0DC 81 98 00 00 */ lwz r12, 0(r24) /* 8031D180 0031A0E0 81 8C 00 20 */ lwz r12, 0x20(r12) /* 8031D184 0031A0E4 7D 89 03 A6 */ mtctr r12 -/* 8031D188 0031A0E8 4E 80 04 21 */ bctrl +/* 8031D188 0031A0E8 4E 80 04 21 */ bctrl /* 8031D18C 0031A0EC 7F 03 C3 78 */ mr r3, r24 /* 8031D190 0031A0F0 38 9F 01 00 */ addi r4, r31, 0x100 /* 8031D194 0031A0F4 81 98 00 00 */ lwz r12, 0(r24) /* 8031D198 0031A0F8 81 8C 00 24 */ lwz r12, 0x24(r12) /* 8031D19C 0031A0FC 7D 89 03 A6 */ mtctr r12 -/* 8031D1A0 0031A100 4E 80 04 21 */ bctrl +/* 8031D1A0 0031A100 4E 80 04 21 */ bctrl /* 8031D1A4 0031A104 7F 03 C3 78 */ mr r3, r24 /* 8031D1A8 0031A108 38 9F 01 6C */ addi r4, r31, 0x16c /* 8031D1AC 0031A10C 81 98 00 00 */ lwz r12, 0(r24) /* 8031D1B0 0031A110 81 8C 00 28 */ lwz r12, 0x28(r12) /* 8031D1B4 0031A114 7D 89 03 A6 */ mtctr r12 -/* 8031D1B8 0031A118 4E 80 04 21 */ bctrl +/* 8031D1B8 0031A118 4E 80 04 21 */ bctrl /* 8031D1BC 0031A11C C0 3F 00 E0 */ lfs f1, 0xe0(r31) /* 8031D1C0 0031A120 7F 03 C3 78 */ mr r3, r24 /* 8031D1C4 0031A124 C0 1F 02 C4 */ lfs f0, 0x2c4(r31) @@ -6690,19 +6690,19 @@ lbl_8031D174: /* 8031D1F4 0031A154 81 98 00 00 */ lwz r12, 0(r24) /* 8031D1F8 0031A158 81 8C 00 18 */ lwz r12, 0x18(r12) /* 8031D1FC 0031A15C 7D 89 03 A6 */ mtctr r12 -/* 8031D200 0031A160 4E 80 04 21 */ bctrl +/* 8031D200 0031A160 4E 80 04 21 */ bctrl /* 8031D204 0031A164 7F 03 C3 78 */ mr r3, r24 /* 8031D208 0031A168 38 9F 01 D8 */ addi r4, r31, 0x1d8 /* 8031D20C 0031A16C 81 98 00 00 */ lwz r12, 0(r24) /* 8031D210 0031A170 81 8C 00 14 */ lwz r12, 0x14(r12) /* 8031D214 0031A174 7D 89 03 A6 */ mtctr r12 -/* 8031D218 0031A178 4E 80 04 21 */ bctrl +/* 8031D218 0031A178 4E 80 04 21 */ bctrl /* 8031D21C 0031A17C 81 98 00 00 */ lwz r12, 0(r24) /* 8031D220 0031A180 7F 03 C3 78 */ mr r3, r24 /* 8031D224 0031A184 88 9F 00 88 */ lbz r4, 0x88(r31) /* 8031D228 0031A188 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8031D22C 0031A18C 7D 89 03 A6 */ mtctr r12 -/* 8031D230 0031A190 4E 80 04 21 */ bctrl +/* 8031D230 0031A190 4E 80 04 21 */ bctrl /* 8031D234 0031A194 80 9F 02 94 */ lwz r4, 0x294(r31) /* 8031D238 0031A198 38 7F 02 90 */ addi r3, r31, 0x290 /* 8031D23C 0031A19C 38 84 00 01 */ addi r4, r4, 1 @@ -6741,12 +6741,12 @@ lbl_8031D29C: /* 8031D2AC 0031A20C 81 98 00 00 */ lwz r12, 0(r24) /* 8031D2B0 0031A210 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031D2B4 0031A214 7D 89 03 A6 */ mtctr r12 -/* 8031D2B8 0031A218 4E 80 04 21 */ bctrl +/* 8031D2B8 0031A218 4E 80 04 21 */ bctrl /* 8031D2BC 0031A21C 7F 03 C3 78 */ mr r3, r24 /* 8031D2C0 0031A220 81 98 00 00 */ lwz r12, 0(r24) /* 8031D2C4 0031A224 81 8C 00 58 */ lwz r12, 0x58(r12) /* 8031D2C8 0031A228 7D 89 03 A6 */ mtctr r12 -/* 8031D2CC 0031A22C 4E 80 04 21 */ bctrl +/* 8031D2CC 0031A22C 4E 80 04 21 */ bctrl /* 8031D2D0 0031A230 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8031D2D4 0031A234 28 00 00 01 */ cmplwi r0, 1 /* 8031D2D8 0031A238 40 82 00 48 */ bne lbl_8031D320 @@ -6757,7 +6757,7 @@ lbl_8031D29C: /* 8031D2EC 0031A24C 81 98 00 00 */ lwz r12, 0(r24) /* 8031D2F0 0031A250 81 8C 00 08 */ lwz r12, 8(r12) /* 8031D2F4 0031A254 7D 89 03 A6 */ mtctr r12 -/* 8031D2F8 0031A258 4E 80 04 21 */ bctrl +/* 8031D2F8 0031A258 4E 80 04 21 */ bctrl lbl_8031D2FC: /* 8031D2FC 0031A25C 80 01 00 10 */ lwz r0, 0x10(r1) /* 8031D300 0031A260 38 61 00 0C */ addi r3, r1, 0xc @@ -6792,7 +6792,7 @@ lbl_8031D35C: /* 8031D368 0031A2C8 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 8031D36C 0031A2CC 7C 08 03 A6 */ mtlr r0 /* 8031D370 0031A2D0 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 8031D374 0031A2D4 4E 80 00 20 */ blr +/* 8031D374 0031A2D4 4E 80 00 20 */ blr .global sub_8031d378 sub_8031d378: @@ -6814,7 +6814,7 @@ sub_8031d378: /* 8031D3B4 0031A314 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8031D3B8 0031A318 7C 08 03 A6 */ mtlr r0 /* 8031D3BC 0031A31C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8031D3C0 0031A320 4E 80 00 20 */ blr +/* 8031D3C0 0031A320 4E 80 00 20 */ blr .global sub_8031d3c4 sub_8031d3c4: @@ -6859,7 +6859,7 @@ lbl_8031D42C: /* 8031D448 0031A3A8 80 05 00 00 */ lwz r0, 0(r5) /* 8031D44C 0031A3AC 90 03 00 00 */ stw r0, 0(r3) /* 8031D450 0031A3B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8031D454 0031A3B4 4E 80 00 20 */ blr +/* 8031D454 0031A3B4 4E 80 00 20 */ blr .global sub_8031d458 sub_8031d458: @@ -6879,7 +6879,7 @@ lbl_8031D488: /* 8031D488 0031A3E8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8031D48C 0031A3EC 7C 08 03 A6 */ mtlr r0 /* 8031D490 0031A3F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8031D494 0031A3F4 4E 80 00 20 */ blr +/* 8031D494 0031A3F4 4E 80 00 20 */ blr .global "ConstructChildParticleSystem__11CElementGenCF25TToken<15CGenDescription>" "ConstructChildParticleSystem__11CElementGenCF25TToken<15CGenDescription>": @@ -6932,49 +6932,49 @@ lbl_8031D52C: /* 8031D544 0031A4A4 81 9F 00 00 */ lwz r12, 0(r31) /* 8031D548 0031A4A8 81 8C 00 20 */ lwz r12, 0x20(r12) /* 8031D54C 0031A4AC 7D 89 03 A6 */ mtctr r12 -/* 8031D550 0031A4B0 4E 80 04 21 */ bctrl +/* 8031D550 0031A4B0 4E 80 04 21 */ bctrl /* 8031D554 0031A4B4 7F E3 FB 78 */ mr r3, r31 /* 8031D558 0031A4B8 38 9D 02 2C */ addi r4, r29, 0x22c /* 8031D55C 0031A4BC 81 9F 00 00 */ lwz r12, 0(r31) /* 8031D560 0031A4C0 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 8031D564 0031A4C4 7D 89 03 A6 */ mtctr r12 -/* 8031D568 0031A4C8 4E 80 04 21 */ bctrl +/* 8031D568 0031A4C8 4E 80 04 21 */ bctrl /* 8031D56C 0031A4CC 7F E3 FB 78 */ mr r3, r31 /* 8031D570 0031A4D0 38 9D 01 00 */ addi r4, r29, 0x100 /* 8031D574 0031A4D4 81 9F 00 00 */ lwz r12, 0(r31) /* 8031D578 0031A4D8 81 8C 00 24 */ lwz r12, 0x24(r12) /* 8031D57C 0031A4DC 7D 89 03 A6 */ mtctr r12 -/* 8031D580 0031A4E0 4E 80 04 21 */ bctrl +/* 8031D580 0031A4E0 4E 80 04 21 */ bctrl /* 8031D584 0031A4E4 7F E3 FB 78 */ mr r3, r31 /* 8031D588 0031A4E8 38 9D 01 6C */ addi r4, r29, 0x16c /* 8031D58C 0031A4EC 81 9F 00 00 */ lwz r12, 0(r31) /* 8031D590 0031A4F0 81 8C 00 28 */ lwz r12, 0x28(r12) /* 8031D594 0031A4F4 7D 89 03 A6 */ mtctr r12 -/* 8031D598 0031A4F8 4E 80 04 21 */ bctrl +/* 8031D598 0031A4F8 4E 80 04 21 */ bctrl /* 8031D59C 0031A4FC 7F E3 FB 78 */ mr r3, r31 /* 8031D5A0 0031A500 38 9D 00 DC */ addi r4, r29, 0xdc /* 8031D5A4 0031A504 81 9F 00 00 */ lwz r12, 0(r31) /* 8031D5A8 0031A508 81 8C 00 18 */ lwz r12, 0x18(r12) /* 8031D5AC 0031A50C 7D 89 03 A6 */ mtctr r12 -/* 8031D5B0 0031A510 4E 80 04 21 */ bctrl +/* 8031D5B0 0031A510 4E 80 04 21 */ bctrl /* 8031D5B4 0031A514 7F E3 FB 78 */ mr r3, r31 /* 8031D5B8 0031A518 38 9D 01 D8 */ addi r4, r29, 0x1d8 /* 8031D5BC 0031A51C 81 9F 00 00 */ lwz r12, 0(r31) /* 8031D5C0 0031A520 81 8C 00 14 */ lwz r12, 0x14(r12) /* 8031D5C4 0031A524 7D 89 03 A6 */ mtctr r12 -/* 8031D5C8 0031A528 4E 80 04 21 */ bctrl +/* 8031D5C8 0031A528 4E 80 04 21 */ bctrl /* 8031D5CC 0031A52C 7F E3 FB 78 */ mr r3, r31 /* 8031D5D0 0031A530 88 9D 00 88 */ lbz r4, 0x88(r29) /* 8031D5D4 0031A534 81 9F 00 00 */ lwz r12, 0(r31) /* 8031D5D8 0031A538 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8031D5DC 0031A53C 7D 89 03 A6 */ mtctr r12 -/* 8031D5E0 0031A540 4E 80 04 21 */ bctrl +/* 8031D5E0 0031A540 4E 80 04 21 */ bctrl /* 8031D5E4 0031A544 7F E3 FB 78 */ mr r3, r31 /* 8031D5E8 0031A548 38 9D 03 38 */ addi r4, r29, 0x338 /* 8031D5EC 0031A54C 81 9F 00 00 */ lwz r12, 0(r31) /* 8031D5F0 0031A550 81 8C 00 30 */ lwz r12, 0x30(r12) /* 8031D5F4 0031A554 7D 89 03 A6 */ mtctr r12 -/* 8031D5F8 0031A558 4E 80 04 21 */ bctrl +/* 8031D5F8 0031A558 4E 80 04 21 */ bctrl /* 8031D5FC 0031A55C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8031D600 0031A560 7F E3 FB 78 */ mr r3, r31 /* 8031D604 0031A564 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -6983,7 +6983,7 @@ lbl_8031D52C: /* 8031D610 0031A570 83 81 00 10 */ lwz r28, 0x10(r1) /* 8031D614 0031A574 7C 08 03 A6 */ mtlr r0 /* 8031D618 0031A578 38 21 00 20 */ addi r1, r1, 0x20 -/* 8031D61C 0031A57C 4E 80 00 20 */ blr +/* 8031D61C 0031A57C 4E 80 00 20 */ blr .global UpdatePSTranslationAndOrientation__11CElementGenFv UpdatePSTranslationAndOrientation__11CElementGenFv: @@ -7007,7 +7007,7 @@ UpdatePSTranslationAndOrientation__11CElementGenFv: /* 8031D664 0031A5C4 38 BF 00 F4 */ addi r5, r31, 0xf4 /* 8031D668 0031A5C8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031D66C 0031A5CC 7D 89 03 A6 */ mtctr r12 -/* 8031D670 0031A5D0 4E 80 04 21 */ bctrl +/* 8031D670 0031A5D0 4E 80 04 21 */ bctrl lbl_8031D674: /* 8031D674 0031A5D4 80 7F 00 28 */ lwz r3, 0x28(r31) /* 8031D678 0031A5D8 80 63 00 D4 */ lwz r3, 0xd4(r3) @@ -7018,7 +7018,7 @@ lbl_8031D674: /* 8031D68C 0031A5EC 80 9F 00 74 */ lwz r4, 0x74(r31) /* 8031D690 0031A5F0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031D694 0031A5F4 7D 89 03 A6 */ mtctr r12 -/* 8031D698 0031A5F8 4E 80 04 21 */ bctrl +/* 8031D698 0031A5F8 4E 80 04 21 */ bctrl lbl_8031D69C: /* 8031D69C 0031A5FC 80 7F 00 28 */ lwz r3, 0x28(r31) /* 8031D6A0 0031A600 80 63 00 E8 */ lwz r3, 0xe8(r3) @@ -7029,7 +7029,7 @@ lbl_8031D69C: /* 8031D6B4 0031A614 80 9F 00 74 */ lwz r4, 0x74(r31) /* 8031D6B8 0031A618 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031D6BC 0031A61C 7D 89 03 A6 */ mtctr r12 -/* 8031D6C0 0031A620 4E 80 04 21 */ bctrl +/* 8031D6C0 0031A620 4E 80 04 21 */ bctrl lbl_8031D6C4: /* 8031D6C4 0031A624 38 61 00 08 */ addi r3, r1, 8 /* 8031D6C8 0031A628 38 80 FF FF */ li r4, -1 @@ -7038,7 +7038,7 @@ lbl_8031D6C4: /* 8031D6D4 0031A634 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8031D6D8 0031A638 7C 08 03 A6 */ mtlr r0 /* 8031D6DC 0031A63C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8031D6E0 0031A640 4E 80 00 20 */ blr +/* 8031D6E0 0031A640 4E 80 00 20 */ blr .global CreateNewParticles__11CElementGenFi CreateNewParticles__11CElementGenFi: @@ -7229,7 +7229,7 @@ lbl_8031D964: /* 8031D990 0031A8F0 38 80 00 00 */ li r4, 0 /* 8031D994 0031A8F4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031D998 0031A8F8 7D 89 03 A6 */ mtctr r12 -/* 8031D99C 0031A8FC 4E 80 04 21 */ bctrl +/* 8031D99C 0031A8FC 4E 80 04 21 */ bctrl lbl_8031D9A0: /* 8031D9A0 0031A900 80 7E 00 00 */ lwz r3, 0(r30) /* 8031D9A4 0031A904 48 00 CD D5 */ bl SetParticleLifetime__16CParticleGlobalsFi @@ -7257,7 +7257,7 @@ lbl_8031D9D0: /* 8031D9F8 0031A958 38 80 00 00 */ li r4, 0 /* 8031D9FC 0031A95C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031DA00 0031A960 7D 89 03 A6 */ mtctr r12 -/* 8031DA04 0031A964 4E 80 04 21 */ bctrl +/* 8031DA04 0031A964 4E 80 04 21 */ bctrl /* 8031DA08 0031A968 48 00 00 0C */ b lbl_8031DA14 lbl_8031DA0C: /* 8031DA0C 0031A96C 38 00 FF FF */ li r0, -1 @@ -7273,7 +7273,7 @@ lbl_8031DA14: /* 8031DA30 0031A990 80 9A 00 74 */ lwz r4, 0x74(r26) /* 8031DA34 0031A994 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031DA38 0031A998 7D 89 03 A6 */ mtctr r12 -/* 8031DA3C 0031A99C 4E 80 04 21 */ bctrl +/* 8031DA3C 0031A99C 4E 80 04 21 */ bctrl /* 8031DA40 0031A9A0 38 61 00 98 */ addi r3, r1, 0x98 /* 8031DA44 0031A9A4 38 9A 01 3C */ addi r4, r26, 0x13c /* 8031DA48 0031A9A8 38 BA 01 A8 */ addi r5, r26, 0x1a8 @@ -7362,7 +7362,7 @@ lbl_8031DB50: /* 8031DB8C 0031AAEC 38 80 00 00 */ li r4, 0 /* 8031DB90 0031AAF0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031DB94 0031AAF4 7D 89 03 A6 */ mtctr r12 -/* 8031DB98 0031AAF8 4E 80 04 21 */ bctrl +/* 8031DB98 0031AAF8 4E 80 04 21 */ bctrl /* 8031DB9C 0031AAFC 48 00 00 0C */ b lbl_8031DBA8 lbl_8031DBA0: /* 8031DBA0 0031AB00 C0 02 C9 F0 */ lfs f0, lbl_805AE710@sda21(r2) @@ -7377,7 +7377,7 @@ lbl_8031DBA8: /* 8031DBC0 0031AB20 38 80 00 00 */ li r4, 0 /* 8031DBC4 0031AB24 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031DBC8 0031AB28 7D 89 03 A6 */ mtctr r12 -/* 8031DBCC 0031AB2C 4E 80 04 21 */ bctrl +/* 8031DBCC 0031AB2C 4E 80 04 21 */ bctrl /* 8031DBD0 0031AB30 48 00 00 78 */ b lbl_8031DC48 lbl_8031DBD4: /* 8031DBD4 0031AB34 C0 02 C9 F0 */ lfs f0, lbl_805AE710@sda21(r2) @@ -7393,7 +7393,7 @@ lbl_8031DBE0: /* 8031DBF8 0031AB58 38 80 00 00 */ li r4, 0 /* 8031DBFC 0031AB5C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031DC00 0031AB60 7D 89 03 A6 */ mtctr r12 -/* 8031DC04 0031AB64 4E 80 04 21 */ bctrl +/* 8031DC04 0031AB64 4E 80 04 21 */ bctrl /* 8031DC08 0031AB68 48 00 00 0C */ b lbl_8031DC14 lbl_8031DC0C: /* 8031DC0C 0031AB6C C0 02 C9 E8 */ lfs f0, lbl_805AE708@sda21(r2) @@ -7408,7 +7408,7 @@ lbl_8031DC14: /* 8031DC2C 0031AB8C 38 80 00 00 */ li r4, 0 /* 8031DC30 0031AB90 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031DC34 0031AB94 7D 89 03 A6 */ mtctr r12 -/* 8031DC38 0031AB98 4E 80 04 21 */ bctrl +/* 8031DC38 0031AB98 4E 80 04 21 */ bctrl /* 8031DC3C 0031AB9C 48 00 00 0C */ b lbl_8031DC48 lbl_8031DC40: /* 8031DC40 0031ABA0 C0 02 CA 30 */ lfs f0, lbl_805AE750@sda21(r2) @@ -7430,7 +7430,7 @@ lbl_8031DC70: /* 8031DC74 0031ABD4 80 01 01 44 */ lwz r0, 0x144(r1) /* 8031DC78 0031ABD8 7C 08 03 A6 */ mtlr r0 /* 8031DC7C 0031ABDC 38 21 01 40 */ addi r1, r1, 0x140 -/* 8031DC80 0031ABE0 4E 80 00 20 */ blr +/* 8031DC80 0031ABE0 4E 80 00 20 */ blr .global sub_8031dc84 sub_8031dc84: @@ -7494,7 +7494,7 @@ lbl_8031DD48: /* 8031DD5C 0031ACBC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8031DD60 0031ACC0 7C 08 03 A6 */ mtlr r0 /* 8031DD64 0031ACC4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8031DD68 0031ACC8 4E 80 00 20 */ blr +/* 8031DD68 0031ACC8 4E 80 00 20 */ blr .global UpdateExistingParticles__11CElementGenFv UpdateExistingParticles__11CElementGenFv: @@ -7702,7 +7702,7 @@ lbl_8031E050: /* 8031E074 0031AFD4 38 BF 00 2C */ addi r5, r31, 0x2c /* 8031E078 0031AFD8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031E07C 0031AFDC 7D 89 03 A6 */ mtctr r12 -/* 8031E080 0031AFE0 4E 80 04 21 */ bctrl +/* 8031E080 0031AFE0 4E 80 04 21 */ bctrl lbl_8031E084: /* 8031E084 0031AFE4 80 7D 00 28 */ lwz r3, 0x28(r29) /* 8031E088 0031AFE8 80 63 00 18 */ lwz r3, 0x18(r3) @@ -7713,7 +7713,7 @@ lbl_8031E084: /* 8031E09C 0031AFFC 38 BF 00 30 */ addi r5, r31, 0x30 /* 8031E0A0 0031B000 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031E0A4 0031B004 7D 89 03 A6 */ mtctr r12 -/* 8031E0A8 0031B008 4E 80 04 21 */ bctrl +/* 8031E0A8 0031B008 4E 80 04 21 */ bctrl /* 8031E0AC 0031B00C 48 00 00 54 */ b lbl_8031E100 lbl_8031E0B0: /* 8031E0B0 0031B010 80 7D 00 28 */ lwz r3, 0x28(r29) @@ -7725,7 +7725,7 @@ lbl_8031E0B0: /* 8031E0C8 0031B028 38 BF 00 30 */ addi r5, r31, 0x30 /* 8031E0CC 0031B02C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031E0D0 0031B030 7D 89 03 A6 */ mtctr r12 -/* 8031E0D4 0031B034 4E 80 04 21 */ bctrl +/* 8031E0D4 0031B034 4E 80 04 21 */ bctrl lbl_8031E0D8: /* 8031E0D8 0031B038 80 7D 00 28 */ lwz r3, 0x28(r29) /* 8031E0DC 0031B03C 80 63 00 38 */ lwz r3, 0x38(r3) @@ -7736,7 +7736,7 @@ lbl_8031E0D8: /* 8031E0F0 0031B050 38 BF 00 2C */ addi r5, r31, 0x2c /* 8031E0F4 0031B054 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031E0F8 0031B058 7D 89 03 A6 */ mtctr r12 -/* 8031E0FC 0031B05C 4E 80 04 21 */ bctrl +/* 8031E0FC 0031B05C 4E 80 04 21 */ bctrl lbl_8031E100: /* 8031E100 0031B060 80 7D 00 28 */ lwz r3, 0x28(r29) /* 8031E104 0031B064 80 63 00 24 */ lwz r3, 0x24(r3) @@ -7747,7 +7747,7 @@ lbl_8031E100: /* 8031E118 0031B078 38 BF 00 34 */ addi r5, r31, 0x34 /* 8031E11C 0031B07C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031E120 0031B080 7D 89 03 A6 */ mtctr r12 -/* 8031E124 0031B084 4E 80 04 21 */ bctrl +/* 8031E124 0031B084 4E 80 04 21 */ bctrl lbl_8031E128: /* 8031E128 0031B088 C0 3F 00 2C */ lfs f1, 0x2c(r31) /* 8031E12C 0031B08C 7F A3 EB 78 */ mr r3, r29 @@ -7773,7 +7773,7 @@ lbl_8031E16C: /* 8031E170 0031B0D0 81 83 00 00 */ lwz r12, 0(r3) /* 8031E174 0031B0D4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031E178 0031B0D8 7D 89 03 A6 */ mtctr r12 -/* 8031E17C 0031B0DC 4E 80 04 21 */ bctrl +/* 8031E17C 0031B0DC 4E 80 04 21 */ bctrl /* 8031E180 0031B0E0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8031E184 0031B0E4 41 82 00 44 */ beq lbl_8031E1C8 /* 8031E188 0031B0E8 80 DD 00 3C */ lwz r6, 0x3c(r29) @@ -7791,7 +7791,7 @@ lbl_8031E16C: /* 8031E1B8 0031B118 81 83 00 00 */ lwz r12, 0(r3) /* 8031E1BC 0031B11C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8031E1C0 0031B120 7D 89 03 A6 */ mtctr r12 -/* 8031E1C4 0031B124 4E 80 04 21 */ bctrl +/* 8031E1C4 0031B124 4E 80 04 21 */ bctrl lbl_8031E1C8: /* 8031E1C8 0031B128 83 DE 00 04 */ lwz r30, 4(r30) lbl_8031E1CC: @@ -7804,7 +7804,7 @@ lbl_8031E1D4: /* 8031E1E0 0031B140 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8031E1E4 0031B144 7C 08 03 A6 */ mtlr r0 /* 8031E1E8 0031B148 38 21 00 20 */ addi r1, r1, 0x20 -/* 8031E1EC 0031B14C 4E 80 00 20 */ blr +/* 8031E1EC 0031B14C 4E 80 00 20 */ blr .global UpdateVelocitySource__11CElementGenFiiRQ211CElementGen9CParticle UpdateVelocitySource__11CElementGenFiiRQ211CElementGen9CParticle: @@ -7864,7 +7864,7 @@ UpdateVelocitySource__11CElementGenFiiRQ211CElementGen9CParticle: /* 8031E2C4 0031B224 81 83 00 00 */ lwz r12, 0(r3) /* 8031E2C8 0031B228 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031E2CC 0031B22C 7D 89 03 A6 */ mtctr r12 -/* 8031E2D0 0031B230 4E 80 04 21 */ bctrl +/* 8031E2D0 0031B230 4E 80 04 21 */ bctrl /* 8031E2D4 0031B234 7C 60 1B 78 */ mr r0, r3 /* 8031E2D8 0031B238 38 61 00 14 */ addi r3, r1, 0x14 /* 8031E2DC 0031B23C 7C 1F 03 78 */ mr r31, r0 @@ -7904,7 +7904,7 @@ lbl_8031E348: /* 8031E360 0031B2C0 81 83 00 00 */ lwz r12, 0(r3) /* 8031E364 0031B2C4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031E368 0031B2C8 7D 89 03 A6 */ mtctr r12 -/* 8031E36C 0031B2CC 4E 80 04 21 */ bctrl +/* 8031E36C 0031B2CC 4E 80 04 21 */ bctrl /* 8031E370 0031B2D0 7C 7F 1B 78 */ mr r31, r3 lbl_8031E374: /* 8031E374 0031B2D4 57 E0 06 3F */ clrlwi. r0, r31, 0x18 @@ -7923,7 +7923,7 @@ lbl_8031E390: /* 8031E3A0 0031B300 83 81 00 60 */ lwz r28, 0x60(r1) /* 8031E3A4 0031B304 7C 08 03 A6 */ mtlr r0 /* 8031E3A8 0031B308 38 21 00 70 */ addi r1, r1, 0x70 -/* 8031E3AC 0031B30C 4E 80 00 20 */ blr +/* 8031E3AC 0031B30C 4E 80 00 20 */ blr .global UpdateAdvanceAccessParameters__11CElementGenFii UpdateAdvanceAccessParameters__11CElementGenFii: @@ -7948,7 +7948,7 @@ UpdateAdvanceAccessParameters__11CElementGenFii: /* 8031E3F8 0031B358 7F E5 FB 78 */ mr r5, r31 /* 8031E3FC 0031B35C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031E400 0031B360 7D 89 03 A6 */ mtctr r12 -/* 8031E404 0031B364 4E 80 04 21 */ bctrl +/* 8031E404 0031B364 4E 80 04 21 */ bctrl lbl_8031E408: /* 8031E408 0031B368 80 7D 00 28 */ lwz r3, 0x28(r29) /* 8031E40C 0031B36C 80 63 01 10 */ lwz r3, 0x110(r3) @@ -7959,7 +7959,7 @@ lbl_8031E408: /* 8031E420 0031B380 38 BF 00 04 */ addi r5, r31, 4 /* 8031E424 0031B384 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031E428 0031B388 7D 89 03 A6 */ mtctr r12 -/* 8031E42C 0031B38C 4E 80 04 21 */ bctrl +/* 8031E42C 0031B38C 4E 80 04 21 */ bctrl lbl_8031E430: /* 8031E430 0031B390 80 7D 00 28 */ lwz r3, 0x28(r29) /* 8031E434 0031B394 80 63 01 14 */ lwz r3, 0x114(r3) @@ -7970,7 +7970,7 @@ lbl_8031E430: /* 8031E448 0031B3A8 38 BF 00 08 */ addi r5, r31, 8 /* 8031E44C 0031B3AC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031E450 0031B3B0 7D 89 03 A6 */ mtctr r12 -/* 8031E454 0031B3B4 4E 80 04 21 */ bctrl +/* 8031E454 0031B3B4 4E 80 04 21 */ bctrl lbl_8031E458: /* 8031E458 0031B3B8 80 7D 00 28 */ lwz r3, 0x28(r29) /* 8031E45C 0031B3BC 80 63 01 18 */ lwz r3, 0x118(r3) @@ -7981,7 +7981,7 @@ lbl_8031E458: /* 8031E470 0031B3D0 38 BF 00 0C */ addi r5, r31, 0xc /* 8031E474 0031B3D4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031E478 0031B3D8 7D 89 03 A6 */ mtctr r12 -/* 8031E47C 0031B3DC 4E 80 04 21 */ bctrl +/* 8031E47C 0031B3DC 4E 80 04 21 */ bctrl lbl_8031E480: /* 8031E480 0031B3E0 80 7D 00 28 */ lwz r3, 0x28(r29) /* 8031E484 0031B3E4 80 63 01 1C */ lwz r3, 0x11c(r3) @@ -7992,7 +7992,7 @@ lbl_8031E480: /* 8031E498 0031B3F8 38 BF 00 10 */ addi r5, r31, 0x10 /* 8031E49C 0031B3FC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031E4A0 0031B400 7D 89 03 A6 */ mtctr r12 -/* 8031E4A4 0031B404 4E 80 04 21 */ bctrl +/* 8031E4A4 0031B404 4E 80 04 21 */ bctrl lbl_8031E4A8: /* 8031E4A8 0031B408 80 7D 00 28 */ lwz r3, 0x28(r29) /* 8031E4AC 0031B40C 80 63 01 20 */ lwz r3, 0x120(r3) @@ -8003,7 +8003,7 @@ lbl_8031E4A8: /* 8031E4C0 0031B420 38 BF 00 14 */ addi r5, r31, 0x14 /* 8031E4C4 0031B424 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031E4C8 0031B428 7D 89 03 A6 */ mtctr r12 -/* 8031E4CC 0031B42C 4E 80 04 21 */ bctrl +/* 8031E4CC 0031B42C 4E 80 04 21 */ bctrl lbl_8031E4D0: /* 8031E4D0 0031B430 80 7D 00 28 */ lwz r3, 0x28(r29) /* 8031E4D4 0031B434 80 63 01 24 */ lwz r3, 0x124(r3) @@ -8014,7 +8014,7 @@ lbl_8031E4D0: /* 8031E4E8 0031B448 38 BF 00 18 */ addi r5, r31, 0x18 /* 8031E4EC 0031B44C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031E4F0 0031B450 7D 89 03 A6 */ mtctr r12 -/* 8031E4F4 0031B454 4E 80 04 21 */ bctrl +/* 8031E4F4 0031B454 4E 80 04 21 */ bctrl lbl_8031E4F8: /* 8031E4F8 0031B458 80 7D 00 28 */ lwz r3, 0x28(r29) /* 8031E4FC 0031B45C 80 63 01 28 */ lwz r3, 0x128(r3) @@ -8025,7 +8025,7 @@ lbl_8031E4F8: /* 8031E510 0031B470 38 BF 00 1C */ addi r5, r31, 0x1c /* 8031E514 0031B474 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031E518 0031B478 7D 89 03 A6 */ mtctr r12 -/* 8031E51C 0031B47C 4E 80 04 21 */ bctrl +/* 8031E51C 0031B47C 4E 80 04 21 */ bctrl lbl_8031E520: /* 8031E520 0031B480 80 01 00 24 */ lwz r0, 0x24(r1) /* 8031E524 0031B484 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -8033,7 +8033,7 @@ lbl_8031E520: /* 8031E52C 0031B48C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8031E530 0031B490 7C 08 03 A6 */ mtlr r0 /* 8031E534 0031B494 38 21 00 20 */ addi r1, r1, 0x20 -/* 8031E538 0031B498 4E 80 00 20 */ blr +/* 8031E538 0031B498 4E 80 00 20 */ blr .global UpdateLightParameters__11CElementGenFv UpdateLightParameters__11CElementGenFv: @@ -8049,7 +8049,7 @@ UpdateLightParameters__11CElementGenFv: /* 8031E560 0031B4C0 81 83 00 00 */ lwz r12, 0(r3) /* 8031E564 0031B4C4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031E568 0031B4C8 7D 89 03 A6 */ mtctr r12 -/* 8031E56C 0031B4CC 4E 80 04 21 */ bctrl +/* 8031E56C 0031B4CC 4E 80 04 21 */ bctrl /* 8031E570 0031B4D0 80 7F 00 28 */ lwz r3, 0x28(r31) /* 8031E574 0031B4D4 38 BF 03 10 */ addi r5, r31, 0x310 /* 8031E578 0031B4D8 80 9F 00 74 */ lwz r4, 0x74(r31) @@ -8057,7 +8057,7 @@ UpdateLightParameters__11CElementGenFv: /* 8031E580 0031B4E0 81 83 00 00 */ lwz r12, 0(r3) /* 8031E584 0031B4E4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031E588 0031B4E8 7D 89 03 A6 */ mtctr r12 -/* 8031E58C 0031B4EC 4E 80 04 21 */ bctrl +/* 8031E58C 0031B4EC 4E 80 04 21 */ bctrl /* 8031E590 0031B4F0 80 1F 03 08 */ lwz r0, 0x308(r31) /* 8031E594 0031B4F4 2C 00 00 02 */ cmpwi r0, 2 /* 8031E598 0031B4F8 41 82 00 70 */ beq lbl_8031E608 @@ -8068,7 +8068,7 @@ UpdateLightParameters__11CElementGenFv: /* 8031E5AC 0031B50C 81 83 00 00 */ lwz r12, 0(r3) /* 8031E5B0 0031B510 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031E5B4 0031B514 7D 89 03 A6 */ mtctr r12 -/* 8031E5B8 0031B518 4E 80 04 21 */ bctrl +/* 8031E5B8 0031B518 4E 80 04 21 */ bctrl /* 8031E5BC 0031B51C 80 7F 00 28 */ lwz r3, 0x28(r31) /* 8031E5C0 0031B520 38 BF 03 30 */ addi r5, r31, 0x330 /* 8031E5C4 0031B524 80 9F 00 74 */ lwz r4, 0x74(r31) @@ -8076,7 +8076,7 @@ UpdateLightParameters__11CElementGenFv: /* 8031E5CC 0031B52C 81 83 00 00 */ lwz r12, 0(r3) /* 8031E5D0 0031B530 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031E5D4 0031B534 7D 89 03 A6 */ mtctr r12 -/* 8031E5D8 0031B538 4E 80 04 21 */ bctrl +/* 8031E5D8 0031B538 4E 80 04 21 */ bctrl /* 8031E5DC 0031B53C 80 1F 03 08 */ lwz r0, 0x308(r31) /* 8031E5E0 0031B540 2C 00 00 03 */ cmpwi r0, 3 /* 8031E5E4 0031B544 40 82 00 24 */ bne lbl_8031E608 @@ -8087,7 +8087,7 @@ UpdateLightParameters__11CElementGenFv: /* 8031E5F8 0031B558 81 83 00 00 */ lwz r12, 0(r3) /* 8031E5FC 0031B55C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031E600 0031B560 7D 89 03 A6 */ mtctr r12 -/* 8031E604 0031B564 4E 80 04 21 */ bctrl +/* 8031E604 0031B564 4E 80 04 21 */ bctrl lbl_8031E608: /* 8031E608 0031B568 80 1F 03 08 */ lwz r0, 0x308(r31) /* 8031E60C 0031B56C 2C 00 00 01 */ cmpwi r0, 1 @@ -8099,13 +8099,13 @@ lbl_8031E608: /* 8031E624 0031B584 81 83 00 00 */ lwz r12, 0(r3) /* 8031E628 0031B588 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031E62C 0031B58C 7D 89 03 A6 */ mtctr r12 -/* 8031E630 0031B590 4E 80 04 21 */ bctrl +/* 8031E630 0031B590 4E 80 04 21 */ bctrl lbl_8031E634: /* 8031E634 0031B594 80 01 00 14 */ lwz r0, 0x14(r1) /* 8031E638 0031B598 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8031E63C 0031B59C 7C 08 03 A6 */ mtlr r0 /* 8031E640 0031B5A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8031E644 0031B5A4 4E 80 00 20 */ blr +/* 8031E644 0031B5A4 4E 80 00 20 */ blr .global InternalUpdate__11CElementGenFd InternalUpdate__11CElementGenFd: @@ -8167,7 +8167,7 @@ lbl_8031E6E8: /* 8031E71C 0031B67C 81 83 00 00 */ lwz r12, 0(r3) /* 8031E720 0031B680 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031E724 0031B684 7D 89 03 A6 */ mtctr r12 -/* 8031E728 0031B688 4E 80 04 21 */ bctrl +/* 8031E728 0031B688 4E 80 04 21 */ bctrl /* 8031E72C 0031B68C C8 41 00 28 */ lfd f2, 0x28(r1) /* 8031E730 0031B690 C0 21 00 20 */ lfs f1, 0x20(r1) /* 8031E734 0031B694 C8 0D 9D 00 */ lfd f0, lbl_805A88C0@sda21(r13) @@ -8202,7 +8202,7 @@ lbl_8031E75C: /* 8031E79C 0031B6FC 80 9C 00 74 */ lwz r4, 0x74(r28) /* 8031E7A0 0031B700 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031E7A4 0031B704 7D 89 03 A6 */ mtctr r12 -/* 8031E7A8 0031B708 4E 80 04 21 */ bctrl +/* 8031E7A8 0031B708 4E 80 04 21 */ bctrl lbl_8031E7AC: /* 8031E7AC 0031B70C CB 62 CA 38 */ lfd f27, lbl_805AE758@sda21(r2) /* 8031E7B0 0031B710 C3 A2 CA 40 */ lfs f29, lbl_805AE760@sda21(r2) @@ -8239,7 +8239,7 @@ lbl_8031E7C0: /* 8031E828 0031B788 81 83 00 00 */ lwz r12, 0(r3) /* 8031E82C 0031B78C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031E830 0031B790 7D 89 03 A6 */ mtctr r12 -/* 8031E834 0031B794 4E 80 04 21 */ bctrl +/* 8031E834 0031B794 4E 80 04 21 */ bctrl /* 8031E838 0031B798 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8031E83C 0031B79C 41 82 00 50 */ beq lbl_8031E88C /* 8031E840 0031B7A0 80 1C 00 34 */ lwz r0, 0x34(r28) @@ -8305,7 +8305,7 @@ lbl_8031E8B4: /* 8031E91C 0031B87C 80 9C 00 74 */ lwz r4, 0x74(r28) /* 8031E920 0031B880 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031E924 0031B884 7D 89 03 A6 */ mtctr r12 -/* 8031E928 0031B888 4E 80 04 21 */ bctrl +/* 8031E928 0031B888 4E 80 04 21 */ bctrl lbl_8031E92C: /* 8031E92C 0031B88C 7F 83 E3 78 */ mr r3, r28 /* 8031E930 0031B890 7F 64 DB 78 */ mr r4, r27 @@ -8403,7 +8403,7 @@ lbl_8031EA54: /* 8031EA80 0031B9E0 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 8031EA84 0031B9E4 7C 08 03 A6 */ mtlr r0 /* 8031EA88 0031B9E8 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 8031EA8C 0031B9EC 4E 80 00 20 */ blr +/* 8031EA8C 0031B9EC 4E 80 00 20 */ blr .global Update__11CElementGenFd Update__11CElementGenFd: @@ -8438,7 +8438,7 @@ Update__11CElementGenFd: /* 8031EB00 0031BA60 81 83 00 00 */ lwz r12, 0(r3) /* 8031EB04 0031BA64 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031EB08 0031BA68 7D 89 03 A6 */ mtctr r12 -/* 8031EB0C 0031BA6C 4E 80 04 21 */ bctrl +/* 8031EB0C 0031BA6C 4E 80 04 21 */ bctrl /* 8031EB10 0031BA70 80 81 00 08 */ lwz r4, 8(r1) /* 8031EB14 0031BA74 3C 00 43 30 */ lis r0, 0x4330 /* 8031EB18 0031BA78 90 01 00 18 */ stw r0, 0x18(r1) @@ -8469,7 +8469,7 @@ lbl_8031EB6C: /* 8031EB74 0031BAD4 83 E1 00 24 */ lwz r31, 0x24(r1) /* 8031EB78 0031BAD8 7C 08 03 A6 */ mtlr r0 /* 8031EB7C 0031BADC 38 21 00 30 */ addi r1, r1, 0x30 -/* 8031EB80 0031BAE0 4E 80 00 20 */ blr +/* 8031EB80 0031BAE0 4E 80 00 20 */ blr .global SetGlobalOrientAndTrans__11CElementGenFRC12CTransform4f SetGlobalOrientAndTrans__11CElementGenFRC12CTransform4f: @@ -8483,7 +8483,7 @@ SetGlobalOrientAndTrans__11CElementGenFRC12CTransform4f: /* 8031EBA0 0031BB00 81 83 00 00 */ lwz r12, 0(r3) /* 8031EBA4 0031BB04 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 8031EBA8 0031BB08 7D 89 03 A6 */ mtctr r12 -/* 8031EBAC 0031BB0C 4E 80 04 21 */ bctrl +/* 8031EBAC 0031BB0C 4E 80 04 21 */ bctrl /* 8031EBB0 0031BB10 C0 5F 00 2C */ lfs f2, 0x2c(r31) /* 8031EBB4 0031BB14 7F C3 F3 78 */ mr r3, r30 /* 8031EBB8 0031BB18 C0 3F 00 1C */ lfs f1, 0x1c(r31) @@ -8495,13 +8495,13 @@ SetGlobalOrientAndTrans__11CElementGenFRC12CTransform4f: /* 8031EBD0 0031BB30 81 9E 00 00 */ lwz r12, 0(r30) /* 8031EBD4 0031BB34 81 8C 00 20 */ lwz r12, 0x20(r12) /* 8031EBD8 0031BB38 7D 89 03 A6 */ mtctr r12 -/* 8031EBDC 0031BB3C 4E 80 04 21 */ bctrl +/* 8031EBDC 0031BB3C 4E 80 04 21 */ bctrl /* 8031EBE0 0031BB40 80 01 00 24 */ lwz r0, 0x24(r1) /* 8031EBE4 0031BB44 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8031EBE8 0031BB48 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8031EBEC 0031BB4C 7C 08 03 A6 */ mtlr r0 /* 8031EBF0 0031BB50 38 21 00 20 */ addi r1, r1, 0x20 -/* 8031EBF4 0031BB54 4E 80 00 20 */ blr +/* 8031EBF4 0031BB54 4E 80 00 20 */ blr .global SetGlobalOrientation__11CElementGenFRC12CTransform4f SetGlobalOrientation__11CElementGenFRC12CTransform4f: @@ -8521,7 +8521,7 @@ lbl_8031EC20: /* 8031EC28 0031BB88 81 83 00 00 */ lwz r12, 0(r3) /* 8031EC2C 0031BB8C 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 8031EC30 0031BB90 7D 89 03 A6 */ mtctr r12 -/* 8031EC34 0031BB94 4E 80 04 21 */ bctrl +/* 8031EC34 0031BB94 4E 80 04 21 */ bctrl /* 8031EC38 0031BB98 3B FF 00 04 */ addi r31, r31, 4 lbl_8031EC3C: /* 8031EC3C 0031BB9C 80 1E 02 94 */ lwz r0, 0x294(r30) @@ -8535,7 +8535,7 @@ lbl_8031EC3C: /* 8031EC5C 0031BBBC 83 C1 00 08 */ lwz r30, 8(r1) /* 8031EC60 0031BBC0 7C 08 03 A6 */ mtlr r0 /* 8031EC64 0031BBC4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8031EC68 0031BBC8 4E 80 00 20 */ blr +/* 8031EC68 0031BBC8 4E 80 00 20 */ blr .global SetOrientation__11CElementGenFRC12CTransform4f SetOrientation__11CElementGenFRC12CTransform4f: @@ -8566,7 +8566,7 @@ lbl_8031ECC0: /* 8031ECC8 0031BC28 81 83 00 00 */ lwz r12, 0(r3) /* 8031ECCC 0031BC2C 81 8C 00 14 */ lwz r12, 0x14(r12) /* 8031ECD0 0031BC30 7D 89 03 A6 */ mtctr r12 -/* 8031ECD4 0031BC34 4E 80 04 21 */ bctrl +/* 8031ECD4 0031BC34 4E 80 04 21 */ bctrl /* 8031ECD8 0031BC38 3B FF 00 04 */ addi r31, r31, 4 lbl_8031ECDC: /* 8031ECDC 0031BC3C 80 1D 02 94 */ lwz r0, 0x294(r29) @@ -8581,7 +8581,7 @@ lbl_8031ECDC: /* 8031ED00 0031BC60 83 A1 00 64 */ lwz r29, 0x64(r1) /* 8031ED04 0031BC64 7C 08 03 A6 */ mtlr r0 /* 8031ED08 0031BC68 38 21 00 70 */ addi r1, r1, 0x70 -/* 8031ED0C 0031BC6C 4E 80 00 20 */ blr +/* 8031ED0C 0031BC6C 4E 80 00 20 */ blr .global SetLocalScale__11CElementGenFRC9CVector3f SetLocalScale__11CElementGenFRC9CVector3f: @@ -8627,7 +8627,7 @@ lbl_8031EDA0: /* 8031EDA8 0031BD08 81 83 00 00 */ lwz r12, 0(r3) /* 8031EDAC 0031BD0C 81 8C 00 28 */ lwz r12, 0x28(r12) /* 8031EDB0 0031BD10 7D 89 03 A6 */ mtctr r12 -/* 8031EDB4 0031BD14 4E 80 04 21 */ bctrl +/* 8031EDB4 0031BD14 4E 80 04 21 */ bctrl /* 8031EDB8 0031BD18 3B FF 00 04 */ addi r31, r31, 4 lbl_8031EDBC: /* 8031EDBC 0031BD1C 80 1D 02 94 */ lwz r0, 0x294(r29) @@ -8642,7 +8642,7 @@ lbl_8031EDBC: /* 8031EDE0 0031BD40 83 A1 00 74 */ lwz r29, 0x74(r1) /* 8031EDE4 0031BD44 7C 08 03 A6 */ mtlr r0 /* 8031EDE8 0031BD48 38 21 00 80 */ addi r1, r1, 0x80 -/* 8031EDEC 0031BD4C 4E 80 00 20 */ blr +/* 8031EDEC 0031BD4C 4E 80 00 20 */ blr .global SetGlobalScale__11CElementGenFRC9CVector3f SetGlobalScale__11CElementGenFRC9CVector3f: @@ -8688,7 +8688,7 @@ lbl_8031EE80: /* 8031EE88 0031BDE8 81 83 00 00 */ lwz r12, 0(r3) /* 8031EE8C 0031BDEC 81 8C 00 24 */ lwz r12, 0x24(r12) /* 8031EE90 0031BDF0 7D 89 03 A6 */ mtctr r12 -/* 8031EE94 0031BDF4 4E 80 04 21 */ bctrl +/* 8031EE94 0031BDF4 4E 80 04 21 */ bctrl /* 8031EE98 0031BDF8 3B FF 00 04 */ addi r31, r31, 4 lbl_8031EE9C: /* 8031EE9C 0031BDFC 80 1D 02 94 */ lwz r0, 0x294(r29) @@ -8703,12 +8703,12 @@ lbl_8031EE9C: /* 8031EEC0 0031BE20 83 A1 00 74 */ lwz r29, 0x74(r1) /* 8031EEC4 0031BE24 7C 08 03 A6 */ mtlr r0 /* 8031EEC8 0031BE28 38 21 00 80 */ addi r1, r1, 0x80 -/* 8031EECC 0031BE2C 4E 80 00 20 */ blr +/* 8031EECC 0031BE2C 4E 80 00 20 */ blr .global GetModulationColor__11CElementGenCFv GetModulationColor__11CElementGenCFv: /* 8031EED0 0031BE30 38 63 03 38 */ addi r3, r3, 0x338 -/* 8031EED4 0031BE34 4E 80 00 20 */ blr +/* 8031EED4 0031BE34 4E 80 00 20 */ blr .global SetModulationColor__11CElementGenFRC6CColor SetModulationColor__11CElementGenFRC6CColor: @@ -8730,7 +8730,7 @@ lbl_8031EF08: /* 8031EF10 0031BE70 81 83 00 00 */ lwz r12, 0(r3) /* 8031EF14 0031BE74 81 8C 00 30 */ lwz r12, 0x30(r12) /* 8031EF18 0031BE78 7D 89 03 A6 */ mtctr r12 -/* 8031EF1C 0031BE7C 4E 80 04 21 */ bctrl +/* 8031EF1C 0031BE7C 4E 80 04 21 */ bctrl /* 8031EF20 0031BE80 3B FF 00 04 */ addi r31, r31, 4 lbl_8031EF24: /* 8031EF24 0031BE84 80 1D 02 94 */ lwz r0, 0x294(r29) @@ -8745,7 +8745,7 @@ lbl_8031EF24: /* 8031EF48 0031BEA8 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8031EF4C 0031BEAC 7C 08 03 A6 */ mtlr r0 /* 8031EF50 0031BEB0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8031EF54 0031BEB4 4E 80 00 20 */ blr +/* 8031EF54 0031BEB4 4E 80 00 20 */ blr .global SetGlobalTranslation__11CElementGenFRC9CVector3f SetGlobalTranslation__11CElementGenFRC9CVector3f: @@ -8771,7 +8771,7 @@ lbl_8031EF98: /* 8031EFA0 0031BF00 81 83 00 00 */ lwz r12, 0(r3) /* 8031EFA4 0031BF04 81 8C 00 20 */ lwz r12, 0x20(r12) /* 8031EFA8 0031BF08 7D 89 03 A6 */ mtctr r12 -/* 8031EFAC 0031BF0C 4E 80 04 21 */ bctrl +/* 8031EFAC 0031BF0C 4E 80 04 21 */ bctrl /* 8031EFB0 0031BF10 3B FF 00 04 */ addi r31, r31, 4 lbl_8031EFB4: /* 8031EFB4 0031BF14 80 1D 02 94 */ lwz r0, 0x294(r29) @@ -8786,7 +8786,7 @@ lbl_8031EFB4: /* 8031EFD8 0031BF38 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8031EFDC 0031BF3C 7C 08 03 A6 */ mtlr r0 /* 8031EFE0 0031BF40 38 21 00 20 */ addi r1, r1, 0x20 -/* 8031EFE4 0031BF44 4E 80 00 20 */ blr +/* 8031EFE4 0031BF44 4E 80 00 20 */ blr .global SetTranslation__11CElementGenFRC9CVector3f SetTranslation__11CElementGenFRC9CVector3f: @@ -8813,7 +8813,7 @@ lbl_8031F02C: /* 8031F034 0031BF94 81 9E 00 00 */ lwz r12, 0(r30) /* 8031F038 0031BF98 81 8C 00 74 */ lwz r12, 0x74(r12) /* 8031F03C 0031BF9C 7D 89 03 A6 */ mtctr r12 -/* 8031F040 0031BFA0 4E 80 04 21 */ bctrl +/* 8031F040 0031BFA0 4E 80 04 21 */ bctrl /* 8031F044 0031BFA4 3C 03 BA B4 */ addis r0, r3, 0xbab4 /* 8031F048 0031BFA8 28 00 53 43 */ cmplwi r0, 0x5343 /* 8031F04C 0031BFAC 40 82 00 50 */ bne lbl_8031F09C @@ -8834,14 +8834,14 @@ lbl_8031F02C: /* 8031F088 0031BFE8 81 9E 00 00 */ lwz r12, 0(r30) /* 8031F08C 0031BFEC 81 8C 00 18 */ lwz r12, 0x18(r12) /* 8031F090 0031BFF0 7D 89 03 A6 */ mtctr r12 -/* 8031F094 0031BFF4 4E 80 04 21 */ bctrl +/* 8031F094 0031BFF4 4E 80 04 21 */ bctrl /* 8031F098 0031BFF8 48 00 00 88 */ b lbl_8031F120 lbl_8031F09C: /* 8031F09C 0031BFFC 7F C3 F3 78 */ mr r3, r30 /* 8031F0A0 0031C000 81 9E 00 00 */ lwz r12, 0(r30) /* 8031F0A4 0031C004 81 8C 00 74 */ lwz r12, 0x74(r12) /* 8031F0A8 0031C008 7D 89 03 A6 */ mtctr r12 -/* 8031F0AC 0031C00C 4E 80 04 21 */ bctrl +/* 8031F0AC 0031C00C 4E 80 04 21 */ bctrl /* 8031F0B0 0031C010 3C 03 AC A9 */ addis r0, r3, 0xaca9 /* 8031F0B4 0031C014 28 00 48 43 */ cmplwi r0, 0x4843 /* 8031F0B8 0031C018 40 82 00 50 */ bne lbl_8031F108 @@ -8862,7 +8862,7 @@ lbl_8031F09C: /* 8031F0F4 0031C054 81 9E 00 00 */ lwz r12, 0(r30) /* 8031F0F8 0031C058 81 8C 00 18 */ lwz r12, 0x18(r12) /* 8031F0FC 0031C05C 7D 89 03 A6 */ mtctr r12 -/* 8031F100 0031C060 4E 80 04 21 */ bctrl +/* 8031F100 0031C060 4E 80 04 21 */ bctrl /* 8031F104 0031C064 48 00 00 1C */ b lbl_8031F120 lbl_8031F108: /* 8031F108 0031C068 7F C3 F3 78 */ mr r3, r30 @@ -8870,7 +8870,7 @@ lbl_8031F108: /* 8031F110 0031C070 81 9E 00 00 */ lwz r12, 0(r30) /* 8031F114 0031C074 81 8C 00 18 */ lwz r12, 0x18(r12) /* 8031F118 0031C078 7D 89 03 A6 */ mtctr r12 -/* 8031F11C 0031C07C 4E 80 04 21 */ bctrl +/* 8031F11C 0031C07C 4E 80 04 21 */ bctrl lbl_8031F120: /* 8031F120 0031C080 3B FF 00 04 */ addi r31, r31, 4 lbl_8031F124: @@ -8887,25 +8887,25 @@ lbl_8031F124: /* 8031F14C 0031C0AC 83 81 00 20 */ lwz r28, 0x20(r1) /* 8031F150 0031C0B0 7C 08 03 A6 */ mtlr r0 /* 8031F154 0031C0B4 38 21 00 30 */ addi r1, r1, 0x30 -/* 8031F158 0031C0B8 4E 80 00 20 */ blr +/* 8031F158 0031C0B8 4E 80 00 20 */ blr .global ShutDown__11CElementGenFv ShutDown__11CElementGenFv: /* 8031F15C 0031C0BC 38 00 00 00 */ li r0, 0 /* 8031F160 0031C0C0 98 0D A8 BA */ stb r0, lbl_805A947A@sda21(r13) -/* 8031F164 0031C0C4 4E 80 00 20 */ blr +/* 8031F164 0031C0C4 4E 80 00 20 */ blr .global Initialize__11CElementGenFv Initialize__11CElementGenFv: /* 8031F168 0031C0C8 88 0D A8 BA */ lbz r0, lbl_805A947A@sda21(r13) /* 8031F16C 0031C0CC 28 00 00 00 */ cmplwi r0, 0 -/* 8031F170 0031C0D0 4C 82 00 20 */ bnelr +/* 8031F170 0031C0D0 4C 82 00 20 */ bnelr /* 8031F174 0031C0D4 38 60 00 00 */ li r3, 0 /* 8031F178 0031C0D8 38 00 00 01 */ li r0, 1 /* 8031F17C 0031C0DC 90 6D A8 B0 */ stw r3, lbl_805A9470@sda21(r13) /* 8031F180 0031C0E0 90 6D A8 B4 */ stw r3, lbl_805A9474@sda21(r13) /* 8031F184 0031C0E4 98 0D A8 BA */ stb r0, lbl_805A947A@sda21(r13) -/* 8031F188 0031C0E8 4E 80 00 20 */ blr +/* 8031F188 0031C0E8 4E 80 00 20 */ blr .global __dt__11CElementGenFv __dt__11CElementGenFv: @@ -8938,7 +8938,7 @@ lbl_8031F1E0: /* 8031F1F0 0031C150 38 80 00 01 */ li r4, 1 /* 8031F1F4 0031C154 81 8C 00 08 */ lwz r12, 8(r12) /* 8031F1F8 0031C158 7D 89 03 A6 */ mtctr r12 -/* 8031F1FC 0031C15C 4E 80 04 21 */ bctrl +/* 8031F1FC 0031C15C 4E 80 04 21 */ bctrl lbl_8031F200: /* 8031F200 0031C160 3B BD 00 04 */ addi r29, r29, 4 lbl_8031F204: @@ -9078,7 +9078,7 @@ lbl_8031F3C0: /* 8031F3D0 0031C330 83 A1 00 64 */ lwz r29, 0x64(r1) /* 8031F3D4 0031C334 7C 08 03 A6 */ mtlr r0 /* 8031F3D8 0031C338 38 21 00 70 */ addi r1, r1, 0x70 -/* 8031F3DC 0031C33C 4E 80 00 20 */ blr +/* 8031F3DC 0031C33C 4E 80 00 20 */ blr .global "__ct__11CElementGenF25TToken<15CGenDescription>Q211CElementGen21EModelOrientationTypeQ211CElementGen20EOptionalSystemFlags" "__ct__11CElementGenF25TToken<15CGenDescription>Q211CElementGen21EModelOrientationTypeQ211CElementGen20EOptionalSystemFlags": @@ -9311,7 +9311,7 @@ lbl_8031F3C0: /* 8031F768 0031C6C8 80 9F 00 74 */ lwz r4, 0x74(r31) /* 8031F76C 0031C6CC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031F770 0031C6D0 7D 89 03 A6 */ mtctr r12 -/* 8031F774 0031C6D4 4E 80 04 21 */ bctrl +/* 8031F774 0031C6D4 4E 80 04 21 */ bctrl /* 8031F778 0031C6D8 80 01 00 10 */ lwz r0, 0x10(r1) /* 8031F77C 0031C6DC B0 1F 00 94 */ sth r0, 0x94(r31) lbl_8031F780: @@ -9363,7 +9363,7 @@ lbl_8031F808: /* 8031F82C 0031C78C 80 9F 00 74 */ lwz r4, 0x74(r31) /* 8031F830 0031C790 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031F834 0031C794 7D 89 03 A6 */ mtctr r12 -/* 8031F838 0031C798 4E 80 04 21 */ bctrl +/* 8031F838 0031C798 4E 80 04 21 */ bctrl lbl_8031F83C: /* 8031F83C 0031C79C 80 9F 00 28 */ lwz r4, 0x28(r31) /* 8031F840 0031C7A0 38 60 00 00 */ li r3, 0 @@ -9515,7 +9515,7 @@ lbl_8031F9FC: /* 8031FA60 0031C9C0 38 80 00 00 */ li r4, 0 /* 8031FA64 0031C9C4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031FA68 0031C9C8 7D 89 03 A6 */ mtctr r12 -/* 8031FA6C 0031C9CC 4E 80 04 21 */ bctrl +/* 8031FA6C 0031C9CC 4E 80 04 21 */ bctrl lbl_8031FA70: /* 8031FA70 0031C9D0 38 00 00 10 */ li r0, 0x10 /* 8031FA74 0031C9D4 90 1F 02 A8 */ stw r0, 0x2a8(r31) @@ -9528,7 +9528,7 @@ lbl_8031FA70: /* 8031FA90 0031C9F0 38 80 00 00 */ li r4, 0 /* 8031FA94 0031C9F4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031FA98 0031C9F8 7D 89 03 A6 */ mtctr r12 -/* 8031FA9C 0031C9FC 4E 80 04 21 */ bctrl +/* 8031FA9C 0031C9FC 4E 80 04 21 */ bctrl /* 8031FAA0 0031CA00 80 1F 02 A8 */ lwz r0, 0x2a8(r31) /* 8031FAA4 0031CA04 2C 00 00 00 */ cmpwi r0, 0 /* 8031FAA8 0031CA08 41 81 00 0C */ bgt lbl_8031FAB4 @@ -9546,7 +9546,7 @@ lbl_8031FAB4: /* 8031FAD4 0031CA34 38 80 00 00 */ li r4, 0 /* 8031FAD8 0031CA38 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031FADC 0031CA3C 7D 89 03 A6 */ mtctr r12 -/* 8031FAE0 0031CA40 4E 80 04 21 */ bctrl +/* 8031FAE0 0031CA40 4E 80 04 21 */ bctrl lbl_8031FAE4: /* 8031FAE4 0031CA44 38 00 00 00 */ li r0, 0 /* 8031FAE8 0031CA48 90 1F 02 AC */ stw r0, 0x2ac(r31) @@ -9559,7 +9559,7 @@ lbl_8031FAE4: /* 8031FB04 0031CA64 38 80 00 00 */ li r4, 0 /* 8031FB08 0031CA68 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031FB0C 0031CA6C 7D 89 03 A6 */ mtctr r12 -/* 8031FB10 0031CA70 4E 80 04 21 */ bctrl +/* 8031FB10 0031CA70 4E 80 04 21 */ bctrl lbl_8031FB14: /* 8031FB14 0031CA74 80 7F 00 28 */ lwz r3, 0x28(r31) /* 8031FB18 0031CA78 80 63 00 D4 */ lwz r3, 0xd4(r3) @@ -9570,13 +9570,13 @@ lbl_8031FB14: /* 8031FB2C 0031CA8C 38 80 00 00 */ li r4, 0 /* 8031FB30 0031CA90 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031FB34 0031CA94 7D 89 03 A6 */ mtctr r12 -/* 8031FB38 0031CA98 4E 80 04 21 */ bctrl +/* 8031FB38 0031CA98 4E 80 04 21 */ bctrl /* 8031FB3C 0031CA9C 80 7F 00 28 */ lwz r3, 0x28(r31) /* 8031FB40 0031CAA0 80 63 00 D4 */ lwz r3, 0xd4(r3) /* 8031FB44 0031CAA4 81 83 00 00 */ lwz r12, 0(r3) /* 8031FB48 0031CAA8 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8031FB4C 0031CAAC 7D 89 03 A6 */ mtctr r12 -/* 8031FB50 0031CAB0 4E 80 04 21 */ bctrl +/* 8031FB50 0031CAB0 4E 80 04 21 */ bctrl /* 8031FB54 0031CAB4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8031FB58 0031CAB8 40 82 00 14 */ bne lbl_8031FB6C /* 8031FB5C 0031CABC 88 1F 02 6C */ lbz r0, 0x26c(r31) @@ -9595,7 +9595,7 @@ lbl_8031FB6C: /* 8031FB8C 0031CAEC 38 80 00 00 */ li r4, 0 /* 8031FB90 0031CAF0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031FB94 0031CAF4 7D 89 03 A6 */ mtctr r12 -/* 8031FB98 0031CAF8 4E 80 04 21 */ bctrl +/* 8031FB98 0031CAF8 4E 80 04 21 */ bctrl lbl_8031FB9C: /* 8031FB9C 0031CAFC 80 7F 00 28 */ lwz r3, 0x28(r31) /* 8031FBA0 0031CB00 80 63 00 E8 */ lwz r3, 0xe8(r3) @@ -9606,13 +9606,13 @@ lbl_8031FB9C: /* 8031FBB4 0031CB14 38 80 00 00 */ li r4, 0 /* 8031FBB8 0031CB18 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031FBBC 0031CB1C 7D 89 03 A6 */ mtctr r12 -/* 8031FBC0 0031CB20 4E 80 04 21 */ bctrl +/* 8031FBC0 0031CB20 4E 80 04 21 */ bctrl /* 8031FBC4 0031CB24 80 7F 00 28 */ lwz r3, 0x28(r31) /* 8031FBC8 0031CB28 80 63 00 E8 */ lwz r3, 0xe8(r3) /* 8031FBCC 0031CB2C 81 83 00 00 */ lwz r12, 0(r3) /* 8031FBD0 0031CB30 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8031FBD4 0031CB34 7D 89 03 A6 */ mtctr r12 -/* 8031FBD8 0031CB38 4E 80 04 21 */ bctrl +/* 8031FBD8 0031CB38 4E 80 04 21 */ bctrl /* 8031FBDC 0031CB3C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8031FBE0 0031CB40 40 82 00 14 */ bne lbl_8031FBF4 /* 8031FBE4 0031CB44 88 1F 02 6C */ lbz r0, 0x26c(r31) @@ -9629,13 +9629,13 @@ lbl_8031FBF4: /* 8031FC0C 0031CB6C 80 9F 00 74 */ lwz r4, 0x74(r31) /* 8031FC10 0031CB70 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031FC14 0031CB74 7D 89 03 A6 */ mtctr r12 -/* 8031FC18 0031CB78 4E 80 04 21 */ bctrl +/* 8031FC18 0031CB78 4E 80 04 21 */ bctrl /* 8031FC1C 0031CB7C 80 7F 00 28 */ lwz r3, 0x28(r31) /* 8031FC20 0031CB80 80 63 00 0C */ lwz r3, 0xc(r3) /* 8031FC24 0031CB84 81 83 00 00 */ lwz r12, 0(r3) /* 8031FC28 0031CB88 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8031FC2C 0031CB8C 7D 89 03 A6 */ mtctr r12 -/* 8031FC30 0031CB90 4E 80 04 21 */ bctrl +/* 8031FC30 0031CB90 4E 80 04 21 */ bctrl /* 8031FC34 0031CB94 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8031FC38 0031CB98 40 82 00 14 */ bne lbl_8031FC4C /* 8031FC3C 0031CB9C 88 1F 02 6C */ lbz r0, 0x26c(r31) @@ -9652,7 +9652,7 @@ lbl_8031FC4C: /* 8031FC64 0031CBC4 38 80 00 00 */ li r4, 0 /* 8031FC68 0031CBC8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031FC6C 0031CBCC 7D 89 03 A6 */ mtctr r12 -/* 8031FC70 0031CBD0 4E 80 04 21 */ bctrl +/* 8031FC70 0031CBD0 4E 80 04 21 */ bctrl /* 8031FC74 0031CBD4 48 00 00 10 */ b lbl_8031FC84 lbl_8031FC78: /* 8031FC78 0031CBD8 3C 60 00 80 */ lis r3, 0x007FFFFF@ha @@ -9668,7 +9668,7 @@ lbl_8031FC84: /* 8031FC9C 0031CBFC 80 9F 00 74 */ lwz r4, 0x74(r31) /* 8031FCA0 0031CC00 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031FCA4 0031CC04 7D 89 03 A6 */ mtctr r12 -/* 8031FCA8 0031CC08 4E 80 04 21 */ bctrl +/* 8031FCA8 0031CC08 4E 80 04 21 */ bctrl lbl_8031FCAC: /* 8031FCAC 0031CC0C 83 DF 00 90 */ lwz r30, 0x90(r31) /* 8031FCB0 0031CC10 2C 1E 01 00 */ cmpwi r30, 0x100 @@ -9736,7 +9736,7 @@ lbl_8031FD4C: /* 8031FD9C 0031CCFC 81 83 00 00 */ lwz r12, 0(r3) /* 8031FDA0 0031CD00 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031FDA4 0031CD04 7D 89 03 A6 */ mtctr r12 -/* 8031FDA8 0031CD08 4E 80 04 21 */ bctrl +/* 8031FDA8 0031CD08 4E 80 04 21 */ bctrl /* 8031FDAC 0031CD0C 80 01 00 0C */ lwz r0, 0xc(r1) /* 8031FDB0 0031CD10 2C 00 00 02 */ cmpwi r0, 2 /* 8031FDB4 0031CD14 41 82 00 3C */ beq lbl_8031FDF0 @@ -9782,7 +9782,7 @@ lbl_8031FE10: /* 8031FE38 0031CD98 81 83 00 00 */ lwz r12, 0(r3) /* 8031FE3C 0031CD9C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8031FE40 0031CDA0 7D 89 03 A6 */ mtctr r12 -/* 8031FE44 0031CDA4 4E 80 04 21 */ bctrl +/* 8031FE44 0031CDA4 4E 80 04 21 */ bctrl /* 8031FE48 0031CDA8 80 01 00 08 */ lwz r0, 8(r1) /* 8031FE4C 0031CDAC 2C 00 00 01 */ cmpwi r0, 1 /* 8031FE50 0031CDB0 41 82 00 2C */ beq lbl_8031FE7C @@ -9821,7 +9821,7 @@ lbl_8031FE9C: /* 8031FEBC 0031CE1C 83 81 00 40 */ lwz r28, 0x40(r1) /* 8031FEC0 0031CE20 7C 08 03 A6 */ mtlr r0 /* 8031FEC4 0031CE24 38 21 00 50 */ addi r1, r1, 0x50 -/* 8031FEC8 0031CE28 4E 80 00 20 */ blr +/* 8031FEC8 0031CE28 4E 80 00 20 */ blr .global sub_8031fecc sub_8031fecc: @@ -9891,7 +9891,7 @@ lbl_8031FF94: /* 8031FFAC 0031CF0C 83 81 00 20 */ lwz r28, 0x20(r1) /* 8031FFB0 0031CF10 7C 08 03 A6 */ mtlr r0 /* 8031FFB4 0031CF14 38 21 00 30 */ addi r1, r1, 0x30 -/* 8031FFB8 0031CF18 4E 80 00 20 */ blr +/* 8031FFB8 0031CF18 4E 80 00 20 */ blr .global sub_8031ffbc sub_8031ffbc: @@ -9975,7 +9975,7 @@ lbl_803200BC: /* 803200D4 0031D034 83 81 00 20 */ lwz r28, 0x20(r1) /* 803200D8 0031D038 7C 08 03 A6 */ mtlr r0 /* 803200DC 0031D03C 38 21 00 30 */ addi r1, r1, 0x30 -/* 803200E0 0031D040 4E 80 00 20 */ blr +/* 803200E0 0031D040 4E 80 00 20 */ blr .global sub_803200e4 sub_803200e4: @@ -10074,7 +10074,7 @@ lbl_80320234: /* 80320238 0031D198 80 01 00 44 */ lwz r0, 0x44(r1) /* 8032023C 0031D19C 7C 08 03 A6 */ mtlr r0 /* 80320240 0031D1A0 38 21 00 40 */ addi r1, r1, 0x40 -/* 80320244 0031D1A4 4E 80 00 20 */ blr +/* 80320244 0031D1A4 4E 80 00 20 */ blr .global sub_80320248 sub_80320248: @@ -10178,7 +10178,7 @@ lbl_803203AC: /* 803203B0 0031D310 80 01 00 44 */ lwz r0, 0x44(r1) /* 803203B4 0031D314 7C 08 03 A6 */ mtlr r0 /* 803203B8 0031D318 38 21 00 40 */ addi r1, r1, 0x40 -/* 803203BC 0031D31C 4E 80 00 20 */ blr +/* 803203BC 0031D31C 4E 80 00 20 */ blr .global sub_803203c0 sub_803203c0: @@ -10242,7 +10242,7 @@ lbl_80320480: /* 8032048C 0031D3EC 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80320490 0031D3F0 7C 08 03 A6 */ mtlr r0 /* 80320494 0031D3F4 38 21 00 30 */ addi r1, r1, 0x30 -/* 80320498 0031D3F8 4E 80 00 20 */ blr +/* 80320498 0031D3F8 4E 80 00 20 */ blr .global sub_8032049c sub_8032049c: @@ -10287,7 +10287,7 @@ lbl_80320524: /* 80320528 0031D488 7C 03 00 40 */ cmplw r3, r0 /* 8032052C 0031D48C 40 82 FF 78 */ bne lbl_803204A4 /* 80320530 0031D490 7C A3 2B 78 */ mr r3, r5 -/* 80320534 0031D494 4E 80 00 20 */ blr +/* 80320534 0031D494 4E 80 00 20 */ blr .global sub_80320538 sub_80320538: @@ -10356,7 +10356,7 @@ lbl_80320608: /* 8032060C 0031D56C 80 01 00 34 */ lwz r0, 0x34(r1) /* 80320610 0031D570 7C 08 03 A6 */ mtlr r0 /* 80320614 0031D574 38 21 00 30 */ addi r1, r1, 0x30 -/* 80320618 0031D578 4E 80 00 20 */ blr +/* 80320618 0031D578 4E 80 00 20 */ blr .global "reserve__Q24rstl69vectorFi" "reserve__Q24rstl69vectorFi": @@ -10441,7 +10441,7 @@ lbl_80320724: /* 80320730 0031D690 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80320734 0031D694 7C 08 03 A6 */ mtlr r0 /* 80320738 0031D698 38 21 00 30 */ addi r1, r1, 0x30 -/* 8032073C 0031D69C 4E 80 00 20 */ blr +/* 8032073C 0031D69C 4E 80 00 20 */ blr .global sub_80320740 sub_80320740: @@ -10512,7 +10512,7 @@ lbl_80320810: /* 8032081C 0031D77C 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80320820 0031D780 7C 08 03 A6 */ mtlr r0 /* 80320824 0031D784 38 21 00 30 */ addi r1, r1, 0x30 -/* 80320828 0031D788 4E 80 00 20 */ blr +/* 80320828 0031D788 4E 80 00 20 */ blr .global sub_8032082c sub_8032082c: @@ -10566,7 +10566,7 @@ lbl_803208B4: /* 803208D8 0031D838 42 00 FF 74 */ bdnz lbl_8032084C lbl_803208DC: /* 803208DC 0031D83C 38 21 00 20 */ addi r1, r1, 0x20 -/* 803208E0 0031D840 4E 80 00 20 */ blr +/* 803208E0 0031D840 4E 80 00 20 */ blr .global sub_803208e4 sub_803208e4: @@ -10626,7 +10626,7 @@ lbl_8032097C: /* 803209A8 0031D908 42 00 FF 5C */ bdnz lbl_80320904 lbl_803209AC: /* 803209AC 0031D90C 38 21 00 20 */ addi r1, r1, 0x20 -/* 803209B0 0031D910 4E 80 00 20 */ blr +/* 803209B0 0031D910 4E 80 00 20 */ blr .global sub_803209b4 sub_803209b4: @@ -10733,7 +10733,7 @@ lbl_80320B10: /* 80320B2C 0031DA8C 90 04 00 0C */ stw r0, 0xc(r4) lbl_80320B30: /* 80320B30 0031DA90 38 21 00 30 */ addi r1, r1, 0x30 -/* 80320B34 0031DA94 4E 80 00 20 */ blr +/* 80320B34 0031DA94 4E 80 00 20 */ blr .global sub_80320b38 sub_80320b38: @@ -10827,7 +10827,7 @@ lbl_80320C64: /* 80320C7C 0031DBDC 90 04 00 0C */ stw r0, 0xc(r4) lbl_80320C80: /* 80320C80 0031DBE0 38 21 00 30 */ addi r1, r1, 0x30 -/* 80320C84 0031DBE4 4E 80 00 20 */ blr +/* 80320C84 0031DBE4 4E 80 00 20 */ blr .global __dt__7CIEGEMT __dt__7CIEGEMT: @@ -10860,7 +10860,7 @@ lbl_80320CE0: /* 80320CE8 0031DC48 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80320CEC 0031DC4C 7C 08 03 A6 */ mtlr r0 /* 80320CF0 0031DC50 38 21 00 10 */ addi r1, r1, 0x10 -/* 80320CF4 0031DC54 4E 80 00 20 */ blr +/* 80320CF4 0031DC54 4E 80 00 20 */ blr .global GetValue__7CIEGEMTCFiRi GetValue__7CIEGEMTCFiRi: @@ -10878,7 +10878,7 @@ GetValue__7CIEGEMTCFiRi: /* 80320D24 0031DC84 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80320D28 0031DC88 7C 08 03 A6 */ mtlr r0 /* 80320D2C 0031DC8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80320D30 0031DC90 4E 80 00 20 */ blr +/* 80320D30 0031DC90 4E 80 00 20 */ blr .global GetValue__7CIEGAPCCFiRi GetValue__7CIEGAPCCFiRi: @@ -10892,14 +10892,14 @@ GetValue__7CIEGAPCCFiRi: /* 80320D50 0031DCB0 81 83 00 00 */ lwz r12, 0(r3) /* 80320D54 0031DCB4 81 8C 00 60 */ lwz r12, 0x60(r12) /* 80320D58 0031DCB8 7D 89 03 A6 */ mtctr r12 -/* 80320D5C 0031DCBC 4E 80 04 21 */ bctrl +/* 80320D5C 0031DCBC 4E 80 04 21 */ bctrl /* 80320D60 0031DCC0 90 7F 00 00 */ stw r3, 0(r31) /* 80320D64 0031DCC4 38 60 00 00 */ li r3, 0 /* 80320D68 0031DCC8 80 01 00 14 */ lwz r0, 0x14(r1) /* 80320D6C 0031DCCC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80320D70 0031DCD0 7C 08 03 A6 */ mtlr r0 /* 80320D74 0031DCD4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80320D78 0031DCD8 4E 80 00 20 */ blr +/* 80320D78 0031DCD8 4E 80 00 20 */ blr .global GetValue__7CIEGTCPCFiRi GetValue__7CIEGTCPCFiRi: @@ -10908,7 +10908,7 @@ GetValue__7CIEGTCPCFiRi: /* 80320D84 0031DCE4 80 84 00 04 */ lwz r4, 4(r4) /* 80320D88 0031DCE8 80 04 02 60 */ lwz r0, 0x260(r4) /* 80320D8C 0031DCEC 90 05 00 00 */ stw r0, 0(r5) -/* 80320D90 0031DCF0 4E 80 00 20 */ blr +/* 80320D90 0031DCF0 4E 80 00 20 */ blr .global GetValue__12CIERealToIntCFiRi GetValue__12CIERealToIntCFiRi: @@ -10930,14 +10930,14 @@ GetValue__12CIERealToIntCFiRi: /* 80320DD0 0031DD30 81 83 00 00 */ lwz r12, 0(r3) /* 80320DD4 0031DD34 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80320DD8 0031DD38 7D 89 03 A6 */ mtctr r12 -/* 80320DDC 0031DD3C 4E 80 04 21 */ bctrl +/* 80320DDC 0031DD3C 4E 80 04 21 */ bctrl /* 80320DE0 0031DD40 80 7D 00 04 */ lwz r3, 4(r29) /* 80320DE4 0031DD44 7F C4 F3 78 */ mr r4, r30 /* 80320DE8 0031DD48 38 A1 00 0C */ addi r5, r1, 0xc /* 80320DEC 0031DD4C 81 83 00 00 */ lwz r12, 0(r3) /* 80320DF0 0031DD50 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80320DF4 0031DD54 7D 89 03 A6 */ mtctr r12 -/* 80320DF8 0031DD58 4E 80 04 21 */ bctrl +/* 80320DF8 0031DD58 4E 80 04 21 */ bctrl /* 80320DFC 0031DD5C C0 21 00 0C */ lfs f1, 0xc(r1) /* 80320E00 0031DD60 38 60 00 00 */ li r3, 0 /* 80320E04 0031DD64 C0 01 00 08 */ lfs f0, 8(r1) @@ -10952,7 +10952,7 @@ GetValue__12CIERealToIntCFiRi: /* 80320E28 0031DD88 80 01 00 34 */ lwz r0, 0x34(r1) /* 80320E2C 0031DD8C 7C 08 03 A6 */ mtlr r0 /* 80320E30 0031DD90 38 21 00 30 */ addi r1, r1, 0x30 -/* 80320E34 0031DD94 4E 80 00 20 */ blr +/* 80320E34 0031DD94 4E 80 00 20 */ blr .global __dt__12CIERealToInt __dt__12CIERealToInt: @@ -10974,7 +10974,7 @@ __dt__12CIERealToInt: /* 80320E74 0031DDD4 38 80 00 01 */ li r4, 1 /* 80320E78 0031DDD8 81 8C 00 08 */ lwz r12, 8(r12) /* 80320E7C 0031DDDC 7D 89 03 A6 */ mtctr r12 -/* 80320E80 0031DDE0 4E 80 04 21 */ bctrl +/* 80320E80 0031DDE0 4E 80 04 21 */ bctrl lbl_80320E84: /* 80320E84 0031DDE4 80 7E 00 08 */ lwz r3, 8(r30) /* 80320E88 0031DDE8 28 03 00 00 */ cmplwi r3, 0 @@ -10983,7 +10983,7 @@ lbl_80320E84: /* 80320E94 0031DDF4 38 80 00 01 */ li r4, 1 /* 80320E98 0031DDF8 81 8C 00 08 */ lwz r12, 8(r12) /* 80320E9C 0031DDFC 7D 89 03 A6 */ mtctr r12 -/* 80320EA0 0031DE00 4E 80 04 21 */ bctrl +/* 80320EA0 0031DE00 4E 80 04 21 */ bctrl lbl_80320EA4: /* 80320EA4 0031DE04 28 1E 00 00 */ cmplwi r30, 0 /* 80320EA8 0031DE08 41 82 00 20 */ beq lbl_80320EC8 @@ -11007,7 +11007,7 @@ lbl_80320EDC: /* 80320EE8 0031DE48 83 C1 00 08 */ lwz r30, 8(r1) /* 80320EEC 0031DE4C 7C 08 03 A6 */ mtlr r0 /* 80320EF0 0031DE50 38 21 00 10 */ addi r1, r1, 0x10 -/* 80320EF4 0031DE54 4E 80 00 20 */ blr +/* 80320EF4 0031DE54 4E 80 00 20 */ blr .global __ct__12CIERealToIntFP12CRealElementP12CRealElement __ct__12CIERealToIntFP12CRealElementP12CRealElement: @@ -11022,7 +11022,7 @@ __ct__12CIERealToIntFP12CRealElementP12CRealElement: /* 80320F18 0031DE78 90 03 00 00 */ stw r0, 0(r3) /* 80320F1C 0031DE7C 90 83 00 04 */ stw r4, 4(r3) /* 80320F20 0031DE80 90 A3 00 08 */ stw r5, 8(r3) -/* 80320F24 0031DE84 4E 80 00 20 */ blr +/* 80320F24 0031DE84 4E 80 00 20 */ blr .global GetValue__11CIESubtractCFiRi GetValue__11CIESubtractCFiRi: @@ -11040,14 +11040,14 @@ GetValue__11CIESubtractCFiRi: /* 80320F54 0031DEB4 81 83 00 00 */ lwz r12, 0(r3) /* 80320F58 0031DEB8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80320F5C 0031DEBC 7D 89 03 A6 */ mtctr r12 -/* 80320F60 0031DEC0 4E 80 04 21 */ bctrl +/* 80320F60 0031DEC0 4E 80 04 21 */ bctrl /* 80320F64 0031DEC4 80 7D 00 08 */ lwz r3, 8(r29) /* 80320F68 0031DEC8 7F C4 F3 78 */ mr r4, r30 /* 80320F6C 0031DECC 38 A1 00 08 */ addi r5, r1, 8 /* 80320F70 0031DED0 81 83 00 00 */ lwz r12, 0(r3) /* 80320F74 0031DED4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80320F78 0031DED8 7D 89 03 A6 */ mtctr r12 -/* 80320F7C 0031DEDC 4E 80 04 21 */ bctrl +/* 80320F7C 0031DEDC 4E 80 04 21 */ bctrl /* 80320F80 0031DEE0 80 81 00 08 */ lwz r4, 8(r1) /* 80320F84 0031DEE4 38 60 00 00 */ li r3, 0 /* 80320F88 0031DEE8 80 01 00 0C */ lwz r0, 0xc(r1) @@ -11059,7 +11059,7 @@ GetValue__11CIESubtractCFiRi: /* 80320FA0 0031DF00 80 01 00 24 */ lwz r0, 0x24(r1) /* 80320FA4 0031DF04 7C 08 03 A6 */ mtlr r0 /* 80320FA8 0031DF08 38 21 00 20 */ addi r1, r1, 0x20 -/* 80320FAC 0031DF0C 4E 80 00 20 */ blr +/* 80320FAC 0031DF0C 4E 80 00 20 */ blr .global __dt__11CIESubtract __dt__11CIESubtract: @@ -11081,7 +11081,7 @@ __dt__11CIESubtract: /* 80320FEC 0031DF4C 38 80 00 01 */ li r4, 1 /* 80320FF0 0031DF50 81 8C 00 08 */ lwz r12, 8(r12) /* 80320FF4 0031DF54 7D 89 03 A6 */ mtctr r12 -/* 80320FF8 0031DF58 4E 80 04 21 */ bctrl +/* 80320FF8 0031DF58 4E 80 04 21 */ bctrl lbl_80320FFC: /* 80320FFC 0031DF5C 80 7E 00 08 */ lwz r3, 8(r30) /* 80321000 0031DF60 28 03 00 00 */ cmplwi r3, 0 @@ -11090,7 +11090,7 @@ lbl_80320FFC: /* 8032100C 0031DF6C 38 80 00 01 */ li r4, 1 /* 80321010 0031DF70 81 8C 00 08 */ lwz r12, 8(r12) /* 80321014 0031DF74 7D 89 03 A6 */ mtctr r12 -/* 80321018 0031DF78 4E 80 04 21 */ bctrl +/* 80321018 0031DF78 4E 80 04 21 */ bctrl lbl_8032101C: /* 8032101C 0031DF7C 28 1E 00 00 */ cmplwi r30, 0 /* 80321020 0031DF80 41 82 00 20 */ beq lbl_80321040 @@ -11114,7 +11114,7 @@ lbl_80321054: /* 80321060 0031DFC0 83 C1 00 08 */ lwz r30, 8(r1) /* 80321064 0031DFC4 7C 08 03 A6 */ mtlr r0 /* 80321068 0031DFC8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8032106C 0031DFCC 4E 80 00 20 */ blr +/* 8032106C 0031DFCC 4E 80 00 20 */ blr .global __ct__11CIESubtractFP11CIntElementP11CIntElement __ct__11CIESubtractFP11CIntElementP11CIntElement: @@ -11129,7 +11129,7 @@ __ct__11CIESubtractFP11CIntElementP11CIntElement: /* 80321090 0031DFF0 90 03 00 00 */ stw r0, 0(r3) /* 80321094 0031DFF4 90 83 00 04 */ stw r4, 4(r3) /* 80321098 0031DFF8 90 A3 00 08 */ stw r5, 8(r3) -/* 8032109C 0031DFFC 4E 80 00 20 */ blr +/* 8032109C 0031DFFC 4E 80 00 20 */ blr .global GetValue__18CIEKeyframeEmitterCFiRi GetValue__18CIEKeyframeEmitterCFiRi: @@ -11221,7 +11221,7 @@ lbl_803211D8: /* 803211D8 0031E138 38 60 00 00 */ li r3, 0 lbl_803211DC: /* 803211DC 0031E13C 38 21 00 30 */ addi r1, r1, 0x30 -/* 803211E0 0031E140 4E 80 00 20 */ blr +/* 803211E0 0031E140 4E 80 00 20 */ blr .global __dt__18CIEKeyframeEmitter __dt__18CIEKeyframeEmitter: @@ -11279,7 +11279,7 @@ lbl_80321290: /* 8032129C 0031E1FC 83 C1 00 18 */ lwz r30, 0x18(r1) /* 803212A0 0031E200 7C 08 03 A6 */ mtlr r0 /* 803212A4 0031E204 38 21 00 20 */ addi r1, r1, 0x20 -/* 803212A8 0031E208 4E 80 00 20 */ blr +/* 803212A8 0031E208 4E 80 00 20 */ blr .global __ct__18CIEKeyframeEmitterFR12CInputStream __ct__18CIEKeyframeEmitterFR12CInputStream: @@ -11364,7 +11364,7 @@ lbl_803213C0: /* 803213D0 0031E330 80 01 00 24 */ lwz r0, 0x24(r1) /* 803213D4 0031E334 7C 08 03 A6 */ mtlr r0 /* 803213D8 0031E338 38 21 00 20 */ addi r1, r1, 0x20 -/* 803213DC 0031E33C 4E 80 00 20 */ blr +/* 803213DC 0031E33C 4E 80 00 20 */ blr .global GetValue__18CIELifetimePercentCFiRi GetValue__18CIELifetimePercentCFiRi: @@ -11380,7 +11380,7 @@ GetValue__18CIELifetimePercentCFiRi: /* 80321404 0031E364 81 83 00 00 */ lwz r12, 0(r3) /* 80321408 0031E368 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8032140C 0031E36C 7D 89 03 A6 */ mtctr r12 -/* 80321410 0031E370 4E 80 04 21 */ bctrl +/* 80321410 0031E370 4E 80 04 21 */ bctrl /* 80321414 0031E374 80 01 00 08 */ lwz r0, 8(r1) /* 80321418 0031E378 2C 00 00 00 */ cmpwi r0, 0 /* 8032141C 0031E37C 40 80 00 0C */ bge lbl_80321428 @@ -11409,7 +11409,7 @@ lbl_80321428: /* 80321474 0031E3D4 80 01 00 34 */ lwz r0, 0x34(r1) /* 80321478 0031E3D8 7C 08 03 A6 */ mtlr r0 /* 8032147C 0031E3DC 38 21 00 30 */ addi r1, r1, 0x30 -/* 80321480 0031E3E0 4E 80 00 20 */ blr +/* 80321480 0031E3E0 4E 80 00 20 */ blr .global __dt__18CIELifetimePercent __dt__18CIELifetimePercent: @@ -11431,7 +11431,7 @@ __dt__18CIELifetimePercent: /* 803214C0 0031E420 38 80 00 01 */ li r4, 1 /* 803214C4 0031E424 81 8C 00 08 */ lwz r12, 8(r12) /* 803214C8 0031E428 7D 89 03 A6 */ mtctr r12 -/* 803214CC 0031E42C 4E 80 04 21 */ bctrl +/* 803214CC 0031E42C 4E 80 04 21 */ bctrl lbl_803214D0: /* 803214D0 0031E430 28 1E 00 00 */ cmplwi r30, 0 /* 803214D4 0031E434 41 82 00 20 */ beq lbl_803214F4 @@ -11455,7 +11455,7 @@ lbl_80321508: /* 80321514 0031E474 83 C1 00 08 */ lwz r30, 8(r1) /* 80321518 0031E478 7C 08 03 A6 */ mtlr r0 /* 8032151C 0031E47C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80321520 0031E480 4E 80 00 20 */ blr +/* 80321520 0031E480 4E 80 00 20 */ blr .global __ct__18CIELifetimePercentFP11CIntElement __ct__18CIELifetimePercentFP11CIntElement: @@ -11469,7 +11469,7 @@ __ct__18CIELifetimePercentFP11CIntElement: /* 80321540 0031E4A0 90 C3 00 00 */ stw r6, 0(r3) /* 80321544 0031E4A4 90 03 00 00 */ stw r0, 0(r3) /* 80321548 0031E4A8 90 83 00 04 */ stw r4, 4(r3) -/* 8032154C 0031E4AC 4E 80 00 20 */ blr +/* 8032154C 0031E4AC 4E 80 00 20 */ blr .global GetValue__8CIEPulseCFiRi GetValue__8CIEPulseCFiRi: @@ -11487,14 +11487,14 @@ GetValue__8CIEPulseCFiRi: /* 8032157C 0031E4DC 81 83 00 00 */ lwz r12, 0(r3) /* 80321580 0031E4E0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80321584 0031E4E4 7D 89 03 A6 */ mtctr r12 -/* 80321588 0031E4E8 4E 80 04 21 */ bctrl +/* 80321588 0031E4E8 4E 80 04 21 */ bctrl /* 8032158C 0031E4EC 80 7D 00 08 */ lwz r3, 8(r29) /* 80321590 0031E4F0 7F C4 F3 78 */ mr r4, r30 /* 80321594 0031E4F4 38 A1 00 08 */ addi r5, r1, 8 /* 80321598 0031E4F8 81 83 00 00 */ lwz r12, 0(r3) /* 8032159C 0031E4FC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803215A0 0031E500 7D 89 03 A6 */ mtctr r12 -/* 803215A4 0031E504 4E 80 04 21 */ bctrl +/* 803215A4 0031E504 4E 80 04 21 */ bctrl /* 803215A8 0031E508 80 61 00 08 */ lwz r3, 8(r1) /* 803215AC 0031E50C 80 81 00 0C */ lwz r4, 0xc(r1) /* 803215B0 0031E510 38 A3 00 01 */ addi r5, r3, 1 @@ -11515,7 +11515,7 @@ lbl_803215C0: /* 803215E8 0031E548 81 83 00 00 */ lwz r12, 0(r3) /* 803215EC 0031E54C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803215F0 0031E550 7D 89 03 A6 */ mtctr r12 -/* 803215F4 0031E554 4E 80 04 21 */ bctrl +/* 803215F4 0031E554 4E 80 04 21 */ bctrl /* 803215F8 0031E558 48 00 00 40 */ b lbl_80321638 lbl_803215FC: /* 803215FC 0031E55C 80 7D 00 0C */ lwz r3, 0xc(r29) @@ -11524,7 +11524,7 @@ lbl_803215FC: /* 80321608 0031E568 81 83 00 00 */ lwz r12, 0(r3) /* 8032160C 0031E56C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80321610 0031E570 7D 89 03 A6 */ mtctr r12 -/* 80321614 0031E574 4E 80 04 21 */ bctrl +/* 80321614 0031E574 4E 80 04 21 */ bctrl /* 80321618 0031E578 48 00 00 20 */ b lbl_80321638 lbl_8032161C: /* 8032161C 0031E57C 80 7D 00 0C */ lwz r3, 0xc(r29) @@ -11533,7 +11533,7 @@ lbl_8032161C: /* 80321628 0031E588 81 83 00 00 */ lwz r12, 0(r3) /* 8032162C 0031E58C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80321630 0031E590 7D 89 03 A6 */ mtctr r12 -/* 80321634 0031E594 4E 80 04 21 */ bctrl +/* 80321634 0031E594 4E 80 04 21 */ bctrl lbl_80321638: /* 80321638 0031E598 80 01 00 24 */ lwz r0, 0x24(r1) /* 8032163C 0031E59C 38 60 00 00 */ li r3, 0 @@ -11542,7 +11542,7 @@ lbl_80321638: /* 80321648 0031E5A8 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8032164C 0031E5AC 7C 08 03 A6 */ mtlr r0 /* 80321650 0031E5B0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80321654 0031E5B4 4E 80 00 20 */ blr +/* 80321654 0031E5B4 4E 80 00 20 */ blr .global __dt__8CIEPulse __dt__8CIEPulse: @@ -11564,7 +11564,7 @@ __dt__8CIEPulse: /* 80321694 0031E5F4 38 80 00 01 */ li r4, 1 /* 80321698 0031E5F8 81 8C 00 08 */ lwz r12, 8(r12) /* 8032169C 0031E5FC 7D 89 03 A6 */ mtctr r12 -/* 803216A0 0031E600 4E 80 04 21 */ bctrl +/* 803216A0 0031E600 4E 80 04 21 */ bctrl lbl_803216A4: /* 803216A4 0031E604 80 7E 00 08 */ lwz r3, 8(r30) /* 803216A8 0031E608 28 03 00 00 */ cmplwi r3, 0 @@ -11573,7 +11573,7 @@ lbl_803216A4: /* 803216B4 0031E614 38 80 00 01 */ li r4, 1 /* 803216B8 0031E618 81 8C 00 08 */ lwz r12, 8(r12) /* 803216BC 0031E61C 7D 89 03 A6 */ mtctr r12 -/* 803216C0 0031E620 4E 80 04 21 */ bctrl +/* 803216C0 0031E620 4E 80 04 21 */ bctrl lbl_803216C4: /* 803216C4 0031E624 80 7E 00 0C */ lwz r3, 0xc(r30) /* 803216C8 0031E628 28 03 00 00 */ cmplwi r3, 0 @@ -11582,7 +11582,7 @@ lbl_803216C4: /* 803216D4 0031E634 38 80 00 01 */ li r4, 1 /* 803216D8 0031E638 81 8C 00 08 */ lwz r12, 8(r12) /* 803216DC 0031E63C 7D 89 03 A6 */ mtctr r12 -/* 803216E0 0031E640 4E 80 04 21 */ bctrl +/* 803216E0 0031E640 4E 80 04 21 */ bctrl lbl_803216E4: /* 803216E4 0031E644 80 7E 00 10 */ lwz r3, 0x10(r30) /* 803216E8 0031E648 28 03 00 00 */ cmplwi r3, 0 @@ -11591,7 +11591,7 @@ lbl_803216E4: /* 803216F4 0031E654 38 80 00 01 */ li r4, 1 /* 803216F8 0031E658 81 8C 00 08 */ lwz r12, 8(r12) /* 803216FC 0031E65C 7D 89 03 A6 */ mtctr r12 -/* 80321700 0031E660 4E 80 04 21 */ bctrl +/* 80321700 0031E660 4E 80 04 21 */ bctrl lbl_80321704: /* 80321704 0031E664 28 1E 00 00 */ cmplwi r30, 0 /* 80321708 0031E668 41 82 00 20 */ beq lbl_80321728 @@ -11615,7 +11615,7 @@ lbl_8032173C: /* 80321748 0031E6A8 83 C1 00 08 */ lwz r30, 8(r1) /* 8032174C 0031E6AC 7C 08 03 A6 */ mtlr r0 /* 80321750 0031E6B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80321754 0031E6B4 4E 80 00 20 */ blr +/* 80321754 0031E6B4 4E 80 00 20 */ blr .global __ct__8CIEPulseFP11CIntElementP11CIntElementP11CIntElementP11CIntElement __ct__8CIEPulseFP11CIntElementP11CIntElementP11CIntElementP11CIntElement: @@ -11632,7 +11632,7 @@ __ct__8CIEPulseFP11CIntElementP11CIntElementP11CIntElementP11CIntElement: /* 80321780 0031E6E0 90 A3 00 08 */ stw r5, 8(r3) /* 80321784 0031E6E4 90 C3 00 0C */ stw r6, 0xc(r3) /* 80321788 0031E6E8 90 E3 00 10 */ stw r7, 0x10(r3) -/* 8032178C 0031E6EC 4E 80 00 20 */ blr +/* 8032178C 0031E6EC 4E 80 00 20 */ blr .global GetValue__8CIEClampCFiRi GetValue__8CIEClampCFiRi: @@ -11650,21 +11650,21 @@ GetValue__8CIEClampCFiRi: /* 803217BC 0031E71C 81 83 00 00 */ lwz r12, 0(r3) /* 803217C0 0031E720 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803217C4 0031E724 7D 89 03 A6 */ mtctr r12 -/* 803217C8 0031E728 4E 80 04 21 */ bctrl +/* 803217C8 0031E728 4E 80 04 21 */ bctrl /* 803217CC 0031E72C 80 7D 00 08 */ lwz r3, 8(r29) /* 803217D0 0031E730 7F C4 F3 78 */ mr r4, r30 /* 803217D4 0031E734 38 A1 00 08 */ addi r5, r1, 8 /* 803217D8 0031E738 81 83 00 00 */ lwz r12, 0(r3) /* 803217DC 0031E73C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803217E0 0031E740 7D 89 03 A6 */ mtctr r12 -/* 803217E4 0031E744 4E 80 04 21 */ bctrl +/* 803217E4 0031E744 4E 80 04 21 */ bctrl /* 803217E8 0031E748 80 7D 00 0C */ lwz r3, 0xc(r29) /* 803217EC 0031E74C 7F C4 F3 78 */ mr r4, r30 /* 803217F0 0031E750 7F E5 FB 78 */ mr r5, r31 /* 803217F4 0031E754 81 83 00 00 */ lwz r12, 0(r3) /* 803217F8 0031E758 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803217FC 0031E75C 7D 89 03 A6 */ mtctr r12 -/* 80321800 0031E760 4E 80 04 21 */ bctrl +/* 80321800 0031E760 4E 80 04 21 */ bctrl /* 80321804 0031E764 80 1F 00 00 */ lwz r0, 0(r31) /* 80321808 0031E768 80 61 00 08 */ lwz r3, 8(r1) /* 8032180C 0031E76C 7C 00 18 00 */ cmpw r0, r3 @@ -11684,7 +11684,7 @@ lbl_8032182C: /* 8032183C 0031E79C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80321840 0031E7A0 7C 08 03 A6 */ mtlr r0 /* 80321844 0031E7A4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80321848 0031E7A8 4E 80 00 20 */ blr +/* 80321848 0031E7A8 4E 80 00 20 */ blr .global __dt__8CIEClamp __dt__8CIEClamp: @@ -11706,7 +11706,7 @@ __dt__8CIEClamp: /* 80321888 0031E7E8 38 80 00 01 */ li r4, 1 /* 8032188C 0031E7EC 81 8C 00 08 */ lwz r12, 8(r12) /* 80321890 0031E7F0 7D 89 03 A6 */ mtctr r12 -/* 80321894 0031E7F4 4E 80 04 21 */ bctrl +/* 80321894 0031E7F4 4E 80 04 21 */ bctrl lbl_80321898: /* 80321898 0031E7F8 80 7E 00 08 */ lwz r3, 8(r30) /* 8032189C 0031E7FC 28 03 00 00 */ cmplwi r3, 0 @@ -11715,7 +11715,7 @@ lbl_80321898: /* 803218A8 0031E808 38 80 00 01 */ li r4, 1 /* 803218AC 0031E80C 81 8C 00 08 */ lwz r12, 8(r12) /* 803218B0 0031E810 7D 89 03 A6 */ mtctr r12 -/* 803218B4 0031E814 4E 80 04 21 */ bctrl +/* 803218B4 0031E814 4E 80 04 21 */ bctrl lbl_803218B8: /* 803218B8 0031E818 80 7E 00 0C */ lwz r3, 0xc(r30) /* 803218BC 0031E81C 28 03 00 00 */ cmplwi r3, 0 @@ -11724,7 +11724,7 @@ lbl_803218B8: /* 803218C8 0031E828 38 80 00 01 */ li r4, 1 /* 803218CC 0031E82C 81 8C 00 08 */ lwz r12, 8(r12) /* 803218D0 0031E830 7D 89 03 A6 */ mtctr r12 -/* 803218D4 0031E834 4E 80 04 21 */ bctrl +/* 803218D4 0031E834 4E 80 04 21 */ bctrl lbl_803218D8: /* 803218D8 0031E838 28 1E 00 00 */ cmplwi r30, 0 /* 803218DC 0031E83C 41 82 00 20 */ beq lbl_803218FC @@ -11748,7 +11748,7 @@ lbl_80321910: /* 8032191C 0031E87C 83 C1 00 08 */ lwz r30, 8(r1) /* 80321920 0031E880 7C 08 03 A6 */ mtlr r0 /* 80321924 0031E884 38 21 00 10 */ addi r1, r1, 0x10 -/* 80321928 0031E888 4E 80 00 20 */ blr +/* 80321928 0031E888 4E 80 00 20 */ blr .global __ct__8CIEClampFP11CIntElementP11CIntElementP11CIntElement __ct__8CIEClampFP11CIntElementP11CIntElementP11CIntElement: @@ -11764,7 +11764,7 @@ __ct__8CIEClampFP11CIntElementP11CIntElementP11CIntElement: /* 80321950 0031E8B0 90 83 00 04 */ stw r4, 4(r3) /* 80321954 0031E8B4 90 A3 00 08 */ stw r5, 8(r3) /* 80321958 0031E8B8 90 C3 00 0C */ stw r6, 0xc(r3) -/* 8032195C 0031E8BC 4E 80 00 20 */ blr +/* 8032195C 0031E8BC 4E 80 00 20 */ blr .global GetValue__12CIETimeChainCFiRi GetValue__12CIETimeChainCFiRi: @@ -11782,7 +11782,7 @@ GetValue__12CIETimeChainCFiRi: /* 8032198C 0031E8EC 81 83 00 00 */ lwz r12, 0(r3) /* 80321990 0031E8F0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80321994 0031E8F4 7D 89 03 A6 */ mtctr r12 -/* 80321998 0031E8F8 4E 80 04 21 */ bctrl +/* 80321998 0031E8F8 4E 80 04 21 */ bctrl /* 8032199C 0031E8FC 80 01 00 08 */ lwz r0, 8(r1) /* 803219A0 0031E900 7C 1E 00 00 */ cmpw r30, r0 /* 803219A4 0031E904 40 80 00 24 */ bge lbl_803219C8 @@ -11792,7 +11792,7 @@ GetValue__12CIETimeChainCFiRi: /* 803219B4 0031E914 81 83 00 00 */ lwz r12, 0(r3) /* 803219B8 0031E918 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803219BC 0031E91C 7D 89 03 A6 */ mtctr r12 -/* 803219C0 0031E920 4E 80 04 21 */ bctrl +/* 803219C0 0031E920 4E 80 04 21 */ bctrl /* 803219C4 0031E924 48 00 00 20 */ b lbl_803219E4 lbl_803219C8: /* 803219C8 0031E928 80 7D 00 08 */ lwz r3, 8(r29) @@ -11801,7 +11801,7 @@ lbl_803219C8: /* 803219D4 0031E934 81 83 00 00 */ lwz r12, 0(r3) /* 803219D8 0031E938 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803219DC 0031E93C 7D 89 03 A6 */ mtctr r12 -/* 803219E0 0031E940 4E 80 04 21 */ bctrl +/* 803219E0 0031E940 4E 80 04 21 */ bctrl lbl_803219E4: /* 803219E4 0031E944 80 01 00 24 */ lwz r0, 0x24(r1) /* 803219E8 0031E948 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -11809,7 +11809,7 @@ lbl_803219E4: /* 803219F0 0031E950 83 A1 00 14 */ lwz r29, 0x14(r1) /* 803219F4 0031E954 7C 08 03 A6 */ mtlr r0 /* 803219F8 0031E958 38 21 00 20 */ addi r1, r1, 0x20 -/* 803219FC 0031E95C 4E 80 00 20 */ blr +/* 803219FC 0031E95C 4E 80 00 20 */ blr .global __dt__12CIETimeChain __dt__12CIETimeChain: @@ -11831,7 +11831,7 @@ __dt__12CIETimeChain: /* 80321A3C 0031E99C 38 80 00 01 */ li r4, 1 /* 80321A40 0031E9A0 81 8C 00 08 */ lwz r12, 8(r12) /* 80321A44 0031E9A4 7D 89 03 A6 */ mtctr r12 -/* 80321A48 0031E9A8 4E 80 04 21 */ bctrl +/* 80321A48 0031E9A8 4E 80 04 21 */ bctrl lbl_80321A4C: /* 80321A4C 0031E9AC 80 7E 00 08 */ lwz r3, 8(r30) /* 80321A50 0031E9B0 28 03 00 00 */ cmplwi r3, 0 @@ -11840,7 +11840,7 @@ lbl_80321A4C: /* 80321A5C 0031E9BC 38 80 00 01 */ li r4, 1 /* 80321A60 0031E9C0 81 8C 00 08 */ lwz r12, 8(r12) /* 80321A64 0031E9C4 7D 89 03 A6 */ mtctr r12 -/* 80321A68 0031E9C8 4E 80 04 21 */ bctrl +/* 80321A68 0031E9C8 4E 80 04 21 */ bctrl lbl_80321A6C: /* 80321A6C 0031E9CC 80 7E 00 0C */ lwz r3, 0xc(r30) /* 80321A70 0031E9D0 28 03 00 00 */ cmplwi r3, 0 @@ -11849,7 +11849,7 @@ lbl_80321A6C: /* 80321A7C 0031E9DC 38 80 00 01 */ li r4, 1 /* 80321A80 0031E9E0 81 8C 00 08 */ lwz r12, 8(r12) /* 80321A84 0031E9E4 7D 89 03 A6 */ mtctr r12 -/* 80321A88 0031E9E8 4E 80 04 21 */ bctrl +/* 80321A88 0031E9E8 4E 80 04 21 */ bctrl lbl_80321A8C: /* 80321A8C 0031E9EC 28 1E 00 00 */ cmplwi r30, 0 /* 80321A90 0031E9F0 41 82 00 20 */ beq lbl_80321AB0 @@ -11873,7 +11873,7 @@ lbl_80321AC4: /* 80321AD0 0031EA30 83 C1 00 08 */ lwz r30, 8(r1) /* 80321AD4 0031EA34 7C 08 03 A6 */ mtlr r0 /* 80321AD8 0031EA38 38 21 00 10 */ addi r1, r1, 0x10 -/* 80321ADC 0031EA3C 4E 80 00 20 */ blr +/* 80321ADC 0031EA3C 4E 80 00 20 */ blr .global __ct__12CIETimeChainFP11CIntElementP11CIntElementP11CIntElement __ct__12CIETimeChainFP11CIntElementP11CIntElementP11CIntElement: @@ -11889,7 +11889,7 @@ __ct__12CIETimeChainFP11CIntElementP11CIntElementP11CIntElement: /* 80321B04 0031EA64 90 83 00 04 */ stw r4, 4(r3) /* 80321B08 0031EA68 90 A3 00 08 */ stw r5, 8(r3) /* 80321B0C 0031EA6C 90 C3 00 0C */ stw r6, 0xc(r3) -/* 80321B10 0031EA70 4E 80 00 20 */ blr +/* 80321B10 0031EA70 4E 80 00 20 */ blr .global GetValue__16CIEInitialRandomCFiRi GetValue__16CIEInitialRandomCFiRi: @@ -11908,14 +11908,14 @@ GetValue__16CIEInitialRandomCFiRi: /* 80321B44 0031EAA4 81 83 00 00 */ lwz r12, 0(r3) /* 80321B48 0031EAA8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80321B4C 0031EAAC 7D 89 03 A6 */ mtctr r12 -/* 80321B50 0031EAB0 4E 80 04 21 */ bctrl +/* 80321B50 0031EAB0 4E 80 04 21 */ bctrl /* 80321B54 0031EAB4 80 7D 00 08 */ lwz r3, 8(r29) /* 80321B58 0031EAB8 7F C4 F3 78 */ mr r4, r30 /* 80321B5C 0031EABC 38 A1 00 08 */ addi r5, r1, 8 /* 80321B60 0031EAC0 81 83 00 00 */ lwz r12, 0(r3) /* 80321B64 0031EAC4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80321B68 0031EAC8 7D 89 03 A6 */ mtctr r12 -/* 80321B6C 0031EACC 4E 80 04 21 */ bctrl +/* 80321B6C 0031EACC 4E 80 04 21 */ bctrl /* 80321B70 0031EAD0 4B FF 0A 8D */ bl GetRandomNumber__9CRandom16Fv /* 80321B74 0031EAD4 80 81 00 0C */ lwz r4, 0xc(r1) /* 80321B78 0031EAD8 80 A1 00 08 */ lwz r5, 8(r1) @@ -11929,7 +11929,7 @@ lbl_80321B84: /* 80321B94 0031EAF4 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80321B98 0031EAF8 7C 08 03 A6 */ mtlr r0 /* 80321B9C 0031EAFC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80321BA0 0031EB00 4E 80 00 20 */ blr +/* 80321BA0 0031EB00 4E 80 00 20 */ blr .global __dt__16CIEInitialRandom __dt__16CIEInitialRandom: @@ -11951,7 +11951,7 @@ __dt__16CIEInitialRandom: /* 80321BE0 0031EB40 38 80 00 01 */ li r4, 1 /* 80321BE4 0031EB44 81 8C 00 08 */ lwz r12, 8(r12) /* 80321BE8 0031EB48 7D 89 03 A6 */ mtctr r12 -/* 80321BEC 0031EB4C 4E 80 04 21 */ bctrl +/* 80321BEC 0031EB4C 4E 80 04 21 */ bctrl lbl_80321BF0: /* 80321BF0 0031EB50 80 7E 00 08 */ lwz r3, 8(r30) /* 80321BF4 0031EB54 28 03 00 00 */ cmplwi r3, 0 @@ -11960,7 +11960,7 @@ lbl_80321BF0: /* 80321C00 0031EB60 38 80 00 01 */ li r4, 1 /* 80321C04 0031EB64 81 8C 00 08 */ lwz r12, 8(r12) /* 80321C08 0031EB68 7D 89 03 A6 */ mtctr r12 -/* 80321C0C 0031EB6C 4E 80 04 21 */ bctrl +/* 80321C0C 0031EB6C 4E 80 04 21 */ bctrl lbl_80321C10: /* 80321C10 0031EB70 28 1E 00 00 */ cmplwi r30, 0 /* 80321C14 0031EB74 41 82 00 20 */ beq lbl_80321C34 @@ -11984,7 +11984,7 @@ lbl_80321C48: /* 80321C54 0031EBB4 83 C1 00 08 */ lwz r30, 8(r1) /* 80321C58 0031EBB8 7C 08 03 A6 */ mtlr r0 /* 80321C5C 0031EBBC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80321C60 0031EBC0 4E 80 00 20 */ blr +/* 80321C60 0031EBC0 4E 80 00 20 */ blr .global __ct__16CIEInitialRandomFP11CIntElementP11CIntElement __ct__16CIEInitialRandomFP11CIntElementP11CIntElement: @@ -11999,7 +11999,7 @@ __ct__16CIEInitialRandomFP11CIntElementP11CIntElement: /* 80321C84 0031EBE4 90 03 00 00 */ stw r0, 0(r3) /* 80321C88 0031EBE8 90 83 00 04 */ stw r4, 4(r3) /* 80321C8C 0031EBEC 90 A3 00 08 */ stw r5, 8(r3) -/* 80321C90 0031EBF0 4E 80 00 20 */ blr +/* 80321C90 0031EBF0 4E 80 00 20 */ blr .global GetValue__12CIETimescaleCFiRi GetValue__12CIETimescaleCFiRi: @@ -12015,7 +12015,7 @@ GetValue__12CIETimescaleCFiRi: /* 80321CB8 0031EC18 81 83 00 00 */ lwz r12, 0(r3) /* 80321CBC 0031EC1C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80321CC0 0031EC20 7D 89 03 A6 */ mtctr r12 -/* 80321CC4 0031EC24 4E 80 04 21 */ bctrl +/* 80321CC4 0031EC24 4E 80 04 21 */ bctrl /* 80321CC8 0031EC28 6F C3 80 00 */ xoris r3, r30, 0x8000 /* 80321CCC 0031EC2C 3C 00 43 30 */ lis r0, 0x4330 /* 80321CD0 0031EC30 90 61 00 14 */ stw r3, 0x14(r1) @@ -12035,7 +12035,7 @@ GetValue__12CIETimescaleCFiRi: /* 80321D08 0031EC68 80 01 00 34 */ lwz r0, 0x34(r1) /* 80321D0C 0031EC6C 7C 08 03 A6 */ mtlr r0 /* 80321D10 0031EC70 38 21 00 30 */ addi r1, r1, 0x30 -/* 80321D14 0031EC74 4E 80 00 20 */ blr +/* 80321D14 0031EC74 4E 80 00 20 */ blr .global __dt__12CIETimeScale __dt__12CIETimeScale: @@ -12057,7 +12057,7 @@ __dt__12CIETimeScale: /* 80321D54 0031ECB4 38 80 00 01 */ li r4, 1 /* 80321D58 0031ECB8 81 8C 00 08 */ lwz r12, 8(r12) /* 80321D5C 0031ECBC 7D 89 03 A6 */ mtctr r12 -/* 80321D60 0031ECC0 4E 80 04 21 */ bctrl +/* 80321D60 0031ECC0 4E 80 04 21 */ bctrl lbl_80321D64: /* 80321D64 0031ECC4 28 1E 00 00 */ cmplwi r30, 0 /* 80321D68 0031ECC8 41 82 00 20 */ beq lbl_80321D88 @@ -12081,7 +12081,7 @@ lbl_80321D9C: /* 80321DA8 0031ED08 83 C1 00 08 */ lwz r30, 8(r1) /* 80321DAC 0031ED0C 7C 08 03 A6 */ mtlr r0 /* 80321DB0 0031ED10 38 21 00 10 */ addi r1, r1, 0x10 -/* 80321DB4 0031ED14 4E 80 00 20 */ blr +/* 80321DB4 0031ED14 4E 80 00 20 */ blr .global __ct__12CIETimescaleFP12CRealElement __ct__12CIETimescaleFP12CRealElement: @@ -12095,7 +12095,7 @@ __ct__12CIETimescaleFP12CRealElement: /* 80321DD4 0031ED34 90 C3 00 00 */ stw r6, 0(r3) /* 80321DD8 0031ED38 90 03 00 00 */ stw r0, 0(r3) /* 80321DDC 0031ED3C 90 83 00 04 */ stw r4, 4(r3) -/* 80321DE0 0031ED40 4E 80 00 20 */ blr +/* 80321DE0 0031ED40 4E 80 00 20 */ blr .global GetValue__10CIEImpulseCFiRi GetValue__10CIEImpulseCFiRi: @@ -12108,7 +12108,7 @@ GetValue__10CIEImpulseCFiRi: /* 80321DFC 0031ED5C 81 83 00 00 */ lwz r12, 0(r3) /* 80321E00 0031ED60 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80321E04 0031ED64 7D 89 03 A6 */ mtctr r12 -/* 80321E08 0031ED68 4E 80 04 21 */ bctrl +/* 80321E08 0031ED68 4E 80 04 21 */ bctrl /* 80321E0C 0031ED6C 48 00 00 0C */ b lbl_80321E18 lbl_80321E10: /* 80321E10 0031ED70 38 00 00 00 */ li r0, 0 @@ -12118,7 +12118,7 @@ lbl_80321E18: /* 80321E1C 0031ED7C 38 60 00 00 */ li r3, 0 /* 80321E20 0031ED80 7C 08 03 A6 */ mtlr r0 /* 80321E24 0031ED84 38 21 00 10 */ addi r1, r1, 0x10 -/* 80321E28 0031ED88 4E 80 00 20 */ blr +/* 80321E28 0031ED88 4E 80 00 20 */ blr .global __dt__10CIEImpulse __dt__10CIEImpulse: @@ -12140,7 +12140,7 @@ __dt__10CIEImpulse: /* 80321E68 0031EDC8 38 80 00 01 */ li r4, 1 /* 80321E6C 0031EDCC 81 8C 00 08 */ lwz r12, 8(r12) /* 80321E70 0031EDD0 7D 89 03 A6 */ mtctr r12 -/* 80321E74 0031EDD4 4E 80 04 21 */ bctrl +/* 80321E74 0031EDD4 4E 80 04 21 */ bctrl lbl_80321E78: /* 80321E78 0031EDD8 28 1E 00 00 */ cmplwi r30, 0 /* 80321E7C 0031EDDC 41 82 00 20 */ beq lbl_80321E9C @@ -12164,7 +12164,7 @@ lbl_80321EB0: /* 80321EBC 0031EE1C 83 C1 00 08 */ lwz r30, 8(r1) /* 80321EC0 0031EE20 7C 08 03 A6 */ mtlr r0 /* 80321EC4 0031EE24 38 21 00 10 */ addi r1, r1, 0x10 -/* 80321EC8 0031EE28 4E 80 00 20 */ blr +/* 80321EC8 0031EE28 4E 80 00 20 */ blr .global __ct__10CIEImpulseFP11CIntElement __ct__10CIEImpulseFP11CIntElement: @@ -12178,7 +12178,7 @@ __ct__10CIEImpulseFP11CIntElement: /* 80321EE8 0031EE48 90 C3 00 00 */ stw r6, 0(r3) /* 80321EEC 0031EE4C 90 03 00 00 */ stw r0, 0(r3) /* 80321EF0 0031EE50 90 83 00 04 */ stw r4, 4(r3) -/* 80321EF4 0031EE54 4E 80 00 20 */ blr +/* 80321EF4 0031EE54 4E 80 00 20 */ blr .global GetValue__16CIESampleAndHoldCFiRi GetValue__16CIESampleAndHoldCFiRi: @@ -12199,14 +12199,14 @@ GetValue__16CIESampleAndHoldCFiRi: /* 80321F30 0031EE90 81 83 00 00 */ lwz r12, 0(r3) /* 80321F34 0031EE94 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80321F38 0031EE98 7D 89 03 A6 */ mtctr r12 -/* 80321F3C 0031EE9C 4E 80 04 21 */ bctrl +/* 80321F3C 0031EE9C 4E 80 04 21 */ bctrl /* 80321F40 0031EEA0 80 7D 00 10 */ lwz r3, 0x10(r29) /* 80321F44 0031EEA4 7F C4 F3 78 */ mr r4, r30 /* 80321F48 0031EEA8 38 A1 00 08 */ addi r5, r1, 8 /* 80321F4C 0031EEAC 81 83 00 00 */ lwz r12, 0(r3) /* 80321F50 0031EEB0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80321F54 0031EEB4 7D 89 03 A6 */ mtctr r12 -/* 80321F58 0031EEB8 4E 80 04 21 */ bctrl +/* 80321F58 0031EEB8 4E 80 04 21 */ bctrl /* 80321F5C 0031EEBC 4B FF 06 A1 */ bl GetRandomNumber__9CRandom16Fv /* 80321F60 0031EEC0 80 81 00 0C */ lwz r4, 0xc(r1) /* 80321F64 0031EEC4 80 A1 00 08 */ lwz r5, 8(r1) @@ -12219,7 +12219,7 @@ GetValue__16CIESampleAndHoldCFiRi: /* 80321F80 0031EEE0 81 83 00 00 */ lwz r12, 0(r3) /* 80321F84 0031EEE4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80321F88 0031EEE8 7D 89 03 A6 */ mtctr r12 -/* 80321F8C 0031EEEC 4E 80 04 21 */ bctrl +/* 80321F8C 0031EEEC 4E 80 04 21 */ bctrl /* 80321F90 0031EEF0 80 1F 00 00 */ lwz r0, 0(r31) /* 80321F94 0031EEF4 90 1D 00 14 */ stw r0, 0x14(r29) /* 80321F98 0031EEF8 48 00 00 10 */ b lbl_80321FA8 @@ -12234,7 +12234,7 @@ lbl_80321FA8: /* 80321FB4 0031EF14 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80321FB8 0031EF18 7C 08 03 A6 */ mtlr r0 /* 80321FBC 0031EF1C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80321FC0 0031EF20 4E 80 00 20 */ blr +/* 80321FC0 0031EF20 4E 80 00 20 */ blr .global __dt__16CIESampleAndHold __dt__16CIESampleAndHold: @@ -12256,7 +12256,7 @@ __dt__16CIESampleAndHold: /* 80322000 0031EF60 38 80 00 01 */ li r4, 1 /* 80322004 0031EF64 81 8C 00 08 */ lwz r12, 8(r12) /* 80322008 0031EF68 7D 89 03 A6 */ mtctr r12 -/* 8032200C 0031EF6C 4E 80 04 21 */ bctrl +/* 8032200C 0031EF6C 4E 80 04 21 */ bctrl lbl_80322010: /* 80322010 0031EF70 80 7E 00 0C */ lwz r3, 0xc(r30) /* 80322014 0031EF74 28 03 00 00 */ cmplwi r3, 0 @@ -12265,7 +12265,7 @@ lbl_80322010: /* 80322020 0031EF80 38 80 00 01 */ li r4, 1 /* 80322024 0031EF84 81 8C 00 08 */ lwz r12, 8(r12) /* 80322028 0031EF88 7D 89 03 A6 */ mtctr r12 -/* 8032202C 0031EF8C 4E 80 04 21 */ bctrl +/* 8032202C 0031EF8C 4E 80 04 21 */ bctrl lbl_80322030: /* 80322030 0031EF90 80 7E 00 10 */ lwz r3, 0x10(r30) /* 80322034 0031EF94 28 03 00 00 */ cmplwi r3, 0 @@ -12274,7 +12274,7 @@ lbl_80322030: /* 80322040 0031EFA0 38 80 00 01 */ li r4, 1 /* 80322044 0031EFA4 81 8C 00 08 */ lwz r12, 8(r12) /* 80322048 0031EFA8 7D 89 03 A6 */ mtctr r12 -/* 8032204C 0031EFAC 4E 80 04 21 */ bctrl +/* 8032204C 0031EFAC 4E 80 04 21 */ bctrl lbl_80322050: /* 80322050 0031EFB0 28 1E 00 00 */ cmplwi r30, 0 /* 80322054 0031EFB4 41 82 00 20 */ beq lbl_80322074 @@ -12298,7 +12298,7 @@ lbl_80322088: /* 80322094 0031EFF4 83 C1 00 08 */ lwz r30, 8(r1) /* 80322098 0031EFF8 7C 08 03 A6 */ mtlr r0 /* 8032209C 0031EFFC 38 21 00 10 */ addi r1, r1, 0x10 -/* 803220A0 0031F000 4E 80 00 20 */ blr +/* 803220A0 0031F000 4E 80 00 20 */ blr .global __ct__16CIESampleAndHoldFP11CIntElementP11CIntElementP11CIntElement __ct__16CIESampleAndHoldFP11CIntElementP11CIntElementP11CIntElement: @@ -12316,7 +12316,7 @@ __ct__16CIESampleAndHoldFP11CIntElementP11CIntElementP11CIntElement: /* 803220D0 0031F030 90 03 00 08 */ stw r0, 8(r3) /* 803220D4 0031F034 90 A3 00 0C */ stw r5, 0xc(r3) /* 803220D8 0031F038 90 C3 00 10 */ stw r6, 0x10(r3) -/* 803220DC 0031F03C 4E 80 00 20 */ blr +/* 803220DC 0031F03C 4E 80 00 20 */ blr .global GetValue__9CIERandomCFiRi GetValue__9CIERandomCFiRi: @@ -12334,14 +12334,14 @@ GetValue__9CIERandomCFiRi: /* 8032210C 0031F06C 81 83 00 00 */ lwz r12, 0(r3) /* 80322110 0031F070 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80322114 0031F074 7D 89 03 A6 */ mtctr r12 -/* 80322118 0031F078 4E 80 04 21 */ bctrl +/* 80322118 0031F078 4E 80 04 21 */ bctrl /* 8032211C 0031F07C 80 7D 00 08 */ lwz r3, 8(r29) /* 80322120 0031F080 7F E4 FB 78 */ mr r4, r31 /* 80322124 0031F084 38 A1 00 08 */ addi r5, r1, 8 /* 80322128 0031F088 81 83 00 00 */ lwz r12, 0(r3) /* 8032212C 0031F08C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80322130 0031F090 7D 89 03 A6 */ mtctr r12 -/* 80322134 0031F094 4E 80 04 21 */ bctrl +/* 80322134 0031F094 4E 80 04 21 */ bctrl /* 80322138 0031F098 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8032213C 0031F09C 2C 1F 00 00 */ cmpwi r31, 0 /* 80322140 0031F0A0 40 81 00 1C */ ble lbl_8032215C @@ -12363,7 +12363,7 @@ lbl_80322168: /* 80322178 0031F0D8 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8032217C 0031F0DC 7C 08 03 A6 */ mtlr r0 /* 80322180 0031F0E0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80322184 0031F0E4 4E 80 00 20 */ blr +/* 80322184 0031F0E4 4E 80 00 20 */ blr .global __dt__9CIERandom __dt__9CIERandom: @@ -12385,7 +12385,7 @@ __dt__9CIERandom: /* 803221C4 0031F124 38 80 00 01 */ li r4, 1 /* 803221C8 0031F128 81 8C 00 08 */ lwz r12, 8(r12) /* 803221CC 0031F12C 7D 89 03 A6 */ mtctr r12 -/* 803221D0 0031F130 4E 80 04 21 */ bctrl +/* 803221D0 0031F130 4E 80 04 21 */ bctrl lbl_803221D4: /* 803221D4 0031F134 80 7E 00 08 */ lwz r3, 8(r30) /* 803221D8 0031F138 28 03 00 00 */ cmplwi r3, 0 @@ -12394,7 +12394,7 @@ lbl_803221D4: /* 803221E4 0031F144 38 80 00 01 */ li r4, 1 /* 803221E8 0031F148 81 8C 00 08 */ lwz r12, 8(r12) /* 803221EC 0031F14C 7D 89 03 A6 */ mtctr r12 -/* 803221F0 0031F150 4E 80 04 21 */ bctrl +/* 803221F0 0031F150 4E 80 04 21 */ bctrl lbl_803221F4: /* 803221F4 0031F154 28 1E 00 00 */ cmplwi r30, 0 /* 803221F8 0031F158 41 82 00 20 */ beq lbl_80322218 @@ -12418,7 +12418,7 @@ lbl_8032222C: /* 80322238 0031F198 83 C1 00 08 */ lwz r30, 8(r1) /* 8032223C 0031F19C 7C 08 03 A6 */ mtlr r0 /* 80322240 0031F1A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80322244 0031F1A4 4E 80 00 20 */ blr +/* 80322244 0031F1A4 4E 80 00 20 */ blr .global __ct__9CIERandomFP11CIntElementP11CIntElement __ct__9CIERandomFP11CIntElementP11CIntElement: @@ -12433,7 +12433,7 @@ __ct__9CIERandomFP11CIntElementP11CIntElement: /* 80322268 0031F1C8 90 03 00 00 */ stw r0, 0(r3) /* 8032226C 0031F1CC 90 83 00 04 */ stw r4, 4(r3) /* 80322270 0031F1D0 90 A3 00 08 */ stw r5, 8(r3) -/* 80322274 0031F1D4 4E 80 00 20 */ blr +/* 80322274 0031F1D4 4E 80 00 20 */ blr .global GetValue__9CIEModuloCFiRi GetValue__9CIEModuloCFiRi: @@ -12451,14 +12451,14 @@ GetValue__9CIEModuloCFiRi: /* 803222A4 0031F204 81 83 00 00 */ lwz r12, 0(r3) /* 803222A8 0031F208 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803222AC 0031F20C 7D 89 03 A6 */ mtctr r12 -/* 803222B0 0031F210 4E 80 04 21 */ bctrl +/* 803222B0 0031F210 4E 80 04 21 */ bctrl /* 803222B4 0031F214 80 7D 00 08 */ lwz r3, 8(r29) /* 803222B8 0031F218 7F C4 F3 78 */ mr r4, r30 /* 803222BC 0031F21C 38 A1 00 08 */ addi r5, r1, 8 /* 803222C0 0031F220 81 83 00 00 */ lwz r12, 0(r3) /* 803222C4 0031F224 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803222C8 0031F228 7D 89 03 A6 */ mtctr r12 -/* 803222CC 0031F22C 4E 80 04 21 */ bctrl +/* 803222CC 0031F22C 4E 80 04 21 */ bctrl /* 803222D0 0031F230 80 81 00 08 */ lwz r4, 8(r1) /* 803222D4 0031F234 2C 04 00 00 */ cmpwi r4, 0 /* 803222D8 0031F238 41 82 00 1C */ beq lbl_803222F4 @@ -12479,7 +12479,7 @@ lbl_803222FC: /* 8032230C 0031F26C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80322310 0031F270 7C 08 03 A6 */ mtlr r0 /* 80322314 0031F274 38 21 00 20 */ addi r1, r1, 0x20 -/* 80322318 0031F278 4E 80 00 20 */ blr +/* 80322318 0031F278 4E 80 00 20 */ blr .global __dt__9CIEModulo __dt__9CIEModulo: @@ -12501,7 +12501,7 @@ __dt__9CIEModulo: /* 80322358 0031F2B8 38 80 00 01 */ li r4, 1 /* 8032235C 0031F2BC 81 8C 00 08 */ lwz r12, 8(r12) /* 80322360 0031F2C0 7D 89 03 A6 */ mtctr r12 -/* 80322364 0031F2C4 4E 80 04 21 */ bctrl +/* 80322364 0031F2C4 4E 80 04 21 */ bctrl lbl_80322368: /* 80322368 0031F2C8 80 7E 00 08 */ lwz r3, 8(r30) /* 8032236C 0031F2CC 28 03 00 00 */ cmplwi r3, 0 @@ -12510,7 +12510,7 @@ lbl_80322368: /* 80322378 0031F2D8 38 80 00 01 */ li r4, 1 /* 8032237C 0031F2DC 81 8C 00 08 */ lwz r12, 8(r12) /* 80322380 0031F2E0 7D 89 03 A6 */ mtctr r12 -/* 80322384 0031F2E4 4E 80 04 21 */ bctrl +/* 80322384 0031F2E4 4E 80 04 21 */ bctrl lbl_80322388: /* 80322388 0031F2E8 28 1E 00 00 */ cmplwi r30, 0 /* 8032238C 0031F2EC 41 82 00 20 */ beq lbl_803223AC @@ -12534,7 +12534,7 @@ lbl_803223C0: /* 803223CC 0031F32C 83 C1 00 08 */ lwz r30, 8(r1) /* 803223D0 0031F330 7C 08 03 A6 */ mtlr r0 /* 803223D4 0031F334 38 21 00 10 */ addi r1, r1, 0x10 -/* 803223D8 0031F338 4E 80 00 20 */ blr +/* 803223D8 0031F338 4E 80 00 20 */ blr .global __ct__9CIEModuloFP11CIntElementP11CIntElement __ct__9CIEModuloFP11CIntElementP11CIntElement: @@ -12549,7 +12549,7 @@ __ct__9CIEModuloFP11CIntElementP11CIntElement: /* 803223FC 0031F35C 90 03 00 00 */ stw r0, 0(r3) /* 80322400 0031F360 90 83 00 04 */ stw r4, 4(r3) /* 80322404 0031F364 90 A3 00 08 */ stw r5, 8(r3) -/* 80322408 0031F368 4E 80 00 20 */ blr +/* 80322408 0031F368 4E 80 00 20 */ blr .global GetValue__11CIEMultiplyCFiRi GetValue__11CIEMultiplyCFiRi: @@ -12567,14 +12567,14 @@ GetValue__11CIEMultiplyCFiRi: /* 80322438 0031F398 81 83 00 00 */ lwz r12, 0(r3) /* 8032243C 0031F39C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80322440 0031F3A0 7D 89 03 A6 */ mtctr r12 -/* 80322444 0031F3A4 4E 80 04 21 */ bctrl +/* 80322444 0031F3A4 4E 80 04 21 */ bctrl /* 80322448 0031F3A8 80 7D 00 08 */ lwz r3, 8(r29) /* 8032244C 0031F3AC 7F C4 F3 78 */ mr r4, r30 /* 80322450 0031F3B0 38 A1 00 08 */ addi r5, r1, 8 /* 80322454 0031F3B4 81 83 00 00 */ lwz r12, 0(r3) /* 80322458 0031F3B8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8032245C 0031F3BC 7D 89 03 A6 */ mtctr r12 -/* 80322460 0031F3C0 4E 80 04 21 */ bctrl +/* 80322460 0031F3C0 4E 80 04 21 */ bctrl /* 80322464 0031F3C4 80 81 00 0C */ lwz r4, 0xc(r1) /* 80322468 0031F3C8 38 60 00 00 */ li r3, 0 /* 8032246C 0031F3CC 80 01 00 08 */ lwz r0, 8(r1) @@ -12586,7 +12586,7 @@ GetValue__11CIEMultiplyCFiRi: /* 80322484 0031F3E4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80322488 0031F3E8 7C 08 03 A6 */ mtlr r0 /* 8032248C 0031F3EC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80322490 0031F3F0 4E 80 00 20 */ blr +/* 80322490 0031F3F0 4E 80 00 20 */ blr .global __dt__11CIEMultiply __dt__11CIEMultiply: @@ -12608,7 +12608,7 @@ __dt__11CIEMultiply: /* 803224D0 0031F430 38 80 00 01 */ li r4, 1 /* 803224D4 0031F434 81 8C 00 08 */ lwz r12, 8(r12) /* 803224D8 0031F438 7D 89 03 A6 */ mtctr r12 -/* 803224DC 0031F43C 4E 80 04 21 */ bctrl +/* 803224DC 0031F43C 4E 80 04 21 */ bctrl lbl_803224E0: /* 803224E0 0031F440 80 7E 00 08 */ lwz r3, 8(r30) /* 803224E4 0031F444 28 03 00 00 */ cmplwi r3, 0 @@ -12617,7 +12617,7 @@ lbl_803224E0: /* 803224F0 0031F450 38 80 00 01 */ li r4, 1 /* 803224F4 0031F454 81 8C 00 08 */ lwz r12, 8(r12) /* 803224F8 0031F458 7D 89 03 A6 */ mtctr r12 -/* 803224FC 0031F45C 4E 80 04 21 */ bctrl +/* 803224FC 0031F45C 4E 80 04 21 */ bctrl lbl_80322500: /* 80322500 0031F460 28 1E 00 00 */ cmplwi r30, 0 /* 80322504 0031F464 41 82 00 20 */ beq lbl_80322524 @@ -12641,7 +12641,7 @@ lbl_80322538: /* 80322544 0031F4A4 83 C1 00 08 */ lwz r30, 8(r1) /* 80322548 0031F4A8 7C 08 03 A6 */ mtlr r0 /* 8032254C 0031F4AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80322550 0031F4B0 4E 80 00 20 */ blr +/* 80322550 0031F4B0 4E 80 00 20 */ blr .global __ct__11CIEMultiplyFP11CIntElementP11CIntElement __ct__11CIEMultiplyFP11CIntElementP11CIntElement: @@ -12656,7 +12656,7 @@ __ct__11CIEMultiplyFP11CIntElementP11CIntElement: /* 80322574 0031F4D4 90 03 00 00 */ stw r0, 0(r3) /* 80322578 0031F4D8 90 83 00 04 */ stw r4, 4(r3) /* 8032257C 0031F4DC 90 A3 00 08 */ stw r5, 8(r3) -/* 80322580 0031F4E0 4E 80 00 20 */ blr +/* 80322580 0031F4E0 4E 80 00 20 */ blr .global GetValue__6CIEAddCFiRi GetValue__6CIEAddCFiRi: @@ -12674,14 +12674,14 @@ GetValue__6CIEAddCFiRi: /* 803225B0 0031F510 81 83 00 00 */ lwz r12, 0(r3) /* 803225B4 0031F514 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803225B8 0031F518 7D 89 03 A6 */ mtctr r12 -/* 803225BC 0031F51C 4E 80 04 21 */ bctrl +/* 803225BC 0031F51C 4E 80 04 21 */ bctrl /* 803225C0 0031F520 80 7D 00 08 */ lwz r3, 8(r29) /* 803225C4 0031F524 7F C4 F3 78 */ mr r4, r30 /* 803225C8 0031F528 38 A1 00 08 */ addi r5, r1, 8 /* 803225CC 0031F52C 81 83 00 00 */ lwz r12, 0(r3) /* 803225D0 0031F530 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803225D4 0031F534 7D 89 03 A6 */ mtctr r12 -/* 803225D8 0031F538 4E 80 04 21 */ bctrl +/* 803225D8 0031F538 4E 80 04 21 */ bctrl /* 803225DC 0031F53C 80 81 00 0C */ lwz r4, 0xc(r1) /* 803225E0 0031F540 38 60 00 00 */ li r3, 0 /* 803225E4 0031F544 80 01 00 08 */ lwz r0, 8(r1) @@ -12693,7 +12693,7 @@ GetValue__6CIEAddCFiRi: /* 803225FC 0031F55C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80322600 0031F560 7C 08 03 A6 */ mtlr r0 /* 80322604 0031F564 38 21 00 20 */ addi r1, r1, 0x20 -/* 80322608 0031F568 4E 80 00 20 */ blr +/* 80322608 0031F568 4E 80 00 20 */ blr .global __dt__6CIEAdd __dt__6CIEAdd: @@ -12715,7 +12715,7 @@ __dt__6CIEAdd: /* 80322648 0031F5A8 38 80 00 01 */ li r4, 1 /* 8032264C 0031F5AC 81 8C 00 08 */ lwz r12, 8(r12) /* 80322650 0031F5B0 7D 89 03 A6 */ mtctr r12 -/* 80322654 0031F5B4 4E 80 04 21 */ bctrl +/* 80322654 0031F5B4 4E 80 04 21 */ bctrl lbl_80322658: /* 80322658 0031F5B8 80 7E 00 08 */ lwz r3, 8(r30) /* 8032265C 0031F5BC 28 03 00 00 */ cmplwi r3, 0 @@ -12724,7 +12724,7 @@ lbl_80322658: /* 80322668 0031F5C8 38 80 00 01 */ li r4, 1 /* 8032266C 0031F5CC 81 8C 00 08 */ lwz r12, 8(r12) /* 80322670 0031F5D0 7D 89 03 A6 */ mtctr r12 -/* 80322674 0031F5D4 4E 80 04 21 */ bctrl +/* 80322674 0031F5D4 4E 80 04 21 */ bctrl lbl_80322678: /* 80322678 0031F5D8 28 1E 00 00 */ cmplwi r30, 0 /* 8032267C 0031F5DC 41 82 00 20 */ beq lbl_8032269C @@ -12748,7 +12748,7 @@ lbl_803226B0: /* 803226BC 0031F61C 83 C1 00 08 */ lwz r30, 8(r1) /* 803226C0 0031F620 7C 08 03 A6 */ mtlr r0 /* 803226C4 0031F624 38 21 00 10 */ addi r1, r1, 0x10 -/* 803226C8 0031F628 4E 80 00 20 */ blr +/* 803226C8 0031F628 4E 80 00 20 */ blr .global __ct__6CIEAddFP11CIntElementP11CIntElement __ct__6CIEAddFP11CIntElementP11CIntElement: @@ -12763,7 +12763,7 @@ __ct__6CIEAddFP11CIntElementP11CIntElement: /* 803226EC 0031F64C 90 03 00 00 */ stw r0, 0(r3) /* 803226F0 0031F650 90 83 00 04 */ stw r4, 4(r3) /* 803226F4 0031F654 90 A3 00 08 */ stw r5, 8(r3) -/* 803226F8 0031F658 4E 80 00 20 */ blr +/* 803226F8 0031F658 4E 80 00 20 */ blr .global GetValue__8CIEDeathCFiRi GetValue__8CIEDeathCFiRi: @@ -12778,14 +12778,14 @@ GetValue__8CIEDeathCFiRi: /* 8032271C 0031F67C 81 83 00 00 */ lwz r12, 0(r3) /* 80322720 0031F680 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80322724 0031F684 7D 89 03 A6 */ mtctr r12 -/* 80322728 0031F688 4E 80 04 21 */ bctrl +/* 80322728 0031F688 4E 80 04 21 */ bctrl /* 8032272C 0031F68C 80 7E 00 08 */ lwz r3, 8(r30) /* 80322730 0031F690 7F E4 FB 78 */ mr r4, r31 /* 80322734 0031F694 38 A1 00 08 */ addi r5, r1, 8 /* 80322738 0031F698 81 83 00 00 */ lwz r12, 0(r3) /* 8032273C 0031F69C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80322740 0031F6A0 7D 89 03 A6 */ mtctr r12 -/* 80322744 0031F6A4 4E 80 04 21 */ bctrl +/* 80322744 0031F6A4 4E 80 04 21 */ bctrl /* 80322748 0031F6A8 80 01 00 08 */ lwz r0, 8(r1) /* 8032274C 0031F6AC 7F E4 FE 70 */ srawi r4, r31, 0x1f /* 80322750 0031F6B0 54 03 0F FE */ srwi r3, r0, 0x1f @@ -12797,7 +12797,7 @@ GetValue__8CIEDeathCFiRi: /* 80322768 0031F6C8 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8032276C 0031F6CC 7C 08 03 A6 */ mtlr r0 /* 80322770 0031F6D0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80322774 0031F6D4 4E 80 00 20 */ blr +/* 80322774 0031F6D4 4E 80 00 20 */ blr .global __dt__8CIEDeath __dt__8CIEDeath: @@ -12819,7 +12819,7 @@ __dt__8CIEDeath: /* 803227B4 0031F714 38 80 00 01 */ li r4, 1 /* 803227B8 0031F718 81 8C 00 08 */ lwz r12, 8(r12) /* 803227BC 0031F71C 7D 89 03 A6 */ mtctr r12 -/* 803227C0 0031F720 4E 80 04 21 */ bctrl +/* 803227C0 0031F720 4E 80 04 21 */ bctrl lbl_803227C4: /* 803227C4 0031F724 80 7E 00 08 */ lwz r3, 8(r30) /* 803227C8 0031F728 28 03 00 00 */ cmplwi r3, 0 @@ -12828,7 +12828,7 @@ lbl_803227C4: /* 803227D4 0031F734 38 80 00 01 */ li r4, 1 /* 803227D8 0031F738 81 8C 00 08 */ lwz r12, 8(r12) /* 803227DC 0031F73C 7D 89 03 A6 */ mtctr r12 -/* 803227E0 0031F740 4E 80 04 21 */ bctrl +/* 803227E0 0031F740 4E 80 04 21 */ bctrl lbl_803227E4: /* 803227E4 0031F744 28 1E 00 00 */ cmplwi r30, 0 /* 803227E8 0031F748 41 82 00 20 */ beq lbl_80322808 @@ -12852,7 +12852,7 @@ lbl_8032281C: /* 80322828 0031F788 83 C1 00 08 */ lwz r30, 8(r1) /* 8032282C 0031F78C 7C 08 03 A6 */ mtlr r0 /* 80322830 0031F790 38 21 00 10 */ addi r1, r1, 0x10 -/* 80322834 0031F794 4E 80 00 20 */ blr +/* 80322834 0031F794 4E 80 00 20 */ blr .global __ct__8CIEDeathFP11CIntElementP11CIntElement __ct__8CIEDeathFP11CIntElementP11CIntElement: @@ -12867,14 +12867,14 @@ __ct__8CIEDeathFP11CIntElementP11CIntElement: /* 80322858 0031F7B8 90 03 00 00 */ stw r0, 0(r3) /* 8032285C 0031F7BC 90 83 00 04 */ stw r4, 4(r3) /* 80322860 0031F7C0 90 A3 00 08 */ stw r5, 8(r3) -/* 80322864 0031F7C4 4E 80 00 20 */ blr +/* 80322864 0031F7C4 4E 80 00 20 */ blr .global sub_80322868 sub_80322868: /* 80322868 0031F7C8 80 03 00 04 */ lwz r0, 4(r3) /* 8032286C 0031F7CC 38 60 00 00 */ li r3, 0 /* 80322870 0031F7D0 90 05 00 00 */ stw r0, 0(r5) -/* 80322874 0031F7D4 4E 80 00 20 */ blr +/* 80322874 0031F7D4 4E 80 00 20 */ blr .global __dt__11CIEConstant __dt__11CIEConstant: @@ -12907,7 +12907,7 @@ lbl_803228D0: /* 803228D8 0031F838 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803228DC 0031F83C 7C 08 03 A6 */ mtlr r0 /* 803228E0 0031F840 38 21 00 10 */ addi r1, r1, 0x10 -/* 803228E4 0031F844 4E 80 00 20 */ blr +/* 803228E4 0031F844 4E 80 00 20 */ blr .global __ct__11CIEConstantFi __ct__11CIEConstantFi: @@ -12921,7 +12921,7 @@ __ct__11CIEConstantFi: /* 80322904 0031F864 90 C3 00 00 */ stw r6, 0(r3) /* 80322908 0031F868 90 03 00 00 */ stw r0, 0(r3) /* 8032290C 0031F86C 90 83 00 04 */ stw r4, 4(r3) -/* 80322910 0031F870 4E 80 00 20 */ blr +/* 80322910 0031F870 4E 80 00 20 */ blr .global __dt__7CIEGAPC __dt__7CIEGAPC: @@ -12954,7 +12954,7 @@ lbl_8032296C: /* 80322974 0031F8D4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80322978 0031F8D8 7C 08 03 A6 */ mtlr r0 /* 8032297C 0031F8DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80322980 0031F8E0 4E 80 00 20 */ blr +/* 80322980 0031F8E0 4E 80 00 20 */ blr .global __dt__7CIEGTCP __dt__7CIEGTCP: @@ -12987,7 +12987,7 @@ lbl_803229DC: /* 803229E4 0031F944 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803229E8 0031F948 7C 08 03 A6 */ mtlr r0 /* 803229EC 0031F94C 38 21 00 10 */ addi r1, r1, 0x10 -/* 803229F0 0031F950 4E 80 00 20 */ blr +/* 803229F0 0031F950 4E 80 00 20 */ blr .global GetValue__15CMVESetPositionCFiR9CVector3fR9CVector3f GetValue__15CMVESetPositionCFiR9CVector3fR9CVector3f: @@ -12999,12 +12999,12 @@ GetValue__15CMVESetPositionCFiR9CVector3fR9CVector3f: /* 80322A08 0031F968 81 83 00 00 */ lwz r12, 0(r3) /* 80322A0C 0031F96C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80322A10 0031F970 7D 89 03 A6 */ mtctr r12 -/* 80322A14 0031F974 4E 80 04 21 */ bctrl +/* 80322A14 0031F974 4E 80 04 21 */ bctrl /* 80322A18 0031F978 80 01 00 14 */ lwz r0, 0x14(r1) /* 80322A1C 0031F97C 38 60 00 00 */ li r3, 0 /* 80322A20 0031F980 7C 08 03 A6 */ mtlr r0 /* 80322A24 0031F984 38 21 00 10 */ addi r1, r1, 0x10 -/* 80322A28 0031F988 4E 80 00 20 */ blr +/* 80322A28 0031F988 4E 80 00 20 */ blr .global __dt__15CMVESetPositionFv __dt__15CMVESetPositionFv: @@ -13026,7 +13026,7 @@ __dt__15CMVESetPositionFv: /* 80322A68 0031F9C8 38 80 00 01 */ li r4, 1 /* 80322A6C 0031F9CC 81 8C 00 08 */ lwz r12, 8(r12) /* 80322A70 0031F9D0 7D 89 03 A6 */ mtctr r12 -/* 80322A74 0031F9D4 4E 80 04 21 */ bctrl +/* 80322A74 0031F9D4 4E 80 04 21 */ bctrl lbl_80322A78: /* 80322A78 0031F9D8 28 1E 00 00 */ cmplwi r30, 0 /* 80322A7C 0031F9DC 41 82 00 20 */ beq lbl_80322A9C @@ -13050,7 +13050,7 @@ lbl_80322AB0: /* 80322ABC 0031FA1C 83 C1 00 08 */ lwz r30, 8(r1) /* 80322AC0 0031FA20 7C 08 03 A6 */ mtlr r0 /* 80322AC4 0031FA24 38 21 00 10 */ addi r1, r1, 0x10 -/* 80322AC8 0031FA28 4E 80 00 20 */ blr +/* 80322AC8 0031FA28 4E 80 00 20 */ blr .global __ct__15CMVESetPositionFP14CVectorElement __ct__15CMVESetPositionFP14CVectorElement: @@ -13064,7 +13064,7 @@ __ct__15CMVESetPositionFP14CVectorElement: /* 80322AE8 0031FA48 90 C3 00 00 */ stw r6, 0(r3) /* 80322AEC 0031FA4C 90 03 00 00 */ stw r0, 0(r3) /* 80322AF0 0031FA50 90 83 00 04 */ stw r4, 4(r3) -/* 80322AF4 0031FA54 4E 80 00 20 */ blr +/* 80322AF4 0031FA54 4E 80 00 20 */ blr .global GetValue__10CMVEBounceCFiR9CVector3fR9CVector3f GetValue__10CMVEBounceCFiR9CVector3fR9CVector3f: @@ -13091,7 +13091,7 @@ GetValue__10CMVEBounceCFiR9CVector3fR9CVector3f: /* 80322B48 0031FAA8 81 83 00 00 */ lwz r12, 0(r3) /* 80322B4C 0031FAAC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80322B50 0031FAB0 7D 89 03 A6 */ mtctr r12 -/* 80322B54 0031FAB4 4E 80 04 21 */ bctrl +/* 80322B54 0031FAB4 4E 80 04 21 */ bctrl /* 80322B58 0031FAB8 38 7C 00 18 */ addi r3, r28, 0x18 /* 80322B5C 0031FABC 4B FF 1D 9D */ bl Normalize__9CVector3fFv /* 80322B60 0031FAC0 C0 02 CA 68 */ lfs f0, lbl_805AE788@sda21(r2) @@ -13104,7 +13104,7 @@ GetValue__10CMVEBounceCFiR9CVector3fR9CVector3f: /* 80322B7C 0031FADC 81 83 00 00 */ lwz r12, 0(r3) /* 80322B80 0031FAE0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80322B84 0031FAE4 7D 89 03 A6 */ mtctr r12 -/* 80322B88 0031FAE8 4E 80 04 21 */ bctrl +/* 80322B88 0031FAE8 4E 80 04 21 */ bctrl /* 80322B8C 0031FAEC C0 3C 00 1C */ lfs f1, 0x1c(r28) /* 80322B90 0031FAF0 C0 01 00 20 */ lfs f0, 0x20(r1) /* 80322B94 0031FAF4 C0 5C 00 18 */ lfs f2, 0x18(r28) @@ -13179,7 +13179,7 @@ lbl_80322C08: /* 80322C9C 0031FBFC 81 83 00 00 */ lwz r12, 0(r3) /* 80322CA0 0031FC00 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80322CA4 0031FC04 7D 89 03 A6 */ mtctr r12 -/* 80322CA8 0031FC08 4E 80 04 21 */ bctrl +/* 80322CA8 0031FC08 4E 80 04 21 */ bctrl /* 80322CAC 0031FC0C C0 A1 00 0C */ lfs f5, 0xc(r1) /* 80322CB0 0031FC10 7F A4 EB 78 */ mr r4, r29 /* 80322CB4 0031FC14 C0 1E 00 00 */ lfs f0, 0(r30) @@ -13204,7 +13204,7 @@ lbl_80322C08: /* 80322D00 0031FC60 81 83 00 00 */ lwz r12, 0(r3) /* 80322D04 0031FC64 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80322D08 0031FC68 7D 89 03 A6 */ mtctr r12 -/* 80322D0C 0031FC6C 4E 80 04 21 */ bctrl +/* 80322D0C 0031FC6C 4E 80 04 21 */ bctrl /* 80322D10 0031FC70 C0 BC 00 1C */ lfs f5, 0x1c(r28) /* 80322D14 0031FC74 C0 1E 00 04 */ lfs f0, 4(r30) /* 80322D18 0031FC78 C0 9C 00 18 */ lfs f4, 0x18(r28) @@ -13244,7 +13244,7 @@ lbl_80322D78: /* 80322D98 0031FCF8 83 81 00 30 */ lwz r28, 0x30(r1) /* 80322D9C 0031FCFC 7C 08 03 A6 */ mtlr r0 /* 80322DA0 0031FD00 38 21 00 60 */ addi r1, r1, 0x60 -/* 80322DA4 0031FD04 4E 80 00 20 */ blr +/* 80322DA4 0031FD04 4E 80 00 20 */ blr .global __dt__10CMVEBounceFv __dt__10CMVEBounceFv: @@ -13266,7 +13266,7 @@ __dt__10CMVEBounceFv: /* 80322DE4 0031FD44 38 80 00 01 */ li r4, 1 /* 80322DE8 0031FD48 81 8C 00 08 */ lwz r12, 8(r12) /* 80322DEC 0031FD4C 7D 89 03 A6 */ mtctr r12 -/* 80322DF0 0031FD50 4E 80 04 21 */ bctrl +/* 80322DF0 0031FD50 4E 80 04 21 */ bctrl lbl_80322DF4: /* 80322DF4 0031FD54 80 7E 00 08 */ lwz r3, 8(r30) /* 80322DF8 0031FD58 28 03 00 00 */ cmplwi r3, 0 @@ -13275,7 +13275,7 @@ lbl_80322DF4: /* 80322E04 0031FD64 38 80 00 01 */ li r4, 1 /* 80322E08 0031FD68 81 8C 00 08 */ lwz r12, 8(r12) /* 80322E0C 0031FD6C 7D 89 03 A6 */ mtctr r12 -/* 80322E10 0031FD70 4E 80 04 21 */ bctrl +/* 80322E10 0031FD70 4E 80 04 21 */ bctrl lbl_80322E14: /* 80322E14 0031FD74 80 7E 00 0C */ lwz r3, 0xc(r30) /* 80322E18 0031FD78 28 03 00 00 */ cmplwi r3, 0 @@ -13284,7 +13284,7 @@ lbl_80322E14: /* 80322E24 0031FD84 38 80 00 01 */ li r4, 1 /* 80322E28 0031FD88 81 8C 00 08 */ lwz r12, 8(r12) /* 80322E2C 0031FD8C 7D 89 03 A6 */ mtctr r12 -/* 80322E30 0031FD90 4E 80 04 21 */ bctrl +/* 80322E30 0031FD90 4E 80 04 21 */ bctrl lbl_80322E34: /* 80322E34 0031FD94 80 7E 00 10 */ lwz r3, 0x10(r30) /* 80322E38 0031FD98 28 03 00 00 */ cmplwi r3, 0 @@ -13293,7 +13293,7 @@ lbl_80322E34: /* 80322E44 0031FDA4 38 80 00 01 */ li r4, 1 /* 80322E48 0031FDA8 81 8C 00 08 */ lwz r12, 8(r12) /* 80322E4C 0031FDAC 7D 89 03 A6 */ mtctr r12 -/* 80322E50 0031FDB0 4E 80 04 21 */ bctrl +/* 80322E50 0031FDB0 4E 80 04 21 */ bctrl lbl_80322E54: /* 80322E54 0031FDB4 28 1E 00 00 */ cmplwi r30, 0 /* 80322E58 0031FDB8 41 82 00 20 */ beq lbl_80322E78 @@ -13317,7 +13317,7 @@ lbl_80322E8C: /* 80322E98 0031FDF8 83 C1 00 08 */ lwz r30, 8(r1) /* 80322E9C 0031FDFC 7C 08 03 A6 */ mtlr r0 /* 80322EA0 0031FE00 38 21 00 10 */ addi r1, r1, 0x10 -/* 80322EA4 0031FE04 4E 80 00 20 */ blr +/* 80322EA4 0031FE04 4E 80 00 20 */ blr .global __ct__10CMVEBounceFP14CVectorElementP14CVectorElementP12CRealElementP12CRealElementb __ct__10CMVEBounceFP14CVectorElementP14CVectorElementP12CRealElementP12CRealElementb: @@ -13359,14 +13359,14 @@ __ct__10CMVEBounceFP14CVectorElementP14CVectorElementP12CRealElementP12CRealElem /* 80322F34 0031FE94 81 9E 00 00 */ lwz r12, 0(r30) /* 80322F38 0031FE98 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80322F3C 0031FE9C 7D 89 03 A6 */ mtctr r12 -/* 80322F40 0031FEA0 4E 80 04 21 */ bctrl +/* 80322F40 0031FEA0 4E 80 04 21 */ bctrl /* 80322F44 0031FEA4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80322F48 0031FEA8 41 82 00 CC */ beq lbl_80323014 /* 80322F4C 0031FEAC 7F E3 FB 78 */ mr r3, r31 /* 80322F50 0031FEB0 81 9F 00 00 */ lwz r12, 0(r31) /* 80322F54 0031FEB4 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80322F58 0031FEB8 7D 89 03 A6 */ mtctr r12 -/* 80322F5C 0031FEBC 4E 80 04 21 */ bctrl +/* 80322F5C 0031FEBC 4E 80 04 21 */ bctrl /* 80322F60 0031FEC0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80322F64 0031FEC4 41 82 00 B0 */ beq lbl_80323014 /* 80322F68 0031FEC8 38 00 00 01 */ li r0, 1 @@ -13377,7 +13377,7 @@ __ct__10CMVEBounceFP14CVectorElementP14CVectorElementP12CRealElementP12CRealElem /* 80322F7C 0031FEDC 81 9F 00 00 */ lwz r12, 0(r31) /* 80322F80 0031FEE0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80322F84 0031FEE4 7D 89 03 A6 */ mtctr r12 -/* 80322F88 0031FEE8 4E 80 04 21 */ bctrl +/* 80322F88 0031FEE8 4E 80 04 21 */ bctrl /* 80322F8C 0031FEEC 38 7D 00 18 */ addi r3, r29, 0x18 /* 80322F90 0031FEF0 C0 1D 00 1C */ lfs f0, 0x1c(r29) /* 80322F94 0031FEF4 C0 5D 00 18 */ lfs f2, 0x18(r29) @@ -13402,7 +13402,7 @@ lbl_80322FC0: /* 80322FDC 0031FF3C 81 9E 00 00 */ lwz r12, 0(r30) /* 80322FE0 0031FF40 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80322FE4 0031FF44 7D 89 03 A6 */ mtctr r12 -/* 80322FE8 0031FF48 4E 80 04 21 */ bctrl +/* 80322FE8 0031FF48 4E 80 04 21 */ bctrl /* 80322FEC 0031FF4C C0 3D 00 1C */ lfs f1, 0x1c(r29) /* 80322FF0 0031FF50 C0 01 00 0C */ lfs f0, 0xc(r1) /* 80322FF4 0031FF54 C0 5D 00 18 */ lfs f2, 0x18(r29) @@ -13421,7 +13421,7 @@ lbl_80323014: /* 80323024 0031FF84 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80323028 0031FF88 7C 08 03 A6 */ mtlr r0 /* 8032302C 0031FF8C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80323030 0031FF90 4E 80 00 20 */ blr +/* 80323030 0031FF90 4E 80 00 20 */ blr .global GetValue__9CMVESwirlCFiR9CVector3fR9CVector3f GetValue__9CMVESwirlCFiR9CVector3fR9CVector3f: @@ -13454,14 +13454,14 @@ GetValue__9CMVESwirlCFiR9CVector3fR9CVector3f: /* 8032309C 0031FFFC 81 83 00 00 */ lwz r12, 0(r3) /* 803230A0 00320000 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803230A4 00320004 7D 89 03 A6 */ mtctr r12 -/* 803230A8 00320008 4E 80 04 21 */ bctrl +/* 803230A8 00320008 4E 80 04 21 */ bctrl /* 803230AC 0032000C 80 7C 00 08 */ lwz r3, 8(r28) /* 803230B0 00320010 7F A4 EB 78 */ mr r4, r29 /* 803230B4 00320014 38 A1 00 10 */ addi r5, r1, 0x10 /* 803230B8 00320018 81 83 00 00 */ lwz r12, 0(r3) /* 803230BC 0032001C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803230C0 00320020 7D 89 03 A6 */ mtctr r12 -/* 803230C4 00320024 4E 80 04 21 */ bctrl +/* 803230C4 00320024 4E 80 04 21 */ bctrl /* 803230C8 00320028 C0 21 00 20 */ lfs f1, 0x20(r1) /* 803230CC 0032002C 7F A4 EB 78 */ mr r4, r29 /* 803230D0 00320030 C0 1F 00 04 */ lfs f0, 4(r31) @@ -13492,14 +13492,14 @@ GetValue__9CMVESwirlCFiR9CVector3fR9CVector3f: /* 80323134 00320094 EF C4 08 28 */ fsubs f30, f4, f1 /* 80323138 00320098 EF E3 00 28 */ fsubs f31, f3, f0 /* 8032313C 0032009C 7D 89 03 A6 */ mtctr r12 -/* 80323140 003200A0 4E 80 04 21 */ bctrl +/* 80323140 003200A0 4E 80 04 21 */ bctrl /* 80323144 003200A4 80 7C 00 10 */ lwz r3, 0x10(r28) /* 80323148 003200A8 7F A4 EB 78 */ mr r4, r29 /* 8032314C 003200AC 38 A1 00 08 */ addi r5, r1, 8 /* 80323150 003200B0 81 83 00 00 */ lwz r12, 0(r3) /* 80323154 003200B4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80323158 003200B8 7D 89 03 A6 */ mtctr r12 -/* 8032315C 003200BC 4E 80 04 21 */ bctrl +/* 8032315C 003200BC 4E 80 04 21 */ bctrl /* 80323160 003200C0 C0 E1 00 14 */ lfs f7, 0x14(r1) /* 80323164 003200C4 38 60 00 00 */ li r3, 0 /* 80323168 003200C8 C1 7E 00 04 */ lfs f11, 4(r30) @@ -13554,7 +13554,7 @@ GetValue__9CMVESwirlCFiR9CVector3fR9CVector3f: /* 8032322C 0032018C 83 81 00 30 */ lwz r28, 0x30(r1) /* 80323230 00320190 7C 08 03 A6 */ mtlr r0 /* 80323234 00320194 38 21 00 70 */ addi r1, r1, 0x70 -/* 80323238 00320198 4E 80 00 20 */ blr +/* 80323238 00320198 4E 80 00 20 */ blr .global __dt__9CMVESwirlFv __dt__9CMVESwirlFv: @@ -13576,7 +13576,7 @@ __dt__9CMVESwirlFv: /* 80323278 003201D8 38 80 00 01 */ li r4, 1 /* 8032327C 003201DC 81 8C 00 08 */ lwz r12, 8(r12) /* 80323280 003201E0 7D 89 03 A6 */ mtctr r12 -/* 80323284 003201E4 4E 80 04 21 */ bctrl +/* 80323284 003201E4 4E 80 04 21 */ bctrl lbl_80323288: /* 80323288 003201E8 80 7E 00 08 */ lwz r3, 8(r30) /* 8032328C 003201EC 28 03 00 00 */ cmplwi r3, 0 @@ -13585,7 +13585,7 @@ lbl_80323288: /* 80323298 003201F8 38 80 00 01 */ li r4, 1 /* 8032329C 003201FC 81 8C 00 08 */ lwz r12, 8(r12) /* 803232A0 00320200 7D 89 03 A6 */ mtctr r12 -/* 803232A4 00320204 4E 80 04 21 */ bctrl +/* 803232A4 00320204 4E 80 04 21 */ bctrl lbl_803232A8: /* 803232A8 00320208 80 7E 00 0C */ lwz r3, 0xc(r30) /* 803232AC 0032020C 28 03 00 00 */ cmplwi r3, 0 @@ -13594,7 +13594,7 @@ lbl_803232A8: /* 803232B8 00320218 38 80 00 01 */ li r4, 1 /* 803232BC 0032021C 81 8C 00 08 */ lwz r12, 8(r12) /* 803232C0 00320220 7D 89 03 A6 */ mtctr r12 -/* 803232C4 00320224 4E 80 04 21 */ bctrl +/* 803232C4 00320224 4E 80 04 21 */ bctrl lbl_803232C8: /* 803232C8 00320228 80 7E 00 10 */ lwz r3, 0x10(r30) /* 803232CC 0032022C 28 03 00 00 */ cmplwi r3, 0 @@ -13603,7 +13603,7 @@ lbl_803232C8: /* 803232D8 00320238 38 80 00 01 */ li r4, 1 /* 803232DC 0032023C 81 8C 00 08 */ lwz r12, 8(r12) /* 803232E0 00320240 7D 89 03 A6 */ mtctr r12 -/* 803232E4 00320244 4E 80 04 21 */ bctrl +/* 803232E4 00320244 4E 80 04 21 */ bctrl lbl_803232E8: /* 803232E8 00320248 28 1E 00 00 */ cmplwi r30, 0 /* 803232EC 0032024C 41 82 00 20 */ beq lbl_8032330C @@ -13627,7 +13627,7 @@ lbl_80323320: /* 8032332C 0032028C 83 C1 00 08 */ lwz r30, 8(r1) /* 80323330 00320290 7C 08 03 A6 */ mtlr r0 /* 80323334 00320294 38 21 00 10 */ addi r1, r1, 0x10 -/* 80323338 00320298 4E 80 00 20 */ blr +/* 80323338 00320298 4E 80 00 20 */ blr .global __ct__9CMVESwirlFP14CVectorElementP14CVectorElementP12CRealElementP12CRealElement __ct__9CMVESwirlFP14CVectorElementP14CVectorElementP12CRealElementP12CRealElement: @@ -13644,7 +13644,7 @@ __ct__9CMVESwirlFP14CVectorElementP14CVectorElementP12CRealElementP12CRealElemen /* 80323364 003202C4 90 A3 00 08 */ stw r5, 8(r3) /* 80323368 003202C8 90 C3 00 0C */ stw r6, 0xc(r3) /* 8032336C 003202CC 90 E3 00 10 */ stw r7, 0x10(r3) -/* 80323370 003202D0 4E 80 00 20 */ blr +/* 80323370 003202D0 4E 80 00 20 */ blr .global GetValue__24CMVEExponentialImplosionCFiR9CVector3fR9CVector3f GetValue__24CMVEExponentialImplosionCFiR9CVector3fR9CVector3f: @@ -13676,7 +13676,7 @@ GetValue__24CMVEExponentialImplosionCFiR9CVector3fR9CVector3f: /* 803233D8 00320338 81 83 00 00 */ lwz r12, 0(r3) /* 803233DC 0032033C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803233E0 00320340 7D 89 03 A6 */ mtctr r12 -/* 803233E4 00320344 4E 80 04 21 */ bctrl +/* 803233E4 00320344 4E 80 04 21 */ bctrl /* 803233E8 00320348 C0 21 00 24 */ lfs f1, 0x24(r1) /* 803233EC 0032034C 38 61 00 14 */ addi r3, r1, 0x14 /* 803233F0 00320350 C0 1F 00 04 */ lfs f0, 4(r31) @@ -13698,7 +13698,7 @@ GetValue__24CMVEExponentialImplosionCFiR9CVector3fR9CVector3f: /* 80323430 00320390 81 83 00 00 */ lwz r12, 0(r3) /* 80323434 00320394 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80323438 00320398 7D 89 03 A6 */ mtctr r12 -/* 8032343C 0032039C 4E 80 04 21 */ bctrl +/* 8032343C 0032039C 4E 80 04 21 */ bctrl /* 80323440 003203A0 C0 01 00 10 */ lfs f0, 0x10(r1) /* 80323444 003203A4 FC 1F 00 40 */ fcmpo cr0, f31, f0 /* 80323448 003203A8 40 81 00 0C */ ble lbl_80323454 @@ -13711,7 +13711,7 @@ lbl_80323454: /* 80323460 003203C0 81 83 00 00 */ lwz r12, 0(r3) /* 80323464 003203C4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80323468 003203C8 7D 89 03 A6 */ mtctr r12 -/* 8032346C 003203CC 4E 80 04 21 */ bctrl +/* 8032346C 003203CC 4E 80 04 21 */ bctrl /* 80323470 003203D0 88 1C 00 14 */ lbz r0, 0x14(r28) /* 80323474 003203D4 28 00 00 00 */ cmplwi r0, 0 /* 80323478 003203D8 41 82 00 18 */ beq lbl_80323490 @@ -13741,7 +13741,7 @@ lbl_803234A4: /* 803234D0 00320430 EF A3 00 72 */ fmuls f29, f3, f1 /* 803234D4 00320434 EF C3 00 32 */ fmuls f30, f3, f0 /* 803234D8 00320438 7D 89 03 A6 */ mtctr r12 -/* 803234DC 0032043C 4E 80 04 21 */ bctrl +/* 803234DC 0032043C 4E 80 04 21 */ bctrl /* 803234E0 00320440 C0 01 00 08 */ lfs f0, 8(r1) /* 803234E4 00320444 38 60 00 00 */ li r3, 0 /* 803234E8 00320448 C0 7E 00 00 */ lfs f3, 0(r30) @@ -13775,7 +13775,7 @@ lbl_80323524: /* 80323554 003204B4 83 81 00 30 */ lwz r28, 0x30(r1) /* 80323558 003204B8 7C 08 03 A6 */ mtlr r0 /* 8032355C 003204BC 38 21 00 80 */ addi r1, r1, 0x80 -/* 80323560 003204C0 4E 80 00 20 */ blr +/* 80323560 003204C0 4E 80 00 20 */ blr .global __dt__24CMVEExponentialImplosionFv __dt__24CMVEExponentialImplosionFv: @@ -13797,7 +13797,7 @@ __dt__24CMVEExponentialImplosionFv: /* 803235A0 00320500 38 80 00 01 */ li r4, 1 /* 803235A4 00320504 81 8C 00 08 */ lwz r12, 8(r12) /* 803235A8 00320508 7D 89 03 A6 */ mtctr r12 -/* 803235AC 0032050C 4E 80 04 21 */ bctrl +/* 803235AC 0032050C 4E 80 04 21 */ bctrl lbl_803235B0: /* 803235B0 00320510 80 7E 00 08 */ lwz r3, 8(r30) /* 803235B4 00320514 28 03 00 00 */ cmplwi r3, 0 @@ -13806,7 +13806,7 @@ lbl_803235B0: /* 803235C0 00320520 38 80 00 01 */ li r4, 1 /* 803235C4 00320524 81 8C 00 08 */ lwz r12, 8(r12) /* 803235C8 00320528 7D 89 03 A6 */ mtctr r12 -/* 803235CC 0032052C 4E 80 04 21 */ bctrl +/* 803235CC 0032052C 4E 80 04 21 */ bctrl lbl_803235D0: /* 803235D0 00320530 80 7E 00 0C */ lwz r3, 0xc(r30) /* 803235D4 00320534 28 03 00 00 */ cmplwi r3, 0 @@ -13815,7 +13815,7 @@ lbl_803235D0: /* 803235E0 00320540 38 80 00 01 */ li r4, 1 /* 803235E4 00320544 81 8C 00 08 */ lwz r12, 8(r12) /* 803235E8 00320548 7D 89 03 A6 */ mtctr r12 -/* 803235EC 0032054C 4E 80 04 21 */ bctrl +/* 803235EC 0032054C 4E 80 04 21 */ bctrl lbl_803235F0: /* 803235F0 00320550 80 7E 00 10 */ lwz r3, 0x10(r30) /* 803235F4 00320554 28 03 00 00 */ cmplwi r3, 0 @@ -13824,7 +13824,7 @@ lbl_803235F0: /* 80323600 00320560 38 80 00 01 */ li r4, 1 /* 80323604 00320564 81 8C 00 08 */ lwz r12, 8(r12) /* 80323608 00320568 7D 89 03 A6 */ mtctr r12 -/* 8032360C 0032056C 4E 80 04 21 */ bctrl +/* 8032360C 0032056C 4E 80 04 21 */ bctrl lbl_80323610: /* 80323610 00320570 28 1E 00 00 */ cmplwi r30, 0 /* 80323614 00320574 41 82 00 20 */ beq lbl_80323634 @@ -13848,7 +13848,7 @@ lbl_80323648: /* 80323654 003205B4 83 C1 00 08 */ lwz r30, 8(r1) /* 80323658 003205B8 7C 08 03 A6 */ mtlr r0 /* 8032365C 003205BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80323660 003205C0 4E 80 00 20 */ blr +/* 80323660 003205C0 4E 80 00 20 */ blr .global __ct__24CMVEExponentialImplosionFP14CVectorElementP12CRealElementP12CRealElementP12CRealElementb __ct__24CMVEExponentialImplosionFP14CVectorElementP12CRealElementP12CRealElementP12CRealElementb: @@ -13866,7 +13866,7 @@ __ct__24CMVEExponentialImplosionFP14CVectorElementP12CRealElementP12CRealElement /* 80323690 003205F0 90 C3 00 0C */ stw r6, 0xc(r3) /* 80323694 003205F4 90 E3 00 10 */ stw r7, 0x10(r3) /* 80323698 003205F8 99 03 00 14 */ stb r8, 0x14(r3) -/* 8032369C 003205FC 4E 80 00 20 */ blr +/* 8032369C 003205FC 4E 80 00 20 */ blr .global GetValue__19CMVELinearImplosionCFiR9CVector3fR9CVector3f GetValue__19CMVELinearImplosionCFiR9CVector3fR9CVector3f: @@ -13896,7 +13896,7 @@ GetValue__19CMVELinearImplosionCFiR9CVector3fR9CVector3f: /* 803236FC 0032065C 81 83 00 00 */ lwz r12, 0(r3) /* 80323700 00320660 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80323704 00320664 7D 89 03 A6 */ mtctr r12 -/* 80323708 00320668 4E 80 04 21 */ bctrl +/* 80323708 00320668 4E 80 04 21 */ bctrl /* 8032370C 0032066C C0 21 00 24 */ lfs f1, 0x24(r1) /* 80323710 00320670 38 61 00 14 */ addi r3, r1, 0x14 /* 80323714 00320674 C0 1F 00 04 */ lfs f0, 4(r31) @@ -13918,7 +13918,7 @@ GetValue__19CMVELinearImplosionCFiR9CVector3fR9CVector3f: /* 80323754 003206B4 81 83 00 00 */ lwz r12, 0(r3) /* 80323758 003206B8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8032375C 003206BC 7D 89 03 A6 */ mtctr r12 -/* 80323760 003206C0 4E 80 04 21 */ bctrl +/* 80323760 003206C0 4E 80 04 21 */ bctrl /* 80323764 003206C4 C0 01 00 10 */ lfs f0, 0x10(r1) /* 80323768 003206C8 FC 1F 00 40 */ fcmpo cr0, f31, f0 /* 8032376C 003206CC 40 81 00 0C */ ble lbl_80323778 @@ -13931,7 +13931,7 @@ lbl_80323778: /* 80323784 003206E4 81 83 00 00 */ lwz r12, 0(r3) /* 80323788 003206E8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8032378C 003206EC 7D 89 03 A6 */ mtctr r12 -/* 80323790 003206F0 4E 80 04 21 */ bctrl +/* 80323790 003206F0 4E 80 04 21 */ bctrl /* 80323794 003206F4 88 1C 00 14 */ lbz r0, 0x14(r28) /* 80323798 003206F8 28 00 00 00 */ cmplwi r0, 0 /* 8032379C 003206FC 41 82 00 18 */ beq lbl_803237B4 @@ -13961,7 +13961,7 @@ lbl_803237C8: /* 803237F4 00320754 EF C3 00 72 */ fmuls f30, f3, f1 /* 803237F8 00320758 EF E3 00 32 */ fmuls f31, f3, f0 /* 803237FC 0032075C 7D 89 03 A6 */ mtctr r12 -/* 80323800 00320760 4E 80 04 21 */ bctrl +/* 80323800 00320760 4E 80 04 21 */ bctrl /* 80323804 00320764 C0 01 00 08 */ lfs f0, 8(r1) /* 80323808 00320768 38 60 00 00 */ li r3, 0 /* 8032380C 0032076C EC 40 07 72 */ fmuls f2, f0, f29 @@ -13984,7 +13984,7 @@ lbl_80323824: /* 8032384C 003207AC 83 81 00 30 */ lwz r28, 0x30(r1) /* 80323850 003207B0 7C 08 03 A6 */ mtlr r0 /* 80323854 003207B4 38 21 00 70 */ addi r1, r1, 0x70 -/* 80323858 003207B8 4E 80 00 20 */ blr +/* 80323858 003207B8 4E 80 00 20 */ blr .global __dt__19CMVELinearImplosionFv __dt__19CMVELinearImplosionFv: @@ -14006,7 +14006,7 @@ __dt__19CMVELinearImplosionFv: /* 80323898 003207F8 38 80 00 01 */ li r4, 1 /* 8032389C 003207FC 81 8C 00 08 */ lwz r12, 8(r12) /* 803238A0 00320800 7D 89 03 A6 */ mtctr r12 -/* 803238A4 00320804 4E 80 04 21 */ bctrl +/* 803238A4 00320804 4E 80 04 21 */ bctrl lbl_803238A8: /* 803238A8 00320808 80 7E 00 08 */ lwz r3, 8(r30) /* 803238AC 0032080C 28 03 00 00 */ cmplwi r3, 0 @@ -14015,7 +14015,7 @@ lbl_803238A8: /* 803238B8 00320818 38 80 00 01 */ li r4, 1 /* 803238BC 0032081C 81 8C 00 08 */ lwz r12, 8(r12) /* 803238C0 00320820 7D 89 03 A6 */ mtctr r12 -/* 803238C4 00320824 4E 80 04 21 */ bctrl +/* 803238C4 00320824 4E 80 04 21 */ bctrl lbl_803238C8: /* 803238C8 00320828 80 7E 00 0C */ lwz r3, 0xc(r30) /* 803238CC 0032082C 28 03 00 00 */ cmplwi r3, 0 @@ -14024,7 +14024,7 @@ lbl_803238C8: /* 803238D8 00320838 38 80 00 01 */ li r4, 1 /* 803238DC 0032083C 81 8C 00 08 */ lwz r12, 8(r12) /* 803238E0 00320840 7D 89 03 A6 */ mtctr r12 -/* 803238E4 00320844 4E 80 04 21 */ bctrl +/* 803238E4 00320844 4E 80 04 21 */ bctrl lbl_803238E8: /* 803238E8 00320848 80 7E 00 10 */ lwz r3, 0x10(r30) /* 803238EC 0032084C 28 03 00 00 */ cmplwi r3, 0 @@ -14033,7 +14033,7 @@ lbl_803238E8: /* 803238F8 00320858 38 80 00 01 */ li r4, 1 /* 803238FC 0032085C 81 8C 00 08 */ lwz r12, 8(r12) /* 80323900 00320860 7D 89 03 A6 */ mtctr r12 -/* 80323904 00320864 4E 80 04 21 */ bctrl +/* 80323904 00320864 4E 80 04 21 */ bctrl lbl_80323908: /* 80323908 00320868 28 1E 00 00 */ cmplwi r30, 0 /* 8032390C 0032086C 41 82 00 20 */ beq lbl_8032392C @@ -14057,7 +14057,7 @@ lbl_80323940: /* 8032394C 003208AC 83 C1 00 08 */ lwz r30, 8(r1) /* 80323950 003208B0 7C 08 03 A6 */ mtlr r0 /* 80323954 003208B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80323958 003208B8 4E 80 00 20 */ blr +/* 80323958 003208B8 4E 80 00 20 */ blr .global __ct__19CMVELinearImplosionFP14CVectorElementP12CRealElementP12CRealElementP12CRealElementb __ct__19CMVELinearImplosionFP14CVectorElementP12CRealElementP12CRealElementP12CRealElementb: @@ -14075,7 +14075,7 @@ __ct__19CMVELinearImplosionFP14CVectorElementP12CRealElementP12CRealElementP12CR /* 80323988 003208E8 90 C3 00 0C */ stw r6, 0xc(r3) /* 8032398C 003208EC 90 E3 00 10 */ stw r7, 0x10(r3) /* 80323990 003208F0 99 03 00 14 */ stb r8, 0x14(r3) -/* 80323994 003208F4 4E 80 00 20 */ blr +/* 80323994 003208F4 4E 80 00 20 */ blr .global GetValue__13CMVEImplosionCFiR9CVector3fR9CVector3f GetValue__13CMVEImplosionCFiR9CVector3fR9CVector3f: @@ -14105,7 +14105,7 @@ GetValue__13CMVEImplosionCFiR9CVector3fR9CVector3f: /* 803239F4 00320954 81 83 00 00 */ lwz r12, 0(r3) /* 803239F8 00320958 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803239FC 0032095C 7D 89 03 A6 */ mtctr r12 -/* 80323A00 00320960 4E 80 04 21 */ bctrl +/* 80323A00 00320960 4E 80 04 21 */ bctrl /* 80323A04 00320964 C0 21 00 24 */ lfs f1, 0x24(r1) /* 80323A08 00320968 38 61 00 14 */ addi r3, r1, 0x14 /* 80323A0C 0032096C C0 1F 00 04 */ lfs f0, 4(r31) @@ -14127,7 +14127,7 @@ GetValue__13CMVEImplosionCFiR9CVector3fR9CVector3f: /* 80323A4C 003209AC 81 83 00 00 */ lwz r12, 0(r3) /* 80323A50 003209B0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80323A54 003209B4 7D 89 03 A6 */ mtctr r12 -/* 80323A58 003209B8 4E 80 04 21 */ bctrl +/* 80323A58 003209B8 4E 80 04 21 */ bctrl /* 80323A5C 003209BC C0 01 00 10 */ lfs f0, 0x10(r1) /* 80323A60 003209C0 FC 1F 00 40 */ fcmpo cr0, f31, f0 /* 80323A64 003209C4 40 81 00 0C */ ble lbl_80323A70 @@ -14140,7 +14140,7 @@ lbl_80323A70: /* 80323A7C 003209DC 81 83 00 00 */ lwz r12, 0(r3) /* 80323A80 003209E0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80323A84 003209E4 7D 89 03 A6 */ mtctr r12 -/* 80323A88 003209E8 4E 80 04 21 */ bctrl +/* 80323A88 003209E8 4E 80 04 21 */ bctrl /* 80323A8C 003209EC 88 1C 00 14 */ lbz r0, 0x14(r28) /* 80323A90 003209F0 28 00 00 00 */ cmplwi r0, 0 /* 80323A94 003209F4 41 82 00 18 */ beq lbl_80323AAC @@ -14170,7 +14170,7 @@ lbl_80323AC0: /* 80323AEC 00320A4C EF C3 00 72 */ fmuls f30, f3, f1 /* 80323AF0 00320A50 EF E3 00 32 */ fmuls f31, f3, f0 /* 80323AF4 00320A54 7D 89 03 A6 */ mtctr r12 -/* 80323AF8 00320A58 4E 80 04 21 */ bctrl +/* 80323AF8 00320A58 4E 80 04 21 */ bctrl /* 80323AFC 00320A5C C0 01 00 08 */ lfs f0, 8(r1) /* 80323B00 00320A60 38 60 00 00 */ li r3, 0 /* 80323B04 00320A64 C0 7E 00 00 */ lfs f3, 0(r30) @@ -14199,7 +14199,7 @@ lbl_80323B34: /* 80323B5C 00320ABC 83 81 00 30 */ lwz r28, 0x30(r1) /* 80323B60 00320AC0 7C 08 03 A6 */ mtlr r0 /* 80323B64 00320AC4 38 21 00 70 */ addi r1, r1, 0x70 -/* 80323B68 00320AC8 4E 80 00 20 */ blr +/* 80323B68 00320AC8 4E 80 00 20 */ blr .global __dt__13CMVEImplosionFv __dt__13CMVEImplosionFv: @@ -14221,7 +14221,7 @@ __dt__13CMVEImplosionFv: /* 80323BA8 00320B08 38 80 00 01 */ li r4, 1 /* 80323BAC 00320B0C 81 8C 00 08 */ lwz r12, 8(r12) /* 80323BB0 00320B10 7D 89 03 A6 */ mtctr r12 -/* 80323BB4 00320B14 4E 80 04 21 */ bctrl +/* 80323BB4 00320B14 4E 80 04 21 */ bctrl lbl_80323BB8: /* 80323BB8 00320B18 80 7E 00 08 */ lwz r3, 8(r30) /* 80323BBC 00320B1C 28 03 00 00 */ cmplwi r3, 0 @@ -14230,7 +14230,7 @@ lbl_80323BB8: /* 80323BC8 00320B28 38 80 00 01 */ li r4, 1 /* 80323BCC 00320B2C 81 8C 00 08 */ lwz r12, 8(r12) /* 80323BD0 00320B30 7D 89 03 A6 */ mtctr r12 -/* 80323BD4 00320B34 4E 80 04 21 */ bctrl +/* 80323BD4 00320B34 4E 80 04 21 */ bctrl lbl_80323BD8: /* 80323BD8 00320B38 80 7E 00 0C */ lwz r3, 0xc(r30) /* 80323BDC 00320B3C 28 03 00 00 */ cmplwi r3, 0 @@ -14239,7 +14239,7 @@ lbl_80323BD8: /* 80323BE8 00320B48 38 80 00 01 */ li r4, 1 /* 80323BEC 00320B4C 81 8C 00 08 */ lwz r12, 8(r12) /* 80323BF0 00320B50 7D 89 03 A6 */ mtctr r12 -/* 80323BF4 00320B54 4E 80 04 21 */ bctrl +/* 80323BF4 00320B54 4E 80 04 21 */ bctrl lbl_80323BF8: /* 80323BF8 00320B58 80 7E 00 10 */ lwz r3, 0x10(r30) /* 80323BFC 00320B5C 28 03 00 00 */ cmplwi r3, 0 @@ -14248,7 +14248,7 @@ lbl_80323BF8: /* 80323C08 00320B68 38 80 00 01 */ li r4, 1 /* 80323C0C 00320B6C 81 8C 00 08 */ lwz r12, 8(r12) /* 80323C10 00320B70 7D 89 03 A6 */ mtctr r12 -/* 80323C14 00320B74 4E 80 04 21 */ bctrl +/* 80323C14 00320B74 4E 80 04 21 */ bctrl lbl_80323C18: /* 80323C18 00320B78 28 1E 00 00 */ cmplwi r30, 0 /* 80323C1C 00320B7C 41 82 00 20 */ beq lbl_80323C3C @@ -14272,7 +14272,7 @@ lbl_80323C50: /* 80323C5C 00320BBC 83 C1 00 08 */ lwz r30, 8(r1) /* 80323C60 00320BC0 7C 08 03 A6 */ mtlr r0 /* 80323C64 00320BC4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80323C68 00320BC8 4E 80 00 20 */ blr +/* 80323C68 00320BC8 4E 80 00 20 */ blr .global __ct__13CMVEImplosionFP14CVectorElementP12CRealElementP12CRealElementP12CRealElementb __ct__13CMVEImplosionFP14CVectorElementP12CRealElementP12CRealElementP12CRealElementb: @@ -14290,7 +14290,7 @@ __ct__13CMVEImplosionFP14CVectorElementP12CRealElementP12CRealElementP12CRealEle /* 80323C98 00320BF8 90 C3 00 0C */ stw r6, 0xc(r3) /* 80323C9C 00320BFC 90 E3 00 10 */ stw r7, 0x10(r3) /* 80323CA0 00320C00 99 03 00 14 */ stb r8, 0x14(r3) -/* 80323CA4 00320C04 4E 80 00 20 */ blr +/* 80323CA4 00320C04 4E 80 00 20 */ blr .global GetValue__9CMVEPulseCFiR9CVector3fR9CVector3f GetValue__9CMVEPulseCFiR9CVector3fR9CVector3f: @@ -14310,14 +14310,14 @@ GetValue__9CMVEPulseCFiR9CVector3fR9CVector3f: /* 80323CDC 00320C3C 81 83 00 00 */ lwz r12, 0(r3) /* 80323CE0 00320C40 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80323CE4 00320C44 7D 89 03 A6 */ mtctr r12 -/* 80323CE8 00320C48 4E 80 04 21 */ bctrl +/* 80323CE8 00320C48 4E 80 04 21 */ bctrl /* 80323CEC 00320C4C 80 7C 00 08 */ lwz r3, 8(r28) /* 80323CF0 00320C50 7F A4 EB 78 */ mr r4, r29 /* 80323CF4 00320C54 38 A1 00 08 */ addi r5, r1, 8 /* 80323CF8 00320C58 81 83 00 00 */ lwz r12, 0(r3) /* 80323CFC 00320C5C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80323D00 00320C60 7D 89 03 A6 */ mtctr r12 -/* 80323D04 00320C64 4E 80 04 21 */ bctrl +/* 80323D04 00320C64 4E 80 04 21 */ bctrl /* 80323D08 00320C68 80 61 00 08 */ lwz r3, 8(r1) /* 80323D0C 00320C6C 80 81 00 0C */ lwz r4, 0xc(r1) /* 80323D10 00320C70 38 A3 00 01 */ addi r5, r3, 1 @@ -14339,7 +14339,7 @@ lbl_80323D20: /* 80323D4C 00320CAC 81 83 00 00 */ lwz r12, 0(r3) /* 80323D50 00320CB0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80323D54 00320CB4 7D 89 03 A6 */ mtctr r12 -/* 80323D58 00320CB8 4E 80 04 21 */ bctrl +/* 80323D58 00320CB8 4E 80 04 21 */ bctrl /* 80323D5C 00320CBC 48 00 00 48 */ b lbl_80323DA4 lbl_80323D60: /* 80323D60 00320CC0 80 7C 00 0C */ lwz r3, 0xc(r28) @@ -14349,7 +14349,7 @@ lbl_80323D60: /* 80323D70 00320CD0 81 83 00 00 */ lwz r12, 0(r3) /* 80323D74 00320CD4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80323D78 00320CD8 7D 89 03 A6 */ mtctr r12 -/* 80323D7C 00320CDC 4E 80 04 21 */ bctrl +/* 80323D7C 00320CDC 4E 80 04 21 */ bctrl /* 80323D80 00320CE0 48 00 00 24 */ b lbl_80323DA4 lbl_80323D84: /* 80323D84 00320CE4 80 7C 00 0C */ lwz r3, 0xc(r28) @@ -14359,7 +14359,7 @@ lbl_80323D84: /* 80323D94 00320CF4 81 83 00 00 */ lwz r12, 0(r3) /* 80323D98 00320CF8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80323D9C 00320CFC 7D 89 03 A6 */ mtctr r12 -/* 80323DA0 00320D00 4E 80 04 21 */ bctrl +/* 80323DA0 00320D00 4E 80 04 21 */ bctrl lbl_80323DA4: /* 80323DA4 00320D04 80 01 00 24 */ lwz r0, 0x24(r1) /* 80323DA8 00320D08 38 60 00 00 */ li r3, 0 @@ -14369,7 +14369,7 @@ lbl_80323DA4: /* 80323DB8 00320D18 83 81 00 10 */ lwz r28, 0x10(r1) /* 80323DBC 00320D1C 7C 08 03 A6 */ mtlr r0 /* 80323DC0 00320D20 38 21 00 20 */ addi r1, r1, 0x20 -/* 80323DC4 00320D24 4E 80 00 20 */ blr +/* 80323DC4 00320D24 4E 80 00 20 */ blr .global __dt__9CMVEPulseFv __dt__9CMVEPulseFv: @@ -14391,7 +14391,7 @@ __dt__9CMVEPulseFv: /* 80323E04 00320D64 38 80 00 01 */ li r4, 1 /* 80323E08 00320D68 81 8C 00 08 */ lwz r12, 8(r12) /* 80323E0C 00320D6C 7D 89 03 A6 */ mtctr r12 -/* 80323E10 00320D70 4E 80 04 21 */ bctrl +/* 80323E10 00320D70 4E 80 04 21 */ bctrl lbl_80323E14: /* 80323E14 00320D74 80 7E 00 08 */ lwz r3, 8(r30) /* 80323E18 00320D78 28 03 00 00 */ cmplwi r3, 0 @@ -14400,7 +14400,7 @@ lbl_80323E14: /* 80323E24 00320D84 38 80 00 01 */ li r4, 1 /* 80323E28 00320D88 81 8C 00 08 */ lwz r12, 8(r12) /* 80323E2C 00320D8C 7D 89 03 A6 */ mtctr r12 -/* 80323E30 00320D90 4E 80 04 21 */ bctrl +/* 80323E30 00320D90 4E 80 04 21 */ bctrl lbl_80323E34: /* 80323E34 00320D94 80 7E 00 0C */ lwz r3, 0xc(r30) /* 80323E38 00320D98 28 03 00 00 */ cmplwi r3, 0 @@ -14409,7 +14409,7 @@ lbl_80323E34: /* 80323E44 00320DA4 38 80 00 01 */ li r4, 1 /* 80323E48 00320DA8 81 8C 00 08 */ lwz r12, 8(r12) /* 80323E4C 00320DAC 7D 89 03 A6 */ mtctr r12 -/* 80323E50 00320DB0 4E 80 04 21 */ bctrl +/* 80323E50 00320DB0 4E 80 04 21 */ bctrl lbl_80323E54: /* 80323E54 00320DB4 80 7E 00 10 */ lwz r3, 0x10(r30) /* 80323E58 00320DB8 28 03 00 00 */ cmplwi r3, 0 @@ -14418,7 +14418,7 @@ lbl_80323E54: /* 80323E64 00320DC4 38 80 00 01 */ li r4, 1 /* 80323E68 00320DC8 81 8C 00 08 */ lwz r12, 8(r12) /* 80323E6C 00320DCC 7D 89 03 A6 */ mtctr r12 -/* 80323E70 00320DD0 4E 80 04 21 */ bctrl +/* 80323E70 00320DD0 4E 80 04 21 */ bctrl lbl_80323E74: /* 80323E74 00320DD4 28 1E 00 00 */ cmplwi r30, 0 /* 80323E78 00320DD8 41 82 00 20 */ beq lbl_80323E98 @@ -14442,7 +14442,7 @@ lbl_80323EAC: /* 80323EB8 00320E18 83 C1 00 08 */ lwz r30, 8(r1) /* 80323EBC 00320E1C 7C 08 03 A6 */ mtlr r0 /* 80323EC0 00320E20 38 21 00 10 */ addi r1, r1, 0x10 -/* 80323EC4 00320E24 4E 80 00 20 */ blr +/* 80323EC4 00320E24 4E 80 00 20 */ blr .global __ct__9CMVEPulseFP11CIntElementP11CIntElementP17CModVectorElementP17CModVectorElement __ct__9CMVEPulseFP11CIntElementP11CIntElementP17CModVectorElementP17CModVectorElement: @@ -14459,7 +14459,7 @@ __ct__9CMVEPulseFP11CIntElementP11CIntElementP17CModVectorElementP17CModVectorEl /* 80323EF0 00320E50 90 A3 00 08 */ stw r5, 8(r3) /* 80323EF4 00320E54 90 C3 00 0C */ stw r6, 0xc(r3) /* 80323EF8 00320E58 90 E3 00 10 */ stw r7, 0x10(r3) -/* 80323EFC 00320E5C 4E 80 00 20 */ blr +/* 80323EFC 00320E5C 4E 80 00 20 */ blr .global GetValue__13CMVETimeChainCFiR9CVector3fR9CVector3f GetValue__13CMVETimeChainCFiR9CVector3fR9CVector3f: @@ -14479,7 +14479,7 @@ GetValue__13CMVETimeChainCFiR9CVector3fR9CVector3f: /* 80323F34 00320E94 81 83 00 00 */ lwz r12, 0(r3) /* 80323F38 00320E98 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80323F3C 00320E9C 7D 89 03 A6 */ mtctr r12 -/* 80323F40 00320EA0 4E 80 04 21 */ bctrl +/* 80323F40 00320EA0 4E 80 04 21 */ bctrl /* 80323F44 00320EA4 80 01 00 08 */ lwz r0, 8(r1) /* 80323F48 00320EA8 7C 1D 00 00 */ cmpw r29, r0 /* 80323F4C 00320EAC 40 80 00 28 */ bge lbl_80323F74 @@ -14490,7 +14490,7 @@ GetValue__13CMVETimeChainCFiR9CVector3fR9CVector3f: /* 80323F60 00320EC0 81 83 00 00 */ lwz r12, 0(r3) /* 80323F64 00320EC4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80323F68 00320EC8 7D 89 03 A6 */ mtctr r12 -/* 80323F6C 00320ECC 4E 80 04 21 */ bctrl +/* 80323F6C 00320ECC 4E 80 04 21 */ bctrl /* 80323F70 00320ED0 48 00 00 24 */ b lbl_80323F94 lbl_80323F74: /* 80323F74 00320ED4 80 7C 00 08 */ lwz r3, 8(r28) @@ -14500,7 +14500,7 @@ lbl_80323F74: /* 80323F84 00320EE4 81 83 00 00 */ lwz r12, 0(r3) /* 80323F88 00320EE8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80323F8C 00320EEC 7D 89 03 A6 */ mtctr r12 -/* 80323F90 00320EF0 4E 80 04 21 */ bctrl +/* 80323F90 00320EF0 4E 80 04 21 */ bctrl lbl_80323F94: /* 80323F94 00320EF4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80323F98 00320EF8 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -14509,7 +14509,7 @@ lbl_80323F94: /* 80323FA4 00320F04 83 81 00 10 */ lwz r28, 0x10(r1) /* 80323FA8 00320F08 7C 08 03 A6 */ mtlr r0 /* 80323FAC 00320F0C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80323FB0 00320F10 4E 80 00 20 */ blr +/* 80323FB0 00320F10 4E 80 00 20 */ blr .global __dt__13CMVETimeChainFv __dt__13CMVETimeChainFv: @@ -14531,7 +14531,7 @@ __dt__13CMVETimeChainFv: /* 80323FF0 00320F50 38 80 00 01 */ li r4, 1 /* 80323FF4 00320F54 81 8C 00 08 */ lwz r12, 8(r12) /* 80323FF8 00320F58 7D 89 03 A6 */ mtctr r12 -/* 80323FFC 00320F5C 4E 80 04 21 */ bctrl +/* 80323FFC 00320F5C 4E 80 04 21 */ bctrl lbl_80324000: /* 80324000 00320F60 80 7E 00 08 */ lwz r3, 8(r30) /* 80324004 00320F64 28 03 00 00 */ cmplwi r3, 0 @@ -14540,7 +14540,7 @@ lbl_80324000: /* 80324010 00320F70 38 80 00 01 */ li r4, 1 /* 80324014 00320F74 81 8C 00 08 */ lwz r12, 8(r12) /* 80324018 00320F78 7D 89 03 A6 */ mtctr r12 -/* 8032401C 00320F7C 4E 80 04 21 */ bctrl +/* 8032401C 00320F7C 4E 80 04 21 */ bctrl lbl_80324020: /* 80324020 00320F80 80 7E 00 0C */ lwz r3, 0xc(r30) /* 80324024 00320F84 28 03 00 00 */ cmplwi r3, 0 @@ -14549,7 +14549,7 @@ lbl_80324020: /* 80324030 00320F90 38 80 00 01 */ li r4, 1 /* 80324034 00320F94 81 8C 00 08 */ lwz r12, 8(r12) /* 80324038 00320F98 7D 89 03 A6 */ mtctr r12 -/* 8032403C 00320F9C 4E 80 04 21 */ bctrl +/* 8032403C 00320F9C 4E 80 04 21 */ bctrl lbl_80324040: /* 80324040 00320FA0 28 1E 00 00 */ cmplwi r30, 0 /* 80324044 00320FA4 41 82 00 20 */ beq lbl_80324064 @@ -14573,7 +14573,7 @@ lbl_80324078: /* 80324084 00320FE4 83 C1 00 08 */ lwz r30, 8(r1) /* 80324088 00320FE8 7C 08 03 A6 */ mtlr r0 /* 8032408C 00320FEC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80324090 00320FF0 4E 80 00 20 */ blr +/* 80324090 00320FF0 4E 80 00 20 */ blr .global __ct__13CMVETimeChainFP17CModVectorElementP17CModVectorElementP11CIntElement __ct__13CMVETimeChainFP17CModVectorElementP17CModVectorElementP11CIntElement: @@ -14589,7 +14589,7 @@ __ct__13CMVETimeChainFP17CModVectorElementP17CModVectorElementP11CIntElement: /* 803240B8 00321018 90 83 00 04 */ stw r4, 4(r3) /* 803240BC 0032101C 90 A3 00 08 */ stw r5, 8(r3) /* 803240C0 00321020 90 C3 00 0C */ stw r6, 0xc(r3) -/* 803240C4 00321024 4E 80 00 20 */ blr +/* 803240C4 00321024 4E 80 00 20 */ blr .global GetValue__11CMVEExplodeCFiR9CVector3fR9CVector3f GetValue__11CMVEExplodeCFiR9CVector3fR9CVector3f: @@ -14636,7 +14636,7 @@ lbl_80324120: /* 80324164 003210C4 81 83 00 00 */ lwz r12, 0(r3) /* 80324168 003210C8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8032416C 003210CC 7D 89 03 A6 */ mtctr r12 -/* 80324170 003210D0 4E 80 04 21 */ bctrl +/* 80324170 003210D0 4E 80 04 21 */ bctrl /* 80324174 003210D4 D3 A1 00 10 */ stfs f29, 0x10(r1) /* 80324178 003210D8 38 61 00 10 */ addi r3, r1, 0x10 /* 8032417C 003210DC D3 81 00 14 */ stfs f28, 0x14(r1) @@ -14664,7 +14664,7 @@ lbl_803241C8: /* 803241D0 00321130 81 83 00 00 */ lwz r12, 0(r3) /* 803241D4 00321134 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803241D8 00321138 7D 89 03 A6 */ mtctr r12 -/* 803241DC 0032113C 4E 80 04 21 */ bctrl +/* 803241DC 0032113C 4E 80 04 21 */ bctrl /* 803241E0 00321140 C0 21 00 08 */ lfs f1, 8(r1) /* 803241E4 00321144 C0 1F 00 00 */ lfs f0, 0(r31) /* 803241E8 00321148 EC 00 00 72 */ fmuls f0, f0, f1 @@ -14693,7 +14693,7 @@ lbl_80324208: /* 80324240 003211A0 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80324244 003211A4 7C 08 03 A6 */ mtlr r0 /* 80324248 003211A8 38 21 00 80 */ addi r1, r1, 0x80 -/* 8032424C 003211AC 4E 80 00 20 */ blr +/* 8032424C 003211AC 4E 80 00 20 */ blr .global __dt__11CMVEExplodeFv __dt__11CMVEExplodeFv: @@ -14715,7 +14715,7 @@ __dt__11CMVEExplodeFv: /* 8032428C 003211EC 38 80 00 01 */ li r4, 1 /* 80324290 003211F0 81 8C 00 08 */ lwz r12, 8(r12) /* 80324294 003211F4 7D 89 03 A6 */ mtctr r12 -/* 80324298 003211F8 4E 80 04 21 */ bctrl +/* 80324298 003211F8 4E 80 04 21 */ bctrl lbl_8032429C: /* 8032429C 003211FC 80 7E 00 08 */ lwz r3, 8(r30) /* 803242A0 00321200 28 03 00 00 */ cmplwi r3, 0 @@ -14724,7 +14724,7 @@ lbl_8032429C: /* 803242AC 0032120C 38 80 00 01 */ li r4, 1 /* 803242B0 00321210 81 8C 00 08 */ lwz r12, 8(r12) /* 803242B4 00321214 7D 89 03 A6 */ mtctr r12 -/* 803242B8 00321218 4E 80 04 21 */ bctrl +/* 803242B8 00321218 4E 80 04 21 */ bctrl lbl_803242BC: /* 803242BC 0032121C 28 1E 00 00 */ cmplwi r30, 0 /* 803242C0 00321220 41 82 00 20 */ beq lbl_803242E0 @@ -14748,7 +14748,7 @@ lbl_803242F4: /* 80324300 00321260 83 C1 00 08 */ lwz r30, 8(r1) /* 80324304 00321264 7C 08 03 A6 */ mtlr r0 /* 80324308 00321268 38 21 00 10 */ addi r1, r1, 0x10 -/* 8032430C 0032126C 4E 80 00 20 */ blr +/* 8032430C 0032126C 4E 80 00 20 */ blr .global __ct__11CMVEExplodeFP12CRealElementP12CRealElement __ct__11CMVEExplodeFP12CRealElementP12CRealElement: @@ -14763,7 +14763,7 @@ __ct__11CMVEExplodeFP12CRealElementP12CRealElement: /* 80324330 00321290 90 03 00 00 */ stw r0, 0(r3) /* 80324334 00321294 90 83 00 04 */ stw r4, 4(r3) /* 80324338 00321298 90 A3 00 08 */ stw r5, 8(r3) -/* 8032433C 0032129C 4E 80 00 20 */ blr +/* 8032433C 0032129C 4E 80 00 20 */ blr .global GetValue__8CMVEWindCFiR9CVector3fR9CVector3f GetValue__8CMVEWindCFiR9CVector3fR9CVector3f: @@ -14791,7 +14791,7 @@ GetValue__8CMVEWindCFiR9CVector3fR9CVector3f: /* 80324394 003212F4 81 83 00 00 */ lwz r12, 0(r3) /* 80324398 003212F8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8032439C 003212FC 7D 89 03 A6 */ mtctr r12 -/* 803243A0 00321300 4E 80 04 21 */ bctrl +/* 803243A0 00321300 4E 80 04 21 */ bctrl /* 803243A4 00321304 80 7D 00 08 */ lwz r3, 8(r29) /* 803243A8 00321308 7F C4 F3 78 */ mr r4, r30 /* 803243AC 0032130C C0 21 00 0C */ lfs f1, 0xc(r1) @@ -14807,7 +14807,7 @@ GetValue__8CMVEWindCFiR9CVector3fR9CVector3f: /* 803243D4 00321334 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803243D8 00321338 EF A1 00 28 */ fsubs f29, f1, f0 /* 803243DC 0032133C 7D 89 03 A6 */ mtctr r12 -/* 803243E0 00321340 4E 80 04 21 */ bctrl +/* 803243E0 00321340 4E 80 04 21 */ bctrl /* 803243E4 00321344 C0 21 00 08 */ lfs f1, 8(r1) /* 803243E8 00321348 38 60 00 00 */ li r3, 0 /* 803243EC 0032134C C0 1F 00 00 */ lfs f0, 0(r31) @@ -14834,7 +14834,7 @@ GetValue__8CMVEWindCFiR9CVector3fR9CVector3f: /* 80324440 003213A0 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80324444 003213A4 7C 08 03 A6 */ mtlr r0 /* 80324448 003213A8 38 21 00 60 */ addi r1, r1, 0x60 -/* 8032444C 003213AC 4E 80 00 20 */ blr +/* 8032444C 003213AC 4E 80 00 20 */ blr .global __dt__8CMVEWindFv __dt__8CMVEWindFv: @@ -14856,7 +14856,7 @@ __dt__8CMVEWindFv: /* 8032448C 003213EC 38 80 00 01 */ li r4, 1 /* 80324490 003213F0 81 8C 00 08 */ lwz r12, 8(r12) /* 80324494 003213F4 7D 89 03 A6 */ mtctr r12 -/* 80324498 003213F8 4E 80 04 21 */ bctrl +/* 80324498 003213F8 4E 80 04 21 */ bctrl lbl_8032449C: /* 8032449C 003213FC 80 7E 00 08 */ lwz r3, 8(r30) /* 803244A0 00321400 28 03 00 00 */ cmplwi r3, 0 @@ -14865,7 +14865,7 @@ lbl_8032449C: /* 803244AC 0032140C 38 80 00 01 */ li r4, 1 /* 803244B0 00321410 81 8C 00 08 */ lwz r12, 8(r12) /* 803244B4 00321414 7D 89 03 A6 */ mtctr r12 -/* 803244B8 00321418 4E 80 04 21 */ bctrl +/* 803244B8 00321418 4E 80 04 21 */ bctrl lbl_803244BC: /* 803244BC 0032141C 28 1E 00 00 */ cmplwi r30, 0 /* 803244C0 00321420 41 82 00 20 */ beq lbl_803244E0 @@ -14889,7 +14889,7 @@ lbl_803244F4: /* 80324500 00321460 83 C1 00 08 */ lwz r30, 8(r1) /* 80324504 00321464 7C 08 03 A6 */ mtlr r0 /* 80324508 00321468 38 21 00 10 */ addi r1, r1, 0x10 -/* 8032450C 0032146C 4E 80 00 20 */ blr +/* 8032450C 0032146C 4E 80 00 20 */ blr .global __ct__8CMVEWindFP14CVectorElementP12CRealElement __ct__8CMVEWindFP14CVectorElementP12CRealElement: @@ -14904,7 +14904,7 @@ __ct__8CMVEWindFP14CVectorElementP12CRealElement: /* 80324530 00321490 90 03 00 00 */ stw r0, 0(r3) /* 80324534 00321494 90 83 00 04 */ stw r4, 4(r3) /* 80324538 00321498 90 A3 00 08 */ stw r5, 8(r3) -/* 8032453C 0032149C 4E 80 00 20 */ blr +/* 8032453C 0032149C 4E 80 00 20 */ blr .global GetValue__11CMVEGravityCFiR9CVector3fR9CVector3f GetValue__11CMVEGravityCFiR9CVector3fR9CVector3f: @@ -14922,7 +14922,7 @@ GetValue__11CMVEGravityCFiR9CVector3fR9CVector3f: /* 8032456C 003214CC 81 83 00 00 */ lwz r12, 0(r3) /* 80324570 003214D0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80324574 003214D4 7D 89 03 A6 */ mtctr r12 -/* 80324578 003214D8 4E 80 04 21 */ bctrl +/* 80324578 003214D8 4E 80 04 21 */ bctrl /* 8032457C 003214DC C0 3F 00 00 */ lfs f1, 0(r31) /* 80324580 003214E0 38 60 00 00 */ li r3, 0 /* 80324584 003214E4 C0 01 00 08 */ lfs f0, 8(r1) @@ -14940,7 +14940,7 @@ GetValue__11CMVEGravityCFiR9CVector3fR9CVector3f: /* 803245B4 00321514 80 01 00 24 */ lwz r0, 0x24(r1) /* 803245B8 00321518 7C 08 03 A6 */ mtlr r0 /* 803245BC 0032151C 38 21 00 20 */ addi r1, r1, 0x20 -/* 803245C0 00321520 4E 80 00 20 */ blr +/* 803245C0 00321520 4E 80 00 20 */ blr .global __dt__11CMVEGravityFv __dt__11CMVEGravityFv: @@ -14962,7 +14962,7 @@ __dt__11CMVEGravityFv: /* 80324600 00321560 38 80 00 01 */ li r4, 1 /* 80324604 00321564 81 8C 00 08 */ lwz r12, 8(r12) /* 80324608 00321568 7D 89 03 A6 */ mtctr r12 -/* 8032460C 0032156C 4E 80 04 21 */ bctrl +/* 8032460C 0032156C 4E 80 04 21 */ bctrl lbl_80324610: /* 80324610 00321570 28 1E 00 00 */ cmplwi r30, 0 /* 80324614 00321574 41 82 00 20 */ beq lbl_80324634 @@ -14986,7 +14986,7 @@ lbl_80324648: /* 80324654 003215B4 83 C1 00 08 */ lwz r30, 8(r1) /* 80324658 003215B8 7C 08 03 A6 */ mtlr r0 /* 8032465C 003215BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80324660 003215C0 4E 80 00 20 */ blr +/* 80324660 003215C0 4E 80 00 20 */ blr .global __ct__11CMVEGravityFP14CVectorElement __ct__11CMVEGravityFP14CVectorElement: @@ -15000,7 +15000,7 @@ __ct__11CMVEGravityFP14CVectorElement: /* 80324680 003215E0 90 C3 00 00 */ stw r6, 0(r3) /* 80324684 003215E4 90 03 00 00 */ stw r0, 0(r3) /* 80324688 003215E8 90 83 00 04 */ stw r4, 4(r3) -/* 8032468C 003215EC 4E 80 00 20 */ blr +/* 8032468C 003215EC 4E 80 00 20 */ blr .global GetValue__16CMVEFastConstantCFiR9CVector3fR9CVector3f GetValue__16CMVEFastConstantCFiR9CVector3fR9CVector3f: @@ -15011,7 +15011,7 @@ GetValue__16CMVEFastConstantCFiR9CVector3fR9CVector3f: /* 803246A0 00321600 C0 03 00 0C */ lfs f0, 0xc(r3) /* 803246A4 00321604 38 60 00 00 */ li r3, 0 /* 803246A8 00321608 D0 05 00 08 */ stfs f0, 8(r5) -/* 803246AC 0032160C 4E 80 00 20 */ blr +/* 803246AC 0032160C 4E 80 00 20 */ blr .global __dt__16CMVEFastConstantFv __dt__16CMVEFastConstantFv: @@ -15044,7 +15044,7 @@ lbl_80324708: /* 80324710 00321670 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80324714 00321674 7C 08 03 A6 */ mtlr r0 /* 80324718 00321678 38 21 00 10 */ addi r1, r1, 0x10 -/* 8032471C 0032167C 4E 80 00 20 */ blr +/* 8032471C 0032167C 4E 80 00 20 */ blr .global __ct__16CMVEFastConstantFfff __ct__16CMVEFastConstantFfff: @@ -15060,7 +15060,7 @@ __ct__16CMVEFastConstantFfff: /* 80324744 003216A4 D0 23 00 04 */ stfs f1, 4(r3) /* 80324748 003216A8 D0 43 00 08 */ stfs f2, 8(r3) /* 8032474C 003216AC D0 63 00 0C */ stfs f3, 0xc(r3) -/* 80324750 003216B0 4E 80 00 20 */ blr +/* 80324750 003216B0 4E 80 00 20 */ blr .global GetValue__12CMVEConstantCFiR9CVector3fR9CVector3f GetValue__12CMVEConstantCFiR9CVector3fR9CVector3f: @@ -15078,21 +15078,21 @@ GetValue__12CMVEConstantCFiR9CVector3fR9CVector3f: /* 80324780 003216E0 81 83 00 00 */ lwz r12, 0(r3) /* 80324784 003216E4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80324788 003216E8 7D 89 03 A6 */ mtctr r12 -/* 8032478C 003216EC 4E 80 04 21 */ bctrl +/* 8032478C 003216EC 4E 80 04 21 */ bctrl /* 80324790 003216F0 80 7D 00 08 */ lwz r3, 8(r29) /* 80324794 003216F4 7F C4 F3 78 */ mr r4, r30 /* 80324798 003216F8 38 A1 00 0C */ addi r5, r1, 0xc /* 8032479C 003216FC 81 83 00 00 */ lwz r12, 0(r3) /* 803247A0 00321700 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803247A4 00321704 7D 89 03 A6 */ mtctr r12 -/* 803247A8 00321708 4E 80 04 21 */ bctrl +/* 803247A8 00321708 4E 80 04 21 */ bctrl /* 803247AC 0032170C 80 7D 00 0C */ lwz r3, 0xc(r29) /* 803247B0 00321710 7F C4 F3 78 */ mr r4, r30 /* 803247B4 00321714 38 A1 00 08 */ addi r5, r1, 8 /* 803247B8 00321718 81 83 00 00 */ lwz r12, 0(r3) /* 803247BC 0032171C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803247C0 00321720 7D 89 03 A6 */ mtctr r12 -/* 803247C4 00321724 4E 80 04 21 */ bctrl +/* 803247C4 00321724 4E 80 04 21 */ bctrl /* 803247C8 00321728 C0 41 00 08 */ lfs f2, 8(r1) /* 803247CC 0032172C 38 60 00 00 */ li r3, 0 /* 803247D0 00321730 C0 21 00 0C */ lfs f1, 0xc(r1) @@ -15106,7 +15106,7 @@ GetValue__12CMVEConstantCFiR9CVector3fR9CVector3f: /* 803247F0 00321750 80 01 00 34 */ lwz r0, 0x34(r1) /* 803247F4 00321754 7C 08 03 A6 */ mtlr r0 /* 803247F8 00321758 38 21 00 30 */ addi r1, r1, 0x30 -/* 803247FC 0032175C 4E 80 00 20 */ blr +/* 803247FC 0032175C 4E 80 00 20 */ blr .global __dt__12CMVEConstantFv __dt__12CMVEConstantFv: @@ -15128,7 +15128,7 @@ __dt__12CMVEConstantFv: /* 8032483C 0032179C 38 80 00 01 */ li r4, 1 /* 80324840 003217A0 81 8C 00 08 */ lwz r12, 8(r12) /* 80324844 003217A4 7D 89 03 A6 */ mtctr r12 -/* 80324848 003217A8 4E 80 04 21 */ bctrl +/* 80324848 003217A8 4E 80 04 21 */ bctrl lbl_8032484C: /* 8032484C 003217AC 80 7E 00 08 */ lwz r3, 8(r30) /* 80324850 003217B0 28 03 00 00 */ cmplwi r3, 0 @@ -15137,7 +15137,7 @@ lbl_8032484C: /* 8032485C 003217BC 38 80 00 01 */ li r4, 1 /* 80324860 003217C0 81 8C 00 08 */ lwz r12, 8(r12) /* 80324864 003217C4 7D 89 03 A6 */ mtctr r12 -/* 80324868 003217C8 4E 80 04 21 */ bctrl +/* 80324868 003217C8 4E 80 04 21 */ bctrl lbl_8032486C: /* 8032486C 003217CC 80 7E 00 0C */ lwz r3, 0xc(r30) /* 80324870 003217D0 28 03 00 00 */ cmplwi r3, 0 @@ -15146,7 +15146,7 @@ lbl_8032486C: /* 8032487C 003217DC 38 80 00 01 */ li r4, 1 /* 80324880 003217E0 81 8C 00 08 */ lwz r12, 8(r12) /* 80324884 003217E4 7D 89 03 A6 */ mtctr r12 -/* 80324888 003217E8 4E 80 04 21 */ bctrl +/* 80324888 003217E8 4E 80 04 21 */ bctrl lbl_8032488C: /* 8032488C 003217EC 28 1E 00 00 */ cmplwi r30, 0 /* 80324890 003217F0 41 82 00 20 */ beq lbl_803248B0 @@ -15170,7 +15170,7 @@ lbl_803248C4: /* 803248D0 00321830 83 C1 00 08 */ lwz r30, 8(r1) /* 803248D4 00321834 7C 08 03 A6 */ mtlr r0 /* 803248D8 00321838 38 21 00 10 */ addi r1, r1, 0x10 -/* 803248DC 0032183C 4E 80 00 20 */ blr +/* 803248DC 0032183C 4E 80 00 20 */ blr .global __ct__12CMVEConstantFP12CRealElementP12CRealElementP12CRealElement __ct__12CMVEConstantFP12CRealElementP12CRealElementP12CRealElement: @@ -15186,7 +15186,7 @@ __ct__12CMVEConstantFP12CRealElementP12CRealElementP12CRealElement: /* 80324904 00321864 90 83 00 04 */ stw r4, 4(r3) /* 80324908 00321868 90 A3 00 08 */ stw r5, 8(r3) /* 8032490C 0032186C 90 C3 00 0C */ stw r6, 0xc(r3) -/* 80324910 00321870 4E 80 00 20 */ blr +/* 80324910 00321870 4E 80 00 20 */ blr .global CreateTexture__Fi CreateTexture__Fi: @@ -15241,7 +15241,7 @@ lbl_80324960: /* 803249D0 00321930 83 C1 00 08 */ lwz r30, 8(r1) /* 803249D4 00321934 7C 08 03 A6 */ mtlr r0 /* 803249D8 00321938 38 21 00 10 */ addi r1, r1, 0x10 -/* 803249DC 0032193C 4E 80 00 20 */ blr +/* 803249DC 0032193C 4E 80 00 20 */ blr .global GetModel__20CParticleDataFactoryFR12CInputStreamP11CSimplePool GetModel__20CParticleDataFactoryFR12CInputStreamP11CSimplePool: @@ -15283,7 +15283,7 @@ lbl_80324A44: /* 80324A60 003219C0 81 9F 00 00 */ lwz r12, 0(r31) /* 80324A64 003219C4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80324A68 003219C8 7D 89 03 A6 */ mtctr r12 -/* 80324A6C 003219CC 4E 80 04 21 */ bctrl +/* 80324A6C 003219CC 4E 80 04 21 */ bctrl /* 80324A70 003219D0 38 61 00 08 */ addi r3, r1, 8 /* 80324A74 003219D4 38 81 00 10 */ addi r4, r1, 0x10 /* 80324A78 003219D8 48 01 C4 31 */ bl __ct__6CTokenFRC6CToken @@ -15308,7 +15308,7 @@ lbl_80324AB0: /* 80324ABC 00321A1C 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80324AC0 00321A20 7C 08 03 A6 */ mtlr r0 /* 80324AC4 00321A24 38 21 00 30 */ addi r1, r1, 0x30 -/* 80324AC8 00321A28 4E 80 00 20 */ blr +/* 80324AC8 00321A28 4E 80 00 20 */ blr .global GetElectricGeneratorDesc__20CParticleDataFactoryFR12CInputStreamP11CSimplePool GetElectricGeneratorDesc__20CParticleDataFactoryFR12CInputStreamP11CSimplePool: @@ -15350,7 +15350,7 @@ lbl_80324B30: /* 80324B4C 00321AAC 81 9F 00 00 */ lwz r12, 0(r31) /* 80324B50 00321AB0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80324B54 00321AB4 7D 89 03 A6 */ mtctr r12 -/* 80324B58 00321AB8 4E 80 04 21 */ bctrl +/* 80324B58 00321AB8 4E 80 04 21 */ bctrl /* 80324B5C 00321ABC 38 61 00 08 */ addi r3, r1, 8 /* 80324B60 00321AC0 38 81 00 10 */ addi r4, r1, 0x10 /* 80324B64 00321AC4 48 01 C3 45 */ bl __ct__6CTokenFRC6CToken @@ -15375,7 +15375,7 @@ lbl_80324B9C: /* 80324BA8 00321B08 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80324BAC 00321B0C 7C 08 03 A6 */ mtlr r0 /* 80324BB0 00321B10 38 21 00 30 */ addi r1, r1, 0x30 -/* 80324BB4 00321B14 4E 80 00 20 */ blr +/* 80324BB4 00321B14 4E 80 00 20 */ blr .global GetSwooshGeneratorDesc__20CParticleDataFactoryFR12CInputStreamP11CSimplePool GetSwooshGeneratorDesc__20CParticleDataFactoryFR12CInputStreamP11CSimplePool: @@ -15417,7 +15417,7 @@ lbl_80324C1C: /* 80324C38 00321B98 81 9F 00 00 */ lwz r12, 0(r31) /* 80324C3C 00321B9C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80324C40 00321BA0 7D 89 03 A6 */ mtctr r12 -/* 80324C44 00321BA4 4E 80 04 21 */ bctrl +/* 80324C44 00321BA4 4E 80 04 21 */ bctrl /* 80324C48 00321BA8 38 61 00 08 */ addi r3, r1, 8 /* 80324C4C 00321BAC 38 81 00 10 */ addi r4, r1, 0x10 /* 80324C50 00321BB0 48 01 C2 59 */ bl __ct__6CTokenFRC6CToken @@ -15442,7 +15442,7 @@ lbl_80324C88: /* 80324C94 00321BF4 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80324C98 00321BF8 7C 08 03 A6 */ mtlr r0 /* 80324C9C 00321BFC 38 21 00 30 */ addi r1, r1, 0x30 -/* 80324CA0 00321C00 4E 80 00 20 */ blr +/* 80324CA0 00321C00 4E 80 00 20 */ blr .global "GetChildGeneratorDesc__20CParticleDataFactoryFUiP11CSimplePoolRCQ24rstl37vector" "GetChildGeneratorDesc__20CParticleDataFactoryFUiP11CSimplePoolRCQ24rstl37vector": @@ -15479,7 +15479,7 @@ lbl_80324C88: /* 80324D1C 00321C7C 81 9F 00 00 */ lwz r12, 0(r31) /* 80324D20 00321C80 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80324D24 00321C84 7D 89 03 A6 */ mtctr r12 -/* 80324D28 00321C88 4E 80 04 21 */ bctrl +/* 80324D28 00321C88 4E 80 04 21 */ bctrl /* 80324D2C 00321C8C 38 61 00 1C */ addi r3, r1, 0x1c /* 80324D30 00321C90 38 81 00 24 */ addi r4, r1, 0x24 /* 80324D34 00321C94 48 01 C1 75 */ bl __ct__6CTokenFRC6CToken @@ -15507,7 +15507,7 @@ lbl_80324D78: /* 80324D80 00321CE0 83 C1 00 38 */ lwz r30, 0x38(r1) /* 80324D84 00321CE4 7C 08 03 A6 */ mtlr r0 /* 80324D88 00321CE8 38 21 00 40 */ addi r1, r1, 0x40 -/* 80324D8C 00321CEC 4E 80 00 20 */ blr +/* 80324D8C 00321CEC 4E 80 00 20 */ blr .global "GetChildGeneratorDesc__20CParticleDataFactoryFR12CInputStreamP11CSimplePoolRCQ24rstl37vector" "GetChildGeneratorDesc__20CParticleDataFactoryFR12CInputStreamP11CSimplePoolRCQ24rstl37vector": @@ -15554,7 +15554,7 @@ lbl_80324E10: /* 80324E20 00321D80 83 81 00 10 */ lwz r28, 0x10(r1) /* 80324E24 00321D84 7C 08 03 A6 */ mtlr r0 /* 80324E28 00321D88 38 21 00 20 */ addi r1, r1, 0x20 -/* 80324E2C 00321D8C 4E 80 00 20 */ blr +/* 80324E2C 00321D8C 4E 80 00 20 */ blr .global GetTextureElement__20CParticleDataFactoryFR12CInputStreamP11CSimplePool GetTextureElement__20CParticleDataFactoryFR12CInputStreamP11CSimplePool: @@ -15618,7 +15618,7 @@ lbl_80324EB4: /* 80324F04 00321E64 38 80 00 01 */ li r4, 1 /* 80324F08 00321E68 81 8C 00 08 */ lwz r12, 8(r12) /* 80324F0C 00321E6C 7D 89 03 A6 */ mtctr r12 -/* 80324F10 00321E70 4E 80 04 21 */ bctrl +/* 80324F10 00321E70 4E 80 04 21 */ bctrl lbl_80324F14: /* 80324F14 00321E74 3C 60 80 3D */ lis r3, lbl_803D7918@ha /* 80324F18 00321E78 3B 00 00 00 */ li r24, 0 @@ -15658,7 +15658,7 @@ lbl_80324F78: /* 80324F94 00321EF4 81 99 00 00 */ lwz r12, 0(r25) /* 80324F98 00321EF8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80324F9C 00321EFC 7D 89 03 A6 */ mtctr r12 -/* 80324FA0 00321F00 4E 80 04 21 */ bctrl +/* 80324FA0 00321F00 4E 80 04 21 */ bctrl /* 80324FA4 00321F04 38 61 00 68 */ addi r3, r1, 0x68 /* 80324FA8 00321F08 38 81 00 40 */ addi r4, r1, 0x40 /* 80324FAC 00321F0C 48 01 BE FD */ bl __ct__6CTokenFRC6CToken @@ -15749,7 +15749,7 @@ lbl_80325044: /* 803250F0 00322050 38 80 00 01 */ li r4, 1 /* 803250F4 00322054 81 8C 00 08 */ lwz r12, 8(r12) /* 803250F8 00322058 7D 89 03 A6 */ mtctr r12 -/* 803250FC 0032205C 4E 80 04 21 */ bctrl +/* 803250FC 0032205C 4E 80 04 21 */ bctrl lbl_80325100: /* 80325100 00322060 3C 60 80 3D */ lis r3, lbl_803D7918@ha /* 80325104 00322064 3B 00 00 00 */ li r24, 0 @@ -15795,7 +15795,7 @@ lbl_8032517C: /* 80325198 003220F8 81 99 00 00 */ lwz r12, 0(r25) /* 8032519C 003220FC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803251A0 00322100 7D 89 03 A6 */ mtctr r12 -/* 803251A4 00322104 4E 80 04 21 */ bctrl +/* 803251A4 00322104 4E 80 04 21 */ bctrl /* 803251A8 00322108 38 61 00 58 */ addi r3, r1, 0x58 /* 803251AC 0032210C 38 81 00 20 */ addi r4, r1, 0x20 /* 803251B0 00322110 48 01 BC F9 */ bl __ct__6CTokenFRC6CToken @@ -15845,7 +15845,7 @@ lbl_80325248: /* 8032524C 003221AC 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 80325250 003221B0 7C 08 03 A6 */ mtlr r0 /* 80325254 003221B4 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 80325258 003221B8 4E 80 00 20 */ blr +/* 80325258 003221B8 4E 80 00 20 */ blr .global GetColorElement__20CParticleDataFactoryFR12CInputStream GetColorElement__20CParticleDataFactoryFR12CInputStream: @@ -15940,28 +15940,28 @@ lbl_80325344: /* 803253A4 00322304 81 9C 00 00 */ lwz r12, 0(r28) /* 803253A8 00322308 81 8C 00 10 */ lwz r12, 0x10(r12) /* 803253AC 0032230C 7D 89 03 A6 */ mtctr r12 -/* 803253B0 00322310 4E 80 04 21 */ bctrl +/* 803253B0 00322310 4E 80 04 21 */ bctrl /* 803253B4 00322314 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 803253B8 00322318 41 82 01 AC */ beq lbl_80325564 /* 803253BC 0032231C 7F 63 DB 78 */ mr r3, r27 /* 803253C0 00322320 81 9B 00 00 */ lwz r12, 0(r27) /* 803253C4 00322324 81 8C 00 10 */ lwz r12, 0x10(r12) /* 803253C8 00322328 7D 89 03 A6 */ mtctr r12 -/* 803253CC 0032232C 4E 80 04 21 */ bctrl +/* 803253CC 0032232C 4E 80 04 21 */ bctrl /* 803253D0 00322330 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 803253D4 00322334 41 82 01 90 */ beq lbl_80325564 /* 803253D8 00322338 7F E3 FB 78 */ mr r3, r31 /* 803253DC 0032233C 81 9F 00 00 */ lwz r12, 0(r31) /* 803253E0 00322340 81 8C 00 10 */ lwz r12, 0x10(r12) /* 803253E4 00322344 7D 89 03 A6 */ mtctr r12 -/* 803253E8 00322348 4E 80 04 21 */ bctrl +/* 803253E8 00322348 4E 80 04 21 */ bctrl /* 803253EC 0032234C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 803253F0 00322350 41 82 01 74 */ beq lbl_80325564 /* 803253F4 00322354 7F 43 D3 78 */ mr r3, r26 /* 803253F8 00322358 81 9A 00 00 */ lwz r12, 0(r26) /* 803253FC 0032235C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80325400 00322360 7D 89 03 A6 */ mtctr r12 -/* 80325404 00322364 4E 80 04 21 */ bctrl +/* 80325404 00322364 4E 80 04 21 */ bctrl /* 80325408 00322368 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8032540C 0032236C 41 82 01 58 */ beq lbl_80325564 /* 80325410 00322370 7F 83 E3 78 */ mr r3, r28 @@ -15970,28 +15970,28 @@ lbl_80325344: /* 8032541C 0032237C 38 80 00 00 */ li r4, 0 /* 80325420 00322380 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80325424 00322384 7D 89 03 A6 */ mtctr r12 -/* 80325428 00322388 4E 80 04 21 */ bctrl +/* 80325428 00322388 4E 80 04 21 */ bctrl /* 8032542C 0032238C 7F 63 DB 78 */ mr r3, r27 /* 80325430 00322390 38 A1 00 10 */ addi r5, r1, 0x10 /* 80325434 00322394 81 9B 00 00 */ lwz r12, 0(r27) /* 80325438 00322398 38 80 00 00 */ li r4, 0 /* 8032543C 0032239C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80325440 003223A0 7D 89 03 A6 */ mtctr r12 -/* 80325444 003223A4 4E 80 04 21 */ bctrl +/* 80325444 003223A4 4E 80 04 21 */ bctrl /* 80325448 003223A8 7F E3 FB 78 */ mr r3, r31 /* 8032544C 003223AC 38 A1 00 0C */ addi r5, r1, 0xc /* 80325450 003223B0 81 9F 00 00 */ lwz r12, 0(r31) /* 80325454 003223B4 38 80 00 00 */ li r4, 0 /* 80325458 003223B8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8032545C 003223BC 7D 89 03 A6 */ mtctr r12 -/* 80325460 003223C0 4E 80 04 21 */ bctrl +/* 80325460 003223C0 4E 80 04 21 */ bctrl /* 80325464 003223C4 7F 43 D3 78 */ mr r3, r26 /* 80325468 003223C8 38 A1 00 08 */ addi r5, r1, 8 /* 8032546C 003223CC 81 9A 00 00 */ lwz r12, 0(r26) /* 80325470 003223D0 38 80 00 00 */ li r4, 0 /* 80325474 003223D4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80325478 003223D8 7D 89 03 A6 */ mtctr r12 -/* 8032547C 003223DC 4E 80 04 21 */ bctrl +/* 8032547C 003223DC 4E 80 04 21 */ bctrl /* 80325480 003223E0 28 1C 00 00 */ cmplwi r28, 0 /* 80325484 003223E4 41 82 00 1C */ beq lbl_803254A0 /* 80325488 003223E8 7F 83 E3 78 */ mr r3, r28 @@ -15999,7 +15999,7 @@ lbl_80325344: /* 80325490 003223F0 81 9C 00 00 */ lwz r12, 0(r28) /* 80325494 003223F4 81 8C 00 08 */ lwz r12, 8(r12) /* 80325498 003223F8 7D 89 03 A6 */ mtctr r12 -/* 8032549C 003223FC 4E 80 04 21 */ bctrl +/* 8032549C 003223FC 4E 80 04 21 */ bctrl lbl_803254A0: /* 803254A0 00322400 28 1B 00 00 */ cmplwi r27, 0 /* 803254A4 00322404 41 82 00 1C */ beq lbl_803254C0 @@ -16008,7 +16008,7 @@ lbl_803254A0: /* 803254B0 00322410 81 9B 00 00 */ lwz r12, 0(r27) /* 803254B4 00322414 81 8C 00 08 */ lwz r12, 8(r12) /* 803254B8 00322418 7D 89 03 A6 */ mtctr r12 -/* 803254BC 0032241C 4E 80 04 21 */ bctrl +/* 803254BC 0032241C 4E 80 04 21 */ bctrl lbl_803254C0: /* 803254C0 00322420 28 1F 00 00 */ cmplwi r31, 0 /* 803254C4 00322424 41 82 00 1C */ beq lbl_803254E0 @@ -16017,7 +16017,7 @@ lbl_803254C0: /* 803254D0 00322430 81 9F 00 00 */ lwz r12, 0(r31) /* 803254D4 00322434 81 8C 00 08 */ lwz r12, 8(r12) /* 803254D8 00322438 7D 89 03 A6 */ mtctr r12 -/* 803254DC 0032243C 4E 80 04 21 */ bctrl +/* 803254DC 0032243C 4E 80 04 21 */ bctrl lbl_803254E0: /* 803254E0 00322440 28 1A 00 00 */ cmplwi r26, 0 /* 803254E4 00322444 41 82 00 1C */ beq lbl_80325500 @@ -16026,7 +16026,7 @@ lbl_803254E0: /* 803254F0 00322450 81 9A 00 00 */ lwz r12, 0(r26) /* 803254F4 00322454 81 8C 00 08 */ lwz r12, 8(r12) /* 803254F8 00322458 7D 89 03 A6 */ mtctr r12 -/* 803254FC 0032245C 4E 80 04 21 */ bctrl +/* 803254FC 0032245C 4E 80 04 21 */ bctrl lbl_80325500: /* 80325500 00322460 28 1D 00 00 */ cmplwi r29, 0 /* 80325504 00322464 41 82 00 24 */ beq lbl_80325528 @@ -16236,7 +16236,7 @@ lbl_803257E8: /* 803257EC 0032274C 80 01 00 34 */ lwz r0, 0x34(r1) /* 803257F0 00322750 7C 08 03 A6 */ mtlr r0 /* 803257F4 00322754 38 21 00 30 */ addi r1, r1, 0x30 -/* 803257F8 00322758 4E 80 00 20 */ blr +/* 803257F8 00322758 4E 80 00 20 */ blr .global GetModVectorElement__20CParticleDataFactoryFR12CInputStream GetModVectorElement__20CParticleDataFactoryFR12CInputStream: @@ -16341,21 +16341,21 @@ lbl_80325920: /* 80325968 003228C8 81 9D 00 00 */ lwz r12, 0(r29) /* 8032596C 003228CC 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80325970 003228D0 7D 89 03 A6 */ mtctr r12 -/* 80325974 003228D4 4E 80 04 21 */ bctrl +/* 80325974 003228D4 4E 80 04 21 */ bctrl /* 80325978 003228D8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8032597C 003228DC 41 82 01 28 */ beq lbl_80325AA4 /* 80325980 003228E0 7F E3 FB 78 */ mr r3, r31 /* 80325984 003228E4 81 9F 00 00 */ lwz r12, 0(r31) /* 80325988 003228E8 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8032598C 003228EC 7D 89 03 A6 */ mtctr r12 -/* 80325990 003228F0 4E 80 04 21 */ bctrl +/* 80325990 003228F0 4E 80 04 21 */ bctrl /* 80325994 003228F4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80325998 003228F8 41 82 01 0C */ beq lbl_80325AA4 /* 8032599C 003228FC 7F 83 E3 78 */ mr r3, r28 /* 803259A0 00322900 81 9C 00 00 */ lwz r12, 0(r28) /* 803259A4 00322904 81 8C 00 10 */ lwz r12, 0x10(r12) /* 803259A8 00322908 7D 89 03 A6 */ mtctr r12 -/* 803259AC 0032290C 4E 80 04 21 */ bctrl +/* 803259AC 0032290C 4E 80 04 21 */ bctrl /* 803259B0 00322910 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 803259B4 00322914 41 82 00 F0 */ beq lbl_80325AA4 /* 803259B8 00322918 7F A3 EB 78 */ mr r3, r29 @@ -16364,21 +16364,21 @@ lbl_80325920: /* 803259C4 00322924 38 80 00 00 */ li r4, 0 /* 803259C8 00322928 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803259CC 0032292C 7D 89 03 A6 */ mtctr r12 -/* 803259D0 00322930 4E 80 04 21 */ bctrl +/* 803259D0 00322930 4E 80 04 21 */ bctrl /* 803259D4 00322934 7F A3 EB 78 */ mr r3, r29 /* 803259D8 00322938 38 A1 00 0C */ addi r5, r1, 0xc /* 803259DC 0032293C 81 9D 00 00 */ lwz r12, 0(r29) /* 803259E0 00322940 38 80 00 00 */ li r4, 0 /* 803259E4 00322944 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803259E8 00322948 7D 89 03 A6 */ mtctr r12 -/* 803259EC 0032294C 4E 80 04 21 */ bctrl +/* 803259EC 0032294C 4E 80 04 21 */ bctrl /* 803259F0 00322950 7F A3 EB 78 */ mr r3, r29 /* 803259F4 00322954 38 A1 00 08 */ addi r5, r1, 8 /* 803259F8 00322958 81 9D 00 00 */ lwz r12, 0(r29) /* 803259FC 0032295C 38 80 00 00 */ li r4, 0 /* 80325A00 00322960 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80325A04 00322964 7D 89 03 A6 */ mtctr r12 -/* 80325A08 00322968 4E 80 04 21 */ bctrl +/* 80325A08 00322968 4E 80 04 21 */ bctrl /* 80325A0C 0032296C 3C 80 80 3D */ lis r4, lbl_803D7918@ha /* 80325A10 00322970 38 60 00 10 */ li r3, 0x10 /* 80325A14 00322974 38 84 79 18 */ addi r4, r4, lbl_803D7918@l @@ -16400,7 +16400,7 @@ lbl_80325A3C: /* 80325A50 003229B0 81 9D 00 00 */ lwz r12, 0(r29) /* 80325A54 003229B4 81 8C 00 08 */ lwz r12, 8(r12) /* 80325A58 003229B8 7D 89 03 A6 */ mtctr r12 -/* 80325A5C 003229BC 4E 80 04 21 */ bctrl +/* 80325A5C 003229BC 4E 80 04 21 */ bctrl lbl_80325A60: /* 80325A60 003229C0 28 1F 00 00 */ cmplwi r31, 0 /* 80325A64 003229C4 41 82 00 1C */ beq lbl_80325A80 @@ -16409,7 +16409,7 @@ lbl_80325A60: /* 80325A70 003229D0 81 9F 00 00 */ lwz r12, 0(r31) /* 80325A74 003229D4 81 8C 00 08 */ lwz r12, 8(r12) /* 80325A78 003229D8 7D 89 03 A6 */ mtctr r12 -/* 80325A7C 003229DC 4E 80 04 21 */ bctrl +/* 80325A7C 003229DC 4E 80 04 21 */ bctrl lbl_80325A80: /* 80325A80 003229E0 28 1C 00 00 */ cmplwi r28, 0 /* 80325A84 003229E4 41 82 05 14 */ beq lbl_80325F98 @@ -16418,7 +16418,7 @@ lbl_80325A80: /* 80325A90 003229F0 81 9C 00 00 */ lwz r12, 0(r28) /* 80325A94 003229F4 81 8C 00 08 */ lwz r12, 8(r12) /* 80325A98 003229F8 7D 89 03 A6 */ mtctr r12 -/* 80325A9C 003229FC 4E 80 04 21 */ bctrl +/* 80325A9C 003229FC 4E 80 04 21 */ bctrl /* 80325AA0 00322A00 48 00 04 F8 */ b lbl_80325F98 lbl_80325AA4: /* 80325AA4 00322A04 3C 80 80 3D */ lis r4, lbl_803D7918@ha @@ -16767,7 +16767,7 @@ lbl_80325F9C: /* 80325FA0 00322F00 80 01 00 34 */ lwz r0, 0x34(r1) /* 80325FA4 00322F04 7C 08 03 A6 */ mtlr r0 /* 80325FA8 00322F08 38 21 00 30 */ addi r1, r1, 0x30 -/* 80325FAC 00322F0C 4E 80 00 20 */ blr +/* 80325FAC 00322F0C 4E 80 00 20 */ blr .global GetEmitterElement__20CParticleDataFactoryFR12CInputStream GetEmitterElement__20CParticleDataFactoryFR12CInputStream: @@ -16953,7 +16953,7 @@ lbl_80326240: /* 80326244 003231A4 80 01 00 34 */ lwz r0, 0x34(r1) /* 80326248 003231A8 7C 08 03 A6 */ mtlr r0 /* 8032624C 003231AC 38 21 00 30 */ addi r1, r1, 0x30 -/* 80326250 003231B0 4E 80 00 20 */ blr +/* 80326250 003231B0 4E 80 00 20 */ blr .global GetVectorElement__20CParticleDataFactoryFR12CInputStream GetVectorElement__20CParticleDataFactoryFR12CInputStream: @@ -17110,21 +17110,21 @@ lbl_80326438: /* 80326480 003233E0 81 9C 00 00 */ lwz r12, 0(r28) /* 80326484 003233E4 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80326488 003233E8 7D 89 03 A6 */ mtctr r12 -/* 8032648C 003233EC 4E 80 04 21 */ bctrl +/* 8032648C 003233EC 4E 80 04 21 */ bctrl /* 80326490 003233F0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80326494 003233F4 41 82 01 50 */ beq lbl_803265E4 /* 80326498 003233F8 7F E3 FB 78 */ mr r3, r31 /* 8032649C 003233FC 81 9F 00 00 */ lwz r12, 0(r31) /* 803264A0 00323400 81 8C 00 10 */ lwz r12, 0x10(r12) /* 803264A4 00323404 7D 89 03 A6 */ mtctr r12 -/* 803264A8 00323408 4E 80 04 21 */ bctrl +/* 803264A8 00323408 4E 80 04 21 */ bctrl /* 803264AC 0032340C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 803264B0 00323410 41 82 01 34 */ beq lbl_803265E4 /* 803264B4 00323414 7F 63 DB 78 */ mr r3, r27 /* 803264B8 00323418 81 9B 00 00 */ lwz r12, 0(r27) /* 803264BC 0032341C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 803264C0 00323420 7D 89 03 A6 */ mtctr r12 -/* 803264C4 00323424 4E 80 04 21 */ bctrl +/* 803264C4 00323424 4E 80 04 21 */ bctrl /* 803264C8 00323428 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 803264CC 0032342C 41 82 01 18 */ beq lbl_803265E4 /* 803264D0 00323430 7F 83 E3 78 */ mr r3, r28 @@ -17133,21 +17133,21 @@ lbl_80326438: /* 803264DC 0032343C 38 80 00 00 */ li r4, 0 /* 803264E0 00323440 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803264E4 00323444 7D 89 03 A6 */ mtctr r12 -/* 803264E8 00323448 4E 80 04 21 */ bctrl +/* 803264E8 00323448 4E 80 04 21 */ bctrl /* 803264EC 0032344C 7F E3 FB 78 */ mr r3, r31 /* 803264F0 00323450 38 A1 00 0C */ addi r5, r1, 0xc /* 803264F4 00323454 81 9F 00 00 */ lwz r12, 0(r31) /* 803264F8 00323458 38 80 00 00 */ li r4, 0 /* 803264FC 0032345C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80326500 00323460 7D 89 03 A6 */ mtctr r12 -/* 80326504 00323464 4E 80 04 21 */ bctrl +/* 80326504 00323464 4E 80 04 21 */ bctrl /* 80326508 00323468 7F 63 DB 78 */ mr r3, r27 /* 8032650C 0032346C 38 A1 00 08 */ addi r5, r1, 8 /* 80326510 00323470 81 9B 00 00 */ lwz r12, 0(r27) /* 80326514 00323474 38 80 00 00 */ li r4, 0 /* 80326518 00323478 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8032651C 0032347C 7D 89 03 A6 */ mtctr r12 -/* 80326520 00323480 4E 80 04 21 */ bctrl +/* 80326520 00323480 4E 80 04 21 */ bctrl /* 80326524 00323484 28 1C 00 00 */ cmplwi r28, 0 /* 80326528 00323488 41 82 00 1C */ beq lbl_80326544 /* 8032652C 0032348C 7F 83 E3 78 */ mr r3, r28 @@ -17155,7 +17155,7 @@ lbl_80326438: /* 80326534 00323494 81 9C 00 00 */ lwz r12, 0(r28) /* 80326538 00323498 81 8C 00 08 */ lwz r12, 8(r12) /* 8032653C 0032349C 7D 89 03 A6 */ mtctr r12 -/* 80326540 003234A0 4E 80 04 21 */ bctrl +/* 80326540 003234A0 4E 80 04 21 */ bctrl lbl_80326544: /* 80326544 003234A4 28 1F 00 00 */ cmplwi r31, 0 /* 80326548 003234A8 41 82 00 1C */ beq lbl_80326564 @@ -17164,7 +17164,7 @@ lbl_80326544: /* 80326554 003234B4 81 9F 00 00 */ lwz r12, 0(r31) /* 80326558 003234B8 81 8C 00 08 */ lwz r12, 8(r12) /* 8032655C 003234BC 7D 89 03 A6 */ mtctr r12 -/* 80326560 003234C0 4E 80 04 21 */ bctrl +/* 80326560 003234C0 4E 80 04 21 */ bctrl lbl_80326564: /* 80326564 003234C4 28 1B 00 00 */ cmplwi r27, 0 /* 80326568 003234C8 41 82 00 1C */ beq lbl_80326584 @@ -17173,7 +17173,7 @@ lbl_80326564: /* 80326574 003234D4 81 9B 00 00 */ lwz r12, 0(r27) /* 80326578 003234D8 81 8C 00 08 */ lwz r12, 8(r12) /* 8032657C 003234DC 7D 89 03 A6 */ mtctr r12 -/* 80326580 003234E0 4E 80 04 21 */ bctrl +/* 80326580 003234E0 4E 80 04 21 */ bctrl lbl_80326584: /* 80326584 003234E4 28 1D 00 00 */ cmplwi r29, 0 /* 80326588 003234E8 41 82 00 24 */ beq lbl_803265AC @@ -17662,7 +17662,7 @@ lbl_80326C7C: /* 80326C80 00323BE0 80 01 00 34 */ lwz r0, 0x34(r1) /* 80326C84 00323BE4 7C 08 03 A6 */ mtlr r0 /* 80326C88 00323BE8 38 21 00 30 */ addi r1, r1, 0x30 -/* 80326C8C 00323BEC 4E 80 00 20 */ blr +/* 80326C8C 00323BEC 4E 80 00 20 */ blr .global GetRealElement__20CParticleDataFactoryFR12CInputStream GetRealElement__20CParticleDataFactoryFR12CInputStream: @@ -18716,7 +18716,7 @@ lbl_80327B90: /* 80327B94 00324AF4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80327B98 00324AF8 7C 08 03 A6 */ mtlr r0 /* 80327B9C 00324AFC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80327BA0 00324B00 4E 80 00 20 */ blr +/* 80327BA0 00324B00 4E 80 00 20 */ blr .global GetIntElement__20CParticleDataFactoryFR12CInputStream GetIntElement__20CParticleDataFactoryFR12CInputStream: @@ -19295,7 +19295,7 @@ lbl_803283C8: /* 803283D8 00325338 83 81 00 10 */ lwz r28, 0x10(r1) /* 803283DC 0032533C 7C 08 03 A6 */ mtlr r0 /* 803283E0 00325340 38 21 00 20 */ addi r1, r1, 0x20 -/* 803283E4 00325344 4E 80 00 20 */ blr +/* 803283E4 00325344 4E 80 00 20 */ blr .global GetReal__20CParticleDataFactoryFR12CInputStream GetReal__20CParticleDataFactoryFR12CInputStream: @@ -19306,7 +19306,7 @@ GetReal__20CParticleDataFactoryFR12CInputStream: /* 803283F8 00325358 80 01 00 14 */ lwz r0, 0x14(r1) /* 803283FC 0032535C 7C 08 03 A6 */ mtlr r0 /* 80328400 00325360 38 21 00 10 */ addi r1, r1, 0x10 -/* 80328404 00325364 4E 80 00 20 */ blr +/* 80328404 00325364 4E 80 00 20 */ blr .global GetInt__20CParticleDataFactoryFR12CInputStream GetInt__20CParticleDataFactoryFR12CInputStream: @@ -19317,7 +19317,7 @@ GetInt__20CParticleDataFactoryFR12CInputStream: /* 80328418 00325378 80 01 00 14 */ lwz r0, 0x14(r1) /* 8032841C 0032537C 7C 08 03 A6 */ mtlr r0 /* 80328420 00325380 38 21 00 10 */ addi r1, r1, 0x10 -/* 80328424 00325384 4E 80 00 20 */ blr +/* 80328424 00325384 4E 80 00 20 */ blr .global GetBool__20CParticleDataFactoryFR12CInputStream GetBool__20CParticleDataFactoryFR12CInputStream: @@ -19333,7 +19333,7 @@ GetBool__20CParticleDataFactoryFR12CInputStream: /* 8032844C 003253AC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80328450 003253B0 7C 08 03 A6 */ mtlr r0 /* 80328454 003253B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80328458 003253B8 4E 80 00 20 */ blr +/* 80328458 003253B8 4E 80 00 20 */ blr .global GetClassID__20CParticleDataFactoryFR12CInputStream GetClassID__20CParticleDataFactoryFR12CInputStream: @@ -19344,7 +19344,7 @@ GetClassID__20CParticleDataFactoryFR12CInputStream: /* 8032846C 003253CC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80328470 003253D0 7C 08 03 A6 */ mtlr r0 /* 80328474 003253D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80328478 003253D8 4E 80 00 20 */ blr +/* 80328478 003253D8 4E 80 00 20 */ blr .global "CreateGPSM__20CParticleDataFactoryFP15CGenDescriptionR12CInputStreamRQ24rstl37vectorP11CSimplePool" "CreateGPSM__20CParticleDataFactoryFP15CGenDescriptionR12CInputStreamRQ24rstl37vectorP11CSimplePool": @@ -19759,7 +19759,7 @@ lbl_80328A44: /* 80328A58 003259B8 38 80 00 01 */ li r4, 1 /* 80328A5C 003259BC 81 8C 00 08 */ lwz r12, 8(r12) /* 80328A60 003259C0 7D 89 03 A6 */ mtctr r12 -/* 80328A64 003259C4 4E 80 04 21 */ bctrl +/* 80328A64 003259C4 4E 80 04 21 */ bctrl /* 80328A68 003259C8 48 00 0F B0 */ b lbl_80329A18 lbl_80328A6C: /* 80328A6C 003259CC 7F C3 F3 78 */ mr r3, r30 @@ -19770,7 +19770,7 @@ lbl_80328A6C: /* 80328A80 003259E0 38 80 00 01 */ li r4, 1 /* 80328A84 003259E4 81 8C 00 08 */ lwz r12, 8(r12) /* 80328A88 003259E8 7D 89 03 A6 */ mtctr r12 -/* 80328A8C 003259EC 4E 80 04 21 */ bctrl +/* 80328A8C 003259EC 4E 80 04 21 */ bctrl /* 80328A90 003259F0 48 00 0F 88 */ b lbl_80329A18 lbl_80328A94: /* 80328A94 003259F4 7F C3 F3 78 */ mr r3, r30 @@ -19781,7 +19781,7 @@ lbl_80328A94: /* 80328AA8 00325A08 38 80 00 01 */ li r4, 1 /* 80328AAC 00325A0C 81 8C 00 08 */ lwz r12, 8(r12) /* 80328AB0 00325A10 7D 89 03 A6 */ mtctr r12 -/* 80328AB4 00325A14 4E 80 04 21 */ bctrl +/* 80328AB4 00325A14 4E 80 04 21 */ bctrl /* 80328AB8 00325A18 48 00 0F 60 */ b lbl_80329A18 lbl_80328ABC: /* 80328ABC 00325A1C 7F C3 F3 78 */ mr r3, r30 @@ -19871,7 +19871,7 @@ lbl_80328BC4: /* 80328BD8 00325B38 38 80 00 01 */ li r4, 1 /* 80328BDC 00325B3C 81 8C 00 08 */ lwz r12, 8(r12) /* 80328BE0 00325B40 7D 89 03 A6 */ mtctr r12 -/* 80328BE4 00325B44 4E 80 04 21 */ bctrl +/* 80328BE4 00325B44 4E 80 04 21 */ bctrl /* 80328BE8 00325B48 48 00 0E 30 */ b lbl_80329A18 lbl_80328BEC: /* 80328BEC 00325B4C 7F C3 F3 78 */ mr r3, r30 @@ -19882,7 +19882,7 @@ lbl_80328BEC: /* 80328C00 00325B60 38 80 00 01 */ li r4, 1 /* 80328C04 00325B64 81 8C 00 08 */ lwz r12, 8(r12) /* 80328C08 00325B68 7D 89 03 A6 */ mtctr r12 -/* 80328C0C 00325B6C 4E 80 04 21 */ bctrl +/* 80328C0C 00325B6C 4E 80 04 21 */ bctrl /* 80328C10 00325B70 48 00 0E 08 */ b lbl_80329A18 lbl_80328C14: /* 80328C14 00325B74 7F C3 F3 78 */ mr r3, r30 @@ -20942,7 +20942,7 @@ lbl_80329A30: /* 80329A34 00326994 80 01 01 64 */ lwz r0, 0x164(r1) /* 80329A38 00326998 7C 08 03 A6 */ mtlr r0 /* 80329A3C 0032699C 38 21 01 60 */ addi r1, r1, 0x160 -/* 80329A40 003269A0 4E 80 00 20 */ blr +/* 80329A40 003269A0 4E 80 00 20 */ blr .global __dt__24CSpawnSystemKeyframeDataFv __dt__24CSpawnSystemKeyframeDataFv: @@ -20963,7 +20963,7 @@ __dt__24CSpawnSystemKeyframeDataFv: /* 80329A7C 003269DC 83 C1 00 08 */ lwz r30, 8(r1) /* 80329A80 003269E0 7C 08 03 A6 */ mtlr r0 /* 80329A84 003269E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80329A88 003269E8 4E 80 00 20 */ blr +/* 80329A88 003269E8 4E 80 00 20 */ blr .global sub_80329a8c sub_80329a8c: @@ -20989,7 +20989,7 @@ lbl_80329AC8: /* 80329AD4 00326A34 83 C1 00 08 */ lwz r30, 8(r1) /* 80329AD8 00326A38 7C 08 03 A6 */ mtlr r0 /* 80329ADC 00326A3C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80329AE0 00326A40 4E 80 00 20 */ blr +/* 80329AE0 00326A40 4E 80 00 20 */ blr .global sub_80329ae4 sub_80329ae4: @@ -21029,7 +21029,7 @@ lbl_80329B54: /* 80329B60 00326AC0 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80329B64 00326AC4 7C 08 03 A6 */ mtlr r0 /* 80329B68 00326AC8 38 21 00 20 */ addi r1, r1, 0x20 -/* 80329B6C 00326ACC 4E 80 00 20 */ blr +/* 80329B6C 00326ACC 4E 80 00 20 */ blr .global sub_80329b70 sub_80329b70: @@ -21054,7 +21054,7 @@ lbl_80329B9C: /* 80329BB0 00326B10 83 C1 00 08 */ lwz r30, 8(r1) /* 80329BB4 00326B14 7C 08 03 A6 */ mtlr r0 /* 80329BB8 00326B18 38 21 00 10 */ addi r1, r1, 0x10 -/* 80329BBC 00326B1C 4E 80 00 20 */ blr +/* 80329BBC 00326B1C 4E 80 00 20 */ blr .global sub_80329bc0 sub_80329bc0: @@ -21066,7 +21066,7 @@ sub_80329bc0: /* 80329BD4 00326B34 80 01 00 14 */ lwz r0, 0x14(r1) /* 80329BD8 00326B38 7C 08 03 A6 */ mtlr r0 /* 80329BDC 00326B3C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80329BE0 00326B40 4E 80 00 20 */ blr +/* 80329BE0 00326B40 4E 80 00 20 */ blr .global sub_80329be4 sub_80329be4: @@ -21092,7 +21092,7 @@ lbl_80329C20: /* 80329C2C 00326B8C 83 C1 00 08 */ lwz r30, 8(r1) /* 80329C30 00326B90 7C 08 03 A6 */ mtlr r0 /* 80329C34 00326B94 38 21 00 10 */ addi r1, r1, 0x10 -/* 80329C38 00326B98 4E 80 00 20 */ blr +/* 80329C38 00326B98 4E 80 00 20 */ blr .global sub_80329c3c sub_80329c3c: @@ -21152,7 +21152,7 @@ lbl_80329CEC: /* 80329CF4 00326C54 80 01 00 34 */ lwz r0, 0x34(r1) /* 80329CF8 00326C58 7C 08 03 A6 */ mtlr r0 /* 80329CFC 00326C5C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80329D00 00326C60 4E 80 00 20 */ blr +/* 80329D00 00326C60 4E 80 00 20 */ blr .global LoadGPSMTokens__20CParticleDataFactoryFP15CGenDescription LoadGPSMTokens__20CParticleDataFactoryFP15CGenDescription: @@ -21227,7 +21227,7 @@ lbl_80329DF8: /* 80329E00 00326D60 83 C1 00 08 */ lwz r30, 8(r1) /* 80329E04 00326D64 7C 08 03 A6 */ mtlr r0 /* 80329E08 00326D68 38 21 00 10 */ addi r1, r1, 0x10 -/* 80329E0C 00326D6C 4E 80 00 20 */ blr +/* 80329E0C 00326D6C 4E 80 00 20 */ blr .global "CreateGeneratorDescription__20CParticleDataFactoryFR12CInputStreamRQ24rstl37vectorUiP11CSimplePool" "CreateGeneratorDescription__20CParticleDataFactoryFR12CInputStreamRQ24rstl37vectorUiP11CSimplePool": @@ -21317,7 +21317,7 @@ lbl_80329F30: /* 80329F40 00326EA0 83 81 00 20 */ lwz r28, 0x20(r1) /* 80329F44 00326EA4 7C 08 03 A6 */ mtlr r0 /* 80329F48 00326EA8 38 21 00 30 */ addi r1, r1, 0x30 -/* 80329F4C 00326EAC 4E 80 00 20 */ blr +/* 80329F4C 00326EAC 4E 80 00 20 */ blr .global GetGeneratorDesc__20CParticleDataFactoryFR12CInputStreamP11CSimplePool GetGeneratorDesc__20CParticleDataFactoryFR12CInputStreamP11CSimplePool: @@ -21370,7 +21370,7 @@ lbl_80329FEC: /* 80329FFC 00326F5C 83 A1 00 34 */ lwz r29, 0x34(r1) /* 8032A000 00326F60 7C 08 03 A6 */ mtlr r0 /* 8032A004 00326F64 38 21 00 40 */ addi r1, r1, 0x40 -/* 8032A008 00326F68 4E 80 00 20 */ blr +/* 8032A008 00326F68 4E 80 00 20 */ blr .global FParticleFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer FParticleFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer: @@ -21416,7 +21416,7 @@ FParticleFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer: /* 8032A0A8 00327008 38 80 00 01 */ li r4, 1 /* 8032A0AC 0032700C 81 8C 00 08 */ lwz r12, 8(r12) /* 8032A0B0 00327010 7D 89 03 A6 */ mtctr r12 -/* 8032A0B4 00327014 4E 80 04 21 */ bctrl +/* 8032A0B4 00327014 4E 80 04 21 */ bctrl lbl_8032A0B8: /* 8032A0B8 00327018 88 01 00 0C */ lbz r0, 0xc(r1) /* 8032A0BC 0032701C 28 00 00 00 */ cmplwi r0, 0 @@ -21431,7 +21431,7 @@ lbl_8032A0D0: /* 8032A0DC 0032703C 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8032A0E0 00327040 7C 08 03 A6 */ mtlr r0 /* 8032A0E4 00327044 38 21 00 30 */ addi r1, r1, 0x30 -/* 8032A0E8 00327048 4E 80 00 20 */ blr +/* 8032A0E8 00327048 4E 80 00 20 */ blr .global "GetIObjObjectFor__25TToken<15CGenDescription>FRCQ24rstl27auto_ptr<15CGenDescription>" "GetIObjObjectFor__25TToken<15CGenDescription>FRCQ24rstl27auto_ptr<15CGenDescription>": @@ -21445,7 +21445,7 @@ lbl_8032A0D0: /* 8032A108 00327068 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8032A10C 0032706C 7C 08 03 A6 */ mtlr r0 /* 8032A110 00327070 38 21 00 10 */ addi r1, r1, 0x10 -/* 8032A114 00327074 4E 80 00 20 */ blr +/* 8032A114 00327074 4E 80 00 20 */ blr .global "GetNewDerivedObject__43TObjOwnerDerivedFromIObj<15CGenDescription>FRCQ24rstl27auto_ptr<15CGenDescription>" "GetNewDerivedObject__43TObjOwnerDerivedFromIObj<15CGenDescription>FRCQ24rstl27auto_ptr<15CGenDescription>": @@ -21488,7 +21488,7 @@ lbl_8032A188: /* 8032A1A4 00327104 80 01 00 14 */ lwz r0, 0x14(r1) /* 8032A1A8 00327108 7C 08 03 A6 */ mtlr r0 /* 8032A1AC 0032710C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8032A1B0 00327110 4E 80 00 20 */ blr +/* 8032A1B0 00327110 4E 80 00 20 */ blr .global sub_8032a1b4 sub_8032a1b4: @@ -21572,7 +21572,7 @@ lbl_8032A2B4: /* 8032A2C0 00327220 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8032A2C4 00327224 7C 08 03 A6 */ mtlr r0 /* 8032A2C8 00327228 38 21 00 20 */ addi r1, r1, 0x20 -/* 8032A2CC 0032722C 4E 80 00 20 */ blr +/* 8032A2CC 0032722C 4E 80 00 20 */ blr .global sub_8032a2d0 sub_8032a2d0: @@ -21659,7 +21659,7 @@ lbl_8032A3DC: /* 8032A3F8 00327358 83 81 04 20 */ lwz r28, 0x420(r1) /* 8032A3FC 0032735C 7C 08 03 A6 */ mtlr r0 /* 8032A400 00327360 38 21 04 30 */ addi r1, r1, 0x430 -/* 8032A404 00327364 4E 80 00 20 */ blr +/* 8032A404 00327364 4E 80 00 20 */ blr .global "count,Q24rstl17rmemory_allocator>,Ui>__4rstlFQ24rstl94pointer_iterator,Q24rstl17rmemory_allocator>Q24rstl94pointer_iterator,Q24rstl17rmemory_allocator>RCUi" "count,Q24rstl17rmemory_allocator>,Ui>__4rstlFQ24rstl94pointer_iterator,Q24rstl17rmemory_allocator>Q24rstl94pointer_iterator,Q24rstl17rmemory_allocator>RCUi": @@ -21681,7 +21681,7 @@ lbl_8032A430: /* 8032A438 00327398 7C 07 00 40 */ cmplw r7, r0 /* 8032A43C 0032739C 40 82 FF D4 */ bne lbl_8032A410 /* 8032A440 003273A0 7D 03 43 78 */ mr r3, r8 -/* 8032A444 003273A4 4E 80 00 20 */ blr +/* 8032A444 003273A4 4E 80 00 20 */ blr .global "count,Q24rstl17rmemory_allocator>,Ui>__4rstlFQ24rstl100const_pointer_iterator,Q24rstl17rmemory_allocator>Q24rstl100const_pointer_iterator,Q24rstl17rmemory_allocator>RCUi" "count,Q24rstl17rmemory_allocator>,Ui>__4rstlFQ24rstl100const_pointer_iterator,Q24rstl17rmemory_allocator>Q24rstl100const_pointer_iterator,Q24rstl17rmemory_allocator>RCUi": @@ -21703,7 +21703,7 @@ lbl_8032A470: /* 8032A478 003273D8 7C 07 00 40 */ cmplw r7, r0 /* 8032A47C 003273DC 40 82 FF D4 */ bne lbl_8032A450 /* 8032A480 003273E0 7D 03 43 78 */ mr r3, r8 -/* 8032A484 003273E4 4E 80 00 20 */ blr +/* 8032A484 003273E4 4E 80 00 20 */ blr .global sub_8032a488 sub_8032a488: @@ -21739,7 +21739,7 @@ lbl_8032A4DC: /* 8032A4F4 00327454 80 01 00 14 */ lwz r0, 0x14(r1) /* 8032A4F8 00327458 7C 08 03 A6 */ mtlr r0 /* 8032A4FC 0032745C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8032A500 00327460 4E 80 00 20 */ blr +/* 8032A500 00327460 4E 80 00 20 */ blr .global __sinit_CElementGen_cpp __sinit_CElementGen_cpp: diff --git a/asm/Kyoto/Particles/CEmitterElement.s b/asm/Kyoto/Particles/CEmitterElement.s index c3264871..ec3f894a 100644 --- a/asm/Kyoto/Particles/CEmitterElement.s +++ b/asm/Kyoto/Particles/CEmitterElement.s @@ -69,42 +69,42 @@ GetValue__14CVEAngleSphereCFiR9CVector3fR9CVector3f: /* 80356978 003538D8 81 83 00 00 */ lwz r12, 0(r3) /* 8035697C 003538DC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80356980 003538E0 7D 89 03 A6 */ mtctr r12 -/* 80356984 003538E4 4E 80 04 21 */ bctrl +/* 80356984 003538E4 4E 80 04 21 */ bctrl /* 80356988 003538E8 80 7C 00 08 */ lwz r3, 8(r28) /* 8035698C 003538EC 7F A4 EB 78 */ mr r4, r29 /* 80356990 003538F0 38 A1 00 1C */ addi r5, r1, 0x1c /* 80356994 003538F4 81 83 00 00 */ lwz r12, 0(r3) /* 80356998 003538F8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8035699C 003538FC 7D 89 03 A6 */ mtctr r12 -/* 803569A0 00353900 4E 80 04 21 */ bctrl +/* 803569A0 00353900 4E 80 04 21 */ bctrl /* 803569A4 00353904 80 7C 00 10 */ lwz r3, 0x10(r28) /* 803569A8 00353908 7F A4 EB 78 */ mr r4, r29 /* 803569AC 0035390C 38 A1 00 14 */ addi r5, r1, 0x14 /* 803569B0 00353910 81 83 00 00 */ lwz r12, 0(r3) /* 803569B4 00353914 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803569B8 00353918 7D 89 03 A6 */ mtctr r12 -/* 803569BC 0035391C 4E 80 04 21 */ bctrl +/* 803569BC 0035391C 4E 80 04 21 */ bctrl /* 803569C0 00353920 80 7C 00 14 */ lwz r3, 0x14(r28) /* 803569C4 00353924 7F A4 EB 78 */ mr r4, r29 /* 803569C8 00353928 38 A1 00 0C */ addi r5, r1, 0xc /* 803569CC 0035392C 81 83 00 00 */ lwz r12, 0(r3) /* 803569D0 00353930 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803569D4 00353934 7D 89 03 A6 */ mtctr r12 -/* 803569D8 00353938 4E 80 04 21 */ bctrl +/* 803569D8 00353938 4E 80 04 21 */ bctrl /* 803569DC 0035393C 80 7C 00 18 */ lwz r3, 0x18(r28) /* 803569E0 00353940 7F A4 EB 78 */ mr r4, r29 /* 803569E4 00353944 38 A1 00 10 */ addi r5, r1, 0x10 /* 803569E8 00353948 81 83 00 00 */ lwz r12, 0(r3) /* 803569EC 0035394C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803569F0 00353950 7D 89 03 A6 */ mtctr r12 -/* 803569F4 00353954 4E 80 04 21 */ bctrl +/* 803569F4 00353954 4E 80 04 21 */ bctrl /* 803569F8 00353958 80 7C 00 1C */ lwz r3, 0x1c(r28) /* 803569FC 0035395C 7F A4 EB 78 */ mr r4, r29 /* 80356A00 00353960 38 A1 00 08 */ addi r5, r1, 8 /* 80356A04 00353964 81 83 00 00 */ lwz r12, 0(r3) /* 80356A08 00353968 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80356A0C 0035396C 7D 89 03 A6 */ mtctr r12 -/* 80356A10 00353970 4E 80 04 21 */ bctrl +/* 80356A10 00353970 4E 80 04 21 */ bctrl /* 80356A14 00353974 C3 A1 00 10 */ lfs f29, 0x10(r1) /* 80356A18 00353978 4B FB BB E5 */ bl GetRandomNumber__9CRandom16Fv /* 80356A1C 0035397C 4B FB BA C1 */ bl Float__9CRandom16Fv @@ -181,7 +181,7 @@ GetValue__14CVEAngleSphereCFiR9CVector3fR9CVector3f: /* 80356B38 00353A98 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80356B3C 00353A9C C3 E1 00 34 */ lfs f31, 0x34(r1) /* 80356B40 00353AA0 7D 89 03 A6 */ mtctr r12 -/* 80356B44 00353AA4 4E 80 04 21 */ bctrl +/* 80356B44 00353AA4 4E 80 04 21 */ bctrl /* 80356B48 00353AA8 C0 01 00 18 */ lfs f0, 0x18(r1) /* 80356B4C 00353AAC 38 60 00 00 */ li r3, 0 /* 80356B50 00353AB0 EC 40 07 72 */ fmuls f2, f0, f29 @@ -203,7 +203,7 @@ GetValue__14CVEAngleSphereCFiR9CVector3fR9CVector3f: /* 80356B90 00353AF0 83 81 00 50 */ lwz r28, 0x50(r1) /* 80356B94 00353AF4 7C 08 03 A6 */ mtlr r0 /* 80356B98 00353AF8 38 21 00 90 */ addi r1, r1, 0x90 -/* 80356B9C 00353AFC 4E 80 00 20 */ blr +/* 80356B9C 00353AFC 4E 80 00 20 */ blr .global __dt__14CVEAngleSphereFv __dt__14CVEAngleSphereFv: @@ -225,7 +225,7 @@ __dt__14CVEAngleSphereFv: /* 80356BDC 00353B3C 38 80 00 01 */ li r4, 1 /* 80356BE0 00353B40 81 8C 00 08 */ lwz r12, 8(r12) /* 80356BE4 00353B44 7D 89 03 A6 */ mtctr r12 -/* 80356BE8 00353B48 4E 80 04 21 */ bctrl +/* 80356BE8 00353B48 4E 80 04 21 */ bctrl lbl_80356BEC: /* 80356BEC 00353B4C 80 7E 00 08 */ lwz r3, 8(r30) /* 80356BF0 00353B50 28 03 00 00 */ cmplwi r3, 0 @@ -234,7 +234,7 @@ lbl_80356BEC: /* 80356BFC 00353B5C 38 80 00 01 */ li r4, 1 /* 80356C00 00353B60 81 8C 00 08 */ lwz r12, 8(r12) /* 80356C04 00353B64 7D 89 03 A6 */ mtctr r12 -/* 80356C08 00353B68 4E 80 04 21 */ bctrl +/* 80356C08 00353B68 4E 80 04 21 */ bctrl lbl_80356C0C: /* 80356C0C 00353B6C 80 7E 00 0C */ lwz r3, 0xc(r30) /* 80356C10 00353B70 28 03 00 00 */ cmplwi r3, 0 @@ -243,7 +243,7 @@ lbl_80356C0C: /* 80356C1C 00353B7C 38 80 00 01 */ li r4, 1 /* 80356C20 00353B80 81 8C 00 08 */ lwz r12, 8(r12) /* 80356C24 00353B84 7D 89 03 A6 */ mtctr r12 -/* 80356C28 00353B88 4E 80 04 21 */ bctrl +/* 80356C28 00353B88 4E 80 04 21 */ bctrl lbl_80356C2C: /* 80356C2C 00353B8C 80 7E 00 10 */ lwz r3, 0x10(r30) /* 80356C30 00353B90 28 03 00 00 */ cmplwi r3, 0 @@ -252,7 +252,7 @@ lbl_80356C2C: /* 80356C3C 00353B9C 38 80 00 01 */ li r4, 1 /* 80356C40 00353BA0 81 8C 00 08 */ lwz r12, 8(r12) /* 80356C44 00353BA4 7D 89 03 A6 */ mtctr r12 -/* 80356C48 00353BA8 4E 80 04 21 */ bctrl +/* 80356C48 00353BA8 4E 80 04 21 */ bctrl lbl_80356C4C: /* 80356C4C 00353BAC 80 7E 00 14 */ lwz r3, 0x14(r30) /* 80356C50 00353BB0 28 03 00 00 */ cmplwi r3, 0 @@ -261,7 +261,7 @@ lbl_80356C4C: /* 80356C5C 00353BBC 38 80 00 01 */ li r4, 1 /* 80356C60 00353BC0 81 8C 00 08 */ lwz r12, 8(r12) /* 80356C64 00353BC4 7D 89 03 A6 */ mtctr r12 -/* 80356C68 00353BC8 4E 80 04 21 */ bctrl +/* 80356C68 00353BC8 4E 80 04 21 */ bctrl lbl_80356C6C: /* 80356C6C 00353BCC 80 7E 00 18 */ lwz r3, 0x18(r30) /* 80356C70 00353BD0 28 03 00 00 */ cmplwi r3, 0 @@ -270,7 +270,7 @@ lbl_80356C6C: /* 80356C7C 00353BDC 38 80 00 01 */ li r4, 1 /* 80356C80 00353BE0 81 8C 00 08 */ lwz r12, 8(r12) /* 80356C84 00353BE4 7D 89 03 A6 */ mtctr r12 -/* 80356C88 00353BE8 4E 80 04 21 */ bctrl +/* 80356C88 00353BE8 4E 80 04 21 */ bctrl lbl_80356C8C: /* 80356C8C 00353BEC 80 7E 00 1C */ lwz r3, 0x1c(r30) /* 80356C90 00353BF0 28 03 00 00 */ cmplwi r3, 0 @@ -279,7 +279,7 @@ lbl_80356C8C: /* 80356C9C 00353BFC 38 80 00 01 */ li r4, 1 /* 80356CA0 00353C00 81 8C 00 08 */ lwz r12, 8(r12) /* 80356CA4 00353C04 7D 89 03 A6 */ mtctr r12 -/* 80356CA8 00353C08 4E 80 04 21 */ bctrl +/* 80356CA8 00353C08 4E 80 04 21 */ bctrl lbl_80356CAC: /* 80356CAC 00353C0C 28 1E 00 00 */ cmplwi r30, 0 /* 80356CB0 00353C10 41 82 00 20 */ beq lbl_80356CD0 @@ -303,7 +303,7 @@ lbl_80356CE4: /* 80356CF0 00353C50 83 C1 00 08 */ lwz r30, 8(r1) /* 80356CF4 00353C54 7C 08 03 A6 */ mtlr r0 /* 80356CF8 00353C58 38 21 00 10 */ addi r1, r1, 0x10 -/* 80356CFC 00353C5C 4E 80 00 20 */ blr +/* 80356CFC 00353C5C 4E 80 00 20 */ blr .global __ct__14CVEAngleSphereFP14CVectorElementP12CRealElementP12CRealElementP12CRealElementP12CRealElementP12CRealElementP12CRealElement __ct__14CVEAngleSphereFP14CVectorElementP12CRealElementP12CRealElementP12CRealElementP12CRealElementP12CRealElementP12CRealElement: @@ -327,7 +327,7 @@ __ct__14CVEAngleSphereFP14CVectorElementP12CRealElementP12CRealElementP12CRealEl /* 80356D44 00353CA4 91 43 00 1C */ stw r10, 0x1c(r3) /* 80356D48 00353CA8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80356D4C 00353CAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80356D50 00353CB0 4E 80 00 20 */ blr +/* 80356D50 00353CB0 4E 80 00 20 */ blr .global __dt__15CEmitterElement __dt__15CEmitterElement: @@ -356,7 +356,7 @@ lbl_80356D9C: /* 80356DA4 00353D04 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80356DA8 00353D08 7C 08 03 A6 */ mtlr r0 /* 80356DAC 00353D0C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80356DB0 00353D10 4E 80 00 20 */ blr +/* 80356DB0 00353D10 4E 80 00 20 */ blr .global GetValue__9CVESphereCFiR9CVector3fR9CVector3f GetValue__9CVESphereCFiR9CVector3fR9CVector3f: @@ -390,14 +390,14 @@ GetValue__9CVESphereCFiR9CVector3fR9CVector3f: /* 80356E20 00353D80 81 83 00 00 */ lwz r12, 0(r3) /* 80356E24 00353D84 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80356E28 00353D88 7D 89 03 A6 */ mtctr r12 -/* 80356E2C 00353D8C 4E 80 04 21 */ bctrl +/* 80356E2C 00353D8C 4E 80 04 21 */ bctrl /* 80356E30 00353D90 80 7C 00 08 */ lwz r3, 8(r28) /* 80356E34 00353D94 7F A4 EB 78 */ mr r4, r29 /* 80356E38 00353D98 38 A1 00 0C */ addi r5, r1, 0xc /* 80356E3C 00353D9C 81 83 00 00 */ lwz r12, 0(r3) /* 80356E40 00353DA0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80356E44 00353DA4 7D 89 03 A6 */ mtctr r12 -/* 80356E48 00353DA8 4E 80 04 21 */ bctrl +/* 80356E48 00353DA8 4E 80 04 21 */ bctrl /* 80356E4C 00353DAC 4B FB B7 B1 */ bl GetRandomNumber__9CRandom16Fv /* 80356E50 00353DB0 38 80 FF 9C */ li r4, -100 /* 80356E54 00353DB4 38 A0 00 64 */ li r5, 0x64 @@ -518,7 +518,7 @@ lbl_80356FF8: /* 80357010 00353F70 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80357014 00353F74 C3 A6 00 08 */ lfs f29, 8(r6) /* 80357018 00353F78 7D 89 03 A6 */ mtctr r12 -/* 8035701C 00353F7C 4E 80 04 21 */ bctrl +/* 8035701C 00353F7C 4E 80 04 21 */ bctrl /* 80357020 00353F80 C0 01 00 08 */ lfs f0, 8(r1) /* 80357024 00353F84 38 60 00 00 */ li r3, 0 /* 80357028 00353F88 EC 40 07 B2 */ fmuls f2, f0, f30 @@ -540,7 +540,7 @@ lbl_80356FF8: /* 80357068 00353FC8 83 81 00 80 */ lwz r28, 0x80(r1) /* 8035706C 00353FCC 7C 08 03 A6 */ mtlr r0 /* 80357070 00353FD0 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 80357074 00353FD4 4E 80 00 20 */ blr +/* 80357074 00353FD4 4E 80 00 20 */ blr .global __dt__9CVESphereFv __dt__9CVESphereFv: @@ -562,7 +562,7 @@ __dt__9CVESphereFv: /* 803570B4 00354014 38 80 00 01 */ li r4, 1 /* 803570B8 00354018 81 8C 00 08 */ lwz r12, 8(r12) /* 803570BC 0035401C 7D 89 03 A6 */ mtctr r12 -/* 803570C0 00354020 4E 80 04 21 */ bctrl +/* 803570C0 00354020 4E 80 04 21 */ bctrl lbl_803570C4: /* 803570C4 00354024 80 7E 00 08 */ lwz r3, 8(r30) /* 803570C8 00354028 28 03 00 00 */ cmplwi r3, 0 @@ -571,7 +571,7 @@ lbl_803570C4: /* 803570D4 00354034 38 80 00 01 */ li r4, 1 /* 803570D8 00354038 81 8C 00 08 */ lwz r12, 8(r12) /* 803570DC 0035403C 7D 89 03 A6 */ mtctr r12 -/* 803570E0 00354040 4E 80 04 21 */ bctrl +/* 803570E0 00354040 4E 80 04 21 */ bctrl lbl_803570E4: /* 803570E4 00354044 80 7E 00 0C */ lwz r3, 0xc(r30) /* 803570E8 00354048 28 03 00 00 */ cmplwi r3, 0 @@ -580,7 +580,7 @@ lbl_803570E4: /* 803570F4 00354054 38 80 00 01 */ li r4, 1 /* 803570F8 00354058 81 8C 00 08 */ lwz r12, 8(r12) /* 803570FC 0035405C 7D 89 03 A6 */ mtctr r12 -/* 80357100 00354060 4E 80 04 21 */ bctrl +/* 80357100 00354060 4E 80 04 21 */ bctrl lbl_80357104: /* 80357104 00354064 28 1E 00 00 */ cmplwi r30, 0 /* 80357108 00354068 41 82 00 20 */ beq lbl_80357128 @@ -604,7 +604,7 @@ lbl_8035713C: /* 80357148 003540A8 83 C1 00 08 */ lwz r30, 8(r1) /* 8035714C 003540AC 7C 08 03 A6 */ mtlr r0 /* 80357150 003540B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80357154 003540B4 4E 80 00 20 */ blr +/* 80357154 003540B4 4E 80 00 20 */ blr .global __ct__9CVESphereFP14CVectorElementP12CRealElementP12CRealElement __ct__9CVESphereFP14CVectorElementP12CRealElementP12CRealElement: @@ -620,7 +620,7 @@ __ct__9CVESphereFP14CVectorElementP12CRealElementP12CRealElement: /* 8035717C 003540DC 90 83 00 04 */ stw r4, 4(r3) /* 80357180 003540E0 90 A3 00 08 */ stw r5, 8(r3) /* 80357184 003540E4 90 C3 00 0C */ stw r6, 0xc(r3) -/* 80357188 003540E8 4E 80 00 20 */ blr +/* 80357188 003540E8 4E 80 00 20 */ blr .global GetValue__16CEESimpleEmitterCFiR9CVector3fR9CVector3f GetValue__16CEESimpleEmitterCFiR9CVector3fR9CVector3f: @@ -637,7 +637,7 @@ GetValue__16CEESimpleEmitterCFiR9CVector3fR9CVector3f: /* 803571B4 00354114 81 83 00 00 */ lwz r12, 0(r3) /* 803571B8 00354118 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803571BC 0035411C 7D 89 03 A6 */ mtctr r12 -/* 803571C0 00354120 4E 80 04 21 */ bctrl +/* 803571C0 00354120 4E 80 04 21 */ bctrl /* 803571C4 00354124 80 7D 00 08 */ lwz r3, 8(r29) /* 803571C8 00354128 28 03 00 00 */ cmplwi r3, 0 /* 803571CC 0035412C 41 82 00 20 */ beq lbl_803571EC @@ -646,7 +646,7 @@ GetValue__16CEESimpleEmitterCFiR9CVector3fR9CVector3f: /* 803571D8 00354138 7F E5 FB 78 */ mr r5, r31 /* 803571DC 0035413C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803571E0 00354140 7D 89 03 A6 */ mtctr r12 -/* 803571E4 00354144 4E 80 04 21 */ bctrl +/* 803571E4 00354144 4E 80 04 21 */ bctrl /* 803571E8 00354148 48 00 00 20 */ b lbl_80357208 lbl_803571EC: /* 803571EC 0035414C 3C 60 80 5A */ lis r3, skZero3f@ha @@ -664,7 +664,7 @@ lbl_80357208: /* 80357218 00354178 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8035721C 0035417C 7C 08 03 A6 */ mtlr r0 /* 80357220 00354180 38 21 00 20 */ addi r1, r1, 0x20 -/* 80357224 00354184 4E 80 00 20 */ blr +/* 80357224 00354184 4E 80 00 20 */ blr .global __dt__16CEESimpleEmitterFv __dt__16CEESimpleEmitterFv: @@ -686,7 +686,7 @@ __dt__16CEESimpleEmitterFv: /* 80357264 003541C4 38 80 00 01 */ li r4, 1 /* 80357268 003541C8 81 8C 00 08 */ lwz r12, 8(r12) /* 8035726C 003541CC 7D 89 03 A6 */ mtctr r12 -/* 80357270 003541D0 4E 80 04 21 */ bctrl +/* 80357270 003541D0 4E 80 04 21 */ bctrl lbl_80357274: /* 80357274 003541D4 80 7E 00 08 */ lwz r3, 8(r30) /* 80357278 003541D8 28 03 00 00 */ cmplwi r3, 0 @@ -695,7 +695,7 @@ lbl_80357274: /* 80357284 003541E4 38 80 00 01 */ li r4, 1 /* 80357288 003541E8 81 8C 00 08 */ lwz r12, 8(r12) /* 8035728C 003541EC 7D 89 03 A6 */ mtctr r12 -/* 80357290 003541F0 4E 80 04 21 */ bctrl +/* 80357290 003541F0 4E 80 04 21 */ bctrl lbl_80357294: /* 80357294 003541F4 28 1E 00 00 */ cmplwi r30, 0 /* 80357298 003541F8 41 82 00 20 */ beq lbl_803572B8 @@ -719,7 +719,7 @@ lbl_803572CC: /* 803572D8 00354238 83 C1 00 08 */ lwz r30, 8(r1) /* 803572DC 0035423C 7C 08 03 A6 */ mtlr r0 /* 803572E0 00354240 38 21 00 10 */ addi r1, r1, 0x10 -/* 803572E4 00354244 4E 80 00 20 */ blr +/* 803572E4 00354244 4E 80 00 20 */ blr .global __ct__16CEESimpleEmitterFP14CVectorElementP14CVectorElement __ct__16CEESimpleEmitterFP14CVectorElementP14CVectorElement: @@ -734,4 +734,4 @@ __ct__16CEESimpleEmitterFP14CVectorElementP14CVectorElement: /* 80357308 00354268 90 03 00 00 */ stw r0, 0(r3) /* 8035730C 0035426C 90 83 00 04 */ stw r4, 4(r3) /* 80357310 00354270 90 A3 00 08 */ stw r5, 8(r3) -/* 80357314 00354274 4E 80 00 20 */ blr +/* 80357314 00354274 4E 80 00 20 */ blr diff --git a/asm/Kyoto/Particles/CGenDescription.s b/asm/Kyoto/Particles/CGenDescription.s index d633318e..1c0cbfd7 100644 --- a/asm/Kyoto/Particles/CGenDescription.s +++ b/asm/Kyoto/Particles/CGenDescription.s @@ -28,7 +28,7 @@ lbl_80366E6C: /* 80366E88 00363DE8 38 80 00 01 */ li r4, 1 /* 80366E8C 00363DEC 81 8C 00 08 */ lwz r12, 8(r12) /* 80366E90 00363DF0 7D 89 03 A6 */ mtctr r12 -/* 80366E94 00363DF4 4E 80 04 21 */ bctrl +/* 80366E94 00363DF4 4E 80 04 21 */ bctrl lbl_80366E98: /* 80366E98 00363DF8 3B 9C 00 01 */ addi r28, r28, 1 /* 80366E9C 00363DFC 3B BD 00 04 */ addi r29, r29, 4 @@ -137,7 +137,7 @@ lbl_80366FF0: /* 80367004 00363F64 83 81 00 10 */ lwz r28, 0x10(r1) /* 80367008 00363F68 7C 08 03 A6 */ mtlr r0 /* 8036700C 00363F6C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80367010 00363F70 4E 80 00 20 */ blr +/* 80367010 00363F70 4E 80 00 20 */ blr .global "__dt__Q24rstl38single_ptr<24CSpawnSystemKeyframeData>Fv" "__dt__Q24rstl38single_ptr<24CSpawnSystemKeyframeData>Fv": @@ -163,7 +163,7 @@ lbl_80367050: /* 8036705C 00363FBC 83 C1 00 08 */ lwz r30, 8(r1) /* 80367060 00363FC0 7C 08 03 A6 */ mtlr r0 /* 80367064 00363FC4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80367068 00363FC8 4E 80 00 20 */ blr +/* 80367068 00363FC8 4E 80 00 20 */ blr .global __ct__15CGenDescriptionFv __ct__15CGenDescriptionFv: @@ -280,9 +280,9 @@ __ct__15CGenDescriptionFv: /* 80367224 00364184 90 A3 01 20 */ stw r5, 0x120(r3) /* 80367228 00364188 90 A3 01 24 */ stw r5, 0x124(r3) /* 8036722C 0036418C 90 A3 01 28 */ stw r5, 0x128(r3) -/* 80367230 00364190 4E 80 00 20 */ blr +/* 80367230 00364190 4E 80 00 20 */ blr .global element_from_desc__FP15CGenDescriptioni element_from_desc__FP15CGenDescriptioni: /* 80367234 00364194 7C 63 22 14 */ add r3, r3, r4 -/* 80367238 00364198 4E 80 00 20 */ blr +/* 80367238 00364198 4E 80 00 20 */ blr diff --git a/asm/Kyoto/Particles/CParticleData.s b/asm/Kyoto/Particles/CParticleData.s index 158b49b4..5ff2d3e0 100644 --- a/asm/Kyoto/Particles/CParticleData.s +++ b/asm/Kyoto/Particles/CParticleData.s @@ -52,7 +52,7 @@ __ct__13CParticleDataFR12CInputStream: /* 80357494 003543F4 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80357498 003543F8 7C 08 03 A6 */ mtlr r0 /* 8035749C 003543FC 38 21 00 30 */ addi r1, r1, 0x30 -/* 803574A0 00354400 4E 80 00 20 */ blr +/* 803574A0 00354400 4E 80 00 20 */ blr .global "Get,Q24rstl17rmemory_allocator>>__12CInputStreamFRC82TType,Q24rstl17rmemory_allocator>>" "Get,Q24rstl17rmemory_allocator>>__12CInputStreamFRC82TType,Q24rstl17rmemory_allocator>>": @@ -70,4 +70,4 @@ __ct__13CParticleDataFR12CInputStream: /* 803574D0 00354430 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 803574D4 00354434 7C 08 03 A6 */ mtlr r0 /* 803574D8 00354438 38 21 00 20 */ addi r1, r1, 0x20 -/* 803574DC 0035443C 4E 80 00 20 */ blr +/* 803574DC 0035443C 4E 80 00 20 */ blr diff --git a/asm/Kyoto/Particles/CParticleElectric.s b/asm/Kyoto/Particles/CParticleElectric.s index 20cab14e..31730825 100644 --- a/asm/Kyoto/Particles/CParticleElectric.s +++ b/asm/Kyoto/Particles/CParticleElectric.s @@ -64,39 +64,39 @@ lbl_805A8A18: .global GetTranslation__17CParticleElectricCFv GetTranslation__17CParticleElectricCFv: /* 8035E8D8 0035B838 38 63 00 38 */ addi r3, r3, 0x38 -/* 8035E8DC 0035B83C 4E 80 00 20 */ blr +/* 8035E8DC 0035B83C 4E 80 00 20 */ blr .global GetOrientation__17CParticleElectricCFv GetOrientation__17CParticleElectricCFv: /* 8035E8E0 0035B840 38 63 00 44 */ addi r3, r3, 0x44 -/* 8035E8E4 0035B844 4E 80 00 20 */ blr +/* 8035E8E4 0035B844 4E 80 00 20 */ blr .global GetGlobalTranslation__17CParticleElectricCFv GetGlobalTranslation__17CParticleElectricCFv: /* 8035E8E8 0035B848 38 63 00 A4 */ addi r3, r3, 0xa4 -/* 8035E8EC 0035B84C 4E 80 00 20 */ blr +/* 8035E8EC 0035B84C 4E 80 00 20 */ blr .global GetGlobalOrientation__17CParticleElectricCFv GetGlobalOrientation__17CParticleElectricCFv: /* 8035E8F0 0035B850 38 63 00 B0 */ addi r3, r3, 0xb0 -/* 8035E8F4 0035B854 4E 80 00 20 */ blr +/* 8035E8F4 0035B854 4E 80 00 20 */ blr .global DestroyParticles__17CParticleElectricFv DestroyParticles__17CParticleElectricFv: -/* 8035E8F8 0035B858 4E 80 00 20 */ blr +/* 8035E8F8 0035B858 4E 80 00 20 */ blr .global Get4CharId__17CParticleElectricFv Get4CharId__17CParticleElectricFv: /* 8035E8FC 0035B85C 3C 60 45 4C */ lis r3, 0x454C5343@ha /* 8035E900 0035B860 38 63 53 43 */ addi r3, r3, 0x454C5343@l -/* 8035E904 0035B864 4E 80 00 20 */ blr +/* 8035E904 0035B864 4E 80 00 20 */ blr .global SetParticleEmission__17CParticleElectricFb SetParticleEmission__17CParticleElectricFb: /* 8035E908 0035B868 88 03 04 50 */ lbz r0, 0x450(r3) /* 8035E90C 0035B86C 50 80 3E 30 */ rlwimi r0, r4, 7, 0x18, 0x18 /* 8035E910 0035B870 98 03 04 50 */ stb r0, 0x450(r3) -/* 8035E914 0035B874 4E 80 00 20 */ blr +/* 8035E914 0035B874 4E 80 00 20 */ blr .global GetLight__17CParticleElectricFv GetLight__17CParticleElectricFv: @@ -116,7 +116,7 @@ GetLight__17CParticleElectricFv: /* 8035E94C 0035B8AC 81 84 00 00 */ lwz r12, 0(r4) /* 8035E950 0035B8B0 81 8C 00 68 */ lwz r12, 0x68(r12) /* 8035E954 0035B8B4 7D 89 03 A6 */ mtctr r12 -/* 8035E958 0035B8B8 4E 80 04 21 */ bctrl +/* 8035E958 0035B8B8 4E 80 04 21 */ bctrl /* 8035E95C 0035B8BC 48 00 00 54 */ b lbl_8035E9B0 lbl_8035E960: /* 8035E960 0035B8C0 54 80 DF FF */ rlwinm. r0, r4, 0x1b, 0x1f, 0x1f @@ -126,7 +126,7 @@ lbl_8035E960: /* 8035E970 0035B8D0 81 84 00 00 */ lwz r12, 0(r4) /* 8035E974 0035B8D4 81 8C 00 68 */ lwz r12, 0x68(r12) /* 8035E978 0035B8D8 7D 89 03 A6 */ mtctr r12 -/* 8035E97C 0035B8DC 4E 80 04 21 */ bctrl +/* 8035E97C 0035B8DC 4E 80 04 21 */ bctrl /* 8035E980 0035B8E0 48 00 00 30 */ b lbl_8035E9B0 lbl_8035E984: /* 8035E984 0035B8E4 4B FE B6 01 */ bl Orange__6CColorFv @@ -135,7 +135,7 @@ lbl_8035E984: /* 8035E990 0035B8F0 81 9E 00 00 */ lwz r12, 0(r30) /* 8035E994 0035B8F4 81 8C 00 44 */ lwz r12, 0x44(r12) /* 8035E998 0035B8F8 7D 89 03 A6 */ mtctr r12 -/* 8035E99C 0035B8FC 4E 80 04 21 */ bctrl +/* 8035E99C 0035B8FC 4E 80 04 21 */ bctrl /* 8035E9A0 0035B900 7C 64 1B 78 */ mr r4, r3 /* 8035E9A4 0035B904 7F A3 EB 78 */ mr r3, r29 /* 8035E9A8 0035B908 7F E5 FB 78 */ mr r5, r31 @@ -147,7 +147,7 @@ lbl_8035E9B0: /* 8035E9BC 0035B91C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8035E9C0 0035B920 7C 08 03 A6 */ mtlr r0 /* 8035E9C4 0035B924 38 21 00 20 */ addi r1, r1, 0x20 -/* 8035E9C8 0035B928 4E 80 00 20 */ blr +/* 8035E9C8 0035B928 4E 80 00 20 */ blr .global SystemHasLight__17CParticleElectricFv SystemHasLight__17CParticleElectricFv: @@ -162,7 +162,7 @@ SystemHasLight__17CParticleElectricFv: /* 8035E9EC 0035B94C 81 83 00 00 */ lwz r12, 0(r3) /* 8035E9F0 0035B950 81 8C 00 64 */ lwz r12, 0x64(r12) /* 8035E9F4 0035B954 7D 89 03 A6 */ mtctr r12 -/* 8035E9F8 0035B958 4E 80 04 21 */ bctrl +/* 8035E9F8 0035B958 4E 80 04 21 */ bctrl /* 8035E9FC 0035B95C 48 00 00 2C */ b lbl_8035EA28 lbl_8035EA00: /* 8035EA00 0035B960 54 80 DF FF */ rlwinm. r0, r4, 0x1b, 0x1f, 0x1f @@ -172,7 +172,7 @@ lbl_8035EA00: /* 8035EA10 0035B970 81 83 00 00 */ lwz r12, 0(r3) /* 8035EA14 0035B974 81 8C 00 64 */ lwz r12, 0x64(r12) /* 8035EA18 0035B978 7D 89 03 A6 */ mtctr r12 -/* 8035EA1C 0035B97C 4E 80 04 21 */ bctrl +/* 8035EA1C 0035B97C 4E 80 04 21 */ bctrl /* 8035EA20 0035B980 48 00 00 08 */ b lbl_8035EA28 lbl_8035EA24: /* 8035EA24 0035B984 38 60 00 00 */ li r3, 0 @@ -180,7 +180,7 @@ lbl_8035EA28: /* 8035EA28 0035B988 80 01 00 14 */ lwz r0, 0x14(r1) /* 8035EA2C 0035B98C 7C 08 03 A6 */ mtlr r0 /* 8035EA30 0035B990 38 21 00 10 */ addi r1, r1, 0x10 -/* 8035EA34 0035B994 4E 80 00 20 */ blr +/* 8035EA34 0035B994 4E 80 00 20 */ blr .global UpdateCachedTransform__17CParticleElectricFv UpdateCachedTransform__17CParticleElectricFv: @@ -218,7 +218,7 @@ UpdateCachedTransform__17CParticleElectricFv: /* 8035EAB4 0035BA14 80 01 01 04 */ lwz r0, 0x104(r1) /* 8035EAB8 0035BA18 7C 08 03 A6 */ mtlr r0 /* 8035EABC 0035BA1C 38 21 01 00 */ addi r1, r1, 0x100 -/* 8035EAC0 0035BA20 4E 80 00 20 */ blr +/* 8035EAC0 0035BA20 4E 80 00 20 */ blr .global SetLocalScale__17CParticleElectricFRC9CVector3f SetLocalScale__17CParticleElectricFRC9CVector3f: @@ -254,7 +254,7 @@ lbl_8035EB20: /* 8035EB34 0035BA94 81 83 00 00 */ lwz r12, 0(r3) /* 8035EB38 0035BA98 81 8C 00 28 */ lwz r12, 0x28(r12) /* 8035EB3C 0035BA9C 7D 89 03 A6 */ mtctr r12 -/* 8035EB40 0035BAA0 4E 80 04 21 */ bctrl +/* 8035EB40 0035BAA0 4E 80 04 21 */ bctrl /* 8035EB44 0035BAA4 83 DE 00 04 */ lwz r30, 4(r30) lbl_8035EB48: /* 8035EB48 0035BAA8 80 1F 03 F0 */ lwz r0, 0x3f0(r31) @@ -275,7 +275,7 @@ lbl_8035EB6C: /* 8035EB7C 0035BADC 81 83 00 00 */ lwz r12, 0(r3) /* 8035EB80 0035BAE0 81 8C 00 28 */ lwz r12, 0x28(r12) /* 8035EB84 0035BAE4 7D 89 03 A6 */ mtctr r12 -/* 8035EB88 0035BAE8 4E 80 04 21 */ bctrl +/* 8035EB88 0035BAE8 4E 80 04 21 */ bctrl /* 8035EB8C 0035BAEC 3B BD 00 08 */ addi r29, r29, 8 /* 8035EB90 0035BAF0 3B DE 00 01 */ addi r30, r30, 1 lbl_8035EB94: @@ -297,7 +297,7 @@ lbl_8035EBB8: /* 8035EBC8 0035BB28 81 83 00 00 */ lwz r12, 0(r3) /* 8035EBCC 0035BB2C 81 8C 00 28 */ lwz r12, 0x28(r12) /* 8035EBD0 0035BB30 7D 89 03 A6 */ mtctr r12 -/* 8035EBD4 0035BB34 4E 80 04 21 */ bctrl +/* 8035EBD4 0035BB34 4E 80 04 21 */ bctrl /* 8035EBD8 0035BB38 3B BD 00 08 */ addi r29, r29, 8 /* 8035EBDC 0035BB3C 3B DE 00 01 */ addi r30, r30, 1 lbl_8035EBE0: @@ -311,7 +311,7 @@ lbl_8035EBEC: /* 8035EBF8 0035BB58 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8035EBFC 0035BB5C 7C 08 03 A6 */ mtlr r0 /* 8035EC00 0035BB60 38 21 00 20 */ addi r1, r1, 0x20 -/* 8035EC04 0035BB64 4E 80 00 20 */ blr +/* 8035EC04 0035BB64 4E 80 00 20 */ blr .global SetGlobalScale__17CParticleElectricFRC9CVector3f SetGlobalScale__17CParticleElectricFRC9CVector3f: @@ -325,7 +325,7 @@ SetGlobalScale__17CParticleElectricFRC9CVector3f: /* 8035EC24 0035BB84 88 03 04 50 */ lbz r0, 0x450(r3) /* 8035EC28 0035BB88 50 A0 17 7A */ rlwimi r0, r5, 2, 0x1d, 0x1d /* 8035EC2C 0035BB8C 98 03 04 50 */ stb r0, 0x450(r3) -/* 8035EC30 0035BB90 4E 80 00 20 */ blr +/* 8035EC30 0035BB90 4E 80 00 20 */ blr .global SetGlobalOrientation__17CParticleElectricFRC12CTransform4f SetGlobalOrientation__17CParticleElectricFRC12CTransform4f: @@ -360,7 +360,7 @@ lbl_8035EC8C: /* 8035ECA0 0035BC00 81 83 00 00 */ lwz r12, 0(r3) /* 8035ECA4 0035BC04 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 8035ECA8 0035BC08 7D 89 03 A6 */ mtctr r12 -/* 8035ECAC 0035BC0C 4E 80 04 21 */ bctrl +/* 8035ECAC 0035BC0C 4E 80 04 21 */ bctrl /* 8035ECB0 0035BC10 83 DE 00 04 */ lwz r30, 4(r30) lbl_8035ECB4: /* 8035ECB4 0035BC14 80 1F 03 F0 */ lwz r0, 0x3f0(r31) @@ -381,7 +381,7 @@ lbl_8035ECD8: /* 8035ECE8 0035BC48 81 83 00 00 */ lwz r12, 0(r3) /* 8035ECEC 0035BC4C 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 8035ECF0 0035BC50 7D 89 03 A6 */ mtctr r12 -/* 8035ECF4 0035BC54 4E 80 04 21 */ bctrl +/* 8035ECF4 0035BC54 4E 80 04 21 */ bctrl /* 8035ECF8 0035BC58 3B BD 00 08 */ addi r29, r29, 8 /* 8035ECFC 0035BC5C 3B DE 00 01 */ addi r30, r30, 1 lbl_8035ED00: @@ -403,7 +403,7 @@ lbl_8035ED24: /* 8035ED34 0035BC94 81 83 00 00 */ lwz r12, 0(r3) /* 8035ED38 0035BC98 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 8035ED3C 0035BC9C 7D 89 03 A6 */ mtctr r12 -/* 8035ED40 0035BCA0 4E 80 04 21 */ bctrl +/* 8035ED40 0035BCA0 4E 80 04 21 */ bctrl /* 8035ED44 0035BCA4 3B BD 00 08 */ addi r29, r29, 8 /* 8035ED48 0035BCA8 3B DE 00 01 */ addi r30, r30, 1 lbl_8035ED4C: @@ -417,7 +417,7 @@ lbl_8035ED58: /* 8035ED64 0035BCC4 83 A1 00 44 */ lwz r29, 0x44(r1) /* 8035ED68 0035BCC8 7C 08 03 A6 */ mtlr r0 /* 8035ED6C 0035BCCC 38 21 00 50 */ addi r1, r1, 0x50 -/* 8035ED70 0035BCD0 4E 80 00 20 */ blr +/* 8035ED70 0035BCD0 4E 80 00 20 */ blr .global SetGlobalTranslation__17CParticleElectricFRC9CVector3f SetGlobalTranslation__17CParticleElectricFRC9CVector3f: @@ -453,7 +453,7 @@ lbl_8035EDD0: /* 8035EDE4 0035BD44 81 83 00 00 */ lwz r12, 0(r3) /* 8035EDE8 0035BD48 81 8C 00 20 */ lwz r12, 0x20(r12) /* 8035EDEC 0035BD4C 7D 89 03 A6 */ mtctr r12 -/* 8035EDF0 0035BD50 4E 80 04 21 */ bctrl +/* 8035EDF0 0035BD50 4E 80 04 21 */ bctrl /* 8035EDF4 0035BD54 83 DE 00 04 */ lwz r30, 4(r30) lbl_8035EDF8: /* 8035EDF8 0035BD58 80 1F 03 F0 */ lwz r0, 0x3f0(r31) @@ -474,7 +474,7 @@ lbl_8035EE1C: /* 8035EE2C 0035BD8C 81 83 00 00 */ lwz r12, 0(r3) /* 8035EE30 0035BD90 81 8C 00 20 */ lwz r12, 0x20(r12) /* 8035EE34 0035BD94 7D 89 03 A6 */ mtctr r12 -/* 8035EE38 0035BD98 4E 80 04 21 */ bctrl +/* 8035EE38 0035BD98 4E 80 04 21 */ bctrl /* 8035EE3C 0035BD9C 3B BD 00 08 */ addi r29, r29, 8 /* 8035EE40 0035BDA0 3B DE 00 01 */ addi r30, r30, 1 lbl_8035EE44: @@ -496,7 +496,7 @@ lbl_8035EE68: /* 8035EE78 0035BDD8 81 83 00 00 */ lwz r12, 0(r3) /* 8035EE7C 0035BDDC 81 8C 00 20 */ lwz r12, 0x20(r12) /* 8035EE80 0035BDE0 7D 89 03 A6 */ mtctr r12 -/* 8035EE84 0035BDE4 4E 80 04 21 */ bctrl +/* 8035EE84 0035BDE4 4E 80 04 21 */ bctrl /* 8035EE88 0035BDE8 3B BD 00 08 */ addi r29, r29, 8 /* 8035EE8C 0035BDEC 3B DE 00 01 */ addi r30, r30, 1 lbl_8035EE90: @@ -510,7 +510,7 @@ lbl_8035EE9C: /* 8035EEA8 0035BE08 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8035EEAC 0035BE0C 7C 08 03 A6 */ mtlr r0 /* 8035EEB0 0035BE10 38 21 00 20 */ addi r1, r1, 0x20 -/* 8035EEB4 0035BE14 4E 80 00 20 */ blr +/* 8035EEB4 0035BE14 4E 80 00 20 */ blr .global SetOrientation__17CParticleElectricFRC12CTransform4f SetOrientation__17CParticleElectricFRC12CTransform4f: @@ -535,7 +535,7 @@ SetOrientation__17CParticleElectricFRC12CTransform4f: /* 8035EF00 0035BE60 80 01 00 44 */ lwz r0, 0x44(r1) /* 8035EF04 0035BE64 7C 08 03 A6 */ mtlr r0 /* 8035EF08 0035BE68 38 21 00 40 */ addi r1, r1, 0x40 -/* 8035EF0C 0035BE6C 4E 80 00 20 */ blr +/* 8035EF0C 0035BE6C 4E 80 00 20 */ blr .global SetTranslation__17CParticleElectricFRC9CVector3f SetTranslation__17CParticleElectricFRC9CVector3f: @@ -549,7 +549,7 @@ SetTranslation__17CParticleElectricFRC9CVector3f: /* 8035EF2C 0035BE8C 88 03 04 50 */ lbz r0, 0x450(r3) /* 8035EF30 0035BE90 50 A0 17 7A */ rlwimi r0, r5, 2, 0x1d, 0x1d /* 8035EF34 0035BE94 98 03 04 50 */ stb r0, 0x450(r3) -/* 8035EF38 0035BE98 4E 80 00 20 */ blr +/* 8035EF38 0035BE98 4E 80 00 20 */ blr .global ForceParticleCreation__17CParticleElectricFi ForceParticleCreation__17CParticleElectricFi: @@ -574,7 +574,7 @@ ForceParticleCreation__17CParticleElectricFi: /* 8035EF84 0035BEE4 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8035EF88 0035BEE8 7C 08 03 A6 */ mtlr r0 /* 8035EF8C 0035BEEC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8035EF90 0035BEF0 4E 80 00 20 */ blr +/* 8035EF90 0035BEF0 4E 80 00 20 */ blr .global GetParticleCount__17CParticleElectricFv GetParticleCount__17CParticleElectricFv: @@ -604,7 +604,7 @@ lbl_8035EFD0: /* 8035EFEC 0035BF4C 81 83 00 00 */ lwz r12, 0(r3) /* 8035EFF0 0035BF50 81 8C 00 60 */ lwz r12, 0x60(r12) /* 8035EFF4 0035BF54 7D 89 03 A6 */ mtctr r12 -/* 8035EFF8 0035BF58 4E 80 04 21 */ bctrl +/* 8035EFF8 0035BF58 4E 80 04 21 */ bctrl /* 8035EFFC 0035BF5C 7F FF 1A 14 */ add r31, r31, r3 lbl_8035F000: /* 8035F000 0035BF60 88 1E 04 50 */ lbz r0, 0x450(r30) @@ -632,7 +632,7 @@ lbl_8035F03C: /* 8035F048 0035BFA8 81 83 00 00 */ lwz r12, 0(r3) /* 8035F04C 0035BFAC 81 8C 00 60 */ lwz r12, 0x60(r12) /* 8035F050 0035BFB0 7D 89 03 A6 */ mtctr r12 -/* 8035F054 0035BFB4 4E 80 04 21 */ bctrl +/* 8035F054 0035BFB4 4E 80 04 21 */ bctrl /* 8035F058 0035BFB8 7F FF 1A 14 */ add r31, r31, r3 /* 8035F05C 0035BFBC 3B 9C 00 08 */ addi r28, r28, 8 /* 8035F060 0035BFC0 3B BD 00 01 */ addi r29, r29, 1 @@ -654,7 +654,7 @@ lbl_8035F088: /* 8035F094 0035BFF4 81 83 00 00 */ lwz r12, 0(r3) /* 8035F098 0035BFF8 81 8C 00 60 */ lwz r12, 0x60(r12) /* 8035F09C 0035BFFC 7D 89 03 A6 */ mtctr r12 -/* 8035F0A0 0035C000 4E 80 04 21 */ bctrl +/* 8035F0A0 0035C000 4E 80 04 21 */ bctrl /* 8035F0A4 0035C004 7F FF 1A 14 */ add r31, r31, r3 /* 8035F0A8 0035C008 3B 9C 00 08 */ addi r28, r28, 8 /* 8035F0AC 0035C00C 3B BD 00 01 */ addi r29, r29, 1 @@ -671,7 +671,7 @@ lbl_8035F0BC: /* 8035F0D0 0035C030 83 81 00 10 */ lwz r28, 0x10(r1) /* 8035F0D4 0035C034 7C 08 03 A6 */ mtlr r0 /* 8035F0D8 0035C038 38 21 00 20 */ addi r1, r1, 0x20 -/* 8035F0DC 0035C03C 4E 80 00 20 */ blr +/* 8035F0DC 0035C03C 4E 80 00 20 */ blr .global IsSystemDeletable__17CParticleElectricFv IsSystemDeletable__17CParticleElectricFv: @@ -711,7 +711,7 @@ lbl_8035F14C: /* 8035F158 0035C0B8 81 83 00 00 */ lwz r12, 0(r3) /* 8035F15C 0035C0BC 81 8C 00 58 */ lwz r12, 0x58(r12) /* 8035F160 0035C0C0 7D 89 03 A6 */ mtctr r12 -/* 8035F164 0035C0C4 4E 80 04 21 */ bctrl +/* 8035F164 0035C0C4 4E 80 04 21 */ bctrl /* 8035F168 0035C0C8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8035F16C 0035C0CC 40 82 00 0C */ bne lbl_8035F178 /* 8035F170 0035C0D0 38 60 00 00 */ li r3, 0 @@ -737,7 +737,7 @@ lbl_8035F1A4: /* 8035F1B0 0035C110 81 83 00 00 */ lwz r12, 0(r3) /* 8035F1B4 0035C114 81 8C 00 58 */ lwz r12, 0x58(r12) /* 8035F1B8 0035C118 7D 89 03 A6 */ mtctr r12 -/* 8035F1BC 0035C11C 4E 80 04 21 */ bctrl +/* 8035F1BC 0035C11C 4E 80 04 21 */ bctrl /* 8035F1C0 0035C120 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8035F1C4 0035C124 40 82 00 0C */ bne lbl_8035F1D0 /* 8035F1C8 0035C128 38 60 00 00 */ li r3, 0 @@ -758,13 +758,13 @@ lbl_8035F1E8: /* 8035F1F4 0035C154 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8035F1F8 0035C158 7C 08 03 A6 */ mtlr r0 /* 8035F1FC 0035C15C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8035F200 0035C160 4E 80 00 20 */ blr +/* 8035F200 0035C160 4E 80 00 20 */ blr .global SetModulationColor__17CParticleElectricFRC6CColor SetModulationColor__17CParticleElectricFRC6CColor: /* 8035F204 0035C164 80 04 00 00 */ lwz r0, 0(r4) /* 8035F208 0035C168 90 03 01 B8 */ stw r0, 0x1b8(r3) -/* 8035F20C 0035C16C 4E 80 00 20 */ blr +/* 8035F20C 0035C16C 4E 80 00 20 */ blr .global GetBounds__17CParticleElectricFv GetBounds__17CParticleElectricFv: @@ -779,7 +779,7 @@ GetBounds__17CParticleElectricFv: /* 8035F230 0035C190 81 9F 00 00 */ lwz r12, 0(r31) /* 8035F234 0035C194 81 8C 00 60 */ lwz r12, 0x60(r12) /* 8035F238 0035C198 7D 89 03 A6 */ mtctr r12 -/* 8035F23C 0035C19C 4E 80 04 21 */ bctrl +/* 8035F23C 0035C19C 4E 80 04 21 */ bctrl /* 8035F240 0035C1A0 2C 03 00 00 */ cmpwi r3, 0 /* 8035F244 0035C1A4 41 81 00 10 */ bgt lbl_8035F254 /* 8035F248 0035C1A8 38 00 00 00 */ li r0, 0 @@ -808,7 +808,7 @@ lbl_8035F294: /* 8035F29C 0035C1FC 83 C1 00 08 */ lwz r30, 8(r1) /* 8035F2A0 0035C200 7C 08 03 A6 */ mtlr r0 /* 8035F2A4 0035C204 38 21 00 10 */ addi r1, r1, 0x10 -/* 8035F2A8 0035C208 4E 80 00 20 */ blr +/* 8035F2A8 0035C208 4E 80 00 20 */ blr .global BuildBounds__17CParticleElectricFv BuildBounds__17CParticleElectricFv: @@ -823,7 +823,7 @@ BuildBounds__17CParticleElectricFv: /* 8035F2CC 0035C22C 81 83 00 00 */ lwz r12, 0(r3) /* 8035F2D0 0035C230 81 8C 00 60 */ lwz r12, 0x60(r12) /* 8035F2D4 0035C234 7D 89 03 A6 */ mtctr r12 -/* 8035F2D8 0035C238 4E 80 04 21 */ bctrl +/* 8035F2D8 0035C238 4E 80 04 21 */ bctrl /* 8035F2DC 0035C23C 2C 03 00 00 */ cmpwi r3, 0 /* 8035F2E0 0035C240 41 81 00 40 */ bgt lbl_8035F320 /* 8035F2E4 0035C244 3C 60 80 5A */ lis r3, lbl_805A6754@ha @@ -871,7 +871,7 @@ lbl_8035F370: /* 8035F384 0035C2E4 81 84 00 00 */ lwz r12, 0(r4) /* 8035F388 0035C2E8 81 8C 00 5C */ lwz r12, 0x5c(r12) /* 8035F38C 0035C2EC 7D 89 03 A6 */ mtctr r12 -/* 8035F390 0035C2F0 4E 80 04 21 */ bctrl +/* 8035F390 0035C2F0 4E 80 04 21 */ bctrl /* 8035F394 0035C2F4 88 01 00 70 */ lbz r0, 0x70(r1) /* 8035F398 0035C2F8 28 00 00 00 */ cmplwi r0, 0 /* 8035F39C 0035C2FC 98 01 00 DC */ stb r0, 0xdc(r1) @@ -1001,7 +1001,7 @@ lbl_8035F55C: /* 8035F56C 0035C4CC 81 84 00 00 */ lwz r12, 0(r4) /* 8035F570 0035C4D0 81 8C 00 5C */ lwz r12, 0x5c(r12) /* 8035F574 0035C4D4 7D 89 03 A6 */ mtctr r12 -/* 8035F578 0035C4D8 4E 80 04 21 */ bctrl +/* 8035F578 0035C4D8 4E 80 04 21 */ bctrl /* 8035F57C 0035C4DC 88 01 00 3C */ lbz r0, 0x3c(r1) /* 8035F580 0035C4E0 28 00 00 00 */ cmplwi r0, 0 /* 8035F584 0035C4E4 98 01 00 A8 */ stb r0, 0xa8(r1) @@ -1057,7 +1057,7 @@ lbl_8035F628: /* 8035F638 0035C598 81 84 00 00 */ lwz r12, 0(r4) /* 8035F63C 0035C59C 81 8C 00 5C */ lwz r12, 0x5c(r12) /* 8035F640 0035C5A0 7D 89 03 A6 */ mtctr r12 -/* 8035F644 0035C5A4 4E 80 04 21 */ bctrl +/* 8035F644 0035C5A4 4E 80 04 21 */ bctrl /* 8035F648 0035C5A8 88 01 00 20 */ lbz r0, 0x20(r1) /* 8035F64C 0035C5AC 28 00 00 00 */ cmplwi r0, 0 /* 8035F650 0035C5B0 98 01 00 8C */ stb r0, 0x8c(r1) @@ -1106,7 +1106,7 @@ lbl_8035F6DC: /* 8035F6EC 0035C64C 83 81 02 30 */ lwz r28, 0x230(r1) /* 8035F6F0 0035C650 7C 08 03 A6 */ mtlr r0 /* 8035F6F4 0035C654 38 21 02 40 */ addi r1, r1, 0x240 -/* 8035F6F8 0035C658 4E 80 00 20 */ blr +/* 8035F6F8 0035C658 4E 80 00 20 */ blr .global UpdateLine__17CParticleElectricFii UpdateLine__17CParticleElectricFii: @@ -1130,7 +1130,7 @@ UpdateLine__17CParticleElectricFii: /* 8035F740 0035C6A0 38 BF 00 1C */ addi r5, r31, 0x1c /* 8035F744 0035C6A4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8035F748 0035C6A8 7D 89 03 A6 */ mtctr r12 -/* 8035F74C 0035C6AC 4E 80 04 21 */ bctrl +/* 8035F74C 0035C6AC 4E 80 04 21 */ bctrl lbl_8035F750: /* 8035F750 0035C6B0 80 7D 00 24 */ lwz r3, 0x24(r29) /* 8035F754 0035C6B4 80 63 00 38 */ lwz r3, 0x38(r3) @@ -1141,7 +1141,7 @@ lbl_8035F750: /* 8035F768 0035C6C8 38 BF 00 20 */ addi r5, r31, 0x20 /* 8035F76C 0035C6CC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8035F770 0035C6D0 7D 89 03 A6 */ mtctr r12 -/* 8035F774 0035C6D4 4E 80 04 21 */ bctrl +/* 8035F774 0035C6D4 4E 80 04 21 */ bctrl lbl_8035F778: /* 8035F778 0035C6D8 80 7D 00 24 */ lwz r3, 0x24(r29) /* 8035F77C 0035C6DC 80 63 00 3C */ lwz r3, 0x3c(r3) @@ -1152,7 +1152,7 @@ lbl_8035F778: /* 8035F790 0035C6F0 38 BF 00 24 */ addi r5, r31, 0x24 /* 8035F794 0035C6F4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8035F798 0035C6F8 7D 89 03 A6 */ mtctr r12 -/* 8035F79C 0035C6FC 4E 80 04 21 */ bctrl +/* 8035F79C 0035C6FC 4E 80 04 21 */ bctrl lbl_8035F7A0: /* 8035F7A0 0035C700 80 7D 00 24 */ lwz r3, 0x24(r29) /* 8035F7A4 0035C704 80 63 00 28 */ lwz r3, 0x28(r3) @@ -1163,7 +1163,7 @@ lbl_8035F7A0: /* 8035F7B8 0035C718 38 BF 00 10 */ addi r5, r31, 0x10 /* 8035F7BC 0035C71C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8035F7C0 0035C720 7D 89 03 A6 */ mtctr r12 -/* 8035F7C4 0035C724 4E 80 04 21 */ bctrl +/* 8035F7C4 0035C724 4E 80 04 21 */ bctrl lbl_8035F7C8: /* 8035F7C8 0035C728 80 7D 00 24 */ lwz r3, 0x24(r29) /* 8035F7CC 0035C72C 80 63 00 2C */ lwz r3, 0x2c(r3) @@ -1174,7 +1174,7 @@ lbl_8035F7C8: /* 8035F7E0 0035C740 38 BF 00 14 */ addi r5, r31, 0x14 /* 8035F7E4 0035C744 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8035F7E8 0035C748 7D 89 03 A6 */ mtctr r12 -/* 8035F7EC 0035C74C 4E 80 04 21 */ bctrl +/* 8035F7EC 0035C74C 4E 80 04 21 */ bctrl lbl_8035F7F0: /* 8035F7F0 0035C750 80 7D 00 24 */ lwz r3, 0x24(r29) /* 8035F7F4 0035C754 80 63 00 30 */ lwz r3, 0x30(r3) @@ -1185,7 +1185,7 @@ lbl_8035F7F0: /* 8035F808 0035C768 38 BF 00 18 */ addi r5, r31, 0x18 /* 8035F80C 0035C76C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8035F810 0035C770 7D 89 03 A6 */ mtctr r12 -/* 8035F814 0035C774 4E 80 04 21 */ bctrl +/* 8035F814 0035C774 4E 80 04 21 */ bctrl lbl_8035F818: /* 8035F818 0035C778 80 01 00 24 */ lwz r0, 0x24(r1) /* 8035F81C 0035C77C 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -1193,7 +1193,7 @@ lbl_8035F818: /* 8035F824 0035C784 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8035F828 0035C788 7C 08 03 A6 */ mtlr r0 /* 8035F82C 0035C78C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8035F830 0035C790 4E 80 00 20 */ blr +/* 8035F830 0035C790 4E 80 00 20 */ blr .global UpdateElectricalEffects__17CParticleElectricFv UpdateElectricalEffects__17CParticleElectricFv: @@ -1224,7 +1224,7 @@ lbl_8035F858: /* 8035F890 0035C7F0 81 83 00 00 */ lwz r12, 0(r3) /* 8035F894 0035C7F4 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8035F898 0035C7F8 7D 89 03 A6 */ mtctr r12 -/* 8035F89C 0035C7FC 4E 80 04 21 */ bctrl +/* 8035F89C 0035C7FC 4E 80 04 21 */ bctrl lbl_8035F8A0: /* 8035F8A0 0035C800 80 1F 00 1C */ lwz r0, 0x1c(r31) /* 8035F8A4 0035C804 2C 00 FF FF */ cmpwi r0, -1 @@ -1237,7 +1237,7 @@ lbl_8035F8A0: /* 8035F8C0 0035C820 81 83 00 00 */ lwz r12, 0(r3) /* 8035F8C4 0035C824 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8035F8C8 0035C828 7D 89 03 A6 */ mtctr r12 -/* 8035F8CC 0035C82C 4E 80 04 21 */ bctrl +/* 8035F8CC 0035C82C 4E 80 04 21 */ bctrl lbl_8035F8D0: /* 8035F8D0 0035C830 7F E4 FB 78 */ mr r4, r31 /* 8035F8D4 0035C834 38 7B 03 E8 */ addi r3, r27, 0x3e8 @@ -1272,7 +1272,7 @@ lbl_8035F8E4: /* 8035F944 0035C8A4 38 A1 00 0C */ addi r5, r1, 0xc /* 8035F948 0035C8A8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8035F94C 0035C8AC 7D 89 03 A6 */ mtctr r12 -/* 8035F950 0035C8B0 4E 80 04 21 */ bctrl +/* 8035F950 0035C8B0 4E 80 04 21 */ bctrl lbl_8035F954: /* 8035F954 0035C8B4 38 61 00 08 */ addi r3, r1, 8 /* 8035F958 0035C8B8 38 81 00 0C */ addi r4, r1, 0xc @@ -1283,7 +1283,7 @@ lbl_8035F954: /* 8035F96C 0035C8CC 81 9A 00 00 */ lwz r12, 0(r26) /* 8035F970 0035C8D0 81 8C 00 30 */ lwz r12, 0x30(r12) /* 8035F974 0035C8D4 7D 89 03 A6 */ mtctr r12 -/* 8035F978 0035C8D8 4E 80 04 21 */ bctrl +/* 8035F978 0035C8D8 4E 80 04 21 */ bctrl lbl_8035F97C: /* 8035F97C 0035C8DC 88 1B 04 50 */ lbz r0, 0x450(r27) /* 8035F980 0035C8E0 54 00 EF FF */ rlwinm. r0, r0, 0x1d, 0x1f, 0x1f @@ -1305,7 +1305,7 @@ lbl_8035F9A8: /* 8035F9B8 0035C918 80 01 00 34 */ lwz r0, 0x34(r1) /* 8035F9BC 0035C91C 7C 08 03 A6 */ mtlr r0 /* 8035F9C0 0035C920 38 21 00 30 */ addi r1, r1, 0x30 -/* 8035F9C4 0035C924 4E 80 00 20 */ blr +/* 8035F9C4 0035C924 4E 80 00 20 */ blr .global CreateNewParticles__17CParticleElectricFi CreateNewParticles__17CParticleElectricFi: @@ -1360,7 +1360,7 @@ lbl_8035FA50: /* 8035FA80 0035C9E0 80 96 00 28 */ lwz r4, 0x28(r22) /* 8035FA84 0035C9E4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8035FA88 0035C9E8 7D 89 03 A6 */ mtctr r12 -/* 8035FA8C 0035C9EC 4E 80 04 21 */ bctrl +/* 8035FA8C 0035C9EC 4E 80 04 21 */ bctrl lbl_8035FA90: /* 8035FA90 0035C9F0 80 F6 00 28 */ lwz r7, 0x28(r22) /* 8035FA94 0035C9F4 38 00 FF FF */ li r0, -1 @@ -1396,31 +1396,31 @@ lbl_8035FA90: /* 8035FB0C 0035CA6C 81 98 00 00 */ lwz r12, 0(r24) /* 8035FB10 0035CA70 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8035FB14 0035CA74 7D 89 03 A6 */ mtctr r12 -/* 8035FB18 0035CA78 4E 80 04 21 */ bctrl +/* 8035FB18 0035CA78 4E 80 04 21 */ bctrl /* 8035FB1C 0035CA7C 7F 03 C3 78 */ mr r3, r24 /* 8035FB20 0035CA80 38 81 00 5C */ addi r4, r1, 0x5c /* 8035FB24 0035CA84 81 98 00 00 */ lwz r12, 0(r24) /* 8035FB28 0035CA88 81 8C 00 20 */ lwz r12, 0x20(r12) /* 8035FB2C 0035CA8C 7D 89 03 A6 */ mtctr r12 -/* 8035FB30 0035CA90 4E 80 04 21 */ bctrl +/* 8035FB30 0035CA90 4E 80 04 21 */ bctrl /* 8035FB34 0035CA94 7F 03 C3 78 */ mr r3, r24 /* 8035FB38 0035CA98 38 81 02 48 */ addi r4, r1, 0x248 /* 8035FB3C 0035CA9C 81 98 00 00 */ lwz r12, 0(r24) /* 8035FB40 0035CAA0 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 8035FB44 0035CAA4 7D 89 03 A6 */ mtctr r12 -/* 8035FB48 0035CAA8 4E 80 04 21 */ bctrl +/* 8035FB48 0035CAA8 4E 80 04 21 */ bctrl /* 8035FB4C 0035CAAC 7F 03 C3 78 */ mr r3, r24 /* 8035FB50 0035CAB0 38 96 00 E0 */ addi r4, r22, 0xe0 /* 8035FB54 0035CAB4 81 98 00 00 */ lwz r12, 0(r24) /* 8035FB58 0035CAB8 81 8C 00 24 */ lwz r12, 0x24(r12) /* 8035FB5C 0035CABC 7D 89 03 A6 */ mtctr r12 -/* 8035FB60 0035CAC0 4E 80 04 21 */ bctrl +/* 8035FB60 0035CAC0 4E 80 04 21 */ bctrl /* 8035FB64 0035CAC4 7F 03 C3 78 */ mr r3, r24 /* 8035FB68 0035CAC8 38 96 00 EC */ addi r4, r22, 0xec /* 8035FB6C 0035CACC 81 98 00 00 */ lwz r12, 0(r24) /* 8035FB70 0035CAD0 81 8C 00 28 */ lwz r12, 0x28(r12) /* 8035FB74 0035CAD4 7D 89 03 A6 */ mtctr r12 -/* 8035FB78 0035CAD8 4E 80 04 21 */ bctrl +/* 8035FB78 0035CAD8 4E 80 04 21 */ bctrl /* 8035FB7C 0035CADC 4B FE A4 31 */ bl White__6CColorFv /* 8035FB80 0035CAE0 80 03 00 00 */ lwz r0, 0(r3) /* 8035FB84 0035CAE4 90 01 00 3C */ stw r0, 0x3c(r1) @@ -1433,7 +1433,7 @@ lbl_8035FA90: /* 8035FBA0 0035CB00 38 A1 00 3C */ addi r5, r1, 0x3c /* 8035FBA4 0035CB04 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8035FBA8 0035CB08 7D 89 03 A6 */ mtctr r12 -/* 8035FBAC 0035CB0C 4E 80 04 21 */ bctrl +/* 8035FBAC 0035CB0C 4E 80 04 21 */ bctrl lbl_8035FBB0: /* 8035FBB0 0035CB10 38 61 00 38 */ addi r3, r1, 0x38 /* 8035FBB4 0035CB14 38 81 00 3C */ addi r4, r1, 0x3c @@ -1444,7 +1444,7 @@ lbl_8035FBB0: /* 8035FBC8 0035CB28 81 98 00 00 */ lwz r12, 0(r24) /* 8035FBCC 0035CB2C 81 8C 00 30 */ lwz r12, 0x30(r12) /* 8035FBD0 0035CB30 7D 89 03 A6 */ mtctr r12 -/* 8035FBD4 0035CB34 4E 80 04 21 */ bctrl +/* 8035FBD4 0035CB34 4E 80 04 21 */ bctrl /* 8035FBD8 0035CB38 80 98 01 58 */ lwz r4, 0x158(r24) /* 8035FBDC 0035CB3C 39 20 00 00 */ li r9, 0 /* 8035FBE0 0035CB40 38 E0 00 00 */ li r7, 0 @@ -1614,7 +1614,7 @@ lbl_8035FE18: /* 8035FE24 0035CD84 81 83 00 00 */ lwz r12, 0(r3) /* 8035FE28 0035CD88 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 8035FE2C 0035CD8C 7D 89 03 A6 */ mtctr r12 -/* 8035FE30 0035CD90 4E 80 04 21 */ bctrl +/* 8035FE30 0035CD90 4E 80 04 21 */ bctrl /* 8035FE34 0035CD94 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8035FE38 0035CD98 40 82 00 98 */ bne lbl_8035FED0 /* 8035FE3C 0035CD9C 38 61 01 28 */ addi r3, r1, 0x128 @@ -1643,7 +1643,7 @@ lbl_8035FE18: /* 8035FE98 0035CDF8 81 98 00 00 */ lwz r12, 0(r24) /* 8035FE9C 0035CDFC 81 8C 00 18 */ lwz r12, 0x18(r12) /* 8035FEA0 0035CE00 7D 89 03 A6 */ mtctr r12 -/* 8035FEA4 0035CE04 4E 80 04 21 */ bctrl +/* 8035FEA4 0035CE04 4E 80 04 21 */ bctrl /* 8035FEA8 0035CE08 80 76 04 0C */ lwz r3, 0x40c(r22) /* 8035FEAC 0035CE0C 38 15 00 04 */ addi r0, r21, 4 /* 8035FEB0 0035CE10 38 80 00 01 */ li r4, 1 @@ -1651,7 +1651,7 @@ lbl_8035FE18: /* 8035FEB8 0035CE18 81 83 00 00 */ lwz r12, 0(r3) /* 8035FEBC 0035CE1C 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8035FEC0 0035CE20 7D 89 03 A6 */ mtctr r12 -/* 8035FEC4 0035CE24 4E 80 04 21 */ bctrl +/* 8035FEC4 0035CE24 4E 80 04 21 */ bctrl /* 8035FEC8 0035CE28 93 DF 00 18 */ stw r30, 0x18(r31) /* 8035FECC 0035CE2C 48 00 00 18 */ b lbl_8035FEE4 lbl_8035FED0: @@ -1675,7 +1675,7 @@ lbl_8035FEFC: /* 8035FF08 0035CE68 81 83 00 00 */ lwz r12, 0(r3) /* 8035FF0C 0035CE6C 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 8035FF10 0035CE70 7D 89 03 A6 */ mtctr r12 -/* 8035FF14 0035CE74 4E 80 04 21 */ bctrl +/* 8035FF14 0035CE74 4E 80 04 21 */ bctrl /* 8035FF18 0035CE78 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8035FF1C 0035CE7C 40 82 00 A8 */ bne lbl_8035FFC4 /* 8035FF20 0035CE80 38 61 00 98 */ addi r3, r1, 0x98 @@ -1708,7 +1708,7 @@ lbl_8035FEFC: /* 8035FF8C 0035CEEC 81 95 00 00 */ lwz r12, 0(r21) /* 8035FF90 0035CEF0 81 8C 00 18 */ lwz r12, 0x18(r12) /* 8035FF94 0035CEF4 7D 89 03 A6 */ mtctr r12 -/* 8035FF98 0035CEF8 4E 80 04 21 */ bctrl +/* 8035FF98 0035CEF8 4E 80 04 21 */ bctrl /* 8035FF9C 0035CEFC 80 76 04 1C */ lwz r3, 0x41c(r22) /* 8035FFA0 0035CF00 38 1E 00 04 */ addi r0, r30, 4 /* 8035FFA4 0035CF04 38 80 00 01 */ li r4, 1 @@ -1716,7 +1716,7 @@ lbl_8035FEFC: /* 8035FFAC 0035CF0C 81 83 00 00 */ lwz r12, 0(r3) /* 8035FFB0 0035CF10 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8035FFB4 0035CF14 7D 89 03 A6 */ mtctr r12 -/* 8035FFB8 0035CF18 4E 80 04 21 */ bctrl +/* 8035FFB8 0035CF18 4E 80 04 21 */ bctrl /* 8035FFBC 0035CF1C 93 1F 00 1C */ stw r24, 0x1c(r31) /* 8035FFC0 0035CF20 48 00 00 34 */ b lbl_8035FFF4 lbl_8035FFC4: @@ -1744,7 +1744,7 @@ lbl_80360000: /* 80360004 0035CF64 80 01 02 B4 */ lwz r0, 0x2b4(r1) /* 80360008 0035CF68 7C 08 03 A6 */ mtlr r0 /* 8036000C 0035CF6C 38 21 02 B0 */ addi r1, r1, 0x2b0 -/* 80360010 0035CF70 4E 80 00 20 */ blr +/* 80360010 0035CF70 4E 80 00 20 */ blr .global sub_80360014 sub_80360014: @@ -1819,7 +1819,7 @@ lbl_803600F8: /* 80360100 0035D060 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80360104 0035D064 7C 08 03 A6 */ mtlr r0 /* 80360108 0035D068 38 21 00 20 */ addi r1, r1, 0x20 -/* 8036010C 0035D06C 4E 80 00 20 */ blr +/* 8036010C 0035D06C 4E 80 00 20 */ blr .global sub_80360110 sub_80360110: @@ -1832,7 +1832,7 @@ sub_80360110: /* 80360128 0035D088 80 01 00 14 */ lwz r0, 0x14(r1) /* 8036012C 0035D08C 7C 08 03 A6 */ mtlr r0 /* 80360130 0035D090 38 21 00 10 */ addi r1, r1, 0x10 -/* 80360134 0035D094 4E 80 00 20 */ blr +/* 80360134 0035D094 4E 80 00 20 */ blr .global sub_80360138 sub_80360138: @@ -1891,7 +1891,7 @@ lbl_803601D0: /* 803601FC 0035D15C 83 81 00 10 */ lwz r28, 0x10(r1) /* 80360200 0035D160 7C 08 03 A6 */ mtlr r0 /* 80360204 0035D164 38 21 00 20 */ addi r1, r1, 0x20 -/* 80360208 0035D168 4E 80 00 20 */ blr +/* 80360208 0035D168 4E 80 00 20 */ blr .global AddElectricalEffects__17CParticleElectricFv AddElectricalEffects__17CParticleElectricFv: @@ -1912,7 +1912,7 @@ AddElectricalEffects__17CParticleElectricFv: /* 80360244 0035D1A4 80 9E 00 28 */ lwz r4, 0x28(r30) /* 80360248 0035D1A8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8036024C 0035D1AC 7D 89 03 A6 */ mtctr r12 -/* 80360250 0035D1B0 4E 80 04 21 */ bctrl +/* 80360250 0035D1B0 4E 80 04 21 */ bctrl /* 80360254 0035D1B4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80360258 0035D1B8 41 82 00 50 */ beq lbl_803602A8 /* 8036025C 0035D1BC 83 FE 03 F0 */ lwz r31, 0x3f0(r30) @@ -1978,7 +1978,7 @@ lbl_80360320: /* 80360328 0035D288 83 C1 00 28 */ lwz r30, 0x28(r1) /* 8036032C 0035D28C 7C 08 03 A6 */ mtlr r0 /* 80360330 0035D290 38 21 00 30 */ addi r1, r1, 0x30 -/* 80360334 0035D294 4E 80 00 20 */ blr +/* 80360334 0035D294 4E 80 00 20 */ blr .global "DrawLineStrip__17CParticleElectricFRCQ24rstl45vector<9CVector3f,Q24rstl17aligned_allocator>fRC6CColor" "DrawLineStrip__17CParticleElectricFRCQ24rstl45vector<9CVector3f,Q24rstl17aligned_allocator>fRC6CColor": @@ -1997,7 +1997,7 @@ lbl_80360320: /* 80360368 0035D2C8 81 9D 00 00 */ lwz r12, 0(r29) /* 8036036C 0035D2CC 81 8C 00 50 */ lwz r12, 0x50(r12) /* 80360370 0035D2D0 7D 89 03 A6 */ mtctr r12 -/* 80360374 0035D2D4 4E 80 04 21 */ bctrl +/* 80360374 0035D2D4 4E 80 04 21 */ bctrl /* 80360378 0035D2D8 7C 64 1B 78 */ mr r4, r3 /* 8036037C 0035D2DC 7F C5 F3 78 */ mr r5, r30 /* 80360380 0035D2E0 38 61 00 08 */ addi r3, r1, 8 @@ -2124,7 +2124,7 @@ lbl_80360544: /* 80360554 0035D4B4 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80360558 0035D4B8 7C 08 03 A6 */ mtlr r0 /* 8036055C 0035D4BC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80360560 0035D4C0 4E 80 00 20 */ blr +/* 80360560 0035D4C0 4E 80 00 20 */ blr .global SetupLineGXMaterial__17CParticleElectricFv SetupLineGXMaterial__17CParticleElectricFv: @@ -2171,7 +2171,7 @@ SetupLineGXMaterial__17CParticleElectricFv: /* 80360604 0035D564 80 01 00 14 */ lwz r0, 0x14(r1) /* 80360608 0035D568 7C 08 03 A6 */ mtlr r0 /* 8036060C 0035D56C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80360610 0035D570 4E 80 00 20 */ blr +/* 80360610 0035D570 4E 80 00 20 */ blr .global RenderLines__17CParticleElectricFv RenderLines__17CParticleElectricFv: @@ -2286,7 +2286,7 @@ lbl_80360780: /* 803607B0 0035D710 83 81 01 C0 */ lwz r28, 0x1c0(r1) /* 803607B4 0035D714 7C 08 03 A6 */ mtlr r0 /* 803607B8 0035D718 38 21 01 D0 */ addi r1, r1, 0x1d0 -/* 803607BC 0035D71C 4E 80 00 20 */ blr +/* 803607BC 0035D71C 4E 80 00 20 */ blr .global RenderSwooshes__17CParticleElectricFv RenderSwooshes__17CParticleElectricFv: @@ -2308,7 +2308,7 @@ lbl_803607E8: /* 803607F8 0035D758 81 83 00 00 */ lwz r12, 0(r3) /* 803607FC 0035D75C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80360800 0035D760 7D 89 03 A6 */ mtctr r12 -/* 80360804 0035D764 4E 80 04 21 */ bctrl +/* 80360804 0035D764 4E 80 04 21 */ bctrl /* 80360808 0035D768 83 FF 00 04 */ lwz r31, 4(r31) lbl_8036080C: /* 8036080C 0035D76C 80 1D 03 F0 */ lwz r0, 0x3f0(r29) @@ -2320,7 +2320,7 @@ lbl_8036080C: /* 80360824 0035D784 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80360828 0035D788 7C 08 03 A6 */ mtlr r0 /* 8036082C 0035D78C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80360830 0035D790 4E 80 00 20 */ blr +/* 80360830 0035D790 4E 80 00 20 */ blr .global Render__17CParticleElectricFv Render__17CParticleElectricFv: @@ -2378,7 +2378,7 @@ lbl_803608E4: /* 803608F0 0035D850 81 83 00 00 */ lwz r12, 0(r3) /* 803608F4 0035D854 81 8C 00 10 */ lwz r12, 0x10(r12) /* 803608F8 0035D858 7D 89 03 A6 */ mtctr r12 -/* 803608FC 0035D85C 4E 80 04 21 */ bctrl +/* 803608FC 0035D85C 4E 80 04 21 */ bctrl /* 80360900 0035D860 3B BD 00 08 */ addi r29, r29, 8 /* 80360904 0035D864 3B 9C 00 01 */ addi r28, r28, 1 lbl_80360908: @@ -2399,7 +2399,7 @@ lbl_8036092C: /* 80360938 0035D898 81 83 00 00 */ lwz r12, 0(r3) /* 8036093C 0035D89C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80360940 0035D8A0 7D 89 03 A6 */ mtctr r12 -/* 80360944 0035D8A4 4E 80 04 21 */ bctrl +/* 80360944 0035D8A4 4E 80 04 21 */ bctrl /* 80360948 0035D8A8 3B BD 00 08 */ addi r29, r29, 8 /* 8036094C 0035D8AC 3B 9C 00 01 */ addi r28, r28, 1 lbl_80360950: @@ -2426,7 +2426,7 @@ lbl_8036095C: /* 8036099C 0035D8FC 83 81 00 10 */ lwz r28, 0x10(r1) /* 803609A0 0035D900 7C 08 03 A6 */ mtlr r0 /* 803609A4 0035D904 38 21 00 30 */ addi r1, r1, 0x30 -/* 803609A8 0035D908 4E 80 00 20 */ blr +/* 803609A8 0035D908 4E 80 00 20 */ blr .global Update__17CParticleElectricFd Update__17CParticleElectricFd: @@ -2460,7 +2460,7 @@ lbl_80360A08: /* 80360A14 0035D974 81 83 00 00 */ lwz r12, 0(r3) /* 80360A18 0035D978 81 8C 00 58 */ lwz r12, 0x58(r12) /* 80360A1C 0035D97C 7D 89 03 A6 */ mtctr r12 -/* 80360A20 0035D980 4E 80 04 21 */ bctrl +/* 80360A20 0035D980 4E 80 04 21 */ bctrl /* 80360A24 0035D984 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80360A28 0035D988 41 82 00 18 */ beq lbl_80360A40 /* 80360A2C 0035D98C 3B FF 00 08 */ addi r31, r31, 8 @@ -2483,7 +2483,7 @@ lbl_80360A58: /* 80360A64 0035D9C4 81 83 00 00 */ lwz r12, 0(r3) /* 80360A68 0035D9C8 81 8C 00 58 */ lwz r12, 0x58(r12) /* 80360A6C 0035D9CC 7D 89 03 A6 */ mtctr r12 -/* 80360A70 0035D9D0 4E 80 04 21 */ bctrl +/* 80360A70 0035D9D0 4E 80 04 21 */ bctrl /* 80360A74 0035D9D4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80360A78 0035D9D8 41 82 00 18 */ beq lbl_80360A90 /* 80360A7C 0035D9DC 3B FF 00 08 */ addi r31, r31, 8 @@ -2548,7 +2548,7 @@ lbl_80360B44: /* 80360B58 0035DAB8 81 83 00 00 */ lwz r12, 0(r3) /* 80360B5C 0035DABC 81 8C 00 20 */ lwz r12, 0x20(r12) /* 80360B60 0035DAC0 7D 89 03 A6 */ mtctr r12 -/* 80360B64 0035DAC4 4E 80 04 21 */ bctrl +/* 80360B64 0035DAC4 4E 80 04 21 */ bctrl /* 80360B68 0035DAC8 80 1E 00 08 */ lwz r0, 8(r30) /* 80360B6C 0035DACC 38 81 00 50 */ addi r4, r1, 0x50 /* 80360B70 0035DAD0 54 03 18 38 */ slwi r3, r0, 3 @@ -2557,7 +2557,7 @@ lbl_80360B44: /* 80360B7C 0035DADC 81 83 00 00 */ lwz r12, 0(r3) /* 80360B80 0035DAE0 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80360B84 0035DAE4 7D 89 03 A6 */ mtctr r12 -/* 80360B88 0035DAE8 4E 80 04 21 */ bctrl +/* 80360B88 0035DAE8 4E 80 04 21 */ bctrl /* 80360B8C 0035DAEC 80 1E 00 08 */ lwz r0, 8(r30) /* 80360B90 0035DAF0 38 9D 00 E0 */ addi r4, r29, 0xe0 /* 80360B94 0035DAF4 54 03 18 38 */ slwi r3, r0, 3 @@ -2566,7 +2566,7 @@ lbl_80360B44: /* 80360BA0 0035DB00 81 83 00 00 */ lwz r12, 0(r3) /* 80360BA4 0035DB04 81 8C 00 24 */ lwz r12, 0x24(r12) /* 80360BA8 0035DB08 7D 89 03 A6 */ mtctr r12 -/* 80360BAC 0035DB0C 4E 80 04 21 */ bctrl +/* 80360BAC 0035DB0C 4E 80 04 21 */ bctrl /* 80360BB0 0035DB10 80 1E 00 08 */ lwz r0, 8(r30) /* 80360BB4 0035DB14 38 9D 00 EC */ addi r4, r29, 0xec /* 80360BB8 0035DB18 54 03 18 38 */ slwi r3, r0, 3 @@ -2575,7 +2575,7 @@ lbl_80360B44: /* 80360BC4 0035DB24 81 83 00 00 */ lwz r12, 0(r3) /* 80360BC8 0035DB28 81 8C 00 28 */ lwz r12, 0x28(r12) /* 80360BCC 0035DB2C 7D 89 03 A6 */ mtctr r12 -/* 80360BD0 0035DB30 4E 80 04 21 */ bctrl +/* 80360BD0 0035DB30 4E 80 04 21 */ bctrl /* 80360BD4 0035DB34 83 DE 00 04 */ lwz r30, 4(r30) lbl_80360BD8: /* 80360BD8 0035DB38 80 1D 03 F0 */ lwz r0, 0x3f0(r29) @@ -2596,7 +2596,7 @@ lbl_80360BFC: /* 80360C0C 0035DB6C 81 83 00 00 */ lwz r12, 0(r3) /* 80360C10 0035DB70 81 8C 00 20 */ lwz r12, 0x20(r12) /* 80360C14 0035DB74 7D 89 03 A6 */ mtctr r12 -/* 80360C18 0035DB78 4E 80 04 21 */ bctrl +/* 80360C18 0035DB78 4E 80 04 21 */ bctrl /* 80360C1C 0035DB7C 80 7D 04 0C */ lwz r3, 0x40c(r29) /* 80360C20 0035DB80 38 1C 00 04 */ addi r0, r28, 4 /* 80360C24 0035DB84 38 81 00 50 */ addi r4, r1, 0x50 @@ -2604,7 +2604,7 @@ lbl_80360BFC: /* 80360C2C 0035DB8C 81 83 00 00 */ lwz r12, 0(r3) /* 80360C30 0035DB90 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80360C34 0035DB94 7D 89 03 A6 */ mtctr r12 -/* 80360C38 0035DB98 4E 80 04 21 */ bctrl +/* 80360C38 0035DB98 4E 80 04 21 */ bctrl /* 80360C3C 0035DB9C 80 7D 04 0C */ lwz r3, 0x40c(r29) /* 80360C40 0035DBA0 38 1C 00 04 */ addi r0, r28, 4 /* 80360C44 0035DBA4 38 9D 00 E0 */ addi r4, r29, 0xe0 @@ -2612,7 +2612,7 @@ lbl_80360BFC: /* 80360C4C 0035DBAC 81 83 00 00 */ lwz r12, 0(r3) /* 80360C50 0035DBB0 81 8C 00 24 */ lwz r12, 0x24(r12) /* 80360C54 0035DBB4 7D 89 03 A6 */ mtctr r12 -/* 80360C58 0035DBB8 4E 80 04 21 */ bctrl +/* 80360C58 0035DBB8 4E 80 04 21 */ bctrl /* 80360C5C 0035DBBC 80 7D 04 0C */ lwz r3, 0x40c(r29) /* 80360C60 0035DBC0 38 1C 00 04 */ addi r0, r28, 4 /* 80360C64 0035DBC4 38 9D 00 EC */ addi r4, r29, 0xec @@ -2620,7 +2620,7 @@ lbl_80360BFC: /* 80360C6C 0035DBCC 81 83 00 00 */ lwz r12, 0(r3) /* 80360C70 0035DBD0 81 8C 00 28 */ lwz r12, 0x28(r12) /* 80360C74 0035DBD4 7D 89 03 A6 */ mtctr r12 -/* 80360C78 0035DBD8 4E 80 04 21 */ bctrl +/* 80360C78 0035DBD8 4E 80 04 21 */ bctrl /* 80360C7C 0035DBDC 3B 9C 00 08 */ addi r28, r28, 8 /* 80360C80 0035DBE0 3B DE 00 01 */ addi r30, r30, 1 lbl_80360C84: @@ -2642,7 +2642,7 @@ lbl_80360CA8: /* 80360CB8 0035DC18 81 83 00 00 */ lwz r12, 0(r3) /* 80360CBC 0035DC1C 81 8C 00 20 */ lwz r12, 0x20(r12) /* 80360CC0 0035DC20 7D 89 03 A6 */ mtctr r12 -/* 80360CC4 0035DC24 4E 80 04 21 */ bctrl +/* 80360CC4 0035DC24 4E 80 04 21 */ bctrl /* 80360CC8 0035DC28 80 7D 04 1C */ lwz r3, 0x41c(r29) /* 80360CCC 0035DC2C 38 1C 00 04 */ addi r0, r28, 4 /* 80360CD0 0035DC30 38 81 00 50 */ addi r4, r1, 0x50 @@ -2650,7 +2650,7 @@ lbl_80360CA8: /* 80360CD8 0035DC38 81 83 00 00 */ lwz r12, 0(r3) /* 80360CDC 0035DC3C 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80360CE0 0035DC40 7D 89 03 A6 */ mtctr r12 -/* 80360CE4 0035DC44 4E 80 04 21 */ bctrl +/* 80360CE4 0035DC44 4E 80 04 21 */ bctrl /* 80360CE8 0035DC48 80 7D 04 1C */ lwz r3, 0x41c(r29) /* 80360CEC 0035DC4C 38 1C 00 04 */ addi r0, r28, 4 /* 80360CF0 0035DC50 38 9D 00 E0 */ addi r4, r29, 0xe0 @@ -2658,7 +2658,7 @@ lbl_80360CA8: /* 80360CF8 0035DC58 81 83 00 00 */ lwz r12, 0(r3) /* 80360CFC 0035DC5C 81 8C 00 24 */ lwz r12, 0x24(r12) /* 80360D00 0035DC60 7D 89 03 A6 */ mtctr r12 -/* 80360D04 0035DC64 4E 80 04 21 */ bctrl +/* 80360D04 0035DC64 4E 80 04 21 */ bctrl /* 80360D08 0035DC68 80 7D 04 1C */ lwz r3, 0x41c(r29) /* 80360D0C 0035DC6C 38 1C 00 04 */ addi r0, r28, 4 /* 80360D10 0035DC70 38 9D 00 EC */ addi r4, r29, 0xec @@ -2666,7 +2666,7 @@ lbl_80360CA8: /* 80360D18 0035DC78 81 83 00 00 */ lwz r12, 0(r3) /* 80360D1C 0035DC7C 81 8C 00 28 */ lwz r12, 0x28(r12) /* 80360D20 0035DC80 7D 89 03 A6 */ mtctr r12 -/* 80360D24 0035DC84 4E 80 04 21 */ bctrl +/* 80360D24 0035DC84 4E 80 04 21 */ bctrl /* 80360D28 0035DC88 3B 9C 00 08 */ addi r28, r28, 8 /* 80360D2C 0035DC8C 3B DE 00 01 */ addi r30, r30, 1 lbl_80360D30: @@ -2722,7 +2722,7 @@ lbl_80360DC4: /* 80360DD4 0035DD34 81 83 00 00 */ lwz r12, 0(r3) /* 80360DD8 0035DD38 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80360DDC 0035DD3C 7D 89 03 A6 */ mtctr r12 -/* 80360DE0 0035DD40 4E 80 04 21 */ bctrl +/* 80360DE0 0035DD40 4E 80 04 21 */ bctrl /* 80360DE4 0035DD44 3B 9C 00 08 */ addi r28, r28, 8 /* 80360DE8 0035DD48 3B DE 00 01 */ addi r30, r30, 1 lbl_80360DEC: @@ -2763,7 +2763,7 @@ lbl_80360E50: /* 80360E60 0035DDC0 81 83 00 00 */ lwz r12, 0(r3) /* 80360E64 0035DDC4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80360E68 0035DDC8 7D 89 03 A6 */ mtctr r12 -/* 80360E6C 0035DDCC 4E 80 04 21 */ bctrl +/* 80360E6C 0035DDCC 4E 80 04 21 */ bctrl /* 80360E70 0035DDD0 3B 9C 00 08 */ addi r28, r28, 8 /* 80360E74 0035DDD4 3B DE 00 01 */ addi r30, r30, 1 lbl_80360E78: @@ -2800,7 +2800,7 @@ lbl_80360EB4: /* 80360EE4 0035DE44 83 81 00 90 */ lwz r28, 0x90(r1) /* 80360EE8 0035DE48 7C 08 03 A6 */ mtlr r0 /* 80360EEC 0035DE4C 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 80360EF0 0035DE50 4E 80 00 20 */ blr +/* 80360EF0 0035DE50 4E 80 00 20 */ blr .global CalculateFractal__17CParticleElectricFiiff CalculateFractal__17CParticleElectricFiiff: @@ -2910,7 +2910,7 @@ lbl_80361058: /* 80361084 0035DFE4 80 01 00 94 */ lwz r0, 0x94(r1) /* 80361088 0035DFE8 7C 08 03 A6 */ mtlr r0 /* 8036108C 0035DFEC 38 21 00 90 */ addi r1, r1, 0x90 -/* 80361090 0035DFF0 4E 80 00 20 */ blr +/* 80361090 0035DFF0 4E 80 00 20 */ blr .global CalculatePoints__17CParticleElectricFv CalculatePoints__17CParticleElectricFv: @@ -2954,7 +2954,7 @@ CalculatePoints__17CParticleElectricFv: /* 80361128 0035E088 80 9E 00 28 */ lwz r4, 0x28(r30) /* 8036112C 0035E08C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80361130 0035E090 7D 89 03 A6 */ mtctr r12 -/* 80361134 0035E094 4E 80 04 21 */ bctrl +/* 80361134 0035E094 4E 80 04 21 */ bctrl lbl_80361138: /* 80361138 0035E098 88 1E 01 84 */ lbz r0, 0x184(r30) /* 8036113C 0035E09C 28 00 00 00 */ cmplwi r0, 0 @@ -3089,7 +3089,7 @@ lbl_803612CC: /* 80361318 0035E278 80 9E 00 28 */ lwz r4, 0x28(r30) /* 8036131C 0035E27C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80361320 0035E280 7D 89 03 A6 */ mtctr r12 -/* 80361324 0035E284 4E 80 04 21 */ bctrl +/* 80361324 0035E284 4E 80 04 21 */ bctrl lbl_80361328: /* 80361328 0035E288 88 1E 01 A4 */ lbz r0, 0x1a4(r30) /* 8036132C 0035E28C 28 00 00 00 */ cmplwi r0, 0 @@ -3389,7 +3389,7 @@ lbl_80361748: /* 80361774 0035E6D4 80 9E 00 28 */ lwz r4, 0x28(r30) /* 80361778 0035E6D8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8036177C 0035E6DC 7D 89 03 A6 */ mtctr r12 -/* 80361780 0035E6E0 4E 80 04 21 */ bctrl +/* 80361780 0035E6E0 4E 80 04 21 */ bctrl /* 80361784 0035E6E4 C0 21 00 10 */ lfs f1, 0x10(r1) /* 80361788 0035E6E8 C0 02 CD 6C */ lfs f0, lbl_805AEA8C@sda21(r2) /* 8036178C 0035E6EC EC 01 00 32 */ fmuls f0, f1, f0 @@ -3406,7 +3406,7 @@ lbl_80361794: /* 803617B4 0035E714 80 9E 00 28 */ lwz r4, 0x28(r30) /* 803617B8 0035E718 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803617BC 0035E71C 7D 89 03 A6 */ mtctr r12 -/* 803617C0 0035E720 4E 80 04 21 */ bctrl +/* 803617C0 0035E720 4E 80 04 21 */ bctrl lbl_803617C4: /* 803617C4 0035E724 80 BE 04 24 */ lwz r5, 0x424(r30) /* 803617C8 0035E728 7F C3 F3 78 */ mr r3, r30 @@ -3725,7 +3725,7 @@ lbl_80361C24: /* 80361C60 0035EBC0 80 01 01 F4 */ lwz r0, 0x1f4(r1) /* 80361C64 0035EBC4 7C 08 03 A6 */ mtlr r0 /* 80361C68 0035EBC8 38 21 01 F0 */ addi r1, r1, 0x1f0 -/* 80361C6C 0035EBCC 4E 80 00 20 */ blr +/* 80361C6C 0035EBCC 4E 80 00 20 */ blr .global __dt__17CParticleElectricFv __dt__17CParticleElectricFv: @@ -3833,7 +3833,7 @@ lbl_80361DB8: /* 80361DDC 0035ED3C 38 80 00 01 */ li r4, 1 /* 80361DE0 0035ED40 81 8C 00 08 */ lwz r12, 8(r12) /* 80361DE4 0035ED44 7D 89 03 A6 */ mtctr r12 -/* 80361DE8 0035ED48 4E 80 04 21 */ bctrl +/* 80361DE8 0035ED48 4E 80 04 21 */ bctrl lbl_80361DEC: /* 80361DEC 0035ED4C 3B 9C 00 08 */ addi r28, r28, 8 /* 80361DF0 0035ED50 3B BD 00 01 */ addi r29, r29, 1 @@ -3922,7 +3922,7 @@ lbl_80361EF0: /* 80361F04 0035EE64 83 81 00 40 */ lwz r28, 0x40(r1) /* 80361F08 0035EE68 7C 08 03 A6 */ mtlr r0 /* 80361F0C 0035EE6C 38 21 00 50 */ addi r1, r1, 0x50 -/* 80361F10 0035EE70 4E 80 00 20 */ blr +/* 80361F10 0035EE70 4E 80 00 20 */ blr .global "__dt__Q24rstl74reserved_vector,32>Fv" "__dt__Q24rstl74reserved_vector,32>Fv": @@ -3946,7 +3946,7 @@ lbl_80361F48: /* 80361F54 0035EEB4 83 C1 00 08 */ lwz r30, 8(r1) /* 80361F58 0035EEB8 7C 08 03 A6 */ mtlr r0 /* 80361F5C 0035EEBC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80361F60 0035EEC0 4E 80 00 20 */ blr +/* 80361F60 0035EEC0 4E 80 00 20 */ blr .global "clear__Q24rstl74reserved_vector,32>Fv" "clear__Q24rstl74reserved_vector,32>Fv": @@ -3977,7 +3977,7 @@ lbl_80361F9C: /* 80361FBC 0035EF1C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80361FC0 0035EF20 7C 08 03 A6 */ mtlr r0 /* 80361FC4 0035EF24 38 21 00 20 */ addi r1, r1, 0x20 -/* 80361FC8 0035EF28 4E 80 00 20 */ blr +/* 80361FC8 0035EF28 4E 80 00 20 */ blr .global "destroy>__4rstlFPQ24rstl45auto_ptr" "destroy>__4rstlFPQ24rstl45auto_ptr": @@ -3989,7 +3989,7 @@ lbl_80361F9C: /* 80361FE0 0035EF40 80 01 00 14 */ lwz r0, 0x14(r1) /* 80361FE4 0035EF44 7C 08 03 A6 */ mtlr r0 /* 80361FE8 0035EF48 38 21 00 10 */ addi r1, r1, 0x10 -/* 80361FEC 0035EF4C 4E 80 00 20 */ blr +/* 80361FEC 0035EF4C 4E 80 00 20 */ blr .global "__dt__Q24rstl45auto_ptrFv" "__dt__Q24rstl45auto_ptrFv": @@ -4041,7 +4041,7 @@ lbl_80362080: /* 80362090 0035EFF0 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80362094 0035EFF4 7C 08 03 A6 */ mtlr r0 /* 80362098 0035EFF8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8036209C 0035EFFC 4E 80 00 20 */ blr +/* 8036209C 0035EFFC 4E 80 00 20 */ blr .global "__dt__Q24rstl45vector<9CVector3f,Q24rstl17aligned_allocator>Fv" "__dt__Q24rstl45vector<9CVector3f,Q24rstl17aligned_allocator>Fv": @@ -4077,7 +4077,7 @@ lbl_803620EC: /* 80362110 0035F070 38 80 00 01 */ li r4, 1 /* 80362114 0035F074 81 8C 00 08 */ lwz r12, 8(r12) /* 80362118 0035F078 7D 89 03 A6 */ mtctr r12 -/* 8036211C 0035F07C 4E 80 04 21 */ bctrl +/* 8036211C 0035F07C 4E 80 04 21 */ bctrl lbl_80362120: /* 80362120 0035F080 3B DE 00 08 */ addi r30, r30, 8 lbl_80362124: @@ -4101,7 +4101,7 @@ lbl_8036214C: /* 80362160 0035F0C0 83 81 00 20 */ lwz r28, 0x20(r1) /* 80362164 0035F0C4 7C 08 03 A6 */ mtlr r0 /* 80362168 0035F0C8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8036216C 0035F0CC 4E 80 00 20 */ blr +/* 8036216C 0035F0CC 4E 80 00 20 */ blr .global "__ct__17CParticleElectricF30TToken<20CElectricDescription>" "__ct__17CParticleElectricF30TToken<20CElectricDescription>": @@ -4328,7 +4328,7 @@ lbl_803623EC: /* 803624BC 0035F41C 80 9F 00 28 */ lwz r4, 0x28(r31) /* 803624C0 0035F420 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803624C4 0035F424 7D 89 03 A6 */ mtctr r12 -/* 803624C8 0035F428 4E 80 04 21 */ bctrl +/* 803624C8 0035F428 4E 80 04 21 */ bctrl lbl_803624CC: /* 803624CC 0035F42C 80 7F 00 24 */ lwz r3, 0x24(r31) /* 803624D0 0035F430 80 63 00 0C */ lwz r3, 0xc(r3) @@ -4339,7 +4339,7 @@ lbl_803624CC: /* 803624E4 0035F444 80 9F 00 28 */ lwz r4, 0x28(r31) /* 803624E8 0035F448 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803624EC 0035F44C 7D 89 03 A6 */ mtctr r12 -/* 803624F0 0035F450 4E 80 04 21 */ bctrl +/* 803624F0 0035F450 4E 80 04 21 */ bctrl lbl_803624F4: /* 803624F4 0035F454 80 1F 01 54 */ lwz r0, 0x154(r31) /* 803624F8 0035F458 2C 00 00 20 */ cmpwi r0, 0x20 @@ -4356,7 +4356,7 @@ lbl_80362508: /* 80362520 0035F480 38 80 00 00 */ li r4, 0 /* 80362524 0035F484 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80362528 0035F488 7D 89 03 A6 */ mtctr r12 -/* 8036252C 0035F48C 4E 80 04 21 */ bctrl +/* 8036252C 0035F48C 4E 80 04 21 */ bctrl /* 80362530 0035F490 48 00 00 10 */ b lbl_80362540 lbl_80362534: /* 80362534 0035F494 3C 60 00 80 */ lis r3, 0x007FFFFF@ha @@ -4423,7 +4423,7 @@ lbl_803625F0: /* 80362618 0035F578 38 80 00 01 */ li r4, 1 /* 8036261C 0035F57C 81 8C 00 08 */ lwz r12, 8(r12) /* 80362620 0035F580 7D 89 03 A6 */ mtctr r12 -/* 80362624 0035F584 4E 80 04 21 */ bctrl +/* 80362624 0035F584 4E 80 04 21 */ bctrl lbl_80362628: /* 80362628 0035F588 7F 40 07 75 */ extsb. r0, r26 /* 8036262C 0035F58C 41 82 00 10 */ beq lbl_8036263C @@ -4449,7 +4449,7 @@ lbl_80362660: /* 80362674 0035F5D4 81 99 00 00 */ lwz r12, 0(r25) /* 80362678 0035F5D8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8036267C 0035F5DC 7D 89 03 A6 */ mtctr r12 -/* 80362680 0035F5E0 4E 80 04 21 */ bctrl +/* 80362680 0035F5E0 4E 80 04 21 */ bctrl /* 80362684 0035F5E4 3A F7 00 01 */ addi r23, r23, 1 lbl_80362688: /* 80362688 0035F5E8 7C 17 C0 00 */ cmpw r23, r24 @@ -4708,7 +4708,7 @@ lbl_803629DC: /* 80362A04 0035F964 38 80 00 01 */ li r4, 1 /* 80362A08 0035F968 81 8C 00 08 */ lwz r12, 8(r12) /* 80362A0C 0035F96C 7D 89 03 A6 */ mtctr r12 -/* 80362A10 0035F970 4E 80 04 21 */ bctrl +/* 80362A10 0035F970 4E 80 04 21 */ bctrl lbl_80362A14: /* 80362A14 0035F974 7F 40 07 75 */ extsb. r0, r26 /* 80362A18 0035F978 41 82 00 10 */ beq lbl_80362A28 @@ -4726,7 +4726,7 @@ lbl_80362A28: /* 80362A44 0035F9A4 81 83 00 00 */ lwz r12, 0(r3) /* 80362A48 0035F9A8 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80362A4C 0035F9AC 7D 89 03 A6 */ mtctr r12 -/* 80362A50 0035F9B0 4E 80 04 21 */ bctrl +/* 80362A50 0035F9B0 4E 80 04 21 */ bctrl /* 80362A54 0035F9B4 3B 7B 00 01 */ addi r27, r27, 1 lbl_80362A58: /* 80362A58 0035F9B8 80 1F 01 54 */ lwz r0, 0x154(r31) @@ -4810,7 +4810,7 @@ lbl_80362B50: /* 80362B78 0035FAD8 38 80 00 01 */ li r4, 1 /* 80362B7C 0035FADC 81 8C 00 08 */ lwz r12, 8(r12) /* 80362B80 0035FAE0 7D 89 03 A6 */ mtctr r12 -/* 80362B84 0035FAE4 4E 80 04 21 */ bctrl +/* 80362B84 0035FAE4 4E 80 04 21 */ bctrl lbl_80362B88: /* 80362B88 0035FAE8 7F 40 07 75 */ extsb. r0, r26 /* 80362B8C 0035FAEC 41 82 00 10 */ beq lbl_80362B9C @@ -4828,7 +4828,7 @@ lbl_80362B9C: /* 80362BB8 0035FB18 81 83 00 00 */ lwz r12, 0(r3) /* 80362BBC 0035FB1C 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80362BC0 0035FB20 7D 89 03 A6 */ mtctr r12 -/* 80362BC4 0035FB24 4E 80 04 21 */ bctrl +/* 80362BC4 0035FB24 4E 80 04 21 */ bctrl /* 80362BC8 0035FB28 3B 7B 00 01 */ addi r27, r27, 1 lbl_80362BCC: /* 80362BCC 0035FB2C 80 1F 01 54 */ lwz r0, 0x154(r31) @@ -4929,7 +4929,7 @@ lbl_80362D24: /* 80362D2C 0035FC8C 80 01 00 D4 */ lwz r0, 0xd4(r1) /* 80362D30 0035FC90 7C 08 03 A6 */ mtlr r0 /* 80362D34 0035FC94 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 80362D38 0035FC98 4E 80 00 20 */ blr +/* 80362D38 0035FC98 4E 80 00 20 */ blr .global sub_80362d3c sub_80362d3c: @@ -4965,7 +4965,7 @@ lbl_80362D90: /* 80362DA8 0035FD08 80 01 00 14 */ lwz r0, 0x14(r1) /* 80362DAC 0035FD0C 7C 08 03 A6 */ mtlr r0 /* 80362DB0 0035FD10 38 21 00 10 */ addi r1, r1, 0x10 -/* 80362DB4 0035FD14 4E 80 00 20 */ blr +/* 80362DB4 0035FD14 4E 80 00 20 */ blr .global "__dt__Q24rstl80listFv" "__dt__Q24rstl80listFv": @@ -5001,7 +5001,7 @@ lbl_80362E10: /* 80362E20 0035FD80 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80362E24 0035FD84 7C 08 03 A6 */ mtlr r0 /* 80362E28 0035FD88 38 21 00 20 */ addi r1, r1, 0x20 -/* 80362E2C 0035FD8C 4E 80 00 20 */ blr +/* 80362E2C 0035FD8C 4E 80 00 20 */ blr .global "reserve__Q24rstl45vector<9CVector3f,Q24rstl17aligned_allocator>Fi" "reserve__Q24rstl45vector<9CVector3f,Q24rstl17aligned_allocator>Fi": @@ -5083,7 +5083,7 @@ lbl_80362F30: /* 80362F3C 0035FE9C 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80362F40 0035FEA0 7C 08 03 A6 */ mtlr r0 /* 80362F44 0035FEA4 38 21 00 30 */ addi r1, r1, 0x30 -/* 80362F48 0035FEA8 4E 80 00 20 */ blr +/* 80362F48 0035FEA8 4E 80 00 20 */ blr .global sub_80362f4c sub_80362f4c: @@ -5150,7 +5150,7 @@ lbl_80363000: /* 80363024 0035FF84 38 80 00 01 */ li r4, 1 /* 80363028 0035FF88 81 8C 00 08 */ lwz r12, 8(r12) /* 8036302C 0035FF8C 7D 89 03 A6 */ mtctr r12 -/* 80363030 0035FF90 4E 80 04 21 */ bctrl +/* 80363030 0035FF90 4E 80 04 21 */ bctrl lbl_80363034: /* 80363034 0035FF94 3B 7B 00 08 */ addi r27, r27, 8 lbl_80363038: diff --git a/asm/Kyoto/Particles/CParticleElectricDataFactory.s b/asm/Kyoto/Particles/CParticleElectricDataFactory.s index 5a2f53d5..67ee88b3 100644 --- a/asm/Kyoto/Particles/CParticleElectricDataFactory.s +++ b/asm/Kyoto/Particles/CParticleElectricDataFactory.s @@ -196,7 +196,7 @@ lbl_8035E154: /* 8035E194 0035B0F4 81 9D 00 00 */ lwz r12, 0(r29) /* 8035E198 0035B0F8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8035E19C 0035B0FC 7D 89 03 A6 */ mtctr r12 -/* 8035E1A0 0035B100 4E 80 04 21 */ bctrl +/* 8035E1A0 0035B100 4E 80 04 21 */ bctrl /* 8035E1A4 0035B104 38 61 00 6C */ addi r3, r1, 0x6c /* 8035E1A8 0035B108 38 81 00 2C */ addi r4, r1, 0x2c /* 8035E1AC 0035B10C 4B FE 2C FD */ bl __ct__6CTokenFRC6CToken @@ -472,7 +472,7 @@ lbl_8035E554: /* 8035E558 0035B4B8 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 8035E55C 0035B4BC 7C 08 03 A6 */ mtlr r0 /* 8035E560 0035B4C0 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 8035E564 0035B4C4 4E 80 00 20 */ blr +/* 8035E564 0035B4C4 4E 80 00 20 */ blr .global LoadELSMTokens__28CParticleElectricDataFactoryFP20CElectricDescription LoadELSMTokens__28CParticleElectricDataFactoryFP20CElectricDescription: @@ -523,7 +523,7 @@ lbl_8035E604: /* 8035E60C 0035B56C 83 C1 00 08 */ lwz r30, 8(r1) /* 8035E610 0035B570 7C 08 03 A6 */ mtlr r0 /* 8035E614 0035B574 38 21 00 10 */ addi r1, r1, 0x10 -/* 8035E618 0035B578 4E 80 00 20 */ blr +/* 8035E618 0035B578 4E 80 00 20 */ blr .global CreateGeneratorDescription__28CParticleElectricDataFactoryFR12CInputStreamP11CSimplePool CreateGeneratorDescription__28CParticleElectricDataFactoryFR12CInputStreamP11CSimplePool: @@ -566,7 +566,7 @@ lbl_8035E694: /* 8035E6A0 0035B600 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8035E6A4 0035B604 7C 08 03 A6 */ mtlr r0 /* 8035E6A8 0035B608 38 21 00 20 */ addi r1, r1, 0x20 -/* 8035E6AC 0035B60C 4E 80 00 20 */ blr +/* 8035E6AC 0035B60C 4E 80 00 20 */ blr .global GetGeneratorDesc__28CParticleElectricDataFactoryFR12CInputStreamP11CSimplePool GetGeneratorDesc__28CParticleElectricDataFactoryFR12CInputStreamP11CSimplePool: @@ -605,7 +605,7 @@ lbl_8035E71C: /* 8035E724 0035B684 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8035E728 0035B688 7C 08 03 A6 */ mtlr r0 /* 8035E72C 0035B68C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8035E730 0035B690 4E 80 00 20 */ blr +/* 8035E730 0035B690 4E 80 00 20 */ blr .global FParticleElectricDataFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer FParticleElectricDataFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer: @@ -650,7 +650,7 @@ FParticleElectricDataFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer: /* 8035E7CC 0035B72C 38 80 00 01 */ li r4, 1 /* 8035E7D0 0035B730 81 8C 00 08 */ lwz r12, 8(r12) /* 8035E7D4 0035B734 7D 89 03 A6 */ mtctr r12 -/* 8035E7D8 0035B738 4E 80 04 21 */ bctrl +/* 8035E7D8 0035B738 4E 80 04 21 */ bctrl lbl_8035E7DC: /* 8035E7DC 0035B73C 88 01 00 0C */ lbz r0, 0xc(r1) /* 8035E7E0 0035B740 28 00 00 00 */ cmplwi r0, 0 @@ -665,7 +665,7 @@ lbl_8035E7F4: /* 8035E800 0035B760 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8035E804 0035B764 7C 08 03 A6 */ mtlr r0 /* 8035E808 0035B768 38 21 00 30 */ addi r1, r1, 0x30 -/* 8035E80C 0035B76C 4E 80 00 20 */ blr +/* 8035E80C 0035B76C 4E 80 00 20 */ blr .global "GetIObjObjectFor__30TToken<20CElectricDescription>FRCQ24rstl32auto_ptr<20CElectricDescription>" "GetIObjObjectFor__30TToken<20CElectricDescription>FRCQ24rstl32auto_ptr<20CElectricDescription>": @@ -679,7 +679,7 @@ lbl_8035E7F4: /* 8035E82C 0035B78C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8035E830 0035B790 7C 08 03 A6 */ mtlr r0 /* 8035E834 0035B794 38 21 00 10 */ addi r1, r1, 0x10 -/* 8035E838 0035B798 4E 80 00 20 */ blr +/* 8035E838 0035B798 4E 80 00 20 */ blr .global "GetNewDerivedObject__48TObjOwnerDerivedFromIObj<20CElectricDescription>FRCQ24rstl32auto_ptr<20CElectricDescription>" "GetNewDerivedObject__48TObjOwnerDerivedFromIObj<20CElectricDescription>FRCQ24rstl32auto_ptr<20CElectricDescription>": diff --git a/asm/Kyoto/Particles/CParticleGlobals.s b/asm/Kyoto/Particles/CParticleGlobals.s index c0f957d8..60198962 100644 --- a/asm/Kyoto/Particles/CParticleGlobals.s +++ b/asm/Kyoto/Particles/CParticleGlobals.s @@ -94,7 +94,7 @@ lbl_8032A730: /* 8032A73C 0032769C 90 0D A8 E0 */ stw r0, lbl_805A94A0@sda21(r13) lbl_8032A740: /* 8032A740 003276A0 38 21 00 30 */ addi r1, r1, 0x30 -/* 8032A744 003276A4 4E 80 00 20 */ blr +/* 8032A744 003276A4 4E 80 00 20 */ blr .global SetEmitterTime__16CParticleGlobalsFi SetEmitterTime__16CParticleGlobalsFi: @@ -109,7 +109,7 @@ SetEmitterTime__16CParticleGlobalsFi: /* 8032A768 003276C8 EC 00 08 28 */ fsubs f0, f0, f1 /* 8032A76C 003276CC D0 0D A8 DC */ stfs f0, lbl_805A949C@sda21(r13) /* 8032A770 003276D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8032A774 003276D4 4E 80 00 20 */ blr +/* 8032A774 003276D4 4E 80 00 20 */ blr .global SetParticleLifetime__16CParticleGlobalsFi SetParticleLifetime__16CParticleGlobalsFi: diff --git a/asm/Kyoto/Particles/CParticleSwoosh.s b/asm/Kyoto/Particles/CParticleSwoosh.s index c896dea3..89096283 100644 --- a/asm/Kyoto/Particles/CParticleSwoosh.s +++ b/asm/Kyoto/Particles/CParticleSwoosh.s @@ -53,42 +53,42 @@ lbl_805A88DC: .global GetTranslation__15CParticleSwooshCFv GetTranslation__15CParticleSwooshCFv: /* 8032A7A8 00327708 38 63 00 38 */ addi r3, r3, 0x38 -/* 8032A7AC 0032770C 4E 80 00 20 */ blr +/* 8032A7AC 0032770C 4E 80 00 20 */ blr .global GetGlobalTranslation__15CParticleSwooshCFv GetGlobalTranslation__15CParticleSwooshCFv: /* 8032A7B0 00327710 38 63 00 A4 */ addi r3, r3, 0xa4 -/* 8032A7B4 00327714 4E 80 00 20 */ blr +/* 8032A7B4 00327714 4E 80 00 20 */ blr .global GetGlobalOrientation__15CParticleSwooshCFv GetGlobalOrientation__15CParticleSwooshCFv: /* 8032A7B8 00327718 38 63 00 B0 */ addi r3, r3, 0xb0 -/* 8032A7BC 0032771C 4E 80 00 20 */ blr +/* 8032A7BC 0032771C 4E 80 00 20 */ blr .global GetGlobalScale__15CParticleSwooshCFv GetGlobalScale__15CParticleSwooshCFv: /* 8032A7C0 00327720 38 63 00 E0 */ addi r3, r3, 0xe0 -/* 8032A7C4 00327724 4E 80 00 20 */ blr +/* 8032A7C4 00327724 4E 80 00 20 */ blr .global GetOrientation__15CParticleSwooshCFv GetOrientation__15CParticleSwooshCFv: /* 8032A7C8 00327728 38 63 00 44 */ addi r3, r3, 0x44 -/* 8032A7CC 0032772C 4E 80 00 20 */ blr +/* 8032A7CC 0032772C 4E 80 00 20 */ blr .global GetParticleEmission__15CParticleSwooshCFv GetParticleEmission__15CParticleSwooshCFv: /* 8032A7D0 00327730 88 03 01 D0 */ lbz r0, 0x1d0(r3) /* 8032A7D4 00327734 54 03 CF FE */ rlwinm r3, r0, 0x19, 0x1f, 0x1f -/* 8032A7D8 00327738 4E 80 00 20 */ blr +/* 8032A7D8 00327738 4E 80 00 20 */ blr .global DestroyParticles__15CParticleSwooshFv DestroyParticles__15CParticleSwooshFv: -/* 8032A7DC 0032773C 4E 80 00 20 */ blr +/* 8032A7DC 0032773C 4E 80 00 20 */ blr .global SystemHasLight__15CParticleSwooshCFv SystemHasLight__15CParticleSwooshCFv: /* 8032A7E0 00327740 38 60 00 00 */ li r3, 0 -/* 8032A7E4 00327744 4E 80 00 20 */ blr +/* 8032A7E4 00327744 4E 80 00 20 */ blr .global SetGlobalScale__15CParticleSwooshFRC9CVector3f SetGlobalScale__15CParticleSwooshFRC9CVector3f: @@ -127,7 +127,7 @@ SetGlobalScale__15CParticleSwooshFRC9CVector3f: /* 8032A868 003277C8 83 C1 00 68 */ lwz r30, 0x68(r1) /* 8032A86C 003277CC 7C 08 03 A6 */ mtlr r0 /* 8032A870 003277D0 38 21 00 70 */ addi r1, r1, 0x70 -/* 8032A874 003277D4 4E 80 00 20 */ blr +/* 8032A874 003277D4 4E 80 00 20 */ blr .global UpdateSwooshTranslation__15CParticleSwooshFRC9CVector3f UpdateSwooshTranslation__15CParticleSwooshFRC9CVector3f: @@ -155,13 +155,13 @@ UpdateSwooshTranslation__15CParticleSwooshFRC9CVector3f: /* 8032A8CC 0032782C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8032A8D0 00327830 7C 08 03 A6 */ mtlr r0 /* 8032A8D4 00327834 38 21 00 20 */ addi r1, r1, 0x20 -/* 8032A8D8 00327838 4E 80 00 20 */ blr +/* 8032A8D8 00327838 4E 80 00 20 */ blr .global Get4CharId__15CParticleSwooshCF Get4CharId__15CParticleSwooshCF: /* 8032A8DC 0032783C 3C 60 53 57 */ lis r3, 0x53574843@ha /* 8032A8E0 00327840 38 63 48 43 */ addi r3, r3, 0x53574843@l -/* 8032A8E4 00327844 4E 80 00 20 */ blr +/* 8032A8E4 00327844 4E 80 00 20 */ blr .global GetLight__15CParticleSwooshCFv GetLight__15CParticleSwooshCFv: @@ -180,7 +180,7 @@ GetLight__15CParticleSwooshCFv: /* 8032A918 00327878 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8032A91C 0032787C 7C 08 03 A6 */ mtlr r0 /* 8032A920 00327880 38 21 00 10 */ addi r1, r1, 0x10 -/* 8032A924 00327884 4E 80 00 20 */ blr +/* 8032A924 00327884 4E 80 00 20 */ blr .global UpdateMaxRadius__15CParticleSwooshFf UpdateMaxRadius__15CParticleSwooshFf: @@ -198,7 +198,7 @@ lbl_8032A94C: /* 8032A94C 003278AC C0 04 00 00 */ lfs f0, 0(r4) /* 8032A950 003278B0 D0 03 02 08 */ stfs f0, 0x208(r3) /* 8032A954 003278B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8032A958 003278B8 4E 80 00 20 */ blr +/* 8032A958 003278B8 4E 80 00 20 */ blr .global UpdateBounds__15CParticleSwooshFRC9CVector3f UpdateBounds__15CParticleSwooshFRC9CVector3f: @@ -282,7 +282,7 @@ lbl_8032AA58: /* 8032AA60 003279C0 D0 23 01 F4 */ stfs f1, 0x1f4(r3) /* 8032AA64 003279C4 D0 43 01 F8 */ stfs f2, 0x1f8(r3) /* 8032AA68 003279C8 38 21 00 40 */ addi r1, r1, 0x40 -/* 8032AA6C 003279CC 4E 80 00 20 */ blr +/* 8032AA6C 003279CC 4E 80 00 20 */ blr .global GetBounds__15CParticleSwooshCFv GetBounds__15CParticleSwooshCFv: @@ -297,7 +297,7 @@ GetBounds__15CParticleSwooshCFv: /* 8032AA90 003279F0 81 9F 00 00 */ lwz r12, 0(r31) /* 8032AA94 003279F4 81 8C 00 60 */ lwz r12, 0x60(r12) /* 8032AA98 003279F8 7D 89 03 A6 */ mtctr r12 -/* 8032AA9C 003279FC 4E 80 04 21 */ bctrl +/* 8032AA9C 003279FC 4E 80 04 21 */ bctrl /* 8032AAA0 00327A00 2C 03 00 01 */ cmpwi r3, 1 /* 8032AAA4 00327A04 41 81 00 94 */ bgt lbl_8032AB38 /* 8032AAA8 00327A08 C0 3F 00 3C */ lfs f1, 0x3c(r31) @@ -397,7 +397,7 @@ lbl_8032AC10: /* 8032AC18 00327B78 83 C1 01 18 */ lwz r30, 0x118(r1) /* 8032AC1C 00327B7C 7C 08 03 A6 */ mtlr r0 /* 8032AC20 00327B80 38 21 01 20 */ addi r1, r1, 0x120 -/* 8032AC24 00327B84 4E 80 00 20 */ blr +/* 8032AC24 00327B84 4E 80 00 20 */ blr .global GetSplinePoint__15CParticleSwooshCFRC9CVector3fRC9CVector3fRC9CVector3fRC9CVector3ff GetSplinePoint__15CParticleSwooshCFRC9CVector3fRC9CVector3fRC9CVector3fRC9CVector3ff: @@ -495,7 +495,7 @@ lbl_8032AD58: /* 8032AD8C 00327CEC E3 41 00 18 */ psq_l f26, 24(r1), 0, qr0 /* 8032AD90 00327CF0 CB 41 00 10 */ lfd f26, 0x10(r1) /* 8032AD94 00327CF4 38 21 00 70 */ addi r1, r1, 0x70 -/* 8032AD98 00327CF8 4E 80 00 20 */ blr +/* 8032AD98 00327CF8 4E 80 00 20 */ blr .global GetRightRadius__15CParticleSwooshFi GetRightRadius__15CParticleSwooshFi: @@ -517,13 +517,13 @@ GetRightRadius__15CParticleSwooshFi: /* 8032ADD8 00327D38 38 A1 00 08 */ addi r5, r1, 8 /* 8032ADDC 00327D3C 7C 84 00 2E */ lwzx r4, r4, r0 /* 8032ADE0 00327D40 7D 89 03 A6 */ mtctr r12 -/* 8032ADE4 00327D44 4E 80 04 21 */ bctrl +/* 8032ADE4 00327D44 4E 80 04 21 */ bctrl lbl_8032ADE8: /* 8032ADE8 00327D48 80 01 00 14 */ lwz r0, 0x14(r1) /* 8032ADEC 00327D4C C0 21 00 08 */ lfs f1, 8(r1) /* 8032ADF0 00327D50 7C 08 03 A6 */ mtlr r0 /* 8032ADF4 00327D54 38 21 00 10 */ addi r1, r1, 0x10 -/* 8032ADF8 00327D58 4E 80 00 20 */ blr +/* 8032ADF8 00327D58 4E 80 00 20 */ blr .global GetLeftRadius__15CParticleSwooshFi GetLeftRadius__15CParticleSwooshFi: @@ -545,13 +545,13 @@ GetLeftRadius__15CParticleSwooshFi: /* 8032AE38 00327D98 38 A1 00 08 */ addi r5, r1, 8 /* 8032AE3C 00327D9C 7C 84 00 2E */ lwzx r4, r4, r0 /* 8032AE40 00327DA0 7D 89 03 A6 */ mtctr r12 -/* 8032AE44 00327DA4 4E 80 04 21 */ bctrl +/* 8032AE44 00327DA4 4E 80 04 21 */ bctrl lbl_8032AE48: /* 8032AE48 00327DA8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8032AE4C 00327DAC C0 21 00 08 */ lfs f1, 8(r1) /* 8032AE50 00327DB0 7C 08 03 A6 */ mtlr r0 /* 8032AE54 00327DB4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8032AE58 00327DB8 4E 80 00 20 */ blr +/* 8032AE58 00327DB8 4E 80 00 20 */ blr .global WrapIndex__15CParticleSwooshFi WrapIndex__15CParticleSwooshFi: @@ -570,14 +570,14 @@ lbl_8032AE7C: /* 8032AE7C 00327DDC 7C 04 00 00 */ cmpw r4, r0 /* 8032AE80 00327DE0 40 80 FF F8 */ bge lbl_8032AE78 /* 8032AE84 00327DE4 7C 83 23 78 */ mr r3, r4 -/* 8032AE88 00327DE8 4E 80 00 20 */ blr +/* 8032AE88 00327DE8 4E 80 00 20 */ blr .global SetParticleEmission__15CParticleSwooshFb SetParticleEmission__15CParticleSwooshFb: /* 8032AE8C 00327DEC 88 03 01 D0 */ lbz r0, 0x1d0(r3) /* 8032AE90 00327DF0 50 80 3E 30 */ rlwimi r0, r4, 7, 0x18, 0x18 /* 8032AE94 00327DF4 98 03 01 D0 */ stb r0, 0x1d0(r3) -/* 8032AE98 00327DF8 4E 80 00 20 */ blr +/* 8032AE98 00327DF8 4E 80 00 20 */ blr .global RenderNSidedSpline__15CParticleSwooshFv RenderNSidedSpline__15CParticleSwooshFv: @@ -1391,7 +1391,7 @@ lbl_8032B9EC: /* 8032BA90 003289F0 80 01 02 B4 */ lwz r0, 0x2b4(r1) /* 8032BA94 003289F4 7C 08 03 A6 */ mtlr r0 /* 8032BA98 003289F8 38 21 02 B0 */ addi r1, r1, 0x2b0 -/* 8032BA9C 003289FC 4E 80 00 20 */ blr +/* 8032BA9C 003289FC 4E 80 00 20 */ blr .global RenderNSidedNoSpline__15CParticleSwooshFv RenderNSidedNoSpline__15CParticleSwooshFv: @@ -1402,7 +1402,7 @@ RenderNSidedNoSpline__15CParticleSwooshFv: /* 8032BAB0 00328A10 80 01 00 14 */ lwz r0, 0x14(r1) /* 8032BAB4 00328A14 7C 08 03 A6 */ mtlr r0 /* 8032BAB8 00328A18 38 21 00 10 */ addi r1, r1, 0x10 -/* 8032BABC 00328A1C 4E 80 00 20 */ blr +/* 8032BABC 00328A1C 4E 80 00 20 */ blr .global Render3SidedSolidSpline__15CParticleSwooshFv Render3SidedSolidSpline__15CParticleSwooshFv: @@ -2180,7 +2180,7 @@ lbl_8032C5F4: /* 8032C688 003295E8 80 01 02 84 */ lwz r0, 0x284(r1) /* 8032C68C 003295EC 7C 08 03 A6 */ mtlr r0 /* 8032C690 003295F0 38 21 02 80 */ addi r1, r1, 0x280 -/* 8032C694 003295F4 4E 80 00 20 */ blr +/* 8032C694 003295F4 4E 80 00 20 */ blr .global Render3SidedSolidNoSplineNoGaps__15CParticleSwooshFv Render3SidedSolidNoSplineNoGaps__15CParticleSwooshFv: @@ -2801,7 +2801,7 @@ lbl_8032CF2C: /* 8032CFB8 00329F18 80 01 02 14 */ lwz r0, 0x214(r1) /* 8032CFBC 00329F1C 7C 08 03 A6 */ mtlr r0 /* 8032CFC0 00329F20 38 21 02 10 */ addi r1, r1, 0x210 -/* 8032CFC4 00329F24 4E 80 00 20 */ blr +/* 8032CFC4 00329F24 4E 80 00 20 */ blr .global Render2SidedSpline__15CParticleSwooshFv Render2SidedSpline__15CParticleSwooshFv: @@ -2812,7 +2812,7 @@ Render2SidedSpline__15CParticleSwooshFv: /* 8032CFD8 00329F38 80 01 00 14 */ lwz r0, 0x14(r1) /* 8032CFDC 00329F3C 7C 08 03 A6 */ mtlr r0 /* 8032CFE0 00329F40 38 21 00 10 */ addi r1, r1, 0x10 -/* 8032CFE4 00329F44 4E 80 00 20 */ blr +/* 8032CFE4 00329F44 4E 80 00 20 */ blr .global Render2SidedNoSplineGaps__15CParticleSwooshFv Render2SidedNoSplineGaps__15CParticleSwooshFv: @@ -3040,7 +3040,7 @@ lbl_8032D318: /* 8032D334 0032A294 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 8032D338 0032A298 7C 08 03 A6 */ mtlr r0 /* 8032D33C 0032A29C 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 8032D340 0032A2A0 4E 80 00 20 */ blr +/* 8032D340 0032A2A0 4E 80 00 20 */ blr .global Render2SidedNoSplineNoGaps__15CParticleSwooshFv Render2SidedNoSplineNoGaps__15CParticleSwooshFv: @@ -3670,7 +3670,7 @@ lbl_8032DC54: /* 8032DC94 0032ABF4 80 01 02 C4 */ lwz r0, 0x2c4(r1) /* 8032DC98 0032ABF8 7C 08 03 A6 */ mtlr r0 /* 8032DC9C 0032ABFC 38 21 02 C0 */ addi r1, r1, 0x2c0 -/* 8032DCA0 0032AC00 4E 80 00 20 */ blr +/* 8032DCA0 0032AC00 4E 80 00 20 */ blr .global Render__15CParticleSwooshFv Render__15CParticleSwooshFv: @@ -3749,7 +3749,7 @@ lbl_8032DD4C: /* 8032DDBC 0032AD1C 80 BD 00 28 */ lwz r5, 0x28(r29) /* 8032DDC0 0032AD20 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8032DDC4 0032AD24 7D 89 03 A6 */ mtctr r12 -/* 8032DDC8 0032AD28 4E 80 04 21 */ bctrl +/* 8032DDC8 0032AD28 4E 80 04 21 */ bctrl /* 8032DDCC 0032AD2C 38 61 00 08 */ addi r3, r1, 8 /* 8032DDD0 0032AD30 38 81 00 10 */ addi r4, r1, 0x10 /* 8032DDD4 0032AD34 48 01 30 D5 */ bl __ct__6CTokenFRC6CToken @@ -3776,7 +3776,7 @@ lbl_8032DD4C: /* 8032DE28 0032AD88 81 83 00 00 */ lwz r12, 0(r3) /* 8032DE2C 0032AD8C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8032DE30 0032AD90 7D 89 03 A6 */ mtctr r12 -/* 8032DE34 0032AD94 4E 80 04 21 */ bctrl +/* 8032DE34 0032AD94 4E 80 04 21 */ bctrl /* 8032DE38 0032AD98 C0 01 00 1C */ lfs f0, 0x1c(r1) /* 8032DE3C 0032AD9C D0 1D 01 D4 */ stfs f0, 0x1d4(r29) /* 8032DE40 0032ADA0 C0 01 00 20 */ lfs f0, 0x20(r1) @@ -3790,7 +3790,7 @@ lbl_8032DD4C: /* 8032DE60 0032ADC0 81 83 00 00 */ lwz r12, 0(r3) /* 8032DE64 0032ADC4 81 8C 00 14 */ lwz r12, 0x14(r12) /* 8032DE68 0032ADC8 7D 89 03 A6 */ mtctr r12 -/* 8032DE6C 0032ADCC 4E 80 04 21 */ bctrl +/* 8032DE6C 0032ADCC 4E 80 04 21 */ bctrl /* 8032DE70 0032ADD0 88 1D 01 D0 */ lbz r0, 0x1d0(r29) /* 8032DE74 0032ADD4 50 60 07 FE */ rlwimi r0, r3, 0, 0x1f, 0x1f /* 8032DE78 0032ADD8 98 1D 01 D0 */ stb r0, 0x1d0(r29) @@ -3799,7 +3799,7 @@ lbl_8032DD4C: /* 8032DE84 0032ADE4 81 83 00 00 */ lwz r12, 0(r3) /* 8032DE88 0032ADE8 81 8C 00 18 */ lwz r12, 0x18(r12) /* 8032DE8C 0032ADEC 7D 89 03 A6 */ mtctr r12 -/* 8032DE90 0032ADF0 4E 80 04 21 */ bctrl +/* 8032DE90 0032ADF0 4E 80 04 21 */ bctrl /* 8032DE94 0032ADF4 88 1D 01 D1 */ lbz r0, 0x1d1(r29) /* 8032DE98 0032ADF8 50 60 3E 30 */ rlwimi r0, r3, 7, 0x18, 0x18 /* 8032DE9C 0032ADFC 98 1D 01 D1 */ stb r0, 0x1d1(r29) @@ -3812,7 +3812,7 @@ lbl_8032DD4C: /* 8032DEB8 0032AE18 80 9D 00 28 */ lwz r4, 0x28(r29) /* 8032DEBC 0032AE1C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8032DEC0 0032AE20 7D 89 03 A6 */ mtctr r12 -/* 8032DEC4 0032AE24 4E 80 04 21 */ bctrl +/* 8032DEC4 0032AE24 4E 80 04 21 */ bctrl lbl_8032DEC8: /* 8032DEC8 0032AE28 80 1D 01 EC */ lwz r0, 0x1ec(r29) /* 8032DECC 0032AE2C 2C 00 00 00 */ cmpwi r0, 0 @@ -3914,7 +3914,7 @@ lbl_8032E010: /* 8032E01C 0032AF7C 83 A1 01 34 */ lwz r29, 0x134(r1) /* 8032E020 0032AF80 7C 08 03 A6 */ mtlr r0 /* 8032E024 0032AF84 38 21 01 40 */ addi r1, r1, 0x140 -/* 8032E028 0032AF88 4E 80 00 20 */ blr +/* 8032E028 0032AF88 4E 80 00 20 */ blr .global IsSystemDeletable__15CParticleSwooshCFv IsSystemDeletable__15CParticleSwooshCFv: @@ -3934,7 +3934,7 @@ lbl_8032E05C: /* 8032E05C 0032AFBC 81 83 00 00 */ lwz r12, 0(r3) /* 8032E060 0032AFC0 81 8C 00 60 */ lwz r12, 0x60(r12) /* 8032E064 0032AFC4 7D 89 03 A6 */ mtctr r12 -/* 8032E068 0032AFC8 4E 80 04 21 */ bctrl +/* 8032E068 0032AFC8 4E 80 04 21 */ bctrl /* 8032E06C 0032AFCC 2C 03 00 02 */ cmpwi r3, 2 /* 8032E070 0032AFD0 41 80 00 0C */ blt lbl_8032E07C /* 8032E074 0032AFD4 38 60 00 00 */ li r3, 0 @@ -3945,23 +3945,23 @@ lbl_8032E080: /* 8032E080 0032AFE0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8032E084 0032AFE4 7C 08 03 A6 */ mtlr r0 /* 8032E088 0032AFE8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8032E08C 0032AFEC 4E 80 00 20 */ blr +/* 8032E08C 0032AFEC 4E 80 00 20 */ blr .global GetModulationColor__15CParticleSwooshCFv GetModulationColor__15CParticleSwooshCFv: /* 8032E090 0032AFF0 38 63 02 0C */ addi r3, r3, 0x20c -/* 8032E094 0032AFF4 4E 80 00 20 */ blr +/* 8032E094 0032AFF4 4E 80 00 20 */ blr .global SetModulationColor__15CParticleSwooshFRC6CColor SetModulationColor__15CParticleSwooshFRC6CColor: /* 8032E098 0032AFF8 80 04 00 00 */ lwz r0, 0(r4) /* 8032E09C 0032AFFC 90 03 02 0C */ stw r0, 0x20c(r3) -/* 8032E0A0 0032B000 4E 80 00 20 */ blr +/* 8032E0A0 0032B000 4E 80 00 20 */ blr .global GetParticleCount__15CParticleSwooshCFv GetParticleCount__15CParticleSwooshCFv: /* 8032E0A4 0032B004 80 63 01 AC */ lwz r3, 0x1ac(r3) -/* 8032E0A8 0032B008 4E 80 00 20 */ blr +/* 8032E0A8 0032B008 4E 80 00 20 */ blr .global SetLocalScale__15CParticleSwooshFRC9CVector3f SetLocalScale__15CParticleSwooshFRC9CVector3f: @@ -3971,7 +3971,7 @@ SetLocalScale__15CParticleSwooshFRC9CVector3f: /* 8032E0B8 0032B018 D0 03 01 50 */ stfs f0, 0x150(r3) /* 8032E0BC 0032B01C C0 04 00 08 */ lfs f0, 8(r4) /* 8032E0C0 0032B020 D0 03 01 54 */ stfs f0, 0x154(r3) -/* 8032E0C4 0032B024 4E 80 00 20 */ blr +/* 8032E0C4 0032B024 4E 80 00 20 */ blr .global SetGlobalOrientation__15CParticleSwooshFRC12CTransform4f SetGlobalOrientation__15CParticleSwooshFRC12CTransform4f: @@ -3989,7 +3989,7 @@ SetGlobalOrientation__15CParticleSwooshFRC12CTransform4f: /* 8032E0F4 0032B054 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 8032E0F8 0032B058 7C 08 03 A6 */ mtlr r0 /* 8032E0FC 0032B05C 38 21 00 40 */ addi r1, r1, 0x40 -/* 8032E100 0032B060 4E 80 00 20 */ blr +/* 8032E100 0032B060 4E 80 00 20 */ blr .global SetGlobalTranslation__15CParticleSwooshFRC9CVector3f SetGlobalTranslation__15CParticleSwooshFRC9CVector3f: @@ -3999,7 +3999,7 @@ SetGlobalTranslation__15CParticleSwooshFRC9CVector3f: /* 8032E110 0032B070 D0 03 00 A8 */ stfs f0, 0xa8(r3) /* 8032E114 0032B074 C0 04 00 08 */ lfs f0, 8(r4) /* 8032E118 0032B078 D0 03 00 AC */ stfs f0, 0xac(r3) -/* 8032E11C 0032B07C 4E 80 00 20 */ blr +/* 8032E11C 0032B07C 4E 80 00 20 */ blr .global SetTranslation__15CParticleSwooshFRC9CVector3f SetTranslation__15CParticleSwooshFRC9CVector3f: @@ -4017,7 +4017,7 @@ SetTranslation__15CParticleSwooshFRC9CVector3f: /* 8032E14C 0032B0AC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8032E150 0032B0B0 7C 08 03 A6 */ mtlr r0 /* 8032E154 0032B0B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8032E158 0032B0B8 4E 80 00 20 */ blr +/* 8032E158 0032B0B8 4E 80 00 20 */ blr .global UpdateTranslationAndOrientation__15CParticleSwooshFv UpdateTranslationAndOrientation__15CParticleSwooshFv: @@ -4084,7 +4084,7 @@ lbl_8032E1F4: /* 8032E248 0032B1A8 80 9C 00 28 */ lwz r4, 0x28(r28) /* 8032E24C 0032B1AC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8032E250 0032B1B0 7D 89 03 A6 */ mtctr r12 -/* 8032E254 0032B1B4 4E 80 04 21 */ bctrl +/* 8032E254 0032B1B4 4E 80 04 21 */ bctrl lbl_8032E258: /* 8032E258 0032B1B8 C0 02 CA 94 */ lfs f0, lbl_805AE7B4@sda21(r2) /* 8032E25C 0032B1BC D0 1D 00 34 */ stfs f0, 0x34(r29) @@ -4098,7 +4098,7 @@ lbl_8032E264: /* 8032E278 0032B1D8 80 9C 00 28 */ lwz r4, 0x28(r28) /* 8032E27C 0032B1DC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8032E280 0032B1E0 7D 89 03 A6 */ mtctr r12 -/* 8032E284 0032B1E4 4E 80 04 21 */ bctrl +/* 8032E284 0032B1E4 4E 80 04 21 */ bctrl /* 8032E288 0032B1E8 48 00 00 0C */ b lbl_8032E294 lbl_8032E28C: /* 8032E28C 0032B1EC C0 02 CA 94 */ lfs f0, lbl_805AE7B4@sda21(r2) @@ -4151,7 +4151,7 @@ lbl_8032E294: /* 8032E344 0032B2A4 81 83 00 00 */ lwz r12, 0(r3) /* 8032E348 0032B2A8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8032E34C 0032B2AC 7D 89 03 A6 */ mtctr r12 -/* 8032E350 0032B2B0 4E 80 04 21 */ bctrl +/* 8032E350 0032B2B0 4E 80 04 21 */ bctrl /* 8032E354 0032B2B4 38 61 00 5C */ addi r3, r1, 0x5c /* 8032E358 0032B2B8 38 9C 00 44 */ addi r4, r28, 0x44 /* 8032E35C 0032B2BC 38 A1 00 98 */ addi r5, r1, 0x98 @@ -4186,7 +4186,7 @@ lbl_8032E3C0: /* 8032E3CC 0032B32C 80 9D 00 68 */ lwz r4, 0x68(r29) /* 8032E3D0 0032B330 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8032E3D4 0032B334 7D 89 03 A6 */ mtctr r12 -/* 8032E3D8 0032B338 4E 80 04 21 */ bctrl +/* 8032E3D8 0032B338 4E 80 04 21 */ bctrl lbl_8032E3DC: /* 8032E3DC 0032B33C 80 7C 00 24 */ lwz r3, 0x24(r28) /* 8032E3E0 0032B340 80 63 00 34 */ lwz r3, 0x34(r3) @@ -4235,7 +4235,7 @@ lbl_8032E3DC: /* 8032E48C 0032B3EC 81 83 00 00 */ lwz r12, 0(r3) /* 8032E490 0032B3F0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8032E494 0032B3F4 7D 89 03 A6 */ mtctr r12 -/* 8032E498 0032B3F8 4E 80 04 21 */ bctrl +/* 8032E498 0032B3F8 4E 80 04 21 */ bctrl /* 8032E49C 0032B3FC 38 61 00 20 */ addi r3, r1, 0x20 /* 8032E4A0 0032B400 38 9C 00 44 */ addi r4, r28, 0x44 /* 8032E4A4 0032B404 38 A1 00 98 */ addi r5, r1, 0x98 @@ -4270,7 +4270,7 @@ lbl_8032E508: /* 8032E514 0032B474 80 9D 00 68 */ lwz r4, 0x68(r29) /* 8032E518 0032B478 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8032E51C 0032B47C 7D 89 03 A6 */ mtctr r12 -/* 8032E520 0032B480 4E 80 04 21 */ bctrl +/* 8032E520 0032B480 4E 80 04 21 */ bctrl lbl_8032E524: /* 8032E524 0032B484 80 1D 00 68 */ lwz r0, 0x68(r29) /* 8032E528 0032B488 2C 00 00 00 */ cmpwi r0, 0 @@ -4297,7 +4297,7 @@ lbl_8032E560: /* 8032E578 0032B4D8 80 9D 00 68 */ lwz r4, 0x68(r29) /* 8032E57C 0032B4DC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8032E580 0032B4E0 7D 89 03 A6 */ mtctr r12 -/* 8032E584 0032B4E4 4E 80 04 21 */ bctrl +/* 8032E584 0032B4E4 4E 80 04 21 */ bctrl /* 8032E588 0032B4E8 C0 3D 00 18 */ lfs f1, 0x18(r29) /* 8032E58C 0032B4EC C0 01 00 A4 */ lfs f0, 0xa4(r1) /* 8032E590 0032B4F0 C0 9D 00 1C */ lfs f4, 0x1c(r29) @@ -4320,7 +4320,7 @@ lbl_8032E5B8: /* 8032E5D0 0032B530 80 9D 00 68 */ lwz r4, 0x68(r29) /* 8032E5D4 0032B534 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8032E5D8 0032B538 7D 89 03 A6 */ mtctr r12 -/* 8032E5DC 0032B53C 4E 80 04 21 */ bctrl +/* 8032E5DC 0032B53C 4E 80 04 21 */ bctrl lbl_8032E5E0: /* 8032E5E0 0032B540 7F 83 E3 78 */ mr r3, r28 /* 8032E5E4 0032B544 7F C4 F3 78 */ mr r4, r30 @@ -4374,7 +4374,7 @@ lbl_8032E680: /* 8032E690 0032B5F0 83 81 00 B0 */ lwz r28, 0xb0(r1) /* 8032E694 0032B5F4 7C 08 03 A6 */ mtlr r0 /* 8032E698 0032B5F8 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 8032E69C 0032B5FC 4E 80 00 20 */ blr +/* 8032E69C 0032B5FC 4E 80 00 20 */ blr .global SetOrientation__15CParticleSwooshFRC12CTransform4f SetOrientation__15CParticleSwooshFRC12CTransform4f: @@ -4402,7 +4402,7 @@ SetOrientation__15CParticleSwooshFRC12CTransform4f: /* 8032E6F4 0032B654 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 8032E6F8 0032B658 7C 08 03 A6 */ mtlr r0 /* 8032E6FC 0032B65C 38 21 00 40 */ addi r1, r1, 0x40 -/* 8032E700 0032B660 4E 80 00 20 */ blr +/* 8032E700 0032B660 4E 80 00 20 */ blr .global Update__15CParticleSwooshFd Update__15CParticleSwooshFd: @@ -4457,7 +4457,7 @@ lbl_8032E748: /* 8032E7C0 0032B720 80 9D 00 28 */ lwz r4, 0x28(r29) /* 8032E7C4 0032B724 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8032E7C8 0032B728 7D 89 03 A6 */ mtctr r12 -/* 8032E7CC 0032B72C 4E 80 04 21 */ bctrl +/* 8032E7CC 0032B72C 4E 80 04 21 */ bctrl lbl_8032E7D0: /* 8032E7D0 0032B730 C0 21 00 14 */ lfs f1, 0x14(r1) /* 8032E7D4 0032B734 C8 02 CB 10 */ lfd f0, lbl_805AE830@sda21(r2) @@ -4506,7 +4506,7 @@ lbl_8032E824: /* 8032E874 0032B7D4 7C A0 2A 14 */ add r5, r0, r5 /* 8032E878 0032B7D8 80 9D 00 28 */ lwz r4, 0x28(r29) /* 8032E87C 0032B7DC 7D 89 03 A6 */ mtctr r12 -/* 8032E880 0032B7E0 4E 80 04 21 */ bctrl +/* 8032E880 0032B7E0 4E 80 04 21 */ bctrl /* 8032E884 0032B7E4 48 00 00 1C */ b lbl_8032E8A0 lbl_8032E888: /* 8032E888 0032B7E8 80 1D 01 58 */ lwz r0, 0x158(r29) @@ -4563,7 +4563,7 @@ lbl_8032E908: /* 8032E94C 0032B8AC 7C A0 2A 14 */ add r5, r0, r5 /* 8032E950 0032B8B0 80 9D 00 28 */ lwz r4, 0x28(r29) /* 8032E954 0032B8B4 7D 89 03 A6 */ mtctr r12 -/* 8032E958 0032B8B8 4E 80 04 21 */ bctrl +/* 8032E958 0032B8B8 4E 80 04 21 */ bctrl /* 8032E95C 0032B8BC 80 1D 01 58 */ lwz r0, 0x158(r29) /* 8032E960 0032B8C0 38 61 00 18 */ addi r3, r1, 0x18 /* 8032E964 0032B8C4 80 DD 01 68 */ lwz r6, 0x168(r29) @@ -4597,7 +4597,7 @@ lbl_8032E9A8: /* 8032E9D0 0032B930 7C A0 2A 14 */ add r5, r0, r5 /* 8032E9D4 0032B934 80 9D 00 28 */ lwz r4, 0x28(r29) /* 8032E9D8 0032B938 7D 89 03 A6 */ mtctr r12 -/* 8032E9DC 0032B93C 4E 80 04 21 */ bctrl +/* 8032E9DC 0032B93C 4E 80 04 21 */ bctrl lbl_8032E9E0: /* 8032E9E0 0032B940 80 1D 01 58 */ lwz r0, 0x158(r29) /* 8032E9E4 0032B944 80 7D 01 68 */ lwz r3, 0x168(r29) @@ -4622,7 +4622,7 @@ lbl_8032E9E0: /* 8032EA30 0032B990 7C A0 2A 14 */ add r5, r0, r5 /* 8032EA34 0032B994 80 9D 00 28 */ lwz r4, 0x28(r29) /* 8032EA38 0032B998 7D 89 03 A6 */ mtctr r12 -/* 8032EA3C 0032B99C 4E 80 04 21 */ bctrl +/* 8032EA3C 0032B99C 4E 80 04 21 */ bctrl /* 8032EA40 0032B9A0 48 00 00 34 */ b lbl_8032EA74 lbl_8032EA44: /* 8032EA44 0032B9A4 C0 22 CA 90 */ lfs f1, lbl_805AE7B0@sda21(r2) @@ -4649,7 +4649,7 @@ lbl_8032EA74: /* 8032EA94 0032B9F4 80 9D 00 28 */ lwz r4, 0x28(r29) /* 8032EA98 0032B9F8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8032EA9C 0032B9FC 7D 89 03 A6 */ mtctr r12 -/* 8032EAA0 0032BA00 4E 80 04 21 */ bctrl +/* 8032EAA0 0032BA00 4E 80 04 21 */ bctrl lbl_8032EAA4: /* 8032EAA4 0032BA04 80 61 00 10 */ lwz r3, 0x10(r1) /* 8032EAA8 0032BA08 3C 00 43 30 */ lis r0, 0x4330 @@ -4723,7 +4723,7 @@ lbl_8032EB88: /* 8032EBA4 0032BB04 83 A1 00 44 */ lwz r29, 0x44(r1) /* 8032EBA8 0032BB08 7C 08 03 A6 */ mtlr r0 /* 8032EBAC 0032BB0C 38 21 00 70 */ addi r1, r1, 0x70 -/* 8032EBB0 0032BB10 4E 80 00 20 */ blr +/* 8032EBB0 0032BB10 4E 80 00 20 */ blr .global IsLargeEnough__15CParticleSwooshCFv IsLargeEnough__15CParticleSwooshCFv: @@ -4737,7 +4737,7 @@ IsLargeEnough__15CParticleSwooshCFv: /* 8032EBD0 0032BB30 38 80 00 01 */ li r4, 1 lbl_8032EBD4: /* 8032EBD4 0032BB34 7C 83 23 78 */ mr r3, r4 -/* 8032EBD8 0032BB38 4E 80 00 20 */ blr +/* 8032EBD8 0032BB38 4E 80 00 20 */ blr .global __dt__15CParticleSwooshFv __dt__15CParticleSwooshFv: @@ -4888,7 +4888,7 @@ lbl_8032EDC8: /* 8032EDD4 0032BD34 83 C1 00 58 */ lwz r30, 0x58(r1) /* 8032EDD8 0032BD38 7C 08 03 A6 */ mtlr r0 /* 8032EDDC 0032BD3C 38 21 00 60 */ addi r1, r1, 0x60 -/* 8032EDE0 0032BD40 4E 80 00 20 */ blr +/* 8032EDE0 0032BD40 4E 80 00 20 */ blr .global "__ct__15CParticleSwooshF28TToken<18CSwooshDescription>i" "__ct__15CParticleSwooshF28TToken<18CSwooshDescription>i": @@ -5073,7 +5073,7 @@ lbl_8032F088: /* 8032F0A0 0032C000 38 80 00 00 */ li r4, 0 /* 8032F0A4 0032C004 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8032F0A8 0032C008 7D 89 03 A6 */ mtctr r12 -/* 8032F0AC 0032C00C 4E 80 04 21 */ bctrl +/* 8032F0AC 0032C00C 4E 80 04 21 */ bctrl lbl_8032F0B0: /* 8032F0B0 0032C010 80 7F 01 B4 */ lwz r3, 0x1b4(r31) /* 8032F0B4 0032C014 38 03 00 01 */ addi r0, r3, 1 @@ -5087,7 +5087,7 @@ lbl_8032F0B0: /* 8032F0D4 0032C034 38 80 00 00 */ li r4, 0 /* 8032F0D8 0032C038 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8032F0DC 0032C03C 7D 89 03 A6 */ mtctr r12 -/* 8032F0E0 0032C040 4E 80 04 21 */ bctrl +/* 8032F0E0 0032C040 4E 80 04 21 */ bctrl lbl_8032F0E4: /* 8032F0E4 0032C044 80 9F 00 24 */ lwz r4, 0x24(r31) /* 8032F0E8 0032C048 7F E3 FB 78 */ mr r3, r31 @@ -5117,7 +5117,7 @@ lbl_8032F0E4: /* 8032F148 0032C0A8 38 80 00 00 */ li r4, 0 /* 8032F14C 0032C0AC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8032F150 0032C0B0 7D 89 03 A6 */ mtctr r12 -/* 8032F154 0032C0B4 4E 80 04 21 */ bctrl +/* 8032F154 0032C0B4 4E 80 04 21 */ bctrl /* 8032F158 0032C0B8 48 00 00 10 */ b lbl_8032F168 lbl_8032F15C: /* 8032F15C 0032C0BC 3C 60 00 80 */ lis r3, 0x007FFFFF@ha @@ -5138,7 +5138,7 @@ lbl_8032F168: /* 8032F194 0032C0F4 38 80 00 00 */ li r4, 0 /* 8032F198 0032C0F8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8032F19C 0032C0FC 7D 89 03 A6 */ mtctr r12 -/* 8032F1A0 0032C100 4E 80 04 21 */ bctrl +/* 8032F1A0 0032C100 4E 80 04 21 */ bctrl lbl_8032F1A4: /* 8032F1A4 0032C104 80 1F 01 B0 */ lwz r0, 0x1b0(r31) /* 8032F1A8 0032C108 2C 00 00 00 */ cmpwi r0, 0 @@ -5206,7 +5206,7 @@ lbl_8032F274: /* 8032F28C 0032C1EC 81 8C 00 14 */ lwz r12, 0x14(r12) /* 8032F290 0032C1F0 38 84 66 70 */ addi r4, r4, skIdentity4f@l /* 8032F294 0032C1F4 7D 89 03 A6 */ mtctr r12 -/* 8032F298 0032C1F8 4E 80 04 21 */ bctrl +/* 8032F298 0032C1F8 4E 80 04 21 */ bctrl /* 8032F29C 0032C1FC 80 1F 01 70 */ lwz r0, 0x170(r31) /* 8032F2A0 0032C200 80 7F 01 78 */ lwz r3, 0x178(r31) /* 8032F2A4 0032C204 1C 00 00 0C */ mulli r0, r0, 0xc @@ -5436,7 +5436,7 @@ lbl_8032F59C: /* 8032F5B0 0032C510 80 01 01 04 */ lwz r0, 0x104(r1) /* 8032F5B4 0032C514 7C 08 03 A6 */ mtlr r0 /* 8032F5B8 0032C518 38 21 01 00 */ addi r1, r1, 0x100 -/* 8032F5BC 0032C51C 4E 80 00 20 */ blr +/* 8032F5BC 0032C51C 4E 80 00 20 */ blr .global sub_8032f5c0 sub_8032f5c0: @@ -5472,7 +5472,7 @@ lbl_8032F600: /* 8032F62C 0032C58C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8032F630 0032C590 7C 08 03 A6 */ mtlr r0 /* 8032F634 0032C594 38 21 00 10 */ addi r1, r1, 0x10 -/* 8032F638 0032C598 4E 80 00 20 */ blr +/* 8032F638 0032C598 4E 80 00 20 */ blr .global sub_8032f63c sub_8032f63c: @@ -5486,7 +5486,7 @@ lbl_8032F654: /* 8032F654 0032C5B4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8032F658 0032C5B8 7C 08 03 A6 */ mtlr r0 /* 8032F65C 0032C5BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8032F660 0032C5C0 4E 80 00 20 */ blr +/* 8032F660 0032C5C0 4E 80 00 20 */ blr .global sub_8032f664 sub_8032f664: @@ -5546,7 +5546,7 @@ sub_8032f664: /* 8032F738 0032C698 80 01 00 14 */ lwz r0, 0x14(r1) /* 8032F73C 0032C69C 7C 08 03 A6 */ mtlr r0 /* 8032F740 0032C6A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8032F744 0032C6A4 4E 80 00 20 */ blr +/* 8032F744 0032C6A4 4E 80 00 20 */ blr .global __ct__Q215CParticleSwoosh11SSwooshDataFRC9CVector3fRC9CVector3fffibRC12CTransform4fRC9CVector3fffRC6CColor __ct__Q215CParticleSwoosh11SSwooshDataFRC9CVector3fRC9CVector3fffibRC12CTransform4fRC9CVector3fffRC6CColor: @@ -5604,7 +5604,7 @@ __ct__Q215CParticleSwoosh11SSwooshDataFRC9CVector3fRC9CVector3fffibRC12CTransfor /* 8032F814 0032C774 80 01 00 24 */ lwz r0, 0x24(r1) /* 8032F818 0032C778 7C 08 03 A6 */ mtlr r0 /* 8032F81C 0032C77C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8032F820 0032C780 4E 80 00 20 */ blr +/* 8032F820 0032C780 4E 80 00 20 */ blr .global sub_8032f824 sub_8032f824: @@ -5667,7 +5667,7 @@ lbl_8032F8E0: /* 8032F8EC 0032C84C 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8032F8F0 0032C850 7C 08 03 A6 */ mtlr r0 /* 8032F8F4 0032C854 38 21 00 30 */ addi r1, r1, 0x30 -/* 8032F8F8 0032C858 4E 80 00 20 */ blr +/* 8032F8F8 0032C858 4E 80 00 20 */ blr .global sub_8032f8fc sub_8032f8fc: diff --git a/asm/Kyoto/Particles/CParticleSwooshDataFactory.s b/asm/Kyoto/Particles/CParticleSwooshDataFactory.s index fc0dd261..460123f1 100644 --- a/asm/Kyoto/Particles/CParticleSwooshDataFactory.s +++ b/asm/Kyoto/Particles/CParticleSwooshDataFactory.s @@ -371,7 +371,7 @@ lbl_8032FE2C: /* 8032FE30 0032CD90 80 01 00 34 */ lwz r0, 0x34(r1) /* 8032FE34 0032CD94 7C 08 03 A6 */ mtlr r0 /* 8032FE38 0032CD98 38 21 00 30 */ addi r1, r1, 0x30 -/* 8032FE3C 0032CD9C 4E 80 00 20 */ blr +/* 8032FE3C 0032CD9C 4E 80 00 20 */ blr .global CreateGeneratorDescription__26CParticleSwooshDataFactoryFR12CInputStreamP11CSimplePool CreateGeneratorDescription__26CParticleSwooshDataFactoryFR12CInputStreamP11CSimplePool: @@ -412,7 +412,7 @@ lbl_8032FEB0: /* 8032FEBC 0032CE1C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8032FEC0 0032CE20 7C 08 03 A6 */ mtlr r0 /* 8032FEC4 0032CE24 38 21 00 20 */ addi r1, r1, 0x20 -/* 8032FEC8 0032CE28 4E 80 00 20 */ blr +/* 8032FEC8 0032CE28 4E 80 00 20 */ blr .global GetGeneratorDesc__26CParticleSwooshDataFactoryFR12CInputStreamP11CSimplePool GetGeneratorDesc__26CParticleSwooshDataFactoryFR12CInputStreamP11CSimplePool: @@ -451,7 +451,7 @@ lbl_8032FF38: /* 8032FF40 0032CEA0 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8032FF44 0032CEA4 7C 08 03 A6 */ mtlr r0 /* 8032FF48 0032CEA8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8032FF4C 0032CEAC 4E 80 00 20 */ blr +/* 8032FF4C 0032CEAC 4E 80 00 20 */ blr .global "__dt__46TObjOwnerDerivedFromIObj<18CSwooshDescription>Fv" "__dt__46TObjOwnerDerivedFromIObj<18CSwooshDescription>Fv": @@ -493,7 +493,7 @@ lbl_8032FFC4: /* 8032FFD0 0032CF30 83 C1 00 08 */ lwz r30, 8(r1) /* 8032FFD4 0032CF34 7C 08 03 A6 */ mtlr r0 /* 8032FFD8 0032CF38 38 21 00 10 */ addi r1, r1, 0x10 -/* 8032FFDC 0032CF3C 4E 80 00 20 */ blr +/* 8032FFDC 0032CF3C 4E 80 00 20 */ blr .global FParticleSwooshDataFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer FParticleSwooshDataFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer: @@ -538,7 +538,7 @@ FParticleSwooshDataFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer: /* 80330078 0032CFD8 38 80 00 01 */ li r4, 1 /* 8033007C 0032CFDC 81 8C 00 08 */ lwz r12, 8(r12) /* 80330080 0032CFE0 7D 89 03 A6 */ mtctr r12 -/* 80330084 0032CFE4 4E 80 04 21 */ bctrl +/* 80330084 0032CFE4 4E 80 04 21 */ bctrl lbl_80330088: /* 80330088 0032CFE8 88 01 00 0C */ lbz r0, 0xc(r1) /* 8033008C 0032CFEC 28 00 00 00 */ cmplwi r0, 0 @@ -553,7 +553,7 @@ lbl_803300A0: /* 803300AC 0032D00C 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 803300B0 0032D010 7C 08 03 A6 */ mtlr r0 /* 803300B4 0032D014 38 21 00 30 */ addi r1, r1, 0x30 -/* 803300B8 0032D018 4E 80 00 20 */ blr +/* 803300B8 0032D018 4E 80 00 20 */ blr .global "GetIObjObjectFor__28TToken<18CSwooshDescription>FRCQ24rstl30auto_ptr<18CSwooshDescription>" "GetIObjObjectFor__28TToken<18CSwooshDescription>FRCQ24rstl30auto_ptr<18CSwooshDescription>": @@ -567,7 +567,7 @@ lbl_803300A0: /* 803300D8 0032D038 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803300DC 0032D03C 7C 08 03 A6 */ mtlr r0 /* 803300E0 0032D040 38 21 00 10 */ addi r1, r1, 0x10 -/* 803300E4 0032D044 4E 80 00 20 */ blr +/* 803300E4 0032D044 4E 80 00 20 */ blr .global sub_803300e8 sub_803300e8: diff --git a/asm/Kyoto/Particles/CRealElement.s b/asm/Kyoto/Particles/CRealElement.s index 4bb64a09..9cfd3f03 100644 --- a/asm/Kyoto/Particles/CRealElement.s +++ b/asm/Kyoto/Particles/CRealElement.s @@ -384,14 +384,14 @@ GetValue__15CREIntTimesRealCFiRf: /* 803301C0 0032D120 81 83 00 00 */ lwz r12, 0(r3) /* 803301C4 0032D124 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803301C8 0032D128 7D 89 03 A6 */ mtctr r12 -/* 803301CC 0032D12C 4E 80 04 21 */ bctrl +/* 803301CC 0032D12C 4E 80 04 21 */ bctrl /* 803301D0 0032D130 80 7D 00 04 */ lwz r3, 4(r29) /* 803301D4 0032D134 7F C4 F3 78 */ mr r4, r30 /* 803301D8 0032D138 38 A1 00 0C */ addi r5, r1, 0xc /* 803301DC 0032D13C 81 83 00 00 */ lwz r12, 0(r3) /* 803301E0 0032D140 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803301E4 0032D144 7D 89 03 A6 */ mtctr r12 -/* 803301E8 0032D148 4E 80 04 21 */ bctrl +/* 803301E8 0032D148 4E 80 04 21 */ bctrl /* 803301EC 0032D14C 80 81 00 0C */ lwz r4, 0xc(r1) /* 803301F0 0032D150 3C 00 43 30 */ lis r0, 0x4330 /* 803301F4 0032D154 90 01 00 10 */ stw r0, 0x10(r1) @@ -410,7 +410,7 @@ GetValue__15CREIntTimesRealCFiRf: /* 80330228 0032D188 80 01 00 34 */ lwz r0, 0x34(r1) /* 8033022C 0032D18C 7C 08 03 A6 */ mtlr r0 /* 80330230 0032D190 38 21 00 30 */ addi r1, r1, 0x30 -/* 80330234 0032D194 4E 80 00 20 */ blr +/* 80330234 0032D194 4E 80 00 20 */ blr .global __dt__15CREIntTimesReal __dt__15CREIntTimesReal: @@ -432,7 +432,7 @@ __dt__15CREIntTimesReal: /* 80330274 0032D1D4 38 80 00 01 */ li r4, 1 /* 80330278 0032D1D8 81 8C 00 08 */ lwz r12, 8(r12) /* 8033027C 0032D1DC 7D 89 03 A6 */ mtctr r12 -/* 80330280 0032D1E0 4E 80 04 21 */ bctrl +/* 80330280 0032D1E0 4E 80 04 21 */ bctrl lbl_80330284: /* 80330284 0032D1E4 80 7E 00 08 */ lwz r3, 8(r30) /* 80330288 0032D1E8 28 03 00 00 */ cmplwi r3, 0 @@ -441,7 +441,7 @@ lbl_80330284: /* 80330294 0032D1F4 38 80 00 01 */ li r4, 1 /* 80330298 0032D1F8 81 8C 00 08 */ lwz r12, 8(r12) /* 8033029C 0032D1FC 7D 89 03 A6 */ mtctr r12 -/* 803302A0 0032D200 4E 80 04 21 */ bctrl +/* 803302A0 0032D200 4E 80 04 21 */ bctrl lbl_803302A4: /* 803302A4 0032D204 28 1E 00 00 */ cmplwi r30, 0 /* 803302A8 0032D208 41 82 00 20 */ beq lbl_803302C8 @@ -465,7 +465,7 @@ lbl_803302DC: /* 803302E8 0032D248 83 C1 00 08 */ lwz r30, 8(r1) /* 803302EC 0032D24C 7C 08 03 A6 */ mtlr r0 /* 803302F0 0032D250 38 21 00 10 */ addi r1, r1, 0x10 -/* 803302F4 0032D254 4E 80 00 20 */ blr +/* 803302F4 0032D254 4E 80 00 20 */ blr .global __ct__15CREIntTimesRealFP12CRealElementP11CIntElement __ct__15CREIntTimesRealFP12CRealElementP11CIntElement: @@ -480,7 +480,7 @@ __ct__15CREIntTimesRealFP12CRealElementP11CIntElement: /* 80330318 0032D278 90 03 00 00 */ stw r0, 0(r3) /* 8033031C 0032D27C 90 83 00 04 */ stw r4, 4(r3) /* 80330320 0032D280 90 A3 00 08 */ stw r5, 8(r3) -/* 80330324 0032D284 4E 80 00 20 */ blr +/* 80330324 0032D284 4E 80 00 20 */ blr .global GetValue__20CREGetComponentAlphaCFiRf GetValue__20CREGetComponentAlphaCFiRf: @@ -502,7 +502,7 @@ GetValue__20CREGetComponentAlphaCFiRf: /* 80330364 0032D2C4 81 83 00 00 */ lwz r12, 0(r3) /* 80330368 0032D2C8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8033036C 0032D2CC 7D 89 03 A6 */ mtctr r12 -/* 80330370 0032D2D0 4E 80 04 21 */ bctrl +/* 80330370 0032D2D0 4E 80 04 21 */ bctrl /* 80330374 0032D2D4 E0 21 A0 0B */ psq_l f1, 11(r1), 1, qr2 /* 80330378 0032D2D8 38 60 00 00 */ li r3, 0 /* 8033037C 0032D2DC C0 02 CB 28 */ lfs f0, lbl_805AE848@sda21(r2) @@ -514,7 +514,7 @@ GetValue__20CREGetComponentAlphaCFiRf: /* 80330394 0032D2F4 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80330398 0032D2F8 7C 08 03 A6 */ mtlr r0 /* 8033039C 0032D2FC 38 21 00 20 */ addi r1, r1, 0x20 -/* 803303A0 0032D300 4E 80 00 20 */ blr +/* 803303A0 0032D300 4E 80 00 20 */ blr .global __dt__20CREGetComponentAlpha __dt__20CREGetComponentAlpha: @@ -536,7 +536,7 @@ __dt__20CREGetComponentAlpha: /* 803303E0 0032D340 38 80 00 01 */ li r4, 1 /* 803303E4 0032D344 81 8C 00 08 */ lwz r12, 8(r12) /* 803303E8 0032D348 7D 89 03 A6 */ mtctr r12 -/* 803303EC 0032D34C 4E 80 04 21 */ bctrl +/* 803303EC 0032D34C 4E 80 04 21 */ bctrl lbl_803303F0: /* 803303F0 0032D350 28 1E 00 00 */ cmplwi r30, 0 /* 803303F4 0032D354 41 82 00 20 */ beq lbl_80330414 @@ -560,7 +560,7 @@ lbl_80330428: /* 80330434 0032D394 83 C1 00 08 */ lwz r30, 8(r1) /* 80330438 0032D398 7C 08 03 A6 */ mtlr r0 /* 8033043C 0032D39C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80330440 0032D3A0 4E 80 00 20 */ blr +/* 80330440 0032D3A0 4E 80 00 20 */ blr .global __ct__20CREGetComponentAlphaFP13CColorElement __ct__20CREGetComponentAlphaFP13CColorElement: @@ -574,7 +574,7 @@ __ct__20CREGetComponentAlphaFP13CColorElement: /* 80330460 0032D3C0 90 C3 00 00 */ stw r6, 0(r3) /* 80330464 0032D3C4 90 03 00 00 */ stw r0, 0(r3) /* 80330468 0032D3C8 90 83 00 04 */ stw r4, 4(r3) -/* 8033046C 0032D3CC 4E 80 00 20 */ blr +/* 8033046C 0032D3CC 4E 80 00 20 */ blr .global GetValue__19CREGetComponentBlueCFiRf GetValue__19CREGetComponentBlueCFiRf: @@ -596,7 +596,7 @@ GetValue__19CREGetComponentBlueCFiRf: /* 803304AC 0032D40C 81 83 00 00 */ lwz r12, 0(r3) /* 803304B0 0032D410 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803304B4 0032D414 7D 89 03 A6 */ mtctr r12 -/* 803304B8 0032D418 4E 80 04 21 */ bctrl +/* 803304B8 0032D418 4E 80 04 21 */ bctrl /* 803304BC 0032D41C E0 21 A0 0A */ psq_l f1, 10(r1), 1, qr2 /* 803304C0 0032D420 38 60 00 00 */ li r3, 0 /* 803304C4 0032D424 C0 02 CB 28 */ lfs f0, lbl_805AE848@sda21(r2) @@ -608,7 +608,7 @@ GetValue__19CREGetComponentBlueCFiRf: /* 803304DC 0032D43C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 803304E0 0032D440 7C 08 03 A6 */ mtlr r0 /* 803304E4 0032D444 38 21 00 20 */ addi r1, r1, 0x20 -/* 803304E8 0032D448 4E 80 00 20 */ blr +/* 803304E8 0032D448 4E 80 00 20 */ blr .global __dt__19CREGetComponentBlue __dt__19CREGetComponentBlue: @@ -630,7 +630,7 @@ __dt__19CREGetComponentBlue: /* 80330528 0032D488 38 80 00 01 */ li r4, 1 /* 8033052C 0032D48C 81 8C 00 08 */ lwz r12, 8(r12) /* 80330530 0032D490 7D 89 03 A6 */ mtctr r12 -/* 80330534 0032D494 4E 80 04 21 */ bctrl +/* 80330534 0032D494 4E 80 04 21 */ bctrl lbl_80330538: /* 80330538 0032D498 28 1E 00 00 */ cmplwi r30, 0 /* 8033053C 0032D49C 41 82 00 20 */ beq lbl_8033055C @@ -654,7 +654,7 @@ lbl_80330570: /* 8033057C 0032D4DC 83 C1 00 08 */ lwz r30, 8(r1) /* 80330580 0032D4E0 7C 08 03 A6 */ mtlr r0 /* 80330584 0032D4E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80330588 0032D4E8 4E 80 00 20 */ blr +/* 80330588 0032D4E8 4E 80 00 20 */ blr .global __ct__19CREGetComponentBlueFP13CColorElement __ct__19CREGetComponentBlueFP13CColorElement: @@ -668,7 +668,7 @@ __ct__19CREGetComponentBlueFP13CColorElement: /* 803305A8 0032D508 90 C3 00 00 */ stw r6, 0(r3) /* 803305AC 0032D50C 90 03 00 00 */ stw r0, 0(r3) /* 803305B0 0032D510 90 83 00 04 */ stw r4, 4(r3) -/* 803305B4 0032D514 4E 80 00 20 */ blr +/* 803305B4 0032D514 4E 80 00 20 */ blr .global GetValue__20CREGetComponentGreenCFiRf GetValue__20CREGetComponentGreenCFiRf: @@ -690,7 +690,7 @@ GetValue__20CREGetComponentGreenCFiRf: /* 803305F4 0032D554 81 83 00 00 */ lwz r12, 0(r3) /* 803305F8 0032D558 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803305FC 0032D55C 7D 89 03 A6 */ mtctr r12 -/* 80330600 0032D560 4E 80 04 21 */ bctrl +/* 80330600 0032D560 4E 80 04 21 */ bctrl /* 80330604 0032D564 E0 21 A0 09 */ psq_l f1, 9(r1), 1, qr2 /* 80330608 0032D568 38 60 00 00 */ li r3, 0 /* 8033060C 0032D56C C0 02 CB 28 */ lfs f0, lbl_805AE848@sda21(r2) @@ -702,7 +702,7 @@ GetValue__20CREGetComponentGreenCFiRf: /* 80330624 0032D584 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80330628 0032D588 7C 08 03 A6 */ mtlr r0 /* 8033062C 0032D58C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80330630 0032D590 4E 80 00 20 */ blr +/* 80330630 0032D590 4E 80 00 20 */ blr .global __dt__20CREGetComponentGreen __dt__20CREGetComponentGreen: @@ -724,7 +724,7 @@ __dt__20CREGetComponentGreen: /* 80330670 0032D5D0 38 80 00 01 */ li r4, 1 /* 80330674 0032D5D4 81 8C 00 08 */ lwz r12, 8(r12) /* 80330678 0032D5D8 7D 89 03 A6 */ mtctr r12 -/* 8033067C 0032D5DC 4E 80 04 21 */ bctrl +/* 8033067C 0032D5DC 4E 80 04 21 */ bctrl lbl_80330680: /* 80330680 0032D5E0 28 1E 00 00 */ cmplwi r30, 0 /* 80330684 0032D5E4 41 82 00 20 */ beq lbl_803306A4 @@ -748,7 +748,7 @@ lbl_803306B8: /* 803306C4 0032D624 83 C1 00 08 */ lwz r30, 8(r1) /* 803306C8 0032D628 7C 08 03 A6 */ mtlr r0 /* 803306CC 0032D62C 38 21 00 10 */ addi r1, r1, 0x10 -/* 803306D0 0032D630 4E 80 00 20 */ blr +/* 803306D0 0032D630 4E 80 00 20 */ blr .global __ct__20CREGetComponentGreenFP13CColorElement __ct__20CREGetComponentGreenFP13CColorElement: @@ -762,7 +762,7 @@ __ct__20CREGetComponentGreenFP13CColorElement: /* 803306F0 0032D650 90 C3 00 00 */ stw r6, 0(r3) /* 803306F4 0032D654 90 03 00 00 */ stw r0, 0(r3) /* 803306F8 0032D658 90 83 00 04 */ stw r4, 4(r3) -/* 803306FC 0032D65C 4E 80 00 20 */ blr +/* 803306FC 0032D65C 4E 80 00 20 */ blr .global GetValue__18CREGetComponentRedCFiRf GetValue__18CREGetComponentRedCFiRf: @@ -784,7 +784,7 @@ GetValue__18CREGetComponentRedCFiRf: /* 8033073C 0032D69C 81 83 00 00 */ lwz r12, 0(r3) /* 80330740 0032D6A0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80330744 0032D6A4 7D 89 03 A6 */ mtctr r12 -/* 80330748 0032D6A8 4E 80 04 21 */ bctrl +/* 80330748 0032D6A8 4E 80 04 21 */ bctrl /* 8033074C 0032D6AC E0 21 A0 08 */ psq_l f1, 8(r1), 1, qr2 /* 80330750 0032D6B0 38 60 00 00 */ li r3, 0 /* 80330754 0032D6B4 C0 02 CB 28 */ lfs f0, lbl_805AE848@sda21(r2) @@ -796,7 +796,7 @@ GetValue__18CREGetComponentRedCFiRf: /* 8033076C 0032D6CC 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80330770 0032D6D0 7C 08 03 A6 */ mtlr r0 /* 80330774 0032D6D4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80330778 0032D6D8 4E 80 00 20 */ blr +/* 80330778 0032D6D8 4E 80 00 20 */ blr .global __dt__18CREGetComponentRed __dt__18CREGetComponentRed: @@ -818,7 +818,7 @@ __dt__18CREGetComponentRed: /* 803307B8 0032D718 38 80 00 01 */ li r4, 1 /* 803307BC 0032D71C 81 8C 00 08 */ lwz r12, 8(r12) /* 803307C0 0032D720 7D 89 03 A6 */ mtctr r12 -/* 803307C4 0032D724 4E 80 04 21 */ bctrl +/* 803307C4 0032D724 4E 80 04 21 */ bctrl lbl_803307C8: /* 803307C8 0032D728 28 1E 00 00 */ cmplwi r30, 0 /* 803307CC 0032D72C 41 82 00 20 */ beq lbl_803307EC @@ -842,7 +842,7 @@ lbl_80330800: /* 8033080C 0032D76C 83 C1 00 08 */ lwz r30, 8(r1) /* 80330810 0032D770 7C 08 03 A6 */ mtlr r0 /* 80330814 0032D774 38 21 00 10 */ addi r1, r1, 0x10 -/* 80330818 0032D778 4E 80 00 20 */ blr +/* 80330818 0032D778 4E 80 00 20 */ blr .global __ct__18CREGetComponentRedFP13CColorElement __ct__18CREGetComponentRedFP13CColorElement: @@ -856,7 +856,7 @@ __ct__18CREGetComponentRedFP13CColorElement: /* 80330838 0032D798 90 C3 00 00 */ stw r6, 0(r3) /* 8033083C 0032D79C 90 03 00 00 */ stw r0, 0(r3) /* 80330840 0032D7A0 90 83 00 04 */ stw r4, 4(r3) -/* 80330844 0032D7A4 4E 80 00 20 */ blr +/* 80330844 0032D7A4 4E 80 00 20 */ blr .global GetValue__11CRESubtractCFiRf GetValue__11CRESubtractCFiRf: @@ -877,14 +877,14 @@ GetValue__11CRESubtractCFiRf: /* 80330880 0032D7E0 81 83 00 00 */ lwz r12, 0(r3) /* 80330884 0032D7E4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80330888 0032D7E8 7D 89 03 A6 */ mtctr r12 -/* 8033088C 0032D7EC 4E 80 04 21 */ bctrl +/* 8033088C 0032D7EC 4E 80 04 21 */ bctrl /* 80330890 0032D7F0 80 7D 00 08 */ lwz r3, 8(r29) /* 80330894 0032D7F4 7F C4 F3 78 */ mr r4, r30 /* 80330898 0032D7F8 38 A1 00 08 */ addi r5, r1, 8 /* 8033089C 0032D7FC 81 83 00 00 */ lwz r12, 0(r3) /* 803308A0 0032D800 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803308A4 0032D804 7D 89 03 A6 */ mtctr r12 -/* 803308A8 0032D808 4E 80 04 21 */ bctrl +/* 803308A8 0032D808 4E 80 04 21 */ bctrl /* 803308AC 0032D80C C0 21 00 0C */ lfs f1, 0xc(r1) /* 803308B0 0032D810 38 60 00 00 */ li r3, 0 /* 803308B4 0032D814 C0 01 00 08 */ lfs f0, 8(r1) @@ -896,7 +896,7 @@ GetValue__11CRESubtractCFiRf: /* 803308CC 0032D82C 80 01 00 24 */ lwz r0, 0x24(r1) /* 803308D0 0032D830 7C 08 03 A6 */ mtlr r0 /* 803308D4 0032D834 38 21 00 20 */ addi r1, r1, 0x20 -/* 803308D8 0032D838 4E 80 00 20 */ blr +/* 803308D8 0032D838 4E 80 00 20 */ blr .global __dt__11CRESubtract __dt__11CRESubtract: @@ -918,7 +918,7 @@ __dt__11CRESubtract: /* 80330918 0032D878 38 80 00 01 */ li r4, 1 /* 8033091C 0032D87C 81 8C 00 08 */ lwz r12, 8(r12) /* 80330920 0032D880 7D 89 03 A6 */ mtctr r12 -/* 80330924 0032D884 4E 80 04 21 */ bctrl +/* 80330924 0032D884 4E 80 04 21 */ bctrl lbl_80330928: /* 80330928 0032D888 80 7E 00 08 */ lwz r3, 8(r30) /* 8033092C 0032D88C 28 03 00 00 */ cmplwi r3, 0 @@ -927,7 +927,7 @@ lbl_80330928: /* 80330938 0032D898 38 80 00 01 */ li r4, 1 /* 8033093C 0032D89C 81 8C 00 08 */ lwz r12, 8(r12) /* 80330940 0032D8A0 7D 89 03 A6 */ mtctr r12 -/* 80330944 0032D8A4 4E 80 04 21 */ bctrl +/* 80330944 0032D8A4 4E 80 04 21 */ bctrl lbl_80330948: /* 80330948 0032D8A8 28 1E 00 00 */ cmplwi r30, 0 /* 8033094C 0032D8AC 41 82 00 20 */ beq lbl_8033096C @@ -951,7 +951,7 @@ lbl_80330980: /* 8033098C 0032D8EC 83 C1 00 08 */ lwz r30, 8(r1) /* 80330990 0032D8F0 7C 08 03 A6 */ mtlr r0 /* 80330994 0032D8F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80330998 0032D8F8 4E 80 00 20 */ blr +/* 80330998 0032D8F8 4E 80 00 20 */ blr .global __ct__11CRESubtractFP12CRealElementP12CRealElement __ct__11CRESubtractFP12CRealElementP12CRealElement: @@ -966,7 +966,7 @@ __ct__11CRESubtractFP12CRealElementP12CRealElement: /* 803309BC 0032D91C 90 03 00 00 */ stw r0, 0(r3) /* 803309C0 0032D920 90 83 00 04 */ stw r4, 4(r3) /* 803309C4 0032D924 90 A3 00 08 */ stw r5, 8(r3) -/* 803309C8 0032D928 4E 80 00 20 */ blr +/* 803309C8 0032D928 4E 80 00 20 */ blr .global GetValue__7CRECEXTCFiRf GetValue__7CRECEXTCFiRf: @@ -982,7 +982,7 @@ GetValue__7CRECEXTCFiRf: /* 803309F0 0032D950 81 83 00 00 */ lwz r12, 0(r3) /* 803309F4 0032D954 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803309F8 0032D958 7D 89 03 A6 */ mtctr r12 -/* 803309FC 0032D95C 4E 80 04 21 */ bctrl +/* 803309FC 0032D95C 4E 80 04 21 */ bctrl /* 80330A00 0032D960 80 6D 9D 20 */ lwz r3, lbl_805A88E0@sda21(r13) /* 80330A04 0032D964 38 8D 9D 20 */ addi r4, r13, lbl_805A88E0@sda21 /* 80330A08 0032D968 80 01 00 08 */ lwz r0, 8(r1) @@ -1007,7 +1007,7 @@ lbl_80330A18: /* 80330A50 0032D9B0 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80330A54 0032D9B4 7C 08 03 A6 */ mtlr r0 /* 80330A58 0032D9B8 38 21 00 20 */ addi r1, r1, 0x20 -/* 80330A5C 0032D9BC 4E 80 00 20 */ blr +/* 80330A5C 0032D9BC 4E 80 00 20 */ blr .global __dt__7CRECEXT __dt__7CRECEXT: @@ -1029,7 +1029,7 @@ __dt__7CRECEXT: /* 80330A9C 0032D9FC 38 80 00 01 */ li r4, 1 /* 80330AA0 0032DA00 81 8C 00 08 */ lwz r12, 8(r12) /* 80330AA4 0032DA04 7D 89 03 A6 */ mtctr r12 -/* 80330AA8 0032DA08 4E 80 04 21 */ bctrl +/* 80330AA8 0032DA08 4E 80 04 21 */ bctrl lbl_80330AAC: /* 80330AAC 0032DA0C 28 1E 00 00 */ cmplwi r30, 0 /* 80330AB0 0032DA10 41 82 00 20 */ beq lbl_80330AD0 @@ -1053,7 +1053,7 @@ lbl_80330AE4: /* 80330AF0 0032DA50 83 C1 00 08 */ lwz r30, 8(r1) /* 80330AF4 0032DA54 7C 08 03 A6 */ mtlr r0 /* 80330AF8 0032DA58 38 21 00 10 */ addi r1, r1, 0x10 -/* 80330AFC 0032DA5C 4E 80 00 20 */ blr +/* 80330AFC 0032DA5C 4E 80 00 20 */ blr .global __ct__7CRECEXTFP11CIntElement __ct__7CRECEXTFP11CIntElement: @@ -1067,7 +1067,7 @@ __ct__7CRECEXTFP11CIntElement: /* 80330B1C 0032DA7C 90 C3 00 00 */ stw r6, 0(r3) /* 80330B20 0032DA80 90 03 00 00 */ stw r0, 0(r3) /* 80330B24 0032DA84 90 83 00 04 */ stw r4, 4(r3) -/* 80330B28 0032DA88 4E 80 00 20 */ blr +/* 80330B28 0032DA88 4E 80 00 20 */ blr .global GetValue__16CREConstantRangeCFiRf GetValue__16CREConstantRangeCFiRf: @@ -1085,21 +1085,21 @@ GetValue__16CREConstantRangeCFiRf: /* 80330B58 0032DAB8 81 83 00 00 */ lwz r12, 0(r3) /* 80330B5C 0032DABC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80330B60 0032DAC0 7D 89 03 A6 */ mtctr r12 -/* 80330B64 0032DAC4 4E 80 04 21 */ bctrl +/* 80330B64 0032DAC4 4E 80 04 21 */ bctrl /* 80330B68 0032DAC8 80 7D 00 08 */ lwz r3, 8(r29) /* 80330B6C 0032DACC 7F C4 F3 78 */ mr r4, r30 /* 80330B70 0032DAD0 38 A1 00 0C */ addi r5, r1, 0xc /* 80330B74 0032DAD4 81 83 00 00 */ lwz r12, 0(r3) /* 80330B78 0032DAD8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80330B7C 0032DADC 7D 89 03 A6 */ mtctr r12 -/* 80330B80 0032DAE0 4E 80 04 21 */ bctrl +/* 80330B80 0032DAE0 4E 80 04 21 */ bctrl /* 80330B84 0032DAE4 80 7D 00 0C */ lwz r3, 0xc(r29) /* 80330B88 0032DAE8 7F C4 F3 78 */ mr r4, r30 /* 80330B8C 0032DAEC 38 A1 00 08 */ addi r5, r1, 8 /* 80330B90 0032DAF0 81 83 00 00 */ lwz r12, 0(r3) /* 80330B94 0032DAF4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80330B98 0032DAF8 7D 89 03 A6 */ mtctr r12 -/* 80330B9C 0032DAFC 4E 80 04 21 */ bctrl +/* 80330B9C 0032DAFC 4E 80 04 21 */ bctrl /* 80330BA0 0032DB00 C0 21 00 10 */ lfs f1, 0x10(r1) /* 80330BA4 0032DB04 C0 01 00 0C */ lfs f0, 0xc(r1) /* 80330BA8 0032DB08 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -1113,7 +1113,7 @@ GetValue__16CREConstantRangeCFiRf: /* 80330BC8 0032DB28 81 83 00 00 */ lwz r12, 0(r3) /* 80330BCC 0032DB2C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80330BD0 0032DB30 7D 89 03 A6 */ mtctr r12 -/* 80330BD4 0032DB34 4E 80 04 21 */ bctrl +/* 80330BD4 0032DB34 4E 80 04 21 */ bctrl /* 80330BD8 0032DB38 48 00 00 20 */ b lbl_80330BF8 lbl_80330BDC: /* 80330BDC 0032DB3C 80 7D 00 14 */ lwz r3, 0x14(r29) @@ -1122,7 +1122,7 @@ lbl_80330BDC: /* 80330BE8 0032DB48 81 83 00 00 */ lwz r12, 0(r3) /* 80330BEC 0032DB4C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80330BF0 0032DB50 7D 89 03 A6 */ mtctr r12 -/* 80330BF4 0032DB54 4E 80 04 21 */ bctrl +/* 80330BF4 0032DB54 4E 80 04 21 */ bctrl lbl_80330BF8: /* 80330BF8 0032DB58 80 01 00 34 */ lwz r0, 0x34(r1) /* 80330BFC 0032DB5C 38 60 00 00 */ li r3, 0 @@ -1131,7 +1131,7 @@ lbl_80330BF8: /* 80330C08 0032DB68 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80330C0C 0032DB6C 7C 08 03 A6 */ mtlr r0 /* 80330C10 0032DB70 38 21 00 30 */ addi r1, r1, 0x30 -/* 80330C14 0032DB74 4E 80 00 20 */ blr +/* 80330C14 0032DB74 4E 80 00 20 */ blr .global __dt__16CREConstantRange __dt__16CREConstantRange: @@ -1153,7 +1153,7 @@ __dt__16CREConstantRange: /* 80330C54 0032DBB4 38 80 00 01 */ li r4, 1 /* 80330C58 0032DBB8 81 8C 00 08 */ lwz r12, 8(r12) /* 80330C5C 0032DBBC 7D 89 03 A6 */ mtctr r12 -/* 80330C60 0032DBC0 4E 80 04 21 */ bctrl +/* 80330C60 0032DBC0 4E 80 04 21 */ bctrl lbl_80330C64: /* 80330C64 0032DBC4 80 7E 00 08 */ lwz r3, 8(r30) /* 80330C68 0032DBC8 28 03 00 00 */ cmplwi r3, 0 @@ -1162,7 +1162,7 @@ lbl_80330C64: /* 80330C74 0032DBD4 38 80 00 01 */ li r4, 1 /* 80330C78 0032DBD8 81 8C 00 08 */ lwz r12, 8(r12) /* 80330C7C 0032DBDC 7D 89 03 A6 */ mtctr r12 -/* 80330C80 0032DBE0 4E 80 04 21 */ bctrl +/* 80330C80 0032DBE0 4E 80 04 21 */ bctrl lbl_80330C84: /* 80330C84 0032DBE4 80 7E 00 0C */ lwz r3, 0xc(r30) /* 80330C88 0032DBE8 28 03 00 00 */ cmplwi r3, 0 @@ -1171,7 +1171,7 @@ lbl_80330C84: /* 80330C94 0032DBF4 38 80 00 01 */ li r4, 1 /* 80330C98 0032DBF8 81 8C 00 08 */ lwz r12, 8(r12) /* 80330C9C 0032DBFC 7D 89 03 A6 */ mtctr r12 -/* 80330CA0 0032DC00 4E 80 04 21 */ bctrl +/* 80330CA0 0032DC00 4E 80 04 21 */ bctrl lbl_80330CA4: /* 80330CA4 0032DC04 80 7E 00 10 */ lwz r3, 0x10(r30) /* 80330CA8 0032DC08 28 03 00 00 */ cmplwi r3, 0 @@ -1180,7 +1180,7 @@ lbl_80330CA4: /* 80330CB4 0032DC14 38 80 00 01 */ li r4, 1 /* 80330CB8 0032DC18 81 8C 00 08 */ lwz r12, 8(r12) /* 80330CBC 0032DC1C 7D 89 03 A6 */ mtctr r12 -/* 80330CC0 0032DC20 4E 80 04 21 */ bctrl +/* 80330CC0 0032DC20 4E 80 04 21 */ bctrl lbl_80330CC4: /* 80330CC4 0032DC24 80 7E 00 14 */ lwz r3, 0x14(r30) /* 80330CC8 0032DC28 28 03 00 00 */ cmplwi r3, 0 @@ -1189,7 +1189,7 @@ lbl_80330CC4: /* 80330CD4 0032DC34 38 80 00 01 */ li r4, 1 /* 80330CD8 0032DC38 81 8C 00 08 */ lwz r12, 8(r12) /* 80330CDC 0032DC3C 7D 89 03 A6 */ mtctr r12 -/* 80330CE0 0032DC40 4E 80 04 21 */ bctrl +/* 80330CE0 0032DC40 4E 80 04 21 */ bctrl lbl_80330CE4: /* 80330CE4 0032DC44 28 1E 00 00 */ cmplwi r30, 0 /* 80330CE8 0032DC48 41 82 00 20 */ beq lbl_80330D08 @@ -1213,7 +1213,7 @@ lbl_80330D1C: /* 80330D28 0032DC88 83 C1 00 08 */ lwz r30, 8(r1) /* 80330D2C 0032DC8C 7C 08 03 A6 */ mtlr r0 /* 80330D30 0032DC90 38 21 00 10 */ addi r1, r1, 0x10 -/* 80330D34 0032DC94 4E 80 00 20 */ blr +/* 80330D34 0032DC94 4E 80 00 20 */ blr .global __ct__16CREConstantRangeFP12CRealElementP12CRealElementP12CRealElementP12CRealElementP12CRealElement __ct__16CREConstantRangeFP12CRealElementP12CRealElementP12CRealElementP12CRealElementP12CRealElement: @@ -1231,7 +1231,7 @@ __ct__16CREConstantRangeFP12CRealElementP12CRealElementP12CRealElementP12CRealEl /* 80330D64 0032DCC4 90 C3 00 0C */ stw r6, 0xc(r3) /* 80330D68 0032DCC8 90 E3 00 10 */ stw r7, 0x10(r3) /* 80330D6C 0032DCCC 91 03 00 14 */ stw r8, 0x14(r3) -/* 80330D70 0032DCD0 4E 80 00 20 */ blr +/* 80330D70 0032DCD0 4E 80 00 20 */ blr .global GetValue__15CRECompareEqualCFiRf GetValue__15CRECompareEqualCFiRf: @@ -1249,14 +1249,14 @@ GetValue__15CRECompareEqualCFiRf: /* 80330DA0 0032DD00 81 83 00 00 */ lwz r12, 0(r3) /* 80330DA4 0032DD04 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80330DA8 0032DD08 7D 89 03 A6 */ mtctr r12 -/* 80330DAC 0032DD0C 4E 80 04 21 */ bctrl +/* 80330DAC 0032DD0C 4E 80 04 21 */ bctrl /* 80330DB0 0032DD10 80 7D 00 08 */ lwz r3, 8(r29) /* 80330DB4 0032DD14 7F C4 F3 78 */ mr r4, r30 /* 80330DB8 0032DD18 38 A1 00 08 */ addi r5, r1, 8 /* 80330DBC 0032DD1C 81 83 00 00 */ lwz r12, 0(r3) /* 80330DC0 0032DD20 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80330DC4 0032DD24 7D 89 03 A6 */ mtctr r12 -/* 80330DC8 0032DD28 4E 80 04 21 */ bctrl +/* 80330DC8 0032DD28 4E 80 04 21 */ bctrl /* 80330DCC 0032DD2C C0 41 00 0C */ lfs f2, 0xc(r1) /* 80330DD0 0032DD30 C0 21 00 08 */ lfs f1, 8(r1) /* 80330DD4 0032DD34 C0 02 CB 30 */ lfs f0, lbl_805AE850@sda21(r2) @@ -1270,7 +1270,7 @@ GetValue__15CRECompareEqualCFiRf: /* 80330DF4 0032DD54 81 83 00 00 */ lwz r12, 0(r3) /* 80330DF8 0032DD58 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80330DFC 0032DD5C 7D 89 03 A6 */ mtctr r12 -/* 80330E00 0032DD60 4E 80 04 21 */ bctrl +/* 80330E00 0032DD60 4E 80 04 21 */ bctrl /* 80330E04 0032DD64 48 00 00 20 */ b lbl_80330E24 lbl_80330E08: /* 80330E08 0032DD68 80 7D 00 10 */ lwz r3, 0x10(r29) @@ -1279,7 +1279,7 @@ lbl_80330E08: /* 80330E14 0032DD74 81 83 00 00 */ lwz r12, 0(r3) /* 80330E18 0032DD78 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80330E1C 0032DD7C 7D 89 03 A6 */ mtctr r12 -/* 80330E20 0032DD80 4E 80 04 21 */ bctrl +/* 80330E20 0032DD80 4E 80 04 21 */ bctrl lbl_80330E24: /* 80330E24 0032DD84 80 01 00 24 */ lwz r0, 0x24(r1) /* 80330E28 0032DD88 38 60 00 00 */ li r3, 0 @@ -1288,7 +1288,7 @@ lbl_80330E24: /* 80330E34 0032DD94 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80330E38 0032DD98 7C 08 03 A6 */ mtlr r0 /* 80330E3C 0032DD9C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80330E40 0032DDA0 4E 80 00 20 */ blr +/* 80330E40 0032DDA0 4E 80 00 20 */ blr .global __dt__15CRECompareEqual __dt__15CRECompareEqual: @@ -1310,7 +1310,7 @@ __dt__15CRECompareEqual: /* 80330E80 0032DDE0 38 80 00 01 */ li r4, 1 /* 80330E84 0032DDE4 81 8C 00 08 */ lwz r12, 8(r12) /* 80330E88 0032DDE8 7D 89 03 A6 */ mtctr r12 -/* 80330E8C 0032DDEC 4E 80 04 21 */ bctrl +/* 80330E8C 0032DDEC 4E 80 04 21 */ bctrl lbl_80330E90: /* 80330E90 0032DDF0 80 7E 00 08 */ lwz r3, 8(r30) /* 80330E94 0032DDF4 28 03 00 00 */ cmplwi r3, 0 @@ -1319,7 +1319,7 @@ lbl_80330E90: /* 80330EA0 0032DE00 38 80 00 01 */ li r4, 1 /* 80330EA4 0032DE04 81 8C 00 08 */ lwz r12, 8(r12) /* 80330EA8 0032DE08 7D 89 03 A6 */ mtctr r12 -/* 80330EAC 0032DE0C 4E 80 04 21 */ bctrl +/* 80330EAC 0032DE0C 4E 80 04 21 */ bctrl lbl_80330EB0: /* 80330EB0 0032DE10 80 7E 00 0C */ lwz r3, 0xc(r30) /* 80330EB4 0032DE14 28 03 00 00 */ cmplwi r3, 0 @@ -1328,7 +1328,7 @@ lbl_80330EB0: /* 80330EC0 0032DE20 38 80 00 01 */ li r4, 1 /* 80330EC4 0032DE24 81 8C 00 08 */ lwz r12, 8(r12) /* 80330EC8 0032DE28 7D 89 03 A6 */ mtctr r12 -/* 80330ECC 0032DE2C 4E 80 04 21 */ bctrl +/* 80330ECC 0032DE2C 4E 80 04 21 */ bctrl lbl_80330ED0: /* 80330ED0 0032DE30 80 7E 00 10 */ lwz r3, 0x10(r30) /* 80330ED4 0032DE34 28 03 00 00 */ cmplwi r3, 0 @@ -1337,7 +1337,7 @@ lbl_80330ED0: /* 80330EE0 0032DE40 38 80 00 01 */ li r4, 1 /* 80330EE4 0032DE44 81 8C 00 08 */ lwz r12, 8(r12) /* 80330EE8 0032DE48 7D 89 03 A6 */ mtctr r12 -/* 80330EEC 0032DE4C 4E 80 04 21 */ bctrl +/* 80330EEC 0032DE4C 4E 80 04 21 */ bctrl lbl_80330EF0: /* 80330EF0 0032DE50 28 1E 00 00 */ cmplwi r30, 0 /* 80330EF4 0032DE54 41 82 00 20 */ beq lbl_80330F14 @@ -1361,7 +1361,7 @@ lbl_80330F28: /* 80330F34 0032DE94 83 C1 00 08 */ lwz r30, 8(r1) /* 80330F38 0032DE98 7C 08 03 A6 */ mtlr r0 /* 80330F3C 0032DE9C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80330F40 0032DEA0 4E 80 00 20 */ blr +/* 80330F40 0032DEA0 4E 80 00 20 */ blr .global __ct__15CRECompareEqualFP12CRealElementP12CRealElementP12CRealElementP12CRealElement __ct__15CRECompareEqualFP12CRealElementP12CRealElementP12CRealElementP12CRealElement: @@ -1378,7 +1378,7 @@ __ct__15CRECompareEqualFP12CRealElementP12CRealElementP12CRealElementP12CRealEle /* 80330F6C 0032DECC 90 A3 00 08 */ stw r5, 8(r3) /* 80330F70 0032DED0 90 C3 00 0C */ stw r6, 0xc(r3) /* 80330F74 0032DED4 90 E3 00 10 */ stw r7, 0x10(r3) -/* 80330F78 0032DED8 4E 80 00 20 */ blr +/* 80330F78 0032DED8 4E 80 00 20 */ blr .global GetValue__18CRECompareLessThanCFiRf GetValue__18CRECompareLessThanCFiRf: @@ -1396,14 +1396,14 @@ GetValue__18CRECompareLessThanCFiRf: /* 80330FA8 0032DF08 81 83 00 00 */ lwz r12, 0(r3) /* 80330FAC 0032DF0C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80330FB0 0032DF10 7D 89 03 A6 */ mtctr r12 -/* 80330FB4 0032DF14 4E 80 04 21 */ bctrl +/* 80330FB4 0032DF14 4E 80 04 21 */ bctrl /* 80330FB8 0032DF18 80 7D 00 08 */ lwz r3, 8(r29) /* 80330FBC 0032DF1C 7F C4 F3 78 */ mr r4, r30 /* 80330FC0 0032DF20 38 A1 00 08 */ addi r5, r1, 8 /* 80330FC4 0032DF24 81 83 00 00 */ lwz r12, 0(r3) /* 80330FC8 0032DF28 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80330FCC 0032DF2C 7D 89 03 A6 */ mtctr r12 -/* 80330FD0 0032DF30 4E 80 04 21 */ bctrl +/* 80330FD0 0032DF30 4E 80 04 21 */ bctrl /* 80330FD4 0032DF34 C0 21 00 0C */ lfs f1, 0xc(r1) /* 80330FD8 0032DF38 C0 01 00 08 */ lfs f0, 8(r1) /* 80330FDC 0032DF3C FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -1414,7 +1414,7 @@ GetValue__18CRECompareLessThanCFiRf: /* 80330FF0 0032DF50 81 83 00 00 */ lwz r12, 0(r3) /* 80330FF4 0032DF54 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80330FF8 0032DF58 7D 89 03 A6 */ mtctr r12 -/* 80330FFC 0032DF5C 4E 80 04 21 */ bctrl +/* 80330FFC 0032DF5C 4E 80 04 21 */ bctrl /* 80331000 0032DF60 48 00 00 20 */ b lbl_80331020 lbl_80331004: /* 80331004 0032DF64 80 7D 00 10 */ lwz r3, 0x10(r29) @@ -1423,7 +1423,7 @@ lbl_80331004: /* 80331010 0032DF70 81 83 00 00 */ lwz r12, 0(r3) /* 80331014 0032DF74 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80331018 0032DF78 7D 89 03 A6 */ mtctr r12 -/* 8033101C 0032DF7C 4E 80 04 21 */ bctrl +/* 8033101C 0032DF7C 4E 80 04 21 */ bctrl lbl_80331020: /* 80331020 0032DF80 80 01 00 24 */ lwz r0, 0x24(r1) /* 80331024 0032DF84 38 60 00 00 */ li r3, 0 @@ -1432,7 +1432,7 @@ lbl_80331020: /* 80331030 0032DF90 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80331034 0032DF94 7C 08 03 A6 */ mtlr r0 /* 80331038 0032DF98 38 21 00 20 */ addi r1, r1, 0x20 -/* 8033103C 0032DF9C 4E 80 00 20 */ blr +/* 8033103C 0032DF9C 4E 80 00 20 */ blr .global __dt__18CRECompareLessThan __dt__18CRECompareLessThan: @@ -1454,7 +1454,7 @@ __dt__18CRECompareLessThan: /* 8033107C 0032DFDC 38 80 00 01 */ li r4, 1 /* 80331080 0032DFE0 81 8C 00 08 */ lwz r12, 8(r12) /* 80331084 0032DFE4 7D 89 03 A6 */ mtctr r12 -/* 80331088 0032DFE8 4E 80 04 21 */ bctrl +/* 80331088 0032DFE8 4E 80 04 21 */ bctrl lbl_8033108C: /* 8033108C 0032DFEC 80 7E 00 08 */ lwz r3, 8(r30) /* 80331090 0032DFF0 28 03 00 00 */ cmplwi r3, 0 @@ -1463,7 +1463,7 @@ lbl_8033108C: /* 8033109C 0032DFFC 38 80 00 01 */ li r4, 1 /* 803310A0 0032E000 81 8C 00 08 */ lwz r12, 8(r12) /* 803310A4 0032E004 7D 89 03 A6 */ mtctr r12 -/* 803310A8 0032E008 4E 80 04 21 */ bctrl +/* 803310A8 0032E008 4E 80 04 21 */ bctrl lbl_803310AC: /* 803310AC 0032E00C 80 7E 00 0C */ lwz r3, 0xc(r30) /* 803310B0 0032E010 28 03 00 00 */ cmplwi r3, 0 @@ -1472,7 +1472,7 @@ lbl_803310AC: /* 803310BC 0032E01C 38 80 00 01 */ li r4, 1 /* 803310C0 0032E020 81 8C 00 08 */ lwz r12, 8(r12) /* 803310C4 0032E024 7D 89 03 A6 */ mtctr r12 -/* 803310C8 0032E028 4E 80 04 21 */ bctrl +/* 803310C8 0032E028 4E 80 04 21 */ bctrl lbl_803310CC: /* 803310CC 0032E02C 80 7E 00 10 */ lwz r3, 0x10(r30) /* 803310D0 0032E030 28 03 00 00 */ cmplwi r3, 0 @@ -1481,7 +1481,7 @@ lbl_803310CC: /* 803310DC 0032E03C 38 80 00 01 */ li r4, 1 /* 803310E0 0032E040 81 8C 00 08 */ lwz r12, 8(r12) /* 803310E4 0032E044 7D 89 03 A6 */ mtctr r12 -/* 803310E8 0032E048 4E 80 04 21 */ bctrl +/* 803310E8 0032E048 4E 80 04 21 */ bctrl lbl_803310EC: /* 803310EC 0032E04C 28 1E 00 00 */ cmplwi r30, 0 /* 803310F0 0032E050 41 82 00 20 */ beq lbl_80331110 @@ -1505,7 +1505,7 @@ lbl_80331124: /* 80331130 0032E090 83 C1 00 08 */ lwz r30, 8(r1) /* 80331134 0032E094 7C 08 03 A6 */ mtlr r0 /* 80331138 0032E098 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033113C 0032E09C 4E 80 00 20 */ blr +/* 8033113C 0032E09C 4E 80 00 20 */ blr .global __ct__18CRECompareLessThanFP12CRealElementP12CRealElementP12CRealElementP12CRealElement __ct__18CRECompareLessThanFP12CRealElementP12CRealElementP12CRealElementP12CRealElement: @@ -1522,7 +1522,7 @@ __ct__18CRECompareLessThanFP12CRealElementP12CRealElementP12CRealElementP12CReal /* 80331168 0032E0C8 90 A3 00 08 */ stw r5, 8(r3) /* 8033116C 0032E0CC 90 C3 00 0C */ stw r6, 0xc(r3) /* 80331170 0032E0D0 90 E3 00 10 */ stw r7, 0x10(r3) -/* 80331174 0032E0D4 4E 80 00 20 */ blr +/* 80331174 0032E0D4 4E 80 00 20 */ blr .global GetValue__7CREIWSTGCFiRf GetValue__7CREIWSTGCFiRf: @@ -1536,7 +1536,7 @@ GetValue__7CREIWSTGCFiRf: /* 80331194 0032E0F4 81 83 00 00 */ lwz r12, 0(r3) /* 80331198 0032E0F8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8033119C 0032E0FC 7D 89 03 A6 */ mtctr r12 -/* 803311A0 0032E100 4E 80 04 21 */ bctrl +/* 803311A0 0032E100 4E 80 04 21 */ bctrl /* 803311A4 0032E104 48 00 00 1C */ b lbl_803311C0 lbl_803311A8: /* 803311A8 0032E108 80 63 00 08 */ lwz r3, 8(r3) @@ -1544,13 +1544,13 @@ lbl_803311A8: /* 803311B0 0032E110 81 83 00 00 */ lwz r12, 0(r3) /* 803311B4 0032E114 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803311B8 0032E118 7D 89 03 A6 */ mtctr r12 -/* 803311BC 0032E11C 4E 80 04 21 */ bctrl +/* 803311BC 0032E11C 4E 80 04 21 */ bctrl lbl_803311C0: /* 803311C0 0032E120 80 01 00 14 */ lwz r0, 0x14(r1) /* 803311C4 0032E124 38 60 00 00 */ li r3, 0 /* 803311C8 0032E128 7C 08 03 A6 */ mtlr r0 /* 803311CC 0032E12C 38 21 00 10 */ addi r1, r1, 0x10 -/* 803311D0 0032E130 4E 80 00 20 */ blr +/* 803311D0 0032E130 4E 80 00 20 */ blr .global __dt__7CREIWST __dt__7CREIWST: @@ -1572,7 +1572,7 @@ __dt__7CREIWST: /* 80331210 0032E170 38 80 00 01 */ li r4, 1 /* 80331214 0032E174 81 8C 00 08 */ lwz r12, 8(r12) /* 80331218 0032E178 7D 89 03 A6 */ mtctr r12 -/* 8033121C 0032E17C 4E 80 04 21 */ bctrl +/* 8033121C 0032E17C 4E 80 04 21 */ bctrl lbl_80331220: /* 80331220 0032E180 80 7E 00 08 */ lwz r3, 8(r30) /* 80331224 0032E184 28 03 00 00 */ cmplwi r3, 0 @@ -1581,7 +1581,7 @@ lbl_80331220: /* 80331230 0032E190 38 80 00 01 */ li r4, 1 /* 80331234 0032E194 81 8C 00 08 */ lwz r12, 8(r12) /* 80331238 0032E198 7D 89 03 A6 */ mtctr r12 -/* 8033123C 0032E19C 4E 80 04 21 */ bctrl +/* 8033123C 0032E19C 4E 80 04 21 */ bctrl lbl_80331240: /* 80331240 0032E1A0 28 1E 00 00 */ cmplwi r30, 0 /* 80331244 0032E1A4 41 82 00 20 */ beq lbl_80331264 @@ -1605,7 +1605,7 @@ lbl_80331278: /* 80331284 0032E1E4 83 C1 00 08 */ lwz r30, 8(r1) /* 80331288 0032E1E8 7C 08 03 A6 */ mtlr r0 /* 8033128C 0032E1EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80331290 0032E1F0 4E 80 00 20 */ blr +/* 80331290 0032E1F0 4E 80 00 20 */ blr .global __ct__7CREISWTFP12CRealElementP12CRealElement __ct__7CREISWTFP12CRealElementP12CRealElement: @@ -1620,7 +1620,7 @@ __ct__7CREISWTFP12CRealElementP12CRealElement: /* 803312B4 0032E214 90 03 00 00 */ stw r0, 0(r3) /* 803312B8 0032E218 90 83 00 04 */ stw r4, 4(r3) /* 803312BC 0032E21C 90 A3 00 08 */ stw r5, 8(r3) -/* 803312C0 0032E220 4E 80 00 20 */ blr +/* 803312C0 0032E220 4E 80 00 20 */ blr .global GetValue__18CREVectorMagnitudeCFiRf GetValue__18CREVectorMagnitudeCFiRf: @@ -1641,7 +1641,7 @@ GetValue__18CREVectorMagnitudeCFiRf: /* 803312FC 0032E25C 81 83 00 00 */ lwz r12, 0(r3) /* 80331300 0032E260 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80331304 0032E264 7D 89 03 A6 */ mtctr r12 -/* 80331308 0032E268 4E 80 04 21 */ bctrl +/* 80331308 0032E268 4E 80 04 21 */ bctrl /* 8033130C 0032E26C 38 61 00 08 */ addi r3, r1, 8 /* 80331310 0032E270 4B FE 35 A9 */ bl Magnitude__9CVector3fCFv /* 80331314 0032E274 D0 3F 00 00 */ stfs f1, 0(r31) @@ -1650,7 +1650,7 @@ GetValue__18CREVectorMagnitudeCFiRf: /* 80331320 0032E280 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80331324 0032E284 7C 08 03 A6 */ mtlr r0 /* 80331328 0032E288 38 21 00 20 */ addi r1, r1, 0x20 -/* 8033132C 0032E28C 4E 80 00 20 */ blr +/* 8033132C 0032E28C 4E 80 00 20 */ blr .global __dt__18CREVectorMagnitude __dt__18CREVectorMagnitude: @@ -1672,7 +1672,7 @@ __dt__18CREVectorMagnitude: /* 8033136C 0032E2CC 38 80 00 01 */ li r4, 1 /* 80331370 0032E2D0 81 8C 00 08 */ lwz r12, 8(r12) /* 80331374 0032E2D4 7D 89 03 A6 */ mtctr r12 -/* 80331378 0032E2D8 4E 80 04 21 */ bctrl +/* 80331378 0032E2D8 4E 80 04 21 */ bctrl lbl_8033137C: /* 8033137C 0032E2DC 28 1E 00 00 */ cmplwi r30, 0 /* 80331380 0032E2E0 41 82 00 20 */ beq lbl_803313A0 @@ -1696,7 +1696,7 @@ lbl_803313B4: /* 803313C0 0032E320 83 C1 00 08 */ lwz r30, 8(r1) /* 803313C4 0032E324 7C 08 03 A6 */ mtlr r0 /* 803313C8 0032E328 38 21 00 10 */ addi r1, r1, 0x10 -/* 803313CC 0032E32C 4E 80 00 20 */ blr +/* 803313CC 0032E32C 4E 80 00 20 */ blr .global __ct__18CREVectorMagnitudeFP14CVectorElement __ct__18CREVectorMagnitudeFP14CVectorElement: @@ -1710,7 +1710,7 @@ __ct__18CREVectorMagnitudeFP14CVectorElement: /* 803313EC 0032E34C 90 C3 00 00 */ stw r6, 0(r3) /* 803313F0 0032E350 90 03 00 00 */ stw r0, 0(r3) /* 803313F4 0032E354 90 83 00 04 */ stw r4, 4(r3) -/* 803313F8 0032E358 4E 80 00 20 */ blr +/* 803313F8 0032E358 4E 80 00 20 */ blr .global GetValue__16CREVectorZToRealCFiRf GetValue__16CREVectorZToRealCFiRf: @@ -1731,7 +1731,7 @@ GetValue__16CREVectorZToRealCFiRf: /* 80331434 0032E394 81 83 00 00 */ lwz r12, 0(r3) /* 80331438 0032E398 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8033143C 0032E39C 7D 89 03 A6 */ mtctr r12 -/* 80331440 0032E3A0 4E 80 04 21 */ bctrl +/* 80331440 0032E3A0 4E 80 04 21 */ bctrl /* 80331444 0032E3A4 C0 01 00 10 */ lfs f0, 0x10(r1) /* 80331448 0032E3A8 38 60 00 00 */ li r3, 0 /* 8033144C 0032E3AC D0 1F 00 00 */ stfs f0, 0(r31) @@ -1739,7 +1739,7 @@ GetValue__16CREVectorZToRealCFiRf: /* 80331454 0032E3B4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80331458 0032E3B8 7C 08 03 A6 */ mtlr r0 /* 8033145C 0032E3BC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80331460 0032E3C0 4E 80 00 20 */ blr +/* 80331460 0032E3C0 4E 80 00 20 */ blr .global __dt__16CREVectorZToReal __dt__16CREVectorZToReal: @@ -1761,7 +1761,7 @@ __dt__16CREVectorZToReal: /* 803314A0 0032E400 38 80 00 01 */ li r4, 1 /* 803314A4 0032E404 81 8C 00 08 */ lwz r12, 8(r12) /* 803314A8 0032E408 7D 89 03 A6 */ mtctr r12 -/* 803314AC 0032E40C 4E 80 04 21 */ bctrl +/* 803314AC 0032E40C 4E 80 04 21 */ bctrl lbl_803314B0: /* 803314B0 0032E410 28 1E 00 00 */ cmplwi r30, 0 /* 803314B4 0032E414 41 82 00 20 */ beq lbl_803314D4 @@ -1785,7 +1785,7 @@ lbl_803314E8: /* 803314F4 0032E454 83 C1 00 08 */ lwz r30, 8(r1) /* 803314F8 0032E458 7C 08 03 A6 */ mtlr r0 /* 803314FC 0032E45C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80331500 0032E460 4E 80 00 20 */ blr +/* 80331500 0032E460 4E 80 00 20 */ blr .global __ct__16CREVectorZToRealFP14CVectorElement __ct__16CREVectorZToRealFP14CVectorElement: @@ -1799,7 +1799,7 @@ __ct__16CREVectorZToRealFP14CVectorElement: /* 80331520 0032E480 90 C3 00 00 */ stw r6, 0(r3) /* 80331524 0032E484 90 03 00 00 */ stw r0, 0(r3) /* 80331528 0032E488 90 83 00 04 */ stw r4, 4(r3) -/* 8033152C 0032E48C 4E 80 00 20 */ blr +/* 8033152C 0032E48C 4E 80 00 20 */ blr .global GetValue__16CREVectorYToRealCFiRf GetValue__16CREVectorYToRealCFiRf: @@ -1820,7 +1820,7 @@ GetValue__16CREVectorYToRealCFiRf: /* 80331568 0032E4C8 81 83 00 00 */ lwz r12, 0(r3) /* 8033156C 0032E4CC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80331570 0032E4D0 7D 89 03 A6 */ mtctr r12 -/* 80331574 0032E4D4 4E 80 04 21 */ bctrl +/* 80331574 0032E4D4 4E 80 04 21 */ bctrl /* 80331578 0032E4D8 C0 01 00 0C */ lfs f0, 0xc(r1) /* 8033157C 0032E4DC 38 60 00 00 */ li r3, 0 /* 80331580 0032E4E0 D0 1F 00 00 */ stfs f0, 0(r31) @@ -1828,7 +1828,7 @@ GetValue__16CREVectorYToRealCFiRf: /* 80331588 0032E4E8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8033158C 0032E4EC 7C 08 03 A6 */ mtlr r0 /* 80331590 0032E4F0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80331594 0032E4F4 4E 80 00 20 */ blr +/* 80331594 0032E4F4 4E 80 00 20 */ blr .global __dt__16CREVectorYToReal __dt__16CREVectorYToReal: @@ -1850,7 +1850,7 @@ __dt__16CREVectorYToReal: /* 803315D4 0032E534 38 80 00 01 */ li r4, 1 /* 803315D8 0032E538 81 8C 00 08 */ lwz r12, 8(r12) /* 803315DC 0032E53C 7D 89 03 A6 */ mtctr r12 -/* 803315E0 0032E540 4E 80 04 21 */ bctrl +/* 803315E0 0032E540 4E 80 04 21 */ bctrl lbl_803315E4: /* 803315E4 0032E544 28 1E 00 00 */ cmplwi r30, 0 /* 803315E8 0032E548 41 82 00 20 */ beq lbl_80331608 @@ -1874,7 +1874,7 @@ lbl_8033161C: /* 80331628 0032E588 83 C1 00 08 */ lwz r30, 8(r1) /* 8033162C 0032E58C 7C 08 03 A6 */ mtlr r0 /* 80331630 0032E590 38 21 00 10 */ addi r1, r1, 0x10 -/* 80331634 0032E594 4E 80 00 20 */ blr +/* 80331634 0032E594 4E 80 00 20 */ blr .global __ct__16CREVectorYToRealFP14CVectorElement __ct__16CREVectorYToRealFP14CVectorElement: @@ -1888,7 +1888,7 @@ __ct__16CREVectorYToRealFP14CVectorElement: /* 80331654 0032E5B4 90 C3 00 00 */ stw r6, 0(r3) /* 80331658 0032E5B8 90 03 00 00 */ stw r0, 0(r3) /* 8033165C 0032E5BC 90 83 00 04 */ stw r4, 4(r3) -/* 80331660 0032E5C0 4E 80 00 20 */ blr +/* 80331660 0032E5C0 4E 80 00 20 */ blr .global GetValue__16CREVectorXToRealCFiRf GetValue__16CREVectorXToRealCFiRf: @@ -1909,7 +1909,7 @@ GetValue__16CREVectorXToRealCFiRf: /* 8033169C 0032E5FC 81 83 00 00 */ lwz r12, 0(r3) /* 803316A0 0032E600 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803316A4 0032E604 7D 89 03 A6 */ mtctr r12 -/* 803316A8 0032E608 4E 80 04 21 */ bctrl +/* 803316A8 0032E608 4E 80 04 21 */ bctrl /* 803316AC 0032E60C C0 01 00 08 */ lfs f0, 8(r1) /* 803316B0 0032E610 38 60 00 00 */ li r3, 0 /* 803316B4 0032E614 D0 1F 00 00 */ stfs f0, 0(r31) @@ -1917,7 +1917,7 @@ GetValue__16CREVectorXToRealCFiRf: /* 803316BC 0032E61C 80 01 00 24 */ lwz r0, 0x24(r1) /* 803316C0 0032E620 7C 08 03 A6 */ mtlr r0 /* 803316C4 0032E624 38 21 00 20 */ addi r1, r1, 0x20 -/* 803316C8 0032E628 4E 80 00 20 */ blr +/* 803316C8 0032E628 4E 80 00 20 */ blr .global __dt__16CREVectorXToReal __dt__16CREVectorXToReal: @@ -1939,7 +1939,7 @@ __dt__16CREVectorXToReal: /* 80331708 0032E668 38 80 00 01 */ li r4, 1 /* 8033170C 0032E66C 81 8C 00 08 */ lwz r12, 8(r12) /* 80331710 0032E670 7D 89 03 A6 */ mtctr r12 -/* 80331714 0032E674 4E 80 04 21 */ bctrl +/* 80331714 0032E674 4E 80 04 21 */ bctrl lbl_80331718: /* 80331718 0032E678 28 1E 00 00 */ cmplwi r30, 0 /* 8033171C 0032E67C 41 82 00 20 */ beq lbl_8033173C @@ -1963,7 +1963,7 @@ lbl_80331750: /* 8033175C 0032E6BC 83 C1 00 08 */ lwz r30, 8(r1) /* 80331760 0032E6C0 7C 08 03 A6 */ mtlr r0 /* 80331764 0032E6C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80331768 0032E6C8 4E 80 00 20 */ blr +/* 80331768 0032E6C8 4E 80 00 20 */ blr .global __ct__16CREVectorXToRealFP14CVectorElement __ct__16CREVectorXToRealFP14CVectorElement: @@ -1977,7 +1977,7 @@ __ct__16CREVectorXToRealFP14CVectorElement: /* 80331788 0032E6E8 90 C3 00 00 */ stw r6, 0(r3) /* 8033178C 0032E6EC 90 03 00 00 */ stw r0, 0(r3) /* 80331790 0032E6F0 90 83 00 04 */ stw r4, 4(r3) -/* 80331794 0032E6F4 4E 80 00 20 */ blr +/* 80331794 0032E6F4 4E 80 00 20 */ blr .global GetValue__7CREPRLWGCFiRf GetValue__7CREPRLWGCFiRf: @@ -1985,7 +1985,7 @@ GetValue__7CREPRLWGCFiRf: /* 8033179C 0032E6FC 38 60 00 00 */ li r3, 0 /* 803317A0 0032E700 C0 04 00 30 */ lfs f0, 0x30(r4) /* 803317A4 0032E704 D0 05 00 00 */ stfs f0, 0(r5) -/* 803317A8 0032E708 4E 80 00 20 */ blr +/* 803317A8 0032E708 4E 80 00 20 */ blr .global GetValue__7CREPSLLGCFiRf GetValue__7CREPSLLGCFiRf: @@ -1993,7 +1993,7 @@ GetValue__7CREPSLLGCFiRf: /* 803317B0 0032E710 38 60 00 00 */ li r3, 0 /* 803317B4 0032E714 C0 04 00 2C */ lfs f0, 0x2c(r4) /* 803317B8 0032E718 D0 05 00 00 */ stfs f0, 0(r5) -/* 803317BC 0032E71C 4E 80 00 20 */ blr +/* 803317BC 0032E71C 4E 80 00 20 */ blr .global GetValue__27CREParticleAccessParameter8CFiRf GetValue__27CREParticleAccessParameter8CFiRf: @@ -2001,7 +2001,7 @@ GetValue__27CREParticleAccessParameter8CFiRf: /* 803317C4 0032E724 38 60 00 00 */ li r3, 0 /* 803317C8 0032E728 C0 04 00 1C */ lfs f0, 0x1c(r4) /* 803317CC 0032E72C D0 05 00 00 */ stfs f0, 0(r5) -/* 803317D0 0032E730 4E 80 00 20 */ blr +/* 803317D0 0032E730 4E 80 00 20 */ blr .global GetValue__27CREParticleAccessParameter7CFiRf GetValue__27CREParticleAccessParameter7CFiRf: @@ -2009,7 +2009,7 @@ GetValue__27CREParticleAccessParameter7CFiRf: /* 803317D8 0032E738 38 60 00 00 */ li r3, 0 /* 803317DC 0032E73C C0 04 00 18 */ lfs f0, 0x18(r4) /* 803317E0 0032E740 D0 05 00 00 */ stfs f0, 0(r5) -/* 803317E4 0032E744 4E 80 00 20 */ blr +/* 803317E4 0032E744 4E 80 00 20 */ blr .global GetValue__27CREParticleAccessParameter6CFiRf GetValue__27CREParticleAccessParameter6CFiRf: @@ -2017,7 +2017,7 @@ GetValue__27CREParticleAccessParameter6CFiRf: /* 803317EC 0032E74C 38 60 00 00 */ li r3, 0 /* 803317F0 0032E750 C0 04 00 14 */ lfs f0, 0x14(r4) /* 803317F4 0032E754 D0 05 00 00 */ stfs f0, 0(r5) -/* 803317F8 0032E758 4E 80 00 20 */ blr +/* 803317F8 0032E758 4E 80 00 20 */ blr .global GetValue__27CREParticleAccessParameter5CFiRf GetValue__27CREParticleAccessParameter5CFiRf: @@ -2025,7 +2025,7 @@ GetValue__27CREParticleAccessParameter5CFiRf: /* 80331800 0032E760 38 60 00 00 */ li r3, 0 /* 80331804 0032E764 C0 04 00 10 */ lfs f0, 0x10(r4) /* 80331808 0032E768 D0 05 00 00 */ stfs f0, 0(r5) -/* 8033180C 0032E76C 4E 80 00 20 */ blr +/* 8033180C 0032E76C 4E 80 00 20 */ blr .global GetValue__27CREParticleAccessParameter4CFiRf GetValue__27CREParticleAccessParameter4CFiRf: @@ -2033,7 +2033,7 @@ GetValue__27CREParticleAccessParameter4CFiRf: /* 80331814 0032E774 38 60 00 00 */ li r3, 0 /* 80331818 0032E778 C0 04 00 0C */ lfs f0, 0xc(r4) /* 8033181C 0032E77C D0 05 00 00 */ stfs f0, 0(r5) -/* 80331820 0032E780 4E 80 00 20 */ blr +/* 80331820 0032E780 4E 80 00 20 */ blr .global GetValue__27CREParticleAccessParameter3CFiRf GetValue__27CREParticleAccessParameter3CFiRf: @@ -2041,7 +2041,7 @@ GetValue__27CREParticleAccessParameter3CFiRf: /* 80331828 0032E788 38 60 00 00 */ li r3, 0 /* 8033182C 0032E78C C0 04 00 08 */ lfs f0, 8(r4) /* 80331830 0032E790 D0 05 00 00 */ stfs f0, 0(r5) -/* 80331834 0032E794 4E 80 00 20 */ blr +/* 80331834 0032E794 4E 80 00 20 */ blr .global GetValue__27CREParticleAccessParameter2CFiRf GetValue__27CREParticleAccessParameter2CFiRf: @@ -2049,7 +2049,7 @@ GetValue__27CREParticleAccessParameter2CFiRf: /* 8033183C 0032E79C 38 60 00 00 */ li r3, 0 /* 80331840 0032E7A0 C0 04 00 04 */ lfs f0, 4(r4) /* 80331844 0032E7A4 D0 05 00 00 */ stfs f0, 0(r5) -/* 80331848 0032E7A8 4E 80 00 20 */ blr +/* 80331848 0032E7A8 4E 80 00 20 */ blr .global GetValue__27CREParticleAccessParameter1CFiRf GetValue__27CREParticleAccessParameter1CFiRf: @@ -2057,7 +2057,7 @@ GetValue__27CREParticleAccessParameter1CFiRf: /* 80331850 0032E7B0 38 60 00 00 */ li r3, 0 /* 80331854 0032E7B4 C0 04 00 00 */ lfs f0, 0(r4) /* 80331858 0032E7B8 D0 05 00 00 */ stfs f0, 0(r5) -/* 8033185C 0032E7BC 4E 80 00 20 */ blr +/* 8033185C 0032E7BC 4E 80 00 20 */ blr .global GetValue__18CREKeyframeEmitterCFiRf GetValue__18CREKeyframeEmitterCFiRf: @@ -2134,7 +2134,7 @@ lbl_8033195C: /* 8033195C 0032E8BC 38 60 00 00 */ li r3, 0 lbl_80331960: /* 80331960 0032E8C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80331964 0032E8C4 4E 80 00 20 */ blr +/* 80331964 0032E8C4 4E 80 00 20 */ blr .global __dt__18CREKeyframeEmitter __dt__18CREKeyframeEmitter: @@ -2192,7 +2192,7 @@ lbl_80331A14: /* 80331A20 0032E980 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80331A24 0032E984 7C 08 03 A6 */ mtlr r0 /* 80331A28 0032E988 38 21 00 20 */ addi r1, r1, 0x20 -/* 80331A2C 0032E98C 4E 80 00 20 */ blr +/* 80331A2C 0032E98C 4E 80 00 20 */ blr .global __ct__18CREKeyframeEmitterFR12CInputStream __ct__18CREKeyframeEmitterFR12CInputStream: @@ -2285,7 +2285,7 @@ lbl_80331B54: /* 80331B74 0032EAD4 83 81 00 08 */ lwz r28, 8(r1) /* 80331B78 0032EAD8 7C 08 03 A6 */ mtlr r0 /* 80331B7C 0032EADC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80331B80 0032EAE0 4E 80 00 20 */ blr +/* 80331B80 0032EAE0 4E 80 00 20 */ blr .global GetValue__16CRELifetimeTweenCFiRf GetValue__16CRELifetimeTweenCFiRf: @@ -2314,14 +2314,14 @@ GetValue__16CRELifetimeTweenCFiRf: /* 80331BDC 0032EB3C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80331BE0 0032EB40 EF E1 00 24 */ fdivs f31, f1, f0 /* 80331BE4 0032EB44 7D 89 03 A6 */ mtctr r12 -/* 80331BE8 0032EB48 4E 80 04 21 */ bctrl +/* 80331BE8 0032EB48 4E 80 04 21 */ bctrl /* 80331BEC 0032EB4C 80 7D 00 08 */ lwz r3, 8(r29) /* 80331BF0 0032EB50 7F C4 F3 78 */ mr r4, r30 /* 80331BF4 0032EB54 38 A1 00 08 */ addi r5, r1, 8 /* 80331BF8 0032EB58 81 83 00 00 */ lwz r12, 0(r3) /* 80331BFC 0032EB5C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80331C00 0032EB60 7D 89 03 A6 */ mtctr r12 -/* 80331C04 0032EB64 4E 80 04 21 */ bctrl +/* 80331C04 0032EB64 4E 80 04 21 */ bctrl /* 80331C08 0032EB68 C0 02 CB 18 */ lfs f0, lbl_805AE838@sda21(r2) /* 80331C0C 0032EB6C 38 60 00 00 */ li r3, 0 /* 80331C10 0032EB70 C0 21 00 0C */ lfs f1, 0xc(r1) @@ -2338,7 +2338,7 @@ GetValue__16CRELifetimeTweenCFiRf: /* 80331C3C 0032EB9C 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80331C40 0032EBA0 7C 08 03 A6 */ mtlr r0 /* 80331C44 0032EBA4 38 21 00 40 */ addi r1, r1, 0x40 -/* 80331C48 0032EBA8 4E 80 00 20 */ blr +/* 80331C48 0032EBA8 4E 80 00 20 */ blr .global __dt__16CRELifetimeTween __dt__16CRELifetimeTween: @@ -2360,7 +2360,7 @@ __dt__16CRELifetimeTween: /* 80331C88 0032EBE8 38 80 00 01 */ li r4, 1 /* 80331C8C 0032EBEC 81 8C 00 08 */ lwz r12, 8(r12) /* 80331C90 0032EBF0 7D 89 03 A6 */ mtctr r12 -/* 80331C94 0032EBF4 4E 80 04 21 */ bctrl +/* 80331C94 0032EBF4 4E 80 04 21 */ bctrl lbl_80331C98: /* 80331C98 0032EBF8 80 7E 00 08 */ lwz r3, 8(r30) /* 80331C9C 0032EBFC 28 03 00 00 */ cmplwi r3, 0 @@ -2369,7 +2369,7 @@ lbl_80331C98: /* 80331CA8 0032EC08 38 80 00 01 */ li r4, 1 /* 80331CAC 0032EC0C 81 8C 00 08 */ lwz r12, 8(r12) /* 80331CB0 0032EC10 7D 89 03 A6 */ mtctr r12 -/* 80331CB4 0032EC14 4E 80 04 21 */ bctrl +/* 80331CB4 0032EC14 4E 80 04 21 */ bctrl lbl_80331CB8: /* 80331CB8 0032EC18 28 1E 00 00 */ cmplwi r30, 0 /* 80331CBC 0032EC1C 41 82 00 20 */ beq lbl_80331CDC @@ -2393,7 +2393,7 @@ lbl_80331CF0: /* 80331CFC 0032EC5C 83 C1 00 08 */ lwz r30, 8(r1) /* 80331D00 0032EC60 7C 08 03 A6 */ mtlr r0 /* 80331D04 0032EC64 38 21 00 10 */ addi r1, r1, 0x10 -/* 80331D08 0032EC68 4E 80 00 20 */ blr +/* 80331D08 0032EC68 4E 80 00 20 */ blr .global __ct__16CRELifetimeTweenFP12CRealElementP12CRealElement __ct__16CRELifetimeTweenFP12CRealElementP12CRealElement: @@ -2408,7 +2408,7 @@ __ct__16CRELifetimeTweenFP12CRealElementP12CRealElement: /* 80331D2C 0032EC8C 90 03 00 00 */ stw r0, 0(r3) /* 80331D30 0032EC90 90 83 00 04 */ stw r4, 4(r3) /* 80331D34 0032EC94 90 A3 00 08 */ stw r5, 8(r3) -/* 80331D38 0032EC98 4E 80 00 20 */ blr +/* 80331D38 0032EC98 4E 80 00 20 */ blr .global GetValue__18CRELifetimePercentCFiRf GetValue__18CRELifetimePercentCFiRf: @@ -2424,7 +2424,7 @@ GetValue__18CRELifetimePercentCFiRf: /* 80331D60 0032ECC0 81 83 00 00 */ lwz r12, 0(r3) /* 80331D64 0032ECC4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80331D68 0032ECC8 7D 89 03 A6 */ mtctr r12 -/* 80331D6C 0032ECCC 4E 80 04 21 */ bctrl +/* 80331D6C 0032ECCC 4E 80 04 21 */ bctrl /* 80331D70 0032ECD0 C0 21 00 08 */ lfs f1, 8(r1) /* 80331D74 0032ECD4 C0 02 CB 2C */ lfs f0, lbl_805AE84C@sda21(r2) /* 80331D78 0032ECD8 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -2442,7 +2442,7 @@ lbl_80331D84: /* 80331DA4 0032ED04 80 01 00 24 */ lwz r0, 0x24(r1) /* 80331DA8 0032ED08 7C 08 03 A6 */ mtlr r0 /* 80331DAC 0032ED0C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80331DB0 0032ED10 4E 80 00 20 */ blr +/* 80331DB0 0032ED10 4E 80 00 20 */ blr .global __dt__18CRELifetimePercent __dt__18CRELifetimePercent: @@ -2464,7 +2464,7 @@ __dt__18CRELifetimePercent: /* 80331DF0 0032ED50 38 80 00 01 */ li r4, 1 /* 80331DF4 0032ED54 81 8C 00 08 */ lwz r12, 8(r12) /* 80331DF8 0032ED58 7D 89 03 A6 */ mtctr r12 -/* 80331DFC 0032ED5C 4E 80 04 21 */ bctrl +/* 80331DFC 0032ED5C 4E 80 04 21 */ bctrl lbl_80331E00: /* 80331E00 0032ED60 28 1E 00 00 */ cmplwi r30, 0 /* 80331E04 0032ED64 41 82 00 20 */ beq lbl_80331E24 @@ -2488,7 +2488,7 @@ lbl_80331E38: /* 80331E44 0032EDA4 83 C1 00 08 */ lwz r30, 8(r1) /* 80331E48 0032EDA8 7C 08 03 A6 */ mtlr r0 /* 80331E4C 0032EDAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80331E50 0032EDB0 4E 80 00 20 */ blr +/* 80331E50 0032EDB0 4E 80 00 20 */ blr .global __ct__18CRELifetimePercentFP12CRealElement __ct__18CRELifetimePercentFP12CRealElement: @@ -2502,7 +2502,7 @@ __ct__18CRELifetimePercentFP12CRealElement: /* 80331E70 0032EDD0 90 C3 00 00 */ stw r6, 0(r3) /* 80331E74 0032EDD4 90 03 00 00 */ stw r0, 0(r3) /* 80331E78 0032EDD8 90 83 00 04 */ stw r4, 4(r3) -/* 80331E7C 0032EDDC 4E 80 00 20 */ blr +/* 80331E7C 0032EDDC 4E 80 00 20 */ blr .global GetValue__8CREPulseCFiRf GetValue__8CREPulseCFiRf: @@ -2520,14 +2520,14 @@ GetValue__8CREPulseCFiRf: /* 80331EAC 0032EE0C 81 83 00 00 */ lwz r12, 0(r3) /* 80331EB0 0032EE10 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80331EB4 0032EE14 7D 89 03 A6 */ mtctr r12 -/* 80331EB8 0032EE18 4E 80 04 21 */ bctrl +/* 80331EB8 0032EE18 4E 80 04 21 */ bctrl /* 80331EBC 0032EE1C 80 7D 00 08 */ lwz r3, 8(r29) /* 80331EC0 0032EE20 7F C4 F3 78 */ mr r4, r30 /* 80331EC4 0032EE24 38 A1 00 08 */ addi r5, r1, 8 /* 80331EC8 0032EE28 81 83 00 00 */ lwz r12, 0(r3) /* 80331ECC 0032EE2C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80331ED0 0032EE30 7D 89 03 A6 */ mtctr r12 -/* 80331ED4 0032EE34 4E 80 04 21 */ bctrl +/* 80331ED4 0032EE34 4E 80 04 21 */ bctrl /* 80331ED8 0032EE38 80 61 00 08 */ lwz r3, 8(r1) /* 80331EDC 0032EE3C 80 81 00 0C */ lwz r4, 0xc(r1) /* 80331EE0 0032EE40 38 A3 00 01 */ addi r5, r3, 1 @@ -2548,7 +2548,7 @@ lbl_80331EF0: /* 80331F18 0032EE78 81 83 00 00 */ lwz r12, 0(r3) /* 80331F1C 0032EE7C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80331F20 0032EE80 7D 89 03 A6 */ mtctr r12 -/* 80331F24 0032EE84 4E 80 04 21 */ bctrl +/* 80331F24 0032EE84 4E 80 04 21 */ bctrl /* 80331F28 0032EE88 48 00 00 40 */ b lbl_80331F68 lbl_80331F2C: /* 80331F2C 0032EE8C 80 7D 00 0C */ lwz r3, 0xc(r29) @@ -2557,7 +2557,7 @@ lbl_80331F2C: /* 80331F38 0032EE98 81 83 00 00 */ lwz r12, 0(r3) /* 80331F3C 0032EE9C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80331F40 0032EEA0 7D 89 03 A6 */ mtctr r12 -/* 80331F44 0032EEA4 4E 80 04 21 */ bctrl +/* 80331F44 0032EEA4 4E 80 04 21 */ bctrl /* 80331F48 0032EEA8 48 00 00 20 */ b lbl_80331F68 lbl_80331F4C: /* 80331F4C 0032EEAC 80 7D 00 0C */ lwz r3, 0xc(r29) @@ -2566,7 +2566,7 @@ lbl_80331F4C: /* 80331F58 0032EEB8 81 83 00 00 */ lwz r12, 0(r3) /* 80331F5C 0032EEBC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80331F60 0032EEC0 7D 89 03 A6 */ mtctr r12 -/* 80331F64 0032EEC4 4E 80 04 21 */ bctrl +/* 80331F64 0032EEC4 4E 80 04 21 */ bctrl lbl_80331F68: /* 80331F68 0032EEC8 80 01 00 24 */ lwz r0, 0x24(r1) /* 80331F6C 0032EECC 38 60 00 00 */ li r3, 0 @@ -2575,7 +2575,7 @@ lbl_80331F68: /* 80331F78 0032EED8 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80331F7C 0032EEDC 7C 08 03 A6 */ mtlr r0 /* 80331F80 0032EEE0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80331F84 0032EEE4 4E 80 00 20 */ blr +/* 80331F84 0032EEE4 4E 80 00 20 */ blr .global __dt__8CREPulse __dt__8CREPulse: @@ -2597,7 +2597,7 @@ __dt__8CREPulse: /* 80331FC4 0032EF24 38 80 00 01 */ li r4, 1 /* 80331FC8 0032EF28 81 8C 00 08 */ lwz r12, 8(r12) /* 80331FCC 0032EF2C 7D 89 03 A6 */ mtctr r12 -/* 80331FD0 0032EF30 4E 80 04 21 */ bctrl +/* 80331FD0 0032EF30 4E 80 04 21 */ bctrl lbl_80331FD4: /* 80331FD4 0032EF34 80 7E 00 08 */ lwz r3, 8(r30) /* 80331FD8 0032EF38 28 03 00 00 */ cmplwi r3, 0 @@ -2606,7 +2606,7 @@ lbl_80331FD4: /* 80331FE4 0032EF44 38 80 00 01 */ li r4, 1 /* 80331FE8 0032EF48 81 8C 00 08 */ lwz r12, 8(r12) /* 80331FEC 0032EF4C 7D 89 03 A6 */ mtctr r12 -/* 80331FF0 0032EF50 4E 80 04 21 */ bctrl +/* 80331FF0 0032EF50 4E 80 04 21 */ bctrl lbl_80331FF4: /* 80331FF4 0032EF54 80 7E 00 0C */ lwz r3, 0xc(r30) /* 80331FF8 0032EF58 28 03 00 00 */ cmplwi r3, 0 @@ -2615,7 +2615,7 @@ lbl_80331FF4: /* 80332004 0032EF64 38 80 00 01 */ li r4, 1 /* 80332008 0032EF68 81 8C 00 08 */ lwz r12, 8(r12) /* 8033200C 0032EF6C 7D 89 03 A6 */ mtctr r12 -/* 80332010 0032EF70 4E 80 04 21 */ bctrl +/* 80332010 0032EF70 4E 80 04 21 */ bctrl lbl_80332014: /* 80332014 0032EF74 80 7E 00 10 */ lwz r3, 0x10(r30) /* 80332018 0032EF78 28 03 00 00 */ cmplwi r3, 0 @@ -2624,7 +2624,7 @@ lbl_80332014: /* 80332024 0032EF84 38 80 00 01 */ li r4, 1 /* 80332028 0032EF88 81 8C 00 08 */ lwz r12, 8(r12) /* 8033202C 0032EF8C 7D 89 03 A6 */ mtctr r12 -/* 80332030 0032EF90 4E 80 04 21 */ bctrl +/* 80332030 0032EF90 4E 80 04 21 */ bctrl lbl_80332034: /* 80332034 0032EF94 28 1E 00 00 */ cmplwi r30, 0 /* 80332038 0032EF98 41 82 00 20 */ beq lbl_80332058 @@ -2648,7 +2648,7 @@ lbl_8033206C: /* 80332078 0032EFD8 83 C1 00 08 */ lwz r30, 8(r1) /* 8033207C 0032EFDC 7C 08 03 A6 */ mtlr r0 /* 80332080 0032EFE0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80332084 0032EFE4 4E 80 00 20 */ blr +/* 80332084 0032EFE4 4E 80 00 20 */ blr .global __ct__8CREPulseFP11CIntElementP11CIntElementP12CRealElementP12CRealElement __ct__8CREPulseFP11CIntElementP11CIntElementP12CRealElementP12CRealElement: @@ -2665,7 +2665,7 @@ __ct__8CREPulseFP11CIntElementP11CIntElementP12CRealElementP12CRealElement: /* 803320B0 0032F010 90 A3 00 08 */ stw r5, 8(r3) /* 803320B4 0032F014 90 C3 00 0C */ stw r6, 0xc(r3) /* 803320B8 0032F018 90 E3 00 10 */ stw r7, 0x10(r3) -/* 803320BC 0032F01C 4E 80 00 20 */ blr +/* 803320BC 0032F01C 4E 80 00 20 */ blr .global GetValue__8CREClampCFiRf GetValue__8CREClampCFiRf: @@ -2683,21 +2683,21 @@ GetValue__8CREClampCFiRf: /* 803320EC 0032F04C 81 83 00 00 */ lwz r12, 0(r3) /* 803320F0 0032F050 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803320F4 0032F054 7D 89 03 A6 */ mtctr r12 -/* 803320F8 0032F058 4E 80 04 21 */ bctrl +/* 803320F8 0032F058 4E 80 04 21 */ bctrl /* 803320FC 0032F05C 80 7D 00 08 */ lwz r3, 8(r29) /* 80332100 0032F060 7F C4 F3 78 */ mr r4, r30 /* 80332104 0032F064 38 A1 00 08 */ addi r5, r1, 8 /* 80332108 0032F068 81 83 00 00 */ lwz r12, 0(r3) /* 8033210C 0032F06C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80332110 0032F070 7D 89 03 A6 */ mtctr r12 -/* 80332114 0032F074 4E 80 04 21 */ bctrl +/* 80332114 0032F074 4E 80 04 21 */ bctrl /* 80332118 0032F078 80 7D 00 0C */ lwz r3, 0xc(r29) /* 8033211C 0032F07C 7F C4 F3 78 */ mr r4, r30 /* 80332120 0032F080 7F E5 FB 78 */ mr r5, r31 /* 80332124 0032F084 81 83 00 00 */ lwz r12, 0(r3) /* 80332128 0032F088 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8033212C 0032F08C 7D 89 03 A6 */ mtctr r12 -/* 80332130 0032F090 4E 80 04 21 */ bctrl +/* 80332130 0032F090 4E 80 04 21 */ bctrl /* 80332134 0032F094 C0 1F 00 00 */ lfs f0, 0(r31) /* 80332138 0032F098 C0 21 00 08 */ lfs f1, 8(r1) /* 8033213C 0032F09C FC 00 08 40 */ fcmpo cr0, f0, f1 @@ -2717,7 +2717,7 @@ lbl_8033215C: /* 8033216C 0032F0CC 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80332170 0032F0D0 7C 08 03 A6 */ mtlr r0 /* 80332174 0032F0D4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80332178 0032F0D8 4E 80 00 20 */ blr +/* 80332178 0032F0D8 4E 80 00 20 */ blr .global __dt__8CREClamp __dt__8CREClamp: @@ -2739,7 +2739,7 @@ __dt__8CREClamp: /* 803321B8 0032F118 38 80 00 01 */ li r4, 1 /* 803321BC 0032F11C 81 8C 00 08 */ lwz r12, 8(r12) /* 803321C0 0032F120 7D 89 03 A6 */ mtctr r12 -/* 803321C4 0032F124 4E 80 04 21 */ bctrl +/* 803321C4 0032F124 4E 80 04 21 */ bctrl lbl_803321C8: /* 803321C8 0032F128 80 7E 00 08 */ lwz r3, 8(r30) /* 803321CC 0032F12C 28 03 00 00 */ cmplwi r3, 0 @@ -2748,7 +2748,7 @@ lbl_803321C8: /* 803321D8 0032F138 38 80 00 01 */ li r4, 1 /* 803321DC 0032F13C 81 8C 00 08 */ lwz r12, 8(r12) /* 803321E0 0032F140 7D 89 03 A6 */ mtctr r12 -/* 803321E4 0032F144 4E 80 04 21 */ bctrl +/* 803321E4 0032F144 4E 80 04 21 */ bctrl lbl_803321E8: /* 803321E8 0032F148 80 7E 00 0C */ lwz r3, 0xc(r30) /* 803321EC 0032F14C 28 03 00 00 */ cmplwi r3, 0 @@ -2757,7 +2757,7 @@ lbl_803321E8: /* 803321F8 0032F158 38 80 00 01 */ li r4, 1 /* 803321FC 0032F15C 81 8C 00 08 */ lwz r12, 8(r12) /* 80332200 0032F160 7D 89 03 A6 */ mtctr r12 -/* 80332204 0032F164 4E 80 04 21 */ bctrl +/* 80332204 0032F164 4E 80 04 21 */ bctrl lbl_80332208: /* 80332208 0032F168 28 1E 00 00 */ cmplwi r30, 0 /* 8033220C 0032F16C 41 82 00 20 */ beq lbl_8033222C @@ -2781,7 +2781,7 @@ lbl_80332240: /* 8033224C 0032F1AC 83 C1 00 08 */ lwz r30, 8(r1) /* 80332250 0032F1B0 7C 08 03 A6 */ mtlr r0 /* 80332254 0032F1B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80332258 0032F1B8 4E 80 00 20 */ blr +/* 80332258 0032F1B8 4E 80 00 20 */ blr .global __ct__8CREClampFP12CRealElementP12CRealElementP12CRealElement __ct__8CREClampFP12CRealElementP12CRealElementP12CRealElement: @@ -2797,7 +2797,7 @@ __ct__8CREClampFP12CRealElementP12CRealElementP12CRealElement: /* 80332280 0032F1E0 90 83 00 04 */ stw r4, 4(r3) /* 80332284 0032F1E4 90 A3 00 08 */ stw r5, 8(r3) /* 80332288 0032F1E8 90 C3 00 0C */ stw r6, 0xc(r3) -/* 8033228C 0032F1EC 4E 80 00 20 */ blr +/* 8033228C 0032F1EC 4E 80 00 20 */ blr .global GetValue__12CRETimeChainCFiRf GetValue__12CRETimeChainCFiRf: @@ -2815,7 +2815,7 @@ GetValue__12CRETimeChainCFiRf: /* 803322BC 0032F21C 81 83 00 00 */ lwz r12, 0(r3) /* 803322C0 0032F220 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803322C4 0032F224 7D 89 03 A6 */ mtctr r12 -/* 803322C8 0032F228 4E 80 04 21 */ bctrl +/* 803322C8 0032F228 4E 80 04 21 */ bctrl /* 803322CC 0032F22C 80 01 00 08 */ lwz r0, 8(r1) /* 803322D0 0032F230 7C 1E 00 00 */ cmpw r30, r0 /* 803322D4 0032F234 40 80 00 24 */ bge lbl_803322F8 @@ -2825,7 +2825,7 @@ GetValue__12CRETimeChainCFiRf: /* 803322E4 0032F244 81 83 00 00 */ lwz r12, 0(r3) /* 803322E8 0032F248 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803322EC 0032F24C 7D 89 03 A6 */ mtctr r12 -/* 803322F0 0032F250 4E 80 04 21 */ bctrl +/* 803322F0 0032F250 4E 80 04 21 */ bctrl /* 803322F4 0032F254 48 00 00 20 */ b lbl_80332314 lbl_803322F8: /* 803322F8 0032F258 80 7D 00 08 */ lwz r3, 8(r29) @@ -2834,7 +2834,7 @@ lbl_803322F8: /* 80332304 0032F264 81 83 00 00 */ lwz r12, 0(r3) /* 80332308 0032F268 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8033230C 0032F26C 7D 89 03 A6 */ mtctr r12 -/* 80332310 0032F270 4E 80 04 21 */ bctrl +/* 80332310 0032F270 4E 80 04 21 */ bctrl lbl_80332314: /* 80332314 0032F274 80 01 00 24 */ lwz r0, 0x24(r1) /* 80332318 0032F278 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -2842,7 +2842,7 @@ lbl_80332314: /* 80332320 0032F280 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80332324 0032F284 7C 08 03 A6 */ mtlr r0 /* 80332328 0032F288 38 21 00 20 */ addi r1, r1, 0x20 -/* 8033232C 0032F28C 4E 80 00 20 */ blr +/* 8033232C 0032F28C 4E 80 00 20 */ blr .global __dt__12CRETimeChain __dt__12CRETimeChain: @@ -2864,7 +2864,7 @@ __dt__12CRETimeChain: /* 8033236C 0032F2CC 38 80 00 01 */ li r4, 1 /* 80332370 0032F2D0 81 8C 00 08 */ lwz r12, 8(r12) /* 80332374 0032F2D4 7D 89 03 A6 */ mtctr r12 -/* 80332378 0032F2D8 4E 80 04 21 */ bctrl +/* 80332378 0032F2D8 4E 80 04 21 */ bctrl lbl_8033237C: /* 8033237C 0032F2DC 80 7E 00 08 */ lwz r3, 8(r30) /* 80332380 0032F2E0 28 03 00 00 */ cmplwi r3, 0 @@ -2873,7 +2873,7 @@ lbl_8033237C: /* 8033238C 0032F2EC 38 80 00 01 */ li r4, 1 /* 80332390 0032F2F0 81 8C 00 08 */ lwz r12, 8(r12) /* 80332394 0032F2F4 7D 89 03 A6 */ mtctr r12 -/* 80332398 0032F2F8 4E 80 04 21 */ bctrl +/* 80332398 0032F2F8 4E 80 04 21 */ bctrl lbl_8033239C: /* 8033239C 0032F2FC 80 7E 00 0C */ lwz r3, 0xc(r30) /* 803323A0 0032F300 28 03 00 00 */ cmplwi r3, 0 @@ -2882,7 +2882,7 @@ lbl_8033239C: /* 803323AC 0032F30C 38 80 00 01 */ li r4, 1 /* 803323B0 0032F310 81 8C 00 08 */ lwz r12, 8(r12) /* 803323B4 0032F314 7D 89 03 A6 */ mtctr r12 -/* 803323B8 0032F318 4E 80 04 21 */ bctrl +/* 803323B8 0032F318 4E 80 04 21 */ bctrl lbl_803323BC: /* 803323BC 0032F31C 28 1E 00 00 */ cmplwi r30, 0 /* 803323C0 0032F320 41 82 00 20 */ beq lbl_803323E0 @@ -2906,7 +2906,7 @@ lbl_803323F4: /* 80332400 0032F360 83 C1 00 08 */ lwz r30, 8(r1) /* 80332404 0032F364 7C 08 03 A6 */ mtlr r0 /* 80332408 0032F368 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033240C 0032F36C 4E 80 00 20 */ blr +/* 8033240C 0032F36C 4E 80 00 20 */ blr .global __ct__12CRETimeChainFP12CRealElementP12CRealElementP11CIntElement __ct__12CRETimeChainFP12CRealElementP12CRealElementP11CIntElement: @@ -2922,7 +2922,7 @@ __ct__12CRETimeChainFP12CRealElementP12CRealElementP11CIntElement: /* 80332434 0032F394 90 83 00 04 */ stw r4, 4(r3) /* 80332438 0032F398 90 A3 00 08 */ stw r5, 8(r3) /* 8033243C 0032F39C 90 C3 00 0C */ stw r6, 0xc(r3) -/* 80332440 0032F3A0 4E 80 00 20 */ blr +/* 80332440 0032F3A0 4E 80 00 20 */ blr .global GetValue__16CREInitialRandomCFiRf GetValue__16CREInitialRandomCFiRf: @@ -2943,14 +2943,14 @@ GetValue__16CREInitialRandomCFiRf: /* 8033247C 0032F3DC 81 83 00 00 */ lwz r12, 0(r3) /* 80332480 0032F3E0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80332484 0032F3E4 7D 89 03 A6 */ mtctr r12 -/* 80332488 0032F3E8 4E 80 04 21 */ bctrl +/* 80332488 0032F3E8 4E 80 04 21 */ bctrl /* 8033248C 0032F3EC 80 7D 00 08 */ lwz r3, 8(r29) /* 80332490 0032F3F0 7F C4 F3 78 */ mr r4, r30 /* 80332494 0032F3F4 38 A1 00 08 */ addi r5, r1, 8 /* 80332498 0032F3F8 81 83 00 00 */ lwz r12, 0(r3) /* 8033249C 0032F3FC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803324A0 0032F400 7D 89 03 A6 */ mtctr r12 -/* 803324A4 0032F404 4E 80 04 21 */ bctrl +/* 803324A4 0032F404 4E 80 04 21 */ bctrl /* 803324A8 0032F408 C3 E1 00 0C */ lfs f31, 0xc(r1) /* 803324AC 0032F40C 4B FE 01 51 */ bl GetRandomNumber__9CRandom16Fv /* 803324B0 0032F410 4B FE 00 2D */ bl Float__9CRandom16Fv @@ -2968,7 +2968,7 @@ lbl_803324C4: /* 803324DC 0032F43C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 803324E0 0032F440 7C 08 03 A6 */ mtlr r0 /* 803324E4 0032F444 38 21 00 30 */ addi r1, r1, 0x30 -/* 803324E8 0032F448 4E 80 00 20 */ blr +/* 803324E8 0032F448 4E 80 00 20 */ blr .global __dt__16CREInitialRandom __dt__16CREInitialRandom: @@ -2990,7 +2990,7 @@ __dt__16CREInitialRandom: /* 80332528 0032F488 38 80 00 01 */ li r4, 1 /* 8033252C 0032F48C 81 8C 00 08 */ lwz r12, 8(r12) /* 80332530 0032F490 7D 89 03 A6 */ mtctr r12 -/* 80332534 0032F494 4E 80 04 21 */ bctrl +/* 80332534 0032F494 4E 80 04 21 */ bctrl lbl_80332538: /* 80332538 0032F498 80 7E 00 08 */ lwz r3, 8(r30) /* 8033253C 0032F49C 28 03 00 00 */ cmplwi r3, 0 @@ -2999,7 +2999,7 @@ lbl_80332538: /* 80332548 0032F4A8 38 80 00 01 */ li r4, 1 /* 8033254C 0032F4AC 81 8C 00 08 */ lwz r12, 8(r12) /* 80332550 0032F4B0 7D 89 03 A6 */ mtctr r12 -/* 80332554 0032F4B4 4E 80 04 21 */ bctrl +/* 80332554 0032F4B4 4E 80 04 21 */ bctrl lbl_80332558: /* 80332558 0032F4B8 28 1E 00 00 */ cmplwi r30, 0 /* 8033255C 0032F4BC 41 82 00 20 */ beq lbl_8033257C @@ -3023,7 +3023,7 @@ lbl_80332590: /* 8033259C 0032F4FC 83 C1 00 08 */ lwz r30, 8(r1) /* 803325A0 0032F500 7C 08 03 A6 */ mtlr r0 /* 803325A4 0032F504 38 21 00 10 */ addi r1, r1, 0x10 -/* 803325A8 0032F508 4E 80 00 20 */ blr +/* 803325A8 0032F508 4E 80 00 20 */ blr .global __ct__16CREInitialRandomFC12CRealElementC12CRealElement __ct__16CREInitialRandomFC12CRealElementC12CRealElement: @@ -3038,7 +3038,7 @@ __ct__16CREInitialRandomFC12CRealElementC12CRealElement: /* 803325CC 0032F52C 90 03 00 00 */ stw r0, 0(r3) /* 803325D0 0032F530 90 83 00 04 */ stw r4, 4(r3) /* 803325D4 0032F534 90 A3 00 08 */ stw r5, 8(r3) -/* 803325D8 0032F538 4E 80 00 20 */ blr +/* 803325D8 0032F538 4E 80 00 20 */ blr .global GetValue__9CRERandomCFiRf GetValue__9CRERandomCFiRf: @@ -3058,14 +3058,14 @@ GetValue__9CRERandomCFiRf: /* 80332610 0032F570 81 83 00 00 */ lwz r12, 0(r3) /* 80332614 0032F574 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80332618 0032F578 7D 89 03 A6 */ mtctr r12 -/* 8033261C 0032F57C 4E 80 04 21 */ bctrl +/* 8033261C 0032F57C 4E 80 04 21 */ bctrl /* 80332620 0032F580 80 7D 00 08 */ lwz r3, 8(r29) /* 80332624 0032F584 7F C4 F3 78 */ mr r4, r30 /* 80332628 0032F588 38 A1 00 08 */ addi r5, r1, 8 /* 8033262C 0032F58C 81 83 00 00 */ lwz r12, 0(r3) /* 80332630 0032F590 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80332634 0032F594 7D 89 03 A6 */ mtctr r12 -/* 80332638 0032F598 4E 80 04 21 */ bctrl +/* 80332638 0032F598 4E 80 04 21 */ bctrl /* 8033263C 0032F59C C3 E1 00 0C */ lfs f31, 0xc(r1) /* 80332640 0032F5A0 4B FD FF BD */ bl GetRandomNumber__9CRandom16Fv /* 80332644 0032F5A4 4B FD FE 99 */ bl Float__9CRandom16Fv @@ -3082,7 +3082,7 @@ GetValue__9CRERandomCFiRf: /* 80332670 0032F5D0 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80332674 0032F5D4 7C 08 03 A6 */ mtlr r0 /* 80332678 0032F5D8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8033267C 0032F5DC 4E 80 00 20 */ blr +/* 8033267C 0032F5DC 4E 80 00 20 */ blr .global __dt__9CRERandomFv __dt__9CRERandomFv: @@ -3104,7 +3104,7 @@ __dt__9CRERandomFv: /* 803326BC 0032F61C 38 80 00 01 */ li r4, 1 /* 803326C0 0032F620 81 8C 00 08 */ lwz r12, 8(r12) /* 803326C4 0032F624 7D 89 03 A6 */ mtctr r12 -/* 803326C8 0032F628 4E 80 04 21 */ bctrl +/* 803326C8 0032F628 4E 80 04 21 */ bctrl lbl_803326CC: /* 803326CC 0032F62C 80 7E 00 08 */ lwz r3, 8(r30) /* 803326D0 0032F630 28 03 00 00 */ cmplwi r3, 0 @@ -3113,7 +3113,7 @@ lbl_803326CC: /* 803326DC 0032F63C 38 80 00 01 */ li r4, 1 /* 803326E0 0032F640 81 8C 00 08 */ lwz r12, 8(r12) /* 803326E4 0032F644 7D 89 03 A6 */ mtctr r12 -/* 803326E8 0032F648 4E 80 04 21 */ bctrl +/* 803326E8 0032F648 4E 80 04 21 */ bctrl lbl_803326EC: /* 803326EC 0032F64C 28 1E 00 00 */ cmplwi r30, 0 /* 803326F0 0032F650 41 82 00 20 */ beq lbl_80332710 @@ -3137,7 +3137,7 @@ lbl_80332724: /* 80332730 0032F690 83 C1 00 08 */ lwz r30, 8(r1) /* 80332734 0032F694 7C 08 03 A6 */ mtlr r0 /* 80332738 0032F698 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033273C 0032F69C 4E 80 00 20 */ blr +/* 8033273C 0032F69C 4E 80 00 20 */ blr .global __ct__9CRERandomFP12CRealElementP12CRealElement __ct__9CRERandomFP12CRealElementP12CRealElement: @@ -3152,7 +3152,7 @@ __ct__9CRERandomFP12CRealElementP12CRealElement: /* 80332760 0032F6C0 90 03 00 00 */ stw r0, 0(r3) /* 80332764 0032F6C4 90 83 00 04 */ stw r4, 4(r3) /* 80332768 0032F6C8 90 A3 00 08 */ stw r5, 8(r3) -/* 8033276C 0032F6CC 4E 80 00 20 */ blr +/* 8033276C 0032F6CC 4E 80 00 20 */ blr .global GetValue__13CREDotProductCFiRf GetValue__13CREDotProductCFiRf: @@ -3181,14 +3181,14 @@ GetValue__13CREDotProductCFiRf: /* 803327C8 0032F728 81 83 00 00 */ lwz r12, 0(r3) /* 803327CC 0032F72C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803327D0 0032F730 7D 89 03 A6 */ mtctr r12 -/* 803327D4 0032F734 4E 80 04 21 */ bctrl +/* 803327D4 0032F734 4E 80 04 21 */ bctrl /* 803327D8 0032F738 80 7D 00 08 */ lwz r3, 8(r29) /* 803327DC 0032F73C 7F C4 F3 78 */ mr r4, r30 /* 803327E0 0032F740 38 A1 00 08 */ addi r5, r1, 8 /* 803327E4 0032F744 81 83 00 00 */ lwz r12, 0(r3) /* 803327E8 0032F748 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803327EC 0032F74C 7D 89 03 A6 */ mtctr r12 -/* 803327F0 0032F750 4E 80 04 21 */ bctrl +/* 803327F0 0032F750 4E 80 04 21 */ bctrl /* 803327F4 0032F754 C0 21 00 18 */ lfs f1, 0x18(r1) /* 803327F8 0032F758 38 60 00 00 */ li r3, 0 /* 803327FC 0032F75C C0 01 00 0C */ lfs f0, 0xc(r1) @@ -3206,7 +3206,7 @@ GetValue__13CREDotProductCFiRf: /* 8033282C 0032F78C 80 01 00 34 */ lwz r0, 0x34(r1) /* 80332830 0032F790 7C 08 03 A6 */ mtlr r0 /* 80332834 0032F794 38 21 00 30 */ addi r1, r1, 0x30 -/* 80332838 0032F798 4E 80 00 20 */ blr +/* 80332838 0032F798 4E 80 00 20 */ blr .global __dt__13CREDotProduct __dt__13CREDotProduct: @@ -3228,7 +3228,7 @@ __dt__13CREDotProduct: /* 80332878 0032F7D8 38 80 00 01 */ li r4, 1 /* 8033287C 0032F7DC 81 8C 00 08 */ lwz r12, 8(r12) /* 80332880 0032F7E0 7D 89 03 A6 */ mtctr r12 -/* 80332884 0032F7E4 4E 80 04 21 */ bctrl +/* 80332884 0032F7E4 4E 80 04 21 */ bctrl lbl_80332888: /* 80332888 0032F7E8 80 7E 00 08 */ lwz r3, 8(r30) /* 8033288C 0032F7EC 28 03 00 00 */ cmplwi r3, 0 @@ -3237,7 +3237,7 @@ lbl_80332888: /* 80332898 0032F7F8 38 80 00 01 */ li r4, 1 /* 8033289C 0032F7FC 81 8C 00 08 */ lwz r12, 8(r12) /* 803328A0 0032F800 7D 89 03 A6 */ mtctr r12 -/* 803328A4 0032F804 4E 80 04 21 */ bctrl +/* 803328A4 0032F804 4E 80 04 21 */ bctrl lbl_803328A8: /* 803328A8 0032F808 28 1E 00 00 */ cmplwi r30, 0 /* 803328AC 0032F80C 41 82 00 20 */ beq lbl_803328CC @@ -3261,7 +3261,7 @@ lbl_803328E0: /* 803328EC 0032F84C 83 C1 00 08 */ lwz r30, 8(r1) /* 803328F0 0032F850 7C 08 03 A6 */ mtlr r0 /* 803328F4 0032F854 38 21 00 10 */ addi r1, r1, 0x10 -/* 803328F8 0032F858 4E 80 00 20 */ blr +/* 803328F8 0032F858 4E 80 00 20 */ blr .global __ct__13CREDotProductFP14CVectorElementP14CVectorElement __ct__13CREDotProductFP14CVectorElementP14CVectorElement: @@ -3276,7 +3276,7 @@ __ct__13CREDotProductFP14CVectorElementP14CVectorElement: /* 8033291C 0032F87C 90 03 00 00 */ stw r0, 0(r3) /* 80332920 0032F880 90 83 00 04 */ stw r4, 4(r3) /* 80332924 0032F884 90 A3 00 08 */ stw r5, 8(r3) -/* 80332928 0032F888 4E 80 00 20 */ blr +/* 80332928 0032F888 4E 80 00 20 */ blr .global GetValue__11CREMultiplyCFiRf GetValue__11CREMultiplyCFiRf: @@ -3294,14 +3294,14 @@ GetValue__11CREMultiplyCFiRf: /* 80332958 0032F8B8 81 83 00 00 */ lwz r12, 0(r3) /* 8033295C 0032F8BC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80332960 0032F8C0 7D 89 03 A6 */ mtctr r12 -/* 80332964 0032F8C4 4E 80 04 21 */ bctrl +/* 80332964 0032F8C4 4E 80 04 21 */ bctrl /* 80332968 0032F8C8 80 7D 00 08 */ lwz r3, 8(r29) /* 8033296C 0032F8CC 7F C4 F3 78 */ mr r4, r30 /* 80332970 0032F8D0 38 A1 00 08 */ addi r5, r1, 8 /* 80332974 0032F8D4 81 83 00 00 */ lwz r12, 0(r3) /* 80332978 0032F8D8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8033297C 0032F8DC 7D 89 03 A6 */ mtctr r12 -/* 80332980 0032F8E0 4E 80 04 21 */ bctrl +/* 80332980 0032F8E0 4E 80 04 21 */ bctrl /* 80332984 0032F8E4 C0 21 00 0C */ lfs f1, 0xc(r1) /* 80332988 0032F8E8 38 60 00 00 */ li r3, 0 /* 8033298C 0032F8EC C0 01 00 08 */ lfs f0, 8(r1) @@ -3313,7 +3313,7 @@ GetValue__11CREMultiplyCFiRf: /* 803329A4 0032F904 80 01 00 24 */ lwz r0, 0x24(r1) /* 803329A8 0032F908 7C 08 03 A6 */ mtlr r0 /* 803329AC 0032F90C 38 21 00 20 */ addi r1, r1, 0x20 -/* 803329B0 0032F910 4E 80 00 20 */ blr +/* 803329B0 0032F910 4E 80 00 20 */ blr .global __dt__11CREMultiplyFv __dt__11CREMultiplyFv: @@ -3335,7 +3335,7 @@ __dt__11CREMultiplyFv: /* 803329F0 0032F950 38 80 00 01 */ li r4, 1 /* 803329F4 0032F954 81 8C 00 08 */ lwz r12, 8(r12) /* 803329F8 0032F958 7D 89 03 A6 */ mtctr r12 -/* 803329FC 0032F95C 4E 80 04 21 */ bctrl +/* 803329FC 0032F95C 4E 80 04 21 */ bctrl lbl_80332A00: /* 80332A00 0032F960 80 7E 00 08 */ lwz r3, 8(r30) /* 80332A04 0032F964 28 03 00 00 */ cmplwi r3, 0 @@ -3344,7 +3344,7 @@ lbl_80332A00: /* 80332A10 0032F970 38 80 00 01 */ li r4, 1 /* 80332A14 0032F974 81 8C 00 08 */ lwz r12, 8(r12) /* 80332A18 0032F978 7D 89 03 A6 */ mtctr r12 -/* 80332A1C 0032F97C 4E 80 04 21 */ bctrl +/* 80332A1C 0032F97C 4E 80 04 21 */ bctrl lbl_80332A20: /* 80332A20 0032F980 28 1E 00 00 */ cmplwi r30, 0 /* 80332A24 0032F984 41 82 00 20 */ beq lbl_80332A44 @@ -3368,7 +3368,7 @@ lbl_80332A58: /* 80332A64 0032F9C4 83 C1 00 08 */ lwz r30, 8(r1) /* 80332A68 0032F9C8 7C 08 03 A6 */ mtlr r0 /* 80332A6C 0032F9CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80332A70 0032F9D0 4E 80 00 20 */ blr +/* 80332A70 0032F9D0 4E 80 00 20 */ blr .global __ct__11CREMultiplyFP12CRealElementP12CRealElement __ct__11CREMultiplyFP12CRealElementP12CRealElement: @@ -3383,7 +3383,7 @@ __ct__11CREMultiplyFP12CRealElementP12CRealElement: /* 80332A94 0032F9F4 90 03 00 00 */ stw r0, 0(r3) /* 80332A98 0032F9F8 90 83 00 04 */ stw r4, 4(r3) /* 80332A9C 0032F9FC 90 A3 00 08 */ stw r5, 8(r3) -/* 80332AA0 0032FA00 4E 80 00 20 */ blr +/* 80332AA0 0032FA00 4E 80 00 20 */ blr .global GetValue__6CREAddCFiRf GetValue__6CREAddCFiRf: @@ -3401,14 +3401,14 @@ GetValue__6CREAddCFiRf: /* 80332AD0 0032FA30 81 83 00 00 */ lwz r12, 0(r3) /* 80332AD4 0032FA34 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80332AD8 0032FA38 7D 89 03 A6 */ mtctr r12 -/* 80332ADC 0032FA3C 4E 80 04 21 */ bctrl +/* 80332ADC 0032FA3C 4E 80 04 21 */ bctrl /* 80332AE0 0032FA40 80 7D 00 08 */ lwz r3, 8(r29) /* 80332AE4 0032FA44 7F C4 F3 78 */ mr r4, r30 /* 80332AE8 0032FA48 38 A1 00 08 */ addi r5, r1, 8 /* 80332AEC 0032FA4C 81 83 00 00 */ lwz r12, 0(r3) /* 80332AF0 0032FA50 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80332AF4 0032FA54 7D 89 03 A6 */ mtctr r12 -/* 80332AF8 0032FA58 4E 80 04 21 */ bctrl +/* 80332AF8 0032FA58 4E 80 04 21 */ bctrl /* 80332AFC 0032FA5C C0 21 00 0C */ lfs f1, 0xc(r1) /* 80332B00 0032FA60 38 60 00 00 */ li r3, 0 /* 80332B04 0032FA64 C0 01 00 08 */ lfs f0, 8(r1) @@ -3420,7 +3420,7 @@ GetValue__6CREAddCFiRf: /* 80332B1C 0032FA7C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80332B20 0032FA80 7C 08 03 A6 */ mtlr r0 /* 80332B24 0032FA84 38 21 00 20 */ addi r1, r1, 0x20 -/* 80332B28 0032FA88 4E 80 00 20 */ blr +/* 80332B28 0032FA88 4E 80 00 20 */ blr .global __dt__6CREAddFv __dt__6CREAddFv: @@ -3442,7 +3442,7 @@ __dt__6CREAddFv: /* 80332B68 0032FAC8 38 80 00 01 */ li r4, 1 /* 80332B6C 0032FACC 81 8C 00 08 */ lwz r12, 8(r12) /* 80332B70 0032FAD0 7D 89 03 A6 */ mtctr r12 -/* 80332B74 0032FAD4 4E 80 04 21 */ bctrl +/* 80332B74 0032FAD4 4E 80 04 21 */ bctrl lbl_80332B78: /* 80332B78 0032FAD8 80 7E 00 08 */ lwz r3, 8(r30) /* 80332B7C 0032FADC 28 03 00 00 */ cmplwi r3, 0 @@ -3451,7 +3451,7 @@ lbl_80332B78: /* 80332B88 0032FAE8 38 80 00 01 */ li r4, 1 /* 80332B8C 0032FAEC 81 8C 00 08 */ lwz r12, 8(r12) /* 80332B90 0032FAF0 7D 89 03 A6 */ mtctr r12 -/* 80332B94 0032FAF4 4E 80 04 21 */ bctrl +/* 80332B94 0032FAF4 4E 80 04 21 */ bctrl lbl_80332B98: /* 80332B98 0032FAF8 28 1E 00 00 */ cmplwi r30, 0 /* 80332B9C 0032FAFC 41 82 00 20 */ beq lbl_80332BBC @@ -3475,7 +3475,7 @@ lbl_80332BD0: /* 80332BDC 0032FB3C 83 C1 00 08 */ lwz r30, 8(r1) /* 80332BE0 0032FB40 7C 08 03 A6 */ mtlr r0 /* 80332BE4 0032FB44 38 21 00 10 */ addi r1, r1, 0x10 -/* 80332BE8 0032FB48 4E 80 00 20 */ blr +/* 80332BE8 0032FB48 4E 80 00 20 */ blr .global __ct__6CREAddFP12CRealElementP12CRealElement __ct__6CREAddFP12CRealElementP12CRealElement: @@ -3490,7 +3490,7 @@ __ct__6CREAddFP12CRealElementP12CRealElement: /* 80332C0C 0032FB6C 90 03 00 00 */ stw r0, 0(r3) /* 80332C10 0032FB70 90 83 00 04 */ stw r4, 4(r3) /* 80332C14 0032FB74 90 A3 00 08 */ stw r5, 8(r3) -/* 80332C18 0032FB78 4E 80 00 20 */ blr +/* 80332C18 0032FB78 4E 80 00 20 */ blr .global GetValue__12CRETimeScaleCFiRf GetValue__12CRETimeScaleCFiRf: @@ -3506,7 +3506,7 @@ GetValue__12CRETimeScaleCFiRf: /* 80332C40 0032FBA0 81 83 00 00 */ lwz r12, 0(r3) /* 80332C44 0032FBA4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80332C48 0032FBA8 7D 89 03 A6 */ mtctr r12 -/* 80332C4C 0032FBAC 4E 80 04 21 */ bctrl +/* 80332C4C 0032FBAC 4E 80 04 21 */ bctrl /* 80332C50 0032FBB0 6F C3 80 00 */ xoris r3, r30, 0x8000 /* 80332C54 0032FBB4 3C 00 43 30 */ lis r0, 0x4330 /* 80332C58 0032FBB8 90 61 00 14 */ stw r3, 0x14(r1) @@ -3523,7 +3523,7 @@ GetValue__12CRETimeScaleCFiRf: /* 80332C84 0032FBE4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80332C88 0032FBE8 7C 08 03 A6 */ mtlr r0 /* 80332C8C 0032FBEC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80332C90 0032FBF0 4E 80 00 20 */ blr +/* 80332C90 0032FBF0 4E 80 00 20 */ blr .global __dt__12CRETimeScaleFv __dt__12CRETimeScaleFv: @@ -3545,7 +3545,7 @@ __dt__12CRETimeScaleFv: /* 80332CD0 0032FC30 38 80 00 01 */ li r4, 1 /* 80332CD4 0032FC34 81 8C 00 08 */ lwz r12, 8(r12) /* 80332CD8 0032FC38 7D 89 03 A6 */ mtctr r12 -/* 80332CDC 0032FC3C 4E 80 04 21 */ bctrl +/* 80332CDC 0032FC3C 4E 80 04 21 */ bctrl lbl_80332CE0: /* 80332CE0 0032FC40 28 1E 00 00 */ cmplwi r30, 0 /* 80332CE4 0032FC44 41 82 00 20 */ beq lbl_80332D04 @@ -3569,7 +3569,7 @@ lbl_80332D18: /* 80332D24 0032FC84 83 C1 00 08 */ lwz r30, 8(r1) /* 80332D28 0032FC88 7C 08 03 A6 */ mtlr r0 /* 80332D2C 0032FC8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80332D30 0032FC90 4E 80 00 20 */ blr +/* 80332D30 0032FC90 4E 80 00 20 */ blr .global __ct__12CRETimeScaleFP12CRealElement __ct__12CRETimeScaleFP12CRealElement: @@ -3583,7 +3583,7 @@ __ct__12CRETimeScaleFP12CRealElement: /* 80332D50 0032FCB0 90 C3 00 00 */ stw r6, 0(r3) /* 80332D54 0032FCB4 90 03 00 00 */ stw r0, 0(r3) /* 80332D58 0032FCB8 90 83 00 04 */ stw r4, 4(r3) -/* 80332D5C 0032FCBC 4E 80 00 20 */ blr +/* 80332D5C 0032FCBC 4E 80 00 20 */ blr .global GetValue__11CRESineWaveCFiRf GetValue__11CRESineWaveCFiRf: @@ -3601,21 +3601,21 @@ GetValue__11CRESineWaveCFiRf: /* 80332D8C 0032FCEC 81 83 00 00 */ lwz r12, 0(r3) /* 80332D90 0032FCF0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80332D94 0032FCF4 7D 89 03 A6 */ mtctr r12 -/* 80332D98 0032FCF8 4E 80 04 21 */ bctrl +/* 80332D98 0032FCF8 4E 80 04 21 */ bctrl /* 80332D9C 0032FCFC 80 7D 00 04 */ lwz r3, 4(r29) /* 80332DA0 0032FD00 7F C4 F3 78 */ mr r4, r30 /* 80332DA4 0032FD04 38 A1 00 0C */ addi r5, r1, 0xc /* 80332DA8 0032FD08 81 83 00 00 */ lwz r12, 0(r3) /* 80332DAC 0032FD0C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80332DB0 0032FD10 7D 89 03 A6 */ mtctr r12 -/* 80332DB4 0032FD14 4E 80 04 21 */ bctrl +/* 80332DB4 0032FD14 4E 80 04 21 */ bctrl /* 80332DB8 0032FD18 80 7D 00 0C */ lwz r3, 0xc(r29) /* 80332DBC 0032FD1C 7F C4 F3 78 */ mr r4, r30 /* 80332DC0 0032FD20 38 A1 00 08 */ addi r5, r1, 8 /* 80332DC4 0032FD24 81 83 00 00 */ lwz r12, 0(r3) /* 80332DC8 0032FD28 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80332DCC 0032FD2C 7D 89 03 A6 */ mtctr r12 -/* 80332DD0 0032FD30 4E 80 04 21 */ bctrl +/* 80332DD0 0032FD30 4E 80 04 21 */ bctrl /* 80332DD4 0032FD34 6F C3 80 00 */ xoris r3, r30, 0x8000 /* 80332DD8 0032FD38 3C 00 43 30 */ lis r0, 0x4330 /* 80332DDC 0032FD3C 90 61 00 1C */ stw r3, 0x1c(r1) @@ -3640,7 +3640,7 @@ GetValue__11CRESineWaveCFiRf: /* 80332E28 0032FD88 80 01 00 34 */ lwz r0, 0x34(r1) /* 80332E2C 0032FD8C 7C 08 03 A6 */ mtlr r0 /* 80332E30 0032FD90 38 21 00 30 */ addi r1, r1, 0x30 -/* 80332E34 0032FD94 4E 80 00 20 */ blr +/* 80332E34 0032FD94 4E 80 00 20 */ blr .global __dt__11CRESineWaveFv __dt__11CRESineWaveFv: @@ -3662,7 +3662,7 @@ __dt__11CRESineWaveFv: /* 80332E74 0032FDD4 38 80 00 01 */ li r4, 1 /* 80332E78 0032FDD8 81 8C 00 08 */ lwz r12, 8(r12) /* 80332E7C 0032FDDC 7D 89 03 A6 */ mtctr r12 -/* 80332E80 0032FDE0 4E 80 04 21 */ bctrl +/* 80332E80 0032FDE0 4E 80 04 21 */ bctrl lbl_80332E84: /* 80332E84 0032FDE4 80 7E 00 08 */ lwz r3, 8(r30) /* 80332E88 0032FDE8 28 03 00 00 */ cmplwi r3, 0 @@ -3671,7 +3671,7 @@ lbl_80332E84: /* 80332E94 0032FDF4 38 80 00 01 */ li r4, 1 /* 80332E98 0032FDF8 81 8C 00 08 */ lwz r12, 8(r12) /* 80332E9C 0032FDFC 7D 89 03 A6 */ mtctr r12 -/* 80332EA0 0032FE00 4E 80 04 21 */ bctrl +/* 80332EA0 0032FE00 4E 80 04 21 */ bctrl lbl_80332EA4: /* 80332EA4 0032FE04 80 7E 00 0C */ lwz r3, 0xc(r30) /* 80332EA8 0032FE08 28 03 00 00 */ cmplwi r3, 0 @@ -3680,7 +3680,7 @@ lbl_80332EA4: /* 80332EB4 0032FE14 38 80 00 01 */ li r4, 1 /* 80332EB8 0032FE18 81 8C 00 08 */ lwz r12, 8(r12) /* 80332EBC 0032FE1C 7D 89 03 A6 */ mtctr r12 -/* 80332EC0 0032FE20 4E 80 04 21 */ bctrl +/* 80332EC0 0032FE20 4E 80 04 21 */ bctrl lbl_80332EC4: /* 80332EC4 0032FE24 28 1E 00 00 */ cmplwi r30, 0 /* 80332EC8 0032FE28 41 82 00 20 */ beq lbl_80332EE8 @@ -3704,7 +3704,7 @@ lbl_80332EFC: /* 80332F08 0032FE68 83 C1 00 08 */ lwz r30, 8(r1) /* 80332F0C 0032FE6C 7C 08 03 A6 */ mtlr r0 /* 80332F10 0032FE70 38 21 00 10 */ addi r1, r1, 0x10 -/* 80332F14 0032FE74 4E 80 00 20 */ blr +/* 80332F14 0032FE74 4E 80 00 20 */ blr .global __ct__11CRESineWaveFP12CRealElementP12CRealElementP12CRealElement __ct__11CRESineWaveFP12CRealElementP12CRealElementP12CRealElement: @@ -3720,14 +3720,14 @@ __ct__11CRESineWaveFP12CRealElementP12CRealElementP12CRealElement: /* 80332F3C 0032FE9C 90 A3 00 04 */ stw r5, 4(r3) /* 80332F40 0032FEA0 90 C3 00 08 */ stw r6, 8(r3) /* 80332F44 0032FEA4 90 83 00 0C */ stw r4, 0xc(r3) -/* 80332F48 0032FEA8 4E 80 00 20 */ blr +/* 80332F48 0032FEA8 4E 80 00 20 */ blr .global GetValue__11CREConstantCFiRf GetValue__11CREConstantCFiRf: /* 80332F4C 0032FEAC C0 03 00 04 */ lfs f0, 4(r3) /* 80332F50 0032FEB0 38 60 00 00 */ li r3, 0 /* 80332F54 0032FEB4 D0 05 00 00 */ stfs f0, 0(r5) -/* 80332F58 0032FEB8 4E 80 00 20 */ blr +/* 80332F58 0032FEB8 4E 80 00 20 */ blr .global __dt__11CREConstantFv __dt__11CREConstantFv: @@ -3760,7 +3760,7 @@ lbl_80332FB4: /* 80332FBC 0032FF1C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80332FC0 0032FF20 7C 08 03 A6 */ mtlr r0 /* 80332FC4 0032FF24 38 21 00 10 */ addi r1, r1, 0x10 -/* 80332FC8 0032FF28 4E 80 00 20 */ blr +/* 80332FC8 0032FF28 4E 80 00 20 */ blr .global __ct__11CREConstantFf __ct__11CREConstantFf: @@ -3774,7 +3774,7 @@ __ct__11CREConstantFf: /* 80332FE8 0032FF48 90 A3 00 00 */ stw r5, 0(r3) /* 80332FEC 0032FF4C 90 03 00 00 */ stw r0, 0(r3) /* 80332FF0 0032FF50 D0 23 00 04 */ stfs f1, 4(r3) -/* 80332FF4 0032FF54 4E 80 00 20 */ blr +/* 80332FF4 0032FF54 4E 80 00 20 */ blr .global __dt__7CREPRLW __dt__7CREPRLW: @@ -3807,7 +3807,7 @@ lbl_80333050: /* 80333058 0032FFB8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8033305C 0032FFBC 7C 08 03 A6 */ mtlr r0 /* 80333060 0032FFC0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80333064 0032FFC4 4E 80 00 20 */ blr +/* 80333064 0032FFC4 4E 80 00 20 */ blr .global __dt__7CREPSLL __dt__7CREPSLL: @@ -3840,7 +3840,7 @@ lbl_803330C0: /* 803330C8 00330028 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803330CC 0033002C 7C 08 03 A6 */ mtlr r0 /* 803330D0 00330030 38 21 00 10 */ addi r1, r1, 0x10 -/* 803330D4 00330034 4E 80 00 20 */ blr +/* 803330D4 00330034 4E 80 00 20 */ blr .global __dt__27CREParticleAccessParameter8 __dt__27CREParticleAccessParameter8: @@ -3873,7 +3873,7 @@ lbl_80333130: /* 80333138 00330098 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8033313C 0033009C 7C 08 03 A6 */ mtlr r0 /* 80333140 003300A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80333144 003300A4 4E 80 00 20 */ blr +/* 80333144 003300A4 4E 80 00 20 */ blr .global __dt__27CREParticleAccessParameter7 __dt__27CREParticleAccessParameter7: @@ -3906,7 +3906,7 @@ lbl_803331A0: /* 803331A8 00330108 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803331AC 0033010C 7C 08 03 A6 */ mtlr r0 /* 803331B0 00330110 38 21 00 10 */ addi r1, r1, 0x10 -/* 803331B4 00330114 4E 80 00 20 */ blr +/* 803331B4 00330114 4E 80 00 20 */ blr .global __dt__27CREParticleAccessParameter6 __dt__27CREParticleAccessParameter6: @@ -3939,7 +3939,7 @@ lbl_80333210: /* 80333218 00330178 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8033321C 0033017C 7C 08 03 A6 */ mtlr r0 /* 80333220 00330180 38 21 00 10 */ addi r1, r1, 0x10 -/* 80333224 00330184 4E 80 00 20 */ blr +/* 80333224 00330184 4E 80 00 20 */ blr .global __dt__27CREParticleAccessParameter5 __dt__27CREParticleAccessParameter5: @@ -3972,7 +3972,7 @@ lbl_80333280: /* 80333288 003301E8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8033328C 003301EC 7C 08 03 A6 */ mtlr r0 /* 80333290 003301F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80333294 003301F4 4E 80 00 20 */ blr +/* 80333294 003301F4 4E 80 00 20 */ blr .global __dt__27CREParticleAccessParameter4 __dt__27CREParticleAccessParameter4: @@ -4005,7 +4005,7 @@ lbl_803332F0: /* 803332F8 00330258 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803332FC 0033025C 7C 08 03 A6 */ mtlr r0 /* 80333300 00330260 38 21 00 10 */ addi r1, r1, 0x10 -/* 80333304 00330264 4E 80 00 20 */ blr +/* 80333304 00330264 4E 80 00 20 */ blr .global __dt__27CREParticleAccessParameter3 __dt__27CREParticleAccessParameter3: @@ -4038,7 +4038,7 @@ lbl_80333360: /* 80333368 003302C8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8033336C 003302CC 7C 08 03 A6 */ mtlr r0 /* 80333370 003302D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80333374 003302D4 4E 80 00 20 */ blr +/* 80333374 003302D4 4E 80 00 20 */ blr .global __dt__27CREParticleAccessParameter2 __dt__27CREParticleAccessParameter2: @@ -4071,7 +4071,7 @@ lbl_803333D0: /* 803333D8 00330338 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803333DC 0033033C 7C 08 03 A6 */ mtlr r0 /* 803333E0 00330340 38 21 00 10 */ addi r1, r1, 0x10 -/* 803333E4 00330344 4E 80 00 20 */ blr +/* 803333E4 00330344 4E 80 00 20 */ blr .global __dt__27CREParticleAccessParameter1 __dt__27CREParticleAccessParameter1: @@ -4104,14 +4104,14 @@ lbl_80333440: /* 80333448 003303A8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8033344C 003303AC 7C 08 03 A6 */ mtlr r0 /* 80333450 003303B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80333454 003303B4 4E 80 00 20 */ blr +/* 80333454 003303B4 4E 80 00 20 */ blr .global IsConstant__16CREInitialRandomCF IsConstant__16CREInitialRandomCF: /* 80333458 003303B8 38 60 00 01 */ li r3, 1 -/* 8033345C 003303BC 4E 80 00 20 */ blr +/* 8033345C 003303BC 4E 80 00 20 */ blr .global IsConstant__11CREConstantCFv IsConstant__11CREConstantCFv: /* 80333460 003303C0 38 60 00 01 */ li r3, 1 -/* 80333464 003303C4 4E 80 00 20 */ blr +/* 80333464 003303C4 4E 80 00 20 */ blr diff --git a/asm/Kyoto/Particles/CSpawnSystemKeyframeData.s b/asm/Kyoto/Particles/CSpawnSystemKeyframeData.s index 119754fa..587804c5 100644 --- a/asm/Kyoto/Particles/CSpawnSystemKeyframeData.s +++ b/asm/Kyoto/Particles/CSpawnSystemKeyframeData.s @@ -52,7 +52,7 @@ LoadToken__Q224CSpawnSystemKeyframeData24CSpawnSystemKeyframeInfoFP11CSimplePool /* 80333498 003303F8 81 84 00 00 */ lwz r12, 0(r4) /* 8033349C 003303FC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803334A0 00330400 7D 89 03 A6 */ mtctr r12 -/* 803334A4 00330404 4E 80 04 21 */ bctrl +/* 803334A4 00330404 4E 80 04 21 */ bctrl /* 803334A8 00330408 88 1F 00 18 */ lbz r0, 0x18(r31) /* 803334AC 0033040C 28 00 00 00 */ cmplwi r0, 0 /* 803334B0 00330410 40 82 00 20 */ bne lbl_803334D0 @@ -78,7 +78,7 @@ lbl_803334DC: /* 803334F4 00330454 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 803334F8 00330458 7C 08 03 A6 */ mtlr r0 /* 803334FC 0033045C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80333500 00330460 4E 80 00 20 */ blr +/* 80333500 00330460 4E 80 00 20 */ blr .global sub_80333504 sub_80333504: @@ -143,7 +143,7 @@ lbl_803335CC: /* 803335D4 00330534 83 C1 00 18 */ lwz r30, 0x18(r1) /* 803335D8 00330538 7C 08 03 A6 */ mtlr r0 /* 803335DC 0033053C 38 21 00 20 */ addi r1, r1, 0x20 -/* 803335E0 00330540 4E 80 00 20 */ blr +/* 803335E0 00330540 4E 80 00 20 */ blr .global sub_803335e4 sub_803335e4: @@ -219,7 +219,7 @@ lbl_803336D4: /* 803336DC 0033063C 80 01 00 24 */ lwz r0, 0x24(r1) /* 803336E0 00330640 7C 08 03 A6 */ mtlr r0 /* 803336E4 00330644 38 21 00 20 */ addi r1, r1, 0x20 -/* 803336E8 00330648 4E 80 00 20 */ blr +/* 803336E8 00330648 4E 80 00 20 */ blr .global LoadAllSpawnedSystemTokens__24CSpawnSystemKeyframeDataFP11CSimplePool LoadAllSpawnedSystemTokens__24CSpawnSystemKeyframeDataFP11CSimplePool: @@ -259,7 +259,7 @@ lbl_80333750: /* 80333760 003306C0 80 01 00 34 */ lwz r0, 0x34(r1) /* 80333764 003306C4 7C 08 03 A6 */ mtlr r0 /* 80333768 003306C8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8033376C 003306CC 4E 80 00 20 */ blr +/* 8033376C 003306CC 4E 80 00 20 */ blr .global __ct__24CSpawnSystemKeyframeDataFR12CInputStream __ct__24CSpawnSystemKeyframeDataFR12CInputStream: @@ -292,7 +292,7 @@ __ct__24CSpawnSystemKeyframeDataFR12CInputStream: /* 803337D8 00330738 83 C1 00 18 */ lwz r30, 0x18(r1) /* 803337DC 0033073C 7C 08 03 A6 */ mtlr r0 /* 803337E0 00330740 38 21 00 20 */ addi r1, r1, 0x20 -/* 803337E4 00330744 4E 80 00 20 */ blr +/* 803337E4 00330744 4E 80 00 20 */ blr .global sub_803337e8 sub_803337e8: @@ -304,7 +304,7 @@ sub_803337e8: /* 803337FC 0033075C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80333800 00330760 7C 08 03 A6 */ mtlr r0 /* 80333804 00330764 38 21 00 10 */ addi r1, r1, 0x10 -/* 80333808 00330768 4E 80 00 20 */ blr +/* 80333808 00330768 4E 80 00 20 */ blr .global "cinput_stream_helper>>__FRC124TType>>R12CInputStream" "cinput_stream_helper>>__FRC124TType>>R12CInputStream": @@ -349,7 +349,7 @@ lbl_8033388C: /* 8033389C 003307FC 80 01 00 44 */ lwz r0, 0x44(r1) /* 803338A0 00330800 7C 08 03 A6 */ mtlr r0 /* 803338A4 00330804 38 21 00 40 */ addi r1, r1, 0x40 -/* 803338A8 00330808 4E 80 00 20 */ blr +/* 803338A8 00330808 4E 80 00 20 */ blr .global sub_803338ac sub_803338ac: @@ -385,7 +385,7 @@ lbl_803338EC: /* 80333918 00330878 80 01 00 14 */ lwz r0, 0x14(r1) /* 8033391C 0033087C 7C 08 03 A6 */ mtlr r0 /* 80333920 00330880 38 21 00 10 */ addi r1, r1, 0x10 -/* 80333924 00330884 4E 80 00 20 */ blr +/* 80333924 00330884 4E 80 00 20 */ blr .global sub_80333928 sub_80333928: @@ -399,7 +399,7 @@ lbl_80333940: /* 80333940 003308A0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80333944 003308A4 7C 08 03 A6 */ mtlr r0 /* 80333948 003308A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033394C 003308AC 4E 80 00 20 */ blr +/* 8033394C 003308AC 4E 80 00 20 */ blr .global sub_80333950 sub_80333950: @@ -418,7 +418,7 @@ sub_80333950: /* 80333980 003308E0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80333984 003308E4 7C 08 03 A6 */ mtlr r0 /* 80333988 003308E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033398C 003308EC 4E 80 00 20 */ blr +/* 8033398C 003308EC 4E 80 00 20 */ blr .global sub_80333990 sub_80333990: @@ -436,7 +436,7 @@ sub_80333990: /* 803339BC 0033091C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 803339C0 00330920 7C 08 03 A6 */ mtlr r0 /* 803339C4 00330924 38 21 00 20 */ addi r1, r1, 0x20 -/* 803339C8 00330928 4E 80 00 20 */ blr +/* 803339C8 00330928 4E 80 00 20 */ blr .global sub_803339cc sub_803339cc: @@ -448,7 +448,7 @@ sub_803339cc: /* 803339E0 00330940 80 01 00 14 */ lwz r0, 0x14(r1) /* 803339E4 00330944 7C 08 03 A6 */ mtlr r0 /* 803339E8 00330948 38 21 00 10 */ addi r1, r1, 0x10 -/* 803339EC 0033094C 4E 80 00 20 */ blr +/* 803339EC 0033094C 4E 80 00 20 */ blr .global sub_803339f0 sub_803339f0: @@ -480,7 +480,7 @@ sub_803339f0: /* 80333A54 003309B4 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80333A58 003309B8 7C 08 03 A6 */ mtlr r0 /* 80333A5C 003309BC 38 21 00 30 */ addi r1, r1, 0x30 -/* 80333A60 003309C0 4E 80 00 20 */ blr +/* 80333A60 003309C0 4E 80 00 20 */ blr .global sub_80333a64 sub_80333a64: @@ -498,7 +498,7 @@ sub_80333a64: /* 80333A90 003309F0 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80333A94 003309F4 7C 08 03 A6 */ mtlr r0 /* 80333A98 003309F8 38 21 00 20 */ addi r1, r1, 0x20 -/* 80333A9C 003309FC 4E 80 00 20 */ blr +/* 80333A9C 003309FC 4E 80 00 20 */ blr .global sub_80333aa0 sub_80333aa0: @@ -511,7 +511,7 @@ sub_80333aa0: /* 80333AB8 00330A18 80 01 00 14 */ lwz r0, 0x14(r1) /* 80333ABC 00330A1C 7C 08 03 A6 */ mtlr r0 /* 80333AC0 00330A20 38 21 00 10 */ addi r1, r1, 0x10 -/* 80333AC4 00330A24 4E 80 00 20 */ blr +/* 80333AC4 00330A24 4E 80 00 20 */ blr .global sub_80333ac8 sub_80333ac8: @@ -607,7 +607,7 @@ lbl_80333BFC: /* 80333C0C 00330B6C 80 01 00 44 */ lwz r0, 0x44(r1) /* 80333C10 00330B70 7C 08 03 A6 */ mtlr r0 /* 80333C14 00330B74 38 21 00 40 */ addi r1, r1, 0x40 -/* 80333C18 00330B78 4E 80 00 20 */ blr +/* 80333C18 00330B78 4E 80 00 20 */ blr .global sub_80333c1c sub_80333c1c: @@ -625,7 +625,7 @@ sub_80333c1c: /* 80333C48 00330BA8 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80333C4C 00330BAC 7C 08 03 A6 */ mtlr r0 /* 80333C50 00330BB0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80333C54 00330BB4 4E 80 00 20 */ blr +/* 80333C54 00330BB4 4E 80 00 20 */ blr .global sub_80333c58 sub_80333c58: @@ -655,7 +655,7 @@ sub_80333c58: /* 80333CB4 00330C14 83 C1 00 08 */ lwz r30, 8(r1) /* 80333CB8 00330C18 7C 08 03 A6 */ mtlr r0 /* 80333CBC 00330C1C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80333CC0 00330C20 4E 80 00 20 */ blr +/* 80333CC0 00330C20 4E 80 00 20 */ blr .global sub_80333cc4 sub_80333cc4: @@ -758,7 +758,7 @@ lbl_80333E10: /* 80333E14 00330D74 80 01 00 34 */ lwz r0, 0x34(r1) /* 80333E18 00330D78 7C 08 03 A6 */ mtlr r0 /* 80333E1C 00330D7C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80333E20 00330D80 4E 80 00 20 */ blr +/* 80333E20 00330D80 4E 80 00 20 */ blr .global sub_80333e24 sub_80333e24: @@ -817,7 +817,7 @@ lbl_80333ED8: /* 80333EE4 00330E44 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80333EE8 00330E48 7C 08 03 A6 */ mtlr r0 /* 80333EEC 00330E4C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80333EF0 00330E50 4E 80 00 20 */ blr +/* 80333EF0 00330E50 4E 80 00 20 */ blr .global sub_80333ef4 sub_80333ef4: @@ -841,7 +841,7 @@ lbl_80333F20: /* 80333F30 00330E90 83 C1 00 08 */ lwz r30, 8(r1) /* 80333F34 00330E94 7C 08 03 A6 */ mtlr r0 /* 80333F38 00330E98 38 21 00 10 */ addi r1, r1, 0x10 -/* 80333F3C 00330E9C 4E 80 00 20 */ blr +/* 80333F3C 00330E9C 4E 80 00 20 */ blr .global sub_80333f40 sub_80333f40: diff --git a/asm/Kyoto/Particles/CSwooshDescription.s b/asm/Kyoto/Particles/CSwooshDescription.s index 4047b816..d583b7f9 100644 --- a/asm/Kyoto/Particles/CSwooshDescription.s +++ b/asm/Kyoto/Particles/CSwooshDescription.s @@ -19,7 +19,7 @@ __dt__18CSwooshDescriptionFv: /* 80366B28 00363A88 38 80 00 01 */ li r4, 1 /* 80366B2C 00363A8C 81 8C 00 08 */ lwz r12, 8(r12) /* 80366B30 00363A90 7D 89 03 A6 */ mtctr r12 -/* 80366B34 00363A94 4E 80 04 21 */ bctrl +/* 80366B34 00363A94 4E 80 04 21 */ bctrl lbl_80366B38: /* 80366B38 00363A98 80 7F 00 04 */ lwz r3, 4(r31) /* 80366B3C 00363A9C 28 03 00 00 */ cmplwi r3, 0 @@ -28,7 +28,7 @@ lbl_80366B38: /* 80366B48 00363AA8 38 80 00 01 */ li r4, 1 /* 80366B4C 00363AAC 81 8C 00 08 */ lwz r12, 8(r12) /* 80366B50 00363AB0 7D 89 03 A6 */ mtctr r12 -/* 80366B54 00363AB4 4E 80 04 21 */ bctrl +/* 80366B54 00363AB4 4E 80 04 21 */ bctrl lbl_80366B58: /* 80366B58 00363AB8 80 7F 00 08 */ lwz r3, 8(r31) /* 80366B5C 00363ABC 28 03 00 00 */ cmplwi r3, 0 @@ -37,7 +37,7 @@ lbl_80366B58: /* 80366B68 00363AC8 38 80 00 01 */ li r4, 1 /* 80366B6C 00363ACC 81 8C 00 08 */ lwz r12, 8(r12) /* 80366B70 00363AD0 7D 89 03 A6 */ mtctr r12 -/* 80366B74 00363AD4 4E 80 04 21 */ bctrl +/* 80366B74 00363AD4 4E 80 04 21 */ bctrl lbl_80366B78: /* 80366B78 00363AD8 80 7F 00 0C */ lwz r3, 0xc(r31) /* 80366B7C 00363ADC 28 03 00 00 */ cmplwi r3, 0 @@ -46,7 +46,7 @@ lbl_80366B78: /* 80366B88 00363AE8 38 80 00 01 */ li r4, 1 /* 80366B8C 00363AEC 81 8C 00 08 */ lwz r12, 8(r12) /* 80366B90 00363AF0 7D 89 03 A6 */ mtctr r12 -/* 80366B94 00363AF4 4E 80 04 21 */ bctrl +/* 80366B94 00363AF4 4E 80 04 21 */ bctrl lbl_80366B98: /* 80366B98 00363AF8 80 7F 00 10 */ lwz r3, 0x10(r31) /* 80366B9C 00363AFC 28 03 00 00 */ cmplwi r3, 0 @@ -55,7 +55,7 @@ lbl_80366B98: /* 80366BA8 00363B08 38 80 00 01 */ li r4, 1 /* 80366BAC 00363B0C 81 8C 00 08 */ lwz r12, 8(r12) /* 80366BB0 00363B10 7D 89 03 A6 */ mtctr r12 -/* 80366BB4 00363B14 4E 80 04 21 */ bctrl +/* 80366BB4 00363B14 4E 80 04 21 */ bctrl lbl_80366BB8: /* 80366BB8 00363B18 80 7F 00 14 */ lwz r3, 0x14(r31) /* 80366BBC 00363B1C 28 03 00 00 */ cmplwi r3, 0 @@ -64,7 +64,7 @@ lbl_80366BB8: /* 80366BC8 00363B28 38 80 00 01 */ li r4, 1 /* 80366BCC 00363B2C 81 8C 00 08 */ lwz r12, 8(r12) /* 80366BD0 00363B30 7D 89 03 A6 */ mtctr r12 -/* 80366BD4 00363B34 4E 80 04 21 */ bctrl +/* 80366BD4 00363B34 4E 80 04 21 */ bctrl lbl_80366BD8: /* 80366BD8 00363B38 80 7F 00 18 */ lwz r3, 0x18(r31) /* 80366BDC 00363B3C 28 03 00 00 */ cmplwi r3, 0 @@ -73,7 +73,7 @@ lbl_80366BD8: /* 80366BE8 00363B48 38 80 00 01 */ li r4, 1 /* 80366BEC 00363B4C 81 8C 00 08 */ lwz r12, 8(r12) /* 80366BF0 00363B50 7D 89 03 A6 */ mtctr r12 -/* 80366BF4 00363B54 4E 80 04 21 */ bctrl +/* 80366BF4 00363B54 4E 80 04 21 */ bctrl lbl_80366BF8: /* 80366BF8 00363B58 80 7F 00 1C */ lwz r3, 0x1c(r31) /* 80366BFC 00363B5C 28 03 00 00 */ cmplwi r3, 0 @@ -82,7 +82,7 @@ lbl_80366BF8: /* 80366C08 00363B68 38 80 00 01 */ li r4, 1 /* 80366C0C 00363B6C 81 8C 00 08 */ lwz r12, 8(r12) /* 80366C10 00363B70 7D 89 03 A6 */ mtctr r12 -/* 80366C14 00363B74 4E 80 04 21 */ bctrl +/* 80366C14 00363B74 4E 80 04 21 */ bctrl lbl_80366C18: /* 80366C18 00363B78 80 7F 00 20 */ lwz r3, 0x20(r31) /* 80366C1C 00363B7C 28 03 00 00 */ cmplwi r3, 0 @@ -91,7 +91,7 @@ lbl_80366C18: /* 80366C28 00363B88 38 80 00 01 */ li r4, 1 /* 80366C2C 00363B8C 81 8C 00 08 */ lwz r12, 8(r12) /* 80366C30 00363B90 7D 89 03 A6 */ mtctr r12 -/* 80366C34 00363B94 4E 80 04 21 */ bctrl +/* 80366C34 00363B94 4E 80 04 21 */ bctrl lbl_80366C38: /* 80366C38 00363B98 80 7F 00 24 */ lwz r3, 0x24(r31) /* 80366C3C 00363B9C 28 03 00 00 */ cmplwi r3, 0 @@ -100,7 +100,7 @@ lbl_80366C38: /* 80366C48 00363BA8 38 80 00 01 */ li r4, 1 /* 80366C4C 00363BAC 81 8C 00 08 */ lwz r12, 8(r12) /* 80366C50 00363BB0 7D 89 03 A6 */ mtctr r12 -/* 80366C54 00363BB4 4E 80 04 21 */ bctrl +/* 80366C54 00363BB4 4E 80 04 21 */ bctrl lbl_80366C58: /* 80366C58 00363BB8 80 7F 00 28 */ lwz r3, 0x28(r31) /* 80366C5C 00363BBC 28 03 00 00 */ cmplwi r3, 0 @@ -109,7 +109,7 @@ lbl_80366C58: /* 80366C68 00363BC8 38 80 00 01 */ li r4, 1 /* 80366C6C 00363BCC 81 8C 00 08 */ lwz r12, 8(r12) /* 80366C70 00363BD0 7D 89 03 A6 */ mtctr r12 -/* 80366C74 00363BD4 4E 80 04 21 */ bctrl +/* 80366C74 00363BD4 4E 80 04 21 */ bctrl lbl_80366C78: /* 80366C78 00363BD8 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 80366C7C 00363BDC 28 03 00 00 */ cmplwi r3, 0 @@ -118,7 +118,7 @@ lbl_80366C78: /* 80366C88 00363BE8 38 80 00 01 */ li r4, 1 /* 80366C8C 00363BEC 81 8C 00 08 */ lwz r12, 8(r12) /* 80366C90 00363BF0 7D 89 03 A6 */ mtctr r12 -/* 80366C94 00363BF4 4E 80 04 21 */ bctrl +/* 80366C94 00363BF4 4E 80 04 21 */ bctrl lbl_80366C98: /* 80366C98 00363BF8 80 7F 00 30 */ lwz r3, 0x30(r31) /* 80366C9C 00363BFC 28 03 00 00 */ cmplwi r3, 0 @@ -127,7 +127,7 @@ lbl_80366C98: /* 80366CA8 00363C08 38 80 00 01 */ li r4, 1 /* 80366CAC 00363C0C 81 8C 00 08 */ lwz r12, 8(r12) /* 80366CB0 00363C10 7D 89 03 A6 */ mtctr r12 -/* 80366CB4 00363C14 4E 80 04 21 */ bctrl +/* 80366CB4 00363C14 4E 80 04 21 */ bctrl lbl_80366CB8: /* 80366CB8 00363C18 80 7F 00 34 */ lwz r3, 0x34(r31) /* 80366CBC 00363C1C 28 03 00 00 */ cmplwi r3, 0 @@ -136,7 +136,7 @@ lbl_80366CB8: /* 80366CC8 00363C28 38 80 00 01 */ li r4, 1 /* 80366CCC 00363C2C 81 8C 00 08 */ lwz r12, 8(r12) /* 80366CD0 00363C30 7D 89 03 A6 */ mtctr r12 -/* 80366CD4 00363C34 4E 80 04 21 */ bctrl +/* 80366CD4 00363C34 4E 80 04 21 */ bctrl lbl_80366CD8: /* 80366CD8 00363C38 80 7F 00 38 */ lwz r3, 0x38(r31) /* 80366CDC 00363C3C 28 03 00 00 */ cmplwi r3, 0 @@ -145,7 +145,7 @@ lbl_80366CD8: /* 80366CE8 00363C48 38 80 00 01 */ li r4, 1 /* 80366CEC 00363C4C 81 8C 00 08 */ lwz r12, 8(r12) /* 80366CF0 00363C50 7D 89 03 A6 */ mtctr r12 -/* 80366CF4 00363C54 4E 80 04 21 */ bctrl +/* 80366CF4 00363C54 4E 80 04 21 */ bctrl lbl_80366CF8: /* 80366CF8 00363C58 80 7F 00 3C */ lwz r3, 0x3c(r31) /* 80366CFC 00363C5C 28 03 00 00 */ cmplwi r3, 0 @@ -154,7 +154,7 @@ lbl_80366CF8: /* 80366D08 00363C68 38 80 00 01 */ li r4, 1 /* 80366D0C 00363C6C 81 8C 00 08 */ lwz r12, 8(r12) /* 80366D10 00363C70 7D 89 03 A6 */ mtctr r12 -/* 80366D14 00363C74 4E 80 04 21 */ bctrl +/* 80366D14 00363C74 4E 80 04 21 */ bctrl lbl_80366D18: /* 80366D18 00363C78 80 7F 00 40 */ lwz r3, 0x40(r31) /* 80366D1C 00363C7C 28 03 00 00 */ cmplwi r3, 0 @@ -163,7 +163,7 @@ lbl_80366D18: /* 80366D28 00363C88 38 80 00 01 */ li r4, 1 /* 80366D2C 00363C8C 81 8C 00 08 */ lwz r12, 8(r12) /* 80366D30 00363C90 7D 89 03 A6 */ mtctr r12 -/* 80366D34 00363C94 4E 80 04 21 */ bctrl +/* 80366D34 00363C94 4E 80 04 21 */ bctrl lbl_80366D38: /* 80366D38 00363C98 7F C0 07 35 */ extsh. r0, r30 /* 80366D3C 00363C9C 40 81 00 0C */ ble lbl_80366D48 @@ -176,7 +176,7 @@ lbl_80366D48: /* 80366D54 00363CB4 83 C1 00 08 */ lwz r30, 8(r1) /* 80366D58 00363CB8 7C 08 03 A6 */ mtlr r0 /* 80366D5C 00363CBC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80366D60 00363CC0 4E 80 00 20 */ blr +/* 80366D60 00363CC0 4E 80 00 20 */ blr .global __ct__18CSwooshDescriptionFv __ct__18CSwooshDescriptionFv: diff --git a/asm/Kyoto/Particles/CUVElement.s b/asm/Kyoto/Particles/CUVElement.s index bbeaafe7..f98b914d 100644 --- a/asm/Kyoto/Particles/CUVElement.s +++ b/asm/Kyoto/Particles/CUVElement.s @@ -47,12 +47,12 @@ lbl_805A88F0: .global HasConstantTexture__15CUVEAnimTextureFv HasConstantTexture__15CUVEAnimTextureFv: /* 80333FA8 00330F08 38 60 00 01 */ li r3, 1 -/* 80333FAC 00330F0C 4E 80 00 20 */ blr +/* 80333FAC 00330F0C 4E 80 00 20 */ blr .global HasConstantUV__15CUVEAnimTextureFv HasConstantUV__15CUVEAnimTextureFv: /* 80333FB0 00330F10 38 60 00 00 */ li r3, 0 -/* 80333FB4 00330F14 4E 80 00 20 */ blr +/* 80333FB4 00330F14 4E 80 00 20 */ blr .global GetValueTexture__15CUVEAnimTextureCFi GetValueTexture__15CUVEAnimTextureCFi: @@ -74,7 +74,7 @@ GetValueTexture__15CUVEAnimTextureCFi: /* 80333FF4 00330F54 83 C1 00 08 */ lwz r30, 8(r1) /* 80333FF8 00330F58 7C 08 03 A6 */ mtlr r0 /* 80333FFC 00330F5C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80334000 00330F60 4E 80 00 20 */ blr +/* 80334000 00330F60 4E 80 00 20 */ blr .global GetValueUV__15CUVEAnimTextureCFiR13SUVElementSet GetValueUV__15CUVEAnimTextureCFiR13SUVElementSet: @@ -94,7 +94,7 @@ GetValueUV__15CUVEAnimTextureCFiR13SUVElementSet: /* 80334038 00330F98 81 83 00 00 */ lwz r12, 0(r3) /* 8033403C 00330F9C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80334040 00330FA0 7D 89 03 A6 */ mtctr r12 -/* 80334044 00330FA4 4E 80 04 21 */ bctrl +/* 80334044 00330FA4 4E 80 04 21 */ bctrl /* 80334048 00330FA8 80 01 00 0C */ lwz r0, 0xc(r1) /* 8033404C 00330FAC 3C A0 43 30 */ lis r5, 0x4330 /* 80334050 00330FB0 80 FE 00 20 */ lwz r7, 0x20(r30) @@ -163,7 +163,7 @@ lbl_80334108: /* 80334140 003310A0 80 01 00 44 */ lwz r0, 0x44(r1) /* 80334144 003310A4 7C 08 03 A6 */ mtlr r0 /* 80334148 003310A8 38 21 00 40 */ addi r1, r1, 0x40 -/* 8033414C 003310AC 4E 80 00 20 */ blr +/* 8033414C 003310AC 4E 80 00 20 */ blr .global __dt__15CUVEAnimTextureFv __dt__15CUVEAnimTextureFv: @@ -185,7 +185,7 @@ __dt__15CUVEAnimTextureFv: /* 8033418C 003310EC 38 80 00 01 */ li r4, 1 /* 80334190 003310F0 81 8C 00 08 */ lwz r12, 8(r12) /* 80334194 003310F4 7D 89 03 A6 */ mtctr r12 -/* 80334198 003310F8 4E 80 04 21 */ bctrl +/* 80334198 003310F8 4E 80 04 21 */ bctrl lbl_8033419C: /* 8033419C 003310FC 34 1F 00 2C */ addic. r0, r31, 0x2c /* 803341A0 00331100 41 82 00 44 */ beq lbl_803341E4 @@ -238,7 +238,7 @@ lbl_80334238: /* 80334244 003311A4 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80334248 003311A8 7C 08 03 A6 */ mtlr r0 /* 8033424C 003311AC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80334250 003311B0 4E 80 00 20 */ blr +/* 80334250 003311B0 4E 80 00 20 */ blr .global "__ct__15CUVEAnimTextureF17TToken<8CTexture>P11CIntElementP11CIntElementP11CIntElementP11CIntElementP11CIntElementb" "__ct__15CUVEAnimTextureF17TToken<8CTexture>P11CIntElementP11CIntElementP11CIntElementP11CIntElementP11CIntElementb": @@ -283,7 +283,7 @@ lbl_80334238: /* 803342EC 0033124C 81 9F 00 00 */ lwz r12, 0(r31) /* 803342F0 00331250 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803342F4 00331254 7D 89 03 A6 */ mtctr r12 -/* 803342F8 00331258 4E 80 04 21 */ bctrl +/* 803342F8 00331258 4E 80 04 21 */ bctrl /* 803342FC 0033125C 80 01 00 10 */ lwz r0, 0x10(r1) /* 80334300 00331260 28 1F 00 00 */ cmplwi r31, 0 /* 80334304 00331264 90 19 00 10 */ stw r0, 0x10(r25) @@ -293,7 +293,7 @@ lbl_80334238: /* 80334314 00331274 81 9F 00 00 */ lwz r12, 0(r31) /* 80334318 00331278 81 8C 00 08 */ lwz r12, 8(r12) /* 8033431C 0033127C 7D 89 03 A6 */ mtctr r12 -/* 80334320 00331280 4E 80 04 21 */ bctrl +/* 80334320 00331280 4E 80 04 21 */ bctrl lbl_80334324: /* 80334324 00331284 7F C3 F3 78 */ mr r3, r30 /* 80334328 00331288 38 A1 00 10 */ addi r5, r1, 0x10 @@ -301,7 +301,7 @@ lbl_80334324: /* 80334330 00331290 38 80 00 00 */ li r4, 0 /* 80334334 00331294 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80334338 00331298 7D 89 03 A6 */ mtctr r12 -/* 8033433C 0033129C 4E 80 04 21 */ bctrl +/* 8033433C 0033129C 4E 80 04 21 */ bctrl /* 80334340 003312A0 80 01 00 10 */ lwz r0, 0x10(r1) /* 80334344 003312A4 28 1E 00 00 */ cmplwi r30, 0 /* 80334348 003312A8 90 19 00 14 */ stw r0, 0x14(r25) @@ -311,7 +311,7 @@ lbl_80334324: /* 80334358 003312B8 81 9E 00 00 */ lwz r12, 0(r30) /* 8033435C 003312BC 81 8C 00 08 */ lwz r12, 8(r12) /* 80334360 003312C0 7D 89 03 A6 */ mtctr r12 -/* 80334364 003312C4 4E 80 04 21 */ bctrl +/* 80334364 003312C4 4E 80 04 21 */ bctrl lbl_80334368: /* 80334368 003312C8 7F A3 EB 78 */ mr r3, r29 /* 8033436C 003312CC 38 A1 00 10 */ addi r5, r1, 0x10 @@ -319,7 +319,7 @@ lbl_80334368: /* 80334374 003312D4 38 80 00 00 */ li r4, 0 /* 80334378 003312D8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8033437C 003312DC 7D 89 03 A6 */ mtctr r12 -/* 80334380 003312E0 4E 80 04 21 */ bctrl +/* 80334380 003312E0 4E 80 04 21 */ bctrl /* 80334384 003312E4 80 01 00 10 */ lwz r0, 0x10(r1) /* 80334388 003312E8 28 1D 00 00 */ cmplwi r29, 0 /* 8033438C 003312EC 90 19 00 18 */ stw r0, 0x18(r25) @@ -329,7 +329,7 @@ lbl_80334368: /* 8033439C 003312FC 81 9D 00 00 */ lwz r12, 0(r29) /* 803343A0 00331300 81 8C 00 08 */ lwz r12, 8(r12) /* 803343A4 00331304 7D 89 03 A6 */ mtctr r12 -/* 803343A8 00331308 4E 80 04 21 */ bctrl +/* 803343A8 00331308 4E 80 04 21 */ bctrl lbl_803343AC: /* 803343AC 0033130C 7F 83 E3 78 */ mr r3, r28 /* 803343B0 00331310 38 A1 00 10 */ addi r5, r1, 0x10 @@ -337,7 +337,7 @@ lbl_803343AC: /* 803343B8 00331318 38 80 00 00 */ li r4, 0 /* 803343BC 0033131C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803343C0 00331320 7D 89 03 A6 */ mtctr r12 -/* 803343C4 00331324 4E 80 04 21 */ bctrl +/* 803343C4 00331324 4E 80 04 21 */ bctrl /* 803343C8 00331328 80 01 00 10 */ lwz r0, 0x10(r1) /* 803343CC 0033132C 28 1C 00 00 */ cmplwi r28, 0 /* 803343D0 00331330 90 19 00 1C */ stw r0, 0x1c(r25) @@ -347,7 +347,7 @@ lbl_803343AC: /* 803343E0 00331340 81 9C 00 00 */ lwz r12, 0(r28) /* 803343E4 00331344 81 8C 00 08 */ lwz r12, 8(r12) /* 803343E8 00331348 7D 89 03 A6 */ mtctr r12 -/* 803343EC 0033134C 4E 80 04 21 */ bctrl +/* 803343EC 0033134C 4E 80 04 21 */ bctrl lbl_803343F0: /* 803343F0 00331350 93 79 00 28 */ stw r27, 0x28(r25) /* 803343F4 00331354 38 AD 9D 28 */ addi r5, r13, lbl_805A88E8@sda21 @@ -483,7 +483,7 @@ lbl_803345C0: /* 803345D8 00331538 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 803345DC 0033153C 7C 08 03 A6 */ mtlr r0 /* 803345E0 00331540 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 803345E4 00331544 4E 80 00 20 */ blr +/* 803345E4 00331544 4E 80 00 20 */ blr .global GetValueTexture__12CUVEConstantCFi GetValueTexture__12CUVEConstantCFi: @@ -505,7 +505,7 @@ GetValueTexture__12CUVEConstantCFi: /* 80334624 00331584 83 C1 00 08 */ lwz r30, 8(r1) /* 80334628 00331588 7C 08 03 A6 */ mtlr r0 /* 8033462C 0033158C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80334630 00331590 4E 80 00 20 */ blr +/* 80334630 00331590 4E 80 00 20 */ blr .global GetValueUV__12CUVEConstantCFiR13SUVElementSet GetValueUV__12CUVEConstantCFiR13SUVElementSet: @@ -515,7 +515,7 @@ GetValueUV__12CUVEConstantCFiR13SUVElementSet: /* 80334640 003315A0 D0 25 00 04 */ stfs f1, 4(r5) /* 80334644 003315A4 D0 05 00 08 */ stfs f0, 8(r5) /* 80334648 003315A8 D0 05 00 0C */ stfs f0, 0xc(r5) -/* 8033464C 003315AC 4E 80 00 20 */ blr +/* 8033464C 003315AC 4E 80 00 20 */ blr .global __dt__12CUVEConstantFv __dt__12CUVEConstantFv: @@ -560,7 +560,7 @@ lbl_803346D0: /* 803346DC 0033163C 83 C1 00 08 */ lwz r30, 8(r1) /* 803346E0 00331640 7C 08 03 A6 */ mtlr r0 /* 803346E4 00331644 38 21 00 10 */ addi r1, r1, 0x10 -/* 803346E8 00331648 4E 80 00 20 */ blr +/* 803346E8 00331648 4E 80 00 20 */ blr .global "__ct__12CUVEConstantF17TToken<8CTexture>" "__ct__12CUVEConstantF17TToken<8CTexture>": @@ -593,17 +593,17 @@ lbl_803346D0: /* 80334754 003316B4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80334758 003316B8 7C 08 03 A6 */ mtlr r0 /* 8033475C 003316BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80334760 003316C0 4E 80 00 20 */ blr +/* 80334760 003316C0 4E 80 00 20 */ blr .global HasConstantTexture__12CUVEConstantFv HasConstantTexture__12CUVEConstantFv: /* 80334764 003316C4 38 60 00 01 */ li r3, 1 -/* 80334768 003316C8 4E 80 00 20 */ blr +/* 80334768 003316C8 4E 80 00 20 */ blr .global HasConstantUV__12CUVEConstantFv HasConstantUV__12CUVEConstantFv: /* 8033476C 003316CC 38 60 00 01 */ li r3, 1 -/* 80334770 003316D0 4E 80 00 20 */ blr +/* 80334770 003316D0 4E 80 00 20 */ blr .global sub_80334774 sub_80334774: diff --git a/asm/Kyoto/Particles/CVectorElement.s b/asm/Kyoto/Particles/CVectorElement.s index c571071a..ba50026c 100644 --- a/asm/Kyoto/Particles/CVectorElement.s +++ b/asm/Kyoto/Particles/CVectorElement.s @@ -222,7 +222,7 @@ GetValue__7CVECVTCCFiR9CVector3f: /* 803348B4 00331814 81 83 00 00 */ lwz r12, 0(r3) /* 803348B8 00331818 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803348BC 0033181C 7D 89 03 A6 */ mtctr r12 -/* 803348C0 00331820 4E 80 04 21 */ bctrl +/* 803348C0 00331820 4E 80 04 21 */ bctrl /* 803348C4 00331824 E0 01 A0 08 */ psq_l f0, 8(r1), 1, qr2 /* 803348C8 00331828 C0 22 CB 50 */ lfs f1, lbl_805AE870@sda21(r2) /* 803348CC 0033182C EC 01 00 32 */ fmuls f0, f1, f0 @@ -240,7 +240,7 @@ GetValue__7CVECVTCCFiR9CVector3f: /* 803348FC 0033185C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80334900 00331860 7C 08 03 A6 */ mtlr r0 /* 80334904 00331864 38 21 00 20 */ addi r1, r1, 0x20 -/* 80334908 00331868 4E 80 00 20 */ blr +/* 80334908 00331868 4E 80 00 20 */ blr .global __dt__7CVECVTC __dt__7CVECVTC: @@ -262,7 +262,7 @@ __dt__7CVECVTC: /* 80334948 003318A8 38 80 00 01 */ li r4, 1 /* 8033494C 003318AC 81 8C 00 08 */ lwz r12, 8(r12) /* 80334950 003318B0 7D 89 03 A6 */ mtctr r12 -/* 80334954 003318B4 4E 80 04 21 */ bctrl +/* 80334954 003318B4 4E 80 04 21 */ bctrl lbl_80334958: /* 80334958 003318B8 28 1E 00 00 */ cmplwi r30, 0 /* 8033495C 003318BC 41 82 00 20 */ beq lbl_8033497C @@ -286,7 +286,7 @@ lbl_80334990: /* 8033499C 003318FC 83 C1 00 08 */ lwz r30, 8(r1) /* 803349A0 00331900 7C 08 03 A6 */ mtlr r0 /* 803349A4 00331904 38 21 00 10 */ addi r1, r1, 0x10 -/* 803349A8 00331908 4E 80 00 20 */ blr +/* 803349A8 00331908 4E 80 00 20 */ blr .global __ct__7CVECTVCFP13CColorElement __ct__7CVECTVCFP13CColorElement: @@ -300,7 +300,7 @@ __ct__7CVECTVCFP13CColorElement: /* 803349C8 00331928 90 C3 00 00 */ stw r6, 0(r3) /* 803349CC 0033192C 90 03 00 00 */ stw r0, 0(r3) /* 803349D0 00331930 90 83 00 04 */ stw r4, 4(r3) -/* 803349D4 00331934 4E 80 00 20 */ blr +/* 803349D4 00331934 4E 80 00 20 */ blr .global GetValue__11CVESubtractCFiR9CVector3f GetValue__11CVESubtractCFiR9CVector3f: @@ -329,14 +329,14 @@ GetValue__11CVESubtractCFiR9CVector3f: /* 80334A30 00331990 81 83 00 00 */ lwz r12, 0(r3) /* 80334A34 00331994 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80334A38 00331998 7D 89 03 A6 */ mtctr r12 -/* 80334A3C 0033199C 4E 80 04 21 */ bctrl +/* 80334A3C 0033199C 4E 80 04 21 */ bctrl /* 80334A40 003319A0 80 7D 00 08 */ lwz r3, 8(r29) /* 80334A44 003319A4 7F C4 F3 78 */ mr r4, r30 /* 80334A48 003319A8 38 A1 00 08 */ addi r5, r1, 8 /* 80334A4C 003319AC 81 83 00 00 */ lwz r12, 0(r3) /* 80334A50 003319B0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80334A54 003319B4 7D 89 03 A6 */ mtctr r12 -/* 80334A58 003319B8 4E 80 04 21 */ bctrl +/* 80334A58 003319B8 4E 80 04 21 */ bctrl /* 80334A5C 003319BC C0 21 00 14 */ lfs f1, 0x14(r1) /* 80334A60 003319C0 38 60 00 00 */ li r3, 0 /* 80334A64 003319C4 C0 01 00 08 */ lfs f0, 8(r1) @@ -356,7 +356,7 @@ GetValue__11CVESubtractCFiR9CVector3f: /* 80334A9C 003319FC 80 01 00 34 */ lwz r0, 0x34(r1) /* 80334AA0 00331A00 7C 08 03 A6 */ mtlr r0 /* 80334AA4 00331A04 38 21 00 30 */ addi r1, r1, 0x30 -/* 80334AA8 00331A08 4E 80 00 20 */ blr +/* 80334AA8 00331A08 4E 80 00 20 */ blr .global __dt__11CVESubtract __dt__11CVESubtract: @@ -378,7 +378,7 @@ __dt__11CVESubtract: /* 80334AE8 00331A48 38 80 00 01 */ li r4, 1 /* 80334AEC 00331A4C 81 8C 00 08 */ lwz r12, 8(r12) /* 80334AF0 00331A50 7D 89 03 A6 */ mtctr r12 -/* 80334AF4 00331A54 4E 80 04 21 */ bctrl +/* 80334AF4 00331A54 4E 80 04 21 */ bctrl lbl_80334AF8: /* 80334AF8 00331A58 80 7E 00 08 */ lwz r3, 8(r30) /* 80334AFC 00331A5C 28 03 00 00 */ cmplwi r3, 0 @@ -387,7 +387,7 @@ lbl_80334AF8: /* 80334B08 00331A68 38 80 00 01 */ li r4, 1 /* 80334B0C 00331A6C 81 8C 00 08 */ lwz r12, 8(r12) /* 80334B10 00331A70 7D 89 03 A6 */ mtctr r12 -/* 80334B14 00331A74 4E 80 04 21 */ bctrl +/* 80334B14 00331A74 4E 80 04 21 */ bctrl lbl_80334B18: /* 80334B18 00331A78 28 1E 00 00 */ cmplwi r30, 0 /* 80334B1C 00331A7C 41 82 00 20 */ beq lbl_80334B3C @@ -411,7 +411,7 @@ lbl_80334B50: /* 80334B5C 00331ABC 83 C1 00 08 */ lwz r30, 8(r1) /* 80334B60 00331AC0 7C 08 03 A6 */ mtlr r0 /* 80334B64 00331AC4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80334B68 00331AC8 4E 80 00 20 */ blr +/* 80334B68 00331AC8 4E 80 00 20 */ blr .global __ct__10CVESubractFP14CVectorElementP14CVectorElement __ct__10CVESubractFP14CVectorElementP14CVectorElement: @@ -426,7 +426,7 @@ __ct__10CVESubractFP14CVectorElementP14CVectorElement: /* 80334B8C 00331AEC 90 03 00 00 */ stw r0, 0(r3) /* 80334B90 00331AF0 90 83 00 04 */ stw r4, 4(r3) /* 80334B94 00331AF4 90 A3 00 08 */ stw r5, 8(r3) -/* 80334B98 00331AF8 4E 80 00 20 */ blr +/* 80334B98 00331AF8 4E 80 00 20 */ blr .global GetValue__28CVEParticleSystemTranslationCFiR9CVector3f GetValue__28CVEParticleSystemTranslationCFiR9CVector3f: @@ -440,7 +440,7 @@ GetValue__28CVEParticleSystemTranslationCFiR9CVector3f: /* 80334BB8 00331B18 81 83 00 00 */ lwz r12, 0(r3) /* 80334BBC 00331B1C 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 80334BC0 00331B20 7D 89 03 A6 */ mtctr r12 -/* 80334BC4 00331B24 4E 80 04 21 */ bctrl +/* 80334BC4 00331B24 4E 80 04 21 */ bctrl /* 80334BC8 00331B28 C0 03 00 00 */ lfs f0, 0(r3) /* 80334BCC 00331B2C D0 1F 00 00 */ stfs f0, 0(r31) /* 80334BD0 00331B30 C0 03 00 04 */ lfs f0, 4(r3) @@ -452,7 +452,7 @@ GetValue__28CVEParticleSystemTranslationCFiR9CVector3f: /* 80334BE8 00331B48 80 01 00 14 */ lwz r0, 0x14(r1) /* 80334BEC 00331B4C 7C 08 03 A6 */ mtlr r0 /* 80334BF0 00331B50 38 21 00 10 */ addi r1, r1, 0x10 -/* 80334BF4 00331B54 4E 80 00 20 */ blr +/* 80334BF4 00331B54 4E 80 00 20 */ blr .global GetValue__33CVEParticleSystemOrientationRightCFiR9CVector3f GetValue__33CVEParticleSystemOrientationRightCFiR9CVector3f: @@ -466,7 +466,7 @@ GetValue__33CVEParticleSystemOrientationRightCFiR9CVector3f: /* 80334C14 00331B74 81 83 00 00 */ lwz r12, 0(r3) /* 80334C18 00331B78 81 8C 00 38 */ lwz r12, 0x38(r12) /* 80334C1C 00331B7C 7D 89 03 A6 */ mtctr r12 -/* 80334C20 00331B80 4E 80 04 21 */ bctrl +/* 80334C20 00331B80 4E 80 04 21 */ bctrl /* 80334C24 00331B84 C0 43 00 20 */ lfs f2, 0x20(r3) /* 80334C28 00331B88 C0 23 00 10 */ lfs f1, 0x10(r3) /* 80334C2C 00331B8C C0 03 00 00 */ lfs f0, 0(r3) @@ -478,7 +478,7 @@ GetValue__33CVEParticleSystemOrientationRightCFiR9CVector3f: /* 80334C44 00331BA4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80334C48 00331BA8 7C 08 03 A6 */ mtlr r0 /* 80334C4C 00331BAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80334C50 00331BB0 4E 80 00 20 */ blr +/* 80334C50 00331BB0 4E 80 00 20 */ blr .global GetValue__31CVEParticleSystemOrienatationUpCFiR9CVector3f GetValue__31CVEParticleSystemOrienatationUpCFiR9CVector3f: @@ -492,7 +492,7 @@ GetValue__31CVEParticleSystemOrienatationUpCFiR9CVector3f: /* 80334C70 00331BD0 81 83 00 00 */ lwz r12, 0(r3) /* 80334C74 00331BD4 81 8C 00 38 */ lwz r12, 0x38(r12) /* 80334C78 00331BD8 7D 89 03 A6 */ mtctr r12 -/* 80334C7C 00331BDC 4E 80 04 21 */ bctrl +/* 80334C7C 00331BDC 4E 80 04 21 */ bctrl /* 80334C80 00331BE0 C0 43 00 28 */ lfs f2, 0x28(r3) /* 80334C84 00331BE4 C0 23 00 18 */ lfs f1, 0x18(r3) /* 80334C88 00331BE8 C0 03 00 08 */ lfs f0, 8(r3) @@ -504,7 +504,7 @@ GetValue__31CVEParticleSystemOrienatationUpCFiR9CVector3f: /* 80334CA0 00331C00 80 01 00 14 */ lwz r0, 0x14(r1) /* 80334CA4 00331C04 7C 08 03 A6 */ mtlr r0 /* 80334CA8 00331C08 38 21 00 10 */ addi r1, r1, 0x10 -/* 80334CAC 00331C0C 4E 80 00 20 */ blr +/* 80334CAC 00331C0C 4E 80 00 20 */ blr .global GetValue__33CVEParticleSystemOrientationFrontCFiR9CVector3f GetValue__33CVEParticleSystemOrientationFrontCFiR9CVector3f: @@ -518,7 +518,7 @@ GetValue__33CVEParticleSystemOrientationFrontCFiR9CVector3f: /* 80334CCC 00331C2C 81 83 00 00 */ lwz r12, 0(r3) /* 80334CD0 00331C30 81 8C 00 38 */ lwz r12, 0x38(r12) /* 80334CD4 00331C34 7D 89 03 A6 */ mtctr r12 -/* 80334CD8 00331C38 4E 80 04 21 */ bctrl +/* 80334CD8 00331C38 4E 80 04 21 */ bctrl /* 80334CDC 00331C3C C0 43 00 24 */ lfs f2, 0x24(r3) /* 80334CE0 00331C40 C0 23 00 14 */ lfs f1, 0x14(r3) /* 80334CE4 00331C44 C0 03 00 04 */ lfs f0, 4(r3) @@ -530,7 +530,7 @@ GetValue__33CVEParticleSystemOrientationFrontCFiR9CVector3f: /* 80334CFC 00331C5C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80334D00 00331C60 7C 08 03 A6 */ mtlr r0 /* 80334D04 00331C64 38 21 00 10 */ addi r1, r1, 0x10 -/* 80334D08 00331C68 4E 80 00 20 */ blr +/* 80334D08 00331C68 4E 80 00 20 */ blr .global GetValue__19CVEParticleVelocityCFiR9CVector3f GetValue__19CVEParticleVelocityCFiR9CVector3f: @@ -542,7 +542,7 @@ GetValue__19CVEParticleVelocityCFiR9CVector3f: /* 80334D20 00331C80 D0 05 00 04 */ stfs f0, 4(r5) /* 80334D24 00331C84 C0 04 00 24 */ lfs f0, 0x24(r4) /* 80334D28 00331C88 D0 05 00 08 */ stfs f0, 8(r5) -/* 80334D2C 00331C8C 4E 80 00 20 */ blr +/* 80334D2C 00331C8C 4E 80 00 20 */ blr .global GetValue__16CVEParticleColorCFiR9CVector3f GetValue__16CVEParticleColorCFiR9CVector3f: @@ -554,7 +554,7 @@ GetValue__16CVEParticleColorCFiR9CVector3f: /* 80334D44 00331CA4 D0 05 00 04 */ stfs f0, 4(r5) /* 80334D48 00331CA8 C0 04 00 18 */ lfs f0, 0x18(r4) /* 80334D4C 00331CAC D0 05 00 08 */ stfs f0, 8(r5) -/* 80334D50 00331CB0 4E 80 00 20 */ blr +/* 80334D50 00331CB0 4E 80 00 20 */ blr .global GetValue__19CVEParticleLocationCFiR9CVector3f GetValue__19CVEParticleLocationCFiR9CVector3f: @@ -566,7 +566,7 @@ GetValue__19CVEParticleLocationCFiR9CVector3f: /* 80334D68 00331CC8 D0 05 00 04 */ stfs f0, 4(r5) /* 80334D6C 00331CCC C0 04 00 0C */ lfs f0, 0xc(r4) /* 80334D70 00331CD0 D0 05 00 08 */ stfs f0, 8(r5) -/* 80334D74 00331CD4 4E 80 00 20 */ blr +/* 80334D74 00331CD4 4E 80 00 20 */ blr .global GetValue__15CVERealToVectorCFiR9CVector3f GetValue__15CVERealToVectorCFiR9CVector3f: @@ -582,7 +582,7 @@ GetValue__15CVERealToVectorCFiR9CVector3f: /* 80334D9C 00331CFC 81 83 00 00 */ lwz r12, 0(r3) /* 80334DA0 00331D00 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80334DA4 00331D04 7D 89 03 A6 */ mtctr r12 -/* 80334DA8 00331D08 4E 80 04 21 */ bctrl +/* 80334DA8 00331D08 4E 80 04 21 */ bctrl /* 80334DAC 00331D0C C0 01 00 08 */ lfs f0, 8(r1) /* 80334DB0 00331D10 38 60 00 00 */ li r3, 0 /* 80334DB4 00331D14 D0 1F 00 00 */ stfs f0, 0(r31) @@ -592,7 +592,7 @@ GetValue__15CVERealToVectorCFiR9CVector3f: /* 80334DC4 00331D24 80 01 00 24 */ lwz r0, 0x24(r1) /* 80334DC8 00331D28 7C 08 03 A6 */ mtlr r0 /* 80334DCC 00331D2C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80334DD0 00331D30 4E 80 00 20 */ blr +/* 80334DD0 00331D30 4E 80 00 20 */ blr .global __dt__15CVERealToVector __dt__15CVERealToVector: @@ -614,7 +614,7 @@ __dt__15CVERealToVector: /* 80334E10 00331D70 38 80 00 01 */ li r4, 1 /* 80334E14 00331D74 81 8C 00 08 */ lwz r12, 8(r12) /* 80334E18 00331D78 7D 89 03 A6 */ mtctr r12 -/* 80334E1C 00331D7C 4E 80 04 21 */ bctrl +/* 80334E1C 00331D7C 4E 80 04 21 */ bctrl lbl_80334E20: /* 80334E20 00331D80 28 1E 00 00 */ cmplwi r30, 0 /* 80334E24 00331D84 41 82 00 20 */ beq lbl_80334E44 @@ -638,7 +638,7 @@ lbl_80334E58: /* 80334E64 00331DC4 83 C1 00 08 */ lwz r30, 8(r1) /* 80334E68 00331DC8 7C 08 03 A6 */ mtlr r0 /* 80334E6C 00331DCC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80334E70 00331DD0 4E 80 00 20 */ blr +/* 80334E70 00331DD0 4E 80 00 20 */ blr .global __ct__15CVERealToVectorFP12CRealElement __ct__15CVERealToVectorFP12CRealElement: @@ -652,7 +652,7 @@ __ct__15CVERealToVectorFP12CRealElement: /* 80334E90 00331DF0 90 C3 00 00 */ stw r6, 0(r3) /* 80334E94 00331DF4 90 03 00 00 */ stw r0, 0(r3) /* 80334E98 00331DF8 90 83 00 04 */ stw r4, 4(r3) -/* 80334E9C 00331DFC 4E 80 00 20 */ blr +/* 80334E9C 00331DFC 4E 80 00 20 */ blr .global GetValue__18CVEKeyframeEmitterCFiR9CVector3f GetValue__18CVEKeyframeEmitterCFiR9CVector3f: @@ -759,7 +759,7 @@ lbl_80335014: /* 80335014 00331F74 38 60 00 00 */ li r3, 0 lbl_80335018: /* 80335018 00331F78 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033501C 00331F7C 4E 80 00 20 */ blr +/* 8033501C 00331F7C 4E 80 00 20 */ blr .global __dt__18CVEKeyframeEmitter __dt__18CVEKeyframeEmitter: @@ -817,7 +817,7 @@ lbl_803350CC: /* 803350D8 00332038 83 C1 00 18 */ lwz r30, 0x18(r1) /* 803350DC 0033203C 7C 08 03 A6 */ mtlr r0 /* 803350E0 00332040 38 21 00 20 */ addi r1, r1, 0x20 -/* 803350E4 00332044 4E 80 00 20 */ blr +/* 803350E4 00332044 4E 80 00 20 */ blr .global __ct__18CVEKeyframeEmitterFR12CInputStream __ct__18CVEKeyframeEmitterFR12CInputStream: @@ -913,7 +913,7 @@ lbl_8033521C: /* 80335238 00332198 83 81 00 20 */ lwz r28, 0x20(r1) /* 8033523C 0033219C 7C 08 03 A6 */ mtlr r0 /* 80335240 003321A0 38 21 00 30 */ addi r1, r1, 0x30 -/* 80335244 003321A4 4E 80 00 20 */ blr +/* 80335244 003321A4 4E 80 00 20 */ blr .global GetValue__8CVEPulseCFiR9CVector3f GetValue__8CVEPulseCFiR9CVector3f: @@ -931,14 +931,14 @@ GetValue__8CVEPulseCFiR9CVector3f: /* 80335274 003321D4 81 83 00 00 */ lwz r12, 0(r3) /* 80335278 003321D8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8033527C 003321DC 7D 89 03 A6 */ mtctr r12 -/* 80335280 003321E0 4E 80 04 21 */ bctrl +/* 80335280 003321E0 4E 80 04 21 */ bctrl /* 80335284 003321E4 80 7D 00 08 */ lwz r3, 8(r29) /* 80335288 003321E8 7F C4 F3 78 */ mr r4, r30 /* 8033528C 003321EC 38 A1 00 08 */ addi r5, r1, 8 /* 80335290 003321F0 81 83 00 00 */ lwz r12, 0(r3) /* 80335294 003321F4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80335298 003321F8 7D 89 03 A6 */ mtctr r12 -/* 8033529C 003321FC 4E 80 04 21 */ bctrl +/* 8033529C 003321FC 4E 80 04 21 */ bctrl /* 803352A0 00332200 80 61 00 08 */ lwz r3, 8(r1) /* 803352A4 00332204 80 81 00 0C */ lwz r4, 0xc(r1) /* 803352A8 00332208 38 A3 00 01 */ addi r5, r3, 1 @@ -959,7 +959,7 @@ lbl_803352B8: /* 803352E0 00332240 81 83 00 00 */ lwz r12, 0(r3) /* 803352E4 00332244 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803352E8 00332248 7D 89 03 A6 */ mtctr r12 -/* 803352EC 0033224C 4E 80 04 21 */ bctrl +/* 803352EC 0033224C 4E 80 04 21 */ bctrl /* 803352F0 00332250 48 00 00 40 */ b lbl_80335330 lbl_803352F4: /* 803352F4 00332254 80 7D 00 0C */ lwz r3, 0xc(r29) @@ -968,7 +968,7 @@ lbl_803352F4: /* 80335300 00332260 81 83 00 00 */ lwz r12, 0(r3) /* 80335304 00332264 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80335308 00332268 7D 89 03 A6 */ mtctr r12 -/* 8033530C 0033226C 4E 80 04 21 */ bctrl +/* 8033530C 0033226C 4E 80 04 21 */ bctrl /* 80335310 00332270 48 00 00 20 */ b lbl_80335330 lbl_80335314: /* 80335314 00332274 80 7D 00 0C */ lwz r3, 0xc(r29) @@ -977,7 +977,7 @@ lbl_80335314: /* 80335320 00332280 81 83 00 00 */ lwz r12, 0(r3) /* 80335324 00332284 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80335328 00332288 7D 89 03 A6 */ mtctr r12 -/* 8033532C 0033228C 4E 80 04 21 */ bctrl +/* 8033532C 0033228C 4E 80 04 21 */ bctrl lbl_80335330: /* 80335330 00332290 80 01 00 24 */ lwz r0, 0x24(r1) /* 80335334 00332294 38 60 00 00 */ li r3, 0 @@ -986,7 +986,7 @@ lbl_80335330: /* 80335340 003322A0 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80335344 003322A4 7C 08 03 A6 */ mtlr r0 /* 80335348 003322A8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8033534C 003322AC 4E 80 00 20 */ blr +/* 8033534C 003322AC 4E 80 00 20 */ blr .global __dt__8CVEPulse __dt__8CVEPulse: @@ -1008,7 +1008,7 @@ __dt__8CVEPulse: /* 8033538C 003322EC 38 80 00 01 */ li r4, 1 /* 80335390 003322F0 81 8C 00 08 */ lwz r12, 8(r12) /* 80335394 003322F4 7D 89 03 A6 */ mtctr r12 -/* 80335398 003322F8 4E 80 04 21 */ bctrl +/* 80335398 003322F8 4E 80 04 21 */ bctrl lbl_8033539C: /* 8033539C 003322FC 80 7E 00 08 */ lwz r3, 8(r30) /* 803353A0 00332300 28 03 00 00 */ cmplwi r3, 0 @@ -1017,7 +1017,7 @@ lbl_8033539C: /* 803353AC 0033230C 38 80 00 01 */ li r4, 1 /* 803353B0 00332310 81 8C 00 08 */ lwz r12, 8(r12) /* 803353B4 00332314 7D 89 03 A6 */ mtctr r12 -/* 803353B8 00332318 4E 80 04 21 */ bctrl +/* 803353B8 00332318 4E 80 04 21 */ bctrl lbl_803353BC: /* 803353BC 0033231C 80 7E 00 0C */ lwz r3, 0xc(r30) /* 803353C0 00332320 28 03 00 00 */ cmplwi r3, 0 @@ -1026,7 +1026,7 @@ lbl_803353BC: /* 803353CC 0033232C 38 80 00 01 */ li r4, 1 /* 803353D0 00332330 81 8C 00 08 */ lwz r12, 8(r12) /* 803353D4 00332334 7D 89 03 A6 */ mtctr r12 -/* 803353D8 00332338 4E 80 04 21 */ bctrl +/* 803353D8 00332338 4E 80 04 21 */ bctrl lbl_803353DC: /* 803353DC 0033233C 80 7E 00 10 */ lwz r3, 0x10(r30) /* 803353E0 00332340 28 03 00 00 */ cmplwi r3, 0 @@ -1035,7 +1035,7 @@ lbl_803353DC: /* 803353EC 0033234C 38 80 00 01 */ li r4, 1 /* 803353F0 00332350 81 8C 00 08 */ lwz r12, 8(r12) /* 803353F4 00332354 7D 89 03 A6 */ mtctr r12 -/* 803353F8 00332358 4E 80 04 21 */ bctrl +/* 803353F8 00332358 4E 80 04 21 */ bctrl lbl_803353FC: /* 803353FC 0033235C 28 1E 00 00 */ cmplwi r30, 0 /* 80335400 00332360 41 82 00 20 */ beq lbl_80335420 @@ -1059,7 +1059,7 @@ lbl_80335434: /* 80335440 003323A0 83 C1 00 08 */ lwz r30, 8(r1) /* 80335444 003323A4 7C 08 03 A6 */ mtlr r0 /* 80335448 003323A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033544C 003323AC 4E 80 00 20 */ blr +/* 8033544C 003323AC 4E 80 00 20 */ blr .global __ct__8CVEPulseFP11CIntElementP11CIntElementP14CVectorElementP14CVectorElement __ct__8CVEPulseFP11CIntElementP11CIntElementP14CVectorElementP14CVectorElement: @@ -1076,7 +1076,7 @@ __ct__8CVEPulseFP11CIntElementP11CIntElementP14CVectorElementP14CVectorElement: /* 80335478 003323D8 90 A3 00 08 */ stw r5, 8(r3) /* 8033547C 003323DC 90 C3 00 0C */ stw r6, 0xc(r3) /* 80335480 003323E0 90 E3 00 10 */ stw r7, 0x10(r3) -/* 80335484 003323E4 4E 80 00 20 */ blr +/* 80335484 003323E4 4E 80 00 20 */ blr .global GetValue__11CVEMultiplyCFiR9CVector3f GetValue__11CVEMultiplyCFiR9CVector3f: @@ -1105,14 +1105,14 @@ GetValue__11CVEMultiplyCFiR9CVector3f: /* 803354E0 00332440 81 83 00 00 */ lwz r12, 0(r3) /* 803354E4 00332444 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803354E8 00332448 7D 89 03 A6 */ mtctr r12 -/* 803354EC 0033244C 4E 80 04 21 */ bctrl +/* 803354EC 0033244C 4E 80 04 21 */ bctrl /* 803354F0 00332450 80 7D 00 08 */ lwz r3, 8(r29) /* 803354F4 00332454 7F C4 F3 78 */ mr r4, r30 /* 803354F8 00332458 38 A1 00 08 */ addi r5, r1, 8 /* 803354FC 0033245C 81 83 00 00 */ lwz r12, 0(r3) /* 80335500 00332460 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80335504 00332464 7D 89 03 A6 */ mtctr r12 -/* 80335508 00332468 4E 80 04 21 */ bctrl +/* 80335508 00332468 4E 80 04 21 */ bctrl /* 8033550C 0033246C C0 21 00 14 */ lfs f1, 0x14(r1) /* 80335510 00332470 38 60 00 00 */ li r3, 0 /* 80335514 00332474 C0 01 00 08 */ lfs f0, 8(r1) @@ -1132,7 +1132,7 @@ GetValue__11CVEMultiplyCFiR9CVector3f: /* 8033554C 003324AC 80 01 00 34 */ lwz r0, 0x34(r1) /* 80335550 003324B0 7C 08 03 A6 */ mtlr r0 /* 80335554 003324B4 38 21 00 30 */ addi r1, r1, 0x30 -/* 80335558 003324B8 4E 80 00 20 */ blr +/* 80335558 003324B8 4E 80 00 20 */ blr .global __dt__11CVEMultiply __dt__11CVEMultiply: @@ -1154,7 +1154,7 @@ __dt__11CVEMultiply: /* 80335598 003324F8 38 80 00 01 */ li r4, 1 /* 8033559C 003324FC 81 8C 00 08 */ lwz r12, 8(r12) /* 803355A0 00332500 7D 89 03 A6 */ mtctr r12 -/* 803355A4 00332504 4E 80 04 21 */ bctrl +/* 803355A4 00332504 4E 80 04 21 */ bctrl lbl_803355A8: /* 803355A8 00332508 80 7E 00 08 */ lwz r3, 8(r30) /* 803355AC 0033250C 28 03 00 00 */ cmplwi r3, 0 @@ -1163,7 +1163,7 @@ lbl_803355A8: /* 803355B8 00332518 38 80 00 01 */ li r4, 1 /* 803355BC 0033251C 81 8C 00 08 */ lwz r12, 8(r12) /* 803355C0 00332520 7D 89 03 A6 */ mtctr r12 -/* 803355C4 00332524 4E 80 04 21 */ bctrl +/* 803355C4 00332524 4E 80 04 21 */ bctrl lbl_803355C8: /* 803355C8 00332528 28 1E 00 00 */ cmplwi r30, 0 /* 803355CC 0033252C 41 82 00 20 */ beq lbl_803355EC @@ -1187,7 +1187,7 @@ lbl_80335600: /* 8033560C 0033256C 83 C1 00 08 */ lwz r30, 8(r1) /* 80335610 00332570 7C 08 03 A6 */ mtlr r0 /* 80335614 00332574 38 21 00 10 */ addi r1, r1, 0x10 -/* 80335618 00332578 4E 80 00 20 */ blr +/* 80335618 00332578 4E 80 00 20 */ blr .global __ct__11CVEMultiplyFP14CVectorElementP14CVectorElement __ct__11CVEMultiplyFP14CVectorElementP14CVectorElement: @@ -1202,7 +1202,7 @@ __ct__11CVEMultiplyFP14CVectorElementP14CVectorElement: /* 8033563C 0033259C 90 03 00 00 */ stw r0, 0(r3) /* 80335640 003325A0 90 83 00 04 */ stw r4, 4(r3) /* 80335644 003325A4 90 A3 00 08 */ stw r5, 8(r3) -/* 80335648 003325A8 4E 80 00 20 */ blr +/* 80335648 003325A8 4E 80 00 20 */ blr .global GetValue__6CVEAddCFiR9CVector3f GetValue__6CVEAddCFiR9CVector3f: @@ -1231,14 +1231,14 @@ GetValue__6CVEAddCFiR9CVector3f: /* 803356A4 00332604 81 83 00 00 */ lwz r12, 0(r3) /* 803356A8 00332608 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803356AC 0033260C 7D 89 03 A6 */ mtctr r12 -/* 803356B0 00332610 4E 80 04 21 */ bctrl +/* 803356B0 00332610 4E 80 04 21 */ bctrl /* 803356B4 00332614 80 7D 00 08 */ lwz r3, 8(r29) /* 803356B8 00332618 7F C4 F3 78 */ mr r4, r30 /* 803356BC 0033261C 38 A1 00 08 */ addi r5, r1, 8 /* 803356C0 00332620 81 83 00 00 */ lwz r12, 0(r3) /* 803356C4 00332624 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803356C8 00332628 7D 89 03 A6 */ mtctr r12 -/* 803356CC 0033262C 4E 80 04 21 */ bctrl +/* 803356CC 0033262C 4E 80 04 21 */ bctrl /* 803356D0 00332630 C0 21 00 14 */ lfs f1, 0x14(r1) /* 803356D4 00332634 38 60 00 00 */ li r3, 0 /* 803356D8 00332638 C0 01 00 08 */ lfs f0, 8(r1) @@ -1258,7 +1258,7 @@ GetValue__6CVEAddCFiR9CVector3f: /* 80335710 00332670 80 01 00 34 */ lwz r0, 0x34(r1) /* 80335714 00332674 7C 08 03 A6 */ mtlr r0 /* 80335718 00332678 38 21 00 30 */ addi r1, r1, 0x30 -/* 8033571C 0033267C 4E 80 00 20 */ blr +/* 8033571C 0033267C 4E 80 00 20 */ blr .global __dt__6CVEAdd __dt__6CVEAdd: @@ -1280,7 +1280,7 @@ __dt__6CVEAdd: /* 8033575C 003326BC 38 80 00 01 */ li r4, 1 /* 80335760 003326C0 81 8C 00 08 */ lwz r12, 8(r12) /* 80335764 003326C4 7D 89 03 A6 */ mtctr r12 -/* 80335768 003326C8 4E 80 04 21 */ bctrl +/* 80335768 003326C8 4E 80 04 21 */ bctrl lbl_8033576C: /* 8033576C 003326CC 80 7E 00 08 */ lwz r3, 8(r30) /* 80335770 003326D0 28 03 00 00 */ cmplwi r3, 0 @@ -1289,7 +1289,7 @@ lbl_8033576C: /* 8033577C 003326DC 38 80 00 01 */ li r4, 1 /* 80335780 003326E0 81 8C 00 08 */ lwz r12, 8(r12) /* 80335784 003326E4 7D 89 03 A6 */ mtctr r12 -/* 80335788 003326E8 4E 80 04 21 */ bctrl +/* 80335788 003326E8 4E 80 04 21 */ bctrl lbl_8033578C: /* 8033578C 003326EC 28 1E 00 00 */ cmplwi r30, 0 /* 80335790 003326F0 41 82 00 20 */ beq lbl_803357B0 @@ -1313,7 +1313,7 @@ lbl_803357C4: /* 803357D0 00332730 83 C1 00 08 */ lwz r30, 8(r1) /* 803357D4 00332734 7C 08 03 A6 */ mtlr r0 /* 803357D8 00332738 38 21 00 10 */ addi r1, r1, 0x10 -/* 803357DC 0033273C 4E 80 00 20 */ blr +/* 803357DC 0033273C 4E 80 00 20 */ blr .global __ct__6CVEAddFP14CVectorElementP14CVectorElement __ct__6CVEAddFP14CVectorElementP14CVectorElement: @@ -1328,7 +1328,7 @@ __ct__6CVEAddFP14CVectorElementP14CVectorElement: /* 80335800 00332760 90 03 00 00 */ stw r0, 0(r3) /* 80335804 00332764 90 83 00 04 */ stw r4, 4(r3) /* 80335808 00332768 90 A3 00 08 */ stw r5, 8(r3) -/* 8033580C 0033276C 4E 80 00 20 */ blr +/* 8033580C 0033276C 4E 80 00 20 */ blr .global GetValue__16CVECircleClusterCFiR9CVector3f GetValue__16CVECircleClusterCFiR9CVector3f: @@ -1365,7 +1365,7 @@ GetValue__16CVECircleClusterCFiR9CVector3f: /* 80335888 003327E8 81 83 00 00 */ lwz r12, 0(r3) /* 8033588C 003327EC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80335890 003327F0 7D 89 03 A6 */ mtctr r12 -/* 80335894 003327F4 4E 80 04 21 */ bctrl +/* 80335894 003327F4 4E 80 04 21 */ bctrl /* 80335898 003327F8 FC 20 E8 90 */ fmr f1, f29 /* 8033589C 003327FC 48 05 F2 41 */ bl sin /* 803358A0 00332800 FC 80 08 18 */ frsp f4, f1 @@ -1402,7 +1402,7 @@ GetValue__16CVECircleClusterCFiR9CVector3f: /* 8033591C 0033287C 81 83 00 00 */ lwz r12, 0(r3) /* 80335920 00332880 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80335924 00332884 7D 89 03 A6 */ mtctr r12 -/* 80335928 00332888 4E 80 04 21 */ bctrl +/* 80335928 00332888 4E 80 04 21 */ bctrl /* 8033592C 0033288C 38 61 00 0C */ addi r3, r1, 0xc /* 80335930 00332890 4B FD EF 89 */ bl Magnitude__9CVector3fCFv /* 80335934 00332894 C0 01 00 08 */ lfs f0, 8(r1) @@ -1438,7 +1438,7 @@ GetValue__16CVECircleClusterCFiR9CVector3f: /* 803359AC 0033290C 83 A1 00 34 */ lwz r29, 0x34(r1) /* 803359B0 00332910 7C 08 03 A6 */ mtlr r0 /* 803359B4 00332914 38 21 00 70 */ addi r1, r1, 0x70 -/* 803359B8 00332918 4E 80 00 20 */ blr +/* 803359B8 00332918 4E 80 00 20 */ blr .global __dt__16CVECircleCluster __dt__16CVECircleCluster: @@ -1460,7 +1460,7 @@ __dt__16CVECircleCluster: /* 803359F8 00332958 38 80 00 01 */ li r4, 1 /* 803359FC 0033295C 81 8C 00 08 */ lwz r12, 8(r12) /* 80335A00 00332960 7D 89 03 A6 */ mtctr r12 -/* 80335A04 00332964 4E 80 04 21 */ bctrl +/* 80335A04 00332964 4E 80 04 21 */ bctrl lbl_80335A08: /* 80335A08 00332968 80 7E 00 24 */ lwz r3, 0x24(r30) /* 80335A0C 0033296C 28 03 00 00 */ cmplwi r3, 0 @@ -1469,7 +1469,7 @@ lbl_80335A08: /* 80335A18 00332978 38 80 00 01 */ li r4, 1 /* 80335A1C 0033297C 81 8C 00 08 */ lwz r12, 8(r12) /* 80335A20 00332980 7D 89 03 A6 */ mtctr r12 -/* 80335A24 00332984 4E 80 04 21 */ bctrl +/* 80335A24 00332984 4E 80 04 21 */ bctrl lbl_80335A28: /* 80335A28 00332988 28 1E 00 00 */ cmplwi r30, 0 /* 80335A2C 0033298C 41 82 00 20 */ beq lbl_80335A4C @@ -1493,7 +1493,7 @@ lbl_80335A60: /* 80335A6C 003329CC 83 C1 00 08 */ lwz r30, 8(r1) /* 80335A70 003329D0 7C 08 03 A6 */ mtlr r0 /* 80335A74 003329D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80335A78 003329D8 4E 80 00 20 */ blr +/* 80335A78 003329D8 4E 80 00 20 */ blr .global __ct__16CVECircleClusterFP14CVectorElementP14CVectorElementP11CIntElementP12CRealElement __ct__16CVECircleClusterFP14CVectorElementP14CVectorElementP11CIntElementP12CRealElement: @@ -1545,7 +1545,7 @@ __ct__16CVECircleClusterFP14CVectorElementP14CVectorElementP11CIntElementP12CRea /* 80335B30 00332A90 81 9E 00 00 */ lwz r12, 0(r30) /* 80335B34 00332A94 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80335B38 00332A98 7D 89 03 A6 */ mtctr r12 -/* 80335B3C 00332A9C 4E 80 04 21 */ bctrl +/* 80335B3C 00332A9C 4E 80 04 21 */ bctrl /* 80335B40 00332AA0 80 81 00 08 */ lwz r4, 8(r1) /* 80335B44 00332AA4 3C 00 43 30 */ lis r0, 0x4330 /* 80335B48 00332AA8 90 01 00 28 */ stw r0, 0x28(r1) @@ -1569,7 +1569,7 @@ __ct__16CVECircleClusterFP14CVectorElementP14CVectorElementP11CIntElementP12CRea /* 80335B90 00332AF0 81 9D 00 00 */ lwz r12, 0(r29) /* 80335B94 00332AF4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80335B98 00332AF8 7D 89 03 A6 */ mtctr r12 -/* 80335B9C 00332AFC 4E 80 04 21 */ bctrl +/* 80335B9C 00332AFC 4E 80 04 21 */ bctrl /* 80335BA0 00332B00 C3 E1 00 18 */ lfs f31, 0x18(r1) /* 80335BA4 00332B04 38 61 00 18 */ addi r3, r1, 0x18 /* 80335BA8 00332B08 C3 C1 00 1C */ lfs f30, 0x1c(r1) @@ -1647,7 +1647,7 @@ lbl_80335C6C: /* 80335CB8 00332C18 81 9E 00 00 */ lwz r12, 0(r30) /* 80335CBC 00332C1C 81 8C 00 08 */ lwz r12, 8(r12) /* 80335CC0 00332C20 7D 89 03 A6 */ mtctr r12 -/* 80335CC4 00332C24 4E 80 04 21 */ bctrl +/* 80335CC4 00332C24 4E 80 04 21 */ bctrl lbl_80335CC8: /* 80335CC8 00332C28 28 1D 00 00 */ cmplwi r29, 0 /* 80335CCC 00332C2C 41 82 00 1C */ beq lbl_80335CE8 @@ -1656,7 +1656,7 @@ lbl_80335CC8: /* 80335CD8 00332C38 81 9D 00 00 */ lwz r12, 0(r29) /* 80335CDC 00332C3C 81 8C 00 08 */ lwz r12, 8(r12) /* 80335CE0 00332C40 7D 89 03 A6 */ mtctr r12 -/* 80335CE4 00332C44 4E 80 04 21 */ bctrl +/* 80335CE4 00332C44 4E 80 04 21 */ bctrl lbl_80335CE8: /* 80335CE8 00332C48 7F E3 FB 78 */ mr r3, r31 /* 80335CEC 00332C4C E3 E1 00 68 */ psq_l f31, 104(r1), 0, qr0 @@ -1671,7 +1671,7 @@ lbl_80335CE8: /* 80335D10 00332C70 83 A1 00 34 */ lwz r29, 0x34(r1) /* 80335D14 00332C74 7C 08 03 A6 */ mtlr r0 /* 80335D18 00332C78 38 21 00 70 */ addi r1, r1, 0x70 -/* 80335D1C 00332C7C 4E 80 00 20 */ blr +/* 80335D1C 00332C7C 4E 80 00 20 */ blr .global GetValue__12CVETimeChainCFiR9CVector3f GetValue__12CVETimeChainCFiR9CVector3f: @@ -1689,7 +1689,7 @@ GetValue__12CVETimeChainCFiR9CVector3f: /* 80335D4C 00332CAC 81 83 00 00 */ lwz r12, 0(r3) /* 80335D50 00332CB0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80335D54 00332CB4 7D 89 03 A6 */ mtctr r12 -/* 80335D58 00332CB8 4E 80 04 21 */ bctrl +/* 80335D58 00332CB8 4E 80 04 21 */ bctrl /* 80335D5C 00332CBC 80 01 00 08 */ lwz r0, 8(r1) /* 80335D60 00332CC0 7C 1E 00 00 */ cmpw r30, r0 /* 80335D64 00332CC4 40 80 00 24 */ bge lbl_80335D88 @@ -1699,7 +1699,7 @@ GetValue__12CVETimeChainCFiR9CVector3f: /* 80335D74 00332CD4 81 83 00 00 */ lwz r12, 0(r3) /* 80335D78 00332CD8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80335D7C 00332CDC 7D 89 03 A6 */ mtctr r12 -/* 80335D80 00332CE0 4E 80 04 21 */ bctrl +/* 80335D80 00332CE0 4E 80 04 21 */ bctrl /* 80335D84 00332CE4 48 00 00 20 */ b lbl_80335DA4 lbl_80335D88: /* 80335D88 00332CE8 80 7D 00 08 */ lwz r3, 8(r29) @@ -1708,7 +1708,7 @@ lbl_80335D88: /* 80335D94 00332CF4 81 83 00 00 */ lwz r12, 0(r3) /* 80335D98 00332CF8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80335D9C 00332CFC 7D 89 03 A6 */ mtctr r12 -/* 80335DA0 00332D00 4E 80 04 21 */ bctrl +/* 80335DA0 00332D00 4E 80 04 21 */ bctrl lbl_80335DA4: /* 80335DA4 00332D04 80 01 00 24 */ lwz r0, 0x24(r1) /* 80335DA8 00332D08 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -1716,7 +1716,7 @@ lbl_80335DA4: /* 80335DB0 00332D10 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80335DB4 00332D14 7C 08 03 A6 */ mtlr r0 /* 80335DB8 00332D18 38 21 00 20 */ addi r1, r1, 0x20 -/* 80335DBC 00332D1C 4E 80 00 20 */ blr +/* 80335DBC 00332D1C 4E 80 00 20 */ blr .global __dt__12CVETimeChain __dt__12CVETimeChain: @@ -1738,7 +1738,7 @@ __dt__12CVETimeChain: /* 80335DFC 00332D5C 38 80 00 01 */ li r4, 1 /* 80335E00 00332D60 81 8C 00 08 */ lwz r12, 8(r12) /* 80335E04 00332D64 7D 89 03 A6 */ mtctr r12 -/* 80335E08 00332D68 4E 80 04 21 */ bctrl +/* 80335E08 00332D68 4E 80 04 21 */ bctrl lbl_80335E0C: /* 80335E0C 00332D6C 80 7E 00 08 */ lwz r3, 8(r30) /* 80335E10 00332D70 28 03 00 00 */ cmplwi r3, 0 @@ -1747,7 +1747,7 @@ lbl_80335E0C: /* 80335E1C 00332D7C 38 80 00 01 */ li r4, 1 /* 80335E20 00332D80 81 8C 00 08 */ lwz r12, 8(r12) /* 80335E24 00332D84 7D 89 03 A6 */ mtctr r12 -/* 80335E28 00332D88 4E 80 04 21 */ bctrl +/* 80335E28 00332D88 4E 80 04 21 */ bctrl lbl_80335E2C: /* 80335E2C 00332D8C 80 7E 00 0C */ lwz r3, 0xc(r30) /* 80335E30 00332D90 28 03 00 00 */ cmplwi r3, 0 @@ -1756,7 +1756,7 @@ lbl_80335E2C: /* 80335E3C 00332D9C 38 80 00 01 */ li r4, 1 /* 80335E40 00332DA0 81 8C 00 08 */ lwz r12, 8(r12) /* 80335E44 00332DA4 7D 89 03 A6 */ mtctr r12 -/* 80335E48 00332DA8 4E 80 04 21 */ bctrl +/* 80335E48 00332DA8 4E 80 04 21 */ bctrl lbl_80335E4C: /* 80335E4C 00332DAC 28 1E 00 00 */ cmplwi r30, 0 /* 80335E50 00332DB0 41 82 00 20 */ beq lbl_80335E70 @@ -1780,7 +1780,7 @@ lbl_80335E84: /* 80335E90 00332DF0 83 C1 00 08 */ lwz r30, 8(r1) /* 80335E94 00332DF4 7C 08 03 A6 */ mtlr r0 /* 80335E98 00332DF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80335E9C 00332DFC 4E 80 00 20 */ blr +/* 80335E9C 00332DFC 4E 80 00 20 */ blr .global __ct__12CVETimeChainFP14CVectorElementP14CVectorElementP11CIntElement __ct__12CVETimeChainFP14CVectorElementP14CVectorElementP11CIntElement: @@ -1796,7 +1796,7 @@ __ct__12CVETimeChainFP14CVectorElementP14CVectorElementP11CIntElement: /* 80335EC4 00332E24 90 83 00 04 */ stw r4, 4(r3) /* 80335EC8 00332E28 90 A3 00 08 */ stw r5, 8(r3) /* 80335ECC 00332E2C 90 C3 00 0C */ stw r6, 0xc(r3) -/* 80335ED0 00332E30 4E 80 00 20 */ blr +/* 80335ED0 00332E30 4E 80 00 20 */ blr .global GetValue__9CVECircleCFiR9CVector3f GetValue__9CVECircleCFiR9CVector3f: @@ -1820,21 +1820,21 @@ GetValue__9CVECircleCFiR9CVector3f: /* 80335F18 00332E78 81 83 00 00 */ lwz r12, 0(r3) /* 80335F1C 00332E7C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80335F20 00332E80 7D 89 03 A6 */ mtctr r12 -/* 80335F24 00332E84 4E 80 04 21 */ bctrl +/* 80335F24 00332E84 4E 80 04 21 */ bctrl /* 80335F28 00332E88 80 7D 00 28 */ lwz r3, 0x28(r29) /* 80335F2C 00332E8C 7F C4 F3 78 */ mr r4, r30 /* 80335F30 00332E90 38 A1 00 10 */ addi r5, r1, 0x10 /* 80335F34 00332E94 81 83 00 00 */ lwz r12, 0(r3) /* 80335F38 00332E98 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80335F3C 00332E9C 7D 89 03 A6 */ mtctr r12 -/* 80335F40 00332EA0 4E 80 04 21 */ bctrl +/* 80335F40 00332EA0 4E 80 04 21 */ bctrl /* 80335F44 00332EA4 80 7D 00 20 */ lwz r3, 0x20(r29) /* 80335F48 00332EA8 7F C4 F3 78 */ mr r4, r30 /* 80335F4C 00332EAC 38 A1 00 08 */ addi r5, r1, 8 /* 80335F50 00332EB0 81 83 00 00 */ lwz r12, 0(r3) /* 80335F54 00332EB4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80335F58 00332EB8 7D 89 03 A6 */ mtctr r12 -/* 80335F5C 00332EBC 4E 80 04 21 */ bctrl +/* 80335F5C 00332EBC 4E 80 04 21 */ bctrl /* 80335F60 00332EC0 6F C3 80 00 */ xoris r3, r30, 0x8000 /* 80335F64 00332EC4 3C 00 43 30 */ lis r0, 0x4330 /* 80335F68 00332EC8 90 61 00 24 */ stw r3, 0x24(r1) @@ -1857,7 +1857,7 @@ GetValue__9CVECircleCFiR9CVector3f: /* 80335FAC 00332F0C EF A0 00 72 */ fmuls f29, f0, f1 /* 80335FB0 00332F10 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80335FB4 00332F14 7D 89 03 A6 */ mtctr r12 -/* 80335FB8 00332F18 4E 80 04 21 */ bctrl +/* 80335FB8 00332F18 4E 80 04 21 */ bctrl /* 80335FBC 00332F1C FC 20 E8 90 */ fmr f1, f29 /* 80335FC0 00332F20 48 05 EB 1D */ bl sin /* 80335FC4 00332F24 C0 81 00 10 */ lfs f4, 0x10(r1) @@ -1909,7 +1909,7 @@ GetValue__9CVECircleCFiR9CVector3f: /* 8033607C 00332FDC 83 A1 00 34 */ lwz r29, 0x34(r1) /* 80336080 00332FE0 7C 08 03 A6 */ mtlr r0 /* 80336084 00332FE4 38 21 00 70 */ addi r1, r1, 0x70 -/* 80336088 00332FE8 4E 80 00 20 */ blr +/* 80336088 00332FE8 4E 80 00 20 */ blr .global __dt__9CVECircle __dt__9CVECircle: @@ -1931,7 +1931,7 @@ __dt__9CVECircle: /* 803360C8 00333028 38 80 00 01 */ li r4, 1 /* 803360CC 0033302C 81 8C 00 08 */ lwz r12, 8(r12) /* 803360D0 00333030 7D 89 03 A6 */ mtctr r12 -/* 803360D4 00333034 4E 80 04 21 */ bctrl +/* 803360D4 00333034 4E 80 04 21 */ bctrl lbl_803360D8: /* 803360D8 00333038 80 7E 00 20 */ lwz r3, 0x20(r30) /* 803360DC 0033303C 28 03 00 00 */ cmplwi r3, 0 @@ -1940,7 +1940,7 @@ lbl_803360D8: /* 803360E8 00333048 38 80 00 01 */ li r4, 1 /* 803360EC 0033304C 81 8C 00 08 */ lwz r12, 8(r12) /* 803360F0 00333050 7D 89 03 A6 */ mtctr r12 -/* 803360F4 00333054 4E 80 04 21 */ bctrl +/* 803360F4 00333054 4E 80 04 21 */ bctrl lbl_803360F8: /* 803360F8 00333058 80 7E 00 24 */ lwz r3, 0x24(r30) /* 803360FC 0033305C 28 03 00 00 */ cmplwi r3, 0 @@ -1949,7 +1949,7 @@ lbl_803360F8: /* 80336108 00333068 38 80 00 01 */ li r4, 1 /* 8033610C 0033306C 81 8C 00 08 */ lwz r12, 8(r12) /* 80336110 00333070 7D 89 03 A6 */ mtctr r12 -/* 80336114 00333074 4E 80 04 21 */ bctrl +/* 80336114 00333074 4E 80 04 21 */ bctrl lbl_80336118: /* 80336118 00333078 80 7E 00 28 */ lwz r3, 0x28(r30) /* 8033611C 0033307C 28 03 00 00 */ cmplwi r3, 0 @@ -1958,7 +1958,7 @@ lbl_80336118: /* 80336128 00333088 38 80 00 01 */ li r4, 1 /* 8033612C 0033308C 81 8C 00 08 */ lwz r12, 8(r12) /* 80336130 00333090 7D 89 03 A6 */ mtctr r12 -/* 80336134 00333094 4E 80 04 21 */ bctrl +/* 80336134 00333094 4E 80 04 21 */ bctrl lbl_80336138: /* 80336138 00333098 28 1E 00 00 */ cmplwi r30, 0 /* 8033613C 0033309C 41 82 00 20 */ beq lbl_8033615C @@ -1982,7 +1982,7 @@ lbl_80336170: /* 8033617C 003330DC 83 C1 00 08 */ lwz r30, 8(r1) /* 80336180 003330E0 7C 08 03 A6 */ mtlr r0 /* 80336184 003330E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80336188 003330E8 4E 80 00 20 */ blr +/* 80336188 003330E8 4E 80 00 20 */ blr .global __ct__9CVECircleFP14CVectorElementP14CVectorElementP12CRealElementP12CRealElementP12CRealElement __ct__9CVECircleFP14CVectorElementP14CVectorElementP12CRealElementP12CRealElementP12CRealElement: @@ -2032,7 +2032,7 @@ __ct__9CVECircleFP14CVectorElementP14CVectorElementP12CRealElementP12CRealElemen /* 80336238 00333198 81 9F 00 00 */ lwz r12, 0(r31) /* 8033623C 0033319C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80336240 003331A0 7D 89 03 A6 */ mtctr r12 -/* 80336244 003331A4 4E 80 04 21 */ bctrl +/* 80336244 003331A4 4E 80 04 21 */ bctrl /* 80336248 003331A8 38 61 00 08 */ addi r3, r1, 8 /* 8033624C 003331AC 38 81 00 14 */ addi r4, r1, 0x14 /* 80336250 003331B0 4B FD E6 01 */ bl AsNormalized__9CVector3fCFv @@ -2086,7 +2086,7 @@ lbl_803362C8: /* 80336308 00333268 81 9F 00 00 */ lwz r12, 0(r31) /* 8033630C 0033326C 81 8C 00 08 */ lwz r12, 8(r12) /* 80336310 00333270 7D 89 03 A6 */ mtctr r12 -/* 80336314 00333274 4E 80 04 21 */ bctrl +/* 80336314 00333274 4E 80 04 21 */ bctrl lbl_80336318: /* 80336318 00333278 80 01 00 34 */ lwz r0, 0x34(r1) /* 8033631C 0033327C 7F C3 F3 78 */ mr r3, r30 @@ -2094,7 +2094,7 @@ lbl_80336318: /* 80336324 00333284 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80336328 00333288 7C 08 03 A6 */ mtlr r0 /* 8033632C 0033328C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80336330 00333290 4E 80 00 20 */ blr +/* 80336330 00333290 4E 80 00 20 */ blr .global GetValue__12CVEAngleConeCFiR9CVector3f GetValue__12CVEAngleConeCFiR9CVector3f: @@ -2118,28 +2118,28 @@ GetValue__12CVEAngleConeCFiR9CVector3f: /* 80336378 003332D8 81 83 00 00 */ lwz r12, 0(r3) /* 8033637C 003332DC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80336380 003332E0 7D 89 03 A6 */ mtctr r12 -/* 80336384 003332E4 4E 80 04 21 */ bctrl +/* 80336384 003332E4 4E 80 04 21 */ bctrl /* 80336388 003332E8 80 7D 00 08 */ lwz r3, 8(r29) /* 8033638C 003332EC 7F C4 F3 78 */ mr r4, r30 /* 80336390 003332F0 38 A1 00 10 */ addi r5, r1, 0x10 /* 80336394 003332F4 81 83 00 00 */ lwz r12, 0(r3) /* 80336398 003332F8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8033639C 003332FC 7D 89 03 A6 */ mtctr r12 -/* 803363A0 00333300 4E 80 04 21 */ bctrl +/* 803363A0 00333300 4E 80 04 21 */ bctrl /* 803363A4 00333304 80 7D 00 0C */ lwz r3, 0xc(r29) /* 803363A8 00333308 7F C4 F3 78 */ mr r4, r30 /* 803363AC 0033330C 38 A1 00 14 */ addi r5, r1, 0x14 /* 803363B0 00333310 81 83 00 00 */ lwz r12, 0(r3) /* 803363B4 00333314 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803363B8 00333318 7D 89 03 A6 */ mtctr r12 -/* 803363BC 0033331C 4E 80 04 21 */ bctrl +/* 803363BC 0033331C 4E 80 04 21 */ bctrl /* 803363C0 00333320 80 7D 00 10 */ lwz r3, 0x10(r29) /* 803363C4 00333324 7F C4 F3 78 */ mr r4, r30 /* 803363C8 00333328 38 A1 00 0C */ addi r5, r1, 0xc /* 803363CC 0033332C 81 83 00 00 */ lwz r12, 0(r3) /* 803363D0 00333330 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803363D4 00333334 7D 89 03 A6 */ mtctr r12 -/* 803363D8 00333338 4E 80 04 21 */ bctrl +/* 803363D8 00333338 4E 80 04 21 */ bctrl /* 803363DC 0033333C C3 A1 00 14 */ lfs f29, 0x14(r1) /* 803363E0 00333340 4B FD C2 1D */ bl GetRandomNumber__9CRandom16Fv /* 803363E4 00333344 4B FD C0 F9 */ bl Float__9CRandom16Fv @@ -2187,7 +2187,7 @@ GetValue__12CVEAngleConeCFiR9CVector3f: /* 8033648C 003333EC 81 83 00 00 */ lwz r12, 0(r3) /* 80336490 003333F0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80336494 003333F4 7D 89 03 A6 */ mtctr r12 -/* 80336498 003333F8 4E 80 04 21 */ bctrl +/* 80336498 003333F8 4E 80 04 21 */ bctrl /* 8033649C 003333FC C0 01 00 08 */ lfs f0, 8(r1) /* 803364A0 00333400 38 60 00 00 */ li r3, 0 /* 803364A4 00333404 EC 40 07 F2 */ fmuls f2, f0, f31 @@ -2208,7 +2208,7 @@ GetValue__12CVEAngleConeCFiR9CVector3f: /* 803364E0 00333440 83 A1 00 24 */ lwz r29, 0x24(r1) /* 803364E4 00333444 7C 08 03 A6 */ mtlr r0 /* 803364E8 00333448 38 21 00 60 */ addi r1, r1, 0x60 -/* 803364EC 0033344C 4E 80 00 20 */ blr +/* 803364EC 0033344C 4E 80 00 20 */ blr .global __dt__12CVEAngleCone __dt__12CVEAngleCone: @@ -2230,7 +2230,7 @@ __dt__12CVEAngleCone: /* 8033652C 0033348C 38 80 00 01 */ li r4, 1 /* 80336530 00333490 81 8C 00 08 */ lwz r12, 8(r12) /* 80336534 00333494 7D 89 03 A6 */ mtctr r12 -/* 80336538 00333498 4E 80 04 21 */ bctrl +/* 80336538 00333498 4E 80 04 21 */ bctrl lbl_8033653C: /* 8033653C 0033349C 80 7E 00 08 */ lwz r3, 8(r30) /* 80336540 003334A0 28 03 00 00 */ cmplwi r3, 0 @@ -2239,7 +2239,7 @@ lbl_8033653C: /* 8033654C 003334AC 38 80 00 01 */ li r4, 1 /* 80336550 003334B0 81 8C 00 08 */ lwz r12, 8(r12) /* 80336554 003334B4 7D 89 03 A6 */ mtctr r12 -/* 80336558 003334B8 4E 80 04 21 */ bctrl +/* 80336558 003334B8 4E 80 04 21 */ bctrl lbl_8033655C: /* 8033655C 003334BC 80 7E 00 0C */ lwz r3, 0xc(r30) /* 80336560 003334C0 28 03 00 00 */ cmplwi r3, 0 @@ -2248,7 +2248,7 @@ lbl_8033655C: /* 8033656C 003334CC 38 80 00 01 */ li r4, 1 /* 80336570 003334D0 81 8C 00 08 */ lwz r12, 8(r12) /* 80336574 003334D4 7D 89 03 A6 */ mtctr r12 -/* 80336578 003334D8 4E 80 04 21 */ bctrl +/* 80336578 003334D8 4E 80 04 21 */ bctrl lbl_8033657C: /* 8033657C 003334DC 80 7E 00 10 */ lwz r3, 0x10(r30) /* 80336580 003334E0 28 03 00 00 */ cmplwi r3, 0 @@ -2257,7 +2257,7 @@ lbl_8033657C: /* 8033658C 003334EC 38 80 00 01 */ li r4, 1 /* 80336590 003334F0 81 8C 00 08 */ lwz r12, 8(r12) /* 80336594 003334F4 7D 89 03 A6 */ mtctr r12 -/* 80336598 003334F8 4E 80 04 21 */ bctrl +/* 80336598 003334F8 4E 80 04 21 */ bctrl lbl_8033659C: /* 8033659C 003334FC 80 7E 00 14 */ lwz r3, 0x14(r30) /* 803365A0 00333500 28 03 00 00 */ cmplwi r3, 0 @@ -2266,7 +2266,7 @@ lbl_8033659C: /* 803365AC 0033350C 38 80 00 01 */ li r4, 1 /* 803365B0 00333510 81 8C 00 08 */ lwz r12, 8(r12) /* 803365B4 00333514 7D 89 03 A6 */ mtctr r12 -/* 803365B8 00333518 4E 80 04 21 */ bctrl +/* 803365B8 00333518 4E 80 04 21 */ bctrl lbl_803365BC: /* 803365BC 0033351C 28 1E 00 00 */ cmplwi r30, 0 /* 803365C0 00333520 41 82 00 20 */ beq lbl_803365E0 @@ -2290,7 +2290,7 @@ lbl_803365F4: /* 80336600 00333560 83 C1 00 08 */ lwz r30, 8(r1) /* 80336604 00333564 7C 08 03 A6 */ mtlr r0 /* 80336608 00333568 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033660C 0033356C 4E 80 00 20 */ blr +/* 8033660C 0033356C 4E 80 00 20 */ blr .global __ct__12CVEAngleConeFP12CRealElementP12CRealElementP12CRealElementP12CRealElementP12CRealElement __ct__12CVEAngleConeFP12CRealElementP12CRealElementP12CRealElementP12CRealElementP12CRealElement: @@ -2308,7 +2308,7 @@ __ct__12CVEAngleConeFP12CRealElementP12CRealElementP12CRealElementP12CRealElemen /* 8033663C 0033359C 90 C3 00 0C */ stw r6, 0xc(r3) /* 80336640 003335A0 90 E3 00 10 */ stw r7, 0x10(r3) /* 80336644 003335A4 91 03 00 14 */ stw r8, 0x14(r3) -/* 80336648 003335A8 4E 80 00 20 */ blr +/* 80336648 003335A8 4E 80 00 20 */ blr .global GetValue__7CVEConeCFiR9CVector3f GetValue__7CVEConeCFiR9CVector3f: @@ -2338,14 +2338,14 @@ GetValue__7CVEConeCFiR9CVector3f: /* 803366A8 00333608 81 83 00 00 */ lwz r12, 0(r3) /* 803366AC 0033360C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803366B0 00333610 7D 89 03 A6 */ mtctr r12 -/* 803366B4 00333614 4E 80 04 21 */ bctrl +/* 803366B4 00333614 4E 80 04 21 */ bctrl /* 803366B8 00333618 80 7D 00 04 */ lwz r3, 4(r29) /* 803366BC 0033361C 7F C4 F3 78 */ mr r4, r30 /* 803366C0 00333620 38 A1 00 0C */ addi r5, r1, 0xc /* 803366C4 00333624 81 83 00 00 */ lwz r12, 0(r3) /* 803366C8 00333628 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803366CC 0033362C 7D 89 03 A6 */ mtctr r12 -/* 803366D0 00333630 4E 80 04 21 */ bctrl +/* 803366D0 00333630 4E 80 04 21 */ bctrl /* 803366D4 00333634 C0 21 00 08 */ lfs f1, 8(r1) /* 803366D8 00333638 C0 0D 9D 38 */ lfs f0, lbl_805A88F8@sda21(r13) /* 803366DC 0033363C FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -2416,7 +2416,7 @@ lbl_80336704: /* 803367D4 00333734 83 A1 00 24 */ lwz r29, 0x24(r1) /* 803367D8 00333738 7C 08 03 A6 */ mtlr r0 /* 803367DC 0033373C 38 21 00 70 */ addi r1, r1, 0x70 -/* 803367E0 00333740 4E 80 00 20 */ blr +/* 803367E0 00333740 4E 80 00 20 */ blr .global __dt__7CVECone __dt__7CVECone: @@ -2438,7 +2438,7 @@ __dt__7CVECone: /* 80336820 00333780 38 80 00 01 */ li r4, 1 /* 80336824 00333784 81 8C 00 08 */ lwz r12, 8(r12) /* 80336828 00333788 7D 89 03 A6 */ mtctr r12 -/* 8033682C 0033378C 4E 80 04 21 */ bctrl +/* 8033682C 0033378C 4E 80 04 21 */ bctrl lbl_80336830: /* 80336830 00333790 80 7E 00 08 */ lwz r3, 8(r30) /* 80336834 00333794 28 03 00 00 */ cmplwi r3, 0 @@ -2447,7 +2447,7 @@ lbl_80336830: /* 80336840 003337A0 38 80 00 01 */ li r4, 1 /* 80336844 003337A4 81 8C 00 08 */ lwz r12, 8(r12) /* 80336848 003337A8 7D 89 03 A6 */ mtctr r12 -/* 8033684C 003337AC 4E 80 04 21 */ bctrl +/* 8033684C 003337AC 4E 80 04 21 */ bctrl lbl_80336850: /* 80336850 003337B0 28 1E 00 00 */ cmplwi r30, 0 /* 80336854 003337B4 41 82 00 20 */ beq lbl_80336874 @@ -2471,7 +2471,7 @@ lbl_80336888: /* 80336894 003337F4 83 C1 00 08 */ lwz r30, 8(r1) /* 80336898 003337F8 7C 08 03 A6 */ mtlr r0 /* 8033689C 003337FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 803368A0 00333800 4E 80 00 20 */ blr +/* 803368A0 00333800 4E 80 00 20 */ blr .global __ct__7CVEConeFP14CVectorElementP12CRealElement __ct__7CVEConeFP14CVectorElementP12CRealElement: @@ -2515,7 +2515,7 @@ __ct__7CVEConeFP14CVectorElementP12CRealElement: /* 80336938 00333898 81 83 00 00 */ lwz r12, 0(r3) /* 8033693C 0033389C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80336940 003338A0 7D 89 03 A6 */ mtctr r12 -/* 80336944 003338A4 4E 80 04 21 */ bctrl +/* 80336944 003338A4 4E 80 04 21 */ bctrl /* 80336948 003338A8 38 61 00 08 */ addi r3, r1, 8 /* 8033694C 003338AC 38 81 00 14 */ addi r4, r1, 0x14 /* 80336950 003338B0 4B FD DF 01 */ bl AsNormalized__9CVector3fCFv @@ -2573,7 +2573,7 @@ lbl_803369E0: /* 80336A18 00333978 80 01 00 34 */ lwz r0, 0x34(r1) /* 80336A1C 0033397C 7C 08 03 A6 */ mtlr r0 /* 80336A20 00333980 38 21 00 30 */ addi r1, r1, 0x30 -/* 80336A24 00333984 4E 80 00 20 */ blr +/* 80336A24 00333984 4E 80 00 20 */ blr .global GetValue__15CVEFastConstantCFiR9CVector3f GetValue__15CVEFastConstantCFiR9CVector3f: @@ -2584,7 +2584,7 @@ GetValue__15CVEFastConstantCFiR9CVector3f: /* 80336A38 00333998 C0 03 00 0C */ lfs f0, 0xc(r3) /* 80336A3C 0033399C 38 60 00 00 */ li r3, 0 /* 80336A40 003339A0 D0 05 00 08 */ stfs f0, 8(r5) -/* 80336A44 003339A4 4E 80 00 20 */ blr +/* 80336A44 003339A4 4E 80 00 20 */ blr .global __dt__15CVEFastConstant __dt__15CVEFastConstant: @@ -2617,7 +2617,7 @@ lbl_80336AA0: /* 80336AA8 00333A08 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80336AAC 00333A0C 7C 08 03 A6 */ mtlr r0 /* 80336AB0 00333A10 38 21 00 10 */ addi r1, r1, 0x10 -/* 80336AB4 00333A14 4E 80 00 20 */ blr +/* 80336AB4 00333A14 4E 80 00 20 */ blr .global __ct__15CVEFastConstantFfff __ct__15CVEFastConstantFfff: @@ -2633,7 +2633,7 @@ __ct__15CVEFastConstantFfff: /* 80336ADC 00333A3C D0 23 00 04 */ stfs f1, 4(r3) /* 80336AE0 00333A40 D0 43 00 08 */ stfs f2, 8(r3) /* 80336AE4 00333A44 D0 63 00 0C */ stfs f3, 0xc(r3) -/* 80336AE8 00333A48 4E 80 00 20 */ blr +/* 80336AE8 00333A48 4E 80 00 20 */ blr .global GetValue__11CVEConstantCFiR9CVector3f GetValue__11CVEConstantCFiR9CVector3f: @@ -2651,21 +2651,21 @@ GetValue__11CVEConstantCFiR9CVector3f: /* 80336B18 00333A78 81 83 00 00 */ lwz r12, 0(r3) /* 80336B1C 00333A7C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80336B20 00333A80 7D 89 03 A6 */ mtctr r12 -/* 80336B24 00333A84 4E 80 04 21 */ bctrl +/* 80336B24 00333A84 4E 80 04 21 */ bctrl /* 80336B28 00333A88 80 7D 00 08 */ lwz r3, 8(r29) /* 80336B2C 00333A8C 7F C4 F3 78 */ mr r4, r30 /* 80336B30 00333A90 38 A1 00 0C */ addi r5, r1, 0xc /* 80336B34 00333A94 81 83 00 00 */ lwz r12, 0(r3) /* 80336B38 00333A98 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80336B3C 00333A9C 7D 89 03 A6 */ mtctr r12 -/* 80336B40 00333AA0 4E 80 04 21 */ bctrl +/* 80336B40 00333AA0 4E 80 04 21 */ bctrl /* 80336B44 00333AA4 80 7D 00 0C */ lwz r3, 0xc(r29) /* 80336B48 00333AA8 7F C4 F3 78 */ mr r4, r30 /* 80336B4C 00333AAC 38 A1 00 08 */ addi r5, r1, 8 /* 80336B50 00333AB0 81 83 00 00 */ lwz r12, 0(r3) /* 80336B54 00333AB4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80336B58 00333AB8 7D 89 03 A6 */ mtctr r12 -/* 80336B5C 00333ABC 4E 80 04 21 */ bctrl +/* 80336B5C 00333ABC 4E 80 04 21 */ bctrl /* 80336B60 00333AC0 C0 41 00 08 */ lfs f2, 8(r1) /* 80336B64 00333AC4 38 60 00 00 */ li r3, 0 /* 80336B68 00333AC8 C0 21 00 0C */ lfs f1, 0xc(r1) @@ -2679,7 +2679,7 @@ GetValue__11CVEConstantCFiR9CVector3f: /* 80336B88 00333AE8 80 01 00 34 */ lwz r0, 0x34(r1) /* 80336B8C 00333AEC 7C 08 03 A6 */ mtlr r0 /* 80336B90 00333AF0 38 21 00 30 */ addi r1, r1, 0x30 -/* 80336B94 00333AF4 4E 80 00 20 */ blr +/* 80336B94 00333AF4 4E 80 00 20 */ blr .global __dt__11CVEConstantF __dt__11CVEConstantF: @@ -2701,7 +2701,7 @@ __dt__11CVEConstantF: /* 80336BD4 00333B34 38 80 00 01 */ li r4, 1 /* 80336BD8 00333B38 81 8C 00 08 */ lwz r12, 8(r12) /* 80336BDC 00333B3C 7D 89 03 A6 */ mtctr r12 -/* 80336BE0 00333B40 4E 80 04 21 */ bctrl +/* 80336BE0 00333B40 4E 80 04 21 */ bctrl lbl_80336BE4: /* 80336BE4 00333B44 80 7E 00 08 */ lwz r3, 8(r30) /* 80336BE8 00333B48 28 03 00 00 */ cmplwi r3, 0 @@ -2710,7 +2710,7 @@ lbl_80336BE4: /* 80336BF4 00333B54 38 80 00 01 */ li r4, 1 /* 80336BF8 00333B58 81 8C 00 08 */ lwz r12, 8(r12) /* 80336BFC 00333B5C 7D 89 03 A6 */ mtctr r12 -/* 80336C00 00333B60 4E 80 04 21 */ bctrl +/* 80336C00 00333B60 4E 80 04 21 */ bctrl lbl_80336C04: /* 80336C04 00333B64 80 7E 00 0C */ lwz r3, 0xc(r30) /* 80336C08 00333B68 28 03 00 00 */ cmplwi r3, 0 @@ -2719,7 +2719,7 @@ lbl_80336C04: /* 80336C14 00333B74 38 80 00 01 */ li r4, 1 /* 80336C18 00333B78 81 8C 00 08 */ lwz r12, 8(r12) /* 80336C1C 00333B7C 7D 89 03 A6 */ mtctr r12 -/* 80336C20 00333B80 4E 80 04 21 */ bctrl +/* 80336C20 00333B80 4E 80 04 21 */ bctrl lbl_80336C24: /* 80336C24 00333B84 28 1E 00 00 */ cmplwi r30, 0 /* 80336C28 00333B88 41 82 00 20 */ beq lbl_80336C48 @@ -2743,7 +2743,7 @@ lbl_80336C5C: /* 80336C68 00333BC8 83 C1 00 08 */ lwz r30, 8(r1) /* 80336C6C 00333BCC 7C 08 03 A6 */ mtlr r0 /* 80336C70 00333BD0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80336C74 00333BD4 4E 80 00 20 */ blr +/* 80336C74 00333BD4 4E 80 00 20 */ blr .global __ct__11CVEConstantFP12CRealElementP12CRealElementP12CRealElement __ct__11CVEConstantFP12CRealElementP12CRealElementP12CRealElement: @@ -2759,7 +2759,7 @@ __ct__11CVEConstantFP12CRealElementP12CRealElementP12CRealElement: /* 80336C9C 00333BFC 90 83 00 04 */ stw r4, 4(r3) /* 80336CA0 00333C00 90 A3 00 08 */ stw r5, 8(r3) /* 80336CA4 00333C04 90 C3 00 0C */ stw r6, 0xc(r3) -/* 80336CA8 00333C08 4E 80 00 20 */ blr +/* 80336CA8 00333C08 4E 80 00 20 */ blr .global __dt__28CVEParticleSystemTranslationFv __dt__28CVEParticleSystemTranslationFv: @@ -2792,7 +2792,7 @@ lbl_80336D04: /* 80336D0C 00333C6C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80336D10 00333C70 7C 08 03 A6 */ mtlr r0 /* 80336D14 00333C74 38 21 00 10 */ addi r1, r1, 0x10 -/* 80336D18 00333C78 4E 80 00 20 */ blr +/* 80336D18 00333C78 4E 80 00 20 */ blr .global __dt__33CVEParticleSystemOrientationRightF __dt__33CVEParticleSystemOrientationRightF: @@ -2825,7 +2825,7 @@ lbl_80336D74: /* 80336D7C 00333CDC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80336D80 00333CE0 7C 08 03 A6 */ mtlr r0 /* 80336D84 00333CE4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80336D88 00333CE8 4E 80 00 20 */ blr +/* 80336D88 00333CE8 4E 80 00 20 */ blr .global __dt__31CVEParticleSystemOrienatationUpF __dt__31CVEParticleSystemOrienatationUpF: @@ -2858,7 +2858,7 @@ lbl_80336DE4: /* 80336DEC 00333D4C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80336DF0 00333D50 7C 08 03 A6 */ mtlr r0 /* 80336DF4 00333D54 38 21 00 10 */ addi r1, r1, 0x10 -/* 80336DF8 00333D58 4E 80 00 20 */ blr +/* 80336DF8 00333D58 4E 80 00 20 */ blr .global __dt__33CVEParticleSystemOrientationFrontF __dt__33CVEParticleSystemOrientationFrontF: @@ -2891,7 +2891,7 @@ lbl_80336E54: /* 80336E5C 00333DBC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80336E60 00333DC0 7C 08 03 A6 */ mtlr r0 /* 80336E64 00333DC4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80336E68 00333DC8 4E 80 00 20 */ blr +/* 80336E68 00333DC8 4E 80 00 20 */ blr .global __dt__19CVEParticleVelocityF __dt__19CVEParticleVelocityF: @@ -2924,7 +2924,7 @@ lbl_80336EC4: /* 80336ECC 00333E2C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80336ED0 00333E30 7C 08 03 A6 */ mtlr r0 /* 80336ED4 00333E34 38 21 00 10 */ addi r1, r1, 0x10 -/* 80336ED8 00333E38 4E 80 00 20 */ blr +/* 80336ED8 00333E38 4E 80 00 20 */ blr .global __dt__16CVEParticleColorF __dt__16CVEParticleColorF: @@ -2957,7 +2957,7 @@ lbl_80336F34: /* 80336F3C 00333E9C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80336F40 00333EA0 7C 08 03 A6 */ mtlr r0 /* 80336F44 00333EA4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80336F48 00333EA8 4E 80 00 20 */ blr +/* 80336F48 00333EA8 4E 80 00 20 */ blr .global __dt__19CVEParticleLocation __dt__19CVEParticleLocation: @@ -2990,9 +2990,9 @@ lbl_80336FA4: /* 80336FAC 00333F0C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80336FB0 00333F10 7C 08 03 A6 */ mtlr r0 /* 80336FB4 00333F14 38 21 00 10 */ addi r1, r1, 0x10 -/* 80336FB8 00333F18 4E 80 00 20 */ blr +/* 80336FB8 00333F18 4E 80 00 20 */ blr .global IsFastConstant__15CVEFastConstantCF IsFastConstant__15CVEFastConstantCF: /* 80336FBC 00333F1C 38 60 00 01 */ li r3, 1 -/* 80336FC0 00333F20 4E 80 00 20 */ blr +/* 80336FC0 00333F20 4E 80 00 20 */ blr diff --git a/asm/Kyoto/Particles/CWarp.s b/asm/Kyoto/Particles/CWarp.s index a89ec10c..6aa38774 100644 --- a/asm/Kyoto/Particles/CWarp.s +++ b/asm/Kyoto/Particles/CWarp.s @@ -13,7 +13,7 @@ lbl_803EE2F8: .4byte 0 .4byte 0 .4byte 0 - + .section .text, "ax" .global __dt__5CWarpFv @@ -36,4 +36,4 @@ lbl_80336FF4: /* 80336FFC 00333F5C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80337000 00333F60 7C 08 03 A6 */ mtlr r0 /* 80337004 00333F64 38 21 00 10 */ addi r1, r1, 0x10 -/* 80337008 00333F68 4E 80 00 20 */ blr +/* 80337008 00333F68 4E 80 00 20 */ blr diff --git a/asm/Kyoto/Streams/CInputStream.s b/asm/Kyoto/Streams/CInputStream.s index 86318454..b876a4b1 100644 --- a/asm/Kyoto/Streams/CInputStream.s +++ b/asm/Kyoto/Streams/CInputStream.s @@ -45,7 +45,7 @@ ReadFloat__12CInputStreamFv: /* 8033EC44 0033BBA4 C0 2D A9 40 */ lfs f1, lbl_805A9500@sda21(r13) /* 8033EC48 0033BBA8 7C 08 03 A6 */ mtlr r0 /* 8033EC4C 0033BBAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033EC50 0033BBB0 4E 80 00 20 */ blr +/* 8033EC50 0033BBB0 4E 80 00 20 */ blr .global ReadLongLong__12CInputStreamFv ReadLongLong__12CInputStreamFv: @@ -60,7 +60,7 @@ ReadLongLong__12CInputStreamFv: /* 8033EC74 0033BBD4 80 8D A9 3C */ lwz r4, lbl_805A94FC@sda21(r13) /* 8033EC78 0033BBD8 7C 08 03 A6 */ mtlr r0 /* 8033EC7C 0033BBDC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033EC80 0033BBE0 4E 80 00 20 */ blr +/* 8033EC80 0033BBE0 4E 80 00 20 */ blr .global ReadLong__12CInputStreamFv ReadLong__12CInputStreamFv: @@ -74,7 +74,7 @@ ReadLong__12CInputStreamFv: /* 8033ECA0 0033BC00 80 6D A9 34 */ lwz r3, lbl_805A94F4@sda21(r13) /* 8033ECA4 0033BC04 7C 08 03 A6 */ mtlr r0 /* 8033ECA8 0033BC08 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033ECAC 0033BC0C 4E 80 00 20 */ blr +/* 8033ECAC 0033BC0C 4E 80 00 20 */ blr .global ReadShort__12CInputStreamFv ReadShort__12CInputStreamFv: @@ -88,7 +88,7 @@ ReadShort__12CInputStreamFv: /* 8033ECCC 0033BC2C A0 6D A9 32 */ lhz r3, lbl_805A94F2@sda21(r13) /* 8033ECD0 0033BC30 7C 08 03 A6 */ mtlr r0 /* 8033ECD4 0033BC34 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033ECD8 0033BC38 4E 80 00 20 */ blr +/* 8033ECD8 0033BC38 4E 80 00 20 */ blr .global ReadBool__12CInputStreamFv ReadBool__12CInputStreamFv: @@ -103,7 +103,7 @@ ReadBool__12CInputStreamFv: /* 8033ECFC 0033BC5C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8033ED00 0033BC60 7C 08 03 A6 */ mtlr r0 /* 8033ED04 0033BC64 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033ED08 0033BC68 4E 80 00 20 */ blr +/* 8033ED08 0033BC68 4E 80 00 20 */ blr .global ReadChar__12CInputStreamFv ReadChar__12CInputStreamFv: @@ -117,7 +117,7 @@ ReadChar__12CInputStreamFv: /* 8033ED28 0033BC88 88 6D A9 30 */ lbz r3, lbl_805A94F0@sda21(r13) /* 8033ED2C 0033BC8C 7C 08 03 A6 */ mtlr r0 /* 8033ED30 0033BC90 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033ED34 0033BC94 4E 80 00 20 */ blr +/* 8033ED34 0033BC94 4E 80 00 20 */ blr .global ReadBits__12CInputStreamFi ReadBits__12CInputStreamFi: @@ -207,7 +207,7 @@ lbl_8033EE60: /* 8033EE70 0033BDD0 83 81 00 10 */ lwz r28, 0x10(r1) /* 8033EE74 0033BDD4 7C 08 03 A6 */ mtlr r0 /* 8033EE78 0033BDD8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8033EE7C 0033BDDC 4E 80 00 20 */ blr +/* 8033EE7C 0033BDDC 4E 80 00 20 */ blr .global ReadBytes__12CInputStreamFPvUl ReadBytes__12CInputStreamFPvUl: @@ -270,7 +270,7 @@ lbl_8033EF40: /* 8033EF44 0033BEA4 80 01 00 24 */ lwz r0, 0x24(r1) /* 8033EF48 0033BEA8 7C 08 03 A6 */ mtlr r0 /* 8033EF4C 0033BEAC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8033EF50 0033BEB0 4E 80 00 20 */ blr +/* 8033EF50 0033BEB0 4E 80 00 20 */ blr .global Get__12CInputStreamFPvUl Get__12CInputStreamFPvUl: @@ -316,7 +316,7 @@ lbl_8033EFD0: /* 8033EFE4 0033BF44 7C 9C EA 14 */ add r4, r28, r29 /* 8033EFE8 0033BF48 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8033EFEC 0033BF4C 7D 89 03 A6 */ mtctr r12 -/* 8033EFF0 0033BF50 4E 80 04 21 */ bctrl +/* 8033EFF0 0033BF50 4E 80 04 21 */ bctrl /* 8033EFF4 0033BF54 7F C3 F0 50 */ subf r30, r3, r30 /* 8033EFF8 0033BF58 7F BD 1A 14 */ add r29, r29, r3 /* 8033EFFC 0033BF5C 48 00 00 0C */ b lbl_8033F008 @@ -333,7 +333,7 @@ lbl_8033F008: /* 8033F020 0033BF80 80 01 00 24 */ lwz r0, 0x24(r1) /* 8033F024 0033BF84 7C 08 03 A6 */ mtlr r0 /* 8033F028 0033BF88 38 21 00 20 */ addi r1, r1, 0x20 -/* 8033F02C 0033BF8C 4E 80 00 20 */ blr +/* 8033F02C 0033BF8C 4E 80 00 20 */ blr .global GrabAnotherBlock__12CInputStreamFv GrabAnotherBlock__12CInputStreamFv: @@ -344,7 +344,7 @@ GrabAnotherBlock__12CInputStreamFv: /* 8033F040 0033BFA0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8033F044 0033BFA4 7C 08 03 A6 */ mtlr r0 /* 8033F048 0033BFA8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033F04C 0033BFAC 4E 80 00 20 */ blr +/* 8033F04C 0033BFAC 4E 80 00 20 */ blr .global InternalReadNext__12CInputStreamFv InternalReadNext__12CInputStreamFv: @@ -358,7 +358,7 @@ InternalReadNext__12CInputStreamFv: /* 8033F06C 0033BFCC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8033F070 0033BFD0 80 A3 00 0C */ lwz r5, 0xc(r3) /* 8033F074 0033BFD4 7D 89 03 A6 */ mtctr r12 -/* 8033F078 0033BFD8 4E 80 04 21 */ bctrl +/* 8033F078 0033BFD8 4E 80 04 21 */ bctrl /* 8033F07C 0033BFDC 90 7F 00 08 */ stw r3, 8(r31) /* 8033F080 0033BFE0 38 00 00 00 */ li r0, 0 /* 8033F084 0033BFE4 90 1F 00 04 */ stw r0, 4(r31) @@ -370,7 +370,7 @@ InternalReadNext__12CInputStreamFv: /* 8033F09C 0033BFFC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8033F0A0 0033C000 7C 08 03 A6 */ mtlr r0 /* 8033F0A4 0033C004 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033F0A8 0033C008 4E 80 00 20 */ blr +/* 8033F0A8 0033C008 4E 80 00 20 */ blr .global __dt__12CInputStreamFv __dt__12CInputStreamFv: @@ -402,7 +402,7 @@ lbl_8033F0FC: /* 8033F108 0033C068 83 C1 00 08 */ lwz r30, 8(r1) /* 8033F10C 0033C06C 7C 08 03 A6 */ mtlr r0 /* 8033F110 0033C070 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033F114 0033C074 4E 80 00 20 */ blr +/* 8033F114 0033C074 4E 80 00 20 */ blr .global __ct__12CInputStreamFPCvib __ct__12CInputStreamFPCvib: @@ -418,7 +418,7 @@ __ct__12CInputStreamFPCvib: /* 8033F13C 0033C09C 90 03 00 18 */ stw r0, 0x18(r3) /* 8033F140 0033C0A0 90 03 00 1C */ stw r0, 0x1c(r3) /* 8033F144 0033C0A4 90 03 00 20 */ stw r0, 0x20(r3) -/* 8033F148 0033C0A8 4E 80 00 20 */ blr +/* 8033F148 0033C0A8 4E 80 00 20 */ blr .global __ct__12CInputStreamFi __ct__12CInputStreamFi: diff --git a/asm/Kyoto/Streams/CMemoryInStream.s b/asm/Kyoto/Streams/CMemoryInStream.s index d04912dd..1fd44ae6 100644 --- a/asm/Kyoto/Streams/CMemoryInStream.s +++ b/asm/Kyoto/Streams/CMemoryInStream.s @@ -15,7 +15,7 @@ __vt__15CMemoryInStream: .global Read__15CMemoryInStreamFPvUl Read__15CMemoryInStreamFPvUl: /* 8033F1C4 0033C124 38 60 00 00 */ li r3, 0 -/* 8033F1C8 0033C128 4E 80 00 20 */ blr +/* 8033F1C8 0033C128 4E 80 00 20 */ blr .global __ct__15CMemoryInStreamFPCvUl __ct__15CMemoryInStreamFPCvUl: @@ -34,7 +34,7 @@ __ct__15CMemoryInStreamFPCvUl: /* 8033F1FC 0033C15C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8033F200 0033C160 7C 08 03 A6 */ mtlr r0 /* 8033F204 0033C164 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033F208 0033C168 4E 80 00 20 */ blr +/* 8033F208 0033C168 4E 80 00 20 */ blr .global __ct__15CMemoryInStreamFPvUlQ215CMemoryInStream10EOwnerShip __ct__15CMemoryInStreamFPvUlQ215CMemoryInStream10EOwnerShip: @@ -54,4 +54,4 @@ __ct__15CMemoryInStreamFPvUlQ215CMemoryInStream10EOwnerShip: /* 8033F240 0033C1A0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8033F244 0033C1A4 7C 08 03 A6 */ mtlr r0 /* 8033F248 0033C1A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033F24C 0033C1AC 4E 80 00 20 */ blr +/* 8033F24C 0033C1AC 4E 80 00 20 */ blr diff --git a/asm/Kyoto/Streams/CMemoryStreamOut.s b/asm/Kyoto/Streams/CMemoryStreamOut.s index ae7263b7..6686e1e5 100644 --- a/asm/Kyoto/Streams/CMemoryStreamOut.s +++ b/asm/Kyoto/Streams/CMemoryStreamOut.s @@ -43,7 +43,7 @@ lbl_8033F2A8: /* 8033F2B0 0033C210 83 C1 00 08 */ lwz r30, 8(r1) /* 8033F2B4 0033C214 7C 08 03 A6 */ mtlr r0 /* 8033F2B8 0033C218 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033F2BC 0033C21C 4E 80 00 20 */ blr +/* 8033F2BC 0033C21C 4E 80 00 20 */ blr .global __dt__16CMemoryStreamOutFv __dt__16CMemoryStreamOutFv: @@ -79,7 +79,7 @@ lbl_8033F320: /* 8033F32C 0033C28C 83 C1 00 08 */ lwz r30, 8(r1) /* 8033F330 0033C290 7C 08 03 A6 */ mtlr r0 /* 8033F334 0033C294 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033F338 0033C298 4E 80 00 20 */ blr +/* 8033F338 0033C298 4E 80 00 20 */ blr .global __ct__16CMemoryStreamOutFPvUlQ216CMemoryStreamOut10EOwnerShipi __ct__16CMemoryStreamOutFPvUlQ216CMemoryStreamOut10EOwnerShipi: @@ -114,4 +114,4 @@ __ct__16CMemoryStreamOutFPvUlQ216CMemoryStreamOut10EOwnerShipi: /* 8033F3AC 0033C30C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8033F3B0 0033C310 7C 08 03 A6 */ mtlr r0 /* 8033F3B4 0033C314 38 21 00 20 */ addi r1, r1, 0x20 -/* 8033F3B8 0033C318 4E 80 00 20 */ blr +/* 8033F3B8 0033C318 4E 80 00 20 */ blr diff --git a/asm/Kyoto/Streams/COutputStream.s b/asm/Kyoto/Streams/COutputStream.s index 49390273..11ddb369 100644 --- a/asm/Kyoto/Streams/COutputStream.s +++ b/asm/Kyoto/Streams/COutputStream.s @@ -81,7 +81,7 @@ lbl_8033F49C: /* 8033F4A8 0033C408 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8033F4AC 0033C40C 7C 08 03 A6 */ mtlr r0 /* 8033F4B0 0033C410 38 21 00 20 */ addi r1, r1, 0x20 -/* 8033F4B4 0033C414 4E 80 00 20 */ blr +/* 8033F4B4 0033C414 4E 80 00 20 */ blr .global FlushShiftRegister__13COutputStreamFv FlushShiftRegister__13COutputStreamFv: @@ -112,7 +112,7 @@ lbl_8033F510: /* 8033F514 0033C474 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8033F518 0033C478 7C 08 03 A6 */ mtlr r0 /* 8033F51C 0033C47C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033F520 0033C480 4E 80 00 20 */ blr +/* 8033F520 0033C480 4E 80 00 20 */ blr .global DoFlush__13COutputStreamFv DoFlush__13COutputStreamFv: @@ -128,7 +128,7 @@ DoFlush__13COutputStreamFv: /* 8033F548 0033C4A8 80 9F 00 0C */ lwz r4, 0xc(r31) /* 8033F54C 0033C4AC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8033F550 0033C4B0 7D 89 03 A6 */ mtctr r12 -/* 8033F554 0033C4B4 4E 80 04 21 */ bctrl +/* 8033F554 0033C4B4 4E 80 04 21 */ bctrl /* 8033F558 0033C4B8 38 00 00 00 */ li r0, 0 /* 8033F55C 0033C4BC 90 1F 00 04 */ stw r0, 4(r31) lbl_8033F560: @@ -136,7 +136,7 @@ lbl_8033F560: /* 8033F564 0033C4C4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8033F568 0033C4C8 7C 08 03 A6 */ mtlr r0 /* 8033F56C 0033C4CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033F570 0033C4D0 4E 80 00 20 */ blr +/* 8033F570 0033C4D0 4E 80 00 20 */ blr .global Flush__13COutputStreamFv Flush__13COutputStreamFv: @@ -152,7 +152,7 @@ Flush__13COutputStreamFv: /* 8033F598 0033C4F8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8033F59C 0033C4FC 7C 08 03 A6 */ mtlr r0 /* 8033F5A0 0033C500 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033F5A4 0033C504 4E 80 00 20 */ blr +/* 8033F5A4 0033C504 4E 80 00 20 */ blr .global DoPut__13COutputStreamFPCvUl DoPut__13COutputStreamFPCvUl: @@ -219,7 +219,7 @@ lbl_8033F670: /* 8033F680 0033C5E0 83 81 00 10 */ lwz r28, 0x10(r1) /* 8033F684 0033C5E4 7C 08 03 A6 */ mtlr r0 /* 8033F688 0033C5E8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8033F68C 0033C5EC 4E 80 00 20 */ blr +/* 8033F68C 0033C5EC 4E 80 00 20 */ blr .global __dt__13COutputStreamFv __dt__13COutputStreamFv: @@ -251,7 +251,7 @@ lbl_8033F6E0: /* 8033F6EC 0033C64C 83 C1 00 08 */ lwz r30, 8(r1) /* 8033F6F0 0033C650 7C 08 03 A6 */ mtlr r0 /* 8033F6F4 0033C654 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033F6F8 0033C658 4E 80 00 20 */ blr +/* 8033F6F8 0033C658 4E 80 00 20 */ blr .global __ct__13COutputStreamFi __ct__13COutputStreamFi: diff --git a/asm/Kyoto/Streams/CZipInputStream.s b/asm/Kyoto/Streams/CZipInputStream.s index ce099ec7..d10f84e3 100644 --- a/asm/Kyoto/Streams/CZipInputStream.s +++ b/asm/Kyoto/Streams/CZipInputStream.s @@ -51,7 +51,7 @@ lbl_8033F80C: /* 8033F830 0033C790 80 01 00 24 */ lwz r0, 0x24(r1) /* 8033F834 0033C794 7C 08 03 A6 */ mtlr r0 /* 8033F838 0033C798 38 21 00 20 */ addi r1, r1, 0x20 -/* 8033F83C 0033C79C 4E 80 00 20 */ blr +/* 8033F83C 0033C79C 4E 80 00 20 */ blr .global __dt__15CZipInputStreamFv __dt__15CZipInputStreamFv: @@ -85,7 +85,7 @@ lbl_8033F884: /* 8033F8A8 0033C808 38 80 00 01 */ li r4, 1 /* 8033F8AC 0033C80C 81 8C 00 08 */ lwz r12, 8(r12) /* 8033F8B0 0033C810 7D 89 03 A6 */ mtctr r12 -/* 8033F8B4 0033C814 4E 80 04 21 */ bctrl +/* 8033F8B4 0033C814 4E 80 04 21 */ bctrl lbl_8033F8B8: /* 8033F8B8 0033C818 34 1E 00 24 */ addic. r0, r30, 0x24 /* 8033F8BC 0033C81C 41 82 00 0C */ beq lbl_8033F8C8 @@ -106,7 +106,7 @@ lbl_8033F8E4: /* 8033F8F0 0033C850 83 C1 00 08 */ lwz r30, 8(r1) /* 8033F8F4 0033C854 7C 08 03 A6 */ mtlr r0 /* 8033F8F8 0033C858 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033F8FC 0033C85C 4E 80 00 20 */ blr +/* 8033F8FC 0033C85C 4E 80 00 20 */ blr .global "__ct__15CZipInputStreamFQ24rstl24auto_ptr<12CInputStream>" "__ct__15CZipInputStreamFQ24rstl24auto_ptr<12CInputStream>": diff --git a/asm/Kyoto/Streams/CZipSupport.s b/asm/Kyoto/Streams/CZipSupport.s index 7ff2d0f9..bb73019a 100644 --- a/asm/Kyoto/Streams/CZipSupport.s +++ b/asm/Kyoto/Streams/CZipSupport.s @@ -15,7 +15,7 @@ lbl_8033FA08: /* 8033FA08 0033C968 80 01 00 14 */ lwz r0, 0x14(r1) /* 8033FA0C 0033C96C 7C 08 03 A6 */ mtlr r0 /* 8033FA10 0033C970 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033FA14 0033C974 4E 80 00 20 */ blr +/* 8033FA14 0033C974 4E 80 00 20 */ blr .global Alloc__11CZipSupportFPvUiUi Alloc__11CZipSupportFPvUiUi: diff --git a/asm/Kyoto/Text/CBlockInstruction.s b/asm/Kyoto/Text/CBlockInstruction.s index ae85a9a2..baf91eaf 100644 --- a/asm/Kyoto/Text/CBlockInstruction.s +++ b/asm/Kyoto/Text/CBlockInstruction.s @@ -56,7 +56,7 @@ lbl_80305E1C: /* 80305E24 00302D84 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80305E28 00302D88 7C 08 03 A6 */ mtlr r0 /* 80305E2C 00302D8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80305E30 00302D90 4E 80 00 20 */ blr +/* 80305E30 00302D90 4E 80 00 20 */ blr .global PageInvoke__17CBlockInstructionCFR16CFontRenderStateP17CTextRenderBuffer PageInvoke__17CBlockInstructionCFR16CFontRenderStateP17CTextRenderBuffer: @@ -66,11 +66,11 @@ PageInvoke__17CBlockInstructionCFR16CFontRenderStateP17CTextRenderBuffer: /* 80305E40 00302DA0 81 83 00 00 */ lwz r12, 0(r3) /* 80305E44 00302DA4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80305E48 00302DA8 7D 89 03 A6 */ mtctr r12 -/* 80305E4C 00302DAC 4E 80 04 21 */ bctrl +/* 80305E4C 00302DAC 4E 80 04 21 */ bctrl /* 80305E50 00302DB0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80305E54 00302DB4 7C 08 03 A6 */ mtlr r0 /* 80305E58 00302DB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80305E5C 00302DBC 4E 80 00 20 */ blr +/* 80305E5C 00302DBC 4E 80 00 20 */ blr .global TestLargestFont__17CBlockInstructionFiii TestLargestFont__17CBlockInstructionFiii: @@ -86,27 +86,27 @@ lbl_80305E70: lbl_80305E80: /* 80305E80 00302DE0 80 03 00 24 */ lwz r0, 0x24(r3) /* 80305E84 00302DE4 7C 00 28 00 */ cmpw r0, r5 -/* 80305E88 00302DE8 4C 80 00 20 */ bgelr +/* 80305E88 00302DE8 4C 80 00 20 */ bgelr /* 80305E8C 00302DEC 90 A3 00 24 */ stw r5, 0x24(r3) /* 80305E90 00302DF0 90 C3 00 28 */ stw r6, 0x28(r3) -/* 80305E94 00302DF4 4E 80 00 20 */ blr +/* 80305E94 00302DF4 4E 80 00 20 */ blr .global SetupPositionLTR__17CBlockInstructionCFR16CFontRenderState SetupPositionLTR__17CBlockInstructionCFR16CFontRenderState: /* 80305E98 00302DF8 80 03 00 1C */ lwz r0, 0x1c(r3) /* 80305E9C 00302DFC 28 00 00 09 */ cmplwi r0, 9 -/* 80305EA0 00302E00 4D 81 00 20 */ bgtlr +/* 80305EA0 00302E00 4D 81 00 20 */ bgtlr /* 80305EA4 00302E04 3C A0 80 3F */ lis r5, lbl_803ED8E4@ha /* 80305EA8 00302E08 54 00 10 3A */ slwi r0, r0, 2 /* 80305EAC 00302E0C 38 A5 D8 E4 */ addi r5, r5, lbl_803ED8E4@l /* 80305EB0 00302E10 7C 05 00 2E */ lwzx r0, r5, r0 /* 80305EB4 00302E14 7C 09 03 A6 */ mtctr r0 -/* 80305EB8 00302E18 4E 80 04 20 */ bctr +/* 80305EB8 00302E18 4E 80 04 20 */ bctr .global lbl_80305EBC lbl_80305EBC: /* 80305EBC 00302E1C 80 03 00 08 */ lwz r0, 8(r3) /* 80305EC0 00302E20 90 04 00 D8 */ stw r0, 0xd8(r4) -/* 80305EC4 00302E24 4E 80 00 20 */ blr +/* 80305EC4 00302E24 4E 80 00 20 */ blr .global lbl_80305EC8 lbl_80305EC8: /* 80305EC8 00302E28 80 A3 00 30 */ lwz r5, 0x30(r3) @@ -118,7 +118,7 @@ lbl_80305EC8: /* 80305EE0 00302E40 7C 00 0E 70 */ srawi r0, r0, 1 /* 80305EE4 00302E44 7C 06 02 14 */ add r0, r6, r0 /* 80305EE8 00302E48 90 04 00 D8 */ stw r0, 0xd8(r4) -/* 80305EEC 00302E4C 4E 80 00 20 */ blr +/* 80305EEC 00302E4C 4E 80 00 20 */ blr .global lbl_80305EF0 lbl_80305EF0: /* 80305EF0 00302E50 80 C3 00 34 */ lwz r6, 0x34(r3) @@ -132,7 +132,7 @@ lbl_80305EF0: /* 80305F10 00302E70 7C 00 0E 70 */ srawi r0, r0, 1 /* 80305F14 00302E74 7C 06 02 14 */ add r0, r6, r0 /* 80305F18 00302E78 90 04 00 D8 */ stw r0, 0xd8(r4) -/* 80305F1C 00302E7C 4E 80 00 20 */ blr +/* 80305F1C 00302E7C 4E 80 00 20 */ blr .global lbl_80305F20 lbl_80305F20: /* 80305F20 00302E80 80 A3 00 08 */ lwz r5, 8(r3) @@ -141,7 +141,7 @@ lbl_80305F20: /* 80305F2C 00302E8C 7C 05 02 14 */ add r0, r5, r0 /* 80305F30 00302E90 7C 03 00 50 */ subf r0, r3, r0 /* 80305F34 00302E94 90 04 00 D8 */ stw r0, 0xd8(r4) -/* 80305F38 00302E98 4E 80 00 20 */ blr +/* 80305F38 00302E98 4E 80 00 20 */ blr .global lbl_80305F3C lbl_80305F3C: /* 80305F3C 00302E9C 80 C3 00 34 */ lwz r6, 0x34(r3) @@ -152,7 +152,7 @@ lbl_80305F3C: /* 80305F50 00302EB0 7C 05 02 14 */ add r0, r5, r0 /* 80305F54 00302EB4 7C 06 00 50 */ subf r0, r6, r0 /* 80305F58 00302EB8 90 04 00 D8 */ stw r0, 0xd8(r4) -/* 80305F5C 00302EBC 4E 80 00 20 */ blr +/* 80305F5C 00302EBC 4E 80 00 20 */ blr .global Invoke__17CBlockInstructionCFR16CFontRenderStateP17CTextRenderBuffer Invoke__17CBlockInstructionCFR16CFontRenderStateP17CTextRenderBuffer: diff --git a/asm/Kyoto/Text/CColorInstruction.s b/asm/Kyoto/Text/CColorInstruction.s index c8afae69..95b0c6ba 100644 --- a/asm/Kyoto/Text/CColorInstruction.s +++ b/asm/Kyoto/Text/CColorInstruction.s @@ -42,7 +42,7 @@ lbl_802FE878: /* 802FE880 002FB7E0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802FE884 002FB7E4 7C 08 03 A6 */ mtlr r0 /* 802FE888 002FB7E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FE88C 002FB7EC 4E 80 00 20 */ blr +/* 802FE88C 002FB7EC 4E 80 00 20 */ blr .global PageInvoke__17CColorInstructionCFR16CFontRenderStateP17CTextRenderBuffer PageInvoke__17CColorInstructionCFR16CFontRenderStateP17CTextRenderBuffer: @@ -52,11 +52,11 @@ PageInvoke__17CColorInstructionCFR16CFontRenderStateP17CTextRenderBuffer: /* 802FE89C 002FB7FC 81 83 00 00 */ lwz r12, 0(r3) /* 802FE8A0 002FB800 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802FE8A4 002FB804 7D 89 03 A6 */ mtctr r12 -/* 802FE8A8 002FB808 4E 80 04 21 */ bctrl +/* 802FE8A8 002FB808 4E 80 04 21 */ bctrl /* 802FE8AC 002FB80C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802FE8B0 002FB810 7C 08 03 A6 */ mtlr r0 /* 802FE8B4 002FB814 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FE8B8 002FB818 4E 80 00 20 */ blr +/* 802FE8B8 002FB818 4E 80 00 20 */ blr .global Invoke__17CColorInstructionCFR16CFontRenderStateP17CTextRenderBuffer Invoke__17CColorInstructionCFR16CFontRenderStateP17CTextRenderBuffer: diff --git a/asm/Kyoto/Text/CColorOverrideInstruction.s b/asm/Kyoto/Text/CColorOverrideInstruction.s index b48da9f8..7c4d321f 100644 --- a/asm/Kyoto/Text/CColorOverrideInstruction.s +++ b/asm/Kyoto/Text/CColorOverrideInstruction.s @@ -54,7 +54,7 @@ lbl_802FE930: /* 802FE938 002FB898 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802FE93C 002FB89C 7C 08 03 A6 */ mtlr r0 /* 802FE940 002FB8A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FE944 002FB8A4 4E 80 00 20 */ blr +/* 802FE944 002FB8A4 4E 80 00 20 */ blr .global PageInvoke__25CColorOverrideInstructionCFR16CFontRenderStateP17CTextRenderBuffer PageInvoke__25CColorOverrideInstructionCFR16CFontRenderStateP17CTextRenderBuffer: @@ -64,11 +64,11 @@ PageInvoke__25CColorOverrideInstructionCFR16CFontRenderStateP17CTextRenderBuffer /* 802FE954 002FB8B4 81 83 00 00 */ lwz r12, 0(r3) /* 802FE958 002FB8B8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802FE95C 002FB8BC 7D 89 03 A6 */ mtctr r12 -/* 802FE960 002FB8C0 4E 80 04 21 */ bctrl +/* 802FE960 002FB8C0 4E 80 04 21 */ bctrl /* 802FE964 002FB8C4 80 01 00 14 */ lwz r0, 0x14(r1) /* 802FE968 002FB8C8 7C 08 03 A6 */ mtlr r0 /* 802FE96C 002FB8CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FE970 002FB8D0 4E 80 00 20 */ blr +/* 802FE970 002FB8D0 4E 80 00 20 */ blr .global Invoke__25CColorOverrideInstructionCFR16CFontRenderStateP17CTextRenderBuffer Invoke__25CColorOverrideInstructionCFR16CFontRenderStateP17CTextRenderBuffer: diff --git a/asm/Kyoto/Text/CDrawStringOptions.s b/asm/Kyoto/Text/CDrawStringOptions.s index 2ab7f076..da115fb1 100644 --- a/asm/Kyoto/Text/CDrawStringOptions.s +++ b/asm/Kyoto/Text/CDrawStringOptions.s @@ -63,4 +63,4 @@ lbl_802FEA70: /* 802FEA70 002FB9D0 38 A5 00 07 */ addi r5, r5, 7 /* 802FEA74 002FB9D4 38 84 00 04 */ addi r4, r4, 4 /* 802FEA78 002FB9D8 42 00 FF 78 */ bdnz lbl_802FE9F0 -/* 802FEA7C 002FB9DC 4E 80 00 20 */ blr +/* 802FEA7C 002FB9DC 4E 80 00 20 */ blr diff --git a/asm/Kyoto/Text/CFont.s b/asm/Kyoto/Text/CFont.s index 1e2b1e90..5cb13877 100644 --- a/asm/Kyoto/Text/CFont.s +++ b/asm/Kyoto/Text/CFont.s @@ -4,7 +4,7 @@ .global DrawString__5CFontCFPCcllRC6CColor DrawString__5CFontCFPCcllRC6CColor: -/* 80305F98 00302EF8 4E 80 00 20 */ blr +/* 80305F98 00302EF8 4E 80 00 20 */ blr .global CharWidth__5CFontCFc CharWidth__5CFontCFc: @@ -16,7 +16,7 @@ CharWidth__5CFontCFc: /* 80305FB0 00302F10 D8 01 00 08 */ stfd f0, 8(r1) /* 80305FB4 00302F14 80 61 00 0C */ lwz r3, 0xc(r1) /* 80305FB8 00302F18 38 21 00 10 */ addi r1, r1, 0x10 -/* 80305FBC 00302F1C 4E 80 00 20 */ blr +/* 80305FBC 00302F1C 4E 80 00 20 */ blr .global __dt__5CFontFv __dt__5CFontFv: @@ -35,7 +35,7 @@ lbl_80305FE4: /* 80305FEC 00302F4C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80305FF0 00302F50 7C 08 03 A6 */ mtlr r0 /* 80305FF4 00302F54 38 21 00 10 */ addi r1, r1, 0x10 -/* 80305FF8 00302F58 4E 80 00 20 */ blr +/* 80305FF8 00302F58 4E 80 00 20 */ blr .global __ct__5CFontFf __ct__5CFontFf: @@ -48,4 +48,4 @@ __ct__5CFontFf: /* 80306014 00302F74 90 03 00 00 */ stw r0, 0(r3) /* 80306018 00302F78 D0 23 00 04 */ stfs f1, 4(r3) /* 8030601C 00302F7C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80306020 00302F80 4E 80 00 20 */ blr +/* 80306020 00302F80 4E 80 00 20 */ blr diff --git a/asm/Kyoto/Text/CFontImageDef.s b/asm/Kyoto/Text/CFontImageDef.s index 4ba41661..b15402d3 100644 --- a/asm/Kyoto/Text/CFontImageDef.s +++ b/asm/Kyoto/Text/CFontImageDef.s @@ -49,7 +49,7 @@ CalculateBaseline__13CFontImageDefFv: /* 803594E4 00356444 80 01 00 44 */ lwz r0, 0x44(r1) /* 803594E8 00356448 7C 08 03 A6 */ mtlr r0 /* 803594EC 0035644C 38 21 00 40 */ addi r1, r1, 0x40 -/* 803594F0 00356450 4E 80 00 20 */ blr +/* 803594F0 00356450 4E 80 00 20 */ blr .global IsLoaded__13CFontImageDefCFv IsLoaded__13CFontImageDefCFv: @@ -65,13 +65,13 @@ lbl_80359508: /* 80359514 00356474 28 00 00 00 */ cmplwi r0, 0 /* 80359518 00356478 40 82 00 0C */ bne lbl_80359524 /* 8035951C 0035647C 38 60 00 00 */ li r3, 0 -/* 80359520 00356480 4E 80 00 20 */ blr +/* 80359520 00356480 4E 80 00 20 */ blr lbl_80359524: /* 80359524 00356484 38 A5 00 08 */ addi r5, r5, 8 /* 80359528 00356488 42 00 FF E0 */ bdnz lbl_80359508 lbl_8035952C: /* 8035952C 0035648C 38 60 00 01 */ li r3, 1 -/* 80359530 00356490 4E 80 00 20 */ blr +/* 80359530 00356490 4E 80 00 20 */ blr .global "__ct__13CFontImageDefFRCQ24rstl54vector<17TToken<8CTexture>,Q24rstl17rmemory_allocator>fRC9CVector2f" "__ct__13CFontImageDefFRCQ24rstl54vector<17TToken<8CTexture>,Q24rstl17rmemory_allocator>fRC9CVector2f": @@ -151,7 +151,7 @@ lbl_80359614: /* 80359634 00356594 80 01 00 24 */ lwz r0, 0x24(r1) /* 80359638 00356598 7C 08 03 A6 */ mtlr r0 /* 8035963C 0035659C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80359640 003565A0 4E 80 00 20 */ blr +/* 80359640 003565A0 4E 80 00 20 */ blr .global "__ct__13CFontImageDefFRC17TToken<8CTexture>RC9CVector2f" "__ct__13CFontImageDefFRC17TToken<8CTexture>RC9CVector2f": @@ -212,4 +212,4 @@ lbl_803596E0: /* 80359708 00356668 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8035970C 0035666C 7C 08 03 A6 */ mtlr r0 /* 80359710 00356670 38 21 00 20 */ addi r1, r1, 0x20 -/* 80359714 00356674 4E 80 00 20 */ blr +/* 80359714 00356674 4E 80 00 20 */ blr diff --git a/asm/Kyoto/Text/CFontInstruction.s b/asm/Kyoto/Text/CFontInstruction.s index 2e60b4cb..334c7d3f 100644 --- a/asm/Kyoto/Text/CFontInstruction.s +++ b/asm/Kyoto/Text/CFontInstruction.s @@ -38,7 +38,7 @@ lbl_802FEAE4: /* 802FEAF0 002FBA50 83 C1 00 08 */ lwz r30, 8(r1) /* 802FEAF4 002FBA54 7C 08 03 A6 */ mtlr r0 /* 802FEAF8 002FBA58 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FEAFC 002FBA5C 4E 80 00 20 */ blr +/* 802FEAFC 002FBA5C 4E 80 00 20 */ blr .global PageInvoke__16CFontInstructionCFR16CFontRenderStateP17CTextRenderBuffer PageInvoke__16CFontInstructionCFR16CFontRenderStateP17CTextRenderBuffer: @@ -48,16 +48,16 @@ PageInvoke__16CFontInstructionCFR16CFontRenderStateP17CTextRenderBuffer: /* 802FEB0C 002FBA6C 81 83 00 00 */ lwz r12, 0(r3) /* 802FEB10 002FBA70 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802FEB14 002FBA74 7D 89 03 A6 */ mtctr r12 -/* 802FEB18 002FBA78 4E 80 04 21 */ bctrl +/* 802FEB18 002FBA78 4E 80 04 21 */ bctrl /* 802FEB1C 002FBA7C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802FEB20 002FBA80 7C 08 03 A6 */ mtlr r0 /* 802FEB24 002FBA84 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FEB28 002FBA88 4E 80 00 20 */ blr +/* 802FEB28 002FBA88 4E 80 00 20 */ blr .global GetAssetCount__16CFontInstructionCFv GetAssetCount__16CFontInstructionCFv: /* 802FEB2C 002FBA8C 38 60 00 02 */ li r3, 2 -/* 802FEB30 002FBA90 4E 80 00 20 */ blr +/* 802FEB30 002FBA90 4E 80 00 20 */ blr .global "GetAssets__16CFontInstructionCFRQ24rstl42vector<6CToken,Q24rstl17rmemory_allocator>" "GetAssets__16CFontInstructionCFRQ24rstl42vector<6CToken,Q24rstl17rmemory_allocator>": @@ -134,7 +134,7 @@ lbl_802FEC28: /* 802FEC30 002FBB90 83 C1 00 18 */ lwz r30, 0x18(r1) /* 802FEC34 002FBB94 7C 08 03 A6 */ mtlr r0 /* 802FEC38 002FBB98 38 21 00 20 */ addi r1, r1, 0x20 -/* 802FEC3C 002FBB9C 4E 80 00 20 */ blr +/* 802FEC3C 002FBB9C 4E 80 00 20 */ blr .global Invoke__16CFontInstructionCFR16CFontRenderStateP17CTextRenderBuffer Invoke__16CFontInstructionCFR16CFontRenderStateP17CTextRenderBuffer: diff --git a/asm/Kyoto/Text/CFontRenderState.s b/asm/Kyoto/Text/CFontRenderState.s index 6f6b274b..79939d9d 100644 --- a/asm/Kyoto/Text/CFontRenderState.s +++ b/asm/Kyoto/Text/CFontRenderState.s @@ -15,7 +15,7 @@ ConvertToTextureSpace__16CFontRenderStateCFRC10CTextColor: /* 802FECE4 002FBC44 98 01 00 0B */ stb r0, 0xb(r1) /* 802FECE8 002FBC48 80 61 00 08 */ lwz r3, 8(r1) /* 802FECEC 002FBC4C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FECF0 002FBC50 4E 80 00 20 */ blr +/* 802FECF0 002FBC50 4E 80 00 20 */ blr .global PopState__16CFontRenderStateFv PopState__16CFontRenderStateFv: @@ -36,7 +36,7 @@ PopState__16CFontRenderStateFv: /* 802FED2C 002FBC8C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802FED30 002FBC90 7C 08 03 A6 */ mtlr r0 /* 802FED34 002FBC94 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FED38 002FBC98 4E 80 00 20 */ blr +/* 802FED38 002FBC98 4E 80 00 20 */ blr .global __as__14CSaveableStateFRC14CSaveableState __as__14CSaveableStateFRC14CSaveableState: @@ -152,7 +152,7 @@ lbl_802FEE70: /* 802FEEBC 002FBE1C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802FEEC0 002FBE20 7C 08 03 A6 */ mtlr r0 /* 802FEEC4 002FBE24 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FEEC8 002FBE28 4E 80 00 20 */ blr +/* 802FEEC8 002FBE28 4E 80 00 20 */ blr .global sub_802feecc sub_802feecc: @@ -232,7 +232,7 @@ lbl_802FEFC0: /* 802FEFC8 002FBF28 83 C1 00 18 */ lwz r30, 0x18(r1) /* 802FEFCC 002FBF2C 7C 08 03 A6 */ mtlr r0 /* 802FEFD0 002FBF30 38 21 00 20 */ addi r1, r1, 0x20 -/* 802FEFD4 002FBF34 4E 80 00 20 */ blr +/* 802FEFD4 002FBF34 4E 80 00 20 */ blr .global sub_802fefd8 sub_802fefd8: @@ -245,7 +245,7 @@ sub_802fefd8: /* 802FEFF0 002FBF50 80 01 00 14 */ lwz r0, 0x14(r1) /* 802FEFF4 002FBF54 7C 08 03 A6 */ mtlr r0 /* 802FEFF8 002FBF58 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FEFFC 002FBF5C 4E 80 00 20 */ blr +/* 802FEFFC 002FBF5C 4E 80 00 20 */ blr .global sub_802ff000 sub_802ff000: @@ -258,7 +258,7 @@ sub_802ff000: /* 802FF018 002FBF78 80 01 00 14 */ lwz r0, 0x14(r1) /* 802FF01C 002FBF7C 7C 08 03 A6 */ mtlr r0 /* 802FF020 002FBF80 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FF024 002FBF84 4E 80 00 20 */ blr +/* 802FF024 002FBF84 4E 80 00 20 */ blr .global sub_802ff028 sub_802ff028: @@ -290,7 +290,7 @@ lbl_802FF064: /* 802FF088 002FBFE8 83 C1 00 08 */ lwz r30, 8(r1) /* 802FF08C 002FBFEC 7C 08 03 A6 */ mtlr r0 /* 802FF090 002FBFF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FF094 002FBFF4 4E 80 00 20 */ blr +/* 802FF094 002FBFF4 4E 80 00 20 */ blr .global sub_802ff098 sub_802ff098: @@ -328,7 +328,7 @@ lbl_802FF0F8: /* 802FF10C 002FC06C 83 81 00 10 */ lwz r28, 0x10(r1) /* 802FF110 002FC070 7C 08 03 A6 */ mtlr r0 /* 802FF114 002FC074 38 21 00 20 */ addi r1, r1, 0x20 -/* 802FF118 002FC078 4E 80 00 20 */ blr +/* 802FF118 002FC078 4E 80 00 20 */ blr .global sub_802ff11c sub_802ff11c: @@ -477,7 +477,7 @@ lbl_802FF2E0: /* 802FF314 002FC274 80 01 00 14 */ lwz r0, 0x14(r1) /* 802FF318 002FC278 7C 08 03 A6 */ mtlr r0 /* 802FF31C 002FC27C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FF320 002FC280 4E 80 00 20 */ blr +/* 802FF320 002FC280 4E 80 00 20 */ blr .global SetColor__16CFontRenderStateF10EColorTypeRC10CTextColor SetColor__16CFontRenderStateF10EColorTypeRC10CTextColor: @@ -533,7 +533,7 @@ lbl_802FF3D0: /* 802FF3D4 002FC334 80 01 00 14 */ lwz r0, 0x14(r1) /* 802FF3D8 002FC338 7C 08 03 A6 */ mtlr r0 /* 802FF3DC 002FC33C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FF3E0 002FC340 4E 80 00 20 */ blr +/* 802FF3E0 002FC340 4E 80 00 20 */ blr .global RefreshPalette__16CFontRenderStateFv RefreshPalette__16CFontRenderStateFv: @@ -551,7 +551,7 @@ RefreshPalette__16CFontRenderStateFv: /* 802FF410 002FC370 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802FF414 002FC374 7C 08 03 A6 */ mtlr r0 /* 802FF418 002FC378 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FF41C 002FC37C 4E 80 00 20 */ blr +/* 802FF41C 002FC37C 4E 80 00 20 */ blr .global RefreshColor__16CFontRenderStateF10EColorType RefreshColor__16CFontRenderStateF10EColorType: @@ -659,7 +659,7 @@ lbl_802FF58C: /* 802FF590 002FC4F0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802FF594 002FC4F4 7C 08 03 A6 */ mtlr r0 /* 802FF598 002FC4F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FF59C 002FC4FC 4E 80 00 20 */ blr +/* 802FF59C 002FC4FC 4E 80 00 20 */ blr .global __ct__16CFontRenderStateFv __ct__16CFontRenderStateFv: @@ -715,7 +715,7 @@ __ct__16CFontRenderStateFv: /* 802FF664 002FC5C4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802FF668 002FC5C8 7C 08 03 A6 */ mtlr r0 /* 802FF66C 002FC5CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FF670 002FC5D0 4E 80 00 20 */ blr +/* 802FF670 002FC5D0 4E 80 00 20 */ blr .global sub_802ff674 sub_802ff674: @@ -757,7 +757,7 @@ lbl_802FF6DC: /* 802FF6F8 002FC658 80 01 00 24 */ lwz r0, 0x24(r1) /* 802FF6FC 002FC65C 7C 08 03 A6 */ mtlr r0 /* 802FF700 002FC660 38 21 00 20 */ addi r1, r1, 0x20 -/* 802FF704 002FC664 4E 80 00 20 */ blr +/* 802FF704 002FC664 4E 80 00 20 */ blr .global sub_802ff708 sub_802ff708: diff --git a/asm/Kyoto/Text/CImageInstruction.s b/asm/Kyoto/Text/CImageInstruction.s index 600200e0..a287a3b0 100644 --- a/asm/Kyoto/Text/CImageInstruction.s +++ b/asm/Kyoto/Text/CImageInstruction.s @@ -49,12 +49,12 @@ lbl_80359774: /* 80359780 003566E0 83 C1 00 08 */ lwz r30, 8(r1) /* 80359784 003566E4 7C 08 03 A6 */ mtlr r0 /* 80359788 003566E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8035978C 003566EC 4E 80 00 20 */ blr +/* 8035978C 003566EC 4E 80 00 20 */ blr .global GetAssetCount__17CImageInstructionCFv GetAssetCount__17CImageInstructionCFv: /* 80359790 003566F0 80 63 00 0C */ lwz r3, 0xc(r3) -/* 80359794 003566F4 4E 80 00 20 */ blr +/* 80359794 003566F4 4E 80 00 20 */ blr .global "GetAssets__17CImageInstructionCFRQ24rstl42vector<6CToken,Q24rstl17rmemory_allocator>" "GetAssets__17CImageInstructionCFRQ24rstl42vector<6CToken,Q24rstl17rmemory_allocator>": @@ -103,7 +103,7 @@ lbl_8035981C: /* 8035982C 0035678C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80359830 00356790 7C 08 03 A6 */ mtlr r0 /* 80359834 00356794 38 21 00 20 */ addi r1, r1, 0x20 -/* 80359838 00356798 4E 80 00 20 */ blr +/* 80359838 00356798 4E 80 00 20 */ blr .global Invoke__17CImageInstructionCFR16CFontRenderStateP17CTextRenderBuffer Invoke__17CImageInstructionCFR16CFontRenderStateP17CTextRenderBuffer: @@ -220,7 +220,7 @@ lbl_803599E0: /* 803599E4 00356944 80 01 00 54 */ lwz r0, 0x54(r1) /* 803599E8 00356948 7C 08 03 A6 */ mtlr r0 /* 803599EC 0035694C 38 21 00 50 */ addi r1, r1, 0x50 -/* 803599F0 00356950 4E 80 00 20 */ blr +/* 803599F0 00356950 4E 80 00 20 */ blr .global CalculateHeight__13CFontImageDefFv CalculateHeight__13CFontImageDefFv: @@ -285,4 +285,4 @@ CalculateHeight__13CFontImageDefFv: /* 80359ADC 00356A3C 83 A1 00 44 */ lwz r29, 0x44(r1) /* 80359AE0 00356A40 7C 08 03 A6 */ mtlr r0 /* 80359AE4 00356A44 38 21 00 50 */ addi r1, r1, 0x50 -/* 80359AE8 00356A48 4E 80 00 20 */ blr +/* 80359AE8 00356A48 4E 80 00 20 */ blr diff --git a/asm/Kyoto/Text/CLineExtraSpaceInstruction.s b/asm/Kyoto/Text/CLineExtraSpaceInstruction.s index 970acfc6..3adf9bbf 100644 --- a/asm/Kyoto/Text/CLineExtraSpaceInstruction.s +++ b/asm/Kyoto/Text/CLineExtraSpaceInstruction.s @@ -42,7 +42,7 @@ lbl_802FF850: /* 802FF858 002FC7B8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802FF85C 002FC7BC 7C 08 03 A6 */ mtlr r0 /* 802FF860 002FC7C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FF864 002FC7C4 4E 80 00 20 */ blr +/* 802FF864 002FC7C4 4E 80 00 20 */ blr .global PageInvoke__26CLineExtraSpaceInstructionCFR16CFontRenderStateP17CTextRenderBuffer PageInvoke__26CLineExtraSpaceInstructionCFR16CFontRenderStateP17CTextRenderBuffer: @@ -52,14 +52,14 @@ PageInvoke__26CLineExtraSpaceInstructionCFR16CFontRenderStateP17CTextRenderBuffe /* 802FF874 002FC7D4 81 83 00 00 */ lwz r12, 0(r3) /* 802FF878 002FC7D8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802FF87C 002FC7DC 7D 89 03 A6 */ mtctr r12 -/* 802FF880 002FC7E0 4E 80 04 21 */ bctrl +/* 802FF880 002FC7E0 4E 80 04 21 */ bctrl /* 802FF884 002FC7E4 80 01 00 14 */ lwz r0, 0x14(r1) /* 802FF888 002FC7E8 7C 08 03 A6 */ mtlr r0 /* 802FF88C 002FC7EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FF890 002FC7F0 4E 80 00 20 */ blr +/* 802FF890 002FC7F0 4E 80 00 20 */ blr .global Invoke__26CLineExtraSpaceInstructionCFR16CFontRenderStateP17CTextRenderBuffer Invoke__26CLineExtraSpaceInstructionCFR16CFontRenderStateP17CTextRenderBuffer: /* 802FF894 002FC7F4 80 03 00 04 */ lwz r0, 4(r3) /* 802FF898 002FC7F8 90 04 00 78 */ stw r0, 0x78(r4) -/* 802FF89C 002FC7FC 4E 80 00 20 */ blr +/* 802FF89C 002FC7FC 4E 80 00 20 */ blr diff --git a/asm/Kyoto/Text/CLineInstruction.s b/asm/Kyoto/Text/CLineInstruction.s index 7747c737..0a871599 100644 --- a/asm/Kyoto/Text/CLineInstruction.s +++ b/asm/Kyoto/Text/CLineInstruction.s @@ -57,7 +57,7 @@ lbl_802FF8E4: /* 802FF8EC 002FC84C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802FF8F0 002FC850 7C 08 03 A6 */ mtlr r0 /* 802FF8F4 002FC854 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FF8F8 002FC858 4E 80 00 20 */ blr +/* 802FF8F8 002FC858 4E 80 00 20 */ blr .global GetBaseline__16CLineInstructionFv GetBaseline__16CLineInstructionFv: @@ -73,10 +73,10 @@ lbl_802FF91C: /* 802FF91C 002FC87C 54 80 06 3F */ clrlwi. r0, r4, 0x18 /* 802FF920 002FC880 41 82 00 0C */ beq lbl_802FF92C /* 802FF924 002FC884 80 63 00 18 */ lwz r3, 0x18(r3) -/* 802FF928 002FC888 4E 80 00 20 */ blr +/* 802FF928 002FC888 4E 80 00 20 */ blr lbl_802FF92C: /* 802FF92C 002FC88C 80 63 00 24 */ lwz r3, 0x24(r3) -/* 802FF930 002FC890 4E 80 00 20 */ blr +/* 802FF930 002FC890 4E 80 00 20 */ blr .global GetHeight__16CLineInstructionFv GetHeight__16CLineInstructionFv: @@ -96,7 +96,7 @@ lbl_802FF960: /* 802FF960 002FC8C0 80 A3 00 1C */ lwz r5, 0x1c(r3) lbl_802FF964: /* 802FF964 002FC8C4 7C A3 2B 78 */ mr r3, r5 -/* 802FF968 002FC8C8 4E 80 00 20 */ blr +/* 802FF968 002FC8C8 4E 80 00 20 */ blr .global TestLargestImage__16CLineInstructionFiii TestLargestImage__16CLineInstructionFiii: @@ -112,10 +112,10 @@ lbl_802FF97C: lbl_802FF98C: /* 802FF98C 002FC8EC 80 03 00 1C */ lwz r0, 0x1c(r3) /* 802FF990 002FC8F0 7C 00 28 00 */ cmpw r0, r5 -/* 802FF994 002FC8F4 4C 80 00 20 */ bgelr +/* 802FF994 002FC8F4 4C 80 00 20 */ bgelr /* 802FF998 002FC8F8 90 A3 00 1C */ stw r5, 0x1c(r3) /* 802FF99C 002FC8FC 90 C3 00 24 */ stw r6, 0x24(r3) -/* 802FF9A0 002FC900 4E 80 00 20 */ blr +/* 802FF9A0 002FC900 4E 80 00 20 */ blr .global TestLargestFont__16CLineInstructionFiii TestLargestFont__16CLineInstructionFiii: @@ -131,10 +131,10 @@ lbl_802FF9B4: lbl_802FF9C4: /* 802FF9C4 002FC924 80 03 00 10 */ lwz r0, 0x10(r3) /* 802FF9C8 002FC928 7C 00 28 00 */ cmpw r0, r5 -/* 802FF9CC 002FC92C 4C 80 00 20 */ bgelr +/* 802FF9CC 002FC92C 4C 80 00 20 */ bgelr /* 802FF9D0 002FC930 90 A3 00 10 */ stw r5, 0x10(r3) /* 802FF9D4 002FC934 90 C3 00 18 */ stw r6, 0x18(r3) -/* 802FF9D8 002FC938 4E 80 00 20 */ blr +/* 802FF9D8 002FC938 4E 80 00 20 */ blr .global SetLineSpacing__16CFontRenderStateFf SetLineSpacing__16CFontRenderStateFf: @@ -147,7 +147,7 @@ SetLineSpacing__16CFontRenderStateFf: /* 802FF9F4 002FC954 38 A5 D6 4C */ addi r5, r5, lbl_803ED64C@l /* 802FF9F8 002FC958 7C 05 00 2E */ lwzx r0, r5, r0 /* 802FF9FC 002FC95C 7C 09 03 A6 */ mtctr r0 -/* 802FFA00 002FC960 4E 80 04 20 */ bctr +/* 802FFA00 002FC960 4E 80 04 20 */ bctr .global lbl_802FFA04 lbl_802FFA04: /* 802FFA04 002FC964 80 64 00 88 */ lwz r3, 0x88(r4) @@ -306,7 +306,7 @@ lbl_802FFC0C: /* 802FFC14 002FCB74 90 04 00 D8 */ stw r0, 0xd8(r4) lbl_802FFC18: /* 802FFC18 002FCB78 38 21 00 20 */ addi r1, r1, 0x20 -/* 802FFC1C 002FCB7C 4E 80 00 20 */ blr +/* 802FFC1C 002FCB7C 4E 80 00 20 */ blr .global PageInvoke__16CLineInstructionCFR16CFontRenderStateP17CTextRenderBuffer PageInvoke__16CLineInstructionCFR16CFontRenderStateP17CTextRenderBuffer: @@ -319,12 +319,12 @@ PageInvoke__16CLineInstructionCFR16CFontRenderStateP17CTextRenderBuffer: /* 802FFC38 002FCB98 81 83 00 00 */ lwz r12, 0(r3) /* 802FFC3C 002FCB9C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802FFC40 002FCBA0 7D 89 03 A6 */ mtctr r12 -/* 802FFC44 002FCBA4 4E 80 04 21 */ bctrl +/* 802FFC44 002FCBA4 4E 80 04 21 */ bctrl lbl_802FFC48: /* 802FFC48 002FCBA8 80 01 00 14 */ lwz r0, 0x14(r1) /* 802FFC4C 002FCBAC 7C 08 03 A6 */ mtlr r0 /* 802FFC50 002FCBB0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FFC54 002FCBB4 4E 80 00 20 */ blr +/* 802FFC54 002FCBB4 4E 80 00 20 */ blr .global Invoke__16CLineInstructionCFR16CFontRenderStateP17CTextRenderBuffer Invoke__16CLineInstructionCFR16CFontRenderStateP17CTextRenderBuffer: diff --git a/asm/Kyoto/Text/CLineSpacingInstruction.s b/asm/Kyoto/Text/CLineSpacingInstruction.s index 144cc65c..3601d01a 100644 --- a/asm/Kyoto/Text/CLineSpacingInstruction.s +++ b/asm/Kyoto/Text/CLineSpacingInstruction.s @@ -42,7 +42,7 @@ lbl_802FFCF0: /* 802FFCF8 002FCC58 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802FFCFC 002FCC5C 7C 08 03 A6 */ mtlr r0 /* 802FFD00 002FCC60 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FFD04 002FCC64 4E 80 00 20 */ blr +/* 802FFD04 002FCC64 4E 80 00 20 */ blr .global PageInvoke__23CLineSpacingInstructionCFR16CFontRenderStateP17CTextRenderBuffer PageInvoke__23CLineSpacingInstructionCFR16CFontRenderStateP17CTextRenderBuffer: @@ -52,11 +52,11 @@ PageInvoke__23CLineSpacingInstructionCFR16CFontRenderStateP17CTextRenderBuffer: /* 802FFD14 002FCC74 81 83 00 00 */ lwz r12, 0(r3) /* 802FFD18 002FCC78 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802FFD1C 002FCC7C 7D 89 03 A6 */ mtctr r12 -/* 802FFD20 002FCC80 4E 80 04 21 */ bctrl +/* 802FFD20 002FCC80 4E 80 04 21 */ bctrl /* 802FFD24 002FCC84 80 01 00 14 */ lwz r0, 0x14(r1) /* 802FFD28 002FCC88 7C 08 03 A6 */ mtlr r0 /* 802FFD2C 002FCC8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FFD30 002FCC90 4E 80 00 20 */ blr +/* 802FFD30 002FCC90 4E 80 00 20 */ blr .global Invoke__23CLineSpacingInstructionCFR16CFontRenderStateP17CTextRenderBuffer Invoke__23CLineSpacingInstructionCFR16CFontRenderStateP17CTextRenderBuffer: diff --git a/asm/Kyoto/Text/CPopStateInstruction.s b/asm/Kyoto/Text/CPopStateInstruction.s index 5223de63..7bbf9159 100644 --- a/asm/Kyoto/Text/CPopStateInstruction.s +++ b/asm/Kyoto/Text/CPopStateInstruction.s @@ -42,7 +42,7 @@ lbl_802FFD84: /* 802FFD8C 002FCCEC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802FFD90 002FCCF0 7C 08 03 A6 */ mtlr r0 /* 802FFD94 002FCCF4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FFD98 002FCCF8 4E 80 00 20 */ blr +/* 802FFD98 002FCCF8 4E 80 00 20 */ blr .global PageInvoke__20CPopStateInstructionCFR16CFontRenderStateP17CTextRenderBuffer PageInvoke__20CPopStateInstructionCFR16CFontRenderStateP17CTextRenderBuffer: @@ -52,11 +52,11 @@ PageInvoke__20CPopStateInstructionCFR16CFontRenderStateP17CTextRenderBuffer: /* 802FFDA8 002FCD08 81 83 00 00 */ lwz r12, 0(r3) /* 802FFDAC 002FCD0C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802FFDB0 002FCD10 7D 89 03 A6 */ mtctr r12 -/* 802FFDB4 002FCD14 4E 80 04 21 */ bctrl +/* 802FFDB4 002FCD14 4E 80 04 21 */ bctrl /* 802FFDB8 002FCD18 80 01 00 14 */ lwz r0, 0x14(r1) /* 802FFDBC 002FCD1C 7C 08 03 A6 */ mtlr r0 /* 802FFDC0 002FCD20 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FFDC4 002FCD24 4E 80 00 20 */ blr +/* 802FFDC4 002FCD24 4E 80 00 20 */ blr .global Invoke__20CPopStateInstructionCFR16CFontRenderStateP17CTextRenderBuffer Invoke__20CPopStateInstructionCFR16CFontRenderStateP17CTextRenderBuffer: diff --git a/asm/Kyoto/Text/CPushStateInstruction.s b/asm/Kyoto/Text/CPushStateInstruction.s index 8cf4974b..ad6c4299 100644 --- a/asm/Kyoto/Text/CPushStateInstruction.s +++ b/asm/Kyoto/Text/CPushStateInstruction.s @@ -42,7 +42,7 @@ lbl_802FFE6C: /* 802FFE74 002FCDD4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802FFE78 002FCDD8 7C 08 03 A6 */ mtlr r0 /* 802FFE7C 002FCDDC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FFE80 002FCDE0 4E 80 00 20 */ blr +/* 802FFE80 002FCDE0 4E 80 00 20 */ blr .global PageInvoke__21CPushStateInstructionCFR16CFontRenderStateP17CTextRenderBuffer PageInvoke__21CPushStateInstructionCFR16CFontRenderStateP17CTextRenderBuffer: @@ -52,11 +52,11 @@ PageInvoke__21CPushStateInstructionCFR16CFontRenderStateP17CTextRenderBuffer: /* 802FFE90 002FCDF0 81 83 00 00 */ lwz r12, 0(r3) /* 802FFE94 002FCDF4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802FFE98 002FCDF8 7D 89 03 A6 */ mtctr r12 -/* 802FFE9C 002FCDFC 4E 80 04 21 */ bctrl +/* 802FFE9C 002FCDFC 4E 80 04 21 */ bctrl /* 802FFEA0 002FCE00 80 01 00 14 */ lwz r0, 0x14(r1) /* 802FFEA4 002FCE04 7C 08 03 A6 */ mtlr r0 /* 802FFEA8 002FCE08 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FFEAC 002FCE0C 4E 80 00 20 */ blr +/* 802FFEAC 002FCE0C 4E 80 00 20 */ blr .global Invoke__21CPushStateInstructionCFR16CFontRenderStateP17CTextRenderBuffer Invoke__21CPushStateInstructionCFR16CFontRenderStateP17CTextRenderBuffer: @@ -68,4 +68,4 @@ Invoke__21CPushStateInstructionCFR16CFontRenderStateP17CTextRenderBuffer: /* 802FFEC4 002FCE24 80 01 00 14 */ lwz r0, 0x14(r1) /* 802FFEC8 002FCE28 7C 08 03 A6 */ mtlr r0 /* 802FFECC 002FCE2C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FFED0 002FCE30 4E 80 00 20 */ blr +/* 802FFED0 002FCE30 4E 80 00 20 */ blr diff --git a/asm/Kyoto/Text/CRasterFont.s b/asm/Kyoto/Text/CRasterFont.s index b8cb565d..b6398a07 100644 --- a/asm/Kyoto/Text/CRasterFont.s +++ b/asm/Kyoto/Text/CRasterFont.s @@ -29,7 +29,7 @@ lbl_802FFF14: /* 802FFF20 002FCE80 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802FFF24 002FCE84 7C 08 03 A6 */ mtlr r0 /* 802FFF28 002FCE88 38 21 00 10 */ addi r1, r1, 0x10 -/* 802FFF2C 002FCE8C 4E 80 00 20 */ blr +/* 802FFF2C 002FCE8C 4E 80 00 20 */ blr .global IsFinishedLoading__11CRasterFontFv IsFinishedLoading__11CRasterFontFv: @@ -44,17 +44,17 @@ IsFinishedLoading__11CRasterFontFv: /* 802FFF50 002FCEB0 38 80 00 01 */ li r4, 1 lbl_802FFF54: /* 802FFF54 002FCEB4 7C 83 23 78 */ mr r3, r4 -/* 802FFF58 002FCEB8 4E 80 00 20 */ blr +/* 802FFF58 002FCEB8 4E 80 00 20 */ blr .global GetLineMargin__11CRasterFontFv GetLineMargin__11CRasterFontFv: /* 802FFF5C 002FCEBC 80 63 00 90 */ lwz r3, 0x90(r3) -/* 802FFF60 002FCEC0 4E 80 00 20 */ blr +/* 802FFF60 002FCEC0 4E 80 00 20 */ blr .global GetBaseLine__11CRasterFontCFv GetBaseLine__11CRasterFontCFv: /* 802FFF64 002FCEC4 80 63 00 8C */ lwz r3, 0x8c(r3) -/* 802FFF68 002FCEC8 4E 80 00 20 */ blr +/* 802FFF68 002FCEC8 4E 80 00 20 */ blr .global SetupRenderState__11CRasterFontFv SetupRenderState__11CRasterFontFv: @@ -126,7 +126,7 @@ SetupRenderState__11CRasterFontFv: /* 80300070 002FCFD0 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80300074 002FCFD4 7C 08 03 A6 */ mtlr r0 /* 80300078 002FCFD8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8030007C 002FCFDC 4E 80 00 20 */ blr +/* 8030007C 002FCFDC 4E 80 00 20 */ blr .global FRasterFontFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer FRasterFontFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer: @@ -168,7 +168,7 @@ lbl_803000EC: /* 80300108 002FD068 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8030010C 002FD06C 7C 08 03 A6 */ mtlr r0 /* 80300110 002FD070 38 21 00 20 */ addi r1, r1, 0x20 -/* 80300114 002FD074 4E 80 00 20 */ blr +/* 80300114 002FD074 4E 80 00 20 */ blr .global sub_80300118 sub_80300118: @@ -203,7 +203,7 @@ sub_80300118: /* 80300188 002FD0E8 38 80 00 01 */ li r4, 1 /* 8030018C 002FD0EC 81 8C 00 08 */ lwz r12, 8(r12) /* 80300190 002FD0F0 7D 89 03 A6 */ mtctr r12 -/* 80300194 002FD0F4 4E 80 04 21 */ bctrl +/* 80300194 002FD0F4 4E 80 04 21 */ bctrl lbl_80300198: /* 80300198 002FD0F8 38 61 00 10 */ addi r3, r1, 0x10 /* 8030019C 002FD0FC 38 80 FF FF */ li r4, -1 @@ -213,7 +213,7 @@ lbl_80300198: /* 803001AC 002FD10C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 803001B0 002FD110 7C 08 03 A6 */ mtlr r0 /* 803001B4 002FD114 38 21 00 20 */ addi r1, r1, 0x20 -/* 803001B8 002FD118 4E 80 00 20 */ blr +/* 803001B8 002FD118 4E 80 00 20 */ blr .global sub_803001bc sub_803001bc: @@ -227,7 +227,7 @@ sub_803001bc: /* 803001D8 002FD138 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803001DC 002FD13C 7C 08 03 A6 */ mtlr r0 /* 803001E0 002FD140 38 21 00 10 */ addi r1, r1, 0x10 -/* 803001E4 002FD144 4E 80 00 20 */ blr +/* 803001E4 002FD144 4E 80 00 20 */ blr .global sub_803001e8 sub_803001e8: @@ -270,7 +270,7 @@ lbl_80300258: /* 80300274 002FD1D4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80300278 002FD1D8 7C 08 03 A6 */ mtlr r0 /* 8030027C 002FD1DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80300280 002FD1E0 4E 80 00 20 */ blr +/* 80300280 002FD1E0 4E 80 00 20 */ blr .global sub_80300284 sub_80300284: @@ -300,7 +300,7 @@ lbl_803002CC: /* 803002D8 002FD238 83 C1 00 08 */ lwz r30, 8(r1) /* 803002DC 002FD23C 7C 08 03 A6 */ mtlr r0 /* 803002E0 002FD240 38 21 00 10 */ addi r1, r1, 0x10 -/* 803002E4 002FD244 4E 80 00 20 */ blr +/* 803002E4 002FD244 4E 80 00 20 */ blr .global InternalGetGlyph__11CRasterFontCFw InternalGetGlyph__11CRasterFontCFw: @@ -361,7 +361,7 @@ lbl_803003AC: /* 803003B0 002FD310 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 803003B4 002FD314 7C 08 03 A6 */ mtlr r0 /* 803003B8 002FD318 38 21 00 40 */ addi r1, r1, 0x40 -/* 803003BC 002FD31C 4E 80 00 20 */ blr +/* 803003BC 002FD31C 4E 80 00 20 */ blr .global SinglePassDrawString__11CRasterFontCFRC18CDrawStringOptionsiiRiRiP17CTextRenderBufferPCwi SinglePassDrawString__11CRasterFontCFRC18CDrawStringOptionsiiRiRiP17CTextRenderBufferPCwi: @@ -452,7 +452,7 @@ lbl_803004EC: /* 803004F0 002FD450 80 01 00 44 */ lwz r0, 0x44(r1) /* 803004F4 002FD454 7C 08 03 A6 */ mtlr r0 /* 803004F8 002FD458 38 21 00 40 */ addi r1, r1, 0x40 -/* 803004FC 002FD45C 4E 80 00 20 */ blr +/* 803004FC 002FD45C 4E 80 00 20 */ blr .global "KernLookup__11CRasterFontFRCQ24rstl45vector<9CKernPair,Q24rstl17rmemory_allocator>ii" "KernLookup__11CRasterFontFRCQ24rstl45vector<9CKernPair,Q24rstl17rmemory_allocator>ii": @@ -468,7 +468,7 @@ lbl_8030051C: /* 80300520 002FD480 7C 05 00 00 */ cmpw r5, r0 /* 80300524 002FD484 40 82 00 0C */ bne lbl_80300530 /* 80300528 002FD488 80 64 00 04 */ lwz r3, 4(r4) -/* 8030052C 002FD48C 4E 80 00 20 */ blr +/* 8030052C 002FD48C 4E 80 00 20 */ blr lbl_80300530: /* 80300530 002FD490 38 84 00 08 */ addi r4, r4, 8 lbl_80300534: @@ -480,17 +480,17 @@ lbl_80300534: /* 80300548 002FD4A8 41 82 FF D4 */ beq lbl_8030051C lbl_8030054C: /* 8030054C 002FD4AC 38 60 00 00 */ li r3, 0 -/* 80300550 002FD4B0 4E 80 00 20 */ blr +/* 80300550 002FD4B0 4E 80 00 20 */ blr .global DrawSpace__11CRasterFontCFRC18CDrawStringOptionsiiRiRii DrawSpace__11CRasterFontCFRC18CDrawStringOptionsiiRiRii: /* 80300554 002FD4B4 80 04 00 00 */ lwz r0, 0(r4) /* 80300558 002FD4B8 2C 00 00 00 */ cmpwi r0, 0 -/* 8030055C 002FD4BC 4C 82 00 20 */ bnelr +/* 8030055C 002FD4BC 4C 82 00 20 */ bnelr /* 80300560 002FD4C0 7C 05 4A 14 */ add r0, r5, r9 /* 80300564 002FD4C4 90 07 00 00 */ stw r0, 0(r7) /* 80300568 002FD4C8 90 C8 00 00 */ stw r6, 0(r8) -/* 8030056C 002FD4CC 4E 80 00 20 */ blr +/* 8030056C 002FD4CC 4E 80 00 20 */ blr .global DrawString__11CRasterFontCFRC18CDrawStringOptionsiiRiRiP17CTextRenderBufferPCwi DrawString__11CRasterFontCFRC18CDrawStringOptionsiiRiRiP17CTextRenderBufferPCwi: @@ -569,7 +569,7 @@ lbl_80300684: /* 80300688 002FD5E8 80 01 00 74 */ lwz r0, 0x74(r1) /* 8030068C 002FD5EC 7C 08 03 A6 */ mtlr r0 /* 80300690 002FD5F0 38 21 00 70 */ addi r1, r1, 0x70 -/* 80300694 002FD5F4 4E 80 00 20 */ blr +/* 80300694 002FD5F4 4E 80 00 20 */ blr .global GetGlyph__11CRasterFontCFw GetGlyph__11CRasterFontCFw: @@ -580,7 +580,7 @@ GetGlyph__11CRasterFontCFw: /* 803006A8 002FD608 80 01 00 14 */ lwz r0, 0x14(r1) /* 803006AC 002FD60C 7C 08 03 A6 */ mtlr r0 /* 803006B0 002FD610 38 21 00 10 */ addi r1, r1, 0x10 -/* 803006B4 002FD614 4E 80 00 20 */ blr +/* 803006B4 002FD614 4E 80 00 20 */ blr .global GetCarriageAdvance__11CRasterFontFv GetCarriageAdvance__11CRasterFontFv: @@ -600,17 +600,17 @@ GetCarriageAdvance__11CRasterFontFv: /* 803006EC 002FD64C 83 C1 00 08 */ lwz r30, 8(r1) /* 803006F0 002FD650 7C 08 03 A6 */ mtlr r0 /* 803006F4 002FD654 38 21 00 10 */ addi r1, r1, 0x10 -/* 803006F8 002FD658 4E 80 00 20 */ blr +/* 803006F8 002FD658 4E 80 00 20 */ blr .global GetMonoHeight__11CRasterFontCFv GetMonoHeight__11CRasterFontCFv: /* 803006FC 002FD65C 80 63 00 08 */ lwz r3, 8(r3) -/* 80300700 002FD660 4E 80 00 20 */ blr +/* 80300700 002FD660 4E 80 00 20 */ blr .global GetMonoWidth__11CRasterFontCFv GetMonoWidth__11CRasterFontCFv: /* 80300704 002FD664 80 63 00 04 */ lwz r3, 4(r3) -/* 80300708 002FD668 4E 80 00 20 */ blr +/* 80300708 002FD668 4E 80 00 20 */ blr .global GetSize__11CRasterFontCFRC18CDrawStringOptionsRiRiPCwi GetSize__11CRasterFontCFRC18CDrawStringOptionsRiRiPCwi: @@ -687,12 +687,12 @@ lbl_80300808: /* 8030080C 002FD76C 80 01 00 34 */ lwz r0, 0x34(r1) /* 80300810 002FD770 7C 08 03 A6 */ mtlr r0 /* 80300814 002FD774 38 21 00 30 */ addi r1, r1, 0x30 -/* 80300818 002FD778 4E 80 00 20 */ blr +/* 80300818 002FD778 4E 80 00 20 */ blr .global GetMode__11CRasterFontCFv GetMode__11CRasterFontCFv: /* 8030081C 002FD77C 80 63 00 2C */ lwz r3, 0x2c(r3) -/* 80300820 002FD780 4E 80 00 20 */ blr +/* 80300820 002FD780 4E 80 00 20 */ blr .global __ct__11CRasterFontFR12CInputStreamR12IObjectStore __ct__11CRasterFontFR12CInputStreamR12IObjectStore: @@ -783,7 +783,7 @@ lbl_803008FC: /* 80300968 002FD8C8 81 98 00 00 */ lwz r12, 0(r24) /* 8030096C 002FD8CC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80300970 002FD8D0 7D 89 03 A6 */ mtctr r12 -/* 80300974 002FD8D4 4E 80 04 21 */ bctrl +/* 80300974 002FD8D4 4E 80 04 21 */ bctrl /* 80300978 002FD8D8 38 61 00 28 */ addi r3, r1, 0x28 /* 8030097C 002FD8DC 38 81 00 30 */ addi r4, r1, 0x30 /* 80300980 002FD8E0 48 04 05 29 */ bl __ct__6CTokenFRC6CToken @@ -1091,7 +1091,7 @@ lbl_80300DD4: /* 80300DE4 002FDD44 80 01 00 F4 */ lwz r0, 0xf4(r1) /* 80300DE8 002FDD48 7C 08 03 A6 */ mtlr r0 /* 80300DEC 002FDD4C 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 80300DF0 002FDD50 4E 80 00 20 */ blr +/* 80300DF0 002FDD50 4E 80 00 20 */ blr .global "sort,Q24rstl59vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,Q24rstl60pair_sorter_finder,Q24rstl7less>>__4rstlFQ24rstl138pointer_iterator,Q24rstl59vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl138pointer_iterator,Q24rstl59vector,Q24rstl17rmemory_allocator>,Q24rstl17" "sort,Q24rstl59vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,Q24rstl60pair_sorter_finder,Q24rstl7less>>__4rstlFQ24rstl138pointer_iterator,Q24rstl59vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl138pointer_iterator,Q24rstl59vector,Q24rstl17rmemory_allocator>,Q24rstl17": @@ -1263,7 +1263,7 @@ lbl_80301068: /* 8030106C 002FDFCC 80 01 00 94 */ lwz r0, 0x94(r1) /* 80301070 002FDFD0 7C 08 03 A6 */ mtlr r0 /* 80301074 002FDFD4 38 21 00 90 */ addi r1, r1, 0x90 -/* 80301078 002FDFD8 4E 80 00 20 */ blr +/* 80301078 002FDFD8 4E 80 00 20 */ blr .global "lower_bound,Q24rstl59vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,w,Q24rstl60pair_sorter_finder,Q24rstl7less>>__4rstlFQ24rstl144const_pointer_iterator,Q24rstl59vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl144const_pointer_iterator,Q24rstl59vector,Q24rstl17r" "lower_bound,Q24rstl59vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,w,Q24rstl60pair_sorter_finder,Q24rstl7less>>__4rstlFQ24rstl144const_pointer_iterator,Q24rstl59vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl144const_pointer_iterator,Q24rstl59vector,Q24rstl17r": @@ -1317,7 +1317,7 @@ lbl_80301118: /* 8030112C 002FE08C 80 01 00 34 */ lwz r0, 0x34(r1) /* 80301130 002FE090 7C 08 03 A6 */ mtlr r0 /* 80301134 002FE094 38 21 00 30 */ addi r1, r1, 0x30 -/* 80301138 002FE098 4E 80 00 20 */ blr +/* 80301138 002FE098 4E 80 00 20 */ blr .global "reserve__Q24rstl59vector,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl59vector,Q24rstl17rmemory_allocator>Fi": @@ -1411,7 +1411,7 @@ lbl_80301268: /* 80301274 002FE1D4 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80301278 002FE1D8 7C 08 03 A6 */ mtlr r0 /* 8030127C 002FE1DC 38 21 00 30 */ addi r1, r1, 0x30 -/* 80301280 002FE1E0 4E 80 00 20 */ blr +/* 80301280 002FE1E0 4E 80 00 20 */ blr .global "reserve__Q24rstl45vector<9CKernPair,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl45vector<9CKernPair,Q24rstl17rmemory_allocator>Fi": @@ -1486,7 +1486,7 @@ lbl_80301364: /* 80301370 002FE2D0 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80301374 002FE2D4 7C 08 03 A6 */ mtlr r0 /* 80301378 002FE2D8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8030137C 002FE2DC 4E 80 00 20 */ blr +/* 8030137C 002FE2DC 4E 80 00 20 */ blr .global "advance,Q24rstl59vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,i>__4rstlFRQ24rstl144const_pointer_iterator,Q24rstl59vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>i" "advance,Q24rstl59vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,i>__4rstlFRQ24rstl144const_pointer_iterator,Q24rstl59vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>i": @@ -1500,7 +1500,7 @@ lbl_80301364: /* 8030139C 002FE2FC 80 01 00 14 */ lwz r0, 0x14(r1) /* 803013A0 002FE300 7C 08 03 A6 */ mtlr r0 /* 803013A4 002FE304 38 21 00 10 */ addi r1, r1, 0x10 -/* 803013A8 002FE308 4E 80 00 20 */ blr +/* 803013A8 002FE308 4E 80 00 20 */ blr .global "__advance,Q24rstl59vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,i>__4rstlFRQ24rstl144const_pointer_iterator,Q24rstl59vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>iQ24rstl26random_access_iterator_tag" "__advance,Q24rstl59vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,i>__4rstlFRQ24rstl144const_pointer_iterator,Q24rstl59vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>iQ24rstl26random_access_iterator_tag": @@ -1508,7 +1508,7 @@ lbl_80301364: /* 803013B0 002FE310 80 83 00 00 */ lwz r4, 0(r3) /* 803013B4 002FE314 7C 04 02 14 */ add r0, r4, r0 /* 803013B8 002FE318 90 03 00 00 */ stw r0, 0(r3) -/* 803013BC 002FE31C 4E 80 00 20 */ blr +/* 803013BC 002FE31C 4E 80 00 20 */ blr .global "distance,Q24rstl59vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl144const_pointer_iterator,Q24rstl59vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl144const_pointer_iterator,Q24rstl59vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>" "distance,Q24rstl59vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl144const_pointer_iterator,Q24rstl59vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl144const_pointer_iterator,Q24rstl59vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>": @@ -1528,7 +1528,7 @@ lbl_80301364: /* 803013F4 002FE354 80 01 00 24 */ lwz r0, 0x24(r1) /* 803013F8 002FE358 7C 08 03 A6 */ mtlr r0 /* 803013FC 002FE35C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80301400 002FE360 4E 80 00 20 */ blr +/* 80301400 002FE360 4E 80 00 20 */ blr .global "__distance,Q24rstl59vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl144const_pointer_iterator,Q24rstl59vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl144const_pointer_iterator,Q24rstl59vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl26random_access_itera" "__distance,Q24rstl59vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl144const_pointer_iterator,Q24rstl59vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl144const_pointer_iterator,Q24rstl59vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl26random_access_itera": @@ -1541,7 +1541,7 @@ lbl_80301364: /* 8030141C 002FE37C 7C 00 1E 70 */ srawi r0, r0, 3 /* 80301420 002FE380 54 03 0F FE */ srwi r3, r0, 0x1f /* 80301424 002FE384 7C 60 1A 14 */ add r3, r0, r3 -/* 80301428 002FE388 4E 80 00 20 */ blr +/* 80301428 002FE388 4E 80 00 20 */ blr .global "__sort3,Q24rstl60pair_sorter_finder,Q24rstl7less>>__4rstlFRQ24rstl15pairRQ24rstl15pairRQ24rstl15pairQ24rstl60pair_sorter_finder,Q24rstl7less>" "__sort3,Q24rstl60pair_sorter_finder,Q24rstl7less>>__4rstlFRQ24rstl15pairRQ24rstl15pairRQ24rstl15pairQ24rstl60pair_sorter_finder,Q24rstl7less>": @@ -1719,7 +1719,7 @@ lbl_803016C4: /* 803016CC 002FE62C 83 A1 00 54 */ lwz r29, 0x54(r1) /* 803016D0 002FE630 83 81 00 50 */ lwz r28, 0x50(r1) /* 803016D4 002FE634 38 21 00 60 */ addi r1, r1, 0x60 -/* 803016D8 002FE638 4E 80 00 20 */ blr +/* 803016D8 002FE638 4E 80 00 20 */ blr .global "__insertion_sort,Q24rstl59vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,Q24rstl60pair_sorter_finder,Q24rstl7less>>__4rstlFQ24rstl138pointer_iterator,Q24rstl59vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl138pointer_iterator,Q24rstl59vector,Q24rstl17rmemory_allocato" "__insertion_sort,Q24rstl59vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,Q24rstl60pair_sorter_finder,Q24rstl7less>>__4rstlFQ24rstl138pointer_iterator,Q24rstl59vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl138pointer_iterator,Q24rstl59vector,Q24rstl17rmemory_allocato": diff --git a/asm/Kyoto/Text/CRemoveColorOverrideInstruction.s b/asm/Kyoto/Text/CRemoveColorOverrideInstruction.s index bc1cff9c..9f16127f 100644 --- a/asm/Kyoto/Text/CRemoveColorOverrideInstruction.s +++ b/asm/Kyoto/Text/CRemoveColorOverrideInstruction.s @@ -42,7 +42,7 @@ lbl_80301880: /* 80301888 002FE7E8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8030188C 002FE7EC 7C 08 03 A6 */ mtlr r0 /* 80301890 002FE7F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80301894 002FE7F4 4E 80 00 20 */ blr +/* 80301894 002FE7F4 4E 80 00 20 */ blr .global PageInvoke__31CRemoveColorOverrideInstructionCFR16CFontRenderStateP17CTextRenderBuffer PageInvoke__31CRemoveColorOverrideInstructionCFR16CFontRenderStateP17CTextRenderBuffer: @@ -52,11 +52,11 @@ PageInvoke__31CRemoveColorOverrideInstructionCFR16CFontRenderStateP17CTextRender /* 803018A4 002FE804 81 83 00 00 */ lwz r12, 0(r3) /* 803018A8 002FE808 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803018AC 002FE80C 7D 89 03 A6 */ mtctr r12 -/* 803018B0 002FE810 4E 80 04 21 */ bctrl +/* 803018B0 002FE810 4E 80 04 21 */ bctrl /* 803018B4 002FE814 80 01 00 14 */ lwz r0, 0x14(r1) /* 803018B8 002FE818 7C 08 03 A6 */ mtlr r0 /* 803018BC 002FE81C 38 21 00 10 */ addi r1, r1, 0x10 -/* 803018C0 002FE820 4E 80 00 20 */ blr +/* 803018C0 002FE820 4E 80 00 20 */ blr .global Invoke__31CRemoveColorOverrideInstructionCFR16CFontRenderStateP17CTextRenderBuffer Invoke__31CRemoveColorOverrideInstructionCFR16CFontRenderStateP17CTextRenderBuffer: @@ -72,4 +72,4 @@ Invoke__31CRemoveColorOverrideInstructionCFR16CFontRenderStateP17CTextRenderBuff /* 803018E8 002FE848 80 01 00 14 */ lwz r0, 0x14(r1) /* 803018EC 002FE84C 7C 08 03 A6 */ mtlr r0 /* 803018F0 002FE850 38 21 00 10 */ addi r1, r1, 0x10 -/* 803018F4 002FE854 4E 80 00 20 */ blr +/* 803018F4 002FE854 4E 80 00 20 */ blr diff --git a/asm/Kyoto/Text/CSavableState.s b/asm/Kyoto/Text/CSavableState.s index 86d281c1..7a1ddf51 100644 --- a/asm/Kyoto/Text/CSavableState.s +++ b/asm/Kyoto/Text/CSavableState.s @@ -48,7 +48,7 @@ lbl_8030196C: /* 80301970 002FE8D0 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80301974 002FE8D4 7C 08 03 A6 */ mtlr r0 /* 80301978 002FE8D8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8030197C 002FE8DC 4E 80 00 20 */ blr +/* 8030197C 002FE8DC 4E 80 00 20 */ blr .global __ct__14CSaveableStateFv __ct__14CSaveableStateFv: diff --git a/asm/Kyoto/Text/CStringTable.s b/asm/Kyoto/Text/CStringTable.s index 62a3349e..61d52bb7 100644 --- a/asm/Kyoto/Text/CStringTable.s +++ b/asm/Kyoto/Text/CStringTable.s @@ -37,7 +37,7 @@ lbl_80356544: /* 80356554 003534B4 83 C1 00 08 */ lwz r30, 8(r1) /* 80356558 003534B8 7C 08 03 A6 */ mtlr r0 /* 8035655C 003534BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80356560 003534C0 4E 80 00 20 */ blr +/* 80356560 003534C0 4E 80 00 20 */ blr .global sub_80356564 sub_80356564: @@ -73,7 +73,7 @@ sub_80356564: /* 803565D8 00353538 38 80 00 01 */ li r4, 1 /* 803565DC 0035353C 81 8C 00 08 */ lwz r12, 8(r12) /* 803565E0 00353540 7D 89 03 A6 */ mtctr r12 -/* 803565E4 00353544 4E 80 04 21 */ bctrl +/* 803565E4 00353544 4E 80 04 21 */ bctrl lbl_803565E8: /* 803565E8 00353548 88 01 00 10 */ lbz r0, 0x10(r1) /* 803565EC 0035354C 28 00 00 00 */ cmplwi r0, 0 @@ -95,7 +95,7 @@ lbl_80356618: /* 80356624 00353584 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80356628 00353588 7C 08 03 A6 */ mtlr r0 /* 8035662C 0035358C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80356630 00353590 4E 80 00 20 */ blr +/* 80356630 00353590 4E 80 00 20 */ blr .global sub_80356634 sub_80356634: @@ -109,7 +109,7 @@ sub_80356634: /* 80356650 003535B0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80356654 003535B4 7C 08 03 A6 */ mtlr r0 /* 80356658 003535B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8035665C 003535BC 4E 80 00 20 */ blr +/* 8035665C 003535BC 4E 80 00 20 */ blr .global sub_80356660 sub_80356660: @@ -152,7 +152,7 @@ lbl_803566D0: /* 803566EC 0035364C 80 01 00 14 */ lwz r0, 0x14(r1) /* 803566F0 00353650 7C 08 03 A6 */ mtlr r0 /* 803566F4 00353654 38 21 00 10 */ addi r1, r1, 0x10 -/* 803566F8 00353658 4E 80 00 20 */ blr +/* 803566F8 00353658 4E 80 00 20 */ blr .global GetString__12CStringTableCFi GetString__12CStringTableCFi: @@ -164,13 +164,13 @@ GetString__12CStringTableCFi: lbl_80356710: /* 80356710 00353670 3C 60 80 3E */ lis r3, lbl_803D8310@ha /* 80356714 00353674 38 63 83 10 */ addi r3, r3, lbl_803D8310@l -/* 80356718 00353678 4E 80 00 20 */ blr +/* 80356718 00353678 4E 80 00 20 */ blr lbl_8035671C: /* 8035671C 0035367C 80 63 00 04 */ lwz r3, 4(r3) /* 80356720 00353680 54 80 10 3A */ slwi r0, r4, 2 /* 80356724 00353684 7C 03 00 2E */ lwzx r0, r3, r0 /* 80356728 00353688 7C 63 02 14 */ add r3, r3, r0 -/* 8035672C 0035368C 4E 80 00 20 */ blr +/* 8035672C 0035368C 4E 80 00 20 */ blr .global __ct__12CStringTableFR12CInputStream __ct__12CStringTableFR12CInputStream: diff --git a/asm/Kyoto/Text/CTextExecuteBuffer.s b/asm/Kyoto/Text/CTextExecuteBuffer.s index 011cc5a5..954569f0 100644 --- a/asm/Kyoto/Text/CTextExecuteBuffer.s +++ b/asm/Kyoto/Text/CTextExecuteBuffer.s @@ -37,7 +37,7 @@ lbl_80301B90: /* 80301BA0 002FEB00 81 83 00 00 */ lwz r12, 0(r3) /* 80301BA4 002FEB04 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80301BA8 002FEB08 7D 89 03 A6 */ mtctr r12 -/* 80301BAC 002FEB0C 4E 80 04 21 */ bctrl +/* 80301BAC 002FEB0C 4E 80 04 21 */ bctrl /* 80301BB0 002FEB10 83 9C 00 04 */ lwz r28, 4(r28) lbl_80301BB4: /* 80301BB4 002FEB14 80 1E 00 08 */ lwz r0, 8(r30) @@ -71,7 +71,7 @@ lbl_80301C04: /* 80301C1C 002FEB7C 81 83 00 00 */ lwz r12, 0(r3) /* 80301C20 002FEB80 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80301C24 002FEB84 7D 89 03 A6 */ mtctr r12 -/* 80301C28 002FEB88 4E 80 04 21 */ bctrl +/* 80301C28 002FEB88 4E 80 04 21 */ bctrl /* 80301C2C 002FEB8C 48 00 00 58 */ b lbl_80301C84 lbl_80301C30: /* 80301C30 002FEB90 80 7B 00 08 */ lwz r3, 8(r27) @@ -81,7 +81,7 @@ lbl_80301C30: /* 80301C40 002FEBA0 81 83 00 00 */ lwz r12, 0(r3) /* 80301C44 002FEBA4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80301C48 002FEBA8 7D 89 03 A6 */ mtctr r12 -/* 80301C4C 002FEBAC 4E 80 04 21 */ bctrl +/* 80301C4C 002FEBAC 4E 80 04 21 */ bctrl /* 80301C50 002FEBB0 38 61 00 20 */ addi r3, r1, 0x20 /* 80301C54 002FEBB4 38 80 00 00 */ li r4, 0 /* 80301C58 002FEBB8 38 A0 00 00 */ li r5, 0 @@ -143,7 +143,7 @@ lbl_80301CFC: /* 80301D28 002FEC88 80 01 07 54 */ lwz r0, 0x754(r1) /* 80301D2C 002FEC8C 7C 08 03 A6 */ mtlr r0 /* 80301D30 002FEC90 38 21 07 50 */ addi r1, r1, 0x750 -/* 80301D34 002FEC94 4E 80 00 20 */ blr +/* 80301D34 002FEC94 4E 80 00 20 */ blr .global sub_80301d38 sub_80301d38: @@ -184,7 +184,7 @@ sub_80301d38: /* 80301DC0 002FED20 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 80301DC4 002FED24 7C 08 03 A6 */ mtlr r0 /* 80301DC8 002FED28 38 21 00 30 */ addi r1, r1, 0x30 -/* 80301DCC 002FED2C 4E 80 00 20 */ blr +/* 80301DCC 002FED2C 4E 80 00 20 */ blr .global sub_80301dd0 sub_80301dd0: @@ -218,7 +218,7 @@ lbl_80301E18: /* 80301E34 002FED94 83 81 00 10 */ lwz r28, 0x10(r1) /* 80301E38 002FED98 7C 08 03 A6 */ mtlr r0 /* 80301E3C 002FED9C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80301E40 002FEDA0 4E 80 00 20 */ blr +/* 80301E40 002FEDA0 4E 80 00 20 */ blr .global sub_80301e44 sub_80301e44: @@ -260,7 +260,7 @@ lbl_80301EAC: /* 80301EC0 002FEE20 83 81 00 10 */ lwz r28, 0x10(r1) /* 80301EC4 002FEE24 7C 08 03 A6 */ mtlr r0 /* 80301EC8 002FEE28 38 21 00 20 */ addi r1, r1, 0x20 -/* 80301ECC 002FEE2C 4E 80 00 20 */ blr +/* 80301ECC 002FEE2C 4E 80 00 20 */ blr .global sub_80301ed0 sub_80301ed0: @@ -273,7 +273,7 @@ sub_80301ed0: /* 80301EE8 002FEE48 80 01 00 14 */ lwz r0, 0x14(r1) /* 80301EEC 002FEE4C 7C 08 03 A6 */ mtlr r0 /* 80301EF0 002FEE50 38 21 00 10 */ addi r1, r1, 0x10 -/* 80301EF4 002FEE54 4E 80 00 20 */ blr +/* 80301EF4 002FEE54 4E 80 00 20 */ blr .global __dt__16CFontRenderStateFv __dt__16CFontRenderStateFv: @@ -373,7 +373,7 @@ lbl_80302030: /* 8030203C 002FEF9C 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80302040 002FEFA0 7C 08 03 A6 */ mtlr r0 /* 80302044 002FEFA4 38 21 00 30 */ addi r1, r1, 0x30 -/* 80302048 002FEFA8 4E 80 00 20 */ blr +/* 80302048 002FEFA8 4E 80 00 20 */ blr .global BuildRenderBufferPage__18CTextExecuteBufferFv BuildRenderBufferPage__18CTextExecuteBufferFv: @@ -400,7 +400,7 @@ lbl_80302088: /* 80302098 002FEFF8 81 83 00 00 */ lwz r12, 0(r3) /* 8030209C 002FEFFC 81 8C 00 10 */ lwz r12, 0x10(r12) /* 803020A0 002FF000 7D 89 03 A6 */ mtctr r12 -/* 803020A4 002FF004 4E 80 04 21 */ bctrl +/* 803020A4 002FF004 4E 80 04 21 */ bctrl /* 803020A8 002FF008 83 FF 00 04 */ lwz r31, 4(r31) lbl_803020AC: /* 803020AC 002FF00C 83 DC 00 00 */ lwz r30, 0(r28) @@ -415,7 +415,7 @@ lbl_803020BC: /* 803020CC 002FF02C 81 83 00 00 */ lwz r12, 0(r3) /* 803020D0 002FF030 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803020D4 002FF034 7D 89 03 A6 */ mtctr r12 -/* 803020D8 002FF038 4E 80 04 21 */ bctrl +/* 803020D8 002FF038 4E 80 04 21 */ bctrl /* 803020DC 002FF03C 83 DE 00 04 */ lwz r30, 4(r30) lbl_803020E0: /* 803020E0 002FF040 80 1D 00 00 */ lwz r0, 0(r29) @@ -439,7 +439,7 @@ lbl_80302114: /* 80302124 002FF084 81 83 00 00 */ lwz r12, 0(r3) /* 80302128 002FF088 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8030212C 002FF08C 7D 89 03 A6 */ mtctr r12 -/* 80302130 002FF090 4E 80 04 21 */ bctrl +/* 80302130 002FF090 4E 80 04 21 */ bctrl /* 80302134 002FF094 83 FF 00 04 */ lwz r31, 4(r31) lbl_80302138: /* 80302138 002FF098 83 DC 00 00 */ lwz r30, 0(r28) @@ -454,7 +454,7 @@ lbl_80302148: /* 80302158 002FF0B8 81 83 00 00 */ lwz r12, 0(r3) /* 8030215C 002FF0BC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80302160 002FF0C0 7D 89 03 A6 */ mtctr r12 -/* 80302164 002FF0C4 4E 80 04 21 */ bctrl +/* 80302164 002FF0C4 4E 80 04 21 */ bctrl /* 80302168 002FF0C8 83 DE 00 04 */ lwz r30, 4(r30) lbl_8030216C: /* 8030216C 002FF0CC 80 1D 00 00 */ lwz r0, 0(r29) @@ -473,7 +473,7 @@ lbl_8030216C: /* 803021A0 002FF100 80 01 04 C4 */ lwz r0, 0x4c4(r1) /* 803021A4 002FF104 7C 08 03 A6 */ mtlr r0 /* 803021A8 002FF108 38 21 04 C0 */ addi r1, r1, 0x4c0 -/* 803021AC 002FF10C 4E 80 00 20 */ blr +/* 803021AC 002FF10C 4E 80 00 20 */ blr .global BuildRenderBuffer__18CTextExecuteBufferFv BuildRenderBuffer__18CTextExecuteBufferFv: @@ -500,7 +500,7 @@ lbl_803021EC: /* 803021FC 002FF15C 81 83 00 00 */ lwz r12, 0(r3) /* 80302200 002FF160 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80302204 002FF164 7D 89 03 A6 */ mtctr r12 -/* 80302208 002FF168 4E 80 04 21 */ bctrl +/* 80302208 002FF168 4E 80 04 21 */ bctrl /* 8030220C 002FF16C 83 FF 00 04 */ lwz r31, 4(r31) lbl_80302210: /* 80302210 002FF170 80 1E 00 08 */ lwz r0, 8(r30) @@ -524,7 +524,7 @@ lbl_80302244: /* 80302254 002FF1B4 81 83 00 00 */ lwz r12, 0(r3) /* 80302258 002FF1B8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8030225C 002FF1BC 7D 89 03 A6 */ mtctr r12 -/* 80302260 002FF1C0 4E 80 04 21 */ bctrl +/* 80302260 002FF1C0 4E 80 04 21 */ bctrl /* 80302264 002FF1C4 83 FF 00 04 */ lwz r31, 4(r31) lbl_80302268: /* 80302268 002FF1C8 80 1E 00 08 */ lwz r0, 8(r30) @@ -545,7 +545,7 @@ lbl_80302268: /* 803022A4 002FF204 83 A1 04 B4 */ lwz r29, 0x4b4(r1) /* 803022A8 002FF208 7C 08 03 A6 */ mtlr r0 /* 803022AC 002FF20C 38 21 04 C0 */ addi r1, r1, 0x4c0 -/* 803022B0 002FF210 4E 80 00 20 */ blr +/* 803022B0 002FF210 4E 80 00 20 */ blr .global GetAssets__18CTextExecuteBufferFv GetAssets__18CTextExecuteBufferFv: @@ -567,7 +567,7 @@ lbl_803022E4: /* 803022EC 002FF24C 81 83 00 00 */ lwz r12, 0(r3) /* 803022F0 002FF250 81 8C 00 18 */ lwz r12, 0x18(r12) /* 803022F4 002FF254 7D 89 03 A6 */ mtctr r12 -/* 803022F8 002FF258 4E 80 04 21 */ bctrl +/* 803022F8 002FF258 4E 80 04 21 */ bctrl /* 803022FC 002FF25C 7F BD 1A 14 */ add r29, r29, r3 /* 80302300 002FF260 83 9C 00 04 */ lwz r28, 4(r28) lbl_80302304: @@ -592,7 +592,7 @@ lbl_8030233C: /* 80302348 002FF2A8 81 83 00 00 */ lwz r12, 0(r3) /* 8030234C 002FF2AC 81 8C 00 14 */ lwz r12, 0x14(r12) /* 80302350 002FF2B0 7D 89 03 A6 */ mtctr r12 -/* 80302354 002FF2B4 4E 80 04 21 */ bctrl +/* 80302354 002FF2B4 4E 80 04 21 */ bctrl /* 80302358 002FF2B8 83 9C 00 04 */ lwz r28, 4(r28) lbl_8030235C: /* 8030235C 002FF2BC 80 1E 00 08 */ lwz r0, 8(r30) @@ -674,7 +674,7 @@ lbl_80302450: /* 80302460 002FF3C0 83 81 00 30 */ lwz r28, 0x30(r1) /* 80302464 002FF3C4 7C 08 03 A6 */ mtlr r0 /* 80302468 002FF3C8 38 21 00 40 */ addi r1, r1, 0x40 -/* 8030246C 002FF3CC 4E 80 00 20 */ blr +/* 8030246C 002FF3CC 4E 80 00 20 */ blr .global AddString__18CTextExecuteBufferFPCwi AddString__18CTextExecuteBufferFPCwi: @@ -779,7 +779,7 @@ lbl_803025CC: /* 803025D0 002FF530 80 01 00 44 */ lwz r0, 0x44(r1) /* 803025D4 002FF534 7C 08 03 A6 */ mtlr r0 /* 803025D8 002FF538 38 21 00 40 */ addi r1, r1, 0x40 -/* 803025DC 002FF53C 4E 80 00 20 */ blr +/* 803025DC 002FF53C 4E 80 00 20 */ blr .global AddStringFragment__18CTextExecuteBufferFPCwi AddStringFragment__18CTextExecuteBufferFPCwi: @@ -817,7 +817,7 @@ lbl_80302640: /* 80302650 002FF5B0 83 81 00 10 */ lwz r28, 0x10(r1) /* 80302654 002FF5B4 7C 08 03 A6 */ mtlr r0 /* 80302658 002FF5B8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8030265C 002FF5BC 4E 80 00 20 */ blr +/* 8030265C 002FF5BC 4E 80 00 20 */ blr .global WrapOneLTR__18CTextExecuteBufferFPCwi WrapOneLTR__18CTextExecuteBufferFPCwi: @@ -1011,7 +1011,7 @@ lbl_80302910: /* 80302918 002FF878 80 01 00 44 */ lwz r0, 0x44(r1) /* 8030291C 002FF87C 7C 08 03 A6 */ mtlr r0 /* 80302920 002FF880 38 21 00 40 */ addi r1, r1, 0x40 -/* 80302924 002FF884 4E 80 00 20 */ blr +/* 80302924 002FF884 4E 80 00 20 */ blr .global sub_80302928 sub_80302928: @@ -1066,7 +1066,7 @@ lbl_803029A0: /* 803029DC 002FF93C 80 01 00 34 */ lwz r0, 0x34(r1) /* 803029E0 002FF940 7C 08 03 A6 */ mtlr r0 /* 803029E4 002FF944 38 21 00 30 */ addi r1, r1, 0x30 -/* 803029E8 002FF948 4E 80 00 20 */ blr +/* 803029E8 002FF948 4E 80 00 20 */ blr .global MoveWordLTR__18CTextExecuteBufferFv MoveWordLTR__18CTextExecuteBufferFv: @@ -1194,7 +1194,7 @@ lbl_80302B7C: /* 80302BBC 002FFB1C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80302BC0 002FFB20 7C 08 03 A6 */ mtlr r0 /* 80302BC4 002FFB24 38 21 00 20 */ addi r1, r1, 0x20 -/* 80302BC8 002FFB28 4E 80 00 20 */ blr +/* 80302BC8 002FFB28 4E 80 00 20 */ blr .global sub_80302bcc sub_80302bcc: @@ -1243,7 +1243,7 @@ lbl_80302C44: /* 80302C68 002FFBC8 80 01 00 24 */ lwz r0, 0x24(r1) /* 80302C6C 002FFBCC 7C 08 03 A6 */ mtlr r0 /* 80302C70 002FFBD0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80302C74 002FFBD4 4E 80 00 20 */ blr +/* 80302C74 002FFBD4 4E 80 00 20 */ blr .global StartNewLine__18CTextExecuteBufferFv StartNewLine__18CTextExecuteBufferFv: @@ -1330,7 +1330,7 @@ lbl_80302D3C: /* 80302DAC 002FFD0C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80302DB0 002FFD10 7C 08 03 A6 */ mtlr r0 /* 80302DB4 002FFD14 38 21 00 20 */ addi r1, r1, 0x20 -/* 80302DB8 002FFD18 4E 80 00 20 */ blr +/* 80302DB8 002FFD18 4E 80 00 20 */ blr .global StartNewWord__18CTextExecuteBufferFv StartNewWord__18CTextExecuteBufferFv: @@ -1392,7 +1392,7 @@ lbl_80302E30: /* 80302E90 002FFDF0 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80302E94 002FFDF4 7C 08 03 A6 */ mtlr r0 /* 80302E98 002FFDF8 38 21 00 20 */ addi r1, r1, 0x20 -/* 80302E9C 002FFDFC 4E 80 00 20 */ blr +/* 80302E9C 002FFDFC 4E 80 00 20 */ blr .global sub_80302ea0 sub_80302ea0: @@ -1408,7 +1408,7 @@ lbl_80302EC0: /* 80302EC0 002FFE20 80 01 00 14 */ lwz r0, 0x14(r1) /* 80302EC4 002FFE24 7C 08 03 A6 */ mtlr r0 /* 80302EC8 002FFE28 38 21 00 10 */ addi r1, r1, 0x10 -/* 80302ECC 002FFE2C 4E 80 00 20 */ blr +/* 80302ECC 002FFE2C 4E 80 00 20 */ blr .global TerminateLineLTR__18CTextExecuteBufferFv TerminateLineLTR__18CTextExecuteBufferFv: @@ -1475,7 +1475,7 @@ lbl_80302FA0: /* 80302FB0 002FFF10 80 01 00 34 */ lwz r0, 0x34(r1) /* 80302FB4 002FFF14 7C 08 03 A6 */ mtlr r0 /* 80302FB8 002FFF18 38 21 00 30 */ addi r1, r1, 0x30 -/* 80302FBC 002FFF1C 4E 80 00 20 */ blr +/* 80302FBC 002FFF1C 4E 80 00 20 */ blr .global __ct__20CPopStateInstructionFv __ct__20CPopStateInstructionFv: @@ -1539,7 +1539,7 @@ lbl_80303088: /* 80303098 002FFFF8 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8030309C 002FFFFC 7C 08 03 A6 */ mtlr r0 /* 803030A0 00300000 38 21 00 20 */ addi r1, r1, 0x20 -/* 803030A4 00300004 4E 80 00 20 */ blr +/* 803030A4 00300004 4E 80 00 20 */ blr .global __ct__21CPushStateInstructionFv __ct__21CPushStateInstructionFv: @@ -1589,31 +1589,31 @@ lbl_8030311C: /* 8030314C 003000AC 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80303150 003000B0 7C 08 03 A6 */ mtlr r0 /* 80303154 003000B4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80303158 003000B8 4E 80 00 20 */ blr +/* 80303158 003000B8 4E 80 00 20 */ blr .global sub_8030315c sub_8030315c: /* 8030315C 003000BC 90 83 00 9C */ stw r4, 0x9c(r3) /* 80303160 003000C0 80 63 00 A4 */ lwz r3, 0xa4(r3) /* 80303164 003000C4 28 03 00 00 */ cmplwi r3, 0 -/* 80303168 003000C8 4D 82 00 20 */ beqlr +/* 80303168 003000C8 4D 82 00 20 */ beqlr /* 8030316C 003000CC 80 03 00 08 */ lwz r0, 8(r3) /* 80303170 003000D0 2C 00 00 00 */ cmpwi r0, 0 -/* 80303174 003000D4 4C 82 00 20 */ bnelr +/* 80303174 003000D4 4C 82 00 20 */ bnelr /* 80303178 003000D8 90 83 00 2C */ stw r4, 0x2c(r3) -/* 8030317C 003000DC 4E 80 00 20 */ blr +/* 8030317C 003000DC 4E 80 00 20 */ blr .global sub_80303180 sub_80303180: /* 80303180 003000E0 90 83 00 98 */ stw r4, 0x98(r3) /* 80303184 003000E4 80 63 00 A4 */ lwz r3, 0xa4(r3) /* 80303188 003000E8 28 03 00 00 */ cmplwi r3, 0 -/* 8030318C 003000EC 4D 82 00 20 */ beqlr +/* 8030318C 003000EC 4D 82 00 20 */ beqlr /* 80303190 003000F0 80 03 00 08 */ lwz r0, 8(r3) /* 80303194 003000F4 2C 00 00 00 */ cmpwi r0, 0 -/* 80303198 003000F8 4C 82 00 20 */ bnelr +/* 80303198 003000F8 4C 82 00 20 */ bnelr /* 8030319C 003000FC 90 83 00 28 */ stw r4, 0x28(r3) -/* 803031A0 00300100 4E 80 00 20 */ blr +/* 803031A0 00300100 4E 80 00 20 */ blr .global __ct__26CLineExtraSpaceInstructionFi __ct__26CLineExtraSpaceInstructionFi: @@ -1666,7 +1666,7 @@ lbl_80303228: /* 80303254 003001B4 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80303258 003001B8 7C 08 03 A6 */ mtlr r0 /* 8030325C 003001BC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80303260 003001C0 4E 80 00 20 */ blr +/* 80303260 003001C0 4E 80 00 20 */ blr .global __ct__23CLineSpacingInstructionFf __ct__23CLineSpacingInstructionFf: @@ -1718,7 +1718,7 @@ lbl_803032E4: /* 80303310 00300270 83 C1 00 10 */ lwz r30, 0x10(r1) /* 80303314 00300274 7C 08 03 A6 */ mtlr r0 /* 80303318 00300278 38 21 00 20 */ addi r1, r1, 0x20 -/* 8030331C 0030027C 4E 80 00 20 */ blr +/* 8030331C 0030027C 4E 80 00 20 */ blr .global __ct__31CRemoveColorOverrideInstructionFi __ct__31CRemoveColorOverrideInstructionFi: @@ -1770,7 +1770,7 @@ lbl_803033A4: /* 803033CC 0030032C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 803033D0 00300330 7C 08 03 A6 */ mtlr r0 /* 803033D4 00300334 38 21 00 20 */ addi r1, r1, 0x20 -/* 803033D8 00300338 4E 80 00 20 */ blr +/* 803033D8 00300338 4E 80 00 20 */ blr .global __ct__25CColorOverrideInstructionFv __ct__25CColorOverrideInstructionFv: @@ -1833,7 +1833,7 @@ lbl_80303488: /* 803034B4 00300414 83 81 00 10 */ lwz r28, 0x10(r1) /* 803034B8 00300418 7C 08 03 A6 */ mtlr r0 /* 803034BC 0030041C 38 21 00 20 */ addi r1, r1, 0x20 -/* 803034C0 00300420 4E 80 00 20 */ blr +/* 803034C0 00300420 4E 80 00 20 */ blr .global __ct__17CColorInstructionFiRC6CColor __ct__17CColorInstructionFiRC6CColor: @@ -1896,7 +1896,7 @@ lbl_80303570: /* 8030359C 003004FC 83 81 00 10 */ lwz r28, 0x10(r1) /* 803035A0 00300500 7C 08 03 A6 */ mtlr r0 /* 803035A4 00300504 38 21 00 20 */ addi r1, r1, 0x20 -/* 803035A8 00300508 4E 80 00 20 */ blr +/* 803035A8 00300508 4E 80 00 20 */ blr .global AddImage__18CTextExecuteBufferFRC13CFontImageDef AddImage__18CTextExecuteBufferFRC13CFontImageDef: @@ -2121,7 +2121,7 @@ lbl_803038CC: /* 803038F8 00300858 83 81 00 60 */ lwz r28, 0x60(r1) /* 803038FC 0030085C 7C 08 03 A6 */ mtlr r0 /* 80303900 00300860 38 21 00 70 */ addi r1, r1, 0x70 -/* 80303904 00300864 4E 80 00 20 */ blr +/* 80303904 00300864 4E 80 00 20 */ blr .global __ct__17CImageInstructionFRC13CFontImageDef __ct__17CImageInstructionFRC13CFontImageDef: @@ -2143,7 +2143,7 @@ __ct__17CImageInstructionFRC13CFontImageDef: /* 80303944 003008A4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80303948 003008A8 7C 08 03 A6 */ mtlr r0 /* 8030394C 003008AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80303950 003008B0 4E 80 00 20 */ blr +/* 80303950 003008B0 4E 80 00 20 */ blr .global "AddFont__18CTextExecuteBufferFRC21TToken<11CRasterFont>" "AddFont__18CTextExecuteBufferFRC21TToken<11CRasterFont>": @@ -2270,7 +2270,7 @@ lbl_80303B0C: /* 80303B18 00300A78 80 01 00 34 */ lwz r0, 0x34(r1) /* 80303B1C 00300A7C 7C 08 03 A6 */ mtlr r0 /* 80303B20 00300A80 38 21 00 30 */ addi r1, r1, 0x30 -/* 80303B24 00300A84 4E 80 00 20 */ blr +/* 80303B24 00300A84 4E 80 00 20 */ blr .global EndBlock__18CTextExecuteBufferFv EndBlock__18CTextExecuteBufferFv: @@ -2291,7 +2291,7 @@ lbl_80303B4C: /* 80303B5C 00300ABC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80303B60 00300AC0 7C 08 03 A6 */ mtlr r0 /* 80303B64 00300AC4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80303B68 00300AC8 4E 80 00 20 */ blr +/* 80303B68 00300AC8 4E 80 00 20 */ blr .global BeginBlock__18CTextExecuteBufferFiiiib14ETextDirection14EJustification22EVerticalJustification BeginBlock__18CTextExecuteBufferFiiiib14ETextDirection14EJustification22EVerticalJustification: @@ -2392,7 +2392,7 @@ lbl_80303CB0: /* 80303CD8 00300C38 80 01 00 44 */ lwz r0, 0x44(r1) /* 80303CDC 00300C3C 7C 08 03 A6 */ mtlr r0 /* 80303CE0 00300C40 38 21 00 40 */ addi r1, r1, 0x40 -/* 80303CE4 00300C44 4E 80 00 20 */ blr +/* 80303CE4 00300C44 4E 80 00 20 */ blr .global Clear__18CTextExecuteBufferFv Clear__18CTextExecuteBufferFv: @@ -2433,7 +2433,7 @@ lbl_80303D18: /* 80303D68 00300CC8 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 80303D6C 00300CCC 7C 08 03 A6 */ mtlr r0 /* 80303D70 00300CD0 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 80303D74 00300CD4 4E 80 00 20 */ blr +/* 80303D74 00300CD4 4E 80 00 20 */ blr .global __ct__18CTextExecuteBufferFv __ct__18CTextExecuteBufferFv: @@ -2471,7 +2471,7 @@ __ct__18CTextExecuteBufferFv: /* 80303DF4 00300D54 80 01 00 14 */ lwz r0, 0x14(r1) /* 80303DF8 00300D58 7C 08 03 A6 */ mtlr r0 /* 80303DFC 00300D5C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80303E00 00300D60 4E 80 00 20 */ blr +/* 80303E00 00300D60 4E 80 00 20 */ blr .global sub_80303e04 sub_80303e04: @@ -2491,7 +2491,7 @@ sub_80303e04: /* 80303E38 00300D98 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80303E3C 00300D9C 7C 08 03 A6 */ mtlr r0 /* 80303E40 00300DA0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80303E44 00300DA4 4E 80 00 20 */ blr +/* 80303E44 00300DA4 4E 80 00 20 */ blr .global sub_80303e48 sub_80303e48: @@ -2505,14 +2505,14 @@ sub_80303e48: /* 80303E64 00300DC4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80303E68 00300DC8 7C 08 03 A6 */ mtlr r0 /* 80303E6C 00300DCC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80303E70 00300DD0 4E 80 00 20 */ blr +/* 80303E70 00300DD0 4E 80 00 20 */ blr .global sub_80303e74 sub_80303e74: /* 80303E74 00300DD4 2C 04 00 00 */ cmpwi r4, 0 /* 80303E78 00300DD8 40 81 00 B8 */ ble lbl_80303F30 /* 80303E7C 00300DDC 38 C0 00 00 */ li r6, 0 -/* 80303E80 00300DE0 4C 81 00 20 */ blelr +/* 80303E80 00300DE0 4C 81 00 20 */ blelr /* 80303E84 00300DE4 2C 04 00 08 */ cmpwi r4, 8 /* 80303E88 00300DE8 38 A4 FF F8 */ addi r5, r4, -8 /* 80303E8C 00300DEC 40 81 00 80 */ ble lbl_80303F0C @@ -2552,16 +2552,16 @@ lbl_80303F0C: /* 80303F0C 00300E6C 7C 06 20 50 */ subf r0, r6, r4 /* 80303F10 00300E70 7C 09 03 A6 */ mtctr r0 /* 80303F14 00300E74 7C 06 20 00 */ cmpw r6, r4 -/* 80303F18 00300E78 4C 80 00 20 */ bgelr +/* 80303F18 00300E78 4C 80 00 20 */ bgelr lbl_80303F1C: /* 80303F1C 00300E7C 80 83 00 00 */ lwz r4, 0(r3) /* 80303F20 00300E80 80 04 00 04 */ lwz r0, 4(r4) /* 80303F24 00300E84 90 03 00 00 */ stw r0, 0(r3) /* 80303F28 00300E88 42 00 FF F4 */ bdnz lbl_80303F1C -/* 80303F2C 00300E8C 4E 80 00 20 */ blr +/* 80303F2C 00300E8C 4E 80 00 20 */ blr lbl_80303F30: /* 80303F30 00300E90 7C 84 00 D0 */ neg r4, r4 -/* 80303F34 00300E94 4C 80 00 20 */ bgelr +/* 80303F34 00300E94 4C 80 00 20 */ bgelr /* 80303F38 00300E98 54 80 E8 FF */ rlwinm. r0, r4, 0x1d, 3, 0x1f /* 80303F3C 00300E9C 7C 09 03 A6 */ mtctr r0 /* 80303F40 00300EA0 41 82 00 70 */ beq lbl_80303FB0 @@ -2592,7 +2592,7 @@ lbl_80303F44: /* 80303FA0 00300F00 90 03 00 00 */ stw r0, 0(r3) /* 80303FA4 00300F04 42 00 FF A0 */ bdnz lbl_80303F44 /* 80303FA8 00300F08 70 84 00 07 */ andi. r4, r4, 7 -/* 80303FAC 00300F0C 4D 82 00 20 */ beqlr +/* 80303FAC 00300F0C 4D 82 00 20 */ beqlr lbl_80303FB0: /* 80303FB0 00300F10 7C 89 03 A6 */ mtctr r4 lbl_80303FB4: @@ -2600,7 +2600,7 @@ lbl_80303FB4: /* 80303FB8 00300F18 80 05 00 00 */ lwz r0, 0(r5) /* 80303FBC 00300F1C 90 03 00 00 */ stw r0, 0(r3) /* 80303FC0 00300F20 42 00 FF F4 */ bdnz lbl_80303FB4 -/* 80303FC4 00300F24 4E 80 00 20 */ blr +/* 80303FC4 00300F24 4E 80 00 20 */ blr .global sub_80303fc8 sub_80303fc8: diff --git a/asm/Kyoto/Text/CTextInstruction.s b/asm/Kyoto/Text/CTextInstruction.s index 8ffe4e98..bda100f0 100644 --- a/asm/Kyoto/Text/CTextInstruction.s +++ b/asm/Kyoto/Text/CTextInstruction.s @@ -42,7 +42,7 @@ lbl_803040A8: /* 803040B0 00301010 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803040B4 00301014 7C 08 03 A6 */ mtlr r0 /* 803040B8 00301018 38 21 00 10 */ addi r1, r1, 0x10 -/* 803040BC 0030101C 4E 80 00 20 */ blr +/* 803040BC 0030101C 4E 80 00 20 */ blr .global __ct__16CTextInstructionFPCwi __ct__16CTextInstructionFPCwi: @@ -55,7 +55,7 @@ __ct__16CTextInstructionFPCwi: /* 803040D8 00301038 39 20 00 00 */ li r9, 0 /* 803040DC 0030103C 90 03 00 00 */ stw r0, 0(r3) /* 803040E0 00301040 90 A3 00 04 */ stw r5, 4(r3) -/* 803040E4 00301044 4C 81 00 20 */ blelr +/* 803040E4 00301044 4C 81 00 20 */ blelr /* 803040E8 00301048 2C 05 00 08 */ cmpwi r5, 8 /* 803040EC 0030104C 38 C5 FF F8 */ addi r6, r5, -8 /* 803040F0 00301050 40 81 00 70 */ ble lbl_80304160 @@ -94,14 +94,14 @@ lbl_80304160: /* 8030416C 003010CC 7C C3 32 14 */ add r6, r3, r6 /* 80304170 003010D0 7C 09 03 A6 */ mtctr r0 /* 80304174 003010D4 7C 09 28 00 */ cmpw r9, r5 -/* 80304178 003010D8 4C 80 00 20 */ bgelr +/* 80304178 003010D8 4C 80 00 20 */ bgelr lbl_8030417C: /* 8030417C 003010DC A0 04 00 00 */ lhz r0, 0(r4) /* 80304180 003010E0 38 84 00 02 */ addi r4, r4, 2 /* 80304184 003010E4 B0 06 00 08 */ sth r0, 8(r6) /* 80304188 003010E8 38 C6 00 02 */ addi r6, r6, 2 /* 8030418C 003010EC 42 00 FF F0 */ bdnz lbl_8030417C -/* 80304190 003010F0 4E 80 00 20 */ blr +/* 80304190 003010F0 4E 80 00 20 */ blr .global Invoke__16CTextInstructionCFR16CFontRenderStateP17CTextRenderBuffer Invoke__16CTextInstructionCFR16CFontRenderStateP17CTextRenderBuffer: @@ -170,7 +170,7 @@ lbl_80304280: /* 80304284 003011E4 80 01 00 44 */ lwz r0, 0x44(r1) /* 80304288 003011E8 7C 08 03 A6 */ mtlr r0 /* 8030428C 003011EC 38 21 00 40 */ addi r1, r1, 0x40 -/* 80304290 003011F0 4E 80 00 20 */ blr +/* 80304290 003011F0 4E 80 00 20 */ blr .global Create__16CTextInstructionFPCwi Create__16CTextInstructionFPCwi: diff --git a/asm/Kyoto/Text/CTextParser.s b/asm/Kyoto/Text/CTextParser.s index afc9d497..4a9f7cad 100644 --- a/asm/Kyoto/Text/CTextParser.s +++ b/asm/Kyoto/Text/CTextParser.s @@ -31,7 +31,7 @@ lbl_803ED718: .string16 "push" .string16 "pop" .balign 8 - + .section .text, "ax" .global ParseColor__11CTextParserFPCwi @@ -68,7 +68,7 @@ lbl_80304354: /* 80304368 003012C8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8030436C 003012CC 7C 08 03 A6 */ mtlr r0 /* 80304370 003012D0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80304374 003012D4 4E 80 00 20 */ blr +/* 80304374 003012D4 4E 80 00 20 */ blr .global GetColorValue__11CTextParserFPCw GetColorValue__11CTextParserFPCw: @@ -88,7 +88,7 @@ GetColorValue__11CTextParserFPCw: /* 803043AC 0030130C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803043B0 00301310 7C 08 03 A6 */ mtlr r0 /* 803043B4 00301314 38 21 00 10 */ addi r1, r1, 0x10 -/* 803043B8 00301318 4E 80 00 20 */ blr +/* 803043B8 00301318 4E 80 00 20 */ blr .global FromHex__11CTextParserFw FromHex__11CTextParserFw: @@ -98,7 +98,7 @@ FromHex__11CTextParserFw: /* 803043C8 00301328 28 04 00 39 */ cmplwi r4, 0x39 /* 803043CC 0030132C 41 81 00 0C */ bgt lbl_803043D8 /* 803043D0 00301330 38 64 FF D0 */ addi r3, r4, -48 -/* 803043D4 00301334 4E 80 00 20 */ blr +/* 803043D4 00301334 4E 80 00 20 */ blr lbl_803043D8: /* 803043D8 00301338 54 64 04 3E */ clrlwi r4, r3, 0x10 /* 803043DC 0030133C 28 04 00 41 */ cmplwi r4, 0x41 @@ -106,7 +106,7 @@ lbl_803043D8: /* 803043E4 00301344 28 04 00 46 */ cmplwi r4, 0x46 /* 803043E8 00301348 41 81 00 0C */ bgt lbl_803043F4 /* 803043EC 0030134C 38 64 FF C9 */ addi r3, r4, -55 -/* 803043F0 00301350 4E 80 00 20 */ blr +/* 803043F0 00301350 4E 80 00 20 */ blr lbl_803043F4: /* 803043F4 00301354 54 63 04 3E */ clrlwi r3, r3, 0x10 /* 803043F8 00301358 28 03 00 61 */ cmplwi r3, 0x61 @@ -114,10 +114,10 @@ lbl_803043F4: /* 80304400 00301360 28 03 00 66 */ cmplwi r3, 0x66 /* 80304404 00301364 41 81 00 0C */ bgt lbl_80304410 /* 80304408 00301368 38 63 FF A9 */ addi r3, r3, -87 -/* 8030440C 0030136C 4E 80 00 20 */ blr +/* 8030440C 0030136C 4E 80 00 20 */ blr lbl_80304410: /* 80304410 00301370 38 60 00 00 */ li r3, 0 -/* 80304414 00301374 4E 80 00 20 */ blr +/* 80304414 00301374 4E 80 00 20 */ blr .global ParseInt__11CTextParserFPCwib ParseInt__11CTextParserFPCwib: @@ -191,9 +191,9 @@ lbl_803044FC: lbl_80304514: /* 80304514 00301474 54 C0 06 3F */ clrlwi. r0, r6, 0x18 /* 80304518 00301478 7C 83 23 78 */ mr r3, r4 -/* 8030451C 0030147C 4D 82 00 20 */ beqlr +/* 8030451C 0030147C 4D 82 00 20 */ beqlr /* 80304520 00301480 7C 64 00 D0 */ neg r3, r4 -/* 80304524 00301484 4E 80 00 20 */ blr +/* 80304524 00301484 4E 80 00 20 */ blr .global Equals__11CTextParserFPCwiPCw Equals__11CTextParserFPCwiPCw: @@ -205,7 +205,7 @@ lbl_80304534: /* 80304538 00301498 7C 00 38 40 */ cmplw r0, r7 /* 8030453C 0030149C 41 82 00 0C */ beq lbl_80304548 /* 80304540 003014A0 38 60 00 00 */ li r3, 0 -/* 80304544 003014A4 4E 80 00 20 */ blr +/* 80304544 003014A4 4E 80 00 20 */ blr lbl_80304548: /* 80304548 003014A8 38 C6 00 02 */ addi r6, r6, 2 /* 8030454C 003014AC 38 63 00 02 */ addi r3, r3, 2 @@ -221,7 +221,7 @@ lbl_80304568: /* 8030456C 003014CC 7C 05 02 2E */ lhzx r0, r5, r0 /* 80304570 003014D0 7C 00 00 34 */ cntlzw r0, r0 /* 80304574 003014D4 54 03 D9 7E */ srwi r3, r0, 5 -/* 80304578 003014D8 4E 80 00 20 */ blr +/* 80304578 003014D8 4E 80 00 20 */ blr .global BeginsWith__11CTextParserFPCwiPCw BeginsWith__11CTextParserFPCwiPCw: @@ -233,7 +233,7 @@ lbl_80304588: /* 8030458C 003014EC 7C 00 38 40 */ cmplw r0, r7 /* 80304590 003014F0 41 82 00 0C */ beq lbl_8030459C /* 80304594 003014F4 38 60 00 00 */ li r3, 0 -/* 80304598 003014F8 4E 80 00 20 */ blr +/* 80304598 003014F8 4E 80 00 20 */ blr lbl_8030459C: /* 8030459C 003014FC 38 C6 00 02 */ addi r6, r6, 2 /* 803045A0 00301500 38 63 00 02 */ addi r3, r3, 2 @@ -249,7 +249,7 @@ lbl_803045BC: /* 803045C0 00301520 7C 05 02 2E */ lhzx r0, r5, r0 /* 803045C4 00301524 7C 00 00 34 */ cntlzw r0, r0 /* 803045C8 00301528 54 03 D9 7E */ srwi r3, r0, 5 -/* 803045CC 0030152C 4E 80 00 20 */ blr +/* 803045CC 0030152C 4E 80 00 20 */ blr .global ParseTag__11CTextParserFR18CTextExecuteBufferPCwi ParseTag__11CTextParserFR18CTextExecuteBufferPCwi: @@ -718,12 +718,12 @@ lbl_80304C90: /* 80304C94 00301BF4 80 01 00 94 */ lwz r0, 0x94(r1) /* 80304C98 00301BF8 7C 08 03 A6 */ mtlr r0 /* 80304C9C 00301BFC 38 21 00 90 */ addi r1, r1, 0x90 -/* 80304CA0 00301C00 4E 80 00 20 */ blr +/* 80304CA0 00301C00 4E 80 00 20 */ blr .global HandleUserTag__11CTextParserFR18CTextExecuteBufferPCwi HandleUserTag__11CTextParserFR18CTextExecuteBufferPCwi: /* 80304CA4 00301C04 38 60 00 00 */ li r3, 0 -/* 80304CA8 00301C08 4E 80 00 20 */ blr +/* 80304CA8 00301C08 4E 80 00 20 */ blr .global GetImage__11CTextParserFPCwi GetImage__11CTextParserFPCwi: @@ -897,7 +897,7 @@ lbl_80304EF0: /* 80304F10 00301E70 81 84 00 00 */ lwz r12, 0(r4) /* 80304F14 00301E74 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80304F18 00301E78 7D 89 03 A6 */ mtctr r12 -/* 80304F1C 00301E7C 4E 80 04 21 */ bctrl +/* 80304F1C 00301E7C 4E 80 04 21 */ bctrl /* 80304F20 00301E80 38 61 00 F0 */ addi r3, r1, 0xf0 /* 80304F24 00301E84 38 81 00 F8 */ addi r4, r1, 0xf8 /* 80304F28 00301E88 48 03 BF 81 */ bl __ct__6CTokenFRC6CToken @@ -1060,7 +1060,7 @@ lbl_80305144: /* 80305164 003020C4 81 84 00 00 */ lwz r12, 0(r4) /* 80305168 003020C8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8030516C 003020CC 7D 89 03 A6 */ mtctr r12 -/* 80305170 003020D0 4E 80 04 21 */ bctrl +/* 80305170 003020D0 4E 80 04 21 */ bctrl /* 80305174 003020D4 38 61 00 D0 */ addi r3, r1, 0xd0 /* 80305178 003020D8 38 81 00 D8 */ addi r4, r1, 0xd8 /* 8030517C 003020DC 48 03 BD 2D */ bl __ct__6CTokenFRC6CToken @@ -1206,7 +1206,7 @@ lbl_803052CC: /* 80305378 003022D8 81 84 00 00 */ lwz r12, 0(r4) /* 8030537C 003022DC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80305380 003022E0 7D 89 03 A6 */ mtctr r12 -/* 80305384 003022E4 4E 80 04 21 */ bctrl +/* 80305384 003022E4 4E 80 04 21 */ bctrl /* 80305388 003022E8 38 61 00 B0 */ addi r3, r1, 0xb0 /* 8030538C 003022EC 38 81 00 B8 */ addi r4, r1, 0xb8 /* 80305390 003022F0 48 03 BB 19 */ bl __ct__6CTokenFRC6CToken @@ -1289,7 +1289,7 @@ lbl_80305478: /* 803054A0 00302400 81 84 00 00 */ lwz r12, 0(r4) /* 803054A4 00302404 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803054A8 00302408 7D 89 03 A6 */ mtctr r12 -/* 803054AC 0030240C 4E 80 04 21 */ bctrl +/* 803054AC 0030240C 4E 80 04 21 */ bctrl /* 803054B0 00302410 38 61 00 90 */ addi r3, r1, 0x90 /* 803054B4 00302414 38 81 00 98 */ addi r4, r1, 0x98 /* 803054B8 00302418 48 03 B9 F1 */ bl __ct__6CTokenFRC6CToken @@ -1320,7 +1320,7 @@ lbl_803054FC: /* 80305518 00302478 80 01 02 34 */ lwz r0, 0x234(r1) /* 8030551C 0030247C 7C 08 03 A6 */ mtlr r0 /* 80305520 00302480 38 21 02 30 */ addi r1, r1, 0x230 -/* 80305524 00302484 4E 80 00 20 */ blr +/* 80305524 00302484 4E 80 00 20 */ blr .global GetFont__11CTextParserFPCwi GetFont__11CTextParserFPCwi: @@ -1358,7 +1358,7 @@ GetFont__11CTextParserFPCwi: /* 803055A4 00302504 81 84 00 00 */ lwz r12, 0(r4) /* 803055A8 00302508 81 8C 00 0C */ lwz r12, 0xc(r12) /* 803055AC 0030250C 7D 89 03 A6 */ mtctr r12 -/* 803055B0 00302510 4E 80 04 21 */ bctrl +/* 803055B0 00302510 4E 80 04 21 */ bctrl /* 803055B4 00302514 7F 83 E3 78 */ mr r3, r28 /* 803055B8 00302518 38 81 00 08 */ addi r4, r1, 8 /* 803055BC 0030251C 48 03 B8 ED */ bl __ct__6CTokenFRC6CToken @@ -1372,7 +1372,7 @@ GetFont__11CTextParserFPCwi: /* 803055DC 0030253C 83 81 00 20 */ lwz r28, 0x20(r1) /* 803055E0 00302540 7C 08 03 A6 */ mtlr r0 /* 803055E4 00302544 38 21 00 30 */ addi r1, r1, 0x30 -/* 803055E8 00302548 4E 80 00 20 */ blr +/* 803055E8 00302548 4E 80 00 20 */ blr .global "GetAssetIdFromString__11CTextParserFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" "GetAssetIdFromString__11CTextParserFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>": @@ -1467,7 +1467,7 @@ lbl_80305730: /* 8030573C 0030269C 83 A1 00 64 */ lwz r29, 0x64(r1) /* 80305740 003026A0 7C 08 03 A6 */ mtlr r0 /* 80305744 003026A4 38 21 00 70 */ addi r1, r1, 0x70 -/* 80305748 003026A8 4E 80 00 20 */ blr +/* 80305748 003026A8 4E 80 00 20 */ blr .global ParseText__11CTextParserFR18CTextExecuteBufferPCwi ParseText__11CTextParserFR18CTextExecuteBufferPCwi: @@ -1567,12 +1567,12 @@ lbl_8030588C: /* 80305890 003027F0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80305894 003027F4 7C 08 03 A6 */ mtlr r0 /* 80305898 003027F8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8030589C 003027FC 4E 80 00 20 */ blr +/* 8030589C 003027FC 4E 80 00 20 */ blr .global __ct__11CTextParserFR12IObjectStore __ct__11CTextParserFR12IObjectStore: /* 803058A0 00302800 90 83 00 00 */ stw r4, 0(r3) -/* 803058A4 00302804 4E 80 00 20 */ blr +/* 803058A4 00302804 4E 80 00 20 */ blr .global "reserve__Q24rstl54vector<17TToken<8CTexture>,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl54vector<17TToken<8CTexture>,Q24rstl17rmemory_allocator>Fi": diff --git a/asm/Kyoto/Text/CTextRenderBuffer.s b/asm/Kyoto/Text/CTextRenderBuffer.s index 7c93ba07..7ac5afa8 100644 --- a/asm/Kyoto/Text/CTextRenderBuffer.s +++ b/asm/Kyoto/Text/CTextRenderBuffer.s @@ -274,7 +274,7 @@ lbl_80359E5C: /* 80359EA8 00356E08 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 80359EAC 00356E0C 7C 08 03 A6 */ mtlr r0 /* 80359EB0 00356E10 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 80359EB4 00356E14 4E 80 00 20 */ blr +/* 80359EB4 00356E14 4E 80 00 20 */ blr .global HasSpaceAvailable__17CTextRenderBufferFRC9CVector2iRC9CVector2i HasSpaceAvailable__17CTextRenderBufferFRC9CVector2iRC9CVector2i: @@ -332,7 +332,7 @@ lbl_80359F6C: /* 80359F78 00356ED8 83 A1 00 44 */ lwz r29, 0x44(r1) /* 80359F7C 00356EDC 7C 08 03 A6 */ mtlr r0 /* 80359F80 00356EE0 38 21 00 50 */ addi r1, r1, 0x50 -/* 80359F84 00356EE4 4E 80 00 20 */ blr +/* 80359F84 00356EE4 4E 80 00 20 */ blr .global SetPrimitive__17CTextRenderBufferFRCQ217CTextRenderBuffer9Primitivei SetPrimitive__17CTextRenderBufferFRCQ217CTextRenderBuffer9Primitivei: @@ -483,7 +483,7 @@ lbl_8035A19C: /* 8035A1B0 00357110 83 C1 00 A8 */ lwz r30, 0xa8(r1) /* 8035A1B4 00357114 7C 08 03 A6 */ mtlr r0 /* 8035A1B8 00357118 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 8035A1BC 0035711C 4E 80 00 20 */ blr +/* 8035A1BC 0035711C 4E 80 00 20 */ blr .global GetPrimitive__17CTextRenderBufferCFi GetPrimitive__17CTextRenderBufferCFi: @@ -589,7 +589,7 @@ lbl_8035A32C: /* 8035A33C 0035729C 83 81 00 30 */ lwz r28, 0x30(r1) /* 8035A340 003572A0 7C 08 03 A6 */ mtlr r0 /* 8035A344 003572A4 38 21 00 40 */ addi r1, r1, 0x40 -/* 8035A348 003572A8 4E 80 00 20 */ blr +/* 8035A348 003572A8 4E 80 00 20 */ blr .global sub_8035a34c sub_8035a34c: @@ -606,7 +606,7 @@ sub_8035a34c: /* 8035A374 003572D4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8035A378 003572D8 7C 08 03 A6 */ mtlr r0 /* 8035A37C 003572DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8035A380 003572E0 4E 80 00 20 */ blr +/* 8035A380 003572E0 4E 80 00 20 */ blr .global GetOutStream__17CTextRenderBufferFv GetOutStream__17CTextRenderBufferFv: @@ -623,12 +623,12 @@ GetOutStream__17CTextRenderBufferFv: /* 8035A3AC 0035730C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8035A3B0 00357310 7C 08 03 A6 */ mtlr r0 /* 8035A3B4 00357314 38 21 00 10 */ addi r1, r1, 0x10 -/* 8035A3B8 00357318 4E 80 00 20 */ blr +/* 8035A3B8 00357318 4E 80 00 20 */ blr .global SetMode__17CTextRenderBufferFQ217CTextRenderBuffer5EMode SetMode__17CTextRenderBufferFQ217CTextRenderBuffer5EMode: /* 8035A3BC 0035731C 90 83 00 00 */ stw r4, 0(r3) -/* 8035A3C0 00357320 4E 80 00 20 */ blr +/* 8035A3C0 00357320 4E 80 00 20 */ blr .global sub_8035a3c4 sub_8035a3c4: @@ -646,7 +646,7 @@ lbl_8035A3EC: /* 8035A3EC 0035734C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8035A3F0 00357350 7C 08 03 A6 */ mtlr r0 /* 8035A3F4 00357354 38 21 00 10 */ addi r1, r1, 0x10 -/* 8035A3F8 00357358 4E 80 00 20 */ blr +/* 8035A3F8 00357358 4E 80 00 20 */ blr .global VerifyBuffer__17CTextRenderBufferFv VerifyBuffer__17CTextRenderBufferFv: @@ -703,7 +703,7 @@ lbl_8035A4A0: /* 8035A4AC 0035740C 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8035A4B0 00357410 7C 08 03 A6 */ mtlr r0 /* 8035A4B4 00357414 38 21 00 30 */ addi r1, r1, 0x30 -/* 8035A4B8 00357418 4E 80 00 20 */ blr +/* 8035A4B8 00357418 4E 80 00 20 */ blr .global Render__17CTextRenderBufferCFRC6CColorf Render__17CTextRenderBufferCFRC6CColorf: @@ -1169,7 +1169,7 @@ lbl_8035AB74: /* 8035ABB8 00357B18 80 01 01 24 */ lwz r0, 0x124(r1) /* 8035ABBC 00357B1C 7C 08 03 A6 */ mtlr r0 /* 8035ABC0 00357B20 38 21 01 20 */ addi r1, r1, 0x120 -/* 8035ABC4 00357B24 4E 80 00 20 */ blr +/* 8035ABC4 00357B24 4E 80 00 20 */ blr .global AddImage__17CTextRenderBufferFRC9CVector2iRC13CFontImageDef AddImage__17CTextRenderBufferFRC9CVector2iRC13CFontImageDef: @@ -1314,7 +1314,7 @@ lbl_8035ADBC: /* 8035ADCC 00357D2C 83 81 00 A0 */ lwz r28, 0xa0(r1) /* 8035ADD0 00357D30 7C 08 03 A6 */ mtlr r0 /* 8035ADD4 00357D34 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 8035ADD8 00357D38 4E 80 00 20 */ blr +/* 8035ADD8 00357D38 4E 80 00 20 */ blr .global sub_8035addc sub_8035addc: @@ -1350,7 +1350,7 @@ lbl_8035AE1C: /* 8035AE48 00357DA8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8035AE4C 00357DAC 7C 08 03 A6 */ mtlr r0 /* 8035AE50 00357DB0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8035AE54 00357DB4 4E 80 00 20 */ blr +/* 8035AE54 00357DB4 4E 80 00 20 */ blr .global sub_8035ae58 sub_8035ae58: @@ -1364,7 +1364,7 @@ lbl_8035AE70: /* 8035AE70 00357DD0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8035AE74 00357DD4 7C 08 03 A6 */ mtlr r0 /* 8035AE78 00357DD8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8035AE7C 00357DDC 4E 80 00 20 */ blr +/* 8035AE7C 00357DDC 4E 80 00 20 */ blr .global AddCharacter__17CTextRenderBufferFRC9CVector2isUi AddCharacter__17CTextRenderBufferFRC9CVector2isUi: @@ -1481,7 +1481,7 @@ lbl_8035B01C: /* 8035B020 00357F80 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 8035B024 00357F84 7C 08 03 A6 */ mtlr r0 /* 8035B028 00357F88 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 8035B02C 00357F8C 4E 80 00 20 */ blr +/* 8035B02C 00357F8C 4E 80 00 20 */ blr .global AddPaletteChange__17CTextRenderBufferFRC16CGraphicsPalette AddPaletteChange__17CTextRenderBufferFRC16CGraphicsPalette: @@ -1585,7 +1585,7 @@ lbl_8035B190: /* 8035B1A0 00358100 83 81 00 A0 */ lwz r28, 0xa0(r1) /* 8035B1A4 00358104 7C 08 03 A6 */ mtlr r0 /* 8035B1A8 00358108 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 8035B1AC 0035810C 4E 80 00 20 */ blr +/* 8035B1AC 0035810C 4E 80 00 20 */ blr .global "AddFontChange__17CTextRenderBufferFRC21TToken<11CRasterFont>" "AddFontChange__17CTextRenderBufferFRC21TToken<11CRasterFont>": @@ -1751,7 +1751,7 @@ lbl_8035B3EC: /* 8035B3F8 00358358 83 A1 00 A4 */ lwz r29, 0xa4(r1) /* 8035B3FC 0035835C 7C 08 03 A6 */ mtlr r0 /* 8035B400 00358360 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 8035B404 00358364 4E 80 00 20 */ blr +/* 8035B404 00358364 4E 80 00 20 */ blr .global GetMatchingPaletteIndex__17CTextRenderBufferCFRC16CGraphicsPalette GetMatchingPaletteIndex__17CTextRenderBufferCFRC16CGraphicsPalette: @@ -1793,7 +1793,7 @@ lbl_8035B474: /* 8035B484 003583E4 83 81 00 10 */ lwz r28, 0x10(r1) /* 8035B488 003583E8 7C 08 03 A6 */ mtlr r0 /* 8035B48C 003583EC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8035B490 003583F0 4E 80 00 20 */ blr +/* 8035B490 003583F0 4E 80 00 20 */ blr .global GetNextAvailablePalette__17CTextRenderBufferCFv GetNextAvailablePalette__17CTextRenderBufferCFv: @@ -1858,7 +1858,7 @@ lbl_8035B548: /* 8035B56C 003584CC 80 01 00 24 */ lwz r0, 0x24(r1) /* 8035B570 003584D0 7C 08 03 A6 */ mtlr r0 /* 8035B574 003584D4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8035B578 003584D8 4E 80 00 20 */ blr +/* 8035B578 003584D8 4E 80 00 20 */ blr .global __ct__17CTextRenderBufferFQ217CTextRenderBuffer5EMode __ct__17CTextRenderBufferFQ217CTextRenderBuffer5EMode: diff --git a/asm/Kyoto/Text/CWordBreakTables.s b/asm/Kyoto/Text/CWordBreakTables.s index 686b8ed6..9ca67b24 100644 --- a/asm/Kyoto/Text/CWordBreakTables.s +++ b/asm/Kyoto/Text/CWordBreakTables.s @@ -54,7 +54,7 @@ lbl_80305A20: /* 80305A24 00302984 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80305A28 00302988 7C 08 03 A6 */ mtlr r0 /* 80305A2C 0030298C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80305A30 00302990 4E 80 00 20 */ blr +/* 80305A30 00302990 4E 80 00 20 */ blr .global GetBeginRank__16CWordBreakTablesFw GetBeginRank__16CWordBreakTablesFw: @@ -99,7 +99,7 @@ lbl_80305AB4: /* 80305AB8 00302A18 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80305ABC 00302A1C 7C 08 03 A6 */ mtlr r0 /* 80305AC0 00302A20 38 21 00 20 */ addi r1, r1, 0x20 -/* 80305AC4 00302A24 4E 80 00 20 */ blr +/* 80305AC4 00302A24 4E 80 00 20 */ blr .global "lower_bound__4rstlFPC20CCharacterIdentifierPC20CCharacterIdentifierRCwQ220CCharacterIdentifier7Compare" "lower_bound__4rstlFPC20CCharacterIdentifierPC20CCharacterIdentifierRCwQ220CCharacterIdentifier7Compare": @@ -146,7 +146,7 @@ lbl_80305B40: /* 80305B5C 00302ABC 83 81 00 10 */ lwz r28, 0x10(r1) /* 80305B60 00302AC0 7C 08 03 A6 */ mtlr r0 /* 80305B64 00302AC4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80305B68 00302AC8 4E 80 00 20 */ blr +/* 80305B68 00302AC8 4E 80 00 20 */ blr .global "advance__4rstlFRPC20CCharacterIdentifieri" "advance__4rstlFRPC20CCharacterIdentifieri": @@ -160,7 +160,7 @@ lbl_80305B40: /* 80305B88 00302AE8 80 01 00 14 */ lwz r0, 0x14(r1) /* 80305B8C 00302AEC 7C 08 03 A6 */ mtlr r0 /* 80305B90 00302AF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80305B94 00302AF4 4E 80 00 20 */ blr +/* 80305B94 00302AF4 4E 80 00 20 */ blr .global "__advance__4rstlFRPC20CCharacterIdentifieriQ24rstl26random_access_iterator_tag" "__advance__4rstlFRPC20CCharacterIdentifieriQ24rstl26random_access_iterator_tag": @@ -168,7 +168,7 @@ lbl_80305B40: /* 80305B9C 00302AFC 54 80 18 38 */ slwi r0, r4, 3 /* 80305BA0 00302B00 7C 05 02 14 */ add r0, r5, r0 /* 80305BA4 00302B04 90 03 00 00 */ stw r0, 0(r3) -/* 80305BA8 00302B08 4E 80 00 20 */ blr +/* 80305BA8 00302B08 4E 80 00 20 */ blr .global "distance__4rstlFPC20CCharacterIdentifierPC20CCharacterIdentifier" "distance__4rstlFPC20CCharacterIdentifierPC20CCharacterIdentifier": @@ -182,7 +182,7 @@ lbl_80305B40: /* 80305BC8 00302B28 80 01 00 14 */ lwz r0, 0x14(r1) /* 80305BCC 00302B2C 7C 08 03 A6 */ mtlr r0 /* 80305BD0 00302B30 38 21 00 10 */ addi r1, r1, 0x10 -/* 80305BD4 00302B34 4E 80 00 20 */ blr +/* 80305BD4 00302B34 4E 80 00 20 */ blr .global "__distance__4rstlFPC20CCharacterIdentifierPC20CCharacterIdentifierQ24rstl26random_access_iterator_tag" "__distance__4rstlFPC20CCharacterIdentifierPC20CCharacterIdentifierQ24rstl26random_access_iterator_tag": diff --git a/asm/Kyoto/Text/CWordInstruction.s b/asm/Kyoto/Text/CWordInstruction.s index 7a9bdad9..79f03343 100644 --- a/asm/Kyoto/Text/CWordInstruction.s +++ b/asm/Kyoto/Text/CWordInstruction.s @@ -42,7 +42,7 @@ lbl_80305C2C: /* 80305C34 00302B94 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80305C38 00302B98 7C 08 03 A6 */ mtlr r0 /* 80305C3C 00302B9C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80305C40 00302BA0 4E 80 00 20 */ blr +/* 80305C40 00302BA0 4E 80 00 20 */ blr .global InvokeLTR__16CWordInstructionCFR16CFontRenderState InvokeLTR__16CWordInstructionCFR16CFontRenderState: @@ -130,13 +130,13 @@ lbl_80305D14: /* 80305D78 00302CD8 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80305D7C 00302CDC 7C 08 03 A6 */ mtlr r0 /* 80305D80 00302CE0 38 21 00 30 */ addi r1, r1, 0x30 -/* 80305D84 00302CE4 4E 80 00 20 */ blr +/* 80305D84 00302CE4 4E 80 00 20 */ blr .global PageInvoke__16CWordInstructionCFR16CFontRenderStateP17CTextRenderBuffer PageInvoke__16CWordInstructionCFR16CFontRenderStateP17CTextRenderBuffer: /* 80305D88 00302CE8 38 00 00 00 */ li r0, 0 /* 80305D8C 00302CEC 98 04 01 08 */ stb r0, 0x108(r4) -/* 80305D90 00302CF0 4E 80 00 20 */ blr +/* 80305D90 00302CF0 4E 80 00 20 */ blr .global Invoke__16CWordInstructionCFR16CFontRenderStateP17CTextRenderBuffer Invoke__16CWordInstructionCFR16CFontRenderStateP17CTextRenderBuffer: diff --git a/asm/Kyoto/rstl/RstlExtras.s b/asm/Kyoto/rstl/RstlExtras.s index 4e204cfa..b58cfe98 100644 --- a/asm/Kyoto/rstl/RstlExtras.s +++ b/asm/Kyoto/rstl/RstlExtras.s @@ -11,7 +11,7 @@ lbl_804BFF30: .global lbl_805A94E8 lbl_805A94E8: .skip 0x8 - + .section .text, "ax" .global "TokenizeString__13CStringExtrasFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>PCci" @@ -176,7 +176,7 @@ lbl_8033E644: /* 8033E648 0033B5A8 80 01 00 54 */ lwz r0, 0x54(r1) /* 8033E64C 0033B5AC 7C 08 03 A6 */ mtlr r0 /* 8033E650 0033B5B0 38 21 00 50 */ addi r1, r1, 0x50 -/* 8033E654 0033B5B4 4E 80 00 20 */ blr +/* 8033E654 0033B5B4 4E 80 00 20 */ blr .global ReadString__13CStringExtrasFR12CInputStream ReadString__13CStringExtrasFR12CInputStream: @@ -232,7 +232,7 @@ lbl_8033E6E4: /* 8033E710 0033B670 83 81 02 20 */ lwz r28, 0x220(r1) /* 8033E714 0033B674 7C 08 03 A6 */ mtlr r0 /* 8033E718 0033B678 38 21 02 30 */ addi r1, r1, 0x230 -/* 8033E71C 0033B67C 4E 80 00 20 */ blr +/* 8033E71C 0033B67C 4E 80 00 20 */ blr .global "ConvertToUNICODE__13CStringExtrasFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" "ConvertToUNICODE__13CStringExtrasFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>": @@ -279,7 +279,7 @@ lbl_8033E78C: /* 8033E7B8 0033B718 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8033E7BC 0033B71C 7C 08 03 A6 */ mtlr r0 /* 8033E7C0 0033B720 38 21 00 30 */ addi r1, r1, 0x30 -/* 8033E7C4 0033B724 4E 80 00 20 */ blr +/* 8033E7C4 0033B724 4E 80 00 20 */ blr .global "ConvertToANSI__13CStringExtrasFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" "ConvertToANSI__13CStringExtrasFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>": @@ -335,7 +335,7 @@ lbl_8033E854: /* 8033E884 0033B7E4 83 81 00 30 */ lwz r28, 0x30(r1) /* 8033E888 0033B7E8 7C 08 03 A6 */ mtlr r0 /* 8033E88C 0033B7EC 38 21 00 40 */ addi r1, r1, 0x40 -/* 8033E890 0033B7F0 4E 80 00 20 */ blr +/* 8033E890 0033B7F0 4E 80 00 20 */ blr .global CreateFromInteger__13CStringExtrasFi CreateFromInteger__13CStringExtrasFi: @@ -422,19 +422,19 @@ lbl_8033E9A8: /* 8033E9B8 0033B918 83 81 00 30 */ lwz r28, 0x30(r1) /* 8033E9BC 0033B91C 7C 08 03 A6 */ mtlr r0 /* 8033E9C0 0033B920 38 21 00 40 */ addi r1, r1, 0x40 -/* 8033E9C4 0033B924 4E 80 00 20 */ blr +/* 8033E9C4 0033B924 4E 80 00 20 */ blr .global ConvertToUpperCase__13CStringExtrasFc ConvertToUpperCase__13CStringExtrasFc: /* 8033E9C8 0033B928 7C 60 07 74 */ extsb r0, r3 /* 8033E9CC 0033B92C 2C 00 00 61 */ cmpwi r0, 0x61 -/* 8033E9D0 0033B930 4D 80 00 20 */ bltlr +/* 8033E9D0 0033B930 4D 80 00 20 */ bltlr /* 8033E9D4 0033B934 2C 00 00 7A */ cmpwi r0, 0x7a -/* 8033E9D8 0033B938 4D 81 00 20 */ bgtlr +/* 8033E9D8 0033B938 4D 81 00 20 */ bgtlr /* 8033E9DC 0033B93C 38 03 FF E0 */ addi r0, r3, -32 /* 8033E9E0 0033B940 54 00 06 3E */ clrlwi r0, r0, 0x18 /* 8033E9E4 0033B944 7C 03 07 74 */ extsb r3, r0 -/* 8033E9E8 0033B948 4E 80 00 20 */ blr +/* 8033E9E8 0033B948 4E 80 00 20 */ blr .global "CompareCaseInsensitive__13CStringExtrasFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" "CompareCaseInsensitive__13CStringExtrasFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RCQ24rstl66basic_string,Q24rstl17rmemory_allocator>": @@ -504,7 +504,7 @@ lbl_8033EAC8: /* 8033EACC 0033BA2C 80 01 00 34 */ lwz r0, 0x34(r1) /* 8033EAD0 0033BA30 7C 08 03 A6 */ mtlr r0 /* 8033EAD4 0033BA34 38 21 00 30 */ addi r1, r1, 0x30 -/* 8033EAD8 0033BA38 4E 80 00 20 */ blr +/* 8033EAD8 0033BA38 4E 80 00 20 */ blr .global "IndexOfSubstring__13CStringExtrasFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" "IndexOfSubstring__13CStringExtrasFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RCQ24rstl66basic_string,Q24rstl17rmemory_allocator>": @@ -565,7 +565,7 @@ lbl_8033EB8C: /* 8033EB90 0033BAF0 80 01 00 34 */ lwz r0, 0x34(r1) /* 8033EB94 0033BAF4 7C 08 03 A6 */ mtlr r0 /* 8033EB98 0033BAF8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8033EB9C 0033BAFC 4E 80 00 20 */ blr +/* 8033EB9C 0033BAFC 4E 80 00 20 */ blr .global __sinit_RstlExtras_cpp __sinit_RstlExtras_cpp: @@ -606,5 +606,5 @@ lbl_8033EC10: /* 8033EC18 0033BB78 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8033EC1C 0033BB7C 7C 08 03 A6 */ mtlr r0 /* 8033EC20 0033BB80 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033EC24 0033BB84 4E 80 00 20 */ blr +/* 8033EC24 0033BB84 4E 80 00 20 */ blr diff --git a/asm/Kyoto/rstl/rstl_map.s b/asm/Kyoto/rstl/rstl_map.s index f52aba09..d48f6b5b 100644 --- a/asm/Kyoto/rstl/rstl_map.s +++ b/asm/Kyoto/rstl/rstl_map.s @@ -7,7 +7,7 @@ rbtree_traverse_forward__4rstlFPCvPv: /* 8033C5E0 00339540 28 04 00 00 */ cmplwi r4, 0 /* 8033C5E4 00339544 40 82 00 0C */ bne lbl_8033C5F0 /* 8033C5E8 00339548 80 63 00 00 */ lwz r3, 0(r3) -/* 8033C5EC 0033954C 4E 80 00 20 */ blr +/* 8033C5EC 0033954C 4E 80 00 20 */ blr lbl_8033C5F0: /* 8033C5F0 00339550 80 A4 00 04 */ lwz r5, 4(r4) /* 8033C5F4 00339554 28 05 00 00 */ cmplwi r5, 0 @@ -16,14 +16,14 @@ lbl_8033C5F0: /* 8033C600 00339560 28 00 00 00 */ cmplwi r0, 0 /* 8033C604 00339564 40 82 00 0C */ bne lbl_8033C610 /* 8033C608 00339568 38 60 00 00 */ li r3, 0 -/* 8033C60C 0033956C 4E 80 00 20 */ blr +/* 8033C60C 0033956C 4E 80 00 20 */ blr lbl_8033C610: /* 8033C610 00339570 28 05 00 00 */ cmplwi r5, 0 /* 8033C614 00339574 40 82 00 14 */ bne lbl_8033C628 /* 8033C618 00339578 80 64 00 08 */ lwz r3, 8(r4) /* 8033C61C 0033957C 80 03 00 00 */ lwz r0, 0(r3) /* 8033C620 00339580 7C 00 20 40 */ cmplw r0, r4 -/* 8033C624 00339584 4D 82 00 20 */ beqlr +/* 8033C624 00339584 4D 82 00 20 */ beqlr lbl_8033C628: /* 8033C628 00339588 28 05 00 00 */ cmplwi r5, 0 /* 8033C62C 0033958C 41 82 00 28 */ beq lbl_8033C654 @@ -35,7 +35,7 @@ lbl_8033C63C: /* 8033C63C 0033959C 80 03 00 00 */ lwz r0, 0(r3) /* 8033C640 003395A0 28 00 00 00 */ cmplwi r0, 0 /* 8033C644 003395A4 40 82 FF F4 */ bne lbl_8033C638 -/* 8033C648 003395A8 4E 80 00 20 */ blr +/* 8033C648 003395A8 4E 80 00 20 */ blr /* 8033C64C 003395AC 48 00 00 08 */ b lbl_8033C654 lbl_8033C650: /* 8033C650 003395B0 7C 64 1B 78 */ mr r4, r3 @@ -48,9 +48,9 @@ lbl_8033C654: /* 8033C668 003395C8 41 82 FF E8 */ beq lbl_8033C650 lbl_8033C66C: /* 8033C66C 003395CC 28 03 00 00 */ cmplwi r3, 0 -/* 8033C670 003395D0 4C 82 00 20 */ bnelr +/* 8033C670 003395D0 4C 82 00 20 */ bnelr /* 8033C674 003395D4 38 60 00 00 */ li r3, 0 -/* 8033C678 003395D8 4E 80 00 20 */ blr +/* 8033C678 003395D8 4E 80 00 20 */ blr .global rbtree_rebalance_for_erase__4rstlFPvPv rbtree_rebalance_for_erase__4rstlFPvPv: @@ -363,7 +363,7 @@ lbl_8033CA74: /* 8033CA88 003399E8 83 81 00 10 */ lwz r28, 0x10(r1) /* 8033CA8C 003399EC 7C 08 03 A6 */ mtlr r0 /* 8033CA90 003399F0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8033CA94 003399F4 4E 80 00 20 */ blr +/* 8033CA94 003399F4 4E 80 00 20 */ blr .global rbtree_rebalance__4rstlFPvPv rbtree_rebalance__4rstlFPvPv: @@ -467,7 +467,7 @@ lbl_8033CBE8: /* 8033CBFC 00339B5C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8033CC00 00339B60 7C 08 03 A6 */ mtlr r0 /* 8033CC04 00339B64 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033CC08 00339B68 4E 80 00 20 */ blr +/* 8033CC08 00339B68 4E 80 00 20 */ blr .global rbtree_rotate_right__4rstlFPvPv rbtree_rotate_right__4rstlFPvPv: @@ -499,7 +499,7 @@ lbl_8033CC50: /* 8033CC60 00339BC0 90 87 00 08 */ stw r4, 8(r7) lbl_8033CC64: /* 8033CC64 00339BC4 90 E4 00 00 */ stw r7, 0(r4) -/* 8033CC68 00339BC8 4E 80 00 20 */ blr +/* 8033CC68 00339BC8 4E 80 00 20 */ blr .global rbtree_rotate_left__4rstlFPvPv rbtree_rotate_left__4rstlFPvPv: diff --git a/asm/Kyoto/rstl/rstl_strings.s b/asm/Kyoto/rstl/rstl_strings.s index 54c6e460..4c1c97af 100644 --- a/asm/Kyoto/rstl/rstl_strings.s +++ b/asm/Kyoto/rstl/rstl_strings.s @@ -49,7 +49,7 @@ lbl_8033CD04: /* 8033CD04 00339C64 80 01 00 14 */ lwz r0, 0x14(r1) /* 8033CD08 00339C68 7C 08 03 A6 */ mtlr r0 /* 8033CD0C 00339C6C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033CD10 00339C70 4E 80 00 20 */ blr +/* 8033CD10 00339C70 4E 80 00 20 */ blr .global "internal_allocate__Q24rstl83basic_string,Q24rstl17rmemory_allocator>Fi" "internal_allocate__Q24rstl83basic_string,Q24rstl17rmemory_allocator>Fi": @@ -85,7 +85,7 @@ lbl_8033CD58: /* 8033CD80 00339CE0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8033CD84 00339CE4 7C 08 03 A6 */ mtlr r0 /* 8033CD88 00339CE8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033CD8C 00339CEC 4E 80 00 20 */ blr +/* 8033CD8C 00339CEC 4E 80 00 20 */ blr .global "__ct__Q24rstl83basic_string,Q24rstl17rmemory_allocator>FPCciRCQ24rstl17rmemory_allocator" "__ct__Q24rstl83basic_string,Q24rstl17rmemory_allocator>FPCciRCQ24rstl17rmemory_allocator": @@ -225,7 +225,7 @@ lbl_8033CF58: /* 8033CF64 00339EC4 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8033CF68 00339EC8 7C 08 03 A6 */ mtlr r0 /* 8033CF6C 00339ECC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8033CF70 00339ED0 4E 80 00 20 */ blr +/* 8033CF70 00339ED0 4E 80 00 20 */ blr .global "internal_prepare_to_write__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fib" "internal_prepare_to_write__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fib": @@ -354,7 +354,7 @@ lbl_8033D114: /* 8033D124 0033A084 83 81 00 10 */ lwz r28, 0x10(r1) /* 8033D128 0033A088 7C 08 03 A6 */ mtlr r0 /* 8033D12C 0033A08C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8033D130 0033A090 4E 80 00 20 */ blr +/* 8033D130 0033A090 4E 80 00 20 */ blr .global "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv": @@ -376,7 +376,7 @@ lbl_8033D16C: /* 8033D16C 0033A0CC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8033D170 0033A0D0 7C 08 03 A6 */ mtlr r0 /* 8033D174 0033A0D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033D178 0033A0D8 4E 80 00 20 */ blr +/* 8033D178 0033A0D8 4E 80 00 20 */ blr .global "internal_allocate__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fi" "internal_allocate__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fi": @@ -413,7 +413,7 @@ lbl_8033D1C4: /* 8033D1EC 0033A14C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8033D1F0 0033A150 7C 08 03 A6 */ mtlr r0 /* 8033D1F4 0033A154 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033D1F8 0033A158 4E 80 00 20 */ blr +/* 8033D1F8 0033A158 4E 80 00 20 */ blr .global sub_8033d1fc sub_8033d1fc: @@ -508,7 +508,7 @@ lbl_8033D314: /* 8033D33C 0033A29C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8033D340 0033A2A0 7C 08 03 A6 */ mtlr r0 /* 8033D344 0033A2A4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8033D348 0033A2A8 4E 80 00 20 */ blr +/* 8033D348 0033A2A8 4E 80 00 20 */ blr .global sub_8033d34c sub_8033d34c: @@ -549,7 +549,7 @@ lbl_8033D3C0: /* 8033D3C8 0033A328 83 C1 00 08 */ lwz r30, 8(r1) /* 8033D3CC 0033A32C 7C 08 03 A6 */ mtlr r0 /* 8033D3D0 0033A330 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033D3D4 0033A334 4E 80 00 20 */ blr +/* 8033D3D4 0033A334 4E 80 00 20 */ blr .global "append__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fiw" "append__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fiw": @@ -623,7 +623,7 @@ lbl_8033D4A4: /* 8033D4D4 0033A434 80 01 00 24 */ lwz r0, 0x24(r1) /* 8033D4D8 0033A438 7C 08 03 A6 */ mtlr r0 /* 8033D4DC 0033A43C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8033D4E0 0033A440 4E 80 00 20 */ blr +/* 8033D4E0 0033A440 4E 80 00 20 */ blr .global sub_8033d4e4 sub_8033d4e4: @@ -724,7 +724,7 @@ lbl_8033D60C: /* 8033D63C 0033A59C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8033D640 0033A5A0 7C 08 03 A6 */ mtlr r0 /* 8033D644 0033A5A4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8033D648 0033A5A8 4E 80 00 20 */ blr +/* 8033D648 0033A5A8 4E 80 00 20 */ blr .global "append__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" "append__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>": @@ -810,7 +810,7 @@ lbl_8033D748: /* 8033D778 0033A6D8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8033D77C 0033A6DC 7C 08 03 A6 */ mtlr r0 /* 8033D780 0033A6E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033D784 0033A6E4 4E 80 00 20 */ blr +/* 8033D784 0033A6E4 4E 80 00 20 */ blr .global "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>": @@ -822,11 +822,11 @@ lbl_8033D748: /* 8033D79C 0033A6FC 90 03 00 08 */ stw r0, 8(r3) /* 8033D7A0 0033A700 80 A3 00 04 */ lwz r5, 4(r3) /* 8033D7A4 0033A704 28 05 00 00 */ cmplwi r5, 0 -/* 8033D7A8 0033A708 4D 82 00 20 */ beqlr +/* 8033D7A8 0033A708 4D 82 00 20 */ beqlr /* 8033D7AC 0033A70C 80 85 00 04 */ lwz r4, 4(r5) /* 8033D7B0 0033A710 38 04 00 01 */ addi r0, r4, 1 /* 8033D7B4 0033A714 90 05 00 04 */ stw r0, 4(r5) -/* 8033D7B8 0033A718 4E 80 00 20 */ blr +/* 8033D7B8 0033A718 4E 80 00 20 */ blr .global "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FPCwiRCQ24rstl17rmemory_allocator" "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FPCwiRCQ24rstl17rmemory_allocator": @@ -932,7 +932,7 @@ lbl_8033D914: /* 8033D920 0033A880 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8033D924 0033A884 7C 08 03 A6 */ mtlr r0 /* 8033D928 0033A888 38 21 00 20 */ addi r1, r1, 0x20 -/* 8033D92C 0033A88C 4E 80 00 20 */ blr +/* 8033D92C 0033A88C 4E 80 00 20 */ blr .global "internal_prepare_to_write__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fib" "internal_prepare_to_write__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fib": @@ -1057,7 +1057,7 @@ lbl_8033DAC0: /* 8033DAD0 0033AA30 83 81 00 10 */ lwz r28, 0x10(r1) /* 8033DAD4 0033AA34 7C 08 03 A6 */ mtlr r0 /* 8033DAD8 0033AA38 38 21 00 20 */ addi r1, r1, 0x20 -/* 8033DADC 0033AA3C 4E 80 00 20 */ blr +/* 8033DADC 0033AA3C 4E 80 00 20 */ blr .global "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv": @@ -1079,7 +1079,7 @@ lbl_8033DB18: /* 8033DB18 0033AA78 80 01 00 14 */ lwz r0, 0x14(r1) /* 8033DB1C 0033AA7C 7C 08 03 A6 */ mtlr r0 /* 8033DB20 0033AA80 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033DB24 0033AA84 4E 80 00 20 */ blr +/* 8033DB24 0033AA84 4E 80 00 20 */ blr .global "internal_allocate__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fi" "internal_allocate__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fi": @@ -1115,7 +1115,7 @@ lbl_8033DB6C: /* 8033DB94 0033AAF4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8033DB98 0033AAF8 7C 08 03 A6 */ mtlr r0 /* 8033DB9C 0033AAFC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033DBA0 0033AB00 4E 80 00 20 */ blr +/* 8033DBA0 0033AB00 4E 80 00 20 */ blr .global "range_iterator__Q24rstl66basic_string,Q24rstl17rmemory_allocator>CFii" "range_iterator__Q24rstl66basic_string,Q24rstl17rmemory_allocator>CFii": @@ -1172,7 +1172,7 @@ lbl_8033DC38: /* 8033DC60 0033ABC0 83 81 00 30 */ lwz r28, 0x30(r1) /* 8033DC64 0033ABC4 7C 08 03 A6 */ mtlr r0 /* 8033DC68 0033ABC8 38 21 00 40 */ addi r1, r1, 0x40 -/* 8033DC6C 0033ABCC 4E 80 00 20 */ blr +/* 8033DC6C 0033ABCC 4E 80 00 20 */ blr .global "position_iterator__Q24rstl66basic_string,Q24rstl17rmemory_allocator>CFi" "position_iterator__Q24rstl66basic_string,Q24rstl17rmemory_allocator>CFi": @@ -1195,7 +1195,7 @@ lbl_8033DC98: /* 8033DCA8 0033AC08 90 A3 00 04 */ stw r5, 4(r3) lbl_8033DCAC: /* 8033DCAC 0033AC0C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033DCB0 0033AC10 4E 80 00 20 */ blr +/* 8033DCB0 0033AC10 4E 80 00 20 */ blr .global "PutTo__Q24rstl66basic_string,Q24rstl17rmemory_allocator>CFR13COutputStream" "PutTo__Q24rstl66basic_string,Q24rstl17rmemory_allocator>CFR13COutputStream": @@ -1243,7 +1243,7 @@ lbl_8033DD2C: /* 8033DD4C 0033ACAC 83 81 00 10 */ lwz r28, 0x10(r1) /* 8033DD50 0033ACB0 7C 08 03 A6 */ mtlr r0 /* 8033DD54 0033ACB4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8033DD58 0033ACB8 4E 80 00 20 */ blr +/* 8033DD58 0033ACB8 4E 80 00 20 */ blr .global "assign__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" "assign__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>": @@ -1284,7 +1284,7 @@ lbl_8033DDD0: /* 8033DDD8 0033AD38 83 C1 00 08 */ lwz r30, 8(r1) /* 8033DDDC 0033AD3C 7C 08 03 A6 */ mtlr r0 /* 8033DDE0 0033AD40 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033DDE4 0033AD44 4E 80 00 20 */ blr +/* 8033DDE4 0033AD44 4E 80 00 20 */ blr .global "append__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fic" "append__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fic": @@ -1354,7 +1354,7 @@ lbl_8033DEA8: /* 8033DED4 0033AE34 80 01 00 24 */ lwz r0, 0x24(r1) /* 8033DED8 0033AE38 7C 08 03 A6 */ mtlr r0 /* 8033DEDC 0033AE3C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8033DEE0 0033AE40 4E 80 00 20 */ blr +/* 8033DEE0 0033AE40 4E 80 00 20 */ blr .global "append__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FPCci" "append__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FPCci": @@ -1450,7 +1450,7 @@ lbl_8033DFFC: /* 8033E028 0033AF88 80 01 00 24 */ lwz r0, 0x24(r1) /* 8033E02C 0033AF8C 7C 08 03 A6 */ mtlr r0 /* 8033E030 0033AF90 38 21 00 20 */ addi r1, r1, 0x20 -/* 8033E034 0033AF94 4E 80 00 20 */ blr +/* 8033E034 0033AF94 4E 80 00 20 */ blr .global "append__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" "append__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>": @@ -1531,7 +1531,7 @@ lbl_8033E124: /* 8033E150 0033B0B0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8033E154 0033B0B4 7C 08 03 A6 */ mtlr r0 /* 8033E158 0033B0B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033E15C 0033B0BC 4E 80 00 20 */ blr +/* 8033E15C 0033B0BC 4E 80 00 20 */ blr .global "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>": @@ -1543,11 +1543,11 @@ lbl_8033E124: /* 8033E174 0033B0D4 90 03 00 08 */ stw r0, 8(r3) /* 8033E178 0033B0D8 80 A3 00 04 */ lwz r5, 4(r3) /* 8033E17C 0033B0DC 28 05 00 00 */ cmplwi r5, 0 -/* 8033E180 0033B0E0 4D 82 00 20 */ beqlr +/* 8033E180 0033B0E0 4D 82 00 20 */ beqlr /* 8033E184 0033B0E4 80 85 00 04 */ lwz r4, 4(r5) /* 8033E188 0033B0E8 38 04 00 01 */ addi r0, r4, 1 /* 8033E18C 0033B0EC 90 05 00 04 */ stw r0, 4(r5) -/* 8033E190 0033B0F0 4E 80 00 20 */ blr +/* 8033E190 0033B0F0 4E 80 00 20 */ blr .global "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FPCciRCQ24rstl17rmemory_allocator" "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FPCciRCQ24rstl17rmemory_allocator": @@ -1649,7 +1649,7 @@ lbl_8033E2DC: /* 8033E2E8 0033B248 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8033E2EC 0033B24C 7C 08 03 A6 */ mtlr r0 /* 8033E2F0 0033B250 38 21 00 20 */ addi r1, r1, 0x20 -/* 8033E2F4 0033B254 4E 80 00 20 */ blr +/* 8033E2F4 0033B254 4E 80 00 20 */ blr .global "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl17rmemory_allocator" "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl17rmemory_allocator": @@ -1705,7 +1705,7 @@ lbl_8033E3A4: /* 8033E3AC 0033B30C 80 01 04 34 */ lwz r0, 0x434(r1) /* 8033E3B0 0033B310 7C 08 03 A6 */ mtlr r0 /* 8033E3B4 0033B314 38 21 04 30 */ addi r1, r1, 0x430 -/* 8033E3B8 0033B318 4E 80 00 20 */ blr +/* 8033E3B8 0033B318 4E 80 00 20 */ blr .global __sinit_rstl_strings_cpp __sinit_rstl_strings_cpp: @@ -1735,7 +1735,7 @@ lbl_8033E3F4: lbl_8033E410: /* 8033E410 0033B370 88 0D A9 23 */ lbz r0, lbl_805A94E3@sda21(r13) /* 8033E414 0033B374 7C 00 07 75 */ extsb. r0, r0 -/* 8033E418 0033B378 4C 82 00 20 */ bnelr +/* 8033E418 0033B378 4C 82 00 20 */ bnelr /* 8033E41C 0033B37C 38 60 00 00 */ li r3, 0 /* 8033E420 0033B380 38 00 00 01 */ li r0, 1 /* 8033E424 0033B384 B0 6D A9 1E */ sth r3, lbl_805A94DE@sda21(r13) diff --git a/asm/Kyoto/zlib/adler32.s b/asm/Kyoto/zlib/adler32.s index 5928b0dc..5fe75a49 100644 --- a/asm/Kyoto/zlib/adler32.s +++ b/asm/Kyoto/zlib/adler32.s @@ -109,4 +109,4 @@ lbl_80341288: lbl_80341298: /* 80341298 0033E1F8 BB 61 00 0C */ lmw r27, 0xc(r1) /* 8034129C 0033E1FC 38 21 00 20 */ addi r1, r1, 0x20 -/* 803412A0 0033E200 4E 80 00 20 */ blr +/* 803412A0 0033E200 4E 80 00 20 */ blr diff --git a/asm/Kyoto/zlib/infblock.s b/asm/Kyoto/zlib/infblock.s index f9dc1cb1..a06a312a 100644 --- a/asm/Kyoto/zlib/infblock.s +++ b/asm/Kyoto/zlib/infblock.s @@ -37,7 +37,7 @@ lbl_803412D4: /* 803412D8 0033E238 80 7F 00 28 */ lwz r3, 0x28(r31) /* 803412DC 0033E23C 80 9E 00 0C */ lwz r4, 0xc(r30) /* 803412E0 0033E240 7D 89 03 A6 */ mtctr r12 -/* 803412E4 0033E244 4E 80 04 21 */ bctrl +/* 803412E4 0033E244 4E 80 04 21 */ bctrl lbl_803412E8: /* 803412E8 0033E248 80 1E 00 00 */ lwz r0, 0(r30) /* 803412EC 0033E24C 2C 00 00 06 */ cmpwi r0, 6 @@ -60,7 +60,7 @@ lbl_80341300: /* 8034132C 0033E28C 38 80 00 00 */ li r4, 0 /* 80341330 0033E290 38 A0 00 00 */ li r5, 0 /* 80341334 0033E294 7D 89 03 A6 */ mtctr r12 -/* 80341338 0033E298 4E 80 04 21 */ bctrl +/* 80341338 0033E298 4E 80 04 21 */ bctrl /* 8034133C 0033E29C 90 7E 00 3C */ stw r3, 0x3c(r30) /* 80341340 0033E2A0 90 7F 00 30 */ stw r3, 0x30(r31) lbl_80341344: @@ -68,24 +68,24 @@ lbl_80341344: /* 80341348 0033E2A8 80 7F 00 28 */ lwz r3, 0x28(r31) /* 8034134C 0033E2AC 80 9E 00 28 */ lwz r4, 0x28(r30) /* 80341350 0033E2B0 7D 89 03 A6 */ mtctr r12 -/* 80341354 0033E2B4 4E 80 04 21 */ bctrl +/* 80341354 0033E2B4 4E 80 04 21 */ bctrl /* 80341358 0033E2B8 81 9F 00 24 */ lwz r12, 0x24(r31) /* 8034135C 0033E2BC 80 7F 00 28 */ lwz r3, 0x28(r31) /* 80341360 0033E2C0 80 9E 00 24 */ lwz r4, 0x24(r30) /* 80341364 0033E2C4 7D 89 03 A6 */ mtctr r12 -/* 80341368 0033E2C8 4E 80 04 21 */ bctrl +/* 80341368 0033E2C8 4E 80 04 21 */ bctrl /* 8034136C 0033E2CC 81 9F 00 24 */ lwz r12, 0x24(r31) /* 80341370 0033E2D0 7F C4 F3 78 */ mr r4, r30 /* 80341374 0033E2D4 80 7F 00 28 */ lwz r3, 0x28(r31) /* 80341378 0033E2D8 7D 89 03 A6 */ mtctr r12 -/* 8034137C 0033E2DC 4E 80 04 21 */ bctrl +/* 8034137C 0033E2DC 4E 80 04 21 */ bctrl /* 80341380 0033E2E0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80341384 0033E2E4 38 60 00 00 */ li r3, 0 /* 80341388 0033E2E8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8034138C 0033E2EC 83 C1 00 08 */ lwz r30, 8(r1) /* 80341390 0033E2F0 7C 08 03 A6 */ mtlr r0 /* 80341394 0033E2F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80341398 0033E2F8 4E 80 00 20 */ blr +/* 80341398 0033E2F8 4E 80 00 20 */ blr .global inflate_blocks inflate_blocks: @@ -121,7 +121,7 @@ lbl_803413F8: /* 80341404 0033E364 54 00 10 3A */ slwi r0, r0, 2 /* 80341408 0033E368 7C 1D 00 2E */ lwzx r0, r29, r0 /* 8034140C 0033E36C 7C 09 03 A6 */ mtctr r0 -/* 80341410 0033E370 4E 80 04 20 */ bctr +/* 80341410 0033E370 4E 80 04 20 */ bctr .global lbl_80341414 lbl_80341414: /* 80341414 0033E374 20 1B 00 0A */ subfic r0, r27, 0xa @@ -525,7 +525,7 @@ lbl_803419A0: /* 803419AC 0033E90C 38 A0 00 04 */ li r5, 4 /* 803419B0 0033E910 7D 89 03 A6 */ mtctr r12 /* 803419B4 0033E914 38 84 01 02 */ addi r4, r4, 0x102 -/* 803419B8 0033E918 4E 80 04 21 */ bctrl +/* 803419B8 0033E918 4E 80 04 21 */ bctrl /* 803419BC 0033E91C 28 03 00 00 */ cmplwi r3, 0 /* 803419C0 0033E920 90 7E 00 0C */ stw r3, 0xc(r30) /* 803419C4 0033E924 40 82 00 40 */ bne lbl_80341A04 @@ -641,7 +641,7 @@ lbl_80341B18: /* 80341B50 0033EAB0 80 7F 00 28 */ lwz r3, 0x28(r31) /* 80341B54 0033EAB4 80 9E 00 0C */ lwz r4, 0xc(r30) /* 80341B58 0033EAB8 7D 89 03 A6 */ mtctr r12 -/* 80341B5C 0033EABC 4E 80 04 21 */ bctrl +/* 80341B5C 0033EABC 4E 80 04 21 */ bctrl /* 80341B60 0033EAC0 2C 17 FF FD */ cmpwi r23, -3 /* 80341B64 0033EAC4 40 82 00 0C */ bne lbl_80341B70 /* 80341B68 0033EAC8 38 00 00 09 */ li r0, 9 @@ -804,7 +804,7 @@ lbl_80341D94: /* 80341D98 0033ECF8 80 7F 00 28 */ lwz r3, 0x28(r31) /* 80341D9C 0033ECFC 80 9E 00 0C */ lwz r4, 0xc(r30) /* 80341DA0 0033ED00 7D 89 03 A6 */ mtctr r12 -/* 80341DA4 0033ED04 4E 80 04 21 */ bctrl +/* 80341DA4 0033ED04 4E 80 04 21 */ bctrl /* 80341DA8 0033ED08 38 00 00 09 */ li r0, 9 /* 80341DAC 0033ED0C 3C 60 80 3D */ lis r3, lbl_803D7AF4@ha /* 80341DB0 0033ED10 38 63 7A F4 */ addi r3, r3, lbl_803D7AF4@l @@ -879,7 +879,7 @@ lbl_80341E3C: /* 80341EB0 0033EE10 80 7F 00 28 */ lwz r3, 0x28(r31) /* 80341EB4 0033EE14 80 9E 00 0C */ lwz r4, 0xc(r30) /* 80341EB8 0033EE18 7D 89 03 A6 */ mtctr r12 -/* 80341EBC 0033EE1C 4E 80 04 21 */ bctrl +/* 80341EBC 0033EE1C 4E 80 04 21 */ bctrl /* 80341EC0 0033EE20 28 17 00 00 */ cmplwi r23, 0 /* 80341EC4 0033EE24 41 82 00 54 */ beq lbl_80341F18 /* 80341EC8 0033EE28 3C 17 00 01 */ addis r0, r23, 1 @@ -1068,7 +1068,7 @@ lbl_80342158: /* 8034215C 0033F0BC 80 01 00 64 */ lwz r0, 0x64(r1) /* 80342160 0033F0C0 7C 08 03 A6 */ mtlr r0 /* 80342164 0033F0C4 38 21 00 60 */ addi r1, r1, 0x60 -/* 80342168 0033F0C8 4E 80 00 20 */ blr +/* 80342168 0033F0C8 4E 80 00 20 */ blr .global inflate_blocks_new inflate_blocks_new: @@ -1087,7 +1087,7 @@ inflate_blocks_new: /* 8034219C 0033F0FC 81 83 00 20 */ lwz r12, 0x20(r3) /* 803421A0 0033F100 80 63 00 28 */ lwz r3, 0x28(r3) /* 803421A4 0033F104 7D 89 03 A6 */ mtctr r12 -/* 803421A8 0033F108 4E 80 04 21 */ bctrl +/* 803421A8 0033F108 4E 80 04 21 */ bctrl /* 803421AC 0033F10C 7C 7F 1B 79 */ or. r31, r3, r3 /* 803421B0 0033F110 40 82 00 08 */ bne lbl_803421B8 /* 803421B4 0033F114 48 00 01 38 */ b lbl_803422EC @@ -1097,7 +1097,7 @@ lbl_803421B8: /* 803421C0 0033F120 80 7C 00 28 */ lwz r3, 0x28(r28) /* 803421C4 0033F124 38 A0 05 A0 */ li r5, 0x5a0 /* 803421C8 0033F128 7D 89 03 A6 */ mtctr r12 -/* 803421CC 0033F12C 4E 80 04 21 */ bctrl +/* 803421CC 0033F12C 4E 80 04 21 */ bctrl /* 803421D0 0033F130 28 03 00 00 */ cmplwi r3, 0 /* 803421D4 0033F134 90 7F 00 24 */ stw r3, 0x24(r31) /* 803421D8 0033F138 40 82 00 20 */ bne lbl_803421F8 @@ -1105,7 +1105,7 @@ lbl_803421B8: /* 803421E0 0033F140 7F E4 FB 78 */ mr r4, r31 /* 803421E4 0033F144 80 7C 00 28 */ lwz r3, 0x28(r28) /* 803421E8 0033F148 7D 89 03 A6 */ mtctr r12 -/* 803421EC 0033F14C 4E 80 04 21 */ bctrl +/* 803421EC 0033F14C 4E 80 04 21 */ bctrl /* 803421F0 0033F150 38 60 00 00 */ li r3, 0 /* 803421F4 0033F154 48 00 00 F8 */ b lbl_803422EC lbl_803421F8: @@ -1114,7 +1114,7 @@ lbl_803421F8: /* 80342200 0033F160 80 7C 00 28 */ lwz r3, 0x28(r28) /* 80342204 0033F164 38 80 00 01 */ li r4, 1 /* 80342208 0033F168 7D 89 03 A6 */ mtctr r12 -/* 8034220C 0033F16C 4E 80 04 21 */ bctrl +/* 8034220C 0033F16C 4E 80 04 21 */ bctrl /* 80342210 0033F170 28 03 00 00 */ cmplwi r3, 0 /* 80342214 0033F174 90 7F 00 28 */ stw r3, 0x28(r31) /* 80342218 0033F178 40 82 00 34 */ bne lbl_8034224C @@ -1122,12 +1122,12 @@ lbl_803421F8: /* 80342220 0033F180 80 7C 00 28 */ lwz r3, 0x28(r28) /* 80342224 0033F184 80 9F 00 24 */ lwz r4, 0x24(r31) /* 80342228 0033F188 7D 89 03 A6 */ mtctr r12 -/* 8034222C 0033F18C 4E 80 04 21 */ bctrl +/* 8034222C 0033F18C 4E 80 04 21 */ bctrl /* 80342230 0033F190 81 9C 00 24 */ lwz r12, 0x24(r28) /* 80342234 0033F194 7F E4 FB 78 */ mr r4, r31 /* 80342238 0033F198 80 7C 00 28 */ lwz r3, 0x28(r28) /* 8034223C 0033F19C 7D 89 03 A6 */ mtctr r12 -/* 80342240 0033F1A0 4E 80 04 21 */ bctrl +/* 80342240 0033F1A0 4E 80 04 21 */ bctrl /* 80342244 0033F1A4 38 60 00 00 */ li r3, 0 /* 80342248 0033F1A8 48 00 00 A4 */ b lbl_803422EC lbl_8034224C: @@ -1147,7 +1147,7 @@ lbl_80342278: /* 8034227C 0033F1DC 80 7C 00 28 */ lwz r3, 0x28(r28) /* 80342280 0033F1E0 80 9F 00 0C */ lwz r4, 0xc(r31) /* 80342284 0033F1E4 7D 89 03 A6 */ mtctr r12 -/* 80342288 0033F1E8 4E 80 04 21 */ bctrl +/* 80342288 0033F1E8 4E 80 04 21 */ bctrl lbl_8034228C: /* 8034228C 0033F1EC 80 1F 00 00 */ lwz r0, 0(r31) /* 80342290 0033F1F0 2C 00 00 06 */ cmpwi r0, 6 @@ -1170,7 +1170,7 @@ lbl_803422A4: /* 803422D0 0033F230 38 80 00 00 */ li r4, 0 /* 803422D4 0033F234 38 A0 00 00 */ li r5, 0 /* 803422D8 0033F238 7D 89 03 A6 */ mtctr r12 -/* 803422DC 0033F23C 4E 80 04 21 */ bctrl +/* 803422DC 0033F23C 4E 80 04 21 */ bctrl /* 803422E0 0033F240 90 7F 00 3C */ stw r3, 0x3c(r31) /* 803422E4 0033F244 90 7C 00 30 */ stw r3, 0x30(r28) lbl_803422E8: @@ -1183,7 +1183,7 @@ lbl_803422EC: /* 803422FC 0033F25C 83 81 00 10 */ lwz r28, 0x10(r1) /* 80342300 0033F260 7C 08 03 A6 */ mtlr r0 /* 80342304 0033F264 38 21 00 20 */ addi r1, r1, 0x20 -/* 80342308 0033F268 4E 80 00 20 */ blr +/* 80342308 0033F268 4E 80 00 20 */ blr .global inflate_blocks_reset inflate_blocks_reset: @@ -1209,7 +1209,7 @@ lbl_8034234C: /* 80342350 0033F2B0 80 7F 00 28 */ lwz r3, 0x28(r31) /* 80342354 0033F2B4 80 9E 00 0C */ lwz r4, 0xc(r30) /* 80342358 0033F2B8 7D 89 03 A6 */ mtctr r12 -/* 8034235C 0033F2BC 4E 80 04 21 */ bctrl +/* 8034235C 0033F2BC 4E 80 04 21 */ bctrl lbl_80342360: /* 80342360 0033F2C0 80 1E 00 00 */ lwz r0, 0(r30) /* 80342364 0033F2C4 2C 00 00 06 */ cmpwi r0, 6 @@ -1232,7 +1232,7 @@ lbl_80342378: /* 803423A4 0033F304 38 80 00 00 */ li r4, 0 /* 803423A8 0033F308 38 A0 00 00 */ li r5, 0 /* 803423AC 0033F30C 7D 89 03 A6 */ mtctr r12 -/* 803423B0 0033F310 4E 80 04 21 */ bctrl +/* 803423B0 0033F310 4E 80 04 21 */ bctrl /* 803423B4 0033F314 90 7E 00 3C */ stw r3, 0x3c(r30) /* 803423B8 0033F318 90 7F 00 30 */ stw r3, 0x30(r31) lbl_803423BC: diff --git a/asm/Kyoto/zlib/infcodes.s b/asm/Kyoto/zlib/infcodes.s index 7096e65c..aba944c9 100644 --- a/asm/Kyoto/zlib/infcodes.s +++ b/asm/Kyoto/zlib/infcodes.s @@ -28,11 +28,11 @@ inflate_codes_free: /* 803423E8 0033F348 7C 64 1B 78 */ mr r4, r3 /* 803423EC 0033F34C 80 65 00 28 */ lwz r3, 0x28(r5) /* 803423F0 0033F350 7D 89 03 A6 */ mtctr r12 -/* 803423F4 0033F354 4E 80 04 21 */ bctrl +/* 803423F4 0033F354 4E 80 04 21 */ bctrl /* 803423F8 0033F358 80 01 00 14 */ lwz r0, 0x14(r1) /* 803423FC 0033F35C 7C 08 03 A6 */ mtlr r0 /* 80342400 0033F360 38 21 00 10 */ addi r1, r1, 0x10 -/* 80342404 0033F364 4E 80 00 20 */ blr +/* 80342404 0033F364 4E 80 00 20 */ blr .global inflate_codes inflate_codes: @@ -68,7 +68,7 @@ lbl_80342464: /* 80342470 0033F3D0 54 00 10 3A */ slwi r0, r0, 2 /* 80342474 0033F3D4 7C 1F 00 2E */ lwzx r0, r31, r0 /* 80342478 0033F3D8 7C 09 03 A6 */ mtctr r0 -/* 8034247C 0033F3DC 4E 80 04 20 */ bctr +/* 8034247C 0033F3DC 4E 80 04 20 */ bctr .global lbl_80342480 lbl_80342480: /* 80342480 0033F3E0 28 03 01 02 */ cmplwi r3, 0x102 @@ -697,7 +697,7 @@ lbl_80342D2C: /* 80342D30 0033FC90 80 01 00 34 */ lwz r0, 0x34(r1) /* 80342D34 0033FC94 7C 08 03 A6 */ mtlr r0 /* 80342D38 0033FC98 38 21 00 30 */ addi r1, r1, 0x30 -/* 80342D3C 0033FC9C 4E 80 00 20 */ blr +/* 80342D3C 0033FC9C 4E 80 00 20 */ blr .global inflate_codes_new inflate_codes_new: @@ -717,7 +717,7 @@ inflate_codes_new: /* 80342D74 0033FCD4 81 87 00 20 */ lwz r12, 0x20(r7) /* 80342D78 0033FCD8 80 67 00 28 */ lwz r3, 0x28(r7) /* 80342D7C 0033FCDC 7D 89 03 A6 */ mtctr r12 -/* 80342D80 0033FCE0 4E 80 04 21 */ bctrl +/* 80342D80 0033FCE0 4E 80 04 21 */ bctrl /* 80342D84 0033FCE4 28 03 00 00 */ cmplwi r3, 0 /* 80342D88 0033FCE8 41 82 00 1C */ beq lbl_80342DA4 /* 80342D8C 0033FCEC 38 00 00 00 */ li r0, 0 diff --git a/asm/Kyoto/zlib/inffast.s b/asm/Kyoto/zlib/inffast.s index a2fc1f32..672ceb4a 100644 --- a/asm/Kyoto/zlib/inffast.s +++ b/asm/Kyoto/zlib/inffast.s @@ -391,4 +391,4 @@ lbl_80343314: lbl_80343350: /* 80343350 003402B0 BB 01 00 10 */ lmw r24, 0x10(r1) /* 80343354 003402B4 38 21 00 30 */ addi r1, r1, 0x30 -/* 80343358 003402B8 4E 80 00 20 */ blr +/* 80343358 003402B8 4E 80 00 20 */ blr diff --git a/asm/Kyoto/zlib/inflate.s b/asm/Kyoto/zlib/inflate.s index a2f745d1..89020700 100644 --- a/asm/Kyoto/zlib/inflate.s +++ b/asm/Kyoto/zlib/inflate.s @@ -60,7 +60,7 @@ lbl_803433C4: /* 803433D4 00340334 54 00 10 3A */ slwi r0, r0, 2 /* 803433D8 00340338 7C 1F 00 2E */ lwzx r0, r31, r0 /* 803433DC 0034033C 7C 09 03 A6 */ mtctr r0 -/* 803433E0 00340340 4E 80 04 20 */ bctr +/* 803433E0 00340340 4E 80 04 20 */ bctr .global lbl_803433E4 lbl_803433E4: /* 803433E4 00340344 80 7C 00 04 */ lwz r3, 4(r28) @@ -460,7 +460,7 @@ lbl_80343940: /* 80343950 003408B0 83 81 00 10 */ lwz r28, 0x10(r1) /* 80343954 003408B4 7C 08 03 A6 */ mtlr r0 /* 80343958 003408B8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8034395C 003408BC 4E 80 00 20 */ blr +/* 8034395C 003408BC 4E 80 00 20 */ blr .global inflateInit2_ inflateInit2_: @@ -512,7 +512,7 @@ lbl_803439F8: /* 80343A00 00340960 80 7F 00 28 */ lwz r3, 0x28(r31) /* 80343A04 00340964 38 A0 00 18 */ li r5, 0x18 /* 80343A08 00340968 7D 89 03 A6 */ mtctr r12 -/* 80343A0C 0034096C 4E 80 04 21 */ bctrl +/* 80343A0C 0034096C 4E 80 04 21 */ bctrl /* 80343A10 00340970 28 03 00 00 */ cmplwi r3, 0 /* 80343A14 00340974 90 7F 00 1C */ stw r3, 0x1c(r31) /* 80343A18 00340978 40 82 00 0C */ bne lbl_80343A24 @@ -561,7 +561,7 @@ lbl_80343AB4: /* 80343AB8 00340A18 80 7F 00 28 */ lwz r3, 0x28(r31) /* 80343ABC 00340A1C 80 9F 00 1C */ lwz r4, 0x1c(r31) /* 80343AC0 00340A20 7D 89 03 A6 */ mtctr r12 -/* 80343AC4 00340A24 4E 80 04 21 */ bctrl +/* 80343AC4 00340A24 4E 80 04 21 */ bctrl /* 80343AC8 00340A28 38 00 00 00 */ li r0, 0 /* 80343ACC 00340A2C 90 1F 00 1C */ stw r0, 0x1c(r31) lbl_80343AD0: @@ -596,7 +596,7 @@ lbl_80343B2C: /* 80343B30 00340A90 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80343B34 00340A94 7C 08 03 A6 */ mtlr r0 /* 80343B38 00340A98 38 21 00 10 */ addi r1, r1, 0x10 -/* 80343B3C 00340A9C 4E 80 00 20 */ blr +/* 80343B3C 00340A9C 4E 80 00 20 */ blr .global inflateEnd inflateEnd: @@ -626,7 +626,7 @@ lbl_80343B8C: /* 80343B90 00340AF0 80 7F 00 28 */ lwz r3, 0x28(r31) /* 80343B94 00340AF4 80 9F 00 1C */ lwz r4, 0x1c(r31) /* 80343B98 00340AF8 7D 89 03 A6 */ mtctr r12 -/* 80343B9C 00340AFC 4E 80 04 21 */ bctrl +/* 80343B9C 00340AFC 4E 80 04 21 */ bctrl /* 80343BA0 00340B00 38 00 00 00 */ li r0, 0 /* 80343BA4 00340B04 38 60 00 00 */ li r3, 0 /* 80343BA8 00340B08 90 1F 00 1C */ stw r0, 0x1c(r31) @@ -635,4 +635,4 @@ lbl_80343BAC: /* 80343BB0 00340B10 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80343BB4 00340B14 7C 08 03 A6 */ mtlr r0 /* 80343BB8 00340B18 38 21 00 10 */ addi r1, r1, 0x10 -/* 80343BBC 00340B1C 4E 80 00 20 */ blr +/* 80343BBC 00340B1C 4E 80 00 20 */ blr diff --git a/asm/Kyoto/zlib/inftrees.s b/asm/Kyoto/zlib/inftrees.s index f90c1b47..09688a5a 100644 --- a/asm/Kyoto/zlib/inftrees.s +++ b/asm/Kyoto/zlib/inftrees.s @@ -1125,7 +1125,7 @@ inflate_trees_fixed: /* 80343BE0 00340B40 90 E4 00 00 */ stw r7, 0(r4) /* 80343BE4 00340B44 91 05 00 00 */ stw r8, 0(r5) /* 80343BE8 00340B48 90 06 00 00 */ stw r0, 0(r6) -/* 80343BEC 00340B4C 4E 80 00 20 */ blr +/* 80343BEC 00340B4C 4E 80 00 20 */ blr .global inflate_trees_dynamic inflate_trees_dynamic: @@ -1151,7 +1151,7 @@ inflate_trees_dynamic: /* 80343C3C 00340B9C 81 9E 00 20 */ lwz r12, 0x20(r30) /* 80343C40 00340BA0 80 7E 00 28 */ lwz r3, 0x28(r30) /* 80343C44 00340BA4 7D 89 03 A6 */ mtctr r12 -/* 80343C48 00340BA8 4E 80 04 21 */ bctrl +/* 80343C48 00340BA8 4E 80 04 21 */ bctrl /* 80343C4C 00340BAC 7C 7F 1B 79 */ or. r31, r3, r3 /* 80343C50 00340BB0 40 82 00 0C */ bne lbl_80343C5C /* 80343C54 00340BB4 38 60 FF FC */ li r3, -4 @@ -1194,7 +1194,7 @@ lbl_80343CD4: /* 80343CD8 00340C38 7F E4 FB 78 */ mr r4, r31 /* 80343CDC 00340C3C 80 7E 00 28 */ lwz r3, 0x28(r30) /* 80343CE0 00340C40 7D 89 03 A6 */ mtctr r12 -/* 80343CE4 00340C44 4E 80 04 21 */ bctrl +/* 80343CE4 00340C44 4E 80 04 21 */ bctrl /* 80343CE8 00340C48 7F 03 C3 78 */ mr r3, r24 /* 80343CEC 00340C4C 48 00 00 E0 */ b lbl_80343DCC lbl_80343CF0: @@ -1248,7 +1248,7 @@ lbl_80343D98: /* 80343D9C 00340CFC 7F E4 FB 78 */ mr r4, r31 /* 80343DA0 00340D00 80 7E 00 28 */ lwz r3, 0x28(r30) /* 80343DA4 00340D04 7D 89 03 A6 */ mtctr r12 -/* 80343DA8 00340D08 4E 80 04 21 */ bctrl +/* 80343DA8 00340D08 4E 80 04 21 */ bctrl /* 80343DAC 00340D0C 7F 23 CB 78 */ mr r3, r25 /* 80343DB0 00340D10 48 00 00 1C */ b lbl_80343DCC lbl_80343DB4: @@ -1256,14 +1256,14 @@ lbl_80343DB4: /* 80343DB8 00340D18 7F E4 FB 78 */ mr r4, r31 /* 80343DBC 00340D1C 80 7E 00 28 */ lwz r3, 0x28(r30) /* 80343DC0 00340D20 7D 89 03 A6 */ mtctr r12 -/* 80343DC4 00340D24 4E 80 04 21 */ bctrl +/* 80343DC4 00340D24 4E 80 04 21 */ bctrl /* 80343DC8 00340D28 38 60 00 00 */ li r3, 0 lbl_80343DCC: /* 80343DCC 00340D2C BA A1 00 24 */ lmw r21, 0x24(r1) /* 80343DD0 00340D30 80 01 00 54 */ lwz r0, 0x54(r1) /* 80343DD4 00340D34 7C 08 03 A6 */ mtlr r0 /* 80343DD8 00340D38 38 21 00 50 */ addi r1, r1, 0x50 -/* 80343DDC 00340D3C 4E 80 00 20 */ blr +/* 80343DDC 00340D3C 4E 80 00 20 */ blr .global inflate_trees_bits inflate_trees_bits: @@ -1283,7 +1283,7 @@ inflate_trees_bits: /* 80343E14 00340D74 81 87 00 20 */ lwz r12, 0x20(r7) /* 80343E18 00340D78 80 67 00 28 */ lwz r3, 0x28(r7) /* 80343E1C 00340D7C 7D 89 03 A6 */ mtctr r12 -/* 80343E20 00340D80 4E 80 04 21 */ bctrl +/* 80343E20 00340D80 4E 80 04 21 */ bctrl /* 80343E24 00340D84 7C 7E 1B 79 */ or. r30, r3, r3 /* 80343E28 00340D88 40 82 00 0C */ bne lbl_80343E34 /* 80343E2C 00340D8C 38 60 FF FC */ li r3, -4 @@ -1326,14 +1326,14 @@ lbl_80343EAC: /* 80343EB0 00340E10 7F C4 F3 78 */ mr r4, r30 /* 80343EB4 00340E14 80 7D 00 28 */ lwz r3, 0x28(r29) /* 80343EB8 00340E18 7D 89 03 A6 */ mtctr r12 -/* 80343EBC 00340E1C 4E 80 04 21 */ bctrl +/* 80343EBC 00340E1C 4E 80 04 21 */ bctrl /* 80343EC0 00340E20 7F E3 FB 78 */ mr r3, r31 lbl_80343EC4: /* 80343EC4 00340E24 BB 41 00 18 */ lmw r26, 0x18(r1) /* 80343EC8 00340E28 80 01 00 34 */ lwz r0, 0x34(r1) /* 80343ECC 00340E2C 7C 08 03 A6 */ mtlr r0 /* 80343ED0 00340E30 38 21 00 30 */ addi r1, r1, 0x30 -/* 80343ED4 00340E34 4E 80 00 20 */ blr +/* 80343ED4 00340E34 4E 80 00 20 */ blr .global huft_build huft_build: @@ -1708,4 +1708,4 @@ lbl_803443EC: lbl_80344400: /* 80344400 00341360 B9 C1 00 D8 */ lmw r14, 0xd8(r1) /* 80344404 00341364 38 21 01 20 */ addi r1, r1, 0x120 -/* 80344408 00341368 4E 80 00 20 */ blr +/* 80344408 00341368 4E 80 00 20 */ blr diff --git a/asm/Kyoto/zlib/infutil.s b/asm/Kyoto/zlib/infutil.s index 39a47715..8818b7bd 100644 --- a/asm/Kyoto/zlib/infutil.s +++ b/asm/Kyoto/zlib/infutil.s @@ -69,7 +69,7 @@ lbl_8034446C: /* 80344494 003413F4 7F 45 D3 78 */ mr r5, r26 /* 80344498 003413F8 80 7B 00 3C */ lwz r3, 0x3c(r27) /* 8034449C 003413FC 7D 89 03 A6 */ mtctr r12 -/* 803444A0 00341400 4E 80 04 21 */ bctrl +/* 803444A0 00341400 4E 80 04 21 */ bctrl /* 803444A4 00341404 90 7B 00 3C */ stw r3, 0x3c(r27) /* 803444A8 00341408 90 7C 00 30 */ stw r3, 0x30(r28) lbl_803444AC: @@ -115,7 +115,7 @@ lbl_80344514: /* 8034453C 0034149C 7F 45 D3 78 */ mr r5, r26 /* 80344540 003414A0 80 7B 00 3C */ lwz r3, 0x3c(r27) /* 80344544 003414A4 7D 89 03 A6 */ mtctr r12 -/* 80344548 003414A8 4E 80 04 21 */ bctrl +/* 80344548 003414A8 4E 80 04 21 */ bctrl /* 8034454C 003414AC 90 7B 00 3C */ stw r3, 0x3c(r27) /* 80344550 003414B0 90 7C 00 30 */ stw r3, 0x30(r28) lbl_80344554: @@ -133,7 +133,7 @@ lbl_8034456C: /* 8034457C 003414DC 80 01 00 24 */ lwz r0, 0x24(r1) /* 80344580 003414E0 7C 08 03 A6 */ mtlr r0 /* 80344584 003414E4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80344588 003414E8 4E 80 00 20 */ blr +/* 80344588 003414E8 4E 80 00 20 */ blr .global zcfree zcfree: @@ -149,7 +149,7 @@ zcfree: /* 803445B0 00341510 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803445B4 00341514 7C 08 03 A6 */ mtlr r0 /* 803445B8 00341518 38 21 00 10 */ addi r1, r1, 0x10 -/* 803445BC 0034151C 4E 80 00 20 */ blr +/* 803445BC 0034151C 4E 80 00 20 */ blr .global zcalloc zcalloc: @@ -162,4 +162,4 @@ zcalloc: /* 803445D8 00341538 80 01 00 14 */ lwz r0, 0x14(r1) /* 803445DC 0034153C 7C 08 03 A6 */ mtlr r0 /* 803445E0 00341540 38 21 00 10 */ addi r1, r1, 0x10 -/* 803445E4 00341544 4E 80 00 20 */ blr +/* 803445E4 00341544 4E 80 00 20 */ blr diff --git a/asm/MetaRender/CCubeRenderer.s b/asm/MetaRender/CCubeRenderer.s index a56c1975..6006f8bd 100644 --- a/asm/MetaRender/CCubeRenderer.s +++ b/asm/MetaRender/CCubeRenderer.s @@ -255,7 +255,7 @@ lbl_805AF498: .global lbl_8046E200 lbl_8046E200: - .skip 0xC + .skip 0xC .global lbl_8046E20C lbl_8046E20C: .skip 0x1DF8 @@ -268,7 +268,7 @@ lbl_8047916C: .global lbl_80479178 lbl_80479178: .skip 0x320 - + .section .text, "ax" .global DrawString__13CCubeRendererFPCcii @@ -298,7 +298,7 @@ DrawString__13CCubeRendererFPCcii: /* 802B5DA8 002B2D08 83 81 00 10 */ lwz r28, 0x10(r1) /* 802B5DAC 002B2D0C 7C 08 03 A6 */ mtlr r0 /* 802B5DB0 002B2D10 38 21 00 20 */ addi r1, r1, 0x20 -/* 802B5DB4 002B2D14 4E 80 00 20 */ blr +/* 802B5DB4 002B2D14 4E 80 00 20 */ blr .global DrawXRayOutline__13CCubeRendererFRC6CModelPCfPCf DrawXRayOutline__13CCubeRendererFRC6CModelPCfPCf: @@ -424,7 +424,7 @@ lbl_802B5F50: /* 802B5F60 002B2EC0 80 01 00 74 */ lwz r0, 0x74(r1) /* 802B5F64 002B2EC4 7C 08 03 A6 */ mtlr r0 /* 802B5F68 002B2EC8 38 21 00 70 */ addi r1, r1, 0x70 -/* 802B5F6C 002B2ECC 4E 80 00 20 */ blr +/* 802B5F6C 002B2ECC 4E 80 00 20 */ blr .global AllocatePhazonSuitMaskTexture__13CCubeRendererFv AllocatePhazonSuitMaskTexture__13CCubeRendererFv: @@ -473,7 +473,7 @@ lbl_802B6000: /* 802B6010 002B2F70 83 C1 00 08 */ lwz r30, 8(r1) /* 802B6014 002B2F74 7C 08 03 A6 */ mtlr r0 /* 802B6018 002B2F78 38 21 00 10 */ addi r1, r1, 0x10 -/* 802B601C 002B2F7C 4E 80 00 20 */ blr +/* 802B601C 002B2F7C 4E 80 00 20 */ blr .global "DrawPhazonSuitIndirectEffect__13CCubeRendererFRC6CColorRC23TLockedToken<8CTexture>RC6CColorffff" "DrawPhazonSuitIndirectEffect__13CCubeRendererFRC6CColorRC23TLockedToken<8CTexture>RC6CColorffff": @@ -617,7 +617,7 @@ lbl_802B6200: /* 802B6230 002B3190 83 81 00 60 */ lwz r28, 0x60(r1) /* 802B6234 002B3194 7C 08 03 A6 */ mtlr r0 /* 802B6238 002B3198 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 802B623C 002B319C 4E 80 00 20 */ blr +/* 802B623C 002B319C 4E 80 00 20 */ blr .global ReallyDrawPhazonSuitIndirectEffect__13CCubeRendererFRC6CColorRC8CTextureRC8CTextureRC6CColor ReallyDrawPhazonSuitIndirectEffect__13CCubeRendererFRC6CColorRC8CTextureRC8CTextureRC6CColor: @@ -1072,7 +1072,7 @@ lbl_802B690C: /* 802B6928 002B3888 80 01 01 64 */ lwz r0, 0x164(r1) /* 802B692C 002B388C 7C 08 03 A6 */ mtlr r0 /* 802B6930 002B3890 38 21 01 60 */ addi r1, r1, 0x160 -/* 802B6934 002B3894 4E 80 00 20 */ blr +/* 802B6934 002B3894 4E 80 00 20 */ blr .global ReallyDrawPhazonSuitEffect__13CCubeRendererFRC6CColorRC8CTexture ReallyDrawPhazonSuitEffect__13CCubeRendererFRC6CColorRC8CTexture: @@ -1111,7 +1111,7 @@ ReallyDrawPhazonSuitEffect__13CCubeRendererFRC6CColorRC8CTexture: /* 802B69B8 002B3918 81 9E 00 00 */ lwz r12, 0(r30) /* 802B69BC 002B391C 81 8C 00 64 */ lwz r12, 0x64(r12) /* 802B69C0 002B3920 7D 89 03 A6 */ mtctr r12 -/* 802B69C4 002B3924 4E 80 04 21 */ bctrl +/* 802B69C4 002B3924 4E 80 04 21 */ bctrl /* 802B69C8 002B3928 38 60 00 01 */ li r3, 1 /* 802B69CC 002B392C 48 05 24 85 */ bl SetNumChans__3CGXFUc /* 802B69D0 002B3930 38 60 00 01 */ li r3, 1 @@ -1219,7 +1219,7 @@ ReallyDrawPhazonSuitEffect__13CCubeRendererFRC6CColorRC8CTexture: /* 802B6B68 002B3AC8 83 C1 00 28 */ lwz r30, 0x28(r1) /* 802B6B6C 002B3ACC 7C 08 03 A6 */ mtlr r0 /* 802B6B70 002B3AD0 38 21 00 30 */ addi r1, r1, 0x30 -/* 802B6B74 002B3AD4 4E 80 00 20 */ blr +/* 802B6B74 002B3AD4 4E 80 00 20 */ blr .global DoPhazonSuitIndirectAlphaBlur__13CCubeRendererFff DoPhazonSuitIndirectAlphaBlur__13CCubeRendererFff: @@ -1260,7 +1260,7 @@ DoPhazonSuitIndirectAlphaBlur__13CCubeRendererFff: /* 802B6C00 002B3B60 81 8C 00 30 */ lwz r12, 0x30(r12) /* 802B6C04 002B3B64 38 84 66 70 */ addi r4, r4, skIdentity4f@l /* 802B6C08 002B3B68 7D 89 03 A6 */ mtctr r12 -/* 802B6C0C 002B3B6C 4E 80 04 21 */ bctrl +/* 802B6C0C 002B3B6C 4E 80 04 21 */ bctrl /* 802B6C10 002B3B70 38 60 00 00 */ li r3, 0 /* 802B6C14 002B3B74 38 80 00 06 */ li r4, 6 /* 802B6C18 002B3B78 38 A0 00 00 */ li r5, 0 @@ -1725,7 +1725,7 @@ lbl_802B7244: /* 802B733C 002B429C 80 01 01 14 */ lwz r0, 0x114(r1) /* 802B7340 002B42A0 7C 08 03 A6 */ mtlr r0 /* 802B7344 002B42A4 38 21 01 10 */ addi r1, r1, 0x110 -/* 802B7348 002B42A8 4E 80 00 20 */ blr +/* 802B7348 002B42A8 4E 80 00 20 */ blr .global CopyTex__13CCubeRendererFibPv8GXTexFmtb CopyTex__13CCubeRendererFibPv8GXTexFmtb: @@ -1800,7 +1800,7 @@ lbl_802B742C: /* 802B7444 002B43A4 80 01 00 34 */ lwz r0, 0x34(r1) /* 802B7448 002B43A8 7C 08 03 A6 */ mtlr r0 /* 802B744C 002B43AC 38 21 00 30 */ addi r1, r1, 0x30 -/* 802B7450 002B43B0 4E 80 00 20 */ blr +/* 802B7450 002B43B0 4E 80 00 20 */ blr .global GetRenderToTexBuffer__13CCubeRendererFi GetRenderToTexBuffer__13CCubeRendererFi: @@ -1809,7 +1809,7 @@ GetRenderToTexBuffer__13CCubeRendererFi: /* 802B745C 002B43BC 7C 03 01 D6 */ mullw r0, r3, r0 /* 802B7460 002B43C0 54 00 E1 3E */ srwi r0, r0, 4 /* 802B7464 002B43C4 7C 64 02 14 */ add r3, r4, r0 -/* 802B7468 002B43C8 4E 80 00 20 */ blr +/* 802B7468 002B43C8 4E 80 00 20 */ blr .global "DrawOverlappingWorldModelShadows__13CCubeRendererFiRQ24rstl10vectorRC6CAABoxii" "DrawOverlappingWorldModelShadows__13CCubeRendererFiRQ24rstl10vectorRC6CAABoxii": @@ -1929,7 +1929,7 @@ lbl_802B75FC: /* 802B7600 002B4560 80 01 00 74 */ lwz r0, 0x74(r1) /* 802B7604 002B4564 7C 08 03 A6 */ mtlr r0 /* 802B7608 002B4568 38 21 00 70 */ addi r1, r1, 0x70 -/* 802B760C 002B456C 4E 80 00 20 */ blr +/* 802B760C 002B456C 4E 80 00 20 */ blr .global "DrawOverlappingWorldModelIDs__13CCubeRendererFiRQ24rstl10vectorRC6CAABoxii" "DrawOverlappingWorldModelIDs__13CCubeRendererFiRQ24rstl10vectorRC6CAABoxii": @@ -2061,7 +2061,7 @@ lbl_802B77D0: /* 802B77D4 002B4734 80 01 00 84 */ lwz r0, 0x84(r1) /* 802B77D8 002B4738 7C 08 03 A6 */ mtlr r0 /* 802B77DC 002B473C 38 21 00 80 */ addi r1, r1, 0x80 -/* 802B77E0 002B4740 4E 80 00 20 */ blr +/* 802B77E0 002B4740 4E 80 00 20 */ blr .global "FindOverlappingWorldModels__13CCubeRendererFRQ24rstl10vectorRC6CAABox" "FindOverlappingWorldModels__13CCubeRendererFRQ24rstl10vectorRC6CAABox": @@ -2234,7 +2234,7 @@ lbl_802B7A24: /* 802B7A28 002B4988 80 01 00 94 */ lwz r0, 0x94(r1) /* 802B7A2C 002B498C 7C 08 03 A6 */ mtlr r0 /* 802B7A30 002B4990 38 21 00 90 */ addi r1, r1, 0x90 -/* 802B7A34 002B4994 4E 80 00 20 */ blr +/* 802B7A34 002B4994 4E 80 00 20 */ blr .global "PrepareDynamicLights__13CCubeRendererFRCQ24rstl14vector" "PrepareDynamicLights__13CCubeRendererFRCQ24rstl14vector": @@ -2372,7 +2372,7 @@ lbl_802B7C08: /* 802B7C18 002B4B78 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 802B7C1C 002B4B7C 7C 08 03 A6 */ mtlr r0 /* 802B7C20 002B4B80 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 802B7C24 002B4B84 4E 80 00 20 */ blr +/* 802B7C24 002B4B84 4E 80 00 20 */ blr .global sub_802b7c28 sub_802b7c28: @@ -2408,7 +2408,7 @@ lbl_802B7C64: /* 802B7C94 002B4BF4 D0 03 00 10 */ stfs f0, 0x10(r3) /* 802B7C98 002B4BF8 C0 04 00 34 */ lfs f0, 0x34(r4) /* 802B7C9C 002B4BFC D0 03 00 14 */ stfs f0, 0x14(r3) -/* 802B7CA0 002B4C00 4E 80 00 20 */ blr +/* 802B7CA0 002B4C00 4E 80 00 20 */ blr lbl_802B7CA4: /* 802B7CA4 002B4C04 38 84 00 08 */ addi r4, r4, 8 /* 802B7CA8 002B4C08 39 29 00 01 */ addi r9, r9, 1 @@ -2434,7 +2434,7 @@ lbl_802B7CC0: /* 802B7CE8 002B4C48 D0 03 00 10 */ stfs f0, 0x10(r3) /* 802B7CEC 002B4C4C C0 04 00 14 */ lfs f0, 0x14(r4) /* 802B7CF0 002B4C50 D0 03 00 14 */ stfs f0, 0x14(r3) -/* 802B7CF4 002B4C54 4E 80 00 20 */ blr +/* 802B7CF4 002B4C54 4E 80 00 20 */ blr .global SetWorldLightFadeLevel__13CCubeRendererFf SetWorldLightFadeLevel__13CCubeRendererFf: @@ -2451,7 +2451,7 @@ SetWorldLightFadeLevel__13CCubeRendererFf: /* 802B7D20 002B4C80 80 01 00 0C */ lwz r0, 0xc(r1) /* 802B7D24 002B4C84 90 03 02 FC */ stw r0, 0x2fc(r3) /* 802B7D28 002B4C88 38 21 00 10 */ addi r1, r1, 0x10 -/* 802B7D2C 002B4C8C 4E 80 00 20 */ blr +/* 802B7D2C 002B4C8C 4E 80 00 20 */ blr .global SetGXRegister1Color__13CCubeRendererFRC6CColor SetGXRegister1Color__13CCubeRendererFRC6CColor: @@ -2466,7 +2466,7 @@ SetGXRegister1Color__13CCubeRendererFRC6CColor: /* 802B7D50 002B4CB0 80 01 00 14 */ lwz r0, 0x14(r1) /* 802B7D54 002B4CB4 7C 08 03 A6 */ mtlr r0 /* 802B7D58 002B4CB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802B7D5C 002B4CBC 4E 80 00 20 */ blr +/* 802B7D5C 002B4CBC 4E 80 00 20 */ blr .global SetThermalColdScale__13CCubeRendererFf SetThermalColdScale__13CCubeRendererFf: @@ -2494,7 +2494,7 @@ SetThermalColdScale__13CCubeRendererFf: /* 802B7DB4 002B4D14 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802B7DB8 002B4D18 7C 08 03 A6 */ mtlr r0 /* 802B7DBC 002B4D1C 38 21 00 30 */ addi r1, r1, 0x30 -/* 802B7DC0 002B4D20 4E 80 00 20 */ blr +/* 802B7DC0 002B4D20 4E 80 00 20 */ blr .global DrawAreaGeometry__13CCubeRendererFiii DrawAreaGeometry__13CCubeRendererFiii: @@ -2631,7 +2631,7 @@ lbl_802B7F64: /* 802B7F8C 002B4EEC 80 01 00 44 */ lwz r0, 0x44(r1) /* 802B7F90 002B4EF0 7C 08 03 A6 */ mtlr r0 /* 802B7F94 002B4EF4 38 21 00 40 */ addi r1, r1, 0x40 -/* 802B7F98 002B4EF8 4E 80 00 20 */ blr +/* 802B7F98 002B4EF8 4E 80 00 20 */ blr .global DrawModelFlat__13CCubeRendererFRC6CModelRC11CModelFlagsbPCfPCf DrawModelFlat__13CCubeRendererFRC6CModelRC11CModelFlagsbPCfPCf: @@ -2745,7 +2745,7 @@ lbl_802B812C: /* 802B8134 002B5094 80 01 00 24 */ lwz r0, 0x24(r1) /* 802B8138 002B5098 7C 08 03 A6 */ mtlr r0 /* 802B813C 002B509C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802B8140 002B50A0 4E 80 00 20 */ blr +/* 802B8140 002B50A0 4E 80 00 20 */ blr .global DrawModelDisintegrate__13CCubeRendererFRC6CModelRC8CTextureRC6CColorPCfPCf DrawModelDisintegrate__13CCubeRendererFRC6CModelRC8CTextureRC6CColorPCfPCf: @@ -3012,7 +3012,7 @@ DrawModelDisintegrate__13CCubeRendererFRC6CModelRC8CTextureRC6CColorPCfPCf: /* 802B8554 002B54B4 80 01 02 74 */ lwz r0, 0x274(r1) /* 802B8558 002B54B8 7C 08 03 A6 */ mtlr r0 /* 802B855C 002B54BC 38 21 02 70 */ addi r1, r1, 0x270 -/* 802B8560 002B54C0 4E 80 00 20 */ blr +/* 802B8560 002B54C0 4E 80 00 20 */ blr .global DrawThermalModel__13CCubeRendererFRC6CModelRC6CColorRC6CColorPCfPCfRC11CModelFlags DrawThermalModel__13CCubeRendererFRC6CModelRC6CColorRC6CColorPCfPCfRC11CModelFlags: @@ -3041,7 +3041,7 @@ DrawThermalModel__13CCubeRendererFRC6CModelRC6CColorRC6CColorPCfPCfRC11CModelFla /* 802B85BC 002B551C 80 01 00 34 */ lwz r0, 0x34(r1) /* 802B85C0 002B5520 7C 08 03 A6 */ mtlr r0 /* 802B85C4 002B5524 38 21 00 30 */ addi r1, r1, 0x30 -/* 802B85C8 002B5528 4E 80 00 20 */ blr +/* 802B85C8 002B5528 4E 80 00 20 */ blr .global sub_802b85cc sub_802b85cc: @@ -3171,7 +3171,7 @@ lbl_802B87AC: /* 802B87B4 002B5714 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 802B87B8 002B5718 7C 08 03 A6 */ mtlr r0 /* 802B87BC 002B571C 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 802B87C0 002B5720 4E 80 00 20 */ blr +/* 802B87C0 002B5720 4E 80 00 20 */ blr .global "__ct__Q213CCubeRenderer18CFogVolumeListItemFRC12CTransform4f6CColorRC6CAABoxPC21TLockedToken<6CModel>PC13CSkinnedModel" "__ct__Q213CCubeRenderer18CFogVolumeListItemFRC12CTransform4f6CColorRC6CAABoxPC21TLockedToken<6CModel>PC13CSkinnedModel": @@ -3275,7 +3275,7 @@ lbl_802B891C: /* 802B8928 002B5888 80 01 00 44 */ lwz r0, 0x44(r1) /* 802B892C 002B588C 7C 08 03 A6 */ mtlr r0 /* 802B8930 002B5890 38 21 00 40 */ addi r1, r1, 0x40 -/* 802B8934 002B5894 4E 80 00 20 */ blr +/* 802B8934 002B5894 4E 80 00 20 */ blr .global PostRenderFogs__13CCubeRendererFv PostRenderFogs__13CCubeRendererFv: @@ -3351,7 +3351,7 @@ lbl_802B8A10: /* 802B8A24 002B5984 83 A1 00 14 */ lwz r29, 0x14(r1) /* 802B8A28 002B5988 7C 08 03 A6 */ mtlr r0 /* 802B8A2C 002B598C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802B8A30 002B5990 4E 80 00 20 */ blr +/* 802B8A30 002B5990 4E 80 00 20 */ blr .global FogSorter FogSorter: @@ -3395,12 +3395,12 @@ lbl_802B8AA4: /* 802B8AB4 002B5A14 80 01 00 24 */ lwz r0, 0x24(r1) /* 802B8AB8 002B5A18 7C 08 03 A6 */ mtlr r0 /* 802B8ABC 002B5A1C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802B8AC0 002B5A20 4E 80 00 20 */ blr +/* 802B8AC0 002B5A20 4E 80 00 20 */ blr .global sub_802b8ac4 sub_802b8ac4: /* 802B8AC4 002B5A24 7C 04 28 40 */ cmplw r4, r5 -/* 802B8AC8 002B5A28 4D 82 00 20 */ beqlr +/* 802B8AC8 002B5A28 4D 82 00 20 */ beqlr /* 802B8ACC 002B5A2C 80 03 00 04 */ lwz r0, 4(r3) /* 802B8AD0 002B5A30 7C 04 00 40 */ cmplw r4, r0 /* 802B8AD4 002B5A34 40 82 00 0C */ bne lbl_802B8AE0 @@ -3432,11 +3432,11 @@ lbl_802B8B20: /* 802B8B2C 002B5A8C 91 04 00 00 */ stw r8, 0(r4) /* 802B8B30 002B5A90 90 A3 00 00 */ stw r5, 0(r3) /* 802B8B34 002B5A94 90 65 00 04 */ stw r3, 4(r5) -/* 802B8B38 002B5A98 4E 80 00 20 */ blr +/* 802B8B38 002B5A98 4E 80 00 20 */ blr lbl_802B8B3C: /* 802B8B3C 002B5A9C 90 85 00 04 */ stw r4, 4(r5) /* 802B8B40 002B5AA0 90 A4 00 00 */ stw r5, 0(r4) -/* 802B8B44 002B5AA4 4E 80 00 20 */ blr +/* 802B8B44 002B5AA4 4E 80 00 20 */ blr .global sub_802b8b48 sub_802b8b48: @@ -3553,7 +3553,7 @@ lbl_802B8CE0: /* 802B8CF8 002B5C58 83 C1 00 A8 */ lwz r30, 0xa8(r1) /* 802B8CFC 002B5C5C 7C 08 03 A6 */ mtlr r0 /* 802B8D00 002B5C60 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 802B8D04 002B5C64 4E 80 00 20 */ blr +/* 802B8D04 002B5C64 4E 80 00 20 */ blr .global DisablePVS__13CCubeRendererFv DisablePVS__13CCubeRendererFv: @@ -3583,7 +3583,7 @@ lbl_802B8D58: /* 802B8D60 002B5CC0 80 01 00 24 */ lwz r0, 0x24(r1) /* 802B8D64 002B5CC4 7C 08 03 A6 */ mtlr r0 /* 802B8D68 002B5CC8 38 21 00 20 */ addi r1, r1, 0x20 -/* 802B8D6C 002B5CCC 4E 80 00 20 */ blr +/* 802B8D6C 002B5CCC 4E 80 00 20 */ blr .global sub_802b8d70 sub_802b8d70: @@ -3670,7 +3670,7 @@ lbl_802B8E88: /* 802B8E90 002B5DF0 83 C1 00 08 */ lwz r30, 8(r1) /* 802B8E94 002B5DF4 7C 08 03 A6 */ mtlr r0 /* 802B8E98 002B5DF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802B8E9C 002B5DFC 4E 80 00 20 */ blr +/* 802B8E9C 002B5DFC 4E 80 00 20 */ blr .global EnablePVS__13CCubeRendererFPC10CPVSVisSeti EnablePVS__13CCubeRendererFPC10CPVSVisSeti: @@ -3735,7 +3735,7 @@ lbl_802B8F68: /* 802B8F78 002B5ED8 83 A1 00 14 */ lwz r29, 0x14(r1) /* 802B8F7C 002B5EDC 7C 08 03 A6 */ mtlr r0 /* 802B8F80 002B5EE0 38 21 00 20 */ addi r1, r1, 0x20 -/* 802B8F84 002B5EE4 4E 80 00 20 */ blr +/* 802B8F84 002B5EE4 4E 80 00 20 */ blr .global SetThermal__13CCubeRendererFbfRC6CColor SetThermal__13CCubeRendererFbfRC6CColor: @@ -3748,7 +3748,7 @@ SetThermal__13CCubeRendererFbfRC6CColor: /* 802B8FA0 002B5F00 90 83 02 F4 */ stw r4, 0x2f4(r3) /* 802B8FA4 002B5F04 98 0D A5 EC */ stb r0, lbl_805A91AC@sda21(r13) /* 802B8FA8 002B5F08 98 0D A8 B8 */ stb r0, lbl_805A9478@sda21(r13) -/* 802B8FAC 002B5F0C 4E 80 00 20 */ blr +/* 802B8FAC 002B5F0C 4E 80 00 20 */ blr .global ReallyRenderFogVolume__13CCubeRendererFRC6CColorRC6CAABoxPC6CModelPC13CSkinnedModel ReallyRenderFogVolume__13CCubeRendererFRC6CColorRC6CAABoxPC6CModelPC13CSkinnedModel: @@ -5021,7 +5021,7 @@ lbl_802BA240: /* 802BA284 002B71E4 80 01 04 24 */ lwz r0, 0x424(r1) /* 802BA288 002B71E8 7C 08 03 A6 */ mtlr r0 /* 802BA28C 002B71EC 38 21 04 20 */ addi r1, r1, 0x420 -/* 802BA290 002B71F0 4E 80 00 20 */ blr +/* 802BA290 002B71F0 4E 80 00 20 */ blr .global "RenderFogVolume__13CCubeRendererFRC6CColorRC6CAABoxPC21TLockedToken<6CModel>PC13CSkinnedModel" "RenderFogVolume__13CCubeRendererFRC6CColorRC6CAABoxPC21TLockedToken<6CModel>PC13CSkinnedModel": @@ -5065,7 +5065,7 @@ lbl_802BA31C: /* 802BA320 002B7280 83 E1 00 7C */ lwz r31, 0x7c(r1) /* 802BA324 002B7284 7C 08 03 A6 */ mtlr r0 /* 802BA328 002B7288 38 21 00 80 */ addi r1, r1, 0x80 -/* 802BA32C 002B728C 4E 80 00 20 */ blr +/* 802BA32C 002B728C 4E 80 00 20 */ blr .global "push_back__Q24rstl70listFRCQ213CCubeRenderer18CFogVolumeListItem" "push_back__Q24rstl70listFRCQ213CCubeRenderer18CFogVolumeListItem": @@ -5078,7 +5078,7 @@ lbl_802BA31C: /* 802BA348 002B72A8 80 01 00 14 */ lwz r0, 0x14(r1) /* 802BA34C 002B72AC 7C 08 03 A6 */ mtlr r0 /* 802BA350 002B72B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BA354 002B72B4 4E 80 00 20 */ blr +/* 802BA354 002B72B4 4E 80 00 20 */ blr .global "do_insert_before__Q24rstl70listFPQ34rstl70list4nodeRCQ213CCubeRenderer18CFogVolumeListItem" "do_insert_before__Q24rstl70listFPQ34rstl70list4nodeRCQ213CCubeRenderer18CFogVolumeListItem": @@ -5110,7 +5110,7 @@ lbl_802BA394: /* 802BA3B8 002B7318 83 C1 00 08 */ lwz r30, 8(r1) /* 802BA3BC 002B731C 7C 08 03 A6 */ mtlr r0 /* 802BA3C0 002B7320 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BA3C4 002B7324 4E 80 00 20 */ blr +/* 802BA3C4 002B7324 4E 80 00 20 */ blr .global __ct__Q213CCubeRenderer18CFogVolumeListItemFRCQ213CCubeRenderer18CFogVolumeListItem __ct__Q213CCubeRenderer18CFogVolumeListItemFRCQ213CCubeRenderer18CFogVolumeListItem: @@ -5175,7 +5175,7 @@ lbl_802BA49C: /* 802BA4A4 002B7404 80 01 00 24 */ lwz r0, 0x24(r1) /* 802BA4A8 002B7408 7C 08 03 A6 */ mtlr r0 /* 802BA4AC 002B740C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802BA4B0 002B7410 4E 80 00 20 */ blr +/* 802BA4B0 002B7410 4E 80 00 20 */ blr .global DoThermalBlendHot__13CCubeRendererFv DoThermalBlendHot__13CCubeRendererFv: @@ -5381,7 +5381,7 @@ DoThermalBlendHot__13CCubeRendererFv: /* 802BA7D0 002B7730 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 802BA7D4 002B7734 7C 08 03 A6 */ mtlr r0 /* 802BA7D8 002B7738 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 802BA7DC 002B773C 4E 80 00 20 */ blr +/* 802BA7DC 002B773C 4E 80 00 20 */ blr .global DoThermalBlendCold__13CCubeRendererFv DoThermalBlendCold__13CCubeRendererFv: @@ -5787,7 +5787,7 @@ lbl_802BAA1C: /* 802BAE0C 002B7D6C 80 01 01 04 */ lwz r0, 0x104(r1) /* 802BAE10 002B7D70 7C 08 03 A6 */ mtlr r0 /* 802BAE14 002B7D74 38 21 01 00 */ addi r1, r1, 0x100 -/* 802BAE18 002B7D78 4E 80 00 20 */ blr +/* 802BAE18 002B7D78 4E 80 00 20 */ blr .global RenderFogVolumeModel__13CCubeRendererFRC6CAABoxPC6CModelRC12CTransform4f12CTransform4fPC13CSkinnedModel RenderFogVolumeModel__13CCubeRendererFRC6CAABoxPC6CModelRC12CTransform4f12CTransform4fPC13CSkinnedModel: @@ -6056,7 +6056,7 @@ lbl_802BB19C: /* 802BB218 002B8178 83 A1 00 E4 */ lwz r29, 0xe4(r1) /* 802BB21C 002B817C 7C 08 03 A6 */ mtlr r0 /* 802BB220 002B8180 38 21 01 D0 */ addi r1, r1, 0x1d0 -/* 802BB224 002B8184 4E 80 00 20 */ blr +/* 802BB224 002B8184 4E 80 00 20 */ blr .global DrawFogSlices__13CCubeRendererFPC6CPlaneiiRC9CVector3ff DrawFogSlices__13CCubeRendererFPC6CPlaneiiRC9CVector3ff: @@ -6351,7 +6351,7 @@ lbl_802BB648: /* 802BB664 002B85C4 80 01 02 54 */ lwz r0, 0x254(r1) /* 802BB668 002B85C8 7C 08 03 A6 */ mtlr r0 /* 802BB66C 002B85CC 38 21 02 50 */ addi r1, r1, 0x250 -/* 802BB670 002B85D0 4E 80 00 20 */ blr +/* 802BB670 002B85D0 4E 80 00 20 */ blr .global DrawFogFans__13CCubeRendererFPC6CPlaneiPC9CVector3fiii DrawFogFans__13CCubeRendererFPC6CPlaneiPC9CVector3fiii: @@ -6561,7 +6561,7 @@ lbl_802BB944: /* 802BB948 002B88A8 80 01 01 54 */ lwz r0, 0x154(r1) /* 802BB94C 002B88AC 7C 08 03 A6 */ mtlr r0 /* 802BB950 002B88B0 38 21 01 50 */ addi r1, r1, 0x150 -/* 802BB954 002B88B4 4E 80 00 20 */ blr +/* 802BB954 002B88B4 4E 80 00 20 */ blr .global DrawFogFan__13CCubeRendererFPC9CVector3fi DrawFogFan__13CCubeRendererFPC9CVector3fi: @@ -6668,7 +6668,7 @@ lbl_802BBACC: /* 802BBAD4 002B8A34 83 C1 00 08 */ lwz r30, 8(r1) /* 802BBAD8 002B8A38 7C 08 03 A6 */ mtlr r0 /* 802BBADC 002B8A3C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BBAE0 002B8A40 4E 80 00 20 */ blr +/* 802BBAE0 002B8A40 4E 80 00 20 */ blr .global GetStaticWorldDataSize__13CCubeRendererFv GetStaticWorldDataSize__13CCubeRendererFv: @@ -6689,7 +6689,7 @@ lbl_802BBB10: /* 802BBB10 002B8A70 7C 04 18 40 */ cmplw r4, r3 /* 802BBB14 002B8A74 40 82 FF E0 */ bne lbl_802BBAF4 /* 802BBB18 002B8A78 7C A3 2B 78 */ mr r3, r5 -/* 802BBB1C 002B8A7C 4E 80 00 20 */ blr +/* 802BBB1C 002B8A7C 4E 80 00 20 */ blr .global SetWorldFog__13CCubeRendererF11ERglFogModeffRC6CColor SetWorldFog__13CCubeRendererF11ERglFogModeffRC6CColor: @@ -6707,7 +6707,7 @@ lbl_802BBB3C: /* 802BBB48 002B8AA8 80 01 00 14 */ lwz r0, 0x14(r1) /* 802BBB4C 002B8AAC 7C 08 03 A6 */ mtlr r0 /* 802BBB50 002B8AB0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BBB54 002B8AB4 4E 80 00 20 */ blr +/* 802BBB54 002B8AB4 4E 80 00 20 */ blr .global SetWireframeFlags__13CCubeRendererFi SetWireframeFlags__13CCubeRendererFi: @@ -6734,7 +6734,7 @@ SetWireframeFlags__13CCubeRendererFi: /* 802BBBA8 002B8B08 83 C1 00 08 */ lwz r30, 8(r1) /* 802BBBAC 002B8B0C 7C 08 03 A6 */ mtlr r0 /* 802BBBB0 002B8B10 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BBBB4 002B8B14 4E 80 00 20 */ blr +/* 802BBBB4 002B8B14 4E 80 00 20 */ blr .global _DrawSpaceWarp__13CCubeRendererFRC9CVector3ff _DrawSpaceWarp__13CCubeRendererFRC9CVector3ff: @@ -7234,7 +7234,7 @@ lbl_802BC348: /* 802BC354 002B92B4 80 01 01 84 */ lwz r0, 0x184(r1) /* 802BC358 002B92B8 7C 08 03 A6 */ mtlr r0 /* 802BC35C 002B92BC 38 21 01 80 */ addi r1, r1, 0x180 -/* 802BC360 002B92C0 4E 80 00 20 */ blr +/* 802BC360 002B92C0 4E 80 00 20 */ blr .global DrawSpaceWarp__13CCubeRendererFRC9CVector3ff DrawSpaceWarp__13CCubeRendererFRC9CVector3ff: @@ -7251,7 +7251,7 @@ lbl_802BC388: /* 802BC388 002B92E8 80 01 00 14 */ lwz r0, 0x14(r1) /* 802BC38C 002B92EC 7C 08 03 A6 */ mtlr r0 /* 802BC390 002B92F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BC394 002B92F4 4E 80 00 20 */ blr +/* 802BC394 002B92F4 4E 80 00 20 */ blr .global CacheReflection__13CCubeRendererFPFPvRC9CVector3f_vPvb CacheReflection__13CCubeRendererFPFPvRC9CVector3f_vPvb: @@ -7335,7 +7335,7 @@ lbl_802BC424: /* 802BC4C4 002B9424 38 83 67 B4 */ addi r4, r3, lbl_805A67B4@l /* 802BC4C8 002B9428 7F C3 F3 78 */ mr r3, r30 /* 802BC4CC 002B942C 7D 89 03 A6 */ mtctr r12 -/* 802BC4D0 002B9430 4E 80 04 21 */ bctrl +/* 802BC4D0 002B9430 4E 80 04 21 */ bctrl /* 802BC4D4 002B9434 80 7C 01 4C */ lwz r3, 0x14c(r28) /* 802BC4D8 002B9438 38 80 00 00 */ li r4, 0 /* 802BC4DC 002B943C 48 05 21 19 */ bl GetConstBitMapData__8CTextureCFi @@ -7363,7 +7363,7 @@ lbl_802BC52C: /* 802BC530 002B9490 80 01 00 34 */ lwz r0, 0x34(r1) /* 802BC534 002B9494 7C 08 03 A6 */ mtlr r0 /* 802BC538 002B9498 38 21 00 30 */ addi r1, r1, 0x30 -/* 802BC53C 002B949C 4E 80 00 20 */ blr +/* 802BC53C 002B949C 4E 80 00 20 */ blr .global GetRealReflection__13CCubeRendererFv GetRealReflection__13CCubeRendererFv: @@ -7373,10 +7373,10 @@ GetRealReflection__13CCubeRendererFv: /* 802BC54C 002B94AC 28 00 00 00 */ cmplwi r0, 0 /* 802BC550 002B94B0 40 82 00 0C */ bne lbl_802BC55C /* 802BC554 002B94B4 38 63 00 E4 */ addi r3, r3, 0xe4 -/* 802BC558 002B94B8 4E 80 00 20 */ blr +/* 802BC558 002B94B8 4E 80 00 20 */ blr lbl_802BC55C: /* 802BC55C 002B94BC 7C 03 03 78 */ mr r3, r0 -/* 802BC560 002B94C0 4E 80 00 20 */ blr +/* 802BC560 002B94C0 4E 80 00 20 */ blr .global SetDebugOption__13CCubeRendererFQ29IRenderer12EDebugOptioni SetDebugOption__13CCubeRendererFQ29IRenderer12EDebugOptioni: @@ -7388,33 +7388,33 @@ SetDebugOption__13CCubeRendererFQ29IRenderer12EDebugOptioni: .global sub_802bc578 sub_802bc578: -/* 802BC578 002B94D8 4E 80 00 20 */ blr +/* 802BC578 002B94D8 4E 80 00 20 */ blr lbl_802BC57C: /* 802BC57C 002B94DC 2C 04 00 03 */ cmpwi r4, 3 -/* 802BC580 002B94E0 4C 80 00 20 */ bgelr +/* 802BC580 002B94E0 4C 80 00 20 */ bgelr /* 802BC584 002B94E4 48 00 00 20 */ b lbl_802BC5A4 lbl_802BC588: /* 802BC588 002B94E8 7C 05 00 D0 */ neg r0, r5 /* 802BC58C 002B94EC 7C 00 2B 78 */ or r0, r0, r5 /* 802BC590 002B94F0 54 00 0F FE */ srwi r0, r0, 0x1f /* 802BC594 002B94F4 98 03 00 C0 */ stb r0, 0xc0(r3) -/* 802BC598 002B94F8 4E 80 00 20 */ blr +/* 802BC598 002B94F8 4E 80 00 20 */ blr lbl_802BC59C: /* 802BC59C 002B94FC 90 A3 00 C4 */ stw r5, 0xc4(r3) -/* 802BC5A0 002B9500 4E 80 00 20 */ blr +/* 802BC5A0 002B9500 4E 80 00 20 */ blr lbl_802BC5A4: /* 802BC5A4 002B9504 7C 85 00 D0 */ neg r4, r5 /* 802BC5A8 002B9508 88 03 03 18 */ lbz r0, 0x318(r3) /* 802BC5AC 002B950C 7C 84 2B 78 */ or r4, r4, r5 /* 802BC5B0 002B9510 50 80 27 38 */ rlwimi r0, r4, 4, 0x1c, 0x1c /* 802BC5B4 002B9514 98 03 03 18 */ stb r0, 0x318(r3) -/* 802BC5B8 002B9518 4E 80 00 20 */ blr +/* 802BC5B8 002B9518 4E 80 00 20 */ blr .global SetDrawableCallback__13CCubeRendererFPFPCvPCvi_vPCv SetDrawableCallback__13CCubeRendererFPFPCvPCvi_vPCv: /* 802BC5BC 002B951C 90 83 00 A8 */ stw r4, 0xa8(r3) /* 802BC5C0 002B9520 90 A3 00 AC */ stw r5, 0xac(r3) -/* 802BC5C4 002B9524 4E 80 00 20 */ blr +/* 802BC5C4 002B9524 4E 80 00 20 */ blr .global GetFPS__13CCubeRendererFv GetFPS__13CCubeRendererFv: @@ -7425,13 +7425,13 @@ GetFPS__13CCubeRendererFv: /* 802BC5D8 002B9538 80 01 00 14 */ lwz r0, 0x14(r1) /* 802BC5DC 002B953C 7C 08 03 A6 */ mtlr r0 /* 802BC5E0 002B9540 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BC5E4 002B9544 4E 80 00 20 */ blr +/* 802BC5E4 002B9544 4E 80 00 20 */ blr .global SetClippingPlanes__13CCubeRendererFRC14CFrustumPlanes SetClippingPlanes__13CCubeRendererFRC14CFrustumPlanes: /* 802BC5E8 002B9548 38 03 00 44 */ addi r0, r3, 0x44 /* 802BC5EC 002B954C 7C 00 20 40 */ cmplw r0, r4 -/* 802BC5F0 002B9550 4D 82 00 20 */ beqlr +/* 802BC5F0 002B9550 4D 82 00 20 */ beqlr /* 802BC5F4 002B9554 80 E3 00 44 */ lwz r7, 0x44(r3) /* 802BC5F8 002B9558 39 03 00 48 */ addi r8, r3, 0x48 /* 802BC5FC 002B955C 38 A0 00 00 */ li r5, 0 @@ -7483,7 +7483,7 @@ lbl_802BC694: /* 802BC698 002B95F8 40 82 FF CC */ bne lbl_802BC664 /* 802BC69C 002B95FC 80 04 00 00 */ lwz r0, 0(r4) /* 802BC6A0 002B9600 90 03 00 44 */ stw r0, 0x44(r3) -/* 802BC6A4 002B9604 4E 80 00 20 */ blr +/* 802BC6A4 002B9604 4E 80 00 20 */ blr .global SetBlendMode_AdditiveDestColor__13CCubeRendererFv SetBlendMode_AdditiveDestColor__13CCubeRendererFv: @@ -7498,7 +7498,7 @@ SetBlendMode_AdditiveDestColor__13CCubeRendererFv: /* 802BC6C8 002B9628 80 01 00 14 */ lwz r0, 0x14(r1) /* 802BC6CC 002B962C 7C 08 03 A6 */ mtlr r0 /* 802BC6D0 002B9630 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BC6D4 002B9634 4E 80 00 20 */ blr +/* 802BC6D4 002B9634 4E 80 00 20 */ blr .global SetBlendMode_Replace__13CCubeRendererFv SetBlendMode_Replace__13CCubeRendererFv: @@ -7513,7 +7513,7 @@ SetBlendMode_Replace__13CCubeRendererFv: /* 802BC6F8 002B9658 80 01 00 14 */ lwz r0, 0x14(r1) /* 802BC6FC 002B965C 7C 08 03 A6 */ mtlr r0 /* 802BC700 002B9660 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BC704 002B9664 4E 80 00 20 */ blr +/* 802BC704 002B9664 4E 80 00 20 */ blr .global SetBlendMode_InvertSrc__13CCubeRendererFv SetBlendMode_InvertSrc__13CCubeRendererFv: @@ -7528,7 +7528,7 @@ SetBlendMode_InvertSrc__13CCubeRendererFv: /* 802BC728 002B9688 80 01 00 14 */ lwz r0, 0x14(r1) /* 802BC72C 002B968C 7C 08 03 A6 */ mtlr r0 /* 802BC730 002B9690 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BC734 002B9694 4E 80 00 20 */ blr +/* 802BC734 002B9694 4E 80 00 20 */ blr .global SetBlendMode_InvertDst__13CCubeRendererFv SetBlendMode_InvertDst__13CCubeRendererFv: @@ -7543,7 +7543,7 @@ SetBlendMode_InvertDst__13CCubeRendererFv: /* 802BC758 002B96B8 80 01 00 14 */ lwz r0, 0x14(r1) /* 802BC75C 002B96BC 7C 08 03 A6 */ mtlr r0 /* 802BC760 002B96C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BC764 002B96C4 4E 80 00 20 */ blr +/* 802BC764 002B96C4 4E 80 00 20 */ blr .global SetBlendMode_ColorMultiply__13CCubeRendererFv SetBlendMode_ColorMultiply__13CCubeRendererFv: @@ -7558,7 +7558,7 @@ SetBlendMode_ColorMultiply__13CCubeRendererFv: /* 802BC788 002B96E8 80 01 00 14 */ lwz r0, 0x14(r1) /* 802BC78C 002B96EC 7C 08 03 A6 */ mtlr r0 /* 802BC790 002B96F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BC794 002B96F4 4E 80 00 20 */ blr +/* 802BC794 002B96F4 4E 80 00 20 */ blr .global SetBlendMode_NoColorWrite__13CCubeRendererFv SetBlendMode_NoColorWrite__13CCubeRendererFv: @@ -7573,7 +7573,7 @@ SetBlendMode_NoColorWrite__13CCubeRendererFv: /* 802BC7B8 002B9718 80 01 00 14 */ lwz r0, 0x14(r1) /* 802BC7BC 002B971C 7C 08 03 A6 */ mtlr r0 /* 802BC7C0 002B9720 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BC7C4 002B9724 4E 80 00 20 */ blr +/* 802BC7C4 002B9724 4E 80 00 20 */ blr .global SetBlendMode_AlphaBlended__13CCubeRendererFv SetBlendMode_AlphaBlended__13CCubeRendererFv: @@ -7588,7 +7588,7 @@ SetBlendMode_AlphaBlended__13CCubeRendererFv: /* 802BC7E8 002B9748 80 01 00 14 */ lwz r0, 0x14(r1) /* 802BC7EC 002B974C 7C 08 03 A6 */ mtlr r0 /* 802BC7F0 002B9750 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BC7F4 002B9754 4E 80 00 20 */ blr +/* 802BC7F4 002B9754 4E 80 00 20 */ blr .global SetBlendMode_AdditiveAlpha__13CCubeRendererFv SetBlendMode_AdditiveAlpha__13CCubeRendererFv: @@ -7603,7 +7603,7 @@ SetBlendMode_AdditiveAlpha__13CCubeRendererFv: /* 802BC818 002B9778 80 01 00 14 */ lwz r0, 0x14(r1) /* 802BC81C 002B977C 7C 08 03 A6 */ mtlr r0 /* 802BC820 002B9780 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BC824 002B9784 4E 80 00 20 */ blr +/* 802BC824 002B9784 4E 80 00 20 */ blr .global SetDepthReadWrite__13CCubeRendererFbb SetDepthReadWrite__13CCubeRendererFbb: @@ -7616,7 +7616,7 @@ SetDepthReadWrite__13CCubeRendererFbb: /* 802BC840 002B97A0 80 01 00 14 */ lwz r0, 0x14(r1) /* 802BC844 002B97A4 7C 08 03 A6 */ mtlr r0 /* 802BC848 002B97A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BC84C 002B97AC 4E 80 00 20 */ blr +/* 802BC84C 002B97AC 4E 80 00 20 */ blr .global SetViewport__13CCubeRendererFiiii SetViewport__13CCubeRendererFiiii: @@ -7648,7 +7648,7 @@ SetViewport__13CCubeRendererFiiii: /* 802BC8B4 002B9814 83 81 00 10 */ lwz r28, 0x10(r1) /* 802BC8B8 002B9818 7C 08 03 A6 */ mtlr r0 /* 802BC8BC 002B981C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802BC8C0 002B9820 4E 80 00 20 */ blr +/* 802BC8C0 002B9820 4E 80 00 20 */ blr .global SetViewportOrtho__13CCubeRendererFbff SetViewportOrtho__13CCubeRendererFbff: @@ -7779,7 +7779,7 @@ lbl_802BC9E8: /* 802BCA94 002B99F4 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 802BCA98 002B99F8 7C 08 03 A6 */ mtlr r0 /* 802BCA9C 002B99FC 38 21 00 80 */ addi r1, r1, 0x80 -/* 802BCAA0 002B9A00 4E 80 00 20 */ blr +/* 802BCAA0 002B9A00 4E 80 00 20 */ blr .global SetPerspective__13CCubeRendererFffff SetPerspective__13CCubeRendererFffff: @@ -7790,7 +7790,7 @@ SetPerspective__13CCubeRendererFffff: /* 802BCAB4 002B9A14 80 01 00 14 */ lwz r0, 0x14(r1) /* 802BCAB8 002B9A18 7C 08 03 A6 */ mtlr r0 /* 802BCABC 002B9A1C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BCAC0 002B9A20 4E 80 00 20 */ blr +/* 802BCAC0 002B9A20 4E 80 00 20 */ blr .global SetPerspective__13CCubeRendererFfffff SetPerspective__13CCubeRendererFfffff: @@ -7804,7 +7804,7 @@ SetPerspective__13CCubeRendererFfffff: /* 802BCAE0 002B9A40 80 01 00 14 */ lwz r0, 0x14(r1) /* 802BCAE4 002B9A44 7C 08 03 A6 */ mtlr r0 /* 802BCAE8 002B9A48 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BCAEC 002B9A4C 4E 80 00 20 */ blr +/* 802BCAEC 002B9A4C 4E 80 00 20 */ blr .global SetAmbientColor__13CCubeRendererFRC6CColor SetAmbientColor__13CCubeRendererFRC6CColor: @@ -7816,7 +7816,7 @@ SetAmbientColor__13CCubeRendererFRC6CColor: /* 802BCB04 002B9A64 80 01 00 14 */ lwz r0, 0x14(r1) /* 802BCB08 002B9A68 7C 08 03 A6 */ mtlr r0 /* 802BCB0C 002B9A6C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BCB10 002B9A70 4E 80 00 20 */ blr +/* 802BCB10 002B9A70 4E 80 00 20 */ blr .global EndPrimitive__13CCubeRendererFv EndPrimitive__13CCubeRendererFv: @@ -7835,7 +7835,7 @@ lbl_802BCB38: /* 802BCB40 002B9AA0 81 9E 00 00 */ lwz r12, 0(r30) /* 802BCB44 002B9AA4 81 8C 00 A8 */ lwz r12, 0xa8(r12) /* 802BCB48 002B9AA8 7D 89 03 A6 */ mtctr r12 -/* 802BCB4C 002B9AAC 4E 80 04 21 */ bctrl +/* 802BCB4C 002B9AAC 4E 80 04 21 */ bctrl lbl_802BCB50: /* 802BCB50 002B9AB0 80 1E 00 18 */ lwz r0, 0x18(r30) /* 802BCB54 002B9AB4 2C 00 00 00 */ cmpwi r0, 0 @@ -7846,7 +7846,7 @@ lbl_802BCB50: /* 802BCB68 002B9AC8 83 C1 00 08 */ lwz r30, 8(r1) /* 802BCB6C 002B9ACC 7C 08 03 A6 */ mtlr r0 /* 802BCB70 002B9AD0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BCB74 002B9AD4 4E 80 00 20 */ blr +/* 802BCB74 002B9AD4 4E 80 00 20 */ blr .global PrimNormal__13CCubeRendererFRC9CVector3f PrimNormal__13CCubeRendererFRC9CVector3f: @@ -7856,7 +7856,7 @@ PrimNormal__13CCubeRendererFRC9CVector3f: /* 802BCB84 002B9AE4 D0 03 02 E8 */ stfs f0, 0x2e8(r3) /* 802BCB88 002B9AE8 C0 04 00 08 */ lfs f0, 8(r4) /* 802BCB8C 002B9AEC D0 03 02 EC */ stfs f0, 0x2ec(r3) -/* 802BCB90 002B9AF0 4E 80 00 20 */ blr +/* 802BCB90 002B9AF0 4E 80 00 20 */ blr .global PrimVertex__13CCubeRendererFRC9CVector3f PrimVertex__13CCubeRendererFRC9CVector3f: @@ -7878,7 +7878,7 @@ PrimVertex__13CCubeRendererFRC9CVector3f: /* 802BCBD0 002B9B30 D0 25 80 00 */ stfs f1, 0xCC008000@l(r5) /* 802BCBD4 002B9B34 80 03 02 E0 */ lwz r0, 0x2e0(r3) /* 802BCBD8 002B9B38 90 05 80 00 */ stw r0, 0xCC008000@l(r5) -/* 802BCBDC 002B9B3C 4E 80 00 20 */ blr +/* 802BCBDC 002B9B3C 4E 80 00 20 */ blr .global BeginTriangleFan__13CCubeRendererFi BeginTriangleFan__13CCubeRendererFi: @@ -7891,7 +7891,7 @@ BeginTriangleFan__13CCubeRendererFi: /* 802BCBF8 002B9B58 80 01 00 14 */ lwz r0, 0x14(r1) /* 802BCBFC 002B9B5C 7C 08 03 A6 */ mtlr r0 /* 802BCC00 002B9B60 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BCC04 002B9B64 4E 80 00 20 */ blr +/* 802BCC04 002B9B64 4E 80 00 20 */ blr .global BeginTriangleStrip__13CCubeRendererFi BeginTriangleStrip__13CCubeRendererFi: @@ -7904,7 +7904,7 @@ BeginTriangleStrip__13CCubeRendererFi: /* 802BCC20 002B9B80 80 01 00 14 */ lwz r0, 0x14(r1) /* 802BCC24 002B9B84 7C 08 03 A6 */ mtlr r0 /* 802BCC28 002B9B88 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BCC2C 002B9B8C 4E 80 00 20 */ blr +/* 802BCC2C 002B9B8C 4E 80 00 20 */ blr .global BeginTriangles__13CCubeRendererFi BeginTriangles__13CCubeRendererFi: @@ -7917,7 +7917,7 @@ BeginTriangles__13CCubeRendererFi: /* 802BCC48 002B9BA8 80 01 00 14 */ lwz r0, 0x14(r1) /* 802BCC4C 002B9BAC 7C 08 03 A6 */ mtlr r0 /* 802BCC50 002B9BB0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BCC54 002B9BB4 4E 80 00 20 */ blr +/* 802BCC54 002B9BB4 4E 80 00 20 */ blr .global BeginLineStrip__13CCubeRendererFi BeginLineStrip__13CCubeRendererFi: @@ -7930,7 +7930,7 @@ BeginLineStrip__13CCubeRendererFi: /* 802BCC70 002B9BD0 80 01 00 14 */ lwz r0, 0x14(r1) /* 802BCC74 002B9BD4 7C 08 03 A6 */ mtlr r0 /* 802BCC78 002B9BD8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BCC7C 002B9BDC 4E 80 00 20 */ blr +/* 802BCC7C 002B9BDC 4E 80 00 20 */ blr .global BeginLines__13CCubeRendererFi BeginLines__13CCubeRendererFi: @@ -7943,7 +7943,7 @@ BeginLines__13CCubeRendererFi: /* 802BCC98 002B9BF8 80 01 00 14 */ lwz r0, 0x14(r1) /* 802BCC9C 002B9BFC 7C 08 03 A6 */ mtlr r0 /* 802BCCA0 002B9C00 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BCCA4 002B9C04 4E 80 00 20 */ blr +/* 802BCCA4 002B9C04 4E 80 00 20 */ blr .global BeginPrimitive__13CCubeRendererFQ29IRenderer14EPrimitiveTypei BeginPrimitive__13CCubeRendererFQ29IRenderer14EPrimitiveTypei: @@ -8016,13 +8016,13 @@ BeginPrimitive__13CCubeRendererFQ29IRenderer14EPrimitiveTypei: /* 802BCDB0 002B9D10 80 01 00 54 */ lwz r0, 0x54(r1) /* 802BCDB4 002B9D14 7C 08 03 A6 */ mtlr r0 /* 802BCDB8 002B9D18 38 21 00 50 */ addi r1, r1, 0x50 -/* 802BCDBC 002B9D1C 4E 80 00 20 */ blr +/* 802BCDBC 002B9D1C 4E 80 00 20 */ blr .global PrimColor__13CCubeRendererFRC6CColor PrimColor__13CCubeRendererFRC6CColor: /* 802BCDC0 002B9D20 80 04 00 00 */ lwz r0, 0(r4) /* 802BCDC4 002B9D24 90 03 02 E0 */ stw r0, 0x2e0(r3) -/* 802BCDC8 002B9D28 4E 80 00 20 */ blr +/* 802BCDC8 002B9D28 4E 80 00 20 */ blr .global PrimColor__13CCubeRendererFffff PrimColor__13CCubeRendererFffff: @@ -8034,7 +8034,7 @@ PrimColor__13CCubeRendererFffff: /* 802BCDE0 002B9D40 80 01 00 14 */ lwz r0, 0x14(r1) /* 802BCDE4 002B9D44 7C 08 03 A6 */ mtlr r0 /* 802BCDE8 002B9D48 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BCDEC 002B9D4C 4E 80 00 20 */ blr +/* 802BCDEC 002B9D4C 4E 80 00 20 */ blr .global AllocateRenderer__8RendererFR12IObjectStoreR10COsContextR10CMemorySysR11CResFactory AllocateRenderer__8RendererFR12IObjectStoreR10COsContextR10CMemorySysR11CResFactory: @@ -8078,7 +8078,7 @@ lbl_802BCE64: /* 802BCE7C 002B9DDC 83 81 00 10 */ lwz r28, 0x10(r1) /* 802BCE80 002B9DE0 7C 08 03 A6 */ mtlr r0 /* 802BCE84 002B9DE4 38 21 00 20 */ addi r1, r1, 0x20 -/* 802BCE88 002B9DE8 4E 80 00 20 */ blr +/* 802BCE88 002B9DE8 4E 80 00 20 */ blr .global "ActivateLightsForModel__13CCubeRendererFRCQ24rstl42vector<6CLight,Q24rstl17rmemory_allocator>RC6CAABox" "ActivateLightsForModel__13CCubeRendererFRCQ24rstl42vector<6CLight,Q24rstl17rmemory_allocator>RC6CAABox": @@ -8242,7 +8242,7 @@ lbl_802BD0D0: /* 802BD0D4 002BA034 80 01 00 94 */ lwz r0, 0x94(r1) /* 802BD0D8 002BA038 7C 08 03 A6 */ mtlr r0 /* 802BD0DC 002BA03C 38 21 00 90 */ addi r1, r1, 0x90 -/* 802BD0E0 002BA040 4E 80 00 20 */ blr +/* 802BD0E0 002BA040 4E 80 00 20 */ blr .global "DrawStaticGeometry__13CCubeRendererFRCQ24rstl42vector<6CLight,Q24rstl17rmemory_allocator>iUiUi" "DrawStaticGeometry__13CCubeRendererFRCQ24rstl42vector<6CLight,Q24rstl17rmemory_allocator>iUiUi": @@ -8270,7 +8270,7 @@ lbl_802BD0D0: /* 802BD138 002BA098 83 81 00 10 */ lwz r28, 0x10(r1) /* 802BD13C 002BA09C 7C 08 03 A6 */ mtlr r0 /* 802BD140 002BA0A0 38 21 00 20 */ addi r1, r1, 0x20 -/* 802BD144 002BA0A4 4E 80 00 20 */ blr +/* 802BD144 002BA0A4 4E 80 00 20 */ blr .global "DrawSortedGeometry__13CCubeRendererFRCQ24rstl42vector<6CLight,Q24rstl17rmemory_allocator>iUiUi" "DrawSortedGeometry__13CCubeRendererFRCQ24rstl42vector<6CLight,Q24rstl17rmemory_allocator>iUiUi": @@ -8336,7 +8336,7 @@ lbl_802BD1E0: /* 802BD214 002BA174 80 01 00 24 */ lwz r0, 0x24(r1) /* 802BD218 002BA178 7C 08 03 A6 */ mtlr r0 /* 802BD21C 002BA17C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802BD220 002BA180 4E 80 00 20 */ blr +/* 802BD220 002BA180 4E 80 00 20 */ blr .global "DrawUnsortedGeometry__13CCubeRendererFRCQ24rstl42vector<6CLight,Q24rstl17rmemory_allocator>iUiUi" "DrawUnsortedGeometry__13CCubeRendererFRCQ24rstl42vector<6CLight,Q24rstl17rmemory_allocator>iUiUi": @@ -8475,7 +8475,7 @@ lbl_802BD3D8: /* 802BD3F0 002BA350 80 01 00 44 */ lwz r0, 0x44(r1) /* 802BD3F4 002BA354 7C 08 03 A6 */ mtlr r0 /* 802BD3F8 002BA358 38 21 00 40 */ addi r1, r1, 0x40 -/* 802BD3FC 002BA35C 4E 80 00 20 */ blr +/* 802BD3FC 002BA35C 4E 80 00 20 */ blr .global "HandleUnsortedModelWireframe__13CCubeRendererFRCQ24rstl42vector<6CLight,Q24rstl17rmemory_allocator>R10CCubeModel" "HandleUnsortedModelWireframe__13CCubeRendererFRCQ24rstl42vector<6CLight,Q24rstl17rmemory_allocator>R10CCubeModel": @@ -8524,7 +8524,7 @@ lbl_802BD488: /* 802BD498 002BA3F8 80 01 00 34 */ lwz r0, 0x34(r1) /* 802BD49C 002BA3FC 7C 08 03 A6 */ mtlr r0 /* 802BD4A0 002BA400 38 21 00 30 */ addi r1, r1, 0x30 -/* 802BD4A4 002BA404 4E 80 00 20 */ blr +/* 802BD4A4 002BA404 4E 80 00 20 */ blr .global "HandleUnsortedModel__13CCubeRendererFRCQ24rstl42vector<6CLight,Q24rstl17rmemory_allocator>R10CCubeModel" "HandleUnsortedModel__13CCubeRendererFRCQ24rstl42vector<6CLight,Q24rstl17rmemory_allocator>R10CCubeModel": @@ -8566,7 +8566,7 @@ lbl_802BD51C: /* 802BD52C 002BA48C 83 81 00 10 */ lwz r28, 0x10(r1) /* 802BD530 002BA490 7C 08 03 A6 */ mtlr r0 /* 802BD534 002BA494 38 21 00 20 */ addi r1, r1, 0x20 -/* 802BD538 002BA498 4E 80 00 20 */ blr +/* 802BD538 002BA498 4E 80 00 20 */ blr .global "RenderBucketItems__13CCubeRendererFRCQ24rstl42vector<6CLight,Q24rstl17rmemory_allocator>" "RenderBucketItems__13CCubeRendererFRCQ24rstl42vector<6CLight,Q24rstl17rmemory_allocator>": @@ -8609,7 +8609,7 @@ lbl_802BD5B8: /* 802BD5BC 002BA51C 81 83 00 00 */ lwz r12, 0(r3) /* 802BD5C0 002BA520 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802BD5C4 002BA524 7D 89 03 A6 */ mtctr r12 -/* 802BD5C8 002BA528 4E 80 04 21 */ bctrl +/* 802BD5C8 002BA528 4E 80 04 21 */ bctrl /* 802BD5CC 002BA52C 48 00 00 90 */ b lbl_802BD65C lbl_802BD5D0: /* 802BD5D0 002BA530 7C 04 B0 00 */ cmpw r4, r22 @@ -8650,7 +8650,7 @@ lbl_802BD638: /* 802BD64C 002BA5AC 38 A4 FF FE */ addi r5, r4, -2 /* 802BD650 002BA5B0 80 9A 00 AC */ lwz r4, 0xac(r26) /* 802BD654 002BA5B4 7D 89 03 A6 */ mtctr r12 -/* 802BD658 002BA5B8 4E 80 04 21 */ bctrl +/* 802BD658 002BA5B8 4E 80 04 21 */ bctrl lbl_802BD65C: /* 802BD65C 002BA5BC 7E C4 B3 78 */ mr r4, r22 /* 802BD660 002BA5C0 3B 18 00 04 */ addi r24, r24, 4 @@ -8673,11 +8673,11 @@ lbl_802BD680: /* 802BD69C 002BA5FC 80 01 00 44 */ lwz r0, 0x44(r1) /* 802BD6A0 002BA600 7C 08 03 A6 */ mtlr r0 /* 802BD6A4 002BA604 38 21 00 40 */ addi r1, r1, 0x40 -/* 802BD6A8 002BA608 4E 80 00 20 */ blr +/* 802BD6A8 002BA608 4E 80 00 20 */ blr .global DrawRenderBucketsDebug__13CCubeRendererFv DrawRenderBucketsDebug__13CCubeRendererFv: -/* 802BD6AC 002BA60C 4E 80 00 20 */ blr +/* 802BD6AC 002BA60C 4E 80 00 20 */ blr .global AddWorldSurfaces__13CCubeRendererFR10CCubeModel AddWorldSurfaces__13CCubeRendererFR10CCubeModel: @@ -8741,7 +8741,7 @@ lbl_802BD77C: /* 802BD78C 002BA6EC 80 01 00 74 */ lwz r0, 0x74(r1) /* 802BD790 002BA6F0 7C 08 03 A6 */ mtlr r0 /* 802BD794 002BA6F4 38 21 00 70 */ addi r1, r1, 0x70 -/* 802BD798 002BA6F8 4E 80 00 20 */ blr +/* 802BD798 002BA6F8 4E 80 00 20 */ blr .global SetupCGraphicsStates__13CCubeRendererFv SetupCGraphicsStates__13CCubeRendererFv: @@ -8781,7 +8781,7 @@ SetupCGraphicsStates__13CCubeRendererFv: /* 802BD820 002BA780 80 01 00 14 */ lwz r0, 0x14(r1) /* 802BD824 002BA784 7C 08 03 A6 */ mtlr r0 /* 802BD828 002BA788 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BD82C 002BA78C 4E 80 00 20 */ blr +/* 802BD82C 002BA78C 4E 80 00 20 */ blr .global SetupRendererStates__13CCubeRendererFb SetupRendererStates__13CCubeRendererFb: @@ -8815,7 +8815,7 @@ SetupRendererStates__13CCubeRendererFb: /* 802BD89C 002BA7FC 83 C1 00 18 */ lwz r30, 0x18(r1) /* 802BD8A0 002BA800 7C 08 03 A6 */ mtlr r0 /* 802BD8A4 002BA804 38 21 00 20 */ addi r1, r1, 0x20 -/* 802BD8A8 002BA808 4E 80 00 20 */ blr +/* 802BD8A8 002BA808 4E 80 00 20 */ blr .global AddDrawable__13CCubeRendererFPCvRC9CVector3fRC6CAABoxiQ29IRenderer16EDrawableSorting AddDrawable__13CCubeRendererFPCvRC9CVector3fRC6CAABoxiQ29IRenderer16EDrawableSorting: @@ -8831,7 +8831,7 @@ AddDrawable__13CCubeRendererFPCvRC9CVector3fRC6CAABoxiQ29IRenderer16EDrawableSor /* 802BD8D0 002BA830 7C E5 3B 78 */ mr r5, r7 /* 802BD8D4 002BA834 80 88 00 AC */ lwz r4, 0xac(r8) /* 802BD8D8 002BA838 7D 89 03 A6 */ mtctr r12 -/* 802BD8DC 002BA83C 4E 80 04 21 */ bctrl +/* 802BD8DC 002BA83C 4E 80 04 21 */ bctrl /* 802BD8E0 002BA840 48 00 00 20 */ b lbl_802BD900 lbl_802BD8E4: /* 802BD8E4 002BA844 7C A3 2B 78 */ mr r3, r5 @@ -8845,7 +8845,7 @@ lbl_802BD900: /* 802BD900 002BA860 80 01 00 14 */ lwz r0, 0x14(r1) /* 802BD904 002BA864 7C 08 03 A6 */ mtlr r0 /* 802BD908 002BA868 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BD90C 002BA86C 4E 80 00 20 */ blr +/* 802BD90C 002BA86C 4E 80 00 20 */ blr .global AddPlaneObject__13CCubeRendererFPCvRC6CAABoxRC6CPlanei AddPlaneObject__13CCubeRendererFPCvRC6CAABoxRC6CPlanei: @@ -8981,7 +8981,7 @@ lbl_802BDAE8: /* 802BDAF4 002BAA54 80 01 00 64 */ lwz r0, 0x64(r1) /* 802BDAF8 002BAA58 7C 08 03 A6 */ mtlr r0 /* 802BDAFC 002BAA5C 38 21 00 60 */ addi r1, r1, 0x60 -/* 802BDB00 002BAA60 4E 80 00 20 */ blr +/* 802BDB00 002BAA60 4E 80 00 20 */ blr .global sub_802bdb04 sub_802bdb04: @@ -9000,7 +9000,7 @@ sub_802bdb04: /* 802BDB34 002BAA94 80 01 00 14 */ lwz r0, 0x14(r1) /* 802BDB38 002BAA98 7C 08 03 A6 */ mtlr r0 /* 802BDB3C 002BAA9C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BDB40 002BAAA0 4E 80 00 20 */ blr +/* 802BDB40 002BAAA0 4E 80 00 20 */ blr .global AddParticleGen__13CCubeRendererFRC12CParticleGen AddParticleGen__13CCubeRendererFRC12CParticleGen: @@ -9015,7 +9015,7 @@ AddParticleGen__13CCubeRendererFRC12CParticleGen: /* 802BDB64 002BAAC4 81 84 00 00 */ lwz r12, 0(r4) /* 802BDB68 002BAAC8 81 8C 00 5C */ lwz r12, 0x5c(r12) /* 802BDB6C 002BAACC 7D 89 03 A6 */ mtctr r12 -/* 802BDB70 002BAAD0 4E 80 04 21 */ bctrl +/* 802BDB70 002BAAD0 4E 80 04 21 */ bctrl /* 802BDB74 002BAAD4 88 01 00 38 */ lbz r0, 0x38(r1) /* 802BDB78 002BAAD8 28 00 00 00 */ cmplwi r0, 0 /* 802BDB7C 002BAADC 98 01 00 54 */ stb r0, 0x54(r1) @@ -9065,7 +9065,7 @@ lbl_802BDC14: /* 802BDC24 002BAB84 83 C1 00 58 */ lwz r30, 0x58(r1) /* 802BDC28 002BAB88 7C 08 03 A6 */ mtlr r0 /* 802BDC2C 002BAB8C 38 21 00 60 */ addi r1, r1, 0x60 -/* 802BDC30 002BAB90 4E 80 00 20 */ blr +/* 802BDC30 002BAB90 4E 80 00 20 */ blr .global EndScene__13CCubeRendererFv EndScene__13CCubeRendererFv: @@ -9097,7 +9097,7 @@ lbl_802BDC8C: /* 802BDC90 002BABF0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802BDC94 002BABF4 7C 08 03 A6 */ mtlr r0 /* 802BDC98 002BABF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BDC9C 002BABFC 4E 80 00 20 */ blr +/* 802BDC9C 002BABFC 4E 80 00 20 */ blr .global BeginScene__13CCubeRendererFv BeginScene__13CCubeRendererFv: @@ -9191,7 +9191,7 @@ lbl_802BDDB4: /* 802BDDF4 002BAD54 83 A1 00 14 */ lwz r29, 0x14(r1) /* 802BDDF8 002BAD58 7C 08 03 A6 */ mtlr r0 /* 802BDDFC 002BAD5C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802BDE00 002BAD60 4E 80 00 20 */ blr +/* 802BDE00 002BAD60 4E 80 00 20 */ blr .global SetWorldViewpoint__13CCubeRendererFRC12CTransform4f SetWorldViewpoint__13CCubeRendererFRC12CTransform4f: @@ -9222,7 +9222,7 @@ SetWorldViewpoint__13CCubeRendererFRC12CTransform4f: /* 802BDE64 002BADC4 80 01 00 14 */ lwz r0, 0x14(r1) /* 802BDE68 002BADC8 7C 08 03 A6 */ mtlr r0 /* 802BDE6C 002BADCC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BDE70 002BADD0 4E 80 00 20 */ blr +/* 802BDE70 002BADD0 4E 80 00 20 */ blr .global SetModelMatrix__13CCubeRendererFRC12CTransform4f SetModelMatrix__13CCubeRendererFRC12CTransform4f: @@ -9234,7 +9234,7 @@ SetModelMatrix__13CCubeRendererFRC12CTransform4f: /* 802BDE88 002BADE8 80 01 00 14 */ lwz r0, 0x14(r1) /* 802BDE8C 002BADEC 7C 08 03 A6 */ mtlr r0 /* 802BDE90 002BADF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BDE94 002BADF4 4E 80 00 20 */ blr +/* 802BDE94 002BADF4 4E 80 00 20 */ blr .global "RemoveStaticGeometry__13CCubeRendererFPCQ24rstl58vector<21CMetroidModelInstance,Q24rstl17rmemory_allocator>" "RemoveStaticGeometry__13CCubeRendererFPCQ24rstl58vector<21CMetroidModelInstance,Q24rstl17rmemory_allocator>": @@ -9258,7 +9258,7 @@ lbl_802BDED4: /* 802BDED8 002BAE38 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802BDEDC 002BAE3C 7C 08 03 A6 */ mtlr r0 /* 802BDEE0 002BAE40 38 21 00 20 */ addi r1, r1, 0x20 -/* 802BDEE4 002BAE44 4E 80 00 20 */ blr +/* 802BDEE4 002BAE44 4E 80 00 20 */ blr .global "FindStaticGeometry__13CCubeRendererFPCQ24rstl58vector<21CMetroidModelInstance,Q24rstl17rmemory_allocator>" "FindStaticGeometry__13CCubeRendererFPCQ24rstl58vector<21CMetroidModelInstance,Q24rstl17rmemory_allocator>": @@ -9270,14 +9270,14 @@ lbl_802BDEF4: /* 802BDEF8 002BAE58 7C 00 28 40 */ cmplw r0, r5 /* 802BDEFC 002BAE5C 40 82 00 0C */ bne lbl_802BDF08 /* 802BDF00 002BAE60 90 C3 00 00 */ stw r6, 0(r3) -/* 802BDF04 002BAE64 4E 80 00 20 */ blr +/* 802BDF04 002BAE64 4E 80 00 20 */ blr lbl_802BDF08: /* 802BDF08 002BAE68 80 C6 00 04 */ lwz r6, 4(r6) lbl_802BDF0C: /* 802BDF0C 002BAE6C 7C 06 20 40 */ cmplw r6, r4 /* 802BDF10 002BAE70 40 82 FF E4 */ bne lbl_802BDEF4 /* 802BDF14 002BAE74 90 83 00 00 */ stw r4, 0(r3) -/* 802BDF18 002BAE78 4E 80 00 20 */ blr +/* 802BDF18 002BAE78 4E 80 00 20 */ blr .global "AddStaticGeometry__13CCubeRendererFPCQ24rstl58vector<21CMetroidModelInstance,Q24rstl17rmemory_allocator>PC12CAreaOctTreei" "AddStaticGeometry__13CCubeRendererFPCQ24rstl58vector<21CMetroidModelInstance,Q24rstl17rmemory_allocator>PC12CAreaOctTreei": @@ -9448,7 +9448,7 @@ lbl_802BE17C: /* 802BE180 002BB0E0 80 01 00 94 */ lwz r0, 0x94(r1) /* 802BE184 002BB0E4 7C 08 03 A6 */ mtlr r0 /* 802BE188 002BB0E8 38 21 00 90 */ addi r1, r1, 0x90 -/* 802BE18C 002BB0EC 4E 80 00 20 */ blr +/* 802BE18C 002BB0EC 4E 80 00 20 */ blr .global sub_802be190 sub_802be190: @@ -9461,7 +9461,7 @@ sub_802be190: /* 802BE1A8 002BB108 80 01 00 14 */ lwz r0, 0x14(r1) /* 802BE1AC 002BB10C 7C 08 03 A6 */ mtlr r0 /* 802BE1B0 002BB110 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BE1B4 002BB114 4E 80 00 20 */ blr +/* 802BE1B4 002BB114 4E 80 00 20 */ blr .global sub_802be1b8 sub_802be1b8: @@ -9493,7 +9493,7 @@ lbl_802BE1F4: /* 802BE218 002BB178 83 C1 00 08 */ lwz r30, 8(r1) /* 802BE21C 002BB17C 7C 08 03 A6 */ mtlr r0 /* 802BE220 002BB180 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BE224 002BB184 4E 80 00 20 */ blr +/* 802BE224 002BB184 4E 80 00 20 */ blr .global sub_802be228 sub_802be228: @@ -9531,7 +9531,7 @@ lbl_802BE288: /* 802BE29C 002BB1FC 83 81 00 10 */ lwz r28, 0x10(r1) /* 802BE2A0 002BB200 7C 08 03 A6 */ mtlr r0 /* 802BE2A4 002BB204 38 21 00 20 */ addi r1, r1, 0x20 -/* 802BE2A8 002BB208 4E 80 00 20 */ blr +/* 802BE2A8 002BB208 4E 80 00 20 */ blr .global sub_802be2ac sub_802be2ac: @@ -9607,7 +9607,7 @@ lbl_802BE39C: /* 802BE3A8 002BB308 83 C1 00 08 */ lwz r30, 8(r1) /* 802BE3AC 002BB30C 7C 08 03 A6 */ mtlr r0 /* 802BE3B0 002BB310 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BE3B4 002BB314 4E 80 00 20 */ blr +/* 802BE3B4 002BB314 4E 80 00 20 */ blr .global sub_802be3b8 sub_802be3b8: @@ -9657,7 +9657,7 @@ lbl_802BE448: /* 802BE454 002BB3B4 83 C1 00 18 */ lwz r30, 0x18(r1) /* 802BE458 002BB3B8 7C 08 03 A6 */ mtlr r0 /* 802BE45C 002BB3BC 38 21 00 20 */ addi r1, r1, 0x20 -/* 802BE460 002BB3C0 4E 80 00 20 */ blr +/* 802BE460 002BB3C0 4E 80 00 20 */ blr .global sub_802be464 sub_802be464: @@ -9687,7 +9687,7 @@ lbl_802BE4AC: /* 802BE4B8 002BB418 83 C1 00 08 */ lwz r30, 8(r1) /* 802BE4BC 002BB41C 7C 08 03 A6 */ mtlr r0 /* 802BE4C0 002BB420 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BE4C4 002BB424 4E 80 00 20 */ blr +/* 802BE4C4 002BB424 4E 80 00 20 */ blr .global sub_802be4c8 sub_802be4c8: @@ -9740,7 +9740,7 @@ lbl_802BE558: /* 802BE56C 002BB4CC 83 81 00 20 */ lwz r28, 0x20(r1) /* 802BE570 002BB4D0 7C 08 03 A6 */ mtlr r0 /* 802BE574 002BB4D4 38 21 00 30 */ addi r1, r1, 0x30 -/* 802BE578 002BB4D8 4E 80 00 20 */ blr +/* 802BE578 002BB4D8 4E 80 00 20 */ blr .global sub_802be57c sub_802be57c: @@ -9770,7 +9770,7 @@ lbl_802BE5C4: /* 802BE5D0 002BB530 83 C1 00 08 */ lwz r30, 8(r1) /* 802BE5D4 002BB534 7C 08 03 A6 */ mtlr r0 /* 802BE5D8 002BB538 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BE5DC 002BB53C 4E 80 00 20 */ blr +/* 802BE5DC 002BB53C 4E 80 00 20 */ blr .global sub_802be5e0 sub_802be5e0: @@ -9824,7 +9824,7 @@ lbl_802BE674: /* 802BE688 002BB5E8 83 81 00 20 */ lwz r28, 0x20(r1) /* 802BE68C 002BB5EC 7C 08 03 A6 */ mtlr r0 /* 802BE690 002BB5F0 38 21 00 30 */ addi r1, r1, 0x30 -/* 802BE694 002BB5F4 4E 80 00 20 */ blr +/* 802BE694 002BB5F4 4E 80 00 20 */ blr .global __dt__13CCubeRendererFv __dt__13CCubeRendererFv: @@ -10002,7 +10002,7 @@ lbl_802BE8EC: /* 802BE8F8 002BB858 83 C1 00 28 */ lwz r30, 0x28(r1) /* 802BE8FC 002BB85C 7C 08 03 A6 */ mtlr r0 /* 802BE900 002BB860 38 21 00 30 */ addi r1, r1, 0x30 -/* 802BE904 002BB864 4E 80 00 20 */ blr +/* 802BE904 002BB864 4E 80 00 20 */ blr .global sub_802be908 sub_802be908: @@ -10022,7 +10022,7 @@ sub_802be908: /* 802BE93C 002BB89C 81 84 00 00 */ lwz r12, 0(r4) /* 802BE940 002BB8A0 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802BE944 002BB8A4 7D 89 03 A6 */ mtctr r12 -/* 802BE948 002BB8A8 4E 80 04 21 */ bctrl +/* 802BE948 002BB8A8 4E 80 04 21 */ bctrl /* 802BE94C 002BB8AC 3B C1 00 10 */ addi r30, r1, 0x10 /* 802BE950 002BB8B0 38 81 00 08 */ addi r4, r1, 8 /* 802BE954 002BB8B4 7F C3 F3 78 */ mr r3, r30 @@ -10125,7 +10125,7 @@ lbl_802BEAAC: /* 802BEAC8 002BBA28 83 C1 00 28 */ lwz r30, 0x28(r1) /* 802BEACC 002BBA2C 7C 08 03 A6 */ mtlr r0 /* 802BEAD0 002BBA30 38 21 00 30 */ addi r1, r1, 0x30 -/* 802BEAD4 002BBA34 4E 80 00 20 */ blr +/* 802BEAD4 002BBA34 4E 80 00 20 */ blr .global sub_802bead8 sub_802bead8: @@ -10225,7 +10225,7 @@ lbl_802BEB74: /* 802BEC44 002BBBA4 80 01 00 94 */ lwz r0, 0x94(r1) /* 802BEC48 002BBBA8 7C 08 03 A6 */ mtlr r0 /* 802BEC4C 002BBBAC 38 21 00 90 */ addi r1, r1, 0x90 -/* 802BEC50 002BBBB0 4E 80 00 20 */ blr +/* 802BEC50 002BBBB0 4E 80 00 20 */ blr .global sub_802bec54 sub_802bec54: @@ -10357,7 +10357,7 @@ lbl_802BED40: /* 802BEE40 002BBDA0 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 802BEE44 002BBDA4 7C 08 03 A6 */ mtlr r0 /* 802BEE48 002BBDA8 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 802BEE4C 002BBDAC 4E 80 00 20 */ blr +/* 802BEE4C 002BBDAC 4E 80 00 20 */ blr .global sub_802bee50 sub_802bee50: @@ -10497,7 +10497,7 @@ lbl_802BEF70: /* 802BF050 002BBFB0 80 01 00 D4 */ lwz r0, 0xd4(r1) /* 802BF054 002BBFB4 7C 08 03 A6 */ mtlr r0 /* 802BF058 002BBFB8 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 802BF05C 002BBFBC 4E 80 00 20 */ blr +/* 802BF05C 002BBFBC 4E 80 00 20 */ blr .global __ct__13CCubeRendererFR12IObjectStoreR10COsContextR10CMemorySysR11CResFactory __ct__13CCubeRendererFR12IObjectStoreR10COsContextR10CMemorySysR11CResFactory: @@ -10693,7 +10693,7 @@ __ct__13CCubeRendererFR12IObjectStoreR10COsContextR10CMemorySysR11CResFactory: /* 802BF354 002BC2B4 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802BF358 002BC2B8 7C 08 03 A6 */ mtlr r0 /* 802BF35C 002BC2BC 38 21 00 20 */ addi r1, r1, 0x20 -/* 802BF360 002BC2C0 4E 80 00 20 */ blr +/* 802BF360 002BC2C0 4E 80 00 20 */ blr .global __ct__Q213CCubeRenderer13CAreaListItem __ct__Q213CCubeRenderer13CAreaListItem: @@ -10714,7 +10714,7 @@ __ct__Q213CCubeRenderer13CAreaListItem: /* 802BF39C 002BC2FC 91 23 00 20 */ stw r9, 0x20(r3) /* 802BF3A0 002BC300 91 23 00 24 */ stw r9, 0x24(r3) /* 802BF3A4 002BC304 91 23 00 28 */ stw r9, 0x28(r3) -/* 802BF3A8 002BC308 4E 80 00 20 */ blr +/* 802BF3A8 002BC308 4E 80 00 20 */ blr .global Clear__7BucketsFv Clear__7BucketsFv: @@ -10865,7 +10865,7 @@ lbl_802BF56C: /* 802BF594 002BC4F4 38 6D A6 14 */ addi r3, r13, lbl_805A91D4@sda21 /* 802BF598 002BC4F8 D0 2D A6 14 */ stfs f1, lbl_805A91D4@sda21(r13) /* 802BF59C 002BC4FC D0 03 00 04 */ stfs f0, 4(r3) -/* 802BF5A0 002BC500 4E 80 00 20 */ blr +/* 802BF5A0 002BC500 4E 80 00 20 */ blr .global Sort__7BucketsFv Sort__7BucketsFv: @@ -11264,7 +11264,7 @@ lbl_802BFAE8: /* 802BFB0C 002BCA6C 80 01 00 94 */ lwz r0, 0x94(r1) /* 802BFB10 002BCA70 7C 08 03 A6 */ mtlr r0 /* 802BFB14 002BCA74 38 21 00 90 */ addi r1, r1, 0x90 -/* 802BFB18 002BCA78 4E 80 00 20 */ blr +/* 802BFB18 002BCA78 4E 80 00 20 */ blr .global InsertPlaneObject__7BucketsFffRC6CAABoxbRC6CPlaneb13EDrawableTypePCv InsertPlaneObject__7BucketsFffRC6CAABoxbRC6CPlaneb13EDrawableTypePCv: @@ -11298,7 +11298,7 @@ lbl_802BFB7C: /* 802BFB84 002BCAE4 83 C1 00 48 */ lwz r30, 0x48(r1) /* 802BFB88 002BCAE8 7C 08 03 A6 */ mtlr r0 /* 802BFB8C 002BCAEC 38 21 00 50 */ addi r1, r1, 0x50 -/* 802BFB90 002BCAF0 4E 80 00 20 */ blr +/* 802BFB90 002BCAF0 4E 80 00 20 */ blr .global "push_back__Q24rstl41reserved_vector<20CDrawablePlaneObject,8>FRC20CDrawablePlaneObject" "push_back__Q24rstl41reserved_vector<20CDrawablePlaneObject,8>FRC20CDrawablePlaneObject": @@ -11319,7 +11319,7 @@ lbl_802BFB7C: /* 802BFBCC 002BCB2C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802BFBD0 002BCB30 7C 08 03 A6 */ mtlr r0 /* 802BFBD4 002BCB34 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BFBD8 002BCB38 4E 80 00 20 */ blr +/* 802BFBD8 002BCB38 4E 80 00 20 */ blr .global "construct<20CDrawablePlaneObject>__4rstlFPvRC20CDrawablePlaneObject" "construct<20CDrawablePlaneObject>__4rstlFPvRC20CDrawablePlaneObject": @@ -11333,7 +11333,7 @@ lbl_802BFBF4: /* 802BFBF4 002BCB54 80 01 00 14 */ lwz r0, 0x14(r1) /* 802BFBF8 002BCB58 7C 08 03 A6 */ mtlr r0 /* 802BFBFC 002BCB5C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BFC00 002BCB60 4E 80 00 20 */ blr +/* 802BFC00 002BCB60 4E 80 00 20 */ blr .global __ct__20CDrawablePlaneObjectFRC20CDrawablePlaneObject __ct__20CDrawablePlaneObjectFRC20CDrawablePlaneObject: @@ -11371,7 +11371,7 @@ __ct__20CDrawablePlaneObjectFRC20CDrawablePlaneObject: /* 802BFC80 002BCBE0 D0 03 00 38 */ stfs f0, 0x38(r3) /* 802BFC84 002BCBE4 88 04 00 3C */ lbz r0, 0x3c(r4) /* 802BFC88 002BCBE8 98 03 00 3C */ stb r0, 0x3c(r3) -/* 802BFC8C 002BCBEC 4E 80 00 20 */ blr +/* 802BFC8C 002BCBEC 4E 80 00 20 */ blr .global __ct__20CDrawablePlaneObjectF13EDrawableTypeffRC6CAABoxbRC6CPlanebPCv __ct__20CDrawablePlaneObjectF13EDrawableTypeffRC6CAABoxbRC6CPlanebPCv: @@ -11408,7 +11408,7 @@ __ct__20CDrawablePlaneObjectF13EDrawableTypeffRC6CAABoxbRC6CPlanebPCv: /* 802BFD08 002BCC68 88 03 00 3C */ lbz r0, 0x3c(r3) /* 802BFD0C 002BCC6C 51 00 36 72 */ rlwimi r0, r8, 6, 0x19, 0x19 /* 802BFD10 002BCC70 98 03 00 3C */ stb r0, 0x3c(r3) -/* 802BFD14 002BCC74 4E 80 00 20 */ blr +/* 802BFD14 002BCC74 4E 80 00 20 */ blr .global Insert__7BucketsFRC9CVector3fRC6CAABox13EDrawableTypePCvRC6CPlaneUs Insert__7BucketsFRC9CVector3fRC6CAABox13EDrawableTypePCvRC6CPlaneUs: @@ -11498,7 +11498,7 @@ lbl_802BFE2C: /* 802BFE50 002BCDB0 7C 00 02 2C */ dcbt 0, r0 lbl_802BFE54: /* 802BFE54 002BCDB4 38 21 00 30 */ addi r1, r1, 0x30 -/* 802BFE58 002BCDB8 4E 80 00 20 */ blr +/* 802BFE58 002BCDB8 4E 80 00 20 */ blr .global Shutdown__7BucketsFv Shutdown__7BucketsFv: @@ -11507,7 +11507,7 @@ Shutdown__7BucketsFv: /* 802BFE64 002BCDC4 90 0D A6 10 */ stw r0, lbl_805A91D0@sda21(r13) /* 802BFE68 002BCDC8 90 0D A6 1C */ stw r0, lbl_805A91DC@sda21(r13) /* 802BFE6C 002BCDCC 90 0D A6 20 */ stw r0, lbl_805A91E0@sda21(r13) -/* 802BFE70 002BCDD0 4E 80 00 20 */ blr +/* 802BFE70 002BCDD0 4E 80 00 20 */ blr .global Init__7BucketsFv Init__7BucketsFv: @@ -11613,7 +11613,7 @@ lbl_802BFFB0: /* 802BFFC8 002BCF28 D0 2D A6 14 */ stfs f1, lbl_805A91D4@sda21(r13) /* 802BFFCC 002BCF2C D0 03 00 04 */ stfs f0, 4(r3) /* 802BFFD0 002BCF30 38 21 02 10 */ addi r1, r1, 0x210 -/* 802BFFD4 002BCF34 4E 80 00 20 */ blr +/* 802BFFD4 002BCF34 4E 80 00 20 */ blr .global "__nw__27TOneStatic<13CCubeRenderer>FUlPCcPCc" "__nw__27TOneStatic<13CCubeRenderer>FUlPCcPCc": @@ -11628,7 +11628,7 @@ lbl_802BFFB0: /* 802BFFF8 002BCF58 80 01 00 14 */ lwz r0, 0x14(r1) /* 802BFFFC 002BCF5C 7C 08 03 A6 */ mtlr r0 /* 802C0000 002BCF60 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C0004 002BCF64 4E 80 00 20 */ blr +/* 802C0004 002BCF64 4E 80 00 20 */ blr .global sub_802c0008 sub_802c0008: @@ -11642,13 +11642,13 @@ sub_802c0008: /* 802C0024 002BCF84 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C0028 002BCF88 7C 08 03 A6 */ mtlr r0 /* 802C002C 002BCF8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C0030 002BCF90 4E 80 00 20 */ blr +/* 802C0030 002BCF90 4E 80 00 20 */ blr .global sub_802c0034 sub_802c0034: /* 802C0034 002BCF94 3C 60 80 48 */ lis r3, lbl_80479178@ha /* 802C0038 002BCF98 38 63 91 78 */ addi r3, r3, lbl_80479178@l -/* 802C003C 002BCF9C 4E 80 00 20 */ blr +/* 802C003C 002BCF9C 4E 80 00 20 */ blr .global sub_802c0040 sub_802c0040: @@ -11661,7 +11661,7 @@ sub_802c0040: /* 802C0058 002BCFB8 98 0D A6 34 */ stb r0, lbl_805A91F4@sda21(r13) lbl_802C005C: /* 802C005C 002BCFBC 38 6D A6 30 */ addi r3, r13, lbl_805A91F0@sda21 -/* 802C0060 002BCFC0 4E 80 00 20 */ blr +/* 802C0060 002BCFC0 4E 80 00 20 */ blr .global sub_802c0064 sub_802c0064: @@ -11753,7 +11753,7 @@ lbl_802C0194: /* 802C0198 002BD0F8 80 01 00 34 */ lwz r0, 0x34(r1) /* 802C019C 002BD0FC 7C 08 03 A6 */ mtlr r0 /* 802C01A0 002BD100 38 21 00 30 */ addi r1, r1, 0x30 -/* 802C01A4 002BD104 4E 80 00 20 */ blr +/* 802C01A4 002BD104 4E 80 00 20 */ blr .global sub_802c01a8 sub_802c01a8: @@ -11859,7 +11859,7 @@ lbl_802C0300: /* 802C0304 002BD264 80 01 00 34 */ lwz r0, 0x34(r1) /* 802C0308 002BD268 7C 08 03 A6 */ mtlr r0 /* 802C030C 002BD26C 38 21 00 30 */ addi r1, r1, 0x30 -/* 802C0310 002BD270 4E 80 00 20 */ blr +/* 802C0310 002BD270 4E 80 00 20 */ blr .global sub_802c0314 sub_802c0314: @@ -11901,7 +11901,7 @@ lbl_802C037C: /* 802C0398 002BD2F8 80 01 00 24 */ lwz r0, 0x24(r1) /* 802C039C 002BD2FC 7C 08 03 A6 */ mtlr r0 /* 802C03A0 002BD300 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C03A4 002BD304 4E 80 00 20 */ blr +/* 802C03A4 002BD304 4E 80 00 20 */ blr .global sub_802c03a8 sub_802c03a8: @@ -11944,7 +11944,7 @@ lbl_802C0418: /* 802C042C 002BD38C 83 81 00 10 */ lwz r28, 0x10(r1) /* 802C0430 002BD390 7C 08 03 A6 */ mtlr r0 /* 802C0434 002BD394 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C0438 002BD398 4E 80 00 20 */ blr +/* 802C0438 002BD398 4E 80 00 20 */ blr .global sub_802c043c sub_802c043c: @@ -12002,7 +12002,7 @@ lbl_802C04D8: /* 802C04F8 002BD458 80 01 00 24 */ lwz r0, 0x24(r1) /* 802C04FC 002BD45C 7C 08 03 A6 */ mtlr r0 /* 802C0500 002BD460 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C0504 002BD464 4E 80 00 20 */ blr +/* 802C0504 002BD464 4E 80 00 20 */ blr .global sub_802c0508 sub_802c0508: @@ -12053,7 +12053,7 @@ lbl_802C059C: /* 802C05A4 002BD504 80 01 00 24 */ lwz r0, 0x24(r1) /* 802C05A8 002BD508 7C 08 03 A6 */ mtlr r0 /* 802C05AC 002BD50C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C05B0 002BD510 4E 80 00 20 */ blr +/* 802C05B0 002BD510 4E 80 00 20 */ blr .global sub_802c05b4 sub_802c05b4: @@ -12089,7 +12089,7 @@ lbl_802C0608: /* 802C0620 002BD580 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C0624 002BD584 7C 08 03 A6 */ mtlr r0 /* 802C0628 002BD588 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C062C 002BD58C 4E 80 00 20 */ blr +/* 802C062C 002BD58C 4E 80 00 20 */ blr .global sub_802c0630 sub_802c0630: @@ -12125,7 +12125,7 @@ lbl_802C0688: /* 802C0698 002BD5F8 83 A1 00 14 */ lwz r29, 0x14(r1) /* 802C069C 002BD5FC 7C 08 03 A6 */ mtlr r0 /* 802C06A0 002BD600 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C06A4 002BD604 4E 80 00 20 */ blr +/* 802C06A4 002BD604 4E 80 00 20 */ blr .global sub_802c06a8 sub_802c06a8: @@ -12204,7 +12204,7 @@ lbl_802C079C: /* 802C07A0 002BD700 80 01 00 34 */ lwz r0, 0x34(r1) /* 802C07A4 002BD704 7C 08 03 A6 */ mtlr r0 /* 802C07A8 002BD708 38 21 00 30 */ addi r1, r1, 0x30 -/* 802C07AC 002BD70C 4E 80 00 20 */ blr +/* 802C07AC 002BD70C 4E 80 00 20 */ blr .global sub_802c07b0 sub_802c07b0: @@ -12214,7 +12214,7 @@ sub_802c07b0: /* 802C07BC 002BD71C 54 00 F8 7E */ srwi r0, r0, 1 /* 802C07C0 002BD720 7C 09 03 A6 */ mtctr r0 /* 802C07C4 002BD724 7C 08 20 40 */ cmplw r8, r4 -/* 802C07C8 002BD728 4C 80 00 20 */ bgelr +/* 802C07C8 002BD728 4C 80 00 20 */ bgelr lbl_802C07CC: /* 802C07CC 002BD72C A1 28 00 00 */ lhz r9, 0(r8) /* 802C07D0 002BD730 7D 0B 43 78 */ mr r11, r8 @@ -12245,7 +12245,7 @@ lbl_802C081C: .global sub_802c0828 sub_802c0828: -/* 802C0828 002BD788 4E 80 00 20 */ blr +/* 802C0828 002BD788 4E 80 00 20 */ blr .global sub_802c082c sub_802c082c: @@ -12255,7 +12255,7 @@ sub_802c082c: /* 802C0838 002BD798 54 00 F0 BE */ srwi r0, r0, 2 /* 802C083C 002BD79C 7C 09 03 A6 */ mtctr r0 /* 802C0840 002BD7A0 7C 06 20 40 */ cmplw r6, r4 -/* 802C0844 002BD7A4 4C 80 00 20 */ bgelr +/* 802C0844 002BD7A4 4C 80 00 20 */ bgelr lbl_802C0848: /* 802C0848 002BD7A8 80 E6 00 00 */ lwz r7, 0(r6) /* 802C084C 002BD7AC 7C C9 33 78 */ mr r9, r6 @@ -12292,7 +12292,7 @@ lbl_802C08A8: .global sub_802c08b4 sub_802c08b4: -/* 802C08B4 002BD814 4E 80 00 20 */ blr +/* 802C08B4 002BD814 4E 80 00 20 */ blr .global sub_802c08b8 sub_802c08b8: @@ -12334,7 +12334,7 @@ lbl_802C092C: /* 802C0934 002BD894 54 00 17 FE */ rlwinm r0, r0, 2, 0x1f, 0x1f lbl_802C0938: /* 802C0938 002BD898 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 802C093C 002BD89C 4D 82 00 20 */ beqlr +/* 802C093C 002BD89C 4D 82 00 20 */ beqlr /* 802C0940 002BD8A0 91 05 00 00 */ stw r8, 0(r5) /* 802C0944 002BD8A4 80 C3 00 00 */ lwz r6, 0(r3) /* 802C0948 002BD8A8 C0 07 00 20 */ lfs f0, 0x20(r7) @@ -12355,10 +12355,10 @@ lbl_802C0978: /* 802C097C 002BD8DC 41 82 00 10 */ beq lbl_802C098C /* 802C0980 002BD8E0 90 C4 00 00 */ stw r6, 0(r4) /* 802C0984 002BD8E4 90 E3 00 00 */ stw r7, 0(r3) -/* 802C0988 002BD8E8 4E 80 00 20 */ blr +/* 802C0988 002BD8E8 4E 80 00 20 */ blr lbl_802C098C: /* 802C098C 002BD8EC 90 E4 00 00 */ stw r7, 0(r4) -/* 802C0990 002BD8F0 4E 80 00 20 */ blr +/* 802C0990 002BD8F0 4E 80 00 20 */ blr .global sub_802c0994 sub_802c0994: @@ -12388,7 +12388,7 @@ lbl_802C09CC: /* 802C09EC 002BD94C C0 27 00 20 */ lfs f1, 0x20(r7) /* 802C09F0 002BD950 C0 08 00 20 */ lfs f0, 0x20(r8) /* 802C09F4 002BD954 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 802C09F8 002BD958 4C 80 00 20 */ bgelr +/* 802C09F8 002BD958 4C 80 00 20 */ bgelr /* 802C09FC 002BD95C B1 45 00 00 */ sth r10, 0(r5) /* 802C0A00 002BD960 80 AD A6 1C */ lwz r5, lbl_805A91DC@sda21(r13) /* 802C0A04 002BD964 A1 03 00 00 */ lhz r8, 0(r3) @@ -12402,10 +12402,10 @@ lbl_802C09CC: /* 802C0A24 002BD984 40 80 00 10 */ bge lbl_802C0A34 /* 802C0A28 002BD988 B1 04 00 00 */ sth r8, 0(r4) /* 802C0A2C 002BD98C B1 23 00 00 */ sth r9, 0(r3) -/* 802C0A30 002BD990 4E 80 00 20 */ blr +/* 802C0A30 002BD990 4E 80 00 20 */ blr lbl_802C0A34: /* 802C0A34 002BD994 B1 24 00 00 */ sth r9, 0(r4) -/* 802C0A38 002BD998 4E 80 00 20 */ blr +/* 802C0A38 002BD998 4E 80 00 20 */ blr .global __sinit_CCubeRenderer_cpp __sinit_CCubeRenderer_cpp: @@ -12477,7 +12477,7 @@ __sinit_CCubeRenderer_cpp: /* 802C0B40 002BDAA0 80 01 00 24 */ lwz r0, 0x24(r1) /* 802C0B44 002BDAA4 7C 08 03 A6 */ mtlr r0 /* 802C0B48 002BDAA8 38 21 00 20 */ addi r1, r1, 0x20 -/* 802C0B4C 002BDAAC 4E 80 00 20 */ blr +/* 802C0B4C 002BDAAC 4E 80 00 20 */ blr .global sub_802c0b50 sub_802c0b50: @@ -12522,7 +12522,7 @@ lbl_802C0BCC: /* 802C0BD4 002BDB34 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802C0BD8 002BDB38 7C 08 03 A6 */ mtlr r0 /* 802C0BDC 002BDB3C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C0BE0 002BDB40 4E 80 00 20 */ blr +/* 802C0BE0 002BDB40 4E 80 00 20 */ blr .global "@4@AddParticleGen__13CCubeRendererFRC12CParticleGen" "@4@AddParticleGen__13CCubeRendererFRC12CParticleGen": diff --git a/asm/MetroidPrime/BodyState/CABSAim.s b/asm/MetroidPrime/BodyState/CABSAim.s index 8dcfab62..a8bf11e1 100644 --- a/asm/MetroidPrime/BodyState/CABSAim.s +++ b/asm/MetroidPrime/BodyState/CABSAim.s @@ -65,7 +65,7 @@ lbl_801D9D5C: /* 801D9D64 001D6CC4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801D9D68 001D6CC8 7C 08 03 A6 */ mtlr r0 /* 801D9D6C 001D6CCC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D9D70 001D6CD0 4E 80 00 20 */ blr +/* 801D9D70 001D6CD0 4E 80 00 20 */ blr .global GetBodyStateTransition__7CABSAimFfR15CBodyController GetBodyStateTransition__7CABSAimFfR15CBodyController: @@ -111,7 +111,7 @@ lbl_801D9DF4: /* 801D9DFC 001D6D5C 83 C1 00 08 */ lwz r30, 8(r1) /* 801D9E00 001D6D60 7C 08 03 A6 */ mtlr r0 /* 801D9E04 001D6D64 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D9E08 001D6D68 4E 80 00 20 */ blr +/* 801D9E08 001D6D68 4E 80 00 20 */ blr .global Shutdown__7CABSAimFR15CBodyController Shutdown__7CABSAimFR15CBodyController: @@ -163,7 +163,7 @@ lbl_801D9EA0: /* 801D9EA8 001D6E08 83 C1 00 08 */ lwz r30, 8(r1) /* 801D9EAC 001D6E0C 7C 08 03 A6 */ mtlr r0 /* 801D9EB0 001D6E10 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D9EB4 001D6E14 4E 80 00 20 */ blr +/* 801D9EB4 001D6E14 4E 80 00 20 */ blr .global UpdateBody__7CABSAimFfR15CBodyControllerR13CStateManager UpdateBody__7CABSAimFfR15CBodyControllerR13CStateManager: @@ -400,7 +400,7 @@ lbl_801DA1F4: /* 801DA21C 001D717C 83 A1 00 34 */ lwz r29, 0x34(r1) /* 801DA220 001D7180 7C 08 03 A6 */ mtlr r0 /* 801DA224 001D7184 38 21 00 70 */ addi r1, r1, 0x70 -/* 801DA228 001D7188 4E 80 00 20 */ blr +/* 801DA228 001D7188 4E 80 00 20 */ blr .global Start__7CABSAimFR15CBodyControllerR13CStateManager Start__7CABSAimFR15CBodyControllerR13CStateManager: @@ -553,7 +553,7 @@ lbl_801DA44C: /* 801DA458 001D73B8 80 01 00 F4 */ lwz r0, 0xf4(r1) /* 801DA45C 001D73BC 7C 08 03 A6 */ mtlr r0 /* 801DA460 001D73C0 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 801DA464 001D73C4 4E 80 00 20 */ blr +/* 801DA464 001D73C4 4E 80 00 20 */ blr .global __ct__7CABSAimFv __ct__7CABSAimFv: diff --git a/asm/MetroidPrime/BodyState/CABSFlinch.s b/asm/MetroidPrime/BodyState/CABSFlinch.s index 61b10474..b379e12d 100644 --- a/asm/MetroidPrime/BodyState/CABSFlinch.s +++ b/asm/MetroidPrime/BodyState/CABSFlinch.s @@ -42,7 +42,7 @@ lbl_801D9A78: /* 801D9A80 001D69E0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801D9A84 001D69E4 7C 08 03 A6 */ mtlr r0 /* 801D9A88 001D69E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D9A8C 001D69EC 4E 80 00 20 */ blr +/* 801D9A8C 001D69EC 4E 80 00 20 */ blr .global GetBodyStateTransition__10CABSFlinchFfR15CBodyController GetBodyStateTransition__10CABSFlinchFfR15CBodyController: @@ -60,11 +60,11 @@ lbl_801D9AB8: /* 801D9AB8 001D6A18 80 01 00 14 */ lwz r0, 0x14(r1) /* 801D9ABC 001D6A1C 7C 08 03 A6 */ mtlr r0 /* 801D9AC0 001D6A20 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D9AC4 001D6A24 4E 80 00 20 */ blr +/* 801D9AC4 001D6A24 4E 80 00 20 */ blr .global Shutdown__10CABSFlinchFR15CBodyController Shutdown__10CABSFlinchFR15CBodyController: -/* 801D9AC8 001D6A28 4E 80 00 20 */ blr +/* 801D9AC8 001D6A28 4E 80 00 20 */ blr .global UpdateBody__10CABSFlinchFfR15CBodyControllerR13CStateManager UpdateBody__10CABSFlinchFfR15CBodyControllerR13CStateManager: @@ -92,7 +92,7 @@ UpdateBody__10CABSFlinchFfR15CBodyControllerR13CStateManager: /* 801D9B20 001D6A80 81 84 00 00 */ lwz r12, 0(r4) /* 801D9B24 001D6A84 81 8C 00 14 */ lwz r12, 0x14(r12) /* 801D9B28 001D6A88 7D 89 03 A6 */ mtctr r12 -/* 801D9B2C 001D6A8C 4E 80 04 21 */ bctrl +/* 801D9B2C 001D6A8C 4E 80 04 21 */ bctrl /* 801D9B30 001D6A90 C0 41 00 08 */ lfs f2, 8(r1) /* 801D9B34 001D6A94 C0 22 AC A0 */ lfs f1, lbl_805AC9C0@sda21(r2) /* 801D9B38 001D6A98 C0 02 AC A4 */ lfs f0, lbl_805AC9C4@sda21(r2) @@ -109,7 +109,7 @@ lbl_801D9B50: /* 801D9B60 001D6AC0 83 A1 00 14 */ lwz r29, 0x14(r1) /* 801D9B64 001D6AC4 7C 08 03 A6 */ mtlr r0 /* 801D9B68 001D6AC8 38 21 00 20 */ addi r1, r1, 0x20 -/* 801D9B6C 001D6ACC 4E 80 00 20 */ blr +/* 801D9B6C 001D6ACC 4E 80 00 20 */ blr .global Start__10CABSFlinchFR15CBodyControllerR13CStateManager Start__10CABSFlinchFR15CBodyControllerR13CStateManager: @@ -212,7 +212,7 @@ lbl_801D9CCC: /* 801D9CDC 001D6C3C 83 81 00 A0 */ lwz r28, 0xa0(r1) /* 801D9CE0 001D6C40 7C 08 03 A6 */ mtlr r0 /* 801D9CE4 001D6C44 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 801D9CE8 001D6C48 4E 80 00 20 */ blr +/* 801D9CE8 001D6C48 4E 80 00 20 */ blr .global __ct__10CABSFlinchFv __ct__10CABSFlinchFv: diff --git a/asm/MetroidPrime/BodyState/CABSIdle.s b/asm/MetroidPrime/BodyState/CABSIdle.s index d8191875..9e3fac26 100644 --- a/asm/MetroidPrime/BodyState/CABSIdle.s +++ b/asm/MetroidPrime/BodyState/CABSIdle.s @@ -13,7 +13,7 @@ lbl_803E5C60: .4byte Start__8CABSIdleFR15CBodyControllerR13CStateManager .4byte UpdateBody__8CABSIdleFfR15CBodyControllerR13CStateManager .4byte Shutdown__8CABSIdleFR15CBodyController - + .section .text, "ax" .global __dt__8CABSIdleFv @@ -42,15 +42,15 @@ lbl_801D9978: /* 801D9980 001D68E0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801D9984 001D68E4 7C 08 03 A6 */ mtlr r0 /* 801D9988 001D68E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D998C 001D68EC 4E 80 00 20 */ blr +/* 801D998C 001D68EC 4E 80 00 20 */ blr .global Start__8CABSIdleFR15CBodyControllerR13CStateManager Start__8CABSIdleFR15CBodyControllerR13CStateManager: -/* 801D9990 001D68F0 4E 80 00 20 */ blr +/* 801D9990 001D68F0 4E 80 00 20 */ blr .global Shutdown__8CABSIdleFR15CBodyController Shutdown__8CABSIdleFR15CBodyController: -/* 801D9994 001D68F4 4E 80 00 20 */ blr +/* 801D9994 001D68F4 4E 80 00 20 */ blr .global GetBodyStateTransition__8CABSIdleFfR15CBodyController GetBodyStateTransition__8CABSIdleFfR15CBodyController: @@ -87,7 +87,7 @@ lbl_801D9A00: /* 801D9A04 001D6964 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801D9A08 001D6968 7C 08 03 A6 */ mtlr r0 /* 801D9A0C 001D696C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D9A10 001D6970 4E 80 00 20 */ blr +/* 801D9A10 001D6970 4E 80 00 20 */ blr .global UpdateBody__8CABSIdleFfR15CBodyControllerR13CStateManager UpdateBody__8CABSIdleFfR15CBodyControllerR13CStateManager: diff --git a/asm/MetroidPrime/BodyState/CABSReaction.s b/asm/MetroidPrime/BodyState/CABSReaction.s index f1f819dc..77c41fdc 100644 --- a/asm/MetroidPrime/BodyState/CABSReaction.s +++ b/asm/MetroidPrime/BodyState/CABSReaction.s @@ -41,7 +41,7 @@ lbl_801F1584: /* 801F158C 001EE4EC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801F1590 001EE4F0 7C 08 03 A6 */ mtlr r0 /* 801F1594 001EE4F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F1598 001EE4F8 4E 80 00 20 */ blr +/* 801F1598 001EE4F8 4E 80 00 20 */ blr .global StopAnimation__12CABSReactionFR15CBodyController StopAnimation__12CABSReactionFR15CBodyController: @@ -65,7 +65,7 @@ lbl_801F15D8: /* 801F15DC 001EE53C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801F15E0 001EE540 7C 08 03 A6 */ mtlr r0 /* 801F15E4 001EE544 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F15E8 001EE548 4E 80 00 20 */ blr +/* 801F15E8 001EE548 4E 80 00 20 */ blr .global GetBodyStateTransition__12CABSReactionFfR15CBodyController GetBodyStateTransition__12CABSReactionFfR15CBodyController: @@ -88,7 +88,7 @@ lbl_801F1624: /* 801F1624 001EE584 80 01 00 14 */ lwz r0, 0x14(r1) /* 801F1628 001EE588 7C 08 03 A6 */ mtlr r0 /* 801F162C 001EE58C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F1630 001EE590 4E 80 00 20 */ blr +/* 801F1630 001EE590 4E 80 00 20 */ blr .global HasIceBreakoutState__15CBodyControllerFv HasIceBreakoutState__15CBodyControllerFv: @@ -172,7 +172,7 @@ lbl_801F1750: /* 801F1754 001EE6B4 83 E1 00 AC */ lwz r31, 0xac(r1) /* 801F1758 001EE6B8 7C 08 03 A6 */ mtlr r0 /* 801F175C 001EE6BC 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 801F1760 001EE6C0 4E 80 00 20 */ blr +/* 801F1760 001EE6C0 4E 80 00 20 */ blr .global Shutdown__12CABSReactionFR15CBodyController Shutdown__12CABSReactionFR15CBodyController: @@ -183,7 +183,7 @@ Shutdown__12CABSReactionFR15CBodyController: /* 801F1774 001EE6D4 80 01 00 14 */ lwz r0, 0x14(r1) /* 801F1778 001EE6D8 7C 08 03 A6 */ mtlr r0 /* 801F177C 001EE6DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F1780 001EE6E0 4E 80 00 20 */ blr +/* 801F1780 001EE6E0 4E 80 00 20 */ blr .global UpdateBody__12CABSReactionFfR15CBodyControllerR13CStateManager UpdateBody__12CABSReactionFfR15CBodyControllerR13CStateManager: @@ -239,7 +239,7 @@ lbl_801F1814: /* 801F1840 001EE7A0 81 84 00 00 */ lwz r12, 0(r4) /* 801F1844 001EE7A4 81 8C 00 14 */ lwz r12, 0x14(r12) /* 801F1848 001EE7A8 7D 89 03 A6 */ mtctr r12 -/* 801F184C 001EE7AC 4E 80 04 21 */ bctrl +/* 801F184C 001EE7AC 4E 80 04 21 */ bctrl /* 801F1850 001EE7B0 C0 41 00 08 */ lfs f2, 8(r1) /* 801F1854 001EE7B4 C0 22 AE D0 */ lfs f1, lbl_805ACBF0@sda21(r2) /* 801F1858 001EE7B8 C0 02 AE D4 */ lfs f0, lbl_805ACBF4@sda21(r2) @@ -264,7 +264,7 @@ lbl_801F1888: /* 801F1898 001EE7F8 83 81 00 10 */ lwz r28, 0x10(r1) /* 801F189C 001EE7FC 7C 08 03 A6 */ mtlr r0 /* 801F18A0 001EE800 38 21 00 20 */ addi r1, r1, 0x20 -/* 801F18A4 001EE804 4E 80 00 20 */ blr +/* 801F18A4 001EE804 4E 80 00 20 */ blr .global Start__12CABSReactionFR15CBodyControllerR13CStateManager Start__12CABSReactionFR15CBodyControllerR13CStateManager: @@ -371,7 +371,7 @@ lbl_801F1A14: /* 801F1A20 001EE980 83 A1 00 A4 */ lwz r29, 0xa4(r1) /* 801F1A24 001EE984 7C 08 03 A6 */ mtlr r0 /* 801F1A28 001EE988 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 801F1A2C 001EE98C 4E 80 00 20 */ blr +/* 801F1A2C 001EE98C 4E 80 00 20 */ blr .global __ct__12CABSReactionFv __ct__12CABSReactionFv: diff --git a/asm/MetroidPrime/BodyState/CBSAttack.s b/asm/MetroidPrime/BodyState/CBSAttack.s index b13b5837..c249d328 100644 --- a/asm/MetroidPrime/BodyState/CBSAttack.s +++ b/asm/MetroidPrime/BodyState/CBSAttack.s @@ -72,12 +72,12 @@ lbl_80134E44: /* 80134E4C 00131DAC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80134E50 00131DB0 7C 08 03 A6 */ mtlr r0 /* 80134E54 00131DB4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80134E58 00131DB8 4E 80 00 20 */ blr +/* 80134E58 00131DB8 4E 80 00 20 */ blr .global CanShoot__9CBSAttackCFv CanShoot__9CBSAttackCFv: /* 80134E5C 00131DBC 38 60 00 00 */ li r3, 0 -/* 80134E60 00131DC0 4E 80 00 20 */ blr +/* 80134E60 00131DC0 4E 80 00 20 */ blr .global UpdatePhysicsActor__9CBSAttackFR15CBodyControllerf UpdatePhysicsActor__9CBSAttackFR15CBodyControllerf: @@ -185,7 +185,7 @@ lbl_80134FD4: /* 80134FE4 00131F44 83 C1 00 58 */ lwz r30, 0x58(r1) /* 80134FE8 00131F48 7C 08 03 A6 */ mtlr r0 /* 80134FEC 00131F4C 38 21 00 70 */ addi r1, r1, 0x70 -/* 80134FF0 00131F50 4E 80 00 20 */ blr +/* 80134FF0 00131F50 4E 80 00 20 */ blr .global GetBodyStateTransition__9CBSAttackFfR15CBodyController GetBodyStateTransition__9CBSAttackFfR15CBodyController: @@ -310,11 +310,11 @@ lbl_8013518C: /* 80135198 001320F8 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8013519C 001320FC 7C 08 03 A6 */ mtlr r0 /* 801351A0 00132100 38 21 00 20 */ addi r1, r1, 0x20 -/* 801351A4 00132104 4E 80 00 20 */ blr +/* 801351A4 00132104 4E 80 00 20 */ blr .global Shutdown__9CBSAttackFR15CBodyController Shutdown__9CBSAttackFR15CBodyController: -/* 801351A8 00132108 4E 80 00 20 */ blr +/* 801351A8 00132108 4E 80 00 20 */ blr .global UpdateBody__9CBSAttackFfR15CBodyControllerR13CStateManager UpdateBody__9CBSAttackFfR15CBodyControllerR13CStateManager: @@ -391,7 +391,7 @@ lbl_80135294: /* 801352B0 00132210 83 81 00 10 */ lwz r28, 0x10(r1) /* 801352B4 00132214 7C 08 03 A6 */ mtlr r0 /* 801352B8 00132218 38 21 00 30 */ addi r1, r1, 0x30 -/* 801352BC 0013221C 4E 80 00 20 */ blr +/* 801352BC 0013221C 4E 80 00 20 */ blr .global Start__9CBSAttackFR15CBodyControllerR13CStateManager Start__9CBSAttackFR15CBodyControllerR13CStateManager: @@ -587,7 +587,7 @@ lbl_80135584: /* 80135588 001324E8 80 01 01 34 */ lwz r0, 0x134(r1) /* 8013558C 001324EC 7C 08 03 A6 */ mtlr r0 /* 80135590 001324F0 38 21 01 30 */ addi r1, r1, 0x130 -/* 80135594 001324F4 4E 80 00 20 */ blr +/* 80135594 001324F4 4E 80 00 20 */ blr .global __ct__9CBSAttackFv __ct__9CBSAttackFv: diff --git a/asm/MetroidPrime/BodyState/CBSCover.s b/asm/MetroidPrime/BodyState/CBSCover.s index 4f50aa5c..ebcaca44 100644 --- a/asm/MetroidPrime/BodyState/CBSCover.s +++ b/asm/MetroidPrime/BodyState/CBSCover.s @@ -48,17 +48,17 @@ lbl_80175D1C: /* 80175D24 00172C84 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80175D28 00172C88 7C 08 03 A6 */ mtlr r0 /* 80175D2C 00172C8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80175D30 00172C90 4E 80 00 20 */ blr +/* 80175D30 00172C90 4E 80 00 20 */ blr .global IsMoving__8CBSCoverCFv IsMoving__8CBSCoverCFv: /* 80175D34 00172C94 38 60 00 01 */ li r3, 1 -/* 80175D38 00172C98 4E 80 00 20 */ blr +/* 80175D38 00172C98 4E 80 00 20 */ blr .global ApplyHeadTracking__8CBSCoverCFv ApplyHeadTracking__8CBSCoverCFv: /* 80175D3C 00172C9C 38 60 00 00 */ li r3, 0 -/* 80175D40 00172CA0 4E 80 00 20 */ blr +/* 80175D40 00172CA0 4E 80 00 20 */ blr .global GetBodyStateTransition__8CBSCoverFfR15CBodyController GetBodyStateTransition__8CBSCoverFfR15CBodyController: @@ -111,11 +111,11 @@ lbl_80175DE4: /* 80175DE8 00172D48 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80175DEC 00172D4C 7C 08 03 A6 */ mtlr r0 /* 80175DF0 00172D50 38 21 00 10 */ addi r1, r1, 0x10 -/* 80175DF4 00172D54 4E 80 00 20 */ blr +/* 80175DF4 00172D54 4E 80 00 20 */ blr .global Shutdown__8CBSCoverFR15CBodyController Shutdown__8CBSCoverFR15CBodyController: -/* 80175DF8 00172D58 4E 80 00 20 */ blr +/* 80175DF8 00172D58 4E 80 00 20 */ blr .global UpdateBody__8CBSCoverFfR15CBodyControllerR13CStateManager UpdateBody__8CBSCoverFfR15CBodyControllerR13CStateManager: @@ -412,7 +412,7 @@ lbl_80176210: /* 80176220 00173180 80 01 01 D4 */ lwz r0, 0x1d4(r1) /* 80176224 00173184 7C 08 03 A6 */ mtlr r0 /* 80176228 00173188 38 21 01 D0 */ addi r1, r1, 0x1d0 -/* 8017622C 0017318C 4E 80 00 20 */ blr +/* 8017622C 0017318C 4E 80 00 20 */ blr .global Start__8CBSCoverFR15CBodyControllerR13CStateManager Start__8CBSCoverFR15CBodyControllerR13CStateManager: @@ -575,7 +575,7 @@ lbl_80176484: /* 80176488 001733E8 80 01 01 34 */ lwz r0, 0x134(r1) /* 8017648C 001733EC 7C 08 03 A6 */ mtlr r0 /* 80176490 001733F0 38 21 01 30 */ addi r1, r1, 0x130 -/* 80176494 001733F4 4E 80 00 20 */ blr +/* 80176494 001733F4 4E 80 00 20 */ blr .global __ct__8CBSCoverFv __ct__8CBSCoverFv: @@ -590,7 +590,7 @@ __ct__8CBSCoverFv: /* 801764B8 00173418 90 83 00 04 */ stw r4, 4(r3) /* 801764BC 0017341C 90 83 00 08 */ stw r4, 8(r3) /* 801764C0 00173420 98 03 00 0C */ stb r0, 0xc(r3) -/* 801764C4 00173424 4E 80 00 20 */ blr +/* 801764C4 00173424 4E 80 00 20 */ blr .global CanShoot__8CBSCoverCFv CanShoot__8CBSCoverCFv: @@ -598,4 +598,4 @@ CanShoot__8CBSCoverCFv: /* 801764CC 0017342C 20 00 00 02 */ subfic r0, r0, 2 /* 801764D0 00173430 7C 00 00 34 */ cntlzw r0, r0 /* 801764D4 00173434 54 03 D9 7E */ srwi r3, r0, 5 -/* 801764D8 00173438 4E 80 00 20 */ blr +/* 801764D8 00173438 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/BodyState/CBSDie.s b/asm/MetroidPrime/BodyState/CBSDie.s index 2d13bade..bba558b0 100644 --- a/asm/MetroidPrime/BodyState/CBSDie.s +++ b/asm/MetroidPrime/BodyState/CBSDie.s @@ -48,21 +48,21 @@ lbl_80135690: /* 80135698 001325F8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8013569C 001325FC 7C 08 03 A6 */ mtlr r0 /* 801356A0 00132600 38 21 00 10 */ addi r1, r1, 0x10 -/* 801356A4 00132604 4E 80 00 20 */ blr +/* 801356A4 00132604 4E 80 00 20 */ blr .global IsDead__6CBSDieCFv IsDead__6CBSDieCFv: /* 801356A8 00132608 88 63 00 08 */ lbz r3, 8(r3) -/* 801356AC 0013260C 4E 80 00 20 */ blr +/* 801356AC 0013260C 4E 80 00 20 */ blr .global IsDying__6CBSDieCFv IsDying__6CBSDieCFv: /* 801356B0 00132610 38 60 00 01 */ li r3, 1 -/* 801356B4 00132614 4E 80 00 20 */ blr +/* 801356B4 00132614 4E 80 00 20 */ blr .global Shutdown__6CBSDieFR15CBodyController Shutdown__6CBSDieFR15CBodyController: -/* 801356B8 00132618 4E 80 00 20 */ blr +/* 801356B8 00132618 4E 80 00 20 */ blr .global UpdateBody__6CBSDieFfR15CBodyControllerR13CStateManager UpdateBody__6CBSDieFfR15CBodyControllerR13CStateManager: @@ -90,7 +90,7 @@ lbl_80135704: /* 8013570C 0013266C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80135710 00132670 7C 08 03 A6 */ mtlr r0 /* 80135714 00132674 38 21 00 10 */ addi r1, r1, 0x10 -/* 80135718 00132678 4E 80 00 20 */ blr +/* 80135718 00132678 4E 80 00 20 */ blr .global Start__6CBSDieFR15CBodyControllerR13CStateManager Start__6CBSDieFR15CBodyControllerR13CStateManager: @@ -226,7 +226,7 @@ lbl_801358F0: /* 801358FC 0013285C 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 80135900 00132860 7C 08 03 A6 */ mtlr r0 /* 80135904 00132864 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 80135908 00132868 4E 80 00 20 */ blr +/* 80135908 00132868 4E 80 00 20 */ blr .global __ct__6CBSDieFv __ct__6CBSDieFv: diff --git a/asm/MetroidPrime/BodyState/CBSFall.s b/asm/MetroidPrime/BodyState/CBSFall.s index 1fafc39a..e76b8bf1 100644 --- a/asm/MetroidPrime/BodyState/CBSFall.s +++ b/asm/MetroidPrime/BodyState/CBSFall.s @@ -48,16 +48,16 @@ lbl_8013597C: /* 80135984 001328E4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80135988 001328E8 7C 08 03 A6 */ mtlr r0 /* 8013598C 001328EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80135990 001328F0 4E 80 00 20 */ blr +/* 80135990 001328F0 4E 80 00 20 */ blr .global GetBodyStateTransition__7CBSFallFfR15CBodyController GetBodyStateTransition__7CBSFallFfR15CBodyController: /* 80135994 001328F4 88 04 03 00 */ lbz r0, 0x300(r4) /* 80135998 001328F8 38 60 FF FF */ li r3, -1 /* 8013599C 001328FC 54 00 CF FF */ rlwinm. r0, r0, 0x19, 0x1f, 0x1f -/* 801359A0 00132900 4D 82 00 20 */ beqlr +/* 801359A0 00132900 4D 82 00 20 */ beqlr /* 801359A4 00132904 38 60 00 02 */ li r3, 2 -/* 801359A8 00132908 4E 80 00 20 */ blr +/* 801359A8 00132908 4E 80 00 20 */ blr .global Shutdown__7CBSFallFR15CBodyController Shutdown__7CBSFallFR15CBodyController: @@ -71,7 +71,7 @@ Shutdown__7CBSFallFR15CBodyController: /* 801359C8 00132928 80 01 00 14 */ lwz r0, 0x14(r1) /* 801359CC 0013292C 7C 08 03 A6 */ mtlr r0 /* 801359D0 00132930 38 21 00 10 */ addi r1, r1, 0x10 -/* 801359D4 00132934 4E 80 00 20 */ blr +/* 801359D4 00132934 4E 80 00 20 */ blr .global UpdateBody__7CBSFallFfR15CBodyControllerR13CStateManager UpdateBody__7CBSFallFfR15CBodyControllerR13CStateManager: @@ -116,7 +116,7 @@ lbl_80135A54: /* 80135A6C 001329CC 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80135A70 001329D0 7C 08 03 A6 */ mtlr r0 /* 80135A74 001329D4 38 21 00 40 */ addi r1, r1, 0x40 -/* 80135A78 001329D8 4E 80 00 20 */ blr +/* 80135A78 001329D8 4E 80 00 20 */ blr .global Start__7CBSFallFR15CBodyControllerR13CStateManager Start__7CBSFallFR15CBodyControllerR13CStateManager: @@ -382,7 +382,7 @@ lbl_80135E3C: /* 80135E48 00132DA8 80 01 01 64 */ lwz r0, 0x164(r1) /* 80135E4C 00132DAC 7C 08 03 A6 */ mtlr r0 /* 80135E50 00132DB0 38 21 01 60 */ addi r1, r1, 0x160 -/* 80135E54 00132DB4 4E 80 00 20 */ blr +/* 80135E54 00132DB4 4E 80 00 20 */ blr .global __ct__7CBSFallFv __ct__7CBSFallFv: diff --git a/asm/MetroidPrime/BodyState/CBSGenerate.s b/asm/MetroidPrime/BodyState/CBSGenerate.s index 791ce97f..a5bd8d3d 100644 --- a/asm/MetroidPrime/BodyState/CBSGenerate.s +++ b/asm/MetroidPrime/BodyState/CBSGenerate.s @@ -48,7 +48,7 @@ lbl_801466F8: /* 80146700 00143660 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80146704 00143664 7C 08 03 A6 */ mtlr r0 /* 80146708 00143668 38 21 00 10 */ addi r1, r1, 0x10 -/* 8014670C 0014366C 4E 80 00 20 */ blr +/* 8014670C 0014366C 4E 80 00 20 */ blr .global GetBodyStateTransition__11CBSGenerateFfR15CBodyController GetBodyStateTransition__11CBSGenerateFfR15CBodyController: @@ -102,11 +102,11 @@ lbl_801467AC: /* 801467B4 00143714 83 C1 00 08 */ lwz r30, 8(r1) /* 801467B8 00143718 7C 08 03 A6 */ mtlr r0 /* 801467BC 0014371C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801467C0 00143720 4E 80 00 20 */ blr +/* 801467C0 00143720 4E 80 00 20 */ blr .global Shutdown__11CBSGenerateFR15CBodyController Shutdown__11CBSGenerateFR15CBodyController: -/* 801467C4 00143724 4E 80 00 20 */ blr +/* 801467C4 00143724 4E 80 00 20 */ blr .global UpdateBody__11CBSGenerateFfR15CBodyControllerR13CStateManager UpdateBody__11CBSGenerateFfR15CBodyControllerR13CStateManager: @@ -153,7 +153,7 @@ lbl_80146848: /* 8014685C 001437BC 83 C1 00 08 */ lwz r30, 8(r1) /* 80146860 001437C0 7C 08 03 A6 */ mtlr r0 /* 80146864 001437C4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80146868 001437C8 4E 80 00 20 */ blr +/* 80146868 001437C8 4E 80 00 20 */ blr .global Start__11CBSGenerateFR15CBodyControllerR13CStateManager Start__11CBSGenerateFR15CBodyControllerR13CStateManager: @@ -301,7 +301,7 @@ lbl_80146A7C: /* 80146A80 001439E0 80 01 01 24 */ lwz r0, 0x124(r1) /* 80146A84 001439E4 7C 08 03 A6 */ mtlr r0 /* 80146A88 001439E8 38 21 01 20 */ addi r1, r1, 0x120 -/* 80146A8C 001439EC 4E 80 00 20 */ blr +/* 80146A8C 001439EC 4E 80 00 20 */ blr .global __ct__11CBSGenerateFv __ct__11CBSGenerateFv: diff --git a/asm/MetroidPrime/BodyState/CBSGetup.s b/asm/MetroidPrime/BodyState/CBSGetup.s index 82a3a4c8..9b713480 100644 --- a/asm/MetroidPrime/BodyState/CBSGetup.s +++ b/asm/MetroidPrime/BodyState/CBSGetup.s @@ -48,7 +48,7 @@ lbl_80135ECC: /* 80135ED4 00132E34 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80135ED8 00132E38 7C 08 03 A6 */ mtlr r0 /* 80135EDC 00132E3C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80135EE0 00132E40 4E 80 00 20 */ blr +/* 80135EE0 00132E40 4E 80 00 20 */ blr .global GetBodyStateTransition__8CBSGetupFfR15CBodyController GetBodyStateTransition__8CBSGetupFfR15CBodyController: @@ -95,7 +95,7 @@ lbl_80135F68: /* 80135F74 00132ED4 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80135F78 00132ED8 7C 08 03 A6 */ mtlr r0 /* 80135F7C 00132EDC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80135F80 00132EE0 4E 80 00 20 */ blr +/* 80135F80 00132EE0 4E 80 00 20 */ blr .global Shutdown__8CBSGetupFR15CBodyController Shutdown__8CBSGetupFR15CBodyController: @@ -109,7 +109,7 @@ Shutdown__8CBSGetupFR15CBodyController: /* 80135FA0 00132F00 80 01 00 14 */ lwz r0, 0x14(r1) /* 80135FA4 00132F04 7C 08 03 A6 */ mtlr r0 /* 80135FA8 00132F08 38 21 00 10 */ addi r1, r1, 0x10 -/* 80135FAC 00132F0C 4E 80 00 20 */ blr +/* 80135FAC 00132F0C 4E 80 00 20 */ blr .global UpdateBody__8CBSGetupFfR15CBodyControllerR13CStateManager UpdateBody__8CBSGetupFfR15CBodyControllerR13CStateManager: @@ -120,7 +120,7 @@ UpdateBody__8CBSGetupFfR15CBodyControllerR13CStateManager: /* 80135FC0 00132F20 80 01 00 14 */ lwz r0, 0x14(r1) /* 80135FC4 00132F24 7C 08 03 A6 */ mtlr r0 /* 80135FC8 00132F28 38 21 00 10 */ addi r1, r1, 0x10 -/* 80135FCC 00132F2C 4E 80 00 20 */ blr +/* 80135FCC 00132F2C 4E 80 00 20 */ blr .global Start__8CBSGetupFR15CBodyControllerR13CStateManager Start__8CBSGetupFR15CBodyControllerR13CStateManager: @@ -261,7 +261,7 @@ lbl_801361C4: /* 801361C8 00133128 80 01 00 F4 */ lwz r0, 0xf4(r1) /* 801361CC 0013312C 7C 08 03 A6 */ mtlr r0 /* 801361D0 00133130 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 801361D4 00133134 4E 80 00 20 */ blr +/* 801361D4 00133134 4E 80 00 20 */ blr .global __ct__8CBSGetupFv __ct__8CBSGetupFv: diff --git a/asm/MetroidPrime/BodyState/CBSGroundHit.s b/asm/MetroidPrime/BodyState/CBSGroundHit.s index 6a16c1b0..cbe5f77d 100644 --- a/asm/MetroidPrime/BodyState/CBSGroundHit.s +++ b/asm/MetroidPrime/BodyState/CBSGroundHit.s @@ -48,7 +48,7 @@ lbl_8013EDA0: /* 8013EDA8 0013BD08 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8013EDAC 0013BD0C 7C 08 03 A6 */ mtlr r0 /* 8013EDB0 0013BD10 38 21 00 10 */ addi r1, r1, 0x10 -/* 8013EDB4 0013BD14 4E 80 00 20 */ blr +/* 8013EDB4 0013BD14 4E 80 00 20 */ blr .global GetBodyStateTransition__12CBSGroundHitFfR15CBodyController GetBodyStateTransition__12CBSGroundHitFfR15CBodyController: @@ -72,7 +72,7 @@ lbl_8013EDF4: /* 8013EDF4 0013BD54 80 01 00 14 */ lwz r0, 0x14(r1) /* 8013EDF8 0013BD58 7C 08 03 A6 */ mtlr r0 /* 8013EDFC 0013BD5C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8013EE00 0013BD60 4E 80 00 20 */ blr +/* 8013EE00 0013BD60 4E 80 00 20 */ blr .global Shutdown__12CBSGroundHitFR15CBodyController Shutdown__12CBSGroundHitFR15CBodyController: @@ -86,7 +86,7 @@ Shutdown__12CBSGroundHitFR15CBodyController: /* 8013EE20 0013BD80 80 01 00 14 */ lwz r0, 0x14(r1) /* 8013EE24 0013BD84 7C 08 03 A6 */ mtlr r0 /* 8013EE28 0013BD88 38 21 00 10 */ addi r1, r1, 0x10 -/* 8013EE2C 0013BD8C 4E 80 00 20 */ blr +/* 8013EE2C 0013BD8C 4E 80 00 20 */ blr .global UpdateBody__12CBSGroundHitFfR15CBodyControllerR13CStateManager UpdateBody__12CBSGroundHitFfR15CBodyControllerR13CStateManager: @@ -131,7 +131,7 @@ lbl_8013EEAC: /* 8013EEC4 0013BE24 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8013EEC8 0013BE28 7C 08 03 A6 */ mtlr r0 /* 8013EECC 0013BE2C 38 21 00 40 */ addi r1, r1, 0x40 -/* 8013EED0 0013BE30 4E 80 00 20 */ blr +/* 8013EED0 0013BE30 4E 80 00 20 */ blr .global Start__12CBSGroundHitFR15CBodyControllerR13CStateManager Start__12CBSGroundHitFR15CBodyControllerR13CStateManager: @@ -401,7 +401,7 @@ lbl_8013F2A4: /* 8013F2B0 0013C210 80 01 01 64 */ lwz r0, 0x164(r1) /* 8013F2B4 0013C214 7C 08 03 A6 */ mtlr r0 /* 8013F2B8 0013C218 38 21 01 60 */ addi r1, r1, 0x160 -/* 8013F2BC 0013C21C 4E 80 00 20 */ blr +/* 8013F2BC 0013C21C 4E 80 00 20 */ blr .global __ct__12CBSGroundHitFv __ct__12CBSGroundHitFv: @@ -416,4 +416,4 @@ __ct__12CBSGroundHitFv: /* 8013F2E0 0013C240 D0 03 00 04 */ stfs f0, 4(r3) /* 8013F2E4 0013C244 D0 03 00 08 */ stfs f0, 8(r3) /* 8013F2E8 0013C248 90 03 00 0C */ stw r0, 0xc(r3) -/* 8013F2EC 0013C24C 4E 80 00 20 */ blr +/* 8013F2EC 0013C24C 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/BodyState/CBSHurled.s b/asm/MetroidPrime/BodyState/CBSHurled.s index 468683b6..f09daebf 100644 --- a/asm/MetroidPrime/BodyState/CBSHurled.s +++ b/asm/MetroidPrime/BodyState/CBSHurled.s @@ -60,17 +60,17 @@ lbl_80144450: /* 80144458 001413B8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8014445C 001413BC 7C 08 03 A6 */ mtlr r0 /* 80144460 001413C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80144464 001413C4 4E 80 00 20 */ blr +/* 80144464 001413C4 4E 80 00 20 */ blr .global IsMoving__9CBSHurledCFv IsMoving__9CBSHurledCFv: /* 80144468 001413C8 38 60 00 01 */ li r3, 1 -/* 8014446C 001413CC 4E 80 00 20 */ blr +/* 8014446C 001413CC 4E 80 00 20 */ blr .global ApplyHeadTracking__9CBSHurledCFv ApplyHeadTracking__9CBSHurledCFv: /* 80144470 001413D0 38 60 00 00 */ li r3, 0 -/* 80144474 001413D4 4E 80 00 20 */ blr +/* 80144474 001413D4 4E 80 00 20 */ blr .global GetBodyStateTransition__9CBSHurledFfR15CBodyController GetBodyStateTransition__9CBSHurledFfR15CBodyController: @@ -110,7 +110,7 @@ lbl_801444E8: /* 801444F0 00141450 83 C1 00 08 */ lwz r30, 8(r1) /* 801444F4 00141454 7C 08 03 A6 */ mtlr r0 /* 801444F8 00141458 38 21 00 10 */ addi r1, r1, 0x10 -/* 801444FC 0014145C 4E 80 00 20 */ blr +/* 801444FC 0014145C 4E 80 00 20 */ blr .global Recover__9CBSHurledFR13CStateManagerR15CBodyControllerQ23pas12EHurledState Recover__9CBSHurledFR13CStateManagerR15CBodyControllerQ23pas12EHurledState: @@ -238,7 +238,7 @@ lbl_801446C8: /* 801446CC 0014162C 80 01 00 F4 */ lwz r0, 0xf4(r1) /* 801446D0 00141630 7C 08 03 A6 */ mtlr r0 /* 801446D4 00141634 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 801446D8 00141638 4E 80 00 20 */ blr +/* 801446D8 00141638 4E 80 00 20 */ blr .global PlayStrikeWallAnimation__9CBSHurledFR15CBodyControllerR13CStateManager PlayStrikeWallAnimation__9CBSHurledFR15CBodyControllerR13CStateManager: @@ -356,7 +356,7 @@ lbl_80144870: /* 80144880 001417E0 83 81 00 D0 */ lwz r28, 0xd0(r1) /* 80144884 001417E4 7C 08 03 A6 */ mtlr r0 /* 80144888 001417E8 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 8014488C 001417EC 4E 80 00 20 */ blr +/* 8014488C 001417EC 4E 80 00 20 */ blr .global PlayLandAnimation__9CBSHurledFR15CBodyControllerR13CStateManager PlayLandAnimation__9CBSHurledFR15CBodyControllerR13CStateManager: @@ -497,7 +497,7 @@ lbl_80144A80: /* 80144A90 001419F0 83 81 00 F0 */ lwz r28, 0xf0(r1) /* 80144A94 001419F4 7C 08 03 A6 */ mtlr r0 /* 80144A98 001419F8 38 21 01 00 */ addi r1, r1, 0x100 -/* 80144A9C 001419FC 4E 80 00 20 */ blr +/* 80144A9C 001419FC 4E 80 00 20 */ blr .global ShouldStartStrikeWall__9CBSHurledCFR15CBodyController ShouldStartStrikeWall__9CBSHurledCFR15CBodyController: @@ -516,7 +516,7 @@ ShouldStartStrikeWall__9CBSHurledCFR15CBodyController: /* 80144AD0 00141A30 81 83 00 00 */ lwz r12, 0(r3) /* 80144AD4 00141A34 81 8C 02 B8 */ lwz r12, 0x2b8(r12) /* 80144AD8 00141A38 7D 89 03 A6 */ mtctr r12 -/* 80144ADC 00141A3C 4E 80 04 21 */ bctrl +/* 80144ADC 00141A3C 4E 80 04 21 */ bctrl /* 80144AE0 00141A40 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80144AE4 00141A44 40 82 00 08 */ bne lbl_80144AEC /* 80144AE8 00141A48 3B E0 00 01 */ li r31, 1 @@ -526,7 +526,7 @@ lbl_80144AEC: /* 80144AF4 00141A54 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80144AF8 00141A58 7C 08 03 A6 */ mtlr r0 /* 80144AFC 00141A5C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80144B00 00141A60 4E 80 00 20 */ blr +/* 80144B00 00141A60 4E 80 00 20 */ blr .global ShouldStartLand__9CBSHurledCFfR15CBodyController ShouldStartLand__9CBSHurledCFfR15CBodyController: @@ -552,7 +552,7 @@ ShouldStartLand__9CBSHurledCFfR15CBodyController: /* 80144B50 00141AB0 81 9E 00 00 */ lwz r12, 0(r30) /* 80144B54 00141AB4 81 8C 02 B8 */ lwz r12, 0x2b8(r12) /* 80144B58 00141AB8 7D 89 03 A6 */ mtctr r12 -/* 80144B5C 00141ABC 4E 80 04 21 */ bctrl +/* 80144B5C 00141ABC 4E 80 04 21 */ bctrl /* 80144B60 00141AC0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80144B64 00141AC4 41 82 00 0C */ beq lbl_80144B70 /* 80144B68 00141AC8 3B E0 00 01 */ li r31, 1 @@ -606,11 +606,11 @@ lbl_80144C00: /* 80144C18 00141B78 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80144C1C 00141B7C 7C 08 03 A6 */ mtlr r0 /* 80144C20 00141B80 38 21 00 40 */ addi r1, r1, 0x40 -/* 80144C24 00141B84 4E 80 00 20 */ blr +/* 80144C24 00141B84 4E 80 00 20 */ blr .global Shutdown__9CBSHurledFR15CBodyController Shutdown__9CBSHurledFR15CBodyController: -/* 80144C28 00141B88 4E 80 00 20 */ blr +/* 80144C28 00141B88 4E 80 00 20 */ blr .global UpdateBody__9CBSHurledFfR15CBodyControllerR13CStateManager UpdateBody__9CBSHurledFfR15CBodyControllerR13CStateManager: @@ -669,7 +669,7 @@ lbl_80144CE0: /* 80144CF4 00141C54 38 63 1F E8 */ addi r3, r3, lbl_803E1FE8@l /* 80144CF8 00141C58 7C 03 00 2E */ lwzx r0, r3, r0 /* 80144CFC 00141C5C 7C 09 03 A6 */ mtctr r0 -/* 80144D00 00141C60 4E 80 04 20 */ bctr +/* 80144D00 00141C60 4E 80 04 20 */ bctr .global lbl_80144D04 lbl_80144D04: /* 80144D04 00141C64 88 1D 03 00 */ lbz r0, 0x300(r29) @@ -778,7 +778,7 @@ lbl_80144E44: /* 80144E84 00141DE4 81 9C 00 00 */ lwz r12, 0(r28) /* 80144E88 00141DE8 81 8C 02 BC */ lwz r12, 0x2bc(r12) /* 80144E8C 00141DEC 7D 89 03 A6 */ mtctr r12 -/* 80144E90 00141DF0 4E 80 04 21 */ bctrl +/* 80144E90 00141DF0 4E 80 04 21 */ bctrl /* 80144E94 00141DF4 C0 02 9C 2C */ lfs f0, lbl_805AB94C@sda21(r2) /* 80144E98 00141DF8 3C 60 80 5A */ lis r3, lbl_805A6700@ha /* 80144E9C 00141DFC 38 A3 67 00 */ addi r5, r3, lbl_805A6700@l @@ -964,7 +964,7 @@ lbl_8014510C: /* 80145128 00142088 83 81 01 60 */ lwz r28, 0x160(r1) /* 8014512C 0014208C 7C 08 03 A6 */ mtlr r0 /* 80145130 00142090 38 21 01 80 */ addi r1, r1, 0x180 -/* 80145134 00142094 4E 80 00 20 */ blr +/* 80145134 00142094 4E 80 00 20 */ blr .global Start__9CBSHurledFR15CBodyControllerR13CStateManager Start__9CBSHurledFR15CBodyControllerR13CStateManager: @@ -1262,12 +1262,12 @@ lbl_8014557C: /* 80145588 001424E8 80 01 01 64 */ lwz r0, 0x164(r1) /* 8014558C 001424EC 7C 08 03 A6 */ mtlr r0 /* 80145590 001424F0 38 21 01 60 */ addi r1, r1, 0x160 -/* 80145594 001424F4 4E 80 00 20 */ blr +/* 80145594 001424F4 4E 80 00 20 */ blr .global IsInAir__9CBSHurledCFRC15CBodyController IsInAir__9CBSHurledCFRC15CBodyController: /* 80145598 001424F8 38 60 00 01 */ li r3, 1 -/* 8014559C 001424FC 4E 80 00 20 */ blr +/* 8014559C 001424FC 4E 80 00 20 */ blr .global __ct__9CBSHurledFv __ct__9CBSHurledFv: @@ -1298,4 +1298,4 @@ __ct__9CBSHurledFv: /* 80145600 00142560 88 03 00 2C */ lbz r0, 0x2c(r3) /* 80145604 00142564 50 80 3E 30 */ rlwimi r0, r4, 7, 0x18, 0x18 /* 80145608 00142568 98 03 00 2C */ stb r0, 0x2c(r3) -/* 8014560C 0014256C 4E 80 00 20 */ blr +/* 8014560C 0014256C 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/BodyState/CBSJump.s b/asm/MetroidPrime/BodyState/CBSJump.s index a872d50f..ce97b30b 100644 --- a/asm/MetroidPrime/BodyState/CBSJump.s +++ b/asm/MetroidPrime/BodyState/CBSJump.s @@ -48,17 +48,17 @@ lbl_80145654: /* 8014565C 001425BC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80145660 001425C0 7C 08 03 A6 */ mtlr r0 /* 80145664 001425C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80145668 001425C8 4E 80 00 20 */ blr +/* 80145668 001425C8 4E 80 00 20 */ blr .global IsMoving__7CBSJumpCFv IsMoving__7CBSJumpCFv: /* 8014566C 001425CC 38 60 00 01 */ li r3, 1 -/* 80145670 001425D0 4E 80 00 20 */ blr +/* 80145670 001425D0 4E 80 00 20 */ blr .global ApplyHeadTracking__7CBSJumpCFv ApplyHeadTracking__7CBSJumpCFv: /* 80145674 001425D4 38 60 00 00 */ li r3, 0 -/* 80145678 001425D8 4E 80 00 20 */ blr +/* 80145678 001425D8 4E 80 00 20 */ blr .global GetBodyStateTransition__7CBSJumpFfR15CBodyController GetBodyStateTransition__7CBSJumpFfR15CBodyController: @@ -105,7 +105,7 @@ lbl_80145704: /* 8014570C 0014266C 83 C1 00 08 */ lwz r30, 8(r1) /* 80145710 00142670 7C 08 03 A6 */ mtlr r0 /* 80145714 00142674 38 21 00 10 */ addi r1, r1, 0x10 -/* 80145718 00142678 4E 80 00 20 */ blr +/* 80145718 00142678 4E 80 00 20 */ blr .global CheckForWallJump__7CBSJumpFR15CBodyControllerR13CStateManager CheckForWallJump__7CBSJumpFR15CBodyControllerR13CStateManager: @@ -250,7 +250,7 @@ lbl_80145918: /* 80145928 00142888 80 01 00 F4 */ lwz r0, 0xf4(r1) /* 8014592C 0014288C 7C 08 03 A6 */ mtlr r0 /* 80145930 00142890 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 80145934 00142894 4E 80 00 20 */ blr +/* 80145934 00142894 4E 80 00 20 */ blr .global CheckForLand__7CBSJumpFR15CBodyControllerR13CStateManager CheckForLand__7CBSJumpFR15CBodyControllerR13CStateManager: @@ -277,7 +277,7 @@ CheckForLand__7CBSJumpFR15CBodyControllerR13CStateManager: /* 80145988 001428E8 81 9F 00 00 */ lwz r12, 0(r31) /* 8014598C 001428EC 81 8C 02 B8 */ lwz r12, 0x2b8(r12) /* 80145990 001428F0 7D 89 03 A6 */ mtctr r12 -/* 80145994 001428F4 4E 80 04 21 */ bctrl +/* 80145994 001428F4 4E 80 04 21 */ bctrl /* 80145998 001428F8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8014599C 001428FC 41 82 01 10 */ beq lbl_80145AAC lbl_801459A0: @@ -360,11 +360,11 @@ lbl_80145AAC: /* 80145ABC 00142A1C 83 81 00 B0 */ lwz r28, 0xb0(r1) /* 80145AC0 00142A20 7C 08 03 A6 */ mtlr r0 /* 80145AC4 00142A24 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 80145AC8 00142A28 4E 80 00 20 */ blr +/* 80145AC8 00142A28 4E 80 00 20 */ blr .global Shutdown__7CBSJumpFR15CBodyController Shutdown__7CBSJumpFR15CBodyController: -/* 80145ACC 00142A2C 4E 80 00 20 */ blr +/* 80145ACC 00142A2C 4E 80 00 20 */ blr .global UpdateBody__7CBSJumpFfR15CBodyControllerR13CStateManager UpdateBody__7CBSJumpFfR15CBodyControllerR13CStateManager: @@ -676,7 +676,7 @@ lbl_80145E40: /* 80145F40 00142EA0 81 8C 02 BC */ lwz r12, 0x2bc(r12) /* 80145F44 00142EA4 EF E1 00 28 */ fsubs f31, f1, f0 /* 80145F48 00142EA8 7D 89 03 A6 */ mtctr r12 -/* 80145F4C 00142EAC 4E 80 04 21 */ bctrl +/* 80145F4C 00142EAC 4E 80 04 21 */ bctrl /* 80145F50 00142EB0 C0 5C 00 2C */ lfs f2, 0x2c(r28) /* 80145F54 00142EB4 C0 1B 00 60 */ lfs f0, 0x60(r27) /* 80145F58 00142EB8 C0 62 9C 70 */ lfs f3, lbl_805AB990@sda21(r2) @@ -739,7 +739,7 @@ lbl_80146008: /* 80146020 00142F80 80 01 01 94 */ lwz r0, 0x194(r1) /* 80146024 00142F84 7C 08 03 A6 */ mtlr r0 /* 80146028 00142F88 38 21 01 90 */ addi r1, r1, 0x190 -/* 8014602C 00142F8C 4E 80 00 20 */ blr +/* 8014602C 00142F8C 4E 80 00 20 */ blr .global PlayJumpLoop__7CBSJumpFR13CStateManagerR15CBodyController PlayJumpLoop__7CBSJumpFR13CStateManagerR15CBodyController: @@ -948,7 +948,7 @@ lbl_8014631C: /* 80146328 00143288 83 A1 01 64 */ lwz r29, 0x164(r1) /* 8014632C 0014328C 7C 08 03 A6 */ mtlr r0 /* 80146330 00143290 38 21 01 70 */ addi r1, r1, 0x170 -/* 80146334 00143294 4E 80 00 20 */ blr +/* 80146334 00143294 4E 80 00 20 */ blr .global Start__7CBSJumpFR15CBodyControllerR13CStateManager Start__7CBSJumpFR15CBodyControllerR13CStateManager: @@ -1112,7 +1112,7 @@ lbl_80146584: /* 80146590 001434F0 83 A1 00 A4 */ lwz r29, 0xa4(r1) /* 80146594 001434F4 7C 08 03 A6 */ mtlr r0 /* 80146598 001434F8 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 8014659C 001434FC 4E 80 00 20 */ blr +/* 8014659C 001434FC 4E 80 00 20 */ blr .global CanShoot__7CBSJumpCFv CanShoot__7CBSJumpCFv: @@ -1121,21 +1121,21 @@ CanShoot__7CBSJumpCFv: /* 801465A8 00143508 2C 00 00 01 */ cmpwi r0, 1 /* 801465AC 0014350C 41 82 00 0C */ beq lbl_801465B8 /* 801465B0 00143510 2C 00 00 02 */ cmpwi r0, 2 -/* 801465B4 00143514 4C 82 00 20 */ bnelr +/* 801465B4 00143514 4C 82 00 20 */ bnelr lbl_801465B8: /* 801465B8 00143518 38 60 00 01 */ li r3, 1 -/* 801465BC 0014351C 4E 80 00 20 */ blr +/* 801465BC 0014351C 4E 80 00 20 */ blr .global ApplyAnimationDeltas__7CBSJumpCFv ApplyAnimationDeltas__7CBSJumpCFv: /* 801465C0 00143520 80 03 00 04 */ lwz r0, 4(r3) /* 801465C4 00143524 38 60 00 00 */ li r3, 0 /* 801465C8 00143528 2C 00 00 01 */ cmpwi r0, 1 -/* 801465CC 0014352C 4D 82 00 20 */ beqlr +/* 801465CC 0014352C 4D 82 00 20 */ beqlr /* 801465D0 00143530 2C 00 00 02 */ cmpwi r0, 2 -/* 801465D4 00143534 4D 82 00 20 */ beqlr +/* 801465D4 00143534 4D 82 00 20 */ beqlr /* 801465D8 00143538 38 60 00 01 */ li r3, 1 -/* 801465DC 0014353C 4E 80 00 20 */ blr +/* 801465DC 0014353C 4E 80 00 20 */ blr .global IsInAir__7CBSJumpCFRC15CBodyController IsInAir__7CBSJumpCFRC15CBodyController: @@ -1144,10 +1144,10 @@ IsInAir__7CBSJumpCFRC15CBodyController: /* 801465E8 00143548 2C 00 00 01 */ cmpwi r0, 1 /* 801465EC 0014354C 41 82 00 0C */ beq lbl_801465F8 /* 801465F0 00143550 2C 00 00 02 */ cmpwi r0, 2 -/* 801465F4 00143554 4C 82 00 20 */ bnelr +/* 801465F4 00143554 4C 82 00 20 */ bnelr lbl_801465F8: /* 801465F8 00143558 38 60 00 01 */ li r3, 1 -/* 801465FC 0014355C 4E 80 00 20 */ blr +/* 801465FC 0014355C 4E 80 00 20 */ blr .global __ct__7CBSJumpFv __ct__7CBSJumpFv: diff --git a/asm/MetroidPrime/BodyState/CBSKnockBack.s b/asm/MetroidPrime/BodyState/CBSKnockBack.s index 5754537b..bd5b2340 100644 --- a/asm/MetroidPrime/BodyState/CBSKnockBack.s +++ b/asm/MetroidPrime/BodyState/CBSKnockBack.s @@ -48,12 +48,12 @@ lbl_80136240: /* 80136248 001331A8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8013624C 001331AC 7C 08 03 A6 */ mtlr r0 /* 80136250 001331B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80136254 001331B4 4E 80 00 20 */ blr +/* 80136254 001331B4 4E 80 00 20 */ blr .global IsMoving__12CBSKnockBackCFv IsMoving__12CBSKnockBackCFv: /* 80136258 001331B8 38 60 00 01 */ li r3, 1 -/* 8013625C 001331BC 4E 80 00 20 */ blr +/* 8013625C 001331BC 4E 80 00 20 */ blr .global GetBodyStateTransition__12CBSKnockBackFfR15CBodyController GetBodyStateTransition__12CBSKnockBackFfR15CBodyController: @@ -116,11 +116,11 @@ lbl_8013631C: /* 80136328 00133288 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8013632C 0013328C 7C 08 03 A6 */ mtlr r0 /* 80136330 00133290 38 21 00 20 */ addi r1, r1, 0x20 -/* 80136334 00133294 4E 80 00 20 */ blr +/* 80136334 00133294 4E 80 00 20 */ blr .global Shutdown__12CBSKnockBackFR15CBodyController Shutdown__12CBSKnockBackFR15CBodyController: -/* 80136338 00133298 4E 80 00 20 */ blr +/* 80136338 00133298 4E 80 00 20 */ blr .global UpdateBody__12CBSKnockBackFfR15CBodyControllerR13CStateManager UpdateBody__12CBSKnockBackFfR15CBodyControllerR13CStateManager: @@ -168,7 +168,7 @@ lbl_801363C4: /* 801363DC 0013333C 83 A1 00 24 */ lwz r29, 0x24(r1) /* 801363E0 00133340 7C 08 03 A6 */ mtlr r0 /* 801363E4 00133344 38 21 00 40 */ addi r1, r1, 0x40 -/* 801363E8 00133348 4E 80 00 20 */ blr +/* 801363E8 00133348 4E 80 00 20 */ blr .global Start__12CBSKnockBackFR15CBodyControllerR13CStateManager Start__12CBSKnockBackFR15CBodyControllerR13CStateManager: @@ -424,7 +424,7 @@ lbl_80136784: /* 80136790 001336F0 80 01 01 54 */ lwz r0, 0x154(r1) /* 80136794 001336F4 7C 08 03 A6 */ mtlr r0 /* 80136798 001336F8 38 21 01 50 */ addi r1, r1, 0x150 -/* 8013679C 001336FC 4E 80 00 20 */ blr +/* 8013679C 001336FC 4E 80 00 20 */ blr .global __ct__12CBSKnockBackFv __ct__12CBSKnockBackFv: diff --git a/asm/MetroidPrime/BodyState/CBSLieOnGround.s b/asm/MetroidPrime/BodyState/CBSLieOnGround.s index f2f51995..dcce9b83 100644 --- a/asm/MetroidPrime/BodyState/CBSLieOnGround.s +++ b/asm/MetroidPrime/BodyState/CBSLieOnGround.s @@ -48,7 +48,7 @@ lbl_80136810: /* 80136818 00133778 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8013681C 0013377C 7C 08 03 A6 */ mtlr r0 /* 80136820 00133780 38 21 00 10 */ addi r1, r1, 0x10 -/* 80136824 00133784 4E 80 00 20 */ blr +/* 80136824 00133784 4E 80 00 20 */ blr .global GetBodyStateTransition__14CBSLieOnGroundFfR15CBodyController GetBodyStateTransition__14CBSLieOnGroundFfR15CBodyController: @@ -98,7 +98,7 @@ lbl_801368BC: /* 801368C4 00133824 83 C1 00 08 */ lwz r30, 8(r1) /* 801368C8 00133828 7C 08 03 A6 */ mtlr r0 /* 801368CC 0013382C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801368D0 00133830 4E 80 00 20 */ blr +/* 801368D0 00133830 4E 80 00 20 */ blr .global Shutdown__14CBSLieOnGroundFR15CBodyController Shutdown__14CBSLieOnGroundFR15CBodyController: @@ -111,7 +111,7 @@ Shutdown__14CBSLieOnGroundFR15CBodyController: /* 801368EC 0013384C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801368F0 00133850 7C 08 03 A6 */ mtlr r0 /* 801368F4 00133854 38 21 00 10 */ addi r1, r1, 0x10 -/* 801368F8 00133858 4E 80 00 20 */ blr +/* 801368F8 00133858 4E 80 00 20 */ blr .global UpdateBody__14CBSLieOnGroundFfR15CBodyControllerR13CStateManager UpdateBody__14CBSLieOnGroundFfR15CBodyControllerR13CStateManager: @@ -122,7 +122,7 @@ UpdateBody__14CBSLieOnGroundFfR15CBodyControllerR13CStateManager: /* 8013690C 0013386C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80136910 00133870 7C 08 03 A6 */ mtlr r0 /* 80136914 00133874 38 21 00 10 */ addi r1, r1, 0x10 -/* 80136918 00133878 4E 80 00 20 */ blr +/* 80136918 00133878 4E 80 00 20 */ blr .global Start__14CBSLieOnGroundFR15CBodyControllerR13CStateManager Start__14CBSLieOnGroundFR15CBodyControllerR13CStateManager: @@ -244,7 +244,7 @@ lbl_80136ABC: /* 80136ACC 00133A2C 83 81 00 D0 */ lwz r28, 0xd0(r1) /* 80136AD0 00133A30 7C 08 03 A6 */ mtlr r0 /* 80136AD4 00133A34 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 80136AD8 00133A38 4E 80 00 20 */ blr +/* 80136AD8 00133A38 4E 80 00 20 */ blr .global __ct__14CBSLieOnGroundFRC6CActor __ct__14CBSLieOnGroundFRC6CActor: diff --git a/asm/MetroidPrime/BodyState/CBSLocomotion.s b/asm/MetroidPrime/BodyState/CBSLocomotion.s index 1a1b6215..6dc9a75a 100644 --- a/asm/MetroidPrime/BodyState/CBSLocomotion.s +++ b/asm/MetroidPrime/BodyState/CBSLocomotion.s @@ -308,27 +308,27 @@ lbl_80136C14: /* 80136C1C 00133B7C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80136C20 00133B80 7C 08 03 A6 */ mtlr r0 /* 80136C24 00133B84 38 21 00 10 */ addi r1, r1, 0x10 -/* 80136C28 00133B88 4E 80 00 20 */ blr +/* 80136C28 00133B88 4E 80 00 20 */ blr .global IsMoving__23CBSRestrictedLocomotionCFv IsMoving__23CBSRestrictedLocomotionCFv: /* 80136C2C 00133B8C 38 60 00 00 */ li r3, 0 -/* 80136C30 00133B90 4E 80 00 20 */ blr +/* 80136C30 00133B90 4E 80 00 20 */ blr .global GetLocomotionSpeed__23CBSRestrictedLocomotionCFQ23pas15ELocomotionTypeQ23pas15ELocomotionAnim GetLocomotionSpeed__23CBSRestrictedLocomotionCFQ23pas15ELocomotionTypeQ23pas15ELocomotionAnim: /* 80136C34 00133B94 C0 22 9A 34 */ lfs f1, lbl_805AB754@sda21(r2) -/* 80136C38 00133B98 4E 80 00 20 */ blr +/* 80136C38 00133B98 4E 80 00 20 */ blr .global CanShoot__13CBSLocomotionCFv CanShoot__13CBSLocomotionCFv: /* 80136C3C 00133B9C 38 60 00 01 */ li r3, 1 -/* 80136C40 00133BA0 4E 80 00 20 */ blr +/* 80136C40 00133BA0 4E 80 00 20 */ blr .global IsPitchable__13CBSLocomotionCFv IsPitchable__13CBSLocomotionCFv: /* 80136C44 00133BA4 38 60 00 00 */ li r3, 0 -/* 80136C48 00133BA8 4E 80 00 20 */ blr +/* 80136C48 00133BA8 4E 80 00 20 */ blr .global ApplyLocomotionPhysics__28CBSRestrictedFlyerLocomotionFfR15CBodyController ApplyLocomotionPhysics__28CBSRestrictedFlyerLocomotionFfR15CBodyController: @@ -379,7 +379,7 @@ lbl_80136CE4: /* 80136CF8 00133C58 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80136CFC 00133C5C 7C 08 03 A6 */ mtlr r0 /* 80136D00 00133C60 38 21 00 40 */ addi r1, r1, 0x40 -/* 80136D04 00133C64 4E 80 00 20 */ blr +/* 80136D04 00133C64 4E 80 00 20 */ blr .global __ct__28CBSRestrictedFlyerLocomotionFR6CActor __ct__28CBSRestrictedFlyerLocomotionFR6CActor: @@ -397,7 +397,7 @@ __ct__28CBSRestrictedFlyerLocomotionFR6CActor: /* 80136D34 00133C94 80 01 00 14 */ lwz r0, 0x14(r1) /* 80136D38 00133C98 7C 08 03 A6 */ mtlr r0 /* 80136D3C 00133C9C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80136D40 00133CA0 4E 80 00 20 */ blr +/* 80136D40 00133CA0 4E 80 00 20 */ blr .global __dt__23CBSRestrictedLocomotionFv __dt__23CBSRestrictedLocomotionFv: @@ -458,7 +458,7 @@ lbl_80136DF8: /* 80136E00 00133D60 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80136E04 00133D64 7C 08 03 A6 */ mtlr r0 /* 80136E08 00133D68 38 21 00 10 */ addi r1, r1, 0x10 -/* 80136E0C 00133D6C 4E 80 00 20 */ blr +/* 80136E0C 00133D6C 4E 80 00 20 */ blr .global UpdateLocomotionAnimation__21CBSNewFlyerLocomotionFffR15CBodyControllerb UpdateLocomotionAnimation__21CBSNewFlyerLocomotionFffR15CBodyControllerb: @@ -585,7 +585,7 @@ lbl_80136FC0: /* 80136FC8 00133F28 C0 22 9A 38 */ lfs f1, lbl_805AB758@sda21(r2) /* 80136FCC 00133F2C 7C 08 03 A6 */ mtlr r0 /* 80136FD0 00133F30 38 21 00 80 */ addi r1, r1, 0x80 -/* 80136FD4 00133F34 4E 80 00 20 */ blr +/* 80136FD4 00133F34 4E 80 00 20 */ blr .global ApplyLocomotionPhysics__21CBSNewFlyerLocomotionFfR15CBodyController ApplyLocomotionPhysics__21CBSNewFlyerLocomotionFfR15CBodyController: @@ -615,7 +615,7 @@ lbl_80137020: /* 80137030 00133F90 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80137034 00133F94 7C 08 03 A6 */ mtlr r0 /* 80137038 00133F98 38 21 00 30 */ addi r1, r1, 0x30 -/* 8013703C 00133F9C 4E 80 00 20 */ blr +/* 8013703C 00133F9C 4E 80 00 20 */ blr .global __ct__21CBSNewFlyerLocomotionFR6CActor __ct__21CBSNewFlyerLocomotionFR6CActor: @@ -633,7 +633,7 @@ __ct__21CBSNewFlyerLocomotionFR6CActor: /* 8013706C 00133FCC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80137070 00133FD0 7C 08 03 A6 */ mtlr r0 /* 80137074 00133FD4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80137078 00133FD8 4E 80 00 20 */ blr +/* 80137078 00133FD8 4E 80 00 20 */ blr .global __dt__18CBSBiPedLocomotionFv __dt__18CBSBiPedLocomotionFv: @@ -710,7 +710,7 @@ lbl_80137164: /* 8013716C 001340CC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80137170 001340D0 7C 08 03 A6 */ mtlr r0 /* 80137174 001340D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80137178 001340D8 4E 80 00 20 */ blr +/* 80137178 001340D8 4E 80 00 20 */ blr .global ApplyLocomotionPhysics__23CBSWallWalkerLocomotionFfR15CBodyController ApplyLocomotionPhysics__23CBSWallWalkerLocomotionFfR15CBodyController: @@ -858,7 +858,7 @@ lbl_80137374: /* 80137390 001342F0 83 A1 00 94 */ lwz r29, 0x94(r1) /* 80137394 001342F4 7C 08 03 A6 */ mtlr r0 /* 80137398 001342F8 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 8013739C 001342FC 4E 80 00 20 */ blr +/* 8013739C 001342FC 4E 80 00 20 */ blr .global __ct__23CBSWallWalkerLocomotionFR6CActor __ct__23CBSWallWalkerLocomotionFR6CActor: @@ -876,7 +876,7 @@ __ct__23CBSWallWalkerLocomotionFR6CActor: /* 801373CC 0013432C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801373D0 00134330 7C 08 03 A6 */ mtlr r0 /* 801373D4 00134334 38 21 00 10 */ addi r1, r1, 0x10 -/* 801373D8 00134338 4E 80 00 20 */ blr +/* 801373D8 00134338 4E 80 00 20 */ blr .global ApplyLocomotionPhysics__18CBSFlyerLocomotionFfR15CBodyController ApplyLocomotionPhysics__18CBSFlyerLocomotionFfR15CBodyController: @@ -952,7 +952,7 @@ lbl_801374C8: /* 801374E8 00134448 83 A1 00 44 */ lwz r29, 0x44(r1) /* 801374EC 0013444C 7C 08 03 A6 */ mtlr r0 /* 801374F0 00134450 38 21 00 70 */ addi r1, r1, 0x70 -/* 801374F4 00134454 4E 80 00 20 */ blr +/* 801374F4 00134454 4E 80 00 20 */ blr .global __ct__18CBSFlyerLocomotionFR6CActorb __ct__18CBSFlyerLocomotionFR6CActorb: @@ -974,7 +974,7 @@ __ct__18CBSFlyerLocomotionFR6CActorb: /* 80137534 00134494 83 C1 00 08 */ lwz r30, 8(r1) /* 80137538 00134498 7C 08 03 A6 */ mtlr r0 /* 8013753C 0013449C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80137540 001344A0 4E 80 00 20 */ blr +/* 80137540 001344A0 4E 80 00 20 */ blr .global UpdateLocomotionAnimation__23CBSRestrictedLocomotionFffR15CBodyControllerb UpdateLocomotionAnimation__23CBSRestrictedLocomotionFffR15CBodyControllerb: @@ -1027,7 +1027,7 @@ lbl_801375E4: /* 801375EC 0013454C 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 801375F0 00134550 7C 08 03 A6 */ mtlr r0 /* 801375F4 00134554 38 21 00 40 */ addi r1, r1, 0x40 -/* 801375F8 00134558 4E 80 00 20 */ blr +/* 801375F8 00134558 4E 80 00 20 */ blr .global __ct__23CBSRestrictedLocomotionFR6CActor __ct__23CBSRestrictedLocomotionFR6CActor: @@ -1200,7 +1200,7 @@ lbl_80137840: /* 80137848 001347A8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8013784C 001347AC 7C 08 03 A6 */ mtlr r0 /* 80137850 001347B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80137854 001347B4 4E 80 00 20 */ blr +/* 80137854 001347B4 4E 80 00 20 */ blr .global UpdateRun__18CBSBiPedLocomotionFfR15CBodyControllerQ23pas15ELocomotionAnim UpdateRun__18CBSBiPedLocomotionFfR15CBodyControllerQ23pas15ELocomotionAnim: @@ -1328,7 +1328,7 @@ lbl_80137A0C: /* 80137A1C 0013497C 80 01 00 94 */ lwz r0, 0x94(r1) /* 80137A20 00134980 7C 08 03 A6 */ mtlr r0 /* 80137A24 00134984 38 21 00 90 */ addi r1, r1, 0x90 -/* 80137A28 00134988 4E 80 00 20 */ blr +/* 80137A28 00134988 4E 80 00 20 */ blr .global UpdateWalk__18CBSBiPedLocomotionFfR15CBodyControllerQ23pas15ELocomotionAnim UpdateWalk__18CBSBiPedLocomotionFfR15CBodyControllerQ23pas15ELocomotionAnim: @@ -1414,7 +1414,7 @@ lbl_80137B30: /* 80137B58 00134AB8 83 A1 00 44 */ lwz r29, 0x44(r1) /* 80137B5C 00134ABC 7C 08 03 A6 */ mtlr r0 /* 80137B60 00134AC0 38 21 00 60 */ addi r1, r1, 0x60 -/* 80137B64 00134AC4 4E 80 00 20 */ blr +/* 80137B64 00134AC4 4E 80 00 20 */ blr .global UpdateStrafe__18CBSBiPedLocomotionFfR15CBodyControllerQ23pas15ELocomotionAnim UpdateStrafe__18CBSBiPedLocomotionFfR15CBodyControllerQ23pas15ELocomotionAnim: @@ -1508,7 +1508,7 @@ lbl_80137C8C: /* 80137CB0 00134C10 7F A5 00 2E */ lwzx r29, r5, r0 /* 80137CB4 00134C14 7F A5 EB 78 */ mr r5, r29 /* 80137CB8 00134C18 7D 89 03 A6 */ mtctr r12 -/* 80137CBC 00134C1C 4E 80 04 21 */ bctrl +/* 80137CBC 00134C1C 4E 80 04 21 */ bctrl /* 80137CC0 00134C20 7C 1C E8 00 */ cmpw r28, r29 /* 80137CC4 00134C24 EF FF 00 72 */ fmuls f31, f31, f1 /* 80137CC8 00134C28 41 82 00 7C */ beq lbl_80137D44 @@ -1582,7 +1582,7 @@ lbl_80137DA8: /* 80137DC4 00134D24 83 81 00 60 */ lwz r28, 0x60(r1) /* 80137DC8 00134D28 7C 08 03 A6 */ mtlr r0 /* 80137DCC 00134D2C 38 21 00 80 */ addi r1, r1, 0x80 -/* 80137DD0 00134D30 4E 80 00 20 */ blr +/* 80137DD0 00134D30 4E 80 00 20 */ blr .global IsStrafing__18CBSBiPedLocomotionCFR15CBodyController IsStrafing__18CBSBiPedLocomotionCFR15CBodyController: @@ -1615,7 +1615,7 @@ lbl_80137E2C: /* 80137E38 00134D98 83 C1 00 08 */ lwz r30, 8(r1) /* 80137E3C 00134D9C 7C 08 03 A6 */ mtlr r0 /* 80137E40 00134DA0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80137E44 00134DA4 4E 80 00 20 */ blr +/* 80137E44 00134DA4 4E 80 00 20 */ blr .global GetLocoAnimation__18CBSBiPedLocomotionCFQ23pas15ELocomotionTypeQ23pas15ELocomotionAnim GetLocoAnimation__18CBSBiPedLocomotionCFQ23pas15ELocomotionTypeQ23pas15ELocomotionAnim: @@ -1624,7 +1624,7 @@ GetLocoAnimation__18CBSBiPedLocomotionCFQ23pas15ELocomotionTypeQ23pas15ELocomoti /* 80137E50 00134DB0 7C 63 22 14 */ add r3, r3, r4 /* 80137E54 00134DB4 7C 63 02 14 */ add r3, r3, r0 /* 80137E58 00134DB8 38 63 00 10 */ addi r3, r3, 0x10 -/* 80137E5C 00134DBC 4E 80 00 20 */ blr +/* 80137E5C 00134DBC 4E 80 00 20 */ blr .global UpdateLocomotionAnimation__18CBSBiPedLocomotionFffR15CBodyControllerb UpdateLocomotionAnimation__18CBSBiPedLocomotionFffR15CBodyControllerb: @@ -1670,14 +1670,14 @@ lbl_80137EE4: /* 80137EF0 00134E50 38 A0 00 02 */ li r5, 2 /* 80137EF4 00134E54 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 80137EF8 00134E58 7D 89 03 A6 */ mtctr r12 -/* 80137EFC 00134E5C 4E 80 04 21 */ bctrl +/* 80137EFC 00134E5C 4E 80 04 21 */ bctrl /* 80137F00 00134E60 7F 83 E3 78 */ mr r3, r28 /* 80137F04 00134E64 EF DD 00 72 */ fmuls f30, f29, f1 /* 80137F08 00134E68 81 9C 00 00 */ lwz r12, 0(r28) /* 80137F0C 00134E6C 7F A4 EB 78 */ mr r4, r29 /* 80137F10 00134E70 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 80137F14 00134E74 7D 89 03 A6 */ mtctr r12 -/* 80137F18 00134E78 4E 80 04 21 */ bctrl +/* 80137F18 00134E78 4E 80 04 21 */ bctrl /* 80137F1C 00134E7C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80137F20 00134E80 41 82 00 30 */ beq lbl_80137F50 /* 80137F24 00134E84 C0 02 9A 44 */ lfs f0, lbl_805AB764@sda21(r2) @@ -1783,7 +1783,7 @@ lbl_80138064: /* 80138098 00134FF8 83 81 00 30 */ lwz r28, 0x30(r1) /* 8013809C 00134FFC 7C 08 03 A6 */ mtlr r0 /* 801380A0 00135000 38 21 00 80 */ addi r1, r1, 0x80 -/* 801380A4 00135004 4E 80 00 20 */ blr +/* 801380A4 00135004 4E 80 00 20 */ blr .global UpdateBody__18CBSBiPedLocomotionFfR15CBodyControllerR13CStateManager UpdateBody__18CBSBiPedLocomotionFfR15CBodyControllerR13CStateManager: @@ -1801,7 +1801,7 @@ lbl_801380CC: /* 801380D0 00135030 80 01 00 14 */ lwz r0, 0x14(r1) /* 801380D4 00135034 7C 08 03 A6 */ mtlr r0 /* 801380D8 00135038 38 21 00 10 */ addi r1, r1, 0x10 -/* 801380DC 0013503C 4E 80 00 20 */ blr +/* 801380DC 0013503C 4E 80 00 20 */ blr .global Start__18CBSBiPedLocomotionFR15CBodyControllerR13CStateManager Start__18CBSBiPedLocomotionFR15CBodyControllerR13CStateManager: @@ -1814,7 +1814,7 @@ Start__18CBSBiPedLocomotionFR15CBodyControllerR13CStateManager: /* 801380F8 00135058 80 01 00 14 */ lwz r0, 0x14(r1) /* 801380FC 0013505C 7C 08 03 A6 */ mtlr r0 /* 80138100 00135060 38 21 00 10 */ addi r1, r1, 0x10 -/* 80138104 00135064 4E 80 00 20 */ blr +/* 80138104 00135064 4E 80 00 20 */ blr .global GetLocomotionSpeed__18CBSBiPedLocomotionCFQ23pas15ELocomotionTypeQ23pas15ELocomotionAnim GetLocomotionSpeed__18CBSBiPedLocomotionCFQ23pas15ELocomotionTypeQ23pas15ELocomotionAnim: @@ -1826,7 +1826,7 @@ GetLocomotionSpeed__18CBSBiPedLocomotionCFQ23pas15ELocomotionTypeQ23pas15ELocomo /* 8013811C 0013507C C0 23 00 04 */ lfs f1, 4(r3) /* 80138120 00135080 7C 08 03 A6 */ mtlr r0 /* 80138124 00135084 38 21 00 10 */ addi r1, r1, 0x10 -/* 80138128 00135088 4E 80 00 20 */ blr +/* 80138128 00135088 4E 80 00 20 */ blr .global __ct__18CBSBiPedLocomotionFR6CActor __ct__18CBSBiPedLocomotionFR6CActor: @@ -2047,7 +2047,7 @@ lbl_801383F8: /* 80138420 00135380 80 01 01 24 */ lwz r0, 0x124(r1) /* 80138424 00135384 7C 08 03 A6 */ mtlr r0 /* 80138428 00135388 38 21 01 20 */ addi r1, r1, 0x120 -/* 8013842C 0013538C 4E 80 00 20 */ blr +/* 8013842C 0013538C 4E 80 00 20 */ blr .global GetBodyStateTransition__13CBSLocomotionFfR15CBodyController GetBodyStateTransition__13CBSLocomotionFfR15CBodyController: @@ -2233,7 +2233,7 @@ lbl_8013869C: /* 801386A8 00135608 81 9D 00 00 */ lwz r12, 0(r29) /* 801386AC 0013560C 81 8C 00 18 */ lwz r12, 0x18(r12) /* 801386B0 00135610 7D 89 03 A6 */ mtctr r12 -/* 801386B4 00135614 4E 80 04 21 */ bctrl +/* 801386B4 00135614 4E 80 04 21 */ bctrl /* 801386B8 00135618 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801386BC 0013561C 40 82 00 0C */ bne lbl_801386C8 /* 801386C0 00135620 38 60 00 08 */ li r3, 8 @@ -2254,7 +2254,7 @@ lbl_801386E4: /* 801386F0 00135650 83 A1 00 14 */ lwz r29, 0x14(r1) /* 801386F4 00135654 7C 08 03 A6 */ mtlr r0 /* 801386F8 00135658 38 21 00 20 */ addi r1, r1, 0x20 -/* 801386FC 0013565C 4E 80 00 20 */ blr +/* 801386FC 0013565C 4E 80 00 20 */ blr .global "ComputeWeightPercentage__13CBSLocomotionCFRCQ24rstl9pairRCQ24rstl9pairf" "ComputeWeightPercentage__13CBSLocomotionCFRCQ24rstl9pairRCQ24rstl9pairf": @@ -2288,7 +2288,7 @@ lbl_8013875C: /* 8013875C 001356BC C0 22 9A 34 */ lfs f1, lbl_805AB754@sda21(r2) lbl_80138760: /* 80138760 001356C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80138764 001356C4 4E 80 00 20 */ blr +/* 80138764 001356C4 4E 80 00 20 */ blr .global GetStartVelocityMagnitude__13CBSLocomotionCFR15CBodyController GetStartVelocityMagnitude__13CBSLocomotionCFR15CBodyController: @@ -2336,7 +2336,7 @@ lbl_801387EC: /* 801387F8 00135758 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801387FC 0013575C 7C 08 03 A6 */ mtlr r0 /* 80138800 00135760 38 21 00 30 */ addi r1, r1, 0x30 -/* 80138804 00135764 4E 80 00 20 */ blr +/* 80138804 00135764 4E 80 00 20 */ blr .global ReStartBodyState__13CBSLocomotionFR15CBodyControllerb ReStartBodyState__13CBSLocomotionFR15CBodyControllerb: @@ -2362,13 +2362,13 @@ lbl_80138838: /* 8013884C 001357AC 38 A0 00 01 */ li r5, 1 /* 80138850 001357B0 81 8C 00 44 */ lwz r12, 0x44(r12) /* 80138854 001357B4 7D 89 03 A6 */ mtctr r12 -/* 80138858 001357B8 4E 80 04 21 */ bctrl +/* 80138858 001357B8 4E 80 04 21 */ bctrl /* 8013885C 001357BC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80138860 001357C0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80138864 001357C4 83 C1 00 08 */ lwz r30, 8(r1) /* 80138868 001357C8 7C 08 03 A6 */ mtlr r0 /* 8013886C 001357CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80138870 001357D0 4E 80 00 20 */ blr +/* 80138870 001357D0 4E 80 00 20 */ blr .global ApplyLocomotionPhysics__13CBSLocomotionFfR15CBodyController ApplyLocomotionPhysics__13CBSLocomotionFfR15CBodyController: @@ -2412,7 +2412,7 @@ lbl_801388D8: /* 80138904 00135864 81 9B 00 00 */ lwz r12, 0(r27) /* 80138908 00135868 81 8C 00 38 */ lwz r12, 0x38(r12) /* 8013890C 0013586C 7D 89 03 A6 */ mtctr r12 -/* 80138910 00135870 4E 80 04 21 */ bctrl +/* 80138910 00135870 4E 80 04 21 */ bctrl /* 80138914 00135874 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80138918 00135878 41 82 01 64 */ beq lbl_80138A7C /* 8013891C 0013587C C0 7F 00 58 */ lfs f3, 0x58(r31) @@ -2538,7 +2538,7 @@ lbl_80138ACC: /* 80138AD8 00135A38 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 80138ADC 00135A3C 7C 08 03 A6 */ mtlr r0 /* 80138AE0 00135A40 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 80138AE4 00135A44 4E 80 00 20 */ blr +/* 80138AE4 00135A44 4E 80 00 20 */ blr .global Shutdown__13CBSLocomotionFR15CBodyController Shutdown__13CBSLocomotionFR15CBodyController: @@ -2551,7 +2551,7 @@ Shutdown__13CBSLocomotionFR15CBodyController: /* 80138B00 00135A60 80 01 00 14 */ lwz r0, 0x14(r1) /* 80138B04 00135A64 7C 08 03 A6 */ mtlr r0 /* 80138B08 00135A68 38 21 00 10 */ addi r1, r1, 0x10 -/* 80138B0C 00135A6C 4E 80 00 20 */ blr +/* 80138B0C 00135A6C 4E 80 00 20 */ blr .global UpdateBody__13CBSLocomotionFfR15CBodyControllerR13CStateManager UpdateBody__13CBSLocomotionFfR15CBodyControllerR13CStateManager: @@ -2568,7 +2568,7 @@ UpdateBody__13CBSLocomotionFfR15CBodyControllerR13CStateManager: /* 80138B38 00135A98 81 83 00 00 */ lwz r12, 0(r3) /* 80138B3C 00135A9C 81 8C 00 48 */ lwz r12, 0x48(r12) /* 80138B40 00135AA0 7D 89 03 A6 */ mtctr r12 -/* 80138B44 00135AA4 4E 80 04 21 */ bctrl +/* 80138B44 00135AA4 4E 80 04 21 */ bctrl /* 80138B48 00135AA8 7C 7F 1B 78 */ mr r31, r3 /* 80138B4C 00135AAC 2C 1F FF FF */ cmpwi r31, -1 /* 80138B50 00135AB0 40 82 00 48 */ bne lbl_80138B98 @@ -2578,7 +2578,7 @@ UpdateBody__13CBSLocomotionFfR15CBodyControllerR13CStateManager: /* 80138B60 00135AC0 7F C4 F3 78 */ mr r4, r30 /* 80138B64 00135AC4 81 8C 00 40 */ lwz r12, 0x40(r12) /* 80138B68 00135AC8 7D 89 03 A6 */ mtctr r12 -/* 80138B6C 00135ACC 4E 80 04 21 */ bctrl +/* 80138B6C 00135ACC 4E 80 04 21 */ bctrl /* 80138B70 00135AD0 FC 00 08 90 */ fmr f0, f1 /* 80138B74 00135AD4 81 9D 00 00 */ lwz r12, 0(r29) /* 80138B78 00135AD8 FC 20 F8 90 */ fmr f1, f31 @@ -2588,7 +2588,7 @@ UpdateBody__13CBSLocomotionFfR15CBodyControllerR13CStateManager: /* 80138B88 00135AE8 FC 40 00 90 */ fmr f2, f0 /* 80138B8C 00135AEC 38 A0 00 00 */ li r5, 0 /* 80138B90 00135AF0 7D 89 03 A6 */ mtctr r12 -/* 80138B94 00135AF4 4E 80 04 21 */ bctrl +/* 80138B94 00135AF4 4E 80 04 21 */ bctrl lbl_80138B98: /* 80138B98 00135AF8 80 01 00 24 */ lwz r0, 0x24(r1) /* 80138B9C 00135AFC 7F E3 FB 78 */ mr r3, r31 @@ -2598,7 +2598,7 @@ lbl_80138B98: /* 80138BAC 00135B0C 83 A1 00 0C */ lwz r29, 0xc(r1) /* 80138BB0 00135B10 7C 08 03 A6 */ mtlr r0 /* 80138BB4 00135B14 38 21 00 20 */ addi r1, r1, 0x20 -/* 80138BB8 00135B18 4E 80 00 20 */ blr +/* 80138BB8 00135B18 4E 80 00 20 */ blr .global Start__13CBSLocomotionFR15CBodyControllerR13CStateManager Start__13CBSLocomotionFR15CBodyControllerR13CStateManager: @@ -2632,7 +2632,7 @@ lbl_80138C18: /* 80138C20 00135B80 83 C1 00 08 */ lwz r30, 8(r1) /* 80138C24 00135B84 7C 08 03 A6 */ mtlr r0 /* 80138C28 00135B88 38 21 00 10 */ addi r1, r1, 0x10 -/* 80138C2C 00135B8C 4E 80 00 20 */ blr +/* 80138C2C 00135B8C 4E 80 00 20 */ blr .global __ct__13CBSLocomotionFv __ct__13CBSLocomotionFv: @@ -2644,7 +2644,7 @@ __ct__13CBSLocomotionFv: /* 80138C44 00135BA4 38 84 16 CC */ addi r4, r4, lbl_803E16CC@l /* 80138C48 00135BA8 90 83 00 00 */ stw r4, 0(r3) /* 80138C4C 00135BAC 90 03 00 04 */ stw r0, 4(r3) -/* 80138C50 00135BB0 4E 80 00 20 */ blr +/* 80138C50 00135BB0 4E 80 00 20 */ blr .global __dt__21CBSNewFlyerLocomotion __dt__21CBSNewFlyerLocomotion: @@ -2672,7 +2672,7 @@ lbl_80138C98: /* 80138CA4 00135C04 83 C1 00 08 */ lwz r30, 8(r1) /* 80138CA8 00135C08 7C 08 03 A6 */ mtlr r0 /* 80138CAC 00135C0C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80138CB0 00135C10 4E 80 00 20 */ blr +/* 80138CB0 00135C10 4E 80 00 20 */ blr .global IsMoving__18CBSBiPedLocomotionCFv IsMoving__18CBSBiPedLocomotionCFv: @@ -2680,7 +2680,7 @@ IsMoving__18CBSBiPedLocomotionCFv: /* 80138CB8 00135C18 7C 03 00 D0 */ neg r0, r3 /* 80138CBC 00135C1C 7C 00 1B 78 */ or r0, r0, r3 /* 80138CC0 00135C20 54 03 0F FE */ srwi r3, r0, 0x1f -/* 80138CC4 00135C24 4E 80 00 20 */ blr +/* 80138CC4 00135C24 4E 80 00 20 */ blr .global __dt__23CBSWallWalkerLocomotion __dt__23CBSWallWalkerLocomotion: @@ -2708,7 +2708,7 @@ lbl_80138D0C: /* 80138D18 00135C78 83 C1 00 08 */ lwz r30, 8(r1) /* 80138D1C 00135C7C 7C 08 03 A6 */ mtlr r0 /* 80138D20 00135C80 38 21 00 10 */ addi r1, r1, 0x10 -/* 80138D24 00135C84 4E 80 00 20 */ blr +/* 80138D24 00135C84 4E 80 00 20 */ blr .global __dt__18CBSFlyerLocomotion __dt__18CBSFlyerLocomotion: @@ -2736,20 +2736,20 @@ lbl_80138D6C: /* 80138D78 00135CD8 83 C1 00 08 */ lwz r30, 8(r1) /* 80138D7C 00135CDC 7C 08 03 A6 */ mtlr r0 /* 80138D80 00135CE0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80138D84 00135CE4 4E 80 00 20 */ blr +/* 80138D84 00135CE4 4E 80 00 20 */ blr .global IsBackPedal__18CBSFlyerLocomotionCFR15CBodyController IsBackPedal__18CBSFlyerLocomotionCFR15CBodyController: /* 80138D88 00135CE8 38 60 00 00 */ li r3, 0 -/* 80138D8C 00135CEC 4E 80 00 20 */ blr +/* 80138D8C 00135CEC 4E 80 00 20 */ blr .global IsPitchable__18CBSFlyerLocomotionCFv IsPitchable__18CBSFlyerLocomotionCFv: /* 80138D90 00135CF0 88 63 03 CC */ lbz r3, 0x3cc(r3) -/* 80138D94 00135CF4 4E 80 00 20 */ blr +/* 80138D94 00135CF4 4E 80 00 20 */ blr .global __sinit_CBSFlyerLocomotion_cpp __sinit_CBSFlyerLocomotion_cpp: /* 80138D98 00135CF8 C0 02 9A 54 */ lfs f0, lbl_805AB774@sda21(r2) /* 80138D9C 00135CFC D0 0D A3 C0 */ stfs f0, lbl_805A8F80@sda21(r13) -/* 80138DA0 00135D00 4E 80 00 20 */ blr +/* 80138DA0 00135D00 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/BodyState/CBSLoopAttack.s b/asm/MetroidPrime/BodyState/CBSLoopAttack.s index c5bc608c..f462c460 100644 --- a/asm/MetroidPrime/BodyState/CBSLoopAttack.s +++ b/asm/MetroidPrime/BodyState/CBSLoopAttack.s @@ -48,12 +48,12 @@ lbl_8013AF10: /* 8013AF18 00137E78 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8013AF1C 00137E7C 7C 08 03 A6 */ mtlr r0 /* 8013AF20 00137E80 38 21 00 10 */ addi r1, r1, 0x10 -/* 8013AF24 00137E84 4E 80 00 20 */ blr +/* 8013AF24 00137E84 4E 80 00 20 */ blr .global CanShoot__13CBSLoopAttackCFv CanShoot__13CBSLoopAttackCFv: /* 8013AF28 00137E88 38 60 00 01 */ li r3, 1 -/* 8013AF2C 00137E8C 4E 80 00 20 */ blr +/* 8013AF2C 00137E8C 4E 80 00 20 */ blr .global GetBodyStateTransition__13CBSLoopAttackFfR15CBodyController GetBodyStateTransition__13CBSLoopAttackFfR15CBodyController: @@ -184,11 +184,11 @@ lbl_8013B0D8: /* 8013B0E0 00138040 83 C1 00 08 */ lwz r30, 8(r1) /* 8013B0E4 00138044 7C 08 03 A6 */ mtlr r0 /* 8013B0E8 00138048 38 21 00 10 */ addi r1, r1, 0x10 -/* 8013B0EC 0013804C 4E 80 00 20 */ blr +/* 8013B0EC 0013804C 4E 80 00 20 */ blr .global Shutdown__13CBSLoopAttackFR15CBodyController Shutdown__13CBSLoopAttackFR15CBodyController: -/* 8013B0F0 00138050 4E 80 00 20 */ blr +/* 8013B0F0 00138050 4E 80 00 20 */ blr .global UpdateBody__13CBSLoopAttackFfR15CBodyControllerR13CStateManager UpdateBody__13CBSLoopAttackFfR15CBodyControllerR13CStateManager: @@ -433,7 +433,7 @@ lbl_8013B44C: /* 8013B45C 001383BC 80 01 01 54 */ lwz r0, 0x154(r1) /* 8013B460 001383C0 7C 08 03 A6 */ mtlr r0 /* 8013B464 001383C4 38 21 01 50 */ addi r1, r1, 0x150 -/* 8013B468 001383C8 4E 80 00 20 */ blr +/* 8013B468 001383C8 4E 80 00 20 */ blr .global Start__13CBSLoopAttackFR15CBodyControllerR13CStateManager Start__13CBSLoopAttackFR15CBodyControllerR13CStateManager: @@ -695,7 +695,7 @@ lbl_8013B81C: /* 8013B828 00138788 83 A1 01 E4 */ lwz r29, 0x1e4(r1) /* 8013B82C 0013878C 7C 08 03 A6 */ mtlr r0 /* 8013B830 00138790 38 21 01 F0 */ addi r1, r1, 0x1f0 -/* 8013B834 00138794 4E 80 00 20 */ blr +/* 8013B834 00138794 4E 80 00 20 */ blr .global __ct__13CBSLoopAttackFv __ct__13CBSLoopAttackFv: diff --git a/asm/MetroidPrime/BodyState/CBSLoopReaction.s b/asm/MetroidPrime/BodyState/CBSLoopReaction.s index 9f7a4396..bf1674e7 100644 --- a/asm/MetroidPrime/BodyState/CBSLoopReaction.s +++ b/asm/MetroidPrime/BodyState/CBSLoopReaction.s @@ -48,7 +48,7 @@ lbl_8013C08C: /* 8013C094 00138FF4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8013C098 00138FF8 7C 08 03 A6 */ mtlr r0 /* 8013C09C 00138FFC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8013C0A0 00139000 4E 80 00 20 */ blr +/* 8013C0A0 00139000 4E 80 00 20 */ blr .global GetBodyStateTransition__15CBSLoopReactionFfR15CBodyController GetBodyStateTransition__15CBSLoopReactionFfR15CBodyController: @@ -174,7 +174,7 @@ lbl_8013C23C: /* 8013C244 001391A4 83 C1 00 08 */ lwz r30, 8(r1) /* 8013C248 001391A8 7C 08 03 A6 */ mtlr r0 /* 8013C24C 001391AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8013C250 001391B0 4E 80 00 20 */ blr +/* 8013C250 001391B0 4E 80 00 20 */ blr .global PlayExitAnimation__15CBSLoopReactionCFR15CBodyControllerR13CStateManager PlayExitAnimation__15CBSLoopReactionCFR15CBodyControllerR13CStateManager: @@ -321,11 +321,11 @@ lbl_8013C444: /* 8013C454 001393B4 83 81 00 D0 */ lwz r28, 0xd0(r1) /* 8013C458 001393B8 7C 08 03 A6 */ mtlr r0 /* 8013C45C 001393BC 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 8013C460 001393C0 4E 80 00 20 */ blr +/* 8013C460 001393C0 4E 80 00 20 */ blr .global Shutdown__15CBSLoopReactionFR15CBodyController Shutdown__15CBSLoopReactionFR15CBodyController: -/* 8013C464 001393C4 4E 80 00 20 */ blr +/* 8013C464 001393C4 4E 80 00 20 */ blr .global UpdateBody__15CBSLoopReactionFfR15CBodyControllerR13CStateManager UpdateBody__15CBSLoopReactionFfR15CBodyControllerR13CStateManager: @@ -523,7 +523,7 @@ lbl_8013C70C: /* 8013C71C 0013967C 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 8013C720 00139680 7C 08 03 A6 */ mtlr r0 /* 8013C724 00139684 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 8013C728 00139688 4E 80 00 20 */ blr +/* 8013C728 00139688 4E 80 00 20 */ blr .global Start__15CBSLoopReactionFR15CBodyControllerR13CStateManager Start__15CBSLoopReactionFR15CBodyControllerR13CStateManager: @@ -728,7 +728,7 @@ lbl_8013CA00: /* 8013CA10 00139970 83 81 01 50 */ lwz r28, 0x150(r1) /* 8013CA14 00139974 7C 08 03 A6 */ mtlr r0 /* 8013CA18 00139978 38 21 01 60 */ addi r1, r1, 0x160 -/* 8013CA1C 0013997C 4E 80 00 20 */ blr +/* 8013CA1C 0013997C 4E 80 00 20 */ blr .global __ct__15CBSLoopReactionFv __ct__15CBSLoopReactionFv: diff --git a/asm/MetroidPrime/BodyState/CBSProjectileAttack.s b/asm/MetroidPrime/BodyState/CBSProjectileAttack.s index 0c8c2fc0..fbced67d 100644 --- a/asm/MetroidPrime/BodyState/CBSProjectileAttack.s +++ b/asm/MetroidPrime/BodyState/CBSProjectileAttack.s @@ -48,12 +48,12 @@ lbl_8014D408: /* 8014D410 0014A370 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8014D414 0014A374 7C 08 03 A6 */ mtlr r0 /* 8014D418 0014A378 38 21 00 10 */ addi r1, r1, 0x10 -/* 8014D41C 0014A37C 4E 80 00 20 */ blr +/* 8014D41C 0014A37C 4E 80 00 20 */ blr .global CanShoot__19CBSProjectileAttackCFv CanShoot__19CBSProjectileAttackCFv: /* 8014D420 0014A380 38 60 00 01 */ li r3, 1 -/* 8014D424 0014A384 4E 80 00 20 */ blr +/* 8014D424 0014A384 4E 80 00 20 */ blr .global GetBodyStateTransition__19CBSProjectileAttackFfR15CBodyController GetBodyStateTransition__19CBSProjectileAttackFfR15CBodyController: @@ -123,11 +123,11 @@ lbl_8014D4FC: /* 8014D504 0014A464 83 C1 00 08 */ lwz r30, 8(r1) /* 8014D508 0014A468 7C 08 03 A6 */ mtlr r0 /* 8014D50C 0014A46C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8014D510 0014A470 4E 80 00 20 */ blr +/* 8014D510 0014A470 4E 80 00 20 */ blr .global Shutdown__19CBSProjectileAttackFR15CBodyController Shutdown__19CBSProjectileAttackFR15CBodyController: -/* 8014D514 0014A474 4E 80 00 20 */ blr +/* 8014D514 0014A474 4E 80 00 20 */ blr .global UpdateBody__19CBSProjectileAttackFfR15CBodyControllerR13CStateManager UpdateBody__19CBSProjectileAttackFfR15CBodyControllerR13CStateManager: @@ -174,7 +174,7 @@ lbl_8014D598: /* 8014D5AC 0014A50C 83 C1 00 08 */ lwz r30, 8(r1) /* 8014D5B0 0014A510 7C 08 03 A6 */ mtlr r0 /* 8014D5B4 0014A514 38 21 00 20 */ addi r1, r1, 0x20 -/* 8014D5B8 0014A518 4E 80 00 20 */ blr +/* 8014D5B8 0014A518 4E 80 00 20 */ blr .global Start__19CBSProjectileAttackFR15CBodyControllerR13CStateManager Start__19CBSProjectileAttackFR15CBodyControllerR13CStateManager: @@ -407,7 +407,7 @@ lbl_8014D908: /* 8014D91C 0014A87C 80 01 01 84 */ lwz r0, 0x184(r1) /* 8014D920 0014A880 7C 08 03 A6 */ mtlr r0 /* 8014D924 0014A884 38 21 01 80 */ addi r1, r1, 0x180 -/* 8014D928 0014A888 4E 80 00 20 */ blr +/* 8014D928 0014A888 4E 80 00 20 */ blr .global __ct__19CBSProjectileAttackFv __ct__19CBSProjectileAttackFv: diff --git a/asm/MetroidPrime/BodyState/CBSScripted.s b/asm/MetroidPrime/BodyState/CBSScripted.s index 8a230d16..ed2e5038 100644 --- a/asm/MetroidPrime/BodyState/CBSScripted.s +++ b/asm/MetroidPrime/BodyState/CBSScripted.s @@ -48,12 +48,12 @@ lbl_8014B104: /* 8014B10C 0014806C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8014B110 00148070 7C 08 03 A6 */ mtlr r0 /* 8014B114 00148074 38 21 00 10 */ addi r1, r1, 0x10 -/* 8014B118 00148078 4E 80 00 20 */ blr +/* 8014B118 00148078 4E 80 00 20 */ blr .global ApplyHeadTracking__11CBSScriptedCFv ApplyHeadTracking__11CBSScriptedCFv: /* 8014B11C 0014807C 38 60 00 00 */ li r3, 0 -/* 8014B120 00148080 4E 80 00 20 */ blr +/* 8014B120 00148080 4E 80 00 20 */ blr .global GetBodyStateTransition__11CBSScriptedFfR15CBodyController GetBodyStateTransition__11CBSScriptedFfR15CBodyController: @@ -131,11 +131,11 @@ lbl_8014B214: /* 8014B220 00148180 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8014B224 00148184 7C 08 03 A6 */ mtlr r0 /* 8014B228 00148188 38 21 00 20 */ addi r1, r1, 0x20 -/* 8014B22C 0014818C 4E 80 00 20 */ blr +/* 8014B22C 0014818C 4E 80 00 20 */ blr .global Shutdown__11CBSScriptedFR15CBodyController Shutdown__11CBSScriptedFR15CBodyController: -/* 8014B230 00148190 4E 80 00 20 */ blr +/* 8014B230 00148190 4E 80 00 20 */ blr .global UpdateBody__11CBSScriptedFfR15CBodyControllerR13CStateManager UpdateBody__11CBSScriptedFfR15CBodyControllerR13CStateManager: @@ -200,7 +200,7 @@ lbl_8014B2F4: /* 8014B30C 0014826C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8014B310 00148270 7C 08 03 A6 */ mtlr r0 /* 8014B314 00148274 38 21 00 30 */ addi r1, r1, 0x30 -/* 8014B318 00148278 4E 80 00 20 */ blr +/* 8014B318 00148278 4E 80 00 20 */ blr .global Start__11CBSScriptedFR15CBodyControllerR13CStateManager Start__11CBSScriptedFR15CBodyControllerR13CStateManager: @@ -252,7 +252,7 @@ Start__11CBSScriptedFR15CBodyControllerR13CStateManager: /* 8014B3D0 00148330 83 C1 00 38 */ lwz r30, 0x38(r1) /* 8014B3D4 00148334 7C 08 03 A6 */ mtlr r0 /* 8014B3D8 00148338 38 21 00 40 */ addi r1, r1, 0x40 -/* 8014B3DC 0014833C 4E 80 00 20 */ blr +/* 8014B3DC 0014833C 4E 80 00 20 */ blr .global __ct__11CBSScriptedFv __ct__11CBSScriptedFv: @@ -271,4 +271,4 @@ __ct__11CBSScriptedFv: /* 8014B410 00148370 50 80 36 72 */ rlwimi r0, r4, 6, 0x19, 0x19 /* 8014B414 00148374 98 03 00 04 */ stb r0, 4(r3) /* 8014B418 00148378 D0 03 00 08 */ stfs f0, 8(r3) -/* 8014B41C 0014837C 4E 80 00 20 */ blr +/* 8014B41C 0014837C 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/BodyState/CBSSlide.s b/asm/MetroidPrime/BodyState/CBSSlide.s index 137a7281..aff92641 100644 --- a/asm/MetroidPrime/BodyState/CBSSlide.s +++ b/asm/MetroidPrime/BodyState/CBSSlide.s @@ -48,17 +48,17 @@ lbl_80143FC8: /* 80143FD0 00140F30 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80143FD4 00140F34 7C 08 03 A6 */ mtlr r0 /* 80143FD8 00140F38 38 21 00 10 */ addi r1, r1, 0x10 -/* 80143FDC 00140F3C 4E 80 00 20 */ blr +/* 80143FDC 00140F3C 4E 80 00 20 */ blr .global IsMoving__8CBSSlideCFv IsMoving__8CBSSlideCFv: /* 80143FE0 00140F40 38 60 00 01 */ li r3, 1 -/* 80143FE4 00140F44 4E 80 00 20 */ blr +/* 80143FE4 00140F44 4E 80 00 20 */ blr .global ApplyHeadTracking__8CBSSlideCFv ApplyHeadTracking__8CBSSlideCFv: /* 80143FE8 00140F48 38 60 00 00 */ li r3, 0 -/* 80143FEC 00140F4C 4E 80 00 20 */ blr +/* 80143FEC 00140F4C 4E 80 00 20 */ blr .global GetBodyStateTransition__8CBSSlideFfR15CBodyController GetBodyStateTransition__8CBSSlideFfR15CBodyController: @@ -112,11 +112,11 @@ lbl_80144090: /* 80144098 00140FF8 83 C1 00 08 */ lwz r30, 8(r1) /* 8014409C 00140FFC 7C 08 03 A6 */ mtlr r0 /* 801440A0 00141000 38 21 00 10 */ addi r1, r1, 0x10 -/* 801440A4 00141004 4E 80 00 20 */ blr +/* 801440A4 00141004 4E 80 00 20 */ blr .global Shutdown__8CBSSlideFR15CBodyController Shutdown__8CBSSlideFR15CBodyController: -/* 801440A8 00141008 4E 80 00 20 */ blr +/* 801440A8 00141008 4E 80 00 20 */ blr .global UpdateBody__8CBSSlideFfR15CBodyControllerR13CStateManager UpdateBody__8CBSSlideFfR15CBodyControllerR13CStateManager: @@ -157,7 +157,7 @@ lbl_80144118: /* 80144130 00141090 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80144134 00141094 7C 08 03 A6 */ mtlr r0 /* 80144138 00141098 38 21 00 40 */ addi r1, r1, 0x40 -/* 8014413C 0014109C 4E 80 00 20 */ blr +/* 8014413C 0014109C 4E 80 00 20 */ blr .global Start__8CBSSlideFR15CBodyControllerR13CStateManager Start__8CBSSlideFR15CBodyControllerR13CStateManager: @@ -339,7 +339,7 @@ lbl_801443C4: /* 801443D8 00141338 80 01 01 34 */ lwz r0, 0x134(r1) /* 801443DC 0014133C 7C 08 03 A6 */ mtlr r0 /* 801443E0 00141340 38 21 01 30 */ addi r1, r1, 0x130 -/* 801443E4 00141344 4E 80 00 20 */ blr +/* 801443E4 00141344 4E 80 00 20 */ blr .global __ct__8CBSSlideFv __ct__8CBSSlideFv: diff --git a/asm/MetroidPrime/BodyState/CBSStep.s b/asm/MetroidPrime/BodyState/CBSStep.s index c6eae2d5..b6a1d46f 100644 --- a/asm/MetroidPrime/BodyState/CBSStep.s +++ b/asm/MetroidPrime/BodyState/CBSStep.s @@ -48,17 +48,17 @@ lbl_80138DE8: /* 80138DF0 00135D50 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80138DF4 00135D54 7C 08 03 A6 */ mtlr r0 /* 80138DF8 00135D58 38 21 00 10 */ addi r1, r1, 0x10 -/* 80138DFC 00135D5C 4E 80 00 20 */ blr +/* 80138DFC 00135D5C 4E 80 00 20 */ blr .global IsMoving__7CBSStepCFv IsMoving__7CBSStepCFv: /* 80138E00 00135D60 38 60 00 01 */ li r3, 1 -/* 80138E04 00135D64 4E 80 00 20 */ blr +/* 80138E04 00135D64 4E 80 00 20 */ blr .global CanShoot__7CBSStepCFv CanShoot__7CBSStepCFv: /* 80138E08 00135D68 38 60 00 01 */ li r3, 1 -/* 80138E0C 00135D6C 4E 80 00 20 */ blr +/* 80138E0C 00135D6C 4E 80 00 20 */ blr .global GetBodyStateTransition__7CBSStepFfR15CBodyController GetBodyStateTransition__7CBSStepFfR15CBodyController: @@ -184,11 +184,11 @@ lbl_80138FA8: /* 80138FB0 00135F10 83 C1 00 08 */ lwz r30, 8(r1) /* 80138FB4 00135F14 7C 08 03 A6 */ mtlr r0 /* 80138FB8 00135F18 38 21 00 10 */ addi r1, r1, 0x10 -/* 80138FBC 00135F1C 4E 80 00 20 */ blr +/* 80138FBC 00135F1C 4E 80 00 20 */ blr .global Shutdown__7CBSStepFR15CBodyController Shutdown__7CBSStepFR15CBodyController: -/* 80138FC0 00135F20 4E 80 00 20 */ blr +/* 80138FC0 00135F20 4E 80 00 20 */ blr .global UpdateBody__7CBSStepFfR15CBodyControllerR13CStateManager UpdateBody__7CBSStepFfR15CBodyControllerR13CStateManager: @@ -235,7 +235,7 @@ lbl_80139044: /* 80139058 00135FB8 83 C1 00 08 */ lwz r30, 8(r1) /* 8013905C 00135FBC 7C 08 03 A6 */ mtlr r0 /* 80139060 00135FC0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80139064 00135FC4 4E 80 00 20 */ blr +/* 80139064 00135FC4 4E 80 00 20 */ blr .global Start__7CBSStepFR15CBodyControllerR13CStateManager Start__7CBSStepFR15CBodyControllerR13CStateManager: @@ -323,7 +323,7 @@ lbl_80139188: /* 80139198 001360F8 83 81 00 A0 */ lwz r28, 0xa0(r1) /* 8013919C 001360FC 7C 08 03 A6 */ mtlr r0 /* 801391A0 00136100 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 801391A4 00136104 4E 80 00 20 */ blr +/* 801391A4 00136104 4E 80 00 20 */ blr .global __ct__7CBSStepFv __ct__7CBSStepFv: diff --git a/asm/MetroidPrime/BodyState/CBSTaunt.s b/asm/MetroidPrime/BodyState/CBSTaunt.s index 2dfa0d25..4e8612e7 100644 --- a/asm/MetroidPrime/BodyState/CBSTaunt.s +++ b/asm/MetroidPrime/BodyState/CBSTaunt.s @@ -48,7 +48,7 @@ lbl_801492F4: /* 801492FC 0014625C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80149300 00146260 7C 08 03 A6 */ mtlr r0 /* 80149304 00146264 38 21 00 10 */ addi r1, r1, 0x10 -/* 80149308 00146268 4E 80 00 20 */ blr +/* 80149308 00146268 4E 80 00 20 */ blr .global GetBodyStateTransition__8CBSTauntFfR15CBodyController GetBodyStateTransition__8CBSTauntFfR15CBodyController: @@ -110,11 +110,11 @@ lbl_801493C8: /* 801493D0 00146330 83 C1 00 08 */ lwz r30, 8(r1) /* 801493D4 00146334 7C 08 03 A6 */ mtlr r0 /* 801493D8 00146338 38 21 00 10 */ addi r1, r1, 0x10 -/* 801493DC 0014633C 4E 80 00 20 */ blr +/* 801493DC 0014633C 4E 80 00 20 */ blr .global Shutdown__8CBSTauntFR15CBodyController Shutdown__8CBSTauntFR15CBodyController: -/* 801493E0 00146340 4E 80 00 20 */ blr +/* 801493E0 00146340 4E 80 00 20 */ blr .global UpdateBody__8CBSTauntFfR15CBodyControllerR13CStateManager UpdateBody__8CBSTauntFfR15CBodyControllerR13CStateManager: @@ -161,7 +161,7 @@ lbl_80149464: /* 80149478 001463D8 83 C1 00 08 */ lwz r30, 8(r1) /* 8014947C 001463DC 7C 08 03 A6 */ mtlr r0 /* 80149480 001463E0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80149484 001463E4 4E 80 00 20 */ blr +/* 80149484 001463E4 4E 80 00 20 */ blr .global Start__8CBSTauntFR15CBodyControllerR13CStateManager Start__8CBSTauntFR15CBodyControllerR13CStateManager: @@ -245,7 +245,7 @@ lbl_8014959C: /* 801495A8 00146508 83 A1 00 A4 */ lwz r29, 0xa4(r1) /* 801495AC 0014650C 7C 08 03 A6 */ mtlr r0 /* 801495B0 00146510 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 801495B4 00146514 4E 80 00 20 */ blr +/* 801495B4 00146514 4E 80 00 20 */ blr .global __ct__8CBSTauntFv __ct__8CBSTauntFv: diff --git a/asm/MetroidPrime/BodyState/CBSTurn.s b/asm/MetroidPrime/BodyState/CBSTurn.s index 4639e688..36d89838 100644 --- a/asm/MetroidPrime/BodyState/CBSTurn.s +++ b/asm/MetroidPrime/BodyState/CBSTurn.s @@ -72,12 +72,12 @@ lbl_80139218: /* 80139220 00136180 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80139224 00136184 7C 08 03 A6 */ mtlr r0 /* 80139228 00136188 38 21 00 10 */ addi r1, r1, 0x10 -/* 8013922C 0013618C 4E 80 00 20 */ blr +/* 8013922C 0013618C 4E 80 00 20 */ blr .global CanShoot__7CBSTurnCFv CanShoot__7CBSTurnCFv: /* 80139230 00136190 38 60 00 01 */ li r3, 1 -/* 80139234 00136194 4E 80 00 20 */ blr +/* 80139234 00136194 4E 80 00 20 */ blr .global UpdateBody__12CBSFlyerTurnFfR15CBodyControllerR13CStateManager UpdateBody__12CBSFlyerTurnFfR15CBodyControllerR13CStateManager: @@ -114,7 +114,7 @@ lbl_801392A0: /* 801392AC 0013620C 7F C4 F3 78 */ mr r4, r30 /* 801392B0 00136210 81 8C 00 38 */ lwz r12, 0x38(r12) /* 801392B4 00136214 7D 89 03 A6 */ mtctr r12 -/* 801392B8 00136218 4E 80 04 21 */ bctrl +/* 801392B8 00136218 4E 80 04 21 */ bctrl /* 801392BC 0013621C 7C 7F 1B 78 */ mr r31, r3 /* 801392C0 00136220 2C 1F FF FF */ cmpwi r31, -1 /* 801392C4 00136224 40 82 00 E4 */ bne lbl_801393A8 @@ -189,7 +189,7 @@ lbl_801393A8: /* 801393C0 00136320 83 A1 00 44 */ lwz r29, 0x44(r1) /* 801393C4 00136324 7C 08 03 A6 */ mtlr r0 /* 801393C8 00136328 38 21 00 60 */ addi r1, r1, 0x60 -/* 801393CC 0013632C 4E 80 00 20 */ blr +/* 801393CC 0013632C 4E 80 00 20 */ blr .global Start__12CBSFlyerTurnFR15CBodyControllerR13CStateManager Start__12CBSFlyerTurnFR15CBodyControllerR13CStateManager: @@ -350,7 +350,7 @@ lbl_80139604: /* 80139614 00136574 83 81 00 F0 */ lwz r28, 0xf0(r1) /* 80139618 00136578 7C 08 03 A6 */ mtlr r0 /* 8013961C 0013657C 38 21 01 00 */ addi r1, r1, 0x100 -/* 80139620 00136580 4E 80 00 20 */ blr +/* 80139620 00136580 4E 80 00 20 */ blr .global __ct__12CBSFlyerTurnFv __ct__12CBSFlyerTurnFv: @@ -368,7 +368,7 @@ __ct__12CBSFlyerTurnFv: /* 80139650 001365B0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80139654 001365B4 7C 08 03 A6 */ mtlr r0 /* 80139658 001365B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8013965C 001365BC 4E 80 00 20 */ blr +/* 8013965C 001365BC 4E 80 00 20 */ blr .global __dt__7CBSTurnFv __dt__7CBSTurnFv: @@ -396,7 +396,7 @@ lbl_801396A4: /* 801396AC 0013660C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801396B0 00136610 7C 08 03 A6 */ mtlr r0 /* 801396B4 00136614 38 21 00 10 */ addi r1, r1, 0x10 -/* 801396B8 00136618 4E 80 00 20 */ blr +/* 801396B8 00136618 4E 80 00 20 */ blr .global GetBodyStateTransition__7CBSTurnFfR15CBodyController GetBodyStateTransition__7CBSTurnFfR15CBodyController: @@ -549,7 +549,7 @@ lbl_801398B0: /* 801398BC 0013681C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 801398C0 00136820 7C 08 03 A6 */ mtlr r0 /* 801398C4 00136824 38 21 00 20 */ addi r1, r1, 0x20 -/* 801398C8 00136828 4E 80 00 20 */ blr +/* 801398C8 00136828 4E 80 00 20 */ blr .global FacingDest__7CBSTurnCFR15CBodyController FacingDest__7CBSTurnCFR15CBodyController: @@ -601,11 +601,11 @@ lbl_80139970: /* 80139974 001368D4 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 80139978 001368D8 7C 08 03 A6 */ mtlr r0 /* 8013997C 001368DC 38 21 00 30 */ addi r1, r1, 0x30 -/* 80139980 001368E0 4E 80 00 20 */ blr +/* 80139980 001368E0 4E 80 00 20 */ blr .global Shutdown__7CBSTurnFR15CBodyController Shutdown__7CBSTurnFR15CBodyController: -/* 80139984 001368E4 4E 80 00 20 */ blr +/* 80139984 001368E4 4E 80 00 20 */ blr .global UpdateBody__7CBSTurnFfR15CBodyControllerR13CStateManager UpdateBody__7CBSTurnFfR15CBodyControllerR13CStateManager: @@ -623,7 +623,7 @@ UpdateBody__7CBSTurnFfR15CBodyControllerR13CStateManager: /* 801399B4 00136914 7C 9E 23 78 */ mr r30, r4 /* 801399B8 00136918 81 8C 00 38 */ lwz r12, 0x38(r12) /* 801399BC 0013691C 7D 89 03 A6 */ mtctr r12 -/* 801399C0 00136920 4E 80 04 21 */ bctrl +/* 801399C0 00136920 4E 80 04 21 */ bctrl /* 801399C4 00136924 7C 7F 1B 78 */ mr r31, r3 /* 801399C8 00136928 2C 1F FF FF */ cmpwi r31, -1 /* 801399CC 0013692C 40 82 00 28 */ bne lbl_801399F4 @@ -646,7 +646,7 @@ lbl_801399F4: /* 80139A0C 0013696C 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80139A10 00136970 7C 08 03 A6 */ mtlr r0 /* 80139A14 00136974 38 21 00 40 */ addi r1, r1, 0x40 -/* 80139A18 00136978 4E 80 00 20 */ blr +/* 80139A18 00136978 4E 80 00 20 */ blr .global Start__7CBSTurnFR15CBodyControllerR13CStateManager Start__7CBSTurnFR15CBodyControllerR13CStateManager: @@ -837,7 +837,7 @@ lbl_80139CC4: /* 80139CD0 00136C30 80 01 01 34 */ lwz r0, 0x134(r1) /* 80139CD4 00136C34 7C 08 03 A6 */ mtlr r0 /* 80139CD8 00136C38 38 21 01 30 */ addi r1, r1, 0x130 -/* 80139CDC 00136C3C 4E 80 00 20 */ blr +/* 80139CDC 00136C3C 4E 80 00 20 */ blr .global __ct__7CBSTurnFv __ct__7CBSTurnFv: diff --git a/asm/MetroidPrime/BodyState/CBSWallHang.s b/asm/MetroidPrime/BodyState/CBSWallHang.s index ef917bff..9ab9d74e 100644 --- a/asm/MetroidPrime/BodyState/CBSWallHang.s +++ b/asm/MetroidPrime/BodyState/CBSWallHang.s @@ -63,12 +63,12 @@ lbl_8018D500: /* 8018D508 0018A468 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8018D50C 0018A46C 7C 08 03 A6 */ mtlr r0 /* 8018D510 0018A470 38 21 00 10 */ addi r1, r1, 0x10 -/* 8018D514 0018A474 4E 80 00 20 */ blr +/* 8018D514 0018A474 4E 80 00 20 */ blr .global IsMoving__11CBSWallHangCFv IsMoving__11CBSWallHangCFv: /* 8018D518 0018A478 38 60 00 01 */ li r3, 1 -/* 8018D51C 0018A47C 4E 80 00 20 */ blr +/* 8018D51C 0018A47C 4E 80 00 20 */ blr .global GetBodyStateTransition__11CBSWallHangFfR15CBodyController GetBodyStateTransition__11CBSWallHangFfR15CBodyController: @@ -96,7 +96,7 @@ lbl_8018D568: /* 8018D56C 0018A4CC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8018D570 0018A4D0 7C 08 03 A6 */ mtlr r0 /* 8018D574 0018A4D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8018D578 0018A4D8 4E 80 00 20 */ blr +/* 8018D578 0018A4D8 4E 80 00 20 */ blr .global FixInPlace__11CBSWallHangFR15CBodyController FixInPlace__11CBSWallHangFR15CBodyController: @@ -121,7 +121,7 @@ lbl_8018D5C0: /* 8018D5C0 0018A520 80 01 00 14 */ lwz r0, 0x14(r1) /* 8018D5C4 0018A524 7C 08 03 A6 */ mtlr r0 /* 8018D5C8 0018A528 38 21 00 10 */ addi r1, r1, 0x10 -/* 8018D5CC 0018A52C 4E 80 00 20 */ blr +/* 8018D5CC 0018A52C 4E 80 00 20 */ blr .global CheckForLand__11CBSWallHangFR15CBodyControllerR13CStateManager CheckForLand__11CBSWallHangFR15CBodyControllerR13CStateManager: @@ -146,7 +146,7 @@ CheckForLand__11CBSWallHangFR15CBodyControllerR13CStateManager: /* 8018D618 0018A578 81 9F 00 00 */ lwz r12, 0(r31) /* 8018D61C 0018A57C 81 8C 02 B8 */ lwz r12, 0x2b8(r12) /* 8018D620 0018A580 7D 89 03 A6 */ mtctr r12 -/* 8018D624 0018A584 4E 80 04 21 */ bctrl +/* 8018D624 0018A584 4E 80 04 21 */ bctrl /* 8018D628 0018A588 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8018D62C 0018A58C 41 82 01 10 */ beq lbl_8018D73C lbl_8018D630: @@ -227,7 +227,7 @@ lbl_8018D73C: /* 8018D744 0018A6A4 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 8018D748 0018A6A8 7C 08 03 A6 */ mtlr r0 /* 8018D74C 0018A6AC 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 8018D750 0018A6B0 4E 80 00 20 */ blr +/* 8018D750 0018A6B0 4E 80 00 20 */ blr .global CheckForWall__11CBSWallHangFR15CBodyControllerR13CStateManager CheckForWall__11CBSWallHangFR15CBodyControllerR13CStateManager: @@ -435,11 +435,11 @@ lbl_8018DA4C: /* 8018DA54 0018A9B4 80 01 01 44 */ lwz r0, 0x144(r1) /* 8018DA58 0018A9B8 7C 08 03 A6 */ mtlr r0 /* 8018DA5C 0018A9BC 38 21 01 40 */ addi r1, r1, 0x140 -/* 8018DA60 0018A9C0 4E 80 00 20 */ blr +/* 8018DA60 0018A9C0 4E 80 00 20 */ blr .global nullsub_134 nullsub_134: -/* 8018DA64 0018A9C4 4E 80 00 20 */ blr +/* 8018DA64 0018A9C4 4E 80 00 20 */ blr .global UpdateBody__11CBSWallHangFfR15CBodyControllerR13CStateManager UpdateBody__11CBSWallHangFfR15CBodyControllerR13CStateManager: @@ -469,7 +469,7 @@ UpdateBody__11CBSWallHangFfR15CBodyControllerR13CStateManager: /* 8018DAC4 0018AA24 38 63 43 D8 */ addi r3, r3, lbl_803E43D8@l /* 8018DAC8 0018AA28 7C 03 00 2E */ lwzx r0, r3, r0 /* 8018DACC 0018AA2C 7C 09 03 A6 */ mtctr r0 -/* 8018DAD0 0018AA30 4E 80 04 20 */ bctr +/* 8018DAD0 0018AA30 4E 80 04 20 */ bctr .global lbl_8018DAD4 lbl_8018DAD4: /* 8018DAD4 0018AA34 88 1D 03 00 */ lbz r0, 0x300(r29) @@ -1426,7 +1426,7 @@ lbl_8018E86C: /* 8018E88C 0018B7EC 80 01 06 14 */ lwz r0, 0x614(r1) /* 8018E890 0018B7F0 7C 08 03 A6 */ mtlr r0 /* 8018E894 0018B7F4 38 21 06 10 */ addi r1, r1, 0x610 -/* 8018E898 0018B7F8 4E 80 00 20 */ blr +/* 8018E898 0018B7F8 4E 80 00 20 */ blr .global Start__11CBSWallHangFR15CBodyControllerR13CStateManager Start__11CBSWallHangFR15CBodyControllerR13CStateManager: @@ -1517,20 +1517,20 @@ lbl_8018E9CC: /* 8018E9D8 0018B938 83 A1 00 A4 */ lwz r29, 0xa4(r1) /* 8018E9DC 0018B93C 7C 08 03 A6 */ mtlr r0 /* 8018E9E0 0018B940 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 8018E9E4 0018B944 4E 80 00 20 */ blr +/* 8018E9E4 0018B944 4E 80 00 20 */ blr .global ApplyGravity__11CBSWallHangCFv ApplyGravity__11CBSWallHangCFv: /* 8018E9E8 0018B948 80 03 00 04 */ lwz r0, 4(r3) /* 8018E9EC 0018B94C 38 60 00 00 */ li r3, 0 /* 8018E9F0 0018B950 2C 00 00 04 */ cmpwi r0, 4 -/* 8018E9F4 0018B954 4D 82 00 20 */ beqlr +/* 8018E9F4 0018B954 4D 82 00 20 */ beqlr /* 8018E9F8 0018B958 2C 00 00 03 */ cmpwi r0, 3 -/* 8018E9FC 0018B95C 4D 82 00 20 */ beqlr +/* 8018E9FC 0018B95C 4D 82 00 20 */ beqlr /* 8018EA00 0018B960 2C 00 00 06 */ cmpwi r0, 6 -/* 8018EA04 0018B964 4D 82 00 20 */ beqlr +/* 8018EA04 0018B964 4D 82 00 20 */ beqlr /* 8018EA08 0018B968 38 60 00 01 */ li r3, 1 -/* 8018EA0C 0018B96C 4E 80 00 20 */ blr +/* 8018EA0C 0018B96C 4E 80 00 20 */ blr .global CanShoot__11CBSWallHangCFv CanShoot__11CBSWallHangCFv: @@ -1538,7 +1538,7 @@ CanShoot__11CBSWallHangCFv: /* 8018EA14 0018B974 20 00 00 04 */ subfic r0, r0, 4 /* 8018EA18 0018B978 7C 00 00 34 */ cntlzw r0, r0 /* 8018EA1C 0018B97C 54 03 D9 7E */ srwi r3, r0, 5 -/* 8018EA20 0018B980 4E 80 00 20 */ blr +/* 8018EA20 0018B980 4E 80 00 20 */ blr .global ApplyHeadTracking__11CBSWallHangCFv ApplyHeadTracking__11CBSWallHangCFv: @@ -1547,10 +1547,10 @@ ApplyHeadTracking__11CBSWallHangCFv: /* 8018EA2C 0018B98C 2C 00 00 04 */ cmpwi r0, 4 /* 8018EA30 0018B990 41 82 00 0C */ beq lbl_8018EA3C /* 8018EA34 0018B994 2C 00 00 05 */ cmpwi r0, 5 -/* 8018EA38 0018B998 4C 82 00 20 */ bnelr +/* 8018EA38 0018B998 4C 82 00 20 */ bnelr lbl_8018EA3C: /* 8018EA3C 0018B99C 38 60 00 01 */ li r3, 1 -/* 8018EA40 0018B9A0 4E 80 00 20 */ blr +/* 8018EA40 0018B9A0 4E 80 00 20 */ blr .global ApplyAnimationDeltas__11CBSWallHangCFv ApplyAnimationDeltas__11CBSWallHangCFv: @@ -1567,10 +1567,10 @@ ApplyAnimationDeltas__11CBSWallHangCFv: /* 8018EA6C 0018B9CC 2C 00 00 06 */ cmpwi r0, 6 /* 8018EA70 0018B9D0 41 82 00 0C */ beq lbl_8018EA7C /* 8018EA74 0018B9D4 2C 00 00 09 */ cmpwi r0, 9 -/* 8018EA78 0018B9D8 4C 82 00 20 */ bnelr +/* 8018EA78 0018B9D8 4C 82 00 20 */ bnelr lbl_8018EA7C: /* 8018EA7C 0018B9DC 38 60 00 01 */ li r3, 1 -/* 8018EA80 0018B9E0 4E 80 00 20 */ blr +/* 8018EA80 0018B9E0 4E 80 00 20 */ blr .global IsInAir__11CBSWallHangCFRC15CBodyController IsInAir__11CBSWallHangCFRC15CBodyController: @@ -1583,10 +1583,10 @@ IsInAir__11CBSWallHangCFRC15CBodyController: /* 8018EA9C 0018B9FC 2C 00 00 07 */ cmpwi r0, 7 /* 8018EAA0 0018BA00 41 82 00 0C */ beq lbl_8018EAAC /* 8018EAA4 0018BA04 2C 00 00 08 */ cmpwi r0, 8 -/* 8018EAA8 0018BA08 4C 82 00 20 */ bnelr +/* 8018EAA8 0018BA08 4C 82 00 20 */ bnelr lbl_8018EAAC: /* 8018EAAC 0018BA0C 38 60 00 01 */ li r3, 1 -/* 8018EAB0 0018BA10 4E 80 00 20 */ blr +/* 8018EAB0 0018BA10 4E 80 00 20 */ blr .global SetLaunchVelocity__11CBSWallHangFR15CBodyController SetLaunchVelocity__11CBSWallHangFR15CBodyController: @@ -1629,7 +1629,7 @@ lbl_8018EB34: /* 8018EB3C 0018BA9C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8018EB40 0018BAA0 7C 08 03 A6 */ mtlr r0 /* 8018EB44 0018BAA4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8018EB48 0018BAA8 4E 80 00 20 */ blr +/* 8018EB48 0018BAA8 4E 80 00 20 */ blr .global __ct__11CBSWallHangFv __ct__11CBSWallHangFv: diff --git a/asm/MetroidPrime/BodyState/CBodyController.s b/asm/MetroidPrime/BodyState/CBodyController.s index aa0b0523..196450c5 100644 --- a/asm/MetroidPrime/BodyState/CBodyController.s +++ b/asm/MetroidPrime/BodyState/CBodyController.s @@ -130,7 +130,7 @@ lbl_80139EDC: /* 80139EFC 00136E5C 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80139F00 00136E60 7C 08 03 A6 */ mtlr r0 /* 80139F04 00136E64 38 21 00 60 */ addi r1, r1, 0x60 -/* 80139F08 00136E68 4E 80 00 20 */ blr +/* 80139F08 00136E68 4E 80 00 20 */ blr .global StopElectrocution__15CBodyControllerFv StopElectrocution__15CBodyControllerFv: @@ -158,7 +158,7 @@ lbl_80139F5C: /* 80139F5C 00136EBC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80139F60 00136EC0 7C 08 03 A6 */ mtlr r0 /* 80139F64 00136EC4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80139F68 00136EC8 4E 80 00 20 */ blr +/* 80139F68 00136EC8 4E 80 00 20 */ blr .global SetElectrocuting__15CBodyControllerFf SetElectrocuting__15CBodyControllerFf: @@ -231,17 +231,17 @@ lbl_8013A058: /* 8013A068 00136FC8 83 C1 00 28 */ lwz r30, 0x28(r1) /* 8013A06C 00136FCC 7C 08 03 A6 */ mtlr r0 /* 8013A070 00136FD0 38 21 00 40 */ addi r1, r1, 0x40 -/* 8013A074 00136FD4 4E 80 00 20 */ blr +/* 8013A074 00136FD4 4E 80 00 20 */ blr .global DouseFlames__15CBodyControllerFv DouseFlames__15CBodyControllerFv: /* 8013A078 00136FD8 C0 23 03 20 */ lfs f1, 0x320(r3) /* 8013A07C 00136FDC C0 02 9A 78 */ lfs f0, lbl_805AB798@sda21(r2) /* 8013A080 00136FE0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8013A084 00136FE4 4C 81 00 20 */ blelr +/* 8013A084 00136FE4 4C 81 00 20 */ blelr /* 8013A088 00136FE8 D0 03 03 20 */ stfs f0, 0x320(r3) /* 8013A08C 00136FEC D0 03 03 28 */ stfs f0, 0x328(r3) -/* 8013A090 00136FF0 4E 80 00 20 */ blr +/* 8013A090 00136FF0 4E 80 00 20 */ blr .global SetOnFire__15CBodyControllerFf SetOnFire__15CBodyControllerFf: @@ -259,7 +259,7 @@ lbl_8013A0BC: /* 8013A0BC 0013701C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8013A0C0 00137020 7C 08 03 A6 */ mtlr r0 /* 8013A0C4 00137024 38 21 00 10 */ addi r1, r1, 0x10 -/* 8013A0C8 00137028 4E 80 00 20 */ blr +/* 8013A0C8 00137028 4E 80 00 20 */ blr .global GetPercentageFrozen__15CBodyControllerCFv GetPercentageFrozen__15CBodyControllerCFv: @@ -276,7 +276,7 @@ GetPercentageFrozen__15CBodyControllerCFv: /* 8013A0F4 00137054 40 82 00 0C */ bne lbl_8013A100 lbl_8013A0F8: /* 8013A0F8 00137058 C0 22 9A 78 */ lfs f1, lbl_805AB798@sda21(r2) -/* 8013A0FC 0013705C 4E 80 00 20 */ blr +/* 8013A0FC 0013705C 4E 80 00 20 */ blr lbl_8013A100: /* 8013A100 00137060 FC 03 10 40 */ fcmpo cr0, f3, f2 /* 8013A104 00137064 C0 22 9A 70 */ lfs f1, lbl_805AB790@sda21(r2) @@ -285,21 +285,21 @@ lbl_8013A100: /* 8013A110 00137070 FC 02 00 40 */ fcmpo cr0, f2, f0 /* 8013A114 00137074 40 81 00 0C */ ble lbl_8013A120 /* 8013A118 00137078 EC 23 10 24 */ fdivs f1, f3, f2 -/* 8013A11C 0013707C 4E 80 00 20 */ blr +/* 8013A11C 0013707C 4E 80 00 20 */ blr lbl_8013A120: /* 8013A120 00137080 EC 06 20 28 */ fsubs f0, f6, f4 /* 8013A124 00137084 FC 03 00 40 */ fcmpo cr0, f3, f0 /* 8013A128 00137088 4C 41 13 82 */ cror 2, 1, 2 -/* 8013A12C 0013708C 4C 82 00 20 */ bnelr +/* 8013A12C 0013708C 4C 82 00 20 */ bnelr /* 8013A130 00137090 C0 02 9A 78 */ lfs f0, lbl_805AB798@sda21(r2) /* 8013A134 00137094 FC 04 00 40 */ fcmpo cr0, f4, f0 -/* 8013A138 00137098 4C 81 00 20 */ blelr +/* 8013A138 00137098 4C 81 00 20 */ blelr /* 8013A13C 0013709C EC 05 10 2A */ fadds f0, f5, f2 /* 8013A140 001370A0 C0 22 9A 70 */ lfs f1, lbl_805AB790@sda21(r2) /* 8013A144 001370A4 EC 03 00 28 */ fsubs f0, f3, f0 /* 8013A148 001370A8 EC 00 20 24 */ fdivs f0, f0, f4 /* 8013A14C 001370AC EC 21 00 28 */ fsubs f1, f1, f0 -/* 8013A150 001370B0 4E 80 00 20 */ blr +/* 8013A150 001370B0 4E 80 00 20 */ blr .global UnFreeze__15CBodyControllerFv UnFreeze__15CBodyControllerFv: @@ -350,21 +350,21 @@ UnFreeze__15CBodyControllerFv: /* 8013A204 00137164 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8013A208 00137168 7C 08 03 A6 */ mtlr r0 /* 8013A20C 0013716C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8013A210 00137170 4E 80 00 20 */ blr +/* 8013A210 00137170 4E 80 00 20 */ blr .global FrozenBreakout__15CBodyControllerFv FrozenBreakout__15CBodyControllerFv: /* 8013A214 00137174 88 03 03 00 */ lbz r0, 0x300(r3) /* 8013A218 00137178 54 00 DF FF */ rlwinm. r0, r0, 0x1b, 0x1f, 0x1f -/* 8013A21C 0013717C 4D 82 00 20 */ beqlr +/* 8013A21C 0013717C 4D 82 00 20 */ beqlr /* 8013A220 00137180 C0 43 03 04 */ lfs f2, 0x304(r3) /* 8013A224 00137184 C0 23 03 08 */ lfs f1, 0x308(r3) /* 8013A228 00137188 C0 03 03 10 */ lfs f0, 0x310(r3) /* 8013A22C 0013718C EC 22 08 2A */ fadds f1, f2, f1 /* 8013A230 00137190 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 8013A234 00137194 4C 80 00 20 */ bgelr +/* 8013A234 00137194 4C 80 00 20 */ bgelr /* 8013A238 00137198 D0 23 03 10 */ stfs f1, 0x310(r3) -/* 8013A23C 0013719C 4E 80 00 20 */ blr +/* 8013A23C 0013719C 4E 80 00 20 */ blr .global Freeze__15CBodyControllerFfff Freeze__15CBodyControllerFfff: @@ -414,7 +414,7 @@ Freeze__15CBodyControllerFfff: /* 8013A2EC 0013724C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8013A2F0 00137250 7C 08 03 A6 */ mtlr r0 /* 8013A2F4 00137254 38 21 00 20 */ addi r1, r1, 0x20 -/* 8013A2F8 00137258 4E 80 00 20 */ blr +/* 8013A2F8 00137258 4E 80 00 20 */ blr .global LoopBestAnimation__15CBodyControllerFRC16CPASAnimParmDataR9CRandom16 LoopBestAnimation__15CBodyControllerFRC16CPASAnimParmDataR9CRandom16: @@ -460,7 +460,7 @@ LoopBestAnimation__15CBodyControllerFRC16CPASAnimParmDataR9CRandom16: /* 8013A398 001372F8 83 A1 00 44 */ lwz r29, 0x44(r1) /* 8013A39C 001372FC 7C 08 03 A6 */ mtlr r0 /* 8013A3A0 00137300 38 21 00 50 */ addi r1, r1, 0x50 -/* 8013A3A4 00137304 4E 80 00 20 */ blr +/* 8013A3A4 00137304 4E 80 00 20 */ blr .global PlayBestAnimation__15CBodyControllerFRC16CPASAnimParmDataR9CRandom16 PlayBestAnimation__15CBodyControllerFRC16CPASAnimParmDataR9CRandom16: @@ -506,7 +506,7 @@ PlayBestAnimation__15CBodyControllerFRC16CPASAnimParmDataR9CRandom16: /* 8013A444 001373A4 83 A1 00 44 */ lwz r29, 0x44(r1) /* 8013A448 001373A8 7C 08 03 A6 */ mtlr r0 /* 8013A44C 001373AC 38 21 00 50 */ addi r1, r1, 0x50 -/* 8013A450 001373B0 4E 80 00 20 */ blr +/* 8013A450 001373B0 4E 80 00 20 */ blr .global GetPASDatabase__15CBodyControllerCFv GetPASDatabase__15CBodyControllerCFv: @@ -514,7 +514,7 @@ GetPASDatabase__15CBodyControllerCFv: /* 8013A458 001373B8 80 63 00 64 */ lwz r3, 0x64(r3) /* 8013A45C 001373BC 80 63 00 10 */ lwz r3, 0x10(r3) /* 8013A460 001373C0 38 63 00 3C */ addi r3, r3, 0x3c -/* 8013A464 001373C4 4E 80 00 20 */ blr +/* 8013A464 001373C4 4E 80 00 20 */ blr .global FaceDirection3D__15CBodyControllerFRC9CVector3ff FaceDirection3D__15CBodyControllerFRC9CVector3ff: @@ -662,7 +662,7 @@ lbl_8013A67C: /* 8013A694 001375F4 83 81 00 C0 */ lwz r28, 0xc0(r1) /* 8013A698 001375F8 7C 08 03 A6 */ mtlr r0 /* 8013A69C 001375FC 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 8013A6A0 00137600 4E 80 00 20 */ blr +/* 8013A6A0 00137600 4E 80 00 20 */ blr .global FaceDirection__15CBodyControllerFRC9CVector3ff FaceDirection__15CBodyControllerFRC9CVector3ff: @@ -755,7 +755,7 @@ lbl_8013A7E8: /* 8013A7F8 00137758 83 C1 00 88 */ lwz r30, 0x88(r1) /* 8013A7FC 0013775C 7C 08 03 A6 */ mtlr r0 /* 8013A800 00137760 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8013A804 00137764 4E 80 00 20 */ blr +/* 8013A804 00137764 4E 80 00 20 */ blr .global SetDeltaRotation__15CBodyControllerFRC11CQuaternion SetDeltaRotation__15CBodyControllerFRC11CQuaternion: @@ -780,7 +780,7 @@ SetDeltaRotation__15CBodyControllerFRC11CQuaternion: /* 8013A850 001377B0 80 01 00 24 */ lwz r0, 0x24(r1) /* 8013A854 001377B4 7C 08 03 A6 */ mtlr r0 /* 8013A858 001377B8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8013A85C 001377BC 4E 80 00 20 */ blr +/* 8013A85C 001377BC 4E 80 00 20 */ blr .global MultiplyPlaybackRate__15CBodyControllerFf MultiplyPlaybackRate__15CBodyControllerFf: @@ -794,7 +794,7 @@ MultiplyPlaybackRate__15CBodyControllerFf: /* 8013A87C 001377DC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8013A880 001377E0 7C 08 03 A6 */ mtlr r0 /* 8013A884 001377E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8013A888 001377E8 4E 80 00 20 */ blr +/* 8013A888 001377E8 4E 80 00 20 */ blr .global SetPlaybackRate__15CBodyControllerFf SetPlaybackRate__15CBodyControllerFf: @@ -808,7 +808,7 @@ SetPlaybackRate__15CBodyControllerFf: /* 8013A8A8 00137808 80 01 00 14 */ lwz r0, 0x14(r1) /* 8013A8AC 0013780C 7C 08 03 A6 */ mtlr r0 /* 8013A8B0 00137810 38 21 00 10 */ addi r1, r1, 0x10 -/* 8013A8B4 00137814 4E 80 00 20 */ blr +/* 8013A8B4 00137814 4E 80 00 20 */ blr .global GetAnimTimeRemaining__15CBodyControllerCFv GetAnimTimeRemaining__15CBodyControllerCFv: @@ -836,7 +836,7 @@ GetAnimTimeRemaining__15CBodyControllerCFv: /* 8013A90C 0013786C 83 E1 00 24 */ lwz r31, 0x24(r1) /* 8013A910 00137870 7C 08 03 A6 */ mtlr r0 /* 8013A914 00137874 38 21 00 30 */ addi r1, r1, 0x30 -/* 8013A918 00137878 4E 80 00 20 */ blr +/* 8013A918 00137878 4E 80 00 20 */ blr .global SetCurrentAnimation__15CBodyControllerFRC18CAnimPlaybackParmsbb SetCurrentAnimation__15CBodyControllerFRC18CAnimPlaybackParmsbb: @@ -866,7 +866,7 @@ SetCurrentAnimation__15CBodyControllerFRC18CAnimPlaybackParmsbb: /* 8013A978 001378D8 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8013A97C 001378DC 7C 08 03 A6 */ mtlr r0 /* 8013A980 001378E0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8013A984 001378E4 4E 80 00 20 */ blr +/* 8013A984 001378E4 4E 80 00 20 */ blr .global EnableAnimation__15CBodyControllerFb EnableAnimation__15CBodyControllerFb: @@ -876,7 +876,7 @@ EnableAnimation__15CBodyControllerFb: /* 8013A994 001378F4 88 03 02 20 */ lbz r0, 0x220(r3) /* 8013A998 001378F8 50 80 3E 30 */ rlwimi r0, r4, 7, 0x18, 0x18 /* 8013A99C 001378FC 98 03 02 20 */ stb r0, 0x220(r3) -/* 8013A9A0 00137900 4E 80 00 20 */ blr +/* 8013A9A0 00137900 4E 80 00 20 */ blr .global SetTurnSpeed__15CBodyControllerFf SetTurnSpeed__15CBodyControllerFf: @@ -894,12 +894,12 @@ lbl_8013A9C8: /* 8013A9C8 00137928 C0 04 00 00 */ lfs f0, 0(r4) /* 8013A9CC 0013792C D0 03 02 FC */ stfs f0, 0x2fc(r3) /* 8013A9D0 00137930 38 21 00 10 */ addi r1, r1, 0x10 -/* 8013A9D4 00137934 4E 80 00 20 */ blr +/* 8013A9D4 00137934 4E 80 00 20 */ blr .global SetLocomotionType__15CBodyControllerFQ23pas15ELocomotionType SetLocomotionType__15CBodyControllerFQ23pas15ELocomotionType: /* 8013A9D8 00137938 90 83 02 EC */ stw r4, 0x2ec(r3) -/* 8013A9DC 0013793C 4E 80 00 20 */ blr +/* 8013A9DC 0013793C 4E 80 00 20 */ blr .global UpdateBody__15CBodyControllerFfR13CStateManager UpdateBody__15CBodyControllerFfR13CStateManager: @@ -959,7 +959,7 @@ lbl_8013AA70: /* 8013AAA4 00137A04 7F C5 F3 78 */ mr r5, r30 /* 8013AAA8 00137A08 81 8C 00 30 */ lwz r12, 0x30(r12) /* 8013AAAC 00137A0C 7D 89 03 A6 */ mtctr r12 -/* 8013AAB0 00137A10 4E 80 04 21 */ bctrl +/* 8013AAB0 00137A10 4E 80 04 21 */ bctrl /* 8013AAB4 00137A14 7C 7F 1B 78 */ mr r31, r3 /* 8013AAB8 00137A18 2C 1F FF FF */ cmpwi r31, -1 /* 8013AABC 00137A1C 41 82 00 4C */ beq lbl_8013AB08 @@ -969,7 +969,7 @@ lbl_8013AA70: /* 8013AACC 00137A2C 7F A4 EB 78 */ mr r4, r29 /* 8013AAD0 00137A30 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8013AAD4 00137A34 7D 89 03 A6 */ mtctr r12 -/* 8013AAD8 00137A38 4E 80 04 21 */ bctrl +/* 8013AAD8 00137A38 4E 80 04 21 */ bctrl /* 8013AADC 00137A3C 7F E4 FB 78 */ mr r4, r31 /* 8013AAE0 00137A40 38 7D 02 A4 */ addi r3, r29, 0x2a4 /* 8013AAE4 00137A44 4B FF 95 F9 */ bl SetState__14CBodyStateInfoFQ23pas15EAnimationState @@ -980,7 +980,7 @@ lbl_8013AA70: /* 8013AAF8 00137A58 7F C5 F3 78 */ mr r5, r30 /* 8013AAFC 00137A5C 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8013AB00 00137A60 7D 89 03 A6 */ mtctr r12 -/* 8013AB04 00137A64 4E 80 04 21 */ bctrl +/* 8013AB04 00137A64 4E 80 04 21 */ bctrl lbl_8013AB08: /* 8013AB08 00137A68 38 7D 02 A4 */ addi r3, r29, 0x2a4 /* 8013AB0C 00137A6C 4B FF 94 31 */ bl GetCurrentAdditiveState__14CBodyStateInfoFv @@ -990,7 +990,7 @@ lbl_8013AB08: /* 8013AB1C 00137A7C 7F C5 F3 78 */ mr r5, r30 /* 8013AB20 00137A80 81 8C 00 18 */ lwz r12, 0x18(r12) /* 8013AB24 00137A84 7D 89 03 A6 */ mtctr r12 -/* 8013AB28 00137A88 4E 80 04 21 */ bctrl +/* 8013AB28 00137A88 4E 80 04 21 */ bctrl /* 8013AB2C 00137A8C 7C 7F 1B 78 */ mr r31, r3 /* 8013AB30 00137A90 2C 1F FF FF */ cmpwi r31, -1 /* 8013AB34 00137A94 41 82 00 4C */ beq lbl_8013AB80 @@ -1000,7 +1000,7 @@ lbl_8013AB08: /* 8013AB44 00137AA4 7F A4 EB 78 */ mr r4, r29 /* 8013AB48 00137AA8 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 8013AB4C 00137AAC 7D 89 03 A6 */ mtctr r12 -/* 8013AB50 00137AB0 4E 80 04 21 */ bctrl +/* 8013AB50 00137AB0 4E 80 04 21 */ bctrl /* 8013AB54 00137AB4 7F E4 FB 78 */ mr r4, r31 /* 8013AB58 00137AB8 38 7D 02 A4 */ addi r3, r29, 0x2a4 /* 8013AB5C 00137ABC 4B FF 94 35 */ bl SetAdditiveState__14CBodyStateInfoFQ23pas15EAnimationState @@ -1011,7 +1011,7 @@ lbl_8013AB08: /* 8013AB70 00137AD0 7F C5 F3 78 */ mr r5, r30 /* 8013AB74 00137AD4 81 8C 00 14 */ lwz r12, 0x14(r12) /* 8013AB78 00137AD8 7D 89 03 A6 */ mtctr r12 -/* 8013AB7C 00137ADC 4E 80 04 21 */ bctrl +/* 8013AB7C 00137ADC 4E 80 04 21 */ bctrl lbl_8013AB80: /* 8013AB80 00137AE0 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 8013AB84 00137AE4 80 01 00 34 */ lwz r0, 0x34(r1) @@ -1021,17 +1021,17 @@ lbl_8013AB80: /* 8013AB94 00137AF4 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8013AB98 00137AF8 7C 08 03 A6 */ mtlr r0 /* 8013AB9C 00137AFC 38 21 00 30 */ addi r1, r1, 0x30 -/* 8013ABA0 00137B00 4E 80 00 20 */ blr +/* 8013ABA0 00137B00 4E 80 00 20 */ blr .global SetFallState__15CBodyControllerFQ23pas10EFallState SetFallState__15CBodyControllerFQ23pas10EFallState: /* 8013ABA4 00137B04 90 83 02 F0 */ stw r4, 0x2f0(r3) -/* 8013ABA8 00137B08 4E 80 00 20 */ blr +/* 8013ABA8 00137B08 4E 80 00 20 */ blr .global GetFallState__15CBodyControllerCFv GetFallState__15CBodyControllerCFv: /* 8013ABAC 00137B0C 80 63 02 F0 */ lwz r3, 0x2f0(r3) -/* 8013ABB0 00137B10 4E 80 00 20 */ blr +/* 8013ABB0 00137B10 4E 80 00 20 */ blr .global HasBodyState__15CBodyControllerCFQ23pas15EAnimationState HasBodyState__15CBodyControllerCFQ23pas15EAnimationState: @@ -1046,7 +1046,7 @@ HasBodyState__15CBodyControllerCFQ23pas15EAnimationState: /* 8013ABD4 00137B34 80 01 00 14 */ lwz r0, 0x14(r1) /* 8013ABD8 00137B38 7C 08 03 A6 */ mtlr r0 /* 8013ABDC 00137B3C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8013ABE0 00137B40 4E 80 00 20 */ blr +/* 8013ABE0 00137B40 4E 80 00 20 */ blr .global Update__15CBodyControllerFfR13CStateManager Update__15CBodyControllerFfR13CStateManager: @@ -1118,7 +1118,7 @@ lbl_8013ACD0: /* 8013ACE0 00137C40 83 C1 00 28 */ lwz r30, 0x28(r1) /* 8013ACE4 00137C44 7C 08 03 A6 */ mtlr r0 /* 8013ACE8 00137C48 38 21 00 40 */ addi r1, r1, 0x40 -/* 8013ACEC 00137C4C 4E 80 00 20 */ blr +/* 8013ACEC 00137C4C 4E 80 00 20 */ blr .global Activate__15CBodyControllerFR13CStateManager Activate__15CBodyControllerFR13CStateManager: @@ -1145,7 +1145,7 @@ Activate__15CBodyControllerFR13CStateManager: /* 8013AD40 00137CA0 7F E5 FB 78 */ mr r5, r31 /* 8013AD44 00137CA4 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8013AD48 00137CA8 7D 89 03 A6 */ mtctr r12 -/* 8013AD4C 00137CAC 4E 80 04 21 */ bctrl +/* 8013AD4C 00137CAC 4E 80 04 21 */ bctrl /* 8013AD50 00137CB0 38 7E 02 A4 */ addi r3, r30, 0x2a4 /* 8013AD54 00137CB4 4B FF 91 E9 */ bl GetCurrentAdditiveState__14CBodyStateInfoFv /* 8013AD58 00137CB8 81 83 00 00 */ lwz r12, 0(r3) @@ -1153,13 +1153,13 @@ Activate__15CBodyControllerFR13CStateManager: /* 8013AD60 00137CC0 7F E5 FB 78 */ mr r5, r31 /* 8013AD64 00137CC4 81 8C 00 14 */ lwz r12, 0x14(r12) /* 8013AD68 00137CC8 7D 89 03 A6 */ mtctr r12 -/* 8013AD6C 00137CCC 4E 80 04 21 */ bctrl +/* 8013AD6C 00137CCC 4E 80 04 21 */ bctrl /* 8013AD70 00137CD0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8013AD74 00137CD4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8013AD78 00137CD8 83 C1 00 08 */ lwz r30, 8(r1) /* 8013AD7C 00137CDC 7C 08 03 A6 */ mtlr r0 /* 8013AD80 00137CE0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8013AD84 00137CE4 4E 80 00 20 */ blr +/* 8013AD84 00137CE4 4E 80 00 20 */ blr .global __ct__15CBodyControllerFR6CActorf9EBodyType __ct__15CBodyControllerFR6CActorf9EBodyType: @@ -1243,4 +1243,4 @@ __ct__15CBodyControllerFR6CActorf9EBodyType: /* 8013AEBC 00137E1C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8013AEC0 00137E20 7C 08 03 A6 */ mtlr r0 /* 8013AEC4 00137E24 38 21 00 30 */ addi r1, r1, 0x30 -/* 8013AEC8 00137E28 4E 80 00 20 */ blr +/* 8013AEC8 00137E28 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/BodyState/CBodyStateCmdMgr.s b/asm/MetroidPrime/BodyState/CBodyStateCmdMgr.s index 0b509b74..5fb22313 100644 --- a/asm/MetroidPrime/BodyState/CBodyStateCmdMgr.s +++ b/asm/MetroidPrime/BodyState/CBodyStateCmdMgr.s @@ -33,7 +33,7 @@ DeliverCmd__16CBodyStateCmdMgrF13EBodyStateCmd: /* 80131440 0012E3A0 7C 00 20 30 */ slw r0, r0, r4 /* 80131444 0012E3A4 7C A0 03 78 */ or r0, r5, r0 /* 80131448 0012E3A8 90 03 00 B4 */ stw r0, 0xb4(r3) -/* 8013144C 0012E3AC 4E 80 00 20 */ blr +/* 8013144C 0012E3AC 4E 80 00 20 */ blr .global GetCmd__16CBodyStateCmdMgrF13EBodyStateCmd GetCmd__16CBodyStateCmdMgrF13EBodyStateCmd: @@ -45,10 +45,10 @@ GetCmd__16CBodyStateCmdMgrF13EBodyStateCmd: /* 80131464 0012E3C4 54 80 10 3A */ slwi r0, r4, 2 /* 80131468 0012E3C8 7C 63 02 14 */ add r3, r3, r0 /* 8013146C 0012E3CC 80 63 00 44 */ lwz r3, 0x44(r3) -/* 80131470 0012E3D0 4E 80 00 20 */ blr +/* 80131470 0012E3D0 4E 80 00 20 */ blr lbl_80131474: /* 80131474 0012E3D4 38 60 00 00 */ li r3, 0 -/* 80131478 0012E3D8 4E 80 00 20 */ blr +/* 80131478 0012E3D8 4E 80 00 20 */ blr .global GetCmd__16CBodyStateCmdMgrCF13EBodyStateCmd GetCmd__16CBodyStateCmdMgrCF13EBodyStateCmd: @@ -60,10 +60,10 @@ GetCmd__16CBodyStateCmdMgrCF13EBodyStateCmd: /* 80131490 0012E3F0 54 80 10 3A */ slwi r0, r4, 2 /* 80131494 0012E3F4 7C 63 02 14 */ add r3, r3, r0 /* 80131498 0012E3F8 80 63 00 44 */ lwz r3, 0x44(r3) -/* 8013149C 0012E3FC 4E 80 00 20 */ blr +/* 8013149C 0012E3FC 4E 80 00 20 */ blr lbl_801314A0: /* 801314A0 0012E400 38 60 00 00 */ li r3, 0 -/* 801314A4 0012E404 4E 80 00 20 */ blr +/* 801314A4 0012E404 4E 80 00 20 */ blr .global ClearLocomotionCmds__16CBodyStateCmdMgrFv ClearLocomotionCmds__16CBodyStateCmdMgrFv: @@ -82,7 +82,7 @@ ClearLocomotionCmds__16CBodyStateCmdMgrFv: /* 801314D8 0012E438 C0 24 00 08 */ lfs f1, 8(r4) /* 801314DC 0012E43C D0 23 00 14 */ stfs f1, 0x14(r3) /* 801314E0 0012E440 D0 03 00 3C */ stfs f0, 0x3c(r3) -/* 801314E4 0012E444 4E 80 00 20 */ blr +/* 801314E4 0012E444 4E 80 00 20 */ blr .global Reset__16CBodyStateCmdMgrFv Reset__16CBodyStateCmdMgrFv: @@ -109,7 +109,7 @@ Reset__16CBodyStateCmdMgrFv: /* 80131538 0012E498 D0 23 00 20 */ stfs f1, 0x20(r3) /* 8013153C 0012E49C D0 03 00 3C */ stfs f0, 0x3c(r3) /* 80131540 0012E4A0 90 03 00 B4 */ stw r0, 0xb4(r3) -/* 80131544 0012E4A4 4E 80 00 20 */ blr +/* 80131544 0012E4A4 4E 80 00 20 */ blr .global BlendSteeringCmds__16CBodyStateCmdMgrFv BlendSteeringCmds__16CBodyStateCmdMgrFv: @@ -234,14 +234,14 @@ lbl_801316FC: /* 80131708 0012E668 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8013170C 0012E66C 7C 08 03 A6 */ mtlr r0 /* 80131710 0012E670 38 21 00 40 */ addi r1, r1, 0x40 -/* 80131714 0012E674 4E 80 00 20 */ blr +/* 80131714 0012E674 4E 80 00 20 */ blr .global DeliverCmd__16CBodyStateCmdMgrFRC16CBCLocomotionCmd DeliverCmd__16CBodyStateCmdMgrFRC16CBCLocomotionCmd: /* 80131718 0012E678 C0 24 00 18 */ lfs f1, 0x18(r4) /* 8013171C 0012E67C C0 02 99 8C */ lfs f0, lbl_805AB6AC@sda21(r2) /* 80131720 0012E680 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80131724 0012E684 4C 81 00 20 */ blelr +/* 80131724 0012E684 4C 81 00 20 */ blelr /* 80131728 0012E688 C0 03 00 3C */ lfs f0, 0x3c(r3) /* 8013172C 0012E68C EC 00 08 2A */ fadds f0, f0, f1 /* 80131730 0012E690 D0 03 00 3C */ stfs f0, 0x3c(r3) @@ -277,7 +277,7 @@ DeliverCmd__16CBodyStateCmdMgrFRC16CBCLocomotionCmd: /* 801317A8 0012E708 C0 03 00 14 */ lfs f0, 0x14(r3) /* 801317AC 0012E70C EC 00 08 2A */ fadds f0, f0, f1 /* 801317B0 0012E710 D0 03 00 14 */ stfs f0, 0x14(r3) -/* 801317B4 0012E714 4E 80 00 20 */ blr +/* 801317B4 0012E714 4E 80 00 20 */ blr .global DeliverCmd__16CBodyStateCmdMgrFRC13CBodyStateCmd DeliverCmd__16CBodyStateCmdMgrFRC13CBodyStateCmd: @@ -292,13 +292,13 @@ DeliverCmd__16CBodyStateCmdMgrFRC13CBodyStateCmd: /* 801317D8 0012E738 7C 63 02 14 */ add r3, r3, r0 /* 801317DC 0012E73C 80 63 00 44 */ lwz r3, 0x44(r3) /* 801317E0 0012E740 90 83 00 04 */ stw r4, 4(r3) -/* 801317E4 0012E744 4E 80 00 20 */ blr +/* 801317E4 0012E744 4E 80 00 20 */ blr .global SetSteeringSpeedRange__16CBodyStateCmdMgrFff SetSteeringSpeedRange__16CBodyStateCmdMgrFff: /* 801317E8 0012E748 D0 23 00 34 */ stfs f1, 0x34(r3) /* 801317EC 0012E74C D0 43 00 38 */ stfs f2, 0x38(r3) -/* 801317F0 0012E750 4E 80 00 20 */ blr +/* 801317F0 0012E750 4E 80 00 20 */ blr .global __dt__16CBodyStateCmdMgrFv __dt__16CBodyStateCmdMgrFv: @@ -637,7 +637,7 @@ lbl_80131C94: /* 80131C9C 0012EBFC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80131CA0 0012EC00 7C 08 03 A6 */ mtlr r0 /* 80131CA4 0012EC04 38 21 00 10 */ addi r1, r1, 0x10 -/* 80131CA8 0012EC08 4E 80 00 20 */ blr +/* 80131CA8 0012EC08 4E 80 00 20 */ blr .global __ct__16CBodyStateCmdMgrFv __ct__16CBodyStateCmdMgrFv: @@ -1091,7 +1091,7 @@ lbl_8013236C: /* 80132374 0012F2D4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80132378 0012F2D8 7C 08 03 A6 */ mtlr r0 /* 8013237C 0012F2DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80132380 0012F2E0 4E 80 00 20 */ blr +/* 80132380 0012F2E0 4E 80 00 20 */ blr .global __dt__20CBCAdditiveFlinchCmdFv __dt__20CBCAdditiveFlinchCmdFv: @@ -1119,7 +1119,7 @@ lbl_801323C8: /* 801323D0 0012F330 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801323D4 0012F334 7C 08 03 A6 */ mtlr r0 /* 801323D8 0012F338 38 21 00 10 */ addi r1, r1, 0x10 -/* 801323DC 0012F33C 4E 80 00 20 */ blr +/* 801323DC 0012F33C 4E 80 00 20 */ blr .global __dt__16CBCLoopAttackCmdFv __dt__16CBCLoopAttackCmdFv: @@ -1147,4 +1147,4 @@ lbl_80132424: /* 8013242C 0012F38C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80132430 0012F390 7C 08 03 A6 */ mtlr r0 /* 80132434 0012F394 38 21 00 10 */ addi r1, r1, 0x10 -/* 80132438 0012F398 4E 80 00 20 */ blr +/* 80132438 0012F398 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/BodyState/CBodyStateInfo.s b/asm/MetroidPrime/BodyState/CBodyStateInfo.s index 10872d5e..39a4d5a5 100644 --- a/asm/MetroidPrime/BodyState/CBodyStateInfo.s +++ b/asm/MetroidPrime/BodyState/CBodyStateInfo.s @@ -178,7 +178,7 @@ lbl_803E12F8: .4byte lbl_8013449C .4byte lbl_801344B4 - + .global lbl_803E1318 lbl_803E1318: # ROM: 0x3DE318 @@ -268,7 +268,7 @@ SetupRestrictedFlyerBodyStates__14CBodyStateInfoFiR6CActor: /* 80132464 0012F3C4 38 85 10 D8 */ addi r4, r5, lbl_803E10D8@l /* 80132468 0012F3C8 7C 04 00 2E */ lwzx r0, r4, r0 /* 8013246C 0012F3CC 7C 09 03 A6 */ mtctr r0 -/* 80132470 0012F3D0 4E 80 04 20 */ bctr +/* 80132470 0012F3D0 4E 80 04 20 */ bctr .global lbl_80132474 lbl_80132474: /* 80132474 0012F3D4 3C 80 80 3D */ lis r4, lbl_803D0058@ha @@ -541,7 +541,7 @@ lbl_801327BC: /* 801327C0 0012F720 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801327C4 0012F724 7C 08 03 A6 */ mtlr r0 /* 801327C8 0012F728 38 21 00 10 */ addi r1, r1, 0x10 -/* 801327CC 0012F72C 4E 80 00 20 */ blr +/* 801327CC 0012F72C 4E 80 00 20 */ blr .global SetupNewFlyerBodyStates__14CBodyStateInfoFiR6CActor SetupNewFlyerBodyStates__14CBodyStateInfoFiR6CActor: @@ -558,7 +558,7 @@ SetupNewFlyerBodyStates__14CBodyStateInfoFiR6CActor: /* 801327F8 0012F758 38 85 11 24 */ addi r4, r5, lbl_803E1124@l /* 801327FC 0012F75C 7C 04 00 2E */ lwzx r0, r4, r0 /* 80132800 0012F760 7C 09 03 A6 */ mtctr r0 -/* 80132804 0012F764 4E 80 04 20 */ bctr +/* 80132804 0012F764 4E 80 04 20 */ bctr .global lbl_80132808 lbl_80132808: /* 80132808 0012F768 3C 80 80 3D */ lis r4, lbl_803D0058@ha @@ -831,7 +831,7 @@ lbl_80132B50: /* 80132B54 0012FAB4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80132B58 0012FAB8 7C 08 03 A6 */ mtlr r0 /* 80132B5C 0012FABC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80132B60 0012FAC0 4E 80 00 20 */ blr +/* 80132B60 0012FAC0 4E 80 00 20 */ blr .global SetupWallWalkerBodyStates__14CBodyStateInfoFiR6CActor SetupWallWalkerBodyStates__14CBodyStateInfoFiR6CActor: @@ -848,7 +848,7 @@ SetupWallWalkerBodyStates__14CBodyStateInfoFiR6CActor: /* 80132B8C 0012FAEC 38 85 11 70 */ addi r4, r5, lbl_803E1170@l /* 80132B90 0012FAF0 7C 04 00 2E */ lwzx r0, r4, r0 /* 80132B94 0012FAF4 7C 09 03 A6 */ mtctr r0 -/* 80132B98 0012FAF8 4E 80 04 20 */ bctr +/* 80132B98 0012FAF8 4E 80 04 20 */ bctr .global lbl_80132B9C lbl_80132B9C: /* 80132B9C 0012FAFC 3C 80 80 3D */ lis r4, lbl_803D0058@ha @@ -1121,7 +1121,7 @@ lbl_80132EE4: /* 80132EE8 0012FE48 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80132EEC 0012FE4C 7C 08 03 A6 */ mtlr r0 /* 80132EF0 0012FE50 38 21 00 10 */ addi r1, r1, 0x10 -/* 80132EF4 0012FE54 4E 80 00 20 */ blr +/* 80132EF4 0012FE54 4E 80 00 20 */ blr .global SetupPitchableFlyerBodyStates__14CBodyStateInfoFiR6CActor SetupPitchableFlyerBodyStates__14CBodyStateInfoFiR6CActor: @@ -1138,7 +1138,7 @@ SetupPitchableFlyerBodyStates__14CBodyStateInfoFiR6CActor: /* 80132F20 0012FE80 38 85 11 BC */ addi r4, r5, lbl_803E11BC@l /* 80132F24 0012FE84 7C 04 00 2E */ lwzx r0, r4, r0 /* 80132F28 0012FE88 7C 09 03 A6 */ mtctr r0 -/* 80132F2C 0012FE8C 4E 80 04 20 */ bctr +/* 80132F2C 0012FE8C 4E 80 04 20 */ bctr .global lbl_80132F30 lbl_80132F30: /* 80132F30 0012FE90 3C 80 80 3D */ lis r4, lbl_803D0058@ha @@ -1412,7 +1412,7 @@ lbl_8013327C: /* 80133280 001301E0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80133284 001301E4 7C 08 03 A6 */ mtlr r0 /* 80133288 001301E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8013328C 001301EC 4E 80 00 20 */ blr +/* 8013328C 001301EC 4E 80 00 20 */ blr .global SetupFlyerBodyStates__14CBodyStateInfoFiR6CActor SetupFlyerBodyStates__14CBodyStateInfoFiR6CActor: @@ -1429,7 +1429,7 @@ SetupFlyerBodyStates__14CBodyStateInfoFiR6CActor: /* 801332B8 00130218 38 85 12 08 */ addi r4, r5, lbl_803E1208@l /* 801332BC 0013021C 7C 04 00 2E */ lwzx r0, r4, r0 /* 801332C0 00130220 7C 09 03 A6 */ mtctr r0 -/* 801332C4 00130224 4E 80 04 20 */ bctr +/* 801332C4 00130224 4E 80 04 20 */ bctr .global lbl_801332C8 lbl_801332C8: /* 801332C8 00130228 3C 80 80 3D */ lis r4, lbl_803D0058@ha @@ -1703,7 +1703,7 @@ lbl_80133614: /* 80133618 00130578 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8013361C 0013057C 7C 08 03 A6 */ mtlr r0 /* 80133620 00130580 38 21 00 10 */ addi r1, r1, 0x10 -/* 80133624 00130584 4E 80 00 20 */ blr +/* 80133624 00130584 4E 80 00 20 */ blr .global SetupRestrictedBodyStates__14CBodyStateInfoFiR6CActor SetupRestrictedBodyStates__14CBodyStateInfoFiR6CActor: @@ -1720,7 +1720,7 @@ SetupRestrictedBodyStates__14CBodyStateInfoFiR6CActor: /* 80133650 001305B0 38 85 12 54 */ addi r4, r5, lbl_803E1254@l /* 80133654 001305B4 7C 04 00 2E */ lwzx r0, r4, r0 /* 80133658 001305B8 7C 09 03 A6 */ mtctr r0 -/* 8013365C 001305BC 4E 80 04 20 */ bctr +/* 8013365C 001305BC 4E 80 04 20 */ bctr .global lbl_80133660 lbl_80133660: /* 80133660 001305C0 3C 80 80 3D */ lis r4, lbl_803D0058@ha @@ -2007,7 +2007,7 @@ lbl_801339D4: /* 801339D8 00130938 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801339DC 0013093C 7C 08 03 A6 */ mtlr r0 /* 801339E0 00130940 38 21 00 10 */ addi r1, r1, 0x10 -/* 801339E4 00130944 4E 80 00 20 */ blr +/* 801339E4 00130944 4E 80 00 20 */ blr .global SetupBiPedalBodyStates__14CBodyStateInfoFiR6CActor SetupBiPedalBodyStates__14CBodyStateInfoFiR6CActor: @@ -2024,7 +2024,7 @@ SetupBiPedalBodyStates__14CBodyStateInfoFiR6CActor: /* 80133A10 00130970 38 85 12 A4 */ addi r4, r5, lbl_803E12A4@l /* 80133A14 00130974 7C 04 00 2E */ lwzx r0, r4, r0 /* 80133A18 00130978 7C 09 03 A6 */ mtctr r0 -/* 80133A1C 0013097C 4E 80 04 20 */ bctr +/* 80133A1C 0013097C 4E 80 04 20 */ bctr .global lbl_80133A20 lbl_80133A20: /* 80133A20 00130980 3C 80 80 3D */ lis r4, lbl_803D0058@ha @@ -2325,7 +2325,7 @@ lbl_80133DC0: /* 80133DC4 00130D24 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80133DC8 00130D28 7C 08 03 A6 */ mtlr r0 /* 80133DCC 00130D2C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80133DD0 00130D30 4E 80 00 20 */ blr +/* 80133DD0 00130D30 4E 80 00 20 */ blr .global GetLocomotionSpeed__14CBodyStateInfoCFQ23pas15ELocomotionAnim GetLocomotionSpeed__14CBodyStateInfoCFQ23pas15ELocomotionAnim: @@ -2384,7 +2384,7 @@ lbl_80133E58: /* 80133E84 00130DE4 80 86 02 EC */ lwz r4, 0x2ec(r6) /* 80133E88 00130DE8 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 80133E8C 00130DEC 7D 89 03 A6 */ mtctr r12 -/* 80133E90 00130DF0 4E 80 04 21 */ bctrl +/* 80133E90 00130DF0 4E 80 04 21 */ bctrl /* 80133E94 00130DF4 48 00 00 08 */ b lbl_80133E9C lbl_80133E98: /* 80133E98 00130DF8 C0 22 99 98 */ lfs f1, lbl_805AB6B8@sda21(r2) @@ -2392,7 +2392,7 @@ lbl_80133E9C: /* 80133E9C 00130DFC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80133EA0 00130E00 7C 08 03 A6 */ mtlr r0 /* 80133EA4 00130E04 38 21 00 10 */ addi r1, r1, 0x10 -/* 80133EA8 00130E08 4E 80 00 20 */ blr +/* 80133EA8 00130E08 4E 80 00 20 */ blr .global GetMaxSpeed__14CBodyStateInfoCFv GetMaxSpeed__14CBodyStateInfoCFv: @@ -2434,7 +2434,7 @@ lbl_80133F18: /* 80133F2C 00130E8C 83 C1 00 08 */ lwz r30, 8(r1) /* 80133F30 00130E90 7C 08 03 A6 */ mtlr r0 /* 80133F34 00130E94 38 21 00 20 */ addi r1, r1, 0x20 -/* 80133F38 00130E98 4E 80 00 20 */ blr +/* 80133F38 00130E98 4E 80 00 20 */ blr .global GetCurrentAdditiveState__14CBodyStateInfoFv GetCurrentAdditiveState__14CBodyStateInfoFv: @@ -2461,7 +2461,7 @@ lbl_80133F7C: /* 80133F84 00130EE4 42 00 FF D4 */ bdnz lbl_80133F58 lbl_80133F88: /* 80133F88 00130EE8 7C E3 3B 78 */ mr r3, r7 -/* 80133F8C 00130EEC 4E 80 00 20 */ blr +/* 80133F8C 00130EEC 4E 80 00 20 */ blr .global SetAdditiveState__14CBodyStateInfoFQ23pas15EAnimationState SetAdditiveState__14CBodyStateInfoFQ23pas15EAnimationState: @@ -2469,21 +2469,21 @@ SetAdditiveState__14CBodyStateInfoFQ23pas15EAnimationState: /* 80133F94 00130EF4 38 C0 00 00 */ li r6, 0 /* 80133F98 00130EF8 7C 09 03 A6 */ mtctr r0 /* 80133F9C 00130EFC 2C 00 00 00 */ cmpwi r0, 0 -/* 80133FA0 00130F00 4C 81 00 20 */ blelr +/* 80133FA0 00130F00 4C 81 00 20 */ blelr lbl_80133FA4: /* 80133FA4 00130F04 80 A3 00 28 */ lwz r5, 0x28(r3) /* 80133FA8 00130F08 7C 05 30 2E */ lwzx r0, r5, r6 /* 80133FAC 00130F0C 7C 04 00 00 */ cmpw r4, r0 /* 80133FB0 00130F10 40 82 00 0C */ bne lbl_80133FBC /* 80133FB4 00130F14 90 83 00 2C */ stw r4, 0x2c(r3) -/* 80133FB8 00130F18 4E 80 00 20 */ blr +/* 80133FB8 00130F18 4E 80 00 20 */ blr lbl_80133FBC: /* 80133FBC 00130F1C 38 C6 00 0C */ addi r6, r6, 0xc /* 80133FC0 00130F20 42 00 FF E4 */ bdnz lbl_80133FA4 .global sub_80133fc4 sub_80133fc4: -/* 80133FC4 00130F24 4E 80 00 20 */ blr +/* 80133FC4 00130F24 4E 80 00 20 */ blr .global ApplyHeadTracking__14CBodyStateInfoCFv ApplyHeadTracking__14CBodyStateInfoCFv: @@ -2497,7 +2497,7 @@ ApplyHeadTracking__14CBodyStateInfoCFv: /* 80133FE4 00130F44 81 83 00 00 */ lwz r12, 0(r3) /* 80133FE8 00130F48 81 8C 00 20 */ lwz r12, 0x20(r12) /* 80133FEC 00130F4C 7D 89 03 A6 */ mtctr r12 -/* 80133FF0 00130F50 4E 80 04 21 */ bctrl +/* 80133FF0 00130F50 4E 80 04 21 */ bctrl /* 80133FF4 00130F54 48 00 00 08 */ b lbl_80133FFC lbl_80133FF8: /* 80133FF8 00130F58 38 60 00 00 */ li r3, 0 @@ -2505,12 +2505,12 @@ lbl_80133FFC: /* 80133FFC 00130F5C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80134000 00130F60 7C 08 03 A6 */ mtlr r0 /* 80134004 00130F64 38 21 00 10 */ addi r1, r1, 0x10 -/* 80134008 00130F68 4E 80 00 20 */ blr +/* 80134008 00130F68 4E 80 00 20 */ blr .global ApplyHeadTracking__10CBodyStateCFv ApplyHeadTracking__10CBodyStateCFv: /* 8013400C 00130F6C 38 60 00 01 */ li r3, 1 -/* 80134010 00130F70 4E 80 00 20 */ blr +/* 80134010 00130F70 4E 80 00 20 */ blr .global GetCurrentState__14CBodyStateInfoFv GetCurrentState__14CBodyStateInfoFv: @@ -2544,7 +2544,7 @@ lbl_80134064: /* 8013406C 00130FCC 38 A0 00 00 */ li r5, 0 lbl_80134070: /* 80134070 00130FD0 80 65 00 14 */ lwz r3, 0x14(r5) -/* 80134074 00130FD4 4E 80 00 20 */ blr +/* 80134074 00130FD4 4E 80 00 20 */ blr .global GetCurrentState__14CBodyStateInfoCFv GetCurrentState__14CBodyStateInfoCFv: @@ -2578,7 +2578,7 @@ lbl_801340C8: /* 801340D0 00131030 38 A0 00 00 */ li r5, 0 lbl_801340D4: /* 801340D4 00131034 80 65 00 14 */ lwz r3, 0x14(r5) -/* 801340D8 00131038 4E 80 00 20 */ blr +/* 801340D8 00131038 4E 80 00 20 */ blr .global SetState__14CBodyStateInfoFQ23pas15EAnimationState SetState__14CBodyStateInfoFQ23pas15EAnimationState: @@ -2629,7 +2629,7 @@ lbl_80134164: /* 8013416C 001310CC 90 83 00 14 */ stw r4, 0x14(r3) lbl_80134170: /* 80134170 001310D0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80134174 001310D4 4E 80 00 20 */ blr +/* 80134174 001310D4 4E 80 00 20 */ blr .global __dt__14CBodyStateInfoFv __dt__14CBodyStateInfoFv: @@ -2654,7 +2654,7 @@ lbl_801341AC: /* 801341BC 0013111C 38 80 00 01 */ li r4, 1 /* 801341C0 00131120 81 8C 00 08 */ lwz r12, 8(r12) /* 801341C4 00131124 7D 89 03 A6 */ mtctr r12 -/* 801341C8 00131128 4E 80 04 21 */ bctrl +/* 801341C8 00131128 4E 80 04 21 */ bctrl lbl_801341CC: /* 801341CC 0013112C 7F C3 F3 78 */ mr r3, r30 /* 801341D0 00131130 7F A4 EB 78 */ mr r4, r29 @@ -2699,7 +2699,7 @@ lbl_8013424C: /* 80134254 001311B4 80 01 00 34 */ lwz r0, 0x34(r1) /* 80134258 001311B8 7C 08 03 A6 */ mtlr r0 /* 8013425C 001311BC 38 21 00 30 */ addi r1, r1, 0x30 -/* 80134260 001311C0 4E 80 00 20 */ blr +/* 80134260 001311C0 4E 80 00 20 */ blr .global sub_80134264 sub_80134264: @@ -2737,7 +2737,7 @@ lbl_801342B0: /* 801342DC 0013123C 38 80 00 01 */ li r4, 1 /* 801342E0 00131240 81 8C 00 08 */ lwz r12, 8(r12) /* 801342E4 00131244 7D 89 03 A6 */ mtctr r12 -/* 801342E8 00131248 4E 80 04 21 */ bctrl +/* 801342E8 00131248 4E 80 04 21 */ bctrl lbl_801342EC: /* 801342EC 0013124C 3B DE 00 0C */ addi r30, r30, 0xc lbl_801342F0: @@ -2761,7 +2761,7 @@ lbl_80134318: /* 8013432C 0013128C 83 81 00 20 */ lwz r28, 0x20(r1) /* 80134330 00131290 7C 08 03 A6 */ mtlr r0 /* 80134334 00131294 38 21 00 30 */ addi r1, r1, 0x30 -/* 80134338 00131298 4E 80 00 20 */ blr +/* 80134338 00131298 4E 80 00 20 */ blr .global __dt__18CAdditiveBodyStateFv __dt__18CAdditiveBodyStateFv: @@ -2783,7 +2783,7 @@ lbl_8013436C: /* 80134374 001312D4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80134378 001312D8 7C 08 03 A6 */ mtlr r0 /* 8013437C 001312DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80134380 001312E0 4E 80 00 20 */ blr +/* 80134380 001312E0 4E 80 00 20 */ blr .global __ct__14CBodyStateInfoFR6CActor9EBodyType __ct__14CBodyStateInfoFR6CActor9EBodyType: @@ -2833,7 +2833,7 @@ lbl_8013440C: /* 8013442C 0013138C 38 63 12 F8 */ addi r3, r3, lbl_803E12F8@l /* 80134430 00131390 7C 03 00 2E */ lwzx r0, r3, r0 /* 80134434 00131394 7C 09 03 A6 */ mtctr r0 -/* 80134438 00131398 4E 80 04 20 */ bctr +/* 80134438 00131398 4E 80 04 20 */ bctr .global lbl_8013443C lbl_8013443C: /* 8013443C 0013139C 80 9E 00 00 */ lwz r4, 0(r30) @@ -2985,7 +2985,7 @@ lbl_80134600: /* 80134630 00131590 38 80 00 01 */ li r4, 1 /* 80134634 00131594 81 8C 00 08 */ lwz r12, 8(r12) /* 80134638 00131598 7D 89 03 A6 */ mtctr r12 -/* 8013463C 0013159C 4E 80 04 21 */ bctrl +/* 8013463C 0013159C 4E 80 04 21 */ bctrl lbl_80134640: /* 80134640 001315A0 88 01 00 28 */ lbz r0, 0x28(r1) /* 80134644 001315A4 28 00 00 00 */ cmplwi r0, 0 @@ -2997,7 +2997,7 @@ lbl_80134640: /* 8013465C 001315BC 38 80 00 01 */ li r4, 1 /* 80134660 001315C0 81 8C 00 08 */ lwz r12, 8(r12) /* 80134664 001315C4 7D 89 03 A6 */ mtctr r12 -/* 80134668 001315C8 4E 80 04 21 */ bctrl +/* 80134668 001315C8 4E 80 04 21 */ bctrl lbl_8013466C: /* 8013466C 001315CC 3C 80 80 3D */ lis r4, lbl_803D0058@ha /* 80134670 001315D0 38 60 00 38 */ li r3, 0x38 @@ -3062,7 +3062,7 @@ lbl_8013471C: /* 8013474C 001316AC 38 80 00 01 */ li r4, 1 /* 80134750 001316B0 81 8C 00 08 */ lwz r12, 8(r12) /* 80134754 001316B4 7D 89 03 A6 */ mtctr r12 -/* 80134758 001316B8 4E 80 04 21 */ bctrl +/* 80134758 001316B8 4E 80 04 21 */ bctrl lbl_8013475C: /* 8013475C 001316BC 88 01 00 20 */ lbz r0, 0x20(r1) /* 80134760 001316C0 28 00 00 00 */ cmplwi r0, 0 @@ -3074,7 +3074,7 @@ lbl_8013475C: /* 80134778 001316D8 38 80 00 01 */ li r4, 1 /* 8013477C 001316DC 81 8C 00 08 */ lwz r12, 8(r12) /* 80134780 001316E0 7D 89 03 A6 */ mtctr r12 -/* 80134784 001316E4 4E 80 04 21 */ bctrl +/* 80134784 001316E4 4E 80 04 21 */ bctrl lbl_80134788: /* 80134788 001316E8 3C 80 80 3D */ lis r4, lbl_803D0058@ha /* 8013478C 001316EC 38 60 00 0C */ li r3, 0xc @@ -3139,7 +3139,7 @@ lbl_80134838: /* 80134868 001317C8 38 80 00 01 */ li r4, 1 /* 8013486C 001317CC 81 8C 00 08 */ lwz r12, 8(r12) /* 80134870 001317D0 7D 89 03 A6 */ mtctr r12 -/* 80134874 001317D4 4E 80 04 21 */ bctrl +/* 80134874 001317D4 4E 80 04 21 */ bctrl lbl_80134878: /* 80134878 001317D8 88 01 00 18 */ lbz r0, 0x18(r1) /* 8013487C 001317DC 28 00 00 00 */ cmplwi r0, 0 @@ -3151,7 +3151,7 @@ lbl_80134878: /* 80134894 001317F4 38 80 00 01 */ li r4, 1 /* 80134898 001317F8 81 8C 00 08 */ lwz r12, 8(r12) /* 8013489C 001317FC 7D 89 03 A6 */ mtctr r12 -/* 801348A0 00131800 4E 80 04 21 */ bctrl +/* 801348A0 00131800 4E 80 04 21 */ bctrl lbl_801348A4: /* 801348A4 00131804 3C 80 80 3D */ lis r4, lbl_803D0058@ha /* 801348A8 00131808 38 60 00 14 */ li r3, 0x14 @@ -3216,7 +3216,7 @@ lbl_80134954: /* 80134984 001318E4 38 80 00 01 */ li r4, 1 /* 80134988 001318E8 81 8C 00 08 */ lwz r12, 8(r12) /* 8013498C 001318EC 7D 89 03 A6 */ mtctr r12 -/* 80134990 001318F0 4E 80 04 21 */ bctrl +/* 80134990 001318F0 4E 80 04 21 */ bctrl lbl_80134994: /* 80134994 001318F4 88 01 00 10 */ lbz r0, 0x10(r1) /* 80134998 001318F8 28 00 00 00 */ cmplwi r0, 0 @@ -3228,39 +3228,39 @@ lbl_80134994: /* 801349B0 00131910 38 80 00 01 */ li r4, 1 /* 801349B4 00131914 81 8C 00 08 */ lwz r12, 8(r12) /* 801349B8 00131918 7D 89 03 A6 */ mtctr r12 -/* 801349BC 0013191C 4E 80 04 21 */ bctrl +/* 801349BC 0013191C 4E 80 04 21 */ bctrl lbl_801349C0: /* 801349C0 00131920 7F E3 FB 78 */ mr r3, r31 /* 801349C4 00131924 BB 41 00 78 */ lmw r26, 0x78(r1) /* 801349C8 00131928 80 01 00 94 */ lwz r0, 0x94(r1) /* 801349CC 0013192C 7C 08 03 A6 */ mtlr r0 /* 801349D0 00131930 38 21 00 90 */ addi r1, r1, 0x90 -/* 801349D4 00131934 4E 80 00 20 */ blr +/* 801349D4 00131934 4E 80 00 20 */ blr .global IsDead__10CBodyStateCFv IsDead__10CBodyStateCFv: /* 801349D8 00131938 38 60 00 00 */ li r3, 0 -/* 801349DC 0013193C 4E 80 00 20 */ blr +/* 801349DC 0013193C 4E 80 00 20 */ blr .global IsDying__10CBodyStateCFv IsDying__10CBodyStateCFv: /* 801349E0 00131940 38 60 00 00 */ li r3, 0 -/* 801349E4 00131944 4E 80 00 20 */ blr +/* 801349E4 00131944 4E 80 00 20 */ blr .global IsMoving__10CBodyStateCFv IsMoving__10CBodyStateCFv: /* 801349E8 00131948 38 60 00 00 */ li r3, 0 -/* 801349EC 0013194C 4E 80 00 20 */ blr +/* 801349EC 0013194C 4E 80 00 20 */ blr .global ApplyHeadTracking__18CAdditiveBodyStateCFv ApplyHeadTracking__18CAdditiveBodyStateCFv: /* 801349F0 00131950 38 60 00 01 */ li r3, 1 -/* 801349F4 00131954 4E 80 00 20 */ blr +/* 801349F4 00131954 4E 80 00 20 */ blr .global CanShoot__18CAdditiveBodyStateCFv CanShoot__18CAdditiveBodyStateCFv: /* 801349F8 00131958 38 60 00 01 */ li r3, 1 -/* 801349FC 0013195C 4E 80 00 20 */ blr +/* 801349FC 0013195C 4E 80 00 20 */ blr .global sub_80134a00 sub_80134a00: @@ -3292,7 +3292,7 @@ lbl_80134A50: /* 80134A58 001319B8 83 C1 00 08 */ lwz r30, 8(r1) /* 80134A5C 001319BC 7C 08 03 A6 */ mtlr r0 /* 80134A60 001319C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80134A64 001319C4 4E 80 00 20 */ blr +/* 80134A64 001319C4 4E 80 00 20 */ blr .global "insert_into__Q24rstl144red_black_tree,0,Q24rstl41select1st>,Q24rstl7less,Q24rstl17rmemory_allocator>FPQ34rstl144red_black_tree,0,Q24rstl41select1st>,Q24rstl7less,Q24rstl17rmemory_allocator>4nodeRCQ24rstl21pair" "insert_into__Q24rstl144red_black_tree,0,Q24rstl41select1st>,Q24rstl7less,Q24rstl17rmemory_allocator>FPQ34rstl144red_black_tree,0,Q24rstl41select1st>,Q24rstl7less,Q24rstl17rmemory_allocator>4nodeRCQ24rstl21pair": @@ -3448,7 +3448,7 @@ lbl_80134C8C: /* 80134C90 00131BF0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80134C94 00131BF4 7C 08 03 A6 */ mtlr r0 /* 80134C98 00131BF8 38 21 00 20 */ addi r1, r1, 0x20 -/* 80134C9C 00131BFC 4E 80 00 20 */ blr +/* 80134C9C 00131BFC 4E 80 00 20 */ blr .global "reserve__Q24rstl91vector>,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl91vector>,Q24rstl17rmemory_allocator>Fi": @@ -3520,7 +3520,7 @@ lbl_80134D60: /* 80134D8C 00131CEC 38 80 00 01 */ li r4, 1 /* 80134D90 00131CF0 81 8C 00 08 */ lwz r12, 8(r12) /* 80134D94 00131CF4 7D 89 03 A6 */ mtctr r12 -/* 80134D98 00131CF8 4E 80 04 21 */ bctrl +/* 80134D98 00131CF8 4E 80 04 21 */ bctrl lbl_80134D9C: /* 80134D9C 00131CFC 3B 7B 00 0C */ addi r27, r27, 0xc lbl_80134DA0: diff --git a/asm/MetroidPrime/CAABoxFilter.s b/asm/MetroidPrime/CAABoxFilter.s index 5f2b575d..ce662194 100644 --- a/asm/MetroidPrime/CAABoxFilter.s +++ b/asm/MetroidPrime/CAABoxFilter.s @@ -13,7 +13,7 @@ Filter__12CAABoxFilterCFRC18CCollisionInfoListR18CCollisionInfoList: /* 80185868 001827C8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8018586C 001827CC 7C 08 03 A6 */ mtlr r0 /* 80185870 001827D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80185874 001827D4 4E 80 00 20 */ blr +/* 80185874 001827D4 4E 80 00 20 */ blr .global FilterBoxFloorCollisions__12CAABoxFilterFRC18CCollisionInfoListR18CCollisionInfoList FilterBoxFloorCollisions__12CAABoxFilterFRC18CCollisionInfoListR18CCollisionInfoList: @@ -129,4 +129,4 @@ lbl_801859E0: /* 80185A00 00182960 83 81 0C 10 */ lwz r28, 0xc10(r1) /* 80185A04 00182964 7C 08 03 A6 */ mtlr r0 /* 80185A08 00182968 38 21 0C 30 */ addi r1, r1, 0xc30 -/* 80185A0C 0018296C 4E 80 00 20 */ blr +/* 80185A0C 0018296C 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/CActor.s b/asm/MetroidPrime/CActor.s index abefac60..843f9254 100644 --- a/asm/MetroidPrime/CActor.s +++ b/asm/MetroidPrime/CActor.s @@ -139,7 +139,7 @@ lbl_80052CB8: /* 80052CC4 0004FC24 80 01 00 34 */ lwz r0, 0x34(r1) /* 80052CC8 0004FC28 7C 08 03 A6 */ mtlr r0 /* 80052CCC 0004FC2C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80052CD0 0004FC30 4E 80 00 20 */ blr +/* 80052CD0 0004FC30 4E 80 00 20 */ blr .global CanDrawStatic__6CActorCFv CanDrawStatic__6CActorCFv: @@ -167,7 +167,7 @@ lbl_80052D0C: /* 80052D20 0004FC80 40 81 00 0C */ ble lbl_80052D2C lbl_80052D24: /* 80052D24 0004FC84 38 60 00 00 */ li r3, 0 -/* 80052D28 0004FC88 4E 80 00 20 */ blr +/* 80052D28 0004FC88 4E 80 00 20 */ blr lbl_80052D2C: /* 80052D2C 0004FC8C 80 85 00 10 */ lwz r4, 0x10(r5) /* 80052D30 0004FC90 38 60 00 00 */ li r3, 0 @@ -184,10 +184,10 @@ lbl_80052D4C: /* 80052D58 0004FCB8 41 82 00 0C */ beq lbl_80052D64 lbl_80052D5C: /* 80052D5C 0004FCBC 38 60 00 00 */ li r3, 0 -/* 80052D60 0004FCC0 4E 80 00 20 */ blr +/* 80052D60 0004FCC0 4E 80 00 20 */ blr lbl_80052D64: /* 80052D64 0004FCC4 38 60 00 01 */ li r3, 1 -/* 80052D68 0004FCC8 4E 80 00 20 */ blr +/* 80052D68 0004FCC8 4E 80 00 20 */ blr .global CreateShadow__6CActorFb CreateShadow__6CActorFb: @@ -219,7 +219,7 @@ lbl_80052DB8: /* 80052DCC 0004FD2C 83 C1 00 08 */ lwz r30, 8(r1) /* 80052DD0 0004FD30 7C 08 03 A6 */ mtlr r0 /* 80052DD4 0004FD34 38 21 00 10 */ addi r1, r1, 0x10 -/* 80052DD8 0004FD38 4E 80 00 20 */ blr +/* 80052DD8 0004FD38 4E 80 00 20 */ blr .global CreateShadow__6CActorFv CreateShadow__6CActorFv: @@ -270,7 +270,7 @@ lbl_80052E74: /* 80052E7C 0004FDDC 83 C1 00 08 */ lwz r30, 8(r1) /* 80052E80 0004FDE0 7C 08 03 A6 */ mtlr r0 /* 80052E84 0004FDE4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80052E88 0004FDE8 4E 80 00 20 */ blr +/* 80052E88 0004FDE8 4E 80 00 20 */ blr .global SetTranslation__6CActorFRC9CVector3f SetTranslation__6CActorFRC9CVector3f: @@ -290,7 +290,7 @@ SetTranslation__6CActorFRC9CVector3f: /* 80052EC0 0004FE20 88 03 00 E4 */ lbz r0, 0xe4(r3) /* 80052EC4 0004FE24 50 A0 17 7A */ rlwimi r0, r5, 2, 0x1d, 0x1d /* 80052EC8 0004FE28 98 03 00 E4 */ stb r0, 0xe4(r3) -/* 80052ECC 0004FE2C 4E 80 00 20 */ blr +/* 80052ECC 0004FE2C 4E 80 00 20 */ blr .global "GetScaledLocatorTransform__6CActorCFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" "GetScaledLocatorTransform__6CActorCFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>": @@ -305,7 +305,7 @@ SetTranslation__6CActorFRC9CVector3f: /* 80052EF0 0004FE50 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80052EF4 0004FE54 7C 08 03 A6 */ mtlr r0 /* 80052EF8 0004FE58 38 21 00 10 */ addi r1, r1, 0x10 -/* 80052EFC 0004FE5C 4E 80 00 20 */ blr +/* 80052EFC 0004FE5C 4E 80 00 20 */ blr .global "GetLocatorTransform__6CActorCFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" "GetLocatorTransform__6CActorCFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>": @@ -320,7 +320,7 @@ SetTranslation__6CActorFRC9CVector3f: /* 80052F20 0004FE80 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80052F24 0004FE84 7C 08 03 A6 */ mtlr r0 /* 80052F28 0004FE88 38 21 00 10 */ addi r1, r1, 0x10 -/* 80052F2C 0004FE8C 4E 80 00 20 */ blr +/* 80052F2C 0004FE8C 4E 80 00 20 */ blr .global ProcessSoundEvent__6CActorFififfUcUcRC9CVector3fRC9CVector3fiR13CStateManager ProcessSoundEvent__6CActorFififfUcUcRC9CVector3fRC9CVector3fiR13CStateManager: @@ -563,7 +563,7 @@ lbl_80053294: /* 800532B0 00050210 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 800532B4 00050214 7C 08 03 A6 */ mtlr r0 /* 800532B8 00050218 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 800532BC 0005021C 4E 80 00 20 */ blr +/* 800532BC 0005021C 4E 80 00 20 */ blr .global SetInFluid__6CActorFb9TUniqueId SetInFluid__6CActorFb9TUniqueId: @@ -576,26 +576,26 @@ SetInFluid__6CActorFb9TUniqueId: /* 800532D8 00050238 98 C3 00 E6 */ stb r6, 0xe6(r3) /* 800532DC 0005023C A0 05 00 00 */ lhz r0, 0(r5) /* 800532E0 00050240 B0 03 00 C4 */ sth r0, 0xc4(r3) -/* 800532E4 00050244 4E 80 00 20 */ blr +/* 800532E4 00050244 4E 80 00 20 */ blr lbl_800532E8: /* 800532E8 00050248 88 83 00 E6 */ lbz r4, 0xe6(r3) /* 800532EC 0005024C 54 85 DF 7F */ rlwinm. r5, r4, 0x1b, 0x1d, 0x1f -/* 800532F0 00050250 4D 82 00 20 */ beqlr +/* 800532F0 00050250 4D 82 00 20 */ beqlr /* 800532F4 00050254 38 05 FF FF */ addi r0, r5, -1 /* 800532F8 00050258 50 04 2E 34 */ rlwimi r4, r0, 5, 0x18, 0x1a /* 800532FC 0005025C 98 83 00 E6 */ stb r4, 0xe6(r3) /* 80053300 00050260 88 03 00 E6 */ lbz r0, 0xe6(r3) /* 80053304 00050264 54 00 DF 7F */ rlwinm. r0, r0, 0x1b, 0x1d, 0x1f -/* 80053308 00050268 4C 82 00 20 */ bnelr +/* 80053308 00050268 4C 82 00 20 */ bnelr /* 8005330C 0005026C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80053310 00050270 B0 03 00 C4 */ sth r0, 0xc4(r3) -/* 80053314 00050274 4E 80 00 20 */ blr +/* 80053314 00050274 4E 80 00 20 */ blr .global GetSfxHandle__6CActorCFv GetSfxHandle__6CActorCFv: /* 80053318 00050278 80 04 00 8C */ lwz r0, 0x8c(r4) /* 8005331C 0005027C 90 03 00 00 */ stw r0, 0(r3) -/* 80053320 00050280 4E 80 00 20 */ blr +/* 80053320 00050280 4E 80 00 20 */ blr .global SetSoundEventPitchBend__6CActorFi SetSoundEventPitchBend__6CActorFi: @@ -618,7 +618,7 @@ lbl_80053360: /* 80053360 000502C0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80053364 000502C4 7C 08 03 A6 */ mtlr r0 /* 80053368 000502C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8005336C 000502CC 4E 80 00 20 */ blr +/* 8005336C 000502CC 4E 80 00 20 */ blr .global SetVolume__6CActorFUc SetVolume__6CActorFUc: @@ -653,7 +653,7 @@ lbl_800533D0: /* 800533DC 0005033C 83 C1 00 28 */ lwz r30, 0x28(r1) /* 800533E0 00050340 7C 08 03 A6 */ mtlr r0 /* 800533E4 00050344 38 21 00 30 */ addi r1, r1, 0x30 -/* 800533E8 00050348 4E 80 00 20 */ blr +/* 800533E8 00050348 4E 80 00 20 */ blr .global SetMuted__6CActorFb SetMuted__6CActorFb: @@ -667,7 +667,7 @@ SetMuted__6CActorFb: /* 80053408 00050368 80 01 00 14 */ lwz r0, 0x14(r1) /* 8005340C 0005036C 7C 08 03 A6 */ mtlr r0 /* 80053410 00050370 38 21 00 10 */ addi r1, r1, 0x10 -/* 80053414 00050374 4E 80 00 20 */ blr +/* 80053414 00050374 4E 80 00 20 */ blr .global MoveScannableObjectInfoToActor__6CActorFP6CActorR13CStateManager MoveScannableObjectInfoToActor__6CActorFP6CActorR13CStateManager: @@ -718,7 +718,7 @@ lbl_800534A8: /* 800534B8 00050418 83 81 00 10 */ lwz r28, 0x10(r1) /* 800534BC 0005041C 7C 08 03 A6 */ mtlr r0 /* 800534C0 00050420 38 21 00 20 */ addi r1, r1, 0x20 -/* 800534C4 00050424 4E 80 00 20 */ blr +/* 800534C4 00050424 4E 80 00 20 */ blr .global GetScannableObjectInfo__6CActorCFv GetScannableObjectInfo__6CActorCFv: @@ -769,7 +769,7 @@ lbl_80053558: /* 80053560 000504C0 83 C1 00 08 */ lwz r30, 8(r1) /* 80053564 000504C4 7C 08 03 A6 */ mtlr r0 /* 80053568 000504C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8005356C 000504CC 4E 80 00 20 */ blr +/* 8005356C 000504CC 4E 80 00 20 */ blr .global OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager: @@ -804,11 +804,11 @@ lbl_800535CC: /* 800535CC 0005052C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800535D0 00050530 7C 08 03 A6 */ mtlr r0 /* 800535D4 00050534 38 21 00 10 */ addi r1, r1, 0x10 -/* 800535D8 00050538 4E 80 00 20 */ blr +/* 800535D8 00050538 4E 80 00 20 */ blr .global FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager: -/* 800535DC 0005053C 4E 80 00 20 */ blr +/* 800535DC 0005053C 4E 80 00 20 */ blr .global GetSortingBounds__6CActorCFRC12CTransform4f GetSortingBounds__6CActorCFRC12CTransform4f: @@ -824,7 +824,7 @@ GetSortingBounds__6CActorCFRC12CTransform4f: /* 80053604 00050564 D0 03 00 10 */ stfs f0, 0x10(r3) /* 80053608 00050568 C0 04 00 B0 */ lfs f0, 0xb0(r4) /* 8005360C 0005056C D0 03 00 14 */ stfs f0, 0x14(r3) -/* 80053610 00050570 4E 80 00 20 */ blr +/* 80053610 00050570 4E 80 00 20 */ blr .global AcceptScriptMsg__6CActorF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__6CActorF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -843,7 +843,7 @@ AcceptScriptMsg__6CActorF20EScriptObjectMessage9TUniqueIdR13CStateManager: /* 80053644 000505A4 38 84 9F 1C */ addi r4, r4, lbl_803D9F1C@l /* 80053648 000505A8 7C 04 00 2E */ lwzx r0, r4, r0 /* 8005364C 000505AC 7C 09 03 A6 */ mtctr r0 -/* 80053650 000505B0 4E 80 04 20 */ bctr +/* 80053650 000505B0 4E 80 04 20 */ bctr .global lbl_80053654 lbl_80053654: /* 80053654 000505B4 88 1C 00 30 */ lbz r0, 0x30(r28) @@ -993,7 +993,7 @@ lbl_8005381C: /* 8005383C 0005079C 80 01 00 64 */ lwz r0, 0x64(r1) /* 80053840 000507A0 7C 08 03 A6 */ mtlr r0 /* 80053844 000507A4 38 21 00 60 */ addi r1, r1, 0x60 -/* 80053848 000507A8 4E 80 00 20 */ blr +/* 80053848 000507A8 4E 80 00 20 */ blr .global SetActive__6CActorFb SetActive__6CActorFb: @@ -1017,7 +1017,7 @@ SetActive__6CActorFb: /* 80053890 000507F0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80053894 000507F4 7C 08 03 A6 */ mtlr r0 /* 80053898 000507F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8005389C 000507FC 4E 80 00 20 */ blr +/* 8005389C 000507FC 4E 80 00 20 */ blr .global SetMaterialFilter__6CActorFRC15CMaterialFilter SetMaterialFilter__6CActorFRC15CMaterialFilter: @@ -1027,12 +1027,12 @@ SetMaterialFilter__6CActorFRC15CMaterialFilter: /* 800538AC 0005080C D8 03 00 78 */ stfd f0, 0x78(r3) /* 800538B0 00050810 80 04 00 10 */ lwz r0, 0x10(r4) /* 800538B4 00050814 90 03 00 80 */ stw r0, 0x80(r3) -/* 800538B8 00050818 4E 80 00 20 */ blr +/* 800538B8 00050818 4E 80 00 20 */ blr .global GetMaterialFilter__6CActorCFv GetMaterialFilter__6CActorCFv: /* 800538BC 0005081C 38 63 00 70 */ addi r3, r3, 0x70 -/* 800538C0 00050820 4E 80 00 20 */ blr +/* 800538C0 00050820 4E 80 00 20 */ blr .global sub_800538c4 sub_800538c4: @@ -1058,7 +1058,7 @@ sub_800538c4: /* 80053910 00050870 80 01 00 14 */ lwz r0, 0x14(r1) /* 80053914 00050874 7C 08 03 A6 */ mtlr r0 /* 80053918 00050878 38 21 00 10 */ addi r1, r1, 0x10 -/* 8005391C 0005087C 4E 80 00 20 */ blr +/* 8005391C 0005087C 4E 80 00 20 */ blr .global SetCalculateLighting__6CActorFb SetCalculateLighting__6CActorFb: @@ -1113,7 +1113,7 @@ lbl_800539C0: /* 800539D8 00050938 83 A1 00 24 */ lwz r29, 0x24(r1) /* 800539DC 0005093C 7C 08 03 A6 */ mtlr r0 /* 800539E0 00050940 38 21 00 30 */ addi r1, r1, 0x30 -/* 800539E4 00050944 4E 80 00 20 */ blr +/* 800539E4 00050944 4E 80 00 20 */ blr .global IsModelOpaque__6CActorCFRC13CStateManager IsModelOpaque__6CActorCFRC13CStateManager: @@ -1164,7 +1164,7 @@ lbl_80053A7C: /* 80053A80 000509E0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80053A84 000509E4 7C 08 03 A6 */ mtlr r0 /* 80053A88 000509E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80053A8C 000509EC 4E 80 00 20 */ blr +/* 80053A8C 000509EC 4E 80 00 20 */ blr .global GetScanObjectIndicatorPosition__6CActorCFRC13CStateManager GetScanObjectIndicatorPosition__6CActorCFRC13CStateManager: @@ -1196,7 +1196,7 @@ GetScanObjectIndicatorPosition__6CActorCFRC13CStateManager: /* 80053AF4 00050A54 38 61 00 40 */ addi r3, r1, 0x40 /* 80053AF8 00050A58 81 8C 00 48 */ lwz r12, 0x48(r12) /* 80053AFC 00050A5C 7D 89 03 A6 */ mtctr r12 -/* 80053B00 00050A60 4E 80 04 21 */ bctrl +/* 80053B00 00050A60 4E 80 04 21 */ bctrl /* 80053B04 00050A64 C3 A1 00 40 */ lfs f29, 0x40(r1) /* 80053B08 00050A68 38 61 00 34 */ addi r3, r1, 0x34 /* 80053B0C 00050A6C C0 1F 00 40 */ lfs f0, 0x40(r31) @@ -1292,7 +1292,7 @@ lbl_80053BC8: /* 80053C60 00050BC0 83 81 00 50 */ lwz r28, 0x50(r1) /* 80053C64 00050BC4 7C 08 03 A6 */ mtlr r0 /* 80053C68 00050BC8 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 80053C6C 00050BCC 4E 80 00 20 */ blr +/* 80053C6C 00050BCC 4E 80 00 20 */ blr .global GetHomingPosition__6CActorCFRC13CStateManagerf GetHomingPosition__6CActorCFRC13CStateManagerf: @@ -1304,12 +1304,12 @@ GetHomingPosition__6CActorCFRC13CStateManagerf: /* 80053C84 00050BE4 81 84 00 00 */ lwz r12, 0(r4) /* 80053C88 00050BE8 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 80053C8C 00050BEC 7D 89 03 A6 */ mtctr r12 -/* 80053C90 00050BF0 4E 80 04 21 */ bctrl +/* 80053C90 00050BF0 4E 80 04 21 */ bctrl /* 80053C94 00050BF4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80053C98 00050BF8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80053C9C 00050BFC 7C 08 03 A6 */ mtlr r0 /* 80053CA0 00050C00 38 21 00 10 */ addi r1, r1, 0x10 -/* 80053CA4 00050C04 4E 80 00 20 */ blr +/* 80053CA4 00050C04 4E 80 00 20 */ blr .global GetAimPosition__6CActorCFRC13CStateManagerf GetAimPosition__6CActorCFRC13CStateManagerf: @@ -1319,7 +1319,7 @@ GetAimPosition__6CActorCFRC13CStateManagerf: /* 80053CB4 00050C14 D0 03 00 00 */ stfs f0, 0(r3) /* 80053CB8 00050C18 D0 23 00 04 */ stfs f1, 4(r3) /* 80053CBC 00050C1C D0 43 00 08 */ stfs f2, 8(r3) -/* 80053CC0 00050C20 4E 80 00 20 */ blr +/* 80053CC0 00050C20 4E 80 00 20 */ blr .global GetOrbitPosition__6CActorCFRC13CStateManager GetOrbitPosition__6CActorCFRC13CStateManager: @@ -1329,12 +1329,12 @@ GetOrbitPosition__6CActorCFRC13CStateManager: /* 80053CD0 00050C30 D0 03 00 00 */ stfs f0, 0(r3) /* 80053CD4 00050C34 D0 23 00 04 */ stfs f1, 4(r3) /* 80053CD8 00050C38 D0 43 00 08 */ stfs f2, 8(r3) -/* 80053CDC 00050C3C 4E 80 00 20 */ blr +/* 80053CDC 00050C3C 4E 80 00 20 */ blr .global GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei: /* 80053CE0 00050C40 38 60 00 0D */ li r3, 0xd -/* 80053CE4 00050C44 4E 80 00 20 */ blr +/* 80053CE4 00050C44 4E 80 00 20 */ blr .global RemoveMaterial__6CActorF14EMaterialTypes14EMaterialTypes14EMaterialTypes14EMaterialTypesR13CStateManager RemoveMaterial__6CActorF14EMaterialTypes14EMaterialTypes14EMaterialTypes14EMaterialTypesR13CStateManager: @@ -1402,7 +1402,7 @@ RemoveMaterial__6CActorF14EMaterialTypes14EMaterialTypes14EMaterialTypes14EMater /* 80053DDC 00050D3C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80053DE0 00050D40 7C 08 03 A6 */ mtlr r0 /* 80053DE4 00050D44 38 21 00 20 */ addi r1, r1, 0x20 -/* 80053DE8 00050D48 4E 80 00 20 */ blr +/* 80053DE8 00050D48 4E 80 00 20 */ blr .global RemoveMaterial__6CActorF14EMaterialTypes14EMaterialTypes14EMaterialTypesR13CStateManager RemoveMaterial__6CActorF14EMaterialTypes14EMaterialTypes14EMaterialTypesR13CStateManager: @@ -1463,7 +1463,7 @@ RemoveMaterial__6CActorF14EMaterialTypes14EMaterialTypes14EMaterialTypesR13CStat /* 80053EC4 00050E24 83 81 00 10 */ lwz r28, 0x10(r1) /* 80053EC8 00050E28 7C 08 03 A6 */ mtlr r0 /* 80053ECC 00050E2C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80053ED0 00050E30 4E 80 00 20 */ blr +/* 80053ED0 00050E30 4E 80 00 20 */ blr .global RemoveMaterial__6CActorF14EMaterialTypes14EMaterialTypesR13CStateManager RemoveMaterial__6CActorF14EMaterialTypes14EMaterialTypesR13CStateManager: @@ -1509,7 +1509,7 @@ RemoveMaterial__6CActorF14EMaterialTypes14EMaterialTypesR13CStateManager: /* 80053F70 00050ED0 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80053F74 00050ED4 7C 08 03 A6 */ mtlr r0 /* 80053F78 00050ED8 38 21 00 20 */ addi r1, r1, 0x20 -/* 80053F7C 00050EDC 4E 80 00 20 */ blr +/* 80053F7C 00050EDC 4E 80 00 20 */ blr .global RemoveMaterial__6CActorF14EMaterialTypesR13CStateManager RemoveMaterial__6CActorF14EMaterialTypesR13CStateManager: @@ -1540,7 +1540,7 @@ RemoveMaterial__6CActorF14EMaterialTypesR13CStateManager: /* 80053FE0 00050F40 83 C1 00 08 */ lwz r30, 8(r1) /* 80053FE4 00050F44 7C 08 03 A6 */ mtlr r0 /* 80053FE8 00050F48 38 21 00 10 */ addi r1, r1, 0x10 -/* 80053FEC 00050F4C 4E 80 00 20 */ blr +/* 80053FEC 00050F4C 4E 80 00 20 */ blr .global AddMaterial__6CActorF14EMaterialTypes14EMaterialTypes14EMaterialTypes14EMaterialTypes14EMaterialTypesR13CStateManager AddMaterial__6CActorF14EMaterialTypes14EMaterialTypes14EMaterialTypes14EMaterialTypes14EMaterialTypesR13CStateManager: @@ -1611,7 +1611,7 @@ AddMaterial__6CActorF14EMaterialTypes14EMaterialTypes14EMaterialTypes14EMaterial /* 800540F0 00051050 80 01 00 24 */ lwz r0, 0x24(r1) /* 800540F4 00051054 7C 08 03 A6 */ mtlr r0 /* 800540F8 00051058 38 21 00 20 */ addi r1, r1, 0x20 -/* 800540FC 0005105C 4E 80 00 20 */ blr +/* 800540FC 0005105C 4E 80 00 20 */ blr .global AddMaterial__6CActorF14EMaterialTypes14EMaterialTypes14EMaterialTypes14EMaterialTypesR13CStateManager AddMaterial__6CActorF14EMaterialTypes14EMaterialTypes14EMaterialTypes14EMaterialTypesR13CStateManager: @@ -1671,7 +1671,7 @@ AddMaterial__6CActorF14EMaterialTypes14EMaterialTypes14EMaterialTypes14EMaterial /* 800541D4 00051134 80 01 00 24 */ lwz r0, 0x24(r1) /* 800541D8 00051138 7C 08 03 A6 */ mtlr r0 /* 800541DC 0005113C 38 21 00 20 */ addi r1, r1, 0x20 -/* 800541E0 00051140 4E 80 00 20 */ blr +/* 800541E0 00051140 4E 80 00 20 */ blr .global AddMaterial__6CActorF14EMaterialTypes14EMaterialTypes14EMaterialTypesR13CStateManager AddMaterial__6CActorF14EMaterialTypes14EMaterialTypes14EMaterialTypesR13CStateManager: @@ -1726,7 +1726,7 @@ AddMaterial__6CActorF14EMaterialTypes14EMaterialTypes14EMaterialTypesR13CStateMa /* 800542A4 00051204 83 81 00 10 */ lwz r28, 0x10(r1) /* 800542A8 00051208 7C 08 03 A6 */ mtlr r0 /* 800542AC 0005120C 38 21 00 20 */ addi r1, r1, 0x20 -/* 800542B0 00051210 4E 80 00 20 */ blr +/* 800542B0 00051210 4E 80 00 20 */ blr .global AddMaterial__6CActorF14EMaterialTypes14EMaterialTypesR13CStateManager AddMaterial__6CActorF14EMaterialTypes14EMaterialTypesR13CStateManager: @@ -1768,7 +1768,7 @@ AddMaterial__6CActorF14EMaterialTypes14EMaterialTypesR13CStateManager: /* 80054340 000512A0 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80054344 000512A4 7C 08 03 A6 */ mtlr r0 /* 80054348 000512A8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8005434C 000512AC 4E 80 00 20 */ blr +/* 8005434C 000512AC 4E 80 00 20 */ blr .global AddMaterial__6CActorF14EMaterialTypesR13CStateManager AddMaterial__6CActorF14EMaterialTypesR13CStateManager: @@ -1797,14 +1797,14 @@ AddMaterial__6CActorF14EMaterialTypesR13CStateManager: /* 800543A8 00051308 83 C1 00 08 */ lwz r30, 8(r1) /* 800543AC 0005130C 7C 08 03 A6 */ mtlr r0 /* 800543B0 00051310 38 21 00 10 */ addi r1, r1, 0x10 -/* 800543B4 00051314 4E 80 00 20 */ blr +/* 800543B4 00051314 4E 80 00 20 */ blr .global SetCallTouch__6CActorFb SetCallTouch__6CActorFb: /* 800543B8 00051318 88 03 00 E5 */ lbz r0, 0xe5(r3) /* 800543BC 0005131C 50 80 1F 38 */ rlwimi r0, r4, 3, 0x1c, 0x1c /* 800543C0 00051320 98 03 00 E5 */ stb r0, 0xe5(r3) -/* 800543C4 00051324 4E 80 00 20 */ blr +/* 800543C4 00051324 4E 80 00 20 */ blr .global GetCallTouch__6CActorCFv GetCallTouch__6CActorCFv: @@ -1813,14 +1813,14 @@ GetCallTouch__6CActorCFv: /* 800543D0 00051330 7C 03 00 D0 */ neg r0, r3 /* 800543D4 00051334 7C 00 1B 78 */ or r0, r0, r3 /* 800543D8 00051338 54 03 0F FE */ srwi r3, r0, 0x1f -/* 800543DC 0005133C 4E 80 00 20 */ blr +/* 800543DC 0005133C 4E 80 00 20 */ blr .global SetUseInSortedLists__6CActorFb SetUseInSortedLists__6CActorFb: /* 800543E0 00051340 88 03 00 E5 */ lbz r0, 0xe5(r3) /* 800543E4 00051344 50 80 26 F6 */ rlwimi r0, r4, 4, 0x1b, 0x1b /* 800543E8 00051348 98 03 00 E5 */ stb r0, 0xe5(r3) -/* 800543EC 0005134C 4E 80 00 20 */ blr +/* 800543EC 0005134C 4E 80 00 20 */ blr .global GetUseInSortedLists__6CActorCFv GetUseInSortedLists__6CActorCFv: @@ -1829,17 +1829,17 @@ GetUseInSortedLists__6CActorCFv: /* 800543F8 00051358 7C 03 00 D0 */ neg r0, r3 /* 800543FC 0005135C 7C 00 1B 78 */ or r0, r0, r3 /* 80054400 00051360 54 03 0F FE */ srwi r3, r0, 0x1f -/* 80054404 00051364 4E 80 00 20 */ blr +/* 80054404 00051364 4E 80 00 20 */ blr .global Touch__6CActorFR6CActorR13CStateManager Touch__6CActorFR6CActorR13CStateManager: -/* 80054408 00051368 4E 80 00 20 */ blr +/* 80054408 00051368 4E 80 00 20 */ blr .global GetTouchBounds__6CActorCFv GetTouchBounds__6CActorCFv: /* 8005440C 0005136C 38 00 00 00 */ li r0, 0 /* 80054410 00051370 98 03 00 18 */ stb r0, 0x18(r3) -/* 80054414 00051374 4E 80 00 20 */ blr +/* 80054414 00051374 4E 80 00 20 */ blr .global GetDamageVulnerability__6CActorCFRC9CVector3fRC9CVector3fRC11CDamageInfo GetDamageVulnerability__6CActorCFRC9CVector3fRC9CVector3fRC11CDamageInfo: @@ -1849,22 +1849,22 @@ GetDamageVulnerability__6CActorCFRC9CVector3fRC9CVector3fRC11CDamageInfo: /* 80054424 00051384 81 83 00 00 */ lwz r12, 0(r3) /* 80054428 00051388 81 8C 00 38 */ lwz r12, 0x38(r12) /* 8005442C 0005138C 7D 89 03 A6 */ mtctr r12 -/* 80054430 00051390 4E 80 04 21 */ bctrl +/* 80054430 00051390 4E 80 04 21 */ bctrl /* 80054434 00051394 80 01 00 14 */ lwz r0, 0x14(r1) /* 80054438 00051398 7C 08 03 A6 */ mtlr r0 /* 8005443C 0005139C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80054440 000513A0 4E 80 00 20 */ blr +/* 80054440 000513A0 4E 80 00 20 */ blr .global GetDamageVulnerability__6CActorCFv GetDamageVulnerability__6CActorCFv: /* 80054444 000513A4 3C 60 80 57 */ lis r3, lbl_8056D578@ha /* 80054448 000513A8 38 63 D5 78 */ addi r3, r3, lbl_8056D578@l -/* 8005444C 000513AC 4E 80 00 20 */ blr +/* 8005444C 000513AC 4E 80 00 20 */ blr .global HealthInfo__6CActorFR13CStateManager HealthInfo__6CActorFR13CStateManager: /* 80054450 000513B0 38 60 00 00 */ li r3, 0 -/* 80054454 000513B4 4E 80 00 20 */ blr +/* 80054454 000513B4 4E 80 00 20 */ blr .global GetPitch__6CActorCFv GetPitch__6CActorCFv: @@ -1889,7 +1889,7 @@ GetPitch__6CActorCFv: /* 800544A0 00051400 FC 20 00 18 */ frsp f1, f0 /* 800544A4 00051404 7C 08 03 A6 */ mtlr r0 /* 800544A8 00051408 38 21 00 10 */ addi r1, r1, 0x10 -/* 800544AC 0005140C 4E 80 00 20 */ blr +/* 800544AC 0005140C 4E 80 00 20 */ blr .global GetYaw__6CActorCFv GetYaw__6CActorCFv: @@ -1954,7 +1954,7 @@ lbl_80054580: /* 80054580 000514E0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80054584 000514E4 7C 08 03 A6 */ mtlr r0 /* 80054588 000514E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8005458C 000514EC 4E 80 00 20 */ blr +/* 8005458C 000514EC 4E 80 00 20 */ blr .global RenderInternal__6CActorCFRC13CStateManager RenderInternal__6CActorCFRC13CStateManager: @@ -2098,7 +2098,7 @@ lbl_80054778: /* 80054794 000516F4 83 A1 00 34 */ lwz r29, 0x34(r1) /* 80054798 000516F8 7C 08 03 A6 */ mtlr r0 /* 8005479C 000516FC 38 21 00 60 */ addi r1, r1, 0x60 -/* 800547A0 00051700 4E 80 00 20 */ blr +/* 800547A0 00051700 4E 80 00 20 */ blr .global Render__6CActorCFRC13CStateManager Render__6CActorCFRC13CStateManager: @@ -2209,7 +2209,7 @@ lbl_80054910: /* 80054924 00051884 83 A1 00 34 */ lwz r29, 0x34(r1) /* 80054928 00051888 7C 08 03 A6 */ mtlr r0 /* 8005492C 0005188C 38 21 00 40 */ addi r1, r1, 0x40 -/* 80054930 00051890 4E 80 00 20 */ blr +/* 80054930 00051890 4E 80 00 20 */ blr .global CanRenderUnsorted__6CActorCFRC13CStateManager CanRenderUnsorted__6CActorCFRC13CStateManager: @@ -2254,11 +2254,11 @@ lbl_800549B4: /* 800549B8 00051918 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800549BC 0005191C 7C 08 03 A6 */ mtlr r0 /* 800549C0 00051920 38 21 00 10 */ addi r1, r1, 0x10 -/* 800549C4 00051924 4E 80 00 20 */ blr +/* 800549C4 00051924 4E 80 00 20 */ blr .global DrawTouchBounds__6CActorCFv DrawTouchBounds__6CActorCFv: -/* 800549C8 00051928 4E 80 00 20 */ blr +/* 800549C8 00051928 4E 80 00 20 */ blr .global EnsureRendered__6CActorCFRC13CStateManager EnsureRendered__6CActorCFRC13CStateManager: @@ -2275,7 +2275,7 @@ EnsureRendered__6CActorCFRC13CStateManager: /* 800549F4 00051954 81 9E 00 00 */ lwz r12, 0(r30) /* 800549F8 00051958 81 8C 00 64 */ lwz r12, 0x64(r12) /* 800549FC 0005195C 7D 89 03 A6 */ mtctr r12 -/* 80054A00 00051960 4E 80 04 21 */ bctrl +/* 80054A00 00051960 4E 80 04 21 */ bctrl /* 80054A04 00051964 3C 60 80 5A */ lis r3, lbl_805A61D4@ha /* 80054A08 00051968 C1 01 00 2C */ lfs f8, 0x2c(r1) /* 80054A0C 0005196C 38 C3 61 D4 */ addi r6, r3, lbl_805A61D4@l @@ -2316,7 +2316,7 @@ EnsureRendered__6CActorCFRC13CStateManager: /* 80054A98 000519F8 83 C1 00 68 */ lwz r30, 0x68(r1) /* 80054A9C 000519FC 7C 08 03 A6 */ mtlr r0 /* 80054AA0 00051A00 38 21 00 70 */ addi r1, r1, 0x70 -/* 80054AA4 00051A04 4E 80 00 20 */ blr +/* 80054AA4 00051A04 4E 80 00 20 */ blr .global EnsureRendered__6CActorCFRC13CStateManagerRC9CVector3f EnsureRendered__6CActorCFRC13CStateManagerRC9CVector3f: @@ -2356,7 +2356,7 @@ lbl_80054B04: /* 80054B28 00051A88 83 81 00 10 */ lwz r28, 0x10(r1) /* 80054B2C 00051A8C 7C 08 03 A6 */ mtlr r0 /* 80054B30 00051A90 38 21 00 20 */ addi r1, r1, 0x20 -/* 80054B34 00051A94 4E 80 00 20 */ blr +/* 80054B34 00051A94 4E 80 00 20 */ blr .global AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager: @@ -2398,7 +2398,7 @@ lbl_80054BA4: /* 80054BB8 00051B18 81 9E 00 00 */ lwz r12, 0(r30) /* 80054BBC 00051B1C 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80054BC0 00051B20 7D 89 03 A6 */ mtctr r12 -/* 80054BC4 00051B24 4E 80 04 21 */ bctrl +/* 80054BC4 00051B24 4E 80 04 21 */ bctrl /* 80054BC8 00051B28 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80054BCC 00051B2C 41 82 00 20 */ beq lbl_80054BEC /* 80054BD0 00051B30 7F C3 F3 78 */ mr r3, r30 @@ -2406,7 +2406,7 @@ lbl_80054BA4: /* 80054BD8 00051B38 81 9E 00 00 */ lwz r12, 0(r30) /* 80054BDC 00051B3C 81 8C 00 28 */ lwz r12, 0x28(r12) /* 80054BE0 00051B40 7D 89 03 A6 */ mtctr r12 -/* 80054BE4 00051B44 4E 80 04 21 */ bctrl +/* 80054BE4 00051B44 4E 80 04 21 */ bctrl /* 80054BE8 00051B48 48 00 00 10 */ b lbl_80054BF8 lbl_80054BEC: /* 80054BEC 00051B4C 7F C3 F3 78 */ mr r3, r30 @@ -2463,7 +2463,7 @@ lbl_80054BF8: /* 80054CB4 00051C14 39 00 00 00 */ li r8, 0 /* 80054CB8 00051C18 81 8C 00 40 */ lwz r12, 0x40(r12) /* 80054CBC 00051C1C 7D 89 03 A6 */ mtctr r12 -/* 80054CC0 00051C20 4E 80 04 21 */ bctrl +/* 80054CC0 00051C20 4E 80 04 21 */ bctrl lbl_80054CC4: /* 80054CC4 00051C24 80 01 00 64 */ lwz r0, 0x64(r1) /* 80054CC8 00051C28 83 E1 00 5C */ lwz r31, 0x5c(r1) @@ -2471,7 +2471,7 @@ lbl_80054CC4: /* 80054CD0 00051C30 83 A1 00 54 */ lwz r29, 0x54(r1) /* 80054CD4 00051C34 7C 08 03 A6 */ mtlr r0 /* 80054CD8 00051C38 38 21 00 60 */ addi r1, r1, 0x60 -/* 80054CDC 00051C3C 4E 80 00 20 */ blr +/* 80054CDC 00051C3C 4E 80 00 20 */ blr .global PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes: @@ -2702,7 +2702,7 @@ lbl_80055010: .global sub_8005502c sub_8005502c: -/* 8005502C 00051F8C 4E 80 00 20 */ blr +/* 8005502C 00051F8C 4E 80 00 20 */ blr .global SetModelData__6CActorFRC10CModelData SetModelData__6CActorFRC10CModelData: @@ -2749,7 +2749,7 @@ lbl_800550A8: /* 800550C4 00052024 83 A1 00 14 */ lwz r29, 0x14(r1) /* 800550C8 00052028 7C 08 03 A6 */ mtlr r0 /* 800550CC 0005202C 38 21 00 20 */ addi r1, r1, 0x20 -/* 800550D0 00052030 4E 80 00 20 */ blr +/* 800550D0 00052030 4E 80 00 20 */ blr .global CalculateRenderBounds__6CActorFv CalculateRenderBounds__6CActorFv: @@ -2817,7 +2817,7 @@ lbl_800551B4: /* 800551B8 00052118 83 E1 00 4C */ lwz r31, 0x4c(r1) /* 800551BC 0005211C 7C 08 03 A6 */ mtlr r0 /* 800551C0 00052120 38 21 00 50 */ addi r1, r1, 0x50 -/* 800551C4 00052124 4E 80 00 20 */ blr +/* 800551C4 00052124 4E 80 00 20 */ blr .global GetAverageAnimVelocity__6CActorFi GetAverageAnimVelocity__6CActorFi: @@ -2844,7 +2844,7 @@ lbl_8005520C: /* 8005520C 0005216C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80055210 00052170 7C 08 03 A6 */ mtlr r0 /* 80055214 00052174 38 21 00 10 */ addi r1, r1, 0x10 -/* 80055218 00052178 4E 80 00 20 */ blr +/* 80055218 00052178 4E 80 00 20 */ blr .global DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType: @@ -2858,7 +2858,7 @@ lbl_80055234: /* 80055234 00052194 80 01 00 14 */ lwz r0, 0x14(r1) /* 80055238 00052198 7C 08 03 A6 */ mtlr r0 /* 8005523C 0005219C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80055240 000521A0 4E 80 00 20 */ blr +/* 80055240 000521A0 4E 80 00 20 */ blr .global RemoveEmitter__6CActorFv RemoveEmitter__6CActorFv: @@ -2884,7 +2884,7 @@ lbl_80055288: /* 8005528C 000521EC 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80055290 000521F0 7C 08 03 A6 */ mtlr r0 /* 80055294 000521F4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80055298 000521F8 4E 80 00 20 */ blr +/* 80055298 000521F8 4E 80 00 20 */ blr .global UpdateAnimation__6CActorFfR13CStateManagerb UpdateAnimation__6CActorFfR13CStateManagerb: @@ -3104,7 +3104,7 @@ lbl_80055598: /* 800555B4 00052514 80 D9 00 38 */ lwz r6, 0x38(r25) /* 800555B8 00052518 81 8C 00 68 */ lwz r12, 0x68(r12) /* 800555BC 0005251C 7D 89 03 A6 */ mtctr r12 -/* 800555C0 00052520 4E 80 04 21 */ bctrl +/* 800555C0 00052520 4E 80 04 21 */ bctrl lbl_800555C4: /* 800555C4 00052524 3B 39 00 4C */ addi r25, r25, 0x4c /* 800555C8 00052528 3B 18 00 01 */ addi r24, r24, 1 @@ -3190,7 +3190,7 @@ lbl_80055680: /* 800556E0 00052640 80 01 00 F4 */ lwz r0, 0xf4(r1) /* 800556E4 00052644 7C 08 03 A6 */ mtlr r0 /* 800556E8 00052648 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 800556EC 0005264C 4E 80 00 20 */ blr +/* 800556EC 0005264C 4E 80 00 20 */ blr .global __dt__6CActorFv __dt__6CActorFv: @@ -3280,7 +3280,7 @@ lbl_80055800: /* 80055810 00052770 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80055814 00052774 7C 08 03 A6 */ mtlr r0 /* 80055818 00052778 38 21 00 20 */ addi r1, r1, 0x20 -/* 8005581C 0005277C 4E 80 00 20 */ blr +/* 8005581C 0005277C 4E 80 00 20 */ blr .global "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC13CMaterialListRC16CActorParameters9TUniqueId" "__ct__6CActorF9TUniqueIdbRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC13CMaterialListRC16CActorParameters9TUniqueId": @@ -3591,7 +3591,7 @@ lbl_80055C58: /* 80055CA4 00052C04 81 84 00 00 */ lwz r12, 0(r4) /* 80055CA8 00052C08 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80055CAC 00052C0C 7D 89 03 A6 */ mtctr r12 -/* 80055CB0 00052C10 4E 80 04 21 */ bctrl +/* 80055CB0 00052C10 4E 80 04 21 */ bctrl /* 80055CB4 00052C14 7F 43 D3 78 */ mr r3, r26 /* 80055CB8 00052C18 38 81 00 0C */ addi r4, r1, 0xc /* 80055CBC 00052C1C 3B 20 00 01 */ li r25, 1 @@ -3625,7 +3625,7 @@ lbl_80055D10: /* 80055D18 00052C78 80 01 00 74 */ lwz r0, 0x74(r1) /* 80055D1C 00052C7C 7C 08 03 A6 */ mtlr r0 /* 80055D20 00052C80 38 21 00 70 */ addi r1, r1, 0x70 -/* 80055D24 00052C84 4E 80 00 20 */ blr +/* 80055D24 00052C84 4E 80 00 20 */ blr .global MakeActorMaterialList__FRC13CMaterialListRC16CActorParameters MakeActorMaterialList__FRC13CMaterialListRC16CActorParameters: @@ -3644,4 +3644,4 @@ lbl_80055D40: lbl_80055D54: /* 80055D54 00052CB4 90 83 00 04 */ stw r4, 4(r3) /* 80055D58 00052CB8 90 C3 00 00 */ stw r6, 0(r3) -/* 80055D5C 00052CBC 4E 80 00 20 */ blr +/* 80055D5C 00052CBC 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/CActorLights.s b/asm/MetroidPrime/CActorLights.s index c377c218..e9745b32 100644 --- a/asm/MetroidPrime/CActorLights.s +++ b/asm/MetroidPrime/CActorLights.s @@ -52,7 +52,7 @@ BuildConstantAmbientLighting__12CActorLightsFv: /* 801030A0 00100000 98 83 02 98 */ stb r4, 0x298(r3) /* 801030A4 00100004 90 03 02 9C */ stw r0, 0x29c(r3) /* 801030A8 00100008 90 03 02 A0 */ stw r0, 0x2a0(r3) -/* 801030AC 0010000C 4E 80 00 20 */ blr +/* 801030AC 0010000C 4E 80 00 20 */ blr .global BuildConstantAmbientLighting__12CActorLightsFRC6CColor BuildConstantAmbientLighting__12CActorLightsFRC6CColor: @@ -86,7 +86,7 @@ BuildConstantAmbientLighting__12CActorLightsFRC6CColor: /* 8010311C 0010007C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80103120 00100080 7C 08 03 A6 */ mtlr r0 /* 80103124 00100084 38 21 00 10 */ addi r1, r1, 0x10 -/* 80103128 00100088 4E 80 00 20 */ blr +/* 80103128 00100088 4E 80 00 20 */ blr .global "BuildFakeLightList__12CActorLightsFRCQ24rstl42vector<6CLight,Q24rstl17rmemory_allocator>RC6CColor" "BuildFakeLightList__12CActorLightsFRCQ24rstl42vector<6CLight,Q24rstl17rmemory_allocator>RC6CColor": @@ -171,7 +171,7 @@ lbl_8010322C: /* 8010323C 0010019C 83 81 00 10 */ lwz r28, 0x10(r1) /* 80103240 001001A0 7C 08 03 A6 */ mtlr r0 /* 80103244 001001A4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80103248 001001A8 4E 80 00 20 */ blr +/* 80103248 001001A8 4E 80 00 20 */ blr .global "push_back__Q24rstl26reserved_vector<6CLight,4>FRC6CLight" "push_back__Q24rstl26reserved_vector<6CLight,4>FRC6CLight": @@ -192,7 +192,7 @@ lbl_8010322C: /* 80103284 001001E4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80103288 001001E8 7C 08 03 A6 */ mtlr r0 /* 8010328C 001001EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80103290 001001F0 4E 80 00 20 */ blr +/* 80103290 001001F0 4E 80 00 20 */ blr .global "construct<6CLight>__4rstlFPvRC6CLight" "construct<6CLight>__4rstlFPvRC6CLight": @@ -206,7 +206,7 @@ lbl_801032AC: /* 801032AC 0010020C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801032B0 00100210 7C 08 03 A6 */ mtlr r0 /* 801032B4 00100214 38 21 00 10 */ addi r1, r1, 0x10 -/* 801032B8 00100218 4E 80 00 20 */ blr +/* 801032B8 00100218 4E 80 00 20 */ blr .global BuildFaceLightList__12CActorLightsFRC13CStateManagerRC9CGameAreaRC6CAABox BuildFaceLightList__12CActorLightsFRC13CStateManagerRC9CGameAreaRC6CAABox: @@ -503,7 +503,7 @@ lbl_801036E4: /* 80103700 00100660 80 01 01 A4 */ lwz r0, 0x1a4(r1) /* 80103704 00100664 7C 08 03 A6 */ mtlr r0 /* 80103708 00100668 38 21 01 A0 */ addi r1, r1, 0x1a0 -/* 8010370C 0010066C 4E 80 00 20 */ blr +/* 8010370C 0010066C 4E 80 00 20 */ blr .global BuildDynamicLightList__12CActorLightsFRC13CStateManagerRC6CAABox BuildDynamicLightList__12CActorLightsFRC13CStateManagerRC6CAABox: @@ -728,7 +728,7 @@ lbl_80103A2C: .global sub_80103a3c sub_80103a3c: -/* 80103A3C 0010099C 4E 80 00 20 */ blr +/* 80103A3C 0010099C 4E 80 00 20 */ blr .global MoveAmbienceToLights__12CActorLightsFRC9CVector3f MoveAmbienceToLights__12CActorLightsFRC9CVector3f: @@ -833,7 +833,7 @@ lbl_80103BA0: /* 80103BA8 00100B08 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80103BAC 00100B0C 7C 08 03 A6 */ mtlr r0 /* 80103BB0 00100B10 38 21 00 30 */ addi r1, r1, 0x30 -/* 80103BB4 00100B14 4E 80 00 20 */ blr +/* 80103BB4 00100B14 4E 80 00 20 */ blr .global AddOverflowToLights__12CActorLightsFRC6CLightRC9CVector3f AddOverflowToLights__12CActorLightsFRC6CLightRC9CVector3f: @@ -913,7 +913,7 @@ lbl_80103CC4: /* 80103CD4 00100C34 83 C1 00 C8 */ lwz r30, 0xc8(r1) /* 80103CD8 00100C38 7C 08 03 A6 */ mtlr r0 /* 80103CDC 00100C3C 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 80103CE0 00100C40 4E 80 00 20 */ blr +/* 80103CE0 00100C40 4E 80 00 20 */ blr .global MultiplyLightingLevels__12CActorLightsFf MultiplyLightingLevels__12CActorLightsFf: @@ -973,7 +973,7 @@ lbl_80103D90: /* 80103DB0 00100D10 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80103DB4 00100D14 7C 08 03 A6 */ mtlr r0 /* 80103DB8 00100D18 38 21 00 40 */ addi r1, r1, 0x40 -/* 80103DBC 00100D1C 4E 80 00 20 */ blr +/* 80103DBC 00100D1C 4E 80 00 20 */ blr .global BuildAreaLightList__12CActorLightsFRC13CStateManagerRC9CGameAreaRC6CAABox BuildAreaLightList__12CActorLightsFRC13CStateManagerRC9CGameAreaRC6CAABox: @@ -1929,7 +1929,7 @@ lbl_80104B44: /* 80104B60 00101AC0 80 0A 00 04 */ lwz r0, 4(r10) /* 80104B64 00101AC4 7D 41 53 78 */ mr r1, r10 /* 80104B68 00101AC8 7C 08 03 A6 */ mtlr r0 -/* 80104B6C 00101ACC 4E 80 00 20 */ blr +/* 80104B6C 00101ACC 4E 80 00 20 */ blr .global MergeOverflowLight__12CActorLightsFR6CLightR9CVector3fRC6CLightf MergeOverflowLight__12CActorLightsFR6CLightR9CVector3fRC6CLightf: @@ -2044,7 +2044,7 @@ MergeOverflowLight__12CActorLightsFR6CLightR9CVector3fRC6CLightf: /* 80104D20 00101C80 83 A1 00 54 */ lwz r29, 0x54(r1) /* 80104D24 00101C84 7C 08 03 A6 */ mtlr r0 /* 80104D28 00101C88 38 21 00 70 */ addi r1, r1, 0x70 -/* 80104D2C 00101C8C 4E 80 00 20 */ blr +/* 80104D2C 00101C8C 4E 80 00 20 */ blr .global UpdateBrightLight__12CActorLightsFv UpdateBrightLight__12CActorLightsFv: @@ -2071,7 +2071,7 @@ lbl_80104D74: /* 80104D78 00101CD8 38 80 00 01 */ li r4, 1 /* 80104D7C 00101CDC 50 80 36 72 */ rlwimi r0, r4, 6, 0x19, 0x19 /* 80104D80 00101CE0 98 03 02 99 */ stb r0, 0x299(r3) -/* 80104D84 00101CE4 4E 80 00 20 */ blr +/* 80104D84 00101CE4 4E 80 00 20 */ blr .global ActivateLights__12CActorLightsCFv ActivateLights__12CActorLightsCFv: @@ -2100,7 +2100,7 @@ lbl_80104DD0: /* 80104DDC 00101D3C 81 83 00 00 */ lwz r12, 0(r3) /* 80104DE0 00101D40 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 80104DE4 00101D44 7D 89 03 A6 */ mtctr r12 -/* 80104DE8 00101D48 4E 80 04 21 */ bctrl +/* 80104DE8 00101D48 4E 80 04 21 */ bctrl /* 80104DEC 00101D4C 48 20 7B 91 */ bl DisableAllLights__9CGraphicsFv /* 80104DF0 00101D50 48 00 02 20 */ b lbl_80105010 lbl_80104DF4: @@ -2115,7 +2115,7 @@ lbl_80104DF4: /* 80104E14 00101D74 81 83 00 00 */ lwz r12, 0(r3) /* 80104E18 00101D78 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 80104E1C 00101D7C 7D 89 03 A6 */ mtctr r12 -/* 80104E20 00101D80 4E 80 04 21 */ bctrl +/* 80104E20 00101D80 4E 80 04 21 */ bctrl /* 80104E24 00101D84 48 00 00 34 */ b lbl_80104E58 lbl_80104E28: /* 80104E28 00101D88 C0 3F 02 88 */ lfs f1, 0x288(r31) @@ -2129,7 +2129,7 @@ lbl_80104E28: /* 80104E48 00101DA8 81 83 00 00 */ lwz r12, 0(r3) /* 80104E4C 00101DAC 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 80104E50 00101DB0 7D 89 03 A6 */ mtctr r12 -/* 80104E54 00101DB4 4E 80 04 21 */ bctrl +/* 80104E54 00101DB4 4E 80 04 21 */ bctrl lbl_80104E58: /* 80104E58 00101DB8 80 1F 00 00 */ lwz r0, 0(r31) /* 80104E5C 00101DBC 3B A0 00 00 */ li r29, 0 @@ -2243,13 +2243,13 @@ lbl_80104FA8: /* 80104FE8 00101F48 81 83 00 00 */ lwz r12, 0(r3) /* 80104FEC 00101F4C 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 80104FF0 00101F50 7D 89 03 A6 */ mtctr r12 -/* 80104FF4 00101F54 4E 80 04 21 */ bctrl +/* 80104FF4 00101F54 4E 80 04 21 */ bctrl /* 80104FF8 00101F58 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 80104FFC 00101F5C 38 81 00 14 */ addi r4, r1, 0x14 /* 80105000 00101F60 81 83 00 00 */ lwz r12, 0(r3) /* 80105004 00101F64 81 8C 00 FC */ lwz r12, 0xfc(r12) /* 80105008 00101F68 7D 89 03 A6 */ mtctr r12 -/* 8010500C 00101F6C 4E 80 04 21 */ bctrl +/* 8010500C 00101F6C 4E 80 04 21 */ bctrl lbl_80105010: /* 80105010 00101F70 E3 E1 00 98 */ psq_l f31, 152(r1), 0, qr0 /* 80105014 00101F74 80 01 00 A4 */ lwz r0, 0xa4(r1) @@ -2260,7 +2260,7 @@ lbl_80105010: /* 80105028 00101F88 83 81 00 80 */ lwz r28, 0x80(r1) /* 8010502C 00101F8C 7C 08 03 A6 */ mtlr r0 /* 80105030 00101F90 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 80105034 00101F94 4E 80 00 20 */ blr +/* 80105034 00101F94 4E 80 00 20 */ blr .global SetAmbientColor__12CActorLightsFRC6CColor SetAmbientColor__12CActorLightsFRC6CColor: @@ -2274,7 +2274,7 @@ SetAmbientColor__12CActorLightsFRC6CColor: /* 80105054 00101FB4 E0 04 A0 02 */ psq_l f0, 2(r4), 1, qr2 /* 80105058 00101FB8 EC 01 00 32 */ fmuls f0, f1, f0 /* 8010505C 00101FBC D0 03 02 90 */ stfs f0, 0x290(r3) -/* 80105060 00101FC0 4E 80 00 20 */ blr +/* 80105060 00101FC0 4E 80 00 20 */ blr .global GetLight__12CActorLightsCFUi GetLight__12CActorLightsCFUi: @@ -2287,18 +2287,18 @@ GetLight__12CActorLightsCFUi: /* 8010507C 00101FDC 1C 04 00 50 */ mulli r0, r4, 0x50 /* 80105080 00101FE0 7C 63 02 14 */ add r3, r3, r0 /* 80105084 00101FE4 38 63 00 04 */ addi r3, r3, 4 -/* 80105088 00101FE8 4E 80 00 20 */ blr +/* 80105088 00101FE8 4E 80 00 20 */ blr lbl_8010508C: /* 8010508C 00101FEC 7C 00 20 50 */ subf r0, r0, r4 /* 80105090 00101FF0 1C 00 00 50 */ mulli r0, r0, 0x50 /* 80105094 00101FF4 7C 63 02 14 */ add r3, r3, r0 /* 80105098 00101FF8 38 63 01 48 */ addi r3, r3, 0x148 -/* 8010509C 00101FFC 4E 80 00 20 */ blr +/* 8010509C 00101FFC 4E 80 00 20 */ blr lbl_801050A0: /* 801050A0 00102000 1C 04 00 50 */ mulli r0, r4, 0x50 /* 801050A4 00102004 7C 63 02 14 */ add r3, r3, r0 /* 801050A8 00102008 38 63 01 48 */ addi r3, r3, 0x148 -/* 801050AC 0010200C 4E 80 00 20 */ blr +/* 801050AC 0010200C 4E 80 00 20 */ blr .global GetActiveLightCount__12CActorLightsCFv GetActiveLightCount__12CActorLightsCFv: @@ -2308,10 +2308,10 @@ GetActiveLightCount__12CActorLightsCFv: /* 801050BC 0010201C 80 83 00 00 */ lwz r4, 0(r3) /* 801050C0 00102020 80 03 01 44 */ lwz r0, 0x144(r3) /* 801050C4 00102024 7C 64 02 14 */ add r3, r4, r0 -/* 801050C8 00102028 4E 80 00 20 */ blr +/* 801050C8 00102028 4E 80 00 20 */ blr lbl_801050CC: /* 801050CC 0010202C 80 63 01 44 */ lwz r3, 0x144(r3) -/* 801050D0 00102030 4E 80 00 20 */ blr +/* 801050D0 00102030 4E 80 00 20 */ blr .global __dt__12CActorLightsFv __dt__12CActorLightsFv: @@ -2387,7 +2387,7 @@ lbl_801051B4: /* 801051BC 0010211C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801051C0 00102120 7C 08 03 A6 */ mtlr r0 /* 801051C4 00102124 38 21 00 10 */ addi r1, r1, 0x10 -/* 801051C8 00102128 4E 80 00 20 */ blr +/* 801051C8 00102128 4E 80 00 20 */ blr .global __ct__12CActorLightsFUi9CVector3fiif __ct__12CActorLightsFUi9CVector3fiif: @@ -2490,7 +2490,7 @@ lbl_80105254: /* 80105348 001022A8 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8010534C 001022AC 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80105350 001022B0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80105354 001022B4 4E 80 00 20 */ blr +/* 80105354 001022B4 4E 80 00 20 */ blr .global "sort__4rstlFP11SLightValueP11SLightValueQ211SLightValue10CPredicate" "sort__4rstlFP11SLightValueP11SLightValueQ211SLightValue10CPredicate": @@ -2609,7 +2609,7 @@ lbl_801054F8: /* 801054FC 0010245C 80 01 00 54 */ lwz r0, 0x54(r1) /* 80105500 00102460 7C 08 03 A6 */ mtlr r0 /* 80105504 00102464 38 21 00 50 */ addi r1, r1, 0x50 -/* 80105508 00102468 4E 80 00 20 */ blr +/* 80105508 00102468 4E 80 00 20 */ blr .global "__insertion_sort__4rstlFP11SLightValueP11SLightValueQ211SLightValue10CPredicate" "__insertion_sort__4rstlFP11SLightValueP11SLightValueQ211SLightValue10CPredicate": @@ -2682,7 +2682,7 @@ lbl_801055C8: /* 80105604 00102564 42 00 FF 2C */ bdnz lbl_80105530 lbl_80105608: /* 80105608 00102568 38 21 00 30 */ addi r1, r1, 0x30 -/* 8010560C 0010256C 4E 80 00 20 */ blr +/* 8010560C 0010256C 4E 80 00 20 */ blr .global "__sort3<11SLightValue,Q211SLightValue10CPredicate>__4rstlFR11SLightValueR11SLightValueR11SLightValueQ211SLightValue10CPredicate" "__sort3<11SLightValue,Q211SLightValue10CPredicate>__4rstlFR11SLightValueR11SLightValueR11SLightValueQ211SLightValue10CPredicate": diff --git a/asm/MetroidPrime/CActorParameters.s b/asm/MetroidPrime/CActorParameters.s index b95173c3..38047982 100644 --- a/asm/MetroidPrime/CActorParameters.s +++ b/asm/MetroidPrime/CActorParameters.s @@ -58,7 +58,7 @@ MakeDamageableTriggerActorParms__FRC16CActorParametersRC16CVisorParameters: /* 801067FC 0010375C 83 C1 00 78 */ lwz r30, 0x78(r1) /* 80106800 00103760 7C 08 03 A6 */ mtlr r0 /* 80106804 00103764 38 21 00 80 */ addi r1, r1, 0x80 -/* 80106808 00103768 4E 80 00 20 */ blr +/* 80106808 00103768 4E 80 00 20 */ blr .global sub_8010680c sub_8010680c: @@ -85,7 +85,7 @@ sub_8010680c: /* 8010685C 001037BC 83 C1 00 78 */ lwz r30, 0x78(r1) /* 80106860 001037C0 7C 08 03 A6 */ mtlr r0 /* 80106864 001037C4 38 21 00 80 */ addi r1, r1, 0x80 -/* 80106868 001037C8 4E 80 00 20 */ blr +/* 80106868 001037C8 4E 80 00 20 */ blr .global Scannable__16CActorParametersCFRC20CScannableParameters Scannable__16CActorParametersCFRC20CScannableParameters: @@ -111,7 +111,7 @@ Scannable__16CActorParametersCFRC20CScannableParameters: /* 801068B8 00103818 83 C1 00 78 */ lwz r30, 0x78(r1) /* 801068BC 0010381C 7C 08 03 A6 */ mtlr r0 /* 801068C0 00103820 38 21 00 80 */ addi r1, r1, 0x80 -/* 801068C4 00103824 4E 80 00 20 */ blr +/* 801068C4 00103824 4E 80 00 20 */ blr .global sub_801068c8 sub_801068c8: @@ -180,7 +180,7 @@ sub_801068c8: /* 801069C0 00103920 D0 23 00 5C */ stfs f1, 0x5c(r3) /* 801069C4 00103924 D0 43 00 60 */ stfs f2, 0x60(r3) /* 801069C8 00103928 D0 63 00 64 */ stfs f3, 0x64(r3) -/* 801069CC 0010392C 4E 80 00 20 */ blr +/* 801069CC 0010392C 4E 80 00 20 */ blr .global __ct__16CActorParametersFv __ct__16CActorParametersFv: diff --git a/asm/MetroidPrime/CActorParticles.s b/asm/MetroidPrime/CActorParticles.s index 6b1d669a..1441e1cb 100644 --- a/asm/MetroidPrime/CActorParticles.s +++ b/asm/MetroidPrime/CActorParticles.s @@ -67,7 +67,7 @@ lbl_801E3930: /* 801E3934 001E0894 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 801E3938 001E0898 7C 08 03 A6 */ mtlr r0 /* 801E393C 001E089C 38 21 00 30 */ addi r1, r1, 0x30 -/* 801E3940 001E08A0 4E 80 00 20 */ blr +/* 801E3940 001E08A0 4E 80 00 20 */ blr .global StartBurnDeath__20CActorModelParticlesFR5CActor StartBurnDeath__20CActorModelParticlesFR5CActor: @@ -112,7 +112,7 @@ StartBurnDeath__20CActorModelParticlesFR5CActor: /* 801E39DC 001E093C 83 C1 00 28 */ lwz r30, 0x28(r1) /* 801E39E0 001E0940 7C 08 03 A6 */ mtlr r0 /* 801E39E4 001E0944 38 21 00 30 */ addi r1, r1, 0x30 -/* 801E39E8 001E0948 4E 80 00 20 */ blr +/* 801E39E8 001E0948 4E 80 00 20 */ blr .global UpdateLoad__20CActorModelParticlesFv UpdateLoad__20CActorModelParticlesFv: @@ -160,7 +160,7 @@ lbl_801E3A80: /* 801E3A84 001E09E4 80 01 00 24 */ lwz r0, 0x24(r1) /* 801E3A88 001E09E8 7C 08 03 A6 */ mtlr r0 /* 801E3A8C 001E09EC 38 21 00 20 */ addi r1, r1, 0x20 -/* 801E3A90 001E09F0 4E 80 00 20 */ blr +/* 801E3A90 001E09F0 4E 80 00 20 */ blr .global DecrementDependency__20CActorModelParticlesF11EDependency DecrementDependency__20CActorModelParticlesF11EDependency: @@ -200,7 +200,7 @@ lbl_801E3B08: /* 801E3B14 001E0A74 83 A1 00 14 */ lwz r29, 0x14(r1) /* 801E3B18 001E0A78 7C 08 03 A6 */ mtlr r0 /* 801E3B1C 001E0A7C 38 21 00 20 */ addi r1, r1, 0x20 -/* 801E3B20 001E0A80 4E 80 00 20 */ blr +/* 801E3B20 001E0A80 4E 80 00 20 */ blr .global IncrementDependency__20CActorModelParticlesFi IncrementDependency__20CActorModelParticlesFi: @@ -229,7 +229,7 @@ lbl_801E3B70: /* 801E3B78 001E0AD8 83 C1 00 08 */ lwz r30, 8(r1) /* 801E3B7C 001E0ADC 7C 08 03 A6 */ mtlr r0 /* 801E3B80 001E0AE0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801E3B84 001E0AE4 4E 80 00 20 */ blr +/* 801E3B84 001E0AE4 4E 80 00 20 */ blr .global LoadParticleDGRPs__20CActorModelParticlesFv LoadParticleDGRPs__20CActorModelParticlesFv: @@ -301,7 +301,7 @@ lbl_801E3C60: /* 801E3C7C 001E0BDC 80 01 00 94 */ lwz r0, 0x94(r1) /* 801E3C80 001E0BE0 7C 08 03 A6 */ mtlr r0 /* 801E3C84 001E0BE4 38 21 00 90 */ addi r1, r1, 0x90 -/* 801E3C88 001E0BE8 4E 80 00 20 */ blr +/* 801E3C88 001E0BE8 4E 80 00 20 */ blr .global sub_801e3c8c sub_801e3c8c: @@ -375,7 +375,7 @@ lbl_801E3D68: /* 801E3D78 001E0CD8 80 01 00 34 */ lwz r0, 0x34(r1) /* 801E3D7C 001E0CDC 7C 08 03 A6 */ mtlr r0 /* 801E3D80 001E0CE0 38 21 00 30 */ addi r1, r1, 0x30 -/* 801E3D84 001E0CE4 4E 80 00 20 */ blr +/* 801E3D84 001E0CE4 4E 80 00 20 */ blr .global MakeIceGen__20CActorModelParticlesFv MakeIceGen__20CActorModelParticlesFv: @@ -419,7 +419,7 @@ lbl_801E3E04: /* 801E3E14 001E0D74 83 A1 00 14 */ lwz r29, 0x14(r1) /* 801E3E18 001E0D78 7C 08 03 A6 */ mtlr r0 /* 801E3E1C 001E0D7C 38 21 00 20 */ addi r1, r1, 0x20 -/* 801E3E20 001E0D80 4E 80 00 20 */ blr +/* 801E3E20 001E0D80 4E 80 00 20 */ blr .global Render__20CActorModelParticlesCFRC6CActor Render__20CActorModelParticlesCFRC6CActor: @@ -485,7 +485,7 @@ lbl_801E3EF4: /* 801E3F00 001E0E60 81 83 00 00 */ lwz r12, 0(r3) /* 801E3F04 001E0E64 81 8C 00 10 */ lwz r12, 0x10(r12) /* 801E3F08 001E0E68 7D 89 03 A6 */ mtctr r12 -/* 801E3F0C 001E0E6C 4E 80 04 21 */ bctrl +/* 801E3F0C 001E0E6C 4E 80 04 21 */ bctrl lbl_801E3F10: /* 801E3F10 001E0E70 3B 5A 00 01 */ addi r26, r26, 1 /* 801E3F14 001E0E74 3B 9C 00 0C */ addi r28, r28, 0xc @@ -500,7 +500,7 @@ lbl_801E3F10: /* 801E3F38 001E0E98 81 83 00 00 */ lwz r12, 0(r3) /* 801E3F3C 001E0E9C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 801E3F40 001E0EA0 7D 89 03 A6 */ mtctr r12 -/* 801E3F44 001E0EA4 4E 80 04 21 */ bctrl +/* 801E3F44 001E0EA4 4E 80 04 21 */ bctrl lbl_801E3F48: /* 801E3F48 001E0EA8 80 7F 00 C4 */ lwz r3, 0xc4(r31) /* 801E3F4C 001E0EAC 28 03 00 00 */ cmplwi r3, 0 @@ -508,7 +508,7 @@ lbl_801E3F48: /* 801E3F54 001E0EB4 81 83 00 00 */ lwz r12, 0(r3) /* 801E3F58 001E0EB8 81 8C 00 10 */ lwz r12, 0x10(r12) /* 801E3F5C 001E0EBC 7D 89 03 A6 */ mtctr r12 -/* 801E3F60 001E0EC0 4E 80 04 21 */ bctrl +/* 801E3F60 001E0EC0 4E 80 04 21 */ bctrl lbl_801E3F64: /* 801E3F64 001E0EC4 80 7F 00 CC */ lwz r3, 0xcc(r31) /* 801E3F68 001E0EC8 28 03 00 00 */ cmplwi r3, 0 @@ -516,7 +516,7 @@ lbl_801E3F64: /* 801E3F70 001E0ED0 81 83 00 00 */ lwz r12, 0(r3) /* 801E3F74 001E0ED4 81 8C 00 10 */ lwz r12, 0x10(r12) /* 801E3F78 001E0ED8 7D 89 03 A6 */ mtctr r12 -/* 801E3F7C 001E0EDC 4E 80 04 21 */ bctrl +/* 801E3F7C 001E0EDC 4E 80 04 21 */ bctrl lbl_801E3F80: /* 801E3F80 001E0EE0 88 1F 01 34 */ lbz r0, 0x134(r31) /* 801E3F84 001E0EE4 38 60 00 01 */ li r3, 1 @@ -533,7 +533,7 @@ lbl_801E3FA4: /* 801E3FA8 001E0F08 81 83 00 00 */ lwz r12, 0(r3) /* 801E3FAC 001E0F0C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 801E3FB0 001E0F10 7D 89 03 A6 */ mtctr r12 -/* 801E3FB4 001E0F14 4E 80 04 21 */ bctrl +/* 801E3FB4 001E0F14 4E 80 04 21 */ bctrl /* 801E3FB8 001E0F18 3B 5A 00 08 */ addi r26, r26, 8 lbl_801E3FBC: /* 801E3FBC 001E0F1C 80 1F 00 94 */ lwz r0, 0x94(r31) @@ -568,7 +568,7 @@ lbl_801E4018: /* 801E4024 001E0F84 81 83 00 00 */ lwz r12, 0(r3) /* 801E4028 001E0F88 81 8C 00 10 */ lwz r12, 0x10(r12) /* 801E402C 001E0F8C 7D 89 03 A6 */ mtctr r12 -/* 801E4030 001E0F90 4E 80 04 21 */ bctrl +/* 801E4030 001E0F90 4E 80 04 21 */ bctrl lbl_801E4034: /* 801E4034 001E0F94 88 1F 01 34 */ lbz r0, 0x134(r31) /* 801E4038 001E0F98 38 60 00 01 */ li r3, 1 @@ -582,7 +582,7 @@ lbl_801E404C: /* 801E4050 001E0FB0 80 01 00 64 */ lwz r0, 0x64(r1) /* 801E4054 001E0FB4 7C 08 03 A6 */ mtlr r0 /* 801E4058 001E0FB8 38 21 00 60 */ addi r1, r1, 0x60 -/* 801E405C 001E0FBC 4E 80 00 20 */ blr +/* 801E405C 001E0FBC 4E 80 00 20 */ blr .global AddStragglersToRenderer__20CActorModelParticlesCFRC13CStateManager AddStragglersToRenderer__20CActorModelParticlesCFRC13CStateManager: @@ -667,7 +667,7 @@ lbl_801E4168: /* 801E4178 001E10D8 81 83 00 00 */ lwz r12, 0(r3) /* 801E417C 001E10DC 81 8C 00 34 */ lwz r12, 0x34(r12) /* 801E4180 001E10E0 7D 89 03 A6 */ mtctr r12 -/* 801E4184 001E10E4 4E 80 04 21 */ bctrl +/* 801E4184 001E10E4 4E 80 04 21 */ bctrl lbl_801E4188: /* 801E4188 001E10E8 3B 39 00 01 */ addi r25, r25, 1 /* 801E418C 001E10EC 3B 5A 00 0C */ addi r26, r26, 0xc @@ -683,7 +683,7 @@ lbl_801E4188: /* 801E41B4 001E1114 81 83 00 00 */ lwz r12, 0(r3) /* 801E41B8 001E1118 81 8C 00 34 */ lwz r12, 0x34(r12) /* 801E41BC 001E111C 7D 89 03 A6 */ mtctr r12 -/* 801E41C0 001E1120 4E 80 04 21 */ bctrl +/* 801E41C0 001E1120 4E 80 04 21 */ bctrl lbl_801E41C4: /* 801E41C4 001E1124 80 9F 00 C4 */ lwz r4, 0xc4(r31) /* 801E41C8 001E1128 28 04 00 00 */ cmplwi r4, 0 @@ -692,7 +692,7 @@ lbl_801E41C4: /* 801E41D4 001E1134 81 83 00 00 */ lwz r12, 0(r3) /* 801E41D8 001E1138 81 8C 00 34 */ lwz r12, 0x34(r12) /* 801E41DC 001E113C 7D 89 03 A6 */ mtctr r12 -/* 801E41E0 001E1140 4E 80 04 21 */ bctrl +/* 801E41E0 001E1140 4E 80 04 21 */ bctrl lbl_801E41E4: /* 801E41E4 001E1144 80 9F 00 CC */ lwz r4, 0xcc(r31) /* 801E41E8 001E1148 28 04 00 00 */ cmplwi r4, 0 @@ -701,7 +701,7 @@ lbl_801E41E4: /* 801E41F4 001E1154 81 83 00 00 */ lwz r12, 0(r3) /* 801E41F8 001E1158 81 8C 00 34 */ lwz r12, 0x34(r12) /* 801E41FC 001E115C 7D 89 03 A6 */ mtctr r12 -/* 801E4200 001E1160 4E 80 04 21 */ bctrl +/* 801E4200 001E1160 4E 80 04 21 */ bctrl lbl_801E4204: /* 801E4204 001E1164 28 1D 00 00 */ cmplwi r29, 0 /* 801E4208 001E1168 41 82 00 60 */ beq lbl_801E4268 @@ -714,7 +714,7 @@ lbl_801E4218: /* 801E4220 001E1180 81 83 00 00 */ lwz r12, 0(r3) /* 801E4224 001E1184 81 8C 00 34 */ lwz r12, 0x34(r12) /* 801E4228 001E1188 7D 89 03 A6 */ mtctr r12 -/* 801E422C 001E118C 4E 80 04 21 */ bctrl +/* 801E422C 001E118C 4E 80 04 21 */ bctrl /* 801E4230 001E1190 3B 39 00 08 */ addi r25, r25, 8 lbl_801E4234: /* 801E4234 001E1194 80 1F 00 94 */ lwz r0, 0x94(r31) @@ -729,7 +729,7 @@ lbl_801E4234: /* 801E4258 001E11B8 81 83 00 00 */ lwz r12, 0(r3) /* 801E425C 001E11BC 81 8C 00 34 */ lwz r12, 0x34(r12) /* 801E4260 001E11C0 7D 89 03 A6 */ mtctr r12 -/* 801E4264 001E11C4 4E 80 04 21 */ bctrl +/* 801E4264 001E11C4 4E 80 04 21 */ bctrl lbl_801E4268: /* 801E4268 001E11C8 28 1E 00 00 */ cmplwi r30, 0 /* 801E426C 001E11CC 41 82 00 24 */ beq lbl_801E4290 @@ -751,7 +751,7 @@ lbl_801E4294: /* 801E42A4 001E1204 80 01 00 34 */ lwz r0, 0x34(r1) /* 801E42A8 001E1208 7C 08 03 A6 */ mtlr r0 /* 801E42AC 001E120C 38 21 00 30 */ addi r1, r1, 0x30 -/* 801E42B0 001E1210 4E 80 00 20 */ blr +/* 801E42B0 001E1210 4E 80 00 20 */ blr .global FindSystem__20CActorModelParticlesF9TUniqueId FindSystem__20CActorModelParticlesF9TUniqueId: @@ -764,14 +764,14 @@ lbl_801E42C0: /* 801E42C8 001E1228 7C 04 00 40 */ cmplw r4, r0 /* 801E42CC 001E122C 40 82 00 0C */ bne lbl_801E42D8 /* 801E42D0 001E1230 90 C3 00 00 */ stw r6, 0(r3) -/* 801E42D4 001E1234 4E 80 00 20 */ blr +/* 801E42D4 001E1234 4E 80 00 20 */ blr lbl_801E42D8: /* 801E42D8 001E1238 80 C6 00 04 */ lwz r6, 4(r6) lbl_801E42DC: /* 801E42DC 001E123C 7C 06 38 40 */ cmplw r6, r7 /* 801E42E0 001E1240 40 82 FF E0 */ bne lbl_801E42C0 /* 801E42E4 001E1244 90 E3 00 00 */ stw r7, 0(r3) -/* 801E42E8 001E1248 4E 80 00 20 */ blr +/* 801E42E8 001E1248 4E 80 00 20 */ blr .global FindSystem__20CActorModelParticlesCF9TUniqueId FindSystem__20CActorModelParticlesCF9TUniqueId: @@ -784,14 +784,14 @@ lbl_801E42F8: /* 801E4300 001E1260 7C 04 00 40 */ cmplw r4, r0 /* 801E4304 001E1264 40 82 00 0C */ bne lbl_801E4310 /* 801E4308 001E1268 90 C3 00 00 */ stw r6, 0(r3) -/* 801E430C 001E126C 4E 80 00 20 */ blr +/* 801E430C 001E126C 4E 80 00 20 */ blr lbl_801E4310: /* 801E4310 001E1270 80 C6 00 04 */ lwz r6, 4(r6) lbl_801E4314: /* 801E4314 001E1274 7C 06 38 40 */ cmplw r6, r7 /* 801E4318 001E1278 40 82 FF E0 */ bne lbl_801E42F8 /* 801E431C 001E127C 90 E3 00 00 */ stw r7, 0(r3) -/* 801E4320 001E1280 4E 80 00 20 */ blr +/* 801E4320 001E1280 4E 80 00 20 */ blr .global FindOrCreateSystem__20CActorModelParticlesFR6CActor FindOrCreateSystem__20CActorModelParticlesFR6CActor: @@ -845,7 +845,7 @@ lbl_801E43C4: /* 801E43CC 001E132C 83 C1 01 48 */ lwz r30, 0x148(r1) /* 801E43D0 001E1330 7C 08 03 A6 */ mtlr r0 /* 801E43D4 001E1334 38 21 01 50 */ addi r1, r1, 0x150 -/* 801E43D8 001E1338 4E 80 00 20 */ blr +/* 801E43D8 001E1338 4E 80 00 20 */ blr .global sub_801e43dc sub_801e43dc: @@ -864,7 +864,7 @@ sub_801e43dc: /* 801E440C 001E136C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801E4410 001E1370 7C 08 03 A6 */ mtlr r0 /* 801E4414 001E1374 38 21 00 10 */ addi r1, r1, 0x10 -/* 801E4418 001E1378 4E 80 00 20 */ blr +/* 801E4418 001E1378 4E 80 00 20 */ blr .global sub_801e441c sub_801e441c: @@ -896,7 +896,7 @@ lbl_801E4458: /* 801E447C 001E13DC 83 C1 00 08 */ lwz r30, 8(r1) /* 801E4480 001E13E0 7C 08 03 A6 */ mtlr r0 /* 801E4484 001E13E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801E4488 001E13E8 4E 80 00 20 */ blr +/* 801E4488 001E13E8 4E 80 00 20 */ blr .global sub_801e448c sub_801e448c: @@ -934,7 +934,7 @@ lbl_801E44EC: /* 801E4500 001E1460 83 81 00 10 */ lwz r28, 0x10(r1) /* 801E4504 001E1464 7C 08 03 A6 */ mtlr r0 /* 801E4508 001E1468 38 21 00 20 */ addi r1, r1, 0x20 -/* 801E450C 001E146C 4E 80 00 20 */ blr +/* 801E450C 001E146C 4E 80 00 20 */ blr .global sub_801e4510 sub_801e4510: @@ -1070,7 +1070,7 @@ lbl_801E4620: /* 801E46FC 001E165C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801E4700 001E1660 7C 08 03 A6 */ mtlr r0 /* 801E4704 001E1664 38 21 00 10 */ addi r1, r1, 0x10 -/* 801E4708 001E1668 4E 80 00 20 */ blr +/* 801E4708 001E1668 4E 80 00 20 */ blr .global "__dt__Q24rstl32auto_ptr<20CRainSplashGenerator>" "__dt__Q24rstl32auto_ptr<20CRainSplashGenerator>": @@ -1100,7 +1100,7 @@ lbl_801E4754: /* 801E4760 001E16C0 83 C1 00 08 */ lwz r30, 8(r1) /* 801E4764 001E16C4 7C 08 03 A6 */ mtlr r0 /* 801E4768 001E16C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801E476C 001E16CC 4E 80 00 20 */ blr +/* 801E476C 001E16CC 4E 80 00 20 */ blr .global SetupHook__20CActorModelParticlesCF9TUniqueId SetupHook__20CActorModelParticlesCF9TUniqueId: @@ -1128,7 +1128,7 @@ lbl_801E47BC: /* 801E47C0 001E1720 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801E47C4 001E1724 7C 08 03 A6 */ mtlr r0 /* 801E47C8 001E1728 38 21 00 20 */ addi r1, r1, 0x20 -/* 801E47CC 001E172C 4E 80 00 20 */ blr +/* 801E47CC 001E172C 4E 80 00 20 */ blr .global GeneratePoints__Q220CActorModelParticles5CItemFPC9CVector3fPC9CVector3fi GeneratePoints__Q220CActorModelParticles5CItemFPC9CVector3fPC9CVector3fi: @@ -1184,7 +1184,7 @@ lbl_801E4800: /* 801E4890 001E17F0 81 9E 00 00 */ lwz r12, 0(r30) /* 801E4894 001E17F4 81 8C 00 18 */ lwz r12, 0x18(r12) /* 801E4898 001E17F8 7D 89 03 A6 */ mtctr r12 -/* 801E489C 001E17FC 4E 80 04 21 */ bctrl +/* 801E489C 001E17FC 4E 80 04 21 */ bctrl lbl_801E48A0: /* 801E48A0 001E1800 3B 39 00 01 */ addi r25, r25, 1 /* 801E48A4 001E1804 3B 18 00 0C */ addi r24, r24, 0xc @@ -1237,7 +1237,7 @@ lbl_801E4900: /* 801E4954 001E18B4 81 83 00 00 */ lwz r12, 0(r3) /* 801E4958 001E18B8 81 8C 00 18 */ lwz r12, 0x18(r12) /* 801E495C 001E18BC 7D 89 03 A6 */ mtctr r12 -/* 801E4960 001E18C0 4E 80 04 21 */ bctrl +/* 801E4960 001E18C0 4E 80 04 21 */ bctrl /* 801E4964 001E18C4 7C 9C C2 14 */ add r4, r28, r24 /* 801E4968 001E18C8 38 61 00 5C */ addi r3, r1, 0x5c /* 801E496C 001E18CC C0 04 00 08 */ lfs f0, 8(r4) @@ -1281,7 +1281,7 @@ lbl_801E4900: /* 801E4A04 001E1964 81 98 00 00 */ lwz r12, 0(r24) /* 801E4A08 001E1968 81 8C 00 14 */ lwz r12, 0x14(r12) /* 801E4A0C 001E196C 7D 89 03 A6 */ mtctr r12 -/* 801E4A10 001E1970 4E 80 04 21 */ bctrl +/* 801E4A10 001E1970 4E 80 04 21 */ bctrl lbl_801E4A14: /* 801E4A14 001E1974 80 7A 00 7C */ lwz r3, 0x7c(r26) /* 801E4A18 001E1978 38 80 00 01 */ li r4, 1 @@ -1334,7 +1334,7 @@ lbl_801E4A48: /* 801E4ACC 001E1A2C 81 97 00 00 */ lwz r12, 0(r23) /* 801E4AD0 001E1A30 81 8C 00 18 */ lwz r12, 0x18(r12) /* 801E4AD4 001E1A34 7D 89 03 A6 */ mtctr r12 -/* 801E4AD8 001E1A38 4E 80 04 21 */ bctrl +/* 801E4AD8 001E1A38 4E 80 04 21 */ bctrl /* 801E4ADC 001E1A3C 38 61 00 50 */ addi r3, r1, 0x50 /* 801E4AE0 001E1A40 7C 9C C2 14 */ add r4, r28, r24 /* 801E4AE4 001E1A44 48 12 F2 ED */ bl __ct__13CUnitVector3fFRC9CVector3f @@ -1346,7 +1346,7 @@ lbl_801E4A48: /* 801E4AFC 001E1A5C 81 97 00 00 */ lwz r12, 0(r23) /* 801E4B00 001E1A60 81 8C 00 14 */ lwz r12, 0x14(r12) /* 801E4B04 001E1A64 7D 89 03 A6 */ mtctr r12 -/* 801E4B08 001E1A68 4E 80 04 21 */ bctrl +/* 801E4B08 001E1A68 4E 80 04 21 */ bctrl /* 801E4B0C 001E1A6C 80 1A 00 8C */ lwz r0, 0x8c(r26) /* 801E4B10 001E1A70 7C 77 00 D0 */ neg r3, r23 /* 801E4B14 001E1A74 7C 63 BB 78 */ or r3, r3, r23 @@ -1375,7 +1375,7 @@ lbl_801E4B44: /* 801E4B6C 001E1ACC 38 80 00 01 */ li r4, 1 /* 801E4B70 001E1AD0 81 8C 00 08 */ lwz r12, 8(r12) /* 801E4B74 001E1AD4 7D 89 03 A6 */ mtctr r12 -/* 801E4B78 001E1AD8 4E 80 04 21 */ bctrl +/* 801E4B78 001E1AD8 4E 80 04 21 */ bctrl lbl_801E4B7C: /* 801E4B7C 001E1ADC 80 1A 00 8C */ lwz r0, 0x8c(r26) /* 801E4B80 001E1AE0 2C 00 00 04 */ cmpwi r0, 4 @@ -1392,7 +1392,7 @@ lbl_801E4B98: /* 801E4BA4 001E1B04 81 83 00 00 */ lwz r12, 0(r3) /* 801E4BA8 001E1B08 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 801E4BAC 001E1B0C 7D 89 03 A6 */ mtctr r12 -/* 801E4BB0 001E1B10 4E 80 04 21 */ bctrl +/* 801E4BB0 001E1B10 4E 80 04 21 */ bctrl /* 801E4BB4 001E1B14 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801E4BB8 001E1B18 41 82 01 54 */ beq lbl_801E4D0C /* 801E4BBC 001E1B1C 80 9A 00 CC */ lwz r4, 0xcc(r26) @@ -1503,13 +1503,13 @@ lbl_801E4D28: /* 801E4D34 001E1C94 80 01 01 14 */ lwz r0, 0x114(r1) /* 801E4D38 001E1C98 7C 08 03 A6 */ mtlr r0 /* 801E4D3C 001E1C9C 38 21 01 10 */ addi r1, r1, 0x110 -/* 801E4D40 001E1CA0 4E 80 00 20 */ blr +/* 801E4D40 001E1CA0 4E 80 00 20 */ blr .global GetParticleEmission__17CParticleElectricFv GetParticleEmission__17CParticleElectricFv: /* 801E4D44 001E1CA4 88 03 04 50 */ lbz r0, 0x450(r3) /* 801E4D48 001E1CA8 54 03 CF FE */ rlwinm r3, r0, 0x19, 0x1f, 0x1f -/* 801E4D4C 001E1CAC 4E 80 00 20 */ blr +/* 801E4D4C 001E1CAC 4E 80 00 20 */ blr .global GetNextBestPt__FiPC9CVector3fiR9CRandom16 GetNextBestPt__FiPC9CVector3fiR9CRandom16: @@ -1566,7 +1566,7 @@ lbl_801E4DF4: /* 801E4E10 001E1D70 80 01 00 44 */ lwz r0, 0x44(r1) /* 801E4E14 001E1D74 7C 08 03 A6 */ mtlr r0 /* 801E4E18 001E1D78 38 21 00 40 */ addi r1, r1, 0x40 -/* 801E4E1C 001E1D7C 4E 80 00 20 */ blr +/* 801E4E1C 001E1D7C 4E 80 00 20 */ blr .global PointGenerator__20CActorModelParticlesFUiPC9CVector3fPC9CVector3fi PointGenerator__20CActorModelParticlesFUiPC9CVector3fPC9CVector3fi: @@ -1577,7 +1577,7 @@ PointGenerator__20CActorModelParticlesFUiPC9CVector3fPC9CVector3fi: /* 801E4E30 001E1D90 80 01 00 14 */ lwz r0, 0x14(r1) /* 801E4E34 001E1D94 7C 08 03 A6 */ mtlr r0 /* 801E4E38 001E1D98 38 21 00 10 */ addi r1, r1, 0x10 -/* 801E4E3C 001E1D9C 4E 80 00 20 */ blr +/* 801E4E3C 001E1D9C 4E 80 00 20 */ blr .global RemoveRainSplashGenerator__20CActorModelParticlesFR6CActor RemoveRainSplashGenerator__20CActorModelParticlesFR6CActor: @@ -1605,7 +1605,7 @@ lbl_801E4E90: /* 801E4E90 001E1DF0 80 01 00 24 */ lwz r0, 0x24(r1) /* 801E4E94 001E1DF4 7C 08 03 A6 */ mtlr r0 /* 801E4E98 001E1DF8 38 21 00 20 */ addi r1, r1, 0x20 -/* 801E4E9C 001E1DFC 4E 80 00 20 */ blr +/* 801E4E9C 001E1DFC 4E 80 00 20 */ blr .global "__as__Q24rstl32auto_ptr<20CRainSplashGenerator>FRCQ24rstl32auto_ptr<20CRainSplashGenerator>" "__as__Q24rstl32auto_ptr<20CRainSplashGenerator>FRCQ24rstl32auto_ptr<20CRainSplashGenerator>": @@ -1638,7 +1638,7 @@ lbl_801E4EF4: /* 801E4F00 001E1E60 83 C1 00 08 */ lwz r30, 8(r1) /* 801E4F04 001E1E64 7C 08 03 A6 */ mtlr r0 /* 801E4F08 001E1E68 38 21 00 10 */ addi r1, r1, 0x10 -/* 801E4F0C 001E1E6C 4E 80 00 20 */ blr +/* 801E4F0C 001E1E6C 4E 80 00 20 */ blr .global AddRainSplashGenerator__20CActorModelParticlesFR6CActorR13CStateManageriif AddRainSplashGenerator__20CActorModelParticlesFR6CActorR13CStateManageriif: @@ -1722,7 +1722,7 @@ lbl_801E501C: /* 801E5034 001E1F94 83 81 00 20 */ lwz r28, 0x20(r1) /* 801E5038 001E1F98 7C 08 03 A6 */ mtlr r0 /* 801E503C 001E1F9C 38 21 00 40 */ addi r1, r1, 0x40 -/* 801E5040 001E1FA0 4E 80 00 20 */ blr +/* 801E5040 001E1FA0 4E 80 00 20 */ blr .global StopThermalHotParticles__20CActorModelParticlesFR5CActor StopThermalHotParticles__20CActorModelParticlesFR5CActor: @@ -1758,7 +1758,7 @@ lbl_801E50A0: /* 801E50B4 001E2014 38 80 00 00 */ li r4, 0 /* 801E50B8 001E2018 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 801E50BC 001E201C 7D 89 03 A6 */ mtctr r12 -/* 801E50C0 001E2020 4E 80 04 21 */ bctrl +/* 801E50C0 001E2020 4E 80 04 21 */ bctrl lbl_801E50C4: /* 801E50C4 001E2024 3B BD 00 01 */ addi r29, r29, 1 /* 801E50C8 001E2028 3B FF 00 0C */ addi r31, r31, 0xc @@ -1771,7 +1771,7 @@ lbl_801E50D4: /* 801E50E0 001E2040 83 A1 00 24 */ lwz r29, 0x24(r1) /* 801E50E4 001E2044 7C 08 03 A6 */ mtlr r0 /* 801E50E8 001E2048 38 21 00 30 */ addi r1, r1, 0x30 -/* 801E50EC 001E204C 4E 80 00 20 */ blr +/* 801E50EC 001E204C 4E 80 00 20 */ blr .global LightDudeOnFire__20CActorModelParticlesFR5CActor LightDudeOnFire__20CActorModelParticlesFR5CActor: @@ -1799,7 +1799,7 @@ lbl_801E513C: /* 801E5140 001E20A0 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801E5144 001E20A4 7C 08 03 A6 */ mtlr r0 /* 801E5148 001E20A8 38 21 00 20 */ addi r1, r1, 0x20 -/* 801E514C 001E20AC 4E 80 00 20 */ blr +/* 801E514C 001E20AC 4E 80 00 20 */ blr .global StopElectric__20CActorModelParticlesFR5CActor StopElectric__20CActorModelParticlesFR5CActor: @@ -1829,13 +1829,13 @@ StopElectric__20CActorModelParticlesFR5CActor: /* 801E51AC 001E210C 38 80 00 00 */ li r4, 0 /* 801E51B0 001E2110 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 801E51B4 001E2114 7D 89 03 A6 */ mtctr r12 -/* 801E51B8 001E2118 4E 80 04 21 */ bctrl +/* 801E51B8 001E2118 4E 80 04 21 */ bctrl lbl_801E51BC: /* 801E51BC 001E211C 80 01 00 24 */ lwz r0, 0x24(r1) /* 801E51C0 001E2120 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801E51C4 001E2124 7C 08 03 A6 */ mtlr r0 /* 801E51C8 001E2128 38 21 00 20 */ addi r1, r1, 0x20 -/* 801E51CC 001E212C 4E 80 00 20 */ blr +/* 801E51CC 001E212C 4E 80 00 20 */ blr .global LoadAndStartElectric__20CActorModelParticlesFR6CActor LoadAndStartElectric__20CActorModelParticlesFR6CActor: @@ -1860,7 +1860,7 @@ lbl_801E5210: /* 801E5214 001E2174 7C 7F 1B 78 */ mr r31, r3 /* 801E5218 001E2178 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 801E521C 001E217C 7D 89 03 A6 */ mtctr r12 -/* 801E5220 001E2180 4E 80 04 21 */ bctrl +/* 801E5220 001E2180 4E 80 04 21 */ bctrl /* 801E5224 001E2184 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801E5228 001E2188 40 82 00 1C */ bne lbl_801E5244 /* 801E522C 001E218C 7F E3 FB 78 */ mr r3, r31 @@ -1868,13 +1868,13 @@ lbl_801E5210: /* 801E5234 001E2194 81 9F 00 00 */ lwz r12, 0(r31) /* 801E5238 001E2198 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 801E523C 001E219C 7D 89 03 A6 */ mtctr r12 -/* 801E5240 001E21A0 4E 80 04 21 */ bctrl +/* 801E5240 001E21A0 4E 80 04 21 */ bctrl lbl_801E5244: /* 801E5244 001E21A4 80 01 00 24 */ lwz r0, 0x24(r1) /* 801E5248 001E21A8 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801E524C 001E21AC 7C 08 03 A6 */ mtlr r0 /* 801E5250 001E21B0 38 21 00 20 */ addi r1, r1, 0x20 -/* 801E5254 001E21B4 4E 80 00 20 */ blr +/* 801E5254 001E21B4 4E 80 00 20 */ blr .global StartIce__20CActorModelParticlesFR6CActorR13CStateManager StartIce__20CActorModelParticlesFR6CActorR13CStateManager: @@ -1892,7 +1892,7 @@ StartIce__20CActorModelParticlesFR6CActorR13CStateManager: /* 801E5284 001E21E4 80 01 00 14 */ lwz r0, 0x14(r1) /* 801E5288 001E21E8 7C 08 03 A6 */ mtlr r0 /* 801E528C 001E21EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801E5290 001E21F0 4E 80 00 20 */ blr +/* 801E5290 001E21F0 4E 80 00 20 */ blr .global EnsureElectricLoaded__20CActorModelParticlesR5CActor EnsureElectricLoaded__20CActorModelParticlesR5CActor: @@ -1910,7 +1910,7 @@ EnsureElectricLoaded__20CActorModelParticlesR5CActor: /* 801E52C0 001E2220 80 01 00 14 */ lwz r0, 0x14(r1) /* 801E52C4 001E2224 7C 08 03 A6 */ mtlr r0 /* 801E52C8 001E2228 38 21 00 10 */ addi r1, r1, 0x10 -/* 801E52CC 001E222C 4E 80 00 20 */ blr +/* 801E52CC 001E222C 4E 80 00 20 */ blr .global EnsureFirePopLoaded__20CActorModelParticlesR5CActor EnsureFirePopLoaded__20CActorModelParticlesR5CActor: @@ -1928,7 +1928,7 @@ EnsureFirePopLoaded__20CActorModelParticlesR5CActor: /* 801E52FC 001E225C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801E5300 001E2260 7C 08 03 A6 */ mtlr r0 /* 801E5304 001E2264 38 21 00 10 */ addi r1, r1, 0x10 -/* 801E5308 001E2268 4E 80 00 20 */ blr +/* 801E5308 001E2268 4E 80 00 20 */ blr .global EnsureIceBreakLoaded__20CActorModelParticlesR5CActor EnsureIceBreakLoaded__20CActorModelParticlesR5CActor: @@ -1946,7 +1946,7 @@ EnsureIceBreakLoaded__20CActorModelParticlesR5CActor: /* 801E5338 001E2298 80 01 00 14 */ lwz r0, 0x14(r1) /* 801E533C 001E229C 7C 08 03 A6 */ mtlr r0 /* 801E5340 001E22A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801E5344 001E22A4 4E 80 00 20 */ blr +/* 801E5344 001E22A4 4E 80 00 20 */ blr .global MakeOnFireGen__20CActorModelParticlesFv MakeOnFireGen__20CActorModelParticlesFv: @@ -1990,7 +1990,7 @@ lbl_801E53C4: /* 801E53D4 001E2334 83 A1 00 14 */ lwz r29, 0x14(r1) /* 801E53D8 001E2338 7C 08 03 A6 */ mtlr r0 /* 801E53DC 001E233C 38 21 00 20 */ addi r1, r1, 0x20 -/* 801E53E0 001E2340 4E 80 00 20 */ blr +/* 801E53E0 001E2340 4E 80 00 20 */ blr .global MakeElectricGen__20CActorModelParticlesFv MakeElectricGen__20CActorModelParticlesFv: @@ -2032,7 +2032,7 @@ lbl_801E5458: /* 801E5468 001E23C8 83 A1 00 14 */ lwz r29, 0x14(r1) /* 801E546C 001E23CC 7C 08 03 A6 */ mtlr r0 /* 801E5470 001E23D0 38 21 00 20 */ addi r1, r1, 0x20 -/* 801E5474 001E23D4 4E 80 00 20 */ blr +/* 801E5474 001E23D4 4E 80 00 20 */ blr .global MakeIcePopGen__20CActorModelParticlesFv MakeIcePopGen__20CActorModelParticlesFv: @@ -2076,7 +2076,7 @@ lbl_801E54F4: /* 801E5504 001E2464 83 A1 00 14 */ lwz r29, 0x14(r1) /* 801E5508 001E2468 7C 08 03 A6 */ mtlr r0 /* 801E550C 001E246C 38 21 00 20 */ addi r1, r1, 0x20 -/* 801E5510 001E2470 4E 80 00 20 */ blr +/* 801E5510 001E2470 4E 80 00 20 */ blr .global MakeFirePopGen__20CActorModelParticlesFv MakeFirePopGen__20CActorModelParticlesFv: @@ -2120,7 +2120,7 @@ lbl_801E5590: /* 801E55A0 001E2500 83 A1 00 14 */ lwz r29, 0x14(r1) /* 801E55A4 001E2504 7C 08 03 A6 */ mtlr r0 /* 801E55A8 001E2508 38 21 00 20 */ addi r1, r1, 0x20 -/* 801E55AC 001E250C 4E 80 00 20 */ blr +/* 801E55AC 001E250C 4E 80 00 20 */ blr .global MakeAshGen__20CActorModelParticlesFv MakeAshGen__20CActorModelParticlesFv: @@ -2164,7 +2164,7 @@ lbl_801E562C: /* 801E563C 001E259C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 801E5640 001E25A0 7C 08 03 A6 */ mtlr r0 /* 801E5644 001E25A4 38 21 00 20 */ addi r1, r1, 0x20 -/* 801E5648 001E25A8 4E 80 00 20 */ blr +/* 801E5648 001E25A8 4E 80 00 20 */ blr .global Update__20CActorModelParticlesFfR13CStateManager Update__20CActorModelParticlesFfR13CStateManager: @@ -2218,7 +2218,7 @@ lbl_801E56DC: /* 801E56F8 001E2658 83 A1 00 1C */ lwz r29, 0x1c(r1) /* 801E56FC 001E265C 7C 08 03 A6 */ mtlr r0 /* 801E5700 001E2660 38 21 00 30 */ addi r1, r1, 0x30 -/* 801E5704 001E2664 4E 80 00 20 */ blr +/* 801E5704 001E2664 4E 80 00 20 */ blr .global __ct__20CActorModelParticlesFv __ct__20CActorModelParticlesFv: @@ -2240,14 +2240,14 @@ __ct__20CActorModelParticlesFv: /* 801E5744 001E26A4 81 83 00 00 */ lwz r12, 0(r3) /* 801E5748 001E26A8 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 801E574C 001E26AC 7D 89 03 A6 */ mtctr r12 -/* 801E5750 001E26B0 4E 80 04 21 */ bctrl +/* 801E5750 001E26B0 4E 80 04 21 */ bctrl /* 801E5754 001E26B4 80 8D A0 64 */ lwz r4, gpSimplePool@sda21(r13) /* 801E5758 001E26B8 7C 65 1B 78 */ mr r5, r3 /* 801E575C 001E26BC 38 61 00 38 */ addi r3, r1, 0x38 /* 801E5760 001E26C0 81 84 00 00 */ lwz r12, 0(r4) /* 801E5764 001E26C4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801E5768 001E26C8 7D 89 03 A6 */ mtctr r12 -/* 801E576C 001E26CC 4E 80 04 21 */ bctrl +/* 801E576C 001E26CC 4E 80 04 21 */ bctrl /* 801E5770 001E26D0 38 7F 00 18 */ addi r3, r31, 0x18 /* 801E5774 001E26D4 38 81 00 38 */ addi r4, r1, 0x38 /* 801E5778 001E26D8 48 15 B7 31 */ bl __ct__6CTokenFRC6CToken @@ -2261,14 +2261,14 @@ __ct__20CActorModelParticlesFv: /* 801E5798 001E26F8 80 84 00 08 */ lwz r4, 8(r4) /* 801E579C 001E26FC 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 801E57A0 001E2700 7D 89 03 A6 */ mtctr r12 -/* 801E57A4 001E2704 4E 80 04 21 */ bctrl +/* 801E57A4 001E2704 4E 80 04 21 */ bctrl /* 801E57A8 001E2708 80 8D A0 64 */ lwz r4, gpSimplePool@sda21(r13) /* 801E57AC 001E270C 7C 65 1B 78 */ mr r5, r3 /* 801E57B0 001E2710 38 61 00 30 */ addi r3, r1, 0x30 /* 801E57B4 001E2714 81 84 00 00 */ lwz r12, 0(r4) /* 801E57B8 001E2718 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801E57BC 001E271C 7D 89 03 A6 */ mtctr r12 -/* 801E57C0 001E2720 4E 80 04 21 */ bctrl +/* 801E57C0 001E2720 4E 80 04 21 */ bctrl /* 801E57C4 001E2724 38 7F 00 20 */ addi r3, r31, 0x20 /* 801E57C8 001E2728 38 81 00 30 */ addi r4, r1, 0x30 /* 801E57CC 001E272C 48 15 B6 DD */ bl __ct__6CTokenFRC6CToken @@ -2282,14 +2282,14 @@ __ct__20CActorModelParticlesFv: /* 801E57EC 001E274C 80 84 00 04 */ lwz r4, 4(r4) /* 801E57F0 001E2750 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 801E57F4 001E2754 7D 89 03 A6 */ mtctr r12 -/* 801E57F8 001E2758 4E 80 04 21 */ bctrl +/* 801E57F8 001E2758 4E 80 04 21 */ bctrl /* 801E57FC 001E275C 80 8D A0 64 */ lwz r4, gpSimplePool@sda21(r13) /* 801E5800 001E2760 7C 65 1B 78 */ mr r5, r3 /* 801E5804 001E2764 38 61 00 28 */ addi r3, r1, 0x28 /* 801E5808 001E2768 81 84 00 00 */ lwz r12, 0(r4) /* 801E580C 001E276C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801E5810 001E2770 7D 89 03 A6 */ mtctr r12 -/* 801E5814 001E2774 4E 80 04 21 */ bctrl +/* 801E5814 001E2774 4E 80 04 21 */ bctrl /* 801E5818 001E2778 38 7F 00 28 */ addi r3, r31, 0x28 /* 801E581C 001E277C 38 81 00 28 */ addi r4, r1, 0x28 /* 801E5820 001E2780 48 15 B6 89 */ bl __ct__6CTokenFRC6CToken @@ -2303,14 +2303,14 @@ __ct__20CActorModelParticlesFv: /* 801E5840 001E27A0 80 84 00 0C */ lwz r4, 0xc(r4) /* 801E5844 001E27A4 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 801E5848 001E27A8 7D 89 03 A6 */ mtctr r12 -/* 801E584C 001E27AC 4E 80 04 21 */ bctrl +/* 801E584C 001E27AC 4E 80 04 21 */ bctrl /* 801E5850 001E27B0 80 8D A0 64 */ lwz r4, gpSimplePool@sda21(r13) /* 801E5854 001E27B4 7C 65 1B 78 */ mr r5, r3 /* 801E5858 001E27B8 38 61 00 20 */ addi r3, r1, 0x20 /* 801E585C 001E27BC 81 84 00 00 */ lwz r12, 0(r4) /* 801E5860 001E27C0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801E5864 001E27C4 7D 89 03 A6 */ mtctr r12 -/* 801E5868 001E27C8 4E 80 04 21 */ bctrl +/* 801E5868 001E27C8 4E 80 04 21 */ bctrl /* 801E586C 001E27CC 38 7F 00 30 */ addi r3, r31, 0x30 /* 801E5870 001E27D0 38 81 00 20 */ addi r4, r1, 0x20 /* 801E5874 001E27D4 48 15 B6 35 */ bl __ct__6CTokenFRC6CToken @@ -2324,14 +2324,14 @@ __ct__20CActorModelParticlesFv: /* 801E5894 001E27F4 80 84 00 14 */ lwz r4, 0x14(r4) /* 801E5898 001E27F8 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 801E589C 001E27FC 7D 89 03 A6 */ mtctr r12 -/* 801E58A0 001E2800 4E 80 04 21 */ bctrl +/* 801E58A0 001E2800 4E 80 04 21 */ bctrl /* 801E58A4 001E2804 80 8D A0 64 */ lwz r4, gpSimplePool@sda21(r13) /* 801E58A8 001E2808 7C 65 1B 78 */ mr r5, r3 /* 801E58AC 001E280C 38 61 00 18 */ addi r3, r1, 0x18 /* 801E58B0 001E2810 81 84 00 00 */ lwz r12, 0(r4) /* 801E58B4 001E2814 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801E58B8 001E2818 7D 89 03 A6 */ mtctr r12 -/* 801E58BC 001E281C 4E 80 04 21 */ bctrl +/* 801E58BC 001E281C 4E 80 04 21 */ bctrl /* 801E58C0 001E2820 38 7F 00 38 */ addi r3, r31, 0x38 /* 801E58C4 001E2824 38 81 00 18 */ addi r4, r1, 0x18 /* 801E58C8 001E2828 48 15 B5 E1 */ bl __ct__6CTokenFRC6CToken @@ -2345,14 +2345,14 @@ __ct__20CActorModelParticlesFv: /* 801E58E8 001E2848 80 84 00 10 */ lwz r4, 0x10(r4) /* 801E58EC 001E284C 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 801E58F0 001E2850 7D 89 03 A6 */ mtctr r12 -/* 801E58F4 001E2854 4E 80 04 21 */ bctrl +/* 801E58F4 001E2854 4E 80 04 21 */ bctrl /* 801E58F8 001E2858 80 8D A0 64 */ lwz r4, gpSimplePool@sda21(r13) /* 801E58FC 001E285C 7C 65 1B 78 */ mr r5, r3 /* 801E5900 001E2860 38 61 00 10 */ addi r3, r1, 0x10 /* 801E5904 001E2864 81 84 00 00 */ lwz r12, 0(r4) /* 801E5908 001E2868 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801E590C 001E286C 7D 89 03 A6 */ mtctr r12 -/* 801E5910 001E2870 4E 80 04 21 */ bctrl +/* 801E5910 001E2870 4E 80 04 21 */ bctrl /* 801E5914 001E2874 38 7F 00 40 */ addi r3, r31, 0x40 /* 801E5918 001E2878 38 81 00 10 */ addi r4, r1, 0x10 /* 801E591C 001E287C 48 15 B5 8D */ bl __ct__6CTokenFRC6CToken @@ -2366,14 +2366,14 @@ __ct__20CActorModelParticlesFv: /* 801E593C 001E289C 38 84 00 63 */ addi r4, r4, 0x63 /* 801E5940 001E28A0 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 801E5944 001E28A4 7D 89 03 A6 */ mtctr r12 -/* 801E5948 001E28A8 4E 80 04 21 */ bctrl +/* 801E5948 001E28A8 4E 80 04 21 */ bctrl /* 801E594C 001E28AC 80 8D A0 64 */ lwz r4, gpSimplePool@sda21(r13) /* 801E5950 001E28B0 7C 65 1B 78 */ mr r5, r3 /* 801E5954 001E28B4 38 61 00 08 */ addi r3, r1, 8 /* 801E5958 001E28B8 81 84 00 00 */ lwz r12, 0(r4) /* 801E595C 001E28BC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801E5960 001E28C0 7D 89 03 A6 */ mtctr r12 -/* 801E5964 001E28C4 4E 80 04 21 */ bctrl +/* 801E5964 001E28C4 4E 80 04 21 */ bctrl /* 801E5968 001E28C8 38 7F 00 48 */ addi r3, r31, 0x48 /* 801E596C 001E28CC 38 81 00 08 */ addi r4, r1, 8 /* 801E5970 001E28D0 48 15 B5 39 */ bl __ct__6CTokenFRC6CToken @@ -2389,7 +2389,7 @@ __ct__20CActorModelParticlesFv: /* 801E5998 001E28F8 83 E1 00 4C */ lwz r31, 0x4c(r1) /* 801E599C 001E28FC 7C 08 03 A6 */ mtlr r0 /* 801E59A0 001E2900 38 21 00 50 */ addi r1, r1, 0x50 -/* 801E59A4 001E2904 4E 80 00 20 */ blr +/* 801E59A4 001E2904 4E 80 00 20 */ blr .global Unlock__Q220CActorModelParticles5CItemF11EDependency Unlock__Q220CActorModelParticles5CItemF11EDependency: @@ -2416,7 +2416,7 @@ lbl_801E59EC: /* 801E59F4 001E2954 83 C1 00 08 */ lwz r30, 8(r1) /* 801E59F8 001E2958 7C 08 03 A6 */ mtlr r0 /* 801E59FC 001E295C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801E5A00 001E2960 4E 80 00 20 */ blr +/* 801E5A00 001E2960 4E 80 00 20 */ blr .global EnsureLoaded__Q220CActorModelParticles5CItemFi EnsureLoaded__Q220CActorModelParticles5CItemFi: @@ -2443,7 +2443,7 @@ lbl_801E5A48: /* 801E5A50 001E29B0 83 C1 00 08 */ lwz r30, 8(r1) /* 801E5A54 001E29B4 7C 08 03 A6 */ mtlr r0 /* 801E5A58 001E29B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801E5A5C 001E29BC 4E 80 00 20 */ blr +/* 801E5A5C 001E29BC 4E 80 00 20 */ blr .global UpdateOnFire__Q220CActorModelParticles5CItemFfR6CActorR13CStateManager UpdateOnFire__Q220CActorModelParticles5CItemFfR6CActorR13CStateManager: @@ -2572,7 +2572,7 @@ lbl_801E5BB8: /* 801E5C14 001E2B74 38 80 00 01 */ li r4, 1 /* 801E5C18 001E2B78 81 8C 00 08 */ lwz r12, 8(r12) /* 801E5C1C 001E2B7C 7D 89 03 A6 */ mtctr r12 -/* 801E5C20 001E2B80 4E 80 04 21 */ bctrl +/* 801E5C20 001E2B80 4E 80 04 21 */ bctrl lbl_801E5C24: /* 801E5C24 001E2B84 88 61 00 1C */ lbz r3, 0x1c(r1) /* 801E5C28 001E2B88 38 00 00 00 */ li r0, 0 @@ -2591,7 +2591,7 @@ lbl_801E5C3C: /* 801E5C58 001E2BB8 38 80 00 01 */ li r4, 1 /* 801E5C5C 001E2BBC 81 8C 00 08 */ lwz r12, 8(r12) /* 801E5C60 001E2BC0 7D 89 03 A6 */ mtctr r12 -/* 801E5C64 001E2BC4 4E 80 04 21 */ bctrl +/* 801E5C64 001E2BC4 4E 80 04 21 */ bctrl lbl_801E5C68: /* 801E5C68 001E2BC8 C0 02 AD 94 */ lfs f0, lbl_805ACAB4@sda21(r2) /* 801E5C6C 001E2BCC D0 1B 00 6C */ stfs f0, 0x6c(r27) @@ -2642,7 +2642,7 @@ lbl_801E5CFC: /* 801E5D0C 001E2C6C 7C 79 1B 78 */ mr r25, r3 /* 801E5D10 001E2C70 81 8C 00 58 */ lwz r12, 0x58(r12) /* 801E5D14 001E2C74 7D 89 03 A6 */ mtctr r12 -/* 801E5D18 001E2C78 4E 80 04 21 */ bctrl +/* 801E5D18 001E2C78 4E 80 04 21 */ bctrl /* 801E5D1C 001E2C7C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801E5D20 001E2C80 41 82 00 90 */ beq lbl_801E5DB0 /* 801E5D24 001E2C84 38 01 00 14 */ addi r0, r1, 0x14 @@ -2661,7 +2661,7 @@ lbl_801E5CFC: /* 801E5D58 001E2CB8 38 80 00 01 */ li r4, 1 /* 801E5D5C 001E2CBC 81 8C 00 08 */ lwz r12, 8(r12) /* 801E5D60 001E2CC0 7D 89 03 A6 */ mtctr r12 -/* 801E5D64 001E2CC4 4E 80 04 21 */ bctrl +/* 801E5D64 001E2CC4 4E 80 04 21 */ bctrl lbl_801E5D68: /* 801E5D68 001E2CC8 88 61 00 14 */ lbz r3, 0x14(r1) /* 801E5D6C 001E2CCC 38 00 00 00 */ li r0, 0 @@ -2680,7 +2680,7 @@ lbl_801E5D80: /* 801E5D9C 001E2CFC 38 80 00 01 */ li r4, 1 /* 801E5DA0 001E2D00 81 8C 00 08 */ lwz r12, 8(r12) /* 801E5DA4 001E2D04 7D 89 03 A6 */ mtctr r12 -/* 801E5DA8 001E2D08 4E 80 04 21 */ bctrl +/* 801E5DA8 001E2D08 4E 80 04 21 */ bctrl /* 801E5DAC 001E2D0C 48 00 00 38 */ b lbl_801E5DE4 lbl_801E5DB0: /* 801E5DB0 001E2D10 28 1C 00 00 */ cmplwi r28, 0 @@ -2694,7 +2694,7 @@ lbl_801E5DC4: /* 801E5DCC 001E2D2C 81 99 00 00 */ lwz r12, 0(r25) /* 801E5DD0 001E2D30 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801E5DD4 001E2D34 7D 89 03 A6 */ mtctr r12 -/* 801E5DD8 001E2D38 4E 80 04 21 */ bctrl +/* 801E5DD8 001E2D38 4E 80 04 21 */ bctrl /* 801E5DDC 001E2D3C 3B C0 00 01 */ li r30, 1 /* 801E5DE0 001E2D40 3B E0 00 01 */ li r31, 1 lbl_801E5DE4: @@ -2747,7 +2747,7 @@ lbl_801E5E78: /* 801E5E88 001E2DE8 80 01 00 74 */ lwz r0, 0x74(r1) /* 801E5E8C 001E2DEC 7C 08 03 A6 */ mtlr r0 /* 801E5E90 001E2DF0 38 21 00 70 */ addi r1, r1, 0x70 -/* 801E5E94 001E2DF4 4E 80 00 20 */ blr +/* 801E5E94 001E2DF4 4E 80 00 20 */ blr .global sub_801e5e98 sub_801e5e98: @@ -2766,7 +2766,7 @@ lbl_801E5EBC: /* 801E5EC4 001E2E24 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801E5EC8 001E2E28 7C 08 03 A6 */ mtlr r0 /* 801E5ECC 001E2E2C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801E5ED0 001E2E30 4E 80 00 20 */ blr +/* 801E5ED0 001E2E30 4E 80 00 20 */ blr .global UpdateAshGen__Q220CActorModelParticles5CItemFfR6CActorR13CStateManager UpdateAshGen__Q220CActorModelParticles5CItemFfR6CActorR13CStateManager: @@ -2792,7 +2792,7 @@ UpdateAshGen__Q220CActorModelParticles5CItemFfR6CActorR13CStateManager: /* 801E5F20 001E2E80 81 83 00 00 */ lwz r12, 0(r3) /* 801E5F24 001E2E84 81 8C 00 58 */ lwz r12, 0x58(r12) /* 801E5F28 001E2E88 7D 89 03 A6 */ mtctr r12 -/* 801E5F2C 001E2E8C 4E 80 04 21 */ bctrl +/* 801E5F2C 001E2E8C 4E 80 04 21 */ bctrl /* 801E5F30 001E2E90 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801E5F34 001E2E94 41 82 00 94 */ beq lbl_801E5FC8 /* 801E5F38 001E2E98 38 61 00 10 */ addi r3, r1, 0x10 @@ -2812,7 +2812,7 @@ UpdateAshGen__Q220CActorModelParticles5CItemFfR6CActorR13CStateManager: /* 801E5F70 001E2ED0 38 80 00 01 */ li r4, 1 /* 801E5F74 001E2ED4 81 8C 00 08 */ lwz r12, 8(r12) /* 801E5F78 001E2ED8 7D 89 03 A6 */ mtctr r12 -/* 801E5F7C 001E2EDC 4E 80 04 21 */ bctrl +/* 801E5F7C 001E2EDC 4E 80 04 21 */ bctrl lbl_801E5F80: /* 801E5F80 001E2EE0 88 61 00 10 */ lbz r3, 0x10(r1) /* 801E5F84 001E2EE4 38 00 00 00 */ li r0, 0 @@ -2831,7 +2831,7 @@ lbl_801E5F98: /* 801E5FB4 001E2F14 38 80 00 01 */ li r4, 1 /* 801E5FB8 001E2F18 81 8C 00 08 */ lwz r12, 8(r12) /* 801E5FBC 001E2F1C 7D 89 03 A6 */ mtctr r12 -/* 801E5FC0 001E2F20 4E 80 04 21 */ bctrl +/* 801E5FC0 001E2F20 4E 80 04 21 */ bctrl /* 801E5FC4 001E2F24 48 00 01 68 */ b lbl_801E612C lbl_801E5FC8: /* 801E5FC8 001E2F28 28 1D 00 00 */ cmplwi r29, 0 @@ -2845,7 +2845,7 @@ lbl_801E5FDC: /* 801E5FE4 001E2F44 81 83 00 00 */ lwz r12, 0(r3) /* 801E5FE8 001E2F48 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801E5FEC 001E2F4C 7D 89 03 A6 */ mtctr r12 -/* 801E5FF0 001E2F50 4E 80 04 21 */ bctrl +/* 801E5FF0 001E2F50 4E 80 04 21 */ bctrl /* 801E5FF4 001E2F54 38 60 00 01 */ li r3, 1 /* 801E5FF8 001E2F58 48 00 01 44 */ b lbl_801E613C lbl_801E5FFC: @@ -2879,7 +2879,7 @@ lbl_801E5FFC: /* 801E6068 001E2FC8 38 80 00 01 */ li r4, 1 /* 801E606C 001E2FCC 81 8C 00 08 */ lwz r12, 8(r12) /* 801E6070 001E2FD0 7D 89 03 A6 */ mtctr r12 -/* 801E6074 001E2FD4 4E 80 04 21 */ bctrl +/* 801E6074 001E2FD4 4E 80 04 21 */ bctrl lbl_801E6078: /* 801E6078 001E2FD8 88 61 00 08 */ lbz r3, 8(r1) /* 801E607C 001E2FDC 38 00 00 00 */ li r0, 0 @@ -2898,7 +2898,7 @@ lbl_801E6090: /* 801E60AC 001E300C 38 80 00 01 */ li r4, 1 /* 801E60B0 001E3010 81 8C 00 08 */ lwz r12, 8(r12) /* 801E60B4 001E3014 7D 89 03 A6 */ mtctr r12 -/* 801E60B8 001E3018 4E 80 04 21 */ bctrl +/* 801E60B8 001E3018 4E 80 04 21 */ bctrl lbl_801E60BC: /* 801E60BC 001E301C 38 00 00 00 */ li r0, 0 /* 801E60C0 001E3020 7F E3 FB 78 */ mr r3, r31 @@ -2946,7 +2946,7 @@ lbl_801E613C: /* 801E6154 001E30B4 83 81 00 20 */ lwz r28, 0x20(r1) /* 801E6158 001E30B8 7C 08 03 A6 */ mtlr r0 /* 801E615C 001E30BC 38 21 00 40 */ addi r1, r1, 0x40 -/* 801E6160 001E30C0 4E 80 00 20 */ blr +/* 801E6160 001E30C0 4E 80 00 20 */ blr .global UpdateIcePop__Q220CActorModelParticles5CItemFfR6CActor UpdateIcePop__Q220CActorModelParticles5CItemFfR6CActor: @@ -2966,7 +2966,7 @@ UpdateIcePop__Q220CActorModelParticles5CItemFfR6CActor: /* 801E6198 001E30F8 81 83 00 00 */ lwz r12, 0(r3) /* 801E619C 001E30FC 81 8C 00 58 */ lwz r12, 0x58(r12) /* 801E61A0 001E3100 7D 89 03 A6 */ mtctr r12 -/* 801E61A4 001E3104 4E 80 04 21 */ bctrl +/* 801E61A4 001E3104 4E 80 04 21 */ bctrl /* 801E61A8 001E3108 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801E61AC 001E310C 41 82 00 94 */ beq lbl_801E6240 /* 801E61B0 001E3110 38 61 00 10 */ addi r3, r1, 0x10 @@ -2986,7 +2986,7 @@ UpdateIcePop__Q220CActorModelParticles5CItemFfR6CActor: /* 801E61E8 001E3148 38 80 00 01 */ li r4, 1 /* 801E61EC 001E314C 81 8C 00 08 */ lwz r12, 8(r12) /* 801E61F0 001E3150 7D 89 03 A6 */ mtctr r12 -/* 801E61F4 001E3154 4E 80 04 21 */ bctrl +/* 801E61F4 001E3154 4E 80 04 21 */ bctrl lbl_801E61F8: /* 801E61F8 001E3158 88 61 00 10 */ lbz r3, 0x10(r1) /* 801E61FC 001E315C 38 00 00 00 */ li r0, 0 @@ -3005,7 +3005,7 @@ lbl_801E6210: /* 801E622C 001E318C 38 80 00 01 */ li r4, 1 /* 801E6230 001E3190 81 8C 00 08 */ lwz r12, 8(r12) /* 801E6234 001E3194 7D 89 03 A6 */ mtctr r12 -/* 801E6238 001E3198 4E 80 04 21 */ bctrl +/* 801E6238 001E3198 4E 80 04 21 */ bctrl /* 801E623C 001E319C 48 00 01 24 */ b lbl_801E6360 lbl_801E6240: /* 801E6240 001E31A0 80 7F 00 E8 */ lwz r3, 0xe8(r31) @@ -3013,7 +3013,7 @@ lbl_801E6240: /* 801E6248 001E31A8 81 83 00 00 */ lwz r12, 0(r3) /* 801E624C 001E31AC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801E6250 001E31B0 7D 89 03 A6 */ mtctr r12 -/* 801E6254 001E31B4 4E 80 04 21 */ bctrl +/* 801E6254 001E31B4 4E 80 04 21 */ bctrl /* 801E6258 001E31B8 38 60 00 01 */ li r3, 1 /* 801E625C 001E31BC 48 00 01 14 */ b lbl_801E6370 lbl_801E6260: @@ -3032,7 +3032,7 @@ lbl_801E6260: /* 801E6290 001E31F0 38 9D 00 34 */ addi r4, r29, 0x34 /* 801E6294 001E31F4 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 801E6298 001E31F8 7D 89 03 A6 */ mtctr r12 -/* 801E629C 001E31FC 4E 80 04 21 */ bctrl +/* 801E629C 001E31FC 4E 80 04 21 */ bctrl /* 801E62A0 001E3200 38 61 00 18 */ addi r3, r1, 0x18 /* 801E62A4 001E3204 38 9D 00 9C */ addi r4, r29, 0x9c /* 801E62A8 001E3208 48 15 13 65 */ bl GetCenterPoint__6CAABoxCFv @@ -3041,7 +3041,7 @@ lbl_801E6260: /* 801E62B4 001E3214 81 9E 00 00 */ lwz r12, 0(r30) /* 801E62B8 001E3218 81 8C 00 20 */ lwz r12, 0x20(r12) /* 801E62BC 001E321C 7D 89 03 A6 */ mtctr r12 -/* 801E62C0 001E3220 4E 80 04 21 */ bctrl +/* 801E62C0 001E3220 4E 80 04 21 */ bctrl /* 801E62C4 001E3224 7C 1E 00 D0 */ neg r0, r30 /* 801E62C8 001E3228 38 61 00 08 */ addi r3, r1, 8 /* 801E62CC 001E322C 7C 04 F3 78 */ or r4, r0, r30 @@ -3061,7 +3061,7 @@ lbl_801E6260: /* 801E6304 001E3264 38 80 00 01 */ li r4, 1 /* 801E6308 001E3268 81 8C 00 08 */ lwz r12, 8(r12) /* 801E630C 001E326C 7D 89 03 A6 */ mtctr r12 -/* 801E6310 001E3270 4E 80 04 21 */ bctrl +/* 801E6310 001E3270 4E 80 04 21 */ bctrl lbl_801E6314: /* 801E6314 001E3274 88 61 00 08 */ lbz r3, 8(r1) /* 801E6318 001E3278 38 00 00 00 */ li r0, 0 @@ -3080,7 +3080,7 @@ lbl_801E632C: /* 801E6348 001E32A8 38 80 00 01 */ li r4, 1 /* 801E634C 001E32AC 81 8C 00 08 */ lwz r12, 8(r12) /* 801E6350 001E32B0 7D 89 03 A6 */ mtctr r12 -/* 801E6354 001E32B4 4E 80 04 21 */ bctrl +/* 801E6354 001E32B4 4E 80 04 21 */ bctrl lbl_801E6358: /* 801E6358 001E32B8 38 60 00 01 */ li r3, 1 /* 801E635C 001E32BC 48 00 00 14 */ b lbl_801E6370 @@ -3097,7 +3097,7 @@ lbl_801E6370: /* 801E6380 001E32E0 83 A1 00 2C */ lwz r29, 0x2c(r1) /* 801E6384 001E32E4 7C 08 03 A6 */ mtlr r0 /* 801E6388 001E32E8 38 21 00 40 */ addi r1, r1, 0x40 -/* 801E638C 001E32EC 4E 80 00 20 */ blr +/* 801E638C 001E32EC 4E 80 00 20 */ blr .global UpdateFirePop__Q220CActorModelParticles5CItemFfR6CActor UpdateFirePop__Q220CActorModelParticles5CItemFfR6CActor: @@ -3117,7 +3117,7 @@ UpdateFirePop__Q220CActorModelParticles5CItemFfR6CActor: /* 801E63C4 001E3324 81 83 00 00 */ lwz r12, 0(r3) /* 801E63C8 001E3328 81 8C 00 58 */ lwz r12, 0x58(r12) /* 801E63CC 001E332C 7D 89 03 A6 */ mtctr r12 -/* 801E63D0 001E3330 4E 80 04 21 */ bctrl +/* 801E63D0 001E3330 4E 80 04 21 */ bctrl /* 801E63D4 001E3334 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801E63D8 001E3338 41 82 00 94 */ beq lbl_801E646C /* 801E63DC 001E333C 38 61 00 10 */ addi r3, r1, 0x10 @@ -3137,7 +3137,7 @@ UpdateFirePop__Q220CActorModelParticles5CItemFfR6CActor: /* 801E6414 001E3374 38 80 00 01 */ li r4, 1 /* 801E6418 001E3378 81 8C 00 08 */ lwz r12, 8(r12) /* 801E641C 001E337C 7D 89 03 A6 */ mtctr r12 -/* 801E6420 001E3380 4E 80 04 21 */ bctrl +/* 801E6420 001E3380 4E 80 04 21 */ bctrl lbl_801E6424: /* 801E6424 001E3384 88 61 00 10 */ lbz r3, 0x10(r1) /* 801E6428 001E3388 38 00 00 00 */ li r0, 0 @@ -3156,7 +3156,7 @@ lbl_801E643C: /* 801E6458 001E33B8 38 80 00 01 */ li r4, 1 /* 801E645C 001E33BC 81 8C 00 08 */ lwz r12, 8(r12) /* 801E6460 001E33C0 7D 89 03 A6 */ mtctr r12 -/* 801E6464 001E33C4 4E 80 04 21 */ bctrl +/* 801E6464 001E33C4 4E 80 04 21 */ bctrl /* 801E6468 001E33C8 48 00 01 24 */ b lbl_801E658C lbl_801E646C: /* 801E646C 001E33CC 80 7F 00 BC */ lwz r3, 0xbc(r31) @@ -3164,7 +3164,7 @@ lbl_801E646C: /* 801E6474 001E33D4 81 83 00 00 */ lwz r12, 0(r3) /* 801E6478 001E33D8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801E647C 001E33DC 7D 89 03 A6 */ mtctr r12 -/* 801E6480 001E33E0 4E 80 04 21 */ bctrl +/* 801E6480 001E33E0 4E 80 04 21 */ bctrl /* 801E6484 001E33E4 38 60 00 01 */ li r3, 1 /* 801E6488 001E33E8 48 00 01 14 */ b lbl_801E659C lbl_801E648C: @@ -3183,7 +3183,7 @@ lbl_801E648C: /* 801E64BC 001E341C 38 9D 00 34 */ addi r4, r29, 0x34 /* 801E64C0 001E3420 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 801E64C4 001E3424 7D 89 03 A6 */ mtctr r12 -/* 801E64C8 001E3428 4E 80 04 21 */ bctrl +/* 801E64C8 001E3428 4E 80 04 21 */ bctrl /* 801E64CC 001E342C 38 61 00 18 */ addi r3, r1, 0x18 /* 801E64D0 001E3430 38 9D 00 9C */ addi r4, r29, 0x9c /* 801E64D4 001E3434 48 15 11 39 */ bl GetCenterPoint__6CAABoxCFv @@ -3192,7 +3192,7 @@ lbl_801E648C: /* 801E64E0 001E3440 81 9E 00 00 */ lwz r12, 0(r30) /* 801E64E4 001E3444 81 8C 00 20 */ lwz r12, 0x20(r12) /* 801E64E8 001E3448 7D 89 03 A6 */ mtctr r12 -/* 801E64EC 001E344C 4E 80 04 21 */ bctrl +/* 801E64EC 001E344C 4E 80 04 21 */ bctrl /* 801E64F0 001E3450 7C 1E 00 D0 */ neg r0, r30 /* 801E64F4 001E3454 38 61 00 08 */ addi r3, r1, 8 /* 801E64F8 001E3458 7C 04 F3 78 */ or r4, r0, r30 @@ -3212,7 +3212,7 @@ lbl_801E648C: /* 801E6530 001E3490 38 80 00 01 */ li r4, 1 /* 801E6534 001E3494 81 8C 00 08 */ lwz r12, 8(r12) /* 801E6538 001E3498 7D 89 03 A6 */ mtctr r12 -/* 801E653C 001E349C 4E 80 04 21 */ bctrl +/* 801E653C 001E349C 4E 80 04 21 */ bctrl lbl_801E6540: /* 801E6540 001E34A0 88 61 00 08 */ lbz r3, 8(r1) /* 801E6544 001E34A4 38 00 00 00 */ li r0, 0 @@ -3231,7 +3231,7 @@ lbl_801E6558: /* 801E6574 001E34D4 38 80 00 01 */ li r4, 1 /* 801E6578 001E34D8 81 8C 00 08 */ lwz r12, 8(r12) /* 801E657C 001E34DC 7D 89 03 A6 */ mtctr r12 -/* 801E6580 001E34E0 4E 80 04 21 */ bctrl +/* 801E6580 001E34E0 4E 80 04 21 */ bctrl lbl_801E6584: /* 801E6584 001E34E4 38 60 00 01 */ li r3, 1 /* 801E6588 001E34E8 48 00 00 14 */ b lbl_801E659C @@ -3248,7 +3248,7 @@ lbl_801E659C: /* 801E65AC 001E350C 83 A1 00 2C */ lwz r29, 0x2c(r1) /* 801E65B0 001E3510 7C 08 03 A6 */ mtlr r0 /* 801E65B4 001E3514 38 21 00 40 */ addi r1, r1, 0x40 -/* 801E65B8 001E3518 4E 80 00 20 */ blr +/* 801E65B8 001E3518 4E 80 00 20 */ blr .global sub_801e65bc sub_801e65bc: @@ -3278,7 +3278,7 @@ lbl_801E6608: /* 801E6610 001E3570 81 9E 00 00 */ lwz r12, 0(r30) /* 801E6614 001E3574 81 8C 00 58 */ lwz r12, 0x58(r12) /* 801E6618 001E3578 7D 89 03 A6 */ mtctr r12 -/* 801E661C 001E357C 4E 80 04 21 */ bctrl +/* 801E661C 001E357C 4E 80 04 21 */ bctrl /* 801E6620 001E3580 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801E6624 001E3584 40 82 00 08 */ bne lbl_801E662C /* 801E6628 001E3588 3B 80 00 01 */ li r28, 1 @@ -3288,7 +3288,7 @@ lbl_801E662C: /* 801E6634 001E3594 81 9E 00 00 */ lwz r12, 0(r30) /* 801E6638 001E3598 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801E663C 001E359C 7D 89 03 A6 */ mtctr r12 -/* 801E6640 001E35A0 4E 80 04 21 */ bctrl +/* 801E6640 001E35A0 4E 80 04 21 */ bctrl /* 801E6644 001E35A4 3B 7B 00 08 */ addi r27, r27, 8 lbl_801E6648: /* 801E6648 001E35A8 80 1F 00 8C */ lwz r0, 0x8c(r31) @@ -3313,7 +3313,7 @@ lbl_801E666C: /* 801E6690 001E35F0 38 80 00 01 */ li r4, 1 /* 801E6694 001E35F4 81 8C 00 08 */ lwz r12, 8(r12) /* 801E6698 001E35F8 7D 89 03 A6 */ mtctr r12 -/* 801E669C 001E35FC 4E 80 04 21 */ bctrl +/* 801E669C 001E35FC 4E 80 04 21 */ bctrl lbl_801E66A0: /* 801E66A0 001E3600 3B BD 00 08 */ addi r29, r29, 8 /* 801E66A4 001E3604 3B DE 00 01 */ addi r30, r30, 1 @@ -3356,7 +3356,7 @@ lbl_801E6718: /* 801E6720 001E3680 80 01 00 34 */ lwz r0, 0x34(r1) /* 801E6724 001E3684 7C 08 03 A6 */ mtlr r0 /* 801E6728 001E3688 38 21 00 30 */ addi r1, r1, 0x30 -/* 801E672C 001E368C 4E 80 00 20 */ blr +/* 801E672C 001E368C 4E 80 00 20 */ blr .global UpdateElectric__Q220CActorModelParticles5CItemFfR6CActorR13CStateManager UpdateElectric__Q220CActorModelParticles5CItemFfR6CActorR13CStateManager: @@ -3379,7 +3379,7 @@ UpdateElectric__Q220CActorModelParticles5CItemFfR6CActorR13CStateManager: /* 801E6770 001E36D0 81 83 00 00 */ lwz r12, 0(r3) /* 801E6774 001E36D4 81 8C 00 58 */ lwz r12, 0x58(r12) /* 801E6778 001E36D8 7D 89 03 A6 */ mtctr r12 -/* 801E677C 001E36DC 4E 80 04 21 */ bctrl +/* 801E677C 001E36DC 4E 80 04 21 */ bctrl /* 801E6780 001E36E0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801E6784 001E36E4 41 82 00 94 */ beq lbl_801E6818 /* 801E6788 001E36E8 38 61 00 10 */ addi r3, r1, 0x10 @@ -3399,7 +3399,7 @@ UpdateElectric__Q220CActorModelParticles5CItemFfR6CActorR13CStateManager: /* 801E67C0 001E3720 38 80 00 01 */ li r4, 1 /* 801E67C4 001E3724 81 8C 00 08 */ lwz r12, 8(r12) /* 801E67C8 001E3728 7D 89 03 A6 */ mtctr r12 -/* 801E67CC 001E372C 4E 80 04 21 */ bctrl +/* 801E67CC 001E372C 4E 80 04 21 */ bctrl lbl_801E67D0: /* 801E67D0 001E3730 88 61 00 10 */ lbz r3, 0x10(r1) /* 801E67D4 001E3734 38 00 00 00 */ li r0, 0 @@ -3418,7 +3418,7 @@ lbl_801E67E8: /* 801E6804 001E3764 38 80 00 01 */ li r4, 1 /* 801E6808 001E3768 81 8C 00 08 */ lwz r12, 8(r12) /* 801E680C 001E376C 7D 89 03 A6 */ mtctr r12 -/* 801E6810 001E3770 4E 80 04 21 */ bctrl +/* 801E6810 001E3770 4E 80 04 21 */ bctrl /* 801E6814 001E3774 48 00 01 A4 */ b lbl_801E69B8 lbl_801E6818: /* 801E6818 001E3778 28 1C 00 00 */ cmplwi r28, 0 @@ -3435,7 +3435,7 @@ lbl_801E6818: /* 801E6844 001E37A4 81 9D 00 00 */ lwz r12, 0(r29) /* 801E6848 001E37A8 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 801E684C 001E37AC 7D 89 03 A6 */ mtctr r12 -/* 801E6850 001E37B0 4E 80 04 21 */ bctrl +/* 801E6850 001E37B0 4E 80 04 21 */ bctrl /* 801E6854 001E37B4 C0 5C 00 60 */ lfs f2, 0x60(r28) /* 801E6858 001E37B8 38 81 00 18 */ addi r4, r1, 0x18 /* 801E685C 001E37BC C0 3C 00 50 */ lfs f1, 0x50(r28) @@ -3447,7 +3447,7 @@ lbl_801E6818: /* 801E6874 001E37D4 81 83 00 00 */ lwz r12, 0(r3) /* 801E6878 001E37D8 81 8C 00 20 */ lwz r12, 0x20(r12) /* 801E687C 001E37DC 7D 89 03 A6 */ mtctr r12 -/* 801E6880 001E37E0 4E 80 04 21 */ bctrl +/* 801E6880 001E37E0 4E 80 04 21 */ bctrl lbl_801E6884: /* 801E6884 001E37E4 28 1C 00 00 */ cmplwi r28, 0 /* 801E6888 001E37E8 41 82 00 10 */ beq lbl_801E6898 @@ -3460,13 +3460,13 @@ lbl_801E6898: /* 801E68A0 001E3800 81 83 00 00 */ lwz r12, 0(r3) /* 801E68A4 001E3804 81 8C 00 30 */ lwz r12, 0x30(r12) /* 801E68A8 001E3808 7D 89 03 A6 */ mtctr r12 -/* 801E68AC 001E380C 4E 80 04 21 */ bctrl +/* 801E68AC 001E380C 4E 80 04 21 */ bctrl /* 801E68B0 001E3810 80 7E 00 C4 */ lwz r3, 0xc4(r30) /* 801E68B4 001E3814 FC 20 F8 90 */ fmr f1, f31 /* 801E68B8 001E3818 81 83 00 00 */ lwz r12, 0(r3) /* 801E68BC 001E381C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801E68C0 001E3820 7D 89 03 A6 */ mtctr r12 -/* 801E68C4 001E3824 4E 80 04 21 */ bctrl +/* 801E68C4 001E3824 4E 80 04 21 */ bctrl /* 801E68C8 001E3828 38 60 00 01 */ li r3, 1 /* 801E68CC 001E382C 48 00 00 FC */ b lbl_801E69C8 lbl_801E68D0: @@ -3483,7 +3483,7 @@ lbl_801E68D0: /* 801E68F8 001E3858 38 9E 00 D0 */ addi r4, r30, 0xd0 /* 801E68FC 001E385C 81 8C 00 30 */ lwz r12, 0x30(r12) /* 801E6900 001E3860 7D 89 03 A6 */ mtctr r12 -/* 801E6904 001E3864 4E 80 04 21 */ bctrl +/* 801E6904 001E3864 4E 80 04 21 */ bctrl /* 801E6908 001E3868 7C 1D 00 D0 */ neg r0, r29 /* 801E690C 001E386C 38 61 00 08 */ addi r3, r1, 8 /* 801E6910 001E3870 7C 04 EB 78 */ or r4, r0, r29 @@ -3503,7 +3503,7 @@ lbl_801E68D0: /* 801E6948 001E38A8 38 80 00 01 */ li r4, 1 /* 801E694C 001E38AC 81 8C 00 08 */ lwz r12, 8(r12) /* 801E6950 001E38B0 7D 89 03 A6 */ mtctr r12 -/* 801E6954 001E38B4 4E 80 04 21 */ bctrl +/* 801E6954 001E38B4 4E 80 04 21 */ bctrl lbl_801E6958: /* 801E6958 001E38B8 88 61 00 08 */ lbz r3, 8(r1) /* 801E695C 001E38BC 38 00 00 00 */ li r0, 0 @@ -3522,7 +3522,7 @@ lbl_801E6970: /* 801E698C 001E38EC 38 80 00 01 */ li r4, 1 /* 801E6990 001E38F0 81 8C 00 08 */ lwz r12, 8(r12) /* 801E6994 001E38F4 7D 89 03 A6 */ mtctr r12 -/* 801E6998 001E38F8 4E 80 04 21 */ bctrl +/* 801E6998 001E38F8 4E 80 04 21 */ bctrl lbl_801E699C: /* 801E699C 001E38FC 38 00 00 00 */ li r0, 0 /* 801E69A0 001E3900 90 1E 00 C8 */ stw r0, 0xc8(r30) @@ -3547,7 +3547,7 @@ lbl_801E69C8: /* 801E69E0 001E3940 83 81 00 60 */ lwz r28, 0x60(r1) /* 801E69E4 001E3944 7C 08 03 A6 */ mtlr r0 /* 801E69E8 001E3948 38 21 00 80 */ addi r1, r1, 0x80 -/* 801E69EC 001E394C 4E 80 00 20 */ blr +/* 801E69EC 001E394C 4E 80 00 20 */ blr .global sub_801e69f0 sub_801e69f0: @@ -3582,7 +3582,7 @@ lbl_801E6A54: /* 801E6A54 001E39B4 80 01 00 14 */ lwz r0, 0x14(r1) /* 801E6A58 001E39B8 7C 08 03 A6 */ mtlr r0 /* 801E6A5C 001E39BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801E6A60 001E39C0 4E 80 00 20 */ blr +/* 801E6A60 001E39C0 4E 80 00 20 */ blr .global Update__Q220CActorModelParticles5CItemFfR13CStateManager Update__Q220CActorModelParticles5CItemFfR13CStateManager: @@ -3647,7 +3647,7 @@ lbl_801E6B18: /* 801E6B40 001E3AA0 38 80 00 00 */ li r4, 0 /* 801E6B44 001E3AA4 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 801E6B48 001E3AA8 7D 89 03 A6 */ mtctr r12 -/* 801E6B4C 001E3AAC 4E 80 04 21 */ bctrl +/* 801E6B4C 001E3AAC 4E 80 04 21 */ bctrl lbl_801E6B50: /* 801E6B50 001E3AB0 80 1C 00 74 */ lwz r0, 0x74(r28) /* 801E6B54 001E3AB4 28 00 00 00 */ cmplwi r0, 0 @@ -3751,7 +3751,7 @@ lbl_801E6C98: /* 801E6CB0 001E3C10 83 81 00 10 */ lwz r28, 0x10(r1) /* 801E6CB4 001E3C14 7C 08 03 A6 */ mtlr r0 /* 801E6CB8 001E3C18 38 21 00 30 */ addi r1, r1, 0x30 -/* 801E6CBC 001E3C1C 4E 80 00 20 */ blr +/* 801E6CBC 001E3C1C 4E 80 00 20 */ blr .global __dt__Q220CActorModelParticles5CItemFv __dt__Q220CActorModelParticles5CItemFv: @@ -3803,7 +3803,7 @@ lbl_801E6D40: /* 801E6D64 001E3CC4 38 80 00 01 */ li r4, 1 /* 801E6D68 001E3CC8 81 8C 00 08 */ lwz r12, 8(r12) /* 801E6D6C 001E3CCC 7D 89 03 A6 */ mtctr r12 -/* 801E6D70 001E3CD0 4E 80 04 21 */ bctrl +/* 801E6D70 001E3CD0 4E 80 04 21 */ bctrl lbl_801E6D74: /* 801E6D74 001E3CD4 38 7E 00 DC */ addi r3, r30, 0xdc /* 801E6D78 001E3CD8 38 80 FF FF */ li r4, -1 @@ -3823,7 +3823,7 @@ lbl_801E6D74: /* 801E6DB0 001E3D10 38 80 00 01 */ li r4, 1 /* 801E6DB4 001E3D14 81 8C 00 08 */ lwz r12, 8(r12) /* 801E6DB8 001E3D18 7D 89 03 A6 */ mtctr r12 -/* 801E6DBC 001E3D1C 4E 80 04 21 */ bctrl +/* 801E6DBC 001E3D1C 4E 80 04 21 */ bctrl lbl_801E6DC0: /* 801E6DC0 001E3D20 34 1E 00 B8 */ addic. r0, r30, 0xb8 /* 801E6DC4 001E3D24 41 82 00 30 */ beq lbl_801E6DF4 @@ -3837,7 +3837,7 @@ lbl_801E6DC0: /* 801E6DE4 001E3D44 38 80 00 01 */ li r4, 1 /* 801E6DE8 001E3D48 81 8C 00 08 */ lwz r12, 8(r12) /* 801E6DEC 001E3D4C 7D 89 03 A6 */ mtctr r12 -/* 801E6DF0 001E3D50 4E 80 04 21 */ bctrl +/* 801E6DF0 001E3D50 4E 80 04 21 */ bctrl lbl_801E6DF4: /* 801E6DF4 001E3D54 34 1E 00 8C */ addic. r0, r30, 0x8c /* 801E6DF8 001E3D58 41 82 00 60 */ beq lbl_801E6E58 @@ -3857,7 +3857,7 @@ lbl_801E6E08: /* 801E6E2C 001E3D8C 38 80 00 01 */ li r4, 1 /* 801E6E30 001E3D90 81 8C 00 08 */ lwz r12, 8(r12) /* 801E6E34 001E3D94 7D 89 03 A6 */ mtctr r12 -/* 801E6E38 001E3D98 4E 80 04 21 */ bctrl +/* 801E6E38 001E3D98 4E 80 04 21 */ bctrl lbl_801E6E3C: /* 801E6E3C 001E3D9C 3B 9C 00 08 */ addi r28, r28, 8 /* 801E6E40 001E3DA0 3B BD 00 01 */ addi r29, r29, 1 @@ -3880,7 +3880,7 @@ lbl_801E6E58: /* 801E6E7C 001E3DDC 38 80 00 01 */ li r4, 1 /* 801E6E80 001E3DE0 81 8C 00 08 */ lwz r12, 8(r12) /* 801E6E84 001E3DE4 7D 89 03 A6 */ mtctr r12 -/* 801E6E88 001E3DE8 4E 80 04 21 */ bctrl +/* 801E6E88 001E3DE8 4E 80 04 21 */ bctrl lbl_801E6E8C: /* 801E6E8C 001E3DEC 34 1E 00 08 */ addic. r0, r30, 8 /* 801E6E90 001E3DF0 41 82 00 64 */ beq lbl_801E6EF4 @@ -3901,7 +3901,7 @@ lbl_801E6EA0: /* 801E6EC8 001E3E28 38 80 00 01 */ li r4, 1 /* 801E6ECC 001E3E2C 81 8C 00 08 */ lwz r12, 8(r12) /* 801E6ED0 001E3E30 7D 89 03 A6 */ mtctr r12 -/* 801E6ED4 001E3E34 4E 80 04 21 */ bctrl +/* 801E6ED4 001E3E34 4E 80 04 21 */ bctrl lbl_801E6ED8: /* 801E6ED8 001E3E38 3B 9C 00 0C */ addi r28, r28, 0xc /* 801E6EDC 001E3E3C 3B BD 00 01 */ addi r29, r29, 1 @@ -3925,7 +3925,7 @@ lbl_801E6F04: /* 801E6F18 001E3E78 83 81 00 10 */ lwz r28, 0x10(r1) /* 801E6F1C 001E3E7C 7C 08 03 A6 */ mtlr r0 /* 801E6F20 001E3E80 38 21 00 20 */ addi r1, r1, 0x20 -/* 801E6F24 001E3E84 4E 80 00 20 */ blr +/* 801E6F24 001E3E84 4E 80 00 20 */ blr .global __ct__Q220CActorModelParticles5CItemFRC9TUniqueIdR20CActorModelParticles __ct__Q220CActorModelParticles5CItemFRC9TUniqueIdR20CActorModelParticles: @@ -4000,7 +4000,7 @@ lbl_801E6FFC: /* 801E7024 001E3F84 38 80 00 01 */ li r4, 1 /* 801E7028 001E3F88 81 8C 00 08 */ lwz r12, 8(r12) /* 801E702C 001E3F8C 7D 89 03 A6 */ mtctr r12 -/* 801E7030 001E3F90 4E 80 04 21 */ bctrl +/* 801E7030 001E3F90 4E 80 04 21 */ bctrl lbl_801E7034: /* 801E7034 001E3F94 88 01 00 08 */ lbz r0, 8(r1) /* 801E7038 001E3F98 28 00 00 00 */ cmplwi r0, 0 @@ -4012,7 +4012,7 @@ lbl_801E7034: /* 801E7050 001E3FB0 38 80 00 01 */ li r4, 1 /* 801E7054 001E3FB4 81 8C 00 08 */ lwz r12, 8(r12) /* 801E7058 001E3FB8 7D 89 03 A6 */ mtctr r12 -/* 801E705C 001E3FBC 4E 80 04 21 */ bctrl +/* 801E705C 001E3FBC 4E 80 04 21 */ bctrl lbl_801E7060: /* 801E7060 001E3FC0 C0 02 AD 80 */ lfs f0, lbl_805ACAA0@sda21(r2) /* 801E7064 001E3FC4 38 80 00 00 */ li r4, 0 @@ -4072,17 +4072,17 @@ lbl_801E7060: /* 801E713C 001E409C 80 01 00 34 */ lwz r0, 0x34(r1) /* 801E7140 001E40A0 7C 08 03 A6 */ mtlr r0 /* 801E7144 001E40A4 38 21 00 30 */ addi r1, r1, 0x30 -/* 801E7148 001E40A8 4E 80 00 20 */ blr +/* 801E7148 001E40A8 4E 80 00 20 */ blr .global UpdateLoad__Q220CActorModelParticles10DependencyFv UpdateLoad__Q220CActorModelParticles10DependencyFv: /* 801E714C 001E40AC 88 03 00 14 */ lbz r0, 0x14(r3) /* 801E7150 001E40B0 28 00 00 00 */ cmplwi r0, 0 -/* 801E7154 001E40B4 4C 82 00 20 */ bnelr +/* 801E7154 001E40B4 4C 82 00 20 */ bnelr /* 801E7158 001E40B8 80 03 00 10 */ lwz r0, 0x10(r3) /* 801E715C 001E40BC 2C 00 00 00 */ cmpwi r0, 0 /* 801E7160 001E40C0 40 82 00 08 */ bne lbl_801E7168 -/* 801E7164 001E40C4 4E 80 00 20 */ blr +/* 801E7164 001E40C4 4E 80 00 20 */ blr lbl_801E7168: /* 801E7168 001E40C8 80 03 00 04 */ lwz r0, 4(r3) /* 801E716C 001E40CC 38 E0 00 00 */ li r7, 0 @@ -4104,10 +4104,10 @@ lbl_801E719C: /* 801E71A0 001E4100 40 82 FF E0 */ bne lbl_801E7180 lbl_801E71A4: /* 801E71A4 001E4104 54 E0 06 3F */ clrlwi. r0, r7, 0x18 -/* 801E71A8 001E4108 4C 82 00 20 */ bnelr +/* 801E71A8 001E4108 4C 82 00 20 */ bnelr /* 801E71AC 001E410C 38 00 00 01 */ li r0, 1 /* 801E71B0 001E4110 98 03 00 14 */ stb r0, 0x14(r3) -/* 801E71B4 001E4114 4E 80 00 20 */ blr +/* 801E71B4 001E4114 4E 80 00 20 */ blr .global Unload__Q220CActorModelParticles10Dependency Unload__Q220CActorModelParticles10Dependency: @@ -4137,7 +4137,7 @@ lbl_801E71E4: /* 801E720C 001E416C 83 C1 00 08 */ lwz r30, 8(r1) /* 801E7210 001E4170 7C 08 03 A6 */ mtlr r0 /* 801E7214 001E4174 38 21 00 10 */ addi r1, r1, 0x10 -/* 801E7218 001E4178 4E 80 00 20 */ blr +/* 801E7218 001E4178 4E 80 00 20 */ blr .global Load__Q220CActorModelParticles10Dependency Load__Q220CActorModelParticles10Dependency: @@ -4183,7 +4183,7 @@ lbl_801E729C: /* 801E72A4 001E4204 83 C1 00 08 */ lwz r30, 8(r1) /* 801E72A8 001E4208 7C 08 03 A6 */ mtlr r0 /* 801E72AC 001E420C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801E72B0 001E4210 4E 80 00 20 */ blr +/* 801E72B0 001E4210 4E 80 00 20 */ blr .global Decrement__Q220CActorModelParticles10Dependency Decrement__Q220CActorModelParticles10Dependency: @@ -4201,7 +4201,7 @@ lbl_801E72DC: /* 801E72DC 001E423C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801E72E0 001E4240 7C 08 03 A6 */ mtlr r0 /* 801E72E4 001E4244 38 21 00 10 */ addi r1, r1, 0x10 -/* 801E72E8 001E4248 4E 80 00 20 */ blr +/* 801E72E8 001E4248 4E 80 00 20 */ blr .global Increment__Q220CActorModelParticles10Dependency Increment__Q220CActorModelParticles10Dependency: @@ -4219,7 +4219,7 @@ lbl_801E7314: /* 801E7314 001E4274 80 01 00 14 */ lwz r0, 0x14(r1) /* 801E7318 001E4278 7C 08 03 A6 */ mtlr r0 /* 801E731C 001E427C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801E7320 001E4280 4E 80 00 20 */ blr +/* 801E7320 001E4280 4E 80 00 20 */ blr .global GetParticleDGRPTokens__20CActorModelParticlesFRCQ24rstl6string GetParticleDGRPTokens__20CActorModelParticlesFRCQ24rstl6string: @@ -4242,7 +4242,7 @@ GetParticleDGRPTokens__20CActorModelParticlesFRCQ24rstl6string: /* 801E7364 001E42C4 81 84 00 00 */ lwz r12, 0(r4) /* 801E7368 001E42C8 81 8C 00 10 */ lwz r12, 0x10(r12) /* 801E736C 001E42CC 7D 89 03 A6 */ mtctr r12 -/* 801E7370 001E42D0 4E 80 04 21 */ bctrl +/* 801E7370 001E42D0 4E 80 04 21 */ bctrl /* 801E7374 001E42D4 3B A1 00 18 */ addi r29, r1, 0x18 /* 801E7378 001E42D8 38 81 00 10 */ addi r4, r1, 0x10 /* 801E737C 001E42DC 7F A3 EB 78 */ mr r3, r29 @@ -4267,7 +4267,7 @@ lbl_801E73B8: /* 801E73C4 001E4324 81 84 00 00 */ lwz r12, 0(r4) /* 801E73C8 001E4328 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801E73CC 001E432C 7D 89 03 A6 */ mtctr r12 -/* 801E73D0 001E4330 4E 80 04 21 */ bctrl +/* 801E73D0 001E4330 4E 80 04 21 */ bctrl /* 801E73D4 001E4334 80 1F 00 04 */ lwz r0, 4(r31) /* 801E73D8 001E4338 80 BF 00 08 */ lwz r5, 8(r31) /* 801E73DC 001E433C 7C 00 28 00 */ cmpw r0, r5 @@ -4312,7 +4312,7 @@ lbl_801E7434: /* 801E7468 001E43C8 83 A1 00 34 */ lwz r29, 0x34(r1) /* 801E746C 001E43CC 7C 08 03 A6 */ mtlr r0 /* 801E7470 001E43D0 38 21 00 40 */ addi r1, r1, 0x40 -/* 801E7474 001E43D4 4E 80 00 20 */ blr +/* 801E7474 001E43D4 4E 80 00 20 */ blr .global IsMediumOrLarge__FRCActor IsMediumOrLarge__FRCActor: @@ -4336,7 +4336,7 @@ lbl_801E74B4: /* 801E74B4 001E4414 80 01 00 14 */ lwz r0, 0x14(r1) /* 801E74B8 001E4418 7C 08 03 A6 */ mtlr r0 /* 801E74BC 001E441C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801E74C0 001E4420 4E 80 00 20 */ blr +/* 801E74C0 001E4420 4E 80 00 20 */ blr .global sub_801e74c4 sub_801e74c4: diff --git a/asm/MetroidPrime/CAnimData.s b/asm/MetroidPrime/CAnimData.s index 1048ec28..b821ef1d 100644 --- a/asm/MetroidPrime/CAnimData.s +++ b/asm/MetroidPrime/CAnimData.s @@ -106,7 +106,7 @@ GetEventResourceIdForAnimResourceId__9CAnimDataCFi: /* 800294A0 00026400 80 01 00 14 */ lwz r0, 0x14(r1) /* 800294A4 00026404 7C 08 03 A6 */ mtlr r0 /* 800294A8 00026408 38 21 00 10 */ addi r1, r1, 0x10 -/* 800294AC 0002640C 4E 80 00 20 */ blr +/* 800294AC 0002640C 4E 80 00 20 */ blr .global AddAdditiveSegData__9CAnimDataCFRC10CSegIdListR16CSegStatementSet AddAdditiveSegData__9CAnimDataCFRC10CSegIdListR16CSegStatementSet: @@ -154,7 +154,7 @@ lbl_8002952C: /* 80029548 000264A8 80 01 00 54 */ lwz r0, 0x54(r1) /* 8002954C 000264AC 7C 08 03 A6 */ mtlr r0 /* 80029550 000264B0 38 21 00 50 */ addi r1, r1, 0x50 -/* 80029554 000264B4 4E 80 00 20 */ blr +/* 80029554 000264B4 4E 80 00 20 */ blr .global AdvanceAdditiveAnims__9CAnimDataFf AdvanceAdditiveAnims__9CAnimDataFf: @@ -348,7 +348,7 @@ lbl_80029828: /* 80029834 00026794 81 84 00 00 */ lwz r12, 0(r4) /* 80029838 00026798 81 8C 00 14 */ lwz r12, 0x14(r12) /* 8002983C 0002679C 7D 89 03 A6 */ mtctr r12 -/* 80029840 000267A0 4E 80 04 21 */ bctrl +/* 80029840 000267A0 4E 80 04 21 */ bctrl /* 80029844 000267A4 C3 21 00 28 */ lfs f25, 0x28(r1) /* 80029848 000267A8 C3 42 83 D0 */ lfs f26, lbl_805AA0F0@sda21(r2) /* 8002984C 000267AC C3 62 83 D4 */ lfs f27, lbl_805AA0F4@sda21(r2) @@ -467,7 +467,7 @@ lbl_80029854: /* 80029A0C 0002696C 81 84 00 00 */ lwz r12, 0(r4) /* 80029A10 00026970 81 8C 00 14 */ lwz r12, 0x14(r12) /* 80029A14 00026974 7D 89 03 A6 */ mtctr r12 -/* 80029A18 00026978 4E 80 04 21 */ bctrl +/* 80029A18 00026978 4E 80 04 21 */ bctrl /* 80029A1C 0002697C C3 21 00 18 */ lfs f25, 0x18(r1) /* 80029A20 00026980 C0 01 00 38 */ lfs f0, 0x38(r1) /* 80029A24 00026984 D3 21 00 08 */ stfs f25, 8(r1) @@ -531,7 +531,7 @@ lbl_80029A88: /* 80029AF8 00026A58 80 01 02 04 */ lwz r0, 0x204(r1) /* 80029AFC 00026A5C 7C 08 03 A6 */ mtlr r0 /* 80029B00 00026A60 38 21 02 00 */ addi r1, r1, 0x200 -/* 80029B04 00026A64 4E 80 00 20 */ blr +/* 80029B04 00026A64 4E 80 00 20 */ blr .global UpdateAdditiveAnims__9CAnimDataFf UpdateAdditiveAnims__9CAnimDataFf: @@ -564,7 +564,7 @@ lbl_80029B50: /* 80029B6C 00026ACC 81 84 00 00 */ lwz r12, 0(r4) /* 80029B70 00026AD0 81 8C 00 14 */ lwz r12, 0x14(r12) /* 80029B74 00026AD4 7D 89 03 A6 */ mtctr r12 -/* 80029B78 00026AD8 4E 80 04 21 */ bctrl +/* 80029B78 00026AD8 4E 80 04 21 */ bctrl /* 80029B7C 00026ADC C0 01 00 08 */ lfs f0, 8(r1) /* 80029B80 00026AE0 EC 00 F0 28 */ fsubs f0, f0, f30 /* 80029B84 00026AE4 FC 00 02 10 */ fabs f0, f0 @@ -606,7 +606,7 @@ lbl_80029BC8: /* 80029C08 00026B68 80 01 00 64 */ lwz r0, 0x64(r1) /* 80029C0C 00026B6C 7C 08 03 A6 */ mtlr r0 /* 80029C10 00026B70 38 21 00 60 */ addi r1, r1, 0x60 -/* 80029C14 00026B74 4E 80 00 20 */ blr +/* 80029C14 00026B74 4E 80 00 20 */ blr .global sub_80029c18 sub_80029c18: @@ -696,7 +696,7 @@ lbl_80029D40: /* 80029D4C 00026CAC 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80029D50 00026CB0 7C 08 03 A6 */ mtlr r0 /* 80029D54 00026CB4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80029D58 00026CB8 4E 80 00 20 */ blr +/* 80029D58 00026CB8 4E 80 00 20 */ blr .global "AdvanceAdditiveAnim__9CAnimDataFR23rc_ptr<13CAnimTreeNode>RC13CCharAnimTime" "AdvanceAdditiveAnim__9CAnimDataFR23rc_ptr<13CAnimTreeNode>RC13CCharAnimTime": @@ -715,7 +715,7 @@ lbl_80029D40: /* 80029D8C 00026CEC 81 84 00 00 */ lwz r12, 0(r4) /* 80029D90 00026CF0 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80029D94 00026CF4 7D 89 03 A6 */ mtctr r12 -/* 80029D98 00026CF8 4E 80 04 21 */ bctrl +/* 80029D98 00026CF8 4E 80 04 21 */ bctrl /* 80029D9C 00026CFC 80 01 00 28 */ lwz r0, 0x28(r1) /* 80029DA0 00026D00 38 61 00 0C */ addi r3, r1, 0xc /* 80029DA4 00026D04 C0 C1 00 2C */ lfs f6, 0x2c(r1) @@ -765,7 +765,7 @@ lbl_80029E20: /* 80029E50 00026DB0 38 80 00 01 */ li r4, 1 /* 80029E54 00026DB4 81 8C 00 08 */ lwz r12, 8(r12) /* 80029E58 00026DB8 7D 89 03 A6 */ mtctr r12 -/* 80029E5C 00026DBC 4E 80 04 21 */ bctrl +/* 80029E5C 00026DBC 4E 80 04 21 */ bctrl lbl_80029E60: /* 80029E60 00026DC0 88 01 00 20 */ lbz r0, 0x20(r1) /* 80029E64 00026DC4 38 60 00 00 */ li r3, 0 @@ -823,7 +823,7 @@ lbl_80029EB8: /* 80029F2C 00026E8C 38 80 00 01 */ li r4, 1 /* 80029F30 00026E90 81 8C 00 08 */ lwz r12, 8(r12) /* 80029F34 00026E94 7D 89 03 A6 */ mtctr r12 -/* 80029F38 00026E98 4E 80 04 21 */ bctrl +/* 80029F38 00026E98 4E 80 04 21 */ bctrl lbl_80029F3C: /* 80029F3C 00026E9C 38 00 00 00 */ li r0, 0 /* 80029F40 00026EA0 98 01 00 20 */ stb r0, 0x20(r1) @@ -834,7 +834,7 @@ lbl_80029F3C: /* 80029F54 00026EB4 83 C1 00 78 */ lwz r30, 0x78(r1) /* 80029F58 00026EB8 7C 08 03 A6 */ mtlr r0 /* 80029F5C 00026EBC 38 21 00 90 */ addi r1, r1, 0x90 -/* 80029F60 00026EC0 4E 80 00 20 */ blr +/* 80029F60 00026EC0 4E 80 00 20 */ blr .global Simplified__11IAnimReaderFv Simplified__11IAnimReaderFv: @@ -846,12 +846,12 @@ Simplified__11IAnimReaderFv: /* 80029F78 00026ED8 81 84 00 00 */ lwz r12, 0(r4) /* 80029F7C 00026EDC 81 8C 00 50 */ lwz r12, 0x50(r12) /* 80029F80 00026EE0 7D 89 03 A6 */ mtctr r12 -/* 80029F84 00026EE4 4E 80 04 21 */ bctrl +/* 80029F84 00026EE4 4E 80 04 21 */ bctrl /* 80029F88 00026EE8 80 01 00 14 */ lwz r0, 0x14(r1) /* 80029F8C 00026EEC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80029F90 00026EF0 7C 08 03 A6 */ mtlr r0 /* 80029F94 00026EF4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80029F98 00026EF8 4E 80 00 20 */ blr +/* 80029F98 00026EF8 4E 80 00 20 */ blr .global IsAdditiveAnimation__9CAnimDataCFUi IsAdditiveAnimation__9CAnimDataCFUi: @@ -913,12 +913,12 @@ lbl_8002A048: /* 8002A070 00026FD0 80 01 00 44 */ lwz r0, 0x44(r1) /* 8002A074 00026FD4 7C 08 03 A6 */ mtlr r0 /* 8002A078 00026FD8 38 21 00 40 */ addi r1, r1, 0x40 -/* 8002A07C 00026FDC 4E 80 00 20 */ blr +/* 8002A07C 00026FDC 4E 80 00 20 */ blr .global GetRootAnimationTree__9CAnimDataCFv GetRootAnimationTree__9CAnimDataCFv: /* 8002A080 00026FE0 38 63 01 F8 */ addi r3, r3, 0x1f8 -/* 8002A084 00026FE4 4E 80 00 20 */ blr +/* 8002A084 00026FE4 4E 80 00 20 */ blr .global GetAdditiveAnimationTree__9CAnimDataCFUi GetAdditiveAnimationTree__9CAnimDataCFUi: @@ -940,7 +940,7 @@ lbl_8002A0B8: /* 8002A0BC 0002701C 40 82 FF EC */ bne lbl_8002A0A8 lbl_8002A0C0: /* 8002A0C0 00027020 38 66 00 0C */ addi r3, r6, 0xc -/* 8002A0C4 00027024 4E 80 00 20 */ blr +/* 8002A0C4 00027024 4E 80 00 20 */ blr .global IsAdditiveAnimationAdded__9CAnimDataCFUi IsAdditiveAnimationAdded__9CAnimDataCFUi: @@ -957,14 +957,14 @@ lbl_8002A0E8: /* 8002A0EC 0002704C 7C 04 00 40 */ cmplw r4, r0 /* 8002A0F0 00027050 40 82 00 0C */ bne lbl_8002A0FC /* 8002A0F4 00027054 38 60 00 01 */ li r3, 1 -/* 8002A0F8 00027058 4E 80 00 20 */ blr +/* 8002A0F8 00027058 4E 80 00 20 */ blr lbl_8002A0FC: /* 8002A0FC 0002705C 38 C6 00 28 */ addi r6, r6, 0x28 lbl_8002A100: /* 8002A100 00027060 7C 06 18 40 */ cmplw r6, r3 /* 8002A104 00027064 40 82 FF E4 */ bne lbl_8002A0E8 /* 8002A108 00027068 38 60 00 00 */ li r3, 0 -/* 8002A10C 0002706C 4E 80 00 20 */ blr +/* 8002A10C 0002706C 4E 80 00 20 */ blr .global GetAdditiveAnimationWeight__9CAnimDataFUi GetAdditiveAnimationWeight__9CAnimDataFUi: @@ -981,14 +981,14 @@ lbl_8002A130: /* 8002A134 00027094 7C 04 00 40 */ cmplw r4, r0 /* 8002A138 00027098 40 82 00 0C */ bne lbl_8002A144 /* 8002A13C 0002709C C0 26 00 10 */ lfs f1, 0x10(r6) -/* 8002A140 000270A0 4E 80 00 20 */ blr +/* 8002A140 000270A0 4E 80 00 20 */ blr lbl_8002A144: /* 8002A144 000270A4 38 C6 00 28 */ addi r6, r6, 0x28 lbl_8002A148: /* 8002A148 000270A8 7C 06 18 40 */ cmplw r6, r3 /* 8002A14C 000270AC 40 82 FF E4 */ bne lbl_8002A130 /* 8002A150 000270B0 C0 22 83 D0 */ lfs f1, lbl_805AA0F0@sda21(r2) -/* 8002A154 000270B4 4E 80 00 20 */ blr +/* 8002A154 000270B4 4E 80 00 20 */ blr .global DelAdditiveAnimation__9CAnimDataFUi DelAdditiveAnimation__9CAnimDataFUi: @@ -1025,7 +1025,7 @@ lbl_8002A1C0: /* 8002A1C0 00027120 80 01 00 14 */ lwz r0, 0x14(r1) /* 8002A1C4 00027124 7C 08 03 A6 */ mtlr r0 /* 8002A1C8 00027128 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002A1CC 0002712C 4E 80 00 20 */ blr +/* 8002A1CC 0002712C 4E 80 00 20 */ blr .global AddAdditiveAnimation__9CAnimDataFUifbb AddAdditiveAnimation__9CAnimDataFUifbb: @@ -1240,7 +1240,7 @@ lbl_8002A4D0: /* 8002A4DC 0002743C 80 01 01 54 */ lwz r0, 0x154(r1) /* 8002A4E0 00027440 7C 08 03 A6 */ mtlr r0 /* 8002A4E4 00027444 38 21 01 50 */ addi r1, r1, 0x150 -/* 8002A4E8 00027448 4E 80 00 20 */ blr +/* 8002A4E8 00027448 4E 80 00 20 */ blr .global GetAnimationManager__9CAnimDataFv GetAnimationManager__9CAnimDataFv: @@ -1250,7 +1250,7 @@ GetAnimationManager__9CAnimDataFv: /* 8002A4F8 00027458 80 64 00 04 */ lwz r3, 4(r4) /* 8002A4FC 0002745C 38 03 00 01 */ addi r0, r3, 1 /* 8002A500 00027460 90 04 00 04 */ stw r0, 4(r4) -/* 8002A504 00027464 4E 80 00 20 */ blr +/* 8002A504 00027464 4E 80 00 20 */ blr .global sub_8002a508 sub_8002a508: @@ -1262,11 +1262,11 @@ sub_8002a508: /* 8002A51C 0002747C 81 83 00 00 */ lwz r12, 0(r3) /* 8002A520 00027480 81 8C 00 54 */ lwz r12, 0x54(r12) /* 8002A524 00027484 7D 89 03 A6 */ mtctr r12 -/* 8002A528 00027488 4E 80 04 21 */ bctrl +/* 8002A528 00027488 4E 80 04 21 */ bctrl /* 8002A52C 0002748C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8002A530 00027490 7C 08 03 A6 */ mtlr r0 /* 8002A534 00027494 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002A538 00027498 4E 80 00 20 */ blr +/* 8002A538 00027498 4E 80 00 20 */ blr .global "SetParticleCEXTValue__CAnimDataFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>if" "SetParticleCEXTValue__CAnimDataFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>if": @@ -1316,7 +1316,7 @@ lbl_8002A5C8: /* 8002A5E4 00027544 83 A1 00 2C */ lwz r29, 0x2c(r1) /* 8002A5E8 00027548 7C 08 03 A6 */ mtlr r0 /* 8002A5EC 0002754C 38 21 00 40 */ addi r1, r1, 0x40 -/* 8002A5F0 00027550 4E 80 00 20 */ blr +/* 8002A5F0 00027550 4E 80 00 20 */ blr .global sub_8002a5f4 sub_8002a5f4: @@ -1345,7 +1345,7 @@ sub_8002a5f4: /* 8002A64C 000275AC 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8002A650 000275B0 7C 08 03 A6 */ mtlr r0 /* 8002A654 000275B4 38 21 00 30 */ addi r1, r1, 0x30 -/* 8002A658 000275B8 4E 80 00 20 */ blr +/* 8002A658 000275B8 4E 80 00 20 */ blr .global sub_8002a65c sub_8002a65c: @@ -1394,7 +1394,7 @@ lbl_8002A6EC: /* 8002A6F8 00027658 80 01 00 44 */ lwz r0, 0x44(r1) /* 8002A6FC 0002765C 7C 08 03 A6 */ mtlr r0 /* 8002A700 00027660 38 21 00 40 */ addi r1, r1, 0x40 -/* 8002A704 00027664 4E 80 00 20 */ blr +/* 8002A704 00027664 4E 80 00 20 */ blr .global sub_8002a708 sub_8002a708: @@ -1405,7 +1405,7 @@ sub_8002a708: /* 8002A718 00027678 80 01 00 14 */ lwz r0, 0x14(r1) /* 8002A71C 0002767C 7C 08 03 A6 */ mtlr r0 /* 8002A720 00027680 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002A724 00027684 4E 80 00 20 */ blr +/* 8002A724 00027684 4E 80 00 20 */ blr .global "__cl__Q24rstl140select1st,Q24rstl17rmemory_allocator>,Q24rstl28auto_ptr<16CParticleGenInfo>>>CFRCQ24rstl119pair,Q24rstl17rmemory_allocator>,Q24rstl28auto_ptr<16CParticleGenInfo>>" "__cl__Q24rstl140select1st,Q24rstl17rmemory_allocator>,Q24rstl28auto_ptr<16CParticleGenInfo>>>CFRCQ24rstl119pair,Q24rstl17rmemory_allocator>,Q24rstl28auto_ptr<16CParticleGenInfo>>": @@ -1418,7 +1418,7 @@ sub_8002a708: /* 8002A740 000276A0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8002A744 000276A4 7C 08 03 A6 */ mtlr r0 /* 8002A748 000276A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002A74C 000276AC 4E 80 00 20 */ blr +/* 8002A74C 000276AC 4E 80 00 20 */ blr .global sub_8002a750 sub_8002a750: @@ -1430,7 +1430,7 @@ sub_8002a750: /* 8002A764 000276C4 54 63 0F FE */ srwi r3, r3, 0x1f /* 8002A768 000276C8 7C 08 03 A6 */ mtlr r0 /* 8002A76C 000276CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002A770 000276D0 4E 80 00 20 */ blr +/* 8002A770 000276D0 4E 80 00 20 */ blr .global sub_8002a774 sub_8002a774: @@ -1464,7 +1464,7 @@ sub_8002a774: /* 8002A7E0 00027740 80 01 00 54 */ lwz r0, 0x54(r1) /* 8002A7E4 00027744 7C 08 03 A6 */ mtlr r0 /* 8002A7E8 00027748 38 21 00 50 */ addi r1, r1, 0x50 -/* 8002A7EC 0002774C 4E 80 00 20 */ blr +/* 8002A7EC 0002774C 4E 80 00 20 */ blr .global sub_8002a7f0 sub_8002a7f0: @@ -1482,7 +1482,7 @@ lbl_8002A808: /* 8002A818 00027778 7C A3 07 74 */ extsb r3, r5 /* 8002A81C 0002777C 7C 00 07 74 */ extsb r0, r0 /* 8002A820 00027780 7C 63 00 51 */ subf. r3, r3, r0 -/* 8002A824 00027784 4C 82 00 20 */ bnelr +/* 8002A824 00027784 4C 82 00 20 */ bnelr /* 8002A828 00027788 38 E7 00 01 */ addi r7, r7, 1 /* 8002A82C 0002778C 39 4A 00 01 */ addi r10, r10, 1 lbl_8002A830: @@ -1533,7 +1533,7 @@ lbl_8002A8C0: /* 8002A8C0 00027820 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8002A8C4 00027824 41 82 00 0C */ beq lbl_8002A8D0 /* 8002A8C8 00027828 38 60 FF FF */ li r3, -1 -/* 8002A8CC 0002782C 4E 80 00 20 */ blr +/* 8002A8CC 0002782C 4E 80 00 20 */ blr lbl_8002A8D0: /* 8002A8D0 00027830 7C 08 58 40 */ cmplw r8, r11 /* 8002A8D4 00027834 38 60 00 00 */ li r3, 0 @@ -1546,10 +1546,10 @@ lbl_8002A8EC: /* 8002A8EC 0002784C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8002A8F0 00027850 41 82 00 0C */ beq lbl_8002A8FC /* 8002A8F4 00027854 38 60 00 00 */ li r3, 0 -/* 8002A8F8 00027858 4E 80 00 20 */ blr +/* 8002A8F8 00027858 4E 80 00 20 */ blr lbl_8002A8FC: /* 8002A8FC 0002785C 38 60 00 01 */ li r3, 1 -/* 8002A900 00027860 4E 80 00 20 */ blr +/* 8002A900 00027860 4E 80 00 20 */ blr .global sub_8002a904 sub_8002a904: @@ -1589,7 +1589,7 @@ lbl_8002A974: /* 8002A980 000278E0 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8002A984 000278E4 7C 08 03 A6 */ mtlr r0 /* 8002A988 000278E8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8002A98C 000278EC 4E 80 00 20 */ blr +/* 8002A98C 000278EC 4E 80 00 20 */ blr .global sub_8002a990 sub_8002a990: @@ -1614,7 +1614,7 @@ lbl_8002A9BC: /* 8002A9D0 00027930 83 C1 00 08 */ lwz r30, 8(r1) /* 8002A9D4 00027934 7C 08 03 A6 */ mtlr r0 /* 8002A9D8 00027938 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002A9DC 0002793C 4E 80 00 20 */ blr +/* 8002A9DC 0002793C 4E 80 00 20 */ blr .global sub_8002a9e0 sub_8002a9e0: @@ -1626,7 +1626,7 @@ sub_8002a9e0: /* 8002A9F4 00027954 80 01 00 14 */ lwz r0, 0x14(r1) /* 8002A9F8 00027958 7C 08 03 A6 */ mtlr r0 /* 8002A9FC 0002795C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002AA00 00027960 4E 80 00 20 */ blr +/* 8002AA00 00027960 4E 80 00 20 */ blr .global sub_8002aa04 sub_8002aa04: @@ -1657,7 +1657,7 @@ lbl_8002AA50: /* 8002AA5C 000279BC 83 C1 00 08 */ lwz r30, 8(r1) /* 8002AA60 000279C0 7C 08 03 A6 */ mtlr r0 /* 8002AA64 000279C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002AA68 000279C8 4E 80 00 20 */ blr +/* 8002AA68 000279C8 4E 80 00 20 */ blr .global sub_8002aa6c sub_8002aa6c: @@ -1715,7 +1715,7 @@ lbl_8002AB0C: /* 8002AB20 00027A80 83 81 00 20 */ lwz r28, 0x20(r1) /* 8002AB24 00027A84 7C 08 03 A6 */ mtlr r0 /* 8002AB28 00027A88 38 21 00 30 */ addi r1, r1, 0x30 -/* 8002AB2C 00027A8C 4E 80 00 20 */ blr +/* 8002AB2C 00027A8C 4E 80 00 20 */ blr .global sub_8002ab30 sub_8002ab30: @@ -1764,7 +1764,7 @@ lbl_8002ABBC: /* 8002ABC8 00027B28 83 C1 00 08 */ lwz r30, 8(r1) /* 8002ABCC 00027B2C 7C 08 03 A6 */ mtlr r0 /* 8002ABD0 00027B30 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002ABD4 00027B34 4E 80 00 20 */ blr +/* 8002ABD4 00027B34 4E 80 00 20 */ blr .global sub_8002abd8 sub_8002abd8: @@ -1798,7 +1798,7 @@ lbl_8002AC20: /* 8002AC3C 00027B9C 83 81 00 10 */ lwz r28, 0x10(r1) /* 8002AC40 00027BA0 7C 08 03 A6 */ mtlr r0 /* 8002AC44 00027BA4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8002AC48 00027BA8 4E 80 00 20 */ blr +/* 8002AC48 00027BA8 4E 80 00 20 */ blr .global sub_8002ac4c sub_8002ac4c: @@ -1812,7 +1812,7 @@ lbl_8002AC64: /* 8002AC64 00027BC4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8002AC68 00027BC8 7C 08 03 A6 */ mtlr r0 /* 8002AC6C 00027BCC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002AC70 00027BD0 4E 80 00 20 */ blr +/* 8002AC70 00027BD0 4E 80 00 20 */ blr .global sub_8002ac74 sub_8002ac74: @@ -1833,7 +1833,7 @@ sub_8002ac74: /* 8002ACAC 00027C0C 83 C1 00 08 */ lwz r30, 8(r1) /* 8002ACB0 00027C10 7C 08 03 A6 */ mtlr r0 /* 8002ACB4 00027C14 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002ACB8 00027C18 4E 80 00 20 */ blr +/* 8002ACB8 00027C18 4E 80 00 20 */ blr .global sub_8002acbc sub_8002acbc: @@ -1908,7 +1908,7 @@ lbl_8002ADA8: /* 8002ADB0 00027D10 80 01 00 24 */ lwz r0, 0x24(r1) /* 8002ADB4 00027D14 7C 08 03 A6 */ mtlr r0 /* 8002ADB8 00027D18 38 21 00 20 */ addi r1, r1, 0x20 -/* 8002ADBC 00027D1C 4E 80 00 20 */ blr +/* 8002ADBC 00027D1C 4E 80 00 20 */ blr .global SetParticleEffectState__9CAnimDataFQ24rstl6stringbR13CStateManager SetParticleEffectState__9CAnimDataFQ24rstl6stringbR13CStateManager: @@ -1957,7 +1957,7 @@ lbl_8002AE4C: /* 8002AE5C 00027DBC 80 01 00 44 */ lwz r0, 0x44(r1) /* 8002AE60 00027DC0 7C 08 03 A6 */ mtlr r0 /* 8002AE64 00027DC4 38 21 00 40 */ addi r1, r1, 0x40 -/* 8002AE68 00027DC8 4E 80 00 20 */ blr +/* 8002AE68 00027DC8 4E 80 00 20 */ blr .global InitializeEffects__9CAnimDataFR13CStateManager7TAreaIdRC9CVector3f InitializeEffects__9CAnimDataFR13CStateManager7TAreaIdRC9CVector3f: @@ -2046,7 +2046,7 @@ lbl_8002AF8C: /* 8002AFA0 00027F00 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 8002AFA4 00027F04 7C 08 03 A6 */ mtlr r0 /* 8002AFA8 00027F08 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8002AFAC 00027F0C 4E 80 00 20 */ blr +/* 8002AFAC 00027F0C 4E 80 00 20 */ blr .global Touch__9CAnimDataCFRC13CSkinnedModeli Touch__9CAnimDataCFRC13CSkinnedModeli: @@ -2059,7 +2059,7 @@ Touch__9CAnimDataCFRC13CSkinnedModeli: /* 8002AFC8 00027F28 80 01 00 14 */ lwz r0, 0x14(r1) /* 8002AFCC 00027F2C 7C 08 03 A6 */ mtlr r0 /* 8002AFD0 00027F30 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002AFD4 00027F34 4E 80 00 20 */ blr +/* 8002AFD4 00027F34 4E 80 00 20 */ blr .global GetTimeOfUserEvent__9CAnimDataCF14EUserEventTypeRC13CCharAnimTime GetTimeOfUserEvent__9CAnimDataCF14EUserEventTypeRC13CCharAnimTime: @@ -2274,7 +2274,7 @@ lbl_8002B2E4: /* 8002B2F0 00028250 80 01 01 44 */ lwz r0, 0x144(r1) /* 8002B2F4 00028254 7C 08 03 A6 */ mtlr r0 /* 8002B2F8 00028258 38 21 01 40 */ addi r1, r1, 0x140 -/* 8002B2FC 0002825C 4E 80 00 20 */ blr +/* 8002B2FC 0002825C 4E 80 00 20 */ blr .global __dt__13CInt32POINodeFv __dt__13CInt32POINodeFv: @@ -2315,7 +2315,7 @@ lbl_8002B370: /* 8002B37C 000282DC 83 C1 00 08 */ lwz r30, 8(r1) /* 8002B380 000282E0 7C 08 03 A6 */ mtlr r0 /* 8002B384 000282E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002B388 000282E8 4E 80 00 20 */ blr +/* 8002B388 000282E8 4E 80 00 20 */ blr .global "__ct__13CInt32POINodeFQ24rstl66basic_string,Q24rstl17rmemory_allocator>UsRC13CCharAnimTimeibfiiiRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" "__ct__13CInt32POINodeFQ24rstl66basic_string,Q24rstl17rmemory_allocator>UsRC13CCharAnimTimeibfiiiRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>": @@ -2343,7 +2343,7 @@ lbl_8002B370: /* 8002B3E0 00028340 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8002B3E4 00028344 7C 08 03 A6 */ mtlr r0 /* 8002B3E8 00028348 38 21 00 20 */ addi r1, r1, 0x20 -/* 8002B3EC 0002834C 4E 80 00 20 */ blr +/* 8002B3EC 0002834C 4E 80 00 20 */ blr .global __dt__8CPOINodeFv __dt__8CPOINodeFv: @@ -2374,19 +2374,19 @@ lbl_8002B43C: /* 8002B448 000283A8 83 C1 00 08 */ lwz r30, 8(r1) /* 8002B44C 000283AC 7C 08 03 A6 */ mtlr r0 /* 8002B450 000283B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002B454 000283B4 4E 80 00 20 */ blr +/* 8002B454 000283B4 4E 80 00 20 */ blr .global MultiplyPlaybackRate__9CAnimDataFf MultiplyPlaybackRate__9CAnimDataFf: /* 8002B458 000283B8 C0 03 02 00 */ lfs f0, 0x200(r3) /* 8002B45C 000283BC EC 00 00 72 */ fmuls f0, f0, f1 /* 8002B460 000283C0 D0 03 02 00 */ stfs f0, 0x200(r3) -/* 8002B464 000283C4 4E 80 00 20 */ blr +/* 8002B464 000283C4 4E 80 00 20 */ blr .global SetPlaybackRate__9CAnimDataFf SetPlaybackRate__9CAnimDataFf: /* 8002B468 000283C8 D0 23 02 00 */ stfs f1, 0x200(r3) -/* 8002B46C 000283CC 4E 80 00 20 */ blr +/* 8002B46C 000283CC 4E 80 00 20 */ blr .global SetRandomPlaybackRate__9CAnimDataFR9CRandom16 SetRandomPlaybackRate__9CAnimDataFR9CRandom16: @@ -2459,7 +2459,7 @@ lbl_8002B554: /* 8002B568 000284C8 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8002B56C 000284CC 7C 08 03 A6 */ mtlr r0 /* 8002B570 000284D0 38 21 00 30 */ addi r1, r1, 0x30 -/* 8002B574 000284D4 4E 80 00 20 */ blr +/* 8002B574 000284D4 4E 80 00 20 */ blr .global "CalcPlaybackAlignmentParms__9CAnimDataFRC18CAnimPlaybackParmsRCQ24rstl25ncrc_ptr<13CAnimTreeNode>" "CalcPlaybackAlignmentParms__9CAnimDataFRC18CAnimPlaybackParmsRCQ24rstl25ncrc_ptr<13CAnimTreeNode>": @@ -2563,7 +2563,7 @@ lbl_8002B6B8: /* 8002B6F8 00028658 81 84 00 00 */ lwz r12, 0(r4) /* 8002B6FC 0002865C 81 8C 00 58 */ lwz r12, 0x58(r12) /* 8002B700 00028660 7D 89 03 A6 */ mtctr r12 -/* 8002B704 00028664 4E 80 04 21 */ bctrl +/* 8002B704 00028664 4E 80 04 21 */ bctrl /* 8002B708 00028668 80 01 03 00 */ lwz r0, 0x300(r1) /* 8002B70C 0002866C 7F 44 D3 78 */ mr r4, r26 /* 8002B710 00028670 C0 C1 03 04 */ lfs f6, 0x304(r1) @@ -2737,7 +2737,7 @@ lbl_8002B950: /* 8002B9A4 00028904 81 84 00 00 */ lwz r12, 0(r4) /* 8002B9A8 00028908 81 8C 00 58 */ lwz r12, 0x58(r12) /* 8002B9AC 0002890C 7D 89 03 A6 */ mtctr r12 -/* 8002B9B0 00028910 4E 80 04 21 */ bctrl +/* 8002B9B0 00028910 4E 80 04 21 */ bctrl /* 8002B9B4 00028914 88 1E 00 18 */ lbz r0, 0x18(r30) /* 8002B9B8 00028918 C3 21 02 98 */ lfs f25, 0x298(r1) /* 8002B9BC 0002891C C3 41 02 9C */ lfs f26, 0x29c(r1) @@ -2797,7 +2797,7 @@ lbl_8002BA4C: /* 8002BA8C 000289EC 81 84 00 00 */ lwz r12, 0(r4) /* 8002BA90 000289F0 81 8C 00 58 */ lwz r12, 0x58(r12) /* 8002BA94 000289F4 7D 89 03 A6 */ mtctr r12 -/* 8002BA98 000289F8 4E 80 04 21 */ bctrl +/* 8002BA98 000289F8 4E 80 04 21 */ bctrl /* 8002BA9C 000289FC 88 1E 00 18 */ lbz r0, 0x18(r30) /* 8002BAA0 00028A00 C3 A1 02 44 */ lfs f29, 0x244(r1) /* 8002BAA4 00028A04 C3 81 02 48 */ lfs f28, 0x248(r1) @@ -3066,7 +3066,7 @@ lbl_8002BE7C: /* 8002BE90 00028DF0 81 84 00 00 */ lwz r12, 0(r4) /* 8002BE94 00028DF4 81 8C 00 58 */ lwz r12, 0x58(r12) /* 8002BE98 00028DF8 7D 89 03 A6 */ mtctr r12 -/* 8002BE9C 00028DFC 4E 80 04 21 */ bctrl +/* 8002BE9C 00028DFC 4E 80 04 21 */ bctrl /* 8002BEA0 00028E00 C0 E1 01 B8 */ lfs f7, 0x1b8(r1) /* 8002BEA4 00028E04 38 61 01 94 */ addi r3, r1, 0x194 /* 8002BEA8 00028E08 80 01 01 BC */ lwz r0, 0x1bc(r1) @@ -3246,7 +3246,7 @@ lbl_8002C0F0: /* 8002C14C 000290AC 80 01 05 24 */ lwz r0, 0x524(r1) /* 8002C150 000290B0 7C 08 03 A6 */ mtlr r0 /* 8002C154 000290B4 38 21 05 20 */ addi r1, r1, 0x520 -/* 8002C158 000290B8 4E 80 00 20 */ blr +/* 8002C158 000290B8 4E 80 00 20 */ blr .global Inverse__9CMatrix3fCFv Inverse__9CMatrix3fCFv: @@ -3319,7 +3319,7 @@ Inverse__9CMatrix3fCFv: /* 8002C264 000291C4 83 C1 00 08 */ lwz r30, 8(r1) /* 8002C268 000291C8 7C 08 03 A6 */ mtlr r0 /* 8002C26C 000291CC 38 21 00 30 */ addi r1, r1, 0x30 -/* 8002C270 000291D0 4E 80 00 20 */ blr +/* 8002C270 000291D0 4E 80 00 20 */ blr .global GetLocatorTransform__9CAnimDataCF6CSegIdPC13CCharAnimTime GetLocatorTransform__9CAnimDataCF6CSegIdPC13CCharAnimTime: @@ -3393,7 +3393,7 @@ lbl_8002C354: /* 8002C370 000292D0 83 81 00 40 */ lwz r28, 0x40(r1) /* 8002C374 000292D4 7C 08 03 A6 */ mtlr r0 /* 8002C378 000292D8 38 21 00 50 */ addi r1, r1, 0x50 -/* 8002C37C 000292DC 4E 80 00 20 */ blr +/* 8002C37C 000292DC 4E 80 00 20 */ blr .global "GetLocatorTransform__9CAnimDataCFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>PC13CCharAnimTime" "GetLocatorTransform__9CAnimDataCFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>PC13CCharAnimTime": @@ -3423,7 +3423,7 @@ lbl_8002C354: /* 8002C3DC 0002933C 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8002C3E0 00029340 7C 08 03 A6 */ mtlr r0 /* 8002C3E4 00029344 38 21 00 30 */ addi r1, r1, 0x30 -/* 8002C3E8 00029348 4E 80 00 20 */ blr +/* 8002C3E8 00029348 4E 80 00 20 */ blr .global "IsAnimTimeRemaining__9CAnimDataCFfRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" "IsAnimTimeRemaining__9CAnimDataCFfRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>": @@ -3441,7 +3441,7 @@ lbl_8002C354: /* 8002C418 00029378 38 61 00 08 */ addi r3, r1, 8 /* 8002C41C 0002937C 81 8C 00 14 */ lwz r12, 0x14(r12) /* 8002C420 00029380 7D 89 03 A6 */ mtctr r12 -/* 8002C424 00029384 4E 80 04 21 */ bctrl +/* 8002C424 00029384 4E 80 04 21 */ bctrl /* 8002C428 00029388 C0 21 00 08 */ lfs f1, 8(r1) /* 8002C42C 0002938C C0 02 83 D0 */ lfs f0, lbl_805AA0F0@sda21(r2) /* 8002C430 00029390 EC 01 00 28 */ fsubs f0, f1, f0 @@ -3460,7 +3460,7 @@ lbl_8002C454: /* 8002C45C 000293BC CB E1 00 10 */ lfd f31, 0x10(r1) /* 8002C460 000293C0 7C 08 03 A6 */ mtlr r0 /* 8002C464 000293C4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8002C468 000293C8 4E 80 00 20 */ blr +/* 8002C468 000293C8 4E 80 00 20 */ blr .global "GetAnimTimeRemaining__9CAnimDataCFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" "GetAnimTimeRemaining__9CAnimDataCFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>": @@ -3475,7 +3475,7 @@ lbl_8002C454: /* 8002C48C 000293EC 81 84 00 00 */ lwz r12, 0(r4) /* 8002C490 000293F0 81 8C 00 14 */ lwz r12, 0x14(r12) /* 8002C494 000293F4 7D 89 03 A6 */ mtctr r12 -/* 8002C498 000293F8 4E 80 04 21 */ bctrl +/* 8002C498 000293F8 4E 80 04 21 */ bctrl /* 8002C49C 000293FC C0 5F 02 00 */ lfs f2, 0x200(r31) /* 8002C4A0 00029400 C0 02 83 D0 */ lfs f0, lbl_805AA0F0@sda21(r2) /* 8002C4A4 00029404 C0 21 00 08 */ lfs f1, 8(r1) @@ -3487,7 +3487,7 @@ lbl_8002C4B4: /* 8002C4B8 00029418 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8002C4BC 0002941C 7C 08 03 A6 */ mtlr r0 /* 8002C4C0 00029420 38 21 00 20 */ addi r1, r1, 0x20 -/* 8002C4C4 00029424 4E 80 00 20 */ blr +/* 8002C4C4 00029424 4E 80 00 20 */ blr .global GetAnimationDuration__9CAnimDataCFi GetAnimationDuration__9CAnimDataCFi: @@ -3534,7 +3534,7 @@ GetAnimationDuration__9CAnimDataCFi: /* 8002C568 000294C8 81 83 00 00 */ lwz r12, 0(r3) /* 8002C56C 000294CC 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8002C570 000294D0 7D 89 03 A6 */ mtctr r12 -/* 8002C574 000294D4 4E 80 04 21 */ bctrl +/* 8002C574 000294D4 4E 80 04 21 */ bctrl /* 8002C578 000294D8 83 C1 00 5C */ lwz r30, 0x5c(r1) /* 8002C57C 000294DC 3B E0 00 00 */ li r31, 0 /* 8002C580 000294E0 3C 60 41 4E */ lis r3, 0x414E494D@ha @@ -3561,7 +3561,7 @@ lbl_8002C5A4: /* 8002C5D0 00029530 81 84 00 00 */ lwz r12, 0(r4) /* 8002C5D4 00029534 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8002C5D8 00029538 7D 89 03 A6 */ mtctr r12 -/* 8002C5DC 0002953C 4E 80 04 21 */ bctrl +/* 8002C5DC 0002953C 4E 80 04 21 */ bctrl /* 8002C5E0 00029540 7F 63 DB 78 */ mr r3, r27 /* 8002C5E4 00029544 38 81 00 28 */ addi r4, r1, 0x28 /* 8002C5E8 00029548 48 31 48 C1 */ bl __ct__6CTokenFRC6CToken @@ -3631,7 +3631,7 @@ lbl_8002C6B8: /* 8002C6C8 00029628 81 83 00 00 */ lwz r12, 0(r3) /* 8002C6CC 0002962C 81 8C 00 14 */ lwz r12, 0x14(r12) /* 8002C6D0 00029630 7D 89 03 A6 */ mtctr r12 -/* 8002C6D4 00029634 4E 80 04 21 */ bctrl +/* 8002C6D4 00029634 4E 80 04 21 */ bctrl /* 8002C6D8 00029638 2C 03 00 03 */ cmpwi r3, 3 /* 8002C6DC 0002963C 40 82 00 28 */ bne lbl_8002C704 /* 8002C6E0 00029640 80 61 00 58 */ lwz r3, 0x58(r1) @@ -3664,7 +3664,7 @@ lbl_8002C718: /* 8002C744 000296A4 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 8002C748 000296A8 7C 08 03 A6 */ mtlr r0 /* 8002C74C 000296AC 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8002C750 000296B0 4E 80 00 20 */ blr +/* 8002C750 000296B0 4E 80 00 20 */ blr .global GetAnimSysContext__9CAnimDataCFv GetAnimSysContext__9CAnimDataCFv: @@ -3674,7 +3674,7 @@ GetAnimSysContext__9CAnimDataCFv: /* 8002C760 000296C0 80 64 00 04 */ lwz r3, 4(r4) /* 8002C764 000296C4 38 03 00 01 */ addi r0, r3, 1 /* 8002C768 000296C8 90 04 00 04 */ stw r0, 4(r4) -/* 8002C76C 000296CC 4E 80 00 20 */ blr +/* 8002C76C 000296CC 4E 80 00 20 */ blr .global GetAnimationManager__9CAnimDataCFv GetAnimationManager__9CAnimDataCFv: @@ -3684,7 +3684,7 @@ GetAnimationManager__9CAnimDataCFv: /* 8002C77C 000296DC 80 64 00 04 */ lwz r3, 4(r4) /* 8002C780 000296E0 38 03 00 01 */ addi r0, r3, 1 /* 8002C784 000296E4 90 04 00 04 */ stw r0, 4(r4) -/* 8002C788 000296E8 4E 80 00 20 */ blr +/* 8002C788 000296E8 4E 80 00 20 */ blr .global RecalcPoseBuilder__9CAnimDataCFPC13CCharAnimTime RecalcPoseBuilder__9CAnimDataCFPC13CCharAnimTime: @@ -3709,7 +3709,7 @@ RecalcPoseBuilder__9CAnimDataCFPC13CCharAnimTime: /* 8002C7D4 00029734 81 83 00 00 */ lwz r12, 0(r3) /* 8002C7D8 00029738 81 8C 00 44 */ lwz r12, 0x44(r12) /* 8002C7DC 0002973C 7D 89 03 A6 */ mtctr r12 -/* 8002C7E0 00029740 4E 80 04 21 */ bctrl +/* 8002C7E0 00029740 4E 80 04 21 */ bctrl /* 8002C7E4 00029744 48 00 00 28 */ b lbl_8002C80C lbl_8002C7E8: /* 8002C7E8 00029748 80 7E 01 F8 */ lwz r3, 0x1f8(r30) @@ -3720,7 +3720,7 @@ lbl_8002C7E8: /* 8002C7FC 0002975C 81 83 00 00 */ lwz r12, 0(r3) /* 8002C800 00029760 81 8C 00 48 */ lwz r12, 0x48(r12) /* 8002C804 00029764 7D 89 03 A6 */ mtctr r12 -/* 8002C808 00029768 4E 80 04 21 */ bctrl +/* 8002C808 00029768 4E 80 04 21 */ bctrl lbl_8002C80C: /* 8002C80C 0002976C 7F C3 F3 78 */ mr r3, r30 /* 8002C810 00029770 7F E4 FB 78 */ mr r4, r31 @@ -3783,7 +3783,7 @@ lbl_8002C8D0: /* 8002C8E8 00029848 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8002C8EC 0002984C 7C 08 03 A6 */ mtlr r0 /* 8002C8F0 00029850 38 21 00 30 */ addi r1, r1, 0x30 -/* 8002C8F4 00029854 4E 80 00 20 */ blr +/* 8002C8F4 00029854 4E 80 00 20 */ blr .global RenderAuxiliary__9CAnimDataCFRC14CFrustumPlanes RenderAuxiliary__9CAnimDataCFRC14CFrustumPlanes: @@ -3795,7 +3795,7 @@ RenderAuxiliary__9CAnimDataCFRC14CFrustumPlanes: /* 8002C90C 0002986C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8002C910 00029870 7C 08 03 A6 */ mtlr r0 /* 8002C914 00029874 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002C918 00029878 4E 80 00 20 */ blr +/* 8002C918 00029878 4E 80 00 20 */ blr .global "Render__9CAnimDataCFRC13CSkinnedModelRC11CModelFlagsRCQ24rstl37optional_object<18CVertexMorphEffect>PCf" "Render__9CAnimDataCFRC13CSkinnedModelRC11CModelFlagsRCQ24rstl37optional_object<18CVertexMorphEffect>PCf": @@ -3821,7 +3821,7 @@ RenderAuxiliary__9CAnimDataCFRC14CFrustumPlanes: /* 8002C968 000298C8 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8002C96C 000298CC 7C 08 03 A6 */ mtlr r0 /* 8002C970 000298D0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8002C974 000298D4 4E 80 00 20 */ blr +/* 8002C974 000298D4 4E 80 00 20 */ blr .global "SetupRender__9CAnimDataCFRC13CSkinnedModelRCQ24rstl37optional_object<18CVertexMorphEffect>PCf" "SetupRender__9CAnimDataCFRC13CSkinnedModelRCQ24rstl37optional_object<18CVertexMorphEffect>PCf": @@ -3860,7 +3860,7 @@ lbl_8002C9CC: /* 8002C9F4 00029954 83 81 00 10 */ lwz r28, 0x10(r1) /* 8002C9F8 00029958 7C 08 03 A6 */ mtlr r0 /* 8002C9FC 0002995C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8002CA00 00029960 4E 80 00 20 */ blr +/* 8002CA00 00029960 4E 80 00 20 */ blr .global PreRender__9CAnimDataFv PreRender__9CAnimDataFv: @@ -3887,7 +3887,7 @@ lbl_8002CA4C: /* 8002CA50 000299B0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8002CA54 000299B4 7C 08 03 A6 */ mtlr r0 /* 8002CA58 000299B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002CA5C 000299BC 4E 80 00 20 */ blr +/* 8002CA5C 000299BC 4E 80 00 20 */ blr .global BuildPose__9CAnimDataFv BuildPose__9CAnimDataFv: @@ -3925,7 +3925,7 @@ lbl_8002CAD0: /* 8002CAD4 00029A34 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8002CAD8 00029A38 7C 08 03 A6 */ mtlr r0 /* 8002CADC 00029A3C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002CAE0 00029A40 4E 80 00 20 */ blr +/* 8002CAE0 00029A40 4E 80 00 20 */ blr .global "PrimitiveSetToTokenVector__9CAnimDataFRCQ24rstl72set<10CPrimitive,Q24rstl18less<10CPrimitive>,Q24rstl17rmemory_allocator>RQ24rstl42vector<6CToken,Q24rstl17rmemory_allocator>b" "PrimitiveSetToTokenVector__9CAnimDataFRCQ24rstl72set<10CPrimitive,Q24rstl18less<10CPrimitive>,Q24rstl17rmemory_allocator>RQ24rstl42vector<6CToken,Q24rstl17rmemory_allocator>b": @@ -3983,7 +3983,7 @@ lbl_8002CB88: /* 8002CBA0 00029B00 81 84 00 00 */ lwz r12, 0(r4) /* 8002CBA4 00029B04 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8002CBA8 00029B08 7D 89 03 A6 */ mtctr r12 -/* 8002CBAC 00029B0C 4E 80 04 21 */ bctrl +/* 8002CBAC 00029B0C 4E 80 04 21 */ bctrl /* 8002CBB0 00029B10 38 61 00 28 */ addi r3, r1, 0x28 /* 8002CBB4 00029B14 38 81 00 18 */ addi r4, r1, 0x18 /* 8002CBB8 00029B18 48 31 42 F1 */ bl __ct__6CTokenFRC6CToken @@ -4040,7 +4040,7 @@ lbl_8002CC5C: /* 8002CC68 00029BC8 80 01 00 64 */ lwz r0, 0x64(r1) /* 8002CC6C 00029BCC 7C 08 03 A6 */ mtlr r0 /* 8002CC70 00029BD0 38 21 00 60 */ addi r1, r1, 0x60 -/* 8002CC74 00029BD4 4E 80 00 20 */ blr +/* 8002CC74 00029BD4 4E 80 00 20 */ blr .global "GetAnimationPrimitives__9CAnimDataCFRC18CAnimPlaybackParmsRQ24rstl72set<10CPrimitive,Q24rstl18less<10CPrimitive>,Q24rstl17rmemory_allocator>" "GetAnimationPrimitives__9CAnimDataCFRC18CAnimPlaybackParmsRQ24rstl72set<10CPrimitive,Q24rstl18less<10CPrimitive>,Q24rstl17rmemory_allocator>": @@ -4072,7 +4072,7 @@ lbl_8002CC5C: /* 8002CCDC 00029C3C 81 83 00 00 */ lwz r12, 0(r3) /* 8002CCE0 00029C40 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8002CCE4 00029C44 7D 89 03 A6 */ mtctr r12 -/* 8002CCE8 00029C48 4E 80 04 21 */ bctrl +/* 8002CCE8 00029C48 4E 80 04 21 */ bctrl /* 8002CCEC 00029C4C 38 61 00 10 */ addi r3, r1, 0x10 /* 8002CCF0 00029C50 48 00 42 41 */ bl sub_80030f30 /* 8002CCF4 00029C54 38 61 00 14 */ addi r3, r1, 0x14 @@ -4096,7 +4096,7 @@ lbl_8002CC5C: /* 8002CD3C 00029C9C 81 83 00 00 */ lwz r12, 0(r3) /* 8002CD40 00029CA0 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8002CD44 00029CA4 7D 89 03 A6 */ mtctr r12 -/* 8002CD48 00029CA8 4E 80 04 21 */ bctrl +/* 8002CD48 00029CA8 4E 80 04 21 */ bctrl /* 8002CD4C 00029CAC 38 61 00 08 */ addi r3, r1, 8 /* 8002CD50 00029CB0 48 00 41 E1 */ bl sub_80030f30 /* 8002CD54 00029CB4 38 61 00 0C */ addi r3, r1, 0xc @@ -4109,7 +4109,7 @@ lbl_8002CD5C: /* 8002CD6C 00029CCC 83 81 00 20 */ lwz r28, 0x20(r1) /* 8002CD70 00029CD0 7C 08 03 A6 */ mtlr r0 /* 8002CD74 00029CD4 38 21 00 30 */ addi r1, r1, 0x30 -/* 8002CD78 00029CD8 4E 80 00 20 */ blr +/* 8002CD78 00029CD8 4E 80 00 20 */ blr .global SetAnimation__9CAnimDataFRC18CAnimPlaybackParmsb SetAnimation__9CAnimDataFRC18CAnimPlaybackParmsb: @@ -4373,7 +4373,7 @@ lbl_8002D13C: /* 8002D148 0002A0A8 80 01 02 14 */ lwz r0, 0x214(r1) /* 8002D14C 0002A0AC 7C 08 03 A6 */ mtlr r0 /* 8002D150 0002A0B0 38 21 02 10 */ addi r1, r1, 0x210 -/* 8002D154 0002A0B4 4E 80 00 20 */ blr +/* 8002D154 0002A0B4 4E 80 00 20 */ blr .global DoAdvance__9CAnimDataFfRbR9CRandom16b DoAdvance__9CAnimDataFfRbR9CRandom16b: @@ -4584,7 +4584,7 @@ lbl_8002D464: /* 8002D470 0002A3D0 81 84 00 00 */ lwz r12, 0(r4) /* 8002D474 0002A3D4 81 8C 00 14 */ lwz r12, 0x14(r12) /* 8002D478 0002A3D8 7D 89 03 A6 */ mtctr r12 -/* 8002D47C 0002A3DC 4E 80 04 21 */ bctrl +/* 8002D47C 0002A3DC 4E 80 04 21 */ bctrl /* 8002D480 0002A3E0 3C C0 80 57 */ lis r6, lbl_8056BDF4@ha /* 8002D484 0002A3E4 3C A0 80 57 */ lis r5, lbl_8056A600@ha /* 8002D488 0002A3E8 3C 80 80 57 */ lis r4, lbl_8056C2B8@ha @@ -4659,7 +4659,7 @@ lbl_8002D4C8: /* 8002D598 0002A4F8 81 84 00 00 */ lwz r12, 0(r4) /* 8002D59C 0002A4FC 81 8C 00 14 */ lwz r12, 0x14(r12) /* 8002D5A0 0002A500 7D 89 03 A6 */ mtctr r12 -/* 8002D5A4 0002A504 4E 80 04 21 */ bctrl +/* 8002D5A4 0002A504 4E 80 04 21 */ bctrl /* 8002D5A8 0002A508 C3 41 00 18 */ lfs f26, 0x18(r1) /* 8002D5AC 0002A50C C0 01 00 28 */ lfs f0, 0x28(r1) /* 8002D5B0 0002A510 D3 41 00 08 */ stfs f26, 8(r1) @@ -4764,7 +4764,7 @@ lbl_8002D6E8: /* 8002D71C 0002A67C 80 01 01 34 */ lwz r0, 0x134(r1) /* 8002D720 0002A680 7C 08 03 A6 */ mtlr r0 /* 8002D724 0002A684 38 21 01 30 */ addi r1, r1, 0x130 -/* 8002D728 0002A688 4E 80 00 20 */ blr +/* 8002D728 0002A688 4E 80 00 20 */ blr .global Advance__9CAnimDataFfRC9CVector3fR13CStateManagerb Advance__9CAnimDataFfRC9CVector3fR13CStateManagerb: @@ -4868,7 +4868,7 @@ lbl_8002D83C: /* 8002D89C 0002A7FC 80 01 00 D4 */ lwz r0, 0xd4(r1) /* 8002D8A0 0002A800 7C 08 03 A6 */ mtlr r0 /* 8002D8A4 0002A804 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 8002D8A8 0002A808 4E 80 00 20 */ blr +/* 8002D8A8 0002A808 4E 80 00 20 */ blr .global AdvanceIgnoreParticles__9CAnimDataFfR9CRandom16b AdvanceIgnoreParticles__9CAnimDataFfR9CRandom16b: @@ -4887,7 +4887,7 @@ AdvanceIgnoreParticles__9CAnimDataFfR9CRandom16b: /* 8002D8DC 0002A83C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8002D8E0 0002A840 7C 08 03 A6 */ mtlr r0 /* 8002D8E4 0002A844 38 21 00 20 */ addi r1, r1, 0x20 -/* 8002D8E8 0002A848 4E 80 00 20 */ blr +/* 8002D8E8 0002A848 4E 80 00 20 */ blr .global AdvanceAnim__9CAnimDataFR13CCharAnimTimeR9CVector3fR11CQuaternion AdvanceAnim__9CAnimDataFR13CCharAnimTimeR9CVector3fR11CQuaternion: @@ -4953,7 +4953,7 @@ AdvanceAnim__9CAnimDataFR13CCharAnimTimeR9CVector3fR11CQuaternion: /* 8002D9D8 0002A938 81 84 00 00 */ lwz r12, 0(r4) /* 8002D9DC 0002A93C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8002D9E0 0002A940 7D 89 03 A6 */ mtctr r12 -/* 8002D9E4 0002A944 4E 80 04 21 */ bctrl +/* 8002D9E4 0002A944 4E 80 04 21 */ bctrl /* 8002D9E8 0002A948 81 81 00 94 */ lwz r12, 0x94(r1) /* 8002D9EC 0002A94C 38 61 00 50 */ addi r3, r1, 0x50 /* 8002D9F0 0002A950 81 61 00 98 */ lwz r11, 0x98(r1) @@ -5011,7 +5011,7 @@ lbl_8002DA94: /* 8002DAB8 0002AA18 38 80 00 01 */ li r4, 1 /* 8002DABC 0002AA1C 81 8C 00 08 */ lwz r12, 8(r12) /* 8002DAC0 0002AA20 7D 89 03 A6 */ mtctr r12 -/* 8002DAC4 0002AA24 4E 80 04 21 */ bctrl +/* 8002DAC4 0002AA24 4E 80 04 21 */ bctrl lbl_8002DAC8: /* 8002DAC8 0002AA28 88 81 00 50 */ lbz r4, 0x50(r1) /* 8002DACC 0002AA2C 38 00 00 00 */ li r0, 0 @@ -5036,7 +5036,7 @@ lbl_8002DAE4: /* 8002DB14 0002AA74 38 80 00 01 */ li r4, 1 /* 8002DB18 0002AA78 81 8C 00 08 */ lwz r12, 8(r12) /* 8002DB1C 0002AA7C 7D 89 03 A6 */ mtctr r12 -/* 8002DB20 0002AA80 4E 80 04 21 */ bctrl +/* 8002DB20 0002AA80 4E 80 04 21 */ bctrl lbl_8002DB24: /* 8002DB24 0002AA84 38 00 00 00 */ li r0, 0 /* 8002DB28 0002AA88 98 01 00 74 */ stb r0, 0x74(r1) @@ -5056,7 +5056,7 @@ lbl_8002DB2C: /* 8002DB5C 0002AABC 38 80 00 01 */ li r4, 1 /* 8002DB60 0002AAC0 81 8C 00 08 */ lwz r12, 8(r12) /* 8002DB64 0002AAC4 7D 89 03 A6 */ mtctr r12 -/* 8002DB68 0002AAC8 4E 80 04 21 */ bctrl +/* 8002DB68 0002AAC8 4E 80 04 21 */ bctrl lbl_8002DB6C: /* 8002DB6C 0002AACC 38 00 00 00 */ li r0, 0 /* 8002DB70 0002AAD0 98 01 00 58 */ stb r0, 0x58(r1) @@ -5260,7 +5260,7 @@ lbl_8002DD68: /* 8002DE58 0002ADB8 38 80 00 01 */ li r4, 1 /* 8002DE5C 0002ADBC 81 8C 00 08 */ lwz r12, 8(r12) /* 8002DE60 0002ADC0 7D 89 03 A6 */ mtctr r12 -/* 8002DE64 0002ADC4 4E 80 04 21 */ bctrl +/* 8002DE64 0002ADC4 4E 80 04 21 */ bctrl lbl_8002DE68: /* 8002DE68 0002ADC8 38 00 00 00 */ li r0, 0 /* 8002DE6C 0002ADCC 98 01 00 74 */ stb r0, 0x74(r1) @@ -5284,7 +5284,7 @@ lbl_8002DE68: /* 8002DEB4 0002AE14 80 01 01 84 */ lwz r0, 0x184(r1) /* 8002DEB8 0002AE18 7C 08 03 A6 */ mtlr r0 /* 8002DEBC 0002AE1C 38 21 01 80 */ addi r1, r1, 0x180 -/* 8002DEC0 0002AE20 4E 80 00 20 */ blr +/* 8002DEC0 0002AE20 4E 80 00 20 */ blr .global "SetXRayModel__9CAnimDataFRC21TLockedToken<6CModel>RC26TLockedToken<10CSkinRules>" "SetXRayModel__9CAnimDataFRC21TLockedToken<6CModel>RC26TLockedToken<10CSkinRules>": @@ -5349,7 +5349,7 @@ lbl_8002DF88: /* 8002DFA0 0002AF00 83 81 00 10 */ lwz r28, 0x10(r1) /* 8002DFA4 0002AF04 7C 08 03 A6 */ mtlr r0 /* 8002DFA8 0002AF08 38 21 00 20 */ addi r1, r1, 0x20 -/* 8002DFAC 0002AF0C 4E 80 00 20 */ blr +/* 8002DFAC 0002AF0C 4E 80 00 20 */ blr .global "SetInfraModel__9CAnimDataFRC21TLockedToken<6CModel>RC26TLockedToken<10CSkinRules>" "SetInfraModel__9CAnimDataFRC21TLockedToken<6CModel>RC26TLockedToken<10CSkinRules>": @@ -5414,7 +5414,7 @@ lbl_8002E074: /* 8002E08C 0002AFEC 83 81 00 10 */ lwz r28, 0x10(r1) /* 8002E090 0002AFF0 7C 08 03 A6 */ mtlr r0 /* 8002E094 0002AFF4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8002E098 0002AFF8 4E 80 00 20 */ blr +/* 8002E098 0002AFF8 4E 80 00 20 */ blr .global "SubstituteModelData__9CAnimDataFRC29TCachedToken<13CSkinnedModel>" "SubstituteModelData__9CAnimDataFRC29TCachedToken<13CSkinnedModel>": @@ -5470,7 +5470,7 @@ lbl_8002E138: /* 8002E158 0002B0B8 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8002E15C 0002B0BC 7C 08 03 A6 */ mtlr r0 /* 8002E160 0002B0C0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8002E164 0002B0C4 4E 80 00 20 */ blr +/* 8002E164 0002B0C4 4E 80 00 20 */ blr .global FreeCache__9CAnimDataFv FreeCache__9CAnimDataFv: @@ -5491,7 +5491,7 @@ lbl_8002E194: /* 8002E19C 0002B0FC 81 9D 00 00 */ lwz r12, 0(r29) /* 8002E1A0 0002B100 81 8C 00 08 */ lwz r12, 8(r12) /* 8002E1A4 0002B104 7D 89 03 A6 */ mtctr r12 -/* 8002E1A8 0002B108 4E 80 04 21 */ bctrl +/* 8002E1A8 0002B108 4E 80 04 21 */ bctrl /* 8002E1AC 0002B10C 3B BD 00 4C */ addi r29, r29, 0x4c /* 8002E1B0 0002B110 3B DE 00 01 */ addi r30, r30, 1 lbl_8002E1B4: @@ -5508,7 +5508,7 @@ lbl_8002E1B4: /* 8002E1DC 0002B13C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8002E1E0 0002B140 7C 08 03 A6 */ mtlr r0 /* 8002E1E4 0002B144 38 21 00 20 */ addi r1, r1, 0x20 -/* 8002E1E8 0002B148 4E 80 00 20 */ blr +/* 8002E1E8 0002B148 4E 80 00 20 */ blr .global InitializeCache__9CAnimDataFv InitializeCache__9CAnimDataFv: @@ -5531,7 +5531,7 @@ lbl_8002E220: /* 8002E228 0002B188 81 9C 00 00 */ lwz r12, 0(r28) /* 8002E22C 0002B18C 81 8C 00 08 */ lwz r12, 8(r12) /* 8002E230 0002B190 7D 89 03 A6 */ mtctr r12 -/* 8002E234 0002B194 4E 80 04 21 */ bctrl +/* 8002E234 0002B194 4E 80 04 21 */ bctrl /* 8002E238 0002B198 3B 9C 00 4C */ addi r28, r28, 0x4c /* 8002E23C 0002B19C 3B BD 00 01 */ addi r29, r29, 1 lbl_8002E240: @@ -5600,7 +5600,7 @@ lbl_8002E30C: /* 8002E330 0002B290 83 81 00 90 */ lwz r28, 0x90(r1) /* 8002E334 0002B294 7C 08 03 A6 */ mtlr r0 /* 8002E338 0002B298 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8002E33C 0002B29C 4E 80 00 20 */ blr +/* 8002E33C 0002B29C 4E 80 00 20 */ blr .global "uninitialized_fill_n__4rstlFP13CInt32POINodeiRC13CInt32POINode" "uninitialized_fill_n__4rstlFP13CInt32POINodeiRC13CInt32POINode": @@ -5667,7 +5667,7 @@ lbl_8002E41C: /* 8002E420 0002B380 80 01 00 24 */ lwz r0, 0x24(r1) /* 8002E424 0002B384 7C 08 03 A6 */ mtlr r0 /* 8002E428 0002B388 38 21 00 20 */ addi r1, r1, 0x20 -/* 8002E42C 0002B38C 4E 80 00 20 */ blr +/* 8002E42C 0002B38C 4E 80 00 20 */ blr .global DrawSkinnedModel__9CAnimDataCFRC13CSkinnedModelRC11CModelFlags DrawSkinnedModel__9CAnimDataCFRC13CSkinnedModelRC11CModelFlags: @@ -5704,7 +5704,7 @@ lbl_8002E470: /* 8002E4A0 0002B400 83 C1 00 08 */ lwz r30, 8(r1) /* 8002E4A4 0002B404 7C 08 03 A6 */ mtlr r0 /* 8002E4A8 0002B408 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002E4AC 0002B40C 4E 80 00 20 */ blr +/* 8002E4AC 0002B40C 4E 80 00 20 */ blr .global "PoseSkinnedModel__9CAnimDataCFRC13CSkinnedModelRC17CPoseAsTransformsRCQ24rstl37optional_object<18CVertexMorphEffect>PCf" "PoseSkinnedModel__9CAnimDataCFRC13CSkinnedModelRC17CPoseAsTransformsRCQ24rstl37optional_object<18CVertexMorphEffect>PCf": @@ -5720,7 +5720,7 @@ lbl_8002E470: /* 8002E4D4 0002B434 80 01 00 14 */ lwz r0, 0x14(r1) /* 8002E4D8 0002B438 7C 08 03 A6 */ mtlr r0 /* 8002E4DC 0002B43C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002E4E0 0002B440 4E 80 00 20 */ blr +/* 8002E4E0 0002B440 4E 80 00 20 */ blr .global AdvanceParticles__9CAnimDataFRC12CTransform4ffRC9CVector3fR13CStateManager AdvanceParticles__9CAnimDataFRC12CTransform4ffRC9CVector3fR13CStateManager: @@ -5738,7 +5738,7 @@ AdvanceParticles__9CAnimDataFRC12CTransform4ffRC9CVector3fR13CStateManager: /* 8002E510 0002B470 80 01 00 14 */ lwz r0, 0x14(r1) /* 8002E514 0002B474 7C 08 03 A6 */ mtlr r0 /* 8002E518 0002B478 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002E51C 0002B47C 4E 80 00 20 */ blr +/* 8002E51C 0002B47C 4E 80 00 20 */ blr .global GetAverageVelocity__9CAnimDataCFi GetAverageVelocity__9CAnimDataCFi: @@ -5783,7 +5783,7 @@ GetAverageVelocity__9CAnimDataCFi: /* 8002E5B8 0002B518 81 83 00 00 */ lwz r12, 0(r3) /* 8002E5BC 0002B51C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8002E5C0 0002B520 7D 89 03 A6 */ mtctr r12 -/* 8002E5C4 0002B524 4E 80 04 21 */ bctrl +/* 8002E5C4 0002B524 4E 80 04 21 */ bctrl /* 8002E5C8 0002B528 C3 C2 83 D0 */ lfs f30, lbl_805AA0F0@sda21(r2) /* 8002E5CC 0002B52C 3B C0 00 00 */ li r30, 0 /* 8002E5D0 0002B530 83 A1 00 5C */ lwz r29, 0x5c(r1) @@ -5808,7 +5808,7 @@ lbl_8002E5F8: /* 8002E618 0002B578 81 84 00 00 */ lwz r12, 0(r4) /* 8002E61C 0002B57C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8002E620 0002B580 7D 89 03 A6 */ mtctr r12 -/* 8002E624 0002B584 4E 80 04 21 */ bctrl +/* 8002E624 0002B584 4E 80 04 21 */ bctrl /* 8002E628 0002B588 7F 43 D3 78 */ mr r3, r26 /* 8002E62C 0002B58C 38 81 00 28 */ addi r4, r1, 0x28 /* 8002E630 0002B590 48 31 28 79 */ bl __ct__6CTokenFRC6CToken @@ -5954,7 +5954,7 @@ lbl_8002E7D4: /* 8002E810 0002B770 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 8002E814 0002B774 7C 08 03 A6 */ mtlr r0 /* 8002E818 0002B778 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 8002E81C 0002B77C 4E 80 00 20 */ blr +/* 8002E81C 0002B77C 4E 80 00 20 */ blr .global ResetPOILists__9CAnimDataFv ResetPOILists__9CAnimDataFv: @@ -5963,7 +5963,7 @@ ResetPOILists__9CAnimDataFv: /* 8002E828 0002B788 90 03 02 10 */ stw r0, 0x210(r3) /* 8002E82C 0002B78C 90 03 02 14 */ stw r0, 0x214(r3) /* 8002E830 0002B790 90 03 02 18 */ stw r0, 0x218(r3) -/* 8002E834 0002B794 4E 80 00 20 */ blr +/* 8002E834 0002B794 4E 80 00 20 */ blr .global "GetLocatorSegId__9CAnimDataCFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" "GetLocatorSegId__9CAnimDataCFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>": @@ -5978,7 +5978,7 @@ ResetPOILists__9CAnimDataFv: /* 8002E858 0002B7B8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8002E85C 0002B7BC 7C 08 03 A6 */ mtlr r0 /* 8002E860 0002B7C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002E864 0002B7C4 4E 80 00 20 */ blr +/* 8002E864 0002B7C4 4E 80 00 20 */ blr .global GetBoundingBox__9CAnimDataCFRC12CTransform4f GetBoundingBox__9CAnimDataCFRC12CTransform4f: @@ -6000,7 +6000,7 @@ GetBoundingBox__9CAnimDataCFRC12CTransform4f: /* 8002E8A4 0002B804 83 C1 00 28 */ lwz r30, 0x28(r1) /* 8002E8A8 0002B808 7C 08 03 A6 */ mtlr r0 /* 8002E8AC 0002B80C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8002E8B0 0002B810 4E 80 00 20 */ blr +/* 8002E8B0 0002B810 4E 80 00 20 */ blr .global GetBoundingBox__9CAnimDataCFv GetBoundingBox__9CAnimDataCFv: @@ -6111,7 +6111,7 @@ lbl_8002EA40: /* 8002EA44 0002B9A4 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 8002EA48 0002B9A8 7C 08 03 A6 */ mtlr r0 /* 8002EA4C 0002B9AC 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 8002EA50 0002B9B0 4E 80 00 20 */ blr +/* 8002EA50 0002B9B0 4E 80 00 20 */ blr .global sub_8002ea54 sub_8002ea54: @@ -6140,7 +6140,7 @@ sub_8002ea54: /* 8002EAAC 0002BA0C 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8002EAB0 0002BA10 7C 08 03 A6 */ mtlr r0 /* 8002EAB4 0002BA14 38 21 00 30 */ addi r1, r1, 0x30 -/* 8002EAB8 0002BA18 4E 80 00 20 */ blr +/* 8002EAB8 0002BA18 4E 80 00 20 */ blr .global sub_8002eabc sub_8002eabc: @@ -6189,7 +6189,7 @@ lbl_8002EB4C: /* 8002EB58 0002BAB8 80 01 00 44 */ lwz r0, 0x44(r1) /* 8002EB5C 0002BABC 7C 08 03 A6 */ mtlr r0 /* 8002EB60 0002BAC0 38 21 00 40 */ addi r1, r1, 0x40 -/* 8002EB64 0002BAC4 4E 80 00 20 */ blr +/* 8002EB64 0002BAC4 4E 80 00 20 */ blr .global sub_8002eb68 sub_8002eb68: @@ -6200,7 +6200,7 @@ sub_8002eb68: /* 8002EB78 0002BAD8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8002EB7C 0002BADC 7C 08 03 A6 */ mtlr r0 /* 8002EB80 0002BAE0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002EB84 0002BAE4 4E 80 00 20 */ blr +/* 8002EB84 0002BAE4 4E 80 00 20 */ blr .global GetContributionOfHighestInfluence__13CAnimTreeNodeCFv GetContributionOfHighestInfluence__13CAnimTreeNodeCFv: @@ -6212,12 +6212,12 @@ GetContributionOfHighestInfluence__13CAnimTreeNodeCFv: /* 8002EB9C 0002BAFC 81 84 00 00 */ lwz r12, 0(r4) /* 8002EBA0 0002BB00 81 8C 00 60 */ lwz r12, 0x60(r12) /* 8002EBA4 0002BB04 7D 89 03 A6 */ mtctr r12 -/* 8002EBA8 0002BB08 4E 80 04 21 */ bctrl +/* 8002EBA8 0002BB08 4E 80 04 21 */ bctrl /* 8002EBAC 0002BB0C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8002EBB0 0002BB10 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8002EBB4 0002BB14 7C 08 03 A6 */ mtlr r0 /* 8002EBB8 0002BB18 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002EBBC 0002BB1C 4E 80 00 20 */ blr +/* 8002EBBC 0002BB1C 4E 80 00 20 */ blr .global __dt__9CAnimDataFv __dt__9CAnimDataFv: @@ -6243,7 +6243,7 @@ lbl_8002EC00: /* 8002EC08 0002BB68 81 9B 00 00 */ lwz r12, 0(r27) /* 8002EC0C 0002BB6C 81 8C 00 08 */ lwz r12, 8(r12) /* 8002EC10 0002BB70 7D 89 03 A6 */ mtctr r12 -/* 8002EC14 0002BB74 4E 80 04 21 */ bctrl +/* 8002EC14 0002BB74 4E 80 04 21 */ bctrl /* 8002EC18 0002BB78 3B 7B 00 3C */ addi r27, r27, 0x3c /* 8002EC1C 0002BB7C 3B 9C 00 01 */ addi r28, r28, 1 lbl_8002EC20: @@ -6264,7 +6264,7 @@ lbl_8002EC4C: /* 8002EC54 0002BBB4 81 9B 00 00 */ lwz r12, 0(r27) /* 8002EC58 0002BBB8 81 8C 00 08 */ lwz r12, 8(r12) /* 8002EC5C 0002BBBC 7D 89 03 A6 */ mtctr r12 -/* 8002EC60 0002BBC0 4E 80 04 21 */ bctrl +/* 8002EC60 0002BBC0 4E 80 04 21 */ bctrl /* 8002EC64 0002BBC4 3B 7B 00 4C */ addi r27, r27, 0x4c /* 8002EC68 0002BBC8 3B 9C 00 01 */ addi r28, r28, 1 lbl_8002EC6C: @@ -6285,7 +6285,7 @@ lbl_8002EC98: /* 8002ECA0 0002BC00 81 9B 00 00 */ lwz r12, 0(r27) /* 8002ECA4 0002BC04 81 8C 00 08 */ lwz r12, 8(r12) /* 8002ECA8 0002BC08 7D 89 03 A6 */ mtctr r12 -/* 8002ECAC 0002BC0C 4E 80 04 21 */ bctrl +/* 8002ECAC 0002BC0C 4E 80 04 21 */ bctrl /* 8002ECB0 0002BC10 3B 7B 00 5C */ addi r27, r27, 0x5c /* 8002ECB4 0002BC14 3B 9C 00 01 */ addi r28, r28, 1 lbl_8002ECB8: @@ -6306,7 +6306,7 @@ lbl_8002ECE4: /* 8002ECEC 0002BC4C 81 9B 00 00 */ lwz r12, 0(r27) /* 8002ECF0 0002BC50 81 8C 00 08 */ lwz r12, 8(r12) /* 8002ECF4 0002BC54 7D 89 03 A6 */ mtctr r12 -/* 8002ECF8 0002BC58 4E 80 04 21 */ bctrl +/* 8002ECF8 0002BC58 4E 80 04 21 */ bctrl /* 8002ECFC 0002BC5C 3B 7B 00 44 */ addi r27, r27, 0x44 /* 8002ED00 0002BC60 3B 9C 00 01 */ addi r28, r28, 1 lbl_8002ED04: @@ -6439,7 +6439,7 @@ lbl_8002EEAC: /* 8002EEB4 0002BE14 80 01 00 24 */ lwz r0, 0x24(r1) /* 8002EEB8 0002BE18 7C 08 03 A6 */ mtlr r0 /* 8002EEBC 0002BE1C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8002EEC0 0002BE20 4E 80 00 20 */ blr +/* 8002EEC0 0002BE20 4E 80 00 20 */ blr .global __dt__14CCharacterInfoFv __dt__14CCharacterInfoFv: @@ -6503,7 +6503,7 @@ lbl_8002EF88: /* 8002EF94 0002BEF4 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8002EF98 0002BEF8 7C 08 03 A6 */ mtlr r0 /* 8002EF9C 0002BEFC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8002EFA0 0002BF00 4E 80 00 20 */ blr +/* 8002EFA0 0002BF00 4E 80 00 20 */ blr .global sub_8002efa4 sub_8002efa4: @@ -6562,7 +6562,7 @@ lbl_8002F048: /* 8002F05C 0002BFBC 83 81 00 20 */ lwz r28, 0x20(r1) /* 8002F060 0002BFC0 7C 08 03 A6 */ mtlr r0 /* 8002F064 0002BFC4 38 21 00 30 */ addi r1, r1, 0x30 -/* 8002F068 0002BFC8 4E 80 00 20 */ blr +/* 8002F068 0002BFC8 4E 80 00 20 */ blr .global __dt__12CPASDatabaseFv __dt__12CPASDatabaseFv: @@ -6587,7 +6587,7 @@ lbl_8002F0A4: /* 8002F0B0 0002C010 83 C1 00 08 */ lwz r30, 8(r1) /* 8002F0B4 0002C014 7C 08 03 A6 */ mtlr r0 /* 8002F0B8 0002C018 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002F0BC 0002C01C 4E 80 00 20 */ blr +/* 8002F0BC 0002C01C 4E 80 00 20 */ blr .global sub_8002f0c0 sub_8002f0c0: @@ -6627,7 +6627,7 @@ lbl_8002F130: /* 8002F13C 0002C09C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8002F140 0002C0A0 7C 08 03 A6 */ mtlr r0 /* 8002F144 0002C0A4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8002F148 0002C0A8 4E 80 00 20 */ blr +/* 8002F148 0002C0A8 4E 80 00 20 */ blr .global sub_8002f14c sub_8002f14c: @@ -6652,7 +6652,7 @@ lbl_8002F178: /* 8002F18C 0002C0EC 83 C1 00 08 */ lwz r30, 8(r1) /* 8002F190 0002C0F0 7C 08 03 A6 */ mtlr r0 /* 8002F194 0002C0F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002F198 0002C0F8 4E 80 00 20 */ blr +/* 8002F198 0002C0F8 4E 80 00 20 */ blr .global sub_8002f19c sub_8002f19c: @@ -6664,7 +6664,7 @@ sub_8002f19c: /* 8002F1B0 0002C110 80 01 00 14 */ lwz r0, 0x14(r1) /* 8002F1B4 0002C114 7C 08 03 A6 */ mtlr r0 /* 8002F1B8 0002C118 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002F1BC 0002C11C 4E 80 00 20 */ blr +/* 8002F1BC 0002C11C 4E 80 00 20 */ blr .global "__rf__Q24rstl126const_pointer_iterator<13CPASAnimState,Q24rstl50vector<13CPASAnimState,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>CFv" "__rf__Q24rstl126const_pointer_iterator<13CPASAnimState,Q24rstl50vector<13CPASAnimState,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>CFv": @@ -6732,7 +6732,7 @@ lbl_8002F28C: /* 8002F298 0002C1F8 83 C1 00 28 */ lwz r30, 0x28(r1) /* 8002F29C 0002C1FC 7C 08 03 A6 */ mtlr r0 /* 8002F2A0 0002C200 38 21 00 30 */ addi r1, r1, 0x30 -/* 8002F2A4 0002C204 4E 80 00 20 */ blr +/* 8002F2A4 0002C204 4E 80 00 20 */ blr .global sub_8002f2a8 sub_8002f2a8: @@ -6805,7 +6805,7 @@ lbl_8002F380: /* 8002F38C 0002C2EC 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8002F390 0002C2F0 7C 08 03 A6 */ mtlr r0 /* 8002F394 0002C2F4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8002F398 0002C2F8 4E 80 00 20 */ blr +/* 8002F398 0002C2F8 4E 80 00 20 */ blr .global __dt__Q214CCharacterInfo16CParticleResDataFv __dt__Q214CCharacterInfo16CParticleResDataFv: @@ -6912,7 +6912,7 @@ lbl_8002F4EC: /* 8002F4F8 0002C458 83 C1 00 48 */ lwz r30, 0x48(r1) /* 8002F4FC 0002C45C 7C 08 03 A6 */ mtlr r0 /* 8002F500 0002C460 38 21 00 50 */ addi r1, r1, 0x50 -/* 8002F504 0002C464 4E 80 00 20 */ blr +/* 8002F504 0002C464 4E 80 00 20 */ blr .global "__dt__Q24rstl133vector,Q24rstl17rmemory_allocator>,6CAABox>,Q24rstl17rmemory_allocator>Fv" "__dt__Q24rstl133vector,Q24rstl17rmemory_allocator>,6CAABox>,Q24rstl17rmemory_allocator>Fv": @@ -6964,7 +6964,7 @@ lbl_8002F594: /* 8002F5A8 0002C508 83 81 00 20 */ lwz r28, 0x20(r1) /* 8002F5AC 0002C50C 7C 08 03 A6 */ mtlr r0 /* 8002F5B0 0002C510 38 21 00 30 */ addi r1, r1, 0x30 -/* 8002F5B4 0002C514 4E 80 00 20 */ blr +/* 8002F5B4 0002C514 4E 80 00 20 */ blr .global __dt__21CHierarchyPoseBuilderFv __dt__21CHierarchyPoseBuilderFv: @@ -7001,7 +7001,7 @@ lbl_8002F61C: /* 8002F628 0002C588 83 C1 00 08 */ lwz r30, 8(r1) /* 8002F62C 0002C58C 7C 08 03 A6 */ mtlr r0 /* 8002F630 0002C590 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002F634 0002C594 4E 80 00 20 */ blr +/* 8002F634 0002C594 4E 80 00 20 */ blr .global sub_8002f638 sub_8002f638: @@ -7052,7 +7052,7 @@ lbl_8002F6C8: /* 8002F6D4 0002C634 83 C1 00 08 */ lwz r30, 8(r1) /* 8002F6D8 0002C638 7C 08 03 A6 */ mtlr r0 /* 8002F6DC 0002C63C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002F6E0 0002C640 4E 80 00 20 */ blr +/* 8002F6E0 0002C640 4E 80 00 20 */ blr .global __dt__13CSoundPOINodeFv __dt__13CSoundPOINodeFv: @@ -7087,7 +7087,7 @@ lbl_8002F740: /* 8002F74C 0002C6AC 83 C1 00 08 */ lwz r30, 8(r1) /* 8002F750 0002C6B0 7C 08 03 A6 */ mtlr r0 /* 8002F754 0002C6B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002F758 0002C6B8 4E 80 00 20 */ blr +/* 8002F758 0002C6B8 4E 80 00 20 */ blr .global __dt__16CParticlePOINodeFv __dt__16CParticlePOINodeFv: @@ -7129,7 +7129,7 @@ lbl_8002F7D0: /* 8002F7DC 0002C73C 83 C1 00 08 */ lwz r30, 8(r1) /* 8002F7E0 0002C740 7C 08 03 A6 */ mtlr r0 /* 8002F7E4 0002C744 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002F7E8 0002C748 4E 80 00 20 */ blr +/* 8002F7E8 0002C748 4E 80 00 20 */ blr .global __dt__12CBoolPOINodeFv __dt__12CBoolPOINodeFv: @@ -7164,7 +7164,7 @@ lbl_8002F848: /* 8002F854 0002C7B4 83 C1 00 08 */ lwz r30, 8(r1) /* 8002F858 0002C7B8 7C 08 03 A6 */ mtlr r0 /* 8002F85C 0002C7BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002F860 0002C7C0 4E 80 00 20 */ blr +/* 8002F860 0002C7C0 4E 80 00 20 */ blr .global "__ct__9CAnimDataFUiRC14CCharacterInfoiibRC31TLockedToken<15CCharLayoutInfo>RC23TToken<13CSkinnedModel>RCQ24rstl62optional_object<43TLockedToken<27CSkinnedModelWithAvgNormals>>RCQ24rstl27ncrc_ptr<15CAnimSysContext>RCQ24rstl27rc_ptr<17CAnimationManager>RCQ24rstl28rc_ptr<18CTransitionManager>RC33TLockedToken<17CCharacterFactory>" "__ct__9CAnimDataFUiRC14CCharacterInfoiibRC31TLockedToken<15CCharLayoutInfo>RC23TToken<13CSkinnedModel>RCQ24rstl62optional_object<43TLockedToken<27CSkinnedModelWithAvgNormals>>RCQ24rstl27ncrc_ptr<15CAnimSysContext>RCQ24rstl27rc_ptr<17CAnimationManager>RCQ24rstl28rc_ptr<18CTransitionManager>RC33TLockedToken<17CCharacterFactory>": @@ -7760,7 +7760,7 @@ lbl_80030110: /* 8003014C 0002D0AC 80 01 04 74 */ lwz r0, 0x474(r1) /* 80030150 0002D0B0 7C 08 03 A6 */ mtlr r0 /* 80030154 0002D0B4 38 21 04 70 */ addi r1, r1, 0x470 -/* 80030158 0002D0B8 4E 80 00 20 */ blr +/* 80030158 0002D0B8 4E 80 00 20 */ blr .global sub_8003015c sub_8003015c: @@ -7828,7 +7828,7 @@ lbl_8003023C: /* 80030240 0002D1A0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80030244 0002D1A4 7C 08 03 A6 */ mtlr r0 /* 80030248 0002D1A8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8003024C 0002D1AC 4E 80 00 20 */ blr +/* 8003024C 0002D1AC 4E 80 00 20 */ blr .global "__ct__13CSoundPOINodeFQ24rstl66basic_string,Q24rstl17rmemory_allocator>UsRC13CCharAnimTimeibfiiiff" "__ct__13CSoundPOINodeFQ24rstl66basic_string,Q24rstl17rmemory_allocator>UsRC13CCharAnimTimeibfiiiff": @@ -7858,7 +7858,7 @@ lbl_8003023C: /* 800302AC 0002D20C 80 01 00 24 */ lwz r0, 0x24(r1) /* 800302B0 0002D210 7C 08 03 A6 */ mtlr r0 /* 800302B4 0002D214 38 21 00 20 */ addi r1, r1, 0x20 -/* 800302B8 0002D218 4E 80 00 20 */ blr +/* 800302B8 0002D218 4E 80 00 20 */ blr .global sub_800302bc sub_800302bc: @@ -7884,7 +7884,7 @@ lbl_800302FC: /* 80030304 0002D264 83 C1 00 08 */ lwz r30, 8(r1) /* 80030308 0002D268 7C 08 03 A6 */ mtlr r0 /* 8003030C 0002D26C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80030310 0002D270 4E 80 00 20 */ blr +/* 80030310 0002D270 4E 80 00 20 */ blr .global sub_80030314 sub_80030314: @@ -7951,7 +7951,7 @@ lbl_800303EC: /* 800303F8 0002D358 80 01 00 24 */ lwz r0, 0x24(r1) /* 800303FC 0002D35C 7C 08 03 A6 */ mtlr r0 /* 80030400 0002D360 38 21 00 20 */ addi r1, r1, 0x20 -/* 80030404 0002D364 4E 80 00 20 */ blr +/* 80030404 0002D364 4E 80 00 20 */ blr .global sub_80030408 sub_80030408: @@ -7985,7 +7985,7 @@ sub_80030408: /* 80030474 0002D3D4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80030478 0002D3D8 7C 08 03 A6 */ mtlr r0 /* 8003047C 0002D3DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80030480 0002D3E0 4E 80 00 20 */ blr +/* 80030480 0002D3E0 4E 80 00 20 */ blr .global "__ct__12CBoolPOINodeFQ24rstl66basic_string,Q24rstl17rmemory_allocator>UsRC13CCharAnimTimeibfiib" "__ct__12CBoolPOINodeFQ24rstl66basic_string,Q24rstl17rmemory_allocator>UsRC13CCharAnimTimeibfiib": @@ -8007,7 +8007,7 @@ sub_80030408: /* 800304C0 0002D420 80 01 00 14 */ lwz r0, 0x14(r1) /* 800304C4 0002D424 7C 08 03 A6 */ mtlr r0 /* 800304C8 0002D428 38 21 00 10 */ addi r1, r1, 0x10 -/* 800304CC 0002D42C 4E 80 00 20 */ blr +/* 800304CC 0002D42C 4E 80 00 20 */ blr .global __ct__14CCharacterInfoFRC14CCharacterInfo __ct__14CCharacterInfoFRC14CCharacterInfo: @@ -8147,7 +8147,7 @@ lbl_800306A8: /* 800306B0 0002D610 80 01 00 34 */ lwz r0, 0x34(r1) /* 800306B4 0002D614 7C 08 03 A6 */ mtlr r0 /* 800306B8 0002D618 38 21 00 30 */ addi r1, r1, 0x30 -/* 800306BC 0002D61C 4E 80 00 20 */ blr +/* 800306BC 0002D61C 4E 80 00 20 */ blr .global sub_800306c0 sub_800306c0: @@ -8221,7 +8221,7 @@ lbl_800307A8: /* 800307B0 0002D710 80 01 00 24 */ lwz r0, 0x24(r1) /* 800307B4 0002D714 7C 08 03 A6 */ mtlr r0 /* 800307B8 0002D718 38 21 00 20 */ addi r1, r1, 0x20 -/* 800307BC 0002D71C 4E 80 00 20 */ blr +/* 800307BC 0002D71C 4E 80 00 20 */ blr .global sub_800307c0 sub_800307c0: @@ -8410,7 +8410,7 @@ lbl_80030A2C: /* 80030A38 0002D998 83 C1 00 08 */ lwz r30, 8(r1) /* 80030A3C 0002D99C 7C 08 03 A6 */ mtlr r0 /* 80030A40 0002D9A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80030A44 0002D9A4 4E 80 00 20 */ blr +/* 80030A44 0002D9A4 4E 80 00 20 */ blr .global __ct__12CPASDatabaseFRC12CPASDatabase __ct__12CPASDatabaseFRC12CPASDatabase: @@ -8430,7 +8430,7 @@ __ct__12CPASDatabaseFRC12CPASDatabase: /* 80030A7C 0002D9DC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80030A80 0002D9E0 7C 08 03 A6 */ mtlr r0 /* 80030A84 0002D9E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80030A88 0002D9E8 4E 80 00 20 */ blr +/* 80030A88 0002D9E8 4E 80 00 20 */ blr .global sub_80030a8c sub_80030a8c: @@ -8480,7 +8480,7 @@ lbl_80030B1C: /* 80030B28 0002DA88 83 C1 00 08 */ lwz r30, 8(r1) /* 80030B2C 0002DA8C 7C 08 03 A6 */ mtlr r0 /* 80030B30 0002DA90 38 21 00 10 */ addi r1, r1, 0x10 -/* 80030B34 0002DA94 4E 80 00 20 */ blr +/* 80030B34 0002DA94 4E 80 00 20 */ blr .global sub_80030b38 sub_80030b38: @@ -8514,7 +8514,7 @@ lbl_80030B80: /* 80030B9C 0002DAFC 83 81 00 10 */ lwz r28, 0x10(r1) /* 80030BA0 0002DB00 7C 08 03 A6 */ mtlr r0 /* 80030BA4 0002DB04 38 21 00 20 */ addi r1, r1, 0x20 -/* 80030BA8 0002DB08 4E 80 00 20 */ blr +/* 80030BA8 0002DB08 4E 80 00 20 */ blr .global sub_80030bac sub_80030bac: @@ -8528,7 +8528,7 @@ lbl_80030BC4: /* 80030BC4 0002DB24 80 01 00 14 */ lwz r0, 0x14(r1) /* 80030BC8 0002DB28 7C 08 03 A6 */ mtlr r0 /* 80030BCC 0002DB2C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80030BD0 0002DB30 4E 80 00 20 */ blr +/* 80030BD0 0002DB30 4E 80 00 20 */ blr .global sub_80030bd4 sub_80030bd4: @@ -8598,7 +8598,7 @@ lbl_80030CA4: /* 80030CB0 0002DC10 83 C1 00 08 */ lwz r30, 8(r1) /* 80030CB4 0002DC14 7C 08 03 A6 */ mtlr r0 /* 80030CB8 0002DC18 38 21 00 10 */ addi r1, r1, 0x10 -/* 80030CBC 0002DC1C 4E 80 00 20 */ blr +/* 80030CBC 0002DC1C 4E 80 00 20 */ blr .global sub_80030cc0 sub_80030cc0: @@ -8678,7 +8678,7 @@ lbl_80030DB4: /* 80030DC0 0002DD20 83 C1 00 08 */ lwz r30, 8(r1) /* 80030DC4 0002DD24 7C 08 03 A6 */ mtlr r0 /* 80030DC8 0002DD28 38 21 00 10 */ addi r1, r1, 0x10 -/* 80030DCC 0002DD2C 4E 80 00 20 */ blr +/* 80030DCC 0002DD2C 4E 80 00 20 */ blr .global sub_80030dd0 sub_80030dd0: @@ -8747,7 +8747,7 @@ lbl_80030EA4: /* 80030EB0 0002DE10 83 C1 00 08 */ lwz r30, 8(r1) /* 80030EB4 0002DE14 7C 08 03 A6 */ mtlr r0 /* 80030EB8 0002DE18 38 21 00 10 */ addi r1, r1, 0x10 -/* 80030EBC 0002DE1C 4E 80 00 20 */ blr +/* 80030EBC 0002DE1C 4E 80 00 20 */ blr .global sub_80030ec0 sub_80030ec0: @@ -8769,7 +8769,7 @@ sub_80030ec0: /* 80030EFC 0002DE5C 38 80 00 01 */ li r4, 1 /* 80030F00 0002DE60 81 8C 00 08 */ lwz r12, 8(r12) /* 80030F04 0002DE64 7D 89 03 A6 */ mtctr r12 -/* 80030F08 0002DE68 4E 80 04 21 */ bctrl +/* 80030F08 0002DE68 4E 80 04 21 */ bctrl lbl_80030F0C: /* 80030F0C 0002DE6C 80 7F 00 00 */ lwz r3, 0(r31) /* 80030F10 0002DE70 28 03 00 00 */ cmplwi r3, 0 @@ -8780,7 +8780,7 @@ lbl_80030F1C: /* 80030F20 0002DE80 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80030F24 0002DE84 7C 08 03 A6 */ mtlr r0 /* 80030F28 0002DE88 38 21 00 10 */ addi r1, r1, 0x10 -/* 80030F2C 0002DE8C 4E 80 00 20 */ blr +/* 80030F2C 0002DE8C 4E 80 00 20 */ blr .global sub_80030f30 sub_80030f30: @@ -8802,7 +8802,7 @@ sub_80030f30: /* 80030F6C 0002DECC 38 80 00 01 */ li r4, 1 /* 80030F70 0002DED0 81 8C 00 08 */ lwz r12, 8(r12) /* 80030F74 0002DED4 7D 89 03 A6 */ mtctr r12 -/* 80030F78 0002DED8 4E 80 04 21 */ bctrl +/* 80030F78 0002DED8 4E 80 04 21 */ bctrl lbl_80030F7C: /* 80030F7C 0002DEDC 80 7F 00 00 */ lwz r3, 0(r31) /* 80030F80 0002DEE0 28 03 00 00 */ cmplwi r3, 0 @@ -8813,7 +8813,7 @@ lbl_80030F8C: /* 80030F90 0002DEF0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80030F94 0002DEF4 7C 08 03 A6 */ mtlr r0 /* 80030F98 0002DEF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80030F9C 0002DEFC 4E 80 00 20 */ blr +/* 80030F9C 0002DEFC 4E 80 00 20 */ blr .global sub_80030fa0 sub_80030fa0: @@ -8835,7 +8835,7 @@ sub_80030fa0: /* 80030FDC 0002DF3C 38 80 00 01 */ li r4, 1 /* 80030FE0 0002DF40 81 8C 00 08 */ lwz r12, 8(r12) /* 80030FE4 0002DF44 7D 89 03 A6 */ mtctr r12 -/* 80030FE8 0002DF48 4E 80 04 21 */ bctrl +/* 80030FE8 0002DF48 4E 80 04 21 */ bctrl lbl_80030FEC: /* 80030FEC 0002DF4C 80 7F 00 00 */ lwz r3, 0(r31) /* 80030FF0 0002DF50 28 03 00 00 */ cmplwi r3, 0 @@ -8846,7 +8846,7 @@ lbl_80030FFC: /* 80031000 0002DF60 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80031004 0002DF64 7C 08 03 A6 */ mtlr r0 /* 80031008 0002DF68 38 21 00 10 */ addi r1, r1, 0x10 -/* 8003100C 0002DF6C 4E 80 00 20 */ blr +/* 8003100C 0002DF6C 4E 80 00 20 */ blr .global sub_80031010 sub_80031010: @@ -8903,7 +8903,7 @@ lbl_800310B8: /* 800310CC 0002E02C 80 01 00 34 */ lwz r0, 0x34(r1) /* 800310D0 0002E030 7C 08 03 A6 */ mtlr r0 /* 800310D4 0002E034 38 21 00 30 */ addi r1, r1, 0x30 -/* 800310D8 0002E038 4E 80 00 20 */ blr +/* 800310D8 0002E038 4E 80 00 20 */ blr .global sub_800310dc sub_800310dc: @@ -8914,7 +8914,7 @@ sub_800310dc: /* 800310EC 0002E04C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800310F0 0002E050 7C 08 03 A6 */ mtlr r0 /* 800310F4 0002E054 38 21 00 10 */ addi r1, r1, 0x10 -/* 800310F8 0002E058 4E 80 00 20 */ blr +/* 800310F8 0002E058 4E 80 00 20 */ blr .global sub_800310fc sub_800310fc: @@ -8971,7 +8971,7 @@ lbl_800311A4: /* 800311B8 0002E118 80 01 00 34 */ lwz r0, 0x34(r1) /* 800311BC 0002E11C 7C 08 03 A6 */ mtlr r0 /* 800311C0 0002E120 38 21 00 30 */ addi r1, r1, 0x30 -/* 800311C4 0002E124 4E 80 00 20 */ blr +/* 800311C4 0002E124 4E 80 00 20 */ blr .global sub_800311c8 sub_800311c8: @@ -8982,7 +8982,7 @@ sub_800311c8: /* 800311D8 0002E138 80 01 00 14 */ lwz r0, 0x14(r1) /* 800311DC 0002E13C 7C 08 03 A6 */ mtlr r0 /* 800311E0 0002E140 38 21 00 10 */ addi r1, r1, 0x10 -/* 800311E4 0002E144 4E 80 00 20 */ blr +/* 800311E4 0002E144 4E 80 00 20 */ blr .global "lower_bound,Q24rstl77vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,Ui,Q24rstl79pair_sorter_finder,Q24rstl8less>>__4rstlFQ24rstl180const_pointer_iterator,Q24rstl77vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl180const_p" "lower_bound,Q24rstl77vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,Ui,Q24rstl79pair_sorter_finder,Q24rstl8less>>__4rstlFQ24rstl180const_pointer_iterator,Q24rstl77vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl180const_p": @@ -9036,7 +9036,7 @@ lbl_80031284: /* 80031298 0002E1F8 80 01 00 34 */ lwz r0, 0x34(r1) /* 8003129C 0002E1FC 7C 08 03 A6 */ mtlr r0 /* 800312A0 0002E200 38 21 00 30 */ addi r1, r1, 0x30 -/* 800312A4 0002E204 4E 80 00 20 */ blr +/* 800312A4 0002E204 4E 80 00 20 */ blr .global sub_800312a8 sub_800312a8: @@ -9076,7 +9076,7 @@ lbl_80031314: /* 8003131C 0002E27C 83 C1 00 08 */ lwz r30, 8(r1) /* 80031320 0002E280 7C 08 03 A6 */ mtlr r0 /* 80031324 0002E284 38 21 00 10 */ addi r1, r1, 0x10 -/* 80031328 0002E288 4E 80 00 20 */ blr +/* 80031328 0002E288 4E 80 00 20 */ blr .global __dt__13CAnimTreeNodeFv __dt__13CAnimTreeNodeFv: @@ -9113,7 +9113,7 @@ lbl_80031390: /* 8003139C 0002E2FC 83 C1 00 08 */ lwz r30, 8(r1) /* 800313A0 0002E300 7C 08 03 A6 */ mtlr r0 /* 800313A4 0002E304 38 21 00 10 */ addi r1, r1, 0x10 -/* 800313A8 0002E308 4E 80 00 20 */ blr +/* 800313A8 0002E308 4E 80 00 20 */ blr .global sub_800313ac sub_800313ac: @@ -9165,7 +9165,7 @@ lbl_80031444: /* 8003144C 0002E3AC 83 C1 00 08 */ lwz r30, 8(r1) /* 80031450 0002E3B0 7C 08 03 A6 */ mtlr r0 /* 80031454 0002E3B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80031458 0002E3B8 4E 80 00 20 */ blr +/* 80031458 0002E3B8 4E 80 00 20 */ blr .global sub_8003145c sub_8003145c: @@ -9211,7 +9211,7 @@ lbl_800314E0: /* 800314E8 0002E448 83 C1 00 08 */ lwz r30, 8(r1) /* 800314EC 0002E44C 7C 08 03 A6 */ mtlr r0 /* 800314F0 0002E450 38 21 00 10 */ addi r1, r1, 0x10 -/* 800314F4 0002E454 4E 80 00 20 */ blr +/* 800314F4 0002E454 4E 80 00 20 */ blr .global sub_800314f8 sub_800314f8: @@ -9256,7 +9256,7 @@ lbl_80031578: /* 80031580 0002E4E0 83 C1 00 08 */ lwz r30, 8(r1) /* 80031584 0002E4E4 7C 08 03 A6 */ mtlr r0 /* 80031588 0002E4E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8003158C 0002E4EC 4E 80 00 20 */ blr +/* 8003158C 0002E4EC 4E 80 00 20 */ blr .global __dt__17CPoseAsTransformsFv __dt__17CPoseAsTransformsFv: @@ -9318,7 +9318,7 @@ lbl_80031640: /* 8003164C 0002E5AC 83 C1 00 08 */ lwz r30, 8(r1) /* 80031650 0002E5B0 7C 08 03 A6 */ mtlr r0 /* 80031654 0002E5B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80031658 0002E5B8 4E 80 00 20 */ blr +/* 80031658 0002E5B8 4E 80 00 20 */ blr .global sub_8003165c sub_8003165c: @@ -9380,7 +9380,7 @@ lbl_8003170C: /* 80031718 0002E678 83 C1 00 08 */ lwz r30, 8(r1) /* 8003171C 0002E67C 7C 08 03 A6 */ mtlr r0 /* 80031720 0002E680 38 21 00 10 */ addi r1, r1, 0x10 -/* 80031724 0002E684 4E 80 00 20 */ blr +/* 80031724 0002E684 4E 80 00 20 */ blr .global sub_80031728 sub_80031728: @@ -9406,7 +9406,7 @@ lbl_8003176C: /* 80031770 0002E6D0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80031774 0002E6D4 7C 08 03 A6 */ mtlr r0 /* 80031778 0002E6D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8003177C 0002E6DC 4E 80 00 20 */ blr +/* 8003177C 0002E6DC 4E 80 00 20 */ blr .global sub_80031780 sub_80031780: @@ -9420,7 +9420,7 @@ sub_80031780: /* 8003179C 0002E6FC 80 01 00 14 */ lwz r0, 0x14(r1) /* 800317A0 0002E700 7C 08 03 A6 */ mtlr r0 /* 800317A4 0002E704 38 21 00 10 */ addi r1, r1, 0x10 -/* 800317A8 0002E708 4E 80 00 20 */ blr +/* 800317A8 0002E708 4E 80 00 20 */ blr .global sub_800317ac sub_800317ac: @@ -9434,7 +9434,7 @@ sub_800317ac: /* 800317C8 0002E728 80 01 00 14 */ lwz r0, 0x14(r1) /* 800317CC 0002E72C 7C 08 03 A6 */ mtlr r0 /* 800317D0 0002E730 38 21 00 10 */ addi r1, r1, 0x10 -/* 800317D4 0002E734 4E 80 00 20 */ blr +/* 800317D4 0002E734 4E 80 00 20 */ blr .global sub_800317d8 sub_800317d8: @@ -9448,7 +9448,7 @@ sub_800317d8: /* 800317F4 0002E754 80 01 00 14 */ lwz r0, 0x14(r1) /* 800317F8 0002E758 7C 08 03 A6 */ mtlr r0 /* 800317FC 0002E75C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80031800 0002E760 4E 80 00 20 */ blr +/* 80031800 0002E760 4E 80 00 20 */ blr .global sub_80031804 sub_80031804: @@ -9456,7 +9456,7 @@ sub_80031804: /* 80031808 0002E768 80 83 00 00 */ lwz r4, 0(r3) /* 8003180C 0002E76C 7C 04 02 14 */ add r0, r4, r0 /* 80031810 0002E770 90 03 00 00 */ stw r0, 0(r3) -/* 80031814 0002E774 4E 80 00 20 */ blr +/* 80031814 0002E774 4E 80 00 20 */ blr .global sub_80031818 sub_80031818: @@ -9464,7 +9464,7 @@ sub_80031818: /* 8003181C 0002E77C 54 80 28 34 */ slwi r0, r4, 5 /* 80031820 0002E780 7C 05 02 14 */ add r0, r5, r0 /* 80031824 0002E784 90 03 00 00 */ stw r0, 0(r3) -/* 80031828 0002E788 4E 80 00 20 */ blr +/* 80031828 0002E788 4E 80 00 20 */ blr .global sub_8003182c sub_8003182c: @@ -9472,7 +9472,7 @@ sub_8003182c: /* 80031830 0002E790 80 83 00 00 */ lwz r4, 0(r3) /* 80031834 0002E794 7C 04 02 14 */ add r0, r4, r0 /* 80031838 0002E798 90 03 00 00 */ stw r0, 0(r3) -/* 8003183C 0002E79C 4E 80 00 20 */ blr +/* 8003183C 0002E79C 4E 80 00 20 */ blr .global sub_80031840 sub_80031840: @@ -9492,7 +9492,7 @@ sub_80031840: /* 80031874 0002E7D4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80031878 0002E7D8 7C 08 03 A6 */ mtlr r0 /* 8003187C 0002E7DC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80031880 0002E7E0 4E 80 00 20 */ blr +/* 80031880 0002E7E0 4E 80 00 20 */ blr .global sub_80031884 sub_80031884: @@ -9512,7 +9512,7 @@ sub_80031884: /* 800318B8 0002E818 80 01 00 24 */ lwz r0, 0x24(r1) /* 800318BC 0002E81C 7C 08 03 A6 */ mtlr r0 /* 800318C0 0002E820 38 21 00 20 */ addi r1, r1, 0x20 -/* 800318C4 0002E824 4E 80 00 20 */ blr +/* 800318C4 0002E824 4E 80 00 20 */ blr .global "distance,Q24rstl77vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl180const_pointer_iterator,Q24rstl77vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl180const_pointer_iterator,Q24rstl77vector,Q24rstl77vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl180const_pointer_iterator,Q24rstl77vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl180const_pointer_iterator,Q24rstl77vector,Q24rstl77vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl180const_pointer_iterator,Q24rstl77vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl180const_pointer_iterator,Q24rstl77vector,Q24rstl77vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl180const_pointer_iterator,Q24rstl77vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl180const_pointer_iterator,Q24rstl77vector,Q24rstl17rmemory_allocator>RCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" "GetUniquePrimitivesFromMetaAnim__22CAnimationDatabaseGameCFRQ24rstl72set<10CPrimitive,Q24rstl18less<10CPrimitive>,Q24rstl17rmemory_allocator>RCQ24rstl66basic_string,Q24rstl17rmemory_allocator>": -/* 8006D80C 0006A76C 4E 80 00 20 */ blr +/* 8006D80C 0006A76C 4E 80 00 20 */ blr .global "GetAllUniquePrimitives__22CAnimationDatabaseGameCFRQ24rstl47vector<10CPrimitive,Q24rstl17rmemory_allocator>" "GetAllUniquePrimitives__22CAnimationDatabaseGameCFRQ24rstl47vector<10CPrimitive,Q24rstl17rmemory_allocator>": @@ -49,7 +49,7 @@ lbl_8006D85C: /* 8006D86C 0006A7CC 81 83 00 00 */ lwz r12, 0(r3) /* 8006D870 0006A7D0 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8006D874 0006A7D4 7D 89 03 A6 */ mtctr r12 -/* 8006D878 0006A7D8 4E 80 04 21 */ bctrl +/* 8006D878 0006A7D8 4E 80 04 21 */ bctrl /* 8006D87C 0006A7DC 3B 9C 00 01 */ addi r28, r28, 1 /* 8006D880 0006A7E0 3B FF 00 04 */ addi r31, r31, 4 lbl_8006D884: @@ -96,7 +96,7 @@ lbl_8006D908: /* 8006D920 0006A880 80 01 00 74 */ lwz r0, 0x74(r1) /* 8006D924 0006A884 7C 08 03 A6 */ mtlr r0 /* 8006D928 0006A888 38 21 00 70 */ addi r1, r1, 0x70 -/* 8006D92C 0006A88C 4E 80 00 20 */ blr +/* 8006D92C 0006A88C 4E 80 00 20 */ blr .global sub_8006d930 sub_8006d930: @@ -129,7 +129,7 @@ sub_8006d930: /* 8006D998 0006A8F8 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8006D99C 0006A8FC 7C 08 03 A6 */ mtlr r0 /* 8006D9A0 0006A900 38 21 00 30 */ addi r1, r1, 0x30 -/* 8006D9A4 0006A904 4E 80 00 20 */ blr +/* 8006D9A4 0006A904 4E 80 00 20 */ blr .global "insert_into,Q24rstl18less<10CPrimitive>,Q24rstl17rmemory_allocator>8iterator>__Q24rstl47vector<10CPrimitive,Q24rstl17rmemory_allocator>FQ24rstl114pointer_iterator<10CPrimitive,Q24rstl47vector<10CPrimitive,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>iQ34rstl130red_black_tree<10CPrimitive,10CPrimitive,0,Q24rstl22identity<10CPrimitive>,Q24rstl18less<10CPrimitive>,Q24rstl17rmemory_allocator>8iterator" "insert_into,Q24rstl18less<10CPrimitive>,Q24rstl17rmemory_allocator>8iterator>__Q24rstl47vector<10CPrimitive,Q24rstl17rmemory_allocator>FQ24rstl114pointer_iterator<10CPrimitive,Q24rstl47vector<10CPrimitive,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>iQ34rstl130red_black_tree<10CPrimitive,10CPrimitive,0,Q24rstl22identity<10CPrimitive>,Q24rstl18less<10CPrimitive>,Q24rstl17rmemory_allocator>8iterator": @@ -361,19 +361,19 @@ lbl_8006DCBC: /* 8006DCC0 0006AC20 80 01 00 44 */ lwz r0, 0x44(r1) /* 8006DCC4 0006AC24 7C 08 03 A6 */ mtlr r0 /* 8006DCC8 0006AC28 38 21 00 40 */ addi r1, r1, 0x40 -/* 8006DCCC 0006AC2C 4E 80 00 20 */ blr +/* 8006DCCC 0006AC2C 4E 80 00 20 */ blr .global GetMetaAnim__22CAnimationDatabaseGameCFUi GetMetaAnim__22CAnimationDatabaseGameCFUi: /* 8006DCD0 0006AC30 80 63 00 1C */ lwz r3, 0x1c(r3) /* 8006DCD4 0006AC34 54 80 10 3A */ slwi r0, r4, 2 /* 8006DCD8 0006AC38 7C 63 02 14 */ add r3, r3, r0 -/* 8006DCDC 0006AC3C 4E 80 00 20 */ blr +/* 8006DCDC 0006AC3C 4E 80 00 20 */ blr .global GetNumMetaAnims__22CAnimationDatabaseGameCFv GetNumMetaAnims__22CAnimationDatabaseGameCFv: /* 8006DCE0 0006AC40 80 63 00 14 */ lwz r3, 0x14(r3) -/* 8006DCE4 0006AC44 4E 80 00 20 */ blr +/* 8006DCE4 0006AC44 4E 80 00 20 */ blr .global GetMetaAnimName__22CAnimationDatabaseGameCFUi GetMetaAnimName__22CAnimationDatabaseGameCFUi: @@ -389,7 +389,7 @@ GetMetaAnimName__22CAnimationDatabaseGameCFUi: /* 8006DD0C 0006AC6C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8006DD10 0006AC70 7C 08 03 A6 */ mtlr r0 /* 8006DD14 0006AC74 38 21 00 10 */ addi r1, r1, 0x10 -/* 8006DD18 0006AC78 4E 80 00 20 */ blr +/* 8006DD18 0006AC78 4E 80 00 20 */ blr .global "__ct__22CAnimationDatabaseGameFRCQ24rstl47vector<10CAnimation,Q24rstl17rmemory_allocator>" "__ct__22CAnimationDatabaseGameFRCQ24rstl47vector<10CAnimation,Q24rstl17rmemory_allocator>": @@ -478,7 +478,7 @@ lbl_8006DE30: /* 8006DE48 0006ADA8 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8006DE4C 0006ADAC 7C 08 03 A6 */ mtlr r0 /* 8006DE50 0006ADB0 38 21 00 30 */ addi r1, r1, 0x30 -/* 8006DE54 0006ADB4 4E 80 00 20 */ blr +/* 8006DE54 0006ADB4 4E 80 00 20 */ blr .global "distance,Q24rstl18less<10CPrimitive>,Q24rstl17rmemory_allocator>8iterator>__4rstlFQ34rstl130red_black_tree<10CPrimitive,10CPrimitive,0,Q24rstl22identity<10CPrimitive>,Q24rstl18less<10CPrimitive>,Q24rstl17rmemory_allocator>8iteratorQ34rstl130red_black_tree<10CPrimitive,10CPrimitive,0,Q24rstl22identity<10CPrimitive>,Q24rstl18less<10CPrimitive>,Q24rstl17rmemory_allocator>8iterator" "distance,Q24rstl18less<10CPrimitive>,Q24rstl17rmemory_allocator>8iterator>__4rstlFQ34rstl130red_black_tree<10CPrimitive,10CPrimitive,0,Q24rstl22identity<10CPrimitive>,Q24rstl18less<10CPrimitive>,Q24rstl17rmemory_allocator>8iteratorQ34rstl130red_black_tree<10CPrimitive,10CPrimitive,0,Q24rstl22identity<10CPrimitive>,Q24rstl18less<10CPrimitive>,Q24rstl17rmemory_allocator>8iterator": @@ -502,7 +502,7 @@ lbl_8006DE30: /* 8006DE9C 0006ADFC 80 01 00 24 */ lwz r0, 0x24(r1) /* 8006DEA0 0006AE00 7C 08 03 A6 */ mtlr r0 /* 8006DEA4 0006AE04 38 21 00 20 */ addi r1, r1, 0x20 -/* 8006DEA8 0006AE08 4E 80 00 20 */ blr +/* 8006DEA8 0006AE08 4E 80 00 20 */ blr .global "__distance,Q24rstl18less<10CPrimitive>,Q24rstl17rmemory_allocator>8iterator>__4rstlFQ34rstl130red_black_tree<10CPrimitive,10CPrimitive,0,Q24rstl22identity<10CPrimitive>,Q24rstl18less<10CPrimitive>,Q24rstl17rmemory_allocator>8iteratorQ34rstl130red_black_tree<10CPrimitive,10CPrimitive,0,Q24rstl22identity<10CPrimitive>,Q24rstl18less<10CPrimitive>,Q24rstl17rmemory_allocator>8iteratorQ24rstl20forward_iterator_tag" "__distance,Q24rstl18less<10CPrimitive>,Q24rstl17rmemory_allocator>8iterator>__4rstlFQ34rstl130red_black_tree<10CPrimitive,10CPrimitive,0,Q24rstl22identity<10CPrimitive>,Q24rstl18less<10CPrimitive>,Q24rstl17rmemory_allocator>8iteratorQ34rstl130red_black_tree<10CPrimitive,10CPrimitive,0,Q24rstl22identity<10CPrimitive>,Q24rstl18less<10CPrimitive>,Q24rstl17rmemory_allocator>8iteratorQ24rstl20forward_iterator_tag": @@ -543,7 +543,7 @@ lbl_8006DF0C: /* 8006DF24 0006AE84 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8006DF28 0006AE88 7C 08 03 A6 */ mtlr r0 /* 8006DF2C 0006AE8C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8006DF30 0006AE90 4E 80 00 20 */ blr +/* 8006DF30 0006AE90 4E 80 00 20 */ blr .global "reserve__Q24rstl47vector<10CPrimitive,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl47vector<10CPrimitive,Q24rstl17rmemory_allocator>Fi": @@ -623,7 +623,7 @@ lbl_8006E02C: /* 8006E030 0006AF90 80 01 00 34 */ lwz r0, 0x34(r1) /* 8006E034 0006AF94 7C 08 03 A6 */ mtlr r0 /* 8006E038 0006AF98 38 21 00 30 */ addi r1, r1, 0x30 -/* 8006E03C 0006AF9C 4E 80 00 20 */ blr +/* 8006E03C 0006AF9C 4E 80 00 20 */ blr .global "reserve__Q24rstl62vector,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl62vector,Q24rstl17rmemory_allocator>Fi": @@ -699,4 +699,4 @@ lbl_8006E128: /* 8006E12C 0006B08C 80 01 00 34 */ lwz r0, 0x34(r1) /* 8006E130 0006B090 7C 08 03 A6 */ mtlr r0 /* 8006E134 0006B094 38 21 00 30 */ addi r1, r1, 0x30 -/* 8006E138 0006B098 4E 80 00 20 */ blr +/* 8006E138 0006B098 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/CArchMsgParmControllerStatus.s b/asm/MetroidPrime/CArchMsgParmControllerStatus.s index ac462da1..974b9856 100644 --- a/asm/MetroidPrime/CArchMsgParmControllerStatus.s +++ b/asm/MetroidPrime/CArchMsgParmControllerStatus.s @@ -38,7 +38,7 @@ lbl_8005A0D4: /* 8005A0DC 0005703C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8005A0E0 00057040 7C 08 03 A6 */ mtlr r0 /* 8005A0E4 00057044 38 21 00 10 */ addi r1, r1, 0x10 -/* 8005A0E8 00057048 4E 80 00 20 */ blr +/* 8005A0E8 00057048 4E 80 00 20 */ blr .global __ct__28CArchMsgParmControllerStatusFsb __ct__28CArchMsgParmControllerStatusFsb: @@ -50,5 +50,5 @@ __ct__28CArchMsgParmControllerStatusFsb: /* 8005A100 00057060 90 03 00 00 */ stw r0, 0(r3) /* 8005A104 00057064 B0 83 00 04 */ sth r4, 4(r3) /* 8005A108 00057068 98 A3 00 06 */ stb r5, 6(r3) -/* 8005A10C 0005706C 4E 80 00 20 */ blr +/* 8005A10C 0005706C 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/CArchMsgParmInt32.s b/asm/MetroidPrime/CArchMsgParmInt32.s index b9946c7f..d71b3604 100644 --- a/asm/MetroidPrime/CArchMsgParmInt32.s +++ b/asm/MetroidPrime/CArchMsgParmInt32.s @@ -9,7 +9,7 @@ lbl_803D9E50: .4byte 0 .4byte __dt__17CArchMsgParmInt32Fv .4byte 0 - + .section .text, "ax" .global __dt__17CArchMsgParmInt32Fv @@ -38,7 +38,7 @@ lbl_8005160C: /* 80051614 0004E574 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80051618 0004E578 7C 08 03 A6 */ mtlr r0 /* 8005161C 0004E57C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80051620 0004E580 4E 80 00 20 */ blr +/* 80051620 0004E580 4E 80 00 20 */ blr .global __ct__17CArchMsgParmInt32Fi __ct__17CArchMsgParmInt32Fi: @@ -49,4 +49,4 @@ __ct__17CArchMsgParmInt32Fi: /* 80051634 0004E594 38 05 9E 50 */ addi r0, r5, lbl_803D9E50@l /* 80051638 0004E598 90 03 00 00 */ stw r0, 0(r3) /* 8005163C 0004E59C 90 83 00 04 */ stw r4, 4(r3) -/* 80051640 0004E5A0 4E 80 00 20 */ blr +/* 80051640 0004E5A0 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/CArchMsgParmInt32Int32VoidPtr.s b/asm/MetroidPrime/CArchMsgParmInt32Int32VoidPtr.s index d80217f3..23780612 100644 --- a/asm/MetroidPrime/CArchMsgParmInt32Int32VoidPtr.s +++ b/asm/MetroidPrime/CArchMsgParmInt32Int32VoidPtr.s @@ -9,7 +9,7 @@ lbl_803D9E60: .4byte 0 .4byte __dt__29CArchMsgParmInt32Int32VoidPtrFv .4byte 0 - + .section .text, "ax" .global __dt__29CArchMsgParmInt32Int32VoidPtrFv @@ -38,7 +38,7 @@ lbl_80051688: /* 80051690 0004E5F0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80051694 0004E5F4 7C 08 03 A6 */ mtlr r0 /* 80051698 0004E5F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8005169C 0004E5FC 4E 80 00 20 */ blr +/* 8005169C 0004E5FC 4E 80 00 20 */ blr .global __ct__29CArchMsgParmInt32Int32VoidPtrFiiPCv __ct__29CArchMsgParmInt32Int32VoidPtrFiiPCv: @@ -51,4 +51,4 @@ __ct__29CArchMsgParmInt32Int32VoidPtrFiiPCv: /* 800516B8 0004E618 90 83 00 04 */ stw r4, 4(r3) /* 800516BC 0004E61C 90 A3 00 08 */ stw r5, 8(r3) /* 800516C0 0004E620 90 C3 00 0C */ stw r6, 0xc(r3) -/* 800516C4 0004E624 4E 80 00 20 */ blr +/* 800516C4 0004E624 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/CArchMsgParmNull.s b/asm/MetroidPrime/CArchMsgParmNull.s index 20393eb2..67b1803e 100644 --- a/asm/MetroidPrime/CArchMsgParmNull.s +++ b/asm/MetroidPrime/CArchMsgParmNull.s @@ -9,7 +9,7 @@ lbl_803D9E70: .4byte 0 .4byte __dt__16CArchMsgParmNullFv .4byte 0 - + .section .text, "ax" .global __dt__16CArchMsgParmNullFv @@ -38,7 +38,7 @@ lbl_8005170C: /* 80051714 0004E674 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80051718 0004E678 7C 08 03 A6 */ mtlr r0 /* 8005171C 0004E67C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80051720 0004E680 4E 80 00 20 */ blr +/* 80051720 0004E680 4E 80 00 20 */ blr .global __ct__16CArchMsgParmNullFv __ct__16CArchMsgParmNullFv: @@ -48,4 +48,4 @@ __ct__16CArchMsgParmNullFv: /* 80051730 0004E690 90 A3 00 00 */ stw r5, 0(r3) /* 80051734 0004E694 38 04 9E 70 */ addi r0, r4, lbl_803D9E70@l /* 80051738 0004E698 90 03 00 00 */ stw r0, 0(r3) -/* 8005173C 0004E69C 4E 80 00 20 */ blr +/* 8005173C 0004E69C 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/CArchMsgParmReal32.s b/asm/MetroidPrime/CArchMsgParmReal32.s index dfa81a28..2b85da2c 100644 --- a/asm/MetroidPrime/CArchMsgParmReal32.s +++ b/asm/MetroidPrime/CArchMsgParmReal32.s @@ -9,7 +9,7 @@ lbl_803D9E80: .4byte 0 .4byte __dt__18CArchMsgParmReal32Fv .4byte 0 - + .section .text, "ax" .global __dt__18CArchMsgParmReal32Fv @@ -38,7 +38,7 @@ lbl_80051784: /* 8005178C 0004E6EC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80051790 0004E6F0 7C 08 03 A6 */ mtlr r0 /* 80051794 0004E6F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80051798 0004E6F8 4E 80 00 20 */ blr +/* 80051798 0004E6F8 4E 80 00 20 */ blr .global __ct__18CArchMsgParmReal32Ff __ct__18CArchMsgParmReal32Ff: diff --git a/asm/MetroidPrime/CArchitectureMessage.s b/asm/MetroidPrime/CArchitectureMessage.s index 142cb5f8..31e41b06 100644 --- a/asm/MetroidPrime/CArchitectureMessage.s +++ b/asm/MetroidPrime/CArchitectureMessage.s @@ -6,4 +6,4 @@ lbl_803D8E9C: .4byte 0 .4byte 0 .4byte 0 - + diff --git a/asm/MetroidPrime/CArtifactDoll.s b/asm/MetroidPrime/CArtifactDoll.s index 204047a5..303d98fa 100644 --- a/asm/MetroidPrime/CArtifactDoll.s +++ b/asm/MetroidPrime/CArtifactDoll.s @@ -45,48 +45,48 @@ lbl_8029C898: /* 8029C89C 002997FC 7C 03 00 40 */ cmplw r3, r0 /* 8029C8A0 00299800 40 82 00 0C */ bne lbl_8029C8AC /* 8029C8A4 00299804 7C A3 2B 78 */ mr r3, r5 -/* 8029C8A8 00299808 4E 80 00 20 */ blr +/* 8029C8A8 00299808 4E 80 00 20 */ blr lbl_8029C8AC: /* 8029C8AC 0029980C 84 04 00 04 */ lwzu r0, 4(r4) /* 8029C8B0 00299810 38 A5 00 01 */ addi r5, r5, 1 /* 8029C8B4 00299814 7C 03 00 40 */ cmplw r3, r0 /* 8029C8B8 00299818 40 82 00 0C */ bne lbl_8029C8C4 /* 8029C8BC 0029981C 7C A3 2B 78 */ mr r3, r5 -/* 8029C8C0 00299820 4E 80 00 20 */ blr +/* 8029C8C0 00299820 4E 80 00 20 */ blr lbl_8029C8C4: /* 8029C8C4 00299824 84 04 00 04 */ lwzu r0, 4(r4) /* 8029C8C8 00299828 38 A5 00 01 */ addi r5, r5, 1 /* 8029C8CC 0029982C 7C 03 00 40 */ cmplw r3, r0 /* 8029C8D0 00299830 40 82 00 0C */ bne lbl_8029C8DC /* 8029C8D4 00299834 7C A3 2B 78 */ mr r3, r5 -/* 8029C8D8 00299838 4E 80 00 20 */ blr +/* 8029C8D8 00299838 4E 80 00 20 */ blr lbl_8029C8DC: /* 8029C8DC 0029983C 84 04 00 04 */ lwzu r0, 4(r4) /* 8029C8E0 00299840 38 A5 00 01 */ addi r5, r5, 1 /* 8029C8E4 00299844 7C 03 00 40 */ cmplw r3, r0 /* 8029C8E8 00299848 40 82 00 0C */ bne lbl_8029C8F4 /* 8029C8EC 0029984C 7C A3 2B 78 */ mr r3, r5 -/* 8029C8F0 00299850 4E 80 00 20 */ blr +/* 8029C8F0 00299850 4E 80 00 20 */ blr lbl_8029C8F4: /* 8029C8F4 00299854 84 04 00 04 */ lwzu r0, 4(r4) /* 8029C8F8 00299858 38 A5 00 01 */ addi r5, r5, 1 /* 8029C8FC 0029985C 7C 03 00 40 */ cmplw r3, r0 /* 8029C900 00299860 40 82 00 0C */ bne lbl_8029C90C /* 8029C904 00299864 7C A3 2B 78 */ mr r3, r5 -/* 8029C908 00299868 4E 80 00 20 */ blr +/* 8029C908 00299868 4E 80 00 20 */ blr lbl_8029C90C: /* 8029C90C 0029986C 84 04 00 04 */ lwzu r0, 4(r4) /* 8029C910 00299870 38 A5 00 01 */ addi r5, r5, 1 /* 8029C914 00299874 7C 03 00 40 */ cmplw r3, r0 /* 8029C918 00299878 40 82 00 0C */ bne lbl_8029C924 /* 8029C91C 0029987C 7C A3 2B 78 */ mr r3, r5 -/* 8029C920 00299880 4E 80 00 20 */ blr +/* 8029C920 00299880 4E 80 00 20 */ blr lbl_8029C924: /* 8029C924 00299884 38 84 00 04 */ addi r4, r4, 4 /* 8029C928 00299888 38 A5 00 01 */ addi r5, r5, 1 /* 8029C92C 0029988C 42 00 FF 6C */ bdnz lbl_8029C898 /* 8029C930 00299890 38 60 FF FF */ li r3, -1 -/* 8029C934 00299894 4E 80 00 20 */ blr +/* 8029C934 00299894 4E 80 00 20 */ blr .global GetArtifactHeadScanFromItemType__13CArtifactDollF9EItemType GetArtifactHeadScanFromItemType__13CArtifactDollF9EItemType: @@ -99,10 +99,10 @@ GetArtifactHeadScanFromItemType__13CArtifactDollF9EItemType: /* 8029C950 002998B0 54 00 10 3A */ slwi r0, r0, 2 /* 8029C954 002998B4 38 63 5D 80 */ addi r3, r3, lbl_803D5D80@l /* 8029C958 002998B8 7C 63 00 2E */ lwzx r3, r3, r0 -/* 8029C95C 002998BC 4E 80 00 20 */ blr +/* 8029C95C 002998BC 4E 80 00 20 */ blr lbl_8029C960: /* 8029C960 002998C0 38 60 FF FF */ li r3, -1 -/* 8029C964 002998C4 4E 80 00 20 */ blr +/* 8029C964 002998C4 4E 80 00 20 */ blr .global Draw__13CArtifactDollFfRC13CStateManagerbUi Draw__13CArtifactDollFfRC13CStateManagerbUi: @@ -155,7 +155,7 @@ Draw__13CArtifactDollFfRC13CStateManagerbUi: /* 8029CA20 00299980 EC 60 18 28 */ fsubs f3, f0, f3 /* 8029CA24 00299984 C0 A2 C0 48 */ lfs f5, lbl_805ADD68@sda21(r2) /* 8029CA28 00299988 7D 89 03 A6 */ mtctr r12 -/* 8029CA2C 0029998C 4E 80 04 21 */ bctrl +/* 8029CA2C 0029998C 4E 80 04 21 */ bctrl /* 8029CA30 00299990 C0 22 C0 4C */ lfs f1, lbl_805ADD6C@sda21(r2) /* 8029CA34 00299994 38 61 01 A4 */ addi r3, r1, 0x1a4 /* 8029CA38 00299998 C0 42 C0 50 */ lfs f2, lbl_805ADD70@sda21(r2) @@ -405,7 +405,7 @@ lbl_8029CDB8: /* 8029CDEC 00299D4C 80 01 02 74 */ lwz r0, 0x274(r1) /* 8029CDF0 00299D50 7C 08 03 A6 */ mtlr r0 /* 8029CDF4 00299D54 38 21 02 70 */ addi r1, r1, 0x270 -/* 8029CDF8 00299D58 4E 80 00 20 */ blr +/* 8029CDF8 00299D58 4E 80 00 20 */ blr .global UpdateArtifactHeadScan__13CArtifactDollFRC13CStateManagerf UpdateArtifactHeadScan__13CArtifactDollFRC13CStateManagerf: @@ -464,7 +464,7 @@ lbl_8029CE94: /* 8029CEBC 00299E1C 83 81 00 10 */ lwz r28, 0x10(r1) /* 8029CEC0 00299E20 7C 08 03 A6 */ mtlr r0 /* 8029CEC4 00299E24 38 21 00 30 */ addi r1, r1, 0x30 -/* 8029CEC8 00299E28 4E 80 00 20 */ blr +/* 8029CEC8 00299E28 4E 80 00 20 */ blr .global CompleteArtifactHeadScan__13CArtifactDollFRC13CStateManager CompleteArtifactHeadScan__13CArtifactDollFRC13CStateManager: @@ -477,7 +477,7 @@ CompleteArtifactHeadScan__13CArtifactDollFRC13CStateManager: /* 8029CEE4 00299E44 80 01 00 14 */ lwz r0, 0x14(r1) /* 8029CEE8 00299E48 7C 08 03 A6 */ mtlr r0 /* 8029CEEC 00299E4C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8029CEF0 00299E50 4E 80 00 20 */ blr +/* 8029CEF0 00299E50 4E 80 00 20 */ blr .global Update__13CArtifactDollFfRC13CStateManager Update__13CArtifactDollFfRC13CStateManager: @@ -531,7 +531,7 @@ lbl_8029CF90: /* 8029CFA0 00299F00 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8029CFA4 00299F04 7C 08 03 A6 */ mtlr r0 /* 8029CFA8 00299F08 38 21 00 30 */ addi r1, r1, 0x30 -/* 8029CFAC 00299F0C 4E 80 00 20 */ blr +/* 8029CFAC 00299F0C 4E 80 00 20 */ blr .global Touch__13CArtifactDollFv Touch__13CArtifactDollFv: @@ -574,7 +574,7 @@ lbl_8029D028: /* 8029D034 00299F94 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8029D038 00299F98 7C 08 03 A6 */ mtlr r0 /* 8029D03C 00299F9C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8029D040 00299FA0 4E 80 00 20 */ blr +/* 8029D040 00299FA0 4E 80 00 20 */ blr .global UpdateActorLights__13CArtifactDollFv UpdateActorLights__13CArtifactDollFv: @@ -757,7 +757,7 @@ UpdateActorLights__13CArtifactDollFv: /* 8029D304 0029A264 83 C1 01 08 */ lwz r30, 0x108(r1) /* 8029D308 0029A268 7C 08 03 A6 */ mtlr r0 /* 8029D30C 0029A26C 38 21 01 10 */ addi r1, r1, 0x110 -/* 8029D310 0029A270 4E 80 00 20 */ blr +/* 8029D310 0029A270 4E 80 00 20 */ blr .global __dt__13CArtifactDollFv __dt__13CArtifactDollFv: @@ -835,7 +835,7 @@ lbl_8029D3FC: /* 8029D410 0029A370 83 81 00 30 */ lwz r28, 0x30(r1) /* 8029D414 0029A374 7C 08 03 A6 */ mtlr r0 /* 8029D418 0029A378 38 21 00 40 */ addi r1, r1, 0x40 -/* 8029D41C 0029A37C 4E 80 00 20 */ blr +/* 8029D41C 0029A37C 4E 80 00 20 */ blr .global IsLoaded__13CArtifactDollCFv IsLoaded__13CArtifactDollCFv: @@ -844,7 +844,7 @@ IsLoaded__13CArtifactDollCFv: /* 8029D428 0029A388 7C 03 00 D0 */ neg r0, r3 /* 8029D42C 0029A38C 7C 00 1B 78 */ or r0, r0, r3 /* 8029D430 0029A390 54 03 0F FE */ srwi r3, r0, 0x1f -/* 8029D434 0029A394 4E 80 00 20 */ blr +/* 8029D434 0029A394 4E 80 00 20 */ blr .global CheckLoadComplete__13CArtifactDollFv CheckLoadComplete__13CArtifactDollFv: @@ -886,7 +886,7 @@ lbl_8029D4AC: /* 8029D4B0 0029A410 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8029D4B4 0029A414 7C 08 03 A6 */ mtlr r0 /* 8029D4B8 0029A418 38 21 00 10 */ addi r1, r1, 0x10 -/* 8029D4BC 0029A41C 4E 80 00 20 */ blr +/* 8029D4BC 0029A41C 4E 80 00 20 */ blr .global __ct__13CArtifactDollFv __ct__13CArtifactDollFv: @@ -960,7 +960,7 @@ lbl_8029D5B8: /* 8029D5C4 0029A524 81 84 00 00 */ lwz r12, 0(r4) /* 8029D5C8 0029A528 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8029D5CC 0029A52C 7D 89 03 A6 */ mtctr r12 -/* 8029D5D0 0029A530 4E 80 04 21 */ bctrl +/* 8029D5D0 0029A530 4E 80 04 21 */ bctrl /* 8029D5D4 0029A534 38 61 00 18 */ addi r3, r1, 0x18 /* 8029D5D8 0029A538 38 81 00 10 */ addi r4, r1, 0x10 /* 8029D5DC 0029A53C 48 0A 38 CD */ bl __ct__6CTokenFRC6CToken @@ -1006,7 +1006,7 @@ lbl_8029D638: /* 8029D670 0029A5D0 83 A1 00 84 */ lwz r29, 0x84(r1) /* 8029D674 0029A5D4 7C 08 03 A6 */ mtlr r0 /* 8029D678 0029A5D8 38 21 00 90 */ addi r1, r1, 0x90 -/* 8029D67C 0029A5DC 4E 80 00 20 */ blr +/* 8029D67C 0029A5DC 4E 80 00 20 */ blr .global __sinit_CArtifactDoll_cpp __sinit_CArtifactDoll_cpp: diff --git a/asm/MetroidPrime/CAudioStateWin.s b/asm/MetroidPrime/CAudioStateWin.s index a55f199e..b774a7e8 100644 --- a/asm/MetroidPrime/CAudioStateWin.s +++ b/asm/MetroidPrime/CAudioStateWin.s @@ -42,7 +42,7 @@ lbl_80111D10: /* 80111D1C 0010EC7C 83 C1 00 08 */ lwz r30, 8(r1) /* 80111D20 0010EC80 7C 08 03 A6 */ mtlr r0 /* 80111D24 0010EC84 38 21 00 10 */ addi r1, r1, 0x10 -/* 80111D28 0010EC88 4E 80 00 20 */ blr +/* 80111D28 0010EC88 4E 80 00 20 */ blr .global OnMessage__14CAudioStateWinFRC20CArchitectureMessageR18CArchitectureQueue OnMessage__14CAudioStateWinFRC20CArchitectureMessageR18CArchitectureQueue: @@ -88,7 +88,7 @@ lbl_80111DB0: /* 80111DB4 0010ED14 38 60 00 00 */ li r3, 0 /* 80111DB8 0010ED18 7C 08 03 A6 */ mtlr r0 /* 80111DBC 0010ED1C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80111DC0 0010ED20 4E 80 00 20 */ blr +/* 80111DC0 0010ED20 4E 80 00 20 */ blr .global __ct__14CAudioStateWinFv __ct__14CAudioStateWinFv: diff --git a/asm/MetroidPrime/CAutoMapper.s b/asm/MetroidPrime/CAutoMapper.s index 5602a483..6cac5707 100644 --- a/asm/MetroidPrime/CAutoMapper.s +++ b/asm/MetroidPrime/CAutoMapper.s @@ -161,7 +161,7 @@ lbl_805A71B8: lbl_805A71BC: # ROM: 0x3F4B5C .4byte 0 - + .section .text, "ax" .global SetupMiniMapWorld__11CAutoMapperFv @@ -186,7 +186,7 @@ SetupMiniMapWorld__11CAutoMapperFv: /* 800956D4 00092634 83 C1 00 08 */ lwz r30, 8(r1) /* 800956D8 00092638 7C 08 03 A6 */ mtlr r0 /* 800956DC 0009263C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800956E0 00092640 4E 80 00 20 */ blr +/* 800956E0 00092640 4E 80 00 20 */ blr .global LeaveMapScreen__11CAutoMapperCFRC13CStateManager LeaveMapScreen__11CAutoMapperCFRC13CStateManager: @@ -309,7 +309,7 @@ lbl_80095730: /* 800958B0 00092810 81 84 00 00 */ lwz r12, 0(r4) /* 800958B4 00092814 81 8C 00 24 */ lwz r12, 0x24(r12) /* 800958B8 00092818 7D 89 03 A6 */ mtctr r12 -/* 800958BC 0009281C 4E 80 04 21 */ bctrl +/* 800958BC 0009281C 4E 80 04 21 */ bctrl /* 800958C0 00092820 80 01 00 08 */ lwz r0, 8(r1) /* 800958C4 00092824 7F C4 F3 78 */ mr r4, r30 /* 800958C8 00092828 7F E5 FB 78 */ mr r5, r31 @@ -341,7 +341,7 @@ lbl_80095924: /* 8009592C 0009288C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80095930 00092890 7C 08 03 A6 */ mtlr r0 /* 80095934 00092894 38 21 00 20 */ addi r1, r1, 0x20 -/* 80095938 00092898 4E 80 00 20 */ blr +/* 80095938 00092898 4E 80 00 20 */ blr .global SetCurWorldAssetId__11CAutoMapperFi SetCurWorldAssetId__11CAutoMapperFi: @@ -351,7 +351,7 @@ SetCurWorldAssetId__11CAutoMapperFi: /* 80095948 000928A8 80 07 00 14 */ lwz r0, 0x14(r7) /* 8009594C 000928AC 7C 09 03 A6 */ mtctr r0 /* 80095950 000928B0 2C 00 00 00 */ cmpwi r0, 0 -/* 80095954 000928B4 4C 81 00 20 */ blelr +/* 80095954 000928B4 4C 81 00 20 */ blelr lbl_80095958: /* 80095958 000928B8 80 A7 00 1C */ lwz r5, 0x1c(r7) /* 8009595C 000928BC 38 06 00 10 */ addi r0, r6, 0x10 @@ -359,7 +359,7 @@ lbl_80095958: /* 80095964 000928C4 7C 04 00 40 */ cmplw r4, r0 /* 80095968 000928C8 40 82 00 0C */ bne lbl_80095974 /* 8009596C 000928CC 91 03 00 9C */ stw r8, 0x9c(r3) -/* 80095970 000928D0 4E 80 00 20 */ blr +/* 80095970 000928D0 4E 80 00 20 */ blr lbl_80095974: /* 80095974 000928D4 38 C6 00 70 */ addi r6, r6, 0x70 /* 80095978 000928D8 39 08 00 01 */ addi r8, r8, 1 @@ -367,7 +367,7 @@ lbl_80095974: .global sub_80095980 sub_80095980: -/* 80095980 000928E0 4E 80 00 20 */ blr +/* 80095980 000928E0 4E 80 00 20 */ blr .global TransformRenderStateWorldToUniverse__11CAutoMapperFRQ211CAutoMapper22SAutoMapperRenderState TransformRenderStateWorldToUniverse__11CAutoMapperFRQ211CAutoMapper22SAutoMapperRenderState: @@ -396,7 +396,7 @@ TransformRenderStateWorldToUniverse__11CAutoMapperFRQ211CAutoMapper22SAutoMapper /* 800959DC 0009293C 80 01 00 24 */ lwz r0, 0x24(r1) /* 800959E0 00092940 7C 08 03 A6 */ mtlr r0 /* 800959E4 00092944 38 21 00 20 */ addi r1, r1, 0x20 -/* 800959E8 00092948 4E 80 00 20 */ blr +/* 800959E8 00092948 4E 80 00 20 */ blr .global TransformRenderStatesUniverseToWorld__11CAutoMapperFv TransformRenderStatesUniverseToWorld__11CAutoMapperFv: @@ -497,7 +497,7 @@ TransformRenderStatesUniverseToWorld__11CAutoMapperFv: /* 80095B64 00092AC4 80 01 00 F4 */ lwz r0, 0xf4(r1) /* 80095B68 00092AC8 7C 08 03 A6 */ mtlr r0 /* 80095B6C 00092ACC 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 80095B70 00092AD0 4E 80 00 20 */ blr +/* 80095B70 00092AD0 4E 80 00 20 */ blr .global TransformRenderStatesWorldToUniverse__11CAutoMapperFv TransformRenderStatesWorldToUniverse__11CAutoMapperFv: @@ -595,7 +595,7 @@ TransformRenderStatesWorldToUniverse__11CAutoMapperFv: /* 80095CE0 00092C40 80 01 00 94 */ lwz r0, 0x94(r1) /* 80095CE4 00092C44 7C 08 03 A6 */ mtlr r0 /* 80095CE8 00092C48 38 21 00 90 */ addi r1, r1, 0x90 -/* 80095CEC 00092C4C 4E 80 00 20 */ blr +/* 80095CEC 00092C4C 4E 80 00 20 */ blr .global IsRenderStateInterpolating__11CAutoMapperCFv IsRenderStateInterpolating__11CAutoMapperCFv: @@ -604,7 +604,7 @@ IsRenderStateInterpolating__11CAutoMapperCFv: /* 80095CF8 00092C58 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80095CFC 00092C5C 7C 00 00 26 */ mfcr r0 /* 80095D00 00092C60 54 03 0F FE */ srwi r3, r0, 0x1f -/* 80095D04 00092C64 4E 80 00 20 */ blr +/* 80095D04 00092C64 4E 80 00 20 */ blr .global IsInMapperStateTransition__11CAutoMapperCFv IsInMapperStateTransition__11CAutoMapperCFv: @@ -614,7 +614,7 @@ IsInMapperStateTransition__11CAutoMapperCFv: /* 80095D14 00092C74 7C 00 20 50 */ subf r0, r0, r4 /* 80095D18 00092C78 7C 60 03 78 */ or r0, r3, r0 /* 80095D1C 00092C7C 54 03 0F FE */ srwi r3, r0, 0x1f -/* 80095D20 00092C80 4E 80 00 20 */ blr +/* 80095D20 00092C80 4E 80 00 20 */ blr .global IsInMapperState__11CAutoMapperCFQ211CAutoMapper16EAutoMapperState IsInMapperState__11CAutoMapperCFQ211CAutoMapper16EAutoMapperState: @@ -628,7 +628,7 @@ IsInMapperState__11CAutoMapperCFQ211CAutoMapper16EAutoMapperState: /* 80095D40 00092CA0 38 A0 00 01 */ li r5, 1 lbl_80095D44: /* 80095D44 00092CA4 7C A3 2B 78 */ mr r3, r5 -/* 80095D48 00092CA8 4E 80 00 20 */ blr +/* 80095D48 00092CA8 4E 80 00 20 */ blr .global GetFinalMapScreenCameraMoveSpeed__11CAutoMapperCFv GetFinalMapScreenCameraMoveSpeed__11CAutoMapperCFv: @@ -651,13 +651,13 @@ lbl_80095D84: /* 80095D88 00092CE8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80095D8C 00092CEC 7C 08 03 A6 */ mtlr r0 /* 80095D90 00092CF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80095D94 00092CF4 4E 80 00 20 */ blr +/* 80095D94 00092CF4 4E 80 00 20 */ blr .global GetBaseMapScreenCameraMoveSpeed__11CAutoMapperCFv GetBaseMapScreenCameraMoveSpeed__11CAutoMapperCFv: /* 80095D98 00092CF8 80 6D A1 44 */ lwz r3, gpTweakAutoMapper@sda21(r13) /* 80095D9C 00092CFC C0 23 00 78 */ lfs f1, 0x78(r3) -/* 80095DA0 00092D00 4E 80 00 20 */ blr +/* 80095DA0 00092D00 4E 80 00 20 */ blr .global GetDesiredMiniMapCameraDistance__11CAutoMapperCFRC13CStateManager GetDesiredMiniMapCameraDistance__11CAutoMapperCFRC13CStateManager: @@ -676,7 +676,7 @@ GetDesiredMiniMapCameraDistance__11CAutoMapperCFRC13CStateManager: /* 80095DD4 00092D34 81 83 00 00 */ lwz r12, 0(r3) /* 80095DD8 00092D38 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80095DDC 00092D3C 7D 89 03 A6 */ mtctr r12 -/* 80095DE0 00092D40 4E 80 04 21 */ bctrl +/* 80095DE0 00092D40 4E 80 04 21 */ bctrl /* 80095DE4 00092D44 7C 64 1B 78 */ mr r4, r3 /* 80095DE8 00092D48 80 6D A0 80 */ lwz r3, gpGameState@sda21(r13) /* 80095DEC 00092D4C 48 13 DB ED */ bl StateForWorld__10CGameStateFUi @@ -691,7 +691,7 @@ GetDesiredMiniMapCameraDistance__11CAutoMapperCFRC13CStateManager: /* 80095E10 00092D70 81 83 00 00 */ lwz r12, 0(r3) /* 80095E14 00092D74 81 8C 00 18 */ lwz r12, 0x18(r12) /* 80095E18 00092D78 7D 89 03 A6 */ mtctr r12 -/* 80095E1C 00092D7C 4E 80 04 21 */ bctrl +/* 80095E1C 00092D7C 4E 80 04 21 */ bctrl /* 80095E20 00092D80 3C 80 80 5A */ lis r4, lbl_805A6754@ha /* 80095E24 00092D84 80 1D 00 A0 */ lwz r0, 0xa0(r29) /* 80095E28 00092D88 38 A4 67 54 */ addi r5, r4, lbl_805A6754@l @@ -715,7 +715,7 @@ GetDesiredMiniMapCameraDistance__11CAutoMapperCFRC13CStateManager: /* 80095E70 00092DD0 90 01 00 34 */ stw r0, 0x34(r1) /* 80095E74 00092DD4 81 8C 00 20 */ lwz r12, 0x20(r12) /* 80095E78 00092DD8 7D 89 03 A6 */ mtctr r12 -/* 80095E7C 00092DDC 4E 80 04 21 */ bctrl +/* 80095E7C 00092DDC 4E 80 04 21 */ bctrl /* 80095E80 00092DE0 80 9D 00 A0 */ lwz r4, 0xa0(r29) /* 80095E84 00092DE4 7C 77 1B 78 */ mr r23, r3 /* 80095E88 00092DE8 7F C3 F3 78 */ mr r3, r30 @@ -739,7 +739,7 @@ lbl_80095EBC: /* 80095EC8 00092E28 38 61 00 30 */ addi r3, r1, 0x30 /* 80095ECC 00092E2C 81 8C 00 18 */ lwz r12, 0x18(r12) /* 80095ED0 00092E30 7D 89 03 A6 */ mtctr r12 -/* 80095ED4 00092E34 4E 80 04 21 */ bctrl +/* 80095ED4 00092E34 4E 80 04 21 */ bctrl /* 80095ED8 00092E38 83 21 00 30 */ lwz r25, 0x30(r1) lbl_80095EDC: /* 80095EDC 00092E3C 7F C3 F3 78 */ mr r3, r30 @@ -790,7 +790,7 @@ lbl_80095F80: /* 80095F84 00092EE4 81 97 00 00 */ lwz r12, 0(r23) /* 80095F88 00092EE8 81 8C 00 14 */ lwz r12, 0x14(r12) /* 80095F8C 00092EEC 7D 89 03 A6 */ mtctr r12 -/* 80095F90 00092EF0 4E 80 04 21 */ bctrl +/* 80095F90 00092EF0 4E 80 04 21 */ bctrl lbl_80095F94: /* 80095F94 00092EF4 7C 15 18 00 */ cmpw r21, r3 /* 80095F98 00092EF8 41 80 FF 14 */ blt lbl_80095EAC @@ -901,7 +901,7 @@ lbl_80096064: /* 80096124 00093084 80 01 01 74 */ lwz r0, 0x174(r1) /* 80096128 00093088 7C 08 03 A6 */ mtlr r0 /* 8009612C 0009308C 38 21 01 70 */ addi r1, r1, 0x170 -/* 80096130 00093090 4E 80 00 20 */ blr +/* 80096130 00093090 4E 80 00 20 */ blr .global GetClampedMapScreenCameraDistance__11CAutoMapperCFf GetClampedMapScreenCameraDistance__11CAutoMapperCFf: @@ -930,7 +930,7 @@ lbl_80096184: /* 80096184 000930E4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80096188 000930E8 7C 08 03 A6 */ mtlr r0 /* 8009618C 000930EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80096190 000930F0 4E 80 00 20 */ blr +/* 80096190 000930F0 4E 80 00 20 */ blr .global GetMapAreaMiniMapDrawAlphaOutlineUnvisited__11CAutoMapperFRC13CStateManager GetMapAreaMiniMapDrawAlphaOutlineUnvisited__11CAutoMapperFRC13CStateManager: @@ -944,7 +944,7 @@ GetMapAreaMiniMapDrawAlphaOutlineUnvisited__11CAutoMapperFRC13CStateManager: /* 800961B0 00093110 C0 44 00 9C */ lfs f2, 0x9c(r4) /* 800961B4 00093114 EC 01 18 3A */ fmadds f0, f1, f0, f3 /* 800961B8 00093118 EC 22 00 32 */ fmuls f1, f2, f0 -/* 800961BC 0009311C 4E 80 00 20 */ blr +/* 800961BC 0009311C 4E 80 00 20 */ blr .global GetMapAreaMiniMapDrawAlphaSurfaceUnvisited__11CAutoMapperFRC13CStateManager GetMapAreaMiniMapDrawAlphaSurfaceUnvisited__11CAutoMapperFRC13CStateManager: @@ -958,7 +958,7 @@ GetMapAreaMiniMapDrawAlphaSurfaceUnvisited__11CAutoMapperFRC13CStateManager: /* 800961DC 0009313C C0 44 00 94 */ lfs f2, 0x94(r4) /* 800961E0 00093140 EC 01 18 3A */ fmadds f0, f1, f0, f3 /* 800961E4 00093144 EC 22 00 32 */ fmuls f1, f2, f0 -/* 800961E8 00093148 4E 80 00 20 */ blr +/* 800961E8 00093148 4E 80 00 20 */ blr .global GetMapAreaMiniMapDrawAlphaOutlineVisited__11CAutoMapperFRC13CStateManager GetMapAreaMiniMapDrawAlphaOutlineVisited__11CAutoMapperFRC13CStateManager: @@ -972,7 +972,7 @@ GetMapAreaMiniMapDrawAlphaOutlineVisited__11CAutoMapperFRC13CStateManager: /* 80096208 00093168 C0 44 00 8C */ lfs f2, 0x8c(r4) /* 8009620C 0009316C EC 01 18 3A */ fmadds f0, f1, f0, f3 /* 80096210 00093170 EC 22 00 32 */ fmuls f1, f2, f0 -/* 80096214 00093174 4E 80 00 20 */ blr +/* 80096214 00093174 4E 80 00 20 */ blr .global GetMapAreaMiniMapDrawAlphaSurfaceVisited__11CAutoMapperFRC13CStateManager GetMapAreaMiniMapDrawAlphaSurfaceVisited__11CAutoMapperFRC13CStateManager: @@ -986,7 +986,7 @@ GetMapAreaMiniMapDrawAlphaSurfaceVisited__11CAutoMapperFRC13CStateManager: /* 80096234 00093194 C0 44 00 84 */ lfs f2, 0x84(r4) /* 80096238 00093198 EC 01 18 3A */ fmadds f0, f1, f0, f3 /* 8009623C 0009319C EC 22 00 32 */ fmuls f1, f2, f0 -/* 80096240 000931A0 4E 80 00 20 */ blr +/* 80096240 000931A0 4E 80 00 20 */ blr .global GetMapAreaMaxDrawDepth__11CAutoMapperCFRC13CStateManageri GetMapAreaMaxDrawDepth__11CAutoMapperCFRC13CStateManageri: @@ -1001,7 +1001,7 @@ GetMapAreaMaxDrawDepth__11CAutoMapperCFRC13CStateManageri: /* 80096264 000931C4 7F E3 FB 78 */ mr r3, r31 /* 80096268 000931C8 81 8C 00 18 */ lwz r12, 0x18(r12) /* 8009626C 000931CC 7D 89 03 A6 */ mtctr r12 -/* 80096270 000931D0 4E 80 04 21 */ bctrl +/* 80096270 000931D0 4E 80 04 21 */ bctrl /* 80096274 000931D4 7F E4 FB 78 */ mr r4, r31 /* 80096278 000931D8 7F C5 F3 78 */ mr r5, r30 /* 8009627C 000931DC 48 00 AD 85 */ bl GetCurrentMapAreaDepth__9CMapWorldCFRC6IWorldi @@ -1017,12 +1017,12 @@ GetMapAreaMaxDrawDepth__11CAutoMapperCFRC13CStateManageri: /* 800962A4 00093204 80 01 00 24 */ lwz r0, 0x24(r1) /* 800962A8 00093208 7C 08 03 A6 */ mtlr r0 /* 800962AC 0009320C 38 21 00 20 */ addi r1, r1, 0x20 -/* 800962B0 00093210 4E 80 00 20 */ blr +/* 800962B0 00093210 4E 80 00 20 */ blr .global GetMapAreaMiniMapDrawDepth__11CAutoMapperFv GetMapAreaMiniMapDrawDepth__11CAutoMapperFv: /* 800962B4 00093214 C0 22 8B 90 */ lfs f1, lbl_805AA8B0@sda21(r2) -/* 800962B8 00093218 4E 80 00 20 */ blr +/* 800962B8 00093218 4E 80 00 20 */ blr .global GetMapScreenViewportSize__11CAutoMapperFv GetMapScreenViewportSize__11CAutoMapperFv: @@ -1037,7 +1037,7 @@ GetMapScreenViewportSize__11CAutoMapperFv: /* 800962DC 0009323C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800962E0 00093240 7C 08 03 A6 */ mtlr r0 /* 800962E4 00093244 38 21 00 10 */ addi r1, r1, 0x10 -/* 800962E8 00093248 4E 80 00 20 */ blr +/* 800962E8 00093248 4E 80 00 20 */ blr .global GetMiniMapViewportSize__11CAutoMapperFv GetMiniMapViewportSize__11CAutoMapperFv: @@ -1079,7 +1079,7 @@ GetMiniMapViewportSize__11CAutoMapperFv: /* 80096378 000932D8 80 01 00 34 */ lwz r0, 0x34(r1) /* 8009637C 000932DC 7C 08 03 A6 */ mtlr r0 /* 80096380 000932E0 38 21 00 30 */ addi r1, r1, 0x30 -/* 80096384 000932E4 4E 80 00 20 */ blr +/* 80096384 000932E4 4E 80 00 20 */ blr .global FindClosestVisibleWorld__11CAutoMapperCFRC9CVector3fRC13CUnitVector3fRC13CStateManager FindClosestVisibleWorld__11CAutoMapperCFRC9CVector3fRC13CUnitVector3fRC13CStateManager: @@ -1231,7 +1231,7 @@ lbl_8009656C: /* 800965AC 0009350C 80 01 00 D4 */ lwz r0, 0xd4(r1) /* 800965B0 00093510 7C 08 03 A6 */ mtlr r0 /* 800965B4 00093514 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 800965B8 00093518 4E 80 00 20 */ blr +/* 800965B8 00093518 4E 80 00 20 */ blr .global FindClosestVisibleArea__11CAutoMapperCFRC9CVector3fRC13CUnitVector3fRC13CStateManagerRC6IWorldRC13CMapWorldInfo FindClosestVisibleArea__11CAutoMapperCFRC9CVector3fRC13CUnitVector3fRC13CStateManagerRC6IWorldRC13CMapWorldInfo: @@ -1258,7 +1258,7 @@ FindClosestVisibleArea__11CAutoMapperCFRC9CVector3fRC13CUnitVector3fRC13CStateMa /* 8009660C 0009356C 7D 16 43 78 */ mr r22, r8 /* 80096610 00093570 81 8C 00 18 */ lwz r12, 0x18(r12) /* 80096614 00093574 7D 89 03 A6 */ mtctr r12 -/* 80096618 00093578 4E 80 04 21 */ bctrl +/* 80096618 00093578 4E 80 04 21 */ bctrl /* 8009661C 0009357C 7C 7F 1B 78 */ mr r31, r3 /* 80096620 00093580 83 D7 00 A0 */ lwz r30, 0xa0(r23) /* 80096624 00093584 C3 82 8B A0 */ lfs f28, lbl_805AA8C0@sda21(r2) @@ -1487,7 +1487,7 @@ lbl_8009691C: /* 80096948 000938A8 80 01 01 94 */ lwz r0, 0x194(r1) /* 8009694C 000938AC 7C 08 03 A6 */ mtlr r0 /* 80096950 000938B0 38 21 01 90 */ addi r1, r1, 0x190 -/* 80096954 000938B4 4E 80 00 20 */ blr +/* 80096954 000938B4 4E 80 00 20 */ blr .global GetAreaPointOfInterest__11CAutoMapperCFRC13CStateManageri GetAreaPointOfInterest__11CAutoMapperCFRC13CStateManageri: @@ -1505,7 +1505,7 @@ GetAreaPointOfInterest__11CAutoMapperCFRC13CStateManageri: /* 80096984 000938E4 7F C3 F3 78 */ mr r3, r30 /* 80096988 000938E8 81 8C 00 18 */ lwz r12, 0x18(r12) /* 8009698C 000938EC 7D 89 03 A6 */ mtctr r12 -/* 80096990 000938F0 4E 80 04 21 */ bctrl +/* 80096990 000938F0 4E 80 04 21 */ bctrl /* 80096994 000938F4 7F A4 EB 78 */ mr r4, r29 /* 80096998 000938F8 48 00 AA 21 */ bl GetMapArea__9CMapWorldCFi /* 8009699C 000938FC 7C 7F 1B 78 */ mr r31, r3 @@ -1528,7 +1528,7 @@ GetAreaPointOfInterest__11CAutoMapperCFRC13CStateManageri: /* 800969E0 00093940 83 81 00 50 */ lwz r28, 0x50(r1) /* 800969E4 00093944 7C 08 03 A6 */ mtlr r0 /* 800969E8 00093948 38 21 00 60 */ addi r1, r1, 0x60 -/* 800969EC 0009394C 4E 80 00 20 */ blr +/* 800969EC 0009394C 4E 80 00 20 */ blr .global GetMiniMapCameraOrientation__11CAutoMapperFRC13CStateManager GetMiniMapCameraOrientation__11CAutoMapperFRC13CStateManager: @@ -1590,7 +1590,7 @@ lbl_80096A84: /* 80096AC8 00093A28 83 E1 00 6C */ lwz r31, 0x6c(r1) /* 80096ACC 00093A2C 7C 08 03 A6 */ mtlr r0 /* 80096AD0 00093A30 38 21 00 80 */ addi r1, r1, 0x80 -/* 80096AD4 00093A34 4E 80 00 20 */ blr +/* 80096AD4 00093A34 4E 80 00 20 */ blr .global LeaveMapScreenState__11CAutoMapperFv LeaveMapScreenState__11CAutoMapperFv: @@ -1611,7 +1611,7 @@ LeaveMapScreenState__11CAutoMapperFv: /* 80096B10 00093A70 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80096B14 00093A74 7C 08 03 A6 */ mtlr r0 /* 80096B18 00093A78 38 21 00 10 */ addi r1, r1, 0x10 -/* 80096B1C 00093A7C 4E 80 00 20 */ blr +/* 80096B1C 00093A7C 4E 80 00 20 */ blr .global SetShouldRotatingSoundBePlaying__11CAutoMapperFb SetShouldRotatingSoundBePlaying__11CAutoMapperFb: @@ -1649,7 +1649,7 @@ lbl_80096B90: /* 80096B94 00093AF4 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80096B98 00093AF8 7C 08 03 A6 */ mtlr r0 /* 80096B9C 00093AFC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80096BA0 00093B00 4E 80 00 20 */ blr +/* 80096BA0 00093B00 4E 80 00 20 */ blr .global SetShouldZoomingSoundBePlaying__11CAutoMapperFb SetShouldZoomingSoundBePlaying__11CAutoMapperFb: @@ -1687,7 +1687,7 @@ lbl_80096C14: /* 80096C18 00093B78 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80096C1C 00093B7C 7C 08 03 A6 */ mtlr r0 /* 80096C20 00093B80 38 21 00 20 */ addi r1, r1, 0x20 -/* 80096C24 00093B84 4E 80 00 20 */ blr +/* 80096C24 00093B84 4E 80 00 20 */ blr .global SetShouldPanningSoundBePlaying__11CAutoMapperFb SetShouldPanningSoundBePlaying__11CAutoMapperFb: @@ -1725,7 +1725,7 @@ lbl_80096C98: /* 80096C9C 00093BFC 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80096CA0 00093C00 7C 08 03 A6 */ mtlr r0 /* 80096CA4 00093C04 38 21 00 20 */ addi r1, r1, 0x20 -/* 80096CA8 00093C08 4E 80 00 20 */ blr +/* 80096CA8 00093C08 4E 80 00 20 */ blr .global BuildMapScreenUniverseRenderState__11CAutoMapperCFRC13CStateManagerRC11CQuaternioni BuildMapScreenUniverseRenderState__11CAutoMapperCFRC13CStateManagerRC11CQuaternioni: @@ -1792,7 +1792,7 @@ BuildMapScreenUniverseRenderState__11CAutoMapperCFRC13CStateManagerRC11CQuaterni /* 80096D9C 00093CFC 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 80096DA0 00093D00 7C 08 03 A6 */ mtlr r0 /* 80096DA4 00093D04 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 80096DA8 00093D08 4E 80 00 20 */ blr +/* 80096DA8 00093D08 4E 80 00 20 */ blr .global __ct__Q211CAutoMapper22SAutoMapperRenderStateFRCQ211CAutoMapper22SAutoMapperRenderState __ct__Q211CAutoMapper22SAutoMapperRenderStateFRCQ211CAutoMapper22SAutoMapperRenderState: @@ -1842,7 +1842,7 @@ __ct__Q211CAutoMapper22SAutoMapperRenderStateFRCQ211CAutoMapper22SAutoMapperRend /* 80096E58 00093DB8 90 03 00 54 */ stw r0, 0x54(r3) /* 80096E5C 00093DBC 80 04 00 58 */ lwz r0, 0x58(r4) /* 80096E60 00093DC0 90 03 00 58 */ stw r0, 0x58(r3) -/* 80096E64 00093DC4 4E 80 00 20 */ blr +/* 80096E64 00093DC4 4E 80 00 20 */ blr .global BuildMapScreenWorldRenderState__11CAutoMapperCFRC13CStateManagerRC11CQuaternioni BuildMapScreenWorldRenderState__11CAutoMapperCFRC13CStateManagerRC11CQuaternioni: @@ -1923,7 +1923,7 @@ lbl_80096EC0: /* 80096F88 00093EE8 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 80096F8C 00093EEC 7C 08 03 A6 */ mtlr r0 /* 80096F90 00093EF0 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 80096F94 00093EF4 4E 80 00 20 */ blr +/* 80096F94 00093EF4 4E 80 00 20 */ blr .global BuildMiniMapWorldRenderState__11CAutoMapperCFRC13CStateManagerRC11CQuaternioni BuildMiniMapWorldRenderState__11CAutoMapperCFRC13CStateManagerRC11CQuaternioni: @@ -2048,14 +2048,14 @@ lbl_80097050: /* 80097168 000940C8 80 01 01 24 */ lwz r0, 0x124(r1) /* 8009716C 000940CC 7C 08 03 A6 */ mtlr r0 /* 80097170 000940D0 38 21 01 20 */ addi r1, r1, 0x120 -/* 80097174 000940D4 4E 80 00 20 */ blr +/* 80097174 000940D4 4E 80 00 20 */ blr .global ResetInterpolationTimer__11CAutoMapperFf ResetInterpolationTimer__11CAutoMapperFf: /* 80097178 000940D8 D0 23 01 C4 */ stfs f1, 0x1c4(r3) /* 8009717C 000940DC C0 02 8B A8 */ lfs f0, lbl_805AA8C8@sda21(r2) /* 80097180 000940E0 D0 03 01 C8 */ stfs f0, 0x1c8(r3) -/* 80097184 000940E4 4E 80 00 20 */ blr +/* 80097184 000940E4 4E 80 00 20 */ blr .global CompleteMapperStateTransition__11CAutoMapperFv CompleteMapperStateTransition__11CAutoMapperFv: @@ -2080,14 +2080,14 @@ lbl_800971BC: /* 800971CC 0009412C 81 83 00 00 */ lwz r12, 0(r3) /* 800971D0 00094130 81 8C 00 18 */ lwz r12, 0x18(r12) /* 800971D4 00094134 7D 89 03 A6 */ mtctr r12 -/* 800971D8 00094138 4E 80 04 21 */ bctrl +/* 800971D8 00094138 4E 80 04 21 */ bctrl /* 800971DC 0009413C 7C 7E 1B 78 */ mr r30, r3 /* 800971E0 00094140 48 00 9F A1 */ bl IsMapAreasStreaming__9CMapWorldCFv /* 800971E4 00094144 80 7C 00 24 */ lwz r3, 0x24(r28) /* 800971E8 00094148 81 83 00 00 */ lwz r12, 0(r3) /* 800971EC 0009414C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800971F0 00094150 7D 89 03 A6 */ mtctr r12 -/* 800971F4 00094154 4E 80 04 21 */ bctrl +/* 800971F4 00094154 4E 80 04 21 */ bctrl /* 800971F8 00094158 7C 64 1B 78 */ mr r4, r3 /* 800971FC 0009415C 80 6D A0 80 */ lwz r3, gpGameState@sda21(r13) /* 80097200 00094160 48 13 C7 D9 */ bl StateForWorld__10CGameStateFUi @@ -2171,7 +2171,7 @@ lbl_8009730C: /* 80097324 00094284 83 81 00 10 */ lwz r28, 0x10(r1) /* 80097328 00094288 7C 08 03 A6 */ mtlr r0 /* 8009732C 0009428C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80097330 00094290 4E 80 00 20 */ blr +/* 80097330 00094290 4E 80 00 20 */ blr .global BeginMapperStateTransition__11CAutoMapperFQ211CAutoMapper16EAutoMapperStateRC13CStateManager BeginMapperStateTransition__11CAutoMapperFQ211CAutoMapper16EAutoMapperStateRC13CStateManager: @@ -2366,7 +2366,7 @@ lbl_800975FC: /* 80097614 00094574 81 84 00 00 */ lwz r12, 0(r4) /* 80097618 00094578 81 8C 00 24 */ lwz r12, 0x24(r12) /* 8009761C 0009457C 7D 89 03 A6 */ mtctr r12 -/* 80097620 00094580 4E 80 04 21 */ bctrl +/* 80097620 00094580 4E 80 04 21 */ bctrl /* 80097624 00094584 80 01 00 14 */ lwz r0, 0x14(r1) /* 80097628 00094588 7F 84 E3 78 */ mr r4, r28 /* 8009762C 0009458C 7F A5 EB 78 */ mr r5, r29 @@ -2618,7 +2618,7 @@ lbl_800979B0: /* 800979EC 0009494C 38 80 00 01 */ li r4, 1 /* 800979F0 00094950 81 8C 00 08 */ lwz r12, 8(r12) /* 800979F4 00094954 7D 89 03 A6 */ mtctr r12 -/* 800979F8 00094958 4E 80 04 21 */ bctrl +/* 800979F8 00094958 4E 80 04 21 */ bctrl lbl_800979FC: /* 800979FC 0009495C 88 61 00 20 */ lbz r3, 0x20(r1) /* 80097A00 00094960 38 00 00 00 */ li r0, 0 @@ -2637,7 +2637,7 @@ lbl_80097A14: /* 80097A30 00094990 38 80 00 01 */ li r4, 1 /* 80097A34 00094994 81 8C 00 08 */ lwz r12, 8(r12) /* 80097A38 00094998 7D 89 03 A6 */ mtctr r12 -/* 80097A3C 0009499C 4E 80 04 21 */ bctrl +/* 80097A3C 0009499C 4E 80 04 21 */ bctrl lbl_80097A40: /* 80097A40 000949A0 3B FF 00 08 */ addi r31, r31, 8 /* 80097A44 000949A4 3B DE 00 01 */ addi r30, r30, 1 @@ -2658,7 +2658,7 @@ lbl_80097A58: /* 80097A78 000949D8 81 84 00 00 */ lwz r12, 0(r4) /* 80097A7C 000949DC 81 8C 00 24 */ lwz r12, 0x24(r12) /* 80097A80 000949E0 7D 89 03 A6 */ mtctr r12 -/* 80097A84 000949E4 4E 80 04 21 */ bctrl +/* 80097A84 000949E4 4E 80 04 21 */ bctrl /* 80097A88 000949E8 80 01 00 08 */ lwz r0, 8(r1) /* 80097A8C 000949EC 7F 84 E3 78 */ mr r4, r28 /* 80097A90 000949F0 7F A5 EB 78 */ mr r5, r29 @@ -2717,7 +2717,7 @@ lbl_80097A58: /* 80097B64 00094AC4 81 83 00 00 */ lwz r12, 0(r3) /* 80097B68 00094AC8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80097B6C 00094ACC 7D 89 03 A6 */ mtctr r12 -/* 80097B70 00094AD0 4E 80 04 21 */ bctrl +/* 80097B70 00094AD0 4E 80 04 21 */ bctrl /* 80097B74 00094AD4 7C 64 1B 78 */ mr r4, r3 /* 80097B78 00094AD8 7F 83 E3 78 */ mr r3, r28 /* 80097B7C 00094ADC 4B FF DD C1 */ bl SetCurWorldAssetId__11CAutoMapperFi @@ -2760,7 +2760,7 @@ lbl_80097BCC: /* 80097C04 00094B64 38 80 00 01 */ li r4, 1 /* 80097C08 00094B68 81 8C 00 08 */ lwz r12, 8(r12) /* 80097C0C 00094B6C 7D 89 03 A6 */ mtctr r12 -/* 80097C10 00094B70 4E 80 04 21 */ bctrl +/* 80097C10 00094B70 4E 80 04 21 */ bctrl lbl_80097C14: /* 80097C14 00094B74 88 61 00 18 */ lbz r3, 0x18(r1) /* 80097C18 00094B78 38 00 00 00 */ li r0, 0 @@ -2779,7 +2779,7 @@ lbl_80097C2C: /* 80097C48 00094BA8 38 80 00 01 */ li r4, 1 /* 80097C4C 00094BAC 81 8C 00 08 */ lwz r12, 8(r12) /* 80097C50 00094BB0 7D 89 03 A6 */ mtctr r12 -/* 80097C54 00094BB4 4E 80 04 21 */ bctrl +/* 80097C54 00094BB4 4E 80 04 21 */ bctrl lbl_80097C58: /* 80097C58 00094BB8 3B DE 00 08 */ addi r30, r30, 8 /* 80097C5C 00094BBC 3B FF 00 01 */ addi r31, r31, 1 @@ -2792,7 +2792,7 @@ lbl_80097C6C: /* 80097C70 00094BD0 80 01 02 14 */ lwz r0, 0x214(r1) /* 80097C74 00094BD4 7C 08 03 A6 */ mtlr r0 /* 80097C78 00094BD8 38 21 02 10 */ addi r1, r1, 0x210 -/* 80097C7C 00094BDC 4E 80 00 20 */ blr +/* 80097C7C 00094BDC 4E 80 00 20 */ blr .global Update__11CAutoMapperFfRC13CStateManager Update__11CAutoMapperFfRC13CStateManager: @@ -3380,7 +3380,7 @@ lbl_800984F4: /* 800984FC 0009545C 81 84 00 00 */ lwz r12, 0(r4) /* 80098500 00095460 81 8C 00 24 */ lwz r12, 0x24(r12) /* 80098504 00095464 7D 89 03 A6 */ mtctr r12 -/* 80098508 00095468 4E 80 04 21 */ bctrl +/* 80098508 00095468 4E 80 04 21 */ bctrl /* 8009850C 0009546C 80 01 00 48 */ lwz r0, 0x48(r1) /* 80098510 00095470 80 7F 00 A0 */ lwz r3, 0xa0(r31) /* 80098514 00095474 7C 00 18 00 */ cmpw r0, r3 @@ -3573,14 +3573,14 @@ lbl_800987D4: /* 800987E8 00095748 81 83 00 00 */ lwz r12, 0(r3) /* 800987EC 0009574C 81 8C 00 18 */ lwz r12, 0x18(r12) /* 800987F0 00095750 7D 89 03 A6 */ mtctr r12 -/* 800987F4 00095754 4E 80 04 21 */ bctrl +/* 800987F4 00095754 4E 80 04 21 */ bctrl /* 800987F8 00095758 7C 60 1B 78 */ mr r0, r3 /* 800987FC 0009575C 80 7F 00 24 */ lwz r3, 0x24(r31) /* 80098800 00095760 7C 1C 03 78 */ mr r28, r0 /* 80098804 00095764 81 83 00 00 */ lwz r12, 0(r3) /* 80098808 00095768 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8009880C 0009576C 7D 89 03 A6 */ mtctr r12 -/* 80098810 00095770 4E 80 04 21 */ bctrl +/* 80098810 00095770 4E 80 04 21 */ bctrl /* 80098814 00095774 7C 64 1B 78 */ mr r4, r3 /* 80098818 00095778 80 6D A0 80 */ lwz r3, gpGameState@sda21(r13) /* 8009881C 0009577C 48 13 B1 BD */ bl StateForWorld__10CGameStateFUi @@ -3657,14 +3657,14 @@ lbl_800988EC: /* 80098924 00095884 81 9D 00 00 */ lwz r12, 0(r29) /* 80098928 00095888 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8009892C 0009588C 7D 89 03 A6 */ mtctr r12 -/* 80098930 00095890 4E 80 04 21 */ bctrl +/* 80098930 00095890 4E 80 04 21 */ bctrl /* 80098934 00095894 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80098938 00095898 41 82 00 20 */ beq lbl_80098958 /* 8009893C 0009589C 7F A3 EB 78 */ mr r3, r29 /* 80098940 000958A0 81 9D 00 00 */ lwz r12, 0(r29) /* 80098944 000958A4 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80098948 000958A8 7D 89 03 A6 */ mtctr r12 -/* 8009894C 000958AC 4E 80 04 21 */ bctrl +/* 8009894C 000958AC 4E 80 04 21 */ bctrl /* 80098950 000958B0 7C 7C 1B 78 */ mr r28, r3 /* 80098954 000958B4 48 00 01 0C */ b lbl_80098A60 lbl_80098958: @@ -3674,7 +3674,7 @@ lbl_80098958: /* 80098964 000958C4 81 83 00 00 */ lwz r12, 0(r3) /* 80098968 000958C8 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8009896C 000958CC 7D 89 03 A6 */ mtctr r12 -/* 80098970 000958D0 4E 80 04 21 */ bctrl +/* 80098970 000958D0 4E 80 04 21 */ bctrl /* 80098974 000958D4 7C 7C 1B 78 */ mr r28, r3 /* 80098978 000958D8 48 00 00 E8 */ b lbl_80098A60 lbl_8009897C: @@ -3689,14 +3689,14 @@ lbl_8009897C: /* 8009899C 000958FC 81 83 00 00 */ lwz r12, 0(r3) /* 800989A0 00095900 81 8C 00 20 */ lwz r12, 0x20(r12) /* 800989A4 00095904 7D 89 03 A6 */ mtctr r12 -/* 800989A8 00095908 4E 80 04 21 */ bctrl +/* 800989A8 00095908 4E 80 04 21 */ bctrl /* 800989AC 0009590C 7C 60 1B 78 */ mr r0, r3 /* 800989B0 00095910 80 7F 00 24 */ lwz r3, 0x24(r31) /* 800989B4 00095914 7C 1C 03 78 */ mr r28, r0 /* 800989B8 00095918 81 83 00 00 */ lwz r12, 0(r3) /* 800989BC 0009591C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800989C0 00095920 7D 89 03 A6 */ mtctr r12 -/* 800989C4 00095924 4E 80 04 21 */ bctrl +/* 800989C4 00095924 4E 80 04 21 */ bctrl /* 800989C8 00095928 7C 64 1B 78 */ mr r4, r3 /* 800989CC 0009592C 80 6D A0 80 */ lwz r3, gpGameState@sda21(r13) /* 800989D0 00095930 48 13 B0 09 */ bl StateForWorld__10CGameStateFUi @@ -3732,7 +3732,7 @@ lbl_80098A38: /* 80098A44 000959A4 81 9C 00 00 */ lwz r12, 0(r28) /* 80098A48 000959A8 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80098A4C 000959AC 7D 89 03 A6 */ mtctr r12 -/* 80098A50 000959B0 4E 80 04 21 */ bctrl +/* 80098A50 000959B0 4E 80 04 21 */ bctrl /* 80098A54 000959B4 48 00 00 08 */ b lbl_80098A5C lbl_80098A58: /* 80098A58 000959B8 38 60 FF FF */ li r3, -1 @@ -3757,7 +3757,7 @@ lbl_80098A60: /* 80098A9C 000959FC 81 84 00 00 */ lwz r12, 0(r4) /* 80098AA0 00095A00 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80098AA4 00095A04 7D 89 03 A6 */ mtctr r12 -/* 80098AA8 00095A08 4E 80 04 21 */ bctrl +/* 80098AA8 00095A08 4E 80 04 21 */ bctrl /* 80098AAC 00095A0C 38 61 00 BC */ addi r3, r1, 0xbc /* 80098AB0 00095A10 38 81 00 60 */ addi r4, r1, 0x60 /* 80098AB4 00095A14 48 2A 83 F5 */ bl __ct__6CTokenFRC6CToken @@ -3921,11 +3921,11 @@ lbl_80098CC4: /* 80098CEC 00095C4C 81 83 00 00 */ lwz r12, 0(r3) /* 80098CF0 00095C50 81 8C 00 20 */ lwz r12, 0x20(r12) /* 80098CF4 00095C54 7D 89 03 A6 */ mtctr r12 -/* 80098CF8 00095C58 4E 80 04 21 */ bctrl +/* 80098CF8 00095C58 4E 80 04 21 */ bctrl /* 80098CFC 00095C5C 81 83 00 00 */ lwz r12, 0(r3) /* 80098D00 00095C60 81 8C 00 20 */ lwz r12, 0x20(r12) /* 80098D04 00095C64 7D 89 03 A6 */ mtctr r12 -/* 80098D08 00095C68 4E 80 04 21 */ bctrl +/* 80098D08 00095C68 4E 80 04 21 */ bctrl /* 80098D0C 00095C6C 7C 64 1B 78 */ mr r4, r3 /* 80098D10 00095C70 7F E3 FB 78 */ mr r3, r31 /* 80098D14 00095C74 48 00 02 05 */ bl GetAreaHintDescriptionString__11CAutoMapperFUi @@ -3947,7 +3947,7 @@ lbl_80098CC4: /* 80098D54 00095CB4 81 84 00 00 */ lwz r12, 0(r4) /* 80098D58 00095CB8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80098D5C 00095CBC 7D 89 03 A6 */ mtctr r12 -/* 80098D60 00095CC0 4E 80 04 21 */ bctrl +/* 80098D60 00095CC0 4E 80 04 21 */ bctrl /* 80098D64 00095CC4 38 61 00 80 */ addi r3, r1, 0x80 /* 80098D68 00095CC8 38 81 00 50 */ addi r4, r1, 0x50 /* 80098D6C 00095CCC 48 2A 81 3D */ bl __ct__6CTokenFRC6CToken @@ -4051,7 +4051,7 @@ lbl_80098EB0: /* 80098EC4 00095E24 81 83 00 00 */ lwz r12, 0(r3) /* 80098EC8 00095E28 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80098ECC 00095E2C 7D 89 03 A6 */ mtctr r12 -/* 80098ED0 00095E30 4E 80 04 21 */ bctrl +/* 80098ED0 00095E30 4E 80 04 21 */ bctrl lbl_80098ED4: /* 80098ED4 00095E34 3B BD 00 08 */ addi r29, r29, 8 /* 80098ED8 00095E38 3B 9C 00 01 */ addi r28, r28, 1 @@ -4070,7 +4070,7 @@ lbl_80098EDC: /* 80098F08 00095E68 83 81 03 10 */ lwz r28, 0x310(r1) /* 80098F0C 00095E6C 7C 08 03 A6 */ mtlr r0 /* 80098F10 00095E70 38 21 03 40 */ addi r1, r1, 0x340 -/* 80098F14 00095E74 4E 80 00 20 */ blr +/* 80098F14 00095E74 4E 80 00 20 */ blr .global GetAreaHintDescriptionString__11CAutoMapperFUi GetAreaHintDescriptionString__11CAutoMapperFUi: @@ -4141,7 +4141,7 @@ lbl_80098FEC: /* 80098FF4 00095F54 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80098FF8 00095F58 83 81 00 10 */ lwz r28, 0x10(r1) /* 80098FFC 00095F5C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80099000 00095F60 4E 80 00 20 */ blr +/* 80099000 00095F60 4E 80 00 20 */ blr .global Draw__11CAutoMapperCFRC13CStateManagerRC12CTransform4ff Draw__11CAutoMapperCFRC13CStateManagerRC12CTransform4ff: @@ -4175,7 +4175,7 @@ Draw__11CAutoMapperCFRC13CStateManagerRC12CTransform4ff: /* 80099070 00095FD0 81 83 00 00 */ lwz r12, 0(r3) /* 80099074 00095FD4 81 8C 00 68 */ lwz r12, 0x68(r12) /* 80099078 00095FD8 7D 89 03 A6 */ mtctr r12 -/* 8009907C 00095FDC 4E 80 04 21 */ bctrl +/* 8009907C 00095FDC 4E 80 04 21 */ bctrl /* 80099080 00095FE0 38 60 00 01 */ li r3, 1 /* 80099084 00095FE4 48 27 29 ED */ bl SetCullMode__9CGraphicsF12ERglCullMode /* 80099088 00095FE8 80 1F 01 BC */ lwz r0, 0x1bc(r31) @@ -4397,7 +4397,7 @@ lbl_80099378: /* 80099398 000962F8 81 83 00 00 */ lwz r12, 0(r3) /* 8009939C 000962FC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800993A0 00096300 7D 89 03 A6 */ mtctr r12 -/* 800993A4 00096304 4E 80 04 21 */ bctrl +/* 800993A4 00096304 4E 80 04 21 */ bctrl /* 800993A8 00096308 7C 64 1B 78 */ mr r4, r3 /* 800993AC 0009630C 80 6D A0 80 */ lwz r3, gpGameState@sda21(r13) /* 800993B0 00096310 48 13 A6 29 */ bl StateForWorld__10CGameStateFUi @@ -4412,7 +4412,7 @@ lbl_80099378: /* 800993D4 00096334 81 83 00 00 */ lwz r12, 0(r3) /* 800993D8 00096338 81 8C 00 18 */ lwz r12, 0x18(r12) /* 800993DC 0009633C 7D 89 03 A6 */ mtctr r12 -/* 800993E0 00096340 4E 80 04 21 */ bctrl +/* 800993E0 00096340 4E 80 04 21 */ bctrl /* 800993E4 00096344 80 1F 01 F4 */ lwz r0, 0x1f4(r31) /* 800993E8 00096348 7C 7B 1B 78 */ mr r27, r3 /* 800993EC 0009634C C3 42 8B A8 */ lfs f26, lbl_805AA8C8@sda21(r2) @@ -4457,7 +4457,7 @@ lbl_80099474: /* 80099478 000963D8 81 83 00 00 */ lwz r12, 0(r3) /* 8009947C 000963DC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80099480 000963E0 7D 89 03 A6 */ mtctr r12 -/* 80099484 000963E4 4E 80 04 21 */ bctrl +/* 80099484 000963E4 4E 80 04 21 */ bctrl /* 80099488 000963E8 80 1A 00 10 */ lwz r0, 0x10(r26) /* 8009948C 000963EC 7C 00 18 40 */ cmplw r0, r3 /* 80099490 000963F0 40 82 00 80 */ bne lbl_80099510 @@ -4549,14 +4549,14 @@ lbl_800995B0: /* 800995C8 00096528 81 83 00 00 */ lwz r12, 0(r3) /* 800995CC 0009652C 81 8C 00 18 */ lwz r12, 0x18(r12) /* 800995D0 00096530 7D 89 03 A6 */ mtctr r12 -/* 800995D4 00096534 4E 80 04 21 */ bctrl +/* 800995D4 00096534 4E 80 04 21 */ bctrl /* 800995D8 00096538 7C 60 1B 78 */ mr r0, r3 /* 800995DC 0009653C 80 7F 00 24 */ lwz r3, 0x24(r31) /* 800995E0 00096540 7C 1A 03 78 */ mr r26, r0 /* 800995E4 00096544 81 83 00 00 */ lwz r12, 0(r3) /* 800995E8 00096548 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800995EC 0009654C 7D 89 03 A6 */ mtctr r12 -/* 800995F0 00096550 4E 80 04 21 */ bctrl +/* 800995F0 00096550 4E 80 04 21 */ bctrl /* 800995F4 00096554 7C 64 1B 78 */ mr r4, r3 /* 800995F8 00096558 80 6D A0 80 */ lwz r3, gpGameState@sda21(r13) /* 800995FC 0009655C 48 13 A3 DD */ bl StateForWorld__10CGameStateFUi @@ -4603,14 +4603,14 @@ lbl_80099698: /* 8009969C 000965FC 81 83 00 00 */ lwz r12, 0(r3) /* 800996A0 00096600 81 8C 00 18 */ lwz r12, 0x18(r12) /* 800996A4 00096604 7D 89 03 A6 */ mtctr r12 -/* 800996A8 00096608 4E 80 04 21 */ bctrl +/* 800996A8 00096608 4E 80 04 21 */ bctrl /* 800996AC 0009660C 7C 60 1B 78 */ mr r0, r3 /* 800996B0 00096610 80 7F 00 24 */ lwz r3, 0x24(r31) /* 800996B4 00096614 7C 1C 03 78 */ mr r28, r0 /* 800996B8 00096618 81 83 00 00 */ lwz r12, 0(r3) /* 800996BC 0009661C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800996C0 00096620 7D 89 03 A6 */ mtctr r12 -/* 800996C4 00096624 4E 80 04 21 */ bctrl +/* 800996C4 00096624 4E 80 04 21 */ bctrl /* 800996C8 00096628 7C 64 1B 78 */ mr r4, r3 /* 800996CC 0009662C 80 6D A0 80 */ lwz r3, gpGameState@sda21(r13) /* 800996D0 00096630 48 13 A3 09 */ bl StateForWorld__10CGameStateFUi @@ -4870,7 +4870,7 @@ lbl_800999F0: /* 80099AA8 00096A08 81 83 00 00 */ lwz r12, 0(r3) /* 80099AAC 00096A0C 81 8C 00 30 */ lwz r12, 0x30(r12) /* 80099AB0 00096A10 7D 89 03 A6 */ mtctr r12 -/* 80099AB4 00096A14 4E 80 04 21 */ bctrl +/* 80099AB4 00096A14 4E 80 04 21 */ bctrl /* 80099AB8 00096A18 80 1F 01 BC */ lwz r0, 0x1bc(r31) /* 80099ABC 00096A1C 38 80 00 00 */ li r4, 0 /* 80099AC0 00096A20 80 7F 00 38 */ lwz r3, 0x38(r31) @@ -4932,13 +4932,13 @@ lbl_80099B78: /* 80099B90 00096AF0 81 83 00 00 */ lwz r12, 0(r3) /* 80099B94 00096AF4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80099B98 00096AF8 7D 89 03 A6 */ mtctr r12 -/* 80099B9C 00096AFC 4E 80 04 21 */ bctrl +/* 80099B9C 00096AFC 4E 80 04 21 */ bctrl /* 80099BA0 00096B00 7C 7D 1B 78 */ mr r29, r3 /* 80099BA4 00096B04 80 7F 00 24 */ lwz r3, 0x24(r31) /* 80099BA8 00096B08 81 83 00 00 */ lwz r12, 0(r3) /* 80099BAC 00096B0C 81 8C 00 18 */ lwz r12, 0x18(r12) /* 80099BB0 00096B10 7D 89 03 A6 */ mtctr r12 -/* 80099BB4 00096B14 4E 80 04 21 */ bctrl +/* 80099BB4 00096B14 4E 80 04 21 */ bctrl /* 80099BB8 00096B18 83 9F 01 FC */ lwz r28, 0x1fc(r31) /* 80099BBC 00096B1C 7C 7B 1B 78 */ mr r27, r3 /* 80099BC0 00096B20 48 00 02 70 */ b lbl_80099E30 @@ -5021,7 +5021,7 @@ lbl_80099CBC: /* 80099CEC 00096C4C 81 83 00 00 */ lwz r12, 0(r3) /* 80099CF0 00096C50 81 8C 00 64 */ lwz r12, 0x64(r12) /* 80099CF4 00096C54 7D 89 03 A6 */ mtctr r12 -/* 80099CF8 00096C58 4E 80 04 21 */ bctrl +/* 80099CF8 00096C58 4E 80 04 21 */ bctrl /* 80099CFC 00096C5C 38 60 00 98 */ li r3, 0x98 /* 80099D00 00096C60 48 27 19 69 */ bl StreamBegin__9CGraphicsF13ERglPrimitive /* 80099D04 00096C64 80 1F 01 BC */ lwz r0, 0x1bc(r31) @@ -5114,14 +5114,14 @@ lbl_80099E3C: /* 80099E48 00096DA8 81 83 00 00 */ lwz r12, 0(r3) /* 80099E4C 00096DAC 81 8C 00 60 */ lwz r12, 0x60(r12) /* 80099E50 00096DB0 7D 89 03 A6 */ mtctr r12 -/* 80099E54 00096DB4 4E 80 04 21 */ bctrl +/* 80099E54 00096DB4 4E 80 04 21 */ bctrl /* 80099E58 00096DB8 48 2B 01 55 */ bl White__6CColorFv /* 80099E5C 00096DBC 7C 64 1B 78 */ mr r4, r3 /* 80099E60 00096DC0 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 80099E64 00096DC4 81 83 00 00 */ lwz r12, 0(r3) /* 80099E68 00096DC8 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 80099E6C 00096DCC 7D 89 03 A6 */ mtctr r12 -/* 80099E70 00096DD0 4E 80 04 21 */ bctrl +/* 80099E70 00096DD0 4E 80 04 21 */ bctrl /* 80099E74 00096DD4 48 27 2B 09 */ bl DisableAllLights__9CGraphicsFv /* 80099E78 00096DD8 80 1F 00 2C */ lwz r0, 0x2c(r31) /* 80099E7C 00096DDC 28 00 00 00 */ cmplwi r0, 0 @@ -5198,7 +5198,7 @@ lbl_80099F44: /* 80099F80 00096EE0 80 01 08 C4 */ lwz r0, 0x8c4(r1) /* 80099F84 00096EE4 7C 08 03 A6 */ mtlr r0 /* 80099F88 00096EE8 38 21 08 C0 */ addi r1, r1, 0x8c0 -/* 80099F8C 00096EEC 4E 80 00 20 */ blr +/* 80099F8C 00096EEC 4E 80 00 20 */ blr .global ProcessMapPanInput__11CAutoMapperFRC11CFinalInputRC13CStateManager ProcessMapPanInput__11CAutoMapperFRC11CFinalInputRC13CStateManager: @@ -5285,7 +5285,7 @@ lbl_8009A0AC: /* 8009A0BC 0009701C 38 63 AE 7C */ addi r3, r3, lbl_803DAE7C@l /* 8009A0C0 00097020 7C 03 00 2E */ lwzx r0, r3, r0 /* 8009A0C4 00097024 7C 09 03 A6 */ mtctr r0 -/* 8009A0C8 00097028 4E 80 04 20 */ bctr +/* 8009A0C8 00097028 4E 80 04 20 */ bctr .global lbl_8009A0CC lbl_8009A0CC: /* 8009A0CC 0009702C 38 00 00 01 */ li r0, 1 @@ -5382,7 +5382,7 @@ lbl_8009A1E0: /* 8009A1F0 00097150 81 83 00 00 */ lwz r12, 0(r3) /* 8009A1F4 00097154 81 8C 00 18 */ lwz r12, 0x18(r12) /* 8009A1F8 00097158 7D 89 03 A6 */ mtctr r12 -/* 8009A1FC 0009715C 4E 80 04 21 */ bctrl +/* 8009A1FC 0009715C 4E 80 04 21 */ bctrl /* 8009A200 00097160 C0 41 01 40 */ lfs f2, 0x140(r1) /* 8009A204 00097164 7C 64 1B 78 */ mr r4, r3 /* 8009A208 00097168 C0 21 01 34 */ lfs f1, 0x134(r1) @@ -5462,7 +5462,7 @@ lbl_8009A2F4: /* 8009A324 00097284 81 83 00 00 */ lwz r12, 0(r3) /* 8009A328 00097288 81 8C 00 18 */ lwz r12, 0x18(r12) /* 8009A32C 0009728C 7D 89 03 A6 */ mtctr r12 -/* 8009A330 00097290 4E 80 04 21 */ bctrl +/* 8009A330 00097290 4E 80 04 21 */ bctrl /* 8009A334 00097294 80 9F 00 A0 */ lwz r4, 0xa0(r31) /* 8009A338 00097298 7C 7D 1B 78 */ mr r29, r3 /* 8009A33C 0009729C 48 00 70 7D */ bl GetMapArea__9CMapWorldCFi @@ -5604,7 +5604,7 @@ lbl_8009A518: /* 8009A54C 000974AC 83 A1 01 54 */ lwz r29, 0x154(r1) /* 8009A550 000974B0 7C 08 03 A6 */ mtlr r0 /* 8009A554 000974B4 38 21 01 B0 */ addi r1, r1, 0x1b0 -/* 8009A558 000974B8 4E 80 00 20 */ blr +/* 8009A558 000974B8 4E 80 00 20 */ blr .global ProcessMapZoomInput__11CAutoMapperFRC11CFinalInputRC13CStateManager ProcessMapZoomInput__11CAutoMapperFRC11CFinalInputRC13CStateManager: @@ -5728,7 +5728,7 @@ lbl_8009A6E4: /* 8009A6F8 00097658 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8009A6FC 0009765C 7C 08 03 A6 */ mtlr r0 /* 8009A700 00097660 38 21 00 30 */ addi r1, r1, 0x30 -/* 8009A704 00097664 4E 80 00 20 */ blr +/* 8009A704 00097664 4E 80 00 20 */ blr .global ProcessMapRotateInput__11CAutoMapperFRC11CFinalInputRC13CStateManager ProcessMapRotateInput__11CAutoMapperFRC11CFinalInputRC13CStateManager: @@ -5791,7 +5791,7 @@ lbl_8009A7C8: /* 8009A7D8 00097738 38 63 AE A8 */ addi r3, r3, lbl_803DAEA8@l /* 8009A7DC 0009773C 7C 03 00 2E */ lwzx r0, r3, r0 /* 8009A7E0 00097740 7C 09 03 A6 */ mtctr r0 -/* 8009A7E4 00097744 4E 80 04 20 */ bctr +/* 8009A7E4 00097744 4E 80 04 20 */ bctr .global lbl_8009A7E8 lbl_8009A7E8: /* 8009A7E8 00097748 38 00 00 01 */ li r0, 1 @@ -6122,7 +6122,7 @@ lbl_8009AC3C: /* 8009AC6C 00097BCC 83 C1 00 F8 */ lwz r30, 0xf8(r1) /* 8009AC70 00097BD0 7C 08 03 A6 */ mtlr r0 /* 8009AC74 00097BD4 38 21 01 50 */ addi r1, r1, 0x150 -/* 8009AC78 00097BD8 4E 80 00 20 */ blr +/* 8009AC78 00097BD8 4E 80 00 20 */ blr .global ProcessMapScreenInput__11CAutoMapperRC11CFinalInputRC13CStateManager ProcessMapScreenInput__11CAutoMapperRC11CFinalInputRC13CStateManager: @@ -6195,7 +6195,7 @@ lbl_8009AD70: /* 8009AD7C 00097CDC 81 83 00 00 */ lwz r12, 0(r3) /* 8009AD80 00097CE0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8009AD84 00097CE4 7D 89 03 A6 */ mtctr r12 -/* 8009AD88 00097CE8 4E 80 04 21 */ bctrl +/* 8009AD88 00097CE8 4E 80 04 21 */ bctrl /* 8009AD8C 00097CEC 7C 64 1B 78 */ mr r4, r3 /* 8009AD90 00097CF0 80 6D A0 80 */ lwz r3, gpGameState@sda21(r13) /* 8009AD94 00097CF4 48 13 8C 45 */ bl StateForWorld__10CGameStateFUi @@ -6274,7 +6274,7 @@ lbl_8009AEA0: /* 8009AEA4 00097E04 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 8009AEA8 00097E08 7C 08 03 A6 */ mtlr r0 /* 8009AEAC 00097E0C 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 8009AEB0 00097E10 4E 80 00 20 */ blr +/* 8009AEB0 00097E10 4E 80 00 20 */ blr .global ProcessControllerInput__11CAutoMapperFRC11CFinalInputRC13CStateManager ProcessControllerInput__11CAutoMapperFRC11CFinalInputRC13CStateManager: @@ -6344,7 +6344,7 @@ lbl_8009AF6C: /* 8009AF9C 00097EFC 81 83 00 00 */ lwz r12, 0(r3) /* 8009AFA0 00097F00 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8009AFA4 00097F04 7D 89 03 A6 */ mtctr r12 -/* 8009AFA8 00097F08 4E 80 04 21 */ bctrl +/* 8009AFA8 00097F08 4E 80 04 21 */ bctrl /* 8009AFAC 00097F0C 7C 64 1B 78 */ mr r4, r3 /* 8009AFB0 00097F10 80 6D A0 80 */ lwz r3, gpGameState@sda21(r13) /* 8009AFB4 00097F14 48 13 8A 25 */ bl StateForWorld__10CGameStateFUi @@ -6474,7 +6474,7 @@ lbl_8009B154: /* 8009B18C 000980EC 81 83 00 00 */ lwz r12, 0(r3) /* 8009B190 000980F0 81 8C 00 18 */ lwz r12, 0x18(r12) /* 8009B194 000980F4 7D 89 03 A6 */ mtctr r12 -/* 8009B198 000980F8 4E 80 04 21 */ bctrl +/* 8009B198 000980F8 4E 80 04 21 */ bctrl /* 8009B19C 000980FC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8009B1A0 00098100 41 82 01 60 */ beq lbl_8009B300 /* 8009B1A4 00098104 3C 80 80 3D */ lis r4, lbl_803CD80C@ha @@ -6510,7 +6510,7 @@ lbl_8009B1D4: /* 8009B218 00098178 38 80 00 01 */ li r4, 1 /* 8009B21C 0009817C 81 8C 00 08 */ lwz r12, 8(r12) /* 8009B220 00098180 7D 89 03 A6 */ mtctr r12 -/* 8009B224 00098184 4E 80 04 21 */ bctrl +/* 8009B224 00098184 4E 80 04 21 */ bctrl lbl_8009B228: /* 8009B228 00098188 88 61 00 38 */ lbz r3, 0x38(r1) /* 8009B22C 0009818C 38 00 00 00 */ li r0, 0 @@ -6529,7 +6529,7 @@ lbl_8009B240: /* 8009B25C 000981BC 38 80 00 01 */ li r4, 1 /* 8009B260 000981C0 81 8C 00 08 */ lwz r12, 8(r12) /* 8009B264 000981C4 7D 89 03 A6 */ mtctr r12 -/* 8009B268 000981C8 4E 80 04 21 */ bctrl +/* 8009B268 000981C8 4E 80 04 21 */ bctrl /* 8009B26C 000981CC 48 00 00 94 */ b lbl_8009B300 lbl_8009B270: /* 8009B270 000981D0 38 60 00 00 */ li r3, 0 @@ -6550,7 +6550,7 @@ lbl_8009B270: /* 8009B2AC 0009820C 38 80 00 01 */ li r4, 1 /* 8009B2B0 00098210 81 8C 00 08 */ lwz r12, 8(r12) /* 8009B2B4 00098214 7D 89 03 A6 */ mtctr r12 -/* 8009B2B8 00098218 4E 80 04 21 */ bctrl +/* 8009B2B8 00098218 4E 80 04 21 */ bctrl lbl_8009B2BC: /* 8009B2BC 0009821C 88 61 00 30 */ lbz r3, 0x30(r1) /* 8009B2C0 00098220 38 00 00 00 */ li r0, 0 @@ -6569,7 +6569,7 @@ lbl_8009B2D4: /* 8009B2F0 00098250 38 80 00 01 */ li r4, 1 /* 8009B2F4 00098254 81 8C 00 08 */ lwz r12, 8(r12) /* 8009B2F8 00098258 7D 89 03 A6 */ mtctr r12 -/* 8009B2FC 0009825C 4E 80 04 21 */ bctrl +/* 8009B2FC 0009825C 4E 80 04 21 */ bctrl lbl_8009B300: /* 8009B300 00098260 3B 7B 00 70 */ addi r27, r27, 0x70 /* 8009B304 00098264 3B 5A 00 08 */ addi r26, r26, 8 @@ -6964,7 +6964,7 @@ lbl_8009B8D0: /* 8009B8D4 00098834 80 01 02 04 */ lwz r0, 0x204(r1) /* 8009B8D8 00098838 7C 08 03 A6 */ mtlr r0 /* 8009B8DC 0009883C 38 21 02 00 */ addi r1, r1, 0x200 -/* 8009B8E0 00098840 4E 80 00 20 */ blr +/* 8009B8E0 00098840 4E 80 00 20 */ blr .global UpdateHintNavigation__11CAutoMapperFfRC13CStateManager UpdateHintNavigation__11CAutoMapperFfRC13CStateManager: @@ -6993,7 +6993,7 @@ UpdateHintNavigation__11CAutoMapperFfRC13CStateManager: /* 8009B93C 0009889C 38 A5 AE D4 */ addi r5, r5, lbl_803DAED4@l /* 8009B940 000988A0 7C 05 00 2E */ lwzx r0, r5, r0 /* 8009B944 000988A4 7C 09 03 A6 */ mtctr r0 -/* 8009B948 000988A8 4E 80 04 20 */ bctr +/* 8009B948 000988A8 4E 80 04 20 */ bctr .global lbl_8009B94C lbl_8009B94C: /* 8009B94C 000988AC 80 7E 00 24 */ lwz r3, 0x24(r30) @@ -7001,7 +7001,7 @@ lbl_8009B94C: /* 8009B954 000988B4 81 83 00 00 */ lwz r12, 0(r3) /* 8009B958 000988B8 81 8C 00 18 */ lwz r12, 0x18(r12) /* 8009B95C 000988BC 7D 89 03 A6 */ mtctr r12 -/* 8009B960 000988C0 4E 80 04 21 */ bctrl +/* 8009B960 000988C0 4E 80 04 21 */ bctrl /* 8009B964 000988C4 7F A4 EB 78 */ mr r4, r29 /* 8009B968 000988C8 48 00 5A 51 */ bl GetMapArea__9CMapWorldCFi /* 8009B96C 000988CC 28 03 00 00 */ cmplwi r3, 0 @@ -7253,7 +7253,7 @@ lbl_8009BCF8: /* 8009BCFC 00098C5C 81 83 00 00 */ lwz r12, 0(r3) /* 8009BD00 00098C60 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8009BD04 00098C64 7D 89 03 A6 */ mtctr r12 -/* 8009BD08 00098C68 4E 80 04 21 */ bctrl +/* 8009BD08 00098C68 4E 80 04 21 */ bctrl /* 8009BD0C 00098C6C 80 1D 00 10 */ lwz r0, 0x10(r29) /* 8009BD10 00098C70 7C 00 18 40 */ cmplw r0, r3 /* 8009BD14 00098C74 40 82 00 58 */ bne lbl_8009BD6C @@ -7427,7 +7427,7 @@ lbl_8009BF78: /* 8009BF8C 00098EEC 83 A1 00 34 */ lwz r29, 0x34(r1) /* 8009BF90 00098EF0 7C 08 03 A6 */ mtlr r0 /* 8009BF94 00098EF4 38 21 00 50 */ addi r1, r1, 0x50 -/* 8009BF98 00098EF8 4E 80 00 20 */ blr +/* 8009BF98 00098EF8 4E 80 00 20 */ blr .global CheckDummyWorldLoad__11CAutoMapperFRC13CStateManager CheckDummyWorldLoad__11CAutoMapperFRC13CStateManager: @@ -7452,14 +7452,14 @@ CheckDummyWorldLoad__11CAutoMapperFRC13CStateManager: /* 8009BFE4 00098F44 81 9E 00 00 */ lwz r12, 0(r30) /* 8009BFE8 00098F48 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8009BFEC 00098F4C 7D 89 03 A6 */ mtctr r12 -/* 8009BFF0 00098F50 4E 80 04 21 */ bctrl +/* 8009BFF0 00098F50 4E 80 04 21 */ bctrl /* 8009BFF4 00098F54 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8009BFF8 00098F58 41 82 01 18 */ beq lbl_8009C110 /* 8009BFFC 00098F5C 7F C3 F3 78 */ mr r3, r30 /* 8009C000 00098F60 81 9E 00 00 */ lwz r12, 0(r30) /* 8009C004 00098F64 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8009C008 00098F68 7D 89 03 A6 */ mtctr r12 -/* 8009C00C 00098F6C 4E 80 04 21 */ bctrl +/* 8009C00C 00098F6C 4E 80 04 21 */ bctrl /* 8009C010 00098F70 7C 64 1B 78 */ mr r4, r3 /* 8009C014 00098F74 80 6D A0 80 */ lwz r3, gpGameState@sda21(r13) /* 8009C018 00098F78 48 13 79 C1 */ bl StateForWorld__10CGameStateFUi @@ -7507,7 +7507,7 @@ CheckDummyWorldLoad__11CAutoMapperFRC13CStateManager: /* 8009C0C0 00099020 81 9E 00 00 */ lwz r12, 0(r30) /* 8009C0C4 00099024 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 8009C0C8 00099028 7D 89 03 A6 */ mtctr r12 -/* 8009C0CC 0009902C 4E 80 04 21 */ bctrl +/* 8009C0CC 0009902C 4E 80 04 21 */ bctrl /* 8009C0D0 00099030 7F 84 E3 78 */ mr r4, r28 /* 8009C0D4 00099034 7F C5 F3 78 */ mr r5, r30 /* 8009C0D8 00099038 48 00 37 85 */ bl RecalculateWorldSphere__9CMapWorldCFRC13CMapWorldInfoRC6IWorld @@ -7537,7 +7537,7 @@ lbl_8009C124: /* 8009C128 00099088 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 8009C12C 0009908C 7C 08 03 A6 */ mtlr r0 /* 8009C130 00099090 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 8009C134 00099094 4E 80 00 20 */ blr +/* 8009C134 00099094 4E 80 00 20 */ blr .global HasCurrentMapUniverseWorld__11CAutoMapperFv HasCurrentMapUniverseWorld__11CAutoMapperFv: @@ -7551,7 +7551,7 @@ HasCurrentMapUniverseWorld__11CAutoMapperFv: /* 8009C154 000990B4 81 83 00 00 */ lwz r12, 0(r3) /* 8009C158 000990B8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8009C15C 000990BC 7D 89 03 A6 */ mtctr r12 -/* 8009C160 000990C0 4E 80 04 21 */ bctrl +/* 8009C160 000990C0 4E 80 04 21 */ bctrl /* 8009C164 000990C4 80 1F 00 14 */ lwz r0, 0x14(r31) /* 8009C168 000990C8 38 A0 00 00 */ li r5, 0 /* 8009C16C 000990CC 7C 09 03 A6 */ mtctr r0 @@ -7575,7 +7575,7 @@ lbl_8009C1A0: /* 8009C1A4 00099104 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8009C1A8 00099108 7C 08 03 A6 */ mtlr r0 /* 8009C1AC 0009910C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009C1B0 00099110 4E 80 00 20 */ blr +/* 8009C1B0 00099110 4E 80 00 20 */ blr .global UnmuteAllLoopedSounds__11CAutoMapperFv UnmuteAllLoopedSounds__11CAutoMapperFv: @@ -7603,7 +7603,7 @@ UnmuteAllLoopedSounds__11CAutoMapperFv: /* 8009C208 00099168 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8009C20C 0009916C 7C 08 03 A6 */ mtlr r0 /* 8009C210 00099170 38 21 00 20 */ addi r1, r1, 0x20 -/* 8009C214 00099174 4E 80 00 20 */ blr +/* 8009C214 00099174 4E 80 00 20 */ blr .global NotHintNavigating__11CAutoMapperFv NotHintNavigating__11CAutoMapperFv: @@ -7611,7 +7611,7 @@ NotHintNavigating__11CAutoMapperFv: /* 8009C21C 0009917C 38 60 00 01 */ li r3, 1 /* 8009C220 00099180 7C 00 00 34 */ cntlzw r0, r0 /* 8009C224 00099184 5C 63 07 FE */ rlwnm r3, r3, r0, 0x1f, 0x1f -/* 8009C228 00099188 4E 80 00 20 */ blr +/* 8009C228 00099188 4E 80 00 20 */ blr .global CanLeaveMapScreenInternal__11CAutoMapperCFRC13CStateManager CanLeaveMapScreenInternal__11CAutoMapperCFRC13CStateManager: @@ -7664,7 +7664,7 @@ lbl_8009C2C4: /* 8009C2D0 00099230 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8009C2D4 00099234 7C 08 03 A6 */ mtlr r0 /* 8009C2D8 00099238 38 21 00 20 */ addi r1, r1, 0x20 -/* 8009C2DC 0009923C 4E 80 00 20 */ blr +/* 8009C2DC 0009923C 4E 80 00 20 */ blr .global CanLeaveMapScreen__11CAutoMapperCFRC13CStateManager CanLeaveMapScreen__11CAutoMapperCFRC13CStateManager: @@ -7686,7 +7686,7 @@ lbl_8009C310: /* 8009C318 00099278 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8009C31C 0009927C 7C 08 03 A6 */ mtlr r0 /* 8009C320 00099280 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009C324 00099284 4E 80 00 20 */ blr +/* 8009C324 00099284 4E 80 00 20 */ blr .global OnNewInGameGuiState__11CAutoMapperF15EInGameGuiStateR13CStateManager OnNewInGameGuiState__11CAutoMapperF15EInGameGuiStateR13CStateManager: @@ -7730,7 +7730,7 @@ OnNewInGameGuiState__11CAutoMapperF15EInGameGuiStateR13CStateManager: /* 8009C3BC 0009931C 81 84 00 00 */ lwz r12, 0(r4) /* 8009C3C0 00099320 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8009C3C4 00099324 7D 89 03 A6 */ mtctr r12 -/* 8009C3C8 00099328 4E 80 04 21 */ bctrl +/* 8009C3C8 00099328 4E 80 04 21 */ bctrl /* 8009C3CC 0009932C 7F E3 FB 78 */ mr r3, r31 /* 8009C3D0 00099330 38 81 00 08 */ addi r4, r1, 8 /* 8009C3D4 00099334 3B 80 00 01 */ li r28, 1 @@ -7808,7 +7808,7 @@ lbl_8009C4C4: /* 8009C4D4 00099434 83 81 00 10 */ lwz r28, 0x10(r1) /* 8009C4D8 00099438 7C 08 03 A6 */ mtlr r0 /* 8009C4DC 0009943C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8009C4E0 00099440 4E 80 00 20 */ blr +/* 8009C4E0 00099440 4E 80 00 20 */ blr .global SetupHintNavigation__11CAutoMapperFv SetupHintNavigation__11CAutoMapperFv: @@ -7903,7 +7903,7 @@ lbl_8009C5EC: /* 8009C628 00099588 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8009C62C 0009958C 7F 44 02 14 */ add r26, r4, r0 /* 8009C630 00099590 7D 89 03 A6 */ mtctr r12 -/* 8009C634 00099594 4E 80 04 21 */ bctrl +/* 8009C634 00099594 4E 80 04 21 */ bctrl /* 8009C638 00099598 3C 80 80 3D */ lis r4, lbl_803CD80C@ha /* 8009C63C 0009959C 83 A2 8C 1C */ lwz r29, lbl_805AA93C@sda21(r2) /* 8009C640 000995A0 7C 75 1B 78 */ mr r21, r3 @@ -8323,7 +8323,7 @@ lbl_8009CC18: /* 8009CC1C 00099B7C 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 8009CC20 00099B80 7C 08 03 A6 */ mtlr r0 /* 8009CC24 00099B84 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 8009CC28 00099B88 4E 80 00 20 */ blr +/* 8009CC28 00099B88 4E 80 00 20 */ blr .global CheckLoadComplete__11CAutoMapperFv CheckLoadComplete__11CAutoMapperFv: @@ -8494,13 +8494,13 @@ lbl_8009CE34: /* 8009CE68 00099DC8 38 80 00 01 */ li r4, 1 /* 8009CE6C 00099DCC 81 8C 00 08 */ lwz r12, 8(r12) /* 8009CE70 00099DD0 7D 89 03 A6 */ mtctr r12 -/* 8009CE74 00099DD4 4E 80 04 21 */ bctrl +/* 8009CE74 00099DD4 4E 80 04 21 */ bctrl lbl_8009CE78: /* 8009CE78 00099DD8 80 7F 00 24 */ lwz r3, 0x24(r31) /* 8009CE7C 00099DDC 81 83 00 00 */ lwz r12, 0(r3) /* 8009CE80 00099DE0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8009CE84 00099DE4 7D 89 03 A6 */ mtctr r12 -/* 8009CE88 00099DE8 4E 80 04 21 */ bctrl +/* 8009CE88 00099DE8 4E 80 04 21 */ bctrl /* 8009CE8C 00099DEC 7C 64 1B 78 */ mr r4, r3 /* 8009CE90 00099DF0 7F E3 FB 78 */ mr r3, r31 /* 8009CE94 00099DF4 4B FF 8A A9 */ bl SetCurWorldAssetId__11CAutoMapperFi @@ -8521,7 +8521,7 @@ lbl_8009CEB8: /* 8009CEC0 00099E20 83 C1 00 28 */ lwz r30, 0x28(r1) /* 8009CEC4 00099E24 7C 08 03 A6 */ mtlr r0 /* 8009CEC8 00099E28 38 21 00 30 */ addi r1, r1, 0x30 -/* 8009CECC 00099E2C 4E 80 00 20 */ blr +/* 8009CECC 00099E2C 4E 80 00 20 */ blr .global sub_8009ced0 sub_8009ced0: @@ -8560,7 +8560,7 @@ lbl_8009CF24: /* 8009CF48 00099EA8 38 80 00 01 */ li r4, 1 /* 8009CF4C 00099EAC 81 8C 00 08 */ lwz r12, 8(r12) /* 8009CF50 00099EB0 7D 89 03 A6 */ mtctr r12 -/* 8009CF54 00099EB4 4E 80 04 21 */ bctrl +/* 8009CF54 00099EB4 4E 80 04 21 */ bctrl lbl_8009CF58: /* 8009CF58 00099EB8 3B 9C 00 08 */ addi r28, r28, 8 lbl_8009CF5C: @@ -8617,7 +8617,7 @@ lbl_8009CFF8: /* 8009D008 00099F68 83 81 00 20 */ lwz r28, 0x20(r1) /* 8009D00C 00099F6C 7C 08 03 A6 */ mtlr r0 /* 8009D010 00099F70 38 21 00 30 */ addi r1, r1, 0x30 -/* 8009D014 00099F74 4E 80 00 20 */ blr +/* 8009D014 00099F74 4E 80 00 20 */ blr .global sub_8009d018 sub_8009d018: @@ -8653,7 +8653,7 @@ lbl_8009D064: /* 8009D088 00099FE8 38 80 00 01 */ li r4, 1 /* 8009D08C 00099FEC 81 8C 00 08 */ lwz r12, 8(r12) /* 8009D090 00099FF0 7D 89 03 A6 */ mtctr r12 -/* 8009D094 00099FF4 4E 80 04 21 */ bctrl +/* 8009D094 00099FF4 4E 80 04 21 */ bctrl lbl_8009D098: /* 8009D098 00099FF8 3B DE 00 08 */ addi r30, r30, 8 lbl_8009D09C: @@ -8677,7 +8677,7 @@ lbl_8009D0C4: /* 8009D0D8 0009A038 83 81 00 20 */ lwz r28, 0x20(r1) /* 8009D0DC 0009A03C 7C 08 03 A6 */ mtlr r0 /* 8009D0E0 0009A040 38 21 00 30 */ addi r1, r1, 0x30 -/* 8009D0E4 0009A044 4E 80 00 20 */ blr +/* 8009D0E4 0009A044 4E 80 00 20 */ blr .global __dt__11CAutoMapperFv __dt__11CAutoMapperFv: @@ -8893,7 +8893,7 @@ lbl_8009D3A8: /* 8009D3BC 0009A31C 83 81 00 10 */ lwz r28, 0x10(r1) /* 8009D3C0 0009A320 7C 08 03 A6 */ mtlr r0 /* 8009D3C4 0009A324 38 21 00 20 */ addi r1, r1, 0x20 -/* 8009D3C8 0009A328 4E 80 00 20 */ blr +/* 8009D3C8 0009A328 4E 80 00 20 */ blr .global "SetResLockState,2>>__11CAutoMapperFv" "SetResLockState,2>>__11CAutoMapperFv": @@ -8931,7 +8931,7 @@ lbl_8009D414: /* 8009D438 0009A398 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8009D43C 0009A39C 7C 08 03 A6 */ mtlr r0 /* 8009D440 0009A3A0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8009D444 0009A3A4 4E 80 00 20 */ blr +/* 8009D444 0009A3A4 4E 80 00 20 */ blr .global "SetResLockState,9>>__11CAutoMapperFv" "SetResLockState,9>>__11CAutoMapperFv": @@ -8969,7 +8969,7 @@ lbl_8009D490: /* 8009D4B4 0009A414 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8009D4B8 0009A418 7C 08 03 A6 */ mtlr r0 /* 8009D4BC 0009A41C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8009D4C0 0009A420 4E 80 00 20 */ blr +/* 8009D4C0 0009A420 4E 80 00 20 */ blr .global __ct__11CAutoMapperFR13CStateManager __ct__11CAutoMapperFR13CStateManager: @@ -8992,7 +8992,7 @@ __ct__11CAutoMapperFR13CStateManager: /* 8009D504 0009A464 81 84 00 00 */ lwz r12, 0(r4) /* 8009D508 0009A468 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8009D50C 0009A46C 7D 89 03 A6 */ mtctr r12 -/* 8009D510 0009A470 4E 80 04 21 */ bctrl +/* 8009D510 0009A470 4E 80 04 21 */ bctrl /* 8009D514 0009A474 3B 5F 00 08 */ addi r26, r31, 8 /* 8009D518 0009A478 38 81 00 BC */ addi r4, r1, 0xbc /* 8009D51C 0009A47C 7F 43 D3 78 */ mr r3, r26 @@ -9018,7 +9018,7 @@ __ct__11CAutoMapperFR13CStateManager: /* 8009D56C 0009A4CC 81 84 00 00 */ lwz r12, 0(r4) /* 8009D570 0009A4D0 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8009D574 0009A4D4 7D 89 03 A6 */ mtctr r12 -/* 8009D578 0009A4D8 4E 80 04 21 */ bctrl +/* 8009D578 0009A4D8 4E 80 04 21 */ bctrl /* 8009D57C 0009A4DC 3B 5F 00 30 */ addi r26, r31, 0x30 /* 8009D580 0009A4E0 38 81 00 B4 */ addi r4, r1, 0xb4 /* 8009D584 0009A4E4 7F 43 D3 78 */ mr r3, r26 @@ -9036,7 +9036,7 @@ __ct__11CAutoMapperFR13CStateManager: /* 8009D5B4 0009A514 38 A5 01 44 */ addi r5, r5, 0x144 /* 8009D5B8 0009A518 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8009D5BC 0009A51C 7D 89 03 A6 */ mtctr r12 -/* 8009D5C0 0009A520 4E 80 04 21 */ bctrl +/* 8009D5C0 0009A520 4E 80 04 21 */ bctrl /* 8009D5C4 0009A524 3B 5F 00 3C */ addi r26, r31, 0x3c /* 8009D5C8 0009A528 38 81 00 AC */ addi r4, r1, 0xac /* 8009D5CC 0009A52C 7F 43 D3 78 */ mr r3, r26 @@ -9059,7 +9059,7 @@ __ct__11CAutoMapperFR13CStateManager: /* 8009D610 0009A570 81 84 00 00 */ lwz r12, 0(r4) /* 8009D614 0009A574 81 8C 00 24 */ lwz r12, 0x24(r12) /* 8009D618 0009A578 7D 89 03 A6 */ mtctr r12 -/* 8009D61C 0009A57C 4E 80 04 21 */ bctrl +/* 8009D61C 0009A57C 4E 80 04 21 */ bctrl /* 8009D620 0009A580 80 01 00 08 */ lwz r0, 8(r1) /* 8009D624 0009A584 7F 24 CB 78 */ mr r4, r25 /* 8009D628 0009A588 90 1F 00 A0 */ stw r0, 0xa0(r31) @@ -9151,7 +9151,7 @@ __ct__11CAutoMapperFR13CStateManager: /* 8009D780 0009A6E0 81 84 00 00 */ lwz r12, 0(r4) /* 8009D784 0009A6E4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8009D788 0009A6E8 7D 89 03 A6 */ mtctr r12 -/* 8009D78C 0009A6EC 4E 80 04 21 */ bctrl +/* 8009D78C 0009A6EC 4E 80 04 21 */ bctrl /* 8009D790 0009A6F0 38 7F 00 48 */ addi r3, r31, 0x48 /* 8009D794 0009A6F4 80 1F 00 48 */ lwz r0, 0x48(r31) /* 8009D798 0009A6F8 54 00 18 38 */ slwi r0, r0, 3 @@ -9179,7 +9179,7 @@ lbl_8009D7B0: /* 8009D7EC 0009A74C 81 84 00 00 */ lwz r12, 0(r4) /* 8009D7F0 0009A750 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8009D7F4 0009A754 7D 89 03 A6 */ mtctr r12 -/* 8009D7F8 0009A758 4E 80 04 21 */ bctrl +/* 8009D7F8 0009A758 4E 80 04 21 */ bctrl /* 8009D7FC 0009A75C 38 7F 00 48 */ addi r3, r31, 0x48 /* 8009D800 0009A760 80 1F 00 48 */ lwz r0, 0x48(r31) /* 8009D804 0009A764 54 00 18 38 */ slwi r0, r0, 3 @@ -9207,7 +9207,7 @@ lbl_8009D81C: /* 8009D858 0009A7B8 81 84 00 00 */ lwz r12, 0(r4) /* 8009D85C 0009A7BC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8009D860 0009A7C0 7D 89 03 A6 */ mtctr r12 -/* 8009D864 0009A7C4 4E 80 04 21 */ bctrl +/* 8009D864 0009A7C4 4E 80 04 21 */ bctrl /* 8009D868 0009A7C8 38 7F 00 48 */ addi r3, r31, 0x48 /* 8009D86C 0009A7CC 80 1F 00 48 */ lwz r0, 0x48(r31) /* 8009D870 0009A7D0 54 00 18 38 */ slwi r0, r0, 3 @@ -9235,7 +9235,7 @@ lbl_8009D888: /* 8009D8C4 0009A824 81 84 00 00 */ lwz r12, 0(r4) /* 8009D8C8 0009A828 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8009D8CC 0009A82C 7D 89 03 A6 */ mtctr r12 -/* 8009D8D0 0009A830 4E 80 04 21 */ bctrl +/* 8009D8D0 0009A830 4E 80 04 21 */ bctrl /* 8009D8D4 0009A834 38 7F 00 48 */ addi r3, r31, 0x48 /* 8009D8D8 0009A838 80 1F 00 48 */ lwz r0, 0x48(r31) /* 8009D8DC 0009A83C 54 00 18 38 */ slwi r0, r0, 3 @@ -9263,7 +9263,7 @@ lbl_8009D8F4: /* 8009D930 0009A890 81 84 00 00 */ lwz r12, 0(r4) /* 8009D934 0009A894 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8009D938 0009A898 7D 89 03 A6 */ mtctr r12 -/* 8009D93C 0009A89C 4E 80 04 21 */ bctrl +/* 8009D93C 0009A89C 4E 80 04 21 */ bctrl /* 8009D940 0009A8A0 38 7F 00 48 */ addi r3, r31, 0x48 /* 8009D944 0009A8A4 80 1F 00 48 */ lwz r0, 0x48(r31) /* 8009D948 0009A8A8 54 00 18 38 */ slwi r0, r0, 3 @@ -9311,7 +9311,7 @@ lbl_8009D9C0: /* 8009D9E0 0009A940 81 84 00 00 */ lwz r12, 0(r4) /* 8009D9E4 0009A944 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8009D9E8 0009A948 7D 89 03 A6 */ mtctr r12 -/* 8009D9EC 0009A94C 4E 80 04 21 */ bctrl +/* 8009D9EC 0009A94C 4E 80 04 21 */ bctrl /* 8009D9F0 0009A950 80 1C 00 00 */ lwz r0, 0(r28) /* 8009D9F4 0009A954 54 00 18 38 */ slwi r0, r0, 3 /* 8009D9F8 0009A958 7C 7C 02 14 */ add r3, r28, r0 @@ -9337,7 +9337,7 @@ lbl_8009DA0C: /* 8009DA44 0009A9A4 81 84 00 00 */ lwz r12, 0(r4) /* 8009DA48 0009A9A8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8009DA4C 0009A9AC 7D 89 03 A6 */ mtctr r12 -/* 8009DA50 0009A9B0 4E 80 04 21 */ bctrl +/* 8009DA50 0009A9B0 4E 80 04 21 */ bctrl /* 8009DA54 0009A9B4 80 1B 00 00 */ lwz r0, 0(r27) /* 8009DA58 0009A9B8 54 00 18 38 */ slwi r0, r0, 3 /* 8009DA5C 0009A9BC 7C 7B 02 14 */ add r3, r27, r0 @@ -9375,7 +9375,7 @@ lbl_8009DAB4: /* 8009DAD4 0009AA34 81 84 00 00 */ lwz r12, 0(r4) /* 8009DAD8 0009AA38 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8009DADC 0009AA3C 7D 89 03 A6 */ mtctr r12 -/* 8009DAE0 0009AA40 4E 80 04 21 */ bctrl +/* 8009DAE0 0009AA40 4E 80 04 21 */ bctrl /* 8009DAE4 0009AA44 80 1B 00 00 */ lwz r0, 0(r27) /* 8009DAE8 0009AA48 54 00 18 38 */ slwi r0, r0, 3 /* 8009DAEC 0009AA4C 7C 7B 02 14 */ add r3, r27, r0 @@ -9401,7 +9401,7 @@ lbl_8009DB00: /* 8009DB38 0009AA98 81 84 00 00 */ lwz r12, 0(r4) /* 8009DB3C 0009AA9C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8009DB40 0009AAA0 7D 89 03 A6 */ mtctr r12 -/* 8009DB44 0009AAA4 4E 80 04 21 */ bctrl +/* 8009DB44 0009AAA4 4E 80 04 21 */ bctrl /* 8009DB48 0009AAA8 80 1C 00 00 */ lwz r0, 0(r28) /* 8009DB4C 0009AAAC 54 00 18 38 */ slwi r0, r0, 3 /* 8009DB50 0009AAB0 7C 7C 02 14 */ add r3, r28, r0 @@ -9427,7 +9427,7 @@ lbl_8009DB64: /* 8009DB9C 0009AAFC 81 84 00 00 */ lwz r12, 0(r4) /* 8009DBA0 0009AB00 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8009DBA4 0009AB04 7D 89 03 A6 */ mtctr r12 -/* 8009DBA8 0009AB08 4E 80 04 21 */ bctrl +/* 8009DBA8 0009AB08 4E 80 04 21 */ bctrl /* 8009DBAC 0009AB0C 80 1A 00 00 */ lwz r0, 0(r26) /* 8009DBB0 0009AB10 54 00 18 38 */ slwi r0, r0, 3 /* 8009DBB4 0009AB14 7C 7A 02 14 */ add r3, r26, r0 @@ -9451,7 +9451,7 @@ lbl_8009DBC8: /* 8009DBF8 0009AB58 80 01 01 54 */ lwz r0, 0x154(r1) /* 8009DBFC 0009AB5C 7C 08 03 A6 */ mtlr r0 /* 8009DC00 0009AB60 38 21 01 50 */ addi r1, r1, 0x150 -/* 8009DC04 0009AB64 4E 80 00 20 */ blr +/* 8009DC04 0009AB64 4E 80 00 20 */ blr .global __ct__Q211CAutoMapper23SAutoMapperHintLocationUifUi7TAreaId __ct__Q211CAutoMapper23SAutoMapperHintLocationUifUi7TAreaId: @@ -9459,7 +9459,7 @@ __ct__Q211CAutoMapper23SAutoMapperHintLocationUifUi7TAreaId: /* 8009DC0C 0009AB6C D0 23 00 04 */ stfs f1, 4(r3) /* 8009DC10 0009AB70 90 A3 00 08 */ stw r5, 8(r3) /* 8009DC14 0009AB74 90 C3 00 0C */ stw r6, 0xc(r3) -/* 8009DC18 0009AB78 4E 80 00 20 */ blr +/* 8009DC18 0009AB78 4E 80 00 20 */ blr .global ResetInterpolation__Q211CAutoMapper22SAutoMapperRenderStateFv ResetInterpolation__Q211CAutoMapper22SAutoMapperRenderStateFv: @@ -9470,7 +9470,7 @@ ResetInterpolation__Q211CAutoMapper22SAutoMapperRenderStateFv: /* 8009DC2C 0009AB8C 90 03 00 50 */ stw r0, 0x50(r3) /* 8009DC30 0009AB90 90 03 00 54 */ stw r0, 0x54(r3) /* 8009DC34 0009AB94 90 03 00 58 */ stw r0, 0x58(r3) -/* 8009DC38 0009AB98 4E 80 00 20 */ blr +/* 8009DC38 0009AB98 4E 80 00 20 */ blr .global InterpolateWithClamp__Q211CAutoMapper22SAutoMapperRenderStateFRCQ211CAutoMapper22SAutoMapperRenderStateRQ211CAutoMapper22SAutoMapperRenderStateRCQ211CAutoMapper22SAutoMapperRenderStatef InterpolateWithClamp__Q211CAutoMapper22SAutoMapperRenderStateFRCQ211CAutoMapper22SAutoMapperRenderStateRQ211CAutoMapper22SAutoMapperRenderStateRCQ211CAutoMapper22SAutoMapperRenderStatef: @@ -9743,7 +9743,7 @@ lbl_8009E018: /* 8009E044 0009AFA4 83 A1 00 84 */ lwz r29, 0x84(r1) /* 8009E048 0009AFA8 7C 08 03 A6 */ mtlr r0 /* 8009E04C 0009AFAC 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 8009E050 0009AFB0 4E 80 00 20 */ blr +/* 8009E050 0009AFB0 4E 80 00 20 */ blr .global __ct__Q211CAutoMapper22SAutoMapperRenderStateFRC9CVector2iRC11CQuaternionffRC9CVector3fffffff __ct__Q211CAutoMapper22SAutoMapperRenderStateFRC9CVector2iRC11CQuaternionffRC9CVector3fffffff: @@ -9780,7 +9780,7 @@ __ct__Q211CAutoMapper22SAutoMapperRenderStateFRC9CVector2iRC11CQuaternionffRC9CV /* 8009E0CC 0009B02C 90 03 00 50 */ stw r0, 0x50(r3) /* 8009E0D0 0009B030 90 03 00 54 */ stw r0, 0x54(r3) /* 8009E0D4 0009B034 90 03 00 58 */ stw r0, 0x58(r3) -/* 8009E0D8 0009B038 4E 80 00 20 */ blr +/* 8009E0D8 0009B038 4E 80 00 20 */ blr .global "reserve__Q24rstl61vector,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl61vector,Q24rstl17rmemory_allocator>Fi": @@ -9848,7 +9848,7 @@ lbl_8009E194: /* 8009E1B8 0009B118 38 80 00 01 */ li r4, 1 /* 8009E1BC 0009B11C 81 8C 00 08 */ lwz r12, 8(r12) /* 8009E1C0 0009B120 7D 89 03 A6 */ mtctr r12 -/* 8009E1C4 0009B124 4E 80 04 21 */ bctrl +/* 8009E1C4 0009B124 4E 80 04 21 */ bctrl lbl_8009E1C8: /* 8009E1C8 0009B128 3B 7B 00 08 */ addi r27, r27, 8 lbl_8009E1CC: @@ -9866,7 +9866,7 @@ lbl_8009E1EC: /* 8009E1F0 0009B150 80 01 00 34 */ lwz r0, 0x34(r1) /* 8009E1F4 0009B154 7C 08 03 A6 */ mtlr r0 /* 8009E1F8 0009B158 38 21 00 30 */ addi r1, r1, 0x30 -/* 8009E1FC 0009B15C 4E 80 00 20 */ blr +/* 8009E1FC 0009B15C 4E 80 00 20 */ blr .global sub_8009e200 sub_8009e200: @@ -9902,7 +9902,7 @@ lbl_8009E254: /* 8009E26C 0009B1CC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009E270 0009B1D0 7C 08 03 A6 */ mtlr r0 /* 8009E274 0009B1D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009E278 0009B1D8 4E 80 00 20 */ blr +/* 8009E278 0009B1D8 4E 80 00 20 */ blr .global sub_8009e27c sub_8009e27c: @@ -9938,7 +9938,7 @@ lbl_8009E2D4: /* 8009E2E4 0009B244 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8009E2E8 0009B248 7C 08 03 A6 */ mtlr r0 /* 8009E2EC 0009B24C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8009E2F0 0009B250 4E 80 00 20 */ blr +/* 8009E2F0 0009B250 4E 80 00 20 */ blr .global sub_8009e2f4 sub_8009e2f4: @@ -9974,7 +9974,7 @@ lbl_8009E348: /* 8009E360 0009B2C0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009E364 0009B2C4 7C 08 03 A6 */ mtlr r0 /* 8009E368 0009B2C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009E36C 0009B2CC 4E 80 00 20 */ blr +/* 8009E36C 0009B2CC 4E 80 00 20 */ blr .global sub_8009e370 sub_8009e370: @@ -10010,4 +10010,4 @@ lbl_8009E3C8: /* 8009E3D8 0009B338 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8009E3DC 0009B33C 7C 08 03 A6 */ mtlr r0 /* 8009E3E0 0009B340 38 21 00 20 */ addi r1, r1, 0x20 -/* 8009E3E4 0009B344 4E 80 00 20 */ blr +/* 8009E3E4 0009B344 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/CAutoSave.s b/asm/MetroidPrime/CAutoSave.s index 0c7458f4..267bb31c 100644 --- a/asm/MetroidPrime/CAutoSave.s +++ b/asm/MetroidPrime/CAutoSave.s @@ -12,13 +12,13 @@ lbl_803D99F0: .4byte GetIsContinueDraw__9CAutoSaveCFv .4byte Draw__9CAutoSaveCFv .4byte PreDraw__6CIOWinCFv - + .section .text, "ax" .global GetIsContinueDraw__9CAutoSaveCFv GetIsContinueDraw__9CAutoSaveCFv: /* 8002515C 000220BC 38 60 00 00 */ li r3, 0 -/* 80025160 000220C0 4E 80 00 20 */ blr +/* 80025160 000220C0 4E 80 00 20 */ blr .global Draw__9CAutoSaveCFv Draw__9CAutoSaveCFv: @@ -30,7 +30,7 @@ Draw__9CAutoSaveCFv: /* 80025178 000220D8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8002517C 000220DC 7C 08 03 A6 */ mtlr r0 /* 80025180 000220E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80025184 000220E4 4E 80 00 20 */ blr +/* 80025184 000220E4 4E 80 00 20 */ blr .global OnMessage__9CAutoSaveFRC20CArchitectureMessageR18CArchitectureQueue OnMessage__9CAutoSaveFRC20CArchitectureMessageR18CArchitectureQueue: @@ -160,7 +160,7 @@ lbl_8002535C: /* 80025360 000222C0 83 E1 00 7C */ lwz r31, 0x7c(r1) /* 80025364 000222C4 7C 08 03 A6 */ mtlr r0 /* 80025368 000222C8 38 21 00 80 */ addi r1, r1, 0x80 -/* 8002536C 000222CC 4E 80 00 20 */ blr +/* 8002536C 000222CC 4E 80 00 20 */ blr .global __dt__9CAutoSaveFv __dt__9CAutoSaveFv: @@ -195,7 +195,7 @@ lbl_800253CC: /* 800253D8 00022338 83 C1 00 08 */ lwz r30, 8(r1) /* 800253DC 0002233C 7C 08 03 A6 */ mtlr r0 /* 800253E0 00022340 38 21 00 10 */ addi r1, r1, 0x10 -/* 800253E4 00022344 4E 80 00 20 */ blr +/* 800253E4 00022344 4E 80 00 20 */ blr .global __ct__9CAutoSaveFv __ct__9CAutoSaveFv: @@ -240,4 +240,4 @@ lbl_80025468: /* 8002547C 000223DC 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80025480 000223E0 7C 08 03 A6 */ mtlr r0 /* 80025484 000223E4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80025488 000223E8 4E 80 00 20 */ blr +/* 80025488 000223E8 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/CAxisAngle.s b/asm/MetroidPrime/CAxisAngle.s index c7400c7b..ad212621 100644 --- a/asm/MetroidPrime/CAxisAngle.s +++ b/asm/MetroidPrime/CAxisAngle.s @@ -16,7 +16,7 @@ __pl__FRC10CAxisAngleRC10CAxisAngle: /* 8001B448 000183A8 EC 02 08 2A */ fadds f0, f2, f1 /* 8001B44C 000183AC D0 63 00 04 */ stfs f3, 4(r3) /* 8001B450 000183B0 D0 03 00 08 */ stfs f0, 8(r3) -/* 8001B454 000183B4 4E 80 00 20 */ blr +/* 8001B454 000183B4 4E 80 00 20 */ blr .global __ml__FRCfRC10CAxisAngle __ml__FRCfRC10CAxisAngle: @@ -30,7 +30,7 @@ __ml__FRCfRC10CAxisAngle: /* 8001B474 000183D4 D0 03 00 00 */ stfs f0, 0(r3) /* 8001B478 000183D8 D0 43 00 04 */ stfs f2, 4(r3) /* 8001B47C 000183DC D0 23 00 08 */ stfs f1, 8(r3) -/* 8001B480 000183E0 4E 80 00 20 */ blr +/* 8001B480 000183E0 4E 80 00 20 */ blr .global __ml__FRC10CAxisAngleRCf __ml__FRC10CAxisAngleRCf: @@ -44,7 +44,7 @@ __ml__FRC10CAxisAngleRCf: /* 8001B4A0 00018400 D0 03 00 00 */ stfs f0, 0(r3) /* 8001B4A4 00018404 D0 43 00 04 */ stfs f2, 4(r3) /* 8001B4A8 00018408 D0 23 00 08 */ stfs f1, 8(r3) -/* 8001B4AC 0001840C 4E 80 00 20 */ blr +/* 8001B4AC 0001840C 4E 80 00 20 */ blr .global __apl__10CAxisAngleFRC10CAxisAngle __apl__10CAxisAngleFRC10CAxisAngle: @@ -60,7 +60,7 @@ __apl__10CAxisAngleFRC10CAxisAngle: /* 8001B4D4 00018434 C0 04 00 08 */ lfs f0, 8(r4) /* 8001B4D8 00018438 EC 01 00 2A */ fadds f0, f1, f0 /* 8001B4DC 0001843C D0 03 00 08 */ stfs f0, 8(r3) -/* 8001B4E0 00018440 4E 80 00 20 */ blr +/* 8001B4E0 00018440 4E 80 00 20 */ blr .global __amu__10CAxisAngleFRCf __amu__10CAxisAngleFRCf: @@ -74,7 +74,7 @@ __amu__10CAxisAngleFRCf: /* 8001B500 00018460 C0 03 00 08 */ lfs f0, 8(r3) /* 8001B504 00018464 EC 00 00 72 */ fmuls f0, f0, f1 /* 8001B508 00018468 D0 03 00 08 */ stfs f0, 8(r3) -/* 8001B50C 0001846C 4E 80 00 20 */ blr +/* 8001B50C 0001846C 4E 80 00 20 */ blr .global GetAngle__10CAxisAngleCFv GetAngle__10CAxisAngleCFv: @@ -85,17 +85,17 @@ GetAngle__10CAxisAngleCFv: /* 8001B520 00018480 80 01 00 14 */ lwz r0, 0x14(r1) /* 8001B524 00018484 7C 08 03 A6 */ mtlr r0 /* 8001B528 00018488 38 21 00 10 */ addi r1, r1, 0x10 -/* 8001B52C 0001848C 4E 80 00 20 */ blr +/* 8001B52C 0001848C 4E 80 00 20 */ blr .global GetVector__10CAxisAngleCFv GetVector__10CAxisAngleCFv: -/* 8001B530 00018490 4E 80 00 20 */ blr +/* 8001B530 00018490 4E 80 00 20 */ blr .global Identity__10CAxisAngleFv Identity__10CAxisAngleFv: /* 8001B534 00018494 3C 60 80 57 */ lis r3, lbl_8056A5E8@ha /* 8001B538 00018498 38 63 A5 E8 */ addi r3, r3, lbl_8056A5E8@l -/* 8001B53C 0001849C 4E 80 00 20 */ blr +/* 8001B53C 0001849C 4E 80 00 20 */ blr .global FromVector__10CAxisAngleFRC9CVector3f FromVector__10CAxisAngleFRC9CVector3f: @@ -105,7 +105,7 @@ FromVector__10CAxisAngleFRC9CVector3f: /* 8001B54C 000184AC D0 03 00 04 */ stfs f0, 4(r3) /* 8001B550 000184B0 C0 04 00 08 */ lfs f0, 8(r4) /* 8001B554 000184B4 D0 03 00 08 */ stfs f0, 8(r3) -/* 8001B558 000184B8 4E 80 00 20 */ blr +/* 8001B558 000184B8 4E 80 00 20 */ blr .global __ct__10CAxisAngleFRC13CUnitVector3ff __ct__10CAxisAngleFRC13CUnitVector3ff: @@ -118,7 +118,7 @@ __ct__10CAxisAngleFRC13CUnitVector3ff: /* 8001B574 000184D4 D0 03 00 00 */ stfs f0, 0(r3) /* 8001B578 000184D8 D0 63 00 04 */ stfs f3, 4(r3) /* 8001B57C 000184DC D0 23 00 08 */ stfs f1, 8(r3) -/* 8001B580 000184E0 4E 80 00 20 */ blr +/* 8001B580 000184E0 4E 80 00 20 */ blr .global __ct__10CAxisAngleFRC9CVector3f __ct__10CAxisAngleFRC9CVector3f: @@ -128,7 +128,7 @@ __ct__10CAxisAngleFRC9CVector3f: /* 8001B590 000184F0 D0 03 00 04 */ stfs f0, 4(r3) /* 8001B594 000184F4 C0 04 00 08 */ lfs f0, 8(r4) /* 8001B598 000184F8 D0 03 00 08 */ stfs f0, 8(r3) -/* 8001B59C 000184FC 4E 80 00 20 */ blr +/* 8001B59C 000184FC 4E 80 00 20 */ blr .global __sinit_CAxisAngle_cpp __sinit_CAxisAngle_cpp: @@ -140,4 +140,4 @@ __sinit_CAxisAngle_cpp: /* 8001B5B4 00018514 C0 04 00 08 */ lfs f0, 8(r4) /* 8001B5B8 00018518 D0 23 00 04 */ stfs f1, 4(r3) /* 8001B5BC 0001851C D0 03 00 08 */ stfs f0, 8(r3) -/* 8001B5C0 00018520 4E 80 00 20 */ blr +/* 8001B5C0 00018520 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/CBallFilter.s b/asm/MetroidPrime/CBallFilter.s index ba725316..82568bf0 100644 --- a/asm/MetroidPrime/CBallFilter.s +++ b/asm/MetroidPrime/CBallFilter.s @@ -13,4 +13,4 @@ Filter__11CBallFilterCFRC18CCollisionInfoListR18CCollisionInfoList: /* 80185840 001827A0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80185844 001827A4 7C 08 03 A6 */ mtlr r0 /* 80185848 001827A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8018584C 001827AC 4E 80 00 20 */ blr +/* 8018584C 001827AC 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/CBoneTracking.s b/asm/MetroidPrime/CBoneTracking.s index 69fd45fd..054b71fd 100644 --- a/asm/MetroidPrime/CBoneTracking.s +++ b/asm/MetroidPrime/CBoneTracking.s @@ -7,7 +7,7 @@ SetNoHorizontalAim__13CBoneTrackingFb: /* 801751A8 00172108 88 03 00 36 */ lbz r0, 0x36(r3) /* 801751AC 0017210C 50 80 1F 38 */ rlwimi r0, r4, 3, 0x1c, 0x1c /* 801751B0 00172110 98 03 00 36 */ stb r0, 0x36(r3) -/* 801751B4 00172114 4E 80 00 20 */ blr +/* 801751B4 00172114 4E 80 00 20 */ blr .global SetTargetPosition__13CBoneTrackingFRC9CVector3f SetTargetPosition__13CBoneTrackingFRC9CVector3f: @@ -25,7 +25,7 @@ SetTargetPosition__13CBoneTrackingFRC9CVector3f: lbl_801751E4: /* 801751E4 00172144 38 00 00 01 */ li r0, 1 /* 801751E8 00172148 98 03 00 30 */ stb r0, 0x30(r3) -/* 801751EC 0017214C 4E 80 00 20 */ blr +/* 801751EC 0017214C 4E 80 00 20 */ blr lbl_801751F0: /* 801751F0 00172150 C0 04 00 00 */ lfs f0, 0(r4) /* 801751F4 00172154 D0 03 00 24 */ stfs f0, 0x24(r3) @@ -33,26 +33,26 @@ lbl_801751F0: /* 801751FC 0017215C D0 03 00 28 */ stfs f0, 0x28(r3) /* 80175200 00172160 C0 04 00 08 */ lfs f0, 8(r4) /* 80175204 00172164 D0 03 00 2C */ stfs f0, 0x2c(r3) -/* 80175208 00172168 4E 80 00 20 */ blr +/* 80175208 00172168 4E 80 00 20 */ blr .global UnsetTarget__13CBoneTrackingFv UnsetTarget__13CBoneTrackingFv: /* 8017520C 0017216C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80175210 00172170 B0 03 00 34 */ sth r0, 0x34(r3) -/* 80175214 00172174 4E 80 00 20 */ blr +/* 80175214 00172174 4E 80 00 20 */ blr .global SetTarget__13CBoneTrackingF9TUniqueId SetTarget__13CBoneTrackingF9TUniqueId: /* 80175218 00172178 A0 04 00 00 */ lhz r0, 0(r4) /* 8017521C 0017217C B0 03 00 34 */ sth r0, 0x34(r3) -/* 80175220 00172180 4E 80 00 20 */ blr +/* 80175220 00172180 4E 80 00 20 */ blr .global SetActive__13CBoneTrackingFb SetActive__13CBoneTrackingFb: /* 80175224 00172184 88 03 00 36 */ lbz r0, 0x36(r3) /* 80175228 00172188 50 80 3E 30 */ rlwimi r0, r4, 7, 0x18, 0x18 /* 8017522C 0017218C 98 03 00 36 */ stb r0, 0x36(r3) -/* 80175230 00172190 4E 80 00 20 */ blr +/* 80175230 00172190 4E 80 00 20 */ blr .global PreRender__13CBoneTrackingFRC13CStateManagerR9CAnimDataRC12CTransform4fRC9CVector3fb PreRender__13CBoneTrackingFRC13CStateManagerR9CAnimDataRC12CTransform4fRC9CVector3fb: @@ -177,7 +177,7 @@ lbl_8017539C: /* 801753F4 00172354 C0 22 A1 78 */ lfs f1, lbl_805ABE98@sda21(r2) /* 801753F8 00172358 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 801753FC 0017235C 7D 89 03 A6 */ mtctr r12 -/* 80175400 00172360 4E 80 04 21 */ bctrl +/* 80175400 00172360 4E 80 04 21 */ bctrl /* 80175404 00172364 38 C1 01 04 */ addi r6, r1, 0x104 /* 80175408 00172368 48 00 00 08 */ b lbl_80175410 lbl_8017540C: @@ -510,7 +510,7 @@ lbl_801758EC: /* 80175900 00172860 80 01 02 64 */ lwz r0, 0x264(r1) /* 80175904 00172864 7C 08 03 A6 */ mtlr r0 /* 80175908 00172868 38 21 02 60 */ addi r1, r1, 0x260 -/* 8017590C 0017286C 4E 80 00 20 */ blr +/* 8017590C 0017286C 4E 80 00 20 */ blr .global PreRender__13CBoneTrackingFRC13CStateManagerR9CAnimDataRC12CTransform4fRC9CVector3fRC15CBodyController PreRender__13CBoneTrackingFRC13CStateManagerR9CAnimDataRC12CTransform4fRC9CVector3fRC15CBodyController: @@ -553,14 +553,14 @@ lbl_80175978: /* 80175998 001728F8 80 01 00 34 */ lwz r0, 0x34(r1) /* 8017599C 001728FC 7C 08 03 A6 */ mtlr r0 /* 801759A0 00172900 38 21 00 30 */ addi r1, r1, 0x30 -/* 801759A4 00172904 4E 80 00 20 */ blr +/* 801759A4 00172904 4E 80 00 20 */ blr .global Update__13CBoneTrackingFf Update__13CBoneTrackingFf: /* 801759A8 00172908 C0 03 00 18 */ lfs f0, 0x18(r3) /* 801759AC 0017290C EC 00 08 2A */ fadds f0, f0, f1 /* 801759B0 00172910 D0 03 00 18 */ stfs f0, 0x18(r3) -/* 801759B4 00172914 4E 80 00 20 */ blr +/* 801759B4 00172914 4E 80 00 20 */ blr .global "__ct__13CBoneTrackingFRC9CAnimDataRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>ffb" "__ct__13CBoneTrackingFRC9CAnimDataRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>ffb": diff --git a/asm/MetroidPrime/CCollisionActor.s b/asm/MetroidPrime/CCollisionActor.s index bbd08866..5f082e93 100644 --- a/asm/MetroidPrime/CCollisionActor.s +++ b/asm/MetroidPrime/CCollisionActor.s @@ -181,7 +181,7 @@ __dt__15CCollisionActorFv: /* 801A8910 001A5870 38 80 00 01 */ li r4, 1 /* 801A8914 001A5874 81 8C 00 20 */ lwz r12, 0x20(r12) /* 801A8918 001A5878 7D 89 03 A6 */ mtctr r12 -/* 801A891C 001A587C 4E 80 04 21 */ bctrl +/* 801A891C 001A587C 4E 80 04 21 */ bctrl lbl_801A8920: /* 801A8920 001A5880 34 1E 02 80 */ addic. r0, r30, 0x280 /* 801A8924 001A5884 41 82 00 24 */ beq lbl_801A8948 @@ -192,7 +192,7 @@ lbl_801A8920: /* 801A8938 001A5898 38 80 00 01 */ li r4, 1 /* 801A893C 001A589C 81 8C 00 20 */ lwz r12, 0x20(r12) /* 801A8940 001A58A0 7D 89 03 A6 */ mtctr r12 -/* 801A8944 001A58A4 4E 80 04 21 */ bctrl +/* 801A8944 001A58A4 4E 80 04 21 */ bctrl lbl_801A8948: /* 801A8948 001A58A8 34 1E 02 7C */ addic. r0, r30, 0x27c /* 801A894C 001A58AC 41 82 00 24 */ beq lbl_801A8970 @@ -203,7 +203,7 @@ lbl_801A8948: /* 801A8960 001A58C0 38 80 00 01 */ li r4, 1 /* 801A8964 001A58C4 81 8C 00 20 */ lwz r12, 0x20(r12) /* 801A8968 001A58C8 7D 89 03 A6 */ mtctr r12 -/* 801A896C 001A58CC 4E 80 04 21 */ bctrl +/* 801A896C 001A58CC 4E 80 04 21 */ bctrl lbl_801A8970: /* 801A8970 001A58D0 38 7E 02 78 */ addi r3, r30, 0x278 /* 801A8974 001A58D4 38 80 FF FF */ li r4, -1 @@ -222,7 +222,7 @@ lbl_801A8998: /* 801A89A4 001A5904 83 C1 00 08 */ lwz r30, 8(r1) /* 801A89A8 001A5908 7C 08 03 A6 */ mtlr r0 /* 801A89AC 001A590C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801A89B0 001A5910 4E 80 00 20 */ blr +/* 801A89B0 001A5910 4E 80 00 20 */ blr .global sub_801a89b4 sub_801a89b4: @@ -248,7 +248,7 @@ lbl_801A89F0: /* 801A89FC 001A595C 83 C1 00 08 */ lwz r30, 8(r1) /* 801A8A00 001A5960 7C 08 03 A6 */ mtlr r0 /* 801A8A04 001A5964 38 21 00 10 */ addi r1, r1, 0x10 -/* 801A8A08 001A5968 4E 80 00 20 */ blr +/* 801A8A08 001A5968 4E 80 00 20 */ blr .global sub_801a8a0c sub_801a8a0c: @@ -326,12 +326,12 @@ lbl_801A8AF4: /* 801A8B08 001A5A68 83 81 00 30 */ lwz r28, 0x30(r1) /* 801A8B0C 001A5A6C 7C 08 03 A6 */ mtlr r0 /* 801A8B10 001A5A70 38 21 00 40 */ addi r1, r1, 0x40 -/* 801A8B14 001A5A74 4E 80 00 20 */ blr +/* 801A8B14 001A5A74 4E 80 00 20 */ blr .global GetCollisionResponseType__15CCollisionActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei GetCollisionResponseType__15CCollisionActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei: /* 801A8B18 001A5A78 80 63 03 00 */ lwz r3, 0x300(r3) -/* 801A8B1C 001A5A7C 4E 80 00 20 */ blr +/* 801A8B1C 001A5A7C 4E 80 00 20 */ blr .global sub_801a8b20 sub_801a8b20: @@ -358,23 +358,23 @@ sub_801a8b20: /* 801A8B70 001A5AD0 D0 04 00 1C */ stfs f0, 0x1c(r4) lbl_801A8B74: /* 801A8B74 001A5AD4 38 21 00 20 */ addi r1, r1, 0x20 -/* 801A8B78 001A5AD8 4E 80 00 20 */ blr +/* 801A8B78 001A5AD8 4E 80 00 20 */ blr .global GetSphereRadius__15CCollisionActorCFv GetSphereRadius__15CCollisionActorCFv: /* 801A8B7C 001A5ADC C0 23 02 88 */ lfs f1, 0x288(r3) -/* 801A8B80 001A5AE0 4E 80 00 20 */ blr +/* 801A8B80 001A5AE0 4E 80 00 20 */ blr .global GetBoxSize__15CCollisionActorCFv GetBoxSize__15CCollisionActorCFv: /* 801A8B84 001A5AE4 38 63 02 60 */ addi r3, r3, 0x260 -/* 801A8B88 001A5AE8 4E 80 00 20 */ blr +/* 801A8B88 001A5AE8 4E 80 00 20 */ blr .global GetLastTouchedObject__15CCollisionActorCFv GetLastTouchedObject__15CCollisionActorCFv: /* 801A8B8C 001A5AEC A0 04 02 FC */ lhz r0, 0x2fc(r4) /* 801A8B90 001A5AF0 B0 03 00 00 */ sth r0, 0(r3) -/* 801A8B94 001A5AF4 4E 80 00 20 */ blr +/* 801A8B94 001A5AF4 4E 80 00 20 */ blr .global SetDamageVulnerability__15CCollisionActorFRC20CDamageVulnerability SetDamageVulnerability__15CCollisionActorFRC20CDamageVulnerability: @@ -430,7 +430,7 @@ SetDamageVulnerability__15CCollisionActorFRC20CDamageVulnerability: /* 801A8C5C 001A5BBC 90 03 02 F4 */ stw r0, 0x2f4(r3) /* 801A8C60 001A5BC0 80 04 00 64 */ lwz r0, 0x64(r4) /* 801A8C64 001A5BC4 90 03 02 F8 */ stw r0, 0x2f8(r3) -/* 801A8C68 001A5BC8 4E 80 00 20 */ blr +/* 801A8C68 001A5BC8 4E 80 00 20 */ blr .global GetDamageVulnerability__15CCollisionActorCFRC9CVector3fRC9CVector3fRC11CDamageInfo GetDamageVulnerability__15CCollisionActorCFRC9CVector3fRC9CVector3fRC11CDamageInfo: @@ -440,21 +440,21 @@ GetDamageVulnerability__15CCollisionActorCFRC9CVector3fRC9CVector3fRC11CDamageIn /* 801A8C78 001A5BD8 81 83 00 00 */ lwz r12, 0(r3) /* 801A8C7C 001A5BDC 81 8C 00 38 */ lwz r12, 0x38(r12) /* 801A8C80 001A5BE0 7D 89 03 A6 */ mtctr r12 -/* 801A8C84 001A5BE4 4E 80 04 21 */ bctrl +/* 801A8C84 001A5BE4 4E 80 04 21 */ bctrl /* 801A8C88 001A5BE8 80 01 00 14 */ lwz r0, 0x14(r1) /* 801A8C8C 001A5BEC 7C 08 03 A6 */ mtlr r0 /* 801A8C90 001A5BF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801A8C94 001A5BF4 4E 80 00 20 */ blr +/* 801A8C94 001A5BF4 4E 80 00 20 */ blr .global GetDamageVulnerability__15CCollisionActorCFv GetDamageVulnerability__15CCollisionActorCFv: /* 801A8C98 001A5BF8 38 63 02 94 */ addi r3, r3, 0x294 -/* 801A8C9C 001A5BFC 4E 80 00 20 */ blr +/* 801A8C9C 001A5BFC 4E 80 00 20 */ blr .global HealthInfo__15CCollisionActorFR13CStateManager HealthInfo__15CCollisionActorFR13CStateManager: /* 801A8CA0 001A5C00 38 63 02 8C */ addi r3, r3, 0x28c -/* 801A8CA4 001A5C04 4E 80 00 20 */ blr +/* 801A8CA4 001A5C04 4E 80 00 20 */ blr .global OnScanStateChange__15CCollisionActorFQ26CActor10EScanStateR13CStateManager OnScanStateChange__15CCollisionActorFQ26CActor10EScanStateR13CStateManager: @@ -483,7 +483,7 @@ OnScanStateChange__15CCollisionActorFQ26CActor10EScanStateR13CStateManager: /* 801A8D00 001A5C60 7F E5 FB 78 */ mr r5, r31 /* 801A8D04 001A5C64 81 8C 00 60 */ lwz r12, 0x60(r12) /* 801A8D08 001A5C68 7D 89 03 A6 */ mtctr r12 -/* 801A8D0C 001A5C6C 4E 80 04 21 */ bctrl +/* 801A8D0C 001A5C6C 4E 80 04 21 */ bctrl lbl_801A8D10: /* 801A8D10 001A5C70 7F A3 EB 78 */ mr r3, r29 /* 801A8D14 001A5C74 7F C4 F3 78 */ mr r4, r30 @@ -495,7 +495,7 @@ lbl_801A8D10: /* 801A8D2C 001A5C8C 83 A1 00 24 */ lwz r29, 0x24(r1) /* 801A8D30 001A5C90 7C 08 03 A6 */ mtlr r0 /* 801A8D34 001A5C94 38 21 00 30 */ addi r1, r1, 0x30 -/* 801A8D38 001A5C98 4E 80 00 20 */ blr +/* 801A8D38 001A5C98 4E 80 00 20 */ blr .global AcceptScriptMsg__15CCollisionActorF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__15CCollisionActorF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -518,7 +518,7 @@ AcceptScriptMsg__15CCollisionActorF20EScriptObjectMessage9TUniqueIdR13CStateMana /* 801A8D7C 001A5CDC 38 63 4B 9C */ addi r3, r3, lbl_803E4B9C@l /* 801A8D80 001A5CE0 7C 03 00 2E */ lwzx r0, r3, r0 /* 801A8D84 001A5CE4 7C 09 03 A6 */ mtctr r0 -/* 801A8D88 001A5CE8 4E 80 04 20 */ bctr +/* 801A8D88 001A5CE8 4E 80 04 20 */ bctr .global lbl_801A8D8C lbl_801A8D8C: /* 801A8D8C 001A5CEC A0 1C 02 5C */ lhz r0, 0x25c(r28) @@ -566,7 +566,7 @@ lbl_801A8DF8: /* 801A8E24 001A5D84 83 81 00 30 */ lwz r28, 0x30(r1) /* 801A8E28 001A5D88 7C 08 03 A6 */ mtlr r0 /* 801A8E2C 001A5D8C 38 21 00 40 */ addi r1, r1, 0x40 -/* 801A8E30 001A5D90 4E 80 00 20 */ blr +/* 801A8E30 001A5D90 4E 80 00 20 */ blr .global GetPrimitiveTransform__15CCollisionActorCFv GetPrimitiveTransform__15CCollisionActorCFv: @@ -597,7 +597,7 @@ GetPrimitiveTransform__15CCollisionActorCFv: /* 801A8E94 001A5DF4 83 C1 00 68 */ lwz r30, 0x68(r1) /* 801A8E98 001A5DF8 7C 08 03 A6 */ mtlr r0 /* 801A8E9C 001A5DFC 38 21 00 70 */ addi r1, r1, 0x70 -/* 801A8EA0 001A5E00 4E 80 00 20 */ blr +/* 801A8EA0 001A5E00 4E 80 00 20 */ blr .global sub_801a8ea4 sub_801a8ea4: @@ -605,15 +605,15 @@ sub_801a8ea4: /* 801A8EA8 001A5E08 2C 00 00 00 */ cmpwi r0, 0 /* 801A8EAC 001A5E0C 40 82 00 0C */ bne lbl_801A8EB8 /* 801A8EB0 001A5E10 80 63 02 7C */ lwz r3, 0x27c(r3) -/* 801A8EB4 001A5E14 4E 80 00 20 */ blr +/* 801A8EB4 001A5E14 4E 80 00 20 */ blr lbl_801A8EB8: /* 801A8EB8 001A5E18 2C 00 00 01 */ cmpwi r0, 1 /* 801A8EBC 001A5E1C 40 82 00 0C */ bne lbl_801A8EC8 /* 801A8EC0 001A5E20 80 63 02 80 */ lwz r3, 0x280(r3) -/* 801A8EC4 001A5E24 4E 80 00 20 */ blr +/* 801A8EC4 001A5E24 4E 80 00 20 */ blr lbl_801A8EC8: /* 801A8EC8 001A5E28 80 63 02 84 */ lwz r3, 0x284(r3) -/* 801A8ECC 001A5E2C 4E 80 00 20 */ blr +/* 801A8ECC 001A5E2C 4E 80 00 20 */ blr .global Touch__15CCollisionActorFR6CActorR13CStateManager Touch__15CCollisionActorFR6CActorR13CStateManager: @@ -636,7 +636,7 @@ Touch__15CCollisionActorFR6CActorR13CStateManager: /* 801A8F10 001A5E70 80 01 00 24 */ lwz r0, 0x24(r1) /* 801A8F14 001A5E74 7C 08 03 A6 */ mtlr r0 /* 801A8F18 001A5E78 38 21 00 20 */ addi r1, r1, 0x20 -/* 801A8F1C 001A5E7C 4E 80 00 20 */ blr +/* 801A8F1C 001A5E7C 4E 80 00 20 */ blr .global GetScanObjectIndicatorPosition__15CCollisionActorCFRC13CStateManager GetScanObjectIndicatorPosition__15CCollisionActorCFRC13CStateManager: @@ -702,7 +702,7 @@ lbl_801A8FE4: /* 801A8FF8 001A5F58 38 61 00 2C */ addi r3, r1, 0x2c /* 801A8FFC 001A5F5C 81 8C 00 48 */ lwz r12, 0x48(r12) /* 801A9000 001A5F60 7D 89 03 A6 */ mtctr r12 -/* 801A9004 001A5F64 4E 80 04 21 */ bctrl +/* 801A9004 001A5F64 4E 80 04 21 */ bctrl /* 801A9008 001A5F68 C3 A1 00 2C */ lfs f29, 0x2c(r1) /* 801A900C 001A5F6C 38 61 00 20 */ addi r3, r1, 0x20 /* 801A9010 001A5F70 C0 1F 00 40 */ lfs f0, 0x40(r31) @@ -745,7 +745,7 @@ lbl_801A8FE4: /* 801A90A4 001A6004 83 81 00 40 */ lwz r28, 0x40(r1) /* 801A90A8 001A6008 7C 08 03 A6 */ mtlr r0 /* 801A90AC 001A600C 38 21 00 90 */ addi r1, r1, 0x90 -/* 801A90B0 001A6010 4E 80 00 20 */ blr +/* 801A90B0 001A6010 4E 80 00 20 */ blr .global GetOrbitPosition__15CCollisionActorCFRC13CStateManager GetOrbitPosition__15CCollisionActorCFRC13CStateManager: @@ -758,7 +758,7 @@ GetOrbitPosition__15CCollisionActorCFRC13CStateManager: /* 801A90CC 001A602C 81 84 00 00 */ lwz r12, 0(r4) /* 801A90D0 001A6030 81 8C 00 40 */ lwz r12, 0x40(r12) /* 801A90D4 001A6034 7D 89 03 A6 */ mtctr r12 -/* 801A90D8 001A6038 4E 80 04 21 */ bctrl +/* 801A90D8 001A6038 4E 80 04 21 */ bctrl /* 801A90DC 001A603C 7F E3 FB 78 */ mr r3, r31 /* 801A90E0 001A6040 38 81 00 08 */ addi r4, r1, 8 /* 801A90E4 001A6044 48 18 E5 29 */ bl GetCenterPoint__6CAABoxCFv @@ -768,7 +768,7 @@ GetOrbitPosition__15CCollisionActorCFRC13CStateManager: /* 801A90F4 001A6054 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 801A90F8 001A6058 7C 08 03 A6 */ mtlr r0 /* 801A90FC 001A605C 38 21 00 30 */ addi r1, r1, 0x30 -/* 801A9100 001A6060 4E 80 00 20 */ blr +/* 801A9100 001A6060 4E 80 00 20 */ blr .global GetTouchBounds__15CCollisionActorCFv GetTouchBounds__15CCollisionActorCFv: @@ -790,7 +790,7 @@ GetTouchBounds__15CCollisionActorCFv: /* 801A9140 001A60A0 81 84 00 00 */ lwz r12, 0(r4) /* 801A9144 001A60A4 81 8C 00 14 */ lwz r12, 0x14(r12) /* 801A9148 001A60A8 7D 89 03 A6 */ mtctr r12 -/* 801A914C 001A60AC 4E 80 04 21 */ bctrl +/* 801A914C 001A60AC 4E 80 04 21 */ bctrl /* 801A9150 001A60B0 88 01 00 80 */ lbz r0, 0x80(r1) /* 801A9154 001A60B4 28 00 00 00 */ cmplwi r0, 0 /* 801A9158 001A60B8 40 82 00 48 */ bne lbl_801A91A0 @@ -835,7 +835,7 @@ lbl_801A91D4: /* 801A91E8 001A6148 81 84 00 00 */ lwz r12, 0(r4) /* 801A91EC 001A614C 81 8C 00 14 */ lwz r12, 0x14(r12) /* 801A91F0 001A6150 7D 89 03 A6 */ mtctr r12 -/* 801A91F4 001A6154 4E 80 04 21 */ bctrl +/* 801A91F4 001A6154 4E 80 04 21 */ bctrl /* 801A91F8 001A6158 88 01 00 80 */ lbz r0, 0x80(r1) /* 801A91FC 001A615C 28 00 00 00 */ cmplwi r0, 0 /* 801A9200 001A6160 40 82 00 48 */ bne lbl_801A9248 @@ -878,7 +878,7 @@ lbl_801A927C: /* 801A9288 001A61E8 81 84 00 00 */ lwz r12, 0(r4) /* 801A928C 001A61EC 81 8C 00 14 */ lwz r12, 0x14(r12) /* 801A9290 001A61F0 7D 89 03 A6 */ mtctr r12 -/* 801A9294 001A61F4 4E 80 04 21 */ bctrl +/* 801A9294 001A61F4 4E 80 04 21 */ bctrl /* 801A9298 001A61F8 88 01 00 80 */ lbz r0, 0x80(r1) /* 801A929C 001A61FC 28 00 00 00 */ cmplwi r0, 0 /* 801A92A0 001A6200 40 82 00 48 */ bne lbl_801A92E8 @@ -971,7 +971,7 @@ lbl_801A93DC: /* 801A93EC 001A634C 83 C1 00 88 */ lwz r30, 0x88(r1) /* 801A93F0 001A6350 7C 08 03 A6 */ mtlr r0 /* 801A93F4 001A6354 38 21 00 90 */ addi r1, r1, 0x90 -/* 801A93F8 001A6358 4E 80 00 20 */ blr +/* 801A93F8 001A6358 4E 80 00 20 */ blr .global Accept__15CCollisionActorFR8IVisitor Accept__15CCollisionActorFR8IVisitor: @@ -984,11 +984,11 @@ Accept__15CCollisionActorFR8IVisitor: /* 801A9414 001A6374 7C 04 03 78 */ mr r4, r0 /* 801A9418 001A6378 81 8C 00 18 */ lwz r12, 0x18(r12) /* 801A941C 001A637C 7D 89 03 A6 */ mtctr r12 -/* 801A9420 001A6380 4E 80 04 21 */ bctrl +/* 801A9420 001A6380 4E 80 04 21 */ bctrl /* 801A9424 001A6384 80 01 00 14 */ lwz r0, 0x14(r1) /* 801A9428 001A6388 7C 08 03 A6 */ mtlr r0 /* 801A942C 001A638C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801A9430 001A6390 4E 80 00 20 */ blr +/* 801A9430 001A6390 4E 80 00 20 */ blr .global __ct__15CCollisionActorF9TUniqueId7TAreaId9TUniqueIdbff __ct__15CCollisionActorF9TUniqueId7TAreaId9TUniqueIdbff: @@ -1291,7 +1291,7 @@ lbl_801A9708: /* 801A98C4 001A6824 80 01 01 C4 */ lwz r0, 0x1c4(r1) /* 801A98C8 001A6828 7C 08 03 A6 */ mtlr r0 /* 801A98CC 001A682C 38 21 01 C0 */ addi r1, r1, 0x1c0 -/* 801A98D0 001A6830 4E 80 00 20 */ blr +/* 801A98D0 001A6830 4E 80 00 20 */ blr .global __ct__15CCollisionActorF9TUniqueId9TUniqueIdRC9CVector3fRC9CVector3fbf __ct__15CCollisionActorF9TUniqueId9TUniqueIdRC9CVector3fRC9CVector3fbf: @@ -1607,7 +1607,7 @@ lbl_801A9BEC: /* 801A9D98 001A6CF8 80 01 01 D4 */ lwz r0, 0x1d4(r1) /* 801A9D9C 001A6CFC 7C 08 03 A6 */ mtlr r0 /* 801A9DA0 001A6D00 38 21 01 D0 */ addi r1, r1, 0x1d0 -/* 801A9DA4 001A6D04 4E 80 00 20 */ blr +/* 801A9DA4 001A6D04 4E 80 00 20 */ blr .global __ct__15CCollisionActorF9TUniqueIdCRi9TUniqueIdRC9CVector3fRC9CVector3fbf __ct__15CCollisionActorF9TUniqueIdCRi9TUniqueIdRC9CVector3fRC9CVector3fbf: @@ -1876,7 +1876,7 @@ lbl_801A9FFC: /* 801AA1AC 001A710C 80 01 01 94 */ lwz r0, 0x194(r1) /* 801AA1B0 001A7110 7C 08 03 A6 */ mtlr r0 /* 801AA1B4 001A7114 38 21 01 90 */ addi r1, r1, 0x190 -/* 801AA1B8 001A7118 4E 80 00 20 */ blr +/* 801AA1B8 001A7118 4E 80 00 20 */ blr .global __sinit_CCollisionActor_cpp __sinit_CCollisionActor_cpp: diff --git a/asm/MetroidPrime/CCollisionActorManager.s b/asm/MetroidPrime/CCollisionActorManager.s index a51895ce..a0e8d985 100644 --- a/asm/MetroidPrime/CCollisionActorManager.s +++ b/asm/MetroidPrime/CCollisionActorManager.s @@ -57,7 +57,7 @@ lbl_801A6F68: /* 801A6F78 001A3ED8 83 81 00 20 */ lwz r28, 0x20(r1) /* 801A6F7C 001A3EDC 7C 08 03 A6 */ mtlr r0 /* 801A6F80 001A3EE0 38 21 00 30 */ addi r1, r1, 0x30 -/* 801A6F84 001A3EE4 4E 80 00 20 */ blr +/* 801A6F84 001A3EE4 4E 80 00 20 */ blr .global GetWRLocatorTransform__22CCollisionActorManagerFRC9CAnimData6CSegIdRC12CTransform4fRC12CTransform4f GetWRLocatorTransform__22CCollisionActorManagerFRC9CAnimData6CSegIdRC12CTransform4fRC12CTransform4f: @@ -127,7 +127,7 @@ GetWRLocatorTransform__22CCollisionActorManagerFRC9CAnimData6CSegIdRC12CTransfor /* 801A7084 001A3FE4 83 A1 00 C4 */ lwz r29, 0xc4(r1) /* 801A7088 001A3FE8 7C 08 03 A6 */ mtlr r0 /* 801A708C 001A3FEC 38 21 01 00 */ addi r1, r1, 0x100 -/* 801A7090 001A3FF0 4E 80 00 20 */ blr +/* 801A7090 001A3FF0 4E 80 00 20 */ blr .global sub_801a7094 sub_801a7094: @@ -239,19 +239,19 @@ lbl_801A7224: /* 801A7228 001A4188 80 01 01 74 */ lwz r0, 0x174(r1) /* 801A722C 001A418C 7C 08 03 A6 */ mtlr r0 /* 801A7230 001A4190 38 21 01 70 */ addi r1, r1, 0x170 -/* 801A7234 001A4194 4E 80 00 20 */ blr +/* 801A7234 001A4194 4E 80 00 20 */ blr .global GetCollisionDescFromIndex__22CCollisionActorManagerCFUi GetCollisionDescFromIndex__22CCollisionActorManagerCFUi: /* 801A7238 001A4198 1C 04 00 44 */ mulli r0, r4, 0x44 /* 801A723C 001A419C 80 63 00 0C */ lwz r3, 0xc(r3) /* 801A7240 001A41A0 7C 63 02 14 */ add r3, r3, r0 -/* 801A7244 001A41A4 4E 80 00 20 */ blr +/* 801A7244 001A41A4 4E 80 00 20 */ blr .global GetNumCollisionActors__22CCollisionActorManagerCFv GetNumCollisionActors__22CCollisionActorManagerCFv: /* 801A7248 001A41A8 80 63 00 04 */ lwz r3, 4(r3) -/* 801A724C 001A41AC 4E 80 00 20 */ blr +/* 801A724C 001A41AC 4E 80 00 20 */ blr .global AddMaterial__22CCollisionActorManagerFR13CStateManagerRC13CMaterialList AddMaterial__22CCollisionActorManagerFR13CStateManagerRC13CMaterialList: @@ -299,7 +299,7 @@ lbl_801A72D8: /* 801A72E8 001A4248 80 01 00 34 */ lwz r0, 0x34(r1) /* 801A72EC 001A424C 7C 08 03 A6 */ mtlr r0 /* 801A72F0 001A4250 38 21 00 30 */ addi r1, r1, 0x30 -/* 801A72F4 001A4254 4E 80 00 20 */ blr +/* 801A72F4 001A4254 4E 80 00 20 */ blr .global SetActive__22CCollisionActorManagerFR13CStateManagerb SetActive__22CCollisionActorManagerFR13CStateManagerb: @@ -335,7 +335,7 @@ lbl_801A7328: /* 801A7368 001A42C8 7F C4 F3 78 */ mr r4, r30 /* 801A736C 001A42CC 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 801A7370 001A42D0 7D 89 03 A6 */ mtctr r12 -/* 801A7374 001A42D4 4E 80 04 21 */ bctrl +/* 801A7374 001A42D4 4E 80 04 21 */ bctrl /* 801A7378 001A42D8 57 80 06 3F */ clrlwi. r0, r28, 0x18 /* 801A737C 001A42DC 41 82 00 18 */ beq lbl_801A7394 /* 801A7380 001A42E0 C0 22 A7 F8 */ lfs f1, lbl_805AC518@sda21(r2) @@ -354,12 +354,12 @@ lbl_801A739C: /* 801A73AC 001A430C 80 01 00 34 */ lwz r0, 0x34(r1) /* 801A73B0 001A4310 7C 08 03 A6 */ mtlr r0 /* 801A73B4 001A4314 38 21 00 30 */ addi r1, r1, 0x30 -/* 801A73B8 001A4318 4E 80 00 20 */ blr +/* 801A73B8 001A4318 4E 80 00 20 */ blr .global GetActive__22CCollisionActorManagerCFv GetActive__22CCollisionActorManagerCFv: /* 801A73BC 001A431C 88 63 00 12 */ lbz r3, 0x12(r3) -/* 801A73C0 001A4320 4E 80 00 20 */ blr +/* 801A73C0 001A4320 4E 80 00 20 */ blr .global Destroy__22CCollisionActorManagerCFR13CStateManager Destroy__22CCollisionActorManagerCFR13CStateManager: @@ -399,7 +399,7 @@ lbl_801A741C: /* 801A7440 001A43A0 83 81 00 10 */ lwz r28, 0x10(r1) /* 801A7444 001A43A4 7C 08 03 A6 */ mtlr r0 /* 801A7448 001A43A8 38 21 00 20 */ addi r1, r1, 0x20 -/* 801A744C 001A43AC 4E 80 00 20 */ blr +/* 801A744C 001A43AC 4E 80 00 20 */ blr .global Update__22CCollisionActorManagerCFfR13CStateManagerQ222CCollisionActorManager14EUpdateOptions Update__22CCollisionActorManagerCFfR13CStateManagerQ222CCollisionActorManager14EUpdateOptions: @@ -704,7 +704,7 @@ lbl_801A78B8: /* 801A78CC 001A482C 80 01 03 A4 */ lwz r0, 0x3a4(r1) /* 801A78D0 001A4830 7C 08 03 A6 */ mtlr r0 /* 801A78D4 001A4834 38 21 03 A0 */ addi r1, r1, 0x3a0 -/* 801A78D8 001A4838 4E 80 00 20 */ blr +/* 801A78D8 001A4838 4E 80 00 20 */ blr .global sub_801a78dc sub_801a78dc: @@ -729,7 +729,7 @@ lbl_801A7914: /* 801A7920 001A4880 83 C1 00 08 */ lwz r30, 8(r1) /* 801A7924 001A4884 7C 08 03 A6 */ mtlr r0 /* 801A7928 001A4888 38 21 00 10 */ addi r1, r1, 0x10 -/* 801A792C 001A488C 4E 80 00 20 */ blr +/* 801A792C 001A488C 4E 80 00 20 */ blr .global "__ct__22CCollisionActorManagerFR13CStateManager9TUniqueId7TAreaIdRCQ24rstl63vector<26CJointCollisionDescription,Q24rstl17rmemory_allocator>b" "__ct__22CCollisionActorManagerFR13CStateManager9TUniqueId7TAreaIdRCQ24rstl63vector<26CJointCollisionDescription,Q24rstl17rmemory_allocator>b": @@ -1488,7 +1488,7 @@ lbl_801A8464: /* 801A8484 001A53E4 80 01 05 C4 */ lwz r0, 0x5c4(r1) /* 801A8488 001A53E8 7C 08 03 A6 */ mtlr r0 /* 801A848C 001A53EC 38 21 05 C0 */ addi r1, r1, 0x5c0 -/* 801A8490 001A53F0 4E 80 00 20 */ blr +/* 801A8490 001A53F0 4E 80 00 20 */ blr .global ScaleAllBounds__26CJointCollisionDescriptionFRC9CVector3f ScaleAllBounds__26CJointCollisionDescriptionFRC9CVector3f: @@ -1524,7 +1524,7 @@ ScaleAllBounds__26CJointCollisionDescriptionFRC9CVector3f: /* 801A8508 001A5468 EC 04 00 72 */ fmuls f0, f4, f1 /* 801A850C 001A546C D0 43 00 1C */ stfs f2, 0x1c(r3) /* 801A8510 001A5470 D0 03 00 20 */ stfs f0, 0x20(r3) -/* 801A8514 001A5474 4E 80 00 20 */ blr +/* 801A8514 001A5474 4E 80 00 20 */ blr .global "OBBCollision__26CJointCollisionDescriptionF6CSegIdRC9CVector3fRC9CVector3fRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>f" "OBBCollision__26CJointCollisionDescriptionF6CSegIdRC9CVector3fRC9CVector3fRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>f": @@ -1574,7 +1574,7 @@ ScaleAllBounds__26CJointCollisionDescriptionFRC9CVector3f: /* 801A85C4 001A5524 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801A85C8 001A5528 7C 08 03 A6 */ mtlr r0 /* 801A85CC 001A552C 38 21 00 30 */ addi r1, r1, 0x30 -/* 801A85D0 001A5530 4E 80 00 20 */ blr +/* 801A85D0 001A5530 4E 80 00 20 */ blr .global "OBBAutoSizeCollision__26CJointCollisionDescriptionF6CSegId6CSegIdRC9CVector3fQ226CJointCollisionDescription16EOrientationTypeRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>f" "OBBAutoSizeCollision__26CJointCollisionDescriptionF6CSegId6CSegIdRC9CVector3fQ226CJointCollisionDescription16EOrientationTypeRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>f": @@ -1624,7 +1624,7 @@ ScaleAllBounds__26CJointCollisionDescriptionFRC9CVector3f: /* 801A8680 001A55E0 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801A8684 001A55E4 7C 08 03 A6 */ mtlr r0 /* 801A8688 001A55E8 38 21 00 30 */ addi r1, r1, 0x30 -/* 801A868C 001A55EC 4E 80 00 20 */ blr +/* 801A868C 001A55EC 4E 80 00 20 */ blr .global "AABoxCollision__26CJointCollisionDescriptionF6CSegIdRC9CVector3fRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>f" "AABoxCollision__26CJointCollisionDescriptionF6CSegIdRC9CVector3fRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>f": @@ -1676,7 +1676,7 @@ ScaleAllBounds__26CJointCollisionDescriptionFRC9CVector3f: /* 801A8744 001A56A4 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801A8748 001A56A8 7C 08 03 A6 */ mtlr r0 /* 801A874C 001A56AC 38 21 00 30 */ addi r1, r1, 0x30 -/* 801A8750 001A56B0 4E 80 00 20 */ blr +/* 801A8750 001A56B0 4E 80 00 20 */ blr .global "SphereSubdivideCollision__26CJointCollisionDescriptionF6CSegId6CSegIdffQ226CJointCollisionDescription16EOrientationTypeRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>f" "SphereSubdivideCollision__26CJointCollisionDescriptionF6CSegId6CSegIdffQ226CJointCollisionDescription16EOrientationTypeRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>f": @@ -1725,7 +1725,7 @@ ScaleAllBounds__26CJointCollisionDescriptionFRC9CVector3f: /* 801A87FC 001A575C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801A8800 001A5760 7C 08 03 A6 */ mtlr r0 /* 801A8804 001A5764 38 21 00 30 */ addi r1, r1, 0x30 -/* 801A8808 001A5768 4E 80 00 20 */ blr +/* 801A8808 001A5768 4E 80 00 20 */ blr .global "SphereCollision__26CJointCollisionDescriptionF6CSegIdfRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>f" "SphereCollision__26CJointCollisionDescriptionF6CSegIdfRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>f": @@ -1776,4 +1776,4 @@ ScaleAllBounds__26CJointCollisionDescriptionFRC9CVector3f: /* 801A88BC 001A581C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801A88C0 001A5820 7C 08 03 A6 */ mtlr r0 /* 801A88C4 001A5824 38 21 00 30 */ addi r1, r1, 0x30 -/* 801A88C8 001A5828 4E 80 00 20 */ blr +/* 801A88C8 001A5828 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/CConsoleOutputWindow.s b/asm/MetroidPrime/CConsoleOutputWindow.s index cbcbb65a..bd6db829 100644 --- a/asm/MetroidPrime/CConsoleOutputWindow.s +++ b/asm/MetroidPrime/CConsoleOutputWindow.s @@ -37,7 +37,7 @@ lbl_805A8F00: .global Draw__20CConsoleOutputWindowCFv Draw__20CConsoleOutputWindowCFv: -/* 800FE884 000FB7E4 4E 80 00 20 */ blr +/* 800FE884 000FB7E4 4E 80 00 20 */ blr .global Update__20CConsoleOutputWindowFf Update__20CConsoleOutputWindowFf: @@ -68,7 +68,7 @@ lbl_800FE8D4: /* 800FE8D8 000FB838 7C 06 00 00 */ cmpw r6, r0 /* 800FE8DC 000FB83C 41 80 FF BC */ blt lbl_800FE898 /* 800FE8E0 000FB840 38 21 00 10 */ addi r1, r1, 0x10 -/* 800FE8E4 000FB844 4E 80 00 20 */ blr +/* 800FE8E4 000FB844 4E 80 00 20 */ blr .global OnMessage__20CConsoleOutputWindowFRC20CArchitectureMessageR18CArchitectureQueue OnMessage__20CConsoleOutputWindowFRC20CArchitectureMessageR18CArchitectureQueue: @@ -103,7 +103,7 @@ lbl_800FE944: /* 800FE948 000FB8A8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800FE94C 000FB8AC 7C 08 03 A6 */ mtlr r0 /* 800FE950 000FB8B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800FE954 000FB8B4 4E 80 00 20 */ blr +/* 800FE954 000FB8B4 4E 80 00 20 */ blr .global __dt__20CConsoleOutputWindowFv __dt__20CConsoleOutputWindowFv: @@ -188,7 +188,7 @@ lbl_800FEA5C: /* 800FEA70 000FB9D0 83 81 00 30 */ lwz r28, 0x30(r1) /* 800FEA74 000FB9D4 7C 08 03 A6 */ mtlr r0 /* 800FEA78 000FB9D8 38 21 00 40 */ addi r1, r1, 0x40 -/* 800FEA7C 000FB9DC 4E 80 00 20 */ blr +/* 800FEA7C 000FB9DC 4E 80 00 20 */ blr .global __ct__20CConsoleOutputWindowFiff __ct__20CConsoleOutputWindowFiff: diff --git a/asm/MetroidPrime/CControlMapper.s b/asm/MetroidPrime/CControlMapper.s index 8fe2860b..7125e6cc 100644 --- a/asm/MetroidPrime/CControlMapper.s +++ b/asm/MetroidPrime/CControlMapper.s @@ -515,7 +515,7 @@ lbl_803D9600: .4byte lbl_8000CF08 .4byte lbl_8000CF18 .4byte 0 - + .section .bss .global lbl_804578F8 lbl_804578F8: diff --git a/asm/MetroidPrime/CDamageInfo.s b/asm/MetroidPrime/CDamageInfo.s index 0acba1e9..d21e3819 100644 --- a/asm/MetroidPrime/CDamageInfo.s +++ b/asm/MetroidPrime/CDamageInfo.s @@ -23,7 +23,7 @@ __ct__11CDamageInfoFRC11CDamageInfof: /* 800C3488 000C03E8 88 03 00 18 */ lbz r0, 0x18(r3) /* 800C348C 000C03EC 50 A0 3E 30 */ rlwimi r0, r5, 7, 0x18, 0x18 /* 800C3490 000C03F0 98 03 00 18 */ stb r0, 0x18(r3) -/* 800C3494 000C03F4 4E 80 00 20 */ blr +/* 800C3494 000C03F4 4E 80 00 20 */ blr .global GetRadiusDamage__11CDamageInfoCFRC20CDamageVulnerability GetRadiusDamage__11CDamageInfoCFRC20CDamageVulnerability: @@ -54,7 +54,7 @@ lbl_800C34E8: /* 800C34EC 000C044C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800C34F0 000C0450 7C 08 03 A6 */ mtlr r0 /* 800C34F4 000C0454 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C34F8 000C0458 4E 80 00 20 */ blr +/* 800C34F8 000C0458 4E 80 00 20 */ blr .global GetDamage__11CDamageInfoCFRC20CDamageVulnerability GetDamage__11CDamageInfoCFRC20CDamageVulnerability: @@ -85,7 +85,7 @@ lbl_800C354C: /* 800C3550 000C04B0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800C3554 000C04B4 7C 08 03 A6 */ mtlr r0 /* 800C3558 000C04B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C355C 000C04BC 4E 80 00 20 */ blr +/* 800C355C 000C04BC 4E 80 00 20 */ blr .global __ct__11CDamageInfoFR12CInputStream __ct__11CDamageInfoFR12CInputStream: diff --git a/asm/MetroidPrime/CDamageVulnerability.s b/asm/MetroidPrime/CDamageVulnerability.s index 993ea2d5..33703228 100644 --- a/asm/MetroidPrime/CDamageVulnerability.s +++ b/asm/MetroidPrime/CDamageVulnerability.s @@ -8,15 +8,15 @@ GetDeflectionType__20CDamageVulnerabilityCFRC11CWeaponMode: /* 80102494 000FF3F4 54 80 CF FF */ rlwinm. r0, r4, 0x19, 0x1f, 0x1f /* 80102498 000FF3F8 41 82 00 0C */ beq lbl_801024A4 /* 8010249C 000FF3FC 80 63 00 60 */ lwz r3, 0x60(r3) -/* 801024A0 000FF400 4E 80 00 20 */ blr +/* 801024A0 000FF400 4E 80 00 20 */ blr lbl_801024A4: /* 801024A4 000FF404 54 80 D7 FF */ rlwinm. r0, r4, 0x1a, 0x1f, 0x1f /* 801024A8 000FF408 41 82 00 0C */ beq lbl_801024B4 /* 801024AC 000FF40C 80 63 00 64 */ lwz r3, 0x64(r3) -/* 801024B0 000FF410 4E 80 00 20 */ blr +/* 801024B0 000FF410 4E 80 00 20 */ blr lbl_801024B4: /* 801024B4 000FF414 80 63 00 5C */ lwz r3, 0x5c(r3) -/* 801024B8 000FF418 4E 80 00 20 */ blr +/* 801024B8 000FF418 4E 80 00 20 */ blr .global GetVulnerability__20CDamageVulnerabilityCFRC11CWeaponMode GetVulnerability__20CDamageVulnerabilityCFRC11CWeaponMode: @@ -27,13 +27,13 @@ GetVulnerability__20CDamageVulnerabilityCFRC11CWeaponMode: /* 801024CC 000FF42C 40 81 00 0C */ ble lbl_801024D8 lbl_801024D0: /* 801024D0 000FF430 38 60 00 02 */ li r3, 2 -/* 801024D4 000FF434 4E 80 00 20 */ blr +/* 801024D4 000FF434 4E 80 00 20 */ blr lbl_801024D8: /* 801024D8 000FF438 88 C4 00 04 */ lbz r6, 4(r4) /* 801024DC 000FF43C 54 C0 DF FF */ rlwinm. r0, r6, 0x1b, 0x1f, 0x1f /* 801024E0 000FF440 41 82 00 0C */ beq lbl_801024EC /* 801024E4 000FF444 38 60 00 01 */ li r3, 1 -/* 801024E8 000FF448 4E 80 00 20 */ blr +/* 801024E8 000FF448 4E 80 00 20 */ blr lbl_801024EC: /* 801024EC 000FF44C 54 C0 CF FF */ rlwinm. r0, r6, 0x19, 0x1f, 0x1f /* 801024F0 000FF450 54 E6 10 3A */ slwi r6, r7, 2 @@ -62,25 +62,25 @@ lbl_8010253C: /* 8010253C 000FF49C 2C 05 00 01 */ cmpwi r5, 1 /* 80102540 000FF4A0 40 82 00 0C */ bne lbl_8010254C /* 80102544 000FF4A4 7D 03 43 78 */ mr r3, r8 -/* 80102548 000FF4A8 4E 80 00 20 */ blr +/* 80102548 000FF4A8 4E 80 00 20 */ blr lbl_8010254C: /* 8010254C 000FF4AC 2C 08 00 05 */ cmpwi r8, 5 /* 80102550 000FF4B0 40 82 00 0C */ bne lbl_8010255C /* 80102554 000FF4B4 38 60 00 00 */ li r3, 0 -/* 80102558 000FF4B8 4E 80 00 20 */ blr +/* 80102558 000FF4B8 4E 80 00 20 */ blr lbl_8010255C: /* 8010255C 000FF4BC 2C 08 00 06 */ cmpwi r8, 6 /* 80102560 000FF4C0 40 82 00 0C */ bne lbl_8010256C /* 80102564 000FF4C4 38 60 00 01 */ li r3, 1 -/* 80102568 000FF4C8 4E 80 00 20 */ blr +/* 80102568 000FF4C8 4E 80 00 20 */ blr lbl_8010256C: /* 8010256C 000FF4CC 2C 08 00 07 */ cmpwi r8, 7 /* 80102570 000FF4D0 40 82 00 0C */ bne lbl_8010257C /* 80102574 000FF4D4 38 60 00 03 */ li r3, 3 -/* 80102578 000FF4D8 4E 80 00 20 */ blr +/* 80102578 000FF4D8 4E 80 00 20 */ blr lbl_8010257C: /* 8010257C 000FF4DC 7D 03 43 78 */ mr r3, r8 -/* 80102580 000FF4E0 4E 80 00 20 */ blr +/* 80102580 000FF4E0 4E 80 00 20 */ blr .global WeaponHits__20CDamageVulnerabilityCFRC11CWeaponModei WeaponHits__20CDamageVulnerabilityCFRC11CWeaponModei: @@ -91,13 +91,13 @@ WeaponHits__20CDamageVulnerabilityCFRC11CWeaponModei: /* 80102594 000FF4F4 40 81 00 0C */ ble lbl_801025A0 lbl_80102598: /* 80102598 000FF4F8 38 60 00 00 */ li r3, 0 -/* 8010259C 000FF4FC 4E 80 00 20 */ blr +/* 8010259C 000FF4FC 4E 80 00 20 */ blr lbl_801025A0: /* 801025A0 000FF500 88 04 00 04 */ lbz r0, 4(r4) /* 801025A4 000FF504 54 00 DF FF */ rlwinm. r0, r0, 0x1b, 0x1f, 0x1f /* 801025A8 000FF508 41 82 00 0C */ beq lbl_801025B4 /* 801025AC 000FF50C 38 60 00 01 */ li r3, 1 -/* 801025B0 000FF510 4E 80 00 20 */ blr +/* 801025B0 000FF510 4E 80 00 20 */ blr lbl_801025B4: /* 801025B4 000FF514 55 2A 10 3A */ slwi r10, r9, 2 /* 801025B8 000FF518 2C 05 00 00 */ cmpwi r5, 0 @@ -194,13 +194,13 @@ lbl_801026D8: /* 801026E8 000FF648 40 82 00 18 */ bne lbl_80102700 lbl_801026EC: /* 801026EC 000FF64C 55 00 06 3F */ clrlwi. r0, r8, 0x18 -/* 801026F0 000FF650 4D 82 00 20 */ beqlr +/* 801026F0 000FF650 4D 82 00 20 */ beqlr /* 801026F4 000FF654 88 04 00 04 */ lbz r0, 4(r4) /* 801026F8 000FF658 54 00 D7 FF */ rlwinm. r0, r0, 0x1a, 0x1f, 0x1f -/* 801026FC 000FF65C 4D 82 00 20 */ beqlr +/* 801026FC 000FF65C 4D 82 00 20 */ beqlr lbl_80102700: /* 80102700 000FF660 38 60 00 01 */ li r3, 1 -/* 80102704 000FF664 4E 80 00 20 */ blr +/* 80102704 000FF664 4E 80 00 20 */ blr .global WeaponHurts__20CDamageVulnerabilityCFRC11CWeaponMode WeaponHurts__20CDamageVulnerabilityCFRC11CWeaponMode: @@ -211,13 +211,13 @@ WeaponHurts__20CDamageVulnerabilityCFRC11CWeaponMode: /* 80102718 000FF678 40 81 00 0C */ ble lbl_80102724 lbl_8010271C: /* 8010271C 000FF67C 38 60 00 00 */ li r3, 0 -/* 80102720 000FF680 4E 80 00 20 */ blr +/* 80102720 000FF680 4E 80 00 20 */ blr lbl_80102724: /* 80102724 000FF684 88 04 00 04 */ lbz r0, 4(r4) /* 80102728 000FF688 54 00 DF FF */ rlwinm. r0, r0, 0x1b, 0x1f, 0x1f /* 8010272C 000FF68C 41 82 00 0C */ beq lbl_80102738 /* 80102730 000FF690 38 60 00 01 */ li r3, 1 -/* 80102734 000FF694 4E 80 00 20 */ blr +/* 80102734 000FF694 4E 80 00 20 */ blr lbl_80102738: /* 80102738 000FF698 54 E8 10 3A */ slwi r8, r7, 2 /* 8010273C 000FF69C 2C 05 00 00 */ cmpwi r5, 0 @@ -356,13 +356,13 @@ lbl_80102904: /* 80102914 000FF874 40 82 00 18 */ bne lbl_8010292C lbl_80102918: /* 80102918 000FF878 54 A0 06 3F */ clrlwi. r0, r5, 0x18 -/* 8010291C 000FF87C 4D 82 00 20 */ beqlr +/* 8010291C 000FF87C 4D 82 00 20 */ beqlr /* 80102920 000FF880 88 04 00 04 */ lbz r0, 4(r4) /* 80102924 000FF884 54 00 D7 FF */ rlwinm. r0, r0, 0x1a, 0x1f, 0x1f -/* 80102928 000FF888 4D 82 00 20 */ beqlr +/* 80102928 000FF888 4D 82 00 20 */ beqlr lbl_8010292C: /* 8010292C 000FF88C 38 60 00 01 */ li r3, 1 -/* 80102930 000FF890 4E 80 00 20 */ blr +/* 80102930 000FF890 4E 80 00 20 */ blr .global __ct__20CDamageVulnerabilityF14EVulnerability14EVulnerability14EVulnerability14EVulnerability14EVulnerability14EVulnerability14EVulnerability14EVulnerability14EVulnerability14EVulnerability15EDeflectionType __ct__20CDamageVulnerabilityF14EVulnerability14EVulnerability14EVulnerability14EVulnerability14EVulnerability14EVulnerability14EVulnerability14EVulnerability14EVulnerability14EVulnerability15EDeflectionType: @@ -407,7 +407,7 @@ __ct__20CDamageVulnerabilityF14EVulnerability14EVulnerability14EVulnerability14E /* 801029CC 000FF92C 80 03 00 0C */ lwz r0, 0xc(r3) /* 801029D0 000FF930 90 03 00 58 */ stw r0, 0x58(r3) /* 801029D4 000FF934 90 83 00 5C */ stw r4, 0x5c(r3) -/* 801029D8 000FF938 4E 80 00 20 */ blr +/* 801029D8 000FF938 4E 80 00 20 */ blr .global LoadData__20CDamageVulnerabilityFR12CInputStreami LoadData__20CDamageVulnerabilityFR12CInputStreami: @@ -516,7 +516,7 @@ lbl_80102B1C: /* 80102B48 000FFAA8 80 01 00 34 */ lwz r0, 0x34(r1) /* 80102B4C 000FFAAC 7C 08 03 A6 */ mtlr r0 /* 80102B50 000FFAB0 38 21 00 30 */ addi r1, r1, 0x30 -/* 80102B54 000FFAB4 4E 80 00 20 */ blr +/* 80102B54 000FFAB4 4E 80 00 20 */ blr .global __ct__20CDamageVulnerabilityFR12CInputStream __ct__20CDamageVulnerabilityFR12CInputStream: @@ -632,7 +632,7 @@ lbl_80102CF0: /* 80102CF8 000FFC58 80 01 00 24 */ lwz r0, 0x24(r1) /* 80102CFC 000FFC5C 7C 08 03 A6 */ mtlr r0 /* 80102D00 000FFC60 38 21 00 20 */ addi r1, r1, 0x20 -/* 80102D04 000FFC64 4E 80 00 20 */ blr +/* 80102D04 000FFC64 4E 80 00 20 */ blr .global __sinit_CDamageVulnerability_cpp __sinit_CDamageVulnerability_cpp: diff --git a/asm/MetroidPrime/CDecalManager.s b/asm/MetroidPrime/CDecalManager.s index 1e029215..66ace494 100644 --- a/asm/MetroidPrime/CDecalManager.s +++ b/asm/MetroidPrime/CDecalManager.s @@ -8,7 +8,7 @@ lbl_8046C558: .global lbl_8046C564 lbl_8046C564: .skip 0xC - + .section .sbss # CDecalManager @@ -86,7 +86,7 @@ lbl_80116F30: /* 80116F88 00113EE8 39 00 00 00 */ li r8, 0 /* 80116F8C 00113EEC 81 8C 00 40 */ lwz r12, 0x40(r12) /* 80116F90 00113EF0 7D 89 03 A6 */ mtctr r12 -/* 80116F94 00113EF4 4E 80 04 21 */ bctrl +/* 80116F94 00113EF4 4E 80 04 21 */ bctrl lbl_80116F98: /* 80116F98 00113EF8 3B 7B 00 04 */ addi r27, r27, 4 lbl_80116F9C: @@ -96,7 +96,7 @@ lbl_80116F9C: /* 80116FA8 00113F08 80 01 00 64 */ lwz r0, 0x64(r1) /* 80116FAC 00113F0C 7C 08 03 A6 */ mtlr r0 /* 80116FB0 00113F10 38 21 00 60 */ addi r1, r1, 0x60 -/* 80116FB4 00113F14 4E 80 00 20 */ blr +/* 80116FB4 00113F14 4E 80 00 20 */ blr .global Update__13CDecalManagerFfR13CStateManager Update__13CDecalManagerFfR13CStateManager: @@ -151,7 +151,7 @@ lbl_80117048: /* 80117068 00113FC8 80 01 00 34 */ lwz r0, 0x34(r1) /* 8011706C 00113FCC 7C 08 03 A6 */ mtlr r0 /* 80117070 00113FD0 38 21 00 30 */ addi r1, r1, 0x30 -/* 80117074 00113FD4 4E 80 00 20 */ blr +/* 80117074 00113FD4 4E 80 00 20 */ blr .global RemoveFromActiveList__13CDecalManagerFPii RemoveFromActiveList__13CDecalManagerFPii: @@ -199,10 +199,10 @@ lbl_801170F4: /* 8011710C 0011406C 7C 00 20 00 */ cmpw r0, r4 /* 80117110 00114070 7C 86 2A 14 */ add r4, r6, r5 /* 80117114 00114074 98 E4 00 78 */ stb r7, 0x78(r4) -/* 80117118 00114078 4C 82 00 20 */ bnelr +/* 80117118 00114078 4C 82 00 20 */ bnelr /* 8011711C 0011407C 38 00 FF FF */ li r0, -1 /* 80117120 00114080 90 0D A3 74 */ stw r0, lbl_805A8F34@sda21(r13) -/* 80117124 00114084 4E 80 00 20 */ blr +/* 80117124 00114084 4E 80 00 20 */ blr .global "AddDecal__13CDecalManagerFRC27TToken<17CDecalDescription>RC12CTransform4fR13CStateManager" "AddDecal__13CDecalManagerFRC27TToken<17CDecalDescription>RC12CTransform4fR13CStateManager": @@ -325,7 +325,7 @@ lbl_801172E0: /* 801172E4 00114244 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 801172E8 00114248 7C 08 03 A6 */ mtlr r0 /* 801172EC 0011424C 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 801172F0 00114250 4E 80 00 20 */ blr +/* 801172F0 00114250 4E 80 00 20 */ blr .global "assign__Q24rstl24optional_object<6CDecal>FRC6CDecal" "assign__Q24rstl24optional_object<6CDecal>FRC6CDecal": @@ -340,7 +340,7 @@ lbl_801172E0: /* 80117314 00114274 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80117318 00114278 7C 08 03 A6 */ mtlr r0 /* 8011731C 0011427C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80117320 00114280 4E 80 00 20 */ blr +/* 80117320 00114280 4E 80 00 20 */ blr .global sub_80117324 sub_80117324: @@ -435,7 +435,7 @@ lbl_80117468: /* 80117478 001143D8 83 81 00 10 */ lwz r28, 0x10(r1) /* 8011747C 001143DC 7C 08 03 A6 */ mtlr r0 /* 80117480 001143E0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80117484 001143E4 4E 80 00 20 */ blr +/* 80117484 001143E4 4E 80 00 20 */ blr .global Reinitialize__13CDecalManagerFv Reinitialize__13CDecalManagerFv: @@ -531,7 +531,7 @@ lbl_801175B0: /* 801175CC 0011452C 83 C1 00 F8 */ lwz r30, 0xf8(r1) /* 801175D0 00114530 7C 08 03 A6 */ mtlr r0 /* 801175D4 00114534 38 21 01 00 */ addi r1, r1, 0x100 -/* 801175D8 00114538 4E 80 00 20 */ blr +/* 801175D8 00114538 4E 80 00 20 */ blr .global sub_801175dc sub_801175dc: @@ -555,7 +555,7 @@ sub_801175dc: /* 80117620 00114580 80 01 00 14 */ lwz r0, 0x14(r1) /* 80117624 00114584 7C 08 03 A6 */ mtlr r0 /* 80117628 00114588 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011762C 0011458C 4E 80 00 20 */ blr +/* 8011762C 0011458C 4E 80 00 20 */ blr .global sub_80117630 sub_80117630: @@ -593,7 +593,7 @@ lbl_80117694: /* 80117698 001145F8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8011769C 001145FC 7C 08 03 A6 */ mtlr r0 /* 801176A0 00114600 38 21 00 10 */ addi r1, r1, 0x10 -/* 801176A4 00114604 4E 80 00 20 */ blr +/* 801176A4 00114604 4E 80 00 20 */ blr .global "__as__Q24rstl24optional_object<6CDecal>FRCQ24rstl24optional_object<6CDecal>" "__as__Q24rstl24optional_object<6CDecal>FRCQ24rstl24optional_object<6CDecal>": @@ -624,7 +624,7 @@ lbl_80117694: /* 80117708 00114668 83 81 00 10 */ lwz r28, 0x10(r1) /* 8011770C 0011466C 7C 08 03 A6 */ mtlr r0 /* 80117710 00114670 38 21 00 20 */ addi r1, r1, 0x20 -/* 80117714 00114674 4E 80 00 20 */ blr +/* 80117714 00114674 4E 80 00 20 */ blr .global sub_80117718 sub_80117718: @@ -687,7 +687,7 @@ lbl_801177E0: /* 801177F4 00114754 83 81 00 10 */ lwz r28, 0x10(r1) /* 801177F8 00114758 7C 08 03 A6 */ mtlr r0 /* 801177FC 0011475C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80117800 00114760 4E 80 00 20 */ blr +/* 80117800 00114760 4E 80 00 20 */ blr .global ShutDown__13CDecalManagerFv ShutDown__13CDecalManagerFv: @@ -729,7 +729,7 @@ lbl_80117860: /* 80117880 001147E0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80117884 001147E4 7C 08 03 A6 */ mtlr r0 /* 80117888 001147E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011788C 001147EC 4E 80 00 20 */ blr +/* 8011788C 001147EC 4E 80 00 20 */ blr .global "data__Q24rstl44reserved_vectorFv" "data__Q24rstl44reserved_vectorFv": @@ -760,7 +760,7 @@ lbl_801178C8: /* 801178E8 00114848 83 A1 00 14 */ lwz r29, 0x14(r1) /* 801178EC 0011484C 7C 08 03 A6 */ mtlr r0 /* 801178F0 00114850 38 21 00 20 */ addi r1, r1, 0x20 -/* 801178F4 00114854 4E 80 00 20 */ blr +/* 801178F4 00114854 4E 80 00 20 */ blr .global sub_801178f8 sub_801178f8: @@ -788,7 +788,7 @@ lbl_80117940: /* 80117944 001148A4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80117948 001148A8 7C 08 03 A6 */ mtlr r0 /* 8011794C 001148AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80117950 001148B0 4E 80 00 20 */ blr +/* 80117950 001148B0 4E 80 00 20 */ blr .global Initialize__13CDecalManagerFv Initialize__13CDecalManagerFv: @@ -865,7 +865,7 @@ lbl_80117A54: /* 80117A5C 001149BC 83 C1 00 F8 */ lwz r30, 0xf8(r1) /* 80117A60 001149C0 7C 08 03 A6 */ mtlr r0 /* 80117A64 001149C4 38 21 01 00 */ addi r1, r1, 0x100 -/* 80117A68 001149C8 4E 80 00 20 */ blr +/* 80117A68 001149C8 4E 80 00 20 */ blr .global sub_80117a6c sub_80117a6c: @@ -886,7 +886,7 @@ sub_80117a6c: /* 80117AA4 00114A04 80 01 00 14 */ lwz r0, 0x14(r1) /* 80117AA8 00114A08 7C 08 03 A6 */ mtlr r0 /* 80117AAC 00114A0C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80117AB0 00114A10 4E 80 00 20 */ blr +/* 80117AB0 00114A10 4E 80 00 20 */ blr .global sub_80117ab4 sub_80117ab4: @@ -900,7 +900,7 @@ lbl_80117ACC: /* 80117ACC 00114A2C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80117AD0 00114A30 7C 08 03 A6 */ mtlr r0 /* 80117AD4 00114A34 38 21 00 10 */ addi r1, r1, 0x10 -/* 80117AD8 00114A38 4E 80 00 20 */ blr +/* 80117AD8 00114A38 4E 80 00 20 */ blr .global sub_80117adc sub_80117adc: @@ -924,7 +924,7 @@ sub_80117adc: /* 80117B20 00114A80 80 01 00 14 */ lwz r0, 0x14(r1) /* 80117B24 00114A84 7C 08 03 A6 */ mtlr r0 /* 80117B28 00114A88 38 21 00 10 */ addi r1, r1, 0x10 -/* 80117B2C 00114A8C 4E 80 00 20 */ blr +/* 80117B2C 00114A8C 4E 80 00 20 */ blr .global __sinit_CDecalManager_cpp __sinit_CDecalManager_cpp: @@ -950,7 +950,7 @@ __sinit_CDecalManager_cpp: /* 80117B7C 00114ADC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80117B80 00114AE0 7C 08 03 A6 */ mtlr r0 /* 80117B84 00114AE4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80117B88 00114AE8 4E 80 00 20 */ blr +/* 80117B88 00114AE8 4E 80 00 20 */ blr .global "__dt__Q24rstl21reserved_vectorFv" "__dt__Q24rstl21reserved_vectorFv": @@ -995,7 +995,7 @@ lbl_80117C08: /* 80117C10 00114B70 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80117C14 00114B74 7C 08 03 A6 */ mtlr r0 /* 80117C18 00114B78 38 21 00 10 */ addi r1, r1, 0x10 -/* 80117C1C 00114B7C 4E 80 00 20 */ blr +/* 80117C1C 00114B7C 4E 80 00 20 */ blr .global "__dt__Q24rstl44reserved_vectorFv" "__dt__Q24rstl44reserved_vectorFv": diff --git a/asm/MetroidPrime/CEffect.s b/asm/MetroidPrime/CEffect.s index 1596e4d1..210bba0f 100644 --- a/asm/MetroidPrime/CEffect.s +++ b/asm/MetroidPrime/CEffect.s @@ -79,15 +79,15 @@ lbl_8005AD28: /* 8005AD38 00057C98 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8005AD3C 00057C9C 7C 08 03 A6 */ mtlr r0 /* 8005AD40 00057CA0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8005AD44 00057CA4 4E 80 00 20 */ blr +/* 8005AD44 00057CA4 4E 80 00 20 */ blr .global nullsub_83 nullsub_83: -/* 8005AD48 00057CA8 4E 80 00 20 */ blr +/* 8005AD48 00057CA8 4E 80 00 20 */ blr .global nullsub_84 nullsub_84: -/* 8005AD4C 00057CAC 4E 80 00 20 */ blr +/* 8005AD4C 00057CAC 4E 80 00 20 */ blr .global "__ct__7CEffectF9TUniqueIdRC11CEntityInfobRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC12CTransform4f" "__ct__7CEffectF9TUniqueIdRC11CEntityInfobRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC12CTransform4f": diff --git a/asm/MetroidPrime/CEntity.s b/asm/MetroidPrime/CEntity.s index c86bec62..19f6bb17 100644 --- a/asm/MetroidPrime/CEntity.s +++ b/asm/MetroidPrime/CEntity.s @@ -19,7 +19,7 @@ lbl_803D9E30: .global lbl_8046C3B8 lbl_8046C3B8: .skip 0x10 - + .section .text, "ax" .global GetAreaId__7CEntityCFv @@ -34,22 +34,22 @@ lbl_80051098: lbl_8005109C: /* 8005109C 0004DFFC 80 04 00 00 */ lwz r0, 0(r4) /* 800510A0 0004E000 90 03 00 00 */ stw r0, 0(r3) -/* 800510A4 0004E004 4E 80 00 20 */ blr +/* 800510A4 0004E004 4E 80 00 20 */ blr .global SetActive__7CEntityFb SetActive__7CEntityFb: /* 800510A8 0004E008 88 03 00 30 */ lbz r0, 0x30(r3) /* 800510AC 0004E00C 50 80 3E 30 */ rlwimi r0, r4, 7, 0x18, 0x18 /* 800510B0 0004E010 98 03 00 30 */ stb r0, 0x30(r3) -/* 800510B4 0004E014 4E 80 00 20 */ blr +/* 800510B4 0004E014 4E 80 00 20 */ blr .global Think__7CEntityFfR13CStateManager Think__7CEntityFfR13CStateManager: -/* 800510B8 0004E018 4E 80 00 20 */ blr +/* 800510B8 0004E018 4E 80 00 20 */ blr .global PreThink__7CEntityFfR13CStateManager PreThink__7CEntityFfR13CStateManager: -/* 800510BC 0004E01C 4E 80 00 20 */ blr +/* 800510BC 0004E01C 4E 80 00 20 */ blr .global SendScriptMsgs__7CEntityF18EScriptObjectStateR13CStateManager20EScriptObjectMessage SendScriptMsgs__7CEntityF18EScriptObjectStateR13CStateManager20EScriptObjectMessage: @@ -94,7 +94,7 @@ lbl_80051130: /* 8005114C 0004E0AC 80 01 00 34 */ lwz r0, 0x34(r1) /* 80051150 0004E0B0 7C 08 03 A6 */ mtlr r0 /* 80051154 0004E0B4 38 21 00 30 */ addi r1, r1, 0x30 -/* 80051158 0004E0B8 4E 80 00 20 */ blr +/* 80051158 0004E0B8 4E 80 00 20 */ blr .global AcceptScriptMsg__7CEntityF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__7CEntityF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -123,7 +123,7 @@ lbl_8005119C: /* 800511AC 0004E10C 38 80 00 01 */ li r4, 1 /* 800511B0 0004E110 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 800511B4 0004E114 7D 89 03 A6 */ mtctr r12 -/* 800511B8 0004E118 4E 80 04 21 */ bctrl +/* 800511B8 0004E118 4E 80 04 21 */ bctrl /* 800511BC 0004E11C 7F C3 F3 78 */ mr r3, r30 /* 800511C0 0004E120 7F E5 FB 78 */ mr r5, r31 /* 800511C4 0004E124 38 80 00 00 */ li r4, 0 @@ -138,7 +138,7 @@ lbl_800511D4: /* 800511E4 0004E144 38 80 00 00 */ li r4, 0 /* 800511E8 0004E148 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 800511EC 0004E14C 7D 89 03 A6 */ mtctr r12 -/* 800511F0 0004E150 4E 80 04 21 */ bctrl +/* 800511F0 0004E150 4E 80 04 21 */ bctrl /* 800511F4 0004E154 7F C3 F3 78 */ mr r3, r30 /* 800511F8 0004E158 7F E5 FB 78 */ mr r5, r31 /* 800511FC 0004E15C 38 80 00 05 */ li r4, 5 @@ -156,7 +156,7 @@ lbl_8005120C: /* 80051228 0004E188 81 83 00 00 */ lwz r12, 0(r3) /* 8005122C 0004E18C 81 8C 00 18 */ lwz r12, 0x18(r12) /* 80051230 0004E190 7D 89 03 A6 */ mtctr r12 -/* 80051234 0004E194 4E 80 04 21 */ bctrl +/* 80051234 0004E194 4E 80 04 21 */ bctrl /* 80051238 0004E198 48 00 00 24 */ b lbl_8005125C lbl_8005123C: /* 8005123C 0004E19C A0 05 00 00 */ lhz r0, 0(r5) @@ -166,14 +166,14 @@ lbl_8005123C: /* 8005124C 0004E1AC 81 83 00 00 */ lwz r12, 0(r3) /* 80051250 0004E1B0 81 8C 00 18 */ lwz r12, 0x18(r12) /* 80051254 0004E1B4 7D 89 03 A6 */ mtctr r12 -/* 80051258 0004E1B8 4E 80 04 21 */ bctrl +/* 80051258 0004E1B8 4E 80 04 21 */ bctrl lbl_8005125C: /* 8005125C 0004E1BC 80 01 00 24 */ lwz r0, 0x24(r1) /* 80051260 0004E1C0 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80051264 0004E1C4 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80051268 0004E1C8 7C 08 03 A6 */ mtlr r0 /* 8005126C 0004E1CC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80051270 0004E1D0 4E 80 00 20 */ blr +/* 80051270 0004E1D0 4E 80 00 20 */ blr .global __dt__7CEntityFv __dt__7CEntityFv: @@ -225,7 +225,7 @@ lbl_80051308: /* 80051314 0004E274 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80051318 0004E278 7C 08 03 A6 */ mtlr r0 /* 8005131C 0004E27C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80051320 0004E280 4E 80 00 20 */ blr +/* 80051320 0004E280 4E 80 00 20 */ blr .global "__ct__7CEntityF9TUniqueIdRC11CEntityInfobRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" "__ct__7CEntityF9TUniqueIdRC11CEntityInfobRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>": @@ -322,7 +322,7 @@ lbl_80051420: /* 80051474 0004E3D4 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80051478 0004E3D8 7C 08 03 A6 */ mtlr r0 /* 8005147C 0004E3DC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80051480 0004E3E0 4E 80 00 20 */ blr +/* 80051480 0004E3E0 4E 80 00 20 */ blr .global "__ct__11CEntityInfoF7TAreaIdRCQ24rstl48vector<11SConnection,Q24rstl17rmemory_allocator>9TEditorId" "__ct__11CEntityInfoF7TAreaIdRCQ24rstl48vector<11SConnection,Q24rstl17rmemory_allocator>9TEditorId": @@ -394,7 +394,7 @@ lbl_80051558: /* 80051570 0004E4D0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80051574 0004E4D4 7C 08 03 A6 */ mtlr r0 /* 80051578 0004E4D8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8005157C 0004E4DC 4E 80 00 20 */ blr +/* 8005157C 0004E4DC 4E 80 00 20 */ blr .global __sinit_CEntity_cpp __sinit_CEntity_cpp: @@ -415,4 +415,4 @@ __sinit_CEntity_cpp: /* 800515B8 0004E518 80 01 00 14 */ lwz r0, 0x14(r1) /* 800515BC 0004E51C 7C 08 03 A6 */ mtlr r0 /* 800515C0 0004E520 38 21 00 10 */ addi r1, r1, 0x10 -/* 800515C4 0004E524 4E 80 00 20 */ blr +/* 800515C4 0004E524 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/CEnvFxManager.s b/asm/MetroidPrime/CEnvFxManager.s index 9a4640e8..ba96816b 100644 --- a/asm/MetroidPrime/CEnvFxManager.s +++ b/asm/MetroidPrime/CEnvFxManager.s @@ -66,7 +66,7 @@ lbl_805A90B0: .global lbl_805A90B4 lbl_805A90B4: .skip 0x4 - + .section .text, "ax" .global AreaLoaded__13CEnvFxManagerFv @@ -85,7 +85,7 @@ lbl_8020FE38: /* 8020FE38 0020CD98 80 03 00 50 */ lwz r0, 0x50(r3) /* 8020FE3C 0020CD9C 7C 06 00 00 */ cmpw r6, r0 /* 8020FE40 0020CDA0 41 80 FF E4 */ blt lbl_8020FE24 -/* 8020FE44 0020CDA4 4E 80 00 20 */ blr +/* 8020FE44 0020CDA4 4E 80 00 20 */ blr .global "BuildBlockObjectList__13CEnvFxManagerFR27reserved_vector<9TUniqueId>R13CStateManager" "BuildBlockObjectList__13CEnvFxManagerFR27reserved_vector<9TUniqueId>R13CStateManager": @@ -164,7 +164,7 @@ lbl_8020FF34: /* 8020FF4C 0020CEAC 83 81 00 20 */ lwz r28, 0x20(r1) /* 8020FF50 0020CEB0 7C 08 03 A6 */ mtlr r0 /* 8020FF54 0020CEB4 38 21 00 30 */ addi r1, r1, 0x30 -/* 8020FF58 0020CEB8 4E 80 00 20 */ blr +/* 8020FF58 0020CEB8 4E 80 00 20 */ blr .global sub_8020ff5c sub_8020ff5c: @@ -179,7 +179,7 @@ sub_8020ff5c: /* 8020FF7C 0020CEDC EC 00 10 28 */ fsubs f0, f0, f2 /* 8020FF80 0020CEE0 D0 03 00 38 */ stfs f0, 0x38(r3) /* 8020FF84 0020CEE4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8020FF88 0020CEE8 4E 80 00 20 */ blr +/* 8020FF88 0020CEE8 4E 80 00 20 */ blr .global UpdateRainSounds__13CEnvFxManagerFR13CStateManager UpdateRainSounds__13CEnvFxManagerFR13CStateManager: @@ -320,7 +320,7 @@ lbl_80210190: /* 80210198 0020D0F8 83 C1 00 D8 */ lwz r30, 0xd8(r1) /* 8021019C 0020D0FC 7C 08 03 A6 */ mtlr r0 /* 802101A0 0020D100 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 802101A4 0020D104 4E 80 00 20 */ blr +/* 802101A4 0020D104 4E 80 00 20 */ blr .global CalcRainPitch__Ff CalcRainPitch__Ff: @@ -331,7 +331,7 @@ CalcRainPitch__Ff: /* 802101B8 0020D118 D8 01 00 08 */ stfd f0, 8(r1) /* 802101BC 0020D11C 80 61 00 0C */ lwz r3, 0xc(r1) /* 802101C0 0020D120 38 21 00 10 */ addi r1, r1, 0x10 -/* 802101C4 0020D124 4E 80 00 20 */ blr +/* 802101C4 0020D124 4E 80 00 20 */ blr .global CalcRainVolume__Ff CalcRainVolume__Ff: @@ -354,7 +354,7 @@ lbl_802101FC: /* 80210200 0020D160 D8 01 00 08 */ stfd f0, 8(r1) /* 80210204 0020D164 80 61 00 0C */ lwz r3, 0xc(r1) /* 80210208 0020D168 38 21 00 10 */ addi r1, r1, 0x10 -/* 8021020C 0020D16C 4E 80 00 20 */ blr +/* 8021020C 0020D16C 4E 80 00 20 */ blr .global Render__13CEnvFxManagerFRC13CStateManager Render__13CEnvFxManagerFRC13CStateManager: @@ -393,7 +393,7 @@ lbl_80210278: /* 8021028C 0020D1EC 81 83 00 00 */ lwz r12, 0(r3) /* 80210290 0020D1F0 81 8C 00 60 */ lwz r12, 0x60(r12) /* 80210294 0020D1F4 7D 89 03 A6 */ mtctr r12 -/* 80210298 0020D1F8 4E 80 04 21 */ bctrl +/* 80210298 0020D1F8 4E 80 04 21 */ bctrl /* 8021029C 0020D1FC 7F 84 E3 78 */ mr r4, r28 /* 802102A0 0020D200 38 61 00 68 */ addi r3, r1, 0x68 /* 802102A4 0020D204 48 00 09 51 */ bl GetParticleBoundsToWorldTransform__13CEnvFxManagerCFv @@ -469,7 +469,7 @@ lbl_8021038C: /* 8021039C 0020D2FC 83 81 01 30 */ lwz r28, 0x130(r1) /* 802103A0 0020D300 7C 08 03 A6 */ mtlr r0 /* 802103A4 0020D304 38 21 01 40 */ addi r1, r1, 0x140 -/* 802103A8 0020D308 4E 80 00 20 */ blr +/* 802103A8 0020D308 4E 80 00 20 */ blr .global SetupRainTevs__13CEnvFxManagerFv SetupRainTevs__13CEnvFxManagerFv: @@ -563,7 +563,7 @@ SetupRainTevs__13CEnvFxManagerFv: /* 80210508 0020D468 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8021050C 0020D46C 7C 08 03 A6 */ mtlr r0 /* 80210510 0020D470 38 21 00 20 */ addi r1, r1, 0x20 -/* 80210514 0020D474 4E 80 00 20 */ blr +/* 80210514 0020D474 4E 80 00 20 */ blr .global sub_80210518 sub_80210518: @@ -577,7 +577,7 @@ sub_80210518: /* 80210534 0020D494 80 01 00 14 */ lwz r0, 0x14(r1) /* 80210538 0020D498 7C 08 03 A6 */ mtlr r0 /* 8021053C 0020D49C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80210540 0020D4A0 4E 80 00 20 */ blr +/* 80210540 0020D4A0 4E 80 00 20 */ blr .global SetupUnderwaterTevs__13CEnvFxManagerFRC12CTransform4fR13CStateManager SetupUnderwaterTevs__13CEnvFxManagerFRC12CTransform4fR13CStateManager: @@ -681,7 +681,7 @@ lbl_80210690: /* 802106C4 0020D624 81 9B 00 00 */ lwz r12, 0(r27) /* 802106C8 0020D628 81 8C 00 40 */ lwz r12, 0x40(r12) /* 802106CC 0020D62C 7D 89 03 A6 */ mtctr r12 -/* 802106D0 0020D630 4E 80 04 21 */ bctrl +/* 802106D0 0020D630 4E 80 04 21 */ bctrl /* 802106D4 0020D634 88 01 00 48 */ lbz r0, 0x48(r1) /* 802106D8 0020D638 28 00 00 00 */ cmplwi r0, 0 /* 802106DC 0020D63C 98 01 00 84 */ stb r0, 0x84(r1) @@ -802,7 +802,7 @@ lbl_8021077C: /* 8021088C 0020D7EC 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 80210890 0020D7F0 7C 08 03 A6 */ mtlr r0 /* 80210894 0020D7F4 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 80210898 0020D7F8 4E 80 00 20 */ blr +/* 80210898 0020D7F8 4E 80 00 20 */ blr .global SetupSnowTevs__13CEnvFxManagerFR13CStateManager SetupSnowTevs__13CEnvFxManagerFR13CStateManager: @@ -830,7 +830,7 @@ SetupSnowTevs__13CEnvFxManagerFR13CStateManager: /* 802108F0 0020D850 C0 42 B2 7C */ lfs f2, lbl_805ACF9C@sda21(r2) /* 802108F4 0020D854 81 8C 00 E0 */ lwz r12, 0xe0(r12) /* 802108F8 0020D858 7D 89 03 A6 */ mtctr r12 -/* 802108FC 0020D85C 4E 80 04 21 */ bctrl +/* 802108FC 0020D85C 4E 80 04 21 */ bctrl /* 80210900 0020D860 C0 22 B2 64 */ lfs f1, lbl_805ACF84@sda21(r2) /* 80210904 0020D864 38 61 00 08 */ addi r3, r1, 8 /* 80210908 0020D868 C0 82 B2 70 */ lfs f4, lbl_805ACF90@sda21(r2) @@ -850,7 +850,7 @@ lbl_80210924: /* 8021093C 0020D89C C0 42 B2 84 */ lfs f2, lbl_805ACFA4@sda21(r2) /* 80210940 0020D8A0 81 8C 00 E0 */ lwz r12, 0xe0(r12) /* 80210944 0020D8A4 7D 89 03 A6 */ mtctr r12 -/* 80210948 0020D8A8 4E 80 04 21 */ bctrl +/* 80210948 0020D8A8 4E 80 04 21 */ bctrl lbl_8021094C: /* 8021094C 0020D8AC 3C 60 80 3D */ lis r3, lbl_803D27B0@ha /* 80210950 0020D8B0 38 63 27 B0 */ addi r3, r3, lbl_803D27B0@l @@ -955,7 +955,7 @@ lbl_8021094C: /* 80210ADC 0020DA3C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80210AE0 0020DA40 7C 08 03 A6 */ mtlr r0 /* 80210AE4 0020DA44 38 21 00 20 */ addi r1, r1, 0x20 -/* 80210AE8 0020DA48 4E 80 00 20 */ blr +/* 80210AE8 0020DA48 4E 80 00 20 */ blr .global BlankFirstSnowflakeMip__13CEnvFxManagerFR8CTexture BlankFirstSnowflakeMip__13CEnvFxManagerFR8CTexture: @@ -1029,7 +1029,7 @@ lbl_80210BDC: /* 80210BE4 0020DB44 83 C1 00 08 */ lwz r30, 8(r1) /* 80210BE8 0020DB48 7C 08 03 A6 */ mtlr r0 /* 80210BEC 0020DB4C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80210BF0 0020DB50 4E 80 00 20 */ blr +/* 80210BF0 0020DB50 4E 80 00 20 */ blr .global GetParticleBoundsToWorldTransform__13CEnvFxManagerCFv GetParticleBoundsToWorldTransform__13CEnvFxManagerCFv: @@ -1068,7 +1068,7 @@ GetParticleBoundsToWorldTransform__13CEnvFxManagerCFv: /* 80210C74 0020DBD4 83 C1 00 E8 */ lwz r30, 0xe8(r1) /* 80210C78 0020DBD8 7C 08 03 A6 */ mtlr r0 /* 80210C7C 0020DBDC 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 80210C80 0020DBE0 4E 80 00 20 */ blr +/* 80210C80 0020DBE0 4E 80 00 20 */ blr .global SetSplashEffectRate__13CEnvFxManagerFfR13CStateManager SetSplashEffectRate__13CEnvFxManagerFfR13CStateManager: @@ -1096,13 +1096,13 @@ SetSplashEffectRate__13CEnvFxManagerFfR13CStateManager: /* 80210CD8 0020DC38 81 83 00 00 */ lwz r12, 0(r3) /* 80210CDC 0020DC3C 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80210CE0 0020DC40 7D 89 03 A6 */ mtctr r12 -/* 80210CE4 0020DC44 4E 80 04 21 */ bctrl +/* 80210CE4 0020DC44 4E 80 04 21 */ bctrl lbl_80210CE8: /* 80210CE8 0020DC48 80 01 00 24 */ lwz r0, 0x24(r1) /* 80210CEC 0020DC4C CB E1 00 18 */ lfd f31, 0x18(r1) /* 80210CF0 0020DC50 7C 08 03 A6 */ mtlr r0 /* 80210CF4 0020DC54 38 21 00 20 */ addi r1, r1, 0x20 -/* 80210CF8 0020DC58 4E 80 00 20 */ blr +/* 80210CF8 0020DC58 4E 80 00 20 */ blr .global UpdateVisorSplash__13CEnvFxManagerFR13CStateManagerfRC12CTransform4f UpdateVisorSplash__13CEnvFxManagerFR13CStateManagerfRC12CTransform4f: @@ -1256,7 +1256,7 @@ lbl_80210EE8: /* 80210F20 0020DE80 83 81 00 50 */ lwz r28, 0x50(r1) /* 80210F24 0020DE84 7C 08 03 A6 */ mtlr r0 /* 80210F28 0020DE88 38 21 00 80 */ addi r1, r1, 0x80 -/* 80210F2C 0020DE8C 4E 80 00 20 */ blr +/* 80210F2C 0020DE8C 4E 80 00 20 */ blr .global UpdateUnderwaterParticles__13CEnvFxManagerFRC15CVectorFixed8_8 UpdateUnderwaterParticles__13CEnvFxManagerFRC15CVectorFixed8_8: @@ -1356,7 +1356,7 @@ lbl_80211084: .global sub_8021108c sub_8021108c: -/* 8021108C 0020DFEC 4E 80 00 20 */ blr +/* 8021108C 0020DFEC 4E 80 00 20 */ blr .global UpdateRainParticles__13CEnvFxManagerFRC15CVectorFixed8_8RC9CVector3ff UpdateRainParticles__13CEnvFxManagerFRC15CVectorFixed8_8RC9CVector3ff: @@ -1473,7 +1473,7 @@ lbl_80211230: /* 80211230 0020E190 2C 08 00 00 */ cmpwi r8, 0 /* 80211234 0020E194 40 80 FE AC */ bge lbl_802110E0 /* 80211238 0020E198 38 21 00 20 */ addi r1, r1, 0x20 -/* 8021123C 0020E19C 4E 80 00 20 */ blr +/* 8021123C 0020E19C 4E 80 00 20 */ blr .global "UpdateSnowParticles__13CEnvFxManagerFR34reserved_vector<15CVectorFixed8_8>" "UpdateSnowParticles__13CEnvFxManagerFR34reserved_vector<15CVectorFixed8_8>": @@ -1580,7 +1580,7 @@ lbl_802113B4: /* 802113B8 0020E318 40 80 FE A8 */ bge lbl_80211260 /* 802113BC 0020E31C BB 61 00 1C */ lmw r27, 0x1c(r1) /* 802113C0 0020E320 38 21 00 30 */ addi r1, r1, 0x30 -/* 802113C4 0020E324 4E 80 00 20 */ blr +/* 802113C4 0020E324 4E 80 00 20 */ blr .global UpdateBlockedGrids__13CEnvFxManagerFR13CStateManager10EEnvFxTypeRC12CTransform4fRC12CTransform4fRC12CTransform4f UpdateBlockedGrids__13CEnvFxManagerFR13CStateManager10EEnvFxTypeRC12CTransform4fRC12CTransform4fRC12CTransform4f: @@ -1832,7 +1832,7 @@ lbl_80211754: /* 80211784 0020E6E4 38 61 00 E4 */ addi r3, r1, 0xe4 /* 80211788 0020E6E8 81 8C 00 40 */ lwz r12, 0x40(r12) /* 8021178C 0020E6EC 7D 89 03 A6 */ mtctr r12 -/* 80211790 0020E6F0 4E 80 04 21 */ bctrl +/* 80211790 0020E6F0 4E 80 04 21 */ bctrl /* 80211794 0020E6F4 88 01 00 FC */ lbz r0, 0xfc(r1) /* 80211798 0020E6F8 28 00 00 00 */ cmplwi r0, 0 /* 8021179C 0020E6FC 98 01 01 30 */ stb r0, 0x130(r1) @@ -1909,7 +1909,7 @@ lbl_802117F8: /* 802118B0 0020E810 38 A1 02 38 */ addi r5, r1, 0x238 /* 802118B4 0020E814 81 8C 00 24 */ lwz r12, 0x24(r12) /* 802118B8 0020E818 7D 89 03 A6 */ mtctr r12 -/* 802118BC 0020E81C 4E 80 04 21 */ bctrl +/* 802118BC 0020E81C 4E 80 04 21 */ bctrl /* 802118C0 0020E820 88 A1 01 70 */ lbz r5, 0x170(r1) /* 802118C4 0020E824 C0 E1 01 50 */ lfs f7, 0x150(r1) /* 802118C8 0020E828 C0 C1 01 54 */ lfs f6, 0x154(r1) @@ -2063,7 +2063,7 @@ lbl_80211AC4: /* 80211AE8 0020EA48 80 01 0B 34 */ lwz r0, 0xb34(r1) /* 80211AEC 0020EA4C 7C 08 03 A6 */ mtlr r0 /* 80211AF0 0020EA50 38 21 0B 30 */ addi r1, r1, 0xb30 -/* 80211AF4 0020EA54 4E 80 00 20 */ blr +/* 80211AF4 0020EA54 4E 80 00 20 */ blr .global "CalculateSnowForces__13CEnvFxManagerFRC15CVectorFixed8_8R34reserved_vector<15CVectorFixed8_8>10EEnvFxTypeRC9CVector3ff" "CalculateSnowForces__13CEnvFxManagerFRC15CVectorFixed8_8R34reserved_vector<15CVectorFixed8_8>10EEnvFxTypeRC9CVector3ff": @@ -2223,7 +2223,7 @@ lbl_80211D3C: lbl_80211D48: /* 80211D48 0020ECA8 BB 61 00 4C */ lmw r27, 0x4c(r1) /* 80211D4C 0020ECAC 38 21 00 60 */ addi r1, r1, 0x60 -/* 80211D50 0020ECB0 4E 80 00 20 */ blr +/* 80211D50 0020ECB0 4E 80 00 20 */ blr .global CreateNewParticles__13CEnvFxManagerF10EEnvFxType CreateNewParticles__13CEnvFxManagerF10EEnvFxType: @@ -2406,7 +2406,7 @@ lbl_80211FB0: /* 80211FDC 0020EF3C 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 80211FE0 0020EF40 7C 08 03 A6 */ mtlr r0 /* 80211FE4 0020EF44 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 80211FE8 0020EF48 4E 80 00 20 */ blr +/* 80211FE8 0020EF48 4E 80 00 20 */ blr .global sub_80211fec sub_80211fec: @@ -2470,7 +2470,7 @@ lbl_802120A8: /* 802120B4 0020F014 83 A1 00 24 */ lwz r29, 0x24(r1) /* 802120B8 0020F018 7C 08 03 A6 */ mtlr r0 /* 802120BC 0020F01C 38 21 00 30 */ addi r1, r1, 0x30 -/* 802120C0 0020F020 4E 80 00 20 */ blr +/* 802120C0 0020F020 4E 80 00 20 */ blr .global Update__13CEnvFxManagerFfR13CStateManager Update__13CEnvFxManagerFfR13CStateManager: @@ -2816,7 +2816,7 @@ lbl_80212594: /* 802125B0 0020F510 83 A1 07 C4 */ lwz r29, 0x7c4(r1) /* 802125B4 0020F514 7C 08 03 A6 */ mtlr r0 /* 802125B8 0020F518 38 21 07 F0 */ addi r1, r1, 0x7f0 -/* 802125BC 0020F51C 4E 80 00 20 */ blr +/* 802125BC 0020F51C 4E 80 00 20 */ blr .global sub_802125c0 sub_802125c0: @@ -2894,7 +2894,7 @@ lbl_802126AC: /* 802126B4 0020F614 83 C1 00 18 */ lwz r30, 0x18(r1) /* 802126B8 0020F618 7C 08 03 A6 */ mtlr r0 /* 802126BC 0020F61C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802126C0 0020F620 4E 80 00 20 */ blr +/* 802126C0 0020F620 4E 80 00 20 */ blr .global sub_802126c4 sub_802126c4: @@ -2904,7 +2904,7 @@ sub_802126c4: /* 802126D0 0020F630 98 03 0B 6A */ stb r0, 0xb6a(r3) /* 802126D4 0020F634 90 03 0B 6C */ stw r0, 0xb6c(r3) /* 802126D8 0020F638 90 03 0B 70 */ stw r0, 0xb70(r3) -/* 802126DC 0020F63C 4E 80 00 20 */ blr +/* 802126DC 0020F63C 4E 80 00 20 */ blr .global Initialize__13CEnvFxManagerFv Initialize__13CEnvFxManagerFv: @@ -2921,7 +2921,7 @@ Initialize__13CEnvFxManagerFv: /* 80212708 0020F668 81 83 00 00 */ lwz r12, 0(r3) /* 8021270C 0020F66C 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80212710 0020F670 7D 89 03 A6 */ mtctr r12 -/* 80212714 0020F674 4E 80 04 21 */ bctrl +/* 80212714 0020F674 4E 80 04 21 */ bctrl /* 80212718 0020F678 80 CD A0 60 */ lwz r6, gpResourceFactory@sda21(r13) /* 8021271C 0020F67C 7C 64 1B 78 */ mr r4, r3 /* 80212720 0020F680 38 A0 00 00 */ li r5, 0 @@ -2960,7 +2960,7 @@ lbl_80212754: /* 8021279C 0020F6FC 38 80 00 01 */ li r4, 1 /* 802127A0 0020F700 81 8C 00 08 */ lwz r12, 8(r12) /* 802127A4 0020F704 7D 89 03 A6 */ mtctr r12 -/* 802127A8 0020F708 4E 80 04 21 */ bctrl +/* 802127A8 0020F708 4E 80 04 21 */ bctrl lbl_802127AC: /* 802127AC 0020F70C 80 01 00 24 */ lwz r0, 0x24(r1) /* 802127B0 0020F710 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -2969,7 +2969,7 @@ lbl_802127AC: /* 802127BC 0020F71C 83 81 00 10 */ lwz r28, 0x10(r1) /* 802127C0 0020F720 7C 08 03 A6 */ mtlr r0 /* 802127C4 0020F724 38 21 00 20 */ addi r1, r1, 0x20 -/* 802127C8 0020F728 4E 80 00 20 */ blr +/* 802127C8 0020F728 4E 80 00 20 */ blr .global AsyncLoadResources__13CEnvFXManagerFR13CStateManager AsyncLoadResources__13CEnvFXManagerFR13CStateManager: @@ -3089,7 +3089,7 @@ lbl_80212954: /* 80212974 0020F8D4 80 01 00 84 */ lwz r0, 0x84(r1) /* 80212978 0020F8D8 7C 08 03 A6 */ mtlr r0 /* 8021297C 0020F8DC 38 21 00 80 */ addi r1, r1, 0x80 -/* 80212980 0020F8E0 4E 80 00 20 */ blr +/* 80212980 0020F8E0 4E 80 00 20 */ blr .global MoveWrapCells__13CEnvFxManagerFii MoveWrapCells__13CEnvFxManagerFii: @@ -3200,7 +3200,7 @@ lbl_80212B04: /* 80212B08 0020FA68 80 01 00 64 */ lwz r0, 0x64(r1) /* 80212B0C 0020FA6C 7C 08 03 A6 */ mtlr r0 /* 80212B10 0020FA70 38 21 00 60 */ addi r1, r1, 0x60 -/* 80212B14 0020FA74 4E 80 00 20 */ blr +/* 80212B14 0020FA74 4E 80 00 20 */ blr .global GetParticleBoundsToWorldScale__13CEnvFxManagerCFv GetParticleBoundsToWorldScale__13CEnvFxManagerCFv: @@ -3220,7 +3220,7 @@ GetParticleBoundsToWorldScale__13CEnvFxManagerCFv: /* 80212B4C 0020FAAC EC 04 00 72 */ fmuls f0, f4, f1 /* 80212B50 0020FAB0 D0 43 00 04 */ stfs f2, 4(r3) /* 80212B54 0020FAB4 D0 03 00 08 */ stfs f0, 8(r3) -/* 80212B58 0020FAB8 4E 80 00 20 */ blr +/* 80212B58 0020FAB8 4E 80 00 20 */ blr .global Render__17CEnvFxManagerGridFRC12CTransform4fRC12CTransform4fRC12CTransform4ff10EEnvFxType Render__17CEnvFxManagerGridFRC12CTransform4fRC12CTransform4fRC12CTransform4ff10EEnvFxType: @@ -3273,7 +3273,7 @@ Render__17CEnvFxManagerGridFRC12CTransform4fRC12CTransform4fRC12CTransform4ff10E /* 80212C14 0020FB74 81 83 00 00 */ lwz r12, 0(r3) /* 80212C18 0020FB78 81 8C 00 30 */ lwz r12, 0x30(r12) /* 80212C1C 0020FB7C 7D 89 03 A6 */ mtctr r12 -/* 80212C20 0020FB80 4E 80 04 21 */ bctrl +/* 80212C20 0020FB80 4E 80 04 21 */ bctrl /* 80212C24 0020FB84 2C 1F 00 01 */ cmpwi r31, 1 /* 80212C28 0020FB88 41 82 00 0C */ beq lbl_80212C34 /* 80212C2C 0020FB8C 2C 1F 00 02 */ cmpwi r31, 2 @@ -3352,7 +3352,7 @@ lbl_80212D30: /* 80212D34 0020FC94 80 01 01 04 */ lwz r0, 0x104(r1) /* 80212D38 0020FC98 7C 08 03 A6 */ mtlr r0 /* 80212D3C 0020FC9C 38 21 01 00 */ addi r1, r1, 0x100 -/* 80212D40 0020FCA0 4E 80 00 20 */ blr +/* 80212D40 0020FCA0 4E 80 00 20 */ blr .global RenderUnderwaterParticles__17CEnvFxManagerGridFR12CTransform4f RenderUnderwaterParticles__17CEnvFxManagerGridFR12CTransform4f: @@ -3461,7 +3461,7 @@ lbl_80212ECC: /* 80212ED4 0020FE34 80 01 00 64 */ lwz r0, 0x64(r1) /* 80212ED8 0020FE38 7C 08 03 A6 */ mtlr r0 /* 80212EDC 0020FE3C 38 21 00 60 */ addi r1, r1, 0x60 -/* 80212EE0 0020FE40 4E 80 00 20 */ blr +/* 80212EE0 0020FE40 4E 80 00 20 */ blr .global RenderSnowParticles__17CEnvFxManagerGridFR12CTransform4f RenderSnowParticles__17CEnvFxManagerGridFR12CTransform4f: @@ -3570,7 +3570,7 @@ lbl_8021306C: /* 80213074 0020FFD4 80 01 00 64 */ lwz r0, 0x64(r1) /* 80213078 0020FFD8 7C 08 03 A6 */ mtlr r0 /* 8021307C 0020FFDC 38 21 00 60 */ addi r1, r1, 0x60 -/* 80213080 0020FFE0 4E 80 00 20 */ blr +/* 80213080 0020FFE0 4E 80 00 20 */ blr .global RenderRainParticles__17CEnvFxManagerGridFR12CTransform4f RenderRainParticles__17CEnvFxManagerGridFR12CTransform4f: @@ -3710,7 +3710,7 @@ lbl_80213274: /* 80213288 002101E8 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8021328C 002101EC 7C 08 03 A6 */ mtlr r0 /* 80213290 002101F0 38 21 00 30 */ addi r1, r1, 0x30 -/* 80213294 002101F4 4E 80 00 20 */ blr +/* 80213294 002101F4 4E 80 00 20 */ blr .global __ct__13CEnvFxManagerFv __ct__13CEnvFxManagerFv: @@ -3758,7 +3758,7 @@ __ct__13CEnvFxManagerFv: /* 8021333C 0021029C 81 84 00 00 */ lwz r12, 0(r4) /* 80213340 002102A0 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80213344 002102A4 7D 89 03 A6 */ mtctr r12 -/* 80213348 002102A8 4E 80 04 21 */ bctrl +/* 80213348 002102A8 4E 80 04 21 */ bctrl /* 8021334C 002102AC 3B 21 00 90 */ addi r25, r1, 0x90 /* 80213350 002102B0 38 81 00 54 */ addi r4, r1, 0x54 /* 80213354 002102B4 7F 23 CB 78 */ mr r3, r25 @@ -3795,7 +3795,7 @@ lbl_80213398: /* 802133CC 0021032C 81 84 00 00 */ lwz r12, 0(r4) /* 802133D0 00210330 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802133D4 00210334 7D 89 03 A6 */ mtctr r12 -/* 802133D8 00210338 4E 80 04 21 */ bctrl +/* 802133D8 00210338 4E 80 04 21 */ bctrl /* 802133DC 0021033C 3B 21 00 84 */ addi r25, r1, 0x84 /* 802133E0 00210340 38 81 00 4C */ addi r4, r1, 0x4c /* 802133E4 00210344 7F 23 CB 78 */ mr r3, r25 @@ -3836,7 +3836,7 @@ lbl_80213428: /* 8021346C 002103CC 81 84 00 00 */ lwz r12, 0(r4) /* 80213470 002103D0 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80213474 002103D4 7D 89 03 A6 */ mtctr r12 -/* 80213478 002103D8 4E 80 04 21 */ bctrl +/* 80213478 002103D8 4E 80 04 21 */ bctrl /* 8021347C 002103DC 3B 21 00 78 */ addi r25, r1, 0x78 /* 80213480 002103E0 38 81 00 44 */ addi r4, r1, 0x44 /* 80213484 002103E4 7F 23 CB 78 */ mr r3, r25 @@ -3873,7 +3873,7 @@ lbl_802134C8: /* 802134FC 0021045C 81 84 00 00 */ lwz r12, 0(r4) /* 80213500 00210460 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80213504 00210464 7D 89 03 A6 */ mtctr r12 -/* 80213508 00210468 4E 80 04 21 */ bctrl +/* 80213508 00210468 4E 80 04 21 */ bctrl /* 8021350C 0021046C 3B 21 00 6C */ addi r25, r1, 0x6c /* 80213510 00210470 38 81 00 3C */ addi r4, r1, 0x3c /* 80213514 00210474 7F 23 CB 78 */ mr r3, r25 @@ -4009,7 +4009,7 @@ lbl_802136CC: /* 802136F0 00210650 80 01 01 14 */ lwz r0, 0x114(r1) /* 802136F4 00210654 7C 08 03 A6 */ mtlr r0 /* 802136F8 00210658 38 21 01 10 */ addi r1, r1, 0x110 -/* 802136FC 0021065C 4E 80 00 20 */ blr +/* 802136FC 0021065C 4E 80 00 20 */ blr .global sub_80213700 sub_80213700: @@ -4030,7 +4030,7 @@ sub_80213700: /* 80213738 00210698 80 01 00 14 */ lwz r0, 0x14(r1) /* 8021373C 0021069C 7C 08 03 A6 */ mtlr r0 /* 80213740 002106A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80213744 002106A4 4E 80 00 20 */ blr +/* 80213744 002106A4 4E 80 00 20 */ blr .global sub_80213748 sub_80213748: @@ -4044,7 +4044,7 @@ lbl_80213760: /* 80213760 002106C0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80213764 002106C4 7C 08 03 A6 */ mtlr r0 /* 80213768 002106C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8021376C 002106CC 4E 80 00 20 */ blr +/* 8021376C 002106CC 4E 80 00 20 */ blr .global sub_80213770 sub_80213770: @@ -4124,7 +4124,7 @@ lbl_80213870: /* 8021387C 002107DC 83 C1 00 08 */ lwz r30, 8(r1) /* 80213880 002107E0 7C 08 03 A6 */ mtlr r0 /* 80213884 002107E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80213888 002107E8 4E 80 00 20 */ blr +/* 80213888 002107E8 4E 80 00 20 */ blr .global "__ct__17CEnvFxManagerGridFRC9CVector2iRC9CVector2iRCQ24rstl52vector<15CVectorFixed8_8,Q24rstl17rmemory_allocator>i" "__ct__17CEnvFxManagerGridFRC9CVector2iRC9CVector2iRCQ24rstl52vector<15CVectorFixed8_8,Q24rstl17rmemory_allocator>i": @@ -4212,7 +4212,7 @@ lbl_8021399C: /* 802139B8 00210918 83 A1 00 14 */ lwz r29, 0x14(r1) /* 802139BC 0021091C 7C 08 03 A6 */ mtlr r0 /* 802139C0 00210920 38 21 00 20 */ addi r1, r1, 0x20 -/* 802139C4 00210924 4E 80 00 20 */ blr +/* 802139C4 00210924 4E 80 00 20 */ blr .global sub_802139c8 sub_802139c8: diff --git a/asm/MetroidPrime/CErrorOutputWindow.s b/asm/MetroidPrime/CErrorOutputWindow.s index 62246ba0..a6c1a0c0 100644 --- a/asm/MetroidPrime/CErrorOutputWindow.s +++ b/asm/MetroidPrime/CErrorOutputWindow.s @@ -282,7 +282,7 @@ lbl_80269494: /* 80269494 002663F4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80269498 002663F8 7C 08 03 A6 */ mtlr r0 /* 8026949C 002663FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802694A0 00266400 4E 80 00 20 */ blr +/* 802694A0 00266400 4E 80 00 20 */ blr .global sub_802694a4 sub_802694a4: @@ -293,7 +293,7 @@ sub_802694a4: /* 802694B4 00266414 80 01 00 14 */ lwz r0, 0x14(r1) /* 802694B8 00266418 7C 08 03 A6 */ mtlr r0 /* 802694BC 0026641C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802694C0 00266420 4E 80 00 20 */ blr +/* 802694C0 00266420 4E 80 00 20 */ blr .global sub_802694c4 sub_802694c4: @@ -317,7 +317,7 @@ lbl_802694F8: /* 80269504 00266464 81 83 00 00 */ lwz r12, 0(r3) /* 80269508 00266468 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 8026950C 0026646C 7D 89 03 A6 */ mtctr r12 -/* 80269510 00266470 4E 80 04 21 */ bctrl +/* 80269510 00266470 4E 80 04 21 */ bctrl /* 80269514 00266474 3B BD 00 01 */ addi r29, r29, 1 /* 80269518 00266478 2C 1D 00 04 */ cmpwi r29, 4 /* 8026951C 0026647C 41 80 FF DC */ blt lbl_802694F8 @@ -379,7 +379,7 @@ lbl_802695DC: /* 802695E8 00266548 83 A1 00 14 */ lwz r29, 0x14(r1) /* 802695EC 0026654C 7C 08 03 A6 */ mtlr r0 /* 802695F0 00266550 38 21 00 20 */ addi r1, r1, 0x20 -/* 802695F4 00266554 4E 80 00 20 */ blr +/* 802695F4 00266554 4E 80 00 20 */ blr .global sub_802695f8 sub_802695f8: @@ -564,7 +564,7 @@ lbl_802698A4: /* 802698B8 00266818 83 A1 04 14 */ lwz r29, 0x414(r1) /* 802698BC 0026681C 7C 08 03 A6 */ mtlr r0 /* 802698C0 00266820 38 21 04 30 */ addi r1, r1, 0x430 -/* 802698C4 00266824 4E 80 00 20 */ blr +/* 802698C4 00266824 4E 80 00 20 */ blr .global Draw__18CErrorOutputWindowCFv Draw__18CErrorOutputWindowCFv: @@ -599,7 +599,7 @@ lbl_80269928: /* 80269928 00266888 80 01 00 14 */ lwz r0, 0x14(r1) /* 8026992C 0026688C 7C 08 03 A6 */ mtlr r0 /* 80269930 00266890 38 21 00 10 */ addi r1, r1, 0x10 -/* 80269934 00266894 4E 80 00 20 */ blr +/* 80269934 00266894 4E 80 00 20 */ blr .global UpdateWindow__18CErrorOutputWindowFv UpdateWindow__18CErrorOutputWindowFv: @@ -642,7 +642,7 @@ lbl_802699A8: /* 802699BC 0026691C 38 84 A3 DC */ addi r4, r4, lbl_803EA3DC@l /* 802699C0 00266920 7C 04 00 2E */ lwzx r0, r4, r0 /* 802699C4 00266924 7C 09 03 A6 */ mtctr r0 -/* 802699C8 00266928 4E 80 04 20 */ bctr +/* 802699C8 00266928 4E 80 04 20 */ bctr .global lbl_802699CC lbl_802699CC: /* 802699CC 0026692C 3C 80 80 3F */ lis r4, lbl_803EA410@ha @@ -741,7 +741,7 @@ lbl_80269AF4: /* 80269AF8 00266A58 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80269AFC 00266A5C 7C 08 03 A6 */ mtlr r0 /* 80269B00 00266A60 38 21 00 10 */ addi r1, r1, 0x10 -/* 80269B04 00266A64 4E 80 00 20 */ blr +/* 80269B04 00266A64 4E 80 00 20 */ blr .global OnMessage__18CErrorOutputWindowCFv OnMessage__18CErrorOutputWindowCFv: @@ -788,7 +788,7 @@ lbl_80269B8C: /* 80269B90 00266AF0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80269B94 00266AF4 7C 08 03 A6 */ mtlr r0 /* 80269B98 00266AF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80269B9C 00266AFC 4E 80 00 20 */ blr +/* 80269B9C 00266AFC 4E 80 00 20 */ blr .global GetIsContinueDraw__18CErrorOutputWindowCFv GetIsContinueDraw__18CErrorOutputWindowCFv: @@ -799,7 +799,7 @@ GetIsContinueDraw__18CErrorOutputWindowCFv: /* 80269BB0 00266B10 7C 00 20 38 */ and r0, r0, r4 /* 80269BB4 00266B14 7C 00 18 50 */ subf r0, r0, r3 /* 80269BB8 00266B18 54 03 0F FE */ srwi r3, r0, 0x1f -/* 80269BBC 00266B1C 4E 80 00 20 */ blr +/* 80269BBC 00266B1C 4E 80 00 20 */ blr .global __ct__18CErrorOutputWindowFiff __ct__18CErrorOutputWindowFiff: diff --git a/asm/MetroidPrime/CEulerAngles.s b/asm/MetroidPrime/CEulerAngles.s index 96631072..0c625931 100644 --- a/asm/MetroidPrime/CEulerAngles.s +++ b/asm/MetroidPrime/CEulerAngles.s @@ -153,7 +153,7 @@ lbl_8001B7C4: /* 8001B7F0 00018750 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8001B7F4 00018754 7C 08 03 A6 */ mtlr r0 /* 8001B7F8 00018758 38 21 00 60 */ addi r1, r1, 0x60 -/* 8001B7FC 0001875C 4E 80 00 20 */ blr +/* 8001B7FC 0001875C 4E 80 00 20 */ blr .global sub_8001b800 sub_8001b800: @@ -267,7 +267,7 @@ lbl_8001B978: /* 8001B994 000188F4 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 8001B998 000188F8 7C 08 03 A6 */ mtlr r0 /* 8001B99C 000188FC 38 21 00 70 */ addi r1, r1, 0x70 -/* 8001B9A0 00018900 4E 80 00 20 */ blr +/* 8001B9A0 00018900 4E 80 00 20 */ blr .global __sinit_CEulerAngles_cpp __sinit_CEulerAngles_cpp: @@ -276,7 +276,7 @@ __sinit_CEulerAngles_cpp: /* 8001B9AC 0001890C D4 03 A5 F4 */ stfsu f0, lbl_8056A5F4@l(r3) /* 8001B9B0 00018910 D0 03 00 04 */ stfs f0, 4(r3) /* 8001B9B4 00018914 D0 03 00 08 */ stfs f0, 8(r3) -/* 8001B9B8 00018918 4E 80 00 20 */ blr +/* 8001B9B8 00018918 4E 80 00 20 */ blr .global FromMatrix3f__12CEulerAnglesFRC9CMatrix3f FromMatrix3f__12CEulerAnglesFRC9CMatrix3f: @@ -289,4 +289,4 @@ FromMatrix3f__12CEulerAnglesFRC9CMatrix3f: /* 8001B9D4 00018934 80 01 00 14 */ lwz r0, 0x14(r1) /* 8001B9D8 00018938 7C 08 03 A6 */ mtlr r0 /* 8001B9DC 0001893C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8001B9E0 00018940 4E 80 00 20 */ blr +/* 8001B9E0 00018940 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/CExplosion.s b/asm/MetroidPrime/CExplosion.s index c12c2fd3..debca3fd 100644 --- a/asm/MetroidPrime/CExplosion.s +++ b/asm/MetroidPrime/CExplosion.s @@ -59,7 +59,7 @@ Render__10CExplosionCFRC13CStateManager: /* 8005A158 000570B8 81 83 00 00 */ lwz r12, 0(r3) /* 8005A15C 000570BC 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8005A160 000570C0 7D 89 03 A6 */ mtctr r12 -/* 8005A164 000570C4 4E 80 04 21 */ bctrl +/* 8005A164 000570C4 4E 80 04 21 */ bctrl /* 8005A168 000570C8 38 60 00 00 */ li r3, 0 /* 8005A16C 000570CC 48 2E B6 7D */ bl SetRenderModelBlack__10CCubeModelFb /* 8005A170 000570D0 38 00 00 00 */ li r0, 0 @@ -81,7 +81,7 @@ lbl_8005A17C: /* 8005A1AC 0005710C 81 83 00 00 */ lwz r12, 0(r3) /* 8005A1B0 00057110 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8005A1B4 00057114 7D 89 03 A6 */ mtctr r12 -/* 8005A1B8 00057118 4E 80 04 21 */ bctrl +/* 8005A1B8 00057118 4E 80 04 21 */ bctrl /* 8005A1BC 0005711C 80 1E 00 04 */ lwz r0, 4(r30) /* 8005A1C0 00057120 7F E3 FB 78 */ mr r3, r31 /* 8005A1C4 00057124 38 81 00 0C */ addi r4, r1, 0xc @@ -96,7 +96,7 @@ lbl_8005A1DC: /* 8005A1E4 00057144 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8005A1E8 00057148 7C 08 03 A6 */ mtlr r0 /* 8005A1EC 0005714C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8005A1F0 00057150 4E 80 00 20 */ blr +/* 8005A1F0 00057150 4E 80 00 20 */ blr .global CalculateRenderBounds__10CExplosionFv CalculateRenderBounds__10CExplosionFv: @@ -110,7 +110,7 @@ CalculateRenderBounds__10CExplosionFv: /* 8005A210 00057170 81 84 00 00 */ lwz r12, 0(r4) /* 8005A214 00057174 81 8C 00 5C */ lwz r12, 0x5c(r12) /* 8005A218 00057178 7D 89 03 A6 */ mtctr r12 -/* 8005A21C 0005717C 4E 80 04 21 */ bctrl +/* 8005A21C 0005717C 4E 80 04 21 */ bctrl /* 8005A220 00057180 88 01 00 44 */ lbz r0, 0x44(r1) /* 8005A224 00057184 28 00 00 00 */ cmplwi r0, 0 /* 8005A228 00057188 98 01 00 60 */ stb r0, 0x60(r1) @@ -185,7 +185,7 @@ lbl_8005A324: /* 8005A330 00057290 80 01 00 74 */ lwz r0, 0x74(r1) /* 8005A334 00057294 7C 08 03 A6 */ mtlr r0 /* 8005A338 00057298 38 21 00 70 */ addi r1, r1, 0x70 -/* 8005A33C 0005729C 4E 80 00 20 */ blr +/* 8005A33C 0005729C 4E 80 00 20 */ blr .global AcceptScriptMsg__10CExplosionF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__10CExplosionF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -208,7 +208,7 @@ lbl_8005A378: /* 8005A37C 000572DC 81 83 00 00 */ lwz r12, 0(r3) /* 8005A380 000572E0 81 8C 00 64 */ lwz r12, 0x64(r12) /* 8005A384 000572E4 7D 89 03 A6 */ mtctr r12 -/* 8005A388 000572E8 4E 80 04 21 */ bctrl +/* 8005A388 000572E8 4E 80 04 21 */ bctrl /* 8005A38C 000572EC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8005A390 000572F0 41 82 01 44 */ beq lbl_8005A4D4 /* 8005A394 000572F4 7F E4 FB 78 */ mr r4, r31 @@ -253,7 +253,7 @@ lbl_8005A378: /* 8005A430 00057390 81 84 00 00 */ lwz r12, 0(r4) /* 8005A434 00057394 81 8C 00 68 */ lwz r12, 0x68(r12) /* 8005A438 00057398 7D 89 03 A6 */ mtctr r12 -/* 8005A43C 0005739C 4E 80 04 21 */ bctrl +/* 8005A43C 0005739C 4E 80 04 21 */ bctrl /* 8005A440 000573A0 93 01 00 08 */ stw r24, 8(r1) /* 8005A444 000573A4 38 00 00 01 */ li r0, 1 /* 8005A448 000573A8 C0 22 86 A8 */ lfs f1, lbl_805AA3C8@sda21(r2) @@ -320,7 +320,7 @@ lbl_8005A524: /* 8005A528 00057488 80 01 00 D4 */ lwz r0, 0xd4(r1) /* 8005A52C 0005748C 7C 08 03 A6 */ mtlr r0 /* 8005A530 00057490 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 8005A534 00057494 4E 80 00 20 */ blr +/* 8005A534 00057494 4E 80 00 20 */ blr .global Accept__10CExplosionFR8IVisitor Accept__10CExplosionFR8IVisitor: @@ -333,11 +333,11 @@ Accept__10CExplosionFR8IVisitor: /* 8005A550 000574B0 7C 04 03 78 */ mr r4, r0 /* 8005A554 000574B4 81 8C 00 28 */ lwz r12, 0x28(r12) /* 8005A558 000574B8 7D 89 03 A6 */ mtctr r12 -/* 8005A55C 000574BC 4E 80 04 21 */ bctrl +/* 8005A55C 000574BC 4E 80 04 21 */ bctrl /* 8005A560 000574C0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8005A564 000574C4 7C 08 03 A6 */ mtlr r0 /* 8005A568 000574C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8005A56C 000574CC 4E 80 00 20 */ blr +/* 8005A56C 000574CC 4E 80 00 20 */ blr .global Think__10CExplosionFfR13CStateManager Think__10CExplosionFfR13CStateManager: @@ -366,7 +366,7 @@ Think__10CExplosionFfR13CStateManager: /* 8005A5C8 00057528 81 83 00 00 */ lwz r12, 0(r3) /* 8005A5CC 0005752C 81 8C 00 20 */ lwz r12, 0x20(r12) /* 8005A5D0 00057530 7D 89 03 A6 */ mtctr r12 -/* 8005A5D4 00057534 4E 80 04 21 */ bctrl +/* 8005A5D4 00057534 4E 80 04 21 */ bctrl /* 8005A5D8 00057538 83 FD 00 E8 */ lwz r31, 0xe8(r29) /* 8005A5DC 0005753C 38 61 00 30 */ addi r3, r1, 0x30 /* 8005A5E0 00057540 38 9D 00 34 */ addi r4, r29, 0x34 @@ -376,7 +376,7 @@ Think__10CExplosionFfR13CStateManager: /* 8005A5F0 00057550 81 9F 00 00 */ lwz r12, 0(r31) /* 8005A5F4 00057554 81 8C 00 14 */ lwz r12, 0x14(r12) /* 8005A5F8 00057558 7D 89 03 A6 */ mtctr r12 -/* 8005A5FC 0005755C 4E 80 04 21 */ bctrl +/* 8005A5FC 0005755C 4E 80 04 21 */ bctrl /* 8005A600 00057560 88 1D 00 E4 */ lbz r0, 0xe4(r29) /* 8005A604 00057564 38 60 00 00 */ li r3, 0 /* 8005A608 00057568 50 60 1F 38 */ rlwimi r0, r3, 3, 0x1c, 0x1c @@ -387,7 +387,7 @@ lbl_8005A610: /* 8005A618 00057578 81 83 00 00 */ lwz r12, 0(r3) /* 8005A61C 0005757C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8005A620 00057580 7D 89 03 A6 */ mtctr r12 -/* 8005A624 00057584 4E 80 04 21 */ bctrl +/* 8005A624 00057584 4E 80 04 21 */ bctrl /* 8005A628 00057588 A0 7D 00 EC */ lhz r3, 0xec(r29) /* 8005A62C 0005758C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8005A630 00057590 7C 03 00 40 */ cmplw r3, r0 @@ -411,7 +411,7 @@ lbl_8005A610: /* 8005A678 000575D8 81 84 00 00 */ lwz r12, 0(r4) /* 8005A67C 000575DC 81 8C 00 68 */ lwz r12, 0x68(r12) /* 8005A680 000575E0 7D 89 03 A6 */ mtctr r12 -/* 8005A684 000575E4 4E 80 04 21 */ bctrl +/* 8005A684 000575E4 4E 80 04 21 */ bctrl /* 8005A688 000575E8 7F E3 FB 78 */ mr r3, r31 /* 8005A68C 000575EC 38 81 00 60 */ addi r4, r1, 0x60 /* 8005A690 000575F0 48 05 B0 B5 */ bl SetLight__10CGameLightFRC6CLight @@ -435,7 +435,7 @@ lbl_8005A6CC: /* 8005A6D0 00057630 81 83 00 00 */ lwz r12, 0(r3) /* 8005A6D4 00057634 81 8C 00 58 */ lwz r12, 0x58(r12) /* 8005A6D8 00057638 7D 89 03 A6 */ mtctr r12 -/* 8005A6DC 0005763C 4E 80 04 21 */ bctrl +/* 8005A6DC 0005763C 4E 80 04 21 */ bctrl /* 8005A6E0 00057640 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8005A6E4 00057644 41 82 00 1C */ beq lbl_8005A700 /* 8005A6E8 00057648 A0 1D 00 08 */ lhz r0, 8(r29) @@ -453,7 +453,7 @@ lbl_8005A700: /* 8005A714 00057674 83 A1 00 B4 */ lwz r29, 0xb4(r1) /* 8005A718 00057678 7C 08 03 A6 */ mtlr r0 /* 8005A71C 0005767C 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 8005A720 00057680 4E 80 00 20 */ blr +/* 8005A720 00057680 4E 80 00 20 */ blr .global PreRender__10CExplosionFR13CStateManagerRC14CFrustumPlanes PreRender__10CExplosionFR13CStateManagerRC14CFrustumPlanes: @@ -487,7 +487,7 @@ lbl_8005A770: /* 8005A788 000576E8 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8005A78C 000576EC 7C 08 03 A6 */ mtlr r0 /* 8005A790 000576F0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8005A794 000576F4 4E 80 00 20 */ blr +/* 8005A794 000576F4 4E 80 00 20 */ blr .global AddToRenderer__10CExplosionCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__10CExplosionCFRC14CFrustumPlanesRC13CStateManager: @@ -528,14 +528,14 @@ lbl_8005A80C: /* 8005A814 00057774 81 83 00 00 */ lwz r12, 0(r3) /* 8005A818 00057778 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8005A81C 0005777C 7D 89 03 A6 */ mtctr r12 -/* 8005A820 00057780 4E 80 04 21 */ bctrl +/* 8005A820 00057780 4E 80 04 21 */ bctrl lbl_8005A824: /* 8005A824 00057784 80 01 00 14 */ lwz r0, 0x14(r1) /* 8005A828 00057788 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8005A82C 0005778C 83 C1 00 08 */ lwz r30, 8(r1) /* 8005A830 00057790 7C 08 03 A6 */ mtlr r0 /* 8005A834 00057794 38 21 00 10 */ addi r1, r1, 0x10 -/* 8005A838 00057798 4E 80 00 20 */ blr +/* 8005A838 00057798 4E 80 00 20 */ blr .global __dt__10CExplosionFv __dt__10CExplosionFv: @@ -559,7 +559,7 @@ __dt__10CExplosionFv: /* 8005A880 000577E0 38 80 00 01 */ li r4, 1 /* 8005A884 000577E4 81 8C 00 08 */ lwz r12, 8(r12) /* 8005A888 000577E8 7D 89 03 A6 */ mtctr r12 -/* 8005A88C 000577EC 4E 80 04 21 */ bctrl +/* 8005A88C 000577EC 4E 80 04 21 */ bctrl lbl_8005A890: /* 8005A890 000577F0 28 1E 00 00 */ cmplwi r30, 0 /* 8005A894 000577F4 41 82 00 1C */ beq lbl_8005A8B0 @@ -581,7 +581,7 @@ lbl_8005A8C0: /* 8005A8CC 0005782C 83 C1 00 08 */ lwz r30, 8(r1) /* 8005A8D0 00057830 7C 08 03 A6 */ mtlr r0 /* 8005A8D4 00057834 38 21 00 10 */ addi r1, r1, 0x10 -/* 8005A8D8 00057838 4E 80 00 20 */ blr +/* 8005A8D8 00057838 4E 80 00 20 */ blr .global "__ct__10CExplosionFRC31TLockedToken<20CElectricDescription>9TUniqueIdbRC11CEntityInfoRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC12CTransform4fUiRC9CVector3fRC6CColor" "__ct__10CExplosionFRC31TLockedToken<20CElectricDescription>9TUniqueIdbRC11CEntityInfoRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC12CTransform4fUiRC9CVector3fRC6CColor": @@ -670,7 +670,7 @@ lbl_8005A9E8: /* 8005AA18 00057978 81 83 00 00 */ lwz r12, 0(r3) /* 8005AA1C 0005797C 81 8C 00 20 */ lwz r12, 0x20(r12) /* 8005AA20 00057980 7D 89 03 A6 */ mtctr r12 -/* 8005AA24 00057984 4E 80 04 21 */ bctrl +/* 8005AA24 00057984 4E 80 04 21 */ bctrl /* 8005AA28 00057988 83 3A 00 E8 */ lwz r25, 0xe8(r26) /* 8005AA2C 0005798C 7F 84 E3 78 */ mr r4, r28 /* 8005AA30 00057990 38 61 00 28 */ addi r3, r1, 0x28 @@ -680,25 +680,25 @@ lbl_8005A9E8: /* 8005AA40 000579A0 81 99 00 00 */ lwz r12, 0(r25) /* 8005AA44 000579A4 81 8C 00 14 */ lwz r12, 0x14(r12) /* 8005AA48 000579A8 7D 89 03 A6 */ mtctr r12 -/* 8005AA4C 000579AC 4E 80 04 21 */ bctrl +/* 8005AA4C 000579AC 4E 80 04 21 */ bctrl /* 8005AA50 000579B0 80 7A 00 E8 */ lwz r3, 0xe8(r26) /* 8005AA54 000579B4 7F C4 F3 78 */ mr r4, r30 /* 8005AA58 000579B8 81 83 00 00 */ lwz r12, 0(r3) /* 8005AA5C 000579BC 81 8C 00 24 */ lwz r12, 0x24(r12) /* 8005AA60 000579C0 7D 89 03 A6 */ mtctr r12 -/* 8005AA64 000579C4 4E 80 04 21 */ bctrl +/* 8005AA64 000579C4 4E 80 04 21 */ bctrl /* 8005AA68 000579C8 80 7A 00 E8 */ lwz r3, 0xe8(r26) /* 8005AA6C 000579CC 7F E4 FB 78 */ mr r4, r31 /* 8005AA70 000579D0 81 83 00 00 */ lwz r12, 0(r3) /* 8005AA74 000579D4 81 8C 00 30 */ lwz r12, 0x30(r12) /* 8005AA78 000579D8 7D 89 03 A6 */ mtctr r12 -/* 8005AA7C 000579DC 4E 80 04 21 */ bctrl +/* 8005AA7C 000579DC 4E 80 04 21 */ bctrl /* 8005AA80 000579E0 7F 43 D3 78 */ mr r3, r26 /* 8005AA84 000579E4 BB 01 00 60 */ lmw r24, 0x60(r1) /* 8005AA88 000579E8 80 01 00 84 */ lwz r0, 0x84(r1) /* 8005AA8C 000579EC 7C 08 03 A6 */ mtlr r0 /* 8005AA90 000579F0 38 21 00 80 */ addi r1, r1, 0x80 -/* 8005AA94 000579F4 4E 80 00 20 */ blr +/* 8005AA94 000579F4 4E 80 00 20 */ blr .global __dt__7CEffectFv __dt__7CEffectFv: @@ -726,7 +726,7 @@ lbl_8005AADC: /* 8005AAE8 00057A48 83 C1 00 08 */ lwz r30, 8(r1) /* 8005AAEC 00057A4C 7C 08 03 A6 */ mtlr r0 /* 8005AAF0 00057A50 38 21 00 10 */ addi r1, r1, 0x10 -/* 8005AAF4 00057A54 4E 80 00 20 */ blr +/* 8005AAF4 00057A54 4E 80 00 20 */ blr .global "__ct__10CExplosionFRC31TLockedToken<15CGenDescription>9TUniqueIdbRC11CEntityInfoRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC12CTransform4fUiRC9CVector3fRC6CColor" "__ct__10CExplosionFRC31TLockedToken<15CGenDescription>9TUniqueIdbRC11CEntityInfoRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC12CTransform4fUiRC9CVector3fRC6CColor": @@ -823,7 +823,7 @@ lbl_8005AC20: /* 8005AC50 00057BB0 81 83 00 00 */ lwz r12, 0(r3) /* 8005AC54 00057BB4 81 8C 00 20 */ lwz r12, 0x20(r12) /* 8005AC58 00057BB8 7D 89 03 A6 */ mtctr r12 -/* 8005AC5C 00057BBC 4E 80 04 21 */ bctrl +/* 8005AC5C 00057BBC 4E 80 04 21 */ bctrl /* 8005AC60 00057BC0 83 3A 00 E8 */ lwz r25, 0xe8(r26) /* 8005AC64 00057BC4 7F 84 E3 78 */ mr r4, r28 /* 8005AC68 00057BC8 38 61 00 28 */ addi r3, r1, 0x28 @@ -833,22 +833,22 @@ lbl_8005AC20: /* 8005AC78 00057BD8 81 99 00 00 */ lwz r12, 0(r25) /* 8005AC7C 00057BDC 81 8C 00 14 */ lwz r12, 0x14(r12) /* 8005AC80 00057BE0 7D 89 03 A6 */ mtctr r12 -/* 8005AC84 00057BE4 4E 80 04 21 */ bctrl +/* 8005AC84 00057BE4 4E 80 04 21 */ bctrl /* 8005AC88 00057BE8 80 7A 00 E8 */ lwz r3, 0xe8(r26) /* 8005AC8C 00057BEC 7F C4 F3 78 */ mr r4, r30 /* 8005AC90 00057BF0 81 83 00 00 */ lwz r12, 0(r3) /* 8005AC94 00057BF4 81 8C 00 24 */ lwz r12, 0x24(r12) /* 8005AC98 00057BF8 7D 89 03 A6 */ mtctr r12 -/* 8005AC9C 00057BFC 4E 80 04 21 */ bctrl +/* 8005AC9C 00057BFC 4E 80 04 21 */ bctrl /* 8005ACA0 00057C00 80 7A 00 E8 */ lwz r3, 0xe8(r26) /* 8005ACA4 00057C04 7F E4 FB 78 */ mr r4, r31 /* 8005ACA8 00057C08 81 83 00 00 */ lwz r12, 0(r3) /* 8005ACAC 00057C0C 81 8C 00 30 */ lwz r12, 0x30(r12) /* 8005ACB0 00057C10 7D 89 03 A6 */ mtctr r12 -/* 8005ACB4 00057C14 4E 80 04 21 */ bctrl +/* 8005ACB4 00057C14 4E 80 04 21 */ bctrl /* 8005ACB8 00057C18 7F 43 D3 78 */ mr r3, r26 /* 8005ACBC 00057C1C BB 01 00 60 */ lmw r24, 0x60(r1) /* 8005ACC0 00057C20 80 01 00 84 */ lwz r0, 0x84(r1) /* 8005ACC4 00057C24 7C 08 03 A6 */ mtlr r0 /* 8005ACC8 00057C28 38 21 00 80 */ addi r1, r1, 0x80 -/* 8005ACCC 00057C2C 4E 80 00 20 */ blr +/* 8005ACCC 00057C2C 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/CFlameWarp.s b/asm/MetroidPrime/CFlameWarp.s index 0593771e..76b0c5b7 100644 --- a/asm/MetroidPrime/CFlameWarp.s +++ b/asm/MetroidPrime/CFlameWarp.s @@ -32,13 +32,13 @@ lbl_805A7C94: Get4CharID__10CFlameWarpFv: /* 801B4F5C 001B1EBC 3C 60 46 57 */ lis r3, 0x46575250@ha /* 801B4F60 001B1EC0 38 63 52 50 */ addi r3, r3, 0x46575250@l -/* 801B4F64 001B1EC4 4E 80 00 20 */ blr +/* 801B4F64 001B1EC4 4E 80 00 20 */ blr .global IsActivated__10CFlameWarpFv IsActivated__10CFlameWarpFv: /* 801B4F68 001B1EC8 88 03 00 A0 */ lbz r0, 0xa0(r3) /* 801B4F6C 001B1ECC 54 03 CF FE */ rlwinm r3, r0, 0x19, 0x1f, 0x1f -/* 801B4F70 001B1ED0 4E 80 00 20 */ blr +/* 801B4F70 001B1ED0 4E 80 00 20 */ blr .global sub_801b4f74 sub_801b4f74: @@ -63,7 +63,7 @@ lbl_801B4F9C: /* 801B4FB4 001B1F14 38 80 00 00 */ li r4, 0 /* 801B4FB8 001B1F18 50 80 2E B4 */ rlwimi r0, r4, 5, 0x1a, 0x1a /* 801B4FBC 001B1F1C 98 03 00 A0 */ stb r0, 0xa0(r3) -/* 801B4FC0 001B1F20 4E 80 00 20 */ blr +/* 801B4FC0 001B1F20 4E 80 00 20 */ blr .global ModifyParticles__10CFlameWarpFiiPiP9CVector3fP9CVector3fP9CVector3fP6CColorPfPf ModifyParticles__10CFlameWarpFiiPiP9CVector3fP9CVector3fP9CVector3fP6CColorPfPf: @@ -503,13 +503,13 @@ lbl_801B5618: /* 801B564C 001B25AC 80 01 01 B4 */ lwz r0, 0x1b4(r1) /* 801B5650 001B25B0 7C 08 03 A6 */ mtlr r0 /* 801B5654 001B25B4 38 21 01 B0 */ addi r1, r1, 0x1b0 -/* 801B5658 001B25B8 4E 80 00 20 */ blr +/* 801B5658 001B25B8 4E 80 00 20 */ blr .global UpdateWarp__10CFlameWarpFv UpdateWarp__10CFlameWarpFv: /* 801B565C 001B25BC 88 03 00 A0 */ lbz r0, 0xa0(r3) /* 801B5660 001B25C0 54 03 CF FE */ rlwinm r3, r0, 0x19, 0x1f, 0x1f -/* 801B5664 001B25C4 4E 80 00 20 */ blr +/* 801B5664 001B25C4 4E 80 00 20 */ blr .global __dt__10CFlameWarpFv __dt__10CFlameWarpFv: @@ -566,7 +566,7 @@ lbl_801B570C: /* 801B5718 001B2678 83 C1 00 08 */ lwz r30, 8(r1) /* 801B571C 001B267C 7C 08 03 A6 */ mtlr r0 /* 801B5720 001B2680 38 21 00 10 */ addi r1, r1, 0x10 -/* 801B5724 001B2684 4E 80 00 20 */ blr +/* 801B5724 001B2684 4E 80 00 20 */ blr .global __ct__10CFlameWarpFfRC9CVector3fb __ct__10CFlameWarpFfRC9CVector3fb: @@ -644,7 +644,7 @@ lbl_801B57B8: /* 801B5834 001B2794 88 03 00 A0 */ lbz r0, 0xa0(r3) /* 801B5838 001B2798 50 C0 2E B4 */ rlwimi r0, r6, 5, 0x1a, 0x1a /* 801B583C 001B279C 98 03 00 A0 */ stb r0, 0xa0(r3) -/* 801B5840 001B27A0 4E 80 00 20 */ blr +/* 801B5840 001B27A0 4E 80 00 20 */ blr .global sub_801b5844 sub_801b5844: @@ -752,7 +752,7 @@ lbl_801B59B0: /* 801B59BC 001B291C 83 A1 00 34 */ lwz r29, 0x34(r1) /* 801B59C0 001B2920 7C 08 03 A6 */ mtlr r0 /* 801B59C4 001B2924 38 21 00 40 */ addi r1, r1, 0x40 -/* 801B59C8 001B2928 4E 80 00 20 */ blr +/* 801B59C8 001B2928 4E 80 00 20 */ blr .global sub_801b59cc sub_801b59cc: @@ -825,7 +825,7 @@ lbl_801B5AA4: /* 801B5AB0 001B2A10 83 A1 00 24 */ lwz r29, 0x24(r1) /* 801B5AB4 001B2A14 7C 08 03 A6 */ mtlr r0 /* 801B5AB8 001B2A18 38 21 00 30 */ addi r1, r1, 0x30 -/* 801B5ABC 001B2A1C 4E 80 00 20 */ blr +/* 801B5ABC 001B2A1C 4E 80 00 20 */ blr .global sub_801b5ac0 sub_801b5ac0: @@ -843,7 +843,7 @@ lbl_801B5AE8: /* 801B5AE8 001B2A48 C0 05 00 00 */ lfs f0, 0(r5) /* 801B5AEC 001B2A4C C0 24 00 00 */ lfs f1, 0(r4) /* 801B5AF0 001B2A50 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 801B5AF4 001B2A54 4C 80 00 20 */ bgelr +/* 801B5AF4 001B2A54 4C 80 00 20 */ bgelr /* 801B5AF8 001B2A58 88 C5 00 04 */ lbz r6, 4(r5) /* 801B5AFC 001B2A5C D0 25 00 00 */ stfs f1, 0(r5) /* 801B5B00 001B2A60 88 04 00 04 */ lbz r0, 4(r4) @@ -856,11 +856,11 @@ lbl_801B5AE8: /* 801B5B1C 001B2A7C 98 04 00 04 */ stb r0, 4(r4) /* 801B5B20 001B2A80 D0 03 00 00 */ stfs f0, 0(r3) /* 801B5B24 001B2A84 98 C3 00 04 */ stb r6, 4(r3) -/* 801B5B28 001B2A88 4E 80 00 20 */ blr +/* 801B5B28 001B2A88 4E 80 00 20 */ blr lbl_801B5B2C: /* 801B5B2C 001B2A8C D0 04 00 00 */ stfs f0, 0(r4) /* 801B5B30 001B2A90 98 C4 00 04 */ stb r6, 4(r4) -/* 801B5B34 001B2A94 4E 80 00 20 */ blr +/* 801B5B34 001B2A94 4E 80 00 20 */ blr .global sub_801b5b38 sub_801b5b38: @@ -895,4 +895,4 @@ lbl_801B5B94: /* 801B5B94 001B2AF4 80 04 00 00 */ lwz r0, 0(r4) /* 801B5B98 001B2AF8 7C 05 00 40 */ cmplw r5, r0 /* 801B5B9C 001B2AFC 41 80 FF A8 */ blt lbl_801B5B44 -/* 801B5BA0 001B2B00 4E 80 00 20 */ blr +/* 801B5BA0 001B2B00 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/CFluidPlane.s b/asm/MetroidPrime/CFluidPlane.s index b4a4e348..7df323d1 100644 --- a/asm/MetroidPrime/CFluidPlane.s +++ b/asm/MetroidPrime/CFluidPlane.s @@ -37,7 +37,7 @@ lbl_805A76D0: .global nullsub_209 nullsub_209: -/* 8012E90C 0012B86C 4E 80 00 20 */ blr +/* 8012E90C 0012B86C 4E 80 00 20 */ blr .global AddRipple__11CFluidPlaneFRC7CRippleRC12CScriptWaterR13CStateManager AddRipple__11CFluidPlaneFRC7CRippleRC12CScriptWaterR13CStateManager: @@ -62,7 +62,7 @@ lbl_8012E94C: /* 8012E954 0012B8B4 83 C1 00 08 */ lwz r30, 8(r1) /* 8012E958 0012B8B8 7C 08 03 A6 */ mtlr r0 /* 8012E95C 0012B8BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8012E960 0012B8C0 4E 80 00 20 */ blr +/* 8012E960 0012B8C0 4E 80 00 20 */ blr .global AddRipple__11CFluidPlaneFf9TUniqueIdRC9CVector3fRC9CVector3fRC12CScriptWaterR13CStateManagerRC9CVector3f AddRipple__11CFluidPlaneFf9TUniqueIdRC9CVector3fRC9CVector3fRC12CScriptWaterR13CStateManagerRC9CVector3f: @@ -115,7 +115,7 @@ lbl_8012EA0C: /* 8012EA18 0012B978 80 01 00 84 */ lwz r0, 0x84(r1) /* 8012EA1C 0012B97C 7C 08 03 A6 */ mtlr r0 /* 8012EA20 0012B980 38 21 00 80 */ addi r1, r1, 0x80 -/* 8012EA24 0012B984 4E 80 00 20 */ blr +/* 8012EA24 0012B984 4E 80 00 20 */ blr .global AddRipple__11CFluidPlaneFf9TUniqueIdRC9CVector3fR13CStateManager AddRipple__11CFluidPlaneFf9TUniqueIdRC9CVector3fR13CStateManager: @@ -159,7 +159,7 @@ lbl_8012EAA4: /* 8012EAB8 0012BA18 83 81 00 58 */ lwz r28, 0x58(r1) /* 8012EABC 0012BA1C 7C 08 03 A6 */ mtlr r0 /* 8012EAC0 0012BA20 38 21 00 70 */ addi r1, r1, 0x70 -/* 8012EAC4 0012BA24 4E 80 00 20 */ blr +/* 8012EAC4 0012BA24 4E 80 00 20 */ blr .global ProjectRippleVelocity__11CFluidPlaneCFff ProjectRippleVelocity__11CFluidPlaneCFff: @@ -181,11 +181,11 @@ lbl_8012EAF4: /* 8012EAFC 0012BA5C 4C 41 13 82 */ cror 2, 1, 2 /* 8012EB00 0012BA60 40 82 00 0C */ bne lbl_8012EB0C /* 8012EB04 0012BA64 C0 22 98 D4 */ lfs f1, lbl_805AB5F4@sda21(r2) -/* 8012EB08 0012BA68 4E 80 00 20 */ blr +/* 8012EB08 0012BA68 4E 80 00 20 */ blr lbl_8012EB0C: /* 8012EB0C 0012BA6C C0 02 98 D8 */ lfs f0, lbl_805AB5F8@sda21(r2) /* 8012EB10 0012BA70 EC 20 00 F2 */ fmuls f1, f0, f3 -/* 8012EB14 0012BA74 4E 80 00 20 */ blr +/* 8012EB14 0012BA74 4E 80 00 20 */ blr .global CalculateRippleIntensity__11CFluidPlaneCFf CalculateRippleIntensity__11CFluidPlaneCFf: @@ -247,7 +247,7 @@ lbl_8012EBCC: /* 8012EBCC 0012BB2C C0 23 00 00 */ lfs f1, 0(r3) /* 8012EBD0 0012BB30 D0 21 00 08 */ stfs f1, 8(r1) /* 8012EBD4 0012BB34 38 21 00 10 */ addi r1, r1, 0x10 -/* 8012EBD8 0012BB38 4E 80 00 20 */ blr +/* 8012EBD8 0012BB38 4E 80 00 20 */ blr .global __dt__11CFluidPlaneFv __dt__11CFluidPlaneFv: @@ -348,7 +348,7 @@ lbl_8012ED18: /* 8012ED24 0012BC84 83 C1 00 08 */ lwz r30, 8(r1) /* 8012ED28 0012BC88 7C 08 03 A6 */ mtlr r0 /* 8012ED2C 0012BC8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8012ED30 0012BC90 4E 80 00 20 */ blr +/* 8012ED30 0012BC90 4E 80 00 20 */ blr .global __ct__11CFluidPlaneFUiUiUifQ211CFluidPlane10EFluidTypefRC14CFluidUVMotion __ct__11CFluidPlaneFUiUiUifQ211CFluidPlane10EFluidTypefRC14CFluidUVMotion: @@ -421,7 +421,7 @@ lbl_8012EDE4: /* 8012EE30 0012BD90 81 84 00 00 */ lwz r12, 0(r4) /* 8012EE34 0012BD94 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8012EE38 0012BD98 7D 89 03 A6 */ mtctr r12 -/* 8012EE3C 0012BD9C 4E 80 04 21 */ bctrl +/* 8012EE3C 0012BD9C 4E 80 04 21 */ bctrl /* 8012EE40 0012BDA0 3B C1 00 50 */ addi r30, r1, 0x50 /* 8012EE44 0012BDA4 38 81 00 28 */ addi r4, r1, 0x28 /* 8012EE48 0012BDA8 7F C3 F3 78 */ mr r3, r30 @@ -479,7 +479,7 @@ lbl_8012EECC: /* 8012EF08 0012BE68 81 84 00 00 */ lwz r12, 0(r4) /* 8012EF0C 0012BE6C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8012EF10 0012BE70 7D 89 03 A6 */ mtctr r12 -/* 8012EF14 0012BE74 4E 80 04 21 */ bctrl +/* 8012EF14 0012BE74 4E 80 04 21 */ bctrl /* 8012EF18 0012BE78 3B C1 00 44 */ addi r30, r1, 0x44 /* 8012EF1C 0012BE7C 38 81 00 18 */ addi r4, r1, 0x18 /* 8012EF20 0012BE80 7F C3 F3 78 */ mr r3, r30 @@ -537,7 +537,7 @@ lbl_8012EFA4: /* 8012EFE0 0012BF40 81 84 00 00 */ lwz r12, 0(r4) /* 8012EFE4 0012BF44 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8012EFE8 0012BF48 7D 89 03 A6 */ mtctr r12 -/* 8012EFEC 0012BF4C 4E 80 04 21 */ bctrl +/* 8012EFEC 0012BF4C 4E 80 04 21 */ bctrl /* 8012EFF0 0012BF50 3B C1 00 38 */ addi r30, r1, 0x38 /* 8012EFF4 0012BF54 38 81 00 08 */ addi r4, r1, 8 /* 8012EFF8 0012BF58 7F C3 F3 78 */ mr r3, r30 @@ -583,7 +583,7 @@ lbl_8012F07C: /* 8012F088 0012BFE8 83 C1 00 68 */ lwz r30, 0x68(r1) /* 8012F08C 0012BFEC 7C 08 03 A6 */ mtlr r0 /* 8012F090 0012BFF0 38 21 00 70 */ addi r1, r1, 0x70 -/* 8012F094 0012BFF4 4E 80 00 20 */ blr +/* 8012F094 0012BFF4 4E 80 00 20 */ blr .global sub_8012f098 sub_8012f098: diff --git a/asm/MetroidPrime/CFluidPlaneCPU.s b/asm/MetroidPrime/CFluidPlaneCPU.s index ce7347e6..a8767e31 100644 --- a/asm/MetroidPrime/CFluidPlaneCPU.s +++ b/asm/MetroidPrime/CFluidPlaneCPU.s @@ -178,7 +178,7 @@ lbl_80199A58: /* 80199A58 001969B8 80 01 00 D4 */ lwz r0, 0xd4(r1) /* 80199A5C 001969BC 7C 08 03 A6 */ mtlr r0 /* 80199A60 001969C0 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 80199A64 001969C4 4E 80 00 20 */ blr +/* 80199A64 001969C4 4E 80 00 20 */ blr .global "Render__14CFluidPlaneCPUCFRC13CStateManagerRC6CAABoxRC12CTransform4fRC12CTransform4fbRC14CFrustumPlanesRCQ24rstl33optional_object<14CRippleManager>9TUniqueIdPCbiiRC9CVector3f" "Render__14CFluidPlaneCPUCFRC13CStateManagerRC6CAABoxRC12CTransform4fRC12CTransform4fbRC14CFrustumPlanesRCQ24rstl33optional_object<14CRippleManager>9TUniqueIdPCbiiRC9CVector3f": @@ -745,7 +745,7 @@ lbl_8019A21C: /* 8019A298 001971F8 80 01 02 94 */ lwz r0, 0x294(r1) /* 8019A29C 001971FC 7C 08 03 A6 */ mtlr r0 /* 8019A2A0 00197200 38 21 02 90 */ addi r1, r1, 0x290 -/* 8019A2A4 00197204 4E 80 00 20 */ blr +/* 8019A2A4 00197204 4E 80 00 20 */ blr .global __ct__Q220CFluidPlaneCPURender10SPatchInfoFRC9CVector3fRC9CVector3fRC9CVector3fffb __ct__Q220CFluidPlaneCPURender10SPatchInfoFRC9CVector3fRC9CVector3fRC9CVector3fffb: @@ -850,7 +850,7 @@ lbl_8019A3DC: /* 8019A420 00197380 D0 63 00 38 */ stfs f3, 0x38(r3) /* 8019A424 00197384 BB 21 00 24 */ lmw r25, 0x24(r1) /* 8019A428 00197388 38 21 00 40 */ addi r1, r1, 0x40 -/* 8019A42C 0019738C 4E 80 00 20 */ blr +/* 8019A42C 0019738C 4E 80 00 20 */ blr .global RenderSetup__14CFluidPlaneCPUCFRC13CStateManagerfRC12CTransform4fRC12CTransform4fRC6CAABoxP12CScriptWater RenderSetup__14CFluidPlaneCPUCFRC13CStateManagerfRC12CTransform4fRC12CTransform4fRC6CAABoxP12CScriptWater: @@ -912,7 +912,7 @@ lbl_8019A4F0: /* 8019A500 00197460 81 83 00 00 */ lwz r12, 0(r3) /* 8019A504 00197464 81 8C 00 30 */ lwz r12, 0x30(r12) /* 8019A508 00197468 7D 89 03 A6 */ mtctr r12 -/* 8019A50C 0019746C 4E 80 04 21 */ bctrl +/* 8019A50C 0019746C 4E 80 04 21 */ bctrl /* 8019A510 00197470 80 82 D7 40 */ lwz r4, lbl_805AF460@sda21(r2) /* 8019A514 00197474 57 C0 06 3F */ clrlwi. r0, r30, 0x18 /* 8019A518 00197478 80 62 A6 D8 */ lwz r3, lbl_805AC3F8@sda21(r2) @@ -2312,7 +2312,7 @@ lbl_8019B9CC: /* 8019B9F0 00198950 80 01 04 44 */ lwz r0, 0x444(r1) /* 8019B9F4 00198954 7C 08 03 A6 */ mtlr r0 /* 8019B9F8 00198958 38 21 04 40 */ addi r1, r1, 0x440 -/* 8019B9FC 0019895C 4E 80 00 20 */ blr +/* 8019B9FC 0019895C 4E 80 00 20 */ blr .global CalculateLightmapMtx__14CFluidPlaneCPUFRC12CTransform4fRC12CTransform4fRC6CAABoxi CalculateLightmapMtx__14CFluidPlaneCPUFRC12CTransform4fRC12CTransform4fRC6CAABoxi: @@ -2549,7 +2549,7 @@ CalculateLightmapMtx__14CFluidPlaneCPUFRC12CTransform4fRC12CTransform4fRC6CAABox /* 8019BD98 00198CF8 80 01 02 74 */ lwz r0, 0x274(r1) /* 8019BD9C 00198CFC 7C 08 03 A6 */ mtlr r0 /* 8019BDA0 00198D00 38 21 02 70 */ addi r1, r1, 0x270 -/* 8019BDA4 00198D04 4E 80 00 20 */ blr +/* 8019BDA4 00198D04 4E 80 00 20 */ blr .global UpdatePatch__FfRQ220CFluidPlaneCPURender10SPatchInfoRC14CFluidPlaneCPURC9CVector3fRC14CRippleManageriiii UpdatePatch__FfRQ220CFluidPlaneCPURender10SPatchInfoRC14CFluidPlaneCPURC9CVector3fRC14CRippleManageriiii: @@ -2734,7 +2734,7 @@ lbl_8019C020: /* 8019C02C 00198F8C 80 01 04 F4 */ lwz r0, 0x4f4(r1) /* 8019C030 00198F90 7C 08 03 A6 */ mtlr r0 /* 8019C034 00198F94 38 21 04 F0 */ addi r1, r1, 0x4f0 -/* 8019C038 00198F98 4E 80 00 20 */ blr +/* 8019C038 00198F98 4E 80 00 20 */ blr .global ApplyTurbulence__FfRA45_A45_Q220CFluidPlaneCPURender13SHFieldSamplePCUcRA256_CfRCQ220CFluidPlaneCPURender10SPatchInfoRC14CFluidPlaneCPURC9CVector3f ApplyTurbulence__FfRA45_A45_Q220CFluidPlaneCPURender13SHFieldSamplePCUcRA256_CfRCQ220CFluidPlaneCPURender10SPatchInfoRC14CFluidPlaneCPURC9CVector3f: @@ -2836,7 +2836,7 @@ lbl_8019C18C: /* 8019C190 001990F0 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8019C194 001990F4 7C 08 03 A6 */ mtlr r0 /* 8019C198 001990F8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8019C19C 001990FC 4E 80 00 20 */ blr +/* 8019C19C 001990FC 4E 80 00 20 */ blr .global UpdatePatchNoNormals__FPCUcPCUcQ220CFluidPlaneCPURender10SPatchInfo UpdatePatchNoNormals__FPCUcPCUcQ220CFluidPlaneCPURender10SPatchInfo: @@ -3065,7 +3065,7 @@ lbl_8019C490: /* 8019C4B8 00199418 83 A1 00 34 */ lwz r29, 0x34(r1) /* 8019C4BC 0019941C 83 81 00 30 */ lwz r28, 0x30(r1) /* 8019C4C0 00199420 38 21 00 40 */ addi r1, r1, 0x40 -/* 8019C4C4 00199424 4E 80 00 20 */ blr +/* 8019C4C4 00199424 4E 80 00 20 */ blr .global UpdatePatchWithNormals__FPCUcPCUcQ220CFluidPlaneCPURender10SPatchInfo UpdatePatchWithNormals__FPCUcPCUcQ220CFluidPlaneCPURender10SPatchInfo: @@ -3515,7 +3515,7 @@ lbl_8019CB08: /* 8019CB24 00199A84 40 81 F9 EC */ ble lbl_8019C510 /* 8019CB28 00199A88 BB 41 00 38 */ lmw r26, 0x38(r1) /* 8019CB2C 00199A8C 38 21 00 50 */ addi r1, r1, 0x50 -/* 8019CB30 00199A90 4E 80 00 20 */ blr +/* 8019CB30 00199A90 4E 80 00 20 */ blr .global __dt__11CTurbulenceFv __dt__11CTurbulenceFv: @@ -3540,7 +3540,7 @@ lbl_8019CB6C: /* 8019CB78 00199AD8 83 C1 00 08 */ lwz r30, 8(r1) /* 8019CB7C 00199ADC 7C 08 03 A6 */ mtlr r0 /* 8019CB80 00199AE0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8019CB84 00199AE4 4E 80 00 20 */ blr +/* 8019CB84 00199AE4 4E 80 00 20 */ blr .global __ct__Q214CFluidPlaneCPU11CTurbulenceFffffffff __ct__Q214CFluidPlaneCPU11CTurbulenceFffffffff: @@ -3689,7 +3689,7 @@ lbl_8019CD5C: /* 8019CDB0 00199D10 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8019CDB4 00199D14 7C 08 03 A6 */ mtlr r0 /* 8019CDB8 00199D18 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 8019CDBC 00199D1C 4E 80 00 20 */ blr +/* 8019CDBC 00199D1C 4E 80 00 20 */ blr .global __ct__14CFluidPlaneCPUFUiUiUiUiUiUifUiQ211CFluidPlane10EFluidTypefRC9CVector3ffRC14CFluidUVMotionfffffffffffff __ct__14CFluidPlaneCPUFUiUiUiUiUiUifUiQ211CFluidPlane10EFluidTypefRC9CVector3ffRC14CFluidUVMotionfffffffffffff: @@ -3830,7 +3830,7 @@ lbl_8019CFB4: /* 8019CFD4 00199F34 81 84 00 00 */ lwz r12, 0(r4) /* 8019CFD8 00199F38 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8019CFDC 00199F3C 7D 89 03 A6 */ mtctr r12 -/* 8019CFE0 00199F40 4E 80 04 21 */ bctrl +/* 8019CFE0 00199F40 4E 80 04 21 */ bctrl /* 8019CFE4 00199F44 3B 01 00 6C */ addi r24, r1, 0x6c /* 8019CFE8 00199F48 38 81 00 38 */ addi r4, r1, 0x38 /* 8019CFEC 00199F4C 7F 03 C3 78 */ mr r3, r24 @@ -3890,7 +3890,7 @@ lbl_8019D070: /* 8019D0B4 0019A014 81 84 00 00 */ lwz r12, 0(r4) /* 8019D0B8 0019A018 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8019D0BC 0019A01C 7D 89 03 A6 */ mtctr r12 -/* 8019D0C0 0019A020 4E 80 04 21 */ bctrl +/* 8019D0C0 0019A020 4E 80 04 21 */ bctrl /* 8019D0C4 0019A024 3B 01 00 60 */ addi r24, r1, 0x60 /* 8019D0C8 0019A028 38 81 00 28 */ addi r4, r1, 0x28 /* 8019D0CC 0019A02C 7F 03 C3 78 */ mr r3, r24 @@ -3948,7 +3948,7 @@ lbl_8019D150: /* 8019D18C 0019A0EC 81 84 00 00 */ lwz r12, 0(r4) /* 8019D190 0019A0F0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8019D194 0019A0F4 7D 89 03 A6 */ mtctr r12 -/* 8019D198 0019A0F8 4E 80 04 21 */ bctrl +/* 8019D198 0019A0F8 4E 80 04 21 */ bctrl /* 8019D19C 0019A0FC 3B 01 00 54 */ addi r24, r1, 0x54 /* 8019D1A0 0019A100 38 81 00 18 */ addi r4, r1, 0x18 /* 8019D1A4 0019A104 7F 03 C3 78 */ mr r3, r24 @@ -4010,7 +4010,7 @@ lbl_8019D228: /* 8019D274 0019A1D4 81 84 00 00 */ lwz r12, 0(r4) /* 8019D278 0019A1D8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8019D27C 0019A1DC 7D 89 03 A6 */ mtctr r12 -/* 8019D280 0019A1E0 4E 80 04 21 */ bctrl +/* 8019D280 0019A1E0 4E 80 04 21 */ bctrl /* 8019D284 0019A1E4 3B 01 00 48 */ addi r24, r1, 0x48 /* 8019D288 0019A1E8 38 81 00 08 */ addi r4, r1, 8 /* 8019D28C 0019A1EC 7F 03 C3 78 */ mr r3, r24 diff --git a/asm/MetroidPrime/CFluidPlaneDoor.s b/asm/MetroidPrime/CFluidPlaneDoor.s index 321d168b..7b47bf7f 100644 --- a/asm/MetroidPrime/CFluidPlaneDoor.s +++ b/asm/MetroidPrime/CFluidPlaneDoor.s @@ -26,15 +26,15 @@ lbl_805A7BB0: .global nullsub_143 nullsub_143: -/* 8019D3A0 0019A300 4E 80 00 20 */ blr +/* 8019D3A0 0019A300 4E 80 00 20 */ blr .global nullsub_144 nullsub_144: -/* 8019D3A4 0019A304 4E 80 00 20 */ blr +/* 8019D3A4 0019A304 4E 80 00 20 */ blr .global nullsub_145 nullsub_145: -/* 8019D3A8 0019A308 4E 80 00 20 */ blr +/* 8019D3A8 0019A308 4E 80 00 20 */ blr .global RenderCleanup__15CFluidPlaneDoorCFv RenderCleanup__15CFluidPlaneDoorCFv: @@ -67,7 +67,7 @@ RenderCleanup__15CFluidPlaneDoorCFv: /* 8019D414 0019A374 80 01 00 14 */ lwz r0, 0x14(r1) /* 8019D418 0019A378 7C 08 03 A6 */ mtlr r0 /* 8019D41C 0019A37C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8019D420 0019A380 4E 80 00 20 */ blr +/* 8019D420 0019A380 4E 80 00 20 */ blr .global Render__15CFluidPlaneDoorCFRC13CStateManagerRC6CAABoxRC14CFrustumPlanesRC14CRippleManagerRC9CVector3f Render__15CFluidPlaneDoorCFRC13CStateManagerRC6CAABoxRC14CFrustumPlanesRC14CRippleManagerRC9CVector3f: @@ -328,7 +328,7 @@ lbl_8019D7A4: /* 8019D7FC 0019A75C 83 81 01 10 */ lwz r28, 0x110(r1) /* 8019D800 0019A760 7C 08 03 A6 */ mtlr r0 /* 8019D804 0019A764 38 21 01 B0 */ addi r1, r1, 0x1b0 -/* 8019D808 0019A768 4E 80 00 20 */ blr +/* 8019D808 0019A768 4E 80 00 20 */ blr .global RenderSetup__15CFluidPlaneDoorCFRC13CStateManagerfRC12CTransform4fRC6CAABox RenderSetup__15CFluidPlaneDoorCFRC13CStateManagerfRC12CTransform4fRC6CAABox: @@ -351,7 +351,7 @@ RenderSetup__15CFluidPlaneDoorCFRC13CStateManagerfRC12CTransform4fRC6CAABox: /* 8019D84C 0019A7AC 81 8C 00 30 */ lwz r12, 0x30(r12) /* 8019D850 0019A7B0 C3 E6 01 1C */ lfs f31, 0x11c(r6) /* 8019D854 0019A7B4 7D 89 03 A6 */ mtctr r12 -/* 8019D858 0019A7B8 4E 80 04 21 */ bctrl +/* 8019D858 0019A7B8 4E 80 04 21 */ bctrl /* 8019D85C 0019A7BC 38 60 00 00 */ li r3, 0 /* 8019D860 0019A7C0 38 8D 8F F0 */ addi r4, r13, lbl_805A7BB0@sda21 /* 8019D864 0019A7C4 48 16 B4 F9 */ bl SetChanMatColor__3CGXFQ23CGX10EChannelIdRC8_GXColor @@ -589,7 +589,7 @@ lbl_8019DBA4: /* 8019DBF0 0019AB50 80 01 00 F4 */ lwz r0, 0xf4(r1) /* 8019DBF4 0019AB54 7C 08 03 A6 */ mtlr r0 /* 8019DBF8 0019AB58 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 8019DBFC 0019AB5C 4E 80 00 20 */ blr +/* 8019DBFC 0019AB5C 4E 80 00 20 */ blr .global __dt__15CFluidPlaneDoorFv __dt__15CFluidPlaneDoorFv: @@ -617,7 +617,7 @@ lbl_8019DC44: /* 8019DC50 0019ABB0 83 C1 00 08 */ lwz r30, 8(r1) /* 8019DC54 0019ABB4 7C 08 03 A6 */ mtlr r0 /* 8019DC58 0019ABB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8019DC5C 0019ABBC 4E 80 00 20 */ blr +/* 8019DC5C 0019ABBC 4E 80 00 20 */ blr .global __ct__15CFluidPlaneDoorFUiUiUifUiQ211CFluidPlane10EFluidTypefRC14CFluidUVMotion __ct__15CFluidPlaneDoorFUiUiUifUiQ211CFluidPlane10EFluidTypefRC14CFluidUVMotion: diff --git a/asm/MetroidPrime/CFluidPlaneManager.s b/asm/MetroidPrime/CFluidPlaneManager.s index 3c5b55b0..eba317c9 100644 --- a/asm/MetroidPrime/CFluidPlaneManager.s +++ b/asm/MetroidPrime/CFluidPlaneManager.s @@ -160,7 +160,7 @@ lbl_8012F25C: /* 8012F2A8 0012C208 E3 41 00 28 */ psq_l f26, 40(r1), 0, qr0 /* 8012F2AC 0012C20C CB 41 00 20 */ lfd f26, 0x20(r1) /* 8012F2B0 0012C210 38 21 00 80 */ addi r1, r1, 0x80 -/* 8012F2B4 0012C214 4E 80 00 20 */ blr +/* 8012F2B4 0012C214 4E 80 00 20 */ blr .global CreateSplash__18CFluidPlaneManagerF9TUniqueIdR13CStateManagerRC12CScriptWaterRC9CVector3ffb CreateSplash__18CFluidPlaneManagerF9TUniqueIdR13CStateManagerRC12CScriptWaterRC9CVector3ffb: @@ -354,7 +354,7 @@ lbl_8012F55C: /* 8012F570 0012C4D0 80 01 01 04 */ lwz r0, 0x104(r1) /* 8012F574 0012C4D4 7C 08 03 A6 */ mtlr r0 /* 8012F578 0012C4D8 38 21 01 00 */ addi r1, r1, 0x100 -/* 8012F57C 0012C4DC 4E 80 00 20 */ blr +/* 8012F57C 0012C4DC 4E 80 00 20 */ blr .global GetLastRippleDeltaTime__18CFluidPlaneManagerCF9TUniqueId GetLastRippleDeltaTime__18CFluidPlaneManagerCF9TUniqueId: @@ -368,7 +368,7 @@ GetLastRippleDeltaTime__18CFluidPlaneManagerCF9TUniqueId: /* 8012F59C 0012C4FC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8012F5A0 0012C500 7C 08 03 A6 */ mtlr r0 /* 8012F5A4 0012C504 38 21 00 10 */ addi r1, r1, 0x10 -/* 8012F5A8 0012C508 4E 80 00 20 */ blr +/* 8012F5A8 0012C508 4E 80 00 20 */ blr .global GetLastSplashDeltaTime__18CFluidPlaneManagerCF9TUniqueId GetLastSplashDeltaTime__18CFluidPlaneManagerCF9TUniqueId: @@ -397,13 +397,13 @@ lbl_8012F5E0: .global sub_8012f5f8 sub_8012f5f8: -/* 8012F5F8 0012C558 4E 80 00 20 */ blr +/* 8012F5F8 0012C558 4E 80 00 20 */ blr .global EndFrame__18CFluidPlaneManagerCFv EndFrame__18CFluidPlaneManagerCFv: /* 8012F5FC 0012C55C 38 00 00 00 */ li r0, 0 /* 8012F600 0012C560 98 03 01 21 */ stb r0, 0x121(r3) -/* 8012F604 0012C564 4E 80 00 20 */ blr +/* 8012F604 0012C564 4E 80 00 20 */ blr .global StartFrame__18CFluidPlaneManagerCFb StartFrame__18CFluidPlaneManagerCFb: @@ -417,7 +417,7 @@ StartFrame__18CFluidPlaneManagerCFb: /* 8012F624 0012C584 80 01 00 14 */ lwz r0, 0x14(r1) /* 8012F628 0012C588 7C 08 03 A6 */ mtlr r0 /* 8012F62C 0012C58C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8012F630 0012C590 4E 80 00 20 */ blr +/* 8012F630 0012C590 4E 80 00 20 */ blr .global Update__18CFluidPlaneManagerFf Update__18CFluidPlaneManagerFf: @@ -460,7 +460,7 @@ lbl_8012F694: /* 8012F6B8 0012C618 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8012F6BC 0012C61C 7C 08 03 A6 */ mtlr r0 /* 8012F6C0 0012C620 38 21 00 20 */ addi r1, r1, 0x20 -/* 8012F6C4 0012C624 4E 80 00 20 */ blr +/* 8012F6C4 0012C624 4E 80 00 20 */ blr .global __ct__18CFluidPlaneManagerFv __ct__18CFluidPlaneManagerFv: @@ -501,7 +501,7 @@ lbl_8012F724: /* 8012F748 0012C6A8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8012F74C 0012C6AC 7C 08 03 A6 */ mtlr r0 /* 8012F750 0012C6B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8012F754 0012C6B4 4E 80 00 20 */ blr +/* 8012F754 0012C6B4 4E 80 00 20 */ blr .global Clear__Q218CFluidPlaneManager13CFluidProfileFv Clear__Q218CFluidPlaneManager13CFluidProfileFv: diff --git a/asm/MetroidPrime/CFluidPlaneRender.s b/asm/MetroidPrime/CFluidPlaneRender.s index 141e02ab..94be1b19 100644 --- a/asm/MetroidPrime/CFluidPlaneRender.s +++ b/asm/MetroidPrime/CFluidPlaneRender.s @@ -32,7 +32,7 @@ lbl_805A9138: .global lbl_805A913C lbl_805A913C: .skip 0x4 - + .section .text, "ax" .global RenderPatch__FRCQ220CFluidPlaneCPURender10SPatchInfob @@ -970,7 +970,7 @@ lbl_8026C954: /* 8026C978 002698D8 80 01 00 84 */ lwz r0, 0x84(r1) /* 8026C97C 002698DC 7C 08 03 A6 */ mtlr r0 /* 8026C980 002698E0 38 21 00 80 */ addi r1, r1, 0x80 -/* 8026C984 002698E4 4E 80 00 20 */ blr +/* 8026C984 002698E4 4E 80 00 20 */ blr .global ApplyRipples__FRC14CRippleManagerRA43_A43_Q220CFluidPlaneCPURender13SHFieldSampleRA22_A22_UcRA256_CfRQ220CFluidPlaneCPURender10SPatchInfo ApplyRipples__FRC14CRippleManagerRA43_A43_Q220CFluidPlaneCPURender13SHFieldSampleRA22_A22_UcRA256_CfRQ220CFluidPlaneCPURender10SPatchInfo: @@ -1193,7 +1193,7 @@ lbl_8026CC9C: /* 8026CCA0 00269C00 80 01 00 24 */ lwz r0, 0x24(r1) /* 8026CCA4 00269C04 7C 08 03 A6 */ mtlr r0 /* 8026CCA8 00269C08 38 21 00 20 */ addi r1, r1, 0x20 -/* 8026CCAC 00269C0C 4E 80 00 20 */ blr +/* 8026CCAC 00269C0C 4E 80 00 20 */ blr .global ApplyRipple__FRC7CRippleRA43_A43_Q220CFluidPlaneCPURender13SHFieldSampleRA22_A22_UcRA256_CfRQ220CFluidPlaneCPURender10SPatchInfof ApplyRipple__FRC7CRippleRA43_A43_Q220CFluidPlaneCPURender13SHFieldSampleRA22_A22_UcRA256_CfRQ220CFluidPlaneCPURender10SPatchInfof: @@ -1769,7 +1769,7 @@ lbl_8026D48C: /* 8026D4E0 0026A440 CA E1 00 A0 */ lfd f23, 0xa0(r1) /* 8026D4E4 0026A444 B9 C1 00 58 */ lmw r14, 0x58(r1) /* 8026D4E8 0026A448 38 21 01 30 */ addi r1, r1, 0x130 -/* 8026D4EC 0026A44C 4E 80 00 20 */ blr +/* 8026D4EC 0026A44C 4E 80 00 20 */ blr .global RenderStripWithRipples__FRA45_A45_CQ220CFluidPlaneCPURender13SHFieldSampleRA22_A22_CUcifRCQ220CFluidPlaneCPURender10SPatchInfo RenderStripWithRipples__FRA45_A45_CQ220CFluidPlaneCPURender13SHFieldSampleRA22_A22_CUcifRCQ220CFluidPlaneCPURender10SPatchInfo: @@ -3443,7 +3443,7 @@ lbl_8026ED2C: /* 8026ED74 0026BCD4 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 8026ED78 0026BCD8 7C 08 03 A6 */ mtlr r0 /* 8026ED7C 0026BCDC 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 8026ED80 0026BCE0 4E 80 00 20 */ blr +/* 8026ED80 0026BCE0 4E 80 00 20 */ blr .global sub_8026ed84 sub_8026ed84: @@ -3454,7 +3454,7 @@ sub_8026ed84: /* 8026ED94 0026BCF4 38 05 00 01 */ addi r0, r5, 1 /* 8026ED98 0026BCF8 7C 09 03 A6 */ mtctr r0 /* 8026ED9C 0026BCFC 2C 05 00 00 */ cmpwi r5, 0 -/* 8026EDA0 0026BD00 4D 80 00 20 */ bltlr +/* 8026EDA0 0026BD00 4D 80 00 20 */ bltlr lbl_8026EDA4: /* 8026EDA4 0026BD04 C0 03 00 00 */ lfs f0, 0(r3) /* 8026EDA8 0026BD08 38 00 00 FF */ li r0, 0xff @@ -3499,7 +3499,7 @@ lbl_8026EDA4: .global sub_8026ee44 sub_8026ee44: -/* 8026EE44 0026BDA4 4E 80 00 20 */ blr +/* 8026EE44 0026BDA4 4E 80 00 20 */ blr lbl_8026EE48: /* 8026EE48 0026BDA8 C0 03 00 00 */ lfs f0, 0(r3) /* 8026EE4C 0026BDAC 3C A0 CC 01 */ lis r5, 0xCC008000@ha @@ -3578,7 +3578,7 @@ lbl_8026EE48: /* 8026EF70 0026BED0 98 65 80 00 */ stb r3, 0xCC008000@l(r5) /* 8026EF74 0026BED4 98 C5 80 00 */ stb r6, 0xCC008000@l(r5) /* 8026EF78 0026BED8 98 E5 80 00 */ stb r7, 0xCC008000@l(r5) -/* 8026EF7C 0026BEDC 4E 80 00 20 */ blr +/* 8026EF7C 0026BEDC 4E 80 00 20 */ blr .global sub_8026ef80 sub_8026ef80: @@ -3588,7 +3588,7 @@ sub_8026ef80: /* 8026EF8C 0026BEEC 3D 20 CC 01 */ lis r9, 0xcc01 /* 8026EF90 0026BEF0 2C 05 00 00 */ cmpwi r5, 0 /* 8026EF94 0026BEF4 38 A5 00 01 */ addi r5, r5, 1 -/* 8026EF98 0026BEF8 4D 80 00 20 */ bltlr +/* 8026EF98 0026BEF8 4D 80 00 20 */ bltlr /* 8026EF9C 0026BEFC 54 A0 F8 7F */ rlwinm. r0, r5, 0x1f, 1, 0x1f /* 8026EFA0 0026BF00 7C 09 03 A6 */ mtctr r0 /* 8026EFA4 0026BF04 41 82 00 D0 */ beq lbl_8026F074 @@ -3643,7 +3643,7 @@ lbl_8026EFA8: /* 8026F064 0026BFC4 EC 42 00 2A */ fadds f2, f2, f0 /* 8026F068 0026BFC8 42 00 FF 40 */ bdnz lbl_8026EFA8 /* 8026F06C 0026BFCC 70 A5 00 01 */ andi. r5, r5, 1 -/* 8026F070 0026BFD0 4D 82 00 20 */ beqlr +/* 8026F070 0026BFD0 4D 82 00 20 */ beqlr lbl_8026F074: /* 8026F074 0026BFD4 7C A9 03 A6 */ mtctr r5 lbl_8026F078: @@ -3676,7 +3676,7 @@ lbl_8026F078: .global sub_8026f0e0 sub_8026f0e0: -/* 8026F0E0 0026C040 4E 80 00 20 */ blr +/* 8026F0E0 0026C040 4E 80 00 20 */ blr lbl_8026F0E4: /* 8026F0E4 0026C044 C0 03 00 00 */ lfs f0, 0(r3) /* 8026F0E8 0026C048 3D 00 CC 01 */ lis r8, 0xCC008000@ha @@ -3727,7 +3727,7 @@ lbl_8026F0E4: /* 8026F19C 0026C0FC 98 68 80 00 */ stb r3, 0xCC008000@l(r8) /* 8026F1A0 0026C100 98 A8 80 00 */ stb r5, 0xCC008000@l(r8) /* 8026F1A4 0026C104 98 C8 80 00 */ stb r6, 0xCC008000@l(r8) -/* 8026F1A8 0026C108 4E 80 00 20 */ blr +/* 8026F1A8 0026C108 4E 80 00 20 */ blr .global sub_8026f1ac sub_8026f1ac: @@ -3738,7 +3738,7 @@ sub_8026f1ac: /* 8026F1BC 0026C11C 38 C0 00 FF */ li r6, 0xff /* 8026F1C0 0026C120 2C 05 00 00 */ cmpwi r5, 0 /* 8026F1C4 0026C124 38 A5 00 01 */ addi r5, r5, 1 -/* 8026F1C8 0026C128 4D 80 00 20 */ bltlr +/* 8026F1C8 0026C128 4D 80 00 20 */ bltlr /* 8026F1CC 0026C12C 54 A0 F8 7F */ rlwinm. r0, r5, 0x1f, 1, 0x1f /* 8026F1D0 0026C130 7C 09 03 A6 */ mtctr r0 /* 8026F1D4 0026C134 41 82 00 9C */ beq lbl_8026F270 @@ -3780,7 +3780,7 @@ lbl_8026F1D8: /* 8026F260 0026C1C0 EC 42 00 2A */ fadds f2, f2, f0 /* 8026F264 0026C1C4 42 00 FF 74 */ bdnz lbl_8026F1D8 /* 8026F268 0026C1C8 70 A5 00 01 */ andi. r5, r5, 1 -/* 8026F26C 0026C1CC 4D 82 00 20 */ beqlr +/* 8026F26C 0026C1CC 4D 82 00 20 */ beqlr lbl_8026F270: /* 8026F270 0026C1D0 7C A9 03 A6 */ mtctr r5 lbl_8026F274: @@ -3806,7 +3806,7 @@ lbl_8026F274: .global sub_8026f2c0 sub_8026f2c0: -/* 8026F2C0 0026C220 4E 80 00 20 */ blr +/* 8026F2C0 0026C220 4E 80 00 20 */ blr lbl_8026F2C4: /* 8026F2C4 0026C224 C0 03 00 00 */ lfs f0, 0(r3) /* 8026F2C8 0026C228 3D 00 CC 01 */ lis r8, 0xCC008000@ha @@ -3845,7 +3845,7 @@ lbl_8026F2C4: /* 8026F34C 0026C2AC 98 68 80 00 */ stb r3, 0xCC008000@l(r8) /* 8026F350 0026C2B0 98 A8 80 00 */ stb r5, 0xCC008000@l(r8) /* 8026F354 0026C2B4 98 C8 80 00 */ stb r6, 0xCC008000@l(r8) -/* 8026F358 0026C2B8 4E 80 00 20 */ blr +/* 8026F358 0026C2B8 4E 80 00 20 */ blr .global RenderTileWithRipplesNBT__fRA45_A45_CQ220CFluidPlaneCPURender13SHFieldSamplefiRCQ220CFluidPlaneCPURender10SPatchInfo RenderTileWithRipplesNBT__fRA45_A45_CQ220CFluidPlaneCPURender13SHFieldSamplefiRCQ220CFluidPlaneCPURender10SPatchInfo: @@ -3893,7 +3893,7 @@ lbl_8026F3DC: /* 8026F3F8 0026C358 80 01 00 44 */ lwz r0, 0x44(r1) /* 8026F3FC 0026C35C 7C 08 03 A6 */ mtlr r0 /* 8026F400 0026C360 38 21 00 40 */ addi r1, r1, 0x40 -/* 8026F404 0026C364 4E 80 00 20 */ blr +/* 8026F404 0026C364 4E 80 00 20 */ blr .global sub_8026f408 sub_8026f408: @@ -3901,7 +3901,7 @@ sub_8026f408: /* 8026F40C 0026C36C 3C C0 CC 01 */ lis r6, 0xCC008000@ha /* 8026F410 0026C370 7C 89 03 A6 */ mtctr r4 /* 8026F414 0026C374 2C 04 00 00 */ cmpwi r4, 0 -/* 8026F418 0026C378 4D 82 00 20 */ beqlr +/* 8026F418 0026C378 4D 82 00 20 */ beqlr lbl_8026F41C: /* 8026F41C 0026C37C C0 03 00 00 */ lfs f0, 0(r3) /* 8026F420 0026C380 39 00 00 FF */ li r8, 0xff @@ -3977,7 +3977,7 @@ lbl_8026F41C: /* 8026F538 0026C498 98 E6 80 00 */ stb r7, 0xCC008000@l(r6) /* 8026F53C 0026C49C 99 06 80 00 */ stb r8, 0xCC008000@l(r6) /* 8026F540 0026C4A0 42 00 FE DC */ bdnz lbl_8026F41C -/* 8026F544 0026C4A4 4E 80 00 20 */ blr +/* 8026F544 0026C4A4 4E 80 00 20 */ blr .global RenderTileWithRipplesNormals__fRA45_A45_CQ220CFluidPlaneCPURender13SHFieldSamplefiRCQ220CFluidPlaneCPURender10SPatchInfo RenderTileWithRipplesNormals__fRA45_A45_CQ220CFluidPlaneCPURender13SHFieldSamplefiRCQ220CFluidPlaneCPURender10SPatchInfo: @@ -4025,7 +4025,7 @@ lbl_8026F5C8: /* 8026F5E4 0026C544 80 01 00 44 */ lwz r0, 0x44(r1) /* 8026F5E8 0026C548 7C 08 03 A6 */ mtlr r0 /* 8026F5EC 0026C54C 38 21 00 40 */ addi r1, r1, 0x40 -/* 8026F5F0 0026C550 4E 80 00 20 */ blr +/* 8026F5F0 0026C550 4E 80 00 20 */ blr .global sub_8026f5f4 sub_8026f5f4: @@ -4033,7 +4033,7 @@ sub_8026f5f4: /* 8026F5F8 0026C558 3D 00 CC 01 */ lis r8, 0xCC008000@ha /* 8026F5FC 0026C55C 7C 89 03 A6 */ mtctr r4 /* 8026F600 0026C560 2C 04 00 00 */ cmpwi r4, 0 -/* 8026F604 0026C564 4D 82 00 20 */ beqlr +/* 8026F604 0026C564 4D 82 00 20 */ beqlr lbl_8026F608: /* 8026F608 0026C568 C0 03 00 00 */ lfs f0, 0(r3) /* 8026F60C 0026C56C 38 E0 00 FF */ li r7, 0xff @@ -4081,7 +4081,7 @@ lbl_8026F608: /* 8026F6B4 0026C614 98 C8 80 00 */ stb r6, 0xCC008000@l(r8) /* 8026F6B8 0026C618 98 E8 80 00 */ stb r7, 0xCC008000@l(r8) /* 8026F6BC 0026C61C 42 00 FF 4C */ bdnz lbl_8026F608 -/* 8026F6C0 0026C620 4E 80 00 20 */ blr +/* 8026F6C0 0026C620 4E 80 00 20 */ blr .global RenderTileWithRipplesNoNormals__fRA45_A45_CQ220CFluidPlaneCPURender13SHFieldSamplefiRCQ220CFluidPlaneCPURender10SPatchInfo RenderTileWithRipplesNoNormals__fRA45_A45_CQ220CFluidPlaneCPURender13SHFieldSamplefiRCQ220CFluidPlaneCPURender10SPatchInfo: @@ -4168,7 +4168,7 @@ lbl_8026F7D8: /* 8026F7F4 0026C754 80 01 00 44 */ lwz r0, 0x44(r1) /* 8026F7F8 0026C758 7C 08 03 A6 */ mtlr r0 /* 8026F7FC 0026C75C 38 21 00 40 */ addi r1, r1, 0x40 -/* 8026F800 0026C760 4E 80 00 20 */ blr +/* 8026F800 0026C760 4E 80 00 20 */ blr .global PrepareRipple__FRC7CRippleRCQ220CFluidPlaneCPURender10SPatchInfoRQ220CFluidPlaneCPURender11SRippleInfo PrepareRipple__FRC7CRippleRCQ220CFluidPlaneCPURender10SPatchInfoRQ220CFluidPlaneCPURender11SRippleInfo: @@ -4341,13 +4341,13 @@ lbl_8026FA5C: /* 8026FA5C 0026C9BC 38 60 00 01 */ li r3, 1 lbl_8026FA60: /* 8026FA60 0026C9C0 38 21 00 40 */ addi r1, r1, 0x40 -/* 8026FA64 0026C9C4 4E 80 00 20 */ blr +/* 8026FA64 0026C9C4 4E 80 00 20 */ blr .global GetGlobalSineWave__Fv GetGlobalSineWave__Fv: /* 8026FA68 0026C9C8 3C 60 80 47 */ lis r3, lbl_8046DCC0@ha /* 8026FA6C 0026C9CC 38 63 DC C0 */ addi r3, r3, lbl_8046DCC0@l -/* 8026FA70 0026C9D0 4E 80 00 20 */ blr +/* 8026FA70 0026C9D0 4E 80 00 20 */ blr .global InitializeSineWave__Fv InitializeSineWave__Fv: diff --git a/asm/MetroidPrime/CFluidUVMotion.s b/asm/MetroidPrime/CFluidUVMotion.s index 49a1b9c4..218bf9a7 100644 --- a/asm/MetroidPrime/CFluidUVMotion.s +++ b/asm/MetroidPrime/CFluidUVMotion.s @@ -131,7 +131,7 @@ lbl_8011CC6C: /* 8011CCB4 00119C14 80 01 00 94 */ lwz r0, 0x94(r1) /* 8011CCB8 00119C18 7C 08 03 A6 */ mtlr r0 /* 8011CCBC 00119C1C 38 21 00 90 */ addi r1, r1, 0x90 -/* 8011CCC0 00119C20 4E 80 00 20 */ blr +/* 8011CCC0 00119C20 4E 80 00 20 */ blr .global __ct__14CFluidUVMotionFffRCQ214CFluidUVMotion17SFluidLayerMotionRCQ214CFluidUVMotion17SFluidLayerMotionRCQ214CFluidUVMotion17SFluidLayerMotion __ct__14CFluidUVMotionFffRCQ214CFluidUVMotion17SFluidLayerMotionRCQ214CFluidUVMotion17SFluidLayerMotionRCQ214CFluidUVMotion17SFluidLayerMotion: @@ -215,7 +215,7 @@ lbl_8011CD60: /* 8011CDE8 00119D48 C0 06 00 14 */ lfs f0, 0x14(r6) /* 8011CDEC 00119D4C D0 03 00 48 */ stfs f0, 0x48(r3) /* 8011CDF0 00119D50 38 21 00 20 */ addi r1, r1, 0x20 -/* 8011CDF4 00119D54 4E 80 00 20 */ blr +/* 8011CDF4 00119D54 4E 80 00 20 */ blr .global __ct__14CFluidUVMotionFff __ct__14CFluidUVMotionFff: diff --git a/asm/MetroidPrime/CFrontEndUI.s b/asm/MetroidPrime/CFrontEndUI.s index 3caa72ab..4a3bbf64 100644 --- a/asm/MetroidPrime/CFrontEndUI.s +++ b/asm/MetroidPrime/CFrontEndUI.s @@ -9,7 +9,7 @@ lbl_803D9810: .4byte 0 .4byte __dt__21CArchMsgParmUserInputFv .4byte 0 - + .global lbl_803D9820 lbl_803D9820: # ROM: 0x3D6820 @@ -91,32 +91,197 @@ lbl_803D9900: .4byte 0 .4byte 0 .4byte 0 - + .section .rodata .global lbl_803CC540 lbl_803CC540: - .incbin "baserom.dol", 0x3C9540, 0x84 + # ROM: 0x3C9540 + .4byte 0x803CC644 + .4byte 0 + .4byte 0x803CC65D + .4byte 0x01000000 + .4byte 0x803CC674 + .4byte 0 + .4byte 0x803CC694 + .4byte 0x01000000 + .4byte 0x803CC6B0 + .4byte 0 + .4byte 0x803CC6D3 + .4byte 0 + .4byte 0x803CC6EF + .4byte 0x01000000 + .4byte 0x803CC704 + .4byte 0 + .4byte 0x803CC704 + .4byte 0 + .asciz "!#$MetroidBuildInfo!#$Build v1.088 10/29/2002 2:21:25" + .byte 0x50, 0x41 + .4byte 0x44000000 + .global lbl_803CC5C4 lbl_803CC5C4: - .incbin "baserom.dol", 0x3C95C4, 0xC + # ROM: 0x3C95C4 + .4byte 0x04420449 + .4byte 0x044A044B + .4byte 0x044C044D + .global lbl_803CC5D0 lbl_803CC5D0: - .incbin "baserom.dol", 0x3C95D0, 0xC + # ROM: 0x3C95D0 + .4byte 0x044E044F + .4byte 0x04500451 + .4byte 0x04520453 + .global lbl_803CC5DC lbl_803CC5DC: - .incbin "baserom.dol", 0x3C95DC, 0xC + # ROM: 0x3C95DC + .4byte 0x40866666 + .4byte 0x40C33333 + .4byte 0x40C33333 + .global lbl_803CC5E8 lbl_803CC5E8: - .incbin "baserom.dol", 0x3C95E8, 0xC + # ROM: 0x3C95E8 + .4byte 0x3EE147AD + .4byte 0x40AD1EB9 + .4byte 0x405A3D72 + .global lbl_803CC5F4 lbl_803CC5F4: - .incbin "baserom.dol", 0x3C95F4, 0x28 + # ROM: 0x3C95F4 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0xFFFFFFFF + .4byte 0x00000007 + .4byte 0x00000008 + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .global lbl_803CC61C lbl_803CC61C: - .incbin "baserom.dol", 0x3C961C, 0x28 + # ROM: 0x3C961C + .4byte 0x00000009 + .4byte 0x00000009 + .4byte 0x00000009 + .4byte 0x00000009 + .4byte 0xFFFFFFFF + .4byte 0x00000009 + .4byte 0xFFFFFFFF + .4byte 0x00000009 + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .global lbl_803CC644 lbl_803CC644: - .incbin "baserom.dol", 0x3C9644, 0x45C + # ROM: 0x3C9644 + .asciz "Video/00_first_start.thp" + .byte 0x56, 0x69, 0x64 + .asciz "eo/01_startloop.thp" + .asciz "Video/02_start_fileselect_A.thp" + .asciz "Video/03_fileselectloop.thp" + .asciz "Video/04_fileselect_playgame_A.thp" + .byte 0x56 + .asciz "ideo/06_fileselect_GBA.thp" + .byte 0x56 + .asciz "ideo/07_GBAloop.thp" + .asciz "Video/08_GBA_fileselect.thp" + .asciz "Audio/frontend_1.rsf" + .byte 0x41, 0x75, 0x64 + .asciz "io/frontend_2.rsf" + .byte 0x46, 0x72 + .asciz "ontEnd_AGSC" + .asciz "??(??)" + .byte 0x56 + .asciz "ideo/attract%d.thp" + .byte 0x46 + .asciz "rontEndUI" + .byte 0x46, 0x72 + .asciz "ontEnd_DGRP" + .asciz "TXTR_PressStart" + .asciz "tablegroup_options" + .byte 0x74 + .asciz "ablegroup_fusionsuit" + .byte 0x74, 0x65, 0x78 + .asciz "tpane_instructions" + .byte 0x74 + .asciz "extpane_nes" + .asciz "textpane_fusionsuit" + .asciz "textpane_fusionsuitno" + .byte 0x74, 0x65 + .asciz "xtpane_fusionsuityes" + .byte 0x74, 0x65, 0x78 + .asciz "tpane_title" + .asciz "textpane_proceed" + .byte 0x74, 0x65, 0x78 + .asciz "tpane_cancel" + .byte 0x46, 0x52, 0x4D + .asciz "E_GBAScreen" + .asciz "FRME_GBALink" + .byte 0x20, 0x20, 0x25 + .asciz "02d%%" + .byte 0x25, 0x30 + .asciz "2d:%02d" + .asciz "tablegroup_fileselect" + .byte 0x6D, 0x6F + .asciz "del_erase" + .byte 0x74, 0x65 + .asciz "xtpane_erase" + .byte 0x74, 0x65, 0x78 + .asciz "tpane_gba" + .byte 0x74, 0x65 + .asciz "xtpane_cheats" + .byte 0x74, 0x65 + .asciz "xtpane_popupadvance" + .asciz "textpane_popupcancel" + .byte 0x74, 0x65, 0x78 + .asciz "tpane_popupextra" + .byte 0x74, 0x61, 0x62 + .asciz "legroup_popup" + .byte 0x6D, 0x6F + .asciz "del_dash7" + .byte 0x46, 0x52 + .asciz "ME_NewFileSelect" + .byte 0x62, 0x61, 0x73 + .asciz "ewidget_file%d" + .byte 0x74 + .asciz "extpane_filename%d" + .byte 0x74 + .asciz "extpane_world%d" + .asciz "textpane_playtime%d" + .asciz "textpane_date%d" + .asciz "tablegroup_mainmenu" + .asciz "textpane_start" + .byte 0x74 + .asciz "extpane_options" + .asciz "FRME_FrontEndPL" + .4byte 0x00746578 + .asciz "tpane_yes" + .byte 0x74, 0x65 + .asciz "xtpane_no" + .byte 0x6D, 0x6F + .asciz "del_gc" + .byte 0x6D + .asciz "odel_gba" + .byte 0x6D, 0x6F, 0x64 + .asciz "el_cable" + .byte 0x6D, 0x6F, 0x64 + .asciz "el_circlegcport" + .asciz "model_circlegbaport" + .asciz "model_circlestartselect" + .asciz "model_pakout" + .byte 0x6D, 0x6F, 0x64 + .asciz "el_gbascreen" + .byte 0x6D, 0x6F, 0x64 + .asciz "el_connect" + .byte 0x46 + .asciz "ONT_Deface14B" + .byte 0x25, 0x73 + .4byte 0x62000000 + .4byte 0 + .section .sbss # CFrontEndUI @@ -199,13 +364,13 @@ lbl_805A6D0C: .4byte 0x003F003F .4byte 0x003F0000 .4byte 0 - + .section .text, "ax" .global GetUserInput__21CArchMsgParmUserInputCFv GetUserInput__21CArchMsgParmUserInputCFv: /* 8001B9E4 00018944 38 63 00 04 */ addi r3, r3, 4 -/* 8001B9E8 00018948 4E 80 00 20 */ blr +/* 8001B9E8 00018948 4E 80 00 20 */ blr .global __dt__21CArchMsgParmUserInputFv __dt__21CArchMsgParmUserInputFv: @@ -233,7 +398,7 @@ lbl_8001BA30: /* 8001BA38 00018998 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8001BA3C 0001899C 7C 08 03 A6 */ mtlr r0 /* 8001BA40 000189A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8001BA44 000189A4 4E 80 00 20 */ blr +/* 8001BA44 000189A4 4E 80 00 20 */ blr .global __ct__21CArchMsgParmUserInputFRC11CFinalInput __ct__21CArchMsgParmUserInputFRC11CFinalInput: @@ -277,7 +442,7 @@ __ct__21CArchMsgParmUserInputFRC11CFinalInput: /* 8001BADC 00018A3C 98 03 00 31 */ stb r0, 0x31(r3) /* 8001BAE0 00018A40 88 04 00 2E */ lbz r0, 0x2e(r4) /* 8001BAE4 00018A44 98 03 00 32 */ stb r0, 0x32(r3) -/* 8001BAE8 00018A48 4E 80 00 20 */ blr +/* 8001BAE8 00018A48 4E 80 00 20 */ blr .global StartSlideShow__11CFrontEndUIFR18CArchitectureQueue StartSlideShow__11CFrontEndUIFR18CArchitectureQueue: @@ -317,7 +482,7 @@ lbl_8001BB64: /* 8001BB68 00018AC8 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8001BB6C 00018ACC 7C 08 03 A6 */ mtlr r0 /* 8001BB70 00018AD0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8001BB74 00018AD4 4E 80 00 20 */ blr +/* 8001BB74 00018AD4 4E 80 00 20 */ blr .global SetFadeBlackWithMovie__11CFrontEndUIFv SetFadeBlackWithMovie__11CFrontEndUIFv: @@ -325,14 +490,14 @@ SetFadeBlackWithMovie__11CFrontEndUIFv: /* 8001BB7C 00018ADC 38 00 00 01 */ li r0, 1 /* 8001BB80 00018AE0 D0 03 00 58 */ stfs f0, 0x58(r3) /* 8001BB84 00018AE4 98 03 00 5C */ stb r0, 0x5c(r3) -/* 8001BB88 00018AE8 4E 80 00 20 */ blr +/* 8001BB88 00018AE8 4E 80 00 20 */ blr .global SetFadeBlackTimer__11CFrontEndUIFf SetFadeBlackTimer__11CFrontEndUIFf: /* 8001BB8C 00018AEC D0 23 00 58 */ stfs f1, 0x58(r3) /* 8001BB90 00018AF0 38 00 00 00 */ li r0, 0 /* 8001BB94 00018AF4 98 03 00 5C */ stb r0, 0x5c(r3) -/* 8001BB98 00018AF8 4E 80 00 20 */ blr +/* 8001BB98 00018AF8 4E 80 00 20 */ blr .global GetAttractMovieFileName__11CFrontEndUIFi GetAttractMovieFileName__11CFrontEndUIFi: @@ -348,7 +513,7 @@ GetAttractMovieFileName__11CFrontEndUIFi: /* 8001BBC0 00018B20 80 01 00 14 */ lwz r0, 0x14(r1) /* 8001BBC4 00018B24 7C 08 03 A6 */ mtlr r0 /* 8001BBC8 00018B28 38 21 00 10 */ addi r1, r1, 0x10 -/* 8001BBCC 00018B2C 4E 80 00 20 */ blr +/* 8001BBCC 00018B2C 4E 80 00 20 */ blr .global GetNextAttractMovieFileName__11CFrontEndUIFi GetNextAttractMovieFileName__11CFrontEndUIFi: @@ -370,7 +535,7 @@ GetNextAttractMovieFileName__11CFrontEndUIFi: /* 8001BC0C 00018B6C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8001BC10 00018B70 7C 08 03 A6 */ mtlr r0 /* 8001BC14 00018B74 38 21 00 10 */ addi r1, r1, 0x10 -/* 8001BC18 00018B78 4E 80 00 20 */ blr +/* 8001BC18 00018B78 4E 80 00 20 */ blr .global SetCurrentMovie__11CFrontEndUIFQ211CFrontEndUI10EMenuMovie SetCurrentMovie__11CFrontEndUIFQ211CFrontEndUI10EMenuMovie: @@ -415,7 +580,7 @@ lbl_8001BCA0: /* 8001BCA8 00018C08 83 C1 00 08 */ lwz r30, 8(r1) /* 8001BCAC 00018C0C 7C 08 03 A6 */ mtlr r0 /* 8001BCB0 00018C10 38 21 00 10 */ addi r1, r1, 0x10 -/* 8001BCB4 00018C14 4E 80 00 20 */ blr +/* 8001BCB4 00018C14 4E 80 00 20 */ blr .global StopAttractMovie__11CFrontEndUIFv StopAttractMovie__11CFrontEndUIFv: @@ -462,7 +627,7 @@ lbl_8001BD44: /* 8001BD48 00018CA8 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8001BD4C 00018CAC 7C 08 03 A6 */ mtlr r0 /* 8001BD50 00018CB0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8001BD54 00018CB4 4E 80 00 20 */ blr +/* 8001BD54 00018CB4 4E 80 00 20 */ blr .global StartAttractMovie__11CFrontEndUIFi StartAttractMovie__11CFrontEndUIFi: @@ -534,7 +699,7 @@ lbl_8001BE40: /* 8001BE48 00018DA8 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8001BE4C 00018DAC 7C 08 03 A6 */ mtlr r0 /* 8001BE50 00018DB0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8001BE54 00018DB4 4E 80 00 20 */ blr +/* 8001BE54 00018DB4 4E 80 00 20 */ blr .global CompleteStateTransition__11CFrontEndUIFv CompleteStateTransition__11CFrontEndUIFv: @@ -605,7 +770,7 @@ lbl_8001BF30: /* 8001BF38 00018E98 83 C1 00 08 */ lwz r30, 8(r1) /* 8001BF3C 00018E9C 7C 08 03 A6 */ mtlr r0 /* 8001BF40 00018EA0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8001BF44 00018EA4 4E 80 00 20 */ blr +/* 8001BF44 00018EA4 4E 80 00 20 */ blr .global StartStateTransition__11CFrontEndUIFQ211CFrontEndUI7EScreen StartStateTransition__11CFrontEndUIFQ211CFrontEndUI7EScreen: @@ -743,7 +908,7 @@ lbl_8001C120: /* 8001C12C 0001908C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8001C130 00019090 7C 08 03 A6 */ mtlr r0 /* 8001C134 00019094 38 21 00 20 */ addi r1, r1, 0x20 -/* 8001C138 00019098 4E 80 00 20 */ blr +/* 8001C138 00019098 4E 80 00 20 */ blr .global CanShowSaveUI__11CFrontEndUIFv CanShowSaveUI__11CFrontEndUIFv: @@ -763,7 +928,7 @@ lbl_8001C168: /* 8001C168 000190C8 38 00 00 01 */ li r0, 1 lbl_8001C16C: /* 8001C16C 000190CC 7C 03 03 78 */ mr r3, r0 -/* 8001C170 000190D0 4E 80 00 20 */ blr +/* 8001C170 000190D0 4E 80 00 20 */ blr .global Draw__11CFrontEndUICFv Draw__11CFrontEndUICFv: @@ -796,7 +961,7 @@ lbl_8001C1CC: /* 8001C1D8 00019138 81 83 00 00 */ lwz r12, 0(r3) /* 8001C1DC 0001913C 81 8C 00 60 */ lwz r12, 0x60(r12) /* 8001C1E0 00019140 7D 89 03 A6 */ mtctr r12 -/* 8001C1E4 00019144 4E 80 04 21 */ bctrl +/* 8001C1E4 00019144 4E 80 04 21 */ bctrl /* 8001C1E8 00019148 80 8D A0 68 */ lwz r4, gpRender@sda21(r13) /* 8001C1EC 0001914C 38 61 00 20 */ addi r3, r1, 0x20 /* 8001C1F0 00019150 C0 22 82 A4 */ lfs f1, lbl_805A9FC4@sda21(r2) @@ -805,7 +970,7 @@ lbl_8001C1CC: /* 8001C1FC 0001915C C0 42 82 A8 */ lfs f2, lbl_805A9FC8@sda21(r2) /* 8001C200 00019160 81 8C 00 54 */ lwz r12, 0x54(r12) /* 8001C204 00019164 7D 89 03 A6 */ mtctr r12 -/* 8001C208 00019168 4E 80 04 21 */ bctrl +/* 8001C208 00019168 4E 80 04 21 */ bctrl /* 8001C20C 0001916C 80 7F 00 CC */ lwz r3, 0xcc(r31) /* 8001C210 00019170 3C 80 80 3F */ lis r4, lbl_803F0004@ha /* 8001C214 00019174 87 84 D9 10 */ lwzu r28, -0x26f0(r4) @@ -949,14 +1114,14 @@ lbl_8001C3DC: /* 8001C420 00019380 81 83 00 00 */ lwz r12, 0(r3) /* 8001C424 00019384 81 8C 00 64 */ lwz r12, 0x64(r12) /* 8001C428 00019388 7D 89 03 A6 */ mtctr r12 -/* 8001C42C 0001938C 4E 80 04 21 */ bctrl +/* 8001C42C 0001938C 4E 80 04 21 */ bctrl /* 8001C430 00019390 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 8001C434 00019394 38 80 00 00 */ li r4, 0 /* 8001C438 00019398 38 A0 00 00 */ li r5, 0 /* 8001C43C 0001939C 81 83 00 00 */ lwz r12, 0(r3) /* 8001C440 000193A0 81 8C 00 60 */ lwz r12, 0x60(r12) /* 8001C444 000193A4 7D 89 03 A6 */ mtctr r12 -/* 8001C448 000193A8 4E 80 04 21 */ bctrl +/* 8001C448 000193A8 4E 80 04 21 */ bctrl /* 8001C44C 000193AC C3 9F 00 64 */ lfs f28, 0x64(r31) /* 8001C450 000193B0 48 32 DB 5D */ bl White__6CColorFv /* 8001C454 000193B4 C0 02 82 AC */ lfs f0, lbl_805A9FCC@sda21(r2) @@ -1129,7 +1294,7 @@ lbl_8001C6A0: /* 8001C6C4 00019624 80 01 01 04 */ lwz r0, 0x104(r1) /* 8001C6C8 00019628 7C 08 03 A6 */ mtlr r0 /* 8001C6CC 0001962C 38 21 01 00 */ addi r1, r1, 0x100 -/* 8001C6D0 00019630 4E 80 00 20 */ blr +/* 8001C6D0 00019630 4E 80 00 20 */ blr .global ProcessUserInput__11CFrontEndUIFRC11CFinalInputR18CArchitectureQueue ProcessUserInput__11CFrontEndUIFRC11CFinalInputR18CArchitectureQueue: @@ -1412,7 +1577,7 @@ lbl_8001CABC: /* 8001CAC4 00019A24 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8001CAC8 00019A28 7C 08 03 A6 */ mtlr r0 /* 8001CACC 00019A2C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8001CAD0 00019A30 4E 80 00 20 */ blr +/* 8001CAD0 00019A30 4E 80 00 20 */ blr .global UpdateMovies__11CFrontEndUIFf UpdateMovies__11CFrontEndUIFf: @@ -1470,7 +1635,7 @@ lbl_8001CB80: /* 8001CB90 00019AF0 83 A1 00 0C */ lwz r29, 0xc(r1) /* 8001CB94 00019AF4 7C 08 03 A6 */ mtlr r0 /* 8001CB98 00019AF8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8001CB9C 00019AFC 4E 80 00 20 */ blr +/* 8001CB9C 00019AFC 4E 80 00 20 */ blr .global PumpMovieLoad__11CFrontEndUI PumpMovieLoad__11CFrontEndUI: @@ -1590,7 +1755,7 @@ lbl_8001CD34: /* 8001CD38 00019C98 80 01 01 34 */ lwz r0, 0x134(r1) /* 8001CD3C 00019C9C 7C 08 03 A6 */ mtlr r0 /* 8001CD40 00019CA0 38 21 01 30 */ addi r1, r1, 0x130 -/* 8001CD44 00019CA4 4E 80 00 20 */ blr +/* 8001CD44 00019CA4 4E 80 00 20 */ blr .global Update__11CFrontEndUIFfR18CArchitectureQueue Update__11CFrontEndUIFfR18CArchitectureQueue: @@ -1743,7 +1908,7 @@ lbl_8001CF5C: /* 8001CF64 00019EC4 81 83 00 00 */ lwz r12, 0(r3) /* 8001CF68 00019EC8 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 8001CF6C 00019ECC 7D 89 03 A6 */ mtctr r12 -/* 8001CF70 00019ED0 4E 80 04 21 */ bctrl +/* 8001CF70 00019ED0 4E 80 04 21 */ bctrl /* 8001CF74 00019ED4 80 9F 00 4C */ lwz r4, 0x4c(r31) /* 8001CF78 00019ED8 80 A3 00 04 */ lwz r5, 4(r3) /* 8001CF7C 00019EDC 38 7F 00 44 */ addi r3, r31, 0x44 @@ -2194,7 +2359,7 @@ lbl_8001D5A0: /* 8001D5C0 0001A520 83 81 00 40 */ lwz r28, 0x40(r1) /* 8001D5C4 0001A524 7C 08 03 A6 */ mtlr r0 /* 8001D5C8 0001A528 38 21 00 70 */ addi r1, r1, 0x70 -/* 8001D5CC 0001A52C 4E 80 00 20 */ blr +/* 8001D5CC 0001A52C 4E 80 00 20 */ blr .global PumpLoad__11CFrontEndUIFv PumpLoad__11CFrontEndUIFv: @@ -2246,7 +2411,7 @@ lbl_8001D668: /* 8001D66C 0001A5CC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8001D670 0001A5D0 7C 08 03 A6 */ mtlr r0 /* 8001D674 0001A5D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8001D678 0001A5D8 4E 80 00 20 */ blr +/* 8001D678 0001A5D8 4E 80 00 20 */ blr .global FinishedLoadingDepsGroup__11CFrontEndUIFv FinishedLoadingDepsGroup__11CFrontEndUIFv: @@ -2272,7 +2437,7 @@ lbl_8001D6B8: /* 8001D6C4 0001A624 81 84 00 00 */ lwz r12, 0(r4) /* 8001D6C8 0001A628 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8001D6CC 0001A62C 7D 89 03 A6 */ mtctr r12 -/* 8001D6D0 0001A630 4E 80 04 21 */ bctrl +/* 8001D6D0 0001A630 4E 80 04 21 */ bctrl /* 8001D6D4 0001A634 38 61 00 10 */ addi r3, r1, 0x10 /* 8001D6D8 0001A638 38 81 00 08 */ addi r4, r1, 8 /* 8001D6DC 0001A63C 48 32 37 CD */ bl __ct__6CTokenFRC6CToken @@ -2323,7 +2488,7 @@ lbl_8001D754: /* 8001D780 0001A6E0 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8001D784 0001A6E4 7C 08 03 A6 */ mtlr r0 /* 8001D788 0001A6E8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8001D78C 0001A6EC 4E 80 00 20 */ blr +/* 8001D78C 0001A6EC 4E 80 00 20 */ blr .global UpdateMusicVol__11CFrontEndUIFv UpdateMusicVol__11CFrontEndUIFv: @@ -2361,7 +2526,7 @@ lbl_8001D800: /* 8001D800 0001A760 80 01 00 24 */ lwz r0, 0x24(r1) /* 8001D804 0001A764 7C 08 03 A6 */ mtlr r0 /* 8001D808 0001A768 38 21 00 20 */ addi r1, r1, 0x20 -/* 8001D80C 0001A76C 4E 80 00 20 */ blr +/* 8001D80C 0001A76C 4E 80 00 20 */ blr .global OnMessage__11CFrontEndUIFRC20CArchitectureMessageR18CArchitectureQueue OnMessage__11CFrontEndUIFRC20CArchitectureMessageR18CArchitectureQueue: @@ -2413,7 +2578,7 @@ lbl_8001D8A4: /* 8001D8AC 0001A80C 83 C1 00 08 */ lwz r30, 8(r1) /* 8001D8B0 0001A810 7C 08 03 A6 */ mtlr r0 /* 8001D8B4 0001A814 38 21 00 10 */ addi r1, r1, 0x10 -/* 8001D8B8 0001A818 4E 80 00 20 */ blr +/* 8001D8B8 0001A818 4E 80 00 20 */ blr .global TransitionToFive__11CFrontEndUIFv TransitionToFive__11CFrontEndUIFv: @@ -2464,7 +2629,7 @@ lbl_8001D964: /* 8001D968 0001A8C8 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8001D96C 0001A8CC 7C 08 03 A6 */ mtlr r0 /* 8001D970 0001A8D0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8001D974 0001A8D4 4E 80 00 20 */ blr +/* 8001D974 0001A8D4 4E 80 00 20 */ blr .global __dt__11CFrontEndUIFv __dt__11CFrontEndUIFv: @@ -2640,7 +2805,7 @@ lbl_8001DBB4: /* 8001DBC8 0001AB28 83 81 00 30 */ lwz r28, 0x30(r1) /* 8001DBCC 0001AB2C 7C 08 03 A6 */ mtlr r0 /* 8001DBD0 0001AB30 38 21 00 40 */ addi r1, r1, 0x40 -/* 8001DBD4 0001AB34 4E 80 00 20 */ blr +/* 8001DBD4 0001AB34 4E 80 00 20 */ blr .global __ct__11CFrontEndUIFR18CArchitectureQueue __ct__11CFrontEndUIFR18CArchitectureQueue: @@ -2691,7 +2856,7 @@ __ct__11CFrontEndUIFR18CArchitectureQueue: /* 8001DC88 0001ABE8 81 84 00 00 */ lwz r12, 0(r4) /* 8001DC8C 0001ABEC 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8001DC90 0001ABF0 7D 89 03 A6 */ mtctr r12 -/* 8001DC94 0001ABF4 4E 80 04 21 */ bctrl +/* 8001DC94 0001ABF4 4E 80 04 21 */ bctrl /* 8001DC98 0001ABF8 38 7F 00 20 */ addi r3, r31, 0x20 /* 8001DC9C 0001ABFC 38 81 00 20 */ addi r4, r1, 0x20 /* 8001DCA0 0001AC00 48 32 32 09 */ bl __ct__6CTokenFRC6CToken @@ -2710,7 +2875,7 @@ __ct__11CFrontEndUIFR18CArchitectureQueue: /* 8001DCD4 0001AC34 81 84 00 00 */ lwz r12, 0(r4) /* 8001DCD8 0001AC38 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8001DCDC 0001AC3C 7D 89 03 A6 */ mtctr r12 -/* 8001DCE0 0001AC40 4E 80 04 21 */ bctrl +/* 8001DCE0 0001AC40 4E 80 04 21 */ bctrl /* 8001DCE4 0001AC44 3B DF 00 38 */ addi r30, r31, 0x38 /* 8001DCE8 0001AC48 38 81 00 18 */ addi r4, r1, 0x18 /* 8001DCEC 0001AC4C 7F C3 F3 78 */ mr r3, r30 @@ -2726,7 +2891,7 @@ __ct__11CFrontEndUIFR18CArchitectureQueue: /* 8001DD14 0001AC74 81 84 00 00 */ lwz r12, 0(r4) /* 8001DD18 0001AC78 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8001DD1C 0001AC7C 7D 89 03 A6 */ mtctr r12 -/* 8001DD20 0001AC80 4E 80 04 21 */ bctrl +/* 8001DD20 0001AC80 4E 80 04 21 */ bctrl /* 8001DD24 0001AC84 3B DF 00 44 */ addi r30, r31, 0x44 /* 8001DD28 0001AC88 38 81 00 10 */ addi r4, r1, 0x10 /* 8001DD2C 0001AC8C 7F C3 F3 78 */ mr r3, r30 @@ -2838,7 +3003,7 @@ lbl_8001DE68: /* 8001DEBC 0001AE1C 81 83 00 00 */ lwz r12, 0(r3) /* 8001DEC0 0001AE20 81 8C 00 18 */ lwz r12, 0x18(r12) /* 8001DEC4 0001AE24 7D 89 03 A6 */ mtctr r12 -/* 8001DEC8 0001AE28 4E 80 04 21 */ bctrl +/* 8001DEC8 0001AE28 4E 80 04 21 */ bctrl /* 8001DECC 0001AE2C 38 7F 00 20 */ addi r3, r31, 0x20 /* 8001DED0 0001AE30 48 32 2E B5 */ bl Lock__6CTokenFv /* 8001DED4 0001AE34 3B C0 00 00 */ li r30, 0 @@ -2860,7 +3025,7 @@ lbl_8001DF00: /* 8001DF0C 0001AE6C 83 C1 00 38 */ lwz r30, 0x38(r1) /* 8001DF10 0001AE70 7C 08 03 A6 */ mtlr r0 /* 8001DF14 0001AE74 38 21 00 40 */ addi r1, r1, 0x40 -/* 8001DF18 0001AE78 4E 80 00 20 */ blr +/* 8001DF18 0001AE78 4E 80 00 20 */ blr .global CanBuild__11CResFactoryFRC10SObjectTag CanBuild__11CResFactoryFRC10SObjectTag: @@ -2872,7 +3037,7 @@ CanBuild__11CResFactoryFRC10SObjectTag: /* 8001DF30 0001AE90 80 01 00 14 */ lwz r0, 0x14(r1) /* 8001DF34 0001AE94 7C 08 03 A6 */ mtlr r0 /* 8001DF38 0001AE98 38 21 00 10 */ addi r1, r1, 0x10 -/* 8001DF3C 0001AE9C 4E 80 00 20 */ blr +/* 8001DF3C 0001AE9C 4E 80 00 20 */ blr .global DoOptionsCancel__17SFusionBonusFrameFPC14CGuiTableGroup DoOptionsCancel__17SFusionBonusFrameFPC14CGuiTableGroup: @@ -2928,7 +3093,7 @@ lbl_8001DFF4: /* 8001DFF8 0001AF58 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8001DFFC 0001AF5C 7C 08 03 A6 */ mtlr r0 /* 8001E000 0001AF60 38 21 00 30 */ addi r1, r1, 0x30 -/* 8001E004 0001AF64 4E 80 00 20 */ blr +/* 8001E004 0001AF64 4E 80 00 20 */ blr .global DoSelectionChange__17SFusionBonusFrameFPC14CGuiTableGroup DoSelectionChange__17SFusionBonusFrameFPC14CGuiTableGroup: @@ -2994,7 +3159,7 @@ lbl_8001E0D4: /* 8001E0EC 0001B04C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8001E0F0 0001B050 7C 08 03 A6 */ mtlr r0 /* 8001E0F4 0001B054 38 21 00 20 */ addi r1, r1, 0x20 -/* 8001E0F8 0001B058 4E 80 00 20 */ blr +/* 8001E0F8 0001B058 4E 80 00 20 */ blr .global DoOptionsAdvance__17SFusionBonusFrameFPC14CGuiTableGroup DoOptionsAdvance__17SFusionBonusFrameFPC14CGuiTableGroup: @@ -3103,7 +3268,7 @@ lbl_8001E268: /* 8001E270 0001B1D0 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8001E274 0001B1D4 7C 08 03 A6 */ mtlr r0 /* 8001E278 0001B1D8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8001E27C 0001B1DC 4E 80 00 20 */ blr +/* 8001E27C 0001B1DC 4E 80 00 20 */ blr .global SetTableColors__17SFusionBonusFrameFP14CGuiTableGroup SetTableColors__17SFusionBonusFrameFP14CGuiTableGroup: @@ -3128,14 +3293,14 @@ SetTableColors__17SFusionBonusFrameFP14CGuiTableGroup: /* 8001E2C8 0001B228 80 01 00 14 */ lwz r0, 0x14(r1) /* 8001E2CC 0001B22C 7C 08 03 A6 */ mtlr r0 /* 8001E2D0 0001B230 38 21 00 10 */ addi r1, r1, 0x10 -/* 8001E2D4 0001B234 4E 80 00 20 */ blr +/* 8001E2D4 0001B234 4E 80 00 20 */ blr .global sub_8001e2d8 sub_8001e2d8: /* 8001E2D8 0001B238 38 00 00 00 */ li r0, 0 /* 8001E2DC 0001B23C 98 03 00 3A */ stb r0, 0x3a(r3) /* 8001E2E0 0001B240 98 03 00 39 */ stb r0, 0x39(r3) -/* 8001E2E4 0001B244 4E 80 00 20 */ blr +/* 8001E2E4 0001B244 4E 80 00 20 */ blr .global FinishedLoading__17SFusionBonusFrameFv FinishedLoading__17SFusionBonusFrameFv: @@ -3366,7 +3531,7 @@ FinishedLoading__17SFusionBonusFrameFv: /* 8001E668 0001B5C8 83 A1 00 F4 */ lwz r29, 0xf4(r1) /* 8001E66C 0001B5CC 7C 08 03 A6 */ mtlr r0 /* 8001E670 0001B5D0 38 21 01 00 */ addi r1, r1, 0x100 -/* 8001E674 0001B5D4 4E 80 00 20 */ blr +/* 8001E674 0001B5D4 4E 80 00 20 */ blr .global sub_8001e678 sub_8001e678: @@ -3387,14 +3552,14 @@ sub_8001e678: /* 8001E6B0 0001B610 7F E5 FB 78 */ mr r5, r31 /* 8001E6B4 0001B614 39 81 00 08 */ addi r12, r1, 8 /* 8001E6B8 0001B618 48 36 B2 75 */ bl __ptmf_scall -/* 8001E6BC 0001B61C 60 00 00 00 */ nop +/* 8001E6BC 0001B61C 60 00 00 00 */ nop /* 8001E6C0 0001B620 80 01 00 34 */ lwz r0, 0x34(r1) /* 8001E6C4 0001B624 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8001E6C8 0001B628 83 C1 00 28 */ lwz r30, 0x28(r1) /* 8001E6CC 0001B62C 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8001E6D0 0001B630 7C 08 03 A6 */ mtlr r0 /* 8001E6D4 0001B634 38 21 00 30 */ addi r1, r1, 0x30 -/* 8001E6D8 0001B638 4E 80 00 20 */ blr +/* 8001E6D8 0001B638 4E 80 00 20 */ blr .global sub_8001e6dc sub_8001e6dc: @@ -3412,13 +3577,13 @@ sub_8001e6dc: /* 8001E708 0001B668 7F E4 FB 78 */ mr r4, r31 /* 8001E70C 0001B66C 39 81 00 08 */ addi r12, r1, 8 /* 8001E710 0001B670 48 36 B2 1D */ bl __ptmf_scall -/* 8001E714 0001B674 60 00 00 00 */ nop +/* 8001E714 0001B674 60 00 00 00 */ nop /* 8001E718 0001B678 80 01 00 24 */ lwz r0, 0x24(r1) /* 8001E71C 0001B67C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8001E720 0001B680 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8001E724 0001B684 7C 08 03 A6 */ mtlr r0 /* 8001E728 0001B688 38 21 00 20 */ addi r1, r1, 0x20 -/* 8001E72C 0001B68C 4E 80 00 20 */ blr +/* 8001E72C 0001B68C 4E 80 00 20 */ blr .global PumpLoad__17SFusionBonusFrameFv PumpLoad__17SFusionBonusFrameFv: @@ -3504,7 +3669,7 @@ lbl_8001E840: /* 8001E848 0001B7A8 83 C1 00 08 */ lwz r30, 8(r1) /* 8001E84C 0001B7AC 7C 08 03 A6 */ mtlr r0 /* 8001E850 0001B7B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8001E854 0001B7B4 4E 80 00 20 */ blr +/* 8001E854 0001B7B4 4E 80 00 20 */ blr .global ProcessUserInput__17SFusionBonusFrameFRC11CFinalInputRC15CSaveGameScreen ProcessUserInput__17SFusionBonusFrameFRC11CFinalInputRC15CSaveGameScreen: @@ -3574,7 +3739,7 @@ lbl_8001E934: /* 8001E944 0001B8A4 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8001E948 0001B8A8 7C 08 03 A6 */ mtlr r0 /* 8001E94C 0001B8AC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8001E950 0001B8B0 4E 80 00 20 */ blr +/* 8001E950 0001B8B0 4E 80 00 20 */ blr .global Update__17SFusionBonusFrameFv Update__17SFusionBonusFrameFv: @@ -3704,7 +3869,7 @@ lbl_8001EAF4: /* 8001EB00 0001BA60 80 01 00 34 */ lwz r0, 0x34(r1) /* 8001EB04 0001BA64 7C 08 03 A6 */ mtlr r0 /* 8001EB08 0001BA68 38 21 00 30 */ addi r1, r1, 0x30 -/* 8001EB0C 0001BA6C 4E 80 00 20 */ blr +/* 8001EB0C 0001BA6C 4E 80 00 20 */ blr .global Draw__17SFusionBonusFrameFv Draw__17SFusionBonusFrameFv: @@ -3733,7 +3898,7 @@ lbl_8001EB58: .global lbl_8001EB60 lbl_8001EB60: /* 8001EB60 0001BAC0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8001EB64 0001BAC4 4E 80 00 20 */ blr +/* 8001EB64 0001BAC4 4E 80 00 20 */ blr .global __dt__17SFusionBonusFrameFv __dt__17SFusionBonusFrameFv: @@ -3784,7 +3949,7 @@ lbl_8001EBF8: /* 8001EC04 0001BB64 83 C1 00 08 */ lwz r30, 8(r1) /* 8001EC08 0001BB68 7C 08 03 A6 */ mtlr r0 /* 8001EC0C 0001BB6C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8001EC10 0001BB70 4E 80 00 20 */ blr +/* 8001EC10 0001BB70 4E 80 00 20 */ blr .global __ct__17SFusionBonusFrameFv __ct__17SFusionBonusFrameFv: @@ -3818,7 +3983,7 @@ lbl_8001EC5C: /* 8001EC7C 0001BBDC 81 84 00 00 */ lwz r12, 0(r4) /* 8001EC80 0001BBE0 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8001EC84 0001BBE4 7D 89 03 A6 */ mtctr r12 -/* 8001EC88 0001BBE8 4E 80 04 21 */ bctrl +/* 8001EC88 0001BBE8 4E 80 04 21 */ bctrl /* 8001EC8C 0001BBEC 3B DF 00 0C */ addi r30, r31, 0xc /* 8001EC90 0001BBF0 38 81 00 10 */ addi r4, r1, 0x10 /* 8001EC94 0001BBF4 7F C3 F3 78 */ mr r3, r30 @@ -3836,7 +4001,7 @@ lbl_8001EC5C: /* 8001ECC4 0001BC24 38 A5 02 24 */ addi r5, r5, 0x224 /* 8001ECC8 0001BC28 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8001ECCC 0001BC2C 7D 89 03 A6 */ mtctr r12 -/* 8001ECD0 0001BC30 4E 80 04 21 */ bctrl +/* 8001ECD0 0001BC30 4E 80 04 21 */ bctrl /* 8001ECD4 0001BC34 3B DF 00 18 */ addi r30, r31, 0x18 /* 8001ECD8 0001BC38 38 81 00 08 */ addi r4, r1, 8 /* 8001ECDC 0001BC3C 7F C3 F3 78 */ mr r3, r30 @@ -3866,7 +4031,7 @@ lbl_8001EC5C: /* 8001ED3C 0001BC9C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8001ED40 0001BCA0 7C 08 03 A6 */ mtlr r0 /* 8001ED44 0001BCA4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8001ED48 0001BCA8 4E 80 00 20 */ blr +/* 8001ED48 0001BCA8 4E 80 00 20 */ blr .global DoPopupCancel__19SNewFileSelectFrameFPC14CGuiTableGroup DoPopupCancel__19SNewFileSelectFrameFPC14CGuiTableGroup: @@ -3910,7 +4075,7 @@ lbl_8001EDD4: /* 8001EDD8 0001BD38 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8001EDDC 0001BD3C 7C 08 03 A6 */ mtlr r0 /* 8001EDE0 0001BD40 38 21 00 20 */ addi r1, r1, 0x20 -/* 8001EDE4 0001BD44 4E 80 00 20 */ blr +/* 8001EDE4 0001BD44 4E 80 00 20 */ blr .global DoPopupAdvance__19SNewFileSelectFrameFPC14CGuiTableGroup DoPopupAdvance__19SNewFileSelectFrameFPC14CGuiTableGroup: @@ -3991,7 +4156,7 @@ lbl_8001EEEC: /* 8001EEF4 0001BE54 83 C1 00 08 */ lwz r30, 8(r1) /* 8001EEF8 0001BE58 7C 08 03 A6 */ mtlr r0 /* 8001EEFC 0001BE5C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8001EF00 0001BE60 4E 80 00 20 */ blr +/* 8001EF00 0001BE60 4E 80 00 20 */ blr .global DoFileselectCancel__19SNewFileSelectFrameFPC14CGuiTableGroup DoFileselectCancel__19SNewFileSelectFrameFPC14CGuiTableGroup: @@ -4019,7 +4184,7 @@ lbl_8001EF50: /* 8001EF54 0001BEB4 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8001EF58 0001BEB8 7C 08 03 A6 */ mtlr r0 /* 8001EF5C 0001BEBC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8001EF60 0001BEC0 4E 80 00 20 */ blr +/* 8001EF60 0001BEC0 4E 80 00 20 */ blr .global DoSelectionChange__19SNewFileSelectFrameFPC14CGuiTableGroup DoSelectionChange__19SNewFileSelectFrameFPC14CGuiTableGroup: @@ -4039,7 +4204,7 @@ DoSelectionChange__19SNewFileSelectFrameFPC14CGuiTableGroup: /* 8001EF98 0001BEF8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8001EF9C 0001BEFC 7C 08 03 A6 */ mtlr r0 /* 8001EFA0 0001BF00 38 21 00 10 */ addi r1, r1, 0x10 -/* 8001EFA4 0001BF04 4E 80 00 20 */ blr +/* 8001EFA4 0001BF04 4E 80 00 20 */ blr .global IsTextDoneAnimating__19SNewFileSelectFrameFv IsTextDoneAnimating__19SNewFileSelectFrameFv: @@ -4106,7 +4271,7 @@ lbl_8001F068: .global sub_8001f080 sub_8001f080: -/* 8001F080 0001BFE0 4E 80 00 20 */ blr +/* 8001F080 0001BFE0 4E 80 00 20 */ blr .global DeactivateExistingGamePopup__19SNewFileSelectFrameFv DeactivateExistingGamePopup__19SNewFileSelectFrameFv: @@ -4143,7 +4308,7 @@ DeactivateExistingGamePopup__19SNewFileSelectFrameFv: /* 8001F0FC 0001C05C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8001F100 0001C060 7C 08 03 A6 */ mtlr r0 /* 8001F104 0001C064 38 21 00 20 */ addi r1, r1, 0x20 -/* 8001F108 0001C068 4E 80 00 20 */ blr +/* 8001F108 0001C068 4E 80 00 20 */ blr .global ActivateExistingGamePopup__19SNewFileSelectFrameFv ActivateExistingGamePopup__19SNewFileSelectFrameFv: @@ -4242,7 +4407,7 @@ ActivateExistingGamePopup__19SNewFileSelectFrameFv: /* 8001F27C 0001C1DC 83 C1 00 98 */ lwz r30, 0x98(r1) /* 8001F280 0001C1E0 7C 08 03 A6 */ mtlr r0 /* 8001F284 0001C1E4 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8001F288 0001C1E8 4E 80 00 20 */ blr +/* 8001F288 0001C1E8 4E 80 00 20 */ blr .global DeactivateNewGamePopup__19SNewFileSelectFrameFv DeactivateNewGamePopup__19SNewFileSelectFrameFv: @@ -4265,7 +4430,7 @@ DeactivateNewGamePopup__19SNewFileSelectFrameFv: /* 8001F2CC 0001C22C 81 83 00 00 */ lwz r12, 0(r3) /* 8001F2D0 0001C230 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 8001F2D4 0001C234 7D 89 03 A6 */ mtctr r12 -/* 8001F2D8 0001C238 4E 80 04 21 */ bctrl +/* 8001F2D8 0001C238 4E 80 04 21 */ bctrl /* 8001F2DC 0001C23C 88 03 00 B6 */ lbz r0, 0xb6(r3) /* 8001F2E0 0001C240 38 80 00 00 */ li r4, 0 /* 8001F2E4 0001C244 50 80 26 F6 */ rlwimi r0, r4, 4, 0x1b, 0x1b @@ -4275,7 +4440,7 @@ DeactivateNewGamePopup__19SNewFileSelectFrameFv: /* 8001F2F4 0001C254 81 83 00 00 */ lwz r12, 0(r3) /* 8001F2F8 0001C258 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 8001F2FC 0001C25C 7D 89 03 A6 */ mtctr r12 -/* 8001F300 0001C260 4E 80 04 21 */ bctrl +/* 8001F300 0001C260 4E 80 04 21 */ bctrl /* 8001F304 0001C264 38 80 00 00 */ li r4, 0 /* 8001F308 0001C268 38 A0 00 01 */ li r5, 1 /* 8001F30C 0001C26C 48 2A B3 DD */ bl SetVisibility__10CGuiWidgetFb14ETraversalMode @@ -4314,7 +4479,7 @@ DeactivateNewGamePopup__19SNewFileSelectFrameFv: /* 8001F390 0001C2F0 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8001F394 0001C2F4 7C 08 03 A6 */ mtlr r0 /* 8001F398 0001C2F8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8001F39C 0001C2FC 4E 80 00 20 */ blr +/* 8001F39C 0001C2FC 4E 80 00 20 */ blr .global ActivateNewGamePopup__19SNewFileSelectFrameFv ActivateNewGamePopup__19SNewFileSelectFrameFv: @@ -4425,7 +4590,7 @@ ActivateNewGamePopup__19SNewFileSelectFrameFv: /* 8001F540 0001C4A0 81 83 00 00 */ lwz r12, 0(r3) /* 8001F544 0001C4A4 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 8001F548 0001C4A8 7D 89 03 A6 */ mtctr r12 -/* 8001F54C 0001C4AC 4E 80 04 21 */ bctrl +/* 8001F54C 0001C4AC 4E 80 04 21 */ bctrl /* 8001F550 0001C4B0 88 03 00 B6 */ lbz r0, 0xb6(r3) /* 8001F554 0001C4B4 38 80 00 01 */ li r4, 1 /* 8001F558 0001C4B8 50 80 26 F6 */ rlwimi r0, r4, 4, 0x1b, 0x1b @@ -4435,7 +4600,7 @@ ActivateNewGamePopup__19SNewFileSelectFrameFv: /* 8001F568 0001C4C8 81 83 00 00 */ lwz r12, 0(r3) /* 8001F56C 0001C4CC 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 8001F570 0001C4D0 7D 89 03 A6 */ mtctr r12 -/* 8001F574 0001C4D4 4E 80 04 21 */ bctrl +/* 8001F574 0001C4D4 4E 80 04 21 */ bctrl /* 8001F578 0001C4D8 38 80 00 01 */ li r4, 1 /* 8001F57C 0001C4DC 38 A0 00 01 */ li r5, 1 /* 8001F580 0001C4E0 48 2A B1 69 */ bl SetVisibility__10CGuiWidgetFb14ETraversalMode @@ -4490,7 +4655,7 @@ lbl_8001F600: /* 8001F63C 0001C59C 83 C1 00 D8 */ lwz r30, 0xd8(r1) /* 8001F640 0001C5A0 7C 08 03 A6 */ mtlr r0 /* 8001F644 0001C5A4 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 8001F648 0001C5A8 4E 80 00 20 */ blr +/* 8001F648 0001C5A8 4E 80 00 20 */ blr .global ResetFrame__19SNewFileSelectFrameFv ResetFrame__19SNewFileSelectFrameFv: @@ -4535,7 +4700,7 @@ lbl_8001F6D8: /* 8001F6E0 0001C640 81 83 00 00 */ lwz r12, 0(r3) /* 8001F6E4 0001C644 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 8001F6E8 0001C648 7D 89 03 A6 */ mtctr r12 -/* 8001F6EC 0001C64C 4E 80 04 21 */ bctrl +/* 8001F6EC 0001C64C 4E 80 04 21 */ bctrl /* 8001F6F0 0001C650 88 03 00 B6 */ lbz r0, 0xb6(r3) /* 8001F6F4 0001C654 53 E0 26 F6 */ rlwimi r0, r31, 4, 0x1b, 0x1b /* 8001F6F8 0001C658 37 DE FF FF */ addic. r30, r30, -1 @@ -4557,7 +4722,7 @@ lbl_8001F6D8: /* 8001F738 0001C698 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8001F73C 0001C69C 7C 08 03 A6 */ mtlr r0 /* 8001F740 0001C6A0 38 21 00 30 */ addi r1, r1, 0x30 -/* 8001F744 0001C6A4 4E 80 00 20 */ blr +/* 8001F744 0001C6A4 4E 80 00 20 */ blr .global EnterErase__19SNewFileSelectFrameFv EnterErase__19SNewFileSelectFrameFv: @@ -4679,7 +4844,7 @@ lbl_8001F8A0: /* 8001F908 0001C868 80 01 00 74 */ lwz r0, 0x74(r1) /* 8001F90C 0001C86C 7C 08 03 A6 */ mtlr r0 /* 8001F910 0001C870 38 21 00 70 */ addi r1, r1, 0x70 -/* 8001F914 0001C874 4E 80 00 20 */ blr +/* 8001F914 0001C874 4E 80 00 20 */ blr .global ClearFrameContents__19SNewFileSelectFrameFv ClearFrameContents__19SNewFileSelectFrameFv: @@ -4850,7 +5015,7 @@ lbl_8001FB78: /* 8001FB94 0001CAF4 81 83 00 00 */ lwz r12, 0(r3) /* 8001FB98 0001CAF8 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 8001FB9C 0001CAFC 7D 89 03 A6 */ mtctr r12 -/* 8001FBA0 0001CB00 4E 80 04 21 */ bctrl +/* 8001FBA0 0001CB00 4E 80 04 21 */ bctrl /* 8001FBA4 0001CB04 7C 7E 1B 78 */ mr r30, r3 /* 8001FBA8 0001CB08 48 27 B6 2D */ bl SlideShowGalleryFlags__10CSlideShowFv /* 8001FBAC 0001CB0C 28 03 00 00 */ cmplwi r3, 0 @@ -4895,7 +5060,7 @@ lbl_8001FC20: /* 8001FC40 0001CBA0 80 01 00 D4 */ lwz r0, 0xd4(r1) /* 8001FC44 0001CBA4 7C 08 03 A6 */ mtlr r0 /* 8001FC48 0001CBA8 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 8001FC4C 0001CBAC 4E 80 00 20 */ blr +/* 8001FC4C 0001CBAC 4E 80 00 20 */ blr .global SetupFrameContents__19SNewFileSelectFrameFv SetupFrameContents__19SNewFileSelectFrameFv: @@ -5178,7 +5343,7 @@ lbl_80020038: /* 80020054 0001CFB4 80 01 01 64 */ lwz r0, 0x164(r1) /* 80020058 0001CFB8 7C 08 03 A6 */ mtlr r0 /* 8002005C 0001CFBC 38 21 01 60 */ addi r1, r1, 0x160 -/* 80020060 0001CFC0 4E 80 00 20 */ blr +/* 80020060 0001CFC0 4E 80 00 20 */ blr .global sub_80020064 sub_80020064: @@ -5204,7 +5369,7 @@ sub_80020064: /* 800200B0 0001D010 83 C1 00 18 */ lwz r30, 0x18(r1) /* 800200B4 0001D014 7C 08 03 A6 */ mtlr r0 /* 800200B8 0001D018 38 21 00 20 */ addi r1, r1, 0x20 -/* 800200BC 0001D01C 4E 80 00 20 */ blr +/* 800200BC 0001D01C 4E 80 00 20 */ blr .global DoFileselectAdvance__19SNewFileSelectFrameFPC14CGuiTableGroup DoFileselectAdvance__19SNewFileSelectFrameFPC14CGuiTableGroup: @@ -5267,7 +5432,7 @@ lbl_80020180: /* 80020188 0001D0E8 83 C1 00 08 */ lwz r30, 8(r1) /* 8002018C 0001D0EC 7C 08 03 A6 */ mtlr r0 /* 80020190 0001D0F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80020194 0001D0F4 4E 80 00 20 */ blr +/* 80020194 0001D0F4 4E 80 00 20 */ blr .global HandleActiveChange__19SNewFileSelectFrameFP10CGuiWidget HandleActiveChange__19SNewFileSelectFrameFP10CGuiWidget: @@ -5354,7 +5519,7 @@ lbl_800202B8: /* 800202C4 0001D224 83 A1 00 64 */ lwz r29, 0x64(r1) /* 800202C8 0001D228 7C 08 03 A6 */ mtlr r0 /* 800202CC 0001D22C 38 21 00 70 */ addi r1, r1, 0x70 -/* 800202D0 0001D230 4E 80 00 20 */ blr +/* 800202D0 0001D230 4E 80 00 20 */ blr .global Draw__19SNewFileSelectFrameFv Draw__19SNewFileSelectFrameFv: @@ -5375,7 +5540,7 @@ lbl_80020308: /* 80020308 0001D268 80 01 00 14 */ lwz r0, 0x14(r1) /* 8002030C 0001D26C 7C 08 03 A6 */ mtlr r0 /* 80020310 0001D270 38 21 00 10 */ addi r1, r1, 0x10 -/* 80020314 0001D274 4E 80 00 20 */ blr +/* 80020314 0001D274 4E 80 00 20 */ blr .global ProcessUserInput__19SNewFileSelectFrameFRC11CFinalInput ProcessUserInput__19SNewFileSelectFrameFRC11CFinalInput: @@ -5434,7 +5599,7 @@ lbl_800203C0: /* 800203D0 0001D330 81 83 00 00 */ lwz r12, 0(r3) /* 800203D4 0001D334 81 8C 00 24 */ lwz r12, 0x24(r12) /* 800203D8 0001D338 7D 89 03 A6 */ mtctr r12 -/* 800203DC 0001D33C 4E 80 04 21 */ bctrl +/* 800203DC 0001D33C 4E 80 04 21 */ bctrl /* 800203E0 0001D340 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800203E4 0001D344 41 82 00 10 */ beq lbl_800203F4 /* 800203E8 0001D348 7F C3 F3 78 */ mr r3, r30 @@ -5454,7 +5619,7 @@ lbl_80020404: /* 80020414 0001D374 81 83 00 00 */ lwz r12, 0(r3) /* 80020418 0001D378 81 8C 00 24 */ lwz r12, 0x24(r12) /* 8002041C 0001D37C 7D 89 03 A6 */ mtctr r12 -/* 80020420 0001D380 4E 80 04 21 */ bctrl +/* 80020420 0001D380 4E 80 04 21 */ bctrl /* 80020424 0001D384 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80020428 0001D388 41 82 00 10 */ beq lbl_80020438 /* 8002042C 0001D38C 7F C3 F3 78 */ mr r3, r30 @@ -5474,13 +5639,13 @@ lbl_8002044C: /* 80020454 0001D3B4 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80020458 0001D3B8 7C 08 03 A6 */ mtlr r0 /* 8002045C 0001D3BC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80020460 0001D3C0 4E 80 00 20 */ blr +/* 80020460 0001D3C0 4E 80 00 20 */ blr .global sub_80020464 sub_80020464: /* 80020464 0001D3C4 88 03 00 B6 */ lbz r0, 0xb6(r3) /* 80020468 0001D3C8 54 03 DF FE */ rlwinm r3, r0, 0x1b, 0x1f, 0x1f -/* 8002046C 0001D3CC 4E 80 00 20 */ blr +/* 8002046C 0001D3CC 4E 80 00 20 */ blr .global Update__19SNewFileSelectFrameFf Update__19SNewFileSelectFrameFf: @@ -5534,7 +5699,7 @@ lbl_80020504: /* 8002051C 0001D47C 83 C1 00 10 */ lwz r30, 0x10(r1) /* 80020520 0001D480 7C 08 03 A6 */ mtlr r0 /* 80020524 0001D484 38 21 00 20 */ addi r1, r1, 0x20 -/* 80020528 0001D488 4E 80 00 20 */ blr +/* 80020528 0001D488 4E 80 00 20 */ blr .global GetUserFileSelection__19SNewFileSelectFrameCFv GetUserFileSelection__19SNewFileSelectFrameCFv: @@ -5546,7 +5711,7 @@ GetUserFileSelection__19SNewFileSelectFrameCFv: /* 80020540 0001D4A0 54 80 0F FE */ srwi r0, r4, 0x1f /* 80020544 0001D4A4 7C 00 19 10 */ subfe r0, r0, r3 /* 80020548 0001D4A8 7C 83 00 38 */ and r3, r4, r0 -/* 8002054C 0001D4AC 4E 80 00 20 */ blr +/* 8002054C 0001D4AC 4E 80 00 20 */ blr .global FinishedLoading__19SNewFileSelectFrame FinishedLoading__19SNewFileSelectFrame: @@ -5699,7 +5864,7 @@ lbl_80020768: /* 80020794 0001D6F4 81 83 00 00 */ lwz r12, 0(r3) /* 80020798 0001D6F8 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 8002079C 0001D6FC 7D 89 03 A6 */ mtctr r12 -/* 800207A0 0001D700 4E 80 04 21 */ bctrl +/* 800207A0 0001D700 4E 80 04 21 */ bctrl /* 800207A4 0001D704 88 03 00 B6 */ lbz r0, 0xb6(r3) /* 800207A8 0001D708 38 80 00 00 */ li r4, 0 /* 800207AC 0001D70C 50 80 26 F6 */ rlwimi r0, r4, 4, 0x1b, 0x1b @@ -5709,7 +5874,7 @@ lbl_80020768: /* 800207BC 0001D71C 81 83 00 00 */ lwz r12, 0(r3) /* 800207C0 0001D720 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 800207C4 0001D724 7D 89 03 A6 */ mtctr r12 -/* 800207C8 0001D728 4E 80 04 21 */ bctrl +/* 800207C8 0001D728 4E 80 04 21 */ bctrl /* 800207CC 0001D72C 38 80 00 00 */ li r4, 0 /* 800207D0 0001D730 38 A0 00 01 */ li r5, 1 /* 800207D4 0001D734 48 2A 9F 15 */ bl SetVisibility__10CGuiWidgetFb14ETraversalMode @@ -5937,7 +6102,7 @@ lbl_80020AC8: /* 80020B24 0001DA84 80 01 01 E4 */ lwz r0, 0x1e4(r1) /* 80020B28 0001DA88 7C 08 03 A6 */ mtlr r0 /* 80020B2C 0001DA8C 38 21 01 E0 */ addi r1, r1, 0x1e0 -/* 80020B30 0001DA90 4E 80 00 20 */ blr +/* 80020B30 0001DA90 4E 80 00 20 */ blr .global sub_80020b34 sub_80020b34: @@ -5958,14 +6123,14 @@ sub_80020b34: /* 80020B6C 0001DACC 7F E5 FB 78 */ mr r5, r31 /* 80020B70 0001DAD0 39 81 00 08 */ addi r12, r1, 8 /* 80020B74 0001DAD4 48 36 8D B9 */ bl __ptmf_scall -/* 80020B78 0001DAD8 60 00 00 00 */ nop +/* 80020B78 0001DAD8 60 00 00 00 */ nop /* 80020B7C 0001DADC 80 01 00 34 */ lwz r0, 0x34(r1) /* 80020B80 0001DAE0 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 80020B84 0001DAE4 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80020B88 0001DAE8 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80020B8C 0001DAEC 7C 08 03 A6 */ mtlr r0 /* 80020B90 0001DAF0 38 21 00 30 */ addi r1, r1, 0x30 -/* 80020B94 0001DAF4 4E 80 00 20 */ blr +/* 80020B94 0001DAF4 4E 80 00 20 */ blr .global sub_80020b98 sub_80020b98: @@ -5983,13 +6148,13 @@ sub_80020b98: /* 80020BC4 0001DB24 7F E4 FB 78 */ mr r4, r31 /* 80020BC8 0001DB28 39 81 00 08 */ addi r12, r1, 8 /* 80020BCC 0001DB2C 48 36 8D 61 */ bl __ptmf_scall -/* 80020BD0 0001DB30 60 00 00 00 */ nop +/* 80020BD0 0001DB30 60 00 00 00 */ nop /* 80020BD4 0001DB34 80 01 00 24 */ lwz r0, 0x24(r1) /* 80020BD8 0001DB38 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80020BDC 0001DB3C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80020BE0 0001DB40 7C 08 03 A6 */ mtlr r0 /* 80020BE4 0001DB44 38 21 00 20 */ addi r1, r1, 0x20 -/* 80020BE8 0001DB48 4E 80 00 20 */ blr +/* 80020BE8 0001DB48 4E 80 00 20 */ blr .global PumpLoad__19SNewFileSelectFrameFv PumpLoad__19SNewFileSelectFrameFv: @@ -6047,7 +6212,7 @@ lbl_80020C98: /* 80020CA0 0001DC00 83 C1 00 08 */ lwz r30, 8(r1) /* 80020CA4 0001DC04 7C 08 03 A6 */ mtlr r0 /* 80020CA8 0001DC08 38 21 00 10 */ addi r1, r1, 0x10 -/* 80020CAC 0001DC0C 4E 80 00 20 */ blr +/* 80020CAC 0001DC0C 4E 80 00 20 */ blr .global __dt__19SNewFileSelectFrameFv __dt__19SNewFileSelectFrameFv: @@ -6124,7 +6289,7 @@ lbl_80020D94: /* 80020DA0 0001DD00 83 C1 00 08 */ lwz r30, 8(r1) /* 80020DA4 0001DD04 7C 08 03 A6 */ mtlr r0 /* 80020DA8 0001DD08 38 21 00 10 */ addi r1, r1, 0x10 -/* 80020DAC 0001DD0C 4E 80 00 20 */ blr +/* 80020DAC 0001DD0C 4E 80 00 20 */ blr .global __ct__19SNewFileSelectFrameFv __ct__19SNewFileSelectFrameFv: @@ -6147,7 +6312,7 @@ __ct__19SNewFileSelectFrameFv: /* 80020DF0 0001DD50 81 84 00 00 */ lwz r12, 0(r4) /* 80020DF4 0001DD54 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80020DF8 0001DD58 7D 89 03 A6 */ mtctr r12 -/* 80020DFC 0001DD5C 4E 80 04 21 */ bctrl +/* 80020DFC 0001DD5C 4E 80 04 21 */ bctrl /* 80020E00 0001DD60 3B FE 00 10 */ addi r31, r30, 0x10 /* 80020E04 0001DD64 38 81 00 08 */ addi r4, r1, 8 /* 80020E08 0001DD68 7F E3 FB 78 */ mr r3, r31 @@ -6201,7 +6366,7 @@ __ct__19SNewFileSelectFrameFv: /* 80020EC8 0001DE28 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80020ECC 0001DE2C 7C 08 03 A6 */ mtlr r0 /* 80020ED0 0001DE30 38 21 00 20 */ addi r1, r1, 0x20 -/* 80020ED4 0001DE34 4E 80 00 20 */ blr +/* 80020ED4 0001DE34 4E 80 00 20 */ blr .global FindFileSelectOption__19SNewFileSelectFrameFP9CGuiFramei FindFileSelectOption__19SNewFileSelectFrameFP9CGuiFramei: @@ -6336,7 +6501,7 @@ lbl_800210AC: /* 800210C8 0001E028 80 01 00 64 */ lwz r0, 0x64(r1) /* 800210CC 0001E02C 7C 08 03 A6 */ mtlr r0 /* 800210D0 0001E030 38 21 00 60 */ addi r1, r1, 0x60 -/* 800210D4 0001E034 4E 80 00 20 */ blr +/* 800210D4 0001E034 4E 80 00 20 */ blr .global StartTextAnimating__19SNewFileSelectFrameFP12CGuiTextPaneQ24rstl7wstring StartTextAnimating__19SNewFileSelectFrameFP12CGuiTextPaneQ24rstl7wstring: @@ -6375,7 +6540,7 @@ StartTextAnimating__19SNewFileSelectFrameFP12CGuiTextPaneQ24rstl7wstring: /* 80021158 0001E0B8 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8002115C 0001E0BC 7C 08 03 A6 */ mtlr r0 /* 80021160 0001E0C0 38 21 00 30 */ addi r1, r1, 0x30 -/* 80021164 0001E0C4 4E 80 00 20 */ blr +/* 80021164 0001E0C4 4E 80 00 20 */ blr .global ComputeRandom__17SFileSelectOption ComputeRandom__17SFileSelectOption: @@ -6397,11 +6562,11 @@ ComputeRandom__17SFileSelectOption: /* 800211A4 0001E104 80 01 00 14 */ lwz r0, 0x14(r1) /* 800211A8 0001E108 7C 08 03 A6 */ mtlr r0 /* 800211AC 0001E10C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800211B0 0001E110 4E 80 00 20 */ blr +/* 800211B0 0001E110 4E 80 00 20 */ blr .global DoCancel__14SFrontEndFrameFPC14CGuiTableGroup DoCancel__14SFrontEndFrameFPC14CGuiTableGroup: -/* 800211B4 0001E114 4E 80 00 20 */ blr +/* 800211B4 0001E114 4E 80 00 20 */ blr .global HandleActiveChange__14SFrontEndFrameFPC14CGuiTableGroup HandleActiveChange__14SFrontEndFrameFPC14CGuiTableGroup: @@ -6426,7 +6591,7 @@ HandleActiveChange__14SFrontEndFrameFPC14CGuiTableGroup: /* 80021200 0001E160 80 01 00 14 */ lwz r0, 0x14(r1) /* 80021204 0001E164 7C 08 03 A6 */ mtlr r0 /* 80021208 0001E168 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002120C 0001E16C 4E 80 00 20 */ blr +/* 8002120C 0001E16C 4E 80 00 20 */ blr .global DoSelectionChange__14SFrontEndFrameFPC14CGuiTableGroup DoSelectionChange__14SFrontEndFrameFPC14CGuiTableGroup: @@ -6454,7 +6619,7 @@ DoSelectionChange__14SFrontEndFrameFPC14CGuiTableGroup: /* 80021264 0001E1C4 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80021268 0001E1C8 7C 08 03 A6 */ mtlr r0 /* 8002126C 0001E1CC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80021270 0001E1D0 4E 80 00 20 */ blr +/* 80021270 0001E1D0 4E 80 00 20 */ blr .global DoAdvance__14SFrontEndFrameFPC14CGuiTableGroup DoAdvance__14SFrontEndFrameFPC14CGuiTableGroup: @@ -6527,7 +6692,7 @@ lbl_80021360: /* 80021364 0001E2C4 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80021368 0001E2C8 7C 08 03 A6 */ mtlr r0 /* 8002136C 0001E2CC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80021370 0001E2D0 4E 80 00 20 */ blr +/* 80021370 0001E2D0 4E 80 00 20 */ blr .global Draw__14SFrontEndFrameFv Draw__14SFrontEndFrameFv: @@ -6541,7 +6706,7 @@ Draw__14SFrontEndFrameFv: /* 80021390 0001E2F0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80021394 0001E2F4 7C 08 03 A6 */ mtlr r0 /* 80021398 0001E2F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002139C 0001E2FC 4E 80 00 20 */ blr +/* 8002139C 0001E2FC 4E 80 00 20 */ blr .global ProcessUserInput__14SFrontEndFrameFRC11CFinalInput ProcessUserInput__14SFrontEndFrameFRC11CFinalInput: @@ -6559,7 +6724,7 @@ ProcessUserInput__14SFrontEndFrameFRC11CFinalInput: /* 800213CC 0001E32C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800213D0 0001E330 7C 08 03 A6 */ mtlr r0 /* 800213D4 0001E334 38 21 00 10 */ addi r1, r1, 0x10 -/* 800213D8 0001E338 4E 80 00 20 */ blr +/* 800213D8 0001E338 4E 80 00 20 */ blr .global Update__14SFrontEndFrameFf Update__14SFrontEndFrameFf: @@ -6579,7 +6744,7 @@ Update__14SFrontEndFrameFf: /* 80021410 0001E370 81 83 00 00 */ lwz r12, 0(r3) /* 80021414 0001E374 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 80021418 0001E378 7D 89 03 A6 */ mtctr r12 -/* 8002141C 0001E37C 4E 80 04 21 */ bctrl +/* 8002141C 0001E37C 4E 80 04 21 */ bctrl /* 80021420 0001E380 7C 7F 1B 78 */ mr r31, r3 /* 80021424 0001E384 48 27 9D B1 */ bl SlideShowGalleryFlags__10CSlideShowFv /* 80021428 0001E388 28 03 00 00 */ cmplwi r3, 0 @@ -6625,7 +6790,7 @@ lbl_8002149C: /* 800214C0 0001E420 83 C1 00 18 */ lwz r30, 0x18(r1) /* 800214C4 0001E424 7C 08 03 A6 */ mtlr r0 /* 800214C8 0001E428 38 21 00 40 */ addi r1, r1, 0x40 -/* 800214CC 0001E42C 4E 80 00 20 */ blr +/* 800214CC 0001E42C 4E 80 00 20 */ blr .global FinishedLoading__14SFrontEndFrameFv FinishedLoading__14SFrontEndFrameFv: @@ -6795,7 +6960,7 @@ lbl_80021644: /* 80021758 0001E6B8 83 A1 00 C4 */ lwz r29, 0xc4(r1) /* 8002175C 0001E6BC 7C 08 03 A6 */ mtlr r0 /* 80021760 0001E6C0 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 80021764 0001E6C4 4E 80 00 20 */ blr +/* 80021764 0001E6C4 4E 80 00 20 */ blr .global sub_80021768 sub_80021768: @@ -6816,14 +6981,14 @@ sub_80021768: /* 800217A0 0001E700 7F E5 FB 78 */ mr r5, r31 /* 800217A4 0001E704 39 81 00 08 */ addi r12, r1, 8 /* 800217A8 0001E708 48 36 81 85 */ bl __ptmf_scall -/* 800217AC 0001E70C 60 00 00 00 */ nop +/* 800217AC 0001E70C 60 00 00 00 */ nop /* 800217B0 0001E710 80 01 00 34 */ lwz r0, 0x34(r1) /* 800217B4 0001E714 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 800217B8 0001E718 83 C1 00 28 */ lwz r30, 0x28(r1) /* 800217BC 0001E71C 83 A1 00 24 */ lwz r29, 0x24(r1) /* 800217C0 0001E720 7C 08 03 A6 */ mtlr r0 /* 800217C4 0001E724 38 21 00 30 */ addi r1, r1, 0x30 -/* 800217C8 0001E728 4E 80 00 20 */ blr +/* 800217C8 0001E728 4E 80 00 20 */ blr .global sub_800217cc sub_800217cc: @@ -6841,13 +7006,13 @@ sub_800217cc: /* 800217F8 0001E758 7F E4 FB 78 */ mr r4, r31 /* 800217FC 0001E75C 39 81 00 08 */ addi r12, r1, 8 /* 80021800 0001E760 48 36 81 2D */ bl __ptmf_scall -/* 80021804 0001E764 60 00 00 00 */ nop +/* 80021804 0001E764 60 00 00 00 */ nop /* 80021808 0001E768 80 01 00 24 */ lwz r0, 0x24(r1) /* 8002180C 0001E76C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80021810 0001E770 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80021814 0001E774 7C 08 03 A6 */ mtlr r0 /* 80021818 0001E778 38 21 00 20 */ addi r1, r1, 0x20 -/* 8002181C 0001E77C 4E 80 00 20 */ blr +/* 8002181C 0001E77C 4E 80 00 20 */ blr .global PumpLoad__14SFrontEndFrameFv PumpLoad__14SFrontEndFrameFv: @@ -6905,7 +7070,7 @@ lbl_800218CC: /* 800218D4 0001E834 83 C1 00 08 */ lwz r30, 8(r1) /* 800218D8 0001E838 7C 08 03 A6 */ mtlr r0 /* 800218DC 0001E83C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800218E0 0001E840 4E 80 00 20 */ blr +/* 800218E0 0001E840 4E 80 00 20 */ blr .global __dt__14SFrontEndFrameFv __dt__14SFrontEndFrameFv: @@ -6936,7 +7101,7 @@ lbl_80021930: /* 8002193C 0001E89C 83 C1 00 08 */ lwz r30, 8(r1) /* 80021940 0001E8A0 7C 08 03 A6 */ mtlr r0 /* 80021944 0001E8A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80021948 0001E8A8 4E 80 00 20 */ blr +/* 80021948 0001E8A8 4E 80 00 20 */ blr .global __ct__14SFrontEndFrameFv __ct__14SFrontEndFrameFv: @@ -6957,7 +7122,7 @@ __ct__14SFrontEndFrameFv: /* 80021984 0001E8E4 81 84 00 00 */ lwz r12, 0(r4) /* 80021988 0001E8E8 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8002198C 0001E8EC 7D 89 03 A6 */ mtctr r12 -/* 80021990 0001E8F0 4E 80 04 21 */ bctrl +/* 80021990 0001E8F0 4E 80 04 21 */ bctrl /* 80021994 0001E8F4 3B FE 00 08 */ addi r31, r30, 8 /* 80021998 0001E8F8 38 81 00 08 */ addi r4, r1, 8 /* 8002199C 0001E8FC 7F E3 FB 78 */ mr r3, r31 @@ -6982,7 +7147,7 @@ __ct__14SFrontEndFrameFv: /* 800219E8 0001E948 83 C1 00 18 */ lwz r30, 0x18(r1) /* 800219EC 0001E94C 7C 08 03 A6 */ mtlr r0 /* 800219F0 0001E950 38 21 00 20 */ addi r1, r1, 0x20 -/* 800219F4 0001E954 4E 80 00 20 */ blr +/* 800219F4 0001E954 4E 80 00 20 */ blr .global OnMessage__16CStateSetterFlowFv OnMessage__16CStateSetterFlowFv: @@ -7004,7 +7169,7 @@ lbl_80021A28: /* 80021A28 0001E988 80 01 00 14 */ lwz r0, 0x14(r1) /* 80021A2C 0001E98C 7C 08 03 A6 */ mtlr r0 /* 80021A30 0001E990 38 21 00 10 */ addi r1, r1, 0x10 -/* 80021A34 0001E994 4E 80 00 20 */ blr +/* 80021A34 0001E994 4E 80 00 20 */ blr .global __dt__16CStateSetterFlowFv __dt__16CStateSetterFlowFv: @@ -7032,7 +7197,7 @@ lbl_80021A7C: /* 80021A88 0001E9E8 83 C1 00 08 */ lwz r30, 8(r1) /* 80021A8C 0001E9EC 7C 08 03 A6 */ mtlr r0 /* 80021A90 0001E9F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80021A94 0001E9F4 4E 80 00 20 */ blr +/* 80021A94 0001E9F4 4E 80 00 20 */ blr .global __ct__16CStateSetterFlowFv __ct__16CStateSetterFlowFv: @@ -7059,7 +7224,7 @@ __ct__16CStateSetterFlowFv: /* 80021AE8 0001EA48 80 01 00 24 */ lwz r0, 0x24(r1) /* 80021AEC 0001EA4C 7C 08 03 A6 */ mtlr r0 /* 80021AF0 0001EA50 38 21 00 20 */ addi r1, r1, 0x20 -/* 80021AF4 0001EA54 4E 80 00 20 */ blr +/* 80021AF4 0001EA54 4E 80 00 20 */ blr .global SetUIText__13SGBALinkFrameF7EUIType SetUIText__13SGBALinkFrameF7EUIType: @@ -7086,7 +7251,7 @@ SetUIText__13SGBALinkFrameF7EUIType: /* 80021B48 0001EAA8 38 63 98 D8 */ addi r3, r3, lbl_803D98D8@l /* 80021B4C 0001EAAC 7C 03 00 2E */ lwzx r0, r3, r0 /* 80021B50 0001EAB0 7C 09 03 A6 */ mtctr r0 -/* 80021B54 0001EAB4 4E 80 04 20 */ bctr +/* 80021B54 0001EAB4 4E 80 04 20 */ bctr .global lbl_80021B58 lbl_80021B58: /* 80021B58 0001EAB8 3A 80 00 49 */ li r20, 0x49 @@ -7284,7 +7449,7 @@ lbl_80021D54: /* 80021DF4 0001ED54 80 01 00 94 */ lwz r0, 0x94(r1) /* 80021DF8 0001ED58 7C 08 03 A6 */ mtlr r0 /* 80021DFC 0001ED5C 38 21 00 90 */ addi r1, r1, 0x90 -/* 80021E00 0001ED60 4E 80 00 20 */ blr +/* 80021E00 0001ED60 4E 80 00 20 */ blr .global ProcessUserInput__13SGBALinkFrameFRC11CFinalInputb ProcessUserInput__13SGBALinkFrameFRC11CFinalInputb: @@ -7431,7 +7596,7 @@ lbl_80021FF8: /* 80022000 0001EF60 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80022004 0001EF64 7C 08 03 A6 */ mtlr r0 /* 80022008 0001EF68 38 21 00 20 */ addi r1, r1, 0x20 -/* 8002200C 0001EF6C 4E 80 00 20 */ blr +/* 8002200C 0001EF6C 4E 80 00 20 */ blr .global Update__13SGBALinkFrameFf Update__13SGBALinkFrameFf: @@ -7452,7 +7617,7 @@ Update__13SGBALinkFrameFf: /* 80022048 0001EFA8 83 E1 00 14 */ lwz r31, 0x14(r1) /* 8002204C 0001EFAC 7C 08 03 A6 */ mtlr r0 /* 80022050 0001EFB0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80022054 0001EFB4 4E 80 00 20 */ blr +/* 80022054 0001EFB4 4E 80 00 20 */ blr .global FinishedLoading__13SGBALinkFrameFv FinishedLoading__13SGBALinkFrameFv: @@ -7544,7 +7709,7 @@ FinishedLoading__13SGBALinkFrameFv: /* 800221AC 0001F10C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 800221B0 0001F110 7C 08 03 A6 */ mtlr r0 /* 800221B4 0001F114 38 21 00 20 */ addi r1, r1, 0x20 -/* 800221B8 0001F118 4E 80 00 20 */ blr +/* 800221B8 0001F118 4E 80 00 20 */ blr .global Draw__13SGBALinkFrameFv Draw__13SGBALinkFrameFv: @@ -7558,7 +7723,7 @@ Draw__13SGBALinkFrameFv: /* 800221D8 0001F138 80 01 00 14 */ lwz r0, 0x14(r1) /* 800221DC 0001F13C 7C 08 03 A6 */ mtlr r0 /* 800221E0 0001F140 38 21 00 10 */ addi r1, r1, 0x10 -/* 800221E4 0001F144 4E 80 00 20 */ blr +/* 800221E4 0001F144 4E 80 00 20 */ blr .global __dt__13SGBALinkFrameFv __dt__13SGBALinkFrameFv: @@ -7577,7 +7742,7 @@ lbl_8002220C: /* 80022214 0001F174 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80022218 0001F178 7C 08 03 A6 */ mtlr r0 /* 8002221C 0001F17C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80022220 0001F180 4E 80 00 20 */ blr +/* 80022220 0001F180 4E 80 00 20 */ blr .global __ct__13SGBALinkFrameFPC9CGuiFrameP11CGBASupportb __ct__13SGBALinkFrameFPC9CGuiFrameP11CGBASupportb: @@ -7620,7 +7785,7 @@ __ct__13SGBALinkFrameFPC9CGuiFrameP11CGBASupportb: /* 800222B4 0001F214 83 A1 00 14 */ lwz r29, 0x14(r1) /* 800222B8 0001F218 7C 08 03 A6 */ mtlr r0 /* 800222BC 0001F21C 38 21 00 20 */ addi r1, r1, 0x20 -/* 800222C0 0001F220 4E 80 00 20 */ blr +/* 800222C0 0001F220 4E 80 00 20 */ blr .global Draw__17SNesEmulatorFrameFRC15CSaveGameScreen Draw__17SNesEmulatorFrameFRC15CSaveGameScreen: @@ -7697,19 +7862,19 @@ lbl_80022380: /* 800223C8 0001F328 C0 42 82 A8 */ lfs f2, lbl_805A9FC8@sda21(r2) /* 800223CC 0001F32C 81 8C 00 54 */ lwz r12, 0x54(r12) /* 800223D0 0001F330 7D 89 03 A6 */ mtctr r12 -/* 800223D4 0001F334 4E 80 04 21 */ bctrl +/* 800223D4 0001F334 4E 80 04 21 */ bctrl /* 800223D8 0001F338 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 800223DC 0001F33C 81 83 00 00 */ lwz r12, 0(r3) /* 800223E0 0001F340 81 8C 00 68 */ lwz r12, 0x68(r12) /* 800223E4 0001F344 7D 89 03 A6 */ mtctr r12 -/* 800223E8 0001F348 4E 80 04 21 */ bctrl +/* 800223E8 0001F348 4E 80 04 21 */ bctrl /* 800223EC 0001F34C 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 800223F0 0001F350 38 80 00 00 */ li r4, 0 /* 800223F4 0001F354 38 A0 00 00 */ li r5, 0 /* 800223F8 0001F358 81 83 00 00 */ lwz r12, 0(r3) /* 800223FC 0001F35C 81 8C 00 60 */ lwz r12, 0x60(r12) /* 80022400 0001F360 7D 89 03 A6 */ mtctr r12 -/* 80022404 0001F364 4E 80 04 21 */ bctrl +/* 80022404 0001F364 4E 80 04 21 */ bctrl /* 80022408 0001F368 C0 22 82 F4 */ lfs f1, lbl_805AA014@sda21(r2) /* 8002240C 0001F36C 38 61 00 20 */ addi r3, r1, 0x20 /* 80022410 0001F370 C0 42 82 9C */ lfs f2, lbl_805A9FBC@sda21(r2) @@ -7726,7 +7891,7 @@ lbl_8002242C: /* 80022438 0001F398 83 A1 00 54 */ lwz r29, 0x54(r1) /* 8002243C 0001F39C 7C 08 03 A6 */ mtlr r0 /* 80022440 0001F3A0 38 21 00 60 */ addi r1, r1, 0x60 -/* 80022444 0001F3A4 4E 80 00 20 */ blr +/* 80022444 0001F3A4 4E 80 00 20 */ blr .global ProcessUserInput__17SNesEmulatorFrameFRC11CFinalInputPC15CSaveGameScreen ProcessUserInput__17SNesEmulatorFrameFRC11CFinalInputPC15CSaveGameScreen: @@ -7787,7 +7952,7 @@ lbl_80022500: /* 8002250C 0001F46C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80022510 0001F470 7C 08 03 A6 */ mtlr r0 /* 80022514 0001F474 38 21 00 20 */ addi r1, r1, 0x20 -/* 80022518 0001F478 4E 80 00 20 */ blr +/* 80022518 0001F478 4E 80 00 20 */ blr .global Update__17SNesEmulatorFrameFfR15CSaveGameScreen Update__17SNesEmulatorFrameFfR15CSaveGameScreen: @@ -8006,7 +8171,7 @@ lbl_800227F4: /* 8002281C 0001F77C 83 81 00 20 */ lwz r28, 0x20(r1) /* 80022820 0001F780 7C 08 03 A6 */ mtlr r0 /* 80022824 0001F784 38 21 00 60 */ addi r1, r1, 0x60 -/* 80022828 0001F788 4E 80 00 20 */ blr +/* 80022828 0001F788 4E 80 00 20 */ blr .global SetMode__17SNesEmulatorFrameF5EMode SetMode__17SNesEmulatorFrameF5EMode: @@ -8191,7 +8356,7 @@ lbl_80022A84: /* 80022A98 0001F9F8 83 81 00 10 */ lwz r28, 0x10(r1) /* 80022A9C 0001F9FC 7C 08 03 A6 */ mtlr r0 /* 80022AA0 0001FA00 38 21 00 20 */ addi r1, r1, 0x20 -/* 80022AA4 0001FA04 4E 80 00 20 */ blr +/* 80022AA4 0001FA04 4E 80 00 20 */ blr .global __dt__17SNesEmulatorFrameFv __dt__17SNesEmulatorFrameFv: @@ -8244,7 +8409,7 @@ lbl_80022B3C: /* 80022B4C 0001FAAC 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80022B50 0001FAB0 7C 08 03 A6 */ mtlr r0 /* 80022B54 0001FAB4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80022B58 0001FAB8 4E 80 00 20 */ blr +/* 80022B58 0001FAB8 4E 80 00 20 */ blr .global __ct__17SNesEmulatorFrameFv __ct__17SNesEmulatorFrameFv: @@ -8296,7 +8461,7 @@ lbl_80022BAC: /* 80022C0C 0001FB6C 81 83 00 00 */ lwz r12, 0(r3) /* 80022C10 0001FB70 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80022C14 0001FB74 7D 89 03 A6 */ mtctr r12 -/* 80022C18 0001FB78 4E 80 04 21 */ bctrl +/* 80022C18 0001FB78 4E 80 04 21 */ bctrl /* 80022C1C 0001FB7C 7C 7D 1B 78 */ mr r29, r3 /* 80022C20 0001FB80 48 32 73 95 */ bl Black__6CColorFv /* 80022C24 0001FB84 7C 7E 1B 78 */ mr r30, r3 @@ -8358,7 +8523,7 @@ lbl_80022C74: /* 80022D00 0001FC60 83 81 00 40 */ lwz r28, 0x40(r1) /* 80022D04 0001FC64 7C 08 03 A6 */ mtlr r0 /* 80022D08 0001FC68 38 21 00 50 */ addi r1, r1, 0x50 -/* 80022D0C 0001FC6C 4E 80 00 20 */ blr +/* 80022D0C 0001FC6C 4E 80 00 20 */ blr .global sub_80022d10 sub_80022d10: @@ -8383,7 +8548,7 @@ sub_80022d10: /* 80022D58 0001FCB8 83 C1 00 08 */ lwz r30, 8(r1) /* 80022D5C 0001FCBC 7C 08 03 A6 */ mtlr r0 /* 80022D60 0001FCC0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80022D64 0001FCC4 4E 80 00 20 */ blr +/* 80022D64 0001FCC4 4E 80 00 20 */ blr .global SetPairText__12SGuiTextPairFRCQ24rstl7wstring SetPairText__12SGuiTextPairFRCQ24rstl7wstring: @@ -8422,7 +8587,7 @@ SetPairText__12SGuiTextPairFRCQ24rstl7wstring: /* 80022DE8 0001FD48 83 C1 00 38 */ lwz r30, 0x38(r1) /* 80022DEC 0001FD4C 7C 08 03 A6 */ mtlr r0 /* 80022DF0 0001FD50 38 21 00 40 */ addi r1, r1, 0x40 -/* 80022DF4 0001FD54 4E 80 00 20 */ blr +/* 80022DF4 0001FD54 4E 80 00 20 */ blr .global FindTextPanePair__14SFrontEndFrameFPC9CGuiFramePCc FindTextPanePair__14SFrontEndFrameFPC9CGuiFramePCc: @@ -8456,14 +8621,14 @@ FindTextPanePair__14SFrontEndFrameFPC9CGuiFramePCc: /* 80022E64 0001FDC4 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80022E68 0001FDC8 7C 08 03 A6 */ mtlr r0 /* 80022E6C 0001FDCC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80022E70 0001FDD0 4E 80 00 20 */ blr +/* 80022E70 0001FDD0 4E 80 00 20 */ blr .global __ct__12SGuiTextPairFv __ct__12SGuiTextPairFv: /* 80022E74 0001FDD4 38 00 00 00 */ li r0, 0 /* 80022E78 0001FDD8 90 03 00 00 */ stw r0, 0(r3) /* 80022E7C 0001FDDC 90 03 00 04 */ stw r0, 4(r3) -/* 80022E80 0001FDE0 4E 80 00 20 */ blr +/* 80022E80 0001FDE0 4E 80 00 20 */ blr .global FindAndSetPairText__14SFrontEndFrameFR9CGuiFramePCcRCQ24rstl7wstring FindAndSetPairText__14SFrontEndFrameFR9CGuiFramePCcRCQ24rstl7wstring: @@ -8518,7 +8683,7 @@ FindAndSetPairText__14SFrontEndFrameFR9CGuiFramePCcRCQ24rstl7wstring: /* 80022F44 0001FEA4 83 81 00 30 */ lwz r28, 0x30(r1) /* 80022F48 0001FEA8 7C 08 03 A6 */ mtlr r0 /* 80022F4C 0001FEAC 38 21 00 40 */ addi r1, r1, 0x40 -/* 80022F50 0001FEB0 4E 80 00 20 */ blr +/* 80022F50 0001FEB0 4E 80 00 20 */ blr .global PlayAdvanceSfx__11CFrontEndUIFv PlayAdvanceSfx__11CFrontEndUIFv: @@ -8546,7 +8711,7 @@ PlayAdvanceSfx__11CFrontEndUIFv: /* 80022FA8 0001FF08 80 01 00 14 */ lwz r0, 0x14(r1) /* 80022FAC 0001FF0C 7C 08 03 A6 */ mtlr r0 /* 80022FB0 0001FF10 38 21 00 10 */ addi r1, r1, 0x10 -/* 80022FB4 0001FF14 4E 80 00 20 */ blr +/* 80022FB4 0001FF14 4E 80 00 20 */ blr .global __sinit_CFrontEndUI_cpp __sinit_CFrontEndUI_cpp: @@ -8557,4 +8722,4 @@ __sinit_CFrontEndUI_cpp: /* 80022FC8 0001FF28 38 04 FE 17 */ addi r0, r4, 0x158EFE17@l /* 80022FCC 0001FF2C 90 AD A0 F0 */ stw r5, lbl_805A8CB0@sda21(r13) /* 80022FD0 0001FF30 90 03 00 04 */ stw r0, 4(r3) -/* 80022FD4 0001FF34 4E 80 00 20 */ blr +/* 80022FD4 0001FF34 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/CGBASupport.s b/asm/MetroidPrime/CGBASupport.s index 395c6b21..75a7e236 100644 --- a/asm/MetroidPrime/CGBASupport.s +++ b/asm/MetroidPrime/CGBASupport.s @@ -279,7 +279,7 @@ lbl_802488F8: /* 80248908 00245868 83 81 00 20 */ lwz r28, 0x20(r1) /* 8024890C 0024586C 7C 08 03 A6 */ mtlr r0 /* 80248910 00245870 38 21 00 30 */ addi r1, r1, 0x30 -/* 80248914 00245874 4E 80 00 20 */ blr +/* 80248914 00245874 4E 80 00 20 */ blr .global Update__11CGBASupportFv Update__11CGBASupportFv: @@ -300,7 +300,7 @@ Update__11CGBASupportFv: /* 80248950 002458B0 38 84 8C 18 */ addi r4, r4, lbl_803E8C18@l /* 80248954 002458B4 7C 04 00 2E */ lwzx r0, r4, r0 /* 80248958 002458B8 7C 09 03 A6 */ mtctr r0 -/* 8024895C 002458BC 4E 80 04 20 */ bctr +/* 8024895C 002458BC 4E 80 04 20 */ bctr .global lbl_80248960 lbl_80248960: /* 80248960 002458C0 2C 05 00 00 */ cmpwi r5, 0 @@ -309,7 +309,7 @@ lbl_80248960: /* 8024896C 002458CC 81 83 00 00 */ lwz r12, 0(r3) /* 80248970 002458D0 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80248974 002458D4 7D 89 03 A6 */ mtctr r12 -/* 80248978 002458D8 4E 80 04 21 */ bctrl +/* 80248978 002458D8 4E 80 04 21 */ bctrl /* 8024897C 002458DC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80248980 002458E0 41 82 01 D4 */ beq lbl_80248B54 /* 80248984 002458E4 80 7F 00 30 */ lwz r3, 0x30(r31) @@ -319,7 +319,7 @@ lbl_80248960: /* 80248994 002458F4 38 80 00 01 */ li r4, 1 /* 80248998 002458F8 81 8C 00 08 */ lwz r12, 8(r12) /* 8024899C 002458FC 7D 89 03 A6 */ mtctr r12 -/* 802489A0 00245900 4E 80 04 21 */ bctrl +/* 802489A0 00245900 4E 80 04 21 */ bctrl lbl_802489A4: /* 802489A4 00245904 38 60 00 00 */ li r3, 0 /* 802489A8 00245908 38 00 00 01 */ li r0, 1 @@ -456,7 +456,7 @@ lbl_80248B54: /* 80248B64 00245AC4 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80248B68 00245AC8 7C 08 03 A6 */ mtlr r0 /* 80248B6C 00245ACC 38 21 00 30 */ addi r1, r1, 0x30 -/* 80248B70 00245AD0 4E 80 00 20 */ blr +/* 80248B70 00245AD0 4E 80 00 20 */ blr .global IsReady__11CGBASupportFv IsReady__11CGBASupportFv: @@ -475,7 +475,7 @@ lbl_80248B9C: /* 80248BA0 00245B00 81 83 00 00 */ lwz r12, 0(r3) /* 80248BA4 00245B04 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80248BA8 00245B08 7D 89 03 A6 */ mtctr r12 -/* 80248BAC 00245B0C 4E 80 04 21 */ bctrl +/* 80248BAC 00245B0C 4E 80 04 21 */ bctrl /* 80248BB0 00245B10 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80248BB4 00245B14 41 82 00 70 */ beq lbl_80248C24 /* 80248BB8 00245B18 80 7F 00 30 */ lwz r3, 0x30(r31) @@ -485,7 +485,7 @@ lbl_80248B9C: /* 80248BC8 00245B28 38 80 00 01 */ li r4, 1 /* 80248BCC 00245B2C 81 8C 00 08 */ lwz r12, 8(r12) /* 80248BD0 00245B30 7D 89 03 A6 */ mtctr r12 -/* 80248BD4 00245B34 4E 80 04 21 */ bctrl +/* 80248BD4 00245B34 4E 80 04 21 */ bctrl lbl_80248BD8: /* 80248BD8 00245B38 38 60 00 00 */ li r3, 0 /* 80248BDC 00245B3C 38 00 00 01 */ li r0, 1 @@ -513,7 +513,7 @@ lbl_80248C28: /* 80248C2C 00245B8C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80248C30 00245B90 7C 08 03 A6 */ mtlr r0 /* 80248C34 00245B94 38 21 00 10 */ addi r1, r1, 0x10 -/* 80248C38 00245B98 4E 80 00 20 */ blr +/* 80248C38 00245B98 4E 80 00 20 */ blr .global StartLink__11CGBASupportFv StartLink__11CGBASupportFv: @@ -521,7 +521,7 @@ StartLink__11CGBASupportFv: /* 80248C40 00245BA0 38 00 FF FF */ li r0, -1 /* 80248C44 00245BA4 90 83 00 34 */ stw r4, 0x34(r3) /* 80248C48 00245BA8 90 03 00 40 */ stw r0, 0x40(r3) -/* 80248C4C 00245BAC 4E 80 00 20 */ blr +/* 80248C4C 00245BAC 4E 80 00 20 */ blr .global InitializeSupport__11CGBASupportFv InitializeSupport__11CGBASupportFv: @@ -535,7 +535,7 @@ InitializeSupport__11CGBASupportFv: /* 80248C6C 00245BCC 90 03 00 40 */ stw r0, 0x40(r3) /* 80248C70 00245BD0 98 83 00 44 */ stb r4, 0x44(r3) /* 80248C74 00245BD4 98 83 00 45 */ stb r4, 0x45(r3) -/* 80248C78 00245BD8 4E 80 00 20 */ blr +/* 80248C78 00245BD8 4E 80 00 20 */ blr .global __dt__11CGBASupportFv __dt__11CGBASupportFv: @@ -558,7 +558,7 @@ __dt__11CGBASupportFv: /* 80248CBC 00245C1C 38 80 00 01 */ li r4, 1 /* 80248CC0 00245C20 81 8C 00 08 */ lwz r12, 8(r12) /* 80248CC4 00245C24 7D 89 03 A6 */ mtctr r12 -/* 80248CC8 00245C28 4E 80 04 21 */ bctrl +/* 80248CC8 00245C28 4E 80 04 21 */ bctrl lbl_80248CCC: /* 80248CCC 00245C2C 34 1E 00 2C */ addic. r0, r30, 0x2c /* 80248CD0 00245C30 41 82 00 0C */ beq lbl_80248CDC @@ -579,7 +579,7 @@ lbl_80248CF8: /* 80248D04 00245C64 83 C1 00 08 */ lwz r30, 8(r1) /* 80248D08 00245C68 7C 08 03 A6 */ mtlr r0 /* 80248D0C 00245C6C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80248D10 00245C70 4E 80 00 20 */ blr +/* 80248D10 00245C70 4E 80 00 20 */ blr .global __ct__11CGBASupportFv __ct__11CGBASupportFv: @@ -631,8 +631,8 @@ __ct__11CGBASupportFv: /* 80248DC8 00245D28 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80248DCC 00245D2C 7C 08 03 A6 */ mtlr r0 /* 80248DD0 00245D30 38 21 00 20 */ addi r1, r1, 0x20 -/* 80248DD4 00245D34 4E 80 00 20 */ blr +/* 80248DD4 00245D34 4E 80 00 20 */ blr .global nullsub_130 nullsub_130: -/* 80248DD8 00245D38 4E 80 00 20 */ blr +/* 80248DD8 00245D38 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/CGameArea.s b/asm/MetroidPrime/CGameArea.s index 6144b0f7..1d086a33 100644 --- a/asm/MetroidPrime/CGameArea.s +++ b/asm/MetroidPrime/CGameArea.s @@ -163,7 +163,7 @@ lbl_8005DDDC: /* 8005DDE8 0005AD48 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8005DDEC 0005AD4C 7C 08 03 A6 */ mtlr r0 /* 8005DDF0 0005AD50 38 21 00 30 */ addi r1, r1, 0x30 -/* 8005DDF4 0005AD54 4E 80 00 20 */ blr +/* 8005DDF4 0005AD54 4E 80 00 20 */ blr .global "reserve__Q24rstl36vectorFi" "reserve__Q24rstl36vectorFi": @@ -234,7 +234,7 @@ lbl_8005DEC8: /* 8005DED4 0005AE34 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8005DED8 0005AE38 7C 08 03 A6 */ mtlr r0 /* 8005DEDC 0005AE3C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8005DEE0 0005AE40 4E 80 00 20 */ blr +/* 8005DEE0 0005AE40 4E 80 00 20 */ blr .global sub_8005dee4 sub_8005dee4: @@ -246,7 +246,7 @@ sub_8005dee4: /* 8005DEF8 0005AE58 80 01 00 14 */ lwz r0, 0x14(r1) /* 8005DEFC 0005AE5C 7C 08 03 A6 */ mtlr r0 /* 8005DF00 0005AE60 38 21 00 10 */ addi r1, r1, 0x10 -/* 8005DF04 0005AE64 4E 80 00 20 */ blr +/* 8005DF04 0005AE64 4E 80 00 20 */ blr .global Get2ndPVSLightFeature__9CGameAreaFUi Get2ndPVSLightFeature__9CGameAreaFUi: @@ -259,11 +259,11 @@ Get2ndPVSLightFeature__9CGameAreaFUi: /* 8005DF20 0005AE80 40 82 00 0C */ bne lbl_8005DF2C lbl_8005DF24: /* 8005DF24 0005AE84 38 60 FF FF */ li r3, -1 -/* 8005DF28 0005AE88 4E 80 00 20 */ blr +/* 8005DF28 0005AE88 4E 80 00 20 */ blr lbl_8005DF2C: /* 8005DF2C 0005AE8C 80 03 00 00 */ lwz r0, 0(r3) /* 8005DF30 0005AE90 7C 60 22 14 */ add r3, r0, r4 -/* 8005DF34 0005AE94 4E 80 00 20 */ blr +/* 8005DF34 0005AE94 4E 80 00 20 */ blr .global Get1stPVSLightFeature__9CGameAreaFUi Get1stPVSLightFeature__9CGameAreaFUi: @@ -272,13 +272,13 @@ Get1stPVSLightFeature__9CGameAreaFUi: /* 8005DF40 0005AEA0 28 03 00 00 */ cmplwi r3, 0 /* 8005DF44 0005AEA4 40 82 00 0C */ bne lbl_8005DF50 /* 8005DF48 0005AEA8 38 60 FF FF */ li r3, -1 -/* 8005DF4C 0005AEAC 4E 80 00 20 */ blr +/* 8005DF4C 0005AEAC 4E 80 00 20 */ blr lbl_8005DF50: /* 8005DF50 0005AEB0 80 03 00 08 */ lwz r0, 8(r3) /* 8005DF54 0005AEB4 80 A3 00 00 */ lwz r5, 0(r3) /* 8005DF58 0005AEB8 7C 60 22 14 */ add r3, r0, r4 /* 8005DF5C 0005AEBC 7C 65 1A 14 */ add r3, r5, r3 -/* 8005DF60 0005AEC0 4E 80 00 20 */ blr +/* 8005DF60 0005AEC0 4E 80 00 20 */ blr .global LookupPVSUniqueID__9CGameAreaF9TUniqueId LookupPVSUniqueID__9CGameAreaF9TUniqueId: @@ -288,7 +288,7 @@ LookupPVSUniqueID__9CGameAreaF9TUniqueId: /* 8005DF70 0005AED0 7C 84 02 14 */ add r4, r4, r0 /* 8005DF74 0005AED4 A0 04 00 AA */ lhz r0, 0xaa(r4) /* 8005DF78 0005AED8 B0 03 00 00 */ sth r0, 0(r3) -/* 8005DF7C 0005AEDC 4E 80 00 20 */ blr +/* 8005DF7C 0005AEDC 4E 80 00 20 */ blr .global LookupPVSID__9CGameAreaF9TUniqueId LookupPVSID__9CGameAreaF9TUniqueId: @@ -297,7 +297,7 @@ LookupPVSID__9CGameAreaF9TUniqueId: /* 8005DF88 0005AEE8 54 00 15 3A */ rlwinm r0, r0, 2, 0x14, 0x1d /* 8005DF8C 0005AEEC 7C 63 02 14 */ add r3, r3, r0 /* 8005DF90 0005AEF0 A0 63 00 A8 */ lhz r3, 0xa8(r3) -/* 8005DF94 0005AEF4 4E 80 00 20 */ blr +/* 8005DF94 0005AEF4 4E 80 00 20 */ blr .global UpdateWeaponWorldLighting__9CGameAreaFf UpdateWeaponWorldLighting__9CGameAreaFf: @@ -434,7 +434,7 @@ lbl_8005E158: /* 8005E164 0005B0C4 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8005E168 0005B0C8 7C 08 03 A6 */ mtlr r0 /* 8005E16C 0005B0CC 38 21 00 30 */ addi r1, r1, 0x30 -/* 8005E170 0005B0D0 4E 80 00 20 */ blr +/* 8005E170 0005B0D0 4E 80 00 20 */ blr .global UpdateThermalVisor__9CGameAreaFf UpdateThermalVisor__9CGameAreaFf: @@ -442,7 +442,7 @@ UpdateThermalVisor__9CGameAreaFf: /* 8005E178 0005B0D8 C0 42 87 00 */ lfs f2, lbl_805AA420@sda21(r2) /* 8005E17C 0005B0DC C0 04 11 20 */ lfs f0, 0x1120(r4) /* 8005E180 0005B0E0 FC 02 00 00 */ fcmpu cr0, f2, f0 -/* 8005E184 0005B0E4 4D 82 00 20 */ beqlr +/* 8005E184 0005B0E4 4D 82 00 20 */ beqlr /* 8005E188 0005B0E8 C0 64 11 1C */ lfs f3, 0x111c(r4) /* 8005E18C 0005B0EC EC 81 00 32 */ fmuls f4, f1, f0 /* 8005E190 0005B0F0 C0 24 11 24 */ lfs f1, 0x1124(r4) @@ -464,7 +464,7 @@ lbl_8005E1C4: lbl_8005E1C8: /* 8005E1C8 0005B128 80 63 01 2C */ lwz r3, 0x12c(r3) /* 8005E1CC 0005B12C D0 63 11 1C */ stfs f3, 0x111c(r3) -/* 8005E1D0 0005B130 4E 80 00 20 */ blr +/* 8005E1D0 0005B130 4E 80 00 20 */ blr .global SetWeaponWorldLighting__9CGameAreaFff SetWeaponWorldLighting__9CGameAreaFff: @@ -472,7 +472,7 @@ SetWeaponWorldLighting__9CGameAreaFff: /* 8005E1D8 0005B138 D0 24 11 34 */ stfs f1, 0x1134(r4) /* 8005E1DC 0005B13C 80 63 01 2C */ lwz r3, 0x12c(r3) /* 8005E1E0 0005B140 D0 43 11 38 */ stfs f2, 0x1138(r3) -/* 8005E1E4 0005B144 4E 80 00 20 */ blr +/* 8005E1E4 0005B144 4E 80 00 20 */ blr .global sub_8005e1e8 sub_8005e1e8: @@ -480,7 +480,7 @@ sub_8005e1e8: /* 8005E1EC 0005B14C D0 24 11 2C */ stfs f1, 0x112c(r4) /* 8005E1F0 0005B150 80 63 01 2C */ lwz r3, 0x12c(r3) /* 8005E1F4 0005B154 D0 43 11 30 */ stfs f2, 0x1130(r3) -/* 8005E1F8 0005B158 4E 80 00 20 */ blr +/* 8005E1F8 0005B158 4E 80 00 20 */ blr .global sub_8005e1fc sub_8005e1fc: @@ -488,21 +488,21 @@ sub_8005e1fc: /* 8005E200 0005B160 D0 24 11 20 */ stfs f1, 0x1120(r4) /* 8005E204 0005B164 80 63 01 2C */ lwz r3, 0x12c(r3) /* 8005E208 0005B168 D0 43 11 24 */ stfs f2, 0x1124(r3) -/* 8005E20C 0005B16C 4E 80 00 20 */ blr +/* 8005E20C 0005B16C 4E 80 00 20 */ blr .global sub_8005e210 sub_8005e210: /* 8005E210 0005B170 80 A3 01 2C */ lwz r5, 0x12c(r3) /* 8005E214 0005B174 28 04 00 00 */ cmplwi r4, 0 /* 8005E218 0005B178 90 85 10 D8 */ stw r4, 0x10d8(r5) -/* 8005E21C 0005B17C 4D 82 00 20 */ beqlr +/* 8005E21C 0005B17C 4D 82 00 20 */ beqlr /* 8005E220 0005B180 C0 04 00 40 */ lfs f0, 0x40(r4) /* 8005E224 0005B184 80 A3 01 2C */ lwz r5, 0x12c(r3) /* 8005E228 0005B188 D0 05 11 1C */ stfs f0, 0x111c(r5) /* 8005E22C 0005B18C C0 04 00 48 */ lfs f0, 0x48(r4) /* 8005E230 0005B190 80 63 01 2C */ lwz r3, 0x12c(r3) /* 8005E234 0005B194 D0 03 11 28 */ stfs f0, 0x1128(r3) -/* 8005E238 0005B198 4E 80 00 20 */ blr +/* 8005E238 0005B198 4E 80 00 20 */ blr .global GetXRayFogDistance__9CGameAreaFv GetXRayFogDistance__9CGameAreaFv: @@ -511,10 +511,10 @@ GetXRayFogDistance__9CGameAreaFv: /* 8005E244 0005B1A4 28 03 00 00 */ cmplwi r3, 0 /* 8005E248 0005B1A8 41 82 00 0C */ beq lbl_8005E254 /* 8005E24C 0005B1AC C0 23 00 44 */ lfs f1, 0x44(r3) -/* 8005E250 0005B1B0 4E 80 00 20 */ blr +/* 8005E250 0005B1B0 4E 80 00 20 */ blr lbl_8005E254: /* 8005E254 0005B1B4 C0 22 87 08 */ lfs f1, lbl_805AA428@sda21(r2) -/* 8005E258 0005B1B8 4E 80 00 20 */ blr +/* 8005E258 0005B1B8 4E 80 00 20 */ blr .global SetLoadPauseState__9CGameAreaFb SetLoadPauseState__9CGameAreaFb: @@ -557,7 +557,7 @@ lbl_8005E2D0: /* 8005E2DC 0005B23C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8005E2E0 0005B240 7C 08 03 A6 */ mtlr r0 /* 8005E2E4 0005B244 38 21 00 20 */ addi r1, r1, 0x20 -/* 8005E2E8 0005B248 4E 80 00 20 */ blr +/* 8005E2E8 0005B248 4E 80 00 20 */ blr .global GetLayerScriptBuffer__9CGameAreaFi GetLayerScriptBuffer__9CGameAreaFi: @@ -575,13 +575,13 @@ GetLayerScriptBuffer__9CGameAreaFi: /* 8005E318 0005B278 90 03 00 00 */ stw r0, 0(r3) /* 8005E31C 0005B27C 80 05 00 04 */ lwz r0, 4(r5) /* 8005E320 0005B280 90 03 00 04 */ stw r0, 4(r3) -/* 8005E324 0005B284 4E 80 00 20 */ blr +/* 8005E324 0005B284 4E 80 00 20 */ blr lbl_8005E328: /* 8005E328 0005B288 38 00 00 00 */ li r0, 0 /* 8005E32C 0005B28C 90 03 00 00 */ stw r0, 0(r3) /* 8005E330 0005B290 80 0D 82 E8 */ lwz r0, lbl_805A6EA8@sda21(r13) /* 8005E334 0005B294 90 03 00 04 */ stw r0, 4(r3) -/* 8005E338 0005B298 4E 80 00 20 */ blr +/* 8005E338 0005B298 4E 80 00 20 */ blr .global IsFinishedOccluding__9CGameAreaCFv IsFinishedOccluding__9CGameAreaCFv: @@ -591,10 +591,10 @@ IsFinishedOccluding__9CGameAreaCFv: /* 8005E348 0005B2A8 40 82 00 10 */ bne lbl_8005E358 /* 8005E34C 0005B2AC 88 03 11 08 */ lbz r0, 0x1108(r3) /* 8005E350 0005B2B0 54 03 E7 FE */ rlwinm r3, r0, 0x1c, 0x1f, 0x1f -/* 8005E354 0005B2B4 4E 80 00 20 */ blr +/* 8005E354 0005B2B4 4E 80 00 20 */ blr lbl_8005E358: /* 8005E358 0005B2B8 38 60 00 01 */ li r3, 1 -/* 8005E35C 0005B2BC 4E 80 00 20 */ blr +/* 8005E35C 0005B2BC 4E 80 00 20 */ blr .global IGetScriptingMemoryAlways__14CDummyGameAreaCFv IGetScriptingMemoryAlways__14CDummyGameAreaCFv: @@ -608,22 +608,22 @@ IGetScriptingMemoryAlways__14CDummyGameAreaCFv: /* 8005E37C 0005B2DC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8005E380 0005B2E0 7C 08 03 A6 */ mtlr r0 /* 8005E384 0005B2E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8005E388 0005B2E8 4E 80 00 20 */ blr +/* 8005E388 0005B2E8 4E 80 00 20 */ blr .global IGetAreaId__14CDummyGameAreaCFv IGetAreaId__14CDummyGameAreaCFv: /* 8005E38C 0005B2EC 80 63 00 10 */ lwz r3, 0x10(r3) -/* 8005E390 0005B2F0 4E 80 00 20 */ blr +/* 8005E390 0005B2F0 4E 80 00 20 */ blr .global IGetAreaAssetID__14CDummyGameAreaCFv IGetAreaAssetID__14CDummyGameAreaCFv: /* 8005E394 0005B2F4 80 63 00 0C */ lwz r3, 0xc(r3) -/* 8005E398 0005B2F8 4E 80 00 20 */ blr +/* 8005E398 0005B2F8 4E 80 00 20 */ blr .global IIsActive__14CDummyGameAreaCFv IIsActive__14CDummyGameAreaCFv: /* 8005E39C 0005B2FC 38 60 00 01 */ li r3, 1 -/* 8005E3A0 0005B300 4E 80 00 20 */ blr +/* 8005E3A0 0005B300 4E 80 00 20 */ blr .global IGetAttachedAreaId__14CDummyGameAreaCFi IGetAttachedAreaId__14CDummyGameAreaCFi: @@ -631,22 +631,22 @@ IGetAttachedAreaId__14CDummyGameAreaCFi: /* 8005E3A8 0005B308 54 A0 08 3C */ slwi r0, r5, 1 /* 8005E3AC 0005B30C 7C 04 02 2E */ lhzx r0, r4, r0 /* 8005E3B0 0005B310 90 03 00 00 */ stw r0, 0(r3) -/* 8005E3B4 0005B314 4E 80 00 20 */ blr +/* 8005E3B4 0005B314 4E 80 00 20 */ blr .global IGetNumAttachedAreas__14CDummyGameAreaCFv IGetNumAttachedAreas__14CDummyGameAreaCFv: /* 8005E3B8 0005B318 80 63 00 48 */ lwz r3, 0x48(r3) -/* 8005E3BC 0005B31C 4E 80 00 20 */ blr +/* 8005E3BC 0005B31C 4E 80 00 20 */ blr .global IGetStringTableAssetId__14CDummyGameAreaCFv IGetStringTableAssetId__14CDummyGameAreaCFv: /* 8005E3C0 0005B320 80 63 00 08 */ lwz r3, 8(r3) -/* 8005E3C4 0005B324 4E 80 00 20 */ blr +/* 8005E3C4 0005B324 4E 80 00 20 */ blr .global IGetTM__14CDummyGameAreaCFv IGetTM__14CDummyGameAreaCFv: /* 8005E3C8 0005B328 38 63 00 14 */ addi r3, r3, 0x14 -/* 8005E3CC 0005B32C 4E 80 00 20 */ blr +/* 8005E3CC 0005B32C 4E 80 00 20 */ blr .global __ct__14CDummyGameAreaFR12CInputStreamii __ct__14CDummyGameAreaFR12CInputStreamii: @@ -900,7 +900,7 @@ lbl_8005E738: /* 8005E748 0005B6A8 80 01 01 44 */ lwz r0, 0x144(r1) /* 8005E74C 0005B6AC 7C 08 03 A6 */ mtlr r0 /* 8005E750 0005B6B0 38 21 01 40 */ addi r1, r1, 0x140 -/* 8005E754 0005B6B4 4E 80 00 20 */ blr +/* 8005E754 0005B6B4 4E 80 00 20 */ blr .global sub_8005e758 sub_8005e758: @@ -936,7 +936,7 @@ lbl_8005E798: /* 8005E7C4 0005B724 80 01 00 14 */ lwz r0, 0x14(r1) /* 8005E7C8 0005B728 7C 08 03 A6 */ mtlr r0 /* 8005E7CC 0005B72C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8005E7D0 0005B730 4E 80 00 20 */ blr +/* 8005E7D0 0005B730 4E 80 00 20 */ blr .global sub_8005e7d4 sub_8005e7d4: @@ -950,7 +950,7 @@ lbl_8005E7EC: /* 8005E7EC 0005B74C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8005E7F0 0005B750 7C 08 03 A6 */ mtlr r0 /* 8005E7F4 0005B754 38 21 00 10 */ addi r1, r1, 0x10 -/* 8005E7F8 0005B758 4E 80 00 20 */ blr +/* 8005E7F8 0005B758 4E 80 00 20 */ blr .global sub_8005e7fc sub_8005e7fc: @@ -1040,7 +1040,7 @@ lbl_8005E910: /* 8005E924 0005B884 80 01 00 14 */ lwz r0, 0x14(r1) /* 8005E928 0005B888 7C 08 03 A6 */ mtlr r0 /* 8005E92C 0005B88C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8005E930 0005B890 4E 80 00 20 */ blr +/* 8005E930 0005B890 4E 80 00 20 */ blr .global ReadDependencyList__9CGameArea ReadDependencyList__9CGameArea: @@ -1101,7 +1101,7 @@ lbl_8005E9E8: /* 8005E9F8 0005B958 80 01 00 24 */ lwz r0, 0x24(r1) /* 8005E9FC 0005B95C 7C 08 03 A6 */ mtlr r0 /* 8005EA00 0005B960 38 21 00 20 */ addi r1, r1, 0x20 -/* 8005EA04 0005B964 4E 80 00 20 */ blr +/* 8005EA04 0005B964 4E 80 00 20 */ blr .global sub_8005ea08 sub_8005ea08: @@ -1175,7 +1175,7 @@ lbl_8005EAE4: /* 8005EAEC 0005BA4C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8005EAF0 0005BA50 7C 08 03 A6 */ mtlr r0 /* 8005EAF4 0005BA54 38 21 00 20 */ addi r1, r1, 0x20 -/* 8005EAF8 0005BA58 4E 80 00 20 */ blr +/* 8005EAF8 0005BA58 4E 80 00 20 */ blr .global IGetScriptingMemoryAlways__9CGameAreaCFv IGetScriptingMemoryAlways__9CGameAreaCFv: @@ -1189,23 +1189,23 @@ IGetScriptingMemoryAlways__9CGameAreaCFv: /* 8005EB18 0005BA78 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8005EB1C 0005BA7C 7C 08 03 A6 */ mtlr r0 /* 8005EB20 0005BA80 38 21 00 10 */ addi r1, r1, 0x10 -/* 8005EB24 0005BA84 4E 80 00 20 */ blr +/* 8005EB24 0005BA84 4E 80 00 20 */ blr .global IGetAreaId__9CGameAreaCFv IGetAreaId__9CGameAreaCFv: /* 8005EB28 0005BA88 80 63 00 88 */ lwz r3, 0x88(r3) -/* 8005EB2C 0005BA8C 4E 80 00 20 */ blr +/* 8005EB2C 0005BA8C 4E 80 00 20 */ blr .global IGetAreaAssetID__9CGameAreaCFv IGetAreaAssetID__9CGameAreaCFv: /* 8005EB30 0005BA90 80 63 00 84 */ lwz r3, 0x84(r3) -/* 8005EB34 0005BA94 4E 80 00 20 */ blr +/* 8005EB34 0005BA94 4E 80 00 20 */ blr .global IIsActive__9CGameAreaCFv IIsActive__9CGameAreaCFv: /* 8005EB38 0005BA98 88 03 00 F0 */ lbz r0, 0xf0(r3) /* 8005EB3C 0005BA9C 54 03 D7 FE */ rlwinm r3, r0, 0x1a, 0x1f, 0x1f -/* 8005EB40 0005BAA0 4E 80 00 20 */ blr +/* 8005EB40 0005BAA0 4E 80 00 20 */ blr .global IGetAttachedAreaId__9CGameAreaCFi IGetAttachedAreaId__9CGameAreaCFi: @@ -1213,22 +1213,22 @@ IGetAttachedAreaId__9CGameAreaCFi: /* 8005EB48 0005BAA8 54 A0 08 3C */ slwi r0, r5, 1 /* 8005EB4C 0005BAAC 7C 04 02 2E */ lhzx r0, r4, r0 /* 8005EB50 0005BAB0 90 03 00 00 */ stw r0, 0(r3) -/* 8005EB54 0005BAB4 4E 80 00 20 */ blr +/* 8005EB54 0005BAB4 4E 80 00 20 */ blr .global IGetNumAttachedAreas__9CGameAreaCFv IGetNumAttachedAreas__9CGameAreaCFv: /* 8005EB58 0005BAB8 80 63 00 90 */ lwz r3, 0x90(r3) -/* 8005EB5C 0005BABC 4E 80 00 20 */ blr +/* 8005EB5C 0005BABC 4E 80 00 20 */ blr .global IGetStringTableAssetId__9CGameAreaCFv IGetStringTableAssetId__9CGameAreaCFv: /* 8005EB60 0005BAC0 80 63 00 08 */ lwz r3, 8(r3) -/* 8005EB64 0005BAC4 4E 80 00 20 */ blr +/* 8005EB64 0005BAC4 4E 80 00 20 */ blr .global IGetTM__9CGameAreaCFv IGetTM__9CGameAreaCFv: /* 8005EB68 0005BAC8 38 63 00 0C */ addi r3, r3, 0xc -/* 8005EB6C 0005BACC 4E 80 00 20 */ blr +/* 8005EB6C 0005BACC 4E 80 00 20 */ blr .global TryTakingOutOfARAM__9CGameAreaFv TryTakingOutOfARAM__9CGameAreaFv: @@ -1265,7 +1265,7 @@ lbl_8005EBD4: /* 8005EBE0 0005BB40 83 C1 00 08 */ lwz r30, 8(r1) /* 8005EBE4 0005BB44 7C 08 03 A6 */ mtlr r0 /* 8005EBE8 0005BB48 38 21 00 10 */ addi r1, r1, 0x10 -/* 8005EBEC 0005BB4C 4E 80 00 20 */ blr +/* 8005EBEC 0005BB4C 4E 80 00 20 */ blr .global DoesAreaNeedEnvFx__9CGameAreaCFv DoesAreaNeedEnvFx__9CGameAreaCFv: @@ -1273,22 +1273,22 @@ DoesAreaNeedEnvFx__9CGameAreaCFv: /* 8005EBF4 0005BB54 28 03 00 00 */ cmplwi r3, 0 /* 8005EBF8 0005BB58 40 82 00 0C */ bne lbl_8005EC04 /* 8005EBFC 0005BB5C 38 60 00 00 */ li r3, 0 -/* 8005EC00 0005BB60 4E 80 00 20 */ blr +/* 8005EC00 0005BB60 4E 80 00 20 */ blr lbl_8005EC04: /* 8005EC04 0005BB64 80 83 10 D8 */ lwz r4, 0x10d8(r3) /* 8005EC08 0005BB68 28 04 00 00 */ cmplwi r4, 0 /* 8005EC0C 0005BB6C 40 82 00 0C */ bne lbl_8005EC18 /* 8005EC10 0005BB70 38 60 00 00 */ li r3, 0 -/* 8005EC14 0005BB74 4E 80 00 20 */ blr +/* 8005EC14 0005BB74 4E 80 00 20 */ blr lbl_8005EC18: /* 8005EC18 0005BB78 80 03 10 DC */ lwz r0, 0x10dc(r3) /* 8005EC1C 0005BB7C 2C 00 00 01 */ cmpwi r0, 1 /* 8005EC20 0005BB80 41 82 00 0C */ beq lbl_8005EC2C /* 8005EC24 0005BB84 38 60 00 00 */ li r3, 0 -/* 8005EC28 0005BB88 4E 80 00 20 */ blr +/* 8005EC28 0005BB88 4E 80 00 20 */ blr lbl_8005EC2C: /* 8005EC2C 0005BB8C 80 64 00 38 */ lwz r3, 0x38(r4) -/* 8005EC30 0005BB90 4E 80 00 20 */ blr +/* 8005EC30 0005BB90 4E 80 00 20 */ blr .global DoesAreaNeedSkyNow__9CGameAreaCFv DoesAreaNeedSkyNow__9CGameAreaCFv: @@ -1296,17 +1296,17 @@ DoesAreaNeedSkyNow__9CGameAreaCFv: /* 8005EC38 0005BB98 28 03 00 00 */ cmplwi r3, 0 /* 8005EC3C 0005BB9C 40 82 00 0C */ bne lbl_8005EC48 /* 8005EC40 0005BBA0 38 60 00 00 */ li r3, 0 -/* 8005EC44 0005BBA4 4E 80 00 20 */ blr +/* 8005EC44 0005BBA4 4E 80 00 20 */ blr lbl_8005EC48: /* 8005EC48 0005BBA8 80 63 10 D8 */ lwz r3, 0x10d8(r3) /* 8005EC4C 0005BBAC 28 03 00 00 */ cmplwi r3, 0 /* 8005EC50 0005BBB0 41 82 00 10 */ beq lbl_8005EC60 /* 8005EC54 0005BBB4 88 03 00 34 */ lbz r0, 0x34(r3) /* 8005EC58 0005BBB8 54 03 CF FE */ rlwinm r3, r0, 0x19, 0x1f, 0x1f -/* 8005EC5C 0005BBBC 4E 80 00 20 */ blr +/* 8005EC5C 0005BBBC 4E 80 00 20 */ blr lbl_8005EC60: /* 8005EC60 0005BBC0 38 60 00 00 */ li r3, 0 -/* 8005EC64 0005BBC4 4E 80 00 20 */ blr +/* 8005EC64 0005BBC4 4E 80 00 20 */ blr .global SetCurrent__Q29CGameArea8CAreaFogCFv SetCurrent__Q29CGameArea8CAreaFogCFv: @@ -1335,7 +1335,7 @@ SetCurrent__Q29CGameArea8CAreaFogCFv: /* 8005ECC0 0005BC20 FC 40 F8 90 */ fmr f2, f31 /* 8005ECC4 0005BC24 81 8C 00 E0 */ lwz r12, 0xe0(r12) /* 8005ECC8 0005BC28 7D 89 03 A6 */ mtctr r12 -/* 8005ECCC 0005BC2C 4E 80 04 21 */ bctrl +/* 8005ECCC 0005BC2C 4E 80 04 21 */ bctrl /* 8005ECD0 0005BC30 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 8005ECD4 0005BC34 CB E1 00 30 */ lfd f31, 0x30(r1) /* 8005ECD8 0005BC38 E3 C1 00 28 */ psq_l f30, 40(r1), 0, qr0 @@ -1344,7 +1344,7 @@ SetCurrent__Q29CGameArea8CAreaFogCFv: /* 8005ECE4 0005BC44 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8005ECE8 0005BC48 7C 08 03 A6 */ mtlr r0 /* 8005ECEC 0005BC4C 38 21 00 40 */ addi r1, r1, 0x40 -/* 8005ECF0 0005BC50 4E 80 00 20 */ blr +/* 8005ECF0 0005BC50 4E 80 00 20 */ blr .global Update__Q29CGameArea8CAreaFogFf Update__Q29CGameArea8CAreaFogFf: @@ -1490,7 +1490,7 @@ lbl_8005EEF8: /* 8005EF04 0005BE64 83 E1 00 7C */ lwz r31, 0x7c(r1) /* 8005EF08 0005BE68 7C 08 03 A6 */ mtlr r0 /* 8005EF0C 0005BE6C 38 21 00 90 */ addi r1, r1, 0x90 -/* 8005EF10 0005BE70 4E 80 00 20 */ blr +/* 8005EF10 0005BE70 4E 80 00 20 */ blr .global UpdateFog__9CGameAreaFf UpdateFog__9CGameAreaFf: @@ -1509,7 +1509,7 @@ lbl_8005EF34: .global sub_8005ef40 sub_8005ef40: -/* 8005EF40 0005BEA0 4E 80 00 20 */ blr +/* 8005EF40 0005BEA0 4E 80 00 20 */ blr .global RollFogOut__Q29CGameArea8CAreaFogFffRC6CColor RollFogOut__Q29CGameArea8CAreaFogFffRC6CColor: @@ -1557,7 +1557,7 @@ RollFogOut__Q29CGameArea8CAreaFogFffRC6CColor: /* 8005EFE8 0005BF48 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8005EFEC 0005BF4C 7C 08 03 A6 */ mtlr r0 /* 8005EFF0 0005BF50 38 21 00 30 */ addi r1, r1, 0x30 -/* 8005EFF4 0005BF54 4E 80 00 20 */ blr +/* 8005EFF4 0005BF54 4E 80 00 20 */ blr .global FadeFog__Q29CGameArea8CAreaFogF11ERglFogModeRC6CColorRC9CVector2ffRC9CVector2f FadeFog__Q29CGameArea8CAreaFogF11ERglFogModeRC6CColorRC9CVector2ffRC9CVector2f: @@ -1636,7 +1636,7 @@ lbl_8005F0E8: /* 8005F110 0005C070 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8005F114 0005C074 7C 08 03 A6 */ mtlr r0 /* 8005F118 0005C078 38 21 00 30 */ addi r1, r1, 0x30 -/* 8005F11C 0005C07C 4E 80 00 20 */ blr +/* 8005F11C 0005C07C 4E 80 00 20 */ blr .global SetFogExplicit__Q29CGameArea8CAreaFogF11ERglFogModeRC6CColorRC9CVector2f SetFogExplicit__Q29CGameArea8CAreaFogF11ERglFogModeRC6CColorRC9CVector2f: @@ -1665,20 +1665,20 @@ SetFogExplicit__Q29CGameArea8CAreaFogF11ERglFogModeRC6CColorRC9CVector2f: /* 8005F178 0005C0D8 D0 03 00 04 */ stfs f0, 4(r3) /* 8005F17C 0005C0DC C0 03 00 10 */ lfs f0, 0x10(r3) /* 8005F180 0005C0E0 D0 03 00 08 */ stfs f0, 8(r3) -/* 8005F184 0005C0E4 4E 80 00 20 */ blr +/* 8005F184 0005C0E4 4E 80 00 20 */ blr .global IsFogDisabled__Q29CGameArea8CAreaFogCFv IsFogDisabled__Q29CGameArea8CAreaFogCFv: /* 8005F188 0005C0E8 80 03 00 00 */ lwz r0, 0(r3) /* 8005F18C 0005C0EC 7C 00 00 34 */ cntlzw r0, r0 /* 8005F190 0005C0F0 54 03 D9 7E */ srwi r3, r0, 5 -/* 8005F194 0005C0F4 4E 80 00 20 */ blr +/* 8005F194 0005C0F4 4E 80 00 20 */ blr .global DisableFog__Q29CGameArea8CAreaFogFv DisableFog__Q29CGameArea8CAreaFogFv: /* 8005F198 0005C0F8 38 00 00 00 */ li r0, 0 /* 8005F19C 0005C0FC 90 03 00 00 */ stw r0, 0(r3) -/* 8005F1A0 0005C100 4E 80 00 20 */ blr +/* 8005F1A0 0005C100 4E 80 00 20 */ blr .global __ct__Q29CGameArea8CAreaFogFv __ct__Q29CGameArea8CAreaFogFv: @@ -1718,7 +1718,7 @@ __ct__Q29CGameArea8CAreaFogFv: /* 8005F228 0005C188 80 01 00 14 */ lwz r0, 0x14(r1) /* 8005F22C 0005C18C 7C 08 03 A6 */ mtlr r0 /* 8005F230 0005C190 38 21 00 10 */ addi r1, r1, 0x10 -/* 8005F234 0005C194 4E 80 00 20 */ blr +/* 8005F234 0005C194 4E 80 00 20 */ blr .global IsQualified__Q29CGameArea15CAreaObjectListFRC7CEntity IsQualified__Q29CGameArea15CAreaObjectListFRC7CEntity: @@ -1727,7 +1727,7 @@ IsQualified__Q29CGameArea15CAreaObjectListFRC7CEntity: /* 8005F240 0005C1A0 7C 03 00 50 */ subf r0, r3, r0 /* 8005F244 0005C1A4 7C 00 00 34 */ cntlzw r0, r0 /* 8005F248 0005C1A8 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -/* 8005F24C 0005C1AC 4E 80 00 20 */ blr +/* 8005F24C 0005C1AC 4E 80 00 20 */ blr .global GetShouldLoadOther__Q29IGameArea4DockCFi GetShouldLoadOther__Q29IGameArea4DockCFi: @@ -1744,16 +1744,16 @@ GetShouldLoadOther__Q29IGameArea4DockCFi: /* 8005F278 0005C1D8 7C 03 00 D0 */ neg r0, r3 /* 8005F27C 0005C1DC 7C 00 1B 78 */ or r0, r0, r3 /* 8005F280 0005C1E0 54 03 0F FE */ srwi r3, r0, 0x1f -/* 8005F284 0005C1E4 4E 80 00 20 */ blr +/* 8005F284 0005C1E4 4E 80 00 20 */ blr lbl_8005F288: /* 8005F288 0005C1E8 38 60 00 00 */ li r3, 0 -/* 8005F28C 0005C1EC 4E 80 00 20 */ blr +/* 8005F28C 0005C1EC 4E 80 00 20 */ blr .global SetShouldLoadOther__Q29IGameArea4DockFib SetShouldLoadOther__Q29IGameArea4DockFib: /* 8005F290 0005C1F0 80 03 00 08 */ lwz r0, 8(r3) /* 8005F294 0005C1F4 7C 04 00 00 */ cmpw r4, r0 -/* 8005F298 0005C1F8 4C 80 00 20 */ bgelr +/* 8005F298 0005C1F8 4C 80 00 20 */ bgelr /* 8005F29C 0005C1FC 54 84 18 38 */ slwi r4, r4, 3 /* 8005F2A0 0005C200 80 C3 00 10 */ lwz r6, 0x10(r3) /* 8005F2A4 0005C204 38 64 00 06 */ addi r3, r4, 6 @@ -1761,7 +1761,7 @@ SetShouldLoadOther__Q29IGameArea4DockFib: /* 8005F2AC 0005C20C 7C 06 18 AE */ lbzx r0, r6, r3 /* 8005F2B0 0005C210 50 80 3E 30 */ rlwimi r0, r4, 7, 0x18, 0x18 /* 8005F2B4 0005C214 7C 06 19 AE */ stbx r0, r6, r3 -/* 8005F2B8 0005C218 4E 80 00 20 */ blr +/* 8005F2B8 0005C218 4E 80 00 20 */ blr .global ShouldLoadOtherArea__Q29IGameArea4DockCFi ShouldLoadOtherArea__Q29IGameArea4DockCFi: @@ -1769,7 +1769,7 @@ ShouldLoadOtherArea__Q29IGameArea4DockCFi: /* 8005F2C0 0005C220 2C 00 00 00 */ cmpwi r0, 0 /* 8005F2C4 0005C224 40 82 00 0C */ bne lbl_8005F2D0 /* 8005F2C8 0005C228 38 60 00 00 */ li r3, 0 -/* 8005F2CC 0005C22C 4E 80 00 20 */ blr +/* 8005F2CC 0005C22C 4E 80 00 20 */ blr lbl_8005F2D0: /* 8005F2D0 0005C230 54 84 18 38 */ slwi r4, r4, 3 /* 8005F2D4 0005C234 80 63 00 10 */ lwz r3, 0x10(r3) @@ -1781,7 +1781,7 @@ lbl_8005F2D0: /* 8005F2EC 0005C24C 7C 03 00 D0 */ neg r0, r3 /* 8005F2F0 0005C250 7C 00 1B 78 */ or r0, r0, r3 /* 8005F2F4 0005C254 54 03 0F FE */ srwi r3, r0, 0x1f -/* 8005F2F8 0005C258 4E 80 00 20 */ blr +/* 8005F2F8 0005C258 4E 80 00 20 */ blr .global GetOtherDockNumber__Q29IGameArea4DockCFi GetOtherDockNumber__Q29IGameArea4DockCFi: @@ -1789,13 +1789,13 @@ GetOtherDockNumber__Q29IGameArea4DockCFi: /* 8005F300 0005C260 2C 00 00 00 */ cmpwi r0, 0 /* 8005F304 0005C264 40 82 00 0C */ bne lbl_8005F310 /* 8005F308 0005C268 38 60 FF FF */ li r3, -1 -/* 8005F30C 0005C26C 4E 80 00 20 */ blr +/* 8005F30C 0005C26C 4E 80 00 20 */ blr lbl_8005F310: /* 8005F310 0005C270 54 84 18 38 */ slwi r4, r4, 3 /* 8005F314 0005C274 80 63 00 10 */ lwz r3, 0x10(r3) /* 8005F318 0005C278 38 04 00 04 */ addi r0, r4, 4 /* 8005F31C 0005C27C 7C 63 02 AE */ lhax r3, r3, r0 -/* 8005F320 0005C280 4E 80 00 20 */ blr +/* 8005F320 0005C280 4E 80 00 20 */ blr .global GetConnectedAreaId__Q29IGameArea4DockCFi GetConnectedAreaId__Q29IGameArea4DockCFi: @@ -1815,24 +1815,24 @@ lbl_8005F350: /* 8005F350 0005C2B0 80 04 00 00 */ lwz r0, 0(r4) /* 8005F354 0005C2B4 90 03 00 00 */ stw r0, 0(r3) /* 8005F358 0005C2B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8005F35C 0005C2BC 4E 80 00 20 */ blr +/* 8005F35C 0005C2BC 4E 80 00 20 */ blr .global SetReferenceCount__Q29IGameArea4DockFi SetReferenceCount__Q29IGameArea4DockFi: /* 8005F360 0005C2C0 90 83 00 00 */ stw r4, 0(r3) /* 8005F364 0005C2C4 38 00 00 01 */ li r0, 1 /* 8005F368 0005C2C8 98 03 00 48 */ stb r0, 0x48(r3) -/* 8005F36C 0005C2CC 4E 80 00 20 */ blr +/* 8005F36C 0005C2CC 4E 80 00 20 */ blr .global GetReferenceCount__Q29IGameArea4DockCFv GetReferenceCount__Q29IGameArea4DockCFv: /* 8005F370 0005C2D0 80 63 00 00 */ lwz r3, 0(r3) -/* 8005F374 0005C2D4 4E 80 00 20 */ blr +/* 8005F374 0005C2D4 4E 80 00 20 */ blr .global IsReferenced__Q29IGameArea4DockCFv IsReferenced__Q29IGameArea4DockCFv: /* 8005F378 0005C2D8 88 63 00 48 */ lbz r3, 0x48(r3) -/* 8005F37C 0005C2DC 4E 80 00 20 */ blr +/* 8005F37C 0005C2DC 4E 80 00 20 */ blr .global __ct__Q29IGameArea4DockFR12CInputStreamRC12CTransform4f __ct__Q29IGameArea4DockFR12CInputStreamRC12CTransform4f: @@ -1939,7 +1939,7 @@ lbl_8005F4E0: /* 8005F4F0 0005C450 80 01 00 44 */ lwz r0, 0x44(r1) /* 8005F4F4 0005C454 7C 08 03 A6 */ mtlr r0 /* 8005F4F8 0005C458 38 21 00 40 */ addi r1, r1, 0x40 -/* 8005F4FC 0005C45C 4E 80 00 20 */ blr +/* 8005F4FC 0005C45C 4E 80 00 20 */ blr .global OtherAreaOcclusionChanged__9CGameAreaFv OtherAreaOcclusionChanged__9CGameAreaFv: @@ -1984,7 +1984,7 @@ lbl_8005F584: /* 8005F58C 0005C4EC 83 C1 00 08 */ lwz r30, 8(r1) /* 8005F590 0005C4F0 7C 08 03 A6 */ mtlr r0 /* 8005F594 0005C4F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8005F598 0005C4F8 4E 80 00 20 */ blr +/* 8005F598 0005C4F8 4E 80 00 20 */ blr .global PingOcclusionState__9CGameAreaFv PingOcclusionState__9CGameAreaFv: @@ -2036,7 +2036,7 @@ lbl_8005F63C: /* 8005F644 0005C5A4 83 C1 00 08 */ lwz r30, 8(r1) /* 8005F648 0005C5A8 7C 08 03 A6 */ mtlr r0 /* 8005F64C 0005C5AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8005F650 0005C5B0 4E 80 00 20 */ blr +/* 8005F650 0005C5B0 4E 80 00 20 */ blr .global PreRender__9CGameAreaFv PreRender__9CGameAreaFv: @@ -2060,7 +2060,7 @@ lbl_8005F690: /* 8005F690 0005C5F0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8005F694 0005C5F4 7C 08 03 A6 */ mtlr r0 /* 8005F698 0005C5F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8005F69C 0005C5FC 4E 80 00 20 */ blr +/* 8005F69C 0005C5FC 4E 80 00 20 */ blr .global AliveUpdate__9CGameAreaFf AliveUpdate__9CGameAreaFf: @@ -2099,7 +2099,7 @@ lbl_8005F6E8: /* 8005F718 0005C678 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8005F71C 0005C67C 7C 08 03 A6 */ mtlr r0 /* 8005F720 0005C680 38 21 00 20 */ addi r1, r1, 0x20 -/* 8005F724 0005C684 4E 80 00 20 */ blr +/* 8005F724 0005C684 4E 80 00 20 */ blr .global SetOcclusionState__9CGameAreaFQ29CGameArea15EOcclusionState SetOcclusionState__9CGameAreaFQ29CGameArea15EOcclusionState: @@ -2137,7 +2137,7 @@ lbl_8005F798: /* 8005F79C 0005C6FC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8005F7A0 0005C700 7C 08 03 A6 */ mtlr r0 /* 8005F7A4 0005C704 38 21 00 10 */ addi r1, r1, 0x10 -/* 8005F7A8 0005C708 4E 80 00 20 */ blr +/* 8005F7A8 0005C708 4E 80 00 20 */ blr .global RemoveStaticGeometry__9CGameAreaFv RemoveStaticGeometry__9CGameAreaFv: @@ -2164,12 +2164,12 @@ RemoveStaticGeometry__9CGameAreaFv: /* 8005F7FC 0005C75C 38 84 00 4C */ addi r4, r4, 0x4c /* 8005F800 0005C760 81 8C 00 18 */ lwz r12, 0x18(r12) /* 8005F804 0005C764 7D 89 03 A6 */ mtctr r12 -/* 8005F808 0005C768 4E 80 04 21 */ bctrl +/* 8005F808 0005C768 4E 80 04 21 */ bctrl lbl_8005F80C: /* 8005F80C 0005C76C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8005F810 0005C770 7C 08 03 A6 */ mtlr r0 /* 8005F814 0005C774 38 21 00 10 */ addi r1, r1, 0x10 -/* 8005F818 0005C778 4E 80 00 20 */ blr +/* 8005F818 0005C778 4E 80 00 20 */ blr .global AddStaticGeometry__9CGameAreaFv AddStaticGeometry__9CGameAreaFv: @@ -2211,13 +2211,13 @@ lbl_8005F894: /* 8005F89C 0005C7FC 81 83 00 00 */ lwz r12, 0(r3) /* 8005F8A0 0005C800 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8005F8A4 0005C804 7D 89 03 A6 */ mtctr r12 -/* 8005F8A8 0005C808 4E 80 04 21 */ bctrl +/* 8005F8A8 0005C808 4E 80 04 21 */ bctrl lbl_8005F8AC: /* 8005F8AC 0005C80C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8005F8B0 0005C810 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8005F8B4 0005C814 7C 08 03 A6 */ mtlr r0 /* 8005F8B8 0005C818 38 21 00 10 */ addi r1, r1, 0x10 -/* 8005F8BC 0005C81C 4E 80 00 20 */ blr +/* 8005F8BC 0005C81C 4E 80 00 20 */ blr .global TransferTokensToARAM__9CGameAreaFv TransferTokensToARAM__9CGameAreaFv: @@ -2314,7 +2314,7 @@ lbl_8005F9FC: /* 8005FA04 0005C964 80 01 00 44 */ lwz r0, 0x44(r1) /* 8005FA08 0005C968 7C 08 03 A6 */ mtlr r0 /* 8005FA0C 0005C96C 38 21 00 40 */ addi r1, r1, 0x40 -/* 8005FA10 0005C970 4E 80 00 20 */ blr +/* 8005FA10 0005C970 4E 80 00 20 */ blr .global TransferARAMTokensOver__9CGameAreaFQ29CGameArea13EARAMTransfer TransferARAMTokensOver__9CGameAreaFQ29CGameArea13EARAMTransfer: @@ -2424,7 +2424,7 @@ lbl_8005FB7C: /* 8005FB80 0005CAE0 80 01 00 44 */ lwz r0, 0x44(r1) /* 8005FB84 0005CAE4 7C 08 03 A6 */ mtlr r0 /* 8005FB88 0005CAE8 38 21 00 40 */ addi r1, r1, 0x40 -/* 8005FB8C 0005CAEC 4E 80 00 20 */ blr +/* 8005FB8C 0005CAEC 4E 80 00 20 */ blr .global SetChain__9CGameAreaFP9CGameAreai SetChain__9CGameAreaFP9CGameAreai: @@ -2432,7 +2432,7 @@ SetChain__9CGameAreaFP9CGameAreai: /* 8005FB94 0005CAF4 7C 00 28 00 */ cmpw r0, r5 /* 8005FB98 0005CAF8 40 82 00 0C */ bne lbl_8005FBA4 /* 8005FB9C 0005CAFC 7C 03 03 78 */ mr r3, r0 -/* 8005FBA0 0005CB00 4E 80 00 20 */ blr +/* 8005FBA0 0005CB00 4E 80 00 20 */ blr lbl_8005FBA4: /* 8005FBA4 0005CB04 80 C3 01 34 */ lwz r6, 0x134(r3) /* 8005FBA8 0005CB08 28 06 00 00 */ cmplwi r6, 0 @@ -2456,7 +2456,7 @@ lbl_8005FBE4: /* 8005FBE4 0005CB44 80 03 01 38 */ lwz r0, 0x138(r3) /* 8005FBE8 0005CB48 90 A3 01 38 */ stw r5, 0x138(r3) /* 8005FBEC 0005CB4C 7C 03 03 78 */ mr r3, r0 -/* 8005FBF0 0005CB50 4E 80 00 20 */ blr +/* 8005FBF0 0005CB50 4E 80 00 20 */ blr .global StartStreamingMainArea__9CGameAreaFv StartStreamingMainArea__9CGameAreaFv: @@ -2656,7 +2656,7 @@ lbl_8005FE8C: /* 8005FEC4 0005CE24 38 80 00 01 */ li r4, 1 /* 8005FEC8 0005CE28 81 8C 00 08 */ lwz r12, 8(r12) /* 8005FECC 0005CE2C 7D 89 03 A6 */ mtctr r12 -/* 8005FED0 0005CE30 4E 80 04 21 */ bctrl +/* 8005FED0 0005CE30 4E 80 04 21 */ bctrl lbl_8005FED4: /* 8005FED4 0005CE34 80 1E 01 28 */ lwz r0, 0x128(r30) /* 8005FED8 0005CE38 38 60 00 00 */ li r3, 0 @@ -2799,7 +2799,7 @@ lbl_800600BC: /* 800600C0 0005D020 80 01 00 74 */ lwz r0, 0x74(r1) /* 800600C4 0005D024 7C 08 03 A6 */ mtlr r0 /* 800600C8 0005D028 38 21 00 70 */ addi r1, r1, 0x70 -/* 800600CC 0005D02C 4E 80 00 20 */ blr +/* 800600CC 0005D02C 4E 80 00 20 */ blr .global sub_800600d0 sub_800600d0: @@ -2820,7 +2820,7 @@ sub_800600d0: /* 80060108 0005D068 83 C1 00 08 */ lwz r30, 8(r1) /* 8006010C 0005D06C 7C 08 03 A6 */ mtlr r0 /* 80060110 0005D070 38 21 00 10 */ addi r1, r1, 0x10 -/* 80060114 0005D074 4E 80 00 20 */ blr +/* 80060114 0005D074 4E 80 00 20 */ blr .global __dt__Q29CGameArea16CPostConstructedFv __dt__Q29CGameArea16CPostConstructedFv: @@ -3092,7 +3092,7 @@ lbl_80060498: /* 800604AC 0005D40C 83 81 00 70 */ lwz r28, 0x70(r1) /* 800604B0 0005D410 7C 08 03 A6 */ mtlr r0 /* 800604B4 0005D414 38 21 00 80 */ addi r1, r1, 0x80 -/* 800604B8 0005D418 4E 80 00 20 */ blr +/* 800604B8 0005D418 4E 80 00 20 */ blr .global sub_800604bc sub_800604bc: @@ -3132,7 +3132,7 @@ lbl_8006052C: /* 80060538 0005D498 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8006053C 0005D49C 7C 08 03 A6 */ mtlr r0 /* 80060540 0005D4A0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80060544 0005D4A4 4E 80 00 20 */ blr +/* 80060544 0005D4A4 4E 80 00 20 */ blr .global "destroy,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl136pointer_iterator<21CMetroidModelInstance,Q24rstl58vector<21CMetroidModelInstance,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl136pointer_iterator<21CMetroidModelInstance,Q24rstl58vector<21CMetroidModelInstance,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>" "destroy,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl136pointer_iterator<21CMetroidModelInstance,Q24rstl58vector<21CMetroidModelInstance,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl136pointer_iterator<21CMetroidModelInstance,Q24rstl58vector<21CMetroidModelInstance,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>": @@ -3157,7 +3157,7 @@ lbl_80060574: /* 80060588 0005D4E8 83 C1 00 08 */ lwz r30, 8(r1) /* 8006058C 0005D4EC 7C 08 03 A6 */ mtlr r0 /* 80060590 0005D4F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80060594 0005D4F4 4E 80 00 20 */ blr +/* 80060594 0005D4F4 4E 80 00 20 */ blr .global __dt__21CMetroidModelInstanceFv __dt__21CMetroidModelInstanceFv: @@ -3190,7 +3190,7 @@ lbl_800605F4: /* 800605F4 0005D554 80 01 00 24 */ lwz r0, 0x24(r1) /* 800605F8 0005D558 7C 08 03 A6 */ mtlr r0 /* 800605FC 0005D55C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80060600 0005D560 4E 80 00 20 */ blr +/* 80060600 0005D560 4E 80 00 20 */ blr .global UnloadAllloadedTextures__9CGameAreaFv UnloadAllloadedTextures__9CGameAreaFv: @@ -3247,7 +3247,7 @@ lbl_800606A8: /* 800606BC 0005D61C 80 01 00 34 */ lwz r0, 0x34(r1) /* 800606C0 0005D620 7C 08 03 A6 */ mtlr r0 /* 800606C4 0005D624 38 21 00 30 */ addi r1, r1, 0x30 -/* 800606C8 0005D628 4E 80 00 20 */ blr +/* 800606C8 0005D628 4E 80 00 20 */ blr .global ReloadAllUnloadedTextures__9CGameAreaFv ReloadAllUnloadedTextures__9CGameAreaFv: @@ -3302,14 +3302,14 @@ lbl_80060768: /* 8006077C 0005D6DC 80 01 00 34 */ lwz r0, 0x34(r1) /* 80060780 0005D6E0 7C 08 03 A6 */ mtlr r0 /* 80060784 0005D6E4 38 21 00 30 */ addi r1, r1, 0x30 -/* 80060788 0005D6E8 4E 80 00 20 */ blr +/* 80060788 0005D6E8 4E 80 00 20 */ blr .global GetNumPartSizes__9CGameAreaCFv GetNumPartSizes__9CGameAreaCFv: /* 8006078C 0005D6EC 80 63 01 1C */ lwz r3, 0x11c(r3) /* 80060790 0005D6F0 80 63 00 04 */ lwz r3, 4(r3) /* 80060794 0005D6F4 80 63 00 3C */ lwz r3, 0x3c(r3) -/* 80060798 0005D6F8 4E 80 00 20 */ blr +/* 80060798 0005D6F8 4E 80 00 20 */ blr .global AllocNewAreaData__9CGameAreaFii AllocNewAreaData__9CGameAreaFii: @@ -3440,7 +3440,7 @@ lbl_80060938: /* 80060970 0005D8D0 38 80 00 01 */ li r4, 1 /* 80060974 0005D8D4 81 8C 00 08 */ lwz r12, 8(r12) /* 80060978 0005D8D8 7D 89 03 A6 */ mtctr r12 -/* 8006097C 0005D8DC 4E 80 04 21 */ bctrl +/* 8006097C 0005D8DC 4E 80 04 21 */ bctrl lbl_80060980: /* 80060980 0005D8E0 88 01 00 28 */ lbz r0, 0x28(r1) /* 80060984 0005D8E4 28 00 00 00 */ cmplwi r0, 0 @@ -3456,7 +3456,7 @@ lbl_80060994: /* 800609A8 0005D908 83 81 00 40 */ lwz r28, 0x40(r1) /* 800609AC 0005D90C 7C 08 03 A6 */ mtlr r0 /* 800609B0 0005D910 38 21 00 50 */ addi r1, r1, 0x50 -/* 800609B4 0005D914 4E 80 00 20 */ blr +/* 800609B4 0005D914 4E 80 00 20 */ blr .global Invalidate__9CGameAreaFP13CStateManager Invalidate__9CGameAreaFP13CStateManager: @@ -3481,14 +3481,14 @@ lbl_800609F0: /* 800609FC 0005D95C 81 83 00 00 */ lwz r12, 0(r3) /* 80060A00 0005D960 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80060A04 0005D964 7D 89 03 A6 */ mtctr r12 -/* 80060A08 0005D968 4E 80 04 21 */ bctrl +/* 80060A08 0005D968 4E 80 04 21 */ bctrl /* 80060A0C 0005D96C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80060A10 0005D970 40 82 00 1C */ bne lbl_80060A2C /* 80060A14 0005D974 80 7E 00 0C */ lwz r3, 0xc(r30) /* 80060A18 0005D978 81 83 00 00 */ lwz r12, 0(r3) /* 80060A1C 0005D97C 81 8C 00 14 */ lwz r12, 0x14(r12) /* 80060A20 0005D980 7D 89 03 A6 */ mtctr r12 -/* 80060A24 0005D984 4E 80 04 21 */ bctrl +/* 80060A24 0005D984 4E 80 04 21 */ bctrl /* 80060A28 0005D988 48 00 00 10 */ b lbl_80060A38 lbl_80060A2C: /* 80060A2C 0005D98C 7F C4 F3 78 */ mr r4, r30 @@ -3566,7 +3566,7 @@ lbl_80060B28: /* 80060B34 0005DA94 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80060B38 0005DA98 7C 08 03 A6 */ mtlr r0 /* 80060B3C 0005DA9C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80060B40 0005DAA0 4E 80 00 20 */ blr +/* 80060B40 0005DAA0 4E 80 00 20 */ blr .global sub_80060b44 sub_80060b44: @@ -3586,7 +3586,7 @@ sub_80060b44: /* 80060B78 0005DAD8 80 01 00 24 */ lwz r0, 0x24(r1) /* 80060B7C 0005DADC 7C 08 03 A6 */ mtlr r0 /* 80060B80 0005DAE0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80060B84 0005DAE4 4E 80 00 20 */ blr +/* 80060B84 0005DAE4 4E 80 00 20 */ blr .global sub_80060b88 sub_80060b88: @@ -3679,7 +3679,7 @@ lbl_80060CA4: /* 80060CB4 0005DC14 83 81 00 20 */ lwz r28, 0x20(r1) /* 80060CB8 0005DC18 7C 08 03 A6 */ mtlr r0 /* 80060CBC 0005DC1C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80060CC0 0005DC20 4E 80 00 20 */ blr +/* 80060CC0 0005DC20 4E 80 00 20 */ blr .global sub_80060cc4 sub_80060cc4: @@ -3734,7 +3734,7 @@ lbl_80060D5C: /* 80060D70 0005DCD0 83 81 00 20 */ lwz r28, 0x20(r1) /* 80060D74 0005DCD4 7C 08 03 A6 */ mtlr r0 /* 80060D78 0005DCD8 38 21 00 30 */ addi r1, r1, 0x30 -/* 80060D7C 0005DCDC 4E 80 00 20 */ blr +/* 80060D7C 0005DCDC 4E 80 00 20 */ blr .global CullDeadAreaRequests__9CGameAreaFv CullDeadAreaRequests__9CGameAreaFv: @@ -3757,7 +3757,7 @@ lbl_80060DA4: /* 80060DB8 0005DD18 81 83 00 00 */ lwz r12, 0(r3) /* 80060DBC 0005DD1C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80060DC0 0005DD20 7D 89 03 A6 */ mtctr r12 -/* 80060DC4 0005DD24 4E 80 04 21 */ bctrl +/* 80060DC4 0005DD24 4E 80 04 21 */ bctrl /* 80060DC8 0005DD28 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80060DCC 0005DD2C 40 82 FF CC */ bne lbl_80060D98 lbl_80060DD0: @@ -3765,7 +3765,7 @@ lbl_80060DD0: /* 80060DD4 0005DD34 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80060DD8 0005DD38 7C 08 03 A6 */ mtlr r0 /* 80060DDC 0005DD3C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80060DE0 0005DD40 4E 80 00 20 */ blr +/* 80060DE0 0005DD40 4E 80 00 20 */ blr .global StartStreamIn__9CGameAreaFR13CStateManager StartStreamIn__9CGameAreaFR13CStateManager: @@ -3870,7 +3870,7 @@ lbl_80060F4C: /* 80060F50 0005DEB0 80 01 00 44 */ lwz r0, 0x44(r1) /* 80060F54 0005DEB4 7C 08 03 A6 */ mtlr r0 /* 80060F58 0005DEB8 38 21 00 40 */ addi r1, r1, 0x40 -/* 80060F5C 0005DEBC 4E 80 00 20 */ blr +/* 80060F5C 0005DEBC 4E 80 00 20 */ blr .global LoadScriptObjects__9CGameAreaFR13CStateManager LoadScriptObjects__9CGameAreaFR13CStateManager: @@ -3960,7 +3960,7 @@ lbl_80061090: /* 80061094 0005DFF4 80 01 00 94 */ lwz r0, 0x94(r1) /* 80061098 0005DFF8 7C 08 03 A6 */ mtlr r0 /* 8006109C 0005DFFC 38 21 00 90 */ addi r1, r1, 0x90 -/* 800610A0 0005E000 4E 80 00 20 */ blr +/* 800610A0 0005E000 4E 80 00 20 */ blr .global Validate__9CGameAreaFR13CStateManager Validate__9CGameAreaFR13CStateManager: @@ -3990,7 +3990,7 @@ lbl_800610EC: /* 800610F8 0005E058 81 83 00 00 */ lwz r12, 0(r3) /* 800610FC 0005E05C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80061100 0005E060 7D 89 03 A6 */ mtctr r12 -/* 80061104 0005E064 4E 80 04 21 */ bctrl +/* 80061104 0005E064 4E 80 04 21 */ bctrl lbl_80061108: /* 80061108 0005E068 83 FF 00 04 */ lwz r31, 4(r31) lbl_8006110C: @@ -4127,7 +4127,7 @@ lbl_800612D0: /* 800612E0 0005E240 83 81 00 30 */ lwz r28, 0x30(r1) /* 800612E4 0005E244 7C 08 03 A6 */ mtlr r0 /* 800612E8 0005E248 38 21 00 40 */ addi r1, r1, 0x40 -/* 800612EC 0005E24C 4E 80 00 20 */ blr +/* 800612EC 0005E24C 4E 80 00 20 */ blr .global PostConstructArea__9CGameAreaFv PostConstructArea__9CGameAreaFv: @@ -4657,7 +4657,7 @@ lbl_80061A58: /* 80061AA0 0005EA00 81 84 00 00 */ lwz r12, 0(r4) /* 80061AA4 0005EA04 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80061AA8 0005EA08 7D 89 03 A6 */ mtctr r12 -/* 80061AAC 0005EA0C 4E 80 04 21 */ bctrl +/* 80061AAC 0005EA0C 4E 80 04 21 */ bctrl /* 80061AB0 0005EA10 3A C1 00 54 */ addi r22, r1, 0x54 /* 80061AB4 0005EA14 38 81 00 24 */ addi r4, r1, 0x24 /* 80061AB8 0005EA18 7E C3 B3 78 */ mr r3, r22 @@ -5121,7 +5121,7 @@ lbl_800620FC: /* 80062118 0005F078 80 01 03 44 */ lwz r0, 0x344(r1) /* 8006211C 0005F07C 7C 08 03 A6 */ mtlr r0 /* 80062120 0005F080 38 21 03 40 */ addi r1, r1, 0x340 -/* 80062124 0005F084 4E 80 00 20 */ blr +/* 80062124 0005F084 4E 80 00 20 */ blr .global sub_80062128 sub_80062128: @@ -5184,7 +5184,7 @@ lbl_800621E4: /* 800621EC 0005F14C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 800621F0 0005F150 7C 08 03 A6 */ mtlr r0 /* 800621F4 0005F154 38 21 00 20 */ addi r1, r1, 0x20 -/* 800621F8 0005F158 4E 80 00 20 */ blr +/* 800621F8 0005F158 4E 80 00 20 */ blr .global sub_800621fc sub_800621fc: @@ -5233,7 +5233,7 @@ lbl_80062298: /* 80062298 0005F1F8 7C 03 20 40 */ cmplw r3, r4 /* 8006229C 0005F1FC 40 82 FF 64 */ bne lbl_80062200 /* 800622A0 0005F200 7C A3 2B 78 */ mr r3, r5 -/* 800622A4 0005F204 4E 80 00 20 */ blr +/* 800622A4 0005F204 4E 80 00 20 */ blr .global sub_800622a8 sub_800622a8: @@ -5303,7 +5303,7 @@ lbl_80062384: /* 80062398 0005F2F8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8006239C 0005F2FC 7C 08 03 A6 */ mtlr r0 /* 800623A0 0005F300 38 21 00 10 */ addi r1, r1, 0x10 -/* 800623A4 0005F304 4E 80 00 20 */ blr +/* 800623A4 0005F304 4E 80 00 20 */ blr .global sub_800623a8 sub_800623a8: @@ -5318,7 +5318,7 @@ sub_800623a8: /* 800623C8 0005F328 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800623CC 0005F32C 7C 08 03 A6 */ mtlr r0 /* 800623D0 0005F330 38 21 00 10 */ addi r1, r1, 0x10 -/* 800623D4 0005F334 4E 80 00 20 */ blr +/* 800623D4 0005F334 4E 80 00 20 */ blr .global sub_800623d8 sub_800623d8: @@ -5418,7 +5418,7 @@ lbl_80062530: /* 80062538 0005F498 83 C1 00 08 */ lwz r30, 8(r1) /* 8006253C 0005F49C 7C 08 03 A6 */ mtlr r0 /* 80062540 0005F4A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80062544 0005F4A4 4E 80 00 20 */ blr +/* 80062544 0005F4A4 4E 80 00 20 */ blr .global FillInStaticGeometry__9CGameAreaFv FillInStaticGeometry__9CGameAreaFv: @@ -5579,7 +5579,7 @@ lbl_8006276C: /* 80062770 0005F6D0 80 01 01 04 */ lwz r0, 0x104(r1) /* 80062774 0005F6D4 7C 08 03 A6 */ mtlr r0 /* 80062778 0005F6D8 38 21 01 00 */ addi r1, r1, 0x100 -/* 8006277C 0005F6DC 4E 80 00 20 */ blr +/* 8006277C 0005F6DC 4E 80 00 20 */ blr .global sub_80062780 sub_80062780: @@ -5615,7 +5615,7 @@ lbl_800627C0: /* 800627EC 0005F74C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800627F0 0005F750 7C 08 03 A6 */ mtlr r0 /* 800627F4 0005F754 38 21 00 10 */ addi r1, r1, 0x10 -/* 800627F8 0005F758 4E 80 00 20 */ blr +/* 800627F8 0005F758 4E 80 00 20 */ blr .global sub_800627fc sub_800627fc: @@ -5629,7 +5629,7 @@ lbl_80062814: /* 80062814 0005F774 80 01 00 14 */ lwz r0, 0x14(r1) /* 80062818 0005F778 7C 08 03 A6 */ mtlr r0 /* 8006281C 0005F77C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80062820 0005F780 4E 80 00 20 */ blr +/* 80062820 0005F780 4E 80 00 20 */ blr .global sub_80062824 sub_80062824: @@ -5718,7 +5718,7 @@ lbl_80062920: /* 80062954 0005F8B4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80062958 0005F8B8 7C 08 03 A6 */ mtlr r0 /* 8006295C 0005F8BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80062960 0005F8C0 4E 80 00 20 */ blr +/* 80062960 0005F8C0 4E 80 00 20 */ blr .global "clear__Q24rstl58vector<21CMetroidModelInstance,Q24rstl17rmemory_allocator>Fv" "clear__Q24rstl58vector<21CMetroidModelInstance,Q24rstl17rmemory_allocator>Fv": @@ -5745,7 +5745,7 @@ lbl_80062920: /* 800629B4 0005F914 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 800629B8 0005F918 7C 08 03 A6 */ mtlr r0 /* 800629BC 0005F91C 38 21 00 20 */ addi r1, r1, 0x20 -/* 800629C0 0005F920 4E 80 00 20 */ blr +/* 800629C0 0005F920 4E 80 00 20 */ blr .global GetScriptingMemoryAlways__FRC9IGameArea GetScriptingMemoryAlways__FRC9IGameArea: @@ -5758,7 +5758,7 @@ GetScriptingMemoryAlways__FRC9IGameArea: /* 800629DC 0005F93C 81 84 00 00 */ lwz r12, 0(r4) /* 800629E0 0005F940 81 8C 00 20 */ lwz r12, 0x20(r12) /* 800629E4 0005F944 7D 89 03 A6 */ mtctr r12 -/* 800629E8 0005F948 4E 80 04 21 */ bctrl +/* 800629E8 0005F948 4E 80 04 21 */ bctrl /* 800629EC 0005F94C 3C A0 4D 52 */ lis r5, 0x4D524541@ha /* 800629F0 0005F950 3C 80 80 3D */ lis r4, lbl_803CCFAC@ha /* 800629F4 0005F954 38 05 45 41 */ addi r0, r5, 0x4D524541@l @@ -5926,7 +5926,7 @@ lbl_80062BDC: /* 80062C58 0005FBB8 38 80 00 01 */ li r4, 1 /* 80062C5C 0005FBBC 81 8C 00 08 */ lwz r12, 8(r12) /* 80062C60 0005FBC0 7D 89 03 A6 */ mtctr r12 -/* 80062C64 0005FBC4 4E 80 04 21 */ bctrl +/* 80062C64 0005FBC4 4E 80 04 21 */ bctrl lbl_80062C68: /* 80062C68 0005FBC8 88 01 00 2C */ lbz r0, 0x2c(r1) /* 80062C6C 0005FBCC 28 00 00 00 */ cmplwi r0, 0 @@ -5960,7 +5960,7 @@ lbl_80062CBC: /* 80062CCC 0005FC2C 38 80 00 01 */ li r4, 1 /* 80062CD0 0005FC30 81 8C 00 08 */ lwz r12, 8(r12) /* 80062CD4 0005FC34 7D 89 03 A6 */ mtctr r12 -/* 80062CD8 0005FC38 4E 80 04 21 */ bctrl +/* 80062CD8 0005FC38 4E 80 04 21 */ bctrl lbl_80062CDC: /* 80062CDC 0005FC3C 80 61 00 20 */ lwz r3, 0x20(r1) /* 80062CE0 0005FC40 28 03 00 00 */ cmplwi r3, 0 @@ -5969,7 +5969,7 @@ lbl_80062CDC: /* 80062CEC 0005FC4C 38 80 00 01 */ li r4, 1 /* 80062CF0 0005FC50 81 8C 00 08 */ lwz r12, 8(r12) /* 80062CF4 0005FC54 7D 89 03 A6 */ mtctr r12 -/* 80062CF8 0005FC58 4E 80 04 21 */ bctrl +/* 80062CF8 0005FC58 4E 80 04 21 */ bctrl lbl_80062CFC: /* 80062CFC 0005FC5C 88 01 00 34 */ lbz r0, 0x34(r1) /* 80062D00 0005FC60 28 00 00 00 */ cmplwi r0, 0 @@ -5996,7 +5996,7 @@ lbl_80062D3C: /* 80062D4C 0005FCAC 38 80 00 01 */ li r4, 1 /* 80062D50 0005FCB0 81 8C 00 08 */ lwz r12, 8(r12) /* 80062D54 0005FCB4 7D 89 03 A6 */ mtctr r12 -/* 80062D58 0005FCB8 4E 80 04 21 */ bctrl +/* 80062D58 0005FCB8 4E 80 04 21 */ bctrl lbl_80062D5C: /* 80062D5C 0005FCBC 88 01 00 34 */ lbz r0, 0x34(r1) /* 80062D60 0005FCC0 28 00 00 00 */ cmplwi r0, 0 @@ -6008,7 +6008,7 @@ lbl_80062D70: /* 80062D74 0005FCD4 80 01 00 74 */ lwz r0, 0x74(r1) /* 80062D78 0005FCD8 7C 08 03 A6 */ mtlr r0 /* 80062D7C 0005FCDC 38 21 00 70 */ addi r1, r1, 0x70 -/* 80062D80 0005FCE0 4E 80 00 20 */ blr +/* 80062D80 0005FCE0 4E 80 00 20 */ blr .global VerifyTokenList__9CGameAreaFv VerifyTokenList__9CGameAreaFv: @@ -6070,7 +6070,7 @@ lbl_80062E2C: /* 80062E50 0005FDB0 81 84 00 00 */ lwz r12, 0(r4) /* 80062E54 0005FDB4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80062E58 0005FDB8 7D 89 03 A6 */ mtctr r12 -/* 80062E5C 0005FDBC 4E 80 04 21 */ bctrl +/* 80062E5C 0005FDBC 4E 80 04 21 */ bctrl /* 80062E60 0005FDC0 80 1A 00 E0 */ lwz r0, 0xe0(r26) /* 80062E64 0005FDC4 80 BA 00 E4 */ lwz r5, 0xe4(r26) /* 80062E68 0005FDC8 7C 00 28 00 */ cmpw r0, r5 @@ -6113,7 +6113,7 @@ lbl_80062EDC: /* 80062EE0 0005FE40 80 01 00 54 */ lwz r0, 0x54(r1) /* 80062EE4 0005FE44 7C 08 03 A6 */ mtlr r0 /* 80062EE8 0005FE48 38 21 00 50 */ addi r1, r1, 0x50 -/* 80062EEC 0005FE4C 4E 80 00 20 */ blr +/* 80062EEC 0005FE4C 4E 80 00 20 */ blr .global ClearTokenList__9CGameAreaFv ClearTokenList__9CGameAreaFv: @@ -6162,7 +6162,7 @@ lbl_80062F6C: /* 80062F88 0005FEE8 80 01 00 34 */ lwz r0, 0x34(r1) /* 80062F8C 0005FEEC 7C 08 03 A6 */ mtlr r0 /* 80062F90 0005FEF0 38 21 00 30 */ addi r1, r1, 0x30 -/* 80062F94 0005FEF4 4E 80 00 20 */ blr +/* 80062F94 0005FEF4 4E 80 00 20 */ blr .global __dt__9CGameAreaFv __dt__9CGameAreaFv: @@ -6341,7 +6341,7 @@ lbl_800631E8: /* 800631FC 0006015C 83 81 00 60 */ lwz r28, 0x60(r1) /* 80063200 00060160 7C 08 03 A6 */ mtlr r0 /* 80063204 00060164 38 21 00 70 */ addi r1, r1, 0x70 -/* 80063208 00060168 4E 80 00 20 */ blr +/* 80063208 00060168 4E 80 00 20 */ blr .global sub_8006320c sub_8006320c: @@ -6367,7 +6367,7 @@ lbl_80063248: /* 80063254 000601B4 83 C1 00 08 */ lwz r30, 8(r1) /* 80063258 000601B8 7C 08 03 A6 */ mtlr r0 /* 8006325C 000601BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80063260 000601C0 4E 80 00 20 */ blr +/* 80063260 000601C0 4E 80 00 20 */ blr .global __ct__9CGameAreaFR12CInputStreami __ct__9CGameAreaFR12CInputStreami: @@ -6687,7 +6687,7 @@ lbl_80063694: /* 800636EC 0006064C 80 01 00 F4 */ lwz r0, 0xf4(r1) /* 800636F0 00060650 7C 08 03 A6 */ mtlr r0 /* 800636F4 00060654 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 800636F8 00060658 4E 80 00 20 */ blr +/* 800636F8 00060658 4E 80 00 20 */ blr .global "clear__Q24rstl37vectorFv" "clear__Q24rstl37vectorFv": @@ -6761,7 +6761,7 @@ lbl_800637D8: /* 800637E0 00060740 83 C1 00 18 */ lwz r30, 0x18(r1) /* 800637E4 00060744 7C 08 03 A6 */ mtlr r0 /* 800637E8 00060748 38 21 00 20 */ addi r1, r1, 0x20 -/* 800637EC 0006074C 4E 80 00 20 */ blr +/* 800637EC 0006074C 4E 80 00 20 */ blr .global __ct__Q29CGameArea16CPostConstructedFv __ct__Q29CGameArea16CPostConstructedFv: @@ -6898,7 +6898,7 @@ lbl_800638F4: /* 800639D4 00060934 D0 03 11 38 */ stfs f0, 0x1138(r3) /* 800639D8 00060938 90 83 11 3C */ stw r4, 0x113c(r3) /* 800639DC 0006093C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800639E0 00060940 4E 80 00 20 */ blr +/* 800639E0 00060940 4E 80 00 20 */ blr .global GetPostConstructedSize__9CGameAreaCFv GetPostConstructedSize__9CGameAreaCFv: @@ -6935,7 +6935,7 @@ lbl_80063A04: /* 80063A54 000609B4 7C 60 2A 14 */ add r3, r0, r5 /* 80063A58 000609B8 38 63 20 10 */ addi r3, r3, 0x2010 /* 80063A5C 000609BC 7C 68 1A 14 */ add r3, r8, r3 -/* 80063A60 000609C0 4E 80 00 20 */ blr +/* 80063A60 000609C0 4E 80 00 20 */ blr .global GetPreConstructedSize__9CGameAreaCFv GetPreConstructedSize__9CGameAreaCFv: @@ -6952,7 +6952,7 @@ GetPreConstructedSize__9CGameAreaCFv: /* 80063A8C 000609EC 7C 00 1A 14 */ add r0, r0, r3 /* 80063A90 000609F0 7C 60 2A 14 */ add r3, r0, r5 /* 80063A94 000609F4 38 63 01 44 */ addi r3, r3, 0x144 -/* 80063A98 000609F8 4E 80 00 20 */ blr +/* 80063A98 000609F8 4E 80 00 20 */ blr .global VerifyHeader__9CGameAreaCFv VerifyHeader__9CGameAreaCFv: @@ -6969,10 +6969,10 @@ VerifyHeader__9CGameAreaCFv: /* 80063AC4 00060A24 2C 03 00 0C */ cmpwi r3, 0xc /* 80063AC8 00060A28 41 80 00 0C */ blt lbl_80063AD4 /* 80063ACC 00060A2C 2C 03 00 0F */ cmpwi r3, 0xf -/* 80063AD0 00060A30 4C 81 00 20 */ blelr +/* 80063AD0 00060A30 4C 81 00 20 */ blelr lbl_80063AD4: /* 80063AD4 00060A34 38 60 00 00 */ li r3, 0 -/* 80063AD8 00060A38 4E 80 00 20 */ blr +/* 80063AD8 00060A38 4E 80 00 20 */ blr .global __dt__9IGameAreaFv __dt__9IGameAreaFv: @@ -6994,7 +6994,7 @@ lbl_80063B0C: /* 80063B14 00060A74 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80063B18 00060A78 7C 08 03 A6 */ mtlr r0 /* 80063B1C 00060A7C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80063B20 00060A80 4E 80 00 20 */ blr +/* 80063B20 00060A80 4E 80 00 20 */ blr .global "reserve__Q24rstl37vectorFi" "reserve__Q24rstl37vectorFi": @@ -7065,7 +7065,7 @@ lbl_80063BF4: /* 80063C00 00060B60 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80063C04 00060B64 7C 08 03 A6 */ mtlr r0 /* 80063C08 00060B68 38 21 00 30 */ addi r1, r1, 0x30 -/* 80063C0C 00060B6C 4E 80 00 20 */ blr +/* 80063C0C 00060B6C 4E 80 00 20 */ blr .global sub_80063c10 sub_80063c10: @@ -7136,7 +7136,7 @@ lbl_80063CE0: /* 80063CEC 00060C4C 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80063CF0 00060C50 7C 08 03 A6 */ mtlr r0 /* 80063CF4 00060C54 38 21 00 30 */ addi r1, r1, 0x30 -/* 80063CF8 00060C58 4E 80 00 20 */ blr +/* 80063CF8 00060C58 4E 80 00 20 */ blr .global sub_80063cfc sub_80063cfc: @@ -7195,7 +7195,7 @@ lbl_80063DB0: /* 80063DBC 00060D1C 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80063DC0 00060D20 7C 08 03 A6 */ mtlr r0 /* 80063DC4 00060D24 38 21 00 30 */ addi r1, r1, 0x30 -/* 80063DC8 00060D28 4E 80 00 20 */ blr +/* 80063DC8 00060D28 4E 80 00 20 */ blr .global sub_80063dcc sub_80063dcc: @@ -7219,7 +7219,7 @@ lbl_80063DF8: /* 80063E08 00060D68 83 C1 00 08 */ lwz r30, 8(r1) /* 80063E0C 00060D6C 7C 08 03 A6 */ mtlr r0 /* 80063E10 00060D70 38 21 00 10 */ addi r1, r1, 0x10 -/* 80063E14 00060D74 4E 80 00 20 */ blr +/* 80063E14 00060D74 4E 80 00 20 */ blr .global sub_80063e18 sub_80063e18: @@ -7250,7 +7250,7 @@ lbl_80063E54: /* 80063E70 00060DD0 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80063E74 00060DD4 7C 08 03 A6 */ mtlr r0 /* 80063E78 00060DD8 38 21 00 20 */ addi r1, r1, 0x20 -/* 80063E7C 00060DDC 4E 80 00 20 */ blr +/* 80063E7C 00060DDC 4E 80 00 20 */ blr .global "reserve__Q24rstl68vectorFi" "reserve__Q24rstl68vectorFi": @@ -7325,7 +7325,7 @@ lbl_80063F60: /* 80063F6C 00060ECC 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80063F70 00060ED0 7C 08 03 A6 */ mtlr r0 /* 80063F74 00060ED4 38 21 00 30 */ addi r1, r1, 0x30 -/* 80063F78 00060ED8 4E 80 00 20 */ blr +/* 80063F78 00060ED8 4E 80 00 20 */ blr .global sub_80063f7c sub_80063f7c: @@ -7389,7 +7389,7 @@ lbl_8006403C: /* 80064048 00060FA8 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8006404C 00060FAC 7C 08 03 A6 */ mtlr r0 /* 80064050 00060FB0 38 21 00 30 */ addi r1, r1, 0x30 -/* 80064054 00060FB4 4E 80 00 20 */ blr +/* 80064054 00060FB4 4E 80 00 20 */ blr .global sub_80064058 sub_80064058: @@ -7440,7 +7440,7 @@ lbl_800640F8: /* 800640FC 0006105C 7C 03 00 40 */ cmplw r3, r0 /* 80064100 00061060 40 82 FF 60 */ bne lbl_80064060 /* 80064104 00061064 7C A3 2B 78 */ mr r3, r5 -/* 80064108 00061068 4E 80 00 20 */ blr +/* 80064108 00061068 4E 80 00 20 */ blr .global sub_8006410c sub_8006410c: @@ -7517,7 +7517,7 @@ lbl_800641F8: /* 800641FC 0006115C 80 01 00 34 */ lwz r0, 0x34(r1) /* 80064200 00061160 7C 08 03 A6 */ mtlr r0 /* 80064204 00061164 38 21 00 30 */ addi r1, r1, 0x30 -/* 80064208 00061168 4E 80 00 20 */ blr +/* 80064208 00061168 4E 80 00 20 */ blr .global "reserve__Q24rstl52vector,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl52vector,Q24rstl17rmemory_allocator>Fi": @@ -7590,7 +7590,7 @@ lbl_800642E4: /* 800642F0 00061250 83 A1 00 24 */ lwz r29, 0x24(r1) /* 800642F4 00061254 7C 08 03 A6 */ mtlr r0 /* 800642F8 00061258 38 21 00 30 */ addi r1, r1, 0x30 -/* 800642FC 0006125C 4E 80 00 20 */ blr +/* 800642FC 0006125C 4E 80 00 20 */ blr .global "reserve__Q24rstl37vectorFi" "reserve__Q24rstl37vectorFi": @@ -7661,7 +7661,7 @@ lbl_800643D0: /* 800643DC 0006133C 83 A1 00 24 */ lwz r29, 0x24(r1) /* 800643E0 00061340 7C 08 03 A6 */ mtlr r0 /* 800643E4 00061344 38 21 00 30 */ addi r1, r1, 0x30 -/* 800643E8 00061348 4E 80 00 20 */ blr +/* 800643E8 00061348 4E 80 00 20 */ blr .global sub_800643ec sub_800643ec: @@ -7720,7 +7720,7 @@ lbl_800644A0: /* 800644AC 0006140C 83 A1 00 24 */ lwz r29, 0x24(r1) /* 800644B0 00061410 7C 08 03 A6 */ mtlr r0 /* 800644B4 00061414 38 21 00 30 */ addi r1, r1, 0x30 -/* 800644B8 00061418 4E 80 00 20 */ blr +/* 800644B8 00061418 4E 80 00 20 */ blr .global sub_800644bc sub_800644bc: @@ -7744,7 +7744,7 @@ lbl_800644E8: /* 800644F8 00061458 83 C1 00 08 */ lwz r30, 8(r1) /* 800644FC 0006145C 7C 08 03 A6 */ mtlr r0 /* 80064500 00061460 38 21 00 10 */ addi r1, r1, 0x10 -/* 80064504 00061464 4E 80 00 20 */ blr +/* 80064504 00061464 4E 80 00 20 */ blr .global sub_80064508 sub_80064508: @@ -7775,7 +7775,7 @@ lbl_80064544: /* 80064560 000614C0 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80064564 000614C4 7C 08 03 A6 */ mtlr r0 /* 80064568 000614C8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8006456C 000614CC 4E 80 00 20 */ blr +/* 8006456C 000614CC 4E 80 00 20 */ blr .global "reserve__Q24rstl72vector,i>,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl72vector,i>,Q24rstl17rmemory_allocator>Fi": @@ -7858,7 +7858,7 @@ lbl_80064674: /* 80064678 000615D8 80 01 00 34 */ lwz r0, 0x34(r1) /* 8006467C 000615DC 7C 08 03 A6 */ mtlr r0 /* 80064680 000615E0 38 21 00 30 */ addi r1, r1, 0x30 -/* 80064684 000615E4 4E 80 00 20 */ blr +/* 80064684 000615E4 4E 80 00 20 */ blr .global "pop_front__Q24rstl65list,Q24rstl17rmemory_allocator>Fv" "pop_front__Q24rstl65list,Q24rstl17rmemory_allocator>Fv": @@ -7894,7 +7894,7 @@ lbl_800646BC: /* 800646F8 00061658 38 80 00 01 */ li r4, 1 /* 800646FC 0006165C 81 8C 00 08 */ lwz r12, 8(r12) /* 80064700 00061660 7D 89 03 A6 */ mtctr r12 -/* 80064704 00061664 4E 80 04 21 */ bctrl +/* 80064704 00061664 4E 80 04 21 */ bctrl lbl_80064708: /* 80064708 00061668 28 1E 00 00 */ cmplwi r30, 0 /* 8006470C 0006166C 41 82 00 0C */ beq lbl_80064718 @@ -7911,7 +7911,7 @@ lbl_80064718: /* 80064734 00061694 80 01 00 24 */ lwz r0, 0x24(r1) /* 80064738 00061698 7C 08 03 A6 */ mtlr r0 /* 8006473C 0006169C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80064740 000616A0 4E 80 00 20 */ blr +/* 80064740 000616A0 4E 80 00 20 */ blr .global sub_80064744 sub_80064744: @@ -7942,7 +7942,7 @@ lbl_80064774: /* 800647A0 00061700 38 80 00 01 */ li r4, 1 /* 800647A4 00061704 81 8C 00 08 */ lwz r12, 8(r12) /* 800647A8 00061708 7D 89 03 A6 */ mtctr r12 -/* 800647AC 0006170C 4E 80 04 21 */ bctrl +/* 800647AC 0006170C 4E 80 04 21 */ bctrl lbl_800647B0: /* 800647B0 00061710 28 1E 00 00 */ cmplwi r30, 0 /* 800647B4 00061714 41 82 00 0C */ beq lbl_800647C0 @@ -7965,4 +7965,4 @@ lbl_800647DC: /* 800647F0 00061750 83 81 00 10 */ lwz r28, 0x10(r1) /* 800647F4 00061754 7C 08 03 A6 */ mtlr r0 /* 800647F8 00061758 38 21 00 20 */ addi r1, r1, 0x20 -/* 800647FC 0006175C 4E 80 00 20 */ blr +/* 800647FC 0006175C 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/CGameCollision.s b/asm/MetroidPrime/CGameCollision.s index c9e8cf06..10ab8384 100644 --- a/asm/MetroidPrime/CGameCollision.s +++ b/asm/MetroidPrime/CGameCollision.s @@ -612,7 +612,7 @@ lbl_80180220: /* 801802FC 0017D25C 80 01 1E 44 */ lwz r0, 0x1e44(r1) /* 80180300 0017D260 7C 08 03 A6 */ mtlr r0 /* 80180304 0017D264 38 21 1E 40 */ addi r1, r1, 0x1e40 -/* 80180308 0017D268 4E 80 00 20 */ blr +/* 80180308 0017D268 4E 80 00 20 */ blr .global GetActorRelativeVelocities__14CGameCollisionFPC13CPhysicsActorPC13CPhysicsActor GetActorRelativeVelocities__14CGameCollisionFPC13CPhysicsActorPC13CPhysicsActor: @@ -673,7 +673,7 @@ lbl_801803AC: /* 801803DC 0017D33C 83 A1 00 24 */ lwz r29, 0x24(r1) /* 801803E0 0017D340 7C 08 03 A6 */ mtlr r0 /* 801803E4 0017D344 38 21 00 60 */ addi r1, r1, 0x60 -/* 801803E8 0017D348 4E 80 00 20 */ blr +/* 801803E8 0017D348 4E 80 00 20 */ blr .global "FindNonIntersectingVector__14CGameCollisionFR13CStateManagerRC19CAreaCollisionCacheRC13CPhysicsActorRC19CCollisionPrimitiveRCQ24rstl32reserved_vector<9TUniqueId,1024>" "FindNonIntersectingVector__14CGameCollisionFR13CStateManagerRC19CAreaCollisionCacheRC13CPhysicsActorRC19CCollisionPrimitiveRCQ24rstl32reserved_vector<9TUniqueId,1024>": @@ -718,7 +718,7 @@ lbl_801803AC: /* 80180484 0017D3E4 81 8C 00 70 */ lwz r12, 0x70(r12) /* 80180488 0017D3E8 38 61 00 58 */ addi r3, r1, 0x58 /* 8018048C 0017D3EC 7D 89 03 A6 */ mtctr r12 -/* 80180490 0017D3F0 4E 80 04 21 */ bctrl +/* 80180490 0017D3F0 4E 80 04 21 */ bctrl /* 80180494 0017D3F4 38 61 00 88 */ addi r3, r1, 0x88 /* 80180498 0017D3F8 38 81 00 58 */ addi r4, r1, 0x58 /* 8018049C 0017D3FC 48 19 26 D9 */ bl __ct__12CTransform4fFRC12CTransform4f @@ -731,7 +731,7 @@ lbl_801803AC: /* 801804B8 0017D418 C3 81 00 A4 */ lfs f28, 0xa4(r1) /* 801804BC 0017D41C C3 A1 00 94 */ lfs f29, 0x94(r1) /* 801804C0 0017D420 7D 89 03 A6 */ mtctr r12 -/* 801804C4 0017D424 4E 80 04 21 */ bctrl +/* 801804C4 0017D424 4E 80 04 21 */ bctrl /* 801804C8 0017D428 38 61 00 28 */ addi r3, r1, 0x28 /* 801804CC 0017D42C 38 81 00 40 */ addi r4, r1, 0x40 /* 801804D0 0017D430 48 1B 71 3D */ bl GetCenterPoint__6CAABoxCFv @@ -768,7 +768,7 @@ lbl_8018052C: /* 80180544 0017D4A4 38 63 3F 80 */ addi r3, r3, lbl_803E3F80@l /* 80180548 0017D4A8 7C 03 A8 2E */ lwzx r0, r3, r21 /* 8018054C 0017D4AC 7C 09 03 A6 */ mtctr r0 -/* 80180550 0017D4B0 4E 80 04 20 */ bctr +/* 80180550 0017D4B0 4E 80 04 20 */ bctr .global lbl_80180554 lbl_80180554: /* 80180554 0017D4B4 C3 42 A2 A8 */ lfs f26, lbl_805ABFC8@sda21(r2) @@ -1030,7 +1030,7 @@ lbl_80180810: /* 8018087C 0017D7DC 80 01 01 C4 */ lwz r0, 0x1c4(r1) /* 80180880 0017D7E0 7C 08 03 A6 */ mtlr r0 /* 80180884 0017D7E4 38 21 01 C0 */ addi r1, r1, 0x1c0 -/* 80180888 0017D7E8 4E 80 00 20 */ blr +/* 80180888 0017D7E8 4E 80 00 20 */ blr .global "CollisionFailsafe__14CGameCollisionFRC13CStateManagerR19CAreaCollisionCacheR13CPhysicsActorRC19CCollisionPrimitiveRCQ24rstl32reserved_vector<9TUniqueId,1024>fUi" "CollisionFailsafe__14CGameCollisionFRC13CStateManagerR19CAreaCollisionCacheR13CPhysicsActorRC19CCollisionPrimitiveRCQ24rstl32reserved_vector<9TUniqueId,1024>fUi": @@ -1070,7 +1070,7 @@ lbl_801808EC: /* 8018090C 0017D86C 38 61 02 50 */ addi r3, r1, 0x250 /* 80180910 0017D870 81 8C 00 70 */ lwz r12, 0x70(r12) /* 80180914 0017D874 7D 89 03 A6 */ mtctr r12 -/* 80180918 0017D878 4E 80 04 21 */ bctrl +/* 80180918 0017D878 4E 80 04 21 */ bctrl /* 8018091C 0017D87C 7F 63 DB 78 */ mr r3, r27 /* 80180920 0017D880 7F 84 E3 78 */ mr r4, r28 /* 80180924 0017D884 7F C5 F3 78 */ mr r5, r30 @@ -1142,7 +1142,7 @@ lbl_80180940: /* 80180A28 0017D988 38 61 01 84 */ addi r3, r1, 0x184 /* 80180A2C 0017D98C 81 8C 00 70 */ lwz r12, 0x70(r12) /* 80180A30 0017D990 7D 89 03 A6 */ mtctr r12 -/* 80180A34 0017D994 4E 80 04 21 */ bctrl +/* 80180A34 0017D994 4E 80 04 21 */ bctrl /* 80180A38 0017D998 7F 63 DB 78 */ mr r3, r27 /* 80180A3C 0017D99C 7F 84 E3 78 */ mr r4, r28 /* 80180A40 0017D9A0 7F C5 F3 78 */ mr r5, r30 @@ -1451,7 +1451,7 @@ lbl_80180ED8: /* 80180EE4 0017DE44 80 01 02 B4 */ lwz r0, 0x2b4(r1) /* 80180EE8 0017DE48 7C 08 03 A6 */ mtlr r0 /* 80180EEC 0017DE4C 38 21 02 B0 */ addi r1, r1, 0x2b0 -/* 80180EF0 0017DE50 4E 80 00 20 */ blr +/* 80180EF0 0017DE50 4E 80 00 20 */ blr .global "MoveAndCollide__14CGameCollisionFR13CStateManagerR13CPhysicsActorfRC16ICollisionFilterPCQ24rstl32reserved_vector<9TUniqueId,1024>" "MoveAndCollide__14CGameCollisionFR13CStateManagerR13CPhysicsActorfRC16ICollisionFilterPCQ24rstl32reserved_vector<9TUniqueId,1024>": @@ -1662,11 +1662,11 @@ lbl_801811E0: /* 801811F4 0017E154 81 9E 00 00 */ lwz r12, 0(r30) /* 801811F8 0017E158 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 801811FC 0017E15C 7D 89 03 A6 */ mtctr r12 -/* 80181200 0017E160 4E 80 04 21 */ bctrl +/* 80181200 0017E160 4E 80 04 21 */ bctrl /* 80181204 0017E164 81 83 00 00 */ lwz r12, 0(r3) /* 80181208 0017E168 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 8018120C 0017E16C 7D 89 03 A6 */ mtctr r12 -/* 80181210 0017E170 4E 80 04 21 */ bctrl +/* 80181210 0017E170 4E 80 04 21 */ bctrl /* 80181214 0017E174 3C 03 B0 BE */ addis r0, r3, 0xb0be /* 80181218 0017E178 28 00 54 47 */ cmplwi r0, 0x5447 /* 8018121C 0017E17C 41 82 00 30 */ beq lbl_8018124C @@ -1692,19 +1692,19 @@ lbl_8018124C: /* 80181268 0017E1C8 81 9E 00 00 */ lwz r12, 0(r30) /* 8018126C 0017E1CC 81 8C 00 70 */ lwz r12, 0x70(r12) /* 80181270 0017E1D0 7D 89 03 A6 */ mtctr r12 -/* 80181274 0017E1D4 4E 80 04 21 */ bctrl +/* 80181274 0017E1D4 4E 80 04 21 */ bctrl /* 80181278 0017E1D8 7F C3 F3 78 */ mr r3, r30 /* 8018127C 0017E1DC 81 9E 00 00 */ lwz r12, 0(r30) /* 80181280 0017E1E0 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 80181284 0017E1E4 7D 89 03 A6 */ mtctr r12 -/* 80181288 0017E1E8 4E 80 04 21 */ bctrl +/* 80181288 0017E1E8 4E 80 04 21 */ bctrl /* 8018128C 0017E1EC 7C 64 1B 78 */ mr r4, r3 /* 80181290 0017E1F0 38 61 00 A4 */ addi r3, r1, 0xa4 /* 80181294 0017E1F4 81 84 00 00 */ lwz r12, 0(r4) /* 80181298 0017E1F8 38 A1 02 80 */ addi r5, r1, 0x280 /* 8018129C 0017E1FC 81 8C 00 14 */ lwz r12, 0x14(r12) /* 801812A0 0017E200 7D 89 03 A6 */ mtctr r12 -/* 801812A4 0017E204 4E 80 04 21 */ bctrl +/* 801812A4 0017E204 4E 80 04 21 */ bctrl /* 801812A8 0017E208 C0 A1 00 A4 */ lfs f5, 0xa4(r1) /* 801812AC 0017E20C 38 61 00 5C */ addi r3, r1, 0x5c /* 801812B0 0017E210 C0 81 00 A8 */ lfs f4, 0xa8(r1) @@ -1730,7 +1730,7 @@ lbl_8018124C: /* 80181300 0017E260 81 9E 00 00 */ lwz r12, 0(r30) /* 80181304 0017E264 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 80181308 0017E268 7D 89 03 A6 */ mtctr r12 -/* 8018130C 0017E26C 4E 80 04 21 */ bctrl +/* 8018130C 0017E26C 4E 80 04 21 */ bctrl /* 80181310 0017E270 48 00 13 BD */ bl GetMinExtentForCollisionPrimitive__14CGameCollisionFRC19CCollisionPrimitive /* 80181314 0017E274 C0 02 A2 C4 */ lfs f0, lbl_805ABFE4@sda21(r2) /* 80181318 0017E278 EC 00 00 72 */ fmuls f0, f0, f1 @@ -1824,12 +1824,12 @@ lbl_80181454: /* 80181468 0017E3C8 81 9E 00 00 */ lwz r12, 0(r30) /* 8018146C 0017E3CC 81 8C 00 70 */ lwz r12, 0x70(r12) /* 80181470 0017E3D0 7D 89 03 A6 */ mtctr r12 -/* 80181474 0017E3D4 4E 80 04 21 */ bctrl +/* 80181474 0017E3D4 4E 80 04 21 */ bctrl /* 80181478 0017E3D8 7F C3 F3 78 */ mr r3, r30 /* 8018147C 0017E3DC 81 9E 00 00 */ lwz r12, 0(r30) /* 80181480 0017E3E0 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 80181484 0017E3E4 7D 89 03 A6 */ mtctr r12 -/* 80181488 0017E3E8 4E 80 04 21 */ bctrl +/* 80181488 0017E3E8 4E 80 04 21 */ bctrl /* 8018148C 0017E3EC 7C 65 1B 78 */ mr r5, r3 /* 80181490 0017E3F0 7F A3 EB 78 */ mr r3, r29 /* 80181494 0017E3F4 7F 27 CB 78 */ mr r7, r25 @@ -1879,12 +1879,12 @@ lbl_8018151C: /* 80181534 0017E494 81 9E 00 00 */ lwz r12, 0(r30) /* 80181538 0017E498 81 8C 00 70 */ lwz r12, 0x70(r12) /* 8018153C 0017E49C 7D 89 03 A6 */ mtctr r12 -/* 80181540 0017E4A0 4E 80 04 21 */ bctrl +/* 80181540 0017E4A0 4E 80 04 21 */ bctrl /* 80181544 0017E4A4 7F C3 F3 78 */ mr r3, r30 /* 80181548 0017E4A8 81 9E 00 00 */ lwz r12, 0(r30) /* 8018154C 0017E4AC 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 80181550 0017E4B0 7D 89 03 A6 */ mtctr r12 -/* 80181554 0017E4B4 4E 80 04 21 */ bctrl +/* 80181554 0017E4B4 4E 80 04 21 */ bctrl /* 80181558 0017E4B8 7C 65 1B 78 */ mr r5, r3 /* 8018155C 0017E4BC 7F A3 EB 78 */ mr r3, r29 /* 80181560 0017E4C0 7F 27 CB 78 */ mr r7, r25 @@ -1933,7 +1933,7 @@ lbl_8018151C: /* 8018160C 0017E56C 38 A1 0F 1C */ addi r5, r1, 0xf1c /* 80181610 0017E570 81 8C 00 08 */ lwz r12, 8(r12) /* 80181614 0017E574 7D 89 03 A6 */ mtctr r12 -/* 80181618 0017E578 4E 80 04 21 */ bctrl +/* 80181618 0017E578 4E 80 04 21 */ bctrl /* 8018161C 0017E57C 80 01 0F 1C */ lwz r0, 0xf1c(r1) /* 80181620 0017E580 2C 00 00 00 */ cmpwi r0, 0 /* 80181624 0017E584 40 82 01 34 */ bne lbl_80181758 @@ -2207,7 +2207,7 @@ lbl_801819F4: /* 80181A00 0017E960 81 9E 00 00 */ lwz r12, 0(r30) /* 80181A04 0017E964 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 80181A08 0017E968 7D 89 03 A6 */ mtctr r12 -/* 80181A0C 0017E96C 4E 80 04 21 */ bctrl +/* 80181A0C 0017E96C 4E 80 04 21 */ bctrl /* 80181A10 0017E970 FC 20 D8 90 */ fmr f1, f27 /* 80181A14 0017E974 7C 66 1B 78 */ mr r6, r3 /* 80181A18 0017E978 7F A3 EB 78 */ mr r3, r29 @@ -2339,7 +2339,7 @@ lbl_80181B84: /* 80181BCC 0017EB2C 80 01 4A F4 */ lwz r0, 0x4af4(r1) /* 80181BD0 0017EB30 7C 08 03 A6 */ mtlr r0 /* 80181BD4 0017EB34 38 21 4A F0 */ addi r1, r1, 0x4af0 -/* 80181BD8 0017EB38 4E 80 00 20 */ blr +/* 80181BD8 0017EB38 4E 80 00 20 */ blr .global "MovePlayer__14CGameCollisionFR13CStateManagerR13CPhysicsActorfPCQ24rstl32reserved_vector<9TUniqueId,1024>" "MovePlayer__14CGameCollisionFR13CStateManagerR13CPhysicsActorfPCQ24rstl32reserved_vector<9TUniqueId,1024>": @@ -2433,7 +2433,7 @@ lbl_80181D08: /* 80181D28 0017EC88 80 01 00 74 */ lwz r0, 0x74(r1) /* 80181D2C 0017EC8C 7C 08 03 A6 */ mtlr r0 /* 80181D30 0017EC90 38 21 00 70 */ addi r1, r1, 0x70 -/* 80181D34 0017EC94 4E 80 00 20 */ blr +/* 80181D34 0017EC94 4E 80 00 20 */ blr .global "Move__14CGameCollisionFR13CStateManagerR13CPhysicsActorfPCQ24rstl32reserved_vector<9TUniqueId,1024>" "Move__14CGameCollisionFR13CStateManagerR13CPhysicsActorfPCQ24rstl32reserved_vector<9TUniqueId,1024>": @@ -2585,7 +2585,7 @@ lbl_80181F48: /* 80181F5C 0017EEBC 83 A1 00 B4 */ lwz r29, 0xb4(r1) /* 80181F60 0017EEC0 7C 08 03 A6 */ mtlr r0 /* 80181F64 0017EEC4 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 80181F68 0017EEC8 4E 80 00 20 */ blr +/* 80181F68 0017EEC8 4E 80 00 20 */ blr .global CollideWithStaticBodyNoRot__14CGameCollisionFR13CPhysicsActorRC13CMaterialListRC13CMaterialListRC13CUnitVector3ffb CollideWithStaticBodyNoRot__14CGameCollisionFR13CPhysicsActorRC13CMaterialListRC13CMaterialListRC13CUnitVector3ffb: @@ -2692,7 +2692,7 @@ lbl_801820E4: /* 801820F0 0017F050 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 801820F4 0017F054 7C 08 03 A6 */ mtlr r0 /* 801820F8 0017F058 38 21 00 50 */ addi r1, r1, 0x50 -/* 801820FC 0017F05C 4E 80 00 20 */ blr +/* 801820FC 0017F05C 4E 80 00 20 */ blr .global CollideWithDynamicBodyNoRot__14CGameCollisionFR13CPhysicsActorR13CPhysicsActorRC14CCollisionInfofb CollideWithDynamicBodyNoRot__14CGameCollisionFR13CPhysicsActorR13CPhysicsActorRC14CCollisionInfofb: @@ -3029,7 +3029,7 @@ lbl_8018258C: /* 801825E0 0017F540 83 A1 00 A4 */ lwz r29, 0xa4(r1) /* 801825E4 0017F544 7C 08 03 A6 */ mtlr r0 /* 801825E8 0017F548 38 21 01 40 */ addi r1, r1, 0x140 -/* 801825EC 0017F54C 4E 80 00 20 */ blr +/* 801825EC 0017F54C 4E 80 00 20 */ blr .global ResolveCollisions__14CGameCollisionFR13CPhysicsActorP13CPhysicsActorRC18CCollisionInfoList ResolveCollisions__14CGameCollisionFR13CPhysicsActorP13CPhysicsActorRC18CCollisionInfoList: @@ -3091,7 +3091,7 @@ lbl_801826A4: /* 801826BC 0017F61C 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 801826C0 0017F620 7C 08 03 A6 */ mtlr r0 /* 801826C4 0017F624 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 801826C8 0017F628 4E 80 00 20 */ blr +/* 801826C8 0017F628 4E 80 00 20 */ blr .global GetMinExtentForCollisionPrimitive__14CGameCollisionFRC19CCollisionPrimitive GetMinExtentForCollisionPrimitive__14CGameCollisionFRC19CCollisionPrimitive: @@ -3103,7 +3103,7 @@ GetMinExtentForCollisionPrimitive__14CGameCollisionFRC19CCollisionPrimitive: /* 801826E0 0017F640 81 83 00 00 */ lwz r12, 0(r3) /* 801826E4 0017F644 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 801826E8 0017F648 7D 89 03 A6 */ mtctr r12 -/* 801826EC 0017F64C 4E 80 04 21 */ bctrl +/* 801826EC 0017F64C 4E 80 04 21 */ bctrl /* 801826F0 0017F650 3C 03 AC B0 */ addis r0, r3, 0xacb0 /* 801826F4 0017F654 28 00 48 52 */ cmplwi r0, 0x4852 /* 801826F8 0017F658 40 82 00 14 */ bne lbl_8018270C @@ -3116,7 +3116,7 @@ lbl_8018270C: /* 80182710 0017F670 81 9F 00 00 */ lwz r12, 0(r31) /* 80182714 0017F674 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80182718 0017F678 7D 89 03 A6 */ mtctr r12 -/* 8018271C 0017F67C 4E 80 04 21 */ bctrl +/* 8018271C 0017F67C 4E 80 04 21 */ bctrl /* 80182720 0017F680 3C 03 BE BF */ addis r0, r3, 0xbebf /* 80182724 0017F684 28 00 42 58 */ cmplwi r0, 0x4258 /* 80182728 0017F688 40 82 00 6C */ bne lbl_80182794 @@ -3155,7 +3155,7 @@ lbl_80182794: /* 80182798 0017F6F8 81 9F 00 00 */ lwz r12, 0(r31) /* 8018279C 0017F6FC 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 801827A0 0017F700 7D 89 03 A6 */ mtctr r12 -/* 801827A4 0017F704 4E 80 04 21 */ bctrl +/* 801827A4 0017F704 4E 80 04 21 */ bctrl /* 801827A8 0017F708 3C 03 BE BE */ addis r0, r3, 0xbebe /* 801827AC 0017F70C 28 00 53 48 */ cmplwi r0, 0x5348 /* 801827B0 0017F710 40 82 00 40 */ bne lbl_801827F0 @@ -3183,7 +3183,7 @@ lbl_801827F4: /* 801827F8 0017F758 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 801827FC 0017F75C 7C 08 03 A6 */ mtlr r0 /* 80182800 0017F760 38 21 00 30 */ addi r1, r1, 0x30 -/* 80182804 0017F764 4E 80 00 20 */ blr +/* 80182804 0017F764 4E 80 00 20 */ blr .global CanBlock__14CGameCollisionFRC13CMaterialListRC9CVector3f CanBlock__14CGameCollisionFRC13CMaterialListRC9CVector3f: @@ -3210,7 +3210,7 @@ lbl_80182834: /* 80182854 0017F7B4 7C 60 03 79 */ or. r0, r3, r0 /* 80182858 0017F7B8 40 82 00 0C */ bne lbl_80182864 /* 8018285C 0017F7BC 38 60 00 00 */ li r3, 0 -/* 80182860 0017F7C0 4E 80 00 20 */ blr +/* 80182860 0017F7C0 4E 80 00 20 */ blr lbl_80182864: /* 80182864 0017F7C4 38 A0 00 00 */ li r5, 0 /* 80182868 0017F7C8 3C 00 04 00 */ lis r0, 0x400 @@ -3221,7 +3221,7 @@ lbl_80182864: /* 8018287C 0017F7DC 7C 60 03 79 */ or. r0, r3, r0 /* 80182880 0017F7E0 41 82 00 0C */ beq lbl_8018288C /* 80182884 0017F7E4 38 60 00 00 */ li r3, 0 -/* 80182888 0017F7E8 4E 80 00 20 */ blr +/* 80182888 0017F7E8 4E 80 00 20 */ blr lbl_8018288C: /* 8018288C 0017F7EC 3C 60 80 00 */ lis r3, 0x8000 /* 80182890 0017F7F0 7C C0 28 38 */ and r0, r6, r5 @@ -3231,14 +3231,14 @@ lbl_8018288C: /* 801828A0 0017F800 7C 60 03 79 */ or. r0, r3, r0 /* 801828A4 0017F804 41 82 00 0C */ beq lbl_801828B0 /* 801828A8 0017F808 38 60 00 01 */ li r3, 1 -/* 801828AC 0017F80C 4E 80 00 20 */ blr +/* 801828AC 0017F80C 4E 80 00 20 */ blr lbl_801828B0: /* 801828B0 0017F810 C0 24 00 08 */ lfs f1, 8(r4) /* 801828B4 0017F814 C0 02 A2 EC */ lfs f0, lbl_805AC00C@sda21(r2) /* 801828B8 0017F818 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 801828BC 0017F81C 7C 00 00 26 */ mfcr r0 /* 801828C0 0017F820 54 03 17 FE */ rlwinm r3, r0, 2, 0x1f, 0x1f -/* 801828C4 0017F824 4E 80 00 20 */ blr +/* 801828C4 0017F824 4E 80 00 20 */ blr .global IsFloor__14CGameCollisionFRC13CMaterialListRC9CVector3f IsFloor__14CGameCollisionFRC13CMaterialListRC9CVector3f: @@ -3253,14 +3253,14 @@ IsFloor__14CGameCollisionFRC13CMaterialListRC9CVector3f: /* 801828E8 0017F848 7C 60 03 79 */ or. r0, r3, r0 /* 801828EC 0017F84C 41 82 00 0C */ beq lbl_801828F8 /* 801828F0 0017F850 38 60 00 01 */ li r3, 1 -/* 801828F4 0017F854 4E 80 00 20 */ blr +/* 801828F4 0017F854 4E 80 00 20 */ blr lbl_801828F8: /* 801828F8 0017F858 C0 24 00 08 */ lfs f1, 8(r4) /* 801828FC 0017F85C C0 02 A2 EC */ lfs f0, lbl_805AC00C@sda21(r2) /* 80182900 0017F860 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80182904 0017F864 7C 00 00 26 */ mfcr r0 /* 80182908 0017F868 54 03 17 FE */ rlwinm r3, r0, 2, 0x1f, 0x1f -/* 8018290C 0017F86C 4E 80 00 20 */ blr +/* 8018290C 0017F86C 4E 80 00 20 */ blr .global CollisionImpulseFiniteVsInfinite__Ffff CollisionImpulseFiniteVsInfinite__Ffff: @@ -3269,7 +3269,7 @@ CollisionImpulseFiniteVsInfinite__Ffff: /* 80182918 0017F878 FC 00 00 50 */ fneg f0, f0 /* 8018291C 0017F87C EC 00 00 B2 */ fmuls f0, f0, f2 /* 80182920 0017F880 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80182924 0017F884 4E 80 00 20 */ blr +/* 80182924 0017F884 4E 80 00 20 */ blr .global CollisionImpulseFiniteVsFinite__Fffff CollisionImpulseFiniteVsFinite__Fffff: @@ -3281,16 +3281,16 @@ CollisionImpulseFiniteVsFinite__Fffff: /* 8018293C 0017F89C FC 20 10 50 */ fneg f1, f2 /* 80182940 0017F8A0 EC 21 00 F2 */ fmuls f1, f1, f3 /* 80182944 0017F8A4 EC 21 00 24 */ fdivs f1, f1, f0 -/* 80182948 0017F8A8 4E 80 00 20 */ blr +/* 80182948 0017F8A8 4E 80 00 20 */ blr .global GetCoefficientOfRestitution__14CGameCollisionFRC14CCollisionInfo GetCoefficientOfRestitution__14CGameCollisionFRC14CCollisionInfo: /* 8018294C 0017F8AC C0 22 A2 A8 */ lfs f1, lbl_805ABFC8@sda21(r2) -/* 80182950 0017F8B0 4E 80 00 20 */ blr +/* 80182950 0017F8B0 4E 80 00 20 */ blr .global ShowCollisionResults__14CGameCollisionFR18CCollisionInfoListRC6CColor ShowCollisionResults__14CGameCollisionFR18CCollisionInfoListRC6CColor: -/* 80182954 0017F8B4 4E 80 00 20 */ blr +/* 80182954 0017F8B4 4E 80 00 20 */ blr .global SendMaterialMessage__14CGameCollisionFR13CStateManagerRC13CMaterialListR6CActor SendMaterialMessage__14CGameCollisionFR13CStateManagerRC13CMaterialListR6CActor: @@ -3335,7 +3335,7 @@ lbl_801829CC: /* 801829E0 0017F940 80 01 00 14 */ lwz r0, 0x14(r1) /* 801829E4 0017F944 7C 08 03 A6 */ mtlr r0 /* 801829E8 0017F948 38 21 00 10 */ addi r1, r1, 0x10 -/* 801829EC 0017F94C 4E 80 00 20 */ blr +/* 801829EC 0017F94C 4E 80 00 20 */ blr .global SendScriptMessages__14CGameCollisionFR13CStateManagerR6CActorP6CActorRC18CCollisionInfoList SendScriptMessages__14CGameCollisionFR13CStateManagerR6CActorP6CActorRC18CCollisionInfoList: @@ -3462,7 +3462,7 @@ lbl_80182BA4: /* 80182BA8 0017FB08 80 01 00 64 */ lwz r0, 0x64(r1) /* 80182BAC 0017FB0C 7C 08 03 A6 */ mtlr r0 /* 80182BB0 0017FB10 38 21 00 60 */ addi r1, r1, 0x60 -/* 80182BB4 0017FB14 4E 80 00 20 */ blr +/* 80182BB4 0017FB14 4E 80 00 20 */ blr .global MakeCollisionCallbacks__14CGameCollisionFR13CStateManagerR13CPhysicsActorRC9TUniqueIdRC18CCollisionInfoList MakeCollisionCallbacks__14CGameCollisionFR13CStateManagerR13CPhysicsActorRC9TUniqueIdRC18CCollisionInfoList: @@ -3481,7 +3481,7 @@ MakeCollisionCallbacks__14CGameCollisionFR13CStateManagerR13CPhysicsActorRC9TUni /* 80182BE8 0017FB48 81 9B 00 00 */ lwz r12, 0(r27) /* 80182BEC 0017FB4C 81 8C 00 74 */ lwz r12, 0x74(r12) /* 80182BF0 0017FB50 7D 89 03 A6 */ mtctr r12 -/* 80182BF4 0017FB54 4E 80 04 21 */ bctrl +/* 80182BF4 0017FB54 4E 80 04 21 */ bctrl /* 80182BF8 0017FB58 A0 7D 00 00 */ lhz r3, 0(r29) /* 80182BFC 0017FB5C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80182C00 0017FB60 7C 03 00 40 */ cmplw r3, r0 @@ -3520,7 +3520,7 @@ lbl_80182C58: /* 80182C7C 0017FBDC 81 9E 00 00 */ lwz r12, 0(r30) /* 80182C80 0017FBE0 81 8C 00 74 */ lwz r12, 0x74(r12) /* 80182C84 0017FBE4 7D 89 03 A6 */ mtctr r12 -/* 80182C88 0017FBE8 4E 80 04 21 */ bctrl +/* 80182C88 0017FBE8 4E 80 04 21 */ bctrl /* 80182C8C 0017FBEC 80 A1 00 18 */ lwz r5, 0x18(r1) /* 80182C90 0017FBF0 38 60 00 00 */ li r3, 0 /* 80182C94 0017FBF4 2C 05 00 00 */ cmpwi r5, 0 @@ -3551,7 +3551,7 @@ lbl_80182CE0: /* 80182CE4 0017FC44 80 01 0C 44 */ lwz r0, 0xc44(r1) /* 80182CE8 0017FC48 7C 08 03 A6 */ mtlr r0 /* 80182CEC 0017FC4C 38 21 0C 40 */ addi r1, r1, 0xc40 -/* 80182CF0 0017FC50 4E 80 00 20 */ blr +/* 80182CF0 0017FC50 4E 80 00 20 */ blr .global __ct__18CCollisionInfoListFRC18CCollisionInfoList __ct__18CCollisionInfoListFRC18CCollisionInfoList: @@ -3566,7 +3566,7 @@ __ct__18CCollisionInfoListFRC18CCollisionInfoList: /* 80182D14 0017FC74 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80182D18 0017FC78 7C 08 03 A6 */ mtlr r0 /* 80182D1C 0017FC7C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80182D20 0017FC80 4E 80 00 20 */ blr +/* 80182D20 0017FC80 4E 80 00 20 */ blr .global sub_80182d24 sub_80182d24: @@ -3586,7 +3586,7 @@ sub_80182d24: /* 80182D58 0017FCB8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80182D5C 0017FCBC 7C 08 03 A6 */ mtlr r0 /* 80182D60 0017FCC0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80182D64 0017FCC4 4E 80 00 20 */ blr +/* 80182D64 0017FCC4 4E 80 00 20 */ blr .global sub_80182d68 sub_80182d68: @@ -3620,7 +3620,7 @@ lbl_80182DB0: /* 80182DCC 0017FD2C 83 81 00 10 */ lwz r28, 0x10(r1) /* 80182DD0 0017FD30 7C 08 03 A6 */ mtlr r0 /* 80182DD4 0017FD34 38 21 00 20 */ addi r1, r1, 0x20 -/* 80182DD8 0017FD38 4E 80 00 20 */ blr +/* 80182DD8 0017FD38 4E 80 00 20 */ blr .global sub_80182ddc sub_80182ddc: @@ -3634,7 +3634,7 @@ lbl_80182DF4: /* 80182DF4 0017FD54 80 01 00 14 */ lwz r0, 0x14(r1) /* 80182DF8 0017FD58 7C 08 03 A6 */ mtlr r0 /* 80182DFC 0017FD5C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80182E00 0017FD60 4E 80 00 20 */ blr +/* 80182E00 0017FD60 4E 80 00 20 */ blr .global DetectStaticCollision_Cached_Moving__14CGameCollisionFRC13CStateManagerR19CAreaCollisionCacheRC19CCollisionPrimitiveRC12CTransform4fRC15CMaterialFilter9CVector3fR14CCollisionInfoRd DetectStaticCollision_Cached_Moving__14CGameCollisionFRC13CStateManagerR19CAreaCollisionCacheRC19CCollisionPrimitiveRC12CTransform4fRC15CMaterialFilter9CVector3fR14CCollisionInfoRd: @@ -3660,7 +3660,7 @@ DetectStaticCollision_Cached_Moving__14CGameCollisionFRC13CStateManagerR19CAreaC /* 80182E50 0017FDB0 7D 3B 4B 78 */ mr r27, r9 /* 80182E54 0017FDB4 7D 5C 53 78 */ mr r28, r10 /* 80182E58 0017FDB8 7D 89 03 A6 */ mtctr r12 -/* 80182E5C 0017FDBC 4E 80 04 21 */ bctrl +/* 80182E5C 0017FDBC 4E 80 04 21 */ bctrl /* 80182E60 0017FDC0 3C 03 B0 BE */ addis r0, r3, 0xb0be /* 80182E64 0017FDC4 28 00 54 47 */ cmplwi r0, 0x5447 /* 80182E68 0017FDC8 40 82 00 0C */ bne lbl_80182E74 @@ -3681,7 +3681,7 @@ lbl_80182E74: /* 80182EA0 0017FE00 EF A3 00 72 */ fmuls f29, f3, f1 /* 80182EA4 0017FE04 EF C3 00 32 */ fmuls f30, f3, f0 /* 80182EA8 0017FE08 7D 89 03 A6 */ mtctr r12 -/* 80182EAC 0017FE0C 4E 80 04 21 */ bctrl +/* 80182EAC 0017FE0C 4E 80 04 21 */ bctrl /* 80182EB0 0017FE10 C1 01 00 8C */ lfs f8, 0x8c(r1) /* 80182EB4 0017FE14 38 61 00 BC */ addi r3, r1, 0xbc /* 80182EB8 0017FE18 C0 E1 00 90 */ lfs f7, 0x90(r1) @@ -3768,7 +3768,7 @@ lbl_80182FF4: /* 80182FF8 0017FF58 81 9D 00 00 */ lwz r12, 0(r29) /* 80182FFC 0017FF5C 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80183000 0017FF60 7D 89 03 A6 */ mtctr r12 -/* 80183004 0017FF64 4E 80 04 21 */ bctrl +/* 80183004 0017FF64 4E 80 04 21 */ bctrl /* 80183008 0017FF68 3C 03 BE BF */ addis r0, r3, 0xbebf /* 8018300C 0017FF6C 28 00 42 58 */ cmplwi r0, 0x4258 /* 80183010 0017FF70 40 82 01 88 */ bne lbl_80183198 @@ -3877,7 +3877,7 @@ lbl_80183198: /* 8018319C 001800FC 81 9D 00 00 */ lwz r12, 0(r29) /* 801831A0 00180100 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 801831A4 00180104 7D 89 03 A6 */ mtctr r12 -/* 801831A8 00180108 4E 80 04 21 */ bctrl +/* 801831A8 00180108 4E 80 04 21 */ bctrl /* 801831AC 0018010C 3C 03 AC B0 */ addis r0, r3, 0xacb0 /* 801831B0 00180110 28 00 48 52 */ cmplwi r0, 0x4852 /* 801831B4 00180114 40 82 01 BC */ bne lbl_80183370 @@ -4007,7 +4007,7 @@ lbl_80183374: /* 80183390 001802F0 80 01 02 14 */ lwz r0, 0x214(r1) /* 80183394 001802F4 7C 08 03 A6 */ mtlr r0 /* 80183398 001802F8 38 21 02 10 */ addi r1, r1, 0x210 -/* 8018339C 001802FC 4E 80 00 20 */ blr +/* 8018339C 001802FC 4E 80 00 20 */ blr .global DetectStaticCollisionBoolean__14CGameCollisionFRC13CStateManagerRC19CCollisionPrimitiveRC12CTransform4fRC15CMaterialFilter DetectStaticCollisionBoolean__14CGameCollisionFRC13CStateManagerRC19CCollisionPrimitiveRC12CTransform4fRC15CMaterialFilter: @@ -4023,7 +4023,7 @@ DetectStaticCollisionBoolean__14CGameCollisionFRC13CStateManagerRC19CCollisionPr /* 801833C4 00180324 81 9C 00 00 */ lwz r12, 0(r28) /* 801833C8 00180328 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 801833CC 0018032C 7D 89 03 A6 */ mtctr r12 -/* 801833D0 00180330 4E 80 04 21 */ bctrl +/* 801833D0 00180330 4E 80 04 21 */ bctrl /* 801833D4 00180334 3C 03 B0 BE */ addis r0, r3, 0xb0be /* 801833D8 00180338 28 00 54 47 */ cmplwi r0, 0x5447 /* 801833DC 0018033C 40 82 00 0C */ bne lbl_801833E8 @@ -4035,7 +4035,7 @@ lbl_801833E8: /* 801833F0 00180350 81 9C 00 00 */ lwz r12, 0(r28) /* 801833F4 00180354 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 801833F8 00180358 7D 89 03 A6 */ mtctr r12 -/* 801833FC 0018035C 4E 80 04 21 */ bctrl +/* 801833FC 0018035C 4E 80 04 21 */ bctrl /* 80183400 00180360 3C 03 BE BF */ addis r0, r3, 0xbebf /* 80183404 00180364 28 00 42 58 */ cmplwi r0, 0x4258 /* 80183408 00180368 40 82 00 90 */ bne lbl_80183498 @@ -4045,7 +4045,7 @@ lbl_801833E8: /* 80183418 00180378 38 61 00 40 */ addi r3, r1, 0x40 /* 8018341C 0018037C 81 8C 00 14 */ lwz r12, 0x14(r12) /* 80183420 00180380 7D 89 03 A6 */ mtctr r12 -/* 80183424 00180384 4E 80 04 21 */ bctrl +/* 80183424 00180384 4E 80 04 21 */ bctrl /* 80183428 00180388 C0 A1 00 40 */ lfs f5, 0x40(r1) /* 8018342C 0018038C C0 81 00 44 */ lfs f4, 0x44(r1) /* 80183430 00180390 C0 61 00 48 */ lfs f3, 0x48(r1) @@ -4082,7 +4082,7 @@ lbl_80183498: /* 8018349C 001803FC 81 9C 00 00 */ lwz r12, 0(r28) /* 801834A0 00180400 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 801834A4 00180404 7D 89 03 A6 */ mtctr r12 -/* 801834A8 00180408 4E 80 04 21 */ bctrl +/* 801834A8 00180408 4E 80 04 21 */ bctrl /* 801834AC 0018040C 3C 03 AC B0 */ addis r0, r3, 0xacb0 /* 801834B0 00180410 28 00 48 52 */ cmplwi r0, 0x4852 /* 801834B4 00180414 40 82 00 C4 */ bne lbl_80183578 @@ -4092,7 +4092,7 @@ lbl_80183498: /* 801834C4 00180424 38 61 00 28 */ addi r3, r1, 0x28 /* 801834C8 00180428 81 8C 00 14 */ lwz r12, 0x14(r12) /* 801834CC 0018042C 7D 89 03 A6 */ mtctr r12 -/* 801834D0 00180430 4E 80 04 21 */ bctrl +/* 801834D0 00180430 4E 80 04 21 */ bctrl /* 801834D4 00180434 C0 A1 00 28 */ lfs f5, 0x28(r1) /* 801834D8 00180438 7F 84 E3 78 */ mr r4, r28 /* 801834DC 0018043C C0 81 00 2C */ lfs f4, 0x2c(r1) @@ -4142,7 +4142,7 @@ lbl_80183578: /* 8018357C 001804DC 81 9C 00 00 */ lwz r12, 0(r28) /* 80183580 001804E0 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80183584 001804E4 7D 89 03 A6 */ mtctr r12 -/* 80183588 001804E8 4E 80 04 21 */ bctrl +/* 80183588 001804E8 4E 80 04 21 */ bctrl /* 8018358C 001804EC 3C 03 BE BE */ addis r0, r3, 0xbebe /* 80183590 001804F0 28 00 53 48 */ cmplwi r0, 0x5348 /* 80183594 001804F4 40 82 00 4C */ bne lbl_801835E0 @@ -4172,7 +4172,7 @@ lbl_801835E4: /* 801835E8 00180548 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 801835EC 0018054C 7C 08 03 A6 */ mtlr r0 /* 801835F0 00180550 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 801835F4 00180554 4E 80 00 20 */ blr +/* 801835F4 00180554 4E 80 00 20 */ blr .global DetectStaticCollisionBoolean_Cached__14CGameCollisionFRC13CStateManagerR19CAreaCollisionCacheRC19CCollisionPrimitiveRC12CTransform4fRC15CMaterialFilter DetectStaticCollisionBoolean_Cached__14CGameCollisionFRC13CStateManagerR19CAreaCollisionCacheRC19CCollisionPrimitiveRC12CTransform4fRC15CMaterialFilter: @@ -4189,7 +4189,7 @@ DetectStaticCollisionBoolean_Cached__14CGameCollisionFRC13CStateManagerR19CAreaC /* 80183620 00180580 81 9D 00 00 */ lwz r12, 0(r29) /* 80183624 00180584 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80183628 00180588 7D 89 03 A6 */ mtctr r12 -/* 8018362C 0018058C 4E 80 04 21 */ bctrl +/* 8018362C 0018058C 4E 80 04 21 */ bctrl /* 80183630 00180590 3C 03 B0 BE */ addis r0, r3, 0xb0be /* 80183634 00180594 28 00 54 47 */ cmplwi r0, 0x5447 /* 80183638 00180598 40 82 00 0C */ bne lbl_80183644 @@ -4203,7 +4203,7 @@ lbl_80183644: /* 80183654 001805B4 3B 80 00 00 */ li r28, 0 /* 80183658 001805B8 81 8C 00 14 */ lwz r12, 0x14(r12) /* 8018365C 001805BC 7D 89 03 A6 */ mtctr r12 -/* 80183660 001805C0 4E 80 04 21 */ bctrl +/* 80183660 001805C0 4E 80 04 21 */ bctrl /* 80183664 001805C4 C0 A1 00 40 */ lfs f5, 0x40(r1) /* 80183668 001805C8 7F C4 F3 78 */ mr r4, r30 /* 8018366C 001805CC C0 81 00 44 */ lfs f4, 0x44(r1) @@ -4273,7 +4273,7 @@ lbl_80183760: /* 80183764 001806C4 81 9D 00 00 */ lwz r12, 0(r29) /* 80183768 001806C8 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 8018376C 001806CC 7D 89 03 A6 */ mtctr r12 -/* 80183770 001806D0 4E 80 04 21 */ bctrl +/* 80183770 001806D0 4E 80 04 21 */ bctrl /* 80183774 001806D4 3C 03 BE BF */ addis r0, r3, 0xbebf /* 80183778 001806D8 28 00 42 58 */ cmplwi r0, 0x4258 /* 8018377C 001806DC 40 82 00 48 */ bne lbl_801837C4 @@ -4302,7 +4302,7 @@ lbl_801837C4: /* 801837C8 00180728 81 9D 00 00 */ lwz r12, 0(r29) /* 801837CC 0018072C 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 801837D0 00180730 7D 89 03 A6 */ mtctr r12 -/* 801837D4 00180734 4E 80 04 21 */ bctrl +/* 801837D4 00180734 4E 80 04 21 */ bctrl /* 801837D8 00180738 3C 03 AC B0 */ addis r0, r3, 0xacb0 /* 801837DC 0018073C 28 00 48 52 */ cmplwi r0, 0x4852 /* 801837E0 00180740 40 82 00 7C */ bne lbl_8018385C @@ -4344,7 +4344,7 @@ lbl_8018385C: /* 80183860 001807C0 81 9D 00 00 */ lwz r12, 0(r29) /* 80183864 001807C4 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80183868 001807C8 7D 89 03 A6 */ mtctr r12 -/* 8018386C 001807CC 4E 80 04 21 */ bctrl +/* 8018386C 001807CC 4E 80 04 21 */ bctrl /* 80183870 001807D0 3C 03 BE BE */ addis r0, r3, 0xbebe /* 80183874 001807D4 28 00 53 48 */ cmplwi r0, 0x5348 /* 80183878 001807D8 40 82 00 50 */ bne lbl_801838C8 @@ -4375,7 +4375,7 @@ lbl_801838CC: /* 801838D0 00180830 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 801838D4 00180834 7C 08 03 A6 */ mtlr r0 /* 801838D8 00180838 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 801838DC 0018083C 4E 80 00 20 */ blr +/* 801838DC 0018083C 4E 80 00 20 */ blr .global DetectStaticCollision__14CGameCollisionFRC13CStateManagerRC19CCollisionPrimitiveRC12CTransform4fRC15CMaterialFilterR18CCollisionInfoList DetectStaticCollision__14CGameCollisionFRC13CStateManagerRC19CCollisionPrimitiveRC12CTransform4fRC15CMaterialFilterR18CCollisionInfoList: @@ -4392,7 +4392,7 @@ DetectStaticCollision__14CGameCollisionFRC13CStateManagerRC19CCollisionPrimitive /* 80183908 00180868 81 9A 00 00 */ lwz r12, 0(r26) /* 8018390C 0018086C 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80183910 00180870 7D 89 03 A6 */ mtctr r12 -/* 80183914 00180874 4E 80 04 21 */ bctrl +/* 80183914 00180874 4E 80 04 21 */ bctrl /* 80183918 00180878 3C 03 B0 BE */ addis r0, r3, 0xb0be /* 8018391C 0018087C 28 00 54 47 */ cmplwi r0, 0x5447 /* 80183920 00180880 40 82 00 0C */ bne lbl_8018392C @@ -4405,7 +4405,7 @@ lbl_8018392C: /* 80183938 00180898 3B E0 00 00 */ li r31, 0 /* 8018393C 0018089C 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80183940 001808A0 7D 89 03 A6 */ mtctr r12 -/* 80183944 001808A4 4E 80 04 21 */ bctrl +/* 80183944 001808A4 4E 80 04 21 */ bctrl /* 80183948 001808A8 3C 03 BE BF */ addis r0, r3, 0xbebf /* 8018394C 001808AC 28 00 42 58 */ cmplwi r0, 0x4258 /* 80183950 001808B0 40 82 00 AC */ bne lbl_801839FC @@ -4415,7 +4415,7 @@ lbl_8018392C: /* 80183960 001808C0 38 61 00 40 */ addi r3, r1, 0x40 /* 80183964 001808C4 81 8C 00 14 */ lwz r12, 0x14(r12) /* 80183968 001808C8 7D 89 03 A6 */ mtctr r12 -/* 8018396C 001808CC 4E 80 04 21 */ bctrl +/* 8018396C 001808CC 4E 80 04 21 */ bctrl /* 80183970 001808D0 C0 A1 00 40 */ lfs f5, 0x40(r1) /* 80183974 001808D4 C0 81 00 44 */ lfs f4, 0x44(r1) /* 80183978 001808D8 C0 61 00 48 */ lfs f3, 0x48(r1) @@ -4437,7 +4437,7 @@ lbl_801839A8: /* 801839B4 00180914 83 84 00 04 */ lwz r28, 4(r4) /* 801839B8 00180918 81 8C 00 10 */ lwz r12, 0x10(r12) /* 801839BC 0018091C 7D 89 03 A6 */ mtctr r12 -/* 801839C0 00180920 4E 80 04 21 */ bctrl +/* 801839C0 00180920 4E 80 04 21 */ bctrl /* 801839C4 00180924 7C 66 1B 78 */ mr r6, r3 /* 801839C8 00180928 7F 83 E3 78 */ mr r3, r28 /* 801839CC 0018092C 7F A5 EB 78 */ mr r5, r29 @@ -4459,7 +4459,7 @@ lbl_801839FC: /* 80183A00 00180960 81 9A 00 00 */ lwz r12, 0(r26) /* 80183A04 00180964 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80183A08 00180968 7D 89 03 A6 */ mtctr r12 -/* 80183A0C 0018096C 4E 80 04 21 */ bctrl +/* 80183A0C 0018096C 4E 80 04 21 */ bctrl /* 80183A10 00180970 3C 03 AC B0 */ addis r0, r3, 0xacb0 /* 80183A14 00180974 28 00 48 52 */ cmplwi r0, 0x4852 /* 80183A18 00180978 40 82 00 E0 */ bne lbl_80183AF8 @@ -4469,7 +4469,7 @@ lbl_801839FC: /* 80183A28 00180988 38 61 00 28 */ addi r3, r1, 0x28 /* 80183A2C 0018098C 81 8C 00 14 */ lwz r12, 0x14(r12) /* 80183A30 00180990 7D 89 03 A6 */ mtctr r12 -/* 80183A34 00180994 4E 80 04 21 */ bctrl +/* 80183A34 00180994 4E 80 04 21 */ bctrl /* 80183A38 00180998 C0 A1 00 28 */ lfs f5, 0x28(r1) /* 80183A3C 0018099C 7F 44 D3 78 */ mr r4, r26 /* 80183A40 001809A0 C0 81 00 2C */ lfs f4, 0x2c(r1) @@ -4503,7 +4503,7 @@ lbl_80183AA0: /* 80183AAC 00180A0C 83 84 00 04 */ lwz r28, 4(r4) /* 80183AB0 00180A10 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80183AB4 00180A14 7D 89 03 A6 */ mtctr r12 -/* 80183AB8 00180A18 4E 80 04 21 */ bctrl +/* 80183AB8 00180A18 4E 80 04 21 */ bctrl /* 80183ABC 00180A1C 7C 66 1B 78 */ mr r6, r3 /* 80183AC0 00180A20 7F 83 E3 78 */ mr r3, r28 /* 80183AC4 00180A24 7F A7 EB 78 */ mr r7, r29 @@ -4526,7 +4526,7 @@ lbl_80183AF8: /* 80183AFC 00180A5C 81 9A 00 00 */ lwz r12, 0(r26) /* 80183B00 00180A60 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80183B04 00180A64 7D 89 03 A6 */ mtctr r12 -/* 80183B08 00180A68 4E 80 04 21 */ bctrl +/* 80183B08 00180A68 4E 80 04 21 */ bctrl /* 80183B0C 00180A6C 3C 03 BE BE */ addis r0, r3, 0xbebe /* 80183B10 00180A70 28 00 53 48 */ cmplwi r0, 0x5348 /* 80183B14 00180A74 40 82 00 4C */ bne lbl_80183B60 @@ -4556,7 +4556,7 @@ lbl_80183B64: /* 80183B68 00180AC8 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 80183B6C 00180ACC 7C 08 03 A6 */ mtlr r0 /* 80183B70 00180AD0 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 80183B74 00180AD4 4E 80 00 20 */ blr +/* 80183B74 00180AD4 4E 80 00 20 */ blr .global DetectStaticCollision_Cached__14CGameCollisionFRC13CStateManagerR19CAreaCollisionCacheRC19CCollisionPrimitiveRC12CTransform4fRC15CMaterialFilterR18CCollisionInfoList DetectStaticCollision_Cached__14CGameCollisionFRC13CStateManagerR19CAreaCollisionCacheRC19CCollisionPrimitiveRC12CTransform4fRC15CMaterialFilterR18CCollisionInfoList: @@ -4574,7 +4574,7 @@ DetectStaticCollision_Cached__14CGameCollisionFRC13CStateManagerR19CAreaCollisio /* 80183BA4 00180B04 81 99 00 00 */ lwz r12, 0(r25) /* 80183BA8 00180B08 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80183BAC 00180B0C 7D 89 03 A6 */ mtctr r12 -/* 80183BB0 00180B10 4E 80 04 21 */ bctrl +/* 80183BB0 00180B10 4E 80 04 21 */ bctrl /* 80183BB4 00180B14 3C 03 B0 BE */ addis r0, r3, 0xb0be /* 80183BB8 00180B18 28 00 54 47 */ cmplwi r0, 0x5447 /* 80183BBC 00180B1C 40 82 00 0C */ bne lbl_80183BC8 @@ -4588,7 +4588,7 @@ lbl_80183BC8: /* 80183BD8 00180B38 3B E0 00 00 */ li r31, 0 /* 80183BDC 00180B3C 81 8C 00 14 */ lwz r12, 0x14(r12) /* 80183BE0 00180B40 7D 89 03 A6 */ mtctr r12 -/* 80183BE4 00180B44 4E 80 04 21 */ bctrl +/* 80183BE4 00180B44 4E 80 04 21 */ bctrl /* 80183BE8 00180B48 C0 A1 00 40 */ lfs f5, 0x40(r1) /* 80183BEC 00180B4C 7F 84 E3 78 */ mr r4, r28 /* 80183BF0 00180B50 C0 81 00 44 */ lfs f4, 0x44(r1) @@ -4659,7 +4659,7 @@ lbl_80183CE8: /* 80183CEC 00180C4C 81 99 00 00 */ lwz r12, 0(r25) /* 80183CF0 00180C50 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80183CF4 00180C54 7D 89 03 A6 */ mtctr r12 -/* 80183CF8 00180C58 4E 80 04 21 */ bctrl +/* 80183CF8 00180C58 4E 80 04 21 */ bctrl /* 80183CFC 00180C5C 3C 03 BE BF */ addis r0, r3, 0xbebf /* 80183D00 00180C60 28 00 42 58 */ cmplwi r0, 0x4258 /* 80183D04 00180C64 40 82 00 64 */ bne lbl_80183D68 @@ -4672,7 +4672,7 @@ lbl_80183D18: /* 80183D1C 00180C7C 81 9A 00 00 */ lwz r12, 0(r26) /* 80183D20 00180C80 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80183D24 00180C84 7D 89 03 A6 */ mtctr r12 -/* 80183D28 00180C88 4E 80 04 21 */ bctrl +/* 80183D28 00180C88 4E 80 04 21 */ bctrl /* 80183D2C 00180C8C 7C 66 1B 78 */ mr r6, r3 /* 80183D30 00180C90 7F 63 DB 78 */ mr r3, r27 /* 80183D34 00180C94 7F A5 EB 78 */ mr r5, r29 @@ -4695,7 +4695,7 @@ lbl_80183D68: /* 80183D6C 00180CCC 81 99 00 00 */ lwz r12, 0(r25) /* 80183D70 00180CD0 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80183D74 00180CD4 7D 89 03 A6 */ mtctr r12 -/* 80183D78 00180CD8 4E 80 04 21 */ bctrl +/* 80183D78 00180CD8 4E 80 04 21 */ bctrl /* 80183D7C 00180CDC 3C 03 AC B0 */ addis r0, r3, 0xacb0 /* 80183D80 00180CE0 28 00 48 52 */ cmplwi r0, 0x4852 /* 80183D84 00180CE4 40 82 00 94 */ bne lbl_80183E18 @@ -4719,7 +4719,7 @@ lbl_80183DC4: /* 80183DC8 00180D28 81 99 00 00 */ lwz r12, 0(r25) /* 80183DCC 00180D2C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80183DD0 00180D30 7D 89 03 A6 */ mtctr r12 -/* 80183DD4 00180D34 4E 80 04 21 */ bctrl +/* 80183DD4 00180D34 4E 80 04 21 */ bctrl /* 80183DD8 00180D38 7C 66 1B 78 */ mr r6, r3 /* 80183DDC 00180D3C 7F 63 DB 78 */ mr r3, r27 /* 80183DE0 00180D40 7F A7 EB 78 */ mr r7, r29 @@ -4743,7 +4743,7 @@ lbl_80183E18: /* 80183E1C 00180D7C 81 99 00 00 */ lwz r12, 0(r25) /* 80183E20 00180D80 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80183E24 00180D84 7D 89 03 A6 */ mtctr r12 -/* 80183E28 00180D88 4E 80 04 21 */ bctrl +/* 80183E28 00180D88 4E 80 04 21 */ bctrl /* 80183E2C 00180D8C 3C 03 BE BE */ addis r0, r3, 0xbebe /* 80183E30 00180D90 28 00 53 48 */ cmplwi r0, 0x5348 /* 80183E34 00180D94 40 82 00 54 */ bne lbl_80183E88 @@ -4775,7 +4775,7 @@ lbl_80183E8C: /* 80183E90 00180DF0 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 80183E94 00180DF4 7C 08 03 A6 */ mtlr r0 /* 80183E98 00180DF8 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 80183E9C 00180DFC 4E 80 00 20 */ blr +/* 80183E9C 00180DFC 4E 80 00 20 */ blr .global "DetectDynamicCollision__14CGameCollisionFRC19CCollisionPrimitiveRC12CTransform4fRCQ24rstl32reserved_vector<9TUniqueId,1024>R9TUniqueIdR18CCollisionInfoListRC13CStateManager" "DetectDynamicCollision__14CGameCollisionFRC19CCollisionPrimitiveRC12CTransform4fRCQ24rstl32reserved_vector<9TUniqueId,1024>R9TUniqueIdR18CCollisionInfoListRC13CStateManager": @@ -4810,12 +4810,12 @@ lbl_80183ED8: /* 80183F0C 00180E6C 81 96 00 00 */ lwz r12, 0(r22) /* 80183F10 00180E70 81 8C 00 70 */ lwz r12, 0x70(r12) /* 80183F14 00180E74 7D 89 03 A6 */ mtctr r12 -/* 80183F18 00180E78 4E 80 04 21 */ bctrl +/* 80183F18 00180E78 4E 80 04 21 */ bctrl /* 80183F1C 00180E7C 7E C3 B3 78 */ mr r3, r22 /* 80183F20 00180E80 81 96 00 00 */ lwz r12, 0(r22) /* 80183F24 00180E84 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 80183F28 00180E88 7D 89 03 A6 */ mtctr r12 -/* 80183F2C 00180E8C 4E 80 04 21 */ bctrl +/* 80183F2C 00180E8C 4E 80 04 21 */ bctrl /* 80183F30 00180E90 3C 80 80 5A */ lis r4, lbl_8059FD18@ha /* 80183F34 00180E94 90 61 00 44 */ stw r3, 0x44(r1) /* 80183F38 00180E98 38 04 FD 18 */ addi r0, r4, lbl_8059FD18@l @@ -4857,7 +4857,7 @@ lbl_80183FB8: /* 80183FBC 00180F1C 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 80183FC0 00180F20 7C 08 03 A6 */ mtlr r0 /* 80183FC4 00180F24 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 80183FC8 00180F28 4E 80 00 20 */ blr +/* 80183FC8 00180F28 4E 80 00 20 */ blr .global "DetectDynamicCollisionBoolean__14CGameCollisionFRC19CCollisionPrimitiveRC12CTransform4fRCQ24rstl32reserved_vector<9TUniqueId,1024>RC13CStateManager" "DetectDynamicCollisionBoolean__14CGameCollisionFRC19CCollisionPrimitiveRC12CTransform4fRCQ24rstl32reserved_vector<9TUniqueId,1024>RC13CStateManager": @@ -4890,12 +4890,12 @@ lbl_80183FFC: /* 80184030 00180F90 81 98 00 00 */ lwz r12, 0(r24) /* 80184034 00180F94 81 8C 00 70 */ lwz r12, 0x70(r12) /* 80184038 00180F98 7D 89 03 A6 */ mtctr r12 -/* 8018403C 00180F9C 4E 80 04 21 */ bctrl +/* 8018403C 00180F9C 4E 80 04 21 */ bctrl /* 80184040 00180FA0 7F 03 C3 78 */ mr r3, r24 /* 80184044 00180FA4 81 98 00 00 */ lwz r12, 0(r24) /* 80184048 00180FA8 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 8018404C 00180FAC 7D 89 03 A6 */ mtctr r12 -/* 80184050 00180FB0 4E 80 04 21 */ bctrl +/* 80184050 00180FB0 4E 80 04 21 */ bctrl /* 80184054 00180FB4 3C 80 80 5A */ lis r4, lbl_8059FD18@ha /* 80184058 00180FB8 90 61 00 44 */ stw r3, 0x44(r1) /* 8018405C 00180FBC 38 04 FD 18 */ addi r0, r4, lbl_8059FD18@l @@ -4932,7 +4932,7 @@ lbl_801840C8: /* 801840CC 0018102C 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 801840D0 00181030 7C 08 03 A6 */ mtlr r0 /* 801840D4 00181034 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 801840D8 00181038 4E 80 00 20 */ blr +/* 801840D8 00181038 4E 80 00 20 */ blr .global "DetectDynamicCollisionMoving__14CGameCollisionFRC19CCollisionPrimitiveRC12CTransform4fRCQ24rstl32reserved_vector<9TUniqueId,1024>9CVector3fR9TUniqueIdR14CCollisionInfoRdRC13CStateManager" "DetectDynamicCollisionMoving__14CGameCollisionFRC19CCollisionPrimitiveRC12CTransform4fRCQ24rstl32reserved_vector<9TUniqueId,1024>9CVector3fR9TUniqueIdR14CCollisionInfoRdRC13CStateManager": @@ -4975,12 +4975,12 @@ lbl_80184120: /* 80184168 001810C8 81 9B 00 00 */ lwz r12, 0(r27) /* 8018416C 001810CC 81 8C 00 70 */ lwz r12, 0x70(r12) /* 80184170 001810D0 7D 89 03 A6 */ mtctr r12 -/* 80184174 001810D4 4E 80 04 21 */ bctrl +/* 80184174 001810D4 4E 80 04 21 */ bctrl /* 80184178 001810D8 7F 63 DB 78 */ mr r3, r27 /* 8018417C 001810DC 81 9B 00 00 */ lwz r12, 0(r27) /* 80184180 001810E0 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 80184184 001810E4 7D 89 03 A6 */ mtctr r12 -/* 80184188 001810E8 4E 80 04 21 */ bctrl +/* 80184188 001810E8 4E 80 04 21 */ bctrl /* 8018418C 001810EC 3C 80 80 5A */ lis r4, lbl_8059FD18@ha /* 80184190 001810F0 90 61 00 50 */ stw r3, 0x50(r1) /* 80184194 001810F4 38 04 FD 18 */ addi r0, r4, lbl_8059FD18@l @@ -5070,7 +5070,7 @@ lbl_801842BC: /* 801842DC 0018123C 80 01 01 64 */ lwz r0, 0x164(r1) /* 801842E0 00181240 7C 08 03 A6 */ mtlr r0 /* 801842E4 00181244 38 21 01 60 */ addi r1, r1, 0x160 -/* 801842E8 00181248 4E 80 00 20 */ blr +/* 801842E8 00181248 4E 80 00 20 */ blr .global "DetectCollision_Cached_Moving__14CGameCollisionFRC13CStateManagerR19CAreaCollisionCacheRC19CCollisionPrimitiveRC12CTransform4fRC15CMaterialFilterRCQ24rstl32reserved_vector<9TUniqueId,1024>9CVector3fR9TUniqueIdR14CCollisionInfoRd" "DetectCollision_Cached_Moving__14CGameCollisionFRC13CStateManagerR19CAreaCollisionCacheRC19CCollisionPrimitiveRC12CTransform4fRC15CMaterialFilterRCQ24rstl32reserved_vector<9TUniqueId,1024>9CVector3fR9TUniqueIdR14CCollisionInfoRd": @@ -5137,7 +5137,7 @@ lbl_801843CC: /* 801843D4 00181334 80 01 00 54 */ lwz r0, 0x54(r1) /* 801843D8 00181338 7C 08 03 A6 */ mtlr r0 /* 801843DC 0018133C 38 21 00 50 */ addi r1, r1, 0x50 -/* 801843E0 00181340 4E 80 00 20 */ blr +/* 801843E0 00181340 4E 80 00 20 */ blr .global "DetectCollision_Cached__14CGameCollisionFRC13CStateManagerR19CAreaCollisionCacheRC19CCollisionPrimitiveRC12CTransform4fRC15CMaterialFilterRCQ24rstl32reserved_vector<9TUniqueId,1024>R9TUniqueIdR18CCollisionInfoList" "DetectCollision_Cached__14CGameCollisionFRC13CStateManagerR19CAreaCollisionCacheRC19CCollisionPrimitiveRC12CTransform4fRC15CMaterialFilterRCQ24rstl32reserved_vector<9TUniqueId,1024>R9TUniqueIdR18CCollisionInfoList": @@ -5190,7 +5190,7 @@ lbl_8018448C: /* 80184494 001813F4 80 01 00 34 */ lwz r0, 0x34(r1) /* 80184498 001813F8 7C 08 03 A6 */ mtlr r0 /* 8018449C 001813FC 38 21 00 30 */ addi r1, r1, 0x30 -/* 801844A0 00181400 4E 80 00 20 */ blr +/* 801844A0 00181400 4E 80 00 20 */ blr .global "DetectCollision__14CGameCollisionFRC13CStateManagerRC19CCollisionPrimitiveRC12CTransform4fRC15CMaterialFilterRCQ24rstl32reserved_vector<9TUniqueId,1024>R9TUniqueIdR18CCollisionInfoList" "DetectCollision__14CGameCollisionFRC13CStateManagerRC19CCollisionPrimitiveRC12CTransform4fRC15CMaterialFilterRCQ24rstl32reserved_vector<9TUniqueId,1024>R9TUniqueIdR18CCollisionInfoList": @@ -5243,7 +5243,7 @@ lbl_8018454C: /* 80184554 001814B4 80 01 00 34 */ lwz r0, 0x34(r1) /* 80184558 001814B8 7C 08 03 A6 */ mtlr r0 /* 8018455C 001814BC 38 21 00 30 */ addi r1, r1, 0x30 -/* 80184560 001814C0 4E 80 00 20 */ blr +/* 80184560 001814C0 4E 80 00 20 */ blr .global "DetectCollisionBoolean_Cached__14CGameCollisionFRC13CStateManagerR19CAreaCollisionCacheRC19CCollisionPrimitiveRC12CTransform4fRC15CMaterialFilterRCQ24rstl32reserved_vector<9TUniqueId,1024>" "DetectCollisionBoolean_Cached__14CGameCollisionFRC13CStateManagerR19CAreaCollisionCacheRC19CCollisionPrimitiveRC12CTransform4fRC15CMaterialFilterRCQ24rstl32reserved_vector<9TUniqueId,1024>": @@ -5293,7 +5293,7 @@ lbl_801845F4: /* 80184604 00181564 83 81 00 10 */ lwz r28, 0x10(r1) /* 80184608 00181568 7C 08 03 A6 */ mtlr r0 /* 8018460C 0018156C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80184610 00181570 4E 80 00 20 */ blr +/* 80184610 00181570 4E 80 00 20 */ blr .global "DetectCollisionBoolean__14CGameCollisionFRC13CStateManagerRC19CCollisionPrimitiveRC12CTransform4fRC15CMaterialFilterRCQ24rstl32reserved_vector<9TUniqueId,1024>" "DetectCollisionBoolean__14CGameCollisionFRC13CStateManagerRC19CCollisionPrimitiveRC12CTransform4fRC15CMaterialFilterRCQ24rstl32reserved_vector<9TUniqueId,1024>": @@ -5343,7 +5343,7 @@ lbl_801846A4: /* 801846B4 00181614 83 81 00 10 */ lwz r28, 0x10(r1) /* 801846B8 00181618 7C 08 03 A6 */ mtlr r0 /* 801846BC 0018161C 38 21 00 20 */ addi r1, r1, 0x20 -/* 801846C0 00181620 4E 80 00 20 */ blr +/* 801846C0 00181620 4E 80 00 20 */ blr .global BuildAreaCollisionCache__14CGameCollisionFRC13CStateManagerR19CAreaCollisionCache BuildAreaCollisionCache__14CGameCollisionFRC13CStateManagerR19CAreaCollisionCache: @@ -5434,7 +5434,7 @@ lbl_801847D8: /* 801847F8 00181758 83 A1 09 44 */ lwz r29, 0x944(r1) /* 801847FC 0018175C 7C 08 03 A6 */ mtlr r0 /* 80184800 00181760 38 21 09 50 */ addi r1, r1, 0x950 -/* 80184804 00181764 4E 80 00 20 */ blr +/* 80184804 00181764 4E 80 00 20 */ blr .global RayStaticIntersection__14CGameCollisionFRC13CStateManagerRC9CVector3fRC9CVector3ffRC15CMaterialFilter RayStaticIntersection__14CGameCollisionFRC13CStateManagerRC9CVector3fRC9CVector3ffRC15CMaterialFilter: @@ -5645,7 +5645,7 @@ lbl_80184A90: /* 80184B18 00181A78 80 01 01 54 */ lwz r0, 0x154(r1) /* 80184B1C 00181A7C 7C 08 03 A6 */ mtlr r0 /* 80184B20 00181A80 38 21 01 50 */ addi r1, r1, 0x150 -/* 80184B24 00181A84 4E 80 00 20 */ blr +/* 80184B24 00181A84 4E 80 00 20 */ blr .global RayStaticIntersectionArea__14CGameCollisionFRC9CGameAreaRC9CVector3fRC9CVector3fRC15CMaterialFilter RayStaticIntersectionArea__14CGameCollisionFRC9CGameAreaRC9CVector3fRC9CVector3fRC15CMaterialFilter: @@ -5704,7 +5704,7 @@ lbl_80184BE8: /* 80184BE8 00181B48 80 01 00 54 */ lwz r0, 0x54(r1) /* 80184BEC 00181B4C 7C 08 03 A6 */ mtlr r0 /* 80184BF0 00181B50 38 21 00 50 */ addi r1, r1, 0x50 -/* 80184BF4 00181B54 4E 80 00 20 */ blr +/* 80184BF4 00181B54 4E 80 00 20 */ blr .global RayStaticIntersectionBool__14CGameCollisionFRC13CStateManagerRC9CVector3fRC9CVector3ffRC15CMaterialFilter RayStaticIntersectionBool__14CGameCollisionFRC13CStateManagerRC9CVector3fRC9CVector3ffRC15CMaterialFilter: @@ -5783,7 +5783,7 @@ lbl_80184CF0: /* 80184D00 00181C60 83 C1 00 48 */ lwz r30, 0x48(r1) /* 80184D04 00181C64 7C 08 03 A6 */ mtlr r0 /* 80184D08 00181C68 38 21 00 60 */ addi r1, r1, 0x60 -/* 80184D0C 00181C6C 4E 80 00 20 */ blr +/* 80184D0C 00181C6C 4E 80 00 20 */ blr .global "RayDynamicIntersectionBool__14CGameCollisionFRC13CStateManagerRC9CVector3fRC9CVector3fRC15CMaterialFilterQ24rstl49reserved_vector<9TUniqueId,1024>PC6CActorf" "RayDynamicIntersectionBool__14CGameCollisionFRC13CStateManagerRC9CVector3fRC9CVector3fRC15CMaterialFilterQ24rstl49reserved_vector<9TUniqueId,1024>PC6CActorf": @@ -5834,12 +5834,12 @@ lbl_80184DA8: /* 80184DB0 00181D10 81 97 00 00 */ lwz r12, 0(r23) /* 80184DB4 00181D14 81 8C 00 70 */ lwz r12, 0x70(r12) /* 80184DB8 00181D18 7D 89 03 A6 */ mtctr r12 -/* 80184DBC 00181D1C 4E 80 04 21 */ bctrl +/* 80184DBC 00181D1C 4E 80 04 21 */ bctrl /* 80184DC0 00181D20 7E E3 BB 78 */ mr r3, r23 /* 80184DC4 00181D24 81 97 00 00 */ lwz r12, 0(r23) /* 80184DC8 00181D28 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 80184DCC 00181D2C 7D 89 03 A6 */ mtctr r12 -/* 80184DD0 00181D30 4E 80 04 21 */ bctrl +/* 80184DD0 00181D30 4E 80 04 21 */ bctrl /* 80184DD4 00181D34 FC 20 F8 90 */ fmr f1, f31 /* 80184DD8 00181D38 7C 77 1B 78 */ mr r23, r3 /* 80184DDC 00181D3C 7F 24 CB 78 */ mr r4, r25 @@ -5857,7 +5857,7 @@ lbl_80184DA8: /* 80184E0C 00181D6C 81 97 00 00 */ lwz r12, 0(r23) /* 80184E10 00181D70 81 8C 00 24 */ lwz r12, 0x24(r12) /* 80184E14 00181D74 7D 89 03 A6 */ mtctr r12 -/* 80184E18 00181D78 4E 80 04 21 */ bctrl +/* 80184E18 00181D78 4E 80 04 21 */ bctrl /* 80184E1C 00181D7C 88 01 00 68 */ lbz r0, 0x68(r1) /* 80184E20 00181D80 28 00 00 00 */ cmplwi r0, 0 /* 80184E24 00181D84 41 82 00 0C */ beq lbl_80184E30 @@ -5880,7 +5880,7 @@ lbl_80184E50: /* 80184E5C 00181DBC 80 01 01 24 */ lwz r0, 0x124(r1) /* 80184E60 00181DC0 7C 08 03 A6 */ mtlr r0 /* 80184E64 00181DC4 38 21 01 20 */ addi r1, r1, 0x120 -/* 80184E68 00181DC8 4E 80 00 20 */ blr +/* 80184E68 00181DC8 4E 80 00 20 */ blr .global "RayDynamicIntersection__14CGameCollisionFRC13CStateManagerR9TUniqueIdRC9CVector3fRC9CVector3ffRC15CMaterialFilterRCQ24rstl32reserved_vector<9TUniqueId,1024>" "RayDynamicIntersection__14CGameCollisionFRC13CStateManagerR9TUniqueIdRC9CVector3fRC9CVector3ffRC15CMaterialFilterRCQ24rstl32reserved_vector<9TUniqueId,1024>": @@ -5948,12 +5948,12 @@ lbl_80184F20: /* 80184F54 00181EB4 81 9D 00 00 */ lwz r12, 0(r29) /* 80184F58 00181EB8 81 8C 00 70 */ lwz r12, 0x70(r12) /* 80184F5C 00181EBC 7D 89 03 A6 */ mtctr r12 -/* 80184F60 00181EC0 4E 80 04 21 */ bctrl +/* 80184F60 00181EC0 4E 80 04 21 */ bctrl /* 80184F64 00181EC4 7F A3 EB 78 */ mr r3, r29 /* 80184F68 00181EC8 81 9D 00 00 */ lwz r12, 0(r29) /* 80184F6C 00181ECC 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 80184F70 00181ED0 7D 89 03 A6 */ mtctr r12 -/* 80184F74 00181ED4 4E 80 04 21 */ bctrl +/* 80184F74 00181ED4 4E 80 04 21 */ bctrl /* 80184F78 00181ED8 FC 20 F8 90 */ fmr f1, f31 /* 80184F7C 00181EDC 7C 75 1B 78 */ mr r21, r3 /* 80184F80 00181EE0 7F 24 CB 78 */ mr r4, r25 @@ -5971,7 +5971,7 @@ lbl_80184F20: /* 80184FB0 00181F10 81 95 00 00 */ lwz r12, 0(r21) /* 80184FB4 00181F14 81 8C 00 24 */ lwz r12, 0x24(r12) /* 80184FB8 00181F18 7D 89 03 A6 */ mtctr r12 -/* 80184FBC 00181F1C 4E 80 04 21 */ bctrl +/* 80184FBC 00181F1C 4E 80 04 21 */ bctrl /* 80184FC0 00181F20 88 C1 00 70 */ lbz r6, 0x70(r1) /* 80184FC4 00181F24 C0 E1 00 50 */ lfs f7, 0x50(r1) /* 80184FC8 00181F28 C0 C1 00 54 */ lfs f6, 0x54(r1) @@ -6052,7 +6052,7 @@ lbl_80185070: /* 801850EC 0018204C 80 01 01 94 */ lwz r0, 0x194(r1) /* 801850F0 00182050 7C 08 03 A6 */ mtlr r0 /* 801850F4 00182054 38 21 01 90 */ addi r1, r1, 0x190 -/* 801850F8 00182058 4E 80 00 20 */ blr +/* 801850F8 00182058 4E 80 00 20 */ blr .global "RayWorldIntersection__14CGameCollisionFRC13CStateManagerR9TUniqueIdRC9CVector3fRC9CVector3ffRC15CMaterialFilterRCQ24rstl32reserved_vector<9TUniqueId,1024>" "RayWorldIntersection__14CGameCollisionFRC13CStateManagerR9TUniqueIdRC9CVector3fRC9CVector3ffRC15CMaterialFilterRCQ24rstl32reserved_vector<9TUniqueId,1024>": @@ -6185,22 +6185,22 @@ lbl_801852A4: /* 801852E8 00182248 80 01 01 14 */ lwz r0, 0x114(r1) /* 801852EC 0018224C 7C 08 03 A6 */ mtlr r0 /* 801852F0 00182250 38 21 01 10 */ addi r1, r1, 0x110 -/* 801852F4 00182254 4E 80 00 20 */ blr +/* 801852F4 00182254 4E 80 00 20 */ blr .global NullMovingCollider__14CGameCollisionFRC27CInternalCollisionStructureRC9CVector3fRdR14CCollisionInfo NullMovingCollider__14CGameCollisionFRC27CInternalCollisionStructureRC9CVector3fRdR14CCollisionInfo: /* 801852F8 00182258 38 60 00 00 */ li r3, 0 -/* 801852FC 0018225C 4E 80 00 20 */ blr +/* 801852FC 0018225C 4E 80 00 20 */ blr .global NullBooleanCollider__14CGameCollisionFRC27CInternalCollisionStructure NullBooleanCollider__14CGameCollisionFRC27CInternalCollisionStructure: /* 80185300 00182260 38 60 00 00 */ li r3, 0 -/* 80185304 00182264 4E 80 00 20 */ blr +/* 80185304 00182264 4E 80 00 20 */ blr .global NullCollisionCollider__14CGameCollisionFRC27CInternalCollisionStructureR18CCollisionInfoList NullCollisionCollider__14CGameCollisionFRC27CInternalCollisionStructureR18CCollisionInfoList: /* 80185308 00182268 38 60 00 00 */ li r3, 0 -/* 8018530C 0018226C 4E 80 00 20 */ blr +/* 8018530C 0018226C 4E 80 00 20 */ blr .global InitCollision__14CGameCollisionFv InitCollision__14CGameCollisionFv: @@ -6278,7 +6278,7 @@ InitCollision__14CGameCollisionFv: /* 8018542C 0018238C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80185430 00182390 7C 08 03 A6 */ mtlr r0 /* 80185434 00182394 38 21 00 10 */ addi r1, r1, 0x10 -/* 80185438 00182398 4E 80 00 20 */ blr +/* 80185438 00182398 4E 80 00 20 */ blr .global sub_8018543c sub_8018543c: @@ -6411,7 +6411,7 @@ lbl_80185600: /* 80185610 00182570 80 01 00 44 */ lwz r0, 0x44(r1) /* 80185614 00182574 7C 08 03 A6 */ mtlr r0 /* 80185618 00182578 38 21 00 40 */ addi r1, r1, 0x40 -/* 8018561C 0018257C 4E 80 00 20 */ blr +/* 8018561C 0018257C 4E 80 00 20 */ blr .global Add__18CCollisionInfoListFRC14CCollisionInfob Add__18CCollisionInfoListFRC14CCollisionInfob: @@ -6548,4 +6548,4 @@ lbl_80185814: /* 80185818 00182778 83 E1 00 6C */ lwz r31, 0x6c(r1) /* 8018581C 0018277C 7C 08 03 A6 */ mtlr r0 /* 80185820 00182780 38 21 00 70 */ addi r1, r1, 0x70 -/* 80185824 00182784 4E 80 00 20 */ blr +/* 80185824 00182784 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/CGameCubeDoll.s b/asm/MetroidPrime/CGameCubeDoll.s index ee2f7cf1..9ac2bd66 100644 --- a/asm/MetroidPrime/CGameCubeDoll.s +++ b/asm/MetroidPrime/CGameCubeDoll.s @@ -40,7 +40,7 @@ Draw__13CGameCubeDollFf: /* 8029E6C8 0029B628 EC 60 18 28 */ fsubs f3, f0, f3 /* 8029E6CC 0029B62C C0 A2 C0 B8 */ lfs f5, lbl_805ADDD8@sda21(r2) /* 8029E6D0 0029B630 7D 89 03 A6 */ mtctr r12 -/* 8029E6D4 0029B634 4E 80 04 21 */ bctrl +/* 8029E6D4 0029B634 4E 80 04 21 */ bctrl /* 8029E6D8 0029B638 C0 22 C0 BC */ lfs f1, lbl_805ADDDC@sda21(r2) /* 8029E6DC 0029B63C 38 61 00 AC */ addi r3, r1, 0xac /* 8029E6E0 0029B640 C0 42 C0 C0 */ lfs f2, lbl_805ADDE0@sda21(r2) @@ -102,7 +102,7 @@ lbl_8029E7B0: /* 8029E7BC 0029B71C 83 E1 00 FC */ lwz r31, 0xfc(r1) /* 8029E7C0 0029B720 7C 08 03 A6 */ mtlr r0 /* 8029E7C4 0029B724 38 21 01 10 */ addi r1, r1, 0x110 -/* 8029E7C8 0029B728 4E 80 00 20 */ blr +/* 8029E7C8 0029B728 4E 80 00 20 */ blr .global Update__13CGameCubeDollFf Update__13CGameCubeDollFf: @@ -140,7 +140,7 @@ lbl_8029E830: /* 8029E83C 0029B79C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8029E840 0029B7A0 7C 08 03 A6 */ mtlr r0 /* 8029E844 0029B7A4 38 21 00 30 */ addi r1, r1, 0x30 -/* 8029E848 0029B7A8 4E 80 00 20 */ blr +/* 8029E848 0029B7A8 4E 80 00 20 */ blr .global Touch__13CGameCubeDollFv Touch__13CGameCubeDollFv: @@ -168,7 +168,7 @@ lbl_8029E898: /* 8029E89C 0029B7FC 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8029E8A0 0029B800 7C 08 03 A6 */ mtlr r0 /* 8029E8A4 0029B804 38 21 00 20 */ addi r1, r1, 0x20 -/* 8029E8A8 0029B808 4E 80 00 20 */ blr +/* 8029E8A8 0029B808 4E 80 00 20 */ blr .global UpdateActorLights__13CGameCubeDollFv UpdateActorLights__13CGameCubeDollFv: @@ -289,7 +289,7 @@ UpdateActorLights__13CGameCubeDollFv: /* 8029EA74 0029B9D4 83 C1 00 A8 */ lwz r30, 0xa8(r1) /* 8029EA78 0029B9D8 7C 08 03 A6 */ mtlr r0 /* 8029EA7C 0029B9DC 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 8029EA80 0029B9E0 4E 80 00 20 */ blr +/* 8029EA80 0029B9E0 4E 80 00 20 */ blr .global __dt__13CGameCubeDollFv __dt__13CGameCubeDollFv: @@ -342,7 +342,7 @@ lbl_8029EB1C: /* 8029EB28 0029BA88 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8029EB2C 0029BA8C 7C 08 03 A6 */ mtlr r0 /* 8029EB30 0029BA90 38 21 00 20 */ addi r1, r1, 0x20 -/* 8029EB34 0029BA94 4E 80 00 20 */ blr +/* 8029EB34 0029BA94 4E 80 00 20 */ blr .global IsLoaded__13CGameCubeDollCFv IsLoaded__13CGameCubeDollCFv: @@ -351,7 +351,7 @@ IsLoaded__13CGameCubeDollCFv: /* 8029EB40 0029BAA0 7C 03 00 D0 */ neg r0, r3 /* 8029EB44 0029BAA4 7C 00 1B 78 */ or r0, r0, r3 /* 8029EB48 0029BAA8 54 03 0F FE */ srwi r3, r0, 0x1f -/* 8029EB4C 0029BAAC 4E 80 00 20 */ blr +/* 8029EB4C 0029BAAC 4E 80 00 20 */ blr .global CheckLoadComplete__13CGameCubeDollFv CheckLoadComplete__13CGameCubeDollFv: @@ -383,7 +383,7 @@ lbl_8029EBA4: /* 8029EBA8 0029BB08 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8029EBAC 0029BB0C 7C 08 03 A6 */ mtlr r0 /* 8029EBB0 0029BB10 38 21 00 10 */ addi r1, r1, 0x10 -/* 8029EBB4 0029BB14 4E 80 00 20 */ blr +/* 8029EBB4 0029BB14 4E 80 00 20 */ blr .global __ct__13CGameCubeDollFv __ct__13CGameCubeDollFv: @@ -399,7 +399,7 @@ __ct__13CGameCubeDollFv: /* 8029EBDC 0029BB3C 81 84 00 00 */ lwz r12, 0(r4) /* 8029EBE0 0029BB40 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8029EBE4 0029BB44 7D 89 03 A6 */ mtctr r12 -/* 8029EBE8 0029BB48 4E 80 04 21 */ bctrl +/* 8029EBE8 0029BB48 4E 80 04 21 */ bctrl /* 8029EBEC 0029BB4C 7F E3 FB 78 */ mr r3, r31 /* 8029EBF0 0029BB50 38 81 00 10 */ addi r4, r1, 0x10 /* 8029EBF4 0029BB54 48 0A 22 B5 */ bl __ct__6CTokenFRC6CToken diff --git a/asm/MetroidPrime/CGameLight.s b/asm/MetroidPrime/CGameLight.s index 3abb0b85..2c508195 100644 --- a/asm/MetroidPrime/CGameLight.s +++ b/asm/MetroidPrime/CGameLight.s @@ -71,7 +71,7 @@ lbl_800B55E4: /* 800B55F0 000B2550 83 C1 00 08 */ lwz r30, 8(r1) /* 800B55F4 000B2554 7C 08 03 A6 */ mtlr r0 /* 800B55F8 000B2558 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B55FC 000B255C 4E 80 00 20 */ blr +/* 800B55FC 000B255C 4E 80 00 20 */ blr .global SetLightPriorityAndId__10CGameLightFv SetLightPriorityAndId__10CGameLightFv: @@ -79,7 +79,7 @@ SetLightPriorityAndId__10CGameLightFv: /* 800B5604 000B2564 90 03 01 28 */ stw r0, 0x128(r3) /* 800B5608 000B2568 80 03 01 3C */ lwz r0, 0x13c(r3) /* 800B560C 000B256C 90 03 01 2C */ stw r0, 0x12c(r3) -/* 800B5610 000B2570 4E 80 00 20 */ blr +/* 800B5610 000B2570 4E 80 00 20 */ blr .global Accept__10CGameLightFR8IVisitor Accept__10CGameLightFR8IVisitor: @@ -92,11 +92,11 @@ Accept__10CGameLightFR8IVisitor: /* 800B562C 000B258C 7C 04 03 78 */ mr r4, r0 /* 800B5630 000B2590 81 8C 00 38 */ lwz r12, 0x38(r12) /* 800B5634 000B2594 7D 89 03 A6 */ mtctr r12 -/* 800B5638 000B2598 4E 80 04 21 */ bctrl +/* 800B5638 000B2598 4E 80 04 21 */ bctrl /* 800B563C 000B259C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800B5640 000B25A0 7C 08 03 A6 */ mtlr r0 /* 800B5644 000B25A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B5648 000B25A8 4E 80 00 20 */ blr +/* 800B5648 000B25A8 4E 80 00 20 */ blr .global Think__10CGameLightFfR13CStateManager Think__10CGameLightFfR13CStateManager: @@ -123,7 +123,7 @@ lbl_800B5698: /* 800B5698 000B25F8 80 01 00 14 */ lwz r0, 0x14(r1) /* 800B569C 000B25FC 7C 08 03 A6 */ mtlr r0 /* 800B56A0 000B2600 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B56A4 000B2604 4E 80 00 20 */ blr +/* 800B56A4 000B2604 4E 80 00 20 */ blr .global GetLight__10CGameLightCFv GetLight__10CGameLightCFv: @@ -166,7 +166,7 @@ lbl_800B5720: /* 800B5734 000B2694 83 C1 00 88 */ lwz r30, 0x88(r1) /* 800B5738 000B2698 7C 08 03 A6 */ mtlr r0 /* 800B573C 000B269C 38 21 00 90 */ addi r1, r1, 0x90 -/* 800B5740 000B26A0 4E 80 00 20 */ blr +/* 800B5740 000B26A0 4E 80 00 20 */ blr .global SetLight__10CGameLightFRC6CLight SetLight__10CGameLightFRC6CLight: @@ -225,7 +225,7 @@ SetLight__10CGameLightFRC6CLight: /* 800B5814 000B2774 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800B5818 000B2778 7C 08 03 A6 */ mtlr r0 /* 800B581C 000B277C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B5820 000B2780 4E 80 00 20 */ blr +/* 800B5820 000B2780 4E 80 00 20 */ blr .global "__ct__10CGameLightF9TUniqueIdbRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC12CTransform4f9TUniqueIdRC6CLightUiUif" "__ct__10CGameLightF9TUniqueIdbRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC12CTransform4f9TUniqueIdRC6CLightUiUif": @@ -336,4 +336,4 @@ lbl_800B5968: /* 800B59B8 000B2918 80 01 01 44 */ lwz r0, 0x144(r1) /* 800B59BC 000B291C 7C 08 03 A6 */ mtlr r0 /* 800B59C0 000B2920 38 21 01 40 */ addi r1, r1, 0x140 -/* 800B59C4 000B2924 4E 80 00 20 */ blr +/* 800B59C4 000B2924 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/CGameProjectile.s b/asm/MetroidPrime/CGameProjectile.s index d7f9bc11..673c53bb 100644 --- a/asm/MetroidPrime/CGameProjectile.s +++ b/asm/MetroidPrime/CGameProjectile.s @@ -136,7 +136,7 @@ lbl_80037494: /* 800374A0 00034400 83 C1 00 08 */ lwz r30, 8(r1) /* 800374A4 00034404 7C 08 03 A6 */ mtlr r0 /* 800374A8 00034408 38 21 00 10 */ addi r1, r1, 0x10 -/* 800374AC 0003440C 4E 80 00 20 */ blr +/* 800374AC 0003440C 4E 80 00 20 */ blr .global sub_800374b0 sub_800374b0: @@ -185,7 +185,7 @@ lbl_80037538: /* 80037544 000344A4 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80037548 000344A8 7C 08 03 A6 */ mtlr r0 /* 8003754C 000344AC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80037550 000344B0 4E 80 00 20 */ blr +/* 80037550 000344B0 4E 80 00 20 */ blr .global ResolveCollisionWithActor__15CGameProjectileFRC14CRayCastResultR6CActorR13CStateManager ResolveCollisionWithActor__15CGameProjectileFRC14CRayCastResultR6CActorR13CStateManager: @@ -392,7 +392,7 @@ lbl_8003782C: .global sub_80037854 sub_80037854: -/* 80037854 000347B4 4E 80 00 20 */ blr +/* 80037854 000347B4 4E 80 00 20 */ blr .global GetBeamAttribType__15CGameProjectileF11EWeaponType GetBeamAttribType__15CGameProjectileF11EWeaponType: @@ -409,19 +409,19 @@ lbl_80037874: /* 8003787C 000347DC 48 00 00 24 */ b lbl_800378A0 lbl_80037880: /* 80037880 000347E0 38 60 00 08 */ li r3, 8 -/* 80037884 000347E4 4E 80 00 20 */ blr +/* 80037884 000347E4 4E 80 00 20 */ blr lbl_80037888: /* 80037888 000347E8 38 60 00 10 */ li r3, 0x10 -/* 8003788C 000347EC 4E 80 00 20 */ blr +/* 8003788C 000347EC 4E 80 00 20 */ blr lbl_80037890: /* 80037890 000347F0 38 60 00 20 */ li r3, 0x20 -/* 80037894 000347F4 4E 80 00 20 */ blr +/* 80037894 000347F4 4E 80 00 20 */ blr lbl_80037898: /* 80037898 000347F8 38 60 00 40 */ li r3, 0x40 -/* 8003789C 000347FC 4E 80 00 20 */ blr +/* 8003789C 000347FC 4E 80 00 20 */ blr lbl_800378A0: /* 800378A0 00034800 38 60 00 00 */ li r3, 0 -/* 800378A4 00034804 4E 80 00 20 */ blr +/* 800378A4 00034804 4E 80 00 20 */ blr .global DeleteProjectileLight__15CGameProjectileFR13CStateManager DeleteProjectileLight__15CGameProjectileFR13CStateManager: @@ -446,7 +446,7 @@ lbl_800378E8: /* 800378EC 0003484C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 800378F0 00034850 7C 08 03 A6 */ mtlr r0 /* 800378F4 00034854 38 21 00 20 */ addi r1, r1, 0x20 -/* 800378F8 00034858 4E 80 00 20 */ blr +/* 800378F8 00034858 4E 80 00 20 */ blr .global "CreateProjectileLight__15CGameProjectileFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC6CLightR13CStateManager" "CreateProjectileLight__15CGameProjectileFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC6CLightR13CStateManager": @@ -507,7 +507,7 @@ lbl_800379C0: /* 800379D0 00034930 80 01 00 54 */ lwz r0, 0x54(r1) /* 800379D4 00034934 7C 08 03 A6 */ mtlr r0 /* 800379D8 00034938 38 21 00 50 */ addi r1, r1, 0x50 -/* 800379DC 0003493C 4E 80 00 20 */ blr +/* 800379DC 0003493C 4E 80 00 20 */ blr .global Chase__15CGameProjectileFfR13CStateManager Chase__15CGameProjectileFfR13CStateManager: @@ -579,7 +579,7 @@ lbl_80037ACC: /* 80037ADC 00034A3C C0 22 84 14 */ lfs f1, lbl_805AA134@sda21(r2) /* 80037AE0 00034A40 81 8C 00 50 */ lwz r12, 0x50(r12) /* 80037AE4 00034A44 7D 89 03 A6 */ mtctr r12 -/* 80037AE8 00034A48 4E 80 04 21 */ bctrl +/* 80037AE8 00034A48 4E 80 04 21 */ bctrl /* 80037AEC 00034A4C C3 A1 00 50 */ lfs f29, 0x50(r1) /* 80037AF0 00034A50 7F E4 FB 78 */ mr r4, r31 /* 80037AF4 00034A54 C3 C1 00 54 */ lfs f30, 0x54(r1) @@ -623,7 +623,7 @@ lbl_80037B78: /* 80037B80 00034AE0 81 9D 01 70 */ lwz r12, 0x170(r29) /* 80037B84 00034AE4 81 8C 00 18 */ lwz r12, 0x18(r12) /* 80037B88 00034AE8 7D 89 03 A6 */ mtctr r12 -/* 80037B8C 00034AEC 4E 80 04 21 */ bctrl +/* 80037B8C 00034AEC 4E 80 04 21 */ bctrl /* 80037B90 00034AF0 C0 41 00 44 */ lfs f2, 0x44(r1) /* 80037B94 00034AF4 C0 01 00 48 */ lfs f0, 0x48(r1) /* 80037B98 00034AF8 C0 21 00 4C */ lfs f1, 0x4c(r1) @@ -659,7 +659,7 @@ lbl_80037BE4: /* 80037C0C 00034B6C 81 9F 00 00 */ lwz r12, 0(r31) /* 80037C10 00034B70 81 8C 00 40 */ lwz r12, 0x40(r12) /* 80037C14 00034B74 7D 89 03 A6 */ mtctr r12 -/* 80037C18 00034B78 4E 80 04 21 */ bctrl +/* 80037C18 00034B78 4E 80 04 21 */ bctrl /* 80037C1C 00034B7C 88 01 00 9C */ lbz r0, 0x9c(r1) /* 80037C20 00034B80 28 00 00 00 */ cmplwi r0, 0 /* 80037C24 00034B84 98 01 00 B8 */ stb r0, 0xb8(r1) @@ -809,7 +809,7 @@ lbl_80037E1C: /* 80037E48 00034DA8 83 A1 01 B4 */ lwz r29, 0x1b4(r1) /* 80037E4C 00034DAC 7C 08 03 A6 */ mtlr r0 /* 80037E50 00034DB0 38 21 02 00 */ addi r1, r1, 0x200 -/* 80037E54 00034DB4 4E 80 00 20 */ blr +/* 80037E54 00034DB4 4E 80 00 20 */ blr .global UpdateHoming__15CGameProjectileFfR13CStateManager UpdateHoming__15CGameProjectileFfR13CStateManager: @@ -856,7 +856,7 @@ lbl_80037EE4: /* 80037EEC 00034E4C 83 C1 00 08 */ lwz r30, 8(r1) /* 80037EF0 00034E50 7C 08 03 A6 */ mtlr r0 /* 80037EF4 00034E54 38 21 00 10 */ addi r1, r1, 0x10 -/* 80037EF8 00034E58 4E 80 00 20 */ blr +/* 80037EF8 00034E58 4E 80 00 20 */ blr .global UpdateProjectileMovement__15CGameProjectileFfR13CStateManager UpdateProjectileMovement__15CGameProjectileFfR13CStateManager: @@ -887,7 +887,7 @@ lbl_80037F3C: /* 80037F58 00034EB8 81 9E 01 70 */ lwz r12, 0x170(r30) /* 80037F5C 00034EBC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80037F60 00034EC0 7D 89 03 A6 */ mtctr r12 -/* 80037F64 00034EC4 4E 80 04 21 */ bctrl +/* 80037F64 00034EC4 4E 80 04 21 */ bctrl /* 80037F68 00034EC8 38 61 00 14 */ addi r3, r1, 0x14 /* 80037F6C 00034ECC 38 9E 01 70 */ addi r4, r30, 0x170 /* 80037F70 00034ED0 48 27 86 69 */ bl GetTransform__17CProjectileWeaponFv @@ -909,7 +909,7 @@ lbl_80037F3C: /* 80037FB0 00034F10 81 9E 01 70 */ lwz r12, 0x170(r30) /* 80037FB4 00034F14 81 8C 00 18 */ lwz r12, 0x18(r12) /* 80037FB8 00034F18 7D 89 03 A6 */ mtctr r12 -/* 80037FBC 00034F1C 4E 80 04 21 */ bctrl +/* 80037FBC 00034F1C 4E 80 04 21 */ bctrl /* 80037FC0 00034F20 7F C3 F3 78 */ mr r3, r30 /* 80037FC4 00034F24 38 81 00 08 */ addi r4, r1, 8 /* 80037FC8 00034F28 48 01 AE C5 */ bl SetTranslation__6CActorFRC9CVector3f @@ -924,7 +924,7 @@ lbl_80037F3C: /* 80037FEC 00034F4C 83 C1 00 48 */ lwz r30, 0x48(r1) /* 80037FF0 00034F50 7C 08 03 A6 */ mtlr r0 /* 80037FF4 00034F54 38 21 00 60 */ addi r1, r1, 0x60 -/* 80037FF8 00034F58 4E 80 00 20 */ blr +/* 80037FF8 00034F58 4E 80 00 20 */ blr .global DoCollisionCheck__15CGameProjectileFR9TUniqueIdR13CStateManager DoCollisionCheck__15CGameProjectileFR9TUniqueIdR13CStateManager: @@ -1090,7 +1090,7 @@ lbl_800381FC: /* 80038264 000351C4 80 01 08 E4 */ lwz r0, 0x8e4(r1) /* 80038268 000351C8 7C 08 03 A6 */ mtlr r0 /* 8003826C 000351CC 38 21 08 E0 */ addi r1, r1, 0x8e0 -/* 80038270 000351D0 4E 80 00 20 */ blr +/* 80038270 000351D0 4E 80 00 20 */ blr .global ApplyDamageToActors__15CGameProjectileFR13CStateManager ApplyDamageToActors__15CGameProjectileFR13CStateManager: @@ -1242,7 +1242,7 @@ lbl_80038480: /* 800384A4 00035404 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 800384A8 00035408 7C 08 03 A6 */ mtlr r0 /* 800384AC 0003540C 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 800384B0 00035410 4E 80 00 20 */ blr +/* 800384B0 00035410 4E 80 00 20 */ blr .global "clear__Q24rstl59vector<22CProjectileTouchResult,Q24rstl17rmemory_allocator>Fv" "clear__Q24rstl59vector<22CProjectileTouchResult,Q24rstl17rmemory_allocator>Fv": @@ -1271,7 +1271,7 @@ lbl_800384F8: /* 80038500 00035460 38 00 00 00 */ li r0, 0 /* 80038504 00035464 90 03 00 04 */ stw r0, 4(r3) /* 80038508 00035468 38 21 00 20 */ addi r1, r1, 0x20 -/* 8003850C 0003546C 4E 80 00 20 */ blr +/* 8003850C 0003546C 4E 80 00 20 */ blr .global FluidFXThink__15CGameProjectileFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager FluidFXThink__15CGameProjectileFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager: @@ -1303,7 +1303,7 @@ lbl_8003856C: /* 80038570 000354D0 80 01 00 34 */ lwz r0, 0x34(r1) /* 80038574 000354D4 7C 08 03 A6 */ mtlr r0 /* 80038578 000354D8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8003857C 000354DC 4E 80 00 20 */ blr +/* 8003857C 000354DC 4E 80 00 20 */ blr .global GetWeaponDescription__17CProjectileWeaponCFv GetWeaponDescription__17CProjectileWeaponCFv: @@ -1325,7 +1325,7 @@ GetWeaponDescription__17CProjectileWeaponCFv: /* 800385BC 0003551C 83 C1 00 08 */ lwz r30, 8(r1) /* 800385C0 00035520 7C 08 03 A6 */ mtlr r0 /* 800385C4 00035524 38 21 00 10 */ addi r1, r1, 0x10 -/* 800385C8 00035528 4E 80 00 20 */ blr +/* 800385C8 00035528 4E 80 00 20 */ blr .global AcceptScriptMsg__15CGameProjectileF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__15CGameProjectileF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -1381,7 +1381,7 @@ lbl_80038678: /* 80038678 000355D8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8003867C 000355DC 7C 08 03 A6 */ mtlr r0 /* 80038680 000355E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80038684 000355E4 4E 80 00 20 */ blr +/* 80038684 000355E4 4E 80 00 20 */ blr .global Accept__15CGameProjectileFR8IVisitor Accept__15CGameProjectileFR8IVisitor: @@ -1394,11 +1394,11 @@ Accept__15CGameProjectileFR8IVisitor: /* 800386A0 00035600 7C 04 03 78 */ mr r4, r0 /* 800386A4 00035604 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 800386A8 00035608 7D 89 03 A6 */ mtctr r12 -/* 800386AC 0003560C 4E 80 04 21 */ bctrl +/* 800386AC 0003560C 4E 80 04 21 */ bctrl /* 800386B0 00035610 80 01 00 14 */ lwz r0, 0x14(r1) /* 800386B4 00035614 7C 08 03 A6 */ mtlr r0 /* 800386B8 00035618 38 21 00 10 */ addi r1, r1, 0x10 -/* 800386BC 0003561C 4E 80 00 20 */ blr +/* 800386BC 0003561C 4E 80 00 20 */ blr .global "RayCollisionCheckWithWorld__15CGameProjectileFR9TUniqueIdRC9CVector3fRC9CVector3ffRQ24rstl32reserved_vector<9TUniqueId,1024>R13CStateManager" "RayCollisionCheckWithWorld__15CGameProjectileFR9TUniqueIdRC9CVector3fRC9CVector3ffRQ24rstl32reserved_vector<9TUniqueId,1024>R13CStateManager": @@ -1631,7 +1631,7 @@ lbl_80038A0C: /* 80038A30 00035990 7F 25 CB 78 */ mr r5, r25 /* 80038A34 00035994 81 8C 00 44 */ lwz r12, 0x44(r12) /* 80038A38 00035998 7D 89 03 A6 */ mtctr r12 -/* 80038A3C 0003599C 4E 80 04 21 */ bctrl +/* 80038A3C 0003599C 4E 80 04 21 */ bctrl /* 80038A40 000359A0 C0 A1 02 54 */ lfs f5, 0x254(r1) /* 80038A44 000359A4 80 C1 02 58 */ lwz r6, 0x258(r1) /* 80038A48 000359A8 80 A1 02 5C */ lwz r5, 0x25c(r1) @@ -1664,7 +1664,7 @@ lbl_80038AA8: /* 80038AB0 00035A10 81 9B 00 00 */ lwz r12, 0(r27) /* 80038AB4 00035A14 81 8C 00 40 */ lwz r12, 0x40(r12) /* 80038AB8 00035A18 7D 89 03 A6 */ mtctr r12 -/* 80038ABC 00035A1C 4E 80 04 21 */ bctrl +/* 80038ABC 00035A1C 4E 80 04 21 */ bctrl /* 80038AC0 00035A20 88 01 00 C8 */ lbz r0, 0xc8(r1) /* 80038AC4 00035A24 28 00 00 00 */ cmplwi r0, 0 /* 80038AC8 00035A28 98 01 01 00 */ stb r0, 0x100(r1) @@ -1852,7 +1852,7 @@ lbl_80038CB0: /* 80038D78 00035CD8 38 A1 02 E8 */ addi r5, r1, 0x2e8 /* 80038D7C 00035CDC 81 8C 00 24 */ lwz r12, 0x24(r12) /* 80038D80 00035CE0 7D 89 03 A6 */ mtctr r12 -/* 80038D84 00035CE4 4E 80 04 21 */ bctrl +/* 80038D84 00035CE4 4E 80 04 21 */ bctrl /* 80038D88 00035CE8 88 C1 01 58 */ lbz r6, 0x158(r1) /* 80038D8C 00035CEC C0 E1 01 38 */ lfs f7, 0x138(r1) /* 80038D90 00035CF0 C0 C1 01 3C */ lfs f6, 0x13c(r1) @@ -2048,7 +2048,7 @@ lbl_80039050: /* 80039064 00035FC4 80 01 03 B4 */ lwz r0, 0x3b4(r1) /* 80039068 00035FC8 7C 08 03 A6 */ mtlr r0 /* 8003906C 00035FCC 38 21 03 B0 */ addi r1, r1, 0x3b0 -/* 80039070 00035FD0 4E 80 00 20 */ blr +/* 80039070 00035FD0 4E 80 00 20 */ blr .global CanCollideWith__15CGameProjectileFR6CActorR13CStateManager CanCollideWith__15CGameProjectileFR6CActorR13CStateManager: @@ -2067,7 +2067,7 @@ CanCollideWith__15CGameProjectileFR6CActorR13CStateManager: /* 800390A4 00036004 81 9E 00 00 */ lwz r12, 0(r30) /* 800390A8 00036008 81 8C 00 38 */ lwz r12, 0x38(r12) /* 800390AC 0003600C 7D 89 03 A6 */ mtctr r12 -/* 800390B0 00036010 4E 80 04 21 */ bctrl +/* 800390B0 00036010 4E 80 04 21 */ bctrl /* 800390B4 00036014 38 9D 01 2C */ addi r4, r29, 0x12c /* 800390B8 00036018 38 A0 00 00 */ li r5, 0 /* 800390BC 0003601C 48 0C 94 01 */ bl GetVulnerability__20CDamageVulnerabilityCFRC11CWeaponMode @@ -2159,7 +2159,7 @@ lbl_800391EC: /* 800391FC 0003615C 83 81 00 60 */ lwz r28, 0x60(r1) /* 80039200 00036160 7C 08 03 A6 */ mtlr r0 /* 80039204 00036164 38 21 00 70 */ addi r1, r1, 0x70 -/* 80039208 00036168 4E 80 00 20 */ blr +/* 80039208 00036168 4E 80 00 20 */ blr .global CanCollideWithComplexCollision__15CGameProjectileFR6CActorR13CStateManager CanCollideWithComplexCollision__15CGameProjectileFR6CActorR13CStateManager: @@ -2250,14 +2250,14 @@ lbl_8003933C: /* 80039348 000362A8 81 9A 00 00 */ lwz r12, 0(r26) /* 8003934C 000362AC 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 80039350 000362B0 7D 89 03 A6 */ mtctr r12 -/* 80039354 000362B4 4E 80 04 21 */ bctrl +/* 80039354 000362B4 4E 80 04 21 */ bctrl /* 80039358 000362B8 81 9A 00 00 */ lwz r12, 0(r26) /* 8003935C 000362BC 7C 7F 1B 78 */ mr r31, r3 /* 80039360 000362C0 7F 44 D3 78 */ mr r4, r26 /* 80039364 000362C4 38 61 02 38 */ addi r3, r1, 0x238 /* 80039368 000362C8 81 8C 00 70 */ lwz r12, 0x70(r12) /* 8003936C 000362CC 7D 89 03 A6 */ mtctr r12 -/* 80039370 000362D0 4E 80 04 21 */ bctrl +/* 80039370 000362D0 4E 80 04 21 */ bctrl /* 80039374 000362D4 38 61 02 9C */ addi r3, r1, 0x29c /* 80039378 000362D8 38 81 02 38 */ addi r4, r1, 0x238 /* 8003937C 000362DC 48 2D 97 F9 */ bl __ct__12CTransform4fFRC12CTransform4f @@ -2322,7 +2322,7 @@ lbl_8003933C: /* 80039468 000363C8 81 9F 00 00 */ lwz r12, 0(r31) /* 8003946C 000363CC 81 8C 00 24 */ lwz r12, 0x24(r12) /* 80039470 000363D0 7D 89 03 A6 */ mtctr r12 -/* 80039474 000363D4 4E 80 04 21 */ bctrl +/* 80039474 000363D4 4E 80 04 21 */ bctrl /* 80039478 000363D8 88 81 02 28 */ lbz r4, 0x228(r1) /* 8003947C 000363DC C0 01 02 08 */ lfs f0, 0x208(r1) /* 80039480 000363E0 28 04 00 00 */ cmplwi r4, 0 @@ -2340,7 +2340,7 @@ lbl_8003933C: /* 800394B0 00036410 81 9F 00 00 */ lwz r12, 0(r31) /* 800394B4 00036414 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 800394B8 00036418 7D 89 03 A6 */ mtctr r12 -/* 800394BC 0003641C 4E 80 04 21 */ bctrl +/* 800394BC 0003641C 4E 80 04 21 */ bctrl /* 800394C0 00036420 3C 03 AC B0 */ addis r0, r3, 0xacb0 /* 800394C4 00036424 28 00 48 52 */ cmplwi r0, 0x4852 /* 800394C8 00036428 41 82 01 D4 */ beq lbl_8003969C @@ -2398,7 +2398,7 @@ lbl_8003933C: /* 80039598 000364F8 81 9F 00 00 */ lwz r12, 0(r31) /* 8003959C 000364FC 81 8C 00 24 */ lwz r12, 0x24(r12) /* 800395A0 00036500 7D 89 03 A6 */ mtctr r12 -/* 800395A4 00036504 4E 80 04 21 */ bctrl +/* 800395A4 00036504 4E 80 04 21 */ bctrl /* 800395A8 00036508 88 81 01 F8 */ lbz r4, 0x1f8(r1) /* 800395AC 0003650C C0 01 01 D8 */ lfs f0, 0x1d8(r1) /* 800395B0 00036510 28 04 00 00 */ cmplwi r4, 0 @@ -2730,7 +2730,7 @@ lbl_80039A70: /* 80039A8C 000369EC 80 01 04 04 */ lwz r0, 0x404(r1) /* 80039A90 000369F0 7C 08 03 A6 */ mtlr r0 /* 80039A94 000369F4 38 21 04 00 */ addi r1, r1, 0x400 -/* 80039A98 000369F8 4E 80 00 20 */ blr +/* 80039A98 000369F8 4E 80 00 20 */ blr .global CanCollideWithGameObject__15CGameProjectileFR6CActorR13CStateManager CanCollideWithGameObject__15CGameProjectileFR6CActorR13CStateManager: @@ -2766,7 +2766,7 @@ CanCollideWithGameObject__15CGameProjectileFR6CActorR13CStateManager: /* 80039B10 00036A70 81 9E 00 00 */ lwz r12, 0(r30) /* 80039B14 00036A74 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80039B18 00036A78 7D 89 03 A6 */ mtctr r12 -/* 80039B1C 00036A7C 4E 80 04 21 */ bctrl +/* 80039B1C 00036A7C 4E 80 04 21 */ bctrl /* 80039B20 00036A80 28 03 00 00 */ cmplwi r3, 0 /* 80039B24 00036A84 40 82 00 84 */ bne lbl_80039BA8 /* 80039B28 00036A88 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) @@ -2943,7 +2943,7 @@ lbl_80039D94: /* 80039DB4 00036D14 80 BD 00 E8 */ lwz r5, 0xe8(r29) /* 80039DB8 00036D18 81 8C 00 94 */ lwz r12, 0x94(r12) /* 80039DBC 00036D1C 7D 89 03 A6 */ mtctr r12 -/* 80039DC0 00036D20 4E 80 04 21 */ bctrl +/* 80039DC0 00036D20 4E 80 04 21 */ bctrl /* 80039DC4 00036D24 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80039DC8 00036D28 40 82 01 B4 */ bne lbl_80039F7C /* 80039DCC 00036D2C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) @@ -3101,12 +3101,12 @@ lbl_80039FF8: /* 8003A008 00036F68 83 81 01 D0 */ lwz r28, 0x1d0(r1) /* 8003A00C 00036F6C 7C 08 03 A6 */ mtlr r0 /* 8003A010 00036F70 38 21 01 E0 */ addi r1, r1, 0x1e0 -/* 8003A014 00036F74 4E 80 00 20 */ blr +/* 8003A014 00036F74 4E 80 00 20 */ blr .global CanBeShot__3CAiFRC13CStateManageri CanBeShot__3CAiFRC13CStateManageri: /* 8003A018 00036F78 38 60 00 01 */ li r3, 1 -/* 8003A01C 00036F7C 4E 80 00 20 */ blr +/* 8003A01C 00036F7C 4E 80 00 20 */ blr .global CanCollideWithTrigger__15CGameProjectileFR6CActorR13CStateManager CanCollideWithTrigger__15CGameProjectileFR6CActorR13CStateManager: @@ -3271,7 +3271,7 @@ lbl_8003A25C: /* 8003A260 000371C0 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 8003A264 000371C4 7C 08 03 A6 */ mtlr r0 /* 8003A268 000371C8 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 8003A26C 000371CC 4E 80 00 20 */ blr +/* 8003A26C 000371CC 4E 80 00 20 */ blr .global GetTouchBounds__15CGameProjectileCFv GetTouchBounds__15CGameProjectileCFv: @@ -3310,7 +3310,7 @@ lbl_8003A2E4: /* 8003A2E8 00037248 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8003A2EC 0003724C 7C 08 03 A6 */ mtlr r0 /* 8003A2F0 00037250 38 21 00 30 */ addi r1, r1, 0x30 -/* 8003A2F4 00037254 4E 80 00 20 */ blr +/* 8003A2F4 00037254 4E 80 00 20 */ blr .global GetProjectileBounds__15CGameProjectileCFv GetProjectileBounds__15CGameProjectileCFv: @@ -3403,7 +3403,7 @@ lbl_8003A404: /* 8003A420 00037380 D0 A3 00 10 */ stfs f5, 0x10(r3) /* 8003A424 00037384 D0 C3 00 14 */ stfs f6, 0x14(r3) /* 8003A428 00037388 38 21 00 40 */ addi r1, r1, 0x40 -/* 8003A42C 0003738C 4E 80 00 20 */ blr +/* 8003A42C 0003738C 4E 80 00 20 */ blr .global Render__15CGameProjectileCFRC13CStateManager Render__15CGameProjectileCFRC13CStateManager: @@ -3418,7 +3418,7 @@ Render__15CGameProjectileCFRC13CStateManager: /* 8003A450 000373B0 81 9E 01 70 */ lwz r12, 0x170(r30) /* 8003A454 000373B4 81 8C 00 14 */ lwz r12, 0x14(r12) /* 8003A458 000373B8 7D 89 03 A6 */ mtctr r12 -/* 8003A45C 000373BC 4E 80 04 21 */ bctrl +/* 8003A45C 000373BC 4E 80 04 21 */ bctrl /* 8003A460 000373C0 7F C3 F3 78 */ mr r3, r30 /* 8003A464 000373C4 7F E4 FB 78 */ mr r4, r31 /* 8003A468 000373C8 48 0C 7A A1 */ bl Render__7CWeaponCFRC13CStateManager @@ -3427,7 +3427,7 @@ Render__15CGameProjectileCFRC13CStateManager: /* 8003A474 000373D4 83 C1 00 08 */ lwz r30, 8(r1) /* 8003A478 000373D8 7C 08 03 A6 */ mtlr r0 /* 8003A47C 000373DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8003A480 000373E0 4E 80 00 20 */ blr +/* 8003A480 000373E0 4E 80 00 20 */ blr .global "__ct__15CGameProjectileFbRC28TToken<18CWeaponDescription>RCQ24rstl66basic_string,Q24rstl17rmemory_allocator>11EWeaponTypeRC12CTransform4f14EMaterialTypesRC11CDamageInfo9TUniqueId7TAreaId9TUniqueId9TUniqueIdUibRC9CVector3fRCQ24rstl50optional_object<31TLockedToken<15CGenDescription>>sb" "__ct__15CGameProjectileFbRC28TToken<18CWeaponDescription>RCQ24rstl66basic_string,Q24rstl17rmemory_allocator>11EWeaponTypeRC12CTransform4f14EMaterialTypesRC11CDamageInfo9TUniqueId7TAreaId9TUniqueId9TUniqueIdUibRC9CVector3fRCQ24rstl50optional_object<31TLockedToken<15CGenDescription>>sb": @@ -3633,4 +3633,4 @@ lbl_8003A6E0: /* 8003A794 000376F4 80 01 01 34 */ lwz r0, 0x134(r1) /* 8003A798 000376F8 7C 08 03 A6 */ mtlr r0 /* 8003A79C 000376FC 38 21 01 30 */ addi r1, r1, 0x130 -/* 8003A7A0 00037700 4E 80 00 20 */ blr +/* 8003A7A0 00037700 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/CGroundMovement.s b/asm/MetroidPrime/CGroundMovement.s index ae65e134..f8284814 100644 --- a/asm/MetroidPrime/CGroundMovement.s +++ b/asm/MetroidPrime/CGroundMovement.s @@ -193,19 +193,19 @@ lbl_80185B74: /* 80185BA4 00182B04 81 99 00 00 */ lwz r12, 0(r25) /* 80185BA8 00182B08 81 8C 00 70 */ lwz r12, 0x70(r12) /* 80185BAC 00182B0C 7D 89 03 A6 */ mtctr r12 -/* 80185BB0 00182B10 4E 80 04 21 */ bctrl +/* 80185BB0 00182B10 4E 80 04 21 */ bctrl /* 80185BB4 00182B14 7F 23 CB 78 */ mr r3, r25 /* 80185BB8 00182B18 81 99 00 00 */ lwz r12, 0(r25) /* 80185BBC 00182B1C 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 80185BC0 00182B20 7D 89 03 A6 */ mtctr r12 -/* 80185BC4 00182B24 4E 80 04 21 */ bctrl +/* 80185BC4 00182B24 4E 80 04 21 */ bctrl /* 80185BC8 00182B28 7C 64 1B 78 */ mr r4, r3 /* 80185BCC 00182B2C 38 61 00 DC */ addi r3, r1, 0xdc /* 80185BD0 00182B30 81 84 00 00 */ lwz r12, 0(r4) /* 80185BD4 00182B34 38 A1 01 58 */ addi r5, r1, 0x158 /* 80185BD8 00182B38 81 8C 00 14 */ lwz r12, 0x14(r12) /* 80185BDC 00182B3C 7D 89 03 A6 */ mtctr r12 -/* 80185BE0 00182B40 4E 80 04 21 */ bctrl +/* 80185BE0 00182B40 4E 80 04 21 */ bctrl /* 80185BE4 00182B44 DB 21 00 20 */ stfd f25, 0x20(r1) /* 80185BE8 00182B48 38 61 01 F0 */ addi r3, r1, 0x1f0 /* 80185BEC 00182B4C 38 80 00 00 */ li r4, 0 @@ -229,12 +229,12 @@ lbl_80185B74: /* 80185C34 00182B94 38 61 01 28 */ addi r3, r1, 0x128 /* 80185C38 00182B98 81 8C 00 70 */ lwz r12, 0x70(r12) /* 80185C3C 00182B9C 7D 89 03 A6 */ mtctr r12 -/* 80185C40 00182BA0 4E 80 04 21 */ bctrl +/* 80185C40 00182BA0 4E 80 04 21 */ bctrl /* 80185C44 00182BA4 7F 23 CB 78 */ mr r3, r25 /* 80185C48 00182BA8 81 99 00 00 */ lwz r12, 0(r25) /* 80185C4C 00182BAC 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 80185C50 00182BB0 7D 89 03 A6 */ mtctr r12 -/* 80185C54 00182BB4 4E 80 04 21 */ bctrl +/* 80185C54 00182BB4 4E 80 04 21 */ bctrl /* 80185C58 00182BB8 38 01 01 F0 */ addi r0, r1, 0x1f0 /* 80185C5C 00182BBC 7C 65 1B 78 */ mr r5, r3 /* 80185C60 00182BC0 90 01 00 08 */ stw r0, 8(r1) @@ -613,7 +613,7 @@ lbl_801861B8: /* 801861C0 00183120 81 99 00 00 */ lwz r12, 0(r25) /* 801861C4 00183124 81 8C 00 80 */ lwz r12, 0x80(r12) /* 801861C8 00183128 7D 89 03 A6 */ mtctr r12 -/* 801861CC 0018312C 4E 80 04 21 */ bctrl +/* 801861CC 0018312C 4E 80 04 21 */ bctrl /* 801861D0 00183130 C0 62 A3 10 */ lfs f3, lbl_805AC030@sda21(r2) /* 801861D4 00183134 C0 02 A3 18 */ lfs f0, lbl_805AC038@sda21(r2) /* 801861D8 00183138 EC 43 C8 2A */ fadds f2, f3, f25 @@ -693,7 +693,7 @@ lbl_8018629C: /* 801862E8 00183248 80 01 03 04 */ lwz r0, 0x304(r1) /* 801862EC 0018324C 7C 08 03 A6 */ mtlr r0 /* 801862F0 00183250 38 21 03 00 */ addi r1, r1, 0x300 -/* 801862F4 00183254 4E 80 00 20 */ blr +/* 801862F4 00183254 4E 80 00 20 */ blr .global sub_801862f8 sub_801862f8: @@ -708,7 +708,7 @@ sub_801862f8: /* 80186318 00183278 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8018631C 0018327C 7C 08 03 A6 */ mtlr r0 /* 80186320 00183280 38 21 00 10 */ addi r1, r1, 0x10 -/* 80186324 00183284 4E 80 00 20 */ blr +/* 80186324 00183284 4E 80 00 20 */ blr .global sub_80186328 sub_80186328: @@ -774,7 +774,7 @@ lbl_80186408: /* 8018640C 0018336C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80186410 00183370 7C 08 03 A6 */ mtlr r0 /* 80186414 00183374 38 21 00 10 */ addi r1, r1, 0x10 -/* 80186418 00183378 4E 80 00 20 */ blr +/* 80186418 00183378 4E 80 00 20 */ blr .global sub_8018641c sub_8018641c: @@ -788,7 +788,7 @@ lbl_80186434: /* 80186434 00183394 80 01 00 14 */ lwz r0, 0x14(r1) /* 80186438 00183398 7C 08 03 A6 */ mtlr r0 /* 8018643C 0018339C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80186440 001833A0 4E 80 00 20 */ blr +/* 80186440 001833A0 4E 80 00 20 */ blr .global RemoveNormalComponent__15CGroundMovementFRC9CVector3fR9CVector3f RemoveNormalComponent__15CGroundMovementFRC9CVector3fR9CVector3f: @@ -807,7 +807,7 @@ RemoveNormalComponent__15CGroundMovementFRC9CVector3fR9CVector3f: /* 80186474 001833D4 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80186478 001833D8 40 81 00 0C */ ble lbl_80186484 /* 8018647C 001833DC 38 60 00 00 */ li r3, 0 -/* 80186480 001833E0 4E 80 00 20 */ blr +/* 80186480 001833E0 4E 80 00 20 */ blr lbl_80186484: /* 80186484 001833E4 EC 04 00 F2 */ fmuls f0, f4, f3 /* 80186488 001833E8 C0 24 00 00 */ lfs f1, 0(r4) @@ -822,7 +822,7 @@ lbl_80186484: /* 801864AC 0018340C C0 04 00 08 */ lfs f0, 8(r4) /* 801864B0 00183410 EC 00 10 28 */ fsubs f0, f0, f2 /* 801864B4 00183414 D0 04 00 08 */ stfs f0, 8(r4) -/* 801864B8 00183418 4E 80 00 20 */ blr +/* 801864B8 00183418 4E 80 00 20 */ blr .global RemoveNormalComponent__15CGroundMovementFRC9CVector3fRC9CVector3fR9CVector3fRf RemoveNormalComponent__15CGroundMovementFRC9CVector3fRC9CVector3fR9CVector3fRf: @@ -939,7 +939,7 @@ lbl_80186644: /* 80186664 001835C4 83 81 00 30 */ lwz r28, 0x30(r1) /* 80186668 001835C8 7C 08 03 A6 */ mtlr r0 /* 8018666C 001835CC 38 21 00 60 */ addi r1, r1, 0x60 -/* 80186670 001835D0 4E 80 00 20 */ blr +/* 80186670 001835D0 4E 80 00 20 */ blr .global RemovePositiveZComponentFromNormal__FR9CVector3f RemovePositiveZComponentFromNormal__FR9CVector3f: @@ -978,7 +978,7 @@ lbl_801866E8: /* 801866EC 0018364C 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 801866F0 00183650 7C 08 03 A6 */ mtlr r0 /* 801866F4 00183654 38 21 00 30 */ addi r1, r1, 0x30 -/* 801866F8 00183658 4E 80 00 20 */ blr +/* 801866F8 00183658 4E 80 00 20 */ blr .global "MoveGroundCollider_New__15CGroundMovementFR13CStateManagerR13CPhysicsActorfPCQ24rstl32reserved_vector<9TUniqueId,1024>" "MoveGroundCollider_New__15CGroundMovementFR13CStateManagerR13CPhysicsActorfPCQ24rstl32reserved_vector<9TUniqueId,1024>": @@ -1138,13 +1138,13 @@ lbl_80186930: /* 80186934 00183894 81 91 00 00 */ lwz r12, 0(r17) /* 80186938 00183898 81 8C 00 78 */ lwz r12, 0x78(r12) /* 8018693C 0018389C 7D 89 03 A6 */ mtctr r12 -/* 80186940 001838A0 4E 80 04 21 */ bctrl +/* 80186940 001838A0 4E 80 04 21 */ bctrl /* 80186944 001838A4 7E 23 8B 78 */ mr r3, r17 /* 80186948 001838A8 FF 80 08 90 */ fmr f28, f1 /* 8018694C 001838AC 81 91 00 00 */ lwz r12, 0(r17) /* 80186950 001838B0 81 8C 00 7C */ lwz r12, 0x7c(r12) /* 80186954 001838B4 7D 89 03 A6 */ mtctr r12 -/* 80186958 001838B8 4E 80 04 21 */ bctrl +/* 80186958 001838B8 4E 80 04 21 */ bctrl /* 8018695C 001838BC 38 00 00 01 */ li r0, 1 /* 80186960 001838C0 FF 00 08 90 */ fmr f24, f1 /* 80186964 001838C4 80 AD 8E BC */ lwz r5, lbl_805A7A7C@sda21(r13) @@ -1353,7 +1353,7 @@ lbl_80186C18: /* 80186C70 00183BD0 81 91 00 00 */ lwz r12, 0(r17) /* 80186C74 00183BD4 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 80186C78 00183BD8 7D 89 03 A6 */ mtctr r12 -/* 80186C7C 00183BDC 4E 80 04 21 */ bctrl +/* 80186C7C 00183BDC 4E 80 04 21 */ bctrl /* 80186C80 00183BE0 93 C1 00 08 */ stw r30, 8(r1) /* 80186C84 00183BE4 7C 65 1B 78 */ mr r5, r3 /* 80186C88 00183BE8 7E 03 83 78 */ mr r3, r16 @@ -1447,7 +1447,7 @@ lbl_80186CEC: /* 80186DDC 00183D3C 81 91 00 00 */ lwz r12, 0(r17) /* 80186DE0 00183D40 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 80186DE4 00183D44 7D 89 03 A6 */ mtctr r12 -/* 80186DE8 00183D48 4E 80 04 21 */ bctrl +/* 80186DE8 00183D48 4E 80 04 21 */ bctrl /* 80186DEC 00183D4C 38 01 05 80 */ addi r0, r1, 0x580 /* 80186DF0 00183D50 7C 65 1B 78 */ mr r5, r3 /* 80186DF4 00183D54 90 01 00 08 */ stw r0, 8(r1) @@ -1976,7 +1976,7 @@ lbl_80187504: /* 80187520 00184480 81 91 00 00 */ lwz r12, 0(r17) /* 80187524 00184484 81 8C 00 78 */ lwz r12, 0x78(r12) /* 80187528 00184488 7D 89 03 A6 */ mtctr r12 -/* 8018752C 0018448C 4E 80 04 21 */ bctrl +/* 8018752C 0018448C 4E 80 04 21 */ bctrl /* 80187530 00184490 C8 02 A3 70 */ lfd f0, lbl_805AC090@sda21(r2) /* 80187534 00184494 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80187538 00184498 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -2005,7 +2005,7 @@ lbl_80187504: /* 80187594 001844F4 81 91 00 00 */ lwz r12, 0(r17) /* 80187598 001844F8 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 8018759C 001844FC 7D 89 03 A6 */ mtctr r12 -/* 801875A0 00184500 4E 80 04 21 */ bctrl +/* 801875A0 00184500 4E 80 04 21 */ bctrl /* 801875A4 00184504 7C 65 1B 78 */ mr r5, r3 /* 801875A8 00184508 7E 03 83 78 */ mr r3, r16 /* 801875AC 0018450C 7D C7 73 78 */ mr r7, r14 @@ -2048,7 +2048,7 @@ lbl_80187600: /* 8018763C 0018459C 81 91 00 00 */ lwz r12, 0(r17) /* 80187640 001845A0 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 80187644 001845A4 7D 89 03 A6 */ mtctr r12 -/* 80187648 001845A8 4E 80 04 21 */ bctrl +/* 80187648 001845A8 4E 80 04 21 */ bctrl /* 8018764C 001845AC 38 01 04 D0 */ addi r0, r1, 0x4d0 /* 80187650 001845B0 7C 65 1B 78 */ mr r5, r3 /* 80187654 001845B4 90 01 00 08 */ stw r0, 8(r1) @@ -2406,14 +2406,14 @@ lbl_80187A54: /* 80187B64 00184AC4 81 91 00 00 */ lwz r12, 0(r17) /* 80187B68 00184AC8 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 80187B6C 00184ACC 7D 89 03 A6 */ mtctr r12 -/* 80187B70 00184AD0 4E 80 04 21 */ bctrl +/* 80187B70 00184AD0 4E 80 04 21 */ bctrl /* 80187B74 00184AD4 81 83 00 00 */ lwz r12, 0(r3) /* 80187B78 00184AD8 7C 6F 1B 78 */ mr r15, r3 /* 80187B7C 00184ADC 3A 41 04 84 */ addi r18, r1, 0x484 /* 80187B80 00184AE0 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80187B84 00184AE4 7D EE 7B 78 */ mr r14, r15 /* 80187B88 00184AE8 7D 89 03 A6 */ mtctr r12 -/* 80187B8C 00184AEC 4E 80 04 21 */ bctrl +/* 80187B8C 00184AEC 4E 80 04 21 */ bctrl /* 80187B90 00184AF0 3C 03 BE BF */ addis r0, r3, 0xbebf /* 80187B94 00184AF4 28 00 42 58 */ cmplwi r0, 0x4258 /* 80187B98 00184AF8 40 82 00 D0 */ bne lbl_80187C68 @@ -2443,7 +2443,7 @@ lbl_80187A54: /* 80187BF8 00184B58 81 8F 00 00 */ lwz r12, 0(r15) /* 80187BFC 00184B5C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80187C00 00184B60 7D 89 03 A6 */ mtctr r12 -/* 80187C04 00184B64 4E 80 04 21 */ bctrl +/* 80187C04 00184B64 4E 80 04 21 */ bctrl /* 80187C08 00184B68 7C 6F 1B 78 */ mr r15, r3 /* 80187C0C 00184B6C 38 61 02 10 */ addi r3, r1, 0x210 /* 80187C10 00184B70 38 81 00 A8 */ addi r4, r1, 0xa8 @@ -2473,7 +2473,7 @@ lbl_80187C68: /* 80187C6C 00184BCC 81 8F 00 00 */ lwz r12, 0(r15) /* 80187C70 00184BD0 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80187C74 00184BD4 7D 89 03 A6 */ mtctr r12 -/* 80187C78 00184BD8 4E 80 04 21 */ bctrl +/* 80187C78 00184BD8 4E 80 04 21 */ bctrl /* 80187C7C 00184BDC 3C 03 AC B0 */ addis r0, r3, 0xacb0 /* 80187C80 00184BE0 28 00 48 52 */ cmplwi r0, 0x4852 /* 80187C84 00184BE4 40 82 00 64 */ bne lbl_80187CE8 @@ -2490,7 +2490,7 @@ lbl_80187C68: /* 80187CB0 00184C10 C2 CF 00 14 */ lfs f22, 0x14(r15) /* 80187CB4 00184C14 C2 EF 00 18 */ lfs f23, 0x18(r15) /* 80187CB8 00184C18 7D 89 03 A6 */ mtctr r12 -/* 80187CBC 00184C1C 4E 80 04 21 */ bctrl +/* 80187CBC 00184C1C 4E 80 04 21 */ bctrl /* 80187CC0 00184C20 7C 64 1B 78 */ mr r4, r3 /* 80187CC4 00184C24 7E 43 93 78 */ mr r3, r18 /* 80187CC8 00184C28 48 14 7B ED */ bl __ct__19CCollisionPrimitiveFRC13CMaterialList @@ -2620,7 +2620,7 @@ lbl_80187DF4: /* 80187E84 00184DE4 80 01 3A A4 */ lwz r0, 0x3aa4(r1) /* 80187E88 00184DE8 7C 08 03 A6 */ mtlr r0 /* 80187E8C 00184DEC 38 21 3A A0 */ addi r1, r1, 0x3aa0 -/* 80187E90 00184DF0 4E 80 00 20 */ blr +/* 80187E90 00184DF0 4E 80 00 20 */ blr .global sub_80187e94 sub_80187e94: @@ -2641,7 +2641,7 @@ sub_80187e94: /* 80187ECC 00184E2C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80187ED0 00184E30 7C 08 03 A6 */ mtlr r0 /* 80187ED4 00184E34 38 21 00 10 */ addi r1, r1, 0x10 -/* 80187ED8 00184E38 4E 80 00 20 */ blr +/* 80187ED8 00184E38 4E 80 00 20 */ blr .global sub_80187edc sub_80187edc: @@ -2662,7 +2662,7 @@ sub_80187edc: /* 80187F14 00184E74 80 01 00 14 */ lwz r0, 0x14(r1) /* 80187F18 00184E78 7C 08 03 A6 */ mtlr r0 /* 80187F1C 00184E7C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80187F20 00184E80 4E 80 00 20 */ blr +/* 80187F20 00184E80 4E 80 00 20 */ blr .global sub_80187f24 sub_80187f24: @@ -2676,7 +2676,7 @@ lbl_80187F3C: /* 80187F3C 00184E9C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80187F40 00184EA0 7C 08 03 A6 */ mtlr r0 /* 80187F44 00184EA4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80187F48 00184EA8 4E 80 00 20 */ blr +/* 80187F48 00184EA8 4E 80 00 20 */ blr .global __ct__Q215CGroundMovement16SMovementOptionsFRCQ215CGroundMovement16SMovementOptions __ct__Q215CGroundMovement16SMovementOptionsFRCQ215CGroundMovement16SMovementOptions: @@ -2718,16 +2718,16 @@ __ct__Q215CGroundMovement16SMovementOptionsFRCQ215CGroundMovement16SMovementOpti /* 80187FD8 00184F38 98 03 00 48 */ stb r0, 0x48(r3) /* 80187FDC 00184F3C 88 04 00 48 */ lbz r0, 0x48(r4) /* 80187FE0 00184F40 28 00 00 00 */ cmplwi r0, 0 -/* 80187FE4 00184F44 4D 82 00 20 */ beqlr +/* 80187FE4 00184F44 4D 82 00 20 */ beqlr /* 80187FE8 00184F48 34 A3 00 3C */ addic. r5, r3, 0x3c -/* 80187FEC 00184F4C 4D 82 00 20 */ beqlr +/* 80187FEC 00184F4C 4D 82 00 20 */ beqlr /* 80187FF0 00184F50 C0 04 00 3C */ lfs f0, 0x3c(r4) /* 80187FF4 00184F54 D0 05 00 00 */ stfs f0, 0(r5) /* 80187FF8 00184F58 C0 04 00 40 */ lfs f0, 0x40(r4) /* 80187FFC 00184F5C D0 05 00 04 */ stfs f0, 4(r5) /* 80188000 00184F60 C0 04 00 44 */ lfs f0, 0x44(r4) /* 80188004 00184F64 D0 05 00 08 */ stfs f0, 8(r5) -/* 80188008 00184F68 4E 80 00 20 */ blr +/* 80188008 00184F68 4E 80 00 20 */ blr .global CollisionDamping__15CGroundMovementFRC9CVector3fRC9CVector3fRC9CVector3fff CollisionDamping__15CGroundMovementFRC9CVector3fRC9CVector3fRC9CVector3fff: @@ -2853,7 +2853,7 @@ CollisionDamping__15CGroundMovementFRC9CVector3fRC9CVector3fRC9CVector3fff: /* 801881E8 00185148 83 A1 00 44 */ lwz r29, 0x44(r1) /* 801881EC 0018514C 7C 08 03 A6 */ mtlr r0 /* 801881F0 00185150 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 801881F4 00185154 4E 80 00 20 */ blr +/* 801881F4 00185154 4E 80 00 20 */ blr .global "MoveGroundColliderXY__15CGroundMovementFR19CAreaCollisionCacheR13CStateManagerR13CPhysicsActorRC15CMaterialFilterRCQ24rstl32reserved_vector<9TUniqueId,1024>f" "MoveGroundColliderXY__15CGroundMovementFR19CAreaCollisionCacheR13CStateManagerR13CPhysicsActorRC15CMaterialFilterRCQ24rstl32reserved_vector<9TUniqueId,1024>f": @@ -3028,7 +3028,7 @@ lbl_80188460: /* 80188468 001853C8 81 9E 00 00 */ lwz r12, 0(r30) /* 8018846C 001853CC 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 80188470 001853D0 7D 89 03 A6 */ mtctr r12 -/* 80188474 001853D4 4E 80 04 21 */ bctrl +/* 80188474 001853D4 4E 80 04 21 */ bctrl /* 80188478 001853D8 4B FF A2 55 */ bl GetMinExtentForCollisionPrimitive__14CGameCollisionFRC19CCollisionPrimitive /* 8018847C 001853DC C0 02 A3 20 */ lfs f0, lbl_805AC040@sda21(r2) /* 80188480 001853E0 EC 20 00 72 */ fmuls f1, f0, f1 @@ -3128,12 +3128,12 @@ lbl_801885BC: /* 801885D8 00185538 81 8C 00 70 */ lwz r12, 0x70(r12) /* 801885DC 0018553C 7D 89 03 A6 */ mtctr r12 /* 801885E0 00185540 3B FF 00 01 */ addi r31, r31, 1 -/* 801885E4 00185544 4E 80 04 21 */ bctrl +/* 801885E4 00185544 4E 80 04 21 */ bctrl /* 801885E8 00185548 7F C3 F3 78 */ mr r3, r30 /* 801885EC 0018554C 81 9E 00 00 */ lwz r12, 0(r30) /* 801885F0 00185550 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 801885F4 00185554 7D 89 03 A6 */ mtctr r12 -/* 801885F8 00185558 4E 80 04 21 */ bctrl +/* 801885F8 00185558 4E 80 04 21 */ bctrl /* 801885FC 0018555C 7C 65 1B 78 */ mr r5, r3 /* 80188600 00185560 7F A3 EB 78 */ mr r3, r29 /* 80188604 00185564 7F 84 E3 78 */ mr r4, r28 @@ -3536,7 +3536,7 @@ lbl_80188B8C: /* 80188BC0 00185B20 80 01 27 24 */ lwz r0, 0x2724(r1) /* 80188BC4 00185B24 7C 08 03 A6 */ mtlr r0 /* 80188BC8 00185B28 38 21 27 20 */ addi r1, r1, 0x2720 -/* 80188BCC 00185B2C 4E 80 00 20 */ blr +/* 80188BCC 00185B2C 4E 80 00 20 */ blr .global "MoveGroundColliderZ__15CGroundMovementFR19CAreaCollisionCacheR13CStateManagerR13CPhysicsActorRC15CMaterialFilterRCQ24rstl32reserved_vector<9TUniqueId,1024>fRfR18CCollisionInfoListR9TUniqueId" "MoveGroundColliderZ__15CGroundMovementFR19CAreaCollisionCacheR13CStateManagerR13CPhysicsActorRC15CMaterialFilterRCQ24rstl32reserved_vector<9TUniqueId,1024>fRfR18CCollisionInfoListR9TUniqueId": @@ -3585,12 +3585,12 @@ lbl_80188B8C: /* 80188C78 00185BD8 81 98 00 00 */ lwz r12, 0(r24) /* 80188C7C 00185BDC 81 8C 00 70 */ lwz r12, 0x70(r12) /* 80188C80 00185BE0 7D 89 03 A6 */ mtctr r12 -/* 80188C84 00185BE4 4E 80 04 21 */ bctrl +/* 80188C84 00185BE4 4E 80 04 21 */ bctrl /* 80188C88 00185BE8 7F 03 C3 78 */ mr r3, r24 /* 80188C8C 00185BEC 81 98 00 00 */ lwz r12, 0(r24) /* 80188C90 00185BF0 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 80188C94 00185BF4 7D 89 03 A6 */ mtctr r12 -/* 80188C98 00185BF8 4E 80 04 21 */ bctrl +/* 80188C98 00185BF8 4E 80 04 21 */ bctrl /* 80188C9C 00185BFC 7C 65 1B 78 */ mr r5, r3 /* 80188CA0 00185C00 7E E3 BB 78 */ mr r3, r23 /* 80188CA4 00185C04 7E C4 B3 78 */ mr r4, r22 @@ -3656,12 +3656,12 @@ lbl_80188D60: /* 80188D84 00185CE4 81 98 00 00 */ lwz r12, 0(r24) /* 80188D88 00185CE8 81 8C 00 70 */ lwz r12, 0x70(r12) /* 80188D8C 00185CEC 7D 89 03 A6 */ mtctr r12 -/* 80188D90 00185CF0 4E 80 04 21 */ bctrl +/* 80188D90 00185CF0 4E 80 04 21 */ bctrl /* 80188D94 00185CF4 7F 03 C3 78 */ mr r3, r24 /* 80188D98 00185CF8 81 98 00 00 */ lwz r12, 0(r24) /* 80188D9C 00185CFC 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 80188DA0 00185D00 7D 89 03 A6 */ mtctr r12 -/* 80188DA4 00185D04 4E 80 04 21 */ bctrl +/* 80188DA4 00185D04 4E 80 04 21 */ bctrl /* 80188DA8 00185D08 7C 65 1B 78 */ mr r5, r3 /* 80188DAC 00185D0C 7E E3 BB 78 */ mr r3, r23 /* 80188DB0 00185D10 7E C4 B3 78 */ mr r4, r22 @@ -3792,7 +3792,7 @@ lbl_80188F54: /* 80188F6C 00185ECC 80 01 0D 54 */ lwz r0, 0xd54(r1) /* 80188F70 00185ED0 7C 08 03 A6 */ mtlr r0 /* 80188F74 00185ED4 38 21 0D 50 */ addi r1, r1, 0xd50 -/* 80188F78 00185ED8 4E 80 00 20 */ blr +/* 80188F78 00185ED8 4E 80 00 20 */ blr .global "ResolveUpDown__15CGroundMovementFR19CAreaCollisionCacheR13CStateManagerR13CPhysicsActorRC15CMaterialFilterRCQ24rstl32reserved_vector<9TUniqueId,1024>ffRfR18CCollisionInfoList" "ResolveUpDown__15CGroundMovementFR19CAreaCollisionCacheR13CStateManagerR13CPhysicsActorRC15CMaterialFilterRCQ24rstl32reserved_vector<9TUniqueId,1024>ffRfR18CCollisionInfoList": @@ -3930,12 +3930,12 @@ lbl_80189148: /* 8018916C 001860CC 81 9E 00 00 */ lwz r12, 0(r30) /* 80189170 001860D0 81 8C 00 70 */ lwz r12, 0x70(r12) /* 80189174 001860D4 7D 89 03 A6 */ mtctr r12 -/* 80189178 001860D8 4E 80 04 21 */ bctrl +/* 80189178 001860D8 4E 80 04 21 */ bctrl /* 8018917C 001860DC 7F C3 F3 78 */ mr r3, r30 /* 80189180 001860E0 81 9E 00 00 */ lwz r12, 0(r30) /* 80189184 001860E4 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 80189188 001860E8 7D 89 03 A6 */ mtctr r12 -/* 8018918C 001860EC 4E 80 04 21 */ bctrl +/* 8018918C 001860EC 4E 80 04 21 */ bctrl /* 80189190 001860F0 7C 65 1B 78 */ mr r5, r3 /* 80189194 001860F4 7F A3 EB 78 */ mr r3, r29 /* 80189198 001860F8 7E C4 B3 78 */ mr r4, r22 @@ -4008,7 +4008,7 @@ lbl_80189274: /* 80189288 001861E8 80 01 01 04 */ lwz r0, 0x104(r1) /* 8018928C 001861EC 7C 08 03 A6 */ mtlr r0 /* 80189290 001861F0 38 21 01 00 */ addi r1, r1, 0x100 -/* 80189294 001861F4 4E 80 00 20 */ blr +/* 80189294 001861F4 4E 80 00 20 */ blr .global "MoveGroundCollider__15CGroundMovementFR13CStateManagerR13CPhysicsActorfPCQ24rstl32reserved_vector<9TUniqueId,1024>" "MoveGroundCollider__15CGroundMovementFR13CStateManagerR13CPhysicsActorfPCQ24rstl32reserved_vector<9TUniqueId,1024>": @@ -4188,11 +4188,11 @@ lbl_80189510: /* 80189524 00186484 81 9D 00 00 */ lwz r12, 0(r29) /* 80189528 00186488 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 8018952C 0018648C 7D 89 03 A6 */ mtctr r12 -/* 80189530 00186490 4E 80 04 21 */ bctrl +/* 80189530 00186490 4E 80 04 21 */ bctrl /* 80189534 00186494 81 83 00 00 */ lwz r12, 0(r3) /* 80189538 00186498 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 8018953C 0018649C 7D 89 03 A6 */ mtctr r12 -/* 80189540 001864A0 4E 80 04 21 */ bctrl +/* 80189540 001864A0 4E 80 04 21 */ bctrl /* 80189544 001864A4 3C 03 B0 BE */ addis r0, r3, 0xb0be /* 80189548 001864A8 28 00 54 47 */ cmplwi r0, 0x5447 /* 8018954C 001864AC 41 82 01 E8 */ beq lbl_80189734 @@ -4203,7 +4203,7 @@ lbl_80189510: /* 80189560 001864C0 81 9D 00 00 */ lwz r12, 0(r29) /* 80189564 001864C4 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 80189568 001864C8 7D 89 03 A6 */ mtctr r12 -/* 8018956C 001864CC 4E 80 04 21 */ bctrl +/* 8018956C 001864CC 4E 80 04 21 */ bctrl /* 80189570 001864D0 4B FF 91 5D */ bl GetMinExtentForCollisionPrimitive__14CGameCollisionFRC19CCollisionPrimitive /* 80189574 001864D4 C0 02 A3 20 */ lfs f0, lbl_805AC040@sda21(r2) /* 80189578 001864D8 EC 00 00 72 */ fmuls f0, f0, f1 @@ -4214,19 +4214,19 @@ lbl_80189510: /* 8018958C 001864EC 81 9D 00 00 */ lwz r12, 0(r29) /* 80189590 001864F0 81 8C 00 70 */ lwz r12, 0x70(r12) /* 80189594 001864F4 7D 89 03 A6 */ mtctr r12 -/* 80189598 001864F8 4E 80 04 21 */ bctrl +/* 80189598 001864F8 4E 80 04 21 */ bctrl /* 8018959C 001864FC 7F A3 EB 78 */ mr r3, r29 /* 801895A0 00186500 81 9D 00 00 */ lwz r12, 0(r29) /* 801895A4 00186504 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 801895A8 00186508 7D 89 03 A6 */ mtctr r12 -/* 801895AC 0018650C 4E 80 04 21 */ bctrl +/* 801895AC 0018650C 4E 80 04 21 */ bctrl /* 801895B0 00186510 7C 64 1B 78 */ mr r4, r3 /* 801895B4 00186514 38 61 00 80 */ addi r3, r1, 0x80 /* 801895B8 00186518 81 84 00 00 */ lwz r12, 0(r4) /* 801895BC 0018651C 38 A1 01 78 */ addi r5, r1, 0x178 /* 801895C0 00186520 81 8C 00 14 */ lwz r12, 0x14(r12) /* 801895C4 00186524 7D 89 03 A6 */ mtctr r12 -/* 801895C8 00186528 4E 80 04 21 */ bctrl +/* 801895C8 00186528 4E 80 04 21 */ bctrl /* 801895CC 0018652C C0 A1 00 80 */ lfs f5, 0x80(r1) /* 801895D0 00186530 38 61 00 40 */ addi r3, r1, 0x40 /* 801895D4 00186534 C0 81 00 84 */ lfs f4, 0x84(r1) @@ -4326,12 +4326,12 @@ lbl_80189734: /* 80189748 001866A8 81 9D 00 00 */ lwz r12, 0(r29) /* 8018974C 001866AC 81 8C 00 70 */ lwz r12, 0x70(r12) /* 80189750 001866B0 7D 89 03 A6 */ mtctr r12 -/* 80189754 001866B4 4E 80 04 21 */ bctrl +/* 80189754 001866B4 4E 80 04 21 */ bctrl /* 80189758 001866B8 7F A3 EB 78 */ mr r3, r29 /* 8018975C 001866BC 81 9D 00 00 */ lwz r12, 0(r29) /* 80189760 001866C0 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 80189764 001866C4 7D 89 03 A6 */ mtctr r12 -/* 80189768 001866C8 4E 80 04 21 */ bctrl +/* 80189768 001866C8 4E 80 04 21 */ bctrl /* 8018976C 001866CC 7C 65 1B 78 */ mr r5, r3 /* 80189770 001866D0 7F 83 E3 78 */ mr r3, r28 /* 80189774 001866D4 7F E7 FB 78 */ mr r7, r31 @@ -4347,7 +4347,7 @@ lbl_80189734: /* 8018979C 001866FC 81 9D 00 00 */ lwz r12, 0(r29) /* 801897A0 00186700 81 8C 00 7C */ lwz r12, 0x7c(r12) /* 801897A4 00186704 7D 89 03 A6 */ mtctr r12 -/* 801897A8 00186708 4E 80 04 21 */ bctrl +/* 801897A8 00186708 4E 80 04 21 */ bctrl /* 801897AC 0018670C C0 02 A3 18 */ lfs f0, lbl_805AC038@sda21(r2) /* 801897B0 00186710 FF E0 08 90 */ fmr f31, f1 /* 801897B4 00186714 7F A3 EB 78 */ mr r3, r29 @@ -4388,7 +4388,7 @@ lbl_8018982C: /* 80189838 00186798 81 9D 00 00 */ lwz r12, 0(r29) /* 8018983C 0018679C 81 8C 00 78 */ lwz r12, 0x78(r12) /* 80189840 001867A0 7D 89 03 A6 */ mtctr r12 -/* 80189844 001867A4 4E 80 04 21 */ bctrl +/* 80189844 001867A4 4E 80 04 21 */ bctrl /* 80189848 001867A8 80 A1 32 24 */ lwz r5, 0x3224(r1) /* 8018984C 001867AC 38 60 00 00 */ li r3, 0 /* 80189850 001867B0 2C 05 00 00 */ cmpwi r5, 0 @@ -4550,7 +4550,7 @@ lbl_80189A48: /* 80189A8C 001869EC 81 9D 00 00 */ lwz r12, 0(r29) /* 80189A90 001869F0 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 80189A94 001869F4 7D 89 03 A6 */ mtctr r12 -/* 80189A98 001869F8 4E 80 04 21 */ bctrl +/* 80189A98 001869F8 4E 80 04 21 */ bctrl /* 80189A9C 001869FC C0 22 A3 18 */ lfs f1, lbl_805AC038@sda21(r2) /* 80189AA0 00186A00 7C 66 1B 78 */ mr r6, r3 /* 80189AA4 00186A04 7F 83 E3 78 */ mr r3, r28 @@ -4668,7 +4668,7 @@ lbl_80189BF0: /* 80189C20 00186B80 80 01 3E 74 */ lwz r0, 0x3e74(r1) /* 80189C24 00186B84 7C 08 03 A6 */ mtlr r0 /* 80189C28 00186B88 38 21 3E 70 */ addi r1, r1, 0x3e70 -/* 80189C2C 00186B8C 4E 80 00 20 */ blr +/* 80189C2C 00186B8C 4E 80 00 20 */ blr .global CheckFalling__15CGroundMovementFR13CPhysicsActorR13CStateManagerf CheckFalling__15CGroundMovementFR13CPhysicsActorR13CStateManagerf: @@ -4684,7 +4684,7 @@ CheckFalling__15CGroundMovementFR13CPhysicsActorR13CStateManagerf: /* 80189C54 00186BB4 81 9B 00 00 */ lwz r12, 0(r27) /* 80189C58 00186BB8 81 8C 00 40 */ lwz r12, 0x40(r12) /* 80189C5C 00186BBC 7D 89 03 A6 */ mtctr r12 -/* 80189C60 00186BC0 4E 80 04 21 */ bctrl +/* 80189C60 00186BC0 4E 80 04 21 */ bctrl /* 80189C64 00186BC4 3B E0 00 00 */ li r31, 0 /* 80189C68 00186BC8 9B E1 00 6C */ stb r31, 0x6c(r1) /* 80189C6C 00186BCC 80 7C 08 50 */ lwz r3, 0x850(r28) @@ -4696,7 +4696,7 @@ lbl_80189C78: /* 80189C80 00186BE0 81 9B 00 00 */ lwz r12, 0(r27) /* 80189C84 00186BE4 81 8C 00 40 */ lwz r12, 0x40(r12) /* 80189C88 00186BE8 7D 89 03 A6 */ mtctr r12 -/* 80189C8C 00186BEC 4E 80 04 21 */ bctrl +/* 80189C8C 00186BEC 4E 80 04 21 */ bctrl /* 80189C90 00186BF0 38 7E 00 6C */ addi r3, r30, 0x6c /* 80189C94 00186BF4 38 81 00 38 */ addi r4, r1, 0x38 /* 80189C98 00186BF8 48 1A DE ED */ bl DoBoundsOverlap__6CAABoxCFRC6CAABox @@ -4766,4 +4766,4 @@ lbl_80189D80: /* 80189D84 00186CE4 80 01 00 94 */ lwz r0, 0x94(r1) /* 80189D88 00186CE8 7C 08 03 A6 */ mtlr r0 /* 80189D8C 00186CEC 38 21 00 90 */ addi r1, r1, 0x90 -/* 80189D90 00186CF0 4E 80 00 20 */ blr +/* 80189D90 00186CF0 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/CIOWin.s b/asm/MetroidPrime/CIOWin.s index ca38bf2f..651de189 100644 --- a/asm/MetroidPrime/CIOWin.s +++ b/asm/MetroidPrime/CIOWin.s @@ -13,26 +13,26 @@ lbl_803D9E90: .4byte Draw__6CIOWinCFv .4byte PreDraw__6CIOWinCFv .4byte 0 - + .section .text, "ax" .global PreDraw__6CIOWinCFv PreDraw__6CIOWinCFv: -/* 80052B8C 0004FAEC 4E 80 00 20 */ blr +/* 80052B8C 0004FAEC 4E 80 00 20 */ blr .global Draw__6CIOWinCFv Draw__6CIOWinCFv: -/* 80052B90 0004FAF0 4E 80 00 20 */ blr +/* 80052B90 0004FAF0 4E 80 00 20 */ blr .global GetIsContinueDraw__6CIOWinCFv GetIsContinueDraw__6CIOWinCFv: /* 80052B94 0004FAF4 38 60 00 01 */ li r3, 1 -/* 80052B98 0004FAF8 4E 80 00 20 */ blr +/* 80052B98 0004FAF8 4E 80 00 20 */ blr .global GetName__6CIOWinCFv GetName__6CIOWinCFv: /* 80052B9C 0004FAFC 38 63 00 04 */ addi r3, r3, 4 -/* 80052BA0 0004FB00 4E 80 00 20 */ blr +/* 80052BA0 0004FB00 4E 80 00 20 */ blr .global __dt__6CIOWinFv __dt__6CIOWinFv: @@ -63,7 +63,7 @@ lbl_80052BF0: /* 80052BFC 0004FB5C 83 C1 00 08 */ lwz r30, 8(r1) /* 80052C00 0004FB60 7C 08 03 A6 */ mtlr r0 /* 80052C04 0004FB64 38 21 00 10 */ addi r1, r1, 0x10 -/* 80052C08 0004FB68 4E 80 00 20 */ blr +/* 80052C08 0004FB68 4E 80 00 20 */ blr .global "__ct__6CIOWinFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" "__ct__6CIOWinFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>": diff --git a/asm/MetroidPrime/CIOWinManager.s b/asm/MetroidPrime/CIOWinManager.s index e7117255..8daec518 100644 --- a/asm/MetroidPrime/CIOWinManager.s +++ b/asm/MetroidPrime/CIOWinManager.s @@ -42,7 +42,7 @@ lbl_80051DB4: /* 80051E04 0004ED64 38 80 00 01 */ li r4, 1 /* 80051E08 0004ED68 81 8C 00 08 */ lwz r12, 8(r12) /* 80051E0C 0004ED6C 7D 89 03 A6 */ mtctr r12 -/* 80051E10 0004ED70 4E 80 04 21 */ bctrl +/* 80051E10 0004ED70 4E 80 04 21 */ bctrl lbl_80051E14: /* 80051E14 0004ED74 80 7F 00 08 */ lwz r3, 8(r31) /* 80051E18 0004ED78 28 03 00 00 */ cmplwi r3, 0 @@ -65,7 +65,7 @@ lbl_80051E34: /* 80051E54 0004EDB4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80051E58 0004EDB8 7C 08 03 A6 */ mtlr r0 /* 80051E5C 0004EDBC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80051E60 0004EDC0 4E 80 00 20 */ blr +/* 80051E60 0004EDC0 4E 80 00 20 */ blr .global GetIOWin__Q213CIOWinManager11IOWinPQNodeCFv GetIOWin__Q213CIOWinManager11IOWinPQNodeCFv: @@ -75,7 +75,7 @@ GetIOWin__Q213CIOWinManager11IOWinPQNodeCFv: /* 80051E70 0004EDD0 80 64 00 04 */ lwz r3, 4(r4) /* 80051E74 0004EDD4 38 03 00 01 */ addi r0, r3, 1 /* 80051E78 0004EDD8 90 04 00 04 */ stw r0, 4(r4) -/* 80051E7C 0004EDDC 4E 80 00 20 */ blr +/* 80051E7C 0004EDDC 4E 80 00 20 */ blr .global OnIOWinMessage__13CIOWinManagerFRC20CArchitectureMessage OnIOWinMessage__13CIOWinManagerFRC20CArchitectureMessage: @@ -214,7 +214,7 @@ lbl_80052058: /* 80052068 0004EFC8 83 81 00 30 */ lwz r28, 0x30(r1) /* 8005206C 0004EFCC 7C 08 03 A6 */ mtlr r0 /* 80052070 0004EFD0 38 21 00 40 */ addi r1, r1, 0x40 -/* 80052074 0004EFD4 4E 80 00 20 */ blr +/* 80052074 0004EFD4 4E 80 00 20 */ blr .global Draw__13CIOWinManagerCFv Draw__13CIOWinManagerCFv: @@ -236,7 +236,7 @@ lbl_8005209C: /* 800520B0 0004F010 81 83 00 00 */ lwz r12, 0(r3) /* 800520B4 0004F014 81 8C 00 18 */ lwz r12, 0x18(r12) /* 800520B8 0004F018 7D 89 03 A6 */ mtctr r12 -/* 800520BC 0004F01C 4E 80 04 21 */ bctrl +/* 800520BC 0004F01C 4E 80 04 21 */ bctrl /* 800520C0 0004F020 38 61 00 14 */ addi r3, r1, 0x14 /* 800520C4 0004F024 4B FB 65 D9 */ bl sub_8000869c /* 800520C8 0004F028 7F C4 F3 78 */ mr r4, r30 @@ -247,7 +247,7 @@ lbl_8005209C: /* 800520DC 0004F03C 81 83 00 00 */ lwz r12, 0(r3) /* 800520E0 0004F040 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800520E4 0004F044 7D 89 03 A6 */ mtctr r12 -/* 800520E8 0004F048 4E 80 04 21 */ bctrl +/* 800520E8 0004F048 4E 80 04 21 */ bctrl /* 800520EC 0004F04C 7C 7F 1B 78 */ mr r31, r3 /* 800520F0 0004F050 38 61 00 10 */ addi r3, r1, 0x10 /* 800520F4 0004F054 4B FB 65 A9 */ bl sub_8000869c @@ -269,7 +269,7 @@ lbl_80052114: /* 80052128 0004F088 81 83 00 00 */ lwz r12, 0(r3) /* 8005212C 0004F08C 81 8C 00 14 */ lwz r12, 0x14(r12) /* 80052130 0004F090 7D 89 03 A6 */ mtctr r12 -/* 80052134 0004F094 4E 80 04 21 */ bctrl +/* 80052134 0004F094 4E 80 04 21 */ bctrl /* 80052138 0004F098 38 61 00 0C */ addi r3, r1, 0xc /* 8005213C 0004F09C 4B FB 65 61 */ bl sub_8000869c /* 80052140 0004F0A0 7F C4 F3 78 */ mr r4, r30 @@ -280,7 +280,7 @@ lbl_80052114: /* 80052154 0004F0B4 81 83 00 00 */ lwz r12, 0(r3) /* 80052158 0004F0B8 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8005215C 0004F0BC 7D 89 03 A6 */ mtctr r12 -/* 80052160 0004F0C0 4E 80 04 21 */ bctrl +/* 80052160 0004F0C0 4E 80 04 21 */ bctrl /* 80052164 0004F0C4 7C 7F 1B 78 */ mr r31, r3 /* 80052168 0004F0C8 38 61 00 08 */ addi r3, r1, 8 /* 8005216C 0004F0CC 4B FB 65 31 */ bl sub_8000869c @@ -297,7 +297,7 @@ lbl_80052184: /* 80052190 0004F0F0 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80052194 0004F0F4 7C 08 03 A6 */ mtlr r0 /* 80052198 0004F0F8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8005219C 0004F0FC 4E 80 00 20 */ blr +/* 8005219C 0004F0FC 4E 80 00 20 */ blr .global DistributeOneMessage__13CIOWinManagerFRC20CArchitectureMessageR18CArchitectureQueue DistributeOneMessage__13CIOWinManagerFRC20CArchitectureMessageR18CArchitectureQueue: @@ -330,7 +330,7 @@ lbl_800521CC: /* 80052204 0004F164 81 83 00 00 */ lwz r12, 0(r3) /* 80052208 0004F168 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8005220C 0004F16C 7D 89 03 A6 */ mtctr r12 -/* 80052210 0004F170 4E 80 04 21 */ bctrl +/* 80052210 0004F170 4E 80 04 21 */ bctrl /* 80052214 0004F174 7C 7F 1B 78 */ mr r31, r3 /* 80052218 0004F178 48 00 00 E0 */ b lbl_800522F8 lbl_8005221C: @@ -442,7 +442,7 @@ lbl_80052378: /* 8005237C 0004F2DC 80 01 00 54 */ lwz r0, 0x54(r1) /* 80052380 0004F2E0 7C 08 03 A6 */ mtlr r0 /* 80052384 0004F2E4 38 21 00 50 */ addi r1, r1, 0x50 -/* 80052388 0004F2E8 4E 80 00 20 */ blr +/* 80052388 0004F2E8 4E 80 00 20 */ blr .global sub_8005238c sub_8005238c: @@ -486,7 +486,7 @@ lbl_80052414: /* 8005241C 0004F37C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80052420 0004F380 7C 08 03 A6 */ mtlr r0 /* 80052424 0004F384 38 21 00 20 */ addi r1, r1, 0x20 -/* 80052428 0004F388 4E 80 00 20 */ blr +/* 80052428 0004F388 4E 80 00 20 */ blr .global PumpMessages__13CIOWinManagerFR18CArchitectureQueue PumpMessages__13CIOWinManagerFR18CArchitectureQueue: @@ -539,7 +539,7 @@ lbl_800524BC: /* 800524D8 0004F438 83 81 00 20 */ lwz r28, 0x20(r1) /* 800524DC 0004F43C 7C 08 03 A6 */ mtlr r0 /* 800524E0 0004F440 38 21 00 30 */ addi r1, r1, 0x30 -/* 800524E4 0004F444 4E 80 00 20 */ blr +/* 800524E4 0004F444 4E 80 00 20 */ blr .global sub_800524e8 sub_800524e8: @@ -611,7 +611,7 @@ lbl_800525CC: /* 800525D0 0004F530 80 01 00 34 */ lwz r0, 0x34(r1) /* 800525D4 0004F534 7C 08 03 A6 */ mtlr r0 /* 800525D8 0004F538 38 21 00 30 */ addi r1, r1, 0x30 -/* 800525DC 0004F53C 4E 80 00 20 */ blr +/* 800525DC 0004F53C 4E 80 00 20 */ blr .global "find__Q24rstl418red_black_tree,Q24rstl17rmemory_allocator>,Q24rstl83pair,Q24rstl17rmemory_allocator>,s>,0,Q24rstl103select1st,Q24rstl17rmemory_allocator>,s>>,Q24rstl81less,Q24rstl17rmemory_allocator>>,Q24rstl17rmemory_allocator>CFRCQ24rstl66basic_string,Q24rstl17rmemory_allocat" "find__Q24rstl418red_black_tree,Q24rstl17rmemory_allocator>,Q24rstl83pair,Q24rstl17rmemory_allocator>,s>,0,Q24rstl103select1st,Q24rstl17rmemory_allocator>,s>>,Q24rstl81less,Q24rstl17rmemory_allocator>>,Q24rstl17rmemory_allocator>CFRCQ24rstl66basic_string,Q24rstl17rmemory_allocat": @@ -624,7 +624,7 @@ lbl_800525CC: /* 800525F8 0004F558 80 01 00 14 */ lwz r0, 0x14(r1) /* 800525FC 0004F55C 7C 08 03 A6 */ mtlr r0 /* 80052600 0004F560 38 21 00 10 */ addi r1, r1, 0x10 -/* 80052604 0004F564 4E 80 00 20 */ blr +/* 80052604 0004F564 4E 80 00 20 */ blr .global sub_80052608 sub_80052608: @@ -746,7 +746,7 @@ lbl_80052780: /* 80052784 0004F6E4 80 01 00 34 */ lwz r0, 0x34(r1) /* 80052788 0004F6E8 7C 08 03 A6 */ mtlr r0 /* 8005278C 0004F6EC 38 21 00 30 */ addi r1, r1, 0x30 -/* 80052790 0004F6F0 4E 80 00 20 */ blr +/* 80052790 0004F6F0 4E 80 00 20 */ blr .global RemoveAllIOWins__13CIOWinManagerFv RemoveAllIOWins__13CIOWinManagerFv: @@ -785,7 +785,7 @@ lbl_800527F4: /* 80052804 0004F764 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80052808 0004F768 7C 08 03 A6 */ mtlr r0 /* 8005280C 0004F76C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80052810 0004F770 4E 80 00 20 */ blr +/* 80052810 0004F770 4E 80 00 20 */ blr .global "RemoveIOWin__13CIOWinManagerFQ24rstl17ncrc_ptr<6CIOWin>" "RemoveIOWin__13CIOWinManagerFQ24rstl17ncrc_ptr<6CIOWin>": @@ -881,7 +881,7 @@ lbl_8005293C: /* 80052940 0004F8A0 80 01 00 34 */ lwz r0, 0x34(r1) /* 80052944 0004F8A4 7C 08 03 A6 */ mtlr r0 /* 80052948 0004F8A8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8005294C 0004F8AC 4E 80 00 20 */ blr +/* 8005294C 0004F8AC 4E 80 00 20 */ blr .global "AddIOWin__13CIOWinManagerFQ24rstl17ncrc_ptr<6CIOWin>ii" "AddIOWin__13CIOWinManagerFQ24rstl17ncrc_ptr<6CIOWin>ii": @@ -989,7 +989,7 @@ lbl_80052AA8: /* 80052AAC 0004FA0C 80 01 00 34 */ lwz r0, 0x34(r1) /* 80052AB0 0004FA10 7C 08 03 A6 */ mtlr r0 /* 80052AB4 0004FA14 38 21 00 30 */ addi r1, r1, 0x30 -/* 80052AB8 0004FA18 4E 80 00 20 */ blr +/* 80052AB8 0004FA18 4E 80 00 20 */ blr .global "__ct__Q213CIOWinManager11IOWinPQNodeFQ24rstl17ncrc_ptr<6CIOWin>iPQ213CIOWinManager11IOWinPQNode" "__ct__Q213CIOWinManager11IOWinPQNodeFQ24rstl17ncrc_ptr<6CIOWin>iPQ213CIOWinManager11IOWinPQNode": @@ -1001,7 +1001,7 @@ lbl_80052AA8: /* 80052AD0 0004FA30 90 07 00 04 */ stw r0, 4(r7) /* 80052AD4 0004FA34 90 A3 00 04 */ stw r5, 4(r3) /* 80052AD8 0004FA38 90 C3 00 08 */ stw r6, 8(r3) -/* 80052ADC 0004FA3C 4E 80 00 20 */ blr +/* 80052ADC 0004FA3C 4E 80 00 20 */ blr .global sub_80052ae0 sub_80052ae0: @@ -1031,7 +1031,7 @@ lbl_80052B28: /* 80052B34 0004FA94 83 C1 00 08 */ lwz r30, 8(r1) /* 80052B38 0004FA98 7C 08 03 A6 */ mtlr r0 /* 80052B3C 0004FA9C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80052B40 0004FAA0 4E 80 00 20 */ blr +/* 80052B40 0004FAA0 4E 80 00 20 */ blr .global __ct__13CIOWinManagerFv __ct__13CIOWinManagerFv: @@ -1044,7 +1044,7 @@ __ct__13CIOWinManagerFv: /* 80052B5C 0004FABC 90 03 00 14 */ stw r0, 0x14(r3) /* 80052B60 0004FAC0 90 03 00 18 */ stw r0, 0x18(r3) /* 80052B64 0004FAC4 90 83 00 1C */ stw r4, 0x1c(r3) -/* 80052B68 0004FAC8 4E 80 00 20 */ blr +/* 80052B68 0004FAC8 4E 80 00 20 */ blr .global "__eq<6CIOWin>__4rstlFRCQ24rstl15rc_ptr<6CIOWin>RCQ24rstl15rc_ptr<6CIOWin>" "__eq<6CIOWin>__4rstlFRCQ24rstl15rc_ptr<6CIOWin>RCQ24rstl15rc_ptr<6CIOWin>": @@ -1055,4 +1055,4 @@ __ct__13CIOWinManagerFv: /* 80052B7C 0004FADC 7C 04 00 50 */ subf r0, r4, r0 /* 80052B80 0004FAE0 7C 00 00 34 */ cntlzw r0, r0 /* 80052B84 0004FAE4 54 03 D9 7E */ srwi r3, r0, 5 -/* 80052B88 0004FAE8 4E 80 00 20 */ blr +/* 80052B88 0004FAE8 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/CIkChain.s b/asm/MetroidPrime/CIkChain.s index 541e1b81..f6a3874b 100644 --- a/asm/MetroidPrime/CIkChain.s +++ b/asm/MetroidPrime/CIkChain.s @@ -77,7 +77,7 @@ lbl_8022594C: /* 80225950 002228B0 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80225954 002228B4 7C 08 03 A6 */ mtlr r0 /* 80225958 002228B8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8022595C 002228BC 4E 80 00 20 */ blr +/* 8022595C 002228BC 4E 80 00 20 */ blr .global Deactivate__8CIkChainFv Deactivate__8CIkChainFv: @@ -85,7 +85,7 @@ Deactivate__8CIkChainFv: /* 80225964 002228C4 38 80 00 00 */ li r4, 0 /* 80225968 002228C8 50 80 3E 30 */ rlwimi r0, r4, 7, 0x18, 0x18 /* 8022596C 002228CC 98 03 00 44 */ stb r0, 0x44(r3) -/* 80225970 002228D0 4E 80 00 20 */ blr +/* 80225970 002228D0 4E 80 00 20 */ blr .global PreRender__8CIkChainFR9CAnimDataRC12CTransform4fRC9CVector3f PreRender__8CIkChainFR9CAnimDataRC12CTransform4fRC9CVector3f: @@ -388,7 +388,7 @@ lbl_80225DFC: /* 80225E0C 00222D6C 83 81 01 F0 */ lwz r28, 0x1f0(r1) /* 80225E10 00222D70 7C 08 03 A6 */ mtlr r0 /* 80225E14 00222D74 38 21 02 00 */ addi r1, r1, 0x200 -/* 80225E18 00222D78 4E 80 00 20 */ blr +/* 80225E18 00222D78 4E 80 00 20 */ blr .global Activate__8CIkChainFRC9CAnimData6CSegIdRC12CTransform4f Activate__8CIkChainFRC9CAnimData6CSegIdRC12CTransform4f: @@ -532,7 +532,7 @@ lbl_80226014: /* 80226020 00222F80 83 A1 00 34 */ lwz r29, 0x34(r1) /* 80226024 00222F84 7C 08 03 A6 */ mtlr r0 /* 80226028 00222F88 38 21 00 40 */ addi r1, r1, 0x40 -/* 8022602C 00222F8C 4E 80 00 20 */ blr +/* 8022602C 00222F8C 4E 80 00 20 */ blr .global Solve__8CIkChainFR11CQuaternionR11CQuaternionRC9CVector3f Solve__8CIkChainFR11CQuaternionR11CQuaternionRC9CVector3f: @@ -834,4 +834,4 @@ lbl_80226408: /* 802264C4 00223424 83 81 01 10 */ lwz r28, 0x110(r1) /* 802264C8 00223428 7C 08 03 A6 */ mtlr r0 /* 802264CC 0022342C 38 21 01 80 */ addi r1, r1, 0x180 -/* 802264D0 00223430 4E 80 00 20 */ blr +/* 802264D0 00223430 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/CInGameGuiManager.s b/asm/MetroidPrime/CInGameGuiManager.s index 44d5e589..0929d34b 100644 --- a/asm/MetroidPrime/CInGameGuiManager.s +++ b/asm/MetroidPrime/CInGameGuiManager.s @@ -109,7 +109,7 @@ lbl_80106B8C: /* 80106BA8 00103B08 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80106BAC 00103B0C 7C 08 03 A6 */ mtlr r0 /* 80106BB0 00103B10 38 21 00 20 */ addi r1, r1, 0x20 -/* 80106BB4 00103B14 4E 80 00 20 */ blr +/* 80106BB4 00103B14 4E 80 00 20 */ blr .global DestroyAreaTextures__17CInGameGuiManagerFRC13CStateManager DestroyAreaTextures__17CInGameGuiManagerFRC13CStateManager: @@ -192,7 +192,7 @@ lbl_80106C94: /* 80106CD8 00103C38 81 84 00 00 */ lwz r12, 0(r4) /* 80106CDC 00103C3C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80106CE0 00103C40 7D 89 03 A6 */ mtctr r12 -/* 80106CE4 00103C44 4E 80 04 21 */ bctrl +/* 80106CE4 00103C44 4E 80 04 21 */ bctrl /* 80106CE8 00103C48 38 61 00 70 */ addi r3, r1, 0x70 /* 80106CEC 00103C4C 38 81 00 58 */ addi r4, r1, 0x58 /* 80106CF0 00103C50 48 23 A1 B9 */ bl __ct__6CTokenFRC6CToken @@ -306,7 +306,7 @@ lbl_80106E40: /* 80106E74 00103DD4 81 84 00 00 */ lwz r12, 0(r4) /* 80106E78 00103DD8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80106E7C 00103DDC 7D 89 03 A6 */ mtctr r12 -/* 80106E80 00103DE0 4E 80 04 21 */ bctrl +/* 80106E80 00103DE0 4E 80 04 21 */ bctrl /* 80106E84 00103DE4 38 61 00 68 */ addi r3, r1, 0x68 /* 80106E88 00103DE8 38 81 00 48 */ addi r4, r1, 0x48 /* 80106E8C 00103DEC 48 23 A0 1D */ bl __ct__6CTokenFRC6CToken @@ -522,7 +522,7 @@ lbl_80107154: /* 80107188 001040E8 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 8010718C 001040EC 7C 08 03 A6 */ mtlr r0 /* 80107190 001040F0 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 80107194 001040F4 4E 80 00 20 */ blr +/* 80107194 001040F4 4E 80 00 20 */ blr .global sub_80107198 sub_80107198: @@ -562,12 +562,12 @@ lbl_801071F4: /* 80107208 00104168 83 C1 00 08 */ lwz r30, 8(r1) /* 8010720C 0010416C 7C 08 03 A6 */ mtlr r0 /* 80107210 00104170 38 21 00 10 */ addi r1, r1, 0x10 -/* 80107214 00104174 4E 80 00 20 */ blr +/* 80107214 00104174 4E 80 00 20 */ blr .global sub_80107218 sub_80107218: /* 80107218 00104178 7C 04 28 40 */ cmplw r4, r5 -/* 8010721C 0010417C 4D 82 00 20 */ beqlr +/* 8010721C 0010417C 4D 82 00 20 */ beqlr /* 80107220 00104180 80 03 00 04 */ lwz r0, 4(r3) /* 80107224 00104184 7C 04 00 40 */ cmplw r4, r0 /* 80107228 00104188 40 82 00 0C */ bne lbl_80107234 @@ -599,11 +599,11 @@ lbl_80107274: /* 80107280 001041E0 91 04 00 00 */ stw r8, 0(r4) /* 80107284 001041E4 90 A3 00 00 */ stw r5, 0(r3) /* 80107288 001041E8 90 65 00 04 */ stw r3, 4(r5) -/* 8010728C 001041EC 4E 80 00 20 */ blr +/* 8010728C 001041EC 4E 80 00 20 */ blr lbl_80107290: /* 80107290 001041F0 90 85 00 04 */ stw r4, 4(r5) /* 80107294 001041F4 90 A4 00 00 */ stw r5, 0(r4) -/* 80107298 001041F8 4E 80 00 20 */ blr +/* 80107298 001041F8 4E 80 00 20 */ blr .global sub_8010729c sub_8010729c: @@ -657,7 +657,7 @@ lbl_80107330: /* 80107344 001042A4 83 81 00 20 */ lwz r28, 0x20(r1) /* 80107348 001042A8 7C 08 03 A6 */ mtlr r0 /* 8010734C 001042AC 38 21 00 30 */ addi r1, r1, 0x30 -/* 80107350 001042B0 4E 80 00 20 */ blr +/* 80107350 001042B0 4E 80 00 20 */ blr .global sub_80107354 sub_80107354: @@ -711,7 +711,7 @@ lbl_801073F0: /* 801073FC 0010435C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80107400 00104360 7C 08 03 A6 */ mtlr r0 /* 80107404 00104364 38 21 00 20 */ addi r1, r1, 0x20 -/* 80107408 00104368 4E 80 00 20 */ blr +/* 80107408 00104368 4E 80 00 20 */ blr .global EnsureStates__17CInGameGuiManagerFR13CStateManager EnsureStates__17CInGameGuiManagerFR13CStateManager: @@ -743,7 +743,7 @@ lbl_80107464: /* 8010746C 001043CC 83 C1 00 08 */ lwz r30, 8(r1) /* 80107470 001043D0 7C 08 03 A6 */ mtlr r0 /* 80107474 001043D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80107478 001043D8 4E 80 00 20 */ blr +/* 80107478 001043D8 4E 80 00 20 */ blr .global DoStateTransition__17CInGameGuiManagerFR13CStateManager DoStateTransition__17CInGameGuiManagerFR13CStateManager: @@ -874,7 +874,7 @@ lbl_80107614: /* 80107630 00104590 80 01 00 24 */ lwz r0, 0x24(r1) /* 80107634 00104594 7C 08 03 A6 */ mtlr r0 /* 80107638 00104598 38 21 00 20 */ addi r1, r1, 0x20 -/* 8010763C 0010459C 4E 80 00 20 */ blr +/* 8010763C 0010459C 4E 80 00 20 */ blr .global BeginStateTransition__17CInGameGuiManagerF15EInGameGuiStateRC13CStateManager BeginStateTransition__17CInGameGuiManagerF15EInGameGuiStateRC13CStateManager: @@ -995,14 +995,14 @@ lbl_801077D8: /* 801077DC 0010473C 80 01 00 24 */ lwz r0, 0x24(r1) /* 801077E0 00104740 7C 08 03 A6 */ mtlr r0 /* 801077E4 00104744 38 21 00 20 */ addi r1, r1, 0x20 -/* 801077E8 00104748 4E 80 00 20 */ blr +/* 801077E8 00104748 4E 80 00 20 */ blr .global GetIsGameDraw__17CInGameGuiManagerCFv GetIsGameDraw__17CInGameGuiManagerCFv: /* 801077EC 0010474C 80 63 00 3C */ lwz r3, 0x3c(r3) /* 801077F0 00104750 88 03 00 50 */ lbz r0, 0x50(r3) /* 801077F4 00104754 54 03 D7 FE */ rlwinm r3, r0, 0x1a, 0x1f, 0x1f -/* 801077F8 00104758 4E 80 00 20 */ blr +/* 801077F8 00104758 4E 80 00 20 */ blr .global ShowPauseGameHudMessage__17CInGameGuiManagerFRC13CStateManagerUi ShowPauseGameHudMessage__17CInGameGuiManagerFRC13CStateManagerUi: @@ -1016,7 +1016,7 @@ ShowPauseGameHudMessage__17CInGameGuiManagerFRC13CStateManagerUi: /* 80107818 00104778 80 01 00 14 */ lwz r0, 0x14(r1) /* 8010781C 0010477C 7C 08 03 A6 */ mtlr r0 /* 80107820 00104780 38 21 00 10 */ addi r1, r1, 0x10 -/* 80107824 00104784 4E 80 00 20 */ blr +/* 80107824 00104784 4E 80 00 20 */ blr .global PauseGame__17CInGameGuiManagerFRC13CStateManager15EInGameGuiState PauseGame__17CInGameGuiManagerFRC13CStateManager15EInGameGuiState: @@ -1035,7 +1035,7 @@ PauseGame__17CInGameGuiManagerFRC13CStateManager15EInGameGuiState: /* 80107858 001047B8 81 83 00 00 */ lwz r12, 0(r3) /* 8010785C 001047BC 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80107860 001047C0 7D 89 03 A6 */ mtctr r12 -/* 80107864 001047C4 4E 80 04 21 */ bctrl +/* 80107864 001047C4 4E 80 04 21 */ bctrl /* 80107868 001047C8 38 60 00 02 */ li r3, 2 /* 8010786C 001047CC 48 1E 20 49 */ bl SetChannel__11CSfxManagerFQ211CSfxManager12ESfxChannels /* 80107870 001047D0 7F A3 EB 78 */ mr r3, r29 @@ -1048,7 +1048,7 @@ PauseGame__17CInGameGuiManagerFRC13CStateManager15EInGameGuiState: /* 8010788C 001047EC 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80107890 001047F0 7C 08 03 A6 */ mtlr r0 /* 80107894 001047F4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80107898 001047F8 4E 80 00 20 */ blr +/* 80107898 001047F8 4E 80 00 20 */ blr .global ProcessControllerInput__17CInGameGuiManagerFRC13CStateManagerRC11CFinalInputR18CArchitectureQueue ProcessControllerInput__17CInGameGuiManagerFRC13CStateManagerRC11CFinalInputR18CArchitectureQueue: @@ -1174,7 +1174,7 @@ lbl_80107A3C: /* 80107A48 001049A8 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80107A4C 001049AC 7C 08 03 A6 */ mtlr r0 /* 80107A50 001049B0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80107A54 001049B4 4E 80 00 20 */ blr +/* 80107A54 001049B4 4E 80 00 20 */ blr .global RefreshHudOptions__17CInGameGuiManagerFv RefreshHudOptions__17CInGameGuiManagerFv: @@ -1186,7 +1186,7 @@ RefreshHudOptions__17CInGameGuiManagerFv: /* 80107A6C 001049CC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80107A70 001049D0 7C 08 03 A6 */ mtlr r0 /* 80107A74 001049D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80107A78 001049D8 4E 80 00 20 */ blr +/* 80107A78 001049D8 4E 80 00 20 */ blr .global OnNewPauseScreenState__17CInGameGuiManagerFR18CArchitectureQueue OnNewPauseScreenState__17CInGameGuiManagerFR18CArchitectureQueue: @@ -1263,7 +1263,7 @@ lbl_80107B6C: /* 80107B74 00104AD4 83 C1 00 08 */ lwz r30, 8(r1) /* 80107B78 00104AD8 7C 08 03 A6 */ mtlr r0 /* 80107B7C 00104ADC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80107B80 00104AE0 4E 80 00 20 */ blr +/* 80107B80 00104AE0 4E 80 00 20 */ blr .global UpdateAutoMapper__17CInGameGuiManagerFR13CStateManagerf UpdateAutoMapper__17CInGameGuiManagerFR13CStateManagerf: @@ -1579,7 +1579,7 @@ lbl_80108010: /* 80108038 00104F98 83 C1 03 F8 */ lwz r30, 0x3f8(r1) /* 8010803C 00104F9C 7C 08 03 A6 */ mtlr r0 /* 80108040 00104FA0 38 21 04 40 */ addi r1, r1, 0x440 -/* 80108044 00104FA4 4E 80 00 20 */ blr +/* 80108044 00104FA4 4E 80 00 20 */ blr .global Update__17CInGameGuiManagerFRC13CStateManagerfR18CArchitectureQueueb Update__17CInGameGuiManagerFRC13CStateManagerfR18CArchitectureQueueb: @@ -1655,7 +1655,7 @@ lbl_801080BC: /* 80108150 001050B0 81 84 00 00 */ lwz r12, 0(r4) /* 80108154 001050B4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80108158 001050B8 7D 89 03 A6 */ mtctr r12 -/* 8010815C 001050BC 4E 80 04 21 */ bctrl +/* 8010815C 001050BC 4E 80 04 21 */ bctrl /* 80108160 001050C0 7F 63 DB 78 */ mr r3, r27 /* 80108164 001050C4 38 81 00 38 */ addi r4, r1, 0x38 /* 80108168 001050C8 3B 20 00 01 */ li r25, 1 @@ -2048,7 +2048,7 @@ lbl_801086B4: /* 801086E0 00105640 80 01 00 94 */ lwz r0, 0x94(r1) /* 801086E4 00105644 7C 08 03 A6 */ mtlr r0 /* 801086E8 00105648 38 21 00 90 */ addi r1, r1, 0x90 -/* 801086EC 0010564C 4E 80 00 20 */ blr +/* 801086EC 0010564C 4E 80 00 20 */ blr .global PreDraw__17CInGameGuiManagerFR13CStateManagerb PreDraw__17CInGameGuiManagerFR13CStateManagerb: @@ -2078,7 +2078,7 @@ lbl_80108738: /* 80108744 001056A4 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80108748 001056A8 7C 08 03 A6 */ mtlr r0 /* 8010874C 001056AC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80108750 001056B0 4E 80 00 20 */ blr +/* 80108750 001056B0 4E 80 00 20 */ blr .global Draw__17CInGameGuiManagerCFRC13CStateManager Draw__17CInGameGuiManagerCFRC13CStateManager: @@ -2127,12 +2127,12 @@ lbl_801087CC: /* 801087F8 00105758 81 83 00 00 */ lwz r12, 0(r3) /* 801087FC 0010575C 81 8C 00 60 */ lwz r12, 0x60(r12) /* 80108800 00105760 7D 89 03 A6 */ mtctr r12 -/* 80108804 00105764 4E 80 04 21 */ bctrl +/* 80108804 00105764 4E 80 04 21 */ bctrl /* 80108808 00105768 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 8010880C 0010576C 81 83 00 00 */ lwz r12, 0(r3) /* 80108810 00105770 81 8C 00 68 */ lwz r12, 0x68(r12) /* 80108814 00105774 7D 89 03 A6 */ mtctr r12 -/* 80108818 00105778 4E 80 04 21 */ bctrl +/* 80108818 00105778 4E 80 04 21 */ bctrl /* 8010881C 0010577C 3C 80 80 5A */ lis r4, lbl_805A5EBC@ha /* 80108820 00105780 38 60 00 00 */ li r3, 0 /* 80108824 00105784 38 84 5E BC */ addi r4, r4, lbl_805A5EBC@l @@ -2438,7 +2438,7 @@ lbl_80108C30: /* 80108C68 00105BC8 81 83 00 00 */ lwz r12, 0(r3) /* 80108C6C 00105BCC 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80108C70 00105BD0 7D 89 03 A6 */ mtctr r12 -/* 80108C74 00105BD4 4E 80 04 21 */ bctrl +/* 80108C74 00105BD4 4E 80 04 21 */ bctrl /* 80108C78 00105BD8 C0 22 94 94 */ lfs f1, lbl_805AB1B4@sda21(r2) /* 80108C7C 00105BDC C0 42 94 AC */ lfs f2, lbl_805AB1CC@sda21(r2) /* 80108C80 00105BE0 48 20 17 61 */ bl SetDepthRange__9CGraphicsFff @@ -2459,7 +2459,7 @@ lbl_80108C30: /* 80108CBC 00105C1C 81 83 00 00 */ lwz r12, 0(r3) /* 80108CC0 00105C20 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80108CC4 00105C24 7D 89 03 A6 */ mtctr r12 -/* 80108CC8 00105C28 4E 80 04 21 */ bctrl +/* 80108CC8 00105C28 4E 80 04 21 */ bctrl /* 80108CCC 00105C2C 38 60 00 01 */ li r3, 1 /* 80108CD0 00105C30 38 80 00 06 */ li r4, 6 /* 80108CD4 00105C34 38 A0 00 00 */ li r5, 0 @@ -2735,7 +2735,7 @@ lbl_80108DE8: /* 801090E4 00106044 81 83 00 00 */ lwz r12, 0(r3) /* 801090E8 00106048 81 8C 00 70 */ lwz r12, 0x70(r12) /* 801090EC 0010604C 7D 89 03 A6 */ mtctr r12 -/* 801090F0 00106050 4E 80 04 21 */ bctrl +/* 801090F0 00106050 4E 80 04 21 */ bctrl /* 801090F4 00106054 80 7F 00 58 */ lwz r3, 0x58(r31) /* 801090F8 00106058 38 80 00 00 */ li r4, 0 /* 801090FC 0010605C 38 A0 00 01 */ li r5, 1 @@ -2808,7 +2808,7 @@ lbl_801091C0: /* 80109204 00106164 80 01 01 D4 */ lwz r0, 0x1d4(r1) /* 80109208 00106168 7C 08 03 A6 */ mtlr r0 /* 8010920C 0010616C 38 21 01 D0 */ addi r1, r1, 0x1d0 -/* 80109210 00106170 4E 80 00 20 */ blr +/* 80109210 00106170 4E 80 00 20 */ blr .global StartFadeIn__17CInGameGuiManagerFv StartFadeIn__17CInGameGuiManagerFv: @@ -2832,7 +2832,7 @@ StartFadeIn__17CInGameGuiManagerFv: /* 80109258 001061B8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8010925C 001061BC 7C 08 03 A6 */ mtlr r0 /* 80109260 001061C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80109264 001061C4 4E 80 00 20 */ blr +/* 80109264 001061C4 4E 80 00 20 */ blr .global CheckLoadComplete__17CInGameGuiManagerFRC13CStateManager CheckLoadComplete__17CInGameGuiManagerFRC13CStateManager: @@ -2876,7 +2876,7 @@ lbl_801092E4: /* 801092F0 00106250 81 84 00 00 */ lwz r12, 0(r4) /* 801092F4 00106254 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801092F8 00106258 7D 89 03 A6 */ mtctr r12 -/* 801092FC 0010625C 4E 80 04 21 */ bctrl +/* 801092FC 0010625C 4E 80 04 21 */ bctrl /* 80109300 00106260 38 61 00 20 */ addi r3, r1, 0x20 /* 80109304 00106264 38 81 00 18 */ addi r4, r1, 0x18 /* 80109308 00106268 48 23 7B A1 */ bl __ct__6CTokenFRC6CToken @@ -2982,7 +2982,7 @@ lbl_8010945C: /* 8010946C 001063CC 38 80 00 01 */ li r4, 1 /* 80109470 001063D0 81 8C 00 08 */ lwz r12, 8(r12) /* 80109474 001063D4 7D 89 03 A6 */ mtctr r12 -/* 80109478 001063D8 4E 80 04 21 */ bctrl +/* 80109478 001063D8 4E 80 04 21 */ bctrl lbl_8010947C: /* 8010947C 001063DC 3C 60 80 3D */ lis r3, lbl_803CEEC4@ha /* 80109480 001063E0 93 BF 00 34 */ stw r29, 0x34(r31) @@ -3004,7 +3004,7 @@ lbl_801094AC: /* 801094BC 0010641C 38 80 00 01 */ li r4, 1 /* 801094C0 00106420 81 8C 00 08 */ lwz r12, 8(r12) /* 801094C4 00106424 7D 89 03 A6 */ mtctr r12 -/* 801094C8 00106428 4E 80 04 21 */ bctrl +/* 801094C8 00106428 4E 80 04 21 */ bctrl lbl_801094CC: /* 801094CC 0010642C 3C 60 80 3D */ lis r3, lbl_803CEEC4@ha /* 801094D0 00106430 93 BF 00 38 */ stw r29, 0x38(r31) @@ -3025,7 +3025,7 @@ lbl_801094F8: /* 80109508 00106468 38 80 00 01 */ li r4, 1 /* 8010950C 0010646C 81 8C 00 08 */ lwz r12, 8(r12) /* 80109510 00106470 7D 89 03 A6 */ mtctr r12 -/* 80109514 00106474 4E 80 04 21 */ bctrl +/* 80109514 00106474 4E 80 04 21 */ bctrl lbl_80109518: /* 80109518 00106478 3C 60 80 3D */ lis r3, lbl_803CEEC4@ha /* 8010951C 0010647C 93 BF 00 3C */ stw r29, 0x3c(r31) @@ -3243,7 +3243,7 @@ lbl_80109824: /* 80109834 00106794 83 81 00 D0 */ lwz r28, 0xd0(r1) /* 80109838 00106798 7C 08 03 A6 */ mtlr r0 /* 8010983C 0010679C 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 80109840 001067A0 4E 80 00 20 */ blr +/* 80109840 001067A0 4E 80 00 20 */ blr .global CheckDGRPLoadComplete__17CInGameGuiManagerFv CheckDGRPLoadComplete__17CInGameGuiManagerFv: @@ -3259,7 +3259,7 @@ lbl_8010985C: /* 80109864 001067C4 28 00 00 00 */ cmplwi r0, 0 /* 80109868 001067C8 40 82 00 0C */ bne lbl_80109874 /* 8010986C 001067CC 38 60 00 00 */ li r3, 0 -/* 80109870 001067D0 4E 80 00 20 */ blr +/* 80109870 001067D0 4E 80 00 20 */ blr lbl_80109874: /* 80109874 001067D4 38 C6 00 08 */ addi r6, r6, 8 lbl_80109878: @@ -3276,14 +3276,14 @@ lbl_80109894: /* 8010989C 001067FC 28 00 00 00 */ cmplwi r0, 0 /* 801098A0 00106800 40 82 00 0C */ bne lbl_801098AC /* 801098A4 00106804 38 60 00 00 */ li r3, 0 -/* 801098A8 00106808 4E 80 00 20 */ blr +/* 801098A8 00106808 4E 80 00 20 */ blr lbl_801098AC: /* 801098AC 0010680C 38 A5 00 08 */ addi r5, r5, 8 lbl_801098B0: /* 801098B0 00106810 7C 05 20 40 */ cmplw r5, r4 /* 801098B4 00106814 40 82 FF E0 */ bne lbl_80109894 /* 801098B8 00106818 38 60 00 01 */ li r3, 1 -/* 801098BC 0010681C 4E 80 00 20 */ blr +/* 801098BC 0010681C 4E 80 00 20 */ blr .global sub_801098c0 sub_801098c0: @@ -3441,7 +3441,7 @@ lbl_80109AC8: /* 80109AD4 00106A34 81 84 00 00 */ lwz r12, 0(r4) /* 80109AD8 00106A38 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80109ADC 00106A3C 7D 89 03 A6 */ mtctr r12 -/* 80109AE0 00106A40 4E 80 04 21 */ bctrl +/* 80109AE0 00106A40 4E 80 04 21 */ bctrl /* 80109AE4 00106A44 80 1C 00 EC */ lwz r0, 0xec(r28) /* 80109AE8 00106A48 80 BC 00 F0 */ lwz r5, 0xf0(r28) /* 80109AEC 00106A4C 7C 00 28 00 */ cmpw r0, r5 @@ -3483,7 +3483,7 @@ lbl_80109B44: /* 80109B6C 00106ACC 83 81 00 40 */ lwz r28, 0x40(r1) /* 80109B70 00106AD0 7C 08 03 A6 */ mtlr r0 /* 80109B74 00106AD4 38 21 00 50 */ addi r1, r1, 0x50 -/* 80109B78 00106AD8 4E 80 00 20 */ blr +/* 80109B78 00106AD8 4E 80 00 20 */ blr .global sub_80109b7c sub_80109b7c: @@ -3562,7 +3562,7 @@ lbl_80109C6C: /* 80109C70 00106BD0 80 01 00 34 */ lwz r0, 0x34(r1) /* 80109C74 00106BD4 7C 08 03 A6 */ mtlr r0 /* 80109C78 00106BD8 38 21 00 30 */ addi r1, r1, 0x30 -/* 80109C7C 00106BDC 4E 80 00 20 */ blr +/* 80109C7C 00106BDC 4E 80 00 20 */ blr .global __dt__17CInGameGuiManagerFv __dt__17CInGameGuiManagerFv: @@ -3772,7 +3772,7 @@ lbl_80109F2C: /* 80109F44 00106EA4 38 80 00 01 */ li r4, 1 /* 80109F48 00106EA8 81 8C 00 08 */ lwz r12, 8(r12) /* 80109F4C 00106EAC 7D 89 03 A6 */ mtctr r12 -/* 80109F50 00106EB0 4E 80 04 21 */ bctrl +/* 80109F50 00106EB0 4E 80 04 21 */ bctrl lbl_80109F54: /* 80109F54 00106EB4 34 1E 00 38 */ addic. r0, r30, 0x38 /* 80109F58 00106EB8 41 82 00 24 */ beq lbl_80109F7C @@ -3783,7 +3783,7 @@ lbl_80109F54: /* 80109F6C 00106ECC 38 80 00 01 */ li r4, 1 /* 80109F70 00106ED0 81 8C 00 08 */ lwz r12, 8(r12) /* 80109F74 00106ED4 7D 89 03 A6 */ mtctr r12 -/* 80109F78 00106ED8 4E 80 04 21 */ bctrl +/* 80109F78 00106ED8 4E 80 04 21 */ bctrl lbl_80109F7C: /* 80109F7C 00106EDC 34 1E 00 34 */ addic. r0, r30, 0x34 /* 80109F80 00106EE0 41 82 00 24 */ beq lbl_80109FA4 @@ -3794,7 +3794,7 @@ lbl_80109F7C: /* 80109F94 00106EF4 38 80 00 01 */ li r4, 1 /* 80109F98 00106EF8 81 8C 00 08 */ lwz r12, 8(r12) /* 80109F9C 00106EFC 7D 89 03 A6 */ mtctr r12 -/* 80109FA0 00106F00 4E 80 04 21 */ bctrl +/* 80109FA0 00106F00 4E 80 04 21 */ bctrl lbl_80109FA4: /* 80109FA4 00106F04 34 1E 00 30 */ addic. r0, r30, 0x30 /* 80109FA8 00106F08 41 82 00 10 */ beq lbl_80109FB8 @@ -3860,7 +3860,7 @@ lbl_8010A064: /* 8010A078 00106FD8 83 81 00 50 */ lwz r28, 0x50(r1) /* 8010A07C 00106FDC 7C 08 03 A6 */ mtlr r0 /* 8010A080 00106FE0 38 21 00 60 */ addi r1, r1, 0x60 -/* 8010A084 00106FE4 4E 80 00 20 */ blr +/* 8010A084 00106FE4 4E 80 00 20 */ blr .global __ct__17CInGameGuiManagerFRC13CStateManagerR18CArchitectureQueue __ct__17CInGameGuiManagerFRC13CStateManagerR18CArchitectureQueue: @@ -3878,7 +3878,7 @@ __ct__17CInGameGuiManagerFRC13CStateManagerR18CArchitectureQueue: /* 8010A0B4 00107014 81 84 00 00 */ lwz r12, 0(r4) /* 8010A0B8 00107018 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8010A0BC 0010701C 7D 89 03 A6 */ mtctr r12 -/* 8010A0C0 00107020 4E 80 04 21 */ bctrl +/* 8010A0C0 00107020 4E 80 04 21 */ bctrl /* 8010A0C4 00107024 7F C3 F3 78 */ mr r3, r30 /* 8010A0C8 00107028 38 81 00 18 */ addi r4, r1, 0x18 /* 8010A0CC 0010702C 48 23 6D DD */ bl __ct__6CTokenFRC6CToken @@ -3913,7 +3913,7 @@ __ct__17CInGameGuiManagerFRC13CStateManagerR18CArchitectureQueue: /* 8010A140 001070A0 81 84 00 00 */ lwz r12, 0(r4) /* 8010A144 001070A4 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8010A148 001070A8 7D 89 03 A6 */ mtctr r12 -/* 8010A14C 001070AC 4E 80 04 21 */ bctrl +/* 8010A14C 001070AC 4E 80 04 21 */ bctrl /* 8010A150 001070B0 3B 3E 00 50 */ addi r25, r30, 0x50 /* 8010A154 001070B4 38 81 00 10 */ addi r4, r1, 0x10 /* 8010A158 001070B8 7F 23 CB 78 */ mr r3, r25 @@ -4088,7 +4088,7 @@ lbl_8010A3D4: /* 8010A3E0 00107340 81 84 00 00 */ lwz r12, 0(r4) /* 8010A3E4 00107344 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8010A3E8 00107348 7D 89 03 A6 */ mtctr r12 -/* 8010A3EC 0010734C 4E 80 04 21 */ bctrl +/* 8010A3EC 0010734C 4E 80 04 21 */ bctrl /* 8010A3F0 00107350 38 61 00 20 */ addi r3, r1, 0x20 /* 8010A3F4 00107354 38 81 00 08 */ addi r4, r1, 8 /* 8010A3F8 00107358 48 23 6A B1 */ bl __ct__6CTokenFRC6CToken @@ -4132,7 +4132,7 @@ lbl_8010A454: /* 8010A484 001073E4 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 8010A488 001073E8 7C 08 03 A6 */ mtlr r0 /* 8010A48C 001073EC 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 8010A490 001073F0 4E 80 00 20 */ blr +/* 8010A490 001073F0 4E 80 00 20 */ blr .global LockPauseScreenDependencies__17CInGameGuiManagerFv LockPauseScreenDependencies__17CInGameGuiManagerFv: @@ -4154,7 +4154,7 @@ lbl_8010A4C0: /* 8010A4CC 0010742C 81 84 00 00 */ lwz r12, 0(r4) /* 8010A4D0 00107430 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8010A4D4 00107434 7D 89 03 A6 */ mtctr r12 -/* 8010A4D8 00107438 4E 80 04 21 */ bctrl +/* 8010A4D8 00107438 4E 80 04 21 */ bctrl /* 8010A4DC 0010743C 38 61 00 10 */ addi r3, r1, 0x10 /* 8010A4E0 00107440 38 81 00 08 */ addi r4, r1, 8 /* 8010A4E4 00107444 48 23 69 C5 */ bl __ct__6CTokenFRC6CToken @@ -4221,7 +4221,7 @@ lbl_8010A5A4: /* 8010A5BC 0010751C 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 8010A5C0 00107520 7C 08 03 A6 */ mtlr r0 /* 8010A5C4 00107524 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8010A5C8 00107528 4E 80 00 20 */ blr +/* 8010A5C8 00107528 4E 80 00 20 */ blr .global "sort,Q24rstl17rmemory_allocator>,24CTextureScoreGreaterThan>__4rstlFQ24rstl134pointer_iterator<20SDumpableTextureInfo,Q24rstl57vector<20SDumpableTextureInfo,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl134pointer_iterator<20SDumpableTextureInfo,Q24rstl57vector<20SDumpableTextureInfo,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>24CTextureScoreGreaterThan" "sort,Q24rstl17rmemory_allocator>,24CTextureScoreGreaterThan>__4rstlFQ24rstl134pointer_iterator<20SDumpableTextureInfo,Q24rstl57vector<20SDumpableTextureInfo,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl134pointer_iterator<20SDumpableTextureInfo,Q24rstl57vector<20SDumpableTextureInfo,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>24CTextureScoreGreaterThan": @@ -4377,7 +4377,7 @@ lbl_8010A7F8: /* 8010A7FC 0010775C 80 01 00 84 */ lwz r0, 0x84(r1) /* 8010A800 00107760 7C 08 03 A6 */ mtlr r0 /* 8010A804 00107764 38 21 00 80 */ addi r1, r1, 0x80 -/* 8010A808 00107768 4E 80 00 20 */ blr +/* 8010A808 00107768 4E 80 00 20 */ blr .global sub_8010a80c sub_8010a80c: @@ -4452,7 +4452,7 @@ lbl_8010A8F0: /* 8010A8F4 00107854 80 01 00 34 */ lwz r0, 0x34(r1) /* 8010A8F8 00107858 7C 08 03 A6 */ mtlr r0 /* 8010A8FC 0010785C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8010A900 00107860 4E 80 00 20 */ blr +/* 8010A900 00107860 4E 80 00 20 */ blr .global "reserve__Q24rstl57vector<20SDumpableTextureInfo,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl57vector<20SDumpableTextureInfo,Q24rstl17rmemory_allocator>Fi": @@ -4533,7 +4533,7 @@ lbl_8010AA00: /* 8010AA04 00107964 80 01 00 34 */ lwz r0, 0x34(r1) /* 8010AA08 00107968 7C 08 03 A6 */ mtlr r0 /* 8010AA0C 0010796C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8010AA10 00107970 4E 80 00 20 */ blr +/* 8010AA10 00107970 4E 80 00 20 */ blr .global sub_8010aa14 sub_8010aa14: @@ -4580,7 +4580,7 @@ lbl_8010AA8C: /* 8010AAA8 00107A08 80 01 00 24 */ lwz r0, 0x24(r1) /* 8010AAAC 00107A0C 7C 08 03 A6 */ mtlr r0 /* 8010AAB0 00107A10 38 21 00 20 */ addi r1, r1, 0x20 -/* 8010AAB4 00107A14 4E 80 00 20 */ blr +/* 8010AAB4 00107A14 4E 80 00 20 */ blr .global sub_8010aab8 sub_8010aab8: @@ -4628,7 +4628,7 @@ lbl_8010AB38: /* 8010AB4C 00107AAC 83 81 00 10 */ lwz r28, 0x10(r1) /* 8010AB50 00107AB0 7C 08 03 A6 */ mtlr r0 /* 8010AB54 00107AB4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8010AB58 00107AB8 4E 80 00 20 */ blr +/* 8010AB58 00107AB8 4E 80 00 20 */ blr .global "__sort3<20SDumpableTextureInfo,24CTextureScoreGreaterThan>__4rstlFR20SDumpableTextureInfoR20SDumpableTextureInfoR20SDumpableTextureInfo24CTextureScoreGreaterThan" "__sort3<20SDumpableTextureInfo,24CTextureScoreGreaterThan>__4rstlFR20SDumpableTextureInfoR20SDumpableTextureInfoR20SDumpableTextureInfo24CTextureScoreGreaterThan": @@ -4732,7 +4732,7 @@ lbl_8010ACC0: /* 8010ACD0 00107C30 83 81 00 30 */ lwz r28, 0x30(r1) /* 8010ACD4 00107C34 7C 08 03 A6 */ mtlr r0 /* 8010ACD8 00107C38 38 21 00 40 */ addi r1, r1, 0x40 -/* 8010ACDC 00107C3C 4E 80 00 20 */ blr +/* 8010ACDC 00107C3C 4E 80 00 20 */ blr .global "__insertion_sort,Q24rstl17rmemory_allocator>,24CTextureScoreGreaterThan>__4rstlFQ24rstl134pointer_iterator<20SDumpableTextureInfo,Q24rstl57vector<20SDumpableTextureInfo,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl134pointer_iterator<20SDumpableTextureInfo,Q24rstl57vector<20SDumpableTextureInfo,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>24CTextureScoreGreaterTha" "__insertion_sort,Q24rstl17rmemory_allocator>,24CTextureScoreGreaterThan>__4rstlFQ24rstl134pointer_iterator<20SDumpableTextureInfo,Q24rstl57vector<20SDumpableTextureInfo,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl134pointer_iterator<20SDumpableTextureInfo,Q24rstl57vector<20SDumpableTextureInfo,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>24CTextureScoreGreaterTha": diff --git a/asm/MetroidPrime/CInGameTweakManager.s b/asm/MetroidPrime/CInGameTweakManager.s index 28af8620..576d485c 100644 --- a/asm/MetroidPrime/CInGameTweakManager.s +++ b/asm/MetroidPrime/CInGameTweakManager.s @@ -352,7 +352,7 @@ lbl_8021C610: /* 8021C614 00219574 80 01 00 F4 */ lwz r0, 0xf4(r1) /* 8021C618 00219578 7C 08 03 A6 */ mtlr r0 /* 8021C61C 0021957C 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 8021C620 00219580 4E 80 00 20 */ blr +/* 8021C620 00219580 4E 80 00 20 */ blr .global sub_8021c624 sub_8021c624: @@ -566,7 +566,7 @@ lbl_8021C910: /* 8021C914 00219874 80 01 00 74 */ lwz r0, 0x74(r1) /* 8021C918 00219878 7C 08 03 A6 */ mtlr r0 /* 8021C91C 0021987C 38 21 00 70 */ addi r1, r1, 0x70 -/* 8021C920 00219880 4E 80 00 20 */ blr +/* 8021C920 00219880 4E 80 00 20 */ blr .global sub_8021c924 sub_8021c924: @@ -751,7 +751,7 @@ sub_8021cb38: /* 8021CB7C 00219ADC 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8021CB80 00219AE0 7C 08 03 A6 */ mtlr r0 /* 8021CB84 00219AE4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8021CB88 00219AE8 4E 80 00 20 */ blr +/* 8021CB88 00219AE8 4E 80 00 20 */ blr .global "GetIdentifierForMidiEvent__19CInGameTweakManagerFUiUiRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" "GetIdentifierForMidiEvent__19CInGameTweakManagerFUiUiRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>": @@ -778,7 +778,7 @@ sub_8021cb38: /* 8021CBDC 00219B3C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8021CBE0 00219B40 7C 08 03 A6 */ mtlr r0 /* 8021CBE4 00219B44 38 21 00 20 */ addi r1, r1, 0x20 -/* 8021CBE8 00219B48 4E 80 00 20 */ blr +/* 8021CBE8 00219B48 4E 80 00 20 */ blr .global sub_8021cbec sub_8021cbec: @@ -801,7 +801,7 @@ sub_8021cbec: /* 8021CC2C 00219B8C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8021CC30 00219B90 7C 08 03 A6 */ mtlr r0 /* 8021CC34 00219B94 38 21 00 20 */ addi r1, r1, 0x20 -/* 8021CC38 00219B98 4E 80 00 20 */ blr +/* 8021CC38 00219B98 4E 80 00 20 */ blr .global sub_8021cc3c sub_8021cc3c: @@ -818,7 +818,7 @@ lbl_8021CC54: /* 8021CC5C 00219BBC 40 82 FF F4 */ bne lbl_8021CC50 /* 8021CC60 00219BC0 7C 04 28 50 */ subf r0, r4, r5 /* 8021CC64 00219BC4 90 03 00 08 */ stw r0, 8(r3) -/* 8021CC68 00219BC8 4E 80 00 20 */ blr +/* 8021CC68 00219BC8 4E 80 00 20 */ blr .global sub_8021cc6c sub_8021cc6c: @@ -833,12 +833,12 @@ sub_8021cc6c: /* 8021CC8C 00219BEC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8021CC90 00219BF0 7C 08 03 A6 */ mtlr r0 /* 8021CC94 00219BF4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8021CC98 00219BF8 4E 80 00 20 */ blr +/* 8021CC98 00219BF8 4E 80 00 20 */ blr .global "ReadFromMemoryCard__19CInGameTweakManagerFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" "ReadFromMemoryCard__19CInGameTweakManagerFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>": /* 8021CC9C 00219BFC 38 60 00 00 */ li r3, 0 -/* 8021CCA0 00219C00 4E 80 00 20 */ blr +/* 8021CCA0 00219C00 4E 80 00 20 */ blr .global "GetTweakValue__19CInGameTweakManagerCFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" "GetTweakValue__19CInGameTweakManagerCFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>": @@ -894,7 +894,7 @@ lbl_8021CD48: /* 8021CD58 00219CB8 83 81 00 30 */ lwz r28, 0x30(r1) /* 8021CD5C 00219CBC 7C 08 03 A6 */ mtlr r0 /* 8021CD60 00219CC0 38 21 00 40 */ addi r1, r1, 0x40 -/* 8021CD64 00219CC4 4E 80 00 20 */ blr +/* 8021CD64 00219CC4 4E 80 00 20 */ blr .global sub_8021cd68 sub_8021cd68: @@ -907,7 +907,7 @@ sub_8021cd68: /* 8021CD80 00219CE0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8021CD84 00219CE4 7C 08 03 A6 */ mtlr r0 /* 8021CD88 00219CE8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8021CD8C 00219CEC 4E 80 00 20 */ blr +/* 8021CD8C 00219CEC 4E 80 00 20 */ blr .global sub_8021cd90 sub_8021cd90: @@ -1089,7 +1089,7 @@ lbl_8021CFE0: lbl_8021CFE4: /* 8021CFE4 00219F44 7D 03 43 78 */ mr r3, r8 /* 8021CFE8 00219F48 38 21 00 50 */ addi r1, r1, 0x50 -/* 8021CFEC 00219F4C 4E 80 00 20 */ blr +/* 8021CFEC 00219F4C 4E 80 00 20 */ blr .global "HasTweakValue__19CInGameTweakManagerCFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" "HasTweakValue__19CInGameTweakManagerCFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>": @@ -1145,7 +1145,7 @@ lbl_8021D094: /* 8021D0A4 0021A004 83 81 00 30 */ lwz r28, 0x30(r1) /* 8021D0A8 0021A008 7C 08 03 A6 */ mtlr r0 /* 8021D0AC 0021A00C 38 21 00 40 */ addi r1, r1, 0x40 -/* 8021D0B0 0021A010 4E 80 00 20 */ blr +/* 8021D0B0 0021A010 4E 80 00 20 */ blr .global __ct__19CInGameTweakManagerFv __ct__19CInGameTweakManagerFv: @@ -1153,7 +1153,7 @@ __ct__19CInGameTweakManagerFv: /* 8021D0B8 0021A018 90 03 00 04 */ stw r0, 4(r3) /* 8021D0BC 0021A01C 90 03 00 08 */ stw r0, 8(r3) /* 8021D0C0 0021A020 90 03 00 0C */ stw r0, 0xc(r3) -/* 8021D0C4 0021A024 4E 80 00 20 */ blr +/* 8021D0C4 0021A024 4E 80 00 20 */ blr .global "substr__Q24rstl66basic_string,Q24rstl17rmemory_allocator>CFii" "substr__Q24rstl66basic_string,Q24rstl17rmemory_allocator>CFii": @@ -1223,7 +1223,7 @@ lbl_8021D194: /* 8021D1B4 0021A114 83 C1 00 58 */ lwz r30, 0x58(r1) /* 8021D1B8 0021A118 7C 08 03 A6 */ mtlr r0 /* 8021D1BC 0021A11C 38 21 00 60 */ addi r1, r1, 0x60 -/* 8021D1C0 0021A120 4E 80 00 20 */ blr +/* 8021D1C0 0021A120 4E 80 00 20 */ blr .global "reserve__Q24rstl138vector,Q24rstl17rmemory_allocator>,10SObjectTag>,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl138vector,Q24rstl17rmemory_allocator>,10SObjectTag>,Q24rstl17rmemory_allocator>Fi": @@ -1303,7 +1303,7 @@ lbl_8021D2BC: /* 8021D2C0 0021A220 80 01 00 34 */ lwz r0, 0x34(r1) /* 8021D2C4 0021A224 7C 08 03 A6 */ mtlr r0 /* 8021D2C8 0021A228 38 21 00 30 */ addi r1, r1, 0x30 -/* 8021D2CC 0021A22C 4E 80 00 20 */ blr +/* 8021D2CC 0021A22C 4E 80 00 20 */ blr .global sub_8021d2d0 sub_8021d2d0: diff --git a/asm/MetroidPrime/CInputGenerator.s b/asm/MetroidPrime/CInputGenerator.s index 517ad74c..eba935fa 100644 --- a/asm/MetroidPrime/CInputGenerator.s +++ b/asm/MetroidPrime/CInputGenerator.s @@ -3,8 +3,11 @@ .section .rodata .global lbl_803CCAA0 lbl_803CCAA0: - .incbin "baserom.dol", 0x3C9AA0, 0x8 - + # ROM: 0x3C9AA0 + .asciz "??(??)" + .balign 4 + + .section .text, "ax" .global Update__15CInputGeneratorFfR18CArchitectureQueue @@ -33,13 +36,13 @@ lbl_80023018: /* 80023028 0001FF88 81 83 00 00 */ lwz r12, 0(r3) /* 8002302C 0001FF8C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80023030 0001FF90 7D 89 03 A6 */ mtctr r12 -/* 80023034 0001FF94 4E 80 04 21 */ bctrl +/* 80023034 0001FF94 4E 80 04 21 */ bctrl /* 80023038 0001FF98 7C 7D 1B 78 */ mr r29, r3 /* 8002303C 0001FF9C 80 7E 00 04 */ lwz r3, 4(r30) /* 80023040 0001FFA0 81 83 00 00 */ lwz r12, 0(r3) /* 80023044 0001FFA4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80023048 0001FFA8 7D 89 03 A6 */ mtctr r12 -/* 8002304C 0001FFAC 4E 80 04 21 */ bctrl +/* 8002304C 0001FFAC 4E 80 04 21 */ bctrl /* 80023050 0001FFB0 3B 61 00 38 */ addi r27, r1, 0x38 /* 80023054 0001FFB4 3B 41 00 68 */ addi r26, r1, 0x68 /* 80023058 0001FFB8 3B 21 00 2C */ addi r25, r1, 0x2c @@ -52,7 +55,7 @@ lbl_80023068: /* 80023070 0001FFD0 81 83 00 00 */ lwz r12, 0(r3) /* 80023074 0001FFD4 81 8C 00 14 */ lwz r12, 0x14(r12) /* 80023078 0001FFD8 7D 89 03 A6 */ mtctr r12 -/* 8002307C 0001FFDC 4E 80 04 21 */ bctrl +/* 8002307C 0001FFDC 4E 80 04 21 */ bctrl /* 80023080 0001FFE0 88 03 00 00 */ lbz r0, 0(r3) /* 80023084 0001FFE4 7C 73 1B 78 */ mr r19, r3 /* 80023088 0001FFE8 28 00 00 00 */ cmplwi r0, 0 @@ -346,7 +349,7 @@ lbl_80023498: /* 800234A4 00020404 80 01 01 54 */ lwz r0, 0x154(r1) /* 800234A8 00020408 7C 08 03 A6 */ mtlr r0 /* 800234AC 0002040C 38 21 01 50 */ addi r1, r1, 0x150 -/* 800234B0 00020410 4E 80 00 20 */ blr +/* 800234B0 00020410 4E 80 00 20 */ blr .global __ct__15CInputGeneratorFP10COsContextff __ct__15CInputGeneratorFP10COsContextff: @@ -377,4 +380,4 @@ __ct__15CInputGeneratorFP10COsContextff: /* 80023514 00020474 80 01 00 24 */ lwz r0, 0x24(r1) /* 80023518 00020478 7C 08 03 A6 */ mtlr r0 /* 8002351C 0002047C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80023520 00020480 4E 80 00 20 */ blr +/* 80023520 00020480 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/CInstruction.s b/asm/MetroidPrime/CInstruction.s index cdf40c0b..f62c6273 100644 --- a/asm/MetroidPrime/CInstruction.s +++ b/asm/MetroidPrime/CInstruction.s @@ -22,7 +22,7 @@ sub_8002940c: /* 80029448 000263A8 38 80 00 01 */ li r4, 1 /* 8002944C 000263AC 81 8C 00 08 */ lwz r12, 8(r12) /* 80029450 000263B0 7D 89 03 A6 */ mtctr r12 -/* 80029454 000263B4 4E 80 04 21 */ bctrl +/* 80029454 000263B4 4E 80 04 21 */ bctrl lbl_80029458: /* 80029458 000263B8 80 7F 00 00 */ lwz r3, 0(r31) /* 8002945C 000263BC 28 03 00 00 */ cmplwi r3, 0 @@ -33,17 +33,17 @@ lbl_80029468: /* 8002946C 000263CC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80029470 000263D0 7C 08 03 A6 */ mtlr r0 /* 80029474 000263D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80029478 000263D8 4E 80 00 20 */ blr +/* 80029478 000263D8 4E 80 00 20 */ blr .global PageInvoke__12CInstructionCFR16CFontRenderStateP17CTextRenderBuffer PageInvoke__12CInstructionCFR16CFontRenderStateP17CTextRenderBuffer: -/* 8002947C 000263DC 4E 80 00 20 */ blr +/* 8002947C 000263DC 4E 80 00 20 */ blr .global "GetAssets__12CInstructionCFRQ24rstl42vector<6CToken,Q24rstl17rmemory_allocator>" "GetAssets__12CInstructionCFRQ24rstl42vector<6CToken,Q24rstl17rmemory_allocator>": -/* 80029480 000263E0 4E 80 00 20 */ blr +/* 80029480 000263E0 4E 80 00 20 */ blr .global GetAssetCount__12CInstructionCFv GetAssetCount__12CInstructionCFv: /* 80029484 000263E4 38 60 00 00 */ li r3, 0 -/* 80029488 000263E8 4E 80 00 20 */ blr +/* 80029488 000263E8 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/CInventoryScreen.s b/asm/MetroidPrime/CInventoryScreen.s index a32ef0c2..1cac6bbd 100644 --- a/asm/MetroidPrime/CInventoryScreen.s +++ b/asm/MetroidPrime/CInventoryScreen.s @@ -113,7 +113,7 @@ lbl_805A7F48: .global IsRightLogDynamic__16CInventoryScreenCFv IsRightLogDynamic__16CInventoryScreenCFv: /* 80205D34 00202C94 38 60 00 01 */ li r3, 1 -/* 80205D38 00202C98 4E 80 00 20 */ blr +/* 80205D38 00202C98 4E 80 00 20 */ blr .global IsRightInventoryItemEquipped__16CInventoryScreenCFi IsRightInventoryItemEquipped__16CInventoryScreenCFi: @@ -132,7 +132,7 @@ IsRightInventoryItemEquipped__16CInventoryScreenCFi: /* 80205D6C 00202CCC 38 63 6F 04 */ addi r3, r3, lbl_803E6F04@l /* 80205D70 00202CD0 7C 03 00 2E */ lwzx r0, r3, r0 /* 80205D74 00202CD4 7C 09 03 A6 */ mtctr r0 -/* 80205D78 00202CD8 4E 80 04 20 */ bctr +/* 80205D78 00202CD8 4E 80 04 20 */ bctr .global lbl_80205D7C lbl_80205D7C: /* 80205D7C 00202CDC 80 1E 00 08 */ lwz r0, 8(r30) @@ -317,7 +317,7 @@ lbl_80205F78: /* 80205F80 00202EE0 83 C1 00 08 */ lwz r30, 8(r1) /* 80205F84 00202EE4 7C 08 03 A6 */ mtlr r0 /* 80205F88 00202EE8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80205F8C 00202EEC 4E 80 00 20 */ blr +/* 80205F8C 00202EEC 4E 80 00 20 */ blr .global HasRightInventoryItem__16CInventoryScreenCFi HasRightInventoryItem__16CInventoryScreenCFi: @@ -336,7 +336,7 @@ HasRightInventoryItem__16CInventoryScreenCFi: /* 80205FC0 00202F20 38 63 6F 64 */ addi r3, r3, lbl_803E6F64@l /* 80205FC4 00202F24 7C 03 00 2E */ lwzx r0, r3, r0 /* 80205FC8 00202F28 7C 09 03 A6 */ mtctr r0 -/* 80205FCC 00202F2C 4E 80 04 20 */ bctr +/* 80205FCC 00202F2C 4E 80 04 20 */ bctr .global lbl_80205FD0 lbl_80205FD0: /* 80205FD0 00202F30 38 60 00 01 */ li r3, 1 @@ -505,7 +505,7 @@ lbl_8020618C: /* 80206194 002030F4 83 C1 00 08 */ lwz r30, 8(r1) /* 80206198 002030F8 7C 08 03 A6 */ mtlr r0 /* 8020619C 002030FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802061A0 00203100 4E 80 00 20 */ blr +/* 802061A0 00203100 4E 80 00 20 */ blr .global HasLeftInventoryItem__16CInventoryScreenCFi HasLeftInventoryItem__16CInventoryScreenCFi: @@ -598,7 +598,7 @@ lbl_802062CC: /* 802062D4 00203234 83 C1 00 08 */ lwz r30, 8(r1) /* 802062D8 00203238 7C 08 03 A6 */ mtlr r0 /* 802062DC 0020323C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802062E0 00203240 4E 80 00 20 */ blr +/* 802062E0 00203240 4E 80 00 20 */ blr .global UpdateSamusDollPulses__16CInventoryScreenFv UpdateSamusDollPulses__16CInventoryScreenFv: @@ -668,11 +668,11 @@ lbl_80206390: /* 802063D0 00203330 80 01 00 24 */ lwz r0, 0x24(r1) /* 802063D4 00203334 7C 08 03 A6 */ mtlr r0 /* 802063D8 00203338 38 21 00 20 */ addi r1, r1, 0x20 -/* 802063DC 0020333C 4E 80 00 20 */ blr +/* 802063DC 0020333C 4E 80 00 20 */ blr .global nullsub_125 nullsub_125: -/* 802063E0 00203340 4E 80 00 20 */ blr +/* 802063E0 00203340 4E 80 00 20 */ blr .global InputDisabled__16CInventoryScreenCFv InputDisabled__16CInventoryScreenCFv: @@ -684,19 +684,19 @@ InputDisabled__16CInventoryScreenCFv: /* 802063F8 00203358 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 802063FC 0020335C 40 81 00 0C */ ble lbl_80206408 /* 80206400 00203360 38 60 00 01 */ li r3, 1 -/* 80206404 00203364 4E 80 00 20 */ blr +/* 80206404 00203364 4E 80 00 20 */ blr lbl_80206408: /* 80206408 00203368 80 03 01 A8 */ lwz r0, 0x1a8(r3) /* 8020640C 0020336C 20 00 00 01 */ subfic r0, r0, 1 /* 80206410 00203370 7C 00 00 34 */ cntlzw r0, r0 /* 80206414 00203374 54 03 D9 7E */ srwi r3, r0, 5 -/* 80206418 00203378 4E 80 00 20 */ blr +/* 80206418 00203378 4E 80 00 20 */ blr .global TransitioningAway__16CInventoryScreenFv TransitioningAway__16CInventoryScreenFv: /* 8020641C 0020337C 38 00 00 01 */ li r0, 1 /* 80206420 00203380 90 03 01 A8 */ stw r0, 0x1a8(r3) -/* 80206424 00203384 4E 80 00 20 */ blr +/* 80206424 00203384 4E 80 00 20 */ blr .global UpdateRightLogHighlight__16CInventoryScreenFbiRC6CColorRC6CColor UpdateRightLogHighlight__16CInventoryScreenFbiRC6CColorRC6CColor: @@ -792,7 +792,7 @@ lbl_80206560: /* 80206578 002034D8 80 01 00 54 */ lwz r0, 0x54(r1) /* 8020657C 002034DC 7C 08 03 A6 */ mtlr r0 /* 80206580 002034E0 38 21 00 50 */ addi r1, r1, 0x50 -/* 80206584 002034E4 4E 80 00 20 */ blr +/* 80206584 002034E4 4E 80 00 20 */ blr .global UpdateRightLogColors__16CInventoryScreenFbRC6CColor UpdateRightLogColors__16CInventoryScreenFbRC6CColor: @@ -874,7 +874,7 @@ lbl_8020667C: /* 802066A0 00203600 80 01 00 54 */ lwz r0, 0x54(r1) /* 802066A4 00203604 7C 08 03 A6 */ mtlr r0 /* 802066A8 00203608 38 21 00 50 */ addi r1, r1, 0x50 -/* 802066AC 0020360C 4E 80 00 20 */ blr +/* 802066AC 0020360C 4E 80 00 20 */ blr .global UpdateRightTable__16CInventoryScreenFv UpdateRightTable__16CInventoryScreenFv: @@ -928,7 +928,7 @@ lbl_802066FC: /* 80206768 002036C8 81 83 00 00 */ lwz r12, 0(r3) /* 8020676C 002036CC 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 80206770 002036D0 7D 89 03 A6 */ mtctr r12 -/* 80206774 002036D4 4E 80 04 21 */ bctrl +/* 80206774 002036D4 4E 80 04 21 */ bctrl /* 80206778 002036D8 88 03 00 B6 */ lbz r0, 0xb6(r3) /* 8020677C 002036DC 38 80 00 01 */ li r4, 1 /* 80206780 002036E0 50 80 26 F6 */ rlwimi r0, r4, 4, 0x1b, 0x1b @@ -952,7 +952,7 @@ lbl_80206798: /* 802067C4 00203724 81 83 00 00 */ lwz r12, 0(r3) /* 802067C8 00203728 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 802067CC 0020372C 7D 89 03 A6 */ mtctr r12 -/* 802067D0 00203730 4E 80 04 21 */ bctrl +/* 802067D0 00203730 4E 80 04 21 */ bctrl /* 802067D4 00203734 88 03 00 B6 */ lbz r0, 0xb6(r3) /* 802067D8 00203738 38 80 00 00 */ li r4, 0 /* 802067DC 0020373C 50 80 26 F6 */ rlwimi r0, r4, 4, 0x1b, 0x1b @@ -990,7 +990,7 @@ lbl_80206848: /* 80206850 002037B0 81 83 00 00 */ lwz r12, 0(r3) /* 80206854 002037B4 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 80206858 002037B8 7D 89 03 A6 */ mtctr r12 -/* 8020685C 002037BC 4E 80 04 21 */ bctrl +/* 8020685C 002037BC 4E 80 04 21 */ bctrl /* 80206860 002037C0 88 03 00 B6 */ lbz r0, 0xb6(r3) /* 80206864 002037C4 38 80 00 00 */ li r4, 0 /* 80206868 002037C8 50 80 26 F6 */ rlwimi r0, r4, 4, 0x1b, 0x1b @@ -1001,7 +1001,7 @@ lbl_80206848: /* 8020687C 002037DC 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 80206880 002037E0 38 84 FF FF */ addi r4, r4, -1 /* 80206884 002037E4 7D 89 03 A6 */ mtctr r12 -/* 80206888 002037E8 4E 80 04 21 */ bctrl +/* 80206888 002037E8 4E 80 04 21 */ bctrl /* 8020688C 002037EC 88 03 00 B6 */ lbz r0, 0xb6(r3) /* 80206890 002037F0 38 80 00 00 */ li r4, 0 /* 80206894 002037F4 50 80 26 F6 */ rlwimi r0, r4, 4, 0x1b, 0x1b @@ -1020,14 +1020,14 @@ lbl_80206848: /* 802068C8 00203828 81 9C 00 00 */ lwz r12, 0(r28) /* 802068CC 0020382C 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 802068D0 00203830 7D 89 03 A6 */ mtctr r12 -/* 802068D4 00203834 4E 80 04 21 */ bctrl +/* 802068D4 00203834 4E 80 04 21 */ bctrl /* 802068D8 00203838 E3 E1 00 78 */ psq_l f31, 120(r1), 0, qr0 /* 802068DC 0020383C CB E1 00 70 */ lfd f31, 0x70(r1) /* 802068E0 00203840 BB 01 00 50 */ lmw r24, 0x50(r1) /* 802068E4 00203844 80 01 00 84 */ lwz r0, 0x84(r1) /* 802068E8 00203848 7C 08 03 A6 */ mtlr r0 /* 802068EC 0020384C 38 21 00 80 */ addi r1, r1, 0x80 -/* 802068F0 00203850 4E 80 00 20 */ blr +/* 802068F0 00203850 4E 80 00 20 */ blr .global Update__16CInventoryScreenFfR9CRandom16R18CArchitectureQueue Update__16CInventoryScreenFfR9CRandom16R18CArchitectureQueue: @@ -1160,7 +1160,7 @@ lbl_80206AA8: /* 80206AC8 00203A28 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80206ACC 00203A2C 7C 08 03 A6 */ mtlr r0 /* 80206AD0 00203A30 38 21 00 60 */ addi r1, r1, 0x60 -/* 80206AD4 00203A34 4E 80 00 20 */ blr +/* 80206AD4 00203A34 4E 80 00 20 */ blr .global Touch__16CInventoryScreenFv Touch__16CInventoryScreenFv: @@ -1176,7 +1176,7 @@ Touch__16CInventoryScreenFv: /* 80206AFC 00203A5C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80206B00 00203A60 7C 08 03 A6 */ mtlr r0 /* 80206B04 00203A64 38 21 00 10 */ addi r1, r1, 0x10 -/* 80206B08 00203A68 4E 80 00 20 */ blr +/* 80206B08 00203A68 4E 80 00 20 */ blr .global Draw__16CInventoryScreenCFfff Draw__16CInventoryScreenCFfff: @@ -1206,7 +1206,7 @@ Draw__16CInventoryScreenCFfff: /* 80206B68 00203AC8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80206B6C 00203ACC 7C 08 03 A6 */ mtlr r0 /* 80206B70 00203AD0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80206B74 00203AD4 4E 80 00 20 */ blr +/* 80206B74 00203AD4 4E 80 00 20 */ blr .global GetRightTableCount__16CInventoryScreenCFv GetRightTableCount__16CInventoryScreenCFv: @@ -1216,7 +1216,7 @@ GetRightTableCount__16CInventoryScreenCFv: /* 80206B84 00203AE4 80 04 00 C4 */ lwz r0, 0xc4(r4) /* 80206B88 00203AE8 54 00 18 38 */ slwi r0, r0, 3 /* 80206B8C 00203AEC 7C 63 00 2E */ lwzx r3, r3, r0 -/* 80206B90 00203AF0 4E 80 00 20 */ blr +/* 80206B90 00203AF0 4E 80 00 20 */ blr .global ShouldRightTableAdvance__16CInventoryScreenFv ShouldRightTableAdvance__16CInventoryScreenFv: @@ -1228,7 +1228,7 @@ ShouldRightTableAdvance__16CInventoryScreenFv: /* 80206BA8 00203B08 FC 01 00 00 */ fcmpu cr0, f1, f0 /* 80206BAC 00203B0C 7C 00 00 26 */ mfcr r0 /* 80206BB0 00203B10 54 03 1F FE */ rlwinm r3, r0, 3, 0x1f, 0x1f -/* 80206BB4 00203B14 4E 80 00 20 */ blr +/* 80206BB4 00203B14 4E 80 00 20 */ blr .global ShouldLeftTableAdvance__16CInventoryScreenFv ShouldLeftTableAdvance__16CInventoryScreenFv: @@ -1240,7 +1240,7 @@ ShouldLeftTableAdvance__16CInventoryScreenFv: /* 80206BCC 00203B2C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80206BD0 00203B30 7C 08 03 A6 */ mtlr r0 /* 80206BD4 00203B34 38 21 00 10 */ addi r1, r1, 0x10 -/* 80206BD8 00203B38 4E 80 00 20 */ blr +/* 80206BD8 00203B38 4E 80 00 20 */ blr .global VActivate__16CInventoryScreenFv VActivate__16CInventoryScreenFv: @@ -1291,7 +1291,7 @@ lbl_80206C58: /* 80206C84 00203BE4 81 83 00 00 */ lwz r12, 0(r3) /* 80206C88 00203BE8 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 80206C8C 00203BEC 7D 89 03 A6 */ mtctr r12 -/* 80206C90 00203BF0 4E 80 04 21 */ bctrl +/* 80206C90 00203BF0 4E 80 04 21 */ bctrl /* 80206C94 00203BF4 88 03 00 B6 */ lbz r0, 0xb6(r3) /* 80206C98 00203BF8 38 80 00 00 */ li r4, 0 /* 80206C9C 00203BFC 50 80 26 F6 */ rlwimi r0, r4, 4, 0x1b, 0x1b @@ -1329,7 +1329,7 @@ lbl_80206D0C: /* 80206D14 00203C74 81 83 00 00 */ lwz r12, 0(r3) /* 80206D18 00203C78 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 80206D1C 00203C7C 7D 89 03 A6 */ mtctr r12 -/* 80206D20 00203C80 4E 80 04 21 */ bctrl +/* 80206D20 00203C80 4E 80 04 21 */ bctrl /* 80206D24 00203C84 88 03 00 B6 */ lbz r0, 0xb6(r3) /* 80206D28 00203C88 53 E0 26 F6 */ rlwimi r0, r31, 4, 0x1b, 0x1b /* 80206D2C 00203C8C 3B BD 00 01 */ addi r29, r29, 1 @@ -1344,12 +1344,12 @@ lbl_80206D34: /* 80206D4C 00203CAC 83 81 00 40 */ lwz r28, 0x40(r1) /* 80206D50 00203CB0 7C 08 03 A6 */ mtlr r0 /* 80206D54 00203CB4 38 21 00 50 */ addi r1, r1, 0x50 -/* 80206D58 00203CB8 4E 80 00 20 */ blr +/* 80206D58 00203CB8 4E 80 00 20 */ blr .global VReady__16CInventoryScreenCFv VReady__16CInventoryScreenCFv: /* 80206D5C 00203CBC 38 60 00 01 */ li r3, 1 -/* 80206D60 00203CC0 4E 80 00 20 */ blr +/* 80206D60 00203CC0 4E 80 00 20 */ blr .global UpdateTextBody__16CInventoryScreenFv UpdateTextBody__16CInventoryScreenFv: @@ -1458,7 +1458,7 @@ lbl_80206EB4: /* 80206EE8 00203E48 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80206EEC 00203E4C 7C 08 03 A6 */ mtlr r0 /* 80206EF0 00203E50 38 21 00 30 */ addi r1, r1, 0x30 -/* 80206EF4 00203E54 4E 80 00 20 */ blr +/* 80206EF4 00203E54 4E 80 00 20 */ blr .global ChangedMode__16CInventoryScreenQ216CPauseScreenBase5EMode ChangedMode__16CInventoryScreenQ216CPauseScreenBase5EMode: @@ -1475,7 +1475,7 @@ lbl_80206F1C: /* 80206F1C 00203E7C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80206F20 00203E80 7C 08 03 A6 */ mtlr r0 /* 80206F24 00203E84 38 21 00 10 */ addi r1, r1, 0x10 -/* 80206F28 00203E88 4E 80 00 20 */ blr +/* 80206F28 00203E88 4E 80 00 20 */ blr .global ProcessInput__16CInventoryScreenFRC11CFinalInput ProcessInput__16CInventoryScreenFRC11CFinalInput: @@ -1822,7 +1822,7 @@ lbl_802073C4: /* 80207418 00204378 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 8020741C 0020437C 7C 08 03 A6 */ mtlr r0 /* 80207420 00204380 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 80207424 00204384 4E 80 00 20 */ blr +/* 80207424 00204384 4E 80 00 20 */ blr .global GetCameraYBias__16CInventoryScreenCFv GetCameraYBias__16CInventoryScreenCFv: @@ -1830,7 +1830,7 @@ GetCameraYBias__16CInventoryScreenCFv: /* 8020742C 0020438C C0 03 00 C4 */ lfs f0, 0xc4(r3) /* 80207430 00204390 FC 00 02 10 */ fabs f0, f0 /* 80207434 00204394 FC 20 00 18 */ frsp f1, f0 -/* 80207438 00204398 4E 80 00 20 */ blr +/* 80207438 00204398 4E 80 00 20 */ blr .global __dt__16CInventoryScreenFv __dt__16CInventoryScreenFv: @@ -1892,7 +1892,7 @@ lbl_80207504: /* 8020750C 0020446C 80 01 00 34 */ lwz r0, 0x34(r1) /* 80207510 00204470 7C 08 03 A6 */ mtlr r0 /* 80207514 00204474 38 21 00 30 */ addi r1, r1, 0x30 -/* 80207518 00204478 4E 80 00 20 */ blr +/* 80207518 00204478 4E 80 00 20 */ blr .global __ct__16CInventoryScreenFRC13CStateManagerRC9CGuiFrameRC12CStringTableRC16CDependencyGroupRC16CDependencyGroup __ct__16CInventoryScreenFRC13CStateManagerRC9CGuiFrameRC12CStringTableRC16CDependencyGroupRC16CDependencyGroup: diff --git a/asm/MetroidPrime/CLightParameters.s b/asm/MetroidPrime/CLightParameters.s index c15e6ec7..38b2e680 100644 --- a/asm/MetroidPrime/CLightParameters.s +++ b/asm/MetroidPrime/CLightParameters.s @@ -115,7 +115,7 @@ lbl_80106598: /* 801065A4 00103504 83 A1 00 34 */ lwz r29, 0x34(r1) /* 801065A8 00103508 7C 08 03 A6 */ mtlr r0 /* 801065AC 0010350C 38 21 00 40 */ addi r1, r1, 0x40 -/* 801065B0 00103510 4E 80 00 20 */ blr +/* 801065B0 00103510 4E 80 00 20 */ blr .global GetFramesBetweenRecalculation__16CLightParametersF26ELightRecalculationOptions GetFramesBetweenRecalculation__16CLightParametersF26ELightRecalculationOptions: @@ -133,19 +133,19 @@ lbl_801065D0: lbl_801065DC: /* 801065DC 0010353C 3C 60 40 00 */ lis r3, 0x3FFFFFFF@ha /* 801065E0 00103540 38 63 FF FF */ addi r3, r3, 0x3FFFFFFF@l -/* 801065E4 00103544 4E 80 00 20 */ blr +/* 801065E4 00103544 4E 80 00 20 */ blr lbl_801065E8: /* 801065E8 00103548 38 60 00 08 */ li r3, 8 -/* 801065EC 0010354C 4E 80 00 20 */ blr +/* 801065EC 0010354C 4E 80 00 20 */ blr lbl_801065F0: /* 801065F0 00103550 38 60 00 04 */ li r3, 4 -/* 801065F4 00103554 4E 80 00 20 */ blr +/* 801065F4 00103554 4E 80 00 20 */ blr lbl_801065F8: /* 801065F8 00103558 38 60 00 01 */ li r3, 1 -/* 801065FC 0010355C 4E 80 00 20 */ blr +/* 801065FC 0010355C 4E 80 00 20 */ blr lbl_80106600: /* 80106600 00103560 38 60 00 08 */ li r3, 8 -/* 80106604 00103564 4E 80 00 20 */ blr +/* 80106604 00103564 4E 80 00 20 */ blr .global __dt__16CActorParametersFv __dt__16CActorParametersFv: @@ -167,7 +167,7 @@ lbl_80106638: /* 80106640 001035A0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80106644 001035A4 7C 08 03 A6 */ mtlr r0 /* 80106648 001035A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8010664C 001035AC 4E 80 00 20 */ blr +/* 8010664C 001035AC 4E 80 00 20 */ blr .global __ct__16CLightParametersFv __ct__16CLightParametersFv: @@ -212,7 +212,7 @@ __ct__16CLightParametersFv: /* 801066E8 00103648 80 01 00 14 */ lwz r0, 0x14(r1) /* 801066EC 0010364C 7C 08 03 A6 */ mtlr r0 /* 801066F0 00103650 38 21 00 10 */ addi r1, r1, 0x10 -/* 801066F4 00103654 4E 80 00 20 */ blr +/* 801066F4 00103654 4E 80 00 20 */ blr .global __ct__16CLightParametersFbfQ216CLightParameters19EShadowTessellationffRC6CColorbQ216CLightParameters21EWorldLightingOptionsQ216CLightParameters26ELightRecalculationOptionsRC9CVector3fii __ct__16CLightParametersFbfQ216CLightParameters19EShadowTessellationffRC6CColorbQ216CLightParameters21EWorldLightingOptionsQ216CLightParameters26ELightRecalculationOptionsRC9CVector3fii: diff --git a/asm/MetroidPrime/CLogBookScreen.s b/asm/MetroidPrime/CLogBookScreen.s index a5cf433e..c10bebbf 100644 --- a/asm/MetroidPrime/CLogBookScreen.s +++ b/asm/MetroidPrime/CLogBookScreen.s @@ -108,7 +108,7 @@ lbl_80245A80: /* 80245A84 002429E4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80245A88 002429E8 7C 08 03 A6 */ mtlr r0 /* 80245A8C 002429EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80245A90 002429F0 4E 80 00 20 */ blr +/* 80245A90 002429F0 4E 80 00 20 */ blr .global IsScanCategoryReady__14CLogBookScreenF13EScanCategory IsScanCategoryReady__14CLogBookScreenF13EScanCategory: @@ -155,7 +155,7 @@ lbl_80245B14: /* 80245B24 00242A84 83 81 00 10 */ lwz r28, 0x10(r1) /* 80245B28 00242A88 7C 08 03 A6 */ mtlr r0 /* 80245B2C 00242A8C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80245B30 00242A90 4E 80 00 20 */ blr +/* 80245B30 00242A90 4E 80 00 20 */ blr .global InputDisabled__14CLogBookScreenCFv InputDisabled__14CLogBookScreenCFv: @@ -163,13 +163,13 @@ InputDisabled__14CLogBookScreenCFv: /* 80245B38 00242A98 20 00 00 01 */ subfic r0, r0, 1 /* 80245B3C 00242A9C 7C 00 00 34 */ cntlzw r0, r0 /* 80245B40 00242AA0 54 03 D9 7E */ srwi r3, r0, 5 -/* 80245B44 00242AA4 4E 80 00 20 */ blr +/* 80245B44 00242AA4 4E 80 00 20 */ blr .global TransitioningAway__14CLogBookScreenFv TransitioningAway__14CLogBookScreenFv: /* 80245B48 00242AA8 38 00 00 01 */ li r0, 1 /* 80245B4C 00242AAC 90 03 02 5C */ stw r0, 0x25c(r3) -/* 80245B50 00242AB0 4E 80 00 20 */ blr +/* 80245B50 00242AB0 4E 80 00 20 */ blr .global UpdateRightTitles__14CLogBookScreenFv UpdateRightTitles__14CLogBookScreenFv: @@ -334,7 +334,7 @@ lbl_80245D90: /* 80245DA8 00242D08 80 01 01 04 */ lwz r0, 0x104(r1) /* 80245DAC 00242D0C 7C 08 03 A6 */ mtlr r0 /* 80245DB0 00242D10 38 21 01 00 */ addi r1, r1, 0x100 -/* 80245DB4 00242D14 4E 80 00 20 */ blr +/* 80245DB4 00242D14 4E 80 00 20 */ blr .global UpdateBodyText__14CLogBookScreenFv UpdateBodyText__14CLogBookScreenFv: @@ -478,7 +478,7 @@ lbl_80245FB4: /* 80245FC0 00242F20 83 A1 00 54 */ lwz r29, 0x54(r1) /* 80245FC4 00242F24 7C 08 03 A6 */ mtlr r0 /* 80245FC8 00242F28 38 21 00 60 */ addi r1, r1, 0x60 -/* 80245FCC 00242F2C 4E 80 00 20 */ blr +/* 80245FCC 00242F2C 4E 80 00 20 */ blr .global sub_80245fd0 sub_80245fd0: @@ -505,7 +505,7 @@ sub_80245fd0: /* 80246020 00242F80 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80246024 00242F84 7C 08 03 A6 */ mtlr r0 /* 80246028 00242F88 38 21 00 20 */ addi r1, r1, 0x20 -/* 8024602C 00242F8C 4E 80 00 20 */ blr +/* 8024602C 00242F8C 4E 80 00 20 */ blr .global UpdateBodyImagesAndText__14CLogBookScreenFv UpdateBodyImagesAndText__14CLogBookScreenFv: @@ -599,7 +599,7 @@ lbl_80246144: /* 80246178 002430D8 80 01 00 54 */ lwz r0, 0x54(r1) /* 8024617C 002430DC 7C 08 03 A6 */ mtlr r0 /* 80246180 002430E0 38 21 00 50 */ addi r1, r1, 0x50 -/* 80246184 002430E4 4E 80 00 20 */ blr +/* 80246184 002430E4 4E 80 00 20 */ blr .global NextSurroundingArticleIndex__14CLogBookScreenFi NextSurroundingArticleIndex__14CLogBookScreenFi: @@ -612,9 +612,9 @@ NextSurroundingArticleIndex__14CLogBookScreenFi: /* 802461A0 00243100 38 64 FF FF */ addi r3, r4, -1 /* 802461A4 00243104 7C A6 2A 14 */ add r5, r6, r5 /* 802461A8 00243108 7C 05 00 00 */ cmpw r5, r0 -/* 802461AC 0024310C 4C 80 00 20 */ bgelr +/* 802461AC 0024310C 4C 80 00 20 */ bgelr /* 802461B0 00243110 7C A3 2B 78 */ mr r3, r5 -/* 802461B4 00243114 4E 80 00 20 */ blr +/* 802461B4 00243114 4E 80 00 20 */ blr lbl_802461B8: /* 802461B8 00243118 38 06 00 06 */ addi r0, r6, 6 /* 802461BC 0024311C 7C 04 00 00 */ cmpw r4, r0 @@ -622,27 +622,27 @@ lbl_802461B8: /* 802461C4 00243124 80 03 01 F4 */ lwz r0, 0x1f4(r3) /* 802461C8 00243128 38 64 00 01 */ addi r3, r4, 1 /* 802461CC 0024312C 7C 03 00 00 */ cmpw r3, r0 -/* 802461D0 00243130 4D 80 00 20 */ bltlr +/* 802461D0 00243130 4D 80 00 20 */ bltlr /* 802461D4 00243134 2C 06 00 00 */ cmpwi r6, 0 /* 802461D8 00243138 38 60 FF FF */ li r3, -1 -/* 802461DC 0024313C 4D 82 00 20 */ beqlr +/* 802461DC 0024313C 4D 82 00 20 */ beqlr /* 802461E0 00243140 38 66 FF FF */ addi r3, r6, -1 -/* 802461E4 00243144 4E 80 00 20 */ blr +/* 802461E4 00243144 4E 80 00 20 */ blr lbl_802461E8: /* 802461E8 00243148 38 06 00 05 */ addi r0, r6, 5 /* 802461EC 0024314C 7C 00 20 50 */ subf r0, r0, r4 /* 802461F0 00243150 7C 00 30 51 */ subf. r0, r0, r6 /* 802461F4 00243154 41 80 00 0C */ blt lbl_80246200 /* 802461F8 00243158 7C 03 03 78 */ mr r3, r0 -/* 802461FC 0024315C 4E 80 00 20 */ blr +/* 802461FC 0024315C 4E 80 00 20 */ blr lbl_80246200: /* 80246200 00243160 80 A3 01 F4 */ lwz r5, 0x1f4(r3) /* 80246204 00243164 38 60 FF FF */ li r3, -1 /* 80246208 00243168 38 05 FF FF */ addi r0, r5, -1 /* 8024620C 0024316C 7C 04 00 00 */ cmpw r4, r0 -/* 80246210 00243170 4C 80 00 20 */ bgelr +/* 80246210 00243170 4C 80 00 20 */ bgelr /* 80246214 00243174 38 64 00 01 */ addi r3, r4, 1 -/* 80246218 00243178 4E 80 00 20 */ blr +/* 80246218 00243178 4E 80 00 20 */ blr .global PumpArticleLoad__14CLogBookScreenFv PumpArticleLoad__14CLogBookScreenFv: @@ -718,7 +718,7 @@ lbl_802462F4: /* 80246318 00243278 81 84 00 00 */ lwz r12, 0(r4) /* 8024631C 0024327C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80246320 00243280 7D 89 03 A6 */ mtctr r12 -/* 80246324 00243284 4E 80 04 21 */ bctrl +/* 80246324 00243284 4E 80 04 21 */ bctrl /* 80246328 00243288 38 61 00 34 */ addi r3, r1, 0x34 /* 8024632C 0024328C 38 81 00 18 */ addi r4, r1, 0x18 /* 80246330 00243290 48 0F AB 79 */ bl __ct__6CTokenFRC6CToken @@ -829,7 +829,7 @@ lbl_80246474: /* 802464A8 00243408 81 84 00 00 */ lwz r12, 0(r4) /* 802464AC 0024340C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802464B0 00243410 7D 89 03 A6 */ mtctr r12 -/* 802464B4 00243414 4E 80 04 21 */ bctrl +/* 802464B4 00243414 4E 80 04 21 */ bctrl /* 802464B8 00243418 38 61 00 28 */ addi r3, r1, 0x28 /* 802464BC 0024341C 38 81 00 08 */ addi r4, r1, 8 /* 802464C0 00243420 48 0F A9 E9 */ bl __ct__6CTokenFRC6CToken @@ -983,7 +983,7 @@ lbl_802466B0: /* 802466C0 00243620 80 01 00 64 */ lwz r0, 0x64(r1) /* 802466C4 00243624 7C 08 03 A6 */ mtlr r0 /* 802466C8 00243628 38 21 00 60 */ addi r1, r1, 0x60 -/* 802466CC 0024362C 4E 80 00 20 */ blr +/* 802466CC 0024362C 4E 80 00 20 */ blr .global InitializeLogBook__14CLogBookScreenFv InitializeLogBook__14CLogBookScreenFv: @@ -1107,7 +1107,7 @@ lbl_80246860: /* 8024687C 002437DC 81 84 00 00 */ lwz r12, 0(r4) /* 80246880 002437E0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80246884 002437E4 7D 89 03 A6 */ mtctr r12 -/* 80246888 002437E8 4E 80 04 21 */ bctrl +/* 80246888 002437E8 4E 80 04 21 */ bctrl /* 8024688C 002437EC 38 61 00 40 */ addi r3, r1, 0x40 /* 80246890 002437F0 38 81 00 20 */ addi r4, r1, 0x20 /* 80246894 002437F4 48 0F A6 15 */ bl __ct__6CTokenFRC6CToken @@ -1225,7 +1225,7 @@ lbl_80246A20: /* 80246A30 00243990 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 80246A34 00243994 7C 08 03 A6 */ mtlr r0 /* 80246A38 00243998 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 80246A3C 0024399C 4E 80 00 20 */ blr +/* 80246A3C 0024399C 4E 80 00 20 */ blr .global RightTableSelectionChanged__14CLogBookScreenFii RightTableSelectionChanged__14CLogBookScreenFii: @@ -1236,12 +1236,12 @@ RightTableSelectionChanged__14CLogBookScreenFii: /* 80246A50 002439B0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80246A54 002439B4 7C 08 03 A6 */ mtlr r0 /* 80246A58 002439B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80246A5C 002439BC 4E 80 00 20 */ blr +/* 80246A5C 002439BC 4E 80 00 20 */ blr .global GetRightTableCount__14CLogBookScreenCFv GetRightTableCount__14CLogBookScreenCFv: /* 80246A60 002439C0 80 63 01 F4 */ lwz r3, 0x1f4(r3) -/* 80246A64 002439C4 4E 80 00 20 */ blr +/* 80246A64 002439C4 4E 80 00 20 */ blr .global ShouldRightTableAdvance__14CLogBookScreenFv ShouldRightTableAdvance__14CLogBookScreenFv: @@ -1340,7 +1340,7 @@ lbl_80246BA4: /* 80246BAC 00243B0C 83 C1 00 08 */ lwz r30, 8(r1) /* 80246BB0 00243B10 7C 08 03 A6 */ mtlr r0 /* 80246BB4 00243B14 38 21 00 10 */ addi r1, r1, 0x10 -/* 80246BB8 00243B18 4E 80 00 20 */ blr +/* 80246BB8 00243B18 4E 80 00 20 */ blr .global ShouldLeftTableAdvance__14CLogBookScreenFv ShouldLeftTableAdvance__14CLogBookScreenFv: @@ -1365,7 +1365,7 @@ lbl_80246BF8: /* 80246BF8 00243B58 80 01 00 14 */ lwz r0, 0x14(r1) /* 80246BFC 00243B5C 7C 08 03 A6 */ mtlr r0 /* 80246C00 00243B60 38 21 00 10 */ addi r1, r1, 0x10 -/* 80246C04 00243B64 4E 80 00 20 */ blr +/* 80246C04 00243B64 4E 80 00 20 */ blr .global UpdateRightTable__14CLogBookScreenFv UpdateRightTable__14CLogBookScreenFv: @@ -1409,7 +1409,7 @@ lbl_80246C80: /* 80246C98 00243BF8 81 84 00 00 */ lwz r12, 0(r4) /* 80246C9C 00243BFC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80246CA0 00243C00 7D 89 03 A6 */ mtctr r12 -/* 80246CA4 00243C04 4E 80 04 21 */ bctrl +/* 80246CA4 00243C04 4E 80 04 21 */ bctrl /* 80246CA8 00243C08 38 61 00 38 */ addi r3, r1, 0x38 /* 80246CAC 00243C0C 38 81 00 08 */ addi r4, r1, 8 /* 80246CB0 00243C10 48 0F A1 F9 */ bl __ct__6CTokenFRC6CToken @@ -1524,7 +1524,7 @@ lbl_80246E18: /* 80246E44 00243DA4 80 01 00 84 */ lwz r0, 0x84(r1) /* 80246E48 00243DA8 7C 08 03 A6 */ mtlr r0 /* 80246E4C 00243DAC 38 21 00 80 */ addi r1, r1, 0x80 -/* 80246E50 00243DB0 4E 80 00 20 */ blr +/* 80246E50 00243DB0 4E 80 00 20 */ blr .global sub_80246e54 sub_80246e54: @@ -1597,7 +1597,7 @@ lbl_80246F38: /* 80246F3C 00243E9C 80 01 00 34 */ lwz r0, 0x34(r1) /* 80246F40 00243EA0 7C 08 03 A6 */ mtlr r0 /* 80246F44 00243EA4 38 21 00 30 */ addi r1, r1, 0x30 -/* 80246F48 00243EA8 4E 80 00 20 */ blr +/* 80246F48 00243EA8 4E 80 00 20 */ blr .global sub_80246f4c sub_80246f4c: @@ -1624,7 +1624,7 @@ sub_80246f4c: /* 80246F9C 00243EFC 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80246FA0 00243F00 7C 08 03 A6 */ mtlr r0 /* 80246FA4 00243F04 38 21 00 20 */ addi r1, r1, 0x20 -/* 80246FA8 00243F08 4E 80 00 20 */ blr +/* 80246FA8 00243F08 4E 80 00 20 */ blr .global sub_80246fac sub_80246fac: @@ -1671,7 +1671,7 @@ lbl_80247024: /* 80247038 00243F98 83 C1 00 08 */ lwz r30, 8(r1) /* 8024703C 00243F9C 7C 08 03 A6 */ mtlr r0 /* 80247040 00243FA0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80247044 00243FA4 4E 80 00 20 */ blr +/* 80247044 00243FA4 4E 80 00 20 */ blr .global sub_80247048 sub_80247048: @@ -1711,7 +1711,7 @@ lbl_802470B8: /* 802470C4 00244024 83 C1 00 18 */ lwz r30, 0x18(r1) /* 802470C8 00244028 7C 08 03 A6 */ mtlr r0 /* 802470CC 0024402C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802470D0 00244030 4E 80 00 20 */ blr +/* 802470D0 00244030 4E 80 00 20 */ blr .global ChangedMode__14CLogBookScreenQ216CPauseScreenBase5EMode ChangedMode__14CLogBookScreenQ216CPauseScreenBase5EMode: @@ -1760,7 +1760,7 @@ lbl_80247170: /* 80247174 002440D4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80247178 002440D8 7C 08 03 A6 */ mtlr r0 /* 8024717C 002440DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80247180 002440E0 4E 80 00 20 */ blr +/* 80247180 002440E0 4E 80 00 20 */ blr .global VActivate__14CLogBookScreenFv VActivate__14CLogBookScreenFv: @@ -1813,7 +1813,7 @@ lbl_80247200: /* 80247234 00244194 81 83 00 00 */ lwz r12, 0(r3) /* 80247238 00244198 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 8024723C 0024419C 7D 89 03 A6 */ mtctr r12 -/* 80247240 002441A0 4E 80 04 21 */ bctrl +/* 80247240 002441A0 4E 80 04 21 */ bctrl /* 80247244 002441A4 88 03 00 B6 */ lbz r0, 0xb6(r3) /* 80247248 002441A8 38 80 00 00 */ li r4, 0 /* 8024724C 002441AC 50 80 26 F6 */ rlwimi r0, r4, 4, 0x1b, 0x1b @@ -1847,7 +1847,7 @@ lbl_802472AC: /* 802472B4 00244214 81 83 00 00 */ lwz r12, 0(r3) /* 802472B8 00244218 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 802472BC 0024421C 7D 89 03 A6 */ mtctr r12 -/* 802472C0 00244220 4E 80 04 21 */ bctrl +/* 802472C0 00244220 4E 80 04 21 */ bctrl /* 802472C4 00244224 88 03 00 B6 */ lbz r0, 0xb6(r3) /* 802472C8 00244228 53 E0 26 F6 */ rlwimi r0, r31, 4, 0x1b, 0x1b /* 802472CC 0024422C 3B BD 00 01 */ addi r29, r29, 1 @@ -1862,12 +1862,12 @@ lbl_802472D4: /* 802472EC 0024424C 83 81 00 40 */ lwz r28, 0x40(r1) /* 802472F0 00244250 7C 08 03 A6 */ mtlr r0 /* 802472F4 00244254 38 21 00 50 */ addi r1, r1, 0x50 -/* 802472F8 00244258 4E 80 00 20 */ blr +/* 802472F8 00244258 4E 80 00 20 */ blr .global VReady__14CLogBookScreenCFv VReady__14CLogBookScreenCFv: /* 802472FC 0024425C 38 60 00 01 */ li r3, 1 -/* 80247300 00244260 4E 80 00 20 */ blr +/* 80247300 00244260 4E 80 00 20 */ blr .global ProcessInput__14CLogBookScreenFRC11CFinalInput ProcessInput__14CLogBookScreenFRC11CFinalInput: @@ -2061,7 +2061,7 @@ lbl_80247598: /* 8024759C 002444FC 80 01 00 34 */ lwz r0, 0x34(r1) /* 802475A0 00244500 7C 08 03 A6 */ mtlr r0 /* 802475A4 00244504 38 21 00 30 */ addi r1, r1, 0x30 -/* 802475A8 00244508 4E 80 00 20 */ blr +/* 802475A8 00244508 4E 80 00 20 */ blr .global Draw__14CLogBookScreenCFfff Draw__14CLogBookScreenCFfff: @@ -2103,7 +2103,7 @@ lbl_802475F8: /* 80247634 00244594 83 C1 00 08 */ lwz r30, 8(r1) /* 80247638 00244598 7C 08 03 A6 */ mtlr r0 /* 8024763C 0024459C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80247640 002445A0 4E 80 00 20 */ blr +/* 80247640 002445A0 4E 80 00 20 */ blr .global GetSelectedArtifactHeadScanIndex__14CLogBookScreenFv GetSelectedArtifactHeadScanIndex__14CLogBookScreenFv: @@ -2129,7 +2129,7 @@ lbl_80247688: /* 80247688 002445E8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8024768C 002445EC 7C 08 03 A6 */ mtlr r0 /* 80247690 002445F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80247694 002445F4 4E 80 00 20 */ blr +/* 80247694 002445F4 4E 80 00 20 */ blr .global IsArtifactCategorySelected__14CLogBookScreenCFv IsArtifactCategorySelected__14CLogBookScreenCFv: @@ -2139,7 +2139,7 @@ IsArtifactCategorySelected__14CLogBookScreenCFv: /* 802476A4 00244604 20 00 00 05 */ subfic r0, r0, 5 /* 802476A8 00244608 7C 00 00 34 */ cntlzw r0, r0 /* 802476AC 0024460C 54 03 D9 7E */ srwi r3, r0, 5 -/* 802476B0 00244610 4E 80 00 20 */ blr +/* 802476B0 00244610 4E 80 00 20 */ blr .global Touch__14CLogBookScreenFv Touch__14CLogBookScreenFv: @@ -2155,7 +2155,7 @@ Touch__14CLogBookScreenFv: /* 802476D8 00244638 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802476DC 0024463C 7C 08 03 A6 */ mtlr r0 /* 802476E0 00244640 38 21 00 10 */ addi r1, r1, 0x10 -/* 802476E4 00244644 4E 80 00 20 */ blr +/* 802476E4 00244644 4E 80 00 20 */ blr .global Update__14CLogBookScreenFfR9CRandom16R18CArchitectureQueue Update__14CLogBookScreenFfR9CRandom16R18CArchitectureQueue: @@ -2299,7 +2299,7 @@ lbl_802478C8: /* 802478E4 00244844 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 802478E8 00244848 7C 08 03 A6 */ mtlr r0 /* 802478EC 0024484C 38 21 00 60 */ addi r1, r1, 0x60 -/* 802478F0 00244850 4E 80 00 20 */ blr +/* 802478F0 00244850 4E 80 00 20 */ blr .global __dt__14CLogBookScreenFv __dt__14CLogBookScreenFv: @@ -2363,7 +2363,7 @@ lbl_802479C0: /* 802479C8 00244928 80 01 00 24 */ lwz r0, 0x24(r1) /* 802479CC 0024492C 7C 08 03 A6 */ mtlr r0 /* 802479D0 00244930 38 21 00 20 */ addi r1, r1, 0x20 -/* 802479D4 00244934 4E 80 00 20 */ blr +/* 802479D4 00244934 4E 80 00 20 */ blr .global sub_802479d8 sub_802479d8: @@ -2387,7 +2387,7 @@ lbl_80247A0C: /* 80247A18 00244978 83 C1 00 08 */ lwz r30, 8(r1) /* 80247A1C 0024497C 7C 08 03 A6 */ mtlr r0 /* 80247A20 00244980 38 21 00 10 */ addi r1, r1, 0x10 -/* 80247A24 00244984 4E 80 00 20 */ blr +/* 80247A24 00244984 4E 80 00 20 */ blr .global sub_80247a28 sub_80247a28: @@ -2437,7 +2437,7 @@ lbl_80247AA0: /* 80247AC0 00244A20 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80247AC4 00244A24 7C 08 03 A6 */ mtlr r0 /* 80247AC8 00244A28 38 21 00 30 */ addi r1, r1, 0x30 -/* 80247ACC 00244A2C 4E 80 00 20 */ blr +/* 80247ACC 00244A2C 4E 80 00 20 */ blr .global sub_80247ad0 sub_80247ad0: @@ -2461,7 +2461,7 @@ lbl_80247B04: /* 80247B10 00244A70 83 C1 00 08 */ lwz r30, 8(r1) /* 80247B14 00244A74 7C 08 03 A6 */ mtlr r0 /* 80247B18 00244A78 38 21 00 10 */ addi r1, r1, 0x10 -/* 80247B1C 00244A7C 4E 80 00 20 */ blr +/* 80247B1C 00244A7C 4E 80 00 20 */ blr .global sub_80247b20 sub_80247b20: @@ -2492,7 +2492,7 @@ lbl_80247B58: /* 80247B78 00244AD8 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80247B7C 00244ADC 7C 08 03 A6 */ mtlr r0 /* 80247B80 00244AE0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80247B84 00244AE4 4E 80 00 20 */ blr +/* 80247B84 00244AE4 4E 80 00 20 */ blr .global sub_80247b88 sub_80247b88: @@ -2504,7 +2504,7 @@ sub_80247b88: /* 80247B9C 00244AFC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80247BA0 00244B00 7C 08 03 A6 */ mtlr r0 /* 80247BA4 00244B04 38 21 00 10 */ addi r1, r1, 0x10 -/* 80247BA8 00244B08 4E 80 00 20 */ blr +/* 80247BA8 00244B08 4E 80 00 20 */ blr .global __ct__14CLogBookScreenFRC13CStateManagerRC9CGuiFrameRC12CStringTable __ct__14CLogBookScreenFRC13CStateManagerRC9CGuiFrameRC12CStringTable: @@ -2590,7 +2590,7 @@ lbl_80247C94: /* 80247CD8 00244C38 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 80247CDC 00244C3C 7C 08 03 A6 */ mtlr r0 /* 80247CE0 00244C40 38 21 00 40 */ addi r1, r1, 0x40 -/* 80247CE4 00244C44 4E 80 00 20 */ blr +/* 80247CE4 00244C44 4E 80 00 20 */ blr .global sub_80247ce8 sub_80247ce8: @@ -2607,7 +2607,7 @@ sub_80247ce8: /* 80247D10 00244C70 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80247D14 00244C74 7C 08 03 A6 */ mtlr r0 /* 80247D18 00244C78 38 21 00 10 */ addi r1, r1, 0x10 -/* 80247D1C 00244C7C 4E 80 00 20 */ blr +/* 80247D1C 00244C7C 4E 80 00 20 */ blr .global sub_80247d20 sub_80247d20: @@ -2642,7 +2642,7 @@ lbl_80247D6C: /* 80247D84 00244CE4 83 81 00 10 */ lwz r28, 0x10(r1) /* 80247D88 00244CE8 7C 08 03 A6 */ mtlr r0 /* 80247D8C 00244CEC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80247D90 00244CF0 4E 80 00 20 */ blr +/* 80247D90 00244CF0 4E 80 00 20 */ blr .global sub_80247d94 sub_80247d94: @@ -2719,7 +2719,7 @@ lbl_80247E88: /* 80247E90 00244DF0 80 01 00 34 */ lwz r0, 0x34(r1) /* 80247E94 00244DF4 7C 08 03 A6 */ mtlr r0 /* 80247E98 00244DF8 38 21 00 30 */ addi r1, r1, 0x30 -/* 80247E9C 00244DFC 4E 80 00 20 */ blr +/* 80247E9C 00244DFC 4E 80 00 20 */ blr .global sub_80247ea0 sub_80247ea0: @@ -2736,7 +2736,7 @@ sub_80247ea0: /* 80247EC8 00244E28 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80247ECC 00244E2C 7C 08 03 A6 */ mtlr r0 /* 80247ED0 00244E30 38 21 00 10 */ addi r1, r1, 0x10 -/* 80247ED4 00244E34 4E 80 00 20 */ blr +/* 80247ED4 00244E34 4E 80 00 20 */ blr .global sub_80247ed8 sub_80247ed8: @@ -2812,7 +2812,7 @@ lbl_80247FB4: /* 80247FCC 00244F2C 83 81 00 10 */ lwz r28, 0x10(r1) /* 80247FD0 00244F30 7C 08 03 A6 */ mtlr r0 /* 80247FD4 00244F34 38 21 00 20 */ addi r1, r1, 0x20 -/* 80247FD8 00244F38 4E 80 00 20 */ blr +/* 80247FD8 00244F38 4E 80 00 20 */ blr .global sub_80247fdc sub_80247fdc: @@ -2938,7 +2938,7 @@ lbl_80248198: /* 8024819C 002450FC 80 01 00 64 */ lwz r0, 0x64(r1) /* 802481A0 00245100 7C 08 03 A6 */ mtlr r0 /* 802481A4 00245104 38 21 00 60 */ addi r1, r1, 0x60 -/* 802481A8 00245108 4E 80 00 20 */ blr +/* 802481A8 00245108 4E 80 00 20 */ blr .global sub_802481ac sub_802481ac: @@ -3011,7 +3011,7 @@ lbl_80248284: /* 80248290 002451F0 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80248294 002451F4 7C 08 03 A6 */ mtlr r0 /* 80248298 002451F8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8024829C 002451FC 4E 80 00 20 */ blr +/* 8024829C 002451FC 4E 80 00 20 */ blr .global sub_802482a0 sub_802482a0: @@ -3090,7 +3090,7 @@ lbl_802483A0: /* 802483A4 00245304 80 01 00 44 */ lwz r0, 0x44(r1) /* 802483A8 00245308 7C 08 03 A6 */ mtlr r0 /* 802483AC 0024530C 38 21 00 40 */ addi r1, r1, 0x40 -/* 802483B0 00245310 4E 80 00 20 */ blr +/* 802483B0 00245310 4E 80 00 20 */ blr .global sub_802483b4 sub_802483b4: @@ -3137,7 +3137,7 @@ lbl_8024842C: /* 80248440 002453A0 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80248444 002453A4 7C 08 03 A6 */ mtlr r0 /* 80248448 002453A8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8024844C 002453AC 4E 80 00 20 */ blr +/* 8024844C 002453AC 4E 80 00 20 */ blr .global sub_80248450 sub_80248450: @@ -3199,7 +3199,7 @@ lbl_8024851C: /* 80248520 00245480 80 01 00 24 */ lwz r0, 0x24(r1) /* 80248524 00245484 7C 08 03 A6 */ mtlr r0 /* 80248528 00245488 38 21 00 20 */ addi r1, r1, 0x20 -/* 8024852C 0024548C 4E 80 00 20 */ blr +/* 8024852C 0024548C 4E 80 00 20 */ blr .global sub_80248530 sub_80248530: diff --git a/asm/MetroidPrime/CMFGame.s b/asm/MetroidPrime/CMFGame.s index 057ef082..16d0d5fd 100644 --- a/asm/MetroidPrime/CMFGame.s +++ b/asm/MetroidPrime/CMFGame.s @@ -111,7 +111,7 @@ Draw__13CMFGameLoaderCFv: /* 80023A44 000209A4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80023A48 000209A8 7C 08 03 A6 */ mtlr r0 /* 80023A4C 000209AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80023A50 000209B0 4E 80 00 20 */ blr +/* 80023A50 000209B0 4E 80 00 20 */ blr .global OnMessage__13CMFGameLoaderFRC20CArchitectureMessageR18CArchitectureQueue OnMessage__13CMFGameLoaderFRC20CArchitectureMessageR18CArchitectureQueue: @@ -431,7 +431,7 @@ lbl_80023EC8: /* 80023ED4 00020E34 80 01 00 74 */ lwz r0, 0x74(r1) /* 80023ED8 00020E38 7C 08 03 A6 */ mtlr r0 /* 80023EDC 00020E3C 38 21 00 70 */ addi r1, r1, 0x70 -/* 80023EE0 00020E40 4E 80 00 20 */ blr +/* 80023EE0 00020E40 4E 80 00 20 */ blr .global MakeLoadDependancyList__13CMFGameLoaderFv MakeLoadDependancyList__13CMFGameLoaderFv: @@ -500,7 +500,7 @@ lbl_80023FA0: /* 80023FC8 00020F28 81 84 00 00 */ lwz r12, 0(r4) /* 80023FCC 00020F2C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80023FD0 00020F30 7D 89 03 A6 */ mtctr r12 -/* 80023FD4 00020F34 4E 80 04 21 */ bctrl +/* 80023FD4 00020F34 4E 80 04 21 */ bctrl /* 80023FD8 00020F38 38 61 00 10 */ addi r3, r1, 0x10 /* 80023FDC 00020F3C 38 81 00 08 */ addi r4, r1, 8 /* 80023FE0 00020F40 48 31 CE C9 */ bl __ct__6CTokenFRC6CToken @@ -551,7 +551,7 @@ lbl_8002406C: /* 8002407C 00020FDC 80 01 00 64 */ lwz r0, 0x64(r1) /* 80024080 00020FE0 7C 08 03 A6 */ mtlr r0 /* 80024084 00020FE4 38 21 00 60 */ addi r1, r1, 0x60 -/* 80024088 00020FE8 4E 80 00 20 */ blr +/* 80024088 00020FE8 4E 80 00 20 */ blr .global __dt__13CMFGameLoaderFv __dt__13CMFGameLoaderFv: @@ -626,7 +626,7 @@ lbl_80024170: /* 80024184 000210E4 83 81 00 20 */ lwz r28, 0x20(r1) /* 80024188 000210E8 7C 08 03 A6 */ mtlr r0 /* 8002418C 000210EC 38 21 00 30 */ addi r1, r1, 0x30 -/* 80024190 000210F0 4E 80 00 20 */ blr +/* 80024190 000210F0 4E 80 00 20 */ blr .global __ct__13CMFGameLoaderFv __ct__13CMFGameLoaderFv: @@ -732,7 +732,7 @@ lbl_800242D0: /* 80024318 00021278 38 84 00 3F */ addi r4, r4, 0x3f /* 8002431C 0002127C 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80024320 00021280 7D 89 03 A6 */ mtctr r12 -/* 80024324 00021284 4E 80 04 21 */ bctrl +/* 80024324 00021284 4E 80 04 21 */ bctrl /* 80024328 00021288 7C 7E 1B 79 */ or. r30, r3, r3 /* 8002432C 0002128C 41 82 00 34 */ beq lbl_80024360 /* 80024330 00021290 80 6D A0 80 */ lwz r3, gpGameState@sda21(r13) @@ -773,7 +773,7 @@ lbl_800243A4: /* 800243A4 00021304 38 00 00 01 */ li r0, 1 lbl_800243A8: /* 800243A8 00021308 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 800243AC 0002130C 4E 80 00 20 */ blr +/* 800243AC 0002130C 4E 80 00 20 */ blr .global PlayerDied__7CMFGameFv PlayerDied__7CMFGameFv: @@ -783,7 +783,7 @@ PlayerDied__7CMFGameFv: /* 800243BC 0002131C 88 03 00 2A */ lbz r0, 0x2a(r3) /* 800243C0 00021320 50 80 36 72 */ rlwimi r0, r4, 6, 0x19, 0x19 /* 800243C4 00021324 98 03 00 2A */ stb r0, 0x2a(r3) -/* 800243C8 00021328 4E 80 00 20 */ blr +/* 800243C8 00021328 4E 80 00 20 */ blr .global UnpauseGame__7CMFGameFv UnpauseGame__7CMFGameFv: @@ -804,7 +804,7 @@ UnpauseGame__7CMFGameFv: /* 80024404 00021364 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80024408 00021368 7C 08 03 A6 */ mtlr r0 /* 8002440C 0002136C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80024410 00021370 4E 80 00 20 */ blr +/* 80024410 00021370 4E 80 00 20 */ blr .global EnterMessageScreen__7CMFGameFf EnterMessageScreen__7CMFGameFf: @@ -822,7 +822,7 @@ EnterMessageScreen__7CMFGameFf: /* 80024440 000213A0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80024444 000213A4 7C 08 03 A6 */ mtlr r0 /* 80024448 000213A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002444C 000213AC 4E 80 00 20 */ blr +/* 8002444C 000213AC 4E 80 00 20 */ blr .global SaveGame__7CMFGameFv SaveGame__7CMFGameFv: @@ -840,7 +840,7 @@ SaveGame__7CMFGameFv: /* 8002447C 000213DC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80024480 000213E0 7C 08 03 A6 */ mtlr r0 /* 80024484 000213E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80024488 000213E8 4E 80 00 20 */ blr +/* 80024488 000213E8 4E 80 00 20 */ blr .global EnterLogBook__7CMFGameFv EnterLogBook__7CMFGameFv: @@ -858,7 +858,7 @@ EnterLogBook__7CMFGameFv: /* 800244B8 00021418 80 01 00 14 */ lwz r0, 0x14(r1) /* 800244BC 0002141C 7C 08 03 A6 */ mtlr r0 /* 800244C0 00021420 38 21 00 10 */ addi r1, r1, 0x10 -/* 800244C4 00021424 4E 80 00 20 */ blr +/* 800244C4 00021424 4E 80 00 20 */ blr .global PauseGame__7CMFGameFv PauseGame__7CMFGameFv: @@ -876,7 +876,7 @@ PauseGame__7CMFGameFv: /* 800244F4 00021454 80 01 00 14 */ lwz r0, 0x14(r1) /* 800244F8 00021458 7C 08 03 A6 */ mtlr r0 /* 800244FC 0002145C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80024500 00021460 4E 80 00 20 */ blr +/* 80024500 00021460 4E 80 00 20 */ blr .global EnterMapScreen__7CMFGameFv EnterMapScreen__7CMFGameFv: @@ -903,7 +903,7 @@ EnterMapScreen__7CMFGameFv: /* 80024554 000214B4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80024558 000214B8 7C 08 03 A6 */ mtlr r0 /* 8002455C 000214BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80024560 000214C0 4E 80 00 20 */ blr +/* 80024560 000214C0 4E 80 00 20 */ blr .global Draw__7CMFGameCFv Draw__7CMFGameCFv: @@ -988,7 +988,7 @@ lbl_80024680: /* 8002468C 000215EC 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80024690 000215F0 7C 08 03 A6 */ mtlr r0 /* 80024694 000215F4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80024698 000215F8 4E 80 00 20 */ blr +/* 80024698 000215F8 4E 80 00 20 */ blr .global OnMessage__7CMFGameFRC20CArchitectureMessageR18CArchitectureQueue OnMessage__7CMFGameFRC20CArchitectureMessageR18CArchitectureQueue: @@ -1012,7 +1012,7 @@ OnMessage__7CMFGameFRC20CArchitectureMessageR18CArchitectureQueue: /* 800246E0 00021640 38 63 99 B4 */ addi r3, r3, lbl_803D99B4@l /* 800246E4 00021644 7C 03 00 2E */ lwzx r0, r3, r0 /* 800246E8 00021648 7C 09 03 A6 */ mtctr r0 -/* 800246EC 0002164C 4E 80 04 20 */ bctr +/* 800246EC 0002164C 4E 80 04 20 */ bctr .global lbl_800246F0 lbl_800246F0: /* 800246F0 00021650 7C 83 23 78 */ mr r3, r4 @@ -1467,7 +1467,7 @@ lbl_80024D4C: /* 80024D64 00021CC4 83 81 00 A0 */ lwz r28, 0xa0(r1) /* 80024D68 00021CC8 7C 08 03 A6 */ mtlr r0 /* 80024D6C 00021CCC 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 80024D70 00021CD0 4E 80 00 20 */ blr +/* 80024D70 00021CD0 4E 80 00 20 */ blr .global Touch__7CMFGameFv Touch__7CMFGameFv: @@ -1540,7 +1540,7 @@ lbl_80024E48: /* 80024E58 00021DB8 83 81 00 10 */ lwz r28, 0x10(r1) /* 80024E5C 00021DBC 7C 08 03 A6 */ mtlr r0 /* 80024E60 00021DC0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80024E64 00021DC4 4E 80 00 20 */ blr +/* 80024E64 00021DC4 4E 80 00 20 */ blr .global __dt__7CMFGameFv __dt__7CMFGameFv: @@ -1600,7 +1600,7 @@ lbl_80024F20: /* 80024F2C 00021E8C 83 C1 00 08 */ lwz r30, 8(r1) /* 80024F30 00021E90 7C 08 03 A6 */ mtlr r0 /* 80024F34 00021E94 38 21 00 10 */ addi r1, r1, 0x10 -/* 80024F38 00021E98 4E 80 00 20 */ blr +/* 80024F38 00021E98 4E 80 00 20 */ blr .global "__ct__7CMFGameFQ24rstl25ncrc_ptr<13CStateManager>Q24rstl29ncrc_ptr<17CInGameGuiManager>R18CArchitectureQueue" "__ct__7CMFGameFQ24rstl25ncrc_ptr<13CStateManager>Q24rstl29ncrc_ptr<17CInGameGuiManager>R18CArchitectureQueue": @@ -1661,7 +1661,7 @@ lbl_80024F20: /* 80025014 00021F74 80 01 00 34 */ lwz r0, 0x34(r1) /* 80025018 00021F78 7C 08 03 A6 */ mtlr r0 /* 8002501C 00021F7C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80025020 00021F80 4E 80 00 20 */ blr +/* 80025020 00021F80 4E 80 00 20 */ blr .global sub_80025024 @@ -1689,7 +1689,7 @@ lbl_8002506C: /* 80025070 00021FD0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80025074 00021FD4 7C 08 03 A6 */ mtlr r0 /* 80025078 00021FD8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002507C 00021FDC 4E 80 00 20 */ blr +/* 8002507C 00021FDC 4E 80 00 20 */ blr .global sub_80025080 sub_80025080: @@ -1716,7 +1716,7 @@ lbl_800250C8: /* 800250CC 0002202C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800250D0 00022030 7C 08 03 A6 */ mtlr r0 /* 800250D4 00022034 38 21 00 10 */ addi r1, r1, 0x10 -/* 800250D8 00022038 4E 80 00 20 */ blr +/* 800250D8 00022038 4E 80 00 20 */ blr .global "__nw__27TOneStatic<13CStateManager>FUlPCcPCc" "__nw__27TOneStatic<13CStateManager>FUlPCcPCc": @@ -1731,13 +1731,13 @@ lbl_800250C8: /* 800250FC 0002205C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80025100 00022060 7C 08 03 A6 */ mtlr r0 /* 80025104 00022064 38 21 00 10 */ addi r1, r1, 0x10 -/* 80025108 00022068 4E 80 00 20 */ blr +/* 80025108 00022068 4E 80 00 20 */ blr .global "GetAllocSpace__27TOneStatic<13CStateManager>Fv" "GetAllocSpace__27TOneStatic<13CStateManager>Fv": /* 8002510C 0002206C 3C 60 80 46 */ lis r3, lbl_8045A1A8@ha /* 80025110 00022070 38 63 A1 A8 */ addi r3, r3, lbl_8045A1A8@l -/* 80025114 00022074 4E 80 00 20 */ blr +/* 80025114 00022074 4E 80 00 20 */ blr .global "ReferenceCount__27TOneStatic<13CStateManager>Fv" "ReferenceCount__27TOneStatic<13CStateManager>Fv": @@ -1750,7 +1750,7 @@ lbl_800250C8: /* 80025130 00022090 98 0D A1 04 */ stb r0, lbl_805A8CC4@sda21(r13) lbl_80025134: /* 80025134 00022094 38 6D A1 00 */ addi r3, r13, lbl_805A8CC0@sda21 -/* 80025138 00022098 4E 80 00 20 */ blr +/* 80025138 00022098 4E 80 00 20 */ blr .global __sinit_CMFGame_cpp __sinit_CMFGame_cpp: @@ -1761,4 +1761,4 @@ __sinit_CMFGame_cpp: /* 8002514C 000220AC 38 04 FE 17 */ addi r0, r4, 0x158EFE17@l /* 80025150 000220B0 90 AD A0 F8 */ stw r5, lbl_805A8CB8@sda21(r13) /* 80025154 000220B4 90 03 00 04 */ stw r0, 4(r3) -/* 80025158 000220B8 4E 80 00 20 */ blr +/* 80025158 000220B8 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/CMainFlow.s b/asm/MetroidPrime/CMainFlow.s index 07af564e..0208fd9e 100644 --- a/asm/MetroidPrime/CMainFlow.s +++ b/asm/MetroidPrime/CMainFlow.s @@ -92,7 +92,7 @@ lbl_803CCAA8: .asciz "??(??)" .asciz "MainFlow" .balign 4 - + .section .text, "ax" .global __dt__9CMainFlowFv @@ -121,7 +121,7 @@ lbl_80023568: /* 80023574 000204D4 83 C1 00 08 */ lwz r30, 8(r1) /* 80023578 000204D8 7C 08 03 A6 */ mtlr r0 /* 8002357C 000204DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80023580 000204E0 4E 80 00 20 */ blr +/* 80023580 000204E0 4E 80 00 20 */ blr .global SetGameState__9CMainFlowF17EClientFlowStatesR18CArchitectureQueue SetGameState__9CMainFlowF17EClientFlowStatesR18CArchitectureQueue: @@ -320,7 +320,7 @@ lbl_80023840: /* 80023844 000207A4 83 E1 00 5C */ lwz r31, 0x5c(r1) /* 80023848 000207A8 7C 08 03 A6 */ mtlr r0 /* 8002384C 000207AC 38 21 00 60 */ addi r1, r1, 0x60 -/* 80023850 000207B0 4E 80 00 20 */ blr +/* 80023850 000207B0 4E 80 00 20 */ blr .global AdvanceGameState__9CMainFlowFR18CArchitectureQueue AdvanceGameState__9CMainFlowFR18CArchitectureQueue: @@ -336,7 +336,7 @@ AdvanceGameState__9CMainFlowFR18CArchitectureQueue: /* 80023878 000207D8 38 A5 99 44 */ addi r5, r5, lbl_803D9944@l /* 8002387C 000207DC 7C 05 00 2E */ lwzx r0, r5, r0 /* 80023880 000207E0 7C 09 03 A6 */ mtctr r0 -/* 80023884 000207E4 4E 80 04 20 */ bctr +/* 80023884 000207E4 4E 80 04 20 */ bctr .global lbl_80023888 lbl_80023888: /* 80023888 000207E8 7C 85 23 78 */ mr r5, r4 @@ -377,16 +377,16 @@ lbl_800238EC: /* 800238EC 0002084C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800238F0 00020850 7C 08 03 A6 */ mtlr r0 /* 800238F4 00020854 38 21 00 10 */ addi r1, r1, 0x10 -/* 800238F8 00020858 4E 80 00 20 */ blr +/* 800238F8 00020858 4E 80 00 20 */ blr .global Draw__9CMainFlowCFv Draw__9CMainFlowCFv: -/* 800238FC 0002085C 4E 80 00 20 */ blr +/* 800238FC 0002085C 4E 80 00 20 */ blr .global GetIsContinueDraw__9CMainFlowCFv GetIsContinueDraw__9CMainFlowCFv: /* 80023900 00020860 38 60 00 00 */ li r3, 0 -/* 80023904 00020864 4E 80 00 20 */ blr +/* 80023904 00020864 4E 80 00 20 */ blr .global OnMessage__9CMainFlowFRC20CArchitectureMessageR18CArchitectureQueue OnMessage__9CMainFlowFRC20CArchitectureMessageR18CArchitectureQueue: @@ -439,7 +439,7 @@ lbl_800239A4: /* 800239AC 0002090C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 800239B0 00020910 7C 08 03 A6 */ mtlr r0 /* 800239B4 00020914 38 21 00 20 */ addi r1, r1, 0x20 -/* 800239B8 00020918 4E 80 00 20 */ blr +/* 800239B8 00020918 4E 80 00 20 */ blr .global __ct__9CMainFlowFv __ct__9CMainFlowFv: diff --git a/asm/MetroidPrime/CMapArea.s b/asm/MetroidPrime/CMapArea.s index c2cc389a..d2bf9a86 100644 --- a/asm/MetroidPrime/CMapArea.s +++ b/asm/MetroidPrime/CMapArea.s @@ -23,7 +23,7 @@ lbl_805A7010: .global lbl_8046C3E0 lbl_8046C3E0: .skip 0x28 - + .section .text, "ax" .global FMapAreaFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer @@ -83,7 +83,7 @@ lbl_80080200: /* 8008025C 0007D1BC 38 80 00 01 */ li r4, 1 /* 80080260 0007D1C0 81 8C 00 08 */ lwz r12, 8(r12) /* 80080264 0007D1C4 7D 89 03 A6 */ mtctr r12 -/* 80080268 0007D1C8 4E 80 04 21 */ bctrl +/* 80080268 0007D1C8 4E 80 04 21 */ bctrl lbl_8008026C: /* 8008026C 0007D1CC 88 01 00 08 */ lbz r0, 8(r1) /* 80080270 0007D1D0 28 00 00 00 */ cmplwi r0, 0 @@ -99,7 +99,7 @@ lbl_80080284: /* 80080294 0007D1F4 83 81 00 20 */ lwz r28, 0x20(r1) /* 80080298 0007D1F8 7C 08 03 A6 */ mtlr r0 /* 8008029C 0007D1FC 38 21 00 30 */ addi r1, r1, 0x30 -/* 800802A0 0007D200 4E 80 00 20 */ blr +/* 800802A0 0007D200 4E 80 00 20 */ blr .global "__dt__35TObjOwnerDerivedFromIObj<8CMapArea>Fv" "__dt__35TObjOwnerDerivedFromIObj<8CMapArea>Fv": @@ -141,7 +141,7 @@ lbl_80080318: /* 80080324 0007D284 83 C1 00 08 */ lwz r30, 8(r1) /* 80080328 0007D288 7C 08 03 A6 */ mtlr r0 /* 8008032C 0007D28C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80080330 0007D290 4E 80 00 20 */ blr +/* 80080330 0007D290 4E 80 00 20 */ blr .global "GetIObjObjectFor__17TToken<8CMapArea>FRCQ24rstl19auto_ptr<8CMapArea>" "GetIObjObjectFor__17TToken<8CMapArea>FRCQ24rstl19auto_ptr<8CMapArea>": @@ -155,7 +155,7 @@ lbl_80080318: /* 80080350 0007D2B0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80080354 0007D2B4 7C 08 03 A6 */ mtlr r0 /* 80080358 0007D2B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8008035C 0007D2BC 4E 80 00 20 */ blr +/* 8008035C 0007D2BC 4E 80 00 20 */ blr .global "GetNewDerivedObject__35TObjOwnerDerivedFromIObj<8CMapArea>FRCQ24rstl19auto_ptr<8CMapArea>" "GetNewDerivedObject__35TObjOwnerDerivedFromIObj<8CMapArea>FRCQ24rstl19auto_ptr<8CMapArea>": @@ -198,7 +198,7 @@ lbl_800803D0: /* 800803EC 0007D34C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800803F0 0007D350 7C 08 03 A6 */ mtlr r0 /* 800803F4 0007D354 38 21 00 10 */ addi r1, r1, 0x10 -/* 800803F8 0007D358 4E 80 00 20 */ blr +/* 800803F8 0007D358 4E 80 00 20 */ blr .global GetAreaPostTranslate__8CMapAreaFRC6IWorld7TAreaId GetAreaPostTranslate__8CMapAreaFRC6IWorld7TAreaId: @@ -210,7 +210,7 @@ GetAreaPostTranslate__8CMapAreaFRC6IWorld7TAreaId: /* 80080410 0007D370 81 83 00 00 */ lwz r12, 0(r3) /* 80080414 0007D374 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80080418 0007D378 7D 89 03 A6 */ mtctr r12 -/* 8008041C 0007D37C 4E 80 04 21 */ bctrl +/* 8008041C 0007D37C 4E 80 04 21 */ bctrl /* 80080420 0007D380 3C 03 4E 54 */ addis r0, r3, 0x4e54 /* 80080424 0007D384 28 00 4D 65 */ cmplwi r0, 0x4d65 /* 80080428 0007D388 40 82 00 24 */ bne lbl_8008044C @@ -230,7 +230,7 @@ lbl_80080454: /* 80080458 0007D3B8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8008045C 0007D3BC 7C 08 03 A6 */ mtlr r0 /* 80080460 0007D3C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80080464 0007D3C4 4E 80 00 20 */ blr +/* 80080464 0007D3C4 4E 80 00 20 */ blr .global GetAreaPostTransform__8CMapAreaFRC6CWorld7TAreaId GetAreaPostTransform__8CMapAreaFRC6CWorld7TAreaId: @@ -247,7 +247,7 @@ GetAreaPostTransform__8CMapAreaFRC6CWorld7TAreaId: /* 80080490 0007D3F0 81 9F 00 00 */ lwz r12, 0(r31) /* 80080494 0007D3F4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80080498 0007D3F8 7D 89 03 A6 */ mtctr r12 -/* 8008049C 0007D3FC 4E 80 04 21 */ bctrl +/* 8008049C 0007D3FC 4E 80 04 21 */ bctrl /* 800804A0 0007D400 3C 03 4E 54 */ addis r0, r3, 0x4e54 /* 800804A4 0007D404 28 00 4D 65 */ cmplwi r0, 0x4d65 /* 800804A8 0007D408 40 82 00 70 */ bne lbl_80080518 @@ -258,11 +258,11 @@ GetAreaPostTransform__8CMapAreaFRC6CWorld7TAreaId: /* 800804BC 0007D41C 93 C1 00 10 */ stw r30, 0x10(r1) /* 800804C0 0007D420 81 8C 00 20 */ lwz r12, 0x20(r12) /* 800804C4 0007D424 7D 89 03 A6 */ mtctr r12 -/* 800804C8 0007D428 4E 80 04 21 */ bctrl +/* 800804C8 0007D428 4E 80 04 21 */ bctrl /* 800804CC 0007D42C 81 83 00 00 */ lwz r12, 0(r3) /* 800804D0 0007D430 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800804D4 0007D434 7D 89 03 A6 */ mtctr r12 -/* 800804D8 0007D438 4E 80 04 21 */ bctrl +/* 800804D8 0007D438 4E 80 04 21 */ bctrl /* 800804DC 0007D43C 3C A0 80 3D */ lis r5, lbl_803CD640@ha /* 800804E0 0007D440 3C 80 80 47 */ lis r4, lbl_8046C3E0@ha /* 800804E4 0007D444 38 A5 D6 40 */ addi r5, r5, lbl_803CD640@l @@ -286,11 +286,11 @@ lbl_80080518: /* 80080528 0007D488 93 C1 00 08 */ stw r30, 8(r1) /* 8008052C 0007D48C 81 8C 00 20 */ lwz r12, 0x20(r12) /* 80080530 0007D490 7D 89 03 A6 */ mtctr r12 -/* 80080534 0007D494 4E 80 04 21 */ bctrl +/* 80080534 0007D494 4E 80 04 21 */ bctrl /* 80080538 0007D498 81 83 00 00 */ lwz r12, 0(r3) /* 8008053C 0007D49C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80080540 0007D4A0 7D 89 03 A6 */ mtctr r12 -/* 80080544 0007D4A4 4E 80 04 21 */ bctrl +/* 80080544 0007D4A4 4E 80 04 21 */ bctrl /* 80080548 0007D4A8 7C 64 1B 78 */ mr r4, r3 /* 8008054C 0007D4AC 7F A3 EB 78 */ mr r3, r29 /* 80080550 0007D4B0 48 29 26 25 */ bl __ct__12CTransform4fFRC12CTransform4f @@ -301,7 +301,7 @@ lbl_80080554: /* 80080560 0007D4C0 83 A1 00 54 */ lwz r29, 0x54(r1) /* 80080564 0007D4C4 7C 08 03 A6 */ mtlr r0 /* 80080568 0007D4C8 38 21 00 60 */ addi r1, r1, 0x60 -/* 8008056C 0007D4CC 4E 80 00 20 */ blr +/* 8008056C 0007D4CC 4E 80 00 20 */ blr .global SetupGXMaterial__Q28CMapArea15CMapAreaSurfaceFv SetupGXMaterial__Q28CMapArea15CMapAreaSurfaceFv: @@ -369,7 +369,7 @@ SetupGXMaterial__Q28CMapArea15CMapAreaSurfaceFv: /* 80080664 0007D5C4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80080668 0007D5C8 7C 08 03 A6 */ mtlr r0 /* 8008066C 0007D5CC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80080670 0007D5D0 4E 80 00 20 */ blr +/* 80080670 0007D5D0 4E 80 00 20 */ blr .global Draw__Q28CMapArea15CMapAreaSurfaceCFPC9CVector3fRC6CColorRC6CColorf Draw__Q28CMapArea15CMapAreaSurfaceCFPC9CVector3fRC6CColorRC6CColorf: @@ -617,7 +617,7 @@ lbl_800809CC: /* 800809E8 0007D948 80 01 00 84 */ lwz r0, 0x84(r1) /* 800809EC 0007D94C 7C 08 03 A6 */ mtlr r0 /* 800809F0 0007D950 38 21 00 80 */ addi r1, r1, 0x80 -/* 800809F4 0007D954 4E 80 00 20 */ blr +/* 800809F4 0007D954 4E 80 00 20 */ blr .global PostConstruct__Q28CMapArea15CMapAreaSurfaceFPCv PostConstruct__Q28CMapArea15CMapAreaSurfaceFPCv: @@ -729,7 +729,7 @@ lbl_80080B84: /* 80080B8C 0007DAEC 80 64 00 00 */ lwz r3, 0(r4) /* 80080B90 0007DAF0 38 84 00 04 */ addi r4, r4, 4 /* 80080B94 0007DAF4 2C 03 00 00 */ cmpwi r3, 0 -/* 80080B98 0007DAF8 4C 81 00 20 */ blelr +/* 80080B98 0007DAF8 4C 81 00 20 */ blelr /* 80080B9C 0007DAFC 2C 03 00 08 */ cmpwi r3, 8 /* 80080BA0 0007DB00 38 C3 FF F8 */ addi r6, r3, -8 /* 80080BA4 0007DB04 40 81 01 20 */ ble lbl_80080CC4 @@ -809,7 +809,7 @@ lbl_80080CC4: /* 80080CC4 0007DC24 7C 05 18 50 */ subf r0, r5, r3 /* 80080CC8 0007DC28 7C 09 03 A6 */ mtctr r0 /* 80080CCC 0007DC2C 7C 05 18 00 */ cmpw r5, r3 -/* 80080CD0 0007DC30 4C 80 00 20 */ bgelr +/* 80080CD0 0007DC30 4C 80 00 20 */ bgelr lbl_80080CD4: /* 80080CD4 0007DC34 80 64 00 00 */ lwz r3, 0(r4) /* 80080CD8 0007DC38 38 84 00 04 */ addi r4, r4, 4 @@ -820,7 +820,7 @@ lbl_80080CD4: /* 80080CEC 0007DC4C 54 00 10 3A */ slwi r0, r0, 2 /* 80080CF0 0007DC50 7C 84 02 14 */ add r4, r4, r0 /* 80080CF4 0007DC54 42 00 FF E0 */ bdnz lbl_80080CD4 -/* 80080CF8 0007DC58 4E 80 00 20 */ blr +/* 80080CF8 0007DC58 4E 80 00 20 */ blr .global GetAreaCenterPoint__8CMapAreaCFv GetAreaCenterPoint__8CMapAreaCFv: @@ -835,7 +835,7 @@ GetAreaCenterPoint__8CMapAreaCFv: /* 80080D1C 0007DC7C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80080D20 0007DC80 7C 08 03 A6 */ mtlr r0 /* 80080D24 0007DC84 38 21 00 10 */ addi r1, r1, 0x10 -/* 80080D28 0007DC88 4E 80 00 20 */ blr +/* 80080D28 0007DC88 4E 80 00 20 */ blr .global GetIsVisibleToAutoMapper__8CMapAreaCFbb GetIsVisibleToAutoMapper__8CMapAreaCFbb: @@ -853,25 +853,25 @@ lbl_80080D4C: /* 80080D54 0007DCB4 48 00 00 30 */ b lbl_80080D84 lbl_80080D58: /* 80080D58 0007DCB8 38 60 00 01 */ li r3, 1 -/* 80080D5C 0007DCBC 4E 80 00 20 */ blr +/* 80080D5C 0007DCBC 4E 80 00 20 */ blr lbl_80080D60: /* 80080D60 0007DCC0 54 80 06 3F */ clrlwi. r0, r4, 0x18 /* 80080D64 0007DCC4 38 60 00 00 */ li r3, 0 /* 80080D68 0007DCC8 40 82 00 0C */ bne lbl_80080D74 /* 80080D6C 0007DCCC 54 A0 06 3F */ clrlwi. r0, r5, 0x18 -/* 80080D70 0007DCD0 4D 82 00 20 */ beqlr +/* 80080D70 0007DCD0 4D 82 00 20 */ beqlr lbl_80080D74: /* 80080D74 0007DCD4 38 60 00 01 */ li r3, 1 -/* 80080D78 0007DCD8 4E 80 00 20 */ blr +/* 80080D78 0007DCD8 4E 80 00 20 */ blr lbl_80080D7C: /* 80080D7C 0007DCDC 7C A3 2B 78 */ mr r3, r5 -/* 80080D80 0007DCE0 4E 80 00 20 */ blr +/* 80080D80 0007DCE0 4E 80 00 20 */ blr lbl_80080D84: /* 80080D84 0007DCE4 38 60 00 00 */ li r3, 0 -/* 80080D88 0007DCE8 4E 80 00 20 */ blr +/* 80080D88 0007DCE8 4E 80 00 20 */ blr lbl_80080D8C: /* 80080D8C 0007DCEC 38 60 00 01 */ li r3, 1 -/* 80080D90 0007DCF0 4E 80 00 20 */ blr +/* 80080D90 0007DCF0 4E 80 00 20 */ blr .global PostConstruct__8CMapAreaFv PostConstruct__8CMapAreaFv: @@ -937,7 +937,7 @@ lbl_80080E50: /* 80080E68 0007DDC8 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80080E6C 0007DDCC 7C 08 03 A6 */ mtlr r0 /* 80080E70 0007DDD0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80080E74 0007DDD4 4E 80 00 20 */ blr +/* 80080E74 0007DDD4 4E 80 00 20 */ blr .global __dt__8CMapAreaFv __dt__8CMapAreaFv: @@ -975,7 +975,7 @@ lbl_80080EE0: /* 80080EEC 0007DE4C 83 C1 00 08 */ lwz r30, 8(r1) /* 80080EF0 0007DE50 7C 08 03 A6 */ mtlr r0 /* 80080EF4 0007DE54 38 21 00 10 */ addi r1, r1, 0x10 -/* 80080EF8 0007DE58 4E 80 00 20 */ blr +/* 80080EF8 0007DE58 4E 80 00 20 */ blr .global __ct__8CMapAreaFR12CInputStreamUi __ct__8CMapAreaFR12CInputStreamUi: @@ -1047,7 +1047,7 @@ __ct__8CMapAreaFR12CInputStreamUi: /* 80081000 0007DF60 80 01 00 24 */ lwz r0, 0x24(r1) /* 80081004 0007DF64 7C 08 03 A6 */ mtlr r0 /* 80081008 0007DF68 38 21 00 20 */ addi r1, r1, 0x20 -/* 8008100C 0007DF6C 4E 80 00 20 */ blr +/* 8008100C 0007DF6C 4E 80 00 20 */ blr .global __sinit_CMapArea_cpp __sinit_CMapArea_cpp: @@ -1064,4 +1064,4 @@ __sinit_CMapArea_cpp: /* 80081038 0007DF98 D0 43 00 18 */ stfs f2, 0x18(r3) /* 8008103C 0007DF9C D0 43 00 1C */ stfs f2, 0x1c(r3) /* 80081040 0007DFA0 D0 03 00 20 */ stfs f0, 0x20(r3) -/* 80081044 0007DFA4 4E 80 00 20 */ blr +/* 80081044 0007DFA4 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/CMapUniverse.s b/asm/MetroidPrime/CMapUniverse.s index 4dc0ecf4..7849d707 100644 --- a/asm/MetroidPrime/CMapUniverse.s +++ b/asm/MetroidPrime/CMapUniverse.s @@ -73,7 +73,7 @@ lbl_80201D70: /* 80201DCC 001FED2C 38 80 00 01 */ li r4, 1 /* 80201DD0 001FED30 81 8C 00 08 */ lwz r12, 8(r12) /* 80201DD4 001FED34 7D 89 03 A6 */ mtctr r12 -/* 80201DD8 001FED38 4E 80 04 21 */ bctrl +/* 80201DD8 001FED38 4E 80 04 21 */ bctrl lbl_80201DDC: /* 80201DDC 001FED3C 88 01 00 08 */ lbz r0, 8(r1) /* 80201DE0 001FED40 28 00 00 00 */ cmplwi r0, 0 @@ -88,7 +88,7 @@ lbl_80201DF4: /* 80201E00 001FED60 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80201E04 001FED64 7C 08 03 A6 */ mtlr r0 /* 80201E08 001FED68 38 21 00 30 */ addi r1, r1, 0x30 -/* 80201E0C 001FED6C 4E 80 00 20 */ blr +/* 80201E0C 001FED6C 4E 80 00 20 */ blr .global "__dt__40TObjOwnerDerivedFromIObj<12CMapUniverse>Fv" "__dt__40TObjOwnerDerivedFromIObj<12CMapUniverse>Fv": @@ -130,7 +130,7 @@ lbl_80201E84: /* 80201E90 001FEDF0 83 C1 00 08 */ lwz r30, 8(r1) /* 80201E94 001FEDF4 7C 08 03 A6 */ mtlr r0 /* 80201E98 001FEDF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80201E9C 001FEDFC 4E 80 00 20 */ blr +/* 80201E9C 001FEDFC 4E 80 00 20 */ blr .global "GetIObjObjectFor__22TToken<12CMapUniverse>FRCQ24rstl24auto_ptr<12CMapUniverse>" "GetIObjObjectFor__22TToken<12CMapUniverse>FRCQ24rstl24auto_ptr<12CMapUniverse>": @@ -144,7 +144,7 @@ lbl_80201E84: /* 80201EBC 001FEE1C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80201EC0 001FEE20 7C 08 03 A6 */ mtlr r0 /* 80201EC4 001FEE24 38 21 00 10 */ addi r1, r1, 0x10 -/* 80201EC8 001FEE28 4E 80 00 20 */ blr +/* 80201EC8 001FEE28 4E 80 00 20 */ blr .global "GetNewDerivedObject__40TObjOwnerDerivedFromIObj<12CMapUniverse>FRCQ24rstl24auto_ptr<12CMapUniverse>" "GetNewDerivedObject__40TObjOwnerDerivedFromIObj<12CMapUniverse>FRCQ24rstl24auto_ptr<12CMapUniverse>": @@ -187,7 +187,7 @@ lbl_80201F3C: /* 80201F58 001FEEB8 80 01 00 14 */ lwz r0, 0x14(r1) /* 80201F5C 001FEEBC 7C 08 03 A6 */ mtlr r0 /* 80201F60 001FEEC0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80201F64 001FEEC4 4E 80 00 20 */ blr +/* 80201F64 001FEEC4 4E 80 00 20 */ blr .global GetMapWorldDataByWorldId__12CMapUniverseFUi GetMapWorldDataByWorldId__12CMapUniverseFUi: @@ -203,13 +203,13 @@ lbl_80201F7C: /* 80201F88 001FEEE8 7C 04 00 40 */ cmplw r4, r0 /* 80201F8C 001FEEEC 40 82 00 0C */ bne lbl_80201F98 /* 80201F90 001FEEF0 7C A3 2B 78 */ mr r3, r5 -/* 80201F94 001FEEF4 4E 80 00 20 */ blr +/* 80201F94 001FEEF4 4E 80 00 20 */ blr lbl_80201F98: /* 80201F98 001FEEF8 38 C6 00 70 */ addi r6, r6, 0x70 /* 80201F9C 001FEEFC 42 00 FF E0 */ bdnz lbl_80201F7C lbl_80201FA0: /* 80201FA0 001FEF00 80 63 00 1C */ lwz r3, 0x1c(r3) -/* 80201FA4 001FEF04 4E 80 00 20 */ blr +/* 80201FA4 001FEF04 4E 80 00 20 */ blr .global __ct__Q212CMapUniverse13CMapWorldDataFR12CInputStream __ct__Q212CMapUniverse13CMapWorldDataFR12CInputStream: @@ -389,7 +389,7 @@ lbl_802021D0: /* 80202234 001FF194 80 01 00 94 */ lwz r0, 0x94(r1) /* 80202238 001FF198 7C 08 03 A6 */ mtlr r0 /* 8020223C 001FF19C 38 21 00 90 */ addi r1, r1, 0x90 -/* 80202240 001FF1A0 4E 80 00 20 */ blr +/* 80202240 001FF1A0 4E 80 00 20 */ blr .global __ct__Q212CMapUniverse12CMapAreaDataFR12CInputStream __ct__Q212CMapUniverse12CMapAreaDataFR12CInputStream: @@ -404,7 +404,7 @@ __ct__Q212CMapUniverse12CMapAreaDataFR12CInputStream: /* 80202264 001FF1C4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80202268 001FF1C8 7C 08 03 A6 */ mtlr r0 /* 8020226C 001FF1CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80202270 001FF1D0 4E 80 00 20 */ blr +/* 80202270 001FF1D0 4E 80 00 20 */ blr .global Draw__12CMapUniverseCFRCQ212CMapUniverse21CMapUniverseDrawParmsRC9CVector3fff Draw__12CMapUniverseCFRCQ212CMapUniverse21CMapUniverseDrawParmsRC9CVector3fff: @@ -850,7 +850,7 @@ lbl_802028C4: /* 802028E4 001FF844 81 83 00 00 */ lwz r12, 0(r3) /* 802028E8 001FF848 81 8C 00 30 */ lwz r12, 0x30(r12) /* 802028EC 001FF84C 7D 89 03 A6 */ mtctr r12 -/* 802028F0 001FF850 4E 80 04 21 */ bctrl +/* 802028F0 001FF850 4E 80 04 21 */ bctrl lbl_802028F4: /* 802028F4 001FF854 56 80 06 3F */ clrlwi. r0, r20, 0x18 /* 802028F8 001FF858 41 82 00 0C */ beq lbl_80202904 @@ -906,7 +906,7 @@ lbl_80202978: /* 802029A4 001FF904 80 01 02 64 */ lwz r0, 0x264(r1) /* 802029A8 001FF908 7C 08 03 A6 */ mtlr r0 /* 802029AC 001FF90C 38 21 02 60 */ addi r1, r1, 0x260 -/* 802029B0 001FF910 4E 80 00 20 */ blr +/* 802029B0 001FF910 4E 80 00 20 */ blr .global sub_802029b4 sub_802029b4: @@ -940,7 +940,7 @@ lbl_80202A0C: /* 80202A18 001FF978 83 C1 00 08 */ lwz r30, 8(r1) /* 80202A1C 001FF97C 7C 08 03 A6 */ mtlr r0 /* 80202A20 001FF980 38 21 00 10 */ addi r1, r1, 0x10 -/* 80202A24 001FF984 4E 80 00 20 */ blr +/* 80202A24 001FF984 4E 80 00 20 */ blr .global sub_80202a28 sub_80202a28: @@ -980,7 +980,7 @@ lbl_80202A98: /* 80202AA4 001FFA04 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80202AA8 001FFA08 7C 08 03 A6 */ mtlr r0 /* 80202AAC 001FFA0C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80202AB0 001FFA10 4E 80 00 20 */ blr +/* 80202AB0 001FFA10 4E 80 00 20 */ blr .global sub_80202ab4 sub_80202ab4: @@ -1005,7 +1005,7 @@ lbl_80202AE0: /* 80202AF4 001FFA54 83 C1 00 08 */ lwz r30, 8(r1) /* 80202AF8 001FFA58 7C 08 03 A6 */ mtlr r0 /* 80202AFC 001FFA5C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80202B00 001FFA60 4E 80 00 20 */ blr +/* 80202B00 001FFA60 4E 80 00 20 */ blr .global sub_80202b04 sub_80202b04: @@ -1017,7 +1017,7 @@ sub_80202b04: /* 80202B18 001FFA78 80 01 00 14 */ lwz r0, 0x14(r1) /* 80202B1C 001FFA7C 7C 08 03 A6 */ mtlr r0 /* 80202B20 001FFA80 38 21 00 10 */ addi r1, r1, 0x10 -/* 80202B24 001FFA84 4E 80 00 20 */ blr +/* 80202B24 001FFA84 4E 80 00 20 */ blr .global sub_80202b28 sub_80202b28: @@ -1066,7 +1066,7 @@ lbl_80202BB0: /* 80202BBC 001FFB1C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80202BC0 001FFB20 7C 08 03 A6 */ mtlr r0 /* 80202BC4 001FFB24 38 21 00 20 */ addi r1, r1, 0x20 -/* 80202BC8 001FFB28 4E 80 00 20 */ blr +/* 80202BC8 001FFB28 4E 80 00 20 */ blr .global __ct__12CMapUniverseFR12CInputStream __ct__12CMapUniverseFR12CInputStream: @@ -1094,7 +1094,7 @@ __ct__12CMapUniverseFR12CInputStream: /* 80202C20 001FFB80 81 84 00 00 */ lwz r12, 0(r4) /* 80202C24 001FFB84 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80202C28 001FFB88 7D 89 03 A6 */ mtctr r12 -/* 80202C2C 001FFB8C 4E 80 04 21 */ bctrl +/* 80202C2C 001FFB8C 4E 80 04 21 */ bctrl /* 80202C30 001FFB90 3B FC 00 04 */ addi r31, r28, 4 /* 80202C34 001FFB94 38 81 00 08 */ addi r4, r1, 8 /* 80202C38 001FFB98 7F E3 FB 78 */ mr r3, r31 @@ -1151,7 +1151,7 @@ lbl_80202CD4: /* 80202CFC 001FFC5C 83 81 00 90 */ lwz r28, 0x90(r1) /* 80202D00 001FFC60 7C 08 03 A6 */ mtlr r0 /* 80202D04 001FFC64 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 80202D08 001FFC68 4E 80 00 20 */ blr +/* 80202D08 001FFC68 4E 80 00 20 */ blr .global sub_80202d0c sub_80202d0c: @@ -1187,7 +1187,7 @@ lbl_80202D4C: /* 80202D78 001FFCD8 80 01 00 14 */ lwz r0, 0x14(r1) /* 80202D7C 001FFCDC 7C 08 03 A6 */ mtlr r0 /* 80202D80 001FFCE0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80202D84 001FFCE4 4E 80 00 20 */ blr +/* 80202D84 001FFCE4 4E 80 00 20 */ blr .global sub_80202d88 sub_80202d88: @@ -1201,7 +1201,7 @@ lbl_80202DA0: /* 80202DA0 001FFD00 80 01 00 14 */ lwz r0, 0x14(r1) /* 80202DA4 001FFD04 7C 08 03 A6 */ mtlr r0 /* 80202DA8 001FFD08 38 21 00 10 */ addi r1, r1, 0x10 -/* 80202DAC 001FFD0C 4E 80 00 20 */ blr +/* 80202DAC 001FFD0C 4E 80 00 20 */ blr .global sub_80202db0 sub_80202db0: @@ -1283,7 +1283,7 @@ lbl_80202E80: /* 80202EC0 001FFE20 80 01 00 24 */ lwz r0, 0x24(r1) /* 80202EC4 001FFE24 7C 08 03 A6 */ mtlr r0 /* 80202EC8 001FFE28 38 21 00 20 */ addi r1, r1, 0x20 -/* 80202ECC 001FFE2C 4E 80 00 20 */ blr +/* 80202ECC 001FFE2C 4E 80 00 20 */ blr .global sub_80202ed0 sub_80202ed0: @@ -1295,7 +1295,7 @@ sub_80202ed0: /* 80202EE4 001FFE44 90 E3 00 14 */ stw r7, 0x14(r3) /* 80202EE8 001FFE48 91 03 00 18 */ stw r8, 0x18(r3) /* 80202EEC 001FFE4C 91 23 00 1C */ stw r9, 0x1c(r3) -/* 80202EF0 001FFE50 4E 80 00 20 */ blr +/* 80202EF0 001FFE50 4E 80 00 20 */ blr .global __ct__Q212CMapUniverse18CMapObjectSortInfoFfiii6CColor6CColor __ct__Q212CMapUniverse18CMapObjectSortInfoFfiii6CColor6CColor: @@ -1307,7 +1307,7 @@ __ct__Q212CMapUniverse18CMapObjectSortInfoFfiii6CColor6CColor: /* 80202F08 001FFE68 90 03 00 10 */ stw r0, 0x10(r3) /* 80202F0C 001FFE6C 80 08 00 00 */ lwz r0, 0(r8) /* 80202F10 001FFE70 90 03 00 14 */ stw r0, 0x14(r3) -/* 80202F14 001FFE74 4E 80 00 20 */ blr +/* 80202F14 001FFE74 4E 80 00 20 */ blr .global sub_80202f18 sub_80202f18: @@ -1435,7 +1435,7 @@ lbl_802030C8: /* 802030E0 00200040 83 81 00 40 */ lwz r28, 0x40(r1) /* 802030E4 00200044 7C 08 03 A6 */ mtlr r0 /* 802030E8 00200048 38 21 00 60 */ addi r1, r1, 0x60 -/* 802030EC 0020004C 4E 80 00 20 */ blr +/* 802030EC 0020004C 4E 80 00 20 */ blr .global sub_802030f0 sub_802030f0: @@ -1466,7 +1466,7 @@ sub_802030f0: /* 80203150 002000B0 90 E3 00 0C */ stw r7, 0xc(r3) /* 80203154 002000B4 91 03 00 10 */ stw r8, 0x10(r3) /* 80203158 002000B8 91 23 00 14 */ stw r9, 0x14(r3) -/* 8020315C 002000BC 4E 80 00 20 */ blr +/* 8020315C 002000BC 4E 80 00 20 */ blr .global sub_80203160 sub_80203160: @@ -1535,7 +1535,7 @@ lbl_80203230: /* 80203234 00200194 80 01 00 34 */ lwz r0, 0x34(r1) /* 80203238 00200198 7C 08 03 A6 */ mtlr r0 /* 8020323C 0020019C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80203240 002001A0 4E 80 00 20 */ blr +/* 80203240 002001A0 4E 80 00 20 */ blr .global sub_80203244 sub_80203244: @@ -1594,7 +1594,7 @@ lbl_802032F8: /* 80203304 00200264 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80203308 00200268 7C 08 03 A6 */ mtlr r0 /* 8020330C 0020026C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80203310 00200270 4E 80 00 20 */ blr +/* 80203310 00200270 4E 80 00 20 */ blr .global sub_80203314 sub_80203314: @@ -1618,7 +1618,7 @@ lbl_80203340: /* 80203350 002002B0 83 C1 00 08 */ lwz r30, 8(r1) /* 80203354 002002B4 7C 08 03 A6 */ mtlr r0 /* 80203358 002002B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8020335C 002002BC 4E 80 00 20 */ blr +/* 8020335C 002002BC 4E 80 00 20 */ blr .global sub_80203360 sub_80203360: @@ -1649,7 +1649,7 @@ lbl_8020339C: /* 802033B8 00200318 83 A1 00 14 */ lwz r29, 0x14(r1) /* 802033BC 0020031C 7C 08 03 A6 */ mtlr r0 /* 802033C0 00200320 38 21 00 20 */ addi r1, r1, 0x20 -/* 802033C4 00200324 4E 80 00 20 */ blr +/* 802033C4 00200324 4E 80 00 20 */ blr .global sub_802033c8 sub_802033c8: @@ -1731,7 +1731,7 @@ lbl_802034C4: /* 802034D0 00200430 83 A1 00 24 */ lwz r29, 0x24(r1) /* 802034D4 00200434 7C 08 03 A6 */ mtlr r0 /* 802034D8 00200438 38 21 00 30 */ addi r1, r1, 0x30 -/* 802034DC 0020043C 4E 80 00 20 */ blr +/* 802034DC 0020043C 4E 80 00 20 */ blr .global sub_802034e0 sub_802034e0: @@ -1805,7 +1805,7 @@ lbl_802035D4: /* 802035E0 00200540 83 A1 00 14 */ lwz r29, 0x14(r1) /* 802035E4 00200544 7C 08 03 A6 */ mtlr r0 /* 802035E8 00200548 38 21 00 20 */ addi r1, r1, 0x20 -/* 802035EC 0020054C 4E 80 00 20 */ blr +/* 802035EC 0020054C 4E 80 00 20 */ blr .global sub_802035f0 sub_802035f0: @@ -1833,7 +1833,7 @@ sub_802035f0: /* 80203644 002005A4 90 E4 00 0C */ stw r7, 0xc(r4) /* 80203648 002005A8 91 04 00 10 */ stw r8, 0x10(r4) /* 8020364C 002005AC 91 24 00 14 */ stw r9, 0x14(r4) -/* 80203650 002005B0 4E 80 00 20 */ blr +/* 80203650 002005B0 4E 80 00 20 */ blr .global "__insertion_sort,Q24rstl17rmemory_allocator>,29CMapObjectSortInfoGreaterThan>__4rstlFQ24rstl162pointer_iterator,Q24rstl17rmemory_allocator>Q24rstl162pointer_iterator,Q24rstl17rmemory_allocator>,29CMapObjectSortInfoGreaterThan>__4rstlFQ24rstl162pointer_iterator,Q24rstl17rmemory_allocator>Q24rstl162pointer_iteratorFv" "__dt__36TObjOwnerDerivedFromIObj<9CMapWorld>Fv": @@ -1049,7 +1049,7 @@ lbl_8009F548: /* 8009F554 0009C4B4 83 C1 00 08 */ lwz r30, 8(r1) /* 8009F558 0009C4B8 7C 08 03 A6 */ mtlr r0 /* 8009F55C 0009C4BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009F560 0009C4C0 4E 80 00 20 */ blr +/* 8009F560 0009C4C0 4E 80 00 20 */ blr .global "GetIObjObjectFor__18TToken<9CMapWorld>FRCQ24rstl20auto_ptr<9CMapWorld>" "GetIObjObjectFor__18TToken<9CMapWorld>FRCQ24rstl20auto_ptr<9CMapWorld>": @@ -1063,7 +1063,7 @@ lbl_8009F548: /* 8009F580 0009C4E0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8009F584 0009C4E4 7C 08 03 A6 */ mtlr r0 /* 8009F588 0009C4E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009F58C 0009C4EC 4E 80 00 20 */ blr +/* 8009F58C 0009C4EC 4E 80 00 20 */ blr .global "GetNewDerivedObject__36TObjOwnerDerivedFromIObj<9CMapWorld>FRCQ24rstl20auto_ptr<9CMapWorld>" "GetNewDerivedObject__36TObjOwnerDerivedFromIObj<9CMapWorld>FRCQ24rstl20auto_ptr<9CMapWorld>": @@ -1106,7 +1106,7 @@ lbl_8009F600: /* 8009F61C 0009C57C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009F620 0009C580 7C 08 03 A6 */ mtlr r0 /* 8009F624 0009C584 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009F628 0009C588 4E 80 00 20 */ blr +/* 8009F628 0009C588 4E 80 00 20 */ blr .global ClearTraversedFlags__9CMapWorldCFv ClearTraversedFlags__9CMapWorldCFv: @@ -1124,7 +1124,7 @@ lbl_8009F644: .global sub_8009f650 sub_8009f650: -/* 8009F650 0009C5B0 4E 80 00 20 */ blr +/* 8009F650 0009C5B0 4E 80 00 20 */ blr .global ConstrainToWorldVolume__9CMapWorldCFRC9CVector3fRC9CVector3f ConstrainToWorldVolume__9CMapWorldCFRC9CVector3fRC9CVector3f: @@ -1261,7 +1261,7 @@ lbl_8009F80C: /* 8009F84C 0009C7AC 83 A1 00 54 */ lwz r29, 0x54(r1) /* 8009F850 0009C7B0 7C 08 03 A6 */ mtlr r0 /* 8009F854 0009C7B4 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 8009F858 0009C7B8 4E 80 00 20 */ blr +/* 8009F858 0009C7B8 4E 80 00 20 */ blr .global RecalculateWorldSphere__9CMapWorldCFRC13CMapWorldInfoRC6IWorld RecalculateWorldSphere__9CMapWorldCFRC13CMapWorldInfoRC6IWorld: @@ -1449,7 +1449,7 @@ lbl_8009FAEC: /* 8009FAF8 0009CA58 80 01 00 F4 */ lwz r0, 0xf4(r1) /* 8009FAFC 0009CA5C 7C 08 03 A6 */ mtlr r0 /* 8009FB00 0009CA60 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 8009FB04 0009CA64 4E 80 00 20 */ blr +/* 8009FB04 0009CA64 4E 80 00 20 */ blr .global "DrawAreas__9CMapWorldCFRCQ29CMapWorld18CMapWorldDrawParmsiRCQ24rstl64vectorb" "DrawAreas__9CMapWorldCFRCQ29CMapWorld18CMapWorldDrawParmsiRCQ24rstl64vectorb": @@ -1484,7 +1484,7 @@ lbl_8009FAEC: /* 8009FB78 0009CAD8 7C EF 3B 78 */ mr r15, r7 /* 8009FB7C 0009CADC 81 8C 00 68 */ lwz r12, 0x68(r12) /* 8009FB80 0009CAE0 7D 89 03 A6 */ mtctr r12 -/* 8009FB84 0009CAE4 4E 80 04 21 */ bctrl +/* 8009FB84 0009CAE4 4E 80 04 21 */ bctrl /* 8009FB88 0009CAE8 C0 22 8C 30 */ lfs f1, lbl_805AA950@sda21(r2) /* 8009FB8C 0009CAEC 38 60 00 05 */ li r3, 5 /* 8009FB90 0009CAF0 48 26 B8 49 */ bl SetLineWidth__9CGraphicsFf13ERglTexOffset @@ -2154,7 +2154,7 @@ lbl_800A0500: /* 800A0520 0009D480 81 83 00 00 */ lwz r12, 0(r3) /* 800A0524 0009D484 81 8C 00 30 */ lwz r12, 0x30(r12) /* 800A0528 0009D488 7D 89 03 A6 */ mtctr r12 -/* 800A052C 0009D48C 4E 80 04 21 */ bctrl +/* 800A052C 0009D48C 4E 80 04 21 */ bctrl lbl_800A0530: /* 800A0530 0009D490 56 C0 06 3F */ clrlwi. r0, r22, 0x18 /* 800A0534 0009D494 41 82 00 0C */ beq lbl_800A0540 @@ -2252,7 +2252,7 @@ lbl_800A0684: /* 800A0688 0009D5E8 81 83 00 00 */ lwz r12, 0(r3) /* 800A068C 0009D5EC 81 8C 00 30 */ lwz r12, 0x30(r12) /* 800A0690 0009D5F0 7D 89 03 A6 */ mtctr r12 -/* 800A0694 0009D5F4 4E 80 04 21 */ bctrl +/* 800A0694 0009D5F4 4E 80 04 21 */ bctrl /* 800A0698 0009D5F8 C0 3F 00 10 */ lfs f1, 0x10(r31) /* 800A069C 0009D5FC 7E 43 93 78 */ mr r3, r18 /* 800A06A0 0009D600 7F A4 EB 78 */ mr r4, r29 @@ -2292,7 +2292,7 @@ lbl_800A06B8: /* 800A0724 0009D684 81 83 00 00 */ lwz r12, 0(r3) /* 800A0728 0009D688 81 8C 00 30 */ lwz r12, 0x30(r12) /* 800A072C 0009D68C 7D 89 03 A6 */ mtctr r12 -/* 800A0730 0009D690 4E 80 04 21 */ bctrl +/* 800A0730 0009D690 4E 80 04 21 */ bctrl /* 800A0734 0009D694 3C 80 2A AB */ lis r4, 0x2AAAAAAB@ha /* 800A0738 0009D698 20 72 00 02 */ subfic r3, r18, 2 /* 800A073C 0009D69C 38 84 AA AB */ addi r4, r4, 0x2AAAAAAB@l @@ -2360,7 +2360,7 @@ lbl_800A07D0: /* 800A081C 0009D77C 80 01 05 D4 */ lwz r0, 0x5d4(r1) /* 800A0820 0009D780 7C 08 03 A6 */ mtlr r0 /* 800A0824 0009D784 38 21 05 D0 */ addi r1, r1, 0x5d0 -/* 800A0828 0009D788 4E 80 00 20 */ blr +/* 800A0828 0009D788 4E 80 00 20 */ blr .global IsMapAreaValid__9CMapWorldCFRC6IWorldib IsMapAreaValid__9CMapWorldCFRC6IWorldib: @@ -2380,11 +2380,11 @@ IsMapAreaValid__9CMapWorldCFRC6IWorldib: /* 800A0860 0009D7C0 93 E1 00 08 */ stw r31, 8(r1) /* 800A0864 0009D7C4 81 8C 00 20 */ lwz r12, 0x20(r12) /* 800A0868 0009D7C8 7D 89 03 A6 */ mtctr r12 -/* 800A086C 0009D7CC 4E 80 04 21 */ bctrl +/* 800A086C 0009D7CC 4E 80 04 21 */ bctrl /* 800A0870 0009D7D0 81 83 00 00 */ lwz r12, 0(r3) /* 800A0874 0009D7D4 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 800A0878 0009D7D8 7D 89 03 A6 */ mtctr r12 -/* 800A087C 0009D7DC 4E 80 04 21 */ bctrl +/* 800A087C 0009D7DC 4E 80 04 21 */ bctrl /* 800A0880 0009D7E0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800A0884 0009D7E4 40 82 00 0C */ bne lbl_800A0890 /* 800A0888 0009D7E8 38 60 00 00 */ li r3, 0 @@ -2408,7 +2408,7 @@ lbl_800A08B8: /* 800A08C4 0009D824 83 A1 00 14 */ lwz r29, 0x14(r1) /* 800A08C8 0009D828 7C 08 03 A6 */ mtlr r0 /* 800A08CC 0009D82C 38 21 00 20 */ addi r1, r1, 0x20 -/* 800A08D0 0009D830 4E 80 00 20 */ blr +/* 800A08D0 0009D830 4E 80 00 20 */ blr .global "DoBFS__9CMapWorldCFRC6IWorldiiffbRQ24rstl64vector" "DoBFS__9CMapWorldCFRC6IWorldiiffbRQ24rstl64vector": @@ -2497,7 +2497,7 @@ lbl_800A09C8: /* 800A0A0C 0009D96C 90 01 00 0C */ stw r0, 0xc(r1) /* 800A0A10 0009D970 81 8C 00 20 */ lwz r12, 0x20(r12) /* 800A0A14 0009D974 7D 89 03 A6 */ mtctr r12 -/* 800A0A18 0009D978 4E 80 04 21 */ bctrl +/* 800A0A18 0009D978 4E 80 04 21 */ bctrl /* 800A0A1C 0009D97C 3B 40 00 00 */ li r26, 0 /* 800A0A20 0009D980 7C 7B 1B 78 */ mr r27, r3 /* 800A0A24 0009D984 48 00 00 E0 */ b lbl_800A0B04 @@ -2508,7 +2508,7 @@ lbl_800A0A28: /* 800A0A34 0009D994 38 61 00 08 */ addi r3, r1, 8 /* 800A0A38 0009D998 81 8C 00 18 */ lwz r12, 0x18(r12) /* 800A0A3C 0009D99C 7D 89 03 A6 */ mtctr r12 -/* 800A0A40 0009D9A0 4E 80 04 21 */ bctrl +/* 800A0A40 0009D9A0 4E 80 04 21 */ bctrl /* 800A0A44 0009D9A4 83 C1 00 08 */ lwz r30, 8(r1) /* 800A0A48 0009D9A8 7E A3 AB 78 */ mr r3, r21 /* 800A0A4C 0009D9AC 7E C4 B3 78 */ mr r4, r22 @@ -2566,7 +2566,7 @@ lbl_800A0B04: /* 800A0B08 0009DA68 81 9B 00 00 */ lwz r12, 0(r27) /* 800A0B0C 0009DA6C 81 8C 00 14 */ lwz r12, 0x14(r12) /* 800A0B10 0009DA70 7D 89 03 A6 */ mtctr r12 -/* 800A0B14 0009DA74 4E 80 04 21 */ bctrl +/* 800A0B14 0009DA74 4E 80 04 21 */ bctrl /* 800A0B18 0009DA78 7C 1A 18 00 */ cmpw r26, r3 /* 800A0B1C 0009DA7C 41 80 FF 0C */ blt lbl_800A0A28 lbl_800A0B20: @@ -2584,7 +2584,7 @@ lbl_800A0B2C: /* 800A0B48 0009DAA8 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 800A0B4C 0009DAAC 7C 08 03 A6 */ mtlr r0 /* 800A0B50 0009DAB0 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 800A0B54 0009DAB4 4E 80 00 20 */ blr +/* 800A0B54 0009DAB4 4E 80 00 20 */ blr .global Draw__9CMapWorldCFRCQ29CMapWorld18CMapWorldDrawParmsiiffb Draw__9CMapWorldCFRCQ29CMapWorld18CMapWorldDrawParmsiiffb: @@ -2711,11 +2711,11 @@ lbl_800A0CF0: /* 800A0D14 0009DC74 D8 01 00 40 */ stfd f0, 0x40(r1) /* 800A0D18 0009DC78 83 C1 00 44 */ lwz r30, 0x44(r1) /* 800A0D1C 0009DC7C 7D 89 03 A6 */ mtctr r12 -/* 800A0D20 0009DC80 4E 80 04 21 */ bctrl +/* 800A0D20 0009DC80 4E 80 04 21 */ bctrl /* 800A0D24 0009DC84 81 83 00 00 */ lwz r12, 0(r3) /* 800A0D28 0009DC88 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 800A0D2C 0009DC8C 7D 89 03 A6 */ mtctr r12 -/* 800A0D30 0009DC90 4E 80 04 21 */ bctrl +/* 800A0D30 0009DC90 4E 80 04 21 */ bctrl /* 800A0D34 0009DC94 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800A0D38 0009DC98 41 82 00 5C */ beq lbl_800A0D94 /* 800A0D3C 0009DC9C 80 B9 00 2C */ lwz r5, 0x2c(r25) @@ -2773,7 +2773,7 @@ lbl_800A0DEC: /* 800A0DF8 0009DD58 80 01 00 84 */ lwz r0, 0x84(r1) /* 800A0DFC 0009DD5C 7C 08 03 A6 */ mtlr r0 /* 800A0E00 0009DD60 38 21 00 80 */ addi r1, r1, 0x80 -/* 800A0E04 0009DD64 4E 80 00 20 */ blr +/* 800A0E04 0009DD64 4E 80 00 20 */ blr .global GetVisibleAreas__9CMapWorldCFRC6IWorldRC13CMapWorldInfo GetVisibleAreas__9CMapWorldCFRC6IWorldRC13CMapWorldInfo: @@ -2917,7 +2917,7 @@ lbl_800A0FEC: /* 800A0FF0 0009DF50 80 01 00 64 */ lwz r0, 0x64(r1) /* 800A0FF4 0009DF54 7C 08 03 A6 */ mtlr r0 /* 800A0FF8 0009DF58 38 21 00 60 */ addi r1, r1, 0x60 -/* 800A0FFC 0009DF5C 4E 80 00 20 */ blr +/* 800A0FFC 0009DF5C 4E 80 00 20 */ blr .global GetCurrentMapAreaDepth__9CMapWorldCFRC6IWorldi GetCurrentMapAreaDepth__9CMapWorldCFRC6IWorldi: @@ -3001,7 +3001,7 @@ lbl_800A1108: /* 800A1114 0009E074 83 A1 00 44 */ lwz r29, 0x44(r1) /* 800A1118 0009E078 7C 08 03 A6 */ mtlr r0 /* 800A111C 0009E07C 38 21 00 50 */ addi r1, r1, 0x50 -/* 800A1120 0009E080 4E 80 00 20 */ blr +/* 800A1120 0009E080 4E 80 00 20 */ blr .global MoveMapAreaToList__9CMapWorldFPQ29CMapWorld12CMapAreaDataQ29CMapWorld12EMapAreaList MoveMapAreaToList__9CMapWorldFPQ29CMapWorld12CMapAreaDataQ29CMapWorld12EMapAreaList: @@ -3031,7 +3031,7 @@ lbl_800A1168: /* 800A1170 0009E0D0 90 04 00 14 */ stw r0, 0x14(r4) /* 800A1174 0009E0D4 90 A4 00 10 */ stw r5, 0x10(r4) /* 800A1178 0009E0D8 7C 86 19 2E */ stwx r4, r6, r3 -/* 800A117C 0009E0DC 4E 80 00 20 */ blr +/* 800A117C 0009E0DC 4E 80 00 20 */ blr .global IsMapAreasStreaming__9CMapWorldCFv IsMapAreasStreaming__9CMapWorldCFv: @@ -3072,7 +3072,7 @@ lbl_800A11DC: /* 800A11F8 0009E158 83 81 00 10 */ lwz r28, 0x10(r1) /* 800A11FC 0009E15C 7C 08 03 A6 */ mtlr r0 /* 800A1200 0009E160 38 21 00 20 */ addi r1, r1, 0x20 -/* 800A1204 0009E164 4E 80 00 20 */ blr +/* 800A1204 0009E164 4E 80 00 20 */ blr .global SetWhichMapAreasLoaded__9CMapWorldFRC6IWorldii SetWhichMapAreasLoaded__9CMapWorldFRC6IWorldii: @@ -3175,7 +3175,7 @@ lbl_800A135C: /* 800A1360 0009E2C0 80 01 00 44 */ lwz r0, 0x44(r1) /* 800A1364 0009E2C4 7C 08 03 A6 */ mtlr r0 /* 800A1368 0009E2C8 38 21 00 40 */ addi r1, r1, 0x40 -/* 800A136C 0009E2CC 4E 80 00 20 */ blr +/* 800A136C 0009E2CC 4E 80 00 20 */ blr .global "IsMapAreaInBFSInfoVector__9CMapWorldCFPCQ29CMapWorld12CMapAreaDataRCQ24rstl64vector" "IsMapAreaInBFSInfoVector__9CMapWorldCFPCQ29CMapWorld12CMapAreaDataRCQ24rstl64vector": @@ -3192,14 +3192,14 @@ lbl_800A1384: /* 800A1394 0009E2F4 7C 04 00 40 */ cmplw r4, r0 /* 800A1398 0009E2F8 40 82 00 0C */ bne lbl_800A13A4 /* 800A139C 0009E2FC 38 60 00 01 */ li r3, 1 -/* 800A13A0 0009E300 4E 80 00 20 */ blr +/* 800A13A0 0009E300 4E 80 00 20 */ blr lbl_800A13A4: /* 800A13A4 0009E304 38 E7 00 10 */ addi r7, r7, 0x10 lbl_800A13A8: /* 800A13A8 0009E308 7C 07 30 40 */ cmplw r7, r6 /* 800A13AC 0009E30C 40 82 FF D8 */ bne lbl_800A1384 /* 800A13B0 0009E310 38 60 00 00 */ li r3, 0 -/* 800A13B4 0009E314 4E 80 00 20 */ blr +/* 800A13B4 0009E314 4E 80 00 20 */ blr .global GetMapArea__9CMapWorldCFi GetMapArea__9CMapWorldCFi: @@ -3213,7 +3213,7 @@ GetMapArea__9CMapWorldCFi: /* 800A13D4 0009E334 80 01 00 14 */ lwz r0, 0x14(r1) /* 800A13D8 0009E338 7C 08 03 A6 */ mtlr r0 /* 800A13DC 0009E33C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A13E0 0009E340 4E 80 00 20 */ blr +/* 800A13E0 0009E340 4E 80 00 20 */ blr .global __dt__9CMapWorldFv __dt__9CMapWorldFv: @@ -3293,7 +3293,7 @@ lbl_800A14D8: /* 800A14E4 0009E444 83 C1 00 18 */ lwz r30, 0x18(r1) /* 800A14E8 0009E448 7C 08 03 A6 */ mtlr r0 /* 800A14EC 0009E44C 38 21 00 20 */ addi r1, r1, 0x20 -/* 800A14F0 0009E450 4E 80 00 20 */ blr +/* 800A14F0 0009E450 4E 80 00 20 */ blr .global sub_800a14f4 sub_800a14f4: @@ -3349,7 +3349,7 @@ lbl_800A1590: /* 800A15A4 0009E504 83 81 00 20 */ lwz r28, 0x20(r1) /* 800A15A8 0009E508 7C 08 03 A6 */ mtlr r0 /* 800A15AC 0009E50C 38 21 00 30 */ addi r1, r1, 0x30 -/* 800A15B0 0009E510 4E 80 00 20 */ blr +/* 800A15B0 0009E510 4E 80 00 20 */ blr .global __ct__9CMapWorldFR12CInputStream __ct__9CMapWorldFR12CInputStream: @@ -3532,7 +3532,7 @@ lbl_800A17E8: /* 800A1828 0009E788 80 01 00 64 */ lwz r0, 0x64(r1) /* 800A182C 0009E78C 7C 08 03 A6 */ mtlr r0 /* 800A1830 0009E790 38 21 00 60 */ addi r1, r1, 0x60 -/* 800A1834 0009E794 4E 80 00 20 */ blr +/* 800A1834 0009E794 4E 80 00 20 */ blr .global sub_800a1838 sub_800a1838: @@ -3607,7 +3607,7 @@ lbl_800A1918: /* 800A1920 0009E880 83 C1 00 18 */ lwz r30, 0x18(r1) /* 800A1924 0009E884 7C 08 03 A6 */ mtlr r0 /* 800A1928 0009E888 38 21 00 20 */ addi r1, r1, 0x20 -/* 800A192C 0009E88C 4E 80 00 20 */ blr +/* 800A192C 0009E88C 4E 80 00 20 */ blr .global __ct__Q29CMapWorld15CMapAreaBFSInfoFiiff __ct__Q29CMapWorld15CMapAreaBFSInfoFiiff: @@ -3615,7 +3615,7 @@ __ct__Q29CMapWorld15CMapAreaBFSInfoFiiff: /* 800A1934 0009E894 90 A3 00 04 */ stw r5, 4(r3) /* 800A1938 0009E898 D0 23 00 08 */ stfs f1, 8(r3) /* 800A193C 0009E89C D0 43 00 0C */ stfs f2, 0xc(r3) -/* 800A1940 0009E8A0 4E 80 00 20 */ blr +/* 800A1940 0009E8A0 4E 80 00 20 */ blr .global __ct__Q29CMapWorld18CMapWorldDrawParmsFfffffRC13CStateManagerRC12CTransform4fRC12CTransform4fRC6IWorldRC13CMapWorldInfofb __ct__Q29CMapWorld18CMapWorldDrawParmsFfffffRC13CStateManagerRC12CTransform4fRC12CTransform4fRC6IWorldRC13CMapWorldInfofb: @@ -3635,7 +3635,7 @@ __ct__Q29CMapWorld18CMapWorldDrawParmsFfffffRC13CStateManagerRC12CTransform4fRC1 /* 800A1978 0009E8D8 D1 03 00 30 */ stfs f8, 0x30(r3) /* 800A197C 0009E8DC D0 03 00 34 */ stfs f0, 0x34(r3) /* 800A1980 0009E8E0 99 23 00 38 */ stb r9, 0x38(r3) -/* 800A1984 0009E8E4 4E 80 00 20 */ blr +/* 800A1984 0009E8E4 4E 80 00 20 */ blr .global GetMapArea__Q29CMapWorld12CMapAreaDataCFv GetMapArea__Q29CMapWorld12CMapAreaDataCFv: @@ -3664,7 +3664,7 @@ lbl_800A19D4: /* 800A19DC 0009E93C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800A19E0 0009E940 7C 08 03 A6 */ mtlr r0 /* 800A19E4 0009E944 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A19E8 0009E948 4E 80 00 20 */ blr +/* 800A19E8 0009E948 4E 80 00 20 */ blr .global IsLoaded__Q29CMapWorld12CMapAreaDataCFv IsLoaded__Q29CMapWorld12CMapAreaDataCFv: @@ -3704,7 +3704,7 @@ lbl_800A1A5C: /* 800A1A60 0009E9C0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800A1A64 0009E9C4 7C 08 03 A6 */ mtlr r0 /* 800A1A68 0009E9C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A1A6C 0009E9CC 4E 80 00 20 */ blr +/* 800A1A6C 0009E9CC 4E 80 00 20 */ blr .global Unlock__Q29CMapWorld12CMapAreaDataFv Unlock__Q29CMapWorld12CMapAreaDataFv: @@ -3718,7 +3718,7 @@ Unlock__Q29CMapWorld12CMapAreaDataFv: /* 800A1A8C 0009E9EC 80 01 00 14 */ lwz r0, 0x14(r1) /* 800A1A90 0009E9F0 7C 08 03 A6 */ mtlr r0 /* 800A1A94 0009E9F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A1A98 0009E9F8 4E 80 00 20 */ blr +/* 800A1A98 0009E9F8 4E 80 00 20 */ blr .global Lock__Q29CMapWorld12CMapAreaDataFv Lock__Q29CMapWorld12CMapAreaDataFv: @@ -3730,7 +3730,7 @@ Lock__Q29CMapWorld12CMapAreaDataFv: /* 800A1AB0 0009EA10 80 01 00 14 */ lwz r0, 0x14(r1) /* 800A1AB4 0009EA14 7C 08 03 A6 */ mtlr r0 /* 800A1AB8 0009EA18 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A1ABC 0009EA1C 4E 80 00 20 */ blr +/* 800A1ABC 0009EA1C 4E 80 00 20 */ blr .global __ct__Q29CMapWorld12CMapAreaDataFUiQ29CMapWorld12EMapAreaListPQ29CMapWorld12CMapAreaData __ct__Q29CMapWorld12CMapAreaDataFUiQ29CMapWorld12EMapAreaListPQ29CMapWorld12CMapAreaData: @@ -3755,7 +3755,7 @@ __ct__Q29CMapWorld12CMapAreaDataFUiQ29CMapWorld12EMapAreaListPQ29CMapWorld12CMap /* 800A1B08 0009EA68 81 84 00 00 */ lwz r12, 0(r4) /* 800A1B0C 0009EA6C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800A1B10 0009EA70 7D 89 03 A6 */ mtctr r12 -/* 800A1B14 0009EA74 4E 80 04 21 */ bctrl +/* 800A1B14 0009EA74 4E 80 04 21 */ bctrl /* 800A1B18 0009EA78 3B BC 00 04 */ addi r29, r28, 4 /* 800A1B1C 0009EA7C 38 81 00 08 */ addi r4, r1, 8 /* 800A1B20 0009EA80 7F A3 EB 78 */ mr r3, r29 @@ -3775,7 +3775,7 @@ __ct__Q29CMapWorld12CMapAreaDataFUiQ29CMapWorld12EMapAreaListPQ29CMapWorld12CMap /* 800A1B58 0009EAB8 80 01 00 34 */ lwz r0, 0x34(r1) /* 800A1B5C 0009EABC 7C 08 03 A6 */ mtlr r0 /* 800A1B60 0009EAC0 38 21 00 30 */ addi r1, r1, 0x30 -/* 800A1B64 0009EAC4 4E 80 00 20 */ blr +/* 800A1B64 0009EAC4 4E 80 00 20 */ blr .global __ct__Q29CMapWorld18CMapObjectSortInfoFfiQ39CMapWorld18CMapObjectSortInfo11EObjectCodei6CColor6CColor __ct__Q29CMapWorld18CMapObjectSortInfoFfiQ39CMapWorld18CMapObjectSortInfo11EObjectCodei6CColor6CColor: @@ -3787,7 +3787,7 @@ __ct__Q29CMapWorld18CMapObjectSortInfoFfiQ39CMapWorld18CMapObjectSortInfo11EObje /* 800A1B7C 0009EADC 90 03 00 0C */ stw r0, 0xc(r3) /* 800A1B80 0009EAE0 80 08 00 00 */ lwz r0, 0(r8) /* 800A1B84 0009EAE4 90 03 00 10 */ stw r0, 0x10(r3) -/* 800A1B88 0009EAE8 4E 80 00 20 */ blr +/* 800A1B88 0009EAE8 4E 80 00 20 */ blr .global sub_800a1b8c sub_800a1b8c: @@ -3948,7 +3948,7 @@ lbl_800A1DB0: /* 800A1DC8 0009ED28 83 81 00 40 */ lwz r28, 0x40(r1) /* 800A1DCC 0009ED2C 7C 08 03 A6 */ mtlr r0 /* 800A1DD0 0009ED30 38 21 00 60 */ addi r1, r1, 0x60 -/* 800A1DD4 0009ED34 4E 80 00 20 */ blr +/* 800A1DD4 0009ED34 4E 80 00 20 */ blr .global sub_800a1dd8 sub_800a1dd8: @@ -3975,7 +3975,7 @@ sub_800a1dd8: /* 800A1E28 0009ED88 90 C3 00 08 */ stw r6, 8(r3) /* 800A1E2C 0009ED8C 90 E3 00 0C */ stw r7, 0xc(r3) /* 800A1E30 0009ED90 91 03 00 10 */ stw r8, 0x10(r3) -/* 800A1E34 0009ED94 4E 80 00 20 */ blr +/* 800A1E34 0009ED94 4E 80 00 20 */ blr .global "reserve__Q24rstl64vectorFi" "reserve__Q24rstl64vectorFi": @@ -4052,7 +4052,7 @@ lbl_800A1F20: /* 800A1F2C 0009EE8C 83 A1 00 24 */ lwz r29, 0x24(r1) /* 800A1F30 0009EE90 7C 08 03 A6 */ mtlr r0 /* 800A1F34 0009EE94 38 21 00 30 */ addi r1, r1, 0x30 -/* 800A1F38 0009EE98 4E 80 00 20 */ blr +/* 800A1F38 0009EE98 4E 80 00 20 */ blr .global "reserve__Q24rstl61vectorFi" "reserve__Q24rstl61vectorFi": @@ -4140,7 +4140,7 @@ lbl_800A2054: /* 800A2058 0009EFB8 80 01 00 44 */ lwz r0, 0x44(r1) /* 800A205C 0009EFBC 7C 08 03 A6 */ mtlr r0 /* 800A2060 0009EFC0 38 21 00 40 */ addi r1, r1, 0x40 -/* 800A2064 0009EFC4 4E 80 00 20 */ blr +/* 800A2064 0009EFC4 4E 80 00 20 */ blr .global sub_800a2068 sub_800a2068: @@ -4211,7 +4211,7 @@ lbl_800A2138: /* 800A2144 0009F0A4 83 A1 00 24 */ lwz r29, 0x24(r1) /* 800A2148 0009F0A8 7C 08 03 A6 */ mtlr r0 /* 800A214C 0009F0AC 38 21 00 30 */ addi r1, r1, 0x30 -/* 800A2150 0009F0B0 4E 80 00 20 */ blr +/* 800A2150 0009F0B0 4E 80 00 20 */ blr .global "reserve__Q24rstl67vectorFi" "reserve__Q24rstl67vectorFi": @@ -4291,7 +4291,7 @@ lbl_800A2248: /* 800A2254 0009F1B4 83 A1 00 24 */ lwz r29, 0x24(r1) /* 800A2258 0009F1B8 7C 08 03 A6 */ mtlr r0 /* 800A225C 0009F1BC 38 21 00 30 */ addi r1, r1, 0x30 -/* 800A2260 0009F1C0 4E 80 00 20 */ blr +/* 800A2260 0009F1C0 4E 80 00 20 */ blr .global "reserve__Q24rstl45vector<9CVector2f,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl45vector<9CVector2f,Q24rstl17rmemory_allocator>Fi": @@ -4364,7 +4364,7 @@ lbl_800A233C: /* 800A2348 0009F2A8 83 A1 00 24 */ lwz r29, 0x24(r1) /* 800A234C 0009F2AC 7C 08 03 A6 */ mtlr r0 /* 800A2350 0009F2B0 38 21 00 30 */ addi r1, r1, 0x30 -/* 800A2354 0009F2B4 4E 80 00 20 */ blr +/* 800A2354 0009F2B4 4E 80 00 20 */ blr .global "__sort3__4rstlFRQ29CMapWorld18CMapObjectSortInfoRQ29CMapWorld18CMapObjectSortInfoRQ29CMapWorld18CMapObjectSortInfo29CMapObjectSortInfoGreaterThan" "__sort3__4rstlFRQ29CMapWorld18CMapObjectSortInfoRQ29CMapWorld18CMapObjectSortInfoRQ29CMapWorld18CMapObjectSortInfo29CMapObjectSortInfoGreaterThan": @@ -4429,7 +4429,7 @@ lbl_800A2420: /* 800A2430 0009F390 54 C6 0F FE */ srwi r6, r6, 0x1f lbl_800A2434: /* 800A2434 0009F394 54 C6 06 3F */ clrlwi. r6, r6, 0x18 -/* 800A2438 0009F398 4D 82 00 20 */ beqlr +/* 800A2438 0009F398 4D 82 00 20 */ beqlr /* 800A243C 0009F39C C0 25 00 00 */ lfs f1, 0(r5) /* 800A2440 0009F3A0 54 0A 00 1E */ rlwinm r10, r0, 0, 0, 0xf /* 800A2444 0009F3A4 80 E5 00 04 */ lwz r7, 4(r5) @@ -4478,14 +4478,14 @@ lbl_800A24B0: /* 800A24E8 0009F448 90 03 00 08 */ stw r0, 8(r3) /* 800A24EC 0009F44C 91 03 00 0C */ stw r8, 0xc(r3) /* 800A24F0 0009F450 91 23 00 10 */ stw r9, 0x10(r3) -/* 800A24F4 0009F454 4E 80 00 20 */ blr +/* 800A24F4 0009F454 4E 80 00 20 */ blr lbl_800A24F8: /* 800A24F8 0009F458 D0 24 00 00 */ stfs f1, 0(r4) /* 800A24FC 0009F45C 90 E4 00 04 */ stw r7, 4(r4) /* 800A2500 0009F460 90 04 00 08 */ stw r0, 8(r4) /* 800A2504 0009F464 91 04 00 0C */ stw r8, 0xc(r4) /* 800A2508 0009F468 91 24 00 10 */ stw r9, 0x10(r4) -/* 800A250C 0009F46C 4E 80 00 20 */ blr +/* 800A250C 0009F46C 4E 80 00 20 */ blr .global "__insertion_sort,Q24rstl17rmemory_allocator>,29CMapObjectSortInfoGreaterThan>__4rstlFQ24rstl154pointer_iterator,Q24rstl17rmemory_allocator>Q24rstl154pointer_iterator,Q24rstl17rmemory_allocator>,29CMapObjectSortInfoGreaterThan>__4rstlFQ24rstl154pointer_iterator,Q24rstl17rmemory_allocator>Q24rstl154pointer_iterator,Q24rstl62vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,9TEditorId,Q24rstl73pair_sorter_finder,Q24rstl16less<9TEditorId>>>__4rstlFQ24rstl144pointer_iterator,Q24rstl62vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl144pointer_iterator,Q24rstl62vector,Q24rstl62vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,9TEditorId,Q24rstl73pair_sorter_finder,Q24rstl16less<9TEditorId>>>__4rstlFQ24rstl144pointer_iterator,Q24rstl62vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl144pointer_iterator,Q24rstl62vector,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl62vector,Q24rstl17rmemory_allocator>Fi": @@ -1939,7 +1939,7 @@ lbl_80169734: /* 80169740 001666A0 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80169744 001666A4 7C 08 03 A6 */ mtlr r0 /* 80169748 001666A8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8016974C 001666AC 4E 80 00 20 */ blr +/* 8016974C 001666AC 4E 80 00 20 */ blr .global sub_80169750 sub_80169750: @@ -1953,7 +1953,7 @@ sub_80169750: /* 8016976C 001666CC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80169770 001666D0 7C 08 03 A6 */ mtlr r0 /* 80169774 001666D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80169778 001666D8 4E 80 00 20 */ blr +/* 80169778 001666D8 4E 80 00 20 */ blr .global sub_8016977c sub_8016977c: @@ -1961,7 +1961,7 @@ sub_8016977c: /* 80169780 001666E0 54 80 18 38 */ slwi r0, r4, 3 /* 80169784 001666E4 7C 05 02 14 */ add r0, r5, r0 /* 80169788 001666E8 90 03 00 00 */ stw r0, 0(r3) -/* 8016978C 001666EC 4E 80 00 20 */ blr +/* 8016978C 001666EC 4E 80 00 20 */ blr .global sub_80169790 sub_80169790: @@ -1981,7 +1981,7 @@ sub_80169790: /* 801697C4 00166724 80 01 00 24 */ lwz r0, 0x24(r1) /* 801697C8 00166728 7C 08 03 A6 */ mtlr r0 /* 801697CC 0016672C 38 21 00 20 */ addi r1, r1, 0x20 -/* 801697D0 00166730 4E 80 00 20 */ blr +/* 801697D0 00166730 4E 80 00 20 */ blr .global sub_801697d4 sub_801697d4: @@ -1990,7 +1990,7 @@ sub_801697d4: /* 801697DC 0016673C 7C 03 00 50 */ subf r0, r3, r0 /* 801697E0 00166740 7C 00 1E 70 */ srawi r0, r0, 3 /* 801697E4 00166744 7C 60 01 94 */ addze r3, r0 -/* 801697E8 00166748 4E 80 00 20 */ blr +/* 801697E8 00166748 4E 80 00 20 */ blr .global sub_801697ec sub_801697ec: @@ -2037,7 +2037,7 @@ lbl_80169880: /* 80169884 001667E4 98 C4 00 04 */ stb r6, 4(r4) lbl_80169888: /* 80169888 001667E8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8016988C 001667EC 4E 80 00 20 */ blr +/* 8016988C 001667EC 4E 80 00 20 */ blr .global sub_80169890 sub_80169890: diff --git a/asm/MetroidPrime/CMappableObject.s b/asm/MetroidPrime/CMappableObject.s index 331cd3c8..7acb7cff 100644 --- a/asm/MetroidPrime/CMappableObject.s +++ b/asm/MetroidPrime/CMappableObject.s @@ -60,12 +60,12 @@ lbl_805A7374: # ROM: 0x3F4D14 .4byte 0x3F800000 -.section .bss +.section .bss .global lbl_8046C498 lbl_8046C498: .skip 0x60 - + .section .text, "ax" .global AdjustTransformForType__15CMappableObjectFv @@ -261,7 +261,7 @@ lbl_800E8A2C: /* 800E8A34 000E5994 83 C1 02 C8 */ lwz r30, 0x2c8(r1) /* 800E8A38 000E5998 7C 08 03 A6 */ mtlr r0 /* 800E8A3C 000E599C 38 21 02 D0 */ addi r1, r1, 0x2d0 -/* 800E8A40 000E59A0 4E 80 00 20 */ blr +/* 800E8A40 000E59A0 4E 80 00 20 */ blr .global GetIsVisibleToAutoMapper__15CMappableObjectFbRC13CMapWorldInfo GetIsVisibleToAutoMapper__15CMappableObjectFbRC13CMapWorldInfo: @@ -338,7 +338,7 @@ lbl_800E8B28: /* 800E8B34 000E5A94 83 A1 00 24 */ lwz r29, 0x24(r1) /* 800E8B38 000E5A98 7C 08 03 A6 */ mtlr r0 /* 800E8B3C 000E5A9C 38 21 00 30 */ addi r1, r1, 0x30 -/* 800E8B40 000E5AA0 4E 80 00 20 */ blr +/* 800E8B40 000E5AA0 4E 80 00 20 */ blr .global BuildSurfaceCenterPoint__15CMappableObjectCFi BuildSurfaceCenterPoint__15CMappableObjectCFi: @@ -433,7 +433,7 @@ lbl_800E8C7C: /* 800E8C80 000E5BE0 83 E1 00 4C */ lwz r31, 0x4c(r1) /* 800E8C84 000E5BE4 7C 08 03 A6 */ mtlr r0 /* 800E8C88 000E5BE8 38 21 00 50 */ addi r1, r1, 0x50 -/* 800E8C8C 000E5BEC 4E 80 00 20 */ blr +/* 800E8C8C 000E5BEC 4E 80 00 20 */ blr .global DrawDoorSurface__15CMappableObjectCFiRC13CMapWorldInfofib DrawDoorSurface__15CMappableObjectCFiRC13CMapWorldInfofib: @@ -508,7 +508,7 @@ lbl_800E8D08: /* 800E8D9C 000E5CFC 83 C1 00 18 */ lwz r30, 0x18(r1) /* 800E8DA0 000E5D00 7C 08 03 A6 */ mtlr r0 /* 800E8DA4 000E5D04 38 21 00 20 */ addi r1, r1, 0x20 -/* 800E8DA8 000E5D08 4E 80 00 20 */ blr +/* 800E8DA8 000E5D08 4E 80 00 20 */ blr .global Draw__15CMappableObjectCFiRC13CMapWorldInfofb Draw__15CMappableObjectCFiRC13CMapWorldInfofb: @@ -609,7 +609,7 @@ lbl_800E8EF8: /* 800E8F14 000E5E74 38 63 FC 10 */ addi r3, r3, lbl_803DFC10@l /* 800E8F18 000E5E78 7C 03 00 2E */ lwzx r0, r3, r0 /* 800E8F1C 000E5E7C 7C 09 03 A6 */ mtctr r0 -/* 800E8F20 000E5E80 4E 80 04 20 */ bctr +/* 800E8F20 000E5E80 4E 80 04 20 */ bctr .global lbl_800E8F24 lbl_800E8F24: /* 800E8F24 000E5E84 38 80 00 FF */ li r4, 0xff @@ -711,7 +711,7 @@ lbl_800E9044: /* 800E9060 000E5FC0 81 84 00 00 */ lwz r12, 0(r4) /* 800E9064 000E5FC4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800E9068 000E5FC8 7D 89 03 A6 */ mtctr r12 -/* 800E906C 000E5FCC 4E 80 04 21 */ bctrl +/* 800E906C 000E5FCC 4E 80 04 21 */ bctrl /* 800E9070 000E5FD0 3B 61 00 48 */ addi r27, r1, 0x48 /* 800E9074 000E5FD4 38 81 00 28 */ addi r4, r1, 0x28 /* 800E9078 000E5FD8 7F 63 DB 78 */ mr r3, r27 @@ -782,7 +782,7 @@ lbl_800E9164: /* 800E9178 000E60D8 80 01 00 94 */ lwz r0, 0x94(r1) /* 800E917C 000E60DC 7C 08 03 A6 */ mtlr r0 /* 800E9180 000E60E0 38 21 00 90 */ addi r1, r1, 0x90 -/* 800E9184 000E60E4 4E 80 00 20 */ blr +/* 800E9184 000E60E4 4E 80 00 20 */ blr .global PostConstruct__15CMappableObjectFPCv PostConstruct__15CMappableObjectFPCv: @@ -817,7 +817,7 @@ PostConstruct__15CMappableObjectFPCv: /* 800E91F8 000E6158 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 800E91FC 000E615C 7C 08 03 A6 */ mtlr r0 /* 800E9200 000E6160 38 21 00 40 */ addi r1, r1, 0x40 -/* 800E9204 000E6164 4E 80 00 20 */ blr +/* 800E9204 000E6164 4E 80 00 20 */ blr .global GetDoorColors__15CMappableObjectCFiRC13CMapWorldInfo GetDoorColors__15CMappableObjectCFiRC13CMapWorldInfo: @@ -870,7 +870,7 @@ lbl_800E92A4: /* 800E92BC 000E621C 38 63 FC 3C */ addi r3, r3, lbl_803DFC3C@l /* 800E92C0 000E6220 7C 03 00 2E */ lwzx r0, r3, r0 /* 800E92C4 000E6224 7C 09 03 A6 */ mtctr r0 -/* 800E92C8 000E6228 4E 80 04 20 */ bctr +/* 800E92C8 000E6228 4E 80 04 20 */ bctr .global lbl_800E92CC lbl_800E92CC: /* 800E92CC 000E622C 38 80 00 01 */ li r4, 1 @@ -994,7 +994,7 @@ lbl_800E9424: /* 800E9458 000E63B8 83 A1 00 34 */ lwz r29, 0x34(r1) /* 800E945C 000E63BC 7C 08 03 A6 */ mtlr r0 /* 800E9460 000E63C0 38 21 00 60 */ addi r1, r1, 0x60 -/* 800E9464 000E63C4 4E 80 00 20 */ blr +/* 800E9464 000E63C4 4E 80 00 20 */ blr .global ReadAutomapperTweaks__15CMappableObjectFRC16CTweakAutoMapper ReadAutomapperTweaks__15CMappableObjectFRC16CTweakAutoMapper: @@ -1033,7 +1033,7 @@ ReadAutomapperTweaks__15CMappableObjectFRC16CTweakAutoMapper: /* 800E94E8 000E6448 D0 84 00 54 */ stfs f4, 0x54(r4) /* 800E94EC 000E644C D0 A4 00 58 */ stfs f5, 0x58(r4) /* 800E94F0 000E6450 D0 04 00 5C */ stfs f0, 0x5c(r4) -/* 800E94F4 000E6454 4E 80 00 20 */ blr +/* 800E94F4 000E6454 4E 80 00 20 */ blr .global __sinit_CMappableObject_cpp __sinit_CMappableObject_cpp: diff --git a/asm/MetroidPrime/CMemoryCardDriver.s b/asm/MetroidPrime/CMemoryCardDriver.s index 7fae1b1c..d60f2907 100644 --- a/asm/MetroidPrime/CMemoryCardDriver.s +++ b/asm/MetroidPrime/CMemoryCardDriver.s @@ -91,7 +91,7 @@ lbl_8024C2D0: /* 8024C2D4 00249234 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8024C2D8 00249238 7C 08 03 A6 */ mtlr r0 /* 8024C2DC 0024923C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024C2E0 00249240 4E 80 00 20 */ blr +/* 8024C2E0 00249240 4E 80 00 20 */ blr .global GetGameFileStateInfo__17CMemoryCardDriverFi GetGameFileStateInfo__17CMemoryCardDriverFi: @@ -101,10 +101,10 @@ GetGameFileStateInfo__17CMemoryCardDriverFi: /* 8024C2F0 00249250 28 03 00 00 */ cmplwi r3, 0 /* 8024C2F4 00249254 40 82 00 0C */ bne lbl_8024C300 /* 8024C2F8 00249258 38 60 00 00 */ li r3, 0 -/* 8024C2FC 0024925C 4E 80 00 20 */ blr +/* 8024C2FC 0024925C 4E 80 00 20 */ blr lbl_8024C300: /* 8024C300 00249260 38 63 03 B0 */ addi r3, r3, 0x3b0 -/* 8024C304 00249264 4E 80 00 20 */ blr +/* 8024C304 00249264 4E 80 00 20 */ blr .global LoadGameState__13SGameFileSlotFi LoadGameState__13SGameFileSlotFi: @@ -132,7 +132,7 @@ LoadGameState__13SGameFileSlotFi: /* 8024C35C 002492BC 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 8024C360 002492C0 7C 08 03 A6 */ mtlr r0 /* 8024C364 002492C4 38 21 00 40 */ addi r1, r1, 0x40 -/* 8024C368 002492C8 4E 80 00 20 */ blr +/* 8024C368 002492C8 4E 80 00 20 */ blr .global InitializeFromGameState__13SGameFileSlotFv InitializeFromGameState__13SGameFileSlotFv: @@ -176,7 +176,7 @@ InitializeFromGameState__13SGameFileSlotFv: /* 8024C400 00249360 80 01 00 D4 */ lwz r0, 0xd4(r1) /* 8024C404 00249364 7C 08 03 A6 */ mtlr r0 /* 8024C408 00249368 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 8024C40C 0024936C 4E 80 00 20 */ blr +/* 8024C40C 0024936C 4E 80 00 20 */ blr .global DoPut__13SGameFileSlotFv DoPut__13SGameFileSlotFv: @@ -198,7 +198,7 @@ DoPut__13SGameFileSlotFv: /* 8024C44C 002493AC 83 C1 00 08 */ lwz r30, 8(r1) /* 8024C450 002493B0 7C 08 03 A6 */ mtlr r0 /* 8024C454 002493B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024C458 002493B8 4E 80 00 20 */ blr +/* 8024C458 002493B8 4E 80 00 20 */ blr .global LoadFile LoadFile: @@ -295,7 +295,7 @@ lbl_8024C528: /* 8024C598 002494F8 80 01 00 44 */ lwz r0, 0x44(r1) /* 8024C59C 002494FC 7C 08 03 A6 */ mtlr r0 /* 8024C5A0 00249500 38 21 00 40 */ addi r1, r1, 0x40 -/* 8024C5A4 00249504 4E 80 00 20 */ blr +/* 8024C5A4 00249504 4E 80 00 20 */ blr .global __ct__13SGameFileSlotFv __ct__13SGameFileSlotFv: @@ -371,7 +371,7 @@ lbl_8024C674: /* 8024C690 002495F0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8024C694 002495F4 7C 08 03 A6 */ mtlr r0 /* 8024C698 002495F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024C69C 002495FC 4E 80 00 20 */ blr +/* 8024C69C 002495FC 4E 80 00 20 */ blr .global DoPut__11SSaveHeaderFv DoPut__11SSaveHeaderFv: @@ -426,7 +426,7 @@ lbl_8024C710: /* 8024C758 002496B8 83 81 00 10 */ lwz r28, 0x10(r1) /* 8024C75C 002496BC 7C 08 03 A6 */ mtlr r0 /* 8024C760 002496C0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8024C764 002496C4 4E 80 00 20 */ blr +/* 8024C764 002496C4 4E 80 00 20 */ blr .global LoadSaveHeader LoadSaveHeader: @@ -457,12 +457,12 @@ lbl_8024C798: /* 8024C7C4 00249724 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8024C7C8 00249728 7C 08 03 A6 */ mtlr r0 /* 8024C7CC 0024972C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8024C7D0 00249730 4E 80 00 20 */ blr +/* 8024C7D0 00249730 4E 80 00 20 */ blr .global __ct__11SSaveHeaderFi __ct__11SSaveHeaderFi: /* 8024C7D4 00249734 90 83 00 00 */ stw r4, 0(r3) -/* 8024C7D8 00249738 4E 80 00 20 */ blr +/* 8024C7D8 00249738 4E 80 00 20 */ blr .global ExportPersistentOptions__17CMemoryCardDriverFv ExportPersistentOptions__17CMemoryCardDriverFv: @@ -506,7 +506,7 @@ ExportPersistentOptions__17CMemoryCardDriverFv: /* 8024C870 002497D0 83 E1 01 9C */ lwz r31, 0x19c(r1) /* 8024C874 002497D4 7C 08 03 A6 */ mtlr r0 /* 8024C878 002497D8 38 21 01 A0 */ addi r1, r1, 0x1a0 -/* 8024C87C 002497DC 4E 80 00 20 */ blr +/* 8024C87C 002497DC 4E 80 00 20 */ blr .global ImportPersistentOptions__17CMemoryCardDriverFv ImportPersistentOptions__17CMemoryCardDriverFv: @@ -536,7 +536,7 @@ ImportPersistentOptions__17CMemoryCardDriverFv: /* 8024C8DC 0024983C 80 01 01 04 */ lwz r0, 0x104(r1) /* 8024C8E0 00249840 7C 08 03 A6 */ mtlr r0 /* 8024C8E4 00249844 38 21 01 00 */ addi r1, r1, 0x100 -/* 8024C8E8 00249848 4E 80 00 20 */ blr +/* 8024C8E8 00249848 4E 80 00 20 */ blr .global BuildExistingFileSlot__17CMemoryCardDriverFi BuildExistingFileSlot__17CMemoryCardDriverFi: @@ -670,7 +670,7 @@ lbl_8024CA74: /* 8024CAAC 00249A0C 83 C1 00 A8 */ lwz r30, 0xa8(r1) /* 8024CAB0 00249A10 7C 08 03 A6 */ mtlr r0 /* 8024CAB4 00249A14 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 8024CAB8 00249A18 4E 80 00 20 */ blr +/* 8024CAB8 00249A18 4E 80 00 20 */ blr .global BuildNewFileSlot__17CMemoryCardDriverFi BuildNewFileSlot__17CMemoryCardDriverFi: @@ -823,7 +823,7 @@ lbl_8024CC50: /* 8024CCCC 00249C2C 83 81 00 40 */ lwz r28, 0x40(r1) /* 8024CCD0 00249C30 7C 08 03 A6 */ mtlr r0 /* 8024CCD4 00249C34 38 21 00 50 */ addi r1, r1, 0x50 -/* 8024CCD8 00249C38 4E 80 00 20 */ blr +/* 8024CCD8 00249C38 4E 80 00 20 */ blr .global EraseFileSlot__17CMemoryCardDriverFi EraseFileSlot__17CMemoryCardDriverFi: @@ -920,7 +920,7 @@ lbl_8024CE0C: /* 8024CE10 00249D70 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8024CE14 00249D74 7C 08 03 A6 */ mtlr r0 /* 8024CE18 00249D78 38 21 00 20 */ addi r1, r1, 0x20 -/* 8024CE1C 00249D7C 4E 80 00 20 */ blr +/* 8024CE1C 00249D7C 4E 80 00 20 */ blr .global ReadFinished__17CMemoryCardDriverFv ReadFinished__17CMemoryCardDriverFv: @@ -1182,7 +1182,7 @@ lbl_8024D190: /* 8024D1A0 0024A100 83 81 00 B0 */ lwz r28, 0xb0(r1) /* 8024D1A4 0024A104 7C 08 03 A6 */ mtlr r0 /* 8024D1A8 0024A108 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 8024D1AC 0024A10C 4E 80 00 20 */ blr +/* 8024D1AC 0024A10C 4E 80 00 20 */ blr .global InitializeFileInfo__17CMemoryCardDriverFv InitializeFileInfo__17CMemoryCardDriverFv: @@ -1328,7 +1328,7 @@ lbl_8024D3A4: /* 8024D3D0 0024A330 83 A1 01 34 */ lwz r29, 0x134(r1) /* 8024D3D4 0024A334 7C 08 03 A6 */ mtlr r0 /* 8024D3D8 0024A338 38 21 01 40 */ addi r1, r1, 0x140 -/* 8024D3DC 0024A33C 4E 80 00 20 */ blr +/* 8024D3DC 0024A33C 4E 80 00 20 */ blr .global StartCardFormat__17CMemoryCardDriverFv StartCardFormat__17CMemoryCardDriverFv: @@ -1352,7 +1352,7 @@ lbl_8024D41C: /* 8024D420 0024A380 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8024D424 0024A384 7C 08 03 A6 */ mtlr r0 /* 8024D428 0024A388 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024D42C 0024A38C 4E 80 00 20 */ blr +/* 8024D42C 0024A38C 4E 80 00 20 */ blr .global StartFileDeleteAltTransactional__17CMemoryCardDriverFv StartFileDeleteAltTransactional__17CMemoryCardDriverFv: @@ -1391,7 +1391,7 @@ lbl_8024D4A4: /* 8024D4AC 0024A40C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8024D4B0 0024A410 7C 08 03 A6 */ mtlr r0 /* 8024D4B4 0024A414 38 21 00 20 */ addi r1, r1, 0x20 -/* 8024D4B8 0024A418 4E 80 00 20 */ blr +/* 8024D4B8 0024A418 4E 80 00 20 */ blr .global StartFileWriteTransactional__17CMemoryCardDriverFv StartFileWriteTransactional__17CMemoryCardDriverFv: @@ -1415,7 +1415,7 @@ lbl_8024D4F8: /* 8024D4FC 0024A45C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8024D500 0024A460 7C 08 03 A6 */ mtlr r0 /* 8024D504 0024A464 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024D508 0024A468 4E 80 00 20 */ blr +/* 8024D508 0024A468 4E 80 00 20 */ blr .global StartFileCreateTransactional__17CMemoryCardDriverFv StartFileCreateTransactional__17CMemoryCardDriverFv: @@ -1493,7 +1493,7 @@ lbl_8024D608: /* 8024D614 0024A574 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8024D618 0024A578 7C 08 03 A6 */ mtlr r0 /* 8024D61C 0024A57C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8024D620 0024A580 4E 80 00 20 */ blr +/* 8024D620 0024A580 4E 80 00 20 */ blr .global sub_8024d624 sub_8024d624: @@ -1514,7 +1514,7 @@ sub_8024d624: /* 8024D65C 0024A5BC 83 C1 00 08 */ lwz r30, 8(r1) /* 8024D660 0024A5C0 7C 08 03 A6 */ mtlr r0 /* 8024D664 0024A5C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024D668 0024A5C8 4E 80 00 20 */ blr +/* 8024D668 0024A5C8 4E 80 00 20 */ blr .global __dt__13CCardFileInfoFv __dt__13CCardFileInfoFv: @@ -1629,7 +1629,7 @@ lbl_8024D7CC: /* 8024D7E0 0024A740 83 81 00 30 */ lwz r28, 0x30(r1) /* 8024D7E4 0024A744 7C 08 03 A6 */ mtlr r0 /* 8024D7E8 0024A748 38 21 00 40 */ addi r1, r1, 0x40 -/* 8024D7EC 0024A74C 4E 80 00 20 */ blr +/* 8024D7EC 0024A74C 4E 80 00 20 */ blr .global StartFileWrite__17CMemoryCardDriverFv StartFileWrite__17CMemoryCardDriverFv: @@ -1653,7 +1653,7 @@ lbl_8024D82C: /* 8024D830 0024A790 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8024D834 0024A794 7C 08 03 A6 */ mtlr r0 /* 8024D838 0024A798 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024D83C 0024A79C 4E 80 00 20 */ blr +/* 8024D83C 0024A79C 4E 80 00 20 */ blr .global StartFileCreate__17CMemoryCardDriverFv StartFileCreate__17CMemoryCardDriverFv: @@ -1727,7 +1727,7 @@ lbl_8024D92C: /* 8024D938 0024A898 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8024D93C 0024A89C 7C 08 03 A6 */ mtlr r0 /* 8024D940 0024A8A0 38 21 00 30 */ addi r1, r1, 0x30 -/* 8024D944 0024A8A4 4E 80 00 20 */ blr +/* 8024D944 0024A8A4 4E 80 00 20 */ blr .global StartFileRead__17CMemoryCardDriverFv StartFileRead__17CMemoryCardDriverFv: @@ -1768,7 +1768,7 @@ lbl_8024D9C0: /* 8024D9C8 0024A928 83 C1 00 08 */ lwz r30, 8(r1) /* 8024D9CC 0024A92C 7C 08 03 A6 */ mtlr r0 /* 8024D9D0 0024A930 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024D9D4 0024A934 4E 80 00 20 */ blr +/* 8024D9D4 0024A934 4E 80 00 20 */ blr .global StartFileDeleteAlt__17CMemoryCardDriverFv StartFileDeleteAlt__17CMemoryCardDriverFv: @@ -1800,7 +1800,7 @@ lbl_8024DA34: /* 8024DA38 0024A998 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8024DA3C 0024A99C 7C 08 03 A6 */ mtlr r0 /* 8024DA40 0024A9A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024DA44 0024A9A4 4E 80 00 20 */ blr +/* 8024DA44 0024A9A4 4E 80 00 20 */ blr .global StartFileDeleteBad__17CMemoryCardDriverFv StartFileDeleteBad__17CMemoryCardDriverFv: @@ -1841,7 +1841,7 @@ lbl_8024DAC0: /* 8024DAC4 0024AA24 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8024DAC8 0024AA28 7C 08 03 A6 */ mtlr r0 /* 8024DACC 0024AA2C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024DAD0 0024AA30 4E 80 00 20 */ blr +/* 8024DAD0 0024AA30 4E 80 00 20 */ blr .global IndexFiles__17CMemoryCardDriverFv IndexFiles__17CMemoryCardDriverFv: @@ -2006,7 +2006,7 @@ lbl_8024DCF8: /* 8024DD08 0024AC68 83 81 00 E0 */ lwz r28, 0xe0(r1) /* 8024DD0C 0024AC6C 7C 08 03 A6 */ mtlr r0 /* 8024DD10 0024AC70 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 8024DD14 0024AC74 4E 80 00 20 */ blr +/* 8024DD14 0024AC74 4E 80 00 20 */ blr .global NoCardFound__17CMemoryCardDriverFv NoCardFound__17CMemoryCardDriverFv: @@ -2017,7 +2017,7 @@ NoCardFound__17CMemoryCardDriverFv: /* 8024DD28 0024AC88 88 03 01 60 */ lbz r0, 0x160(r3) /* 8024DD2C 0024AC8C 50 80 07 FE */ rlwimi r0, r4, 0, 0x1f, 0x1f /* 8024DD30 0024AC90 98 03 01 60 */ stb r0, 0x160(r3) -/* 8024DD34 0024AC94 4E 80 00 20 */ blr +/* 8024DD34 0024AC94 4E 80 00 20 */ blr .global CheckCardCapacity__17CMemoryCardDriverFv CheckCardCapacity__17CMemoryCardDriverFv: @@ -2026,17 +2026,17 @@ CheckCardCapacity__17CMemoryCardDriverFv: /* 8024DD40 0024ACA0 41 80 00 10 */ blt lbl_8024DD50 /* 8024DD44 0024ACA4 80 03 00 1C */ lwz r0, 0x1c(r3) /* 8024DD48 0024ACA8 28 00 00 01 */ cmplwi r0, 1 -/* 8024DD4C 0024ACAC 4C 80 00 20 */ bgelr +/* 8024DD4C 0024ACAC 4C 80 00 20 */ bgelr lbl_8024DD50: /* 8024DD50 0024ACB0 38 00 00 06 */ li r0, 6 /* 8024DD54 0024ACB4 90 03 00 14 */ stw r0, 0x14(r3) -/* 8024DD58 0024ACB8 4E 80 00 20 */ blr +/* 8024DD58 0024ACB8 4E 80 00 20 */ blr .global ClearError__17CMemoryCardDriverFv ClearError__17CMemoryCardDriverFv: /* 8024DD5C 0024ACBC 38 00 00 00 */ li r0, 0 /* 8024DD60 0024ACC0 90 03 00 14 */ stw r0, 0x14(r3) -/* 8024DD64 0024ACC4 4E 80 00 20 */ blr +/* 8024DD64 0024ACC4 4E 80 00 20 */ blr .global StartCardCheck__17CMemoryCardDriverFv StartCardCheck__17CMemoryCardDriverFv: @@ -2060,7 +2060,7 @@ lbl_8024DDA4: /* 8024DDA8 0024AD08 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8024DDAC 0024AD0C 7C 08 03 A6 */ mtlr r0 /* 8024DDB0 0024AD10 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024DDB4 0024AD14 4E 80 00 20 */ blr +/* 8024DDB4 0024AD14 4E 80 00 20 */ blr .global StartMountCard__17CMemoryCardDriverFv StartMountCard__17CMemoryCardDriverFv: @@ -2084,7 +2084,7 @@ lbl_8024DDF4: /* 8024DDF8 0024AD58 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8024DDFC 0024AD5C 7C 08 03 A6 */ mtlr r0 /* 8024DE00 0024AD60 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024DE04 0024AD64 4E 80 00 20 */ blr +/* 8024DE04 0024AD64 4E 80 00 20 */ blr .global UpdateCardProbe__17CMemoryCardDriverFv UpdateCardProbe__17CMemoryCardDriverFv: @@ -2135,7 +2135,7 @@ lbl_8024DEA4: /* 8024DEA8 0024AE08 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8024DEAC 0024AE0C 7C 08 03 A6 */ mtlr r0 /* 8024DEB0 0024AE10 38 21 00 30 */ addi r1, r1, 0x30 -/* 8024DEB4 0024AE14 4E 80 00 20 */ blr +/* 8024DEB4 0024AE14 4E 80 00 20 */ blr .global StartCardProbe__17CMemoryCardDriverFv StartCardProbe__17CMemoryCardDriverFv: @@ -2150,7 +2150,7 @@ StartCardProbe__17CMemoryCardDriverFv: /* 8024DED8 0024AE38 80 01 00 14 */ lwz r0, 0x14(r1) /* 8024DEDC 0024AE3C 7C 08 03 A6 */ mtlr r0 /* 8024DEE0 0024AE40 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024DEE4 0024AE44 4E 80 00 20 */ blr +/* 8024DEE4 0024AE44 4E 80 00 20 */ blr .global UpdateCardFormat__17CMemoryCardDriverFv UpdateCardFormat__17CMemoryCardDriverFv: @@ -2177,7 +2177,7 @@ lbl_8024DF2C: /* 8024DF2C 0024AE8C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8024DF30 0024AE90 7C 08 03 A6 */ mtlr r0 /* 8024DF34 0024AE94 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024DF38 0024AE98 4E 80 00 20 */ blr +/* 8024DF38 0024AE98 4E 80 00 20 */ blr .global UpdateFileAltDeleteTransactional__17CMemoryCardDriverFv UpdateFileAltDeleteTransactional__17CMemoryCardDriverFv: @@ -2204,7 +2204,7 @@ lbl_8024DF80: /* 8024DF84 0024AEE4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8024DF88 0024AEE8 7C 08 03 A6 */ mtlr r0 /* 8024DF8C 0024AEEC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024DF90 0024AEF0 4E 80 00 20 */ blr +/* 8024DF90 0024AEF0 4E 80 00 20 */ blr .global WriteBackupBuf__17CMemoryCardDriverFv WriteBackupBuf__17CMemoryCardDriverFv: @@ -2224,7 +2224,7 @@ WriteBackupBuf__17CMemoryCardDriverFv: /* 8024DFC8 0024AF28 80 01 00 14 */ lwz r0, 0x14(r1) /* 8024DFCC 0024AF2C 7C 08 03 A6 */ mtlr r0 /* 8024DFD0 0024AF30 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024DFD4 0024AF34 4E 80 00 20 */ blr +/* 8024DFD4 0024AF34 4E 80 00 20 */ blr .global StartFileRenameBtoA__17CMemoryCardDriverFv StartFileRenameBtoA__17CMemoryCardDriverFv: @@ -2280,7 +2280,7 @@ lbl_8024E08C: /* 8024E094 0024AFF4 83 C1 00 28 */ lwz r30, 0x28(r1) /* 8024E098 0024AFF8 7C 08 03 A6 */ mtlr r0 /* 8024E09C 0024AFFC 38 21 00 30 */ addi r1, r1, 0x30 -/* 8024E0A0 0024B000 4E 80 00 20 */ blr +/* 8024E0A0 0024B000 4E 80 00 20 */ blr .global UpdateFileRenameBtoA__17CMemoryCardDriverFv UpdateFileRenameBtoA__17CMemoryCardDriverFv: @@ -2300,7 +2300,7 @@ lbl_8024E0D0: /* 8024E0D0 0024B030 80 01 00 14 */ lwz r0, 0x14(r1) /* 8024E0D4 0024B034 7C 08 03 A6 */ mtlr r0 /* 8024E0D8 0024B038 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024E0DC 0024B03C 4E 80 00 20 */ blr +/* 8024E0DC 0024B03C 4E 80 00 20 */ blr .global UpdateFileWriteTransactional__17CMemoryCardDriverFv UpdateFileWriteTransactional__17CMemoryCardDriverFv: @@ -2350,7 +2350,7 @@ lbl_8024E174: /* 8024E178 0024B0D8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8024E17C 0024B0DC 7C 08 03 A6 */ mtlr r0 /* 8024E180 0024B0E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024E184 0024B0E4 4E 80 00 20 */ blr +/* 8024E184 0024B0E4 4E 80 00 20 */ blr .global UpdateFileCreateTransactional__17CMemoryCardDriverFv UpdateFileCreateTransactional__17CMemoryCardDriverFv: @@ -2370,7 +2370,7 @@ lbl_8024E1B4: /* 8024E1B4 0024B114 80 01 00 14 */ lwz r0, 0x14(r1) /* 8024E1B8 0024B118 7C 08 03 A6 */ mtlr r0 /* 8024E1BC 0024B11C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024E1C0 0024B120 4E 80 00 20 */ blr +/* 8024E1C0 0024B120 4E 80 00 20 */ blr .global UpdateFileWrite__17CMemoryCardDriverFv UpdateFileWrite__17CMemoryCardDriverFv: @@ -2416,7 +2416,7 @@ lbl_8024E24C: /* 8024E250 0024B1B0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8024E254 0024B1B4 7C 08 03 A6 */ mtlr r0 /* 8024E258 0024B1B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024E25C 0024B1BC 4E 80 00 20 */ blr +/* 8024E25C 0024B1BC 4E 80 00 20 */ blr .global UpdateFileCreate__17CMemoryCardDriverFv UpdateFileCreate__17CMemoryCardDriverFv: @@ -2436,7 +2436,7 @@ lbl_8024E28C: /* 8024E28C 0024B1EC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8024E290 0024B1F0 7C 08 03 A6 */ mtlr r0 /* 8024E294 0024B1F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024E298 0024B1F8 4E 80 00 20 */ blr +/* 8024E298 0024B1F8 4E 80 00 20 */ blr .global UpdateFileDeleteBad__17CMemoryCardDriverFv UpdateFileDeleteBad__17CMemoryCardDriverFv: @@ -2480,7 +2480,7 @@ lbl_8024E320: /* 8024E324 0024B284 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8024E328 0024B288 7C 08 03 A6 */ mtlr r0 /* 8024E32C 0024B28C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024E330 0024B290 4E 80 00 20 */ blr +/* 8024E330 0024B290 4E 80 00 20 */ blr .global UpdateFileDeleteAlt__17CMemoryCardDriverFv UpdateFileDeleteAlt__17CMemoryCardDriverFv: @@ -2507,7 +2507,7 @@ lbl_8024E378: /* 8024E37C 0024B2DC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8024E380 0024B2E0 7C 08 03 A6 */ mtlr r0 /* 8024E384 0024B2E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024E388 0024B2E8 4E 80 00 20 */ blr +/* 8024E388 0024B2E8 4E 80 00 20 */ blr .global UpdateFileRead__17CMemoryCardDriverFv UpdateFileRead__17CMemoryCardDriverFv: @@ -2591,7 +2591,7 @@ lbl_8024E498: /* 8024E4A8 0024B408 83 81 00 10 */ lwz r28, 0x10(r1) /* 8024E4AC 0024B40C 7C 08 03 A6 */ mtlr r0 /* 8024E4B0 0024B410 38 21 00 20 */ addi r1, r1, 0x20 -/* 8024E4B4 0024B414 4E 80 00 20 */ blr +/* 8024E4B4 0024B414 4E 80 00 20 */ blr .global UpdateCardCheck__17CMemoryCardDriverFv UpdateCardCheck__17CMemoryCardDriverFv: @@ -2631,7 +2631,7 @@ lbl_8024E52C: /* 8024E530 0024B490 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8024E534 0024B494 7C 08 03 A6 */ mtlr r0 /* 8024E538 0024B498 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024E53C 0024B49C 4E 80 00 20 */ blr +/* 8024E53C 0024B49C 4E 80 00 20 */ blr .global UpdateMountCard__17CMemoryCardDriverFi UpdateMountCard__17CMemoryCardDriverFi: @@ -2660,7 +2660,7 @@ lbl_8024E58C: /* 8024E58C 0024B4EC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8024E590 0024B4F0 7C 08 03 A6 */ mtlr r0 /* 8024E594 0024B4F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024E598 0024B4F8 4E 80 00 20 */ blr +/* 8024E598 0024B4F8 4E 80 00 20 */ blr .global HandleCardError__17CMemoryCardDriverFi HandleCardError__17CMemoryCardDriverFi: @@ -2675,7 +2675,7 @@ HandleCardError__17CMemoryCardDriverFi: /* 8024E5BC 0024B51C 38 84 8D 38 */ addi r4, r4, lbl_803E8D38@l /* 8024E5C0 0024B520 7C 04 00 2E */ lwzx r0, r4, r0 /* 8024E5C4 0024B524 7C 09 03 A6 */ mtctr r0 -/* 8024E5C8 0024B528 4E 80 04 20 */ bctr +/* 8024E5C8 0024B528 4E 80 04 20 */ bctr .global lbl_8024E5CC lbl_8024E5CC: /* 8024E5CC 0024B52C 90 A3 00 10 */ stw r5, 0x10(r3) @@ -2702,7 +2702,7 @@ lbl_8024E600: /* 8024E600 0024B560 80 01 00 14 */ lwz r0, 0x14(r1) /* 8024E604 0024B564 7C 08 03 A6 */ mtlr r0 /* 8024E608 0024B568 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024E60C 0024B56C 4E 80 00 20 */ blr +/* 8024E60C 0024B56C 4E 80 00 20 */ blr .global Update__17CMemoryCardDriverFv Update__17CMemoryCardDriverFv: @@ -2768,7 +2768,7 @@ lbl_8024E6B0: /* 8024E6F0 0024B650 38 63 8D 6C */ addi r3, r3, lbl_803E8D6C@l /* 8024E6F4 0024B654 7C 03 00 2E */ lwzx r0, r3, r0 /* 8024E6F8 0024B658 7C 09 03 A6 */ mtctr r0 -/* 8024E6FC 0024B65C 4E 80 04 20 */ bctr +/* 8024E6FC 0024B65C 4E 80 04 20 */ bctr .global lbl_8024E700 lbl_8024E700: /* 8024E700 0024B660 7F A3 EB 78 */ mr r3, r29 @@ -2853,7 +2853,7 @@ lbl_8024E7CC: /* 8024E7D8 0024B738 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8024E7DC 0024B73C 7C 08 03 A6 */ mtlr r0 /* 8024E7E0 0024B740 38 21 00 30 */ addi r1, r1, 0x30 -/* 8024E7E4 0024B744 4E 80 00 20 */ blr +/* 8024E7E4 0024B744 4E 80 00 20 */ blr .global __dt__17CMemoryCardDriverFv __dt__17CMemoryCardDriverFv: @@ -2975,7 +2975,7 @@ lbl_8024E964: /* 8024E978 0024B8D8 83 81 00 10 */ lwz r28, 0x10(r1) /* 8024E97C 0024B8DC 7C 08 03 A6 */ mtlr r0 /* 8024E980 0024B8E0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8024E984 0024B8E4 4E 80 00 20 */ blr +/* 8024E984 0024B8E4 4E 80 00 20 */ blr .global sub_8024e988 sub_8024e988: @@ -2999,7 +2999,7 @@ lbl_8024E9BC: /* 8024E9C8 0024B928 83 C1 00 08 */ lwz r30, 8(r1) /* 8024E9CC 0024B92C 7C 08 03 A6 */ mtlr r0 /* 8024E9D0 0024B930 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024E9D4 0024B934 4E 80 00 20 */ blr +/* 8024E9D4 0024B934 4E 80 00 20 */ blr .global sub_8024e9d8 sub_8024e9d8: @@ -3030,7 +3030,7 @@ lbl_8024EA10: /* 8024EA30 0024B990 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8024EA34 0024B994 7C 08 03 A6 */ mtlr r0 /* 8024EA38 0024B998 38 21 00 20 */ addi r1, r1, 0x20 -/* 8024EA3C 0024B99C 4E 80 00 20 */ blr +/* 8024EA3C 0024B99C 4E 80 00 20 */ blr .global sub_8024ea40 sub_8024ea40: @@ -3042,7 +3042,7 @@ sub_8024ea40: /* 8024EA54 0024B9B4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8024EA58 0024B9B8 7C 08 03 A6 */ mtlr r0 /* 8024EA5C 0024B9BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024EA60 0024B9C0 4E 80 00 20 */ blr +/* 8024EA60 0024B9C0 4E 80 00 20 */ blr .global "__dt__Q24rstl29pairFv" "__dt__Q24rstl29pairFv": @@ -3068,7 +3068,7 @@ lbl_8024EAA0: /* 8024EAAC 0024BA0C 83 C1 00 08 */ lwz r30, 8(r1) /* 8024EAB0 0024BA10 7C 08 03 A6 */ mtlr r0 /* 8024EAB4 0024BA14 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024EAB8 0024BA18 4E 80 00 20 */ blr +/* 8024EAB8 0024BA18 4E 80 00 20 */ blr .global __dt__19SMemoryCardFileInfoFv __dt__19SMemoryCardFileInfoFv: @@ -3134,7 +3134,7 @@ lbl_8024EB7C: /* 8024EB88 0024BAE8 83 C1 00 28 */ lwz r30, 0x28(r1) /* 8024EB8C 0024BAEC 7C 08 03 A6 */ mtlr r0 /* 8024EB90 0024BAF0 38 21 00 30 */ addi r1, r1, 0x30 -/* 8024EB94 0024BAF4 4E 80 00 20 */ blr +/* 8024EB94 0024BAF4 4E 80 00 20 */ blr .global sub_8024eb98 sub_8024eb98: @@ -3160,7 +3160,7 @@ lbl_8024EBD4: /* 8024EBE0 0024BB40 83 C1 00 08 */ lwz r30, 8(r1) /* 8024EBE4 0024BB44 7C 08 03 A6 */ mtlr r0 /* 8024EBE8 0024BB48 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024EBEC 0024BB4C 4E 80 00 20 */ blr +/* 8024EBEC 0024BB4C 4E 80 00 20 */ blr .global ClearFileInfo__17CMemoryCardDriverFv ClearFileInfo__17CMemoryCardDriverFv: @@ -3173,7 +3173,7 @@ ClearFileInfo__17CMemoryCardDriverFv: /* 8024EC08 0024BB68 80 01 00 14 */ lwz r0, 0x14(r1) /* 8024EC0C 0024BB6C 7C 08 03 A6 */ mtlr r0 /* 8024EC10 0024BB70 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024EC14 0024BB74 4E 80 00 20 */ blr +/* 8024EC14 0024BB74 4E 80 00 20 */ blr .global __ct__17CMemoryCardDriverFv __ct__17CMemoryCardDriverFv: @@ -3345,7 +3345,7 @@ lbl_8024EDB0: /* 8024EE6C 0024BDCC 83 C1 00 C8 */ lwz r30, 0xc8(r1) /* 8024EE70 0024BDD0 7C 08 03 A6 */ mtlr r0 /* 8024EE74 0024BDD4 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 8024EE78 0024BDD8 4E 80 00 20 */ blr +/* 8024EE78 0024BDD8 4E 80 00 20 */ blr .global sub_8024ee7c sub_8024ee7c: @@ -3366,7 +3366,7 @@ sub_8024ee7c: /* 8024EEB4 0024BE14 80 01 00 14 */ lwz r0, 0x14(r1) /* 8024EEB8 0024BE18 7C 08 03 A6 */ mtlr r0 /* 8024EEBC 0024BE1C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024EEC0 0024BE20 4E 80 00 20 */ blr +/* 8024EEC0 0024BE20 4E 80 00 20 */ blr .global sub_8024eec4 sub_8024eec4: @@ -3380,7 +3380,7 @@ lbl_8024EEDC: /* 8024EEDC 0024BE3C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8024EEE0 0024BE40 7C 08 03 A6 */ mtlr r0 /* 8024EEE4 0024BE44 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024EEE8 0024BE48 4E 80 00 20 */ blr +/* 8024EEE8 0024BE48 4E 80 00 20 */ blr .global sub_8024eeec sub_8024eeec: @@ -3399,7 +3399,7 @@ sub_8024eeec: /* 8024EF1C 0024BE7C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8024EF20 0024BE80 7C 08 03 A6 */ mtlr r0 /* 8024EF24 0024BE84 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024EF28 0024BE88 4E 80 00 20 */ blr +/* 8024EF28 0024BE88 4E 80 00 20 */ blr .global sub_8024ef2c sub_8024ef2c: @@ -3527,7 +3527,7 @@ lbl_8024F0D0: /* 8024F0E0 0024C040 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8024F0E4 0024C044 7C 08 03 A6 */ mtlr r0 /* 8024F0E8 0024C048 38 21 00 20 */ addi r1, r1, 0x20 -/* 8024F0EC 0024C04C 4E 80 00 20 */ blr +/* 8024F0EC 0024C04C 4E 80 00 20 */ blr .global IsCardWriting__17CMemoryCardDriverF6EState IsCardWriting__17CMemoryCardDriverF6EState: @@ -3556,7 +3556,7 @@ lbl_8024F130: /* 8024F140 0024C0A0 38 A0 00 00 */ li r5, 0 lbl_8024F144: /* 8024F144 0024C0A4 7C A3 2B 78 */ mr r3, r5 -/* 8024F148 0024C0A8 4E 80 00 20 */ blr +/* 8024F148 0024C0A8 4E 80 00 20 */ blr .global IsCardBusy__17CMemoryCardDriverF6EState IsCardBusy__17CMemoryCardDriverF6EState: diff --git a/asm/MetroidPrime/CMemoryDrawEnum.s b/asm/MetroidPrime/CMemoryDrawEnum.s index 67ba759f..43b7e821 100644 --- a/asm/MetroidPrime/CMemoryDrawEnum.s +++ b/asm/MetroidPrime/CMemoryDrawEnum.s @@ -48,4 +48,4 @@ __ct__Q210IAllocator8SMetricsFRCQ210IAllocator8SMetrics: /* 800C36F0 000C0650 90 03 00 50 */ stw r0, 0x50(r3) /* 800C36F4 000C0654 80 04 00 54 */ lwz r0, 0x54(r4) /* 800C36F8 000C0658 90 03 00 54 */ stw r0, 0x54(r3) -/* 800C36FC 000C065C 4E 80 00 20 */ blr +/* 800C36FC 000C065C 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/CMessageScreen.s b/asm/MetroidPrime/CMessageScreen.s index 038ad89b..4bd1ef7e 100644 --- a/asm/MetroidPrime/CMessageScreen.s +++ b/asm/MetroidPrime/CMessageScreen.s @@ -50,7 +50,7 @@ lbl_801EF650: /* 801EF650 001EC5B0 80 01 00 24 */ lwz r0, 0x24(r1) /* 801EF654 001EC5B4 7C 08 03 A6 */ mtlr r0 /* 801EF658 001EC5B8 38 21 00 20 */ addi r1, r1, 0x20 -/* 801EF65C 001EC5BC 4E 80 00 20 */ blr +/* 801EF65C 001EC5BC 4E 80 00 20 */ blr .global ProcessControllerInput__14CMessageScreenFRC11CFinalInput ProcessControllerInput__14CMessageScreenFRC11CFinalInput: @@ -137,7 +137,7 @@ lbl_801EF784: /* 801EF794 001EC6F4 83 C1 00 28 */ lwz r30, 0x28(r1) /* 801EF798 001EC6F8 7C 08 03 A6 */ mtlr r0 /* 801EF79C 001EC6FC 38 21 00 40 */ addi r1, r1, 0x40 -/* 801EF7A0 001EC700 4E 80 00 20 */ blr +/* 801EF7A0 001EC700 4E 80 00 20 */ blr .global Update__14CMessageScreenFf Update__14CMessageScreenFf: @@ -632,7 +632,7 @@ lbl_801EFEA8: /* 801EFEF0 001ECE50 83 C1 01 38 */ lwz r30, 0x138(r1) /* 801EFEF4 001ECE54 7C 08 03 A6 */ mtlr r0 /* 801EFEF8 001ECE58 38 21 01 A0 */ addi r1, r1, 0x1a0 -/* 801EFEFC 001ECE5C 4E 80 00 20 */ blr +/* 801EFEFC 001ECE5C 4E 80 00 20 */ blr .global __ct__14CMessageScreenFUif __ct__14CMessageScreenFUif: @@ -655,7 +655,7 @@ __ct__14CMessageScreenFUif: /* 801EFF40 001ECEA0 81 84 00 00 */ lwz r12, 0(r4) /* 801EFF44 001ECEA4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801EFF48 001ECEA8 7D 89 03 A6 */ mtctr r12 -/* 801EFF4C 001ECEAC 4E 80 04 21 */ bctrl +/* 801EFF4C 001ECEAC 4E 80 04 21 */ bctrl /* 801EFF50 001ECEB0 7F E3 FB 78 */ mr r3, r31 /* 801EFF54 001ECEB4 38 81 00 10 */ addi r4, r1, 0x10 /* 801EFF58 001ECEB8 48 15 0F 51 */ bl __ct__6CTokenFRC6CToken @@ -672,7 +672,7 @@ __ct__14CMessageScreenFUif: /* 801EFF84 001ECEE4 38 A5 00 A5 */ addi r5, r5, 0xa5 /* 801EFF88 001ECEE8 81 8C 00 10 */ lwz r12, 0x10(r12) /* 801EFF8C 001ECEEC 7D 89 03 A6 */ mtctr r12 -/* 801EFF90 001ECEF0 4E 80 04 21 */ bctrl +/* 801EFF90 001ECEF0 4E 80 04 21 */ bctrl /* 801EFF94 001ECEF4 3B DF 00 0C */ addi r30, r31, 0xc /* 801EFF98 001ECEF8 38 81 00 08 */ addi r4, r1, 8 /* 801EFF9C 001ECEFC 7F C3 F3 78 */ mr r3, r30 diff --git a/asm/MetroidPrime/CModelData.s b/asm/MetroidPrime/CModelData.s index 27fc0516..f68b49a7 100644 --- a/asm/MetroidPrime/CModelData.s +++ b/asm/MetroidPrime/CModelData.s @@ -5,7 +5,7 @@ .global lbl_8046C538 lbl_8046C538: .skip 0x20 - + .section .text, "ax" .global GetNumMaterialSets__10CModelDataCFv @@ -16,17 +16,17 @@ GetNumMaterialSets__10CModelDataCFv: /* 80114C54 00111BB4 80 64 00 E0 */ lwz r3, 0xe0(r4) /* 80114C58 00111BB8 80 63 00 0C */ lwz r3, 0xc(r3) /* 80114C5C 00111BBC 80 63 00 1C */ lwz r3, 0x1c(r3) -/* 80114C60 00111BC0 4E 80 00 20 */ blr +/* 80114C60 00111BC0 4E 80 00 20 */ blr lbl_80114C64: /* 80114C64 00111BC4 88 03 00 28 */ lbz r0, 0x28(r3) /* 80114C68 00111BC8 28 00 00 00 */ cmplwi r0, 0 /* 80114C6C 00111BCC 41 82 00 10 */ beq lbl_80114C7C /* 80114C70 00111BD0 80 63 00 24 */ lwz r3, 0x24(r3) /* 80114C74 00111BD4 80 63 00 1C */ lwz r3, 0x1c(r3) -/* 80114C78 00111BD8 4E 80 00 20 */ blr +/* 80114C78 00111BD8 4E 80 00 20 */ blr lbl_80114C7C: /* 80114C7C 00111BDC 38 60 00 01 */ li r3, 1 -/* 80114C80 00111BE0 4E 80 00 20 */ blr +/* 80114C80 00111BE0 4E 80 00 20 */ blr .global IsLoaded__10CModelDataCFi IsLoaded__10CModelDataCFi: @@ -114,7 +114,7 @@ lbl_80114DA0: /* 80114DAC 00111D0C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80114DB0 00111D10 7C 08 03 A6 */ mtlr r0 /* 80114DB4 00111D14 38 21 00 20 */ addi r1, r1, 0x20 -/* 80114DB8 00111D18 4E 80 00 20 */ blr +/* 80114DB8 00111D18 4E 80 00 20 */ blr .global Render__10CModelDataCFRC13CStateManagerRC12CTransform4fPC12CActorLightsRC11CModelFlags Render__10CModelDataCFRC13CStateManagerRC12CTransform4fPC12CActorLightsRC11CModelFlags: @@ -144,7 +144,7 @@ Render__10CModelDataCFRC13CStateManagerRC12CTransform4fPC12CActorLightsRC11CMode /* 80114E18 00111D78 83 81 00 10 */ lwz r28, 0x10(r1) /* 80114E1C 00111D7C 7C 08 03 A6 */ mtlr r0 /* 80114E20 00111D80 38 21 00 20 */ addi r1, r1, 0x20 -/* 80114E24 00111D84 4E 80 00 20 */ blr +/* 80114E24 00111D84 4E 80 00 20 */ blr .global HasModel__10CModelDataCF11EWhichModel HasModel__10CModelDataCF11EWhichModel: @@ -163,24 +163,24 @@ lbl_80114E4C: /* 80114E54 00111DB4 48 00 00 24 */ b lbl_80114E78 lbl_80114E58: /* 80114E58 00111DB8 38 60 00 01 */ li r3, 1 -/* 80114E5C 00111DBC 4E 80 00 20 */ blr +/* 80114E5C 00111DBC 4E 80 00 20 */ blr lbl_80114E60: /* 80114E60 00111DC0 80 65 00 F4 */ lwz r3, 0xf4(r5) /* 80114E64 00111DC4 80 63 00 00 */ lwz r3, 0(r3) /* 80114E68 00111DC8 7C 03 00 D0 */ neg r0, r3 /* 80114E6C 00111DCC 7C 00 1B 78 */ or r0, r0, r3 /* 80114E70 00111DD0 54 03 0F FE */ srwi r3, r0, 0x1f -/* 80114E74 00111DD4 4E 80 00 20 */ blr +/* 80114E74 00111DD4 4E 80 00 20 */ blr lbl_80114E78: /* 80114E78 00111DD8 80 65 00 F8 */ lwz r3, 0xf8(r5) /* 80114E7C 00111DDC 80 63 00 00 */ lwz r3, 0(r3) /* 80114E80 00111DE0 7C 03 00 D0 */ neg r0, r3 /* 80114E84 00111DE4 7C 00 1B 78 */ or r0, r0, r3 /* 80114E88 00111DE8 54 03 0F FE */ srwi r3, r0, 0x1f -/* 80114E8C 00111DEC 4E 80 00 20 */ blr +/* 80114E8C 00111DEC 4E 80 00 20 */ blr lbl_80114E90: /* 80114E90 00111DF0 38 60 00 00 */ li r3, 0 -/* 80114E94 00111DF4 4E 80 00 20 */ blr +/* 80114E94 00111DF4 4E 80 00 20 */ blr lbl_80114E98: /* 80114E98 00111DF8 2C 04 00 01 */ cmpwi r4, 1 /* 80114E9C 00111DFC 41 82 00 28 */ beq lbl_80114EC4 @@ -194,16 +194,16 @@ lbl_80114EB0: /* 80114EB8 00111E18 48 00 00 14 */ b lbl_80114ECC lbl_80114EBC: /* 80114EBC 00111E1C 88 63 00 28 */ lbz r3, 0x28(r3) -/* 80114EC0 00111E20 4E 80 00 20 */ blr +/* 80114EC0 00111E20 4E 80 00 20 */ blr lbl_80114EC4: /* 80114EC4 00111E24 88 63 00 38 */ lbz r3, 0x38(r3) -/* 80114EC8 00111E28 4E 80 00 20 */ blr +/* 80114EC8 00111E28 4E 80 00 20 */ blr lbl_80114ECC: /* 80114ECC 00111E2C 88 63 00 48 */ lbz r3, 0x48(r3) -/* 80114ED0 00111E30 4E 80 00 20 */ blr +/* 80114ED0 00111E30 4E 80 00 20 */ blr lbl_80114ED4: /* 80114ED4 00111E34 38 60 00 00 */ li r3, 0 -/* 80114ED8 00111E38 4E 80 00 20 */ blr +/* 80114ED8 00111E38 4E 80 00 20 */ blr .global GetRenderingModel__10CModelDataFRC13CStateManager GetRenderingModel__10CModelDataFRC13CStateManager: @@ -243,7 +243,7 @@ lbl_80114F48: /* 80114F4C 00111EAC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80114F50 00111EB0 7C 08 03 A6 */ mtlr r0 /* 80114F54 00111EB4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80114F58 00111EB8 4E 80 00 20 */ blr +/* 80114F58 00111EB8 4E 80 00 20 */ blr .global PickAnimatedModel__10CModelDataCFQ210CModelData11EWhichModel PickAnimatedModel__10CModelDataCFQ210CModelData11EWhichModel: @@ -265,11 +265,11 @@ lbl_80114F90: /* 80114F90 00111EF0 28 00 00 00 */ cmplwi r0, 0 /* 80114F94 00111EF4 41 82 00 0C */ beq lbl_80114FA0 /* 80114F98 00111EF8 7C 03 03 78 */ mr r3, r0 -/* 80114F9C 00111EFC 4E 80 00 20 */ blr +/* 80114F9C 00111EFC 4E 80 00 20 */ blr lbl_80114FA0: /* 80114FA0 00111F00 80 63 00 10 */ lwz r3, 0x10(r3) /* 80114FA4 00111F04 80 63 00 E0 */ lwz r3, 0xe0(r3) -/* 80114FA8 00111F08 4E 80 00 20 */ blr +/* 80114FA8 00111F08 4E 80 00 20 */ blr .global PickStaticModel__10CModelDataCFQ210CModelData11EWhichModel PickStaticModel__10CModelDataCFQ210CModelData11EWhichModel: @@ -282,16 +282,16 @@ PickStaticModel__10CModelDataCFQ210CModelData11EWhichModel: /* 80114FC4 00111F24 28 00 00 00 */ cmplwi r0, 0 /* 80114FC8 00111F28 41 82 00 20 */ beq lbl_80114FE8 /* 80114FCC 00111F2C 38 63 00 3C */ addi r3, r3, 0x3c -/* 80114FD0 00111F30 4E 80 00 20 */ blr +/* 80114FD0 00111F30 4E 80 00 20 */ blr lbl_80114FD4: /* 80114FD4 00111F34 88 03 00 38 */ lbz r0, 0x38(r3) /* 80114FD8 00111F38 28 00 00 00 */ cmplwi r0, 0 /* 80114FDC 00111F3C 41 82 00 0C */ beq lbl_80114FE8 /* 80114FE0 00111F40 38 63 00 2C */ addi r3, r3, 0x2c -/* 80114FE4 00111F44 4E 80 00 20 */ blr +/* 80114FE4 00111F44 4E 80 00 20 */ blr lbl_80114FE8: /* 80114FE8 00111F48 38 63 00 1C */ addi r3, r3, 0x1c -/* 80114FEC 00111F4C 4E 80 00 20 */ blr +/* 80114FEC 00111F4C 4E 80 00 20 */ blr .global "SetXRayModel__10CModelDataFRCQ24rstl11pair" "SetXRayModel__10CModelDataFRCQ24rstl11pair": @@ -337,7 +337,7 @@ lbl_80115038: /* 80115088 00111FE8 81 84 00 00 */ lwz r12, 0(r4) /* 8011508C 00111FEC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80115090 00111FF0 7D 89 03 A6 */ mtctr r12 -/* 80115094 00111FF4 4E 80 04 21 */ bctrl +/* 80115094 00111FF4 4E 80 04 21 */ bctrl /* 80115098 00111FF8 38 61 00 30 */ addi r3, r1, 0x30 /* 8011509C 00111FFC 38 81 00 38 */ addi r4, r1, 0x38 /* 801150A0 00112000 48 22 BE 09 */ bl __ct__6CTokenFRC6CToken @@ -360,7 +360,7 @@ lbl_80115038: /* 801150E4 00112044 81 84 00 00 */ lwz r12, 0(r4) /* 801150E8 00112048 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801150EC 0011204C 7D 89 03 A6 */ mtctr r12 -/* 801150F0 00112050 4E 80 04 21 */ bctrl +/* 801150F0 00112050 4E 80 04 21 */ bctrl /* 801150F4 00112054 38 61 00 18 */ addi r3, r1, 0x18 /* 801150F8 00112058 38 81 00 20 */ addi r4, r1, 0x20 /* 801150FC 0011205C 48 22 BD AD */ bl __ct__6CTokenFRC6CToken @@ -407,7 +407,7 @@ lbl_8011517C: /* 8011519C 001120FC 81 84 00 00 */ lwz r12, 0(r4) /* 801151A0 00112100 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801151A4 00112104 7D 89 03 A6 */ mtctr r12 -/* 801151A8 00112108 4E 80 04 21 */ bctrl +/* 801151A8 00112108 4E 80 04 21 */ bctrl /* 801151AC 0011210C 3B A1 00 48 */ addi r29, r1, 0x48 /* 801151B0 00112110 38 81 00 08 */ addi r4, r1, 8 /* 801151B4 00112114 7F A3 EB 78 */ mr r3, r29 @@ -453,7 +453,7 @@ lbl_80115238: /* 80115244 001121A4 83 A1 00 74 */ lwz r29, 0x74(r1) /* 80115248 001121A8 7C 08 03 A6 */ mtlr r0 /* 8011524C 001121AC 38 21 00 80 */ addi r1, r1, 0x80 -/* 80115250 001121B0 4E 80 00 20 */ blr +/* 80115250 001121B0 4E 80 00 20 */ blr .global "SetInfraModel__10CModelDataFRCQ24rstl11pair" "SetInfraModel__10CModelDataFRCQ24rstl11pair": @@ -484,7 +484,7 @@ lbl_80115238: /* 801152B4 00112214 81 84 00 00 */ lwz r12, 0(r4) /* 801152B8 00112218 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801152BC 0011221C 7D 89 03 A6 */ mtctr r12 -/* 801152C0 00112220 4E 80 04 21 */ bctrl +/* 801152C0 00112220 4E 80 04 21 */ bctrl /* 801152C4 00112224 38 61 00 30 */ addi r3, r1, 0x30 /* 801152C8 00112228 38 81 00 38 */ addi r4, r1, 0x38 /* 801152CC 0011222C 48 22 BB DD */ bl __ct__6CTokenFRC6CToken @@ -507,7 +507,7 @@ lbl_80115238: /* 80115310 00112270 81 84 00 00 */ lwz r12, 0(r4) /* 80115314 00112274 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80115318 00112278 7D 89 03 A6 */ mtctr r12 -/* 8011531C 0011227C 4E 80 04 21 */ bctrl +/* 8011531C 0011227C 4E 80 04 21 */ bctrl /* 80115320 00112280 38 61 00 18 */ addi r3, r1, 0x18 /* 80115324 00112284 38 81 00 20 */ addi r4, r1, 0x20 /* 80115328 00112288 48 22 BB 81 */ bl __ct__6CTokenFRC6CToken @@ -553,7 +553,7 @@ lbl_801153A8: /* 801153C4 00112324 81 84 00 00 */ lwz r12, 0(r4) /* 801153C8 00112328 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801153CC 0011232C 7D 89 03 A6 */ mtctr r12 -/* 801153D0 00112330 4E 80 04 21 */ bctrl +/* 801153D0 00112330 4E 80 04 21 */ bctrl /* 801153D4 00112334 3B A1 00 48 */ addi r29, r1, 0x48 /* 801153D8 00112338 38 81 00 08 */ addi r4, r1, 8 /* 801153DC 0011233C 7F A3 EB 78 */ mr r3, r29 @@ -599,7 +599,7 @@ lbl_80115460: /* 8011546C 001123CC 83 A1 00 74 */ lwz r29, 0x74(r1) /* 80115470 001123D0 7C 08 03 A6 */ mtlr r0 /* 80115474 001123D4 38 21 00 80 */ addi r1, r1, 0x80 -/* 80115478 001123D8 4E 80 00 20 */ blr +/* 80115478 001123D8 4E 80 00 20 */ blr .global IsDefinitelyOpaque__10CModelDataCFQ210CModelData11EWhichModel IsDefinitelyOpaque__10CModelDataCFQ210CModelData11EWhichModel: @@ -641,7 +641,7 @@ lbl_801154FC: /* 801154FC 0011245C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80115500 00112460 7C 08 03 A6 */ mtlr r0 /* 80115504 00112464 38 21 00 10 */ addi r1, r1, 0x10 -/* 80115508 00112468 4E 80 00 20 */ blr +/* 80115508 00112468 4E 80 00 20 */ blr .global GetIsLoop__10CModelDataCFv GetIsLoop__10CModelDataCFv: @@ -649,11 +649,11 @@ GetIsLoop__10CModelDataCFv: /* 80115510 00112470 28 03 00 00 */ cmplwi r3, 0 /* 80115514 00112474 40 82 00 0C */ bne lbl_80115520 /* 80115518 00112478 38 60 00 00 */ li r3, 0 -/* 8011551C 0011247C 4E 80 00 20 */ blr +/* 8011551C 0011247C 4E 80 00 20 */ blr lbl_80115520: /* 80115520 00112480 88 03 02 20 */ lbz r0, 0x220(r3) /* 80115524 00112484 54 03 D7 FE */ rlwinm r3, r0, 0x1a, 0x1f, 0x1f -/* 80115528 00112488 4E 80 00 20 */ blr +/* 80115528 00112488 4E 80 00 20 */ blr .global GetAnimationDuration__10CModelDataCFi GetAnimationDuration__10CModelDataCFi: @@ -671,13 +671,13 @@ lbl_80115550: /* 80115550 001124B0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80115554 001124B4 7C 08 03 A6 */ mtlr r0 /* 80115558 001124B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011555C 001124BC 4E 80 00 20 */ blr +/* 8011555C 001124BC 4E 80 00 20 */ blr .global EnableLooping__10CModelDataFb EnableLooping__10CModelDataFb: /* 80115560 001124C0 80 A3 00 10 */ lwz r5, 0x10(r3) /* 80115564 001124C4 28 05 00 00 */ cmplwi r5, 0 -/* 80115568 001124C8 4D 82 00 20 */ beqlr +/* 80115568 001124C8 4D 82 00 20 */ beqlr /* 8011556C 001124CC 88 05 02 20 */ lbz r0, 0x220(r5) /* 80115570 001124D0 50 80 36 72 */ rlwimi r0, r4, 6, 0x19, 0x19 /* 80115574 001124D4 38 60 00 01 */ li r3, 1 @@ -685,7 +685,7 @@ EnableLooping__10CModelDataFb: /* 8011557C 001124DC 88 05 02 20 */ lbz r0, 0x220(r5) /* 80115580 001124E0 50 60 3E 30 */ rlwimi r0, r3, 7, 0x18, 0x18 /* 80115584 001124E4 98 05 02 20 */ stb r0, 0x220(r5) -/* 80115588 001124E8 4E 80 00 20 */ blr +/* 80115588 001124E8 4E 80 00 20 */ blr .global AdvanceParticles__10CModelDataFRC12CTransform4ffR13CStateManager AdvanceParticles__10CModelDataFRC12CTransform4ffR13CStateManager: @@ -703,7 +703,7 @@ lbl_801155B4: /* 801155B4 00112514 80 01 00 14 */ lwz r0, 0x14(r1) /* 801155B8 00112518 7C 08 03 A6 */ mtlr r0 /* 801155BC 0011251C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801155C0 00112520 4E 80 00 20 */ blr +/* 801155C0 00112520 4E 80 00 20 */ blr .global GetBounds__10CModelDataCFv GetBounds__10CModelDataCFv: @@ -835,7 +835,7 @@ lbl_80115798: /* 801157A4 00112704 83 A1 00 84 */ lwz r29, 0x84(r1) /* 801157A8 00112708 7C 08 03 A6 */ mtlr r0 /* 801157AC 0011270C 38 21 00 90 */ addi r1, r1, 0x90 -/* 801157B0 00112710 4E 80 00 20 */ blr +/* 801157B0 00112710 4E 80 00 20 */ blr .global GetBounds__10CModelDataCFRC12CTransform4f GetBounds__10CModelDataCFRC12CTransform4f: @@ -933,7 +933,7 @@ lbl_80115900: /* 8011590C 0011286C 83 A1 00 B4 */ lwz r29, 0xb4(r1) /* 80115910 00112870 7C 08 03 A6 */ mtlr r0 /* 80115914 00112874 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 80115918 00112878 4E 80 00 20 */ blr +/* 80115918 00112878 4E 80 00 20 */ blr .global "GetScaledLocatorTransformDynamic__10CModelDataCFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>PC13CCharAnimTime" "GetScaledLocatorTransformDynamic__10CModelDataCFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>PC13CCharAnimTime": @@ -969,7 +969,7 @@ lbl_80115900: /* 80115990 001128F0 83 C1 00 68 */ lwz r30, 0x68(r1) /* 80115994 001128F4 7C 08 03 A6 */ mtlr r0 /* 80115998 001128F8 38 21 00 70 */ addi r1, r1, 0x70 -/* 8011599C 001128FC 4E 80 00 20 */ blr +/* 8011599C 001128FC 4E 80 00 20 */ blr .global "GetScaledLocatorTransform__10CModelDataCFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" "GetScaledLocatorTransform__10CModelDataCFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>": @@ -1005,7 +1005,7 @@ lbl_80115900: /* 80115A14 00112974 83 C1 00 68 */ lwz r30, 0x68(r1) /* 80115A18 00112978 7C 08 03 A6 */ mtlr r0 /* 80115A1C 0011297C 38 21 00 70 */ addi r1, r1, 0x70 -/* 80115A20 00112980 4E 80 00 20 */ blr +/* 80115A20 00112980 4E 80 00 20 */ blr .global "GetLocatorTransformDynamic__10CModelDataCFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>PC13CCharAnimTime" "GetLocatorTransformDynamic__10CModelDataCFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>PC13CCharAnimTime": @@ -1028,7 +1028,7 @@ lbl_80115A58: /* 80115A5C 001129BC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80115A60 001129C0 7C 08 03 A6 */ mtlr r0 /* 80115A64 001129C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80115A68 001129C8 4E 80 00 20 */ blr +/* 80115A68 001129C8 4E 80 00 20 */ blr .global "GetLocatorTransform__10CModelDataCFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" "GetLocatorTransform__10CModelDataCFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>": @@ -1052,7 +1052,7 @@ lbl_80115AA4: /* 80115AA8 00112A08 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80115AAC 00112A0C 7C 08 03 A6 */ mtlr r0 /* 80115AB0 00112A10 38 21 00 10 */ addi r1, r1, 0x10 -/* 80115AB4 00112A14 4E 80 00 20 */ blr +/* 80115AB4 00112A14 4E 80 00 20 */ blr .global AdvanceAnimationIgnoreParticles__10CModelDataFfR9CRandom16b AdvanceAnimationIgnoreParticles__10CModelDataFfR9CRandom16b: @@ -1088,7 +1088,7 @@ lbl_80115B20: /* 80115B24 00112A84 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80115B28 00112A88 7C 08 03 A6 */ mtlr r0 /* 80115B2C 00112A8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80115B30 00112A90 4E 80 00 20 */ blr +/* 80115B30 00112A90 4E 80 00 20 */ blr .global AdvanceAnimation__10CModelDataFfR13CStateManager7TAreaIdb AdvanceAnimation__10CModelDataFfR13CStateManager7TAreaIdb: @@ -1137,19 +1137,19 @@ lbl_80115BD0: /* 80115BD4 00112B34 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80115BD8 00112B38 7C 08 03 A6 */ mtlr r0 /* 80115BDC 00112B3C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80115BE0 00112B40 4E 80 00 20 */ blr +/* 80115BE0 00112B40 4E 80 00 20 */ blr .global IsAnimating__10CModelDataCFv IsAnimating__10CModelDataCFv: /* 80115BE4 00112B44 80 83 00 10 */ lwz r4, 0x10(r3) /* 80115BE8 00112B48 38 60 00 00 */ li r3, 0 /* 80115BEC 00112B4C 28 04 00 00 */ cmplwi r4, 0 -/* 80115BF0 00112B50 4D 82 00 20 */ beqlr +/* 80115BF0 00112B50 4D 82 00 20 */ beqlr /* 80115BF4 00112B54 88 04 02 20 */ lbz r0, 0x220(r4) /* 80115BF8 00112B58 54 00 CF FF */ rlwinm. r0, r0, 0x19, 0x1f, 0x1f -/* 80115BFC 00112B5C 4D 82 00 20 */ beqlr +/* 80115BFC 00112B5C 4D 82 00 20 */ beqlr /* 80115C00 00112B60 38 60 00 01 */ li r3, 1 -/* 80115C04 00112B64 4E 80 00 20 */ blr +/* 80115C04 00112B64 4E 80 00 20 */ blr .global IsInFrustum__10CModelDataCFRC12CTransform4fRC14CFrustumPlanes IsInFrustum__10CModelDataCFRC12CTransform4fRC14CFrustumPlanes: @@ -1185,7 +1185,7 @@ lbl_80115C6C: /* 80115C70 00112BD0 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 80115C74 00112BD4 7C 08 03 A6 */ mtlr r0 /* 80115C78 00112BD8 38 21 00 30 */ addi r1, r1, 0x30 -/* 80115C7C 00112BDC 4E 80 00 20 */ blr +/* 80115C7C 00112BDC 4E 80 00 20 */ blr .global RenderParticles__10CModelDataCFRC14CFrustumPlanes RenderParticles__10CModelDataCFRC14CFrustumPlanes: @@ -1200,7 +1200,7 @@ lbl_80115C9C: /* 80115C9C 00112BFC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80115CA0 00112C00 7C 08 03 A6 */ mtlr r0 /* 80115CA4 00112C04 38 21 00 10 */ addi r1, r1, 0x10 -/* 80115CA8 00112C08 4E 80 00 20 */ blr +/* 80115CA8 00112C08 4E 80 00 20 */ blr .global Touch__10CModelDataCFQ210CModelData11EWhichModeli Touch__10CModelDataCFQ210CModelData11EWhichModeli: @@ -1230,7 +1230,7 @@ lbl_80115CF8: /* 80115D00 00112C60 83 C1 00 08 */ lwz r30, 8(r1) /* 80115D04 00112C64 7C 08 03 A6 */ mtlr r0 /* 80115D08 00112C68 38 21 00 10 */ addi r1, r1, 0x10 -/* 80115D0C 00112C6C 4E 80 00 20 */ blr +/* 80115D0C 00112C6C 4E 80 00 20 */ blr .global Touch__10CModelDataCFRC13CStateManageri Touch__10CModelDataCFRC13CStateManageri: @@ -1252,7 +1252,7 @@ Touch__10CModelDataCFRC13CStateManageri: /* 80115D4C 00112CAC 83 C1 00 08 */ lwz r30, 8(r1) /* 80115D50 00112CB0 7C 08 03 A6 */ mtlr r0 /* 80115D54 00112CB4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80115D58 00112CB8 4E 80 00 20 */ blr +/* 80115D58 00112CB8 4E 80 00 20 */ blr .global MultipassDraw__10CModelDataF11EWhichModelRC12CTransform4fPC12CActorLightsPC11CModelFlagsi MultipassDraw__10CModelDataF11EWhichModelRC12CTransform4fPC12CActorLightsPC11CModelFlagsi: @@ -1281,7 +1281,7 @@ MultipassDraw__10CModelDataF11EWhichModelRC12CTransform4fPC12CActorLightsPC11CMo /* 80115DB4 00112D14 81 83 00 00 */ lwz r12, 0(r3) /* 80115DB8 00112D18 81 8C 00 30 */ lwz r12, 0x30(r12) /* 80115DBC 00112D1C 7D 89 03 A6 */ mtctr r12 -/* 80115DC0 00112D20 4E 80 04 21 */ bctrl +/* 80115DC0 00112D20 4E 80 04 21 */ bctrl /* 80115DC4 00112D24 28 1E 00 00 */ cmplwi r30, 0 /* 80115DC8 00112D28 41 82 00 10 */ beq lbl_80115DD8 /* 80115DCC 00112D2C 7F C3 F3 78 */ mr r3, r30 @@ -1294,7 +1294,7 @@ lbl_80115DD8: /* 80115DE4 00112D44 81 83 00 00 */ lwz r12, 0(r3) /* 80115DE8 00112D48 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 80115DEC 00112D4C 7D 89 03 A6 */ mtctr r12 -/* 80115DF0 00112D50 4E 80 04 21 */ bctrl +/* 80115DF0 00112D50 4E 80 04 21 */ bctrl lbl_80115DF4: /* 80115DF4 00112D54 80 1A 00 10 */ lwz r0, 0x10(r26) /* 80115DF8 00112D58 28 00 00 00 */ cmplwi r0, 0 @@ -1344,7 +1344,7 @@ lbl_80115E94: /* 80115E98 00112DF8 80 01 01 14 */ lwz r0, 0x114(r1) /* 80115E9C 00112DFC 7C 08 03 A6 */ mtlr r0 /* 80115EA0 00112E00 38 21 01 10 */ addi r1, r1, 0x110 -/* 80115EA4 00112E04 4E 80 00 20 */ blr +/* 80115EA4 00112E04 4E 80 00 20 */ blr .global MultiLightingDraw__10CModelDataF11EWhichModelRC12CTransform4fPC12CActorLightsRC6CColorRC6CColor MultiLightingDraw__10CModelDataF11EWhichModelRC12CTransform4fPC12CActorLightsRC6CColorRC6CColor: @@ -1373,7 +1373,7 @@ MultiLightingDraw__10CModelDataF11EWhichModelRC12CTransform4fPC12CActorLightsRC6 /* 80115F00 00112E60 81 83 00 00 */ lwz r12, 0(r3) /* 80115F04 00112E64 81 8C 00 30 */ lwz r12, 0x30(r12) /* 80115F08 00112E68 7D 89 03 A6 */ mtctr r12 -/* 80115F0C 00112E6C 4E 80 04 21 */ bctrl +/* 80115F0C 00112E6C 4E 80 04 21 */ bctrl /* 80115F10 00112E70 80 1A 00 10 */ lwz r0, 0x10(r26) /* 80115F14 00112E74 28 00 00 00 */ cmplwi r0, 0 /* 80115F18 00112E78 41 82 00 68 */ beq lbl_80115F80 @@ -1420,7 +1420,7 @@ lbl_80115FB0: /* 80115FB4 00112F14 80 01 01 24 */ lwz r0, 0x124(r1) /* 80115FB8 00112F18 7C 08 03 A6 */ mtlr r0 /* 80115FBC 00112F1C 38 21 01 20 */ addi r1, r1, 0x120 -/* 80115FC0 00112F20 4E 80 00 20 */ blr +/* 80115FC0 00112F20 4E 80 00 20 */ blr .global FlatDraw__10CModelDataF11EWhichModelRC12CTransform4fbRC11CModelFlags FlatDraw__10CModelDataF11EWhichModelRC12CTransform4fbRC11CModelFlags: @@ -1448,7 +1448,7 @@ FlatDraw__10CModelDataF11EWhichModelRC12CTransform4fbRC11CModelFlags: /* 80116018 00112F78 81 83 00 00 */ lwz r12, 0(r3) /* 8011601C 00112F7C 81 8C 00 30 */ lwz r12, 0x30(r12) /* 80116020 00112F80 7D 89 03 A6 */ mtctr r12 -/* 80116024 00112F84 4E 80 04 21 */ bctrl +/* 80116024 00112F84 4E 80 04 21 */ bctrl /* 80116028 00112F88 48 1F 69 55 */ bl DisableAllLights__9CGraphicsFv /* 8011602C 00112F8C 80 1B 00 10 */ lwz r0, 0x10(r27) /* 80116030 00112F90 28 00 00 00 */ cmplwi r0, 0 @@ -1490,13 +1490,13 @@ lbl_80116094: /* 801160BC 0011301C 39 00 00 00 */ li r8, 0 /* 801160C0 00113020 81 8C 00 D8 */ lwz r12, 0xd8(r12) /* 801160C4 00113024 7D 89 03 A6 */ mtctr r12 -/* 801160C8 00113028 4E 80 04 21 */ bctrl +/* 801160C8 00113028 4E 80 04 21 */ bctrl lbl_801160CC: /* 801160CC 0011302C BB 61 00 FC */ lmw r27, 0xfc(r1) /* 801160D0 00113030 80 01 01 14 */ lwz r0, 0x114(r1) /* 801160D4 00113034 7C 08 03 A6 */ mtlr r0 /* 801160D8 00113038 38 21 01 10 */ addi r1, r1, 0x110 -/* 801160DC 0011303C 4E 80 00 20 */ blr +/* 801160DC 0011303C 4E 80 00 20 */ blr .global DisintegrateDraw__10CModelDataFRC13CStateManagerRC12CTransform4fRC8CTextureRC6CColor DisintegrateDraw__10CModelDataFRC13CStateManagerRC12CTransform4fRC8CTextureRC6CColor: @@ -1530,7 +1530,7 @@ DisintegrateDraw__10CModelDataFRC13CStateManagerRC12CTransform4fRC8CTextureRC6CC /* 8011614C 001130AC 83 81 00 08 */ lwz r28, 8(r1) /* 80116150 001130B0 7C 08 03 A6 */ mtlr r0 /* 80116154 001130B4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80116158 001130B8 4E 80 00 20 */ blr +/* 80116158 001130B8 4E 80 00 20 */ blr .global DisintegrateDraw__10CModelDataF11EWhichModelRC12CTransform4fRC8CTextureRC6CColor DisintegrateDraw__10CModelDataF11EWhichModelRC12CTransform4fRC8CTextureRC6CColor: @@ -1560,7 +1560,7 @@ DisintegrateDraw__10CModelDataF11EWhichModelRC12CTransform4fRC8CTextureRC6CColor /* 801161B8 00113118 81 83 00 00 */ lwz r12, 0(r3) /* 801161BC 0011311C 81 8C 00 30 */ lwz r12, 0x30(r12) /* 801161C0 00113120 7D 89 03 A6 */ mtctr r12 -/* 801161C4 00113124 4E 80 04 21 */ bctrl +/* 801161C4 00113124 4E 80 04 21 */ bctrl /* 801161C8 00113128 48 1F 67 B5 */ bl DisableAllLights__9CGraphicsFv /* 801161CC 0011312C 7F 64 DB 78 */ mr r4, r27 /* 801161D0 00113130 38 61 00 18 */ addi r3, r1, 0x18 @@ -1609,14 +1609,14 @@ lbl_8011624C: /* 80116278 001131D8 81 8C 00 D4 */ lwz r12, 0xd4(r12) /* 8011627C 001131DC 39 00 00 00 */ li r8, 0 /* 80116280 001131E0 7D 89 03 A6 */ mtctr r12 -/* 80116284 001131E4 4E 80 04 21 */ bctrl +/* 80116284 001131E4 4E 80 04 21 */ bctrl lbl_80116288: /* 80116288 001131E8 CB E1 01 28 */ lfd f31, 0x128(r1) /* 8011628C 001131EC BB 61 01 14 */ lmw r27, 0x114(r1) /* 80116290 001131F0 80 01 01 34 */ lwz r0, 0x134(r1) /* 80116294 001131F4 7C 08 03 A6 */ mtlr r0 /* 80116298 001131F8 38 21 01 30 */ addi r1, r1, 0x130 -/* 8011629C 001131FC 4E 80 00 20 */ blr +/* 8011629C 001131FC 4E 80 00 20 */ blr .global RenderThermal__10CModelDataCFRC12CTransform4fRC6CColorRC6CColorRC11CModelFlags RenderThermal__10CModelDataCFRC12CTransform4fRC6CColorRC6CColorRC11CModelFlags: @@ -1644,7 +1644,7 @@ RenderThermal__10CModelDataCFRC12CTransform4fRC6CColorRC6CColorRC11CModelFlags: /* 801162F4 00113254 81 83 00 00 */ lwz r12, 0(r3) /* 801162F8 00113258 81 8C 00 30 */ lwz r12, 0x30(r12) /* 801162FC 0011325C 7D 89 03 A6 */ mtctr r12 -/* 80116300 00113260 4E 80 04 21 */ bctrl +/* 80116300 00113260 4E 80 04 21 */ bctrl /* 80116304 00113264 48 1F 66 79 */ bl DisableAllLights__9CGraphicsFv /* 80116308 00113268 80 1B 00 10 */ lwz r0, 0x10(r27) /* 8011630C 0011326C 28 00 00 00 */ cmplwi r0, 0 @@ -1684,13 +1684,13 @@ lbl_80116364: /* 80116390 001132F0 81 8C 00 D0 */ lwz r12, 0xd0(r12) /* 80116394 001132F4 39 00 00 00 */ li r8, 0 /* 80116398 001132F8 7D 89 03 A6 */ mtctr r12 -/* 8011639C 001132FC 4E 80 04 21 */ bctrl +/* 8011639C 001132FC 4E 80 04 21 */ bctrl lbl_801163A0: /* 801163A0 00113300 BB 61 00 EC */ lmw r27, 0xec(r1) /* 801163A4 00113304 80 01 01 04 */ lwz r0, 0x104(r1) /* 801163A8 00113308 7C 08 03 A6 */ mtlr r0 /* 801163AC 0011330C 38 21 01 00 */ addi r1, r1, 0x100 -/* 801163B0 00113310 4E 80 00 20 */ blr +/* 801163B0 00113310 4E 80 00 20 */ blr .global RenderThermal__10CModelDataCFPCfPCfRC6CColorRC6CColorRC11CModelFlags RenderThermal__10CModelDataCFPCfPCfRC6CColorRC6CColorRC11CModelFlags: @@ -1709,11 +1709,11 @@ RenderThermal__10CModelDataCFPCfPCfRC6CColorRC6CColorRC11CModelFlags: /* 801163E4 00113344 81 83 00 00 */ lwz r12, 0(r3) /* 801163E8 00113348 81 8C 00 D0 */ lwz r12, 0xd0(r12) /* 801163EC 0011334C 7D 89 03 A6 */ mtctr r12 -/* 801163F0 00113350 4E 80 04 21 */ bctrl +/* 801163F0 00113350 4E 80 04 21 */ bctrl /* 801163F4 00113354 80 01 00 14 */ lwz r0, 0x14(r1) /* 801163F8 00113358 7C 08 03 A6 */ mtlr r0 /* 801163FC 0011335C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80116400 00113360 4E 80 00 20 */ blr +/* 80116400 00113360 4E 80 00 20 */ blr .global ThermalDraw__10CModelDataRC6CColorRC6CColorRC11CModelFlags ThermalDraw__10CModelDataRC6CColorRC6CColorRC11CModelFlags: @@ -1733,7 +1733,7 @@ ThermalDraw__10CModelDataRC6CColorRC6CColorRC11CModelFlags: /* 80116438 00113398 80 01 00 24 */ lwz r0, 0x24(r1) /* 8011643C 0011339C 7C 08 03 A6 */ mtlr r0 /* 80116440 001133A0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80116444 001133A4 4E 80 00 20 */ blr +/* 80116444 001133A4 4E 80 00 20 */ blr .global MultipassDrawCallback__10CModelDataFPCfPCfPC21SMultipassDrawContext MultipassDrawCallback__10CModelDataFPCfPCfPC21SMultipassDrawContext: @@ -1766,7 +1766,7 @@ lbl_80116498: /* 801164A8 00113408 80 01 00 24 */ lwz r0, 0x24(r1) /* 801164AC 0011340C 7C 08 03 A6 */ mtlr r0 /* 801164B0 00113410 38 21 00 20 */ addi r1, r1, 0x20 -/* 801164B4 00113414 4E 80 00 20 */ blr +/* 801164B4 00113414 4E 80 00 20 */ blr .global MultiLightingDrawCallback__10CModelDataFPCfPCfPC25SMultiLightingDrawContext MultiLightingDrawCallback__10CModelDataFPCfPCfPC25SMultiLightingDrawContext: @@ -1871,7 +1871,7 @@ lbl_80116624: /* 80116630 00113590 83 A1 00 44 */ lwz r29, 0x44(r1) /* 80116634 00113594 7C 08 03 A6 */ mtlr r0 /* 80116638 00113598 38 21 00 50 */ addi r1, r1, 0x50 -/* 8011663C 0011359C 4E 80 00 20 */ blr +/* 8011663C 0011359C 4E 80 00 20 */ blr .global FlatDrawCallback__10CModelDataFPCfPCfPC16SFlatDrawContext FlatDrawCallback__10CModelDataFPCfPCfPC16SFlatDrawContext: @@ -1889,11 +1889,11 @@ FlatDrawCallback__10CModelDataFPCfPCfPC16SFlatDrawContext: /* 8011666C 001135CC 80 A6 00 08 */ lwz r5, 8(r6) /* 80116670 001135D0 88 C6 00 04 */ lbz r6, 4(r6) /* 80116674 001135D4 7D 89 03 A6 */ mtctr r12 -/* 80116678 001135D8 4E 80 04 21 */ bctrl +/* 80116678 001135D8 4E 80 04 21 */ bctrl /* 8011667C 001135DC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80116680 001135E0 7C 08 03 A6 */ mtlr r0 /* 80116684 001135E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80116688 001135E8 4E 80 00 20 */ blr +/* 80116688 001135E8 4E 80 00 20 */ blr .global DisintegrateDrawCallback__10CModelDataFPCfPCfPC22SOneTextureDrawContext DisintegrateDrawCallback__10CModelDataFPCfPCfPC22SOneTextureDrawContext: @@ -1912,11 +1912,11 @@ DisintegrateDrawCallback__10CModelDataFPCfPCfPC22SOneTextureDrawContext: /* 801166BC 0011361C 80 A9 00 04 */ lwz r5, 4(r9) /* 801166C0 00113620 C0 29 00 0C */ lfs f1, 0xc(r9) /* 801166C4 00113624 7D 89 03 A6 */ mtctr r12 -/* 801166C8 00113628 4E 80 04 21 */ bctrl +/* 801166C8 00113628 4E 80 04 21 */ bctrl /* 801166CC 0011362C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801166D0 00113630 7C 08 03 A6 */ mtlr r0 /* 801166D4 00113634 38 21 00 10 */ addi r1, r1, 0x10 -/* 801166D8 00113638 4E 80 00 20 */ blr +/* 801166D8 00113638 4E 80 00 20 */ blr .global ThermalDrawCallback__10CModelDataFPCfPCfPC19SThermalDrawContext ThermalDrawCallback__10CModelDataFPCfPCfPC19SThermalDrawContext: @@ -1935,11 +1935,11 @@ ThermalDrawCallback__10CModelDataFPCfPCfPC19SThermalDrawContext: /* 8011670C 0011366C 81 8C 00 D0 */ lwz r12, 0xd0(r12) /* 80116710 00113670 81 2A 00 0C */ lwz r9, 0xc(r10) /* 80116714 00113674 7D 89 03 A6 */ mtctr r12 -/* 80116718 00113678 4E 80 04 21 */ bctrl +/* 80116718 00113678 4E 80 04 21 */ bctrl /* 8011671C 0011367C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80116720 00113680 7C 08 03 A6 */ mtlr r0 /* 80116724 00113684 38 21 00 10 */ addi r1, r1, 0x10 -/* 80116728 00113688 4E 80 00 20 */ blr +/* 80116728 00113688 4E 80 00 20 */ blr .global RenderUnsortedParts__10CModelDataCFQ210CModelData11EWhichModelRC12CTransform4fPC12CActorLightsRC11CModelFlags RenderUnsortedParts__10CModelDataCFQ210CModelData11EWhichModelRC12CTransform4fPC12CActorLightsRC11CModelFlags: @@ -1992,7 +1992,7 @@ lbl_801167A0: /* 801167D8 00113738 81 83 00 00 */ lwz r12, 0(r3) /* 801167DC 0011373C 81 8C 00 30 */ lwz r12, 0x30(r12) /* 801167E0 00113740 7D 89 03 A6 */ mtctr r12 -/* 801167E4 00113744 4E 80 04 21 */ bctrl +/* 801167E4 00113744 4E 80 04 21 */ bctrl /* 801167E8 00113748 28 1E 00 00 */ cmplwi r30, 0 /* 801167EC 0011374C 41 82 00 10 */ beq lbl_801167FC /* 801167F0 00113750 7F C3 F3 78 */ mr r3, r30 @@ -2005,7 +2005,7 @@ lbl_801167FC: /* 80116808 00113768 81 83 00 00 */ lwz r12, 0(r3) /* 8011680C 0011376C 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 80116810 00113770 7D 89 03 A6 */ mtctr r12 -/* 80116814 00113774 4E 80 04 21 */ bctrl +/* 80116814 00113774 4E 80 04 21 */ bctrl lbl_80116818: /* 80116818 00113778 7F 63 DB 78 */ mr r3, r27 /* 8011681C 0011377C 7F 84 E3 78 */ mr r4, r28 @@ -2019,7 +2019,7 @@ lbl_80116818: /* 8011683C 0011379C 81 83 00 00 */ lwz r12, 0(r3) /* 80116840 001137A0 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 80116844 001137A4 7D 89 03 A6 */ mtctr r12 -/* 80116848 001137A8 4E 80 04 21 */ bctrl +/* 80116848 001137A8 4E 80 04 21 */ bctrl /* 8011684C 001137AC 48 1F 61 31 */ bl DisableAllLights__9CGraphicsFv /* 80116850 001137B0 88 1B 00 14 */ lbz r0, 0x14(r27) /* 80116854 001137B4 38 60 00 01 */ li r3, 1 @@ -2030,7 +2030,7 @@ lbl_80116860: /* 80116864 001137C4 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 80116868 001137C8 7C 08 03 A6 */ mtlr r0 /* 8011686C 001137CC 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 80116870 001137D0 4E 80 00 20 */ blr +/* 80116870 001137D0 4E 80 00 20 */ blr .global Render__10CModelDataCFQ210CModelData11EWhichModelRC12CTransform4fPC12CActorLightsRC11CModelFlags Render__10CModelDataCFQ210CModelData11EWhichModelRC12CTransform4fPC12CActorLightsRC11CModelFlags: @@ -2090,7 +2090,7 @@ lbl_80116900: /* 80116944 001138A4 81 83 00 00 */ lwz r12, 0(r3) /* 80116948 001138A8 81 8C 00 30 */ lwz r12, 0x30(r12) /* 8011694C 001138AC 7D 89 03 A6 */ mtctr r12 -/* 80116950 001138B0 4E 80 04 21 */ bctrl +/* 80116950 001138B0 4E 80 04 21 */ bctrl /* 80116954 001138B4 28 1E 00 00 */ cmplwi r30, 0 /* 80116958 001138B8 41 82 00 10 */ beq lbl_80116968 /* 8011695C 001138BC 7F C3 F3 78 */ mr r3, r30 @@ -2103,7 +2103,7 @@ lbl_80116968: /* 80116974 001138D4 81 83 00 00 */ lwz r12, 0(r3) /* 80116978 001138D8 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 8011697C 001138DC 7D 89 03 A6 */ mtctr r12 -/* 80116980 001138E0 4E 80 04 21 */ bctrl +/* 80116980 001138E0 4E 80 04 21 */ bctrl lbl_80116984: /* 80116984 001138E4 83 DF 00 10 */ lwz r30, 0x10(r31) /* 80116988 001138E8 28 1E 00 00 */ cmplwi r30, 0 @@ -2147,7 +2147,7 @@ lbl_80116A08: /* 80116A14 00113974 81 83 00 00 */ lwz r12, 0(r3) /* 80116A18 00113978 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 80116A1C 0011397C 7D 89 03 A6 */ mtctr r12 -/* 80116A20 00113980 4E 80 04 21 */ bctrl +/* 80116A20 00113980 4E 80 04 21 */ bctrl /* 80116A24 00113984 48 1F 5F 59 */ bl DisableAllLights__9CGraphicsFv /* 80116A28 00113988 88 1F 00 14 */ lbz r0, 0x14(r31) /* 80116A2C 0011398C 38 60 00 00 */ li r3, 0 @@ -2158,7 +2158,7 @@ lbl_80116A38: /* 80116A3C 0011399C 80 01 01 14 */ lwz r0, 0x114(r1) /* 80116A40 001139A0 7C 08 03 A6 */ mtlr r0 /* 80116A44 001139A4 38 21 01 10 */ addi r1, r1, 0x110 -/* 80116A48 001139A8 4E 80 00 20 */ blr +/* 80116A48 001139A8 4E 80 00 20 */ blr .global __dt__10CModelDataFv __dt__10CModelDataFv: @@ -2235,7 +2235,7 @@ lbl_80116B38: /* 80116B44 00113AA4 83 C1 00 08 */ lwz r30, 8(r1) /* 80116B48 00113AA8 7C 08 03 A6 */ mtlr r0 /* 80116B4C 00113AAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80116B50 00113AB0 4E 80 00 20 */ blr +/* 80116B50 00113AB0 4E 80 00 20 */ blr .global __ct__10CModelDataFRC8CAnimRes __ct__10CModelDataFRC8CAnimRes: @@ -2341,7 +2341,7 @@ lbl_80116CB4: /* 80116CD0 00113C30 83 A1 00 34 */ lwz r29, 0x34(r1) /* 80116CD4 00113C34 7C 08 03 A6 */ mtlr r0 /* 80116CD8 00113C38 38 21 00 40 */ addi r1, r1, 0x40 -/* 80116CDC 00113C3C 4E 80 00 20 */ blr +/* 80116CDC 00113C3C 4E 80 00 20 */ blr .global __ct__10CModelDataFv __ct__10CModelDataFv: @@ -2375,7 +2375,7 @@ __ct__10CModelDataFv: /* 80116D4C 00113CAC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80116D50 00113CB0 7C 08 03 A6 */ mtlr r0 /* 80116D54 00113CB4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80116D58 00113CB8 4E 80 00 20 */ blr +/* 80116D58 00113CB8 4E 80 00 20 */ blr .global __ct__10CModelDataFRC10CStaticRes __ct__10CModelDataFRC10CStaticRes: @@ -2415,7 +2415,7 @@ __ct__10CModelDataFRC10CStaticRes: /* 80116DE0 00113D40 81 84 00 00 */ lwz r12, 0(r4) /* 80116DE4 00113D44 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80116DE8 00113D48 7D 89 03 A6 */ mtctr r12 -/* 80116DEC 00113D4C 4E 80 04 21 */ bctrl +/* 80116DEC 00113D4C 4E 80 04 21 */ bctrl /* 80116DF0 00113D50 3B E1 00 18 */ addi r31, r1, 0x18 /* 80116DF4 00113D54 38 81 00 08 */ addi r4, r1, 8 /* 80116DF8 00113D58 7F E3 FB 78 */ mr r3, r31 @@ -2451,7 +2451,7 @@ lbl_80116E3C: /* 80116E6C 00113DCC 80 01 00 34 */ lwz r0, 0x34(r1) /* 80116E70 00113DD0 7C 08 03 A6 */ mtlr r0 /* 80116E74 00113DD4 38 21 00 30 */ addi r1, r1, 0x30 -/* 80116E78 00113DD8 4E 80 00 20 */ blr +/* 80116E78 00113DD8 4E 80 00 20 */ blr .global __sinit_CModelData_cpp __sinit_CModelData_cpp: diff --git a/asm/MetroidPrime/CNESEmulator.s b/asm/MetroidPrime/CNESEmulator.s index de03f965..dd9d45e4 100644 --- a/asm/MetroidPrime/CNESEmulator.s +++ b/asm/MetroidPrime/CNESEmulator.s @@ -29,12 +29,12 @@ lbl_805A9160: .global GetPassword__12CNESEmulatorFv GetPassword__12CNESEmulatorFv: /* 80293B00 00290A60 38 63 00 21 */ addi r3, r3, 0x21 -/* 80293B04 00290A64 4E 80 00 20 */ blr +/* 80293B04 00290A64 4E 80 00 20 */ blr .global IsGameOver__12CNESEmulatorFv IsGameOver__12CNESEmulatorFv: /* 80293B08 00290A68 88 63 00 20 */ lbz r3, 0x20(r3) -/* 80293B0C 00290A6C 4E 80 00 20 */ blr +/* 80293B0C 00290A6C 4E 80 00 20 */ blr .global LoadPassword__12CNESEmulatorFPCc LoadPassword__12CNESEmulatorFPCc: @@ -52,12 +52,12 @@ LoadPassword__12CNESEmulatorFPCc: /* 80293B3C 00290A9C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80293B40 00290AA0 7C 08 03 A6 */ mtlr r0 /* 80293B44 00290AA4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80293B48 00290AA8 4E 80 00 20 */ blr +/* 80293B48 00290AA8 4E 80 00 20 */ blr .global GetPasswordEntryState__12CNESEmulatorFv GetPasswordEntryState__12CNESEmulatorFv: /* 80293B4C 00290AAC 80 63 00 34 */ lwz r3, 0x34(r3) -/* 80293B50 00290AB0 4E 80 00 20 */ blr +/* 80293B50 00290AB0 4E 80 00 20 */ blr .global Draw__12CNESEmulatorFRC6CColorb Draw__12CNESEmulatorFRC6CColorb: @@ -85,12 +85,12 @@ Draw__12CNESEmulatorFRC6CColorb: /* 80293BA8 00290B08 81 84 00 18 */ lwz r12, 0x18(r4) /* 80293BAC 00290B0C 80 9C 00 0C */ lwz r4, 0xc(r28) /* 80293BB0 00290B10 7D 89 03 A6 */ mtctr r12 -/* 80293BB4 00290B14 4E 80 04 21 */ bctrl +/* 80293BB4 00290B14 4E 80 04 21 */ bctrl /* 80293BB8 00290B18 80 8D A5 A0 */ lwz r4, lbl_805A9160@sda21(r13) /* 80293BBC 00290B1C 80 7C 00 08 */ lwz r3, 8(r28) /* 80293BC0 00290B20 81 84 00 1C */ lwz r12, 0x1c(r4) /* 80293BC4 00290B24 7D 89 03 A6 */ mtctr r12 -/* 80293BC8 00290B28 4E 80 04 21 */ bctrl +/* 80293BC8 00290B28 4E 80 04 21 */ bctrl /* 80293BCC 00290B2C 38 60 00 00 */ li r3, 0 /* 80293BD0 00290B30 48 0E 8B 6D */ bl GXSetClipMode /* 80293BD4 00290B34 38 60 00 00 */ li r3, 0 @@ -171,7 +171,7 @@ lbl_80293C38: /* 80293CFC 00290C5C 81 83 00 00 */ lwz r12, 0(r3) /* 80293D00 00290C60 81 8C 00 30 */ lwz r12, 0x30(r12) /* 80293D04 00290C64 7D 89 03 A6 */ mtctr r12 -/* 80293D08 00290C68 4E 80 04 21 */ bctrl +/* 80293D08 00290C68 4E 80 04 21 */ bctrl /* 80293D0C 00290C6C 3C 60 80 5A */ lis r3, skIdentity4f@ha /* 80293D10 00290C70 38 63 66 70 */ addi r3, r3, skIdentity4f@l /* 80293D14 00290C74 48 07 8A 39 */ bl SetViewPointMatrix__9CGraphicsFRC12CTransform4f @@ -179,7 +179,7 @@ lbl_80293C38: /* 80293D1C 00290C7C 81 83 00 00 */ lwz r12, 0(r3) /* 80293D20 00290C80 81 8C 00 7C */ lwz r12, 0x7c(r12) /* 80293D24 00290C84 7D 89 03 A6 */ mtctr r12 -/* 80293D28 00290C88 4E 80 04 21 */ bctrl +/* 80293D28 00290C88 4E 80 04 21 */ bctrl /* 80293D2C 00290C8C 57 65 06 3E */ clrlwi r5, r27, 0x18 /* 80293D30 00290C90 80 9C 00 04 */ lwz r4, 4(r28) /* 80293D34 00290C94 7C 05 00 D0 */ neg r0, r5 @@ -244,7 +244,7 @@ lbl_80293E18: /* 80293E1C 00290D7C 80 01 00 44 */ lwz r0, 0x44(r1) /* 80293E20 00290D80 7C 08 03 A6 */ mtlr r0 /* 80293E24 00290D84 38 21 00 40 */ addi r1, r1, 0x40 -/* 80293E28 00290D88 4E 80 00 20 */ blr +/* 80293E28 00290D88 4E 80 00 20 */ blr .global sub_80293e2c sub_80293e2c: @@ -448,7 +448,7 @@ sub_80293e2c: /* 80294140 002910A0 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 80294144 002910A4 7C 08 03 A6 */ mtlr r0 /* 80294148 002910A8 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 8029414C 002910AC 4E 80 00 20 */ blr +/* 8029414C 002910AC 4E 80 00 20 */ blr .global Update__12CNESEmulatorFv Update__12CNESEmulatorFv: @@ -463,7 +463,7 @@ Update__12CNESEmulatorFv: /* 80294170 002910D0 81 83 00 00 */ lwz r12, 0(r3) /* 80294174 002910D4 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80294178 002910D8 7D 89 03 A6 */ mtctr r12 -/* 8029417C 002910DC 4E 80 04 21 */ bctrl +/* 8029417C 002910DC 4E 80 04 21 */ bctrl /* 80294180 002910E0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80294184 002910E4 41 82 01 58 */ beq lbl_802942DC /* 80294188 002910E8 3C 60 80 3D */ lis r3, lbl_803D5BA4@ha @@ -487,11 +487,11 @@ Update__12CNESEmulatorFv: /* 802941D0 00291130 80 7F 00 10 */ lwz r3, 0x10(r31) /* 802941D4 00291134 81 83 00 34 */ lwz r12, 0x34(r3) /* 802941D8 00291138 7D 89 03 A6 */ mtctr r12 -/* 802941DC 0029113C 4E 80 04 21 */ bctrl +/* 802941DC 0029113C 4E 80 04 21 */ bctrl /* 802941E0 00291140 80 6D A5 A0 */ lwz r3, lbl_805A9160@sda21(r13) /* 802941E4 00291144 81 83 00 00 */ lwz r12, 0(r3) /* 802941E8 00291148 7D 89 03 A6 */ mtctr r12 -/* 802941EC 0029114C 4E 80 04 21 */ bctrl +/* 802941EC 0029114C 4E 80 04 21 */ bctrl /* 802941F0 00291150 80 8D A5 A0 */ lwz r4, lbl_805A9160@sda21(r13) /* 802941F4 00291154 38 A0 00 00 */ li r5, 0 /* 802941F8 00291158 80 7F 00 08 */ lwz r3, 8(r31) @@ -500,7 +500,7 @@ Update__12CNESEmulatorFv: /* 80294204 00291164 80 DF 00 18 */ lwz r6, 0x18(r31) /* 80294208 00291168 80 FF 00 1C */ lwz r7, 0x1c(r31) /* 8029420C 0029116C 7D 89 03 A6 */ mtctr r12 -/* 80294210 00291170 4E 80 04 21 */ bctrl +/* 80294210 00291170 4E 80 04 21 */ bctrl /* 80294214 00291174 80 7F 00 08 */ lwz r3, 8(r31) /* 80294218 00291178 38 00 00 00 */ li r0, 0 /* 8029421C 0029117C 90 03 00 20 */ stw r0, 0x20(r3) @@ -517,7 +517,7 @@ Update__12CNESEmulatorFv: /* 80294248 002911A8 38 80 00 01 */ li r4, 1 /* 8029424C 002911AC 81 8C 00 08 */ lwz r12, 8(r12) /* 80294250 002911B0 7D 89 03 A6 */ mtctr r12 -/* 80294254 002911B4 4E 80 04 21 */ bctrl +/* 80294254 002911B4 4E 80 04 21 */ bctrl lbl_80294258: /* 80294258 002911B8 38 00 00 00 */ li r0, 0 /* 8029425C 002911BC 90 1F 00 00 */ stw r0, 0(r31) @@ -553,13 +553,13 @@ lbl_802942C0: /* 802942CC 0029122C 81 84 00 10 */ lwz r12, 0x10(r4) /* 802942D0 00291230 80 9F 00 0C */ lwz r4, 0xc(r31) /* 802942D4 00291234 7D 89 03 A6 */ mtctr r12 -/* 802942D8 00291238 4E 80 04 21 */ bctrl +/* 802942D8 00291238 4E 80 04 21 */ bctrl lbl_802942DC: /* 802942DC 0029123C 80 01 00 24 */ lwz r0, 0x24(r1) /* 802942E0 00291240 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802942E4 00291244 7C 08 03 A6 */ mtlr r0 /* 802942E8 00291248 38 21 00 20 */ addi r1, r1, 0x20 -/* 802942EC 0029124C 4E 80 00 20 */ blr +/* 802942EC 0029124C 4E 80 00 20 */ blr .global ProcessUserInput__12CNESEmulatorFRC11CFinalInputi ProcessUserInput__12CNESEmulatorFRC11CFinalInputi: @@ -733,7 +733,7 @@ lbl_80294504: /* 80294514 00291474 83 81 00 10 */ lwz r28, 0x10(r1) /* 80294518 00291478 7C 08 03 A6 */ mtlr r0 /* 8029451C 0029147C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80294520 00291480 4E 80 00 20 */ blr +/* 80294520 00291480 4E 80 00 20 */ blr .global __dt__12CNESEmulatorFv __dt__12CNESEmulatorFv: @@ -752,7 +752,7 @@ __dt__12CNESEmulatorFv: /* 80294554 002914B4 80 6D A5 A0 */ lwz r3, lbl_805A9160@sda21(r13) /* 80294558 002914B8 81 83 00 08 */ lwz r12, 8(r3) /* 8029455C 002914BC 7D 89 03 A6 */ mtctr r12 -/* 80294560 002914C0 4E 80 04 21 */ bctrl +/* 80294560 002914C0 4E 80 04 21 */ bctrl /* 80294564 002914C4 7C 60 1B 78 */ mr r0, r3 /* 80294568 002914C8 38 80 00 00 */ li r4, 0 /* 8029456C 002914CC 38 A0 00 40 */ li r5, 0x40 @@ -767,7 +767,7 @@ __dt__12CNESEmulatorFv: /* 80294590 002914F0 80 7D 00 10 */ lwz r3, 0x10(r29) /* 80294594 002914F4 81 83 00 38 */ lwz r12, 0x38(r3) /* 80294598 002914F8 7D 89 03 A6 */ mtctr r12 -/* 8029459C 002914FC 4E 80 04 21 */ bctrl +/* 8029459C 002914FC 4E 80 04 21 */ bctrl /* 802945A0 00291500 80 7D 00 10 */ lwz r3, 0x10(r29) /* 802945A4 00291504 48 0E E0 81 */ bl OSUnlink lbl_802945A8: @@ -808,7 +808,7 @@ lbl_80294610: /* 80294628 00291588 38 80 00 01 */ li r4, 1 /* 8029462C 0029158C 81 8C 00 08 */ lwz r12, 8(r12) /* 80294630 00291590 7D 89 03 A6 */ mtctr r12 -/* 80294634 00291594 4E 80 04 21 */ bctrl +/* 80294634 00291594 4E 80 04 21 */ bctrl lbl_80294638: /* 80294638 00291598 7F C0 07 35 */ extsh. r0, r30 /* 8029463C 0029159C 40 81 00 0C */ ble lbl_80294648 @@ -822,7 +822,7 @@ lbl_80294648: /* 80294658 002915B8 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8029465C 002915BC 7C 08 03 A6 */ mtlr r0 /* 80294660 002915C0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80294664 002915C4 4E 80 00 20 */ blr +/* 80294664 002915C4 4E 80 00 20 */ blr .global __ct__12CNESEmulatorFv __ct__12CNESEmulatorFv: @@ -1014,7 +1014,7 @@ __ct__12CNESEmulatorFv: /* 8029494C 002918AC 81 83 00 00 */ lwz r12, 0(r3) /* 80294950 002918B0 81 8C 00 08 */ lwz r12, 8(r12) /* 80294954 002918B4 7D 89 03 A6 */ mtctr r12 -/* 80294958 002918B8 4E 80 04 21 */ bctrl +/* 80294958 002918B8 4E 80 04 21 */ bctrl lbl_8029495C: /* 8029495C 002918BC 93 DF 00 00 */ stw r30, 0(r31) /* 80294960 002918C0 38 61 00 5C */ addi r3, r1, 0x5c @@ -1026,7 +1026,7 @@ lbl_8029495C: /* 80294978 002918D8 83 C1 00 88 */ lwz r30, 0x88(r1) /* 8029497C 002918DC 7C 08 03 A6 */ mtlr r0 /* 80294980 002918E0 38 21 00 90 */ addi r1, r1, 0x90 -/* 80294984 002918E4 4E 80 00 20 */ blr +/* 80294984 002918E4 4E 80 00 20 */ blr .global CheckForGameOver__12CNESEmulatorFPCcPc CheckForGameOver__12CNESEmulatorFPCcPc: @@ -1131,7 +1131,7 @@ lbl_80294AD4: /* 80294ADC 00291A3C 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80294AE0 00291A40 7C 08 03 A6 */ mtlr r0 /* 80294AE4 00291A44 38 21 00 30 */ addi r1, r1, 0x30 -/* 80294AE8 00291A48 4E 80 00 20 */ blr +/* 80294AE8 00291A48 4E 80 00 20 */ blr .global SetPasswordIntoEntryScreen__12CNESEmulatorFPCcPcPCc SetPasswordIntoEntryScreen__12CNESEmulatorFPCcPcPCc: @@ -1268,7 +1268,7 @@ lbl_80294CA8: /* 80294CB8 00291C18 83 81 00 10 */ lwz r28, 0x10(r1) /* 80294CBC 00291C1C 7C 08 03 A6 */ mtlr r0 /* 80294CC0 00291C20 38 21 00 20 */ addi r1, r1, 0x20 -/* 80294CC4 00291C24 4E 80 00 20 */ blr +/* 80294CC4 00291C24 4E 80 00 20 */ blr .global CheckForPasswordEntryScreen__12CNESEmulatorFPCc CheckForPasswordEntryScreen__12CNESEmulatorFPCc: diff --git a/asm/MetroidPrime/CObjectList.s b/asm/MetroidPrime/CObjectList.s index c1f0fd71..66b839b7 100644 --- a/asm/MetroidPrime/CObjectList.s +++ b/asm/MetroidPrime/CObjectList.s @@ -9,7 +9,7 @@ lbl_803D96D8: .4byte 0 .4byte IsQualified__11CObjectListFRC7CEntity .4byte 0 - + .section .text, "ax" .global GetObjectByIndex__11CObjectListCFi @@ -17,7 +17,7 @@ GetObjectByIndex__11CObjectListCFi: /* 8000FCCC 0000CC2C 54 80 18 38 */ slwi r0, r4, 3 /* 8000FCD0 0000CC30 7C 63 02 14 */ add r3, r3, r0 /* 8000FCD4 0000CC34 80 63 00 04 */ lwz r3, 4(r3) -/* 8000FCD8 0000CC38 4E 80 00 20 */ blr +/* 8000FCD8 0000CC38 4E 80 00 20 */ blr .global __vc__11CObjectListCFi __vc__11CObjectListCFi: @@ -34,9 +34,9 @@ lbl_8000FD00: /* 8000FD00 0000CC60 38 80 00 01 */ li r4, 1 lbl_8000FD04: /* 8000FD04 0000CC64 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 8000FD08 0000CC68 4D 82 00 20 */ beqlr +/* 8000FD08 0000CC68 4D 82 00 20 */ beqlr /* 8000FD0C 0000CC6C 38 60 00 00 */ li r3, 0 -/* 8000FD10 0000CC70 4E 80 00 20 */ blr +/* 8000FD10 0000CC70 4E 80 00 20 */ blr .global __vc__11CObjectListFi __vc__11CObjectListFi: @@ -53,9 +53,9 @@ lbl_8000FD38: /* 8000FD38 0000CC98 38 80 00 01 */ li r4, 1 lbl_8000FD3C: /* 8000FD3C 0000CC9C 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 8000FD40 0000CCA0 4D 82 00 20 */ beqlr +/* 8000FD40 0000CCA0 4D 82 00 20 */ beqlr /* 8000FD44 0000CCA4 38 60 00 00 */ li r3, 0 -/* 8000FD48 0000CCA8 4E 80 00 20 */ blr +/* 8000FD48 0000CCA8 4E 80 00 20 */ blr .global GetValidObjectById__11CObjectListCF9TUniqueId GetValidObjectById__11CObjectListCF9TUniqueId: @@ -64,7 +64,7 @@ GetValidObjectById__11CObjectListCF9TUniqueId: /* 8000FD54 0000CCB4 7C 05 00 40 */ cmplw r5, r0 /* 8000FD58 0000CCB8 40 82 00 0C */ bne lbl_8000FD64 /* 8000FD5C 0000CCBC 38 60 00 00 */ li r3, 0 -/* 8000FD60 0000CCC0 4E 80 00 20 */ blr +/* 8000FD60 0000CCC0 4E 80 00 20 */ blr lbl_8000FD64: /* 8000FD64 0000CCC4 54 A0 1C F8 */ rlwinm r0, r5, 3, 0x13, 0x1c /* 8000FD68 0000CCC8 38 80 00 00 */ li r4, 0 @@ -78,9 +78,9 @@ lbl_8000FD64: /* 8000FD88 0000CCE8 38 80 00 01 */ li r4, 1 lbl_8000FD8C: /* 8000FD8C 0000CCEC 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 8000FD90 0000CCF0 4C 82 00 20 */ bnelr +/* 8000FD90 0000CCF0 4C 82 00 20 */ bnelr /* 8000FD94 0000CCF4 38 60 00 00 */ li r3, 0 -/* 8000FD98 0000CCF8 4E 80 00 20 */ blr +/* 8000FD98 0000CCF8 4E 80 00 20 */ blr .global GetValidObjectById__11CObjectListF9TUniqueId GetValidObjectById__11CObjectListF9TUniqueId: @@ -89,7 +89,7 @@ GetValidObjectById__11CObjectListF9TUniqueId: /* 8000FDA4 0000CD04 7C 05 00 40 */ cmplw r5, r0 /* 8000FDA8 0000CD08 40 82 00 0C */ bne lbl_8000FDB4 /* 8000FDAC 0000CD0C 38 60 00 00 */ li r3, 0 -/* 8000FDB0 0000CD10 4E 80 00 20 */ blr +/* 8000FDB0 0000CD10 4E 80 00 20 */ blr lbl_8000FDB4: /* 8000FDB4 0000CD14 54 A0 1C F8 */ rlwinm r0, r5, 3, 0x13, 0x1c /* 8000FDB8 0000CD18 38 80 00 00 */ li r4, 0 @@ -103,9 +103,9 @@ lbl_8000FDB4: /* 8000FDD8 0000CD38 38 80 00 01 */ li r4, 1 lbl_8000FDDC: /* 8000FDDC 0000CD3C 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 8000FDE0 0000CD40 4C 82 00 20 */ bnelr +/* 8000FDE0 0000CD40 4C 82 00 20 */ bnelr /* 8000FDE4 0000CD44 38 60 00 00 */ li r3, 0 -/* 8000FDE8 0000CD48 4E 80 00 20 */ blr +/* 8000FDE8 0000CD48 4E 80 00 20 */ blr .global GetObjectById__11CObjectListCF9TUniqueId GetObjectById__11CObjectListCF9TUniqueId: @@ -114,7 +114,7 @@ GetObjectById__11CObjectListCF9TUniqueId: /* 8000FDF4 0000CD54 7C 05 00 40 */ cmplw r5, r0 /* 8000FDF8 0000CD58 40 82 00 0C */ bne lbl_8000FE04 /* 8000FDFC 0000CD5C 38 60 00 00 */ li r3, 0 -/* 8000FE00 0000CD60 4E 80 00 20 */ blr +/* 8000FE00 0000CD60 4E 80 00 20 */ blr lbl_8000FE04: /* 8000FE04 0000CD64 54 A0 1C F8 */ rlwinm r0, r5, 3, 0x13, 0x1c /* 8000FE08 0000CD68 38 80 00 00 */ li r4, 0 @@ -131,9 +131,9 @@ lbl_8000FE04: /* 8000FE34 0000CD94 38 80 00 01 */ li r4, 1 lbl_8000FE38: /* 8000FE38 0000CD98 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 8000FE3C 0000CD9C 4C 82 00 20 */ bnelr +/* 8000FE3C 0000CD9C 4C 82 00 20 */ bnelr /* 8000FE40 0000CDA0 38 60 00 00 */ li r3, 0 -/* 8000FE44 0000CDA4 4E 80 00 20 */ blr +/* 8000FE44 0000CDA4 4E 80 00 20 */ blr .global GetObjectById__11CObjectListF9TUniqueId GetObjectById__11CObjectListF9TUniqueId: @@ -142,7 +142,7 @@ GetObjectById__11CObjectListF9TUniqueId: /* 8000FE50 0000CDB0 7C 05 00 40 */ cmplw r5, r0 /* 8000FE54 0000CDB4 40 82 00 0C */ bne lbl_8000FE60 /* 8000FE58 0000CDB8 38 60 00 00 */ li r3, 0 -/* 8000FE5C 0000CDBC 4E 80 00 20 */ blr +/* 8000FE5C 0000CDBC 4E 80 00 20 */ blr lbl_8000FE60: /* 8000FE60 0000CDC0 54 A0 1C F8 */ rlwinm r0, r5, 3, 0x13, 0x1c /* 8000FE64 0000CDC4 38 80 00 00 */ li r4, 0 @@ -159,9 +159,9 @@ lbl_8000FE60: /* 8000FE90 0000CDF0 38 80 00 01 */ li r4, 1 lbl_8000FE94: /* 8000FE94 0000CDF4 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 8000FE98 0000CDF8 4C 82 00 20 */ bnelr +/* 8000FE98 0000CDF8 4C 82 00 20 */ bnelr /* 8000FE9C 0000CDFC 38 60 00 00 */ li r3, 0 -/* 8000FEA0 0000CE00 4E 80 00 20 */ blr +/* 8000FEA0 0000CE00 4E 80 00 20 */ blr .global RemoveObject__11CObjectListF9TUniqueId RemoveObject__11CObjectListF9TUniqueId: @@ -171,10 +171,10 @@ RemoveObject__11CObjectListF9TUniqueId: /* 8000FEB0 0000CE10 7C A3 02 14 */ add r5, r3, r0 /* 8000FEB4 0000CE14 80 C5 00 04 */ lwz r6, 4(r5) /* 8000FEB8 0000CE18 28 06 00 00 */ cmplwi r6, 0 -/* 8000FEBC 0000CE1C 4D 82 00 20 */ beqlr +/* 8000FEBC 0000CE1C 4D 82 00 20 */ beqlr /* 8000FEC0 0000CE20 A0 06 00 08 */ lhz r0, 8(r6) /* 8000FEC4 0000CE24 7C 00 38 40 */ cmplw r0, r7 -/* 8000FEC8 0000CE28 4C 82 00 20 */ bnelr +/* 8000FEC8 0000CE28 4C 82 00 20 */ bnelr /* 8000FECC 0000CE2C A8 03 20 08 */ lha r0, 0x2008(r3) /* 8000FED0 0000CE30 7C 00 40 00 */ cmpw r0, r8 /* 8000FED4 0000CE34 40 82 00 38 */ bne lbl_8000FF0C @@ -222,7 +222,7 @@ lbl_8000FF48: /* 8000FF74 0000CED4 7C 63 02 14 */ add r3, r3, r0 /* 8000FF78 0000CED8 B0 A3 00 08 */ sth r5, 8(r3) /* 8000FF7C 0000CEDC B0 A3 00 0A */ sth r5, 0xa(r3) -/* 8000FF80 0000CEE0 4E 80 00 20 */ blr +/* 8000FF80 0000CEE0 4E 80 00 20 */ blr .global AddObject__11CObjectListFR7CEntity AddObject__11CObjectListFR7CEntity: @@ -236,7 +236,7 @@ AddObject__11CObjectListFR7CEntity: /* 8000FFA0 0000CF00 81 83 00 00 */ lwz r12, 0(r3) /* 8000FFA4 0000CF04 81 8C 00 08 */ lwz r12, 8(r12) /* 8000FFA8 0000CF08 7D 89 03 A6 */ mtctr r12 -/* 8000FFAC 0000CF0C 4E 80 04 21 */ bctrl +/* 8000FFAC 0000CF0C 4E 80 04 21 */ bctrl /* 8000FFB0 0000CF10 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8000FFB4 0000CF14 41 82 00 64 */ beq lbl_80010018 /* 8000FFB8 0000CF18 A8 1E 20 08 */ lha r0, 0x2008(r30) @@ -270,12 +270,12 @@ lbl_80010018: /* 80010020 0000CF80 83 C1 00 08 */ lwz r30, 8(r1) /* 80010024 0000CF84 7C 08 03 A6 */ mtlr r0 /* 80010028 0000CF88 38 21 00 10 */ addi r1, r1, 0x10 -/* 8001002C 0000CF8C 4E 80 00 20 */ blr +/* 8001002C 0000CF8C 4E 80 00 20 */ blr .global IsQualified__11CObjectListFRC7CEntity IsQualified__11CObjectListFRC7CEntity: /* 80010030 0000CF90 38 60 00 01 */ li r3, 1 -/* 80010034 0000CF94 4E 80 00 20 */ blr +/* 80010034 0000CF94 4E 80 00 20 */ blr .global __ct__11CObjectListF15EGameObjectList __ct__11CObjectListF15EGameObjectList: @@ -340,7 +340,7 @@ lbl_800100A0: /* 8001011C 0000D07C 83 C1 00 08 */ lwz r30, 8(r1) /* 80010120 0000D080 7C 08 03 A6 */ mtlr r0 /* 80010124 0000D084 38 21 00 10 */ addi r1, r1, 0x10 -/* 80010128 0000D088 4E 80 00 20 */ blr +/* 80010128 0000D088 4E 80 00 20 */ blr .global __ct__Q211CObjectList16SObjectListEntryFv __ct__Q211CObjectList16SObjectListEntryFv: @@ -349,4 +349,4 @@ __ct__Q211CObjectList16SObjectListEntryFv: /* 80010134 0000D094 90 83 00 00 */ stw r4, 0(r3) /* 80010138 0000D098 B0 03 00 04 */ sth r0, 4(r3) /* 8001013C 0000D09C B0 03 00 06 */ sth r0, 6(r3) -/* 80010140 0000D0A0 4E 80 00 20 */ blr +/* 80010140 0000D0A0 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/CParticleDatabase.s b/asm/MetroidPrime/CParticleDatabase.s index 32c4821a..fd193e71 100644 --- a/asm/MetroidPrime/CParticleDatabase.s +++ b/asm/MetroidPrime/CParticleDatabase.s @@ -89,7 +89,7 @@ lbl_800B7AA8: /* 800B7AB8 000B4A18 7F 84 E3 78 */ mr r4, r28 /* 800B7ABC 000B4A1C 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 800B7AC0 000B4A20 7D 89 03 A6 */ mtctr r12 -/* 800B7AC4 000B4A24 4E 80 04 21 */ bctrl +/* 800B7AC4 000B4A24 4E 80 04 21 */ bctrl lbl_800B7AC8: /* 800B7AC8 000B4A28 7F C3 F3 78 */ mr r3, r30 /* 800B7ACC 000B4A2C 7F A4 EB 78 */ mr r4, r29 @@ -113,7 +113,7 @@ lbl_800B7AF0: /* 800B7B08 000B4A68 83 81 00 10 */ lwz r28, 0x10(r1) /* 800B7B0C 000B4A6C 7C 08 03 A6 */ mtlr r0 /* 800B7B10 000B4A70 38 21 00 20 */ addi r1, r1, 0x20 -/* 800B7B14 000B4A74 4E 80 00 20 */ blr +/* 800B7B14 000B4A74 4E 80 00 20 */ blr .global SetModulationColorAllActiveEffects__17CParticleDatabaseFRC6CColor SetModulationColorAllActiveEffects__17CParticleDatabaseFRC6CColor: @@ -147,7 +147,7 @@ SetModulationColorAllActiveEffects__17CParticleDatabaseFRC6CColor: /* 800B7B84 000B4AE4 83 C1 00 08 */ lwz r30, 8(r1) /* 800B7B88 000B4AE8 7C 08 03 A6 */ mtlr r0 /* 800B7B8C 000B4AEC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B7B90 000B4AF0 4E 80 00 20 */ blr +/* 800B7B90 000B4AF0 4E 80 00 20 */ blr .global "SuspendAllActiveEffectsForParticleDB__17CParticleDatabaseFR13CStateManagerRQ24rstl236map,Q24rstl17rmemory_allocator>,Q24rstl28auto_ptr<16CParticleGenInfo>,Q24rstl81less,Q24rstl17rmemory_allocator>>,Q24rstl17rmemory_allocator>" "SuspendAllActiveEffectsForParticleDB__17CParticleDatabaseFR13CStateManagerRQ24rstl236map,Q24rstl17rmemory_allocator>,Q24rstl28auto_ptr<16CParticleGenInfo>,Q24rstl81less,Q24rstl17rmemory_allocator>>,Q24rstl17rmemory_allocator>": @@ -172,7 +172,7 @@ lbl_800B7BCC: /* 800B7BD8 000B4B38 81 83 00 00 */ lwz r12, 0(r3) /* 800B7BDC 000B4B3C 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 800B7BE0 000B4B40 7D 89 03 A6 */ mtctr r12 -/* 800B7BE4 000B4B44 4E 80 04 21 */ bctrl +/* 800B7BE4 000B4B44 4E 80 04 21 */ bctrl /* 800B7BE8 000B4B48 7F C3 F3 78 */ mr r3, r30 /* 800B7BEC 000B4B4C 7F A4 EB 78 */ mr r4, r29 /* 800B7BF0 000B4B50 48 28 49 F1 */ bl rbtree_traverse_forward__4rstlFPCvPv @@ -195,7 +195,7 @@ lbl_800B7C10: /* 800B7C28 000B4B88 83 81 00 10 */ lwz r28, 0x10(r1) /* 800B7C2C 000B4B8C 7C 08 03 A6 */ mtlr r0 /* 800B7C30 000B4B90 38 21 00 20 */ addi r1, r1, 0x20 -/* 800B7C34 000B4B94 4E 80 00 20 */ blr +/* 800B7C34 000B4B94 4E 80 00 20 */ blr .global SuspendAllActiveEffects__17CParticleDatabaseFR13CStateManager SuspendAllActiveEffects__17CParticleDatabaseFR13CStateManager: @@ -220,7 +220,7 @@ SuspendAllActiveEffects__17CParticleDatabaseFR13CStateManager: /* 800B7C80 000B4BE0 83 C1 00 08 */ lwz r30, 8(r1) /* 800B7C84 000B4BE4 7C 08 03 A6 */ mtlr r0 /* 800B7C88 000B4BE8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B7C8C 000B4BEC 4E 80 00 20 */ blr +/* 800B7C8C 000B4BEC 4E 80 00 20 */ blr .global DeleteAllLightsForParticleDB__17CParticleDatabaseFR13CStateManager DeleteAllLightsForParticleDB__17CParticleDatabaseFR13CStateManager: @@ -244,7 +244,7 @@ lbl_800B7CC8: /* 800B7CD0 000B4C30 81 83 00 00 */ lwz r12, 0(r3) /* 800B7CD4 000B4C34 81 8C 00 48 */ lwz r12, 0x48(r12) /* 800B7CD8 000B4C38 7D 89 03 A6 */ mtctr r12 -/* 800B7CDC 000B4C3C 4E 80 04 21 */ bctrl +/* 800B7CDC 000B4C3C 4E 80 04 21 */ bctrl /* 800B7CE0 000B4C40 7F C3 F3 78 */ mr r3, r30 /* 800B7CE4 000B4C44 7F A4 EB 78 */ mr r4, r29 /* 800B7CE8 000B4C48 48 28 48 F9 */ bl rbtree_traverse_forward__4rstlFPCvPv @@ -267,7 +267,7 @@ lbl_800B7D08: /* 800B7D20 000B4C80 83 81 00 10 */ lwz r28, 0x10(r1) /* 800B7D24 000B4C84 7C 08 03 A6 */ mtlr r0 /* 800B7D28 000B4C88 38 21 00 20 */ addi r1, r1, 0x20 -/* 800B7D2C 000B4C8C 4E 80 00 20 */ blr +/* 800B7D2C 000B4C8C 4E 80 00 20 */ blr .global DeleteAllLights__17CParticleDatabaseCFR13CStateManager DeleteAllLights__17CParticleDatabaseCFR13CStateManager: @@ -301,7 +301,7 @@ DeleteAllLights__17CParticleDatabaseCFR13CStateManager: /* 800B7D9C 000B4CFC 83 C1 00 08 */ lwz r30, 8(r1) /* 800B7DA0 000B4D00 7C 08 03 A6 */ mtlr r0 /* 800B7DA4 000B4D04 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B7DA8 000B4D08 4E 80 00 20 */ blr +/* 800B7DA8 000B4D08 4E 80 00 20 */ blr .global "RenderParticleGenMapMasked__17CParticleDatabaseFRCQ24rstl236map,Q24rstl17rmemory_allocator>,Q24rstl28auto_ptr<16CParticleGenInfo>,Q24rstl81less,Q24rstl17rmemory_allocator>>,Q24rstl17rmemory_allocator>ii" "RenderParticleGenMapMasked__17CParticleDatabaseFRCQ24rstl236map,Q24rstl17rmemory_allocator>,Q24rstl28auto_ptr<16CParticleGenInfo>,Q24rstl81less,Q24rstl17rmemory_allocator>>,Q24rstl17rmemory_allocator>ii": @@ -326,7 +326,7 @@ lbl_800B7DDC: /* 800B7DF0 000B4D50 81 83 00 00 */ lwz r12, 0(r3) /* 800B7DF4 000B4D54 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800B7DF8 000B4D58 7D 89 03 A6 */ mtctr r12 -/* 800B7DFC 000B4D5C 4E 80 04 21 */ bctrl +/* 800B7DFC 000B4D5C 4E 80 04 21 */ bctrl lbl_800B7E00: /* 800B7E00 000B4D60 7F E3 FB 78 */ mr r3, r31 /* 800B7E04 000B4D64 7F C4 F3 78 */ mr r4, r30 @@ -350,7 +350,7 @@ lbl_800B7E28: /* 800B7E40 000B4DA0 83 81 00 10 */ lwz r28, 0x10(r1) /* 800B7E44 000B4DA4 7C 08 03 A6 */ mtlr r0 /* 800B7E48 000B4DA8 38 21 00 20 */ addi r1, r1, 0x20 -/* 800B7E4C 000B4DAC 4E 80 00 20 */ blr +/* 800B7E4C 000B4DAC 4E 80 00 20 */ blr .global "RenderParticleGenMap__17CParticleDatabaseFRCQ24rstl236map,Q24rstl17rmemory_allocator>,Q24rstl28auto_ptr<16CParticleGenInfo>,Q24rstl81less,Q24rstl17rmemory_allocator>>,Q24rstl17rmemory_allocator>" "RenderParticleGenMap__17CParticleDatabaseFRCQ24rstl236map,Q24rstl17rmemory_allocator>,Q24rstl28auto_ptr<16CParticleGenInfo>,Q24rstl81less,Q24rstl17rmemory_allocator>>,Q24rstl17rmemory_allocator>": @@ -367,7 +367,7 @@ lbl_800B7E70: /* 800B7E74 000B4DD4 81 83 00 00 */ lwz r12, 0(r3) /* 800B7E78 000B4DD8 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800B7E7C 000B4DDC 7D 89 03 A6 */ mtctr r12 -/* 800B7E80 000B4DE0 4E 80 04 21 */ bctrl +/* 800B7E80 000B4DE0 4E 80 04 21 */ bctrl /* 800B7E84 000B4DE4 7F E3 FB 78 */ mr r3, r31 /* 800B7E88 000B4DE8 7F C4 F3 78 */ mr r4, r30 /* 800B7E8C 000B4DEC 48 28 47 55 */ bl rbtree_traverse_forward__4rstlFPCvPv @@ -388,7 +388,7 @@ lbl_800B7EAC: /* 800B7EBC 000B4E1C 83 C1 00 08 */ lwz r30, 8(r1) /* 800B7EC0 000B4E20 7C 08 03 A6 */ mtlr r0 /* 800B7EC4 000B4E24 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B7EC8 000B4E28 4E 80 00 20 */ blr +/* 800B7EC8 000B4E28 4E 80 00 20 */ blr .global RenderSystemsToBeDrawnLastMasked__17CParticleDatabaseCFii RenderSystemsToBeDrawnLastMasked__17CParticleDatabaseCFii: @@ -413,7 +413,7 @@ RenderSystemsToBeDrawnLastMasked__17CParticleDatabaseCFii: /* 800B7F14 000B4E74 83 A1 00 14 */ lwz r29, 0x14(r1) /* 800B7F18 000B4E78 7C 08 03 A6 */ mtlr r0 /* 800B7F1C 000B4E7C 38 21 00 20 */ addi r1, r1, 0x20 -/* 800B7F20 000B4E80 4E 80 00 20 */ blr +/* 800B7F20 000B4E80 4E 80 00 20 */ blr .global RenderSystemsToBeDrawnLast__17CParticleDatabaseCFv RenderSystemsToBeDrawnLast__17CParticleDatabaseCFv: @@ -430,7 +430,7 @@ RenderSystemsToBeDrawnLast__17CParticleDatabaseCFv: /* 800B7F4C 000B4EAC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800B7F50 000B4EB0 7C 08 03 A6 */ mtlr r0 /* 800B7F54 000B4EB4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B7F58 000B4EB8 4E 80 00 20 */ blr +/* 800B7F58 000B4EB8 4E 80 00 20 */ blr .global RenderSystemsToBeDrawnFirstMasked__17CParticleDatabaseCFii RenderSystemsToBeDrawnFirstMasked__17CParticleDatabaseCFii: @@ -455,7 +455,7 @@ RenderSystemsToBeDrawnFirstMasked__17CParticleDatabaseCFii: /* 800B7FA4 000B4F04 83 A1 00 14 */ lwz r29, 0x14(r1) /* 800B7FA8 000B4F08 7C 08 03 A6 */ mtlr r0 /* 800B7FAC 000B4F0C 38 21 00 20 */ addi r1, r1, 0x20 -/* 800B7FB0 000B4F10 4E 80 00 20 */ blr +/* 800B7FB0 000B4F10 4E 80 00 20 */ blr .global RenderSystemsToBeDrawnFirst__17CParticleDatabaseCFv RenderSystemsToBeDrawnFirst__17CParticleDatabaseCFv: @@ -472,7 +472,7 @@ RenderSystemsToBeDrawnFirst__17CParticleDatabaseCFv: /* 800B7FDC 000B4F3C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800B7FE0 000B4F40 7C 08 03 A6 */ mtlr r0 /* 800B7FE4 000B4F44 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B7FE8 000B4F48 4E 80 00 20 */ blr +/* 800B7FE8 000B4F48 4E 80 00 20 */ blr .global "AddToRendererClippedParticleGenMapMasked__17CParticleDatabaseCFRCQ24rstl236map,Q24rstl17rmemory_allocator>,Q24rstl28auto_ptr<16CParticleGenInfo>,Q24rstl81less,Q24rstl17rmemory_allocator>>,Q24rstl17rmemory_allocator>RC14CFrustumPlanesii" "AddToRendererClippedParticleGenMapMasked__17CParticleDatabaseCFRCQ24rstl236map,Q24rstl17rmemory_allocator>,Q24rstl28auto_ptr<16CParticleGenInfo>,Q24rstl81less,Q24rstl17rmemory_allocator>>,Q24rstl17rmemory_allocator>RC14CFrustumPlanesii": @@ -497,7 +497,7 @@ lbl_800B8014: /* 800B8030 000B4F90 81 9D 00 00 */ lwz r12, 0(r29) /* 800B8034 000B4F94 81 8C 00 34 */ lwz r12, 0x34(r12) /* 800B8038 000B4F98 7D 89 03 A6 */ mtctr r12 -/* 800B803C 000B4F9C 4E 80 04 21 */ bctrl +/* 800B803C 000B4F9C 4E 80 04 21 */ bctrl /* 800B8040 000B4FA0 7F 43 D3 78 */ mr r3, r26 /* 800B8044 000B4FA4 38 81 00 08 */ addi r4, r1, 8 /* 800B8048 000B4FA8 48 28 D1 41 */ bl "BoxInFrustumPlanes__14CFrustumPlanesCFRCQ24rstl24optional_object<6CAABox>" @@ -512,7 +512,7 @@ lbl_800B8014: /* 800B806C 000B4FCC 81 9D 00 00 */ lwz r12, 0(r29) /* 800B8070 000B4FD0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800B8074 000B4FD4 7D 89 03 A6 */ mtctr r12 -/* 800B8078 000B4FD8 4E 80 04 21 */ bctrl +/* 800B8078 000B4FD8 4E 80 04 21 */ bctrl lbl_800B807C: /* 800B807C 000B4FDC 7F E3 FB 78 */ mr r3, r31 /* 800B8080 000B4FE0 7F C4 F3 78 */ mr r4, r30 @@ -533,7 +533,7 @@ lbl_800B80A4: /* 800B80B0 000B5010 80 01 00 44 */ lwz r0, 0x44(r1) /* 800B80B4 000B5014 7C 08 03 A6 */ mtlr r0 /* 800B80B8 000B5018 38 21 00 40 */ addi r1, r1, 0x40 -/* 800B80BC 000B501C 4E 80 00 20 */ blr +/* 800B80BC 000B501C 4E 80 00 20 */ blr .global "AddToRendererClippedParticleGenMap__17CParticleDatabaseCFRCQ24rstl236map,Q24rstl17rmemory_allocator>,Q24rstl28auto_ptr<16CParticleGenInfo>,Q24rstl81less,Q24rstl17rmemory_allocator>>,Q24rstl17rmemory_allocator>RC14CFrustumPlanes" "AddToRendererClippedParticleGenMap__17CParticleDatabaseCFRCQ24rstl236map,Q24rstl17rmemory_allocator>,Q24rstl28auto_ptr<16CParticleGenInfo>,Q24rstl81less,Q24rstl17rmemory_allocator>>,Q24rstl17rmemory_allocator>RC14CFrustumPlanes": @@ -555,7 +555,7 @@ lbl_800B80EC: /* 800B80F8 000B5058 81 9D 00 00 */ lwz r12, 0(r29) /* 800B80FC 000B505C 81 8C 00 34 */ lwz r12, 0x34(r12) /* 800B8100 000B5060 7D 89 03 A6 */ mtctr r12 -/* 800B8104 000B5064 4E 80 04 21 */ bctrl +/* 800B8104 000B5064 4E 80 04 21 */ bctrl /* 800B8108 000B5068 7F 83 E3 78 */ mr r3, r28 /* 800B810C 000B506C 38 81 00 08 */ addi r4, r1, 8 /* 800B8110 000B5070 48 28 D0 79 */ bl "BoxInFrustumPlanes__14CFrustumPlanesCFRCQ24rstl24optional_object<6CAABox>" @@ -570,7 +570,7 @@ lbl_800B80EC: /* 800B8134 000B5094 81 9D 00 00 */ lwz r12, 0(r29) /* 800B8138 000B5098 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800B813C 000B509C 7D 89 03 A6 */ mtctr r12 -/* 800B8140 000B50A0 4E 80 04 21 */ bctrl +/* 800B8140 000B50A0 4E 80 04 21 */ bctrl lbl_800B8144: /* 800B8144 000B50A4 7F E3 FB 78 */ mr r3, r31 /* 800B8148 000B50A8 7F C4 F3 78 */ mr r4, r30 @@ -594,7 +594,7 @@ lbl_800B816C: /* 800B8184 000B50E4 83 81 00 30 */ lwz r28, 0x30(r1) /* 800B8188 000B50E8 7C 08 03 A6 */ mtlr r0 /* 800B818C 000B50EC 38 21 00 40 */ addi r1, r1, 0x40 -/* 800B8190 000B50F0 4E 80 00 20 */ blr +/* 800B8190 000B50F0 4E 80 00 20 */ blr .global AddToRendererClippedMasked__17CParticleDatabaseCFRC14CFrustumPlanesii AddToRendererClippedMasked__17CParticleDatabaseCFRC14CFrustumPlanesii: @@ -627,7 +627,7 @@ AddToRendererClippedMasked__17CParticleDatabaseCFRC14CFrustumPlanesii: /* 800B81FC 000B515C 83 81 00 10 */ lwz r28, 0x10(r1) /* 800B8200 000B5160 7C 08 03 A6 */ mtlr r0 /* 800B8204 000B5164 38 21 00 20 */ addi r1, r1, 0x20 -/* 800B8208 000B5168 4E 80 00 20 */ blr +/* 800B8208 000B5168 4E 80 00 20 */ blr .global AddToRendererClipped__17CParticleDatabaseCFRC14CFrustumPlanes AddToRendererClipped__17CParticleDatabaseCFRC14CFrustumPlanes: @@ -650,7 +650,7 @@ AddToRendererClipped__17CParticleDatabaseCFRC14CFrustumPlanes: /* 800B824C 000B51AC 83 C1 00 08 */ lwz r30, 8(r1) /* 800B8250 000B51B0 7C 08 03 A6 */ mtlr r0 /* 800B8254 000B51B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B8258 000B51B8 4E 80 00 20 */ blr +/* 800B8258 000B51B8 4E 80 00 20 */ blr .global "UpdateParticleGenDB__17CParticleDatabaseFfRC17CPoseAsTransformsRC15CCharLayoutInfoRC12CTransform4fRC9CVector3fR13CStateManagerRQ24rstl236map,Q24rstl17rmemory_allocator>,Q24rstl28auto_ptr<16CParticleGenInfo>,Q24rstl81less,Q24rstl17rmemory_allocator>>,Q24rstl17rmemory_allocator>b" "UpdateParticleGenDB__17CParticleDatabaseFfRC17CPoseAsTransformsRC15CCharLayoutInfoRC12CTransform4fRC9CVector3fR13CStateManagerRQ24rstl236map,Q24rstl17rmemory_allocator>,Q24rstl28auto_ptr<16CParticleGenInfo>,Q24rstl81less,Q24rstl17rmemory_allocator>>,Q24rstl17rmemory_allocator>b": @@ -784,14 +784,14 @@ lbl_800B842C: /* 800B8438 000B5398 38 97 00 44 */ addi r4, r23, 0x44 /* 800B843C 000B539C 81 8C 00 18 */ lwz r12, 0x18(r12) /* 800B8440 000B53A0 7D 89 03 A6 */ mtctr r12 -/* 800B8444 000B53A4 4E 80 04 21 */ bctrl +/* 800B8444 000B53A4 4E 80 04 21 */ bctrl /* 800B8448 000B53A8 7E E3 BB 78 */ mr r3, r23 /* 800B844C 000B53AC 7F C5 F3 78 */ mr r5, r30 /* 800B8450 000B53B0 81 97 00 00 */ lwz r12, 0(r23) /* 800B8454 000B53B4 38 97 00 74 */ addi r4, r23, 0x74 /* 800B8458 000B53B8 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 800B845C 000B53BC 7D 89 03 A6 */ mtctr r12 -/* 800B8460 000B53C0 4E 80 04 21 */ bctrl +/* 800B8460 000B53C0 4E 80 04 21 */ bctrl /* 800B8464 000B53C4 80 17 00 2C */ lwz r0, 0x2c(r23) /* 800B8468 000B53C8 54 00 04 A5 */ rlwinm. r0, r0, 0, 0x12, 0x12 /* 800B846C 000B53CC 41 82 00 50 */ beq lbl_800B84BC @@ -812,7 +812,7 @@ lbl_800B842C: /* 800B84A8 000B5408 81 97 00 00 */ lwz r12, 0(r23) /* 800B84AC 000B540C 81 8C 00 28 */ lwz r12, 0x28(r12) /* 800B84B0 000B5410 7D 89 03 A6 */ mtctr r12 -/* 800B84B4 000B5414 4E 80 04 21 */ bctrl +/* 800B84B4 000B5414 4E 80 04 21 */ bctrl /* 800B84B8 000B5418 48 00 02 3C */ b lbl_800B86F4 lbl_800B84BC: /* 800B84BC 000B541C 7E E3 BB 78 */ mr r3, r23 @@ -820,7 +820,7 @@ lbl_800B84BC: /* 800B84C4 000B5424 81 97 00 00 */ lwz r12, 0(r23) /* 800B84C8 000B5428 81 8C 00 28 */ lwz r12, 0x28(r12) /* 800B84CC 000B542C 7D 89 03 A6 */ mtctr r12 -/* 800B84D0 000B5430 4E 80 04 21 */ bctrl +/* 800B84D0 000B5430 4E 80 04 21 */ bctrl /* 800B84D4 000B5434 48 00 02 20 */ b lbl_800B86F4 lbl_800B84D8: /* 800B84D8 000B5438 88 17 00 40 */ lbz r0, 0x40(r23) @@ -868,7 +868,7 @@ lbl_800B84F4: /* 800B857C 000B54DC 81 97 00 00 */ lwz r12, 0(r23) /* 800B8580 000B54E0 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 800B8584 000B54E4 7D 89 03 A6 */ mtctr r12 -/* 800B8588 000B54E8 4E 80 04 21 */ bctrl +/* 800B8588 000B54E8 4E 80 04 21 */ bctrl /* 800B858C 000B54EC 80 17 00 2C */ lwz r0, 0x2c(r23) /* 800B8590 000B54F0 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 800B8594 000B54F4 41 82 00 30 */ beq lbl_800B85C4 @@ -881,7 +881,7 @@ lbl_800B84F4: /* 800B85B0 000B5510 38 81 01 08 */ addi r4, r1, 0x108 /* 800B85B4 000B5514 81 8C 00 18 */ lwz r12, 0x18(r12) /* 800B85B8 000B5518 7D 89 03 A6 */ mtctr r12 -/* 800B85BC 000B551C 4E 80 04 21 */ bctrl +/* 800B85BC 000B551C 4E 80 04 21 */ bctrl /* 800B85C0 000B5520 48 00 00 C4 */ b lbl_800B8684 lbl_800B85C4: /* 800B85C4 000B5524 38 61 00 D8 */ addi r3, r1, 0xd8 @@ -893,7 +893,7 @@ lbl_800B85C4: /* 800B85DC 000B553C 38 81 00 D8 */ addi r4, r1, 0xd8 /* 800B85E0 000B5540 81 8C 00 18 */ lwz r12, 0x18(r12) /* 800B85E4 000B5544 7D 89 03 A6 */ mtctr r12 -/* 800B85E8 000B5548 4E 80 04 21 */ bctrl +/* 800B85E8 000B5548 4E 80 04 21 */ bctrl /* 800B85EC 000B554C 48 00 00 98 */ b lbl_800B8684 lbl_800B85F0: /* 800B85F0 000B5550 C0 41 01 D4 */ lfs f2, 0x1d4(r1) @@ -908,7 +908,7 @@ lbl_800B85F0: /* 800B8614 000B5574 81 97 00 00 */ lwz r12, 0(r23) /* 800B8618 000B5578 81 8C 00 24 */ lwz r12, 0x24(r12) /* 800B861C 000B557C 7D 89 03 A6 */ mtctr r12 -/* 800B8620 000B5580 4E 80 04 21 */ bctrl +/* 800B8620 000B5580 4E 80 04 21 */ bctrl /* 800B8624 000B5584 80 17 00 2C */ lwz r0, 0x2c(r23) /* 800B8628 000B5588 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 800B862C 000B558C 41 82 00 30 */ beq lbl_800B865C @@ -921,7 +921,7 @@ lbl_800B85F0: /* 800B8648 000B55A8 38 81 00 A8 */ addi r4, r1, 0xa8 /* 800B864C 000B55AC 81 8C 00 20 */ lwz r12, 0x20(r12) /* 800B8650 000B55B0 7D 89 03 A6 */ mtctr r12 -/* 800B8654 000B55B4 4E 80 04 21 */ bctrl +/* 800B8654 000B55B4 4E 80 04 21 */ bctrl /* 800B8658 000B55B8 48 00 00 2C */ b lbl_800B8684 lbl_800B865C: /* 800B865C 000B55BC 38 61 00 78 */ addi r3, r1, 0x78 @@ -933,7 +933,7 @@ lbl_800B865C: /* 800B8674 000B55D4 38 81 00 78 */ addi r4, r1, 0x78 /* 800B8678 000B55D8 81 8C 00 20 */ lwz r12, 0x20(r12) /* 800B867C 000B55DC 7D 89 03 A6 */ mtctr r12 -/* 800B8680 000B55E0 4E 80 04 21 */ bctrl +/* 800B8680 000B55E0 4E 80 04 21 */ bctrl lbl_800B8684: /* 800B8684 000B55E4 80 17 00 2C */ lwz r0, 0x2c(r23) /* 800B8688 000B55E8 54 00 04 A5 */ rlwinm. r0, r0, 0, 0x12, 0x12 @@ -955,7 +955,7 @@ lbl_800B8684: /* 800B86C8 000B5628 81 97 00 00 */ lwz r12, 0(r23) /* 800B86CC 000B562C 81 8C 00 28 */ lwz r12, 0x28(r12) /* 800B86D0 000B5630 7D 89 03 A6 */ mtctr r12 -/* 800B86D4 000B5634 4E 80 04 21 */ bctrl +/* 800B86D4 000B5634 4E 80 04 21 */ bctrl /* 800B86D8 000B5638 48 00 00 1C */ b lbl_800B86F4 lbl_800B86DC: /* 800B86DC 000B563C 7E E3 BB 78 */ mr r3, r23 @@ -963,7 +963,7 @@ lbl_800B86DC: /* 800B86E4 000B5644 81 97 00 00 */ lwz r12, 0(r23) /* 800B86E8 000B5648 81 8C 00 28 */ lwz r12, 0x28(r12) /* 800B86EC 000B564C 7D 89 03 A6 */ mtctr r12 -/* 800B86F0 000B5650 4E 80 04 21 */ bctrl +/* 800B86F0 000B5650 4E 80 04 21 */ bctrl lbl_800B86F4: /* 800B86F4 000B5654 C0 02 8D 20 */ lfs f0, lbl_805AAA40@sda21(r2) /* 800B86F8 000B5658 C0 37 00 0C */ lfs f1, 0xc(r23) @@ -982,7 +982,7 @@ lbl_800B8708: /* 800B8728 000B5688 81 97 00 00 */ lwz r12, 0(r23) /* 800B872C 000B568C 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 800B8730 000B5690 7D 89 03 A6 */ mtctr r12 -/* 800B8734 000B5694 4E 80 04 21 */ bctrl +/* 800B8734 000B5694 4E 80 04 21 */ bctrl /* 800B8738 000B5698 C0 17 00 20 */ lfs f0, 0x20(r23) /* 800B873C 000B569C D0 17 00 3C */ stfs f0, 0x3c(r23) /* 800B8740 000B56A0 80 17 00 2C */ lwz r0, 0x2c(r23) @@ -992,7 +992,7 @@ lbl_800B8708: /* 800B8750 000B56B0 81 97 00 00 */ lwz r12, 0(r23) /* 800B8754 000B56B4 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 800B8758 000B56B8 7D 89 03 A6 */ mtctr r12 -/* 800B875C 000B56BC 4E 80 04 21 */ bctrl +/* 800B875C 000B56BC 4E 80 04 21 */ bctrl lbl_800B8760: /* 800B8760 000B56C0 7E E3 BB 78 */ mr r3, r23 /* 800B8764 000B56C4 FC 20 F8 90 */ fmr f1, f31 @@ -1000,7 +1000,7 @@ lbl_800B8760: /* 800B876C 000B56CC 7F C4 F3 78 */ mr r4, r30 /* 800B8770 000B56D0 81 8C 00 14 */ lwz r12, 0x14(r12) /* 800B8774 000B56D4 7D 89 03 A6 */ mtctr r12 -/* 800B8778 000B56D8 4E 80 04 21 */ bctrl +/* 800B8778 000B56D8 4E 80 04 21 */ bctrl /* 800B877C 000B56DC 88 17 00 24 */ lbz r0, 0x24(r23) /* 800B8780 000B56E0 28 00 00 00 */ cmplwi r0, 0 /* 800B8784 000B56E4 40 82 01 04 */ bne lbl_800B8888 @@ -1008,7 +1008,7 @@ lbl_800B8760: /* 800B878C 000B56EC 81 97 00 00 */ lwz r12, 0(r23) /* 800B8790 000B56F0 81 8C 00 38 */ lwz r12, 0x38(r12) /* 800B8794 000B56F4 7D 89 03 A6 */ mtctr r12 -/* 800B8798 000B56F8 4E 80 04 21 */ bctrl +/* 800B8798 000B56F8 4E 80 04 21 */ bctrl /* 800B879C 000B56FC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B87A0 000B5700 40 82 01 C8 */ bne lbl_800B8968 /* 800B87A4 000B5704 C0 57 00 20 */ lfs f2, 0x20(r23) @@ -1024,7 +1024,7 @@ lbl_800B8760: /* 800B87CC 000B572C 81 97 00 00 */ lwz r12, 0(r23) /* 800B87D0 000B5730 81 8C 00 48 */ lwz r12, 0x48(r12) /* 800B87D4 000B5734 7D 89 03 A6 */ mtctr r12 -/* 800B87D8 000B5738 4E 80 04 21 */ bctrl +/* 800B87D8 000B5738 4E 80 04 21 */ bctrl /* 800B87DC 000B573C 82 C1 00 28 */ lwz r22, 0x28(r1) /* 800B87E0 000B5740 80 61 00 2C */ lwz r3, 0x2c(r1) /* 800B87E4 000B5744 92 C1 00 20 */ stw r22, 0x20(r1) @@ -1051,7 +1051,7 @@ lbl_800B8760: /* 800B8838 000B5798 38 80 00 01 */ li r4, 1 /* 800B883C 000B579C 81 8C 00 08 */ lwz r12, 8(r12) /* 800B8840 000B57A0 7D 89 03 A6 */ mtctr r12 -/* 800B8844 000B57A4 4E 80 04 21 */ bctrl +/* 800B8844 000B57A4 4E 80 04 21 */ bctrl lbl_800B8848: /* 800B8848 000B57A8 34 16 00 10 */ addic. r0, r22, 0x10 /* 800B884C 000B57AC 41 82 00 0C */ beq lbl_800B8858 @@ -1076,7 +1076,7 @@ lbl_800B8888: /* 800B888C 000B57EC 81 97 00 00 */ lwz r12, 0(r23) /* 800B8890 000B57F0 81 8C 00 30 */ lwz r12, 0x30(r12) /* 800B8894 000B57F4 7D 89 03 A6 */ mtctr r12 -/* 800B8898 000B57F8 4E 80 04 21 */ bctrl +/* 800B8898 000B57F8 4E 80 04 21 */ bctrl /* 800B889C 000B57FC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B88A0 000B5800 41 82 00 C8 */ beq lbl_800B8968 /* 800B88A4 000B5804 7E E3 BB 78 */ mr r3, r23 @@ -1084,7 +1084,7 @@ lbl_800B8888: /* 800B88AC 000B580C 81 97 00 00 */ lwz r12, 0(r23) /* 800B88B0 000B5810 81 8C 00 48 */ lwz r12, 0x48(r12) /* 800B88B4 000B5814 7D 89 03 A6 */ mtctr r12 -/* 800B88B8 000B5818 4E 80 04 21 */ bctrl +/* 800B88B8 000B5818 4E 80 04 21 */ bctrl /* 800B88BC 000B581C 82 C1 00 28 */ lwz r22, 0x28(r1) /* 800B88C0 000B5820 80 61 00 2C */ lwz r3, 0x2c(r1) /* 800B88C4 000B5824 92 C1 00 18 */ stw r22, 0x18(r1) @@ -1111,7 +1111,7 @@ lbl_800B8888: /* 800B8918 000B5878 38 80 00 01 */ li r4, 1 /* 800B891C 000B587C 81 8C 00 08 */ lwz r12, 8(r12) /* 800B8920 000B5880 7D 89 03 A6 */ mtctr r12 -/* 800B8924 000B5884 4E 80 04 21 */ bctrl +/* 800B8924 000B5884 4E 80 04 21 */ bctrl lbl_800B8928: /* 800B8928 000B5888 34 16 00 10 */ addic. r0, r22, 0x10 /* 800B892C 000B588C 41 82 00 0C */ beq lbl_800B8938 @@ -1159,7 +1159,7 @@ lbl_800B89A8: /* 800B89BC 000B591C 80 01 02 C4 */ lwz r0, 0x2c4(r1) /* 800B89C0 000B5920 7C 08 03 A6 */ mtlr r0 /* 800B89C4 000B5924 38 21 02 C0 */ addi r1, r1, 0x2c0 -/* 800B89C8 000B5928 4E 80 00 20 */ blr +/* 800B89C8 000B5928 4E 80 00 20 */ blr .global Update__17CParticleDatabaseFfRC17CPoseAsTransformsRC15CCharLayoutInfoRC12CTransform4fRC9CVector3fR13CStateManager Update__17CParticleDatabaseFfRC17CPoseAsTransformsRC15CCharLayoutInfoRC12CTransform4fRC9CVector3fR13CStateManager: @@ -1256,7 +1256,7 @@ lbl_800B8B20: /* 800B8B28 000B5A88 80 01 00 34 */ lwz r0, 0x34(r1) /* 800B8B2C 000B5A8C 7C 08 03 A6 */ mtlr r0 /* 800B8B30 000B5A90 38 21 00 30 */ addi r1, r1, 0x30 -/* 800B8B34 000B5A94 4E 80 00 20 */ blr +/* 800B8B34 000B5A94 4E 80 00 20 */ blr .global GetParticleSystem__23CParticleGenInfoGenericCFv GetParticleSystem__23CParticleGenInfoGenericCFv: @@ -1266,7 +1266,7 @@ GetParticleSystem__23CParticleGenInfoGenericCFv: /* 800B8B44 000B5AA4 80 64 00 04 */ lwz r3, 4(r4) /* 800B8B48 000B5AA8 38 03 00 01 */ addi r0, r3, 1 /* 800B8B4C 000B5AAC 90 04 00 04 */ stw r0, 4(r4) -/* 800B8B50 000B5AB0 4E 80 00 20 */ blr +/* 800B8B50 000B5AB0 4E 80 00 20 */ blr .global "SetCEXTValue__17CParticleDatabaseFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>if" "SetCEXTValue__17CParticleDatabaseFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>if": @@ -1299,7 +1299,7 @@ lbl_800B8BAC: /* 800B8BB8 000B5B18 83 C1 00 10 */ lwz r30, 0x10(r1) /* 800B8BBC 000B5B1C 7C 08 03 A6 */ mtlr r0 /* 800B8BC0 000B5B20 38 21 00 20 */ addi r1, r1, 0x20 -/* 800B8BC4 000B5B24 4E 80 00 20 */ blr +/* 800B8BC4 000B5B24 4E 80 00 20 */ blr .global "SetParticleEffectState__17CParticleDatabaseFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>bR13CStateManager" "SetParticleEffectState__17CParticleDatabaseFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>bR13CStateManager": @@ -1319,7 +1319,7 @@ lbl_800B8BAC: /* 800B8BFC 000B5B5C 7F C5 F3 78 */ mr r5, r30 /* 800B8C00 000B5B60 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 800B8C04 000B5B64 7D 89 03 A6 */ mtctr r12 -/* 800B8C08 000B5B68 4E 80 04 21 */ bctrl +/* 800B8C08 000B5B68 4E 80 04 21 */ bctrl /* 800B8C0C 000B5B6C 57 A0 06 3F */ clrlwi. r0, r29, 0x18 /* 800B8C10 000B5B70 9B BF 00 24 */ stb r29, 0x24(r31) /* 800B8C14 000B5B74 40 82 00 24 */ bne lbl_800B8C38 @@ -1330,7 +1330,7 @@ lbl_800B8BAC: /* 800B8C28 000B5B88 81 9F 00 00 */ lwz r12, 0(r31) /* 800B8C2C 000B5B8C 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 800B8C30 000B5B90 7D 89 03 A6 */ mtctr r12 -/* 800B8C34 000B5B94 4E 80 04 21 */ bctrl +/* 800B8C34 000B5B94 4E 80 04 21 */ bctrl lbl_800B8C38: /* 800B8C38 000B5B98 38 00 00 01 */ li r0, 1 /* 800B8C3C 000B5B9C 98 1F 00 40 */ stb r0, 0x40(r31) @@ -1341,7 +1341,7 @@ lbl_800B8C40: /* 800B8C4C 000B5BAC 83 A1 00 14 */ lwz r29, 0x14(r1) /* 800B8C50 000B5BB0 7C 08 03 A6 */ mtlr r0 /* 800B8C54 000B5BB4 38 21 00 20 */ addi r1, r1, 0x20 -/* 800B8C58 000B5BB8 4E 80 00 20 */ blr +/* 800B8C58 000B5BB8 4E 80 00 20 */ blr .global "GetParticleEffect__17CParticleDatabaseFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" "GetParticleEffect__17CParticleDatabaseFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>": @@ -1491,7 +1491,7 @@ lbl_800B8E44: /* 800B8E4C 000B5DAC 83 C1 00 68 */ lwz r30, 0x68(r1) /* 800B8E50 000B5DB0 7C 08 03 A6 */ mtlr r0 /* 800B8E54 000B5DB4 38 21 00 70 */ addi r1, r1, 0x70 -/* 800B8E58 000B5DB8 4E 80 00 20 */ blr +/* 800B8E58 000B5DB8 4E 80 00 20 */ blr .global "find__Q24rstl492red_black_tree,Q24rstl17rmemory_allocator>,Q24rstl119pair,Q24rstl17rmemory_allocator>,Q24rstl28auto_ptr<16CParticleGenInfo>>,0,Q24rstl140select1st,Q24rstl17rmemory_allocator>,Q24rstl28auto_ptr<16CParticleGenInfo>>>,Q24rstl81less,Q24rstl17rmemory_allocator>>,Q24rstl17rmemory_allocator>FR" "find__Q24rstl492red_black_tree,Q24rstl17rmemory_allocator>,Q24rstl119pair,Q24rstl17rmemory_allocator>,Q24rstl28auto_ptr<16CParticleGenInfo>>,0,Q24rstl140select1st,Q24rstl17rmemory_allocator>,Q24rstl28auto_ptr<16CParticleGenInfo>>>,Q24rstl81less,Q24rstl17rmemory_allocator>>,Q24rstl17rmemory_allocator>FR": @@ -1513,7 +1513,7 @@ lbl_800B8E44: /* 800B8E98 000B5DF8 83 C1 00 08 */ lwz r30, 8(r1) /* 800B8E9C 000B5DFC 7C 08 03 A6 */ mtlr r0 /* 800B8EA0 000B5E00 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B8EA4 000B5E04 4E 80 00 20 */ blr +/* 800B8EA4 000B5E04 4E 80 00 20 */ blr .global "find_node__Q24rstl492red_black_tree,Q24rstl17rmemory_allocator>,Q24rstl119pair,Q24rstl17rmemory_allocator>,Q24rstl28auto_ptr<16CParticleGenInfo>>,0,Q24rstl140select1st,Q24rstl17rmemory_allocator>,Q24rstl28auto_ptr<16CParticleGenInfo>>>,Q24rstl81less,Q24rstl17rmemory_allocator>>,Q24rstl17rmemory_allocat" "find_node__Q24rstl492red_black_tree,Q24rstl17rmemory_allocator>,Q24rstl119pair,Q24rstl17rmemory_allocator>,Q24rstl28auto_ptr<16CParticleGenInfo>>,0,Q24rstl140select1st,Q24rstl17rmemory_allocator>,Q24rstl28auto_ptr<16CParticleGenInfo>>>,Q24rstl81less,Q24rstl17rmemory_allocator>>,Q24rstl17rmemory_allocat": @@ -1570,7 +1570,7 @@ lbl_800B8F44: /* 800B8F54 000B5EB4 83 81 00 10 */ lwz r28, 0x10(r1) /* 800B8F58 000B5EB8 7C 08 03 A6 */ mtlr r0 /* 800B8F5C 000B5EBC 38 21 00 20 */ addi r1, r1, 0x20 -/* 800B8F60 000B5EC0 4E 80 00 20 */ blr +/* 800B8F60 000B5EC0 4E 80 00 20 */ blr .global "AddAuxiliaryParticleEffect__17CParticleDatabaseFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>iRC22CAuxiliaryParticleDataRC9CVector3fR13CStateManager7TAreaIdi" "AddAuxiliaryParticleEffect__17CParticleDatabaseFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>iRC22CAuxiliaryParticleDataRC9CVector3fR13CStateManager7TAreaIdi": @@ -1778,7 +1778,7 @@ lbl_800B9210: /* 800B9250 000B61B0 38 80 00 01 */ li r4, 1 /* 800B9254 000B61B4 81 8C 00 08 */ lwz r12, 8(r12) /* 800B9258 000B61B8 7D 89 03 A6 */ mtctr r12 -/* 800B925C 000B61BC 4E 80 04 21 */ bctrl +/* 800B925C 000B61BC 4E 80 04 21 */ bctrl lbl_800B9260: /* 800B9260 000B61C0 88 81 00 28 */ lbz r4, 0x28(r1) /* 800B9264 000B61C4 38 00 00 00 */ li r0, 0 @@ -1797,7 +1797,7 @@ lbl_800B9278: /* 800B9294 000B61F4 38 80 00 01 */ li r4, 1 /* 800B9298 000B61F8 81 8C 00 08 */ lwz r12, 8(r12) /* 800B929C 000B61FC 7D 89 03 A6 */ mtctr r12 -/* 800B92A0 000B6200 4E 80 04 21 */ bctrl +/* 800B92A0 000B6200 4E 80 04 21 */ bctrl lbl_800B92A4: /* 800B92A4 000B6204 7E A0 07 75 */ extsb. r0, r21 /* 800B92A8 000B6208 41 82 00 0C */ beq lbl_800B92B4 @@ -1815,7 +1815,7 @@ lbl_800B92C4: /* 800B92D0 000B6230 81 83 00 00 */ lwz r12, 0(r3) /* 800B92D4 000B6234 81 8C 00 24 */ lwz r12, 0x24(r12) /* 800B92D8 000B6238 7D 89 03 A6 */ mtctr r12 -/* 800B92DC 000B623C 4E 80 04 21 */ bctrl +/* 800B92DC 000B623C 4E 80 04 21 */ bctrl /* 800B92E0 000B6240 80 81 00 44 */ lwz r4, 0x44(r1) /* 800B92E4 000B6244 38 00 00 00 */ li r0, 0 /* 800B92E8 000B6248 7F 83 E3 78 */ mr r3, r28 @@ -1841,7 +1841,7 @@ lbl_800B9314: /* 800B9330 000B6290 38 80 00 01 */ li r4, 1 /* 800B9334 000B6294 81 8C 00 08 */ lwz r12, 8(r12) /* 800B9338 000B6298 7D 89 03 A6 */ mtctr r12 -/* 800B933C 000B629C 4E 80 04 21 */ bctrl +/* 800B933C 000B629C 4E 80 04 21 */ bctrl /* 800B9340 000B62A0 48 00 00 38 */ b lbl_800B9378 lbl_800B9344: /* 800B9344 000B62A4 88 15 00 24 */ lbz r0, 0x24(r21) @@ -1852,7 +1852,7 @@ lbl_800B9344: /* 800B9358 000B62B8 38 80 00 01 */ li r4, 1 /* 800B935C 000B62BC 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 800B9360 000B62C0 7D 89 03 A6 */ mtctr r12 -/* 800B9364 000B62C4 4E 80 04 21 */ bctrl +/* 800B9364 000B62C4 4E 80 04 21 */ bctrl /* 800B9368 000B62C8 38 00 00 01 */ li r0, 1 /* 800B936C 000B62CC 98 15 00 24 */ stb r0, 0x24(r21) /* 800B9370 000B62D0 98 15 00 40 */ stb r0, 0x40(r21) @@ -1864,7 +1864,7 @@ lbl_800B9378: /* 800B9384 000B62E4 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 800B9388 000B62E8 7C 08 03 A6 */ mtlr r0 /* 800B938C 000B62EC 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 800B9390 000B62F0 4E 80 00 20 */ blr +/* 800B9390 000B62F0 4E 80 00 20 */ blr .global "AddParticleEffect__17CParticleDatabaseFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>iRC13CParticleDataRC9CVector3fR13CStateManager7TAreaIdb" "AddParticleEffect__17CParticleDatabaseFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>iRC13CParticleDataRC9CVector3fR13CStateManager7TAreaIdb": @@ -2064,7 +2064,7 @@ lbl_800B9620: /* 800B9660 000B65C0 38 80 00 01 */ li r4, 1 /* 800B9664 000B65C4 81 8C 00 08 */ lwz r12, 8(r12) /* 800B9668 000B65C8 7D 89 03 A6 */ mtctr r12 -/* 800B966C 000B65CC 4E 80 04 21 */ bctrl +/* 800B966C 000B65CC 4E 80 04 21 */ bctrl lbl_800B9670: /* 800B9670 000B65D0 88 81 00 6C */ lbz r4, 0x6c(r1) /* 800B9674 000B65D4 38 00 00 00 */ li r0, 0 @@ -2083,7 +2083,7 @@ lbl_800B9688: /* 800B96A4 000B6604 38 80 00 01 */ li r4, 1 /* 800B96A8 000B6608 81 8C 00 08 */ lwz r12, 8(r12) /* 800B96AC 000B660C 7D 89 03 A6 */ mtctr r12 -/* 800B96B0 000B6610 4E 80 04 21 */ bctrl +/* 800B96B0 000B6610 4E 80 04 21 */ bctrl lbl_800B96B4: /* 800B96B4 000B6614 7E A0 07 75 */ extsb. r0, r21 /* 800B96B8 000B6618 41 82 00 0C */ beq lbl_800B96C4 @@ -2234,7 +2234,7 @@ lbl_800B9884: /* 800B98C4 000B6824 38 80 00 01 */ li r4, 1 /* 800B98C8 000B6828 81 8C 00 08 */ lwz r12, 8(r12) /* 800B98CC 000B682C 7D 89 03 A6 */ mtctr r12 -/* 800B98D0 000B6830 4E 80 04 21 */ bctrl +/* 800B98D0 000B6830 4E 80 04 21 */ bctrl lbl_800B98D4: /* 800B98D4 000B6834 88 81 00 54 */ lbz r4, 0x54(r1) /* 800B98D8 000B6838 38 00 00 00 */ li r0, 0 @@ -2253,7 +2253,7 @@ lbl_800B98EC: /* 800B9908 000B6868 38 80 00 01 */ li r4, 1 /* 800B990C 000B686C 81 8C 00 08 */ lwz r12, 8(r12) /* 800B9910 000B6870 7D 89 03 A6 */ mtctr r12 -/* 800B9914 000B6874 4E 80 04 21 */ bctrl +/* 800B9914 000B6874 4E 80 04 21 */ bctrl lbl_800B9918: /* 800B9918 000B6878 7E 60 07 75 */ extsb. r0, r19 /* 800B991C 000B687C 41 82 00 0C */ beq lbl_800B9928 @@ -2407,7 +2407,7 @@ lbl_800B9AF4: /* 800B9B34 000B6A94 38 80 00 01 */ li r4, 1 /* 800B9B38 000B6A98 81 8C 00 08 */ lwz r12, 8(r12) /* 800B9B3C 000B6A9C 7D 89 03 A6 */ mtctr r12 -/* 800B9B40 000B6AA0 4E 80 04 21 */ bctrl +/* 800B9B40 000B6AA0 4E 80 04 21 */ bctrl lbl_800B9B44: /* 800B9B44 000B6AA4 88 81 00 3C */ lbz r4, 0x3c(r1) /* 800B9B48 000B6AA8 38 00 00 00 */ li r0, 0 @@ -2426,7 +2426,7 @@ lbl_800B9B5C: /* 800B9B78 000B6AD8 38 80 00 01 */ li r4, 1 /* 800B9B7C 000B6ADC 81 8C 00 08 */ lwz r12, 8(r12) /* 800B9B80 000B6AE0 7D 89 03 A6 */ mtctr r12 -/* 800B9B84 000B6AE4 4E 80 04 21 */ bctrl +/* 800B9B84 000B6AE4 4E 80 04 21 */ bctrl lbl_800B9B88: /* 800B9B88 000B6AE8 7E A0 07 75 */ extsb. r0, r21 /* 800B9B8C 000B6AEC 41 82 00 0C */ beq lbl_800B9B98 @@ -2447,7 +2447,7 @@ lbl_800B9BA0: /* 800B9BC0 000B6B20 81 83 00 00 */ lwz r12, 0(r3) /* 800B9BC4 000B6B24 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 800B9BC8 000B6B28 7D 89 03 A6 */ mtctr r12 -/* 800B9BCC 000B6B2C 4E 80 04 21 */ bctrl +/* 800B9BCC 000B6B2C 4E 80 04 21 */ bctrl /* 800B9BD0 000B6B30 80 81 00 88 */ lwz r4, 0x88(r1) /* 800B9BD4 000B6B34 38 00 00 01 */ li r0, 1 /* 800B9BD8 000B6B38 7F E3 FB 78 */ mr r3, r31 @@ -2468,7 +2468,7 @@ lbl_800B9BF4: /* 800B9C10 000B6B70 38 80 00 01 */ li r4, 1 /* 800B9C14 000B6B74 81 8C 00 08 */ lwz r12, 8(r12) /* 800B9C18 000B6B78 7D 89 03 A6 */ mtctr r12 -/* 800B9C1C 000B6B7C 4E 80 04 21 */ bctrl +/* 800B9C1C 000B6B7C 4E 80 04 21 */ bctrl /* 800B9C20 000B6B80 48 00 00 38 */ b lbl_800B9C58 lbl_800B9C24: /* 800B9C24 000B6B84 88 12 00 24 */ lbz r0, 0x24(r18) @@ -2479,7 +2479,7 @@ lbl_800B9C24: /* 800B9C38 000B6B98 38 80 00 01 */ li r4, 1 /* 800B9C3C 000B6B9C 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 800B9C40 000B6BA0 7D 89 03 A6 */ mtctr r12 -/* 800B9C44 000B6BA4 4E 80 04 21 */ bctrl +/* 800B9C44 000B6BA4 4E 80 04 21 */ bctrl /* 800B9C48 000B6BA8 38 00 00 01 */ li r0, 1 /* 800B9C4C 000B6BAC 98 12 00 24 */ stb r0, 0x24(r18) /* 800B9C50 000B6BB0 98 12 00 40 */ stb r0, 0x40(r18) @@ -2491,7 +2491,7 @@ lbl_800B9C58: /* 800B9C64 000B6BC4 80 01 01 14 */ lwz r0, 0x114(r1) /* 800B9C68 000B6BC8 7C 08 03 A6 */ mtlr r0 /* 800B9C6C 000B6BCC 38 21 01 10 */ addi r1, r1, 0x110 -/* 800B9C70 000B6BD0 4E 80 00 20 */ blr +/* 800B9C70 000B6BD0 4E 80 00 20 */ blr .global "InsertParticleGen__17CParticleDatabaseFbiRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RCQ24rstl28auto_ptr<16CParticleGenInfo>" "InsertParticleGen__17CParticleDatabaseFbiRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RCQ24rstl28auto_ptr<16CParticleGenInfo>": @@ -2564,7 +2564,7 @@ lbl_800B9CFC: /* 800B9D5C 000B6CBC 38 80 00 01 */ li r4, 1 /* 800B9D60 000B6CC0 81 8C 00 08 */ lwz r12, 8(r12) /* 800B9D64 000B6CC4 7D 89 03 A6 */ mtctr r12 -/* 800B9D68 000B6CC8 4E 80 04 21 */ bctrl +/* 800B9D68 000B6CC8 4E 80 04 21 */ bctrl lbl_800B9D6C: /* 800B9D6C 000B6CCC 38 61 00 14 */ addi r3, r1, 0x14 /* 800B9D70 000B6CD0 48 28 3D 71 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -2579,7 +2579,7 @@ lbl_800B9D8C: /* 800B9D90 000B6CF0 80 01 00 54 */ lwz r0, 0x54(r1) /* 800B9D94 000B6CF4 7C 08 03 A6 */ mtlr r0 /* 800B9D98 000B6CF8 38 21 00 50 */ addi r1, r1, 0x50 -/* 800B9D9C 000B6CFC 4E 80 00 20 */ blr +/* 800B9D9C 000B6CFC 4E 80 00 20 */ blr .global CacheParticleDesc__17CParticleDatabaseFRC10SObjectTag CacheParticleDesc__17CParticleDatabaseFRC10SObjectTag: @@ -2668,7 +2668,7 @@ lbl_800B9E80: /* 800B9EC4 000B6E24 81 84 00 00 */ lwz r12, 0(r4) /* 800B9EC8 000B6E28 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800B9ECC 000B6E2C 7D 89 03 A6 */ mtctr r12 -/* 800B9ED0 000B6E30 4E 80 04 21 */ bctrl +/* 800B9ED0 000B6E30 4E 80 04 21 */ bctrl /* 800B9ED4 000B6E34 7F A3 EB 78 */ mr r3, r29 /* 800B9ED8 000B6E38 38 81 00 5C */ addi r4, r1, 0x5c /* 800B9EDC 000B6E3C 3B 80 00 01 */ li r28, 1 @@ -2775,7 +2775,7 @@ lbl_800B9FFC: /* 800BA040 000B6FA0 81 84 00 00 */ lwz r12, 0(r4) /* 800BA044 000B6FA4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800BA048 000B6FA8 7D 89 03 A6 */ mtctr r12 -/* 800BA04C 000B6FAC 4E 80 04 21 */ bctrl +/* 800BA04C 000B6FAC 4E 80 04 21 */ bctrl /* 800BA050 000B6FB0 7F A3 EB 78 */ mr r3, r29 /* 800BA054 000B6FB4 38 81 00 3C */ addi r4, r1, 0x3c /* 800BA058 000B6FB8 3B 80 00 01 */ li r28, 1 @@ -2882,7 +2882,7 @@ lbl_800BA178: /* 800BA1BC 000B711C 81 84 00 00 */ lwz r12, 0(r4) /* 800BA1C0 000B7120 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800BA1C4 000B7124 7D 89 03 A6 */ mtctr r12 -/* 800BA1C8 000B7128 4E 80 04 21 */ bctrl +/* 800BA1C8 000B7128 4E 80 04 21 */ bctrl /* 800BA1CC 000B712C 7F A3 EB 78 */ mr r3, r29 /* 800BA1D0 000B7130 38 81 00 1C */ addi r4, r1, 0x1c /* 800BA1D4 000B7134 3B 80 00 01 */ li r28, 1 @@ -2937,7 +2937,7 @@ lbl_800BA274: /* 800BA284 000B71E4 83 81 00 A0 */ lwz r28, 0xa0(r1) /* 800BA288 000B71E8 7C 08 03 A6 */ mtlr r0 /* 800BA28C 000B71EC 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 800BA290 000B71F0 4E 80 00 20 */ blr +/* 800BA290 000B71F0 4E 80 00 20 */ blr .global CacheParticleDesc__17CParticleDatabaseFRCQ213CharacterInfo16CParticleResData CacheParticleDesc__17CParticleDatabaseFRCQ213CharacterInfo16CParticleResData: @@ -3013,7 +3013,7 @@ lbl_800BA344: /* 800BA388 000B72E8 81 84 00 00 */ lwz r12, 0(r4) /* 800BA38C 000B72EC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800BA390 000B72F0 7D 89 03 A6 */ mtctr r12 -/* 800BA394 000B72F4 4E 80 04 21 */ bctrl +/* 800BA394 000B72F4 4E 80 04 21 */ bctrl /* 800BA398 000B72F8 7F 03 C3 78 */ mr r3, r24 /* 800BA39C 000B72FC 38 81 00 5C */ addi r4, r1, 0x5c /* 800BA3A0 000B7300 3A E0 00 01 */ li r23, 1 @@ -3130,7 +3130,7 @@ lbl_800BA4E0: /* 800BA524 000B7484 81 84 00 00 */ lwz r12, 0(r4) /* 800BA528 000B7488 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800BA52C 000B748C 7D 89 03 A6 */ mtctr r12 -/* 800BA530 000B7490 4E 80 04 21 */ bctrl +/* 800BA530 000B7490 4E 80 04 21 */ bctrl /* 800BA534 000B7494 7F 03 C3 78 */ mr r3, r24 /* 800BA538 000B7498 38 81 00 3C */ addi r4, r1, 0x3c /* 800BA53C 000B749C 3A E0 00 01 */ li r23, 1 @@ -3247,7 +3247,7 @@ lbl_800BA67C: /* 800BA6C0 000B7620 81 84 00 00 */ lwz r12, 0(r4) /* 800BA6C4 000B7624 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800BA6C8 000B7628 7D 89 03 A6 */ mtctr r12 -/* 800BA6CC 000B762C 4E 80 04 21 */ bctrl +/* 800BA6CC 000B762C 4E 80 04 21 */ bctrl /* 800BA6D0 000B7630 7F 03 C3 78 */ mr r3, r24 /* 800BA6D4 000B7634 38 81 00 1C */ addi r4, r1, 0x1c /* 800BA6D8 000B7638 3A E0 00 01 */ li r23, 1 @@ -3302,7 +3302,7 @@ lbl_800BA778: /* 800BA784 000B76E4 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 800BA788 000B76E8 7C 08 03 A6 */ mtlr r0 /* 800BA78C 000B76EC 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 800BA790 000B76F0 4E 80 00 20 */ blr +/* 800BA790 000B76F0 4E 80 00 20 */ blr .global __dt__17CParticleDatabaseFv __dt__17CParticleDatabaseFv: @@ -3468,7 +3468,7 @@ lbl_800BA9B8: /* 800BA9C4 000B7924 83 C1 00 08 */ lwz r30, 8(r1) /* 800BA9C8 000B7928 7C 08 03 A6 */ mtlr r0 /* 800BA9CC 000B792C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800BA9D0 000B7930 4E 80 00 20 */ blr +/* 800BA9D0 000B7930 4E 80 00 20 */ blr .global __ct__17CParticleDatabaseFv __ct__17CParticleDatabaseFv: @@ -3562,7 +3562,7 @@ __ct__17CParticleDatabaseFv: /* 800BAB30 000B7A90 83 A1 00 54 */ lwz r29, 0x54(r1) /* 800BAB34 000B7A94 83 81 00 50 */ lwz r28, 0x50(r1) /* 800BAB38 000B7A98 38 21 00 60 */ addi r1, r1, 0x60 -/* 800BAB3C 000B7A9C 4E 80 00 20 */ blr +/* 800BAB3C 000B7A9C 4E 80 00 20 */ blr .global sub_800bab40 sub_800bab40: @@ -3600,7 +3600,7 @@ lbl_800BAB80: /* 800BABB4 000B7B14 38 80 00 01 */ li r4, 1 /* 800BABB8 000B7B18 81 8C 00 08 */ lwz r12, 8(r12) /* 800BABBC 000B7B1C 7D 89 03 A6 */ mtctr r12 -/* 800BABC0 000B7B20 4E 80 04 21 */ bctrl +/* 800BABC0 000B7B20 4E 80 04 21 */ bctrl lbl_800BABC4: /* 800BABC4 000B7B24 34 1F 00 10 */ addic. r0, r31, 0x10 /* 800BABC8 000B7B28 41 82 00 0C */ beq lbl_800BABD4 @@ -3617,7 +3617,7 @@ lbl_800BABE4: /* 800BABEC 000B7B4C 83 C1 00 08 */ lwz r30, 8(r1) /* 800BABF0 000B7B50 7C 08 03 A6 */ mtlr r0 /* 800BABF4 000B7B54 38 21 00 10 */ addi r1, r1, 0x10 -/* 800BABF8 000B7B58 4E 80 00 20 */ blr +/* 800BABF8 000B7B58 4E 80 00 20 */ blr .global "_getGraphicLightId,30TToken<20CElectricDescription>>__FRCQ24rstl24ncrc_ptr<12CParticleGen>RC30TToken<20CElectricDescription>" "_getGraphicLightId,30TToken<20CElectricDescription>>__FRCQ24rstl24ncrc_ptr<12CParticleGen>RC30TToken<20CElectricDescription>": @@ -3631,7 +3631,7 @@ lbl_800BABE4: /* 800BAC18 000B7B78 81 83 00 00 */ lwz r12, 0(r3) /* 800BAC1C 000B7B7C 81 8C 00 64 */ lwz r12, 0x64(r12) /* 800BAC20 000B7B80 7D 89 03 A6 */ mtctr r12 -/* 800BAC24 000B7B84 4E 80 04 21 */ bctrl +/* 800BAC24 000B7B84 4E 80 04 21 */ bctrl /* 800BAC28 000B7B88 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800BAC2C 000B7B8C 41 82 00 10 */ beq lbl_800BAC3C /* 800BAC30 000B7B90 80 7F 00 00 */ lwz r3, 0(r31) @@ -3644,7 +3644,7 @@ lbl_800BAC40: /* 800BAC44 000B7BA4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800BAC48 000B7BA8 7C 08 03 A6 */ mtlr r0 /* 800BAC4C 000B7BAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800BAC50 000B7BB0 4E 80 00 20 */ blr +/* 800BAC50 000B7BB0 4E 80 00 20 */ blr .global "_getGraphicLightId,25TToken<15CGenDescription>>__FRCQ24rstl24ncrc_ptr<12CParticleGen>RC25TToken<15CGenDescription>" "_getGraphicLightId,25TToken<15CGenDescription>>__FRCQ24rstl24ncrc_ptr<12CParticleGen>RC25TToken<15CGenDescription>": @@ -3658,7 +3658,7 @@ lbl_800BAC40: /* 800BAC70 000B7BD0 81 83 00 00 */ lwz r12, 0(r3) /* 800BAC74 000B7BD4 81 8C 00 64 */ lwz r12, 0x64(r12) /* 800BAC78 000B7BD8 7D 89 03 A6 */ mtctr r12 -/* 800BAC7C 000B7BDC 4E 80 04 21 */ bctrl +/* 800BAC7C 000B7BDC 4E 80 04 21 */ bctrl /* 800BAC80 000B7BE0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800BAC84 000B7BE4 41 82 00 10 */ beq lbl_800BAC94 /* 800BAC88 000B7BE8 80 7F 00 00 */ lwz r3, 0(r31) @@ -3671,7 +3671,7 @@ lbl_800BAC98: /* 800BAC9C 000B7BFC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800BACA0 000B7C00 7C 08 03 A6 */ mtlr r0 /* 800BACA4 000B7C04 38 21 00 10 */ addi r1, r1, 0x10 -/* 800BACA8 000B7C08 4E 80 00 20 */ blr +/* 800BACA8 000B7C08 4E 80 00 20 */ blr .global sub_800bacac sub_800bacac: @@ -3711,7 +3711,7 @@ lbl_800BAD18: /* 800BAD20 000B7C80 83 C1 00 08 */ lwz r30, 8(r1) /* 800BAD24 000B7C84 7C 08 03 A6 */ mtlr r0 /* 800BAD28 000B7C88 38 21 00 10 */ addi r1, r1, 0x10 -/* 800BAD2C 000B7C8C 4E 80 00 20 */ blr +/* 800BAD2C 000B7C8C 4E 80 00 20 */ blr .global sub_800bad30 sub_800bad30: @@ -3878,7 +3878,7 @@ lbl_800BAF80: /* 800BAF84 000B7EE4 80 01 00 24 */ lwz r0, 0x24(r1) /* 800BAF88 000B7EE8 7C 08 03 A6 */ mtlr r0 /* 800BAF8C 000B7EEC 38 21 00 20 */ addi r1, r1, 0x20 -/* 800BAF90 000B7EF0 4E 80 00 20 */ blr +/* 800BAF90 000B7EF0 4E 80 00 20 */ blr .global sub_800baf94 sub_800baf94: @@ -3918,7 +3918,7 @@ lbl_800BB000: /* 800BB008 000B7F68 83 C1 00 08 */ lwz r30, 8(r1) /* 800BB00C 000B7F6C 7C 08 03 A6 */ mtlr r0 /* 800BB010 000B7F70 38 21 00 10 */ addi r1, r1, 0x10 -/* 800BB014 000B7F74 4E 80 00 20 */ blr +/* 800BB014 000B7F74 4E 80 00 20 */ blr .global sub_800bb018 sub_800bb018: @@ -4085,7 +4085,7 @@ lbl_800BB268: /* 800BB26C 000B81CC 80 01 00 24 */ lwz r0, 0x24(r1) /* 800BB270 000B81D0 7C 08 03 A6 */ mtlr r0 /* 800BB274 000B81D4 38 21 00 20 */ addi r1, r1, 0x20 -/* 800BB278 000B81D8 4E 80 00 20 */ blr +/* 800BB278 000B81D8 4E 80 00 20 */ blr .global sub_800bb27c sub_800bb27c: @@ -4125,7 +4125,7 @@ lbl_800BB2E8: /* 800BB2F0 000B8250 83 C1 00 08 */ lwz r30, 8(r1) /* 800BB2F4 000B8254 7C 08 03 A6 */ mtlr r0 /* 800BB2F8 000B8258 38 21 00 10 */ addi r1, r1, 0x10 -/* 800BB2FC 000B825C 4E 80 00 20 */ blr +/* 800BB2FC 000B825C 4E 80 00 20 */ blr .global sub_800bb300 sub_800bb300: @@ -4292,7 +4292,7 @@ lbl_800BB550: /* 800BB554 000B84B4 80 01 00 24 */ lwz r0, 0x24(r1) /* 800BB558 000B84B8 7C 08 03 A6 */ mtlr r0 /* 800BB55C 000B84BC 38 21 00 20 */ addi r1, r1, 0x20 -/* 800BB560 000B84C0 4E 80 00 20 */ blr +/* 800BB560 000B84C0 4E 80 00 20 */ blr .global sub_800bb564 sub_800bb564: @@ -4466,7 +4466,7 @@ lbl_800BB7D0: /* 800BB7D4 000B8734 80 01 00 24 */ lwz r0, 0x24(r1) /* 800BB7D8 000B8738 7C 08 03 A6 */ mtlr r0 /* 800BB7DC 000B873C 38 21 00 20 */ addi r1, r1, 0x20 -/* 800BB7E0 000B8740 4E 80 00 20 */ blr +/* 800BB7E0 000B8740 4E 80 00 20 */ blr .global sub_800bb7e4 sub_800bb7e4: @@ -4503,7 +4503,7 @@ lbl_800BB848: /* 800BB850 000B87B0 83 C1 00 08 */ lwz r30, 8(r1) /* 800BB854 000B87B4 7C 08 03 A6 */ mtlr r0 /* 800BB858 000B87B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800BB85C 000B87BC 4E 80 00 20 */ blr +/* 800BB85C 000B87BC 4E 80 00 20 */ blr .global sub_800bb860 sub_800bb860: @@ -4540,7 +4540,7 @@ lbl_800BB8C4: /* 800BB8CC 000B882C 83 C1 00 08 */ lwz r30, 8(r1) /* 800BB8D0 000B8830 7C 08 03 A6 */ mtlr r0 /* 800BB8D4 000B8834 38 21 00 10 */ addi r1, r1, 0x10 -/* 800BB8D8 000B8838 4E 80 00 20 */ blr +/* 800BB8D8 000B8838 4E 80 00 20 */ blr .global sub_800bb8dc sub_800bb8dc: @@ -4577,4 +4577,4 @@ lbl_800BB940: /* 800BB948 000B88A8 83 C1 00 08 */ lwz r30, 8(r1) /* 800BB94C 000B88AC 7C 08 03 A6 */ mtlr r0 /* 800BB950 000B88B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800BB954 000B88B4 4E 80 00 20 */ blr +/* 800BB954 000B88B4 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/CParticleGenInfo.s b/asm/MetroidPrime/CParticleGenInfo.s index 4dfb57b3..cdb9b626 100644 --- a/asm/MetroidPrime/CParticleGenInfo.s +++ b/asm/MetroidPrime/CParticleGenInfo.s @@ -57,7 +57,7 @@ lbl_800B776C: /* 800B7778 000B46D8 83 C1 00 08 */ lwz r30, 8(r1) /* 800B777C 000B46DC 7C 08 03 A6 */ mtlr r0 /* 800B7780 000B46E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B7784 000B46E4 4E 80 00 20 */ blr +/* 800B7784 000B46E4 4E 80 00 20 */ blr .global "_initializeLight__FRCQ24rstl24ncrc_ptr<12CParticleGen>R13CStateManageri" "_initializeLight__FRCQ24rstl24ncrc_ptr<12CParticleGen>R13CStateManageri": @@ -75,7 +75,7 @@ lbl_800B776C: /* 800B77B4 000B4714 81 83 00 00 */ lwz r12, 0(r3) /* 800B77B8 000B4718 81 8C 00 64 */ lwz r12, 0x64(r12) /* 800B77BC 000B471C 7D 89 03 A6 */ mtctr r12 -/* 800B77C0 000B4720 4E 80 04 21 */ bctrl +/* 800B77C0 000B4720 4E 80 04 21 */ bctrl /* 800B77C4 000B4724 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B77C8 000B4728 41 82 01 34 */ beq lbl_800B78FC /* 800B77CC 000B472C 7F A4 EB 78 */ mr r4, r29 @@ -111,18 +111,18 @@ lbl_800B776C: /* 800B7844 000B47A4 81 84 00 00 */ lwz r12, 0(r4) /* 800B7848 000B47A8 81 8C 00 68 */ lwz r12, 0x68(r12) /* 800B784C 000B47AC 7D 89 03 A6 */ mtctr r12 -/* 800B7850 000B47B0 4E 80 04 21 */ bctrl +/* 800B7850 000B47B0 4E 80 04 21 */ bctrl /* 800B7854 000B47B4 7F 23 CB 78 */ mr r3, r25 /* 800B7858 000B47B8 81 99 00 00 */ lwz r12, 0(r25) /* 800B785C 000B47BC 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 800B7860 000B47C0 7D 89 03 A6 */ mtctr r12 -/* 800B7864 000B47C4 4E 80 04 21 */ bctrl +/* 800B7864 000B47C4 4E 80 04 21 */ bctrl /* 800B7868 000B47C8 7C 7E 1B 78 */ mr r30, r3 /* 800B786C 000B47CC 7F 23 CB 78 */ mr r3, r25 /* 800B7870 000B47D0 81 99 00 00 */ lwz r12, 0(r25) /* 800B7874 000B47D4 81 8C 00 38 */ lwz r12, 0x38(r12) /* 800B7878 000B47D8 7D 89 03 A6 */ mtctr r12 -/* 800B787C 000B47DC 4E 80 04 21 */ bctrl +/* 800B787C 000B47DC 4E 80 04 21 */ bctrl /* 800B7880 000B47E0 7C 64 1B 78 */ mr r4, r3 /* 800B7884 000B47E4 38 61 00 64 */ addi r3, r1, 0x64 /* 800B7888 000B47E8 48 25 B8 6D */ bl BuildMatrix3f__12CTransform4fCFv @@ -164,7 +164,7 @@ lbl_800B7904: /* 800B7908 000B4868 80 01 01 04 */ lwz r0, 0x104(r1) /* 800B790C 000B486C 7C 08 03 A6 */ mtlr r0 /* 800B7910 000B4870 38 21 01 00 */ addi r1, r1, 0x100 -/* 800B7914 000B4874 4E 80 00 20 */ blr +/* 800B7914 000B4874 4E 80 00 20 */ blr .global "__ct__16CParticleGenInfoFRC10SObjectTagiRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC9CVector3fQ213CParticleData13EParentedModei" "__ct__16CParticleGenInfoFRC10SObjectTagiRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC9CVector3fQ213CParticleData13EParentedModei": @@ -225,7 +225,7 @@ lbl_800B7904: /* 800B79F0 000B4950 80 01 00 34 */ lwz r0, 0x34(r1) /* 800B79F4 000B4954 7C 08 03 A6 */ mtlr r0 /* 800B79F8 000B4958 38 21 00 30 */ addi r1, r1, 0x30 -/* 800B79FC 000B495C 4E 80 00 20 */ blr +/* 800B79FC 000B495C 4E 80 00 20 */ blr .global sub_800b7a00 sub_800b7a00: @@ -247,7 +247,7 @@ sub_800b7a00: /* 800B7A3C 000B499C 38 80 00 01 */ li r4, 1 /* 800B7A40 000B49A0 81 8C 00 08 */ lwz r12, 8(r12) /* 800B7A44 000B49A4 7D 89 03 A6 */ mtctr r12 -/* 800B7A48 000B49A8 4E 80 04 21 */ bctrl +/* 800B7A48 000B49A8 4E 80 04 21 */ bctrl lbl_800B7A4C: /* 800B7A4C 000B49AC 80 7F 00 00 */ lwz r3, 0(r31) /* 800B7A50 000B49B0 28 03 00 00 */ cmplwi r3, 0 @@ -258,4 +258,4 @@ lbl_800B7A5C: /* 800B7A60 000B49C0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800B7A64 000B49C4 7C 08 03 A6 */ mtlr r0 /* 800B7A68 000B49C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B7A6C 000B49CC 4E 80 00 20 */ blr +/* 800B7A6C 000B49CC 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/CParticleGenInfoGeneric.s b/asm/MetroidPrime/CParticleGenInfoGeneric.s index 0d65c5c5..6903a1d7 100644 --- a/asm/MetroidPrime/CParticleGenInfoGeneric.s +++ b/asm/MetroidPrime/CParticleGenInfoGeneric.s @@ -38,11 +38,11 @@ IsSystemDeletable__23CParticleGenInfoGenericCFv: /* 800B6EE0 000B3E40 81 83 00 00 */ lwz r12, 0(r3) /* 800B6EE4 000B3E44 81 8C 00 58 */ lwz r12, 0x58(r12) /* 800B6EE8 000B3E48 7D 89 03 A6 */ mtctr r12 -/* 800B6EEC 000B3E4C 4E 80 04 21 */ bctrl +/* 800B6EEC 000B3E4C 4E 80 04 21 */ bctrl /* 800B6EF0 000B3E50 80 01 00 14 */ lwz r0, 0x14(r1) /* 800B6EF4 000B3E54 7C 08 03 A6 */ mtlr r0 /* 800B6EF8 000B3E58 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B6EFC 000B3E5C 4E 80 00 20 */ blr +/* 800B6EFC 000B3E5C 4E 80 00 20 */ blr .global GetBounds__23CParticleGenInfoGenericCFv GetBounds__23CParticleGenInfoGenericCFv: @@ -56,12 +56,12 @@ GetBounds__23CParticleGenInfoGenericCFv: /* 800B6F1C 000B3E7C 81 84 00 00 */ lwz r12, 0(r4) /* 800B6F20 000B3E80 81 8C 00 5C */ lwz r12, 0x5c(r12) /* 800B6F24 000B3E84 7D 89 03 A6 */ mtctr r12 -/* 800B6F28 000B3E88 4E 80 04 21 */ bctrl +/* 800B6F28 000B3E88 4E 80 04 21 */ bctrl /* 800B6F2C 000B3E8C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800B6F30 000B3E90 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800B6F34 000B3E94 7C 08 03 A6 */ mtlr r0 /* 800B6F38 000B3E98 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B6F3C 000B3E9C 4E 80 00 20 */ blr +/* 800B6F3C 000B3E9C 4E 80 00 20 */ blr .global HasActiveParticles__23CParticleGenInfoGenericCFv HasActiveParticles__23CParticleGenInfoGenericCFv: @@ -73,14 +73,14 @@ HasActiveParticles__23CParticleGenInfoGenericCFv: /* 800B6F54 000B3EB4 81 83 00 00 */ lwz r12, 0(r3) /* 800B6F58 000B3EB8 81 8C 00 60 */ lwz r12, 0x60(r12) /* 800B6F5C 000B3EBC 7D 89 03 A6 */ mtctr r12 -/* 800B6F60 000B3EC0 4E 80 04 21 */ bctrl +/* 800B6F60 000B3EC0 4E 80 04 21 */ bctrl /* 800B6F64 000B3EC4 7C 03 00 D0 */ neg r0, r3 /* 800B6F68 000B3EC8 7C 00 18 78 */ andc r0, r0, r3 /* 800B6F6C 000B3ECC 54 03 0F FE */ srwi r3, r0, 0x1f /* 800B6F70 000B3ED0 80 01 00 14 */ lwz r0, 0x14(r1) /* 800B6F74 000B3ED4 7C 08 03 A6 */ mtlr r0 /* 800B6F78 000B3ED8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B6F7C 000B3EDC 4E 80 00 20 */ blr +/* 800B6F7C 000B3EDC 4E 80 00 20 */ blr .global DestroyParticles__23CParticleGenInfoGenericFv DestroyParticles__23CParticleGenInfoGenericFv: @@ -92,11 +92,11 @@ DestroyParticles__23CParticleGenInfoGenericFv: /* 800B6F94 000B3EF4 81 83 00 00 */ lwz r12, 0(r3) /* 800B6F98 000B3EF8 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 800B6F9C 000B3EFC 7D 89 03 A6 */ mtctr r12 -/* 800B6FA0 000B3F00 4E 80 04 21 */ bctrl +/* 800B6FA0 000B3F00 4E 80 04 21 */ bctrl /* 800B6FA4 000B3F04 80 01 00 14 */ lwz r0, 0x14(r1) /* 800B6FA8 000B3F08 7C 08 03 A6 */ mtlr r0 /* 800B6FAC 000B3F0C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B6FB0 000B3F10 4E 80 00 20 */ blr +/* 800B6FB0 000B3F10 4E 80 00 20 */ blr .global HasLight__23CParticleGenInfoGenericCFv HasLight__23CParticleGenInfoGenericCFv: @@ -108,11 +108,11 @@ HasLight__23CParticleGenInfoGenericCFv: /* 800B6FC8 000B3F28 81 83 00 00 */ lwz r12, 0(r3) /* 800B6FCC 000B3F2C 81 8C 00 64 */ lwz r12, 0x64(r12) /* 800B6FD0 000B3F30 7D 89 03 A6 */ mtctr r12 -/* 800B6FD4 000B3F34 4E 80 04 21 */ bctrl +/* 800B6FD4 000B3F34 4E 80 04 21 */ bctrl /* 800B6FD8 000B3F38 80 01 00 14 */ lwz r0, 0x14(r1) /* 800B6FDC 000B3F3C 7C 08 03 A6 */ mtlr r0 /* 800B6FE0 000B3F40 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B6FE4 000B3F44 4E 80 00 20 */ blr +/* 800B6FE4 000B3F44 4E 80 00 20 */ blr .global SetModulationColor__23CParticleGenInfoGenericFRC6CColor SetModulationColor__23CParticleGenInfoGenericFRC6CColor: @@ -124,17 +124,17 @@ SetModulationColor__23CParticleGenInfoGenericFRC6CColor: /* 800B6FFC 000B3F5C 81 83 00 00 */ lwz r12, 0(r3) /* 800B7000 000B3F60 81 8C 00 30 */ lwz r12, 0x30(r12) /* 800B7004 000B3F64 7D 89 03 A6 */ mtctr r12 -/* 800B7008 000B3F68 4E 80 04 21 */ bctrl +/* 800B7008 000B3F68 4E 80 04 21 */ bctrl /* 800B700C 000B3F6C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800B7010 000B3F70 7C 08 03 A6 */ mtlr r0 /* 800B7014 000B3F74 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B7018 000B3F78 4E 80 00 20 */ blr +/* 800B7018 000B3F78 4E 80 00 20 */ blr .global GetLightId__23CParticleGenInfoGenericCFv GetLightId__23CParticleGenInfoGenericCFv: /* 800B701C 000B3F7C A0 04 00 88 */ lhz r0, 0x88(r4) /* 800B7020 000B3F80 B0 03 00 00 */ sth r0, 0(r3) -/* 800B7024 000B3F84 4E 80 00 20 */ blr +/* 800B7024 000B3F84 4E 80 00 20 */ blr .global DeleteLight__23CParticleGenInfoGenericFR13CStateManager DeleteLight__23CParticleGenInfoGenericFR13CStateManager: @@ -159,7 +159,7 @@ lbl_800B7068: /* 800B706C 000B3FCC 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 800B7070 000B3FD0 7C 08 03 A6 */ mtlr r0 /* 800B7074 000B3FD4 38 21 00 20 */ addi r1, r1, 0x20 -/* 800B7078 000B3FD8 4E 80 00 20 */ blr +/* 800B7078 000B3FD8 4E 80 00 20 */ blr .global SetParticleEmission__23CParticleGenInfoGenericFbR13CStateManager SetParticleEmission__23CParticleGenInfoGenericFbR13CStateManager: @@ -177,7 +177,7 @@ SetParticleEmission__23CParticleGenInfoGenericFbR13CStateManager: /* 800B70A8 000B4008 81 83 00 00 */ lwz r12, 0(r3) /* 800B70AC 000B400C 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 800B70B0 000B4010 7D 89 03 A6 */ mtctr r12 -/* 800B70B4 000B4014 4E 80 04 21 */ bctrl +/* 800B70B4 000B4014 4E 80 04 21 */ bctrl /* 800B70B8 000B4018 A0 7D 00 88 */ lhz r3, 0x88(r29) /* 800B70BC 000B401C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800B70C0 000B4020 7C 03 00 40 */ cmplw r3, r0 @@ -197,7 +197,7 @@ SetParticleEmission__23CParticleGenInfoGenericFbR13CStateManager: /* 800B70F8 000B4058 57 C4 06 3E */ clrlwi r4, r30, 0x18 /* 800B70FC 000B405C 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 800B7100 000B4060 7D 89 03 A6 */ mtctr r12 -/* 800B7104 000B4064 4E 80 04 21 */ bctrl +/* 800B7104 000B4064 4E 80 04 21 */ bctrl lbl_800B7108: /* 800B7108 000B4068 80 01 00 34 */ lwz r0, 0x34(r1) /* 800B710C 000B406C 83 E1 00 2C */ lwz r31, 0x2c(r1) @@ -205,7 +205,7 @@ lbl_800B7108: /* 800B7114 000B4074 83 A1 00 24 */ lwz r29, 0x24(r1) /* 800B7118 000B4078 7C 08 03 A6 */ mtlr r0 /* 800B711C 000B407C 38 21 00 30 */ addi r1, r1, 0x30 -/* 800B7120 000B4080 4E 80 00 20 */ blr +/* 800B7120 000B4080 4E 80 00 20 */ blr .global SetGlobalScale__23CParticleGenInfoGenericFRC9CVector3f SetGlobalScale__23CParticleGenInfoGenericFRC9CVector3f: @@ -217,11 +217,11 @@ SetGlobalScale__23CParticleGenInfoGenericFRC9CVector3f: /* 800B7138 000B4098 81 83 00 00 */ lwz r12, 0(r3) /* 800B713C 000B409C 81 8C 00 24 */ lwz r12, 0x24(r12) /* 800B7140 000B40A0 7D 89 03 A6 */ mtctr r12 -/* 800B7144 000B40A4 4E 80 04 21 */ bctrl +/* 800B7144 000B40A4 4E 80 04 21 */ bctrl /* 800B7148 000B40A8 80 01 00 14 */ lwz r0, 0x14(r1) /* 800B714C 000B40AC 7C 08 03 A6 */ mtlr r0 /* 800B7150 000B40B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B7154 000B40B4 4E 80 00 20 */ blr +/* 800B7154 000B40B4 4E 80 00 20 */ blr .global SetGlobalTranslation__23CParticleGenInfoGenericFRC9CVector3fR13CStateManager SetGlobalTranslation__23CParticleGenInfoGenericFRC9CVector3fR13CStateManager: @@ -239,7 +239,7 @@ SetGlobalTranslation__23CParticleGenInfoGenericFRC9CVector3fR13CStateManager: /* 800B7184 000B40E4 81 83 00 00 */ lwz r12, 0(r3) /* 800B7188 000B40E8 81 8C 00 20 */ lwz r12, 0x20(r12) /* 800B718C 000B40EC 7D 89 03 A6 */ mtctr r12 -/* 800B7190 000B40F0 4E 80 04 21 */ bctrl +/* 800B7190 000B40F0 4E 80 04 21 */ bctrl /* 800B7194 000B40F4 A0 7D 00 88 */ lhz r3, 0x88(r29) /* 800B7198 000B40F8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800B719C 000B40FC 7C 03 00 40 */ cmplw r3, r0 @@ -264,7 +264,7 @@ lbl_800B71D8: /* 800B71E4 000B4144 83 A1 00 24 */ lwz r29, 0x24(r1) /* 800B71E8 000B4148 7C 08 03 A6 */ mtlr r0 /* 800B71EC 000B414C 38 21 00 30 */ addi r1, r1, 0x30 -/* 800B71F0 000B4150 4E 80 00 20 */ blr +/* 800B71F0 000B4150 4E 80 00 20 */ blr .global SetGlobalOrientation__23CParticleGenInfoGenericFRC12CTransform4fR13CStateManager SetGlobalOrientation__23CParticleGenInfoGenericFRC12CTransform4fR13CStateManager: @@ -282,7 +282,7 @@ SetGlobalOrientation__23CParticleGenInfoGenericFRC12CTransform4fR13CStateManager /* 800B7220 000B4180 81 83 00 00 */ lwz r12, 0(r3) /* 800B7224 000B4184 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 800B7228 000B4188 7D 89 03 A6 */ mtctr r12 -/* 800B722C 000B418C 4E 80 04 21 */ bctrl +/* 800B722C 000B418C 4E 80 04 21 */ bctrl /* 800B7230 000B4190 A0 7D 00 88 */ lhz r3, 0x88(r29) /* 800B7234 000B4194 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800B7238 000B4198 7C 03 00 40 */ cmplw r3, r0 @@ -331,7 +331,7 @@ lbl_800B72D4: /* 800B72E0 000B4240 83 A1 00 64 */ lwz r29, 0x64(r1) /* 800B72E4 000B4244 7C 08 03 A6 */ mtlr r0 /* 800B72E8 000B4248 38 21 00 70 */ addi r1, r1, 0x70 -/* 800B72EC 000B424C 4E 80 00 20 */ blr +/* 800B72EC 000B424C 4E 80 00 20 */ blr .global SetTranslation__23CParticleGenInfoGenericFRC9CVector3fR13CStateManager SetTranslation__23CParticleGenInfoGenericFRC9CVector3fR13CStateManager: @@ -349,7 +349,7 @@ SetTranslation__23CParticleGenInfoGenericFRC9CVector3fR13CStateManager: /* 800B731C 000B427C 81 83 00 00 */ lwz r12, 0(r3) /* 800B7320 000B4280 81 8C 00 18 */ lwz r12, 0x18(r12) /* 800B7324 000B4284 7D 89 03 A6 */ mtctr r12 -/* 800B7328 000B4288 4E 80 04 21 */ bctrl +/* 800B7328 000B4288 4E 80 04 21 */ bctrl /* 800B732C 000B428C A0 7D 00 88 */ lhz r3, 0x88(r29) /* 800B7330 000B4290 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800B7334 000B4294 7C 03 00 40 */ cmplw r3, r0 @@ -374,7 +374,7 @@ lbl_800B7370: /* 800B737C 000B42DC 83 A1 00 24 */ lwz r29, 0x24(r1) /* 800B7380 000B42E0 7C 08 03 A6 */ mtlr r0 /* 800B7384 000B42E4 38 21 00 30 */ addi r1, r1, 0x30 -/* 800B7388 000B42E8 4E 80 00 20 */ blr +/* 800B7388 000B42E8 4E 80 00 20 */ blr .global SetOrientation__23CParticleGenInfoGenericFRC12CTransform4fR13CStateManager SetOrientation__23CParticleGenInfoGenericFRC12CTransform4fR13CStateManager: @@ -392,7 +392,7 @@ SetOrientation__23CParticleGenInfoGenericFRC12CTransform4fR13CStateManager: /* 800B73B8 000B4318 81 83 00 00 */ lwz r12, 0(r3) /* 800B73BC 000B431C 81 8C 00 14 */ lwz r12, 0x14(r12) /* 800B73C0 000B4320 7D 89 03 A6 */ mtctr r12 -/* 800B73C4 000B4324 4E 80 04 21 */ bctrl +/* 800B73C4 000B4324 4E 80 04 21 */ bctrl /* 800B73C8 000B4328 A0 7D 00 88 */ lhz r3, 0x88(r29) /* 800B73CC 000B432C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800B73D0 000B4330 7C 03 00 40 */ cmplw r3, r0 @@ -450,7 +450,7 @@ lbl_800B7490: /* 800B749C 000B43FC 83 A1 00 D4 */ lwz r29, 0xd4(r1) /* 800B74A0 000B4400 7C 08 03 A6 */ mtlr r0 /* 800B74A4 000B4404 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 800B74A8 000B4408 4E 80 00 20 */ blr +/* 800B74A8 000B4408 4E 80 00 20 */ blr .global Update__23CParticleGenInfoGenericFfR13CStateManager Update__23CParticleGenInfoGenericFfR13CStateManager: @@ -466,7 +466,7 @@ Update__23CParticleGenInfoGenericFfR13CStateManager: /* 800B74D0 000B4430 81 83 00 00 */ lwz r12, 0(r3) /* 800B74D4 000B4434 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800B74D8 000B4438 7D 89 03 A6 */ mtctr r12 -/* 800B74DC 000B443C 4E 80 04 21 */ bctrl +/* 800B74DC 000B443C 4E 80 04 21 */ bctrl /* 800B74E0 000B4440 A0 7E 00 88 */ lhz r3, 0x88(r30) /* 800B74E4 000B4444 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800B74E8 000B4448 7C 03 00 40 */ cmplw r3, r0 @@ -488,7 +488,7 @@ Update__23CParticleGenInfoGenericFfR13CStateManager: /* 800B7528 000B4488 81 84 00 00 */ lwz r12, 0(r4) /* 800B752C 000B448C 81 8C 00 68 */ lwz r12, 0x68(r12) /* 800B7530 000B4490 7D 89 03 A6 */ mtctr r12 -/* 800B7534 000B4494 4E 80 04 21 */ bctrl +/* 800B7534 000B4494 4E 80 04 21 */ bctrl /* 800B7538 000B4498 7F E3 FB 78 */ mr r3, r31 /* 800B753C 000B449C 38 81 00 14 */ addi r4, r1, 0x14 /* 800B7540 000B44A0 4B FF E2 05 */ bl SetLight__10CGameLightFRC6CLight @@ -498,7 +498,7 @@ lbl_800B7544: /* 800B754C 000B44AC 83 C1 00 68 */ lwz r30, 0x68(r1) /* 800B7550 000B44B0 7C 08 03 A6 */ mtlr r0 /* 800B7554 000B44B4 38 21 00 70 */ addi r1, r1, 0x70 -/* 800B7558 000B44B8 4E 80 00 20 */ blr +/* 800B7558 000B44B8 4E 80 00 20 */ blr .global Render__23CParticleGenInfoGenericFv Render__23CParticleGenInfoGenericFv: @@ -510,11 +510,11 @@ Render__23CParticleGenInfoGenericFv: /* 800B7570 000B44D0 81 83 00 00 */ lwz r12, 0(r3) /* 800B7574 000B44D4 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800B7578 000B44D8 7D 89 03 A6 */ mtctr r12 -/* 800B757C 000B44DC 4E 80 04 21 */ bctrl +/* 800B757C 000B44DC 4E 80 04 21 */ bctrl /* 800B7580 000B44E0 80 01 00 14 */ lwz r0, 0x14(r1) /* 800B7584 000B44E4 7C 08 03 A6 */ mtlr r0 /* 800B7588 000B44E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B758C 000B44EC 4E 80 00 20 */ blr +/* 800B758C 000B44EC 4E 80 00 20 */ blr .global AddToRenderer__23CParticleGenInfoGenericFv AddToRenderer__23CParticleGenInfoGenericFv: @@ -528,11 +528,11 @@ AddToRenderer__23CParticleGenInfoGenericFv: /* 800B75AC 000B450C 80 84 00 00 */ lwz r4, 0(r4) /* 800B75B0 000B4510 81 8C 00 34 */ lwz r12, 0x34(r12) /* 800B75B4 000B4514 7D 89 03 A6 */ mtctr r12 -/* 800B75B8 000B4518 4E 80 04 21 */ bctrl +/* 800B75B8 000B4518 4E 80 04 21 */ bctrl /* 800B75BC 000B451C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800B75C0 000B4520 7C 08 03 A6 */ mtlr r0 /* 800B75C4 000B4524 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B75C8 000B4528 4E 80 00 20 */ blr +/* 800B75C8 000B4528 4E 80 00 20 */ blr .global __dt__23CParticleGenInfoGenericFv __dt__23CParticleGenInfoGenericFv: @@ -575,7 +575,7 @@ lbl_800B7644: /* 800B7650 000B45B0 83 C1 00 08 */ lwz r30, 8(r1) /* 800B7654 000B45B4 7C 08 03 A6 */ mtlr r0 /* 800B7658 000B45B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B765C 000B45BC 4E 80 00 20 */ blr +/* 800B765C 000B45BC 4E 80 00 20 */ blr .global "__ct__23CParticleGenInfoGenericFRC10SObjectTagQ24rstl24ncrc_ptr<12CParticleGen>iRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>9CVector3fQ213CParticleData13EParentedModeiR13CStateManageri" "__ct__23CParticleGenInfoGenericFRC10SObjectTagQ24rstl24ncrc_ptr<12CParticleGen>iRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>9CVector3fQ213CParticleData13EParentedModeiR13CStateManageri": @@ -628,4 +628,4 @@ lbl_800B7700: /* 800B7710 000B4670 80 01 00 34 */ lwz r0, 0x34(r1) /* 800B7714 000B4674 7C 08 03 A6 */ mtlr r0 /* 800B7718 000B4678 38 21 00 30 */ addi r1, r1, 0x30 -/* 800B771C 000B467C 4E 80 00 20 */ blr +/* 800B771C 000B467C 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/CPauseScreen.s b/asm/MetroidPrime/CPauseScreen.s index ce1d0c7b..128ee6be 100644 --- a/asm/MetroidPrime/CPauseScreen.s +++ b/asm/MetroidPrime/CPauseScreen.s @@ -121,35 +121,35 @@ lbl_805A6F8C: .global GetCameraYBias__16CPauseScreenBaseCFv GetCameraYBias__16CPauseScreenBaseCFv: /* 80070A98 0006D9F8 C0 22 88 30 */ lfs f1, lbl_805AA550@sda21(r2) -/* 80070A9C 0006D9FC 4E 80 00 20 */ blr +/* 80070A9C 0006D9FC 4E 80 00 20 */ blr .global IsRightLogDynamic__16CPauseScreenBaseCFv IsRightLogDynamic__16CPauseScreenBaseCFv: /* 80070AA0 0006DA00 38 60 00 00 */ li r3, 0 -/* 80070AA4 0006DA04 4E 80 00 20 */ blr +/* 80070AA4 0006DA04 4E 80 00 20 */ blr .global UpdateRightLogColors__16CPauseScreenBaseFbRC6CColor UpdateRightLogColors__16CPauseScreenBaseFbRC6CColor: -/* 80070AA8 0006DA08 4E 80 00 20 */ blr +/* 80070AA8 0006DA08 4E 80 00 20 */ blr .global UpdateRightLogHighlight__16CPauseScreenBaseFbiRC6CColorRC6CColor UpdateRightLogHighlight__16CPauseScreenBaseFbiRC6CColorRC6CColor: -/* 80070AAC 0006DA0C 4E 80 00 20 */ blr +/* 80070AAC 0006DA0C 4E 80 00 20 */ blr .global ShouldExitPauseScreen__16CPauseScreenBaseCFv ShouldExitPauseScreen__16CPauseScreenBaseCFv: /* 80070AB0 0006DA10 88 03 01 98 */ lbz r0, 0x198(r3) /* 80070AB4 0006DA14 54 03 DF FE */ rlwinm r3, r0, 0x1b, 0x1f, 0x1f -/* 80070AB8 0006DA18 4E 80 00 20 */ blr +/* 80070AB8 0006DA18 4E 80 00 20 */ blr .global InputDisabled__16CPauseScreenBaseCFv InputDisabled__16CPauseScreenBaseCFv: /* 80070ABC 0006DA1C 38 60 00 00 */ li r3, 0 -/* 80070AC0 0006DA20 4E 80 00 20 */ blr +/* 80070AC0 0006DA20 4E 80 00 20 */ blr .global TransitioningAway__16CPauseScreenBaseFv TransitioningAway__16CPauseScreenBaseFv: -/* 80070AC4 0006DA24 4E 80 00 20 */ blr +/* 80070AC4 0006DA24 4E 80 00 20 */ blr .global OnRightTableCancel__16CPauseScreenBaseFP14CGuiTableGroup OnRightTableCancel__16CPauseScreenBaseFP14CGuiTableGroup: @@ -161,11 +161,11 @@ OnRightTableCancel__16CPauseScreenBaseFP14CGuiTableGroup: /* 80070ADC 0006DA3C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80070AE0 0006DA40 7C 08 03 A6 */ mtlr r0 /* 80070AE4 0006DA44 38 21 00 10 */ addi r1, r1, 0x10 -/* 80070AE8 0006DA48 4E 80 00 20 */ blr +/* 80070AE8 0006DA48 4E 80 00 20 */ blr .global nullsub_63 nullsub_63: -/* 80070AEC 0006DA4C 4E 80 00 20 */ blr +/* 80070AEC 0006DA4C 4E 80 00 20 */ blr .global SetRightTableSelection__16CPauseScreenBaseFii SetRightTableSelection__16CPauseScreenBaseFii: @@ -182,7 +182,7 @@ SetRightTableSelection__16CPauseScreenBaseFii: /* 80070B18 0006DA78 81 83 00 00 */ lwz r12, 0(r3) /* 80070B1C 0006DA7C 81 8C 00 44 */ lwz r12, 0x44(r12) /* 80070B20 0006DA80 7D 89 03 A6 */ mtctr r12 -/* 80070B24 0006DA84 4E 80 04 21 */ bctrl +/* 80070B24 0006DA84 4E 80 04 21 */ bctrl /* 80070B28 0006DA88 83 9D 00 1C */ lwz r28, 0x1c(r29) /* 80070B2C 0006DA8C 38 63 FF FF */ addi r3, r3, -1 /* 80070B30 0006DA90 7C 1E F8 50 */ subf r0, r30, r31 @@ -239,7 +239,7 @@ lbl_80070BB8: /* 80070BF0 0006DB50 7F E5 FB 78 */ mr r5, r31 /* 80070BF4 0006DB54 81 8C 00 30 */ lwz r12, 0x30(r12) /* 80070BF8 0006DB58 7D 89 03 A6 */ mtctr r12 -/* 80070BFC 0006DB5C 4E 80 04 21 */ bctrl +/* 80070BFC 0006DB5C 4E 80 04 21 */ bctrl /* 80070C00 0006DB60 80 01 00 34 */ lwz r0, 0x34(r1) /* 80070C04 0006DB64 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 80070C08 0006DB68 83 C1 00 28 */ lwz r30, 0x28(r1) @@ -247,7 +247,7 @@ lbl_80070BB8: /* 80070C10 0006DB70 83 81 00 20 */ lwz r28, 0x20(r1) /* 80070C14 0006DB74 7C 08 03 A6 */ mtlr r0 /* 80070C18 0006DB78 38 21 00 30 */ addi r1, r1, 0x30 -/* 80070C1C 0006DB7C 4E 80 00 20 */ blr +/* 80070C1C 0006DB7C 4E 80 00 20 */ blr .global OnTableSelectionChange__16CPauseScreenBaseFP14CGuiTableGroupi OnTableSelectionChange__16CPauseScreenBaseFP14CGuiTableGroupi: @@ -277,7 +277,7 @@ OnTableSelectionChange__16CPauseScreenBaseFP14CGuiTableGroupi: /* 80070C7C 0006DBDC 81 9D 00 00 */ lwz r12, 0(r29) /* 80070C80 0006DBE0 81 8C 00 38 */ lwz r12, 0x38(r12) /* 80070C84 0006DBE4 7D 89 03 A6 */ mtctr r12 -/* 80070C88 0006DBE8 4E 80 04 21 */ bctrl +/* 80070C88 0006DBE8 4E 80 04 21 */ bctrl /* 80070C8C 0006DBEC 48 00 00 18 */ b lbl_80070CA4 lbl_80070C90: /* 80070C90 0006DBF0 80 BD 00 84 */ lwz r5, 0x84(r29) @@ -292,7 +292,7 @@ lbl_80070CA4: /* 80070CB0 0006DC10 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80070CB4 0006DC14 7C 08 03 A6 */ mtlr r0 /* 80070CB8 0006DC18 38 21 00 20 */ addi r1, r1, 0x20 -/* 80070CBC 0006DC1C 4E 80 00 20 */ blr +/* 80070CBC 0006DC1C 4E 80 00 20 */ blr .global OnRightTableAdvance__16CPauseScreenBaseFP14CGuiTableGroup OnRightTableAdvance__16CPauseScreenBaseFP14CGuiTableGroup: @@ -304,7 +304,7 @@ OnRightTableAdvance__16CPauseScreenBaseFP14CGuiTableGroup: /* 80070CD4 0006DC34 81 83 00 00 */ lwz r12, 0(r3) /* 80070CD8 0006DC38 81 8C 00 40 */ lwz r12, 0x40(r12) /* 80070CDC 0006DC3C 7D 89 03 A6 */ mtctr r12 -/* 80070CE0 0006DC40 4E 80 04 21 */ bctrl +/* 80070CE0 0006DC40 4E 80 04 21 */ bctrl /* 80070CE4 0006DC44 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80070CE8 0006DC48 41 82 00 40 */ beq lbl_80070D28 /* 80070CEC 0006DC4C 88 1F 01 98 */ lbz r0, 0x198(r31) @@ -327,12 +327,12 @@ lbl_80070D28: /* 80070D2C 0006DC8C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80070D30 0006DC90 7C 08 03 A6 */ mtlr r0 /* 80070D34 0006DC94 38 21 00 20 */ addi r1, r1, 0x20 -/* 80070D38 0006DC98 4E 80 00 20 */ blr +/* 80070D38 0006DC98 4E 80 00 20 */ blr .global ShouldRightTableAdvance__16CPauseScreenBaseFv ShouldRightTableAdvance__16CPauseScreenBaseFv: /* 80070D3C 0006DC9C 38 60 00 01 */ li r3, 1 -/* 80070D40 0006DCA0 4E 80 00 20 */ blr +/* 80070D40 0006DCA0 4E 80 00 20 */ blr .global OnLeftTableAdvance__16CPauseScreenBaseFP14CGuiTableGroup OnLeftTableAdvance__16CPauseScreenBaseFP14CGuiTableGroup: @@ -344,7 +344,7 @@ OnLeftTableAdvance__16CPauseScreenBaseFP14CGuiTableGroup: /* 80070D58 0006DCB8 81 83 00 00 */ lwz r12, 0(r3) /* 80070D5C 0006DCBC 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 80070D60 0006DCC0 7D 89 03 A6 */ mtctr r12 -/* 80070D64 0006DCC4 4E 80 04 21 */ bctrl +/* 80070D64 0006DCC4 4E 80 04 21 */ bctrl /* 80070D68 0006DCC8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80070D6C 0006DCCC 41 82 00 44 */ beq lbl_80070DB0 /* 80070D70 0006DCD0 7F E3 FB 78 */ mr r3, r31 @@ -368,12 +368,12 @@ lbl_80070DB0: /* 80070DB4 0006DD14 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80070DB8 0006DD18 7C 08 03 A6 */ mtlr r0 /* 80070DBC 0006DD1C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80070DC0 0006DD20 4E 80 00 20 */ blr +/* 80070DC0 0006DD20 4E 80 00 20 */ blr .global ShouldLeftTableAdvance__16CPauseScreenBaseFv ShouldLeftTableAdvance__16CPauseScreenBaseFv: /* 80070DC4 0006DD24 38 60 00 01 */ li r3, 1 -/* 80070DC8 0006DD28 4E 80 00 20 */ blr +/* 80070DC8 0006DD28 4E 80 00 20 */ blr .global UpdateRightTable__16CPauseScreenBaseFv UpdateRightTable__16CPauseScreenBaseFv: @@ -393,11 +393,11 @@ UpdateRightTable__16CPauseScreenBaseFv: /* 80070E00 0006DD60 80 01 00 14 */ lwz r0, 0x14(r1) /* 80070E04 0006DD64 7C 08 03 A6 */ mtlr r0 /* 80070E08 0006DD68 38 21 00 10 */ addi r1, r1, 0x10 -/* 80070E0C 0006DD6C 4E 80 00 20 */ blr +/* 80070E0C 0006DD6C 4E 80 00 20 */ blr .global ChangedMode__16CPauseScreenBaseQ216CPauseScreenBase5EMode ChangedMode__16CPauseScreenBaseQ216CPauseScreenBase5EMode: -/* 80070E10 0006DD70 4E 80 00 20 */ blr +/* 80070E10 0006DD70 4E 80 00 20 */ blr .global ChangeMode__16CPauseScreenBaseFQ216CPauseScreenBase5EMode ChangeMode__16CPauseScreenBaseFQ216CPauseScreenBase5EMode: @@ -446,7 +446,7 @@ lbl_80070EAC: /* 80070EB0 0006DE10 81 9D 00 00 */ lwz r12, 0(r29) /* 80070EB4 0006DE14 81 8C 00 48 */ lwz r12, 0x48(r12) /* 80070EB8 0006DE18 7D 89 03 A6 */ mtctr r12 -/* 80070EBC 0006DE1C 4E 80 04 21 */ bctrl +/* 80070EBC 0006DE1C 4E 80 04 21 */ bctrl /* 80070EC0 0006DE20 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80070EC4 0006DE24 41 82 00 28 */ beq lbl_80070EEC /* 80070EC8 0006DE28 7F A3 EB 78 */ mr r3, r29 @@ -456,7 +456,7 @@ lbl_80070EAC: /* 80070ED8 0006DE38 38 80 00 00 */ li r4, 0 /* 80070EDC 0006DE3C 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 80070EE0 0006DE40 7D 89 03 A6 */ mtctr r12 -/* 80070EE4 0006DE44 4E 80 04 21 */ bctrl +/* 80070EE4 0006DE44 4E 80 04 21 */ bctrl /* 80070EE8 0006DE48 48 00 00 10 */ b lbl_80070EF8 lbl_80070EEC: /* 80070EEC 0006DE4C 80 7D 00 80 */ lwz r3, 0x80(r29) @@ -529,7 +529,7 @@ lbl_80070FD8: /* 80070FDC 0006DF3C 81 9D 00 00 */ lwz r12, 0(r29) /* 80070FE0 0006DF40 81 8C 00 48 */ lwz r12, 0x48(r12) /* 80070FE4 0006DF44 7D 89 03 A6 */ mtctr r12 -/* 80070FE8 0006DF48 4E 80 04 21 */ bctrl +/* 80070FE8 0006DF48 4E 80 04 21 */ bctrl /* 80070FEC 0006DF4C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80070FF0 0006DF50 41 82 00 28 */ beq lbl_80071018 /* 80070FF4 0006DF54 7F A3 EB 78 */ mr r3, r29 @@ -539,7 +539,7 @@ lbl_80070FD8: /* 80071004 0006DF64 38 80 00 01 */ li r4, 1 /* 80071008 0006DF68 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 8007100C 0006DF6C 7D 89 03 A6 */ mtctr r12 -/* 80071010 0006DF70 4E 80 04 21 */ bctrl +/* 80071010 0006DF70 4E 80 04 21 */ bctrl /* 80071014 0006DF74 48 00 00 10 */ b lbl_80071024 lbl_80071018: /* 80071018 0006DF78 80 7D 00 80 */ lwz r3, 0x80(r29) @@ -561,7 +561,7 @@ lbl_80071040: /* 80071050 0006DFB0 81 9D 00 00 */ lwz r12, 0(r29) /* 80071054 0006DFB4 81 8C 00 48 */ lwz r12, 0x48(r12) /* 80071058 0006DFB8 7D 89 03 A6 */ mtctr r12 -/* 8007105C 0006DFBC 4E 80 04 21 */ bctrl +/* 8007105C 0006DFBC 4E 80 04 21 */ bctrl /* 80071060 0006DFC0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80071064 0006DFC4 41 82 00 28 */ beq lbl_8007108C /* 80071068 0006DFC8 7F A3 EB 78 */ mr r3, r29 @@ -571,7 +571,7 @@ lbl_80071040: /* 80071078 0006DFD8 38 80 00 00 */ li r4, 0 /* 8007107C 0006DFDC 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 80071080 0006DFE0 7D 89 03 A6 */ mtctr r12 -/* 80071084 0006DFE4 4E 80 04 21 */ bctrl +/* 80071084 0006DFE4 4E 80 04 21 */ bctrl /* 80071088 0006DFE8 48 00 00 10 */ b lbl_80071098 lbl_8007108C: /* 8007108C 0006DFEC 80 7D 00 80 */ lwz r3, 0x80(r29) @@ -590,7 +590,7 @@ lbl_800710B0: /* 800710B8 0006E018 81 9D 00 00 */ lwz r12, 0(r29) /* 800710BC 0006E01C 81 8C 00 34 */ lwz r12, 0x34(r12) /* 800710C0 0006E020 7D 89 03 A6 */ mtctr r12 -/* 800710C4 0006E024 4E 80 04 21 */ bctrl +/* 800710C4 0006E024 4E 80 04 21 */ bctrl lbl_800710C8: /* 800710C8 0006E028 80 01 00 34 */ lwz r0, 0x34(r1) /* 800710CC 0006E02C 83 E1 00 2C */ lwz r31, 0x2c(r1) @@ -598,7 +598,7 @@ lbl_800710C8: /* 800710D4 0006E034 83 A1 00 24 */ lwz r29, 0x24(r1) /* 800710D8 0006E038 7C 08 03 A6 */ mtlr r0 /* 800710DC 0006E03C 38 21 00 30 */ addi r1, r1, 0x30 -/* 800710E0 0006E040 4E 80 00 20 */ blr +/* 800710E0 0006E040 4E 80 00 20 */ blr .global UpdateSideTable__16CPauseScreenBaseFP14CGuiTableGroup UpdateSideTable__16CPauseScreenBaseFP14CGuiTableGroup: @@ -680,7 +680,7 @@ lbl_80071140: /* 8007120C 0006E16C 81 9E 00 00 */ lwz r12, 0(r30) /* 80071210 0006E170 81 8C 00 48 */ lwz r12, 0x48(r12) /* 80071214 0006E174 7D 89 03 A6 */ mtctr r12 -/* 80071218 0006E178 4E 80 04 21 */ bctrl +/* 80071218 0006E178 4E 80 04 21 */ bctrl /* 8007121C 0006E17C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80071220 0006E180 41 82 00 2C */ beq lbl_8007124C /* 80071224 0006E184 7F C3 F3 78 */ mr r3, r30 @@ -691,7 +691,7 @@ lbl_80071140: /* 80071238 0006E198 38 E1 00 08 */ addi r7, r1, 8 /* 8007123C 0006E19C 81 8C 00 50 */ lwz r12, 0x50(r12) /* 80071240 0006E1A0 7D 89 03 A6 */ mtctr r12 -/* 80071244 0006E1A4 4E 80 04 21 */ bctrl +/* 80071244 0006E1A4 4E 80 04 21 */ bctrl /* 80071248 0006E1A8 48 00 01 00 */ b lbl_80071348 lbl_8007124C: /* 8007124C 0006E1AC 3B BE 01 48 */ addi r29, r30, 0x148 @@ -770,7 +770,7 @@ lbl_80071348: /* 8007134C 0006E2AC 80 01 00 F4 */ lwz r0, 0xf4(r1) /* 80071350 0006E2B0 7C 08 03 A6 */ mtlr r0 /* 80071354 0006E2B4 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 80071358 0006E2B8 4E 80 00 20 */ blr +/* 80071358 0006E2B8 4E 80 00 20 */ blr .global ProcessInput__16CPauseScreenBaseFRC11CFinalInput ProcessInput__16CPauseScreenBaseFRC11CFinalInput: @@ -786,7 +786,7 @@ ProcessInput__16CPauseScreenBaseFRC11CFinalInput: /* 80071380 0006E2E0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80071384 0006E2E4 7C 08 03 A6 */ mtlr r0 /* 80071388 0006E2E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8007138C 0006E2EC 4E 80 00 20 */ blr +/* 8007138C 0006E2EC 4E 80 00 20 */ blr .global Draw__16CPauseScreenBaseCFfff Draw__16CPauseScreenBaseCFfff: @@ -856,11 +856,11 @@ Draw__16CPauseScreenBaseCFfff: /* 8007148C 0006E3EC 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 80071490 0006E3F0 7C 08 03 A6 */ mtlr r0 /* 80071494 0006E3F4 38 21 00 80 */ addi r1, r1, 0x80 -/* 80071498 0006E3F8 4E 80 00 20 */ blr +/* 80071498 0006E3F8 4E 80 00 20 */ blr .global Touch__16CPauseScreenBaseFv Touch__16CPauseScreenBaseFv: -/* 8007149C 0006E3FC 4E 80 00 20 */ blr +/* 8007149C 0006E3FC 4E 80 00 20 */ blr .global Update__16CPauseScreenBaseFfR9CRandom16R18CArchitectureQueue Update__16CPauseScreenBaseFfR9CRandom16R18CArchitectureQueue: @@ -903,7 +903,7 @@ lbl_8007151C: /* 80071528 0006E488 81 9F 00 00 */ lwz r12, 0(r31) /* 8007152C 0006E48C 81 8C 00 44 */ lwz r12, 0x44(r12) /* 80071530 0006E490 7D 89 03 A6 */ mtctr r12 -/* 80071534 0006E494 4E 80 04 21 */ bctrl +/* 80071534 0006E494 4E 80 04 21 */ bctrl /* 80071538 0006E498 80 9F 00 10 */ lwz r4, 0x10(r31) /* 8007153C 0006E49C 38 A0 00 00 */ li r5, 0 /* 80071540 0006E4A0 2C 04 00 01 */ cmpwi r4, 1 @@ -1073,7 +1073,7 @@ lbl_800716B0: /* 800717A8 0006E708 83 C1 00 38 */ lwz r30, 0x38(r1) /* 800717AC 0006E70C 7C 08 03 A6 */ mtlr r0 /* 800717B0 0006E710 38 21 00 80 */ addi r1, r1, 0x80 -/* 800717B4 0006E714 4E 80 00 20 */ blr +/* 800717B4 0006E714 4E 80 00 20 */ blr .global IsReady__16CPauseScreenBaseFv IsReady__16CPauseScreenBaseFv: @@ -1091,7 +1091,7 @@ lbl_800717E0: /* 800717E0 0006E740 81 83 00 00 */ lwz r12, 0(r3) /* 800717E4 0006E744 81 8C 00 28 */ lwz r12, 0x28(r12) /* 800717E8 0006E748 7D 89 03 A6 */ mtctr r12 -/* 800717EC 0006E74C 4E 80 04 21 */ bctrl +/* 800717EC 0006E74C 4E 80 04 21 */ bctrl /* 800717F0 0006E750 88 1F 01 98 */ lbz r0, 0x198(r31) /* 800717F4 0006E754 50 60 3E 30 */ rlwimi r0, r3, 7, 0x18, 0x18 /* 800717F8 0006E758 98 1F 01 98 */ stb r0, 0x198(r31) @@ -1102,7 +1102,7 @@ lbl_800717E0: /* 8007180C 0006E76C 81 9F 00 00 */ lwz r12, 0(r31) /* 80071810 0006E770 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80071814 0006E774 7D 89 03 A6 */ mtctr r12 -/* 80071818 0006E778 4E 80 04 21 */ bctrl +/* 80071818 0006E778 4E 80 04 21 */ bctrl /* 8007181C 0006E77C 7F E3 FB 78 */ mr r3, r31 /* 80071820 0006E780 38 80 00 00 */ li r4, 0 /* 80071824 0006E784 4B FF F5 F1 */ bl ChangeMode__16CPauseScreenBaseFQ216CPauseScreenBase5EMode @@ -1113,7 +1113,7 @@ lbl_800717E0: /* 80071838 0006E798 81 9F 00 00 */ lwz r12, 0(r31) /* 8007183C 0006E79C 81 8C 00 38 */ lwz r12, 0x38(r12) /* 80071840 0006E7A0 7D 89 03 A6 */ mtctr r12 -/* 80071844 0006E7A4 4E 80 04 21 */ bctrl +/* 80071844 0006E7A4 4E 80 04 21 */ bctrl /* 80071848 0006E7A8 38 60 00 01 */ li r3, 1 /* 8007184C 0006E7AC 48 00 00 08 */ b lbl_80071854 lbl_80071850: @@ -1123,7 +1123,7 @@ lbl_80071854: /* 80071858 0006E7B8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8007185C 0006E7BC 7C 08 03 A6 */ mtlr r0 /* 80071860 0006E7C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80071864 0006E7C4 4E 80 00 20 */ blr +/* 80071864 0006E7C4 4E 80 00 20 */ blr .global InitializeFrameGlue__16CPauseScreenBaseFv InitializeFrameGlue__16CPauseScreenBaseFv: @@ -1427,7 +1427,7 @@ InitializeFrameGlue__16CPauseScreenBaseFv: /* 80071D0C 0006EC6C 81 83 00 00 */ lwz r12, 0(r3) /* 80071D10 0006EC70 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 80071D14 0006EC74 7D 89 03 A6 */ mtctr r12 -/* 80071D18 0006EC78 4E 80 04 21 */ bctrl +/* 80071D18 0006EC78 4E 80 04 21 */ bctrl /* 80071D1C 0006EC7C C0 43 00 A0 */ lfs f2, 0xa0(r3) /* 80071D20 0006EC80 38 80 00 01 */ li r4, 1 /* 80071D24 0006EC84 C0 23 00 90 */ lfs f1, 0x90(r3) @@ -1439,7 +1439,7 @@ InitializeFrameGlue__16CPauseScreenBaseFv: /* 80071D3C 0006EC9C 81 83 00 00 */ lwz r12, 0(r3) /* 80071D40 0006ECA0 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 80071D44 0006ECA4 7D 89 03 A6 */ mtctr r12 -/* 80071D48 0006ECA8 4E 80 04 21 */ bctrl +/* 80071D48 0006ECA8 4E 80 04 21 */ bctrl /* 80071D4C 0006ECAC C0 63 00 A0 */ lfs f3, 0xa0(r3) /* 80071D50 0006ECB0 3B 40 00 00 */ li r26, 0 /* 80071D54 0006ECB4 C0 1F 00 34 */ lfs f0, 0x34(r31) @@ -1478,7 +1478,7 @@ lbl_80071DCC: /* 80071DD4 0006ED34 81 83 00 00 */ lwz r12, 0(r3) /* 80071DD8 0006ED38 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 80071DDC 0006ED3C 7D 89 03 A6 */ mtctr r12 -/* 80071DE0 0006ED40 4E 80 04 21 */ bctrl +/* 80071DE0 0006ED40 4E 80 04 21 */ bctrl /* 80071DE4 0006ED44 88 03 00 B6 */ lbz r0, 0xb6(r3) /* 80071DE8 0006ED48 3B 5A 00 01 */ addi r26, r26, 1 /* 80071DEC 0006ED4C 53 20 26 F6 */ rlwimi r0, r25, 4, 0x1b, 0x1b @@ -1495,7 +1495,7 @@ lbl_80071E10: /* 80071E14 0006ED74 7F 64 DB 78 */ mr r4, r27 /* 80071E18 0006ED78 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 80071E1C 0006ED7C 7D 89 03 A6 */ mtctr r12 -/* 80071E20 0006ED80 4E 80 04 21 */ bctrl +/* 80071E20 0006ED80 4E 80 04 21 */ bctrl /* 80071E24 0006ED84 6F 60 80 00 */ xoris r0, r27, 0x8000 /* 80071E28 0006ED88 C0 3F 00 30 */ lfs f1, 0x30(r31) /* 80071E2C 0006ED8C 90 01 02 24 */ stw r0, 0x224(r1) @@ -1703,7 +1703,7 @@ lbl_800720B4: /* 80072128 0006F088 81 9F 00 00 */ lwz r12, 0(r31) /* 8007212C 0006F08C 81 8C 00 48 */ lwz r12, 0x48(r12) /* 80072130 0006F090 7D 89 03 A6 */ mtctr r12 -/* 80072134 0006F094 4E 80 04 21 */ bctrl +/* 80072134 0006F094 4E 80 04 21 */ bctrl /* 80072138 0006F098 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8007213C 0006F09C 41 82 00 44 */ beq lbl_80072180 /* 80072140 0006F0A0 80 6D A1 3C */ lwz r3, gpTweakGuiColors@sda21(r13) @@ -1720,7 +1720,7 @@ lbl_800720B4: /* 8007216C 0006F0CC 81 9F 00 00 */ lwz r12, 0(r31) /* 80072170 0006F0D0 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 80072174 0006F0D4 7D 89 03 A6 */ mtctr r12 -/* 80072178 0006F0D8 4E 80 04 21 */ bctrl +/* 80072178 0006F0D8 4E 80 04 21 */ bctrl /* 8007217C 0006F0DC 48 00 00 14 */ b lbl_80072190 lbl_80072180: /* 80072180 0006F0E0 80 8D A1 3C */ lwz r4, gpTweakGuiColors@sda21(r13) @@ -1954,7 +1954,7 @@ lbl_800721BC: /* 80072504 0006F464 80 01 02 94 */ lwz r0, 0x294(r1) /* 80072508 0006F468 7C 08 03 A6 */ mtlr r0 /* 8007250C 0006F46C 38 21 02 90 */ addi r1, r1, 0x290 -/* 80072510 0006F470 4E 80 00 20 */ blr +/* 80072510 0006F470 4E 80 00 20 */ blr .global sub_80072514 sub_80072514: @@ -1975,14 +1975,14 @@ sub_80072514: /* 8007254C 0006F4AC 7F E5 FB 78 */ mr r5, r31 /* 80072550 0006F4B0 39 81 00 08 */ addi r12, r1, 8 /* 80072554 0006F4B4 48 31 73 D9 */ bl __ptmf_scall -/* 80072558 0006F4B8 60 00 00 00 */ nop +/* 80072558 0006F4B8 60 00 00 00 */ nop /* 8007255C 0006F4BC 80 01 00 34 */ lwz r0, 0x34(r1) /* 80072560 0006F4C0 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 80072564 0006F4C4 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80072568 0006F4C8 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8007256C 0006F4CC 7C 08 03 A6 */ mtlr r0 /* 80072570 0006F4D0 38 21 00 30 */ addi r1, r1, 0x30 -/* 80072574 0006F4D4 4E 80 00 20 */ blr +/* 80072574 0006F4D4 4E 80 00 20 */ blr .global sub_80072578 sub_80072578: @@ -2000,13 +2000,13 @@ sub_80072578: /* 800725A4 0006F504 7F E4 FB 78 */ mr r4, r31 /* 800725A8 0006F508 39 81 00 08 */ addi r12, r1, 8 /* 800725AC 0006F50C 48 31 73 81 */ bl __ptmf_scall -/* 800725B0 0006F510 60 00 00 00 */ nop +/* 800725B0 0006F510 60 00 00 00 */ nop /* 800725B4 0006F514 80 01 00 24 */ lwz r0, 0x24(r1) /* 800725B8 0006F518 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 800725BC 0006F51C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 800725C0 0006F520 7C 08 03 A6 */ mtlr r0 /* 800725C4 0006F524 38 21 00 20 */ addi r1, r1, 0x20 -/* 800725C8 0006F528 4E 80 00 20 */ blr +/* 800725C8 0006F528 4E 80 00 20 */ blr .global __dt__16CPauseScreenBaseFv __dt__16CPauseScreenBaseFv: @@ -2201,7 +2201,7 @@ lbl_80072834: /* 80072840 0006F7A0 83 C1 00 08 */ lwz r30, 8(r1) /* 80072844 0006F7A4 7C 08 03 A6 */ mtlr r0 /* 80072848 0006F7A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8007284C 0006F7AC 4E 80 00 20 */ blr +/* 8007284C 0006F7AC 4E 80 00 20 */ blr .global __ct__16CPauseScreenBaseFRC13CStateManagerRC9CGuiFrameRC12CStringTable __ct__16CPauseScreenBaseFRC13CStateManagerRC9CGuiFrameRC12CStringTable: @@ -2303,7 +2303,7 @@ __ct__16CPauseScreenBaseFRC13CStateManagerRC9CGuiFrameRC12CStringTable: /* 800729CC 0006F92C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800729D0 0006F930 7C 08 03 A6 */ mtlr r0 /* 800729D4 0006F934 38 21 00 10 */ addi r1, r1, 0x10 -/* 800729D8 0006F938 4E 80 00 20 */ blr +/* 800729D8 0006F938 4E 80 00 20 */ blr .global GetHelmetCamYOff__12CPauseScreenCFv GetHelmetCamYOff__12CPauseScreenCFv: @@ -2322,12 +2322,12 @@ lbl_80072A08: /* 80072A08 0006F968 81 83 00 00 */ lwz r12, 0(r3) /* 80072A0C 0006F96C 81 8C 00 24 */ lwz r12, 0x24(r12) /* 80072A10 0006F970 7D 89 03 A6 */ mtctr r12 -/* 80072A14 0006F974 4E 80 04 21 */ bctrl +/* 80072A14 0006F974 4E 80 04 21 */ bctrl lbl_80072A18: /* 80072A18 0006F978 80 01 00 14 */ lwz r0, 0x14(r1) /* 80072A1C 0006F97C 7C 08 03 A6 */ mtlr r0 /* 80072A20 0006F980 38 21 00 10 */ addi r1, r1, 0x10 -/* 80072A24 0006F984 4E 80 00 20 */ blr +/* 80072A24 0006F984 4E 80 00 20 */ blr .global ShouldSwitchToInGame__12CPauseScreenCFv ShouldSwitchToInGame__12CPauseScreenCFv: @@ -2355,7 +2355,7 @@ lbl_80072A6C: /* 80072A78 0006F9D8 83 C1 00 08 */ lwz r30, 8(r1) /* 80072A7C 0006F9DC 7C 08 03 A6 */ mtlr r0 /* 80072A80 0006F9E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80072A84 0006F9E4 4E 80 00 20 */ blr +/* 80072A84 0006F9E4 4E 80 00 20 */ blr .global ShouldSwitchToMapScreen__12CPauseScreenCFv ShouldSwitchToMapScreen__12CPauseScreenCFv: @@ -2383,12 +2383,12 @@ lbl_80072ACC: /* 80072AD8 0006FA38 83 C1 00 08 */ lwz r30, 8(r1) /* 80072ADC 0006FA3C 7C 08 03 A6 */ mtlr r0 /* 80072AE0 0006FA40 38 21 00 10 */ addi r1, r1, 0x10 -/* 80072AE4 0006FA44 4E 80 00 20 */ blr +/* 80072AE4 0006FA44 4E 80 00 20 */ blr .global IsLoaded__12CPauseScreenCFv IsLoaded__12CPauseScreenCFv: /* 80072AE8 0006FA48 88 63 00 90 */ lbz r3, 0x90(r3) -/* 80072AEC 0006FA4C 4E 80 00 20 */ blr +/* 80072AEC 0006FA4C 4E 80 00 20 */ blr .global InputEnabled__12CPauseScreenCFv InputEnabled__12CPauseScreenCFv: @@ -2415,7 +2415,7 @@ lbl_80072B20: /* 80072B3C 0006FA9C 81 83 00 00 */ lwz r12, 0(r3) /* 80072B40 0006FAA0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80072B44 0006FAA4 7D 89 03 A6 */ mtctr r12 -/* 80072B48 0006FAA8 4E 80 04 21 */ bctrl +/* 80072B48 0006FAA8 4E 80 04 21 */ bctrl /* 80072B4C 0006FAAC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80072B50 0006FAB0 41 82 00 0C */ beq lbl_80072B5C /* 80072B54 0006FAB4 38 60 00 00 */ li r3, 0 @@ -2431,7 +2431,7 @@ lbl_80072B5C: /* 80072B78 0006FAD8 81 83 00 00 */ lwz r12, 0(r3) /* 80072B7C 0006FADC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80072B80 0006FAE0 7D 89 03 A6 */ mtctr r12 -/* 80072B84 0006FAE4 4E 80 04 21 */ bctrl +/* 80072B84 0006FAE4 4E 80 04 21 */ bctrl /* 80072B88 0006FAE8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80072B8C 0006FAEC 41 82 00 0C */ beq lbl_80072B98 /* 80072B90 0006FAF0 38 60 00 00 */ li r3, 0 @@ -2444,7 +2444,7 @@ lbl_80072B9C: /* 80072BA4 0006FB04 83 C1 00 08 */ lwz r30, 8(r1) /* 80072BA8 0006FB08 7C 08 03 A6 */ mtlr r0 /* 80072BAC 0006FB0C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80072BB0 0006FB10 4E 80 00 20 */ blr +/* 80072BB0 0006FB10 4E 80 00 20 */ blr .global ProcessControllerInput__12CPauseScreenFRC13CStateManagerRC11CFinalInput ProcessControllerInput__12CPauseScreenFRC13CStateManagerRC11CFinalInput: @@ -2488,7 +2488,7 @@ lbl_80072C3C: /* 80072C40 0006FBA0 7F 84 E3 78 */ mr r4, r28 /* 80072C44 0006FBA4 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80072C48 0006FBA8 7D 89 03 A6 */ mtctr r12 -/* 80072C4C 0006FBAC 4E 80 04 21 */ bctrl +/* 80072C4C 0006FBAC 4E 80 04 21 */ bctrl lbl_80072C50: /* 80072C50 0006FBB0 7F E3 FB 78 */ mr r3, r31 /* 80072C54 0006FBB4 4B FF FE 9D */ bl InputEnabled__12CPauseScreenCFv @@ -2846,7 +2846,7 @@ lbl_8007319C: /* 800731A0 00070100 80 01 01 14 */ lwz r0, 0x114(r1) /* 800731A4 00070104 7C 08 03 A6 */ mtlr r0 /* 800731A8 00070108 38 21 01 10 */ addi r1, r1, 0x110 -/* 800731AC 0007010C 4E 80 00 20 */ blr +/* 800731AC 0007010C 4E 80 00 20 */ blr .global Draw__12CPauseScreenFv Draw__12CPauseScreenFv: @@ -2931,12 +2931,12 @@ lbl_800732BC: /* 800732C0 00070220 C0 62 88 30 */ lfs f3, lbl_805AA550@sda21(r2) /* 800732C4 00070224 81 8C 00 20 */ lwz r12, 0x20(r12) /* 800732C8 00070228 7D 89 03 A6 */ mtctr r12 -/* 800732CC 0007022C 4E 80 04 21 */ bctrl +/* 800732CC 0007022C 4E 80 04 21 */ bctrl /* 800732D0 00070230 80 7E 00 84 */ lwz r3, 0x84(r30) /* 800732D4 00070234 81 83 00 00 */ lwz r12, 0(r3) /* 800732D8 00070238 81 8C 00 24 */ lwz r12, 0x24(r12) /* 800732DC 0007023C 7D 89 03 A6 */ mtctr r12 -/* 800732E0 00070240 4E 80 04 21 */ bctrl +/* 800732E0 00070240 4E 80 04 21 */ bctrl /* 800732E4 00070244 FC 40 08 90 */ fmr f2, f1 lbl_800732E8: /* 800732E8 00070248 C0 02 88 48 */ lfs f0, lbl_805AA568@sda21(r2) @@ -2957,7 +2957,7 @@ lbl_80073310: /* 80073320 00070280 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80073324 00070284 7C 08 03 A6 */ mtlr r0 /* 80073328 00070288 38 21 00 40 */ addi r1, r1, 0x40 -/* 8007332C 0007028C 4E 80 00 20 */ blr +/* 8007332C 0007028C 4E 80 00 20 */ blr .global TransitionComplete__12CPauseScreenFv TransitionComplete__12CPauseScreenFv: @@ -2987,7 +2987,7 @@ TransitionComplete__12CPauseScreenFv: /* 8007338C 000702EC 38 80 00 01 */ li r4, 1 /* 80073390 000702F0 81 8C 00 08 */ lwz r12, 8(r12) /* 80073394 000702F4 7D 89 03 A6 */ mtctr r12 -/* 80073398 000702F8 4E 80 04 21 */ bctrl +/* 80073398 000702F8 4E 80 04 21 */ bctrl lbl_8007339C: /* 8007339C 000702FC 88 61 00 10 */ lbz r3, 0x10(r1) /* 800733A0 00070300 38 00 00 00 */ li r0, 0 @@ -3006,7 +3006,7 @@ lbl_800733B4: /* 800733D0 00070330 38 80 00 01 */ li r4, 1 /* 800733D4 00070334 81 8C 00 08 */ lwz r12, 8(r12) /* 800733D8 00070338 7D 89 03 A6 */ mtctr r12 -/* 800733DC 0007033C 4E 80 04 21 */ bctrl +/* 800733DC 0007033C 4E 80 04 21 */ bctrl lbl_800733E0: /* 800733E0 00070340 80 1F 00 78 */ lwz r0, 0x78(r31) /* 800733E4 00070344 20 00 00 01 */ subfic r0, r0, 1 @@ -3056,7 +3056,7 @@ lbl_800733E0: /* 80073494 000703F4 83 C1 00 38 */ lwz r30, 0x38(r1) /* 80073498 000703F8 7C 08 03 A6 */ mtlr r0 /* 8007349C 000703FC 38 21 00 40 */ addi r1, r1, 0x40 -/* 800734A0 00070400 4E 80 00 20 */ blr +/* 800734A0 00070400 4E 80 00 20 */ blr .global PreDraw__12CPauseScreenFv PreDraw__12CPauseScreenFv: @@ -3080,13 +3080,13 @@ PreDraw__12CPauseScreenFv: /* 800734E8 00070448 81 83 00 00 */ lwz r12, 0(r3) /* 800734EC 0007044C 81 8C 00 18 */ lwz r12, 0x18(r12) /* 800734F0 00070450 7D 89 03 A6 */ mtctr r12 -/* 800734F4 00070454 4E 80 04 21 */ bctrl +/* 800734F4 00070454 4E 80 04 21 */ bctrl lbl_800734F8: /* 800734F8 00070458 80 01 00 14 */ lwz r0, 0x14(r1) /* 800734FC 0007045C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80073500 00070460 7C 08 03 A6 */ mtlr r0 /* 80073504 00070464 38 21 00 10 */ addi r1, r1, 0x10 -/* 80073508 00070468 4E 80 00 20 */ blr +/* 80073508 00070468 4E 80 00 20 */ blr .global Update__12CPauseScreenFfRC13CStateManagerR9CRandom16R18CArchitectureQueue Update__12CPauseScreenFfRC13CStateManagerR9CRandom16R18CArchitectureQueue: @@ -3137,7 +3137,7 @@ lbl_800735A0: /* 800735B4 00070514 81 83 00 00 */ lwz r12, 0(r3) /* 800735B8 00070518 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800735BC 0007051C 7D 89 03 A6 */ mtctr r12 -/* 800735C0 00070520 4E 80 04 21 */ bctrl +/* 800735C0 00070520 4E 80 04 21 */ bctrl /* 800735C4 00070524 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800735C8 00070528 40 82 00 34 */ bne lbl_800735FC lbl_800735CC: @@ -3167,7 +3167,7 @@ lbl_800735FC: /* 80073620 00070580 7F C5 F3 78 */ mr r5, r30 /* 80073624 00070584 81 8C 00 14 */ lwz r12, 0x14(r12) /* 80073628 00070588 7D 89 03 A6 */ mtctr r12 -/* 8007362C 0007058C 4E 80 04 21 */ bctrl +/* 8007362C 0007058C 4E 80 04 21 */ bctrl /* 80073630 00070590 C0 3C 00 10 */ lfs f1, 0x10(r28) /* 80073634 00070594 C0 02 88 50 */ lfs f0, lbl_805AA570@sda21(r2) /* 80073638 00070598 80 7C 00 08 */ lwz r3, 8(r28) @@ -3223,7 +3223,7 @@ lbl_800736D0: /* 800736EC 0007064C 80 01 00 74 */ lwz r0, 0x74(r1) /* 800736F0 00070650 7C 08 03 A6 */ mtlr r0 /* 800736F4 00070654 38 21 00 70 */ addi r1, r1, 0x70 -/* 800736F8 00070658 4E 80 00 20 */ blr +/* 800736F8 00070658 4E 80 00 20 */ blr .global StartTransition__12CPauseScreenFfRC13CStateManagerQ212CPauseScreen10ESubScreeni StartTransition__12CPauseScreenFfRC13CStateManagerQ212CPauseScreen10ESubScreeni: @@ -3270,7 +3270,7 @@ StartTransition__12CPauseScreenFfRC13CStateManagerQ212CPauseScreen10ESubScreeni: /* 8007379C 000706FC 38 80 00 01 */ li r4, 1 /* 800737A0 00070700 81 8C 00 08 */ lwz r12, 8(r12) /* 800737A4 00070704 7D 89 03 A6 */ mtctr r12 -/* 800737A8 00070708 4E 80 04 21 */ bctrl +/* 800737A8 00070708 4E 80 04 21 */ bctrl lbl_800737AC: /* 800737AC 0007070C 88 61 00 08 */ lbz r3, 8(r1) /* 800737B0 00070710 38 00 00 00 */ li r0, 0 @@ -3289,7 +3289,7 @@ lbl_800737C4: /* 800737E0 00070740 38 80 00 01 */ li r4, 1 /* 800737E4 00070744 81 8C 00 08 */ lwz r12, 8(r12) /* 800737E8 00070748 7D 89 03 A6 */ mtctr r12 -/* 800737EC 0007074C 4E 80 04 21 */ bctrl +/* 800737EC 0007074C 4E 80 04 21 */ bctrl lbl_800737F0: /* 800737F0 00070750 80 7E 00 04 */ lwz r3, 4(r30) /* 800737F4 00070754 28 03 00 00 */ cmplwi r3, 0 @@ -3297,7 +3297,7 @@ lbl_800737F0: /* 800737FC 0007075C 81 83 00 00 */ lwz r12, 0(r3) /* 80073800 00070760 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80073804 00070764 7D 89 03 A6 */ mtctr r12 -/* 80073808 00070768 4E 80 04 21 */ bctrl +/* 80073808 00070768 4E 80 04 21 */ bctrl lbl_8007380C: /* 8007380C 0007076C 38 00 00 00 */ li r0, 0 /* 80073810 00070770 98 1F 00 91 */ stb r0, 0x91(r31) @@ -3308,7 +3308,7 @@ lbl_80073814: /* 80073820 00070780 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80073824 00070784 7C 08 03 A6 */ mtlr r0 /* 80073828 00070788 38 21 00 20 */ addi r1, r1, 0x20 -/* 8007382C 0007078C 4E 80 00 20 */ blr +/* 8007382C 0007078C 4E 80 00 20 */ blr .global BuildPauseSubScreen__12CPauseScreenFQ212CPauseScreen10ESubScreenRC13CStateManagerRC9CGuiFrame BuildPauseSubScreen__12CPauseScreenFQ212CPauseScreen10ESubScreenRC13CStateManagerRC9CGuiFrame: @@ -3394,7 +3394,7 @@ lbl_8007393C: /* 8007394C 000708AC 83 81 00 10 */ lwz r28, 0x10(r1) /* 80073950 000708B0 7C 08 03 A6 */ mtlr r0 /* 80073954 000708B4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80073958 000708B8 4E 80 00 20 */ blr +/* 80073958 000708B8 4E 80 00 20 */ blr .global CheckLoadComplete__12CPauseScreenFRC13CStateManager CheckLoadComplete__12CPauseScreenFRC13CStateManager: @@ -3487,7 +3487,7 @@ lbl_80073A7C: /* 80073A88 000709E8 81 83 00 00 */ lwz r12, 0(r3) /* 80073A8C 000709EC 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80073A90 000709F0 7D 89 03 A6 */ mtctr r12 -/* 80073A94 000709F4 4E 80 04 21 */ bctrl +/* 80073A94 000709F4 4E 80 04 21 */ bctrl /* 80073A98 000709F8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80073A9C 000709FC 41 82 01 70 */ beq lbl_80073C0C /* 80073AA0 00070A00 80 9D 00 5C */ lwz r4, 0x5c(r29) @@ -3576,7 +3576,7 @@ lbl_80073BB4: /* 80073BDC 00070B3C 38 80 00 01 */ li r4, 1 /* 80073BE0 00070B40 81 8C 00 08 */ lwz r12, 8(r12) /* 80073BE4 00070B44 7D 89 03 A6 */ mtctr r12 -/* 80073BE8 00070B48 4E 80 04 21 */ bctrl +/* 80073BE8 00070B48 4E 80 04 21 */ bctrl lbl_80073BEC: /* 80073BEC 00070B4C 38 00 00 00 */ li r0, 0 /* 80073BF0 00070B50 90 1D 00 60 */ stw r0, 0x60(r29) @@ -3620,7 +3620,7 @@ lbl_80073C68: /* 80073C74 00070BD4 83 A1 00 64 */ lwz r29, 0x64(r1) /* 80073C78 00070BD8 7C 08 03 A6 */ mtlr r0 /* 80073C7C 00070BDC 38 21 00 70 */ addi r1, r1, 0x70 -/* 80073C80 00070BE0 4E 80 00 20 */ blr +/* 80073C80 00070BE0 4E 80 00 20 */ blr .global InitializeFrameGlue__12CPauseScreenFv InitializeFrameGlue__12CPauseScreenFv: @@ -3754,7 +3754,7 @@ lbl_80073E70: /* 80073E7C 00070DDC 83 E1 00 4C */ lwz r31, 0x4c(r1) /* 80073E80 00070DE0 7C 08 03 A6 */ mtlr r0 /* 80073E84 00070DE4 38 21 00 60 */ addi r1, r1, 0x60 -/* 80073E88 00070DE8 4E 80 00 20 */ blr +/* 80073E88 00070DE8 4E 80 00 20 */ blr .global __dt__12CPauseScreenFv __dt__12CPauseScreenFv: @@ -3787,7 +3787,7 @@ lbl_80073ECC: /* 80073EF0 00070E50 38 80 00 01 */ li r4, 1 /* 80073EF4 00070E54 81 8C 00 08 */ lwz r12, 8(r12) /* 80073EF8 00070E58 7D 89 03 A6 */ mtctr r12 -/* 80073EFC 00070E5C 4E 80 04 21 */ bctrl +/* 80073EFC 00070E5C 4E 80 04 21 */ bctrl lbl_80073F00: /* 80073F00 00070E60 3B 9C 00 08 */ addi r28, r28, 8 /* 80073F04 00070E64 3B BD 00 01 */ addi r29, r29, 1 @@ -3831,7 +3831,7 @@ lbl_80073F6C: /* 80073F84 00070EE4 38 80 00 01 */ li r4, 1 /* 80073F88 00070EE8 81 8C 00 08 */ lwz r12, 8(r12) /* 80073F8C 00070EEC 7D 89 03 A6 */ mtctr r12 -/* 80073F90 00070EF0 4E 80 04 21 */ bctrl +/* 80073F90 00070EF0 4E 80 04 21 */ bctrl lbl_80073F94: /* 80073F94 00070EF4 34 1E 00 5C */ addic. r0, r30, 0x5c /* 80073F98 00070EF8 41 82 00 0C */ beq lbl_80073FA4 @@ -3867,7 +3867,7 @@ lbl_80073FEC: /* 80074000 00070F60 83 81 00 10 */ lwz r28, 0x10(r1) /* 80074004 00070F64 7C 08 03 A6 */ mtlr r0 /* 80074008 00070F68 38 21 00 20 */ addi r1, r1, 0x20 -/* 8007400C 00070F6C 4E 80 00 20 */ blr +/* 8007400C 00070F6C 4E 80 00 20 */ blr .global __ct__12CPauseScreenFiRC16CDependencyGroupRC16CDependencyGroup __ct__12CPauseScreenFiRC16CDependencyGroupRC16CDependencyGroup: @@ -3897,7 +3897,7 @@ __ct__12CPauseScreenFiRC16CDependencyGroupRC16CDependencyGroup: /* 8007406C 00070FCC 81 84 00 00 */ lwz r12, 0(r4) /* 80074070 00070FD0 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80074074 00070FD4 7D 89 03 A6 */ mtctr r12 -/* 80074078 00070FD8 4E 80 04 21 */ bctrl +/* 80074078 00070FD8 4E 80 04 21 */ bctrl /* 8007407C 00070FDC 3B 9F 00 14 */ addi r28, r31, 0x14 /* 80074080 00070FE0 38 81 00 34 */ addi r4, r1, 0x34 /* 80074084 00070FE4 7F 83 E3 78 */ mr r3, r28 @@ -3917,7 +3917,7 @@ __ct__12CPauseScreenFiRC16CDependencyGroupRC16CDependencyGroup: /* 800740BC 0007101C 81 84 00 00 */ lwz r12, 0(r4) /* 800740C0 00071020 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800740C4 00071024 7D 89 03 A6 */ mtctr r12 -/* 800740C8 00071028 4E 80 04 21 */ bctrl +/* 800740C8 00071028 4E 80 04 21 */ bctrl /* 800740CC 0007102C 3B 9F 00 28 */ addi r28, r31, 0x28 /* 800740D0 00071030 38 81 00 2C */ addi r4, r1, 0x2c /* 800740D4 00071034 7F 83 E3 78 */ mr r3, r28 @@ -3943,7 +3943,7 @@ __ct__12CPauseScreenFiRC16CDependencyGroupRC16CDependencyGroup: /* 80074124 00071084 81 83 00 00 */ lwz r12, 0(r3) /* 80074128 00071088 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 8007412C 0007108C 7D 89 03 A6 */ mtctr r12 -/* 80074130 00071090 4E 80 04 21 */ bctrl +/* 80074130 00071090 4E 80 04 21 */ bctrl /* 80074134 00071094 80 A3 00 04 */ lwz r5, 4(r3) /* 80074138 00071098 3C 60 46 52 */ lis r3, 0x46524D45@ha /* 8007413C 0007109C 38 03 4D 45 */ addi r0, r3, 0x46524D45@l @@ -4012,7 +4012,7 @@ lbl_80074214: /* 80074230 00071190 38 80 00 01 */ li r4, 1 /* 80074234 00071194 81 8C 00 08 */ lwz r12, 8(r12) /* 80074238 00071198 7D 89 03 A6 */ mtctr r12 -/* 8007423C 0007119C 4E 80 04 21 */ bctrl +/* 8007423C 0007119C 4E 80 04 21 */ bctrl lbl_80074240: /* 80074240 000711A0 38 60 00 00 */ li r3, 0 /* 80074244 000711A4 38 00 00 01 */ li r0, 1 @@ -4039,40 +4039,40 @@ lbl_80074240: /* 80074298 000711F8 83 81 00 40 */ lwz r28, 0x40(r1) /* 8007429C 000711FC 7C 08 03 A6 */ mtlr r0 /* 800742A0 00071200 38 21 00 50 */ addi r1, r1, 0x50 -/* 800742A4 00071204 4E 80 00 20 */ blr +/* 800742A4 00071204 4E 80 00 20 */ blr .global GetNextSubscreen__12CPauseScreenFQ212CPauseScreen10ESubScreen GetNextSubscreen__12CPauseScreenFQ212CPauseScreen10ESubScreen: /* 800742A8 00071208 2C 03 00 02 */ cmpwi r3, 2 /* 800742AC 0007120C 40 82 00 0C */ bne lbl_800742B8 /* 800742B0 00071210 38 60 00 00 */ li r3, 0 -/* 800742B4 00071214 4E 80 00 20 */ blr +/* 800742B4 00071214 4E 80 00 20 */ blr lbl_800742B8: /* 800742B8 00071218 2C 03 00 01 */ cmpwi r3, 1 /* 800742BC 0007121C 40 82 00 0C */ bne lbl_800742C8 /* 800742C0 00071220 38 60 00 02 */ li r3, 2 -/* 800742C4 00071224 4E 80 00 20 */ blr +/* 800742C4 00071224 4E 80 00 20 */ blr lbl_800742C8: /* 800742C8 00071228 2C 03 00 00 */ cmpwi r3, 0 /* 800742CC 0007122C 38 60 00 03 */ li r3, 3 -/* 800742D0 00071230 4C 82 00 20 */ bnelr +/* 800742D0 00071230 4C 82 00 20 */ bnelr /* 800742D4 00071234 38 60 00 01 */ li r3, 1 -/* 800742D8 00071238 4E 80 00 20 */ blr +/* 800742D8 00071238 4E 80 00 20 */ blr .global GetPreviousSubscreen__12CPauseScreenFQ212CPauseScreen10ESubScreen GetPreviousSubscreen__12CPauseScreenFQ212CPauseScreen10ESubScreen: /* 800742DC 0007123C 2C 03 00 02 */ cmpwi r3, 2 /* 800742E0 00071240 40 82 00 0C */ bne lbl_800742EC /* 800742E4 00071244 38 60 00 01 */ li r3, 1 -/* 800742E8 00071248 4E 80 00 20 */ blr +/* 800742E8 00071248 4E 80 00 20 */ blr lbl_800742EC: /* 800742EC 0007124C 2C 03 00 01 */ cmpwi r3, 1 /* 800742F0 00071250 40 82 00 0C */ bne lbl_800742FC /* 800742F4 00071254 38 60 00 00 */ li r3, 0 -/* 800742F8 00071258 4E 80 00 20 */ blr +/* 800742F8 00071258 4E 80 00 20 */ blr lbl_800742FC: /* 800742FC 0007125C 2C 03 00 00 */ cmpwi r3, 0 /* 80074300 00071260 38 60 00 03 */ li r3, 3 -/* 80074304 00071264 4C 82 00 20 */ bnelr +/* 80074304 00071264 4C 82 00 20 */ bnelr /* 80074308 00071268 38 60 00 02 */ li r3, 2 -/* 8007430C 0007126C 4E 80 00 20 */ blr +/* 8007430C 0007126C 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/CPauseScreenBlur.s b/asm/MetroidPrime/CPauseScreenBlur.s index dc968fc3..bf02b720 100644 --- a/asm/MetroidPrime/CPauseScreenBlur.s +++ b/asm/MetroidPrime/CPauseScreenBlur.s @@ -29,7 +29,7 @@ GetBlurAmt__16CPauseScreenBlurCFv: /* 8025D5B4 0025A514 C0 03 00 18 */ lfs f0, 0x18(r3) /* 8025D5B8 0025A518 FC 00 02 10 */ fabs f0, f0 /* 8025D5BC 0025A51C FC 20 00 18 */ frsp f1, f0 -/* 8025D5C0 0025A520 4E 80 00 20 */ blr +/* 8025D5C0 0025A520 4E 80 00 20 */ blr .global SetState__16CPauseScreenBlurFQ216CPauseScreenBlur6EState SetState__16CPauseScreenBlurFQ216CPauseScreenBlur6EState: @@ -131,7 +131,7 @@ lbl_8025D710: /* 8025D71C 0025A67C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8025D720 0025A680 7C 08 03 A6 */ mtlr r0 /* 8025D724 0025A684 38 21 00 20 */ addi r1, r1, 0x20 -/* 8025D728 0025A688 4E 80 00 20 */ blr +/* 8025D728 0025A688 4E 80 00 20 */ blr .global sub_8025d72c sub_8025d72c: @@ -139,18 +139,18 @@ sub_8025d72c: /* 8025D730 0025A690 2C 00 00 00 */ cmpwi r0, 0 /* 8025D734 0025A694 40 82 00 0C */ bne lbl_8025D740 /* 8025D738 0025A698 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 8025D73C 0025A69C 4D 82 00 20 */ beqlr +/* 8025D73C 0025A69C 4D 82 00 20 */ beqlr lbl_8025D740: /* 8025D740 0025A6A0 80 03 00 14 */ lwz r0, 0x14(r3) /* 8025D744 0025A6A4 90 03 00 10 */ stw r0, 0x10(r3) /* 8025D748 0025A6A8 80 03 00 10 */ lwz r0, 0x10(r3) /* 8025D74C 0025A6AC 2C 00 00 00 */ cmpwi r0, 0 -/* 8025D750 0025A6B0 4C 82 00 20 */ bnelr +/* 8025D750 0025A6B0 4C 82 00 20 */ bnelr /* 8025D754 0025A6B4 88 03 00 50 */ lbz r0, 0x50(r3) /* 8025D758 0025A6B8 38 80 00 01 */ li r4, 1 /* 8025D75C 0025A6BC 50 80 36 72 */ rlwimi r0, r4, 6, 0x19, 0x19 /* 8025D760 0025A6C0 98 03 00 50 */ stb r0, 0x50(r3) -/* 8025D764 0025A6C4 4E 80 00 20 */ blr +/* 8025D764 0025A6C4 4E 80 00 20 */ blr .global Draw__16CPauseScreenBlurFRC13CStateManager Draw__16CPauseScreenBlurFRC13CStateManager: @@ -222,7 +222,7 @@ lbl_8025D858: /* 8025D864 0025A7C4 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8025D868 0025A7C8 7C 08 03 A6 */ mtlr r0 /* 8025D86C 0025A7CC 38 21 00 30 */ addi r1, r1, 0x30 -/* 8025D870 0025A7D0 4E 80 00 20 */ blr +/* 8025D870 0025A7D0 4E 80 00 20 */ blr .global Update__16CPauseScreenBlurfRC13CStateManagerb Update__16CPauseScreenBlurfRC13CStateManagerb: @@ -313,7 +313,7 @@ lbl_8025D994: /* 8025D99C 0025A8FC 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8025D9A0 0025A900 7C 08 03 A6 */ mtlr r0 /* 8025D9A4 0025A904 38 21 00 20 */ addi r1, r1, 0x20 -/* 8025D9A8 0025A908 4E 80 00 20 */ blr +/* 8025D9A8 0025A908 4E 80 00 20 */ blr .global OnNewInGameGuiState__16CPauseScreenBlurF15EInGameGuiStateR13CStateManager OnNewInGameGuiState__16CPauseScreenBlurF15EInGameGuiStateR13CStateManager: @@ -363,7 +363,7 @@ lbl_8025DA38: /* 8025DA38 0025A998 80 01 00 14 */ lwz r0, 0x14(r1) /* 8025DA3C 0025A99C 7C 08 03 A6 */ mtlr r0 /* 8025DA40 0025A9A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025DA44 0025A9A4 4E 80 00 20 */ blr +/* 8025DA44 0025A9A4 4E 80 00 20 */ blr .global __dt__16CPauseScreenBlurFv __dt__16CPauseScreenBlurFv: @@ -414,7 +414,7 @@ lbl_8025DADC: /* 8025DAE8 0025AA48 83 C1 00 08 */ lwz r30, 8(r1) /* 8025DAEC 0025AA4C 7C 08 03 A6 */ mtlr r0 /* 8025DAF0 0025AA50 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025DAF4 0025AA54 4E 80 00 20 */ blr +/* 8025DAF4 0025AA54 4E 80 00 20 */ blr .global __ct__16CPauseScreenBlurFv __ct__16CPauseScreenBlurFv: @@ -434,7 +434,7 @@ __ct__16CPauseScreenBlurFv: /* 8025DB2C 0025AA8C 81 84 00 00 */ lwz r12, 0(r4) /* 8025DB30 0025AA90 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8025DB34 0025AA94 7D 89 03 A6 */ mtctr r12 -/* 8025DB38 0025AA98 4E 80 04 21 */ bctrl +/* 8025DB38 0025AA98 4E 80 04 21 */ bctrl /* 8025DB3C 0025AA9C 3B FE 00 04 */ addi r31, r30, 4 /* 8025DB40 0025AAA0 38 81 00 08 */ addi r4, r1, 8 /* 8025DB44 0025AAA4 7F E3 FB 78 */ mr r3, r31 diff --git a/asm/MetroidPrime/CPauseScreenFrame.s b/asm/MetroidPrime/CPauseScreenFrame.s index 255d5428..4f07df34 100644 --- a/asm/MetroidPrime/CPauseScreenFrame.s +++ b/asm/MetroidPrime/CPauseScreenFrame.s @@ -167,7 +167,7 @@ DoSliderChange__21SOptionsFrontEndFrameFP15CGuiSliderGroup: /* 80241B18 0023EA78 81 83 00 00 */ lwz r12, 0(r3) /* 80241B1C 0023EA7C 81 8C 00 24 */ lwz r12, 0x24(r12) /* 80241B20 0023EA80 7D 89 03 A6 */ mtctr r12 -/* 80241B24 0023EA84 4E 80 04 21 */ bctrl +/* 80241B24 0023EA84 4E 80 04 21 */ bctrl /* 80241B28 0023EA88 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80241B2C 0023EA8C 41 82 00 44 */ beq lbl_80241B70 /* 80241B30 0023EA90 80 BE 00 24 */ lwz r5, 0x24(r30) @@ -192,7 +192,7 @@ lbl_80241B70: /* 80241B78 0023EAD8 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80241B7C 0023EADC 7C 08 03 A6 */ mtlr r0 /* 80241B80 0023EAE0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80241B84 0023EAE4 4E 80 00 20 */ blr +/* 80241B84 0023EAE4 4E 80 00 20 */ blr .global SetTableColors__21SOptionsFrontEndFrameFP14CGuiTableGroup SetTableColors__21SOptionsFrontEndFrameFP14CGuiTableGroup: @@ -217,7 +217,7 @@ SetTableColors__21SOptionsFrontEndFrameFP14CGuiTableGroup: /* 80241BD0 0023EB30 80 01 00 14 */ lwz r0, 0x14(r1) /* 80241BD4 0023EB34 7C 08 03 A6 */ mtlr r0 /* 80241BD8 0023EB38 38 21 00 10 */ addi r1, r1, 0x10 -/* 80241BDC 0023EB3C 4E 80 00 20 */ blr +/* 80241BDC 0023EB3C 4E 80 00 20 */ blr .global Draw__21SOptionsFrontEndFrameFv Draw__21SOptionsFrontEndFrameFv: @@ -247,7 +247,7 @@ lbl_80241C38: /* 80241C38 0023EB98 80 01 00 24 */ lwz r0, 0x24(r1) /* 80241C3C 0023EB9C 7C 08 03 A6 */ mtlr r0 /* 80241C40 0023EBA0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80241C44 0023EBA4 4E 80 00 20 */ blr +/* 80241C44 0023EBA4 4E 80 00 20 */ blr .global ProcessUserInput__21SOptionsFrontEndFrameFRC11CFinalInputPC15CSaveGameScreen ProcessUserInput__21SOptionsFrontEndFrameFRC11CFinalInputPC15CSaveGameScreen: @@ -280,7 +280,7 @@ lbl_80241C84: /* 80241CAC 0023EC0C 81 83 00 00 */ lwz r12, 0(r3) /* 80241CB0 0023EC10 81 8C 00 24 */ lwz r12, 0x24(r12) /* 80241CB4 0023EC14 7D 89 03 A6 */ mtctr r12 -/* 80241CB8 0023EC18 4E 80 04 21 */ bctrl +/* 80241CB8 0023EC18 4E 80 04 21 */ bctrl /* 80241CBC 0023EC1C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80241CC0 0023EC20 41 82 00 3C */ beq lbl_80241CFC /* 80241CC4 0023EC24 88 1E 01 34 */ lbz r0, 0x134(r30) @@ -318,7 +318,7 @@ lbl_80241D24: /* 80241D3C 0023EC9C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80241D40 0023ECA0 7C 08 03 A6 */ mtlr r0 /* 80241D44 0023ECA4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80241D48 0023ECA8 4E 80 00 20 */ blr +/* 80241D48 0023ECA8 4E 80 00 20 */ blr .global Update__21SOptionsFrontEndFrameFfPC15CSaveGameScreen Update__21SOptionsFrontEndFrameFfPC15CSaveGameScreen: @@ -406,7 +406,7 @@ lbl_80241E68: /* 80241E78 0023EDD8 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80241E7C 0023EDDC 7C 08 03 A6 */ mtlr r0 /* 80241E80 0023EDE0 38 21 00 30 */ addi r1, r1, 0x30 -/* 80241E84 0023EDE4 4E 80 00 20 */ blr +/* 80241E84 0023EDE4 4E 80 00 20 */ blr .global DoMenuCancel__21SOptionsFrontEndFrameFP14CGuiTableGroup DoMenuCancel__21SOptionsFrontEndFrameFP14CGuiTableGroup: @@ -447,7 +447,7 @@ lbl_80241F08: /* 80241F0C 0023EE6C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80241F10 0023EE70 7C 08 03 A6 */ mtlr r0 /* 80241F14 0023EE74 38 21 00 20 */ addi r1, r1, 0x20 -/* 80241F18 0023EE78 4E 80 00 20 */ blr +/* 80241F18 0023EE78 4E 80 00 20 */ blr .global DoMenuSelectionChange__21SOptionsFrontEndFrameFP14CGuiTableGroup DoMenuSelectionChange__21SOptionsFrontEndFrameFP14CGuiTableGroup: @@ -503,7 +503,7 @@ lbl_80241FD4: /* 80241FD4 0023EF34 81 83 00 00 */ lwz r12, 0(r3) /* 80241FD8 0023EF38 81 8C 00 24 */ lwz r12, 0x24(r12) /* 80241FDC 0023EF3C 7D 89 03 A6 */ mtctr r12 -/* 80241FE0 0023EF40 4E 80 04 21 */ bctrl +/* 80241FE0 0023EF40 4E 80 04 21 */ bctrl /* 80241FE4 0023EF44 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80241FE8 0023EF48 41 82 00 9C */ beq lbl_80242084 /* 80241FEC 0023EF4C 80 BF 00 24 */ lwz r5, 0x24(r31) @@ -552,7 +552,7 @@ lbl_80242084: /* 80242094 0023EFF4 83 81 00 20 */ lwz r28, 0x20(r1) /* 80242098 0023EFF8 7C 08 03 A6 */ mtlr r0 /* 8024209C 0023EFFC 38 21 00 30 */ addi r1, r1, 0x30 -/* 802420A0 0023F000 4E 80 00 20 */ blr +/* 802420A0 0023F000 4E 80 00 20 */ blr .global DoLeftMenuAdvance__21SOptionsFrontEndFrameFP14CGuiTableGroup DoLeftMenuAdvance__21SOptionsFrontEndFrameFP14CGuiTableGroup: @@ -599,7 +599,7 @@ lbl_8024213C: /* 80242140 0023F0A0 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80242144 0023F0A4 7C 08 03 A6 */ mtlr r0 /* 80242148 0023F0A8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8024214C 0023F0AC 4E 80 00 20 */ blr +/* 8024214C 0023F0AC 4E 80 00 20 */ blr .global DeactivateRightMenu__21SOptionsFrontEndFrameFv DeactivateRightMenu__21SOptionsFrontEndFrameFv: @@ -633,7 +633,7 @@ DeactivateRightMenu__21SOptionsFrontEndFrameFv: /* 802421BC 0023F11C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802421C0 0023F120 7C 08 03 A6 */ mtlr r0 /* 802421C4 0023F124 38 21 00 10 */ addi r1, r1, 0x10 -/* 802421C8 0023F128 4E 80 00 20 */ blr +/* 802421C8 0023F128 4E 80 00 20 */ blr .global HandleRightSelectionChange__21SOptionsFrontEndFrameFv HandleRightSelectionChange__21SOptionsFrontEndFrameFv: @@ -812,7 +812,7 @@ lbl_80242460: /* 80242468 0023F3C8 83 C1 01 38 */ lwz r30, 0x138(r1) /* 8024246C 0023F3CC 7C 08 03 A6 */ mtlr r0 /* 80242470 0023F3D0 38 21 01 40 */ addi r1, r1, 0x140 -/* 80242474 0023F3D4 4E 80 00 20 */ blr +/* 80242474 0023F3D4 4E 80 00 20 */ blr .global SetRightUIText__21SOptionsFrontEndFrameFv SetRightUIText__21SOptionsFrontEndFrameFv: @@ -854,7 +854,7 @@ lbl_802424B4: /* 80242500 0023F460 81 83 00 00 */ lwz r12, 0(r3) /* 80242504 0023F464 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 80242508 0023F468 7D 89 03 A6 */ mtctr r12 -/* 8024250C 0023F46C 4E 80 04 21 */ bctrl +/* 8024250C 0023F46C 4E 80 04 21 */ bctrl /* 80242510 0023F470 88 03 00 B6 */ lbz r0, 0xb6(r3) /* 80242514 0023F474 38 80 00 01 */ li r4, 1 /* 80242518 0023F478 50 80 26 F6 */ rlwimi r0, r4, 4, 0x1b, 0x1b @@ -870,7 +870,7 @@ lbl_80242524: /* 8024253C 0023F49C 81 83 00 00 */ lwz r12, 0(r3) /* 80242540 0023F4A0 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 80242544 0023F4A4 7D 89 03 A6 */ mtctr r12 -/* 80242548 0023F4A8 4E 80 04 21 */ bctrl +/* 80242548 0023F4A8 4E 80 04 21 */ bctrl /* 8024254C 0023F4AC 88 03 00 B6 */ lbz r0, 0xb6(r3) /* 80242550 0023F4B0 38 80 00 00 */ li r4, 0 /* 80242554 0023F4B4 50 80 26 F6 */ rlwimi r0, r4, 4, 0x1b, 0x1b @@ -884,7 +884,7 @@ lbl_8024255C: /* 80242570 0023F4D0 80 01 00 44 */ lwz r0, 0x44(r1) /* 80242574 0023F4D4 7C 08 03 A6 */ mtlr r0 /* 80242578 0023F4D8 38 21 00 40 */ addi r1, r1, 0x40 -/* 8024257C 0023F4DC 4E 80 00 20 */ blr +/* 8024257C 0023F4DC 4E 80 00 20 */ blr .global FinishedLoading__21SOptionsFrontEndFrameFv FinishedLoading__21SOptionsFrontEndFrameFv: @@ -976,7 +976,7 @@ FinishedLoading__21SOptionsFrontEndFrameFv: /* 802426D4 0023F634 81 83 00 00 */ lwz r12, 0(r3) /* 802426D8 0023F638 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 802426DC 0023F63C 7D 89 03 A6 */ mtctr r12 -/* 802426E0 0023F640 4E 80 04 21 */ bctrl +/* 802426E0 0023F640 4E 80 04 21 */ bctrl /* 802426E4 0023F644 7C 64 1B 78 */ mr r4, r3 /* 802426E8 0023F648 38 61 00 E8 */ addi r3, r1, 0xe8 /* 802426EC 0023F64C 48 08 7F C1 */ bl GetIdlePosition__10CGuiWidgetFv @@ -986,7 +986,7 @@ FinishedLoading__21SOptionsFrontEndFrameFv: /* 802426FC 0023F65C 81 83 00 00 */ lwz r12, 0(r3) /* 80242700 0023F660 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 80242704 0023F664 7D 89 03 A6 */ mtctr r12 -/* 80242708 0023F668 4E 80 04 21 */ bctrl +/* 80242708 0023F668 4E 80 04 21 */ bctrl /* 8024270C 0023F66C 7C 64 1B 78 */ mr r4, r3 /* 80242710 0023F670 38 61 00 F4 */ addi r3, r1, 0xf4 /* 80242714 0023F674 48 08 7F 99 */ bl GetIdlePosition__10CGuiWidgetFv @@ -1288,7 +1288,7 @@ lbl_80242AEC: /* 80242BA8 0023FB08 83 A1 02 14 */ lwz r29, 0x214(r1) /* 80242BAC 0023FB0C 7C 08 03 A6 */ mtlr r0 /* 80242BB0 0023FB10 38 21 02 30 */ addi r1, r1, 0x230 -/* 80242BB4 0023FB14 4E 80 00 20 */ blr +/* 80242BB4 0023FB14 4E 80 00 20 */ blr .global sub_80242bb8 sub_80242bb8: @@ -1309,14 +1309,14 @@ sub_80242bb8: /* 80242BF0 0023FB50 7F E4 FB 78 */ mr r4, r31 /* 80242BF4 0023FB54 39 81 00 08 */ addi r12, r1, 8 /* 80242BF8 0023FB58 48 14 6D 35 */ bl __ptmf_scall -/* 80242BFC 0023FB5C 60 00 00 00 */ nop +/* 80242BFC 0023FB5C 60 00 00 00 */ nop /* 80242C00 0023FB60 80 01 00 34 */ lwz r0, 0x34(r1) /* 80242C04 0023FB64 CB E1 00 28 */ lfd f31, 0x28(r1) /* 80242C08 0023FB68 83 E1 00 24 */ lwz r31, 0x24(r1) /* 80242C0C 0023FB6C 83 C1 00 20 */ lwz r30, 0x20(r1) /* 80242C10 0023FB70 7C 08 03 A6 */ mtlr r0 /* 80242C14 0023FB74 38 21 00 30 */ addi r1, r1, 0x30 -/* 80242C18 0023FB78 4E 80 00 20 */ blr +/* 80242C18 0023FB78 4E 80 00 20 */ blr .global sub_80242c1c sub_80242c1c: @@ -1337,14 +1337,14 @@ sub_80242c1c: /* 80242C54 0023FBB4 7F E5 FB 78 */ mr r5, r31 /* 80242C58 0023FBB8 39 81 00 08 */ addi r12, r1, 8 /* 80242C5C 0023FBBC 48 14 6C D1 */ bl __ptmf_scall -/* 80242C60 0023FBC0 60 00 00 00 */ nop +/* 80242C60 0023FBC0 60 00 00 00 */ nop /* 80242C64 0023FBC4 80 01 00 34 */ lwz r0, 0x34(r1) /* 80242C68 0023FBC8 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 80242C6C 0023FBCC 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80242C70 0023FBD0 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80242C74 0023FBD4 7C 08 03 A6 */ mtlr r0 /* 80242C78 0023FBD8 38 21 00 30 */ addi r1, r1, 0x30 -/* 80242C7C 0023FBDC 4E 80 00 20 */ blr +/* 80242C7C 0023FBDC 4E 80 00 20 */ blr .global sub_80242c80 sub_80242c80: @@ -1362,13 +1362,13 @@ sub_80242c80: /* 80242CAC 0023FC0C 7F E4 FB 78 */ mr r4, r31 /* 80242CB0 0023FC10 39 81 00 08 */ addi r12, r1, 8 /* 80242CB4 0023FC14 48 14 6C 79 */ bl __ptmf_scall -/* 80242CB8 0023FC18 60 00 00 00 */ nop +/* 80242CB8 0023FC18 60 00 00 00 */ nop /* 80242CBC 0023FC1C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80242CC0 0023FC20 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80242CC4 0023FC24 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80242CC8 0023FC28 7C 08 03 A6 */ mtlr r0 /* 80242CCC 0023FC2C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80242CD0 0023FC30 4E 80 00 20 */ blr +/* 80242CD0 0023FC30 4E 80 00 20 */ blr .global PumpLoad__21SOptionsFrontEndFrameFv PumpLoad__21SOptionsFrontEndFrameFv: @@ -1452,7 +1452,7 @@ lbl_80242DDC: /* 80242DE4 0023FD44 83 C1 00 08 */ lwz r30, 8(r1) /* 80242DE8 0023FD48 7C 08 03 A6 */ mtlr r0 /* 80242DEC 0023FD4C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80242DF0 0023FD50 4E 80 00 20 */ blr +/* 80242DF0 0023FD50 4E 80 00 20 */ blr .global __dt__21SOptionsFrontEndFrameFv __dt__21SOptionsFrontEndFrameFv: @@ -1498,7 +1498,7 @@ lbl_80242E78: /* 80242E84 0023FDE4 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80242E88 0023FDE8 7C 08 03 A6 */ mtlr r0 /* 80242E8C 0023FDEC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80242E90 0023FDF0 4E 80 00 20 */ blr +/* 80242E90 0023FDF0 4E 80 00 20 */ blr .global __ct__21SOptionsFrontEndFrameFv __ct__21SOptionsFrontEndFrameFv: @@ -1518,7 +1518,7 @@ __ct__21SOptionsFrontEndFrameFv: /* 80242EC8 0023FE28 81 84 00 00 */ lwz r12, 0(r4) /* 80242ECC 0023FE2C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80242ED0 0023FE30 7D 89 03 A6 */ mtctr r12 -/* 80242ED4 0023FE34 4E 80 04 21 */ bctrl +/* 80242ED4 0023FE34 4E 80 04 21 */ bctrl /* 80242ED8 0023FE38 3B FE 00 04 */ addi r31, r30, 4 /* 80242EDC 0023FE3C 38 81 00 10 */ addi r4, r1, 0x10 /* 80242EE0 0023FE40 7F E3 FB 78 */ mr r3, r31 @@ -1536,7 +1536,7 @@ __ct__21SOptionsFrontEndFrameFv: /* 80242F10 0023FE70 38 A5 01 1F */ addi r5, r5, 0x11f /* 80242F14 0023FE74 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80242F18 0023FE78 7D 89 03 A6 */ mtctr r12 -/* 80242F1C 0023FE7C 4E 80 04 21 */ bctrl +/* 80242F1C 0023FE7C 4E 80 04 21 */ bctrl /* 80242F20 0023FE80 3B FE 00 10 */ addi r31, r30, 0x10 /* 80242F24 0023FE84 38 81 00 08 */ addi r4, r1, 8 /* 80242F28 0023FE88 7F E3 FB 78 */ mr r3, r31 @@ -1577,7 +1577,7 @@ __ct__21SOptionsFrontEndFrameFv: /* 80242FB4 0023FF14 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80242FB8 0023FF18 7C 08 03 A6 */ mtlr r0 /* 80242FBC 0023FF1C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80242FC0 0023FF20 4E 80 00 20 */ blr +/* 80242FC0 0023FF20 4E 80 00 20 */ blr .global OnEnumChanged__14COptionsScreenFP14CGuiTableGroupi OnEnumChanged__14COptionsScreenFP14CGuiTableGroupi: @@ -1636,7 +1636,7 @@ lbl_80243088: /* 8024308C 0023FFEC 80 01 00 34 */ lwz r0, 0x34(r1) /* 80243090 0023FFF0 7C 08 03 A6 */ mtlr r0 /* 80243094 0023FFF4 38 21 00 30 */ addi r1, r1, 0x30 -/* 80243098 0023FFF8 4E 80 00 20 */ blr +/* 80243098 0023FFF8 4E 80 00 20 */ blr .global OnSliderChanged__14COptionsScreenFP15CGuiSliderGroupf OnSliderChanged__14COptionsScreenFP15CGuiSliderGroupf: @@ -1665,7 +1665,7 @@ lbl_802430F0: /* 802430F0 00240050 80 01 00 14 */ lwz r0, 0x14(r1) /* 802430F4 00240054 7C 08 03 A6 */ mtlr r0 /* 802430F8 00240058 38 21 00 10 */ addi r1, r1, 0x10 -/* 802430FC 0024005C 4E 80 00 20 */ blr +/* 802430FC 0024005C 4E 80 00 20 */ blr .global UpdateOptionView__14COptionsScreenFv UpdateOptionView__14COptionsScreenFv: @@ -1818,7 +1818,7 @@ lbl_80243328: /* 80243338 00240298 83 C1 00 38 */ lwz r30, 0x38(r1) /* 8024333C 0024029C 7C 08 03 A6 */ mtlr r0 /* 80243340 002402A0 38 21 00 50 */ addi r1, r1, 0x50 -/* 80243344 002402A4 4E 80 00 20 */ blr +/* 80243344 002402A4 4E 80 00 20 */ blr .global ResetOptionWidgetVisibility__14COptionsScreenFv ResetOptionWidgetVisibility__14COptionsScreenFv: @@ -1850,7 +1850,7 @@ ResetOptionWidgetVisibility__14COptionsScreenFv: /* 802433AC 0024030C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802433B0 00240310 7C 08 03 A6 */ mtlr r0 /* 802433B4 00240314 38 21 00 10 */ addi r1, r1, 0x10 -/* 802433B8 00240318 4E 80 00 20 */ blr +/* 802433B8 00240318 4E 80 00 20 */ blr .global RightTableSelectionChanged__14COptionsScreenFii RightTableSelectionChanged__14COptionsScreenFii: @@ -1861,7 +1861,7 @@ RightTableSelectionChanged__14COptionsScreenFii: /* 802433CC 0024032C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802433D0 00240330 7C 08 03 A6 */ mtlr r0 /* 802433D4 00240334 38 21 00 10 */ addi r1, r1, 0x10 -/* 802433D8 00240338 4E 80 00 20 */ blr +/* 802433D8 00240338 4E 80 00 20 */ blr .global ChangedMode__14COptionsScreenQ216CPauseScreenBase5EMode ChangedMode__14COptionsScreenQ216CPauseScreenBase5EMode: @@ -1893,7 +1893,7 @@ lbl_80243434: /* 80243438 00240398 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8024343C 0024039C 7C 08 03 A6 */ mtlr r0 /* 80243440 002403A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80243444 002403A4 4E 80 00 20 */ blr +/* 80243444 002403A4 4E 80 00 20 */ blr .global UpdateRightTable__14COptionsScreenFv UpdateRightTable__14COptionsScreenFv: @@ -1954,7 +1954,7 @@ lbl_802434FC: /* 80243514 00240474 80 01 00 54 */ lwz r0, 0x54(r1) /* 80243518 00240478 7C 08 03 A6 */ mtlr r0 /* 8024351C 0024047C 38 21 00 50 */ addi r1, r1, 0x50 -/* 80243520 00240480 4E 80 00 20 */ blr +/* 80243520 00240480 4E 80 00 20 */ blr .global GetRightTableCount__14COptionsScreenCFv GetRightTableCount__14COptionsScreenCFv: @@ -1964,7 +1964,7 @@ GetRightTableCount__14COptionsScreenCFv: /* 80243530 00240490 80 04 00 C4 */ lwz r0, 0xc4(r4) /* 80243534 00240494 54 00 18 38 */ slwi r0, r0, 3 /* 80243538 00240498 7C 63 00 2E */ lwzx r3, r3, r0 -/* 8024353C 0024049C 4E 80 00 20 */ blr +/* 8024353C 0024049C 4E 80 00 20 */ blr .global ShouldLeftTableAdvance__14COptionsScreenFv ShouldLeftTableAdvance__14COptionsScreenFv: @@ -1974,12 +1974,12 @@ ShouldLeftTableAdvance__14COptionsScreenFv: /* 8024354C 002404AC 38 04 FF FC */ addi r0, r4, -4 /* 80243550 002404B0 7C 60 03 78 */ or r0, r3, r0 /* 80243554 002404B4 54 03 0F FE */ srwi r3, r0, 0x1f -/* 80243558 002404B8 4E 80 00 20 */ blr +/* 80243558 002404B8 4E 80 00 20 */ blr .global ShouldRightTableAdvance__14COptionsScreenFv ShouldRightTableAdvance__14COptionsScreenFv: /* 8024355C 002404BC 38 60 00 00 */ li r3, 0 -/* 80243560 002404C0 4E 80 00 20 */ blr +/* 80243560 002404C0 4E 80 00 20 */ blr .global VActivate__14COptionsScreenFv VActivate__14COptionsScreenFv: @@ -2036,7 +2036,7 @@ lbl_8024361C: /* 80243624 00240584 81 83 00 00 */ lwz r12, 0(r3) /* 80243628 00240588 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 8024362C 0024058C 7D 89 03 A6 */ mtctr r12 -/* 80243630 00240590 4E 80 04 21 */ bctrl +/* 80243630 00240590 4E 80 04 21 */ bctrl /* 80243634 00240594 88 03 00 B6 */ lbz r0, 0xb6(r3) /* 80243638 00240598 53 A0 26 F6 */ rlwimi r0, r29, 4, 0x1b, 0x1b /* 8024363C 0024059C 3B 7B 00 01 */ addi r27, r27, 1 @@ -2057,7 +2057,7 @@ lbl_80243644: /* 80243674 002405D4 81 83 00 00 */ lwz r12, 0(r3) /* 80243678 002405D8 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 8024367C 002405DC 7D 89 03 A6 */ mtctr r12 -/* 80243680 002405E0 4E 80 04 21 */ bctrl +/* 80243680 002405E0 4E 80 04 21 */ bctrl /* 80243684 002405E4 7C 7D 1B 78 */ mr r29, r3 /* 80243688 002405E8 80 7E 00 0C */ lwz r3, 0xc(r30) /* 8024368C 002405EC 38 80 00 5F */ li r4, 0x5f @@ -2076,7 +2076,7 @@ lbl_80243644: /* 802436C0 00240620 81 83 00 00 */ lwz r12, 0(r3) /* 802436C4 00240624 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 802436C8 00240628 7D 89 03 A6 */ mtctr r12 -/* 802436CC 0024062C 4E 80 04 21 */ bctrl +/* 802436CC 0024062C 4E 80 04 21 */ bctrl /* 802436D0 00240630 7C 7D 1B 78 */ mr r29, r3 /* 802436D4 00240634 80 7E 00 0C */ lwz r3, 0xc(r30) /* 802436D8 00240638 38 80 00 5E */ li r4, 0x5e @@ -2095,7 +2095,7 @@ lbl_80243644: /* 8024370C 0024066C 81 83 00 00 */ lwz r12, 0(r3) /* 80243710 00240670 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 80243714 00240674 7D 89 03 A6 */ mtctr r12 -/* 80243718 00240678 4E 80 04 21 */ bctrl +/* 80243718 00240678 4E 80 04 21 */ bctrl /* 8024371C 0024067C 7C 7D 1B 78 */ mr r29, r3 /* 80243720 00240680 80 7E 00 0C */ lwz r3, 0xc(r30) /* 80243724 00240684 38 80 00 60 */ li r4, 0x60 @@ -2114,7 +2114,7 @@ lbl_80243644: /* 80243758 002406B8 81 83 00 00 */ lwz r12, 0(r3) /* 8024375C 002406BC 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 80243760 002406C0 7D 89 03 A6 */ mtctr r12 -/* 80243764 002406C4 4E 80 04 21 */ bctrl +/* 80243764 002406C4 4E 80 04 21 */ bctrl /* 80243768 002406C8 7C 7D 1B 78 */ mr r29, r3 /* 8024376C 002406CC 80 7E 00 0C */ lwz r3, 0xc(r30) /* 80243770 002406D0 38 80 00 61 */ li r4, 0x61 @@ -2133,7 +2133,7 @@ lbl_80243644: /* 802437A4 00240704 81 83 00 00 */ lwz r12, 0(r3) /* 802437A8 00240708 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 802437AC 0024070C 7D 89 03 A6 */ mtctr r12 -/* 802437B0 00240710 4E 80 04 21 */ bctrl +/* 802437B0 00240710 4E 80 04 21 */ bctrl /* 802437B4 00240714 7C 7D 1B 78 */ mr r29, r3 /* 802437B8 00240718 80 7E 00 0C */ lwz r3, 0xc(r30) /* 802437BC 0024071C 38 80 00 62 */ li r4, 0x62 @@ -2214,7 +2214,7 @@ lbl_80243644: /* 802438E8 00240848 80 01 01 34 */ lwz r0, 0x134(r1) /* 802438EC 0024084C 7C 08 03 A6 */ mtlr r0 /* 802438F0 00240850 38 21 01 30 */ addi r1, r1, 0x130 -/* 802438F4 00240854 4E 80 00 20 */ blr +/* 802438F4 00240854 4E 80 00 20 */ blr .global sub_802438f8 sub_802438f8: @@ -2235,14 +2235,14 @@ sub_802438f8: /* 80243930 00240890 7F E5 FB 78 */ mr r5, r31 /* 80243934 00240894 39 81 00 08 */ addi r12, r1, 8 /* 80243938 00240898 48 14 5F F5 */ bl __ptmf_scall -/* 8024393C 0024089C 60 00 00 00 */ nop +/* 8024393C 0024089C 60 00 00 00 */ nop /* 80243940 002408A0 80 01 00 34 */ lwz r0, 0x34(r1) /* 80243944 002408A4 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 80243948 002408A8 83 C1 00 28 */ lwz r30, 0x28(r1) /* 8024394C 002408AC 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80243950 002408B0 7C 08 03 A6 */ mtlr r0 /* 80243954 002408B4 38 21 00 30 */ addi r1, r1, 0x30 -/* 80243958 002408B8 4E 80 00 20 */ blr +/* 80243958 002408B8 4E 80 00 20 */ blr .global sub_8024395c sub_8024395c: @@ -2263,14 +2263,14 @@ sub_8024395c: /* 80243994 002408F4 7F E4 FB 78 */ mr r4, r31 /* 80243998 002408F8 39 81 00 08 */ addi r12, r1, 8 /* 8024399C 002408FC 48 14 5F 91 */ bl __ptmf_scall -/* 802439A0 00240900 60 00 00 00 */ nop +/* 802439A0 00240900 60 00 00 00 */ nop /* 802439A4 00240904 80 01 00 34 */ lwz r0, 0x34(r1) /* 802439A8 00240908 CB E1 00 28 */ lfd f31, 0x28(r1) /* 802439AC 0024090C 83 E1 00 24 */ lwz r31, 0x24(r1) /* 802439B0 00240910 83 C1 00 20 */ lwz r30, 0x20(r1) /* 802439B4 00240914 7C 08 03 A6 */ mtlr r0 /* 802439B8 00240918 38 21 00 30 */ addi r1, r1, 0x30 -/* 802439BC 0024091C 4E 80 00 20 */ blr +/* 802439BC 0024091C 4E 80 00 20 */ blr .global Draw__14COptionsScreenCFfff Draw__14COptionsScreenCFfff: @@ -2307,7 +2307,7 @@ lbl_80243A28: /* 80243A34 00240994 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80243A38 00240998 7C 08 03 A6 */ mtlr r0 /* 80243A3C 0024099C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80243A40 002409A0 4E 80 00 20 */ blr +/* 80243A40 002409A0 4E 80 00 20 */ blr .global ProcessInput__14COptionsScreenFRC11CFinalInput ProcessInput__14COptionsScreenFRC11CFinalInput: @@ -2374,7 +2374,7 @@ lbl_80243B14: /* 80243B20 00240A80 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80243B24 00240A84 7C 08 03 A6 */ mtlr r0 /* 80243B28 00240A88 38 21 00 20 */ addi r1, r1, 0x20 -/* 80243B2C 00240A8C 4E 80 00 20 */ blr +/* 80243B2C 00240A8C 4E 80 00 20 */ blr .global Touch__14COptionsScreenFv Touch__14COptionsScreenFv: @@ -2390,7 +2390,7 @@ Touch__14COptionsScreenFv: /* 80243B54 00240AB4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80243B58 00240AB8 7C 08 03 A6 */ mtlr r0 /* 80243B5C 00240ABC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80243B60 00240AC0 4E 80 00 20 */ blr +/* 80243B60 00240AC0 4E 80 00 20 */ blr .global Update__14COptionsScreenFfR9CRandom16R18CArchitectureQueue Update__14COptionsScreenFfR9CRandom16R18CArchitectureQueue: @@ -2590,7 +2590,7 @@ lbl_80243E08: /* 80243E30 00240D90 83 A1 00 44 */ lwz r29, 0x44(r1) /* 80243E34 00240D94 7C 08 03 A6 */ mtlr r0 /* 80243E38 00240D98 38 21 00 70 */ addi r1, r1, 0x70 -/* 80243E3C 00240D9C 4E 80 00 20 */ blr +/* 80243E3C 00240D9C 4E 80 00 20 */ blr .global InputDisabled__14COptionsScreenCFv InputDisabled__14COptionsScreenCFv: @@ -2598,12 +2598,12 @@ InputDisabled__14COptionsScreenCFv: /* 80243E44 00240DA4 7C 03 00 D0 */ neg r0, r3 /* 80243E48 00240DA8 7C 00 1B 78 */ or r0, r0, r3 /* 80243E4C 00240DAC 54 03 0F FE */ srwi r3, r0, 0x1f -/* 80243E50 00240DB0 4E 80 00 20 */ blr +/* 80243E50 00240DB0 4E 80 00 20 */ blr .global VReady__14COptionsScreenCFv VReady__14COptionsScreenCFv: /* 80243E54 00240DB4 38 60 00 01 */ li r3, 1 -/* 80243E58 00240DB8 4E 80 00 20 */ blr +/* 80243E58 00240DB8 4E 80 00 20 */ blr .global __dt__14COptionsScreenFv __dt__14COptionsScreenFv: @@ -2663,7 +2663,7 @@ lbl_80243F10: /* 80243F20 00240E80 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80243F24 00240E84 7C 08 03 A6 */ mtlr r0 /* 80243F28 00240E88 38 21 00 20 */ addi r1, r1, 0x20 -/* 80243F2C 00240E8C 4E 80 00 20 */ blr +/* 80243F2C 00240E8C 4E 80 00 20 */ blr .global __ct__14COptionsScreenFRC13CStateManagerRC9CGuiFrameRC12CStringTable __ct__14COptionsScreenFRC13CStateManagerRC9CGuiFrameRC12CStringTable: @@ -2705,7 +2705,7 @@ lbl_80243F84: /* 80243FB8 00240F18 80 01 00 14 */ lwz r0, 0x14(r1) /* 80243FBC 00240F1C 7C 08 03 A6 */ mtlr r0 /* 80243FC0 00240F20 38 21 00 10 */ addi r1, r1, 0x10 -/* 80243FC4 00240F24 4E 80 00 20 */ blr +/* 80243FC4 00240F24 4E 80 00 20 */ blr .global TryRestoreDefaults__12CGameOptionsFRC11CFinalInputiib TryRestoreDefaults__12CGameOptionsFRC11CFinalInputiib: @@ -2836,7 +2836,7 @@ lbl_80244190: /* 80244198 002410F8 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8024419C 002410FC 7C 08 03 A6 */ mtlr r0 /* 802441A0 00241100 38 21 00 20 */ addi r1, r1, 0x20 -/* 802441A4 00241104 4E 80 00 20 */ blr +/* 802441A4 00241104 4E 80 00 20 */ blr .global SetOption__12CGameOptionsF11EGameOptioni SetOption__12CGameOptionsF11EGameOptioni: @@ -2852,7 +2852,7 @@ SetOption__12CGameOptionsF11EGameOptioni: /* 802441CC 0024112C 38 65 88 2C */ addi r3, r5, lbl_803E882C@l /* 802441D0 00241130 7C 03 00 2E */ lwzx r0, r3, r0 /* 802441D4 00241134 7C 09 03 A6 */ mtctr r0 -/* 802441D8 00241138 4E 80 04 20 */ bctr +/* 802441D8 00241138 4E 80 04 20 */ bctr .global lbl_802441DC lbl_802441DC: /* 802441DC 0024113C 90 86 00 60 */ stw r4, 0x60(r6) @@ -2947,7 +2947,7 @@ lbl_802442D4: /* 802442D4 00241234 80 01 00 14 */ lwz r0, 0x14(r1) /* 802442D8 00241238 7C 08 03 A6 */ mtlr r0 /* 802442DC 0024123C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802442E0 00241240 4E 80 00 20 */ blr +/* 802442E0 00241240 4E 80 00 20 */ blr .global GetOption__11CGameOptionF11EGameOption GetOption__11CGameOptionF11EGameOption: @@ -2959,15 +2959,15 @@ GetOption__11CGameOptionF11EGameOption: /* 802442F8 00241258 38 64 88 64 */ addi r3, r4, lbl_803E8864@l /* 802442FC 0024125C 7C 03 00 2E */ lwzx r0, r3, r0 /* 80244300 00241260 7C 09 03 A6 */ mtctr r0 -/* 80244304 00241264 4E 80 04 20 */ bctr +/* 80244304 00241264 4E 80 04 20 */ bctr .global lbl_80244308 lbl_80244308: /* 80244308 00241268 80 65 01 DC */ lwz r3, 0x1dc(r5) -/* 8024430C 0024126C 4E 80 00 20 */ blr +/* 8024430C 0024126C 4E 80 00 20 */ blr .global lbl_80244310 lbl_80244310: /* 80244310 00241270 80 65 01 E0 */ lwz r3, 0x1e0(r5) -/* 80244314 00241274 4E 80 00 20 */ blr +/* 80244314 00241274 4E 80 00 20 */ blr .global lbl_80244318 lbl_80244318: /* 80244318 00241278 88 05 01 E4 */ lbz r0, 0x1e4(r5) @@ -2975,7 +2975,7 @@ lbl_80244318: /* 80244320 00241280 7C 03 00 D0 */ neg r0, r3 /* 80244324 00241284 7C 00 1B 78 */ or r0, r0, r3 /* 80244328 00241288 54 03 0F FE */ srwi r3, r0, 0x1f -/* 8024432C 0024128C 4E 80 00 20 */ blr +/* 8024432C 0024128C 4E 80 00 20 */ blr .global lbl_80244330 lbl_80244330: /* 80244330 00241290 88 05 01 E4 */ lbz r0, 0x1e4(r5) @@ -2983,35 +2983,35 @@ lbl_80244330: /* 80244338 00241298 7C 03 00 D0 */ neg r0, r3 /* 8024433C 0024129C 7C 00 1B 78 */ or r0, r0, r3 /* 80244340 002412A0 54 03 0F FE */ srwi r3, r0, 0x1f -/* 80244344 002412A4 4E 80 00 20 */ blr +/* 80244344 002412A4 4E 80 00 20 */ blr .global lbl_80244348 lbl_80244348: /* 80244348 002412A8 80 65 01 C4 */ lwz r3, 0x1c4(r5) -/* 8024434C 002412AC 4E 80 00 20 */ blr +/* 8024434C 002412AC 4E 80 00 20 */ blr .global lbl_80244350 lbl_80244350: /* 80244350 002412B0 80 65 01 C8 */ lwz r3, 0x1c8(r5) -/* 80244354 002412B4 4E 80 00 20 */ blr +/* 80244354 002412B4 4E 80 00 20 */ blr .global lbl_80244358 lbl_80244358: /* 80244358 002412B8 80 65 01 CC */ lwz r3, 0x1cc(r5) -/* 8024435C 002412BC 4E 80 00 20 */ blr +/* 8024435C 002412BC 4E 80 00 20 */ blr .global lbl_80244360 lbl_80244360: /* 80244360 002412C0 80 65 01 D0 */ lwz r3, 0x1d0(r5) -/* 80244364 002412C4 4E 80 00 20 */ blr +/* 80244364 002412C4 4E 80 00 20 */ blr .global lbl_80244368 lbl_80244368: /* 80244368 002412C8 80 65 01 D4 */ lwz r3, 0x1d4(r5) -/* 8024436C 002412CC 4E 80 00 20 */ blr +/* 8024436C 002412CC 4E 80 00 20 */ blr .global lbl_80244370 lbl_80244370: /* 80244370 002412D0 80 65 01 D8 */ lwz r3, 0x1d8(r5) -/* 80244374 002412D4 4E 80 00 20 */ blr +/* 80244374 002412D4 4E 80 00 20 */ blr .global lbl_80244378 lbl_80244378: /* 80244378 002412D8 80 65 01 C0 */ lwz r3, 0x1c0(r5) -/* 8024437C 002412DC 4E 80 00 20 */ blr +/* 8024437C 002412DC 4E 80 00 20 */ blr .global lbl_80244380 lbl_80244380: /* 80244380 002412E0 88 05 01 E4 */ lbz r0, 0x1e4(r5) @@ -3019,7 +3019,7 @@ lbl_80244380: /* 80244388 002412E8 7C 03 00 D0 */ neg r0, r3 /* 8024438C 002412EC 7C 00 1B 78 */ or r0, r0, r3 /* 80244390 002412F0 54 03 0F FE */ srwi r3, r0, 0x1f -/* 80244394 002412F4 4E 80 00 20 */ blr +/* 80244394 002412F4 4E 80 00 20 */ blr .global lbl_80244398 lbl_80244398: /* 80244398 002412F8 88 05 01 E4 */ lbz r0, 0x1e4(r5) @@ -3027,7 +3027,7 @@ lbl_80244398: /* 802443A0 00241300 7C 03 00 D0 */ neg r0, r3 /* 802443A4 00241304 7C 00 1B 78 */ or r0, r0, r3 /* 802443A8 00241308 54 03 0F FE */ srwi r3, r0, 0x1f -/* 802443AC 0024130C 4E 80 00 20 */ blr +/* 802443AC 0024130C 4E 80 00 20 */ blr .global lbl_802443B0 lbl_802443B0: /* 802443B0 00241310 88 05 01 E4 */ lbz r0, 0x1e4(r5) @@ -3035,10 +3035,10 @@ lbl_802443B0: /* 802443B8 00241318 7C 03 00 D0 */ neg r0, r3 /* 802443BC 0024131C 7C 00 1B 78 */ or r0, r0, r3 /* 802443C0 00241320 54 03 0F FE */ srwi r3, r0, 0x1f -/* 802443C4 00241324 4E 80 00 20 */ blr +/* 802443C4 00241324 4E 80 00 20 */ blr lbl_802443C8: /* 802443C8 00241328 38 60 00 00 */ li r3, 0 -/* 802443CC 0024132C 4E 80 00 20 */ blr +/* 802443CC 0024132C 4E 80 00 20 */ blr .global sub_802443d0 sub_802443d0: @@ -3124,7 +3124,7 @@ lbl_802444F4: /* 802444FC 0024145C 81 83 00 00 */ lwz r12, 0(r3) /* 80244500 00241460 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 80244504 00241464 7D 89 03 A6 */ mtctr r12 -/* 80244508 00241468 4E 80 04 21 */ bctrl +/* 80244508 00241468 4E 80 04 21 */ bctrl /* 8024450C 0024146C 7C 1E F8 00 */ cmpw r30, r31 /* 80244510 00241470 38 81 00 08 */ addi r4, r1, 8 /* 80244514 00241474 40 82 00 08 */ bne lbl_8024451C @@ -3140,7 +3140,7 @@ lbl_8024451C: /* 80244538 00241498 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8024453C 0024149C 7C 08 03 A6 */ mtlr r0 /* 80244540 002414A0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80244544 002414A4 4E 80 00 20 */ blr +/* 80244544 002414A4 4E 80 00 20 */ blr .global FinishedLoading__15CQuitGameScreenFv FinishedLoading__15CQuitGameScreenFv: @@ -3292,7 +3292,7 @@ FinishedLoading__15CQuitGameScreenFv: /* 8024478C 002416EC 83 C1 00 B8 */ lwz r30, 0xb8(r1) /* 80244790 002416F0 7C 08 03 A6 */ mtlr r0 /* 80244794 002416F4 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 80244798 002416F8 4E 80 00 20 */ blr +/* 80244798 002416F8 4E 80 00 20 */ blr .global sub_8024479c sub_8024479c: @@ -3313,14 +3313,14 @@ sub_8024479c: /* 802447D4 00241734 7F E5 FB 78 */ mr r5, r31 /* 802447D8 00241738 39 81 00 08 */ addi r12, r1, 8 /* 802447DC 0024173C 48 14 51 51 */ bl __ptmf_scall -/* 802447E0 00241740 60 00 00 00 */ nop +/* 802447E0 00241740 60 00 00 00 */ nop /* 802447E4 00241744 80 01 00 34 */ lwz r0, 0x34(r1) /* 802447E8 00241748 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 802447EC 0024174C 83 C1 00 28 */ lwz r30, 0x28(r1) /* 802447F0 00241750 83 A1 00 24 */ lwz r29, 0x24(r1) /* 802447F4 00241754 7C 08 03 A6 */ mtlr r0 /* 802447F8 00241758 38 21 00 30 */ addi r1, r1, 0x30 -/* 802447FC 0024175C 4E 80 00 20 */ blr +/* 802447FC 0024175C 4E 80 00 20 */ blr .global sub_80244800 sub_80244800: @@ -3338,13 +3338,13 @@ sub_80244800: /* 8024482C 0024178C 7F E4 FB 78 */ mr r4, r31 /* 80244830 00241790 39 81 00 08 */ addi r12, r1, 8 /* 80244834 00241794 48 14 50 F9 */ bl __ptmf_scall -/* 80244838 00241798 60 00 00 00 */ nop +/* 80244838 00241798 60 00 00 00 */ nop /* 8024483C 0024179C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80244840 002417A0 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80244844 002417A4 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80244848 002417A8 7C 08 03 A6 */ mtlr r0 /* 8024484C 002417AC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80244850 002417B0 4E 80 00 20 */ blr +/* 80244850 002417B0 4E 80 00 20 */ blr .global DoSelectionChange__15CQuitGameScreenFP14CGuiTableGroup DoSelectionChange__15CQuitGameScreenFP14CGuiTableGroup: @@ -3364,7 +3364,7 @@ DoSelectionChange__15CQuitGameScreenFP14CGuiTableGroup: /* 80244888 002417E8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8024488C 002417EC 7C 08 03 A6 */ mtlr r0 /* 80244890 002417F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80244894 002417F4 4E 80 00 20 */ blr +/* 80244894 002417F4 4E 80 00 20 */ blr .global DoAdvance__15CQuitGameScreenFP14CGuiTableGroup DoAdvance__15CQuitGameScreenFP14CGuiTableGroup: @@ -3405,7 +3405,7 @@ lbl_80244914: /* 80244918 00241878 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8024491C 0024187C 7C 08 03 A6 */ mtlr r0 /* 80244920 00241880 38 21 00 20 */ addi r1, r1, 0x20 -/* 80244924 00241884 4E 80 00 20 */ blr +/* 80244924 00241884 4E 80 00 20 */ blr .global Update__15CQuitGameScreenFv Update__15CQuitGameScreenFv: @@ -3449,7 +3449,7 @@ lbl_802449A4: /* 802449AC 0024190C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802449B0 00241910 7C 08 03 A6 */ mtlr r0 /* 802449B4 00241914 38 21 00 10 */ addi r1, r1, 0x10 -/* 802449B8 00241918 4E 80 00 20 */ blr +/* 802449B8 00241918 4E 80 00 20 */ blr .global Draw__15CQuitGameScreenFv Draw__15CQuitGameScreenFv: @@ -3511,7 +3511,7 @@ lbl_80244A84: /* 80244A90 002419F0 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 80244A94 002419F4 7C 08 03 A6 */ mtlr r0 /* 80244A98 002419F8 38 21 00 50 */ addi r1, r1, 0x50 -/* 80244A9C 002419FC 4E 80 00 20 */ blr +/* 80244A9C 002419FC 4E 80 00 20 */ blr .global ProcessUserInput__15CQuitGameScreenFRC11CFinalInput ProcessUserInput__15CQuitGameScreenFRC11CFinalInput: @@ -3543,7 +3543,7 @@ lbl_80244AF8: /* 80244B00 00241A60 83 C1 00 08 */ lwz r30, 8(r1) /* 80244B04 00241A64 7C 08 03 A6 */ mtlr r0 /* 80244B08 00241A68 38 21 00 10 */ addi r1, r1, 0x10 -/* 80244B0C 00241A6C 4E 80 00 20 */ blr +/* 80244B0C 00241A6C 4E 80 00 20 */ blr .global __ct__15CQuitGameScreenF9EQuitType __ct__15CQuitGameScreenF9EQuitType: @@ -3562,7 +3562,7 @@ __ct__15CQuitGameScreenF9EQuitType: /* 80244B40 00241AA0 81 84 00 00 */ lwz r12, 0(r4) /* 80244B44 00241AA4 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80244B48 00241AA8 7D 89 03 A6 */ mtctr r12 -/* 80244B4C 00241AAC 4E 80 04 21 */ bctrl +/* 80244B4C 00241AAC 4E 80 04 21 */ bctrl /* 80244B50 00241AB0 3B FE 00 04 */ addi r31, r30, 4 /* 80244B54 00241AB4 38 81 00 08 */ addi r4, r1, 8 /* 80244B58 00241AB8 7F E3 FB 78 */ mr r3, r31 diff --git a/asm/MetroidPrime/CPhysicsActor.s b/asm/MetroidPrime/CPhysicsActor.s index 2c6b067a..f210311f 100644 --- a/asm/MetroidPrime/CPhysicsActor.s +++ b/asm/MetroidPrime/CPhysicsActor.s @@ -58,32 +58,32 @@ lbl_805A7634: .global GetMaximumCollisionVelocity__13CPhysicsActorCFv GetMaximumCollisionVelocity__13CPhysicsActorCFv: /* 8011A4B8 00117418 C0 23 02 38 */ lfs f1, 0x238(r3) -/* 8011A4BC 0011741C 4E 80 00 20 */ blr +/* 8011A4BC 0011741C 4E 80 00 20 */ blr .global SetMaximumCollisionVelocity__13CPhysicsActorFf SetMaximumCollisionVelocity__13CPhysicsActorFf: /* 8011A4C0 00117420 D0 23 02 38 */ stfs f1, 0x238(r3) -/* 8011A4C4 00117424 4E 80 00 20 */ blr +/* 8011A4C4 00117424 4E 80 00 20 */ blr .global GetCollisionAccuracyModifier__13CPhysicsActorCFv GetCollisionAccuracyModifier__13CPhysicsActorCFv: /* 8011A4C8 00117428 C0 23 02 48 */ lfs f1, 0x248(r3) -/* 8011A4CC 0011742C 4E 80 00 20 */ blr +/* 8011A4CC 0011742C 4E 80 00 20 */ blr .global SetCollisionAccuracyModifier__13CPhysicsActorFf SetCollisionAccuracyModifier__13CPhysicsActorFf: /* 8011A4D0 00117430 D0 23 02 48 */ stfs f1, 0x248(r3) -/* 8011A4D4 00117434 4E 80 00 20 */ blr +/* 8011A4D4 00117434 4E 80 00 20 */ blr .global GetCoefficientOfRestitutionModifier__13CPhysicsActorCFv GetCoefficientOfRestitutionModifier__13CPhysicsActorCFv: /* 8011A4D8 00117438 C0 23 02 44 */ lfs f1, 0x244(r3) -/* 8011A4DC 0011743C 4E 80 00 20 */ blr +/* 8011A4DC 0011743C 4E 80 00 20 */ blr .global SetCoefficientOfRestitutionModifier__13CPhysicsActorFf SetCoefficientOfRestitutionModifier__13CPhysicsActorFf: /* 8011A4E0 00117440 D0 23 02 44 */ stfs f1, 0x244(r3) -/* 8011A4E4 00117444 4E 80 00 20 */ blr +/* 8011A4E4 00117444 4E 80 00 20 */ blr .global Render__13CPhysicsActorCFRC13CStateManager Render__13CPhysicsActorCFRC13CStateManager: @@ -94,7 +94,7 @@ Render__13CPhysicsActorCFRC13CStateManager: /* 8011A4F8 00117458 80 01 00 14 */ lwz r0, 0x14(r1) /* 8011A4FC 0011745C 7C 08 03 A6 */ mtlr r0 /* 8011A500 00117460 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011A504 00117464 4E 80 00 20 */ blr +/* 8011A504 00117464 4E 80 00 20 */ blr .global GetAimPosition__13CPhysicsActorCFRC13CStateManagerf GetAimPosition__13CPhysicsActorCFRC13CStateManagerf: @@ -153,7 +153,7 @@ lbl_8011A5B0: /* 8011A5D0 00117530 83 C1 00 78 */ lwz r30, 0x78(r1) /* 8011A5D4 00117534 7C 08 03 A6 */ mtlr r0 /* 8011A5D8 00117538 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 8011A5DC 0011753C 4E 80 00 20 */ blr +/* 8011A5DC 0011753C 4E 80 00 20 */ blr .global GetOrbitPosition__13CPhysicsActorCFRC13CStateManager GetOrbitPosition__13CPhysicsActorCFRC13CStateManager: @@ -171,17 +171,17 @@ GetOrbitPosition__13CPhysicsActorCFRC13CStateManager: /* 8011A60C 0011756C 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8011A610 00117570 7C 08 03 A6 */ mtlr r0 /* 8011A614 00117574 38 21 00 30 */ addi r1, r1, 0x30 -/* 8011A618 00117578 4E 80 00 20 */ blr +/* 8011A618 00117578 4E 80 00 20 */ blr .global GetStepUpHeight__13CPhysicsActorCFv GetStepUpHeight__13CPhysicsActorCFv: /* 8011A61C 0011757C C0 23 02 3C */ lfs f1, 0x23c(r3) -/* 8011A620 00117580 4E 80 00 20 */ blr +/* 8011A620 00117580 4E 80 00 20 */ blr .global GetStepDownHeight__13CPhysicsActorCFv GetStepDownHeight__13CPhysicsActorCFv: /* 8011A624 00117584 C0 23 02 40 */ lfs f1, 0x240(r3) -/* 8011A628 00117588 4E 80 00 20 */ blr +/* 8011A628 00117588 4E 80 00 20 */ blr .global GetPrimitiveOffset__13CPhysicsActorCFv GetPrimitiveOffset__13CPhysicsActorCFv: @@ -191,14 +191,14 @@ GetPrimitiveOffset__13CPhysicsActorCFv: /* 8011A638 00117598 D0 03 00 04 */ stfs f0, 4(r3) /* 8011A63C 0011759C C0 04 01 F0 */ lfs f0, 0x1f0(r4) /* 8011A640 001175A0 D0 03 00 08 */ stfs f0, 8(r3) -/* 8011A644 001175A4 4E 80 00 20 */ blr +/* 8011A644 001175A4 4E 80 00 20 */ blr .global GetWeight__13CPhysicsActorCFv GetWeight__13CPhysicsActorCFv: /* 8011A648 001175A8 C0 22 96 A8 */ lfs f1, lbl_805AB3C8@sda21(r2) /* 8011A64C 001175AC C0 03 00 E8 */ lfs f0, 0xe8(r3) /* 8011A650 001175B0 EC 21 00 32 */ fmuls f1, f1, f0 -/* 8011A654 001175B4 4E 80 00 20 */ blr +/* 8011A654 001175B4 4E 80 00 20 */ blr .global SetBoundingBox__13CPhysicsActorFRC6CAABox SetBoundingBox__13CPhysicsActorFRC6CAABox: @@ -224,7 +224,7 @@ SetBoundingBox__13CPhysicsActorFRC6CAABox: /* 8011A6A4 00117604 80 01 00 14 */ lwz r0, 0x14(r1) /* 8011A6A8 00117608 7C 08 03 A6 */ mtlr r0 /* 8011A6AC 0011760C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011A6B0 00117610 4E 80 00 20 */ blr +/* 8011A6B0 00117610 4E 80 00 20 */ blr .global GetMotionVolume__13CPhysicsActorCFf GetMotionVolume__13CPhysicsActorCFf: @@ -246,19 +246,19 @@ GetMotionVolume__13CPhysicsActorCFf: /* 8011A6F0 00117650 81 8C 00 70 */ lwz r12, 0x70(r12) /* 8011A6F4 00117654 38 61 00 7C */ addi r3, r1, 0x7c /* 8011A6F8 00117658 7D 89 03 A6 */ mtctr r12 -/* 8011A6FC 0011765C 4E 80 04 21 */ bctrl +/* 8011A6FC 0011765C 4E 80 04 21 */ bctrl /* 8011A700 00117660 7F E3 FB 78 */ mr r3, r31 /* 8011A704 00117664 81 9F 00 00 */ lwz r12, 0(r31) /* 8011A708 00117668 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 8011A70C 0011766C 7D 89 03 A6 */ mtctr r12 -/* 8011A710 00117670 4E 80 04 21 */ bctrl +/* 8011A710 00117670 4E 80 04 21 */ bctrl /* 8011A714 00117674 7C 64 1B 78 */ mr r4, r3 /* 8011A718 00117678 38 61 00 4C */ addi r3, r1, 0x4c /* 8011A71C 0011767C 81 84 00 00 */ lwz r12, 0(r4) /* 8011A720 00117680 38 A1 00 7C */ addi r5, r1, 0x7c /* 8011A724 00117684 81 8C 00 14 */ lwz r12, 0x14(r12) /* 8011A728 00117688 7D 89 03 A6 */ mtctr r12 -/* 8011A72C 0011768C 4E 80 04 21 */ bctrl +/* 8011A72C 0011768C 4E 80 04 21 */ bctrl /* 8011A730 00117690 C0 A1 00 4C */ lfs f5, 0x4c(r1) /* 8011A734 00117694 7F E4 FB 78 */ mr r4, r31 /* 8011A738 00117698 C0 81 00 50 */ lfs f4, 0x50(r1) @@ -308,7 +308,7 @@ GetMotionVolume__13CPhysicsActorCFf: /* 8011A7E8 00117748 81 9F 00 00 */ lwz r12, 0(r31) /* 8011A7EC 0011774C 81 8C 00 7C */ lwz r12, 0x7c(r12) /* 8011A7F0 00117750 7D 89 03 A6 */ mtctr r12 -/* 8011A7F4 00117754 4E 80 04 21 */ bctrl +/* 8011A7F4 00117754 4E 80 04 21 */ bctrl /* 8011A7F8 00117758 FC 40 08 18 */ frsp f2, f1 /* 8011A7FC 0011775C C0 0D 8A 70 */ lfs f0, lbl_805A7630@sda21(r13) /* 8011A800 00117760 D0 21 00 0C */ stfs f1, 0xc(r1) @@ -339,7 +339,7 @@ lbl_8011A818: /* 8011A85C 001177BC 81 9F 00 00 */ lwz r12, 0(r31) /* 8011A860 001177C0 81 8C 00 78 */ lwz r12, 0x78(r12) /* 8011A864 001177C4 7D 89 03 A6 */ mtctr r12 -/* 8011A868 001177C8 4E 80 04 21 */ bctrl +/* 8011A868 001177C8 4E 80 04 21 */ bctrl /* 8011A86C 001177CC FC 40 08 18 */ frsp f2, f1 /* 8011A870 001177D0 C0 0D 8A 74 */ lfs f0, lbl_805A7634@sda21(r13) /* 8011A874 001177D4 D0 21 00 08 */ stfs f1, 8(r1) @@ -389,7 +389,7 @@ lbl_8011A88C: /* 8011A91C 0011787C 83 C1 00 B8 */ lwz r30, 0xb8(r1) /* 8011A920 00117880 7C 08 03 A6 */ mtlr r0 /* 8011A924 00117884 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 8011A928 00117888 4E 80 00 20 */ blr +/* 8011A928 00117888 4E 80 00 20 */ blr .global GetBoundingBox__13CPhysicsActorCFv GetBoundingBox__13CPhysicsActorCFv: @@ -429,16 +429,16 @@ GetBoundingBox__13CPhysicsActorCFv: /* 8011A9B0 00117910 80 01 00 24 */ lwz r0, 0x24(r1) /* 8011A9B4 00117914 7C 08 03 A6 */ mtlr r0 /* 8011A9B8 00117918 38 21 00 20 */ addi r1, r1, 0x20 -/* 8011A9BC 0011791C 4E 80 00 20 */ blr +/* 8011A9BC 0011791C 4E 80 00 20 */ blr .global GetBaseBoundingBox__13CPhysicsActorCFv GetBaseBoundingBox__13CPhysicsActorCFv: /* 8011A9C0 00117920 38 63 01 A4 */ addi r3, r3, 0x1a4 -/* 8011A9C4 00117924 4E 80 00 20 */ blr +/* 8011A9C4 00117924 4E 80 00 20 */ blr .global CollidedWith__13CPhysicsActorFRC9TUniqueIdRC18CCollisionInfoListR13CStateManager CollidedWith__13CPhysicsActorFRC9TUniqueIdRC18CCollisionInfoListR13CStateManager: -/* 8011A9C8 00117928 4E 80 00 20 */ blr +/* 8011A9C8 00117928 4E 80 00 20 */ blr .global GetPrimitiveTransform__13CPhysicsActorCFv GetPrimitiveTransform__13CPhysicsActorCFv: @@ -468,7 +468,7 @@ GetPrimitiveTransform__13CPhysicsActorCFv: /* 8011AA28 00117988 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8011AA2C 0011798C 7C 08 03 A6 */ mtlr r0 /* 8011AA30 00117990 38 21 00 30 */ addi r1, r1, 0x30 -/* 8011AA34 00117994 4E 80 00 20 */ blr +/* 8011AA34 00117994 4E 80 00 20 */ blr .global MoveCollisionPrimitive__13CPhysicsActorFRC9CVector3f MoveCollisionPrimitive__13CPhysicsActorFRC9CVector3f: @@ -478,12 +478,12 @@ MoveCollisionPrimitive__13CPhysicsActorFRC9CVector3f: /* 8011AA44 001179A4 D0 03 01 EC */ stfs f0, 0x1ec(r3) /* 8011AA48 001179A8 C0 04 00 08 */ lfs f0, 8(r4) /* 8011AA4C 001179AC D0 03 01 F0 */ stfs f0, 0x1f0(r3) -/* 8011AA50 001179B0 4E 80 00 20 */ blr +/* 8011AA50 001179B0 4E 80 00 20 */ blr .global GetCollisionPrimitive__13CPhysicsActorCFv GetCollisionPrimitive__13CPhysicsActorCFv: /* 8011AA54 001179B4 38 63 01 C0 */ addi r3, r3, 0x1c0 -/* 8011AA58 001179B8 4E 80 00 20 */ blr +/* 8011AA58 001179B8 4E 80 00 20 */ blr .global SetInertiaTensorScalar__13CPhysicsActorFf SetInertiaTensorScalar__13CPhysicsActorFf: @@ -499,7 +499,7 @@ lbl_8011AA70: /* 8011AA78 001179D8 C0 03 00 F0 */ lfs f0, 0xf0(r3) /* 8011AA7C 001179DC EC 01 00 24 */ fdivs f0, f1, f0 /* 8011AA80 001179E0 D0 03 00 F4 */ stfs f0, 0xf4(r3) -/* 8011AA84 001179E4 4E 80 00 20 */ blr +/* 8011AA84 001179E4 4E 80 00 20 */ blr .global SetMass__13CPhysicsActorFf SetMass__13CPhysicsActorFf: @@ -525,7 +525,7 @@ lbl_8011AAB8: /* 8011AACC 00117A2C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8011AAD0 00117A30 7C 08 03 A6 */ mtlr r0 /* 8011AAD4 00117A34 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011AAD8 00117A38 4E 80 00 20 */ blr +/* 8011AAD8 00117A38 4E 80 00 20 */ blr .global SetAngularVelocityOR__13CPhysicsActorFRC10CAxisAngle SetAngularVelocityOR__13CPhysicsActorFRC10CAxisAngle: @@ -578,7 +578,7 @@ SetAngularVelocityOR__13CPhysicsActorFRC10CAxisAngle: /* 8011AB94 00117AF4 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 8011AB98 00117AF8 7C 08 03 A6 */ mtlr r0 /* 8011AB9C 00117AFC 38 21 00 50 */ addi r1, r1, 0x50 -/* 8011ABA0 00117B00 4E 80 00 20 */ blr +/* 8011ABA0 00117B00 4E 80 00 20 */ blr .global GetAngularVelocityOR__13CPhysicsActorCFv GetAngularVelocityOR__13CPhysicsActorCFv: @@ -603,7 +603,7 @@ GetAngularVelocityOR__13CPhysicsActorCFv: /* 8011ABEC 00117B4C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8011ABF0 00117B50 7C 08 03 A6 */ mtlr r0 /* 8011ABF4 00117B54 38 21 00 20 */ addi r1, r1, 0x20 -/* 8011ABF8 00117B58 4E 80 00 20 */ blr +/* 8011ABF8 00117B58 4E 80 00 20 */ blr .global SetAngularVelocityWR__13CPhysicsActorFRC10CAxisAngle SetAngularVelocityWR__13CPhysicsActorFRC10CAxisAngle: @@ -647,7 +647,7 @@ SetAngularVelocityWR__13CPhysicsActorFRC10CAxisAngle: /* 8011AC90 00117BF0 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8011AC94 00117BF4 7C 08 03 A6 */ mtlr r0 /* 8011AC98 00117BF8 38 21 00 40 */ addi r1, r1, 0x40 -/* 8011AC9C 00117BFC 4E 80 00 20 */ blr +/* 8011AC9C 00117BFC 4E 80 00 20 */ blr .global SetVelocityWR__13CPhysicsActorFRC9CVector3f SetVelocityWR__13CPhysicsActorFRC9CVector3f: @@ -667,7 +667,7 @@ SetVelocityWR__13CPhysicsActorFRC9CVector3f: /* 8011ACD4 00117C34 D0 03 00 FC */ stfs f0, 0xfc(r3) /* 8011ACD8 00117C38 D0 43 01 00 */ stfs f2, 0x100(r3) /* 8011ACDC 00117C3C D0 23 01 04 */ stfs f1, 0x104(r3) -/* 8011ACE0 00117C40 4E 80 00 20 */ blr +/* 8011ACE0 00117C40 4E 80 00 20 */ blr .global GetTotalForceWR__13CPhysicsActorCFv GetTotalForceWR__13CPhysicsActorCFv: @@ -683,7 +683,7 @@ GetTotalForceWR__13CPhysicsActorCFv: /* 8011AD08 00117C68 EC 02 08 2A */ fadds f0, f2, f1 /* 8011AD0C 00117C6C D0 63 00 04 */ stfs f3, 4(r3) /* 8011AD10 00117C70 D0 03 00 08 */ stfs f0, 8(r3) -/* 8011AD14 00117C74 4E 80 00 20 */ blr +/* 8011AD14 00117C74 4E 80 00 20 */ blr .global SetVelocityOR__13CPhysicsActorFRC9CVector3f SetVelocityOR__13CPhysicsActorFRC9CVector3f: @@ -703,7 +703,7 @@ SetVelocityOR__13CPhysicsActorFRC9CVector3f: /* 8011AD4C 00117CAC 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8011AD50 00117CB0 7C 08 03 A6 */ mtlr r0 /* 8011AD54 00117CB4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8011AD58 00117CB8 4E 80 00 20 */ blr +/* 8011AD58 00117CB8 4E 80 00 20 */ blr .global RotateInOneFrameOR__13CPhysicsActorFRC11CQuaternionf RotateInOneFrameOR__13CPhysicsActorFRC11CQuaternionf: @@ -726,7 +726,7 @@ RotateInOneFrameOR__13CPhysicsActorFRC11CQuaternionf: /* 8011AD9C 00117CFC 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8011ADA0 00117D00 7C 08 03 A6 */ mtlr r0 /* 8011ADA4 00117D04 38 21 00 30 */ addi r1, r1, 0x30 -/* 8011ADA8 00117D08 4E 80 00 20 */ blr +/* 8011ADA8 00117D08 4E 80 00 20 */ blr .global MoveInOneFrameOR__13CPhysicsActorFRC9CVector3ff MoveInOneFrameOR__13CPhysicsActorFRC9CVector3ff: @@ -755,7 +755,7 @@ MoveInOneFrameOR__13CPhysicsActorFRC9CVector3ff: /* 8011AE04 00117D64 80 01 00 24 */ lwz r0, 0x24(r1) /* 8011AE08 00117D68 7C 08 03 A6 */ mtlr r0 /* 8011AE0C 00117D6C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8011AE10 00117D70 4E 80 00 20 */ blr +/* 8011AE10 00117D70 4E 80 00 20 */ blr .global RotateToOR__13CPhysicsActorFRC11CQuaternionf RotateToOR__13CPhysicsActorFRC11CQuaternionf: @@ -783,7 +783,7 @@ RotateToOR__13CPhysicsActorFRC11CQuaternionf: /* 8011AE68 00117DC8 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8011AE6C 00117DCC 7C 08 03 A6 */ mtlr r0 /* 8011AE70 00117DD0 38 21 00 30 */ addi r1, r1, 0x30 -/* 8011AE74 00117DD4 4E 80 00 20 */ blr +/* 8011AE74 00117DD4 4E 80 00 20 */ blr .global MoveToOR__13CPhysicsActorFRC9CVector3ff MoveToOR__13CPhysicsActorFRC9CVector3ff: @@ -808,7 +808,7 @@ MoveToOR__13CPhysicsActorFRC9CVector3ff: /* 8011AEC0 00117E20 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8011AEC4 00117E24 7C 08 03 A6 */ mtlr r0 /* 8011AEC8 00117E28 38 21 00 20 */ addi r1, r1, 0x20 -/* 8011AECC 00117E2C 4E 80 00 20 */ blr +/* 8011AECC 00117E2C 4E 80 00 20 */ blr .global GetRotateToORAngularMomentumWR__13CPhysicsActorCFRC11CQuaternionf GetRotateToORAngularMomentumWR__13CPhysicsActorCFRC11CQuaternionf: @@ -891,7 +891,7 @@ lbl_8011AFD4: /* 8011AFF8 00117F58 83 A1 00 34 */ lwz r29, 0x34(r1) /* 8011AFFC 00117F5C 7C 08 03 A6 */ mtlr r0 /* 8011B000 00117F60 38 21 00 70 */ addi r1, r1, 0x70 -/* 8011B004 00117F64 4E 80 00 20 */ blr +/* 8011B004 00117F64 4E 80 00 20 */ blr .global GetMoveToORImpulseWR__13CPhysicsActorCFRC9CVector3ff GetMoveToORImpulseWR__13CPhysicsActorCFRC9CVector3ff: @@ -930,7 +930,7 @@ GetMoveToORImpulseWR__13CPhysicsActorCFRC9CVector3ff: /* 8011B088 00117FE8 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8011B08C 00117FEC 7C 08 03 A6 */ mtlr r0 /* 8011B090 00117FF0 38 21 00 30 */ addi r1, r1, 0x30 -/* 8011B094 00117FF4 4E 80 00 20 */ blr +/* 8011B094 00117FF4 4E 80 00 20 */ blr .global MoveToInOneFrameWR__13CPhysicsActorFRC9CVector3ff MoveToInOneFrameWR__13CPhysicsActorFRC9CVector3ff: @@ -961,7 +961,7 @@ MoveToInOneFrameWR__13CPhysicsActorFRC9CVector3ff: /* 8011B0F8 00118058 C0 03 01 94 */ lfs f0, 0x194(r3) /* 8011B0FC 0011805C EC 00 08 2A */ fadds f0, f0, f1 /* 8011B100 00118060 D0 03 01 94 */ stfs f0, 0x194(r3) -/* 8011B104 00118064 4E 80 00 20 */ blr +/* 8011B104 00118064 4E 80 00 20 */ blr .global MoveToWR__13CPhysicsActorFRC9CVector3ff MoveToWR__13CPhysicsActorFRC9CVector3ff: @@ -993,7 +993,7 @@ MoveToWR__13CPhysicsActorFRC9CVector3ff: /* 8011B16C 001180CC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8011B170 001180D0 7C 08 03 A6 */ mtlr r0 /* 8011B174 001180D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011B178 001180D8 4E 80 00 20 */ blr +/* 8011B178 001180D8 4E 80 00 20 */ blr .global UseCollisionImpulses__13CPhysicsActorFv UseCollisionImpulses__13CPhysicsActorFv: @@ -1037,7 +1037,7 @@ UseCollisionImpulses__13CPhysicsActorFv: /* 8011B210 00118170 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8011B214 00118174 7C 08 03 A6 */ mtlr r0 /* 8011B218 00118178 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011B21C 0011817C 4E 80 00 20 */ blr +/* 8011B21C 0011817C 4E 80 00 20 */ blr .global ClearImpulses__13CPhysicsActorFv ClearImpulses__13CPhysicsActorFv: @@ -1077,7 +1077,7 @@ ClearImpulses__13CPhysicsActorFv: /* 8011B2A4 00118204 80 01 00 14 */ lwz r0, 0x14(r1) /* 8011B2A8 00118208 7C 08 03 A6 */ mtlr r0 /* 8011B2AC 0011820C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011B2B0 00118210 4E 80 00 20 */ blr +/* 8011B2B0 00118210 4E 80 00 20 */ blr .global ClearForcesAndTorques__13CPhysicsActorFv ClearForcesAndTorques__13CPhysicsActorFv: @@ -1129,7 +1129,7 @@ ClearForcesAndTorques__13CPhysicsActorFv: /* 8011B368 001182C8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8011B36C 001182CC 7C 08 03 A6 */ mtlr r0 /* 8011B370 001182D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011B374 001182D4 4E 80 00 20 */ blr +/* 8011B374 001182D4 4E 80 00 20 */ blr .global Stop__13CPhysicsActorFv Stop__13CPhysicsActorFv: @@ -1159,7 +1159,7 @@ Stop__13CPhysicsActorFv: /* 8011B3D4 00118334 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8011B3D8 00118338 7C 08 03 A6 */ mtlr r0 /* 8011B3DC 0011833C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011B3E0 00118340 4E 80 00 20 */ blr +/* 8011B3E0 00118340 4E 80 00 20 */ blr .global WillMove__13CPhysicsActorFRC13CStateManager WillMove__13CPhysicsActorFRC13CStateManager: @@ -1240,7 +1240,7 @@ lbl_8011B500: /* 8011B504 00118464 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8011B508 00118468 7C 08 03 A6 */ mtlr r0 /* 8011B50C 0011846C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8011B510 00118470 4E 80 00 20 */ blr +/* 8011B510 00118470 4E 80 00 20 */ blr .global AddMotionState__13CPhysicsActorFRC12CMotionState AddMotionState__13CPhysicsActorFRC12CMotionState: @@ -1331,7 +1331,7 @@ AddMotionState__13CPhysicsActorFRC12CMotionState: /* 8011B664 001185C4 83 C1 00 98 */ lwz r30, 0x98(r1) /* 8011B668 001185C8 7C 08 03 A6 */ mtlr r0 /* 8011B66C 001185CC 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8011B670 001185D0 4E 80 00 20 */ blr +/* 8011B670 001185D0 4E 80 00 20 */ blr .global GetMotionState__13CPhysicsActorCFv GetMotionState__13CPhysicsActorCFv: @@ -1379,7 +1379,7 @@ GetMotionState__13CPhysicsActorCFv: /* 8011B718 00118678 83 C1 00 28 */ lwz r30, 0x28(r1) /* 8011B71C 0011867C 7C 08 03 A6 */ mtlr r0 /* 8011B720 00118680 38 21 00 30 */ addi r1, r1, 0x30 -/* 8011B724 00118684 4E 80 00 20 */ blr +/* 8011B724 00118684 4E 80 00 20 */ blr .global SetMotionState__13CPhysicsActorFRC12CMotionState SetMotionState__13CPhysicsActorFRC12CMotionState: @@ -1438,7 +1438,7 @@ SetMotionState__13CPhysicsActorFRC12CMotionState: /* 8011B7F8 00118758 83 C1 00 58 */ lwz r30, 0x58(r1) /* 8011B7FC 0011875C 7C 08 03 A6 */ mtlr r0 /* 8011B800 00118760 38 21 00 60 */ addi r1, r1, 0x60 -/* 8011B804 00118764 4E 80 00 20 */ blr +/* 8011B804 00118764 4E 80 00 20 */ blr .global PredictMotion_Internal__13CPhysicsActorCFf PredictMotion_Internal__13CPhysicsActorCFf: @@ -1518,7 +1518,7 @@ lbl_8011B8EC: /* 8011B924 00118884 83 C1 00 78 */ lwz r30, 0x78(r1) /* 8011B928 00118888 7C 08 03 A6 */ mtlr r0 /* 8011B92C 0011888C 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 8011B930 00118890 4E 80 00 20 */ blr +/* 8011B930 00118890 4E 80 00 20 */ blr .global PredictLinearMotion__13CPhysicsActorCFf PredictLinearMotion__13CPhysicsActorCFf: @@ -1616,7 +1616,7 @@ PredictLinearMotion__13CPhysicsActorCFf: /* 8011BAA0 00118A00 83 C1 00 28 */ lwz r30, 0x28(r1) /* 8011BAA4 00118A04 7C 08 03 A6 */ mtlr r0 /* 8011BAA8 00118A08 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8011BAAC 00118A0C 4E 80 00 20 */ blr +/* 8011BAAC 00118A0C 4E 80 00 20 */ blr .global PredictAngularMotion__13CPhysicsActorCFf PredictAngularMotion__13CPhysicsActorCFf: @@ -1747,7 +1747,7 @@ PredictAngularMotion__13CPhysicsActorCFf: /* 8011BCA0 00118C00 83 A1 00 B4 */ lwz r29, 0xb4(r1) /* 8011BCA4 00118C04 7C 08 03 A6 */ mtlr r0 /* 8011BCA8 00118C08 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 8011BCAC 00118C0C 4E 80 00 20 */ blr +/* 8011BCAC 00118C0C 4E 80 00 20 */ blr .global PredictMotion__13CPhysicsActorCFf PredictMotion__13CPhysicsActorCFf: @@ -1820,7 +1820,7 @@ PredictMotion__13CPhysicsActorCFf: /* 8011BDB8 00118D18 83 C1 00 78 */ lwz r30, 0x78(r1) /* 8011BDBC 00118D1C 7C 08 03 A6 */ mtlr r0 /* 8011BDC0 00118D20 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 8011BDC4 00118D24 4E 80 00 20 */ blr +/* 8011BDC4 00118D24 4E 80 00 20 */ blr .global CalculateNewVelocityWR_UsingImpulses__13CPhysicsActorCFv CalculateNewVelocityWR_UsingImpulses__13CPhysicsActorCFv: @@ -1846,7 +1846,7 @@ CalculateNewVelocityWR_UsingImpulses__13CPhysicsActorCFv: /* 8011BE14 00118D74 EC 03 08 2A */ fadds f0, f3, f1 /* 8011BE18 00118D78 D0 43 00 04 */ stfs f2, 4(r3) /* 8011BE1C 00118D7C D0 03 00 08 */ stfs f0, 8(r3) -/* 8011BE20 00118D80 4E 80 00 20 */ blr +/* 8011BE20 00118D80 4E 80 00 20 */ blr .global SetPhysicsState__13CPhysicsActorFRC13CPhysicsState SetPhysicsState__13CPhysicsActorFRC13CPhysicsState: @@ -1963,7 +1963,7 @@ SetPhysicsState__13CPhysicsActorFRC13CPhysicsState: /* 8011BFDC 00118F3C 83 C1 00 88 */ lwz r30, 0x88(r1) /* 8011BFE0 00118F40 7C 08 03 A6 */ mtlr r0 /* 8011BFE4 00118F44 38 21 00 90 */ addi r1, r1, 0x90 -/* 8011BFE8 00118F48 4E 80 00 20 */ blr +/* 8011BFE8 00118F48 4E 80 00 20 */ blr .global GetPhysicsState__13CPhysicsActorCFv GetPhysicsState__13CPhysicsActorCFv: @@ -2001,7 +2001,7 @@ GetPhysicsState__13CPhysicsActorCFv: /* 8011C068 00118FC8 83 C1 00 38 */ lwz r30, 0x38(r1) /* 8011C06C 00118FCC 7C 08 03 A6 */ mtlr r0 /* 8011C070 00118FD0 38 21 00 40 */ addi r1, r1, 0x40 -/* 8011C074 00118FD4 4E 80 00 20 */ blr +/* 8011C074 00118FD4 4E 80 00 20 */ blr .global ComputeDerivedQuantities__13CPhysicsActorFv ComputeDerivedQuantities__13CPhysicsActorFv: @@ -2055,7 +2055,7 @@ ComputeDerivedQuantities__13CPhysicsActorFv: /* 8011C134 00119094 83 E1 00 4C */ lwz r31, 0x4c(r1) /* 8011C138 00119098 7C 08 03 A6 */ mtlr r0 /* 8011C13C 0011909C 38 21 00 60 */ addi r1, r1, 0x60 -/* 8011C140 001190A0 4E 80 00 20 */ blr +/* 8011C140 001190A0 4E 80 00 20 */ blr .global ApplyForceOR__13CPhysicsActorFRC9CVector3fRC10CAxisAngle ApplyForceOR__13CPhysicsActorFRC9CVector3fRC10CAxisAngle: @@ -2106,7 +2106,7 @@ ApplyForceOR__13CPhysicsActorFRC9CVector3fRC10CAxisAngle: /* 8011C1F4 00119154 80 01 00 44 */ lwz r0, 0x44(r1) /* 8011C1F8 00119158 7C 08 03 A6 */ mtlr r0 /* 8011C1FC 0011915C 38 21 00 40 */ addi r1, r1, 0x40 -/* 8011C200 00119160 4E 80 00 20 */ blr +/* 8011C200 00119160 4E 80 00 20 */ blr .global ApplyImpulseOR__13CPhysicsActorFRC9CVector3fRC10CAxisAngle ApplyImpulseOR__13CPhysicsActorFRC9CVector3fRC10CAxisAngle: @@ -2157,7 +2157,7 @@ ApplyImpulseOR__13CPhysicsActorFRC9CVector3fRC10CAxisAngle: /* 8011C2B4 00119214 80 01 00 44 */ lwz r0, 0x44(r1) /* 8011C2B8 00119218 7C 08 03 A6 */ mtlr r0 /* 8011C2BC 0011921C 38 21 00 40 */ addi r1, r1, 0x40 -/* 8011C2C0 00119220 4E 80 00 20 */ blr +/* 8011C2C0 00119220 4E 80 00 20 */ blr .global ApplyForceWR__13CPhysicsActorFRC9CVector3fRC10CAxisAngle ApplyForceWR__13CPhysicsActorFRC9CVector3fRC10CAxisAngle: @@ -2191,7 +2191,7 @@ ApplyForceWR__13CPhysicsActorFRC9CVector3fRC10CAxisAngle: /* 8011C330 00119290 80 01 00 24 */ lwz r0, 0x24(r1) /* 8011C334 00119294 7C 08 03 A6 */ mtlr r0 /* 8011C338 00119298 38 21 00 20 */ addi r1, r1, 0x20 -/* 8011C33C 0011929C 4E 80 00 20 */ blr +/* 8011C33C 0011929C 4E 80 00 20 */ blr .global ApplyTorqueWR__13CPhysicsActorFRC9CVector3f ApplyTorqueWR__13CPhysicsActorFRC9CVector3f: @@ -2216,7 +2216,7 @@ ApplyTorqueWR__13CPhysicsActorFRC9CVector3f: /* 8011C388 001192E8 80 01 00 34 */ lwz r0, 0x34(r1) /* 8011C38C 001192EC 7C 08 03 A6 */ mtlr r0 /* 8011C390 001192F0 38 21 00 30 */ addi r1, r1, 0x30 -/* 8011C394 001192F4 4E 80 00 20 */ blr +/* 8011C394 001192F4 4E 80 00 20 */ blr .global ApplyImpulseWR__13CPhysicsActorFRC9CVector3fRC10CAxisAngle ApplyImpulseWR__13CPhysicsActorFRC9CVector3fRC10CAxisAngle: @@ -2250,7 +2250,7 @@ ApplyImpulseWR__13CPhysicsActorFRC9CVector3fRC10CAxisAngle: /* 8011C404 00119364 80 01 00 24 */ lwz r0, 0x24(r1) /* 8011C408 00119368 7C 08 03 A6 */ mtlr r0 /* 8011C40C 0011936C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8011C410 00119370 4E 80 00 20 */ blr +/* 8011C410 00119370 4E 80 00 20 */ blr .global __dt__13CPhysicsActorFv __dt__13CPhysicsActorFv: @@ -2295,7 +2295,7 @@ lbl_8011C494: /* 8011C4A0 00119400 83 C1 00 08 */ lwz r30, 8(r1) /* 8011C4A4 00119404 7C 08 03 A6 */ mtlr r0 /* 8011C4A8 00119408 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011C4AC 0011940C 4E 80 00 20 */ blr +/* 8011C4AC 0011940C 4E 80 00 20 */ blr .global "__ct__13CPhysicsActorF9TUniqueIdbRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC13CMaterialListRC6CAABoxRC10SMoverDataRC16CActorParametersff" "__ct__13CPhysicsActorF9TUniqueIdbRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC13CMaterialListRC6CAABoxRC10SMoverDataRC16CActorParametersff": @@ -2524,4 +2524,4 @@ lbl_8011C548: /* 8011C820 00119780 80 01 00 94 */ lwz r0, 0x94(r1) /* 8011C824 00119784 7C 08 03 A6 */ mtlr r0 /* 8011C828 00119788 38 21 00 90 */ addi r1, r1, 0x90 -/* 8011C82C 0011978C 4E 80 00 20 */ blr +/* 8011C82C 0011978C 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/CPlayMovie.s b/asm/MetroidPrime/CPlayMovie.s index 47374897..92ad9709 100644 --- a/asm/MetroidPrime/CPlayMovie.s +++ b/asm/MetroidPrime/CPlayMovie.s @@ -169,7 +169,7 @@ lbl_80025558: /* 8002556C 000224CC 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80025570 000224D0 7C 08 03 A6 */ mtlr r0 /* 80025574 000224D4 38 21 00 40 */ addi r1, r1, 0x40 -/* 80025578 000224D8 4E 80 00 20 */ blr +/* 80025578 000224D8 4E 80 00 20 */ blr .global sub_8002557c sub_8002557c: @@ -196,7 +196,7 @@ sub_8002557c: /* 800255CC 0002252C C0 42 83 24 */ lfs f2, lbl_805AA044@sda21(r2) /* 800255D0 00022530 81 8C 00 54 */ lwz r12, 0x54(r12) /* 800255D4 00022534 7D 89 03 A6 */ mtctr r12 -/* 800255D8 00022538 4E 80 04 21 */ bctrl +/* 800255D8 00022538 4E 80 04 21 */ bctrl /* 800255DC 0002253C C0 21 00 20 */ lfs f1, 0x20(r1) /* 800255E0 00022540 3F E0 43 30 */ lis r31, 0x4330 /* 800255E4 00022544 C0 01 00 18 */ lfs f0, 0x18(r1) @@ -276,7 +276,7 @@ lbl_800256AC: /* 80025700 00022660 83 A1 00 44 */ lwz r29, 0x44(r1) /* 80025704 00022664 7C 08 03 A6 */ mtlr r0 /* 80025708 00022668 38 21 00 90 */ addi r1, r1, 0x90 -/* 8002570C 0002266C 4E 80 00 20 */ blr +/* 8002570C 0002266C 4E 80 00 20 */ blr .global Draw__8CCreditsCFv Draw__8CCreditsCFv: @@ -296,7 +296,7 @@ lbl_8002573C: /* 80025740 000226A0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80025744 000226A4 7C 08 03 A6 */ mtlr r0 /* 80025748 000226A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8002574C 000226AC 4E 80 00 20 */ blr +/* 8002574C 000226AC 4E 80 00 20 */ blr .global sub_80025750 sub_80025750: @@ -355,7 +355,7 @@ lbl_80025804: /* 8002580C 0002276C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80025810 00022770 7C 08 03 A6 */ mtlr r0 /* 80025814 00022774 38 21 00 20 */ addi r1, r1, 0x20 -/* 80025818 00022778 4E 80 00 20 */ blr +/* 80025818 00022778 4E 80 00 20 */ blr .global Update__8CCreditsFfR18CArchitectureQueue Update__8CCreditsFfR18CArchitectureQueue: @@ -425,7 +425,7 @@ lbl_800258E0: /* 80025904 00022864 80 84 02 E0 */ lwz r4, 0x2e0(r4) /* 80025908 00022868 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 8002590C 0002286C 7D 89 03 A6 */ mtctr r12 -/* 80025910 00022870 4E 80 04 21 */ bctrl +/* 80025910 00022870 4E 80 04 21 */ bctrl /* 80025914 00022874 82 AD A1 38 */ lwz r21, gpTweakGui@sda21(r13) /* 80025918 00022878 7C 77 1B 78 */ mr r23, r3 /* 8002591C 0002287C 48 32 46 91 */ bl White__6CColorFv @@ -847,7 +847,7 @@ lbl_80025EF4: /* 80025F10 00022E70 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 80025F14 00022E74 7C 08 03 A6 */ mtlr r0 /* 80025F18 00022E78 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 80025F1C 00022E7C 4E 80 00 20 */ blr +/* 80025F1C 00022E7C 4E 80 00 20 */ blr .global sub_80025f20 sub_80025f20: @@ -860,7 +860,7 @@ sub_80025f20: /* 80025F38 00022E98 80 01 00 14 */ lwz r0, 0x14(r1) /* 80025F3C 00022E9C 7C 08 03 A6 */ mtlr r0 /* 80025F40 00022EA0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80025F44 00022EA4 4E 80 00 20 */ blr +/* 80025F44 00022EA4 4E 80 00 20 */ blr .global sub_80025f48 sub_80025f48: @@ -918,7 +918,7 @@ lbl_80025FDC: /* 80026008 00022F68 83 81 00 10 */ lwz r28, 0x10(r1) /* 8002600C 00022F6C 7C 08 03 A6 */ mtlr r0 /* 80026010 00022F70 38 21 00 20 */ addi r1, r1, 0x20 -/* 80026014 00022F74 4E 80 00 20 */ blr +/* 80026014 00022F74 4E 80 00 20 */ blr .global OnMessage__8CCreditsFRC20CArchitectureMessageR18CArchitectureQueue OnMessage__8CCreditsFRC20CArchitectureMessageR18CArchitectureQueue: @@ -1047,7 +1047,7 @@ lbl_800261E4: /* 800261EC 0002314C 83 C1 00 78 */ lwz r30, 0x78(r1) /* 800261F0 00023150 7C 08 03 A6 */ mtlr r0 /* 800261F4 00023154 38 21 00 80 */ addi r1, r1, 0x80 -/* 800261F8 00023158 4E 80 00 20 */ blr +/* 800261F8 00023158 4E 80 00 20 */ blr .global __dt__8CCreditsFv __dt__8CCreditsFv: @@ -1103,7 +1103,7 @@ lbl_800262A0: /* 800262AC 0002320C 83 C1 00 08 */ lwz r30, 8(r1) /* 800262B0 00023210 7C 08 03 A6 */ mtlr r0 /* 800262B4 00023214 38 21 00 10 */ addi r1, r1, 0x10 -/* 800262B8 00023218 4E 80 00 20 */ blr +/* 800262B8 00023218 4E 80 00 20 */ blr .global __ct__8CCreditsFv __ct__8CCreditsFv: @@ -1134,7 +1134,7 @@ __ct__8CCreditsFv: /* 8002631C 0002327C 80 A5 02 D0 */ lwz r5, 0x2d0(r5) /* 80026320 00023280 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80026324 00023284 7D 89 03 A6 */ mtctr r12 -/* 80026328 00023288 4E 80 04 21 */ bctrl +/* 80026328 00023288 4E 80 04 21 */ bctrl /* 8002632C 0002328C 38 7F 00 18 */ addi r3, r31, 0x18 /* 80026330 00023290 38 81 00 10 */ addi r4, r1, 0x10 /* 80026334 00023294 48 31 AB 75 */ bl __ct__6CTokenFRC6CToken @@ -1148,7 +1148,7 @@ __ct__8CCreditsFv: /* 80026354 000232B4 80 A5 02 F0 */ lwz r5, 0x2f0(r5) /* 80026358 000232B8 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8002635C 000232BC 7D 89 03 A6 */ mtctr r12 -/* 80026360 000232C0 4E 80 04 21 */ bctrl +/* 80026360 000232C0 4E 80 04 21 */ bctrl /* 80026364 000232C4 38 7F 00 20 */ addi r3, r31, 0x20 /* 80026368 000232C8 38 81 00 08 */ addi r4, r1, 8 /* 8002636C 000232CC 48 31 AB 3D */ bl __ct__6CTokenFRC6CToken @@ -1198,7 +1198,7 @@ __ct__8CCreditsFv: /* 8002641C 0002337C 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 80026420 00023380 7C 08 03 A6 */ mtlr r0 /* 80026424 00023384 38 21 00 30 */ addi r1, r1, 0x30 -/* 80026428 00023388 4E 80 00 20 */ blr +/* 80026428 00023388 4E 80 00 20 */ blr .global sub_8002642c sub_8002642c: @@ -1210,11 +1210,11 @@ sub_8002642c: /* 80026440 000233A0 7C 83 02 14 */ add r4, r3, r0 /* 80026444 000233A4 80 04 00 24 */ lwz r0, 0x24(r4) /* 80026448 000233A8 90 03 00 38 */ stw r0, 0x38(r3) -/* 8002644C 000233AC 4E 80 00 20 */ blr +/* 8002644C 000233AC 4E 80 00 20 */ blr lbl_80026450: /* 80026450 000233B0 38 00 00 00 */ li r0, 0 /* 80026454 000233B4 90 03 00 38 */ stw r0, 0x38(r3) -/* 80026458 000233B8 4E 80 00 20 */ blr +/* 80026458 000233B8 4E 80 00 20 */ blr .global sub_8002645c sub_8002645c: @@ -1251,7 +1251,7 @@ lbl_800264CC: /* 800264D0 00023430 38 60 00 01 */ li r3, 1 /* 800264D4 00023434 7C 08 03 A6 */ mtlr r0 /* 800264D8 00023438 38 21 00 10 */ addi r1, r1, 0x10 -/* 800264DC 0002343C 4E 80 00 20 */ blr +/* 800264DC 0002343C 4E 80 00 20 */ blr .global sub_800264e0 sub_800264e0: @@ -1428,7 +1428,7 @@ lbl_80026740: /* 80026760 000236C0 83 C1 00 38 */ lwz r30, 0x38(r1) /* 80026764 000236C4 7C 08 03 A6 */ mtlr r0 /* 80026768 000236C8 38 21 00 70 */ addi r1, r1, 0x70 -/* 8002676C 000236CC 4E 80 00 20 */ blr +/* 8002676C 000236CC 4E 80 00 20 */ blr .global sub_80026770 sub_80026770: @@ -1547,7 +1547,7 @@ lbl_8002690C: /* 8002691C 0002387C 83 C1 00 48 */ lwz r30, 0x48(r1) /* 80026920 00023880 7C 08 03 A6 */ mtlr r0 /* 80026924 00023884 38 21 00 60 */ addi r1, r1, 0x60 -/* 80026928 00023888 4E 80 00 20 */ blr +/* 80026928 00023888 4E 80 00 20 */ blr .global sub_8002692c sub_8002692c: @@ -1562,7 +1562,7 @@ lbl_80026948: /* 80026948 000238A8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8002694C 000238AC 7C 08 03 A6 */ mtlr r0 /* 80026950 000238B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80026954 000238B4 4E 80 00 20 */ blr +/* 80026954 000238B4 4E 80 00 20 */ blr .global Draw__10CPlayMovieCFv Draw__10CPlayMovieCFv: @@ -1591,7 +1591,7 @@ lbl_800269A4: /* 800269A8 00023908 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800269AC 0002390C 7C 08 03 A6 */ mtlr r0 /* 800269B0 00023910 38 21 00 10 */ addi r1, r1, 0x10 -/* 800269B4 00023914 4E 80 00 20 */ blr +/* 800269B4 00023914 4E 80 00 20 */ blr .global OnMessage__10CPlayMovieFRC20CArchitectureMessageR18CArchitectureQueue OnMessage__10CPlayMovieFRC20CArchitectureMessageR18CArchitectureQueue: @@ -1654,7 +1654,7 @@ lbl_80026A68: /* 80026A84 000239E4 83 C5 00 0C */ lwz r30, 0xc(r5) /* 80026A88 000239E8 80 84 03 24 */ lwz r4, 0x324(r4) /* 80026A8C 000239EC 7D 89 03 A6 */ mtctr r12 -/* 80026A90 000239F0 4E 80 04 21 */ bctrl +/* 80026A90 000239F0 4E 80 04 21 */ bctrl /* 80026A94 000239F4 3C 80 80 3D */ lis r4, lbl_803CCB50@ha /* 80026A98 000239F8 7C 7C 1B 78 */ mr r28, r3 /* 80026A9C 000239FC 38 84 CB 50 */ addi r4, r4, lbl_803CCB50@l @@ -1718,7 +1718,7 @@ lbl_80026B10: /* 80026B80 00023AE0 80 84 03 34 */ lwz r4, 0x334(r4) /* 80026B84 00023AE4 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80026B88 00023AE8 7D 89 03 A6 */ mtctr r12 -/* 80026B8C 00023AEC 4E 80 04 21 */ bctrl +/* 80026B8C 00023AEC 4E 80 04 21 */ bctrl /* 80026B90 00023AF0 3C 80 80 3D */ lis r4, lbl_803CCB50@ha /* 80026B94 00023AF4 7C 7C 1B 78 */ mr r28, r3 /* 80026B98 00023AF8 38 84 CB 50 */ addi r4, r4, lbl_803CCB50@l @@ -2407,7 +2407,7 @@ lbl_8002757C: /* 80027590 000244F0 80 01 01 F4 */ lwz r0, 0x1f4(r1) /* 80027594 000244F4 7C 08 03 A6 */ mtlr r0 /* 80027598 000244F8 38 21 01 F0 */ addi r1, r1, 0x1f0 -/* 8002759C 000244FC 4E 80 00 20 */ blr +/* 8002759C 000244FC 4E 80 00 20 */ blr .global IsGameWon__10CPlayMovieF11EWhichMovie IsGameWon__10CPlayMovieF11EWhichMovie: @@ -2422,11 +2422,11 @@ IsGameWon__10CPlayMovieF11EWhichMovie: /* 800275C0 00024520 38 C0 00 00 */ li r6, 0 lbl_800275C4: /* 800275C4 00024524 54 C0 06 3F */ clrlwi. r0, r6, 0x18 -/* 800275C8 00024528 4C 82 00 20 */ bnelr +/* 800275C8 00024528 4C 82 00 20 */ bnelr /* 800275CC 0002452C 2C 04 00 02 */ cmpwi r4, 2 -/* 800275D0 00024530 4D 82 00 20 */ beqlr +/* 800275D0 00024530 4D 82 00 20 */ beqlr /* 800275D4 00024534 38 60 00 00 */ li r3, 0 -/* 800275D8 00024538 4E 80 00 20 */ blr +/* 800275D8 00024538 4E 80 00 20 */ blr .global __dt__10CPlayMovieFv __dt__10CPlayMovieFv: @@ -2541,7 +2541,7 @@ lbl_80027740: /* 80027754 000246B4 83 81 00 10 */ lwz r28, 0x10(r1) /* 80027758 000246B8 7C 08 03 A6 */ mtlr r0 /* 8002775C 000246BC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80027760 000246C0 4E 80 00 20 */ blr +/* 80027760 000246C0 4E 80 00 20 */ blr .global __ct__10CPlayMovieFQ210CPlayMovie11EWhichMovie __ct__10CPlayMovieFQ210CPlayMovie11EWhichMovie: @@ -2592,7 +2592,7 @@ __ct__10CPlayMovieFQ210CPlayMovie11EWhichMovie: /* 80027814 00024774 38 80 00 01 */ li r4, 1 /* 80027818 00024778 81 8C 00 08 */ lwz r12, 8(r12) /* 8002781C 0002477C 7D 89 03 A6 */ mtctr r12 -/* 80027820 00024780 4E 80 04 21 */ bctrl +/* 80027820 00024780 4E 80 04 21 */ bctrl lbl_80027824: /* 80027824 00024784 3B 1F 00 50 */ addi r24, r31, 0x50 /* 80027828 00024788 38 61 00 08 */ addi r3, r1, 8 @@ -2613,7 +2613,7 @@ lbl_80027824: /* 80027864 000247C4 38 80 00 01 */ li r4, 1 /* 80027868 000247C8 81 8C 00 08 */ lwz r12, 8(r12) /* 8002786C 000247CC 7D 89 03 A6 */ mtctr r12 -/* 80027870 000247D0 4E 80 04 21 */ bctrl +/* 80027870 000247D0 4E 80 04 21 */ bctrl lbl_80027874: /* 80027874 000247D4 38 A0 00 00 */ li r5, 0 /* 80027878 000247D8 C0 22 83 2C */ lfs f1, lbl_805AA04C@sda21(r2) @@ -2698,7 +2698,7 @@ lbl_8002797C: /* 800279A0 00024900 80 A5 03 14 */ lwz r5, 0x314(r5) /* 800279A4 00024904 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800279A8 00024908 7D 89 03 A6 */ mtctr r12 -/* 800279AC 0002490C 4E 80 04 21 */ bctrl +/* 800279AC 0002490C 4E 80 04 21 */ bctrl /* 800279B0 00024910 38 61 00 38 */ addi r3, r1, 0x38 /* 800279B4 00024914 38 81 00 40 */ addi r4, r1, 0x40 /* 800279B8 00024918 48 31 94 F1 */ bl __ct__6CTokenFRC6CToken @@ -2720,7 +2720,7 @@ lbl_8002797C: /* 800279F8 00024958 80 A5 03 24 */ lwz r5, 0x324(r5) /* 800279FC 0002495C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80027A00 00024960 7D 89 03 A6 */ mtctr r12 -/* 80027A04 00024964 4E 80 04 21 */ bctrl +/* 80027A04 00024964 4E 80 04 21 */ bctrl /* 80027A08 00024968 38 61 00 28 */ addi r3, r1, 0x28 /* 80027A0C 0002496C 38 81 00 30 */ addi r4, r1, 0x30 /* 80027A10 00024970 48 31 94 99 */ bl __ct__6CTokenFRC6CToken @@ -2866,7 +2866,7 @@ lbl_80027C08: /* 80027C10 00024B70 80 01 00 84 */ lwz r0, 0x84(r1) /* 80027C14 00024B74 7C 08 03 A6 */ mtlr r0 /* 80027C18 00024B78 38 21 00 80 */ addi r1, r1, 0x80 -/* 80027C1C 00024B7C 4E 80 00 20 */ blr +/* 80027C1C 00024B7C 4E 80 00 20 */ blr .global sub_80027c20 sub_80027c20: @@ -2916,7 +2916,7 @@ lbl_80027CAC: /* 80027CBC 00024C1C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80027CC0 00024C20 7C 08 03 A6 */ mtlr r0 /* 80027CC4 00024C24 38 21 00 20 */ addi r1, r1, 0x20 -/* 80027CC8 00024C28 4E 80 00 20 */ blr +/* 80027CC8 00024C28 4E 80 00 20 */ blr .global sub_80027ccc sub_80027ccc: @@ -2956,7 +2956,7 @@ lbl_80027D30: /* 80027D4C 00024CAC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80027D50 00024CB0 7C 08 03 A6 */ mtlr r0 /* 80027D54 00024CB4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80027D58 00024CB8 4E 80 00 20 */ blr +/* 80027D58 00024CB8 4E 80 00 20 */ blr .global sub_80027d5c sub_80027d5c: @@ -2982,7 +2982,7 @@ lbl_80027D98: /* 80027DA4 00024D04 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80027DA8 00024D08 7C 08 03 A6 */ mtlr r0 /* 80027DAC 00024D0C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80027DB0 00024D10 4E 80 00 20 */ blr +/* 80027DB0 00024D10 4E 80 00 20 */ blr .global sub_80027db4 sub_80027db4: @@ -3009,7 +3009,7 @@ lbl_80027DFC: /* 80027E00 00024D60 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80027E04 00024D64 7C 08 03 A6 */ mtlr r0 /* 80027E08 00024D68 38 21 00 20 */ addi r1, r1, 0x20 -/* 80027E0C 00024D6C 4E 80 00 20 */ blr +/* 80027E0C 00024D6C 4E 80 00 20 */ blr .global sub_80027e10 sub_80027e10: @@ -3030,7 +3030,7 @@ sub_80027e10: /* 80027E48 00024DA8 C0 42 83 24 */ lfs f2, lbl_805AA044@sda21(r2) /* 80027E4C 00024DAC 81 8C 00 54 */ lwz r12, 0x54(r12) /* 80027E50 00024DB0 7D 89 03 A6 */ mtctr r12 -/* 80027E54 00024DB4 4E 80 04 21 */ bctrl +/* 80027E54 00024DB4 4E 80 04 21 */ bctrl /* 80027E58 00024DB8 7F E4 FB 78 */ mr r4, r31 /* 80027E5C 00024DBC 38 61 00 18 */ addi r3, r1, 0x18 /* 80027E60 00024DC0 48 2E B2 E1 */ bl Translate__12CTransform4fFRC9CVector3f @@ -3039,19 +3039,19 @@ sub_80027e10: /* 80027E6C 00024DCC 81 83 00 00 */ lwz r12, 0(r3) /* 80027E70 00024DD0 81 8C 00 30 */ lwz r12, 0x30(r12) /* 80027E74 00024DD4 7D 89 03 A6 */ mtctr r12 -/* 80027E78 00024DD8 4E 80 04 21 */ bctrl +/* 80027E78 00024DD8 4E 80 04 21 */ bctrl /* 80027E7C 00024DDC 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 80027E80 00024DE0 38 80 00 00 */ li r4, 0 /* 80027E84 00024DE4 38 A0 00 00 */ li r5, 0 /* 80027E88 00024DE8 81 83 00 00 */ lwz r12, 0(r3) /* 80027E8C 00024DEC 81 8C 00 60 */ lwz r12, 0x60(r12) /* 80027E90 00024DF0 7D 89 03 A6 */ mtctr r12 -/* 80027E94 00024DF4 4E 80 04 21 */ bctrl +/* 80027E94 00024DF4 4E 80 04 21 */ bctrl /* 80027E98 00024DF8 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 80027E9C 00024DFC 81 83 00 00 */ lwz r12, 0(r3) /* 80027EA0 00024E00 81 8C 00 64 */ lwz r12, 0x64(r12) /* 80027EA4 00024E04 7D 89 03 A6 */ mtctr r12 -/* 80027EA8 00024E08 4E 80 04 21 */ bctrl +/* 80027EA8 00024E08 4E 80 04 21 */ bctrl /* 80027EAC 00024E0C 7F C3 F3 78 */ mr r3, r30 /* 80027EB0 00024E10 48 2A 16 95 */ bl Render__15CGuiTextSupportFv /* 80027EB4 00024E14 80 01 00 54 */ lwz r0, 0x54(r1) @@ -3059,7 +3059,7 @@ sub_80027e10: /* 80027EBC 00024E1C 83 C1 00 48 */ lwz r30, 0x48(r1) /* 80027EC0 00024E20 7C 08 03 A6 */ mtlr r0 /* 80027EC4 00024E24 38 21 00 50 */ addi r1, r1, 0x50 -/* 80027EC8 00024E28 4E 80 00 20 */ blr +/* 80027EC8 00024E28 4E 80 00 20 */ blr .global sub_80027ecc sub_80027ecc: @@ -3093,7 +3093,7 @@ lbl_80027F30: /* 80027F34 00024E94 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80027F38 00024E98 7C 08 03 A6 */ mtlr r0 /* 80027F3C 00024E9C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80027F40 00024EA0 4E 80 00 20 */ blr +/* 80027F40 00024EA0 4E 80 00 20 */ blr .global sub_80027f44 sub_80027f44: @@ -3114,7 +3114,7 @@ lbl_80027F6C: /* 80027F78 00024ED8 81 83 00 00 */ lwz r12, 0(r3) /* 80027F7C 00024EDC 81 8C 00 60 */ lwz r12, 0x60(r12) /* 80027F80 00024EE0 7D 89 03 A6 */ mtctr r12 -/* 80027F84 00024EE4 4E 80 04 21 */ bctrl +/* 80027F84 00024EE4 4E 80 04 21 */ bctrl /* 80027F88 00024EE8 80 8D A0 68 */ lwz r4, gpRender@sda21(r13) /* 80027F8C 00024EEC 38 61 00 08 */ addi r3, r1, 8 /* 80027F90 00024EF0 C0 22 83 20 */ lfs f1, lbl_805AA040@sda21(r2) @@ -3123,7 +3123,7 @@ lbl_80027F6C: /* 80027F9C 00024EFC C0 42 83 24 */ lfs f2, lbl_805AA044@sda21(r2) /* 80027FA0 00024F00 81 8C 00 54 */ lwz r12, 0x54(r12) /* 80027FA4 00024F04 7D 89 03 A6 */ mtctr r12 -/* 80027FA8 00024F08 4E 80 04 21 */ bctrl +/* 80027FA8 00024F08 4E 80 04 21 */ bctrl /* 80027FAC 00024F0C 3C 80 80 3F */ lis r4, lbl_803F0004@ha /* 80027FB0 00024F10 87 A4 D9 10 */ lwzu r29, -0x26f0(r4) /* 80027FB4 00024F14 7F E3 FB 78 */ mr r3, r31 @@ -3207,17 +3207,17 @@ lbl_800280E4: /* 800280E8 00025048 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 800280EC 0002504C 7C 08 03 A6 */ mtlr r0 /* 800280F0 00025050 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 800280F4 00025054 4E 80 00 20 */ blr +/* 800280F4 00025054 4E 80 00 20 */ blr .global GetIsContinueDraw__8CCreditsCFv GetIsContinueDraw__8CCreditsCFv: /* 800280F8 00025058 38 60 00 00 */ li r3, 0 -/* 800280FC 0002505C 4E 80 00 20 */ blr +/* 800280FC 0002505C 4E 80 00 20 */ blr .global GetIsContinueDraw__10CPlayMovieCFv GetIsContinueDraw__10CPlayMovieCFv: /* 80028100 00025060 38 60 00 00 */ li r3, 0 -/* 80028104 00025064 4E 80 00 20 */ blr +/* 80028104 00025064 4E 80 00 20 */ blr .global sub_80028108 sub_80028108: @@ -3244,7 +3244,7 @@ lbl_80028150: /* 80028154 000250B4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80028158 000250B8 7C 08 03 A6 */ mtlr r0 /* 8002815C 000250BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80028160 000250C0 4E 80 00 20 */ blr +/* 80028160 000250C0 4E 80 00 20 */ blr .global sub_80028164 sub_80028164: diff --git a/asm/MetroidPrime/CPreFrontEnd.s b/asm/MetroidPrime/CPreFrontEnd.s index 1c194e41..20a36567 100644 --- a/asm/MetroidPrime/CPreFrontEnd.s +++ b/asm/MetroidPrime/CPreFrontEnd.s @@ -42,7 +42,7 @@ lbl_8029E4E8: /* 8029E4F4 0029B454 83 C1 00 08 */ lwz r30, 8(r1) /* 8029E4F8 0029B458 7C 08 03 A6 */ mtlr r0 /* 8029E4FC 0029B45C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8029E500 0029B460 4E 80 00 20 */ blr +/* 8029E500 0029B460 4E 80 00 20 */ blr .global Draw__12CPreFrontEndCFv Draw__12CPreFrontEndCFv: @@ -54,7 +54,7 @@ Draw__12CPreFrontEndCFv: /* 8029E518 0029B478 80 01 00 14 */ lwz r0, 0x14(r1) /* 8029E51C 0029B47C 7C 08 03 A6 */ mtlr r0 /* 8029E520 0029B480 38 21 00 10 */ addi r1, r1, 0x10 -/* 8029E524 0029B484 4E 80 00 20 */ blr +/* 8029E524 0029B484 4E 80 00 20 */ blr .global OnIOWinMessage__12CPreFrontEndFRC20CArchitectureMessage OnIOWinMessage__12CPreFrontEndFRC20CArchitectureMessage: @@ -108,7 +108,7 @@ lbl_8029E5CC: /* 8029E5D0 0029B530 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8029E5D4 0029B534 7C 08 03 A6 */ mtlr r0 /* 8029E5D8 0029B538 38 21 00 10 */ addi r1, r1, 0x10 -/* 8029E5DC 0029B53C 4E 80 00 20 */ blr +/* 8029E5DC 0029B53C 4E 80 00 20 */ blr .global __ct__12CPreFrontEndFv __ct__12CPreFrontEndFv: diff --git a/asm/MetroidPrime/CProjectedShadow.s b/asm/MetroidPrime/CProjectedShadow.s index ac1d6e2f..66bfd1cc 100644 --- a/asm/MetroidPrime/CProjectedShadow.s +++ b/asm/MetroidPrime/CProjectedShadow.s @@ -20,7 +20,7 @@ lbl_805AF480: sub_8029d6c8: /* 8029D6C8 0029A628 38 00 00 00 */ li r0, 0 /* 8029D6CC 0029A62C 98 03 00 80 */ stb r0, 0x80(r3) -/* 8029D6D0 0029A630 4E 80 00 20 */ blr +/* 8029D6D0 0029A630 4E 80 00 20 */ blr .global Render__16CProjectedShadowFRC13CStateManager Render__16CProjectedShadowFRC13CStateManager: @@ -306,7 +306,7 @@ lbl_8029DAA0: /* 8029DB14 0029AA74 81 83 00 00 */ lwz r12, 0(r3) /* 8029DB18 0029AA78 81 8C 00 30 */ lwz r12, 0x30(r12) /* 8029DB1C 0029AA7C 7D 89 03 A6 */ mtctr r12 -/* 8029DB20 0029AA80 4E 80 04 21 */ bctrl +/* 8029DB20 0029AA80 4E 80 04 21 */ bctrl /* 8029DB24 0029AA84 38 61 00 98 */ addi r3, r1, 0x98 /* 8029DB28 0029AA88 38 81 02 18 */ addi r4, r1, 0x218 /* 8029DB2C 0029AA8C 38 A1 01 E8 */ addi r5, r1, 0x1e8 @@ -407,7 +407,7 @@ lbl_8029DC74: /* 8029DC88 0029ABE8 80 01 0B 34 */ lwz r0, 0xb34(r1) /* 8029DC8C 0029ABEC 7C 08 03 A6 */ mtlr r0 /* 8029DC90 0029ABF0 38 21 0B 30 */ addi r1, r1, 0xb30 -/* 8029DC94 0029ABF4 4E 80 00 20 */ blr +/* 8029DC94 0029ABF4 4E 80 00 20 */ blr .global sub_8029dc98 sub_8029dc98: @@ -470,7 +470,7 @@ sub_8029dc98: /* 8029DD78 0029ACD8 CB E1 00 40 */ lfd f31, 0x40(r1) /* 8029DD7C 0029ACDC 7C 08 03 A6 */ mtlr r0 /* 8029DD80 0029ACE0 38 21 00 50 */ addi r1, r1, 0x50 -/* 8029DD84 0029ACE4 4E 80 00 20 */ blr +/* 8029DD84 0029ACE4 4E 80 00 20 */ blr .global RenderShadowBuffer__16CProjectedShadowFR13CStateManagerRC10CModelDataRC12CTransform4fiRC9CVector3fff RenderShadowBuffer__16CProjectedShadowFR13CStateManagerRC10CModelDataRC12CTransform4fiRC9CVector3fff: @@ -616,7 +616,7 @@ RenderShadowBuffer__16CProjectedShadowFR13CStateManagerRC10CModelDataRC12CTransf /* 8029DFB4 0029AF14 81 8C 00 5C */ lwz r12, 0x5c(r12) /* 8029DFB8 0029AF18 7C BC 00 50 */ subf r5, r28, r0 /* 8029DFBC 0029AF1C 7D 89 03 A6 */ mtctr r12 -/* 8029DFC0 0029AF20 4E 80 04 21 */ bctrl +/* 8029DFC0 0029AF20 4E 80 04 21 */ bctrl /* 8029DFC4 0029AF24 38 60 00 01 */ li r3, 1 /* 8029DFC8 0029AF28 48 06 AC C9 */ bl SetNumTevStages__3CGXFUc /* 8029DFCC 0029AF2C 38 60 00 01 */ li r3, 1 @@ -751,7 +751,7 @@ RenderShadowBuffer__16CProjectedShadowFR13CStateManagerRC10CModelDataRC12CTransf /* 8029E1D0 0029B130 80 C1 00 48 */ lwz r6, 0x48(r1) /* 8029E1D4 0029B134 80 E1 00 4C */ lwz r7, 0x4c(r1) /* 8029E1D8 0029B138 7D 89 03 A6 */ mtctr r12 -/* 8029E1DC 0029B13C 4E 80 04 21 */ bctrl +/* 8029E1DC 0029B13C 4E 80 04 21 */ bctrl /* 8029E1E0 0029B140 FC 20 F8 90 */ fmr f1, f31 /* 8029E1E4 0029B144 FC 40 F0 90 */ fmr f2, f30 /* 8029E1E8 0029B148 48 06 C1 F9 */ bl SetDepthRange__9CGraphicsFff @@ -764,7 +764,7 @@ RenderShadowBuffer__16CProjectedShadowFR13CStateManagerRC10CModelDataRC12CTransf /* 8029E204 0029B164 80 01 02 04 */ lwz r0, 0x204(r1) /* 8029E208 0029B168 7C 08 03 A6 */ mtlr r0 /* 8029E20C 0029B16C 38 21 02 00 */ addi r1, r1, 0x200 -/* 8029E210 0029B170 4E 80 00 20 */ blr +/* 8029E210 0029B170 4E 80 00 20 */ blr .global sub_8029e214 sub_8029e214: @@ -827,7 +827,7 @@ sub_8029e214: /* 8029E2F4 0029B254 80 01 00 54 */ lwz r0, 0x54(r1) /* 8029E2F8 0029B258 7C 08 03 A6 */ mtlr r0 /* 8029E2FC 0029B25C 38 21 00 50 */ addi r1, r1, 0x50 -/* 8029E300 0029B260 4E 80 00 20 */ blr +/* 8029E300 0029B260 4E 80 00 20 */ blr .global ModelDrawCallback__16CProjectedShadowFPCfPCfPC18SShadowDrawContext ModelDrawCallback__16CProjectedShadowFPCfPCfPC18SShadowDrawContext: @@ -862,7 +862,7 @@ lbl_8029E35C: /* 8029E370 0029B2D0 83 81 00 10 */ lwz r28, 0x10(r1) /* 8029E374 0029B2D4 7C 08 03 A6 */ mtlr r0 /* 8029E378 0029B2D8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8029E37C 0029B2DC 4E 80 00 20 */ blr +/* 8029E37C 0029B2DC 4E 80 00 20 */ blr .global __dt__16CProjectedShadowFv __dt__16CProjectedShadowFv: @@ -889,7 +889,7 @@ lbl_8029E3C0: /* 8029E3CC 0029B32C 83 C1 00 08 */ lwz r30, 8(r1) /* 8029E3D0 0029B330 7C 08 03 A6 */ mtlr r0 /* 8029E3D4 0029B334 38 21 00 10 */ addi r1, r1, 0x10 -/* 8029E3D8 0029B338 4E 80 00 20 */ blr +/* 8029E3D8 0029B338 4E 80 00 20 */ blr .global __ct__16CProjectedShadowFv __ct__16CProjectedShadowFv: diff --git a/asm/MetroidPrime/CRagDoll.s b/asm/MetroidPrime/CRagDoll.s index 2477a76a..ef66cbe2 100644 --- a/asm/MetroidPrime/CRagDoll.s +++ b/asm/MetroidPrime/CRagDoll.s @@ -64,7 +64,7 @@ lbl_805A7FD8: .global PreRender__8CRagDollFRC9CVector3fR10CModelData PreRender__8CRagDollFRC9CVector3fR10CModelData: -/* 8020C854 002097B4 4E 80 00 20 */ blr +/* 8020C854 002097B4 4E 80 00 20 */ blr .global CalculateRenderBounds__8CRagDollCFv CalculateRenderBounds__8CRagDollCFv: @@ -135,7 +135,7 @@ lbl_8020C92C: /* 8020C94C 002098AC 80 01 00 54 */ lwz r0, 0x54(r1) /* 8020C950 002098B0 7C 08 03 A6 */ mtlr r0 /* 8020C954 002098B4 38 21 00 50 */ addi r1, r1, 0x50 -/* 8020C958 002098B8 4E 80 00 20 */ blr +/* 8020C958 002098B8 4E 80 00 20 */ blr .global BoneAlign__8CRagDollFR21CHierarchyPoseBuilderRC15CCharLayoutInfoiiRC11CQuaternion BoneAlign__8CRagDollFR21CHierarchyPoseBuilderRC15CCharLayoutInfoiiRC11CQuaternion: @@ -239,7 +239,7 @@ BoneAlign__8CRagDollFR21CHierarchyPoseBuilderRC15CCharLayoutInfoiiRC11CQuaternio /* 8020CAE0 00209A40 D0 61 00 4C */ stfs f3, 0x4c(r1) /* 8020CAE4 00209A44 7C 08 03 A6 */ mtlr r0 /* 8020CAE8 00209A48 38 21 00 90 */ addi r1, r1, 0x90 -/* 8020CAEC 00209A4C 4E 80 00 20 */ blr +/* 8020CAEC 00209A4C 4E 80 00 20 */ blr .global AddJointConstraint__8CRagDollFiiiiii AddJointConstraint__8CRagDollFiiiiii: @@ -292,7 +292,7 @@ lbl_8020CB8C: /* 8020CB9C 00209AFC 80 01 00 34 */ lwz r0, 0x34(r1) /* 8020CBA0 00209B00 7C 08 03 A6 */ mtlr r0 /* 8020CBA4 00209B04 38 21 00 30 */ addi r1, r1, 0x30 -/* 8020CBA8 00209B08 4E 80 00 20 */ blr +/* 8020CBA8 00209B08 4E 80 00 20 */ blr .global AddMaxLengthConstraint__8CRagDollFiif AddMaxLengthConstraint__8CRagDollFiif: @@ -343,7 +343,7 @@ lbl_8020CC34: /* 8020CC50 00209BB0 80 01 00 24 */ lwz r0, 0x24(r1) /* 8020CC54 00209BB4 7C 08 03 A6 */ mtlr r0 /* 8020CC58 00209BB8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8020CC5C 00209BBC 4E 80 00 20 */ blr +/* 8020CC5C 00209BBC 4E 80 00 20 */ blr .global AddMinLengthConstraint__8CRagDollFiif AddMinLengthConstraint__8CRagDollFiif: @@ -394,7 +394,7 @@ lbl_8020CCE8: /* 8020CD04 00209C64 80 01 00 24 */ lwz r0, 0x24(r1) /* 8020CD08 00209C68 7C 08 03 A6 */ mtlr r0 /* 8020CD0C 00209C6C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8020CD10 00209C70 4E 80 00 20 */ blr +/* 8020CD10 00209C70 4E 80 00 20 */ blr .global AddLengthConstraint__8CRagDollFii AddLengthConstraint__8CRagDollFii: @@ -466,7 +466,7 @@ lbl_8020CDE8: /* 8020CE0C 00209D6C 83 81 00 20 */ lwz r28, 0x20(r1) /* 8020CE10 00209D70 7C 08 03 A6 */ mtlr r0 /* 8020CE14 00209D74 38 21 00 40 */ addi r1, r1, 0x40 -/* 8020CE18 00209D78 4E 80 00 20 */ blr +/* 8020CE18 00209D78 4E 80 00 20 */ blr .global AddParticle__8CRagDollFRC6CSegIdRC9CVector3fRC9CVector3ff AddParticle__8CRagDollFRC6CSegIdRC9CVector3fRC9CVector3ff: @@ -514,7 +514,7 @@ AddParticle__8CRagDollFRC6CSegIdRC9CVector3fRC9CVector3ff: /* 8020CEC0 00209E20 80 01 00 54 */ lwz r0, 0x54(r1) /* 8020CEC4 00209E24 7C 08 03 A6 */ mtlr r0 /* 8020CEC8 00209E28 38 21 00 50 */ addi r1, r1, 0x50 -/* 8020CECC 00209E2C 4E 80 00 20 */ blr +/* 8020CECC 00209E2C 4E 80 00 20 */ blr .global "push_back__Q24rstl64vectorFRCQ28CRagDoll16CRagDollParticle" "push_back__Q24rstl64vectorFRCQ28CRagDoll16CRagDollParticle": @@ -582,7 +582,7 @@ lbl_8020CFA4: /* 8020CFB8 00209F18 80 01 00 14 */ lwz r0, 0x14(r1) /* 8020CFBC 00209F1C 7C 08 03 A6 */ mtlr r0 /* 8020CFC0 00209F20 38 21 00 10 */ addi r1, r1, 0x10 -/* 8020CFC4 00209F24 4E 80 00 20 */ blr +/* 8020CFC4 00209F24 4E 80 00 20 */ blr .global Update__Q28CRagDoll23CRagDollPlaneConstraintFv Update__Q28CRagDoll23CRagDollPlaneConstraintFv: @@ -657,7 +657,7 @@ lbl_8020D0D0: /* 8020D0D4 0020A034 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8020D0D8 0020A038 7C 08 03 A6 */ mtlr r0 /* 8020D0DC 0020A03C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8020D0E0 0020A040 4E 80 00 20 */ blr +/* 8020D0E0 0020A040 4E 80 00 20 */ blr .global Update__Q28CRagDoll23CRagDollJointConstraintFv Update__Q28CRagDoll23CRagDollJointConstraintFv: @@ -790,7 +790,7 @@ lbl_8020D2BC: /* 8020D2D8 0020A238 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 8020D2DC 0020A23C 7C 08 03 A6 */ mtlr r0 /* 8020D2E0 0020A240 38 21 00 70 */ addi r1, r1, 0x70 -/* 8020D2E4 0020A244 4E 80 00 20 */ blr +/* 8020D2E4 0020A244 4E 80 00 20 */ blr .global Update__Q28CRagDoll24CRagDollLengthConstraintFv Update__Q28CRagDoll24CRagDollLengthConstraintFv: @@ -829,7 +829,7 @@ lbl_8020D358: /* 8020D360 0020A2C0 54 06 17 FE */ rlwinm r6, r0, 2, 0x1f, 0x1f lbl_8020D364: /* 8020D364 0020A2C4 54 C0 06 3F */ clrlwi. r0, r6, 0x18 -/* 8020D368 0020A2C8 4D 82 00 20 */ beqlr +/* 8020D368 0020A2C8 4D 82 00 20 */ beqlr /* 8020D36C 0020A2CC EC 40 30 2A */ fadds f2, f0, f6 /* 8020D370 0020A2D0 C0 22 B1 D0 */ lfs f1, lbl_805ACEF0@sda21(r2) /* 8020D374 0020A2D4 C0 05 00 04 */ lfs f0, 4(r5) @@ -855,7 +855,7 @@ lbl_8020D364: /* 8020D3C4 0020A324 C0 04 00 0C */ lfs f0, 0xc(r4) /* 8020D3C8 0020A328 EC 00 08 2A */ fadds f0, f0, f1 /* 8020D3CC 0020A32C D0 04 00 0C */ stfs f0, 0xc(r4) -/* 8020D3D0 0020A330 4E 80 00 20 */ blr +/* 8020D3D0 0020A330 4E 80 00 20 */ blr .global Update__8CRagDollFR13CStateManagerff Update__8CRagDollFR13CStateManagerff: @@ -896,7 +896,7 @@ lbl_8020D448: /* 8020D454 0020A3B4 83 C1 00 10 */ lwz r30, 0x10(r1) /* 8020D458 0020A3B8 7C 08 03 A6 */ mtlr r0 /* 8020D45C 0020A3BC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8020D460 0020A3C0 4E 80 00 20 */ blr +/* 8020D460 0020A3C0 4E 80 00 20 */ blr .global CheckStatic__8CRagDollFf CheckStatic__8CRagDollFf: @@ -1044,7 +1044,7 @@ lbl_8020D650: /* 8020D67C 0020A5DC 83 81 00 10 */ lwz r28, 0x10(r1) /* 8020D680 0020A5E0 7C 08 03 A6 */ mtlr r0 /* 8020D684 0020A5E4 38 21 00 40 */ addi r1, r1, 0x40 -/* 8020D688 0020A5E8 4E 80 00 20 */ blr +/* 8020D688 0020A5E8 4E 80 00 20 */ blr .global ClearForces__8CRagDollFv ClearForces__8CRagDollFv: @@ -1072,7 +1072,7 @@ lbl_8020D6CC: .global sub_8020d6d8 sub_8020d6d8: -/* 8020D6D8 0020A638 4E 80 00 20 */ blr +/* 8020D6D8 0020A638 4E 80 00 20 */ blr .global SatisfyConstraints__8CRagDollFR13CStateManager SatisfyConstraints__8CRagDollFR13CStateManager: @@ -1142,7 +1142,7 @@ lbl_8020D7AC: /* 8020D7BC 0020A71C 83 81 00 10 */ lwz r28, 0x10(r1) /* 8020D7C0 0020A720 7C 08 03 A6 */ mtlr r0 /* 8020D7C4 0020A724 38 21 00 20 */ addi r1, r1, 0x20 -/* 8020D7C8 0020A728 4E 80 00 20 */ blr +/* 8020D7C8 0020A728 4E 80 00 20 */ blr .global SatisfyWorldConstraints__8CRagDollFR13CStateManageri SatisfyWorldConstraints__8CRagDollFR13CStateManageri: @@ -1703,7 +1703,7 @@ lbl_8020DFC4: /* 8020E008 0020AF68 80 01 25 14 */ lwz r0, 0x2514(r1) /* 8020E00C 0020AF6C 7C 08 03 A6 */ mtlr r0 /* 8020E010 0020AF70 38 21 25 10 */ addi r1, r1, 0x2510 -/* 8020E014 0020AF74 4E 80 00 20 */ blr +/* 8020E014 0020AF74 4E 80 00 20 */ blr .global AccumulateForces__8CRagDollFff AccumulateForces__8CRagDollFff: @@ -1994,7 +1994,7 @@ lbl_8020E410: /* 8020E45C 0020B3BC 80 01 00 D4 */ lwz r0, 0xd4(r1) /* 8020E460 0020B3C0 7C 08 03 A6 */ mtlr r0 /* 8020E464 0020B3C4 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 8020E468 0020B3C8 4E 80 00 20 */ blr +/* 8020E468 0020B3C8 4E 80 00 20 */ blr .global Verlet__8CRagDollFf Verlet__8CRagDollFf: @@ -2156,7 +2156,7 @@ lbl_8020E6A4: /* 8020E6C4 0020B624 80 01 00 74 */ lwz r0, 0x74(r1) /* 8020E6C8 0020B628 7C 08 03 A6 */ mtlr r0 /* 8020E6CC 0020B62C 38 21 00 70 */ addi r1, r1, 0x70 -/* 8020E6D0 0020B630 4E 80 00 20 */ blr +/* 8020E6D0 0020B630 4E 80 00 20 */ blr .global Prime__8CRagDollFR13CStateManagerRC12CTransform4fR10CModelData Prime__8CRagDollFR13CStateManagerRC12CTransform4fR10CModelData: @@ -2248,7 +2248,7 @@ lbl_8020E7F4: /* 8020E814 0020B774 80 01 00 54 */ lwz r0, 0x54(r1) /* 8020E818 0020B778 7C 08 03 A6 */ mtlr r0 /* 8020E81C 0020B77C 38 21 00 50 */ addi r1, r1, 0x50 -/* 8020E820 0020B780 4E 80 00 20 */ blr +/* 8020E820 0020B780 4E 80 00 20 */ blr .global SatisfyWorldConstraintsOnConstruction__8CRagDollFR13CStateManager SatisfyWorldConstraintsOnConstruction__8CRagDollFR13CStateManager: @@ -2298,7 +2298,7 @@ lbl_8020E8B0: /* 8020E8C0 0020B820 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8020E8C4 0020B824 7C 08 03 A6 */ mtlr r0 /* 8020E8C8 0020B828 38 21 00 10 */ addi r1, r1, 0x10 -/* 8020E8CC 0020B82C 4E 80 00 20 */ blr +/* 8020E8CC 0020B82C 4E 80 00 20 */ blr .global __ct__8CRagDollFfffUi __ct__8CRagDollFfffUi: diff --git a/asm/MetroidPrime/CRainSplashGenerator.s b/asm/MetroidPrime/CRainSplashGenerator.s index d52cb0c2..5b26f50b 100644 --- a/asm/MetroidPrime/CRainSplashGenerator.s +++ b/asm/MetroidPrime/CRainSplashGenerator.s @@ -37,7 +37,7 @@ lbl_80269CB4: /* 80269CF0 00266C50 80 01 00 24 */ lwz r0, 0x24(r1) /* 80269CF4 00266C54 7C 08 03 A6 */ mtlr r0 /* 80269CF8 00266C58 38 21 00 20 */ addi r1, r1, 0x20 -/* 80269CFC 00266C5C 4E 80 00 20 */ blr +/* 80269CFC 00266C5C 4E 80 00 20 */ blr .global IsActive__Q220CRainSplashGenerator11SRainSplashCFfR13CStateManager IsActive__Q220CRainSplashGenerator11SRainSplashCFfR13CStateManager: @@ -58,7 +58,7 @@ lbl_80269D30: /* 80269D30 00266C90 7C 05 18 40 */ cmplw r5, r3 /* 80269D34 00266C94 40 82 FF E8 */ bne lbl_80269D1C /* 80269D38 00266C98 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 80269D3C 00266C9C 4E 80 00 20 */ blr +/* 80269D3C 00266C9C 4E 80 00 20 */ blr .global Draw__Q220CRainSplashGenerator11SRainSplashCFffRC9CVector3f Draw__Q220CRainSplashGenerator11SRainSplashCFffRC9CVector3f: @@ -98,7 +98,7 @@ lbl_80269D90: /* 80269DBC 00266D1C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80269DC0 00266D20 7C 08 03 A6 */ mtlr r0 /* 80269DC4 00266D24 38 21 00 30 */ addi r1, r1, 0x30 -/* 80269DC8 00266D28 4E 80 00 20 */ blr +/* 80269DC8 00266D28 4E 80 00 20 */ blr .global Update__Q220CRainSplashGenerator11SRainSplashFfR13CStateManager Update__Q220CRainSplashGenerator11SRainSplashFfR13CStateManager: @@ -134,7 +134,7 @@ lbl_80269E10: /* 80269E38 00266D98 83 A1 00 0C */ lwz r29, 0xc(r1) /* 80269E3C 00266D9C 7C 08 03 A6 */ mtlr r0 /* 80269E40 00266DA0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80269E44 00266DA4 4E 80 00 20 */ blr +/* 80269E44 00266DA4 4E 80 00 20 */ blr .global __ct__Q220CRainSplashGenerator11SRainSplash __ct__Q220CRainSplashGenerator11SRainSplash: @@ -212,7 +212,7 @@ lbl_80269F38: /* 80269F54 00266EB4 D0 23 00 6C */ stfs f1, 0x6c(r3) /* 80269F58 00266EB8 D0 03 00 70 */ stfs f0, 0x70(r3) /* 80269F5C 00266EBC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80269F60 00266EC0 4E 80 00 20 */ blr +/* 80269F60 00266EC0 4E 80 00 20 */ blr .global Draw__Q220CRainSplashGenerator11SSplashLineCFffRC9CVector3f Draw__Q220CRainSplashGenerator11SSplashLineCFffRC9CVector3f: @@ -310,7 +310,7 @@ lbl_8026A094: /* 8026A0C0 00267020 80 01 00 84 */ lwz r0, 0x84(r1) /* 8026A0C4 00267024 7C 08 03 A6 */ mtlr r0 /* 8026A0C8 00267028 38 21 00 80 */ addi r1, r1, 0x80 -/* 8026A0CC 0026702C 4E 80 00 20 */ blr +/* 8026A0CC 0026702C 4E 80 00 20 */ blr .global Update__Q220CRainSplashGenerator11SSplashLineFfR13CStateManager Update__Q220CRainSplashGenerator11SSplashLineFfR13CStateManager: @@ -387,7 +387,7 @@ lbl_8026A1D4: /* 8026A1DC 0026713C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8026A1E0 00267140 7C 08 03 A6 */ mtlr r0 /* 8026A1E4 00267144 38 21 00 20 */ addi r1, r1, 0x20 -/* 8026A1E8 00267148 4E 80 00 20 */ blr +/* 8026A1E8 00267148 4E 80 00 20 */ blr .global SetActive__Q220CRainSplashGenerator11SSplashLine SetActive__Q220CRainSplashGenerator11SSplashLine: @@ -395,7 +395,7 @@ SetActive__Q220CRainSplashGenerator11SSplashLine: /* 8026A1F0 00267150 38 80 00 01 */ li r4, 1 /* 8026A1F4 00267154 50 80 3E 30 */ rlwimi r0, r4, 7, 0x18, 0x18 /* 8026A1F8 00267158 98 03 00 16 */ stb r0, 0x16(r3) -/* 8026A1FC 0026715C 4E 80 00 20 */ blr +/* 8026A1FC 0026715C 4E 80 00 20 */ blr .global DoDraw__20CRainSplashGeneratorCFRC12CTransform4f DoDraw__20CRainSplashGeneratorCFRC12CTransform4f: @@ -519,7 +519,7 @@ lbl_8026A3A4: /* 8026A3B0 00267310 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8026A3B4 00267314 7C 08 03 A6 */ mtlr r0 /* 8026A3B8 00267318 38 21 00 20 */ addi r1, r1, 0x20 -/* 8026A3BC 0026731C 4E 80 00 20 */ blr +/* 8026A3BC 0026731C 4E 80 00 20 */ blr .global Draw__20CRainSplashGeneratorCFRC12CTransform4f Draw__20CRainSplashGeneratorCFRC12CTransform4f: @@ -534,7 +534,7 @@ lbl_8026A3DC: /* 8026A3DC 0026733C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8026A3E0 00267340 7C 08 03 A6 */ mtlr r0 /* 8026A3E4 00267344 38 21 00 10 */ addi r1, r1, 0x10 -/* 8026A3E8 00267348 4E 80 00 20 */ blr +/* 8026A3E8 00267348 4E 80 00 20 */ blr .global Update__20CRainSplashGeneratorFfR13CStateManager Update__20CRainSplashGeneratorFfR13CStateManager: @@ -575,7 +575,7 @@ lbl_8026A468: /* 8026A46C 002673CC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8026A470 002673D0 7C 08 03 A6 */ mtlr r0 /* 8026A474 002673D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8026A478 002673D8 4E 80 00 20 */ blr +/* 8026A478 002673D8 4E 80 00 20 */ blr .global UpdateRainSplashes__20CRainSplashGeneratorFR13CStateManagerff UpdateRainSplashes__20CRainSplashGeneratorFR13CStateManagerff: @@ -625,7 +625,7 @@ lbl_8026A510: /* 8026A520 00267480 83 C1 00 08 */ lwz r30, 8(r1) /* 8026A524 00267484 7C 08 03 A6 */ mtlr r0 /* 8026A528 00267488 38 21 00 20 */ addi r1, r1, 0x20 -/* 8026A52C 0026748C 4E 80 00 20 */ blr +/* 8026A52C 0026748C 4E 80 00 20 */ blr .global UpdateRainSplashRange__20CRainSplashGeneratorFR13CStateManageriif UpdateRainSplashRange__20CRainSplashGeneratorFR13CStateManageriif: @@ -675,7 +675,7 @@ lbl_8026A5C0: /* 8026A5D0 00267530 80 01 00 34 */ lwz r0, 0x34(r1) /* 8026A5D4 00267534 7C 08 03 A6 */ mtlr r0 /* 8026A5D8 00267538 38 21 00 30 */ addi r1, r1, 0x30 -/* 8026A5DC 0026753C 4E 80 00 20 */ blr +/* 8026A5DC 0026753C 4E 80 00 20 */ blr .global GeneratePoints__20CRainSplashGeneratorFPC9CVector3fPC9CVector3fi GeneratePoints__20CRainSplashGeneratorFPC9CVector3fPC9CVector3fi: @@ -741,7 +741,7 @@ lbl_8026A6B8: /* 8026A6BC 0026761C 80 01 00 34 */ lwz r0, 0x34(r1) /* 8026A6C0 00267620 7C 08 03 A6 */ mtlr r0 /* 8026A6C4 00267624 38 21 00 30 */ addi r1, r1, 0x30 -/* 8026A6C8 00267628 4E 80 00 20 */ blr +/* 8026A6C8 00267628 4E 80 00 20 */ blr .global AddPoint__20CRainSplashGeneratorFRC9CVector3f AddPoint__20CRainSplashGeneratorFRC9CVector3f: @@ -772,7 +772,7 @@ lbl_8026A6F8: /* 8026A728 00267688 80 01 00 14 */ lwz r0, 0x14(r1) /* 8026A72C 0026768C 7C 08 03 A6 */ mtlr r0 /* 8026A730 00267690 38 21 00 10 */ addi r1, r1, 0x10 -/* 8026A734 00267694 4E 80 00 20 */ blr +/* 8026A734 00267694 4E 80 00 20 */ blr .global __ct__20CRainSplashGeneratorFRC9CVector3fiiff __ct__20CRainSplashGeneratorFRC9CVector3fiiff: @@ -892,7 +892,7 @@ lbl_8026A8AC: /* 8026A8D8 00267838 83 81 00 80 */ lwz r28, 0x80(r1) /* 8026A8DC 0026783C 7C 08 03 A6 */ mtlr r0 /* 8026A8E0 00267840 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 8026A8E4 00267844 4E 80 00 20 */ blr +/* 8026A8E4 00267844 4E 80 00 20 */ blr .global "push_back__Q24rstl45vectorFRCQ220CRainSplashGenerator11SRainSplash" "push_back__Q24rstl45vectorFRCQ220CRainSplashGenerator11SRainSplash": @@ -928,7 +928,7 @@ lbl_8026A928: /* 8026A954 002678B4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8026A958 002678B8 7C 08 03 A6 */ mtlr r0 /* 8026A95C 002678BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8026A960 002678C0 4E 80 00 20 */ blr +/* 8026A960 002678C0 4E 80 00 20 */ blr .global __ct__Q220CRainSplashGenerator11SRainSplashFRCQ220CRainSplashGenerator11SRainSplash __ct__Q220CRainSplashGenerator11SRainSplashFRCQ220CRainSplashGenerator11SRainSplash: @@ -942,7 +942,7 @@ lbl_8026A97C: /* 8026A97C 002678DC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8026A980 002678E0 7C 08 03 A6 */ mtlr r0 /* 8026A984 002678E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8026A988 002678E8 4E 80 00 20 */ blr +/* 8026A988 002678E8 4E 80 00 20 */ blr .global __as__Q220CRainSplashGenerator11SRainSplashFRCQ220CRainSplashGenerator11SRainSplash __as__Q220CRainSplashGenerator11SRainSplashFRCQ220CRainSplashGenerator11SRainSplash: @@ -986,7 +986,7 @@ lbl_8026AA00: /* 8026AA14 00267974 D0 03 00 6C */ stfs f0, 0x6c(r3) /* 8026AA18 00267978 C0 04 00 70 */ lfs f0, 0x70(r4) /* 8026AA1C 0026797C D0 03 00 70 */ stfs f0, 0x70(r3) -/* 8026AA20 00267980 4E 80 00 20 */ blr +/* 8026AA20 00267980 4E 80 00 20 */ blr .global GetNextBestPt__20CRainSplashGeneratorFiPC9CVector3fPC9CVector3fiR9CRandom16f GetNextBestPt__20CRainSplashGeneratorFiPC9CVector3fPC9CVector3fiR9CRandom16f: @@ -1095,7 +1095,7 @@ lbl_8026AB74: /* 8026ABA8 00267B08 80 01 00 84 */ lwz r0, 0x84(r1) /* 8026ABAC 00267B0C 7C 08 03 A6 */ mtlr r0 /* 8026ABB0 00267B10 38 21 00 80 */ addi r1, r1, 0x80 -/* 8026ABB4 00267B14 4E 80 00 20 */ blr +/* 8026ABB4 00267B14 4E 80 00 20 */ blr .global sub_8026abb8 sub_8026abb8: @@ -1189,7 +1189,7 @@ lbl_8026ACDC: /* 8026ACE8 00267C48 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8026ACEC 00267C4C 7C 08 03 A6 */ mtlr r0 /* 8026ACF0 00267C50 38 21 00 30 */ addi r1, r1, 0x30 -/* 8026ACF4 00267C54 4E 80 00 20 */ blr +/* 8026ACF4 00267C54 4E 80 00 20 */ blr .global sub_8026acf8 sub_8026acf8: @@ -1220,4 +1220,4 @@ lbl_8026AD34: /* 8026AD50 00267CB0 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8026AD54 00267CB4 7C 08 03 A6 */ mtlr r0 /* 8026AD58 00267CB8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8026AD5C 00267CBC 4E 80 00 20 */ blr +/* 8026AD5C 00267CBC 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/CRippleManager.s b/asm/MetroidPrime/CRippleManager.s index c4b18e5a..dbe26f1c 100644 --- a/asm/MetroidPrime/CRippleManager.s +++ b/asm/MetroidPrime/CRippleManager.s @@ -88,7 +88,7 @@ lbl_8011D070: /* 8011D074 00119FD4 D0 03 00 00 */ stfs f0, 0(r3) lbl_8011D078: /* 8011D078 00119FD8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011D07C 00119FDC 4E 80 00 20 */ blr +/* 8011D07C 00119FDC 4E 80 00 20 */ blr .global GetLastRippleDeltaTime__14CRippleManagerCF9TUniqueId GetLastRippleDeltaTime__14CRippleManagerCF9TUniqueId: @@ -113,7 +113,7 @@ lbl_8011D0B0: /* 8011D0BC 0011A01C 7C 05 02 14 */ add r0, r5, r0 /* 8011D0C0 0011A020 7C 06 00 40 */ cmplw r6, r0 /* 8011D0C4 0011A024 40 82 FF C8 */ bne lbl_8011D08C -/* 8011D0C8 0011A028 4E 80 00 20 */ blr +/* 8011D0C8 0011A028 4E 80 00 20 */ blr .global Update__14CRippleManagerFf Update__14CRippleManagerFf: @@ -140,7 +140,7 @@ lbl_8011D0F8: .global sub_8011d110 sub_8011d110: -/* 8011D110 0011A070 4E 80 00 20 */ blr +/* 8011D110 0011A070 4E 80 00 20 */ blr .global Init__14CRippleManagerFi Init__14CRippleManagerFi: @@ -181,7 +181,7 @@ lbl_8011D174: /* 8011D194 0011A0F4 83 C1 00 58 */ lwz r30, 0x58(r1) /* 8011D198 0011A0F8 7C 08 03 A6 */ mtlr r0 /* 8011D19C 0011A0FC 38 21 00 60 */ addi r1, r1, 0x60 -/* 8011D1A0 0011A100 4E 80 00 20 */ blr +/* 8011D1A0 0011A100 4E 80 00 20 */ blr .global sub_8011d1a4 sub_8011d1a4: @@ -271,7 +271,7 @@ lbl_8011D2C8: /* 8011D2D4 0011A234 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8011D2D8 0011A238 7C 08 03 A6 */ mtlr r0 /* 8011D2DC 0011A23C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8011D2E0 0011A240 4E 80 00 20 */ blr +/* 8011D2E0 0011A240 4E 80 00 20 */ blr .global __ct__14CRippleManagerFif __ct__14CRippleManagerFif: @@ -293,7 +293,7 @@ __ct__14CRippleManagerFif: /* 8011D320 0011A280 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8011D324 0011A284 7C 08 03 A6 */ mtlr r0 /* 8011D328 0011A288 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011D32C 0011A28C 4E 80 00 20 */ blr +/* 8011D32C 0011A28C 4E 80 00 20 */ blr .global sub_8011d330 sub_8011d330: @@ -356,7 +356,7 @@ lbl_8011D3EC: /* 8011D3F8 0011A358 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8011D3FC 0011A35C 7C 08 03 A6 */ mtlr r0 /* 8011D400 0011A360 38 21 00 30 */ addi r1, r1, 0x30 -/* 8011D404 0011A364 4E 80 00 20 */ blr +/* 8011D404 0011A364 4E 80 00 20 */ blr .global sub_8011d408 sub_8011d408: @@ -405,4 +405,4 @@ lbl_8011D4A0: /* 8011D4A4 0011A404 7C 03 00 40 */ cmplw r3, r0 /* 8011D4A8 0011A408 40 82 FF 68 */ bne lbl_8011D410 /* 8011D4AC 0011A40C 7C A3 2B 78 */ mr r3, r5 -/* 8011D4B0 0011A410 4E 80 00 20 */ blr +/* 8011D4B0 0011A410 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/CRumbleManager.s b/asm/MetroidPrime/CRumbleManager.s index 25f80026..1cac4602 100644 --- a/asm/MetroidPrime/CRumbleManager.s +++ b/asm/MetroidPrime/CRumbleManager.s @@ -11,7 +11,7 @@ Update__14CRumbleManagerFf: /* 8022E104 0022B064 80 01 00 14 */ lwz r0, 0x14(r1) /* 8022E108 0022B068 7C 08 03 A6 */ mtlr r0 /* 8022E10C 0022B06C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8022E110 0022B070 4E 80 00 20 */ blr +/* 8022E110 0022B070 4E 80 00 20 */ blr .global StopRumble__14CRumbleManagerFs StopRumble__14CRumbleManagerFs: @@ -28,7 +28,7 @@ lbl_8022E138: /* 8022E138 0022B098 80 01 00 14 */ lwz r0, 0x14(r1) /* 8022E13C 0022B09C 7C 08 03 A6 */ mtlr r0 /* 8022E140 0022B0A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8022E144 0022B0A4 4E 80 00 20 */ blr +/* 8022E144 0022B0A4 4E 80 00 20 */ blr .global Rumble__14CRumbleManagerFR13CStateManagerRC9CVector3f11ERumbleFxIdf15ERumblePriority Rumble__14CRumbleManagerFR13CStateManagerRC9CVector3f11ERumbleFxIdf15ERumblePriority: @@ -96,7 +96,7 @@ lbl_8022E21C: /* 8022E234 0022B194 83 81 00 20 */ lwz r28, 0x20(r1) /* 8022E238 0022B198 7C 08 03 A6 */ mtlr r0 /* 8022E23C 0022B19C 38 21 00 40 */ addi r1, r1, 0x40 -/* 8022E240 0022B1A0 4E 80 00 20 */ blr +/* 8022E240 0022B1A0 4E 80 00 20 */ blr .global Rumble__14CRumbleManagerFR13CStateManager11ERumbleFxIdf15ERumblePriority Rumble__14CRumbleManagerFR13CStateManager11ERumbleFxIdf15ERumblePriority: @@ -121,7 +121,7 @@ lbl_8022E284: /* 8022E284 0022B1E4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8022E288 0022B1E8 7C 08 03 A6 */ mtlr r0 /* 8022E28C 0022B1EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8022E290 0022B1F0 4E 80 00 20 */ blr +/* 8022E290 0022B1F0 4E 80 00 20 */ blr .global __dt__14CRumbleManagerFv __dt__14CRumbleManagerFv: @@ -148,7 +148,7 @@ lbl_8022E2D4: /* 8022E2E0 0022B240 83 C1 00 08 */ lwz r30, 8(r1) /* 8022E2E4 0022B244 7C 08 03 A6 */ mtlr r0 /* 8022E2E8 0022B248 38 21 00 10 */ addi r1, r1, 0x10 -/* 8022E2EC 0022B24C 4E 80 00 20 */ blr +/* 8022E2EC 0022B24C 4E 80 00 20 */ blr .global __ct__14CRumbleManagerFv __ct__14CRumbleManagerFv: diff --git a/asm/MetroidPrime/CSWDataDolphin.s b/asm/MetroidPrime/CSWDataDolphin.s index 9de7417d..58716144 100644 --- a/asm/MetroidPrime/CSWDataDolphin.s +++ b/asm/MetroidPrime/CSWDataDolphin.s @@ -7,7 +7,7 @@ lbl_805AE290: # ROM: 0x3FAB30 .float 1.0 .4byte 0 - + .global lbl_805AE298 lbl_805AE298: # ROM: 0x3FAB38 @@ -46,7 +46,7 @@ Initialize__Q210CStopwatch7CSWDataFv: /* 802D6788 002D36E8 80 01 00 14 */ lwz r0, 0x14(r1) /* 802D678C 002D36EC 7C 08 03 A6 */ mtlr r0 /* 802D6790 002D36F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802D6794 002D36F4 4E 80 00 20 */ blr +/* 802D6794 002D36F4 4E 80 00 20 */ blr .global Wait__Q210CStopwatch7CSWDataCFf Wait__Q210CStopwatch7CSWDataCFf: @@ -87,4 +87,4 @@ lbl_802D67EC: /* 802D681C 002D377C 83 C1 00 28 */ lwz r30, 0x28(r1) /* 802D6820 002D3780 7C 08 03 A6 */ mtlr r0 /* 802D6824 002D3784 38 21 00 30 */ addi r1, r1, 0x30 -/* 802D6828 002D3788 4E 80 00 20 */ blr +/* 802D6828 002D3788 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/CSamusDoll.s b/asm/MetroidPrime/CSamusDoll.s index d397536a..3bf9a67f 100644 --- a/asm/MetroidPrime/CSamusDoll.s +++ b/asm/MetroidPrime/CSamusDoll.s @@ -159,7 +159,7 @@ lbl_800DAAA0: /* 800DAAA4 000D7A04 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 800DAAA8 000D7A08 7C 08 03 A6 */ mtlr r0 /* 800DAAAC 000D7A0C 38 21 00 20 */ addi r1, r1, 0x20 -/* 800DAAB0 000D7A10 4E 80 00 20 */ blr +/* 800DAAB0 000D7A10 4E 80 00 20 */ blr .global SetZoomSfxPlaying__10CSamusDollFb SetZoomSfxPlaying__10CSamusDollFb: @@ -197,7 +197,7 @@ lbl_800DAB24: /* 800DAB28 000D7A88 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 800DAB2C 000D7A8C 7C 08 03 A6 */ mtlr r0 /* 800DAB30 000D7A90 38 21 00 20 */ addi r1, r1, 0x20 -/* 800DAB34 000D7A94 4E 80 00 20 */ blr +/* 800DAB34 000D7A94 4E 80 00 20 */ blr .global SetOffsetSfxPlaying__10CSamusDollFb SetOffsetSfxPlaying__10CSamusDollFb: @@ -235,7 +235,7 @@ lbl_800DABA8: /* 800DABAC 000D7B0C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 800DABB0 000D7B10 7C 08 03 A6 */ mtlr r0 /* 800DABB4 000D7B14 38 21 00 20 */ addi r1, r1, 0x20 -/* 800DABB8 000D7B18 4E 80 00 20 */ blr +/* 800DABB8 000D7B18 4E 80 00 20 */ blr .global BeginViewInterpolate__10CSamusDollFb BeginViewInterpolate__10CSamusDollFb: @@ -322,7 +322,7 @@ lbl_800DACD8: /* 800DACE0 000D7C40 83 C1 00 18 */ lwz r30, 0x18(r1) /* 800DACE4 000D7C44 7C 08 03 A6 */ mtlr r0 /* 800DACE8 000D7C48 38 21 00 20 */ addi r1, r1, 0x20 -/* 800DACEC 000D7C4C 4E 80 00 20 */ blr +/* 800DACEC 000D7C4C 4E 80 00 20 */ blr .global SetOffset__10CSamusDollFRC9CVector3ff SetOffset__10CSamusDollFRC9CVector3ff: @@ -619,7 +619,7 @@ lbl_800DB0F8: .global sub_800db150 sub_800db150: -/* 800DB150 000D80B0 4E 80 00 20 */ blr +/* 800DB150 000D80B0 4E 80 00 20 */ blr .global SetRotation__10CSamusDollFfff SetRotation__10CSamusDollFfff: @@ -815,42 +815,42 @@ lbl_800DB40C: /* 800DB420 000D8380 83 E1 00 DC */ lwz r31, 0xdc(r1) /* 800DB424 000D8384 7C 08 03 A6 */ mtlr r0 /* 800DB428 000D8388 38 21 01 00 */ addi r1, r1, 0x100 -/* 800DB42C 000D838C 4E 80 00 20 */ blr +/* 800DB42C 000D838C 4E 80 00 20 */ blr .global SetPulseSuit__10CSamusDollFb SetPulseSuit__10CSamusDollFb: /* 800DB430 000D8390 88 03 02 70 */ lbz r0, 0x270(r3) /* 800DB434 000D8394 50 80 2E B4 */ rlwimi r0, r4, 5, 0x1a, 0x1a /* 800DB438 000D8398 98 03 02 70 */ stb r0, 0x270(r3) -/* 800DB43C 000D839C 4E 80 00 20 */ blr +/* 800DB43C 000D839C 4E 80 00 20 */ blr .global SetPulseVisor__10CSamusDollFb SetPulseVisor__10CSamusDollFb: /* 800DB440 000D83A0 88 03 02 70 */ lbz r0, 0x270(r3) /* 800DB444 000D83A4 50 80 0F BC */ rlwimi r0, r4, 1, 0x1e, 0x1e /* 800DB448 000D83A8 98 03 02 70 */ stb r0, 0x270(r3) -/* 800DB44C 000D83AC 4E 80 00 20 */ blr +/* 800DB44C 000D83AC 4E 80 00 20 */ blr .global SetPulseBoots__10CSamusDollFb SetPulseBoots__10CSamusDollFb: /* 800DB450 000D83B0 88 03 02 70 */ lbz r0, 0x270(r3) /* 800DB454 000D83B4 50 80 17 7A */ rlwimi r0, r4, 2, 0x1d, 0x1d /* 800DB458 000D83B8 98 03 02 70 */ stb r0, 0x270(r3) -/* 800DB45C 000D83BC 4E 80 00 20 */ blr +/* 800DB45C 000D83BC 4E 80 00 20 */ blr .global SetPulseGrapple__10CSamusDollFb SetPulseGrapple__10CSamusDollFb: /* 800DB460 000D83C0 88 03 02 70 */ lbz r0, 0x270(r3) /* 800DB464 000D83C4 50 80 1F 38 */ rlwimi r0, r4, 3, 0x1c, 0x1c /* 800DB468 000D83C8 98 03 02 70 */ stb r0, 0x270(r3) -/* 800DB46C 000D83CC 4E 80 00 20 */ blr +/* 800DB46C 000D83CC 4E 80 00 20 */ blr .global SetPulseBeam__10CSamusDollFb SetPulseBeam__10CSamusDollFb: /* 800DB470 000D83D0 88 03 02 70 */ lbz r0, 0x270(r3) /* 800DB474 000D83D4 50 80 26 F6 */ rlwimi r0, r4, 4, 0x1b, 0x1b /* 800DB478 000D83D8 98 03 02 70 */ stb r0, 0x270(r3) -/* 800DB47C 000D83DC 4E 80 00 20 */ blr +/* 800DB47C 000D83DC 4E 80 00 20 */ blr .global SetTransitionAnimation__10CSamusDollFv SetTransitionAnimation__10CSamusDollFv: @@ -954,7 +954,7 @@ lbl_800DB5F8: /* 800DB5FC 000D855C 83 E1 00 AC */ lwz r31, 0xac(r1) /* 800DB600 000D8560 7C 08 03 A6 */ mtlr r0 /* 800DB604 000D8564 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 800DB608 000D8568 4E 80 00 20 */ blr +/* 800DB608 000D8568 4E 80 00 20 */ blr .global CheckTransition__10CSamusDollFb CheckTransition__10CSamusDollFb: @@ -977,7 +977,7 @@ lbl_800DB644: /* 800DB644 000D85A4 80 01 00 14 */ lwz r0, 0x14(r1) /* 800DB648 000D85A8 7C 08 03 A6 */ mtlr r0 /* 800DB64C 000D85AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800DB650 000D85B0 4E 80 00 20 */ blr +/* 800DB650 000D85B0 4E 80 00 20 */ blr .global Draw__10CSamusDollFRC13CStateManagerf Draw__10CSamusDollFRC13CStateManagerf: @@ -1057,7 +1057,7 @@ Draw__10CSamusDollFRC13CStateManagerf: /* 800DB778 000D86D8 C0 A2 8E E0 */ lfs f5, lbl_805AAC00@sda21(r2) /* 800DB77C 000D86DC EC 60 18 28 */ fsubs f3, f0, f3 /* 800DB780 000D86E0 7D 89 03 A6 */ mtctr r12 -/* 800DB784 000D86E4 4E 80 04 21 */ bctrl +/* 800DB784 000D86E4 4E 80 04 21 */ bctrl /* 800DB788 000D86E8 C0 22 8E 90 */ lfs f1, lbl_805AABB0@sda21(r2) /* 800DB78C 000D86EC 38 61 04 10 */ addi r3, r1, 0x410 /* 800DB790 000D86F0 C0 5F 00 C0 */ lfs f2, 0xc0(r31) @@ -1971,7 +1971,7 @@ lbl_800DC3A4: /* 800DC548 000D94A8 81 83 00 00 */ lwz r12, 0(r3) /* 800DC54C 000D94AC 81 8C 00 30 */ lwz r12, 0x30(r12) /* 800DC550 000D94B0 7D 89 03 A6 */ mtctr r12 -/* 800DC554 000D94B4 4E 80 04 21 */ bctrl +/* 800DC554 000D94B4 4E 80 04 21 */ bctrl /* 800DC558 000D94B8 C0 02 8E 90 */ lfs f0, lbl_805AABB0@sda21(r2) /* 800DC55C 000D94BC FC 1F 00 40 */ fcmpo cr0, f31, f0 /* 800DC560 000D94C0 40 81 01 08 */ ble lbl_800DC668 @@ -2004,7 +2004,7 @@ lbl_800DC3A4: /* 800DC5CC 000D952C 81 83 00 00 */ lwz r12, 0(r3) /* 800DC5D0 000D9530 81 8C 00 30 */ lwz r12, 0x30(r12) /* 800DC5D4 000D9534 7D 89 03 A6 */ mtctr r12 -/* 800DC5D8 000D9538 4E 80 04 21 */ bctrl +/* 800DC5D8 000D9538 4E 80 04 21 */ bctrl /* 800DC5DC 000D953C 80 7F 02 2C */ lwz r3, 0x22c(r31) /* 800DC5E0 000D9540 48 23 B0 BD */ bl GetNumActiveChildParticles__11CElementGenCFv /* 800DC5E4 000D9544 2C 03 00 01 */ cmpwi r3, 1 @@ -2034,13 +2034,13 @@ lbl_800DC3A4: /* 800DC644 000D95A4 81 83 00 00 */ lwz r12, 0(r3) /* 800DC648 000D95A8 81 8C 00 30 */ lwz r12, 0x30(r12) /* 800DC64C 000D95AC 7D 89 03 A6 */ mtctr r12 -/* 800DC650 000D95B0 4E 80 04 21 */ bctrl +/* 800DC650 000D95B0 4E 80 04 21 */ bctrl lbl_800DC654: /* 800DC654 000D95B4 80 7F 02 2C */ lwz r3, 0x22c(r31) /* 800DC658 000D95B8 81 83 00 00 */ lwz r12, 0(r3) /* 800DC65C 000D95BC 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800DC660 000D95C0 7D 89 03 A6 */ mtctr r12 -/* 800DC664 000D95C4 4E 80 04 21 */ bctrl +/* 800DC664 000D95C4 4E 80 04 21 */ bctrl lbl_800DC668: /* 800DC668 000D95C8 88 1F 02 70 */ lbz r0, 0x270(r31) /* 800DC66C 000D95CC 54 00 CF FF */ rlwinm. r0, r0, 0x19, 0x1f, 0x1f @@ -2140,12 +2140,12 @@ lbl_800DC79C: /* 800DC7E0 000D9740 81 83 00 00 */ lwz r12, 0(r3) /* 800DC7E4 000D9744 81 8C 00 30 */ lwz r12, 0x30(r12) /* 800DC7E8 000D9748 7D 89 03 A6 */ mtctr r12 -/* 800DC7EC 000D974C 4E 80 04 21 */ bctrl +/* 800DC7EC 000D974C 4E 80 04 21 */ bctrl /* 800DC7F0 000D9750 80 7F 02 38 */ lwz r3, 0x238(r31) /* 800DC7F4 000D9754 81 83 00 00 */ lwz r12, 0(r3) /* 800DC7F8 000D9758 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800DC7FC 000D975C 7D 89 03 A6 */ mtctr r12 -/* 800DC800 000D9760 4E 80 04 21 */ bctrl +/* 800DC800 000D9760 4E 80 04 21 */ bctrl lbl_800DC804: /* 800DC804 000D9764 48 23 01 79 */ bl DisableAllLights__9CGraphicsFv lbl_800DC808: @@ -2169,7 +2169,7 @@ lbl_800DC808: /* 800DC84C 000D97AC 80 01 06 34 */ lwz r0, 0x634(r1) /* 800DC850 000D97B0 7C 08 03 A6 */ mtlr r0 /* 800DC854 000D97B4 38 21 06 30 */ addi r1, r1, 0x630 -/* 800DC858 000D97B8 4E 80 00 20 */ blr +/* 800DC858 000D97B8 4E 80 00 20 */ blr .global Update__10CSamusDollFfR9CRandom16 Update__10CSamusDollFfR9CRandom16: @@ -2404,7 +2404,7 @@ lbl_800DCB78: /* 800DCB88 000D9AE8 38 80 00 01 */ li r4, 1 /* 800DCB8C 000D9AEC 81 8C 00 08 */ lwz r12, 8(r12) /* 800DCB90 000D9AF0 7D 89 03 A6 */ mtctr r12 -/* 800DCB94 000D9AF4 4E 80 04 21 */ bctrl +/* 800DCB94 000D9AF4 4E 80 04 21 */ bctrl lbl_800DCB98: /* 800DCB98 000D9AF8 7F 80 07 75 */ extsb. r0, r28 /* 800DCB9C 000D9AFC 93 BE 02 38 */ stw r29, 0x238(r30) @@ -2429,7 +2429,7 @@ lbl_800DCBB0: /* 800DCBE4 000D9B44 81 83 00 00 */ lwz r12, 0(r3) /* 800DCBE8 000D9B48 81 8C 00 24 */ lwz r12, 0x24(r12) /* 800DCBEC 000D9B4C 7D 89 03 A6 */ mtctr r12 -/* 800DCBF0 000D9B50 4E 80 04 21 */ bctrl +/* 800DCBF0 000D9B50 4E 80 04 21 */ bctrl lbl_800DCBF4: /* 800DCBF4 000D9B54 C0 22 8E 90 */ lfs f1, lbl_805AABB0@sda21(r2) /* 800DCBF8 000D9B58 C0 1E 00 54 */ lfs f0, 0x54(r30) @@ -2685,7 +2685,7 @@ lbl_800DCF20: /* 800DCF4C 000D9EAC 38 A5 01 26 */ addi r5, r5, 0x126 /* 800DCF50 000D9EB0 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800DCF54 000D9EB4 7D 89 03 A6 */ mtctr r12 -/* 800DCF58 000D9EB8 4E 80 04 21 */ bctrl +/* 800DCF58 000D9EB8 4E 80 04 21 */ bctrl /* 800DCF5C 000D9EBC 38 61 00 B0 */ addi r3, r1, 0xb0 /* 800DCF60 000D9EC0 38 81 00 48 */ addi r4, r1, 0x48 /* 800DCF64 000D9EC4 48 26 3F 45 */ bl __ct__6CTokenFRC6CToken @@ -2855,20 +2855,20 @@ lbl_800DD14C: /* 800DD1BC 000DA11C 81 83 00 00 */ lwz r12, 0(r3) /* 800DD1C0 000DA120 81 8C 00 20 */ lwz r12, 0x20(r12) /* 800DD1C4 000DA124 7D 89 03 A6 */ mtctr r12 -/* 800DD1C8 000DA128 4E 80 04 21 */ bctrl +/* 800DD1C8 000DA128 4E 80 04 21 */ bctrl /* 800DD1CC 000DA12C 80 7E 02 2C */ lwz r3, 0x22c(r30) /* 800DD1D0 000DA130 FC 20 F0 90 */ fmr f1, f30 /* 800DD1D4 000DA134 81 83 00 00 */ lwz r12, 0(r3) /* 800DD1D8 000DA138 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800DD1DC 000DA13C 7D 89 03 A6 */ mtctr r12 -/* 800DD1E0 000DA140 4E 80 04 21 */ bctrl +/* 800DD1E0 000DA140 4E 80 04 21 */ bctrl /* 800DD1E4 000DA144 80 7E 02 38 */ lwz r3, 0x238(r30) /* 800DD1E8 000DA148 28 03 00 00 */ cmplwi r3, 0 /* 800DD1EC 000DA14C 41 82 00 94 */ beq lbl_800DD280 /* 800DD1F0 000DA150 81 83 00 00 */ lwz r12, 0(r3) /* 800DD1F4 000DA154 81 8C 00 58 */ lwz r12, 0x58(r12) /* 800DD1F8 000DA158 7D 89 03 A6 */ mtctr r12 -/* 800DD1FC 000DA15C 4E 80 04 21 */ bctrl +/* 800DD1FC 000DA15C 4E 80 04 21 */ bctrl /* 800DD200 000DA160 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800DD204 000DA164 41 82 00 2C */ beq lbl_800DD230 /* 800DD208 000DA168 80 7E 02 38 */ lwz r3, 0x238(r30) @@ -2878,7 +2878,7 @@ lbl_800DD14C: /* 800DD218 000DA178 38 80 00 01 */ li r4, 1 /* 800DD21C 000DA17C 81 8C 00 08 */ lwz r12, 8(r12) /* 800DD220 000DA180 7D 89 03 A6 */ mtctr r12 -/* 800DD224 000DA184 4E 80 04 21 */ bctrl +/* 800DD224 000DA184 4E 80 04 21 */ bctrl lbl_800DD228: /* 800DD228 000DA188 38 00 00 00 */ li r0, 0 /* 800DD22C 000DA18C 90 1E 02 38 */ stw r0, 0x238(r30) @@ -2896,13 +2896,13 @@ lbl_800DD230: /* 800DD258 000DA1B8 81 83 00 00 */ lwz r12, 0(r3) /* 800DD25C 000DA1BC 81 8C 00 20 */ lwz r12, 0x20(r12) /* 800DD260 000DA1C0 7D 89 03 A6 */ mtctr r12 -/* 800DD264 000DA1C4 4E 80 04 21 */ bctrl +/* 800DD264 000DA1C4 4E 80 04 21 */ bctrl /* 800DD268 000DA1C8 80 7E 02 38 */ lwz r3, 0x238(r30) /* 800DD26C 000DA1CC FC 20 F0 90 */ fmr f1, f30 /* 800DD270 000DA1D0 81 83 00 00 */ lwz r12, 0(r3) /* 800DD274 000DA1D4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800DD278 000DA1D8 7D 89 03 A6 */ mtctr r12 -/* 800DD27C 000DA1DC 4E 80 04 21 */ bctrl +/* 800DD27C 000DA1DC 4E 80 04 21 */ bctrl lbl_800DD280: /* 800DD280 000DA1E0 C0 22 8E 90 */ lfs f1, lbl_805AABB0@sda21(r2) /* 800DD284 000DA1E4 C0 5E 00 C4 */ lfs f2, 0xc4(r30) @@ -3037,7 +3037,7 @@ lbl_800DD440: /* 800DD460 000DA3C0 83 81 01 80 */ lwz r28, 0x180(r1) /* 800DD464 000DA3C4 7C 08 03 A6 */ mtlr r0 /* 800DD468 000DA3C8 38 21 01 B0 */ addi r1, r1, 0x1b0 -/* 800DD46C 000DA3CC 4E 80 00 20 */ blr +/* 800DD46C 000DA3CC 4E 80 00 20 */ blr .global Touch__10CSamusDollFv Touch__10CSamusDollFv: @@ -3072,7 +3072,7 @@ lbl_800DD4D8: /* 800DD4DC 000DA43C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800DD4E0 000DA440 7C 08 03 A6 */ mtlr r0 /* 800DD4E4 000DA444 38 21 00 10 */ addi r1, r1, 0x10 -/* 800DD4E8 000DA448 4E 80 00 20 */ blr +/* 800DD4E8 000DA448 4E 80 00 20 */ blr .global BuildSuitModelDataBoots__10CSamusDollFQ212CPlayerState11EPlayerSuit BuildSuitModelDataBoots__10CSamusDollFQ212CPlayerState11EPlayerSuit: @@ -3093,7 +3093,7 @@ BuildSuitModelDataBoots__10CSamusDollFQ212CPlayerState11EPlayerSuit: /* 800DD524 000DA484 81 83 00 00 */ lwz r12, 0(r3) /* 800DD528 000DA488 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 800DD52C 000DA48C 7D 89 03 A6 */ mtctr r12 -/* 800DD530 000DA490 4E 80 04 21 */ bctrl +/* 800DD530 000DA490 4E 80 04 21 */ bctrl /* 800DD534 000DA494 3C 80 80 47 */ lis r4, lbl_8046C470@ha /* 800DD538 000DA498 C4 44 C4 70 */ lfsu f2, lbl_8046C470@l(r4) /* 800DD53C 000DA49C 80 C3 00 04 */ lwz r6, 4(r3) @@ -3141,7 +3141,7 @@ BuildSuitModelDataBoots__10CSamusDollFQ212CPlayerState11EPlayerSuit: /* 800DD5E4 000DA544 83 C1 00 98 */ lwz r30, 0x98(r1) /* 800DD5E8 000DA548 7C 08 03 A6 */ mtlr r0 /* 800DD5EC 000DA54C 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 800DD5F0 000DA550 4E 80 00 20 */ blr +/* 800DD5F0 000DA550 4E 80 00 20 */ blr .global BuildSuitModelData1__10CSamusDollFQ212CPlayerState11EPlayerSuit BuildSuitModelData1__10CSamusDollFQ212CPlayerState11EPlayerSuit: @@ -3162,7 +3162,7 @@ BuildSuitModelData1__10CSamusDollFQ212CPlayerState11EPlayerSuit: /* 800DD62C 000DA58C 81 83 00 00 */ lwz r12, 0(r3) /* 800DD630 000DA590 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 800DD634 000DA594 7D 89 03 A6 */ mtctr r12 -/* 800DD638 000DA598 4E 80 04 21 */ bctrl +/* 800DD638 000DA598 4E 80 04 21 */ bctrl /* 800DD63C 000DA59C 3C 80 80 47 */ lis r4, lbl_8046C470@ha /* 800DD640 000DA5A0 C4 44 C4 70 */ lfsu f2, lbl_8046C470@l(r4) /* 800DD644 000DA5A4 80 C3 00 04 */ lwz r6, 4(r3) @@ -3210,7 +3210,7 @@ BuildSuitModelData1__10CSamusDollFQ212CPlayerState11EPlayerSuit: /* 800DD6EC 000DA64C 83 C1 00 98 */ lwz r30, 0x98(r1) /* 800DD6F0 000DA650 7C 08 03 A6 */ mtlr r0 /* 800DD6F4 000DA654 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 800DD6F8 000DA658 4E 80 00 20 */ blr +/* 800DD6F8 000DA658 4E 80 00 20 */ blr .global SetupLights__10CSamusDollFv SetupLights__10CSamusDollFv: @@ -3291,7 +3291,7 @@ SetupLights__10CSamusDollFv: /* 800DD824 000DA784 83 C1 00 98 */ lwz r30, 0x98(r1) /* 800DD828 000DA788 7C 08 03 A6 */ mtlr r0 /* 800DD82C 000DA78C 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 800DD830 000DA790 4E 80 00 20 */ blr +/* 800DD830 000DA790 4E 80 00 20 */ blr .global __dt__10CSamusDollFv __dt__10CSamusDollFv: @@ -3364,7 +3364,7 @@ lbl_800DD90C: /* 800DD924 000DA884 38 80 00 01 */ li r4, 1 /* 800DD928 000DA888 81 8C 00 08 */ lwz r12, 8(r12) /* 800DD92C 000DA88C 7D 89 03 A6 */ mtctr r12 -/* 800DD930 000DA890 4E 80 04 21 */ bctrl +/* 800DD930 000DA890 4E 80 04 21 */ bctrl lbl_800DD934: /* 800DD934 000DA894 34 1E 02 30 */ addic. r0, r30, 0x230 /* 800DD938 000DA898 41 82 00 10 */ beq lbl_800DD948 @@ -3381,7 +3381,7 @@ lbl_800DD948: /* 800DD960 000DA8C0 38 80 00 01 */ li r4, 1 /* 800DD964 000DA8C4 81 8C 00 08 */ lwz r12, 8(r12) /* 800DD968 000DA8C8 7D 89 03 A6 */ mtctr r12 -/* 800DD96C 000DA8CC 4E 80 04 21 */ bctrl +/* 800DD96C 000DA8CC 4E 80 04 21 */ bctrl lbl_800DD970: /* 800DD970 000DA8D0 34 1E 02 24 */ addic. r0, r30, 0x224 /* 800DD974 000DA8D4 41 82 00 10 */ beq lbl_800DD984 @@ -3527,7 +3527,7 @@ lbl_800DDB40: /* 800DDB54 000DAAB4 83 81 00 30 */ lwz r28, 0x30(r1) /* 800DDB58 000DAAB8 7C 08 03 A6 */ mtlr r0 /* 800DDB5C 000DAABC 38 21 00 40 */ addi r1, r1, 0x40 -/* 800DDB60 000DAAC0 4E 80 00 20 */ blr +/* 800DDB60 000DAAC0 4E 80 00 20 */ blr .global IsLoaded__10CSamusDollCFv IsLoaded__10CSamusDollCFv: @@ -3535,38 +3535,38 @@ IsLoaded__10CSamusDollCFv: /* 800DDB68 000DAAC8 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 800DDB6C 000DAACC 41 82 00 0C */ beq lbl_800DDB78 /* 800DDB70 000DAAD0 38 60 00 01 */ li r3, 1 -/* 800DDB74 000DAAD4 4E 80 00 20 */ blr +/* 800DDB74 000DAAD4 4E 80 00 20 */ blr lbl_800DDB78: /* 800DDB78 000DAAD8 80 83 01 EC */ lwz r4, 0x1ec(r3) /* 800DDB7C 000DAADC 80 04 00 10 */ lwz r0, 0x10(r4) /* 800DDB80 000DAAE0 28 00 00 00 */ cmplwi r0, 0 /* 800DDB84 000DAAE4 40 82 00 0C */ bne lbl_800DDB90 /* 800DDB88 000DAAE8 38 60 00 00 */ li r3, 0 -/* 800DDB8C 000DAAEC 4E 80 00 20 */ blr +/* 800DDB8C 000DAAEC 4E 80 00 20 */ blr lbl_800DDB90: /* 800DDB90 000DAAF0 80 03 01 FC */ lwz r0, 0x1fc(r3) /* 800DDB94 000DAAF4 28 00 00 00 */ cmplwi r0, 0 /* 800DDB98 000DAAF8 40 82 00 0C */ bne lbl_800DDBA4 /* 800DDB9C 000DAAFC 38 60 00 00 */ li r3, 0 -/* 800DDBA0 000DAB00 4E 80 00 20 */ blr +/* 800DDBA0 000DAB00 4E 80 00 20 */ blr lbl_800DDBA4: /* 800DDBA4 000DAB04 80 03 02 08 */ lwz r0, 0x208(r3) /* 800DDBA8 000DAB08 28 00 00 00 */ cmplwi r0, 0 /* 800DDBAC 000DAB0C 40 82 00 0C */ bne lbl_800DDBB8 /* 800DDBB0 000DAB10 38 60 00 00 */ li r3, 0 -/* 800DDBB4 000DAB14 4E 80 00 20 */ blr +/* 800DDBB4 000DAB14 4E 80 00 20 */ blr lbl_800DDBB8: /* 800DDBB8 000DAB18 80 03 02 14 */ lwz r0, 0x214(r3) /* 800DDBBC 000DAB1C 28 00 00 00 */ cmplwi r0, 0 /* 800DDBC0 000DAB20 40 82 00 0C */ bne lbl_800DDBCC /* 800DDBC4 000DAB24 38 60 00 00 */ li r3, 0 -/* 800DDBC8 000DAB28 4E 80 00 20 */ blr +/* 800DDBC8 000DAB28 4E 80 00 20 */ blr lbl_800DDBCC: /* 800DDBCC 000DAB2C 80 03 01 DC */ lwz r0, 0x1dc(r3) /* 800DDBD0 000DAB30 28 00 00 00 */ cmplwi r0, 0 /* 800DDBD4 000DAB34 40 82 00 0C */ bne lbl_800DDBE0 /* 800DDBD8 000DAB38 38 60 00 00 */ li r3, 0 -/* 800DDBDC 000DAB3C 4E 80 00 20 */ blr +/* 800DDBDC 000DAB3C 4E 80 00 20 */ blr lbl_800DDBE0: /* 800DDBE0 000DAB40 88 03 02 1C */ lbz r0, 0x21c(r3) /* 800DDBE4 000DAB44 28 00 00 00 */ cmplwi r0, 0 @@ -3575,10 +3575,10 @@ lbl_800DDBE0: /* 800DDBF0 000DAB50 28 00 00 00 */ cmplwi r0, 0 /* 800DDBF4 000DAB54 40 82 00 0C */ bne lbl_800DDC00 /* 800DDBF8 000DAB58 38 60 00 00 */ li r3, 0 -/* 800DDBFC 000DAB5C 4E 80 00 20 */ blr +/* 800DDBFC 000DAB5C 4E 80 00 20 */ blr lbl_800DDC00: /* 800DDC00 000DAB60 88 63 01 14 */ lbz r3, 0x114(r3) -/* 800DDC04 000DAB64 4E 80 00 20 */ blr +/* 800DDC04 000DAB64 4E 80 00 20 */ blr .global CheckLoadComplete__10CSamusDollFv CheckLoadComplete__10CSamusDollFv: @@ -3640,7 +3640,7 @@ lbl_800DDCA8: /* 800DDCD0 000DAC30 38 84 01 3C */ addi r4, r4, 0x13c /* 800DDCD4 000DAC34 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 800DDCD8 000DAC38 7D 89 03 A6 */ mtctr r12 -/* 800DDCDC 000DAC3C 4E 80 04 21 */ bctrl +/* 800DDCDC 000DAC3C 4E 80 04 21 */ bctrl /* 800DDCE0 000DAC40 3C 80 80 47 */ lis r4, lbl_8046C470@ha /* 800DDCE4 000DAC44 80 C3 00 04 */ lwz r6, 4(r3) /* 800DDCE8 000DAC48 C0 44 C4 70 */ lfs f2, lbl_8046C470@l(r4) @@ -3707,7 +3707,7 @@ lbl_800DDDC0: /* 800DDDD0 000DAD30 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 800DDDD4 000DAD34 7C 9B 00 2E */ lwzx r4, r27, r0 /* 800DDDD8 000DAD38 7D 89 03 A6 */ mtctr r12 -/* 800DDDDC 000DAD3C 4E 80 04 21 */ bctrl +/* 800DDDDC 000DAD3C 4E 80 04 21 */ bctrl /* 800DDDE0 000DAD40 3C 80 80 47 */ lis r4, lbl_8046C470@ha /* 800DDDE4 000DAD44 80 C3 00 04 */ lwz r6, 4(r3) /* 800DDDE8 000DAD48 C0 44 C4 70 */ lfs f2, lbl_8046C470@l(r4) @@ -3746,7 +3746,7 @@ lbl_800DDE64: /* 800DDE68 000DADC8 80 01 01 94 */ lwz r0, 0x194(r1) /* 800DDE6C 000DADCC 7C 08 03 A6 */ mtlr r0 /* 800DDE70 000DADD0 38 21 01 90 */ addi r1, r1, 0x190 -/* 800DDE74 000DADD4 4E 80 00 20 */ blr +/* 800DDE74 000DADD4 4E 80 00 20 */ blr .global sub_800dde78 sub_800dde78: @@ -3761,7 +3761,7 @@ sub_800dde78: /* 800DDE98 000DADF8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800DDE9C 000DADFC 7C 08 03 A6 */ mtlr r0 /* 800DDEA0 000DAE00 38 21 00 10 */ addi r1, r1, 0x10 -/* 800DDEA4 000DAE04 4E 80 00 20 */ blr +/* 800DDEA4 000DAE04 4E 80 00 20 */ blr .global "emplace__Q24rstl29optional_object<10CModelData>FRC10CModelData" "emplace__Q24rstl29optional_object<10CModelData>FRC10CModelData": @@ -3784,7 +3784,7 @@ lbl_800DDEDC: /* 800DDEE0 000DAE40 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800DDEE4 000DAE44 7C 08 03 A6 */ mtlr r0 /* 800DDEE8 000DAE48 38 21 00 10 */ addi r1, r1, 0x10 -/* 800DDEEC 000DAE4C 4E 80 00 20 */ blr +/* 800DDEEC 000DAE4C 4E 80 00 20 */ blr .global sub_800ddef0 sub_800ddef0: @@ -3798,7 +3798,7 @@ lbl_800DDF08: /* 800DDF08 000DAE68 80 01 00 14 */ lwz r0, 0x14(r1) /* 800DDF0C 000DAE6C 7C 08 03 A6 */ mtlr r0 /* 800DDF10 000DAE70 38 21 00 10 */ addi r1, r1, 0x10 -/* 800DDF14 000DAE74 4E 80 00 20 */ blr +/* 800DDF14 000DAE74 4E 80 00 20 */ blr .global __ct__10CSamusDollFRC16CDependencyGroupRC16CDependencyGroupQ212CPlayerState11EPlayerSuitQ212CPlayerState7EBeamIdbb __ct__10CSamusDollFRC16CDependencyGroupRC16CDependencyGroupQ212CPlayerState11EPlayerSuitQ212CPlayerState7EBeamIdbb: @@ -3909,7 +3909,7 @@ __ct__10CSamusDollFRC16CDependencyGroupRC16CDependencyGroupQ212CPlayerState11EPl /* 800DE0B8 000DB018 81 84 00 00 */ lwz r12, 0(r4) /* 800DE0BC 000DB01C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800DE0C0 000DB020 7D 89 03 A6 */ mtctr r12 -/* 800DE0C4 000DB024 4E 80 04 21 */ bctrl +/* 800DE0C4 000DB024 4E 80 04 21 */ bctrl /* 800DE0C8 000DB028 3A DF 01 D4 */ addi r22, r31, 0x1d4 /* 800DE0CC 000DB02C 38 81 00 64 */ addi r4, r1, 0x64 /* 800DE0D0 000DB030 7E C3 B3 78 */ mr r3, r22 @@ -3960,7 +3960,7 @@ lbl_800DE15C: /* 800DE174 000DB0D4 81 84 00 00 */ lwz r12, 0(r4) /* 800DE178 000DB0D8 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800DE17C 000DB0DC 7D 89 03 A6 */ mtctr r12 -/* 800DE180 000DB0E0 4E 80 04 21 */ bctrl +/* 800DE180 000DB0E0 4E 80 04 21 */ bctrl /* 800DE184 000DB0E4 38 7F 01 EC */ addi r3, r31, 0x1ec /* 800DE188 000DB0E8 38 81 00 5C */ addi r4, r1, 0x5c /* 800DE18C 000DB0EC 48 26 2D 1D */ bl __ct__6CTokenFRC6CToken @@ -3975,7 +3975,7 @@ lbl_800DE15C: /* 800DE1B0 000DB110 7C A5 00 2E */ lwzx r5, r5, r0 /* 800DE1B4 000DB114 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800DE1B8 000DB118 7D 89 03 A6 */ mtctr r12 -/* 800DE1BC 000DB11C 4E 80 04 21 */ bctrl +/* 800DE1BC 000DB11C 4E 80 04 21 */ bctrl /* 800DE1C0 000DB120 3A DF 01 F4 */ addi r22, r31, 0x1f4 /* 800DE1C4 000DB124 38 81 00 54 */ addi r4, r1, 0x54 /* 800DE1C8 000DB128 7E C3 B3 78 */ mr r3, r22 @@ -3993,7 +3993,7 @@ lbl_800DE15C: /* 800DE1F8 000DB158 7C A5 D0 2E */ lwzx r5, r5, r26 /* 800DE1FC 000DB15C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800DE200 000DB160 7D 89 03 A6 */ mtctr r12 -/* 800DE204 000DB164 4E 80 04 21 */ bctrl +/* 800DE204 000DB164 4E 80 04 21 */ bctrl /* 800DE208 000DB168 3A DF 02 00 */ addi r22, r31, 0x200 /* 800DE20C 000DB16C 38 81 00 4C */ addi r4, r1, 0x4c /* 800DE210 000DB170 7E C3 B3 78 */ mr r3, r22 @@ -4009,7 +4009,7 @@ lbl_800DE15C: /* 800DE238 000DB198 81 84 00 00 */ lwz r12, 0(r4) /* 800DE23C 000DB19C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800DE240 000DB1A0 7D 89 03 A6 */ mtctr r12 -/* 800DE244 000DB1A4 4E 80 04 21 */ bctrl +/* 800DE244 000DB1A4 4E 80 04 21 */ bctrl /* 800DE248 000DB1A8 3A DF 02 0C */ addi r22, r31, 0x20c /* 800DE24C 000DB1AC 38 81 00 44 */ addi r4, r1, 0x44 /* 800DE250 000DB1B0 7E C3 B3 78 */ mr r3, r22 @@ -4026,7 +4026,7 @@ lbl_800DE15C: /* 800DE27C 000DB1DC 81 84 00 00 */ lwz r12, 0(r4) /* 800DE280 000DB1E0 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800DE284 000DB1E4 7D 89 03 A6 */ mtctr r12 -/* 800DE288 000DB1E8 4E 80 04 21 */ bctrl +/* 800DE288 000DB1E8 4E 80 04 21 */ bctrl /* 800DE28C 000DB1EC 3A DF 02 18 */ addi r22, r31, 0x218 /* 800DE290 000DB1F0 38 81 00 3C */ addi r4, r1, 0x3c /* 800DE294 000DB1F4 7E C3 B3 78 */ mr r3, r22 @@ -4044,7 +4044,7 @@ lbl_800DE15C: /* 800DE2C4 000DB224 38 A5 01 51 */ addi r5, r5, 0x151 /* 800DE2C8 000DB228 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800DE2CC 000DB22C 7D 89 03 A6 */ mtctr r12 -/* 800DE2D0 000DB230 4E 80 04 21 */ bctrl +/* 800DE2D0 000DB230 4E 80 04 21 */ bctrl /* 800DE2D4 000DB234 38 7F 02 24 */ addi r3, r31, 0x224 /* 800DE2D8 000DB238 38 81 00 34 */ addi r4, r1, 0x34 /* 800DE2DC 000DB23C 48 26 2B CD */ bl __ct__6CTokenFRC6CToken @@ -4086,7 +4086,7 @@ lbl_800DE350: /* 800DE364 000DB2C4 38 A5 01 5F */ addi r5, r5, 0x15f /* 800DE368 000DB2C8 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800DE36C 000DB2CC 7D 89 03 A6 */ mtctr r12 -/* 800DE370 000DB2D0 4E 80 04 21 */ bctrl +/* 800DE370 000DB2D0 4E 80 04 21 */ bctrl /* 800DE374 000DB2D4 38 7F 02 30 */ addi r3, r31, 0x230 /* 800DE378 000DB2D8 38 81 00 24 */ addi r4, r1, 0x24 /* 800DE37C 000DB2DC 48 26 2B 2D */ bl __ct__6CTokenFRC6CToken @@ -4179,7 +4179,7 @@ lbl_800DE42C: /* 800DE4D4 000DB434 81 83 00 00 */ lwz r12, 0(r3) /* 800DE4D8 000DB438 81 8C 00 24 */ lwz r12, 0x24(r12) /* 800DE4DC 000DB43C 7D 89 03 A6 */ mtctr r12 -/* 800DE4E0 000DB440 4E 80 04 21 */ bctrl +/* 800DE4E0 000DB440 4E 80 04 21 */ bctrl /* 800DE4E4 000DB444 38 7F 01 D4 */ addi r3, r31, 0x1d4 /* 800DE4E8 000DB448 48 26 28 9D */ bl Lock__6CTokenFv /* 800DE4EC 000DB44C 38 7F 01 EC */ addi r3, r31, 0x1ec @@ -4211,7 +4211,7 @@ lbl_800DE540: /* 800DE54C 000DB4AC 81 84 00 00 */ lwz r12, 0(r4) /* 800DE550 000DB4B0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800DE554 000DB4B4 7D 89 03 A6 */ mtctr r12 -/* 800DE558 000DB4B8 4E 80 04 21 */ bctrl +/* 800DE558 000DB4B8 4E 80 04 21 */ bctrl /* 800DE55C 000DB4BC 38 61 00 74 */ addi r3, r1, 0x74 /* 800DE560 000DB4C0 38 81 00 1C */ addi r4, r1, 0x1c /* 800DE564 000DB4C4 48 26 29 45 */ bl __ct__6CTokenFRC6CToken @@ -4263,7 +4263,7 @@ lbl_800DE5FC: /* 800DE608 000DB568 81 84 00 00 */ lwz r12, 0(r4) /* 800DE60C 000DB56C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800DE610 000DB570 7D 89 03 A6 */ mtctr r12 -/* 800DE614 000DB574 4E 80 04 21 */ bctrl +/* 800DE614 000DB574 4E 80 04 21 */ bctrl /* 800DE618 000DB578 38 61 00 6C */ addi r3, r1, 0x6c /* 800DE61C 000DB57C 38 81 00 14 */ addi r4, r1, 0x14 /* 800DE620 000DB580 48 26 28 89 */ bl __ct__6CTokenFRC6CToken @@ -4311,7 +4311,7 @@ lbl_800DE698: /* 800DE6B8 000DB618 80 01 01 54 */ lwz r0, 0x154(r1) /* 800DE6BC 000DB61C 7C 08 03 A6 */ mtlr r0 /* 800DE6C0 000DB620 38 21 01 50 */ addi r1, r1, 0x150 -/* 800DE6C4 000DB624 4E 80 00 20 */ blr +/* 800DE6C4 000DB624 4E 80 00 20 */ blr .global "__ct__Q24rstl42vector<6CLight,Q24rstl17rmemory_allocator>FiRC6CLightRCQ24rstl17rmemory_allocator" "__ct__Q24rstl42vector<6CLight,Q24rstl17rmemory_allocator>FiRC6CLightRCQ24rstl17rmemory_allocator": @@ -4352,7 +4352,7 @@ lbl_800DE728: /* 800DE748 000DB6A8 83 A1 00 14 */ lwz r29, 0x14(r1) /* 800DE74C 000DB6AC 7C 08 03 A6 */ mtlr r0 /* 800DE750 000DB6B0 38 21 00 20 */ addi r1, r1, 0x20 -/* 800DE754 000DB6B4 4E 80 00 20 */ blr +/* 800DE754 000DB6B4 4E 80 00 20 */ blr .global sub_800de758 sub_800de758: @@ -4387,7 +4387,7 @@ lbl_800DE7A4: /* 800DE7BC 000DB71C 83 81 00 10 */ lwz r28, 0x10(r1) /* 800DE7C0 000DB720 7C 08 03 A6 */ mtlr r0 /* 800DE7C4 000DB724 38 21 00 20 */ addi r1, r1, 0x20 -/* 800DE7C8 000DB728 4E 80 00 20 */ blr +/* 800DE7C8 000DB728 4E 80 00 20 */ blr .global __sinit_CSamusDoll_cpp __sinit_CSamusDoll_cpp: @@ -4402,4 +4402,4 @@ __sinit_CSamusDoll_cpp: /* 800DE7EC 000DB74C D0 44 00 08 */ stfs f2, 8(r4) /* 800DE7F0 000DB750 D0 23 00 04 */ stfs f1, 4(r3) /* 800DE7F4 000DB754 D0 03 00 08 */ stfs f0, 8(r3) -/* 800DE7F8 000DB758 4E 80 00 20 */ blr +/* 800DE7F8 000DB758 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/CSaveGameScreen.s b/asm/MetroidPrime/CSaveGameScreen.s index f8ee3188..e4c6958b 100644 --- a/asm/MetroidPrime/CSaveGameScreen.s +++ b/asm/MetroidPrime/CSaveGameScreen.s @@ -78,7 +78,7 @@ lbl_805A82D8: .global SetInGame__15CSaveGameScreenb SetInGame__15CSaveGameScreenb: /* 8024F16C 0024C0CC 98 83 00 93 */ stb r4, 0x93(r3) -/* 8024F170 0024C0D0 4E 80 00 20 */ blr +/* 8024F170 0024C0D0 4E 80 00 20 */ blr .global SetUIColors__15CSaveGameScreenFv SetUIColors__15CSaveGameScreenFv: @@ -100,7 +100,7 @@ SetUIColors__15CSaveGameScreenFv: /* 8024F1B0 0024C110 80 01 00 14 */ lwz r0, 0x14(r1) /* 8024F1B4 0024C114 7C 08 03 A6 */ mtlr r0 /* 8024F1B8 0024C118 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024F1BC 0024C11C 4E 80 00 20 */ blr +/* 8024F1BC 0024C11C 4E 80 00 20 */ blr .global DoSelectionChange__15CSaveGameScreenFP14CGuiTableGroup DoSelectionChange__15CSaveGameScreenFP14CGuiTableGroup: @@ -124,7 +124,7 @@ DoSelectionChange__15CSaveGameScreenFP14CGuiTableGroup: /* 8024F204 0024C164 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8024F208 0024C168 7C 08 03 A6 */ mtlr r0 /* 8024F20C 0024C16C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8024F210 0024C170 4E 80 00 20 */ blr +/* 8024F210 0024C170 4E 80 00 20 */ blr .global DoAdvance__15CSaveGameScreenFP14CGuiTableGroup DoAdvance__15CSaveGameScreenFP14CGuiTableGroup: @@ -144,7 +144,7 @@ DoAdvance__15CSaveGameScreenFP14CGuiTableGroup: /* 8024F248 0024C1A8 38 84 8D B8 */ addi r4, r4, lbl_803E8DB8@l /* 8024F24C 0024C1AC 7C 04 00 2E */ lwzx r0, r4, r0 /* 8024F250 0024C1B0 7C 09 03 A6 */ mtctr r0 -/* 8024F254 0024C1B4 4E 80 04 20 */ bctr +/* 8024F254 0024C1B4 4E 80 04 20 */ bctr .global lbl_8024F258 lbl_8024F258: /* 8024F258 0024C1B8 2C 05 00 00 */ cmpwi r5, 0 @@ -422,7 +422,7 @@ lbl_8024F5E0: /* 8024F5E4 0024C544 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8024F5E8 0024C548 7C 08 03 A6 */ mtlr r0 /* 8024F5EC 0024C54C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8024F5F0 0024C550 4E 80 00 20 */ blr +/* 8024F5F0 0024C550 4E 80 00 20 */ blr .global StartGame__15CSaveGameScreenFi StartGame__15CSaveGameScreenFi: @@ -458,7 +458,7 @@ lbl_8024F654: /* 8024F660 0024C5C0 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8024F664 0024C5C4 7C 08 03 A6 */ mtlr r0 /* 8024F668 0024C5C8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8024F66C 0024C5CC 4E 80 00 20 */ blr +/* 8024F66C 0024C5CC 4E 80 00 20 */ blr .global SaveNESState__15CSaveGameScreenFv SaveNESState__15CSaveGameScreenFv: @@ -481,7 +481,7 @@ lbl_8024F6AC: /* 8024F6AC 0024C60C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8024F6B0 0024C610 7C 08 03 A6 */ mtlr r0 /* 8024F6B4 0024C614 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024F6B8 0024C618 4E 80 00 20 */ blr +/* 8024F6B8 0024C618 4E 80 00 20 */ blr .global EraseGame__15CSaveGameScreenFi EraseGame__15CSaveGameScreenFi: @@ -500,7 +500,7 @@ EraseGame__15CSaveGameScreenFi: /* 8024F6EC 0024C64C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8024F6F0 0024C650 7C 08 03 A6 */ mtlr r0 /* 8024F6F4 0024C654 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024F6F8 0024C658 4E 80 00 20 */ blr +/* 8024F6F8 0024C658 4E 80 00 20 */ blr .global GetGameData__15CSaveGameScreenFi GetGameData__15CSaveGameScreenFi: @@ -512,7 +512,7 @@ GetGameData__15CSaveGameScreenFi: /* 8024F710 0024C670 80 01 00 14 */ lwz r0, 0x14(r1) /* 8024F714 0024C674 7C 08 03 A6 */ mtlr r0 /* 8024F718 0024C678 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024F71C 0024C67C 4E 80 00 20 */ blr +/* 8024F71C 0024C67C 4E 80 00 20 */ blr .global Draw__15CSaveGameScreenFv Draw__15CSaveGameScreenFv: @@ -529,7 +529,7 @@ lbl_8024F744: /* 8024F744 0024C6A4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8024F748 0024C6A8 7C 08 03 A6 */ mtlr r0 /* 8024F74C 0024C6AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024F750 0024C6B0 4E 80 00 20 */ blr +/* 8024F750 0024C6B0 4E 80 00 20 */ blr .global ContinueWithoutSaving__15CSaveGameScreenFv ContinueWithoutSaving__15CSaveGameScreenFv: @@ -539,7 +539,7 @@ ContinueWithoutSaving__15CSaveGameScreenFv: /* 8024F760 0024C6C0 80 6D A0 80 */ lwz r3, gpGameState@sda21(r13) /* 8024F764 0024C6C4 90 03 02 14 */ stw r0, 0x214(r3) /* 8024F768 0024C6C8 90 03 02 10 */ stw r0, 0x210(r3) -/* 8024F76C 0024C6CC 4E 80 00 20 */ blr +/* 8024F76C 0024C6CC 4E 80 00 20 */ blr .global ProcessUserInput__15CSaveGameScreenFRC11CFinalInput ProcessUserInput__15CSaveGameScreenFRC11CFinalInput: @@ -554,7 +554,7 @@ lbl_8024F78C: /* 8024F78C 0024C6EC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8024F790 0024C6F0 7C 08 03 A6 */ mtlr r0 /* 8024F794 0024C6F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024F798 0024C6F8 4E 80 00 20 */ blr +/* 8024F798 0024C6F8 4E 80 00 20 */ blr .global Update__15CSaveGameScreenFf Update__15CSaveGameScreenFf: @@ -702,7 +702,7 @@ lbl_8024F980: /* 8024F994 0024C8F4 83 81 00 28 */ lwz r28, 0x28(r1) /* 8024F998 0024C8F8 7C 08 03 A6 */ mtlr r0 /* 8024F99C 0024C8FC 38 21 00 40 */ addi r1, r1, 0x40 -/* 8024F9A0 0024C900 4E 80 00 20 */ blr +/* 8024F9A0 0024C900 4E 80 00 20 */ blr .global PumpLoad__15CSaveGameScreenFv PumpLoad__15CSaveGameScreenFv: @@ -931,7 +931,7 @@ lbl_8024FCC0: /* 8024FCC4 0024CC24 83 E1 00 6C */ lwz r31, 0x6c(r1) /* 8024FCC8 0024CC28 7C 08 03 A6 */ mtlr r0 /* 8024FCCC 0024CC2C 38 21 00 70 */ addi r1, r1, 0x70 -/* 8024FCD0 0024CC30 4E 80 00 20 */ blr +/* 8024FCD0 0024CC30 4E 80 00 20 */ blr .global sub_8024fcd4 sub_8024fcd4: @@ -952,14 +952,14 @@ sub_8024fcd4: /* 8024FD0C 0024CC6C 7F E5 FB 78 */ mr r5, r31 /* 8024FD10 0024CC70 39 81 00 08 */ addi r12, r1, 8 /* 8024FD14 0024CC74 48 13 9C 19 */ bl __ptmf_scall -/* 8024FD18 0024CC78 60 00 00 00 */ nop +/* 8024FD18 0024CC78 60 00 00 00 */ nop /* 8024FD1C 0024CC7C 80 01 00 34 */ lwz r0, 0x34(r1) /* 8024FD20 0024CC80 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8024FD24 0024CC84 83 C1 00 28 */ lwz r30, 0x28(r1) /* 8024FD28 0024CC88 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8024FD2C 0024CC8C 7C 08 03 A6 */ mtlr r0 /* 8024FD30 0024CC90 38 21 00 30 */ addi r1, r1, 0x30 -/* 8024FD34 0024CC94 4E 80 00 20 */ blr +/* 8024FD34 0024CC94 4E 80 00 20 */ blr .global sub_8024fd38 sub_8024fd38: @@ -977,13 +977,13 @@ sub_8024fd38: /* 8024FD64 0024CCC4 7F E4 FB 78 */ mr r4, r31 /* 8024FD68 0024CCC8 39 81 00 08 */ addi r12, r1, 8 /* 8024FD6C 0024CCCC 48 13 9B C1 */ bl __ptmf_scall -/* 8024FD70 0024CCD0 60 00 00 00 */ nop +/* 8024FD70 0024CCD0 60 00 00 00 */ nop /* 8024FD74 0024CCD4 80 01 00 24 */ lwz r0, 0x24(r1) /* 8024FD78 0024CCD8 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8024FD7C 0024CCDC 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8024FD80 0024CCE0 7C 08 03 A6 */ mtlr r0 /* 8024FD84 0024CCE4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8024FD88 0024CCE8 4E 80 00 20 */ blr +/* 8024FD88 0024CCE8 4E 80 00 20 */ blr .global ResetCardDriver__15CSaveGameScreenFv ResetCardDriver__15CSaveGameScreenFv: @@ -1025,7 +1025,7 @@ lbl_8024FDDC: /* 8024FE14 0024CD74 83 C1 00 08 */ lwz r30, 8(r1) /* 8024FE18 0024CD78 7C 08 03 A6 */ mtlr r0 /* 8024FE1C 0024CD7C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024FE20 0024CD80 4E 80 00 20 */ blr +/* 8024FE20 0024CD80 4E 80 00 20 */ blr .global __dt__15CSaveGameScreenFv __dt__15CSaveGameScreenFv: @@ -1125,7 +1125,7 @@ lbl_8024FF58: /* 8024FF6C 0024CECC 83 81 00 20 */ lwz r28, 0x20(r1) /* 8024FF70 0024CED0 7C 08 03 A6 */ mtlr r0 /* 8024FF74 0024CED4 38 21 00 30 */ addi r1, r1, 0x30 -/* 8024FF78 0024CED8 4E 80 00 20 */ blr +/* 8024FF78 0024CED8 4E 80 00 20 */ blr .global __ct__15CSaveGameScreen __ct__15CSaveGameScreen: @@ -1148,7 +1148,7 @@ __ct__15CSaveGameScreen: /* 8024FFBC 0024CF1C 81 84 00 00 */ lwz r12, 0(r4) /* 8024FFC0 0024CF20 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8024FFC4 0024CF24 7D 89 03 A6 */ mtctr r12 -/* 8024FFC8 0024CF28 4E 80 04 21 */ bctrl +/* 8024FFC8 0024CF28 4E 80 04 21 */ bctrl /* 8024FFCC 0024CF2C 3B 9F 00 14 */ addi r28, r31, 0x14 /* 8024FFD0 0024CF30 38 81 00 38 */ addi r4, r1, 0x38 /* 8024FFD4 0024CF34 7F 83 E3 78 */ mr r3, r28 @@ -1164,7 +1164,7 @@ __ct__15CSaveGameScreen: /* 8024FFFC 0024CF5C 81 84 00 00 */ lwz r12, 0(r4) /* 80250000 0024CF60 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80250004 0024CF64 7D 89 03 A6 */ mtctr r12 -/* 80250008 0024CF68 4E 80 04 21 */ bctrl +/* 80250008 0024CF68 4E 80 04 21 */ bctrl /* 8025000C 0024CF6C 3B 9F 00 20 */ addi r28, r31, 0x20 /* 80250010 0024CF70 38 81 00 30 */ addi r4, r1, 0x30 /* 80250014 0024CF74 7F 83 E3 78 */ mr r3, r28 @@ -1180,7 +1180,7 @@ __ct__15CSaveGameScreen: /* 8025003C 0024CF9C 81 84 00 00 */ lwz r12, 0(r4) /* 80250040 0024CFA0 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80250044 0024CFA4 7D 89 03 A6 */ mtctr r12 -/* 80250048 0024CFA8 4E 80 04 21 */ bctrl +/* 80250048 0024CFA8 4E 80 04 21 */ bctrl /* 8025004C 0024CFAC 3B 9F 00 2C */ addi r28, r31, 0x2c /* 80250050 0024CFB0 38 81 00 28 */ addi r4, r1, 0x28 /* 80250054 0024CFB4 7F 83 E3 78 */ mr r3, r28 @@ -1196,7 +1196,7 @@ __ct__15CSaveGameScreen: /* 8025007C 0024CFDC 81 84 00 00 */ lwz r12, 0(r4) /* 80250080 0024CFE0 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80250084 0024CFE4 7D 89 03 A6 */ mtctr r12 -/* 80250088 0024CFE8 4E 80 04 21 */ bctrl +/* 80250088 0024CFE8 4E 80 04 21 */ bctrl /* 8025008C 0024CFEC 3B 9F 00 38 */ addi r28, r31, 0x38 /* 80250090 0024CFF0 38 81 00 20 */ addi r4, r1, 0x20 /* 80250094 0024CFF4 7F 83 E3 78 */ mr r3, r28 @@ -1212,7 +1212,7 @@ __ct__15CSaveGameScreen: /* 802500BC 0024D01C 81 84 00 00 */ lwz r12, 0(r4) /* 802500C0 0024D020 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802500C4 0024D024 7D 89 03 A6 */ mtctr r12 -/* 802500C8 0024D028 4E 80 04 21 */ bctrl +/* 802500C8 0024D028 4E 80 04 21 */ bctrl /* 802500CC 0024D02C 3B 9F 00 44 */ addi r28, r31, 0x44 /* 802500D0 0024D030 38 81 00 18 */ addi r4, r1, 0x18 /* 802500D4 0024D034 7F 83 E3 78 */ mr r3, r28 @@ -1292,7 +1292,7 @@ lbl_802501D4: /* 802501EC 0024D14C 81 84 00 00 */ lwz r12, 0(r4) /* 802501F0 0024D150 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802501F4 0024D154 7D 89 03 A6 */ mtctr r12 -/* 802501F8 0024D158 4E 80 04 21 */ bctrl +/* 802501F8 0024D158 4E 80 04 21 */ bctrl /* 802501FC 0024D15C 38 61 00 40 */ addi r3, r1, 0x40 /* 80250200 0024D160 38 81 00 08 */ addi r4, r1, 8 /* 80250204 0024D164 48 0F 0C A5 */ bl __ct__6CTokenFRC6CToken @@ -1343,7 +1343,7 @@ lbl_8025027C: /* 802502A8 0024D208 83 81 00 50 */ lwz r28, 0x50(r1) /* 802502AC 0024D20C 7C 08 03 A6 */ mtlr r0 /* 802502B0 0024D210 38 21 00 60 */ addi r1, r1, 0x60 -/* 802502B4 0024D214 4E 80 00 20 */ blr +/* 802502B4 0024D214 4E 80 00 20 */ blr .global ConstructCardDriver__15CSaveGameScreen ConstructCardDriver__15CSaveGameScreen: @@ -1368,21 +1368,21 @@ ConstructCardDriver__15CSaveGameScreen: /* 80250300 0024D260 81 83 00 00 */ lwz r12, 0(r3) /* 80250304 0024D264 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80250308 0024D268 7D 89 03 A6 */ mtctr r12 -/* 8025030C 0024D26C 4E 80 04 21 */ bctrl +/* 8025030C 0024D26C 4E 80 04 21 */ bctrl /* 80250310 0024D270 7C 7E 1B 78 */ mr r30, r3 /* 80250314 0024D274 80 6D A0 60 */ lwz r3, gpResourceFactory@sda21(r13) /* 80250318 0024D278 80 82 B8 BC */ lwz r4, lbl_805AD5DC@sda21(r2) /* 8025031C 0024D27C 81 83 00 00 */ lwz r12, 0(r3) /* 80250320 0024D280 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80250324 0024D284 7D 89 03 A6 */ mtctr r12 -/* 80250328 0024D288 4E 80 04 21 */ bctrl +/* 80250328 0024D288 4E 80 04 21 */ bctrl /* 8025032C 0024D28C 7C 7F 1B 78 */ mr r31, r3 /* 80250330 0024D290 80 6D A0 60 */ lwz r3, gpResourceFactory@sda21(r13) /* 80250334 0024D294 80 82 B8 B8 */ lwz r4, lbl_805AD5D8@sda21(r2) /* 80250338 0024D298 81 83 00 00 */ lwz r12, 0(r3) /* 8025033C 0024D29C 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80250340 0024D2A0 7D 89 03 A6 */ mtctr r12 -/* 80250344 0024D2A4 4E 80 04 21 */ bctrl +/* 80250344 0024D2A4 4E 80 04 21 */ bctrl /* 80250348 0024D2A8 80 A3 00 04 */ lwz r5, 4(r3) /* 8025034C 0024D2AC 7F A3 EB 78 */ mr r3, r29 /* 80250350 0024D2B0 80 DF 00 04 */ lwz r6, 4(r31) @@ -1400,7 +1400,7 @@ lbl_80250368: /* 8025037C 0024D2DC 83 81 00 10 */ lwz r28, 0x10(r1) /* 80250380 0024D2E0 7C 08 03 A6 */ mtlr r0 /* 80250384 0024D2E4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80250388 0024D2E8 4E 80 00 20 */ blr +/* 80250388 0024D2E8 4E 80 00 20 */ blr .global SetUIText__15CSaveGameScreenFv SetUIText__15CSaveGameScreenFv: @@ -1425,7 +1425,7 @@ SetUIText__15CSaveGameScreenFv: /* 802503D4 0024D334 38 63 8D FC */ addi r3, r3, lbl_803E8DFC@l /* 802503D8 0024D338 7C 03 00 2E */ lwzx r0, r3, r0 /* 802503DC 0024D33C 7C 09 03 A6 */ mtctr r0 -/* 802503E0 0024D340 4E 80 04 20 */ bctr +/* 802503E0 0024D340 4E 80 04 20 */ bctr .global lbl_802503E4 lbl_802503E4: /* 802503E4 0024D344 3B 20 00 18 */ li r25, 0x18 @@ -1751,7 +1751,7 @@ lbl_802507E8: /* 80250814 0024D774 80 01 00 D4 */ lwz r0, 0xd4(r1) /* 80250818 0024D778 7C 08 03 A6 */ mtlr r0 /* 8025081C 0024D77C 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 80250820 0024D780 4E 80 00 20 */ blr +/* 80250820 0024D780 4E 80 00 20 */ blr .global SelectUIType__15CSaveGameScreenFv SelectUIType__15CSaveGameScreenFv: @@ -1842,7 +1842,7 @@ lbl_8025093C: /* 80250944 0024D8A4 83 C1 00 08 */ lwz r30, 8(r1) /* 80250948 0024D8A8 7C 08 03 A6 */ mtlr r0 /* 8025094C 0024D8AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80250950 0024D8B0 4E 80 00 20 */ blr +/* 80250950 0024D8B0 4E 80 00 20 */ blr .global IsHiddenFromFrontEnd__15CSaveGameScreenFv IsHiddenFromFrontEnd__15CSaveGameScreenFv: @@ -1856,10 +1856,10 @@ IsHiddenFromFrontEnd__15CSaveGameScreenFv: /* 80250970 0024D8D0 48 00 00 0C */ b lbl_8025097C lbl_80250974: /* 80250974 0024D8D4 38 60 00 00 */ li r3, 0 -/* 80250978 0024D8D8 4E 80 00 20 */ blr +/* 80250978 0024D8D8 4E 80 00 20 */ blr lbl_8025097C: /* 8025097C 0024D8DC 38 60 00 01 */ li r3, 1 -/* 80250980 0024D8E0 4E 80 00 20 */ blr +/* 80250980 0024D8E0 4E 80 00 20 */ blr .global sub_80250984 sub_80250984: diff --git a/asm/MetroidPrime/CScriptMailbox.s b/asm/MetroidPrime/CScriptMailbox.s index bdf895a8..bd85ca6b 100644 --- a/asm/MetroidPrime/CScriptMailbox.s +++ b/asm/MetroidPrime/CScriptMailbox.s @@ -31,14 +31,14 @@ lbl_800E1A50: /* 800E1A60 000DE9C0 7C 03 00 40 */ cmplw r3, r0 /* 800E1A64 000DE9C4 40 82 00 0C */ bne lbl_800E1A70 /* 800E1A68 000DE9C8 38 60 00 01 */ li r3, 1 -/* 800E1A6C 000DE9CC 4E 80 00 20 */ blr +/* 800E1A6C 000DE9CC 4E 80 00 20 */ blr lbl_800E1A70: /* 800E1A70 000DE9D0 38 C6 00 04 */ addi r6, r6, 4 lbl_800E1A74: /* 800E1A74 000DE9D4 7C 06 28 40 */ cmplw r6, r5 /* 800E1A78 000DE9D8 40 82 FF D8 */ bne lbl_800E1A50 /* 800E1A7C 000DE9DC 38 60 00 00 */ li r3, 0 -/* 800E1A80 000DE9E0 4E 80 00 20 */ blr +/* 800E1A80 000DE9E0 4E 80 00 20 */ blr .global RemoveRelay__14CScriptMailboxF9TEditorId RemoveRelay__14CScriptMailboxF9TEditorId: @@ -57,9 +57,9 @@ lbl_800E1A9C: /* 800E1AB0 000DEA10 40 82 00 4C */ bne lbl_800E1AFC /* 800E1AB4 000DEA14 38 03 00 04 */ addi r0, r3, 4 /* 800E1AB8 000DEA18 7C 07 00 40 */ cmplw r7, r0 -/* 800E1ABC 000DEA1C 4D 80 00 20 */ bltlr +/* 800E1ABC 000DEA1C 4D 80 00 20 */ bltlr /* 800E1AC0 000DEA20 7C 07 30 40 */ cmplw r7, r6 -/* 800E1AC4 000DEA24 4C 80 00 20 */ bgelr +/* 800E1AC4 000DEA24 4C 80 00 20 */ bgelr /* 800E1AC8 000DEA28 7C E5 3B 78 */ mr r5, r7 /* 800E1ACC 000DEA2C 48 00 00 10 */ b lbl_800E1ADC lbl_800E1AD0: @@ -74,13 +74,13 @@ lbl_800E1ADC: /* 800E1AEC 000DEA4C 41 80 FF E4 */ blt lbl_800E1AD0 /* 800E1AF0 000DEA50 38 04 FF FF */ addi r0, r4, -1 /* 800E1AF4 000DEA54 90 03 00 00 */ stw r0, 0(r3) -/* 800E1AF8 000DEA58 4E 80 00 20 */ blr +/* 800E1AF8 000DEA58 4E 80 00 20 */ blr lbl_800E1AFC: /* 800E1AFC 000DEA5C 38 E7 00 04 */ addi r7, r7, 4 lbl_800E1B00: /* 800E1B00 000DEA60 7C 07 30 40 */ cmplw r7, r6 /* 800E1B04 000DEA64 40 82 FF 98 */ bne lbl_800E1A9C -/* 800E1B08 000DEA68 4E 80 00 20 */ blr +/* 800E1B08 000DEA68 4E 80 00 20 */ blr .global AddRelay__14CScriptMailboxF9TEditorId AddRelay__14CScriptMailboxF9TEditorId: @@ -96,7 +96,7 @@ lbl_800E1B24: /* 800E1B2C 000DEA8C 54 A5 01 BE */ clrlwi r5, r5, 6 /* 800E1B30 000DEA90 54 00 01 BE */ clrlwi r0, r0, 6 /* 800E1B34 000DEA94 7C 05 00 40 */ cmplw r5, r0 -/* 800E1B38 000DEA98 4D 82 00 20 */ beqlr +/* 800E1B38 000DEA98 4D 82 00 20 */ beqlr /* 800E1B3C 000DEA9C 38 E7 00 04 */ addi r7, r7, 4 lbl_800E1B40: /* 800E1B40 000DEAA0 7C 07 30 40 */ cmplw r7, r6 @@ -109,7 +109,7 @@ lbl_800E1B58: /* 800E1B58 000DEAB8 80 83 00 00 */ lwz r4, 0(r3) /* 800E1B5C 000DEABC 38 04 00 01 */ addi r0, r4, 1 /* 800E1B60 000DEAC0 90 03 00 00 */ stw r0, 0(r3) -/* 800E1B64 000DEAC4 4E 80 00 20 */ blr +/* 800E1B64 000DEAC4 4E 80 00 20 */ blr .global SendMsgs__14CScriptMailboxFRC7TAreaIdR13CStateManager SendMsgs__14CScriptMailboxFRC7TAreaIdR13CStateManager: @@ -204,7 +204,7 @@ lbl_800E1CA8: /* 800E1CAC 000DEC0C 80 01 00 54 */ lwz r0, 0x54(r1) /* 800E1CB0 000DEC10 7C 08 03 A6 */ mtlr r0 /* 800E1CB4 000DEC14 38 21 00 50 */ addi r1, r1, 0x50 -/* 800E1CB8 000DEC18 4E 80 00 20 */ blr +/* 800E1CB8 000DEC18 4E 80 00 20 */ blr .global PutTo__14CScriptMailboxCFR13COutputStream PutTo__14CScriptMailboxCFR13COutputStream: @@ -302,7 +302,7 @@ lbl_800E1DF4: /* 800E1DF8 000DED58 80 01 00 54 */ lwz r0, 0x54(r1) /* 800E1DFC 000DED5C 7C 08 03 A6 */ mtlr r0 /* 800E1E00 000DED60 38 21 00 50 */ addi r1, r1, 0x50 -/* 800E1E04 000DED64 4E 80 00 20 */ blr +/* 800E1E04 000DED64 4E 80 00 20 */ blr .global __dt__14CScriptMailboxFv __dt__14CScriptMailboxFv: @@ -355,7 +355,7 @@ lbl_800E1E9C: /* 800E1EA8 000DEE08 83 C1 00 08 */ lwz r30, 8(r1) /* 800E1EAC 000DEE0C 7C 08 03 A6 */ mtlr r0 /* 800E1EB0 000DEE10 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E1EB4 000DEE14 4E 80 00 20 */ blr +/* 800E1EB4 000DEE14 4E 80 00 20 */ blr .global __ct__14CScriptMailboxFR12CInputStreamRC10CSaveWorld __ct__14CScriptMailboxFR12CInputStreamRC10CSaveWorld: @@ -465,7 +465,7 @@ lbl_800E2014: /* 800E201C 000DEF7C 80 01 00 44 */ lwz r0, 0x44(r1) /* 800E2020 000DEF80 7C 08 03 A6 */ mtlr r0 /* 800E2024 000DEF84 38 21 00 40 */ addi r1, r1, 0x40 -/* 800E2028 000DEF88 4E 80 00 20 */ blr +/* 800E2028 000DEF88 4E 80 00 20 */ blr .global __ct__14CScriptMailboxFv __ct__14CScriptMailboxFv: diff --git a/asm/MetroidPrime/CSimpleShadow.s b/asm/MetroidPrime/CSimpleShadow.s index cdf5f789..c153b178 100644 --- a/asm/MetroidPrime/CSimpleShadow.s +++ b/asm/MetroidPrime/CSimpleShadow.s @@ -18,7 +18,7 @@ lbl_805A757C: Valid__13CSimpleShadowCFv: /* 80105B00 00102A60 88 03 00 48 */ lbz r0, 0x48(r3) /* 80105B04 00102A64 54 03 CF FE */ rlwinm r3, r0, 0x19, 0x1f, 0x1f -/* 80105B08 00102A68 4E 80 00 20 */ blr +/* 80105B08 00102A68 4E 80 00 20 */ blr .global GetMaxShadowBox__13CSimpleShadowCFRC6CAABox GetMaxShadowBox__13CSimpleShadowCFRC6CAABox: @@ -111,7 +111,7 @@ GetMaxShadowBox__13CSimpleShadowCFRC6CAABox: /* 80105C64 00102BC4 83 A1 00 54 */ lwz r29, 0x54(r1) /* 80105C68 00102BC8 7C 08 03 A6 */ mtlr r0 /* 80105C6C 00102BCC 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 80105C70 00102BD0 4E 80 00 20 */ blr +/* 80105C70 00102BD0 4E 80 00 20 */ blr .global GetBounds__13CSimpleShadowCFv GetBounds__13CSimpleShadowCFv: @@ -145,28 +145,28 @@ GetBounds__13CSimpleShadowCFv: /* 80105CE0 00102C40 80 01 00 34 */ lwz r0, 0x34(r1) /* 80105CE4 00102C44 7C 08 03 A6 */ mtlr r0 /* 80105CE8 00102C48 38 21 00 30 */ addi r1, r1, 0x30 -/* 80105CEC 00102C4C 4E 80 00 20 */ blr +/* 80105CEC 00102C4C 4E 80 00 20 */ blr .global sub_80105cf0 sub_80105cf0: /* 80105CF0 00102C50 88 03 00 48 */ lbz r0, 0x48(r3) /* 80105CF4 00102C54 50 80 36 72 */ rlwimi r0, r4, 6, 0x19, 0x19 /* 80105CF8 00102C58 98 03 00 48 */ stb r0, 0x48(r3) -/* 80105CFC 00102C5C 4E 80 00 20 */ blr +/* 80105CFC 00102C5C 4E 80 00 20 */ blr .global GetMaxObjectHeight__13CSimpleShadowCFv GetMaxObjectHeight__13CSimpleShadowCFv: /* 80105D00 00102C60 C0 23 00 40 */ lfs f1, 0x40(r3) -/* 80105D04 00102C64 4E 80 00 20 */ blr +/* 80105D04 00102C64 4E 80 00 20 */ blr .global SetUserAlpha__13CSimpleShadowFf SetUserAlpha__13CSimpleShadowFf: /* 80105D08 00102C68 D0 23 00 38 */ stfs f1, 0x38(r3) -/* 80105D0C 00102C6C 4E 80 00 20 */ blr +/* 80105D0C 00102C6C 4E 80 00 20 */ blr .global GetTransform__13CSimpleShadowCFv GetTransform__13CSimpleShadowCFv: -/* 80105D10 00102C70 4E 80 00 20 */ blr +/* 80105D10 00102C70 4E 80 00 20 */ blr .global Render__13CSimpleShadowCFPC8CTexture Render__13CSimpleShadowCFPC8CTexture: @@ -190,7 +190,7 @@ Render__13CSimpleShadowCFPC8CTexture: /* 80105D58 00102CB8 81 83 00 00 */ lwz r12, 0(r3) /* 80105D5C 00102CBC 81 8C 00 30 */ lwz r12, 0x30(r12) /* 80105D60 00102CC0 7D 89 03 A6 */ mtctr r12 -/* 80105D64 00102CC4 4E 80 04 21 */ bctrl +/* 80105D64 00102CC4 4E 80 04 21 */ bctrl /* 80105D68 00102CC8 7F E3 FB 78 */ mr r3, r31 /* 80105D6C 00102CCC 38 80 00 00 */ li r4, 0 /* 80105D70 00102CD0 38 A0 00 01 */ li r5, 1 @@ -279,7 +279,7 @@ lbl_80105EA0: /* 80105EB8 00102E18 83 C1 00 48 */ lwz r30, 0x48(r1) /* 80105EBC 00102E1C 7C 08 03 A6 */ mtlr r0 /* 80105EC0 00102E20 38 21 00 70 */ addi r1, r1, 0x70 -/* 80105EC4 00102E24 4E 80 00 20 */ blr +/* 80105EC4 00102E24 4E 80 00 20 */ blr .global Calculate__13CSimpleShadowFRC6CAABoxRC12CTransform4fRC13CStateManager Calculate__13CSimpleShadowFRC6CAABoxRC12CTransform4fRC13CStateManager: @@ -578,7 +578,7 @@ lbl_80106308: /* 80106330 00103290 83 C1 09 68 */ lwz r30, 0x968(r1) /* 80106334 00103294 7C 08 03 A6 */ mtlr r0 /* 80106338 00103298 38 21 09 B0 */ addi r1, r1, 0x9b0 -/* 8010633C 0010329C 4E 80 00 20 */ blr +/* 8010633C 0010329C 4E 80 00 20 */ blr .global __ct__13CSimpleShadowFffff __ct__13CSimpleShadowFffff: diff --git a/asm/MetroidPrime/CSlideShow.s b/asm/MetroidPrime/CSlideShow.s index bddbd1e8..7e8953b6 100644 --- a/asm/MetroidPrime/CSlideShow.s +++ b/asm/MetroidPrime/CSlideShow.s @@ -126,7 +126,7 @@ lbl_805A9168: .global GetIsContinueDraw__10CSlideShowFv GetIsContinueDraw__10CSlideShowFv: /* 802979E4 00294944 38 60 00 00 */ li r3, 0 -/* 802979E8 00294948 4E 80 00 20 */ blr +/* 802979E8 00294948 4E 80 00 20 */ blr .global sub_802979ec sub_802979ec: @@ -208,7 +208,7 @@ lbl_80297AA4: /* 80297B0C 00294A6C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80297B10 00294A70 7C 08 03 A6 */ mtlr r0 /* 80297B14 00294A74 38 21 00 30 */ addi r1, r1, 0x30 -/* 80297B18 00294A78 4E 80 00 20 */ blr +/* 80297B18 00294A78 4E 80 00 20 */ blr .global sub_80297b1c sub_80297b1c: @@ -275,7 +275,7 @@ lbl_80297BFC: /* 80297C04 00294B64 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80297C08 00294B68 7C 08 03 A6 */ mtlr r0 /* 80297C0C 00294B6C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80297C10 00294B70 4E 80 00 20 */ blr +/* 80297C10 00294B70 4E 80 00 20 */ blr .global sub_80297c14 sub_80297c14: @@ -365,7 +365,7 @@ lbl_80297D4C: /* 80297D50 00294CB0 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 80297D54 00294CB4 7C 08 03 A6 */ mtlr r0 /* 80297D58 00294CB8 38 21 00 40 */ addi r1, r1, 0x40 -/* 80297D5C 00294CBC 4E 80 00 20 */ blr +/* 80297D5C 00294CBC 4E 80 00 20 */ blr .global sub_80297d60 sub_80297d60: @@ -654,7 +654,7 @@ lbl_80298178: /* 802981B4 00295114 83 81 00 80 */ lwz r28, 0x80(r1) /* 802981B8 00295118 7C 08 03 A6 */ mtlr r0 /* 802981BC 0029511C 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 802981C0 00295120 4E 80 00 20 */ blr +/* 802981C0 00295120 4E 80 00 20 */ blr .global sub_802981c4 sub_802981c4: @@ -682,7 +682,7 @@ sub_802981c4: /* 80298218 00295178 C0 22 C0 04 */ lfs f1, lbl_805ADD24@sda21(r2) /* 8029821C 0029517C C0 42 C0 08 */ lfs f2, lbl_805ADD28@sda21(r2) /* 80298220 00295180 7D 89 03 A6 */ mtctr r12 -/* 80298224 00295184 4E 80 04 21 */ bctrl +/* 80298224 00295184 4E 80 04 21 */ bctrl /* 80298228 00295188 3C 60 80 5A */ lis r3, skIdentity4f@ha /* 8029822C 0029518C 38 63 66 70 */ addi r3, r3, skIdentity4f@l /* 80298230 00295190 48 07 45 1D */ bl SetViewPointMatrix__9CGraphicsFRC12CTransform4f @@ -814,12 +814,12 @@ sub_802981c4: /* 80298428 00295388 39 00 00 00 */ li r8, 0 /* 8029842C 0029538C 81 8C 00 D8 */ lwz r12, 0xd8(r12) /* 80298430 00295390 7D 89 03 A6 */ mtctr r12 -/* 80298434 00295394 4E 80 04 21 */ bctrl +/* 80298434 00295394 4E 80 04 21 */ bctrl /* 80298438 00295398 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 8029843C 0029539C 81 83 00 00 */ lwz r12, 0(r3) /* 80298440 002953A0 81 8C 00 68 */ lwz r12, 0x68(r12) /* 80298444 002953A4 7D 89 03 A6 */ mtctr r12 -/* 80298448 002953A8 4E 80 04 21 */ bctrl +/* 80298448 002953A8 4E 80 04 21 */ bctrl lbl_8029844C: /* 8029844C 002953AC E3 E1 01 48 */ psq_l f31, 328(r1), 0, qr0 /* 80298450 002953B0 80 01 01 54 */ lwz r0, 0x154(r1) @@ -829,7 +829,7 @@ lbl_8029844C: /* 80298460 002953C0 83 A1 01 34 */ lwz r29, 0x134(r1) /* 80298464 002953C4 7C 08 03 A6 */ mtlr r0 /* 80298468 002953C8 38 21 01 50 */ addi r1, r1, 0x150 -/* 8029846C 002953CC 4E 80 00 20 */ blr +/* 8029846C 002953CC 4E 80 00 20 */ blr .global sub_80298470 sub_80298470: @@ -853,7 +853,7 @@ sub_80298470: /* 802984B4 00295414 C0 22 C0 04 */ lfs f1, lbl_805ADD24@sda21(r2) /* 802984B8 00295418 C0 42 C0 08 */ lfs f2, lbl_805ADD28@sda21(r2) /* 802984BC 0029541C 7D 89 03 A6 */ mtctr r12 -/* 802984C0 00295420 4E 80 04 21 */ bctrl +/* 802984C0 00295420 4E 80 04 21 */ bctrl /* 802984C4 00295424 6F E3 80 00 */ xoris r3, r31, 0x8000 /* 802984C8 00295428 3C 00 43 30 */ lis r0, 0x4330 /* 802984CC 0029542C 90 61 00 4C */ stw r3, 0x4c(r1) @@ -872,7 +872,7 @@ sub_80298470: /* 80298500 00295460 81 83 00 00 */ lwz r12, 0(r3) /* 80298504 00295464 81 8C 00 30 */ lwz r12, 0x30(r12) /* 80298508 00295468 7D 89 03 A6 */ mtctr r12 -/* 8029850C 0029546C 4E 80 04 21 */ bctrl +/* 8029850C 0029546C 4E 80 04 21 */ bctrl /* 80298510 00295470 38 60 00 00 */ li r3, 0 /* 80298514 00295474 48 07 35 5D */ bl SetCullMode__9CGraphicsF12ERglCullMode /* 80298518 00295478 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) @@ -881,7 +881,7 @@ sub_80298470: /* 80298524 00295484 81 83 00 00 */ lwz r12, 0(r3) /* 80298528 00295488 81 8C 00 60 */ lwz r12, 0x60(r12) /* 8029852C 0029548C 7D 89 03 A6 */ mtctr r12 -/* 80298530 00295490 4E 80 04 21 */ bctrl +/* 80298530 00295490 4E 80 04 21 */ bctrl /* 80298534 00295494 80 7E 00 C4 */ lwz r3, 0xc4(r30) /* 80298538 00295498 48 03 10 0D */ bl Render__15CGuiTextSupportFv /* 8029853C 0029549C 7F C3 F3 78 */ mr r3, r30 @@ -892,7 +892,7 @@ lbl_80298544: /* 8029854C 002954AC 83 C1 00 58 */ lwz r30, 0x58(r1) /* 80298550 002954B0 7C 08 03 A6 */ mtlr r0 /* 80298554 002954B4 38 21 00 60 */ addi r1, r1, 0x60 -/* 80298558 002954B8 4E 80 00 20 */ blr +/* 80298558 002954B8 4E 80 00 20 */ blr .global sub_8029855c sub_8029855c: @@ -998,7 +998,7 @@ lbl_802986C4: /* 802986D0 00295630 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 802986D4 00295634 7C 08 03 A6 */ mtlr r0 /* 802986D8 00295638 38 21 00 40 */ addi r1, r1, 0x40 -/* 802986DC 0029563C 4E 80 00 20 */ blr +/* 802986DC 0029563C 4E 80 00 20 */ blr .global sub_802986e0 sub_802986e0: @@ -1039,7 +1039,7 @@ sub_802986e0: /* 80298768 002956C8 81 8C 00 54 */ lwz r12, 0x54(r12) /* 8029876C 002956CC C0 42 C0 08 */ lfs f2, lbl_805ADD28@sda21(r2) /* 80298770 002956D0 7D 89 03 A6 */ mtctr r12 -/* 80298774 002956D4 4E 80 04 21 */ bctrl +/* 80298774 002956D4 4E 80 04 21 */ bctrl /* 80298778 002956D8 6F C3 80 00 */ xoris r3, r30, 0x8000 /* 8029877C 002956DC 3C 00 43 30 */ lis r0, 0x4330 /* 80298780 002956E0 90 61 00 6C */ stw r3, 0x6c(r1) @@ -1058,7 +1058,7 @@ sub_802986e0: /* 802987B4 00295714 81 83 00 00 */ lwz r12, 0(r3) /* 802987B8 00295718 81 8C 00 30 */ lwz r12, 0x30(r12) /* 802987BC 0029571C 7D 89 03 A6 */ mtctr r12 -/* 802987C0 00295720 4E 80 04 21 */ bctrl +/* 802987C0 00295720 4E 80 04 21 */ bctrl /* 802987C4 00295724 38 60 00 00 */ li r3, 0 /* 802987C8 00295728 48 07 32 A9 */ bl SetCullMode__9CGraphicsF12ERglCullMode /* 802987CC 0029572C 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) @@ -1067,7 +1067,7 @@ sub_802986e0: /* 802987D8 00295738 81 83 00 00 */ lwz r12, 0(r3) /* 802987DC 0029573C 81 8C 00 60 */ lwz r12, 0x60(r12) /* 802987E0 00295740 7D 89 03 A6 */ mtctr r12 -/* 802987E4 00295744 4E 80 04 21 */ bctrl +/* 802987E4 00295744 4E 80 04 21 */ bctrl /* 802987E8 00295748 83 DF 00 C8 */ lwz r30, 0xc8(r31) /* 802987EC 0029574C 48 0B 17 C1 */ bl White__6CColorFv /* 802987F0 00295750 88 83 00 03 */ lbz r4, 3(r3) @@ -1135,7 +1135,7 @@ lbl_802988C4: /* 802988E4 00295844 83 C1 00 78 */ lwz r30, 0x78(r1) /* 802988E8 00295848 7C 08 03 A6 */ mtlr r0 /* 802988EC 0029584C 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 802988F0 00295850 4E 80 00 20 */ blr +/* 802988F0 00295850 4E 80 00 20 */ blr .global sub_802988f4 sub_802988f4: @@ -1150,14 +1150,14 @@ lbl_80298908: /* 80298910 00295870 28 00 00 00 */ cmplwi r0, 0 /* 80298914 00295874 40 82 00 0C */ bne lbl_80298920 /* 80298918 00295878 38 60 00 00 */ li r3, 0 -/* 8029891C 0029587C 4E 80 00 20 */ blr +/* 8029891C 0029587C 4E 80 00 20 */ blr lbl_80298920: /* 80298920 00295880 38 A5 00 08 */ addi r5, r5, 8 lbl_80298924: /* 80298924 00295884 7C 05 20 40 */ cmplw r5, r4 /* 80298928 00295888 40 82 FF E0 */ bne lbl_80298908 /* 8029892C 0029588C 38 60 00 01 */ li r3, 1 -/* 80298930 00295890 4E 80 00 20 */ blr +/* 80298930 00295890 4E 80 00 20 */ blr .global sub_80298934 sub_80298934: @@ -1195,7 +1195,7 @@ lbl_8029897C: /* 802989A0 00295900 83 A1 00 14 */ lwz r29, 0x14(r1) /* 802989A4 00295904 7C 08 03 A6 */ mtlr r0 /* 802989A8 00295908 38 21 00 20 */ addi r1, r1, 0x20 -/* 802989AC 0029590C 4E 80 00 20 */ blr +/* 802989AC 0029590C 4E 80 00 20 */ blr .global sub_802989b0 sub_802989b0: @@ -1233,7 +1233,7 @@ lbl_802989F8: /* 80298A1C 0029597C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80298A20 00295980 7C 08 03 A6 */ mtlr r0 /* 80298A24 00295984 38 21 00 20 */ addi r1, r1, 0x20 -/* 80298A28 00295988 4E 80 00 20 */ blr +/* 80298A28 00295988 4E 80 00 20 */ blr .global sub_80298a2c sub_80298a2c: @@ -1277,7 +1277,7 @@ sub_80298a2c: /* 80298AC0 00295A20 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80298AC4 00295A24 7C 08 03 A6 */ mtlr r0 /* 80298AC8 00295A28 38 21 00 30 */ addi r1, r1, 0x30 -/* 80298ACC 00295A2C 4E 80 00 20 */ blr +/* 80298ACC 00295A2C 4E 80 00 20 */ blr .global sub_80298ad0 sub_80298ad0: @@ -1315,7 +1315,7 @@ lbl_80298B40: /* 80298B44 00295AA4 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80298B48 00295AA8 7C 08 03 A6 */ mtlr r0 /* 80298B4C 00295AAC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80298B50 00295AB0 4E 80 00 20 */ blr +/* 80298B50 00295AB0 4E 80 00 20 */ blr .global sub_80298b54 sub_80298b54: @@ -1353,7 +1353,7 @@ lbl_80298BC4: /* 80298BC8 00295B28 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80298BCC 00295B2C 7C 08 03 A6 */ mtlr r0 /* 80298BD0 00295B30 38 21 00 20 */ addi r1, r1, 0x20 -/* 80298BD4 00295B34 4E 80 00 20 */ blr +/* 80298BD4 00295B34 4E 80 00 20 */ blr .global sub_80298bd8 sub_80298bd8: @@ -1776,7 +1776,7 @@ lbl_80299224: /* 80299244 002961A4 83 C1 01 F8 */ lwz r30, 0x1f8(r1) /* 80299248 002961A8 7C 08 03 A6 */ mtlr r0 /* 8029924C 002961AC 38 21 02 30 */ addi r1, r1, 0x230 -/* 80299250 002961B0 4E 80 00 20 */ blr +/* 80299250 002961B0 4E 80 00 20 */ blr .global sub_80299254 sub_80299254: @@ -1877,7 +1877,7 @@ lbl_802993A4: /* 802993B8 00296318 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802993BC 0029631C 7C 08 03 A6 */ mtlr r0 /* 802993C0 00296320 38 21 00 30 */ addi r1, r1, 0x30 -/* 802993C4 00296324 4E 80 00 20 */ blr +/* 802993C4 00296324 4E 80 00 20 */ blr .global sub_802993c8 sub_802993c8: @@ -1913,7 +1913,7 @@ sub_802993c8: /* 8029943C 0029639C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80299440 002963A0 7C 08 03 A6 */ mtlr r0 /* 80299444 002963A4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80299448 002963A8 4E 80 00 20 */ blr +/* 80299448 002963A8 4E 80 00 20 */ blr .global sub_8029944c sub_8029944c: @@ -1935,7 +1935,7 @@ sub_8029944c: /* 80299488 002963E8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8029948C 002963EC 7C 08 03 A6 */ mtlr r0 /* 80299490 002963F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80299494 002963F4 4E 80 00 20 */ blr +/* 80299494 002963F4 4E 80 00 20 */ blr .global sub_80299498 sub_80299498: @@ -1946,10 +1946,10 @@ sub_80299498: /* 802994A8 00296408 54 80 D7 FF */ rlwinm. r0, r4, 0x1a, 0x1f, 0x1f /* 802994AC 0029640C 40 82 00 0C */ bne lbl_802994B8 /* 802994B0 00296410 54 80 DF FF */ rlwinm. r0, r4, 0x1b, 0x1f, 0x1f -/* 802994B4 00296414 4D 82 00 20 */ beqlr +/* 802994B4 00296414 4D 82 00 20 */ beqlr lbl_802994B8: /* 802994B8 00296418 38 60 00 01 */ li r3, 1 -/* 802994BC 0029641C 4E 80 00 20 */ blr +/* 802994BC 0029641C 4E 80 00 20 */ blr .global sub_802994c0 sub_802994c0: @@ -1965,7 +1965,7 @@ sub_802994c0: /* 802994E4 00296444 88 03 01 34 */ lbz r0, 0x134(r3) /* 802994E8 00296448 50 A0 3E 30 */ rlwimi r0, r5, 7, 0x18, 0x18 /* 802994EC 0029644C 98 03 01 34 */ stb r0, 0x134(r3) -/* 802994F0 00296450 4E 80 00 20 */ blr +/* 802994F0 00296450 4E 80 00 20 */ blr .global sub_802994f4 sub_802994f4: @@ -2024,7 +2024,7 @@ lbl_80299540: /* 802995C0 00296520 81 84 00 00 */ lwz r12, 0(r4) /* 802995C4 00296524 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802995C8 00296528 7D 89 03 A6 */ mtctr r12 -/* 802995CC 0029652C 4E 80 04 21 */ bctrl +/* 802995CC 0029652C 4E 80 04 21 */ bctrl /* 802995D0 00296530 7F A3 EB 78 */ mr r3, r29 /* 802995D4 00296534 38 81 00 10 */ addi r4, r1, 0x10 /* 802995D8 00296538 3B C0 00 01 */ li r30, 1 @@ -2106,7 +2106,7 @@ lbl_802996D8: /* 802996E8 00296648 83 81 00 20 */ lwz r28, 0x20(r1) /* 802996EC 0029664C 7C 08 03 A6 */ mtlr r0 /* 802996F0 00296650 38 21 00 30 */ addi r1, r1, 0x30 -/* 802996F4 00296654 4E 80 00 20 */ blr +/* 802996F4 00296654 4E 80 00 20 */ blr .global sub_802996f8 sub_802996f8: @@ -2208,7 +2208,7 @@ lbl_80299848: /* 80299854 002967B4 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80299858 002967B8 7C 08 03 A6 */ mtlr r0 /* 8029985C 002967BC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80299860 002967C0 4E 80 00 20 */ blr +/* 80299860 002967C0 4E 80 00 20 */ blr .global ProcessUserInput__10CSlideShowFRC11CFinalInput ProcessUserInput__10CSlideShowFRC11CFinalInput: @@ -2453,7 +2453,7 @@ lbl_80299BB8: /* 80299BC4 00296B24 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80299BC8 00296B28 7C 08 03 A6 */ mtlr r0 /* 80299BCC 00296B2C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80299BD0 00296B30 4E 80 00 20 */ blr +/* 80299BD0 00296B30 4E 80 00 20 */ blr .global UpdatePersistentScanPercent__FUiUiUi UpdatePersistentScanPercent__FUiUiUi: @@ -2565,7 +2565,7 @@ lbl_80299D48: /* 80299D70 00296CD0 81 83 00 00 */ lwz r12, 0(r3) /* 80299D74 00296CD4 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80299D78 00296CD8 7D 89 03 A6 */ mtctr r12 -/* 80299D7C 00296CDC 4E 80 04 21 */ bctrl +/* 80299D7C 00296CDC 4E 80 04 21 */ bctrl /* 80299D80 00296CE0 83 E3 00 04 */ lwz r31, 4(r3) /* 80299D84 00296CE4 38 61 00 30 */ addi r3, r1, 0x30 /* 80299D88 00296CE8 48 0A 3D 59 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" @@ -2584,7 +2584,7 @@ lbl_80299D98: /* 80299DB4 00296D14 83 A1 00 84 */ lwz r29, 0x84(r1) /* 80299DB8 00296D18 7C 08 03 A6 */ mtlr r0 /* 80299DBC 00296D1C 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 80299DC0 00296D20 4E 80 00 20 */ blr +/* 80299DC0 00296D20 4E 80 00 20 */ blr .global CalculateScanCompletionRate__13CStateManagerFv CalculateScanCompletionRate__13CStateManagerFv: @@ -2629,7 +2629,7 @@ lbl_80299E40: lbl_80299E48: /* 80299E48 00296DA8 91 43 00 00 */ stw r10, 0(r3) /* 80299E4C 00296DAC 91 23 00 04 */ stw r9, 4(r3) -/* 80299E50 00296DB0 4E 80 00 20 */ blr +/* 80299E50 00296DB0 4E 80 00 20 */ blr .global IsDataLoreResearchScan__FUi IsDataLoreResearchScan__FUi: @@ -2705,7 +2705,7 @@ lbl_80299F48: /* 80299F4C 00296EAC 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 80299F50 00296EB0 7C 08 03 A6 */ mtlr r0 /* 80299F54 00296EB4 38 21 00 40 */ addi r1, r1, 0x40 -/* 80299F58 00296EB8 4E 80 00 20 */ blr +/* 80299F58 00296EB8 4E 80 00 20 */ blr .global Draw__10CSlideShowFv Draw__10CSlideShowFv: @@ -2821,7 +2821,7 @@ lbl_8029A0D0: /* 8029A0E4 00297044 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8029A0E8 00297048 7C 08 03 A6 */ mtlr r0 /* 8029A0EC 0029704C 38 21 00 40 */ addi r1, r1, 0x40 -/* 8029A0F0 00297050 4E 80 00 20 */ blr +/* 8029A0F0 00297050 4E 80 00 20 */ blr .global OnMessage__10CSlideShowFv OnMessage__10CSlideShowFv: @@ -2983,7 +2983,7 @@ lbl_8029A2FC: /* 8029A324 00297284 81 83 00 00 */ lwz r12, 0(r3) /* 8029A328 00297288 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 8029A32C 0029728C 7D 89 03 A6 */ mtctr r12 -/* 8029A330 00297290 4E 80 04 21 */ bctrl +/* 8029A330 00297290 4E 80 04 21 */ bctrl /* 8029A334 00297294 7C 79 1B 79 */ or. r25, r3, r3 /* 8029A338 00297298 40 82 00 A0 */ bne lbl_8029A3D8 /* 8029A33C 0029729C 80 1F 00 D4 */ lwz r0, 0xd4(r31) @@ -3044,7 +3044,7 @@ lbl_8029A3D8: /* 8029A408 00297368 81 84 00 00 */ lwz r12, 0(r4) /* 8029A40C 0029736C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8029A410 00297370 7D 89 03 A6 */ mtctr r12 -/* 8029A414 00297374 4E 80 04 21 */ bctrl +/* 8029A414 00297374 4E 80 04 21 */ bctrl /* 8029A418 00297378 7F 43 D3 78 */ mr r3, r26 /* 8029A41C 0029737C 38 81 00 30 */ addi r4, r1, 0x30 /* 8029A420 00297380 3B 60 00 01 */ li r27, 1 @@ -3122,7 +3122,7 @@ lbl_8029A500: /* 8029A520 00297480 81 83 00 00 */ lwz r12, 0(r3) /* 8029A524 00297484 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 8029A528 00297488 7D 89 03 A6 */ mtctr r12 -/* 8029A52C 0029748C 4E 80 04 21 */ bctrl +/* 8029A52C 0029748C 4E 80 04 21 */ bctrl /* 8029A530 00297490 3C 80 80 3D */ lis r4, lbl_803D5C48@ha /* 8029A534 00297494 7C 79 1B 78 */ mr r25, r3 /* 8029A538 00297498 38 84 5C 48 */ addi r4, r4, lbl_803D5C48@l @@ -3139,7 +3139,7 @@ lbl_8029A500: /* 8029A564 002974C4 81 84 00 00 */ lwz r12, 0(r4) /* 8029A568 002974C8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8029A56C 002974CC 7D 89 03 A6 */ mtctr r12 -/* 8029A570 002974D0 4E 80 04 21 */ bctrl +/* 8029A570 002974D0 4E 80 04 21 */ bctrl /* 8029A574 002974D4 7F 43 D3 78 */ mr r3, r26 /* 8029A578 002974D8 38 81 00 20 */ addi r4, r1, 0x20 /* 8029A57C 002974DC 3B 80 00 01 */ li r28, 1 @@ -3569,7 +3569,7 @@ lbl_8029AB88: /* 8029ABA4 00297B04 80 01 01 24 */ lwz r0, 0x124(r1) /* 8029ABA8 00297B08 7C 08 03 A6 */ mtlr r0 /* 8029ABAC 00297B0C 38 21 01 20 */ addi r1, r1, 0x120 -/* 8029ABB0 00297B10 4E 80 00 20 */ blr +/* 8029ABB0 00297B10 4E 80 00 20 */ blr .global sub_8029abb4 sub_8029abb4: @@ -3583,7 +3583,7 @@ sub_8029abb4: /* 8029ABD0 00297B30 81 83 00 00 */ lwz r12, 0(r3) /* 8029ABD4 00297B34 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 8029ABD8 00297B38 7D 89 03 A6 */ mtctr r12 -/* 8029ABDC 00297B3C 4E 80 04 21 */ bctrl +/* 8029ABDC 00297B3C 4E 80 04 21 */ bctrl /* 8029ABE0 00297B40 7C 7F 1B 79 */ or. r31, r3, r3 /* 8029ABE4 00297B44 41 82 00 C4 */ beq lbl_8029ACA8 /* 8029ABE8 00297B48 80 7F 00 00 */ lwz r3, 0(r31) @@ -3604,7 +3604,7 @@ lbl_8029AC14: /* 8029AC20 00297B80 81 84 00 00 */ lwz r12, 0(r4) /* 8029AC24 00297B84 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8029AC28 00297B88 7D 89 03 A6 */ mtctr r12 -/* 8029AC2C 00297B8C 4E 80 04 21 */ bctrl +/* 8029AC2C 00297B8C 4E 80 04 21 */ bctrl /* 8029AC30 00297B90 38 61 00 08 */ addi r3, r1, 8 /* 8029AC34 00297B94 38 81 00 10 */ addi r4, r1, 0x10 /* 8029AC38 00297B98 48 0A 62 71 */ bl __ct__6CTokenFRC6CToken @@ -3649,7 +3649,7 @@ lbl_8029ACB4: /* 8029ACBC 00297C1C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8029ACC0 00297C20 7C 08 03 A6 */ mtlr r0 /* 8029ACC4 00297C24 38 21 00 20 */ addi r1, r1, 0x20 -/* 8029ACC8 00297C28 4E 80 00 20 */ blr +/* 8029ACC8 00297C28 4E 80 00 20 */ blr .global sub_8029accc sub_8029accc: @@ -3799,7 +3799,7 @@ lbl_8029AEA8: /* 8029AECC 00297E2C 81 83 00 00 */ lwz r12, 0(r3) /* 8029AED0 00297E30 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 8029AED4 00297E34 7D 89 03 A6 */ mtctr r12 -/* 8029AED8 00297E38 4E 80 04 21 */ bctrl +/* 8029AED8 00297E38 4E 80 04 21 */ bctrl /* 8029AEDC 00297E3C 80 1D 00 08 */ lwz r0, 8(r29) /* 8029AEE0 00297E40 7C 76 1B 78 */ mr r22, r3 /* 8029AEE4 00297E44 80 BD 00 0C */ lwz r5, 0xc(r29) @@ -3847,7 +3847,7 @@ lbl_8029AF6C: /* 8029AF70 00297ED0 80 01 00 84 */ lwz r0, 0x84(r1) /* 8029AF74 00297ED4 7C 08 03 A6 */ mtlr r0 /* 8029AF78 00297ED8 38 21 00 80 */ addi r1, r1, 0x80 -/* 8029AF7C 00297EDC 4E 80 00 20 */ blr +/* 8029AF7C 00297EDC 4E 80 00 20 */ blr .global sub_8029af80 sub_8029af80: @@ -3930,7 +3930,7 @@ lbl_8029B078: /* 8029B090 00297FF0 80 01 00 24 */ lwz r0, 0x24(r1) /* 8029B094 00297FF4 7C 08 03 A6 */ mtlr r0 /* 8029B098 00297FF8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8029B09C 00297FFC 4E 80 00 20 */ blr +/* 8029B09C 00297FFC 4E 80 00 20 */ blr .global sub_8029b0a0 sub_8029b0a0: @@ -3952,7 +3952,7 @@ sub_8029b0a0: /* 8029B0DC 0029803C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8029B0E0 00298040 7C 08 03 A6 */ mtlr r0 /* 8029B0E4 00298044 38 21 00 20 */ addi r1, r1, 0x20 -/* 8029B0E8 00298048 4E 80 00 20 */ blr +/* 8029B0E8 00298048 4E 80 00 20 */ blr .global sub_8029b0ec sub_8029b0ec: @@ -4020,7 +4020,7 @@ lbl_8029B19C: /* 8029B1C4 00298124 80 01 00 34 */ lwz r0, 0x34(r1) /* 8029B1C8 00298128 7C 08 03 A6 */ mtlr r0 /* 8029B1CC 0029812C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8029B1D0 00298130 4E 80 00 20 */ blr +/* 8029B1D0 00298130 4E 80 00 20 */ blr .global SlideShowGalleryFlags__10CSlideShowFv SlideShowGalleryFlags__10CSlideShowFv: @@ -4058,7 +4058,7 @@ lbl_8029B238: /* 8029B240 002981A0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8029B244 002981A4 7C 08 03 A6 */ mtlr r0 /* 8029B248 002981A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8029B24C 002981AC 4E 80 00 20 */ blr +/* 8029B24C 002981AC 4E 80 00 20 */ blr .global __dt__10CSlideShowFv __dt__10CSlideShowFv: @@ -4262,7 +4262,7 @@ lbl_8029B500: /* 8029B514 00298474 83 81 00 50 */ lwz r28, 0x50(r1) /* 8029B518 00298478 7C 08 03 A6 */ mtlr r0 /* 8029B51C 0029847C 38 21 00 60 */ addi r1, r1, 0x60 -/* 8029B520 00298480 4E 80 00 20 */ blr +/* 8029B520 00298480 4E 80 00 20 */ blr .global sub_8029b524 sub_8029b524: @@ -4302,7 +4302,7 @@ lbl_8029B594: /* 8029B5A0 00298500 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8029B5A4 00298504 7C 08 03 A6 */ mtlr r0 /* 8029B5A8 00298508 38 21 00 20 */ addi r1, r1, 0x20 -/* 8029B5AC 0029850C 4E 80 00 20 */ blr +/* 8029B5AC 0029850C 4E 80 00 20 */ blr .global sub_8029b5b0 sub_8029b5b0: @@ -4327,7 +4327,7 @@ lbl_8029B5DC: /* 8029B5F0 00298550 83 C1 00 08 */ lwz r30, 8(r1) /* 8029B5F4 00298554 7C 08 03 A6 */ mtlr r0 /* 8029B5F8 00298558 38 21 00 10 */ addi r1, r1, 0x10 -/* 8029B5FC 0029855C 4E 80 00 20 */ blr +/* 8029B5FC 0029855C 4E 80 00 20 */ blr .global sub_8029b600 sub_8029b600: @@ -4360,7 +4360,7 @@ lbl_8029B65C: /* 8029B65C 002985BC 80 01 00 24 */ lwz r0, 0x24(r1) /* 8029B660 002985C0 7C 08 03 A6 */ mtlr r0 /* 8029B664 002985C4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8029B668 002985C8 4E 80 00 20 */ blr +/* 8029B668 002985C8 4E 80 00 20 */ blr .global sub_8029b66c sub_8029b66c: @@ -4414,7 +4414,7 @@ lbl_8029B70C: /* 8029B714 00298674 80 01 00 34 */ lwz r0, 0x34(r1) /* 8029B718 00298678 7C 08 03 A6 */ mtlr r0 /* 8029B71C 0029867C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8029B720 00298680 4E 80 00 20 */ blr +/* 8029B720 00298680 4E 80 00 20 */ blr .global __ct__10CSlideShowFv __ct__10CSlideShowFv: @@ -4584,7 +4584,7 @@ __ct__10CSlideShowFv: /* 8029B9B0 00298910 83 84 00 0C */ lwz r28, 0xc(r4) /* 8029B9B4 00298914 80 85 00 14 */ lwz r4, 0x14(r5) /* 8029B9B8 00298918 7D 89 03 A6 */ mtctr r12 -/* 8029B9BC 0029891C 4E 80 04 21 */ bctrl +/* 8029B9BC 0029891C 4E 80 04 21 */ bctrl /* 8029B9C0 00298920 3C 80 80 3D */ lis r4, lbl_803D5C48@ha /* 8029B9C4 00298924 7C 7E 1B 78 */ mr r30, r3 /* 8029B9C8 00298928 38 84 5C 48 */ addi r4, r4, lbl_803D5C48@l @@ -4685,7 +4685,7 @@ lbl_8029BB14: /* 8029BB34 00298A94 81 84 00 00 */ lwz r12, 0(r4) /* 8029BB38 00298A98 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8029BB3C 00298A9C 7D 89 03 A6 */ mtctr r12 -/* 8029BB40 00298AA0 4E 80 04 21 */ bctrl +/* 8029BB40 00298AA0 4E 80 04 21 */ bctrl /* 8029BB44 00298AA4 80 1F 00 FC */ lwz r0, 0xfc(r31) /* 8029BB48 00298AA8 80 BF 01 00 */ lwz r5, 0x100(r31) /* 8029BB4C 00298AAC 7C 00 28 00 */ cmpw r0, r5 @@ -4765,7 +4765,7 @@ lbl_8029BC40: /* 8029BC60 00298BC0 81 84 00 00 */ lwz r12, 0(r4) /* 8029BC64 00298BC4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8029BC68 00298BC8 7D 89 03 A6 */ mtctr r12 -/* 8029BC6C 00298BCC 4E 80 04 21 */ bctrl +/* 8029BC6C 00298BCC 4E 80 04 21 */ bctrl /* 8029BC70 00298BD0 80 1F 01 0C */ lwz r0, 0x10c(r31) /* 8029BC74 00298BD4 80 BF 01 10 */ lwz r5, 0x110(r31) /* 8029BC78 00298BD8 7C 00 28 00 */ cmpw r0, r5 @@ -4813,7 +4813,7 @@ lbl_8029BCB4: /* 8029BD14 00298C74 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 8029BD18 00298C78 7C 08 03 A6 */ mtlr r0 /* 8029BD1C 00298C7C 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 8029BD20 00298C80 4E 80 00 20 */ blr +/* 8029BD20 00298C80 4E 80 00 20 */ blr .global sub_8029bd24 sub_8029bd24: @@ -4973,7 +4973,7 @@ lbl_8029BF68: /* 8029BF7C 00298EDC 80 01 00 D4 */ lwz r0, 0xd4(r1) /* 8029BF80 00298EE0 7C 08 03 A6 */ mtlr r0 /* 8029BF84 00298EE4 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 8029BF88 00298EE8 4E 80 00 20 */ blr +/* 8029BF88 00298EE8 4E 80 00 20 */ blr .global sub_8029bf8c sub_8029bf8c: @@ -5005,43 +5005,43 @@ lbl_8029BFD0: /* 8029BFE0 00298F40 38 63 BF D4 */ addi r3, r3, lbl_803EBFD4@l /* 8029BFE4 00298F44 7C 03 00 2E */ lwzx r0, r3, r0 /* 8029BFE8 00298F48 7C 09 03 A6 */ mtctr r0 -/* 8029BFEC 00298F4C 4E 80 04 20 */ bctr +/* 8029BFEC 00298F4C 4E 80 04 20 */ bctr .global lbl_8029BFF0 lbl_8029BFF0: /* 8029BFF0 00298F50 38 60 00 01 */ li r3, 1 -/* 8029BFF4 00298F54 4E 80 00 20 */ blr +/* 8029BFF4 00298F54 4E 80 00 20 */ blr .global lbl_8029BFF8 lbl_8029BFF8: /* 8029BFF8 00298F58 38 60 00 02 */ li r3, 2 -/* 8029BFFC 00298F5C 4E 80 00 20 */ blr +/* 8029BFFC 00298F5C 4E 80 00 20 */ blr .global lbl_8029C000 lbl_8029C000: /* 8029C000 00298F60 38 60 00 03 */ li r3, 3 -/* 8029C004 00298F64 4E 80 00 20 */ blr +/* 8029C004 00298F64 4E 80 00 20 */ blr .global lbl_8029C008 lbl_8029C008: /* 8029C008 00298F68 38 60 00 04 */ li r3, 4 -/* 8029C00C 00298F6C 4E 80 00 20 */ blr +/* 8029C00C 00298F6C 4E 80 00 20 */ blr .global lbl_8029C010 lbl_8029C010: /* 8029C010 00298F70 38 60 00 05 */ li r3, 5 -/* 8029C014 00298F74 4E 80 00 20 */ blr +/* 8029C014 00298F74 4E 80 00 20 */ blr .global lbl_8029C018 lbl_8029C018: /* 8029C018 00298F78 38 60 00 06 */ li r3, 6 -/* 8029C01C 00298F7C 4E 80 00 20 */ blr +/* 8029C01C 00298F7C 4E 80 00 20 */ blr .global lbl_8029C020 lbl_8029C020: /* 8029C020 00298F80 38 60 00 07 */ li r3, 7 -/* 8029C024 00298F84 4E 80 00 20 */ blr +/* 8029C024 00298F84 4E 80 00 20 */ blr .global lbl_8029C028 lbl_8029C028: /* 8029C028 00298F88 38 60 00 08 */ li r3, 8 -/* 8029C02C 00298F8C 4E 80 00 20 */ blr +/* 8029C02C 00298F8C 4E 80 00 20 */ blr .global lbl_8029C030 lbl_8029C030: /* 8029C030 00298F90 38 60 00 00 */ li r3, 0 -/* 8029C034 00298F94 4E 80 00 20 */ blr +/* 8029C034 00298F94 4E 80 00 20 */ blr .global sub_8029c038 sub_8029c038: @@ -5095,7 +5095,7 @@ lbl_8029C0D4: /* 8029C0E8 00299048 80 01 00 34 */ lwz r0, 0x34(r1) /* 8029C0EC 0029904C 7C 08 03 A6 */ mtlr r0 /* 8029C0F0 00299050 38 21 00 30 */ addi r1, r1, 0x30 -/* 8029C0F4 00299054 4E 80 00 20 */ blr +/* 8029C0F4 00299054 4E 80 00 20 */ blr .global sub_8029c0f8 sub_8029c0f8: @@ -5167,7 +5167,7 @@ lbl_8029C1CC: /* 8029C1D8 00299138 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8029C1DC 0029913C 7C 08 03 A6 */ mtlr r0 /* 8029C1E0 00299140 38 21 00 30 */ addi r1, r1, 0x30 -/* 8029C1E4 00299144 4E 80 00 20 */ blr +/* 8029C1E4 00299144 4E 80 00 20 */ blr .global sub_8029c1e8 sub_8029c1e8: @@ -5227,7 +5227,7 @@ lbl_8029C2A0: /* 8029C2AC 0029920C 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8029C2B0 00299210 7C 08 03 A6 */ mtlr r0 /* 8029C2B4 00299214 38 21 00 30 */ addi r1, r1, 0x30 -/* 8029C2B8 00299218 4E 80 00 20 */ blr +/* 8029C2B8 00299218 4E 80 00 20 */ blr .global sub_8029c2bc sub_8029c2bc: @@ -5251,7 +5251,7 @@ lbl_8029C2E8: /* 8029C2F8 00299258 83 C1 00 08 */ lwz r30, 8(r1) /* 8029C2FC 0029925C 7C 08 03 A6 */ mtlr r0 /* 8029C300 00299260 38 21 00 10 */ addi r1, r1, 0x10 -/* 8029C304 00299264 4E 80 00 20 */ blr +/* 8029C304 00299264 4E 80 00 20 */ blr .global sub_8029c308 sub_8029c308: @@ -5327,7 +5327,7 @@ lbl_8029C3E0: /* 8029C3FC 0029935C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8029C400 00299360 7C 08 03 A6 */ mtlr r0 /* 8029C404 00299364 38 21 00 20 */ addi r1, r1, 0x20 -/* 8029C408 00299368 4E 80 00 20 */ blr +/* 8029C408 00299368 4E 80 00 20 */ blr .global sub_8029c40c sub_8029c40c: @@ -5413,7 +5413,7 @@ lbl_8029C51C: /* 8029C520 00299480 80 01 00 34 */ lwz r0, 0x34(r1) /* 8029C524 00299484 7C 08 03 A6 */ mtlr r0 /* 8029C528 00299488 38 21 00 30 */ addi r1, r1, 0x30 -/* 8029C52C 0029948C 4E 80 00 20 */ blr +/* 8029C52C 0029948C 4E 80 00 20 */ blr .global sub_8029c530 sub_8029c530: @@ -5427,7 +5427,7 @@ sub_8029c530: /* 8029C54C 002994AC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8029C550 002994B0 7C 08 03 A6 */ mtlr r0 /* 8029C554 002994B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8029C558 002994B8 4E 80 00 20 */ blr +/* 8029C558 002994B8 4E 80 00 20 */ blr .global sub_8029c55c sub_8029c55c: @@ -5435,7 +5435,7 @@ sub_8029c55c: /* 8029C560 002994C0 54 80 18 38 */ slwi r0, r4, 3 /* 8029C564 002994C4 7C 05 02 14 */ add r0, r5, r0 /* 8029C568 002994C8 90 03 00 00 */ stw r0, 0(r3) -/* 8029C56C 002994CC 4E 80 00 20 */ blr +/* 8029C56C 002994CC 4E 80 00 20 */ blr .global sub_8029c570 sub_8029c570: @@ -5455,7 +5455,7 @@ sub_8029c570: /* 8029C5A4 00299504 80 01 00 24 */ lwz r0, 0x24(r1) /* 8029C5A8 00299508 7C 08 03 A6 */ mtlr r0 /* 8029C5AC 0029950C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8029C5B0 00299510 4E 80 00 20 */ blr +/* 8029C5B0 00299510 4E 80 00 20 */ blr .global sub_8029c5b4 sub_8029c5b4: @@ -5464,7 +5464,7 @@ sub_8029c5b4: /* 8029C5BC 0029951C 7C 03 00 50 */ subf r0, r3, r0 /* 8029C5C0 00299520 7C 00 1E 70 */ srawi r0, r0, 3 /* 8029C5C4 00299524 7C 60 01 94 */ addze r3, r0 -/* 8029C5C8 00299528 4E 80 00 20 */ blr +/* 8029C5C8 00299528 4E 80 00 20 */ blr .global __sinit_CSlideShow_cpp __sinit_CSlideShow_cpp: diff --git a/asm/MetroidPrime/CSortedLists.s b/asm/MetroidPrime/CSortedLists.s index c8864fc1..3683ef29 100644 --- a/asm/MetroidPrime/CSortedLists.s +++ b/asm/MetroidPrime/CSortedLists.s @@ -104,7 +104,7 @@ lbl_801496F4: /* 80149720 00146680 80 01 00 54 */ lwz r0, 0x54(r1) /* 80149724 00146684 7C 08 03 A6 */ mtlr r0 /* 80149728 00146688 38 21 00 50 */ addi r1, r1, 0x50 -/* 8014972C 0014668C 4E 80 00 20 */ blr +/* 8014972C 0014668C 4E 80 00 20 */ blr .global "BuildNearList__Q22SL18CSortedListManagerCFRQ24rstl32reserved_vector<9TUniqueId,1024>RC6CActorRC6CAABox" "BuildNearList__Q22SL18CSortedListManagerCFRQ24rstl32reserved_vector<9TUniqueId,1024>RC6CActorRC6CAABox": @@ -166,7 +166,7 @@ lbl_801497EC: /* 801497FC 0014675C 80 01 00 34 */ lwz r0, 0x34(r1) /* 80149800 00146760 7C 08 03 A6 */ mtlr r0 /* 80149804 00146764 38 21 00 30 */ addi r1, r1, 0x30 -/* 80149808 00146768 4E 80 00 20 */ blr +/* 80149808 00146768 4E 80 00 20 */ blr .global "BuildNearList__Q22SL18CSortedListManagerCFRQ24rstl32reserved_vector<9TUniqueId,1024>RC6CAABoxRC15CMaterialFilterPC6CActor" "BuildNearList__Q22SL18CSortedListManagerCFRQ24rstl32reserved_vector<9TUniqueId,1024>RC6CAABoxRC15CMaterialFilterPC6CActor": @@ -216,7 +216,7 @@ lbl_80149898: /* 801498A8 00146808 80 01 00 24 */ lwz r0, 0x24(r1) /* 801498AC 0014680C 7C 08 03 A6 */ mtlr r0 /* 801498B0 00146810 38 21 00 20 */ addi r1, r1, 0x20 -/* 801498B4 00146814 4E 80 00 20 */ blr +/* 801498B4 00146814 4E 80 00 20 */ blr .global ConstructIntersectionArray__Q22SL18CSortedListManagerCFRC6CAABox ConstructIntersectionArray__Q22SL18CSortedListManagerCFRC6CAABox: @@ -414,7 +414,7 @@ lbl_80149B98: /* 80149B9C 00146AFC 80 01 00 74 */ lwz r0, 0x74(r1) /* 80149BA0 00146B00 7C 08 03 A6 */ mtlr r0 /* 80149BA4 00146B04 38 21 00 70 */ addi r1, r1, 0x70 -/* 80149BA8 00146B08 4E 80 00 20 */ blr +/* 80149BA8 00146B08 4E 80 00 20 */ blr .global CalculateIntersections__Q22SL18CSortedListManagerCFQ22SL12ESortedListsQ22SL12ESortedListsssssQ22SL12ESortedListsQ22SL12ESortedListsQ22SL12ESortedListsQ22SL12ESortedListsRC6CAABox CalculateIntersections__Q22SL18CSortedListManagerCFQ22SL12ESortedListsQ22SL12ESortedListsssssQ22SL12ESortedListsQ22SL12ESortedListsQ22SL12ESortedListsQ22SL12ESortedListsRC6CAABox: @@ -584,7 +584,7 @@ lbl_80149DE4: /* 80149DF8 00146D58 A8 61 00 0A */ lha r3, 0xa(r1) /* 80149DFC 00146D5C 7C 08 03 A6 */ mtlr r0 /* 80149E00 00146D60 38 21 00 50 */ addi r1, r1, 0x50 -/* 80149E04 00146D64 4E 80 00 20 */ blr +/* 80149E04 00146D64 4E 80 00 20 */ blr .global AddToLinkedList__Q22SL18CSortedListManagerCFsRsRs AddToLinkedList__Q22SL18CSortedListManagerCFsRsRs: @@ -597,20 +597,20 @@ AddToLinkedList__Q22SL18CSortedListManagerCFsRsRs: /* 80149E20 00146D80 B1 03 00 28 */ sth r8, 0x28(r3) /* 80149E24 00146D84 B0 86 00 00 */ sth r4, 0(r6) /* 80149E28 00146D88 B0 85 00 00 */ sth r4, 0(r5) -/* 80149E2C 00146D8C 4E 80 00 20 */ blr +/* 80149E2C 00146D8C 4E 80 00 20 */ blr lbl_80149E30: /* 80149E30 00146D90 7C 87 07 34 */ extsh r7, r4 /* 80149E34 00146D94 1C 07 00 2C */ mulli r0, r7, 0x2c /* 80149E38 00146D98 7C 63 02 14 */ add r3, r3, r0 /* 80149E3C 00146D9C A8 03 00 28 */ lha r0, 0x28(r3) /* 80149E40 00146DA0 2C 00 FF FF */ cmpwi r0, -1 -/* 80149E44 00146DA4 4C 82 00 20 */ bnelr +/* 80149E44 00146DA4 4C 82 00 20 */ bnelr /* 80149E48 00146DA8 A8 06 00 00 */ lha r0, 0(r6) /* 80149E4C 00146DAC 7C 07 00 00 */ cmpw r7, r0 -/* 80149E50 00146DB0 4D 82 00 20 */ beqlr +/* 80149E50 00146DB0 4D 82 00 20 */ beqlr /* 80149E54 00146DB4 B1 03 00 28 */ sth r8, 0x28(r3) /* 80149E58 00146DB8 B0 85 00 00 */ sth r4, 0(r5) -/* 80149E5C 00146DBC 4E 80 00 20 */ blr +/* 80149E5C 00146DBC 4E 80 00 20 */ blr .global Move__Q22SL18CSortedListManagerFPC6CActorRC6CAABox Move__Q22SL18CSortedListManagerFPC6CActorRC6CAABox: @@ -664,7 +664,7 @@ Move__Q22SL18CSortedListManagerFPC6CActorRC6CAABox: /* 80149F1C 00146E7C 83 C1 00 08 */ lwz r30, 8(r1) /* 80149F20 00146E80 7C 08 03 A6 */ mtlr r0 /* 80149F24 00146E84 38 21 00 10 */ addi r1, r1, 0x10 -/* 80149F28 00146E88 4E 80 00 20 */ blr +/* 80149F28 00146E88 4E 80 00 20 */ blr .global Remove__Q22SL18CSortedListManagerFPC6CActor Remove__Q22SL18CSortedListManagerFPC6CActor: @@ -714,7 +714,7 @@ lbl_80149FCC: /* 80149FD4 00146F34 83 C1 00 08 */ lwz r30, 8(r1) /* 80149FD8 00146F38 7C 08 03 A6 */ mtlr r0 /* 80149FDC 00146F3C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80149FE0 00146F40 4E 80 00 20 */ blr +/* 80149FE0 00146F40 4E 80 00 20 */ blr .global Insert__Q22SL18CSortedListManagerFP6CActorRC6CAABox Insert__Q22SL18CSortedListManagerFP6CActorRC6CAABox: @@ -795,7 +795,7 @@ lbl_8014A0FC: /* 8014A104 00147064 83 C1 00 38 */ lwz r30, 0x38(r1) /* 8014A108 00147068 7C 08 03 A6 */ mtlr r0 /* 8014A10C 0014706C 38 21 00 40 */ addi r1, r1, 0x40 -/* 8014A110 00147070 4E 80 00 20 */ blr +/* 8014A110 00147070 4E 80 00 20 */ blr .global MoveInList__Q22SL18CSortedListManagerFQ22SL12ESortedListss MoveInList__Q22SL18CSortedListManagerFQ22SL12ESortedListss: @@ -843,7 +843,7 @@ lbl_8014A1AC: /* 8014A1B0 00147110 7C CA 07 34 */ extsh r10, r6 /* 8014A1B4 00147114 38 E7 FF FF */ addi r7, r7, -1 /* 8014A1B8 00147118 7C 0A 38 00 */ cmpw r10, r7 -/* 8014A1BC 0014711C 4C 80 00 20 */ bgelr +/* 8014A1BC 0014711C 4C 80 00 20 */ bgelr /* 8014A1C0 00147120 55 49 08 3C */ slwi r9, r10, 1 /* 8014A1C4 00147124 39 89 00 02 */ addi r12, r9, 2 /* 8014A1C8 00147128 7D 05 4A AE */ lhax r8, r5, r9 @@ -857,7 +857,7 @@ lbl_8014A1AC: /* 8014A1E8 00147148 7C 03 44 2E */ lfsx f0, r3, r8 /* 8014A1EC 0014714C 7C 23 3C 2E */ lfsx f1, r3, r7 /* 8014A1F0 00147150 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8014A1F4 00147154 4C 80 00 20 */ bgelr +/* 8014A1F4 00147154 4C 80 00 20 */ bgelr /* 8014A1F8 00147158 38 EB 00 1C */ addi r7, r11, 0x1c /* 8014A1FC 0014715C 39 0A 00 01 */ addi r8, r10, 1 /* 8014A200 00147160 7C C4 3B 2E */ sthx r6, r4, r7 @@ -871,7 +871,7 @@ lbl_8014A1AC: /* 8014A220 00147180 7C E5 63 2E */ sthx r7, r5, r12 /* 8014A224 00147184 7D 05 4B 2E */ sthx r8, r5, r9 /* 8014A228 00147188 4B FF FF 0C */ b lbl_8014A134 -/* 8014A22C 0014718C 4E 80 00 20 */ blr +/* 8014A22C 0014718C 4E 80 00 20 */ blr .global RemoveFromList__Q22SL18CSortedListManagerFQ22SL12ESortedListss RemoveFromList__Q22SL18CSortedListManagerFQ22SL12ESortedListss: @@ -900,7 +900,7 @@ lbl_8014A278: /* 8014A280 001471E0 7C 07 00 00 */ cmpw r7, r0 /* 8014A284 001471E4 41 80 FF D4 */ blt lbl_8014A258 /* 8014A288 001471E8 90 06 08 00 */ stw r0, 0x800(r6) -/* 8014A28C 001471EC 4E 80 00 20 */ blr +/* 8014A28C 001471EC 4E 80 00 20 */ blr .global InsertInList__Q22SL18CSortedListManagerFQ22SL12ESortedListsRQ22SL5SNode InsertInList__Q22SL18CSortedListManagerFQ22SL12ESortedListsRQ22SL5SNode: @@ -1003,7 +1003,7 @@ lbl_8014A3D8: /* 8014A3F4 00147354 38 84 00 01 */ addi r4, r4, 1 /* 8014A3F8 00147358 90 86 08 00 */ stw r4, 0x800(r6) /* 8014A3FC 0014735C B0 03 00 1C */ sth r0, 0x1c(r3) -/* 8014A400 00147360 4E 80 00 20 */ blr +/* 8014A400 00147360 4E 80 00 20 */ blr .global FindInListUpper__Q22SL18CSortedListManagerCFQ22SL12ESortedListsf FindInListUpper__Q22SL18CSortedListManagerCFQ22SL12ESortedListsf: @@ -1038,7 +1038,7 @@ lbl_8014A468: /* 8014A468 001473C8 2C 07 00 00 */ cmpwi r7, 0 /* 8014A46C 001473CC 41 81 FF B8 */ bgt lbl_8014A424 /* 8014A470 001473D0 7D 23 07 34 */ extsh r3, r9 -/* 8014A474 001473D4 4E 80 00 20 */ blr +/* 8014A474 001473D4 4E 80 00 20 */ blr .global FindInListLower__Q22SL18CSortedListManagerCFQ22SL12ESortedListsf FindInListLower__Q22SL18CSortedListManagerCFQ22SL12ESortedListsf: @@ -1073,7 +1073,7 @@ lbl_8014A4DC: /* 8014A4DC 0014743C 2C 07 00 00 */ cmpwi r7, 0 /* 8014A4E0 00147440 41 81 FF B8 */ bgt lbl_8014A498 /* 8014A4E4 00147444 7D 23 07 34 */ extsh r3, r9 -/* 8014A4E8 00147448 4E 80 00 20 */ blr +/* 8014A4E8 00147448 4E 80 00 20 */ blr .global ActorInLists__Q22SL18CSortedListManagerCFPC6CActor ActorInLists__Q22SL18CSortedListManagerCFPC6CActor: @@ -1090,7 +1090,7 @@ ActorInLists__Q22SL18CSortedListManagerCFPC6CActor: /* 8014A514 00147474 38 A0 00 01 */ li r5, 1 lbl_8014A518: /* 8014A518 00147478 7C A3 2B 78 */ mr r3, r5 -/* 8014A51C 0014747C 4E 80 00 20 */ blr +/* 8014A51C 0014747C 4E 80 00 20 */ blr .global Reset__Q22SL18CSortedListManagerFv Reset__Q22SL18CSortedListManagerFv: @@ -1423,7 +1423,7 @@ lbl_8014A9F4: /* 8014AA18 00147978 80 01 08 44 */ lwz r0, 0x844(r1) /* 8014AA1C 0014797C 7C 08 03 A6 */ mtlr r0 /* 8014AA20 00147980 38 21 08 40 */ addi r1, r1, 0x840 -/* 8014AA24 00147984 4E 80 00 20 */ blr +/* 8014AA24 00147984 4E 80 00 20 */ blr .global __ct__Q22SL18CSortedListManagerFv __ct__Q22SL18CSortedListManagerFv: @@ -1453,7 +1453,7 @@ __ct__Q22SL18CSortedListManagerFv: /* 8014AA84 001479E4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8014AA88 001479E8 7C 08 03 A6 */ mtlr r0 /* 8014AA8C 001479EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8014AA90 001479F0 4E 80 00 20 */ blr +/* 8014AA90 001479F0 4E 80 00 20 */ blr .global __ct__Q22SL11SSortedListFv __ct__Q22SL11SSortedListFv: @@ -1498,7 +1498,7 @@ lbl_8014AAAC: /* 8014AB28 00147A88 B0 85 00 3E */ sth r4, 0x3e(r5) /* 8014AB2C 00147A8C 38 A5 00 40 */ addi r5, r5, 0x40 /* 8014AB30 00147A90 42 00 FF 7C */ bdnz lbl_8014AAAC -/* 8014AB34 00147A94 4E 80 00 20 */ blr +/* 8014AB34 00147A94 4E 80 00 20 */ blr .global __ct__Q22SL5SNodeFP6CActorRC6CAABox __ct__Q22SL5SNodeFP6CActorRC6CAABox: @@ -1525,7 +1525,7 @@ __ct__Q22SL5SNodeFP6CActorRC6CAABox: /* 8014AB88 00147AE8 B0 83 00 22 */ sth r4, 0x22(r3) /* 8014AB8C 00147AEC B0 83 00 24 */ sth r4, 0x24(r3) /* 8014AB90 00147AF0 B0 83 00 26 */ sth r4, 0x26(r3) -/* 8014AB94 00147AF4 4E 80 00 20 */ blr +/* 8014AB94 00147AF4 4E 80 00 20 */ blr .global __ct__Q22SL5SNodeFv __ct__Q22SL5SNodeFv: diff --git a/asm/MetroidPrime/CSplashScreen.s b/asm/MetroidPrime/CSplashScreen.s index 9813a742..2096fcb2 100644 --- a/asm/MetroidPrime/CSplashScreen.s +++ b/asm/MetroidPrime/CSplashScreen.s @@ -12,7 +12,7 @@ lbl_803D9A50: .4byte GetIsContinueDraw__6CIOWinCFv .4byte Draw__13CSplashScreenCFv .4byte PreDraw__6CIOWinCFv - + .global lbl_803D9A6C lbl_803D9A6C: # ROM: 0x3D6A6C @@ -34,7 +34,7 @@ lbl_803D9A88: .string16 "Progressive Scan mode." .string16 "Interlace mode." .balign 4 - + .section .sdata .global lbl_805A6D90 @@ -82,7 +82,7 @@ lbl_80028260: /* 8002826C 000251CC 83 C1 00 08 */ lwz r30, 8(r1) /* 80028270 000251D0 7C 08 03 A6 */ mtlr r0 /* 80028274 000251D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80028278 000251D8 4E 80 00 20 */ blr +/* 80028278 000251D8 4E 80 00 20 */ blr .global Draw__13CSplashScreenCFv Draw__13CSplashScreenCFv: @@ -147,7 +147,7 @@ lbl_8002832C: /* 80028350 000252B0 81 83 00 00 */ lwz r12, 0(r3) /* 80028354 000252B4 81 8C 00 30 */ lwz r12, 0x30(r12) /* 80028358 000252B8 7D 89 03 A6 */ mtctr r12 -/* 8002835C 000252BC 4E 80 04 21 */ bctrl +/* 8002835C 000252BC 4E 80 04 21 */ bctrl /* 80028360 000252C0 3C 60 80 5A */ lis r3, skIdentity4f@ha /* 80028364 000252C4 38 63 66 70 */ addi r3, r3, skIdentity4f@l /* 80028368 000252C8 48 2E 43 E5 */ bl SetViewPointMatrix__9CGraphicsFRC12CTransform4f @@ -162,7 +162,7 @@ lbl_8002832C: /* 8002838C 000252EC 81 83 00 00 */ lwz r12, 0(r3) /* 80028390 000252F0 81 8C 00 68 */ lwz r12, 0x68(r12) /* 80028394 000252F4 7D 89 03 A6 */ mtctr r12 -/* 80028398 000252F8 4E 80 04 21 */ bctrl +/* 80028398 000252F8 4E 80 04 21 */ bctrl /* 8002839C 000252FC 3B 81 00 C8 */ addi r28, r1, 0xc8 /* 800283A0 00025300 38 9E 00 28 */ addi r4, r30, 0x28 /* 800283A4 00025304 7F 83 E3 78 */ mr r3, r28 @@ -476,7 +476,7 @@ lbl_80028838: /* 80028854 000257B4 C0 42 83 B0 */ lfs f2, lbl_805AA0D0@sda21(r2) /* 80028858 000257B8 81 8C 00 54 */ lwz r12, 0x54(r12) /* 8002885C 000257BC 7D 89 03 A6 */ mtctr r12 -/* 80028860 000257C0 4E 80 04 21 */ bctrl +/* 80028860 000257C0 4E 80 04 21 */ bctrl /* 80028864 000257C4 38 60 00 01 */ li r3, 1 /* 80028868 000257C8 38 80 00 04 */ li r4, 4 /* 8002886C 000257CC 38 A0 00 05 */ li r5, 5 @@ -539,7 +539,7 @@ lbl_80028930: /* 8002894C 000258AC 80 01 05 14 */ lwz r0, 0x514(r1) /* 80028950 000258B0 7C 08 03 A6 */ mtlr r0 /* 80028954 000258B4 38 21 05 10 */ addi r1, r1, 0x510 -/* 80028958 000258B8 4E 80 00 20 */ blr +/* 80028958 000258B8 4E 80 00 20 */ blr .global __dt__17CTextRenderBufferFv __dt__17CTextRenderBufferFv: @@ -661,7 +661,7 @@ lbl_80028AD8: /* 80028AEC 00025A4C 83 81 00 40 */ lwz r28, 0x40(r1) /* 80028AF0 00025A50 7C 08 03 A6 */ mtlr r0 /* 80028AF4 00025A54 38 21 00 50 */ addi r1, r1, 0x50 -/* 80028AF8 00025A58 4E 80 00 20 */ blr +/* 80028AF8 00025A58 4E 80 00 20 */ blr .global sub_80028afc sub_80028afc: @@ -701,7 +701,7 @@ lbl_80028B6C: /* 80028B78 00025AD8 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80028B7C 00025ADC 7C 08 03 A6 */ mtlr r0 /* 80028B80 00025AE0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80028B84 00025AE4 4E 80 00 20 */ blr +/* 80028B84 00025AE4 4E 80 00 20 */ blr .global sub_80028b88 sub_80028b88: @@ -726,7 +726,7 @@ lbl_80028BB4: /* 80028BC8 00025B28 83 C1 00 08 */ lwz r30, 8(r1) /* 80028BCC 00025B2C 7C 08 03 A6 */ mtlr r0 /* 80028BD0 00025B30 38 21 00 10 */ addi r1, r1, 0x10 -/* 80028BD4 00025B34 4E 80 00 20 */ blr +/* 80028BD4 00025B34 4E 80 00 20 */ blr .global sub_80028bd8 sub_80028bd8: @@ -738,7 +738,7 @@ sub_80028bd8: /* 80028BEC 00025B4C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80028BF0 00025B50 7C 08 03 A6 */ mtlr r0 /* 80028BF4 00025B54 38 21 00 10 */ addi r1, r1, 0x10 -/* 80028BF8 00025B58 4E 80 00 20 */ blr +/* 80028BF8 00025B58 4E 80 00 20 */ blr .global sub_80028bfc sub_80028bfc: @@ -792,7 +792,7 @@ lbl_80028C90: /* 80028CA4 00025C04 83 81 00 20 */ lwz r28, 0x20(r1) /* 80028CA8 00025C08 7C 08 03 A6 */ mtlr r0 /* 80028CAC 00025C0C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80028CB0 00025C10 4E 80 00 20 */ blr +/* 80028CB0 00025C10 4E 80 00 20 */ blr .global __dt__18CTextExecuteBufferFv __dt__18CTextExecuteBufferFv: @@ -824,7 +824,7 @@ lbl_80028D08: /* 80028D14 00025C74 83 C1 00 08 */ lwz r30, 8(r1) /* 80028D18 00025C78 7C 08 03 A6 */ mtlr r0 /* 80028D1C 00025C7C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80028D20 00025C80 4E 80 00 20 */ blr +/* 80028D20 00025C80 4E 80 00 20 */ blr .global __dt__14CSaveableStateFv __dt__14CSaveableStateFv: @@ -931,7 +931,7 @@ lbl_80028E70: /* 80028E7C 00025DDC 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80028E80 00025DE0 7C 08 03 A6 */ mtlr r0 /* 80028E84 00025DE4 38 21 00 30 */ addi r1, r1, 0x30 -/* 80028E88 00025DE8 4E 80 00 20 */ blr +/* 80028E88 00025DE8 4E 80 00 20 */ blr .global OnMessage__13CSplashScreenFRC20CArchitectureMessageR18CArchitectureQueue OnMessage__13CSplashScreenFRC20CArchitectureMessageR18CArchitectureQueue: @@ -968,7 +968,7 @@ lbl_80028EE8: /* 80028EFC 00025E5C 81 83 00 00 */ lwz r12, 0(r3) /* 80028F00 00025E60 81 8C 00 14 */ lwz r12, 0x14(r12) /* 80028F04 00025E64 7D 89 03 A6 */ mtctr r12 -/* 80028F08 00025E68 4E 80 04 21 */ bctrl +/* 80028F08 00025E68 4E 80 04 21 */ bctrl /* 80028F0C 00025E6C 8B 43 00 37 */ lbz r26, 0x37(r3) /* 80028F10 00025E70 48 2E 06 E1 */ bl GetProgressiveMode__9CGraphicsFv /* 80028F14 00025E74 7C 7B 1B 78 */ mr r27, r3 @@ -1177,7 +1177,7 @@ lbl_800291E8: /* 800291EC 0002614C 80 01 00 34 */ lwz r0, 0x34(r1) /* 800291F0 00026150 7C 08 03 A6 */ mtlr r0 /* 800291F4 00026154 38 21 00 30 */ addi r1, r1, 0x30 -/* 800291F8 00026158 4E 80 00 20 */ blr +/* 800291F8 00026158 4E 80 00 20 */ blr .global __ct__13CSplashScreenFQ213CSplashScreen13ESplashScreen __ct__13CSplashScreenFQ213CSplashScreen13ESplashScreen: @@ -1221,7 +1221,7 @@ __ct__13CSplashScreenFQ213CSplashScreen13ESplashScreen: /* 80029290 000261F0 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80029294 000261F4 7C A5 00 2E */ lwzx r5, r5, r0 /* 80029298 000261F8 7D 89 03 A6 */ mtctr r12 -/* 8002929C 000261FC 4E 80 04 21 */ bctrl +/* 8002929C 000261FC 4E 80 04 21 */ bctrl /* 800292A0 00026200 38 7E 00 28 */ addi r3, r30, 0x28 /* 800292A4 00026204 38 81 00 08 */ addi r4, r1, 8 /* 800292A8 00026208 48 31 7C 01 */ bl __ct__6CTokenFRC6CToken @@ -1236,7 +1236,7 @@ __ct__13CSplashScreenFQ213CSplashScreen13ESplashScreen: /* 800292CC 0002622C 83 C1 00 28 */ lwz r30, 0x28(r1) /* 800292D0 00026230 7C 08 03 A6 */ mtlr r0 /* 800292D4 00026234 38 21 00 30 */ addi r1, r1, 0x30 -/* 800292D8 00026238 4E 80 00 20 */ blr +/* 800292D8 00026238 4E 80 00 20 */ blr .global sub_800292dc sub_800292dc: @@ -1282,7 +1282,7 @@ lbl_80029354: /* 80029368 000262C8 83 81 00 10 */ lwz r28, 0x10(r1) /* 8002936C 000262CC 7C 08 03 A6 */ mtlr r0 /* 80029370 000262D0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80029374 000262D4 4E 80 00 20 */ blr +/* 80029374 000262D4 4E 80 00 20 */ blr .global sub_80029378 sub_80029378: @@ -1325,4 +1325,4 @@ lbl_800293E8: /* 800293FC 0002635C 83 81 00 10 */ lwz r28, 0x10(r1) /* 80029400 00026360 7C 08 03 A6 */ mtlr r0 /* 80029404 00026364 38 21 00 20 */ addi r1, r1, 0x20 -/* 80029408 00026368 4E 80 00 20 */ blr +/* 80029408 00026368 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/CStateManager.s b/asm/MetroidPrime/CStateManager.s index add4d2da..33058077 100644 --- a/asm/MetroidPrime/CStateManager.s +++ b/asm/MetroidPrime/CStateManager.s @@ -216,7 +216,7 @@ lbl_80043E38: /* 80043E44 00040DA4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80043E48 00040DA8 7C 08 03 A6 */ mtlr r0 /* 80043E4C 00040DAC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80043E50 00040DB0 4E 80 00 20 */ blr +/* 80043E50 00040DB0 4E 80 00 20 */ blr .global SendScriptMsgAlways__13CStateManagerF9TUniqueId SendScriptMsgAlways__13CStateManagerF9TUniqueId: @@ -243,7 +243,7 @@ SendScriptMsgAlways__13CStateManagerF9TUniqueId: /* 80043EA4 00040E04 81 83 00 00 */ lwz r12, 0(r3) /* 80043EA8 00040E08 81 8C 00 18 */ lwz r12, 0x18(r12) /* 80043EAC 00040E0C 7D 89 03 A6 */ mtctr r12 -/* 80043EB0 00040E10 4E 80 04 21 */ bctrl +/* 80043EB0 00040E10 4E 80 04 21 */ bctrl lbl_80043EB4: /* 80043EB4 00040E14 80 01 00 24 */ lwz r0, 0x24(r1) /* 80043EB8 00040E18 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -251,7 +251,7 @@ lbl_80043EB4: /* 80043EC0 00040E20 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80043EC4 00040E24 7C 08 03 A6 */ mtlr r0 /* 80043EC8 00040E28 38 21 00 20 */ addi r1, r1, 0x20 -/* 80043ECC 00040E2C 4E 80 00 20 */ blr +/* 80043ECC 00040E2C 4E 80 00 20 */ blr .global SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage: @@ -273,24 +273,24 @@ SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage: /* 80043F0C 00040E6C 81 83 00 00 */ lwz r12, 0(r3) /* 80043F10 00040E70 81 8C 00 18 */ lwz r12, 0x18(r12) /* 80043F14 00040E74 7D 89 03 A6 */ mtctr r12 -/* 80043F18 00040E78 4E 80 04 21 */ bctrl +/* 80043F18 00040E78 4E 80 04 21 */ bctrl lbl_80043F1C: /* 80043F1C 00040E7C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80043F20 00040E80 7C 08 03 A6 */ mtlr r0 /* 80043F24 00040E84 38 21 00 10 */ addi r1, r1, 0x10 -/* 80043F28 00040E88 4E 80 00 20 */ blr +/* 80043F28 00040E88 4E 80 00 20 */ blr .global sub_80043f2c sub_80043f2c: /* 80043F2C 00040E8C 90 83 0F 84 */ stw r4, 0xf84(r3) /* 80043F30 00040E90 90 A3 0F 88 */ stw r5, 0xf88(r3) /* 80043F34 00040E94 D0 23 0F 8C */ stfs f1, 0xf8c(r3) -/* 80043F38 00040E98 4E 80 00 20 */ blr +/* 80043F38 00040E98 4E 80 00 20 */ blr .global GetPlayer__13CStateManagerCFv GetPlayer__13CStateManagerCFv: /* 80043F3C 00040E9C 80 63 08 4C */ lwz r3, 0x84c(r3) -/* 80043F40 00040EA0 4E 80 00 20 */ blr +/* 80043F40 00040EA0 4E 80 00 20 */ blr .global SetBossParams__13CStateManagerF9TUniqueIdfUi SetBossParams__13CStateManagerF9TUniqueIdfUi: @@ -298,7 +298,7 @@ SetBossParams__13CStateManagerF9TUniqueIdfUi: /* 80043F48 00040EA8 B0 03 0F 18 */ sth r0, 0xf18(r3) /* 80043F4C 00040EAC D0 23 0F 1C */ stfs f1, 0xf1c(r3) /* 80043F50 00040EB0 90 A3 0F 20 */ stw r5, 0xf20(r3) -/* 80043F54 00040EB4 4E 80 00 20 */ blr +/* 80043F54 00040EB4 4E 80 00 20 */ blr .global SetGameState__13CStateManagerFQ213CStateManager10EGameState SetGameState__13CStateManagerFQ213CStateManager10EGameState: @@ -351,7 +351,7 @@ lbl_80043FF0: /* 80043FF8 00040F58 83 C1 00 08 */ lwz r30, 8(r1) /* 80043FFC 00040F5C 7C 08 03 A6 */ mtlr r0 /* 80044000 00040F60 38 21 00 10 */ addi r1, r1, 0x10 -/* 80044004 00040F64 4E 80 00 20 */ blr +/* 80044004 00040F64 4E 80 00 20 */ blr .global sub_80044008 sub_80044008: @@ -364,7 +364,7 @@ sub_80044008: /* 80044020 00040F80 90 03 0F 00 */ stw r0, 0xf00(r3) /* 80044024 00040F84 80 06 00 04 */ lwz r0, 4(r6) /* 80044028 00040F88 90 03 0F 04 */ stw r0, 0xf04(r3) -/* 8004402C 00040F8C 4E 80 00 20 */ blr +/* 8004402C 00040F8C 4E 80 00 20 */ blr .global sub_80044030 sub_80044030: @@ -390,17 +390,17 @@ lbl_80044070: /* 80044078 00040FD8 83 C1 00 08 */ lwz r30, 8(r1) /* 8004407C 00040FDC 7C 08 03 A6 */ mtlr r0 /* 80044080 00040FE0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80044084 00040FE4 4E 80 00 20 */ blr +/* 80044084 00040FE4 4E 80 00 20 */ blr .global sub_80044088 sub_80044088: /* 80044088 00040FE8 80 63 0F 70 */ lwz r3, 0xf70(r3) -/* 8004408C 00040FEC 4E 80 00 20 */ blr +/* 8004408C 00040FEC 4E 80 00 20 */ blr .global sub_80044090 sub_80044090: /* 80044090 00040FF0 80 63 0F 70 */ lwz r3, 0xf70(r3) -/* 80044094 00040FF4 4E 80 00 20 */ blr +/* 80044094 00040FF4 4E 80 00 20 */ blr .global sub_80044098 sub_80044098: @@ -470,7 +470,7 @@ lbl_80044158: /* 80044190 000410F0 81 8C 00 58 */ lwz r12, 0x58(r12) /* 80044194 000410F4 38 E0 00 00 */ li r7, 0 /* 80044198 000410F8 7D 89 03 A6 */ mtctr r12 -/* 8004419C 000410FC 4E 80 04 21 */ bctrl +/* 8004419C 000410FC 4E 80 04 21 */ bctrl /* 800441A0 00041100 7C 79 1B 78 */ mr r25, r3 lbl_800441A4: /* 800441A4 00041104 7F C4 F3 78 */ mr r4, r30 @@ -662,7 +662,7 @@ lbl_80044454: /* 80044460 000413C0 80 01 01 64 */ lwz r0, 0x164(r1) /* 80044464 000413C4 7C 08 03 A6 */ mtlr r0 /* 80044468 000413C8 38 21 01 60 */ addi r1, r1, 0x160 -/* 8004446C 000413CC 4E 80 00 20 */ blr +/* 8004446C 000413CC 4E 80 00 20 */ blr .global GetCharacterRenderMaskAndTarget__13CStateManagerFbRiRi GetCharacterRenderMaskAndTarget__13CStateManagerFbRiRi: @@ -735,7 +735,7 @@ lbl_80044540: /* 80044558 000414B8 83 81 00 10 */ lwz r28, 0x10(r1) /* 8004455C 000414BC 7C 08 03 A6 */ mtlr r0 /* 80044560 000414C0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80044564 000414C4 4E 80 00 20 */ blr +/* 80044564 000414C4 4E 80 00 20 */ blr .global UpdateThermalVisor__13CStateManagerFv UpdateThermalVisor__13CStateManagerFv: @@ -911,7 +911,7 @@ lbl_800447A8: /* 800447DC 0004173C 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 800447E0 00041740 7C 08 03 A6 */ mtlr r0 /* 800447E4 00041744 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 800447E8 00041748 4E 80 00 20 */ blr +/* 800447E8 00041748 4E 80 00 20 */ blr .global CanShowMapScreen__13CStateManagerFv CanShowMapScreen__13CStateManagerFv: @@ -934,7 +934,7 @@ lbl_80044824: /* 80044824 00041784 80 01 00 14 */ lwz r0, 0x14(r1) /* 80044828 00041788 7C 08 03 A6 */ mtlr r0 /* 8004482C 0004178C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80044830 00041790 4E 80 00 20 */ blr +/* 80044830 00041790 4E 80 00 20 */ blr .global ShowPausedHUDMemo__13CStateManagerFUif ShowPausedHUDMemo__13CStateManagerFUif: @@ -948,7 +948,7 @@ ShowPausedHUDMemo__13CStateManagerFUif: /* 80044850 000417B0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80044854 000417B4 7C 08 03 A6 */ mtlr r0 /* 80044858 000417B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8004485C 000417BC 4E 80 00 20 */ blr +/* 8004485C 000417BC 4E 80 00 20 */ blr .global DeferStateTransition__13CStateManagerF23EStateManagerTransition DeferStateTransition__13CStateManagerF23EStateManagerTransition: @@ -983,7 +983,7 @@ lbl_800448C0: /* 800448C8 00041828 83 C1 00 08 */ lwz r30, 8(r1) /* 800448CC 0004182C 7C 08 03 A6 */ mtlr r0 /* 800448D0 00041830 38 21 00 10 */ addi r1, r1, 0x10 -/* 800448D4 00041834 4E 80 00 20 */ blr +/* 800448D4 00041834 4E 80 00 20 */ blr .global RenderLast__13CStateManagerFRC9TUniqueId RenderLast__13CStateManagerFRC9TUniqueId: @@ -993,7 +993,7 @@ RenderLast__13CStateManagerFRC9TUniqueId: /* 800448E4 00041844 2C 00 00 14 */ cmpwi r0, 0x14 /* 800448E8 00041848 40 82 00 0C */ bne lbl_800448F4 /* 800448EC 0004184C 38 60 00 00 */ li r3, 0 -/* 800448F0 00041850 4E 80 00 20 */ blr +/* 800448F0 00041850 4E 80 00 20 */ blr lbl_800448F4: /* 800448F4 00041854 54 00 08 3C */ slwi r0, r0, 1 /* 800448F8 00041858 7C 63 02 14 */ add r3, r3, r0 @@ -1007,7 +1007,7 @@ lbl_8004490C: /* 80044914 00041874 80 85 F3 9C */ lwz r4, -0xc64(r5) /* 80044918 00041878 38 04 00 01 */ addi r0, r4, 1 /* 8004491C 0004187C 90 05 F3 9C */ stw r0, -0xc64(r5) -/* 80044920 00041880 4E 80 00 20 */ blr +/* 80044920 00041880 4E 80 00 20 */ blr .global AddDrawableActorPlane__13CStateManagerCFRC6CActorRC6CPlaneRC6CAABox AddDrawableActorPlane__13CStateManagerCFRC6CActorRC6CPlaneRC6CAABox: @@ -1025,11 +1025,11 @@ AddDrawableActorPlane__13CStateManagerCFRC6CActorRC6CPlaneRC6CAABox: /* 80044950 000418B0 81 83 00 00 */ lwz r12, 0(r3) /* 80044954 000418B4 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 80044958 000418B8 7D 89 03 A6 */ mtctr r12 -/* 8004495C 000418BC 4E 80 04 21 */ bctrl +/* 8004495C 000418BC 4E 80 04 21 */ bctrl /* 80044960 000418C0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80044964 000418C4 7C 08 03 A6 */ mtlr r0 /* 80044968 000418C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8004496C 000418CC 4E 80 00 20 */ blr +/* 8004496C 000418CC 4E 80 00 20 */ blr .global AddDrawableActor__13CStateManagerCFRC6CActorRC9CVector3fRC6CAABox AddDrawableActor__13CStateManagerCFRC6CActorRC9CVector3fRC6CAABox: @@ -1045,11 +1045,11 @@ AddDrawableActor__13CStateManagerCFRC6CActorRC9CVector3fRC6CAABox: /* 80044994 000418F4 81 83 00 00 */ lwz r12, 0(r3) /* 80044998 000418F8 81 8C 00 40 */ lwz r12, 0x40(r12) /* 8004499C 000418FC 7D 89 03 A6 */ mtctr r12 -/* 800449A0 00041900 4E 80 04 21 */ bctrl +/* 800449A0 00041900 4E 80 04 21 */ bctrl /* 800449A4 00041904 80 01 00 14 */ lwz r0, 0x14(r1) /* 800449A8 00041908 7C 08 03 A6 */ mtlr r0 /* 800449AC 0004190C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800449B0 00041910 4E 80 00 20 */ blr +/* 800449B0 00041910 4E 80 00 20 */ blr .global SpecialSkipCinematic__13CStateManagerFv SpecialSkipCinematic__13CStateManagerFv: @@ -1109,7 +1109,7 @@ lbl_80044A64: /* 80044A70 000419D0 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80044A74 000419D4 7C 08 03 A6 */ mtlr r0 /* 80044A78 000419D8 38 21 00 20 */ addi r1, r1, 0x20 -/* 80044A7C 000419DC 4E 80 00 20 */ blr +/* 80044A7C 000419DC 4E 80 00 20 */ blr .global GetVisAreaId__13CStateManagerCFv GetVisAreaId__13CStateManagerCFv: @@ -1263,7 +1263,7 @@ lbl_80044C94: /* 80044C98 00041BF8 80 01 08 A4 */ lwz r0, 0x8a4(r1) /* 80044C9C 00041BFC 7C 08 03 A6 */ mtlr r0 /* 80044CA0 00041C00 38 21 08 A0 */ addi r1, r1, 0x8a0 -/* 80044CA4 00041C04 4E 80 00 20 */ blr +/* 80044CA4 00041C04 4E 80 00 20 */ blr .global GetWeaponIdCount__13CStateManagerF9TUniqueId11EWeaponType GetWeaponIdCount__13CStateManagerF9TUniqueId11EWeaponType: @@ -1278,7 +1278,7 @@ GetWeaponIdCount__13CStateManagerF9TUniqueId11EWeaponType: /* 80044CC8 00041C28 80 01 00 14 */ lwz r0, 0x14(r1) /* 80044CCC 00041C2C 7C 08 03 A6 */ mtlr r0 /* 80044CD0 00041C30 38 21 00 10 */ addi r1, r1, 0x10 -/* 80044CD4 00041C34 4E 80 00 20 */ blr +/* 80044CD4 00041C34 4E 80 00 20 */ blr .global RemoveWeaponId__13CStateManagerF9TUniqueId11EWeaponType RemoveWeaponId__13CStateManagerF9TUniqueId11EWeaponType: @@ -1293,7 +1293,7 @@ RemoveWeaponId__13CStateManagerF9TUniqueId11EWeaponType: /* 80044CF8 00041C58 80 01 00 14 */ lwz r0, 0x14(r1) /* 80044CFC 00041C5C 7C 08 03 A6 */ mtlr r0 /* 80044D00 00041C60 38 21 00 10 */ addi r1, r1, 0x10 -/* 80044D04 00041C64 4E 80 00 20 */ blr +/* 80044D04 00041C64 4E 80 00 20 */ blr .global AddWeaponId__13CStateManagerF9TUniqueId11EWeaponType AddWeaponId__13CStateManagerF9TUniqueId11EWeaponType: @@ -1308,7 +1308,7 @@ AddWeaponId__13CStateManagerF9TUniqueId11EWeaponType: /* 80044D28 00041C88 80 01 00 14 */ lwz r0, 0x14(r1) /* 80044D2C 00041C8C 7C 08 03 A6 */ mtlr r0 /* 80044D30 00041C90 38 21 00 10 */ addi r1, r1, 0x10 -/* 80044D34 00041C94 4E 80 00 20 */ blr +/* 80044D34 00041C94 4E 80 00 20 */ blr .global UpdateHintState__13CStateManagerFf UpdateHintState__13CStateManagerFf: @@ -1429,7 +1429,7 @@ lbl_80044EE0: /* 80044EE4 00041E44 80 01 00 74 */ lwz r0, 0x74(r1) /* 80044EE8 00041E48 7C 08 03 A6 */ mtlr r0 /* 80044EEC 00041E4C 38 21 00 70 */ addi r1, r1, 0x70 -/* 80044EF0 00041E50 4E 80 00 20 */ blr +/* 80044EF0 00041E50 4E 80 00 20 */ blr .global UpdateEscapeSequenceTimer__13CStateManagerFf UpdateEscapeSequenceTimer__13CStateManagerFf: @@ -1536,18 +1536,18 @@ lbl_80045058: /* 80045064 00041FC4 83 E1 00 EC */ lwz r31, 0xec(r1) /* 80045068 00041FC8 7C 08 03 A6 */ mtlr r0 /* 8004506C 00041FCC 38 21 01 00 */ addi r1, r1, 0x100 -/* 80045070 00041FD0 4E 80 00 20 */ blr +/* 80045070 00041FD0 4E 80 00 20 */ blr .global GetEscapeSequenceTimer__13CStateManagerCFv GetEscapeSequenceTimer__13CStateManagerCFv: /* 80045074 00041FD4 C0 23 0F 0C */ lfs f1, 0xf0c(r3) -/* 80045078 00041FD8 4E 80 00 20 */ blr +/* 80045078 00041FD8 4E 80 00 20 */ blr .global ResetEscapeSequenceTimer__13CStateManagerFf ResetEscapeSequenceTimer__13CStateManagerFf: /* 8004507C 00041FDC D0 23 0F 0C */ stfs f1, 0xf0c(r3) /* 80045080 00041FE0 D0 23 0F 10 */ stfs f1, 0xf10(r3) -/* 80045084 00041FE4 4E 80 00 20 */ blr +/* 80045084 00041FE4 4E 80 00 20 */ blr .global SetupParticleHook__13CStateManagerCFRC6CActor SetupParticleHook__13CStateManagerCFRC6CActor: @@ -1563,7 +1563,7 @@ SetupParticleHook__13CStateManagerCFRC6CActor: /* 800450AC 0004200C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800450B0 00042010 7C 08 03 A6 */ mtlr r0 /* 800450B4 00042014 38 21 00 10 */ addi r1, r1, 0x10 -/* 800450B8 00042018 4E 80 00 20 */ blr +/* 800450B8 00042018 4E 80 00 20 */ blr .global MurderScriptInstanceNames__13CStateManagerFv MurderScriptInstanceNames__13CStateManagerFv: @@ -1651,7 +1651,7 @@ lbl_800451BC: /* 800451D4 00042134 83 81 00 20 */ lwz r28, 0x20(r1) /* 800451D8 00042138 7C 08 03 A6 */ mtlr r0 /* 800451DC 0004213C 38 21 00 30 */ addi r1, r1, 0x30 -/* 800451E0 00042140 4E 80 00 20 */ blr +/* 800451E0 00042140 4E 80 00 20 */ blr .global HashInstanceName__13CStateManagerFR12CInputStream HashInstanceName__13CStateManagerFR12CInputStream: @@ -1692,7 +1692,7 @@ lbl_8004524C: /* 80045268 000421C8 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8004526C 000421CC 7C 08 03 A6 */ mtlr r0 /* 80045270 000421D0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80045274 000421D4 4E 80 00 20 */ blr +/* 80045274 000421D4 4E 80 00 20 */ blr .global SetActorAreaId__13CStateManagerFR6CActor7TAreaId SetActorAreaId__13CStateManagerFR6CActor7TAreaId: @@ -1764,7 +1764,7 @@ lbl_80045368: /* 80045374 000422D4 83 A1 00 34 */ lwz r29, 0x34(r1) /* 80045378 000422D8 7C 08 03 A6 */ mtlr r0 /* 8004537C 000422DC 38 21 00 40 */ addi r1, r1, 0x40 -/* 80045380 000422E0 4E 80 00 20 */ blr +/* 80045380 000422E0 4E 80 00 20 */ blr .global TouchPlayerActor__13CStateManagerFv TouchPlayerActor__13CStateManagerFv: @@ -1789,7 +1789,7 @@ lbl_800453C4: /* 800453C8 00042328 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 800453CC 0004232C 7C 08 03 A6 */ mtlr r0 /* 800453D0 00042330 38 21 00 20 */ addi r1, r1, 0x20 -/* 800453D4 00042334 4E 80 00 20 */ blr +/* 800453D4 00042334 4E 80 00 20 */ blr .global TouchSky__13CStateManagerCFv TouchSky__13CStateManagerCFv: @@ -1801,7 +1801,7 @@ TouchSky__13CStateManagerCFv: /* 800453EC 0004234C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800453F0 00042350 7C 08 03 A6 */ mtlr r0 /* 800453F4 00042354 38 21 00 10 */ addi r1, r1, 0x10 -/* 800453F8 00042358 4E 80 00 20 */ blr +/* 800453F8 00042358 4E 80 00 20 */ blr .global DrawSpaceWarp__13CStateManagerCFRC9CVector3ff DrawSpaceWarp__13CStateManagerCFRC9CVector3ff: @@ -1842,7 +1842,7 @@ lbl_80045454: /* 8004547C 000423DC 81 83 00 00 */ lwz r12, 0(r3) /* 80045480 000423E0 81 8C 00 CC */ lwz r12, 0xcc(r12) /* 80045484 000423E4 7D 89 03 A6 */ mtctr r12 -/* 80045488 000423E8 4E 80 04 21 */ bctrl +/* 80045488 000423E8 4E 80 04 21 */ bctrl lbl_8004548C: /* 8004548C 000423EC 80 01 00 34 */ lwz r0, 0x34(r1) /* 80045490 000423F0 CB E1 00 28 */ lfd f31, 0x28(r1) @@ -1850,7 +1850,7 @@ lbl_8004548C: /* 80045498 000423F8 83 C1 00 20 */ lwz r30, 0x20(r1) /* 8004549C 000423FC 7C 08 03 A6 */ mtlr r0 /* 800454A0 00042400 38 21 00 30 */ addi r1, r1, 0x30 -/* 800454A4 00042404 4E 80 00 20 */ blr +/* 800454A4 00042404 4E 80 00 20 */ blr .global DrawReflection__13CStateManagerFRC9CVector3f DrawReflection__13CStateManagerFRC9CVector3f: @@ -1977,7 +1977,7 @@ lbl_80045624: /* 80045680 000425E0 C0 9F 01 60 */ lfs f4, 0x160(r31) /* 80045684 000425E4 C0 BF 01 64 */ lfs f5, 0x164(r31) /* 80045688 000425E8 7D 89 03 A6 */ mtctr r12 -/* 8004568C 000425EC 4E 80 04 21 */ bctrl +/* 8004568C 000425EC 4E 80 04 21 */ bctrl /* 80045690 000425F0 7F C3 F3 78 */ mr r3, r30 /* 80045694 000425F4 7F A4 EB 78 */ mr r4, r29 /* 80045698 000425F8 4B FC EA DD */ bl RenderReflectedPlayer__7CPlayerFR13CStateManager @@ -1991,7 +1991,7 @@ lbl_80045624: /* 800456B8 00042618 83 A1 01 44 */ lwz r29, 0x144(r1) /* 800456BC 0004261C 7C 08 03 A6 */ mtlr r0 /* 800456C0 00042620 38 21 01 50 */ addi r1, r1, 0x150 -/* 800456C4 00042624 4E 80 00 20 */ blr +/* 800456C4 00042624 4E 80 00 20 */ blr .global CacheReflection__13CStateManagerFv CacheReflection__13CStateManagerFv: @@ -2008,11 +2008,11 @@ CacheReflection__13CStateManagerFv: /* 800456F0 00042650 54 06 D9 7E */ srwi r6, r0, 5 /* 800456F4 00042654 81 8C 00 C8 */ lwz r12, 0xc8(r12) /* 800456F8 00042658 7D 89 03 A6 */ mtctr r12 -/* 800456FC 0004265C 4E 80 04 21 */ bctrl +/* 800456FC 0004265C 4E 80 04 21 */ bctrl /* 80045700 00042660 80 01 00 14 */ lwz r0, 0x14(r1) /* 80045704 00042664 7C 08 03 A6 */ mtlr r0 /* 80045708 00042668 38 21 00 10 */ addi r1, r1, 0x10 -/* 8004570C 0004266C 4E 80 00 20 */ blr +/* 8004570C 0004266C 4E 80 00 20 */ blr .global ReflectionDrawer__13CStateManagerFPvRC9CVector3f ReflectionDrawer__13CStateManagerFPvRC9CVector3f: @@ -2023,7 +2023,7 @@ ReflectionDrawer__13CStateManagerFPvRC9CVector3f: /* 80045720 00042680 80 01 00 14 */ lwz r0, 0x14(r1) /* 80045724 00042684 7C 08 03 A6 */ mtlr r0 /* 80045728 00042688 38 21 00 10 */ addi r1, r1, 0x10 -/* 8004572C 0004268C 4E 80 00 20 */ blr +/* 8004572C 0004268C 4E 80 00 20 */ blr .global CanCreateProjectile__13CStateManagerCF9TUniqueId11EWeaponTypei CanCreateProjectile__13CStateManagerCF9TUniqueId11EWeaponTypei: @@ -2046,7 +2046,7 @@ CanCreateProjectile__13CStateManagerCF9TUniqueId11EWeaponTypei: /* 80045770 000426D0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80045774 000426D4 7C 08 03 A6 */ mtlr r0 /* 80045778 000426D8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8004577C 000426DC 4E 80 00 20 */ blr +/* 8004577C 000426DC 4E 80 00 20 */ blr .global BuildDynamicLightListForWorld__13CStateManagerFv BuildDynamicLightListForWorld__13CStateManagerFv: @@ -2209,7 +2209,7 @@ lbl_800459A4: /* 800459B4 00042914 83 81 00 C0 */ lwz r28, 0xc0(r1) /* 800459B8 00042918 7C 08 03 A6 */ mtlr r0 /* 800459BC 0004291C 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 800459C0 00042920 4E 80 00 20 */ blr +/* 800459C0 00042920 4E 80 00 20 */ blr .global sub_800459c4 sub_800459c4: @@ -2245,7 +2245,7 @@ lbl_80045A04: /* 80045A30 00042990 80 01 00 14 */ lwz r0, 0x14(r1) /* 80045A34 00042994 7C 08 03 A6 */ mtlr r0 /* 80045A38 00042998 38 21 00 10 */ addi r1, r1, 0x10 -/* 80045A3C 0004299C 4E 80 00 20 */ blr +/* 80045A3C 0004299C 4E 80 00 20 */ blr .global sub_80045a40 sub_80045a40: @@ -2259,7 +2259,7 @@ lbl_80045A58: /* 80045A58 000429B8 80 01 00 14 */ lwz r0, 0x14(r1) /* 80045A5C 000429BC 7C 08 03 A6 */ mtlr r0 /* 80045A60 000429C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80045A64 000429C4 4E 80 00 20 */ blr +/* 80045A64 000429C4 4E 80 00 20 */ blr .global sub_80045a68 sub_80045a68: @@ -2322,7 +2322,7 @@ lbl_80045B24: /* 80045B2C 00042A8C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80045B30 00042A90 7C 08 03 A6 */ mtlr r0 /* 80045B34 00042A94 38 21 00 20 */ addi r1, r1, 0x20 -/* 80045B38 00042A98 4E 80 00 20 */ blr +/* 80045B38 00042A98 4E 80 00 20 */ blr .global sub_80045b3c sub_80045b3c: @@ -2352,11 +2352,11 @@ lbl_80045B78: /* 80045B90 00042AF0 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80045B94 00042AF4 7C 08 03 A6 */ mtlr r0 /* 80045B98 00042AF8 38 21 00 20 */ addi r1, r1, 0x20 -/* 80045B9C 00042AFC 4E 80 00 20 */ blr +/* 80045B9C 00042AFC 4E 80 00 20 */ blr .global DrawDebugStuff__13CStateManagerCFv DrawDebugStuff__13CStateManagerCFv: -/* 80045BA0 00042B00 4E 80 00 20 */ blr +/* 80045BA0 00042B00 4E 80 00 20 */ blr .global RenderCamerasAndAreaLights__13CStateManagerCFv RenderCamerasAndAreaLights__13CStateManagerCFv: @@ -2383,7 +2383,7 @@ lbl_80045BD0: /* 80045BF0 00042B50 83 C1 00 08 */ lwz r30, 8(r1) /* 80045BF4 00042B54 7C 08 03 A6 */ mtlr r0 /* 80045BF8 00042B58 38 21 00 10 */ addi r1, r1, 0x10 -/* 80045BFC 00042B5C 4E 80 00 20 */ blr +/* 80045BFC 00042B5C 4E 80 00 20 */ blr .global DrawE3DeathEffect__13CStateManagerCFv DrawE3DeathEffect__13CStateManagerCFv: @@ -2478,7 +2478,7 @@ lbl_80045D3C: /* 80045D54 00042CB4 CB A1 00 50 */ lfd f29, 0x50(r1) /* 80045D58 00042CB8 7C 08 03 A6 */ mtlr r0 /* 80045D5C 00042CBC 38 21 00 80 */ addi r1, r1, 0x80 -/* 80045D60 00042CC0 4E 80 00 20 */ blr +/* 80045D60 00042CC0 4E 80 00 20 */ blr .global DrawAdditionalFilters__13CStateManagerCFv DrawAdditionalFilters__13CStateManagerCFv: @@ -2528,7 +2528,7 @@ lbl_80045DF8: /* 80045E0C 00042D6C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80045E10 00042D70 7C 08 03 A6 */ mtlr r0 /* 80045E14 00042D74 38 21 00 40 */ addi r1, r1, 0x40 -/* 80045E18 00042D78 4E 80 00 20 */ blr +/* 80045E18 00042D78 4E 80 00 20 */ blr .global ResetViewAfterDraw__13CStateManagerCFRCQ29CGraphics9CViewportRC12CTransform4f ResetViewAfterDraw__13CStateManagerCFRCQ29CGraphics9CViewportRC12CTransform4f: @@ -2548,7 +2548,7 @@ ResetViewAfterDraw__13CStateManagerCFRCQ29CGraphics9CViewportRC12CTransform4f: /* 80045E50 00042DB0 80 C7 00 08 */ lwz r6, 8(r7) /* 80045E54 00042DB4 80 E7 00 0C */ lwz r7, 0xc(r7) /* 80045E58 00042DB8 7D 89 03 A6 */ mtctr r12 -/* 80045E5C 00042DBC 4E 80 04 21 */ bctrl +/* 80045E5C 00042DBC 4E 80 04 21 */ bctrl /* 80045E60 00042DC0 80 7F 08 70 */ lwz r3, 0x870(r31) /* 80045E64 00042DC4 7F E4 FB 78 */ mr r4, r31 /* 80045E68 00042DC8 4B FC 5C B1 */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager @@ -2568,7 +2568,7 @@ ResetViewAfterDraw__13CStateManagerCFRCQ29CGraphics9CViewportRC12CTransform4f: /* 80045EA0 00042E00 81 83 00 00 */ lwz r12, 0(r3) /* 80045EA4 00042E04 81 8C 00 58 */ lwz r12, 0x58(r12) /* 80045EA8 00042E08 7D 89 03 A6 */ mtctr r12 -/* 80045EAC 00042E0C 4E 80 04 21 */ bctrl +/* 80045EAC 00042E0C 4E 80 04 21 */ bctrl /* 80045EB0 00042E10 3C 60 80 3F */ lis r3, lbl_803ED910@ha /* 80045EB4 00042E14 3C 80 43 30 */ lis r4, 0x4330 /* 80045EB8 00042E18 38 C3 D9 10 */ addi r6, r3, lbl_803ED910@l @@ -2592,7 +2592,7 @@ ResetViewAfterDraw__13CStateManagerCFRCQ29CGraphics9CViewportRC12CTransform4f: /* 80045F00 00042E60 C0 BF 01 64 */ lfs f5, 0x164(r31) /* 80045F04 00042E64 EC 60 18 28 */ fsubs f3, f0, f3 /* 80045F08 00042E68 7D 89 03 A6 */ mtctr r12 -/* 80045F0C 00042E6C 4E 80 04 21 */ bctrl +/* 80045F0C 00042E6C 4E 80 04 21 */ bctrl /* 80045F10 00042E70 80 A1 00 08 */ lwz r5, 8(r1) /* 80045F14 00042E74 38 60 00 00 */ li r3, 0 /* 80045F18 00042E78 2C 05 00 00 */ cmpwi r5, 0 @@ -2623,7 +2623,7 @@ lbl_80045F5C: /* 80045F6C 00042ECC 83 C1 00 88 */ lwz r30, 0x88(r1) /* 80045F70 00042ED0 7C 08 03 A6 */ mtlr r0 /* 80045F74 00042ED4 38 21 00 90 */ addi r1, r1, 0x90 -/* 80045F78 00042ED8 4E 80 00 20 */ blr +/* 80045F78 00042ED8 4E 80 00 20 */ blr .global DrawWorld__13CStateManagerCFv DrawWorld__13CStateManagerCFv: @@ -2869,7 +2869,7 @@ lbl_800462D0: /* 800462E4 00043244 C0 26 02 8C */ lfs f1, 0x28c(r6) /* 800462E8 00043248 81 8C 00 E8 */ lwz r12, 0xe8(r12) /* 800462EC 0004324C 7D 89 03 A6 */ mtctr r12 -/* 800462F0 00043250 4E 80 04 21 */ bctrl +/* 800462F0 00043250 4E 80 04 21 */ bctrl /* 800462F4 00043254 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 800462F8 00043258 C0 30 0F 28 */ lfs f1, 0xf28(r16) /* 800462FC 0004325C 81 83 00 00 */ lwz r12, 0(r3) @@ -2877,7 +2877,7 @@ lbl_800462D0: /* 80046304 00043264 81 8C 00 EC */ lwz r12, 0xec(r12) /* 80046308 00043268 EC 21 00 2A */ fadds f1, f1, f0 /* 8004630C 0004326C 7D 89 03 A6 */ mtctr r12 -/* 80046310 00043270 4E 80 04 21 */ bctrl +/* 80046310 00043270 4E 80 04 21 */ bctrl /* 80046314 00043274 80 61 00 F8 */ lwz r3, 0xf8(r1) /* 80046318 00043278 3A 63 FF FF */ addi r19, r3, -1 /* 8004631C 0004327C 1C 13 00 14 */ mulli r0, r19, 0x14 @@ -2897,14 +2897,14 @@ lbl_80046330: /* 80046350 000432B0 7E 45 93 78 */ mr r5, r18 /* 80046354 000432B4 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80046358 000432B8 7D 89 03 A6 */ mtctr r12 -/* 8004635C 000432BC 4E 80 04 21 */ bctrl +/* 8004635C 000432BC 4E 80 04 21 */ bctrl /* 80046360 000432C0 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 80046364 000432C4 80 94 01 2C */ lwz r4, 0x12c(r20) /* 80046368 000432C8 81 83 00 00 */ lwz r12, 0(r3) /* 8004636C 000432CC C0 24 11 28 */ lfs f1, 0x1128(r4) /* 80046370 000432D0 81 8C 01 00 */ lwz r12, 0x100(r12) /* 80046374 000432D4 7D 89 03 A6 */ mtctr r12 -/* 80046378 000432D8 4E 80 04 21 */ bctrl +/* 80046378 000432D8 4E 80 04 21 */ bctrl /* 8004637C 000432DC 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 80046380 000432E0 7E 44 93 78 */ mr r4, r18 /* 80046384 000432E4 7E C5 B3 78 */ mr r5, r22 @@ -2912,7 +2912,7 @@ lbl_80046330: /* 8004638C 000432EC 81 83 00 00 */ lwz r12, 0(r3) /* 80046390 000432F0 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80046394 000432F4 7D 89 03 A6 */ mtctr r12 -/* 80046398 000432F8 4E 80 04 21 */ bctrl +/* 80046398 000432F8 4E 80 04 21 */ bctrl /* 8004639C 000432FC 39 CE FF FC */ addi r14, r14, -4 /* 800463A0 00043300 3A 31 FF EC */ addi r17, r17, -20 /* 800463A4 00043304 3A 73 FF FF */ addi r19, r19, -1 @@ -2932,7 +2932,7 @@ lbl_800463A8: /* 800463D8 00043338 C0 42 85 64 */ lfs f2, lbl_805AA284@sda21(r2) /* 800463DC 0004333C 81 8C 00 E0 */ lwz r12, 0xe0(r12) /* 800463E0 00043340 7D 89 03 A6 */ mtctr r12 -/* 800463E4 00043344 4E 80 04 21 */ bctrl +/* 800463E4 00043344 4E 80 04 21 */ bctrl lbl_800463E8: /* 800463E8 00043348 C0 41 01 30 */ lfs f2, 0x130(r1) /* 800463EC 0004334C 38 61 00 C8 */ addi r3, r1, 0xc8 @@ -2976,7 +2976,7 @@ lbl_80046474: /* 80046478 000433D8 7E 04 83 78 */ mr r4, r16 /* 8004647C 000433DC 81 8C 00 28 */ lwz r12, 0x28(r12) /* 80046480 000433E0 7D 89 03 A6 */ mtctr r12 -/* 80046484 000433E4 4E 80 04 21 */ bctrl +/* 80046484 000433E4 4E 80 04 21 */ bctrl lbl_80046488: /* 80046488 000433E8 39 CE 00 02 */ addi r14, r14, 2 lbl_8004648C: @@ -3012,7 +3012,7 @@ lbl_800464CC: /* 800464FC 0004345C C0 24 11 28 */ lfs f1, 0x1128(r4) /* 80046500 00043460 81 8C 01 00 */ lwz r12, 0x100(r12) /* 80046504 00043464 7D 89 03 A6 */ mtctr r12 -/* 80046508 00043468 4E 80 04 21 */ bctrl +/* 80046508 00043468 4E 80 04 21 */ bctrl /* 8004650C 0004346C 80 72 01 2C */ lwz r3, 0x12c(r18) /* 80046510 00043470 83 E3 10 C0 */ lwz r31, 0x10c0(r3) /* 80046514 00043474 AA 3F 20 08 */ lha r17, 0x2008(r31) @@ -3069,7 +3069,7 @@ lbl_800465CC: /* 800465D4 00043534 38 81 01 B8 */ addi r4, r1, 0x1b8 /* 800465D8 00043538 81 8C 00 24 */ lwz r12, 0x24(r12) /* 800465DC 0004353C 7D 89 03 A6 */ mtctr r12 -/* 800465E0 00043540 4E 80 04 21 */ bctrl +/* 800465E0 00043540 4E 80 04 21 */ bctrl /* 800465E4 00043544 48 00 00 70 */ b lbl_80046654 lbl_800465E8: /* 800465E8 00043548 3A 80 00 01 */ li r20, 1 @@ -3087,7 +3087,7 @@ lbl_80046604: /* 80046610 00043570 38 81 01 B8 */ addi r4, r1, 0x1b8 /* 80046614 00043574 81 8C 00 24 */ lwz r12, 0x24(r12) /* 80046618 00043578 7D 89 03 A6 */ mtctr r12 -/* 8004661C 0004357C 4E 80 04 21 */ bctrl +/* 8004661C 0004357C 4E 80 04 21 */ bctrl lbl_80046620: /* 80046620 00043580 56 A0 06 3F */ clrlwi. r0, r21, 0x18 /* 80046624 00043584 41 82 00 30 */ beq lbl_80046654 @@ -3145,7 +3145,7 @@ lbl_800466D0: /* 800466DC 0004363C 81 83 00 00 */ lwz r12, 0(r3) /* 800466E0 00043640 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800466E4 00043644 7D 89 03 A6 */ mtctr r12 -/* 800466E8 00043648 4E 80 04 21 */ bctrl +/* 800466E8 00043648 4E 80 04 21 */ bctrl /* 800466EC 0004364C 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 800466F0 00043650 7E C5 B3 78 */ mr r5, r22 /* 800466F4 00043654 7D E6 7B 78 */ mr r6, r15 @@ -3153,7 +3153,7 @@ lbl_800466D0: /* 800466FC 0004365C 81 83 00 00 */ lwz r12, 0(r3) /* 80046700 00043660 81 8C 00 20 */ lwz r12, 0x20(r12) /* 80046704 00043664 7D 89 03 A6 */ mtctr r12 -/* 80046708 00043668 4E 80 04 21 */ bctrl +/* 80046708 00043668 4E 80 04 21 */ bctrl /* 8004670C 0004366C 3B BD 00 04 */ addi r29, r29, 4 /* 80046710 00043670 3B 9C 00 14 */ addi r28, r28, 0x14 /* 80046714 00043674 3A 73 00 01 */ addi r19, r19, 1 @@ -3171,13 +3171,13 @@ lbl_80046718: /* 80046740 000436A0 81 83 00 00 */ lwz r12, 0(r3) /* 80046744 000436A4 81 8C 00 28 */ lwz r12, 0x28(r12) /* 80046748 000436A8 7D 89 03 A6 */ mtctr r12 -/* 8004674C 000436AC 4E 80 04 21 */ bctrl +/* 8004674C 000436AC 4E 80 04 21 */ bctrl lbl_80046750: /* 80046750 000436B0 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 80046754 000436B4 81 83 00 00 */ lwz r12, 0(r3) /* 80046758 000436B8 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8004675C 000436BC 7D 89 03 A6 */ mtctr r12 -/* 80046760 000436C0 4E 80 04 21 */ bctrl +/* 80046760 000436C0 4E 80 04 21 */ bctrl /* 80046764 000436C4 56 A0 06 3F */ clrlwi. r0, r21, 0x18 /* 80046768 000436C8 41 82 02 D8 */ beq lbl_80046A40 /* 8004676C 000436CC 80 18 00 00 */ lwz r0, 0(r24) @@ -3203,7 +3203,7 @@ lbl_8004678C: /* 800467B8 00043718 7E 04 83 78 */ mr r4, r16 /* 800467BC 0004371C 81 8C 00 28 */ lwz r12, 0x28(r12) /* 800467C0 00043720 7D 89 03 A6 */ mtctr r12 -/* 800467C4 00043724 4E 80 04 21 */ bctrl +/* 800467C4 00043724 4E 80 04 21 */ bctrl lbl_800467C8: /* 800467C8 00043728 39 CE 00 02 */ addi r14, r14, 2 lbl_800467CC: @@ -3221,7 +3221,7 @@ lbl_800467F0: /* 800467F4 00043754 81 83 00 00 */ lwz r12, 0(r3) /* 800467F8 00043758 81 8C 00 F0 */ lwz r12, 0xf0(r12) /* 800467FC 0004375C 7D 89 03 A6 */ mtctr r12 -/* 80046800 00043760 4E 80 04 21 */ bctrl +/* 80046800 00043760 4E 80 04 21 */ bctrl /* 80046804 00043764 38 00 00 00 */ li r0, 0 /* 80046808 00043768 39 D7 00 04 */ addi r14, r23, 4 /* 8004680C 0004376C 90 10 0F 34 */ stw r0, 0xf34(r16) @@ -3241,7 +3241,7 @@ lbl_80046814: /* 80046840 000437A0 7E 04 83 78 */ mr r4, r16 /* 80046844 000437A4 81 8C 00 28 */ lwz r12, 0x28(r12) /* 80046848 000437A8 7D 89 03 A6 */ mtctr r12 -/* 8004684C 000437AC 4E 80 04 21 */ bctrl +/* 8004684C 000437AC 4E 80 04 21 */ bctrl lbl_80046850: /* 80046850 000437B0 39 CE 00 02 */ addi r14, r14, 2 lbl_80046854: @@ -3267,7 +3267,7 @@ lbl_80046888: /* 8004689C 000437FC 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800468A0 00043800 7E 25 8B 78 */ mr r5, r17 /* 800468A4 00043804 7D 89 03 A6 */ mtctr r12 -/* 800468A8 00043808 4E 80 04 21 */ bctrl +/* 800468A8 00043808 4E 80 04 21 */ bctrl /* 800468AC 0004380C 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 800468B0 00043810 7E 24 8B 78 */ mr r4, r17 /* 800468B4 00043814 7E C5 B3 78 */ mr r5, r22 @@ -3275,7 +3275,7 @@ lbl_80046888: /* 800468BC 0004381C 81 83 00 00 */ lwz r12, 0(r3) /* 800468C0 00043820 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 800468C4 00043824 7D 89 03 A6 */ mtctr r12 -/* 800468C8 00043828 4E 80 04 21 */ bctrl +/* 800468C8 00043828 4E 80 04 21 */ bctrl /* 800468CC 0004382C 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 800468D0 00043830 7E 24 8B 78 */ mr r4, r17 /* 800468D4 00043834 7E C5 B3 78 */ mr r5, r22 @@ -3283,7 +3283,7 @@ lbl_80046888: /* 800468DC 0004383C 81 83 00 00 */ lwz r12, 0(r3) /* 800468E0 00043840 81 8C 00 28 */ lwz r12, 0x28(r12) /* 800468E4 00043844 7D 89 03 A6 */ mtctr r12 -/* 800468E8 00043848 4E 80 04 21 */ bctrl +/* 800468E8 00043848 4E 80 04 21 */ bctrl /* 800468EC 0004384C 39 CE FF FC */ addi r14, r14, -4 /* 800468F0 00043850 39 EF FF EC */ addi r15, r15, -20 /* 800468F4 00043854 3A 52 FF FF */ addi r18, r18, -1 @@ -3318,7 +3318,7 @@ lbl_80046950: /* 80046958 000438B8 38 81 01 B8 */ addi r4, r1, 0x1b8 /* 8004695C 000438BC 81 8C 00 24 */ lwz r12, 0x24(r12) /* 80046960 000438C0 7D 89 03 A6 */ mtctr r12 -/* 80046964 000438C4 4E 80 04 21 */ bctrl +/* 80046964 000438C4 4E 80 04 21 */ bctrl lbl_80046968: /* 80046968 000438C8 3A 73 00 04 */ addi r19, r19, 4 lbl_8004696C: @@ -3345,7 +3345,7 @@ lbl_8004696C: /* 800469BC 0004391C 38 81 01 B8 */ addi r4, r1, 0x1b8 /* 800469C0 00043920 81 8C 00 24 */ lwz r12, 0x24(r12) /* 800469C4 00043924 7D 89 03 A6 */ mtctr r12 -/* 800469C8 00043928 4E 80 04 21 */ bctrl +/* 800469C8 00043928 4E 80 04 21 */ bctrl lbl_800469CC: /* 800469CC 0004392C 80 D0 08 DC */ lwz r6, 0x8dc(r16) /* 800469D0 00043930 7E 24 8B 78 */ mr r4, r17 @@ -3356,7 +3356,7 @@ lbl_800469CC: /* 800469E4 00043944 81 83 00 00 */ lwz r12, 0(r3) /* 800469E8 00043948 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800469EC 0004394C 7D 89 03 A6 */ mtctr r12 -/* 800469F0 00043950 4E 80 04 21 */ bctrl +/* 800469F0 00043950 4E 80 04 21 */ bctrl /* 800469F4 00043954 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 800469F8 00043958 7D E4 7B 78 */ mr r4, r15 /* 800469FC 0004395C 7E C5 B3 78 */ mr r5, r22 @@ -3364,7 +3364,7 @@ lbl_800469CC: /* 80046A04 00043964 81 83 00 00 */ lwz r12, 0(r3) /* 80046A08 00043968 81 8C 00 20 */ lwz r12, 0x20(r12) /* 80046A0C 0004396C 7D 89 03 A6 */ mtctr r12 -/* 80046A10 00043970 4E 80 04 21 */ bctrl +/* 80046A10 00043970 4E 80 04 21 */ bctrl /* 80046A14 00043974 3B 7B 00 04 */ addi r27, r27, 4 /* 80046A18 00043978 3A 31 00 14 */ addi r17, r17, 0x14 /* 80046A1C 0004397C 3A 52 00 01 */ addi r18, r18, 1 @@ -3376,7 +3376,7 @@ lbl_80046A20: /* 80046A30 00043990 81 83 00 00 */ lwz r12, 0(r3) /* 80046A34 00043994 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80046A38 00043998 7D 89 03 A6 */ mtctr r12 -/* 80046A3C 0004399C 4E 80 04 21 */ bctrl +/* 80046A3C 0004399C 4E 80 04 21 */ bctrl lbl_80046A40: /* 80046A40 000439A0 80 70 08 7C */ lwz r3, 0x87c(r16) /* 80046A44 000439A4 48 0E 8B B9 */ bl EndFrame__18CFluidPlaneManagerCFv @@ -3389,7 +3389,7 @@ lbl_80046A40: /* 80046A60 000439C0 C0 42 85 64 */ lfs f2, lbl_805AA284@sda21(r2) /* 80046A64 000439C4 81 8C 00 E0 */ lwz r12, 0xe0(r12) /* 80046A68 000439C8 7D 89 03 A6 */ mtctr r12 -/* 80046A6C 000439CC 4E 80 04 21 */ bctrl +/* 80046A6C 000439CC 4E 80 04 21 */ bctrl /* 80046A70 000439D0 88 02 80 E8 */ lbz r0, lbl_805A9E08@sda21(r2) /* 80046A74 000439D4 28 00 00 00 */ cmplwi r0, 0 /* 80046A78 000439D8 41 82 00 0C */ beq lbl_80046A84 @@ -3434,7 +3434,7 @@ lbl_80046B00: /* 80046B04 00043A64 7E 04 83 78 */ mr r4, r16 /* 80046B08 00043A68 81 8C 00 28 */ lwz r12, 0x28(r12) /* 80046B0C 00043A6C 7D 89 03 A6 */ mtctr r12 -/* 80046B10 00043A70 4E 80 04 21 */ bctrl +/* 80046B10 00043A70 4E 80 04 21 */ bctrl lbl_80046B14: /* 80046B14 00043A74 39 CE 00 02 */ addi r14, r14, 2 lbl_80046B18: @@ -3454,7 +3454,7 @@ lbl_80046B3C: /* 80046B48 00043AA8 81 83 00 00 */ lwz r12, 0(r3) /* 80046B4C 00043AAC 81 8C 00 F4 */ lwz r12, 0xf4(r12) /* 80046B50 00043AB0 7D 89 03 A6 */ mtctr r12 -/* 80046B54 00043AB4 4E 80 04 21 */ bctrl +/* 80046B54 00043AB4 4E 80 04 21 */ bctrl /* 80046B58 00043AB8 48 30 34 5D */ bl Black__6CColorFv /* 80046B5C 00043ABC 7C 65 1B 78 */ mr r5, r3 /* 80046B60 00043AC0 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) @@ -3463,7 +3463,7 @@ lbl_80046B3C: /* 80046B6C 00043ACC 81 83 00 00 */ lwz r12, 0(r3) /* 80046B70 00043AD0 81 8C 00 E8 */ lwz r12, 0xe8(r12) /* 80046B74 00043AD4 7D 89 03 A6 */ mtctr r12 -/* 80046B78 00043AD8 4E 80 04 21 */ bctrl +/* 80046B78 00043AD8 4E 80 04 21 */ bctrl /* 80046B7C 00043ADC 38 00 00 02 */ li r0, 2 /* 80046B80 00043AE0 90 10 0F 34 */ stw r0, 0xf34(r16) lbl_80046B84: @@ -3579,13 +3579,13 @@ lbl_80046CE4: /* 80046CFC 00043C5C 80 01 13 44 */ lwz r0, 0x1344(r1) /* 80046D00 00043C60 7C 08 03 A6 */ mtlr r0 /* 80046D04 00043C64 38 21 13 40 */ addi r1, r1, 0x1340 -/* 80046D08 00043C68 4E 80 00 20 */ blr +/* 80046D08 00043C68 4E 80 00 20 */ blr .global GetAliveAreasEnd__6CWorldFv GetAliveAreasEnd__6CWorldFv: /* 80046D0C 00043C6C 80 0D A2 18 */ lwz r0, lbl_805A8DD8@sda21(r13) /* 80046D10 00043C70 90 03 00 00 */ stw r0, 0(r3) -/* 80046D14 00043C74 4E 80 00 20 */ blr +/* 80046D14 00043C74 4E 80 00 20 */ blr .global sub_80046d18 sub_80046d18: @@ -3616,7 +3616,7 @@ lbl_80046D70: /* 80046D70 00043CD0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80046D74 00043CD4 7C 08 03 A6 */ mtlr r0 /* 80046D78 00043CD8 38 21 00 20 */ addi r1, r1, 0x20 -/* 80046D7C 00043CDC 4E 80 00 20 */ blr +/* 80046D7C 00043CDC 4E 80 00 20 */ blr .global SetupFogForArea__13CStateManagerCF7TAreaId SetupFogForArea__13CStateManagerCF7TAreaId: @@ -3647,7 +3647,7 @@ lbl_80046DD8: /* 80046DD8 00043D38 80 01 00 24 */ lwz r0, 0x24(r1) /* 80046DDC 00043D3C 7C 08 03 A6 */ mtlr r0 /* 80046DE0 00043D40 38 21 00 20 */ addi r1, r1, 0x20 -/* 80046DE4 00043D44 4E 80 00 20 */ blr +/* 80046DE4 00043D44 4E 80 00 20 */ blr .global sub_80046de8 sub_80046de8: @@ -3679,13 +3679,13 @@ sub_80046de8: /* 80046E4C 00043DAC 80 84 02 7C */ lwz r4, 0x27c(r4) /* 80046E50 00043DB0 EC 42 00 32 */ fmuls f2, f2, f0 /* 80046E54 00043DB4 7D 89 03 A6 */ mtctr r12 -/* 80046E58 00043DB8 4E 80 04 21 */ bctrl +/* 80046E58 00043DB8 4E 80 04 21 */ bctrl lbl_80046E5C: /* 80046E5C 00043DBC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80046E60 00043DC0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80046E64 00043DC4 7C 08 03 A6 */ mtlr r0 /* 80046E68 00043DC8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80046E6C 00043DCC 4E 80 00 20 */ blr +/* 80046E6C 00043DCC 4E 80 00 20 */ blr .global SetupFogForArea__13CStateManagerCFRC9CGameArea SetupFogForArea__13CStateManagerCFRC9CGameArea: @@ -3721,7 +3721,7 @@ SetupFogForArea__13CStateManagerCFRC9CGameArea: /* 80046EE4 00043E44 80 84 02 7C */ lwz r4, 0x27c(r4) /* 80046EE8 00043E48 EC 43 00 BA */ fmadds f2, f3, f2, f0 /* 80046EEC 00043E4C 7D 89 03 A6 */ mtctr r12 -/* 80046EF0 00043E50 4E 80 04 21 */ bctrl +/* 80046EF0 00043E50 4E 80 04 21 */ bctrl /* 80046EF4 00043E54 48 00 00 10 */ b lbl_80046F04 lbl_80046EF8: /* 80046EF8 00043E58 80 7F 01 2C */ lwz r3, 0x12c(r31) @@ -3733,7 +3733,7 @@ lbl_80046F04: /* 80046F0C 00043E6C 83 C1 00 08 */ lwz r30, 8(r1) /* 80046F10 00043E70 7C 08 03 A6 */ mtlr r0 /* 80046F14 00043E74 38 21 00 10 */ addi r1, r1, 0x10 -/* 80046F18 00043E78 4E 80 00 20 */ blr +/* 80046F18 00043E78 4E 80 00 20 */ blr .global SetupFogForDraw__13CStateManagerCFv SetupFogForDraw__13CStateManagerCFv: @@ -3765,7 +3765,7 @@ lbl_80046F5C: /* 80046F7C 00043EDC C0 42 85 64 */ lfs f2, lbl_805AA284@sda21(r2) /* 80046F80 00043EE0 81 8C 00 E0 */ lwz r12, 0xe0(r12) /* 80046F84 00043EE4 7D 89 03 A6 */ mtctr r12 -/* 80046F88 00043EE8 4E 80 04 21 */ bctrl +/* 80046F88 00043EE8 4E 80 04 21 */ bctrl /* 80046F8C 00043EEC 38 60 00 01 */ li r3, 1 /* 80046F90 00043EF0 48 00 00 40 */ b lbl_80046FD0 lbl_80046F94: @@ -3792,7 +3792,7 @@ lbl_80046FD0: /* 80046FD4 00043F34 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80046FD8 00043F38 7C 08 03 A6 */ mtlr r0 /* 80046FDC 00043F3C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80046FE0 00043F40 4E 80 00 20 */ blr +/* 80046FE0 00043F40 4E 80 00 20 */ blr .global SetupViewForDraw__13CStateManagerCFRCQ29CGraphics9CViewport SetupViewForDraw__13CStateManagerCFRCQ29CGraphics9CViewport: @@ -3826,7 +3826,7 @@ SetupViewForDraw__13CStateManagerCFRCQ29CGraphics9CViewport: /* 80047050 00043FB0 81 83 00 00 */ lwz r12, 0(r3) /* 80047054 00043FB4 81 8C 00 48 */ lwz r12, 0x48(r12) /* 80047058 00043FB8 7D 89 03 A6 */ mtctr r12 -/* 8004705C 00043FBC 4E 80 04 21 */ bctrl +/* 8004705C 00043FBC 4E 80 04 21 */ bctrl /* 80047060 00043FC0 80 7E 08 4C */ lwz r3, 0x84c(r30) /* 80047064 00043FC4 C0 43 00 60 */ lfs f2, 0x60(r3) /* 80047068 00043FC8 C0 23 00 50 */ lfs f1, 0x50(r3) @@ -3902,7 +3902,7 @@ SetupViewForDraw__13CStateManagerCFRCQ29CGraphics9CViewport: /* 80047180 000440E0 7F 67 DB 78 */ mr r7, r27 /* 80047184 000440E4 81 8C 00 5C */ lwz r12, 0x5c(r12) /* 80047188 000440E8 7D 89 03 A6 */ mtctr r12 -/* 8004718C 000440EC 4E 80 04 21 */ bctrl +/* 8004718C 000440EC 4E 80 04 21 */ bctrl /* 80047190 000440F0 C0 22 85 80 */ lfs f1, lbl_805AA2A0@sda21(r2) /* 80047194 000440F4 C0 42 85 64 */ lfs f2, lbl_805AA284@sda21(r2) /* 80047198 000440F8 48 2C 32 49 */ bl SetDepthRange__9CGraphicsFff @@ -3918,7 +3918,7 @@ SetupViewForDraw__13CStateManagerCFRCQ29CGraphics9CViewport: /* 800471C0 00044120 EC 21 00 32 */ fmuls f1, f1, f0 /* 800471C4 00044124 C0 BF 01 64 */ lfs f5, 0x164(r31) /* 800471C8 00044128 7D 89 03 A6 */ mtctr r12 -/* 800471CC 0004412C 4E 80 04 21 */ bctrl +/* 800471CC 0004412C 4E 80 04 21 */ bctrl /* 800471D0 00044130 FC 20 E0 90 */ fmr f1, f28 /* 800471D4 00044134 C0 7F 01 60 */ lfs f3, 0x160(r31) /* 800471D8 00044138 FC 40 F0 90 */ fmr f2, f30 @@ -3932,21 +3932,21 @@ SetupViewForDraw__13CStateManagerCFRCQ29CGraphics9CViewport: /* 800471F8 00044158 81 83 00 00 */ lwz r12, 0(r3) /* 800471FC 0004415C 81 8C 00 58 */ lwz r12, 0x58(r12) /* 80047200 00044160 7D 89 03 A6 */ mtctr r12 -/* 80047204 00044164 4E 80 04 21 */ bctrl +/* 80047204 00044164 4E 80 04 21 */ bctrl /* 80047208 00044168 48 30 2D A5 */ bl White__6CColorFv /* 8004720C 0004416C 7C 64 1B 78 */ mr r4, r3 /* 80047210 00044170 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 80047214 00044174 81 83 00 00 */ lwz r12, 0(r3) /* 80047218 00044178 81 8C 00 B4 */ lwz r12, 0xb4(r12) /* 8004721C 0004417C 7D 89 03 A6 */ mtctr r12 -/* 80047220 00044180 4E 80 04 21 */ bctrl +/* 80047220 00044180 4E 80 04 21 */ bctrl /* 80047224 00044184 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 80047228 00044188 3C 80 80 5A */ lis r4, skIdentity4f@ha /* 8004722C 0004418C 38 84 66 70 */ addi r4, r4, skIdentity4f@l /* 80047230 00044190 81 83 00 00 */ lwz r12, 0(r3) /* 80047234 00044194 81 8C 00 30 */ lwz r12, 0x30(r12) /* 80047238 00044198 7D 89 03 A6 */ mtctr r12 -/* 8004723C 0004419C 4E 80 04 21 */ bctrl +/* 8004723C 0004419C 4E 80 04 21 */ bctrl /* 80047240 000441A0 80 7E 08 7C */ lwz r3, 0x87c(r30) /* 80047244 000441A4 38 80 00 00 */ li r4, 0 /* 80047248 000441A8 48 0E 83 C1 */ bl StartFrame__18CFluidPlaneManagerCFb @@ -3956,7 +3956,7 @@ SetupViewForDraw__13CStateManagerCFRCQ29CGraphics9CViewport: /* 80047258 000441B8 81 83 00 00 */ lwz r12, 0(r3) /* 8004725C 000441BC 81 8C 00 84 */ lwz r12, 0x84(r12) /* 80047260 000441C0 7D 89 03 A6 */ mtctr r12 -/* 80047264 000441C4 4E 80 04 21 */ bctrl +/* 80047264 000441C4 4E 80 04 21 */ bctrl /* 80047268 000441C8 80 01 00 74 */ lwz r0, 0x74(r1) /* 8004726C 000441CC 38 81 00 78 */ addi r4, r1, 0x78 /* 80047270 000441D0 38 7D 00 04 */ addi r3, r29, 4 @@ -4018,7 +4018,7 @@ lbl_80047308: /* 80047334 00044294 80 01 01 64 */ lwz r0, 0x164(r1) /* 80047338 00044298 7C 08 03 A6 */ mtlr r0 /* 8004733C 0004429C 38 21 01 60 */ addi r1, r1, 0x160 -/* 80047340 000442A0 4E 80 00 20 */ blr +/* 80047340 000442A0 4E 80 00 20 */ blr .global PreRender__13CStateManagerFv PreRender__13CStateManagerFv: @@ -4148,14 +4148,14 @@ lbl_800474CC: /* 80047500 00044460 81 9A 00 00 */ lwz r12, 0(r26) /* 80047504 00044464 81 8C 00 30 */ lwz r12, 0x30(r12) /* 80047508 00044468 7D 89 03 A6 */ mtctr r12 -/* 8004750C 0004446C 4E 80 04 21 */ bctrl +/* 8004750C 0004446C 4E 80 04 21 */ bctrl /* 80047510 00044470 7F 43 D3 78 */ mr r3, r26 /* 80047514 00044474 7F 84 E3 78 */ mr r4, r28 /* 80047518 00044478 81 9A 00 00 */ lwz r12, 0(r26) /* 8004751C 0004447C 38 A1 00 74 */ addi r5, r1, 0x74 /* 80047520 00044480 81 8C 00 20 */ lwz r12, 0x20(r12) /* 80047524 00044484 7D 89 03 A6 */ mtctr r12 -/* 80047528 00044488 4E 80 04 21 */ bctrl +/* 80047528 00044488 4E 80 04 21 */ bctrl lbl_8004752C: /* 8004752C 0004448C 2C 19 FF FF */ cmpwi r25, -1 /* 80047530 00044490 41 82 00 14 */ beq lbl_80047544 @@ -4187,7 +4187,7 @@ lbl_8004757C: /* 80047584 000444E4 81 83 00 00 */ lwz r12, 0(r3) /* 80047588 000444E8 81 8C 01 08 */ lwz r12, 0x108(r12) /* 8004758C 000444EC 7D 89 03 A6 */ mtctr r12 -/* 80047590 000444F0 4E 80 04 21 */ bctrl +/* 80047590 000444F0 4E 80 04 21 */ bctrl /* 80047594 000444F4 48 33 DE 15 */ bl OSGetTime /* 80047598 000444F8 3C A0 80 5A */ lis r5, mData__10CStopwatch@ha /* 8004759C 000444FC 7C 9E 20 10 */ subfc r4, r30, r4 @@ -4228,13 +4228,13 @@ lbl_80047610: /* 80047614 00044574 80 01 01 04 */ lwz r0, 0x104(r1) /* 80047618 00044578 7C 08 03 A6 */ mtlr r0 /* 8004761C 0004457C 38 21 01 00 */ addi r1, r1, 0x100 -/* 80047620 00044580 4E 80 00 20 */ blr +/* 80047620 00044580 4E 80 00 20 */ blr .global AliveAreasEnd__6CWorldFv AliveAreasEnd__6CWorldFv: /* 80047624 00044584 80 0D A2 1C */ lwz r0, lbl_805A8DDC@sda21(r13) /* 80047628 00044588 90 03 00 00 */ stw r0, 0(r3) -/* 8004762C 0004458C 4E 80 00 20 */ blr +/* 8004762C 0004458C 4E 80 00 20 */ blr .global GetVisSetForArea__13CStateManagerCF7TAreaId7TAreaId GetVisSetForArea__13CStateManagerCF7TAreaId7TAreaId: @@ -4477,7 +4477,7 @@ lbl_8004798C: /* 800479A8 00044908 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 800479AC 0004490C 7C 08 03 A6 */ mtlr r0 /* 800479B0 00044910 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 800479B4 00044914 4E 80 00 20 */ blr +/* 800479B4 00044914 4E 80 00 20 */ blr .global RendererDrawCallback__13CStateManagerFPCvPCvi RendererDrawCallback__13CStateManagerFPCvPCvi: @@ -4519,7 +4519,7 @@ lbl_80047A30: /* 80047A38 00044998 81 9E 00 00 */ lwz r12, 0(r30) /* 80047A3C 0004499C 81 8C 00 28 */ lwz r12, 0x28(r12) /* 80047A40 000449A0 7D 89 03 A6 */ mtctr r12 -/* 80047A44 000449A4 4E 80 04 21 */ bctrl +/* 80047A44 000449A4 4E 80 04 21 */ bctrl /* 80047A48 000449A8 80 1F 08 DC */ lwz r0, 0x8dc(r31) /* 80047A4C 000449AC 90 1E 00 C8 */ stw r0, 0xc8(r30) /* 80047A50 000449B0 48 00 00 14 */ b lbl_80047A64 @@ -4535,7 +4535,7 @@ lbl_80047A64: /* 80047A6C 000449CC 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80047A70 000449D0 7C 08 03 A6 */ mtlr r0 /* 80047A74 000449D4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80047A78 000449D8 4E 80 00 20 */ blr +/* 80047A78 000449D8 4E 80 00 20 */ blr .global RecursiveDrawTree__13CStateManagerCF9TUniqueId RecursiveDrawTree__13CStateManagerCF9TUniqueId: @@ -4579,7 +4579,7 @@ lbl_80047AF4: /* 80047B0C 00044A6C 81 9F 00 00 */ lwz r12, 0(r31) /* 80047B10 00044A70 81 8C 00 28 */ lwz r12, 0x28(r12) /* 80047B14 00044A74 7D 89 03 A6 */ mtctr r12 -/* 80047B18 00044A78 4E 80 04 21 */ bctrl +/* 80047B18 00044A78 4E 80 04 21 */ bctrl lbl_80047B1C: /* 80047B1C 00044A7C 80 1E 08 DC */ lwz r0, 0x8dc(r30) /* 80047B20 00044A80 90 1F 00 C8 */ stw r0, 0xc8(r31) @@ -4589,7 +4589,7 @@ lbl_80047B24: /* 80047B2C 00044A8C 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80047B30 00044A90 7C 08 03 A6 */ mtlr r0 /* 80047B34 00044A94 38 21 00 30 */ addi r1, r1, 0x30 -/* 80047B38 00044A98 4E 80 00 20 */ blr +/* 80047B38 00044A98 4E 80 00 20 */ blr .global SendScriptMsg__13CStateManagerF9TUniqueId9TEditorId20EScriptObjectMessage18EScriptObjectState SendScriptMsg__13CStateManagerF9TUniqueId9TEditorId20EScriptObjectMessage18EScriptObjectState: @@ -4659,7 +4659,7 @@ lbl_80047C1C: /* 80047C20 00044B80 80 01 00 54 */ lwz r0, 0x54(r1) /* 80047C24 00044B84 7C 08 03 A6 */ mtlr r0 /* 80047C28 00044B88 38 21 00 50 */ addi r1, r1, 0x50 -/* 80047C2C 00044B8C 4E 80 00 20 */ blr +/* 80047C2C 00044B8C 4E 80 00 20 */ blr .global FreeScriptObjects__13CStateManagerF7TAreaId FreeScriptObjects__13CStateManagerF7TAreaId: @@ -4793,7 +4793,7 @@ lbl_80047DF0: /* 80047DF4 00044D54 80 01 00 54 */ lwz r0, 0x54(r1) /* 80047DF8 00044D58 7C 08 03 A6 */ mtlr r0 /* 80047DFC 00044D5C 38 21 00 50 */ addi r1, r1, 0x50 -/* 80047E00 00044D60 4E 80 00 20 */ blr +/* 80047E00 00044D60 4E 80 00 20 */ blr .global GetBuildForScript__13CStateManagerCF9TEditorId GetBuildForScript__13CStateManagerCF9TEditorId: @@ -4846,13 +4846,13 @@ lbl_80047E90: /* 80047E9C 00044DFC 90 03 00 00 */ stw r0, 0(r3) /* 80047EA0 00044E00 80 08 00 10 */ lwz r0, 0x10(r8) /* 80047EA4 00044E04 90 03 00 04 */ stw r0, 4(r3) -/* 80047EA8 00044E08 4E 80 00 20 */ blr +/* 80047EA8 00044E08 4E 80 00 20 */ blr lbl_80047EAC: /* 80047EAC 00044E0C 38 00 00 00 */ li r0, 0 /* 80047EB0 00044E10 90 03 00 00 */ stw r0, 0(r3) /* 80047EB4 00044E14 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) /* 80047EB8 00044E18 90 03 00 04 */ stw r0, 4(r3) -/* 80047EBC 00044E1C 4E 80 00 20 */ blr +/* 80047EBC 00044E1C 4E 80 00 20 */ blr .global GetEditorIdForUniqueId__13CStateManagerCF9TUniqueId GetEditorIdForUniqueId__13CStateManagerCF9TUniqueId: @@ -4880,7 +4880,7 @@ lbl_80047F08: /* 80047F0C 00044E6C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80047F10 00044E70 7C 08 03 A6 */ mtlr r0 /* 80047F14 00044E74 38 21 00 20 */ addi r1, r1, 0x20 -/* 80047F18 00044E78 4E 80 00 20 */ blr +/* 80047F18 00044E78 4E 80 00 20 */ blr .global GetIdForScript__13CStateManagerCF9TEditorId GetIdForScript__13CStateManagerCF9TEditorId: @@ -4931,11 +4931,11 @@ lbl_80047FA8: /* 80047FAC 00044F0C 41 82 00 10 */ beq lbl_80047FBC /* 80047FB0 00044F10 A0 08 00 14 */ lhz r0, 0x14(r8) /* 80047FB4 00044F14 B0 03 00 00 */ sth r0, 0(r3) -/* 80047FB8 00044F18 4E 80 00 20 */ blr +/* 80047FB8 00044F18 4E 80 00 20 */ blr lbl_80047FBC: /* 80047FBC 00044F1C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80047FC0 00044F20 B0 03 00 00 */ sth r0, 0(r3) -/* 80047FC4 00044F24 4E 80 00 20 */ blr +/* 80047FC4 00044F24 4E 80 00 20 */ blr .global GetIdListForScript__13CStateManagerCF9TEditorId GetIdListForScript__13CStateManagerCF9TEditorId: @@ -4959,7 +4959,7 @@ GetIdListForScript__13CStateManagerCF9TEditorId: /* 8004800C 00044F6C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80048010 00044F70 7C 08 03 A6 */ mtlr r0 /* 80048014 00044F74 38 21 00 20 */ addi r1, r1, 0x20 -/* 80048018 00044F78 4E 80 00 20 */ blr +/* 80048018 00044F78 4E 80 00 20 */ blr .global sub_8004801c sub_8004801c: @@ -5005,7 +5005,7 @@ lbl_80048090: /* 800480A0 00045000 90 03 00 04 */ stw r0, 4(r3) /* 800480A4 00045004 90 E3 00 08 */ stw r7, 8(r3) /* 800480A8 00045008 91 23 00 0C */ stw r9, 0xc(r3) -/* 800480AC 0004500C 4E 80 00 20 */ blr +/* 800480AC 0004500C 4E 80 00 20 */ blr .global "InitScriptObjects__13CStateManagerFRCQ24rstl18vector<9TEditorId>" "InitScriptObjects__13CStateManagerFRCQ24rstl18vector<9TEditorId>": @@ -5060,7 +5060,7 @@ lbl_80048140: /* 80048164 000450C4 83 81 00 20 */ lwz r28, 0x20(r1) /* 80048168 000450C8 7C 08 03 A6 */ mtlr r0 /* 8004816C 000450CC 38 21 00 30 */ addi r1, r1, 0x30 -/* 80048170 000450D0 4E 80 00 20 */ blr +/* 80048170 000450D0 4E 80 00 20 */ blr .global LoadScriptObjects__13CStateManagerF7TAreaIdR12CInputStreamQ213CStateManager18EScriptPersistence LoadScriptObjects__13CStateManagerF7TAreaIdR12CInputStreamQ213CStateManager18EScriptPersistence: @@ -5161,7 +5161,7 @@ lbl_800482C8: /* 800482D8 00045238 80 01 00 74 */ lwz r0, 0x74(r1) /* 800482DC 0004523C 7C 08 03 A6 */ mtlr r0 /* 800482E0 00045240 38 21 00 70 */ addi r1, r1, 0x70 -/* 800482E4 00045244 4E 80 00 20 */ blr +/* 800482E4 00045244 4E 80 00 20 */ blr .global GenerateObject__13CStateManagerF9TEditorId GenerateObject__13CStateManagerF9TEditorId: @@ -5239,7 +5239,7 @@ lbl_800483EC: /* 800483FC 0004535C 83 81 00 60 */ lwz r28, 0x60(r1) /* 80048400 00045360 7C 08 03 A6 */ mtlr r0 /* 80048404 00045364 38 21 00 70 */ addi r1, r1, 0x70 -/* 80048408 00045368 4E 80 00 20 */ blr +/* 80048408 00045368 4E 80 00 20 */ blr .global LoadScriptObject__13CStateManagerF7TAreaId17EScriptObjectTypeUiR12CInputStream LoadScriptObject__13CStateManagerF7TAreaId17EScriptObjectTypeUiR12CInputStream: @@ -5348,7 +5348,7 @@ lbl_80048554: /* 8004858C 000454EC 7E A5 AB 78 */ mr r5, r21 /* 80048590 000454F0 38 C1 00 68 */ addi r6, r1, 0x68 /* 80048594 000454F4 7D 89 03 A6 */ mtctr r12 -/* 80048598 000454F8 4E 80 04 21 */ bctrl +/* 80048598 000454F8 4E 80 04 21 */ bctrl /* 8004859C 000454FC 80 01 00 70 */ lwz r0, 0x70(r1) /* 800485A0 00045500 7C 7C 1B 78 */ mr r28, r3 /* 800485A4 00045504 80 81 00 78 */ lwz r4, 0x78(r1) @@ -5454,7 +5454,7 @@ lbl_800486E4: .global sub_800486f4 sub_800486f4: -/* 800486F4 00045654 4E 80 00 20 */ blr +/* 800486F4 00045654 4E 80 00 20 */ blr .global "__dt__Q24rstl48vector<11SConnection,Q24rstl17rmemory_allocator>Fv" "__dt__Q24rstl48vector<11SConnection,Q24rstl17rmemory_allocator>Fv": @@ -5496,7 +5496,7 @@ lbl_80048768: /* 80048774 000456D4 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80048778 000456D8 7C 08 03 A6 */ mtlr r0 /* 8004877C 000456DC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80048780 000456E0 4E 80 00 20 */ blr +/* 80048780 000456E0 4E 80 00 20 */ blr .global InformListeners__13CStateManagerFRC9CVector3f16EListenNoiseType InformListeners__13CStateManagerFRC9CVector3f16EListenNoiseType: @@ -5547,7 +5547,7 @@ lbl_80048818: /* 80048828 00045788 7F A5 EB 78 */ mr r5, r29 /* 8004882C 0004578C 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 80048830 00045790 7D 89 03 A6 */ mtctr r12 -/* 80048834 00045794 4E 80 04 21 */ bctrl +/* 80048834 00045794 4E 80 04 21 */ bctrl lbl_80048838: /* 80048838 00045798 2C 1E FF FF */ cmpwi r30, -1 /* 8004883C 0004579C 41 82 00 14 */ beq lbl_80048850 @@ -5564,12 +5564,12 @@ lbl_80048854: /* 80048860 000457C0 80 01 00 34 */ lwz r0, 0x34(r1) /* 80048864 000457C4 7C 08 03 A6 */ mtlr r0 /* 80048868 000457C8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8004886C 000457CC 4E 80 00 20 */ blr +/* 8004886C 000457CC 4E 80 00 20 */ blr .global Listen__3CAiFRC9CVector3f16EListenNoiseType Listen__3CAiFRC9CVector3f16EListenNoiseType: /* 80048870 000457D0 38 60 00 00 */ li r3, 0 -/* 80048874 000457D4 4E 80 00 20 */ blr +/* 80048874 000457D4 4E 80 00 20 */ blr .global KnockBackPlayer__13CStateManagerFR7CPlayerRC9CVector3fff KnockBackPlayer__13CStateManagerFR7CPlayerRC9CVector3fff: @@ -5717,7 +5717,7 @@ lbl_80048A70: /* 80048A88 000459E8 83 C1 00 58 */ lwz r30, 0x58(r1) /* 80048A8C 000459EC 7C 08 03 A6 */ mtlr r0 /* 80048A90 000459F0 38 21 00 80 */ addi r1, r1, 0x80 -/* 80048A94 000459F4 4E 80 00 20 */ blr +/* 80048A94 000459F4 4E 80 00 20 */ blr .global ApplyKnockBack__13CStateManagerFR6CActorRC11CDamageInfoRC20CDamageVulnerabilityRC9CVector3ff ApplyKnockBack__13CStateManagerFR6CActorRC11CDamageInfoRC20CDamageVulnerabilityRC9CVector3ff: @@ -5747,7 +5747,7 @@ ApplyKnockBack__13CStateManagerFR6CActorRC11CDamageInfoRC20CDamageVulnerabilityR /* 80048AF4 00045A54 81 9B 00 00 */ lwz r12, 0(r27) /* 80048AF8 00045A58 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80048AFC 00045A5C 7D 89 03 A6 */ mtctr r12 -/* 80048B00 00045A60 4E 80 04 21 */ bctrl +/* 80048B00 00045A60 4E 80 04 21 */ bctrl /* 80048B04 00045A64 7C 7F 1B 79 */ or. r31, r3, r3 /* 80048B08 00045A68 41 82 01 78 */ beq lbl_80048C80 /* 80048B0C 00045A6C C0 22 85 64 */ lfs f1, lbl_805AA284@sda21(r2) @@ -5845,7 +5845,7 @@ lbl_80048C44: /* 80048C70 00045BD0 39 00 00 00 */ li r8, 0 /* 80048C74 00045BD4 81 8C 00 88 */ lwz r12, 0x88(r12) /* 80048C78 00045BD8 7D 89 03 A6 */ mtctr r12 -/* 80048C7C 00045BDC 4E 80 04 21 */ bctrl +/* 80048C7C 00045BDC 4E 80 04 21 */ bctrl lbl_80048C80: /* 80048C80 00045BE0 E3 E1 00 78 */ psq_l f31, 120(r1), 0, qr0 /* 80048C84 00045BE4 CB E1 00 70 */ lfd f31, 0x70(r1) @@ -5857,7 +5857,7 @@ lbl_80048C80: /* 80048C9C 00045BFC 80 01 00 84 */ lwz r0, 0x84(r1) /* 80048CA0 00045C00 7C 08 03 A6 */ mtlr r0 /* 80048CA4 00045C04 38 21 00 80 */ addi r1, r1, 0x80 -/* 80048CA8 00045C08 4E 80 00 20 */ blr +/* 80048CA8 00045C08 4E 80 00 20 */ blr .global ApplyDamageToWorld__13CStateManagerF9TUniqueIdRC6CActorRC9CVector3fRC11CDamageInfoRC15CMaterialFilter ApplyDamageToWorld__13CStateManagerF9TUniqueIdRC6CActorRC9CVector3fRC11CDamageInfoRC15CMaterialFilter: @@ -6091,7 +6091,7 @@ lbl_80048FF4: /* 80049000 00045F60 80 01 08 F4 */ lwz r0, 0x8f4(r1) /* 80049004 00045F64 7C 08 03 A6 */ mtlr r0 /* 80049008 00045F68 38 21 08 F0 */ addi r1, r1, 0x8f0 -/* 8004900C 00045F6C 4E 80 00 20 */ blr +/* 8004900C 00045F6C 4E 80 00 20 */ blr .global ProcessRadiusDamage__13CStateManagerFRC6CActorR6CActor9TUniqueIdRC11CDamageInfoRC15CMaterialFilter ProcessRadiusDamage__13CStateManagerFRC6CActorR6CActor9TUniqueIdRC11CDamageInfoRC15CMaterialFilter: @@ -6220,7 +6220,7 @@ lbl_800491D0: /* 800491DC 0004613C 80 01 08 94 */ lwz r0, 0x894(r1) /* 800491E0 00046140 7C 08 03 A6 */ mtlr r0 /* 800491E4 00046144 38 21 08 90 */ addi r1, r1, 0x890 -/* 800491E8 00046148 4E 80 00 20 */ blr +/* 800491E8 00046148 4E 80 00 20 */ blr .global ApplyRadiusDamage__13CStateManagerFRC6CActorRC9CVector3fR6CActorRC11CDamageInfo ApplyRadiusDamage__13CStateManagerFRC6CActorRC9CVector3fR6CActorRC11CDamageInfo: @@ -6261,7 +6261,7 @@ ApplyRadiusDamage__13CStateManagerFRC6CActorRC9CVector3fR6CActorRC11CDamageInfo: /* 80049274 000461D4 81 9A 00 00 */ lwz r12, 0(r26) /* 80049278 000461D8 81 8C 00 40 */ lwz r12, 0x40(r12) /* 8004927C 000461DC 7D 89 03 A6 */ mtctr r12 -/* 80049280 000461E0 4E 80 04 21 */ bctrl +/* 80049280 000461E0 4E 80 04 21 */ bctrl /* 80049284 000461E4 88 61 00 80 */ lbz r3, 0x80(r1) /* 80049288 000461E8 38 00 00 00 */ li r0, 0 /* 8004928C 000461EC 28 03 00 00 */ cmplwi r3, 0 @@ -6272,7 +6272,7 @@ ApplyRadiusDamage__13CStateManagerFRC6CActorRC9CVector3fR6CActorRC11CDamageInfo: /* 800492A0 00046200 81 9A 00 00 */ lwz r12, 0(r26) /* 800492A4 00046204 81 8C 00 40 */ lwz r12, 0x40(r12) /* 800492A8 00046208 7D 89 03 A6 */ mtctr r12 -/* 800492AC 0004620C 4E 80 04 21 */ bctrl +/* 800492AC 0004620C 4E 80 04 21 */ bctrl /* 800492B0 00046210 C0 7B 00 10 */ lfs f3, 0x10(r27) /* 800492B4 00046214 38 61 00 24 */ addi r3, r1, 0x24 /* 800492B8 00046218 C0 59 00 00 */ lfs f2, 0(r25) @@ -6311,7 +6311,7 @@ lbl_80049324: /* 8004932C 0004628C 81 9A 00 00 */ lwz r12, 0(r26) /* 80049330 00046290 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80049334 00046294 7D 89 03 A6 */ mtctr r12 -/* 80049338 00046298 4E 80 04 21 */ bctrl +/* 80049338 00046298 4E 80 04 21 */ bctrl /* 8004933C 0004629C 28 03 00 00 */ cmplwi r3, 0 /* 80049340 000462A0 3B A0 00 00 */ li r29, 0 /* 80049344 000462A4 41 82 00 18 */ beq lbl_8004935C @@ -6331,7 +6331,7 @@ lbl_8004935C: /* 80049378 000462D8 38 A1 00 40 */ addi r5, r1, 0x40 /* 8004937C 000462DC 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 80049380 000462E0 7D 89 03 A6 */ mtctr r12 -/* 80049384 000462E4 4E 80 04 21 */ bctrl +/* 80049384 000462E4 4E 80 04 21 */ bctrl /* 80049388 000462E8 7C 7C 1B 78 */ mr r28, r3 /* 8004938C 000462EC 48 00 00 1C */ b lbl_800493A8 lbl_80049390: @@ -6339,7 +6339,7 @@ lbl_80049390: /* 80049394 000462F4 81 9A 00 00 */ lwz r12, 0(r26) /* 80049398 000462F8 81 8C 00 38 */ lwz r12, 0x38(r12) /* 8004939C 000462FC 7D 89 03 A6 */ mtctr r12 -/* 800493A0 00046300 4E 80 04 21 */ bctrl +/* 800493A0 00046300 4E 80 04 21 */ bctrl /* 800493A4 00046304 7C 7C 1B 78 */ mr r28, r3 lbl_800493A8: /* 800493A8 00046308 7F 83 E3 78 */ mr r3, r28 @@ -6423,7 +6423,7 @@ lbl_800494C4: /* 800494D0 00046430 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 800494D4 00046434 7C 08 03 A6 */ mtlr r0 /* 800494D8 00046438 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 800494DC 0004643C 4E 80 00 20 */ blr +/* 800494DC 0004643C 4E 80 00 20 */ blr .global "TestRayDamage__13CStateManagerRC9CVector3fRC6CActorRCQ24rstl49reserved_vector<9TUniqueId,1024>" "TestRayDamage__13CStateManagerRC9CVector3fRC6CActorRCQ24rstl49reserved_vector<9TUniqueId,1024>": @@ -6442,7 +6442,7 @@ lbl_800494C4: /* 80049510 00046470 7F 84 E3 78 */ mr r4, r28 /* 80049514 00046474 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80049518 00046478 7D 89 03 A6 */ mtctr r12 -/* 8004951C 0004647C 4E 80 04 21 */ bctrl +/* 8004951C 0004647C 4E 80 04 21 */ bctrl /* 80049520 00046480 28 03 00 00 */ cmplwi r3, 0 /* 80049524 00046484 40 82 00 0C */ bne lbl_80049530 /* 80049528 00046488 38 60 00 00 */ li r3, 0 @@ -6516,7 +6516,7 @@ lbl_80049620: /* 80049628 00046588 81 9E 00 00 */ lwz r12, 0(r30) /* 8004962C 0004658C 81 8C 00 40 */ lwz r12, 0x40(r12) /* 80049630 00046590 7D 89 03 A6 */ mtctr r12 -/* 80049634 00046594 4E 80 04 21 */ bctrl +/* 80049634 00046594 4E 80 04 21 */ bctrl /* 80049638 00046598 88 01 00 54 */ lbz r0, 0x54(r1) /* 8004963C 0004659C 28 00 00 00 */ cmplwi r0, 0 /* 80049640 000465A0 98 01 00 88 */ stb r0, 0x88(r1) @@ -6692,7 +6692,7 @@ lbl_800498BC: /* 800498C8 00046828 80 01 01 34 */ lwz r0, 0x134(r1) /* 800498CC 0004682C 7C 08 03 A6 */ mtlr r0 /* 800498D0 00046830 38 21 01 30 */ addi r1, r1, 0x130 -/* 800498D4 00046834 4E 80 00 20 */ blr +/* 800498D4 00046834 4E 80 00 20 */ blr .global MultiRayCollideWorld__13CStateManagerRC5CMRayRC15CMaterialFilter MultiRayCollideWorld__13CStateManagerRC5CMRayRC15CMaterialFilter: @@ -6826,7 +6826,7 @@ lbl_80049AA8: /* 80049ABC 00046A1C 83 81 00 60 */ lwz r28, 0x60(r1) /* 80049AC0 00046A20 7C 08 03 A6 */ mtlr r0 /* 80049AC4 00046A24 38 21 00 70 */ addi r1, r1, 0x70 -/* 80049AC8 00046A28 4E 80 00 20 */ blr +/* 80049AC8 00046A28 4E 80 00 20 */ blr .global TestBombHittingWater__13CStateManagerFRC6CActorRC9CVector3fR6CActor TestBombHittingWater__13CStateManagerFRC6CActorRC9CVector3fR6CActor: @@ -6941,7 +6941,7 @@ lbl_80049B2C: /* 80049C78 00046BD8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80049C7C 00046BDC EC 20 0F FA */ fmadds f1, f0, f31, f1 /* 80049C80 00046BE0 7D 89 03 A6 */ mtctr r12 -/* 80049C84 00046BE4 4E 80 04 21 */ bctrl +/* 80049C84 00046BE4 4E 80 04 21 */ bctrl lbl_80049C88: /* 80049C88 00046BE8 2C 1C 00 00 */ cmpwi r28, 0 /* 80049C8C 00046BEC 40 82 01 24 */ bne lbl_80049DB0 @@ -7017,7 +7017,7 @@ lbl_80049CC0: /* 80049DA0 00046D00 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80049DA4 00046D04 EC 20 0F FA */ fmadds f1, f0, f31, f1 /* 80049DA8 00046D08 7D 89 03 A6 */ mtctr r12 -/* 80049DAC 00046D0C 4E 80 04 21 */ bctrl +/* 80049DAC 00046D0C 4E 80 04 21 */ bctrl lbl_80049DB0: /* 80049DB0 00046D10 E3 E1 01 08 */ psq_l f31, 264(r1), 0, qr0 /* 80049DB4 00046D14 CB E1 01 00 */ lfd f31, 0x100(r1) @@ -7027,7 +7027,7 @@ lbl_80049DB0: /* 80049DC4 00046D24 80 01 01 14 */ lwz r0, 0x114(r1) /* 80049DC8 00046D28 7C 08 03 A6 */ mtlr r0 /* 80049DCC 00046D2C 38 21 01 10 */ addi r1, r1, 0x110 -/* 80049DD0 00046D30 4E 80 00 20 */ blr +/* 80049DD0 00046D30 4E 80 00 20 */ blr .global ApplyLocalDamage__13CStateManagerFRC9CVector3fRC9CVector3fR6CActorfRC11CWeaponMode ApplyLocalDamage__13CStateManagerFRC9CVector3fRC9CVector3fR6CActorfRC11CWeaponMode: @@ -7052,7 +7052,7 @@ ApplyLocalDamage__13CStateManagerFRC9CVector3fRC9CVector3fR6CActorfRC11CWeaponMo /* 80049E1C 00046D7C 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80049E20 00046D80 7F 24 CB 78 */ mr r4, r25 /* 80049E24 00046D84 7D 89 03 A6 */ mtctr r12 -/* 80049E28 00046D88 4E 80 04 21 */ bctrl +/* 80049E28 00046D88 4E 80 04 21 */ bctrl /* 80049E2C 00046D8C 7C 7F 1B 79 */ or. r31, r3, r3 /* 80049E30 00046D90 41 82 00 10 */ beq lbl_80049E40 /* 80049E34 00046D94 C0 02 85 68 */ lfs f0, lbl_805AA288@sda21(r2) @@ -7197,7 +7197,7 @@ lbl_8004A014: /* 8004A030 00046F90 7F 64 DB 78 */ mr r4, r27 /* 8004A034 00046F94 81 8C 00 90 */ lwz r12, 0x90(r12) /* 8004A038 00046F98 7D 89 03 A6 */ mtctr r12 -/* 8004A03C 00046F9C 4E 80 04 21 */ bctrl +/* 8004A03C 00046F9C 4E 80 04 21 */ bctrl lbl_8004A040: /* 8004A040 00046FA0 C0 02 85 68 */ lfs f0, lbl_805AA288@sda21(r2) /* 8004A044 00046FA4 FC 1D 00 40 */ fcmpo cr0, f29, f0 @@ -7210,7 +7210,7 @@ lbl_8004A040: /* 8004A060 00046FC0 38 C0 00 14 */ li r6, 0x14 /* 8004A064 00046FC4 81 8C 00 84 */ lwz r12, 0x84(r12) /* 8004A068 00046FC8 7D 89 03 A6 */ mtctr r12 -/* 8004A06C 00046FCC 4E 80 04 21 */ bctrl +/* 8004A06C 00046FCC 4E 80 04 21 */ bctrl lbl_8004A070: /* 8004A070 00046FD0 57 E3 06 3E */ clrlwi r3, r31, 0x18 lbl_8004A074: @@ -7224,7 +7224,7 @@ lbl_8004A074: /* 8004A090 00046FF0 80 01 00 84 */ lwz r0, 0x84(r1) /* 8004A094 00046FF4 7C 08 03 A6 */ mtlr r0 /* 8004A098 00046FF8 38 21 00 80 */ addi r1, r1, 0x80 -/* 8004A09C 00046FFC 4E 80 00 20 */ blr +/* 8004A09C 00046FFC 4E 80 00 20 */ blr .global ApplyDamage__13CStateManagerF9TUniqueId9TUniqueId9TUniqueIdRC11CDamageInfoRC15CMaterialFilterRC9CVector3f ApplyDamage__13CStateManagerF9TUniqueId9TUniqueId9TUniqueIdRC11CDamageInfoRC15CMaterialFilterRC9CVector3f: @@ -7272,7 +7272,7 @@ ApplyDamage__13CStateManagerF9TUniqueId9TUniqueId9TUniqueIdRC11CDamageInfoRC15CM /* 8004A144 000470A4 81 9D 00 00 */ lwz r12, 0(r29) /* 8004A148 000470A8 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8004A14C 000470AC 7D 89 03 A6 */ mtctr r12 -/* 8004A150 000470B0 4E 80 04 21 */ bctrl +/* 8004A150 000470B0 4E 80 04 21 */ bctrl /* 8004A154 000470B4 28 03 00 00 */ cmplwi r3, 0 /* 8004A158 000470B8 41 82 02 4C */ beq lbl_8004A3A4 /* 8004A15C 000470BC C0 22 85 68 */ lfs f1, lbl_805AA288@sda21(r2) @@ -7319,14 +7319,14 @@ lbl_8004A1DC: /* 8004A1F4 00047154 38 A1 00 78 */ addi r5, r1, 0x78 /* 8004A1F8 00047158 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 8004A1FC 0004715C 7D 89 03 A6 */ mtctr r12 -/* 8004A200 00047160 4E 80 04 21 */ bctrl +/* 8004A200 00047160 4E 80 04 21 */ bctrl /* 8004A204 00047164 48 00 00 18 */ b lbl_8004A21C lbl_8004A208: /* 8004A208 00047168 7F A3 EB 78 */ mr r3, r29 /* 8004A20C 0004716C 81 9D 00 00 */ lwz r12, 0(r29) /* 8004A210 00047170 81 8C 00 38 */ lwz r12, 0x38(r12) /* 8004A214 00047174 7D 89 03 A6 */ mtctr r12 -/* 8004A218 00047178 4E 80 04 21 */ bctrl +/* 8004A218 00047178 4E 80 04 21 */ bctrl lbl_8004A21C: /* 8004A21C 0004717C 80 19 00 00 */ lwz r0, 0(r25) /* 8004A220 00047180 7C 75 1B 78 */ mr r21, r3 @@ -7480,7 +7480,7 @@ lbl_8004A440: /* 8004A444 000473A4 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 8004A448 000473A8 7C 08 03 A6 */ mtlr r0 /* 8004A44C 000473AC 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 8004A450 000473B0 4E 80 00 20 */ blr +/* 8004A450 000473B0 4E 80 00 20 */ blr .global UpdateAreaSounds__13CStateManagerFv UpdateAreaSounds__13CStateManagerFv: @@ -7581,7 +7581,7 @@ lbl_8004A584: /* 8004A594 000474F4 83 C1 00 38 */ lwz r30, 0x38(r1) /* 8004A598 000474F8 7C 08 03 A6 */ mtlr r0 /* 8004A59C 000474FC 38 21 00 40 */ addi r1, r1, 0x40 -/* 8004A5A0 00047500 4E 80 00 20 */ blr +/* 8004A5A0 00047500 4E 80 00 20 */ blr .global FrameEnd__13CStateManagerFv FrameEnd__13CStateManagerFv: @@ -7593,11 +7593,11 @@ FrameEnd__13CStateManagerFv: /* 8004A5B8 00047518 81 83 00 00 */ lwz r12, 0(r3) /* 8004A5BC 0004751C 81 8C 00 24 */ lwz r12, 0x24(r12) /* 8004A5C0 00047520 7D 89 03 A6 */ mtctr r12 -/* 8004A5C4 00047524 4E 80 04 21 */ bctrl +/* 8004A5C4 00047524 4E 80 04 21 */ bctrl /* 8004A5C8 00047528 80 01 00 14 */ lwz r0, 0x14(r1) /* 8004A5CC 0004752C 7C 08 03 A6 */ mtlr r0 /* 8004A5D0 00047530 38 21 00 10 */ addi r1, r1, 0x10 -/* 8004A5D4 00047534 4E 80 00 20 */ blr +/* 8004A5D4 00047534 4E 80 00 20 */ blr .global ProcessPlayerInput__13CStateManagerFv ProcessPlayerInput__13CStateManagerFv: @@ -7614,7 +7614,7 @@ lbl_8004A5FC: /* 8004A5FC 0004755C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8004A600 00047560 7C 08 03 A6 */ mtlr r0 /* 8004A604 00047564 38 21 00 10 */ addi r1, r1, 0x10 -/* 8004A608 00047568 4E 80 00 20 */ blr +/* 8004A608 00047568 4E 80 00 20 */ blr .global ProcessInput__13CStateManagerFRC11CFinalInput ProcessInput__13CStateManagerFRC11CFinalInput: @@ -7733,7 +7733,7 @@ lbl_8004A7A4: /* 8004A7BC 0004771C 83 C1 00 08 */ lwz r30, 8(r1) /* 8004A7C0 00047720 7C 08 03 A6 */ mtlr r0 /* 8004A7C4 00047724 38 21 00 10 */ addi r1, r1, 0x10 -/* 8004A7C8 00047728 4E 80 00 20 */ blr +/* 8004A7C8 00047728 4E 80 00 20 */ blr .global Update__13CStateManagerFf Update__13CStateManagerFf: @@ -7912,7 +7912,7 @@ lbl_8004AA38: /* 8004AA40 000479A0 7F C4 F3 78 */ mr r4, r30 /* 8004AA44 000479A4 81 8C 00 14 */ lwz r12, 0x14(r12) /* 8004AA48 000479A8 7D 89 03 A6 */ mtctr r12 -/* 8004AA4C 000479AC 4E 80 04 21 */ bctrl +/* 8004AA4C 000479AC 4E 80 04 21 */ bctrl lbl_8004AA50: /* 8004AA50 000479B0 A0 7E 0F 76 */ lhz r3, 0xf76(r30) /* 8004AA54 000479B4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) @@ -8014,7 +8014,7 @@ lbl_8004AB6C: /* 8004ABB8 00047B18 80 01 00 44 */ lwz r0, 0x44(r1) /* 8004ABBC 00047B1C 7C 08 03 A6 */ mtlr r0 /* 8004ABC0 00047B20 38 21 00 40 */ addi r1, r1, 0x40 -/* 8004ABC4 00047B24 4E 80 00 20 */ blr +/* 8004ABC4 00047B24 4E 80 00 20 */ blr .global PostUpdatePlayer__13CStateManagerFf PostUpdatePlayer__13CStateManagerFf: @@ -8027,7 +8027,7 @@ PostUpdatePlayer__13CStateManagerFf: /* 8004ABE0 00047B40 80 01 00 14 */ lwz r0, 0x14(r1) /* 8004ABE4 00047B44 7C 08 03 A6 */ mtlr r0 /* 8004ABE8 00047B48 38 21 00 10 */ addi r1, r1, 0x10 -/* 8004ABEC 00047B4C 4E 80 00 20 */ blr +/* 8004ABEC 00047B4C 4E 80 00 20 */ blr .global PreThinkObjects__13CStateManagerFf PreThinkObjects__13CStateManagerFf: @@ -8069,7 +8069,7 @@ lbl_8004AC48: /* 8004AC74 00047BD4 7F 64 DB 78 */ mr r4, r27 /* 8004AC78 00047BD8 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8004AC7C 00047BDC 7D 89 03 A6 */ mtctr r12 -/* 8004AC80 00047BE0 4E 80 04 21 */ bctrl +/* 8004AC80 00047BE0 4E 80 04 21 */ bctrl lbl_8004AC84: /* 8004AC84 00047BE4 2C 1E FF FF */ cmpwi r30, -1 /* 8004AC88 00047BE8 41 82 00 14 */ beq lbl_8004AC9C @@ -8107,7 +8107,7 @@ lbl_8004ACB8: /* 8004ACF8 00047C58 7F 64 DB 78 */ mr r4, r27 /* 8004ACFC 00047C5C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8004AD00 00047C60 7D 89 03 A6 */ mtctr r12 -/* 8004AD04 00047C64 4E 80 04 21 */ bctrl +/* 8004AD04 00047C64 4E 80 04 21 */ bctrl lbl_8004AD08: /* 8004AD08 00047C68 2C 1D FF FF */ cmpwi r29, -1 /* 8004AD0C 00047C6C 41 82 00 14 */ beq lbl_8004AD20 @@ -8127,7 +8127,7 @@ lbl_8004AD2C: /* 8004AD38 00047C98 80 01 00 44 */ lwz r0, 0x44(r1) /* 8004AD3C 00047C9C 7C 08 03 A6 */ mtlr r0 /* 8004AD40 00047CA0 38 21 00 40 */ addi r1, r1, 0x40 -/* 8004AD44 00047CA4 4E 80 00 20 */ blr +/* 8004AD44 00047CA4 4E 80 00 20 */ blr .global Think__13CStateManagerFf Think__13CStateManagerFf: @@ -8169,7 +8169,7 @@ lbl_8004ADA0: /* 8004ADCC 00047D2C 7F 64 DB 78 */ mr r4, r27 /* 8004ADD0 00047D30 81 8C 00 14 */ lwz r12, 0x14(r12) /* 8004ADD4 00047D34 7D 89 03 A6 */ mtctr r12 -/* 8004ADD8 00047D38 4E 80 04 21 */ bctrl +/* 8004ADD8 00047D38 4E 80 04 21 */ bctrl lbl_8004ADDC: /* 8004ADDC 00047D3C 2C 1C FF FF */ cmpwi r28, -1 /* 8004ADE0 00047D40 41 82 00 14 */ beq lbl_8004ADF4 @@ -8247,7 +8247,7 @@ lbl_8004AEB4: /* 8004AEE0 00047E40 7F 64 DB 78 */ mr r4, r27 /* 8004AEE4 00047E44 81 8C 00 14 */ lwz r12, 0x14(r12) /* 8004AEE8 00047E48 7D 89 03 A6 */ mtctr r12 -/* 8004AEEC 00047E4C 4E 80 04 21 */ bctrl +/* 8004AEEC 00047E4C 4E 80 04 21 */ bctrl lbl_8004AEF0: /* 8004AEF0 00047E50 2C 1D FF FF */ cmpwi r29, -1 /* 8004AEF4 00047E54 41 82 00 14 */ beq lbl_8004AF08 @@ -8267,7 +8267,7 @@ lbl_8004AF14: /* 8004AF20 00047E80 80 01 00 54 */ lwz r0, 0x54(r1) /* 8004AF24 00047E84 7C 08 03 A6 */ mtlr r0 /* 8004AF28 00047E88 38 21 00 50 */ addi r1, r1, 0x50 -/* 8004AF2C 00047E8C 4E 80 00 20 */ blr +/* 8004AF2C 00047E8C 4E 80 00 20 */ blr .global CrossTouchActors__13CStateManagerFf CrossTouchActors__13CStateManagerFf: @@ -8301,7 +8301,7 @@ lbl_8004AF64: /* 8004AF98 00047EF8 81 9C 00 00 */ lwz r12, 0(r28) /* 8004AF9C 00047EFC 81 8C 00 40 */ lwz r12, 0x40(r12) /* 8004AFA0 00047F00 7D 89 03 A6 */ mtctr r12 -/* 8004AFA4 00047F04 4E 80 04 21 */ bctrl +/* 8004AFA4 00047F04 4E 80 04 21 */ bctrl /* 8004AFA8 00047F08 88 01 00 58 */ lbz r0, 0x58(r1) /* 8004AFAC 00047F0C 28 00 00 00 */ cmplwi r0, 0 /* 8004AFB0 00047F10 98 01 00 A8 */ stb r0, 0xa8(r1) @@ -8388,7 +8388,7 @@ lbl_8004B0BC: /* 8004B0E0 00048040 81 9A 00 00 */ lwz r12, 0(r26) /* 8004B0E4 00048044 81 8C 00 40 */ lwz r12, 0x40(r12) /* 8004B0E8 00048048 7D 89 03 A6 */ mtctr r12 -/* 8004B0EC 0004804C 4E 80 04 21 */ bctrl +/* 8004B0EC 0004804C 4E 80 04 21 */ bctrl /* 8004B0F0 00048050 88 01 00 24 */ lbz r0, 0x24(r1) /* 8004B0F4 00048054 28 00 00 00 */ cmplwi r0, 0 /* 8004B0F8 00048058 98 01 00 74 */ stb r0, 0x74(r1) @@ -8438,14 +8438,14 @@ lbl_8004B164: /* 8004B19C 000480FC 7F 25 CB 78 */ mr r5, r25 /* 8004B1A0 00048100 81 8C 00 44 */ lwz r12, 0x44(r12) /* 8004B1A4 00048104 7D 89 03 A6 */ mtctr r12 -/* 8004B1A8 00048108 4E 80 04 21 */ bctrl +/* 8004B1A8 00048108 4E 80 04 21 */ bctrl /* 8004B1AC 0004810C 7F 43 D3 78 */ mr r3, r26 /* 8004B1B0 00048110 7F 84 E3 78 */ mr r4, r28 /* 8004B1B4 00048114 81 9A 00 00 */ lwz r12, 0(r26) /* 8004B1B8 00048118 7F 25 CB 78 */ mr r5, r25 /* 8004B1BC 0004811C 81 8C 00 44 */ lwz r12, 0x44(r12) /* 8004B1C0 00048120 7D 89 03 A6 */ mtctr r12 -/* 8004B1C4 00048124 4E 80 04 21 */ bctrl +/* 8004B1C4 00048124 4E 80 04 21 */ bctrl lbl_8004B1C8: /* 8004B1C8 00048128 A0 1C 00 08 */ lhz r0, 8(r28) /* 8004B1CC 0004812C 38 61 08 B0 */ addi r3, r1, 0x8b0 @@ -8505,7 +8505,7 @@ lbl_8004B270: /* 8004B27C 000481DC 80 01 0C D4 */ lwz r0, 0xcd4(r1) /* 8004B280 000481E0 7C 08 03 A6 */ mtlr r0 /* 8004B284 000481E4 38 21 0C D0 */ addi r1, r1, 0xcd0 -/* 8004B288 000481E8 4E 80 00 20 */ blr +/* 8004B288 000481E8 4E 80 00 20 */ blr .global MoveDoors__13CStateManagerFf MoveDoors__13CStateManagerFf: @@ -8620,7 +8620,7 @@ lbl_8004B3FC: /* 8004B41C 0004837C 83 81 00 30 */ lwz r28, 0x30(r1) /* 8004B420 00048380 7C 08 03 A6 */ mtlr r0 /* 8004B424 00048384 38 21 00 50 */ addi r1, r1, 0x50 -/* 8004B428 00048388 4E 80 00 20 */ blr +/* 8004B428 00048388 4E 80 00 20 */ blr .global MovePlatforms__13CStateManagerFf MovePlatforms__13CStateManagerFf: @@ -8681,15 +8681,15 @@ lbl_8004B4D4: /* 8004B4F4 00048454 83 81 00 10 */ lwz r28, 0x10(r1) /* 8004B4F8 00048458 7C 08 03 A6 */ mtlr r0 /* 8004B4FC 0004845C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8004B500 00048460 4E 80 00 20 */ blr +/* 8004B500 00048460 4E 80 00 20 */ blr .global nullsub_34 nullsub_34: -/* 8004B504 00048464 4E 80 00 20 */ blr +/* 8004B504 00048464 4E 80 00 20 */ blr .global UpdateGameState__13CStateManagerFv UpdateGameState__13CStateManagerFv: -/* 8004B508 00048468 4E 80 00 20 */ blr +/* 8004B508 00048468 4E 80 00 20 */ blr .global SwapOutAllPossibleMemory__13CStateManagerFv SwapOutAllPossibleMemory__13CStateManagerFv: @@ -8703,7 +8703,7 @@ SwapOutAllPossibleMemory__13CStateManagerFv: /* 8004B528 00048488 38 60 00 01 */ li r3, 1 /* 8004B52C 0004848C 7C 08 03 A6 */ mtlr r0 /* 8004B530 00048490 38 21 00 10 */ addi r1, r1, 0x10 -/* 8004B534 00048494 4E 80 00 20 */ blr +/* 8004B534 00048494 4E 80 00 20 */ blr .global MemoryAllocatorAllocationFailedCallback__13CStateManagerFPCvUi MemoryAllocatorAllocationFailedCallback__13CStateManagerFPCvUi: @@ -8714,11 +8714,11 @@ MemoryAllocatorAllocationFailedCallback__13CStateManagerFPCvUi: /* 8004B548 000484A8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8004B54C 000484AC 7C 08 03 A6 */ mtlr r0 /* 8004B550 000484B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8004B554 000484B4 4E 80 00 20 */ blr +/* 8004B554 000484B4 4E 80 00 20 */ blr .global SwapOutTexturesToARAM__13CStateManagerFiUi SwapOutTexturesToARAM__13CStateManagerFiUi: -/* 8004B558 000484B8 4E 80 00 20 */ blr +/* 8004B558 000484B8 4E 80 00 20 */ blr .global FrameBegin__13CStateManagerFUi FrameBegin__13CStateManagerFUi: @@ -8736,7 +8736,7 @@ FrameBegin__13CStateManagerFUi: /* 8004B588 000484E8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8004B58C 000484EC 7C 08 03 A6 */ mtlr r0 /* 8004B590 000484F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8004B594 000484F4 4E 80 00 20 */ blr +/* 8004B594 000484F4 4E 80 00 20 */ blr .global InitializeState__13CStateManagerFUi7TAreaIdUi InitializeState__13CStateManagerFUi7TAreaIdUi: @@ -8778,7 +8778,7 @@ lbl_8004B610: /* 8004B620 00048580 38 80 00 01 */ li r4, 1 /* 8004B624 00048584 81 8C 00 08 */ lwz r12, 8(r12) /* 8004B628 00048588 7D 89 03 A6 */ mtctr r12 -/* 8004B62C 0004858C 4E 80 04 21 */ bctrl +/* 8004B62C 0004858C 4E 80 04 21 */ bctrl lbl_8004B630: /* 8004B630 00048590 93 7F 08 50 */ stw r27, 0x850(r31) /* 8004B634 00048594 38 00 00 01 */ li r0, 1 @@ -9054,7 +9054,7 @@ lbl_8004BA14: /* 8004BA18 00048978 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 8004BA1C 0004897C 7C 08 03 A6 */ mtlr r0 /* 8004BA20 00048980 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8004BA24 00048984 4E 80 00 20 */ blr +/* 8004BA24 00048984 4E 80 00 20 */ blr .global CreateStandardGameObjects__13CStateManagerFv CreateStandardGameObjects__13CStateManagerFv: @@ -9232,7 +9232,7 @@ lbl_8004BC94: /* 8004BCD0 00048C30 83 C1 01 68 */ lwz r30, 0x168(r1) /* 8004BCD4 00048C34 7C 08 03 A6 */ mtlr r0 /* 8004BCD8 00048C38 38 21 01 A0 */ addi r1, r1, 0x1a0 -/* 8004BCDC 00048C3C 4E 80 00 20 */ blr +/* 8004BCDC 00048C3C 4E 80 00 20 */ blr .global RemoveObject__13CStateManagerF9TUniqueId RemoveObject__13CStateManagerF9TUniqueId: @@ -9362,7 +9362,7 @@ lbl_8004BE90: /* 8004BEA0 00048E00 80 01 00 74 */ lwz r0, 0x74(r1) /* 8004BEA4 00048E04 7C 08 03 A6 */ mtlr r0 /* 8004BEA8 00048E08 38 21 00 70 */ addi r1, r1, 0x70 -/* 8004BEAC 00048E0C 4E 80 00 20 */ blr +/* 8004BEAC 00048E0C 4E 80 00 20 */ blr .global sub_8004beb0 sub_8004beb0: @@ -9408,7 +9408,7 @@ lbl_8004BF24: /* 8004BF34 00048E94 90 03 00 04 */ stw r0, 4(r3) /* 8004BF38 00048E98 90 E3 00 08 */ stw r7, 8(r3) /* 8004BF3C 00048E9C 91 23 00 0C */ stw r9, 0xc(r3) -/* 8004BF40 00048EA0 4E 80 00 20 */ blr +/* 8004BF40 00048EA0 4E 80 00 20 */ blr .global UpdateRoomAcoustics__13CStateManagerF7TAreaId UpdateRoomAcoustics__13CStateManagerF7TAreaId: @@ -9521,7 +9521,7 @@ lbl_8004C0B0: /* 8004C0BC 0004901C 80 01 00 74 */ lwz r0, 0x74(r1) /* 8004C0C0 00049020 7C 08 03 A6 */ mtlr r0 /* 8004C0C4 00049024 38 21 00 70 */ addi r1, r1, 0x70 -/* 8004C0C8 00049028 4E 80 00 20 */ blr +/* 8004C0C8 00049028 4E 80 00 20 */ blr .global SetCurrentAreaId__13CStateManagerF7TAreaId SetCurrentAreaId__13CStateManagerF7TAreaId: @@ -9576,7 +9576,7 @@ lbl_8004C17C: /* 8004C184 000490E4 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8004C188 000490E8 7C 08 03 A6 */ mtlr r0 /* 8004C18C 000490EC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8004C190 000490F0 4E 80 00 20 */ blr +/* 8004C190 000490F0 4E 80 00 20 */ blr .global BringOutYourDead__13CStateManagerFv BringOutYourDead__13CStateManagerFv: @@ -9612,7 +9612,7 @@ lbl_8004C1BC: /* 8004C200 00049160 81 9C 00 00 */ lwz r12, 0(r28) /* 8004C204 00049164 81 8C 00 08 */ lwz r12, 8(r12) /* 8004C208 00049168 7D 89 03 A6 */ mtctr r12 -/* 8004C20C 0004916C 4E 80 04 21 */ bctrl +/* 8004C20C 0004916C 4E 80 04 21 */ bctrl lbl_8004C210: /* 8004C210 00049170 3B BD 00 02 */ addi r29, r29, 2 lbl_8004C214: @@ -9640,7 +9640,7 @@ lbl_8004C250: /* 8004C25C 000491BC 80 01 00 34 */ lwz r0, 0x34(r1) /* 8004C260 000491C0 7C 08 03 A6 */ mtlr r0 /* 8004C264 000491C4 38 21 00 30 */ addi r1, r1, 0x30 -/* 8004C268 000491C8 4E 80 00 20 */ blr +/* 8004C268 000491C8 4E 80 00 20 */ blr .global FreeScriptObject__13CStateManagerF9TUniqueId FreeScriptObject__13CStateManagerF9TUniqueId: @@ -9759,7 +9759,7 @@ lbl_8004C3DC: /* 8004C400 00049360 81 9F 00 00 */ lwz r12, 0(r31) /* 8004C404 00049364 81 8C 00 18 */ lwz r12, 0x18(r12) /* 8004C408 00049368 7D 89 03 A6 */ mtctr r12 -/* 8004C40C 0004936C 4E 80 04 21 */ bctrl +/* 8004C40C 0004936C 4E 80 04 21 */ bctrl /* 8004C410 00049370 88 1F 00 30 */ lbz r0, 0x30(r31) /* 8004C414 00049374 38 60 00 01 */ li r3, 1 /* 8004C418 00049378 50 60 2E B4 */ rlwimi r0, r3, 5, 0x1a, 0x1a @@ -9783,7 +9783,7 @@ lbl_8004C450: /* 8004C45C 000493BC 83 A1 00 A4 */ lwz r29, 0xa4(r1) /* 8004C460 000493C0 7C 08 03 A6 */ mtlr r0 /* 8004C464 000493C4 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 8004C468 000493C8 4E 80 00 20 */ blr +/* 8004C468 000493C8 4E 80 00 20 */ blr .global sub_8004c46c sub_8004c46c: @@ -9796,7 +9796,7 @@ sub_8004c46c: /* 8004C484 000493E4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8004C488 000493E8 7C 08 03 A6 */ mtlr r0 /* 8004C48C 000493EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8004C490 000493F0 4E 80 00 20 */ blr +/* 8004C490 000493F0 4E 80 00 20 */ blr .global sub_8004c494 sub_8004c494: @@ -9860,7 +9860,7 @@ lbl_8004C538: /* 8004C564 000494C4 83 81 00 10 */ lwz r28, 0x10(r1) /* 8004C568 000494C8 7C 08 03 A6 */ mtlr r0 /* 8004C56C 000494CC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8004C570 000494D0 4E 80 00 20 */ blr +/* 8004C570 000494D0 4E 80 00 20 */ blr .global ObjectById__13CStateManagerF9TUniqueId ObjectById__13CStateManagerF9TUniqueId: @@ -9875,7 +9875,7 @@ ObjectById__13CStateManagerF9TUniqueId: /* 8004C594 000494F4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8004C598 000494F8 7C 08 03 A6 */ mtlr r0 /* 8004C59C 000494FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8004C5A0 00049500 4E 80 00 20 */ blr +/* 8004C5A0 00049500 4E 80 00 20 */ blr .global GetObjectById__13CStateManagerCF9TUniqueId GetObjectById__13CStateManagerCF9TUniqueId: @@ -9890,11 +9890,11 @@ GetObjectById__13CStateManagerCF9TUniqueId: /* 8004C5C4 00049524 80 01 00 14 */ lwz r0, 0x14(r1) /* 8004C5C8 00049528 7C 08 03 A6 */ mtlr r0 /* 8004C5CC 0004952C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8004C5D0 00049530 4E 80 00 20 */ blr +/* 8004C5D0 00049530 4E 80 00 20 */ blr .global AreaUnloaded__13CStateManagerF7TAreaId AreaUnloaded__13CStateManagerF7TAreaId: -/* 8004C5D4 00049534 4E 80 00 20 */ blr +/* 8004C5D4 00049534 4E 80 00 20 */ blr .global PrepareAreaUnload__13CStateManagerF7TAreaId PrepareAreaUnload__13CStateManagerF7TAreaId: @@ -9949,7 +9949,7 @@ lbl_8004C668: /* 8004C688 000495E8 80 01 00 34 */ lwz r0, 0x34(r1) /* 8004C68C 000495EC 7C 08 03 A6 */ mtlr r0 /* 8004C690 000495F0 38 21 00 30 */ addi r1, r1, 0x30 -/* 8004C694 000495F4 4E 80 00 20 */ blr +/* 8004C694 000495F4 4E 80 00 20 */ blr .global AreaLoaded__13CStateManagerF7TAreaId AreaLoaded__13CStateManagerF7TAreaId: @@ -9968,7 +9968,7 @@ AreaLoaded__13CStateManagerF7TAreaId: /* 8004C6C8 00049628 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8004C6CC 0004962C 7C 08 03 A6 */ mtlr r0 /* 8004C6D0 00049630 38 21 00 10 */ addi r1, r1, 0x10 -/* 8004C6D4 00049634 4E 80 00 20 */ blr +/* 8004C6D4 00049634 4E 80 00 20 */ blr .global "BuildNearList__13CStateManagerCFRQ24rstl32reserved_vector<9TUniqueId,1024>RC9CVector3fRC9CVector3ffRC15CMaterialFilterPC6CActor" "BuildNearList__13CStateManagerCFRQ24rstl32reserved_vector<9TUniqueId,1024>RC9CVector3fRC9CVector3ffRC15CMaterialFilterPC6CActor": @@ -9980,7 +9980,7 @@ AreaLoaded__13CStateManagerF7TAreaId: /* 8004C6EC 0004964C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8004C6F0 00049650 7C 08 03 A6 */ mtlr r0 /* 8004C6F4 00049654 38 21 00 10 */ addi r1, r1, 0x10 -/* 8004C6F8 00049658 4E 80 00 20 */ blr +/* 8004C6F8 00049658 4E 80 00 20 */ blr .global "BuildColliderList__13CStateManagerCFRQ24rstl32reserved_vector<9TUniqueId,1024>RC6CActorRC6CAABox" "BuildColliderList__13CStateManagerCFRQ24rstl32reserved_vector<9TUniqueId,1024>RC6CActorRC6CAABox": @@ -9992,7 +9992,7 @@ AreaLoaded__13CStateManagerF7TAreaId: /* 8004C710 00049670 80 01 00 14 */ lwz r0, 0x14(r1) /* 8004C714 00049674 7C 08 03 A6 */ mtlr r0 /* 8004C718 00049678 38 21 00 10 */ addi r1, r1, 0x10 -/* 8004C71C 0004967C 4E 80 00 20 */ blr +/* 8004C71C 0004967C 4E 80 00 20 */ blr .global "BuildNearList__13CStateManagerCFRQ24rstl32reserved_vector<9TUniqueId,1024>RC6CAABoxRC15CMaterialFilterPC6CActor" "BuildNearList__13CStateManagerCFRQ24rstl32reserved_vector<9TUniqueId,1024>RC6CAABoxRC15CMaterialFilterPC6CActor": @@ -10004,7 +10004,7 @@ AreaLoaded__13CStateManagerF7TAreaId: /* 8004C734 00049694 80 01 00 14 */ lwz r0, 0x14(r1) /* 8004C738 00049698 7C 08 03 A6 */ mtlr r0 /* 8004C73C 0004969C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8004C740 000496A0 4E 80 00 20 */ blr +/* 8004C740 000496A0 4E 80 00 20 */ blr .global UpdateActorInSortedLists__13CStateManagerFR6CActor UpdateActorInSortedLists__13CStateManagerFR6CActor: @@ -10097,7 +10097,7 @@ lbl_8004C878: /* 8004C880 000497E0 83 C1 00 48 */ lwz r30, 0x48(r1) /* 8004C884 000497E4 7C 08 03 A6 */ mtlr r0 /* 8004C888 000497E8 38 21 00 50 */ addi r1, r1, 0x50 -/* 8004C88C 000497EC 4E 80 00 20 */ blr +/* 8004C88C 000497EC 4E 80 00 20 */ blr .global UpdateSortedLists__13CStateManagerFv UpdateSortedLists__13CStateManagerFv: @@ -10141,7 +10141,7 @@ lbl_8004C904: /* 8004C910 00049870 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8004C914 00049874 7C 08 03 A6 */ mtlr r0 /* 8004C918 00049878 38 21 00 20 */ addi r1, r1, 0x20 -/* 8004C91C 0004987C 4E 80 00 20 */ blr +/* 8004C91C 0004987C 4E 80 00 20 */ blr .global CalculateObjectBounds__13CStateManagerFRC6CActor CalculateObjectBounds__13CStateManagerFRC6CActor: @@ -10162,7 +10162,7 @@ CalculateObjectBounds__13CStateManagerFRC6CActor: /* 8004C958 000498B8 38 61 00 40 */ addi r3, r1, 0x40 /* 8004C95C 000498BC 81 8C 00 40 */ lwz r12, 0x40(r12) /* 8004C960 000498C0 7D 89 03 A6 */ mtctr r12 -/* 8004C964 000498C4 4E 80 04 21 */ bctrl +/* 8004C964 000498C4 4E 80 04 21 */ bctrl /* 8004C968 000498C8 88 01 00 58 */ lbz r0, 0x58(r1) /* 8004C96C 000498CC 28 00 00 00 */ cmplwi r0, 0 /* 8004C970 000498D0 98 01 00 8C */ stb r0, 0x8c(r1) @@ -10276,7 +10276,7 @@ lbl_8004CAF8: /* 8004CB04 00049A64 83 A1 00 94 */ lwz r29, 0x94(r1) /* 8004CB08 00049A68 7C 08 03 A6 */ mtlr r0 /* 8004CB0C 00049A6C 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8004CB10 00049A70 4E 80 00 20 */ blr +/* 8004CB10 00049A70 4E 80 00 20 */ blr .global AddObject__13CStateManagerFR7CEntity AddObject__13CStateManagerFR7CEntity: @@ -10371,7 +10371,7 @@ lbl_8004CC44: /* 8004CC5C 00049BBC 81 9F 00 00 */ lwz r12, 0(r31) /* 8004CC60 00049BC0 81 8C 00 18 */ lwz r12, 0x18(r12) /* 8004CC64 00049BC4 7D 89 03 A6 */ mtctr r12 -/* 8004CC68 00049BC8 4E 80 04 21 */ bctrl +/* 8004CC68 00049BC8 4E 80 04 21 */ bctrl /* 8004CC6C 00049BCC 80 7F 00 04 */ lwz r3, 4(r31) /* 8004CC70 00049BD0 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 8004CC74 00049BD4 7C 03 00 00 */ cmpw r3, r0 @@ -10406,7 +10406,7 @@ lbl_8004CCD4: /* 8004CCE4 00049C44 83 81 00 50 */ lwz r28, 0x50(r1) /* 8004CCE8 00049C48 7C 08 03 A6 */ mtlr r0 /* 8004CCEC 00049C4C 38 21 00 60 */ addi r1, r1, 0x60 -/* 8004CCF0 00049C50 4E 80 00 20 */ blr +/* 8004CCF0 00049C50 4E 80 00 20 */ blr .global AddObject__13CStateManagerFP7CEntityQ213CStateManager18EScriptPersistence AddObject__13CStateManagerFP7CEntityQ213CStateManager18EScriptPersistence: @@ -10420,7 +10420,7 @@ lbl_8004CD0C: /* 8004CD0C 00049C6C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8004CD10 00049C70 7C 08 03 A6 */ mtlr r0 /* 8004CD14 00049C74 38 21 00 10 */ addi r1, r1, 0x10 -/* 8004CD18 00049C78 4E 80 00 20 */ blr +/* 8004CD18 00049C78 4E 80 00 20 */ blr .global sub_8004cd1c sub_8004cd1c: @@ -10428,7 +10428,7 @@ sub_8004cd1c: /* 8004CD20 00049C80 7C 03 00 D0 */ neg r0, r3 /* 8004CD24 00049C84 7C 00 1B 78 */ or r0, r0, r3 /* 8004CD28 00049C88 54 03 0F FE */ srwi r3, r0, 0x1f -/* 8004CD2C 00049C8C 4E 80 00 20 */ blr +/* 8004CD2C 00049C8C 4E 80 00 20 */ blr .global "RayCollideWorldInternal__13CStateManagerRC9CVector3fRC9CVector3fRC15CMaterialFilterRCQ24rstl49reserved_vector<9TUniqueId,1024>RC6CActor" "RayCollideWorldInternal__13CStateManagerRC9CVector3fRC9CVector3fRC15CMaterialFilterRCQ24rstl49reserved_vector<9TUniqueId,1024>RC6CActor": @@ -10499,7 +10499,7 @@ lbl_8004CE1C: /* 8004CE2C 00049D8C 80 01 00 44 */ lwz r0, 0x44(r1) /* 8004CE30 00049D90 7C 08 03 A6 */ mtlr r0 /* 8004CE34 00049D94 38 21 00 40 */ addi r1, r1, 0x40 -/* 8004CE38 00049D98 4E 80 00 20 */ blr +/* 8004CE38 00049D98 4E 80 00 20 */ blr .global RayCollideWorld__13CStateManagerFRC9CVector3fRC9CVector3fRC15CMaterialFilterPC6CActor RayCollideWorld__13CStateManagerFRC9CVector3fRC9CVector3fRC15CMaterialFilterPC6CActor: @@ -10582,7 +10582,7 @@ lbl_8004CF50: /* 8004CF5C 00049EBC 80 01 08 34 */ lwz r0, 0x834(r1) /* 8004CF60 00049EC0 7C 08 03 A6 */ mtlr r0 /* 8004CF64 00049EC4 38 21 08 30 */ addi r1, r1, 0x830 -/* 8004CF68 00049EC8 4E 80 00 20 */ blr +/* 8004CF68 00049EC8 4E 80 00 20 */ blr .global "RayCollideWorld__13CStateManagerRC9CVector3fRC9CVector3fRCQ24rstl49reserved_vector<9TUniqueId,1024>RC15CMaterialFilterPC6CActor" "RayCollideWorld__13CStateManagerRC9CVector3fRC9CVector3fRCQ24rstl49reserved_vector<9TUniqueId,1024>RC15CMaterialFilterPC6CActor": @@ -10596,7 +10596,7 @@ lbl_8004CF50: /* 8004CF88 00049EE8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8004CF8C 00049EEC 7C 08 03 A6 */ mtlr r0 /* 8004CF90 00049EF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8004CF94 00049EF4 4E 80 00 20 */ blr +/* 8004CF94 00049EF4 4E 80 00 20 */ blr .global RayStaticIntersection__13CStateManagerCFRC9CVector3fRC9CVector3ffRC15CMaterialFilter RayStaticIntersection__13CStateManagerCFRC9CVector3fRC9CVector3ffRC15CMaterialFilter: @@ -10610,7 +10610,7 @@ RayStaticIntersection__13CStateManagerCFRC9CVector3fRC9CVector3ffRC15CMaterialFi /* 8004CFB4 00049F14 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8004CFB8 00049F18 7C 08 03 A6 */ mtlr r0 /* 8004CFBC 00049F1C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8004CFC0 00049F20 4E 80 00 20 */ blr +/* 8004CFC0 00049F20 4E 80 00 20 */ blr .global "RayWorldIntersection__13CStateManagerCFR9TUniqueIdRC9CVector3fRC9CVector3ffRC15CMaterialFilterRCQ24rstl32reserved_vector<9TUniqueId,1024>" "RayWorldIntersection__13CStateManagerCFR9TUniqueIdRC9CVector3fRC9CVector3ffRC15CMaterialFilterRCQ24rstl32reserved_vector<9TUniqueId,1024>": @@ -10624,7 +10624,7 @@ RayStaticIntersection__13CStateManagerCFRC9CVector3fRC9CVector3ffRC15CMaterialFi /* 8004CFE0 00049F40 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8004CFE4 00049F44 7C 08 03 A6 */ mtlr r0 /* 8004CFE8 00049F48 38 21 00 10 */ addi r1, r1, 0x10 -/* 8004CFEC 00049F4C 4E 80 00 20 */ blr +/* 8004CFEC 00049F4C 4E 80 00 20 */ blr .global UpdateObjectInLists__13CStateManagerFR7CEntity UpdateObjectInLists__13CStateManagerFR7CEntity: @@ -10654,7 +10654,7 @@ lbl_8004D020: /* 8004D048 00049FA8 81 83 00 00 */ lwz r12, 0(r3) /* 8004D04C 00049FAC 81 8C 00 08 */ lwz r12, 8(r12) /* 8004D050 00049FB0 7D 89 03 A6 */ mtctr r12 -/* 8004D054 00049FB4 4E 80 04 21 */ bctrl +/* 8004D054 00049FB4 4E 80 04 21 */ bctrl /* 8004D058 00049FB8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8004D05C 00049FBC 40 82 00 1C */ bne lbl_8004D078 /* 8004D060 00049FC0 A0 1D 00 08 */ lhz r0, 8(r29) @@ -10690,7 +10690,7 @@ lbl_8004D0A8: /* 8004D0CC 0004A02C 83 81 00 20 */ lwz r28, 0x20(r1) /* 8004D0D0 0004A030 7C 08 03 A6 */ mtlr r0 /* 8004D0D4 0004A034 38 21 00 30 */ addi r1, r1, 0x30 -/* 8004D0D8 0004A038 4E 80 00 20 */ blr +/* 8004D0D8 0004A038 4E 80 00 20 */ blr .global AllocateUniqueId__13CStateManagerFv AllocateUniqueId__13CStateManagerFv: @@ -10748,7 +10748,7 @@ lbl_8004D188: /* 8004D19C 0004A0FC 80 01 00 24 */ lwz r0, 0x24(r1) /* 8004D1A0 0004A100 7C 08 03 A6 */ mtlr r0 /* 8004D1A4 0004A104 38 21 00 20 */ addi r1, r1, 0x20 -/* 8004D1A8 0004A108 4E 80 00 20 */ blr +/* 8004D1A8 0004A108 4E 80 00 20 */ blr .global __dt__13CStateManagerFv __dt__13CStateManagerFv: @@ -10794,7 +10794,7 @@ lbl_8004D208: /* 8004D244 0004A1A4 81 83 00 00 */ lwz r12, 0(r3) /* 8004D248 0004A1A8 81 8C 00 18 */ lwz r12, 0x18(r12) /* 8004D24C 0004A1AC 7D 89 03 A6 */ mtctr r12 -/* 8004D250 0004A1B0 4E 80 04 21 */ bctrl +/* 8004D250 0004A1B0 4E 80 04 21 */ bctrl /* 8004D254 0004A1B4 A0 1C 00 08 */ lhz r0, 8(r28) /* 8004D258 0004A1B8 7F A3 EB 78 */ mr r3, r29 /* 8004D25C 0004A1BC 38 81 00 18 */ addi r4, r1, 0x18 @@ -10808,7 +10808,7 @@ lbl_8004D208: /* 8004D27C 0004A1DC 81 9C 00 00 */ lwz r12, 0(r28) /* 8004D280 0004A1E0 81 8C 00 08 */ lwz r12, 8(r12) /* 8004D284 0004A1E4 7D 89 03 A6 */ mtctr r12 -/* 8004D288 0004A1E8 4E 80 04 21 */ bctrl +/* 8004D288 0004A1E8 4E 80 04 21 */ bctrl lbl_8004D28C: /* 8004D28C 0004A1EC 3B 5A 00 01 */ addi r26, r26, 1 /* 8004D290 0004A1F0 2C 1A 04 00 */ cmpwi r26, 0x400 @@ -10824,7 +10824,7 @@ lbl_8004D28C: /* 8004D2B8 0004A218 81 83 00 00 */ lwz r12, 0(r3) /* 8004D2BC 0004A21C 81 8C 00 18 */ lwz r12, 0x18(r12) /* 8004D2C0 0004A220 7D 89 03 A6 */ mtctr r12 -/* 8004D2C4 0004A224 4E 80 04 21 */ bctrl +/* 8004D2C4 0004A224 4E 80 04 21 */ bctrl /* 8004D2C8 0004A228 80 BD 08 4C */ lwz r5, 0x84c(r29) /* 8004D2CC 0004A22C 7F A3 EB 78 */ mr r3, r29 /* 8004D2D0 0004A230 38 81 00 0C */ addi r4, r1, 0xc @@ -10839,7 +10839,7 @@ lbl_8004D28C: /* 8004D2F4 0004A254 38 80 00 01 */ li r4, 1 /* 8004D2F8 0004A258 81 8C 00 08 */ lwz r12, 8(r12) /* 8004D2FC 0004A25C 7D 89 03 A6 */ mtctr r12 -/* 8004D300 0004A260 4E 80 04 21 */ bctrl +/* 8004D300 0004A260 4E 80 04 21 */ bctrl lbl_8004D304: /* 8004D304 0004A264 38 00 00 00 */ li r0, 0 /* 8004D308 0004A268 90 1D 08 4C */ stw r0, 0x84c(r29) @@ -11049,7 +11049,7 @@ lbl_8004D5A0: /* 8004D5D0 0004A530 38 80 00 01 */ li r4, 1 /* 8004D5D4 0004A534 81 8C 00 08 */ lwz r12, 8(r12) /* 8004D5D8 0004A538 7D 89 03 A6 */ mtctr r12 -/* 8004D5DC 0004A53C 4E 80 04 21 */ bctrl +/* 8004D5DC 0004A53C 4E 80 04 21 */ bctrl lbl_8004D5E0: /* 8004D5E0 0004A540 34 1D 08 08 */ addic. r0, r29, 0x808 /* 8004D5E4 0004A544 41 82 00 44 */ beq lbl_8004D628 @@ -11111,7 +11111,7 @@ lbl_8004D694: /* 8004D69C 0004A5FC 80 01 00 54 */ lwz r0, 0x54(r1) /* 8004D6A0 0004A600 7C 08 03 A6 */ mtlr r0 /* 8004D6A4 0004A604 38 21 00 50 */ addi r1, r1, 0x50 -/* 8004D6A8 0004A608 4E 80 00 20 */ blr +/* 8004D6A8 0004A608 4E 80 00 20 */ blr .global sub_8004d6ac sub_8004d6ac: @@ -11137,7 +11137,7 @@ lbl_8004D6E8: /* 8004D6F4 0004A654 83 C1 00 08 */ lwz r30, 8(r1) /* 8004D6F8 0004A658 7C 08 03 A6 */ mtlr r0 /* 8004D6FC 0004A65C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8004D700 0004A660 4E 80 00 20 */ blr +/* 8004D700 0004A660 4E 80 00 20 */ blr .global __dt__22CStateManagerContainerFv __dt__22CStateManagerContainerFv: @@ -11289,7 +11289,7 @@ lbl_8004D8F4: /* 8004D900 0004A860 83 C1 00 08 */ lwz r30, 8(r1) /* 8004D904 0004A864 7C 08 03 A6 */ mtlr r0 /* 8004D908 0004A868 38 21 00 10 */ addi r1, r1, 0x10 -/* 8004D90C 0004A86C 4E 80 00 20 */ blr +/* 8004D90C 0004A86C 4E 80 00 20 */ blr .global __dt__14CCameraManagerFv __dt__14CCameraManagerFv: @@ -11420,7 +11420,7 @@ lbl_8004DAA8: /* 8004DAB4 0004AA14 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8004DAB8 0004AA18 7C 08 03 A6 */ mtlr r0 /* 8004DABC 0004AA1C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8004DAC0 0004AA20 4E 80 00 20 */ blr +/* 8004DAC0 0004AA20 4E 80 00 20 */ blr .global __dt__18CFluidPlaneManagerFv __dt__18CFluidPlaneManagerFv: @@ -11494,7 +11494,7 @@ lbl_8004DBA0: /* 8004DBAC 0004AB0C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8004DBB0 0004AB10 7C 08 03 A6 */ mtlr r0 /* 8004DBB4 0004AB14 38 21 00 20 */ addi r1, r1, 0x20 -/* 8004DBB8 0004AB18 4E 80 00 20 */ blr +/* 8004DBB8 0004AB18 4E 80 00 20 */ blr .global __dt__13CEnvFxManagerFv __dt__13CEnvFxManagerFv: @@ -11608,7 +11608,7 @@ lbl_8004DD24: /* 8004DD30 0004AC90 83 C1 00 08 */ lwz r30, 8(r1) /* 8004DD34 0004AC94 7C 08 03 A6 */ mtlr r0 /* 8004DD38 0004AC98 38 21 00 10 */ addi r1, r1, 0x10 -/* 8004DD3C 0004AC9C 4E 80 00 20 */ blr +/* 8004DD3C 0004AC9C 4E 80 00 20 */ blr .global sub_8004dd40 sub_8004dd40: @@ -11632,7 +11632,7 @@ lbl_8004DD74: /* 8004DD80 0004ACE0 83 C1 00 08 */ lwz r30, 8(r1) /* 8004DD84 0004ACE4 7C 08 03 A6 */ mtlr r0 /* 8004DD88 0004ACE8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8004DD8C 0004ACEC 4E 80 00 20 */ blr +/* 8004DD8C 0004ACEC 4E 80 00 20 */ blr .global sub_8004dd90 sub_8004dd90: @@ -11663,7 +11663,7 @@ lbl_8004DDC8: /* 8004DDE8 0004AD48 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8004DDEC 0004AD4C 7C 08 03 A6 */ mtlr r0 /* 8004DDF0 0004AD50 38 21 00 20 */ addi r1, r1, 0x20 -/* 8004DDF4 0004AD54 4E 80 00 20 */ blr +/* 8004DDF4 0004AD54 4E 80 00 20 */ blr .global sub_8004ddf8 sub_8004ddf8: @@ -11696,7 +11696,7 @@ lbl_8004DE54: /* 8004DE54 0004ADB4 80 01 00 24 */ lwz r0, 0x24(r1) /* 8004DE58 0004ADB8 7C 08 03 A6 */ mtlr r0 /* 8004DE5C 0004ADBC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8004DE60 0004ADC0 4E 80 00 20 */ blr +/* 8004DE60 0004ADC0 4E 80 00 20 */ blr .global __dt__20CActorModelParticlesFv __dt__20CActorModelParticlesFv: @@ -11764,7 +11764,7 @@ lbl_8004DF30: /* 8004DF3C 0004AE9C 83 C1 00 08 */ lwz r30, 8(r1) /* 8004DF40 0004AEA0 7C 08 03 A6 */ mtlr r0 /* 8004DF44 0004AEA4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8004DF48 0004AEA8 4E 80 00 20 */ blr +/* 8004DF48 0004AEA8 4E 80 00 20 */ blr .global sub_8004df4c sub_8004df4c: @@ -11788,7 +11788,7 @@ lbl_8004DF80: /* 8004DF8C 0004AEEC 83 C1 00 08 */ lwz r30, 8(r1) /* 8004DF90 0004AEF0 7C 08 03 A6 */ mtlr r0 /* 8004DF94 0004AEF4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8004DF98 0004AEF8 4E 80 00 20 */ blr +/* 8004DF98 0004AEF8 4E 80 00 20 */ blr .global sub_8004df9c sub_8004df9c: @@ -11838,7 +11838,7 @@ lbl_8004E01C: /* 8004E034 0004AF94 80 01 00 34 */ lwz r0, 0x34(r1) /* 8004E038 0004AF98 7C 08 03 A6 */ mtlr r0 /* 8004E03C 0004AF9C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8004E040 0004AFA0 4E 80 00 20 */ blr +/* 8004E040 0004AFA0 4E 80 00 20 */ blr .global "__dt__Q24rstl36reserved_vector<15CCameraBlurPass,9>Fv" "__dt__Q24rstl36reserved_vector<15CCameraBlurPass,9>Fv": @@ -11862,7 +11862,7 @@ lbl_8004E078: /* 8004E084 0004AFE4 83 C1 00 08 */ lwz r30, 8(r1) /* 8004E088 0004AFE8 7C 08 03 A6 */ mtlr r0 /* 8004E08C 0004AFEC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8004E090 0004AFF0 4E 80 00 20 */ blr +/* 8004E090 0004AFF0 4E 80 00 20 */ blr .global "clear__Q24rstl36reserved_vector<15CCameraBlurPass,9>Fv" "clear__Q24rstl36reserved_vector<15CCameraBlurPass,9>Fv": @@ -11909,7 +11909,7 @@ lbl_8004E100: /* 8004E124 0004B084 83 81 00 10 */ lwz r28, 0x10(r1) /* 8004E128 0004B088 7C 08 03 A6 */ mtlr r0 /* 8004E12C 0004B08C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8004E130 0004B090 4E 80 00 20 */ blr +/* 8004E130 0004B090 4E 80 00 20 */ blr .global "__ct__13CStateManagerFRCQ24rstl26ncrc_ptr<14CScriptMailbox>RCQ24rstl25ncrc_ptr<13CMapWorldInfo>RCQ24rstl24ncrc_ptr<12CPlayerState>RCQ24rstl30ncrc_ptr<18CWorldTransManager>" "__ct__13CStateManagerFRCQ24rstl26ncrc_ptr<14CScriptMailbox>RCQ24rstl25ncrc_ptr<13CMapWorldInfo>RCQ24rstl24ncrc_ptr<12CPlayerState>RCQ24rstl30ncrc_ptr<18CWorldTransManager>": @@ -12174,7 +12174,7 @@ lbl_8004E394: /* 8004E4F0 0004B450 81 84 00 00 */ lwz r12, 0(r4) /* 8004E4F4 0004B454 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8004E4F8 0004B458 7D 89 03 A6 */ mtctr r12 -/* 8004E4FC 0004B45C 4E 80 04 21 */ bctrl +/* 8004E4FC 0004B45C 4E 80 04 21 */ bctrl /* 8004E500 0004B460 3B 3F 08 F0 */ addi r25, r31, 0x8f0 /* 8004E504 0004B464 38 81 00 64 */ addi r4, r1, 0x64 /* 8004E508 0004B468 7F 23 CB 78 */ mr r3, r25 @@ -12665,7 +12665,7 @@ lbl_8004EBF8: /* 8004EC08 0004BB68 81 83 00 00 */ lwz r12, 0(r3) /* 8004EC0C 0004BB6C 81 8C 00 44 */ lwz r12, 0x44(r12) /* 8004EC10 0004BB70 7D 89 03 A6 */ mtctr r12 -/* 8004EC14 0004BB74 4E 80 04 21 */ bctrl +/* 8004EC14 0004BB74 4E 80 04 21 */ bctrl /* 8004EC18 0004BB78 3C 60 80 05 */ lis r3, MemoryAllocatorAllocationFailedCallback__13CStateManagerFPCvUi@ha /* 8004EC1C 0004BB7C 7F E4 FB 78 */ mr r4, r31 /* 8004EC20 0004BB80 38 63 B5 38 */ addi r3, r3, MemoryAllocatorAllocationFailedCallback__13CStateManagerFPCvUi@l @@ -13103,7 +13103,7 @@ lbl_8004EC74: /* 8004F2D0 0004C230 80 01 01 04 */ lwz r0, 0x104(r1) /* 8004F2D4 0004C234 7C 08 03 A6 */ mtlr r0 /* 8004F2D8 0004C238 38 21 01 00 */ addi r1, r1, 0x100 -/* 8004F2DC 0004C23C 4E 80 00 20 */ blr +/* 8004F2DC 0004C23C 4E 80 00 20 */ blr .global sub_8004f2e0 sub_8004f2e0: @@ -13120,7 +13120,7 @@ sub_8004f2e0: /* 8004F308 0004C268 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8004F30C 0004C26C 7C 08 03 A6 */ mtlr r0 /* 8004F310 0004C270 38 21 00 10 */ addi r1, r1, 0x10 -/* 8004F314 0004C274 4E 80 00 20 */ blr +/* 8004F314 0004C274 4E 80 00 20 */ blr .global sub_8004f318 sub_8004f318: @@ -13185,7 +13185,7 @@ lbl_8004F3D8: /* 8004F3F0 0004C350 83 81 00 10 */ lwz r28, 0x10(r1) /* 8004F3F4 0004C354 7C 08 03 A6 */ mtlr r0 /* 8004F3F8 0004C358 38 21 00 20 */ addi r1, r1, 0x20 -/* 8004F3FC 0004C35C 4E 80 00 20 */ blr +/* 8004F3FC 0004C35C 4E 80 00 20 */ blr .global "__cl__Q227@unnamed@CStateManager_cpp@11area_sorterCFPC9CGameAreaPC9CGameArea" "__cl__Q227@unnamed@CStateManager_cpp@11area_sorterCFPC9CGameAreaPC9CGameArea": @@ -13251,7 +13251,7 @@ lbl_8004F4CC: /* 8004F4DC 0004C43C 83 C1 00 28 */ lwz r30, 0x28(r1) /* 8004F4E0 0004C440 7C 08 03 A6 */ mtlr r0 /* 8004F4E4 0004C444 38 21 00 40 */ addi r1, r1, 0x40 -/* 8004F4E8 0004C448 4E 80 00 20 */ blr +/* 8004F4E8 0004C448 4E 80 00 20 */ blr .global sub_8004f4ec sub_8004f4ec: @@ -13283,7 +13283,7 @@ lbl_8004F53C: /* 8004F544 0004C4A4 83 C1 00 08 */ lwz r30, 8(r1) /* 8004F548 0004C4A8 7C 08 03 A6 */ mtlr r0 /* 8004F54C 0004C4AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8004F550 0004C4B0 4E 80 00 20 */ blr +/* 8004F550 0004C4B0 4E 80 00 20 */ blr .global sub_8004f554 sub_8004f554: @@ -13315,7 +13315,7 @@ lbl_8004F5A4: /* 8004F5AC 0004C50C 83 C1 00 08 */ lwz r30, 8(r1) /* 8004F5B0 0004C510 7C 08 03 A6 */ mtlr r0 /* 8004F5B4 0004C514 38 21 00 10 */ addi r1, r1, 0x10 -/* 8004F5B8 0004C518 4E 80 00 20 */ blr +/* 8004F5B8 0004C518 4E 80 00 20 */ blr .global sub_8004f5bc sub_8004f5bc: @@ -13354,7 +13354,7 @@ lbl_8004F624: /* 8004F62C 0004C58C 83 C1 00 08 */ lwz r30, 8(r1) /* 8004F630 0004C590 7C 08 03 A6 */ mtlr r0 /* 8004F634 0004C594 38 21 00 10 */ addi r1, r1, 0x10 -/* 8004F638 0004C598 4E 80 00 20 */ blr +/* 8004F638 0004C598 4E 80 00 20 */ blr .global "__nw__36TOneStatic<22CStateManagerContainer>FUlPCcPCc" "__nw__36TOneStatic<22CStateManagerContainer>FUlPCcPCc": @@ -13369,7 +13369,7 @@ lbl_8004F624: /* 8004F65C 0004C5BC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8004F660 0004C5C0 7C 08 03 A6 */ mtlr r0 /* 8004F664 0004C5C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8004F668 0004C5C8 4E 80 00 20 */ blr +/* 8004F668 0004C5C8 4E 80 00 20 */ blr .global "__dl__36TOneStatic<22CStateManagerContainer>FPv" "__dl__36TOneStatic<22CStateManagerContainer>FPv": @@ -13383,13 +13383,13 @@ lbl_8004F624: /* 8004F688 0004C5E8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8004F68C 0004C5EC 7C 08 03 A6 */ mtlr r0 /* 8004F690 0004C5F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8004F694 0004C5F4 4E 80 00 20 */ blr +/* 8004F694 0004C5F4 4E 80 00 20 */ blr .global "GetAllocSpace__36TOneStatic<22CStateManagerContainer>Fv" "GetAllocSpace__36TOneStatic<22CStateManagerContainer>Fv": /* 8004F698 0004C5F8 3C 60 80 46 */ lis r3, lbl_8045C5B4@ha /* 8004F69C 0004C5FC 38 63 C5 B4 */ addi r3, r3, lbl_8045C5B4@l -/* 8004F6A0 0004C600 4E 80 00 20 */ blr +/* 8004F6A0 0004C600 4E 80 00 20 */ blr .global "ReferenceCount__36TOneStatic<22CStateManagerContainer>Fv" "ReferenceCount__36TOneStatic<22CStateManagerContainer>Fv": @@ -13402,7 +13402,7 @@ lbl_8004F624: /* 8004F6BC 0004C61C 98 0D A2 14 */ stb r0, lbl_805A8DD4@sda21(r13) lbl_8004F6C0: /* 8004F6C0 0004C620 38 6D A2 10 */ addi r3, r13, lbl_805A8DD0@sda21 -/* 8004F6C4 0004C624 4E 80 00 20 */ blr +/* 8004F6C4 0004C624 4E 80 00 20 */ blr .global "__dl__27TOneStatic<13CStateManager>FPv" "__dl__27TOneStatic<13CStateManager>FPv": @@ -13416,7 +13416,7 @@ lbl_8004F6C0: /* 8004F6E4 0004C644 80 01 00 14 */ lwz r0, 0x14(r1) /* 8004F6E8 0004C648 7C 08 03 A6 */ mtlr r0 /* 8004F6EC 0004C64C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8004F6F0 0004C650 4E 80 00 20 */ blr +/* 8004F6F0 0004C650 4E 80 00 20 */ blr .global "__nw__20TOneStatic<7CPlayer>FUlPCcPCc" "__nw__20TOneStatic<7CPlayer>FUlPCcPCc": @@ -13431,22 +13431,22 @@ lbl_8004F6C0: /* 8004F714 0004C674 80 01 00 14 */ lwz r0, 0x14(r1) /* 8004F718 0004C678 7C 08 03 A6 */ mtlr r0 /* 8004F71C 0004C67C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8004F720 0004C680 4E 80 00 20 */ blr +/* 8004F720 0004C680 4E 80 00 20 */ blr .global "GetAllocSpace__20TOneStatic<7CPlayer>Fv" "GetAllocSpace__20TOneStatic<7CPlayer>Fv": /* 8004F724 0004C684 3C 60 80 47 */ lis r3, lbl_8046B97C@ha /* 8004F728 0004C688 38 63 B9 7C */ addi r3, r3, lbl_8046B97C@l -/* 8004F72C 0004C68C 4E 80 00 20 */ blr +/* 8004F72C 0004C68C 4E 80 00 20 */ blr .global "Max__5CMathFRCfRCf" "Max__5CMathFRCfRCf": /* 8004F730 0004C690 C0 23 00 00 */ lfs f1, 0(r3) /* 8004F734 0004C694 C0 04 00 00 */ lfs f0, 0(r4) /* 8004F738 0004C698 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8004F73C 0004C69C 4D 81 00 20 */ bgtlr +/* 8004F73C 0004C69C 4D 81 00 20 */ bgtlr /* 8004F740 0004C6A0 7C 83 23 78 */ mr r3, r4 -/* 8004F744 0004C6A4 4E 80 00 20 */ blr +/* 8004F744 0004C6A4 4E 80 00 20 */ blr .global "sort__4rstlFPPC9CGameAreaPPC9CGameAreaQ227@unnamed@CStateManager_cpp@11area_sorter" "sort__4rstlFPPC9CGameAreaPPC9CGameAreaQ227@unnamed@CStateManager_cpp@11area_sorter": @@ -13556,7 +13556,7 @@ lbl_8004F8C4: /* 8004F8C8 0004C828 80 01 00 64 */ lwz r0, 0x64(r1) /* 8004F8CC 0004C82C 7C 08 03 A6 */ mtlr r0 /* 8004F8D0 0004C830 38 21 00 60 */ addi r1, r1, 0x60 -/* 8004F8D4 0004C834 4E 80 00 20 */ blr +/* 8004F8D4 0004C834 4E 80 00 20 */ blr .global sub_8004f8d8 sub_8004f8d8: @@ -13722,7 +13722,7 @@ lbl_8004FB0C: /* 8004FB20 0004CA80 83 81 00 98 */ lwz r28, 0x98(r1) /* 8004FB24 0004CA84 7C 08 03 A6 */ mtlr r0 /* 8004FB28 0004CA88 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 8004FB2C 0004CA8C 4E 80 00 20 */ blr +/* 8004FB2C 0004CA8C 4E 80 00 20 */ blr .global sub_8004fb30 sub_8004fb30: @@ -13824,7 +13824,7 @@ sub_8004fb30: /* 8004FCAC 0004CC0C 80 01 00 64 */ lwz r0, 0x64(r1) /* 8004FCB0 0004CC10 7C 08 03 A6 */ mtlr r0 /* 8004FCB4 0004CC14 38 21 00 60 */ addi r1, r1, 0x60 -/* 8004FCB8 0004CC18 4E 80 00 20 */ blr +/* 8004FCB8 0004CC18 4E 80 00 20 */ blr .global "insert_into__Q24rstl195red_black_tree<13TGameScriptId,Q24rstl32pair<13TGameScriptId,9TUniqueId>,1,Q24rstl52select1st>,Q24rstl21less<13TGameScriptId>,Q24rstl17rmemory_allocator>FPQ34rstl195red_black_tree<13TGameScriptId,Q24rstl32pair<13TGameScriptId,9TUniqueId>,1,Q24rstl52select1st>,Q24rstl21less<13TGameScriptId>,Q24rstl17rmemory_allocator>4nodeRCQ24rstl32pair<13TGameScriptId,9TUniqueId>" "insert_into__Q24rstl195red_black_tree<13TGameScriptId,Q24rstl32pair<13TGameScriptId,9TUniqueId>,1,Q24rstl52select1st>,Q24rstl21less<13TGameScriptId>,Q24rstl17rmemory_allocator>FPQ34rstl195red_black_tree<13TGameScriptId,Q24rstl32pair<13TGameScriptId,9TUniqueId>,1,Q24rstl52select1st>,Q24rstl21less<13TGameScriptId>,Q24rstl17rmemory_allocator>4nodeRCQ24rstl32pair<13TGameScriptId,9TUniqueId>": @@ -13967,7 +13967,7 @@ lbl_8004FEB0: /* 8004FEB4 0004CE14 80 01 00 24 */ lwz r0, 0x24(r1) /* 8004FEB8 0004CE18 7C 08 03 A6 */ mtlr r0 /* 8004FEBC 0004CE1C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8004FEC0 0004CE20 4E 80 00 20 */ blr +/* 8004FEC0 0004CE20 4E 80 00 20 */ blr .global "insert_into__Q24rstl197red_black_tree<9TEditorId,Q24rstl38pair<9TEditorId,19SScriptObjectStream>,0,Q24rstl58select1st>,Q24rstl16less<9TEditorId>,Q24rstl17rmemory_allocator>FPQ34rstl197red_black_tree<9TEditorId,Q24rstl38pair<9TEditorId,19SScriptObjectStream>,0,Q24rstl58select1st>,Q24rstl16less<9TEditorId>,Q24rstl17rmemory_allocator>4nodeRCQ24rstl38pair<9TEditorId,19SScriptObjectStream>" "insert_into__Q24rstl197red_black_tree<9TEditorId,Q24rstl38pair<9TEditorId,19SScriptObjectStream>,0,Q24rstl58select1st>,Q24rstl16less<9TEditorId>,Q24rstl17rmemory_allocator>FPQ34rstl197red_black_tree<9TEditorId,Q24rstl38pair<9TEditorId,19SScriptObjectStream>,0,Q24rstl58select1st>,Q24rstl16less<9TEditorId>,Q24rstl17rmemory_allocator>4nodeRCQ24rstl38pair<9TEditorId,19SScriptObjectStream>": @@ -14136,7 +14136,7 @@ lbl_8005011C: /* 80050120 0004D080 80 01 00 24 */ lwz r0, 0x24(r1) /* 80050124 0004D084 7C 08 03 A6 */ mtlr r0 /* 80050128 0004D088 38 21 00 20 */ addi r1, r1, 0x20 -/* 8005012C 0004D08C 4E 80 00 20 */ blr +/* 8005012C 0004D08C 4E 80 00 20 */ blr .global __dt__10CWeaponMgrFv __dt__10CWeaponMgrFv: @@ -14200,7 +14200,7 @@ lbl_800501EC: /* 800501F4 0004D154 83 C1 00 08 */ lwz r30, 8(r1) /* 800501F8 0004D158 7C 08 03 A6 */ mtlr r0 /* 800501FC 0004D15C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80050200 0004D160 4E 80 00 20 */ blr +/* 80050200 0004D160 4E 80 00 20 */ blr .global sub_80050204 sub_80050204: @@ -14264,7 +14264,7 @@ lbl_800502C4: /* 800502D0 0004D230 83 A1 00 24 */ lwz r29, 0x24(r1) /* 800502D4 0004D234 7C 08 03 A6 */ mtlr r0 /* 800502D8 0004D238 38 21 00 30 */ addi r1, r1, 0x30 -/* 800502DC 0004D23C 4E 80 00 20 */ blr +/* 800502DC 0004D23C 4E 80 00 20 */ blr .global sub_800502e0 sub_800502e0: @@ -14295,7 +14295,7 @@ lbl_8005031C: /* 80050338 0004D298 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8005033C 0004D29C 7C 08 03 A6 */ mtlr r0 /* 80050340 0004D2A0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80050344 0004D2A4 4E 80 00 20 */ blr +/* 80050344 0004D2A4 4E 80 00 20 */ blr .global "reserve__Q24rstl45vector<9TEditorId,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl45vector<9TEditorId,Q24rstl17rmemory_allocator>Fi": @@ -14366,7 +14366,7 @@ lbl_80050418: /* 80050424 0004D384 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80050428 0004D388 7C 08 03 A6 */ mtlr r0 /* 8005042C 0004D38C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80050430 0004D390 4E 80 00 20 */ blr +/* 80050430 0004D390 4E 80 00 20 */ blr .global "reserve__Q24rstl48vector<11SConnection,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl48vector<11SConnection,Q24rstl17rmemory_allocator>Fi": @@ -14442,7 +14442,7 @@ lbl_80050518: /* 80050524 0004D484 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80050528 0004D488 7C 08 03 A6 */ mtlr r0 /* 8005052C 0004D48C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80050530 0004D490 4E 80 00 20 */ blr +/* 80050530 0004D490 4E 80 00 20 */ blr .global sub_80050534 sub_80050534: @@ -14478,7 +14478,7 @@ lbl_8005058C: /* 8005059C 0004D4FC 83 A1 00 14 */ lwz r29, 0x14(r1) /* 800505A0 0004D500 7C 08 03 A6 */ mtlr r0 /* 800505A4 0004D504 38 21 00 20 */ addi r1, r1, 0x20 -/* 800505A8 0004D508 4E 80 00 20 */ blr +/* 800505A8 0004D508 4E 80 00 20 */ blr .global sub_800505ac sub_800505ac: @@ -14542,7 +14542,7 @@ lbl_8005065C: /* 80050674 0004D5D4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80050678 0004D5D8 7C 08 03 A6 */ mtlr r0 /* 8005067C 0004D5DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80050680 0004D5E0 4E 80 00 20 */ blr +/* 80050680 0004D5E0 4E 80 00 20 */ blr .global sub_80050684 sub_80050684: @@ -14608,7 +14608,7 @@ lbl_80050740: /* 80050750 0004D6B0 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80050754 0004D6B4 7C 08 03 A6 */ mtlr r0 /* 80050758 0004D6B8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8005075C 0004D6BC 4E 80 00 20 */ blr +/* 8005075C 0004D6BC 4E 80 00 20 */ blr .global sub_80050760 sub_80050760: @@ -14651,7 +14651,7 @@ lbl_800507D0: /* 800507E4 0004D744 83 81 00 10 */ lwz r28, 0x10(r1) /* 800507E8 0004D748 7C 08 03 A6 */ mtlr r0 /* 800507EC 0004D74C 38 21 00 20 */ addi r1, r1, 0x20 -/* 800507F0 0004D750 4E 80 00 20 */ blr +/* 800507F0 0004D750 4E 80 00 20 */ blr .global "__insertion_sort__4rstlFPPC9CGameAreaPPC9CGameAreaQ227@unnamed@CStateManager_cpp@11area_sorter" "__insertion_sort__4rstlFPPC9CGameAreaPPC9CGameAreaQ227@unnamed@CStateManager_cpp@11area_sorter": @@ -14693,7 +14693,7 @@ lbl_80050860: /* 8005086C 0004D7CC 80 01 00 34 */ lwz r0, 0x34(r1) /* 80050870 0004D7D0 7C 08 03 A6 */ mtlr r0 /* 80050874 0004D7D4 38 21 00 30 */ addi r1, r1, 0x30 -/* 80050878 0004D7D8 4E 80 00 20 */ blr +/* 80050878 0004D7D8 4E 80 00 20 */ blr .global sub_8005087c sub_8005087c: @@ -14951,7 +14951,7 @@ lbl_80050C24: /* 80050C38 0004DB98 83 A1 00 64 */ lwz r29, 0x64(r1) /* 80050C3C 0004DB9C 7C 08 03 A6 */ mtlr r0 /* 80050C40 0004DBA0 38 21 00 80 */ addi r1, r1, 0x80 -/* 80050C44 0004DBA4 4E 80 00 20 */ blr +/* 80050C44 0004DBA4 4E 80 00 20 */ blr .global sub_80050c48 sub_80050c48: @@ -15050,7 +15050,7 @@ sub_80050c48: /* 80050DB8 0004DD18 80 01 00 64 */ lwz r0, 0x64(r1) /* 80050DBC 0004DD1C 7C 08 03 A6 */ mtlr r0 /* 80050DC0 0004DD20 38 21 00 60 */ addi r1, r1, 0x60 -/* 80050DC4 0004DD24 4E 80 00 20 */ blr +/* 80050DC4 0004DD24 4E 80 00 20 */ blr .global "__sort3__4rstlFRPC9CGameAreaRPC9CGameAreaRPC9CGameAreaQ227@unnamed@CStateManager_cpp@11area_sorter" "__sort3__4rstlFRPC9CGameAreaRPC9CGameAreaRPC9CGameAreaQ227@unnamed@CStateManager_cpp@11area_sorter": @@ -15099,7 +15099,7 @@ lbl_80050E60: /* 80050E64 0004DDC4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80050E68 0004DDC8 7C 08 03 A6 */ mtlr r0 /* 80050E6C 0004DDCC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80050E70 0004DDD0 4E 80 00 20 */ blr +/* 80050E70 0004DDD0 4E 80 00 20 */ blr .global "__insertion_sort,Q24rstl17rmemory_allocator>,15CLightPredicate>__4rstlFQ24rstl104pointer_iterator<6CLight,Q24rstl42vector<6CLight,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl104pointer_iterator<6CLight,Q24rstl42vector<6CLight,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>15CLightPredicate" "__insertion_sort,Q24rstl17rmemory_allocator>,15CLightPredicate>__4rstlFQ24rstl104pointer_iterator<6CLight,Q24rstl42vector<6CLight,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl104pointer_iterator<6CLight,Q24rstl42vector<6CLight,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>15CLightPredicate": @@ -15242,4 +15242,4 @@ lbl_8005105C: /* 80051074 0004DFD4 80 01 00 84 */ lwz r0, 0x84(r1) /* 80051078 0004DFD8 7C 08 03 A6 */ mtlr r0 /* 8005107C 0004DFDC 38 21 00 80 */ addi r1, r1, 0x80 -/* 80051080 0004DFE0 4E 80 00 20 */ blr +/* 80051080 0004DFE0 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/CSteeringBehaviors.s b/asm/MetroidPrime/CSteeringBehaviors.s index 3edcd3a1..14f84d68 100644 --- a/asm/MetroidPrime/CSteeringBehaviors.s +++ b/asm/MetroidPrime/CSteeringBehaviors.s @@ -216,7 +216,7 @@ lbl_8013CCC4: /* 8013CD40 00139CA0 83 81 00 60 */ lwz r28, 0x60(r1) /* 8013CD44 00139CA4 7C 08 03 A6 */ mtlr r0 /* 8013CD48 00139CA8 38 21 01 30 */ addi r1, r1, 0x130 -/* 8013CD4C 00139CAC 4E 80 00 20 */ blr +/* 8013CD4C 00139CAC 4E 80 00 20 */ blr .global ProjectOrbitalIntersection__18CSteeringBehaviorsFRC9CVector3ffRC9CVector3fRC9CVector3fRC9CVector3fRC9CVector3fR9CVector3f ProjectOrbitalIntersection__18CSteeringBehaviorsFRC9CVector3ffRC9CVector3fRC9CVector3fRC9CVector3fRC9CVector3fR9CVector3f: @@ -489,7 +489,7 @@ lbl_8013D0D8: /* 8013D15C 0013A0BC 80 01 01 84 */ lwz r0, 0x184(r1) /* 8013D160 0013A0C0 7C 08 03 A6 */ mtlr r0 /* 8013D164 0013A0C4 38 21 01 80 */ addi r1, r1, 0x180 -/* 8013D168 0013A0C8 4E 80 00 20 */ blr +/* 8013D168 0013A0C8 4E 80 00 20 */ blr .global ProjectOrbitalIntersection__18CSteeringBehaviorsFRC9CVector3ffRC9CVector3fRC9CVector3fRC9CVector3fR9CVector3f ProjectOrbitalIntersection__18CSteeringBehaviorsFRC9CVector3ffRC9CVector3fRC9CVector3fRC9CVector3fR9CVector3f: @@ -756,7 +756,7 @@ lbl_8013D4D8: /* 8013D55C 0013A4BC 80 01 01 84 */ lwz r0, 0x184(r1) /* 8013D560 0013A4C0 7C 08 03 A6 */ mtlr r0 /* 8013D564 0013A4C4 38 21 01 80 */ addi r1, r1, 0x180 -/* 8013D568 0013A4C8 4E 80 00 20 */ blr +/* 8013D568 0013A4C8 4E 80 00 20 */ blr .global ProjectLinearIntersection__18CSteeringBehaviorsFRC9CVector3ffRC9CVector3fRC9CVector3fRC9CVector3fR9CVector3f ProjectLinearIntersection__18CSteeringBehaviorsFRC9CVector3ffRC9CVector3fRC9CVector3fRC9CVector3fR9CVector3f: @@ -971,7 +971,7 @@ lbl_8013D85C: /* 8013D868 0013A7C8 80 01 00 54 */ lwz r0, 0x54(r1) /* 8013D86C 0013A7CC 7C 08 03 A6 */ mtlr r0 /* 8013D870 0013A7D0 38 21 00 50 */ addi r1, r1, 0x50 -/* 8013D874 0013A7D4 4E 80 00 20 */ blr +/* 8013D874 0013A7D4 4E 80 00 20 */ blr .global ProjectLinearIntersection__18CSteeringBehaviorsFRC9CVector3ffRC9CVector3fRC9CVector3fR9CVector3f ProjectLinearIntersection__18CSteeringBehaviorsFRC9CVector3ffRC9CVector3fRC9CVector3fR9CVector3f: @@ -1043,7 +1043,7 @@ lbl_8013D968: /* 8013D974 0013A8D4 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8013D978 0013A8D8 7C 08 03 A6 */ mtlr r0 /* 8013D97C 0013A8DC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8013D980 0013A8E0 4E 80 00 20 */ blr +/* 8013D980 0013A8E0 4E 80 00 20 */ blr .global "SolveQuartic__18CSteeringBehaviorsFRCQ24rstl20reserved_vectorRQ24rstl20reserved_vector" "SolveQuartic__18CSteeringBehaviorsFRCQ24rstl20reserved_vectorRQ24rstl20reserved_vector": @@ -1505,7 +1505,7 @@ lbl_8013DFAC: /* 8013DFE4 0013AF44 83 C1 00 48 */ lwz r30, 0x48(r1) /* 8013DFE8 0013AF48 7C 08 03 A6 */ mtlr r0 /* 8013DFEC 0013AF4C 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 8013DFF0 0013AF50 4E 80 00 20 */ blr +/* 8013DFF0 0013AF50 4E 80 00 20 */ blr .global "SolveCubic__18CSteeringBehaviorsFRCQ24rstl20reserved_vectorRQ24rstl20reserved_vector" "SolveCubic__18CSteeringBehaviorsFRCQ24rstl20reserved_vectorRQ24rstl20reserved_vector": @@ -1785,7 +1785,7 @@ lbl_8013E384: /* 8013E3E4 0013B344 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8013E3E8 0013B348 7C 08 03 A6 */ mtlr r0 /* 8013E3EC 0013B34C 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 8013E3F0 0013B350 4E 80 00 20 */ blr +/* 8013E3F0 0013B350 4E 80 00 20 */ blr .global SolveQuadratic__18CSteeringBehaviorsFfffRfRf SolveQuadratic__18CSteeringBehaviorsFfffRfRf: @@ -1838,7 +1838,7 @@ lbl_8013E488: /* 8013E4A0 0013B400 83 C1 00 08 */ lwz r30, 8(r1) /* 8013E4A4 0013B404 7C 08 03 A6 */ mtlr r0 /* 8013E4A8 0013B408 38 21 00 30 */ addi r1, r1, 0x30 -/* 8013E4AC 0013B40C 4E 80 00 20 */ blr +/* 8013E4AC 0013B40C 4E 80 00 20 */ blr .global Arrival2D__18CSteeringBehaviorsCFRC13CPhysicsActorRC9CVector2ff Arrival2D__18CSteeringBehaviorsCFRC13CPhysicsActorRC9CVector2ff: @@ -1886,7 +1886,7 @@ lbl_8013E544: /* 8013E54C 0013B4AC 83 C1 00 38 */ lwz r30, 0x38(r1) /* 8013E550 0013B4B0 7C 08 03 A6 */ mtlr r0 /* 8013E554 0013B4B4 38 21 00 40 */ addi r1, r1, 0x40 -/* 8013E558 0013B4B8 4E 80 00 20 */ blr +/* 8013E558 0013B4B8 4E 80 00 20 */ blr .global Flee2D__18CSteeringBehaviorsCFRC13CPhysicsActorRC9CVector2f Flee2D__18CSteeringBehaviorsCFRC13CPhysicsActorRC9CVector2f: @@ -1940,7 +1940,7 @@ lbl_8013E604: /* 8013E610 0013B570 83 A1 00 44 */ lwz r29, 0x44(r1) /* 8013E614 0013B574 7C 08 03 A6 */ mtlr r0 /* 8013E618 0013B578 38 21 00 50 */ addi r1, r1, 0x50 -/* 8013E61C 0013B57C 4E 80 00 20 */ blr +/* 8013E61C 0013B57C 4E 80 00 20 */ blr .global "Cohesion__18CSteeringBehaviorsCFRC13CPhysicsActorRQ24rstl32reserved_vector<9TUniqueId,1024>fRC13CStateManager" "Cohesion__18CSteeringBehaviorsCFRC13CPhysicsActorRQ24rstl32reserved_vector<9TUniqueId,1024>fRC13CStateManager": @@ -2035,7 +2035,7 @@ lbl_8013E760: /* 8013E76C 0013B6CC 80 01 00 54 */ lwz r0, 0x54(r1) /* 8013E770 0013B6D0 7C 08 03 A6 */ mtlr r0 /* 8013E774 0013B6D4 38 21 00 50 */ addi r1, r1, 0x50 -/* 8013E778 0013B6D8 4E 80 00 20 */ blr +/* 8013E778 0013B6D8 4E 80 00 20 */ blr .global "Alignment__18CSteeringBehaviorsCFRC13CPhysicsActorRQ24rstl32reserved_vector<9TUniqueId,1024>RC13CStateManager" "Alignment__18CSteeringBehaviorsCFRC13CPhysicsActorRQ24rstl32reserved_vector<9TUniqueId,1024>RC13CStateManager": @@ -2135,7 +2135,7 @@ lbl_8013E878: /* 8013E8E0 0013B840 80 01 00 54 */ lwz r0, 0x54(r1) /* 8013E8E4 0013B844 7C 08 03 A6 */ mtlr r0 /* 8013E8E8 0013B848 38 21 00 50 */ addi r1, r1, 0x50 -/* 8013E8EC 0013B84C 4E 80 00 20 */ blr +/* 8013E8EC 0013B84C 4E 80 00 20 */ blr .global Separation__18CSteeringBehaviorsCFRC13CPhysicsActorRC9CVector3ff Separation__18CSteeringBehaviorsCFRC13CPhysicsActorRC9CVector3ff: @@ -2216,7 +2216,7 @@ lbl_8013E9F0: /* 8013EA0C 0013B96C 83 C1 00 38 */ lwz r30, 0x38(r1) /* 8013EA10 0013B970 7C 08 03 A6 */ mtlr r0 /* 8013EA14 0013B974 38 21 00 50 */ addi r1, r1, 0x50 -/* 8013EA18 0013B978 4E 80 00 20 */ blr +/* 8013EA18 0013B978 4E 80 00 20 */ blr .global Pursuit__18CSteeringBehaviorsCFRC13CPhysicsActorRC9CVector3fRC9CVector3f Pursuit__18CSteeringBehaviorsCFRC13CPhysicsActorRC9CVector3fRC9CVector3f: @@ -2284,7 +2284,7 @@ lbl_8013EADC: /* 8013EB0C 0013BA6C 80 01 00 54 */ lwz r0, 0x54(r1) /* 8013EB10 0013BA70 7C 08 03 A6 */ mtlr r0 /* 8013EB14 0013BA74 38 21 00 50 */ addi r1, r1, 0x50 -/* 8013EB18 0013BA78 4E 80 00 20 */ blr +/* 8013EB18 0013BA78 4E 80 00 20 */ blr .global Arrival__18CSteeringBehaviorsCFRC13CPhysicsActorRC9CVector3ff Arrival__18CSteeringBehaviorsCFRC13CPhysicsActorRC9CVector3ff: @@ -2356,7 +2356,7 @@ lbl_8013EC04: /* 8013EC10 0013BB70 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8013EC14 0013BB74 7C 08 03 A6 */ mtlr r0 /* 8013EC18 0013BB78 38 21 00 40 */ addi r1, r1, 0x40 -/* 8013EC1C 0013BB7C 4E 80 00 20 */ blr +/* 8013EC1C 0013BB7C 4E 80 00 20 */ blr .global Seek__18CSteeringBehaviorsCFRC13CPhysicsActorRC9CVector3f Seek__18CSteeringBehaviorsCFRC13CPhysicsActorRC9CVector3f: @@ -2398,7 +2398,7 @@ lbl_8013ECA0: /* 8013ECA4 0013BC04 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8013ECA8 0013BC08 7C 08 03 A6 */ mtlr r0 /* 8013ECAC 0013BC0C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8013ECB0 0013BC10 4E 80 00 20 */ blr +/* 8013ECB0 0013BC10 4E 80 00 20 */ blr .global Flee__18CSteeringBehaviorsCFRC13CPhysicsActorRC9CVector3f Flee__18CSteeringBehaviorsCFRC13CPhysicsActorRC9CVector3f: @@ -2442,7 +2442,7 @@ lbl_8013ED38: /* 8013ED40 0013BCA0 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8013ED44 0013BCA4 7C 08 03 A6 */ mtlr r0 /* 8013ED48 0013BCA8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8013ED4C 0013BCAC 4E 80 00 20 */ blr +/* 8013ED4C 0013BCAC 4E 80 00 20 */ blr .global __ct__18CSteeringBehaviorsFv __ct__18CSteeringBehaviorsFv: diff --git a/asm/MetroidPrime/CTargetReticles.s b/asm/MetroidPrime/CTargetReticles.s index 0efd5fb6..9880f5ff 100644 --- a/asm/MetroidPrime/CTargetReticles.s +++ b/asm/MetroidPrime/CTargetReticles.s @@ -97,13 +97,13 @@ lbl_805A7274: .global lbl_8046C450 lbl_8046C450: .skip 0x20 - + .section .text, "ax" .global ResetInterpolationTimer__17COrbitPointMarkerFf ResetInterpolationTimer__17COrbitPointMarkerFf: /* 800BC2B0 000B9210 D0 23 00 20 */ stfs f1, 0x20(r3) -/* 800BC2B4 000B9214 4E 80 00 20 */ blr +/* 800BC2B4 000B9214 4E 80 00 20 */ blr .global Draw__17COrbitPointMarkerCFRC13CStateManager Draw__17COrbitPointMarkerCFRC13CStateManager: @@ -177,7 +177,7 @@ lbl_800BC34C: /* 800BC3BC 000B931C 81 83 00 00 */ lwz r12, 0(r3) /* 800BC3C0 000B9320 81 8C 00 58 */ lwz r12, 0x58(r12) /* 800BC3C4 000B9324 7D 89 03 A6 */ mtctr r12 -/* 800BC3C8 000B9328 4E 80 04 21 */ bctrl +/* 800BC3C8 000B9328 4E 80 04 21 */ bctrl /* 800BC3CC 000B932C 3C 60 80 3F */ lis r3, lbl_803ED910@ha /* 800BC3D0 000B9330 3C 80 43 30 */ lis r4, 0x4330 /* 800BC3D4 000B9334 38 C3 D9 10 */ addi r6, r3, lbl_803ED910@l @@ -201,7 +201,7 @@ lbl_800BC34C: /* 800BC41C 000B937C C0 BE 01 64 */ lfs f5, 0x164(r30) /* 800BC420 000B9380 EC 60 18 28 */ fsubs f3, f0, f3 /* 800BC424 000B9384 7D 89 03 A6 */ mtctr r12 -/* 800BC428 000B9388 4E 80 04 21 */ bctrl +/* 800BC428 000B9388 4E 80 04 21 */ bctrl /* 800BC42C 000B938C 80 A1 00 E0 */ lwz r5, 0xe0(r1) /* 800BC430 000B9390 38 60 00 00 */ li r3, 0 /* 800BC434 000B9394 2C 05 00 00 */ cmpwi r5, 0 @@ -272,7 +272,7 @@ lbl_800BC4B8: /* 800BC520 000B9480 81 83 00 00 */ lwz r12, 0(r3) /* 800BC524 000B9484 81 8C 00 30 */ lwz r12, 0x30(r12) /* 800BC528 000B9488 7D 89 03 A6 */ mtctr r12 -/* 800BC52C 000B948C 4E 80 04 21 */ bctrl +/* 800BC52C 000B948C 4E 80 04 21 */ bctrl /* 800BC530 000B9490 88 7E 01 BF */ lbz r3, 0x1bf(r30) /* 800BC534 000B9494 3C 00 43 30 */ lis r0, 0x4330 /* 800BC538 000B9498 90 01 01 50 */ stw r0, 0x150(r1) @@ -311,7 +311,7 @@ lbl_800BC59C: /* 800BC5B8 000B9518 83 A1 01 64 */ lwz r29, 0x164(r1) /* 800BC5BC 000B951C 7C 08 03 A6 */ mtlr r0 /* 800BC5C0 000B9520 38 21 01 90 */ addi r1, r1, 0x190 -/* 800BC5C4 000B9524 4E 80 00 20 */ blr +/* 800BC5C4 000B9524 4E 80 00 20 */ blr .global Update__17COrbitPointMarkerFfRC13CStateManager Update__17COrbitPointMarkerFfRC13CStateManager: @@ -536,7 +536,7 @@ lbl_800BC8D4: /* 800BC8F0 000B9850 80 01 01 14 */ lwz r0, 0x114(r1) /* 800BC8F4 000B9854 7C 08 03 A6 */ mtlr r0 /* 800BC8F8 000B9858 38 21 01 10 */ addi r1, r1, 0x110 -/* 800BC8FC 000B985C 4E 80 00 20 */ blr +/* 800BC8FC 000B985C 4E 80 00 20 */ blr .global CheckLoadComplete__17COrbitPointMarkerFv CheckLoadComplete__17COrbitPointMarkerFv: @@ -571,7 +571,7 @@ lbl_800BC960: /* 800BC964 000B98C4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800BC968 000B98C8 7C 08 03 A6 */ mtlr r0 /* 800BC96C 000B98CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800BC970 000B98D0 4E 80 00 20 */ blr +/* 800BC970 000B98D0 4E 80 00 20 */ blr .global __ct__17COrbitPointMarkerFv __ct__17COrbitPointMarkerFv: @@ -607,7 +607,7 @@ __ct__17COrbitPointMarkerFv: /* 800BC9E8 000B9948 81 84 00 00 */ lwz r12, 0(r4) /* 800BC9EC 000B994C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800BC9F0 000B9950 7D 89 03 A6 */ mtctr r12 -/* 800BC9F4 000B9954 4E 80 04 21 */ bctrl +/* 800BC9F4 000B9954 4E 80 04 21 */ bctrl /* 800BC9F8 000B9958 3B FE 00 28 */ addi r31, r30, 0x28 /* 800BC9FC 000B995C 38 81 00 08 */ addi r4, r1, 8 /* 800BCA00 000B9960 7F E3 FB 78 */ mr r3, r31 @@ -625,7 +625,7 @@ __ct__17COrbitPointMarkerFv: /* 800BCA30 000B9990 83 C1 00 18 */ lwz r30, 0x18(r1) /* 800BCA34 000B9994 7C 08 03 A6 */ mtlr r0 /* 800BCA38 000B9998 38 21 00 20 */ addi r1, r1, 0x20 -/* 800BCA3C 000B999C 4E 80 00 20 */ blr +/* 800BCA3C 000B999C 4E 80 00 20 */ blr .global Touch__17CTargetingManagerCFv Touch__17CTargetingManagerCFv: @@ -636,7 +636,7 @@ Touch__17CTargetingManagerCFv: /* 800BCA50 000B99B0 80 01 00 14 */ lwz r0, 0x14(r1) /* 800BCA54 000B99B4 7C 08 03 A6 */ mtlr r0 /* 800BCA58 000B99B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800BCA5C 000B99BC 4E 80 00 20 */ blr +/* 800BCA5C 000B99BC 4E 80 00 20 */ blr .global Touch__22CCompoundTargetReticleCFv Touch__22CCompoundTargetReticleCFv: @@ -746,7 +746,7 @@ lbl_800BCB9C: /* 800BCBBC 000B9B1C 83 C1 00 08 */ lwz r30, 8(r1) /* 800BCBC0 000B9B20 7C 08 03 A6 */ mtlr r0 /* 800BCBC4 000B9B24 38 21 00 10 */ addi r1, r1, 0x10 -/* 800BCBC8 000B9B28 4E 80 00 20 */ blr +/* 800BCBC8 000B9B28 4E 80 00 20 */ blr .global Draw__17CTargetingManagerCFRC13CStateManager Draw__17CTargetingManagerCFRC13CStateManager: @@ -794,7 +794,7 @@ Draw__17CTargetingManagerCFRC13CStateManager: /* 800BCC70 000B9BD0 81 83 00 00 */ lwz r12, 0(r3) /* 800BCC74 000B9BD4 81 8C 00 58 */ lwz r12, 0x58(r12) /* 800BCC78 000B9BD8 7D 89 03 A6 */ mtctr r12 -/* 800BCC7C 000B9BDC 4E 80 04 21 */ bctrl +/* 800BCC7C 000B9BDC 4E 80 04 21 */ bctrl /* 800BCC80 000B9BE0 3C 60 80 3F */ lis r3, lbl_803ED910@ha /* 800BCC84 000B9BE4 3C 80 43 30 */ lis r4, 0x4330 /* 800BCC88 000B9BE8 38 C3 D9 10 */ addi r6, r3, lbl_803ED910@l @@ -818,7 +818,7 @@ Draw__17CTargetingManagerCFRC13CStateManager: /* 800BCCD0 000B9C30 C0 BF 01 64 */ lfs f5, 0x164(r31) /* 800BCCD4 000B9C34 EC 60 18 28 */ fsubs f3, f0, f3 /* 800BCCD8 000B9C38 7D 89 03 A6 */ mtctr r12 -/* 800BCCDC 000B9C3C 4E 80 04 21 */ bctrl +/* 800BCCDC 000B9C3C 4E 80 04 21 */ bctrl /* 800BCCE0 000B9C40 7F 83 E3 78 */ mr r3, r28 /* 800BCCE4 000B9C44 7F A4 EB 78 */ mr r4, r29 /* 800BCCE8 000B9C48 7F C5 F3 78 */ mr r5, r30 @@ -855,7 +855,7 @@ lbl_800BCD3C: /* 800BCD54 000B9CB4 83 81 00 E0 */ lwz r28, 0xe0(r1) /* 800BCD58 000B9CB8 7C 08 03 A6 */ mtlr r0 /* 800BCD5C 000B9CBC 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 800BCD60 000B9CC0 4E 80 00 20 */ blr +/* 800BCD60 000B9CC0 4E 80 00 20 */ blr .global Update__17CTargetingManagerFfRC13CStateManager Update__17CTargetingManagerFfRC13CStateManager: @@ -879,7 +879,7 @@ Update__17CTargetingManagerFfRC13CStateManager: /* 800BCDA8 000B9D08 83 C1 00 10 */ lwz r30, 0x10(r1) /* 800BCDAC 000B9D0C 7C 08 03 A6 */ mtlr r0 /* 800BCDB0 000B9D10 38 21 00 20 */ addi r1, r1, 0x20 -/* 800BCDB4 000B9D14 4E 80 00 20 */ blr +/* 800BCDB4 000B9D14 4E 80 00 20 */ blr .global CheckLoadComplete__17CTargetingManagerFv CheckLoadComplete__17CTargetingManagerFv: @@ -905,7 +905,7 @@ lbl_800BCDF4: /* 800BCE00 000B9D60 83 C1 00 08 */ lwz r30, 8(r1) /* 800BCE04 000B9D64 7C 08 03 A6 */ mtlr r0 /* 800BCE08 000B9D68 38 21 00 10 */ addi r1, r1, 0x10 -/* 800BCE0C 000B9D6C 4E 80 00 20 */ blr +/* 800BCE0C 000B9D6C 4E 80 00 20 */ blr .global __ct__17CTargetingManagerFRC13CStateManager __ct__17CTargetingManagerFRC13CStateManager: @@ -922,7 +922,7 @@ __ct__17CTargetingManagerFRC13CStateManager: /* 800BCE38 000B9D98 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800BCE3C 000B9D9C 7C 08 03 A6 */ mtlr r0 /* 800BCE40 000B9DA0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800BCE44 000B9DA4 4E 80 00 20 */ blr +/* 800BCE44 000B9DA4 4E 80 00 20 */ blr .global InterpolateWithClamp__25CTargetReticleRenderStateFRC25CTargetReticleRenderStateR25CTargetReticleRenderStateRC25CTargetReticleRenderStatef InterpolateWithClamp__25CTargetReticleRenderStateFRC25CTargetReticleRenderStateR25CTargetReticleRenderStateRC25CTargetReticleRenderStatef: @@ -1000,7 +1000,7 @@ lbl_800BCF4C: /* 800BCF58 000B9EB8 83 A1 00 24 */ lwz r29, 0x24(r1) /* 800BCF5C 000B9EBC 7C 08 03 A6 */ mtlr r0 /* 800BCF60 000B9EC0 38 21 00 30 */ addi r1, r1, 0x30 -/* 800BCF64 000B9EC4 4E 80 00 20 */ blr +/* 800BCF64 000B9EC4 4E 80 00 20 */ blr .global __ct__25CTargetReticleRenderStateF9TUniqueIdf9CVector3fffb __ct__25CTargetReticleRenderStateF9TUniqueIdf9CVector3fffb: @@ -1016,7 +1016,7 @@ __ct__25CTargetReticleRenderStateF9TUniqueIdf9CVector3fffb: /* 800BCF8C 000B9EEC D0 43 00 14 */ stfs f2, 0x14(r3) /* 800BCF90 000B9EF0 D0 63 00 18 */ stfs f3, 0x18(r3) /* 800BCF94 000B9EF4 98 C3 00 1C */ stb r6, 0x1c(r3) -/* 800BCF98 000B9EF8 4E 80 00 20 */ blr +/* 800BCF98 000B9EF8 4E 80 00 20 */ blr .global CalculateClampedScale__22CCompoundTargetReticleF9CVector3ffffRC13CStateManager CalculateClampedScale__22CCompoundTargetReticleF9CVector3ffffRC13CStateManager: @@ -1123,7 +1123,7 @@ CalculateClampedScale__22CCompoundTargetReticleF9CVector3ffffRC13CStateManager: /* 800BD12C 000BA08C 83 A1 00 D4 */ lwz r29, 0xd4(r1) /* 800BD130 000BA090 7C 08 03 A6 */ mtlr r0 /* 800BD134 000BA094 38 21 01 00 */ addi r1, r1, 0x100 -/* 800BD138 000BA098 4E 80 00 20 */ blr +/* 800BD138 000BA098 4E 80 00 20 */ blr .global IsGrappleTarget__22CCompoundTargetReticleF9TUniqueIdRC13CStateManager IsGrappleTarget__22CCompoundTargetReticleF9TUniqueIdRC13CStateManager: @@ -1145,7 +1145,7 @@ IsGrappleTarget__22CCompoundTargetReticleF9TUniqueIdRC13CStateManager: /* 800BD178 000BA0D8 80 01 00 24 */ lwz r0, 0x24(r1) /* 800BD17C 000BA0DC 7C 08 03 A6 */ mtlr r0 /* 800BD180 000BA0E0 38 21 00 20 */ addi r1, r1, 0x20 -/* 800BD184 000BA0E4 4E 80 00 20 */ blr +/* 800BD184 000BA0E4 4E 80 00 20 */ blr .global CalculateOrbitZoneReticlePosition__22CCompoundTargetReticleCFRC13CStateManagerb CalculateOrbitZoneReticlePosition__22CCompoundTargetReticleCFRC13CStateManagerb: @@ -1235,7 +1235,7 @@ lbl_800BD27C: /* 800BD2D0 000BA230 83 81 00 90 */ lwz r28, 0x90(r1) /* 800BD2D4 000BA234 7C 08 03 A6 */ mtlr r0 /* 800BD2D8 000BA238 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 800BD2DC 000BA23C 4E 80 00 20 */ blr +/* 800BD2DC 000BA23C 4E 80 00 20 */ blr .global CalculatePositionWorld__22CCompoundTargetReticleCFRC6CActorRC13CStateManager CalculatePositionWorld__22CCompoundTargetReticleCFRC6CActorRC13CStateManager: @@ -1253,7 +1253,7 @@ CalculatePositionWorld__22CCompoundTargetReticleCFRC6CActorRC13CStateManager: /* 800BD30C 000BA26C 38 61 00 14 */ addi r3, r1, 0x14 /* 800BD310 000BA270 81 8C 00 48 */ lwz r12, 0x48(r12) /* 800BD314 000BA274 7D 89 03 A6 */ mtctr r12 -/* 800BD318 000BA278 4E 80 04 21 */ bctrl +/* 800BD318 000BA278 4E 80 04 21 */ bctrl /* 800BD31C 000BA27C 38 61 00 14 */ addi r3, r1, 0x14 /* 800BD320 000BA280 48 00 00 28 */ b lbl_800BD348 lbl_800BD324: @@ -1264,7 +1264,7 @@ lbl_800BD324: /* 800BD334 000BA294 C0 22 8D 30 */ lfs f1, lbl_805AAA50@sda21(r2) /* 800BD338 000BA298 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 800BD33C 000BA29C 7D 89 03 A6 */ mtctr r12 -/* 800BD340 000BA2A0 4E 80 04 21 */ bctrl +/* 800BD340 000BA2A0 4E 80 04 21 */ bctrl /* 800BD344 000BA2A4 38 61 00 08 */ addi r3, r1, 8 lbl_800BD348: /* 800BD348 000BA2A8 C0 03 00 00 */ lfs f0, 0(r3) @@ -1277,7 +1277,7 @@ lbl_800BD348: /* 800BD364 000BA2C4 80 01 00 34 */ lwz r0, 0x34(r1) /* 800BD368 000BA2C8 7C 08 03 A6 */ mtlr r0 /* 800BD36C 000BA2CC 38 21 00 30 */ addi r1, r1, 0x30 -/* 800BD370 000BA2D0 4E 80 00 20 */ blr +/* 800BD370 000BA2D0 4E 80 00 20 */ blr .global CalculateRadiusWorld__22CCompoundTargetReticleCFRC6CActorRC13CStateManager CalculateRadiusWorld__22CCompoundTargetReticleCFRC6CActorRC13CStateManager: @@ -1292,7 +1292,7 @@ CalculateRadiusWorld__22CCompoundTargetReticleCFRC6CActorRC13CStateManager: /* 800BD394 000BA2F4 81 84 00 00 */ lwz r12, 0(r4) /* 800BD398 000BA2F8 81 8C 00 40 */ lwz r12, 0x40(r12) /* 800BD39C 000BA2FC 7D 89 03 A6 */ mtctr r12 -/* 800BD3A0 000BA300 4E 80 04 21 */ bctrl +/* 800BD3A0 000BA300 4E 80 04 21 */ bctrl /* 800BD3A4 000BA304 88 01 00 68 */ lbz r0, 0x68(r1) /* 800BD3A8 000BA308 28 00 00 00 */ cmplwi r0, 0 /* 800BD3AC 000BA30C 98 01 00 84 */ stb r0, 0x84(r1) @@ -1327,7 +1327,7 @@ lbl_800BD408: /* 800BD418 000BA378 C0 22 8D 30 */ lfs f1, lbl_805AAA50@sda21(r2) /* 800BD41C 000BA37C 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 800BD420 000BA380 7D 89 03 A6 */ mtctr r12 -/* 800BD424 000BA384 4E 80 04 21 */ bctrl +/* 800BD424 000BA384 4E 80 04 21 */ bctrl /* 800BD428 000BA388 7F C4 F3 78 */ mr r4, r30 /* 800BD42C 000BA38C 7F E5 FB 78 */ mr r5, r31 /* 800BD430 000BA390 81 9E 00 00 */ lwz r12, 0(r30) @@ -1335,7 +1335,7 @@ lbl_800BD408: /* 800BD438 000BA398 C0 22 8D 30 */ lfs f1, lbl_805AAA50@sda21(r2) /* 800BD43C 000BA39C 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 800BD440 000BA3A0 7D 89 03 A6 */ mtctr r12 -/* 800BD444 000BA3A4 4E 80 04 21 */ bctrl +/* 800BD444 000BA3A4 4E 80 04 21 */ bctrl /* 800BD448 000BA3A8 38 61 00 38 */ addi r3, r1, 0x38 /* 800BD44C 000BA3AC 38 81 00 20 */ addi r4, r1, 0x20 /* 800BD450 000BA3B0 38 A1 00 2C */ addi r5, r1, 0x2c @@ -1429,7 +1429,7 @@ lbl_800BD564: /* 800BD574 000BA4D4 83 C1 00 88 */ lwz r30, 0x88(r1) /* 800BD578 000BA4D8 7C 08 03 A6 */ mtlr r0 /* 800BD57C 000BA4DC 38 21 00 90 */ addi r1, r1, 0x90 -/* 800BD580 000BA4E0 4E 80 00 20 */ blr +/* 800BD580 000BA4E0 4E 80 00 20 */ blr .global UpdateTargetParameters__22CCompoundTargetReticleFR25CTargetReticleRenderStateRC13CStateManager UpdateTargetParameters__22CCompoundTargetReticleFR25CTargetReticleRenderStateRC13CStateManager: @@ -1508,7 +1508,7 @@ lbl_800BD67C: /* 800BD68C 000BA5EC 83 81 00 30 */ lwz r28, 0x30(r1) /* 800BD690 000BA5F0 7C 08 03 A6 */ mtlr r0 /* 800BD694 000BA5F4 38 21 00 40 */ addi r1, r1, 0x40 -/* 800BD698 000BA5F8 4E 80 00 20 */ blr +/* 800BD698 000BA5F8 4E 80 00 20 */ blr .global DrawOrbitZoneGroup__22CCompoundTargetReticleCFRC9CMatrix3fRC13CStateManager DrawOrbitZoneGroup__22CCompoundTargetReticleCFRC9CMatrix3fRC13CStateManager: @@ -1565,7 +1565,7 @@ lbl_800BD71C: /* 800BD760 000BA6C0 81 83 00 00 */ lwz r12, 0(r3) /* 800BD764 000BA6C4 81 8C 00 30 */ lwz r12, 0x30(r12) /* 800BD768 000BA6C8 7D 89 03 A6 */ mtctr r12 -/* 800BD76C 000BA6CC 4E 80 04 21 */ bctrl +/* 800BD76C 000BA6CC 4E 80 04 21 */ bctrl /* 800BD770 000BA6D0 88 7F 01 C3 */ lbz r3, 0x1c3(r31) /* 800BD774 000BA6D4 3C 00 43 30 */ lis r0, 0x4330 /* 800BD778 000BA6D8 90 01 00 B0 */ stw r0, 0xb0(r1) @@ -1604,7 +1604,7 @@ lbl_800BD7E0: /* 800BD7F8 000BA758 83 81 00 C0 */ lwz r28, 0xc0(r1) /* 800BD7FC 000BA75C 7C 08 03 A6 */ mtlr r0 /* 800BD800 000BA760 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 800BD804 000BA764 4E 80 00 20 */ blr +/* 800BD804 000BA764 4E 80 00 20 */ blr .global DrawNextLockOnGroup__22CCompoundTargetReticleCFRC9CMatrix3fRC13CStateManager DrawNextLockOnGroup__22CCompoundTargetReticleCFRC9CMatrix3fRC13CStateManager: @@ -1762,7 +1762,7 @@ lbl_800BD964: /* 800BDA4C 000BA9AC 81 83 00 00 */ lwz r12, 0(r3) /* 800BDA50 000BA9B0 81 8C 00 30 */ lwz r12, 0x30(r12) /* 800BDA54 000BA9B4 7D 89 03 A6 */ mtctr r12 -/* 800BDA58 000BA9B8 4E 80 04 21 */ bctrl +/* 800BDA58 000BA9B8 4E 80 04 21 */ bctrl /* 800BDA5C 000BA9BC 88 78 01 53 */ lbz r3, 0x153(r24) /* 800BDA60 000BA9C0 3C 00 43 30 */ lis r0, 0x4330 /* 800BDA64 000BA9C4 90 01 04 48 */ stw r0, 0x448(r1) @@ -1869,7 +1869,7 @@ lbl_800BDB08: /* 800BDBF0 000BAB50 81 83 00 00 */ lwz r12, 0(r3) /* 800BDBF4 000BAB54 81 8C 00 30 */ lwz r12, 0x30(r12) /* 800BDBF8 000BAB58 7D 89 03 A6 */ mtctr r12 -/* 800BDBFC 000BAB5C 4E 80 04 21 */ bctrl +/* 800BDBFC 000BAB5C 4E 80 04 21 */ bctrl /* 800BDC00 000BAB60 88 78 02 17 */ lbz r3, 0x217(r24) /* 800BDC04 000BAB64 3C 00 43 30 */ lis r0, 0x4330 /* 800BDC08 000BAB68 90 01 04 48 */ stw r0, 0x448(r1) @@ -1967,7 +1967,7 @@ lbl_800BDCAC: /* 800BDD70 000BACD0 81 83 00 00 */ lwz r12, 0(r3) /* 800BDD74 000BACD4 81 8C 00 30 */ lwz r12, 0x30(r12) /* 800BDD78 000BACD8 7D 89 03 A6 */ mtctr r12 -/* 800BDD7C 000BACDC 4E 80 04 21 */ bctrl +/* 800BDD7C 000BACDC 4E 80 04 21 */ bctrl /* 800BDD80 000BACE0 88 78 00 B3 */ lbz r3, 0xb3(r24) /* 800BDD84 000BACE4 3C 00 43 30 */ lis r0, 0x4330 /* 800BDD88 000BACE8 90 01 04 48 */ stw r0, 0x448(r1) @@ -2053,7 +2053,7 @@ lbl_800BDDEC: /* 800BDEC4 000BAE24 81 83 00 00 */ lwz r12, 0(r3) /* 800BDEC8 000BAE28 81 8C 00 30 */ lwz r12, 0x30(r12) /* 800BDECC 000BAE2C 7D 89 03 A6 */ mtctr r12 -/* 800BDED0 000BAE30 4E 80 04 21 */ bctrl +/* 800BDED0 000BAE30 4E 80 04 21 */ bctrl /* 800BDED4 000BAE34 38 60 00 01 */ li r3, 1 /* 800BDED8 000BAE38 38 80 00 01 */ li r4, 1 /* 800BDEDC 000BAE3C 38 A0 00 00 */ li r5, 0 @@ -2095,13 +2095,13 @@ lbl_800BDF24: /* 800BDF60 000BAEC0 81 83 00 00 */ lwz r12, 0(r3) /* 800BDF64 000BAEC4 81 8C 00 94 */ lwz r12, 0x94(r12) /* 800BDF68 000BAEC8 7D 89 03 A6 */ mtctr r12 -/* 800BDF6C 000BAECC 4E 80 04 21 */ bctrl +/* 800BDF6C 000BAECC 4E 80 04 21 */ bctrl /* 800BDF70 000BAED0 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 800BDF74 000BAED4 38 81 00 14 */ addi r4, r1, 0x14 /* 800BDF78 000BAED8 81 83 00 00 */ lwz r12, 0(r3) /* 800BDF7C 000BAEDC 81 8C 00 B4 */ lwz r12, 0xb4(r12) /* 800BDF80 000BAEE0 7D 89 03 A6 */ mtctr r12 -/* 800BDF84 000BAEE4 4E 80 04 21 */ bctrl +/* 800BDF84 000BAEE4 4E 80 04 21 */ bctrl /* 800BDF88 000BAEE8 D3 C1 00 CC */ stfs f30, 0xcc(r1) /* 800BDF8C 000BAEEC 38 81 00 CC */ addi r4, r1, 0xcc /* 800BDF90 000BAEF0 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) @@ -2110,7 +2110,7 @@ lbl_800BDF24: /* 800BDF9C 000BAEFC 81 83 00 00 */ lwz r12, 0(r3) /* 800BDFA0 000BAF00 81 8C 00 A8 */ lwz r12, 0xa8(r12) /* 800BDFA4 000BAF04 7D 89 03 A6 */ mtctr r12 -/* 800BDFA8 000BAF08 4E 80 04 21 */ bctrl +/* 800BDFA8 000BAF08 4E 80 04 21 */ bctrl /* 800BDFAC 000BAF0C D3 A1 00 C0 */ stfs f29, 0xc0(r1) /* 800BDFB0 000BAF10 38 81 00 C0 */ addi r4, r1, 0xc0 /* 800BDFB4 000BAF14 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) @@ -2119,7 +2119,7 @@ lbl_800BDF24: /* 800BDFC0 000BAF20 81 83 00 00 */ lwz r12, 0(r3) /* 800BDFC4 000BAF24 81 8C 00 A8 */ lwz r12, 0xa8(r12) /* 800BDFC8 000BAF28 7D 89 03 A6 */ mtctr r12 -/* 800BDFCC 000BAF2C 4E 80 04 21 */ bctrl +/* 800BDFCC 000BAF2C 4E 80 04 21 */ bctrl /* 800BDFD0 000BAF30 D2 E1 00 B4 */ stfs f23, 0xb4(r1) /* 800BDFD4 000BAF34 38 81 00 B4 */ addi r4, r1, 0xb4 /* 800BDFD8 000BAF38 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) @@ -2128,7 +2128,7 @@ lbl_800BDF24: /* 800BDFE4 000BAF44 81 83 00 00 */ lwz r12, 0(r3) /* 800BDFE8 000BAF48 81 8C 00 A8 */ lwz r12, 0xa8(r12) /* 800BDFEC 000BAF4C 7D 89 03 A6 */ mtctr r12 -/* 800BDFF0 000BAF50 4E 80 04 21 */ bctrl +/* 800BDFF0 000BAF50 4E 80 04 21 */ bctrl /* 800BDFF4 000BAF54 D3 81 00 A8 */ stfs f28, 0xa8(r1) /* 800BDFF8 000BAF58 38 81 00 A8 */ addi r4, r1, 0xa8 /* 800BDFFC 000BAF5C 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) @@ -2137,7 +2137,7 @@ lbl_800BDF24: /* 800BE008 000BAF68 81 83 00 00 */ lwz r12, 0(r3) /* 800BE00C 000BAF6C 81 8C 00 A8 */ lwz r12, 0xa8(r12) /* 800BE010 000BAF70 7D 89 03 A6 */ mtctr r12 -/* 800BE014 000BAF74 4E 80 04 21 */ bctrl +/* 800BE014 000BAF74 4E 80 04 21 */ bctrl /* 800BE018 000BAF78 D3 41 00 9C */ stfs f26, 0x9c(r1) /* 800BE01C 000BAF7C 38 81 00 9C */ addi r4, r1, 0x9c /* 800BE020 000BAF80 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) @@ -2146,7 +2146,7 @@ lbl_800BDF24: /* 800BE02C 000BAF8C 81 83 00 00 */ lwz r12, 0(r3) /* 800BE030 000BAF90 81 8C 00 A8 */ lwz r12, 0xa8(r12) /* 800BE034 000BAF94 7D 89 03 A6 */ mtctr r12 -/* 800BE038 000BAF98 4E 80 04 21 */ bctrl +/* 800BE038 000BAF98 4E 80 04 21 */ bctrl /* 800BE03C 000BAF9C D3 41 00 90 */ stfs f26, 0x90(r1) /* 800BE040 000BAFA0 38 81 00 90 */ addi r4, r1, 0x90 /* 800BE044 000BAFA4 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) @@ -2155,7 +2155,7 @@ lbl_800BDF24: /* 800BE050 000BAFB0 81 83 00 00 */ lwz r12, 0(r3) /* 800BE054 000BAFB4 81 8C 00 A8 */ lwz r12, 0xa8(r12) /* 800BE058 000BAFB8 7D 89 03 A6 */ mtctr r12 -/* 800BE05C 000BAFBC 4E 80 04 21 */ bctrl +/* 800BE05C 000BAFBC 4E 80 04 21 */ bctrl /* 800BE060 000BAFC0 D3 41 00 84 */ stfs f26, 0x84(r1) /* 800BE064 000BAFC4 38 81 00 84 */ addi r4, r1, 0x84 /* 800BE068 000BAFC8 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) @@ -2164,7 +2164,7 @@ lbl_800BDF24: /* 800BE074 000BAFD4 81 83 00 00 */ lwz r12, 0(r3) /* 800BE078 000BAFD8 81 8C 00 A8 */ lwz r12, 0xa8(r12) /* 800BE07C 000BAFDC 7D 89 03 A6 */ mtctr r12 -/* 800BE080 000BAFE0 4E 80 04 21 */ bctrl +/* 800BE080 000BAFE0 4E 80 04 21 */ bctrl /* 800BE084 000BAFE4 D3 41 00 78 */ stfs f26, 0x78(r1) /* 800BE088 000BAFE8 38 81 00 78 */ addi r4, r1, 0x78 /* 800BE08C 000BAFEC 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) @@ -2173,12 +2173,12 @@ lbl_800BDF24: /* 800BE098 000BAFF8 81 83 00 00 */ lwz r12, 0(r3) /* 800BE09C 000BAFFC 81 8C 00 A8 */ lwz r12, 0xa8(r12) /* 800BE0A0 000BB000 7D 89 03 A6 */ mtctr r12 -/* 800BE0A4 000BB004 4E 80 04 21 */ bctrl +/* 800BE0A4 000BB004 4E 80 04 21 */ bctrl /* 800BE0A8 000BB008 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 800BE0AC 000BB00C 81 83 00 00 */ lwz r12, 0(r3) /* 800BE0B0 000BB010 81 8C 00 B8 */ lwz r12, 0xb8(r12) /* 800BE0B4 000BB014 7D 89 03 A6 */ mtctr r12 -/* 800BE0B8 000BB018 4E 80 04 21 */ bctrl +/* 800BE0B8 000BB018 4E 80 04 21 */ bctrl /* 800BE0BC 000BB01C 3B 60 00 00 */ li r27, 0 lbl_800BE0C0: /* 800BE0C0 000BB020 2C 1B 00 02 */ cmpwi r27, 2 @@ -2200,7 +2200,7 @@ lbl_800BE0E8: /* 800BE0F0 000BB050 81 83 00 00 */ lwz r12, 0(r3) /* 800BE0F4 000BB054 81 8C 00 98 */ lwz r12, 0x98(r12) /* 800BE0F8 000BB058 7D 89 03 A6 */ mtctr r12 -/* 800BE0FC 000BB05C 4E 80 04 21 */ bctrl +/* 800BE0FC 000BB05C 4E 80 04 21 */ bctrl /* 800BE100 000BB060 EE 77 05 B2 */ fmuls f19, f23, f22 /* 800BE104 000BB064 D3 41 00 70 */ stfs f26, 0x70(r1) /* 800BE108 000BB068 EC 19 05 72 */ fmuls f0, f25, f21 @@ -2211,7 +2211,7 @@ lbl_800BE0E8: /* 800BE11C 000BB07C 81 83 00 00 */ lwz r12, 0(r3) /* 800BE120 000BB080 81 8C 00 A8 */ lwz r12, 0xa8(r12) /* 800BE124 000BB084 7D 89 03 A6 */ mtctr r12 -/* 800BE128 000BB088 4E 80 04 21 */ bctrl +/* 800BE128 000BB088 4E 80 04 21 */ bctrl /* 800BE12C 000BB08C EC 18 05 72 */ fmuls f0, f24, f21 /* 800BE130 000BB090 D2 61 00 60 */ stfs f19, 0x60(r1) /* 800BE134 000BB094 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) @@ -2221,7 +2221,7 @@ lbl_800BE0E8: /* 800BE144 000BB0A4 81 83 00 00 */ lwz r12, 0(r3) /* 800BE148 000BB0A8 81 8C 00 A8 */ lwz r12, 0xa8(r12) /* 800BE14C 000BB0AC 7D 89 03 A6 */ mtctr r12 -/* 800BE150 000BB0B0 4E 80 04 21 */ bctrl +/* 800BE150 000BB0B0 4E 80 04 21 */ bctrl /* 800BE154 000BB0B4 EC 18 05 B2 */ fmuls f0, f24, f22 /* 800BE158 000BB0B8 D3 41 00 58 */ stfs f26, 0x58(r1) /* 800BE15C 000BB0BC EE 77 05 72 */ fmuls f19, f23, f21 @@ -2232,7 +2232,7 @@ lbl_800BE0E8: /* 800BE170 000BB0D0 81 83 00 00 */ lwz r12, 0(r3) /* 800BE174 000BB0D4 81 8C 00 A8 */ lwz r12, 0xa8(r12) /* 800BE178 000BB0D8 7D 89 03 A6 */ mtctr r12 -/* 800BE17C 000BB0DC 4E 80 04 21 */ bctrl +/* 800BE17C 000BB0DC 4E 80 04 21 */ bctrl /* 800BE180 000BB0E0 EC 19 05 B2 */ fmuls f0, f25, f22 /* 800BE184 000BB0E4 D3 41 00 4C */ stfs f26, 0x4c(r1) /* 800BE188 000BB0E8 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) @@ -2242,12 +2242,12 @@ lbl_800BE0E8: /* 800BE198 000BB0F8 81 83 00 00 */ lwz r12, 0(r3) /* 800BE19C 000BB0FC 81 8C 00 A8 */ lwz r12, 0xa8(r12) /* 800BE1A0 000BB100 7D 89 03 A6 */ mtctr r12 -/* 800BE1A4 000BB104 4E 80 04 21 */ bctrl +/* 800BE1A4 000BB104 4E 80 04 21 */ bctrl /* 800BE1A8 000BB108 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 800BE1AC 000BB10C 81 83 00 00 */ lwz r12, 0(r3) /* 800BE1B0 000BB110 81 8C 00 B8 */ lwz r12, 0xb8(r12) /* 800BE1B4 000BB114 7D 89 03 A6 */ mtctr r12 -/* 800BE1B8 000BB118 4E 80 04 21 */ bctrl +/* 800BE1B8 000BB118 4E 80 04 21 */ bctrl /* 800BE1BC 000BB11C 3B 7B 00 01 */ addi r27, r27, 1 /* 800BE1C0 000BB120 2C 1B 00 04 */ cmpwi r27, 4 /* 800BE1C4 000BB124 41 80 FE FC */ blt lbl_800BE0C0 @@ -2288,7 +2288,7 @@ lbl_800BE1E0: /* 800BE24C 000BB1AC 80 01 05 44 */ lwz r0, 0x544(r1) /* 800BE250 000BB1B0 7C 08 03 A6 */ mtlr r0 /* 800BE254 000BB1B4 38 21 05 40 */ addi r1, r1, 0x540 -/* 800BE258 000BB1B8 4E 80 00 20 */ blr +/* 800BE258 000BB1B8 4E 80 00 20 */ blr .global DrawCurrLockOnGroup__22CCompoundTargetReticleCFRC9CMatrix3fRC13CStateManager DrawCurrLockOnGroup__22CCompoundTargetReticleCFRC9CMatrix3fRC13CStateManager: @@ -2585,7 +2585,7 @@ lbl_800BE5C0: /* 800BE6BC 000BB61C 81 83 00 00 */ lwz r12, 0(r3) /* 800BE6C0 000BB620 81 8C 00 30 */ lwz r12, 0x30(r12) /* 800BE6C4 000BB624 7D 89 03 A6 */ mtctr r12 -/* 800BE6C8 000BB628 4E 80 04 21 */ bctrl +/* 800BE6C8 000BB628 4E 80 04 21 */ bctrl /* 800BE6CC 000BB62C 88 75 01 4F */ lbz r3, 0x14f(r21) /* 800BE6D0 000BB630 3C 00 43 30 */ lis r0, 0x4330 /* 800BE6D4 000BB634 90 01 0B 10 */ stw r0, 0xb10(r1) @@ -2703,7 +2703,7 @@ lbl_800BE790: /* 800BE88C 000BB7EC 81 83 00 00 */ lwz r12, 0(r3) /* 800BE890 000BB7F0 81 8C 00 30 */ lwz r12, 0x30(r12) /* 800BE894 000BB7F4 7D 89 03 A6 */ mtctr r12 -/* 800BE898 000BB7F8 4E 80 04 21 */ bctrl +/* 800BE898 000BB7F8 4E 80 04 21 */ bctrl /* 800BE89C 000BB7FC 88 75 00 BB */ lbz r3, 0xbb(r21) /* 800BE8A0 000BB800 3C 00 43 30 */ lis r0, 0x4330 /* 800BE8A4 000BB804 90 01 0B 10 */ stw r0, 0xb10(r1) @@ -2872,7 +2872,7 @@ lbl_800BEA84: /* 800BEB14 000BBA74 81 83 00 00 */ lwz r12, 0(r3) /* 800BEB18 000BBA78 81 8C 00 30 */ lwz r12, 0x30(r12) /* 800BEB1C 000BBA7C 7D 89 03 A6 */ mtctr r12 -/* 800BEB20 000BBA80 4E 80 04 21 */ bctrl +/* 800BEB20 000BBA80 4E 80 04 21 */ bctrl /* 800BEB24 000BBA84 88 1C 00 CF */ lbz r0, 0xcf(r28) /* 800BEB28 000BBA88 93 41 0B 10 */ stw r26, 0xb10(r1) /* 800BEB2C 000BBA8C 90 01 0B 14 */ stw r0, 0xb14(r1) @@ -3001,7 +3001,7 @@ lbl_800BEC90: /* 800BED0C 000BBC6C 81 83 00 00 */ lwz r12, 0(r3) /* 800BED10 000BBC70 81 8C 00 30 */ lwz r12, 0x30(r12) /* 800BED14 000BBC74 7D 89 03 A6 */ mtctr r12 -/* 800BED18 000BBC78 4E 80 04 21 */ bctrl +/* 800BED18 000BBC78 4E 80 04 21 */ bctrl /* 800BED1C 000BBC7C 88 7C 00 F7 */ lbz r3, 0xf7(r28) /* 800BED20 000BBC80 3C 00 43 30 */ lis r0, 0x4330 /* 800BED24 000BBC84 90 01 0B 10 */ stw r0, 0xb10(r1) @@ -3163,7 +3163,7 @@ lbl_800BEEFC: /* 800BEF84 000BBEE4 81 83 00 00 */ lwz r12, 0(r3) /* 800BEF88 000BBEE8 81 8C 00 30 */ lwz r12, 0x30(r12) /* 800BEF8C 000BBEEC 7D 89 03 A6 */ mtctr r12 -/* 800BEF90 000BBEF0 4E 80 04 21 */ bctrl +/* 800BEF90 000BBEF0 4E 80 04 21 */ bctrl /* 800BEF94 000BBEF4 88 61 00 7F */ lbz r3, 0x7f(r1) /* 800BEF98 000BBEF8 3C 00 43 30 */ lis r0, 0x4330 /* 800BEF9C 000BBEFC 90 01 0B 10 */ stw r0, 0xb10(r1) @@ -3278,7 +3278,7 @@ lbl_800BF0C0: /* 800BF140 000BC0A0 81 83 00 00 */ lwz r12, 0(r3) /* 800BF144 000BC0A4 81 8C 00 30 */ lwz r12, 0x30(r12) /* 800BF148 000BC0A8 7D 89 03 A6 */ mtctr r12 -/* 800BF14C 000BC0AC 4E 80 04 21 */ bctrl +/* 800BF14C 000BC0AC 4E 80 04 21 */ bctrl /* 800BF150 000BC0B0 3A D6 00 01 */ addi r22, r22, 1 lbl_800BF154: /* 800BF154 000BC0B4 7C 16 A8 00 */ cmpw r22, r21 @@ -3386,7 +3386,7 @@ lbl_800BF1F8: /* 800BF2D4 000BC234 81 83 00 00 */ lwz r12, 0(r3) /* 800BF2D8 000BC238 81 8C 00 30 */ lwz r12, 0x30(r12) /* 800BF2DC 000BC23C 7D 89 03 A6 */ mtctr r12 -/* 800BF2E0 000BC240 4E 80 04 21 */ bctrl +/* 800BF2E0 000BC240 4E 80 04 21 */ bctrl /* 800BF2E4 000BC244 88 75 00 03 */ lbz r3, 3(r21) /* 800BF2E8 000BC248 3C 00 43 30 */ lis r0, 0x4330 /* 800BF2EC 000BC24C 90 01 0B 18 */ stw r0, 0xb18(r1) @@ -3509,7 +3509,7 @@ lbl_800BF3B0: /* 800BF4B8 000BC418 81 83 00 00 */ lwz r12, 0(r3) /* 800BF4BC 000BC41C 81 8C 00 30 */ lwz r12, 0x30(r12) /* 800BF4C0 000BC420 7D 89 03 A6 */ mtctr r12 -/* 800BF4C4 000BC424 4E 80 04 21 */ bctrl +/* 800BF4C4 000BC424 4E 80 04 21 */ bctrl /* 800BF4C8 000BC428 88 75 01 33 */ lbz r3, 0x133(r21) /* 800BF4CC 000BC42C 3C 00 43 30 */ lis r0, 0x4330 /* 800BF4D0 000BC430 EC 15 04 32 */ fmuls f0, f21, f16 @@ -3669,7 +3669,7 @@ lbl_800BF6B4: /* 800BF720 000BC680 81 83 00 00 */ lwz r12, 0(r3) /* 800BF724 000BC684 81 8C 00 30 */ lwz r12, 0x30(r12) /* 800BF728 000BC688 7D 89 03 A6 */ mtctr r12 -/* 800BF72C 000BC68C 4E 80 04 21 */ bctrl +/* 800BF72C 000BC68C 4E 80 04 21 */ bctrl /* 800BF730 000BC690 88 1D 01 3F */ lbz r0, 0x13f(r29) /* 800BF734 000BC694 93 41 0B 18 */ stw r26, 0xb18(r1) /* 800BF738 000BC698 90 01 0B 1C */ stw r0, 0xb1c(r1) @@ -3743,7 +3743,7 @@ lbl_800BF7B8: /* 800BF844 000BC7A4 80 01 0C 64 */ lwz r0, 0xc64(r1) /* 800BF848 000BC7A8 7C 08 03 A6 */ mtlr r0 /* 800BF84C 000BC7AC 38 21 0C 60 */ addi r1, r1, 0xc60 -/* 800BF850 000BC7B0 4E 80 00 20 */ blr +/* 800BF850 000BC7B0 4E 80 00 20 */ blr .global DrawGrapplePoint__22CCompoundTargetReticleFRC19CScriptGrapplePointRC13CStateManagerRC9CMatrix3fb DrawGrapplePoint__22CCompoundTargetReticleFRC19CScriptGrapplePointRC13CStateManagerRC9CMatrix3fb: @@ -3763,7 +3763,7 @@ DrawGrapplePoint__22CCompoundTargetReticleFRC19CScriptGrapplePointRC13CStateMana /* 800BF888 000BC7E8 7C FD 3B 78 */ mr r29, r7 /* 800BF88C 000BC7EC 38 61 00 28 */ addi r3, r1, 0x28 /* 800BF890 000BC7F0 7D 89 03 A6 */ mtctr r12 -/* 800BF894 000BC7F4 4E 80 04 21 */ bctrl +/* 800BF894 000BC7F4 4E 80 04 21 */ bctrl /* 800BF898 000BC7F8 88 1B 01 2C */ lbz r0, 0x12c(r27) /* 800BF89C 000BC7FC C0 41 00 28 */ lfs f2, 0x28(r1) /* 800BF8A0 000BC800 C0 21 00 2C */ lfs f1, 0x2c(r1) @@ -3831,7 +3831,7 @@ lbl_800BF8D0: /* 800BF990 000BC8F0 81 83 00 00 */ lwz r12, 0(r3) /* 800BF994 000BC8F4 81 8C 00 30 */ lwz r12, 0x30(r12) /* 800BF998 000BC8F8 7D 89 03 A6 */ mtctr r12 -/* 800BF99C 000BC8FC 4E 80 04 21 */ bctrl +/* 800BF99C 000BC8FC 4E 80 04 21 */ bctrl /* 800BF9A0 000BC900 38 A0 00 03 */ li r5, 3 /* 800BF9A4 000BC904 38 E0 00 07 */ li r7, 7 /* 800BF9A8 000BC908 38 C0 00 00 */ li r6, 0 @@ -3854,7 +3854,7 @@ lbl_800BF8D0: /* 800BF9EC 000BC94C 80 01 01 14 */ lwz r0, 0x114(r1) /* 800BF9F0 000BC950 7C 08 03 A6 */ mtlr r0 /* 800BF9F4 000BC954 38 21 01 10 */ addi r1, r1, 0x110 -/* 800BF9F8 000BC958 4E 80 00 20 */ blr +/* 800BF9F8 000BC958 4E 80 00 20 */ blr .global DrawGrappleGroup__22CCompoundTargetReticleCFRC9CMatrix3fRC13CStateManager DrawGrappleGroup__22CCompoundTargetReticleCFRC9CMatrix3fRC13CStateManager: @@ -4025,7 +4025,7 @@ lbl_800BFC40: /* 800BFC44 000BCBA4 80 01 00 54 */ lwz r0, 0x54(r1) /* 800BFC48 000BCBA8 7C 08 03 A6 */ mtlr r0 /* 800BFC4C 000BCBAC 38 21 00 50 */ addi r1, r1, 0x50 -/* 800BFC50 000BCBB0 4E 80 00 20 */ blr +/* 800BFC50 000BCBB0 4E 80 00 20 */ blr .global Draw__22CCompoundTargetReticleCFRC13CStateManager Draw__22CCompoundTargetReticleCFRC13CStateManager: @@ -4098,7 +4098,7 @@ lbl_800BFD44: /* 800BFD50 000BCCB0 83 A1 00 B4 */ lwz r29, 0xb4(r1) /* 800BFD54 000BCCB4 7C 08 03 A6 */ mtlr r0 /* 800BFD58 000BCCB8 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 800BFD5C 000BCCBC 4E 80 00 20 */ blr +/* 800BFD5C 000BCCBC 4E 80 00 20 */ blr .global UpdateOrbitZoneGroup__22CCompoundTargetReticleFfRC13CStateManager UpdateOrbitZoneGroup__22CCompoundTargetReticleFfRC13CStateManager: @@ -4186,7 +4186,7 @@ lbl_800BFE74: /* 800BFE78 000BCDD8 D0 03 01 E8 */ stfs f0, 0x1e8(r3) lbl_800BFE7C: /* 800BFE7C 000BCDDC 38 21 00 20 */ addi r1, r1, 0x20 -/* 800BFE80 000BCDE0 4E 80 00 20 */ blr +/* 800BFE80 000BCDE0 4E 80 00 20 */ blr .global UpdateNextLockOnGroup__22CCompoundTargetReticleFfRC13CStateManager UpdateNextLockOnGroup__22CCompoundTargetReticleFfRC13CStateManager: @@ -4423,7 +4423,7 @@ lbl_800C01D0: /* 800C01E0 000BD140 83 C1 00 78 */ lwz r30, 0x78(r1) /* 800C01E4 000BD144 7C 08 03 A6 */ mtlr r0 /* 800C01E8 000BD148 38 21 00 90 */ addi r1, r1, 0x90 -/* 800C01EC 000BD14C 4E 80 00 20 */ blr +/* 800C01EC 000BD14C 4E 80 00 20 */ blr .global UpdateCurrLockOnGroup__22CCompoundTargetReticleFfRC13CStateManager UpdateCurrLockOnGroup__22CCompoundTargetReticleFfRC13CStateManager: @@ -4908,7 +4908,7 @@ lbl_800C08B4: /* 800C08C8 000BD828 83 A1 00 94 */ lwz r29, 0x94(r1) /* 800C08CC 000BD82C 7C 08 03 A6 */ mtlr r0 /* 800C08D0 000BD830 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 800C08D4 000BD834 4E 80 00 20 */ blr +/* 800C08D4 000BD834 4E 80 00 20 */ blr .global Update__22CCompoundTargetReticleFfRC13CStateManager Update__22CCompoundTargetReticleFfRC13CStateManager: @@ -5633,7 +5633,7 @@ lbl_800C12A0: /* 800C12B8 000BE218 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 800C12BC 000BE21C 7C 08 03 A6 */ mtlr r0 /* 800C12C0 000BE220 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 800C12C4 000BE224 4E 80 00 20 */ blr +/* 800C12C4 000BE224 4E 80 00 20 */ blr .global GetDesiredReticleState__22CCompoundTargetReticleCFRC13CStateManager GetDesiredReticleState__22CCompoundTargetReticleCFRC13CStateManager: @@ -5653,24 +5653,24 @@ lbl_800C12F0: /* 800C12F8 000BE258 48 00 00 1C */ b lbl_800C1314 lbl_800C12FC: /* 800C12FC 000BE25C 38 60 00 01 */ li r3, 1 -/* 800C1300 000BE260 4E 80 00 20 */ blr +/* 800C1300 000BE260 4E 80 00 20 */ blr lbl_800C1304: /* 800C1304 000BE264 38 60 00 02 */ li r3, 2 -/* 800C1308 000BE268 4E 80 00 20 */ blr +/* 800C1308 000BE268 4E 80 00 20 */ blr lbl_800C130C: /* 800C130C 000BE26C 38 60 00 00 */ li r3, 0 -/* 800C1310 000BE270 4E 80 00 20 */ blr +/* 800C1310 000BE270 4E 80 00 20 */ blr lbl_800C1314: /* 800C1314 000BE274 38 60 00 03 */ li r3, 3 -/* 800C1318 000BE278 4E 80 00 20 */ blr +/* 800C1318 000BE278 4E 80 00 20 */ blr lbl_800C131C: /* 800C131C 000BE27C 38 60 00 00 */ li r3, 0 -/* 800C1320 000BE280 4E 80 00 20 */ blr +/* 800C1320 000BE280 4E 80 00 20 */ blr .global CheckLoadComplete__22CCompoundTargetReticleFv CheckLoadComplete__22CCompoundTargetReticleFv: /* 800C1324 000BE284 38 60 00 01 */ li r3, 1 -/* 800C1328 000BE288 4E 80 00 20 */ blr +/* 800C1328 000BE288 4E 80 00 20 */ blr .global __ct__22CCompoundTargetReticleFRC13CStateManager __ct__22CCompoundTargetReticleFRC13CStateManager: @@ -5731,7 +5731,7 @@ __ct__22CCompoundTargetReticleFRC13CStateManager: /* 800C1404 000BE364 81 84 00 00 */ lwz r12, 0(r4) /* 800C1408 000BE368 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800C140C 000BE36C 7D 89 03 A6 */ mtctr r12 -/* 800C1410 000BE370 4E 80 04 21 */ bctrl +/* 800C1410 000BE370 4E 80 04 21 */ bctrl /* 800C1414 000BE374 3B 7D 00 34 */ addi r27, r29, 0x34 /* 800C1418 000BE378 38 81 00 60 */ addi r4, r1, 0x60 /* 800C141C 000BE37C 7F 63 DB 78 */ mr r3, r27 @@ -5747,7 +5747,7 @@ __ct__22CCompoundTargetReticleFRC13CStateManager: /* 800C1444 000BE3A4 81 84 00 00 */ lwz r12, 0(r4) /* 800C1448 000BE3A8 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800C144C 000BE3AC 7D 89 03 A6 */ mtctr r12 -/* 800C1450 000BE3B0 4E 80 04 21 */ bctrl +/* 800C1450 000BE3B0 4E 80 04 21 */ bctrl /* 800C1454 000BE3B4 3B 7D 00 40 */ addi r27, r29, 0x40 /* 800C1458 000BE3B8 38 81 00 58 */ addi r4, r1, 0x58 /* 800C145C 000BE3BC 7F 63 DB 78 */ mr r3, r27 @@ -5763,7 +5763,7 @@ __ct__22CCompoundTargetReticleFRC13CStateManager: /* 800C1484 000BE3E4 81 84 00 00 */ lwz r12, 0(r4) /* 800C1488 000BE3E8 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800C148C 000BE3EC 7D 89 03 A6 */ mtctr r12 -/* 800C1490 000BE3F0 4E 80 04 21 */ bctrl +/* 800C1490 000BE3F0 4E 80 04 21 */ bctrl /* 800C1494 000BE3F4 3B 7D 00 4C */ addi r27, r29, 0x4c /* 800C1498 000BE3F8 38 81 00 50 */ addi r4, r1, 0x50 /* 800C149C 000BE3FC 7F 63 DB 78 */ mr r3, r27 @@ -5779,7 +5779,7 @@ __ct__22CCompoundTargetReticleFRC13CStateManager: /* 800C14C4 000BE424 81 84 00 00 */ lwz r12, 0(r4) /* 800C14C8 000BE428 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800C14CC 000BE42C 7D 89 03 A6 */ mtctr r12 -/* 800C14D0 000BE430 4E 80 04 21 */ bctrl +/* 800C14D0 000BE430 4E 80 04 21 */ bctrl /* 800C14D4 000BE434 3B 7D 00 58 */ addi r27, r29, 0x58 /* 800C14D8 000BE438 38 81 00 48 */ addi r4, r1, 0x48 /* 800C14DC 000BE43C 7F 63 DB 78 */ mr r3, r27 @@ -5795,7 +5795,7 @@ __ct__22CCompoundTargetReticleFRC13CStateManager: /* 800C1504 000BE464 81 84 00 00 */ lwz r12, 0(r4) /* 800C1508 000BE468 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800C150C 000BE46C 7D 89 03 A6 */ mtctr r12 -/* 800C1510 000BE470 4E 80 04 21 */ bctrl +/* 800C1510 000BE470 4E 80 04 21 */ bctrl /* 800C1514 000BE474 3B 7D 00 64 */ addi r27, r29, 0x64 /* 800C1518 000BE478 38 81 00 40 */ addi r4, r1, 0x40 /* 800C151C 000BE47C 7F 63 DB 78 */ mr r3, r27 @@ -5811,7 +5811,7 @@ __ct__22CCompoundTargetReticleFRC13CStateManager: /* 800C1544 000BE4A4 81 84 00 00 */ lwz r12, 0(r4) /* 800C1548 000BE4A8 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800C154C 000BE4AC 7D 89 03 A6 */ mtctr r12 -/* 800C1550 000BE4B0 4E 80 04 21 */ bctrl +/* 800C1550 000BE4B0 4E 80 04 21 */ bctrl /* 800C1554 000BE4B4 3B 7D 00 70 */ addi r27, r29, 0x70 /* 800C1558 000BE4B8 38 81 00 38 */ addi r4, r1, 0x38 /* 800C155C 000BE4BC 7F 63 DB 78 */ mr r3, r27 @@ -5827,7 +5827,7 @@ __ct__22CCompoundTargetReticleFRC13CStateManager: /* 800C1584 000BE4E4 81 84 00 00 */ lwz r12, 0(r4) /* 800C1588 000BE4E8 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800C158C 000BE4EC 7D 89 03 A6 */ mtctr r12 -/* 800C1590 000BE4F0 4E 80 04 21 */ bctrl +/* 800C1590 000BE4F0 4E 80 04 21 */ bctrl /* 800C1594 000BE4F4 3B 7D 00 7C */ addi r27, r29, 0x7c /* 800C1598 000BE4F8 38 81 00 30 */ addi r4, r1, 0x30 /* 800C159C 000BE4FC 7F 63 DB 78 */ mr r3, r27 @@ -5843,7 +5843,7 @@ __ct__22CCompoundTargetReticleFRC13CStateManager: /* 800C15C4 000BE524 81 84 00 00 */ lwz r12, 0(r4) /* 800C15C8 000BE528 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800C15CC 000BE52C 7D 89 03 A6 */ mtctr r12 -/* 800C15D0 000BE530 4E 80 04 21 */ bctrl +/* 800C15D0 000BE530 4E 80 04 21 */ bctrl /* 800C15D4 000BE534 3B 7D 00 88 */ addi r27, r29, 0x88 /* 800C15D8 000BE538 38 81 00 28 */ addi r4, r1, 0x28 /* 800C15DC 000BE53C 7F 63 DB 78 */ mr r3, r27 @@ -5859,7 +5859,7 @@ __ct__22CCompoundTargetReticleFRC13CStateManager: /* 800C1604 000BE564 81 84 00 00 */ lwz r12, 0(r4) /* 800C1608 000BE568 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800C160C 000BE56C 7D 89 03 A6 */ mtctr r12 -/* 800C1610 000BE570 4E 80 04 21 */ bctrl +/* 800C1610 000BE570 4E 80 04 21 */ bctrl /* 800C1614 000BE574 3B 7D 00 94 */ addi r27, r29, 0x94 /* 800C1618 000BE578 38 81 00 20 */ addi r4, r1, 0x20 /* 800C161C 000BE57C 7F 63 DB 78 */ mr r3, r27 @@ -5875,7 +5875,7 @@ __ct__22CCompoundTargetReticleFRC13CStateManager: /* 800C1644 000BE5A4 81 84 00 00 */ lwz r12, 0(r4) /* 800C1648 000BE5A8 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800C164C 000BE5AC 7D 89 03 A6 */ mtctr r12 -/* 800C1650 000BE5B0 4E 80 04 21 */ bctrl +/* 800C1650 000BE5B0 4E 80 04 21 */ bctrl /* 800C1654 000BE5B4 3B 7D 00 A0 */ addi r27, r29, 0xa0 /* 800C1658 000BE5B8 38 81 00 18 */ addi r4, r1, 0x18 /* 800C165C 000BE5BC 7F 63 DB 78 */ mr r3, r27 @@ -5891,7 +5891,7 @@ __ct__22CCompoundTargetReticleFRC13CStateManager: /* 800C1684 000BE5E4 81 84 00 00 */ lwz r12, 0(r4) /* 800C1688 000BE5E8 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800C168C 000BE5EC 7D 89 03 A6 */ mtctr r12 -/* 800C1690 000BE5F0 4E 80 04 21 */ bctrl +/* 800C1690 000BE5F0 4E 80 04 21 */ bctrl /* 800C1694 000BE5F4 3B 7D 00 AC */ addi r27, r29, 0xac /* 800C1698 000BE5F8 38 81 00 10 */ addi r4, r1, 0x10 /* 800C169C 000BE5FC 7F 63 DB 78 */ mr r3, r27 @@ -5907,7 +5907,7 @@ __ct__22CCompoundTargetReticleFRC13CStateManager: /* 800C16C4 000BE624 81 84 00 00 */ lwz r12, 0(r4) /* 800C16C8 000BE628 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800C16CC 000BE62C 7D 89 03 A6 */ mtctr r12 -/* 800C16D0 000BE630 4E 80 04 21 */ bctrl +/* 800C16D0 000BE630 4E 80 04 21 */ bctrl /* 800C16D4 000BE634 3B 7D 00 B8 */ addi r27, r29, 0xb8 /* 800C16D8 000BE638 38 81 00 08 */ addi r4, r1, 8 /* 800C16DC 000BE63C 7F 63 DB 78 */ mr r3, r27 @@ -6140,7 +6140,7 @@ lbl_800C1A24: /* 800C1A58 000BE9B8 80 01 01 24 */ lwz r0, 0x124(r1) /* 800C1A5C 000BE9BC 7C 08 03 A6 */ mtlr r0 /* 800C1A60 000BE9C0 38 21 01 20 */ addi r1, r1, 0x120 -/* 800C1A64 000BE9C4 4E 80 00 20 */ blr +/* 800C1A64 000BE9C4 4E 80 00 20 */ blr .global __ct__Q222CCompoundTargetReticle14SOuterItemInfoFPCc __ct__Q222CCompoundTargetReticle14SOuterItemInfoFPCc: @@ -6155,7 +6155,7 @@ __ct__Q222CCompoundTargetReticle14SOuterItemInfoFPCc: /* 800C1A88 000BE9E8 81 84 00 00 */ lwz r12, 0(r4) /* 800C1A8C 000BE9EC 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800C1A90 000BE9F0 7D 89 03 A6 */ mtctr r12 -/* 800C1A94 000BE9F4 4E 80 04 21 */ bctrl +/* 800C1A94 000BE9F4 4E 80 04 21 */ bctrl /* 800C1A98 000BE9F8 7F E3 FB 78 */ mr r3, r31 /* 800C1A9C 000BE9FC 38 81 00 08 */ addi r4, r1, 8 /* 800C1AA0 000BEA00 48 27 F4 09 */ bl __ct__6CTokenFRC6CToken @@ -6174,7 +6174,7 @@ __ct__Q222CCompoundTargetReticle14SOuterItemInfoFPCc: /* 800C1AD4 000BEA34 80 01 00 24 */ lwz r0, 0x24(r1) /* 800C1AD8 000BEA38 7C 08 03 A6 */ mtlr r0 /* 800C1ADC 000BEA3C 38 21 00 20 */ addi r1, r1, 0x20 -/* 800C1AE0 000BEA40 4E 80 00 20 */ blr +/* 800C1AE0 000BEA40 4E 80 00 20 */ blr .global calculate_premultiplied_overshoot_offset__Ff calculate_premultiplied_overshoot_offset__Ff: @@ -6192,7 +6192,7 @@ calculate_premultiplied_overshoot_offset__Ff: /* 800C1B10 000BEA70 80 01 00 14 */ lwz r0, 0x14(r1) /* 800C1B14 000BEA74 7C 08 03 A6 */ mtlr r0 /* 800C1B18 000BEA78 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C1B1C 000BEA7C 4E 80 00 20 */ blr +/* 800C1B1C 000BEA7C 4E 80 00 20 */ blr .global offshoot_func__Ffff offshoot_func__Ffff: @@ -6213,7 +6213,7 @@ offshoot_func__Ffff: /* 800C1B58 000BEAB8 CB E1 00 10 */ lfd f31, 0x10(r1) /* 800C1B5C 000BEABC 7C 08 03 A6 */ mtlr r0 /* 800C1B60 000BEAC0 38 21 00 20 */ addi r1, r1, 0x20 -/* 800C1B64 000BEAC4 4E 80 00 20 */ blr +/* 800C1B64 000BEAC4 4E 80 00 20 */ blr .global IsDamageOrbit__F19EPlayerOrbitRequest IsDamageOrbit__F19EPlayerOrbitRequest: @@ -6227,10 +6227,10 @@ lbl_800C1B7C: /* 800C1B80 000BEAE0 40 80 00 0C */ bge lbl_800C1B8C lbl_800C1B84: /* 800C1B84 000BEAE4 38 60 00 01 */ li r3, 1 -/* 800C1B88 000BEAE8 4E 80 00 20 */ blr +/* 800C1B88 000BEAE8 4E 80 00 20 */ blr lbl_800C1B8C: /* 800C1B8C 000BEAEC 38 60 00 00 */ li r3, 0 -/* 800C1B90 000BEAF0 4E 80 00 20 */ blr +/* 800C1B90 000BEAF0 4E 80 00 20 */ blr .global "reserve__Q24rstl77vectorFi" "reserve__Q24rstl77vectorFi": @@ -6318,7 +6318,7 @@ lbl_800C1CAC: /* 800C1CB0 000BEC10 80 01 00 34 */ lwz r0, 0x34(r1) /* 800C1CB4 000BEC14 7C 08 03 A6 */ mtlr r0 /* 800C1CB8 000BEC18 38 21 00 30 */ addi r1, r1, 0x30 -/* 800C1CBC 000BEC1C 4E 80 00 20 */ blr +/* 800C1CBC 000BEC1C 4E 80 00 20 */ blr .global __sinit_CTargetReticles_cpp __sinit_CTargetReticles_cpp: @@ -6347,4 +6347,4 @@ __sinit_CTargetReticles_cpp: /* 800C1D18 000BEC78 80 01 00 24 */ lwz r0, 0x24(r1) /* 800C1D1C 000BEC7C 7C 08 03 A6 */ mtlr r0 /* 800C1D20 000BEC80 38 21 00 20 */ addi r1, r1, 0x20 -/* 800C1D24 000BEC84 4E 80 00 20 */ blr +/* 800C1D24 000BEC84 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/CTransitionDatabaseGame.s b/asm/MetroidPrime/CTransitionDatabaseGame.s index 3b824bd0..557a5880 100644 --- a/asm/MetroidPrime/CTransitionDatabaseGame.s +++ b/asm/MetroidPrime/CTransitionDatabaseGame.s @@ -153,7 +153,7 @@ lbl_8006E2F4: /* 8006E2F8 0006B258 83 E1 00 6C */ lwz r31, 0x6c(r1) /* 8006E2FC 0006B25C 7C 08 03 A6 */ mtlr r0 /* 8006E300 0006B260 38 21 00 70 */ addi r1, r1, 0x70 -/* 8006E304 0006B264 4E 80 00 20 */ blr +/* 8006E304 0006B264 4E 80 00 20 */ blr .global "__ct__23CTransitionDatabaseGameFRCQ24rstl48vector<11CTransition,Q24rstl17rmemory_allocator>RCQ24rstl52vector<15CHalfTransition,Q24rstl17rmemory_allocator>RCQ24rstl20rc_ptr<10IMetaTrans>" "__ct__23CTransitionDatabaseGameFRCQ24rstl48vector<11CTransition,Q24rstl17rmemory_allocator>RCQ24rstl52vector<15CHalfTransition,Q24rstl17rmemory_allocator>RCQ24rstl20rc_ptr<10IMetaTrans>": @@ -354,7 +354,7 @@ lbl_8006E58C: /* 8006E5E0 0006B540 80 01 00 84 */ lwz r0, 0x84(r1) /* 8006E5E4 0006B544 7C 08 03 A6 */ mtlr r0 /* 8006E5E8 0006B548 38 21 00 80 */ addi r1, r1, 0x80 -/* 8006E5EC 0006B54C 4E 80 00 20 */ blr +/* 8006E5EC 0006B54C 4E 80 00 20 */ blr .global sub_8006e5f0 sub_8006e5f0: @@ -518,7 +518,7 @@ lbl_8006E830: /* 8006E834 0006B794 80 01 00 74 */ lwz r0, 0x74(r1) /* 8006E838 0006B798 7C 08 03 A6 */ mtlr r0 /* 8006E83C 0006B79C 38 21 00 70 */ addi r1, r1, 0x70 -/* 8006E840 0006B7A0 4E 80 00 20 */ blr +/* 8006E840 0006B7A0 4E 80 00 20 */ blr .global sub_8006e844 sub_8006e844: @@ -590,7 +590,7 @@ lbl_8006E92C: /* 8006E93C 0006B89C 83 81 00 20 */ lwz r28, 0x20(r1) /* 8006E940 0006B8A0 7C 08 03 A6 */ mtlr r0 /* 8006E944 0006B8A4 38 21 00 30 */ addi r1, r1, 0x30 -/* 8006E948 0006B8A8 4E 80 00 20 */ blr +/* 8006E948 0006B8A8 4E 80 00 20 */ blr .global sub_8006e94c sub_8006e94c: @@ -717,7 +717,7 @@ lbl_8006EB08: /* 8006EB0C 0006BA6C 80 01 00 64 */ lwz r0, 0x64(r1) /* 8006EB10 0006BA70 7C 08 03 A6 */ mtlr r0 /* 8006EB14 0006BA74 38 21 00 60 */ addi r1, r1, 0x60 -/* 8006EB18 0006BA78 4E 80 00 20 */ blr +/* 8006EB18 0006BA78 4E 80 00 20 */ blr .global sub_8006eb1c sub_8006eb1c: @@ -783,7 +783,7 @@ lbl_8006EBEC: /* 8006EBFC 0006BB5C 83 81 00 10 */ lwz r28, 0x10(r1) /* 8006EC00 0006BB60 7C 08 03 A6 */ mtlr r0 /* 8006EC04 0006BB64 38 21 00 20 */ addi r1, r1, 0x20 -/* 8006EC08 0006BB68 4E 80 00 20 */ blr +/* 8006EC08 0006BB68 4E 80 00 20 */ blr .global "lower_bound,Q24rstl20rc_ptr<10IMetaTrans>>,Q24rstl100vector,Q24rstl20rc_ptr<10IMetaTrans>>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,Q24rstl11pair,Q24rstl142pair_sorter_finder,Q24rstl20rc_ptr<10IMetaTrans>>,Q237@unnamed@CTransitionDatabaseGame_cpp@13uint_comparer>>__4rstlFQ24rstl227const_pointer_iterator,Q24rstl20r" "lower_bound,Q24rstl20rc_ptr<10IMetaTrans>>,Q24rstl100vector,Q24rstl20rc_ptr<10IMetaTrans>>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,Q24rstl11pair,Q24rstl142pair_sorter_finder,Q24rstl20rc_ptr<10IMetaTrans>>,Q237@unnamed@CTransitionDatabaseGame_cpp@13uint_comparer>>__4rstlFQ24rstl227const_pointer_iterator,Q24rstl20r": @@ -852,7 +852,7 @@ lbl_8006ECDC: /* 8006ECF0 0006BC50 80 01 00 34 */ lwz r0, 0x34(r1) /* 8006ECF4 0006BC54 7C 08 03 A6 */ mtlr r0 /* 8006ECF8 0006BC58 38 21 00 30 */ addi r1, r1, 0x30 -/* 8006ECFC 0006BC5C 4E 80 00 20 */ blr +/* 8006ECFC 0006BC5C 4E 80 00 20 */ blr .global "lower_bound>,Q24rstl82vector>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,Ui,Q24rstl124pair_sorter_finder>,Q237@unnamed@CTransitionDatabaseGame_cpp@13uint_comparer>>__4rstlFQ24rstl190const_pointer_iterator>,Q24rstl82vector>,Q24rst" "lower_bound>,Q24rstl82vector>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,Ui,Q24rstl124pair_sorter_finder>,Q237@unnamed@CTransitionDatabaseGame_cpp@13uint_comparer>>__4rstlFQ24rstl190const_pointer_iterator>,Q24rstl82vector>,Q24rst": @@ -906,7 +906,7 @@ lbl_8006ED9C: /* 8006EDB0 0006BD10 80 01 00 34 */ lwz r0, 0x34(r1) /* 8006EDB4 0006BD14 7C 08 03 A6 */ mtlr r0 /* 8006EDB8 0006BD18 38 21 00 30 */ addi r1, r1, 0x30 -/* 8006EDBC 0006BD1C 4E 80 00 20 */ blr +/* 8006EDBC 0006BD1C 4E 80 00 20 */ blr .global "reserve__Q24rstl100vector,Q24rstl20rc_ptr<10IMetaTrans>>,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl100vector,Q24rstl20rc_ptr<10IMetaTrans>>,Q24rstl17rmemory_allocator>Fi": @@ -989,7 +989,7 @@ lbl_8006EEC4: /* 8006EEC8 0006BE28 80 01 00 34 */ lwz r0, 0x34(r1) /* 8006EECC 0006BE2C 7C 08 03 A6 */ mtlr r0 /* 8006EED0 0006BE30 38 21 00 30 */ addi r1, r1, 0x30 -/* 8006EED4 0006BE34 4E 80 00 20 */ blr +/* 8006EED4 0006BE34 4E 80 00 20 */ blr .global "reserve__Q24rstl82vector>,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl82vector>,Q24rstl17rmemory_allocator>Fi": @@ -1069,7 +1069,7 @@ lbl_8006EFD0: /* 8006EFD4 0006BF34 80 01 00 34 */ lwz r0, 0x34(r1) /* 8006EFD8 0006BF38 7C 08 03 A6 */ mtlr r0 /* 8006EFDC 0006BF3C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8006EFE0 0006BF40 4E 80 00 20 */ blr +/* 8006EFE0 0006BF40 4E 80 00 20 */ blr .global "advance,Q24rstl20rc_ptr<10IMetaTrans>>,Q24rstl100vector,Q24rstl20rc_ptr<10IMetaTrans>>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,i>__4rstlFRQ24rstl227const_pointer_iterator,Q24rstl20rc_ptr<10IMetaTrans>>,Q24rstl100vector,Q24rstl20rc_ptr<10IMetaTrans>>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>i" "advance,Q24rstl20rc_ptr<10IMetaTrans>>,Q24rstl100vector,Q24rstl20rc_ptr<10IMetaTrans>>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,i>__4rstlFRQ24rstl227const_pointer_iterator,Q24rstl20rc_ptr<10IMetaTrans>>,Q24rstl100vector,Q24rstl20rc_ptr<10IMetaTrans>>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>i": @@ -1083,7 +1083,7 @@ lbl_8006EFD0: /* 8006F000 0006BF60 80 01 00 14 */ lwz r0, 0x14(r1) /* 8006F004 0006BF64 7C 08 03 A6 */ mtlr r0 /* 8006F008 0006BF68 38 21 00 10 */ addi r1, r1, 0x10 -/* 8006F00C 0006BF6C 4E 80 00 20 */ blr +/* 8006F00C 0006BF6C 4E 80 00 20 */ blr .global "advance>,Q24rstl82vector>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,i>__4rstlFRQ24rstl190const_pointer_iterator>,Q24rstl82vector>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>i" "advance>,Q24rstl82vector>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,i>__4rstlFRQ24rstl190const_pointer_iterator>,Q24rstl82vector>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>i": @@ -1097,7 +1097,7 @@ lbl_8006EFD0: /* 8006F02C 0006BF8C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8006F030 0006BF90 7C 08 03 A6 */ mtlr r0 /* 8006F034 0006BF94 38 21 00 10 */ addi r1, r1, 0x10 -/* 8006F038 0006BF98 4E 80 00 20 */ blr +/* 8006F038 0006BF98 4E 80 00 20 */ blr .global sub_8006f03c sub_8006f03c: @@ -1105,7 +1105,7 @@ sub_8006f03c: /* 8006F040 0006BFA0 54 80 18 38 */ slwi r0, r4, 3 /* 8006F044 0006BFA4 7C 05 02 14 */ add r0, r5, r0 /* 8006F048 0006BFA8 90 03 00 00 */ stw r0, 0(r3) -/* 8006F04C 0006BFAC 4E 80 00 20 */ blr +/* 8006F04C 0006BFAC 4E 80 00 20 */ blr .global "__advance,Q24rstl20rc_ptr<10IMetaTrans>>,Q24rstl100vector,Q24rstl20rc_ptr<10IMetaTrans>>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,i>__4rstlFRQ24rstl227const_pointer_iterator,Q24rstl20rc_ptr<10IMetaTrans>>,Q24rstl100vector,Q24rstl20rc_ptr<10IMetaTrans>>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>iQ24rstl26rand" "__advance,Q24rstl20rc_ptr<10IMetaTrans>>,Q24rstl100vector,Q24rstl20rc_ptr<10IMetaTrans>>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,i>__4rstlFRQ24rstl227const_pointer_iterator,Q24rstl20rc_ptr<10IMetaTrans>>,Q24rstl100vector,Q24rstl20rc_ptr<10IMetaTrans>>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>iQ24rstl26rand": @@ -1113,7 +1113,7 @@ sub_8006f03c: /* 8006F054 0006BFB4 80 83 00 00 */ lwz r4, 0(r3) /* 8006F058 0006BFB8 7C 04 02 14 */ add r0, r4, r0 /* 8006F05C 0006BFBC 90 03 00 00 */ stw r0, 0(r3) -/* 8006F060 0006BFC0 4E 80 00 20 */ blr +/* 8006F060 0006BFC0 4E 80 00 20 */ blr .global "distance,Q24rstl20rc_ptr<10IMetaTrans>>,Q24rstl100vector,Q24rstl20rc_ptr<10IMetaTrans>>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl227const_pointer_iterator,Q24rstl20rc_ptr<10IMetaTrans>>,Q24rstl100vector,Q24rstl20rc_ptr<10IMetaTrans>>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl227const_po" "distance,Q24rstl20rc_ptr<10IMetaTrans>>,Q24rstl100vector,Q24rstl20rc_ptr<10IMetaTrans>>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl227const_pointer_iterator,Q24rstl20rc_ptr<10IMetaTrans>>,Q24rstl100vector,Q24rstl20rc_ptr<10IMetaTrans>>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl227const_po": @@ -1133,7 +1133,7 @@ sub_8006f03c: /* 8006F098 0006BFF8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8006F09C 0006BFFC 7C 08 03 A6 */ mtlr r0 /* 8006F0A0 0006C000 38 21 00 20 */ addi r1, r1, 0x20 -/* 8006F0A4 0006C004 4E 80 00 20 */ blr +/* 8006F0A4 0006C004 4E 80 00 20 */ blr .global "distance>,Q24rstl82vector>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl190const_pointer_iterator>,Q24rstl82vector>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl190const_pointer_iterator>,Q24rstl82ve" "distance>,Q24rstl82vector>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl190const_pointer_iterator>,Q24rstl82vector>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl190const_pointer_iterator>,Q24rstl82ve": @@ -1153,7 +1153,7 @@ sub_8006f03c: /* 8006F0DC 0006C03C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8006F0E0 0006C040 7C 08 03 A6 */ mtlr r0 /* 8006F0E4 0006C044 38 21 00 20 */ addi r1, r1, 0x20 -/* 8006F0E8 0006C048 4E 80 00 20 */ blr +/* 8006F0E8 0006C048 4E 80 00 20 */ blr .global "__distance,Q24rstl20rc_ptr<10IMetaTrans>>,Q24rstl100vector,Q24rstl20rc_ptr<10IMetaTrans>>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl227const_pointer_iterator,Q24rstl20rc_ptr<10IMetaTrans>>,Q24rstl100vector,Q24rstl20rc_ptr<10IMetaTrans>>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl227const_" "__distance,Q24rstl20rc_ptr<10IMetaTrans>>,Q24rstl100vector,Q24rstl20rc_ptr<10IMetaTrans>>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl227const_pointer_iterator,Q24rstl20rc_ptr<10IMetaTrans>>,Q24rstl100vector,Q24rstl20rc_ptr<10IMetaTrans>>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl227const_": @@ -1166,7 +1166,7 @@ sub_8006f03c: /* 8006F104 0006C064 7C 00 0E 70 */ srawi r0, r0, 1 /* 8006F108 0006C068 54 03 0F FE */ srwi r3, r0, 0x1f /* 8006F10C 0006C06C 7C 60 1A 14 */ add r3, r0, r3 -/* 8006F110 0006C070 4E 80 00 20 */ blr +/* 8006F110 0006C070 4E 80 00 20 */ blr .global "__distance>,Q24rstl82vector>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl190const_pointer_iterator>,Q24rstl82vector>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl190const_pointer_iterator>,Q24rstl82" "__distance>,Q24rstl82vector>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl190const_pointer_iterator>,Q24rstl82vector>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl190const_pointer_iterator>,Q24rstl82": @@ -1175,7 +1175,7 @@ sub_8006f03c: /* 8006F11C 0006C07C 7C 03 00 50 */ subf r0, r3, r0 /* 8006F120 0006C080 7C 00 1E 70 */ srawi r0, r0, 3 /* 8006F124 0006C084 7C 60 01 94 */ addze r3, r0 -/* 8006F128 0006C088 4E 80 00 20 */ blr +/* 8006F128 0006C088 4E 80 00 20 */ blr .global sub_8006f12c sub_8006f12c: @@ -1281,7 +1281,7 @@ lbl_8006F290: /* 8006F2A0 0006C200 83 81 00 10 */ lwz r28, 0x10(r1) /* 8006F2A4 0006C204 7C 08 03 A6 */ mtlr r0 /* 8006F2A8 0006C208 38 21 00 20 */ addi r1, r1, 0x20 -/* 8006F2AC 0006C20C 4E 80 00 20 */ blr +/* 8006F2AC 0006C20C 4E 80 00 20 */ blr .global sub_8006f2b0 sub_8006f2b0: @@ -1342,7 +1342,7 @@ lbl_8006F370: /* 8006F37C 0006C2DC 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8006F380 0006C2E0 7C 08 03 A6 */ mtlr r0 /* 8006F384 0006C2E4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8006F388 0006C2E8 4E 80 00 20 */ blr +/* 8006F388 0006C2E8 4E 80 00 20 */ blr .global sub_8006f38c sub_8006f38c: @@ -1507,7 +1507,7 @@ lbl_8006F5C4: /* 8006F5D4 0006C534 83 81 00 20 */ lwz r28, 0x20(r1) /* 8006F5D8 0006C538 7C 08 03 A6 */ mtlr r0 /* 8006F5DC 0006C53C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8006F5E0 0006C540 4E 80 00 20 */ blr +/* 8006F5E0 0006C540 4E 80 00 20 */ blr .global sub_8006f5e4 sub_8006f5e4: @@ -1574,7 +1574,7 @@ lbl_8006F6BC: /* 8006F6C8 0006C628 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8006F6CC 0006C62C 7C 08 03 A6 */ mtlr r0 /* 8006F6D0 0006C630 38 21 00 30 */ addi r1, r1, 0x30 -/* 8006F6D4 0006C634 4E 80 00 20 */ blr +/* 8006F6D4 0006C634 4E 80 00 20 */ blr .global sub_8006f6d8 sub_8006f6d8: @@ -1655,7 +1655,7 @@ lbl_8006F7D0: /* 8006F7E0 0006C740 80 01 00 34 */ lwz r0, 0x34(r1) /* 8006F7E4 0006C744 7C 08 03 A6 */ mtlr r0 /* 8006F7E8 0006C748 38 21 00 30 */ addi r1, r1, 0x30 -/* 8006F7EC 0006C74C 4E 80 00 20 */ blr +/* 8006F7EC 0006C74C 4E 80 00 20 */ blr .global "__insertion_sort,Q24rstl20rc_ptr<10IMetaTrans>>,Q24rstl100vector,Q24rstl20rc_ptr<10IMetaTrans>>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,Q24rstl142pair_sorter_finder,Q24rstl20rc_ptr<10IMetaTrans>>,Q237@unnamed@CTransitionDatabaseGame_cpp@13uint_comparer>>__4rstlFQ24rstl221pointer_iterator,Q24rstl20rc_ptr<10IMetaTrans>>,Q24rstl" "__insertion_sort,Q24rstl20rc_ptr<10IMetaTrans>>,Q24rstl100vector,Q24rstl20rc_ptr<10IMetaTrans>>,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,Q24rstl142pair_sorter_finder,Q24rstl20rc_ptr<10IMetaTrans>>,Q237@unnamed@CTransitionDatabaseGame_cpp@13uint_comparer>>__4rstlFQ24rstl221pointer_iterator,Q24rstl20rc_ptr<10IMetaTrans>>,Q24rstl": @@ -1757,4 +1757,4 @@ lbl_8006F934: /* 8006F944 0006C8A4 80 01 00 34 */ lwz r0, 0x34(r1) /* 8006F948 0006C8A8 7C 08 03 A6 */ mtlr r0 /* 8006F94C 0006C8AC 38 21 00 30 */ addi r1, r1, 0x30 -/* 8006F950 0006C8B0 4E 80 00 20 */ blr +/* 8006F950 0006C8B0 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/CVisorFlare.s b/asm/MetroidPrime/CVisorFlare.s index 67503120..5ea76d2a 100644 --- a/asm/MetroidPrime/CVisorFlare.s +++ b/asm/MetroidPrime/CVisorFlare.s @@ -50,7 +50,7 @@ lbl_80207624: /* 80207624 00204584 80 01 00 14 */ lwz r0, 0x14(r1) /* 80207628 00204588 7C 08 03 A6 */ mtlr r0 /* 8020762C 0020458C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80207630 00204590 4E 80 00 20 */ blr +/* 80207630 00204590 4E 80 00 20 */ blr .global sub_80207634 sub_80207634: @@ -164,14 +164,14 @@ lbl_802077C8: /* 802077CC 0020472C 81 83 00 00 */ lwz r12, 0(r3) /* 802077D0 00204730 81 8C 00 64 */ lwz r12, 0x64(r12) /* 802077D4 00204734 7D 89 03 A6 */ mtctr r12 -/* 802077D8 00204738 4E 80 04 21 */ bctrl +/* 802077D8 00204738 4E 80 04 21 */ bctrl /* 802077DC 0020473C 48 00 00 18 */ b lbl_802077F4 lbl_802077E0: /* 802077E0 00204740 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 802077E4 00204744 81 83 00 00 */ lwz r12, 0(r3) /* 802077E8 00204748 81 8C 00 68 */ lwz r12, 0x68(r12) /* 802077EC 0020474C 7D 89 03 A6 */ mtctr r12 -/* 802077F0 00204750 4E 80 04 21 */ bctrl +/* 802077F0 00204750 4E 80 04 21 */ bctrl lbl_802077F4: /* 802077F4 00204754 3C 80 80 5A */ lis r4, lbl_805A5EBC@ha /* 802077F8 00204758 38 60 00 00 */ li r3, 0 @@ -185,7 +185,7 @@ lbl_80207810: /* 80207814 00204774 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80207818 00204778 7C 08 03 A6 */ mtlr r0 /* 8020781C 0020477C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80207820 00204780 4E 80 00 20 */ blr +/* 80207820 00204780 4E 80 00 20 */ blr .global sub_80207824 sub_80207824: @@ -270,7 +270,7 @@ sub_80207824: /* 8020795C 002048BC 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80207960 002048C0 7C 08 03 A6 */ mtlr r0 /* 80207964 002048C4 38 21 00 60 */ addi r1, r1, 0x60 -/* 80207968 002048C8 4E 80 00 20 */ blr +/* 80207968 002048C8 4E 80 00 20 */ blr .global sub_8020796c sub_8020796c: @@ -342,7 +342,7 @@ sub_8020796c: /* 80207A70 002049D0 CB C1 00 10 */ lfd f30, 0x10(r1) /* 80207A74 002049D4 7C 08 03 A6 */ mtlr r0 /* 80207A78 002049D8 38 21 00 30 */ addi r1, r1, 0x30 -/* 80207A7C 002049DC 4E 80 00 20 */ blr +/* 80207A7C 002049DC 4E 80 00 20 */ blr .global Render__11CVisorFlareCFRC9CVector3fRC13CStateManager Render__11CVisorFlareCFRC9CVector3fRC13CStateManager: @@ -413,7 +413,7 @@ lbl_80207B60: /* 80207B70 00204AD0 81 83 00 00 */ lwz r12, 0(r3) /* 80207B74 00204AD4 81 8C 00 60 */ lwz r12, 0x60(r12) /* 80207B78 00204AD8 7D 89 03 A6 */ mtctr r12 -/* 80207B7C 00204ADC 4E 80 04 21 */ bctrl +/* 80207B7C 00204ADC 4E 80 04 21 */ bctrl /* 80207B80 00204AE0 80 7F 08 70 */ lwz r3, 0x870(r31) /* 80207B84 00204AE4 7F E4 FB 78 */ mr r4, r31 /* 80207B88 00204AE8 4B E0 3F 91 */ bl GetCurrentCamera__14CCameraManagerCFR13CStateManager @@ -558,7 +558,7 @@ lbl_80207D40: /* 80207DA8 00204D08 81 83 00 00 */ lwz r12, 0(r3) /* 80207DAC 00204D0C 81 8C 00 30 */ lwz r12, 0x30(r12) /* 80207DB0 00204D10 7D 89 03 A6 */ mtctr r12 -/* 80207DB4 00204D14 4E 80 04 21 */ bctrl +/* 80207DB4 00204D14 4E 80 04 21 */ bctrl /* 80207DB8 00204D18 C0 1E 00 24 */ lfs f0, 0x24(r30) /* 80207DBC 00204D1C 88 1E 00 14 */ lbz r0, 0x14(r30) /* 80207DC0 00204D20 EC 3F 00 32 */ fmuls f1, f31, f0 @@ -670,7 +670,7 @@ lbl_80207EFC: /* 80207F48 00204EA8 80 01 02 14 */ lwz r0, 0x214(r1) /* 80207F4C 00204EAC 7C 08 03 A6 */ mtlr r0 /* 80207F50 00204EB0 38 21 02 10 */ addi r1, r1, 0x210 -/* 80207F54 00204EB4 4E 80 00 20 */ blr +/* 80207F54 00204EB4 4E 80 00 20 */ blr .global Update__11CVisorFlareFfRC9CVector3fPC6CActorR13CStateManager Update__11CVisorFlareFfRC9CVector3fPC6CActorR13CStateManager: @@ -911,7 +911,7 @@ lbl_802082AC: /* 802082C8 00205228 80 01 09 24 */ lwz r0, 0x924(r1) /* 802082CC 0020522C 7C 08 03 A6 */ mtlr r0 /* 802082D0 00205230 38 21 09 20 */ addi r1, r1, 0x920 -/* 802082D4 00205234 4E 80 00 20 */ blr +/* 802082D4 00205234 4E 80 00 20 */ blr .global "__ct__11CVisorFlareFQ211CVisorFlare10EBlendModebfffRCQ24rstl60vector" "__ct__11CVisorFlareFQ211CVisorFlare10EBlendModebfffRCQ24rstl60vector": @@ -968,7 +968,7 @@ lbl_80208350: /* 80208398 002052F8 83 81 00 10 */ lwz r28, 0x10(r1) /* 8020839C 002052FC 7C 08 03 A6 */ mtlr r0 /* 802083A0 00205300 38 21 00 40 */ addi r1, r1, 0x40 -/* 802083A4 00205304 4E 80 00 20 */ blr +/* 802083A4 00205304 4E 80 00 20 */ blr .global "__ct__Q211CVisorFlare9CFlareDefFRC17TToken<8CTexture>ffUi" "__ct__Q211CVisorFlare9CFlareDefFRC17TToken<8CTexture>ffUi": diff --git a/asm/MetroidPrime/CWeaponMgr.s b/asm/MetroidPrime/CWeaponMgr.s index 1fd0ad8c..436395fc 100644 --- a/asm/MetroidPrime/CWeaponMgr.s +++ b/asm/MetroidPrime/CWeaponMgr.s @@ -85,7 +85,7 @@ lbl_800C1DDC: /* 800C1DDC 000BED3C 38 60 00 00 */ li r3, 0 lbl_800C1DE0: /* 800C1DE0 000BED40 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C1DE4 000BED44 4E 80 00 20 */ blr +/* 800C1DE4 000BED44 4E 80 00 20 */ blr .global DecrCount__10CWeaponMgrF9TUniqueId11EWeaponType DecrCount__10CWeaponMgrF9TUniqueId11EWeaponType: @@ -176,7 +176,7 @@ lbl_800C1EFC: /* 800C1EFC 000BEE5C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800C1F00 000BEE60 7C 08 03 A6 */ mtlr r0 /* 800C1F04 000BEE64 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C1F08 000BEE68 4E 80 00 20 */ blr +/* 800C1F08 000BEE68 4E 80 00 20 */ blr .global IncrCount__10CWeaponMgrF9TUniqueId11EWeaponType IncrCount__10CWeaponMgrF9TUniqueId11EWeaponType: @@ -362,7 +362,7 @@ lbl_800C2160: /* 800C2164 000BF0C4 83 E1 00 AC */ lwz r31, 0xac(r1) /* 800C2168 000BF0C8 7C 08 03 A6 */ mtlr r0 /* 800C216C 000BF0CC 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 800C2170 000BF0D0 4E 80 00 20 */ blr +/* 800C2170 000BF0D0 4E 80 00 20 */ blr .global Remove__10CWeaponMgrF9TUniqueId Remove__10CWeaponMgrF9TUniqueId: @@ -468,7 +468,7 @@ lbl_800C22C0: /* 800C22C4 000BF224 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 800C22C8 000BF228 7C 08 03 A6 */ mtlr r0 /* 800C22CC 000BF22C 38 21 00 30 */ addi r1, r1, 0x30 -/* 800C22D0 000BF230 4E 80 00 20 */ blr +/* 800C22D0 000BF230 4E 80 00 20 */ blr .global __ct__10CWeaponMgrFv __ct__10CWeaponMgrFv: @@ -483,7 +483,7 @@ __ct__10CWeaponMgrFv: /* 800C22F4 000BF254 90 03 00 0C */ stw r0, 0xc(r3) /* 800C22F8 000BF258 90 03 00 10 */ stw r0, 0x10(r3) /* 800C22FC 000BF25C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C2300 000BF260 4E 80 00 20 */ blr +/* 800C2300 000BF260 4E 80 00 20 */ blr .global sub_800c2304 sub_800c2304: @@ -494,7 +494,7 @@ sub_800c2304: /* 800C2314 000BF274 80 01 00 14 */ lwz r0, 0x14(r1) /* 800C2318 000BF278 7C 08 03 A6 */ mtlr r0 /* 800C231C 000BF27C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C2320 000BF280 4E 80 00 20 */ blr +/* 800C2320 000BF280 4E 80 00 20 */ blr .global sub_800c2324 sub_800c2324: @@ -693,4 +693,4 @@ lbl_800C25DC: /* 800C25E0 000BF540 80 01 00 24 */ lwz r0, 0x24(r1) /* 800C25E4 000BF544 7C 08 03 A6 */ mtlr r0 /* 800C25E8 000BF548 38 21 00 20 */ addi r1, r1, 0x20 -/* 800C25EC 000BF54C 4E 80 00 20 */ blr +/* 800C25EC 000BF54C 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/CWorld.s b/asm/MetroidPrime/CWorld.s index cca6b7e0..c3552fa3 100644 --- a/asm/MetroidPrime/CWorld.s +++ b/asm/MetroidPrime/CWorld.s @@ -106,7 +106,7 @@ lbl_80055D94: /* 80055D98 00052CF8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80055D9C 00052CFC 7C 08 03 A6 */ mtlr r0 /* 80055DA0 00052D00 38 21 00 10 */ addi r1, r1, 0x10 -/* 80055DA4 00052D04 4E 80 00 20 */ blr +/* 80055DA4 00052D04 4E 80 00 20 */ blr .global StopSounds__6CWorldFv StopSounds__6CWorldFv: @@ -162,7 +162,7 @@ lbl_80055E40: /* 80055E54 00052DB4 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80055E58 00052DB8 7C 08 03 A6 */ mtlr r0 /* 80055E5C 00052DBC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80055E60 00052DC0 4E 80 00 20 */ blr +/* 80055E60 00052DC0 4E 80 00 20 */ blr .global StopSound__6CWorldFs StopSound__6CWorldFs: @@ -228,13 +228,13 @@ lbl_80055F20: .global sub_80055f38 sub_80055f38: -/* 80055F38 00052E98 4E 80 00 20 */ blr +/* 80055F38 00052E98 4E 80 00 20 */ blr .global AddGlobalSound__6CWorldFUs10CSfxHandle AddGlobalSound__6CWorldFUs10CSfxHandle: /* 80055F3C 00052E9C 80 03 00 C8 */ lwz r0, 0xc8(r3) /* 80055F40 00052EA0 2C 00 00 0A */ cmpwi r0, 0xa -/* 80055F44 00052EA4 4C 80 00 20 */ bgelr +/* 80055F44 00052EA4 4C 80 00 20 */ bgelr /* 80055F48 00052EA8 54 00 18 38 */ slwi r0, r0, 3 /* 80055F4C 00052EAC 80 C5 00 00 */ lwz r6, 0(r5) /* 80055F50 00052EB0 7C A3 02 14 */ add r5, r3, r0 @@ -247,7 +247,7 @@ lbl_80055F68: /* 80055F68 00052EC8 80 83 00 C8 */ lwz r4, 0xc8(r3) /* 80055F6C 00052ECC 38 04 00 01 */ addi r0, r4, 1 /* 80055F70 00052ED0 90 03 00 C8 */ stw r0, 0xc8(r3) -/* 80055F74 00052ED4 4E 80 00 20 */ blr +/* 80055F74 00052ED4 4E 80 00 20 */ blr .global IsPlayingSound__6CWorldCFUi IsPlayingSound__6CWorldCFUi: @@ -262,14 +262,14 @@ lbl_80055F90: /* 80055F94 00052EF4 7C 03 00 40 */ cmplw r3, r0 /* 80055F98 00052EF8 40 82 00 0C */ bne lbl_80055FA4 /* 80055F9C 00052EFC 38 60 00 01 */ li r3, 1 -/* 80055FA0 00052F00 4E 80 00 20 */ blr +/* 80055FA0 00052F00 4E 80 00 20 */ blr lbl_80055FA4: /* 80055FA4 00052F04 38 C6 00 08 */ addi r6, r6, 8 lbl_80055FA8: /* 80055FA8 00052F08 7C 06 20 40 */ cmplw r6, r4 /* 80055FAC 00052F0C 40 82 FF E4 */ bne lbl_80055F90 /* 80055FB0 00052F10 38 60 00 00 */ li r3, 0 -/* 80055FB4 00052F14 4E 80 00 20 */ blr +/* 80055FB4 00052F14 4E 80 00 20 */ blr .global MoveAreaToChain3__6CWorldF7TAreaId MoveAreaToChain3__6CWorldF7TAreaId: @@ -287,7 +287,7 @@ MoveAreaToChain3__6CWorldF7TAreaId: /* 80055FE4 00052F44 80 01 00 14 */ lwz r0, 0x14(r1) /* 80055FE8 00052F48 7C 08 03 A6 */ mtlr r0 /* 80055FEC 00052F4C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80055FF0 00052F50 4E 80 00 20 */ blr +/* 80055FF0 00052F50 4E 80 00 20 */ blr .global SetLoadPauseState__6CWorldFb SetLoadPauseState__6CWorldFb: @@ -319,7 +319,7 @@ lbl_8005602C: /* 80056050 00052FB0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80056054 00052FB4 7C 08 03 A6 */ mtlr r0 /* 80056058 00052FB8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8005605C 00052FBC 4E 80 00 20 */ blr +/* 8005605C 00052FBC 4E 80 00 20 */ blr .global sub_80056060 sub_80056060: @@ -352,7 +352,7 @@ lbl_800560B4: lbl_800560C0: /* 800560C0 00053020 91 03 00 00 */ stw r8, 0(r3) /* 800560C4 00053024 38 21 00 10 */ addi r1, r1, 0x10 -/* 800560C8 00053028 4E 80 00 20 */ blr +/* 800560C8 00053028 4E 80 00 20 */ blr .global IGetAreaId__6CWorldCF7TAreaId IGetAreaId__6CWorldCF7TAreaId: @@ -366,7 +366,7 @@ IGetAreaId__6CWorldCF7TAreaId: /* 800560E8 00053048 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800560EC 0005304C 7C 08 03 A6 */ mtlr r0 /* 800560F0 00053050 38 21 00 10 */ addi r1, r1, 0x10 -/* 800560F4 00053054 4E 80 00 20 */ blr +/* 800560F4 00053054 4E 80 00 20 */ blr .global sub_800560f8 sub_800560f8: @@ -399,7 +399,7 @@ lbl_8005614C: lbl_80056158: /* 80056158 000530B8 91 03 00 00 */ stw r8, 0(r3) /* 8005615C 000530BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80056160 000530C0 4E 80 00 20 */ blr +/* 80056160 000530C0 4E 80 00 20 */ blr .global AreSkyNeedsMet__6CWorldCFv AreSkyNeedsMet__6CWorldCFv: @@ -433,7 +433,7 @@ lbl_800561C0: /* 800561C0 00053120 80 01 00 14 */ lwz r0, 0x14(r1) /* 800561C4 00053124 7C 08 03 A6 */ mtlr r0 /* 800561C8 00053128 38 21 00 10 */ addi r1, r1, 0x10 -/* 800561CC 0005312C 4E 80 00 20 */ blr +/* 800561CC 0005312C 4E 80 00 20 */ blr .global DrawSky__6CWorldCFRC12CTransform4f DrawSky__6CWorldCFRC12CTransform4f: @@ -460,14 +460,14 @@ lbl_80056204: /* 8005621C 0005317C 81 83 00 00 */ lwz r12, 0(r3) /* 80056220 00053180 81 8C 00 30 */ lwz r12, 0x30(r12) /* 80056224 00053184 7D 89 03 A6 */ mtctr r12 -/* 80056228 00053188 4E 80 04 21 */ bctrl +/* 80056228 00053188 4E 80 04 21 */ bctrl /* 8005622C 0005318C 48 2F 3D 81 */ bl White__6CColorFv /* 80056230 00053190 7C 64 1B 78 */ mr r4, r3 /* 80056234 00053194 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 80056238 00053198 81 83 00 00 */ lwz r12, 0(r3) /* 8005623C 0005319C 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 80056240 000531A0 7D 89 03 A6 */ mtctr r12 -/* 80056244 000531A4 4E 80 04 21 */ bctrl +/* 80056244 000531A4 4E 80 04 21 */ bctrl /* 80056248 000531A8 C0 22 86 90 */ lfs f1, lbl_805AA3B0@sda21(r2) /* 8005624C 000531AC C0 42 86 94 */ lfs f2, lbl_805AA3B4@sda21(r2) /* 80056250 000531B0 48 2B 41 91 */ bl SetDepthRange__9CGraphicsFff @@ -512,7 +512,7 @@ lbl_800562D8: /* 800562E0 00053240 83 C1 00 18 */ lwz r30, 0x18(r1) /* 800562E4 00053244 7C 08 03 A6 */ mtlr r0 /* 800562E8 00053248 38 21 00 20 */ addi r1, r1, 0x20 -/* 800562EC 0005324C 4E 80 00 20 */ blr +/* 800562EC 0005324C 4E 80 00 20 */ blr .global PreRender__6CWorldFv PreRender__6CWorldFv: @@ -534,7 +534,7 @@ lbl_80056314: /* 80056324 00053284 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80056328 00053288 7C 08 03 A6 */ mtlr r0 /* 8005632C 0005328C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80056330 00053290 4E 80 00 20 */ blr +/* 80056330 00053290 4E 80 00 20 */ blr .global Update__6CWorldFf Update__6CWorldFf: @@ -621,7 +621,7 @@ lbl_800563F8: /* 80056458 000533B8 81 84 00 00 */ lwz r12, 0(r4) /* 8005645C 000533BC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80056460 000533C0 7D 89 03 A6 */ mtctr r12 -/* 80056464 000533C4 4E 80 04 21 */ bctrl +/* 80056464 000533C4 4E 80 04 21 */ bctrl /* 80056468 000533C8 3B 41 00 54 */ addi r26, r1, 0x54 /* 8005646C 000533CC 38 81 00 08 */ addi r4, r1, 8 /* 80056470 000533D0 7F 43 D3 78 */ mr r3, r26 @@ -945,7 +945,7 @@ lbl_800568E0: /* 800568E8 00053848 80 01 00 84 */ lwz r0, 0x84(r1) /* 800568EC 0005384C 7C 08 03 A6 */ mtlr r0 /* 800568F0 00053850 38 21 00 80 */ addi r1, r1, 0x80 -/* 800568F4 00053854 4E 80 00 20 */ blr +/* 800568F4 00053854 4E 80 00 20 */ blr .global TouchSky__6CWorldCFv TouchSky__6CWorldCFv: @@ -972,12 +972,12 @@ lbl_8005693C: /* 80056940 000538A0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80056944 000538A4 7C 08 03 A6 */ mtlr r0 /* 80056948 000538A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8005694C 000538AC 4E 80 00 20 */ blr +/* 8005694C 000538AC 4E 80 00 20 */ blr .global IGetAreaCount__11CDummyWorldFv IGetAreaCount__11CDummyWorldFv: /* 80056950 000538B0 80 63 00 1C */ lwz r3, 0x1c(r3) -/* 80056954 000538B4 4E 80 00 20 */ blr +/* 80056954 000538B4 4E 80 00 20 */ blr .global IGetDefaultAudioTrack__11CDummyWorldCFv IGetDefaultAudioTrack__11CDummyWorldCFv: @@ -993,7 +993,7 @@ IGetDefaultAudioTrack__11CDummyWorldCFv: /* 8005697C 000538DC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80056980 000538E0 7C 08 03 A6 */ mtlr r0 /* 80056984 000538E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80056988 000538E8 4E 80 00 20 */ blr +/* 80056988 000538E8 4E 80 00 20 */ blr .global IGetAreaId__11CDummyWorldCF7TAreaId IGetAreaId__11CDummyWorldCF7TAreaId: @@ -1018,11 +1018,11 @@ lbl_800569C0: /* 800569D0 00053930 93 C1 00 08 */ stw r30, 8(r1) /* 800569D4 00053934 81 8C 00 20 */ lwz r12, 0x20(r12) /* 800569D8 00053938 7D 89 03 A6 */ mtctr r12 -/* 800569DC 0005393C 4E 80 04 21 */ bctrl +/* 800569DC 0005393C 4E 80 04 21 */ bctrl /* 800569E0 00053940 81 83 00 00 */ lwz r12, 0(r3) /* 800569E4 00053944 81 8C 00 20 */ lwz r12, 0x20(r12) /* 800569E8 00053948 7D 89 03 A6 */ mtctr r12 -/* 800569EC 0005394C 4E 80 04 21 */ bctrl +/* 800569EC 0005394C 4E 80 04 21 */ bctrl /* 800569F0 00053950 7C 1D 18 40 */ cmplw r29, r3 /* 800569F4 00053954 40 82 00 0C */ bne lbl_80056A00 /* 800569F8 00053958 93 DB 00 00 */ stw r30, 0(r27) @@ -1040,13 +1040,13 @@ lbl_80056A14: /* 80056A18 00053978 80 01 00 34 */ lwz r0, 0x34(r1) /* 80056A1C 0005397C 7C 08 03 A6 */ mtlr r0 /* 80056A20 00053980 38 21 00 30 */ addi r1, r1, 0x30 -/* 80056A24 00053984 4E 80 00 20 */ blr +/* 80056A24 00053984 4E 80 00 20 */ blr .global IGetCurrentAreaId__11CDummyWorldCFv IGetCurrentAreaId__11CDummyWorldCFv: /* 80056A28 00053988 80 04 00 3C */ lwz r0, 0x3c(r4) /* 80056A2C 0005398C 90 03 00 00 */ stw r0, 0(r3) -/* 80056A30 00053990 4E 80 00 20 */ blr +/* 80056A30 00053990 4E 80 00 20 */ blr .global IGetAreaAlways__11CDummyWorldCF7TAreaId IGetAreaAlways__11CDummyWorldCF7TAreaId: @@ -1055,34 +1055,34 @@ IGetAreaAlways__11CDummyWorldCF7TAreaId: /* 80056A3C 0005399C 54 03 18 38 */ slwi r3, r0, 3 /* 80056A40 000539A0 38 03 00 04 */ addi r0, r3, 4 /* 80056A44 000539A4 7C 64 00 2E */ lwzx r3, r4, r0 -/* 80056A48 000539A8 4E 80 00 20 */ blr +/* 80056A48 000539A8 4E 80 00 20 */ blr .global IMapWorld__11CDummyWorldFv IMapWorld__11CDummyWorldFv: /* 80056A4C 000539AC 80 63 00 2C */ lwz r3, 0x2c(r3) /* 80056A50 000539B0 80 63 00 08 */ lwz r3, 8(r3) -/* 80056A54 000539B4 4E 80 00 20 */ blr +/* 80056A54 000539B4 4E 80 00 20 */ blr .global IGetMapWorld__11CDummyWorldCFv IGetMapWorld__11CDummyWorldCFv: /* 80056A58 000539B8 80 63 00 2C */ lwz r3, 0x2c(r3) /* 80056A5C 000539BC 80 63 00 08 */ lwz r3, 8(r3) -/* 80056A60 000539C0 4E 80 00 20 */ blr +/* 80056A60 000539C0 4E 80 00 20 */ blr .global IGetStringTableAssetId__11CDummyWorldCFv IGetStringTableAssetId__11CDummyWorldCFv: /* 80056A64 000539C4 80 63 00 10 */ lwz r3, 0x10(r3) -/* 80056A68 000539C8 4E 80 00 20 */ blr +/* 80056A68 000539C8 4E 80 00 20 */ blr .global IGetSaveWorldAssetId__11CDummyWorldCFv IGetSaveWorldAssetId__11CDummyWorldCFv: /* 80056A6C 000539CC 80 63 00 14 */ lwz r3, 0x14(r3) -/* 80056A70 000539D0 4E 80 00 20 */ blr +/* 80056A70 000539D0 4E 80 00 20 */ blr .global IGetWorldAssetId__11CDummyWorldCFv IGetWorldAssetId__11CDummyWorldCFv: /* 80056A74 000539D4 80 63 00 0C */ lwz r3, 0xc(r3) -/* 80056A78 000539D8 4E 80 00 20 */ blr +/* 80056A78 000539D8 4E 80 00 20 */ blr .global ICheckWorldComplete__11CDummyWorldFv ICheckWorldComplete__11CDummyWorldFv: @@ -1108,7 +1108,7 @@ lbl_80056ABC: /* 80056AC0 00053A20 81 83 00 00 */ lwz r12, 0(r3) /* 80056AC4 00053A24 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80056AC8 00053A28 7D 89 03 A6 */ mtctr r12 -/* 80056ACC 00053A2C 4E 80 04 21 */ bctrl +/* 80056ACC 00053A2C 4E 80 04 21 */ bctrl /* 80056AD0 00053A30 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80056AD4 00053A34 40 82 00 0C */ bne lbl_80056AE0 /* 80056AD8 00053A38 38 60 00 00 */ li r3, 0 @@ -1229,7 +1229,7 @@ lbl_80056C50: /* 80056C78 00053BD8 38 80 00 01 */ li r4, 1 /* 80056C7C 00053BDC 81 8C 00 08 */ lwz r12, 8(r12) /* 80056C80 00053BE0 7D 89 03 A6 */ mtctr r12 -/* 80056C84 00053BE4 4E 80 04 21 */ bctrl +/* 80056C84 00053BE4 4E 80 04 21 */ bctrl lbl_80056C88: /* 80056C88 00053BE8 3B 9C 00 01 */ addi r28, r28, 1 lbl_80056C8C: @@ -1261,7 +1261,7 @@ lbl_80056C8C: /* 80056CF0 00053C50 81 84 00 00 */ lwz r12, 0(r4) /* 80056CF4 00053C54 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80056CF8 00053C58 7D 89 03 A6 */ mtctr r12 -/* 80056CFC 00053C5C 4E 80 04 21 */ bctrl +/* 80056CFC 00053C5C 4E 80 04 21 */ bctrl /* 80056D00 00053C60 7F 83 E3 78 */ mr r3, r28 /* 80056D04 00053C64 38 81 00 20 */ addi r4, r1, 0x20 /* 80056D08 00053C68 3B E0 00 01 */ li r31, 1 @@ -1331,7 +1331,7 @@ lbl_80056DC4: /* 80056DE4 00053D44 38 80 00 01 */ li r4, 1 /* 80056DE8 00053D48 81 8C 00 08 */ lwz r12, 8(r12) /* 80056DEC 00053D4C 7D 89 03 A6 */ mtctr r12 -/* 80056DF0 00053D50 4E 80 04 21 */ bctrl +/* 80056DF0 00053D50 4E 80 04 21 */ bctrl lbl_80056DF4: /* 80056DF4 00053D54 38 00 00 00 */ li r0, 0 /* 80056DF8 00053D58 90 1B 00 30 */ stw r0, 0x30(r27) @@ -1394,7 +1394,7 @@ lbl_80056EC0: /* 80056EC4 00053E24 81 9B 00 00 */ lwz r12, 0(r27) /* 80056EC8 00053E28 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80056ECC 00053E2C 7D 89 03 A6 */ mtctr r12 -/* 80056ED0 00053E30 4E 80 04 21 */ bctrl +/* 80056ED0 00053E30 4E 80 04 21 */ bctrl /* 80056ED4 00053E34 7F 64 DB 78 */ mr r4, r27 /* 80056ED8 00053E38 38 A0 00 00 */ li r5, 0 /* 80056EDC 00053E3C 38 C0 27 0F */ li r6, 0x270f @@ -1422,7 +1422,7 @@ lbl_80056F1C: /* 80056F20 00053E80 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 80056F24 00053E84 7C 08 03 A6 */ mtlr r0 /* 80056F28 00053E88 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 80056F2C 00053E8C 4E 80 00 20 */ blr +/* 80056F2C 00053E8C 4E 80 00 20 */ blr .global __dt__14CDummyGameAreaFv __dt__14CDummyGameAreaFv: @@ -1475,7 +1475,7 @@ lbl_80056FCC: /* 80056FD8 00053F38 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80056FDC 00053F3C 7C 08 03 A6 */ mtlr r0 /* 80056FE0 00053F40 38 21 00 20 */ addi r1, r1, 0x20 -/* 80056FE4 00053F44 4E 80 00 20 */ blr +/* 80056FE4 00053F44 4E 80 00 20 */ blr .global sub_80056fe8 sub_80056fe8: @@ -1515,7 +1515,7 @@ lbl_80057058: /* 80057064 00053FC4 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80057068 00053FC8 7C 08 03 A6 */ mtlr r0 /* 8005706C 00053FCC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80057070 00053FD0 4E 80 00 20 */ blr +/* 80057070 00053FD0 4E 80 00 20 */ blr .global sub_80057074 sub_80057074: @@ -1540,7 +1540,7 @@ lbl_800570A0: /* 800570B4 00054014 83 C1 00 08 */ lwz r30, 8(r1) /* 800570B8 00054018 7C 08 03 A6 */ mtlr r0 /* 800570BC 0005401C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800570C0 00054020 4E 80 00 20 */ blr +/* 800570C0 00054020 4E 80 00 20 */ blr .global sub_800570c4 sub_800570c4: @@ -1552,7 +1552,7 @@ sub_800570c4: /* 800570D8 00054038 80 01 00 14 */ lwz r0, 0x14(r1) /* 800570DC 0005403C 7C 08 03 A6 */ mtlr r0 /* 800570E0 00054040 38 21 00 10 */ addi r1, r1, 0x10 -/* 800570E4 00054044 4E 80 00 20 */ blr +/* 800570E4 00054044 4E 80 00 20 */ blr .global sub_800570e8 sub_800570e8: @@ -1624,7 +1624,7 @@ lbl_800571BC: /* 800571C8 00054128 83 C1 00 18 */ lwz r30, 0x18(r1) /* 800571CC 0005412C 7C 08 03 A6 */ mtlr r0 /* 800571D0 00054130 38 21 00 20 */ addi r1, r1, 0x20 -/* 800571D4 00054134 4E 80 00 20 */ blr +/* 800571D4 00054134 4E 80 00 20 */ blr .global "LoadRelays__FR12CInputStreamRQ24rstl44vector" "LoadRelays__FR12CInputStreamRQ24rstl44vector": @@ -1694,7 +1694,7 @@ lbl_800572A4: /* 800572C0 00054220 83 81 00 20 */ lwz r28, 0x20(r1) /* 800572C4 00054224 7C 08 03 A6 */ mtlr r0 /* 800572C8 00054228 38 21 00 30 */ addi r1, r1, 0x30 -/* 800572CC 0005422C 4E 80 00 20 */ blr +/* 800572CC 0005422C 4E 80 00 20 */ blr .global __dt__11CDummyWorldFv __dt__11CDummyWorldFv: @@ -1724,7 +1724,7 @@ lbl_80057310: /* 80057328 00054288 38 80 00 01 */ li r4, 1 /* 8005732C 0005428C 81 8C 00 08 */ lwz r12, 8(r12) /* 80057330 00054290 7D 89 03 A6 */ mtctr r12 -/* 80057334 00054294 4E 80 04 21 */ bctrl +/* 80057334 00054294 4E 80 04 21 */ bctrl lbl_80057338: /* 80057338 00054298 34 1D 00 2C */ addic. r0, r29, 0x2c /* 8005733C 0005429C 41 82 00 28 */ beq lbl_80057364 @@ -1757,7 +1757,7 @@ lbl_8005738C: /* 8005739C 000542FC 83 A1 00 14 */ lwz r29, 0x14(r1) /* 800573A0 00054300 7C 08 03 A6 */ mtlr r0 /* 800573A4 00054304 38 21 00 20 */ addi r1, r1, 0x20 -/* 800573A8 00054308 4E 80 00 20 */ blr +/* 800573A8 00054308 4E 80 00 20 */ blr .global sub_800573ac sub_800573ac: @@ -1793,7 +1793,7 @@ lbl_800573F8: /* 8005741C 0005437C 38 80 00 01 */ li r4, 1 /* 80057420 00054380 81 8C 00 08 */ lwz r12, 8(r12) /* 80057424 00054384 7D 89 03 A6 */ mtctr r12 -/* 80057428 00054388 4E 80 04 21 */ bctrl +/* 80057428 00054388 4E 80 04 21 */ bctrl lbl_8005742C: /* 8005742C 0005438C 3B DE 00 08 */ addi r30, r30, 8 lbl_80057430: @@ -1817,7 +1817,7 @@ lbl_80057458: /* 8005746C 000543CC 83 81 00 20 */ lwz r28, 0x20(r1) /* 80057470 000543D0 7C 08 03 A6 */ mtlr r0 /* 80057474 000543D4 38 21 00 30 */ addi r1, r1, 0x30 -/* 80057478 000543D8 4E 80 00 20 */ blr +/* 80057478 000543D8 4E 80 00 20 */ blr .global __ct__11CDummyWorldFUi __ct__11CDummyWorldFUi: @@ -1890,7 +1890,7 @@ __ct__11CDummyWorldFUi: /* 80057584 000544E4 81 83 00 00 */ lwz r12, 0(r3) /* 80057588 000544E8 81 8C 00 08 */ lwz r12, 8(r12) /* 8005758C 000544EC 7D 89 03 A6 */ mtctr r12 -/* 80057590 000544F0 4E 80 04 21 */ bctrl +/* 80057590 000544F0 4E 80 04 21 */ bctrl lbl_80057594: /* 80057594 000544F4 93 DF 00 30 */ stw r30, 0x30(r31) /* 80057598 000544F8 7F E3 FB 78 */ mr r3, r31 @@ -1899,12 +1899,12 @@ lbl_80057594: /* 800575A4 00054504 83 C1 00 18 */ lwz r30, 0x18(r1) /* 800575A8 00054508 7C 08 03 A6 */ mtlr r0 /* 800575AC 0005450C 38 21 00 20 */ addi r1, r1, 0x20 -/* 800575B0 00054510 4E 80 00 20 */ blr +/* 800575B0 00054510 4E 80 00 20 */ blr .global IGetGameAreas__6CWorldCFv IGetGameAreas__6CWorldCFv: /* 800575B4 00054514 80 63 00 18 */ lwz r3, 0x18(r3) -/* 800575B8 00054518 4E 80 00 20 */ blr +/* 800575B8 00054518 4E 80 00 20 */ blr .global IGetDefaultAudioTrack__6CWorldCFv IGetDefaultAudioTrack__6CWorldCFv: @@ -1916,7 +1916,7 @@ IGetDefaultAudioTrack__6CWorldCFv: /* 800575D0 00054530 80 01 00 14 */ lwz r0, 0x14(r1) /* 800575D4 00054534 7C 08 03 A6 */ mtlr r0 /* 800575D8 00054538 38 21 00 10 */ addi r1, r1, 0x10 -/* 800575DC 0005453C 4E 80 00 20 */ blr +/* 800575DC 0005453C 4E 80 00 20 */ blr .global ICheckWorldComplete__6CWorldFv ICheckWorldComplete__6CWorldFv: @@ -1932,13 +1932,13 @@ ICheckWorldComplete__6CWorldFv: /* 80057604 00054564 80 01 00 14 */ lwz r0, 0x14(r1) /* 80057608 00054568 7C 08 03 A6 */ mtlr r0 /* 8005760C 0005456C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80057610 00054570 4E 80 00 20 */ blr +/* 80057610 00054570 4E 80 00 20 */ blr .global IGetCurrentAreaId__6CWorldCFv IGetCurrentAreaId__6CWorldCFv: /* 80057614 00054574 80 04 00 68 */ lwz r0, 0x68(r4) /* 80057618 00054578 90 03 00 00 */ stw r0, 0(r3) -/* 8005761C 0005457C 4E 80 00 20 */ blr +/* 8005761C 0005457C 4E 80 00 20 */ blr .global IGetAreaAlways__6CWorldCF7TAreaId IGetAreaAlways__6CWorldCF7TAreaId: @@ -1950,7 +1950,7 @@ IGetAreaAlways__6CWorldCF7TAreaId: /* 80057634 00054594 38 03 00 04 */ addi r0, r3, 4 /* 80057638 00054598 7C 64 00 2E */ lwzx r3, r4, r0 /* 8005763C 0005459C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80057640 000545A0 4E 80 00 20 */ blr +/* 80057640 000545A0 4E 80 00 20 */ blr .global IMapWorld__6CWorldFv IMapWorld__6CWorldFv: @@ -1961,7 +1961,7 @@ IMapWorld__6CWorldFv: /* 80057654 000545B4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80057658 000545B8 7C 08 03 A6 */ mtlr r0 /* 8005765C 000545BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80057660 000545C0 4E 80 00 20 */ blr +/* 80057660 000545C0 4E 80 00 20 */ blr .global IGetMapWorld__6CWorldCFv IGetMapWorld__6CWorldCFv: @@ -1972,28 +1972,28 @@ IGetMapWorld__6CWorldCFv: /* 80057674 000545D4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80057678 000545D8 7C 08 03 A6 */ mtlr r0 /* 8005767C 000545DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80057680 000545E0 4E 80 00 20 */ blr +/* 80057680 000545E0 4E 80 00 20 */ blr .global IGetSaveWorldAssetId__6CWorldCFv IGetSaveWorldAssetId__6CWorldCFv: /* 80057684 000545E4 80 63 00 10 */ lwz r3, 0x10(r3) -/* 80057688 000545E8 4E 80 00 20 */ blr +/* 80057688 000545E8 4E 80 00 20 */ blr .global IGetStringTableAssetId__6CWorldCFv IGetStringTableAssetId__6CWorldCFv: /* 8005768C 000545EC 80 63 00 0C */ lwz r3, 0xc(r3) -/* 80057690 000545F0 4E 80 00 20 */ blr +/* 80057690 000545F0 4E 80 00 20 */ blr .global IGetWorldAssetId__6CWorldCFv IGetWorldAssetId__6CWorldCFv: /* 80057694 000545F4 80 63 00 08 */ lwz r3, 8(r3) -/* 80057698 000545F8 4E 80 00 20 */ blr +/* 80057698 000545F8 4E 80 00 20 */ blr .global GetMapWorld__6CWorldCFv GetMapWorld__6CWorldCFv: /* 8005769C 000545FC 80 63 00 28 */ lwz r3, 0x28(r3) /* 800576A0 00054600 80 63 00 08 */ lwz r3, 8(r3) -/* 800576A4 00054604 4E 80 00 20 */ blr +/* 800576A4 00054604 4E 80 00 20 */ blr .global UnloadSoundGroups__6CWorldFv UnloadSoundGroups__6CWorldFv: @@ -2034,7 +2034,7 @@ lbl_800576FC: /* 8005771C 0005467C 83 C1 00 08 */ lwz r30, 8(r1) /* 80057720 00054680 7C 08 03 A6 */ mtlr r0 /* 80057724 00054684 38 21 00 10 */ addi r1, r1, 0x10 -/* 80057728 00054688 4E 80 00 20 */ blr +/* 80057728 00054688 4E 80 00 20 */ blr .global LoadSoundGroup__6CWorldFUcUiRQ26CWorld15CSoundGroupData LoadSoundGroup__6CWorldFUcUiRQ26CWorld15CSoundGroupData: @@ -2095,7 +2095,7 @@ lbl_800577E8: /* 800577F8 00054758 83 81 00 20 */ lwz r28, 0x20(r1) /* 800577FC 0005475C 7C 08 03 A6 */ mtlr r0 /* 80057800 00054760 38 21 00 30 */ addi r1, r1, 0x30 -/* 80057804 00054764 4E 80 00 20 */ blr +/* 80057804 00054764 4E 80 00 20 */ blr .global LoadSoundGroups__6CWorldFv LoadSoundGroups__6CWorldFv: @@ -2107,7 +2107,7 @@ LoadSoundGroups__6CWorldFv: /* 8005781C 0005477C 81 83 00 00 */ lwz r12, 0(r3) /* 80057820 00054780 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80057824 00054784 7D 89 03 A6 */ mtctr r12 -/* 80057828 00054788 4E 80 04 21 */ bctrl +/* 80057828 00054788 4E 80 04 21 */ bctrl /* 8005782C 0005478C 80 8D A0 88 */ lwz r4, gpTweakManager@sda21(r13) /* 80057830 00054790 7C 65 1B 78 */ mr r5, r3 /* 80057834 00054794 38 61 00 40 */ addi r3, r1, 0x40 @@ -2199,7 +2199,7 @@ lbl_8005794C: /* 80057964 000548C4 81 84 00 00 */ lwz r12, 0(r4) /* 80057968 000548C8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8005796C 000548CC 7D 89 03 A6 */ mtctr r12 -/* 80057970 000548D0 4E 80 04 21 */ bctrl +/* 80057970 000548D0 4E 80 04 21 */ bctrl /* 80057974 000548D4 38 61 00 38 */ addi r3, r1, 0x38 /* 80057978 000548D8 38 81 00 28 */ addi r4, r1, 0x28 /* 8005797C 000548DC 48 2E 95 2D */ bl __ct__6CTokenFRC6CToken @@ -2325,7 +2325,7 @@ lbl_80057B20: /* 80057B24 00054A84 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 80057B28 00054A88 7C 08 03 A6 */ mtlr r0 /* 80057B2C 00054A8C 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 80057B30 00054A90 4E 80 00 20 */ blr +/* 80057B30 00054A90 4E 80 00 20 */ blr .global MoveToChain__6CWorldFP9CGameAreaQ26CWorld6EChain MoveToChain__6CWorldFP9CGameAreaQ26CWorld6EChain: @@ -2360,7 +2360,7 @@ lbl_80057B94: /* 80057B9C 00054AFC 83 C1 00 08 */ lwz r30, 8(r1) /* 80057BA0 00054B00 7C 08 03 A6 */ mtlr r0 /* 80057BA4 00054B04 38 21 00 10 */ addi r1, r1, 0x10 -/* 80057BA8 00054B08 4E 80 00 20 */ blr +/* 80057BA8 00054B08 4E 80 00 20 */ blr .global TravelToArea__6CWorldFRC7TAreaIdR13CStateManagerb TravelToArea__6CWorldFRC7TAreaIdR13CStateManagerb: @@ -2555,7 +2555,7 @@ lbl_80057E3C: /* 80057E40 00054DA0 80 01 00 44 */ lwz r0, 0x44(r1) /* 80057E44 00054DA4 7C 08 03 A6 */ mtlr r0 /* 80057E48 00054DA8 38 21 00 40 */ addi r1, r1, 0x40 -/* 80057E4C 00054DAC 4E 80 00 20 */ blr +/* 80057E4C 00054DAC 4E 80 00 20 */ blr .global ScheduleAreaToLoad__6CWorldFP9CGameAreaR13CStateManager ScheduleAreaToLoad__6CWorldFP9CGameAreaR13CStateManager: @@ -2588,7 +2588,7 @@ lbl_80057EA8: /* 80057EA8 00054E08 80 01 00 14 */ lwz r0, 0x14(r1) /* 80057EAC 00054E0C 7C 08 03 A6 */ mtlr r0 /* 80057EB0 00054E10 38 21 00 10 */ addi r1, r1, 0x10 -/* 80057EB4 00054E14 4E 80 00 20 */ blr +/* 80057EB4 00054E14 4E 80 00 20 */ blr .global __dt__6CWorldFv __dt__6CWorldFv: @@ -2747,7 +2747,7 @@ lbl_800580B0: /* 800580C8 00055028 38 80 00 01 */ li r4, 1 /* 800580CC 0005502C 81 8C 00 08 */ lwz r12, 8(r12) /* 800580D0 00055030 7D 89 03 A6 */ mtctr r12 -/* 800580D4 00055034 4E 80 04 21 */ bctrl +/* 800580D4 00055034 4E 80 04 21 */ bctrl lbl_800580D8: /* 800580D8 00055038 34 1E 00 2C */ addic. r0, r30, 0x2c /* 800580DC 0005503C 41 82 00 44 */ beq lbl_80058120 @@ -2801,7 +2801,7 @@ lbl_80058174: /* 80058184 000550E4 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80058188 000550E8 7C 08 03 A6 */ mtlr r0 /* 8005818C 000550EC 38 21 00 30 */ addi r1, r1, 0x30 -/* 80058190 000550F0 4E 80 00 20 */ blr +/* 80058190 000550F0 4E 80 00 20 */ blr .global sub_80058194 sub_80058194: @@ -2837,7 +2837,7 @@ lbl_800581E0: /* 80058204 00055164 38 80 00 01 */ li r4, 1 /* 80058208 00055168 81 8C 00 08 */ lwz r12, 8(r12) /* 8005820C 0005516C 7D 89 03 A6 */ mtctr r12 -/* 80058210 00055170 4E 80 04 21 */ bctrl +/* 80058210 00055170 4E 80 04 21 */ bctrl lbl_80058214: /* 80058214 00055174 3B DE 00 08 */ addi r30, r30, 8 lbl_80058218: @@ -2861,7 +2861,7 @@ lbl_80058240: /* 80058254 000551B4 83 81 00 20 */ lwz r28, 0x20(r1) /* 80058258 000551B8 7C 08 03 A6 */ mtlr r0 /* 8005825C 000551BC 38 21 00 30 */ addi r1, r1, 0x30 -/* 80058260 000551C0 4E 80 00 20 */ blr +/* 80058260 000551C0 4E 80 00 20 */ blr .global sub_80058264 sub_80058264: @@ -2920,7 +2920,7 @@ lbl_80058310: /* 80058318 00055278 80 01 00 34 */ lwz r0, 0x34(r1) /* 8005831C 0005527C 7C 08 03 A6 */ mtlr r0 /* 80058320 00055280 38 21 00 30 */ addi r1, r1, 0x30 -/* 80058324 00055284 4E 80 00 20 */ blr +/* 80058324 00055284 4E 80 00 20 */ blr .global CheckWorldComplete__6CWorldFP13CStateManager7TAreaIdUi CheckWorldComplete__6CWorldFP13CStateManager7TAreaIdUi: @@ -2985,7 +2985,7 @@ lbl_800583F4: /* 800583F8 00055358 81 83 00 00 */ lwz r12, 0(r3) /* 800583FC 0005535C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80058400 00055360 7D 89 03 A6 */ mtctr r12 -/* 80058404 00055364 4E 80 04 21 */ bctrl +/* 80058404 00055364 4E 80 04 21 */ bctrl /* 80058408 00055368 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8005840C 0005536C 40 82 00 0C */ bne lbl_80058418 /* 80058410 00055370 38 60 00 00 */ li r3, 0 @@ -3028,7 +3028,7 @@ lbl_8005845C: /* 8005849C 000553FC 81 84 00 00 */ lwz r12, 0(r4) /* 800584A0 00055400 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800584A4 00055404 7D 89 03 A6 */ mtctr r12 -/* 800584A8 00055408 4E 80 04 21 */ bctrl +/* 800584A8 00055408 4E 80 04 21 */ bctrl /* 800584AC 0005540C 38 61 00 A4 */ addi r3, r1, 0xa4 /* 800584B0 00055410 38 81 00 58 */ addi r4, r1, 0x58 /* 800584B4 00055414 48 2E 89 F5 */ bl __ct__6CTokenFRC6CToken @@ -3160,7 +3160,7 @@ lbl_80058654: /* 8005867C 000555DC 38 80 00 01 */ li r4, 1 /* 80058680 000555E0 81 8C 00 08 */ lwz r12, 8(r12) /* 80058684 000555E4 7D 89 03 A6 */ mtctr r12 -/* 80058688 000555E8 4E 80 04 21 */ bctrl +/* 80058688 000555E8 4E 80 04 21 */ bctrl lbl_8005868C: /* 8005868C 000555EC 3B 7B 00 01 */ addi r27, r27, 1 lbl_80058690: @@ -3226,7 +3226,7 @@ lbl_8005870C: /* 80058764 000556C4 81 84 00 00 */ lwz r12, 0(r4) /* 80058768 000556C8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8005876C 000556CC 7D 89 03 A6 */ mtctr r12 -/* 80058770 000556D0 4E 80 04 21 */ bctrl +/* 80058770 000556D0 4E 80 04 21 */ bctrl /* 80058774 000556D4 7F 63 DB 78 */ mr r3, r27 /* 80058778 000556D8 38 81 00 40 */ addi r4, r1, 0x40 /* 8005877C 000556DC 3B 20 00 01 */ li r25, 1 @@ -3438,7 +3438,7 @@ lbl_80058A48: /* 80058A68 000559C8 38 80 00 01 */ li r4, 1 /* 80058A6C 000559CC 81 8C 00 08 */ lwz r12, 8(r12) /* 80058A70 000559D0 7D 89 03 A6 */ mtctr r12 -/* 80058A74 000559D4 4E 80 04 21 */ bctrl +/* 80058A74 000559D4 4E 80 04 21 */ bctrl lbl_80058A78: /* 80058A78 000559D8 38 00 00 00 */ li r0, 0 /* 80058A7C 000559DC 90 1F 00 3C */ stw r0, 0x3c(r31) @@ -3676,7 +3676,7 @@ lbl_80058D94: /* 80058DA0 00055D00 80 01 01 54 */ lwz r0, 0x154(r1) /* 80058DA4 00055D04 7C 08 03 A6 */ mtlr r0 /* 80058DA8 00055D08 38 21 01 50 */ addi r1, r1, 0x150 -/* 80058DAC 00055D0C 4E 80 00 20 */ blr +/* 80058DAC 00055D0C 4E 80 00 20 */ blr .global sub_80058db0 sub_80058db0: @@ -3756,7 +3756,7 @@ lbl_80058EA4: /* 80058EAC 00055E0C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80058EB0 00055E10 7C 08 03 A6 */ mtlr r0 /* 80058EB4 00055E14 38 21 00 20 */ addi r1, r1, 0x20 -/* 80058EB8 00055E18 4E 80 00 20 */ blr +/* 80058EB8 00055E18 4E 80 00 20 */ blr .global __ct__6CWorldFR12IObjectStoreR11CResFactoryUi __ct__6CWorldFR12IObjectStoreR11CResFactoryUi: @@ -3862,7 +3862,7 @@ __ct__6CWorldFR12IObjectStoreR11CResFactoryUi: /* 80059048 00055FA8 81 83 00 00 */ lwz r12, 0(r3) /* 8005904C 00055FAC 81 8C 00 08 */ lwz r12, 8(r12) /* 80059050 00055FB0 7D 89 03 A6 */ mtctr r12 -/* 80059054 00055FB4 4E 80 04 21 */ bctrl +/* 80059054 00055FB4 4E 80 04 21 */ bctrl lbl_80059058: /* 80059058 00055FB8 93 FE 00 3C */ stw r31, 0x3c(r30) /* 8005905C 00055FBC 7F C3 F3 78 */ mr r3, r30 @@ -3872,7 +3872,7 @@ lbl_80059058: /* 8005906C 00055FCC 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80059070 00055FD0 7C 08 03 A6 */ mtlr r0 /* 80059074 00055FD4 38 21 00 30 */ addi r1, r1, 0x30 -/* 80059078 00055FD8 4E 80 00 20 */ blr +/* 80059078 00055FD8 4E 80 00 20 */ blr .global __ct__Q26CWorld15CSoundGroupDataFiUi __ct__Q26CWorld15CSoundGroupDataFiUi: @@ -3912,7 +3912,7 @@ __ct__Q26CWorld15CSoundGroupDataFiUi: /* 80059100 00056060 81 84 00 00 */ lwz r12, 0(r4) /* 80059104 00056064 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80059108 00056068 7D 89 03 A6 */ mtctr r12 -/* 8005910C 0005606C 4E 80 04 21 */ bctrl +/* 8005910C 0005606C 4E 80 04 21 */ bctrl /* 80059110 00056070 88 1E 00 24 */ lbz r0, 0x24(r30) /* 80059114 00056074 28 00 00 00 */ cmplwi r0, 0 /* 80059118 00056078 40 82 00 20 */ bne lbl_80059138 @@ -3939,7 +3939,7 @@ lbl_80059150: /* 8005915C 000560BC 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80059160 000560C0 7C 08 03 A6 */ mtlr r0 /* 80059164 000560C4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80059168 000560C8 4E 80 00 20 */ blr +/* 80059168 000560C8 4E 80 00 20 */ blr .global __dt__6IWorldFv __dt__6IWorldFv: @@ -3961,7 +3961,7 @@ lbl_8005919C: /* 800591A4 00056104 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800591A8 00056108 7C 08 03 A6 */ mtlr r0 /* 800591AC 0005610C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800591B0 00056110 4E 80 00 20 */ blr +/* 800591B0 00056110 4E 80 00 20 */ blr .global __ct__6CRelayFR12CInputStream __ct__6CRelayFR12CInputStream: @@ -3990,7 +3990,7 @@ __ct__6CRelayFR12CInputStream: /* 8005920C 0005616C 83 C1 00 08 */ lwz r30, 8(r1) /* 80059210 00056170 7C 08 03 A6 */ mtlr r0 /* 80059214 00056174 38 21 00 10 */ addi r1, r1, 0x10 -/* 80059218 00056178 4E 80 00 20 */ blr +/* 80059218 00056178 4E 80 00 20 */ blr .global ReadWorldLayers__12CWorldLayersFR12CInputStream ReadWorldLayers__12CWorldLayersFR12CInputStream: @@ -4178,7 +4178,7 @@ lbl_800594A8: /* 800594AC 0005640C 80 01 00 64 */ lwz r0, 0x64(r1) /* 800594B0 00056410 7C 08 03 A6 */ mtlr r0 /* 800594B4 00056414 38 21 00 60 */ addi r1, r1, 0x60 -/* 800594B8 00056418 4E 80 00 20 */ blr +/* 800594B8 00056418 4E 80 00 20 */ blr .global sub_800594bc sub_800594bc: @@ -4196,7 +4196,7 @@ sub_800594bc: /* 800594E8 00056448 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 800594EC 0005644C 7C 08 03 A6 */ mtlr r0 /* 800594F0 00056450 38 21 00 20 */ addi r1, r1, 0x20 -/* 800594F4 00056454 4E 80 00 20 */ blr +/* 800594F4 00056454 4E 80 00 20 */ blr .global sub_800594f8 sub_800594f8: @@ -4209,7 +4209,7 @@ sub_800594f8: /* 80059510 00056470 80 01 00 14 */ lwz r0, 0x14(r1) /* 80059514 00056474 7C 08 03 A6 */ mtlr r0 /* 80059518 00056478 38 21 00 10 */ addi r1, r1, 0x10 -/* 8005951C 0005647C 4E 80 00 20 */ blr +/* 8005951C 0005647C 4E 80 00 20 */ blr .global sub_80059520 sub_80059520: @@ -4272,7 +4272,7 @@ lbl_800595DC: /* 800595EC 0005654C 80 01 00 34 */ lwz r0, 0x34(r1) /* 800595F0 00056550 7C 08 03 A6 */ mtlr r0 /* 800595F4 00056554 38 21 00 30 */ addi r1, r1, 0x30 -/* 800595F8 00056558 4E 80 00 20 */ blr +/* 800595F8 00056558 4E 80 00 20 */ blr .global "reserve__Q24rstl44vectorFi" "reserve__Q24rstl44vectorFi": @@ -4351,7 +4351,7 @@ lbl_800596EC: /* 800596F8 00056658 83 A1 00 24 */ lwz r29, 0x24(r1) /* 800596FC 0005665C 7C 08 03 A6 */ mtlr r0 /* 80059700 00056660 38 21 00 30 */ addi r1, r1, 0x30 -/* 80059704 00056664 4E 80 00 20 */ blr +/* 80059704 00056664 4E 80 00 20 */ blr .global "reserve__Q24rstl61vectorFi" "reserve__Q24rstl61vectorFi": @@ -4455,7 +4455,7 @@ lbl_80059858: /* 8005985C 000567BC 80 01 00 34 */ lwz r0, 0x34(r1) /* 80059860 000567C0 7C 08 03 A6 */ mtlr r0 /* 80059864 000567C4 38 21 00 30 */ addi r1, r1, 0x30 -/* 80059868 000567C8 4E 80 00 20 */ blr +/* 80059868 000567C8 4E 80 00 20 */ blr .global sub_8005986c sub_8005986c: @@ -4523,7 +4523,7 @@ lbl_80059924: /* 80059948 000568A8 38 80 00 01 */ li r4, 1 /* 8005994C 000568AC 81 8C 00 08 */ lwz r12, 8(r12) /* 80059950 000568B0 7D 89 03 A6 */ mtctr r12 -/* 80059954 000568B4 4E 80 04 21 */ bctrl +/* 80059954 000568B4 4E 80 04 21 */ bctrl lbl_80059958: /* 80059958 000568B8 3B 7B 00 08 */ addi r27, r27, 8 lbl_8005995C: @@ -4541,7 +4541,7 @@ lbl_8005997C: /* 80059980 000568E0 80 01 00 34 */ lwz r0, 0x34(r1) /* 80059984 000568E4 7C 08 03 A6 */ mtlr r0 /* 80059988 000568E8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8005998C 000568EC 4E 80 00 20 */ blr +/* 8005998C 000568EC 4E 80 00 20 */ blr .global sub_80059990 sub_80059990: @@ -4609,7 +4609,7 @@ lbl_80059A48: /* 80059A6C 000569CC 38 80 00 01 */ li r4, 1 /* 80059A70 000569D0 81 8C 00 08 */ lwz r12, 8(r12) /* 80059A74 000569D4 7D 89 03 A6 */ mtctr r12 -/* 80059A78 000569D8 4E 80 04 21 */ bctrl +/* 80059A78 000569D8 4E 80 04 21 */ bctrl lbl_80059A7C: /* 80059A7C 000569DC 3B 7B 00 08 */ addi r27, r27, 8 lbl_80059A80: @@ -4627,7 +4627,7 @@ lbl_80059AA0: /* 80059AA4 00056A04 80 01 00 34 */ lwz r0, 0x34(r1) /* 80059AA8 00056A08 7C 08 03 A6 */ mtlr r0 /* 80059AAC 00056A0C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80059AB0 00056A10 4E 80 00 20 */ blr +/* 80059AB0 00056A10 4E 80 00 20 */ blr .global sub_80059ab4 sub_80059ab4: @@ -4703,7 +4703,7 @@ lbl_80059B98: /* 80059BA4 00056B04 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80059BA8 00056B08 7C 08 03 A6 */ mtlr r0 /* 80059BAC 00056B0C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80059BB0 00056B10 4E 80 00 20 */ blr +/* 80059BB0 00056B10 4E 80 00 20 */ blr .global "reserve__Q24rstl110vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl110vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Fi": @@ -4777,7 +4777,7 @@ lbl_80059C94: /* 80059C98 00056BF8 80 01 00 34 */ lwz r0, 0x34(r1) /* 80059C9C 00056BFC 7C 08 03 A6 */ mtlr r0 /* 80059CA0 00056C00 38 21 00 30 */ addi r1, r1, 0x30 -/* 80059CA4 00056C04 4E 80 00 20 */ blr +/* 80059CA4 00056C04 4E 80 00 20 */ blr .global "reserve__Q24rstl36vectorFi" "reserve__Q24rstl36vectorFi": @@ -4849,7 +4849,7 @@ lbl_80059D7C: /* 80059D88 00056CE8 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80059D8C 00056CEC 7C 08 03 A6 */ mtlr r0 /* 80059D90 00056CF0 38 21 00 30 */ addi r1, r1, 0x30 -/* 80059D94 00056CF4 4E 80 00 20 */ blr +/* 80059D94 00056CF4 4E 80 00 20 */ blr .global sub_80059d98 sub_80059d98: @@ -4909,7 +4909,7 @@ lbl_80059E44: /* 80059E54 00056DB4 83 81 00 20 */ lwz r28, 0x20(r1) /* 80059E58 00056DB8 7C 08 03 A6 */ mtlr r0 /* 80059E5C 00056DBC 38 21 00 30 */ addi r1, r1, 0x30 -/* 80059E60 00056DC0 4E 80 00 20 */ blr +/* 80059E60 00056DC0 4E 80 00 20 */ blr .global sub_80059e64 sub_80059e64: @@ -4960,11 +4960,11 @@ lbl_80059EF8: /* 80059F00 00056E60 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80059F04 00056E64 7C 08 03 A6 */ mtlr r0 /* 80059F08 00056E68 38 21 00 20 */ addi r1, r1, 0x20 -/* 80059F0C 00056E6C 4E 80 00 20 */ blr +/* 80059F0C 00056E6C 4E 80 00 20 */ blr .global __sinit_CWorld_cpp __sinit_CWorld_cpp: /* 80059F10 00056E70 38 00 00 00 */ li r0, 0 /* 80059F14 00056E74 90 0D A2 18 */ stw r0, lbl_805A8DD8@sda21(r13) /* 80059F18 00056E78 90 0D A2 1C */ stw r0, lbl_805A8DDC@sda21(r13) -/* 80059F1C 00056E7C 4E 80 00 20 */ blr +/* 80059F1C 00056E7C 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/CWorldShadow.s b/asm/MetroidPrime/CWorldShadow.s index 4b1ce1f8..e96ed86f 100644 --- a/asm/MetroidPrime/CWorldShadow.s +++ b/asm/MetroidPrime/CWorldShadow.s @@ -22,7 +22,7 @@ lbl_805A8F24: ResetBlur__12CWorldShadowFv: /* 80110F8C 0010DEEC 38 00 00 01 */ li r0, 1 /* 80110F90 0010DEF0 98 03 00 88 */ stb r0, 0x88(r3) -/* 80110F94 0010DEF4 4E 80 00 20 */ blr +/* 80110F94 0010DEF4 4E 80 00 20 */ blr .global DisableModelProjectedShadow__12CWorldShadowCFv DisableModelProjectedShadow__12CWorldShadowCFv: @@ -33,7 +33,7 @@ DisableModelProjectedShadow__12CWorldShadowCFv: /* 80110FA8 0010DF08 80 01 00 14 */ lwz r0, 0x14(r1) /* 80110FAC 0010DF0C 7C 08 03 A6 */ mtlr r0 /* 80110FB0 0010DF10 38 21 00 10 */ addi r1, r1, 0x10 -/* 80110FB4 0010DF14 4E 80 00 20 */ blr +/* 80110FB4 0010DF14 4E 80 00 20 */ blr .global EnableModelProjectedShadow__12CWorldShadowCFRC12CTransform4fUif EnableModelProjectedShadow__12CWorldShadowCFRC12CTransform4fUif: @@ -171,7 +171,7 @@ lbl_80111058: /* 801111C0 0010E120 83 A1 02 04 */ lwz r29, 0x204(r1) /* 801111C4 0010E124 7C 08 03 A6 */ mtlr r0 /* 801111C8 0010E128 38 21 02 20 */ addi r1, r1, 0x220 -/* 801111CC 0010E12C 4E 80 00 20 */ blr +/* 801111CC 0010E12C 4E 80 00 20 */ blr .global BuildLightShadowTexture__12CWorldShadowFRC13CStateManager7TAreaIdUiRC6CAABoxbb BuildLightShadowTexture__12CWorldShadowFRC13CStateManager7TAreaIdUiRC6CAABoxbb: @@ -271,7 +271,7 @@ lbl_8011132C: /* 80111338 0010E298 81 83 00 00 */ lwz r12, 0(r3) /* 8011133C 0010E29C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80111340 0010E2A0 7D 89 03 A6 */ mtctr r12 -/* 80111344 0010E2A4 4E 80 04 21 */ bctrl +/* 80111344 0010E2A4 4E 80 04 21 */ bctrl /* 80111348 0010E2A8 28 1B 00 00 */ cmplwi r27, 0 /* 8011134C 0010E2AC 41 82 00 60 */ beq lbl_801113AC /* 80111350 0010E2B0 88 01 01 0C */ lbz r0, 0x10c(r1) @@ -290,7 +290,7 @@ lbl_80111368: /* 80111380 0010E2E0 81 83 00 00 */ lwz r12, 0(r3) /* 80111384 0010E2E4 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80111388 0010E2E8 7D 89 03 A6 */ mtctr r12 -/* 8011138C 0010E2EC 4E 80 04 21 */ bctrl +/* 8011138C 0010E2EC 4E 80 04 21 */ bctrl /* 80111390 0010E2F0 34 61 00 E4 */ addic. r3, r1, 0xe4 /* 80111394 0010E2F4 41 82 00 18 */ beq lbl_801113AC /* 80111398 0010E2F8 88 03 00 00 */ lbz r0, 0(r3) @@ -382,7 +382,7 @@ lbl_801113AC: /* 801114EC 0010E44C 81 83 00 00 */ lwz r12, 0(r3) /* 801114F0 0010E450 81 8C 00 58 */ lwz r12, 0x58(r12) /* 801114F4 0010E454 7D 89 03 A6 */ mtctr r12 -/* 801114F8 0010E458 4E 80 04 21 */ bctrl +/* 801114F8 0010E458 4E 80 04 21 */ bctrl /* 801114FC 0010E45C 80 DF 00 00 */ lwz r6, 0(r31) /* 80111500 0010E460 3C 80 43 30 */ lis r4, 0x4330 /* 80111504 0010E464 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) @@ -405,7 +405,7 @@ lbl_801113AC: /* 80111548 0010E4A8 C8 01 01 E0 */ lfd f0, 0x1e0(r1) /* 8011154C 0010E4AC EC 60 18 28 */ fsubs f3, f0, f3 /* 80111550 0010E4B0 7D 89 03 A6 */ mtctr r12 -/* 80111554 0010E4B4 4E 80 04 21 */ bctrl +/* 80111554 0010E4B4 4E 80 04 21 */ bctrl /* 80111558 0010E4B8 C3 ED A7 E0 */ lfs f31, lbl_805A93A0@sda21(r13) /* 8011155C 0010E4BC C3 CD 9C 78 */ lfs f30, lbl_805A8838@sda21(r13) /* 80111560 0010E4C0 C0 22 95 88 */ lfs f1, lbl_805AB2A8@sda21(r2) @@ -428,7 +428,7 @@ lbl_801113AC: /* 801115A4 0010E504 83 68 00 08 */ lwz r27, 8(r8) /* 801115A8 0010E508 83 48 00 0C */ lwz r26, 0xc(r8) /* 801115AC 0010E50C 7D 89 03 A6 */ mtctr r12 -/* 801115B0 0010E510 4E 80 04 21 */ bctrl +/* 801115B0 0010E510 4E 80 04 21 */ bctrl /* 801115B4 0010E514 C0 21 00 D0 */ lfs f1, 0xd0(r1) /* 801115B8 0010E518 3C 60 80 5A */ lis r3, lbl_805A66F4@ha /* 801115BC 0010E51C C0 62 95 88 */ lfs f3, lbl_805AB2A8@sda21(r2) @@ -457,14 +457,14 @@ lbl_801113AC: /* 80111618 0010E578 81 83 00 00 */ lwz r12, 0(r3) /* 8011161C 0010E57C 81 8C 00 30 */ lwz r12, 0x30(r12) /* 80111620 0010E580 7D 89 03 A6 */ mtctr r12 -/* 80111624 0010E584 4E 80 04 21 */ bctrl +/* 80111624 0010E584 4E 80 04 21 */ bctrl /* 80111628 0010E588 48 23 89 85 */ bl White__6CColorFv /* 8011162C 0010E58C 7C 64 1B 78 */ mr r4, r3 /* 80111630 0010E590 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 80111634 0010E594 81 83 00 00 */ lwz r12, 0(r3) /* 80111638 0010E598 81 8C 00 B4 */ lwz r12, 0xb4(r12) /* 8011163C 0010E59C 7D 89 03 A6 */ mtctr r12 -/* 80111640 0010E5A0 4E 80 04 21 */ bctrl +/* 80111640 0010E5A0 4E 80 04 21 */ bctrl /* 80111644 0010E5A4 38 60 00 07 */ li r3, 7 /* 80111648 0010E5A8 38 80 00 00 */ li r4, 0 /* 8011164C 0010E5AC 38 A0 00 00 */ li r5, 0 @@ -491,7 +491,7 @@ lbl_801113AC: /* 801116A0 0010E600 81 83 00 00 */ lwz r12, 0(r3) /* 801116A4 0010E604 81 8C 00 A0 */ lwz r12, 0xa0(r12) /* 801116A8 0010E608 7D 89 03 A6 */ mtctr r12 -/* 801116AC 0010E60C 4E 80 04 21 */ bctrl +/* 801116AC 0010E60C 4E 80 04 21 */ bctrl /* 801116B0 0010E610 FF A0 E0 50 */ fneg f29, f28 /* 801116B4 0010E614 C0 02 95 88 */ lfs f0, lbl_805AB2A8@sda21(r2) /* 801116B8 0010E618 D3 81 00 8C */ stfs f28, 0x8c(r1) @@ -502,7 +502,7 @@ lbl_801113AC: /* 801116CC 0010E62C 81 83 00 00 */ lwz r12, 0(r3) /* 801116D0 0010E630 81 8C 00 A8 */ lwz r12, 0xa8(r12) /* 801116D4 0010E634 7D 89 03 A6 */ mtctr r12 -/* 801116D8 0010E638 4E 80 04 21 */ bctrl +/* 801116D8 0010E638 4E 80 04 21 */ bctrl /* 801116DC 0010E63C C0 02 95 88 */ lfs f0, lbl_805AB2A8@sda21(r2) /* 801116E0 0010E640 38 81 00 78 */ addi r4, r1, 0x78 /* 801116E4 0010E644 D3 81 00 78 */ stfs f28, 0x78(r1) @@ -512,7 +512,7 @@ lbl_801113AC: /* 801116F4 0010E654 81 83 00 00 */ lwz r12, 0(r3) /* 801116F8 0010E658 81 8C 00 A8 */ lwz r12, 0xa8(r12) /* 801116FC 0010E65C 7D 89 03 A6 */ mtctr r12 -/* 80111700 0010E660 4E 80 04 21 */ bctrl +/* 80111700 0010E660 4E 80 04 21 */ bctrl /* 80111704 0010E664 C0 02 95 88 */ lfs f0, lbl_805AB2A8@sda21(r2) /* 80111708 0010E668 38 81 00 6C */ addi r4, r1, 0x6c /* 8011170C 0010E66C D3 A1 00 6C */ stfs f29, 0x6c(r1) @@ -522,7 +522,7 @@ lbl_801113AC: /* 8011171C 0010E67C 81 83 00 00 */ lwz r12, 0(r3) /* 80111720 0010E680 81 8C 00 A8 */ lwz r12, 0xa8(r12) /* 80111724 0010E684 7D 89 03 A6 */ mtctr r12 -/* 80111728 0010E688 4E 80 04 21 */ bctrl +/* 80111728 0010E688 4E 80 04 21 */ bctrl /* 8011172C 0010E68C C0 02 95 88 */ lfs f0, lbl_805AB2A8@sda21(r2) /* 80111730 0010E690 38 81 00 60 */ addi r4, r1, 0x60 /* 80111734 0010E694 D3 81 00 60 */ stfs f28, 0x60(r1) @@ -532,19 +532,19 @@ lbl_801113AC: /* 80111744 0010E6A4 81 83 00 00 */ lwz r12, 0(r3) /* 80111748 0010E6A8 81 8C 00 A8 */ lwz r12, 0xa8(r12) /* 8011174C 0010E6AC 7D 89 03 A6 */ mtctr r12 -/* 80111750 0010E6B0 4E 80 04 21 */ bctrl +/* 80111750 0010E6B0 4E 80 04 21 */ bctrl /* 80111754 0010E6B4 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 80111758 0010E6B8 81 83 00 00 */ lwz r12, 0(r3) /* 8011175C 0010E6BC 81 8C 00 B8 */ lwz r12, 0xb8(r12) /* 80111760 0010E6C0 7D 89 03 A6 */ mtctr r12 -/* 80111764 0010E6C4 4E 80 04 21 */ bctrl +/* 80111764 0010E6C4 4E 80 04 21 */ bctrl /* 80111768 0010E6C8 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 8011176C 0010E6CC 3C 80 80 5A */ lis r4, skIdentity4f@ha /* 80111770 0010E6D0 38 84 66 70 */ addi r4, r4, skIdentity4f@l /* 80111774 0010E6D4 81 83 00 00 */ lwz r12, 0(r3) /* 80111778 0010E6D8 81 8C 00 30 */ lwz r12, 0x30(r12) /* 8011177C 0010E6DC 7D 89 03 A6 */ mtctr r12 -/* 80111780 0010E6E0 4E 80 04 21 */ bctrl +/* 80111780 0010E6E0 4E 80 04 21 */ bctrl /* 80111784 0010E6E4 38 60 00 01 */ li r3, 1 /* 80111788 0010E6E8 48 23 40 61 */ bl SetRenderModelBlack__10CCubeModelFb /* 8011178C 0010E6EC 38 60 00 01 */ li r3, 1 @@ -558,7 +558,7 @@ lbl_801113AC: /* 801117AC 0010E70C 81 83 00 00 */ lwz r12, 0(r3) /* 801117B0 0010E710 81 8C 01 08 */ lwz r12, 0x108(r12) /* 801117B4 0010E714 7D 89 03 A6 */ mtctr r12 -/* 801117B8 0010E718 4E 80 04 21 */ bctrl +/* 801117B8 0010E718 4E 80 04 21 */ bctrl /* 801117BC 0010E71C 80 01 00 54 */ lwz r0, 0x54(r1) /* 801117C0 0010E720 80 61 00 5C */ lwz r3, 0x5c(r1) /* 801117C4 0010E724 1C 00 00 50 */ mulli r0, r0, 0x50 @@ -585,7 +585,7 @@ lbl_801117FC: /* 8011180C 0010E76C 81 83 00 00 */ lwz r12, 0(r3) /* 80111810 0010E770 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80111814 0010E774 7D 89 03 A6 */ mtctr r12 -/* 80111818 0010E778 4E 80 04 21 */ bctrl +/* 80111818 0010E778 4E 80 04 21 */ bctrl /* 8011181C 0010E77C 38 60 00 00 */ li r3, 0 /* 80111820 0010E780 48 23 3F C9 */ bl SetRenderModelBlack__10CCubeModelFb /* 80111824 0010E784 38 60 00 00 */ li r3, 0 @@ -597,7 +597,7 @@ lbl_801117FC: /* 8011183C 0010E79C 81 83 00 00 */ lwz r12, 0(r3) /* 80111840 0010E7A0 81 8C 00 30 */ lwz r12, 0x30(r12) /* 80111844 0010E7A4 7D 89 03 A6 */ mtctr r12 -/* 80111848 0010E7A8 4E 80 04 21 */ bctrl +/* 80111848 0010E7A8 4E 80 04 21 */ bctrl /* 8011184C 0010E7AC 38 60 00 07 */ li r3, 7 /* 80111850 0010E7B0 38 80 00 00 */ li r4, 0 /* 80111854 0010E7B4 38 A0 00 00 */ li r5, 0 @@ -758,7 +758,7 @@ lbl_80111A6C: /* 80111AB0 0010EA10 7F 47 D3 78 */ mr r7, r26 /* 80111AB4 0010EA14 81 8C 00 5C */ lwz r12, 0x5c(r12) /* 80111AB8 0010EA18 7D 89 03 A6 */ mtctr r12 -/* 80111ABC 0010EA1C 4E 80 04 21 */ bctrl +/* 80111ABC 0010EA1C 4E 80 04 21 */ bctrl /* 80111AC0 0010EA20 FC 20 F8 90 */ fmr f1, f31 /* 80111AC4 0010EA24 FC 40 F0 90 */ fmr f2, f30 /* 80111AC8 0010EA28 48 1F 89 19 */ bl SetDepthRange__9CGraphicsFff @@ -800,7 +800,7 @@ lbl_80111B20: /* 80111B44 0010EAA4 80 01 02 54 */ lwz r0, 0x254(r1) /* 80111B48 0010EAA8 7C 08 03 A6 */ mtlr r0 /* 80111B4C 0010EAAC 38 21 02 50 */ addi r1, r1, 0x250 -/* 80111B50 0010EAB0 4E 80 00 20 */ blr +/* 80111B50 0010EAB0 4E 80 00 20 */ blr .global __dt__12CWorldShadowFv __dt__12CWorldShadowFv: @@ -834,7 +834,7 @@ lbl_80111BA8: /* 80111BB4 0010EB14 83 C1 00 08 */ lwz r30, 8(r1) /* 80111BB8 0010EB18 7C 08 03 A6 */ mtlr r0 /* 80111BBC 0010EB1C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80111BC0 0010EB20 4E 80 00 20 */ blr +/* 80111BC0 0010EB20 4E 80 00 20 */ blr .global __ct__12CWorldShadowFUiUib __ct__12CWorldShadowFUiUib: diff --git a/asm/MetroidPrime/CWorldTransManager.s b/asm/MetroidPrime/CWorldTransManager.s index 094ee0f3..f134d8e6 100644 --- a/asm/MetroidPrime/CWorldTransManager.s +++ b/asm/MetroidPrime/CWorldTransManager.s @@ -166,7 +166,7 @@ lbl_80208F50: /* 80208F5C 00205EBC 81 84 00 00 */ lwz r12, 0(r4) /* 80208F60 00205EC0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80208F64 00205EC4 7D 89 03 A6 */ mtctr r12 -/* 80208F68 00205EC8 4E 80 04 21 */ bctrl +/* 80208F68 00205EC8 4E 80 04 21 */ bctrl /* 80208F6C 00205ECC 80 A1 00 40 */ lwz r5, 0x40(r1) /* 80208F70 00205ED0 38 61 00 40 */ addi r3, r1, 0x40 /* 80208F74 00205ED4 38 80 FF FF */ li r4, -1 @@ -187,7 +187,7 @@ lbl_80208F50: /* 80208FB0 00205F10 81 84 00 00 */ lwz r12, 0(r4) /* 80208FB4 00205F14 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80208FB8 00205F18 7D 89 03 A6 */ mtctr r12 -/* 80208FBC 00205F1C 4E 80 04 21 */ bctrl +/* 80208FBC 00205F1C 4E 80 04 21 */ bctrl /* 80208FC0 00205F20 38 61 00 58 */ addi r3, r1, 0x58 /* 80208FC4 00205F24 38 81 00 38 */ addi r4, r1, 0x38 /* 80208FC8 00205F28 48 13 7E E1 */ bl __ct__6CTokenFRC6CToken @@ -241,7 +241,7 @@ lbl_8020905C: /* 80209074 00205FD4 81 84 00 00 */ lwz r12, 0(r4) /* 80209078 00205FD8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8020907C 00205FDC 7D 89 03 A6 */ mtctr r12 -/* 80209080 00205FE0 4E 80 04 21 */ bctrl +/* 80209080 00205FE0 4E 80 04 21 */ bctrl /* 80209084 00205FE4 38 61 00 50 */ addi r3, r1, 0x50 /* 80209088 00205FE8 38 81 00 30 */ addi r4, r1, 0x30 /* 8020908C 00205FEC 48 13 7E 1D */ bl __ct__6CTokenFRC6CToken @@ -369,7 +369,7 @@ lbl_80209240: /* 80209248 002061A8 80 01 00 D4 */ lwz r0, 0xd4(r1) /* 8020924C 002061AC 7C 08 03 A6 */ mtlr r0 /* 80209250 002061B0 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 80209254 002061B4 4E 80 00 20 */ blr +/* 80209254 002061B4 4E 80 00 20 */ blr .global StartTextFadeOut__18CWorldTransManagerFv StartTextFadeOut__18CWorldTransManagerFv: @@ -383,7 +383,7 @@ lbl_8020926C: /* 80209270 002061D0 38 80 00 01 */ li r4, 1 /* 80209274 002061D4 50 80 36 72 */ rlwimi r0, r4, 6, 0x19, 0x19 /* 80209278 002061D8 98 03 00 44 */ stb r0, 0x44(r3) -/* 8020927C 002061DC 4E 80 00 20 */ blr +/* 8020927C 002061DC 4E 80 00 20 */ blr .global DrawText__18CWorldTransManagerCFv DrawText__18CWorldTransManagerCFv: @@ -404,7 +404,7 @@ DrawText__18CWorldTransManagerCFv: /* 802092B8 00206218 C0 42 B1 24 */ lfs f2, lbl_805ACE44@sda21(r2) /* 802092BC 0020621C 81 8C 00 54 */ lwz r12, 0x54(r12) /* 802092C0 00206220 7D 89 03 A6 */ mtctr r12 -/* 802092C4 00206224 4E 80 04 21 */ bctrl +/* 802092C4 00206224 4E 80 04 21 */ bctrl /* 802092C8 00206228 C0 22 B1 28 */ lfs f1, lbl_805ACE48@sda21(r2) /* 802092CC 0020622C 38 61 00 24 */ addi r3, r1, 0x24 /* 802092D0 00206230 C0 62 B1 2C */ lfs f3, lbl_805ACE4C@sda21(r2) @@ -415,7 +415,7 @@ DrawText__18CWorldTransManagerCFv: /* 802092E4 00206244 81 83 00 00 */ lwz r12, 0(r3) /* 802092E8 00206248 81 8C 00 30 */ lwz r12, 0x30(r12) /* 802092EC 0020624C 7D 89 03 A6 */ mtctr r12 -/* 802092F0 00206250 4E 80 04 21 */ bctrl +/* 802092F0 00206250 4E 80 04 21 */ bctrl /* 802092F4 00206254 38 60 00 00 */ li r3, 0 /* 802092F8 00206258 48 10 27 79 */ bl SetCullMode__9CGraphicsF12ERglCullMode /* 802092FC 0020625C 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) @@ -424,12 +424,12 @@ DrawText__18CWorldTransManagerCFv: /* 80209308 00206268 81 83 00 00 */ lwz r12, 0(r3) /* 8020930C 0020626C 81 8C 00 60 */ lwz r12, 0x60(r12) /* 80209310 00206270 7D 89 03 A6 */ mtctr r12 -/* 80209314 00206274 4E 80 04 21 */ bctrl +/* 80209314 00206274 4E 80 04 21 */ bctrl /* 80209318 00206278 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 8020931C 0020627C 81 83 00 00 */ lwz r12, 0(r3) /* 80209320 00206280 81 8C 00 64 */ lwz r12, 0x64(r12) /* 80209324 00206284 7D 89 03 A6 */ mtctr r12 -/* 80209328 00206288 4E 80 04 21 */ bctrl +/* 80209328 00206288 4E 80 04 21 */ bctrl /* 8020932C 0020628C 80 7F 00 08 */ lwz r3, 8(r31) /* 80209330 00206290 48 0C 02 15 */ bl Render__15CGuiTextSupportFv /* 80209334 00206294 C0 5F 00 00 */ lfs f2, 0(r31) @@ -501,7 +501,7 @@ lbl_802093FC: /* 80209418 00206378 83 E1 00 5C */ lwz r31, 0x5c(r1) /* 8020941C 0020637C 7C 08 03 A6 */ mtlr r0 /* 80209420 00206380 38 21 00 80 */ addi r1, r1, 0x80 -/* 80209424 00206384 4E 80 00 20 */ blr +/* 80209424 00206384 4E 80 00 20 */ blr .global UpdateText__18CWorldTransManagerFf UpdateText__18CWorldTransManagerFf: @@ -625,7 +625,7 @@ lbl_802095D4: /* 802095E0 00206540 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 802095E4 00206544 7C 08 03 A6 */ mtlr r0 /* 802095E8 00206548 38 21 00 40 */ addi r1, r1, 0x40 -/* 802095EC 0020654C 4E 80 00 20 */ blr +/* 802095EC 0020654C 4E 80 00 20 */ blr .global EnableTransition__18CWorldTransManagerFviibbfff EnableTransition__18CWorldTransManagerFviibbfff: @@ -707,7 +707,7 @@ lbl_802096D8: /* 80209718 00206678 81 84 00 00 */ lwz r12, 0(r4) /* 8020971C 0020667C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80209720 00206680 7D 89 03 A6 */ mtctr r12 -/* 80209724 00206684 4E 80 04 21 */ bctrl +/* 80209724 00206684 4E 80 04 21 */ bctrl /* 80209728 00206688 38 61 00 10 */ addi r3, r1, 0x10 /* 8020972C 0020668C 38 81 00 18 */ addi r4, r1, 0x18 /* 80209730 00206690 48 13 77 79 */ bl __ct__6CTokenFRC6CToken @@ -752,7 +752,7 @@ lbl_80209768: /* 802097C0 00206720 80 01 00 84 */ lwz r0, 0x84(r1) /* 802097C4 00206724 7C 08 03 A6 */ mtlr r0 /* 802097C8 00206728 38 21 00 80 */ addi r1, r1, 0x80 -/* 802097CC 0020672C 4E 80 00 20 */ blr +/* 802097CC 0020672C 4E 80 00 20 */ blr .global sub_802097d0 sub_802097d0: @@ -773,7 +773,7 @@ sub_802097d0: /* 80209808 00206768 83 C1 00 08 */ lwz r30, 8(r1) /* 8020980C 0020676C 7C 08 03 A6 */ mtlr r0 /* 80209810 00206770 38 21 00 10 */ addi r1, r1, 0x10 -/* 80209814 00206774 4E 80 00 20 */ blr +/* 80209814 00206774 4E 80 00 20 */ blr .global __dt__Q218CWorldTransManager11SModelDatasFv __dt__Q218CWorldTransManager11SModelDatasFv: @@ -870,14 +870,14 @@ lbl_80209948: /* 80209954 002068B4 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80209958 002068B8 7C 08 03 A6 */ mtlr r0 /* 8020995C 002068BC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80209960 002068C0 4E 80 00 20 */ blr +/* 80209960 002068C0 4E 80 00 20 */ blr .global sub_80209964 sub_80209964: /* 80209964 002068C4 B0 83 00 24 */ sth r4, 0x24(r3) /* 80209968 002068C8 98 A3 00 2C */ stb r5, 0x2c(r3) /* 8020996C 002068CC 98 C3 00 2D */ stb r6, 0x2d(r3) -/* 80209970 002068D0 4E 80 00 20 */ blr +/* 80209970 002068D0 4E 80 00 20 */ blr .global sub_80209974 sub_80209974: @@ -900,7 +900,7 @@ lbl_802099AC: /* 802099B0 00206910 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802099B4 00206914 7C 08 03 A6 */ mtlr r0 /* 802099B8 00206918 38 21 00 20 */ addi r1, r1, 0x20 -/* 802099BC 0020691C 4E 80 00 20 */ blr +/* 802099BC 0020691C 4E 80 00 20 */ blr .global sub_802099c0 sub_802099c0: @@ -931,7 +931,7 @@ lbl_80209A18: /* 80209A1C 0020697C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80209A20 00206980 7C 08 03 A6 */ mtlr r0 /* 80209A24 00206984 38 21 00 20 */ addi r1, r1, 0x20 -/* 80209A28 00206988 4E 80 00 20 */ blr +/* 80209A28 00206988 4E 80 00 20 */ blr .global DrawDisabled__18CWorldTransManagerCFv DrawDisabled__18CWorldTransManagerCFv: @@ -955,7 +955,7 @@ DrawDisabled__18CWorldTransManagerCFv: /* 80209A70 002069D0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80209A74 002069D4 7C 08 03 A6 */ mtlr r0 /* 80209A78 002069D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80209A7C 002069DC 4E 80 00 20 */ blr +/* 80209A7C 002069DC 4E 80 00 20 */ blr .global DrawEnabled__18CWorldTransManagerCFv DrawEnabled__18CWorldTransManagerCFv: @@ -1001,7 +1001,7 @@ DrawEnabled__18CWorldTransManagerCFv: /* 80209B1C 00206A7C EC 00 28 28 */ fsubs f0, f0, f5 /* 80209B20 00206A80 EC 42 00 24 */ fdivs f2, f2, f0 /* 80209B24 00206A84 7D 89 03 A6 */ mtctr r12 -/* 80209B28 00206A88 4E 80 04 21 */ bctrl +/* 80209B28 00206A88 4E 80 04 21 */ bctrl /* 80209B2C 00206A8C 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 80209B30 00206A90 38 80 00 01 */ li r4, 1 /* 80209B34 00206A94 88 03 03 18 */ lbz r0, 0x318(r3) @@ -1092,7 +1092,7 @@ lbl_80209B80: /* 80209C80 00206BE0 81 83 00 00 */ lwz r12, 0(r3) /* 80209C84 00206BE4 81 8C 00 30 */ lwz r12, 0x30(r12) /* 80209C88 00206BE8 7D 89 03 A6 */ mtctr r12 -/* 80209C8C 00206BEC 4E 80 04 21 */ bctrl +/* 80209C8C 00206BEC 4E 80 04 21 */ bctrl /* 80209C90 00206BF0 48 16 E8 D5 */ bl GXPixModeSync /* 80209C94 00206BF4 80 E2 C7 A8 */ lwz r7, lbl_805AE4C8@sda21(r2) /* 80209C98 00206BF8 7F E3 FB 78 */ mr r3, r31 @@ -1264,7 +1264,7 @@ lbl_80209F04: /* 80209F18 00206E78 80 01 00 84 */ lwz r0, 0x84(r1) /* 80209F1C 00206E7C 7C 08 03 A6 */ mtlr r0 /* 80209F20 00206E80 38 21 00 80 */ addi r1, r1, 0x80 -/* 80209F24 00206E84 4E 80 00 20 */ blr +/* 80209F24 00206E84 4E 80 00 20 */ blr .global DrawSecondPass__18CWorldTransManagerCFv DrawSecondPass__18CWorldTransManagerCFv: @@ -1329,7 +1329,7 @@ DrawSecondPass__18CWorldTransManagerCFv: /* 8020A010 00206F70 83 E1 00 EC */ lwz r31, 0xec(r1) /* 8020A014 00206F74 7C 08 03 A6 */ mtlr r0 /* 8020A018 00206F78 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 8020A01C 00206F7C 4E 80 00 20 */ blr +/* 8020A01C 00206F7C 4E 80 00 20 */ blr .global DrawFirstPass__18CWorldTransManagerCFv DrawFirstPass__18CWorldTransManagerCFv: @@ -1443,7 +1443,7 @@ lbl_8020A1B8: /* 8020A1C4 00207124 83 E1 01 2C */ lwz r31, 0x12c(r1) /* 8020A1C8 00207128 7C 08 03 A6 */ mtlr r0 /* 8020A1CC 0020712C 38 21 01 40 */ addi r1, r1, 0x140 -/* 8020A1D0 00207130 4E 80 00 20 */ blr +/* 8020A1D0 00207130 4E 80 00 20 */ blr .global DrawAllModels__18CWorldTransManagerCFv DrawAllModels__18CWorldTransManagerCFv: @@ -1668,7 +1668,7 @@ lbl_8020A50C: /* 8020A520 00207480 83 C1 03 E8 */ lwz r30, 0x3e8(r1) /* 8020A524 00207484 7C 08 03 A6 */ mtlr r0 /* 8020A528 00207488 38 21 03 F0 */ addi r1, r1, 0x3f0 -/* 8020A52C 0020748C 4E 80 00 20 */ blr +/* 8020A52C 0020748C 4E 80 00 20 */ blr .global UpdateLights__18CWorldTransManagerFf UpdateLights__18CWorldTransManagerFf: @@ -1826,7 +1826,7 @@ lbl_8020A75C: /* 8020A76C 002076CC 83 C1 01 88 */ lwz r30, 0x188(r1) /* 8020A770 002076D0 7C 08 03 A6 */ mtlr r0 /* 8020A774 002076D4 38 21 01 A0 */ addi r1, r1, 0x1a0 -/* 8020A778 002076D8 4E 80 00 20 */ blr +/* 8020A778 002076D8 4E 80 00 20 */ blr .global Draw__18CWorldTransManagerCFv Draw__18CWorldTransManagerCFv: @@ -1856,7 +1856,7 @@ lbl_8020A7C4: /* 8020A7C4 00207724 80 01 00 14 */ lwz r0, 0x14(r1) /* 8020A7C8 00207728 7C 08 03 A6 */ mtlr r0 /* 8020A7CC 0020772C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8020A7D0 00207730 4E 80 00 20 */ blr +/* 8020A7D0 00207730 4E 80 00 20 */ blr .global UpdateEnabled__18CWorldTransManagerFf UpdateEnabled__18CWorldTransManagerFf: @@ -2059,19 +2059,19 @@ lbl_8020AAA4: /* 8020AAC0 00207A20 83 C1 00 88 */ lwz r30, 0x88(r1) /* 8020AAC4 00207A24 7C 08 03 A6 */ mtlr r0 /* 8020AAC8 00207A28 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8020AACC 00207A2C 4E 80 00 20 */ blr +/* 8020AACC 00207A2C 4E 80 00 20 */ blr .global UpdateDisabled__18CWorldTransManagerFf UpdateDisabled__18CWorldTransManagerFf: /* 8020AAD0 00207A30 C0 23 00 00 */ lfs f1, 0(r3) /* 8020AAD4 00207A34 C0 02 B1 48 */ lfs f0, lbl_805ACE68@sda21(r2) /* 8020AAD8 00207A38 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8020AADC 00207A3C 4C 81 00 20 */ blelr +/* 8020AADC 00207A3C 4C 81 00 20 */ blelr /* 8020AAE0 00207A40 88 03 00 44 */ lbz r0, 0x44(r3) /* 8020AAE4 00207A44 38 80 00 01 */ li r4, 1 /* 8020AAE8 00207A48 50 80 3E 30 */ rlwimi r0, r4, 7, 0x18, 0x18 /* 8020AAEC 00207A4C 98 03 00 44 */ stb r0, 0x44(r3) -/* 8020AAF0 00207A50 4E 80 00 20 */ blr +/* 8020AAF0 00207A50 4E 80 00 20 */ blr .global Update__18CWorldTransManagerFf Update__18CWorldTransManagerFf: @@ -2104,7 +2104,7 @@ lbl_8020AB48: /* 8020AB48 00207AA8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8020AB4C 00207AAC 7C 08 03 A6 */ mtlr r0 /* 8020AB50 00207AB0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8020AB54 00207AB4 4E 80 00 20 */ blr +/* 8020AB54 00207AB4 4E 80 00 20 */ blr .global EndTransition__18CWorldTransManagerFv EndTransition__18CWorldTransManagerFv: @@ -2115,7 +2115,7 @@ EndTransition__18CWorldTransManagerFv: /* 8020AB68 00207AC8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8020AB6C 00207ACC 7C 08 03 A6 */ mtlr r0 /* 8020AB70 00207AD0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8020AB74 00207AD4 4E 80 00 20 */ blr +/* 8020AB74 00207AD4 4E 80 00 20 */ blr .global StartTransition__18CWorldTransManagerFv StartTransition__18CWorldTransManagerFv: @@ -2130,7 +2130,7 @@ StartTransition__18CWorldTransManagerFv: /* 8020AB98 00207AF8 88 03 00 44 */ lbz r0, 0x44(r3) /* 8020AB9C 00207AFC 50 80 1F 38 */ rlwimi r0, r4, 3, 0x1c, 0x1c /* 8020ABA0 00207B00 98 03 00 44 */ stb r0, 0x44(r3) -/* 8020ABA4 00207B04 4E 80 00 20 */ blr +/* 8020ABA4 00207B04 4E 80 00 20 */ blr .global EnableTransition__18CWorldTransManagerFRC8CAnimResUiRC9CVector3fUiRC9CVector3fb EnableTransition__18CWorldTransManagerFRC8CAnimResUiRC9CVector3fUiRC9CVector3fb: @@ -2226,7 +2226,7 @@ lbl_8020AC20: /* 8020AD08 00207C68 81 84 00 00 */ lwz r12, 0(r4) /* 8020AD0C 00207C6C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8020AD10 00207C70 7D 89 03 A6 */ mtctr r12 -/* 8020AD14 00207C74 4E 80 04 21 */ bctrl +/* 8020AD14 00207C74 4E 80 04 21 */ bctrl /* 8020AD18 00207C78 80 7A 00 04 */ lwz r3, 4(r26) /* 8020AD1C 00207C7C 3B 23 01 4C */ addi r25, r3, 0x14c /* 8020AD20 00207C80 88 03 01 54 */ lbz r0, 0x154(r3) @@ -2284,7 +2284,7 @@ lbl_8020AD58: /* 8020ADE4 00207D44 81 84 00 00 */ lwz r12, 0(r4) /* 8020ADE8 00207D48 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8020ADEC 00207D4C 7D 89 03 A6 */ mtctr r12 -/* 8020ADF0 00207D50 4E 80 04 21 */ bctrl +/* 8020ADF0 00207D50 4E 80 04 21 */ bctrl /* 8020ADF4 00207D54 80 7A 00 04 */ lwz r3, 4(r26) /* 8020ADF8 00207D58 3B 23 01 58 */ addi r25, r3, 0x158 /* 8020ADFC 00207D5C 88 03 01 60 */ lbz r0, 0x160(r3) @@ -2321,7 +2321,7 @@ lbl_8020AE34: /* 8020AE6C 00207DCC 81 84 00 00 */ lwz r12, 0(r4) /* 8020AE70 00207DD0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8020AE74 00207DD4 7D 89 03 A6 */ mtctr r12 -/* 8020AE78 00207DD8 4E 80 04 21 */ bctrl +/* 8020AE78 00207DD8 4E 80 04 21 */ bctrl /* 8020AE7C 00207DDC 80 7A 00 04 */ lwz r3, 4(r26) /* 8020AE80 00207DE0 3B 23 01 64 */ addi r25, r3, 0x164 /* 8020AE84 00207DE4 88 03 01 6C */ lbz r0, 0x16c(r3) @@ -2424,7 +2424,7 @@ lbl_8020AFDC: /* 8020AFF0 00207F50 80 01 01 C4 */ lwz r0, 0x1c4(r1) /* 8020AFF4 00207F54 7C 08 03 A6 */ mtlr r0 /* 8020AFF8 00207F58 38 21 01 C0 */ addi r1, r1, 0x1c0 -/* 8020AFFC 00207F5C 4E 80 00 20 */ blr +/* 8020AFFC 00207F5C 4E 80 00 20 */ blr .global TouchModels__18CWorldTransManagerFv TouchModels__18CWorldTransManagerFv: @@ -2704,7 +2704,7 @@ lbl_8020B3D0: /* 8020B3D4 00208334 83 E1 01 1C */ lwz r31, 0x11c(r1) /* 8020B3D8 00208338 7C 08 03 A6 */ mtlr r0 /* 8020B3DC 0020833C 38 21 01 20 */ addi r1, r1, 0x120 -/* 8020B3E0 00208340 4E 80 00 20 */ blr +/* 8020B3E0 00208340 4E 80 00 20 */ blr .global sub_8020b3e4 sub_8020b3e4: @@ -2754,7 +2754,7 @@ lbl_8020B46C: /* 8020B478 002083D8 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8020B47C 002083DC 7C 08 03 A6 */ mtlr r0 /* 8020B480 002083E0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8020B484 002083E4 4E 80 00 20 */ blr +/* 8020B484 002083E4 4E 80 00 20 */ blr .global DisableTransition__18CWorldTransManagerFv DisableTransition__18CWorldTransManagerFv: @@ -2780,7 +2780,7 @@ DisableTransition__18CWorldTransManagerFv: /* 8020B4D4 00208434 80 01 00 14 */ lwz r0, 0x14(r1) /* 8020B4D8 00208438 7C 08 03 A6 */ mtlr r0 /* 8020B4DC 0020843C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8020B4E0 00208440 4E 80 00 20 */ blr +/* 8020B4E0 00208440 4E 80 00 20 */ blr .global sub_8020b4e4 sub_8020b4e4: @@ -2880,7 +2880,7 @@ sub_8020b4e4: /* 8020B658 002085B8 83 E1 01 3C */ lwz r31, 0x13c(r1) /* 8020B65C 002085BC 7C 08 03 A6 */ mtlr r0 /* 8020B660 002085C0 38 21 01 40 */ addi r1, r1, 0x140 -/* 8020B664 002085C4 4E 80 00 20 */ blr +/* 8020B664 002085C4 4E 80 00 20 */ blr .global sub_8020b668 sub_8020b668: @@ -2925,7 +2925,7 @@ lbl_8020B6E4: /* 8020B6F0 00208650 83 C1 00 08 */ lwz r30, 8(r1) /* 8020B6F4 00208654 7C 08 03 A6 */ mtlr r0 /* 8020B6F8 00208658 38 21 00 10 */ addi r1, r1, 0x10 -/* 8020B6FC 0020865C 4E 80 00 20 */ blr +/* 8020B6FC 0020865C 4E 80 00 20 */ blr .global __dt__18CWorldTransManagerFv __dt__18CWorldTransManagerFv: @@ -2951,7 +2951,7 @@ lbl_8020B73C: /* 8020B748 002086A8 83 C1 00 08 */ lwz r30, 8(r1) /* 8020B74C 002086AC 7C 08 03 A6 */ mtlr r0 /* 8020B750 002086B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8020B754 002086B4 4E 80 00 20 */ blr +/* 8020B754 002086B4 4E 80 00 20 */ blr .global __ct__18CWorldTransManagerFv __ct__18CWorldTransManagerFv: @@ -3001,7 +3001,7 @@ __ct__18CWorldTransManagerFv: /* 8020B804 00208764 80 01 00 14 */ lwz r0, 0x14(r1) /* 8020B808 00208768 7C 08 03 A6 */ mtlr r0 /* 8020B80C 0020876C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8020B810 00208770 4E 80 00 20 */ blr +/* 8020B810 00208770 4E 80 00 20 */ blr .global sub_8020b814 sub_8020b814: @@ -3043,7 +3043,7 @@ lbl_8020B87C: /* 8020B898 002087F8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8020B89C 002087FC 7C 08 03 A6 */ mtlr r0 /* 8020B8A0 00208800 38 21 00 20 */ addi r1, r1, 0x20 -/* 8020B8A4 00208804 4E 80 00 20 */ blr +/* 8020B8A4 00208804 4E 80 00 20 */ blr .global sub_8020b8a8 sub_8020b8a8: diff --git a/asm/MetroidPrime/Cameras/CBallCamera.s b/asm/MetroidPrime/Cameras/CBallCamera.s index 311bc36a..d24a8eed 100644 --- a/asm/MetroidPrime/Cameras/CBallCamera.s +++ b/asm/MetroidPrime/Cameras/CBallCamera.s @@ -912,7 +912,7 @@ lbl_80081794: /* 800817C0 0007E720 80 01 0E 44 */ lwz r0, 0xe44(r1) /* 800817C4 0007E724 7C 08 03 A6 */ mtlr r0 /* 800817C8 0007E728 38 21 0E 40 */ addi r1, r1, 0xe40 -/* 800817CC 0007E72C 4E 80 00 20 */ blr +/* 800817CC 0007E72C 4E 80 00 20 */ blr .global CheckFailsafeFromMorphBallState__11CBallCameraCFR13CStateManager CheckFailsafeFromMorphBallState__11CBallCameraCFR13CStateManager: @@ -1380,7 +1380,7 @@ lbl_80081E44: /* 80081E70 0007EDD0 80 01 0B C4 */ lwz r0, 0xbc4(r1) /* 80081E74 0007EDD4 7C 08 03 A6 */ mtlr r0 /* 80081E78 0007EDD8 38 21 0B C0 */ addi r1, r1, 0xbc0 -/* 80081E7C 0007EDDC 4E 80 00 20 */ blr +/* 80081E7C 0007EDDC 4E 80 00 20 */ blr .global ApplyCameraHint__11CBallCameraFR13CStateManager ApplyCameraHint__11CBallCameraFR13CStateManager: @@ -1688,7 +1688,7 @@ lbl_80082294: /* 800822A8 0007F208 38 63 AC 04 */ addi r3, r3, lbl_803DAC04@l /* 800822AC 0007F20C 7C 03 00 2E */ lwzx r0, r3, r0 /* 800822B0 0007F210 7C 09 03 A6 */ mtctr r0 -/* 800822B4 0007F214 4E 80 04 20 */ bctr +/* 800822B4 0007F214 4E 80 04 20 */ bctr .global lbl_800822B8 lbl_800822B8: /* 800822B8 0007F218 C0 1F 01 1C */ lfs f0, 0x11c(r31) @@ -1987,7 +1987,7 @@ lbl_800826F4: /* 80082710 0007F670 83 A1 03 04 */ lwz r29, 0x304(r1) /* 80082714 0007F674 7C 08 03 A6 */ mtlr r0 /* 80082718 0007F678 38 21 03 30 */ addi r1, r1, 0x330 -/* 8008271C 0007F67C 4E 80 00 20 */ blr +/* 8008271C 0007F67C 4E 80 00 20 */ blr .global Accept__11CBallCameraFR8IVisitor Accept__11CBallCameraFR8IVisitor: @@ -2000,11 +2000,11 @@ Accept__11CBallCameraFR8IVisitor: /* 80082738 0007F698 7C 04 03 78 */ mr r4, r0 /* 8008273C 0007F69C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80082740 0007F6A0 7D 89 03 A6 */ mtctr r12 -/* 80082744 0007F6A4 4E 80 04 21 */ bctrl +/* 80082744 0007F6A4 4E 80 04 21 */ bctrl /* 80082748 0007F6A8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8008274C 0007F6AC 7C 08 03 A6 */ mtlr r0 /* 80082750 0007F6B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80082754 0007F6B4 4E 80 00 20 */ blr +/* 80082754 0007F6B4 4E 80 00 20 */ blr .global AcceptScriptMsg__11CBallCameraF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__11CBallCameraF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -2249,7 +2249,7 @@ lbl_80082AF8: /* 80082AFC 0007FA5C 80 01 01 04 */ lwz r0, 0x104(r1) /* 80082B00 0007FA60 7C 08 03 A6 */ mtlr r0 /* 80082B04 0007FA64 38 21 01 00 */ addi r1, r1, 0x100 -/* 80082B08 0007FA68 4E 80 00 20 */ blr +/* 80082B08 0007FA68 4E 80 00 20 */ blr .global ProcessInput__11CBallCameraFRC11CFinalInputR13CStateManager ProcessInput__11CBallCameraFRC11CFinalInputR13CStateManager: @@ -2360,7 +2360,7 @@ lbl_80082C7C: /* 80082C8C 0007FBEC 83 81 00 20 */ lwz r28, 0x20(r1) /* 80082C90 0007FBF0 7C 08 03 A6 */ mtlr r0 /* 80082C94 0007FBF4 38 21 00 30 */ addi r1, r1, 0x30 -/* 80082C98 0007FBF8 4E 80 00 20 */ blr +/* 80082C98 0007FBF8 4E 80 00 20 */ blr .global SetState__11CBallCameraFQ211CBallCamera16EBallCameraStateR13CStateManager SetState__11CBallCameraFQ211CBallCamera16EBallCameraStateR13CStateManager: @@ -2465,7 +2465,7 @@ lbl_80082DF8: /* 80082E10 0007FD70 83 A1 00 54 */ lwz r29, 0x54(r1) /* 80082E14 0007FD74 7C 08 03 A6 */ mtlr r0 /* 80082E18 0007FD78 38 21 00 70 */ addi r1, r1, 0x70 -/* 80082E1C 0007FD7C 4E 80 00 20 */ blr +/* 80082E1C 0007FD7C 4E 80 00 20 */ blr .global Think__11CBallCameraFfR13CStateManager Think__11CBallCameraFfR13CStateManager: @@ -2526,7 +2526,7 @@ lbl_80082EB8: /* 80082EF4 0007FE54 81 9E 00 00 */ lwz r12, 0(r30) /* 80082EF8 0007FE58 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80082EFC 0007FE5C 7D 89 03 A6 */ mtctr r12 -/* 80082F00 0007FE60 4E 80 04 21 */ bctrl +/* 80082F00 0007FE60 4E 80 04 21 */ bctrl /* 80082F04 0007FE64 48 00 01 D0 */ b lbl_800830D4 lbl_80082F08: /* 80082F08 0007FE68 28 1E 00 00 */ cmplwi r30, 0 @@ -2536,7 +2536,7 @@ lbl_80082F08: /* 80082F18 0007FE78 81 9E 00 00 */ lwz r12, 0(r30) /* 80082F1C 0007FE7C 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80082F20 0007FE80 7D 89 03 A6 */ mtctr r12 -/* 80082F24 0007FE84 4E 80 04 21 */ bctrl +/* 80082F24 0007FE84 4E 80 04 21 */ bctrl lbl_80082F28: /* 80082F28 0007FE88 38 61 00 B0 */ addi r3, r1, 0xb0 /* 80082F2C 0007FE8C 38 9F 00 34 */ addi r4, r31, 0x34 @@ -2663,31 +2663,31 @@ lbl_800830D4: /* 800830E4 00080044 83 A1 00 EC */ lwz r29, 0xec(r1) /* 800830E8 00080048 7C 08 03 A6 */ mtlr r0 /* 800830EC 0008004C 38 21 01 00 */ addi r1, r1, 0x100 -/* 800830F0 00080050 4E 80 00 20 */ blr +/* 800830F0 00080050 4E 80 00 20 */ blr .global DoorClosed__11CBallCameraF9TUniqueId DoorClosed__11CBallCameraF9TUniqueId: /* 800830F4 00080054 A0 84 00 00 */ lhz r4, 0(r4) /* 800830F8 00080058 A0 03 03 DC */ lhz r0, 0x3dc(r3) /* 800830FC 0008005C 7C 04 00 40 */ cmplw r4, r0 -/* 80083100 00080060 4C 82 00 20 */ bnelr +/* 80083100 00080060 4C 82 00 20 */ bnelr /* 80083104 00080064 88 03 01 8E */ lbz r0, 0x18e(r3) /* 80083108 00080068 38 80 00 01 */ li r4, 1 /* 8008310C 0008006C 50 80 26 F6 */ rlwimi r0, r4, 4, 0x1b, 0x1b /* 80083110 00080070 98 03 01 8E */ stb r0, 0x18e(r3) -/* 80083114 00080074 4E 80 00 20 */ blr +/* 80083114 00080074 4E 80 00 20 */ blr .global DoorClosing__11CBallCameraF9TUniqueId DoorClosing__11CBallCameraF9TUniqueId: /* 80083118 00080078 A0 84 00 00 */ lhz r4, 0(r4) /* 8008311C 0008007C A0 03 03 DC */ lhz r0, 0x3dc(r3) /* 80083120 00080080 7C 04 00 40 */ cmplw r4, r0 -/* 80083124 00080084 4C 82 00 20 */ bnelr +/* 80083124 00080084 4C 82 00 20 */ bnelr /* 80083128 00080088 88 03 01 8E */ lbz r0, 0x18e(r3) /* 8008312C 0008008C 38 80 00 01 */ li r4, 1 /* 80083130 00080090 50 80 1F 38 */ rlwimi r0, r4, 3, 0x1c, 0x1c /* 80083134 00080094 98 03 01 8E */ stb r0, 0x18e(r3) -/* 80083138 00080098 4E 80 00 20 */ blr +/* 80083138 00080098 4E 80 00 20 */ blr .global IsBallNearDoor__11CBallCameraCFRC9CVector3fR13CStateManager IsBallNearDoor__11CBallCameraCFRC9CVector3fR13CStateManager: @@ -2726,7 +2726,7 @@ lbl_800831AC: /* 800831B4 00080114 81 9D 00 00 */ lwz r12, 0(r29) /* 800831B8 00080118 81 8C 00 40 */ lwz r12, 0x40(r12) /* 800831BC 0008011C 7D 89 03 A6 */ mtctr r12 -/* 800831C0 00080120 4E 80 04 21 */ bctrl +/* 800831C0 00080120 4E 80 04 21 */ bctrl /* 800831C4 00080124 88 01 00 68 */ lbz r0, 0x68(r1) /* 800831C8 00080128 28 00 00 00 */ cmplwi r0, 0 /* 800831CC 0008012C 98 01 00 9C */ stb r0, 0x9c(r1) @@ -2833,7 +2833,7 @@ lbl_8008333C: /* 80083348 000802A8 83 A1 00 A4 */ lwz r29, 0xa4(r1) /* 8008334C 000802AC 7C 08 03 A6 */ mtlr r0 /* 80083350 000802B0 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 80083354 000802B4 4E 80 00 20 */ blr +/* 80083354 000802B4 4E 80 00 20 */ blr .global CheckFailSafe__11CBallCameraFfR13CStateManager CheckFailSafe__11CBallCameraFfR13CStateManager: @@ -3230,7 +3230,7 @@ lbl_8008390C: /* 80083934 00080894 83 81 09 10 */ lwz r28, 0x910(r1) /* 80083938 00080898 7C 08 03 A6 */ mtlr r0 /* 8008393C 0008089C 38 21 09 40 */ addi r1, r1, 0x940 -/* 80083940 000808A0 4E 80 00 20 */ blr +/* 80083940 000808A0 4E 80 00 20 */ blr .global ActivateFailSafe__11CBallCameraFfR13CStateManager ActivateFailSafe__11CBallCameraFfR13CStateManager: @@ -3305,7 +3305,7 @@ ActivateFailSafe__11CBallCameraFfR13CStateManager: /* 80083A54 000809B4 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 80083A58 000809B8 7C 08 03 A6 */ mtlr r0 /* 80083A5C 000809BC 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 80083A60 000809C0 4E 80 00 20 */ blr +/* 80083A60 000809C0 4E 80 00 20 */ blr .global UpdateLookAtPosition__11CBallCameraFfR13CStateManager UpdateLookAtPosition__11CBallCameraFfR13CStateManager: @@ -3681,7 +3681,7 @@ lbl_80083F7C: /* 80083FE8 00080F48 83 A1 00 F4 */ lwz r29, 0xf4(r1) /* 80083FEC 00080F4C 7C 08 03 A6 */ mtlr r0 /* 80083FF0 00080F50 38 21 01 C0 */ addi r1, r1, 0x1c0 -/* 80083FF4 00080F54 4E 80 00 20 */ blr +/* 80083FF4 00080F54 4E 80 00 20 */ blr .global UpdateUsingFixedCameras__11CBallCameraFfR13CStateManager UpdateUsingFixedCameras__11CBallCameraFfR13CStateManager: @@ -3790,7 +3790,7 @@ lbl_80084168: /* 8008417C 000810DC 83 A1 00 54 */ lwz r29, 0x54(r1) /* 80084180 000810E0 7C 08 03 A6 */ mtlr r0 /* 80084184 000810E4 38 21 00 70 */ addi r1, r1, 0x70 -/* 80084188 000810E8 4E 80 00 20 */ blr +/* 80084188 000810E8 4E 80 00 20 */ blr .global GetFixedLookTarget__11CBallCameraCFRC9CVector3fR13CStateManager GetFixedLookTarget__11CBallCameraCFRC9CVector3fR13CStateManager: @@ -4055,7 +4055,7 @@ lbl_80084544: /* 80084558 000814B8 83 A1 00 B4 */ lwz r29, 0xb4(r1) /* 8008455C 000814BC 7C 08 03 A6 */ mtlr r0 /* 80084560 000814C0 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 80084564 000814C4 4E 80 00 20 */ blr +/* 80084564 000814C4 4E 80 00 20 */ blr .global MoveCollisionActor__11CBallCameraFRC9CVector3ffR13CStateManager MoveCollisionActor__11CBallCameraFRC9CVector3ffR13CStateManager: @@ -4281,7 +4281,7 @@ lbl_800848AC: /* 800848B8 00081818 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 800848BC 0008181C 7C 08 03 A6 */ mtlr r0 /* 800848C0 00081820 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 800848C4 00081824 4E 80 00 20 */ blr +/* 800848C4 00081824 4E 80 00 20 */ blr .global ClampElevationToWater__11CBallCameraCFRC9CVector3fR13CStateManager ClampElevationToWater__11CBallCameraCFRC9CVector3fR13CStateManager: @@ -4352,7 +4352,7 @@ lbl_80084994: /* 800849C0 00081920 83 C1 00 38 */ lwz r30, 0x38(r1) /* 800849C4 00081924 7C 08 03 A6 */ mtlr r0 /* 800849C8 00081928 38 21 00 70 */ addi r1, r1, 0x70 -/* 800849CC 0008192C 4E 80 00 20 */ blr +/* 800849CC 0008192C 4E 80 00 20 */ blr .global UpdateAnglePerSecond__11CBallCameraFf UpdateAnglePerSecond__11CBallCameraFf: @@ -4381,10 +4381,10 @@ lbl_80084A1C: /* 80084A24 00081984 EC 22 00 72 */ fmuls f1, f2, f1 /* 80084A28 00081988 EC 03 00 7A */ fmadds f0, f3, f1, f0 /* 80084A2C 0008198C D0 03 01 A4 */ stfs f0, 0x1a4(r3) -/* 80084A30 00081990 4E 80 00 20 */ blr +/* 80084A30 00081990 4E 80 00 20 */ blr lbl_80084A34: /* 80084A34 00081994 D0 63 01 A4 */ stfs f3, 0x1a4(r3) -/* 80084A38 00081998 4E 80 00 20 */ blr +/* 80084A38 00081998 4E 80 00 20 */ blr .global ComputeVelocity__11CBallCameraCFRC9CVector3fRC9CVector3f ComputeVelocity__11CBallCameraCFRC9CVector3fRC9CVector3f: @@ -4452,7 +4452,7 @@ lbl_80084B00: /* 80084B28 00081A88 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80084B2C 00081A8C 7C 08 03 A6 */ mtlr r0 /* 80084B30 00081A90 38 21 00 40 */ addi r1, r1, 0x40 -/* 80084B34 00081A94 4E 80 00 20 */ blr +/* 80084B34 00081A94 4E 80 00 20 */ blr .global TweenVelocity__11CBallCameraFRC9CVector3fRC9CVector3fff TweenVelocity__11CBallCameraFRC9CVector3fRC9CVector3fff: @@ -4550,7 +4550,7 @@ lbl_80084C54: /* 80084C98 00081BF8 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80084C9C 00081BFC 7C 08 03 A6 */ mtlr r0 /* 80084CA0 00081C00 38 21 00 90 */ addi r1, r1, 0x90 -/* 80084CA4 00081C04 4E 80 00 20 */ blr +/* 80084CA4 00081C04 4E 80 00 20 */ blr .global UpdateUsingPathCameras__11CBallCameraFfR13CStateManager UpdateUsingPathCameras__11CBallCameraFfR13CStateManager: @@ -4589,7 +4589,7 @@ lbl_80084D1C: /* 80084D24 00081C84 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80084D28 00081C88 7C 08 03 A6 */ mtlr r0 /* 80084D2C 00081C8C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80084D30 00081C90 4E 80 00 20 */ blr +/* 80084D30 00081C90 4E 80 00 20 */ blr .global UpdateUsingSpindleCameras__11CBallCameraFfR13CStateManager UpdateUsingSpindleCameras__11CBallCameraFfR13CStateManager: @@ -4628,7 +4628,7 @@ lbl_80084DA8: /* 80084DB0 00081D10 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80084DB4 00081D14 7C 08 03 A6 */ mtlr r0 /* 80084DB8 00081D18 38 21 00 20 */ addi r1, r1, 0x20 -/* 80084DBC 00081D1C 4E 80 00 20 */ blr +/* 80084DBC 00081D1C 4E 80 00 20 */ blr .global UpdateUsingTransitions__11CBallCameraFfR13CStateManager UpdateUsingTransitions__11CBallCameraFfR13CStateManager: @@ -5331,7 +5331,7 @@ lbl_80085818: /* 80085828 00082788 81 83 00 00 */ lwz r12, 0(r3) /* 8008582C 0008278C 81 8C 00 70 */ lwz r12, 0x70(r12) /* 80085830 00082790 7D 89 03 A6 */ mtctr r12 -/* 80085834 00082794 4E 80 04 21 */ bctrl +/* 80085834 00082794 4E 80 04 21 */ bctrl lbl_80085838: /* 80085838 00082798 E3 E1 03 98 */ psq_l f31, 920(r1), 0, qr0 /* 8008583C 0008279C CB E1 03 90 */ lfd f31, 0x390(r1) @@ -5360,7 +5360,7 @@ lbl_80085838: /* 80085898 000827F8 83 81 02 F0 */ lwz r28, 0x2f0(r1) /* 8008589C 000827FC 7C 08 03 A6 */ mtlr r0 /* 800858A0 00082800 38 21 03 A0 */ addi r1, r1, 0x3a0 -/* 800858A4 00082804 4E 80 00 20 */ blr +/* 800858A4 00082804 4E 80 00 20 */ blr .global UpdateUsingColliders__11CBallCameraFfR13CStateManager UpdateUsingColliders__11CBallCameraFfR13CStateManager: @@ -6717,7 +6717,7 @@ lbl_80086C80: /* 80086CC4 00083C24 80 01 0C 84 */ lwz r0, 0xc84(r1) /* 80086CC8 00083C28 7C 08 03 A6 */ mtlr r0 /* 80086CCC 00083C2C 38 21 0C 80 */ addi r1, r1, 0xc80 -/* 80086CD0 00083C30 4E 80 00 20 */ blr +/* 80086CD0 00083C30 4E 80 00 20 */ blr .global UpdateUsingFreeLook__11CBallCameraFfR13CStateManager UpdateUsingFreeLook__11CBallCameraFfR13CStateManager: @@ -7176,7 +7176,7 @@ lbl_80087368: /* 800873A4 00084304 83 A1 01 D4 */ lwz r29, 0x1d4(r1) /* 800873A8 00084308 7C 08 03 A6 */ mtlr r0 /* 800873AC 0008430C 38 21 02 40 */ addi r1, r1, 0x240 -/* 800873B0 00084310 4E 80 00 20 */ blr +/* 800873B0 00084310 4E 80 00 20 */ blr .global ResetSpline__11CBallCameraFR13CStateManager ResetSpline__11CBallCameraFR13CStateManager: @@ -7578,7 +7578,7 @@ lbl_8008797C: /* 800879B4 00084914 83 81 09 90 */ lwz r28, 0x990(r1) /* 800879B8 00084918 7C 08 03 A6 */ mtlr r0 /* 800879BC 0008491C 38 21 09 E0 */ addi r1, r1, 0x9e0 -/* 800879C0 00084920 4E 80 00 20 */ blr +/* 800879C0 00084920 4E 80 00 20 */ blr .global BuildSpline__11CBallCameraFR13CStateManager BuildSpline__11CBallCameraFR13CStateManager: @@ -8399,7 +8399,7 @@ lbl_80088610: /* 80088630 00085590 83 C1 0B D8 */ lwz r30, 0xbd8(r1) /* 80088634 00085594 7C 08 03 A6 */ mtlr r0 /* 80088638 00085598 38 21 0C 10 */ addi r1, r1, 0xc10 -/* 8008863C 0008559C 4E 80 00 20 */ blr +/* 8008863C 0008559C 4E 80 00 20 */ blr .global ShouldResetSpline__11CBallCameraCFR13CStateManager ShouldResetSpline__11CBallCameraCFR13CStateManager: @@ -8442,7 +8442,7 @@ lbl_800886B8: /* 800886C8 00085628 83 A1 00 14 */ lwz r29, 0x14(r1) /* 800886CC 0008562C 7C 08 03 A6 */ mtlr r0 /* 800886D0 00085630 38 21 00 20 */ addi r1, r1, 0x20 -/* 800886D4 00085634 4E 80 00 20 */ blr +/* 800886D4 00085634 4E 80 00 20 */ blr .global InterpolateCameraElevation__11CBallCameraCFRC9CVector3ff InterpolateCameraElevation__11CBallCameraCFRC9CVector3ff: @@ -8533,7 +8533,7 @@ lbl_800887F8: /* 80088818 00085778 83 C1 00 28 */ lwz r30, 0x28(r1) /* 8008881C 0008577C 7C 08 03 A6 */ mtlr r0 /* 80088820 00085780 38 21 00 60 */ addi r1, r1, 0x60 -/* 80088824 00085784 4E 80 00 20 */ blr +/* 80088824 00085784 4E 80 00 20 */ blr .global UpdatePlayerMovement__11CBallCameraFfR13CStateManager UpdatePlayerMovement__11CBallCameraFfR13CStateManager: @@ -8717,7 +8717,7 @@ lbl_80088A8C: /* 80088ACC 00085A2C 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80088AD0 00085A30 7C 08 03 A6 */ mtlr r0 /* 80088AD4 00085A34 38 21 00 70 */ addi r1, r1, 0x70 -/* 80088AD8 00085A38 4E 80 00 20 */ blr +/* 80088AD8 00085A38 4E 80 00 20 */ blr .global UpdateTransform__11CBallCameraFRC9CVector3fRC9CVector3ffR13CStateManager UpdateTransform__11CBallCameraFRC9CVector3fRC9CVector3ffR13CStateManager: @@ -9100,7 +9100,7 @@ lbl_80089040: .global sub_8008907c sub_8008907c: -/* 8008907C 00085FDC 4E 80 00 20 */ blr +/* 8008907C 00085FDC 4E 80 00 20 */ blr .global UpdateCameraPositions__11CBallCameraFfRC12CTransform4fRC12CTransform4f UpdateCameraPositions__11CBallCameraFfRC12CTransform4fRC12CTransform4f: @@ -9293,7 +9293,7 @@ lbl_80089340: /* 80089364 000862C4 83 81 01 90 */ lwz r28, 0x190(r1) /* 80089368 000862C8 7C 08 03 A6 */ mtlr r0 /* 8008936C 000862CC 38 21 01 B0 */ addi r1, r1, 0x1b0 -/* 80089370 000862D0 4E 80 00 20 */ blr +/* 80089370 000862D0 4E 80 00 20 */ blr .global ConstrainYawAngle__11CBallCameraCFRC7CPlayerfffR13CStateManager ConstrainYawAngle__11CBallCameraCFRC7CPlayerfffR13CStateManager: @@ -9521,7 +9521,7 @@ lbl_80089690: /* 800896BC 0008661C 83 A1 00 84 */ lwz r29, 0x84(r1) /* 800896C0 00086620 7C 08 03 A6 */ mtlr r0 /* 800896C4 00086624 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 800896C8 00086628 4E 80 00 20 */ blr +/* 800896C8 00086628 4E 80 00 20 */ blr .global ConstrainElevationAndDistance__11CBallCameraFRfRffR13CStateManager ConstrainElevationAndDistance__11CBallCameraFRfRffR13CStateManager: @@ -9673,7 +9673,7 @@ lbl_800898A0: /* 800898EC 0008684C 80 01 00 94 */ lwz r0, 0x94(r1) /* 800898F0 00086850 7C 08 03 A6 */ mtlr r0 /* 800898F4 00086854 38 21 00 90 */ addi r1, r1, 0x90 -/* 800898F8 00086858 4E 80 00 20 */ blr +/* 800898F8 00086858 4E 80 00 20 */ blr .global UpdateObjectTooCloseId__11CBallCameraFR13CStateManager UpdateObjectTooCloseId__11CBallCameraFR13CStateManager: @@ -9842,7 +9842,7 @@ lbl_80089B10: /* 80089B70 00086AD0 83 81 20 80 */ lwz r28, 0x2080(r1) /* 80089B74 00086AD4 7C 08 03 A6 */ mtlr r0 /* 80089B78 00086AD8 38 21 20 F0 */ addi r1, r1, 0x20f0 -/* 80089B7C 00086ADC 4E 80 00 20 */ blr +/* 80089B7C 00086ADC 4E 80 00 20 */ blr .global UpdateLookDirection__11CBallCameraFRC9CVector3fR13CStateManager UpdateLookDirection__11CBallCameraFRC9CVector3fR13CStateManager: @@ -9923,7 +9923,7 @@ lbl_80089BE0: /* 80089CA4 00086C04 83 A1 00 A4 */ lwz r29, 0xa4(r1) /* 80089CA8 00086C08 7C 08 03 A6 */ mtlr r0 /* 80089CAC 00086C0C 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 80089CB0 00086C10 4E 80 00 20 */ blr +/* 80089CB0 00086C10 4E 80 00 20 */ blr .global FindDesiredPosition__11CBallCameraFffRC9CVector3fR13CStateManagerb FindDesiredPosition__11CBallCameraFffRC9CVector3fR13CStateManagerb: @@ -10817,7 +10817,7 @@ lbl_8008A97C: /* 8008A9EC 0008794C 80 01 15 F4 */ lwz r0, 0x15f4(r1) /* 8008A9F0 00087950 7C 08 03 A6 */ mtlr r0 /* 8008A9F4 00087954 38 21 15 F0 */ addi r1, r1, 0x15f0 -/* 8008A9F8 00087958 4E 80 00 20 */ blr +/* 8008A9F8 00087958 4E 80 00 20 */ blr .global DetectCollision__11CBallCameraFRC9CVector3fRC9CVector3ffRfR13CStateManager DetectCollision__11CBallCameraFRC9CVector3fRC9CVector3ffRfR13CStateManager: @@ -11304,7 +11304,7 @@ lbl_8008B0C8: /* 8008B108 00088068 80 01 25 94 */ lwz r0, 0x2594(r1) /* 8008B10C 0008806C 7C 08 03 A6 */ mtlr r0 /* 8008B110 00088070 38 21 25 90 */ addi r1, r1, 0x2590 -/* 8008B114 00088074 4E 80 00 20 */ blr +/* 8008B114 00088074 4E 80 00 20 */ blr .global "AvoidGeometry__11CBallCameraFRC12CTransform4fRCQ24rstl32reserved_vector<9TUniqueId,1024>fR13CStateManager" "AvoidGeometry__11CBallCameraFRC12CTransform4fRCQ24rstl32reserved_vector<9TUniqueId,1024>fR13CStateManager": @@ -11391,7 +11391,7 @@ lbl_8008B228: /* 8008B23C 0008819C 83 C1 00 08 */ lwz r30, 8(r1) /* 8008B240 000881A0 7C 08 03 A6 */ mtlr r0 /* 8008B244 000881A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8008B248 000881A8 4E 80 00 20 */ blr +/* 8008B248 000881A8 4E 80 00 20 */ blr .global "AvoidGeometryFull__11CBallCameraFRC12CTransform4fRCQ24rstl32reserved_vector<9TUniqueId,1024>fR13CStateManager" "AvoidGeometryFull__11CBallCameraFRC12CTransform4fRCQ24rstl32reserved_vector<9TUniqueId,1024>fR13CStateManager": @@ -11446,7 +11446,7 @@ lbl_8008B228: /* 8008B30C 0008826C 80 01 00 34 */ lwz r0, 0x34(r1) /* 8008B310 00088270 7C 08 03 A6 */ mtlr r0 /* 8008B314 00088274 38 21 00 30 */ addi r1, r1, 0x30 -/* 8008B318 00088278 4E 80 00 20 */ blr +/* 8008B318 00088278 4E 80 00 20 */ blr .global "CalculateCollidersBoundingBox__11CBallCameraCFRCQ24rstl52vector<15CCameraCollider,Q24rstl17rmemory_allocator>RC13CStateManager" "CalculateCollidersBoundingBox__11CBallCameraCFRCQ24rstl52vector<15CCameraCollider,Q24rstl17rmemory_allocator>RC13CStateManager": @@ -11512,7 +11512,7 @@ lbl_8008B398: /* 8008B400 00088360 80 01 00 54 */ lwz r0, 0x54(r1) /* 8008B404 00088364 7C 08 03 A6 */ mtlr r0 /* 8008B408 00088368 38 21 00 50 */ addi r1, r1, 0x50 -/* 8008B40C 0008836C 4E 80 00 20 */ blr +/* 8008B40C 0008836C 4E 80 00 20 */ blr .global "CountObscuredColliders__11CBallCameraCFRCQ24rstl52vector<15CCameraCollider,Q24rstl17rmemory_allocator>" "CountObscuredColliders__11CBallCameraCFRCQ24rstl52vector<15CCameraCollider,Q24rstl17rmemory_allocator>": @@ -11521,7 +11521,7 @@ lbl_8008B398: /* 8008B418 00088378 38 C0 00 00 */ li r6, 0 /* 8008B41C 0008837C 7C 09 03 A6 */ mtctr r0 /* 8008B420 00088380 2C 00 00 00 */ cmpwi r0, 0 -/* 8008B424 00088384 4C 81 00 20 */ blelr +/* 8008B424 00088384 4C 81 00 20 */ blelr lbl_8008B428: /* 8008B428 00088388 80 A4 00 0C */ lwz r5, 0xc(r4) /* 8008B42C 0008838C 38 06 00 4C */ addi r0, r6, 0x4c @@ -11535,7 +11535,7 @@ lbl_8008B440: .global sub_8008b448 sub_8008b448: -/* 8008B448 000883A8 4E 80 00 20 */ blr +/* 8008B448 000883A8 4E 80 00 20 */ blr .global ApplyColliders__11CBallCameraFv ApplyColliders__11CBallCameraFv: @@ -11750,7 +11750,7 @@ lbl_8008B714: /* 8008B74C 000886AC 83 C1 00 38 */ lwz r30, 0x38(r1) /* 8008B750 000886B0 7C 08 03 A6 */ mtlr r0 /* 8008B754 000886B4 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8008B758 000886B8 4E 80 00 20 */ blr +/* 8008B758 000886B8 4E 80 00 20 */ blr .global "CalculateCollidersCentroid__11CBallCameraCFRCQ24rstl52vector<15CCameraCollider,Q24rstl17rmemory_allocator>i" "CalculateCollidersCentroid__11CBallCameraCFRCQ24rstl52vector<15CCameraCollider,Q24rstl17rmemory_allocator>i": @@ -11853,7 +11853,7 @@ lbl_8008B8B4: /* 8008B8C0 00088820 D0 23 00 08 */ stfs f1, 8(r3) lbl_8008B8C4: /* 8008B8C4 00088824 38 21 00 20 */ addi r1, r1, 0x20 -/* 8008B8C8 00088828 4E 80 00 20 */ blr +/* 8008B8C8 00088828 4E 80 00 20 */ blr .global "UpdateColliders__11CBallCameraFRC12CTransform4fRQ24rstl52vector<15CCameraCollider,Q24rstl17rmemory_allocator>RiifRCQ24rstl32reserved_vector<9TUniqueId,1024>fR13CStateManager" "UpdateColliders__11CBallCameraFRC12CTransform4fRQ24rstl52vector<15CCameraCollider,Q24rstl17rmemory_allocator>RiifRCQ24rstl32reserved_vector<9TUniqueId,1024>fR13CStateManager": @@ -12247,7 +12247,7 @@ lbl_8008BE74: /* 8008BEB8 00088E18 80 01 02 54 */ lwz r0, 0x254(r1) /* 8008BEBC 00088E1C 7C 08 03 A6 */ mtlr r0 /* 8008BEC0 00088E20 38 21 02 50 */ addi r1, r1, 0x250 -/* 8008BEC4 00088E24 4E 80 00 20 */ blr +/* 8008BEC4 00088E24 4E 80 00 20 */ blr .global "UpdateCollidersDistances__11CBallCameraFRQ24rstl52vector<15CCameraCollider,Q24rstl17rmemory_allocator>fff" "UpdateCollidersDistances__11CBallCameraFRQ24rstl52vector<15CCameraCollider,Q24rstl17rmemory_allocator>fff": @@ -12367,7 +12367,7 @@ lbl_8008C018: /* 8008C07C 00088FDC 83 81 00 30 */ lwz r28, 0x30(r1) /* 8008C080 00088FE0 7C 08 03 A6 */ mtlr r0 /* 8008C084 00088FE4 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 8008C088 00088FE8 4E 80 00 20 */ blr +/* 8008C088 00088FE8 4E 80 00 20 */ blr .global Reset__11CBallCameraFRC12CTransform4fR13CStateManager Reset__11CBallCameraFRC12CTransform4fR13CStateManager: @@ -12581,7 +12581,7 @@ lbl_8008C288: /* 8008C3C0 00089320 81 9E 00 00 */ lwz r12, 0(r30) /* 8008C3C4 00089324 81 8C 00 14 */ lwz r12, 0x14(r12) /* 8008C3C8 00089328 7D 89 03 A6 */ mtctr r12 -/* 8008C3CC 0008932C 4E 80 04 21 */ bctrl +/* 8008C3CC 0008932C 4E 80 04 21 */ bctrl /* 8008C3D0 00089330 88 1E 01 8D */ lbz r0, 0x18d(r30) /* 8008C3D4 00089334 38 60 00 00 */ li r3, 0 /* 8008C3D8 00089338 50 60 36 72 */ rlwimi r0, r3, 6, 0x19, 0x19 @@ -12597,11 +12597,11 @@ lbl_8008C3EC: /* 8008C3FC 0008935C 83 81 01 00 */ lwz r28, 0x100(r1) /* 8008C400 00089360 7C 08 03 A6 */ mtlr r0 /* 8008C404 00089364 38 21 01 10 */ addi r1, r1, 0x110 -/* 8008C408 00089368 4E 80 00 20 */ blr +/* 8008C408 00089368 4E 80 00 20 */ blr .global Render__11CBallCameraCFRC13CStateManager Render__11CBallCameraCFRC13CStateManager: -/* 8008C40C 0008936C 4E 80 00 20 */ blr +/* 8008C40C 0008936C 4E 80 00 20 */ blr .global "SetupColliders__11CBallCameraFRQ24rstl52vector<15CCameraCollider,Q24rstl17rmemory_allocator>fffifff" "SetupColliders__11CBallCameraFRQ24rstl52vector<15CCameraCollider,Q24rstl17rmemory_allocator>fffifff": @@ -12742,7 +12742,7 @@ lbl_8008C5A4: /* 8008C618 00089578 80 01 01 84 */ lwz r0, 0x184(r1) /* 8008C61C 0008957C 7C 08 03 A6 */ mtlr r0 /* 8008C620 00089580 38 21 01 80 */ addi r1, r1, 0x180 -/* 8008C624 00089584 4E 80 00 20 */ blr +/* 8008C624 00089584 4E 80 00 20 */ blr .global "push_back__Q24rstl52vector<15CCameraCollider,Q24rstl17rmemory_allocator>FRC15CCameraCollider" "push_back__Q24rstl52vector<15CCameraCollider,Q24rstl17rmemory_allocator>FRC15CCameraCollider": @@ -12778,7 +12778,7 @@ lbl_8008C668: /* 8008C694 000895F4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8008C698 000895F8 7C 08 03 A6 */ mtlr r0 /* 8008C69C 000895FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8008C6A0 00089600 4E 80 00 20 */ blr +/* 8008C6A0 00089600 4E 80 00 20 */ blr .global "construct<15CCameraCollider>__4rstlFPvRC15CCameraCollider" "construct<15CCameraCollider>__4rstlFPvRC15CCameraCollider": @@ -12792,7 +12792,7 @@ lbl_8008C6BC: /* 8008C6BC 0008961C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8008C6C0 00089620 7C 08 03 A6 */ mtlr r0 /* 8008C6C4 00089624 38 21 00 10 */ addi r1, r1, 0x10 -/* 8008C6C8 00089628 4E 80 00 20 */ blr +/* 8008C6C8 00089628 4E 80 00 20 */ blr .global __ct__15CCameraColliderFRC15CCameraCollider __ct__15CCameraColliderFRC15CCameraCollider: @@ -12839,7 +12839,7 @@ __ct__15CCameraColliderFRC15CCameraCollider: /* 8008C76C 000896CC 90 03 00 4C */ stw r0, 0x4c(r3) /* 8008C770 000896D0 C0 04 00 50 */ lfs f0, 0x50(r4) /* 8008C774 000896D4 D0 03 00 50 */ stfs f0, 0x50(r3) -/* 8008C778 000896D8 4E 80 00 20 */ blr +/* 8008C778 000896D8 4E 80 00 20 */ blr .global __dt__15CCameraColliderFv __dt__15CCameraColliderFv: @@ -12861,7 +12861,7 @@ lbl_8008C7AC: /* 8008C7B4 00089714 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8008C7B8 00089718 7C 08 03 A6 */ mtlr r0 /* 8008C7BC 0008971C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8008C7C0 00089720 4E 80 00 20 */ blr +/* 8008C7C0 00089720 4E 80 00 20 */ blr .global ResetToTweaks__11CBallCameraFR13CStateManager ResetToTweaks__11CBallCameraFR13CStateManager: @@ -13005,7 +13005,7 @@ ResetToTweaks__11CBallCameraFR13CStateManager: /* 8008C9E8 00089948 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8008C9EC 0008994C 7C 08 03 A6 */ mtlr r0 /* 8008C9F0 00089950 38 21 00 60 */ addi r1, r1, 0x60 -/* 8008C9F4 00089954 4E 80 00 20 */ blr +/* 8008C9F4 00089954 4E 80 00 20 */ blr .global TeleportCamera__11CBallCameraFRC12CTransform4fR13CStateManager TeleportCamera__11CBallCameraFRC12CTransform4fR13CStateManager: @@ -13046,7 +13046,7 @@ TeleportCamera__11CBallCameraFRC12CTransform4fR13CStateManager: /* 8008CA80 000899E0 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8008CA84 000899E4 7C 08 03 A6 */ mtlr r0 /* 8008CA88 000899E8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8008CA8C 000899EC 4E 80 00 20 */ blr +/* 8008CA8C 000899EC 4E 80 00 20 */ blr .global ResetPosition__11CBallCameraFR13CStateManager ResetPosition__11CBallCameraFR13CStateManager: @@ -13084,7 +13084,7 @@ ResetPosition__11CBallCameraFR13CStateManager: /* 8008CB0C 00089A6C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8008CB10 00089A70 7C 08 03 A6 */ mtlr r0 /* 8008CB14 00089A74 38 21 00 20 */ addi r1, r1, 0x20 -/* 8008CB18 00089A78 4E 80 00 20 */ blr +/* 8008CB18 00089A78 4E 80 00 20 */ blr .global TeleportCamera__11CBallCameraFRC9CVector3fR13CStateManager TeleportCamera__11CBallCameraFRC9CVector3fR13CStateManager: @@ -13152,7 +13152,7 @@ lbl_8008CC00: /* 8008CC0C 00089B6C 83 A1 00 44 */ lwz r29, 0x44(r1) /* 8008CC10 00089B70 7C 08 03 A6 */ mtlr r0 /* 8008CC14 00089B74 38 21 00 50 */ addi r1, r1, 0x50 -/* 8008CC18 00089B78 4E 80 00 20 */ blr +/* 8008CC18 00089B78 4E 80 00 20 */ blr .global "TeleportColliders__11CBallCameraFRQ24rstl52vector<15CCameraCollider,Q24rstl17rmemory_allocator>9CVector3f" "TeleportColliders__11CBallCameraFRQ24rstl52vector<15CCameraCollider,Q24rstl17rmemory_allocator>9CVector3f": @@ -13210,7 +13210,7 @@ lbl_8008CCDC: /* 8008CCE0 00089C40 7C 08 00 00 */ cmpw r8, r0 /* 8008CCE4 00089C44 41 80 FF 48 */ blt lbl_8008CC2C /* 8008CCE8 00089C48 38 21 00 30 */ addi r1, r1, 0x30 -/* 8008CCEC 00089C4C 4E 80 00 20 */ blr +/* 8008CCEC 00089C4C 4E 80 00 20 */ blr .global __dt__11CBallCameraFv __dt__11CBallCameraFv: @@ -13255,7 +13255,7 @@ lbl_8008CD78: /* 8008CD80 00089CE0 81 9C 00 00 */ lwz r12, 0(r28) /* 8008CD84 00089CE4 81 8C 00 08 */ lwz r12, 8(r12) /* 8008CD88 00089CE8 7D 89 03 A6 */ mtctr r12 -/* 8008CD8C 00089CEC 4E 80 04 21 */ bctrl +/* 8008CD8C 00089CEC 4E 80 04 21 */ bctrl /* 8008CD90 00089CF0 3B 9C 00 54 */ addi r28, r28, 0x54 lbl_8008CD94: /* 8008CD94 00089CF4 7C 1C E8 40 */ cmplw r28, r29 @@ -13282,7 +13282,7 @@ lbl_8008CDD8: /* 8008CDE0 00089D40 81 9C 00 00 */ lwz r12, 0(r28) /* 8008CDE4 00089D44 81 8C 00 08 */ lwz r12, 8(r12) /* 8008CDE8 00089D48 7D 89 03 A6 */ mtctr r12 -/* 8008CDEC 00089D4C 4E 80 04 21 */ bctrl +/* 8008CDEC 00089D4C 4E 80 04 21 */ bctrl /* 8008CDF0 00089D50 3B 9C 00 54 */ addi r28, r28, 0x54 lbl_8008CDF4: /* 8008CDF4 00089D54 7C 1C E8 40 */ cmplw r28, r29 @@ -13309,7 +13309,7 @@ lbl_8008CE38: /* 8008CE40 00089DA0 81 9C 00 00 */ lwz r12, 0(r28) /* 8008CE44 00089DA4 81 8C 00 08 */ lwz r12, 8(r12) /* 8008CE48 00089DA8 7D 89 03 A6 */ mtctr r12 -/* 8008CE4C 00089DAC 4E 80 04 21 */ bctrl +/* 8008CE4C 00089DAC 4E 80 04 21 */ bctrl /* 8008CE50 00089DB0 3B 9C 00 54 */ addi r28, r28, 0x54 lbl_8008CE54: /* 8008CE54 00089DB4 7C 1C E8 40 */ cmplw r28, r29 @@ -13335,7 +13335,7 @@ lbl_8008CE88: /* 8008CE9C 00089DFC 83 81 00 40 */ lwz r28, 0x40(r1) /* 8008CEA0 00089E00 7C 08 03 A6 */ mtlr r0 /* 8008CEA4 00089E04 38 21 00 50 */ addi r1, r1, 0x50 -/* 8008CEA8 00089E08 4E 80 00 20 */ blr +/* 8008CEA8 00089E08 4E 80 00 20 */ blr .global __dt__Q211CBallCamera14SFailsafeStateFv __dt__Q211CBallCamera14SFailsafeStateFv: @@ -13387,7 +13387,7 @@ lbl_8008CF3C: /* 8008CF4C 00089EAC 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8008CF50 00089EB0 7C 08 03 A6 */ mtlr r0 /* 8008CF54 00089EB4 38 21 00 30 */ addi r1, r1, 0x30 -/* 8008CF58 00089EB8 4E 80 00 20 */ blr +/* 8008CF58 00089EB8 4E 80 00 20 */ blr .global __ct__11CBallCameraF9TUniqueId9TUniqueIdRC12CTransform4fffff __ct__11CBallCameraF9TUniqueId9TUniqueIdRC12CTransform4fffff: @@ -13925,7 +13925,7 @@ lbl_8008D6E4: /* 8008D794 0008A6F4 83 81 00 60 */ lwz r28, 0x60(r1) /* 8008D798 0008A6F8 7C 08 03 A6 */ mtlr r0 /* 8008D79C 0008A6FC 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 8008D7A0 0008A700 4E 80 00 20 */ blr +/* 8008D7A0 0008A700 4E 80 00 20 */ blr .global __ct__15CCameraColliderFf9CVector3fRC13CCameraSpringf __ct__15CCameraColliderFf9CVector3fRC13CCameraSpringf: @@ -13970,7 +13970,7 @@ __ct__15CCameraColliderFf9CVector3fRC13CCameraSpringf: /* 8008D83C 0008A79C D0 03 00 48 */ stfs f0, 0x48(r3) /* 8008D840 0008A7A0 90 03 00 4C */ stw r0, 0x4c(r3) /* 8008D844 0008A7A4 D0 43 00 50 */ stfs f2, 0x50(r3) -/* 8008D848 0008A7A8 4E 80 00 20 */ blr +/* 8008D848 0008A7A8 4E 80 00 20 */ blr .global "reserve__Q24rstl52vector<15CCameraCollider,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl52vector<15CCameraCollider,Q24rstl17rmemory_allocator>Fi": @@ -14019,7 +14019,7 @@ lbl_8008D8E0: /* 8008D8E8 0008A848 81 9B 00 00 */ lwz r12, 0(r27) /* 8008D8EC 0008A84C 81 8C 00 08 */ lwz r12, 8(r12) /* 8008D8F0 0008A850 7D 89 03 A6 */ mtctr r12 -/* 8008D8F4 0008A854 4E 80 04 21 */ bctrl +/* 8008D8F4 0008A854 4E 80 04 21 */ bctrl /* 8008D8F8 0008A858 3B 7B 00 54 */ addi r27, r27, 0x54 lbl_8008D8FC: /* 8008D8FC 0008A85C 7C 1B E0 40 */ cmplw r27, r28 @@ -14036,7 +14036,7 @@ lbl_8008D91C: /* 8008D920 0008A880 80 01 00 34 */ lwz r0, 0x34(r1) /* 8008D924 0008A884 7C 08 03 A6 */ mtlr r0 /* 8008D928 0008A888 38 21 00 30 */ addi r1, r1, 0x30 -/* 8008D92C 0008A88C 4E 80 00 20 */ blr +/* 8008D92C 0008A88C 4E 80 00 20 */ blr .global "uninitialized_copy,Q24rstl17rmemory_allocator>,P15CCameraCollider>__4rstlFQ24rstl124pointer_iterator<15CCameraCollider,Q24rstl52vector<15CCameraCollider,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl124pointer_iterator<15CCameraCollider,Q24rstl52vector<15CCameraCollider,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>P15CCameraCollider" "uninitialized_copy,Q24rstl17rmemory_allocator>,P15CCameraCollider>__4rstlFQ24rstl124pointer_iterator<15CCameraCollider,Q24rstl52vector<15CCameraCollider,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl124pointer_iterator<15CCameraCollider,Q24rstl52vector<15CCameraCollider,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>P15CCameraCollider": @@ -14067,7 +14067,7 @@ lbl_8008D96C: /* 8008D988 0008A8E8 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8008D98C 0008A8EC 7C 08 03 A6 */ mtlr r0 /* 8008D990 0008A8F0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8008D994 0008A8F4 4E 80 00 20 */ blr +/* 8008D994 0008A8F4 4E 80 00 20 */ blr .global __sinit_CBallCamera_cpp __sinit_CBallCamera_cpp: @@ -14124,4 +14124,4 @@ __sinit_CBallCamera_cpp: /* 8008DA60 0008A9C0 80 01 00 34 */ lwz r0, 0x34(r1) /* 8008DA64 0008A9C4 7C 08 03 A6 */ mtlr r0 /* 8008DA68 0008A9C8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8008DA6C 0008A9CC 4E 80 00 20 */ blr +/* 8008DA6C 0008A9CC 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/Cameras/CBallCameraFailsafeState.s b/asm/MetroidPrime/Cameras/CBallCameraFailsafeState.s index 39124271..851fc669 100644 --- a/asm/MetroidPrime/Cameras/CBallCameraFailsafeState.s +++ b/asm/MetroidPrime/Cameras/CBallCameraFailsafeState.s @@ -57,7 +57,7 @@ lbl_805A826C: .global nullsub_19 nullsub_19: -/* 8023E604 0023B564 4E 80 00 20 */ blr +/* 8023E604 0023B564 4E 80 00 20 */ blr .global __ct__Q211CBallCamera14SFailsafeStateFv __ct__Q211CBallCamera14SFailsafeStateFv: @@ -108,7 +108,7 @@ __ct__Q211CBallCamera14SFailsafeStateFv: /* 8023E6B8 0023B618 80 01 00 14 */ lwz r0, 0x14(r1) /* 8023E6BC 0023B61C 7C 08 03 A6 */ mtlr r0 /* 8023E6C0 0023B620 38 21 00 10 */ addi r1, r1, 0x10 -/* 8023E6C4 0023B624 4E 80 00 20 */ blr +/* 8023E6C4 0023B624 4E 80 00 20 */ blr .global UpdateTransitionFromBallCamera__11CBallCameraFR13CStateManager UpdateTransitionFromBallCamera__11CBallCameraFR13CStateManager: @@ -285,7 +285,7 @@ lbl_8023E950: /* 8023E960 0023B8C0 81 83 00 00 */ lwz r12, 0(r3) /* 8023E964 0023B8C4 81 8C 00 70 */ lwz r12, 0x70(r12) /* 8023E968 0023B8C8 7D 89 03 A6 */ mtctr r12 -/* 8023E96C 0023B8CC 4E 80 04 21 */ bctrl +/* 8023E96C 0023B8CC 4E 80 04 21 */ bctrl /* 8023E970 0023B8D0 80 9E 04 7C */ lwz r4, 0x47c(r30) /* 8023E974 0023B8D4 38 60 00 00 */ li r3, 0 /* 8023E978 0023B8D8 D3 E4 00 84 */ stfs f31, 0x84(r4) @@ -305,7 +305,7 @@ lbl_8023E950: /* 8023E9B0 0023B910 83 A1 00 84 */ lwz r29, 0x84(r1) /* 8023E9B4 0023B914 7C 08 03 A6 */ mtlr r0 /* 8023E9B8 0023B918 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 8023E9BC 0023B91C 4E 80 00 20 */ blr +/* 8023E9BC 0023B91C 4E 80 00 20 */ blr .global TransitionFromMorphBallState__11CBallCameraFR13CStateManager TransitionFromMorphBallState__11CBallCameraFR13CStateManager: @@ -581,7 +581,7 @@ lbl_8023ED6C: /* 8023EDB4 0023BD14 83 81 00 50 */ lwz r28, 0x50(r1) /* 8023EDB8 0023BD18 7C 08 03 A6 */ mtlr r0 /* 8023EDBC 0023BD1C 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8023EDC0 0023BD20 4E 80 00 20 */ blr +/* 8023EDC0 0023BD20 4E 80 00 20 */ blr .global "GetFailsafeBezierPoint__11CBallCameraFRCQ24rstl18vector<9CVector3f>f" "GetFailsafeBezierPoint__11CBallCameraFRCQ24rstl18vector<9CVector3f>f": @@ -627,7 +627,7 @@ lbl_8023EE14: /* 8023EE58 0023BDB8 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8023EE5C 0023BDBC 7C 08 03 A6 */ mtlr r0 /* 8023EE60 0023BDC0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8023EE64 0023BDC4 4E 80 00 20 */ blr +/* 8023EE64 0023BDC4 4E 80 00 20 */ blr .global CheckTransitionLineOfSight__11CBallCameraFRC9CVector3fRC9CVector3fRffR13CStateManager CheckTransitionLineOfSight__11CBallCameraFRC9CVector3fRC9CVector3fRffR13CStateManager: diff --git a/asm/MetroidPrime/Cameras/CCameraFilter.s b/asm/MetroidPrime/Cameras/CCameraFilter.s index 24e9fc61..e3686801 100644 --- a/asm/MetroidPrime/Cameras/CCameraFilter.s +++ b/asm/MetroidPrime/Cameras/CCameraFilter.s @@ -59,7 +59,7 @@ lbl_805A8EE0: FreePersistentFbTexture__15CCameraBlurPassFv: /* 800EA948 000E78A8 38 00 00 00 */ li r0, 0 /* 800EA94C 000E78AC 98 03 00 2D */ stb r0, 0x2d(r3) -/* 800EA950 000E78B0 4E 80 00 20 */ blr +/* 800EA950 000E78B0 4E 80 00 20 */ blr .global AllocatePersistentFbTexture__15CCameraBlurPassFv AllocatePersistentFbTexture__15CCameraBlurPassFv: @@ -80,7 +80,7 @@ AllocatePersistentFbTexture__15CCameraBlurPassFv: /* 800EA98C 000E78EC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800EA990 000E78F0 7C 08 03 A6 */ mtlr r0 /* 800EA994 000E78F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800EA998 000E78F8 4E 80 00 20 */ blr +/* 800EA998 000E78F8 4E 80 00 20 */ blr .global GetFbCopy__15CCameraBlurPassCF9_GXTexFmtPUc GetFbCopy__15CCameraBlurPassCF9_GXTexFmtPUc: @@ -146,7 +146,7 @@ lbl_800EAA54: /* 800EAA78 000E79D8 83 A1 00 14 */ lwz r29, 0x14(r1) /* 800EAA7C 000E79DC 7C 08 03 A6 */ mtlr r0 /* 800EAA80 000E79E0 38 21 00 20 */ addi r1, r1, 0x20 -/* 800EAA84 000E79E4 4E 80 00 20 */ blr +/* 800EAA84 000E79E4 4E 80 00 20 */ blr .global Draw__15CCameraBlurPassCFv Draw__15CCameraBlurPassCFv: @@ -316,7 +316,7 @@ lbl_800EAC40: /* 800EACF0 000E7C50 81 83 00 00 */ lwz r12, 0(r3) /* 800EACF4 000E7C54 81 8C 00 60 */ lwz r12, 0x60(r12) /* 800EACF8 000E7C58 7D 89 03 A6 */ mtctr r12 -/* 800EACFC 000E7C5C 4E 80 04 21 */ bctrl +/* 800EACFC 000E7C5C 4E 80 04 21 */ bctrl /* 800EAD00 000E7C60 3C 60 80 5A */ lis r3, skIdentity4f@ha /* 800EAD04 000E7C64 38 63 66 70 */ addi r3, r3, skIdentity4f@l /* 800EAD08 000E7C68 48 22 1A 45 */ bl SetViewPointMatrix__9CGraphicsFRC12CTransform4f @@ -326,7 +326,7 @@ lbl_800EAC40: /* 800EAD18 000E7C78 81 83 00 00 */ lwz r12, 0(r3) /* 800EAD1C 000E7C7C 81 8C 00 30 */ lwz r12, 0x30(r12) /* 800EAD20 000E7C80 7D 89 03 A6 */ mtctr r12 -/* 800EAD24 000E7C84 4E 80 04 21 */ bctrl +/* 800EAD24 000E7C84 4E 80 04 21 */ bctrl /* 800EAD28 000E7C88 80 18 00 10 */ lwz r0, 0x10(r24) /* 800EAD2C 000E7C8C 2C 00 00 03 */ cmpwi r0, 3 /* 800EAD30 000E7C90 40 82 06 00 */ bne lbl_800EB330 @@ -334,7 +334,7 @@ lbl_800EAC40: /* 800EAD38 000E7C98 81 83 00 00 */ lwz r12, 0(r3) /* 800EAD3C 000E7C9C 81 8C 00 7C */ lwz r12, 0x7c(r12) /* 800EAD40 000E7CA0 7D 89 03 A6 */ mtctr r12 -/* 800EAD44 000E7CA4 4E 80 04 21 */ bctrl +/* 800EAD44 000E7CA4 4E 80 04 21 */ bctrl /* 800EAD48 000E7CA8 81 1F 00 78 */ lwz r8, 0x78(r31) /* 800EAD4C 000E7CAC 38 61 00 6C */ addi r3, r1, 0x6c /* 800EAD50 000E7CB0 80 FF 00 7C */ lwz r7, 0x7c(r31) @@ -724,7 +724,7 @@ lbl_800EB330: /* 800EB334 000E8294 81 83 00 00 */ lwz r12, 0(r3) /* 800EB338 000E8298 81 8C 00 68 */ lwz r12, 0x68(r12) /* 800EB33C 000E829C 7D 89 03 A6 */ mtctr r12 -/* 800EB340 000E82A0 4E 80 04 21 */ bctrl +/* 800EB340 000E82A0 4E 80 04 21 */ bctrl /* 800EB344 000E82A4 81 1F 00 B0 */ lwz r8, 0xb0(r31) /* 800EB348 000E82A8 38 61 00 34 */ addi r3, r1, 0x34 /* 800EB34C 000E82AC 80 FF 00 B4 */ lwz r7, 0xb4(r31) @@ -1083,14 +1083,14 @@ lbl_800EB8A0: /* 800EB8A4 000E8804 81 83 00 00 */ lwz r12, 0(r3) /* 800EB8A8 000E8808 81 8C 00 68 */ lwz r12, 0x68(r12) /* 800EB8AC 000E880C 7D 89 03 A6 */ mtctr r12 -/* 800EB8B0 000E8810 4E 80 04 21 */ bctrl +/* 800EB8B0 000E8810 4E 80 04 21 */ bctrl /* 800EB8B4 000E8814 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 800EB8B8 000E8818 38 80 00 01 */ li r4, 1 /* 800EB8BC 000E881C 38 A0 00 01 */ li r5, 1 /* 800EB8C0 000E8820 81 83 00 00 */ lwz r12, 0(r3) /* 800EB8C4 000E8824 81 8C 00 60 */ lwz r12, 0x60(r12) /* 800EB8C8 000E8828 7D 89 03 A6 */ mtctr r12 -/* 800EB8CC 000E882C 4E 80 04 21 */ bctrl +/* 800EB8CC 000E882C 4E 80 04 21 */ bctrl lbl_800EB8D0: /* 800EB8D0 000E8830 E3 E1 01 F8 */ psq_l f31, 504(r1), 0, qr0 /* 800EB8D4 000E8834 CB E1 01 F0 */ lfd f31, 0x1f0(r1) @@ -1132,7 +1132,7 @@ lbl_800EB8D0: /* 800EB964 000E88C4 80 01 02 04 */ lwz r0, 0x204(r1) /* 800EB968 000E88C8 7C 08 03 A6 */ mtlr r0 /* 800EB96C 000E88CC 38 21 02 00 */ addi r1, r1, 0x200 -/* 800EB970 000E88D0 4E 80 00 20 */ blr +/* 800EB970 000E88D0 4E 80 00 20 */ blr .global DisableBlur__15CCameraBlurPassFf DisableBlur__15CCameraBlurPassFf: @@ -1147,7 +1147,7 @@ DisableBlur__15CCameraBlurPassFf: /* 800EB994 000E88F4 80 01 00 14 */ lwz r0, 0x14(r1) /* 800EB998 000E88F8 7C 08 03 A6 */ mtlr r0 /* 800EB99C 000E88FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800EB9A0 000E8900 4E 80 00 20 */ blr +/* 800EB9A0 000E8900 4E 80 00 20 */ blr .global SetBlur__15CCameraBlurPassFQ215CCameraBlurPass9EBlurTypeffb SetBlur__15CCameraBlurPassFQ215CCameraBlurPass9EBlurTypeffb: @@ -1247,7 +1247,7 @@ lbl_800EBABC: /* 800EBAFC 000E8A5C 81 84 00 00 */ lwz r12, 0(r4) /* 800EBB00 000E8A60 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800EBB04 000E8A64 7D 89 03 A6 */ mtctr r12 -/* 800EBB08 000E8A68 4E 80 04 21 */ bctrl +/* 800EBB08 000E8A68 4E 80 04 21 */ bctrl /* 800EBB0C 000E8A6C 38 61 00 18 */ addi r3, r1, 0x18 /* 800EBB10 000E8A70 38 81 00 20 */ addi r4, r1, 0x20 /* 800EBB14 000E8A74 48 25 53 95 */ bl __ct__6CTokenFRC6CToken @@ -1393,7 +1393,7 @@ lbl_800EBCC4: /* 800EBD0C 000E8C6C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800EBD10 000E8C70 7C A5 00 2E */ lwzx r5, r5, r0 /* 800EBD14 000E8C74 7D 89 03 A6 */ mtctr r12 -/* 800EBD18 000E8C78 4E 80 04 21 */ bctrl +/* 800EBD18 000E8C78 4E 80 04 21 */ bctrl /* 800EBD1C 000E8C7C 38 61 00 08 */ addi r3, r1, 8 /* 800EBD20 000E8C80 38 81 00 10 */ addi r4, r1, 0x10 /* 800EBD24 000E8C84 48 25 51 85 */ bl __ct__6CTokenFRC6CToken @@ -1446,7 +1446,7 @@ lbl_800EBDB8: /* 800EBDC8 000E8D28 83 81 00 60 */ lwz r28, 0x60(r1) /* 800EBDCC 000E8D2C 7C 08 03 A6 */ mtlr r0 /* 800EBDD0 000E8D30 38 21 00 70 */ addi r1, r1, 0x70 -/* 800EBDD4 000E8D34 4E 80 00 20 */ blr +/* 800EBDD4 000E8D34 4E 80 00 20 */ blr .global Update__15CCameraBlurPassFf Update__15CCameraBlurPassFf: @@ -1568,7 +1568,7 @@ lbl_800EBF3C: /* 800EBF80 000E8EE0 81 84 00 00 */ lwz r12, 0(r4) /* 800EBF84 000E8EE4 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800EBF88 000E8EE8 7D 89 03 A6 */ mtctr r12 -/* 800EBF8C 000E8EEC 4E 80 04 21 */ bctrl +/* 800EBF8C 000E8EEC 4E 80 04 21 */ bctrl /* 800EBF90 000E8EF0 38 61 00 0C */ addi r3, r1, 0xc /* 800EBF94 000E8EF4 38 81 00 14 */ addi r4, r1, 0x14 /* 800EBF98 000E8EF8 48 25 4F 11 */ bl __ct__6CTokenFRC6CToken @@ -1616,7 +1616,7 @@ lbl_800EC024: /* 800EC02C 000E8F8C 83 C1 00 38 */ lwz r30, 0x38(r1) /* 800EC030 000E8F90 7C 08 03 A6 */ mtlr r0 /* 800EC034 000E8F94 38 21 00 40 */ addi r1, r1, 0x40 -/* 800EC038 000E8F98 4E 80 00 20 */ blr +/* 800EC038 000E8F98 4E 80 00 20 */ blr .global __ct__15CCameraBlurPassFv __ct__15CCameraBlurPassFv: @@ -1633,7 +1633,7 @@ __ct__15CCameraBlurPassFv: /* 800EC064 000E8FC4 98 03 00 2C */ stb r0, 0x2c(r3) /* 800EC068 000E8FC8 98 03 00 2D */ stb r0, 0x2d(r3) /* 800EC06C 000E8FCC 90 03 00 30 */ stw r0, 0x30(r3) -/* 800EC070 000E8FD0 4E 80 00 20 */ blr +/* 800EC070 000E8FD0 4E 80 00 20 */ blr .global DrawFilterShape__17CCameraFilterPassFQ217CCameraFilterPass12EFilterShapeRC6CColorPC8CTexturef DrawFilterShape__17CCameraFilterPassFQ217CCameraFilterPass12EFilterShapeRC6CColorPC8CTexturef: @@ -1647,7 +1647,7 @@ DrawFilterShape__17CCameraFilterPassFQ217CCameraFilterPass12EFilterShapeRC6CColo /* 800EC090 000E8FF0 38 66 FC C0 */ addi r3, r6, lbl_803DFCC0@l /* 800EC094 000E8FF4 7C 03 00 2E */ lwzx r0, r3, r0 /* 800EC098 000E8FF8 7C 09 03 A6 */ mtctr r0 -/* 800EC09C 000E8FFC 4E 80 04 20 */ bctr +/* 800EC09C 000E8FFC 4E 80 04 20 */ bctr .global lbl_800EC0A0 lbl_800EC0A0: /* 800EC0A0 000E9000 7C 83 23 78 */ mr r3, r4 @@ -1706,7 +1706,7 @@ lbl_800EC138: /* 800EC138 000E9098 80 01 00 14 */ lwz r0, 0x14(r1) /* 800EC13C 000E909C 7C 08 03 A6 */ mtlr r0 /* 800EC140 000E90A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800EC144 000E90A4 4E 80 00 20 */ blr +/* 800EC144 000E90A4 4E 80 00 20 */ blr .global DrawFilter__17CCameraFilterPassFQ217CCameraFilterPass11EFilterTypeQ217CCameraFilterPass12EFilterShapeRC6CColorPC8CTexturef DrawFilter__17CCameraFilterPassFQ217CCameraFilterPass11EFilterTypeQ217CCameraFilterPass12EFilterShapeRC6CColorPC8CTexturef: @@ -1730,7 +1730,7 @@ DrawFilter__17CCameraFilterPassFQ217CCameraFilterPass11EFilterTypeQ217CCameraFil /* 800EC18C 000E90EC 38 64 FC E4 */ addi r3, r4, lbl_803DFCE4@l /* 800EC190 000E90F0 7C 03 00 2E */ lwzx r0, r3, r0 /* 800EC194 000E90F4 7C 09 03 A6 */ mtctr r0 -/* 800EC198 000E90F8 4E 80 04 20 */ bctr +/* 800EC198 000E90F8 4E 80 04 20 */ bctr .global lbl_800EC19C lbl_800EC19C: /* 800EC19C 000E90FC 48 00 00 D4 */ b lbl_800EC270 @@ -1740,7 +1740,7 @@ lbl_800EC1A0: /* 800EC1A4 000E9104 81 83 00 00 */ lwz r12, 0(r3) /* 800EC1A8 000E9108 81 8C 00 70 */ lwz r12, 0x70(r12) /* 800EC1AC 000E910C 7D 89 03 A6 */ mtctr r12 -/* 800EC1B0 000E9110 4E 80 04 21 */ bctrl +/* 800EC1B0 000E9110 4E 80 04 21 */ bctrl /* 800EC1B4 000E9114 48 00 00 94 */ b lbl_800EC248 .global lbl_800EC1B8 lbl_800EC1B8: @@ -1748,7 +1748,7 @@ lbl_800EC1B8: /* 800EC1BC 000E911C 81 83 00 00 */ lwz r12, 0(r3) /* 800EC1C0 000E9120 81 8C 00 74 */ lwz r12, 0x74(r12) /* 800EC1C4 000E9124 7D 89 03 A6 */ mtctr r12 -/* 800EC1C8 000E9128 4E 80 04 21 */ bctrl +/* 800EC1C8 000E9128 4E 80 04 21 */ bctrl /* 800EC1CC 000E912C 48 00 00 7C */ b lbl_800EC248 .global lbl_800EC1D0 lbl_800EC1D0: @@ -1756,7 +1756,7 @@ lbl_800EC1D0: /* 800EC1D4 000E9134 81 83 00 00 */ lwz r12, 0(r3) /* 800EC1D8 000E9138 81 8C 00 64 */ lwz r12, 0x64(r12) /* 800EC1DC 000E913C 7D 89 03 A6 */ mtctr r12 -/* 800EC1E0 000E9140 4E 80 04 21 */ bctrl +/* 800EC1E0 000E9140 4E 80 04 21 */ bctrl /* 800EC1E4 000E9144 48 00 00 64 */ b lbl_800EC248 .global lbl_800EC1E8 lbl_800EC1E8: @@ -1764,7 +1764,7 @@ lbl_800EC1E8: /* 800EC1EC 000E914C 81 83 00 00 */ lwz r12, 0(r3) /* 800EC1F0 000E9150 81 8C 00 68 */ lwz r12, 0x68(r12) /* 800EC1F4 000E9154 7D 89 03 A6 */ mtctr r12 -/* 800EC1F8 000E9158 4E 80 04 21 */ bctrl +/* 800EC1F8 000E9158 4E 80 04 21 */ bctrl /* 800EC1FC 000E915C 48 00 00 4C */ b lbl_800EC248 .global lbl_800EC200 lbl_800EC200: @@ -1783,7 +1783,7 @@ lbl_800EC21C: /* 800EC220 000E9180 81 83 00 00 */ lwz r12, 0(r3) /* 800EC224 000E9184 81 8C 00 80 */ lwz r12, 0x80(r12) /* 800EC228 000E9188 7D 89 03 A6 */ mtctr r12 -/* 800EC22C 000E918C 4E 80 04 21 */ bctrl +/* 800EC22C 000E918C 4E 80 04 21 */ bctrl /* 800EC230 000E9190 48 00 00 18 */ b lbl_800EC248 .global lbl_800EC234 lbl_800EC234: @@ -1791,7 +1791,7 @@ lbl_800EC234: /* 800EC238 000E9198 81 83 00 00 */ lwz r12, 0(r3) /* 800EC23C 000E919C 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 800EC240 000E91A0 7D 89 03 A6 */ mtctr r12 -/* 800EC244 000E91A4 4E 80 04 21 */ bctrl +/* 800EC244 000E91A4 4E 80 04 21 */ bctrl lbl_800EC248: /* 800EC248 000E91A8 FC 20 F8 90 */ fmr f1, f31 /* 800EC24C 000E91AC 7F A3 EB 78 */ mr r3, r29 @@ -1802,7 +1802,7 @@ lbl_800EC248: /* 800EC260 000E91C0 81 83 00 00 */ lwz r12, 0(r3) /* 800EC264 000E91C4 81 8C 00 68 */ lwz r12, 0x68(r12) /* 800EC268 000E91C8 7D 89 03 A6 */ mtctr r12 -/* 800EC26C 000E91CC 4E 80 04 21 */ bctrl +/* 800EC26C 000E91CC 4E 80 04 21 */ bctrl lbl_800EC270: /* 800EC270 000E91D0 80 01 00 24 */ lwz r0, 0x24(r1) /* 800EC274 000E91D4 CB E1 00 18 */ lfd f31, 0x18(r1) @@ -1811,7 +1811,7 @@ lbl_800EC270: /* 800EC280 000E91E0 83 A1 00 0C */ lwz r29, 0xc(r1) /* 800EC284 000E91E4 7C 08 03 A6 */ mtlr r0 /* 800EC288 000E91E8 38 21 00 20 */ addi r1, r1, 0x20 -/* 800EC28C 000E91EC 4E 80 00 20 */ blr +/* 800EC28C 000E91EC 4E 80 00 20 */ blr .global Draw__17CCameraFilterPassCFv Draw__17CCameraFilterPassCFv: @@ -1840,7 +1840,7 @@ lbl_800EC2CC: /* 800EC2E0 000E9240 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800EC2E4 000E9244 7C 08 03 A6 */ mtlr r0 /* 800EC2E8 000E9248 38 21 00 10 */ addi r1, r1, 0x10 -/* 800EC2EC 000E924C 4E 80 00 20 */ blr +/* 800EC2EC 000E924C 4E 80 00 20 */ blr .global DrawRandomStatic__17CCameraFilterPassFRC6CColorfb DrawRandomStatic__17CCameraFilterPassFRC6CColorfb: @@ -1868,7 +1868,7 @@ DrawRandomStatic__17CCameraFilterPassFRC6CColorfb: /* 800EC344 000E92A4 81 8C 00 54 */ lwz r12, 0x54(r12) /* 800EC348 000E92A8 C0 42 90 DC */ lfs f2, lbl_805AADFC@sda21(r2) /* 800EC34C 000E92AC 7D 89 03 A6 */ mtctr r12 -/* 800EC350 000E92B0 4E 80 04 21 */ bctrl +/* 800EC350 000E92B0 4E 80 04 21 */ bctrl /* 800EC354 000E92B4 C0 61 00 3C */ lfs f3, 0x3c(r1) /* 800EC358 000E92B8 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 800EC35C 000E92BC C0 41 00 40 */ lfs f2, 0x40(r1) @@ -1896,7 +1896,7 @@ DrawRandomStatic__17CCameraFilterPassFRC6CColorfb: /* 800EC3B4 000E9314 81 83 00 00 */ lwz r12, 0(r3) /* 800EC3B8 000E9318 81 8C 00 60 */ lwz r12, 0x60(r12) /* 800EC3BC 000E931C 7D 89 03 A6 */ mtctr r12 -/* 800EC3C0 000E9320 4E 80 04 21 */ bctrl +/* 800EC3C0 000E9320 4E 80 04 21 */ bctrl /* 800EC3C4 000E9324 3C 80 80 5A */ lis r4, lbl_805A5EBC@ha /* 800EC3C8 000E9328 38 60 00 00 */ li r3, 0 /* 800EC3CC 000E932C 38 84 5E BC */ addi r4, r4, lbl_805A5EBC@l @@ -1935,7 +1935,7 @@ lbl_800EC440: /* 800EC44C 000E93AC 81 83 00 00 */ lwz r12, 0(r3) /* 800EC450 000E93B0 81 8C 00 60 */ lwz r12, 0x60(r12) /* 800EC454 000E93B4 7D 89 03 A6 */ mtctr r12 -/* 800EC458 000E93B8 4E 80 04 21 */ bctrl +/* 800EC458 000E93B8 4E 80 04 21 */ bctrl /* 800EC45C 000E93BC 3C 80 80 5A */ lis r4, lbl_805A6038@ha /* 800EC460 000E93C0 38 60 00 00 */ li r3, 0 /* 800EC464 000E93C4 38 84 60 38 */ addi r4, r4, lbl_805A6038@l @@ -2050,7 +2050,7 @@ lbl_800EC5E8: /* 800EC610 000E9570 83 C1 00 78 */ lwz r30, 0x78(r1) /* 800EC614 000E9574 7C 08 03 A6 */ mtlr r0 /* 800EC618 000E9578 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 800EC61C 000E957C 4E 80 00 20 */ blr +/* 800EC61C 000E957C 4E 80 00 20 */ blr .global DrawWideScreen__17CCameraFilterPassFRC6CColorPC8CTexturef DrawWideScreen__17CCameraFilterPassFRC6CColorPC8CTexturef: @@ -2076,7 +2076,7 @@ DrawWideScreen__17CCameraFilterPassFRC6CColorPC8CTexturef: /* 800EC66C 000E95CC 81 8C 00 54 */ lwz r12, 0x54(r12) /* 800EC670 000E95D0 C0 42 91 34 */ lfs f2, lbl_805AAE54@sda21(r2) /* 800EC674 000E95D4 7D 89 03 A6 */ mtctr r12 -/* 800EC678 000E95D8 4E 80 04 21 */ bctrl +/* 800EC678 000E95D8 4E 80 04 21 */ bctrl /* 800EC67C 000E95DC C0 E1 00 68 */ lfs f7, 0x68(r1) /* 800EC680 000E95E0 38 80 00 00 */ li r4, 0 /* 800EC684 000E95E4 C0 A1 00 70 */ lfs f5, 0x70(r1) @@ -2099,14 +2099,14 @@ DrawWideScreen__17CCameraFilterPassFRC6CColorPC8CTexturef: /* 800EC6C8 000E9628 D0 A1 00 80 */ stfs f5, 0x80(r1) /* 800EC6CC 000E962C D0 81 00 84 */ stfs f4, 0x84(r1) /* 800EC6D0 000E9630 7D 89 03 A6 */ mtctr r12 -/* 800EC6D4 000E9634 4E 80 04 21 */ bctrl +/* 800EC6D4 000E9634 4E 80 04 21 */ bctrl /* 800EC6D8 000E9638 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 800EC6DC 000E963C 3C 80 80 5A */ lis r4, skIdentity4f@ha /* 800EC6E0 000E9640 38 84 66 70 */ addi r4, r4, skIdentity4f@l /* 800EC6E4 000E9644 81 83 00 00 */ lwz r12, 0(r3) /* 800EC6E8 000E9648 81 8C 00 30 */ lwz r12, 0x30(r12) /* 800EC6EC 000E964C 7D 89 03 A6 */ mtctr r12 -/* 800EC6F0 000E9650 4E 80 04 21 */ bctrl +/* 800EC6F0 000E9650 4E 80 04 21 */ bctrl /* 800EC6F4 000E9654 28 1E 00 00 */ cmplwi r30, 0 /* 800EC6F8 000E9658 41 82 00 14 */ beq lbl_800EC70C /* 800EC6FC 000E965C 7F C3 F3 78 */ mr r3, r30 @@ -2284,7 +2284,7 @@ lbl_800EC70C: /* 800EC9A8 000E9908 83 C1 00 98 */ lwz r30, 0x98(r1) /* 800EC9AC 000E990C 7C 08 03 A6 */ mtlr r0 /* 800EC9B0 000E9910 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 800EC9B4 000E9914 4E 80 00 20 */ blr +/* 800EC9B4 000E9914 4E 80 00 20 */ blr .global GetT__17CCameraFilterPassCFb GetT__17CCameraFilterPassCFb: @@ -2301,10 +2301,10 @@ lbl_800EC9D0: /* 800EC9DC 000E993C EC 21 00 28 */ fsubs f1, f1, f0 lbl_800EC9E0: /* 800EC9E0 000E9940 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 800EC9E4 000E9944 4D 82 00 20 */ beqlr +/* 800EC9E4 000E9944 4D 82 00 20 */ beqlr /* 800EC9E8 000E9948 C0 02 90 DC */ lfs f0, lbl_805AADFC@sda21(r2) /* 800EC9EC 000E994C EC 20 08 28 */ fsubs f1, f0, f1 -/* 800EC9F0 000E9950 4E 80 00 20 */ blr +/* 800EC9F0 000E9950 4E 80 00 20 */ blr .global DrawScanLines__17CCameraFilterPassFRC6CColorb DrawScanLines__17CCameraFilterPassFRC6CColorb: @@ -2340,7 +2340,7 @@ DrawScanLines__17CCameraFilterPassFRC6CColorb: /* 800ECA68 000E99C8 81 8C 00 54 */ lwz r12, 0x54(r12) /* 800ECA6C 000E99CC C0 42 91 34 */ lfs f2, lbl_805AAE54@sda21(r2) /* 800ECA70 000E99D0 7D 89 03 A6 */ mtctr r12 -/* 800ECA74 000E99D4 4E 80 04 21 */ bctrl +/* 800ECA74 000E99D4 4E 80 04 21 */ bctrl /* 800ECA78 000E99D8 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 800ECA7C 000E99DC 38 80 00 00 */ li r4, 0 /* 800ECA80 000E99E0 C0 61 00 20 */ lfs f3, 0x20(r1) @@ -2355,14 +2355,14 @@ DrawScanLines__17CCameraFilterPassFRC6CColorb: /* 800ECAA4 000E9A04 D0 21 00 38 */ stfs f1, 0x38(r1) /* 800ECAA8 000E9A08 D0 01 00 3C */ stfs f0, 0x3c(r1) /* 800ECAAC 000E9A0C 7D 89 03 A6 */ mtctr r12 -/* 800ECAB0 000E9A10 4E 80 04 21 */ bctrl +/* 800ECAB0 000E9A10 4E 80 04 21 */ bctrl /* 800ECAB4 000E9A14 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 800ECAB8 000E9A18 3C 80 80 5A */ lis r4, skIdentity4f@ha /* 800ECABC 000E9A1C 38 84 66 70 */ addi r4, r4, skIdentity4f@l /* 800ECAC0 000E9A20 81 83 00 00 */ lwz r12, 0(r3) /* 800ECAC4 000E9A24 81 8C 00 30 */ lwz r12, 0x30(r12) /* 800ECAC8 000E9A28 7D 89 03 A6 */ mtctr r12 -/* 800ECACC 000E9A2C 4E 80 04 21 */ bctrl +/* 800ECACC 000E9A2C 4E 80 04 21 */ bctrl /* 800ECAD0 000E9A30 57 A0 06 3F */ clrlwi. r0, r29, 0x18 /* 800ECAD4 000E9A34 41 82 00 0C */ beq lbl_800ECAE0 /* 800ECAD8 000E9A38 C3 E2 90 EC */ lfs f31, lbl_805AAE0C@sda21(r2) @@ -2386,13 +2386,13 @@ lbl_800ECAE4: /* 800ECB18 000E9A78 81 83 00 00 */ lwz r12, 0(r3) /* 800ECB1C 000E9A7C 81 8C 00 94 */ lwz r12, 0x94(r12) /* 800ECB20 000E9A80 7D 89 03 A6 */ mtctr r12 -/* 800ECB24 000E9A84 4E 80 04 21 */ bctrl +/* 800ECB24 000E9A84 4E 80 04 21 */ bctrl /* 800ECB28 000E9A88 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 800ECB2C 000E9A8C 7F E4 FB 78 */ mr r4, r31 /* 800ECB30 000E9A90 81 83 00 00 */ lwz r12, 0(r3) /* 800ECB34 000E9A94 81 8C 00 B4 */ lwz r12, 0xb4(r12) /* 800ECB38 000E9A98 7D 89 03 A6 */ mtctr r12 -/* 800ECB3C 000E9A9C 4E 80 04 21 */ bctrl +/* 800ECB3C 000E9A9C 4E 80 04 21 */ bctrl /* 800ECB40 000E9AA0 C3 21 00 30 */ lfs f25, 0x30(r1) /* 800ECB44 000E9AA4 3B A0 00 00 */ li r29, 0 /* 800ECB48 000E9AA8 C3 42 90 EC */ lfs f26, lbl_805AAE0C@sda21(r2) @@ -2419,7 +2419,7 @@ lbl_800ECB64: /* 800ECB98 000E9AF8 81 83 00 00 */ lwz r12, 0(r3) /* 800ECB9C 000E9AFC 81 8C 00 A8 */ lwz r12, 0xa8(r12) /* 800ECBA0 000E9B00 7D 89 03 A6 */ mtctr r12 -/* 800ECBA4 000E9B04 4E 80 04 21 */ bctrl +/* 800ECBA4 000E9B04 4E 80 04 21 */ bctrl /* 800ECBA8 000E9B08 EC 18 E8 2A */ fadds f0, f24, f29 /* 800ECBAC 000E9B0C D3 C1 00 08 */ stfs f30, 8(r1) /* 800ECBB0 000E9B10 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) @@ -2430,7 +2430,7 @@ lbl_800ECB64: /* 800ECBC4 000E9B24 81 83 00 00 */ lwz r12, 0(r3) /* 800ECBC8 000E9B28 81 8C 00 A8 */ lwz r12, 0xa8(r12) /* 800ECBCC 000E9B2C 7D 89 03 A6 */ mtctr r12 -/* 800ECBD0 000E9B30 4E 80 04 21 */ bctrl +/* 800ECBD0 000E9B30 4E 80 04 21 */ bctrl /* 800ECBD4 000E9B34 3B BD 00 01 */ addi r29, r29, 1 lbl_800ECBD8: /* 800ECBD8 000E9B38 7C 1D F0 00 */ cmpw r29, r30 @@ -2439,7 +2439,7 @@ lbl_800ECBD8: /* 800ECBE4 000E9B44 81 83 00 00 */ lwz r12, 0(r3) /* 800ECBE8 000E9B48 81 8C 00 B8 */ lwz r12, 0xb8(r12) /* 800ECBEC 000E9B4C 7D 89 03 A6 */ mtctr r12 -/* 800ECBF0 000E9B50 4E 80 04 21 */ bctrl +/* 800ECBF0 000E9B50 4E 80 04 21 */ bctrl /* 800ECBF4 000E9B54 C0 22 90 DC */ lfs f1, lbl_805AADFC@sda21(r2) /* 800ECBF8 000E9B58 38 60 00 05 */ li r3, 5 /* 800ECBFC 000E9B5C 48 21 E7 DD */ bl SetLineWidth__9CGraphicsFf13ERglTexOffset @@ -2465,7 +2465,7 @@ lbl_800ECBD8: /* 800ECC4C 000E9BAC 83 A1 00 54 */ lwz r29, 0x54(r1) /* 800ECC50 000E9BB0 7C 08 03 A6 */ mtlr r0 /* 800ECC54 000E9BB4 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 800ECC58 000E9BB8 4E 80 00 20 */ blr +/* 800ECC58 000E9BB8 4E 80 00 20 */ blr .global DrawFullScreenTexturedQuadQuarters__17CCameraFilterPassFRC6CColorPC8CTexturef DrawFullScreenTexturedQuadQuarters__17CCameraFilterPassFRC6CColorPC8CTexturef: @@ -2493,7 +2493,7 @@ DrawFullScreenTexturedQuadQuarters__17CCameraFilterPassFRC6CColorPC8CTexturef: /* 800ECCB0 000E9C10 81 8C 00 54 */ lwz r12, 0x54(r12) /* 800ECCB4 000E9C14 C0 42 91 34 */ lfs f2, lbl_805AAE54@sda21(r2) /* 800ECCB8 000E9C18 7D 89 03 A6 */ mtctr r12 -/* 800ECCBC 000E9C1C 4E 80 04 21 */ bctrl +/* 800ECCBC 000E9C1C 4E 80 04 21 */ bctrl /* 800ECCC0 000E9C20 C0 61 00 38 */ lfs f3, 0x38(r1) /* 800ECCC4 000E9C24 3C 60 80 5A */ lis r3, lbl_805A5EBC@ha /* 800ECCC8 000E9C28 C0 41 00 3C */ lfs f2, 0x3c(r1) @@ -2515,7 +2515,7 @@ DrawFullScreenTexturedQuadQuarters__17CCameraFilterPassFRC6CColorPC8CTexturef: /* 800ECD08 000E9C68 81 83 00 00 */ lwz r12, 0(r3) /* 800ECD0C 000E9C6C 81 8C 00 60 */ lwz r12, 0x60(r12) /* 800ECD10 000E9C70 7D 89 03 A6 */ mtctr r12 -/* 800ECD14 000E9C74 4E 80 04 21 */ bctrl +/* 800ECD14 000E9C74 4E 80 04 21 */ bctrl /* 800ECD18 000E9C78 28 1F 00 00 */ cmplwi r31, 0 /* 800ECD1C 000E9C7C 41 82 00 14 */ beq lbl_800ECD30 /* 800ECD20 000E9C80 7F E3 FB 78 */ mr r3, r31 @@ -2552,7 +2552,7 @@ lbl_800ECD78: /* 800ECD84 000E9CE4 81 83 00 00 */ lwz r12, 0(r3) /* 800ECD88 000E9CE8 81 8C 00 30 */ lwz r12, 0x30(r12) /* 800ECD8C 000E9CEC 7D 89 03 A6 */ mtctr r12 -/* 800ECD90 000E9CF0 4E 80 04 21 */ bctrl +/* 800ECD90 000E9CF0 4E 80 04 21 */ bctrl /* 800ECD94 000E9CF4 38 60 00 98 */ li r3, 0x98 /* 800ECD98 000E9CF8 48 21 E8 D1 */ bl StreamBegin__9CGraphicsF13ERglPrimitive /* 800ECD9C 000E9CFC 7F C3 F3 78 */ mr r3, r30 @@ -2608,7 +2608,7 @@ lbl_800ECD78: /* 800ECE64 000E9DC4 83 C1 00 88 */ lwz r30, 0x88(r1) /* 800ECE68 000E9DC8 7C 08 03 A6 */ mtlr r0 /* 800ECE6C 000E9DCC 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 800ECE70 000E9DD0 4E 80 00 20 */ blr +/* 800ECE70 000E9DD0 4E 80 00 20 */ blr .global DrawFullScreenTexturedQuad__17CCameraFilterPassFRC6CColorPC8CTexturef DrawFullScreenTexturedQuad__17CCameraFilterPassFRC6CColorPC8CTexturef: @@ -2635,7 +2635,7 @@ DrawFullScreenTexturedQuad__17CCameraFilterPassFRC6CColorPC8CTexturef: /* 800ECEC4 000E9E24 C0 42 91 34 */ lfs f2, lbl_805AAE54@sda21(r2) /* 800ECEC8 000E9E28 EF C0 18 2A */ fadds f30, f0, f3 /* 800ECECC 000E9E2C 7D 89 03 A6 */ mtctr r12 -/* 800ECED0 000E9E30 4E 80 04 21 */ bctrl +/* 800ECED0 000E9E30 4E 80 04 21 */ bctrl /* 800ECED4 000E9E34 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 800ECED8 000E9E38 38 80 00 00 */ li r4, 0 /* 800ECEDC 000E9E3C C0 61 00 38 */ lfs f3, 0x38(r1) @@ -2650,7 +2650,7 @@ DrawFullScreenTexturedQuad__17CCameraFilterPassFRC6CColorPC8CTexturef: /* 800ECF00 000E9E60 D0 21 00 50 */ stfs f1, 0x50(r1) /* 800ECF04 000E9E64 D0 01 00 54 */ stfs f0, 0x54(r1) /* 800ECF08 000E9E68 7D 89 03 A6 */ mtctr r12 -/* 800ECF0C 000E9E6C 4E 80 04 21 */ bctrl +/* 800ECF0C 000E9E6C 4E 80 04 21 */ bctrl /* 800ECF10 000E9E70 28 1F 00 00 */ cmplwi r31, 0 /* 800ECF14 000E9E74 41 82 00 14 */ beq lbl_800ECF28 /* 800ECF18 000E9E78 7F E3 FB 78 */ mr r3, r31 @@ -2735,7 +2735,7 @@ lbl_800ECF28: /* 800ED050 000E9FB0 83 C1 00 58 */ lwz r30, 0x58(r1) /* 800ED054 000E9FB4 7C 08 03 A6 */ mtlr r0 /* 800ED058 000E9FB8 38 21 00 80 */ addi r1, r1, 0x80 -/* 800ED05C 000E9FBC 4E 80 00 20 */ blr +/* 800ED05C 000E9FBC 4E 80 00 20 */ blr .global DrawFullScreenColoredQuad__17CCameraFilterPassFRC6CColor DrawFullScreenColoredQuad__17CCameraFilterPassFRC6CColor: @@ -2752,7 +2752,7 @@ DrawFullScreenColoredQuad__17CCameraFilterPassFRC6CColor: /* 800ED088 000E9FE8 81 84 00 00 */ lwz r12, 0(r4) /* 800ED08C 000E9FEC 81 8C 00 54 */ lwz r12, 0x54(r12) /* 800ED090 000E9FF0 7D 89 03 A6 */ mtctr r12 -/* 800ED094 000E9FF4 4E 80 04 21 */ bctrl +/* 800ED094 000E9FF4 4E 80 04 21 */ bctrl /* 800ED098 000E9FF8 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 800ED09C 000E9FFC 38 80 00 00 */ li r4, 0 /* 800ED0A0 000EA000 C0 61 00 38 */ lfs f3, 0x38(r1) @@ -2767,19 +2767,19 @@ DrawFullScreenColoredQuad__17CCameraFilterPassFRC6CColor: /* 800ED0C4 000EA024 D0 21 00 50 */ stfs f1, 0x50(r1) /* 800ED0C8 000EA028 D0 01 00 54 */ stfs f0, 0x54(r1) /* 800ED0CC 000EA02C 7D 89 03 A6 */ mtctr r12 -/* 800ED0D0 000EA030 4E 80 04 21 */ bctrl +/* 800ED0D0 000EA030 4E 80 04 21 */ bctrl /* 800ED0D4 000EA034 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 800ED0D8 000EA038 38 80 00 04 */ li r4, 4 /* 800ED0DC 000EA03C 81 83 00 00 */ lwz r12, 0(r3) /* 800ED0E0 000EA040 81 8C 00 A0 */ lwz r12, 0xa0(r12) /* 800ED0E4 000EA044 7D 89 03 A6 */ mtctr r12 -/* 800ED0E8 000EA048 4E 80 04 21 */ bctrl +/* 800ED0E8 000EA048 4E 80 04 21 */ bctrl /* 800ED0EC 000EA04C 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 800ED0F0 000EA050 7F E4 FB 78 */ mr r4, r31 /* 800ED0F4 000EA054 81 83 00 00 */ lwz r12, 0(r3) /* 800ED0F8 000EA058 81 8C 00 B4 */ lwz r12, 0xb4(r12) /* 800ED0FC 000EA05C 7D 89 03 A6 */ mtctr r12 -/* 800ED100 000EA060 4E 80 04 21 */ bctrl +/* 800ED100 000EA060 4E 80 04 21 */ bctrl /* 800ED104 000EA064 C0 42 90 DC */ lfs f2, lbl_805AADFC@sda21(r2) /* 800ED108 000EA068 38 81 00 2C */ addi r4, r1, 0x2c /* 800ED10C 000EA06C C0 01 00 54 */ lfs f0, 0x54(r1) @@ -2794,7 +2794,7 @@ DrawFullScreenColoredQuad__17CCameraFilterPassFRC6CColor: /* 800ED130 000EA090 81 83 00 00 */ lwz r12, 0(r3) /* 800ED134 000EA094 81 8C 00 A8 */ lwz r12, 0xa8(r12) /* 800ED138 000EA098 7D 89 03 A6 */ mtctr r12 -/* 800ED13C 000EA09C 4E 80 04 21 */ bctrl +/* 800ED13C 000EA09C 4E 80 04 21 */ bctrl /* 800ED140 000EA0A0 C0 21 00 48 */ lfs f1, 0x48(r1) /* 800ED144 000EA0A4 38 81 00 20 */ addi r4, r1, 0x20 /* 800ED148 000EA0A8 C0 62 90 DC */ lfs f3, lbl_805AADFC@sda21(r2) @@ -2809,7 +2809,7 @@ DrawFullScreenColoredQuad__17CCameraFilterPassFRC6CColor: /* 800ED16C 000EA0CC 81 83 00 00 */ lwz r12, 0(r3) /* 800ED170 000EA0D0 81 8C 00 A8 */ lwz r12, 0xa8(r12) /* 800ED174 000EA0D4 7D 89 03 A6 */ mtctr r12 -/* 800ED178 000EA0D8 4E 80 04 21 */ bctrl +/* 800ED178 000EA0D8 4E 80 04 21 */ bctrl /* 800ED17C 000EA0DC C0 42 90 DC */ lfs f2, lbl_805AADFC@sda21(r2) /* 800ED180 000EA0E0 38 81 00 14 */ addi r4, r1, 0x14 /* 800ED184 000EA0E4 C0 01 00 54 */ lfs f0, 0x54(r1) @@ -2824,7 +2824,7 @@ DrawFullScreenColoredQuad__17CCameraFilterPassFRC6CColor: /* 800ED1A8 000EA108 81 83 00 00 */ lwz r12, 0(r3) /* 800ED1AC 000EA10C 81 8C 00 A8 */ lwz r12, 0xa8(r12) /* 800ED1B0 000EA110 7D 89 03 A6 */ mtctr r12 -/* 800ED1B4 000EA114 4E 80 04 21 */ bctrl +/* 800ED1B4 000EA114 4E 80 04 21 */ bctrl /* 800ED1B8 000EA118 C0 62 90 DC */ lfs f3, lbl_805AADFC@sda21(r2) /* 800ED1BC 000EA11C 38 81 00 08 */ addi r4, r1, 8 /* 800ED1C0 000EA120 C0 21 00 50 */ lfs f1, 0x50(r1) @@ -2839,17 +2839,17 @@ DrawFullScreenColoredQuad__17CCameraFilterPassFRC6CColor: /* 800ED1E4 000EA144 81 83 00 00 */ lwz r12, 0(r3) /* 800ED1E8 000EA148 81 8C 00 A8 */ lwz r12, 0xa8(r12) /* 800ED1EC 000EA14C 7D 89 03 A6 */ mtctr r12 -/* 800ED1F0 000EA150 4E 80 04 21 */ bctrl +/* 800ED1F0 000EA150 4E 80 04 21 */ bctrl /* 800ED1F4 000EA154 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 800ED1F8 000EA158 81 83 00 00 */ lwz r12, 0(r3) /* 800ED1FC 000EA15C 81 8C 00 B8 */ lwz r12, 0xb8(r12) /* 800ED200 000EA160 7D 89 03 A6 */ mtctr r12 -/* 800ED204 000EA164 4E 80 04 21 */ bctrl +/* 800ED204 000EA164 4E 80 04 21 */ bctrl /* 800ED208 000EA168 80 01 00 64 */ lwz r0, 0x64(r1) /* 800ED20C 000EA16C 83 E1 00 5C */ lwz r31, 0x5c(r1) /* 800ED210 000EA170 7C 08 03 A6 */ mtlr r0 /* 800ED214 000EA174 38 21 00 60 */ addi r1, r1, 0x60 -/* 800ED218 000EA178 4E 80 00 20 */ blr +/* 800ED218 000EA178 4E 80 00 20 */ blr .global Update__17CCameraFilterPassFf Update__17CCameraFilterPassFf: @@ -2943,7 +2943,7 @@ lbl_800ED350: /* 800ED358 000EA2B8 83 C1 00 18 */ lwz r30, 0x18(r1) /* 800ED35C 000EA2BC 7C 08 03 A6 */ mtlr r0 /* 800ED360 000EA2C0 38 21 00 20 */ addi r1, r1, 0x20 -/* 800ED364 000EA2C4 4E 80 00 20 */ blr +/* 800ED364 000EA2C4 4E 80 00 20 */ blr .global DisableFilter__17CCameraFilterPassFf DisableFilter__17CCameraFilterPassFf: @@ -2960,7 +2960,7 @@ DisableFilter__17CCameraFilterPassFf: /* 800ED390 000EA2F0 80 01 00 14 */ lwz r0, 0x14(r1) /* 800ED394 000EA2F4 7C 08 03 A6 */ mtlr r0 /* 800ED398 000EA2F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800ED39C 000EA2FC 4E 80 00 20 */ blr +/* 800ED39C 000EA2FC 4E 80 00 20 */ blr .global SetFilter__17CCameraFilterPassFQ217CCameraFilterPass11EFilterTypeQ217CCameraFilterPass12EFilterShapefRC6CColorUi SetFilter__17CCameraFilterPassFQ217CCameraFilterPass11EFilterTypeQ217CCameraFilterPass12EFilterShapefRC6CColorUi: @@ -3012,7 +3012,7 @@ SetFilter__17CCameraFilterPassFQ217CCameraFilterPass11EFilterTypeQ217CCameraFilt /* 800ED454 000EA3B4 81 84 00 00 */ lwz r12, 0(r4) /* 800ED458 000EA3B8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800ED45C 000EA3BC 7D 89 03 A6 */ mtctr r12 -/* 800ED460 000EA3C0 4E 80 04 21 */ bctrl +/* 800ED460 000EA3C0 4E 80 04 21 */ bctrl /* 800ED464 000EA3C4 7F 83 E3 78 */ mr r3, r28 /* 800ED468 000EA3C8 38 81 00 30 */ addi r4, r1, 0x30 /* 800ED46C 000EA3CC 3B C0 00 01 */ li r30, 1 @@ -3102,7 +3102,7 @@ lbl_800ED538: /* 800ED5A0 000EA500 81 84 00 00 */ lwz r12, 0(r4) /* 800ED5A4 000EA504 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800ED5A8 000EA508 7D 89 03 A6 */ mtctr r12 -/* 800ED5AC 000EA50C 4E 80 04 21 */ bctrl +/* 800ED5AC 000EA50C 4E 80 04 21 */ bctrl /* 800ED5B0 000EA510 7F 63 DB 78 */ mr r3, r27 /* 800ED5B4 000EA514 38 81 00 18 */ addi r4, r1, 0x18 /* 800ED5B8 000EA518 3B 80 00 01 */ li r28, 1 @@ -3235,7 +3235,7 @@ lbl_800ED770: /* 800ED77C 000EA6DC 80 01 00 74 */ lwz r0, 0x74(r1) /* 800ED780 000EA6E0 7C 08 03 A6 */ mtlr r0 /* 800ED784 000EA6E4 38 21 00 70 */ addi r1, r1, 0x70 -/* 800ED788 000EA6E8 4E 80 00 20 */ blr +/* 800ED788 000EA6E8 4E 80 00 20 */ blr .global __ct__17CCameraFilterPassFv __ct__17CCameraFilterPassFv: @@ -3253,7 +3253,7 @@ __ct__17CCameraFilterPassFv: /* 800ED7B8 000EA718 90 03 00 20 */ stw r0, 0x20(r3) /* 800ED7BC 000EA71C 98 83 00 24 */ stb r4, 0x24(r3) /* 800ED7C0 000EA720 90 83 00 28 */ stw r4, 0x28(r3) -/* 800ED7C4 000EA724 4E 80 00 20 */ blr +/* 800ED7C4 000EA724 4E 80 00 20 */ blr .global __sinit_CCameraFilter_cpp __sinit_CCameraFilter_cpp: diff --git a/asm/MetroidPrime/Cameras/CCameraHint.s b/asm/MetroidPrime/Cameras/CCameraHint.s index 3346fa2a..8f914951 100644 --- a/asm/MetroidPrime/Cameras/CCameraHint.s +++ b/asm/MetroidPrime/Cameras/CCameraHint.s @@ -31,7 +31,7 @@ lbl_800C51BC: /* 800C51C4 000C2124 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800C51C8 000C2128 7C 08 03 A6 */ mtlr r0 /* 800C51CC 000C212C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C51D0 000C2130 4E 80 00 20 */ blr +/* 800C51D0 000C2130 4E 80 00 20 */ blr .global __ct__11CCameraHintFiQ211CBallCamera20EBallCameraBehaviourfffRC9CVector3fRC9CVector3fRC9CVector3fffffffffff __ct__11CCameraHintFiQ211CBallCamera20EBallCameraBehaviourfffRC9CVector3fRC9CVector3fRC9CVector3fffffffffff: @@ -76,4 +76,4 @@ __ct__11CCameraHintFiQ211CBallCamera20EBallCameraBehaviourfffRC9CVector3fRC9CVec /* 800C526C 000C21CC D1 63 00 58 */ stfs f11, 0x58(r3) /* 800C5270 000C21D0 D1 43 00 5C */ stfs f10, 0x5c(r3) /* 800C5274 000C21D4 D1 23 00 60 */ stfs f9, 0x60(r3) -/* 800C5278 000C21D8 4E 80 00 20 */ blr +/* 800C5278 000C21D8 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/Cameras/CCameraManager.s b/asm/MetroidPrime/Cameras/CCameraManager.s index 86e9b99e..e3b54d9f 100644 --- a/asm/MetroidPrime/Cameras/CCameraManager.s +++ b/asm/MetroidPrime/Cameras/CCameraManager.s @@ -111,12 +111,15 @@ lbl_805A6BE8: # ROM: 0x3F4588 .4byte 0x42FE0000 .4byte 0 - + .section .rodata .global lbl_803CC028 lbl_803CC028: - .incbin "baserom.dol", 0x3C9028, 0x8 - + # ROM: 0x3C9028 + .asciz "??(??)" + .balign 4 + + .section .text, "ax" @@ -170,13 +173,13 @@ lbl_800091E4: /* 800091F4 00006154 CB E1 00 10 */ lfd f31, 0x10(r1) /* 800091F8 00006158 7C 08 03 A6 */ mtlr r0 /* 800091FC 0000615C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80009200 00006160 4E 80 00 20 */ blr +/* 80009200 00006160 4E 80 00 20 */ blr .global GetSpindleCameraId__14CCameraManagerCFv GetSpindleCameraId__14CCameraManagerCFv: /* 80009204 00006164 A0 04 00 A2 */ lhz r0, 0xa2(r4) /* 80009208 00006168 B0 03 00 00 */ sth r0, 0(r3) -/* 8000920C 0000616C 4E 80 00 20 */ blr +/* 8000920C 0000616C 4E 80 00 20 */ blr .global SetSpindleCamera__14CCameraManagerF9TUniqueIdR13CStateManager SetSpindleCamera__14CCameraManagerF9TUniqueIdR13CStateManager: @@ -211,7 +214,7 @@ SetSpindleCamera__14CCameraManagerF9TUniqueIdR13CStateManager: /* 80009280 000061E0 38 81 00 14 */ addi r4, r1, 0x14 /* 80009284 000061E4 81 8C 00 70 */ lwz r12, 0x70(r12) /* 80009288 000061E8 7D 89 03 A6 */ mtctr r12 -/* 8000928C 000061EC 4E 80 04 21 */ bctrl +/* 8000928C 000061EC 4E 80 04 21 */ bctrl /* 80009290 000061F0 80 7D 00 80 */ lwz r3, 0x80(r29) /* 80009294 000061F4 7F C5 F3 78 */ mr r5, r30 /* 80009298 000061F8 38 9F 00 34 */ addi r4, r31, 0x34 @@ -223,13 +226,13 @@ lbl_800092A0: /* 800092AC 0000620C 83 A1 00 54 */ lwz r29, 0x54(r1) /* 800092B0 00006210 7C 08 03 A6 */ mtlr r0 /* 800092B4 00006214 38 21 00 60 */ addi r1, r1, 0x60 -/* 800092B8 00006218 4E 80 00 20 */ blr +/* 800092B8 00006218 4E 80 00 20 */ blr .global GetPathCameraId__14CCameraManagerCFv GetPathCameraId__14CCameraManagerCFv: /* 800092BC 0000621C A0 04 00 A4 */ lhz r0, 0xa4(r4) /* 800092C0 00006220 B0 03 00 00 */ sth r0, 0(r3) -/* 800092C4 00006224 4E 80 00 20 */ blr +/* 800092C4 00006224 4E 80 00 20 */ blr .global SetPathCamera__14CCameraManagerF9TUniqueIdR13CStateManager SetPathCamera__14CCameraManagerF9TUniqueIdR13CStateManager: @@ -264,7 +267,7 @@ SetPathCamera__14CCameraManagerF9TUniqueIdR13CStateManager: /* 80009338 00006298 38 81 00 14 */ addi r4, r1, 0x14 /* 8000933C 0000629C 81 8C 00 70 */ lwz r12, 0x70(r12) /* 80009340 000062A0 7D 89 03 A6 */ mtctr r12 -/* 80009344 000062A4 4E 80 04 21 */ bctrl +/* 80009344 000062A4 4E 80 04 21 */ bctrl /* 80009348 000062A8 80 7D 00 80 */ lwz r3, 0x80(r29) /* 8000934C 000062AC 7F C5 F3 78 */ mr r5, r30 /* 80009350 000062B0 38 9F 00 34 */ addi r4, r31, 0x34 @@ -276,7 +279,7 @@ lbl_80009358: /* 80009364 000062C4 83 A1 00 54 */ lwz r29, 0x54(r1) /* 80009368 000062C8 7C 08 03 A6 */ mtlr r0 /* 8000936C 000062CC 38 21 00 60 */ addi r1, r1, 0x60 -/* 80009370 000062D0 4E 80 00 20 */ blr +/* 80009370 000062D0 4E 80 00 20 */ blr .global HasCameraHint__14CCameraManagerCFR13CStateManager HasCameraHint__14CCameraManagerCFR13CStateManager: @@ -304,7 +307,7 @@ lbl_800093C0: /* 800093C0 00006320 80 01 00 14 */ lwz r0, 0x14(r1) /* 800093C4 00006324 7C 08 03 A6 */ mtlr r0 /* 800093C8 00006328 38 21 00 10 */ addi r1, r1, 0x10 -/* 800093CC 0000632C 4E 80 00 20 */ blr +/* 800093CC 0000632C 4E 80 00 20 */ blr .global GetCameraHint__14CCameraManagerCFR13CStateManager GetCameraHint__14CCameraManagerCFR13CStateManager: @@ -323,7 +326,7 @@ GetCameraHint__14CCameraManagerCFR13CStateManager: /* 80009400 00006360 80 63 00 04 */ lwz r3, 4(r3) /* 80009404 00006364 7C 08 03 A6 */ mtlr r0 /* 80009408 00006368 38 21 00 20 */ addi r1, r1, 0x20 -/* 8000940C 0000636C 4E 80 00 20 */ blr +/* 8000940C 0000636C 4E 80 00 20 */ blr .global SetupBallCamera__14CCameraManagerFR13CStateManager SetupBallCamera__14CCameraManagerFR13CStateManager: @@ -375,7 +378,7 @@ lbl_800094B0: /* 800094B0 00006410 83 C1 00 18 */ lwz r30, 0x18(r1) /* 800094B4 00006414 7C 08 03 A6 */ mtlr r0 /* 800094B8 00006418 38 21 00 20 */ addi r1, r1, 0x20 -/* 800094BC 0000641C 4E 80 00 20 */ blr +/* 800094BC 0000641C 4E 80 00 20 */ blr .global AddInactiveCameraHint__14CCameraManagerF9TUniqueIdR13CStateManager AddInactiveCameraHint__14CCameraManagerF9TUniqueIdR13CStateManager: @@ -430,7 +433,7 @@ lbl_80009564: /* 8000956C 000064CC 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80009570 000064D0 7C 08 03 A6 */ mtlr r0 /* 80009574 000064D4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80009578 000064D8 4E 80 00 20 */ blr +/* 80009578 000064D8 4E 80 00 20 */ blr .global DeleteCameraHint__14CCameraManagerF9TUniqueIdR13CStateManager DeleteCameraHint__14CCameraManagerF9TUniqueIdR13CStateManager: @@ -496,7 +499,7 @@ lbl_80009644: /* 80009654 000065B4 83 81 00 20 */ lwz r28, 0x20(r1) /* 80009658 000065B8 7C 08 03 A6 */ mtlr r0 /* 8000965C 000065BC 38 21 00 30 */ addi r1, r1, 0x30 -/* 80009660 000065C0 4E 80 00 20 */ blr +/* 80009660 000065C0 4E 80 00 20 */ blr .global AddActiveCameraHint__14CCameraManagerF9TUniqueIdR13CStateManager AddActiveCameraHint__14CCameraManagerF9TUniqueIdR13CStateManager: @@ -556,7 +559,7 @@ lbl_80009718: /* 80009720 00006680 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80009724 00006684 7C 08 03 A6 */ mtlr r0 /* 80009728 00006688 38 21 00 20 */ addi r1, r1, 0x20 -/* 8000972C 0000668C 4E 80 00 20 */ blr +/* 8000972C 0000668C 4E 80 00 20 */ blr .global HasBallCameraInitialPositionHint__14CCameraManagerCFR13CStateManager HasBallCameraInitialPositionHint__14CCameraManagerCFR13CStateManager: @@ -594,7 +597,7 @@ lbl_80009798: /* 8000979C 000066FC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800097A0 00006700 7C 08 03 A6 */ mtlr r0 /* 800097A4 00006704 38 21 00 10 */ addi r1, r1, 0x10 -/* 800097A8 00006708 4E 80 00 20 */ blr +/* 800097A8 00006708 4E 80 00 20 */ blr .global UpdateCameraHints__14CCameraManagerFfR13CStateManager UpdateCameraHints__14CCameraManagerFfR13CStateManager: @@ -1372,7 +1375,7 @@ lbl_8000A248: /* 8000A28C 000071EC 80 01 02 04 */ lwz r0, 0x204(r1) /* 8000A290 000071F0 7C 08 03 A6 */ mtlr r0 /* 8000A294 000071F4 38 21 02 00 */ addi r1, r1, 0x200 -/* 8000A298 000071F8 4E 80 00 20 */ blr +/* 8000A298 000071F8 4E 80 00 20 */ blr .global RestoreHintlessCamera__14CCameraManagerFR13CStateManager RestoreHintlessCamera__14CCameraManagerFR13CStateManager: @@ -1502,7 +1505,7 @@ lbl_8000A46C: /* 8000A478 000073D8 83 A1 00 A4 */ lwz r29, 0xa4(r1) /* 8000A47C 000073DC 7C 08 03 A6 */ mtlr r0 /* 8000A480 000073E0 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 8000A484 000073E4 4E 80 00 20 */ blr +/* 8000A484 000073E4 4E 80 00 20 */ blr .global ApplyCameraHint__14CCameraManagerFRC17CScriptCameraHintR13CStateManager ApplyCameraHint__14CCameraManagerFRC17CScriptCameraHintR13CStateManager: @@ -1648,7 +1651,7 @@ lbl_8000A680: /* 8000A690 000075F0 83 81 00 A0 */ lwz r28, 0xa0(r1) /* 8000A694 000075F4 7C 08 03 A6 */ mtlr r0 /* 8000A698 000075F8 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 8000A69C 000075FC 4E 80 00 20 */ blr +/* 8000A69C 000075FC 4E 80 00 20 */ blr .global SkipBallCameraCinematic__14CCameraManagerFR13CStateManager SkipBallCameraCinematic__14CCameraManagerFR13CStateManager: @@ -1702,7 +1705,7 @@ lbl_8000A748: /* 8000A758 000076B8 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8000A75C 000076BC 7C 08 03 A6 */ mtlr r0 /* 8000A760 000076C0 38 21 00 30 */ addi r1, r1, 0x30 -/* 8000A764 000076C4 4E 80 00 20 */ blr +/* 8000A764 000076C4 4E 80 00 20 */ blr .global InterpolateToBallCamera__14CCameraManagerFRC12CTransform4f9TUniqueIdRC9CVector3ffffbR13CStateManager InterpolateToBallCamera__14CCameraManagerFRC12CTransform4f9TUniqueIdRC9CVector3ffffbR13CStateManager: @@ -1762,7 +1765,7 @@ lbl_8000A828: /* 8000A838 00007798 80 01 00 54 */ lwz r0, 0x54(r1) /* 8000A83C 0000779C 7C 08 03 A6 */ mtlr r0 /* 8000A840 000077A0 38 21 00 50 */ addi r1, r1, 0x50 -/* 8000A844 000077A4 4E 80 00 20 */ blr +/* 8000A844 000077A4 4E 80 00 20 */ blr .global SetPlayerCamera__14CCameraManagerFR13CStateManager9TUniqueId SetPlayerCamera__14CCameraManagerFR13CStateManager9TUniqueId: @@ -1781,7 +1784,7 @@ SetPlayerCamera__14CCameraManagerFR13CStateManager9TUniqueId: /* 8000A878 000077D8 38 80 00 00 */ li r4, 0 /* 8000A87C 000077DC 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 8000A880 000077E0 7D 89 03 A6 */ mtctr r12 -/* 8000A884 000077E4 4E 80 04 21 */ bctrl +/* 8000A884 000077E4 4E 80 04 21 */ bctrl /* 8000A888 000077E8 80 7E 00 80 */ lwz r3, 0x80(r30) /* 8000A88C 000077EC 48 05 06 FD */ bl SkipFovInterpolation__11CGameCameraFv /* 8000A890 000077F0 7F C3 F3 78 */ mr r3, r30 @@ -1799,19 +1802,19 @@ lbl_8000A8B4: /* 8000A8BC 0000781C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8000A8C0 00007820 7C 08 03 A6 */ mtlr r0 /* 8000A8C4 00007824 38 21 00 20 */ addi r1, r1, 0x20 -/* 8000A8C8 00007828 4E 80 00 20 */ blr +/* 8000A8C8 00007828 4E 80 00 20 */ blr .global ShouldBypassInterpolationCamera__14CCameraManagerCFv ShouldBypassInterpolationCamera__14CCameraManagerCFv: /* 8000A8CC 0000782C 38 60 00 00 */ li r3, 0 -/* 8000A8D0 00007830 4E 80 00 20 */ blr +/* 8000A8D0 00007830 4E 80 00 20 */ blr .global IsInterpolationCameraActive__14CCameraManagerCFv IsInterpolationCameraActive__14CCameraManagerCFv: /* 8000A8D4 00007834 80 63 00 88 */ lwz r3, 0x88(r3) /* 8000A8D8 00007838 88 03 00 30 */ lbz r0, 0x30(r3) /* 8000A8DC 0000783C 54 03 CF FE */ rlwinm r3, r0, 0x19, 0x1f, 0x1f -/* 8000A8E0 00007840 4E 80 00 20 */ blr +/* 8000A8E0 00007840 4E 80 00 20 */ blr .global IsInFirstPersonCamera__14CCameraManagerCFv IsInFirstPersonCamera__14CCameraManagerCFv: @@ -1824,7 +1827,7 @@ IsInFirstPersonCamera__14CCameraManagerCFv: .global sub_8000a8fc sub_8000a8fc: -/* 8000A8FC 0000785C 4E 80 00 20 */ blr +/* 8000A8FC 0000785C 4E 80 00 20 */ blr .global IsInCinematicCamera__14CCameraManagerCFv IsInCinematicCamera__14CCameraManagerCFv: @@ -1832,7 +1835,7 @@ IsInCinematicCamera__14CCameraManagerCFv: /* 8000A904 00007864 7C 03 00 D0 */ neg r0, r3 /* 8000A908 00007868 7C 00 1B 78 */ or r0, r0, r3 /* 8000A90C 0000786C 54 03 0F FE */ srwi r3, r0, 0x1f -/* 8000A910 00007870 4E 80 00 20 */ blr +/* 8000A910 00007870 4E 80 00 20 */ blr .global GetGlobalCameraTranslation__14CCameraManagerCFRC13CStateManager GetGlobalCameraTranslation__14CCameraManagerCFRC13CStateManager: @@ -1856,7 +1859,7 @@ GetGlobalCameraTranslation__14CCameraManagerCFRC13CStateManager: /* 8000A958 000078B8 83 C1 00 08 */ lwz r30, 8(r1) /* 8000A95C 000078BC 7C 08 03 A6 */ mtlr r0 /* 8000A960 000078C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8000A964 000078C4 4E 80 00 20 */ blr +/* 8000A964 000078C4 4E 80 00 20 */ blr .global GetCurrentCameraTransform__14CCameraManagerCFRC13CStateManager GetCurrentCameraTransform__14CCameraManagerCFRC13CStateManager: @@ -1885,7 +1888,7 @@ GetCurrentCameraTransform__14CCameraManagerCFRC13CStateManager: /* 8000A9C0 00007920 83 A1 00 44 */ lwz r29, 0x44(r1) /* 8000A9C4 00007924 7C 08 03 A6 */ mtlr r0 /* 8000A9C8 00007928 38 21 00 50 */ addi r1, r1, 0x50 -/* 8000A9CC 0000792C 4E 80 00 20 */ blr +/* 8000A9CC 0000792C 4E 80 00 20 */ blr .global RemoveCameraShaker__14CCameraManagerFi RemoveCameraShaker__14CCameraManagerFi: @@ -1912,7 +1915,7 @@ lbl_8000AA10: /* 8000AA10 00007970 80 01 00 14 */ lwz r0, 0x14(r1) /* 8000AA14 00007974 7C 08 03 A6 */ mtlr r0 /* 8000AA18 00007978 38 21 00 10 */ addi r1, r1, 0x10 -/* 8000AA1C 0000797C 4E 80 00 20 */ blr +/* 8000AA1C 0000797C 4E 80 00 20 */ blr .global AddCameraShaker__14CCameraManagerFRC16CCameraShakeDatab AddCameraShaker__14CCameraManagerFRC16CCameraShakeDatab: @@ -2047,7 +2050,7 @@ lbl_8000ABE4: /* 8000AC00 00007B60 83 A1 01 14 */ lwz r29, 0x114(r1) /* 8000AC04 00007B64 7C 08 03 A6 */ mtlr r0 /* 8000AC08 00007B68 38 21 01 40 */ addi r1, r1, 0x140 -/* 8000AC0C 00007B6C 4E 80 00 20 */ blr +/* 8000AC0C 00007B6C 4E 80 00 20 */ blr .global sub_8000ac10 sub_8000ac10: @@ -2060,7 +2063,7 @@ sub_8000ac10: /* 8000AC28 00007B88 80 01 00 14 */ lwz r0, 0x14(r1) /* 8000AC2C 00007B8C 7C 08 03 A6 */ mtlr r0 /* 8000AC30 00007B90 38 21 00 10 */ addi r1, r1, 0x10 -/* 8000AC34 00007B94 4E 80 00 20 */ blr +/* 8000AC34 00007B94 4E 80 00 20 */ blr .global sub_8000ac38 sub_8000ac38: @@ -2092,7 +2095,7 @@ lbl_8000AC74: /* 8000AC98 00007BF8 83 C1 00 08 */ lwz r30, 8(r1) /* 8000AC9C 00007BFC 7C 08 03 A6 */ mtlr r0 /* 8000ACA0 00007C00 38 21 00 10 */ addi r1, r1, 0x10 -/* 8000ACA4 00007C04 4E 80 00 20 */ blr +/* 8000ACA4 00007C04 4E 80 00 20 */ blr .global sub_8000aca8 sub_8000aca8: @@ -2130,7 +2133,7 @@ lbl_8000AD08: /* 8000AD1C 00007C7C 83 81 00 10 */ lwz r28, 0x10(r1) /* 8000AD20 00007C80 7C 08 03 A6 */ mtlr r0 /* 8000AD24 00007C84 38 21 00 20 */ addi r1, r1, 0x20 -/* 8000AD28 00007C88 4E 80 00 20 */ blr +/* 8000AD28 00007C88 4E 80 00 20 */ blr .global sub_8000ad2c sub_8000ad2c: @@ -2168,7 +2171,7 @@ lbl_8000AD90: /* 8000AD98 00007CF8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8000AD9C 00007CFC 7C 08 03 A6 */ mtlr r0 /* 8000ADA0 00007D00 38 21 00 10 */ addi r1, r1, 0x10 -/* 8000ADA4 00007D04 4E 80 00 20 */ blr +/* 8000ADA4 00007D04 4E 80 00 20 */ blr .global __ct__16CCameraShakeDataFRC16CCameraShakeData __ct__16CCameraShakeDataFRC16CCameraShakeData: @@ -2277,7 +2280,7 @@ __ct__16CCameraShakeDataFRC16CCameraShakeData: /* 8000AF40 00007EA0 D0 03 00 CC */ stfs f0, 0xcc(r3) /* 8000AF44 00007EA4 C0 04 00 D0 */ lfs f0, 0xd0(r4) /* 8000AF48 00007EA8 D0 03 00 D0 */ stfs f0, 0xd0(r3) -/* 8000AF4C 00007EAC 4E 80 00 20 */ blr +/* 8000AF4C 00007EAC 4E 80 00 20 */ blr .global __dt__22CCameraShakerComponentFv __dt__22CCameraShakerComponentFv: @@ -2299,7 +2302,7 @@ lbl_8000AF80: /* 8000AF88 00007EE8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8000AF8C 00007EEC 7C 08 03 A6 */ mtlr r0 /* 8000AF90 00007EF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8000AF94 00007EF4 4E 80 00 20 */ blr +/* 8000AF94 00007EF4 4E 80 00 20 */ blr .global SkipCinematic__14CCameraManagerFR13CStateManager SkipCinematic__14CCameraManagerFR13CStateManager: @@ -2327,7 +2330,7 @@ lbl_8000AFE0: /* 8000AFE8 00007F48 81 9F 00 00 */ lwz r12, 0(r31) /* 8000AFEC 00007F4C 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 8000AFF0 00007F50 7D 89 03 A6 */ mtctr r12 -/* 8000AFF4 00007F54 4E 80 04 21 */ bctrl +/* 8000AFF4 00007F54 4E 80 04 21 */ bctrl /* 8000AFF8 00007F58 7F E3 FB 78 */ mr r3, r31 /* 8000AFFC 00007F5C 7F C4 F3 78 */ mr r4, r30 /* 8000B000 00007F60 48 08 92 E9 */ bl WasDeactivated__16CCinematicCameraFR13CStateManager @@ -2355,7 +2358,7 @@ lbl_8000B020: .global sub_8000b054 sub_8000b054: -/* 8000B054 00007FB4 4E 80 00 20 */ blr +/* 8000B054 00007FB4 4E 80 00 20 */ blr .global EnterCinematic__14CCameraManagerFR13CStateManager EnterCinematic__14CCameraManagerFR13CStateManager: @@ -2455,7 +2458,7 @@ lbl_8000B1A8: /* 8000B1B4 00008114 80 01 00 64 */ lwz r0, 0x64(r1) /* 8000B1B8 00008118 7C 08 03 A6 */ mtlr r0 /* 8000B1BC 0000811C 38 21 00 60 */ addi r1, r1, 0x60 -/* 8000B1C0 00008120 4E 80 00 20 */ blr +/* 8000B1C0 00008120 4E 80 00 20 */ blr .global RemoveCinemaCamera__14CCameraManagerF9TUniqueIdR13CStateManager RemoveCinemaCamera__14CCameraManagerF9TUniqueIdR13CStateManager: @@ -2499,7 +2502,7 @@ lbl_8000B248: /* 8000B248 000081A8 80 01 00 34 */ lwz r0, 0x34(r1) /* 8000B24C 000081AC 7C 08 03 A6 */ mtlr r0 /* 8000B250 000081B0 38 21 00 30 */ addi r1, r1, 0x30 -/* 8000B254 000081B4 4E 80 00 20 */ blr +/* 8000B254 000081B4 4E 80 00 20 */ blr .global "find,Q24rstl17rmemory_allocator>,9TUniqueId>__4rstlFQ24rstl110pointer_iterator<9TUniqueId,Q24rstl45vector<9TUniqueId,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl110pointer_iterator<9TUniqueId,Q24rstl45vector<9TUniqueId,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>RC9TUniqueId" "find,Q24rstl17rmemory_allocator>,9TUniqueId>__4rstlFQ24rstl110pointer_iterator<9TUniqueId,Q24rstl45vector<9TUniqueId,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl110pointer_iterator<9TUniqueId,Q24rstl45vector<9TUniqueId,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>RC9TUniqueId": @@ -2521,7 +2524,7 @@ lbl_8000B248: /* 8000B294 000081F4 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8000B298 000081F8 7C 08 03 A6 */ mtlr r0 /* 8000B29C 000081FC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8000B2A0 00008200 4E 80 00 20 */ blr +/* 8000B2A0 00008200 4E 80 00 20 */ blr .global sub_8000b2a4 sub_8000b2a4: @@ -2567,7 +2570,7 @@ lbl_8000B310: /* 8000B32C 0000828C 80 05 00 00 */ lwz r0, 0(r5) /* 8000B330 00008290 90 03 00 00 */ stw r0, 0(r3) /* 8000B334 00008294 38 21 00 10 */ addi r1, r1, 0x10 -/* 8000B338 00008298 4E 80 00 20 */ blr +/* 8000B338 00008298 4E 80 00 20 */ blr .global AddCinemaCamera__14CCameraManagerF9TUniqueIdR13CStateManager AddCinemaCamera__14CCameraManagerF9TUniqueIdR13CStateManager: @@ -2652,7 +2655,7 @@ lbl_8000B450: /* 8000B45C 000083BC 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8000B460 000083C0 7C 08 03 A6 */ mtlr r0 /* 8000B464 000083C4 38 21 00 30 */ addi r1, r1, 0x30 -/* 8000B468 000083C8 4E 80 00 20 */ blr +/* 8000B468 000083C8 4E 80 00 20 */ blr .global ProcessInput__14CCameraManagerFRC11CFinalInputR13CStateManager ProcessInput__14CCameraManagerFRC11CFinalInputR13CStateManager: @@ -2683,7 +2686,7 @@ lbl_8000B49C: /* 8000B4C8 00008428 7F A5 EB 78 */ mr r5, r29 /* 8000B4CC 0000842C 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 8000B4D0 00008430 7D 89 03 A6 */ mtctr r12 -/* 8000B4D4 00008434 4E 80 04 21 */ bctrl +/* 8000B4D4 00008434 4E 80 04 21 */ bctrl lbl_8000B4D8: /* 8000B4D8 00008438 2C 1E FF FF */ cmpwi r30, -1 /* 8000B4DC 0000843C 41 82 00 14 */ beq lbl_8000B4F0 @@ -2703,7 +2706,7 @@ lbl_8000B4F4: /* 8000B50C 0000846C 83 81 00 10 */ lwz r28, 0x10(r1) /* 8000B510 00008470 7C 08 03 A6 */ mtlr r0 /* 8000B514 00008474 38 21 00 20 */ addi r1, r1, 0x20 -/* 8000B518 00008478 4E 80 00 20 */ blr +/* 8000B518 00008478 4E 80 00 20 */ blr .global SetInsideFluid__14CCameraManagerFb9TUniqueId SetInsideFluid__14CCameraManagerFb9TUniqueId: @@ -2714,12 +2717,12 @@ SetInsideFluid__14CCameraManagerFb9TUniqueId: /* 8000B52C 0000848C 90 03 00 74 */ stw r0, 0x74(r3) /* 8000B530 00008490 A0 05 00 00 */ lhz r0, 0(r5) /* 8000B534 00008494 B0 03 00 78 */ sth r0, 0x78(r3) -/* 8000B538 00008498 4E 80 00 20 */ blr +/* 8000B538 00008498 4E 80 00 20 */ blr lbl_8000B53C: /* 8000B53C 0000849C 80 83 00 74 */ lwz r4, 0x74(r3) /* 8000B540 000084A0 38 04 FF FF */ addi r0, r4, -1 /* 8000B544 000084A4 90 03 00 74 */ stw r0, 0x74(r3) -/* 8000B548 000084A8 4E 80 00 20 */ blr +/* 8000B548 000084A8 4E 80 00 20 */ blr .global Update__14CCameraManagerFfR13CStateManager Update__14CCameraManagerFfR13CStateManager: @@ -2754,7 +2757,7 @@ Update__14CCameraManagerFfR13CStateManager: /* 8000B5BC 0000851C 83 C1 00 10 */ lwz r30, 0x10(r1) /* 8000B5C0 00008520 7C 08 03 A6 */ mtlr r0 /* 8000B5C4 00008524 38 21 00 20 */ addi r1, r1, 0x20 -/* 8000B5C8 00008528 4E 80 00 20 */ blr +/* 8000B5C8 00008528 4E 80 00 20 */ blr .global sub_8000b5cc sub_8000b5cc: @@ -2765,10 +2768,10 @@ sub_8000b5cc: /* 8000B5DC 0000853C 40 80 00 10 */ bge lbl_8000B5EC /* 8000B5E0 00008540 FC 00 10 50 */ fneg f0, f2 /* 8000B5E4 00008544 D0 03 00 98 */ stfs f0, 0x98(r3) -/* 8000B5E8 00008548 4E 80 00 20 */ blr +/* 8000B5E8 00008548 4E 80 00 20 */ blr lbl_8000B5EC: /* 8000B5EC 0000854C D0 43 00 98 */ stfs f2, 0x98(r3) -/* 8000B5F0 00008550 4E 80 00 20 */ blr +/* 8000B5F0 00008550 4E 80 00 20 */ blr .global CalculateFogDensity__14CCameraManagerFR13CStateManagerPC12CScriptWater CalculateFogDensity__14CCameraManagerFR13CStateManagerPC12CScriptWater: @@ -2808,7 +2811,7 @@ lbl_8000B65C: /* 8000B670 000085D0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8000B674 000085D4 7C 08 03 A6 */ mtlr r0 /* 8000B678 000085D8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8000B67C 000085DC 4E 80 00 20 */ blr +/* 8000B67C 000085DC 4E 80 00 20 */ blr .global UpdateFog__14CCameraManagerFfR13CStateManager UpdateFog__14CCameraManagerFfR13CStateManager: @@ -2944,7 +2947,7 @@ lbl_8000B83C: /* 8000B868 000087C8 83 81 00 20 */ lwz r28, 0x20(r1) /* 8000B86C 000087CC 7C 08 03 A6 */ mtlr r0 /* 8000B870 000087D0 38 21 00 50 */ addi r1, r1, 0x50 -/* 8000B874 000087D4 4E 80 00 20 */ blr +/* 8000B874 000087D4 4E 80 00 20 */ blr .global UpdateRumble__14CCameraManagerFfR13CStateManager UpdateRumble__14CCameraManagerFfR13CStateManager: @@ -3062,7 +3065,7 @@ lbl_8000BA0C: /* 8000BA18 00008978 80 01 00 44 */ lwz r0, 0x44(r1) /* 8000BA1C 0000897C 7C 08 03 A6 */ mtlr r0 /* 8000BA20 00008980 38 21 00 40 */ addi r1, r1, 0x40 -/* 8000BA24 00008984 4E 80 00 20 */ blr +/* 8000BA24 00008984 4E 80 00 20 */ blr .global UpdateSfxListener__14CCameraManagerFR13CStateManager UpdateSfxListener__14CCameraManagerFR13CStateManager: @@ -3104,13 +3107,13 @@ UpdateSfxListener__14CCameraManagerFR13CStateManager: /* 8000BAB4 00008A14 80 01 00 94 */ lwz r0, 0x94(r1) /* 8000BAB8 00008A18 7C 08 03 A6 */ mtlr r0 /* 8000BABC 00008A1C 38 21 00 90 */ addi r1, r1, 0x90 -/* 8000BAC0 00008A20 4E 80 00 20 */ blr +/* 8000BAC0 00008A20 4E 80 00 20 */ blr .global SetCurrentCameraId__14CCameraManagerF9TUniqueIdR13CStateManager SetCurrentCameraId__14CCameraManagerF9TUniqueIdR13CStateManager: /* 8000BAC4 00008A24 A0 04 00 00 */ lhz r0, 0(r4) /* 8000BAC8 00008A28 B0 03 00 00 */ sth r0, 0(r3) -/* 8000BACC 00008A2C 4E 80 00 20 */ blr +/* 8000BACC 00008A2C 4E 80 00 20 */ blr .global GetLastCineCamera__14CCameraManagerCFR13CStateManager GetLastCineCamera__14CCameraManagerCFR13CStateManager: @@ -3131,7 +3134,7 @@ GetLastCineCamera__14CCameraManagerCFR13CStateManager: /* 8000BB08 00008A68 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8000BB0C 00008A6C 7C 08 03 A6 */ mtlr r0 /* 8000BB10 00008A70 38 21 00 20 */ addi r1, r1, 0x20 -/* 8000BB14 00008A74 4E 80 00 20 */ blr +/* 8000BB14 00008A74 4E 80 00 20 */ blr .global GetCurrentCamera__14CCameraManagerCFR13CStateManager GetCurrentCamera__14CCameraManagerCFR13CStateManager: @@ -3152,7 +3155,7 @@ GetCurrentCamera__14CCameraManagerCFR13CStateManager: /* 8000BB50 00008AB0 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8000BB54 00008AB4 7C 08 03 A6 */ mtlr r0 /* 8000BB58 00008AB8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8000BB5C 00008ABC 4E 80 00 20 */ blr +/* 8000BB5C 00008ABC 4E 80 00 20 */ blr .global GetCurrentCamera__14CCameraManagerFR13CStateManager GetCurrentCamera__14CCameraManagerFR13CStateManager: @@ -3173,7 +3176,7 @@ GetCurrentCamera__14CCameraManagerFR13CStateManager: /* 8000BB98 00008AF8 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8000BB9C 00008AFC 7C 08 03 A6 */ mtlr r0 /* 8000BBA0 00008B00 38 21 00 20 */ addi r1, r1, 0x20 -/* 8000BBA4 00008B04 4E 80 00 20 */ blr +/* 8000BBA4 00008B04 4E 80 00 20 */ blr .global GetLastCineCameraId__14CCameraManagerCFv GetLastCineCameraId__14CCameraManagerCFv: @@ -3182,14 +3185,14 @@ GetLastCineCameraId__14CCameraManagerCFv: /* 8000BBB0 00008B10 40 82 00 10 */ bne lbl_8000BBC0 /* 8000BBB4 00008B14 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8000BBB8 00008B18 B0 03 00 00 */ sth r0, 0(r3) -/* 8000BBBC 00008B1C 4E 80 00 20 */ blr +/* 8000BBBC 00008B1C 4E 80 00 20 */ blr lbl_8000BBC0: /* 8000BBC0 00008B20 38 05 FF FF */ addi r0, r5, -1 /* 8000BBC4 00008B24 80 84 00 10 */ lwz r4, 0x10(r4) /* 8000BBC8 00008B28 54 00 08 3C */ slwi r0, r0, 1 /* 8000BBCC 00008B2C 7C 04 02 2E */ lhzx r0, r4, r0 /* 8000BBD0 00008B30 B0 03 00 00 */ sth r0, 0(r3) -/* 8000BBD4 00008B34 4E 80 00 20 */ blr +/* 8000BBD4 00008B34 4E 80 00 20 */ blr .global GetCurrentCameraId__14CCameraManagerCFv GetCurrentCameraId__14CCameraManagerCFv: @@ -3198,14 +3201,14 @@ GetCurrentCameraId__14CCameraManagerCFv: /* 8000BBE0 00008B40 40 82 00 10 */ bne lbl_8000BBF0 /* 8000BBE4 00008B44 A0 04 00 00 */ lhz r0, 0(r4) /* 8000BBE8 00008B48 B0 03 00 00 */ sth r0, 0(r3) -/* 8000BBEC 00008B4C 4E 80 00 20 */ blr +/* 8000BBEC 00008B4C 4E 80 00 20 */ blr lbl_8000BBF0: /* 8000BBF0 00008B50 38 05 FF FF */ addi r0, r5, -1 /* 8000BBF4 00008B54 80 84 00 10 */ lwz r4, 0x10(r4) /* 8000BBF8 00008B58 54 00 08 3C */ slwi r0, r0, 1 /* 8000BBFC 00008B5C 7C 04 02 2E */ lhzx r0, r4, r0 /* 8000BC00 00008B60 B0 03 00 00 */ sth r0, 0(r3) -/* 8000BC04 00008B64 4E 80 00 20 */ blr +/* 8000BC04 00008B64 4E 80 00 20 */ blr .global RenderCameras__14CCameraManagerFRC13CStateManager RenderCameras__14CCameraManagerFRC13CStateManager: @@ -3227,7 +3230,7 @@ lbl_8000BC30: /* 8000BC40 00008BA0 7F A4 EB 78 */ mr r4, r29 /* 8000BC44 00008BA4 81 8C 00 28 */ lwz r12, 0x28(r12) /* 8000BC48 00008BA8 7D 89 03 A6 */ mtctr r12 -/* 8000BC4C 00008BAC 4E 80 04 21 */ bctrl +/* 8000BC4C 00008BAC 4E 80 04 21 */ bctrl /* 8000BC50 00008BB0 2C 1E FF FF */ cmpwi r30, -1 /* 8000BC54 00008BB4 41 82 00 14 */ beq lbl_8000BC68 /* 8000BC58 00008BB8 57 C3 18 38 */ slwi r3, r30, 3 @@ -3245,7 +3248,7 @@ lbl_8000BC6C: /* 8000BC80 00008BE0 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8000BC84 00008BE4 7C 08 03 A6 */ mtlr r0 /* 8000BC88 00008BE8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8000BC8C 00008BEC 4E 80 00 20 */ blr +/* 8000BC8C 00008BEC 4E 80 00 20 */ blr .global ResetCameras__14CCameraManagerFR13CStateManager ResetCameras__14CCameraManagerFR13CStateManager: @@ -3285,7 +3288,7 @@ lbl_8000BCF4: /* 8000BD10 00008C70 38 81 00 44 */ addi r4, r1, 0x44 /* 8000BD14 00008C74 81 8C 00 70 */ lwz r12, 0x70(r12) /* 8000BD18 00008C78 7D 89 03 A6 */ mtctr r12 -/* 8000BD1C 00008C7C 4E 80 04 21 */ bctrl +/* 8000BD1C 00008C7C 4E 80 04 21 */ bctrl lbl_8000BD20: /* 8000BD20 00008C80 2C 1E FF FF */ cmpwi r30, -1 /* 8000BD24 00008C84 41 82 00 14 */ beq lbl_8000BD38 @@ -3304,7 +3307,7 @@ lbl_8000BD3C: /* 8000BD50 00008CB0 83 A1 00 84 */ lwz r29, 0x84(r1) /* 8000BD54 00008CB4 7C 08 03 A6 */ mtlr r0 /* 8000BD58 00008CB8 38 21 00 90 */ addi r1, r1, 0x90 -/* 8000BD5C 00008CBC 4E 80 00 20 */ blr +/* 8000BD5C 00008CBC 4E 80 00 20 */ blr .global ThinkCameras__14CCameraManagerFfR13CStateManager ThinkCameras__14CCameraManagerFfR13CStateManager: @@ -3331,7 +3334,7 @@ lbl_8000BD90: /* 8000BDAC 00008D0C 7F 84 E3 78 */ mr r4, r28 /* 8000BDB0 00008D10 81 8C 00 14 */ lwz r12, 0x14(r12) /* 8000BDB4 00008D14 7D 89 03 A6 */ mtctr r12 -/* 8000BDB8 00008D18 4E 80 04 21 */ bctrl +/* 8000BDB8 00008D18 4E 80 04 21 */ bctrl /* 8000BDBC 00008D1C FC 20 F8 90 */ fmr f1, f31 /* 8000BDC0 00008D20 7F A3 EB 78 */ mr r3, r29 /* 8000BDC4 00008D24 48 04 F0 79 */ bl UpdatePerspective__11CGameCameraFf @@ -3374,7 +3377,7 @@ lbl_8000BE3C: /* 8000BE48 00008DA8 80 01 00 44 */ lwz r0, 0x44(r1) /* 8000BE4C 00008DAC 7C 08 03 A6 */ mtlr r0 /* 8000BE50 00008DB0 38 21 00 40 */ addi r1, r1, 0x40 -/* 8000BE54 00008DB4 4E 80 00 20 */ blr +/* 8000BE54 00008DB4 4E 80 00 20 */ blr .global CreateStandardCameras__14CCameraManagerFR13CStateManager CreateStandardCameras__14CCameraManagerFR13CStateManager: @@ -3532,32 +3535,32 @@ lbl_8000C06C: /* 8000C0A8 00009008 83 A1 00 84 */ lwz r29, 0x84(r1) /* 8000C0AC 0000900C 7C 08 03 A6 */ mtlr r0 /* 8000C0B0 00009010 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 8000C0B4 00009014 4E 80 00 20 */ blr +/* 8000C0B4 00009014 4E 80 00 20 */ blr .global DefaultAspect__14CCameraManagerFv DefaultAspect__14CCameraManagerFv: /* 8000C0B8 00009018 C0 2D 80 20 */ lfs f1, lbl_805A6BE0@sda21(r13) -/* 8000C0BC 0000901C 4E 80 00 20 */ blr +/* 8000C0BC 0000901C 4E 80 00 20 */ blr .global DefaultFarPlane__14CCameraManagerFv DefaultFarPlane__14CCameraManagerFv: /* 8000C0C0 00009020 C0 2D 80 1C */ lfs f1, lbl_805A6BDC@sda21(r13) -/* 8000C0C4 00009024 4E 80 00 20 */ blr +/* 8000C0C4 00009024 4E 80 00 20 */ blr .global DefaultNearPlane__14CCameraManagerFv DefaultNearPlane__14CCameraManagerFv: /* 8000C0C8 00009028 C0 2D 80 18 */ lfs f1, lbl_805A6BD8@sda21(r13) -/* 8000C0CC 0000902C 4E 80 00 20 */ blr +/* 8000C0CC 0000902C 4E 80 00 20 */ blr .global DefaultFirstPersonFov__14CCameraManagerFv DefaultFirstPersonFov__14CCameraManagerFv: /* 8000C0D0 00009030 C0 2D 80 10 */ lfs f1, lbl_805A6BD0@sda21(r13) -/* 8000C0D4 00009034 4E 80 00 20 */ blr +/* 8000C0D4 00009034 4E 80 00 20 */ blr .global DefaultThirdPersonFov__14CCameraManagerFv DefaultThirdPersonFov__14CCameraManagerFv: /* 8000C0D8 00009038 C0 2D 80 14 */ lfs f1, lbl_805A6BD4@sda21(r13) -/* 8000C0DC 0000903C 4E 80 00 20 */ blr +/* 8000C0DC 0000903C 4E 80 00 20 */ blr .global __ct__14CCameraManagerF9TUniqueId __ct__14CCameraManagerF9TUniqueId: @@ -3677,22 +3680,22 @@ __ct__14CCameraManagerF9TUniqueId: /* 8000C2A4 00009204 80 01 00 44 */ lwz r0, 0x44(r1) /* 8000C2A8 00009208 7C 08 03 A6 */ mtlr r0 /* 8000C2AC 0000920C 38 21 00 40 */ addi r1, r1, 0x40 -/* 8000C2B0 00009210 4E 80 00 20 */ blr +/* 8000C2B0 00009210 4E 80 00 20 */ blr .global "Clamp__5CMathFRCfRCfRCf" "Clamp__5CMathFRCfRCfRCf": /* 8000C2B4 00009214 C0 03 00 00 */ lfs f0, 0(r3) /* 8000C2B8 00009218 C0 24 00 00 */ lfs f1, 0(r4) /* 8000C2BC 0000921C FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 8000C2C0 00009220 4D 81 00 20 */ bgtlr +/* 8000C2C0 00009220 4D 81 00 20 */ bgtlr /* 8000C2C4 00009224 C0 05 00 00 */ lfs f0, 0(r5) /* 8000C2C8 00009228 FC 00 08 40 */ fcmpo cr0, f0, f1 /* 8000C2CC 0000922C 40 80 00 0C */ bge lbl_8000C2D8 /* 8000C2D0 00009230 7C A3 2B 78 */ mr r3, r5 -/* 8000C2D4 00009234 4E 80 00 20 */ blr +/* 8000C2D4 00009234 4E 80 00 20 */ blr lbl_8000C2D8: /* 8000C2D8 00009238 7C 83 23 78 */ mr r3, r4 -/* 8000C2DC 0000923C 4E 80 00 20 */ blr +/* 8000C2DC 0000923C 4E 80 00 20 */ blr .global sub_8000c2e0 sub_8000c2e0: @@ -3776,7 +3779,7 @@ lbl_8000C3F4: /* 8000C3F8 00009358 80 01 00 44 */ lwz r0, 0x44(r1) /* 8000C3FC 0000935C 7C 08 03 A6 */ mtlr r0 /* 8000C400 00009360 38 21 00 40 */ addi r1, r1, 0x40 -/* 8000C404 00009364 4E 80 00 20 */ blr +/* 8000C404 00009364 4E 80 00 20 */ blr .global "reserve__Q24rstl45vector<9TUniqueId,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl45vector<9TUniqueId,Q24rstl17rmemory_allocator>Fi": @@ -3847,7 +3850,7 @@ lbl_8000C4D8: /* 8000C4E4 00009444 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8000C4E8 00009448 7C 08 03 A6 */ mtlr r0 /* 8000C4EC 0000944C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8000C4F0 00009450 4E 80 00 20 */ blr +/* 8000C4F0 00009450 4E 80 00 20 */ blr .global sub_8000c4f4 sub_8000c4f4: @@ -3903,7 +3906,7 @@ lbl_8000C58C: /* 8000C5A4 00009504 80 01 00 14 */ lwz r0, 0x14(r1) /* 8000C5A8 00009508 7C 08 03 A6 */ mtlr r0 /* 8000C5AC 0000950C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8000C5B0 00009510 4E 80 00 20 */ blr +/* 8000C5B0 00009510 4E 80 00 20 */ blr .global sub_8000c5b4 sub_8000c5b4: @@ -3960,7 +3963,7 @@ lbl_8000C654: /* 8000C664 000095C4 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8000C668 000095C8 7C 08 03 A6 */ mtlr r0 /* 8000C66C 000095CC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8000C670 000095D0 4E 80 00 20 */ blr +/* 8000C670 000095D0 4E 80 00 20 */ blr .global sub_8000c674 sub_8000c674: @@ -4001,7 +4004,7 @@ lbl_8000C6D8: /* 8000C6EC 0000964C 42 00 FF A8 */ bdnz lbl_8000C694 lbl_8000C6F0: /* 8000C6F0 00009650 38 21 00 10 */ addi r1, r1, 0x10 -/* 8000C6F4 00009654 4E 80 00 20 */ blr +/* 8000C6F4 00009654 4E 80 00 20 */ blr .global sub_8000c6f8 sub_8000c6f8: @@ -4043,4 +4046,4 @@ lbl_8000C778: /* 8000C77C 000096DC B0 C4 00 04 */ sth r6, 4(r4) lbl_8000C780: /* 8000C780 000096E0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8000C784 000096E4 4E 80 00 20 */ blr +/* 8000C784 000096E4 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/Cameras/CCameraShakeData.s b/asm/MetroidPrime/Cameras/CCameraShakeData.s index 09ce2412..cb16b740 100644 --- a/asm/MetroidPrime/Cameras/CCameraShakeData.s +++ b/asm/MetroidPrime/Cameras/CCameraShakeData.s @@ -36,7 +36,7 @@ lbl_805A789C: .global lbl_8046C7D0 lbl_8046C7D0: .skip 0x78 - + .section .text, "ax" .global GetSomething2__16CCameraShakeDataFv @@ -85,7 +85,7 @@ lbl_8015C968: /* 8015C978 001598D8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8015C97C 001598DC 7C 08 03 A6 */ mtlr r0 /* 8015C980 001598E0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8015C984 001598E4 4E 80 00 20 */ blr +/* 8015C984 001598E4 4E 80 00 20 */ blr .global GetSomething__16CCameraShakeDataFv GetSomething__16CCameraShakeDataFv: @@ -133,7 +133,7 @@ lbl_8015CA10: /* 8015CA20 00159980 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8015CA24 00159984 7C 08 03 A6 */ mtlr r0 /* 8015CA28 00159988 38 21 00 20 */ addi r1, r1, 0x20 -/* 8015CA2C 0015998C 4E 80 00 20 */ blr +/* 8015CA2C 0015998C 4E 80 00 20 */ blr .global __ct__16CCameraShakeDataFR12CInputStream __ct__16CCameraShakeDataFR12CInputStream: @@ -171,7 +171,7 @@ __ct__16CCameraShakeDataFR12CInputStream: /* 8015CAAC 00159A0C 83 C1 00 08 */ lwz r30, 8(r1) /* 8015CAB0 00159A10 7C 08 03 A6 */ mtlr r0 /* 8015CAB4 00159A14 38 21 00 10 */ addi r1, r1, 0x10 -/* 8015CAB8 00159A18 4E 80 00 20 */ blr +/* 8015CAB8 00159A18 4E 80 00 20 */ blr .global LoadCameraShakeData__FR12CInputStream LoadCameraShakeData__FR12CInputStream: @@ -343,7 +343,7 @@ lbl_8015CD18: /* 8015CD40 00159CA0 83 C1 01 88 */ lwz r30, 0x188(r1) /* 8015CD44 00159CA4 7C 08 03 A6 */ mtlr r0 /* 8015CD48 00159CA8 38 21 01 D0 */ addi r1, r1, 0x1d0 -/* 8015CD4C 00159CAC 4E 80 00 20 */ blr +/* 8015CD4C 00159CAC 4E 80 00 20 */ blr .global GetPoint__16CCameraShakeDataCFv GetPoint__16CCameraShakeDataCFv: @@ -353,7 +353,7 @@ GetPoint__16CCameraShakeDataCFv: /* 8015CD5C 00159CBC D0 03 00 00 */ stfs f0, 0(r3) /* 8015CD60 00159CC0 D0 23 00 04 */ stfs f1, 4(r3) /* 8015CD64 00159CC4 D0 43 00 08 */ stfs f2, 8(r3) -/* 8015CD68 00159CC8 4E 80 00 20 */ blr +/* 8015CD68 00159CC8 4E 80 00 20 */ blr .global Update__16CCameraShakeDataFfR13CStateManager Update__16CCameraShakeDataFfR13CStateManager: @@ -421,7 +421,7 @@ lbl_8015CE14: /* 8015CE5C 00159DBC 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8015CE60 00159DC0 7C 08 03 A6 */ mtlr r0 /* 8015CE64 00159DC4 38 21 00 40 */ addi r1, r1, 0x40 -/* 8015CE68 00159DC8 4E 80 00 20 */ blr +/* 8015CE68 00159DC8 4E 80 00 20 */ blr .global SetSfxPositionAndDistance__16CCameraShakeDataFRC9CVector3ff SetSfxPositionAndDistance__16CCameraShakeDataFRC9CVector3ff: @@ -435,7 +435,7 @@ SetSfxPositionAndDistance__16CCameraShakeDataFRC9CVector3ff: /* 8015CE88 00159DE8 D0 03 00 C8 */ stfs f0, 0xc8(r3) /* 8015CE8C 00159DEC C0 04 00 08 */ lfs f0, 8(r4) /* 8015CE90 00159DF0 D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 8015CE94 00159DF4 4E 80 00 20 */ blr +/* 8015CE94 00159DF4 4E 80 00 20 */ blr .global __ct__16CCameraShakeDataFffiRC9CVector3fRC22CCameraShakerComponentRC22CCameraShakerComponentRC22CCameraShakerComponent __ct__16CCameraShakeDataFffiRC9CVector3fRC22CCameraShakerComponentRC22CCameraShakerComponentRC22CCameraShakerComponent: @@ -541,7 +541,7 @@ __ct__16CCameraShakeDataFffiRC9CVector3fRC22CCameraShakerComponentRC22CCameraSha /* 8015D024 00159F84 C0 05 00 08 */ lfs f0, 8(r5) /* 8015D028 00159F88 D0 03 00 CC */ stfs f0, 0xcc(r3) /* 8015D02C 00159F8C D0 43 00 D0 */ stfs f2, 0xd0(r3) -/* 8015D030 00159F90 4E 80 00 20 */ blr +/* 8015D030 00159F90 4E 80 00 20 */ blr .global sub_8015d034 sub_8015d034: @@ -610,7 +610,7 @@ lbl_8015D0FC: /* 8015D120 0015A080 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8015D124 0015A084 7C 08 03 A6 */ mtlr r0 /* 8015D128 0015A088 38 21 00 50 */ addi r1, r1, 0x50 -/* 8015D12C 0015A08C 4E 80 00 20 */ blr +/* 8015D12C 0015A08C 4E 80 00 20 */ blr .global __ct__22CCameraShakerComponentFv __ct__22CCameraShakerComponentFv: @@ -632,7 +632,7 @@ __ct__22CCameraShakerComponentFv: /* 8015D16C 0015A0CC 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 8015D170 0015A0D0 7C 08 03 A6 */ mtlr r0 /* 8015D174 0015A0D4 38 21 00 40 */ addi r1, r1, 0x40 -/* 8015D178 0015A0D8 4E 80 00 20 */ blr +/* 8015D178 0015A0D8 4E 80 00 20 */ blr .global LoadNewCameraShakerComponent__FR12CInputStream LoadNewCameraShakerComponent__FR12CInputStream: @@ -688,7 +688,7 @@ LoadNewCameraShakerComponent__FR12CInputStream: /* 8015D240 0015A1A0 83 A1 00 74 */ lwz r29, 0x74(r1) /* 8015D244 0015A1A4 7C 08 03 A6 */ mtlr r0 /* 8015D248 0015A1A8 38 21 00 80 */ addi r1, r1, 0x80 -/* 8015D24C 0015A1AC 4E 80 00 20 */ blr +/* 8015D24C 0015A1AC 4E 80 00 20 */ blr .global __ct__22CCameraShakerComponentFiRC17SCameraShakePointRC17SCameraShakePoint __ct__22CCameraShakerComponentFiRC17SCameraShakePointRC17SCameraShakePoint: @@ -722,7 +722,7 @@ __ct__22CCameraShakerComponentFiRC17SCameraShakePointRC17SCameraShakePoint: /* 8015D2BC 0015A21C C0 26 00 14 */ lfs f1, 0x14(r6) /* 8015D2C0 0015A220 D0 23 00 34 */ stfs f1, 0x34(r3) /* 8015D2C4 0015A224 D0 03 00 38 */ stfs f0, 0x38(r3) -/* 8015D2C8 0015A228 4E 80 00 20 */ blr +/* 8015D2C8 0015A228 4E 80 00 20 */ blr .global GetSomething__17SCameraShakePointFv GetSomething__17SCameraShakePointFv: @@ -730,10 +730,10 @@ GetSomething__17SCameraShakePointFv: /* 8015D2D0 0015A230 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 8015D2D4 0015A234 41 82 00 0C */ beq lbl_8015D2E0 /* 8015D2D8 0015A238 C0 23 00 08 */ lfs f1, 8(r3) -/* 8015D2DC 0015A23C 4E 80 00 20 */ blr +/* 8015D2DC 0015A23C 4E 80 00 20 */ blr lbl_8015D2E0: /* 8015D2E0 0015A240 C0 23 00 04 */ lfs f1, 4(r3) -/* 8015D2E4 0015A244 4E 80 00 20 */ blr +/* 8015D2E4 0015A244 4E 80 00 20 */ blr .global sub_8015d2e8 sub_8015d2e8: @@ -793,7 +793,7 @@ lbl_8015D394: /* 8015D3B4 0015A314 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8015D3B8 0015A318 7C 08 03 A6 */ mtlr r0 /* 8015D3BC 0015A31C 38 21 00 40 */ addi r1, r1, 0x40 -/* 8015D3C0 0015A320 4E 80 00 20 */ blr +/* 8015D3C0 0015A320 4E 80 00 20 */ blr .global __ct__17SCameraShakePointFv __ct__17SCameraShakePointFv: @@ -809,7 +809,7 @@ __ct__17SCameraShakePointFv: /* 8015D3E8 0015A348 80 01 00 14 */ lwz r0, 0x14(r1) /* 8015D3EC 0015A34C 7C 08 03 A6 */ mtlr r0 /* 8015D3F0 0015A350 38 21 00 10 */ addi r1, r1, 0x10 -/* 8015D3F4 0015A354 4E 80 00 20 */ blr +/* 8015D3F4 0015A354 4E 80 00 20 */ blr .global LoadCameraShakePoint__R12CInputStream LoadCameraShakePoint__R12CInputStream: @@ -855,7 +855,7 @@ LoadCameraShakePoint__R12CInputStream: /* 8015D494 0015A3F4 83 A1 00 0C */ lwz r29, 0xc(r1) /* 8015D498 0015A3F8 7C 08 03 A6 */ mtlr r0 /* 8015D49C 0015A3FC 38 21 00 30 */ addi r1, r1, 0x30 -/* 8015D4A0 0015A400 4E 80 00 20 */ blr +/* 8015D4A0 0015A400 4E 80 00 20 */ blr .global __ct__17SCameraShakePointFiffff __ct__17SCameraShakePointFiffff: @@ -866,7 +866,7 @@ __ct__17SCameraShakePointFiffff: /* 8015D4B4 0015A414 D0 23 00 0C */ stfs f1, 0xc(r3) /* 8015D4B8 0015A418 D0 43 00 10 */ stfs f2, 0x10(r3) /* 8015D4BC 0015A41C D0 63 00 14 */ stfs f3, 0x14(r3) -/* 8015D4C0 0015A420 4E 80 00 20 */ blr +/* 8015D4C0 0015A420 4E 80 00 20 */ blr .global BuildMissileShakeData__16CCameraShakeDataFfffRC9CVector3f BuildMissileShakeData__16CCameraShakeDataFfffRC9CVector3f: @@ -939,7 +939,7 @@ lbl_8015D5A8: /* 8015D5B4 0015A514 83 C1 01 C0 */ lwz r30, 0x1c0(r1) /* 8015D5B8 0015A518 7C 08 03 A6 */ mtlr r0 /* 8015D5BC 0015A51C 38 21 01 D0 */ addi r1, r1, 0x1d0 -/* 8015D5C0 0015A520 4E 80 00 20 */ blr +/* 8015D5C0 0015A520 4E 80 00 20 */ blr .global BuildPatternedExplodeShakeData__16CCameraShakeDataFRC9CVector3ffff BuildPatternedExplodeShakeData__16CCameraShakeDataFRC9CVector3ffff: @@ -1012,7 +1012,7 @@ lbl_8015D6A8: /* 8015D6B4 0015A614 83 C1 01 C0 */ lwz r30, 0x1c0(r1) /* 8015D6B8 0015A618 7C 08 03 A6 */ mtlr r0 /* 8015D6BC 0015A61C 38 21 01 D0 */ addi r1, r1, 0x1d0 -/* 8015D6C0 0015A620 4E 80 00 20 */ blr +/* 8015D6C0 0015A620 4E 80 00 20 */ blr .global BuildLandingCameraShake__16CCameraShakeDataFff BuildLandingCameraShake__16CCameraShakeDataFff: @@ -1109,7 +1109,7 @@ lbl_8015D80C: /* 8015D820 0015A780 83 E1 01 2C */ lwz r31, 0x12c(r1) /* 8015D824 0015A784 7C 08 03 A6 */ mtlr r0 /* 8015D828 0015A788 38 21 01 50 */ addi r1, r1, 0x150 -/* 8015D82C 0015A78C 4E 80 00 20 */ blr +/* 8015D82C 0015A78C 4E 80 00 20 */ blr .global __ct__16CCameraShakeDataFff __ct__16CCameraShakeDataFff: @@ -1181,7 +1181,7 @@ lbl_8015D91C: /* 8015D928 0015A888 83 E1 00 FC */ lwz r31, 0xfc(r1) /* 8015D92C 0015A88C 7C 08 03 A6 */ mtlr r0 /* 8015D930 0015A890 38 21 01 10 */ addi r1, r1, 0x110 -/* 8015D934 0015A894 4E 80 00 20 */ blr +/* 8015D934 0015A894 4E 80 00 20 */ blr .global BuildPatternedExplodeShakeData__16CCameraShakeDataFff BuildPatternedExplodeShakeData__16CCameraShakeDataFff: @@ -1253,7 +1253,7 @@ lbl_8015DA24: /* 8015DA30 0015A990 83 E1 00 FC */ lwz r31, 0xfc(r1) /* 8015DA34 0015A994 7C 08 03 A6 */ mtlr r0 /* 8015DA38 0015A998 38 21 01 10 */ addi r1, r1, 0x110 -/* 8015DA3C 0015A99C 4E 80 00 20 */ blr +/* 8015DA3C 0015A99C 4E 80 00 20 */ blr .global BuildPhazonCameraShakeData__16CCameraShakeDataFff BuildPhazonCameraShakeData__16CCameraShakeDataFff: @@ -1352,7 +1352,7 @@ lbl_8015DB88: /* 8015DBA4 0015AB04 83 E1 01 2C */ lwz r31, 0x12c(r1) /* 8015DBA8 0015AB08 7C 08 03 A6 */ mtlr r0 /* 8015DBAC 0015AB0C 38 21 01 60 */ addi r1, r1, 0x160 -/* 8015DBB0 0015AB10 4E 80 00 20 */ blr +/* 8015DBB0 0015AB10 4E 80 00 20 */ blr .global BuildProjectileCameraShake__16CCameraShakeDataFff BuildProjectileCameraShake__16CCameraShakeDataFff: @@ -1422,7 +1422,7 @@ lbl_8015DC98: /* 8015DCA4 0015AC04 83 E1 00 FC */ lwz r31, 0xfc(r1) /* 8015DCA8 0015AC08 7C 08 03 A6 */ mtlr r0 /* 8015DCAC 0015AC0C 38 21 01 10 */ addi r1, r1, 0x110 -/* 8015DCB0 0015AC10 4E 80 00 20 */ blr +/* 8015DCB0 0015AC10 4E 80 00 20 */ blr .global __sinit_CCameraShakeData_cpp __sinit_CCameraShakeData_cpp: diff --git a/asm/MetroidPrime/Cameras/CCinematicCamera.s b/asm/MetroidPrime/Cameras/CCinematicCamera.s index b8ef7166..da88fc2b 100644 --- a/asm/MetroidPrime/Cameras/CCinematicCamera.s +++ b/asm/MetroidPrime/Cameras/CCinematicCamera.s @@ -118,7 +118,7 @@ lbl_80092BD8: /* 80092BEC 0008FB4C CB C1 00 20 */ lfd f30, 0x20(r1) /* 80092BF0 0008FB50 7C 08 03 A6 */ mtlr r0 /* 80092BF4 0008FB54 38 21 00 40 */ addi r1, r1, 0x40 -/* 80092BF8 0008FB58 4E 80 00 20 */ blr +/* 80092BF8 0008FB58 4E 80 00 20 */ blr .global "GetInterpolatedHFov__16CCinematicCameraCFRCQ24rstl36vectorf" "GetInterpolatedHFov__16CCinematicCameraCFRCQ24rstl36vectorf": @@ -181,7 +181,7 @@ lbl_80092CC4: /* 80092CD0 0008FC30 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80092CD4 0008FC34 7C 08 03 A6 */ mtlr r0 /* 80092CD8 0008FC38 38 21 00 30 */ addi r1, r1, 0x30 -/* 80092CDC 0008FC3C 4E 80 00 20 */ blr +/* 80092CDC 0008FC3C 4E 80 00 20 */ blr .global "GetInterpolatedOrientation__16CCinematicCameraCFRCQ24rstl48vector<11CQuaternion,Q24rstl17rmemory_allocator>f" "GetInterpolatedOrientation__16CCinematicCameraCFRCQ24rstl48vector<11CQuaternion,Q24rstl17rmemory_allocator>f": @@ -261,7 +261,7 @@ lbl_80092DE8: /* 80092DF8 0008FD58 83 81 00 20 */ lwz r28, 0x20(r1) /* 80092DFC 0008FD5C 7C 08 03 A6 */ mtlr r0 /* 80092E00 0008FD60 38 21 00 30 */ addi r1, r1, 0x30 -/* 80092E04 0008FD64 4E 80 00 20 */ blr +/* 80092E04 0008FD64 4E 80 00 20 */ blr .global "GetInterpolatedSplinePoint__16CCinematicCameraCFRCQ24rstl45vector<9CVector3f,Q24rstl17rmemory_allocator>Rif" "GetInterpolatedSplinePoint__16CCinematicCameraCFRCQ24rstl45vector<9CVector3f,Q24rstl17rmemory_allocator>Rif": @@ -482,7 +482,7 @@ lbl_80093134: /* 80093138 00090098 80 01 00 74 */ lwz r0, 0x74(r1) /* 8009313C 0009009C 7C 08 03 A6 */ mtlr r0 /* 80093140 000900A0 38 21 00 70 */ addi r1, r1, 0x70 -/* 80093144 000900A4 4E 80 00 20 */ blr +/* 80093144 000900A4 4E 80 00 20 */ blr .global "PickRandomActiveConnection__16CCinematicCameraFRCQ24rstl48vector<11SConnection,Q24rstl17rmemory_allocator>R11SConnectionR13CStateManager" "PickRandomActiveConnection__16CCinematicCameraFRCQ24rstl48vector<11SConnection,Q24rstl17rmemory_allocator>R11SConnectionR13CStateManager": @@ -600,7 +600,7 @@ lbl_800932D8: /* 800932DC 0009023C 80 01 00 54 */ lwz r0, 0x54(r1) /* 800932E0 00090240 7C 08 03 A6 */ mtlr r0 /* 800932E4 00090244 38 21 00 50 */ addi r1, r1, 0x50 -/* 800932E8 00090248 4E 80 00 20 */ blr +/* 800932E8 00090248 4E 80 00 20 */ blr .global GenerateMoveOutofIntoEyePosition__16CCinematicCameraFbR13CStateManager GenerateMoveOutofIntoEyePosition__16CCinematicCameraFbR13CStateManager: @@ -738,7 +738,7 @@ lbl_800934DC: /* 800934E8 00090448 81 84 00 00 */ lwz r12, 0(r4) /* 800934EC 0009044C 81 8C 00 18 */ lwz r12, 0x18(r12) /* 800934F0 00090450 7D 89 03 A6 */ mtctr r12 -/* 800934F4 00090454 4E 80 04 21 */ bctrl +/* 800934F4 00090454 4E 80 04 21 */ bctrl /* 800934F8 00090458 C0 01 00 C8 */ lfs f0, 0xc8(r1) /* 800934FC 0009045C 38 61 00 1C */ addi r3, r1, 0x1c /* 80093500 00090460 80 01 00 CC */ lwz r0, 0xcc(r1) @@ -927,7 +927,7 @@ lbl_80093748: /* 800937B0 00090710 80 01 02 E4 */ lwz r0, 0x2e4(r1) /* 800937B4 00090714 7C 08 03 A6 */ mtlr r0 /* 800937B8 00090718 38 21 02 E0 */ addi r1, r1, 0x2e0 -/* 800937BC 0009071C 4E 80 00 20 */ blr +/* 800937BC 0009071C 4E 80 00 20 */ blr .global GenerateMoveOutofIntoPoints__16CCinematicCameraFbR13CStateManager GenerateMoveOutofIntoPoints__16CCinematicCameraFbR13CStateManager: @@ -1182,7 +1182,7 @@ lbl_80093ADC: /* 80093B5C 00090ABC 80 01 01 04 */ lwz r0, 0x104(r1) /* 80093B60 00090AC0 7C 08 03 A6 */ mtlr r0 /* 80093B64 00090AC4 38 21 01 00 */ addi r1, r1, 0x100 -/* 80093B68 00090AC8 4E 80 00 20 */ blr +/* 80093B68 00090AC8 4E 80 00 20 */ blr .global CalculateWaypoints__16CCinematicCameraFR13CStateManager CalculateWaypoints__16CCinematicCameraFR13CStateManager: @@ -1713,7 +1713,7 @@ lbl_800942BC: /* 800942D8 00091238 80 01 01 64 */ lwz r0, 0x164(r1) /* 800942DC 0009123C 7C 08 03 A6 */ mtlr r0 /* 800942E0 00091240 38 21 01 60 */ addi r1, r1, 0x160 -/* 800942E4 00091244 4E 80 00 20 */ blr +/* 800942E4 00091244 4E 80 00 20 */ blr .global WasDeactivated__16CCinematicCameraFR13CStateManager WasDeactivated__16CCinematicCameraFR13CStateManager: @@ -1904,7 +1904,7 @@ lbl_80094574: /* 8009457C 000914DC 83 C1 00 D8 */ lwz r30, 0xd8(r1) /* 80094580 000914E0 7C 08 03 A6 */ mtlr r0 /* 80094584 000914E4 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 80094588 000914E8 4E 80 00 20 */ blr +/* 80094588 000914E8 4E 80 00 20 */ blr .global "__as__Q24rstl36vectorFRCQ24rstl36vector" "__as__Q24rstl36vectorFRCQ24rstl36vector": @@ -1978,7 +1978,7 @@ lbl_80094668: /* 80094670 000915D0 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80094674 000915D4 7C 08 03 A6 */ mtlr r0 /* 80094678 000915D8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8009467C 000915DC 4E 80 00 20 */ blr +/* 8009467C 000915DC 4E 80 00 20 */ blr .global "__as__Q24rstl48vector<11CQuaternion,Q24rstl17rmemory_allocator>FRCQ24rstl48vector<11CQuaternion,Q24rstl17rmemory_allocator>" "__as__Q24rstl48vector<11CQuaternion,Q24rstl17rmemory_allocator>FRCQ24rstl48vector<11CQuaternion,Q24rstl17rmemory_allocator>": @@ -2058,7 +2058,7 @@ lbl_80094774: /* 8009477C 000916DC 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80094780 000916E0 7C 08 03 A6 */ mtlr r0 /* 80094784 000916E4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80094788 000916E8 4E 80 00 20 */ blr +/* 80094788 000916E8 4E 80 00 20 */ blr .global "__as__Q24rstl45vector<9CVector3f,Q24rstl17rmemory_allocator>FRCQ24rstl45vector<9CVector3f,Q24rstl17rmemory_allocator>" "__as__Q24rstl45vector<9CVector3f,Q24rstl17rmemory_allocator>FRCQ24rstl45vector<9CVector3f,Q24rstl17rmemory_allocator>": @@ -2136,7 +2136,7 @@ lbl_80094878: /* 80094880 000917E0 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80094884 000917E4 7C 08 03 A6 */ mtlr r0 /* 80094888 000917E8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8009488C 000917EC 4E 80 00 20 */ blr +/* 8009488C 000917EC 4E 80 00 20 */ blr .global DeactivateSelf__16CCinematicCameraFR13CStateManager DeactivateSelf__16CCinematicCameraFR13CStateManager: @@ -2151,7 +2151,7 @@ DeactivateSelf__16CCinematicCameraFR13CStateManager: /* 800948B0 00091810 81 83 00 00 */ lwz r12, 0(r3) /* 800948B4 00091814 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 800948B8 00091818 7D 89 03 A6 */ mtctr r12 -/* 800948BC 0009181C 4E 80 04 21 */ bctrl +/* 800948BC 0009181C 4E 80 04 21 */ bctrl /* 800948C0 00091820 7F C3 F3 78 */ mr r3, r30 /* 800948C4 00091824 7F E5 FB 78 */ mr r5, r31 /* 800948C8 00091828 38 80 00 05 */ li r4, 5 @@ -2165,7 +2165,7 @@ DeactivateSelf__16CCinematicCameraFR13CStateManager: /* 800948E8 00091848 83 C1 00 08 */ lwz r30, 8(r1) /* 800948EC 0009184C 7C 08 03 A6 */ mtlr r0 /* 800948F0 00091850 38 21 00 10 */ addi r1, r1, 0x10 -/* 800948F4 00091854 4E 80 00 20 */ blr +/* 800948F4 00091854 4E 80 00 20 */ blr .global SendArrivedMsg__16CCinematicCameraCF9TUniqueIdR13CStateManager SendArrivedMsg__16CCinematicCameraCF9TUniqueIdR13CStateManager: @@ -2185,7 +2185,7 @@ SendArrivedMsg__16CCinematicCameraCF9TUniqueIdR13CStateManager: /* 8009492C 0009188C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80094930 00091890 7C 08 03 A6 */ mtlr r0 /* 80094934 00091894 38 21 00 20 */ addi r1, r1, 0x20 -/* 80094938 00091898 4E 80 00 20 */ blr +/* 80094938 00091898 4E 80 00 20 */ blr .global AcceptScriptMsg__16CCinematicCameraF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__16CCinematicCameraF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -2282,7 +2282,7 @@ lbl_80094A74: /* 80094A84 000919E4 81 9E 00 00 */ lwz r12, 0(r30) /* 80094A88 000919E8 81 8C 00 14 */ lwz r12, 0x14(r12) /* 80094A8C 000919EC 7D 89 03 A6 */ mtctr r12 -/* 80094A90 000919F0 4E 80 04 21 */ bctrl +/* 80094A90 000919F0 4E 80 04 21 */ bctrl /* 80094A94 000919F4 A0 1E 00 08 */ lhz r0, 8(r30) /* 80094A98 000919F8 7F E5 FB 78 */ mr r5, r31 /* 80094A9C 000919FC 38 81 00 14 */ addi r4, r1, 0x14 @@ -2339,7 +2339,7 @@ lbl_80094B4C: /* 80094B58 00091AB8 83 A1 00 44 */ lwz r29, 0x44(r1) /* 80094B5C 00091ABC 7C 08 03 A6 */ mtlr r0 /* 80094B60 00091AC0 38 21 00 50 */ addi r1, r1, 0x50 -/* 80094B64 00091AC4 4E 80 00 20 */ blr +/* 80094B64 00091AC4 4E 80 00 20 */ blr .global Accept__16CCinematicCameraFR8IVisitor Accept__16CCinematicCameraFR8IVisitor: @@ -2352,15 +2352,15 @@ Accept__16CCinematicCameraFR8IVisitor: /* 80094B80 00091AE0 7C 04 03 78 */ mr r4, r0 /* 80094B84 00091AE4 81 8C 00 14 */ lwz r12, 0x14(r12) /* 80094B88 00091AE8 7D 89 03 A6 */ mtctr r12 -/* 80094B8C 00091AEC 4E 80 04 21 */ bctrl +/* 80094B8C 00091AEC 4E 80 04 21 */ bctrl /* 80094B90 00091AF0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80094B94 00091AF4 7C 08 03 A6 */ mtlr r0 /* 80094B98 00091AF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80094B9C 00091AFC 4E 80 00 20 */ blr +/* 80094B9C 00091AFC 4E 80 00 20 */ blr .global ProcessInput__16CCinematicCameraFRC11CFinalInputR13CStateManager ProcessInput__16CCinematicCameraFRC11CFinalInputR13CStateManager: -/* 80094BA0 00091B00 4E 80 00 20 */ blr +/* 80094BA0 00091B00 4E 80 00 20 */ blr .global Think__16CCinematicCameraFfR13CStateManager Think__16CCinematicCameraFfR13CStateManager: @@ -2778,11 +2778,11 @@ lbl_800951AC: /* 800951CC 0009212C 83 81 01 A0 */ lwz r28, 0x1a0(r1) /* 800951D0 00092130 7C 08 03 A6 */ mtlr r0 /* 800951D4 00092134 38 21 01 D0 */ addi r1, r1, 0x1d0 -/* 800951D8 00092138 4E 80 00 20 */ blr +/* 800951D8 00092138 4E 80 00 20 */ blr .global Reset__16CCinematicCameraFRC12CTransform4fR13CStateManager Reset__16CCinematicCameraFRC12CTransform4fR13CStateManager: -/* 800951DC 0009213C 4E 80 00 20 */ blr +/* 800951DC 0009213C 4E 80 00 20 */ blr .global __dt__16CCinematicCameraFv __dt__16CCinematicCameraFv: @@ -2937,7 +2937,7 @@ lbl_800953D8: /* 800953E4 00092344 83 C1 00 68 */ lwz r30, 0x68(r1) /* 800953E8 00092348 7C 08 03 A6 */ mtlr r0 /* 800953EC 0009234C 38 21 00 70 */ addi r1, r1, 0x70 -/* 800953F0 00092350 4E 80 00 20 */ blr +/* 800953F0 00092350 4E 80 00 20 */ blr .global "__ct__16CCinematicCameraF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fbfffffUi" "__ct__16CCinematicCameraF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fbfffffUi": @@ -3041,7 +3041,7 @@ lbl_800953D8: /* 80095578 000924D8 83 A1 00 34 */ lwz r29, 0x34(r1) /* 8009557C 000924DC 7C 08 03 A6 */ mtlr r0 /* 80095580 000924E0 38 21 00 60 */ addi r1, r1, 0x60 -/* 80095584 000924E4 4E 80 00 20 */ blr +/* 80095584 000924E4 4E 80 00 20 */ blr .global "reserve__Q24rstl48vector<11CQuaternion,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl48vector<11CQuaternion,Q24rstl17rmemory_allocator>Fi": @@ -3119,4 +3119,4 @@ lbl_80095674: /* 80095680 000925E0 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80095684 000925E4 7C 08 03 A6 */ mtlr r0 /* 80095688 000925E8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8009568C 000925EC 4E 80 00 20 */ blr +/* 8009568C 000925EC 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/Cameras/CFirstPersonCamera.s b/asm/MetroidPrime/Cameras/CFirstPersonCamera.s index d4f31e11..ee598e6d 100644 --- a/asm/MetroidPrime/Cameras/CFirstPersonCamera.s +++ b/asm/MetroidPrime/Cameras/CFirstPersonCamera.s @@ -34,7 +34,7 @@ lbl_803D9660: .4byte ProcessInput__18CFirstPersonCameraFRC11CFinalInputR13CStateManager .4byte Reset__18CFirstPersonCameraFRC12CTransform4fR13CStateManager .4byte 0 - + .section .rodata .global lbl_803CC420 lbl_803CC420: @@ -195,13 +195,13 @@ lbl_805A9DF8: lbl_805A9DFC: # ROM: 0x3F669C .4byte 0x3F7FF972 - + .section .text, "ax" .global GetGunFollowTransform__18CFirstPersonCameraCFv GetGunFollowTransform__18CFirstPersonCameraCFv: /* 8000E0E4 0000B044 38 63 01 90 */ addi r3, r3, 0x190 -/* 8000E0E8 0000B048 4E 80 00 20 */ blr +/* 8000E0E8 0000B048 4E 80 00 20 */ blr .global Accept__18CFirstPersonCameraFR8IVisitor Accept__18CFirstPersonCameraFR8IVisitor: @@ -214,11 +214,11 @@ Accept__18CFirstPersonCameraFR8IVisitor: /* 8000E104 0000B064 7C 04 03 78 */ mr r4, r0 /* 8000E108 0000B068 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8000E10C 0000B06C 7D 89 03 A6 */ mtctr r12 -/* 8000E110 0000B070 4E 80 04 21 */ bctrl +/* 8000E110 0000B070 4E 80 04 21 */ bctrl /* 8000E114 0000B074 80 01 00 14 */ lwz r0, 0x14(r1) /* 8000E118 0000B078 7C 08 03 A6 */ mtlr r0 /* 8000E11C 0000B07C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8000E120 0000B080 4E 80 00 20 */ blr +/* 8000E120 0000B080 4E 80 00 20 */ blr .global Think__18CFirstPersonCameraFfR13CStateManager Think__18CFirstPersonCameraFfR13CStateManager: @@ -352,7 +352,7 @@ lbl_8000E2F4: /* 8000E308 0000B268 83 A1 00 C4 */ lwz r29, 0xc4(r1) /* 8000E30C 0000B26C 7C 08 03 A6 */ mtlr r0 /* 8000E310 0000B270 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 8000E314 0000B274 4E 80 00 20 */ blr +/* 8000E314 0000B274 4E 80 00 20 */ blr .global SkipCinematic__18CFirstPersonCameraFv SkipCinematic__18CFirstPersonCameraFv: @@ -365,7 +365,7 @@ SkipCinematic__18CFirstPersonCameraFv: /* 8000E330 0000B290 C0 24 00 08 */ lfs f1, 8(r4) /* 8000E334 0000B294 D0 23 01 D0 */ stfs f1, 0x1d0(r3) /* 8000E338 0000B298 D0 03 01 D4 */ stfs f0, 0x1d4(r3) -/* 8000E33C 0000B29C 4E 80 00 20 */ blr +/* 8000E33C 0000B29C 4E 80 00 20 */ blr .global Reset__18CFirstPersonCameraFRC12CTransform4fR13CStateManager Reset__18CFirstPersonCameraFRC12CTransform4fR13CStateManager: @@ -402,15 +402,15 @@ Reset__18CFirstPersonCameraFRC12CTransform4fR13CStateManager: /* 8000E3B8 0000B318 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8000E3BC 0000B31C 7C 08 03 A6 */ mtlr r0 /* 8000E3C0 0000B320 38 21 00 20 */ addi r1, r1, 0x20 -/* 8000E3C4 0000B324 4E 80 00 20 */ blr +/* 8000E3C4 0000B324 4E 80 00 20 */ blr .global Render__18CFirstPersonCameraCFRC13CStateManager Render__18CFirstPersonCameraCFRC13CStateManager: -/* 8000E3C8 0000B328 4E 80 00 20 */ blr +/* 8000E3C8 0000B328 4E 80 00 20 */ blr .global PreThink__18CFirstPersonCameraFfR13CStateManager PreThink__18CFirstPersonCameraFfR13CStateManager: -/* 8000E3CC 0000B32C 4E 80 00 20 */ blr +/* 8000E3CC 0000B32C 4E 80 00 20 */ blr .global UpdateTransform__18CFirstPersonCameraFR13CStateManagerf UpdateTransform__18CFirstPersonCameraFR13CStateManagerf: @@ -1744,7 +1744,7 @@ lbl_8000F784: /* 8000F7C4 0000C724 83 81 08 B0 */ lwz r28, 0x8b0(r1) /* 8000F7C8 0000C728 7C 08 03 A6 */ mtlr r0 /* 8000F7CC 0000C72C 38 21 09 20 */ addi r1, r1, 0x920 -/* 8000F7D0 0000C730 4E 80 00 20 */ blr +/* 8000F7D0 0000C730 4E 80 00 20 */ blr .global UpdateElevation__18CFirstPersonCameraFR13CStateManager UpdateElevation__18CFirstPersonCameraFR13CStateManager: @@ -1927,11 +1927,11 @@ lbl_8000FA54: /* 8000FA70 0000C9D0 83 A1 00 54 */ lwz r29, 0x54(r1) /* 8000FA74 0000C9D4 7C 08 03 A6 */ mtlr r0 /* 8000FA78 0000C9D8 38 21 00 80 */ addi r1, r1, 0x80 -/* 8000FA7C 0000C9DC 4E 80 00 20 */ blr +/* 8000FA7C 0000C9DC 4E 80 00 20 */ blr .global ProcessInput__18CFirstPersonCameraFRC11CFinalInputR13CStateManager ProcessInput__18CFirstPersonCameraFRC11CFinalInputR13CStateManager: -/* 8000FA80 0000C9E0 4E 80 00 20 */ blr +/* 8000FA80 0000C9E0 4E 80 00 20 */ blr .global __dt__18CFirstPersonCameraFv __dt__18CFirstPersonCameraFv: @@ -1959,7 +1959,7 @@ lbl_8000FAC8: /* 8000FAD4 0000CA34 83 C1 00 08 */ lwz r30, 8(r1) /* 8000FAD8 0000CA38 7C 08 03 A6 */ mtlr r0 /* 8000FADC 0000CA3C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8000FAE0 0000CA40 4E 80 00 20 */ blr +/* 8000FAE0 0000CA40 4E 80 00 20 */ blr .global __ct__18CFirstPersonCameraFRC9TUniqueIdRC12CTransform4f9TUniqueIdfffff __ct__18CFirstPersonCameraFRC9TUniqueIdRC12CTransform4f9TUniqueIdfffff: @@ -2087,4 +2087,4 @@ lbl_8000FC14: /* 8000FCBC 0000CC1C 83 81 00 60 */ lwz r28, 0x60(r1) /* 8000FCC0 0000CC20 7C 08 03 A6 */ mtlr r0 /* 8000FCC4 0000CC24 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 8000FCC8 0000CC28 4E 80 00 20 */ blr +/* 8000FCC8 0000CC28 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/Cameras/CGameCamera.s b/asm/MetroidPrime/Cameras/CGameCamera.s index fdeb9570..dd87bca8 100644 --- a/asm/MetroidPrime/Cameras/CGameCamera.s +++ b/asm/MetroidPrime/Cameras/CGameCamera.s @@ -134,7 +134,7 @@ lbl_8005AEFC: /* 8005AF08 00057E68 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8005AF0C 00057E6C 7C 08 03 A6 */ mtlr r0 /* 8005AF10 00057E70 38 21 00 30 */ addi r1, r1, 0x30 -/* 8005AF14 00057E74 4E 80 00 20 */ blr +/* 8005AF14 00057E74 4E 80 00 20 */ blr .global SetFovInterpolation__11CGameCameraFffff SetFovInterpolation__11CGameCameraFffff: @@ -150,7 +150,7 @@ SetFovInterpolation__11CGameCameraFffff: /* 8005AF3C 00057E9C D0 43 01 84 */ stfs f2, 0x184(r3) /* 8005AF40 00057EA0 D0 03 01 78 */ stfs f0, 0x178(r3) /* 8005AF44 00057EA4 D0 03 01 74 */ stfs f0, 0x174(r3) -/* 8005AF48 00057EA8 4E 80 00 20 */ blr +/* 8005AF48 00057EA8 4E 80 00 20 */ blr lbl_8005AF4C: /* 8005AF4C 00057EAC FC 04 00 40 */ fcmpo cr0, f4, f0 /* 8005AF50 00057EB0 40 80 00 0C */ bge lbl_8005AF5C @@ -168,7 +168,7 @@ lbl_8005AF60: /* 8005AF78 00057ED8 88 03 01 70 */ lbz r0, 0x170(r3) /* 8005AF7C 00057EDC 50 80 3E 30 */ rlwimi r0, r4, 7, 0x18, 0x18 /* 8005AF80 00057EE0 98 03 01 70 */ stb r0, 0x170(r3) -/* 8005AF84 00057EE4 4E 80 00 20 */ blr +/* 8005AF84 00057EE4 4E 80 00 20 */ blr .global SkipFovInterpolation__11CGameCameraFv SkipFovInterpolation__11CGameCameraFv: @@ -186,7 +186,7 @@ lbl_8005AFB0: /* 8005AFB0 00057F10 C0 02 86 B8 */ lfs f0, lbl_805AA3D8@sda21(r2) /* 8005AFB4 00057F14 D0 03 01 78 */ stfs f0, 0x178(r3) /* 8005AFB8 00057F18 D0 03 01 74 */ stfs f0, 0x174(r3) -/* 8005AFBC 00057F1C 4E 80 00 20 */ blr +/* 8005AFBC 00057F1C 4E 80 00 20 */ blr .global ValidateCameraTransform__11CGameCameraFRC12CTransform4fRC12CTransform4f ValidateCameraTransform__11CGameCameraFRC12CTransform4fRC12CTransform4f: @@ -393,7 +393,7 @@ lbl_8005B294: /* 8005B2C4 00058224 83 A1 01 74 */ lwz r29, 0x174(r1) /* 8005B2C8 00058228 7C 08 03 A6 */ mtlr r0 /* 8005B2CC 0005822C 38 21 01 80 */ addi r1, r1, 0x180 -/* 8005B2D0 00058230 4E 80 00 20 */ blr +/* 8005B2D0 00058230 4E 80 00 20 */ blr .global Accept__11CGameCameraFR8IVisitor Accept__11CGameCameraFR8IVisitor: @@ -406,11 +406,11 @@ Accept__11CGameCameraFR8IVisitor: /* 8005B2EC 0005824C 7C 04 03 78 */ mr r4, r0 /* 8005B2F0 00058250 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8005B2F4 00058254 7D 89 03 A6 */ mtctr r12 -/* 8005B2F8 00058258 4E 80 04 21 */ bctrl +/* 8005B2F8 00058258 4E 80 04 21 */ bctrl /* 8005B2FC 0005825C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8005B300 00058260 7C 08 03 A6 */ mtlr r0 /* 8005B304 00058264 38 21 00 10 */ addi r1, r1, 0x10 -/* 8005B308 00058268 4E 80 00 20 */ blr +/* 8005B308 00058268 4E 80 00 20 */ blr .global SetActive__11CGameCameraFb SetActive__11CGameCameraFb: @@ -428,7 +428,7 @@ SetActive__11CGameCameraFb: /* 8005B338 00058298 80 01 00 14 */ lwz r0, 0x14(r1) /* 8005B33C 0005829C 7C 08 03 A6 */ mtlr r0 /* 8005B340 000582A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8005B344 000582A4 4E 80 00 20 */ blr +/* 8005B344 000582A4 4E 80 00 20 */ blr .global AcceptScriptMsg__11CGameCameraF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__11CGameCameraF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -470,7 +470,7 @@ lbl_8005B3C0: /* 8005B3C0 00058320 80 01 00 24 */ lwz r0, 0x24(r1) /* 8005B3C4 00058324 7C 08 03 A6 */ mtlr r0 /* 8005B3C8 00058328 38 21 00 20 */ addi r1, r1, 0x20 -/* 8005B3CC 0005832C 4E 80 00 20 */ blr +/* 8005B3CC 0005832C 4E 80 00 20 */ blr .global FindClosestLengthOnSpline__13CCameraSplineCFf9CVector3f FindClosestLengthOnSpline__13CCameraSplineCFf9CVector3f: @@ -924,7 +924,7 @@ lbl_8005B9E0: /* 8005BA70 000589D0 80 01 01 F4 */ lwz r0, 0x1f4(r1) /* 8005BA74 000589D4 7C 08 03 A6 */ mtlr r0 /* 8005BA78 000589D8 38 21 01 F0 */ addi r1, r1, 0x1f0 -/* 8005BA7C 000589DC 4E 80 00 20 */ blr +/* 8005BA7C 000589DC 4E 80 00 20 */ blr .global GetInterpolatedSplinePointByLength__13CCameraSplineCFf GetInterpolatedSplinePointByLength__13CCameraSplineCFf: @@ -1306,7 +1306,7 @@ lbl_8005BFAC: /* 8005BFC0 00058F20 83 A1 01 A4 */ lwz r29, 0x1a4(r1) /* 8005BFC4 00058F24 7C 08 03 A6 */ mtlr r0 /* 8005BFC8 00058F28 38 21 01 C0 */ addi r1, r1, 0x1c0 -/* 8005BFCC 00058F2C 4E 80 00 20 */ blr +/* 8005BFCC 00058F2C 4E 80 00 20 */ blr .global GetInterpolatedSplinePointByTime__13CCameraSplineCFff GetInterpolatedSplinePointByTime__13CCameraSplineCFff: @@ -1479,7 +1479,7 @@ lbl_8005C20C: /* 8005C218 00059178 83 E1 00 8C */ lwz r31, 0x8c(r1) /* 8005C21C 0005917C 7C 08 03 A6 */ mtlr r0 /* 8005C220 00059180 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8005C224 00059184 4E 80 00 20 */ blr +/* 8005C224 00059184 4E 80 00 20 */ blr .global ValidateLength__13CCameraSplineCFf ValidateLength__13CCameraSplineCFf: @@ -1525,7 +1525,7 @@ lbl_8005C2A8: /* 8005C2AC 0005920C C0 21 00 08 */ lfs f1, 8(r1) /* 8005C2B0 00059210 7C 08 03 A6 */ mtlr r0 /* 8005C2B4 00059214 38 21 00 10 */ addi r1, r1, 0x10 -/* 8005C2B8 00059218 4E 80 00 20 */ blr +/* 8005C2B8 00059218 4E 80 00 20 */ blr .global CalculateSplineLength__13CCameraSplineFv CalculateSplineLength__13CCameraSplineFv: @@ -1749,7 +1749,7 @@ lbl_8005C578: /* 8005C5E4 00059544 83 A1 00 54 */ lwz r29, 0x54(r1) /* 8005C5E8 00059548 7C 08 03 A6 */ mtlr r0 /* 8005C5EC 0005954C 38 21 01 20 */ addi r1, r1, 0x120 -/* 8005C5F0 00059550 4E 80 00 20 */ blr +/* 8005C5F0 00059550 4E 80 00 20 */ blr .global ClampLength__13CCameraSplineCFRC9CVector3fbRC15CMaterialFilterRC13CStateManager ClampLength__13CCameraSplineCFRC9CVector3fbRC15CMaterialFilterRC13CStateManager: @@ -1893,7 +1893,7 @@ lbl_8005C7D0: /* 8005C7F8 00059758 83 81 00 B0 */ lwz r28, 0xb0(r1) /* 8005C7FC 0005975C 7C 08 03 A6 */ mtlr r0 /* 8005C800 00059760 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 8005C804 00059764 4E 80 00 20 */ blr +/* 8005C804 00059764 4E 80 00 20 */ blr .global "GetSurroundingPoints__13CCameraSplineFiRQ24rstl27reserved_vector<9CVector3f>RQ24rstl27reserved_vector<9CVector3f>" "GetSurroundingPoints__13CCameraSplineFiRQ24rstl27reserved_vector<9CVector3f>RQ24rstl27reserved_vector<9CVector3f>": @@ -1906,7 +1906,7 @@ lbl_8005C7D0: /* 8005C820 00059780 41 80 00 0C */ blt lbl_8005C82C lbl_8005C824: /* 8005C824 00059784 38 60 00 00 */ li r3, 0 -/* 8005C828 00059788 4E 80 00 20 */ blr +/* 8005C828 00059788 4E 80 00 20 */ blr lbl_8005C82C: /* 8005C82C 0005978C 2C 04 00 00 */ cmpwi r4, 0 /* 8005C830 00059790 40 81 00 90 */ ble lbl_8005C8C0 @@ -2327,7 +2327,7 @@ lbl_8005CE34: /* 8005CE3C 00059D9C 90 06 00 00 */ stw r0, 0(r6) lbl_8005CE40: /* 8005CE40 00059DA0 38 60 00 01 */ li r3, 1 -/* 8005CE44 00059DA4 4E 80 00 20 */ blr +/* 8005CE44 00059DA4 4E 80 00 20 */ blr .global Reset__13CCameraSplineFi Reset__13CCameraSplineFi: @@ -2403,7 +2403,7 @@ lbl_8005CF38: /* 8005CF40 00059EA0 83 C1 00 38 */ lwz r30, 0x38(r1) /* 8005CF44 00059EA4 7C 08 03 A6 */ mtlr r0 /* 8005CF48 00059EA8 38 21 00 40 */ addi r1, r1, 0x40 -/* 8005CF4C 00059EAC 4E 80 00 20 */ blr +/* 8005CF4C 00059EAC 4E 80 00 20 */ blr .global AddKnot__13CCameraSplineFRC9CVector3fRC9CVector3f AddKnot__13CCameraSplineFRC9CVector3fRC9CVector3f: @@ -2476,13 +2476,13 @@ lbl_8005D028: /* 8005D040 00059FA0 80 01 00 24 */ lwz r0, 0x24(r1) /* 8005D044 00059FA4 7C 08 03 A6 */ mtlr r0 /* 8005D048 00059FA8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8005D04C 00059FAC 4E 80 00 20 */ blr +/* 8005D04C 00059FAC 4E 80 00 20 */ blr .global SetKnotPosition__13CCameraSplineFiRC9CVector3f SetKnotPosition__13CCameraSplineFiRC9CVector3f: /* 8005D050 00059FB0 80 03 00 08 */ lwz r0, 8(r3) /* 8005D054 00059FB4 7C 04 00 00 */ cmpw r4, r0 -/* 8005D058 00059FB8 4C 80 00 20 */ bgelr +/* 8005D058 00059FB8 4C 80 00 20 */ bgelr /* 8005D05C 00059FBC 1C 04 00 0C */ mulli r0, r4, 0xc /* 8005D060 00059FC0 80 63 00 10 */ lwz r3, 0x10(r3) /* 8005D064 00059FC4 C0 05 00 00 */ lfs f0, 0(r5) @@ -2492,7 +2492,7 @@ SetKnotPosition__13CCameraSplineFiRC9CVector3f: /* 8005D074 00059FD4 D0 03 00 04 */ stfs f0, 4(r3) /* 8005D078 00059FD8 C0 05 00 08 */ lfs f0, 8(r5) /* 8005D07C 00059FDC D0 03 00 08 */ stfs f0, 8(r3) -/* 8005D080 00059FE0 4E 80 00 20 */ blr +/* 8005D080 00059FE0 4E 80 00 20 */ blr .global GetKnotPosition__11CBallCameraCFi GetKnotPosition__11CBallCameraCFi: @@ -2508,7 +2508,7 @@ GetKnotPosition__11CBallCameraCFi: /* 8005D0A8 0005A008 D0 03 00 04 */ stfs f0, 4(r3) /* 8005D0AC 0005A00C C0 04 00 08 */ lfs f0, 8(r4) /* 8005D0B0 0005A010 D0 03 00 08 */ stfs f0, 8(r3) -/* 8005D0B4 0005A014 4E 80 00 20 */ blr +/* 8005D0B4 0005A014 4E 80 00 20 */ blr lbl_8005D0B8: /* 8005D0B8 0005A018 3C 80 80 5A */ lis r4, skZero3f@ha /* 8005D0BC 0005A01C C4 04 66 A0 */ lfsu f0, skZero3f@l(r4) @@ -2517,7 +2517,7 @@ lbl_8005D0B8: /* 8005D0C8 0005A028 D0 03 00 04 */ stfs f0, 4(r3) /* 8005D0CC 0005A02C C0 04 00 08 */ lfs f0, 8(r4) /* 8005D0D0 0005A030 D0 03 00 08 */ stfs f0, 8(r3) -/* 8005D0D4 0005A034 4E 80 00 20 */ blr +/* 8005D0D4 0005A034 4E 80 00 20 */ blr .global GetKnotT__13CCameraSplineCFi GetKnotT__13CCameraSplineCFi: @@ -2527,10 +2527,10 @@ GetKnotT__13CCameraSplineCFi: /* 8005D0E4 0005A044 80 63 00 30 */ lwz r3, 0x30(r3) /* 8005D0E8 0005A048 54 80 10 3A */ slwi r0, r4, 2 /* 8005D0EC 0005A04C 7C 23 04 2E */ lfsx f1, r3, r0 -/* 8005D0F0 0005A050 4E 80 00 20 */ blr +/* 8005D0F0 0005A050 4E 80 00 20 */ blr lbl_8005D0F4: /* 8005D0F4 0005A054 C0 22 86 B8 */ lfs f1, lbl_805AA3D8@sda21(r2) -/* 8005D0F8 0005A058 4E 80 00 20 */ blr +/* 8005D0F8 0005A058 4E 80 00 20 */ blr .global "CalculateKnots__13CCameraSplineFRCQ24rstl48vector<11SConnection,Q24rstl17rmemory_allocator>R13CStateManager" "CalculateKnots__13CCameraSplineFRCQ24rstl48vector<11SConnection,Q24rstl17rmemory_allocator>R13CStateManager": @@ -2794,7 +2794,7 @@ lbl_8005D49C: /* 8005D4A0 0005A400 80 01 00 F4 */ lwz r0, 0xf4(r1) /* 8005D4A4 0005A404 7C 08 03 A6 */ mtlr r0 /* 8005D4A8 0005A408 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 8005D4AC 0005A40C 4E 80 00 20 */ blr +/* 8005D4AC 0005A40C 4E 80 00 20 */ blr .global sub_8005d4b0 sub_8005d4b0: @@ -2868,7 +2868,7 @@ lbl_8005D58C: /* 8005D594 0005A4F4 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8005D598 0005A4F8 7C 08 03 A6 */ mtlr r0 /* 8005D59C 0005A4FC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8005D5A0 0005A500 4E 80 00 20 */ blr +/* 8005D5A0 0005A500 4E 80 00 20 */ blr .global "Initialise__13CCameraSplineFRCQ24rstl48vector<11SConnection,Q24rstl17rmemory_allocator>R13CStateManager" "Initialise__13CCameraSplineFRCQ24rstl48vector<11SConnection,Q24rstl17rmemory_allocator>R13CStateManager": @@ -2888,7 +2888,7 @@ lbl_8005D58C: /* 8005D5D8 0005A538 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8005D5DC 0005A53C 7C 08 03 A6 */ mtlr r0 /* 8005D5E0 0005A540 38 21 00 20 */ addi r1, r1, 0x20 -/* 8005D5E4 0005A544 4E 80 00 20 */ blr +/* 8005D5E4 0005A544 4E 80 00 20 */ blr .global __dt__13CCameraSplineFv __dt__13CCameraSplineFv: @@ -2998,7 +2998,7 @@ lbl_8005D744: /* 8005D750 0005A6B0 83 C1 00 48 */ lwz r30, 0x48(r1) /* 8005D754 0005A6B4 7C 08 03 A6 */ mtlr r0 /* 8005D758 0005A6B8 38 21 00 50 */ addi r1, r1, 0x50 -/* 8005D75C 0005A6BC 4E 80 00 20 */ blr +/* 8005D75C 0005A6BC 4E 80 00 20 */ blr .global __ct__13CCameraSplineFb __ct__13CCameraSplineFb: @@ -3021,7 +3021,7 @@ __ct__13CCameraSplineFb: /* 8005D7A0 0005A700 90 03 00 40 */ stw r0, 0x40(r3) /* 8005D7A4 0005A704 D0 03 00 44 */ stfs f0, 0x44(r3) /* 8005D7A8 0005A708 98 83 00 48 */ stb r4, 0x48(r3) -/* 8005D7AC 0005A70C 4E 80 00 20 */ blr +/* 8005D7AC 0005A70C 4E 80 00 20 */ blr .global Reset__13CCameraSpringFv Reset__13CCameraSpringFv: @@ -3041,7 +3041,7 @@ Reset__13CCameraSpringFv: /* 8005D7E4 0005A744 80 01 00 14 */ lwz r0, 0x14(r1) /* 8005D7E8 0005A748 7C 08 03 A6 */ mtlr r0 /* 8005D7EC 0005A74C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8005D7F0 0005A750 4E 80 00 20 */ blr +/* 8005D7F0 0005A750 4E 80 00 20 */ blr .global ApplyDistanceSpringNoMax__13CCameraSpringFfff ApplyDistanceSpringNoMax__13CCameraSpringFfff: @@ -3062,7 +3062,7 @@ ApplyDistanceSpringNoMax__13CCameraSpringFfff: /* 8005D82C 0005A78C FC 40 08 90 */ fmr f2, f1 lbl_8005D830: /* 8005D830 0005A790 FC 20 10 90 */ fmr f1, f2 -/* 8005D834 0005A794 4E 80 00 20 */ blr +/* 8005D834 0005A794 4E 80 00 20 */ blr .global ApplyDistanceSpring__13CCameraSpringFfff ApplyDistanceSpring__13CCameraSpringFfff: @@ -3089,7 +3089,7 @@ lbl_8005D874: /* 8005D884 0005A7E4 EC C1 10 2A */ fadds f6, f1, f2 lbl_8005D888: /* 8005D888 0005A7E8 FC 20 30 90 */ fmr f1, f6 -/* 8005D88C 0005A7EC 4E 80 00 20 */ blr +/* 8005D88C 0005A7EC 4E 80 00 20 */ blr .global ConvertToScreenSpace__11CGameCameraCFRC9CVector3f ConvertToScreenSpace__11CGameCameraCFRC9CVector3f: @@ -3154,7 +3154,7 @@ lbl_8005D960: /* 8005D968 0005A8C8 83 C1 00 38 */ lwz r30, 0x38(r1) /* 8005D96C 0005A8CC 7C 08 03 A6 */ mtlr r0 /* 8005D970 0005A8D0 38 21 00 40 */ addi r1, r1, 0x40 -/* 8005D974 0005A8D4 4E 80 00 20 */ blr +/* 8005D974 0005A8D4 4E 80 00 20 */ blr .global GetPerspectiveMatrix__11CGameCameraCFv GetPerspectiveMatrix__11CGameCameraCFv: @@ -3215,7 +3215,7 @@ lbl_8005DA44: /* 8005DA4C 0005A9AC 83 E1 00 4C */ lwz r31, 0x4c(r1) /* 8005DA50 0005A9B0 7C 08 03 A6 */ mtlr r0 /* 8005DA54 0005A9B4 38 21 00 50 */ addi r1, r1, 0x50 -/* 8005DA58 0005A9B8 4E 80 00 20 */ blr +/* 8005DA58 0005A9B8 4E 80 00 20 */ blr .global __dt__11CGameCameraFv __dt__11CGameCameraFv: @@ -3243,7 +3243,7 @@ lbl_8005DAA0: /* 8005DAAC 0005AA0C 83 C1 00 08 */ lwz r30, 8(r1) /* 8005DAB0 0005AA10 7C 08 03 A6 */ mtlr r0 /* 8005DAB4 0005AA14 38 21 00 10 */ addi r1, r1, 0x10 -/* 8005DAB8 0005AA18 4E 80 00 20 */ blr +/* 8005DAB8 0005AA18 4E 80 00 20 */ blr .global "__ct__11CGameCameraF9TUniqueIdbRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fffff9TUniqueIdbi" "__ct__11CGameCameraF9TUniqueIdbRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fffff9TUniqueIdbi": @@ -3389,4 +3389,4 @@ lbl_8005DAA0: /* 8005DCE8 0005AC48 80 01 01 44 */ lwz r0, 0x144(r1) /* 8005DCEC 0005AC4C 7C 08 03 A6 */ mtlr r0 /* 8005DCF0 0005AC50 38 21 01 40 */ addi r1, r1, 0x140 -/* 8005DCF4 0005AC54 4E 80 00 20 */ blr +/* 8005DCF4 0005AC54 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/Cameras/CInterpolationCamera.s b/asm/MetroidPrime/Cameras/CInterpolationCamera.s index 5e49cdd6..ff9c12fb 100644 --- a/asm/MetroidPrime/Cameras/CInterpolationCamera.s +++ b/asm/MetroidPrime/Cameras/CInterpolationCamera.s @@ -35,7 +35,7 @@ lbl_803E9D80: .4byte ProcessInput__20CInterpolationCameraFRC11CFinalInputR13CStateManager .4byte Reset__20CInterpolationCameraFRC12CTransform4fR13CStateManager .4byte 0 - + .section .text, "ax" .global AcceptScriptMsg__20CInterpolationCameraF20EScriptObjectMessage9TUniqueIdR13CStateManager @@ -50,11 +50,11 @@ AcceptScriptMsg__20CInterpolationCameraF20EScriptObjectMessage9TUniqueIdR13CStat /* 80264FD8 00261F38 80 01 00 14 */ lwz r0, 0x14(r1) /* 80264FDC 00261F3C 7C 08 03 A6 */ mtlr r0 /* 80264FE0 00261F40 38 21 00 10 */ addi r1, r1, 0x10 -/* 80264FE4 00261F44 4E 80 00 20 */ blr +/* 80264FE4 00261F44 4E 80 00 20 */ blr .global Render__20CInterpolationCameraCFRC13CStateManager Render__20CInterpolationCameraCFRC13CStateManager: -/* 80264FE8 00261F48 4E 80 00 20 */ blr +/* 80264FE8 00261F48 4E 80 00 20 */ blr .global Accept__20CInterpolationCameraFR8IVisitor Accept__20CInterpolationCameraFR8IVisitor: @@ -67,15 +67,15 @@ Accept__20CInterpolationCameraFR8IVisitor: /* 80265004 00261F64 7C 04 03 78 */ mr r4, r0 /* 80265008 00261F68 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8026500C 00261F6C 7D 89 03 A6 */ mtctr r12 -/* 80265010 00261F70 4E 80 04 21 */ bctrl +/* 80265010 00261F70 4E 80 04 21 */ bctrl /* 80265014 00261F74 80 01 00 14 */ lwz r0, 0x14(r1) /* 80265018 00261F78 7C 08 03 A6 */ mtlr r0 /* 8026501C 00261F7C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80265020 00261F80 4E 80 00 20 */ blr +/* 80265020 00261F80 4E 80 00 20 */ blr .global ProcessInput__20CInterpolationCameraFRC11CFinalInputR13CStateManager ProcessInput__20CInterpolationCameraFRC11CFinalInputR13CStateManager: -/* 80265024 00261F84 4E 80 00 20 */ blr +/* 80265024 00261F84 4E 80 00 20 */ blr .global Think__20CInterpolationCameraFfR13CStateManager Think__20CInterpolationCameraFfR13CStateManager: @@ -273,7 +273,7 @@ lbl_802652D8: /* 80265304 00262264 83 A1 00 A4 */ lwz r29, 0xa4(r1) /* 80265308 00262268 7C 08 03 A6 */ mtlr r0 /* 8026530C 0026226C 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 80265310 00262270 4E 80 00 20 */ blr +/* 80265310 00262270 4E 80 00 20 */ blr .global sub_80265314 sub_80265314: @@ -288,7 +288,7 @@ sub_80265314: /* 80265334 00262294 81 83 00 00 */ lwz r12, 0(r3) /* 80265338 00262298 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 8026533C 0026229C 7D 89 03 A6 */ mtctr r12 -/* 80265340 002622A0 4E 80 04 21 */ bctrl +/* 80265340 002622A0 4E 80 04 21 */ bctrl /* 80265344 002622A4 80 7F 08 70 */ lwz r3, 0x870(r31) /* 80265348 002622A8 4B DA 55 85 */ bl ShouldBypassInterpolationCamera__14CCameraManagerCFv /* 8026534C 002622AC 54 60 06 3F */ clrlwi. r0, r3, 0x18 @@ -304,7 +304,7 @@ lbl_80265368: /* 80265370 002622D0 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80265374 002622D4 7C 08 03 A6 */ mtlr r0 /* 80265378 002622D8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8026537C 002622DC 4E 80 00 20 */ blr +/* 8026537C 002622DC 4E 80 00 20 */ blr .global SetInterpolation__20CInterpolationCameraFRC12CTransform4fRC9CVector3ffff9TUniqueIdbR13CStateManager SetInterpolation__20CInterpolationCameraFRC12CTransform4fRC9CVector3ffff9TUniqueIdbR13CStateManager: @@ -331,7 +331,7 @@ SetInterpolation__20CInterpolationCameraFRC12CTransform4fRC9CVector3ffff9TUnique /* 802653D0 00262330 7D 1E 43 78 */ mr r30, r8 /* 802653D4 00262334 38 80 00 01 */ li r4, 1 /* 802653D8 00262338 7D 89 03 A6 */ mtctr r12 -/* 802653DC 0026233C 4E 80 04 21 */ bctrl +/* 802653DC 0026233C 4E 80 04 21 */ bctrl /* 802653E0 00262340 7F 44 D3 78 */ mr r4, r26 /* 802653E4 00262344 38 7F 00 34 */ addi r3, r31, 0x34 /* 802653E8 00262348 48 0A D7 59 */ bl __as__12CTransform4fFRC12CTransform4f @@ -394,7 +394,7 @@ lbl_802654AC: /* 802654C8 00262428 80 01 00 64 */ lwz r0, 0x64(r1) /* 802654CC 0026242C 7C 08 03 A6 */ mtlr r0 /* 802654D0 00262430 38 21 00 60 */ addi r1, r1, 0x60 -/* 802654D4 00262434 4E 80 00 20 */ blr +/* 802654D4 00262434 4E 80 00 20 */ blr .global InterpolateSinusoidal__20CInterpolationCameraFR12CTransform4fRC9CVector3fRC9CVector3fff InterpolateSinusoidal__20CInterpolationCameraFR12CTransform4fRC9CVector3fRC9CVector3fff: @@ -659,7 +659,7 @@ lbl_80265870: /* 802658B0 00262810 83 81 01 30 */ lwz r28, 0x130(r1) /* 802658B4 00262814 7C 08 03 A6 */ mtlr r0 /* 802658B8 00262818 38 21 01 80 */ addi r1, r1, 0x180 -/* 802658BC 0026281C 4E 80 00 20 */ blr +/* 802658BC 0026281C 4E 80 00 20 */ blr .global InterpolateWithDistance__20CInterpolationCameraFR12CTransform4fRC9CVector3fRC9CVector3ffffff InterpolateWithDistance__20CInterpolationCameraFR12CTransform4fRC9CVector3fRC9CVector3ffffff: @@ -1017,11 +1017,11 @@ lbl_80265DC4: /* 80265DFC 00262D5C 80 01 02 04 */ lwz r0, 0x204(r1) /* 80265E00 00262D60 7C 08 03 A6 */ mtlr r0 /* 80265E04 00262D64 38 21 02 00 */ addi r1, r1, 0x200 -/* 80265E08 00262D68 4E 80 00 20 */ blr +/* 80265E08 00262D68 4E 80 00 20 */ blr .global Reset__20CInterpolationCameraFRC12CTransform4fR13CStateManager Reset__20CInterpolationCameraFRC12CTransform4fR13CStateManager: -/* 80265E0C 00262D6C 4E 80 00 20 */ blr +/* 80265E0C 00262D6C 4E 80 00 20 */ blr .global __dt__20CInterpolationCamera __dt__20CInterpolationCamera: @@ -1049,7 +1049,7 @@ lbl_80265E54: /* 80265E60 00262DC0 83 C1 00 08 */ lwz r30, 8(r1) /* 80265E64 00262DC4 7C 08 03 A6 */ mtlr r0 /* 80265E68 00262DC8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80265E6C 00262DCC 4E 80 00 20 */ blr +/* 80265E6C 00262DCC 4E 80 00 20 */ blr .global __ct__20CInterpolationCameraF9TUniqueIdRC12CTransform4f __ct__20CInterpolationCameraF9TUniqueIdRC12CTransform4f: diff --git a/asm/MetroidPrime/Cameras/CPathCamera.s b/asm/MetroidPrime/Cameras/CPathCamera.s index 05565f5b..29c10b8d 100644 --- a/asm/MetroidPrime/Cameras/CPathCamera.s +++ b/asm/MetroidPrime/Cameras/CPathCamera.s @@ -125,11 +125,11 @@ lbl_8012D988: /* 8012D994 0012A8F4 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8012D998 0012A8F8 7C 08 03 A6 */ mtlr r0 /* 8012D99C 0012A8FC 38 21 00 30 */ addi r1, r1, 0x30 -/* 8012D9A0 0012A900 4E 80 00 20 */ blr +/* 8012D9A0 0012A900 4E 80 00 20 */ blr .global Render__11CPathCameraCFRC13CStateManager Render__11CPathCameraCFRC13CStateManager: -/* 8012D9A4 0012A904 4E 80 00 20 */ blr +/* 8012D9A4 0012A904 4E 80 00 20 */ blr .global Accept__11CPathCameraFR8IVisitor Accept__11CPathCameraFR8IVisitor: @@ -142,15 +142,15 @@ Accept__11CPathCameraFR8IVisitor: /* 8012D9C0 0012A920 7C 04 03 78 */ mr r4, r0 /* 8012D9C4 0012A924 81 8C 00 48 */ lwz r12, 0x48(r12) /* 8012D9C8 0012A928 7D 89 03 A6 */ mtctr r12 -/* 8012D9CC 0012A92C 4E 80 04 21 */ bctrl +/* 8012D9CC 0012A92C 4E 80 04 21 */ bctrl /* 8012D9D0 0012A930 80 01 00 14 */ lwz r0, 0x14(r1) /* 8012D9D4 0012A934 7C 08 03 A6 */ mtlr r0 /* 8012D9D8 0012A938 38 21 00 10 */ addi r1, r1, 0x10 -/* 8012D9DC 0012A93C 4E 80 00 20 */ blr +/* 8012D9DC 0012A93C 4E 80 00 20 */ blr .global ProcessInput__11CPathCameraFRC11CFinalInputR13CStateManager ProcessInput__11CPathCameraFRC11CFinalInputR13CStateManager: -/* 8012D9E0 0012A940 4E 80 00 20 */ blr +/* 8012D9E0 0012A940 4E 80 00 20 */ blr .global Think__11CPathCameraFfR13CStateManager Think__11CPathCameraFfR13CStateManager: @@ -373,7 +373,7 @@ lbl_8012DD18: /* 8012DD2C 0012AC8C 83 A1 01 64 */ lwz r29, 0x164(r1) /* 8012DD30 0012AC90 7C 08 03 A6 */ mtlr r0 /* 8012DD34 0012AC94 38 21 01 80 */ addi r1, r1, 0x180 -/* 8012DD38 0012AC98 4E 80 00 20 */ blr +/* 8012DD38 0012AC98 4E 80 00 20 */ blr .global ClampToClosedDoor__11CPathCameraFR13CStateManager ClampToClosedDoor__11CPathCameraFR13CStateManager: @@ -439,7 +439,7 @@ lbl_8012DE18: /* 8012DE20 0012AD80 83 C1 00 68 */ lwz r30, 0x68(r1) /* 8012DE24 0012AD84 7C 08 03 A6 */ mtlr r0 /* 8012DE28 0012AD88 38 21 00 70 */ addi r1, r1, 0x70 -/* 8012DE2C 0012AD8C 4E 80 00 20 */ blr +/* 8012DE2C 0012AD8C 4E 80 00 20 */ blr .global MoveAlongSpline__11CPathCameraFfR13CStateManager MoveAlongSpline__11CPathCameraFfR13CStateManager: @@ -705,7 +705,7 @@ lbl_8012E1C0: /* 8012E1F8 0012B158 83 A1 00 F4 */ lwz r29, 0xf4(r1) /* 8012E1FC 0012B15C 7C 08 03 A6 */ mtlr r0 /* 8012E200 0012B160 38 21 01 40 */ addi r1, r1, 0x140 -/* 8012E204 0012B164 4E 80 00 20 */ blr +/* 8012E204 0012B164 4E 80 00 20 */ blr .global Reset__11CPathCameraFRC12CTransform4fR13CStateManager Reset__11CPathCameraFRC12CTransform4fR13CStateManager: @@ -1015,7 +1015,7 @@ lbl_8012E5D8: /* 8012E698 0012B5F8 83 A1 02 24 */ lwz r29, 0x224(r1) /* 8012E69C 0012B5FC 7C 08 03 A6 */ mtlr r0 /* 8012E6A0 0012B600 38 21 02 C0 */ addi r1, r1, 0x2c0 -/* 8012E6A4 0012B604 4E 80 00 20 */ blr +/* 8012E6A4 0012B604 4E 80 00 20 */ blr .global __dt__11CPathCameraFv __dt__11CPathCameraFv: @@ -1047,7 +1047,7 @@ lbl_8012E6FC: /* 8012E708 0012B668 83 C1 00 08 */ lwz r30, 8(r1) /* 8012E70C 0012B66C 7C 08 03 A6 */ mtlr r0 /* 8012E710 0012B670 38 21 00 10 */ addi r1, r1, 0x10 -/* 8012E714 0012B674 4E 80 00 20 */ blr +/* 8012E714 0012B674 4E 80 00 20 */ blr .global "__ct__11CPathCameraF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fbbbbbfffffffQ211CPathCamera22EInitialSplinePosition" "__ct__11CPathCameraF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fbbbbbfffffffQ211CPathCamera22EInitialSplinePosition": @@ -1145,7 +1145,7 @@ lbl_8012E6FC: /* 8012E884 0012B7E4 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 8012E888 0012B7E8 7C 08 03 A6 */ mtlr r0 /* 8012E88C 0012B7EC 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 8012E890 0012B7F0 4E 80 00 20 */ blr +/* 8012E890 0012B7F0 4E 80 00 20 */ blr .global __sinit_CPathCamera_cpp __sinit_CPathCamera_cpp: @@ -1178,4 +1178,4 @@ __sinit_CPathCamera_cpp: /* 8012E8FC 0012B85C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8012E900 0012B860 7C 08 03 A6 */ mtlr r0 /* 8012E904 0012B864 38 21 00 20 */ addi r1, r1, 0x20 -/* 8012E908 0012B868 4E 80 00 20 */ blr +/* 8012E908 0012B868 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/Clamp_int.s b/asm/MetroidPrime/Clamp_int.s index d9c1614f..0b8921a8 100644 --- a/asm/MetroidPrime/Clamp_int.s +++ b/asm/MetroidPrime/Clamp_int.s @@ -7,12 +7,12 @@ /* 8005A064 00056FC4 80 03 00 00 */ lwz r0, 0(r3) /* 8005A068 00056FC8 80 C4 00 00 */ lwz r6, 0(r4) /* 8005A06C 00056FCC 7C 00 30 00 */ cmpw r0, r6 -/* 8005A070 00056FD0 4D 81 00 20 */ bgtlr +/* 8005A070 00056FD0 4D 81 00 20 */ bgtlr /* 8005A074 00056FD4 80 05 00 00 */ lwz r0, 0(r5) /* 8005A078 00056FD8 7C 00 30 00 */ cmpw r0, r6 /* 8005A07C 00056FDC 40 80 00 0C */ bge lbl_8005A088 /* 8005A080 00056FE0 7C A3 2B 78 */ mr r3, r5 -/* 8005A084 00056FE4 4E 80 00 20 */ blr +/* 8005A084 00056FE4 4E 80 00 20 */ blr lbl_8005A088: /* 8005A088 00056FE8 7C 83 23 78 */ mr r3, r4 -/* 8005A08C 00056FEC 4E 80 00 20 */ blr +/* 8005A08C 00056FEC 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/Decode.s b/asm/MetroidPrime/Decode.s index 3ef784b9..2ed08267 100644 --- a/asm/MetroidPrime/Decode.s +++ b/asm/MetroidPrime/Decode.s @@ -56,13 +56,13 @@ lbl_80051838: /* 80051878 0004E7D8 83 81 00 10 */ lwz r28, 0x10(r1) /* 8005187C 0004E7DC 7C 08 03 A6 */ mtlr r0 /* 80051880 0004E7E0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80051884 0004E7E4 4E 80 00 20 */ blr +/* 80051884 0004E7E4 4E 80 00 20 */ blr .global GetParm__20CArchitectureMessageCFv GetParm__20CArchitectureMessageCFv: /* 80051888 0004E7E8 80 63 00 08 */ lwz r3, 8(r3) /* 8005188C 0004E7EC 80 63 00 00 */ lwz r3, 0(r3) -/* 80051890 0004E7F0 4E 80 00 20 */ blr +/* 80051890 0004E7F0 4E 80 00 20 */ blr .global CreateFrameBegin__7MakeMsgF14EArchMsgTargetRCi CreateFrameBegin__7MakeMsgF14EArchMsgTargetRCi: @@ -118,7 +118,7 @@ lbl_80051910: /* 80051950 0004E8B0 83 81 00 10 */ lwz r28, 0x10(r1) /* 80051954 0004E8B4 7C 08 03 A6 */ mtlr r0 /* 80051958 0004E8B8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8005195C 0004E8BC 4E 80 00 20 */ blr +/* 8005195C 0004E8BC 4E 80 00 20 */ blr .global CreateQuitGameplay__7MakeMsgF14EArchMsgTarget CreateQuitGameplay__7MakeMsgF14EArchMsgTarget: @@ -170,7 +170,7 @@ lbl_800519D0: /* 80051A0C 0004E96C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80051A10 0004E970 7C 08 03 A6 */ mtlr r0 /* 80051A14 0004E974 38 21 00 20 */ addi r1, r1, 0x20 -/* 80051A18 0004E978 4E 80 00 20 */ blr +/* 80051A18 0004E978 4E 80 00 20 */ blr .global CreateControllerStatus__7MakeMsgF14EArchMsgTargetRCsRCb CreateControllerStatus__7MakeMsgF14EArchMsgTargetRCsRCb: @@ -222,19 +222,19 @@ lbl_80051A94: /* 80051AC8 0004EA28 80 01 00 34 */ lwz r0, 0x34(r1) /* 80051ACC 0004EA2C 7C 08 03 A6 */ mtlr r0 /* 80051AD0 0004EA30 38 21 00 30 */ addi r1, r1, 0x30 -/* 80051AD4 0004EA34 4E 80 00 20 */ blr +/* 80051AD4 0004EA34 4E 80 00 20 */ blr .global GetParmNewGameflowState__7MakeMsgFRC20CArchitectureMessage GetParmNewGameflowState__7MakeMsgFRC20CArchitectureMessage: /* 80051AD8 0004EA38 80 63 00 08 */ lwz r3, 8(r3) /* 80051ADC 0004EA3C 80 63 00 00 */ lwz r3, 0(r3) -/* 80051AE0 0004EA40 4E 80 00 20 */ blr +/* 80051AE0 0004EA40 4E 80 00 20 */ blr .global GetParmUserInput__7MakeMsgFRC20CArchitectureMessage GetParmUserInput__7MakeMsgFRC20CArchitectureMessage: /* 80051AE4 0004EA44 80 63 00 08 */ lwz r3, 8(r3) /* 80051AE8 0004EA48 80 63 00 00 */ lwz r3, 0(r3) -/* 80051AEC 0004EA4C 4E 80 00 20 */ blr +/* 80051AEC 0004EA4C 4E 80 00 20 */ blr .global CreateUserInput__7MakeMsgF14EArchMsgTargetRC11CFinalInput CreateUserInput__7MakeMsgF14EArchMsgTargetRC11CFinalInput: @@ -290,13 +290,13 @@ lbl_80051B6C: /* 80051BAC 0004EB0C 83 81 00 10 */ lwz r28, 0x10(r1) /* 80051BB0 0004EB10 7C 08 03 A6 */ mtlr r0 /* 80051BB4 0004EB14 38 21 00 20 */ addi r1, r1, 0x20 -/* 80051BB8 0004EB18 4E 80 00 20 */ blr +/* 80051BB8 0004EB18 4E 80 00 20 */ blr .global GetParmTimerTick__7MakeMsgFRC20CArchitectureMessage GetParmTimerTick__7MakeMsgFRC20CArchitectureMessage: /* 80051BBC 0004EB1C 80 63 00 08 */ lwz r3, 8(r3) /* 80051BC0 0004EB20 80 63 00 00 */ lwz r3, 0(r3) -/* 80051BC4 0004EB24 4E 80 00 20 */ blr +/* 80051BC4 0004EB24 4E 80 00 20 */ blr .global CreateTimerTick__7MakeMsgF14EArchMsgTargetRCf CreateTimerTick__7MakeMsgF14EArchMsgTargetRCf: @@ -352,19 +352,19 @@ lbl_80051C44: /* 80051C84 0004EBE4 83 81 00 10 */ lwz r28, 0x10(r1) /* 80051C88 0004EBE8 7C 08 03 A6 */ mtlr r0 /* 80051C8C 0004EBEC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80051C90 0004EBF0 4E 80 00 20 */ blr +/* 80051C90 0004EBF0 4E 80 00 20 */ blr .global GetParmChangeIOWinPriority__7MakeMsgFRC20CArchitectureMessage GetParmChangeIOWinPriority__7MakeMsgFRC20CArchitectureMessage: /* 80051C94 0004EBF4 80 63 00 08 */ lwz r3, 8(r3) /* 80051C98 0004EBF8 80 63 00 00 */ lwz r3, 0(r3) -/* 80051C9C 0004EBFC 4E 80 00 20 */ blr +/* 80051C9C 0004EBFC 4E 80 00 20 */ blr .global GetParmCreateIOWin__7MakeMsgFRC20CArchitectureMessage GetParmCreateIOWin__7MakeMsgFRC20CArchitectureMessage: /* 80051CA0 0004EC00 80 63 00 08 */ lwz r3, 8(r3) /* 80051CA4 0004EC04 80 63 00 00 */ lwz r3, 0(r3) -/* 80051CA8 0004EC08 4E 80 00 20 */ blr +/* 80051CA8 0004EC08 4E 80 00 20 */ blr .global CreateCreateIOWin__7MakeMsgF14EArchMsgTargetRCiRCiRCP6CIOWin CreateCreateIOWin__7MakeMsgF14EArchMsgTargetRCiRCiRCP6CIOWin: @@ -418,10 +418,10 @@ lbl_80051D2C: /* 80051D60 0004ECC0 80 01 00 34 */ lwz r0, 0x34(r1) /* 80051D64 0004ECC4 7C 08 03 A6 */ mtlr r0 /* 80051D68 0004ECC8 38 21 00 30 */ addi r1, r1, 0x30 -/* 80051D6C 0004ECCC 4E 80 00 20 */ blr +/* 80051D6C 0004ECCC 4E 80 00 20 */ blr .global GetParmDeleteIOWin__7MakeMsgFRC20CArchitectureMessage GetParmDeleteIOWin__7MakeMsgFRC20CArchitectureMessage: /* 80051D70 0004ECD0 80 63 00 08 */ lwz r3, 8(r3) /* 80051D74 0004ECD4 80 63 00 00 */ lwz r3, 0(r3) -/* 80051D78 0004ECD8 4E 80 00 20 */ blr +/* 80051D78 0004ECD8 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/Enemies/CActorContraption.s b/asm/MetroidPrime/Enemies/CActorContraption.s index b40f9afc..abc0e113 100644 --- a/asm/MetroidPrime/Enemies/CActorContraption.s +++ b/asm/MetroidPrime/Enemies/CActorContraption.s @@ -78,7 +78,7 @@ lbl_8023F398: /* 8023F3A4 0023C304 83 C1 00 08 */ lwz r30, 8(r1) /* 8023F3A8 0023C308 7C 08 03 A6 */ mtlr r0 /* 8023F3AC 0023C30C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8023F3B0 0023C310 4E 80 00 20 */ blr +/* 8023F3B0 0023C310 4E 80 00 20 */ blr .global Accept__17CActorContraptionFR8IVisitor Accept__17CActorContraptionFR8IVisitor: @@ -91,11 +91,11 @@ Accept__17CActorContraptionFR8IVisitor: /* 8023F3CC 0023C32C 7C 04 03 78 */ mr r4, r0 /* 8023F3D0 0023C330 81 8C 00 5C */ lwz r12, 0x5c(r12) /* 8023F3D4 0023C334 7D 89 03 A6 */ mtctr r12 -/* 8023F3D8 0023C338 4E 80 04 21 */ bctrl +/* 8023F3D8 0023C338 4E 80 04 21 */ bctrl /* 8023F3DC 0023C33C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8023F3E0 0023C340 7C 08 03 A6 */ mtlr r0 /* 8023F3E4 0023C344 38 21 00 10 */ addi r1, r1, 0x10 -/* 8023F3E8 0023C348 4E 80 00 20 */ blr +/* 8023F3E8 0023C348 4E 80 00 20 */ blr .global DoUserAnimEvent__17CActorContraptionFR13CStateManagerRC13CInt32POINode14EUserEventType DoUserAnimEvent__17CActorContraptionFR13CStateManagerRC13CInt32POINode14EUserEventType: @@ -171,7 +171,7 @@ lbl_8023F4D4: /* 8023F4E4 0023C444 83 81 00 10 */ lwz r28, 0x10(r1) /* 8023F4E8 0023C448 7C 08 03 A6 */ mtlr r0 /* 8023F4EC 0023C44C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8023F4F0 0023C450 4E 80 00 20 */ blr +/* 8023F4F0 0023C450 4E 80 00 20 */ blr .global AcceptScriptMsg__17CActorContraptionF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__17CActorContraptionF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -284,7 +284,7 @@ lbl_8023F660: /* 8023F664 0023C5C4 80 01 00 34 */ lwz r0, 0x34(r1) /* 8023F668 0023C5C8 7C 08 03 A6 */ mtlr r0 /* 8023F66C 0023C5CC 38 21 00 30 */ addi r1, r1, 0x30 -/* 8023F670 0023C5D0 4E 80 00 20 */ blr +/* 8023F670 0023C5D0 4E 80 00 20 */ blr .global Think__17CActorContraptionFfR13CStateManager Think__17CActorContraptionFfR13CStateManager: @@ -343,7 +343,7 @@ lbl_8023F718: /* 8023F738 0023C698 83 81 00 A8 */ lwz r28, 0xa8(r1) /* 8023F73C 0023C69C 7C 08 03 A6 */ mtlr r0 /* 8023F740 0023C6A0 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 8023F744 0023C6A4 4E 80 00 20 */ blr +/* 8023F744 0023C6A4 4E 80 00 20 */ blr .global sub_8023f748 sub_8023f748: @@ -501,7 +501,7 @@ lbl_8023F978: /* 8023F97C 0023C8DC 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 8023F980 0023C8E0 7C 08 03 A6 */ mtlr r0 /* 8023F984 0023C8E4 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 8023F988 0023C8E8 4E 80 00 20 */ blr +/* 8023F988 0023C8E8 4E 80 00 20 */ blr .global "__ct__17CActorContraptionF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC6CAABoxRC13CMaterialListffRC11CHealthInfoRC20CDamageVulnerabilityRC16CActorParametersiRC11CDamageInfob" "__ct__17CActorContraptionF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC6CAABoxRC13CMaterialListffRC11CHealthInfoRC20CDamageVulnerabilityRC16CActorParametersiRC11CDamageInfob": @@ -552,7 +552,7 @@ lbl_8023F978: /* 8023FA3C 0023C99C 81 84 00 00 */ lwz r12, 0(r4) /* 8023FA40 0023C9A0 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8023FA44 0023C9A4 7D 89 03 A6 */ mtctr r12 -/* 8023FA48 0023C9A8 4E 80 04 21 */ bctrl +/* 8023FA48 0023C9A8 4E 80 04 21 */ bctrl /* 8023FA4C 0023C9AC 38 7F 03 00 */ addi r3, r31, 0x300 /* 8023FA50 0023C9B0 38 81 00 34 */ addi r4, r1, 0x34 /* 8023FA54 0023C9B4 48 10 14 55 */ bl __ct__6CTokenFRC6CToken @@ -581,7 +581,7 @@ lbl_8023F978: /* 8023FAB0 0023CA10 80 01 00 54 */ lwz r0, 0x54(r1) /* 8023FAB4 0023CA14 7C 08 03 A6 */ mtlr r0 /* 8023FAB8 0023CA18 38 21 00 50 */ addi r1, r1, 0x50 -/* 8023FABC 0023CA1C 4E 80 00 20 */ blr +/* 8023FABC 0023CA1C 4E 80 00 20 */ blr .global sub_8023fac0 sub_8023fac0: @@ -627,7 +627,7 @@ lbl_8023FB34: /* 8023FB50 0023CAB0 80 01 00 24 */ lwz r0, 0x24(r1) /* 8023FB54 0023CAB4 7C 08 03 A6 */ mtlr r0 /* 8023FB58 0023CAB8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8023FB5C 0023CABC 4E 80 00 20 */ blr +/* 8023FB5C 0023CABC 4E 80 00 20 */ blr .global sub_8023fb60 sub_8023fb60: diff --git a/asm/MetroidPrime/Enemies/CAi.s b/asm/MetroidPrime/Enemies/CAi.s index c0763b2f..c0cf29d5 100644 --- a/asm/MetroidPrime/Enemies/CAi.s +++ b/asm/MetroidPrime/Enemies/CAi.s @@ -1078,567 +1078,567 @@ lbl_805A8E88: .global ShouldCallForBackup__3CAiFR13CStateManagerf ShouldCallForBackup__3CAiFR13CStateManagerf: /* 800A25F4 0009F554 38 60 00 00 */ li r3, 0 -/* 800A25F8 0009F558 4E 80 00 20 */ blr +/* 800A25F8 0009F558 4E 80 00 20 */ blr .global IsDizzy__3CAiFR13CStateManagerf IsDizzy__3CAiFR13CStateManagerf: /* 800A25FC 0009F55C 38 60 00 00 */ li r3, 0 -/* 800A2600 0009F560 4E 80 00 20 */ blr +/* 800A2600 0009F560 4E 80 00 20 */ blr .global FixedRandom__3CAiFR13CStateManagerf FixedRandom__3CAiFR13CStateManagerf: /* 800A2604 0009F564 38 60 00 00 */ li r3, 0 -/* 800A2608 0009F568 4E 80 00 20 */ blr +/* 800A2608 0009F568 4E 80 00 20 */ blr .global Random__3CAiFR13CStateManagerf Random__3CAiFR13CStateManagerf: /* 800A260C 0009F56C 38 60 00 00 */ li r3, 0 -/* 800A2610 0009F570 4E 80 00 20 */ blr +/* 800A2610 0009F570 4E 80 00 20 */ blr .global BounceFind__3CAiFR13CStateManagerf BounceFind__3CAiFR13CStateManagerf: /* 800A2614 0009F574 38 60 00 00 */ li r3, 0 -/* 800A2618 0009F578 4E 80 00 20 */ blr +/* 800A2618 0009F578 4E 80 00 20 */ blr .global CodeTrigger__3CAiFR13CStateManagerf CodeTrigger__3CAiFR13CStateManagerf: /* 800A261C 0009F57C 38 60 00 00 */ li r3, 0 -/* 800A2620 0009F580 4E 80 00 20 */ blr +/* 800A2620 0009F580 4E 80 00 20 */ blr .global LostInterest__3CAiFR13CStateManagerf LostInterest__3CAiFR13CStateManagerf: /* 800A2624 0009F584 38 60 00 00 */ li r3, 0 -/* 800A2628 0009F588 4E 80 00 20 */ blr +/* 800A2628 0009F588 4E 80 00 20 */ blr .global ShouldSpecialAttack__3CAiFR13CStateManagerf ShouldSpecialAttack__3CAiFR13CStateManagerf: /* 800A262C 0009F58C 38 60 00 00 */ li r3, 0 -/* 800A2630 0009F590 4E 80 00 20 */ blr +/* 800A2630 0009F590 4E 80 00 20 */ blr .global ShouldStrafe__3CAiFR13CStateManagerf ShouldStrafe__3CAiFR13CStateManagerf: /* 800A2634 0009F594 38 60 00 00 */ li r3, 0 -/* 800A2638 0009F598 4E 80 00 20 */ blr +/* 800A2638 0009F598 4E 80 00 20 */ blr .global BreakAttack__3CAiFR13CStateManagerf BreakAttack__3CAiFR13CStateManagerf: /* 800A263C 0009F59C 38 60 00 00 */ li r3, 0 -/* 800A2640 0009F5A0 4E 80 00 20 */ blr +/* 800A2640 0009F5A0 4E 80 00 20 */ blr .global StartAttack__3CAiFR13CStateManagerf StartAttack__3CAiFR13CStateManagerf: /* 800A2644 0009F5A4 38 60 00 00 */ li r3, 0 -/* 800A2648 0009F5A8 4E 80 00 20 */ blr +/* 800A2648 0009F5A8 4E 80 00 20 */ blr .global AIStage__3CAiFR13CStateManagerf AIStage__3CAiFR13CStateManagerf: /* 800A264C 0009F5AC 38 60 00 00 */ li r3, 0 -/* 800A2650 0009F5B0 4E 80 00 20 */ blr +/* 800A2650 0009F5B0 4E 80 00 20 */ blr .global SetAIStage__3CAiFR13CStateManagerf SetAIStage__3CAiFR13CStateManagerf: /* 800A2654 0009F5B4 38 60 00 00 */ li r3, 0 -/* 800A2658 0009F5B8 4E 80 00 20 */ blr +/* 800A2658 0009F5B8 4E 80 00 20 */ blr .global ShouldWallHang__3CAiFR13CStateManagerf ShouldWallHang__3CAiFR13CStateManagerf: /* 800A265C 0009F5BC 38 60 00 00 */ li r3, 0 -/* 800A2660 0009F5C0 4E 80 00 20 */ blr +/* 800A2660 0009F5C0 4E 80 00 20 */ blr .global HasTargetingPoint__3CAiFR13CStateManagerf HasTargetingPoint__3CAiFR13CStateManagerf: /* 800A2664 0009F5C4 38 60 00 00 */ li r3, 0 -/* 800A2668 0009F5C8 4E 80 00 20 */ blr +/* 800A2668 0009F5C8 4E 80 00 20 */ blr .global ShotAt__3CAiFR13CStateManagerf ShotAt__3CAiFR13CStateManagerf: /* 800A266C 0009F5CC 38 60 00 00 */ li r3, 0 -/* 800A2670 0009F5D0 4E 80 00 20 */ blr +/* 800A2670 0009F5D0 4E 80 00 20 */ blr .global ShouldMove__3CAiFR13CStateManagerf ShouldMove__3CAiFR13CStateManagerf: /* 800A2674 0009F5D4 38 60 00 00 */ li r3, 0 -/* 800A2678 0009F5D8 4E 80 00 20 */ blr +/* 800A2678 0009F5D8 4E 80 00 20 */ blr .global ShouldCrouch__3CAiFR13CStateManagerf ShouldCrouch__3CAiFR13CStateManagerf: /* 800A267C 0009F5DC 38 60 00 00 */ li r3, 0 -/* 800A2680 0009F5E0 4E 80 00 20 */ blr +/* 800A2680 0009F5E0 4E 80 00 20 */ blr .global ShouldRetreat__3CAiFR13CStateManagerf ShouldRetreat__3CAiFR13CStateManagerf: /* 800A2684 0009F5E4 38 60 00 00 */ li r3, 0 -/* 800A2688 0009F5E8 4E 80 00 20 */ blr +/* 800A2688 0009F5E8 4E 80 00 20 */ blr .global ShouldDodge__3CAiFR13CStateManagerf ShouldDodge__3CAiFR13CStateManagerf: /* 800A268C 0009F5EC 38 60 00 00 */ li r3, 0 -/* 800A2690 0009F5F0 4E 80 00 20 */ blr +/* 800A2690 0009F5F0 4E 80 00 20 */ blr .global PatrolPathOver__3CAiFR13CStateManagerf PatrolPathOver__3CAiFR13CStateManagerf: /* 800A2694 0009F5F4 38 60 00 00 */ li r3, 0 -/* 800A2698 0009F5F8 4E 80 00 20 */ blr +/* 800A2698 0009F5F8 4E 80 00 20 */ blr .global ShouldFlinch__3CAiFR13CStateManagerf ShouldFlinch__3CAiFR13CStateManagerf: /* 800A269C 0009F5FC 38 60 00 00 */ li r3, 0 -/* 800A26A0 0009F600 4E 80 00 20 */ blr +/* 800A26A0 0009F600 4E 80 00 20 */ blr .global ShouldFire__3CAiFR13CStateManagerf ShouldFire__3CAiFR13CStateManagerf: /* 800A26A4 0009F604 38 60 00 00 */ li r3, 0 -/* 800A26A8 0009F608 4E 80 00 20 */ blr +/* 800A26A8 0009F608 4E 80 00 20 */ blr .global Inside__3CAiFR13CStateManagerf Inside__3CAiFR13CStateManagerf: /* 800A26AC 0009F60C 38 60 00 00 */ li r3, 0 -/* 800A26B0 0009F610 4E 80 00 20 */ blr +/* 800A26B0 0009F610 4E 80 00 20 */ blr .global ShouldTaunt__3CAiFR13CStateManagerf ShouldTaunt__3CAiFR13CStateManagerf: /* 800A26B4 0009F614 38 60 00 00 */ li r3, 0 -/* 800A26B8 0009F618 4E 80 00 20 */ blr +/* 800A26B8 0009F618 4E 80 00 20 */ blr .global AttackOver__3CAiFR13CStateManagerf AttackOver__3CAiFR13CStateManagerf: /* 800A26BC 0009F61C 38 60 00 00 */ li r3, 0 -/* 800A26C0 0009F620 4E 80 00 20 */ blr +/* 800A26C0 0009F620 4E 80 00 20 */ blr .global AggressionCheck__3CAiFR13CStateManagerf AggressionCheck__3CAiFR13CStateManagerf: /* 800A26C4 0009F624 38 60 00 00 */ li r3, 0 -/* 800A26C8 0009F628 4E 80 00 20 */ blr +/* 800A26C8 0009F628 4E 80 00 20 */ blr .global LineOfSight__3CAiFR13CStateManagerf LineOfSight__3CAiFR13CStateManagerf: /* 800A26CC 0009F62C 38 60 00 00 */ li r3, 0 -/* 800A26D0 0009F630 4E 80 00 20 */ blr +/* 800A26D0 0009F630 4E 80 00 20 */ blr .global GotUp__3CAiFR13CStateManagerf GotUp__3CAiFR13CStateManagerf: /* 800A26D4 0009F634 38 60 00 00 */ li r3, 0 -/* 800A26D8 0009F638 4E 80 00 20 */ blr +/* 800A26D8 0009F638 4E 80 00 20 */ blr .global CoveringFire__3CAiFR13CStateManagerf CoveringFire__3CAiFR13CStateManagerf: /* 800A26DC 0009F63C 38 60 00 00 */ li r3, 0 -/* 800A26E0 0009F640 4E 80 00 20 */ blr +/* 800A26E0 0009F640 4E 80 00 20 */ blr .global CoverNearlyBlown__3CAiFR13CStateManagerf CoverNearlyBlown__3CAiFR13CStateManagerf: /* 800A26E4 0009F644 38 60 00 00 */ li r3, 0 -/* 800A26E8 0009F648 4E 80 00 20 */ blr +/* 800A26E8 0009F648 4E 80 00 20 */ blr .global CoverBlown__3CAiFR13CStateManagerf CoverBlown__3CAiFR13CStateManagerf: /* 800A26EC 0009F64C 38 60 00 00 */ li r3, 0 -/* 800A26F0 0009F650 4E 80 00 20 */ blr +/* 800A26F0 0009F650 4E 80 00 20 */ blr .global CoverFind__3CAiFR13CStateManagerf CoverFind__3CAiFR13CStateManagerf: /* 800A26F4 0009F654 38 60 00 00 */ li r3, 0 -/* 800A26F8 0009F658 4E 80 00 20 */ blr +/* 800A26F8 0009F658 4E 80 00 20 */ blr .global CoverCheck__3CAiFR13CStateManagerf CoverCheck__3CAiFR13CStateManagerf: /* 800A26FC 0009F65C 38 60 00 00 */ li r3, 0 -/* 800A2700 0009F660 4E 80 00 20 */ blr +/* 800A2700 0009F660 4E 80 00 20 */ blr .global HearPlayer__3CAiFR13CStateManagerf HearPlayer__3CAiFR13CStateManagerf: /* 800A2704 0009F664 38 60 00 00 */ li r3, 0 -/* 800A2708 0009F668 4E 80 00 20 */ blr +/* 800A2708 0009F668 4E 80 00 20 */ blr .global HearShot__3CAiFR13CStateManagerf HearShot__3CAiFR13CStateManagerf: /* 800A270C 0009F66C 38 60 00 00 */ li r3, 0 -/* 800A2710 0009F670 4E 80 00 20 */ blr +/* 800A2710 0009F670 4E 80 00 20 */ blr .global Landed__3CAiFR13CStateManagerf Landed__3CAiFR13CStateManagerf: /* 800A2714 0009F674 38 60 00 00 */ li r3, 0 -/* 800A2718 0009F678 4E 80 00 20 */ blr +/* 800A2718 0009F678 4E 80 00 20 */ blr .global NoPathNodes__3CAiFR13CStateManagerf NoPathNodes__3CAiFR13CStateManagerf: /* 800A271C 0009F67C 38 60 00 00 */ li r3, 0 -/* 800A2720 0009F680 4E 80 00 20 */ blr +/* 800A2720 0009F680 4E 80 00 20 */ blr .global Stuck__3CAiFR13CStateManagerf Stuck__3CAiFR13CStateManagerf: /* 800A2724 0009F684 38 60 00 00 */ li r3, 0 -/* 800A2728 0009F688 4E 80 00 20 */ blr +/* 800A2728 0009F688 4E 80 00 20 */ blr .global ShouldJumpBack__3CAiFR13CStateManagerf ShouldJumpBack__3CAiFR13CStateManagerf: /* 800A272C 0009F68C 38 60 00 00 */ li r3, 0 -/* 800A2730 0009F690 4E 80 00 20 */ blr +/* 800A2730 0009F690 4E 80 00 20 */ blr .global HitSomething__3CAiFR13CStateManagerf HitSomething__3CAiFR13CStateManagerf: /* 800A2734 0009F694 38 60 00 00 */ li r3, 0 -/* 800A2738 0009F698 4E 80 00 20 */ blr +/* 800A2738 0009F698 4E 80 00 20 */ blr .global ShouldTurn__3CAiFR13CStateManagerf ShouldTurn__3CAiFR13CStateManagerf: /* 800A273C 0009F69C 38 60 00 00 */ li r3, 0 -/* 800A2740 0009F6A0 4E 80 00 20 */ blr +/* 800A2740 0009F6A0 4E 80 00 20 */ blr .global InPosition__3CAiFR13CStateManagerf InPosition__3CAiFR13CStateManagerf: /* 800A2744 0009F6A4 38 60 00 00 */ li r3, 0 -/* 800A2748 0009F6A8 4E 80 00 20 */ blr +/* 800A2748 0009F6A8 4E 80 00 20 */ blr .global ShouldDoubleSnap__3CAiFR13CStateManagerf ShouldDoubleSnap__3CAiFR13CStateManagerf: /* 800A274C 0009F6AC 38 60 00 00 */ li r3, 0 -/* 800A2750 0009F6B0 4E 80 00 20 */ blr +/* 800A2750 0009F6B0 4E 80 00 20 */ blr .global ShouldAttack__3CAiFR13CStateManagerf ShouldAttack__3CAiFR13CStateManagerf: /* 800A2754 0009F6B4 38 60 00 00 */ li r3, 0 -/* 800A2758 0009F6B8 4E 80 00 20 */ blr +/* 800A2758 0009F6B8 4E 80 00 20 */ blr .global AnimOver__3CAiFR13CStateManagerf AnimOver__3CAiFR13CStateManagerf: /* 800A275C 0009F6BC 38 60 00 00 */ li r3, 0 -/* 800A2760 0009F6C0 4E 80 00 20 */ blr +/* 800A2760 0009F6C0 4E 80 00 20 */ blr .global Default__3CAiFR13CStateManagerf Default__3CAiFR13CStateManagerf: /* 800A2764 0009F6C4 38 60 00 00 */ li r3, 0 -/* 800A2768 0009F6C8 4E 80 00 20 */ blr +/* 800A2768 0009F6C8 4E 80 00 20 */ blr .global FixedDelay__3CAiFR13CStateManagerf FixedDelay__3CAiFR13CStateManagerf: /* 800A276C 0009F6CC 38 60 00 00 */ li r3, 0 -/* 800A2770 0009F6D0 4E 80 00 20 */ blr +/* 800A2770 0009F6D0 4E 80 00 20 */ blr .global RandomDelay__3CAiFR13CStateManagerf RandomDelay__3CAiFR13CStateManagerf: /* 800A2774 0009F6D4 38 60 00 00 */ li r3, 0 -/* 800A2778 0009F6D8 4E 80 00 20 */ blr +/* 800A2778 0009F6D8 4E 80 00 20 */ blr .global Delay__3CAiFR13CStateManagerf Delay__3CAiFR13CStateManagerf: /* 800A277C 0009F6DC 38 60 00 00 */ li r3, 0 -/* 800A2780 0009F6E0 4E 80 00 20 */ blr +/* 800A2780 0009F6E0 4E 80 00 20 */ blr .global HasRetreatPattern__3CAiFR13CStateManagerf HasRetreatPattern__3CAiFR13CStateManagerf: /* 800A2784 0009F6E4 38 60 00 00 */ li r3, 0 -/* 800A2788 0009F6E8 4E 80 00 20 */ blr +/* 800A2788 0009F6E8 4E 80 00 20 */ blr .global HasPatrolPath__3CAiFR13CStateManagerf HasPatrolPath__3CAiFR13CStateManagerf: /* 800A278C 0009F6EC 38 60 00 00 */ li r3, 0 -/* 800A2790 0009F6F0 4E 80 00 20 */ blr +/* 800A2790 0009F6F0 4E 80 00 20 */ blr .global HasAttackPattern__3CAiFR13CStateManagerf HasAttackPattern__3CAiFR13CStateManagerf: /* 800A2794 0009F6F4 38 60 00 00 */ li r3, 0 -/* 800A2798 0009F6F8 4E 80 00 20 */ blr +/* 800A2798 0009F6F8 4E 80 00 20 */ blr .global PatternShagged__3CAiFR13CStateManagerf PatternShagged__3CAiFR13CStateManagerf: /* 800A279C 0009F6FC 38 60 00 00 */ li r3, 0 -/* 800A27A0 0009F700 4E 80 00 20 */ blr +/* 800A27A0 0009F700 4E 80 00 20 */ blr .global PatternOver__3CAiFR13CStateManagerf PatternOver__3CAiFR13CStateManagerf: /* 800A27A4 0009F704 38 60 00 00 */ li r3, 0 -/* 800A27A8 0009F708 4E 80 00 20 */ blr +/* 800A27A8 0009F708 4E 80 00 20 */ blr .global PlayerSpot__3CAiFR13CStateManagerf PlayerSpot__3CAiFR13CStateManagerf: /* 800A27AC 0009F70C 38 60 00 00 */ li r3, 0 -/* 800A27B0 0009F710 4E 80 00 20 */ blr +/* 800A27B0 0009F710 4E 80 00 20 */ blr .global SpotPlayer__3CAiFR13CStateManagerf SpotPlayer__3CAiFR13CStateManagerf: /* 800A27B4 0009F714 38 60 00 00 */ li r3, 0 -/* 800A27B8 0009F718 4E 80 00 20 */ blr +/* 800A27B8 0009F718 4E 80 00 20 */ blr .global InDetectionRange__3CAiFR13CStateManagerf InDetectionRange__3CAiFR13CStateManagerf: /* 800A27BC 0009F71C 38 60 00 00 */ li r3, 0 -/* 800A27C0 0009F720 4E 80 00 20 */ blr +/* 800A27C0 0009F720 4E 80 00 20 */ blr .global InMaxRange__3CAiFR13CStateManagerf InMaxRange__3CAiFR13CStateManagerf: /* 800A27C4 0009F724 38 60 00 00 */ li r3, 0 -/* 800A27C8 0009F728 4E 80 00 20 */ blr +/* 800A27C8 0009F728 4E 80 00 20 */ blr .global InRange__3CAiFR13CStateManagerf InRange__3CAiFR13CStateManagerf: /* 800A27CC 0009F72C 38 60 00 00 */ li r3, 0 -/* 800A27D0 0009F730 4E 80 00 20 */ blr +/* 800A27D0 0009F730 4E 80 00 20 */ blr .global TooClose__3CAiFR13CStateManagerf TooClose__3CAiFR13CStateManagerf: /* 800A27D4 0009F734 38 60 00 00 */ li r3, 0 -/* 800A27D8 0009F738 4E 80 00 20 */ blr +/* 800A27D8 0009F738 4E 80 00 20 */ blr .global PathFound__3CAiFR13CStateManagerf PathFound__3CAiFR13CStateManagerf: /* 800A27DC 0009F73C 38 60 00 00 */ li r3, 0 -/* 800A27E0 0009F740 4E 80 00 20 */ blr +/* 800A27E0 0009F740 4E 80 00 20 */ blr .global PathOver__3CAiFR13CStateManagerf PathOver__3CAiFR13CStateManagerf: /* 800A27E4 0009F744 38 60 00 00 */ li r3, 0 -/* 800A27E8 0009F748 4E 80 00 20 */ blr +/* 800A27E8 0009F748 4E 80 00 20 */ blr .global PathShagged__3CAiFR13CStateManagerf PathShagged__3CAiFR13CStateManagerf: /* 800A27EC 0009F74C 38 60 00 00 */ li r3, 0 -/* 800A27F0 0009F750 4E 80 00 20 */ blr +/* 800A27F0 0009F750 4E 80 00 20 */ blr .global Attacked__3CAiFR13CStateManagerf Attacked__3CAiFR13CStateManagerf: /* 800A27F4 0009F754 38 60 00 00 */ li r3, 0 -/* 800A27F8 0009F758 4E 80 00 20 */ blr +/* 800A27F8 0009F758 4E 80 00 20 */ blr .global Offline__3CAiFR13CStateManagerf Offline__3CAiFR13CStateManagerf: /* 800A27FC 0009F75C 38 60 00 00 */ li r3, 0 -/* 800A2800 0009F760 4E 80 00 20 */ blr +/* 800A2800 0009F760 4E 80 00 20 */ blr .global Leash__3CAiFR13CStateManagerf Leash__3CAiFR13CStateManagerf: /* 800A2804 0009F764 38 60 00 00 */ li r3, 0 -/* 800A2808 0009F768 4E 80 00 20 */ blr +/* 800A2808 0009F768 4E 80 00 20 */ blr .global InAttackPosition__3CAiFR13CStateManagerf InAttackPosition__3CAiFR13CStateManagerf: /* 800A280C 0009F76C 38 60 00 00 */ li r3, 0 -/* 800A2810 0009F770 4E 80 00 20 */ blr +/* 800A2810 0009F770 4E 80 00 20 */ blr .global PodAttack__3CAiFR13CStateManager9EStateMsgf PodAttack__3CAiFR13CStateManager9EStateMsgf: -/* 800A2814 0009F774 4E 80 00 20 */ blr +/* 800A2814 0009F774 4E 80 00 20 */ blr .global BulbAttack__3CAiFR13CStateManager9EStateMsgf BulbAttack__3CAiFR13CStateManager9EStateMsgf: -/* 800A2818 0009F778 4E 80 00 20 */ blr +/* 800A2818 0009F778 4E 80 00 20 */ blr .global CallForBackup__3CAiFR13CStateManager9EStateMsgf CallForBackup__3CAiFR13CStateManager9EStateMsgf: -/* 800A281C 0009F77C 4E 80 00 20 */ blr +/* 800A281C 0009F77C 4E 80 00 20 */ blr .global Dizzy__3CAiFR13CStateManager9EStateMsgf Dizzy__3CAiFR13CStateManager9EStateMsgf: -/* 800A2820 0009F780 4E 80 00 20 */ blr +/* 800A2820 0009F780 4E 80 00 20 */ blr .global PathFindEx__3CAiFR13CStateManager9EStateMsgf PathFindEx__3CAiFR13CStateManager9EStateMsgf: -/* 800A2824 0009F784 4E 80 00 20 */ blr +/* 800A2824 0009F784 4E 80 00 20 */ blr .global Bounce__3CAiFR13CStateManager9EStateMsgf Bounce__3CAiFR13CStateManager9EStateMsgf: -/* 800A2828 0009F788 4E 80 00 20 */ blr +/* 800A2828 0009F788 4E 80 00 20 */ blr .global Land__3CAiFR13CStateManager9EStateMsgf Land__3CAiFR13CStateManager9EStateMsgf: -/* 800A282C 0009F78C 4E 80 00 20 */ blr +/* 800A282C 0009F78C 4E 80 00 20 */ blr .global Faint__3CAiFR13CStateManager9EStateMsgf Faint__3CAiFR13CStateManager9EStateMsgf: -/* 800A2830 0009F790 4E 80 00 20 */ blr +/* 800A2830 0009F790 4E 80 00 20 */ blr .global Growth__3CAiFR13CStateManager9EStateMsgf Growth__3CAiFR13CStateManager9EStateMsgf: -/* 800A2834 0009F794 4E 80 00 20 */ blr +/* 800A2834 0009F794 4E 80 00 20 */ blr .global SpecialAttack__3CAiFR13CStateManager9EStateMsgf SpecialAttack__3CAiFR13CStateManager9EStateMsgf: -/* 800A2838 0009F798 4E 80 00 20 */ blr +/* 800A2838 0009F798 4E 80 00 20 */ blr .global Enraged__3CAiFR13CStateManager9EStateMsgf Enraged__3CAiFR13CStateManager9EStateMsgf: -/* 800A283C 0009F79C 4E 80 00 20 */ blr +/* 800A283C 0009F79C 4E 80 00 20 */ blr .global WallDetach__3CAiFR13CStateManager9EStateMsgf WallDetach__3CAiFR13CStateManager9EStateMsgf: -/* 800A2840 0009F7A0 4E 80 00 20 */ blr +/* 800A2840 0009F7A0 4E 80 00 20 */ blr .global WallHang__3CAiFR13CStateManager9EStateMsgf WallHang__3CAiFR13CStateManager9EStateMsgf: -/* 800A2844 0009F7A4 4E 80 00 20 */ blr +/* 800A2844 0009F7A4 4E 80 00 20 */ blr .global Approach__3CAiFR13CStateManager9EStateMsgf Approach__3CAiFR13CStateManager9EStateMsgf: -/* 800A2848 0009F7A8 4E 80 00 20 */ blr +/* 800A2848 0009F7A8 4E 80 00 20 */ blr .global Cover__3CAiFR13CStateManager9EStateMsgf Cover__3CAiFR13CStateManager9EStateMsgf: -/* 800A284C 0009F7AC 4E 80 00 20 */ blr +/* 800A284C 0009F7AC 4E 80 00 20 */ blr .global Retreat__3CAiFR13CStateManager9EStateMsgf Retreat__3CAiFR13CStateManager9EStateMsgf: -/* 800A2850 0009F7B0 4E 80 00 20 */ blr +/* 800A2850 0009F7B0 4E 80 00 20 */ blr .global Dodge__3CAiFR13CStateManager9EStateMsgf Dodge__3CAiFR13CStateManager9EStateMsgf: -/* 800A2854 0009F7B4 4E 80 00 20 */ blr +/* 800A2854 0009F7B4 4E 80 00 20 */ blr .global Explode__3CAiFR13CStateManager9EStateMsgf Explode__3CAiFR13CStateManager9EStateMsgf: -/* 800A2858 0009F7B8 4E 80 00 20 */ blr +/* 800A2858 0009F7B8 4E 80 00 20 */ blr .global Jump__3CAiFR13CStateManager9EStateMsgf Jump__3CAiFR13CStateManager9EStateMsgf: -/* 800A285C 0009F7BC 4E 80 00 20 */ blr +/* 800A285C 0009F7BC 4E 80 00 20 */ blr .global TelegraphAttack__3CAiFR13CStateManager9EStateMsgf TelegraphAttack__3CAiFR13CStateManager9EStateMsgf: -/* 800A2860 0009F7C0 4E 80 00 20 */ blr +/* 800A2860 0009F7C0 4E 80 00 20 */ blr .global Hurled__3CAiFR13CStateManager9EStateMsgf Hurled__3CAiFR13CStateManager9EStateMsgf: -/* 800A2864 0009F7C4 4E 80 00 20 */ blr +/* 800A2864 0009F7C4 4E 80 00 20 */ blr .global Flinch__3CAiFR13CStateManager9EStateMsgf Flinch__3CAiFR13CStateManager9EStateMsgf: -/* 800A2868 0009F7C8 4E 80 00 20 */ blr +/* 800A2868 0009F7C8 4E 80 00 20 */ blr .global ProjectileAttack__3CAiFR13CStateManager9EStateMsgf ProjectileAttack__3CAiFR13CStateManager9EStateMsgf: -/* 800A286C 0009F7CC 4E 80 00 20 */ blr +/* 800A286C 0009F7CC 4E 80 00 20 */ blr .global Lurk__3CAiFR13CStateManager9EStateMsgf Lurk__3CAiFR13CStateManager9EStateMsgf: -/* 800A2870 0009F7D0 4E 80 00 20 */ blr +/* 800A2870 0009F7D0 4E 80 00 20 */ blr .global Flee__3CAiFR13CStateManager9EStateMsgf Flee__3CAiFR13CStateManager9EStateMsgf: -/* 800A2874 0009F7D4 4E 80 00 20 */ blr +/* 800A2874 0009F7D4 4E 80 00 20 */ blr .global Suck__3CAiFR13CStateManager9EStateMsgf Suck__3CAiFR13CStateManager9EStateMsgf: -/* 800A2878 0009F7D8 4E 80 00 20 */ blr +/* 800A2878 0009F7D8 4E 80 00 20 */ blr .global Taunt__3CAiFR13CStateManager9EStateMsgf Taunt__3CAiFR13CStateManager9EStateMsgf: -/* 800A287C 0009F7DC 4E 80 00 20 */ blr +/* 800A287C 0009F7DC 4E 80 00 20 */ blr .global GetUp__3CAiFR13CStateManager9EStateMsgf GetUp__3CAiFR13CStateManager9EStateMsgf: -/* 800A2880 0009F7E0 4E 80 00 20 */ blr +/* 800A2880 0009F7E0 4E 80 00 20 */ blr .global FadeOut__3CAiFR13CStateManager9EStateMsgf FadeOut__3CAiFR13CStateManager9EStateMsgf: -/* 800A2884 0009F7E4 4E 80 00 20 */ blr +/* 800A2884 0009F7E4 4E 80 00 20 */ blr .global FadeIn__3CAiFR13CStateManager9EStateMsgf FadeIn__3CAiFR13CStateManager9EStateMsgf: -/* 800A2888 0009F7E8 4E 80 00 20 */ blr +/* 800A2888 0009F7E8 4E 80 00 20 */ blr .global Crouch__3CAiFR13CStateManager9EStateMsgf Crouch__3CAiFR13CStateManager9EStateMsgf: -/* 800A288C 0009F7EC 4E 80 00 20 */ blr +/* 800A288C 0009F7EC 4E 80 00 20 */ blr .global CoverAttack__3CAiFR13CStateManager9EStateMsgf CoverAttack__3CAiFR13CStateManager9EStateMsgf: -/* 800A2890 0009F7F0 4E 80 00 20 */ blr +/* 800A2890 0009F7F0 4E 80 00 20 */ blr .global InActive__3CAiFR13CStateManager9EStateMsgf InActive__3CAiFR13CStateManager9EStateMsgf: -/* 800A2894 0009F7F4 4E 80 00 20 */ blr +/* 800A2894 0009F7F4 4E 80 00 20 */ blr .global Active__3CAiFR13CStateManager9EStateMsgf Active__3CAiFR13CStateManager9EStateMsgf: -/* 800A2898 0009F7F8 4E 80 00 20 */ blr +/* 800A2898 0009F7F8 4E 80 00 20 */ blr .global Skid__3CAiFR13CStateManager9EStateMsgf Skid__3CAiFR13CStateManager9EStateMsgf: -/* 800A289C 0009F7FC 4E 80 00 20 */ blr +/* 800A289C 0009F7FC 4E 80 00 20 */ blr .global TurnAround__3CAiFR13CStateManager9EStateMsgf TurnAround__3CAiFR13CStateManager9EStateMsgf: -/* 800A28A0 0009F800 4E 80 00 20 */ blr +/* 800A28A0 0009F800 4E 80 00 20 */ blr .global Shuffle__3CAiFR13CStateManager9EStateMsgf Shuffle__3CAiFR13CStateManager9EStateMsgf: -/* 800A28A4 0009F804 4E 80 00 20 */ blr +/* 800A28A4 0009F804 4E 80 00 20 */ blr .global DoubleSnap__3CAiFR13CStateManager9EStateMsgf DoubleSnap__3CAiFR13CStateManager9EStateMsgf: -/* 800A28A8 0009F808 4E 80 00 20 */ blr +/* 800A28A8 0009F808 4E 80 00 20 */ blr .global JumpBack__3CAiFR13CStateManager9EStateMsgf JumpBack__3CAiFR13CStateManager9EStateMsgf: -/* 800A28AC 0009F80C 4E 80 00 20 */ blr +/* 800A28AC 0009F80C 4E 80 00 20 */ blr .global LoopedAttack__3CAiFR13CStateManager9EStateMsgf LoopedAttack__3CAiFR13CStateManager9EStateMsgf: -/* 800A28B0 0009F810 4E 80 00 20 */ blr +/* 800A28B0 0009F810 4E 80 00 20 */ blr .global Attack__3CAiFR13CStateManager9EStateMsgf Attack__3CAiFR13CStateManager9EStateMsgf: -/* 800A28B4 0009F814 4E 80 00 20 */ blr +/* 800A28B4 0009F814 4E 80 00 20 */ blr .global Deactivate__3CAiFR13CStateManager9EStateMsgf Deactivate__3CAiFR13CStateManager9EStateMsgf: -/* 800A28B8 0009F818 4E 80 00 20 */ blr +/* 800A28B8 0009F818 4E 80 00 20 */ blr .global Generate__3CAiFR13CStateManager9EStateMsgf Generate__3CAiFR13CStateManager9EStateMsgf: -/* 800A28BC 0009F81C 4E 80 00 20 */ blr +/* 800A28BC 0009F81C 4E 80 00 20 */ blr .global Run__3CAiFR13CStateManager9EStateMsgf Run__3CAiFR13CStateManager9EStateMsgf: -/* 800A28C0 0009F820 4E 80 00 20 */ blr +/* 800A28C0 0009F820 4E 80 00 20 */ blr .global Walk__3CAiFR13CStateManager9EStateMsgf Walk__3CAiFR13CStateManager9EStateMsgf: -/* 800A28C4 0009F824 4E 80 00 20 */ blr +/* 800A28C4 0009F824 4E 80 00 20 */ blr .global Halt__3CAiFR13CStateManager9EStateMsgf Halt__3CAiFR13CStateManager9EStateMsgf: -/* 800A28C8 0009F828 4E 80 00 20 */ blr +/* 800A28C8 0009F828 4E 80 00 20 */ blr .global TargetCover__3CAiFR13CStateManager9EStateMsgf TargetCover__3CAiFR13CStateManager9EStateMsgf: -/* 800A28CC 0009F82C 4E 80 00 20 */ blr +/* 800A28CC 0009F82C 4E 80 00 20 */ blr .global TargetPlayer__3CAiFR13CStateManager9EStateMsgf TargetPlayer__3CAiFR13CStateManager9EStateMsgf: -/* 800A28D0 0009F830 4E 80 00 20 */ blr +/* 800A28D0 0009F830 4E 80 00 20 */ blr .global TargetPatrol__3CAiFR13CStateManager9EStateMsgf TargetPatrol__3CAiFR13CStateManager9EStateMsgf: -/* 800A28D4 0009F834 4E 80 00 20 */ blr +/* 800A28D4 0009F834 4E 80 00 20 */ blr .global SelectTarget__3CAiFR13CStateManager9EStateMsgf SelectTarget__3CAiFR13CStateManager9EStateMsgf: -/* 800A28D8 0009F838 4E 80 00 20 */ blr +/* 800A28D8 0009F838 4E 80 00 20 */ blr .global Start__3CAiFR13CStateManager9EStateMsgf Start__3CAiFR13CStateManager9EStateMsgf: -/* 800A28DC 0009F83C 4E 80 00 20 */ blr +/* 800A28DC 0009F83C 4E 80 00 20 */ blr .global PathFind__3CAiFR13CStateManager9EStateMsgf PathFind__3CAiFR13CStateManager9EStateMsgf: -/* 800A28E0 0009F840 4E 80 00 20 */ blr +/* 800A28E0 0009F840 4E 80 00 20 */ blr .global Dead__3CAiFR13CStateManager9EStateMsgf Dead__3CAiFR13CStateManager9EStateMsgf: -/* 800A28E4 0009F844 4E 80 00 20 */ blr +/* 800A28E4 0009F844 4E 80 00 20 */ blr .global FollowPattern__3CAiFR13CStateManager9EStateMsgf FollowPattern__3CAiFR13CStateManager9EStateMsgf: -/* 800A28E8 0009F848 4E 80 00 20 */ blr +/* 800A28E8 0009F848 4E 80 00 20 */ blr .global Patrol__3CAiFR13CStateManager9EStateMsgf Patrol__3CAiFR13CStateManager9EStateMsgf: -/* 800A28EC 0009F84C 4E 80 00 20 */ blr +/* 800A28EC 0009F84C 4E 80 00 20 */ blr .global GetCollisionResponseType__3CAiCFRC9CVector3fRC9CVector3fRC11CWeaponModei GetCollisionResponseType__3CAiCFRC9CVector3fRC9CVector3fRC11CWeaponModei: /* 800A28F0 0009F850 38 60 00 10 */ li r3, 0x10 -/* 800A28F4 0009F854 4E 80 00 20 */ blr +/* 800A28F4 0009F854 4E 80 00 20 */ blr .global GetStateMachine__3CAiFv GetStateMachine__3CAiFv: @@ -1680,7 +1680,7 @@ lbl_800A296C: /* 800A2970 0009F8D0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800A2974 0009F8D4 7C 08 03 A6 */ mtlr r0 /* 800A2978 0009F8D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A297C 0009F8DC 4E 80 00 20 */ blr +/* 800A297C 0009F8DC 4E 80 00 20 */ blr .global GetTriggerFunc__3CAiFPCc GetTriggerFunc__3CAiFPCc: @@ -1703,7 +1703,7 @@ GetTriggerFunc__3CAiFPCc: /* 800A29C0 0009F920 80 01 00 24 */ lwz r0, 0x24(r1) /* 800A29C4 0009F924 7C 08 03 A6 */ mtlr r0 /* 800A29C8 0009F928 38 21 00 20 */ addi r1, r1, 0x20 -/* 800A29CC 0009F92C 4E 80 00 20 */ blr +/* 800A29CC 0009F92C 4E 80 00 20 */ blr .global GetStateFunc__3CAiFPCc GetStateFunc__3CAiFPCc: @@ -1726,12 +1726,12 @@ GetStateFunc__3CAiFPCc: /* 800A2A10 0009F970 80 01 00 24 */ lwz r0, 0x24(r1) /* 800A2A14 0009F974 7C 08 03 A6 */ mtlr r0 /* 800A2A18 0009F978 38 21 00 20 */ addi r1, r1, 0x20 -/* 800A2A1C 0009F97C 4E 80 00 20 */ blr +/* 800A2A1C 0009F97C 4E 80 00 20 */ blr .global CreateFuncLookup__3CAiFP10CAiFuncMap CreateFuncLookup__3CAiFP10CAiFuncMap: /* 800A2A20 0009F980 90 6D A2 B8 */ stw r3, lbl_805A8E78@sda21(r13) -/* 800A2A24 0009F984 4E 80 00 20 */ blr +/* 800A2A24 0009F984 4E 80 00 20 */ blr .global FluidFXThink__3CAiFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager FluidFXThink__3CAiFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager: @@ -1831,7 +1831,7 @@ lbl_800A2B6C: /* 800A2B90 0009FAF0 7F E4 FB 78 */ mr r4, r31 /* 800A2B94 0009FAF4 81 8C 00 34 */ lwz r12, 0x34(r12) /* 800A2B98 0009FAF8 7D 89 03 A6 */ mtctr r12 -/* 800A2B9C 0009FAFC 4E 80 04 21 */ bctrl +/* 800A2B9C 0009FAFC 4E 80 04 21 */ bctrl /* 800A2BA0 0009FB00 C0 23 00 00 */ lfs f1, 0(r3) /* 800A2BA4 0009FB04 C0 02 8C 78 */ lfs f0, lbl_805AA998@sda21(r2) /* 800A2BA8 0009FB08 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -1889,7 +1889,7 @@ lbl_800A2BBC: /* 800A2C70 0009FBD0 81 83 00 00 */ lwz r12, 0(r3) /* 800A2C74 0009FBD4 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800A2C78 0009FBD8 7D 89 03 A6 */ mtctr r12 -/* 800A2C7C 0009FBDC 4E 80 04 21 */ bctrl +/* 800A2C7C 0009FBDC 4E 80 04 21 */ bctrl lbl_800A2C80: /* 800A2C80 0009FBE0 E3 E1 00 D8 */ psq_l f31, 216(r1), 0, qr0 /* 800A2C84 0009FBE4 80 01 00 E4 */ lwz r0, 0xe4(r1) @@ -1899,7 +1899,7 @@ lbl_800A2C80: /* 800A2C94 0009FBF4 83 A1 00 C4 */ lwz r29, 0xc4(r1) /* 800A2C98 0009FBF8 7C 08 03 A6 */ mtlr r0 /* 800A2C9C 0009FBFC 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 800A2CA0 0009FC00 4E 80 00 20 */ blr +/* 800A2CA0 0009FC00 4E 80 00 20 */ blr .global AcceptScriptMsg__3CAiF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__3CAiF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -1952,26 +1952,26 @@ lbl_800A2D34: /* 800A2D54 0009FCB4 80 01 00 54 */ lwz r0, 0x54(r1) /* 800A2D58 0009FCB8 7C 08 03 A6 */ mtlr r0 /* 800A2D5C 0009FCBC 38 21 00 50 */ addi r1, r1, 0x50 -/* 800A2D60 0009FCC0 4E 80 00 20 */ blr +/* 800A2D60 0009FCC0 4E 80 00 20 */ blr .global TakeDamage__3CAiFRC9CVector3ff TakeDamage__3CAiFRC9CVector3ff: -/* 800A2D64 0009FCC4 4E 80 00 20 */ blr +/* 800A2D64 0009FCC4 4E 80 00 20 */ blr .global GetDamageVulnerability__3CAiFv GetDamageVulnerability__3CAiFv: /* 800A2D68 0009FCC8 38 63 02 60 */ addi r3, r3, 0x260 -/* 800A2D6C 0009FCCC 4E 80 00 20 */ blr +/* 800A2D6C 0009FCCC 4E 80 00 20 */ blr .global GetDamageVulnerability__3CAiCFv GetDamageVulnerability__3CAiCFv: /* 800A2D70 0009FCD0 38 63 02 60 */ addi r3, r3, 0x260 -/* 800A2D74 0009FCD4 4E 80 00 20 */ blr +/* 800A2D74 0009FCD4 4E 80 00 20 */ blr .global HealthInfo__3CAiFR13CStateManager HealthInfo__3CAiFR13CStateManager: /* 800A2D78 0009FCD8 38 63 02 58 */ addi r3, r3, 0x258 -/* 800A2D7C 0009FCDC 4E 80 00 20 */ blr +/* 800A2D7C 0009FCDC 4E 80 00 20 */ blr .global __dt__3CAiFv __dt__3CAiFv: @@ -2008,7 +2008,7 @@ lbl_800A2DE4: /* 800A2DF0 0009FD50 83 C1 00 08 */ lwz r30, 8(r1) /* 800A2DF4 0009FD54 7C 08 03 A6 */ mtlr r0 /* 800A2DF8 0009FD58 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A2DFC 0009FD5C 4E 80 00 20 */ blr +/* 800A2DFC 0009FD5C 4E 80 00 20 */ blr .global "__ct__3CAiF9TUniqueIdbRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC6CAABoxfRC11CHealthInfoRC20CDamageVulnerabilityRC13CMaterialListUiRC16CActorParametersff" "__ct__3CAiF9TUniqueIdbRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC6CAABoxfRC11CHealthInfoRC20CDamageVulnerabilityRC13CMaterialListUiRC16CActorParametersff": @@ -2169,7 +2169,7 @@ lbl_800A2DE4: /* 800A3068 0009FFC8 81 84 00 00 */ lwz r12, 0(r4) /* 800A306C 0009FFCC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800A3070 0009FFD0 7D 89 03 A6 */ mtctr r12 -/* 800A3074 0009FFD4 4E 80 04 21 */ bctrl +/* 800A3074 0009FFD4 4E 80 04 21 */ bctrl /* 800A3078 0009FFD8 3A 3F 02 C8 */ addi r17, r31, 0x2c8 /* 800A307C 0009FFDC 38 81 00 1C */ addi r4, r1, 0x1c /* 800A3080 0009FFE0 7E 23 8B 78 */ mr r3, r17 @@ -2212,7 +2212,7 @@ lbl_800A30EC: /* 800A310C 000A006C 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 800A3110 000A0070 7C 08 03 A6 */ mtlr r0 /* 800A3114 000A0074 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 800A3118 000A0078 4E 80 00 20 */ blr +/* 800A3118 000A0078 4E 80 00 20 */ blr .global GetTriggerFunc__10CAiFuncMapCFPCc GetTriggerFunc__10CAiFuncMapCFPCc: @@ -2272,7 +2272,7 @@ lbl_800A31C4: /* 800A31E8 000A0148 80 01 00 44 */ lwz r0, 0x44(r1) /* 800A31EC 000A014C 7C 08 03 A6 */ mtlr r0 /* 800A31F0 000A0150 38 21 00 40 */ addi r1, r1, 0x40 -/* 800A31F4 000A0154 4E 80 00 20 */ blr +/* 800A31F4 000A0154 4E 80 00 20 */ blr .global GetStateFunc__10CAiFuncMapCFPCc GetStateFunc__10CAiFuncMapCFPCc: @@ -2355,7 +2355,7 @@ lbl_800A32F8: /* 800A331C 000A027C 80 01 00 54 */ lwz r0, 0x54(r1) /* 800A3320 000A0280 7C 08 03 A6 */ mtlr r0 /* 800A3324 000A0284 38 21 00 50 */ addi r1, r1, 0x50 -/* 800A3328 000A0288 4E 80 00 20 */ blr +/* 800A3328 000A0288 4E 80 00 20 */ blr .global __ct__10CAiFuncMapFv __ct__10CAiFuncMapFv: @@ -2513,7 +2513,7 @@ lbl_800A34BC: /* 800A3560 000A04C0 80 01 00 84 */ lwz r0, 0x84(r1) /* 800A3564 000A04C4 7C 08 03 A6 */ mtlr r0 /* 800A3568 000A04C8 38 21 00 80 */ addi r1, r1, 0x80 -/* 800A356C 000A04CC 4E 80 00 20 */ blr +/* 800A356C 000A04CC 4E 80 00 20 */ blr .global "sort,Q24rstl94vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,Q24rstl111pair_sorter_finder,Q217@unnamed@CAi_cpp@9cstr_less>>__4rstlFQ24rstl208pointer_iterator,Q24rstl94vector,Q24rstl94vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,Q24rstl111pair_sorter_finder,Q217@unnamed@CAi_cpp@9cstr_less>>__4rstlFQ24rstl208pointer_iterator,Q24rstl94vector,Q24rstl84vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,Q24rstl101pair_sorter_finder,Q217@unnamed@CAi_cpp@9cstr_less>>__4rstlFQ24rstl188pointer_iterator,Q24rstl84vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemor" "sort,Q24rstl84vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,Q24rstl101pair_sorter_finder,Q217@unnamed@CAi_cpp@9cstr_less>>__4rstlFQ24rstl188pointer_iterator,Q24rstl84vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemor": @@ -2791,7 +2791,7 @@ lbl_800A3958: /* 800A3968 000A08C8 83 81 00 50 */ lwz r28, 0x50(r1) /* 800A396C 000A08CC 7C 08 03 A6 */ mtlr r0 /* 800A3970 000A08D0 38 21 00 60 */ addi r1, r1, 0x60 -/* 800A3974 000A08D4 4E 80 00 20 */ blr +/* 800A3974 000A08D4 4E 80 00 20 */ blr .global "lower_bound,Q24rstl94vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,PCc,Q24rstl111pair_sorter_finder,Q217@unnamed@CAi_cpp@9cstr_less>>__4rstlFQ24rstl214const_pointer_iterator,Q24rstl94vector,Q24rstl94vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,PCc,Q24rstl111pair_sorter_finder,Q217@unnamed@CAi_cpp@9cstr_less>>__4rstlFQ24rstl214const_pointer_iterator,Q24rstl94vector,Q24rstl84vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,PCc,Q24rstl101pair_sorter_finder,Q217@unnamed@CAi_cpp@9cstr_less>>__4rstlFQ24rstl194const_pointer_iterator,Q24rstl84vector,Q24rstl17rmemory_all" "lower_bound,Q24rstl84vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,PCc,Q24rstl101pair_sorter_finder,Q217@unnamed@CAi_cpp@9cstr_less>>__4rstlFQ24rstl194const_pointer_iterator,Q24rstl84vector,Q24rstl17rmemory_all": @@ -2903,7 +2903,7 @@ lbl_800A3AE4: /* 800A3AF8 000A0A58 80 01 00 34 */ lwz r0, 0x34(r1) /* 800A3AFC 000A0A5C 7C 08 03 A6 */ mtlr r0 /* 800A3B00 000A0A60 38 21 00 30 */ addi r1, r1, 0x30 -/* 800A3B04 000A0A64 4E 80 00 20 */ blr +/* 800A3B04 000A0A64 4E 80 00 20 */ blr .global "reserve__Q24rstl94vector,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl94vector,Q24rstl17rmemory_allocator>Fi": @@ -2981,7 +2981,7 @@ lbl_800A3BF4: /* 800A3C00 000A0B60 83 A1 00 24 */ lwz r29, 0x24(r1) /* 800A3C04 000A0B64 7C 08 03 A6 */ mtlr r0 /* 800A3C08 000A0B68 38 21 00 30 */ addi r1, r1, 0x30 -/* 800A3C0C 000A0B6C 4E 80 00 20 */ blr +/* 800A3C0C 000A0B6C 4E 80 00 20 */ blr .global "reserve__Q24rstl84vector,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl84vector,Q24rstl17rmemory_allocator>Fi": @@ -3059,7 +3059,7 @@ lbl_800A3CFC: /* 800A3D08 000A0C68 83 A1 00 24 */ lwz r29, 0x24(r1) /* 800A3D0C 000A0C6C 7C 08 03 A6 */ mtlr r0 /* 800A3D10 000A0C70 38 21 00 30 */ addi r1, r1, 0x30 -/* 800A3D14 000A0C74 4E 80 00 20 */ blr +/* 800A3D14 000A0C74 4E 80 00 20 */ blr .global "advance,Q24rstl94vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,i>__4rstlFRQ24rstl214const_pointer_iterator,Q24rstl94vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>i" "advance,Q24rstl94vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,i>__4rstlFRQ24rstl214const_pointer_iterator,Q24rstl94vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>i": @@ -3073,7 +3073,7 @@ lbl_800A3CFC: /* 800A3D34 000A0C94 80 01 00 14 */ lwz r0, 0x14(r1) /* 800A3D38 000A0C98 7C 08 03 A6 */ mtlr r0 /* 800A3D3C 000A0C9C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A3D40 000A0CA0 4E 80 00 20 */ blr +/* 800A3D40 000A0CA0 4E 80 00 20 */ blr .global "advance,Q24rstl84vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,i>__4rstlFRQ24rstl194const_pointer_iterator,Q24rstl84vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>i" "advance,Q24rstl84vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,i>__4rstlFRQ24rstl194const_pointer_iterator,Q24rstl84vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>i": @@ -3087,7 +3087,7 @@ lbl_800A3CFC: /* 800A3D60 000A0CC0 80 01 00 14 */ lwz r0, 0x14(r1) /* 800A3D64 000A0CC4 7C 08 03 A6 */ mtlr r0 /* 800A3D68 000A0CC8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A3D6C 000A0CCC 4E 80 00 20 */ blr +/* 800A3D6C 000A0CCC 4E 80 00 20 */ blr .global "__advance,Q24rstl84vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,i>__4rstlFRQ24rstl194const_pointer_iterator,Q24rstl84vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>iQ24rstl26random_access_iterator_tag" "__advance,Q24rstl84vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,i>__4rstlFRQ24rstl194const_pointer_iterator,Q24rstl84vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>iQ24rstl26random_access_iterator_tag": @@ -3095,7 +3095,7 @@ lbl_800A3CFC: /* 800A3D74 000A0CD4 54 80 20 36 */ slwi r0, r4, 4 /* 800A3D78 000A0CD8 7C 05 02 14 */ add r0, r5, r0 /* 800A3D7C 000A0CDC 90 03 00 00 */ stw r0, 0(r3) -/* 800A3D80 000A0CE0 4E 80 00 20 */ blr +/* 800A3D80 000A0CE0 4E 80 00 20 */ blr .global "__advance,Q24rstl94vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,i>__4rstlFRQ24rstl214const_pointer_iterator,Q24rstl94vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>iQ24rstl26random_access_iterator_tag" "__advance,Q24rstl94vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,i>__4rstlFRQ24rstl214const_pointer_iterator,Q24rstl94vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>iQ24rstl26random_access_iterator_tag": @@ -3103,7 +3103,7 @@ lbl_800A3CFC: /* 800A3D88 000A0CE8 54 80 20 36 */ slwi r0, r4, 4 /* 800A3D8C 000A0CEC 7C 05 02 14 */ add r0, r5, r0 /* 800A3D90 000A0CF0 90 03 00 00 */ stw r0, 0(r3) -/* 800A3D94 000A0CF4 4E 80 00 20 */ blr +/* 800A3D94 000A0CF4 4E 80 00 20 */ blr .global "distance,Q24rstl94vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl214const_pointer_iterator,Q24rstl94vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl214const_pointer_iterator,Q24rstl94vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl214const_pointer_iterator,Q24rstl94vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl214const_pointer_iterator,Q24rstl84vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl194const_pointer_iterator,Q24rstl84vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl194const_pointer_iterator,Q" "distance,Q24rstl84vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl194const_pointer_iterator,Q24rstl84vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl194const_pointer_iterator,Q": @@ -3143,7 +3143,7 @@ lbl_800A3CFC: /* 800A3E10 000A0D70 80 01 00 24 */ lwz r0, 0x24(r1) /* 800A3E14 000A0D74 7C 08 03 A6 */ mtlr r0 /* 800A3E18 000A0D78 38 21 00 20 */ addi r1, r1, 0x20 -/* 800A3E1C 000A0D7C 4E 80 00 20 */ blr +/* 800A3E1C 000A0D7C 4E 80 00 20 */ blr .global "__distance,Q24rstl94vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl214const_pointer_iterator,Q24rstl94vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl214const_pointer_iterator,Q24rstl94vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl214const_pointer_iterator,Q24rstl94vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl214const_pointer_iterator,Q24rstl84vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl194const_pointer_iterator,Q24rstl84vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl194const_pointer_iterator" "__distance,Q24rstl84vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl194const_pointer_iterator,Q24rstl84vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl194const_pointer_iterator": @@ -3161,7 +3161,7 @@ lbl_800A3CFC: /* 800A3E40 000A0DA0 7C 03 00 50 */ subf r0, r3, r0 /* 800A3E44 000A0DA4 7C 00 26 70 */ srawi r0, r0, 4 /* 800A3E48 000A0DA8 7C 60 01 94 */ addze r3, r0 -/* 800A3E4C 000A0DAC 4E 80 00 20 */ blr +/* 800A3E4C 000A0DAC 4E 80 00 20 */ blr .global "__sort3,Q24rstl101pair_sorter_finder,Q217@unnamed@CAi_cpp@9cstr_less>>__4rstlFRQ24rstl40pairRQ24rstl40pairRQ24rstl40pairQ24rstl101pair_sorter_finder,Q217@unnamed@CAi_cpp@9cstr_less>" "__sort3,Q24rstl101pair_sorter_finder,Q217@unnamed@CAi_cpp@9cstr_less>>__4rstlFRQ24rstl40pairRQ24rstl40pairRQ24rstl40pairQ24rstl101pair_sorter_finder,Q217@unnamed@CAi_cpp@9cstr_less>": @@ -3257,7 +3257,7 @@ lbl_800A3F98: /* 800A3FA8 000A0F08 83 81 00 30 */ lwz r28, 0x30(r1) /* 800A3FAC 000A0F0C 7C 08 03 A6 */ mtlr r0 /* 800A3FB0 000A0F10 38 21 00 40 */ addi r1, r1, 0x40 -/* 800A3FB4 000A0F14 4E 80 00 20 */ blr +/* 800A3FB4 000A0F14 4E 80 00 20 */ blr .global "__sort3,Q24rstl111pair_sorter_finder,Q217@unnamed@CAi_cpp@9cstr_less>>__4rstlFRQ24rstl50pairRQ24rstl50pairRQ24rstl50pairQ24rstl111pair_sorter_finder,Q217@unnamed@CAi_cpp@9cstr_less>" "__sort3,Q24rstl111pair_sorter_finder,Q217@unnamed@CAi_cpp@9cstr_less>>__4rstlFRQ24rstl50pairRQ24rstl50pairRQ24rstl50pairQ24rstl111pair_sorter_finder,Q217@unnamed@CAi_cpp@9cstr_less>": @@ -3353,7 +3353,7 @@ lbl_800A4100: /* 800A4110 000A1070 83 81 00 30 */ lwz r28, 0x30(r1) /* 800A4114 000A1074 7C 08 03 A6 */ mtlr r0 /* 800A4118 000A1078 38 21 00 40 */ addi r1, r1, 0x40 -/* 800A411C 000A107C 4E 80 00 20 */ blr +/* 800A411C 000A107C 4E 80 00 20 */ blr .global "__insertion_sort,Q24rstl84vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,Q24rstl101pair_sorter_finder,Q217@unnamed@CAi_cpp@9cstr_less>>__4rstlFQ24rstl188pointer_iterator,Q24rstl84vector,Q24rstl17rmemory_allocator>,Q24" "__insertion_sort,Q24rstl84vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,Q24rstl101pair_sorter_finder,Q217@unnamed@CAi_cpp@9cstr_less>>__4rstlFQ24rstl188pointer_iterator,Q24rstl84vector,Q24rstl17rmemory_allocator>,Q24": @@ -3414,7 +3414,7 @@ lbl_800A41D4: /* 800A41E4 000A1144 80 01 00 34 */ lwz r0, 0x34(r1) /* 800A41E8 000A1148 7C 08 03 A6 */ mtlr r0 /* 800A41EC 000A114C 38 21 00 30 */ addi r1, r1, 0x30 -/* 800A41F0 000A1150 4E 80 00 20 */ blr +/* 800A41F0 000A1150 4E 80 00 20 */ blr .global "__insertion_sort,Q24rstl94vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,Q24rstl111pair_sorter_finder,Q217@unnamed@CAi_cpp@9cstr_less>>__4rstlFQ24rstl208pointer_iterator,Q24rstl94vector,Q24rstl94vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,Q24rstl111pair_sorter_finder,Q217@unnamed@CAi_cpp@9cstr_less>>__4rstlFQ24rstl208pointer_iterator,Q24rstl94vector,Q24rstl17rmemory_allocator>Fv" /* 8025144C 0024E3AC 48 00 00 1C */ b lbl_80251468 @@ -890,7 +890,7 @@ lbl_80251450: /* 80251458 0024E3B8 38 A0 00 00 */ li r5, 0 /* 8025145C 0024E3BC 81 8C 00 74 */ lwz r12, 0x74(r12) /* 80251460 0024E3C0 7D 89 03 A6 */ mtctr r12 -/* 80251464 0024E3C4 4E 80 04 21 */ bctrl +/* 80251464 0024E3C4 4E 80 04 21 */ bctrl lbl_80251468: /* 80251468 0024E3C8 3B 9C 00 01 */ addi r28, r28, 1 /* 8025146C 0024E3CC 3B BD 00 02 */ addi r29, r29, 2 @@ -903,7 +903,7 @@ lbl_80251480: /* 80251484 0024E3E4 80 01 01 D4 */ lwz r0, 0x1d4(r1) /* 80251488 0024E3E8 7C 08 03 A6 */ mtlr r0 /* 8025148C 0024E3EC 38 21 01 D0 */ addi r1, r1, 0x1d0 -/* 80251490 0024E3F0 4E 80 00 20 */ blr +/* 80251490 0024E3F0 4E 80 00 20 */ blr .global sub_80251494 sub_80251494: @@ -1002,7 +1002,7 @@ lbl_802515BC: /* 802515F8 0024E558 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 802515FC 0024E55C 7C 08 03 A6 */ mtlr r0 /* 80251600 0024E560 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 80251604 0024E564 4E 80 00 20 */ blr +/* 80251604 0024E564 4E 80 00 20 */ blr .global AcceptScriptMsg__11CAtomicBetaF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__11CAtomicBetaF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -1067,7 +1067,7 @@ lbl_802516B0: /* 802516DC 0024E63C 83 81 00 10 */ lwz r28, 0x10(r1) /* 802516E0 0024E640 7C 08 03 A6 */ mtlr r0 /* 802516E4 0024E644 38 21 00 20 */ addi r1, r1, 0x20 -/* 802516E8 0024E648 4E 80 00 20 */ blr +/* 802516E8 0024E648 4E 80 00 20 */ blr .global Accept__11CAtomicBetaFR8IVisitor Accept__11CAtomicBetaFR8IVisitor: @@ -1080,11 +1080,11 @@ Accept__11CAtomicBetaFR8IVisitor: /* 80251704 0024E664 7C 04 03 78 */ mr r4, r0 /* 80251708 0024E668 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 8025170C 0024E66C 7D 89 03 A6 */ mtctr r12 -/* 80251710 0024E670 4E 80 04 21 */ bctrl +/* 80251710 0024E670 4E 80 04 21 */ bctrl /* 80251714 0024E674 80 01 00 14 */ lwz r0, 0x14(r1) /* 80251718 0024E678 7C 08 03 A6 */ mtlr r0 /* 8025171C 0024E67C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80251720 0024E680 4E 80 00 20 */ blr +/* 80251720 0024E680 4E 80 00 20 */ blr .global __dt__11CAtomicBetaFv __dt__11CAtomicBetaFv: @@ -1161,7 +1161,7 @@ lbl_80251810: /* 8025181C 0024E77C 83 C1 00 08 */ lwz r30, 8(r1) /* 80251820 0024E780 7C 08 03 A6 */ mtlr r0 /* 80251824 0024E784 38 21 00 10 */ addi r1, r1, 0x10 -/* 80251828 0024E788 4E 80 00 20 */ blr +/* 80251828 0024E788 4E 80 00 20 */ blr .global __ct__11CAtomicBeta __ct__11CAtomicBeta: @@ -1301,7 +1301,7 @@ __ct__11CAtomicBeta: /* 80251A40 0024E9A0 81 84 00 00 */ lwz r12, 0(r4) /* 80251A44 0024E9A4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80251A48 0024E9A8 7D 89 03 A6 */ mtctr r12 -/* 80251A4C 0024E9AC 4E 80 04 21 */ bctrl +/* 80251A4C 0024E9AC 4E 80 04 21 */ bctrl /* 80251A50 0024E9B0 38 76 06 00 */ addi r3, r22, 0x600 /* 80251A54 0024E9B4 38 81 00 34 */ addi r4, r1, 0x34 /* 80251A58 0024E9B8 48 0E F4 51 */ bl __ct__6CTokenFRC6CToken @@ -1318,7 +1318,7 @@ __ct__11CAtomicBeta: /* 80251A84 0024E9E4 81 84 00 00 */ lwz r12, 0(r4) /* 80251A88 0024E9E8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80251A8C 0024E9EC 7D 89 03 A6 */ mtctr r12 -/* 80251A90 0024E9F0 4E 80 04 21 */ bctrl +/* 80251A90 0024E9F0 4E 80 04 21 */ bctrl /* 80251A94 0024E9F4 38 76 06 08 */ addi r3, r22, 0x608 /* 80251A98 0024E9F8 38 81 00 24 */ addi r4, r1, 0x24 /* 80251A9C 0024E9FC 48 0E F4 0D */ bl __ct__6CTokenFRC6CToken @@ -1389,4 +1389,4 @@ __ct__11CAtomicBeta: /* 80251BA0 0024EB00 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 80251BA4 0024EB04 7C 08 03 A6 */ mtlr r0 /* 80251BA8 0024EB08 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 80251BAC 0024EB0C 4E 80 00 20 */ blr +/* 80251BAC 0024EB0C 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/Enemies/CBabygoth.s b/asm/MetroidPrime/Enemies/CBabygoth.s index 580703c6..4487fd28 100644 --- a/asm/MetroidPrime/Enemies/CBabygoth.s +++ b/asm/MetroidPrime/Enemies/CBabygoth.s @@ -313,27 +313,27 @@ sub_8021d43c: /* 8021D440 0021A3A0 2C 00 00 00 */ cmpwi r0, 0 /* 8021D444 0021A3A4 40 82 00 0C */ bne lbl_8021D450 /* 8021D448 0021A3A8 38 63 06 EC */ addi r3, r3, 0x6ec -/* 8021D44C 0021A3AC 4E 80 00 20 */ blr +/* 8021D44C 0021A3AC 4E 80 00 20 */ blr lbl_8021D450: /* 8021D450 0021A3B0 38 63 07 D0 */ addi r3, r3, 0x7d0 -/* 8021D454 0021A3B4 4E 80 00 20 */ blr +/* 8021D454 0021A3B4 4E 80 00 20 */ blr .global IsListening__9CBabygothCFv IsListening__9CBabygothCFv: /* 8021D458 0021A3B8 38 60 00 01 */ li r3, 1 -/* 8021D45C 0021A3BC 4E 80 00 20 */ blr +/* 8021D45C 0021A3BC 4E 80 00 20 */ blr .global GetCollisionPrimitive__9CBabygothCFv GetCollisionPrimitive__9CBabygothCFv: /* 8021D460 0021A3C0 38 63 09 30 */ addi r3, r3, 0x930 -/* 8021D464 0021A3C4 4E 80 00 20 */ blr +/* 8021D464 0021A3C4 4E 80 00 20 */ blr .global GetGravityConstant__9CBabygothCFv GetGravityConstant__9CBabygothCFv: /* 8021D468 0021A3C8 C0 22 B4 00 */ lfs f1, lbl_805AD120@sda21(r2) /* 8021D46C 0021A3CC C0 02 96 A0 */ lfs f0, lbl_805AB3C0@sda21(r2) /* 8021D470 0021A3D0 EC 21 00 32 */ fmuls f1, f1, f0 -/* 8021D474 0021A3D4 4E 80 00 20 */ blr +/* 8021D474 0021A3D4 4E 80 00 20 */ blr .global sub_8021d478 sub_8021d478: @@ -412,7 +412,7 @@ lbl_8021D584: /* 8021D594 0021A4F4 83 81 00 60 */ lwz r28, 0x60(r1) /* 8021D598 0021A4F8 7C 08 03 A6 */ mtlr r0 /* 8021D59C 0021A4FC 38 21 00 70 */ addi r1, r1, 0x70 -/* 8021D5A0 0021A500 4E 80 00 20 */ blr +/* 8021D5A0 0021A500 4E 80 00 20 */ blr .global sub_8021d5a4 sub_8021d5a4: @@ -458,7 +458,7 @@ lbl_8021D618: /* 8021D634 0021A594 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8021D638 0021A598 7C 08 03 A6 */ mtlr r0 /* 8021D63C 0021A59C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8021D640 0021A5A0 4E 80 00 20 */ blr +/* 8021D640 0021A5A0 4E 80 00 20 */ blr .global sub_8021d644 sub_8021d644: @@ -503,7 +503,7 @@ lbl_8021D6D0: /* 8021D6D8 0021A638 83 C1 00 28 */ lwz r30, 0x28(r1) /* 8021D6DC 0021A63C 7C 08 03 A6 */ mtlr r0 /* 8021D6E0 0021A640 38 21 00 30 */ addi r1, r1, 0x30 -/* 8021D6E4 0021A644 4E 80 00 20 */ blr +/* 8021D6E4 0021A644 4E 80 00 20 */ blr .global sub_8021d6e8 sub_8021d6e8: @@ -548,7 +548,7 @@ lbl_8021D774: /* 8021D77C 0021A6DC 83 C1 00 28 */ lwz r30, 0x28(r1) /* 8021D780 0021A6E0 7C 08 03 A6 */ mtlr r0 /* 8021D784 0021A6E4 38 21 00 30 */ addi r1, r1, 0x30 -/* 8021D788 0021A6E8 4E 80 00 20 */ blr +/* 8021D788 0021A6E8 4E 80 00 20 */ blr .global sub_8021d78c sub_8021d78c: @@ -562,27 +562,27 @@ sub_8021d78c: .global sub_8021d7a8 sub_8021d7a8: -/* 8021D7A8 0021A708 4E 80 00 20 */ blr +/* 8021D7A8 0021A708 4E 80 00 20 */ blr lbl_8021D7AC: /* 8021D7AC 0021A70C 2C 04 00 04 */ cmpwi r4, 4 -/* 8021D7B0 0021A710 4C 80 00 20 */ bgelr +/* 8021D7B0 0021A710 4C 80 00 20 */ bgelr .global sub_8021d7b4 sub_8021d7b4: -/* 8021D7B4 0021A714 4E 80 00 20 */ blr +/* 8021D7B4 0021A714 4E 80 00 20 */ blr lbl_8021D7B8: /* 8021D7B8 0021A718 C0 23 06 B0 */ lfs f1, 0x6b0(r3) -/* 8021D7BC 0021A71C 4E 80 00 20 */ blr +/* 8021D7BC 0021A71C 4E 80 00 20 */ blr lbl_8021D7C0: /* 8021D7C0 0021A720 C0 22 B4 08 */ lfs f1, lbl_805AD128@sda21(r2) /* 8021D7C4 0021A724 C0 03 06 B0 */ lfs f0, 0x6b0(r3) /* 8021D7C8 0021A728 EC 21 00 32 */ fmuls f1, f1, f0 -/* 8021D7CC 0021A72C 4E 80 00 20 */ blr +/* 8021D7CC 0021A72C 4E 80 00 20 */ blr lbl_8021D7D0: /* 8021D7D0 0021A730 C0 22 B4 0C */ lfs f1, lbl_805AD12C@sda21(r2) /* 8021D7D4 0021A734 C0 03 06 B0 */ lfs f0, 0x6b0(r3) /* 8021D7D8 0021A738 EC 21 00 32 */ fmuls f1, f1, f0 -/* 8021D7DC 0021A73C 4E 80 00 20 */ blr +/* 8021D7DC 0021A73C 4E 80 00 20 */ blr .global sub_8021d7e0 sub_8021d7e0: @@ -716,7 +716,7 @@ lbl_8021D9BC: /* 8021D9C0 0021A920 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 8021D9C4 0021A924 7C 08 03 A6 */ mtlr r0 /* 8021D9C8 0021A928 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 8021D9CC 0021A92C 4E 80 00 20 */ blr +/* 8021D9CC 0021A92C 4E 80 00 20 */ blr .global sub_8021d9d0 sub_8021d9d0: @@ -761,7 +761,7 @@ lbl_8021DA3C: /* 8021DA5C 0021A9BC 80 01 00 34 */ lwz r0, 0x34(r1) /* 8021DA60 0021A9C0 7C 08 03 A6 */ mtlr r0 /* 8021DA64 0021A9C4 38 21 00 30 */ addi r1, r1, 0x30 -/* 8021DA68 0021A9C8 4E 80 00 20 */ blr +/* 8021DA68 0021A9C8 4E 80 00 20 */ blr .global sub_8021da6c sub_8021da6c: @@ -806,7 +806,7 @@ lbl_8021DAE4: /* 8021DAF4 0021AA54 83 C1 00 08 */ lwz r30, 8(r1) /* 8021DAF8 0021AA58 7C 08 03 A6 */ mtlr r0 /* 8021DAFC 0021AA5C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8021DB00 0021AA60 4E 80 00 20 */ blr +/* 8021DB00 0021AA60 4E 80 00 20 */ blr .global sub_8021db04 sub_8021db04: @@ -849,7 +849,7 @@ lbl_8021DB84: /* 8021DB90 0021AAF0 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8021DB94 0021AAF4 7C 08 03 A6 */ mtlr r0 /* 8021DB98 0021AAF8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8021DB9C 0021AAFC 4E 80 00 20 */ blr +/* 8021DB9C 0021AAFC 4E 80 00 20 */ blr .global sub_8021dba0 sub_8021dba0: @@ -960,7 +960,7 @@ lbl_8021DCC0: /* 8021DD38 0021AC98 81 9F 00 00 */ lwz r12, 0(r31) /* 8021DD3C 0021AC9C 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 8021DD40 0021ACA0 7D 89 03 A6 */ mtctr r12 -/* 8021DD44 0021ACA4 4E 80 04 21 */ bctrl +/* 8021DD44 0021ACA4 4E 80 04 21 */ bctrl /* 8021DD48 0021ACA8 28 03 00 00 */ cmplwi r3, 0 /* 8021DD4C 0021ACAC 41 82 00 4C */ beq lbl_8021DD98 /* 8021DD50 0021ACB0 7F E3 FB 78 */ mr r3, r31 @@ -969,7 +969,7 @@ lbl_8021DCC0: /* 8021DD5C 0021ACBC C0 22 B4 04 */ lfs f1, lbl_805AD124@sda21(r2) /* 8021DD60 0021ACC0 81 8C 01 90 */ lwz r12, 0x190(r12) /* 8021DD64 0021ACC4 7D 89 03 A6 */ mtctr r12 -/* 8021DD68 0021ACC8 4E 80 04 21 */ bctrl +/* 8021DD68 0021ACC8 4E 80 04 21 */ bctrl /* 8021DD6C 0021ACCC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8021DD70 0021ACD0 40 82 00 28 */ bne lbl_8021DD98 /* 8021DD74 0021ACD4 FC 20 F8 90 */ fmr f1, f31 @@ -1014,7 +1014,7 @@ lbl_8021DDE8: /* 8021DDF8 0021AD58 83 C1 00 88 */ lwz r30, 0x88(r1) /* 8021DDFC 0021AD5C 7C 08 03 A6 */ mtlr r0 /* 8021DE00 0021AD60 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8021DE04 0021AD64 4E 80 00 20 */ blr +/* 8021DE04 0021AD64 4E 80 00 20 */ blr .global sub_8021de08 sub_8021de08: @@ -1110,7 +1110,7 @@ lbl_8021DF3C: /* 8021DF54 0021AEB4 83 81 00 50 */ lwz r28, 0x50(r1) /* 8021DF58 0021AEB8 7C 08 03 A6 */ mtlr r0 /* 8021DF5C 0021AEBC 38 21 00 60 */ addi r1, r1, 0x60 -/* 8021DF60 0021AEC0 4E 80 00 20 */ blr +/* 8021DF60 0021AEC0 4E 80 00 20 */ blr .global sub_8021df64 sub_8021df64: @@ -1178,7 +1178,7 @@ lbl_8021E038: /* 8021E044 0021AFA4 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8021E048 0021AFA8 7C 08 03 A6 */ mtlr r0 /* 8021E04C 0021AFAC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8021E050 0021AFB0 4E 80 00 20 */ blr +/* 8021E050 0021AFB0 4E 80 00 20 */ blr .global GetCollisionResponseType__9CBabygothCFRC9CVector3fRC9CVector3fRC11CWeaponModei GetCollisionResponseType__9CBabygothCFRC9CVector3fRC9CVector3fRC11CWeaponModei: @@ -1202,12 +1202,12 @@ lbl_8021E08C: /* 8021E08C 0021AFEC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8021E090 0021AFF0 7C 08 03 A6 */ mtlr r0 /* 8021E094 0021AFF4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8021E098 0021AFF8 4E 80 00 20 */ blr +/* 8021E098 0021AFF8 4E 80 00 20 */ blr .global sub_8021e09c sub_8021e09c: /* 8021E09C 0021AFFC 90 83 08 B4 */ stw r4, 0x8b4(r3) -/* 8021E0A0 0021B000 4E 80 00 20 */ blr +/* 8021E0A0 0021B000 4E 80 00 20 */ blr .global sub_8021e0a4 sub_8021e0a4: @@ -1258,7 +1258,7 @@ lbl_8021E140: /* 8021E150 0021B0B0 83 A1 00 8C */ lwz r29, 0x8c(r1) /* 8021E154 0021B0B4 7C 08 03 A6 */ mtlr r0 /* 8021E158 0021B0B8 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8021E15C 0021B0BC 4E 80 00 20 */ blr +/* 8021E15C 0021B0BC 4E 80 00 20 */ blr .global sub_8021e160 sub_8021e160: @@ -1353,7 +1353,7 @@ lbl_8021E2B0: /* 8021E2B4 0021B214 80 01 00 94 */ lwz r0, 0x94(r1) /* 8021E2B8 0021B218 7C 08 03 A6 */ mtlr r0 /* 8021E2BC 0021B21C 38 21 00 90 */ addi r1, r1, 0x90 -/* 8021E2C0 0021B220 4E 80 00 20 */ blr +/* 8021E2C0 0021B220 4E 80 00 20 */ blr .global sub_8021e2c4 sub_8021e2c4: @@ -1389,10 +1389,10 @@ lbl_8021E324: /* 8021E324 0021B284 C0 43 08 E8 */ lfs f2, 0x8e8(r3) /* 8021E328 0021B288 C0 03 06 D8 */ lfs f0, 0x6d8(r3) /* 8021E32C 0021B28C FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8021E330 0021B290 4C 80 00 20 */ bgelr +/* 8021E330 0021B290 4C 80 00 20 */ bgelr /* 8021E334 0021B294 EC 02 08 2A */ fadds f0, f2, f1 /* 8021E338 0021B298 D0 03 08 E8 */ stfs f0, 0x8e8(r3) -/* 8021E33C 0021B29C 4E 80 00 20 */ blr +/* 8021E33C 0021B29C 4E 80 00 20 */ blr .global sub_8021e340 sub_8021e340: @@ -1442,7 +1442,7 @@ lbl_8021E38C: /* 8021E3E4 0021B344 83 C1 00 08 */ lwz r30, 8(r1) /* 8021E3E8 0021B348 7C 08 03 A6 */ mtlr r0 /* 8021E3EC 0021B34C 38 21 00 40 */ addi r1, r1, 0x40 -/* 8021E3F0 0021B350 4E 80 00 20 */ blr +/* 8021E3F0 0021B350 4E 80 00 20 */ blr .global sub_8021e3f4 sub_8021e3f4: @@ -1477,7 +1477,7 @@ sub_8021e3f4: /* 8021E464 0021B3C4 7F C4 F3 78 */ mr r4, r30 /* 8021E468 0021B3C8 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8021E46C 0021B3CC 7D 89 03 A6 */ mtctr r12 -/* 8021E470 0021B3D0 4E 80 04 21 */ bctrl +/* 8021E470 0021B3D0 4E 80 04 21 */ bctrl /* 8021E474 0021B3D4 C0 03 00 00 */ lfs f0, 0(r3) /* 8021E478 0021B3D8 38 61 00 20 */ addi r3, r1, 0x20 /* 8021E47C 0021B3DC C0 3D 06 B0 */ lfs f1, 0x6b0(r29) @@ -1507,7 +1507,7 @@ lbl_8021E4A4: /* 8021E4D4 0021B434 7F C4 F3 78 */ mr r4, r30 /* 8021E4D8 0021B438 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8021E4DC 0021B43C 7D 89 03 A6 */ mtctr r12 -/* 8021E4E0 0021B440 4E 80 04 21 */ bctrl +/* 8021E4E0 0021B440 4E 80 04 21 */ bctrl /* 8021E4E4 0021B444 C0 03 00 00 */ lfs f0, 0(r3) /* 8021E4E8 0021B448 38 61 00 20 */ addi r3, r1, 0x20 /* 8021E4EC 0021B44C C0 3D 06 B0 */ lfs f1, 0x6b0(r29) @@ -1615,7 +1615,7 @@ lbl_8021E638: /* 8021E668 0021B5C8 7F C4 F3 78 */ mr r4, r30 /* 8021E66C 0021B5CC 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8021E670 0021B5D0 7D 89 03 A6 */ mtctr r12 -/* 8021E674 0021B5D4 4E 80 04 21 */ bctrl +/* 8021E674 0021B5D4 4E 80 04 21 */ bctrl /* 8021E678 0021B5D8 D3 E3 00 00 */ stfs f31, 0(r3) lbl_8021E67C: /* 8021E67C 0021B5DC 7F FC FB 78 */ mr r28, r31 @@ -1636,7 +1636,7 @@ lbl_8021E684: /* 8021E6B4 0021B614 7F C4 F3 78 */ mr r4, r30 /* 8021E6B8 0021B618 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8021E6BC 0021B61C 7D 89 03 A6 */ mtctr r12 -/* 8021E6C0 0021B620 4E 80 04 21 */ bctrl +/* 8021E6C0 0021B620 4E 80 04 21 */ bctrl /* 8021E6C4 0021B624 D3 E3 00 00 */ stfs f31, 0(r3) lbl_8021E6C8: /* 8021E6C8 0021B628 3B 9C 00 02 */ addi r28, r28, 2 @@ -1656,7 +1656,7 @@ lbl_8021E6E0: /* 8021E6F8 0021B658 83 81 00 50 */ lwz r28, 0x50(r1) /* 8021E6FC 0021B65C 7C 08 03 A6 */ mtlr r0 /* 8021E700 0021B660 38 21 00 70 */ addi r1, r1, 0x70 -/* 8021E704 0021B664 4E 80 00 20 */ blr +/* 8021E704 0021B664 4E 80 00 20 */ blr .global sub_8021e708 sub_8021e708: @@ -1694,7 +1694,7 @@ sub_8021e708: /* 8021E784 0021B6E4 7F C4 F3 78 */ mr r4, r30 /* 8021E788 0021B6E8 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8021E78C 0021B6EC 7D 89 03 A6 */ mtctr r12 -/* 8021E790 0021B6F0 4E 80 04 21 */ bctrl +/* 8021E790 0021B6F0 4E 80 04 21 */ bctrl /* 8021E794 0021B6F4 C0 03 00 00 */ lfs f0, 0(r3) /* 8021E798 0021B6F8 38 61 00 20 */ addi r3, r1, 0x20 /* 8021E79C 0021B6FC C0 3D 08 EC */ lfs f1, 0x8ec(r29) @@ -1724,7 +1724,7 @@ lbl_8021E7C4: /* 8021E7F4 0021B754 7F C4 F3 78 */ mr r4, r30 /* 8021E7F8 0021B758 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8021E7FC 0021B75C 7D 89 03 A6 */ mtctr r12 -/* 8021E800 0021B760 4E 80 04 21 */ bctrl +/* 8021E800 0021B760 4E 80 04 21 */ bctrl /* 8021E804 0021B764 C0 03 00 00 */ lfs f0, 0(r3) /* 8021E808 0021B768 38 61 00 20 */ addi r3, r1, 0x20 /* 8021E80C 0021B76C C0 3D 08 EC */ lfs f1, 0x8ec(r29) @@ -1747,7 +1747,7 @@ lbl_8021E82C: /* 8021E848 0021B7A8 81 9D 00 00 */ lwz r12, 0(r29) /* 8021E84C 0021B7AC 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8021E850 0021B7B0 7D 89 03 A6 */ mtctr r12 -/* 8021E854 0021B7B4 4E 80 04 21 */ bctrl +/* 8021E854 0021B7B4 4E 80 04 21 */ bctrl /* 8021E858 0021B7B8 C0 23 00 00 */ lfs f1, 0(r3) /* 8021E85C 0021B7BC 7F A3 EB 78 */ mr r3, r29 /* 8021E860 0021B7C0 81 9D 00 00 */ lwz r12, 0(r29) @@ -1756,14 +1756,14 @@ lbl_8021E82C: /* 8021E86C 0021B7CC 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8021E870 0021B7D0 EF E1 00 28 */ fsubs f31, f1, f0 /* 8021E874 0021B7D4 7D 89 03 A6 */ mtctr r12 -/* 8021E878 0021B7D8 4E 80 04 21 */ bctrl +/* 8021E878 0021B7D8 4E 80 04 21 */ bctrl /* 8021E87C 0021B7DC D3 E3 00 00 */ stfs f31, 0(r3) /* 8021E880 0021B7E0 7F A3 EB 78 */ mr r3, r29 /* 8021E884 0021B7E4 7F C4 F3 78 */ mr r4, r30 /* 8021E888 0021B7E8 81 9D 00 00 */ lwz r12, 0(r29) /* 8021E88C 0021B7EC 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8021E890 0021B7F0 7D 89 03 A6 */ mtctr r12 -/* 8021E894 0021B7F4 4E 80 04 21 */ bctrl +/* 8021E894 0021B7F4 4E 80 04 21 */ bctrl /* 8021E898 0021B7F8 C0 23 00 00 */ lfs f1, 0(r3) /* 8021E89C 0021B7FC C0 02 B4 04 */ lfs f0, lbl_805AD124@sda21(r2) /* 8021E8A0 0021B800 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -1777,7 +1777,7 @@ lbl_8021E82C: /* 8021E8C0 0021B820 7F C4 F3 78 */ mr r4, r30 /* 8021E8C4 0021B824 38 C0 00 14 */ li r6, 0x14 /* 8021E8C8 0021B828 7D 89 03 A6 */ mtctr r12 -/* 8021E8CC 0021B82C 4E 80 04 21 */ bctrl +/* 8021E8CC 0021B82C 4E 80 04 21 */ bctrl /* 8021E8D0 0021B830 88 1D 0A 48 */ lbz r0, 0xa48(r29) /* 8021E8D4 0021B834 38 60 00 01 */ li r3, 1 /* 8021E8D8 0021B838 50 60 2E B4 */ rlwimi r0, r3, 5, 0x1a, 0x1a @@ -1812,7 +1812,7 @@ lbl_8021E914: /* 8021E948 0021B8A8 C3 FD 08 EC */ lfs f31, 0x8ec(r29) /* 8021E94C 0021B8AC 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8021E950 0021B8B0 7D 89 03 A6 */ mtctr r12 -/* 8021E954 0021B8B4 4E 80 04 21 */ bctrl +/* 8021E954 0021B8B4 4E 80 04 21 */ bctrl /* 8021E958 0021B8B8 D3 E3 00 00 */ stfs f31, 0(r3) lbl_8021E95C: /* 8021E95C 0021B8BC 7F FC FB 78 */ mr r28, r31 @@ -1834,7 +1834,7 @@ lbl_8021E964: /* 8021E998 0021B8F8 C3 FD 08 EC */ lfs f31, 0x8ec(r29) /* 8021E99C 0021B8FC 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8021E9A0 0021B900 7D 89 03 A6 */ mtctr r12 -/* 8021E9A4 0021B904 4E 80 04 21 */ bctrl +/* 8021E9A4 0021B904 4E 80 04 21 */ bctrl /* 8021E9A8 0021B908 D3 E3 00 00 */ stfs f31, 0(r3) lbl_8021E9AC: /* 8021E9AC 0021B90C 3B 9C 00 02 */ addi r28, r28, 2 @@ -1857,7 +1857,7 @@ lbl_8021E9CC: /* 8021E9E4 0021B944 83 81 00 50 */ lwz r28, 0x50(r1) /* 8021E9E8 0021B948 7C 08 03 A6 */ mtlr r0 /* 8021E9EC 0021B94C 38 21 00 70 */ addi r1, r1, 0x70 -/* 8021E9F0 0021B950 4E 80 00 20 */ blr +/* 8021E9F0 0021B950 4E 80 00 20 */ blr .global sub_8021e9f4 sub_8021e9f4: @@ -1870,7 +1870,7 @@ sub_8021e9f4: /* 8021EA0C 0021B96C 81 83 00 00 */ lwz r12, 0(r3) /* 8021EA10 0021B970 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8021EA14 0021B974 7D 89 03 A6 */ mtctr r12 -/* 8021EA18 0021B978 4E 80 04 21 */ bctrl +/* 8021EA18 0021B978 4E 80 04 21 */ bctrl /* 8021EA1C 0021B97C A0 1A 09 F6 */ lhz r0, 0x9f6(r26) /* 8021EA20 0021B980 7C 7F 1B 78 */ mr r31, r3 /* 8021EA24 0021B984 7F 63 DB 78 */ mr r3, r27 @@ -1888,7 +1888,7 @@ sub_8021e9f4: /* 8021EA54 0021B9B4 81 9E 00 00 */ lwz r12, 0(r30) /* 8021EA58 0021B9B8 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8021EA5C 0021B9BC 7D 89 03 A6 */ mtctr r12 -/* 8021EA60 0021B9C0 4E 80 04 21 */ bctrl +/* 8021EA60 0021B9C0 4E 80 04 21 */ bctrl /* 8021EA64 0021B9C4 C0 1F 00 00 */ lfs f0, 0(r31) /* 8021EA68 0021B9C8 38 9A 09 8C */ addi r4, r26, 0x98c /* 8021EA6C 0021B9CC D0 03 00 00 */ stfs f0, 0(r3) @@ -1917,7 +1917,7 @@ lbl_8021EA8C: /* 8021EAC0 0021BA20 81 9C 00 00 */ lwz r12, 0(r28) /* 8021EAC4 0021BA24 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8021EAC8 0021BA28 7D 89 03 A6 */ mtctr r12 -/* 8021EACC 0021BA2C 4E 80 04 21 */ bctrl +/* 8021EACC 0021BA2C 4E 80 04 21 */ bctrl /* 8021EAD0 0021BA30 C0 1F 00 00 */ lfs f0, 0(r31) /* 8021EAD4 0021BA34 38 9A 09 8C */ addi r4, r26, 0x98c /* 8021EAD8 0021BA38 D0 03 00 00 */ stfs f0, 0(r3) @@ -1937,7 +1937,7 @@ lbl_8021EAF0: /* 8021EB08 0021BA68 80 01 00 44 */ lwz r0, 0x44(r1) /* 8021EB0C 0021BA6C 7C 08 03 A6 */ mtlr r0 /* 8021EB10 0021BA70 38 21 00 40 */ addi r1, r1, 0x40 -/* 8021EB14 0021BA74 4E 80 00 20 */ blr +/* 8021EB14 0021BA74 4E 80 00 20 */ blr .global sub_8021eb18 sub_8021eb18: @@ -1954,7 +1954,7 @@ sub_8021eb18: /* 8021EB40 0021BAA0 7C 9A 23 78 */ mr r26, r4 /* 8021EB44 0021BAA4 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8021EB48 0021BAA8 7D 89 03 A6 */ mtctr r12 -/* 8021EB4C 0021BAAC 4E 80 04 21 */ bctrl +/* 8021EB4C 0021BAAC 4E 80 04 21 */ bctrl /* 8021EB50 0021BAB0 7C 7F 1B 78 */ mr r31, r3 /* 8021EB54 0021BAB4 7F 43 D3 78 */ mr r3, r26 /* 8021EB58 0021BAB8 C0 1F 00 00 */ lfs f0, 0(r31) @@ -1974,7 +1974,7 @@ sub_8021eb18: /* 8021EB90 0021BAF0 C3 F9 06 B0 */ lfs f31, 0x6b0(r25) /* 8021EB94 0021BAF4 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8021EB98 0021BAF8 7D 89 03 A6 */ mtctr r12 -/* 8021EB9C 0021BAFC 4E 80 04 21 */ bctrl +/* 8021EB9C 0021BAFC 4E 80 04 21 */ bctrl /* 8021EBA0 0021BB00 D3 E3 00 00 */ stfs f31, 0(r3) lbl_8021EBA4: /* 8021EBA4 0021BB04 3B B9 09 FC */ addi r29, r25, 0x9fc @@ -2000,7 +2000,7 @@ lbl_8021EBB4: /* 8021EBF0 0021BB50 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8021EBF4 0021BB54 C3 D9 06 B0 */ lfs f30, 0x6b0(r25) /* 8021EBF8 0021BB58 7D 89 03 A6 */ mtctr r12 -/* 8021EBFC 0021BB5C 4E 80 04 21 */ bctrl +/* 8021EBFC 0021BB5C 4E 80 04 21 */ bctrl /* 8021EC00 0021BB60 D3 C3 00 00 */ stfs f30, 0(r3) /* 8021EC04 0021BB64 7F C4 F3 78 */ mr r4, r30 /* 8021EC08 0021BB68 D3 E3 00 04 */ stfs f31, 4(r3) @@ -2024,7 +2024,7 @@ lbl_8021EC18: /* 8021EC48 0021BBA8 80 01 00 64 */ lwz r0, 0x64(r1) /* 8021EC4C 0021BBAC 7C 08 03 A6 */ mtlr r0 /* 8021EC50 0021BBB0 38 21 00 60 */ addi r1, r1, 0x60 -/* 8021EC54 0021BBB4 4E 80 00 20 */ blr +/* 8021EC54 0021BBB4 4E 80 00 20 */ blr .global sub_8021ec58 sub_8021ec58: @@ -2208,7 +2208,7 @@ lbl_8021EEE0: /* 8021EF10 0021BE70 83 C1 00 F8 */ lwz r30, 0xf8(r1) /* 8021EF14 0021BE74 7C 08 03 A6 */ mtlr r0 /* 8021EF18 0021BE78 38 21 01 50 */ addi r1, r1, 0x150 -/* 8021EF1C 0021BE7C 4E 80 00 20 */ blr +/* 8021EF1C 0021BE7C 4E 80 00 20 */ blr .global sub_8021ef20 sub_8021ef20: @@ -2260,7 +2260,7 @@ lbl_8021EFA8: /* 8021EFC8 0021BF28 83 81 00 20 */ lwz r28, 0x20(r1) /* 8021EFCC 0021BF2C 7C 08 03 A6 */ mtlr r0 /* 8021EFD0 0021BF30 38 21 00 30 */ addi r1, r1, 0x30 -/* 8021EFD4 0021BF34 4E 80 00 20 */ blr +/* 8021EFD4 0021BF34 4E 80 00 20 */ blr .global sub_8021efd8 sub_8021efd8: @@ -2276,14 +2276,14 @@ lbl_8021EFF0: /* 8021EFF8 0021BF58 7C 03 00 40 */ cmplw r3, r0 /* 8021EFFC 0021BF5C 40 82 00 0C */ bne lbl_8021F008 /* 8021F000 0021BF60 38 60 00 01 */ li r3, 1 -/* 8021F004 0021BF64 4E 80 00 20 */ blr +/* 8021F004 0021BF64 4E 80 00 20 */ blr lbl_8021F008: /* 8021F008 0021BF68 38 C6 00 02 */ addi r6, r6, 2 lbl_8021F00C: /* 8021F00C 0021BF6C 7C 06 28 40 */ cmplw r6, r5 /* 8021F010 0021BF70 40 82 FF E0 */ bne lbl_8021EFF0 /* 8021F014 0021BF74 38 60 00 00 */ li r3, 0 -/* 8021F018 0021BF78 4E 80 00 20 */ blr +/* 8021F018 0021BF78 4E 80 00 20 */ blr .global sub_8021f01c sub_8021f01c: @@ -2292,7 +2292,7 @@ sub_8021f01c: /* 8021F024 0021BF84 7C 04 00 50 */ subf r0, r4, r0 /* 8021F028 0021BF88 7C 00 00 34 */ cntlzw r0, r0 /* 8021F02C 0021BF8C 54 03 D9 7E */ srwi r3, r0, 5 -/* 8021F030 0021BF90 4E 80 00 20 */ blr +/* 8021F030 0021BF90 4E 80 00 20 */ blr .global sub_8021f034 sub_8021f034: @@ -2390,7 +2390,7 @@ lbl_8021F184: /* 8021F190 0021C0F0 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 8021F194 0021C0F4 7C 08 03 A6 */ mtlr r0 /* 8021F198 0021C0F8 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 8021F19C 0021C0FC 4E 80 00 20 */ blr +/* 8021F19C 0021C0FC 4E 80 00 20 */ blr .global sub_8021f1a0 sub_8021f1a0: @@ -2597,7 +2597,7 @@ lbl_8021F380: /* 8021F4A4 0021C404 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 8021F4A8 0021C408 7C 08 03 A6 */ mtlr r0 /* 8021F4AC 0021C40C 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 8021F4B0 0021C410 4E 80 00 20 */ blr +/* 8021F4B0 0021C410 4E 80 00 20 */ blr .global sub_8021f4b4 sub_8021f4b4: @@ -2625,7 +2625,7 @@ sub_8021f4b4: /* 8021F508 0021C468 81 9E 00 00 */ lwz r12, 0(r30) /* 8021F50C 0021C46C 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8021F510 0021C470 7D 89 03 A6 */ mtctr r12 -/* 8021F514 0021C474 4E 80 04 21 */ bctrl +/* 8021F514 0021C474 4E 80 04 21 */ bctrl /* 8021F518 0021C478 C0 23 00 00 */ lfs f1, 0(r3) /* 8021F51C 0021C47C C0 02 B4 04 */ lfs f0, lbl_805AD124@sda21(r2) /* 8021F520 0021C480 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -2710,7 +2710,7 @@ lbl_8021F5E8: /* 8021F658 0021C5B8 B0 01 00 18 */ sth r0, 0x18(r1) /* 8021F65C 0021C5BC 81 8C 02 B0 */ lwz r12, 0x2b0(r12) /* 8021F660 0021C5C0 7D 89 03 A6 */ mtctr r12 -/* 8021F664 0021C5C4 4E 80 04 21 */ bctrl +/* 8021F664 0021C5C4 4E 80 04 21 */ bctrl /* 8021F668 0021C5C8 3C 80 80 5A */ lis r4, skZero3f@ha /* 8021F66C 0021C5CC 7F E3 FB 78 */ mr r3, r31 /* 8021F670 0021C5D0 39 24 66 A0 */ addi r9, r4, skZero3f@l @@ -2729,7 +2729,7 @@ lbl_8021F694: /* 8021F6A0 0021C600 83 A1 00 A4 */ lwz r29, 0xa4(r1) /* 8021F6A4 0021C604 7C 08 03 A6 */ mtlr r0 /* 8021F6A8 0021C608 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 8021F6AC 0021C60C 4E 80 00 20 */ blr +/* 8021F6AC 0021C60C 4E 80 00 20 */ blr .global sub_8021f6b0 sub_8021f6b0: @@ -2759,7 +2759,7 @@ sub_8021f6b0: /* 8021F70C 0021C66C 81 84 00 00 */ lwz r12, 0(r4) /* 8021F710 0021C670 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 8021F714 0021C674 7D 89 03 A6 */ mtctr r12 -/* 8021F718 0021C678 4E 80 04 21 */ bctrl +/* 8021F718 0021C678 4E 80 04 21 */ bctrl /* 8021F71C 0021C67C C0 21 00 14 */ lfs f1, 0x14(r1) /* 8021F720 0021C680 38 61 00 20 */ addi r3, r1, 0x20 /* 8021F724 0021C684 C0 02 B4 04 */ lfs f0, lbl_805AD124@sda21(r2) @@ -2811,7 +2811,7 @@ lbl_8021F7C8: /* 8021F7D8 0021C738 83 C1 00 38 */ lwz r30, 0x38(r1) /* 8021F7DC 0021C73C 7C 08 03 A6 */ mtlr r0 /* 8021F7E0 0021C740 38 21 00 50 */ addi r1, r1, 0x50 -/* 8021F7E4 0021C744 4E 80 00 20 */ blr +/* 8021F7E4 0021C744 4E 80 00 20 */ blr .global sub_8021f7e8 sub_8021f7e8: @@ -2853,7 +2853,7 @@ sub_8021f7e8: /* 8021F874 0021C7D4 80 01 00 44 */ lwz r0, 0x44(r1) /* 8021F878 0021C7D8 7C 08 03 A6 */ mtlr r0 /* 8021F87C 0021C7DC 38 21 00 40 */ addi r1, r1, 0x40 -/* 8021F880 0021C7E0 4E 80 00 20 */ blr +/* 8021F880 0021C7E0 4E 80 00 20 */ blr .global TurnAround__9CBabygothFR13CStateManager9EStateMsgf TurnAround__9CBabygothFR13CStateManager9EStateMsgf: @@ -2909,7 +2909,7 @@ lbl_8021F938: /* 8021F93C 0021C89C C0 22 B4 3C */ lfs f1, lbl_805AD15C@sda21(r2) /* 8021F940 0021C8A0 81 8C 01 E8 */ lwz r12, 0x1e8(r12) /* 8021F944 0021C8A4 7D 89 03 A6 */ mtctr r12 -/* 8021F948 0021C8A8 4E 80 04 21 */ bctrl +/* 8021F948 0021C8A8 4E 80 04 21 */ bctrl /* 8021F94C 0021C8AC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8021F950 0021C8B0 41 82 00 F0 */ beq lbl_8021FA40 /* 8021F954 0021C8B4 80 9E 00 64 */ lwz r4, 0x64(r30) @@ -2927,7 +2927,7 @@ lbl_8021F980: /* 8021F980 0021C8E0 81 84 00 00 */ lwz r12, 0(r4) /* 8021F984 0021C8E4 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 8021F988 0021C8E8 7D 89 03 A6 */ mtctr r12 -/* 8021F98C 0021C8EC 4E 80 04 21 */ bctrl +/* 8021F98C 0021C8EC 4E 80 04 21 */ bctrl /* 8021F990 0021C8F0 C0 21 00 24 */ lfs f1, 0x24(r1) /* 8021F994 0021C8F4 38 61 00 28 */ addi r3, r1, 0x28 /* 8021F998 0021C8F8 C0 1E 00 60 */ lfs f0, 0x60(r30) @@ -2981,7 +2981,7 @@ lbl_8021FA40: /* 8021FA50 0021C9B0 83 C1 00 58 */ lwz r30, 0x58(r1) /* 8021FA54 0021C9B4 7C 08 03 A6 */ mtlr r0 /* 8021FA58 0021C9B8 38 21 00 70 */ addi r1, r1, 0x70 -/* 8021FA5C 0021C9BC 4E 80 00 20 */ blr +/* 8021FA5C 0021C9BC 4E 80 00 20 */ blr .global GetUp__9CBabygothFR13CStateManager9EStateMsgf GetUp__9CBabygothFR13CStateManager9EStateMsgf: @@ -3066,7 +3066,7 @@ lbl_8021FB74: /* 8021FB78 0021CAD8 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8021FB7C 0021CADC 7C 08 03 A6 */ mtlr r0 /* 8021FB80 0021CAE0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8021FB84 0021CAE4 4E 80 00 20 */ blr +/* 8021FB84 0021CAE4 4E 80 00 20 */ blr .global Enraged__9CBabygothFR13CStateManager9EStateMsgf Enraged__9CBabygothFR13CStateManager9EStateMsgf: @@ -3169,7 +3169,7 @@ lbl_8021FCEC: /* 8021FCF0 0021CC50 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8021FCF4 0021CC54 7C 08 03 A6 */ mtlr r0 /* 8021FCF8 0021CC58 38 21 00 30 */ addi r1, r1, 0x30 -/* 8021FCFC 0021CC5C 4E 80 00 20 */ blr +/* 8021FCFC 0021CC5C 4E 80 00 20 */ blr .global FollowPattern__9CBabygothFR13CStateManager9EStateMsgf FollowPattern__9CBabygothFR13CStateManager9EStateMsgf: @@ -3288,7 +3288,7 @@ lbl_8021FE94: /* 8021FE9C 0021CDFC 83 C1 00 28 */ lwz r30, 0x28(r1) /* 8021FEA0 0021CE00 7C 08 03 A6 */ mtlr r0 /* 8021FEA4 0021CE04 38 21 00 30 */ addi r1, r1, 0x30 -/* 8021FEA8 0021CE08 4E 80 00 20 */ blr +/* 8021FEA8 0021CE08 4E 80 00 20 */ blr .global Taunt__9CBabygothFR13CStateManager9EStateMsgf Taunt__9CBabygothFR13CStateManager9EStateMsgf: @@ -3346,7 +3346,7 @@ lbl_8021FF64: /* 8021FF6C 0021CECC 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8021FF70 0021CED0 7C 08 03 A6 */ mtlr r0 /* 8021FF74 0021CED4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8021FF78 0021CED8 4E 80 00 20 */ blr +/* 8021FF78 0021CED8 4E 80 00 20 */ blr .global Crouch__9CBabygothFR13CStateManager9EStateMsgf Crouch__9CBabygothFR13CStateManager9EStateMsgf: @@ -3409,7 +3409,7 @@ lbl_80220044: /* 8022004C 0021CFAC 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80220050 0021CFB0 7C 08 03 A6 */ mtlr r0 /* 80220054 0021CFB4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80220058 0021CFB8 4E 80 00 20 */ blr +/* 80220058 0021CFB8 4E 80 00 20 */ blr .global Deactivate__9CBabygothFR13CStateManager9EStateMsgf Deactivate__9CBabygothFR13CStateManager9EStateMsgf: @@ -3601,7 +3601,7 @@ lbl_80220310: /* 80220314 0021D274 83 E1 00 7C */ lwz r31, 0x7c(r1) /* 80220318 0021D278 7C 08 03 A6 */ mtlr r0 /* 8022031C 0021D27C 38 21 00 80 */ addi r1, r1, 0x80 -/* 80220320 0021D280 4E 80 00 20 */ blr +/* 80220320 0021D280 4E 80 00 20 */ blr .global Generate__9CBabygothFR13CStateManager9EStateMsgf Generate__9CBabygothFR13CStateManager9EStateMsgf: @@ -3715,7 +3715,7 @@ lbl_802204B0: /* 802204B8 0021D418 83 C1 00 28 */ lwz r30, 0x28(r1) /* 802204BC 0021D41C 7C 08 03 A6 */ mtlr r0 /* 802204C0 0021D420 38 21 00 30 */ addi r1, r1, 0x30 -/* 802204C4 0021D424 4E 80 00 20 */ blr +/* 802204C4 0021D424 4E 80 00 20 */ blr .global TargetPatrol__9CBabygothFR13CStateManager9EStateMsgf TargetPatrol__9CBabygothFR13CStateManager9EStateMsgf: @@ -3756,7 +3756,7 @@ lbl_80220510: /* 8022054C 0021D4AC C0 22 B4 04 */ lfs f1, lbl_805AD124@sda21(r2) /* 80220550 0021D4B0 81 8C 01 C0 */ lwz r12, 0x1c0(r12) /* 80220554 0021D4B4 7D 89 03 A6 */ mtctr r12 -/* 80220558 0021D4B8 4E 80 04 21 */ bctrl +/* 80220558 0021D4B8 4E 80 04 21 */ bctrl /* 8022055C 0021D4BC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80220560 0021D4C0 41 82 00 28 */ beq lbl_80220588 /* 80220564 0021D4C4 FC 20 F8 90 */ fmr f1, f31 @@ -3783,7 +3783,7 @@ lbl_80220594: /* 802205B0 0021D510 81 9D 00 00 */ lwz r12, 0(r29) /* 802205B4 0021D514 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 802205B8 0021D518 7D 89 03 A6 */ mtctr r12 -/* 802205BC 0021D51C 4E 80 04 21 */ bctrl +/* 802205BC 0021D51C 4E 80 04 21 */ bctrl /* 802205C0 0021D520 28 03 00 00 */ cmplwi r3, 0 /* 802205C4 0021D524 41 82 00 F8 */ beq lbl_802206BC /* 802205C8 0021D528 7F A3 EB 78 */ mr r3, r29 @@ -3799,7 +3799,7 @@ lbl_802205EC: /* 802205EC 0021D54C 81 83 00 00 */ lwz r12, 0(r3) /* 802205F0 0021D550 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 802205F4 0021D554 7D 89 03 A6 */ mtctr r12 -/* 802205F8 0021D558 4E 80 04 21 */ bctrl +/* 802205F8 0021D558 4E 80 04 21 */ bctrl /* 802205FC 0021D55C 28 03 00 00 */ cmplwi r3, 0 /* 80220600 0021D560 41 82 00 58 */ beq lbl_80220658 /* 80220604 0021D564 7F A3 EB 78 */ mr r3, r29 @@ -3808,7 +3808,7 @@ lbl_802205EC: /* 80220610 0021D570 C0 22 B4 04 */ lfs f1, lbl_805AD124@sda21(r2) /* 80220614 0021D574 81 8C 01 90 */ lwz r12, 0x190(r12) /* 80220618 0021D578 7D 89 03 A6 */ mtctr r12 -/* 8022061C 0021D57C 4E 80 04 21 */ bctrl +/* 8022061C 0021D57C 4E 80 04 21 */ bctrl /* 80220620 0021D580 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80220624 0021D584 40 82 00 34 */ bne lbl_80220658 /* 80220628 0021D588 7F A3 EB 78 */ mr r3, r29 @@ -3858,7 +3858,7 @@ lbl_802206BC: /* 802206D0 0021D630 83 A1 00 34 */ lwz r29, 0x34(r1) /* 802206D4 0021D634 7C 08 03 A6 */ mtlr r0 /* 802206D8 0021D638 38 21 00 50 */ addi r1, r1, 0x50 -/* 802206DC 0021D63C 4E 80 00 20 */ blr +/* 802206DC 0021D63C 4E 80 00 20 */ blr .global Patrol__9CBabygothFR13CStateManager9EStateMsgf Patrol__9CBabygothFR13CStateManager9EStateMsgf: @@ -3889,7 +3889,7 @@ lbl_80220718: /* 8022073C 0021D69C 83 A1 00 0C */ lwz r29, 0xc(r1) /* 80220740 0021D6A0 7C 08 03 A6 */ mtlr r0 /* 80220744 0021D6A4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80220748 0021D6A8 4E 80 00 20 */ blr +/* 80220748 0021D6A8 4E 80 00 20 */ blr .global Approach__9CBabygothFR13CStateManager9EStateMsgf Approach__9CBabygothFR13CStateManager9EStateMsgf: @@ -4040,7 +4040,7 @@ lbl_80220934: /* 80220970 0021D8D0 81 9D 00 00 */ lwz r12, 0(r29) /* 80220974 0021D8D4 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 80220978 0021D8D8 7D 89 03 A6 */ mtctr r12 -/* 8022097C 0021D8DC 4E 80 04 21 */ bctrl +/* 8022097C 0021D8DC 4E 80 04 21 */ bctrl /* 80220980 0021D8E0 28 03 00 00 */ cmplwi r3, 0 /* 80220984 0021D8E4 41 82 00 60 */ beq lbl_802209E4 /* 80220988 0021D8E8 7F A3 EB 78 */ mr r3, r29 @@ -4049,7 +4049,7 @@ lbl_80220934: /* 80220994 0021D8F4 C0 22 B4 04 */ lfs f1, lbl_805AD124@sda21(r2) /* 80220998 0021D8F8 81 8C 01 90 */ lwz r12, 0x190(r12) /* 8022099C 0021D8FC 7D 89 03 A6 */ mtctr r12 -/* 802209A0 0021D900 4E 80 04 21 */ bctrl +/* 802209A0 0021D900 4E 80 04 21 */ bctrl /* 802209A4 0021D904 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802209A8 0021D908 40 82 00 3C */ bne lbl_802209E4 /* 802209AC 0021D90C 80 7D 07 D4 */ lwz r3, 0x7d4(r29) @@ -4086,7 +4086,7 @@ lbl_802209E4: /* 80220A24 0021D984 81 9D 00 00 */ lwz r12, 0(r29) /* 80220A28 0021D988 81 8C 01 E8 */ lwz r12, 0x1e8(r12) /* 80220A2C 0021D98C 7D 89 03 A6 */ mtctr r12 -/* 80220A30 0021D990 4E 80 04 21 */ bctrl +/* 80220A30 0021D990 4E 80 04 21 */ bctrl /* 80220A34 0021D994 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80220A38 0021D998 41 82 00 6C */ beq lbl_80220AA4 /* 80220A3C 0021D99C 38 61 00 28 */ addi r3, r1, 0x28 @@ -4137,7 +4137,7 @@ lbl_80220AD0: /* 80220AE4 0021DA44 83 A1 00 54 */ lwz r29, 0x54(r1) /* 80220AE8 0021DA48 7C 08 03 A6 */ mtlr r0 /* 80220AEC 0021DA4C 38 21 00 70 */ addi r1, r1, 0x70 -/* 80220AF0 0021DA50 4E 80 00 20 */ blr +/* 80220AF0 0021DA50 4E 80 00 20 */ blr .global PathFind__9CBabygothFR13CStateManager9EStateMsgf PathFind__9CBabygothFR13CStateManager9EStateMsgf: @@ -4216,7 +4216,7 @@ lbl_80220BFC: /* 80220C08 0021DB68 81 9E 00 00 */ lwz r12, 0(r30) /* 80220C0C 0021DB6C 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 80220C10 0021DB70 7D 89 03 A6 */ mtctr r12 -/* 80220C14 0021DB74 4E 80 04 21 */ bctrl +/* 80220C14 0021DB74 4E 80 04 21 */ bctrl /* 80220C18 0021DB78 28 03 00 00 */ cmplwi r3, 0 /* 80220C1C 0021DB7C 41 82 02 1C */ beq lbl_80220E38 /* 80220C20 0021DB80 7F C3 F3 78 */ mr r3, r30 @@ -4225,7 +4225,7 @@ lbl_80220BFC: /* 80220C2C 0021DB8C C0 22 B4 04 */ lfs f1, lbl_805AD124@sda21(r2) /* 80220C30 0021DB90 81 8C 01 90 */ lwz r12, 0x190(r12) /* 80220C34 0021DB94 7D 89 03 A6 */ mtctr r12 -/* 80220C38 0021DB98 4E 80 04 21 */ bctrl +/* 80220C38 0021DB98 4E 80 04 21 */ bctrl /* 80220C3C 0021DB9C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80220C40 0021DBA0 40 82 01 F8 */ bne lbl_80220E38 /* 80220C44 0021DBA4 80 7E 06 F0 */ lwz r3, 0x6f0(r30) @@ -4408,7 +4408,7 @@ lbl_80220EE4: /* 80220EF8 0021DE58 83 A1 00 E4 */ lwz r29, 0xe4(r1) /* 80220EFC 0021DE5C 7C 08 03 A6 */ mtlr r0 /* 80220F00 0021DE60 38 21 01 00 */ addi r1, r1, 0x100 -/* 80220F04 0021DE64 4E 80 00 20 */ blr +/* 80220F04 0021DE64 4E 80 00 20 */ blr .global SpecialAttack__9CBabygothFR13CStateManager9EStateMsgf SpecialAttack__9CBabygothFR13CStateManager9EStateMsgf: @@ -4588,7 +4588,7 @@ lbl_80221188: /* 80221190 0021E0F0 83 C1 00 58 */ lwz r30, 0x58(r1) /* 80221194 0021E0F4 7C 08 03 A6 */ mtlr r0 /* 80221198 0021E0F8 38 21 00 60 */ addi r1, r1, 0x60 -/* 8022119C 0021E0FC 4E 80 00 20 */ blr +/* 8022119C 0021E0FC 4E 80 00 20 */ blr .global Attack__9CBabygothFR13CStateManager9EStateMsgf Attack__9CBabygothFR13CStateManager9EStateMsgf: @@ -4636,7 +4636,7 @@ lbl_802211F4: /* 8022123C 0021E19C 81 84 00 00 */ lwz r12, 0(r4) /* 80221240 0021E1A0 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 80221244 0021E1A4 7D 89 03 A6 */ mtctr r12 -/* 80221248 0021E1A8 4E 80 04 21 */ bctrl +/* 80221248 0021E1A8 4E 80 04 21 */ bctrl /* 8022124C 0021E1AC C0 01 00 14 */ lfs f0, 0x14(r1) /* 80221250 0021E1B0 7F C3 F3 78 */ mr r3, r30 /* 80221254 0021E1B4 38 80 00 00 */ li r4, 0 @@ -4732,7 +4732,7 @@ lbl_80221394: /* 802213A8 0021E308 83 A1 00 24 */ lwz r29, 0x24(r1) /* 802213AC 0021E30C 7C 08 03 A6 */ mtlr r0 /* 802213B0 0021E310 38 21 00 40 */ addi r1, r1, 0x40 -/* 802213B4 0021E314 4E 80 00 20 */ blr +/* 802213B4 0021E314 4E 80 00 20 */ blr .global ProjectileAttack__9CBabygothFR13CStateManager9EStateMsgf ProjectileAttack__9CBabygothFR13CStateManager9EStateMsgf: @@ -4808,7 +4808,7 @@ lbl_802214A8: /* 802214B8 0021E418 81 84 00 00 */ lwz r12, 0(r4) /* 802214BC 0021E41C 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 802214C0 0021E420 7D 89 03 A6 */ mtctr r12 -/* 802214C4 0021E424 4E 80 04 21 */ bctrl +/* 802214C4 0021E424 4E 80 04 21 */ bctrl /* 802214C8 0021E428 C0 41 00 40 */ lfs f2, 0x40(r1) /* 802214CC 0021E42C C0 21 00 44 */ lfs f1, 0x44(r1) /* 802214D0 0021E430 C0 01 00 48 */ lfs f0, 0x48(r1) @@ -4963,7 +4963,7 @@ lbl_802216FC: /* 80221704 0021E664 83 C1 00 78 */ lwz r30, 0x78(r1) /* 80221708 0021E668 7C 08 03 A6 */ mtlr r0 /* 8022170C 0021E66C 38 21 00 80 */ addi r1, r1, 0x80 -/* 80221710 0021E670 4E 80 00 20 */ blr +/* 80221710 0021E670 4E 80 00 20 */ blr .global sub_80221714 sub_80221714: @@ -4971,7 +4971,7 @@ sub_80221714: /* 80221718 0021E678 20 00 00 04 */ subfic r0, r0, 4 /* 8022171C 0021E67C 7C 00 00 34 */ cntlzw r0, r0 /* 80221720 0021E680 54 03 D9 7E */ srwi r3, r0, 5 -/* 80221724 0021E684 4E 80 00 20 */ blr +/* 80221724 0021E684 4E 80 00 20 */ blr .global SpotPlayer__9CBabygothFR13CStateManagerf SpotPlayer__9CBabygothFR13CStateManagerf: @@ -4990,7 +4990,7 @@ lbl_8022174C: /* 80221750 0021E6B0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80221754 0021E6B4 7C 08 03 A6 */ mtlr r0 /* 80221758 0021E6B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8022175C 0021E6BC 4E 80 00 20 */ blr +/* 8022175C 0021E6BC 4E 80 00 20 */ blr .global InDetectionRange__9CBabygothFR13CStateManagerf InDetectionRange__9CBabygothFR13CStateManagerf: @@ -5031,13 +5031,13 @@ lbl_802217A8: /* 802217E0 0021E740 FC 03 00 40 */ fcmpo cr0, f3, f0 /* 802217E4 0021E744 7C 00 00 26 */ mfcr r0 /* 802217E8 0021E748 54 03 0F FE */ srwi r3, r0, 0x1f -/* 802217EC 0021E74C 4E 80 00 20 */ blr +/* 802217EC 0021E74C 4E 80 00 20 */ blr lbl_802217F0: /* 802217F0 0021E750 38 60 00 01 */ li r3, 1 -/* 802217F4 0021E754 4E 80 00 20 */ blr +/* 802217F4 0021E754 4E 80 00 20 */ blr lbl_802217F8: /* 802217F8 0021E758 7C 03 03 78 */ mr r3, r0 -/* 802217FC 0021E75C 4E 80 00 20 */ blr +/* 802217FC 0021E75C 4E 80 00 20 */ blr .global InPosition__9CBabygothFR13CStateManagerf InPosition__9CBabygothFR13CStateManagerf: @@ -5057,7 +5057,7 @@ InPosition__9CBabygothFR13CStateManagerf: /* 80221834 0021E794 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80221838 0021E798 7C 00 00 26 */ mfcr r0 /* 8022183C 0021E79C 54 03 0F FE */ srwi r3, r0, 0x1f -/* 80221840 0021E7A0 4E 80 00 20 */ blr +/* 80221840 0021E7A0 4E 80 00 20 */ blr .global ShouldTurn__9CBabygothFR13CStateManagerf ShouldTurn__9CBabygothFR13CStateManagerf: @@ -5091,7 +5091,7 @@ lbl_802218A4: /* 802218A4 0021E804 81 84 00 00 */ lwz r12, 0(r4) /* 802218A8 0021E808 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 802218AC 0021E80C 7D 89 03 A6 */ mtctr r12 -/* 802218B0 0021E810 4E 80 04 21 */ bctrl +/* 802218B0 0021E810 4E 80 04 21 */ bctrl /* 802218B4 0021E814 C0 41 00 44 */ lfs f2, 0x44(r1) /* 802218B8 0021E818 38 61 00 10 */ addi r3, r1, 0x10 /* 802218BC 0021E81C C0 1F 00 50 */ lfs f0, 0x50(r31) @@ -5134,7 +5134,7 @@ lbl_802218A4: /* 80221950 0021E8B0 83 E1 00 5C */ lwz r31, 0x5c(r1) /* 80221954 0021E8B4 7C 08 03 A6 */ mtlr r0 /* 80221958 0021E8B8 38 21 00 70 */ addi r1, r1, 0x70 -/* 8022195C 0021E8BC 4E 80 00 20 */ blr +/* 8022195C 0021E8BC 4E 80 00 20 */ blr .global ShouldFire__9CBabygothFR13CStateManagerf ShouldFire__9CBabygothFR13CStateManagerf: @@ -5160,7 +5160,7 @@ ShouldFire__9CBabygothFR13CStateManagerf: /* 802219AC 0021E90C 38 61 00 08 */ addi r3, r1, 8 /* 802219B0 0021E910 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 802219B4 0021E914 7D 89 03 A6 */ mtctr r12 -/* 802219B8 0021E918 4E 80 04 21 */ bctrl +/* 802219B8 0021E918 4E 80 04 21 */ bctrl /* 802219BC 0021E91C C0 41 00 08 */ lfs f2, 8(r1) /* 802219C0 0021E920 7F C4 F3 78 */ mr r4, r30 /* 802219C4 0021E924 C0 21 00 0C */ lfs f1, 0xc(r1) @@ -5200,7 +5200,7 @@ ShouldFire__9CBabygothFR13CStateManagerf: /* 80221A4C 0021E9AC C0 22 B4 4C */ lfs f1, lbl_805AD16C@sda21(r2) /* 80221A50 0021E9B0 81 8C 01 E8 */ lwz r12, 0x1e8(r12) /* 80221A54 0021E9B4 7D 89 03 A6 */ mtctr r12 -/* 80221A58 0021E9B8 4E 80 04 21 */ bctrl +/* 80221A58 0021E9B8 4E 80 04 21 */ bctrl /* 80221A5C 0021E9BC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80221A60 0021E9C0 40 82 00 28 */ bne lbl_80221A88 /* 80221A64 0021E9C4 7F C3 F3 78 */ mr r3, r30 @@ -5220,7 +5220,7 @@ lbl_80221A8C: /* 80221A94 0021E9F4 83 C1 00 98 */ lwz r30, 0x98(r1) /* 80221A98 0021E9F8 7C 08 03 A6 */ mtlr r0 /* 80221A9C 0021E9FC 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 80221AA0 0021EA00 4E 80 00 20 */ blr +/* 80221AA0 0021EA00 4E 80 00 20 */ blr .global ShouldSpecialAttack__9CBabygothFR13CStateManagerf ShouldSpecialAttack__9CBabygothFR13CStateManagerf: @@ -5246,7 +5246,7 @@ ShouldSpecialAttack__9CBabygothFR13CStateManagerf: /* 80221AF0 0021EA50 38 61 00 08 */ addi r3, r1, 8 /* 80221AF4 0021EA54 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 80221AF8 0021EA58 7D 89 03 A6 */ mtctr r12 -/* 80221AFC 0021EA5C 4E 80 04 21 */ bctrl +/* 80221AFC 0021EA5C 4E 80 04 21 */ bctrl /* 80221B00 0021EA60 C0 41 00 08 */ lfs f2, 8(r1) /* 80221B04 0021EA64 7F C4 F3 78 */ mr r4, r30 /* 80221B08 0021EA68 C0 21 00 0C */ lfs f1, 0xc(r1) @@ -5286,7 +5286,7 @@ ShouldSpecialAttack__9CBabygothFR13CStateManagerf: /* 80221B90 0021EAF0 C0 22 B4 3C */ lfs f1, lbl_805AD15C@sda21(r2) /* 80221B94 0021EAF4 81 8C 01 E8 */ lwz r12, 0x1e8(r12) /* 80221B98 0021EAF8 7D 89 03 A6 */ mtctr r12 -/* 80221B9C 0021EAFC 4E 80 04 21 */ bctrl +/* 80221B9C 0021EAFC 4E 80 04 21 */ bctrl /* 80221BA0 0021EB00 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80221BA4 0021EB04 40 82 00 28 */ bne lbl_80221BCC /* 80221BA8 0021EB08 7F C3 F3 78 */ mr r3, r30 @@ -5306,7 +5306,7 @@ lbl_80221BD0: /* 80221BD8 0021EB38 83 C1 00 98 */ lwz r30, 0x98(r1) /* 80221BDC 0021EB3C 7C 08 03 A6 */ mtlr r0 /* 80221BE0 0021EB40 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 80221BE4 0021EB44 4E 80 00 20 */ blr +/* 80221BE4 0021EB44 4E 80 00 20 */ blr .global ShouldAttack__9CBabygothFR13CStateManagerf ShouldAttack__9CBabygothFR13CStateManagerf: @@ -5346,7 +5346,7 @@ ShouldAttack__9CBabygothFR13CStateManagerf: /* 80221C6C 0021EBCC 38 61 00 24 */ addi r3, r1, 0x24 /* 80221C70 0021EBD0 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 80221C74 0021EBD4 7D 89 03 A6 */ mtctr r12 -/* 80221C78 0021EBD8 4E 80 04 21 */ bctrl +/* 80221C78 0021EBD8 4E 80 04 21 */ bctrl /* 80221C7C 0021EBDC C0 A1 00 24 */ lfs f5, 0x24(r1) /* 80221C80 0021EBE0 38 61 00 3C */ addi r3, r1, 0x3c /* 80221C84 0021EBE4 C0 81 00 28 */ lfs f4, 0x28(r1) @@ -5378,7 +5378,7 @@ ShouldAttack__9CBabygothFR13CStateManagerf: /* 80221CEC 0021EC4C C0 22 B4 3C */ lfs f1, lbl_805AD15C@sda21(r2) /* 80221CF0 0021EC50 81 8C 01 E8 */ lwz r12, 0x1e8(r12) /* 80221CF4 0021EC54 7D 89 03 A6 */ mtctr r12 -/* 80221CF8 0021EC58 4E 80 04 21 */ bctrl +/* 80221CF8 0021EC58 4E 80 04 21 */ bctrl /* 80221CFC 0021EC5C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80221D00 0021EC60 40 82 00 C4 */ bne lbl_80221DC4 /* 80221D04 0021EC64 7F A4 EB 78 */ mr r4, r29 @@ -5443,7 +5443,7 @@ lbl_80221DC8: /* 80221DE4 0021ED44 83 A1 00 C4 */ lwz r29, 0xc4(r1) /* 80221DE8 0021ED48 7C 08 03 A6 */ mtlr r0 /* 80221DEC 0021ED4C 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 80221DF0 0021ED50 4E 80 00 20 */ blr +/* 80221DF0 0021ED50 4E 80 00 20 */ blr .global Leash__9CBabygothFR13CStateManagerf Leash__9CBabygothFR13CStateManagerf: @@ -5485,10 +5485,10 @@ Leash__9CBabygothFR13CStateManagerf: /* 80221E80 0021EDE0 38 00 00 01 */ li r0, 1 lbl_80221E84: /* 80221E84 0021EDE4 7C 03 03 78 */ mr r3, r0 -/* 80221E88 0021EDE8 4E 80 00 20 */ blr +/* 80221E88 0021EDE8 4E 80 00 20 */ blr lbl_80221E8C: /* 80221E8C 0021EDEC 38 60 00 00 */ li r3, 0 -/* 80221E90 0021EDF0 4E 80 00 20 */ blr +/* 80221E90 0021EDF0 4E 80 00 20 */ blr .global LineOfSight__9CBabygothFR13CStateManagerf LineOfSight__9CBabygothFR13CStateManagerf: @@ -5506,7 +5506,7 @@ LineOfSight__9CBabygothFR13CStateManagerf: /* 80221EC0 0021EE20 81 84 00 00 */ lwz r12, 0(r4) /* 80221EC4 0021EE24 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 80221EC8 0021EE28 7D 89 03 A6 */ mtctr r12 -/* 80221ECC 0021EE2C 4E 80 04 21 */ bctrl +/* 80221ECC 0021EE2C 4E 80 04 21 */ bctrl /* 80221ED0 0021EE30 C0 41 00 08 */ lfs f2, 8(r1) /* 80221ED4 0021EE34 7F C4 F3 78 */ mr r4, r30 /* 80221ED8 0021EE38 C0 21 00 0C */ lfs f1, 0xc(r1) @@ -5539,7 +5539,7 @@ LineOfSight__9CBabygothFR13CStateManagerf: /* 80221F44 0021EEA4 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 80221F48 0021EEA8 7C 08 03 A6 */ mtlr r0 /* 80221F4C 0021EEAC 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 80221F50 0021EEB0 4E 80 00 20 */ blr +/* 80221F50 0021EEB0 4E 80 00 20 */ blr .global LostInterest__9CBabygothFR13CStateManagerf LostInterest__9CBabygothFR13CStateManagerf: @@ -5570,7 +5570,7 @@ lbl_80221FAC: /* 80221FAC 0021EF0C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80221FB0 0021EF10 7C 08 03 A6 */ mtlr r0 /* 80221FB4 0021EF14 38 21 00 20 */ addi r1, r1, 0x20 -/* 80221FB8 0021EF18 4E 80 00 20 */ blr +/* 80221FB8 0021EF18 4E 80 00 20 */ blr .global OffLine__9CBabygothFR13CStateManagerf OffLine__9CBabygothFR13CStateManagerf: @@ -5589,13 +5589,13 @@ OffLine__9CBabygothFR13CStateManagerf: /* 80221FEC 0021EF4C C0 22 B4 04 */ lfs f1, lbl_805AD124@sda21(r2) /* 80221FF0 0021EF50 81 8C 01 90 */ lwz r12, 0x190(r12) /* 80221FF4 0021EF54 7D 89 03 A6 */ mtctr r12 -/* 80221FF8 0021EF58 4E 80 04 21 */ bctrl +/* 80221FF8 0021EF58 4E 80 04 21 */ bctrl /* 80221FFC 0021EF5C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80222000 0021EF60 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80222004 0021EF64 83 C1 00 08 */ lwz r30, 8(r1) /* 80222008 0021EF68 7C 08 03 A6 */ mtlr r0 /* 8022200C 0021EF6C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80222010 0021EF70 4E 80 00 20 */ blr +/* 80222010 0021EF70 4E 80 00 20 */ blr .global ShotAt__9CBabygothFR13CStateManagerf ShotAt__9CBabygothFR13CStateManagerf: @@ -5604,7 +5604,7 @@ ShotAt__9CBabygothFR13CStateManagerf: /* 8022201C 0021EF7C 7C 03 00 D0 */ neg r0, r3 /* 80222020 0021EF80 7C 00 1B 78 */ or r0, r0, r3 /* 80222024 0021EF84 54 03 0F FE */ srwi r3, r0, 0x1f -/* 80222028 0021EF88 4E 80 00 20 */ blr +/* 80222028 0021EF88 4E 80 00 20 */ blr .global InMaxRange__9CBabygothFR13CStateManagerf InMaxRange__9CBabygothFR13CStateManagerf: @@ -5638,7 +5638,7 @@ InMaxRange__9CBabygothFR13CStateManagerf: /* 80222098 0021EFF8 7C 00 00 26 */ mfcr r0 /* 8022209C 0021EFFC 54 03 0F FE */ srwi r3, r0, 0x1f /* 802220A0 0021F000 38 21 00 20 */ addi r1, r1, 0x20 -/* 802220A4 0021F004 4E 80 00 20 */ blr +/* 802220A4 0021F004 4E 80 00 20 */ blr .global AggressionCheck__9CBabygothFR13CStateManagerf AggressionCheck__9CBabygothFR13CStateManagerf: @@ -5652,10 +5652,10 @@ AggressionCheck__9CBabygothFR13CStateManagerf: /* 802220C4 0021F024 2C 00 00 03 */ cmpwi r0, 3 /* 802220C8 0021F028 40 82 00 0C */ bne lbl_802220D4 /* 802220CC 0021F02C 38 60 00 01 */ li r3, 1 -/* 802220D0 0021F030 4E 80 00 20 */ blr +/* 802220D0 0021F030 4E 80 00 20 */ blr lbl_802220D4: /* 802220D4 0021F034 38 60 00 00 */ li r3, 0 -/* 802220D8 0021F038 4E 80 00 20 */ blr +/* 802220D8 0021F038 4E 80 00 20 */ blr .global TooClose__9CBabygothFR13CStateManagerf TooClose__9CBabygothFR13CStateManagerf: @@ -5685,7 +5685,7 @@ TooClose__9CBabygothFR13CStateManagerf: /* 80222138 0021F098 81 9F 09 30 */ lwz r12, 0x930(r31) /* 8022213C 0021F09C 81 8C 00 14 */ lwz r12, 0x14(r12) /* 80222140 0021F0A0 7D 89 03 A6 */ mtctr r12 -/* 80222144 0021F0A4 4E 80 04 21 */ bctrl +/* 80222144 0021F0A4 4E 80 04 21 */ bctrl /* 80222148 0021F0A8 C0 A1 00 08 */ lfs f5, 8(r1) /* 8022214C 0021F0AC 38 61 00 38 */ addi r3, r1, 0x38 /* 80222150 0021F0B0 C0 81 00 0C */ lfs f4, 0xc(r1) @@ -5716,7 +5716,7 @@ lbl_802221A8: /* 802221AC 0021F10C 83 E1 00 6C */ lwz r31, 0x6c(r1) /* 802221B0 0021F110 7C 08 03 A6 */ mtlr r0 /* 802221B4 0021F114 38 21 00 70 */ addi r1, r1, 0x70 -/* 802221B8 0021F118 4E 80 00 20 */ blr +/* 802221B8 0021F118 4E 80 00 20 */ blr .global GetAimPosition__9CBabygothCFRC13CStateManagerf GetAimPosition__9CBabygothCFRC13CStateManagerf: @@ -5905,7 +5905,7 @@ lbl_8022244C: /* 80222470 0021F3D0 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 80222474 0021F3D4 7C 08 03 A6 */ mtlr r0 /* 80222478 0021F3D8 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 8022247C 0021F3DC 4E 80 00 20 */ blr +/* 8022247C 0021F3DC 4E 80 00 20 */ blr .global DoUserAnimEvent__9CBabygothFR13CStateManagerRC13CInt32POINode14EUserEventType DoUserAnimEvent__9CBabygothFR13CStateManagerRC13CInt32POINode14EUserEventType: @@ -5934,7 +5934,7 @@ DoUserAnimEvent__9CBabygothFR13CStateManagerRC13CInt32POINode14EUserEventType: /* 802224D8 0021F438 38 A5 76 1C */ addi r5, r5, lbl_803E761C@l /* 802224DC 0021F43C 7C 05 00 2E */ lwzx r0, r5, r0 /* 802224E0 0021F440 7C 09 03 A6 */ mtctr r0 -/* 802224E4 0021F444 4E 80 04 20 */ bctr +/* 802224E4 0021F444 4E 80 04 20 */ bctr .global lbl_802224E8 lbl_802224E8: /* 802224E8 0021F448 7F 64 DB 78 */ mr r4, r27 @@ -5951,7 +5951,7 @@ lbl_802224E8: /* 80222514 0021F474 81 84 00 00 */ lwz r12, 0(r4) /* 80222518 0021F478 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 8022251C 0021F47C 7D 89 03 A6 */ mtctr r12 -/* 80222520 0021F480 4E 80 04 21 */ bctrl +/* 80222520 0021F480 4E 80 04 21 */ bctrl /* 80222524 0021F484 C0 41 00 7C */ lfs f2, 0x7c(r1) /* 80222528 0021F488 7F 63 DB 78 */ mr r3, r27 /* 8022252C 0021F48C C0 21 00 80 */ lfs f1, 0x80(r1) @@ -5969,7 +5969,7 @@ lbl_802224E8: /* 8022255C 0021F4BC 81 9B 00 00 */ lwz r12, 0(r27) /* 80222560 0021F4C0 81 8C 02 C0 */ lwz r12, 0x2c0(r12) /* 80222564 0021F4C4 7D 89 03 A6 */ mtctr r12 -/* 80222568 0021F4C8 4E 80 04 21 */ bctrl +/* 80222568 0021F4C8 4E 80 04 21 */ bctrl /* 8022256C 0021F4CC FC 20 F8 90 */ fmr f1, f31 /* 80222570 0021F4D0 7C 64 1B 78 */ mr r4, r3 /* 80222574 0021F4D4 7F E7 FB 78 */ mr r7, r31 @@ -6183,7 +6183,7 @@ lbl_80222850: /* 80222874 0021F7D4 80 01 01 D4 */ lwz r0, 0x1d4(r1) /* 80222878 0021F7D8 7C 08 03 A6 */ mtlr r0 /* 8022287C 0021F7DC 38 21 01 D0 */ addi r1, r1, 0x1d0 -/* 80222880 0021F7E0 4E 80 00 20 */ blr +/* 80222880 0021F7E0 4E 80 00 20 */ blr .global GetOrigin__9CBabygothCFv GetOrigin__9CBabygothCFv: @@ -6252,7 +6252,7 @@ lbl_80222948: /* 80222978 0021F8D8 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8022297C 0021F8DC 7C 08 03 A6 */ mtlr r0 /* 80222980 0021F8E0 38 21 00 60 */ addi r1, r1, 0x60 -/* 80222984 0021F8E4 4E 80 00 20 */ blr +/* 80222984 0021F8E4 4E 80 00 20 */ blr .global Listen__9CBabygothFRC9CVector3f16EListenNoiseType Listen__9CBabygothFRC9CVector3f16EListenNoiseType: @@ -6283,28 +6283,28 @@ Listen__9CBabygothFRC9CVector3f16EListenNoiseType: /* 802229E8 0021F948 98 03 0A 48 */ stb r0, 0xa48(r3) lbl_802229EC: /* 802229EC 0021F94C 54 C3 06 3E */ clrlwi r3, r6, 0x18 -/* 802229F0 0021F950 4E 80 00 20 */ blr +/* 802229F0 0021F950 4E 80 00 20 */ blr .global GetDamageVulnerability__9CBabygothCFRC9CVector3fRC9CVector3fRC11CDamageInfo GetDamageVulnerability__9CBabygothCFRC9CVector3fRC9CVector3fRC11CDamageInfo: /* 802229F4 0021F954 3C 60 80 57 */ lis r3, lbl_8056D7E8@ha /* 802229F8 0021F958 38 63 D7 E8 */ addi r3, r3, lbl_8056D7E8@l -/* 802229FC 0021F95C 4E 80 00 20 */ blr +/* 802229FC 0021F95C 4E 80 00 20 */ blr .global GetDamageVulnerability__9CBabygothCFv GetDamageVulnerability__9CBabygothCFv: /* 80222A00 0021F960 3C 60 80 57 */ lis r3, lbl_8056D7E8@ha /* 80222A04 0021F964 38 63 D7 E8 */ addi r3, r3, lbl_8056D7E8@l -/* 80222A08 0021F968 4E 80 00 20 */ blr +/* 80222A08 0021F968 4E 80 00 20 */ blr .global TakeDamage__9CBabygothFRC9CVector3ff TakeDamage__9CBabygothFRC9CVector3ff: /* 80222A0C 0021F96C 88 03 04 00 */ lbz r0, 0x400(r3) /* 80222A10 0021F970 54 00 D7 FF */ rlwinm. r0, r0, 0x1a, 0x1f, 0x1f -/* 80222A14 0021F974 4D 82 00 20 */ beqlr +/* 80222A14 0021F974 4D 82 00 20 */ beqlr /* 80222A18 0021F978 C0 02 88 F0 */ lfs f0, lbl_805AA610@sda21(r2) /* 80222A1C 0021F97C D0 03 04 28 */ stfs f0, 0x428(r3) -/* 80222A20 0021F980 4E 80 00 20 */ blr +/* 80222A20 0021F980 4E 80 00 20 */ blr .global Shock__9CBabygothFff Shock__9CBabygothFff: @@ -6348,7 +6348,7 @@ Shock__9CBabygothFff: /* 80222AB8 0021FA18 81 83 00 00 */ lwz r12, 0(r3) /* 80222ABC 0021FA1C 81 8C 00 38 */ lwz r12, 0x38(r12) /* 80222AC0 0021FA20 7D 89 03 A6 */ mtctr r12 -/* 80222AC4 0021FA24 4E 80 04 21 */ bctrl +/* 80222AC4 0021FA24 4E 80 04 21 */ bctrl /* 80222AC8 0021FA28 38 81 00 14 */ addi r4, r1, 0x14 /* 80222ACC 0021FA2C 38 A0 00 00 */ li r5, 0 /* 80222AD0 0021FA30 4B ED F9 ED */ bl GetVulnerability__20CDamageVulnerabilityCFRC11CWeaponMode @@ -6381,7 +6381,7 @@ lbl_80222B1C: /* 80222B30 0021FA90 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 80222B34 0021FA94 7C 08 03 A6 */ mtlr r0 /* 80222B38 0021FA98 38 21 00 50 */ addi r1, r1, 0x50 -/* 80222B3C 0021FA9C 4E 80 00 20 */ blr +/* 80222B3C 0021FA9C 4E 80 00 20 */ blr .global KnockBack__9CBabygothFRC9CVector3fR13CStateManagerRC11CDamageInfo14EKnockBackTypef KnockBack__9CBabygothFRC9CVector3fR13CStateManagerRC11CDamageInfo14EKnockBackTypef: @@ -6441,12 +6441,12 @@ lbl_80222C04: /* 80222C0C 0021FB6C 80 01 00 44 */ lwz r0, 0x44(r1) /* 80222C10 0021FB70 7C 08 03 A6 */ mtlr r0 /* 80222C14 0021FB74 38 21 00 40 */ addi r1, r1, 0x40 -/* 80222C18 0021FB78 4E 80 00 20 */ blr +/* 80222C18 0021FB78 4E 80 00 20 */ blr .global ProjectileInfo__9CBabygothFv ProjectileInfo__9CBabygothFv: /* 80222C1C 0021FB7C 38 63 09 58 */ addi r3, r3, 0x958 -/* 80222C20 0021FB80 4E 80 00 20 */ blr +/* 80222C20 0021FB80 4E 80 00 20 */ blr .global PreRender__9CBabygothFR13CStateManagerRC14CFrustumPlanes PreRender__9CBabygothFR13CStateManagerRC14CFrustumPlanes: @@ -6462,7 +6462,7 @@ PreRender__9CBabygothFR13CStateManagerRC14CFrustumPlanes: /* 80222C48 0021FBA8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80222C4C 0021FBAC 7C 08 03 A6 */ mtlr r0 /* 80222C50 0021FBB0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80222C54 0021FBB4 4E 80 00 20 */ blr +/* 80222C54 0021FBB4 4E 80 00 20 */ blr .global Render__9CBabygothCFRC13CStateManager Render__9CBabygothCFRC13CStateManager: @@ -6473,7 +6473,7 @@ Render__9CBabygothCFRC13CStateManager: /* 80222C68 0021FBC8 80 01 00 14 */ lwz r0, 0x14(r1) /* 80222C6C 0021FBCC 7C 08 03 A6 */ mtlr r0 /* 80222C70 0021FBD0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80222C74 0021FBD4 4E 80 00 20 */ blr +/* 80222C74 0021FBD4 4E 80 00 20 */ blr .global AcceptScriptMsg__9CBabygothF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__9CBabygothF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -6495,7 +6495,7 @@ AcceptScriptMsg__9CBabygothF20EScriptObjectMessage9TUniqueIdR13CStateManager: /* 80222CB4 0021FC14 38 84 76 7C */ addi r4, r4, lbl_803E767C@l /* 80222CB8 0021FC18 7C 04 00 2E */ lwzx r0, r4, r0 /* 80222CBC 0021FC1C 7C 09 03 A6 */ mtctr r0 -/* 80222CC0 0021FC20 4E 80 04 20 */ bctr +/* 80222CC0 0021FC20 4E 80 04 20 */ bctr .global lbl_80222CC4 lbl_80222CC4: /* 80222CC4 0021FC24 81 83 00 00 */ lwz r12, 0(r3) @@ -6503,7 +6503,7 @@ lbl_80222CC4: /* 80222CCC 0021FC2C C0 22 B4 04 */ lfs f1, lbl_805AD124@sda21(r2) /* 80222CD0 0021FC30 81 8C 01 C0 */ lwz r12, 0x1c0(r12) /* 80222CD4 0021FC34 7D 89 03 A6 */ mtctr r12 -/* 80222CD8 0021FC38 4E 80 04 21 */ bctrl +/* 80222CD8 0021FC38 4E 80 04 21 */ bctrl /* 80222CDC 0021FC3C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80222CE0 0021FC40 40 82 00 10 */ bne lbl_80222CF0 /* 80222CE4 0021FC44 80 7B 04 50 */ lwz r3, 0x450(r27) @@ -6607,7 +6607,7 @@ lbl_80222E28: /* 80222E3C 0021FD9C C3 FB 00 E8 */ lfs f31, 0xe8(r27) /* 80222E40 0021FDA0 81 8C 02 BC */ lwz r12, 0x2bc(r12) /* 80222E44 0021FDA4 7D 89 03 A6 */ mtctr r12 -/* 80222E48 0021FDA8 4E 80 04 21 */ bctrl +/* 80222E48 0021FDA8 4E 80 04 21 */ bctrl /* 80222E4C 0021FDAC EC 01 07 F2 */ fmuls f0, f1, f31 /* 80222E50 0021FDB0 C0 22 B4 04 */ lfs f1, lbl_805AD124@sda21(r2) /* 80222E54 0021FDB4 38 C0 00 00 */ li r6, 0 @@ -6764,7 +6764,7 @@ lbl_80222FE8: /* 80223084 0021FFE4 81 8C 00 90 */ lwz r12, 0x90(r12) /* 80223088 0021FFE8 38 84 66 A0 */ addi r4, r4, skZero3f@l /* 8022308C 0021FFEC 7D 89 03 A6 */ mtctr r12 -/* 80223090 0021FFF0 4E 80 04 21 */ bctrl +/* 80223090 0021FFF0 4E 80 04 21 */ bctrl /* 80223094 0021FFF4 48 00 00 8C */ b lbl_80223120 lbl_80223098: /* 80223098 0021FFF8 7F 63 DB 78 */ mr r3, r27 @@ -6779,7 +6779,7 @@ lbl_80223098: /* 802230BC 0022001C 81 8C 00 90 */ lwz r12, 0x90(r12) /* 802230C0 00220020 38 84 66 A0 */ addi r4, r4, skZero3f@l /* 802230C4 00220024 7D 89 03 A6 */ mtctr r12 -/* 802230C8 00220028 4E 80 04 21 */ bctrl +/* 802230C8 00220028 4E 80 04 21 */ bctrl /* 802230CC 0022002C 80 1B 05 6C */ lwz r0, 0x56c(r27) /* 802230D0 00220030 2C 00 00 03 */ cmpwi r0, 3 /* 802230D4 00220034 41 82 00 4C */ beq lbl_80223120 @@ -6818,7 +6818,7 @@ lbl_80223120: /* 80223154 002200B4 81 9B 00 00 */ lwz r12, 0(r27) /* 80223158 002200B8 81 8C 00 88 */ lwz r12, 0x88(r12) /* 8022315C 002200BC 7D 89 03 A6 */ mtctr r12 -/* 80223160 002200C0 4E 80 04 21 */ bctrl +/* 80223160 002200C0 4E 80 04 21 */ bctrl lbl_80223164: /* 80223164 002200C4 88 1B 0A 48 */ lbz r0, 0xa48(r27) /* 80223168 002200C8 38 60 00 01 */ li r3, 1 @@ -6915,7 +6915,7 @@ lbl_802232A4: /* 802232B0 00220210 80 01 01 14 */ lwz r0, 0x114(r1) /* 802232B4 00220214 7C 08 03 A6 */ mtlr r0 /* 802232B8 00220218 38 21 01 10 */ addi r1, r1, 0x110 -/* 802232BC 0022021C 4E 80 00 20 */ blr +/* 802232BC 0022021C 4E 80 00 20 */ blr .global Think__9CBabygothFfR13CStateManager Think__9CBabygothFfR13CStateManager: @@ -7023,7 +7023,7 @@ lbl_8022336C: /* 8022344C 002203AC 81 83 00 00 */ lwz r12, 0(r3) /* 80223450 002203B0 81 8C 00 14 */ lwz r12, 0x14(r12) /* 80223454 002203B4 7D 89 03 A6 */ mtctr r12 -/* 80223458 002203B8 4E 80 04 21 */ bctrl +/* 80223458 002203B8 4E 80 04 21 */ bctrl /* 8022345C 002203BC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80223460 002203C0 41 82 00 10 */ beq lbl_80223470 /* 80223464 002203C4 7F C3 F3 78 */ mr r3, r30 @@ -7037,7 +7037,7 @@ lbl_80223470: /* 80223480 002203E0 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80223484 002203E4 7C 08 03 A6 */ mtlr r0 /* 80223488 002203E8 38 21 00 40 */ addi r1, r1, 0x40 -/* 8022348C 002203EC 4E 80 00 20 */ blr +/* 8022348C 002203EC 4E 80 00 20 */ blr .global Accept__9CBabygothFR8IVisitor Accept__9CBabygothFR8IVisitor: @@ -7050,11 +7050,11 @@ Accept__9CBabygothFR8IVisitor: /* 802234A8 00220408 7C 04 03 78 */ mr r4, r0 /* 802234AC 0022040C 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 802234B0 00220410 7D 89 03 A6 */ mtctr r12 -/* 802234B4 00220414 4E 80 04 21 */ bctrl +/* 802234B4 00220414 4E 80 04 21 */ bctrl /* 802234B8 00220418 80 01 00 14 */ lwz r0, 0x14(r1) /* 802234BC 0022041C 7C 08 03 A6 */ mtlr r0 /* 802234C0 00220420 38 21 00 10 */ addi r1, r1, 0x10 -/* 802234C4 00220424 4E 80 00 20 */ blr +/* 802234C4 00220424 4E 80 00 20 */ blr .global __dt__9CBabygothFv __dt__9CBabygothFv: @@ -7258,7 +7258,7 @@ lbl_80223764: /* 80223770 002206D0 83 C1 00 08 */ lwz r30, 8(r1) /* 80223774 002206D4 7C 08 03 A6 */ mtlr r0 /* 80223778 002206D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8022377C 002206DC 4E 80 00 20 */ blr +/* 8022377C 002206DC 4E 80 00 20 */ blr .global "__ct__9CBabygothF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC14CPatternedInfoRC16CActorParametersRC13CBabygothData" "__ct__9CBabygothF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC14CPatternedInfoRC16CActorParametersRC13CBabygothData": @@ -7403,7 +7403,7 @@ lbl_80223764: /* 802239A8 00220908 81 84 00 00 */ lwz r12, 0(r4) /* 802239AC 0022090C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802239B0 00220910 7D 89 03 A6 */ mtctr r12 -/* 802239B4 00220914 4E 80 04 21 */ bctrl +/* 802239B4 00220914 4E 80 04 21 */ bctrl /* 802239B8 00220918 38 81 00 D4 */ addi r4, r1, 0xd4 /* 802239BC 0022091C 3B 20 00 01 */ li r25, 1 /* 802239C0 00220920 48 00 00 30 */ b lbl_802239F0 @@ -7416,7 +7416,7 @@ lbl_802239C4: /* 802239D8 00220938 38 A5 00 6B */ addi r5, r5, 0x6b /* 802239DC 0022093C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802239E0 00220940 7D 89 03 A6 */ mtctr r12 -/* 802239E4 00220944 4E 80 04 21 */ bctrl +/* 802239E4 00220944 4E 80 04 21 */ bctrl /* 802239E8 00220948 3B 40 00 01 */ li r26, 1 /* 802239EC 0022094C 38 81 00 CC */ addi r4, r1, 0xcc lbl_802239F0: @@ -7518,7 +7518,7 @@ lbl_80223A20: /* 80223B64 00220AC4 81 84 00 00 */ lwz r12, 0(r4) /* 80223B68 00220AC8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80223B6C 00220ACC 7D 89 03 A6 */ mtctr r12 -/* 80223B70 00220AD0 4E 80 04 21 */ bctrl +/* 80223B70 00220AD0 4E 80 04 21 */ bctrl /* 80223B74 00220AD4 3B 21 01 28 */ addi r25, r1, 0x128 /* 80223B78 00220AD8 38 81 00 AC */ addi r4, r1, 0xac /* 80223B7C 00220ADC 7F 23 CB 78 */ mr r3, r25 @@ -7540,7 +7540,7 @@ lbl_80223A20: /* 80223BBC 00220B1C 81 84 00 00 */ lwz r12, 0(r4) /* 80223BC0 00220B20 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80223BC4 00220B24 7D 89 03 A6 */ mtctr r12 -/* 80223BC8 00220B28 4E 80 04 21 */ bctrl +/* 80223BC8 00220B28 4E 80 04 21 */ bctrl /* 80223BCC 00220B2C 3B 61 01 34 */ addi r27, r1, 0x134 /* 80223BD0 00220B30 38 81 00 BC */ addi r4, r1, 0xbc /* 80223BD4 00220B34 7F 63 DB 78 */ mr r3, r27 @@ -7581,7 +7581,7 @@ lbl_80223C1C: /* 80223C5C 00220BBC 38 80 00 01 */ li r4, 1 /* 80223C60 00220BC0 81 8C 00 08 */ lwz r12, 8(r12) /* 80223C64 00220BC4 7D 89 03 A6 */ mtctr r12 -/* 80223C68 00220BC8 4E 80 04 21 */ bctrl +/* 80223C68 00220BC8 4E 80 04 21 */ bctrl lbl_80223C6C: /* 80223C6C 00220BCC 93 C1 01 24 */ stw r30, 0x124(r1) /* 80223C70 00220BD0 7F 03 C3 78 */ mr r3, r24 @@ -7632,7 +7632,7 @@ lbl_80223CF4: /* 80223D14 00220C74 81 84 00 00 */ lwz r12, 0(r4) /* 80223D18 00220C78 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80223D1C 00220C7C 7D 89 03 A6 */ mtctr r12 -/* 80223D20 00220C80 4E 80 04 21 */ bctrl +/* 80223D20 00220C80 4E 80 04 21 */ bctrl /* 80223D24 00220C84 3B 1D 0A 14 */ addi r24, r29, 0xa14 /* 80223D28 00220C88 38 81 00 9C */ addi r4, r1, 0x9c /* 80223D2C 00220C8C 7F 03 C3 78 */ mr r3, r24 @@ -7655,7 +7655,7 @@ lbl_80223CF4: /* 80223D70 00220CD0 81 84 00 00 */ lwz r12, 0(r4) /* 80223D74 00220CD4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80223D78 00220CD8 7D 89 03 A6 */ mtctr r12 -/* 80223D7C 00220CDC 4E 80 04 21 */ bctrl +/* 80223D7C 00220CDC 4E 80 04 21 */ bctrl /* 80223D80 00220CE0 3B 1D 0A 20 */ addi r24, r29, 0xa20 /* 80223D84 00220CE4 38 81 00 8C */ addi r4, r1, 0x8c /* 80223D88 00220CE8 7F 03 C3 78 */ mr r3, r24 @@ -7678,7 +7678,7 @@ lbl_80223CF4: /* 80223DCC 00220D2C 81 84 00 00 */ lwz r12, 0(r4) /* 80223DD0 00220D30 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80223DD4 00220D34 7D 89 03 A6 */ mtctr r12 -/* 80223DD8 00220D38 4E 80 04 21 */ bctrl +/* 80223DD8 00220D38 4E 80 04 21 */ bctrl /* 80223DDC 00220D3C 3B 1D 0A 2C */ addi r24, r29, 0xa2c /* 80223DE0 00220D40 38 81 00 7C */ addi r4, r1, 0x7c /* 80223DE4 00220D44 7F 03 C3 78 */ mr r3, r24 @@ -7708,7 +7708,7 @@ lbl_80223CF4: /* 80223E44 00220DA4 81 84 00 00 */ lwz r12, 0(r4) /* 80223E48 00220DA8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80223E4C 00220DAC 7D 89 03 A6 */ mtctr r12 -/* 80223E50 00220DB0 4E 80 04 21 */ bctrl +/* 80223E50 00220DB0 4E 80 04 21 */ bctrl /* 80223E54 00220DB4 3B 01 01 10 */ addi r24, r1, 0x110 /* 80223E58 00220DB8 38 81 00 6C */ addi r4, r1, 0x6c /* 80223E5C 00220DBC 7F 03 C3 78 */ mr r3, r24 @@ -7948,7 +7948,7 @@ lbl_802241C0: /* 802241C8 00221128 80 01 01 D4 */ lwz r0, 0x1d4(r1) /* 802241CC 0022112C 7C 08 03 A6 */ mtlr r0 /* 802241D0 00221130 38 21 01 D0 */ addi r1, r1, 0x1d0 -/* 802241D4 00221134 4E 80 00 20 */ blr +/* 802241D4 00221134 4E 80 00 20 */ blr .global __ct__13CBabygothDataFRC13CBabygothData __ct__13CBabygothDataFRC13CBabygothData: @@ -8142,7 +8142,7 @@ __ct__13CBabygothDataFRC13CBabygothData: /* 802244C4 00221424 B0 03 01 70 */ sth r0, 0x170(r3) /* 802244C8 00221428 80 04 01 74 */ lwz r0, 0x174(r4) /* 802244CC 0022142C 90 03 01 74 */ stw r0, 0x174(r3) -/* 802244D0 00221430 4E 80 00 20 */ blr +/* 802244D0 00221430 4E 80 00 20 */ blr .global __ct__13CBabygothDataFR12CInputStream __ct__13CBabygothDataFR12CInputStream: @@ -8250,7 +8250,7 @@ __ct__13CBabygothDataFR12CInputStream: /* 80224668 002215C8 83 C1 00 08 */ lwz r30, 8(r1) /* 8022466C 002215CC 7C 08 03 A6 */ mtlr r0 /* 80224670 002215D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80224674 002215D4 4E 80 00 20 */ blr +/* 80224674 002215D4 4E 80 00 20 */ blr .global __sinit_CBabygoth_cpp __sinit_CBabygoth_cpp: diff --git a/asm/MetroidPrime/Enemies/CBeetle.s b/asm/MetroidPrime/Enemies/CBeetle.s index 855bb710..738f9289 100644 --- a/asm/MetroidPrime/Enemies/CBeetle.s +++ b/asm/MetroidPrime/Enemies/CBeetle.s @@ -292,29 +292,29 @@ lbl_805A8ECC: .global GetSearchPath__7CBeetleFv GetSearchPath__7CBeetleFv: /* 800E2EDC 000DFE3C 38 63 05 FC */ addi r3, r3, 0x5fc -/* 800E2EE0 000DFE40 4E 80 00 20 */ blr +/* 800E2EE0 000DFE40 4E 80 00 20 */ blr .global NoPathNodes__7CBeetleFR13CStateManagerf NoPathNodes__7CBeetleFR13CStateManagerf: /* 800E2EE4 000DFE44 38 60 00 00 */ li r3, 0 -/* 800E2EE8 000DFE48 4E 80 00 20 */ blr +/* 800E2EE8 000DFE48 4E 80 00 20 */ blr .global PathShagged__7CBeetleFR13CStateManager9EStateMsgf PathShagged__7CBeetleFR13CStateManager9EStateMsgf: /* 800E2EEC 000DFE4C 38 60 00 00 */ li r3, 0 -/* 800E2EF0 000DFE50 4E 80 00 20 */ blr +/* 800E2EF0 000DFE50 4E 80 00 20 */ blr .global IsListening__7CBeetleCFv IsListening__7CBeetleCFv: /* 800E2EF4 000DFE54 38 60 00 01 */ li r3, 1 -/* 800E2EF8 000DFE58 4E 80 00 20 */ blr +/* 800E2EF8 000DFE58 4E 80 00 20 */ blr .global GetGravityConstant__7CBeetleCFv GetGravityConstant__7CBeetleCFv: /* 800E2EFC 000DFE5C C0 22 8F CC */ lfs f1, lbl_805AACEC@sda21(r2) /* 800E2F00 000DFE60 C0 02 96 A0 */ lfs f0, lbl_805AB3C0@sda21(r2) /* 800E2F04 000DFE64 EC 21 00 32 */ fmuls f1, f1, f0 -/* 800E2F08 000DFE68 4E 80 00 20 */ blr +/* 800E2F08 000DFE68 4E 80 00 20 */ blr .global RefinePathFindDest__7CBeetleFR13CStateManagerR9CVector3f RefinePathFindDest__7CBeetleFR13CStateManagerR9CVector3f: @@ -416,7 +416,7 @@ lbl_800E3070: /* 800E3078 000DFFD8 83 C1 00 48 */ lwz r30, 0x48(r1) /* 800E307C 000DFFDC 7C 08 03 A6 */ mtlr r0 /* 800E3080 000DFFE0 38 21 00 50 */ addi r1, r1, 0x50 -/* 800E3084 000DFFE4 4E 80 00 20 */ blr +/* 800E3084 000DFFE4 4E 80 00 20 */ blr .global PreRender__7CBeetleFR13CStateManagerRC14CFrustumPlanes PreRender__7CBeetleFR13CStateManagerRC14CFrustumPlanes: @@ -488,7 +488,7 @@ lbl_800E3150: /* 800E3174 000E00D4 83 A1 00 14 */ lwz r29, 0x14(r1) /* 800E3178 000E00D8 7C 08 03 A6 */ mtlr r0 /* 800E317C 000E00DC 38 21 00 30 */ addi r1, r1, 0x30 -/* 800E3180 000E00E0 4E 80 00 20 */ blr +/* 800E3180 000E00E0 4E 80 00 20 */ blr .global FindFurthestRetreatPoint__7CBeetleFR13CStateManager FindFurthestRetreatPoint__7CBeetleFR13CStateManager: @@ -586,7 +586,7 @@ lbl_800E32C4: /* 800E32E0 000E0240 83 81 00 50 */ lwz r28, 0x50(r1) /* 800E32E4 000E0244 7C 08 03 A6 */ mtlr r0 /* 800E32E8 000E0248 38 21 00 70 */ addi r1, r1, 0x70 -/* 800E32EC 000E024C 4E 80 00 20 */ blr +/* 800E32EC 000E024C 4E 80 00 20 */ blr .global SetupRetreatPoints__7CBeetleFR13CStateManager SetupRetreatPoints__7CBeetleFR13CStateManager: @@ -661,7 +661,7 @@ lbl_800E33DC: /* 800E33EC 000E034C 83 81 00 20 */ lwz r28, 0x20(r1) /* 800E33F0 000E0350 7C 08 03 A6 */ mtlr r0 /* 800E33F4 000E0354 38 21 00 30 */ addi r1, r1, 0x30 -/* 800E33F8 000E0358 4E 80 00 20 */ blr +/* 800E33F8 000E0358 4E 80 00 20 */ blr .global SeparateFromMelees__7CBeetleFR13CStateManager SeparateFromMelees__7CBeetleFR13CStateManager: @@ -774,7 +774,7 @@ lbl_800E3574: /* 800E3588 000E04E8 80 01 00 84 */ lwz r0, 0x84(r1) /* 800E358C 000E04EC 7C 08 03 A6 */ mtlr r0 /* 800E3590 000E04F0 38 21 00 80 */ addi r1, r1, 0x80 -/* 800E3594 000E04F4 4E 80 00 20 */ blr +/* 800E3594 000E04F4 4E 80 00 20 */ blr .global GetOrigin__7CBeetleCFv GetOrigin__7CBeetleCFv: @@ -871,7 +871,7 @@ lbl_800E36CC: /* 800E36F8 000E0658 83 A1 00 64 */ lwz r29, 0x64(r1) /* 800E36FC 000E065C 7C 08 03 A6 */ mtlr r0 /* 800E3700 000E0660 38 21 00 80 */ addi r1, r1, 0x80 -/* 800E3704 000E0664 4E 80 00 20 */ blr +/* 800E3704 000E0664 4E 80 00 20 */ blr .global SquadRemove__7CBeetleFR13CStateManager SquadRemove__7CBeetleFR13CStateManager: @@ -916,7 +916,7 @@ lbl_800E3794: /* 800E379C 000E06FC 83 C1 00 28 */ lwz r30, 0x28(r1) /* 800E37A0 000E0700 7C 08 03 A6 */ mtlr r0 /* 800E37A4 000E0704 38 21 00 30 */ addi r1, r1, 0x30 -/* 800E37A8 000E0708 4E 80 00 20 */ blr +/* 800E37A8 000E0708 4E 80 00 20 */ blr .global SquadAdd__7CBeetleFR13CStateManager SquadAdd__7CBeetleFR13CStateManager: @@ -950,7 +950,7 @@ lbl_800E3810: /* 800E3814 000E0774 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 800E3818 000E0778 7C 08 03 A6 */ mtlr r0 /* 800E381C 000E077C 38 21 00 20 */ addi r1, r1, 0x20 -/* 800E3820 000E0780 4E 80 00 20 */ blr +/* 800E3820 000E0780 4E 80 00 20 */ blr .global Death__7CBeetleFRC9CVector3fR13CStateManager Death__7CBeetleFRC9CVector3fR13CStateManager: @@ -1027,7 +1027,7 @@ lbl_800E3928: /* 800E3934 000E0894 83 A1 00 84 */ lwz r29, 0x84(r1) /* 800E3938 000E0898 7C 08 03 A6 */ mtlr r0 /* 800E393C 000E089C 38 21 00 90 */ addi r1, r1, 0x90 -/* 800E3940 000E08A0 4E 80 00 20 */ blr +/* 800E3940 000E08A0 4E 80 00 20 */ blr .global Render__7CBeetleCFRC13CStateManager Render__7CBeetleCFRC13CStateManager: @@ -1112,7 +1112,7 @@ lbl_800E3A60: /* 800E3A74 000E09D4 83 C1 00 88 */ lwz r30, 0x88(r1) /* 800E3A78 000E09D8 7C 08 03 A6 */ mtlr r0 /* 800E3A7C 000E09DC 38 21 00 90 */ addi r1, r1, 0x90 -/* 800E3A80 000E09E0 4E 80 00 20 */ blr +/* 800E3A80 000E09E0 4E 80 00 20 */ blr .global GetAimPosition__7CBeetleCFRC13CStateManagerf GetAimPosition__7CBeetleCFRC13CStateManagerf: @@ -1251,13 +1251,13 @@ lbl_800E3C54: /* 800E3C7C 000E0BDC 83 C1 00 C8 */ lwz r30, 0xc8(r1) /* 800E3C80 000E0BE0 7C 08 03 A6 */ mtlr r0 /* 800E3C84 000E0BE4 38 21 01 10 */ addi r1, r1, 0x110 -/* 800E3C88 000E0BE8 4E 80 00 20 */ blr +/* 800E3C88 000E0BE8 4E 80 00 20 */ blr .global TakeDamage__7CBeetleFRC9CVector3ff TakeDamage__7CBeetleFRC9CVector3ff: /* 800E3C8C 000E0BEC C0 02 88 F0 */ lfs f0, lbl_805AA610@sda21(r2) /* 800E3C90 000E0BF0 D0 03 04 28 */ stfs f0, 0x428(r3) -/* 800E3C94 000E0BF4 4E 80 00 20 */ blr +/* 800E3C94 000E0BF4 4E 80 00 20 */ blr .global GetCollisionResponseType__7CBeetleCFRC9CVector3fRC9CVector3fRC11CWeaponModei GetCollisionResponseType__7CBeetleCFRC9CVector3fRC9CVector3fRC11CWeaponModei: @@ -1350,7 +1350,7 @@ lbl_800E3DD8: /* 800E3DE0 000E0D40 80 01 00 74 */ lwz r0, 0x74(r1) /* 800E3DE4 000E0D44 7C 08 03 A6 */ mtlr r0 /* 800E3DE8 000E0D48 38 21 00 70 */ addi r1, r1, 0x70 -/* 800E3DEC 000E0D4C 4E 80 00 20 */ blr +/* 800E3DEC 000E0D4C 4E 80 00 20 */ blr .global GetDamageVulnerability__7CBeetleCFv GetDamageVulnerability__7CBeetleCFv: @@ -1383,7 +1383,7 @@ lbl_800E3E48: /* 800E3E48 000E0DA8 80 01 00 14 */ lwz r0, 0x14(r1) /* 800E3E4C 000E0DAC 7C 08 03 A6 */ mtlr r0 /* 800E3E50 000E0DB0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E3E54 000E0DB4 4E 80 00 20 */ blr +/* 800E3E54 000E0DB4 4E 80 00 20 */ blr .global GetDamageVulnerability__7CBeetleCFRC9CVector3fRC9CVector3fRC11CDamageInfo GetDamageVulnerability__7CBeetleCFRC9CVector3fRC9CVector3fRC11CDamageInfo: @@ -1466,7 +1466,7 @@ lbl_800E3F78: /* 800E3F78 000E0ED8 81 83 00 00 */ lwz r12, 0(r3) /* 800E3F7C 000E0EDC 81 8C 00 38 */ lwz r12, 0x38(r12) /* 800E3F80 000E0EE0 7D 89 03 A6 */ mtctr r12 -/* 800E3F84 000E0EE4 4E 80 04 21 */ bctrl +/* 800E3F84 000E0EE4 4E 80 04 21 */ bctrl lbl_800E3F88: /* 800E3F88 000E0EE8 80 01 00 64 */ lwz r0, 0x64(r1) /* 800E3F8C 000E0EEC 83 E1 00 5C */ lwz r31, 0x5c(r1) @@ -1474,7 +1474,7 @@ lbl_800E3F88: /* 800E3F94 000E0EF4 83 A1 00 54 */ lwz r29, 0x54(r1) /* 800E3F98 000E0EF8 7C 08 03 A6 */ mtlr r0 /* 800E3F9C 000E0EFC 38 21 00 60 */ addi r1, r1, 0x60 -/* 800E3FA0 000E0F00 4E 80 00 20 */ blr +/* 800E3FA0 000E0F00 4E 80 00 20 */ blr .global Shock__7CBeetleFff Shock__7CBeetleFff: @@ -1492,7 +1492,7 @@ Shock__7CBeetleFff: /* 800E3FD0 000E0F30 7C 7F 1B 78 */ mr r31, r3 /* 800E3FD4 000E0F34 81 8C 00 38 */ lwz r12, 0x38(r12) /* 800E3FD8 000E0F38 7D 89 03 A6 */ mtctr r12 -/* 800E3FDC 000E0F3C 4E 80 04 21 */ bctrl +/* 800E3FDC 000E0F3C 4E 80 04 21 */ bctrl /* 800E3FE0 000E0F40 80 83 00 00 */ lwz r4, 0(r3) /* 800E3FE4 000E0F44 80 03 00 04 */ lwz r0, 4(r3) /* 800E3FE8 000E0F48 90 81 00 10 */ stw r4, 0x10(r1) @@ -1649,7 +1649,7 @@ lbl_800E4220: /* 800E4234 000E1194 83 E1 00 7C */ lwz r31, 0x7c(r1) /* 800E4238 000E1198 7C 08 03 A6 */ mtlr r0 /* 800E423C 000E119C 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 800E4240 000E11A0 4E 80 00 20 */ blr +/* 800E4240 000E11A0 4E 80 00 20 */ blr .global Burn__7CBeetleFff Burn__7CBeetleFff: @@ -1667,7 +1667,7 @@ Burn__7CBeetleFff: /* 800E4270 000E11D0 7C 7F 1B 78 */ mr r31, r3 /* 800E4274 000E11D4 81 8C 00 38 */ lwz r12, 0x38(r12) /* 800E4278 000E11D8 7D 89 03 A6 */ mtctr r12 -/* 800E427C 000E11DC 4E 80 04 21 */ bctrl +/* 800E427C 000E11DC 4E 80 04 21 */ bctrl /* 800E4280 000E11E0 80 83 00 00 */ lwz r4, 0(r3) /* 800E4284 000E11E4 80 03 00 04 */ lwz r0, 4(r3) /* 800E4288 000E11E8 90 81 00 10 */ stw r4, 0x10(r1) @@ -1824,7 +1824,7 @@ lbl_800E44C0: /* 800E44D4 000E1434 83 E1 00 7C */ lwz r31, 0x7c(r1) /* 800E44D8 000E1438 7C 08 03 A6 */ mtlr r0 /* 800E44DC 000E143C 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 800E44E0 000E1440 4E 80 00 20 */ blr +/* 800E44E0 000E1440 4E 80 00 20 */ blr .global CollidedWith__9CBeetleFRC9TUniqueIdRC18CCollisionInfoListR13CStateManager CollidedWith__9CBeetleFRC9TUniqueIdRC18CCollisionInfoListR13CStateManager: @@ -1918,7 +1918,7 @@ lbl_800E4608: /* 800E462C 000E158C 80 01 00 34 */ lwz r0, 0x34(r1) /* 800E4630 000E1590 7C 08 03 A6 */ mtlr r0 /* 800E4634 000E1594 38 21 00 30 */ addi r1, r1, 0x30 -/* 800E4638 000E1598 4E 80 00 20 */ blr +/* 800E4638 000E1598 4E 80 00 20 */ blr .global Think__7CBeetleFfR13CStateManager Think__7CBeetleFfR13CStateManager: @@ -1967,7 +1967,7 @@ lbl_800E46D4: /* 800E46D8 000E1638 81 9E 00 00 */ lwz r12, 0(r30) /* 800E46DC 000E163C 81 8C 02 B8 */ lwz r12, 0x2b8(r12) /* 800E46E0 000E1640 7D 89 03 A6 */ mtctr r12 -/* 800E46E4 000E1644 4E 80 04 21 */ bctrl +/* 800E46E4 000E1644 4E 80 04 21 */ bctrl /* 800E46E8 000E1648 7C 64 1B 78 */ mr r4, r3 /* 800E46EC 000E164C 38 7E 04 60 */ addi r3, r30, 0x460 /* 800E46F0 000E1650 48 14 F6 75 */ bl SetAutoResetImpulse__20CKnockBackControllerFb @@ -2038,7 +2038,7 @@ lbl_800E47D4: /* 800E47E4 000E1744 83 C1 00 38 */ lwz r30, 0x38(r1) /* 800E47E8 000E1748 7C 08 03 A6 */ mtlr r0 /* 800E47EC 000E174C 38 21 00 50 */ addi r1, r1, 0x50 -/* 800E47F0 000E1750 4E 80 00 20 */ blr +/* 800E47F0 000E1750 4E 80 00 20 */ blr .global DoUserAnimEvent__7CBeetleFR13CStateManagerRC13CInt32POINode14EUserEventType DoUserAnimEvent__7CBeetleFR13CStateManagerRC13CInt32POINode14EUserEventType: @@ -2233,7 +2233,7 @@ lbl_800E4A7C: /* 800E4AC4 000E1A24 83 81 00 E0 */ lwz r28, 0xe0(r1) /* 800E4AC8 000E1A28 7C 08 03 A6 */ mtlr r0 /* 800E4ACC 000E1A2C 38 21 01 60 */ addi r1, r1, 0x160 -/* 800E4AD0 000E1A30 4E 80 00 20 */ blr +/* 800E4AD0 000E1A30 4E 80 00 20 */ blr .global Retreat__7CBeetleFR13CStateManager9EStateMsgf Retreat__7CBeetleFR13CStateManager9EStateMsgf: @@ -2313,7 +2313,7 @@ lbl_800E4BE0: /* 800E4BE0 000E1B40 81 83 00 00 */ lwz r12, 0(r3) /* 800E4BE4 000E1B44 81 8C 02 B8 */ lwz r12, 0x2b8(r12) /* 800E4BE8 000E1B48 7D 89 03 A6 */ mtctr r12 -/* 800E4BEC 000E1B4C 4E 80 04 21 */ bctrl +/* 800E4BEC 000E1B4C 4E 80 04 21 */ bctrl /* 800E4BF0 000E1B50 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E4BF4 000E1B54 41 82 00 D4 */ beq lbl_800E4CC8 /* 800E4BF8 000E1B58 3C C0 80 3E */ lis r6, lbl_803DAA68@ha @@ -2572,7 +2572,7 @@ lbl_800E4FAC: /* 800E4FBC 000E1F1C 83 C1 00 E8 */ lwz r30, 0xe8(r1) /* 800E4FC0 000E1F20 7C 08 03 A6 */ mtlr r0 /* 800E4FC4 000E1F24 38 21 01 00 */ addi r1, r1, 0x100 -/* 800E4FC8 000E1F28 4E 80 00 20 */ blr +/* 800E4FC8 000E1F28 4E 80 00 20 */ blr .global PathFind__7CBeetleFR13CStateManager9EStateMsgf PathFind__7CBeetleFR13CStateManager9EStateMsgf: @@ -2602,7 +2602,7 @@ lbl_800E5024: /* 800E5024 000E1F84 81 83 00 00 */ lwz r12, 0(r3) /* 800E5028 000E1F88 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 800E502C 000E1F8C 7D 89 03 A6 */ mtctr r12 -/* 800E5030 000E1F90 4E 80 04 21 */ bctrl +/* 800E5030 000E1F90 4E 80 04 21 */ bctrl /* 800E5034 000E1F94 28 03 00 00 */ cmplwi r3, 0 /* 800E5038 000E1F98 41 82 02 10 */ beq lbl_800E5248 /* 800E503C 000E1F9C 7F A3 EB 78 */ mr r3, r29 @@ -2643,7 +2643,7 @@ lbl_800E5064: /* 800E50C4 000E2024 81 9D 00 00 */ lwz r12, 0(r29) /* 800E50C8 000E2028 81 8C 01 90 */ lwz r12, 0x190(r12) /* 800E50CC 000E202C 7D 89 03 A6 */ mtctr r12 -/* 800E50D0 000E2030 4E 80 04 21 */ bctrl +/* 800E50D0 000E2030 4E 80 04 21 */ bctrl /* 800E50D4 000E2034 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E50D8 000E2038 40 82 00 40 */ bne lbl_800E5118 /* 800E50DC 000E203C 80 7D 06 00 */ lwz r3, 0x600(r29) @@ -2757,7 +2757,7 @@ lbl_800E5248: /* 800E526C 000E21CC 83 A1 00 84 */ lwz r29, 0x84(r1) /* 800E5270 000E21D0 7C 08 03 A6 */ mtlr r0 /* 800E5274 000E21D4 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 800E5278 000E21D8 4E 80 00 20 */ blr +/* 800E5278 000E21D8 4E 80 00 20 */ blr .global Taunt__7CBeetleFR13CStateManager9EStateMsgf Taunt__7CBeetleFR13CStateManager9EStateMsgf: @@ -2839,7 +2839,7 @@ lbl_800E5388: /* 800E5390 000E22F0 83 C1 00 18 */ lwz r30, 0x18(r1) /* 800E5394 000E22F4 7C 08 03 A6 */ mtlr r0 /* 800E5398 000E22F8 38 21 00 20 */ addi r1, r1, 0x20 -/* 800E539C 000E22FC 4E 80 00 20 */ blr +/* 800E539C 000E22FC 4E 80 00 20 */ blr .global Skid__7CBeetleFR13CStateManager9EStateMsgf Skid__7CBeetleFR13CStateManager9EStateMsgf: @@ -2863,7 +2863,7 @@ lbl_800E53DC: /* 800E53DC 000E233C 81 83 00 00 */ lwz r12, 0(r3) /* 800E53E0 000E2340 81 8C 02 B8 */ lwz r12, 0x2b8(r12) /* 800E53E4 000E2344 7D 89 03 A6 */ mtctr r12 -/* 800E53E8 000E2348 4E 80 04 21 */ bctrl +/* 800E53E8 000E2348 4E 80 04 21 */ bctrl /* 800E53EC 000E234C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E53F0 000E2350 41 82 01 0C */ beq lbl_800E54FC /* 800E53F4 000E2354 88 1E 08 38 */ lbz r0, 0x838(r30) @@ -2940,7 +2940,7 @@ lbl_800E54FC: /* 800E5504 000E2464 83 C1 00 38 */ lwz r30, 0x38(r1) /* 800E5508 000E2468 7C 08 03 A6 */ mtlr r0 /* 800E550C 000E246C 38 21 00 40 */ addi r1, r1, 0x40 -/* 800E5510 000E2470 4E 80 00 20 */ blr +/* 800E5510 000E2470 4E 80 00 20 */ blr .global PatternOver__7CBeetleFR13CStateManagerf PatternOver__7CBeetleFR13CStateManagerf: @@ -2950,11 +2950,11 @@ PatternOver__7CBeetleFR13CStateManagerf: /* 800E5520 000E2480 81 83 00 00 */ lwz r12, 0(r3) /* 800E5524 000E2484 81 8C 01 D8 */ lwz r12, 0x1d8(r12) /* 800E5528 000E2488 7D 89 03 A6 */ mtctr r12 -/* 800E552C 000E248C 4E 80 04 21 */ bctrl +/* 800E552C 000E248C 4E 80 04 21 */ bctrl /* 800E5530 000E2490 80 01 00 14 */ lwz r0, 0x14(r1) /* 800E5534 000E2494 7C 08 03 A6 */ mtlr r0 /* 800E5538 000E2498 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E553C 000E249C 4E 80 00 20 */ blr +/* 800E553C 000E249C 4E 80 00 20 */ blr .global ShotAt__7CBeetleFR13CStateManagerf ShotAt__7CBeetleFR13CStateManagerf: @@ -2969,10 +2969,10 @@ ShotAt__7CBeetleFR13CStateManagerf: /* 800E5560 000E24C0 7C 03 00 D0 */ neg r0, r3 /* 800E5564 000E24C4 7C 00 1B 78 */ or r0, r0, r3 /* 800E5568 000E24C8 54 03 0F FE */ srwi r3, r0, 0x1f -/* 800E556C 000E24CC 4E 80 00 20 */ blr +/* 800E556C 000E24CC 4E 80 00 20 */ blr lbl_800E5570: /* 800E5570 000E24D0 38 60 00 00 */ li r3, 0 -/* 800E5574 000E24D4 4E 80 00 20 */ blr +/* 800E5574 000E24D4 4E 80 00 20 */ blr .global ShouldTaunt__7CBeetleFR13CStateManagerf ShouldTaunt__7CBeetleFR13CStateManagerf: @@ -3022,7 +3022,7 @@ lbl_800E5614: /* 800E5618 000E2578 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 800E561C 000E257C 7C 08 03 A6 */ mtlr r0 /* 800E5620 000E2580 38 21 00 20 */ addi r1, r1, 0x20 -/* 800E5624 000E2584 4E 80 00 20 */ blr +/* 800E5624 000E2584 4E 80 00 20 */ blr .global AnimOver__7CBeetleFR13CStateManagerf AnimOver__7CBeetleFR13CStateManagerf: @@ -3030,7 +3030,7 @@ AnimOver__7CBeetleFR13CStateManagerf: /* 800E562C 000E258C 20 00 00 04 */ subfic r0, r0, 4 /* 800E5630 000E2590 7C 00 00 34 */ cntlzw r0, r0 /* 800E5634 000E2594 54 03 D9 7E */ srwi r3, r0, 5 -/* 800E5638 000E2598 4E 80 00 20 */ blr +/* 800E5638 000E2598 4E 80 00 20 */ blr .global TurnAround__7CBeetleFR13CStateManager9EStateMsgf TurnAround__7CBeetleFR13CStateManager9EStateMsgf: @@ -3129,7 +3129,7 @@ lbl_800E5784: /* 800E5788 000E26E8 83 E1 00 4C */ lwz r31, 0x4c(r1) /* 800E578C 000E26EC 7C 08 03 A6 */ mtlr r0 /* 800E5790 000E26F0 38 21 00 50 */ addi r1, r1, 0x50 -/* 800E5794 000E26F4 4E 80 00 20 */ blr +/* 800E5794 000E26F4 4E 80 00 20 */ blr .global ShouldTurn__7CBeetleFR13CStateManagerf ShouldTurn__7CBeetleFR13CStateManagerf: @@ -3183,7 +3183,7 @@ ShouldTurn__7CBeetleFR13CStateManagerf: /* 800E5854 000E27B4 80 01 00 64 */ lwz r0, 0x64(r1) /* 800E5858 000E27B8 7C 08 03 A6 */ mtlr r0 /* 800E585C 000E27BC 38 21 00 60 */ addi r1, r1, 0x60 -/* 800E5860 000E27C0 4E 80 00 20 */ blr +/* 800E5860 000E27C0 4E 80 00 20 */ blr .global Stuck__7CBeetleFR13CStateManagerf Stuck__7CBeetleFR13CStateManagerf: @@ -3193,13 +3193,13 @@ Stuck__7CBeetleFR13CStateManagerf: /* 800E5870 000E27D0 7C 00 00 34 */ cntlzw r0, r0 /* 800E5874 000E27D4 7C 60 00 30 */ slw r0, r3, r0 /* 800E5878 000E27D8 54 03 0F FE */ srwi r3, r0, 0x1f -/* 800E587C 000E27DC 4E 80 00 20 */ blr +/* 800E587C 000E27DC 4E 80 00 20 */ blr .global HitSomething__7CBeetleFR13CStateManagerf HitSomething__7CBeetleFR13CStateManagerf: /* 800E5880 000E27E0 88 03 08 38 */ lbz r0, 0x838(r3) /* 800E5884 000E27E4 54 03 CF FE */ rlwinm r3, r0, 0x19, 0x1f, 0x1f -/* 800E5888 000E27E8 4E 80 00 20 */ blr +/* 800E5888 000E27E8 4E 80 00 20 */ blr .global Shuffle__7CBeetleFR13CStateManager9EStateMsgf Shuffle__7CBeetleFR13CStateManager9EStateMsgf: @@ -3477,7 +3477,7 @@ lbl_800E5C68: /* 800E5C90 000E2BF0 83 C1 00 E8 */ lwz r30, 0xe8(r1) /* 800E5C94 000E2BF4 7C 08 03 A6 */ mtlr r0 /* 800E5C98 000E2BF8 38 21 01 30 */ addi r1, r1, 0x130 -/* 800E5C9C 000E2BFC 4E 80 00 20 */ blr +/* 800E5C9C 000E2BFC 4E 80 00 20 */ blr .global DoubleSnap__7CBeetleFR13CStateManager9EStateMsgf DoubleSnap__7CBeetleFR13CStateManager9EStateMsgf: @@ -3583,7 +3583,7 @@ lbl_800E5E08: /* 800E5E0C 000E2D6C 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 800E5E10 000E2D70 7C 08 03 A6 */ mtlr r0 /* 800E5E14 000E2D74 38 21 00 30 */ addi r1, r1, 0x30 -/* 800E5E18 000E2D78 4E 80 00 20 */ blr +/* 800E5E18 000E2D78 4E 80 00 20 */ blr .global ShouldDoubleSnap__7CBeetleFR13CStateManagerf ShouldDoubleSnap__7CBeetleFR13CStateManagerf: @@ -3607,14 +3607,14 @@ ShouldDoubleSnap__7CBeetleFR13CStateManagerf: /* 800E5E60 000E2DC0 3B E0 00 00 */ li r31, 0 /* 800E5E64 000E2DC4 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 800E5E68 000E2DC8 7D 89 03 A6 */ mtctr r12 -/* 800E5E6C 000E2DCC 4E 80 04 21 */ bctrl +/* 800E5E6C 000E2DCC 4E 80 04 21 */ bctrl /* 800E5E70 000E2DD0 28 03 00 00 */ cmplwi r3, 0 /* 800E5E74 000E2DD4 40 82 02 54 */ bne lbl_800E60C8 /* 800E5E78 000E2DD8 7F A3 EB 78 */ mr r3, r29 /* 800E5E7C 000E2DDC 81 9D 00 00 */ lwz r12, 0(r29) /* 800E5E80 000E2DE0 81 8C 02 B8 */ lwz r12, 0x2b8(r12) /* 800E5E84 000E2DE4 7D 89 03 A6 */ mtctr r12 -/* 800E5E88 000E2DE8 4E 80 04 21 */ bctrl +/* 800E5E88 000E2DE8 4E 80 04 21 */ bctrl /* 800E5E8C 000E2DEC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E5E90 000E2DF0 41 82 02 38 */ beq lbl_800E60C8 /* 800E5E94 000E2DF4 80 DE 08 4C */ lwz r6, 0x84c(r30) @@ -3780,7 +3780,7 @@ lbl_800E60C8: /* 800E60F8 000E3058 83 A1 08 F4 */ lwz r29, 0x8f4(r1) /* 800E60FC 000E305C 7C 08 03 A6 */ mtlr r0 /* 800E6100 000E3060 38 21 09 40 */ addi r1, r1, 0x940 -/* 800E6104 000E3064 4E 80 00 20 */ blr +/* 800E6104 000E3064 4E 80 00 20 */ blr .global JumpBack__7CBeetleFR13CStateManager9EStateMsgf JumpBack__7CBeetleFR13CStateManager9EStateMsgf: @@ -3823,7 +3823,7 @@ lbl_800E6184: /* 800E6184 000E30E4 81 83 00 00 */ lwz r12, 0(r3) /* 800E6188 000E30E8 81 8C 02 B8 */ lwz r12, 0x2b8(r12) /* 800E618C 000E30EC 7D 89 03 A6 */ mtctr r12 -/* 800E6190 000E30F0 4E 80 04 21 */ bctrl +/* 800E6190 000E30F0 4E 80 04 21 */ bctrl /* 800E6194 000E30F4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E6198 000E30F8 41 82 00 90 */ beq lbl_800E6228 /* 800E619C 000E30FC 3C 60 80 3E */ lis r3, lbl_803DAA68@ha @@ -3867,7 +3867,7 @@ lbl_800E6228: /* 800E622C 000E318C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 800E6230 000E3190 7C 08 03 A6 */ mtlr r0 /* 800E6234 000E3194 38 21 00 20 */ addi r1, r1, 0x20 -/* 800E6238 000E3198 4E 80 00 20 */ blr +/* 800E6238 000E3198 4E 80 00 20 */ blr .global ShouldJumpBack__7CBeetleFR13CStateManagerf ShouldJumpBack__7CBeetleFR13CStateManagerf: @@ -3987,7 +3987,7 @@ lbl_800E63D4: /* 800E63EC 000E334C 80 01 08 D4 */ lwz r0, 0x8d4(r1) /* 800E63F0 000E3350 7C 08 03 A6 */ mtlr r0 /* 800E63F4 000E3354 38 21 08 D0 */ addi r1, r1, 0x8d0 -/* 800E63F8 000E3358 4E 80 00 20 */ blr +/* 800E63F8 000E3358 4E 80 00 20 */ blr .global ShouldAttack__7CBeetleFR13CStateManagerf ShouldAttack__7CBeetleFR13CStateManagerf: @@ -4039,7 +4039,7 @@ lbl_800E649C: /* 800E64A4 000E3404 83 C1 00 28 */ lwz r30, 0x28(r1) /* 800E64A8 000E3408 7C 08 03 A6 */ mtlr r0 /* 800E64AC 000E340C 38 21 00 30 */ addi r1, r1, 0x30 -/* 800E64B0 000E3410 4E 80 00 20 */ blr +/* 800E64B0 000E3410 4E 80 00 20 */ blr .global InAttackPosition__7CBeetleFR13CStateManager9EStateMsgf InAttackPosition__7CBeetleFR13CStateManager9EStateMsgf: @@ -4081,7 +4081,7 @@ InAttackPosition__7CBeetleFR13CStateManager9EStateMsgf: /* 800E6540 000E34A0 C0 23 03 C8 */ lfs f1, 0x3c8(r3) /* 800E6544 000E34A4 81 8C 01 AC */ lwz r12, 0x1ac(r12) /* 800E6548 000E34A8 7D 89 03 A6 */ mtctr r12 -/* 800E654C 000E34AC 4E 80 04 21 */ bctrl +/* 800E654C 000E34AC 4E 80 04 21 */ bctrl /* 800E6550 000E34B0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E6554 000E34B4 41 82 00 08 */ beq lbl_800E655C /* 800E6558 000E34B8 3B E0 00 01 */ li r31, 1 @@ -4091,7 +4091,7 @@ lbl_800E655C: /* 800E6564 000E34C4 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 800E6568 000E34C8 7C 08 03 A6 */ mtlr r0 /* 800E656C 000E34CC 38 21 00 30 */ addi r1, r1, 0x30 -/* 800E6570 000E34D0 4E 80 00 20 */ blr +/* 800E6570 000E34D0 4E 80 00 20 */ blr .global InRange__7CBeetleFR13CStateManager9EStateMsgf InRange__7CBeetleFR13CStateManager9EStateMsgf: @@ -4151,12 +4151,12 @@ lbl_800E65F4: /* 800E6644 000E35A4 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 800E6648 000E35A8 7C 08 03 A6 */ mtlr r0 /* 800E664C 000E35AC 38 21 00 50 */ addi r1, r1, 0x50 -/* 800E6650 000E35B0 4E 80 00 20 */ blr +/* 800E6650 000E35B0 4E 80 00 20 */ blr .global HasAttackPattern__7CBeetleFR13CStateManagerf HasAttackPattern__7CBeetleFR13CStateManagerf: /* 800E6654 000E35B4 38 60 00 01 */ li r3, 1 -/* 800E6658 000E35B8 4E 80 00 20 */ blr +/* 800E6658 000E35B8 4E 80 00 20 */ blr .global FollowPattern__7CBeetleFR13CStateManager9EStateMsgf FollowPattern__7CBeetleFR13CStateManager9EStateMsgf: @@ -4202,7 +4202,7 @@ lbl_800E66E4: /* 800E66E4 000E3644 81 83 00 00 */ lwz r12, 0(r3) /* 800E66E8 000E3648 81 8C 02 B8 */ lwz r12, 0x2b8(r12) /* 800E66EC 000E364C 7D 89 03 A6 */ mtctr r12 -/* 800E66F0 000E3650 4E 80 04 21 */ bctrl +/* 800E66F0 000E3650 4E 80 04 21 */ bctrl /* 800E66F4 000E3654 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E66F8 000E3658 41 82 01 58 */ beq lbl_800E6850 /* 800E66FC 000E365C 3C 80 80 3E */ lis r4, lbl_803DAA68@ha @@ -4243,7 +4243,7 @@ lbl_800E6774: /* 800E6784 000E36E4 81 83 00 00 */ lwz r12, 0(r3) /* 800E6788 000E36E8 81 8C 02 B8 */ lwz r12, 0x2b8(r12) /* 800E678C 000E36EC 7D 89 03 A6 */ mtctr r12 -/* 800E6790 000E36F0 4E 80 04 21 */ bctrl +/* 800E6790 000E36F0 4E 80 04 21 */ bctrl /* 800E6794 000E36F4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E6798 000E36F8 41 82 00 B8 */ beq lbl_800E6850 /* 800E679C 000E36FC 3C 80 80 3E */ lis r4, lbl_803DAA68@ha @@ -4316,7 +4316,7 @@ lbl_800E6888: /* 800E6894 000E37F4 83 A1 00 34 */ lwz r29, 0x34(r1) /* 800E6898 000E37F8 7C 08 03 A6 */ mtlr r0 /* 800E689C 000E37FC 38 21 00 40 */ addi r1, r1, 0x40 -/* 800E68A0 000E3800 4E 80 00 20 */ blr +/* 800E68A0 000E3800 4E 80 00 20 */ blr .global Attack__7CBeetleFR13CStateManager9EStateMsgf Attack__7CBeetleFR13CStateManager9EStateMsgf: @@ -4394,7 +4394,7 @@ lbl_800E69A8: /* 800E69A8 000E3908 81 83 00 00 */ lwz r12, 0(r3) /* 800E69AC 000E390C 81 8C 02 B8 */ lwz r12, 0x2b8(r12) /* 800E69B0 000E3910 7D 89 03 A6 */ mtctr r12 -/* 800E69B4 000E3914 4E 80 04 21 */ bctrl +/* 800E69B4 000E3914 4E 80 04 21 */ bctrl /* 800E69B8 000E3918 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E69BC 000E391C 41 82 01 C8 */ beq lbl_800E6B84 /* 800E69C0 000E3920 80 9E 08 4C */ lwz r4, 0x84c(r30) @@ -4404,7 +4404,7 @@ lbl_800E69A8: /* 800E69D0 000E3930 81 84 00 00 */ lwz r12, 0(r4) /* 800E69D4 000E3934 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 800E69D8 000E3938 7D 89 03 A6 */ mtctr r12 -/* 800E69DC 000E393C 4E 80 04 21 */ bctrl +/* 800E69DC 000E393C 4E 80 04 21 */ bctrl /* 800E69E0 000E3940 C3 DF 00 60 */ lfs f30, 0x60(r31) /* 800E69E4 000E3944 38 61 00 44 */ addi r3, r1, 0x44 /* 800E69E8 000E3948 C0 3F 00 40 */ lfs f1, 0x40(r31) @@ -4487,7 +4487,7 @@ lbl_800E6B10: /* 800E6B10 000E3A70 81 83 00 00 */ lwz r12, 0(r3) /* 800E6B14 000E3A74 81 8C 02 B8 */ lwz r12, 0x2b8(r12) /* 800E6B18 000E3A78 7D 89 03 A6 */ mtctr r12 -/* 800E6B1C 000E3A7C 4E 80 04 21 */ bctrl +/* 800E6B1C 000E3A7C 4E 80 04 21 */ bctrl /* 800E6B20 000E3A80 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E6B24 000E3A84 41 82 00 3C */ beq lbl_800E6B60 /* 800E6B28 000E3A88 C0 3F 02 E0 */ lfs f1, 0x2e0(r31) @@ -4553,7 +4553,7 @@ lbl_800E6BE4: /* 800E6C04 000E3B64 83 C1 00 78 */ lwz r30, 0x78(r1) /* 800E6C08 000E3B68 7C 08 03 A6 */ mtlr r0 /* 800E6C0C 000E3B6C 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 800E6C10 000E3B70 4E 80 00 20 */ blr +/* 800E6C10 000E3B70 4E 80 00 20 */ blr .global TargetPlayer__7CBeetleFR13CStateManager9EStateMsgf TargetPlayer__7CBeetleFR13CStateManager9EStateMsgf: @@ -4614,7 +4614,7 @@ lbl_800E6CD4: /* 800E6CDC 000E3C3C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 800E6CE0 000E3C40 7C 08 03 A6 */ mtlr r0 /* 800E6CE4 000E3C44 38 21 00 20 */ addi r1, r1, 0x20 -/* 800E6CE8 000E3C48 4E 80 00 20 */ blr +/* 800E6CE8 000E3C48 4E 80 00 20 */ blr .global Deactivate__7CBeetleFR13CStateManager9EStateMsgf Deactivate__7CBeetleFR13CStateManager9EStateMsgf: @@ -4687,7 +4687,7 @@ lbl_800E6DE0: /* 800E6DE0 000E3D40 81 83 00 00 */ lwz r12, 0(r3) /* 800E6DE4 000E3D44 81 8C 02 B8 */ lwz r12, 0x2b8(r12) /* 800E6DE8 000E3D48 7D 89 03 A6 */ mtctr r12 -/* 800E6DEC 000E3D4C 4E 80 04 21 */ bctrl +/* 800E6DEC 000E3D4C 4E 80 04 21 */ bctrl /* 800E6DF0 000E3D50 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E6DF4 000E3D54 41 82 00 D4 */ beq lbl_800E6EC8 /* 800E6DF8 000E3D58 3C C0 80 3E */ lis r6, lbl_803DAA68@ha @@ -4894,7 +4894,7 @@ lbl_800E70EC: /* 800E7100 000E4060 83 A1 00 D4 */ lwz r29, 0xd4(r1) /* 800E7104 000E4064 7C 08 03 A6 */ mtlr r0 /* 800E7108 000E4068 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 800E710C 000E406C 4E 80 00 20 */ blr +/* 800E710C 000E406C 4E 80 00 20 */ blr .global Generate__7CBeetleFR13CStateManager9EStateMsgf Generate__7CBeetleFR13CStateManager9EStateMsgf: @@ -5367,7 +5367,7 @@ lbl_800E77D4: /* 800E77F8 000E4758 80 01 09 E4 */ lwz r0, 0x9e4(r1) /* 800E77FC 000E475C 7C 08 03 A6 */ mtlr r0 /* 800E7800 000E4760 38 21 09 E0 */ addi r1, r1, 0x9e0 -/* 800E7804 000E4764 4E 80 00 20 */ blr +/* 800E7804 000E4764 4E 80 00 20 */ blr .global GetOrbitPosition__7CBeetleCFRC13CStateManager GetOrbitPosition__7CBeetleCFRC13CStateManager: @@ -5405,7 +5405,7 @@ GetOrbitPosition__7CBeetleCFRC13CStateManager: /* 800E7884 000E47E4 83 C1 00 38 */ lwz r30, 0x38(r1) /* 800E7888 000E47E8 7C 08 03 A6 */ mtlr r0 /* 800E788C 000E47EC 38 21 00 60 */ addi r1, r1, 0x60 -/* 800E7890 000E47F0 4E 80 00 20 */ blr +/* 800E7890 000E47F0 4E 80 00 20 */ blr .global AcceptScriptMsg__7CBeetleF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__7CBeetleF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -5427,7 +5427,7 @@ AcceptScriptMsg__7CBeetleF20EScriptObjectMessage9TUniqueIdR13CStateManager: /* 800E78D0 000E4830 38 84 FB 5C */ addi r4, r4, lbl_803DFB5C@l /* 800E78D4 000E4834 7C 04 00 2E */ lwzx r0, r4, r0 /* 800E78D8 000E4838 7C 09 03 A6 */ mtctr r0 -/* 800E78DC 000E483C 4E 80 04 20 */ bctr +/* 800E78DC 000E483C 4E 80 04 20 */ bctr .global lbl_800E78E0 lbl_800E78E0: /* 800E78E0 000E4840 7F C4 F3 78 */ mr r4, r30 @@ -5464,7 +5464,7 @@ lbl_800E7930: /* 800E7944 000E48A4 C3 FB 00 E8 */ lfs f31, 0xe8(r27) /* 800E7948 000E48A8 81 8C 02 BC */ lwz r12, 0x2bc(r12) /* 800E794C 000E48AC 7D 89 03 A6 */ mtctr r12 -/* 800E7950 000E48B0 4E 80 04 21 */ bctrl +/* 800E7950 000E48B0 4E 80 04 21 */ bctrl /* 800E7954 000E48B4 EC 01 07 F2 */ fmuls f0, f1, f31 /* 800E7958 000E48B8 C0 22 8F E4 */ lfs f1, lbl_805AAD04@sda21(r2) /* 800E795C 000E48BC 38 60 00 00 */ li r3, 0 @@ -5529,7 +5529,7 @@ lbl_800E7A20: /* 800E7A2C 000E498C 80 01 00 44 */ lwz r0, 0x44(r1) /* 800E7A30 000E4990 7C 08 03 A6 */ mtlr r0 /* 800E7A34 000E4994 38 21 00 40 */ addi r1, r1, 0x40 -/* 800E7A38 000E4998 4E 80 00 20 */ blr +/* 800E7A38 000E4998 4E 80 00 20 */ blr .global Accept__7CBeetleFR8IVisitor Accept__7CBeetleFR8IVisitor: @@ -5542,11 +5542,11 @@ Accept__7CBeetleFR8IVisitor: /* 800E7A54 000E49B4 7C 04 03 78 */ mr r4, r0 /* 800E7A58 000E49B8 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 800E7A5C 000E49BC 7D 89 03 A6 */ mtctr r12 -/* 800E7A60 000E49C0 4E 80 04 21 */ bctrl +/* 800E7A60 000E49C0 4E 80 04 21 */ bctrl /* 800E7A64 000E49C4 80 01 00 14 */ lwz r0, 0x14(r1) /* 800E7A68 000E49C8 7C 08 03 A6 */ mtlr r0 /* 800E7A6C 000E49CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E7A70 000E49D0 4E 80 00 20 */ blr +/* 800E7A70 000E49D0 4E 80 00 20 */ blr .global __dt__7CBeetleFv __dt__7CBeetleFv: @@ -5645,7 +5645,7 @@ lbl_800E7BA4: /* 800E7BB0 000E4B10 83 C1 00 08 */ lwz r30, 8(r1) /* 800E7BB4 000E4B14 7C 08 03 A6 */ mtlr r0 /* 800E7BB8 000E4B18 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E7BBC 000E4B1C 4E 80 00 20 */ blr +/* 800E7BBC 000E4B1C 4E 80 00 20 */ blr .global "__ct__7CBeetleF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC14CPatternedInfoQ210CPatterned11EFlavorTypeQ27CBeetle13EEntranceTypeRC11CDamageInfoRC20CDamageVulnerabilityRC9CVector3ffRC20CDamageVulnerabilityRC16CActorParametersRCQ24rstl29optional_object<10CStaticRes>" "__ct__7CBeetleF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC14CPatternedInfoQ210CPatterned11EFlavorTypeQ27CBeetle13EEntranceTypeRC11CDamageInfoRC20CDamageVulnerabilityRC9CVector3ffRC20CDamageVulnerabilityRC16CActorParametersRCQ24rstl29optional_object<10CStaticRes>": @@ -6077,7 +6077,7 @@ lbl_800E81FC: /* 800E821C 000E517C 80 01 02 94 */ lwz r0, 0x294(r1) /* 800E8220 000E5180 7C 08 03 A6 */ mtlr r0 /* 800E8224 000E5184 38 21 02 90 */ addi r1, r1, 0x290 -/* 800E8228 000E5188 4E 80 00 20 */ blr +/* 800E8228 000E5188 4E 80 00 20 */ blr .global sub_800e822c sub_800e822c: @@ -6098,7 +6098,7 @@ lbl_800E8258: /* 800E8260 000E51C0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800E8264 000E51C4 7C 08 03 A6 */ mtlr r0 /* 800E8268 000E51C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E826C 000E51CC 4E 80 00 20 */ blr +/* 800E826C 000E51CC 4E 80 00 20 */ blr .global sub_800e8270 sub_800e8270: @@ -6112,7 +6112,7 @@ lbl_800E8288: /* 800E8288 000E51E8 80 01 00 14 */ lwz r0, 0x14(r1) /* 800E828C 000E51EC 7C 08 03 A6 */ mtlr r0 /* 800E8290 000E51F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E8294 000E51F4 4E 80 00 20 */ blr +/* 800E8294 000E51F4 4E 80 00 20 */ blr .global sub_800e8298 sub_800e8298: @@ -6129,4 +6129,4 @@ sub_800e8298: /* 800E82C0 000E5220 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800E82C4 000E5224 7C 08 03 A6 */ mtlr r0 /* 800E82C8 000E5228 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E82CC 000E522C 4E 80 00 20 */ blr +/* 800E82CC 000E522C 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/Enemies/CBloodFlower.s b/asm/MetroidPrime/Enemies/CBloodFlower.s index f699ca3d..4b3df81a 100644 --- a/asm/MetroidPrime/Enemies/CBloodFlower.s +++ b/asm/MetroidPrime/Enemies/CBloodFlower.s @@ -281,7 +281,7 @@ lbl_80118C80: /* 80118C98 00115BF8 38 80 00 01 */ li r4, 1 /* 80118C9C 00115BFC 81 8C 00 08 */ lwz r12, 8(r12) /* 80118CA0 00115C00 7D 89 03 A6 */ mtctr r12 -/* 80118CA4 00115C04 4E 80 04 21 */ bctrl +/* 80118CA4 00115C04 4E 80 04 21 */ bctrl lbl_80118CA8: /* 80118CA8 00115C08 34 1E 05 68 */ addic. r0, r30, 0x568 /* 80118CAC 00115C0C 41 82 00 18 */ beq lbl_80118CC4 @@ -305,7 +305,7 @@ lbl_80118CE0: /* 80118CEC 00115C4C 83 C1 00 08 */ lwz r30, 8(r1) /* 80118CF0 00115C50 7C 08 03 A6 */ mtlr r0 /* 80118CF4 00115C54 38 21 00 10 */ addi r1, r1, 0x10 -/* 80118CF8 00115C58 4E 80 00 20 */ blr +/* 80118CF8 00115C58 4E 80 00 20 */ blr .global sub_80118cfc sub_80118cfc: @@ -340,7 +340,7 @@ lbl_80118D64: /* 80118D68 00115CC8 81 9E 00 00 */ lwz r12, 0(r30) /* 80118D6C 00115CCC 81 8C 02 C0 */ lwz r12, 0x2c0(r12) /* 80118D70 00115CD0 7D 89 03 A6 */ mtctr r12 -/* 80118D74 00115CD4 4E 80 04 21 */ bctrl +/* 80118D74 00115CD4 4E 80 04 21 */ bctrl /* 80118D78 00115CD8 7C 7D 1B 78 */ mr r29, r3 /* 80118D7C 00115CDC 80 03 00 08 */ lwz r0, 8(r3) /* 80118D80 00115CE0 28 00 00 00 */ cmplwi r0, 0 @@ -382,7 +382,7 @@ lbl_80118DC4: /* 80118E04 00115D64 81 84 00 00 */ lwz r12, 0(r4) /* 80118E08 00115D68 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 80118E0C 00115D6C 7D 89 03 A6 */ mtctr r12 -/* 80118E10 00115D70 4E 80 04 21 */ bctrl +/* 80118E10 00115D70 4E 80 04 21 */ bctrl /* 80118E14 00115D74 C0 7B 00 2C */ lfs f3, 0x2c(r27) /* 80118E18 00115D78 C0 01 00 4C */ lfs f0, 0x4c(r1) /* 80118E1C 00115D7C C0 5B 00 1C */ lfs f2, 0x1c(r27) @@ -447,13 +447,13 @@ lbl_80118E68: /* 80118EFC 00115E5C 81 9E 00 00 */ lwz r12, 0(r30) /* 80118F00 00115E60 81 8C 02 C0 */ lwz r12, 0x2c0(r12) /* 80118F04 00115E64 7D 89 03 A6 */ mtctr r12 -/* 80118F08 00115E68 4E 80 04 21 */ bctrl +/* 80118F08 00115E68 4E 80 04 21 */ bctrl /* 80118F0C 00115E6C 7C 7D 1B 78 */ mr r29, r3 /* 80118F10 00115E70 7F C3 F3 78 */ mr r3, r30 /* 80118F14 00115E74 81 9E 00 00 */ lwz r12, 0(r30) /* 80118F18 00115E78 81 8C 02 C0 */ lwz r12, 0x2c0(r12) /* 80118F1C 00115E7C 7D 89 03 A6 */ mtctr r12 -/* 80118F20 00115E80 4E 80 04 21 */ bctrl +/* 80118F20 00115E80 4E 80 04 21 */ bctrl /* 80118F24 00115E84 7C 65 1B 78 */ mr r5, r3 /* 80118F28 00115E88 7F C3 F3 78 */ mr r3, r30 /* 80118F2C 00115E8C 7F E4 FB 78 */ mr r4, r31 @@ -503,11 +503,11 @@ lbl_80118FAC: /* 80118FD8 00115F38 80 01 01 24 */ lwz r0, 0x124(r1) /* 80118FDC 00115F3C 7C 08 03 A6 */ mtlr r0 /* 80118FE0 00115F40 38 21 01 20 */ addi r1, r1, 0x120 -/* 80118FE4 00115F44 4E 80 00 20 */ blr +/* 80118FE4 00115F44 4E 80 00 20 */ blr .global Touch__12CBloodFlowerFR6CActorR13CStateManager Touch__12CBloodFlowerFR6CActorR13CStateManager: -/* 80118FE8 00115F48 4E 80 00 20 */ blr +/* 80118FE8 00115F48 4E 80 00 20 */ blr .global sub_80118fec sub_80118fec: @@ -537,7 +537,7 @@ sub_80118fec: /* 80119048 00115FA8 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8011904C 00115FAC 7C 08 03 A6 */ mtlr r0 /* 80119050 00115FB0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80119054 00115FB4 4E 80 00 20 */ blr +/* 80119054 00115FB4 4E 80 00 20 */ blr .global sub_80119058 sub_80119058: @@ -567,7 +567,7 @@ sub_80119058: /* 801190B4 00116014 83 C1 00 18 */ lwz r30, 0x18(r1) /* 801190B8 00116018 7C 08 03 A6 */ mtlr r0 /* 801190BC 0011601C 38 21 00 20 */ addi r1, r1, 0x20 -/* 801190C0 00116020 4E 80 00 20 */ blr +/* 801190C0 00116020 4E 80 00 20 */ blr .global sub_801190c4 sub_801190c4: @@ -620,7 +620,7 @@ lbl_80119154: /* 80119168 001160C8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8011916C 001160CC 7C 08 03 A6 */ mtlr r0 /* 80119170 001160D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80119174 001160D4 4E 80 00 20 */ blr +/* 80119174 001160D4 4E 80 00 20 */ blr .global sub_80119178 sub_80119178: @@ -732,7 +732,7 @@ lbl_801192FC: /* 80119300 00116260 80 01 00 84 */ lwz r0, 0x84(r1) /* 80119304 00116264 7C 08 03 A6 */ mtlr r0 /* 80119308 00116268 38 21 00 80 */ addi r1, r1, 0x80 -/* 8011930C 0011626C 4E 80 00 20 */ blr +/* 8011930C 0011626C 4E 80 00 20 */ blr .global GetCollisionResponseType__12CBloodFlowerCFRC9CVector3fRC9CVector3fRC11CWeaponModei GetCollisionResponseType__12CBloodFlowerCFRC9CVector3fRC9CVector3fRC11CWeaponModei: @@ -744,7 +744,7 @@ GetCollisionResponseType__12CBloodFlowerCFRC9CVector3fRC9CVector3fRC11CWeaponMod /* 80119324 00116284 81 83 00 00 */ lwz r12, 0(r3) /* 80119328 00116288 81 8C 00 38 */ lwz r12, 0x38(r12) /* 8011932C 0011628C 7D 89 03 A6 */ mtctr r12 -/* 80119330 00116290 4E 80 04 21 */ bctrl +/* 80119330 00116290 4E 80 04 21 */ bctrl /* 80119334 00116294 7F E4 FB 78 */ mr r4, r31 /* 80119338 00116298 38 A0 00 00 */ li r5, 0 /* 8011933C 0011629C 4B FE 93 CD */ bl WeaponHurts__20CDamageVulnerabilityCFRC11CWeaponMode @@ -757,7 +757,7 @@ lbl_80119350: /* 80119354 001162B4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80119358 001162B8 7C 08 03 A6 */ mtlr r0 /* 8011935C 001162BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80119360 001162C0 4E 80 00 20 */ blr +/* 80119360 001162C0 4E 80 00 20 */ blr .global sub_80119364 sub_80119364: @@ -776,7 +776,7 @@ sub_80119364: /* 80119394 001162F4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80119398 001162F8 7C 08 03 A6 */ mtlr r0 /* 8011939C 001162FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801193A0 00116300 4E 80 00 20 */ blr +/* 801193A0 00116300 4E 80 00 20 */ blr .global Render__12CBloodFlowerCFRC13CStateManager Render__12CBloodFlowerCFRC13CStateManager: @@ -790,12 +790,12 @@ Render__12CBloodFlowerCFRC13CStateManager: /* 801193C0 00116320 81 83 00 00 */ lwz r12, 0(r3) /* 801193C4 00116324 81 8C 00 10 */ lwz r12, 0x10(r12) /* 801193C8 00116328 7D 89 03 A6 */ mtctr r12 -/* 801193CC 0011632C 4E 80 04 21 */ bctrl +/* 801193CC 0011632C 4E 80 04 21 */ bctrl /* 801193D0 00116330 80 01 00 14 */ lwz r0, 0x14(r1) /* 801193D4 00116334 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801193D8 00116338 7C 08 03 A6 */ mtlr r0 /* 801193DC 0011633C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801193E0 00116340 4E 80 00 20 */ blr +/* 801193E0 00116340 4E 80 00 20 */ blr .global Think__12CBloodFlowerFfR13CStateManager Think__12CBloodFlowerFfR13CStateManager: @@ -816,7 +816,7 @@ Think__12CBloodFlowerFfR13CStateManager: /* 8011941C 0011637C 81 83 00 00 */ lwz r12, 0(r3) /* 80119420 00116380 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80119424 00116384 7D 89 03 A6 */ mtctr r12 -/* 80119428 00116388 4E 80 04 21 */ bctrl +/* 80119428 00116388 4E 80 04 21 */ bctrl /* 8011942C 0011638C C0 3F 05 BC */ lfs f1, 0x5bc(r31) /* 80119430 00116390 C0 02 96 7C */ lfs f0, lbl_805AB39C@sda21(r2) /* 80119434 00116394 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -834,7 +834,7 @@ lbl_80119450: /* 8011945C 001163BC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80119460 001163C0 7C 08 03 A6 */ mtlr r0 /* 80119464 001163C4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80119468 001163C8 4E 80 00 20 */ blr +/* 80119468 001163C8 4E 80 00 20 */ blr .global DoUserAnimEvent__12CBloodFlowerFR13CStateManagerRC13CInt32POINode14EUserEventType DoUserAnimEvent__12CBloodFlowerFR13CStateManagerRC13CInt32POINode14EUserEventType: @@ -914,7 +914,7 @@ lbl_80119568: /* 80119574 001164D4 80 01 00 64 */ lwz r0, 0x64(r1) /* 80119578 001164D8 7C 08 03 A6 */ mtlr r0 /* 8011957C 001164DC 38 21 00 60 */ addi r1, r1, 0x60 -/* 80119580 001164E0 4E 80 00 20 */ blr +/* 80119580 001164E0 4E 80 00 20 */ blr .global ShouldAttack__12CBloodFlowerFR13CStateManagerf ShouldAttack__12CBloodFlowerFR13CStateManagerf: @@ -933,7 +933,7 @@ ShouldAttack__12CBloodFlowerFR13CStateManagerf: /* 801195B4 00116514 C0 22 96 7C */ lfs f1, lbl_805AB39C@sda21(r2) /* 801195B8 00116518 81 8C 01 9C */ lwz r12, 0x19c(r12) /* 801195BC 0011651C 7D 89 03 A6 */ mtctr r12 -/* 801195C0 00116520 4E 80 04 21 */ bctrl +/* 801195C0 00116520 4E 80 04 21 */ bctrl /* 801195C4 00116524 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801195C8 00116528 41 82 00 0C */ beq lbl_801195D4 /* 801195CC 0011652C 38 60 00 00 */ li r3, 0 @@ -976,7 +976,7 @@ lbl_8011963C: /* 80119654 001165B4 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80119658 001165B8 7C 08 03 A6 */ mtlr r0 /* 8011965C 001165BC 38 21 00 40 */ addi r1, r1, 0x40 -/* 80119660 001165C0 4E 80 00 20 */ blr +/* 80119660 001165C0 4E 80 00 20 */ blr .global ShouldTurn__12CBloodFlowerFR13CStateManagerf ShouldTurn__12CBloodFlowerFR13CStateManagerf: @@ -991,7 +991,7 @@ ShouldTurn__12CBloodFlowerFR13CStateManagerf: /* 80119684 001165E4 81 83 00 00 */ lwz r12, 0(r3) /* 80119688 001165E8 81 8C 01 9C */ lwz r12, 0x19c(r12) /* 8011968C 001165EC 7D 89 03 A6 */ mtctr r12 -/* 80119690 001165F0 4E 80 04 21 */ bctrl +/* 80119690 001165F0 4E 80 04 21 */ bctrl /* 80119694 001165F4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80119698 001165F8 41 82 00 0C */ beq lbl_801196A4 /* 8011969C 001165FC 38 60 00 00 */ li r3, 0 @@ -1043,7 +1043,7 @@ lbl_80119744: /* 8011974C 001166AC 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80119750 001166B0 7C 08 03 A6 */ mtlr r0 /* 80119754 001166B4 38 21 00 30 */ addi r1, r1, 0x30 -/* 80119758 001166B8 4E 80 00 20 */ blr +/* 80119758 001166B8 4E 80 00 20 */ blr .global Leash__12CBloodFlowerFR13CStateManager9EStateMsgf Leash__12CBloodFlowerFR13CStateManager9EStateMsgf: @@ -1052,7 +1052,7 @@ Leash__12CBloodFlowerFR13CStateManager9EStateMsgf: /* 80119764 001166C4 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80119768 001166C8 7C 00 00 26 */ mfcr r0 /* 8011976C 001166CC 54 03 17 FE */ rlwinm r3, r0, 2, 0x1f, 0x1f -/* 80119770 001166D0 4E 80 00 20 */ blr +/* 80119770 001166D0 4E 80 00 20 */ blr .global PodAttack__12CBloodFlowerFR13CStateManager9EStateMsgf PodAttack__12CBloodFlowerFR13CStateManager9EStateMsgf: @@ -1126,7 +1126,7 @@ lbl_801197C4: /* 80119878 001167D8 90 A1 00 6C */ stw r5, 0x6c(r1) /* 8011987C 001167DC 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80119880 001167E0 7D 89 03 A6 */ mtctr r12 -/* 80119884 001167E4 4E 80 04 21 */ bctrl +/* 80119884 001167E4 4E 80 04 21 */ bctrl /* 80119888 001167E8 7F C3 F3 78 */ mr r3, r30 /* 8011988C 001167EC 7F E4 FB 78 */ mr r4, r31 /* 80119890 001167F0 38 A0 00 01 */ li r5, 1 @@ -1137,7 +1137,7 @@ lbl_8011989C: /* 801198A0 00116800 C0 22 96 7C */ lfs f1, lbl_805AB39C@sda21(r2) /* 801198A4 00116804 81 8C 01 9C */ lwz r12, 0x19c(r12) /* 801198A8 00116808 7D 89 03 A6 */ mtctr r12 -/* 801198AC 0011680C 4E 80 04 21 */ bctrl +/* 801198AC 0011680C 4E 80 04 21 */ bctrl /* 801198B0 00116810 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801198B4 00116814 41 82 01 54 */ beq lbl_80119A08 /* 801198B8 00116818 80 AD 8A 68 */ lwz r5, lbl_805A7628@sda21(r13) @@ -1181,7 +1181,7 @@ lbl_80119944: /* 8011994C 001168AC 81 83 00 00 */ lwz r12, 0(r3) /* 80119950 001168B0 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80119954 001168B4 7D 89 03 A6 */ mtctr r12 -/* 80119958 001168B8 4E 80 04 21 */ bctrl +/* 80119958 001168B8 4E 80 04 21 */ bctrl /* 8011995C 001168BC 7F C3 F3 78 */ mr r3, r30 /* 80119960 001168C0 7F E4 FB 78 */ mr r4, r31 /* 80119964 001168C4 38 A0 00 00 */ li r5, 0 @@ -1234,7 +1234,7 @@ lbl_80119A08: /* 80119A1C 0011697C 83 A1 00 94 */ lwz r29, 0x94(r1) /* 80119A20 00116980 7C 08 03 A6 */ mtlr r0 /* 80119A24 00116984 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 80119A28 00116988 4E 80 00 20 */ blr +/* 80119A28 00116988 4E 80 00 20 */ blr .global sub_80119a2c sub_80119a2c: @@ -1309,7 +1309,7 @@ lbl_80119AFC: /* 80119B24 00116A84 83 81 00 30 */ lwz r28, 0x30(r1) /* 80119B28 00116A88 7C 08 03 A6 */ mtlr r0 /* 80119B2C 00116A8C 38 21 00 40 */ addi r1, r1, 0x40 -/* 80119B30 00116A90 4E 80 00 20 */ blr +/* 80119B30 00116A90 4E 80 00 20 */ blr .global BulbAttack__12CBloodFlowerFR13CStateManager9EStateMsgf BulbAttack__12CBloodFlowerFR13CStateManager9EStateMsgf: @@ -1374,7 +1374,7 @@ lbl_80119C0C: /* 80119C14 00116B74 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80119C18 00116B78 7C 08 03 A6 */ mtlr r0 /* 80119C1C 00116B7C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80119C20 00116B80 4E 80 00 20 */ blr +/* 80119C20 00116B80 4E 80 00 20 */ blr .global Active__12CBloodFlowerFR13CStateManager9EStateMsgf Active__12CBloodFlowerFR13CStateManager9EStateMsgf: @@ -1505,7 +1505,7 @@ lbl_80119DE8: /* 80119DFC 00116D5C 83 A1 00 54 */ lwz r29, 0x54(r1) /* 80119E00 00116D60 7C 08 03 A6 */ mtlr r0 /* 80119E04 00116D64 38 21 00 70 */ addi r1, r1, 0x70 -/* 80119E08 00116D68 4E 80 00 20 */ blr +/* 80119E08 00116D68 4E 80 00 20 */ blr .global __dt__17CBCAdditiveAimCmd __dt__17CBCAdditiveAimCmd: @@ -1533,7 +1533,7 @@ lbl_80119E50: /* 80119E58 00116DB8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80119E5C 00116DBC 7C 08 03 A6 */ mtlr r0 /* 80119E60 00116DC0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80119E64 00116DC4 4E 80 00 20 */ blr +/* 80119E64 00116DC4 4E 80 00 20 */ blr .global InActive__12CBloodFlowerFR13CStateManager9EStateMsgf InActive__12CBloodFlowerFR13CStateManager9EStateMsgf: @@ -1569,12 +1569,12 @@ lbl_80119EC8: /* 80119ECC 00116E2C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80119ED0 00116E30 7C 08 03 A6 */ mtlr r0 /* 80119ED4 00116E34 38 21 00 10 */ addi r1, r1, 0x10 -/* 80119ED8 00116E38 4E 80 00 20 */ blr +/* 80119ED8 00116E38 4E 80 00 20 */ blr .global ProjectileInfo__12CBloodFlowerFv ProjectileInfo__12CBloodFlowerFv: /* 80119EDC 00116E3C 38 63 05 90 */ addi r3, r3, 0x590 -/* 80119EE0 00116E40 4E 80 00 20 */ blr +/* 80119EE0 00116E40 4E 80 00 20 */ blr .global AcceptScriptMsg__12CBloodFlowerF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__12CBloodFlowerF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -1610,7 +1610,7 @@ lbl_80119F3C: /* 80119F50 00116EB0 81 9D 00 00 */ lwz r12, 0(r29) /* 80119F54 00116EB4 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80119F58 00116EB8 7D 89 03 A6 */ mtctr r12 -/* 80119F5C 00116EBC 4E 80 04 21 */ bctrl +/* 80119F5C 00116EBC 4E 80 04 21 */ bctrl /* 80119F60 00116EC0 C0 03 00 00 */ lfs f0, 0(r3) /* 80119F64 00116EC4 D0 1D 05 B8 */ stfs f0, 0x5b8(r29) /* 80119F68 00116EC8 48 00 00 30 */ b lbl_80119F98 @@ -1634,7 +1634,7 @@ lbl_80119F98: /* 80119FA4 00116F04 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80119FA8 00116F08 7C 08 03 A6 */ mtlr r0 /* 80119FAC 00116F0C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80119FB0 00116F10 4E 80 00 20 */ blr +/* 80119FB0 00116F10 4E 80 00 20 */ blr .global Accept__12CBloodFlowerFR8IVisitor Accept__12CBloodFlowerFR8IVisitor: @@ -1647,11 +1647,11 @@ Accept__12CBloodFlowerFR8IVisitor: /* 80119FCC 00116F2C 7C 04 03 78 */ mr r4, r0 /* 80119FD0 00116F30 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 80119FD4 00116F34 7D 89 03 A6 */ mtctr r12 -/* 80119FD8 00116F38 4E 80 04 21 */ bctrl +/* 80119FD8 00116F38 4E 80 04 21 */ bctrl /* 80119FDC 00116F3C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80119FE0 00116F40 7C 08 03 A6 */ mtlr r0 /* 80119FE4 00116F44 38 21 00 10 */ addi r1, r1, 0x10 -/* 80119FE8 00116F48 4E 80 00 20 */ blr +/* 80119FE8 00116F48 4E 80 00 20 */ blr .global "__ct__12CBloodFlowerF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC14CPatternedInfoUiUiRC16CActorParametersUiRC11CDamageInfoRC11CDamageInfoUiUiUi" "__ct__12CBloodFlowerF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC14CPatternedInfoUiUiRC16CActorParametersUiRC11CDamageInfoRC11CDamageInfoUiUiUi": @@ -1710,7 +1710,7 @@ Accept__12CBloodFlowerFR8IVisitor: /* 8011A0BC 0011701C 81 84 00 00 */ lwz r12, 0(r4) /* 8011A0C0 00117020 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8011A0C4 00117024 7D 89 03 A6 */ mtctr r12 -/* 8011A0C8 00117028 4E 80 04 21 */ bctrl +/* 8011A0C8 00117028 4E 80 04 21 */ bctrl /* 8011A0CC 0011702C 3A 3D 05 68 */ addi r17, r29, 0x568 /* 8011A0D0 00117030 38 81 00 4C */ addi r4, r1, 0x4c /* 8011A0D4 00117034 7E 23 8B 78 */ mr r3, r17 @@ -1759,7 +1759,7 @@ lbl_8011A15C: /* 8011A178 001170D8 81 84 00 00 */ lwz r12, 0(r4) /* 8011A17C 001170DC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8011A180 001170E0 7D 89 03 A6 */ mtctr r12 -/* 8011A184 001170E4 4E 80 04 21 */ bctrl +/* 8011A184 001170E4 4E 80 04 21 */ bctrl /* 8011A188 001170E8 3A 3D 05 78 */ addi r17, r29, 0x578 /* 8011A18C 001170EC 38 81 00 34 */ addi r4, r1, 0x34 /* 8011A190 001170F0 7E 23 8B 78 */ mr r3, r17 @@ -1843,7 +1843,7 @@ lbl_8011A15C: /* 8011A2C8 00117228 81 83 00 00 */ lwz r12, 0(r3) /* 8011A2CC 0011722C 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8011A2D0 00117230 7D 89 03 A6 */ mtctr r12 -/* 8011A2D4 00117234 4E 80 04 21 */ bctrl +/* 8011A2D4 00117234 4E 80 04 21 */ bctrl /* 8011A2D8 00117238 82 3D 05 74 */ lwz r17, 0x574(r29) /* 8011A2DC 0011723C 7F C4 F3 78 */ mr r4, r30 /* 8011A2E0 00117240 38 61 00 90 */ addi r3, r1, 0x90 @@ -1853,7 +1853,7 @@ lbl_8011A15C: /* 8011A2F0 00117250 81 91 00 00 */ lwz r12, 0(r17) /* 8011A2F4 00117254 81 8C 00 14 */ lwz r12, 0x14(r12) /* 8011A2F8 00117258 7D 89 03 A6 */ mtctr r12 -/* 8011A2FC 0011725C 4E 80 04 21 */ bctrl +/* 8011A2FC 0011725C 4E 80 04 21 */ bctrl /* 8011A300 00117260 C0 5E 00 2C */ lfs f2, 0x2c(r30) /* 8011A304 00117264 38 81 00 74 */ addi r4, r1, 0x74 /* 8011A308 00117268 C0 3E 00 1C */ lfs f1, 0x1c(r30) @@ -1865,7 +1865,7 @@ lbl_8011A15C: /* 8011A320 00117280 81 83 00 00 */ lwz r12, 0(r3) /* 8011A324 00117284 81 8C 00 20 */ lwz r12, 0x20(r12) /* 8011A328 00117288 7D 89 03 A6 */ mtctr r12 -/* 8011A32C 0011728C 4E 80 04 21 */ bctrl +/* 8011A32C 0011728C 4E 80 04 21 */ bctrl /* 8011A330 00117290 C0 5F 00 00 */ lfs f2, 0(r31) /* 8011A334 00117294 38 81 00 68 */ addi r4, r1, 0x68 /* 8011A338 00117298 C0 3F 00 04 */ lfs f1, 4(r31) @@ -1877,7 +1877,7 @@ lbl_8011A15C: /* 8011A350 001172B0 81 83 00 00 */ lwz r12, 0(r3) /* 8011A354 001172B4 81 8C 00 24 */ lwz r12, 0x24(r12) /* 8011A358 001172B8 7D 89 03 A6 */ mtctr r12 -/* 8011A35C 001172BC 4E 80 04 21 */ bctrl +/* 8011A35C 001172BC 4E 80 04 21 */ bctrl /* 8011A360 001172C0 38 7D 05 78 */ addi r3, r29, 0x578 /* 8011A364 001172C4 48 22 6A 21 */ bl Lock__6CTokenFv /* 8011A368 001172C8 38 7D 05 90 */ addi r3, r29, 0x590 @@ -1898,7 +1898,7 @@ lbl_8011A15C: /* 8011A3A4 00117304 81 84 00 00 */ lwz r12, 0(r4) /* 8011A3A8 00117308 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8011A3AC 0011730C 7D 89 03 A6 */ mtctr r12 -/* 8011A3B0 00117310 4E 80 04 21 */ bctrl +/* 8011A3B0 00117310 4E 80 04 21 */ bctrl /* 8011A3B4 00117314 3A 21 00 5C */ addi r17, r1, 0x5c /* 8011A3B8 00117318 38 81 00 24 */ addi r4, r1, 0x24 /* 8011A3BC 0011731C 7E 23 8B 78 */ mr r3, r17 diff --git a/asm/MetroidPrime/Enemies/CBouncyGrenade.s b/asm/MetroidPrime/Enemies/CBouncyGrenade.s index 14d87de4..155b1cb1 100644 --- a/asm/MetroidPrime/Enemies/CBouncyGrenade.s +++ b/asm/MetroidPrime/Enemies/CBouncyGrenade.s @@ -134,7 +134,7 @@ __dt__14CBouncyGrenadeFv: /* 8022E364 0022B2C4 38 80 00 01 */ li r4, 1 /* 8022E368 0022B2C8 81 8C 00 08 */ lwz r12, 8(r12) /* 8022E36C 0022B2CC 7D 89 03 A6 */ mtctr r12 -/* 8022E370 0022B2D0 4E 80 04 21 */ bctrl +/* 8022E370 0022B2D0 4E 80 04 21 */ bctrl lbl_8022E374: /* 8022E374 0022B2D4 34 1E 02 A8 */ addic. r0, r30, 0x2a8 /* 8022E378 0022B2D8 41 82 00 24 */ beq lbl_8022E39C @@ -145,7 +145,7 @@ lbl_8022E374: /* 8022E38C 0022B2EC 38 80 00 01 */ li r4, 1 /* 8022E390 0022B2F0 81 8C 00 08 */ lwz r12, 8(r12) /* 8022E394 0022B2F4 7D 89 03 A6 */ mtctr r12 -/* 8022E398 0022B2F8 4E 80 04 21 */ bctrl +/* 8022E398 0022B2F8 4E 80 04 21 */ bctrl lbl_8022E39C: /* 8022E39C 0022B2FC 34 1E 02 A4 */ addic. r0, r30, 0x2a4 /* 8022E3A0 0022B300 41 82 00 24 */ beq lbl_8022E3C4 @@ -156,7 +156,7 @@ lbl_8022E39C: /* 8022E3B4 0022B314 38 80 00 01 */ li r4, 1 /* 8022E3B8 0022B318 81 8C 00 08 */ lwz r12, 8(r12) /* 8022E3BC 0022B31C 7D 89 03 A6 */ mtctr r12 -/* 8022E3C0 0022B320 4E 80 04 21 */ bctrl +/* 8022E3C0 0022B320 4E 80 04 21 */ bctrl lbl_8022E3C4: /* 8022E3C4 0022B324 34 1E 02 A0 */ addic. r0, r30, 0x2a0 /* 8022E3C8 0022B328 41 82 00 24 */ beq lbl_8022E3EC @@ -167,7 +167,7 @@ lbl_8022E3C4: /* 8022E3DC 0022B33C 38 80 00 01 */ li r4, 1 /* 8022E3E0 0022B340 81 8C 00 08 */ lwz r12, 8(r12) /* 8022E3E4 0022B344 7D 89 03 A6 */ mtctr r12 -/* 8022E3E8 0022B348 4E 80 04 21 */ bctrl +/* 8022E3E8 0022B348 4E 80 04 21 */ bctrl lbl_8022E3EC: /* 8022E3EC 0022B34C 7F C3 F3 78 */ mr r3, r30 /* 8022E3F0 0022B350 38 80 00 00 */ li r4, 0 @@ -183,7 +183,7 @@ lbl_8022E408: /* 8022E414 0022B374 83 C1 00 08 */ lwz r30, 8(r1) /* 8022E418 0022B378 7C 08 03 A6 */ mtlr r0 /* 8022E41C 0022B37C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8022E420 0022B380 4E 80 00 20 */ blr +/* 8022E420 0022B380 4E 80 00 20 */ blr .global sub_8022e424 sub_8022e424: @@ -221,25 +221,25 @@ sub_8022e424: /* 8022E4A0 0022B400 81 83 00 00 */ lwz r12, 0(r3) /* 8022E4A4 0022B404 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8022E4A8 0022B408 7D 89 03 A6 */ mtctr r12 -/* 8022E4AC 0022B40C 4E 80 04 21 */ bctrl +/* 8022E4AC 0022B40C 4E 80 04 21 */ bctrl /* 8022E4B0 0022B410 80 7E 02 A4 */ lwz r3, 0x2a4(r30) /* 8022E4B4 0022B414 38 80 00 01 */ li r4, 1 /* 8022E4B8 0022B418 81 83 00 00 */ lwz r12, 0(r3) /* 8022E4BC 0022B41C 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8022E4C0 0022B420 7D 89 03 A6 */ mtctr r12 -/* 8022E4C4 0022B424 4E 80 04 21 */ bctrl +/* 8022E4C4 0022B424 4E 80 04 21 */ bctrl /* 8022E4C8 0022B428 80 7E 02 A8 */ lwz r3, 0x2a8(r30) /* 8022E4CC 0022B42C 38 80 00 01 */ li r4, 1 /* 8022E4D0 0022B430 81 83 00 00 */ lwz r12, 0(r3) /* 8022E4D4 0022B434 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8022E4D8 0022B438 7D 89 03 A6 */ mtctr r12 -/* 8022E4DC 0022B43C 4E 80 04 21 */ bctrl +/* 8022E4DC 0022B43C 4E 80 04 21 */ bctrl /* 8022E4E0 0022B440 80 7E 02 AC */ lwz r3, 0x2ac(r30) /* 8022E4E4 0022B444 38 80 00 00 */ li r4, 0 /* 8022E4E8 0022B448 81 83 00 00 */ lwz r12, 0(r3) /* 8022E4EC 0022B44C 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8022E4F0 0022B450 7D 89 03 A6 */ mtctr r12 -/* 8022E4F4 0022B454 4E 80 04 21 */ bctrl +/* 8022E4F4 0022B454 4E 80 04 21 */ bctrl /* 8022E4F8 0022B458 A0 BB 00 00 */ lhz r5, 0(r27) /* 8022E4FC 0022B45C 7F E3 FB 78 */ mr r3, r31 /* 8022E500 0022B460 A0 1E 02 98 */ lhz r0, 0x298(r30) @@ -482,7 +482,7 @@ lbl_8022E884: /* 8022E888 0022B7E8 80 01 09 44 */ lwz r0, 0x944(r1) /* 8022E88C 0022B7EC 7C 08 03 A6 */ mtlr r0 /* 8022E890 0022B7F0 38 21 09 40 */ addi r1, r1, 0x940 -/* 8022E894 0022B7F4 4E 80 00 20 */ blr +/* 8022E894 0022B7F4 4E 80 00 20 */ blr .global sub_8022e898 sub_8022e898: @@ -517,7 +517,7 @@ lbl_8022E8F8: /* 8022E900 0022B860 81 83 00 00 */ lwz r12, 0(r3) /* 8022E904 0022B864 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8022E908 0022B868 7D 89 03 A6 */ mtctr r12 -/* 8022E90C 0022B86C 4E 80 04 21 */ bctrl +/* 8022E90C 0022B86C 4E 80 04 21 */ bctrl /* 8022E910 0022B870 48 00 00 38 */ b lbl_8022E948 lbl_8022E914: /* 8022E914 0022B874 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) @@ -525,7 +525,7 @@ lbl_8022E914: /* 8022E91C 0022B87C 81 83 00 00 */ lwz r12, 0(r3) /* 8022E920 0022B880 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8022E924 0022B884 7D 89 03 A6 */ mtctr r12 -/* 8022E928 0022B888 4E 80 04 21 */ bctrl +/* 8022E928 0022B888 4E 80 04 21 */ bctrl /* 8022E92C 0022B88C 48 00 00 1C */ b lbl_8022E948 lbl_8022E930: /* 8022E930 0022B890 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) @@ -533,14 +533,14 @@ lbl_8022E930: /* 8022E938 0022B898 81 83 00 00 */ lwz r12, 0(r3) /* 8022E93C 0022B89C 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8022E940 0022B8A0 7D 89 03 A6 */ mtctr r12 -/* 8022E944 0022B8A4 4E 80 04 21 */ bctrl +/* 8022E944 0022B8A4 4E 80 04 21 */ bctrl lbl_8022E948: /* 8022E948 0022B8A8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8022E94C 0022B8AC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8022E950 0022B8B0 83 C1 00 08 */ lwz r30, 8(r1) /* 8022E954 0022B8B4 7C 08 03 A6 */ mtlr r0 /* 8022E958 0022B8B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8022E95C 0022B8BC 4E 80 00 20 */ blr +/* 8022E95C 0022B8BC 4E 80 00 20 */ blr .global sub_8022e960 sub_8022e960: @@ -591,7 +591,7 @@ lbl_8022E9D0: /* 8022EA0C 0022B96C 81 83 00 00 */ lwz r12, 0(r3) /* 8022EA10 0022B970 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8022EA14 0022B974 7D 89 03 A6 */ mtctr r12 -/* 8022EA18 0022B978 4E 80 04 21 */ bctrl +/* 8022EA18 0022B978 4E 80 04 21 */ bctrl /* 8022EA1C 0022B97C 80 1E 00 04 */ lwz r0, 4(r30) /* 8022EA20 0022B980 7F E3 FB 78 */ mr r3, r31 /* 8022EA24 0022B984 38 81 00 0C */ addi r4, r1, 0xc @@ -607,7 +607,7 @@ lbl_8022EA40: /* 8022EA48 0022B9A8 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8022EA4C 0022B9AC 7C 08 03 A6 */ mtlr r0 /* 8022EA50 0022B9B0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8022EA54 0022B9B4 4E 80 00 20 */ blr +/* 8022EA54 0022B9B4 4E 80 00 20 */ blr .global sub_8022ea58 sub_8022ea58: @@ -837,7 +837,7 @@ lbl_8022ED78: /* 8022EDB0 0022BD10 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 8022EDB4 0022BD14 7C 08 03 A6 */ mtlr r0 /* 8022EDB8 0022BD18 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 8022EDBC 0022BD1C 4E 80 00 20 */ blr +/* 8022EDBC 0022BD1C 4E 80 00 20 */ blr .global sub_8022edc0 sub_8022edc0: @@ -872,7 +872,7 @@ lbl_8022EE28: /* 8022EE2C 0022BD8C 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8022EE30 0022BD90 7C 08 03 A6 */ mtlr r0 /* 8022EE34 0022BD94 38 21 00 30 */ addi r1, r1, 0x30 -/* 8022EE38 0022BD98 4E 80 00 20 */ blr +/* 8022EE38 0022BD98 4E 80 00 20 */ blr .global sub_8022ee3c sub_8022ee3c: @@ -883,7 +883,7 @@ sub_8022ee3c: /* 8022EE4C 0022BDAC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8022EE50 0022BDB0 7C 08 03 A6 */ mtlr r0 /* 8022EE54 0022BDB4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8022EE58 0022BDB8 4E 80 00 20 */ blr +/* 8022EE58 0022BDB8 4E 80 00 20 */ blr .global sub_8022ee5c sub_8022ee5c: @@ -929,73 +929,73 @@ sub_8022ee5c: /* 8022EEF8 0022BE58 81 83 00 00 */ lwz r12, 0(r3) /* 8022EEFC 0022BE5C 81 8C 00 14 */ lwz r12, 0x14(r12) /* 8022EF00 0022BE60 7D 89 03 A6 */ mtctr r12 -/* 8022EF04 0022BE64 4E 80 04 21 */ bctrl +/* 8022EF04 0022BE64 4E 80 04 21 */ bctrl /* 8022EF08 0022BE68 80 7E 02 A0 */ lwz r3, 0x2a0(r30) /* 8022EF0C 0022BE6C 38 81 00 38 */ addi r4, r1, 0x38 /* 8022EF10 0022BE70 81 83 00 00 */ lwz r12, 0(r3) /* 8022EF14 0022BE74 81 8C 00 20 */ lwz r12, 0x20(r12) /* 8022EF18 0022BE78 7D 89 03 A6 */ mtctr r12 -/* 8022EF1C 0022BE7C 4E 80 04 21 */ bctrl +/* 8022EF1C 0022BE7C 4E 80 04 21 */ bctrl /* 8022EF20 0022BE80 80 7E 02 A0 */ lwz r3, 0x2a0(r30) /* 8022EF24 0022BE84 38 81 00 2C */ addi r4, r1, 0x2c /* 8022EF28 0022BE88 81 83 00 00 */ lwz r12, 0(r3) /* 8022EF2C 0022BE8C 81 8C 00 24 */ lwz r12, 0x24(r12) /* 8022EF30 0022BE90 7D 89 03 A6 */ mtctr r12 -/* 8022EF34 0022BE94 4E 80 04 21 */ bctrl +/* 8022EF34 0022BE94 4E 80 04 21 */ bctrl /* 8022EF38 0022BE98 80 7E 02 A0 */ lwz r3, 0x2a0(r30) /* 8022EF3C 0022BE9C FC 20 F8 90 */ fmr f1, f31 /* 8022EF40 0022BEA0 81 83 00 00 */ lwz r12, 0(r3) /* 8022EF44 0022BEA4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8022EF48 0022BEA8 7D 89 03 A6 */ mtctr r12 -/* 8022EF4C 0022BEAC 4E 80 04 21 */ bctrl +/* 8022EF4C 0022BEAC 4E 80 04 21 */ bctrl /* 8022EF50 0022BEB0 80 7E 02 A4 */ lwz r3, 0x2a4(r30) /* 8022EF54 0022BEB4 38 81 00 74 */ addi r4, r1, 0x74 /* 8022EF58 0022BEB8 81 83 00 00 */ lwz r12, 0(r3) /* 8022EF5C 0022BEBC 81 8C 00 14 */ lwz r12, 0x14(r12) /* 8022EF60 0022BEC0 7D 89 03 A6 */ mtctr r12 -/* 8022EF64 0022BEC4 4E 80 04 21 */ bctrl +/* 8022EF64 0022BEC4 4E 80 04 21 */ bctrl /* 8022EF68 0022BEC8 80 7E 02 A4 */ lwz r3, 0x2a4(r30) /* 8022EF6C 0022BECC 38 81 00 38 */ addi r4, r1, 0x38 /* 8022EF70 0022BED0 81 83 00 00 */ lwz r12, 0(r3) /* 8022EF74 0022BED4 81 8C 00 20 */ lwz r12, 0x20(r12) /* 8022EF78 0022BED8 7D 89 03 A6 */ mtctr r12 -/* 8022EF7C 0022BEDC 4E 80 04 21 */ bctrl +/* 8022EF7C 0022BEDC 4E 80 04 21 */ bctrl /* 8022EF80 0022BEE0 80 7E 02 A4 */ lwz r3, 0x2a4(r30) /* 8022EF84 0022BEE4 38 81 00 2C */ addi r4, r1, 0x2c /* 8022EF88 0022BEE8 81 83 00 00 */ lwz r12, 0(r3) /* 8022EF8C 0022BEEC 81 8C 00 24 */ lwz r12, 0x24(r12) /* 8022EF90 0022BEF0 7D 89 03 A6 */ mtctr r12 -/* 8022EF94 0022BEF4 4E 80 04 21 */ bctrl +/* 8022EF94 0022BEF4 4E 80 04 21 */ bctrl /* 8022EF98 0022BEF8 80 7E 02 A4 */ lwz r3, 0x2a4(r30) /* 8022EF9C 0022BEFC FC 20 F8 90 */ fmr f1, f31 /* 8022EFA0 0022BF00 81 83 00 00 */ lwz r12, 0(r3) /* 8022EFA4 0022BF04 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8022EFA8 0022BF08 7D 89 03 A6 */ mtctr r12 -/* 8022EFAC 0022BF0C 4E 80 04 21 */ bctrl +/* 8022EFAC 0022BF0C 4E 80 04 21 */ bctrl /* 8022EFB0 0022BF10 80 7E 02 A8 */ lwz r3, 0x2a8(r30) /* 8022EFB4 0022BF14 38 81 00 74 */ addi r4, r1, 0x74 /* 8022EFB8 0022BF18 81 83 00 00 */ lwz r12, 0(r3) /* 8022EFBC 0022BF1C 81 8C 00 14 */ lwz r12, 0x14(r12) /* 8022EFC0 0022BF20 7D 89 03 A6 */ mtctr r12 -/* 8022EFC4 0022BF24 4E 80 04 21 */ bctrl +/* 8022EFC4 0022BF24 4E 80 04 21 */ bctrl /* 8022EFC8 0022BF28 80 7E 02 A8 */ lwz r3, 0x2a8(r30) /* 8022EFCC 0022BF2C 38 81 00 38 */ addi r4, r1, 0x38 /* 8022EFD0 0022BF30 81 83 00 00 */ lwz r12, 0(r3) /* 8022EFD4 0022BF34 81 8C 00 20 */ lwz r12, 0x20(r12) /* 8022EFD8 0022BF38 7D 89 03 A6 */ mtctr r12 -/* 8022EFDC 0022BF3C 4E 80 04 21 */ bctrl +/* 8022EFDC 0022BF3C 4E 80 04 21 */ bctrl /* 8022EFE0 0022BF40 80 7E 02 A8 */ lwz r3, 0x2a8(r30) /* 8022EFE4 0022BF44 38 81 00 2C */ addi r4, r1, 0x2c /* 8022EFE8 0022BF48 81 83 00 00 */ lwz r12, 0(r3) /* 8022EFEC 0022BF4C 81 8C 00 24 */ lwz r12, 0x24(r12) /* 8022EFF0 0022BF50 7D 89 03 A6 */ mtctr r12 -/* 8022EFF4 0022BF54 4E 80 04 21 */ bctrl +/* 8022EFF4 0022BF54 4E 80 04 21 */ bctrl /* 8022EFF8 0022BF58 80 7E 02 A8 */ lwz r3, 0x2a8(r30) /* 8022EFFC 0022BF5C FC 20 F8 90 */ fmr f1, f31 /* 8022F000 0022BF60 81 83 00 00 */ lwz r12, 0(r3) /* 8022F004 0022BF64 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8022F008 0022BF68 7D 89 03 A6 */ mtctr r12 -/* 8022F00C 0022BF6C 4E 80 04 21 */ bctrl +/* 8022F00C 0022BF6C 4E 80 04 21 */ bctrl /* 8022F010 0022BF70 48 00 00 64 */ b lbl_8022F074 lbl_8022F014: /* 8022F014 0022BF74 80 7E 02 AC */ lwz r3, 0x2ac(r30) @@ -1003,25 +1003,25 @@ lbl_8022F014: /* 8022F01C 0022BF7C 81 83 00 00 */ lwz r12, 0(r3) /* 8022F020 0022BF80 81 8C 00 14 */ lwz r12, 0x14(r12) /* 8022F024 0022BF84 7D 89 03 A6 */ mtctr r12 -/* 8022F028 0022BF88 4E 80 04 21 */ bctrl +/* 8022F028 0022BF88 4E 80 04 21 */ bctrl /* 8022F02C 0022BF8C 80 7E 02 AC */ lwz r3, 0x2ac(r30) /* 8022F030 0022BF90 38 81 00 38 */ addi r4, r1, 0x38 /* 8022F034 0022BF94 81 83 00 00 */ lwz r12, 0(r3) /* 8022F038 0022BF98 81 8C 00 20 */ lwz r12, 0x20(r12) /* 8022F03C 0022BF9C 7D 89 03 A6 */ mtctr r12 -/* 8022F040 0022BFA0 4E 80 04 21 */ bctrl +/* 8022F040 0022BFA0 4E 80 04 21 */ bctrl /* 8022F044 0022BFA4 80 7E 02 AC */ lwz r3, 0x2ac(r30) /* 8022F048 0022BFA8 38 81 00 2C */ addi r4, r1, 0x2c /* 8022F04C 0022BFAC 81 83 00 00 */ lwz r12, 0(r3) /* 8022F050 0022BFB0 81 8C 00 24 */ lwz r12, 0x24(r12) /* 8022F054 0022BFB4 7D 89 03 A6 */ mtctr r12 -/* 8022F058 0022BFB8 4E 80 04 21 */ bctrl +/* 8022F058 0022BFB8 4E 80 04 21 */ bctrl /* 8022F05C 0022BFBC 80 7E 02 AC */ lwz r3, 0x2ac(r30) /* 8022F060 0022BFC0 FC 20 F8 90 */ fmr f1, f31 /* 8022F064 0022BFC4 81 83 00 00 */ lwz r12, 0(r3) /* 8022F068 0022BFC8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8022F06C 0022BFCC 7D 89 03 A6 */ mtctr r12 -/* 8022F070 0022BFD0 4E 80 04 21 */ bctrl +/* 8022F070 0022BFD0 4E 80 04 21 */ bctrl lbl_8022F074: /* 8022F074 0022BFD4 C0 3E 02 9C */ lfs f1, 0x29c(r30) /* 8022F078 0022BFD8 C0 02 B6 44 */ lfs f0, lbl_805AD364@sda21(r2) @@ -1082,21 +1082,21 @@ lbl_8022F148: /* 8022F14C 0022C0AC 81 83 00 00 */ lwz r12, 0(r3) /* 8022F150 0022C0B0 81 8C 00 58 */ lwz r12, 0x58(r12) /* 8022F154 0022C0B4 7D 89 03 A6 */ mtctr r12 -/* 8022F158 0022C0B8 4E 80 04 21 */ bctrl +/* 8022F158 0022C0B8 4E 80 04 21 */ bctrl /* 8022F15C 0022C0BC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022F160 0022C0C0 41 82 00 54 */ beq lbl_8022F1B4 /* 8022F164 0022C0C4 80 7E 02 A4 */ lwz r3, 0x2a4(r30) /* 8022F168 0022C0C8 81 83 00 00 */ lwz r12, 0(r3) /* 8022F16C 0022C0CC 81 8C 00 58 */ lwz r12, 0x58(r12) /* 8022F170 0022C0D0 7D 89 03 A6 */ mtctr r12 -/* 8022F174 0022C0D4 4E 80 04 21 */ bctrl +/* 8022F174 0022C0D4 4E 80 04 21 */ bctrl /* 8022F178 0022C0D8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022F17C 0022C0DC 41 82 00 38 */ beq lbl_8022F1B4 /* 8022F180 0022C0E0 80 7E 02 A8 */ lwz r3, 0x2a8(r30) /* 8022F184 0022C0E4 81 83 00 00 */ lwz r12, 0(r3) /* 8022F188 0022C0E8 81 8C 00 58 */ lwz r12, 0x58(r12) /* 8022F18C 0022C0EC 7D 89 03 A6 */ mtctr r12 -/* 8022F190 0022C0F0 4E 80 04 21 */ bctrl +/* 8022F190 0022C0F0 4E 80 04 21 */ bctrl /* 8022F194 0022C0F4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022F198 0022C0F8 41 82 00 1C */ beq lbl_8022F1B4 /* 8022F19C 0022C0FC A0 1E 00 08 */ lhz r0, 8(r30) @@ -1113,7 +1113,7 @@ lbl_8022F1B4: /* 8022F1C4 0022C124 83 C1 00 A8 */ lwz r30, 0xa8(r1) /* 8022F1C8 0022C128 7C 08 03 A6 */ mtlr r0 /* 8022F1CC 0022C12C 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 8022F1D0 0022C130 4E 80 00 20 */ blr +/* 8022F1D0 0022C130 4E 80 00 20 */ blr .global Accept__14CBouncyGrenadeFR8IVisitor Accept__14CBouncyGrenadeFR8IVisitor: @@ -1126,11 +1126,11 @@ Accept__14CBouncyGrenadeFR8IVisitor: /* 8022F1EC 0022C14C 7C 04 03 78 */ mr r4, r0 /* 8022F1F0 0022C150 81 8C 00 50 */ lwz r12, 0x50(r12) /* 8022F1F4 0022C154 7D 89 03 A6 */ mtctr r12 -/* 8022F1F8 0022C158 4E 80 04 21 */ bctrl +/* 8022F1F8 0022C158 4E 80 04 21 */ bctrl /* 8022F1FC 0022C15C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8022F200 0022C160 7C 08 03 A6 */ mtlr r0 /* 8022F204 0022C164 38 21 00 10 */ addi r1, r1, 0x10 -/* 8022F208 0022C168 4E 80 00 20 */ blr +/* 8022F208 0022C168 4E 80 00 20 */ blr .global __ct__14CBouncyGrenade __ct__14CBouncyGrenade: @@ -1310,25 +1310,25 @@ __ct__14CBouncyGrenade: /* 8022F4C0 0022C420 81 83 00 00 */ lwz r12, 0(r3) /* 8022F4C4 0022C424 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8022F4C8 0022C428 7D 89 03 A6 */ mtctr r12 -/* 8022F4CC 0022C42C 4E 80 04 21 */ bctrl +/* 8022F4CC 0022C42C 4E 80 04 21 */ bctrl /* 8022F4D0 0022C430 80 77 02 A4 */ lwz r3, 0x2a4(r23) /* 8022F4D4 0022C434 38 80 00 00 */ li r4, 0 /* 8022F4D8 0022C438 81 83 00 00 */ lwz r12, 0(r3) /* 8022F4DC 0022C43C 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8022F4E0 0022C440 7D 89 03 A6 */ mtctr r12 -/* 8022F4E4 0022C444 4E 80 04 21 */ bctrl +/* 8022F4E4 0022C444 4E 80 04 21 */ bctrl /* 8022F4E8 0022C448 80 77 02 A8 */ lwz r3, 0x2a8(r23) /* 8022F4EC 0022C44C 38 80 00 00 */ li r4, 0 /* 8022F4F0 0022C450 81 83 00 00 */ lwz r12, 0(r3) /* 8022F4F4 0022C454 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8022F4F8 0022C458 7D 89 03 A6 */ mtctr r12 -/* 8022F4FC 0022C45C 4E 80 04 21 */ bctrl +/* 8022F4FC 0022C45C 4E 80 04 21 */ bctrl /* 8022F500 0022C460 80 77 02 AC */ lwz r3, 0x2ac(r23) /* 8022F504 0022C464 38 80 00 01 */ li r4, 1 /* 8022F508 0022C468 81 83 00 00 */ lwz r12, 0(r3) /* 8022F50C 0022C46C 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8022F510 0022C470 7D 89 03 A6 */ mtctr r12 -/* 8022F514 0022C474 4E 80 04 21 */ bctrl +/* 8022F514 0022C474 4E 80 04 21 */ bctrl /* 8022F518 0022C478 7E E3 BB 78 */ mr r3, r23 /* 8022F51C 0022C47C 4B E2 43 A1 */ bl GetMaterialFilter__6CActorCFv /* 8022F520 0022C480 80 AD 95 C4 */ lwz r5, lbl_805A8184@sda21(r13) @@ -1361,7 +1361,7 @@ __ct__14CBouncyGrenade: /* 8022F58C 0022C4EC 80 01 00 F4 */ lwz r0, 0xf4(r1) /* 8022F590 0022C4F0 7C 08 03 A6 */ mtlr r0 /* 8022F594 0022C4F4 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 8022F598 0022C4F8 4E 80 00 20 */ blr +/* 8022F598 0022C4F8 4E 80 00 20 */ blr .global sub_8022f59c sub_8022f59c: @@ -1380,7 +1380,7 @@ sub_8022f59c: /* 8022F5CC 0022C52C 81 84 00 00 */ lwz r12, 0(r4) /* 8022F5D0 0022C530 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8022F5D4 0022C534 7D 89 03 A6 */ mtctr r12 -/* 8022F5D8 0022C538 4E 80 04 21 */ bctrl +/* 8022F5D8 0022C538 4E 80 04 21 */ bctrl /* 8022F5DC 0022C53C 3B E1 00 20 */ addi r31, r1, 0x20 /* 8022F5E0 0022C540 38 81 00 10 */ addi r4, r1, 0x10 /* 8022F5E4 0022C544 7F E3 FB 78 */ mr r3, r31 diff --git a/asm/MetroidPrime/Enemies/CBurrower.s b/asm/MetroidPrime/Enemies/CBurrower.s index 195b0961..2eb5d0d3 100644 --- a/asm/MetroidPrime/Enemies/CBurrower.s +++ b/asm/MetroidPrime/Enemies/CBurrower.s @@ -219,7 +219,7 @@ lbl_803EA7C4: .global GetSearchPath__9CBurrowerFv GetSearchPath__9CBurrowerFv: /* 8026FB48 0026CAA8 38 63 05 68 */ addi r3, r3, 0x568 -/* 8026FB4C 0026CAAC 4E 80 00 20 */ blr +/* 8026FB4C 0026CAAC 4E 80 00 20 */ blr .global sub_8026fb50 sub_8026fb50: @@ -227,10 +227,10 @@ sub_8026fb50: /* 8026FB54 0026CAB4 54 00 D7 FF */ rlwinm. r0, r0, 0x1a, 0x1f, 0x1f /* 8026FB58 0026CAB8 41 82 00 0C */ beq lbl_8026FB64 /* 8026FB5C 0026CABC 38 63 06 8C */ addi r3, r3, 0x68c -/* 8026FB60 0026CAC0 4E 80 00 20 */ blr +/* 8026FB60 0026CAC0 4E 80 00 20 */ blr lbl_8026FB64: /* 8026FB64 0026CAC4 38 63 05 20 */ addi r3, r3, 0x520 -/* 8026FB68 0026CAC8 4E 80 00 20 */ blr +/* 8026FB68 0026CAC8 4E 80 00 20 */ blr .global TurnAround__9CBurrowerFR13CStateManager9EStateMsgf TurnAround__9CBurrowerFR13CStateManager9EStateMsgf: @@ -264,7 +264,7 @@ lbl_8026FBD0: /* 8026FBD0 0026CB30 80 01 00 34 */ lwz r0, 0x34(r1) /* 8026FBD4 0026CB34 7C 08 03 A6 */ mtlr r0 /* 8026FBD8 0026CB38 38 21 00 30 */ addi r1, r1, 0x30 -/* 8026FBDC 0026CB3C 4E 80 00 20 */ blr +/* 8026FBDC 0026CB3C 4E 80 00 20 */ blr .global Death__9CBurrowerFRC9CVector3fR13CStateManager Death__9CBurrowerFRC9CVector3fR13CStateManager: @@ -284,13 +284,13 @@ Death__9CBurrowerFRC9CVector3fR13CStateManager: /* 8026FC14 0026CB74 38 80 00 00 */ li r4, 0 /* 8026FC18 0026CB78 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8026FC1C 0026CB7C 7D 89 03 A6 */ mtctr r12 -/* 8026FC20 0026CB80 4E 80 04 21 */ bctrl +/* 8026FC20 0026CB80 4E 80 04 21 */ bctrl lbl_8026FC24: /* 8026FC24 0026CB84 80 01 00 14 */ lwz r0, 0x14(r1) /* 8026FC28 0026CB88 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8026FC2C 0026CB8C 7C 08 03 A6 */ mtlr r0 /* 8026FC30 0026CB90 38 21 00 10 */ addi r1, r1, 0x10 -/* 8026FC34 0026CB94 4E 80 00 20 */ blr +/* 8026FC34 0026CB94 4E 80 00 20 */ blr .global AddToRenderer__9CBurrowerCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__9CBurrowerCFRC14CFrustumPlanesRC13CStateManager: @@ -313,7 +313,7 @@ AddToRenderer__9CBurrowerCFRC14CFrustumPlanesRC13CStateManager: /* 8026FC78 0026CBD8 81 83 00 00 */ lwz r12, 0(r3) /* 8026FC7C 0026CBDC 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8026FC80 0026CBE0 7D 89 03 A6 */ mtctr r12 -/* 8026FC84 0026CBE4 4E 80 04 21 */ bctrl +/* 8026FC84 0026CBE4 4E 80 04 21 */ bctrl lbl_8026FC88: /* 8026FC88 0026CBE8 7F A3 EB 78 */ mr r3, r29 /* 8026FC8C 0026CBEC 7F C4 F3 78 */ mr r4, r30 @@ -325,7 +325,7 @@ lbl_8026FC88: /* 8026FCA4 0026CC04 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8026FCA8 0026CC08 7C 08 03 A6 */ mtlr r0 /* 8026FCAC 0026CC0C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8026FCB0 0026CC10 4E 80 00 20 */ blr +/* 8026FCB0 0026CC10 4E 80 00 20 */ blr .global GetDamageVulnerability__9CBurrowerCFRC9CVector3fRC9CVector3fRC11CDamageInfo GetDamageVulnerability__9CBurrowerCFRC9CVector3fRC9CVector3fRC11CDamageInfo: @@ -345,7 +345,7 @@ lbl_8026FCE0: /* 8026FCE0 0026CC40 80 01 00 14 */ lwz r0, 0x14(r1) /* 8026FCE4 0026CC44 7C 08 03 A6 */ mtlr r0 /* 8026FCE8 0026CC48 38 21 00 10 */ addi r1, r1, 0x10 -/* 8026FCEC 0026CC4C 4E 80 00 20 */ blr +/* 8026FCEC 0026CC4C 4E 80 00 20 */ blr .global GetDamageVulnerability__9CBurrowerCFv GetDamageVulnerability__9CBurrowerCFv: @@ -365,7 +365,7 @@ lbl_8026FD1C: /* 8026FD1C 0026CC7C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8026FD20 0026CC80 7C 08 03 A6 */ mtlr r0 /* 8026FD24 0026CC84 38 21 00 10 */ addi r1, r1, 0x10 -/* 8026FD28 0026CC88 4E 80 00 20 */ blr +/* 8026FD28 0026CC88 4E 80 00 20 */ blr .global ShouldAttack__9CBurrowerFR13CStateManagerf ShouldAttack__9CBurrowerFR13CStateManagerf: @@ -404,7 +404,7 @@ lbl_8026FD9C: /* 8026FDA0 0026CD00 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8026FDA4 0026CD04 7C 08 03 A6 */ mtlr r0 /* 8026FDA8 0026CD08 38 21 00 20 */ addi r1, r1, 0x20 -/* 8026FDAC 0026CD0C 4E 80 00 20 */ blr +/* 8026FDAC 0026CD0C 4E 80 00 20 */ blr .global PathShagged__9CBurrowerFR13CStateManagerf PathShagged__9CBurrowerFR13CStateManagerf: @@ -433,7 +433,7 @@ lbl_8026FDFC: /* 8026FDFC 0026CD5C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8026FE00 0026CD60 7C 08 03 A6 */ mtlr r0 /* 8026FE04 0026CD64 38 21 00 20 */ addi r1, r1, 0x20 -/* 8026FE08 0026CD68 4E 80 00 20 */ blr +/* 8026FE08 0026CD68 4E 80 00 20 */ blr .global DoUserAnimEvent__9CBurrowerFR13CStateManagerRC13CInt32POINode14EUserEventType DoUserAnimEvent__9CBurrowerFR13CStateManagerRC13CInt32POINode14EUserEventType: @@ -468,7 +468,7 @@ lbl_8026FE60: /* 8026FE74 0026CDD4 81 9B 00 00 */ lwz r12, 0(r27) /* 8026FE78 0026CDD8 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 8026FE7C 0026CDDC 7D 89 03 A6 */ mtctr r12 -/* 8026FE80 0026CDE0 4E 80 04 21 */ bctrl +/* 8026FE80 0026CDE0 4E 80 04 21 */ bctrl /* 8026FE84 0026CDE4 C0 41 00 28 */ lfs f2, 0x28(r1) /* 8026FE88 0026CDE8 7F 84 E3 78 */ mr r4, r28 /* 8026FE8C 0026CDEC C0 21 00 2C */ lfs f1, 0x2c(r1) @@ -489,7 +489,7 @@ lbl_8026FE60: /* 8026FEC8 0026CE28 81 9C 00 00 */ lwz r12, 0(r28) /* 8026FECC 0026CE2C 81 8C 02 C0 */ lwz r12, 0x2c0(r12) /* 8026FED0 0026CE30 7D 89 03 A6 */ mtctr r12 -/* 8026FED4 0026CE34 4E 80 04 21 */ bctrl +/* 8026FED4 0026CE34 4E 80 04 21 */ bctrl /* 8026FED8 0026CE38 FC 20 F8 90 */ fmr f1, f31 /* 8026FEDC 0026CE3C 7C 64 1B 78 */ mr r4, r3 /* 8026FEE0 0026CE40 7F 67 DB 78 */ mr r7, r27 @@ -578,22 +578,22 @@ lbl_80270010: /* 8027001C 0026CF7C 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 80270020 0026CF80 7C 08 03 A6 */ mtlr r0 /* 80270024 0026CF84 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 80270028 0026CF88 4E 80 00 20 */ blr +/* 80270028 0026CF88 4E 80 00 20 */ blr .global ProjectileInfo__9CBurrowerFv ProjectileInfo__9CBurrowerFv: /* 8027002C 0026CF8C 38 63 06 4C */ addi r3, r3, 0x64c -/* 80270030 0026CF90 4E 80 00 20 */ blr +/* 80270030 0026CF90 4E 80 00 20 */ blr .global Lurk__9CBurrowerFR13CStateManager9EStateMsgf Lurk__9CBurrowerFR13CStateManager9EStateMsgf: /* 80270034 0026CF94 2C 05 00 00 */ cmpwi r5, 0 /* 80270038 0026CF98 41 82 00 0C */ beq lbl_80270044 -/* 8027003C 0026CF9C 4D 80 00 20 */ bltlr +/* 8027003C 0026CF9C 4D 80 00 20 */ bltlr .global sub_80270040 sub_80270040: -/* 80270040 0026CFA0 4E 80 00 20 */ blr +/* 80270040 0026CFA0 4E 80 00 20 */ blr lbl_80270044: /* 80270044 0026CFA4 88 03 06 AC */ lbz r0, 0x6ac(r3) /* 80270048 0026CFA8 38 80 00 00 */ li r4, 0 @@ -601,7 +601,7 @@ lbl_80270044: /* 80270050 0026CFB0 C0 02 BB C0 */ lfs f0, lbl_805AD8E0@sda21(r2) /* 80270054 0026CFB4 98 03 06 AC */ stb r0, 0x6ac(r3) /* 80270058 0026CFB8 D0 03 06 A0 */ stfs f0, 0x6a0(r3) -/* 8027005C 0026CFBC 4E 80 00 20 */ blr +/* 8027005C 0026CFBC 4E 80 00 20 */ blr .global TargetPatrol__9CBurrowerFR13CStateManager9EStateMsgf TargetPatrol__9CBurrowerFR13CStateManager9EStateMsgf: @@ -667,7 +667,7 @@ lbl_80270134: /* 8027013C 0026D09C 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80270140 0026D0A0 7C 08 03 A6 */ mtlr r0 /* 80270144 0026D0A4 38 21 00 30 */ addi r1, r1, 0x30 -/* 80270148 0026D0A8 4E 80 00 20 */ blr +/* 80270148 0026D0A8 4E 80 00 20 */ blr .global Retreat__9CBurrowerFR13CStateManager9EStateMsgf Retreat__9CBurrowerFR13CStateManager9EStateMsgf: @@ -716,12 +716,12 @@ lbl_802701BC: /* 802701E4 0026D144 81 83 00 00 */ lwz r12, 0(r3) /* 802701E8 0026D148 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 802701EC 0026D14C 7D 89 03 A6 */ mtctr r12 -/* 802701F0 0026D150 4E 80 04 21 */ bctrl +/* 802701F0 0026D150 4E 80 04 21 */ bctrl lbl_802701F4: /* 802701F4 0026D154 80 01 00 24 */ lwz r0, 0x24(r1) /* 802701F8 0026D158 7C 08 03 A6 */ mtlr r0 /* 802701FC 0026D15C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80270200 0026D160 4E 80 00 20 */ blr +/* 80270200 0026D160 4E 80 00 20 */ blr .global ProjectileAttack__9CBurrowerFR13CStateManager9EStateMsgf ProjectileAttack__9CBurrowerFR13CStateManager9EStateMsgf: @@ -757,7 +757,7 @@ lbl_80270244: /* 80270270 0026D1D0 38 80 00 00 */ li r4, 0 /* 80270274 0026D1D4 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80270278 0026D1D8 7D 89 03 A6 */ mtctr r12 -/* 8027027C 0026D1DC 4E 80 04 21 */ bctrl +/* 8027027C 0026D1DC 4E 80 04 21 */ bctrl lbl_80270280: /* 80270280 0026D1E0 38 00 00 01 */ li r0, 1 /* 80270284 0026D1E4 90 1E 03 2C */ stw r0, 0x32c(r30) @@ -806,7 +806,7 @@ lbl_8027031C: /* 80270324 0026D284 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80270328 0026D288 7C 08 03 A6 */ mtlr r0 /* 8027032C 0026D28C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80270330 0026D290 4E 80 00 20 */ blr +/* 80270330 0026D290 4E 80 00 20 */ blr .global Active__9CBurrowerFR13CStateManager9EStateMsgf Active__9CBurrowerFR13CStateManager9EStateMsgf: @@ -858,7 +858,7 @@ lbl_802703D4: /* 802703D4 0026D334 80 01 00 24 */ lwz r0, 0x24(r1) /* 802703D8 0026D338 7C 08 03 A6 */ mtlr r0 /* 802703DC 0026D33C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802703E0 0026D340 4E 80 00 20 */ blr +/* 802703E0 0026D340 4E 80 00 20 */ blr .global Patrol__9CBurrowerFR13CStateManager9EStateMsgf Patrol__9CBurrowerFR13CStateManager9EStateMsgf: @@ -895,7 +895,7 @@ lbl_80270434: /* 80270454 0026D3B4 38 80 00 01 */ li r4, 1 /* 80270458 0026D3B8 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8027045C 0026D3BC 7D 89 03 A6 */ mtctr r12 -/* 80270460 0026D3C0 4E 80 04 21 */ bctrl +/* 80270460 0026D3C0 4E 80 04 21 */ bctrl /* 80270464 0026D3C4 48 00 00 0C */ b lbl_80270470 lbl_80270468: /* 80270468 0026D3C8 A0 1D 02 DC */ lhz r0, 0x2dc(r29) @@ -913,7 +913,7 @@ lbl_80270470: /* 80270494 0026D3F4 83 A1 00 0C */ lwz r29, 0xc(r1) /* 80270498 0026D3F8 7C 08 03 A6 */ mtlr r0 /* 8027049C 0026D3FC 38 21 00 20 */ addi r1, r1, 0x20 -/* 802704A0 0026D400 4E 80 00 20 */ blr +/* 802704A0 0026D400 4E 80 00 20 */ blr .global Think__9CBurrowerFfR13CStateManager Think__9CBurrowerFfR13CStateManager: @@ -1051,7 +1051,7 @@ lbl_80270658: /* 802706A4 0026D604 81 83 00 00 */ lwz r12, 0(r3) /* 802706A8 0026D608 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 802706AC 0026D60C 7D 89 03 A6 */ mtctr r12 -/* 802706B0 0026D610 4E 80 04 21 */ bctrl +/* 802706B0 0026D610 4E 80 04 21 */ bctrl /* 802706B4 0026D614 83 DF 06 74 */ lwz r30, 0x674(r31) /* 802706B8 0026D618 38 61 00 90 */ addi r3, r1, 0x90 /* 802706BC 0026D61C 38 9F 00 34 */ addi r4, r31, 0x34 @@ -1061,7 +1061,7 @@ lbl_80270658: /* 802706CC 0026D62C 81 9E 00 00 */ lwz r12, 0(r30) /* 802706D0 0026D630 81 8C 00 14 */ lwz r12, 0x14(r12) /* 802706D4 0026D634 7D 89 03 A6 */ mtctr r12 -/* 802706D8 0026D638 4E 80 04 21 */ bctrl +/* 802706D8 0026D638 4E 80 04 21 */ bctrl /* 802706DC 0026D63C C0 5F 00 60 */ lfs f2, 0x60(r31) /* 802706E0 0026D640 38 81 00 18 */ addi r4, r1, 0x18 /* 802706E4 0026D644 C0 3F 00 50 */ lfs f1, 0x50(r31) @@ -1073,7 +1073,7 @@ lbl_80270658: /* 802706FC 0026D65C 81 83 00 00 */ lwz r12, 0(r3) /* 80270700 0026D660 81 8C 00 18 */ lwz r12, 0x18(r12) /* 80270704 0026D664 7D 89 03 A6 */ mtctr r12 -/* 80270708 0026D668 4E 80 04 21 */ bctrl +/* 80270708 0026D668 4E 80 04 21 */ bctrl /* 8027070C 0026D66C 80 7F 06 74 */ lwz r3, 0x674(r31) /* 80270710 0026D670 38 80 00 01 */ li r4, 1 /* 80270714 0026D674 48 0A C1 AD */ bl ForceParticleCreation__11CElementGenFi @@ -1083,13 +1083,13 @@ lbl_80270658: /* 80270724 0026D684 81 83 00 00 */ lwz r12, 0(r3) /* 80270728 0026D688 81 8C 00 14 */ lwz r12, 0x14(r12) /* 8027072C 0026D68C 7D 89 03 A6 */ mtctr r12 -/* 80270730 0026D690 4E 80 04 21 */ bctrl +/* 80270730 0026D690 4E 80 04 21 */ bctrl /* 80270734 0026D694 80 7F 06 74 */ lwz r3, 0x674(r31) /* 80270738 0026D698 38 80 00 00 */ li r4, 0 /* 8027073C 0026D69C 81 83 00 00 */ lwz r12, 0(r3) /* 80270740 0026D6A0 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80270744 0026D6A4 7D 89 03 A6 */ mtctr r12 -/* 80270748 0026D6A8 4E 80 04 21 */ bctrl +/* 80270748 0026D6A8 4E 80 04 21 */ bctrl lbl_8027074C: /* 8027074C 0026D6AC C0 02 BB C0 */ lfs f0, lbl_805AD8E0@sda21(r2) /* 80270750 0026D6B0 D0 1F 06 A0 */ stfs f0, 0x6a0(r31) @@ -1099,7 +1099,7 @@ lbl_80270754: /* 8027075C 0026D6BC 81 83 00 00 */ lwz r12, 0(r3) /* 80270760 0026D6C0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80270764 0026D6C4 7D 89 03 A6 */ mtctr r12 -/* 80270768 0026D6C8 4E 80 04 21 */ bctrl +/* 80270768 0026D6C8 4E 80 04 21 */ bctrl lbl_8027076C: /* 8027076C 0026D6CC 80 7F 06 78 */ lwz r3, 0x678(r31) /* 80270770 0026D6D0 28 03 00 00 */ cmplwi r3, 0 @@ -1120,14 +1120,14 @@ lbl_8027076C: /* 802707AC 0026D70C 81 83 00 00 */ lwz r12, 0(r3) /* 802707B0 0026D710 81 8C 00 18 */ lwz r12, 0x18(r12) /* 802707B4 0026D714 7D 89 03 A6 */ mtctr r12 -/* 802707B8 0026D718 4E 80 04 21 */ bctrl +/* 802707B8 0026D718 4E 80 04 21 */ bctrl lbl_802707BC: /* 802707BC 0026D71C 80 7F 06 78 */ lwz r3, 0x678(r31) /* 802707C0 0026D720 FC 20 F8 90 */ fmr f1, f31 /* 802707C4 0026D724 81 83 00 00 */ lwz r12, 0(r3) /* 802707C8 0026D728 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802707CC 0026D72C 7D 89 03 A6 */ mtctr r12 -/* 802707D0 0026D730 4E 80 04 21 */ bctrl +/* 802707D0 0026D730 4E 80 04 21 */ bctrl lbl_802707D4: /* 802707D4 0026D734 E3 E1 00 D8 */ psq_l f31, 216(r1), 0, qr0 /* 802707D8 0026D738 80 01 00 E4 */ lwz r0, 0xe4(r1) @@ -1136,7 +1136,7 @@ lbl_802707D4: /* 802707E4 0026D744 83 C1 00 C8 */ lwz r30, 0xc8(r1) /* 802707E8 0026D748 7C 08 03 A6 */ mtlr r0 /* 802707EC 0026D74C 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 802707F0 0026D750 4E 80 00 20 */ blr +/* 802707F0 0026D750 4E 80 00 20 */ blr .global Render__9CBurrowerFRC13CStateManager Render__9CBurrowerFRC13CStateManager: @@ -1158,7 +1158,7 @@ Render__9CBurrowerFRC13CStateManager: /* 80270830 0026D790 81 83 00 00 */ lwz r12, 0(r3) /* 80270834 0026D794 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80270838 0026D798 7D 89 03 A6 */ mtctr r12 -/* 8027083C 0026D79C 4E 80 04 21 */ bctrl +/* 8027083C 0026D79C 4E 80 04 21 */ bctrl lbl_80270840: /* 80270840 0026D7A0 7F C3 F3 78 */ mr r3, r30 /* 80270844 0026D7A4 7F E4 FB 78 */ mr r4, r31 @@ -1168,7 +1168,7 @@ lbl_80270840: /* 80270854 0026D7B4 83 C1 00 08 */ lwz r30, 8(r1) /* 80270858 0026D7B8 7C 08 03 A6 */ mtlr r0 /* 8027085C 0026D7BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80270860 0026D7C0 4E 80 00 20 */ blr +/* 80270860 0026D7C0 4E 80 00 20 */ blr .global AcceptScriptMsg__9CBurrowerF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__9CBurrowerF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -1225,7 +1225,7 @@ lbl_802708CC: /* 80270920 0026D880 38 80 00 01 */ li r4, 1 /* 80270924 0026D884 81 8C 00 08 */ lwz r12, 8(r12) /* 80270928 0026D888 7D 89 03 A6 */ mtctr r12 -/* 8027092C 0026D88C 4E 80 04 21 */ bctrl +/* 8027092C 0026D88C 4E 80 04 21 */ bctrl lbl_80270930: /* 80270930 0026D890 38 00 00 00 */ li r0, 0 /* 80270934 0026D894 90 1D 06 78 */ stw r0, 0x678(r29) @@ -1240,7 +1240,7 @@ lbl_80270944: /* 80270950 0026D8B0 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80270954 0026D8B4 7C 08 03 A6 */ mtlr r0 /* 80270958 0026D8B8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8027095C 0026D8BC 4E 80 00 20 */ blr +/* 8027095C 0026D8BC 4E 80 00 20 */ blr .global __dt__9CBurrowerFv __dt__9CBurrowerFv: @@ -1294,7 +1294,7 @@ lbl_802709F4: /* 80270A0C 0026D96C 38 80 00 01 */ li r4, 1 /* 80270A10 0026D970 81 8C 00 08 */ lwz r12, 8(r12) /* 80270A14 0026D974 7D 89 03 A6 */ mtctr r12 -/* 80270A18 0026D978 4E 80 04 21 */ bctrl +/* 80270A18 0026D978 4E 80 04 21 */ bctrl lbl_80270A1C: /* 80270A1C 0026D97C 34 1E 06 74 */ addic. r0, r30, 0x674 /* 80270A20 0026D980 41 82 00 24 */ beq lbl_80270A44 @@ -1305,7 +1305,7 @@ lbl_80270A1C: /* 80270A34 0026D994 38 80 00 01 */ li r4, 1 /* 80270A38 0026D998 81 8C 00 08 */ lwz r12, 8(r12) /* 80270A3C 0026D99C 7D 89 03 A6 */ mtctr r12 -/* 80270A40 0026D9A0 4E 80 04 21 */ bctrl +/* 80270A40 0026D9A0 4E 80 04 21 */ bctrl lbl_80270A44: /* 80270A44 0026D9A4 34 1E 06 4C */ addic. r0, r30, 0x64c /* 80270A48 0026D9A8 41 82 00 20 */ beq lbl_80270A68 @@ -1361,7 +1361,7 @@ lbl_80270AE8: /* 80270AF4 0026DA54 83 C1 00 08 */ lwz r30, 8(r1) /* 80270AF8 0026DA58 7C 08 03 A6 */ mtlr r0 /* 80270AFC 0026DA5C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80270B00 0026DA60 4E 80 00 20 */ blr +/* 80270B00 0026DA60 4E 80 00 20 */ blr .global __ct__9CBurrower __ct__9CBurrower: @@ -1454,7 +1454,7 @@ __ct__9CBurrower: /* 80270C5C 0026DBBC 81 84 00 00 */ lwz r12, 0(r4) /* 80270C60 0026DBC0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80270C64 0026DBC4 7D 89 03 A6 */ mtctr r12 -/* 80270C68 0026DBC8 4E 80 04 21 */ bctrl +/* 80270C68 0026DBC8 4E 80 04 21 */ bctrl /* 80270C6C 0026DBCC 3A E1 00 C0 */ addi r23, r1, 0xc0 /* 80270C70 0026DBD0 38 81 00 64 */ addi r4, r1, 0x64 /* 80270C74 0026DBD4 7E E3 BB 78 */ mr r3, r23 @@ -1503,7 +1503,7 @@ lbl_80270D0C: /* 80270D1C 0026DC7C 38 80 00 01 */ li r4, 1 /* 80270D20 0026DC80 81 8C 00 08 */ lwz r12, 8(r12) /* 80270D24 0026DC84 7D 89 03 A6 */ mtctr r12 -/* 80270D28 0026DC88 4E 80 04 21 */ bctrl +/* 80270D28 0026DC88 4E 80 04 21 */ bctrl lbl_80270D2C: /* 80270D2C 0026DC8C 7E E0 07 75 */ extsb. r0, r23 /* 80270D30 0026DC90 93 7F 06 74 */ stw r27, 0x674(r31) @@ -1531,13 +1531,13 @@ lbl_80270D44: /* 80270D84 0026DCE4 81 83 00 00 */ lwz r12, 0(r3) /* 80270D88 0026DCE8 81 8C 00 24 */ lwz r12, 0x24(r12) /* 80270D8C 0026DCEC 7D 89 03 A6 */ mtctr r12 -/* 80270D90 0026DCF0 4E 80 04 21 */ bctrl +/* 80270D90 0026DCF0 4E 80 04 21 */ bctrl /* 80270D94 0026DCF4 80 7F 06 74 */ lwz r3, 0x674(r31) /* 80270D98 0026DCF8 38 80 00 00 */ li r4, 0 /* 80270D9C 0026DCFC 81 83 00 00 */ lwz r12, 0(r3) /* 80270DA0 0026DD00 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80270DA4 0026DD04 7D 89 03 A6 */ mtctr r12 -/* 80270DA8 0026DD08 4E 80 04 21 */ bctrl +/* 80270DA8 0026DD08 4E 80 04 21 */ bctrl lbl_80270DAC: /* 80270DAC 0026DD0C 38 61 00 D8 */ addi r3, r1, 0xd8 /* 80270DB0 0026DD10 38 80 00 00 */ li r4, 0 @@ -1557,7 +1557,7 @@ lbl_80270DB8: /* 80270DE4 0026DD44 81 84 00 00 */ lwz r12, 0(r4) /* 80270DE8 0026DD48 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80270DEC 0026DD4C 7D 89 03 A6 */ mtctr r12 -/* 80270DF0 0026DD50 4E 80 04 21 */ bctrl +/* 80270DF0 0026DD50 4E 80 04 21 */ bctrl /* 80270DF4 0026DD54 3A E1 00 A8 */ addi r23, r1, 0xa8 /* 80270DF8 0026DD58 38 81 00 4C */ addi r4, r1, 0x4c /* 80270DFC 0026DD5C 7E E3 BB 78 */ mr r3, r23 @@ -1606,7 +1606,7 @@ lbl_80270E94: /* 80270EA4 0026DE04 38 80 00 01 */ li r4, 1 /* 80270EA8 0026DE08 81 8C 00 08 */ lwz r12, 8(r12) /* 80270EAC 0026DE0C 7D 89 03 A6 */ mtctr r12 -/* 80270EB0 0026DE10 4E 80 04 21 */ bctrl +/* 80270EB0 0026DE10 4E 80 04 21 */ bctrl lbl_80270EB4: /* 80270EB4 0026DE14 7E E0 07 75 */ extsb. r0, r23 /* 80270EB8 0026DE18 93 7F 06 78 */ stw r27, 0x678(r31) @@ -1629,13 +1629,13 @@ lbl_80270ECC: /* 80270EF8 0026DE58 81 83 00 00 */ lwz r12, 0(r3) /* 80270EFC 0026DE5C 81 8C 00 24 */ lwz r12, 0x24(r12) /* 80270F00 0026DE60 7D 89 03 A6 */ mtctr r12 -/* 80270F04 0026DE64 4E 80 04 21 */ bctrl +/* 80270F04 0026DE64 4E 80 04 21 */ bctrl /* 80270F08 0026DE68 80 7F 06 78 */ lwz r3, 0x678(r31) /* 80270F0C 0026DE6C 38 80 00 00 */ li r4, 0 /* 80270F10 0026DE70 81 83 00 00 */ lwz r12, 0(r3) /* 80270F14 0026DE74 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80270F18 0026DE78 7D 89 03 A6 */ mtctr r12 -/* 80270F1C 0026DE7C 4E 80 04 21 */ bctrl +/* 80270F1C 0026DE7C 4E 80 04 21 */ bctrl lbl_80270F20: /* 80270F20 0026DE80 38 61 00 CC */ addi r3, r1, 0xcc /* 80270F24 0026DE84 38 80 00 00 */ li r4, 0 @@ -1655,7 +1655,7 @@ lbl_80270F2C: /* 80270F58 0026DEB8 81 84 00 00 */ lwz r12, 0(r4) /* 80270F5C 0026DEBC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80270F60 0026DEC0 7D 89 03 A6 */ mtctr r12 -/* 80270F64 0026DEC4 4E 80 04 21 */ bctrl +/* 80270F64 0026DEC4 4E 80 04 21 */ bctrl /* 80270F68 0026DEC8 3A E1 00 90 */ addi r23, r1, 0x90 /* 80270F6C 0026DECC 38 81 00 34 */ addi r4, r1, 0x34 /* 80270F70 0026DED0 7E E3 BB 78 */ mr r3, r23 @@ -1751,7 +1751,7 @@ lbl_80271090: /* 802710B8 0026E018 81 84 00 00 */ lwz r12, 0(r4) /* 802710BC 0026E01C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802710C0 0026E020 7D 89 03 A6 */ mtctr r12 -/* 802710C4 0026E024 4E 80 04 21 */ bctrl +/* 802710C4 0026E024 4E 80 04 21 */ bctrl /* 802710C8 0026E028 38 61 00 74 */ addi r3, r1, 0x74 /* 802710CC 0026E02C 38 81 00 24 */ addi r4, r1, 0x24 /* 802710D0 0026E030 48 0C FD D9 */ bl __ct__6CTokenFRC6CToken @@ -1793,7 +1793,7 @@ lbl_80271148: /* 80271150 0026E0B0 80 01 01 14 */ lwz r0, 0x114(r1) /* 80271154 0026E0B4 7C 08 03 A6 */ mtlr r0 /* 80271158 0026E0B8 38 21 01 10 */ addi r1, r1, 0x110 -/* 8027115C 0026E0BC 4E 80 00 20 */ blr +/* 8027115C 0026E0BC 4E 80 00 20 */ blr .global __sinit_CBurrower_cpp __sinit_CBurrower_cpp: diff --git a/asm/MetroidPrime/Enemies/CBurstFire.s b/asm/MetroidPrime/Enemies/CBurstFire.s index 130805ef..ab8c2781 100644 --- a/asm/MetroidPrime/Enemies/CBurstFire.s +++ b/asm/MetroidPrime/Enemies/CBurstFire.s @@ -6,7 +6,7 @@ GetMaxZError__10CBurstFireCFv: /* 801AD120 001AA080 80 6D A1 18 */ lwz r3, gpTweakPlayer@sda21(r13) /* 801AD124 001AA084 C0 23 01 24 */ lfs f1, 0x124(r3) -/* 801AD128 001AA088 4E 80 00 20 */ blr +/* 801AD128 001AA088 4E 80 00 20 */ blr .global GetMaxXError__10CBurstFireCFv GetMaxXError__10CBurstFireCFv: @@ -15,7 +15,7 @@ GetMaxXError__10CBurstFireCFv: /* 801AD134 001AA094 C0 23 02 70 */ lfs f1, 0x270(r3) /* 801AD138 001AA098 C0 02 A8 78 */ lfs f0, lbl_805AC598@sda21(r2) /* 801AD13C 001AA09C EC 22 00 7A */ fmadds f1, f2, f1, f0 -/* 801AD140 001AA0A0 4E 80 00 20 */ blr +/* 801AD140 001AA0A0 4E 80 00 20 */ blr .global GetDistanceCompensatedError__10CBurstFireCFff GetDistanceCompensatedError__10CBurstFireCFff: @@ -76,7 +76,7 @@ lbl_801AD1DC: /* 801AD20C 001AA16C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 801AD210 001AA170 7C 08 03 A6 */ mtlr r0 /* 801AD214 001AA174 38 21 00 40 */ addi r1, r1, 0x40 -/* 801AD218 001AA178 4E 80 00 20 */ blr +/* 801AD218 001AA178 4E 80 00 20 */ blr .global GetError__10CBurstFireCFff GetError__10CBurstFireCFff: @@ -161,7 +161,7 @@ lbl_801AD30C: /* 801AD344 001AA2A4 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801AD348 001AA2A8 7C 08 03 A6 */ mtlr r0 /* 801AD34C 001AA2AC 38 21 00 70 */ addi r1, r1, 0x70 -/* 801AD350 001AA2B0 4E 80 00 20 */ blr +/* 801AD350 001AA2B0 4E 80 00 20 */ blr .global Update__10CBurstFireFR13CStateManagerf Update__10CBurstFireFR13CStateManagerf: @@ -218,7 +218,7 @@ lbl_801AD410: /* 801AD414 001AA374 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801AD418 001AA378 7C 08 03 A6 */ mtlr r0 /* 801AD41C 001AA37C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801AD420 001AA380 4E 80 00 20 */ blr +/* 801AD420 001AA380 4E 80 00 20 */ blr .global Start__10CBurstFireFR13CStateManager Start__10CBurstFireFR13CStateManager: @@ -281,7 +281,7 @@ lbl_801AD4BC: /* 801AD4F4 001AA454 80 01 00 24 */ lwz r0, 0x24(r1) /* 801AD4F8 001AA458 7C 08 03 A6 */ mtlr r0 /* 801AD4FC 001AA45C 38 21 00 20 */ addi r1, r1, 0x20 -/* 801AD500 001AA460 4E 80 00 20 */ blr +/* 801AD500 001AA460 4E 80 00 20 */ blr .global __ct__10CBurstFireFPPC6SBursti __ct__10CBurstFireFPPC6SBursti: diff --git a/asm/MetroidPrime/Enemies/CChozoGhost.s b/asm/MetroidPrime/Enemies/CChozoGhost.s index 211fd913..d236cc32 100644 --- a/asm/MetroidPrime/Enemies/CChozoGhost.s +++ b/asm/MetroidPrime/Enemies/CChozoGhost.s @@ -313,7 +313,7 @@ lbl_805A7778: .global lbl_8046C748 lbl_8046C748: .skip 0x10 - + .section .text, "ax" .global __dt__11CChozoGhostFv @@ -385,12 +385,12 @@ lbl_8013F3CC: /* 8013F3D8 0013C338 83 C1 00 08 */ lwz r30, 8(r1) /* 8013F3DC 0013C33C 7C 08 03 A6 */ mtlr r0 /* 8013F3E0 0013C340 38 21 00 10 */ addi r1, r1, 0x10 -/* 8013F3E4 0013C344 4E 80 00 20 */ blr +/* 8013F3E4 0013C344 4E 80 00 20 */ blr .global GetGravityConstant__11CChozoGhostCFv GetGravityConstant__11CChozoGhostCFv: /* 8013F3E8 0013C348 C0 22 9B 58 */ lfs f1, lbl_805AB878@sda21(r2) -/* 8013F3EC 0013C34C 4E 80 00 20 */ blr +/* 8013F3EC 0013C34C 4E 80 00 20 */ blr .global Think__11CChozoGhostFfR13CStateManager Think__11CChozoGhostFfR13CStateManager: @@ -436,7 +436,7 @@ lbl_8013F478: /* 8013F488 0013C3E8 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8013F48C 0013C3EC 7C 08 03 A6 */ mtlr r0 /* 8013F490 0013C3F0 38 21 00 30 */ addi r1, r1, 0x30 -/* 8013F494 0013C3F4 4E 80 00 20 */ blr +/* 8013F494 0013C3F4 4E 80 00 20 */ blr .global KnockBack__11CChozoGhostFRC9CVector3fR13CStateManagerRC11CDamageInfo14EKnockBackTypef KnockBack__11CChozoGhostFRC9CVector3fR13CStateManagerRC11CDamageInfo14EKnockBackTypef: @@ -525,7 +525,7 @@ lbl_8013F5C4: /* 8013F5D0 0013C530 80 01 00 44 */ lwz r0, 0x44(r1) /* 8013F5D4 0013C534 7C 08 03 A6 */ mtlr r0 /* 8013F5D8 0013C538 38 21 00 40 */ addi r1, r1, 0x40 -/* 8013F5DC 0013C53C 4E 80 00 20 */ blr +/* 8013F5DC 0013C53C 4E 80 00 20 */ blr .global DoUserAnimEvent__11CChozoGhostFR13CStateManagerRC13CInt32POINode14EUserEventType DoUserAnimEvent__11CChozoGhostFR13CStateManagerRC13CInt32POINode14EUserEventType: @@ -566,7 +566,7 @@ lbl_8013F634: /* 8013F660 0013C5C0 81 84 00 00 */ lwz r12, 0(r4) /* 8013F664 0013C5C4 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 8013F668 0013C5C8 7D 89 03 A6 */ mtctr r12 -/* 8013F66C 0013C5CC 4E 80 04 21 */ bctrl +/* 8013F66C 0013C5CC 4E 80 04 21 */ bctrl /* 8013F670 0013C5D0 C0 A1 00 54 */ lfs f5, 0x54(r1) /* 8013F674 0013C5D4 3C 60 80 5A */ lis r3, lbl_805A66F4@ha /* 8013F678 0013C5D8 C0 81 00 58 */ lfs f4, 0x58(r1) @@ -649,7 +649,7 @@ lbl_8013F754: /* 8013F7A4 0013C704 81 9C 00 00 */ lwz r12, 0(r28) /* 8013F7A8 0013C708 81 8C 02 C0 */ lwz r12, 0x2c0(r12) /* 8013F7AC 0013C70C 7D 89 03 A6 */ mtctr r12 -/* 8013F7B0 0013C710 4E 80 04 21 */ bctrl +/* 8013F7B0 0013C710 4E 80 04 21 */ bctrl /* 8013F7B4 0013C714 48 0D C7 A1 */ bl GetProjectileSpeed__15CProjectileInfoCFv /* 8013F7B8 0013C718 C0 02 9B 5C */ lfs f0, lbl_805AB87C@sda21(r2) /* 8013F7BC 0013C71C FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -771,7 +771,7 @@ lbl_8013F95C: /* 8013F968 0013C8C8 80 01 01 64 */ lwz r0, 0x164(r1) /* 8013F96C 0013C8CC 7C 08 03 A6 */ mtlr r0 /* 8013F970 0013C8D0 38 21 01 60 */ addi r1, r1, 0x160 -/* 8013F974 0013C8D4 4E 80 00 20 */ blr +/* 8013F974 0013C8D4 4E 80 00 20 */ blr .global ProjectileInfo__11CChozoGhostFv ProjectileInfo__11CChozoGhostFv: @@ -779,10 +779,10 @@ ProjectileInfo__11CChozoGhostFv: /* 8013F97C 0013C8DC 2C 00 00 02 */ cmpwi r0, 2 /* 8013F980 0013C8E0 40 82 00 0C */ bne lbl_8013F98C /* 8013F984 0013C8E4 38 63 05 78 */ addi r3, r3, 0x578 -/* 8013F988 0013C8E8 4E 80 00 20 */ blr +/* 8013F988 0013C8E8 4E 80 00 20 */ blr lbl_8013F98C: /* 8013F98C 0013C8EC 38 63 05 A0 */ addi r3, r3, 0x5a0 -/* 8013F990 0013C8F0 4E 80 00 20 */ blr +/* 8013F990 0013C8F0 4E 80 00 20 */ blr .global Dead__11CChozoGhostFR13CStateManager9EStateMsgf Dead__11CChozoGhostFR13CStateManager9EStateMsgf: @@ -829,7 +829,7 @@ lbl_8013FA24: /* 8013FA28 0013C988 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8013FA2C 0013C98C 7C 08 03 A6 */ mtlr r0 /* 8013FA30 0013C990 38 21 00 10 */ addi r1, r1, 0x10 -/* 8013FA34 0013C994 4E 80 00 20 */ blr +/* 8013FA34 0013C994 4E 80 00 20 */ blr .global Deactivate__11CChozoGhostFR13CStateManager9EStateMsgf Deactivate__11CChozoGhostFR13CStateManager9EStateMsgf: @@ -893,19 +893,19 @@ lbl_8013FB00: /* 8013FB08 0013CA68 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8013FB0C 0013CA6C 7C 08 03 A6 */ mtlr r0 /* 8013FB10 0013CA70 38 21 00 20 */ addi r1, r1, 0x20 -/* 8013FB14 0013CA74 4E 80 00 20 */ blr +/* 8013FB14 0013CA74 4E 80 00 20 */ blr .global AggressionCheck__11CChozoGhostFR13CStateManagerf AggressionCheck__11CChozoGhostFR13CStateManagerf: /* 8013FB18 0013CA78 88 03 06 65 */ lbz r0, 0x665(r3) /* 8013FB1C 0013CA7C 54 03 F7 FE */ rlwinm r3, r0, 0x1e, 0x1f, 0x1f -/* 8013FB20 0013CA80 4E 80 00 20 */ blr +/* 8013FB20 0013CA80 4E 80 00 20 */ blr .global ShouldFlinch__11CChozoGhostFR13CStateManagerf ShouldFlinch__11CChozoGhostFR13CStateManagerf: /* 8013FB24 0013CA84 88 03 06 64 */ lbz r0, 0x664(r3) /* 8013FB28 0013CA88 54 03 D7 FE */ rlwinm r3, r0, 0x1a, 0x1f, 0x1f -/* 8013FB2C 0013CA8C 4E 80 00 20 */ blr +/* 8013FB2C 0013CA8C 4E 80 00 20 */ blr .global Leash__11CChozoGhostFR13CStateManagerf Leash__11CChozoGhostFR13CStateManagerf: @@ -928,7 +928,7 @@ lbl_8013FB60: /* 8013FB68 0013CAC8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8013FB6C 0013CACC 7C 08 03 A6 */ mtlr r0 /* 8013FB70 0013CAD0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8013FB74 0013CAD4 4E 80 00 20 */ blr +/* 8013FB74 0013CAD4 4E 80 00 20 */ blr .global sub_8013fb78 sub_8013fb78: @@ -936,7 +936,7 @@ sub_8013fb78: /* 8013FB7C 0013CADC 20 00 00 03 */ subfic r0, r0, 3 /* 8013FB80 0013CAE0 7C 00 00 34 */ cntlzw r0, r0 /* 8013FB84 0013CAE4 54 03 D9 7E */ srwi r3, r0, 5 -/* 8013FB88 0013CAE8 4E 80 00 20 */ blr +/* 8013FB88 0013CAE8 4E 80 00 20 */ blr .global Lurk__11CChozoGhostFR13CStateManager9EStateMsgf Lurk__11CChozoGhostFR13CStateManager9EStateMsgf: @@ -961,7 +961,7 @@ lbl_8013FBC8: /* 8013FBC8 0013CB28 80 01 00 14 */ lwz r0, 0x14(r1) /* 8013FBCC 0013CB2C 7C 08 03 A6 */ mtlr r0 /* 8013FBD0 0013CB30 38 21 00 10 */ addi r1, r1, 0x10 -/* 8013FBD4 0013CB34 4E 80 00 20 */ blr +/* 8013FBD4 0013CB34 4E 80 00 20 */ blr .global Hurled__11CChozoGhostFR13CStateManager9EStateMsgf Hurled__11CChozoGhostFR13CStateManager9EStateMsgf: @@ -1125,7 +1125,7 @@ lbl_8013FE20: /* 8013FE30 0013CD90 83 C1 00 78 */ lwz r30, 0x78(r1) /* 8013FE34 0013CD94 7C 08 03 A6 */ mtlr r0 /* 8013FE38 0013CD98 38 21 00 90 */ addi r1, r1, 0x90 -/* 8013FE3C 0013CD9C 4E 80 00 20 */ blr +/* 8013FE3C 0013CD9C 4E 80 00 20 */ blr .global Taunt__11CChozoGhostFR13CStateManager9EStateMsgf Taunt__11CChozoGhostFR13CStateManager9EStateMsgf: @@ -1182,7 +1182,7 @@ lbl_8013FEE8: /* 8013FEF4 0013CE54 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8013FEF8 0013CE58 7C 08 03 A6 */ mtlr r0 /* 8013FEFC 0013CE5C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8013FF00 0013CE60 4E 80 00 20 */ blr +/* 8013FF00 0013CE60 4E 80 00 20 */ blr .global sub_8013ff04 sub_8013ff04: @@ -1190,7 +1190,7 @@ sub_8013ff04: /* 8013FF08 0013CE68 20 00 00 01 */ subfic r0, r0, 1 /* 8013FF0C 0013CE6C 7C 00 00 34 */ cntlzw r0, r0 /* 8013FF10 0013CE70 54 03 D9 7E */ srwi r3, r0, 5 -/* 8013FF14 0013CE74 4E 80 00 20 */ blr +/* 8013FF14 0013CE74 4E 80 00 20 */ blr .global Shuffle__11CChozoGhostFR13CStateManager9EStateMsgf Shuffle__11CChozoGhostFR13CStateManager9EStateMsgf: @@ -1296,7 +1296,7 @@ lbl_80140070: /* 80140084 0013CFE4 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80140088 0013CFE8 7C 08 03 A6 */ mtlr r0 /* 8014008C 0013CFEC 38 21 00 40 */ addi r1, r1, 0x40 -/* 80140090 0013CFF0 4E 80 00 20 */ blr +/* 80140090 0013CFF0 4E 80 00 20 */ blr .global Land__11CChozoGhostFR13CStateManager9EStateMsgf Land__11CChozoGhostFR13CStateManager9EStateMsgf: @@ -1334,7 +1334,7 @@ lbl_80140104: /* 80140108 0013D068 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8014010C 0013D06C 7C 08 03 A6 */ mtlr r0 /* 80140110 0013D070 38 21 00 20 */ addi r1, r1, 0x20 -/* 80140114 0013D074 4E 80 00 20 */ blr +/* 80140114 0013D074 4E 80 00 20 */ blr .global Attack__11CChozoGhostFR13CStateManager9EStateMsgf Attack__11CChozoGhostFR13CStateManager9EStateMsgf: @@ -1525,7 +1525,7 @@ lbl_801403BC: /* 801403CC 0013D32C 83 C1 00 98 */ lwz r30, 0x98(r1) /* 801403D0 0013D330 7C 08 03 A6 */ mtlr r0 /* 801403D4 0013D334 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 801403D8 0013D338 4E 80 00 20 */ blr +/* 801403D8 0013D338 4E 80 00 20 */ blr .global sub_801403dc sub_801403dc: @@ -1533,7 +1533,7 @@ sub_801403dc: /* 801403E0 0013D340 20 00 00 02 */ subfic r0, r0, 2 /* 801403E4 0013D344 7C 00 00 34 */ cntlzw r0, r0 /* 801403E8 0013D348 54 03 D9 7E */ srwi r3, r0, 5 -/* 801403EC 0013D34C 4E 80 00 20 */ blr +/* 801403EC 0013D34C 4E 80 00 20 */ blr .global SelectTarget__11CChozoGhostFR13CStateManager9EStateMsgf SelectTarget__11CChozoGhostFR13CStateManager9EStateMsgf: @@ -1549,13 +1549,13 @@ lbl_8014040C: /* 8014040C 0013D36C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80140410 0013D370 7C 08 03 A6 */ mtlr r0 /* 80140414 0013D374 38 21 00 10 */ addi r1, r1, 0x10 -/* 80140418 0013D378 4E 80 00 20 */ blr +/* 80140418 0013D378 4E 80 00 20 */ blr .global InRange__11CChozoGhostFR13CStateManagerf InRange__11CChozoGhostFR13CStateManagerf: /* 8014041C 0013D37C 88 03 06 65 */ lbz r0, 0x665(r3) /* 80140420 0013D380 54 03 EF FE */ rlwinm r3, r0, 0x1d, 0x1f, 0x1f -/* 80140424 0013D384 4E 80 00 20 */ blr +/* 80140424 0013D384 4E 80 00 20 */ blr .global Run__11CChozoGhostFR13CStateManager9EStateMsgf Run__11CChozoGhostFR13CStateManager9EStateMsgf: @@ -1714,7 +1714,7 @@ lbl_80140664: /* 80140674 0013D5D4 83 C1 00 58 */ lwz r30, 0x58(r1) /* 80140678 0013D5D8 7C 08 03 A6 */ mtlr r0 /* 8014067C 0013D5DC 38 21 00 70 */ addi r1, r1, 0x70 -/* 80140680 0013D5E0 4E 80 00 20 */ blr +/* 80140680 0013D5E0 4E 80 00 20 */ blr .global WallDetach__11CChozoGhostFR13CStateManager9EStateMsgf WallDetach__11CChozoGhostFR13CStateManager9EStateMsgf: @@ -1854,7 +1854,7 @@ lbl_8014086C: /* 80140878 0013D7D8 83 A1 00 74 */ lwz r29, 0x74(r1) /* 8014087C 0013D7DC 7C 08 03 A6 */ mtlr r0 /* 80140880 0013D7E0 38 21 00 80 */ addi r1, r1, 0x80 -/* 80140884 0013D7E4 4E 80 00 20 */ blr +/* 80140884 0013D7E4 4E 80 00 20 */ blr .global Generate__11CChozoGhostFR13CStateManager9EStateMsgf Generate__11CChozoGhostFR13CStateManager9EStateMsgf: @@ -2028,7 +2028,7 @@ lbl_80140AF0: /* 80140B00 0013DA60 83 C1 00 98 */ lwz r30, 0x98(r1) /* 80140B04 0013DA64 7C 08 03 A6 */ mtlr r0 /* 80140B08 0013DA68 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 80140B0C 0013DA6C 4E 80 00 20 */ blr +/* 80140B0C 0013DA6C 4E 80 00 20 */ blr .global Growth__11CChozoGhostFR13CStateManager9EStateMsgf Growth__11CChozoGhostFR13CStateManager9EStateMsgf: @@ -2093,7 +2093,7 @@ lbl_80140BE0: /* 80140BE8 0013DB48 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80140BEC 0013DB4C 7C 08 03 A6 */ mtlr r0 /* 80140BF0 0013DB50 38 21 00 20 */ addi r1, r1, 0x20 -/* 80140BF4 0013DB54 4E 80 00 20 */ blr +/* 80140BF4 0013DB54 4E 80 00 20 */ blr .global AIStage__11CChozoGhostFR13CStateManagerf AIStage__11CChozoGhostFR13CStateManagerf: @@ -2106,7 +2106,7 @@ AIStage__11CChozoGhostFR13CStateManagerf: /* 80140C10 0013DB70 7C 00 00 34 */ cntlzw r0, r0 /* 80140C14 0013DB74 54 03 D9 7E */ srwi r3, r0, 5 /* 80140C18 0013DB78 38 21 00 10 */ addi r1, r1, 0x10 -/* 80140C1C 0013DB7C 4E 80 00 20 */ blr +/* 80140C1C 0013DB7C 4E 80 00 20 */ blr .global InActive__11CChozoGhostFR13CStateManager9EStateMsgf InActive__11CChozoGhostFR13CStateManager9EStateMsgf: @@ -2175,7 +2175,7 @@ lbl_80140CF4: /* 80140D04 0013DC64 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80140D08 0013DC68 7C 08 03 A6 */ mtlr r0 /* 80140D0C 0013DC6C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80140D10 0013DC70 4E 80 00 20 */ blr +/* 80140D10 0013DC70 4E 80 00 20 */ blr .global sub_80140d14 sub_80140d14: @@ -2293,7 +2293,7 @@ lbl_80140EA4: /* 80140EC8 0013DE28 83 A1 00 D4 */ lwz r29, 0xd4(r1) /* 80140ECC 0013DE2C 7C 08 03 A6 */ mtlr r0 /* 80140ED0 0013DE30 38 21 01 10 */ addi r1, r1, 0x110 -/* 80140ED4 0013DE34 4E 80 00 20 */ blr +/* 80140ED4 0013DE34 4E 80 00 20 */ blr .global sub_80140ed8 sub_80140ed8: @@ -2341,7 +2341,7 @@ lbl_80140F6C: /* 80140F70 0013DED0 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 80140F74 0013DED4 7C 08 03 A6 */ mtlr r0 /* 80140F78 0013DED8 38 21 00 40 */ addi r1, r1, 0x40 -/* 80140F7C 0013DEDC 4E 80 00 20 */ blr +/* 80140F7C 0013DEDC 4E 80 00 20 */ blr .global sub_80140f80 sub_80140f80: @@ -2751,13 +2751,13 @@ lbl_8014154C: /* 80141580 0013E4E0 80 01 01 84 */ lwz r0, 0x184(r1) /* 80141584 0013E4E4 7C 08 03 A6 */ mtlr r0 /* 80141588 0013E4E8 38 21 01 80 */ addi r1, r1, 0x180 -/* 8014158C 0013E4EC 4E 80 00 20 */ blr +/* 8014158C 0013E4EC 4E 80 00 20 */ blr .global sub_80141590 sub_80141590: /* 80141590 0013E4F0 88 03 06 64 */ lbz r0, 0x664(r3) /* 80141594 0013E4F4 54 03 E7 FE */ rlwinm r3, r0, 0x1c, 0x1f, 0x1f -/* 80141598 0013E4F8 4E 80 00 20 */ blr +/* 80141598 0013E4F8 4E 80 00 20 */ blr .global sub_8014159c sub_8014159c: @@ -2780,7 +2780,7 @@ sub_8014159c: /* 801415DC 0013E53C 80 01 00 24 */ lwz r0, 0x24(r1) /* 801415E0 0013E540 7C 08 03 A6 */ mtlr r0 /* 801415E4 0013E544 38 21 00 20 */ addi r1, r1, 0x20 -/* 801415E8 0013E548 4E 80 00 20 */ blr +/* 801415E8 0013E548 4E 80 00 20 */ blr .global sub_801415ec sub_801415ec: @@ -2827,7 +2827,7 @@ lbl_80141680: /* 80141688 0013E5E8 83 C1 00 28 */ lwz r30, 0x28(r1) /* 8014168C 0013E5EC 7C 08 03 A6 */ mtlr r0 /* 80141690 0013E5F0 38 21 00 30 */ addi r1, r1, 0x30 -/* 80141694 0013E5F4 4E 80 00 20 */ blr +/* 80141694 0013E5F4 4E 80 00 20 */ blr .global sub_80141698 sub_80141698: @@ -2875,7 +2875,7 @@ lbl_8014172C: /* 80141734 0013E694 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80141738 0013E698 7C 08 03 A6 */ mtlr r0 /* 8014173C 0013E69C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80141740 0013E6A0 4E 80 00 20 */ blr +/* 80141740 0013E6A0 4E 80 00 20 */ blr .global GetOrigin__11CChozoGhostCFv GetOrigin__11CChozoGhostCFv: @@ -2885,7 +2885,7 @@ GetOrigin__11CChozoGhostCFv: /* 80141750 0013E6B0 D0 03 00 00 */ stfs f0, 0(r3) /* 80141754 0013E6B4 D0 23 00 04 */ stfs f1, 4(r3) /* 80141758 0013E6B8 D0 43 00 08 */ stfs f2, 8(r3) -/* 8014175C 0013E6BC 4E 80 00 20 */ blr +/* 8014175C 0013E6BC 4E 80 00 20 */ blr .global sub_80141760 sub_80141760: @@ -2895,14 +2895,14 @@ sub_80141760: /* 8014176C 0013E6CC 81 83 00 00 */ lwz r12, 0(r3) /* 80141770 0013E6D0 81 8C 02 B4 */ lwz r12, 0x2b4(r12) /* 80141774 0013E6D4 7D 89 03 A6 */ mtctr r12 -/* 80141778 0013E6D8 4E 80 04 21 */ bctrl +/* 80141778 0013E6D8 4E 80 04 21 */ bctrl /* 8014177C 0013E6DC 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80141780 0013E6E0 20 00 00 1F */ subfic r0, r0, 0x1f /* 80141784 0013E6E4 54 03 0F FE */ srwi r3, r0, 0x1f /* 80141788 0013E6E8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8014178C 0013E6EC 7C 08 03 A6 */ mtlr r0 /* 80141790 0013E6F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80141794 0013E6F4 4E 80 00 20 */ blr +/* 80141794 0013E6F4 4E 80 00 20 */ blr .global Render__11CChozoGhostCFRC13CStateManager Render__11CChozoGhostCFRC13CStateManager: @@ -2987,7 +2987,7 @@ lbl_801418B8: /* 801418C4 0013E824 83 A1 00 24 */ lwz r29, 0x24(r1) /* 801418C8 0013E828 7C 08 03 A6 */ mtlr r0 /* 801418CC 0013E82C 38 21 00 30 */ addi r1, r1, 0x30 -/* 801418D0 0013E830 4E 80 00 20 */ blr +/* 801418D0 0013E830 4E 80 00 20 */ blr .global PreRender__11CChozoGhostFR13CStateManagerRC14CFrustumPlanes PreRender__11CChozoGhostFR13CStateManagerRC14CFrustumPlanes: @@ -3038,7 +3038,7 @@ lbl_8014196C: /* 8014197C 0013E8DC 90 01 00 10 */ stw r0, 0x10(r1) /* 80141980 0013E8E0 81 8C 02 B4 */ lwz r12, 0x2b4(r12) /* 80141984 0013E8E4 7D 89 03 A6 */ mtctr r12 -/* 80141988 0013E8E8 4E 80 04 21 */ bctrl +/* 80141988 0013E8E8 4E 80 04 21 */ bctrl /* 8014198C 0013E8EC 7C 7C 1B 78 */ mr r28, r3 /* 80141990 0013E8F0 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80141994 0013E8F4 28 00 00 FF */ cmplwi r0, 0xff @@ -3130,7 +3130,7 @@ lbl_80141A7C: /* 80141AD8 0013EA38 83 81 00 30 */ lwz r28, 0x30(r1) /* 80141ADC 0013EA3C 7C 08 03 A6 */ mtlr r0 /* 80141AE0 0013EA40 38 21 00 40 */ addi r1, r1, 0x40 -/* 80141AE4 0013EA44 4E 80 00 20 */ blr +/* 80141AE4 0013EA44 4E 80 00 20 */ blr .global GetModelAlphau8__11CChozoGhostCFRC13CStateManager GetModelAlphau8__11CChozoGhostCFRC13CStateManager: @@ -3158,7 +3158,7 @@ lbl_80141B28: /* 80141B34 0013EA94 83 C1 00 08 */ lwz r30, 8(r1) /* 80141B38 0013EA98 7C 08 03 A6 */ mtlr r0 /* 80141B3C 0013EA9C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80141B40 0013EAA0 4E 80 00 20 */ blr +/* 80141B40 0013EAA0 4E 80 00 20 */ blr .global GetDamageVulnerability__11CChozoGhostCFv GetDamageVulnerability__11CChozoGhostCFv: @@ -3177,12 +3177,12 @@ lbl_80141B6C: /* 80141B6C 0013EACC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80141B70 0013EAD0 7C 08 03 A6 */ mtlr r0 /* 80141B74 0013EAD4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80141B78 0013EAD8 4E 80 00 20 */ blr +/* 80141B78 0013EAD8 4E 80 00 20 */ blr .global GetCollisionResponseType__11CChozoGhostCFRC9CVector3fRC9CVector3fRC11CWeaponModei GetCollisionResponseType__11CChozoGhostCFRC9CVector3fRC9CVector3fRC11CWeaponModei: /* 80141B7C 0013EADC 38 60 00 26 */ li r3, 0x26 -/* 80141B80 0013EAE0 4E 80 00 20 */ blr +/* 80141B80 0013EAE0 4E 80 00 20 */ blr .global CanBeShot__11CChozoGhostFRC13CStateManageri CanBeShot__11CChozoGhostFRC13CStateManageri: @@ -3193,7 +3193,7 @@ CanBeShot__11CChozoGhostFRC13CStateManageri: /* 80141B94 0013EAF4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80141B98 0013EAF8 7C 08 03 A6 */ mtlr r0 /* 80141B9C 0013EAFC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80141BA0 0013EB00 4E 80 00 20 */ blr +/* 80141BA0 0013EB00 4E 80 00 20 */ blr .global Touch__11CChozoGhostFR6CActorR13CStateManager Touch__11CChozoGhostFR6CActorR13CStateManager: @@ -3247,7 +3247,7 @@ Touch__11CChozoGhostFR6CActorR13CStateManager: /* 80141C60 0013EBC0 B0 01 00 18 */ sth r0, 0x18(r1) /* 80141C64 0013EBC4 81 8C 02 B0 */ lwz r12, 0x2b0(r12) /* 80141C68 0013EBC8 7D 89 03 A6 */ mtctr r12 -/* 80141C6C 0013EBCC 4E 80 04 21 */ bctrl +/* 80141C6C 0013EBCC 4E 80 04 21 */ bctrl /* 80141C70 0013EBD0 3C 80 80 5A */ lis r4, skZero3f@ha /* 80141C74 0013EBD4 7F C3 F3 78 */ mr r3, r30 /* 80141C78 0013EBD8 39 24 66 A0 */ addi r9, r4, skZero3f@l @@ -3271,7 +3271,7 @@ lbl_80141C9C: /* 80141CBC 0013EC1C 83 81 00 60 */ lwz r28, 0x60(r1) /* 80141CC0 0013EC20 7C 08 03 A6 */ mtlr r0 /* 80141CC4 0013EC24 38 21 00 70 */ addi r1, r1, 0x70 -/* 80141CC8 0013EC28 4E 80 00 20 */ blr +/* 80141CC8 0013EC28 4E 80 00 20 */ blr .global AcceptScriptMsg__11CChozoGhostF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__11CChozoGhostF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -3297,7 +3297,7 @@ AcceptScriptMsg__11CChozoGhostF20EScriptObjectMessage9TUniqueIdR13CStateManager: /* 80141D18 0013EC78 38 63 1B E4 */ addi r3, r3, lbl_803E1BE4@l /* 80141D1C 0013EC7C 7C 03 00 2E */ lwzx r0, r3, r0 /* 80141D20 0013EC80 7C 09 03 A6 */ mtctr r0 -/* 80141D24 0013EC84 4E 80 04 20 */ bctr +/* 80141D24 0013EC84 4E 80 04 20 */ bctr .global lbl_80141D28 lbl_80141D28: /* 80141D28 0013EC88 88 1F 00 30 */ lbz r0, 0x30(r31) @@ -3351,7 +3351,7 @@ lbl_80141DAC: /* 80141DC0 0013ED20 81 9F 00 00 */ lwz r12, 0(r31) /* 80141DC4 0013ED24 81 8C 02 BC */ lwz r12, 0x2bc(r12) /* 80141DC8 0013ED28 7D 89 03 A6 */ mtctr r12 -/* 80141DCC 0013ED2C 4E 80 04 21 */ bctrl +/* 80141DCC 0013ED2C 4E 80 04 21 */ bctrl /* 80141DD0 0013ED30 FC 20 08 50 */ fneg f1, f1 /* 80141DD4 0013ED34 C0 02 9B 5C */ lfs f0, lbl_805AB87C@sda21(r2) /* 80141DD8 0013ED38 D0 1F 01 50 */ stfs f0, 0x150(r31) @@ -3368,7 +3368,7 @@ lbl_80141DE8: /* 80141DFC 0013ED5C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80141E00 0013ED60 7C 08 03 A6 */ mtlr r0 /* 80141E04 0013ED64 38 21 00 30 */ addi r1, r1, 0x30 -/* 80141E08 0013ED68 4E 80 00 20 */ blr +/* 80141E08 0013ED68 4E 80 00 20 */ blr .global Accept__11CChozoGhostFR8IVisitor Accept__11CChozoGhostFR8IVisitor: @@ -3381,11 +3381,11 @@ Accept__11CChozoGhostFR8IVisitor: /* 80141E24 0013ED84 7C 04 03 78 */ mr r4, r0 /* 80141E28 0013ED88 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 80141E2C 0013ED8C 7D 89 03 A6 */ mtctr r12 -/* 80141E30 0013ED90 4E 80 04 21 */ bctrl +/* 80141E30 0013ED90 4E 80 04 21 */ bctrl /* 80141E34 0013ED94 80 01 00 14 */ lwz r0, 0x14(r1) /* 80141E38 0013ED98 7C 08 03 A6 */ mtlr r0 /* 80141E3C 0013ED9C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80141E40 0013EDA0 4E 80 00 20 */ blr +/* 80141E40 0013EDA0 4E 80 00 20 */ blr .global "__ct__11CChozoGhostF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC16CActorParametersRC14CPatternedInfoffffUiRC11CDamageInfoUiRC11CDamageInfoRCQ211CChozoGhost13CBehaveChanceRCQ211CChozoGhost13CBehaveChanceRCQ211CChozoGhost13CBehaveChance" "__ct__11CChozoGhostF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC16CActorParametersRC14CPatternedInfoffffUiRC11CDamageInfoUiRC11CDamageInfoRCQ211CChozoGhost13CBehaveChanceRCQ211CChozoGhost13CBehaveChanceRCQ211CChozoGhost13CBehaveChance": @@ -3772,7 +3772,7 @@ lbl_80142160: /* 80142430 0013F390 81 84 00 00 */ lwz r12, 0(r4) /* 80142434 0013F394 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80142438 0013F398 7D 89 03 A6 */ mtctr r12 -/* 8014243C 0013F39C 4E 80 04 21 */ bctrl +/* 8014243C 0013F39C 4E 80 04 21 */ bctrl /* 80142440 0013F3A0 39 E1 00 F4 */ addi r15, r1, 0xf4 /* 80142444 0013F3A4 38 81 00 24 */ addi r4, r1, 0x24 /* 80142448 0013F3A8 7D E3 7B 78 */ mr r3, r15 @@ -3937,7 +3937,7 @@ lbl_80142628: /* 80142678 0013F5D8 80 01 02 F4 */ lwz r0, 0x2f4(r1) /* 8014267C 0013F5DC 7C 08 03 A6 */ mtlr r0 /* 80142680 0013F5E0 38 21 02 F0 */ addi r1, r1, 0x2f0 -/* 80142684 0013F5E4 4E 80 00 20 */ blr +/* 80142684 0013F5E4 4E 80 00 20 */ blr .global GetBehave__Q211CChozoGhost13CBehaveChanceCFQ211CChozoGhost11EBehaveTypeR13CStateManager GetBehave__Q211CChozoGhost13CBehaveChanceCFQ211CChozoGhost11EBehaveTypeR13CStateManager: @@ -4021,7 +4021,7 @@ lbl_80142780: /* 80142798 0013F6F8 CB A1 00 10 */ lfd f29, 0x10(r1) /* 8014279C 0013F6FC 7C 08 03 A6 */ mtlr r0 /* 801427A0 0013F700 38 21 00 40 */ addi r1, r1, 0x40 -/* 801427A4 0013F704 4E 80 00 20 */ blr +/* 801427A4 0013F704 4E 80 00 20 */ blr .global __ct__Q211CChozoGhost13CBehaveChanceFR12CInputStream __ct__Q211CChozoGhost13CBehaveChanceFR12CInputStream: @@ -4098,16 +4098,16 @@ lbl_80142850: /* 801428B0 0013F810 80 01 00 14 */ lwz r0, 0x14(r1) /* 801428B4 0013F814 7C 08 03 A6 */ mtlr r0 /* 801428B8 0013F818 38 21 00 10 */ addi r1, r1, 0x10 -/* 801428BC 0013F81C 4E 80 00 20 */ blr +/* 801428BC 0013F81C 4E 80 00 20 */ blr .global sub_801428c0 sub_801428c0: /* 801428C0 0013F820 80 A3 00 00 */ lwz r5, 0(r3) /* 801428C4 0013F824 80 04 00 00 */ lwz r0, 0(r4) /* 801428C8 0013F828 7C 05 00 00 */ cmpw r5, r0 -/* 801428CC 0013F82C 4D 81 00 20 */ bgtlr +/* 801428CC 0013F82C 4D 81 00 20 */ bgtlr /* 801428D0 0013F830 7C 83 23 78 */ mr r3, r4 -/* 801428D4 0013F834 4E 80 00 20 */ blr +/* 801428D4 0013F834 4E 80 00 20 */ blr .global __sinit_CChozoGhost_cpp __sinit_CChozoGhost_cpp: diff --git a/asm/MetroidPrime/Enemies/CDrone.s b/asm/MetroidPrime/Enemies/CDrone.s index fa171dc3..58ffc7fe 100644 --- a/asm/MetroidPrime/Enemies/CDrone.s +++ b/asm/MetroidPrime/Enemies/CDrone.s @@ -492,7 +492,7 @@ lbl_8046C890: .global lbl_8046C8A8 lbl_8046C8A8: .skip 0x18 - + .section .sbss # CDrone .global lbl_805A8FE0 @@ -737,17 +737,17 @@ lbl_8015F12C: /* 8015F138 0015C098 83 C1 00 08 */ lwz r30, 8(r1) /* 8015F13C 0015C09C 7C 08 03 A6 */ mtlr r0 /* 8015F140 0015C0A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8015F144 0015C0A4 4E 80 00 20 */ blr +/* 8015F144 0015C0A4 4E 80 00 20 */ blr .global GetSearchPath__6CDroneFv GetSearchPath__6CDroneFv: /* 8015F148 0015C0A8 38 63 06 B0 */ addi r3, r3, 0x6b0 -/* 8015F14C 0015C0AC 4E 80 00 20 */ blr +/* 8015F14C 0015C0AC 4E 80 00 20 */ blr .global sub_8015f150 sub_8015f150: /* 8015F150 0015C0B0 38 60 00 03 */ li r3, 3 -/* 8015F154 0015C0B4 4E 80 00 20 */ blr +/* 8015F154 0015C0B4 4E 80 00 20 */ blr .global sub_8015f158 sub_8015f158: @@ -818,7 +818,7 @@ lbl_8015F240: /* 8015F24C 0015C1AC 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8015F250 0015C1B0 7C 08 03 A6 */ mtlr r0 /* 8015F254 0015C1B4 38 21 00 40 */ addi r1, r1, 0x40 -/* 8015F258 0015C1B8 4E 80 00 20 */ blr +/* 8015F258 0015C1B8 4E 80 00 20 */ blr .global sub_8015f25c sub_8015f25c: @@ -931,7 +931,7 @@ lbl_8015F3D8: /* 8015F3E4 0015C344 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8015F3E8 0015C348 7C 08 03 A6 */ mtlr r0 /* 8015F3EC 0015C34C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8015F3F0 0015C350 4E 80 00 20 */ blr +/* 8015F3F0 0015C350 4E 80 00 20 */ blr .global sub_8015f3f4 sub_8015f3f4: @@ -976,7 +976,7 @@ lbl_8015F480: /* 8015F488 0015C3E8 83 C1 00 28 */ lwz r30, 0x28(r1) /* 8015F48C 0015C3EC 7C 08 03 A6 */ mtlr r0 /* 8015F490 0015C3F0 38 21 00 30 */ addi r1, r1, 0x30 -/* 8015F494 0015C3F4 4E 80 00 20 */ blr +/* 8015F494 0015C3F4 4E 80 00 20 */ blr .global sub_8015f498 sub_8015f498: @@ -1010,7 +1010,7 @@ lbl_8015F4FC: /* 8015F500 0015C460 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8015F504 0015C464 7C 08 03 A6 */ mtlr r0 /* 8015F508 0015C468 38 21 00 20 */ addi r1, r1, 0x20 -/* 8015F50C 0015C46C 4E 80 00 20 */ blr +/* 8015F50C 0015C46C 4E 80 00 20 */ blr .global sub_8015f510 sub_8015f510: @@ -1045,7 +1045,7 @@ sub_8015f510: /* 8015F580 0015C4E0 C0 3F 06 1C */ lfs f1, 0x61c(r31) /* 8015F584 0015C4E4 81 8C 02 CC */ lwz r12, 0x2cc(r12) /* 8015F588 0015C4E8 7D 89 03 A6 */ mtctr r12 -/* 8015F58C 0015C4EC 4E 80 04 21 */ bctrl +/* 8015F58C 0015C4EC 4E 80 04 21 */ bctrl /* 8015F590 0015C4F0 80 01 00 5C */ lwz r0, 0x5c(r1) /* 8015F594 0015C4F4 2C 00 00 00 */ cmpwi r0, 0 /* 8015F598 0015C4F8 40 81 02 60 */ ble lbl_8015F7F8 @@ -1247,11 +1247,11 @@ lbl_8015F84C: /* 8015F87C 0015C7DC 83 81 08 60 */ lwz r28, 0x860(r1) /* 8015F880 0015C7E0 7C 08 03 A6 */ mtlr r0 /* 8015F884 0015C7E4 38 21 08 B0 */ addi r1, r1, 0x8b0 -/* 8015F888 0015C7E8 4E 80 00 20 */ blr +/* 8015F888 0015C7E8 4E 80 00 20 */ blr .global Burn__6CDroneFff Burn__6CDroneFff: -/* 8015F88C 0015C7EC 4E 80 00 20 */ blr +/* 8015F88C 0015C7EC 4E 80 00 20 */ blr .global CanRenderUnsorted__6CDroneCFRC13CStateManager CanRenderUnsorted__6CDroneCFRC13CStateManager: @@ -1273,7 +1273,7 @@ lbl_8015F8C4: /* 8015F8C4 0015C824 80 01 00 14 */ lwz r0, 0x14(r1) /* 8015F8C8 0015C828 7C 08 03 A6 */ mtlr r0 /* 8015F8CC 0015C82C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8015F8D0 0015C830 4E 80 00 20 */ blr +/* 8015F8D0 0015C830 4E 80 00 20 */ blr .global Cover__6CDroneFR13CStateManager9EStateMsgf Cover__6CDroneFR13CStateManager9EStateMsgf: @@ -1371,7 +1371,7 @@ lbl_8015FA10: /* 8015FA2C 0015C98C C3 BD 00 40 */ lfs f29, 0x40(r29) /* 8015FA30 0015C990 C0 22 9F 68 */ lfs f1, lbl_805ABC88@sda21(r2) /* 8015FA34 0015C994 7D 89 03 A6 */ mtctr r12 -/* 8015FA38 0015C998 4E 80 04 21 */ bctrl +/* 8015FA38 0015C998 4E 80 04 21 */ bctrl /* 8015FA3C 0015C99C C0 41 00 98 */ lfs f2, 0x98(r1) /* 8015FA40 0015C9A0 38 61 00 AC */ addi r3, r1, 0xac /* 8015FA44 0015C9A4 C0 21 00 9C */ lfs f1, 0x9c(r1) @@ -1511,7 +1511,7 @@ lbl_8015FBB4: /* 8015FC54 0015CBB4 C3 7D 00 40 */ lfs f27, 0x40(r29) /* 8015FC58 0015CBB8 C0 22 9F 68 */ lfs f1, lbl_805ABC88@sda21(r2) /* 8015FC5C 0015CBBC 7D 89 03 A6 */ mtctr r12 -/* 8015FC60 0015CBC0 4E 80 04 21 */ bctrl +/* 8015FC60 0015CBC0 4E 80 04 21 */ bctrl /* 8015FC64 0015CBC4 C0 41 00 24 */ lfs f2, 0x24(r1) /* 8015FC68 0015CBC8 38 61 00 3C */ addi r3, r1, 0x3c /* 8015FC6C 0015CBCC C0 21 00 28 */ lfs f1, 0x28(r1) @@ -1578,7 +1578,7 @@ lbl_8015FD24: /* 8015FD58 0015CCB8 83 A1 01 14 */ lwz r29, 0x114(r1) /* 8015FD5C 0015CCBC 7C 08 03 A6 */ mtlr r0 /* 8015FD60 0015CCC0 38 21 01 70 */ addi r1, r1, 0x170 -/* 8015FD64 0015CCC4 4E 80 00 20 */ blr +/* 8015FD64 0015CCC4 4E 80 00 20 */ blr .global CoverCheck__6CDroneFR13CStateManagerf CoverCheck__6CDroneFR13CStateManagerf: @@ -1629,7 +1629,7 @@ lbl_8015FE08: /* 8015FE0C 0015CD6C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8015FE10 0015CD70 7C 08 03 A6 */ mtlr r0 /* 8015FE14 0015CD74 38 21 00 10 */ addi r1, r1, 0x10 -/* 8015FE18 0015CD78 4E 80 00 20 */ blr +/* 8015FE18 0015CD78 4E 80 00 20 */ blr .global ShouldMove__6CDroneFR13CStateManagerf ShouldMove__6CDroneFR13CStateManagerf: @@ -1639,7 +1639,7 @@ ShouldMove__6CDroneFR13CStateManagerf: /* 8015FE28 0015CD88 4C 40 13 82 */ cror 2, 0, 2 /* 8015FE2C 0015CD8C 7C 00 00 26 */ mfcr r0 /* 8015FE30 0015CD90 54 03 1F FE */ rlwinm r3, r0, 3, 0x1f, 0x1f -/* 8015FE34 0015CD94 4E 80 00 20 */ blr +/* 8015FE34 0015CD94 4E 80 00 20 */ blr .global Leash__6CDroneFR13CStateManagerf Leash__6CDroneFR13CStateManagerf: @@ -1671,7 +1671,7 @@ Leash__6CDroneFR13CStateManagerf: /* 8015FE9C 0015CDFC 7C 00 00 26 */ mfcr r0 /* 8015FEA0 0015CE00 54 03 0F FE */ srwi r3, r0, 0x1f /* 8015FEA4 0015CE04 38 21 00 20 */ addi r1, r1, 0x20 -/* 8015FEA8 0015CE08 4E 80 00 20 */ blr +/* 8015FEA8 0015CE08 4E 80 00 20 */ blr .global TargetPlayer__6CDroneFR13CStateManager9EStateMsgf TargetPlayer__6CDroneFR13CStateManager9EStateMsgf: @@ -1721,7 +1721,7 @@ lbl_8015FF4C: /* 8015FF50 0015CEB0 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 8015FF54 0015CEB4 7C 08 03 A6 */ mtlr r0 /* 8015FF58 0015CEB8 38 21 00 40 */ addi r1, r1, 0x40 -/* 8015FF5C 0015CEBC 4E 80 00 20 */ blr +/* 8015FF5C 0015CEBC 4E 80 00 20 */ blr .global PathFind__6CDroneFR13CStateManager9EStateMsgf PathFind__6CDroneFR13CStateManager9EStateMsgf: @@ -1765,7 +1765,7 @@ lbl_8015FFBC: /* 8015FFEC 0015CF4C 81 83 00 00 */ lwz r12, 0(r3) /* 8015FFF0 0015CF50 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 8015FFF4 0015CF54 7D 89 03 A6 */ mtctr r12 -/* 8015FFF8 0015CF58 4E 80 04 21 */ bctrl +/* 8015FFF8 0015CF58 4E 80 04 21 */ bctrl /* 8015FFFC 0015CF5C 38 81 00 74 */ addi r4, r1, 0x74 /* 80160000 0015CF60 38 A1 00 8C */ addi r5, r1, 0x8c /* 80160004 0015CF64 48 06 7C 69 */ bl Search__15CPathFindSearchFRC9CVector3fRC9CVector3f @@ -1775,7 +1775,7 @@ lbl_8015FFBC: /* 80160014 0015CF74 81 9D 00 00 */ lwz r12, 0(r29) /* 80160018 0015CF78 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 8016001C 0015CF7C 7D 89 03 A6 */ mtctr r12 -/* 80160020 0015CF80 4E 80 04 21 */ bctrl +/* 80160020 0015CF80 4E 80 04 21 */ bctrl /* 80160024 0015CF84 80 03 00 CC */ lwz r0, 0xcc(r3) /* 80160028 0015CF88 2C 00 00 03 */ cmpwi r0, 3 /* 8016002C 0015CF8C 41 82 00 24 */ beq lbl_80160050 @@ -1783,7 +1783,7 @@ lbl_8015FFBC: /* 80160034 0015CF94 81 9D 00 00 */ lwz r12, 0(r29) /* 80160038 0015CF98 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 8016003C 0015CF9C 7D 89 03 A6 */ mtctr r12 -/* 80160040 0015CFA0 4E 80 04 21 */ bctrl +/* 80160040 0015CFA0 4E 80 04 21 */ bctrl /* 80160044 0015CFA4 80 03 00 CC */ lwz r0, 0xcc(r3) /* 80160048 0015CFA8 2C 00 00 04 */ cmpwi r0, 4 /* 8016004C 0015CFAC 40 82 00 88 */ bne lbl_801600D4 @@ -1798,7 +1798,7 @@ lbl_80160050: /* 8016006C 0015CFCC 81 9D 00 00 */ lwz r12, 0(r29) /* 80160070 0015CFD0 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 80160074 0015CFD4 7D 89 03 A6 */ mtctr r12 -/* 80160078 0015CFD8 4E 80 04 21 */ bctrl +/* 80160078 0015CFD8 4E 80 04 21 */ bctrl /* 8016007C 0015CFDC 38 81 00 68 */ addi r4, r1, 0x68 /* 80160080 0015CFE0 38 A1 00 8C */ addi r5, r1, 0x8c /* 80160084 0015CFE4 48 06 70 79 */ bl FindClosestReachablePoint__15CPathFindSearchCFRC9CVector3fR9CVector3f @@ -1814,7 +1814,7 @@ lbl_80160050: /* 801600AC 0015D00C 81 9D 00 00 */ lwz r12, 0(r29) /* 801600B0 0015D010 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801600B4 0015D014 7D 89 03 A6 */ mtctr r12 -/* 801600B8 0015D018 4E 80 04 21 */ bctrl +/* 801600B8 0015D018 4E 80 04 21 */ bctrl /* 801600BC 0015D01C 38 81 00 5C */ addi r4, r1, 0x5c /* 801600C0 0015D020 38 A1 00 8C */ addi r5, r1, 0x8c /* 801600C4 0015D024 48 06 7B A9 */ bl Search__15CPathFindSearchFRC9CVector3fRC9CVector3f @@ -1882,7 +1882,7 @@ lbl_801600F4: /* 801601B4 0015D114 C3 FD 00 40 */ lfs f31, 0x40(r29) /* 801601B8 0015D118 C0 22 9F 68 */ lfs f1, lbl_805ABC88@sda21(r2) /* 801601BC 0015D11C 7D 89 03 A6 */ mtctr r12 -/* 801601C0 0015D120 4E 80 04 21 */ bctrl +/* 801601C0 0015D120 4E 80 04 21 */ bctrl /* 801601C4 0015D124 C0 41 00 20 */ lfs f2, 0x20(r1) /* 801601C8 0015D128 38 61 00 38 */ addi r3, r1, 0x38 /* 801601CC 0015D12C C0 21 00 24 */ lfs f1, 0x24(r1) @@ -1959,7 +1959,7 @@ lbl_801602B8: /* 801602DC 0015D23C 83 A1 00 C4 */ lwz r29, 0xc4(r1) /* 801602E0 0015D240 7C 08 03 A6 */ mtlr r0 /* 801602E4 0015D244 38 21 01 00 */ addi r1, r1, 0x100 -/* 801602E8 0015D248 4E 80 00 20 */ blr +/* 801602E8 0015D248 4E 80 00 20 */ blr .global PathFindEx__6CDroneFR13CStateManager9EStateMsgf PathFindEx__6CDroneFR13CStateManager9EStateMsgf: @@ -2000,7 +2000,7 @@ lbl_80160324: /* 80160370 0015D2D0 81 9D 00 00 */ lwz r12, 0(r29) /* 80160374 0015D2D4 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 80160378 0015D2D8 7D 89 03 A6 */ mtctr r12 -/* 8016037C 0015D2DC 4E 80 04 21 */ bctrl +/* 8016037C 0015D2DC 4E 80 04 21 */ bctrl /* 80160380 0015D2E0 38 81 00 20 */ addi r4, r1, 0x20 /* 80160384 0015D2E4 38 A1 00 2C */ addi r5, r1, 0x2c /* 80160388 0015D2E8 48 06 78 E5 */ bl Search__15CPathFindSearchFRC9CVector3fRC9CVector3f @@ -2010,7 +2010,7 @@ lbl_80160324: /* 80160398 0015D2F8 81 9D 00 00 */ lwz r12, 0(r29) /* 8016039C 0015D2FC 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801603A0 0015D300 7D 89 03 A6 */ mtctr r12 -/* 801603A4 0015D304 4E 80 04 21 */ bctrl +/* 801603A4 0015D304 4E 80 04 21 */ bctrl /* 801603A8 0015D308 80 03 00 CC */ lwz r0, 0xcc(r3) /* 801603AC 0015D30C 2C 00 00 03 */ cmpwi r0, 3 /* 801603B0 0015D310 41 82 00 24 */ beq lbl_801603D4 @@ -2018,7 +2018,7 @@ lbl_80160324: /* 801603B8 0015D318 81 9D 00 00 */ lwz r12, 0(r29) /* 801603BC 0015D31C 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801603C0 0015D320 7D 89 03 A6 */ mtctr r12 -/* 801603C4 0015D324 4E 80 04 21 */ bctrl +/* 801603C4 0015D324 4E 80 04 21 */ bctrl /* 801603C8 0015D328 80 03 00 CC */ lwz r0, 0xcc(r3) /* 801603CC 0015D32C 2C 00 00 04 */ cmpwi r0, 4 /* 801603D0 0015D330 40 82 00 88 */ bne lbl_80160458 @@ -2033,7 +2033,7 @@ lbl_801603D4: /* 801603F0 0015D350 81 9D 00 00 */ lwz r12, 0(r29) /* 801603F4 0015D354 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801603F8 0015D358 7D 89 03 A6 */ mtctr r12 -/* 801603FC 0015D35C 4E 80 04 21 */ bctrl +/* 801603FC 0015D35C 4E 80 04 21 */ bctrl /* 80160400 0015D360 38 81 00 14 */ addi r4, r1, 0x14 /* 80160404 0015D364 38 A1 00 2C */ addi r5, r1, 0x2c /* 80160408 0015D368 48 06 6C F5 */ bl FindClosestReachablePoint__15CPathFindSearchCFRC9CVector3fR9CVector3f @@ -2049,7 +2049,7 @@ lbl_801603D4: /* 80160430 0015D390 81 9D 00 00 */ lwz r12, 0(r29) /* 80160434 0015D394 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 80160438 0015D398 7D 89 03 A6 */ mtctr r12 -/* 8016043C 0015D39C 4E 80 04 21 */ bctrl +/* 8016043C 0015D39C 4E 80 04 21 */ bctrl /* 80160440 0015D3A0 38 81 00 08 */ addi r4, r1, 8 /* 80160444 0015D3A4 38 A1 00 2C */ addi r5, r1, 0x2c /* 80160448 0015D3A8 48 06 78 25 */ bl Search__15CPathFindSearchFRC9CVector3fRC9CVector3f @@ -2063,7 +2063,7 @@ lbl_80160458: /* 80160464 0015D3C4 83 A1 00 44 */ lwz r29, 0x44(r1) /* 80160468 0015D3C8 7C 08 03 A6 */ mtlr r0 /* 8016046C 0015D3CC 38 21 00 50 */ addi r1, r1, 0x50 -/* 80160470 0015D3D0 4E 80 00 20 */ blr +/* 80160470 0015D3D0 4E 80 00 20 */ blr .global Attack__6CDroneFR13CStateManager9EStateMsgf Attack__6CDroneFR13CStateManager9EStateMsgf: @@ -2103,7 +2103,7 @@ lbl_801604CC: /* 801604F0 0015D450 81 84 00 00 */ lwz r12, 0(r4) /* 801604F4 0015D454 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 801604F8 0015D458 7D 89 03 A6 */ mtctr r12 -/* 801604FC 0015D45C 4E 80 04 21 */ bctrl +/* 801604FC 0015D45C 4E 80 04 21 */ bctrl /* 80160500 0015D460 C0 A1 00 5C */ lfs f5, 0x5c(r1) /* 80160504 0015D464 38 61 00 50 */ addi r3, r1, 0x50 /* 80160508 0015D468 C0 81 00 60 */ lfs f4, 0x60(r1) @@ -2637,7 +2637,7 @@ lbl_80160CD8: /* 80160D10 0015DC70 38 A0 00 00 */ li r5, 0 /* 80160D14 0015DC74 81 8C 02 D4 */ lwz r12, 0x2d4(r12) /* 80160D18 0015DC78 7D 89 03 A6 */ mtctr r12 -/* 80160D1C 0015DC7C 4E 80 04 21 */ bctrl +/* 80160D1C 0015DC7C 4E 80 04 21 */ bctrl /* 80160D20 0015DC80 C0 1E 05 F4 */ lfs f0, 0x5f4(r30) /* 80160D24 0015DC84 38 60 00 00 */ li r3, 0 /* 80160D28 0015DC88 D0 1E 05 D0 */ stfs f0, 0x5d0(r30) @@ -2656,7 +2656,7 @@ lbl_80160D38: /* 80160D58 0015DCB8 83 C1 00 98 */ lwz r30, 0x98(r1) /* 80160D5C 0015DCBC 7C 08 03 A6 */ mtlr r0 /* 80160D60 0015DCC0 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 80160D64 0015DCC4 4E 80 00 20 */ blr +/* 80160D64 0015DCC4 4E 80 00 20 */ blr .global Active__6CDroneFR13CStateManager9EStateMsgf Active__6CDroneFR13CStateManager9EStateMsgf: @@ -2687,7 +2687,7 @@ lbl_80160DB8: /* 80160DB8 0015DD18 80 01 00 14 */ lwz r0, 0x14(r1) /* 80160DBC 0015DD1C 7C 08 03 A6 */ mtlr r0 /* 80160DC0 0015DD20 38 21 00 10 */ addi r1, r1, 0x10 -/* 80160DC4 0015DD24 4E 80 00 20 */ blr +/* 80160DC4 0015DD24 4E 80 00 20 */ blr .global ProjectileAttack__6CDroneFR13CStateManager9EStateMsgf ProjectileAttack__6CDroneFR13CStateManager9EStateMsgf: @@ -2839,7 +2839,7 @@ lbl_80160FD4: /* 80160FE4 0015DF44 81 84 00 00 */ lwz r12, 0(r4) /* 80160FE8 0015DF48 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 80160FEC 0015DF4C 7D 89 03 A6 */ mtctr r12 -/* 80160FF0 0015DF50 4E 80 04 21 */ bctrl +/* 80160FF0 0015DF50 4E 80 04 21 */ bctrl /* 80160FF4 0015DF54 C0 5D 00 60 */ lfs f2, 0x60(r29) /* 80160FF8 0015DF58 C0 61 00 90 */ lfs f3, 0x90(r1) /* 80160FFC 0015DF5C C0 3D 00 50 */ lfs f1, 0x50(r29) @@ -3004,7 +3004,7 @@ lbl_8016122C: /* 80161240 0015E1A0 83 A1 00 D4 */ lwz r29, 0xd4(r1) /* 80161244 0015E1A4 7C 08 03 A6 */ mtlr r0 /* 80161248 0015E1A8 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 8016124C 0015E1AC 4E 80 00 20 */ blr +/* 8016124C 0015E1AC 4E 80 00 20 */ blr .global sub_80161250 sub_80161250: @@ -3012,7 +3012,7 @@ sub_80161250: /* 80161254 0015E1B4 20 00 00 02 */ subfic r0, r0, 2 /* 80161258 0015E1B8 7C 00 00 34 */ cntlzw r0, r0 /* 8016125C 0015E1BC 54 03 D9 7E */ srwi r3, r0, 5 -/* 80161260 0015E1C0 4E 80 00 20 */ blr +/* 80161260 0015E1C0 4E 80 00 20 */ blr .global TelegraphAttack__6CDroneFR13CStateManager9EStateMsgf TelegraphAttack__6CDroneFR13CStateManager9EStateMsgf: @@ -3095,7 +3095,7 @@ lbl_80161370: /* 80161374 0015E2D4 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80161378 0015E2D8 7C 08 03 A6 */ mtlr r0 /* 8016137C 0015E2DC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80161380 0015E2E0 4E 80 00 20 */ blr +/* 80161380 0015E2E0 4E 80 00 20 */ blr .global Flee__6CDroneFR13CStateManager9EStateMsgf Flee__6CDroneFR13CStateManager9EStateMsgf: @@ -3335,7 +3335,7 @@ lbl_801616EC: /* 801616F8 0015E658 83 A1 00 E4 */ lwz r29, 0xe4(r1) /* 801616FC 0015E65C 7C 08 03 A6 */ mtlr r0 /* 80161700 0015E660 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 80161704 0015E664 4E 80 00 20 */ blr +/* 80161704 0015E664 4E 80 00 20 */ blr .global SpecialAttack__6CDroneFR13CStateManager9EStateMsgf SpecialAttack__6CDroneFR13CStateManager9EStateMsgf: @@ -3410,7 +3410,7 @@ lbl_80161798: /* 8016180C 0015E76C C3 A4 00 50 */ lfs f29, 0x50(r4) /* 80161810 0015E770 C3 C4 00 40 */ lfs f30, 0x40(r4) /* 80161814 0015E774 7D 89 03 A6 */ mtctr r12 -/* 80161818 0015E778 4E 80 04 21 */ bctrl +/* 80161818 0015E778 4E 80 04 21 */ bctrl /* 8016181C 0015E77C C0 41 00 30 */ lfs f2, 0x30(r1) /* 80161820 0015E780 C0 21 00 34 */ lfs f1, 0x34(r1) /* 80161824 0015E784 C0 01 00 2C */ lfs f0, 0x2c(r1) @@ -3495,7 +3495,7 @@ lbl_8016192C: /* 80161954 0015E8B4 83 C1 00 88 */ lwz r30, 0x88(r1) /* 80161958 0015E8B8 7C 08 03 A6 */ mtlr r0 /* 8016195C 0015E8BC 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 80161960 0015E8C0 4E 80 00 20 */ blr +/* 80161960 0015E8C0 4E 80 00 20 */ blr .global Retreat__6CDroneFR13CStateManager9EStateMsgf Retreat__6CDroneFR13CStateManager9EStateMsgf: @@ -3629,7 +3629,7 @@ lbl_80161B2C: /* 80161B38 0015EA98 83 A1 00 44 */ lwz r29, 0x44(r1) /* 80161B3C 0015EA9C 7C 08 03 A6 */ mtlr r0 /* 80161B40 0015EAA0 38 21 00 50 */ addi r1, r1, 0x50 -/* 80161B44 0015EAA4 4E 80 00 20 */ blr +/* 80161B44 0015EAA4 4E 80 00 20 */ blr .global TargetPatrol__6CDroneFR13CStateManager9EStateMsgf TargetPatrol__6CDroneFR13CStateManager9EStateMsgf: @@ -3679,7 +3679,7 @@ lbl_80161BCC: /* 80161BE8 0015EB48 81 84 00 00 */ lwz r12, 0(r4) /* 80161BEC 0015EB4C 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 80161BF0 0015EB50 7D 89 03 A6 */ mtctr r12 -/* 80161BF4 0015EB54 4E 80 04 21 */ bctrl +/* 80161BF4 0015EB54 4E 80 04 21 */ bctrl /* 80161BF8 0015EB58 7F C3 F3 78 */ mr r3, r30 /* 80161BFC 0015EB5C 38 81 00 5C */ addi r4, r1, 0x5c /* 80161C00 0015EB60 4B F1 AF 5D */ bl SetDestPos__10CPatternedFRC9CVector3f @@ -3718,7 +3718,7 @@ lbl_80161C58: /* 80161C74 0015EBD4 C3 FE 00 40 */ lfs f31, 0x40(r30) /* 80161C78 0015EBD8 C0 22 9F 68 */ lfs f1, lbl_805ABC88@sda21(r2) /* 80161C7C 0015EBDC 7D 89 03 A6 */ mtctr r12 -/* 80161C80 0015EBE0 4E 80 04 21 */ bctrl +/* 80161C80 0015EBE0 4E 80 04 21 */ bctrl /* 80161C84 0015EBE4 C0 41 00 38 */ lfs f2, 0x38(r1) /* 80161C88 0015EBE8 38 61 00 50 */ addi r3, r1, 0x50 /* 80161C8C 0015EBEC C0 21 00 3C */ lfs f1, 0x3c(r1) @@ -3803,7 +3803,7 @@ lbl_80161DA0: /* 80161DC0 0015ED20 83 C1 00 88 */ lwz r30, 0x88(r1) /* 80161DC4 0015ED24 7C 08 03 A6 */ mtlr r0 /* 80161DC8 0015ED28 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 80161DCC 0015ED2C 4E 80 00 20 */ blr +/* 80161DCC 0015ED2C 4E 80 00 20 */ blr .global AddToRenderer__6CDroneCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__6CDroneCFRC14CFrustumPlanesRC13CStateManager: @@ -3814,7 +3814,7 @@ AddToRenderer__6CDroneCFRC14CFrustumPlanesRC13CStateManager: /* 80161DE0 0015ED40 80 01 00 14 */ lwz r0, 0x14(r1) /* 80161DE4 0015ED44 7C 08 03 A6 */ mtlr r0 /* 80161DE8 0015ED48 38 21 00 10 */ addi r1, r1, 0x10 -/* 80161DEC 0015ED4C 4E 80 00 20 */ blr +/* 80161DEC 0015ED4C 4E 80 00 20 */ blr .global Render__6CDroneCFRC13CStateManager Render__6CDroneCFRC13CStateManager: @@ -3836,7 +3836,7 @@ Render__6CDroneCFRC13CStateManager: /* 80161E2C 0015ED8C 90 A1 00 20 */ stw r5, 0x20(r1) /* 80161E30 0015ED90 54 1F D9 7E */ srwi r31, r0, 5 /* 80161E34 0015ED94 7D 89 03 A6 */ mtctr r12 -/* 80161E38 0015ED98 4E 80 04 21 */ bctrl +/* 80161E38 0015ED98 4E 80 04 21 */ bctrl /* 80161E3C 0015ED9C 54 64 06 3E */ clrlwi r4, r3, 0x18 /* 80161E40 0015EDA0 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 80161E44 0015EDA4 7C 64 00 D0 */ neg r3, r4 @@ -3971,7 +3971,7 @@ lbl_80162028: /* 80162038 0015EF98 83 81 00 B0 */ lwz r28, 0xb0(r1) /* 8016203C 0015EF9C 7C 08 03 A6 */ mtlr r0 /* 80162040 0015EFA0 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 80162044 0015EFA4 4E 80 00 20 */ blr +/* 80162044 0015EFA4 4E 80 00 20 */ blr .global PreRender__6CDroneFR13CStateManagerRC14CFrustumPlanes PreRender__6CDroneFR13CStateManagerRC14CFrustumPlanes: @@ -4018,7 +4018,7 @@ lbl_801620CC: /* 801620DC 0015F03C 81 9E 00 00 */ lwz r12, 0(r30) /* 801620E0 0015F040 81 8C 02 B4 */ lwz r12, 0x2b4(r12) /* 801620E4 0015F044 7D 89 03 A6 */ mtctr r12 -/* 801620E8 0015F048 4E 80 04 21 */ bctrl +/* 801620E8 0015F048 4E 80 04 21 */ bctrl /* 801620EC 0015F04C 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 801620F0 0015F050 7C 03 00 D0 */ neg r0, r3 /* 801620F4 0015F054 7C 00 1B 78 */ or r0, r0, r3 @@ -4033,7 +4033,7 @@ lbl_8016210C: /* 80162114 0015F074 83 C1 00 08 */ lwz r30, 8(r1) /* 80162118 0015F078 7C 08 03 A6 */ mtlr r0 /* 8016211C 0015F07C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80162120 0015F080 4E 80 00 20 */ blr +/* 80162120 0015F080 4E 80 00 20 */ blr .global Death__6CDroneFRC9CVector3fR13CStateManager Death__6CDroneFRC9CVector3fR13CStateManager: @@ -4068,13 +4068,13 @@ Death__6CDroneFRC9CVector3fR13CStateManager: /* 80162194 0015F0F4 38 A0 00 00 */ li r5, 0 /* 80162198 0015F0F8 81 8C 02 D4 */ lwz r12, 0x2d4(r12) /* 8016219C 0015F0FC 7D 89 03 A6 */ mtctr r12 -/* 801621A0 0015F100 4E 80 04 21 */ bctrl +/* 801621A0 0015F100 4E 80 04 21 */ bctrl /* 801621A4 0015F104 7F A3 EB 78 */ mr r3, r29 /* 801621A8 0015F108 7F C4 F3 78 */ mr r4, r30 /* 801621AC 0015F10C 81 9D 00 00 */ lwz r12, 0(r29) /* 801621B0 0015F110 81 8C 00 34 */ lwz r12, 0x34(r12) /* 801621B4 0015F114 7D 89 03 A6 */ mtctr r12 -/* 801621B8 0015F118 4E 80 04 21 */ bctrl +/* 801621B8 0015F118 4E 80 04 21 */ bctrl /* 801621BC 0015F11C C0 5D 03 E4 */ lfs f2, 0x3e4(r29) /* 801621C0 0015F120 C0 23 00 00 */ lfs f1, 0(r3) /* 801621C4 0015F124 C0 1D 03 D8 */ lfs f0, 0x3d8(r29) @@ -4183,7 +4183,7 @@ lbl_80162340: /* 80162350 0015F2B0 83 81 01 00 */ lwz r28, 0x100(r1) /* 80162354 0015F2B4 7C 08 03 A6 */ mtlr r0 /* 80162358 0015F2B8 38 21 01 10 */ addi r1, r1, 0x110 -/* 8016235C 0015F2BC 4E 80 00 20 */ blr +/* 8016235C 0015F2BC 4E 80 00 20 */ blr .global Dead__6CDroneFR13CStateManager9EStateMsgf Dead__6CDroneFR13CStateManager9EStateMsgf: @@ -4212,7 +4212,7 @@ lbl_80162398: /* 801623B4 0015F314 81 9E 00 00 */ lwz r12, 0(r30) /* 801623B8 0015F318 81 8C 00 80 */ lwz r12, 0x80(r12) /* 801623BC 0015F31C 7D 89 03 A6 */ mtctr r12 -/* 801623C0 0015F320 4E 80 04 21 */ bctrl +/* 801623C0 0015F320 4E 80 04 21 */ bctrl /* 801623C4 0015F324 C0 02 9F 68 */ lfs f0, lbl_805ABC88@sda21(r2) /* 801623C8 0015F328 FC 20 08 50 */ fneg f1, f1 /* 801623CC 0015F32C D0 1E 01 50 */ stfs f0, 0x150(r30) @@ -4246,7 +4246,7 @@ lbl_80162410: /* 80162434 0015F394 81 9E 00 00 */ lwz r12, 0(r30) /* 80162438 0015F398 81 8C 02 D4 */ lwz r12, 0x2d4(r12) /* 8016243C 0015F39C 7D 89 03 A6 */ mtctr r12 -/* 80162440 0015F3A0 4E 80 04 21 */ bctrl +/* 80162440 0015F3A0 4E 80 04 21 */ bctrl /* 80162444 0015F3A4 38 00 00 00 */ li r0, 0 /* 80162448 0015F3A8 90 1E 07 C8 */ stw r0, 0x7c8(r30) /* 8016244C 0015F3AC 48 00 01 98 */ b lbl_801625E4 @@ -4360,7 +4360,7 @@ lbl_801625E4: /* 801625EC 0015F54C 83 C1 00 48 */ lwz r30, 0x48(r1) /* 801625F0 0015F550 7C 08 03 A6 */ mtlr r0 /* 801625F4 0015F554 38 21 00 50 */ addi r1, r1, 0x50 -/* 801625F8 0015F558 4E 80 00 20 */ blr +/* 801625F8 0015F558 4E 80 00 20 */ blr .global SpotPlayer__6CDroneFR13CStateManagerf SpotPlayer__6CDroneFR13CStateManagerf: @@ -4415,7 +4415,7 @@ lbl_801626B4: /* 801626B8 0015F618 C0 22 9F 68 */ lfs f1, lbl_805ABC88@sda21(r2) /* 801626BC 0015F61C 81 8C 02 20 */ lwz r12, 0x220(r12) /* 801626C0 0015F620 7D 89 03 A6 */ mtctr r12 -/* 801626C4 0015F624 4E 80 04 21 */ bctrl +/* 801626C4 0015F624 4E 80 04 21 */ bctrl /* 801626C8 0015F628 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801626CC 0015F62C 40 82 00 0C */ bne lbl_801626D8 /* 801626D0 0015F630 38 60 00 00 */ li r3, 0 @@ -4462,7 +4462,7 @@ lbl_801626D8: /* 80162770 0015F6D0 C3 FE 00 40 */ lfs f31, 0x40(r30) /* 80162774 0015F6D4 C0 22 9F 68 */ lfs f1, lbl_805ABC88@sda21(r2) /* 80162778 0015F6D8 7D 89 03 A6 */ mtctr r12 -/* 8016277C 0015F6DC 4E 80 04 21 */ bctrl +/* 8016277C 0015F6DC 4E 80 04 21 */ bctrl /* 80162780 0015F6E0 C0 41 00 08 */ lfs f2, 8(r1) /* 80162784 0015F6E4 38 61 00 20 */ addi r3, r1, 0x20 /* 80162788 0015F6E8 C0 21 00 0C */ lfs f1, 0xc(r1) @@ -4503,7 +4503,7 @@ lbl_801627D8: /* 80162810 0015F770 83 C1 00 88 */ lwz r30, 0x88(r1) /* 80162814 0015F774 7C 08 03 A6 */ mtlr r0 /* 80162818 0015F778 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 8016281C 0015F77C 4E 80 00 20 */ blr +/* 8016281C 0015F77C 4E 80 00 20 */ blr .global ShouldFire__6CDroneFR13CStateManagerf ShouldFire__6CDroneFR13CStateManagerf: @@ -4560,7 +4560,7 @@ ShouldFire__6CDroneFR13CStateManagerf: /* 801628E8 0015F848 81 84 00 00 */ lwz r12, 0(r4) /* 801628EC 0015F84C 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 801628F0 0015F850 7D 89 03 A6 */ mtctr r12 -/* 801628F4 0015F854 4E 80 04 21 */ bctrl +/* 801628F4 0015F854 4E 80 04 21 */ bctrl /* 801628F8 0015F858 C0 41 00 40 */ lfs f2, 0x40(r1) /* 801628FC 0015F85C 38 61 00 30 */ addi r3, r1, 0x30 /* 80162900 0015F860 C0 21 00 44 */ lfs f1, 0x44(r1) @@ -4628,7 +4628,7 @@ lbl_801629EC: /* 801629F0 0015F950 80 01 01 64 */ lwz r0, 0x164(r1) /* 801629F4 0015F954 7C 08 03 A6 */ mtlr r0 /* 801629F8 0015F958 38 21 01 60 */ addi r1, r1, 0x160 -/* 801629FC 0015F95C 4E 80 00 20 */ blr +/* 801629FC 0015F95C 4E 80 00 20 */ blr .global LineOfSight__6CDroneFR13CStateManagerf LineOfSight__6CDroneFR13CStateManagerf: @@ -4682,7 +4682,7 @@ LineOfSight__6CDroneFR13CStateManagerf: /* 80162ABC 0015FA1C 81 84 00 00 */ lwz r12, 0(r4) /* 80162AC0 0015FA20 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 80162AC4 0015FA24 7D 89 03 A6 */ mtctr r12 -/* 80162AC8 0015FA28 4E 80 04 21 */ bctrl +/* 80162AC8 0015FA28 4E 80 04 21 */ bctrl /* 80162ACC 0015FA2C C0 41 00 08 */ lfs f2, 8(r1) /* 80162AD0 0015FA30 7F 63 DB 78 */ mr r3, r27 /* 80162AD4 0015FA34 C0 21 00 0C */ lfs f1, 0xc(r1) @@ -4699,7 +4699,7 @@ LineOfSight__6CDroneFR13CStateManagerf: /* 80162B00 0015FA60 80 01 00 84 */ lwz r0, 0x84(r1) /* 80162B04 0015FA64 7C 08 03 A6 */ mtlr r0 /* 80162B08 0015FA68 38 21 00 80 */ addi r1, r1, 0x80 -/* 80162B0C 0015FA6C 4E 80 00 20 */ blr +/* 80162B0C 0015FA6C 4E 80 00 20 */ blr .global Deactivate__6CDroneFR13CStateManager9EStateMsgf Deactivate__6CDroneFR13CStateManager9EStateMsgf: @@ -4715,7 +4715,7 @@ lbl_80162B2C: /* 80162B2C 0015FA8C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80162B30 0015FA90 7C 08 03 A6 */ mtlr r0 /* 80162B34 0015FA94 38 21 00 10 */ addi r1, r1, 0x10 -/* 80162B38 0015FA98 4E 80 00 20 */ blr +/* 80162B38 0015FA98 4E 80 00 20 */ blr .global Dodge__6CDroneFR13CStateManager9EStateMsgf Dodge__6CDroneFR13CStateManager9EStateMsgf: @@ -4950,19 +4950,19 @@ lbl_80162E8C: /* 80162E98 0015FDF8 83 A1 00 54 */ lwz r29, 0x54(r1) /* 80162E9C 0015FDFC 7C 08 03 A6 */ mtlr r0 /* 80162EA0 0015FE00 38 21 00 60 */ addi r1, r1, 0x60 -/* 80162EA4 0015FE04 4E 80 00 20 */ blr +/* 80162EA4 0015FE04 4E 80 00 20 */ blr .global AttackOver__6CDroneFR13CStateManagerf AttackOver__6CDroneFR13CStateManagerf: /* 80162EA8 0015FE08 88 03 08 34 */ lbz r0, 0x834(r3) /* 80162EAC 0015FE0C 54 03 07 FE */ clrlwi r3, r0, 0x1f -/* 80162EB0 0015FE10 4E 80 00 20 */ blr +/* 80162EB0 0015FE10 4E 80 00 20 */ blr .global CodeTrigger__6CDroneFR13CStateManagerf CodeTrigger__6CDroneFR13CStateManagerf: /* 80162EB4 0015FE14 88 03 08 34 */ lbz r0, 0x834(r3) /* 80162EB8 0015FE18 54 03 F7 FE */ rlwinm r3, r0, 0x1e, 0x1f, 0x1f -/* 80162EBC 0015FE1C 4E 80 00 20 */ blr +/* 80162EBC 0015FE1C 4E 80 00 20 */ blr .global InRange__6CDroneFR13CStateManagerf InRange__6CDroneFR13CStateManagerf: @@ -5001,7 +5001,7 @@ InRange__6CDroneFR13CStateManagerf: lbl_80162F40: /* 80162F40 0015FEA0 7C 03 03 78 */ mr r3, r0 /* 80162F44 0015FEA4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80162F48 0015FEA8 4E 80 00 20 */ blr +/* 80162F48 0015FEA8 4E 80 00 20 */ blr .global sub_80162f4c sub_80162f4c: @@ -5059,7 +5059,7 @@ sub_80162f4c: /* 80163018 0015FF78 80 01 00 84 */ lwz r0, 0x84(r1) /* 8016301C 0015FF7C 7C 08 03 A6 */ mtlr r0 /* 80163020 0015FF80 38 21 00 80 */ addi r1, r1, 0x80 -/* 80163024 0015FF84 4E 80 00 20 */ blr +/* 80163024 0015FF84 4E 80 00 20 */ blr .global HearShot__6CDroneFR13CStateManagerf HearShot__6CDroneFR13CStateManagerf: @@ -5080,7 +5080,7 @@ HearShot__6CDroneFR13CStateManagerf: /* 80163060 0015FFC0 81 83 00 00 */ lwz r12, 0(r3) /* 80163064 0015FFC4 81 8C 02 CC */ lwz r12, 0x2cc(r12) /* 80163068 0015FFC8 7D 89 03 A6 */ mtctr r12 -/* 8016306C 0015FFCC 4E 80 04 21 */ bctrl +/* 8016306C 0015FFCC 4E 80 04 21 */ bctrl /* 80163070 0015FFD0 3B E1 00 18 */ addi r31, r1, 0x18 /* 80163074 0015FFD4 7F FE FB 78 */ mr r30, r31 /* 80163078 0015FFD8 48 00 00 9C */ b lbl_80163114 @@ -5166,7 +5166,7 @@ lbl_8016317C: /* 80163188 001600E8 83 A1 08 24 */ lwz r29, 0x824(r1) /* 8016318C 001600EC 7C 08 03 A6 */ mtlr r0 /* 80163190 001600F0 38 21 08 30 */ addi r1, r1, 0x830 -/* 80163194 001600F4 4E 80 00 20 */ blr +/* 80163194 001600F4 4E 80 00 20 */ blr .global ShouldAttack__6CDroneFR13CStateManagerf ShouldAttack__6CDroneFR13CStateManagerf: @@ -5218,7 +5218,7 @@ lbl_80163238: /* 80163240 001601A0 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80163244 001601A4 7C 08 03 A6 */ mtlr r0 /* 80163248 001601A8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8016324C 001601AC 4E 80 00 20 */ blr +/* 8016324C 001601AC 4E 80 00 20 */ blr .global KnockBack__6CDroneFRC9CVector3fR13CStateManagerRC11CDamageInfo14EKnockBackTypef KnockBack__6CDroneFRC9CVector3fR13CStateManagerRC11CDamageInfo14EKnockBackTypef: @@ -5243,7 +5243,7 @@ lbl_80163290: /* 80163294 001601F4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80163298 001601F8 7C 08 03 A6 */ mtlr r0 /* 8016329C 001601FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801632A0 00160200 4E 80 00 20 */ blr +/* 801632A0 00160200 4E 80 00 20 */ blr .global sub_801632a4 sub_801632a4: @@ -5315,7 +5315,7 @@ lbl_80163394: /* 80163398 001602F8 80 01 00 44 */ lwz r0, 0x44(r1) /* 8016339C 001602FC 7C 08 03 A6 */ mtlr r0 /* 801633A0 00160300 38 21 00 40 */ addi r1, r1, 0x40 -/* 801633A4 00160304 4E 80 00 20 */ blr +/* 801633A4 00160304 4E 80 00 20 */ blr .global sub_801633a8 sub_801633a8: @@ -5551,7 +5551,7 @@ lbl_8016348C: /* 80163734 00160694 81 83 00 00 */ lwz r12, 0(r3) /* 80163738 00160698 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8016373C 0016069C 7D 89 03 A6 */ mtctr r12 -/* 80163740 001606A0 4E 80 04 21 */ bctrl +/* 80163740 001606A0 4E 80 04 21 */ bctrl lbl_80163744: /* 80163744 001606A4 80 A1 01 80 */ lwz r5, 0x180(r1) /* 80163748 001606A8 38 60 00 00 */ li r3, 0 @@ -5585,7 +5585,7 @@ lbl_80163790: /* 801637A8 00160708 83 81 09 90 */ lwz r28, 0x990(r1) /* 801637AC 0016070C 7C 08 03 A6 */ mtlr r0 /* 801637B0 00160710 38 21 09 A0 */ addi r1, r1, 0x9a0 -/* 801637B4 00160714 4E 80 00 20 */ blr +/* 801637B4 00160714 4E 80 00 20 */ blr .global sub_801637b8 sub_801637b8: @@ -5645,12 +5645,12 @@ lbl_80163854: /* 80163888 001607E8 81 9C 00 00 */ lwz r12, 0(r28) /* 8016388C 001607EC 81 8C 00 70 */ lwz r12, 0x70(r12) /* 80163890 001607F0 7D 89 03 A6 */ mtctr r12 -/* 80163894 001607F4 4E 80 04 21 */ bctrl +/* 80163894 001607F4 4E 80 04 21 */ bctrl /* 80163898 001607F8 7F 83 E3 78 */ mr r3, r28 /* 8016389C 001607FC 81 9C 00 00 */ lwz r12, 0(r28) /* 801638A0 00160800 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 801638A4 00160804 7D 89 03 A6 */ mtctr r12 -/* 801638A8 00160808 4E 80 04 21 */ bctrl +/* 801638A8 00160808 4E 80 04 21 */ bctrl /* 801638AC 0016080C FC 20 F8 90 */ fmr f1, f31 /* 801638B0 00160810 7C 75 1B 78 */ mr r21, r3 /* 801638B4 00160814 7F 24 CB 78 */ mr r4, r25 @@ -5670,7 +5670,7 @@ lbl_80163854: /* 801638EC 0016084C 81 95 00 00 */ lwz r12, 0(r21) /* 801638F0 00160850 81 8C 00 24 */ lwz r12, 0x24(r12) /* 801638F4 00160854 7D 89 03 A6 */ mtctr r12 -/* 801638F8 00160858 4E 80 04 21 */ bctrl +/* 801638F8 00160858 4E 80 04 21 */ bctrl /* 801638FC 0016085C 88 81 00 B8 */ lbz r4, 0xb8(r1) /* 80163900 00160860 C0 E1 00 98 */ lfs f7, 0x98(r1) /* 80163904 00160864 C0 C1 00 9C */ lfs f6, 0x9c(r1) @@ -5775,7 +5775,7 @@ lbl_801639C8: /* 80163A88 001609E8 38 A1 01 80 */ addi r5, r1, 0x180 /* 80163A8C 001609EC 81 8C 00 24 */ lwz r12, 0x24(r12) /* 80163A90 001609F0 7D 89 03 A6 */ mtctr r12 -/* 80163A94 001609F4 4E 80 04 21 */ bctrl +/* 80163A94 001609F4 4E 80 04 21 */ bctrl /* 80163A98 001609F8 88 81 00 58 */ lbz r4, 0x58(r1) /* 80163A9C 001609FC C0 E1 00 38 */ lfs f7, 0x38(r1) /* 80163AA0 00160A00 C0 C1 00 3C */ lfs f6, 0x3c(r1) @@ -5888,7 +5888,7 @@ lbl_80163BCC: /* 80163C30 00160B90 80 01 02 A4 */ lwz r0, 0x2a4(r1) /* 80163C34 00160B94 7C 08 03 A6 */ mtlr r0 /* 80163C38 00160B98 38 21 02 A0 */ addi r1, r1, 0x2a0 -/* 80163C3C 00160B9C 4E 80 00 20 */ blr +/* 80163C3C 00160B9C 4E 80 00 20 */ blr .global sub_80163c40 sub_80163c40: @@ -6176,7 +6176,7 @@ lbl_80164000: /* 80164098 00160FF8 B0 01 00 24 */ sth r0, 0x24(r1) /* 8016409C 00160FFC 81 8C 02 B0 */ lwz r12, 0x2b0(r12) /* 801640A0 00161000 7D 89 03 A6 */ mtctr r12 -/* 801640A4 00161004 4E 80 04 21 */ bctrl +/* 801640A4 00161004 4E 80 04 21 */ bctrl /* 801640A8 00161008 3C 80 80 5A */ lis r4, skZero3f@ha /* 801640AC 0016100C 7F E3 FB 78 */ mr r3, r31 /* 801640B0 00161010 39 24 66 A0 */ addi r9, r4, skZero3f@l @@ -6295,7 +6295,7 @@ lbl_80164234: /* 80164254 001611B4 80 01 0A 94 */ lwz r0, 0xa94(r1) /* 80164258 001611B8 7C 08 03 A6 */ mtlr r0 /* 8016425C 001611BC 38 21 0A 90 */ addi r1, r1, 0xa90 -/* 80164260 001611C0 4E 80 00 20 */ blr +/* 80164260 001611C0 4E 80 00 20 */ blr .global sub_80164264 sub_80164264: @@ -6584,7 +6584,7 @@ lbl_80164664: /* 80164684 001615E4 83 81 09 70 */ lwz r28, 0x970(r1) /* 80164688 001615E8 7C 08 03 A6 */ mtlr r0 /* 8016468C 001615EC 38 21 09 90 */ addi r1, r1, 0x990 -/* 80164690 001615F0 4E 80 00 20 */ blr +/* 80164690 001615F0 4E 80 00 20 */ blr .global GetCollisionPrimitive__6CDroneCFv GetCollisionPrimitive__6CDroneCFv: @@ -6602,7 +6602,7 @@ lbl_801646B8: /* 801646B8 00161618 80 01 00 14 */ lwz r0, 0x14(r1) /* 801646BC 0016161C 7C 08 03 A6 */ mtlr r0 /* 801646C0 00161620 38 21 00 10 */ addi r1, r1, 0x10 -/* 801646C4 00161624 4E 80 00 20 */ blr +/* 801646C4 00161624 4E 80 00 20 */ blr .global Patrol__6CDroneFR13CStateManager9EStateMsgf Patrol__6CDroneFR13CStateManager9EStateMsgf: @@ -6638,7 +6638,7 @@ lbl_8016471C: /* 80164734 00161694 38 A0 00 01 */ li r5, 1 /* 80164738 00161698 81 8C 02 D0 */ lwz r12, 0x2d0(r12) /* 8016473C 0016169C 7D 89 03 A6 */ mtctr r12 -/* 80164740 001616A0 4E 80 04 21 */ bctrl +/* 80164740 001616A0 4E 80 04 21 */ bctrl /* 80164744 001616A4 88 1D 08 34 */ lbz r0, 0x834(r29) /* 80164748 001616A8 38 60 00 01 */ li r3, 1 /* 8016474C 001616AC 50 60 36 72 */ rlwimi r0, r3, 6, 0x19, 0x19 @@ -6655,7 +6655,7 @@ lbl_80164758: /* 80164774 001616D4 38 A0 00 20 */ li r5, 0x20 /* 80164778 001616D8 81 8C 02 CC */ lwz r12, 0x2cc(r12) /* 8016477C 001616DC 7D 89 03 A6 */ mtctr r12 -/* 80164780 001616E0 4E 80 04 21 */ bctrl +/* 80164780 001616E0 4E 80 04 21 */ bctrl /* 80164784 001616E4 80 01 00 40 */ lwz r0, 0x40(r1) /* 80164788 001616E8 2C 00 00 00 */ cmpwi r0, 0 /* 8016478C 001616EC 41 82 00 CC */ beq lbl_80164858 @@ -6742,7 +6742,7 @@ lbl_801648B0: /* 801648B4 00161814 38 A0 00 00 */ li r5, 0 /* 801648B8 00161818 81 8C 02 D0 */ lwz r12, 0x2d0(r12) /* 801648BC 0016181C 7D 89 03 A6 */ mtctr r12 -/* 801648C0 00161820 4E 80 04 21 */ bctrl +/* 801648C0 00161820 4E 80 04 21 */ bctrl /* 801648C4 00161824 88 1D 08 34 */ lbz r0, 0x834(r29) /* 801648C8 00161828 38 60 00 00 */ li r3, 0 /* 801648CC 0016182C 50 60 36 72 */ rlwimi r0, r3, 6, 0x19, 0x19 @@ -6761,7 +6761,7 @@ lbl_801648D4: /* 801648FC 0016185C 83 A1 08 54 */ lwz r29, 0x854(r1) /* 80164900 00161860 7C 08 03 A6 */ mtlr r0 /* 80164904 00161864 38 21 08 70 */ addi r1, r1, 0x870 -/* 80164908 00161868 4E 80 00 20 */ blr +/* 80164908 00161868 4E 80 00 20 */ blr .global sub_8016490c sub_8016490c: @@ -6848,7 +6848,7 @@ sub_8016490c: /* 80164A4C 001619AC 83 E1 00 BC */ lwz r31, 0xbc(r1) /* 80164A50 001619B0 7C 08 03 A6 */ mtlr r0 /* 80164A54 001619B4 38 21 01 00 */ addi r1, r1, 0x100 -/* 80164A58 001619B8 4E 80 00 20 */ blr +/* 80164A58 001619B8 4E 80 00 20 */ blr .global Think__6CDroneFfR13CStateManager Think__6CDroneFfR13CStateManager: @@ -6934,7 +6934,7 @@ lbl_80164B44: /* 80164B84 00161AE4 38 A0 00 00 */ li r5, 0 /* 80164B88 00161AE8 81 8C 02 D4 */ lwz r12, 0x2d4(r12) /* 80164B8C 00161AEC 7D 89 03 A6 */ mtctr r12 -/* 80164B90 00161AF0 4E 80 04 21 */ bctrl +/* 80164B90 00161AF0 4E 80 04 21 */ bctrl lbl_80164B94: /* 80164B94 00161AF4 FC 20 F8 90 */ fmr f1, f31 /* 80164B98 00161AF8 7F C3 F3 78 */ mr r3, r30 @@ -7006,7 +7006,7 @@ lbl_80164C70: /* 80164C88 00161BE8 81 9E 00 00 */ lwz r12, 0(r30) /* 80164C8C 00161BEC 81 8C 02 D8 */ lwz r12, 0x2d8(r12) /* 80164C90 00161BF0 7D 89 03 A6 */ mtctr r12 -/* 80164C94 00161BF4 4E 80 04 21 */ bctrl +/* 80164C94 00161BF4 4E 80 04 21 */ bctrl lbl_80164C98: /* 80164C98 00161BF8 88 1E 08 34 */ lbz r0, 0x834(r30) /* 80164C9C 00161BFC 54 00 D7 FF */ rlwinm. r0, r0, 0x1a, 0x1f, 0x1f @@ -7150,7 +7150,7 @@ lbl_80164E9C: /* 80164EA4 00161E04 81 9E 00 00 */ lwz r12, 0(r30) /* 80164EA8 00161E08 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80164EAC 00161E0C 7D 89 03 A6 */ mtctr r12 -/* 80164EB0 00161E10 4E 80 04 21 */ bctrl +/* 80164EB0 00161E10 4E 80 04 21 */ bctrl /* 80164EB4 00161E14 C0 5E 06 00 */ lfs f2, 0x600(r30) /* 80164EB8 00161E18 C0 02 9F 68 */ lfs f0, lbl_805ABC88@sda21(r2) /* 80164EBC 00161E1C C0 9E 06 04 */ lfs f4, 0x604(r30) @@ -7176,7 +7176,7 @@ lbl_80164F00: /* 80164F08 00161E68 81 9E 00 00 */ lwz r12, 0(r30) /* 80164F0C 00161E6C 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80164F10 00161E70 7D 89 03 A6 */ mtctr r12 -/* 80164F14 00161E74 4E 80 04 21 */ bctrl +/* 80164F14 00161E74 4E 80 04 21 */ bctrl /* 80164F18 00161E78 C0 03 00 00 */ lfs f0, 0(r3) /* 80164F1C 00161E7C D0 1E 06 04 */ stfs f0, 0x604(r30) /* 80164F20 00161E80 80 1E 03 FC */ lwz r0, 0x3fc(r30) @@ -7573,7 +7573,7 @@ lbl_801654C0: /* 801654D4 00162434 80 01 0A 34 */ lwz r0, 0xa34(r1) /* 801654D8 00162438 7C 08 03 A6 */ mtlr r0 /* 801654DC 0016243C 38 21 0A 30 */ addi r1, r1, 0xa30 -/* 801654E0 00162440 4E 80 00 20 */ blr +/* 801654E0 00162440 4E 80 00 20 */ blr .global GetDamageVulnerability__6CDroneCFRC9CVector3fRC9CVector3fRC11CDamageInfo GetDamageVulnerability__6CDroneCFRC9CVector3fRC9CVector3fRC11CDamageInfo: @@ -7611,7 +7611,7 @@ lbl_80165554: /* 80165558 001624B8 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8016555C 001624BC 7C 08 03 A6 */ mtlr r0 /* 80165560 001624C0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80165564 001624C4 4E 80 00 20 */ blr +/* 80165564 001624C4 4E 80 00 20 */ blr .global GetCollisionResponseType__6CDroneCFRC9CVector3fRC9CVector3fRC11CWeaponModei GetCollisionResponseType__6CDroneCFRC9CVector3fRC9CVector3fRC11CWeaponModei: @@ -7648,7 +7648,7 @@ lbl_801655D0: /* 801655DC 0016253C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 801655E0 00162540 7C 08 03 A6 */ mtlr r0 /* 801655E4 00162544 38 21 00 20 */ addi r1, r1, 0x20 -/* 801655E8 00162548 4E 80 00 20 */ blr +/* 801655E8 00162548 4E 80 00 20 */ blr .global sub_801655ec sub_801655ec: @@ -7712,7 +7712,7 @@ lbl_801656BC: /* 801656C4 00162624 83 C1 00 68 */ lwz r30, 0x68(r1) /* 801656C8 00162628 7C 08 03 A6 */ mtlr r0 /* 801656CC 0016262C 38 21 00 70 */ addi r1, r1, 0x70 -/* 801656D0 00162630 4E 80 00 20 */ blr +/* 801656D0 00162630 4E 80 00 20 */ blr .global sub_801656d4 sub_801656d4: @@ -7894,7 +7894,7 @@ lbl_80165968: /* 80165974 001628D4 80 01 09 14 */ lwz r0, 0x914(r1) /* 80165978 001628D8 7C 08 03 A6 */ mtlr r0 /* 8016597C 001628DC 38 21 09 10 */ addi r1, r1, 0x910 -/* 80165980 001628E0 4E 80 00 20 */ blr +/* 80165980 001628E0 4E 80 00 20 */ blr .global sub_80165984 sub_80165984: @@ -7920,7 +7920,7 @@ sub_80165984: /* 801659D0 00162930 C0 22 9F 68 */ lfs f1, lbl_805ABC88@sda21(r2) /* 801659D4 00162934 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 801659D8 00162938 7D 89 03 A6 */ mtctr r12 -/* 801659DC 0016293C 4E 80 04 21 */ bctrl +/* 801659DC 0016293C 4E 80 04 21 */ bctrl /* 801659E0 00162940 C0 A1 00 70 */ lfs f5, 0x70(r1) /* 801659E4 00162944 38 61 00 64 */ addi r3, r1, 0x64 /* 801659E8 00162948 C0 81 00 74 */ lfs f4, 0x74(r1) @@ -8063,7 +8063,7 @@ lbl_80165BDC: /* 80165C00 00162B60 83 A1 01 74 */ lwz r29, 0x174(r1) /* 80165C04 00162B64 7C 08 03 A6 */ mtlr r0 /* 80165C08 00162B68 38 21 01 B0 */ addi r1, r1, 0x1b0 -/* 80165C0C 00162B6C 4E 80 00 20 */ blr +/* 80165C0C 00162B6C 4E 80 00 20 */ blr .global Touch__6CDroneFR6CActorR13CStateManager Touch__6CDroneFR6CActorR13CStateManager: @@ -8118,7 +8118,7 @@ lbl_80165CC4: /* 80165CCC 00162C2C 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80165CD0 00162C30 7C 08 03 A6 */ mtlr r0 /* 80165CD4 00162C34 38 21 00 30 */ addi r1, r1, 0x30 -/* 80165CD8 00162C38 4E 80 00 20 */ blr +/* 80165CD8 00162C38 4E 80 00 20 */ blr .global DoUserAnimEvent__6CDroneFR13CStateManagerRC13CInt32POINode14EUserEventType DoUserAnimEvent__6CDroneFR13CStateManagerRC13CInt32POINode14EUserEventType: @@ -8140,7 +8140,7 @@ DoUserAnimEvent__6CDroneFR13CStateManagerRC13CInt32POINode14EUserEventType: /* 80165D18 00162C78 38 A5 39 88 */ addi r5, r5, lbl_803E3988@l /* 80165D1C 00162C7C 7C 05 00 2E */ lwzx r0, r5, r0 /* 80165D20 00162C80 7C 09 03 A6 */ mtctr r0 -/* 80165D24 00162C84 4E 80 04 20 */ bctr +/* 80165D24 00162C84 4E 80 04 20 */ bctr .global lbl_80165D28 lbl_80165D28: /* 80165D28 00162C88 7F 84 E3 78 */ mr r4, r28 @@ -8178,7 +8178,7 @@ lbl_80165D5C: /* 80165DA0 00162D00 81 9C 00 00 */ lwz r12, 0(r28) /* 80165DA4 00162D04 81 8C 02 D4 */ lwz r12, 0x2d4(r12) /* 80165DA8 00162D08 7D 89 03 A6 */ mtctr r12 -/* 80165DAC 00162D0C 4E 80 04 21 */ bctrl +/* 80165DAC 00162D0C 4E 80 04 21 */ bctrl /* 80165DB0 00162D10 48 00 00 24 */ b lbl_80165DD4 lbl_80165DB4: /* 80165DB4 00162D14 80 1C 03 FC */ lwz r0, 0x3fc(r28) @@ -8208,7 +8208,7 @@ lbl_80165DDC: /* 80165E08 00162D68 81 9C 00 00 */ lwz r12, 0(r28) /* 80165E0C 00162D6C 81 8C 02 D4 */ lwz r12, 0x2d4(r12) /* 80165E10 00162D70 7D 89 03 A6 */ mtctr r12 -/* 80165E14 00162D74 4E 80 04 21 */ bctrl +/* 80165E14 00162D74 4E 80 04 21 */ bctrl /* 80165E18 00162D78 48 00 00 24 */ b lbl_80165E3C lbl_80165E1C: /* 80165E1C 00162D7C 80 1C 03 FC */ lwz r0, 0x3fc(r28) @@ -8263,7 +8263,7 @@ lbl_80165EB0: /* 80165EB8 00162E18 81 9C 00 00 */ lwz r12, 0(r28) /* 80165EBC 00162E1C 81 8C 02 98 */ lwz r12, 0x298(r12) /* 80165EC0 00162E20 7D 89 03 A6 */ mtctr r12 -/* 80165EC4 00162E24 4E 80 04 21 */ bctrl +/* 80165EC4 00162E24 4E 80 04 21 */ bctrl .global lbl_80165EC8 lbl_80165EC8: /* 80165EC8 00162E28 57 60 06 3F */ clrlwi. r0, r27, 0x18 @@ -8280,7 +8280,7 @@ lbl_80165EE8: /* 80165EF0 00162E50 80 01 00 94 */ lwz r0, 0x94(r1) /* 80165EF4 00162E54 7C 08 03 A6 */ mtlr r0 /* 80165EF8 00162E58 38 21 00 90 */ addi r1, r1, 0x90 -/* 80165EFC 00162E5C 4E 80 00 20 */ blr +/* 80165EFC 00162E5C 4E 80 00 20 */ blr .global sub_80165f00 sub_80165f00: @@ -8341,7 +8341,7 @@ sub_80165f00: /* 80165FD8 00162F38 54 05 17 FE */ rlwinm r5, r0, 2, 0x1f, 0x1f /* 80165FDC 00162F3C 81 8C 02 D4 */ lwz r12, 0x2d4(r12) /* 80165FE0 00162F40 7D 89 03 A6 */ mtctr r12 -/* 80165FE4 00162F44 4E 80 04 21 */ bctrl +/* 80165FE4 00162F44 4E 80 04 21 */ bctrl /* 80165FE8 00162F48 28 1F 00 00 */ cmplwi r31, 0 /* 80165FEC 00162F4C 41 82 00 9C */ beq lbl_80166088 /* 80165FF0 00162F50 3C 80 80 3D */ lis r4, lbl_803D0398@ha @@ -8389,7 +8389,7 @@ lbl_80166088: /* 80166094 00162FF4 83 A1 00 E4 */ lwz r29, 0xe4(r1) /* 80166098 00162FF8 7C 08 03 A6 */ mtlr r0 /* 8016609C 00162FFC 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 801660A0 00163000 4E 80 00 20 */ blr +/* 801660A0 00163000 4E 80 00 20 */ blr .global sub_801660a4 sub_801660a4: @@ -8537,7 +8537,7 @@ lbl_801662B4: /* 801662B8 00163218 80 01 01 14 */ lwz r0, 0x114(r1) /* 801662BC 0016321C 7C 08 03 A6 */ mtlr r0 /* 801662C0 00163220 38 21 01 10 */ addi r1, r1, 0x110 -/* 801662C4 00163224 4E 80 00 20 */ blr +/* 801662C4 00163224 4E 80 00 20 */ blr .global sub_801662c8 sub_801662c8: @@ -8562,7 +8562,7 @@ lbl_801662E8: /* 8016630C 0016326C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80166310 00163270 7C 08 03 A6 */ mtlr r0 /* 80166314 00163274 38 21 00 20 */ addi r1, r1, 0x20 -/* 80166318 00163278 4E 80 00 20 */ blr +/* 80166318 00163278 4E 80 00 20 */ blr .global AcceptScriptMsg__6CDroneF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__6CDroneF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -8587,7 +8587,7 @@ AcceptScriptMsg__6CDroneF20EScriptObjectMessage9TUniqueIdR13CStateManager: /* 80166364 001632C4 38 63 39 C8 */ addi r3, r3, lbl_803E39C8@l /* 80166368 001632C8 7C 03 00 2E */ lwzx r0, r3, r0 /* 8016636C 001632CC 7C 09 03 A6 */ mtctr r0 -/* 80166370 001632D0 4E 80 04 20 */ bctr +/* 80166370 001632D0 4E 80 04 20 */ bctr .global lbl_80166374 lbl_80166374: /* 80166374 001632D4 7F C3 F3 78 */ mr r3, r30 @@ -8596,7 +8596,7 @@ lbl_80166374: /* 80166380 001632E0 38 A0 00 01 */ li r5, 1 /* 80166384 001632E4 81 8C 02 D0 */ lwz r12, 0x2d0(r12) /* 80166388 001632E8 7D 89 03 A6 */ mtctr r12 -/* 8016638C 001632EC 4E 80 04 21 */ bctrl +/* 8016638C 001632EC 4E 80 04 21 */ bctrl /* 80166390 001632F0 7F C3 F3 78 */ mr r3, r30 /* 80166394 001632F4 7F E4 FB 78 */ mr r4, r31 /* 80166398 001632F8 4B FF 91 01 */ bl sub_8015f498 @@ -8796,7 +8796,7 @@ lbl_80166658: /* 80166660 001635C0 81 9E 00 00 */ lwz r12, 0(r30) /* 80166664 001635C4 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80166668 001635C8 7D 89 03 A6 */ mtctr r12 -/* 8016666C 001635CC 4E 80 04 21 */ bctrl +/* 8016666C 001635CC 4E 80 04 21 */ bctrl /* 80166670 001635D0 C0 03 00 00 */ lfs f0, 0(r3) /* 80166674 001635D4 C0 62 9F 7C */ lfs f3, lbl_805ABC9C@sda21(r2) /* 80166678 001635D8 D0 1E 06 04 */ stfs f0, 0x604(r30) @@ -8836,7 +8836,7 @@ lbl_801666C0: /* 801666F8 00163658 81 9E 00 00 */ lwz r12, 0(r30) /* 801666FC 0016365C 81 8C 02 9C */ lwz r12, 0x29c(r12) /* 80166700 00163660 7D 89 03 A6 */ mtctr r12 -/* 80166704 00163664 4E 80 04 21 */ bctrl +/* 80166704 00163664 4E 80 04 21 */ bctrl .global lbl_80166708 lbl_80166708: /* 80166708 00163668 80 01 01 14 */ lwz r0, 0x114(r1) @@ -8846,7 +8846,7 @@ lbl_80166708: /* 80166718 00163678 83 81 01 00 */ lwz r28, 0x100(r1) /* 8016671C 0016367C 7C 08 03 A6 */ mtlr r0 /* 80166720 00163680 38 21 01 10 */ addi r1, r1, 0x110 -/* 80166724 00163684 4E 80 00 20 */ blr +/* 80166724 00163684 4E 80 00 20 */ blr .global Accept__6CDroneFR8IVisitor Accept__6CDroneFR8IVisitor: @@ -8859,11 +8859,11 @@ Accept__6CDroneFR8IVisitor: /* 80166740 001636A0 7C 04 03 78 */ mr r4, r0 /* 80166744 001636A4 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 80166748 001636A8 7D 89 03 A6 */ mtctr r12 -/* 8016674C 001636AC 4E 80 04 21 */ bctrl +/* 8016674C 001636AC 4E 80 04 21 */ bctrl /* 80166750 001636B0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80166754 001636B4 7C 08 03 A6 */ mtlr r0 /* 80166758 001636B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8016675C 001636BC 4E 80 00 20 */ blr +/* 8016675C 001636BC 4E 80 00 20 */ blr .global "__ct__6CDroneF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>Q210CPatterned11EFlavorTypeRC11CEntityInfoRC12CTransform4fRC10CModelDataRC14CPatternedInfoQ210CPatterned13EMovementTypeQ210CPatterned13EColliderType9EBodyTypeRC11CDamageInfoUiUiUiRC11CDamageInfofUiQ24rstl60vectorRC16CActorParameters" "__ct__6CDroneF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>Q210CPatterned11EFlavorTypeRC11CEntityInfoRC12CTransform4fRC10CModelDataRC14CPatternedInfoQ210CPatterned13EMovementTypeQ210CPatterned13EColliderType9EBodyTypeRC11CDamageInfoUiUiUiRC11CDamageInfofUiQ24rstl60vectorRC16CActorParameters": @@ -8978,7 +8978,7 @@ lbl_8016689C: /* 8016690C 0016386C 81 84 00 00 */ lwz r12, 0(r4) /* 80166910 00163870 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80166914 00163874 7D 89 03 A6 */ mtctr r12 -/* 80166918 00163878 4E 80 04 21 */ bctrl +/* 80166918 00163878 4E 80 04 21 */ bctrl /* 8016691C 0016387C 3A 3E 05 6C */ addi r17, r30, 0x56c /* 80166920 00163880 38 81 00 24 */ addi r4, r1, 0x24 /* 80166924 00163884 7E 23 8B 78 */ mr r3, r17 @@ -9349,7 +9349,7 @@ lbl_80166D0C: /* 80166EAC 00163E0C 80 01 01 B4 */ lwz r0, 0x1b4(r1) /* 80166EB0 00163E10 7C 08 03 A6 */ mtlr r0 /* 80166EB4 00163E14 38 21 01 B0 */ addi r1, r1, 0x1b0 -/* 80166EB8 00163E18 4E 80 00 20 */ blr +/* 80166EB8 00163E18 4E 80 00 20 */ blr .global sub_80166ebc sub_80166ebc: @@ -9374,7 +9374,7 @@ lbl_80166EDC: /* 80166F00 00163E60 80 01 00 24 */ lwz r0, 0x24(r1) /* 80166F04 00163E64 7C 08 03 A6 */ mtlr r0 /* 80166F08 00163E68 38 21 00 20 */ addi r1, r1, 0x20 -/* 80166F0C 00163E6C 4E 80 00 20 */ blr +/* 80166F0C 00163E6C 4E 80 00 20 */ blr .global sub_80166f10 sub_80166f10: @@ -9471,7 +9471,7 @@ lbl_8016705C: /* 80167070 00163FD0 81 83 00 00 */ lwz r12, 0(r3) /* 80167074 00163FD4 81 8C 00 30 */ lwz r12, 0x30(r12) /* 80167078 00163FD8 7D 89 03 A6 */ mtctr r12 -/* 8016707C 00163FDC 4E 80 04 21 */ bctrl +/* 8016707C 00163FDC 4E 80 04 21 */ bctrl /* 80167080 00163FE0 38 60 00 98 */ li r3, 0x98 /* 80167084 00163FE4 48 1A 45 E5 */ bl StreamBegin__9CGraphicsF13ERglPrimitive /* 80167088 00163FE8 3C 00 43 30 */ lis r0, 0x4330 @@ -9562,7 +9562,7 @@ lbl_80167188: /* 801671D0 00164130 83 81 00 C0 */ lwz r28, 0xc0(r1) /* 801671D4 00164134 7C 08 03 A6 */ mtlr r0 /* 801671D8 00164138 38 21 01 40 */ addi r1, r1, 0x140 -/* 801671DC 0016413C 4E 80 00 20 */ blr +/* 801671DC 0016413C 4E 80 00 20 */ blr .global Render__11CDroneLaserCFRC13CStateManager Render__11CDroneLaserCFRC13CStateManager: @@ -9577,7 +9577,7 @@ Render__11CDroneLaserCFRC13CStateManager: /* 80167200 00164160 81 83 00 00 */ lwz r12, 0(r3) /* 80167204 00164164 81 8C 00 60 */ lwz r12, 0x60(r12) /* 80167208 00164168 7D 89 03 A6 */ mtctr r12 -/* 8016720C 0016416C 4E 80 04 21 */ bctrl +/* 8016720C 0016416C 4E 80 04 21 */ bctrl /* 80167210 00164170 C0 22 9F 7C */ lfs f1, lbl_805ABC9C@sda21(r2) /* 80167214 00164174 38 61 00 10 */ addi r3, r1, 0x10 /* 80167218 00164178 C0 42 A0 54 */ lfs f2, lbl_805ABD74@sda21(r2) @@ -9596,7 +9596,7 @@ Render__11CDroneLaserCFRC13CStateManager: /* 8016724C 001641AC 81 83 00 00 */ lwz r12, 0(r3) /* 80167250 001641B0 81 8C 00 60 */ lwz r12, 0x60(r12) /* 80167254 001641B4 7D 89 03 A6 */ mtctr r12 -/* 80167258 001641B8 4E 80 04 21 */ bctrl +/* 80167258 001641B8 4E 80 04 21 */ bctrl /* 8016725C 001641BC C0 42 9F 68 */ lfs f2, lbl_805ABC88@sda21(r2) /* 80167260 001641C0 38 61 00 0C */ addi r3, r1, 0xc /* 80167264 001641C4 C0 22 A0 5C */ lfs f1, lbl_805ABD7C@sda21(r2) @@ -9625,7 +9625,7 @@ Render__11CDroneLaserCFRC13CStateManager: /* 801672C0 00164220 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801672C4 00164224 7C 08 03 A6 */ mtlr r0 /* 801672C8 00164228 38 21 00 20 */ addi r1, r1, 0x20 -/* 801672CC 0016422C 4E 80 00 20 */ blr +/* 801672CC 0016422C 4E 80 00 20 */ blr .global AddToRenderer__11CDroneLaserCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__11CDroneLaserCFRC14CFrustumPlanesRC13CStateManager: @@ -9641,7 +9641,7 @@ AddToRenderer__11CDroneLaserCFRC14CFrustumPlanesRC13CStateManager: /* 801672F4 00164254 81 83 00 00 */ lwz r12, 0(r3) /* 801672F8 00164258 81 8C 00 34 */ lwz r12, 0x34(r12) /* 801672FC 0016425C 7D 89 03 A6 */ mtctr r12 -/* 80167300 00164260 4E 80 04 21 */ bctrl +/* 80167300 00164260 4E 80 04 21 */ bctrl /* 80167304 00164264 7F C3 F3 78 */ mr r3, r30 /* 80167308 00164268 7F E4 FB 78 */ mr r4, r31 /* 8016730C 0016426C 4B EE D6 C1 */ bl EnsureRendered__6CActorCFRC13CStateManager @@ -9650,7 +9650,7 @@ AddToRenderer__11CDroneLaserCFRC14CFrustumPlanesRC13CStateManager: /* 80167318 00164278 83 C1 00 08 */ lwz r30, 8(r1) /* 8016731C 0016427C 7C 08 03 A6 */ mtlr r0 /* 80167320 00164280 38 21 00 10 */ addi r1, r1, 0x10 -/* 80167324 00164284 4E 80 00 20 */ blr +/* 80167324 00164284 4E 80 00 20 */ blr .global CalculateRenderBounds__11CDroneLaserFv CalculateRenderBounds__11CDroneLaserFv: @@ -9766,7 +9766,7 @@ CalculateRenderBounds__11CDroneLaserFv: /* 801674DC 0016443C 83 E1 00 8C */ lwz r31, 0x8c(r1) /* 801674E0 00164440 7C 08 03 A6 */ mtlr r0 /* 801674E4 00164444 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 801674E8 00164448 4E 80 00 20 */ blr +/* 801674E8 00164448 4E 80 00 20 */ blr .global Accept__11CDroneLaserFR8IVisitor Accept__11CDroneLaserFR8IVisitor: @@ -9779,11 +9779,11 @@ Accept__11CDroneLaserFR8IVisitor: /* 80167504 00164464 7C 04 03 78 */ mr r4, r0 /* 80167508 00164468 81 8C 00 08 */ lwz r12, 8(r12) /* 8016750C 0016446C 7D 89 03 A6 */ mtctr r12 -/* 80167510 00164470 4E 80 04 21 */ bctrl +/* 80167510 00164470 4E 80 04 21 */ bctrl /* 80167514 00164474 80 01 00 14 */ lwz r0, 0x14(r1) /* 80167518 00164478 7C 08 03 A6 */ mtlr r0 /* 8016751C 0016447C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80167520 00164480 4E 80 00 20 */ blr +/* 80167520 00164480 4E 80 00 20 */ blr .global AcceptScriptMsg__11CDroneLaserF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__11CDroneLaserF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -9824,7 +9824,7 @@ lbl_8016758C: /* 801675A4 00164504 81 83 00 00 */ lwz r12, 0(r3) /* 801675A8 00164508 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 801675AC 0016450C 7D 89 03 A6 */ mtctr r12 -/* 801675B0 00164510 4E 80 04 21 */ bctrl +/* 801675B0 00164510 4E 80 04 21 */ bctrl /* 801675B4 00164514 48 00 01 50 */ b lbl_80167704 lbl_801675B8: /* 801675B8 00164518 7F C3 F3 78 */ mr r3, r30 @@ -9836,7 +9836,7 @@ lbl_801675B8: /* 801675D0 00164530 81 83 00 00 */ lwz r12, 0(r3) /* 801675D4 00164534 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 801675D8 00164538 7D 89 03 A6 */ mtctr r12 -/* 801675DC 0016453C 4E 80 04 21 */ bctrl +/* 801675DC 0016453C 4E 80 04 21 */ bctrl /* 801675E0 00164540 48 00 01 24 */ b lbl_80167704 lbl_801675E4: /* 801675E4 00164544 7F E4 FB 78 */ mr r4, r31 @@ -9922,7 +9922,7 @@ lbl_80167704: /* 80167714 00164674 83 81 00 E0 */ lwz r28, 0xe0(r1) /* 80167718 00164678 7C 08 03 A6 */ mtlr r0 /* 8016771C 0016467C 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 80167720 00164680 4E 80 00 20 */ blr +/* 80167720 00164680 4E 80 00 20 */ blr .global Think__11CDroneLaserFfR13CStateManager Think__11CDroneLaserFfR13CStateManager: @@ -9933,11 +9933,11 @@ Think__11CDroneLaserFfR13CStateManager: /* 80167734 00164694 81 83 00 00 */ lwz r12, 0(r3) /* 80167738 00164698 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8016773C 0016469C 7D 89 03 A6 */ mtctr r12 -/* 80167740 001646A0 4E 80 04 21 */ bctrl +/* 80167740 001646A0 4E 80 04 21 */ bctrl /* 80167744 001646A4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80167748 001646A8 7C 08 03 A6 */ mtlr r0 /* 8016774C 001646AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80167750 001646B0 4E 80 00 20 */ blr +/* 80167750 001646B0 4E 80 00 20 */ blr .global sub_80167754 sub_80167754: @@ -10029,13 +10029,13 @@ lbl_8016787C: /* 801678A4 00164804 81 9F 00 00 */ lwz r12, 0(r31) /* 801678A8 00164808 81 8C 00 14 */ lwz r12, 0x14(r12) /* 801678AC 0016480C 7D 89 03 A6 */ mtctr r12 -/* 801678B0 00164810 4E 80 04 21 */ bctrl +/* 801678B0 00164810 4E 80 04 21 */ bctrl /* 801678B4 00164814 80 7C 01 04 */ lwz r3, 0x104(r28) /* 801678B8 00164818 7F A4 EB 78 */ mr r4, r29 /* 801678BC 0016481C 81 83 00 00 */ lwz r12, 0(r3) /* 801678C0 00164820 81 8C 00 18 */ lwz r12, 0x18(r12) /* 801678C4 00164824 7D 89 03 A6 */ mtctr r12 -/* 801678C8 00164828 4E 80 04 21 */ bctrl +/* 801678C8 00164828 4E 80 04 21 */ bctrl /* 801678CC 0016482C E3 E1 00 B8 */ psq_l f31, 184(r1), 0, qr0 /* 801678D0 00164830 CB E1 00 B0 */ lfd f31, 0xb0(r1) /* 801678D4 00164834 E3 C1 00 A8 */ psq_l f30, 168(r1), 0, qr0 @@ -10049,7 +10049,7 @@ lbl_8016787C: /* 801678F4 00164854 83 81 00 80 */ lwz r28, 0x80(r1) /* 801678F8 00164858 7C 08 03 A6 */ mtlr r0 /* 801678FC 0016485C 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 80167900 00164860 4E 80 00 20 */ blr +/* 80167900 00164860 4E 80 00 20 */ blr .global __ct__11CDroneLaserF9TUniqueIdRC12CTransform4fUi __ct__11CDroneLaserF9TUniqueIdRC12CTransform4fUi: @@ -10167,7 +10167,7 @@ lbl_80167A60: /* 80167AB4 00164A14 81 84 00 00 */ lwz r12, 0(r4) /* 80167AB8 00164A18 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80167ABC 00164A1C 7D 89 03 A6 */ mtctr r12 -/* 80167AC0 00164A20 4E 80 04 21 */ bctrl +/* 80167AC0 00164A20 4E 80 04 21 */ bctrl /* 80167AC4 00164A24 3B 7C 00 F8 */ addi r27, r28, 0xf8 /* 80167AC8 00164A28 38 81 00 38 */ addi r4, r1, 0x38 /* 80167ACC 00164A2C 7F 63 DB 78 */ mr r3, r27 @@ -10211,7 +10211,7 @@ lbl_80167B54: /* 80167B5C 00164ABC 80 01 01 B4 */ lwz r0, 0x1b4(r1) /* 80167B60 00164AC0 7C 08 03 A6 */ mtlr r0 /* 80167B64 00164AC4 38 21 01 B0 */ addi r1, r1, 0x1b0 -/* 80167B68 00164AC8 4E 80 00 20 */ blr +/* 80167B68 00164AC8 4E 80 00 20 */ blr .global __dt__11CDroneLaserFv __dt__11CDroneLaserFv: @@ -10235,7 +10235,7 @@ __dt__11CDroneLaserFv: /* 80167BB0 00164B10 38 80 00 01 */ li r4, 1 /* 80167BB4 00164B14 81 8C 00 08 */ lwz r12, 8(r12) /* 80167BB8 00164B18 7D 89 03 A6 */ mtctr r12 -/* 80167BBC 00164B1C 4E 80 04 21 */ bctrl +/* 80167BBC 00164B1C 4E 80 04 21 */ bctrl lbl_80167BC0: /* 80167BC0 00164B20 34 1E 00 F8 */ addic. r0, r30, 0xf8 /* 80167BC4 00164B24 41 82 00 18 */ beq lbl_80167BDC diff --git a/asm/MetroidPrime/Enemies/CElitePirate.s b/asm/MetroidPrime/Enemies/CElitePirate.s index 2fe41bf2..340f3c51 100644 --- a/asm/MetroidPrime/Enemies/CElitePirate.s +++ b/asm/MetroidPrime/Enemies/CElitePirate.s @@ -375,22 +375,22 @@ lbl_805A8174: .global GetSearchPath__12CElitePirateFv GetSearchPath__12CElitePirateFv: /* 80227398 002242F8 38 63 07 D0 */ addi r3, r3, 0x7d0 -/* 8022739C 002242FC 4E 80 00 20 */ blr +/* 8022739C 002242FC 4E 80 00 20 */ blr .global GetCollisionPrimitive__12CElitePirateCFv GetCollisionPrimitive__12CElitePirateCFv: /* 802273A0 00224300 38 63 07 38 */ addi r3, r3, 0x738 -/* 802273A4 00224304 4E 80 00 20 */ blr +/* 802273A4 00224304 4E 80 00 20 */ blr .global sub_802273a8 sub_802273a8: /* 802273A8 00224308 38 60 00 01 */ li r3, 1 -/* 802273AC 0022430C 4E 80 00 20 */ blr +/* 802273AC 0022430C 4E 80 00 20 */ blr .global sub_802273b0 sub_802273b0: /* 802273B0 00224310 38 60 00 01 */ li r3, 1 -/* 802273B4 00224314 4E 80 00 20 */ blr +/* 802273B4 00224314 4E 80 00 20 */ blr .global sub_802273b8 sub_802273b8: @@ -423,7 +423,7 @@ sub_802273b8: /* 80227420 00224380 D0 43 00 30 */ stfs f2, 0x30(r3) /* 80227424 00224384 90 C3 00 34 */ stw r6, 0x34(r3) /* 80227428 00224388 B0 A3 00 38 */ sth r5, 0x38(r3) -/* 8022742C 0022438C 4E 80 00 20 */ blr +/* 8022742C 0022438C 4E 80 00 20 */ blr .global sub_80227430 sub_80227430: @@ -437,10 +437,10 @@ sub_80227430: /* 8022744C 002243AC 2C 00 00 03 */ cmpwi r0, 3 /* 80227450 002243B0 40 82 00 0C */ bne lbl_8022745C /* 80227454 002243B4 38 60 00 00 */ li r3, 0 -/* 80227458 002243B8 4E 80 00 20 */ blr +/* 80227458 002243B8 4E 80 00 20 */ blr lbl_8022745C: /* 8022745C 002243BC 38 60 00 01 */ li r3, 1 -/* 80227460 002243C0 4E 80 00 20 */ blr +/* 80227460 002243C0 4E 80 00 20 */ blr .global sub_80227464 sub_80227464: @@ -457,7 +457,7 @@ sub_80227464: /* 8022748C 002243EC 81 83 00 00 */ lwz r12, 0(r3) /* 80227490 002243F0 81 8C 02 CC */ lwz r12, 0x2cc(r12) /* 80227494 002243F4 7D 89 03 A6 */ mtctr r12 -/* 80227498 002243F8 4E 80 04 21 */ bctrl +/* 80227498 002243F8 4E 80 04 21 */ bctrl /* 8022749C 002243FC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802274A0 00224400 41 82 00 DC */ beq lbl_8022757C /* 802274A4 00224404 A0 1D 00 00 */ lhz r0, 0(r29) @@ -522,7 +522,7 @@ lbl_8022757C: /* 8022758C 002244EC 83 81 00 60 */ lwz r28, 0x60(r1) /* 80227590 002244F0 7C 08 03 A6 */ mtlr r0 /* 80227594 002244F4 38 21 00 70 */ addi r1, r1, 0x70 -/* 80227598 002244F8 4E 80 00 20 */ blr +/* 80227598 002244F8 4E 80 00 20 */ blr .global sub_8022759c sub_8022759c: @@ -542,7 +542,7 @@ sub_8022759c: /* 802275D0 00224530 7C BF 2B 78 */ mr r31, r5 /* 802275D4 00224534 81 8C 02 D0 */ lwz r12, 0x2d0(r12) /* 802275D8 00224538 7D 89 03 A6 */ mtctr r12 -/* 802275DC 0022453C 4E 80 04 21 */ bctrl +/* 802275DC 0022453C 4E 80 04 21 */ bctrl /* 802275E0 00224540 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802275E4 00224544 41 82 00 70 */ beq lbl_80227654 /* 802275E8 00224548 C0 3D 07 B4 */ lfs f1, 0x7b4(r29) @@ -556,7 +556,7 @@ sub_8022759c: /* 80227608 00224568 81 9D 00 00 */ lwz r12, 0(r29) /* 8022760C 0022456C 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80227610 00224570 7D 89 03 A6 */ mtctr r12 -/* 80227614 00224574 4E 80 04 21 */ bctrl +/* 80227614 00224574 4E 80 04 21 */ bctrl /* 80227618 00224578 C0 43 00 00 */ lfs f2, 0(r3) /* 8022761C 0022457C C0 1D 07 B4 */ lfs f0, 0x7b4(r29) /* 80227620 00224580 C0 3D 07 B0 */ lfs f1, 0x7b0(r29) @@ -601,7 +601,7 @@ lbl_80227690: /* 802276AC 0022460C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 802276B0 00224610 7C 08 03 A6 */ mtlr r0 /* 802276B4 00224614 38 21 00 40 */ addi r1, r1, 0x40 -/* 802276B8 00224618 4E 80 00 20 */ blr +/* 802276B8 00224618 4E 80 00 20 */ blr .global sub_802276bc sub_802276bc: @@ -681,7 +681,7 @@ lbl_802277C4: /* 802277D0 00224730 80 01 00 44 */ lwz r0, 0x44(r1) /* 802277D4 00224734 7C 08 03 A6 */ mtlr r0 /* 802277D8 00224738 38 21 00 40 */ addi r1, r1, 0x40 -/* 802277DC 0022473C 4E 80 00 20 */ blr +/* 802277DC 0022473C 4E 80 00 20 */ blr .global sub_802277e0 sub_802277e0: @@ -717,7 +717,7 @@ sub_802277e0: /* 80227854 002247B4 81 83 00 00 */ lwz r12, 0(r3) /* 80227858 002247B8 81 8C 00 18 */ lwz r12, 0x18(r12) /* 8022785C 002247BC 7D 89 03 A6 */ mtctr r12 -/* 80227860 002247C0 4E 80 04 21 */ bctrl +/* 80227860 002247C0 4E 80 04 21 */ bctrl /* 80227864 002247C4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80227868 002247C8 40 82 01 80 */ bne lbl_802279E8 lbl_8022786C: @@ -726,7 +726,7 @@ lbl_8022786C: /* 80227874 002247D4 81 9E 00 00 */ lwz r12, 0(r30) /* 80227878 002247D8 81 8C 02 CC */ lwz r12, 0x2cc(r12) /* 8022787C 002247DC 7D 89 03 A6 */ mtctr r12 -/* 80227880 002247E0 4E 80 04 21 */ bctrl +/* 80227880 002247E0 4E 80 04 21 */ bctrl /* 80227884 002247E4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80227888 002247E8 41 82 00 98 */ beq lbl_80227920 /* 8022788C 002247EC A0 1E 07 70 */ lhz r0, 0x770(r30) @@ -776,7 +776,7 @@ lbl_80227920: /* 80227938 00224898 C0 22 B5 B8 */ lfs f1, lbl_805AD2D8@sda21(r2) /* 8022793C 0022489C 81 8C 01 9C */ lwz r12, 0x19c(r12) /* 80227940 002248A0 7D 89 03 A6 */ mtctr r12 -/* 80227944 002248A4 4E 80 04 21 */ bctrl +/* 80227944 002248A4 4E 80 04 21 */ bctrl /* 80227948 002248A8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022794C 002248AC 41 82 00 08 */ beq lbl_80227954 lbl_80227950: @@ -864,7 +864,7 @@ lbl_80227A74: /* 80227A80 002249E0 83 A1 00 64 */ lwz r29, 0x64(r1) /* 80227A84 002249E4 7C 08 03 A6 */ mtlr r0 /* 80227A88 002249E8 38 21 00 70 */ addi r1, r1, 0x70 -/* 80227A8C 002249EC 4E 80 00 20 */ blr +/* 80227A8C 002249EC 4E 80 00 20 */ blr .global sub_80227a90 sub_80227a90: @@ -1347,7 +1347,7 @@ lbl_8022817C: /* 802281C8 00225128 80 01 12 D4 */ lwz r0, 0x12d4(r1) /* 802281CC 0022512C 7C 08 03 A6 */ mtlr r0 /* 802281D0 00225130 38 21 12 D0 */ addi r1, r1, 0x12d0 -/* 802281D4 00225134 4E 80 00 20 */ blr +/* 802281D4 00225134 4E 80 00 20 */ blr .global sub_802281d8 sub_802281d8: @@ -1472,7 +1472,7 @@ lbl_80228394: /* 80228398 002252F8 80 01 00 94 */ lwz r0, 0x94(r1) /* 8022839C 002252FC 7C 08 03 A6 */ mtlr r0 /* 802283A0 00225300 38 21 00 90 */ addi r1, r1, 0x90 -/* 802283A4 00225304 4E 80 00 20 */ blr +/* 802283A4 00225304 4E 80 00 20 */ blr .global sub_802283a8 sub_802283a8: @@ -1620,7 +1620,7 @@ lbl_80228598: /* 802285B4 00225514 83 A1 01 14 */ lwz r29, 0x114(r1) /* 802285B8 00225518 7C 08 03 A6 */ mtlr r0 /* 802285BC 0022551C 38 21 01 40 */ addi r1, r1, 0x140 -/* 802285C0 00225520 4E 80 00 20 */ blr +/* 802285C0 00225520 4E 80 00 20 */ blr .global sub_802285c4 sub_802285c4: @@ -1652,7 +1652,7 @@ lbl_80228614: /* 80228624 00225584 83 C1 00 08 */ lwz r30, 8(r1) /* 80228628 00225588 7C 08 03 A6 */ mtlr r0 /* 8022862C 0022558C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80228630 00225590 4E 80 00 20 */ blr +/* 80228630 00225590 4E 80 00 20 */ blr .global sub_80228634 sub_80228634: @@ -1745,7 +1745,7 @@ lbl_80228764: /* 80228788 002256E8 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 8022878C 002256EC 7C 08 03 A6 */ mtlr r0 /* 80228790 002256F0 38 21 00 80 */ addi r1, r1, 0x80 -/* 80228794 002256F4 4E 80 00 20 */ blr +/* 80228794 002256F4 4E 80 00 20 */ blr .global sub_80228798 sub_80228798: @@ -1804,7 +1804,7 @@ lbl_8022882C: /* 80228854 002257B4 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 80228858 002257B8 7C 08 03 A6 */ mtlr r0 /* 8022885C 002257BC 38 21 00 30 */ addi r1, r1, 0x30 -/* 80228860 002257C0 4E 80 00 20 */ blr +/* 80228860 002257C0 4E 80 00 20 */ blr .global sub_80228864 sub_80228864: @@ -1854,7 +1854,7 @@ sub_80228864: /* 80228910 00225870 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 80228914 00225874 7C 08 03 A6 */ mtlr r0 /* 80228918 00225878 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8022891C 0022587C 4E 80 00 20 */ blr +/* 8022891C 0022587C 4E 80 00 20 */ blr .global sub_80228920 sub_80228920: @@ -1895,7 +1895,7 @@ lbl_80228994: /* 802289A0 00225900 83 A1 00 24 */ lwz r29, 0x24(r1) /* 802289A4 00225904 7C 08 03 A6 */ mtlr r0 /* 802289A8 00225908 38 21 00 30 */ addi r1, r1, 0x30 -/* 802289AC 0022590C 4E 80 00 20 */ blr +/* 802289AC 0022590C 4E 80 00 20 */ blr .global sub_802289b0 sub_802289b0: @@ -1909,7 +1909,7 @@ sub_802289b0: /* 802289CC 0022592C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802289D0 00225930 7C 08 03 A6 */ mtlr r0 /* 802289D4 00225934 38 21 00 10 */ addi r1, r1, 0x10 -/* 802289D8 00225938 4E 80 00 20 */ blr +/* 802289D8 00225938 4E 80 00 20 */ blr .global sub_802289dc sub_802289dc: @@ -1966,7 +1966,7 @@ lbl_80228A8C: /* 80228A9C 002259FC 83 81 00 70 */ lwz r28, 0x70(r1) /* 80228AA0 00225A00 7C 08 03 A6 */ mtlr r0 /* 80228AA4 00225A04 38 21 00 80 */ addi r1, r1, 0x80 -/* 80228AA8 00225A08 4E 80 00 20 */ blr +/* 80228AA8 00225A08 4E 80 00 20 */ blr .global sub_80228aac sub_80228aac: @@ -2165,7 +2165,7 @@ lbl_80228D8C: /* 80228D90 00225CF0 80 01 02 14 */ lwz r0, 0x214(r1) /* 80228D94 00225CF4 7C 08 03 A6 */ mtlr r0 /* 80228D98 00225CF8 38 21 02 10 */ addi r1, r1, 0x210 -/* 80228D9C 00225CFC 4E 80 00 20 */ blr +/* 80228D9C 00225CFC 4E 80 00 20 */ blr .global sub_80228da0 sub_80228da0: @@ -2212,7 +2212,7 @@ sub_80228da0: /* 80228E40 00225DA0 D0 03 00 50 */ stfs f0, 0x50(r3) /* 80228E44 00225DA4 C0 08 00 0C */ lfs f0, 0xc(r8) /* 80228E48 00225DA8 D0 03 00 54 */ stfs f0, 0x54(r3) -/* 80228E4C 00225DAC 4E 80 00 20 */ blr +/* 80228E4C 00225DAC 4E 80 00 20 */ blr .global sub_80228e50 sub_80228e50: @@ -2226,10 +2226,10 @@ lbl_80228E68: /* 80228E68 00225DC8 C0 43 07 AC */ lfs f2, 0x7ac(r3) /* 80228E6C 00225DCC C0 02 B5 B8 */ lfs f0, lbl_805AD2D8@sda21(r2) /* 80228E70 00225DD0 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 80228E74 00225DD4 4C 81 00 20 */ blelr +/* 80228E74 00225DD4 4C 81 00 20 */ blelr /* 80228E78 00225DD8 EC 02 08 28 */ fsubs f0, f2, f1 /* 80228E7C 00225DDC D0 03 07 AC */ stfs f0, 0x7ac(r3) -/* 80228E80 00225DE0 4E 80 00 20 */ blr +/* 80228E80 00225DE0 4E 80 00 20 */ blr .global sub_80228e84 sub_80228e84: @@ -2249,13 +2249,13 @@ sub_80228e84: /* 80228EB8 00225E18 7C 9D 23 78 */ mr r29, r4 /* 80228EBC 00225E1C 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80228EC0 00225E20 7D 89 03 A6 */ mtctr r12 -/* 80228EC4 00225E24 4E 80 04 21 */ bctrl +/* 80228EC4 00225E24 4E 80 04 21 */ bctrl /* 80228EC8 00225E28 C3 E3 00 00 */ lfs f31, 0(r3) /* 80228ECC 00225E2C 7F 83 E3 78 */ mr r3, r28 /* 80228ED0 00225E30 81 9C 00 00 */ lwz r12, 0(r28) /* 80228ED4 00225E34 81 8C 02 CC */ lwz r12, 0x2cc(r12) /* 80228ED8 00225E38 7D 89 03 A6 */ mtctr r12 -/* 80228EDC 00225E3C 4E 80 04 21 */ bctrl +/* 80228EDC 00225E3C 4E 80 04 21 */ bctrl /* 80228EE0 00225E40 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80228EE4 00225E44 41 82 00 B4 */ beq lbl_80228F98 /* 80228EE8 00225E48 A0 1C 07 70 */ lhz r0, 0x770(r28) @@ -2274,14 +2274,14 @@ sub_80228e84: /* 80228F1C 00225E7C 81 9E 00 00 */ lwz r12, 0(r30) /* 80228F20 00225E80 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80228F24 00225E84 7D 89 03 A6 */ mtctr r12 -/* 80228F28 00225E88 4E 80 04 21 */ bctrl +/* 80228F28 00225E88 4E 80 04 21 */ bctrl /* 80228F2C 00225E8C C3 C3 00 00 */ lfs f30, 0(r3) /* 80228F30 00225E90 7F 83 E3 78 */ mr r3, r28 /* 80228F34 00225E94 81 9C 00 00 */ lwz r12, 0(r28) /* 80228F38 00225E98 7F A4 EB 78 */ mr r4, r29 /* 80228F3C 00225E9C 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80228F40 00225EA0 7D 89 03 A6 */ mtctr r12 -/* 80228F44 00225EA4 4E 80 04 21 */ bctrl +/* 80228F44 00225EA4 4E 80 04 21 */ bctrl /* 80228F48 00225EA8 EC 1F F0 28 */ fsubs f0, f31, f30 /* 80228F4C 00225EAC 7F A4 EB 78 */ mr r4, r29 /* 80228F50 00225EB0 EC 1F 00 28 */ fsubs f0, f31, f0 @@ -2290,14 +2290,14 @@ sub_80228e84: /* 80228F5C 00225EBC 81 9C 00 00 */ lwz r12, 0(r28) /* 80228F60 00225EC0 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80228F64 00225EC4 7D 89 03 A6 */ mtctr r12 -/* 80228F68 00225EC8 4E 80 04 21 */ bctrl +/* 80228F68 00225EC8 4E 80 04 21 */ bctrl /* 80228F6C 00225ECC 7C 7F 1B 78 */ mr r31, r3 /* 80228F70 00225ED0 7F C3 F3 78 */ mr r3, r30 /* 80228F74 00225ED4 81 9E 00 00 */ lwz r12, 0(r30) /* 80228F78 00225ED8 7F A4 EB 78 */ mr r4, r29 /* 80228F7C 00225EDC 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80228F80 00225EE0 7D 89 03 A6 */ mtctr r12 -/* 80228F84 00225EE4 4E 80 04 21 */ bctrl +/* 80228F84 00225EE4 4E 80 04 21 */ bctrl /* 80228F88 00225EE8 C0 1F 00 00 */ lfs f0, 0(r31) /* 80228F8C 00225EEC D0 03 00 00 */ stfs f0, 0(r3) /* 80228F90 00225EF0 C0 1F 00 04 */ lfs f0, 4(r31) @@ -2308,7 +2308,7 @@ lbl_80228F98: /* 80228FA0 00225F00 81 9C 00 00 */ lwz r12, 0(r28) /* 80228FA4 00225F04 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80228FA8 00225F08 7D 89 03 A6 */ mtctr r12 -/* 80228FAC 00225F0C 4E 80 04 21 */ bctrl +/* 80228FAC 00225F0C 4E 80 04 21 */ bctrl /* 80228FB0 00225F10 C0 23 00 00 */ lfs f1, 0(r3) /* 80228FB4 00225F14 C0 02 B5 B8 */ lfs f0, lbl_805AD2D8@sda21(r2) /* 80228FB8 00225F18 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -2322,7 +2322,7 @@ lbl_80228F98: /* 80228FD8 00225F38 7F A4 EB 78 */ mr r4, r29 /* 80228FDC 00225F3C 38 C0 00 14 */ li r6, 0x14 /* 80228FE0 00225F40 7D 89 03 A6 */ mtctr r12 -/* 80228FE4 00225F44 4E 80 04 21 */ bctrl +/* 80228FE4 00225F44 4E 80 04 21 */ bctrl /* 80228FE8 00225F48 7F 83 E3 78 */ mr r3, r28 /* 80228FEC 00225F4C 7F A6 EB 78 */ mr r6, r29 /* 80228FF0 00225F50 38 80 00 29 */ li r4, 0x29 @@ -2340,7 +2340,7 @@ lbl_80228FFC: /* 8022901C 00225F7C 83 81 00 20 */ lwz r28, 0x20(r1) /* 80229020 00225F80 7C 08 03 A6 */ mtlr r0 /* 80229024 00225F84 38 21 00 50 */ addi r1, r1, 0x50 -/* 80229028 00225F88 4E 80 00 20 */ blr +/* 80229028 00225F88 4E 80 00 20 */ blr .global sub_8022902c sub_8022902c: @@ -2361,7 +2361,7 @@ sub_8022902c: /* 80229064 00225FC4 7C BE 2B 78 */ mr r30, r5 /* 80229068 00225FC8 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8022906C 00225FCC 7D 89 03 A6 */ mtctr r12 -/* 80229070 00225FD0 4E 80 04 21 */ bctrl +/* 80229070 00225FD0 4E 80 04 21 */ bctrl /* 80229074 00225FD4 A0 9E 00 00 */ lhz r4, 0(r30) /* 80229078 00225FD8 7C 7F 1B 78 */ mr r31, r3 /* 8022907C 00225FDC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) @@ -2384,7 +2384,7 @@ sub_8022902c: /* 802290C0 00226020 81 8C 00 34 */ lwz r12, 0x34(r12) /* 802290C4 00226024 C3 DC 06 9C */ lfs f30, 0x69c(r28) /* 802290C8 00226028 7D 89 03 A6 */ mtctr r12 -/* 802290CC 0022602C 4E 80 04 21 */ bctrl +/* 802290CC 0022602C 4E 80 04 21 */ bctrl /* 802290D0 00226030 D3 C3 00 00 */ stfs f30, 0(r3) /* 802290D4 00226034 38 9C 05 6C */ addi r4, r28, 0x56c /* 802290D8 00226038 D3 E3 00 04 */ stfs f31, 4(r3) @@ -2402,7 +2402,7 @@ lbl_802290E4: /* 80229104 00226064 83 81 00 20 */ lwz r28, 0x20(r1) /* 80229108 00226068 7C 08 03 A6 */ mtlr r0 /* 8022910C 0022606C 38 21 00 50 */ addi r1, r1, 0x50 -/* 80229110 00226070 4E 80 00 20 */ blr +/* 80229110 00226070 4E 80 00 20 */ blr .global sub_80229114 sub_80229114: @@ -2418,7 +2418,7 @@ sub_80229114: /* 80229138 00226098 81 83 00 00 */ lwz r12, 0(r3) /* 8022913C 0022609C 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80229140 002260A0 7D 89 03 A6 */ mtctr r12 -/* 80229144 002260A4 4E 80 04 21 */ bctrl +/* 80229144 002260A4 4E 80 04 21 */ bctrl /* 80229148 002260A8 7C 7F 1B 78 */ mr r31, r3 /* 8022914C 002260AC 7F 83 E3 78 */ mr r3, r28 /* 80229150 002260B0 C0 1F 00 00 */ lfs f0, 0(r31) @@ -2426,7 +2426,7 @@ sub_80229114: /* 80229158 002260B8 81 9C 00 00 */ lwz r12, 0(r28) /* 8022915C 002260BC 81 8C 02 CC */ lwz r12, 0x2cc(r12) /* 80229160 002260C0 7D 89 03 A6 */ mtctr r12 -/* 80229164 002260C4 4E 80 04 21 */ bctrl +/* 80229164 002260C4 4E 80 04 21 */ bctrl /* 80229168 002260C8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022916C 002260CC 41 82 00 64 */ beq lbl_802291D0 /* 80229170 002260D0 A0 1C 07 70 */ lhz r0, 0x770(r28) @@ -2445,7 +2445,7 @@ sub_80229114: /* 802291A4 00226104 81 9E 00 00 */ lwz r12, 0(r30) /* 802291A8 00226108 81 8C 00 34 */ lwz r12, 0x34(r12) /* 802291AC 0022610C 7D 89 03 A6 */ mtctr r12 -/* 802291B0 00226110 4E 80 04 21 */ bctrl +/* 802291B0 00226110 4E 80 04 21 */ bctrl /* 802291B4 00226114 C0 1F 00 00 */ lfs f0, 0(r31) /* 802291B8 00226118 38 9C 05 6C */ addi r4, r28, 0x56c /* 802291BC 0022611C D0 03 00 00 */ stfs f0, 0(r3) @@ -2467,7 +2467,7 @@ lbl_802291D0: /* 802291F8 00226158 83 81 00 20 */ lwz r28, 0x20(r1) /* 802291FC 0022615C 7C 08 03 A6 */ mtlr r0 /* 80229200 00226160 38 21 00 30 */ addi r1, r1, 0x30 -/* 80229204 00226164 4E 80 00 20 */ blr +/* 80229204 00226164 4E 80 00 20 */ blr .global sub_80229208 sub_80229208: @@ -2475,7 +2475,7 @@ sub_80229208: /* 8022920C 0022616C 38 60 00 00 */ li r3, 0 /* 80229210 00226170 80 04 02 EC */ lwz r0, 0x2ec(r4) /* 80229214 00226174 2C 00 00 00 */ cmpwi r0, 0 -/* 80229218 00226178 4C 82 00 20 */ bnelr +/* 80229218 00226178 4C 82 00 20 */ bnelr /* 8022921C 0022617C 80 84 02 B8 */ lwz r4, 0x2b8(r4) /* 80229220 00226180 38 00 00 01 */ li r0, 1 /* 80229224 00226184 2C 04 00 05 */ cmpwi r4, 5 @@ -2485,9 +2485,9 @@ sub_80229208: /* 80229234 00226194 7C 60 1B 78 */ mr r0, r3 lbl_80229238: /* 80229238 00226198 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 8022923C 0022619C 4D 82 00 20 */ beqlr +/* 8022923C 0022619C 4D 82 00 20 */ beqlr /* 80229240 002261A0 38 60 00 01 */ li r3, 1 -/* 80229244 002261A4 4E 80 00 20 */ blr +/* 80229244 002261A4 4E 80 00 20 */ blr .global sub_80229248 sub_80229248: @@ -2510,7 +2510,7 @@ sub_80229248: /* 80229288 002261E8 D0 41 00 24 */ stfs f2, 0x24(r1) /* 8022928C 002261EC D0 21 00 28 */ stfs f1, 0x28(r1) /* 80229290 002261F0 7D 89 03 A6 */ mtctr r12 -/* 80229294 002261F4 4E 80 04 21 */ bctrl +/* 80229294 002261F4 4E 80 04 21 */ bctrl /* 80229298 002261F8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022929C 002261FC 41 82 00 0C */ beq lbl_802292A8 /* 802292A0 00226200 C0 22 B5 FC */ lfs f1, lbl_805AD31C@sda21(r2) @@ -2556,7 +2556,7 @@ lbl_802292AC: /* 80229338 00226298 83 E1 00 4C */ lwz r31, 0x4c(r1) /* 8022933C 0022629C 7C 08 03 A6 */ mtlr r0 /* 80229340 002262A0 38 21 00 60 */ addi r1, r1, 0x60 -/* 80229344 002262A4 4E 80 00 20 */ blr +/* 80229344 002262A4 4E 80 00 20 */ blr .global sub_80229348 sub_80229348: @@ -2606,7 +2606,7 @@ lbl_802293C0: /* 802293E8 00226348 83 81 00 20 */ lwz r28, 0x20(r1) /* 802293EC 0022634C 7C 08 03 A6 */ mtlr r0 /* 802293F0 00226350 38 21 00 30 */ addi r1, r1, 0x30 -/* 802293F4 00226354 4E 80 00 20 */ blr +/* 802293F4 00226354 4E 80 00 20 */ blr .global sub_802293f8 sub_802293f8: @@ -2622,14 +2622,14 @@ lbl_80229410: /* 80229418 00226378 7C 03 00 40 */ cmplw r3, r0 /* 8022941C 0022637C 40 82 00 0C */ bne lbl_80229428 /* 80229420 00226380 38 60 00 01 */ li r3, 1 -/* 80229424 00226384 4E 80 00 20 */ blr +/* 80229424 00226384 4E 80 00 20 */ blr lbl_80229428: /* 80229428 00226388 38 C6 00 02 */ addi r6, r6, 2 lbl_8022942C: /* 8022942C 0022638C 7C 06 28 40 */ cmplw r6, r5 /* 80229430 00226390 40 82 FF E0 */ bne lbl_80229410 /* 80229434 00226394 38 60 00 00 */ li r3, 0 -/* 80229438 00226398 4E 80 00 20 */ blr +/* 80229438 00226398 4E 80 00 20 */ blr .global sub_8022943c sub_8022943c: @@ -2683,7 +2683,7 @@ lbl_802294E0: /* 802294E4 00226444 80 01 00 44 */ lwz r0, 0x44(r1) /* 802294E8 00226448 7C 08 03 A6 */ mtlr r0 /* 802294EC 0022644C 38 21 00 40 */ addi r1, r1, 0x40 -/* 802294F0 00226450 4E 80 00 20 */ blr +/* 802294F0 00226450 4E 80 00 20 */ blr .global sub_802294f4 sub_802294f4: @@ -2781,7 +2781,7 @@ lbl_80229644: /* 80229650 002265B0 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 80229654 002265B4 7C 08 03 A6 */ mtlr r0 /* 80229658 002265B8 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 8022965C 002265BC 4E 80 00 20 */ blr +/* 8022965C 002265BC 4E 80 00 20 */ blr .global sub_80229660 sub_80229660: @@ -2898,7 +2898,7 @@ lbl_802297FC: /* 80229808 00226768 80 01 01 04 */ lwz r0, 0x104(r1) /* 8022980C 0022676C 7C 08 03 A6 */ mtlr r0 /* 80229810 00226770 38 21 01 00 */ addi r1, r1, 0x100 -/* 80229814 00226774 4E 80 00 20 */ blr +/* 80229814 00226774 4E 80 00 20 */ blr .global sub_80229818 sub_80229818: @@ -2964,7 +2964,7 @@ sub_80229818: /* 80229904 00226864 81 83 00 00 */ lwz r12, 0(r3) /* 80229908 00226868 81 8C 02 CC */ lwz r12, 0x2cc(r12) /* 8022990C 0022686C 7D 89 03 A6 */ mtctr r12 -/* 80229910 00226870 4E 80 04 21 */ bctrl +/* 80229910 00226870 4E 80 04 21 */ bctrl /* 80229914 00226874 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80229918 00226878 41 82 01 E4 */ beq lbl_80229AFC /* 8022991C 0022687C 39 DE 07 78 */ addi r14, r30, 0x778 @@ -3146,7 +3146,7 @@ lbl_80229B44: /* 80229BB4 00226B14 80 01 01 04 */ lwz r0, 0x104(r1) /* 80229BB8 00226B18 7C 08 03 A6 */ mtlr r0 /* 80229BBC 00226B1C 38 21 01 00 */ addi r1, r1, 0x100 -/* 80229BC0 00226B20 4E 80 00 20 */ blr +/* 80229BC0 00226B20 4E 80 00 20 */ blr .global sub_80229bc4 sub_80229bc4: @@ -3184,7 +3184,7 @@ sub_80229bc4: /* 80229C40 00226BA0 81 9D 00 00 */ lwz r12, 0(r29) /* 80229C44 00226BA4 81 8C 02 CC */ lwz r12, 0x2cc(r12) /* 80229C48 00226BA8 7D 89 03 A6 */ mtctr r12 -/* 80229C4C 00226BAC 4E 80 04 21 */ bctrl +/* 80229C4C 00226BAC 4E 80 04 21 */ bctrl /* 80229C50 00226BB0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80229C54 00226BB4 41 82 00 7C */ beq lbl_80229CD0 /* 80229C58 00226BB8 3C 80 80 3D */ lis r4, lbl_803D3310@ha @@ -3396,7 +3396,7 @@ lbl_80229F30: /* 80229F54 00226EB4 81 9D 00 00 */ lwz r12, 0(r29) /* 80229F58 00226EB8 81 8C 02 D4 */ lwz r12, 0x2d4(r12) /* 80229F5C 00226EBC 7D 89 03 A6 */ mtctr r12 -/* 80229F60 00226EC0 4E 80 04 21 */ bctrl +/* 80229F60 00226EC0 4E 80 04 21 */ bctrl /* 80229F64 00226EC4 80 AD 95 8C */ lwz r5, lbl_805A814C@sda21(r13) /* 80229F68 00226EC8 38 60 00 00 */ li r3, 0 /* 80229F6C 00226ECC 38 80 00 01 */ li r4, 1 @@ -3446,7 +3446,7 @@ lbl_8022A008: /* 8022A018 00226F78 80 01 01 34 */ lwz r0, 0x134(r1) /* 8022A01C 00226F7C 7C 08 03 A6 */ mtlr r0 /* 8022A020 00226F80 38 21 01 30 */ addi r1, r1, 0x130 -/* 8022A024 00226F84 4E 80 00 20 */ blr +/* 8022A024 00226F84 4E 80 00 20 */ blr .global CallForBackup__12CElitePirateFR13CStateManager9EStateMsgf CallForBackup__12CElitePirateFR13CStateManager9EStateMsgf: @@ -3566,7 +3566,7 @@ lbl_8022A1C4: /* 8022A1C8 00227128 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8022A1CC 0022712C 7C 08 03 A6 */ mtlr r0 /* 8022A1D0 00227130 38 21 00 30 */ addi r1, r1, 0x30 -/* 8022A1D4 00227134 4E 80 00 20 */ blr +/* 8022A1D4 00227134 4E 80 00 20 */ blr .global Cover__12CElitePirateFR13CStateManager9EStateMsgf Cover__12CElitePirateFR13CStateManager9EStateMsgf: @@ -3600,7 +3600,7 @@ lbl_8022A22C: /* 8022A23C 0022719C 81 9D 00 00 */ lwz r12, 0(r29) /* 8022A240 002271A0 81 8C 02 CC */ lwz r12, 0x2cc(r12) /* 8022A244 002271A4 7D 89 03 A6 */ mtctr r12 -/* 8022A248 002271A8 4E 80 04 21 */ bctrl +/* 8022A248 002271A8 4E 80 04 21 */ bctrl /* 8022A24C 002271AC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022A250 002271B0 41 82 00 3C */ beq lbl_8022A28C /* 8022A254 002271B4 A0 1D 07 70 */ lhz r0, 0x770(r29) @@ -3646,7 +3646,7 @@ lbl_8022A28C: /* 8022A2F0 00227250 C0 22 B5 B8 */ lfs f1, lbl_805AD2D8@sda21(r2) /* 8022A2F4 00227254 81 8C 01 9C */ lwz r12, 0x19c(r12) /* 8022A2F8 00227258 7D 89 03 A6 */ mtctr r12 -/* 8022A2FC 0022725C 4E 80 04 21 */ bctrl +/* 8022A2FC 0022725C 4E 80 04 21 */ bctrl /* 8022A300 00227260 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022A304 00227264 41 82 03 80 */ beq lbl_8022A684 /* 8022A308 00227268 80 7D 04 50 */ lwz r3, 0x450(r29) @@ -3676,7 +3676,7 @@ lbl_8022A354: /* 8022A360 002272C0 C0 22 B5 B8 */ lfs f1, lbl_805AD2D8@sda21(r2) /* 8022A364 002272C4 81 8C 01 90 */ lwz r12, 0x190(r12) /* 8022A368 002272C8 7D 89 03 A6 */ mtctr r12 -/* 8022A36C 002272CC 4E 80 04 21 */ bctrl +/* 8022A36C 002272CC 4E 80 04 21 */ bctrl /* 8022A370 002272D0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022A374 002272D4 41 82 00 10 */ beq lbl_8022A384 /* 8022A378 002272D8 C0 1D 07 A8 */ lfs f0, 0x7a8(r29) @@ -3692,7 +3692,7 @@ lbl_8022A388: /* 8022A398 002272F8 81 9D 00 00 */ lwz r12, 0(r29) /* 8022A39C 002272FC 81 8C 01 9C */ lwz r12, 0x19c(r12) /* 8022A3A0 00227300 7D 89 03 A6 */ mtctr r12 -/* 8022A3A4 00227304 4E 80 04 21 */ bctrl +/* 8022A3A4 00227304 4E 80 04 21 */ bctrl /* 8022A3A8 00227308 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022A3AC 0022730C 40 82 00 40 */ bne lbl_8022A3EC /* 8022A3B0 00227310 7F A3 EB 78 */ mr r3, r29 @@ -3701,7 +3701,7 @@ lbl_8022A388: /* 8022A3BC 0022731C C0 22 B5 B8 */ lfs f1, lbl_805AD2D8@sda21(r2) /* 8022A3C0 00227320 81 8C 01 90 */ lwz r12, 0x190(r12) /* 8022A3C4 00227324 7D 89 03 A6 */ mtctr r12 -/* 8022A3C8 00227328 4E 80 04 21 */ bctrl +/* 8022A3C8 00227328 4E 80 04 21 */ bctrl /* 8022A3CC 0022732C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022A3D0 00227330 40 82 00 1C */ bne lbl_8022A3EC /* 8022A3D4 00227334 FC 20 F8 90 */ fmr f1, f31 @@ -3717,7 +3717,7 @@ lbl_8022A3EC: /* 8022A3F8 00227358 C0 22 B5 B8 */ lfs f1, lbl_805AD2D8@sda21(r2) /* 8022A3FC 0022735C 81 8C 01 90 */ lwz r12, 0x190(r12) /* 8022A400 00227360 7D 89 03 A6 */ mtctr r12 -/* 8022A404 00227364 4E 80 04 21 */ bctrl +/* 8022A404 00227364 4E 80 04 21 */ bctrl /* 8022A408 00227368 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022A40C 0022736C 41 82 00 F4 */ beq lbl_8022A500 /* 8022A410 00227370 C0 5D 00 38 */ lfs f2, 0x38(r29) @@ -3789,7 +3789,7 @@ lbl_8022A500: /* 8022A50C 0022746C C0 22 B5 B8 */ lfs f1, lbl_805AD2D8@sda21(r2) /* 8022A510 00227470 81 8C 01 E8 */ lwz r12, 0x1e8(r12) /* 8022A514 00227474 7D 89 03 A6 */ mtctr r12 -/* 8022A518 00227478 4E 80 04 21 */ bctrl +/* 8022A518 00227478 4E 80 04 21 */ bctrl /* 8022A51C 0022747C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022A520 00227480 41 82 00 CC */ beq lbl_8022A5EC /* 8022A524 00227484 80 DD 00 64 */ lwz r6, 0x64(r29) @@ -3803,7 +3803,7 @@ lbl_8022A500: /* 8022A544 002274A4 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 8022A548 002274A8 EC 21 00 32 */ fmuls f1, f1, f0 /* 8022A54C 002274AC 7D 89 03 A6 */ mtctr r12 -/* 8022A550 002274B0 4E 80 04 21 */ bctrl +/* 8022A550 002274B0 4E 80 04 21 */ bctrl /* 8022A554 002274B4 C0 21 00 38 */ lfs f1, 0x38(r1) /* 8022A558 002274B8 38 61 00 7C */ addi r3, r1, 0x7c /* 8022A55C 002274BC C0 1D 00 50 */ lfs f0, 0x50(r29) @@ -3862,7 +3862,7 @@ lbl_8022A60C: /* 8022A628 00227588 81 9D 00 00 */ lwz r12, 0(r29) /* 8022A62C 0022758C 81 8C 02 CC */ lwz r12, 0x2cc(r12) /* 8022A630 00227590 7D 89 03 A6 */ mtctr r12 -/* 8022A634 00227594 4E 80 04 21 */ bctrl +/* 8022A634 00227594 4E 80 04 21 */ bctrl /* 8022A638 00227598 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022A63C 0022759C 41 82 00 38 */ beq lbl_8022A674 /* 8022A640 002275A0 A0 1D 07 70 */ lhz r0, 0x770(r29) @@ -3892,7 +3892,7 @@ lbl_8022A684: /* 8022A698 002275F8 83 A1 00 C4 */ lwz r29, 0xc4(r1) /* 8022A69C 002275FC 7C 08 03 A6 */ mtlr r0 /* 8022A6A0 00227600 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 8022A6A4 00227604 4E 80 00 20 */ blr +/* 8022A6A4 00227604 4E 80 00 20 */ blr .global Attack__12CElitePirateFR13CStateManager9EStateMsgf Attack__12CElitePirateFR13CStateManager9EStateMsgf: @@ -4048,7 +4048,7 @@ lbl_8022A8A0: /* 8022A8D8 00227838 81 83 00 00 */ lwz r12, 0(r3) /* 8022A8DC 0022783C 81 8C 01 DC */ lwz r12, 0x1dc(r12) /* 8022A8E0 00227840 7D 89 03 A6 */ mtctr r12 -/* 8022A8E4 00227844 4E 80 04 21 */ bctrl +/* 8022A8E4 00227844 4E 80 04 21 */ bctrl /* 8022A8E8 00227848 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022A8EC 0022784C 41 82 01 7C */ beq lbl_8022AA68 /* 8022A8F0 00227850 3C A0 80 3E */ lis r5, lbl_803DAA68@ha @@ -4154,7 +4154,7 @@ lbl_8022AA68: /* 8022AA70 002279D0 83 C1 00 48 */ lwz r30, 0x48(r1) /* 8022AA74 002279D4 7C 08 03 A6 */ mtlr r0 /* 8022AA78 002279D8 38 21 00 50 */ addi r1, r1, 0x50 -/* 8022AA7C 002279DC 4E 80 00 20 */ blr +/* 8022AA7C 002279DC 4E 80 00 20 */ blr .global SpecialAttack__12CElitePirateFR13CStateManager9EStateMsgf SpecialAttack__12CElitePirateFR13CStateManager9EStateMsgf: @@ -4274,7 +4274,7 @@ lbl_8022AC18: /* 8022AC1C 00227B7C 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8022AC20 00227B80 7C 08 03 A6 */ mtlr r0 /* 8022AC24 00227B84 38 21 00 30 */ addi r1, r1, 0x30 -/* 8022AC28 00227B88 4E 80 00 20 */ blr +/* 8022AC28 00227B88 4E 80 00 20 */ blr .global ProjectileAttack__12CElitePirateFR13CStateManager9EStateMsgf ProjectileAttack__12CElitePirateFR13CStateManager9EStateMsgf: @@ -4385,7 +4385,7 @@ lbl_8022ADA0: /* 8022ADA4 00227D04 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8022ADA8 00227D08 7C 08 03 A6 */ mtlr r0 /* 8022ADAC 00227D0C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8022ADB0 00227D10 4E 80 00 20 */ blr +/* 8022ADB0 00227D10 4E 80 00 20 */ blr .global Generate__12CElitePirateFR13CStateManager9EStateMsgf Generate__12CElitePirateFR13CStateManager9EStateMsgf: @@ -4427,7 +4427,7 @@ lbl_8022AE28: /* 8022AE2C 00227D8C C0 22 B5 B8 */ lfs f1, lbl_805AD2D8@sda21(r2) /* 8022AE30 00227D90 81 8C 01 E8 */ lwz r12, 0x1e8(r12) /* 8022AE34 00227D94 7D 89 03 A6 */ mtctr r12 -/* 8022AE38 00227D98 4E 80 04 21 */ bctrl +/* 8022AE38 00227D98 4E 80 04 21 */ bctrl /* 8022AE3C 00227D9C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022AE40 00227DA0 41 82 00 A4 */ beq lbl_8022AEE4 /* 8022AE44 00227DA4 80 9F 08 4C */ lwz r4, 0x84c(r31) @@ -4551,14 +4551,14 @@ lbl_8022AFF0: /* 8022B008 00227F68 38 A0 00 01 */ li r5, 1 /* 8022B00C 00227F6C 81 8C 02 D8 */ lwz r12, 0x2d8(r12) /* 8022B010 00227F70 7D 89 03 A6 */ mtctr r12 -/* 8022B014 00227F74 4E 80 04 21 */ bctrl +/* 8022B014 00227F74 4E 80 04 21 */ bctrl lbl_8022B018: /* 8022B018 00227F78 80 01 00 74 */ lwz r0, 0x74(r1) /* 8022B01C 00227F7C 83 E1 00 6C */ lwz r31, 0x6c(r1) /* 8022B020 00227F80 83 C1 00 68 */ lwz r30, 0x68(r1) /* 8022B024 00227F84 7C 08 03 A6 */ mtlr r0 /* 8022B028 00227F88 38 21 00 70 */ addi r1, r1, 0x70 -/* 8022B02C 00227F8C 4E 80 00 20 */ blr +/* 8022B02C 00227F8C 4E 80 00 20 */ blr .global Patrol__12CElitePirateFR13CStateManager9EStateMsgf Patrol__12CElitePirateFR13CStateManager9EStateMsgf: @@ -4599,7 +4599,7 @@ lbl_8022B08C: /* 8022B0B0 00228010 83 A1 00 0C */ lwz r29, 0xc(r1) /* 8022B0B4 00228014 7C 08 03 A6 */ mtlr r0 /* 8022B0B8 00228018 38 21 00 20 */ addi r1, r1, 0x20 -/* 8022B0BC 0022801C 4E 80 00 20 */ blr +/* 8022B0BC 0022801C 4E 80 00 20 */ blr .global TargetPatrol__12CElitePirateFR13CStateManager9EStateMsgf TargetPatrol__12CElitePirateFR13CStateManager9EStateMsgf: @@ -4635,7 +4635,7 @@ lbl_8022B114: /* 8022B12C 0022808C C0 22 B5 B8 */ lfs f1, lbl_805AD2D8@sda21(r2) /* 8022B130 00228090 81 8C 01 C0 */ lwz r12, 0x1c0(r12) /* 8022B134 00228094 7D 89 03 A6 */ mtctr r12 -/* 8022B138 00228098 4E 80 04 21 */ bctrl +/* 8022B138 00228098 4E 80 04 21 */ bctrl /* 8022B13C 0022809C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022B140 002280A0 41 82 00 28 */ beq lbl_8022B168 /* 8022B144 002280A4 FC 20 F8 90 */ fmr f1, f31 @@ -4662,7 +4662,7 @@ lbl_8022B174: /* 8022B190 002280F0 81 9D 00 00 */ lwz r12, 0(r29) /* 8022B194 002280F4 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 8022B198 002280F8 7D 89 03 A6 */ mtctr r12 -/* 8022B19C 002280FC 4E 80 04 21 */ bctrl +/* 8022B19C 002280FC 4E 80 04 21 */ bctrl /* 8022B1A0 00228100 28 03 00 00 */ cmplwi r3, 0 /* 8022B1A4 00228104 41 82 00 C8 */ beq lbl_8022B26C /* 8022B1A8 00228108 FC 20 F8 90 */ fmr f1, f31 @@ -4676,7 +4676,7 @@ lbl_8022B1C0: /* 8022B1C4 00228124 C0 22 B5 B8 */ lfs f1, lbl_805AD2D8@sda21(r2) /* 8022B1C8 00228128 81 8C 01 90 */ lwz r12, 0x190(r12) /* 8022B1CC 0022812C 7D 89 03 A6 */ mtctr r12 -/* 8022B1D0 00228130 4E 80 04 21 */ bctrl +/* 8022B1D0 00228130 4E 80 04 21 */ bctrl /* 8022B1D4 00228134 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022B1D8 00228138 40 82 00 1C */ bne lbl_8022B1F4 /* 8022B1DC 0022813C FC 20 F8 90 */ fmr f1, f31 @@ -4726,7 +4726,7 @@ lbl_8022B26C: /* 8022B280 002281E0 83 A1 00 34 */ lwz r29, 0x34(r1) /* 8022B284 002281E4 7C 08 03 A6 */ mtlr r0 /* 8022B288 002281E8 38 21 00 50 */ addi r1, r1, 0x50 -/* 8022B28C 002281EC 4E 80 00 20 */ blr +/* 8022B28C 002281EC 4E 80 00 20 */ blr .global Taunt__12CElitePirateFR13CStateManager9EStateMsgf Taunt__12CElitePirateFR13CStateManager9EStateMsgf: @@ -4817,7 +4817,7 @@ lbl_8022B3BC: /* 8022B3C0 00228320 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8022B3C4 00228324 7C 08 03 A6 */ mtlr r0 /* 8022B3C8 00228328 38 21 00 20 */ addi r1, r1, 0x20 -/* 8022B3CC 0022832C 4E 80 00 20 */ blr +/* 8022B3CC 0022832C 4E 80 00 20 */ blr .global PathFind__12CElitePirateFR13CStateManager9EStateMsgf PathFind__12CElitePirateFR13CStateManager9EStateMsgf: @@ -4887,7 +4887,7 @@ lbl_8022B42C: /* 8022B4C4 00228424 81 9F 00 00 */ lwz r12, 0(r31) /* 8022B4C8 00228428 81 8C 01 9C */ lwz r12, 0x19c(r12) /* 8022B4CC 0022842C 7D 89 03 A6 */ mtctr r12 -/* 8022B4D0 00228430 4E 80 04 21 */ bctrl +/* 8022B4D0 00228430 4E 80 04 21 */ bctrl /* 8022B4D4 00228434 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022B4D8 00228438 41 82 02 9C */ beq lbl_8022B774 /* 8022B4DC 0022843C 80 7F 04 50 */ lwz r3, 0x450(r31) @@ -4908,7 +4908,7 @@ lbl_8022B504: /* 8022B510 00228470 C0 22 B5 B8 */ lfs f1, lbl_805AD2D8@sda21(r2) /* 8022B514 00228474 81 8C 01 9C */ lwz r12, 0x19c(r12) /* 8022B518 00228478 7D 89 03 A6 */ mtctr r12 -/* 8022B51C 0022847C 4E 80 04 21 */ bctrl +/* 8022B51C 0022847C 4E 80 04 21 */ bctrl /* 8022B520 00228480 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022B524 00228484 40 82 00 40 */ bne lbl_8022B564 /* 8022B528 00228488 7F E3 FB 78 */ mr r3, r31 @@ -4917,7 +4917,7 @@ lbl_8022B504: /* 8022B534 00228494 C0 22 B5 B8 */ lfs f1, lbl_805AD2D8@sda21(r2) /* 8022B538 00228498 81 8C 01 90 */ lwz r12, 0x190(r12) /* 8022B53C 0022849C 7D 89 03 A6 */ mtctr r12 -/* 8022B540 002284A0 4E 80 04 21 */ bctrl +/* 8022B540 002284A0 4E 80 04 21 */ bctrl /* 8022B544 002284A4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022B548 002284A8 40 82 00 1C */ bne lbl_8022B564 /* 8022B54C 002284AC FC 20 F0 90 */ fmr f1, f30 @@ -4933,7 +4933,7 @@ lbl_8022B564: /* 8022B570 002284D0 C0 22 B5 B8 */ lfs f1, lbl_805AD2D8@sda21(r2) /* 8022B574 002284D4 81 8C 01 90 */ lwz r12, 0x190(r12) /* 8022B578 002284D8 7D 89 03 A6 */ mtctr r12 -/* 8022B57C 002284DC 4E 80 04 21 */ bctrl +/* 8022B57C 002284DC 4E 80 04 21 */ bctrl /* 8022B580 002284E0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022B584 002284E4 41 82 00 F4 */ beq lbl_8022B678 /* 8022B588 002284E8 C0 5F 00 38 */ lfs f2, 0x38(r31) @@ -5005,7 +5005,7 @@ lbl_8022B678: /* 8022B684 002285E4 C0 22 B5 B8 */ lfs f1, lbl_805AD2D8@sda21(r2) /* 8022B688 002285E8 81 8C 01 E8 */ lwz r12, 0x1e8(r12) /* 8022B68C 002285EC 7D 89 03 A6 */ mtctr r12 -/* 8022B690 002285F0 4E 80 04 21 */ bctrl +/* 8022B690 002285F0 4E 80 04 21 */ bctrl /* 8022B694 002285F4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022B698 002285F8 41 82 00 DC */ beq lbl_8022B774 /* 8022B69C 002285FC 80 DF 00 64 */ lwz r6, 0x64(r31) @@ -5019,7 +5019,7 @@ lbl_8022B678: /* 8022B6BC 0022861C 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 8022B6C0 00228620 EC 21 00 32 */ fmuls f1, f1, f0 /* 8022B6C4 00228624 7D 89 03 A6 */ mtctr r12 -/* 8022B6C8 00228628 4E 80 04 21 */ bctrl +/* 8022B6C8 00228628 4E 80 04 21 */ bctrl /* 8022B6CC 0022862C C0 21 00 20 */ lfs f1, 0x20(r1) /* 8022B6D0 00228630 38 61 00 64 */ addi r3, r1, 0x64 /* 8022B6D4 00228634 C0 1F 00 50 */ lfs f0, 0x50(r31) @@ -5074,7 +5074,7 @@ lbl_8022B774: /* 8022B790 002286F0 83 A1 00 B4 */ lwz r29, 0xb4(r1) /* 8022B794 002286F4 7C 08 03 A6 */ mtlr r0 /* 8022B798 002286F8 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 8022B79C 002286FC 4E 80 00 20 */ blr +/* 8022B79C 002286FC 4E 80 00 20 */ blr .global Halt__12CElitePirateFR13CStateManager9EStateMsgf Halt__12CElitePirateFR13CStateManager9EStateMsgf: @@ -5203,7 +5203,7 @@ lbl_8022B96C: /* 8022B978 002288D8 83 A1 00 44 */ lwz r29, 0x44(r1) /* 8022B97C 002288DC 7C 08 03 A6 */ mtlr r0 /* 8022B980 002288E0 38 21 00 50 */ addi r1, r1, 0x50 -/* 8022B984 002288E4 4E 80 00 20 */ blr +/* 8022B984 002288E4 4E 80 00 20 */ blr .global Run__12CElitePirateFR13CStateManager9EStateMsgf Run__12CElitePirateFR13CStateManager9EStateMsgf: @@ -5266,7 +5266,7 @@ lbl_8022BA58: /* 8022BA5C 002289BC C0 22 B5 B8 */ lfs f1, lbl_805AD2D8@sda21(r2) /* 8022BA60 002289C0 81 8C 01 90 */ lwz r12, 0x190(r12) /* 8022BA64 002289C4 7D 89 03 A6 */ mtctr r12 -/* 8022BA68 002289C8 4E 80 04 21 */ bctrl +/* 8022BA68 002289C8 4E 80 04 21 */ bctrl /* 8022BA6C 002289CC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022BA70 002289D0 40 82 00 1C */ bne lbl_8022BA8C /* 8022BA74 002289D4 FC 20 F8 90 */ fmr f1, f31 @@ -5345,7 +5345,7 @@ lbl_8022BB7C: /* 8022BB88 00228AE8 C0 22 B5 B8 */ lfs f1, lbl_805AD2D8@sda21(r2) /* 8022BB8C 00228AEC 81 8C 01 E8 */ lwz r12, 0x1e8(r12) /* 8022BB90 00228AF0 7D 89 03 A6 */ mtctr r12 -/* 8022BB94 00228AF4 4E 80 04 21 */ bctrl +/* 8022BB94 00228AF4 4E 80 04 21 */ bctrl /* 8022BB98 00228AF8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022BB9C 00228AFC 41 82 01 00 */ beq lbl_8022BC9C /* 8022BBA0 00228B00 80 DE 00 64 */ lwz r6, 0x64(r30) @@ -5359,7 +5359,7 @@ lbl_8022BB7C: /* 8022BBC0 00228B20 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 8022BBC4 00228B24 EC 21 00 32 */ fmuls f1, f1, f0 /* 8022BBC8 00228B28 7D 89 03 A6 */ mtctr r12 -/* 8022BBCC 00228B2C 4E 80 04 21 */ bctrl +/* 8022BBCC 00228B2C 4E 80 04 21 */ bctrl /* 8022BBD0 00228B30 C0 21 00 20 */ lfs f1, 0x20(r1) /* 8022BBD4 00228B34 38 61 00 64 */ addi r3, r1, 0x64 /* 8022BBD8 00228B38 C0 1E 00 50 */ lfs f0, 0x50(r30) @@ -5421,7 +5421,7 @@ lbl_8022BC9C: /* 8022BCB0 00228C10 83 A1 00 B4 */ lwz r29, 0xb4(r1) /* 8022BCB4 00228C14 7C 08 03 A6 */ mtlr r0 /* 8022BCB8 00228C18 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 8022BCBC 00228C1C 4E 80 00 20 */ blr +/* 8022BCBC 00228C1C 4E 80 00 20 */ blr .global sub_8022bcc0 sub_8022bcc0: @@ -5429,7 +5429,7 @@ sub_8022bcc0: /* 8022BCC4 00228C24 20 00 00 03 */ subfic r0, r0, 3 /* 8022BCC8 00228C28 7C 00 00 34 */ cntlzw r0, r0 /* 8022BCCC 00228C2C 54 03 D9 7E */ srwi r3, r0, 5 -/* 8022BCD0 00228C30 4E 80 00 20 */ blr +/* 8022BCD0 00228C30 4E 80 00 20 */ blr .global AggressionCheck__12CElitePirateFR13CStateManagerf AggressionCheck__12CElitePirateFR13CStateManagerf: @@ -5447,7 +5447,7 @@ AggressionCheck__12CElitePirateFR13CStateManagerf: /* 8022BD00 00228C60 81 83 00 00 */ lwz r12, 0(r3) /* 8022BD04 00228C64 81 8C 01 90 */ lwz r12, 0x190(r12) /* 8022BD08 00228C68 7D 89 03 A6 */ mtctr r12 -/* 8022BD0C 00228C6C 4E 80 04 21 */ bctrl +/* 8022BD0C 00228C6C 4E 80 04 21 */ bctrl /* 8022BD10 00228C70 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022BD14 00228C74 40 82 00 6C */ bne lbl_8022BD80 /* 8022BD18 00228C78 88 1E 09 88 */ lbz r0, 0x988(r30) @@ -5485,7 +5485,7 @@ lbl_8022BD84: /* 8022BD8C 00228CEC 83 C1 00 08 */ lwz r30, 8(r1) /* 8022BD90 00228CF0 7C 08 03 A6 */ mtlr r0 /* 8022BD94 00228CF4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8022BD98 00228CF8 4E 80 00 20 */ blr +/* 8022BD98 00228CF8 4E 80 00 20 */ blr .global TooClose__12CElitePirateFR13CStateManagerf TooClose__12CElitePirateFR13CStateManagerf: @@ -5507,7 +5507,7 @@ TooClose__12CElitePirateFR13CStateManagerf: /* 8022BDD8 00228D38 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8022BDDC 00228D3C 7C 00 00 26 */ mfcr r0 /* 8022BDE0 00228D40 54 03 0F FE */ srwi r3, r0, 0x1f -/* 8022BDE4 00228D44 4E 80 00 20 */ blr +/* 8022BDE4 00228D44 4E 80 00 20 */ blr .global InPosition__12CElitePirateFR13CStateManagerf InPosition__12CElitePirateFR13CStateManagerf: @@ -5527,13 +5527,13 @@ InPosition__12CElitePirateFR13CStateManagerf: /* 8022BE1C 00228D7C FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8022BE20 00228D80 7C 00 00 26 */ mfcr r0 /* 8022BE24 00228D84 54 03 0F FE */ srwi r3, r0, 0x1f -/* 8022BE28 00228D88 4E 80 00 20 */ blr +/* 8022BE28 00228D88 4E 80 00 20 */ blr .global ShotAt__12CElitePirateFR13CStateManagerf ShotAt__12CElitePirateFR13CStateManagerf: /* 8022BE2C 00228D8C 88 03 09 88 */ lbz r0, 0x988(r3) /* 8022BE30 00228D90 54 03 E7 FE */ rlwinm r3, r0, 0x1c, 0x1f, 0x1f -/* 8022BE34 00228D94 4E 80 00 20 */ blr +/* 8022BE34 00228D94 4E 80 00 20 */ blr .global sub_8022be38 sub_8022be38: @@ -5553,10 +5553,10 @@ sub_8022be38: /* 8022BE6C 00228DCC 4C 41 13 82 */ cror 2, 1, 2 /* 8022BE70 00228DD0 7C 00 00 26 */ mfcr r0 /* 8022BE74 00228DD4 54 03 1F FE */ rlwinm r3, r0, 3, 0x1f, 0x1f -/* 8022BE78 00228DD8 4E 80 00 20 */ blr +/* 8022BE78 00228DD8 4E 80 00 20 */ blr lbl_8022BE7C: /* 8022BE7C 00228DDC 38 60 00 00 */ li r3, 0 -/* 8022BE80 00228DE0 4E 80 00 20 */ blr +/* 8022BE80 00228DE0 4E 80 00 20 */ blr .global ShouldCallForBackup__12CElitePirateFR13CStateManagerf ShouldCallForBackup__12CElitePirateFR13CStateManagerf: @@ -5570,7 +5570,7 @@ ShouldCallForBackup__12CElitePirateFR13CStateManagerf: /* 8022BEA0 00228E00 80 01 00 14 */ lwz r0, 0x14(r1) /* 8022BEA4 00228E04 7C 08 03 A6 */ mtlr r0 /* 8022BEA8 00228E08 38 21 00 10 */ addi r1, r1, 0x10 -/* 8022BEAC 00228E0C 4E 80 00 20 */ blr +/* 8022BEAC 00228E0C 4E 80 00 20 */ blr .global ShouldSpecialAttack__12CElitePirateFR13CStateManagerf ShouldSpecialAttack__12CElitePirateFR13CStateManagerf: @@ -5594,7 +5594,7 @@ ShouldSpecialAttack__12CElitePirateFR13CStateManagerf: /* 8022BEF4 00228E54 38 61 00 08 */ addi r3, r1, 8 /* 8022BEF8 00228E58 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 8022BEFC 00228E5C 7D 89 03 A6 */ mtctr r12 -/* 8022BF00 00228E60 4E 80 04 21 */ bctrl +/* 8022BF00 00228E60 4E 80 04 21 */ bctrl /* 8022BF04 00228E64 C0 21 00 0C */ lfs f1, 0xc(r1) /* 8022BF08 00228E68 C0 1F 00 50 */ lfs f0, 0x50(r31) /* 8022BF0C 00228E6C C0 5F 02 FC */ lfs f2, 0x2fc(r31) @@ -5631,7 +5631,7 @@ lbl_8022BF7C: /* 8022BF80 00228EE0 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8022BF84 00228EE4 7C 08 03 A6 */ mtlr r0 /* 8022BF88 00228EE8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8022BF8C 00228EEC 4E 80 00 20 */ blr +/* 8022BF8C 00228EEC 4E 80 00 20 */ blr .global ShouldAttack__12CElitePirateFR13CStateManagerf ShouldAttack__12CElitePirateFR13CStateManagerf: @@ -5660,7 +5660,7 @@ ShouldAttack__12CElitePirateFR13CStateManagerf: /* 8022BFE8 00228F48 C0 22 B5 B8 */ lfs f1, lbl_805AD2D8@sda21(r2) /* 8022BFEC 00228F4C 81 8C 01 E8 */ lwz r12, 0x1e8(r12) /* 8022BFF0 00228F50 7D 89 03 A6 */ mtctr r12 -/* 8022BFF4 00228F54 4E 80 04 21 */ bctrl +/* 8022BFF4 00228F54 4E 80 04 21 */ bctrl /* 8022BFF8 00228F58 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8022BFFC 00228F5C 7C 00 00 34 */ cntlzw r0, r0 /* 8022C000 00228F60 54 03 D9 7E */ srwi r3, r0, 5 @@ -5671,7 +5671,7 @@ lbl_8022C00C: /* 8022C00C 00228F6C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8022C010 00228F70 7C 08 03 A6 */ mtlr r0 /* 8022C014 00228F74 38 21 00 10 */ addi r1, r1, 0x10 -/* 8022C018 00228F78 4E 80 00 20 */ blr +/* 8022C018 00228F78 4E 80 00 20 */ blr .global sub_8022c01c sub_8022c01c: @@ -5707,7 +5707,7 @@ sub_8022c01c: /* 8022C090 00228FF0 81 84 00 00 */ lwz r12, 0(r4) /* 8022C094 00228FF4 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 8022C098 00228FF8 7D 89 03 A6 */ mtctr r12 -/* 8022C09C 00228FFC 4E 80 04 21 */ bctrl +/* 8022C09C 00228FFC 4E 80 04 21 */ bctrl /* 8022C0A0 00229000 C0 81 00 38 */ lfs f4, 0x38(r1) /* 8022C0A4 00229004 C0 61 00 3C */ lfs f3, 0x3c(r1) /* 8022C0A8 00229008 C0 41 00 40 */ lfs f2, 0x40(r1) @@ -5734,7 +5734,7 @@ sub_8022c01c: /* 8022C0FC 0022905C C0 22 B5 B8 */ lfs f1, lbl_805AD2D8@sda21(r2) /* 8022C100 00229060 81 8C 01 E8 */ lwz r12, 0x1e8(r12) /* 8022C104 00229064 7D 89 03 A6 */ mtctr r12 -/* 8022C108 00229068 4E 80 04 21 */ bctrl +/* 8022C108 00229068 4E 80 04 21 */ bctrl /* 8022C10C 0022906C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022C110 00229070 40 82 01 4C */ bne lbl_8022C25C /* 8022C114 00229074 7F A4 EB 78 */ mr r4, r29 @@ -5830,7 +5830,7 @@ lbl_8022C260: /* 8022C274 002291D4 83 A1 00 94 */ lwz r29, 0x94(r1) /* 8022C278 002291D8 7C 08 03 A6 */ mtlr r0 /* 8022C27C 002291DC 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 8022C280 002291E0 4E 80 00 20 */ blr +/* 8022C280 002291E0 4E 80 00 20 */ blr .global ShouldFire__12CElitePirateFR13CStateManagerf ShouldFire__12CElitePirateFR13CStateManagerf: @@ -5844,7 +5844,7 @@ ShouldFire__12CElitePirateFR13CStateManagerf: /* 8022C2A0 00229200 80 01 00 14 */ lwz r0, 0x14(r1) /* 8022C2A4 00229204 7C 08 03 A6 */ mtlr r0 /* 8022C2A8 00229208 38 21 00 10 */ addi r1, r1, 0x10 -/* 8022C2AC 0022920C 4E 80 00 20 */ blr +/* 8022C2AC 0022920C 4E 80 00 20 */ blr .global ShouldTaunt__12CElitePirateFR13CStateManagerf ShouldTaunt__12CElitePirateFR13CStateManagerf: @@ -5854,7 +5854,7 @@ ShouldTaunt__12CElitePirateFR13CStateManagerf: /* 8022C2BC 0022921C 4C 40 13 82 */ cror 2, 0, 2 /* 8022C2C0 00229220 7C 00 00 26 */ mfcr r0 /* 8022C2C4 00229224 54 03 1F FE */ rlwinm r3, r0, 3, 0x1f, 0x1f -/* 8022C2C8 00229228 4E 80 00 20 */ blr +/* 8022C2C8 00229228 4E 80 00 20 */ blr .global ShouldTurn__12CElitePirateFR13CStateManagerf ShouldTurn__12CElitePirateFR13CStateManagerf: @@ -5908,7 +5908,7 @@ ShouldTurn__12CElitePirateFR13CStateManagerf: /* 8022C388 002292E8 80 01 00 64 */ lwz r0, 0x64(r1) /* 8022C38C 002292EC 7C 08 03 A6 */ mtlr r0 /* 8022C390 002292F0 38 21 00 60 */ addi r1, r1, 0x60 -/* 8022C394 002292F4 4E 80 00 20 */ blr +/* 8022C394 002292F4 4E 80 00 20 */ blr .global InDetectionRange__12CElitePirateFR13CStateManagerf InDetectionRange__12CElitePirateFR13CStateManagerf: @@ -5926,7 +5926,7 @@ lbl_8022C3BC: /* 8022C3BC 0022931C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8022C3C0 00229320 7C 08 03 A6 */ mtlr r0 /* 8022C3C4 00229324 38 21 00 10 */ addi r1, r1, 0x10 -/* 8022C3C8 00229328 4E 80 00 20 */ blr +/* 8022C3C8 00229328 4E 80 00 20 */ blr .global SpotPlayer__12CElitePirateFR13CStateManagerf SpotPlayer__12CElitePirateFR13CStateManagerf: @@ -5944,7 +5944,7 @@ lbl_8022C3F0: /* 8022C3F0 00229350 80 01 00 14 */ lwz r0, 0x14(r1) /* 8022C3F4 00229354 7C 08 03 A6 */ mtlr r0 /* 8022C3F8 00229358 38 21 00 10 */ addi r1, r1, 0x10 -/* 8022C3FC 0022935C 4E 80 00 20 */ blr +/* 8022C3FC 0022935C 4E 80 00 20 */ blr .global DoUserAnimEvent__12CElitePirateFR13CStateManagerRC13CInt32POINode14EUserEventType DoUserAnimEvent__12CElitePirateFR13CStateManagerRC13CInt32POINode14EUserEventType: @@ -5971,7 +5971,7 @@ DoUserAnimEvent__12CElitePirateFR13CStateManagerRC13CInt32POINode14EUserEventTyp /* 8022C450 002293B0 38 A5 7D C0 */ addi r5, r5, lbl_803E7DC0@l /* 8022C454 002293B4 7C 05 00 2E */ lwzx r0, r5, r0 /* 8022C458 002293B8 7C 09 03 A6 */ mtctr r0 -/* 8022C45C 002293BC 4E 80 04 20 */ bctr +/* 8022C45C 002293BC 4E 80 04 20 */ bctr .global lbl_8022C460 lbl_8022C460: /* 8022C460 002293C0 A0 7C 07 72 */ lhz r3, 0x772(r28) @@ -6052,7 +6052,7 @@ lbl_8022C4B0: /* 8022C580 002294E0 81 9C 00 00 */ lwz r12, 0(r28) /* 8022C584 002294E4 81 8C 02 D0 */ lwz r12, 0x2d0(r12) /* 8022C588 002294E8 7D 89 03 A6 */ mtctr r12 -/* 8022C58C 002294EC 4E 80 04 21 */ bctrl +/* 8022C58C 002294EC 4E 80 04 21 */ bctrl /* 8022C590 002294F0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022C594 002294F4 41 82 00 0C */ beq lbl_8022C5A0 /* 8022C598 002294F8 C3 C2 B5 D0 */ lfs f30, lbl_805AD2F0@sda21(r2) @@ -6064,7 +6064,7 @@ lbl_8022C5A4: /* 8022C5A8 00229508 81 9C 00 00 */ lwz r12, 0(r28) /* 8022C5AC 0022950C 81 8C 02 D0 */ lwz r12, 0x2d0(r12) /* 8022C5B0 00229510 7D 89 03 A6 */ mtctr r12 -/* 8022C5B4 00229514 4E 80 04 21 */ bctrl +/* 8022C5B4 00229514 4E 80 04 21 */ bctrl /* 8022C5B8 00229518 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022C5BC 0022951C 41 82 00 0C */ beq lbl_8022C5C8 /* 8022C5C0 00229520 C3 A2 B6 10 */ lfs f29, lbl_805AD330@sda21(r2) @@ -6103,7 +6103,7 @@ lbl_8022C5CC: /* 8022C63C 0022959C 81 9C 00 00 */ lwz r12, 0(r28) /* 8022C640 002295A0 81 8C 02 DC */ lwz r12, 0x2dc(r12) /* 8022C644 002295A4 7D 89 03 A6 */ mtctr r12 -/* 8022C648 002295A8 4E 80 04 21 */ bctrl +/* 8022C648 002295A8 4E 80 04 21 */ bctrl /* 8022C64C 002295AC FC 20 E8 90 */ fmr f1, f29 /* 8022C650 002295B0 7F 63 DB 78 */ mr r3, r27 /* 8022C654 002295B4 FC 40 F0 90 */ fmr f2, f30 @@ -6176,7 +6176,7 @@ lbl_8022C728: /* 8022C728 00229688 81 83 00 00 */ lwz r12, 0(r3) /* 8022C72C 0022968C 81 8C 02 CC */ lwz r12, 0x2cc(r12) /* 8022C730 00229690 7D 89 03 A6 */ mtctr r12 -/* 8022C734 00229694 4E 80 04 21 */ bctrl +/* 8022C734 00229694 4E 80 04 21 */ bctrl /* 8022C738 00229698 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022C73C 0022969C 41 82 00 68 */ beq lbl_8022C7A4 /* 8022C740 002296A0 3B 60 00 00 */ li r27, 0 @@ -6230,23 +6230,23 @@ lbl_8022C7C8: /* 8022C7E4 00229744 80 01 01 E4 */ lwz r0, 0x1e4(r1) /* 8022C7E8 00229748 7C 08 03 A6 */ mtlr r0 /* 8022C7EC 0022974C 38 21 01 E0 */ addi r1, r1, 0x1e0 -/* 8022C7F0 00229750 4E 80 00 20 */ blr +/* 8022C7F0 00229750 4E 80 00 20 */ blr .global GetDamageVulnerability__12CElitePirateCFRC9CVector3fRC9CVector3fRC11CDamageInfo GetDamageVulnerability__12CElitePirateCFRC9CVector3fRC9CVector3fRC11CDamageInfo: /* 8022C7F4 00229754 3C 60 80 57 */ lis r3, lbl_8056D7E8@ha /* 8022C7F8 00229758 38 63 D7 E8 */ addi r3, r3, lbl_8056D7E8@l -/* 8022C7FC 0022975C 4E 80 00 20 */ blr +/* 8022C7FC 0022975C 4E 80 00 20 */ blr .global GetDamageVulnerability__12CElitePirateCFv GetDamageVulnerability__12CElitePirateCFv: /* 8022C800 00229760 3C 60 80 57 */ lis r3, lbl_8056D7E8@ha /* 8022C804 00229764 38 63 D7 E8 */ addi r3, r3, lbl_8056D7E8@l -/* 8022C808 00229768 4E 80 00 20 */ blr +/* 8022C808 00229768 4E 80 00 20 */ blr .global TakeDamage__12CElitePirateFRC9CVector3ff TakeDamage__12CElitePirateFRC9CVector3ff: -/* 8022C80C 0022976C 4E 80 00 20 */ blr +/* 8022C80C 0022976C 4E 80 00 20 */ blr .global GetOrbitPosition__12CElitePirateCFRC13CStateManager GetOrbitPosition__12CElitePirateCFRC13CStateManager: @@ -6283,7 +6283,7 @@ lbl_8022C880: /* 8022C884 002297E4 81 9E 00 00 */ lwz r12, 0(r30) /* 8022C888 002297E8 81 8C 02 CC */ lwz r12, 0x2cc(r12) /* 8022C88C 002297EC 7D 89 03 A6 */ mtctr r12 -/* 8022C890 002297F0 4E 80 04 21 */ bctrl +/* 8022C890 002297F0 4E 80 04 21 */ bctrl /* 8022C894 002297F4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022C898 002297F8 41 82 00 4C */ beq lbl_8022C8E4 /* 8022C89C 002297FC A0 1E 07 70 */ lhz r0, 0x770(r30) @@ -6331,7 +6331,7 @@ lbl_8022C930: /* 8022C93C 0022989C 83 A1 00 64 */ lwz r29, 0x64(r1) /* 8022C940 002298A0 7C 08 03 A6 */ mtlr r0 /* 8022C944 002298A4 38 21 00 70 */ addi r1, r1, 0x70 -/* 8022C948 002298A8 4E 80 00 20 */ blr +/* 8022C948 002298A8 4E 80 00 20 */ blr .global GetAimPosition__12CElitePirateCFRC13CStateManagerf GetAimPosition__12CElitePirateCFRC13CStateManagerf: @@ -6382,7 +6382,7 @@ lbl_8022C9EC: /* 8022C9F8 00229958 7F C5 F3 78 */ mr r5, r30 /* 8022C9FC 0022995C 81 8C 00 48 */ lwz r12, 0x48(r12) /* 8022CA00 00229960 7D 89 03 A6 */ mtctr r12 -/* 8022CA04 00229964 4E 80 04 21 */ bctrl +/* 8022CA04 00229964 4E 80 04 21 */ bctrl lbl_8022CA08: /* 8022CA08 00229968 80 01 00 34 */ lwz r0, 0x34(r1) /* 8022CA0C 0022996C 83 E1 00 2C */ lwz r31, 0x2c(r1) @@ -6391,7 +6391,7 @@ lbl_8022CA08: /* 8022CA18 00229978 83 81 00 20 */ lwz r28, 0x20(r1) /* 8022CA1C 0022997C 7C 08 03 A6 */ mtlr r0 /* 8022CA20 00229980 38 21 00 30 */ addi r1, r1, 0x30 -/* 8022CA24 00229984 4E 80 00 20 */ blr +/* 8022CA24 00229984 4E 80 00 20 */ blr .global KnockBack__12CElitePirateFRC9CVector3fR13CStateManagerRC11CDamageInfo14EKnockBackTypef KnockBack__12CElitePirateFRC9CVector3fR13CStateManagerRC11CDamageInfo14EKnockBackTypef: @@ -6451,7 +6451,7 @@ KnockBack__12CElitePirateFRC9CVector3fR13CStateManagerRC11CDamageInfo14EKnockBac /* 8022CAFC 00229A5C 81 9A 00 00 */ lwz r12, 0(r26) /* 8022CB00 00229A60 81 8C 02 90 */ lwz r12, 0x290(r12) /* 8022CB04 00229A64 7D 89 03 A6 */ mtctr r12 -/* 8022CB08 00229A68 4E 80 04 21 */ bctrl +/* 8022CB08 00229A68 4E 80 04 21 */ bctrl lbl_8022CB0C: /* 8022CB0C 00229A6C E3 E1 00 58 */ psq_l f31, 88(r1), 0, qr0 /* 8022CB10 00229A70 CB E1 00 50 */ lfd f31, 0x50(r1) @@ -6459,7 +6459,7 @@ lbl_8022CB0C: /* 8022CB18 00229A78 80 01 00 64 */ lwz r0, 0x64(r1) /* 8022CB1C 00229A7C 7C 08 03 A6 */ mtlr r0 /* 8022CB20 00229A80 38 21 00 60 */ addi r1, r1, 0x60 -/* 8022CB24 00229A84 4E 80 00 20 */ blr +/* 8022CB24 00229A84 4E 80 00 20 */ blr .global PreRender__12CElitePirateFR13CStateManagerRC14CFrustumPlanes PreRender__12CElitePirateFR13CStateManagerRC14CFrustumPlanes: @@ -6504,7 +6504,7 @@ lbl_8022CBAC: /* 8022CBBC 00229B1C 83 C1 00 28 */ lwz r30, 0x28(r1) /* 8022CBC0 00229B20 7C 08 03 A6 */ mtlr r0 /* 8022CBC4 00229B24 38 21 00 30 */ addi r1, r1, 0x30 -/* 8022CBC8 00229B28 4E 80 00 20 */ blr +/* 8022CBC8 00229B28 4E 80 00 20 */ blr .global AcceptScriptMsg__12CElitePirateF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__12CElitePirateF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -6526,7 +6526,7 @@ AcceptScriptMsg__12CElitePirateF20EScriptObjectMessage9TUniqueIdR13CStateManager /* 8022CC08 00229B68 38 84 7E 20 */ addi r4, r4, lbl_803E7E20@l /* 8022CC0C 00229B6C 7C 04 00 2E */ lwzx r0, r4, r0 /* 8022CC10 00229B70 7C 09 03 A6 */ mtctr r0 -/* 8022CC14 00229B74 4E 80 04 20 */ bctr +/* 8022CC14 00229B74 4E 80 04 20 */ bctr .global lbl_8022CC18 lbl_8022CC18: /* 8022CC18 00229B78 80 7D 04 50 */ lwz r3, 0x450(r29) @@ -6576,7 +6576,7 @@ lbl_8022CCBC: /* 8022CCBC 00229C1C 81 83 00 00 */ lwz r12, 0(r3) /* 8022CCC0 00229C20 81 8C 02 CC */ lwz r12, 0x2cc(r12) /* 8022CCC4 00229C24 7D 89 03 A6 */ mtctr r12 -/* 8022CCC8 00229C28 4E 80 04 21 */ bctrl +/* 8022CCC8 00229C28 4E 80 04 21 */ bctrl /* 8022CCCC 00229C2C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022CCD0 00229C30 41 82 00 14 */ beq lbl_8022CCE4 /* 8022CCD4 00229C34 80 7D 07 30 */ lwz r3, 0x730(r29) @@ -6595,14 +6595,14 @@ lbl_8022CCE4: /* 8022CD04 00229C64 38 80 00 01 */ li r4, 1 /* 8022CD08 00229C68 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 8022CD0C 00229C6C 7D 89 03 A6 */ mtctr r12 -/* 8022CD10 00229C70 4E 80 04 21 */ bctrl +/* 8022CD10 00229C70 4E 80 04 21 */ bctrl /* 8022CD14 00229C74 48 00 06 30 */ b lbl_8022D344 .global lbl_8022CD18 lbl_8022CD18: /* 8022CD18 00229C78 81 83 00 00 */ lwz r12, 0(r3) /* 8022CD1C 00229C7C 81 8C 02 CC */ lwz r12, 0x2cc(r12) /* 8022CD20 00229C80 7D 89 03 A6 */ mtctr r12 -/* 8022CD24 00229C84 4E 80 04 21 */ bctrl +/* 8022CD24 00229C84 4E 80 04 21 */ bctrl /* 8022CD28 00229C88 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022CD2C 00229C8C 41 82 00 14 */ beq lbl_8022CD40 /* 8022CD30 00229C90 80 7D 07 30 */ lwz r3, 0x730(r29) @@ -6625,14 +6625,14 @@ lbl_8022CD40: /* 8022CD70 00229CD0 38 80 00 00 */ li r4, 0 /* 8022CD74 00229CD4 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 8022CD78 00229CD8 7D 89 03 A6 */ mtctr r12 -/* 8022CD7C 00229CDC 4E 80 04 21 */ bctrl +/* 8022CD7C 00229CDC 4E 80 04 21 */ bctrl /* 8022CD80 00229CE0 48 00 05 C4 */ b lbl_8022D344 .global lbl_8022CD84 lbl_8022CD84: /* 8022CD84 00229CE4 81 83 00 00 */ lwz r12, 0(r3) /* 8022CD88 00229CE8 81 8C 02 CC */ lwz r12, 0x2cc(r12) /* 8022CD8C 00229CEC 7D 89 03 A6 */ mtctr r12 -/* 8022CD90 00229CF0 4E 80 04 21 */ bctrl +/* 8022CD90 00229CF0 4E 80 04 21 */ bctrl /* 8022CD94 00229CF4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022CD98 00229CF8 41 82 00 10 */ beq lbl_8022CDA8 /* 8022CD9C 00229CFC 80 7D 07 30 */ lwz r3, 0x730(r29) @@ -6675,7 +6675,7 @@ lbl_8022CE10: /* 8022CE14 00229D74 7F E4 FB 78 */ mr r4, r31 /* 8022CE18 00229D78 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8022CE1C 00229D7C 7D 89 03 A6 */ mtctr r12 -/* 8022CE20 00229D80 4E 80 04 21 */ bctrl +/* 8022CE20 00229D80 4E 80 04 21 */ bctrl /* 8022CE24 00229D84 C0 23 00 00 */ lfs f1, 0(r3) /* 8022CE28 00229D88 C0 02 B5 B8 */ lfs f0, lbl_805AD2D8@sda21(r2) /* 8022CE2C 00229D8C FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -6751,7 +6751,7 @@ lbl_8022CEE0: /* 8022CF3C 00229E9C B0 01 00 54 */ sth r0, 0x54(r1) /* 8022CF40 00229EA0 81 8C 02 B0 */ lwz r12, 0x2b0(r12) /* 8022CF44 00229EA4 7D 89 03 A6 */ mtctr r12 -/* 8022CF48 00229EA8 4E 80 04 21 */ bctrl +/* 8022CF48 00229EA8 4E 80 04 21 */ bctrl /* 8022CF4C 00229EAC 3C 80 80 5A */ lis r4, skZero3f@ha /* 8022CF50 00229EB0 7F E3 FB 78 */ mr r3, r31 /* 8022CF54 00229EB4 39 24 66 A0 */ addi r9, r4, skZero3f@l @@ -6779,7 +6779,7 @@ lbl_8022CF8C: /* 8022CFA8 00229F08 81 9D 00 00 */ lwz r12, 0(r29) /* 8022CFAC 00229F0C 81 8C 02 B0 */ lwz r12, 0x2b0(r12) /* 8022CFB0 00229F10 7D 89 03 A6 */ mtctr r12 -/* 8022CFB4 00229F14 4E 80 04 21 */ bctrl +/* 8022CFB4 00229F14 4E 80 04 21 */ bctrl /* 8022CFB8 00229F18 C0 21 01 00 */ lfs f1, 0x100(r1) /* 8022CFBC 00229F1C 38 60 00 00 */ li r3, 0 /* 8022CFC0 00229F20 C0 02 B5 BC */ lfs f0, lbl_805AD2DC@sda21(r2) @@ -6915,7 +6915,7 @@ lbl_8022D0EC: /* 8022D1B8 0022A118 81 9D 00 00 */ lwz r12, 0(r29) /* 8022D1BC 0022A11C 81 8C 00 88 */ lwz r12, 0x88(r12) /* 8022D1C0 0022A120 7D 89 03 A6 */ mtctr r12 -/* 8022D1C4 0022A124 4E 80 04 21 */ bctrl +/* 8022D1C4 0022A124 4E 80 04 21 */ bctrl /* 8022D1C8 0022A128 A0 01 00 80 */ lhz r0, 0x80(r1) /* 8022D1CC 0022A12C 7F A3 EB 78 */ mr r3, r29 /* 8022D1D0 0022A130 7F 84 E3 78 */ mr r4, r28 @@ -7035,7 +7035,7 @@ lbl_8022D368: /* 8022D374 0022A2D4 80 01 01 94 */ lwz r0, 0x194(r1) /* 8022D378 0022A2D8 7C 08 03 A6 */ mtlr r0 /* 8022D37C 0022A2DC 38 21 01 90 */ addi r1, r1, 0x190 -/* 8022D380 0022A2E0 4E 80 00 20 */ blr +/* 8022D380 0022A2E0 4E 80 00 20 */ blr .global Think__12CElitePirateFfR13CStateManager Think__12CElitePirateFfR13CStateManager: @@ -7060,7 +7060,7 @@ Think__12CElitePirateFfR13CStateManager: /* 8022D3CC 0022A32C 81 9E 00 00 */ lwz r12, 0(r30) /* 8022D3D0 0022A330 81 8C 02 CC */ lwz r12, 0x2cc(r12) /* 8022D3D4 0022A334 7D 89 03 A6 */ mtctr r12 -/* 8022D3D8 0022A338 4E 80 04 21 */ bctrl +/* 8022D3D8 0022A338 4E 80 04 21 */ bctrl /* 8022D3DC 0022A33C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022D3E0 0022A340 41 82 00 18 */ beq lbl_8022D3F8 /* 8022D3E4 0022A344 FC 20 F8 90 */ fmr f1, f31 @@ -7121,7 +7121,7 @@ lbl_8022D4A0: /* 8022D4B0 0022A410 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8022D4B4 0022A414 7C 08 03 A6 */ mtlr r0 /* 8022D4B8 0022A418 38 21 00 30 */ addi r1, r1, 0x30 -/* 8022D4BC 0022A41C 4E 80 00 20 */ blr +/* 8022D4BC 0022A41C 4E 80 00 20 */ blr .global Accept__12CElitePirateFR8IVisitor Accept__12CElitePirateFR8IVisitor: @@ -7134,11 +7134,11 @@ Accept__12CElitePirateFR8IVisitor: /* 8022D4D8 0022A438 7C 04 03 78 */ mr r4, r0 /* 8022D4DC 0022A43C 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 8022D4E0 0022A440 7D 89 03 A6 */ mtctr r12 -/* 8022D4E4 0022A444 4E 80 04 21 */ bctrl +/* 8022D4E4 0022A444 4E 80 04 21 */ bctrl /* 8022D4E8 0022A448 80 01 00 14 */ lwz r0, 0x14(r1) /* 8022D4EC 0022A44C 7C 08 03 A6 */ mtlr r0 /* 8022D4F0 0022A450 38 21 00 10 */ addi r1, r1, 0x10 -/* 8022D4F4 0022A454 4E 80 00 20 */ blr +/* 8022D4F4 0022A454 4E 80 00 20 */ blr .global __dt__12CElitePirateFv __dt__12CElitePirateFv: @@ -7335,7 +7335,7 @@ lbl_8022D774: /* 8022D780 0022A6E0 83 C1 00 08 */ lwz r30, 8(r1) /* 8022D784 0022A6E4 7C 08 03 A6 */ mtlr r0 /* 8022D788 0022A6E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8022D78C 0022A6EC 4E 80 00 20 */ blr +/* 8022D78C 0022A6EC 4E 80 00 20 */ blr .global "__ct__12CElitePirateF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC14CPatternedInfoRC16CActorParametersRC16CElitePirateData" "__ct__12CElitePirateF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC14CPatternedInfoRC16CActorParametersRC16CElitePirateData": @@ -7487,7 +7487,7 @@ lbl_8022D774: /* 8022D9D4 0022A934 81 84 00 00 */ lwz r12, 0(r4) /* 8022D9D8 0022A938 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8022D9DC 0022A93C 7D 89 03 A6 */ mtctr r12 -/* 8022D9E0 0022A940 4E 80 04 21 */ bctrl +/* 8022D9E0 0022A940 4E 80 04 21 */ bctrl /* 8022D9E4 0022A944 3A E1 00 54 */ addi r23, r1, 0x54 /* 8022D9E8 0022A948 38 81 00 24 */ addi r4, r1, 0x24 /* 8022D9EC 0022A94C 7E E3 BB 78 */ mr r3, r23 @@ -7668,7 +7668,7 @@ lbl_8022DB1C: /* 8022DC80 0022ABE0 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 8022DC84 0022ABE4 7C 08 03 A6 */ mtlr r0 /* 8022DC88 0022ABE8 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 8022DC8C 0022ABEC 4E 80 00 20 */ blr +/* 8022DC8C 0022ABEC 4E 80 00 20 */ blr .global __ct__16CElitePirateDataFRC16CElitePirateData __ct__16CElitePirateDataFRC16CElitePirateData: @@ -7786,7 +7786,7 @@ __ct__16CElitePirateDataFRC16CElitePirateData: /* 8022DE4C 0022ADAC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8022DE50 0022ADB0 7C 08 03 A6 */ mtlr r0 /* 8022DE54 0022ADB4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8022DE58 0022ADB8 4E 80 00 20 */ blr +/* 8022DE58 0022ADB8 4E 80 00 20 */ blr .global __ct__16CElitePirateDataFR12CInputStreami __ct__16CElitePirateDataFR12CInputStreami: @@ -7946,7 +7946,7 @@ lbl_8022E0A4: /* 8022E0B8 0022B018 83 A1 00 84 */ lwz r29, 0x84(r1) /* 8022E0BC 0022B01C 7C 08 03 A6 */ mtlr r0 /* 8022E0C0 0022B020 38 21 00 90 */ addi r1, r1, 0x90 -/* 8022E0C4 0022B024 4E 80 00 20 */ blr +/* 8022E0C4 0022B024 4E 80 00 20 */ blr .global __sinit_CElitePirate_cpp __sinit_CElitePirate_cpp: diff --git a/asm/MetroidPrime/Enemies/CEyeBall.s b/asm/MetroidPrime/Enemies/CEyeBall.s index ecf51879..5a84ec63 100644 --- a/asm/MetroidPrime/Enemies/CEyeBall.s +++ b/asm/MetroidPrime/Enemies/CEyeBall.s @@ -281,7 +281,7 @@ lbl_80224714: /* 80224720 00221680 83 C1 00 08 */ lwz r30, 8(r1) /* 80224724 00221684 7C 08 03 A6 */ mtlr r0 /* 80224728 00221688 38 21 00 10 */ addi r1, r1, 0x10 -/* 8022472C 0022168C 4E 80 00 20 */ blr +/* 8022472C 0022168C 4E 80 00 20 */ blr .global Death__8CEyeBallFRC9CVector3fR13CStateManager Death__8CEyeBallFRC9CVector3fR13CStateManager: @@ -324,7 +324,7 @@ Death__8CEyeBallFRC9CVector3fR13CStateManager: /* 802247C0 00221720 80 01 00 54 */ lwz r0, 0x54(r1) /* 802247C4 00221724 7C 08 03 A6 */ mtlr r0 /* 802247C8 00221728 38 21 00 50 */ addi r1, r1, 0x50 -/* 802247CC 0022172C 4E 80 00 20 */ blr +/* 802247CC 0022172C 4E 80 00 20 */ blr .global ResetBeamState__8CEyeballFR13CStateManager ResetBeamState__8CEyeballFR13CStateManager: @@ -347,7 +347,7 @@ ResetBeamState__8CEyeballFR13CStateManager: /* 80224810 00221770 38 A0 00 01 */ li r5, 1 /* 80224814 00221774 81 8C 00 74 */ lwz r12, 0x74(r12) /* 80224818 00221778 7D 89 03 A6 */ mtctr r12 -/* 8022481C 0022177C 4E 80 04 21 */ bctrl +/* 8022481C 0022177C 4E 80 04 21 */ bctrl lbl_80224820: /* 80224820 00221780 88 1E 06 0C */ lbz r0, 0x60c(r30) /* 80224824 00221784 38 60 00 00 */ li r3, 0 @@ -368,7 +368,7 @@ lbl_80224854: /* 8022485C 002217BC 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80224860 002217C0 7C 08 03 A6 */ mtlr r0 /* 80224864 002217C4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80224868 002217C8 4E 80 00 20 */ blr +/* 80224868 002217C8 4E 80 00 20 */ blr .global FireBeam__8CEyeballFR13CStateManagerRC12CTransform4f FireBeam__8CEyeballFR13CStateManagerRC12CTransform4f: @@ -397,7 +397,7 @@ FireBeam__8CEyeballFR13CStateManagerRC12CTransform4f: /* 802248C4 00221824 38 C0 00 00 */ li r6, 0 /* 802248C8 00221828 81 8C 00 78 */ lwz r12, 0x78(r12) /* 802248CC 0022182C 7D 89 03 A6 */ mtctr r12 -/* 802248D0 00221830 4E 80 04 21 */ bctrl +/* 802248D0 00221830 4E 80 04 21 */ bctrl /* 802248D4 00221834 88 1F 06 0C */ lbz r0, 0x60c(r31) /* 802248D8 00221838 39 80 00 01 */ li r12, 1 /* 802248DC 0022183C 51 80 1F 38 */ rlwimi r0, r12, 3, 0x1c, 0x1c @@ -458,11 +458,11 @@ lbl_802249A8: /* 802249B4 00221914 83 A1 00 44 */ lwz r29, 0x44(r1) /* 802249B8 00221918 7C 08 03 A6 */ mtlr r0 /* 802249BC 0022191C 38 21 00 50 */ addi r1, r1, 0x50 -/* 802249C0 00221920 4E 80 00 20 */ blr +/* 802249C0 00221920 4E 80 00 20 */ blr .global Touch__8CEyeBallFR6CActorR13CStateManager Touch__8CEyeBallFR6CActorR13CStateManager: -/* 802249C4 00221924 4E 80 00 20 */ blr +/* 802249C4 00221924 4E 80 00 20 */ blr .global UpdateAnimation__8CEyeballFv UpdateAnimation__8CEyeballFv: @@ -569,13 +569,13 @@ lbl_80224B40: /* 80224B48 00221AA8 83 C1 00 38 */ lwz r30, 0x38(r1) /* 80224B4C 00221AAC 7C 08 03 A6 */ mtlr r0 /* 80224B50 00221AB0 38 21 00 40 */ addi r1, r1, 0x40 -/* 80224B54 00221AB4 4E 80 00 20 */ blr +/* 80224B54 00221AB4 4E 80 00 20 */ blr .global ShouldAttack__8CEyeBallFR13CStateManagerf ShouldAttack__8CEyeBallFR13CStateManagerf: /* 80224B58 00221AB8 88 03 06 0C */ lbz r0, 0x60c(r3) /* 80224B5C 00221ABC 54 03 DF FE */ rlwinm r3, r0, 0x1b, 0x1f, 0x1f -/* 80224B60 00221AC0 4E 80 00 20 */ blr +/* 80224B60 00221AC0 4E 80 00 20 */ blr .global ShouldFire__8CEyeBallFR13CStateManagerf ShouldFire__8CEyeBallFR13CStateManagerf: @@ -583,7 +583,7 @@ ShouldFire__8CEyeBallFR13CStateManagerf: /* 80224B68 00221AC8 54 00 E7 FE */ rlwinm r0, r0, 0x1c, 0x1f, 0x1f /* 80224B6C 00221ACC 7C 00 00 34 */ cntlzw r0, r0 /* 80224B70 00221AD0 54 03 D9 7E */ srwi r3, r0, 5 -/* 80224B74 00221AD4 4E 80 00 20 */ blr +/* 80224B74 00221AD4 4E 80 00 20 */ blr .global Cover__8CEyeBallFR13CStateManager9EStateMsgf Cover__8CEyeBallFR13CStateManager9EStateMsgf: @@ -611,7 +611,7 @@ lbl_80224BC0: /* 80224BC4 00221B24 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80224BC8 00221B28 7C 08 03 A6 */ mtlr r0 /* 80224BCC 00221B2C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80224BD0 00221B30 4E 80 00 20 */ blr +/* 80224BD0 00221B30 4E 80 00 20 */ blr .global Flinch__8CEyeBallFR13CStateManager9EStateMsgf Flinch__8CEyeBallFR13CStateManager9EStateMsgf: @@ -655,7 +655,7 @@ lbl_80224C54: /* 80224C54 00221BB4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80224C58 00221BB8 7C 08 03 A6 */ mtlr r0 /* 80224C5C 00221BBC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80224C60 00221BC0 4E 80 00 20 */ blr +/* 80224C60 00221BC0 4E 80 00 20 */ blr .global Render__8CEyeBallCFRC13CStateManager Render__8CEyeBallCFRC13CStateManager: @@ -666,7 +666,7 @@ Render__8CEyeBallCFRC13CStateManager: /* 80224C74 00221BD4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80224C78 00221BD8 7C 08 03 A6 */ mtlr r0 /* 80224C7C 00221BDC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80224C80 00221BE0 4E 80 00 20 */ blr +/* 80224C80 00221BE0 4E 80 00 20 */ blr .global sub_80224c84 sub_80224c84: @@ -714,7 +714,7 @@ sub_80224c84: /* 80224D28 00221C88 80 01 00 34 */ lwz r0, 0x34(r1) /* 80224D2C 00221C8C 7C 08 03 A6 */ mtlr r0 /* 80224D30 00221C90 38 21 00 30 */ addi r1, r1, 0x30 -/* 80224D34 00221C94 4E 80 00 20 */ blr +/* 80224D34 00221C94 4E 80 00 20 */ blr .global Think__8CEyeBallFfR13CStateManager Think__8CEyeBallFfR13CStateManager: @@ -869,7 +869,7 @@ lbl_80224F04: /* 80224F78 00221ED8 38 81 00 90 */ addi r4, r1, 0x90 /* 80224F7C 00221EDC 81 8C 00 70 */ lwz r12, 0x70(r12) /* 80224F80 00221EE0 7D 89 03 A6 */ mtctr r12 -/* 80224F84 00221EE4 4E 80 04 21 */ bctrl +/* 80224F84 00221EE4 4E 80 04 21 */ bctrl lbl_80224F88: /* 80224F88 00221EE8 88 1E 06 0C */ lbz r0, 0x60c(r30) /* 80224F8C 00221EEC 54 00 EF FF */ rlwinm. r0, r0, 0x1d, 0x1f, 0x1f @@ -905,7 +905,7 @@ lbl_80224FE4: /* 80224FF8 00221F58 83 A1 00 C4 */ lwz r29, 0xc4(r1) /* 80224FFC 00221F5C 7C 08 03 A6 */ mtlr r0 /* 80225000 00221F60 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 80225004 00221F64 4E 80 00 20 */ blr +/* 80225004 00221F64 4E 80 00 20 */ blr .global PreRender__8CEyeBallFR13CStateManagerRC14CFrustumPlanes PreRender__8CEyeBallFR13CStateManagerRC14CFrustumPlanes: @@ -937,7 +937,7 @@ PreRender__8CEyeBallFR13CStateManagerRC14CFrustumPlanes: /* 8022506C 00221FCC 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80225070 00221FD0 7C 08 03 A6 */ mtlr r0 /* 80225074 00221FD4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80225078 00221FD8 4E 80 00 20 */ blr +/* 80225078 00221FD8 4E 80 00 20 */ blr .global Active__8CEyeBallFR13CStateManager9EStateMsgf Active__8CEyeBallFR13CStateManager9EStateMsgf: @@ -999,7 +999,7 @@ lbl_80225118: /* 80225144 002220A4 38 A0 00 01 */ li r5, 1 /* 80225148 002220A8 81 8C 00 74 */ lwz r12, 0x74(r12) /* 8022514C 002220AC 7D 89 03 A6 */ mtctr r12 -/* 80225150 002220B0 4E 80 04 21 */ bctrl +/* 80225150 002220B0 4E 80 04 21 */ bctrl lbl_80225154: /* 80225154 002220B4 88 1E 06 0C */ lbz r0, 0x60c(r30) /* 80225158 002220B8 38 60 00 00 */ li r3, 0 @@ -1017,7 +1017,7 @@ lbl_8022517C: /* 80225184 002220E4 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80225188 002220E8 7C 08 03 A6 */ mtlr r0 /* 8022518C 002220EC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80225190 002220F0 4E 80 00 20 */ blr +/* 80225190 002220F0 4E 80 00 20 */ blr .global InActive__8CEyeBallFR13CStateManager9EStateMsgf InActive__8CEyeBallFR13CStateManager9EStateMsgf: @@ -1036,7 +1036,7 @@ lbl_802251BC: /* 802251BC 0022211C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802251C0 00222120 7C 08 03 A6 */ mtlr r0 /* 802251C4 00222124 38 21 00 10 */ addi r1, r1, 0x10 -/* 802251C8 00222128 4E 80 00 20 */ blr +/* 802251C8 00222128 4E 80 00 20 */ blr .global DoUserAnimEvent__8CEyeBallFR13CStateManagerRC13CInt32POINode14EUserEventType DoUserAnimEvent__8CEyeBallFR13CStateManagerRC13CInt32POINode14EUserEventType: @@ -1092,7 +1092,7 @@ lbl_80225278: /* 80225280 002221E0 80 01 00 94 */ lwz r0, 0x94(r1) /* 80225284 002221E4 7C 08 03 A6 */ mtlr r0 /* 80225288 002221E8 38 21 00 90 */ addi r1, r1, 0x90 -/* 8022528C 002221EC 4E 80 00 20 */ blr +/* 8022528C 002221EC 4E 80 00 20 */ blr .global AcceptScriptMsg__8CEyeBallF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__8CEyeBallF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -1113,7 +1113,7 @@ AcceptScriptMsg__8CEyeBallF20EScriptObjectMessage9TUniqueIdR13CStateManager: /* 802252C8 00222228 38 84 7A 18 */ addi r4, r4, lbl_803E7A18@l /* 802252CC 0022222C 7C 04 00 2E */ lwzx r0, r4, r0 /* 802252D0 00222230 7C 09 03 A6 */ mtctr r0 -/* 802252D4 00222234 4E 80 04 20 */ bctr +/* 802252D4 00222234 4E 80 04 20 */ bctr .global lbl_802252D8 lbl_802252D8: /* 802252D8 00222238 A0 1D 00 00 */ lhz r0, 0(r29) @@ -1136,7 +1136,7 @@ lbl_802252D8: /* 8022531C 0022227C 81 9B 00 00 */ lwz r12, 0(r27) /* 80225320 00222280 81 8C 00 38 */ lwz r12, 0x38(r12) /* 80225324 00222284 7D 89 03 A6 */ mtctr r12 -/* 80225328 00222288 4E 80 04 21 */ bctrl +/* 80225328 00222288 4E 80 04 21 */ bctrl /* 8022532C 0022228C 38 9F 01 2C */ addi r4, r31, 0x12c /* 80225330 00222290 38 A0 00 00 */ li r5, 0 /* 80225334 00222294 4B ED D1 89 */ bl GetVulnerability__20CDamageVulnerabilityCFRC11CWeaponMode @@ -1171,7 +1171,7 @@ lbl_80225358: /* 8022539C 002222FC 81 9B 00 00 */ lwz r12, 0(r27) /* 802253A0 00222300 81 8C 00 38 */ lwz r12, 0x38(r12) /* 802253A4 00222304 7D 89 03 A6 */ mtctr r12 -/* 802253A8 00222308 4E 80 04 21 */ bctrl +/* 802253A8 00222308 4E 80 04 21 */ bctrl /* 802253AC 0022230C 38 9F 01 2C */ addi r4, r31, 0x12c /* 802253B0 00222310 38 A0 00 00 */ li r5, 0 /* 802253B4 00222314 4B ED D1 09 */ bl GetVulnerability__20CDamageVulnerabilityCFRC11CWeaponMode @@ -1247,7 +1247,7 @@ lbl_8022549C: /* 802254A0 00222400 80 01 00 54 */ lwz r0, 0x54(r1) /* 802254A4 00222404 7C 08 03 A6 */ mtlr r0 /* 802254A8 00222408 38 21 00 50 */ addi r1, r1, 0x50 -/* 802254AC 0022240C 4E 80 00 20 */ blr +/* 802254AC 0022240C 4E 80 00 20 */ blr .global CreateBeam__8CEyeballFR13CStateManager CreateBeam__8CEyeballFR13CStateManager: @@ -1385,7 +1385,7 @@ lbl_802256A0: /* 802256B0 00222610 83 81 00 C0 */ lwz r28, 0xc0(r1) /* 802256B4 00222614 7C 08 03 A6 */ mtlr r0 /* 802256B8 00222618 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 802256BC 0022261C 4E 80 00 20 */ blr +/* 802256BC 0022261C 4E 80 00 20 */ blr .global Accept__8CEyeBallFR8IVisitor Accept__8CEyeBallFR8IVisitor: @@ -1398,11 +1398,11 @@ Accept__8CEyeBallFR8IVisitor: /* 802256D8 00222638 7C 04 03 78 */ mr r4, r0 /* 802256DC 0022263C 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 802256E0 00222640 7D 89 03 A6 */ mtctr r12 -/* 802256E4 00222644 4E 80 04 21 */ bctrl +/* 802256E4 00222644 4E 80 04 21 */ bctrl /* 802256E8 00222648 80 01 00 14 */ lwz r0, 0x14(r1) /* 802256EC 0022264C 7C 08 03 A6 */ mtlr r0 /* 802256F0 00222650 38 21 00 10 */ addi r1, r1, 0x10 -/* 802256F4 00222654 4E 80 00 20 */ blr +/* 802256F4 00222654 4E 80 00 20 */ blr .global "__ct__8CEyeBallF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>Q210CPatterned11EFlavorTypeRC11CEntityInfoRC12CTransform4fRC10CModelDataRC14CPatternedInfoffUiRC11CDamageInfoUiUiUiUiRC16CActorParameters" "__ct__8CEyeBallF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>Q210CPatterned11EFlavorTypeRC11CEntityInfoRC12CTransform4fRC10CModelDataRC14CPatternedInfoffUiRC11CDamageInfoUiUiUiUiRC16CActorParameters": diff --git a/asm/MetroidPrime/Enemies/CFireFlea.s b/asm/MetroidPrime/Enemies/CFireFlea.s index 260dea67..d108a1a2 100644 --- a/asm/MetroidPrime/Enemies/CFireFlea.s +++ b/asm/MetroidPrime/Enemies/CFireFlea.s @@ -339,7 +339,7 @@ lbl_80142A3C: /* 80142A48 0013F9A8 83 C1 00 08 */ lwz r30, 8(r1) /* 80142A4C 0013F9AC 7C 08 03 A6 */ mtlr r0 /* 80142A50 0013F9B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80142A54 0013F9B4 4E 80 00 20 */ blr +/* 80142A54 0013F9B4 4E 80 00 20 */ blr .global Delay__9CFireFleaFR13CStateManagerf Delay__9CFireFleaFR13CStateManagerf: @@ -348,12 +348,12 @@ Delay__9CFireFleaFR13CStateManagerf: /* 80142A60 0013F9C0 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80142A64 0013F9C4 7C 00 00 26 */ mfcr r0 /* 80142A68 0013F9C8 54 03 17 FE */ rlwinm r3, r0, 2, 0x1f, 0x1f -/* 80142A6C 0013F9CC 4E 80 00 20 */ blr +/* 80142A6C 0013F9CC 4E 80 00 20 */ blr .global GetSearchPath__9CFireFleaFv GetSearchPath__9CFireFleaFv: /* 80142A70 0013F9D0 38 63 0D 8C */ addi r3, r3, 0xd8c -/* 80142A74 0013F9D4 4E 80 00 20 */ blr +/* 80142A74 0013F9D4 4E 80 00 20 */ blr .global InPosition__9CFireFleaFR13CStateManagerf InPosition__9CFireFleaFR13CStateManagerf: @@ -388,7 +388,7 @@ lbl_80142AE4: /* 80142AE4 0013FA44 38 60 00 00 */ li r3, 0 lbl_80142AE8: /* 80142AE8 0013FA48 38 21 00 20 */ addi r1, r1, 0x20 -/* 80142AEC 0013FA4C 4E 80 00 20 */ blr +/* 80142AEC 0013FA4C 4E 80 00 20 */ blr .global TargetPatrol__9CFireFleaFR13CStateManager9EStateMsgf TargetPatrol__9CFireFleaFR13CStateManager9EStateMsgf: @@ -427,14 +427,14 @@ lbl_80142B68: /* 80142B68 0013FAC8 81 83 00 00 */ lwz r12, 0(r3) /* 80142B6C 0013FACC 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 80142B70 0013FAD0 7D 89 03 A6 */ mtctr r12 -/* 80142B74 0013FAD4 4E 80 04 21 */ bctrl +/* 80142B74 0013FAD4 4E 80 04 21 */ bctrl /* 80142B78 0013FAD8 28 03 00 00 */ cmplwi r3, 0 /* 80142B7C 0013FADC 41 82 01 3C */ beq lbl_80142CB8 /* 80142B80 0013FAE0 7F A3 EB 78 */ mr r3, r29 /* 80142B84 0013FAE4 81 9D 00 00 */ lwz r12, 0(r29) /* 80142B88 0013FAE8 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 80142B8C 0013FAEC 7D 89 03 A6 */ mtctr r12 -/* 80142B90 0013FAF0 4E 80 04 21 */ bctrl +/* 80142B90 0013FAF0 4E 80 04 21 */ bctrl /* 80142B94 0013FAF4 80 03 00 CC */ lwz r0, 0xcc(r3) /* 80142B98 0013FAF8 2C 00 00 00 */ cmpwi r0, 0 /* 80142B9C 0013FAFC 41 82 01 04 */ beq lbl_80142CA0 @@ -456,7 +456,7 @@ lbl_80142B68: /* 80142BDC 0013FB3C 81 9D 00 00 */ lwz r12, 0(r29) /* 80142BE0 0013FB40 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 80142BE4 0013FB44 7D 89 03 A6 */ mtctr r12 -/* 80142BE8 0013FB48 4E 80 04 21 */ bctrl +/* 80142BE8 0013FB48 4E 80 04 21 */ bctrl /* 80142BEC 0013FB4C 38 81 00 2C */ addi r4, r1, 0x2c /* 80142BF0 0013FB50 38 A1 00 44 */ addi r5, r1, 0x44 /* 80142BF4 0013FB54 48 08 45 09 */ bl FindClosestReachablePoint__15CPathFindSearchCFRC9CVector3fR9CVector3f @@ -544,7 +544,7 @@ lbl_80142D1C: /* 80142D30 0013FC90 83 A1 00 94 */ lwz r29, 0x94(r1) /* 80142D34 0013FC94 7C 08 03 A6 */ mtlr r0 /* 80142D38 0013FC98 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 80142D3C 0013FC9C 4E 80 00 20 */ blr +/* 80142D3C 0013FC9C 4E 80 00 20 */ blr .global Dead__9CFireFleaFR13CStateManager9EStateMsgf Dead__9CFireFleaFR13CStateManager9EStateMsgf: @@ -607,7 +607,7 @@ lbl_80142E08: /* 80142E14 0013FD74 83 A1 00 34 */ lwz r29, 0x34(r1) /* 80142E18 0013FD78 7C 08 03 A6 */ mtlr r0 /* 80142E1C 0013FD7C 38 21 00 40 */ addi r1, r1, 0x40 -/* 80142E20 0013FD80 4E 80 00 20 */ blr +/* 80142E20 0013FD80 4E 80 00 20 */ blr .global Flee__9CFireFleaFR13CStateManager9EStateMsgf Flee__9CFireFleaFR13CStateManager9EStateMsgf: @@ -751,7 +751,7 @@ lbl_80143020: /* 80143024 0013FF84 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 80143028 0013FF88 7C 08 03 A6 */ mtlr r0 /* 8014302C 0013FF8C 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 80143030 0013FF90 4E 80 00 20 */ blr +/* 80143030 0013FF90 4E 80 00 20 */ blr .global sub_80143034 sub_80143034: @@ -1068,7 +1068,7 @@ lbl_801434D4: /* 801434EC 0014044C 83 81 02 20 */ lwz r28, 0x220(r1) /* 801434F0 00140450 7C 08 03 A6 */ mtlr r0 /* 801434F4 00140454 38 21 02 40 */ addi r1, r1, 0x240 -/* 801434F8 00140458 4E 80 00 20 */ blr +/* 801434F8 00140458 4E 80 00 20 */ blr .global sub_801434fc sub_801434fc: @@ -1179,7 +1179,7 @@ lbl_80143660: /* 8014366C 001405CC 83 A1 08 34 */ lwz r29, 0x834(r1) /* 80143670 001405D0 7C 08 03 A6 */ mtlr r0 /* 80143674 001405D4 38 21 08 40 */ addi r1, r1, 0x840 -/* 80143678 001405D8 4E 80 00 20 */ blr +/* 80143678 001405D8 4E 80 00 20 */ blr .global Patrol__9CFireFleaFR13CStateManager9EStateMsgf Patrol__9CFireFleaFR13CStateManager9EStateMsgf: @@ -1240,7 +1240,7 @@ lbl_80143738: /* 8014374C 001406AC 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80143750 001406B0 7C 08 03 A6 */ mtlr r0 /* 80143754 001406B4 38 21 00 40 */ addi r1, r1, 0x40 -/* 80143758 001406B8 4E 80 00 20 */ blr +/* 80143758 001406B8 4E 80 00 20 */ blr .global HearShot__9CFireFleaFR13CStateManagerf HearShot__9CFireFleaFR13CStateManagerf: @@ -1323,7 +1323,7 @@ lbl_801437C4: /* 8014387C 001407DC 80 01 00 74 */ lwz r0, 0x74(r1) /* 80143880 001407E0 7C 08 03 A6 */ mtlr r0 /* 80143884 001407E4 38 21 00 70 */ addi r1, r1, 0x70 -/* 80143888 001407E8 4E 80 00 20 */ blr +/* 80143888 001407E8 4E 80 00 20 */ blr .global Think__9CFireFleaFfR13CStateManager Think__9CFireFleaFfR13CStateManager: @@ -1338,7 +1338,7 @@ lbl_801438A8: /* 801438A8 00140808 80 01 00 14 */ lwz r0, 0x14(r1) /* 801438AC 0014080C 7C 08 03 A6 */ mtlr r0 /* 801438B0 00140810 38 21 00 10 */ addi r1, r1, 0x10 -/* 801438B4 00140814 4E 80 00 20 */ blr +/* 801438B4 00140814 4E 80 00 20 */ blr .global AcceptScriptMsg__9CFireFleaF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__9CFireFleaF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -1391,7 +1391,7 @@ lbl_80143954: /* 80143960 001408C0 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80143964 001408C4 7C 08 03 A6 */ mtlr r0 /* 80143968 001408C8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8014396C 001408CC 4E 80 00 20 */ blr +/* 8014396C 001408CC 4E 80 00 20 */ blr .global Accept__9CFireFleaFR8IVisitor Accept__9CFireFleaFR8IVisitor: @@ -1404,11 +1404,11 @@ Accept__9CFireFleaFR8IVisitor: /* 80143988 001408E8 7C 04 03 78 */ mr r4, r0 /* 8014398C 001408EC 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 80143990 001408F0 7D 89 03 A6 */ mtctr r12 -/* 80143994 001408F4 4E 80 04 21 */ bctrl +/* 80143994 001408F4 4E 80 04 21 */ bctrl /* 80143998 001408F8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8014399C 001408FC 7C 08 03 A6 */ mtlr r0 /* 801439A0 00140900 38 21 00 10 */ addi r1, r1, 0x10 -/* 801439A4 00140904 4E 80 00 20 */ blr +/* 801439A4 00140904 4E 80 00 20 */ blr .global "__ct__9CFireFleaF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC16CActorParametersRC14CPatternedInfof" "__ct__9CFireFleaF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC16CActorParametersRC14CPatternedInfof": @@ -1511,7 +1511,7 @@ Accept__9CFireFleaFR8IVisitor: /* 80143B28 00140A88 83 A1 00 44 */ lwz r29, 0x44(r1) /* 80143B2C 00140A8C 7C 08 03 A6 */ mtlr r0 /* 80143B30 00140A90 38 21 00 60 */ addi r1, r1, 0x60 -/* 80143B34 00140A94 4E 80 00 20 */ blr +/* 80143B34 00140A94 4E 80 00 20 */ blr .global Accept__Q29CFireFlea18CDeathCameraEffectFR8IVisitor Accept__Q29CFireFlea18CDeathCameraEffectFR8IVisitor: @@ -1524,11 +1524,11 @@ Accept__Q29CFireFlea18CDeathCameraEffectFR8IVisitor: /* 80143B50 00140AB0 7C 04 03 78 */ mr r4, r0 /* 80143B54 00140AB4 81 8C 00 24 */ lwz r12, 0x24(r12) /* 80143B58 00140AB8 7D 89 03 A6 */ mtctr r12 -/* 80143B5C 00140ABC 4E 80 04 21 */ bctrl +/* 80143B5C 00140ABC 4E 80 04 21 */ bctrl /* 80143B60 00140AC0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80143B64 00140AC4 7C 08 03 A6 */ mtlr r0 /* 80143B68 00140AC8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80143B6C 00140ACC 4E 80 00 20 */ blr +/* 80143B6C 00140ACC 4E 80 00 20 */ blr .global Think__Q29CFireFlea18CDeathCameraEffectFfR13CStateManager Think__Q29CFireFlea18CDeathCameraEffectFfR13CStateManager: @@ -1546,7 +1546,7 @@ Think__Q29CFireFlea18CDeathCameraEffectFfR13CStateManager: /* 80143B9C 00140AFC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80143BA0 00140B00 7C 08 03 A6 */ mtlr r0 /* 80143BA4 00140B04 38 21 00 10 */ addi r1, r1, 0x10 -/* 80143BA8 00140B08 4E 80 00 20 */ blr +/* 80143BA8 00140B08 4E 80 00 20 */ blr .global PreThink__Q29CFireFlea18CDeathCameraEffectFfR13CStateManager PreThink__Q29CFireFlea18CDeathCameraEffectFfR13CStateManager: @@ -1686,7 +1686,7 @@ lbl_80143D98: /* 80143DA8 00140D08 83 81 00 30 */ lwz r28, 0x30(r1) /* 80143DAC 00140D0C 7C 08 03 A6 */ mtlr r0 /* 80143DB0 00140D10 38 21 00 40 */ addi r1, r1, 0x40 -/* 80143DB4 00140D14 4E 80 00 20 */ blr +/* 80143DB4 00140D14 4E 80 00 20 */ blr .global "__ct__Q29CFireFlea18CDeathCameraEffectF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" "__ct__Q29CFireFlea18CDeathCameraEffectF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>": @@ -1756,7 +1756,7 @@ lbl_80143E64: /* 80143EA8 00140E08 80 01 00 54 */ lwz r0, 0x54(r1) /* 80143EAC 00140E0C 7C 08 03 A6 */ mtlr r0 /* 80143EB0 00140E10 38 21 00 50 */ addi r1, r1, 0x50 -/* 80143EB4 00140E14 4E 80 00 20 */ blr +/* 80143EB4 00140E14 4E 80 00 20 */ blr .global __dt__Q29CFireFlea18CDeathCameraEffectFv __dt__Q29CFireFlea18CDeathCameraEffectFv: @@ -1784,7 +1784,7 @@ lbl_80143EFC: /* 80143F08 00140E68 83 C1 00 08 */ lwz r30, 8(r1) /* 80143F0C 00140E6C 7C 08 03 A6 */ mtlr r0 /* 80143F10 00140E70 38 21 00 10 */ addi r1, r1, 0x10 -/* 80143F14 00140E74 4E 80 00 20 */ blr +/* 80143F14 00140E74 4E 80 00 20 */ blr .global __sinit_CFireFlea_cpp __sinit_CFireFlea_cpp: @@ -1814,4 +1814,4 @@ __sinit_CFireFlea_cpp: /* 80143F74 00140ED4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80143F78 00140ED8 7C 08 03 A6 */ mtlr r0 /* 80143F7C 00140EDC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80143F80 00140EE0 4E 80 00 20 */ blr +/* 80143F80 00140EE0 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/Enemies/CFlaahgra.s b/asm/MetroidPrime/Enemies/CFlaahgra.s index e0356c39..643c3381 100644 --- a/asm/MetroidPrime/Enemies/CFlaahgra.s +++ b/asm/MetroidPrime/Enemies/CFlaahgra.s @@ -465,13 +465,13 @@ lbl_801AD5C4: /* 801AD5D0 001AA530 83 C1 00 08 */ lwz r30, 8(r1) /* 801AD5D4 001AA534 7C 08 03 A6 */ mtlr r0 /* 801AD5D8 001AA538 38 21 00 10 */ addi r1, r1, 0x10 -/* 801AD5DC 001AA53C 4E 80 00 20 */ blr +/* 801AD5DC 001AA53C 4E 80 00 20 */ blr .global GetTouchBounds__17CFlaahgraRendererCFv GetTouchBounds__17CFlaahgraRendererCFv: /* 801AD5E0 001AA540 38 00 00 00 */ li r0, 0 /* 801AD5E4 001AA544 98 03 00 18 */ stb r0, 0x18(r3) -/* 801AD5E8 001AA548 4E 80 00 20 */ blr +/* 801AD5E8 001AA548 4E 80 00 20 */ blr .global AddToRenderer__17CFlaahgraRendererCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__17CFlaahgraRendererCFRC14CFrustumPlanesRC13CStateManager: @@ -506,7 +506,7 @@ lbl_801AD650: /* 801AD654 001AA5B4 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801AD658 001AA5B8 7C 08 03 A6 */ mtlr r0 /* 801AD65C 001AA5BC 38 21 00 20 */ addi r1, r1, 0x20 -/* 801AD660 001AA5C0 4E 80 00 20 */ blr +/* 801AD660 001AA5C0 4E 80 00 20 */ blr .global Accept__17CFlaahgraRendererFR8IVisitor Accept__17CFlaahgraRendererFR8IVisitor: @@ -519,11 +519,11 @@ Accept__17CFlaahgraRendererFR8IVisitor: /* 801AD67C 001AA5DC 7C 04 03 78 */ mr r4, r0 /* 801AD680 001AA5E0 81 8C 00 08 */ lwz r12, 8(r12) /* 801AD684 001AA5E4 7D 89 03 A6 */ mtctr r12 -/* 801AD688 001AA5E8 4E 80 04 21 */ bctrl +/* 801AD688 001AA5E8 4E 80 04 21 */ bctrl /* 801AD68C 001AA5EC 80 01 00 14 */ lwz r0, 0x14(r1) /* 801AD690 001AA5F0 7C 08 03 A6 */ mtlr r0 /* 801AD694 001AA5F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801AD698 001AA5F8 4E 80 00 20 */ blr +/* 801AD698 001AA5F8 4E 80 00 20 */ blr .global "__ct__17CFlaahgraRendererF9TUniqueId9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4f" "__ct__17CFlaahgraRendererF9TUniqueId9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4f": @@ -587,7 +587,7 @@ Accept__17CFlaahgraRendererFR8IVisitor: /* 801AD780 001AA6E0 80 01 00 F4 */ lwz r0, 0xf4(r1) /* 801AD784 001AA6E4 7C 08 03 A6 */ mtlr r0 /* 801AD788 001AA6E8 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 801AD78C 001AA6EC 4E 80 00 20 */ blr +/* 801AD78C 001AA6EC 4E 80 00 20 */ blr .global sub_801ad790 sub_801ad790: @@ -696,7 +696,7 @@ lbl_801AD900: /* 801AD90C 001AA86C 83 A1 00 74 */ lwz r29, 0x74(r1) /* 801AD910 001AA870 7C 08 03 A6 */ mtlr r0 /* 801AD914 001AA874 38 21 00 80 */ addi r1, r1, 0x80 -/* 801AD918 001AA878 4E 80 00 20 */ blr +/* 801AD918 001AA878 4E 80 00 20 */ blr .global sub_801ad91c sub_801ad91c: @@ -725,7 +725,7 @@ lbl_801AD954: /* 801AD970 001AA8D0 81 84 00 00 */ lwz r12, 0(r4) /* 801AD974 001AA8D4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801AD978 001AA8D8 7D 89 03 A6 */ mtctr r12 -/* 801AD97C 001AA8DC 4E 80 04 21 */ bctrl +/* 801AD97C 001AA8DC 4E 80 04 21 */ bctrl /* 801AD980 001AA8E0 88 1F 08 D0 */ lbz r0, 0x8d0(r31) /* 801AD984 001AA8E4 28 00 00 00 */ cmplwi r0, 0 /* 801AD988 001AA8E8 40 82 00 20 */ bne lbl_801AD9A8 @@ -752,7 +752,7 @@ lbl_801AD9C8: /* 801AD9CC 001AA92C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801AD9D0 001AA930 7C 08 03 A6 */ mtlr r0 /* 801AD9D4 001AA934 38 21 00 20 */ addi r1, r1, 0x20 -/* 801AD9D8 001AA938 4E 80 00 20 */ blr +/* 801AD9D8 001AA938 4E 80 00 20 */ blr .global sub_801ad9dc sub_801ad9dc: @@ -798,7 +798,7 @@ lbl_801ADA60: /* 801ADA6C 001AA9CC 83 A1 00 14 */ lwz r29, 0x14(r1) /* 801ADA70 001AA9D0 7C 08 03 A6 */ mtlr r0 /* 801ADA74 001AA9D4 38 21 00 20 */ addi r1, r1, 0x20 -/* 801ADA78 001AA9D8 4E 80 00 20 */ blr +/* 801ADA78 001AA9D8 4E 80 00 20 */ blr .global sub_801ada7c sub_801ada7c: @@ -833,7 +833,7 @@ lbl_801ADAE4: /* 801ADAE8 001AAA48 80 01 00 14 */ lwz r0, 0x14(r1) /* 801ADAEC 001AAA4C 7C 08 03 A6 */ mtlr r0 /* 801ADAF0 001AAA50 38 21 00 10 */ addi r1, r1, 0x10 -/* 801ADAF4 001AAA54 4E 80 00 20 */ blr +/* 801ADAF4 001AAA54 4E 80 00 20 */ blr .global sub_801adaf8 sub_801adaf8: @@ -905,7 +905,7 @@ lbl_801ADBD8: /* 801ADBE8 001AAB48 7C A0 EA 14 */ add r5, r0, r29 /* 801ADBEC 001AAB4C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801ADBF0 001AAB50 7D 89 03 A6 */ mtctr r12 -/* 801ADBF4 001AAB54 4E 80 04 21 */ bctrl +/* 801ADBF4 001AAB54 4E 80 04 21 */ bctrl /* 801ADBF8 001AAB58 38 61 00 10 */ addi r3, r1, 0x10 /* 801ADBFC 001AAB5C 38 81 00 08 */ addi r4, r1, 8 /* 801ADC00 001AAB60 48 19 32 A9 */ bl __ct__6CTokenFRC6CToken @@ -958,7 +958,7 @@ lbl_801ADC94: /* 801ADCA4 001AAC04 83 81 00 30 */ lwz r28, 0x30(r1) /* 801ADCA8 001AAC08 7C 08 03 A6 */ mtlr r0 /* 801ADCAC 001AAC0C 38 21 00 40 */ addi r1, r1, 0x40 -/* 801ADCB0 001AAC10 4E 80 00 20 */ blr +/* 801ADCB0 001AAC10 4E 80 00 20 */ blr .global sub_801adcb4 sub_801adcb4: @@ -973,7 +973,7 @@ sub_801adcb4: /* 801ADCD4 001AAC34 81 83 00 00 */ lwz r12, 0(r3) /* 801ADCD8 001AAC38 81 8C 02 C0 */ lwz r12, 0x2c0(r12) /* 801ADCDC 001AAC3C 7D 89 03 A6 */ mtctr r12 -/* 801ADCE0 001AAC40 4E 80 04 21 */ bctrl +/* 801ADCE0 001AAC40 4E 80 04 21 */ bctrl /* 801ADCE4 001AAC44 7C 7C 1B 78 */ mr r28, r3 /* 801ADCE8 001AAC48 80 03 00 08 */ lwz r0, 8(r3) /* 801ADCEC 001AAC4C 28 00 00 00 */ cmplwi r0, 0 @@ -1012,7 +1012,7 @@ lbl_801ADD30: /* 801ADD64 001AACC4 81 9D 00 00 */ lwz r12, 0(r29) /* 801ADD68 001AACC8 81 8C 02 C0 */ lwz r12, 0x2c0(r12) /* 801ADD6C 001AACCC 7D 89 03 A6 */ mtctr r12 -/* 801ADD70 001AACD0 4E 80 04 21 */ bctrl +/* 801ADD70 001AACD0 4E 80 04 21 */ bctrl /* 801ADD74 001AACD4 80 03 00 0C */ lwz r0, 0xc(r3) /* 801ADD78 001AACD8 90 01 00 28 */ stw r0, 0x28(r1) /* 801ADD7C 001AACDC 88 03 00 10 */ lbz r0, 0x10(r3) @@ -1057,7 +1057,7 @@ lbl_801ADDC4: /* 801ADE14 001AAD74 81 9D 00 00 */ lwz r12, 0(r29) /* 801ADE18 001AAD78 81 8C 02 C0 */ lwz r12, 0x2c0(r12) /* 801ADE1C 001AAD7C 7D 89 03 A6 */ mtctr r12 -/* 801ADE20 001AAD80 4E 80 04 21 */ bctrl +/* 801ADE20 001AAD80 4E 80 04 21 */ bctrl /* 801ADE24 001AAD84 88 1D 08 E4 */ lbz r0, 0x8e4(r29) /* 801ADE28 001AAD88 7C 65 1B 78 */ mr r5, r3 /* 801ADE2C 001AAD8C 7F 83 E3 78 */ mr r3, r28 @@ -1082,7 +1082,7 @@ lbl_801ADE68: /* 801ADE70 001AADD0 80 01 00 64 */ lwz r0, 0x64(r1) /* 801ADE74 001AADD4 7C 08 03 A6 */ mtlr r0 /* 801ADE78 001AADD8 38 21 00 60 */ addi r1, r1, 0x60 -/* 801ADE7C 001AADDC 4E 80 00 20 */ blr +/* 801ADE7C 001AADDC 4E 80 00 20 */ blr .global sub_801ade80 sub_801ade80: @@ -1165,7 +1165,7 @@ lbl_801ADF84: /* 801ADF94 001AAEF4 7C 06 00 40 */ cmplw r6, r0 /* 801ADF98 001AAEF8 40 82 FF 98 */ bne lbl_801ADF30 /* 801ADF9C 001AAEFC 38 21 00 30 */ addi r1, r1, 0x30 -/* 801ADFA0 001AAF00 4E 80 00 20 */ blr +/* 801ADFA0 001AAF00 4E 80 00 20 */ blr .global sub_801adfa4 sub_801adfa4: @@ -1238,7 +1238,7 @@ lbl_801AE064: /* 801AE0A0 001AB000 80 01 00 74 */ lwz r0, 0x74(r1) /* 801AE0A4 001AB004 7C 08 03 A6 */ mtlr r0 /* 801AE0A8 001AB008 38 21 00 70 */ addi r1, r1, 0x70 -/* 801AE0AC 001AB00C 4E 80 00 20 */ blr +/* 801AE0AC 001AB00C 4E 80 00 20 */ blr .global sub_801ae0b0 sub_801ae0b0: @@ -1330,7 +1330,7 @@ lbl_801AE1BC: /* 801AE1E4 001AB144 83 81 00 20 */ lwz r28, 0x20(r1) /* 801AE1E8 001AB148 7C 08 03 A6 */ mtlr r0 /* 801AE1EC 001AB14C 38 21 00 30 */ addi r1, r1, 0x30 -/* 801AE1F0 001AB150 4E 80 00 20 */ blr +/* 801AE1F0 001AB150 4E 80 00 20 */ blr .global sub_801ae1f4 sub_801ae1f4: @@ -1440,7 +1440,7 @@ lbl_801AE370: /* 801AE378 001AB2D8 83 C1 00 F8 */ lwz r30, 0xf8(r1) /* 801AE37C 001AB2DC 7C 08 03 A6 */ mtlr r0 /* 801AE380 001AB2E0 38 21 01 00 */ addi r1, r1, 0x100 -/* 801AE384 001AB2E4 4E 80 00 20 */ blr +/* 801AE384 001AB2E4 4E 80 00 20 */ blr .global sub_801ae388 sub_801ae388: @@ -1492,7 +1492,7 @@ lbl_801AE410: /* 801AE430 001AB390 83 81 00 20 */ lwz r28, 0x20(r1) /* 801AE434 001AB394 7C 08 03 A6 */ mtlr r0 /* 801AE438 001AB398 38 21 00 30 */ addi r1, r1, 0x30 -/* 801AE43C 001AB39C 4E 80 00 20 */ blr +/* 801AE43C 001AB39C 4E 80 00 20 */ blr .global sub_801ae440 sub_801ae440: @@ -1626,7 +1626,7 @@ lbl_801AE600: /* 801AE628 001AB588 83 C1 00 28 */ lwz r30, 0x28(r1) /* 801AE62C 001AB58C 7C 08 03 A6 */ mtlr r0 /* 801AE630 001AB590 38 21 00 70 */ addi r1, r1, 0x70 -/* 801AE634 001AB594 4E 80 00 20 */ blr +/* 801AE634 001AB594 4E 80 00 20 */ blr .global sub_801ae638 sub_801ae638: @@ -1635,7 +1635,7 @@ sub_801ae638: /* 801AE640 001AB5A0 20 00 00 12 */ subfic r0, r0, 0x12 /* 801AE644 001AB5A4 7C 00 00 34 */ cntlzw r0, r0 /* 801AE648 001AB5A8 54 03 D9 7E */ srwi r3, r0, 5 -/* 801AE64C 001AB5AC 4E 80 00 20 */ blr +/* 801AE64C 001AB5AC 4E 80 00 20 */ blr .global sub_801ae650 sub_801ae650: @@ -1644,10 +1644,10 @@ sub_801ae650: /* 801AE658 001AB5B8 2C 00 00 00 */ cmpwi r0, 0 /* 801AE65C 001AB5BC 41 82 00 0C */ beq lbl_801AE668 /* 801AE660 001AB5C0 2C 00 00 01 */ cmpwi r0, 1 -/* 801AE664 001AB5C4 4C 82 00 20 */ bnelr +/* 801AE664 001AB5C4 4C 82 00 20 */ bnelr lbl_801AE668: /* 801AE668 001AB5C8 38 60 00 01 */ li r3, 1 -/* 801AE66C 001AB5CC 4E 80 00 20 */ blr +/* 801AE66C 001AB5CC 4E 80 00 20 */ blr .global sub_801ae670 sub_801ae670: @@ -1658,10 +1658,10 @@ sub_801ae670: /* 801AE680 001AB5E0 2C 00 00 03 */ cmpwi r0, 3 /* 801AE684 001AB5E4 41 82 00 0C */ beq lbl_801AE690 /* 801AE688 001AB5E8 2C 00 00 04 */ cmpwi r0, 4 -/* 801AE68C 001AB5EC 4C 82 00 20 */ bnelr +/* 801AE68C 001AB5EC 4C 82 00 20 */ bnelr lbl_801AE690: /* 801AE690 001AB5F0 38 60 00 01 */ li r3, 1 -/* 801AE694 001AB5F4 4E 80 00 20 */ blr +/* 801AE694 001AB5F4 4E 80 00 20 */ blr .global sub_801ae698 sub_801ae698: @@ -1713,7 +1713,7 @@ lbl_801AE71C: /* 801AE744 001AB6A4 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 801AE748 001AB6A8 7C 08 03 A6 */ mtlr r0 /* 801AE74C 001AB6AC 38 21 00 70 */ addi r1, r1, 0x70 -/* 801AE750 001AB6B0 4E 80 00 20 */ blr +/* 801AE750 001AB6B0 4E 80 00 20 */ blr .global sub_801ae754 sub_801ae754: @@ -1753,7 +1753,7 @@ lbl_801AE7B4: /* 801AE7CC 001AB72C 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 801AE7D0 001AB730 38 61 00 08 */ addi r3, r1, 8 /* 801AE7D4 001AB734 7D 89 03 A6 */ mtctr r12 -/* 801AE7D8 001AB738 4E 80 04 21 */ bctrl +/* 801AE7D8 001AB738 4E 80 04 21 */ bctrl /* 801AE7DC 001AB73C C0 21 00 08 */ lfs f1, 8(r1) /* 801AE7E0 001AB740 C0 1C 00 40 */ lfs f0, 0x40(r28) /* 801AE7E4 001AB744 C0 81 00 0C */ lfs f4, 0xc(r1) @@ -1772,7 +1772,7 @@ lbl_801AE7B4: /* 801AE818 001AB778 80 01 00 44 */ lwz r0, 0x44(r1) /* 801AE81C 001AB77C 7C 08 03 A6 */ mtlr r0 /* 801AE820 001AB780 38 21 00 40 */ addi r1, r1, 0x40 -/* 801AE824 001AB784 4E 80 00 20 */ blr +/* 801AE824 001AB784 4E 80 00 20 */ blr .global sub_801ae828 sub_801ae828: @@ -1811,13 +1811,13 @@ lbl_801AE87C: /* 801AE8A4 001AB804 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 801AE8A8 001AB808 40 81 00 0C */ ble lbl_801AE8B4 /* 801AE8AC 001AB80C 38 60 00 01 */ li r3, 1 -/* 801AE8B0 001AB810 4E 80 00 20 */ blr +/* 801AE8B0 001AB810 4E 80 00 20 */ blr lbl_801AE8B4: /* 801AE8B4 001AB814 38 60 00 00 */ li r3, 0 -/* 801AE8B8 001AB818 4E 80 00 20 */ blr +/* 801AE8B8 001AB818 4E 80 00 20 */ blr lbl_801AE8BC: /* 801AE8BC 001AB81C 38 60 00 03 */ li r3, 3 -/* 801AE8C0 001AB820 4E 80 00 20 */ blr +/* 801AE8C0 001AB820 4E 80 00 20 */ blr .global sub_801ae8c4 sub_801ae8c4: @@ -1856,7 +1856,7 @@ lbl_801AE93C: /* 801AE93C 001AB89C 80 01 00 34 */ lwz r0, 0x34(r1) /* 801AE940 001AB8A0 7C 08 03 A6 */ mtlr r0 /* 801AE944 001AB8A4 38 21 00 30 */ addi r1, r1, 0x30 -/* 801AE948 001AB8A8 4E 80 00 20 */ blr +/* 801AE948 001AB8A8 4E 80 00 20 */ blr .global sub_801ae94c sub_801ae94c: @@ -1872,7 +1872,7 @@ sub_801ae94c: /* 801AE970 001AB8D0 D0 63 00 00 */ stfs f3, 0(r3) /* 801AE974 001AB8D4 D0 83 00 04 */ stfs f4, 4(r3) /* 801AE978 001AB8D8 D0 03 00 08 */ stfs f0, 8(r3) -/* 801AE97C 001AB8DC 4E 80 00 20 */ blr +/* 801AE97C 001AB8DC 4E 80 00 20 */ blr .global sub_801ae980 sub_801ae980: @@ -1900,7 +1900,7 @@ sub_801ae980: /* 801AE9D4 001AB934 90 C1 00 08 */ stw r6, 8(r1) /* 801AE9D8 001AB938 98 01 00 0C */ stb r0, 0xc(r1) /* 801AE9DC 001AB93C 7D 89 03 A6 */ mtctr r12 -/* 801AE9E0 001AB940 4E 80 04 21 */ bctrl +/* 801AE9E0 001AB940 4E 80 04 21 */ bctrl /* 801AE9E4 001AB944 C0 23 00 00 */ lfs f1, 0(r3) /* 801AE9E8 001AB948 7F C3 F3 78 */ mr r3, r30 /* 801AE9EC 001AB94C 81 9E 00 00 */ lwz r12, 0(r30) @@ -1909,7 +1909,7 @@ sub_801ae980: /* 801AE9F8 001AB958 81 8C 00 34 */ lwz r12, 0x34(r12) /* 801AE9FC 001AB95C EF E1 00 28 */ fsubs f31, f1, f0 /* 801AEA00 001AB960 7D 89 03 A6 */ mtctr r12 -/* 801AEA04 001AB964 4E 80 04 21 */ bctrl +/* 801AEA04 001AB964 4E 80 04 21 */ bctrl /* 801AEA08 001AB968 D3 E3 00 00 */ stfs f31, 0(r3) /* 801AEA0C 001AB96C 38 60 00 01 */ li r3, 1 /* 801AEA10 001AB970 C0 02 A8 BC */ lfs f0, lbl_805AC5DC@sda21(r2) @@ -1931,7 +1931,7 @@ sub_801ae980: /* 801AEA50 001AB9B0 83 C1 00 18 */ lwz r30, 0x18(r1) /* 801AEA54 001AB9B4 7C 08 03 A6 */ mtlr r0 /* 801AEA58 001AB9B8 38 21 00 30 */ addi r1, r1, 0x30 -/* 801AEA5C 001AB9BC 4E 80 00 20 */ blr +/* 801AEA5C 001AB9BC 4E 80 00 20 */ blr .global sub_801aea60 sub_801aea60: @@ -2014,7 +2014,7 @@ lbl_801AEB04: /* 801AEB78 001ABAD8 81 9F 00 00 */ lwz r12, 0(r31) /* 801AEB7C 001ABADC 81 8C 00 90 */ lwz r12, 0x90(r12) /* 801AEB80 001ABAE0 7D 89 03 A6 */ mtctr r12 -/* 801AEB84 001ABAE4 4E 80 04 21 */ bctrl +/* 801AEB84 001ABAE4 4E 80 04 21 */ bctrl /* 801AEB88 001ABAE8 C0 1F 07 D8 */ lfs f0, 0x7d8(r31) /* 801AEB8C 001ABAEC EC 00 F8 2A */ fadds f0, f0, f31 /* 801AEB90 001ABAF0 D0 1F 07 D8 */ stfs f0, 0x7d8(r31) @@ -2027,7 +2027,7 @@ lbl_801AEB94: /* 801AEBA8 001ABB08 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801AEBAC 001ABB0C 7C 08 03 A6 */ mtlr r0 /* 801AEBB0 001ABB10 38 21 00 40 */ addi r1, r1, 0x40 -/* 801AEBB4 001ABB14 4E 80 00 20 */ blr +/* 801AEBB4 001ABB14 4E 80 00 20 */ blr .global sub_801aebb8 sub_801aebb8: @@ -2043,14 +2043,14 @@ lbl_801AEBD0: /* 801AEBD8 001ABB38 7C 03 00 40 */ cmplw r3, r0 /* 801AEBDC 001ABB3C 40 82 00 0C */ bne lbl_801AEBE8 /* 801AEBE0 001ABB40 38 60 00 01 */ li r3, 1 -/* 801AEBE4 001ABB44 4E 80 00 20 */ blr +/* 801AEBE4 001ABB44 4E 80 00 20 */ blr lbl_801AEBE8: /* 801AEBE8 001ABB48 38 C6 00 02 */ addi r6, r6, 2 lbl_801AEBEC: /* 801AEBEC 001ABB4C 7C 06 28 40 */ cmplw r6, r5 /* 801AEBF0 001ABB50 40 82 FF E0 */ bne lbl_801AEBD0 /* 801AEBF4 001ABB54 38 60 00 00 */ li r3, 0 -/* 801AEBF8 001ABB58 4E 80 00 20 */ blr +/* 801AEBF8 001ABB58 4E 80 00 20 */ blr .global sub_801aebfc sub_801aebfc: @@ -2086,7 +2086,7 @@ lbl_801AEC3C: /* 801AEC6C 001ABBCC 7F E4 FB 78 */ mr r4, r31 /* 801AEC70 001ABBD0 81 8C 00 34 */ lwz r12, 0x34(r12) /* 801AEC74 001ABBD4 7D 89 03 A6 */ mtctr r12 -/* 801AEC78 001ABBD8 4E 80 04 21 */ bctrl +/* 801AEC78 001ABBD8 4E 80 04 21 */ bctrl /* 801AEC7C 001ABBDC C0 03 00 00 */ lfs f0, 0(r3) /* 801AEC80 001ABBE0 38 61 00 14 */ addi r3, r1, 0x14 /* 801AEC84 001ABBE4 C0 3E 08 18 */ lfs f1, 0x818(r30) @@ -2113,7 +2113,7 @@ lbl_801AECA4: /* 801AECD0 001ABC30 C0 22 A8 BC */ lfs f1, lbl_805AC5DC@sda21(r2) /* 801AECD4 001ABC34 81 8C 02 88 */ lwz r12, 0x288(r12) /* 801AECD8 001ABC38 7D 89 03 A6 */ mtctr r12 -/* 801AECDC 001ABC3C 4E 80 04 21 */ bctrl +/* 801AECDC 001ABC3C 4E 80 04 21 */ bctrl /* 801AECE0 001ABC40 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801AECE4 001ABC44 41 82 00 18 */ beq lbl_801AECFC /* 801AECE8 001ABC48 C0 3E 08 14 */ lfs f1, 0x814(r30) @@ -2137,7 +2137,7 @@ lbl_801AED1C: /* 801AED24 001ABC84 81 9E 00 00 */ lwz r12, 0(r30) /* 801AED28 001ABC88 81 8C 00 34 */ lwz r12, 0x34(r12) /* 801AED2C 001ABC8C 7D 89 03 A6 */ mtctr r12 -/* 801AED30 001ABC90 4E 80 04 21 */ bctrl +/* 801AED30 001ABC90 4E 80 04 21 */ bctrl /* 801AED34 001ABC94 C0 23 00 00 */ lfs f1, 0(r3) /* 801AED38 001ABC98 C0 02 A8 BC */ lfs f0, lbl_805AC5DC@sda21(r2) /* 801AED3C 001ABC9C FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -2151,7 +2151,7 @@ lbl_801AED1C: /* 801AED5C 001ABCBC 7F E4 FB 78 */ mr r4, r31 /* 801AED60 001ABCC0 38 C0 00 14 */ li r6, 0x14 /* 801AED64 001ABCC4 7D 89 03 A6 */ mtctr r12 -/* 801AED68 001ABCC8 4E 80 04 21 */ bctrl +/* 801AED68 001ABCC8 4E 80 04 21 */ bctrl /* 801AED6C 001ABCCC 7F C3 F3 78 */ mr r3, r30 /* 801AED70 001ABCD0 7F E5 FB 78 */ mr r5, r31 /* 801AED74 001ABCD4 38 80 00 29 */ li r4, 0x29 @@ -2177,7 +2177,7 @@ lbl_801AED88: /* 801AEDBC 001ABD1C C3 FE 08 18 */ lfs f31, 0x818(r30) /* 801AEDC0 001ABD20 81 8C 00 34 */ lwz r12, 0x34(r12) /* 801AEDC4 001ABD24 7D 89 03 A6 */ mtctr r12 -/* 801AEDC8 001ABD28 4E 80 04 21 */ bctrl +/* 801AEDC8 001ABD28 4E 80 04 21 */ bctrl /* 801AEDCC 001ABD2C D3 E3 00 00 */ stfs f31, 0(r3) lbl_801AEDD0: /* 801AEDD0 001ABD30 3B 9C 00 02 */ addi r28, r28, 2 @@ -2197,7 +2197,7 @@ lbl_801AEDE8: /* 801AEE00 001ABD60 83 81 00 30 */ lwz r28, 0x30(r1) /* 801AEE04 001ABD64 7C 08 03 A6 */ mtlr r0 /* 801AEE08 001ABD68 38 21 00 50 */ addi r1, r1, 0x50 -/* 801AEE0C 001ABD6C 4E 80 00 20 */ blr +/* 801AEE0C 001ABD6C 4E 80 00 20 */ blr .global sub_801aee10 sub_801aee10: @@ -2257,14 +2257,14 @@ lbl_801AEE88: /* 801AEED0 001ABE30 81 9C 00 00 */ lwz r12, 0(r28) /* 801AEED4 001ABE34 81 8C 00 34 */ lwz r12, 0x34(r12) /* 801AEED8 001ABE38 7D 89 03 A6 */ mtctr r12 -/* 801AEEDC 001ABE3C 4E 80 04 21 */ bctrl +/* 801AEEDC 001ABE3C 4E 80 04 21 */ bctrl /* 801AEEE0 001ABE40 7C 7B 1B 78 */ mr r27, r3 /* 801AEEE4 001ABE44 7F 23 CB 78 */ mr r3, r25 /* 801AEEE8 001ABE48 81 99 00 00 */ lwz r12, 0(r25) /* 801AEEEC 001ABE4C 7F A4 EB 78 */ mr r4, r29 /* 801AEEF0 001ABE50 81 8C 00 34 */ lwz r12, 0x34(r12) /* 801AEEF4 001ABE54 7D 89 03 A6 */ mtctr r12 -/* 801AEEF8 001ABE58 4E 80 04 21 */ bctrl +/* 801AEEF8 001ABE58 4E 80 04 21 */ bctrl /* 801AEEFC 001ABE5C C0 1B 00 00 */ lfs f0, 0(r27) /* 801AEF00 001ABE60 3C 80 80 3D */ lis r4, lbl_803D1590@ha /* 801AEF04 001ABE64 38 84 15 90 */ addi r4, r4, lbl_803D1590@l @@ -2307,14 +2307,14 @@ lbl_801AEF70: /* 801AEF88 001ABEE8 81 9C 00 00 */ lwz r12, 0(r28) /* 801AEF8C 001ABEEC 81 8C 00 34 */ lwz r12, 0x34(r12) /* 801AEF90 001ABEF0 7D 89 03 A6 */ mtctr r12 -/* 801AEF94 001ABEF4 4E 80 04 21 */ bctrl +/* 801AEF94 001ABEF4 4E 80 04 21 */ bctrl /* 801AEF98 001ABEF8 C0 03 00 00 */ lfs f0, 0(r3) /* 801AEF9C 001ABEFC D0 1C 08 18 */ stfs f0, 0x818(r28) /* 801AEFA0 001ABF00 BB 21 00 34 */ lmw r25, 0x34(r1) /* 801AEFA4 001ABF04 80 01 00 54 */ lwz r0, 0x54(r1) /* 801AEFA8 001ABF08 7C 08 03 A6 */ mtlr r0 /* 801AEFAC 001ABF0C 38 21 00 50 */ addi r1, r1, 0x50 -/* 801AEFB0 001ABF10 4E 80 00 20 */ blr +/* 801AEFB0 001ABF10 4E 80 00 20 */ blr .global sub_801aefb4 sub_801aefb4: @@ -2348,7 +2348,7 @@ lbl_801AF018: /* 801AF01C 001ABF7C 81 9D 00 00 */ lwz r12, 0(r29) /* 801AF020 001ABF80 81 8C 00 38 */ lwz r12, 0x38(r12) /* 801AF024 001ABF84 7D 89 03 A6 */ mtctr r12 -/* 801AF028 001ABF88 4E 80 04 21 */ bctrl +/* 801AF028 001ABF88 4E 80 04 21 */ bctrl /* 801AF02C 001ABF8C 7C 64 1B 78 */ mr r4, r3 /* 801AF030 001ABF90 7F E3 FB 78 */ mr r3, r31 /* 801AF034 001ABF94 4B FF 9B 65 */ bl SetDamageVulnerability__15CCollisionActorFRC20CDamageVulnerability @@ -2359,7 +2359,7 @@ lbl_801AF038: /* 801AF044 001ABFA4 83 A1 00 24 */ lwz r29, 0x24(r1) /* 801AF048 001ABFA8 7C 08 03 A6 */ mtlr r0 /* 801AF04C 001ABFAC 38 21 00 30 */ addi r1, r1, 0x30 -/* 801AF050 001ABFB0 4E 80 00 20 */ blr +/* 801AF050 001ABFB0 4E 80 00 20 */ blr .global sub_801af054 sub_801af054: @@ -2391,7 +2391,7 @@ sub_801af054: /* 801AF0B8 001AC018 83 C1 00 10 */ lwz r30, 0x10(r1) /* 801AF0BC 001AC01C 7C 08 03 A6 */ mtlr r0 /* 801AF0C0 001AC020 38 21 00 20 */ addi r1, r1, 0x20 -/* 801AF0C4 001AC024 4E 80 00 20 */ blr +/* 801AF0C4 001AC024 4E 80 00 20 */ blr .global sub_801af0c8 sub_801af0c8: @@ -2462,7 +2462,7 @@ lbl_801AF0EC: /* 801AF1C4 001AC124 81 99 00 00 */ lwz r12, 0(r25) /* 801AF1C8 001AC128 81 8C 00 38 */ lwz r12, 0x38(r12) /* 801AF1CC 001AC12C 7D 89 03 A6 */ mtctr r12 -/* 801AF1D0 001AC130 4E 80 04 21 */ bctrl +/* 801AF1D0 001AC130 4E 80 04 21 */ bctrl /* 801AF1D4 001AC134 7C 64 1B 78 */ mr r4, r3 /* 801AF1D8 001AC138 7F 83 E3 78 */ mr r3, r28 /* 801AF1DC 001AC13C 4B FF 99 BD */ bl SetDamageVulnerability__15CCollisionActorFRC20CDamageVulnerability @@ -2477,7 +2477,7 @@ lbl_801AF1E4: /* 801AF1F8 001AC158 80 01 00 54 */ lwz r0, 0x54(r1) /* 801AF1FC 001AC15C 7C 08 03 A6 */ mtlr r0 /* 801AF200 001AC160 38 21 00 50 */ addi r1, r1, 0x50 -/* 801AF204 001AC164 4E 80 00 20 */ blr +/* 801AF204 001AC164 4E 80 00 20 */ blr .global sub_801af208 sub_801af208: @@ -2575,7 +2575,7 @@ lbl_801AF358: /* 801AF364 001AC2C4 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 801AF368 001AC2C8 7C 08 03 A6 */ mtlr r0 /* 801AF36C 001AC2CC 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 801AF370 001AC2D0 4E 80 00 20 */ blr +/* 801AF370 001AC2D0 4E 80 00 20 */ blr .global sub_801af374 sub_801af374: @@ -2692,7 +2692,7 @@ lbl_801AF510: /* 801AF51C 001AC47C 80 01 01 04 */ lwz r0, 0x104(r1) /* 801AF520 001AC480 7C 08 03 A6 */ mtlr r0 /* 801AF524 001AC484 38 21 01 00 */ addi r1, r1, 0x100 -/* 801AF528 001AC488 4E 80 00 20 */ blr +/* 801AF528 001AC488 4E 80 00 20 */ blr .global sub_801af52c sub_801af52c: @@ -3000,7 +3000,7 @@ lbl_801AF764: /* 801AF9D4 001AC934 83 81 00 A0 */ lwz r28, 0xa0(r1) /* 801AF9D8 001AC938 7C 08 03 A6 */ mtlr r0 /* 801AF9DC 001AC93C 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 801AF9E0 001AC940 4E 80 00 20 */ blr +/* 801AF9E0 001AC940 4E 80 00 20 */ blr .global Dead__9CFlaahgraFR13CStateManager9EStateMsgf Dead__9CFlaahgraFR13CStateManager9EStateMsgf: @@ -3208,7 +3208,7 @@ lbl_801AFCD4: /* 801AFCE0 001ACC40 83 A1 00 B4 */ lwz r29, 0xb4(r1) /* 801AFCE4 001ACC44 7C 08 03 A6 */ mtlr r0 /* 801AFCE8 001ACC48 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 801AFCEC 001ACC4C 4E 80 00 20 */ blr +/* 801AFCEC 001ACC4C 4E 80 00 20 */ blr .global Cover__9CFlaahgraFR13CStateManager9EStateMsgf Cover__9CFlaahgraFR13CStateManager9EStateMsgf: @@ -3464,7 +3464,7 @@ lbl_801B0090: /* 801B0098 001ACFF8 83 C1 00 A8 */ lwz r30, 0xa8(r1) /* 801B009C 001ACFFC 7C 08 03 A6 */ mtlr r0 /* 801B00A0 001AD000 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 801B00A4 001AD004 4E 80 00 20 */ blr +/* 801B00A4 001AD004 4E 80 00 20 */ blr .global Dizzy__9CFlaahgraFR13CStateManager9EStateMsgf Dizzy__9CFlaahgraFR13CStateManager9EStateMsgf: @@ -3563,7 +3563,7 @@ lbl_801B01E4: .global sub_801b01f4 sub_801b01f4: -/* 801B01F4 001AD154 4E 80 00 20 */ blr +/* 801B01F4 001AD154 4E 80 00 20 */ blr .global ProjectileAttack__9CFlaahgraFR13CStateManager9EStateMsgf ProjectileAttack__9CFlaahgraFR13CStateManager9EStateMsgf: @@ -3767,7 +3767,7 @@ lbl_801B04C8: /* 801B04D4 001AD434 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 801B04D8 001AD438 7C 08 03 A6 */ mtlr r0 /* 801B04DC 001AD43C 38 21 00 50 */ addi r1, r1, 0x50 -/* 801B04E0 001AD440 4E 80 00 20 */ blr +/* 801B04E0 001AD440 4E 80 00 20 */ blr .global SpecialAttack__9CFlaahgraFR13CStateManager9EStateMsgf SpecialAttack__9CFlaahgraFR13CStateManager9EStateMsgf: @@ -3937,7 +3937,7 @@ lbl_801B073C: /* 801B0748 001AD6A8 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 801B074C 001AD6AC 7C 08 03 A6 */ mtlr r0 /* 801B0750 001AD6B0 38 21 00 50 */ addi r1, r1, 0x50 -/* 801B0754 001AD6B4 4E 80 00 20 */ blr +/* 801B0754 001AD6B4 4E 80 00 20 */ blr .global Attack__9CFlaahgraFR13CStateManager9EStateMsgf Attack__9CFlaahgraFR13CStateManager9EStateMsgf: @@ -4104,7 +4104,7 @@ lbl_801B0990: /* 801B09AC 001AD90C 81 83 00 00 */ lwz r12, 0(r3) /* 801B09B0 001AD910 81 8C 01 DC */ lwz r12, 0x1dc(r12) /* 801B09B4 001AD914 7D 89 03 A6 */ mtctr r12 -/* 801B09B8 001AD918 4E 80 04 21 */ bctrl +/* 801B09B8 001AD918 4E 80 04 21 */ bctrl /* 801B09BC 001AD91C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801B09C0 001AD920 41 82 01 C8 */ beq lbl_801B0B88 /* 801B09C4 001AD924 80 1E 07 A8 */ lwz r0, 0x7a8(r30) @@ -4232,7 +4232,7 @@ lbl_801B0B88: /* 801B0B98 001ADAF8 83 C1 00 68 */ lwz r30, 0x68(r1) /* 801B0B9C 001ADAFC 7C 08 03 A6 */ mtlr r0 /* 801B0BA0 001ADB00 38 21 00 80 */ addi r1, r1, 0x80 -/* 801B0BA4 001ADB04 4E 80 00 20 */ blr +/* 801B0BA4 001ADB04 4E 80 00 20 */ blr .global TurnAround__9CFlaahgraFR13CStateManager9EStateMsgf TurnAround__9CFlaahgraFR13CStateManager9EStateMsgf: @@ -4274,7 +4274,7 @@ lbl_801B0C24: /* 801B0C28 001ADB88 C0 22 A8 BC */ lfs f1, lbl_805AC5DC@sda21(r2) /* 801B0C2C 001ADB8C 81 8C 01 E8 */ lwz r12, 0x1e8(r12) /* 801B0C30 001ADB90 7D 89 03 A6 */ mtctr r12 -/* 801B0C34 001ADB94 4E 80 04 21 */ bctrl +/* 801B0C34 001ADB94 4E 80 04 21 */ bctrl /* 801B0C38 001ADB98 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801B0C3C 001ADB9C 41 82 00 E8 */ beq lbl_801B0D24 /* 801B0C40 001ADBA0 80 9E 00 64 */ lwz r4, 0x64(r30) @@ -4292,7 +4292,7 @@ lbl_801B0C6C: /* 801B0C6C 001ADBCC 81 84 00 00 */ lwz r12, 0(r4) /* 801B0C70 001ADBD0 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 801B0C74 001ADBD4 7D 89 03 A6 */ mtctr r12 -/* 801B0C78 001ADBD8 4E 80 04 21 */ bctrl +/* 801B0C78 001ADBD8 4E 80 04 21 */ bctrl /* 801B0C7C 001ADBDC C0 21 00 20 */ lfs f1, 0x20(r1) /* 801B0C80 001ADBE0 38 61 00 28 */ addi r3, r1, 0x28 /* 801B0C84 001ADBE4 C0 1E 00 50 */ lfs f0, 0x50(r30) @@ -4342,7 +4342,7 @@ lbl_801B0D24: /* 801B0D2C 001ADC8C 83 C1 00 58 */ lwz r30, 0x58(r1) /* 801B0D30 001ADC90 7C 08 03 A6 */ mtlr r0 /* 801B0D34 001ADC94 38 21 00 60 */ addi r1, r1, 0x60 -/* 801B0D38 001ADC98 4E 80 00 20 */ blr +/* 801B0D38 001ADC98 4E 80 00 20 */ blr .global Suck__9CFlaahgraFR13CStateManager9EStateMsgf Suck__9CFlaahgraFR13CStateManager9EStateMsgf: @@ -4516,7 +4516,7 @@ lbl_801B0FA0: /* 801B0FA8 001ADF08 83 C1 00 38 */ lwz r30, 0x38(r1) /* 801B0FAC 001ADF0C 7C 08 03 A6 */ mtlr r0 /* 801B0FB0 001ADF10 38 21 00 40 */ addi r1, r1, 0x40 -/* 801B0FB4 001ADF14 4E 80 00 20 */ blr +/* 801B0FB4 001ADF14 4E 80 00 20 */ blr .global GetUp__9CFlaahgraFR13CStateManager9EStateMsgf GetUp__9CFlaahgraFR13CStateManager9EStateMsgf: @@ -4662,7 +4662,7 @@ lbl_801B11AC: /* 801B11B4 001AE114 83 C1 00 18 */ lwz r30, 0x18(r1) /* 801B11B8 001AE118 7C 08 03 A6 */ mtlr r0 /* 801B11BC 001AE11C 38 21 00 20 */ addi r1, r1, 0x20 -/* 801B11C0 001AE120 4E 80 00 20 */ blr +/* 801B11C0 001AE120 4E 80 00 20 */ blr .global Faint__9CFlaahgraFR13CStateManager9EStateMsgf Faint__9CFlaahgraFR13CStateManager9EStateMsgf: @@ -4853,7 +4853,7 @@ lbl_801B1474: /* 801B147C 001AE3DC 83 C1 00 38 */ lwz r30, 0x38(r1) /* 801B1480 001AE3E0 7C 08 03 A6 */ mtlr r0 /* 801B1484 001AE3E4 38 21 00 40 */ addi r1, r1, 0x40 -/* 801B1488 001AE3E8 4E 80 00 20 */ blr +/* 801B1488 001AE3E8 4E 80 00 20 */ blr .global Growth__9CFlaahgraFR13CStateManager9EStateMsgf Growth__9CFlaahgraFR13CStateManager9EStateMsgf: @@ -5089,7 +5089,7 @@ lbl_801B17E4: /* 801B17EC 001AE74C 83 C1 00 58 */ lwz r30, 0x58(r1) /* 801B17F0 001AE750 7C 08 03 A6 */ mtlr r0 /* 801B17F4 001AE754 38 21 00 60 */ addi r1, r1, 0x60 -/* 801B17F8 001AE758 4E 80 00 20 */ blr +/* 801B17F8 001AE758 4E 80 00 20 */ blr .global Generate__9CFlaahgraFR13CStateManager9EStateMsgf Generate__9CFlaahgraFR13CStateManager9EStateMsgf: @@ -5205,7 +5205,7 @@ lbl_801B1988: /* 801B198C 001AE8EC 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 801B1990 001AE8F0 7C 08 03 A6 */ mtlr r0 /* 801B1994 001AE8F4 38 21 00 30 */ addi r1, r1, 0x30 -/* 801B1998 001AE8F8 4E 80 00 20 */ blr +/* 801B1998 001AE8F8 4E 80 00 20 */ blr .global Enraged__9CFlaahgraFR13CStateManager9EStateMsgf Enraged__9CFlaahgraFR13CStateManager9EStateMsgf: @@ -5289,7 +5289,7 @@ lbl_801B1AA8: /* 801B1AAC 001AEA0C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801B1AB0 001AEA10 7C 08 03 A6 */ mtlr r0 /* 801B1AB4 001AEA14 38 21 00 20 */ addi r1, r1, 0x20 -/* 801B1AB8 001AEA18 4E 80 00 20 */ blr +/* 801B1AB8 001AEA18 4E 80 00 20 */ blr .global FadeIn__9CFlaahgraFR13CStateManager9EStateMsgf FadeIn__9CFlaahgraFR13CStateManager9EStateMsgf: @@ -5305,7 +5305,7 @@ FadeIn__9CFlaahgraFR13CStateManager9EStateMsgf: /* 801B1AE0 001AEA40 81 83 00 00 */ lwz r12, 0(r3) /* 801B1AE4 001AEA44 81 8C 00 34 */ lwz r12, 0x34(r12) /* 801B1AE8 001AEA48 7D 89 03 A6 */ mtctr r12 -/* 801B1AEC 001AEA4C 4E 80 04 21 */ bctrl +/* 801B1AEC 001AEA4C 4E 80 04 21 */ bctrl /* 801B1AF0 001AEA50 C0 23 00 00 */ lfs f1, 0(r3) /* 801B1AF4 001AEA54 C0 02 A8 BC */ lfs f0, lbl_805AC5DC@sda21(r2) /* 801B1AF8 001AEA58 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -5330,7 +5330,7 @@ lbl_801B1B34: /* 801B1B3C 001AEA9C 83 C1 00 08 */ lwz r30, 8(r1) /* 801B1B40 001AEAA0 7C 08 03 A6 */ mtlr r0 /* 801B1B44 001AEAA4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801B1B48 001AEAA8 4E 80 00 20 */ blr +/* 801B1B48 001AEAA8 4E 80 00 20 */ blr .global FadeOut__9CFlaahgraFR13CStateManager9EStateMsgf FadeOut__9CFlaahgraFR13CStateManager9EStateMsgf: @@ -5410,7 +5410,7 @@ lbl_801B1C60: /* 801B1C68 001AEBC8 83 C1 00 28 */ lwz r30, 0x28(r1) /* 801B1C6C 001AEBCC 7C 08 03 A6 */ mtlr r0 /* 801B1C70 001AEBD0 38 21 00 30 */ addi r1, r1, 0x30 -/* 801B1C74 001AEBD4 4E 80 00 20 */ blr +/* 801B1C74 001AEBD4 4E 80 00 20 */ blr .global sub_801b1c78 sub_801b1c78: @@ -5418,7 +5418,7 @@ sub_801b1c78: /* 801B1C7C 001AEBDC 20 00 00 04 */ subfic r0, r0, 4 /* 801B1C80 001AEBE0 7C 00 00 34 */ cntlzw r0, r0 /* 801B1C84 001AEBE4 54 03 D9 7E */ srwi r3, r0, 5 -/* 801B1C88 001AEBE8 4E 80 00 20 */ blr +/* 801B1C88 001AEBE8 4E 80 00 20 */ blr .global CoverCheck__9CFlaahgraFR13CStateManagerf CoverCheck__9CFlaahgraFR13CStateManagerf: @@ -5474,7 +5474,7 @@ lbl_801B1D28: /* 801B1D38 001AEC98 83 81 00 10 */ lwz r28, 0x10(r1) /* 801B1D3C 001AEC9C 7C 08 03 A6 */ mtlr r0 /* 801B1D40 001AECA0 38 21 00 20 */ addi r1, r1, 0x20 -/* 801B1D44 001AECA4 4E 80 00 20 */ blr +/* 801B1D44 001AECA4 4E 80 00 20 */ blr .global IsDizzy__9CFlaahgraFR13CStateManagerf IsDizzy__9CFlaahgraFR13CStateManagerf: @@ -5483,7 +5483,7 @@ IsDizzy__9CFlaahgraFR13CStateManagerf: /* 801B1D50 001AECB0 20 00 00 0A */ subfic r0, r0, 0xa /* 801B1D54 001AECB4 7C 00 00 34 */ cntlzw r0, r0 /* 801B1D58 001AECB8 54 03 D9 7E */ srwi r3, r0, 5 -/* 801B1D5C 001AECBC 4E 80 00 20 */ blr +/* 801B1D5C 001AECBC 4E 80 00 20 */ blr .global BreakAttack__9CFlaahgraFR13CStateManagerf BreakAttack__9CFlaahgraFR13CStateManagerf: @@ -5499,7 +5499,7 @@ BreakAttack__9CFlaahgraFR13CStateManagerf: /* 801B1D84 001AECE4 38 80 00 01 */ li r4, 1 lbl_801B1D88: /* 801B1D88 001AECE8 7C 83 23 78 */ mr r3, r4 -/* 801B1D8C 001AECEC 4E 80 00 20 */ blr +/* 801B1D8C 001AECEC 4E 80 00 20 */ blr .global ShouldFire__9CFlaahgraFR13CStateManagerf ShouldFire__9CFlaahgraFR13CStateManagerf: @@ -5556,7 +5556,7 @@ lbl_801B1E4C: /* 801B1E50 001AEDB0 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 801B1E54 001AEDB4 7C 08 03 A6 */ mtlr r0 /* 801B1E58 001AEDB8 38 21 00 40 */ addi r1, r1, 0x40 -/* 801B1E5C 001AEDBC 4E 80 00 20 */ blr +/* 801B1E5C 001AEDBC 4E 80 00 20 */ blr .global ShouldSpecialAttack__9CFlaahgraFR13CStateManagerf ShouldSpecialAttack__9CFlaahgraFR13CStateManagerf: @@ -5573,7 +5573,7 @@ ShouldSpecialAttack__9CFlaahgraFR13CStateManagerf: /* 801B1E88 001AEDE8 81 83 00 00 */ lwz r12, 0(r3) /* 801B1E8C 001AEDEC 81 8C 02 34 */ lwz r12, 0x234(r12) /* 801B1E90 001AEDF0 7D 89 03 A6 */ mtctr r12 -/* 801B1E94 001AEDF4 4E 80 04 21 */ bctrl +/* 801B1E94 001AEDF4 4E 80 04 21 */ bctrl /* 801B1E98 001AEDF8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801B1E9C 001AEDFC 41 82 00 1C */ beq lbl_801B1EB8 /* 801B1EA0 001AEE00 80 1F 07 88 */ lwz r0, 0x788(r31) @@ -5589,7 +5589,7 @@ lbl_801B1EBC: /* 801B1EC0 001AEE20 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801B1EC4 001AEE24 7C 08 03 A6 */ mtlr r0 /* 801B1EC8 001AEE28 38 21 00 10 */ addi r1, r1, 0x10 -/* 801B1ECC 001AEE2C 4E 80 00 20 */ blr +/* 801B1ECC 001AEE2C 4E 80 00 20 */ blr .global ShouldAttack__9CFlaahgraFR13CStateManagerf ShouldAttack__9CFlaahgraFR13CStateManagerf: @@ -5708,7 +5708,7 @@ lbl_801B2068: /* 801B2080 001AEFE0 83 C1 00 48 */ lwz r30, 0x48(r1) /* 801B2084 001AEFE4 7C 08 03 A6 */ mtlr r0 /* 801B2088 001AEFE8 38 21 00 70 */ addi r1, r1, 0x70 -/* 801B208C 001AEFEC 4E 80 00 20 */ blr +/* 801B208C 001AEFEC 4E 80 00 20 */ blr .global ShouldTurn__9CFlaahgraFR13CStateManagerf ShouldTurn__9CFlaahgraFR13CStateManagerf: @@ -5762,7 +5762,7 @@ ShouldTurn__9CFlaahgraFR13CStateManagerf: /* 801B214C 001AF0AC 80 01 00 64 */ lwz r0, 0x64(r1) /* 801B2150 001AF0B0 7C 08 03 A6 */ mtlr r0 /* 801B2154 001AF0B4 38 21 00 60 */ addi r1, r1, 0x60 -/* 801B2158 001AF0B8 4E 80 00 20 */ blr +/* 801B2158 001AF0B8 4E 80 00 20 */ blr .global AIStage__9CFlaahgraFR13CStateManagerf AIStage__9CFlaahgraFR13CStateManagerf: @@ -5775,7 +5775,7 @@ AIStage__9CFlaahgraFR13CStateManagerf: /* 801B2174 001AF0D4 7C 00 00 34 */ cntlzw r0, r0 /* 801B2178 001AF0D8 54 03 D9 7E */ srwi r3, r0, 5 /* 801B217C 001AF0DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801B2180 001AF0E0 4E 80 00 20 */ blr +/* 801B2180 001AF0E0 4E 80 00 20 */ blr .global HitSomething__9CFlaahgraFR13CStateManagerf HitSomething__9CFlaahgraFR13CStateManagerf: @@ -5784,18 +5784,18 @@ HitSomething__9CFlaahgraFR13CStateManagerf: /* 801B218C 001AF0EC FC 01 00 40 */ fcmpo cr0, f1, f0 /* 801B2190 001AF0F0 7C 00 00 26 */ mfcr r0 /* 801B2194 001AF0F4 54 03 17 FE */ rlwinm r3, r0, 2, 0x1f, 0x1f -/* 801B2198 001AF0F8 4E 80 00 20 */ blr +/* 801B2198 001AF0F8 4E 80 00 20 */ blr .global OffLine__9CFlaahgraFR13CStateManagerf OffLine__9CFlaahgraFR13CStateManagerf: /* 801B219C 001AF0FC 88 83 08 E5 */ lbz r4, 0x8e5(r3) /* 801B21A0 001AF100 38 60 00 00 */ li r3, 0 /* 801B21A4 001AF104 54 80 F7 FF */ rlwinm. r0, r4, 0x1e, 0x1f, 0x1f -/* 801B21A8 001AF108 4D 82 00 20 */ beqlr +/* 801B21A8 001AF108 4D 82 00 20 */ beqlr /* 801B21AC 001AF10C 54 80 EF FF */ rlwinm. r0, r4, 0x1d, 0x1f, 0x1f -/* 801B21B0 001AF110 4D 82 00 20 */ beqlr +/* 801B21B0 001AF110 4D 82 00 20 */ beqlr /* 801B21B4 001AF114 38 60 00 01 */ li r3, 1 -/* 801B21B8 001AF118 4E 80 00 20 */ blr +/* 801B21B8 001AF118 4E 80 00 20 */ blr .global Death__9CFlaahgraFRC9CVector3fR13CStateManager Death__9CFlaahgraFRC9CVector3fR13CStateManager: @@ -5842,7 +5842,7 @@ lbl_801B224C: /* 801B2254 001AF1B4 83 C1 00 18 */ lwz r30, 0x18(r1) /* 801B2258 001AF1B8 7C 08 03 A6 */ mtlr r0 /* 801B225C 001AF1BC 38 21 00 20 */ addi r1, r1, 0x20 -/* 801B2260 001AF1C0 4E 80 00 20 */ blr +/* 801B2260 001AF1C0 4E 80 00 20 */ blr .global DoUserAnimEvent__9CFlaahgraFR13CStateManagerRC13CInt32POINode14EUserEventType DoUserAnimEvent__9CFlaahgraFR13CStateManagerRC13CInt32POINode14EUserEventType: @@ -5871,7 +5871,7 @@ DoUserAnimEvent__9CFlaahgraFR13CStateManagerRC13CInt32POINode14EUserEventType: /* 801B22BC 001AF21C 38 84 4D 74 */ addi r4, r4, lbl_803E4D74@l /* 801B22C0 001AF220 7C 04 00 2E */ lwzx r0, r4, r0 /* 801B22C4 001AF224 7C 09 03 A6 */ mtctr r0 -/* 801B22C8 001AF228 4E 80 04 20 */ bctr +/* 801B22C8 001AF228 4E 80 04 20 */ bctr .global lbl_801B22CC lbl_801B22CC: /* 801B22CC 001AF22C 7F 64 DB 78 */ mr r4, r27 @@ -5937,7 +5937,7 @@ lbl_801B2380: /* 801B23A8 001AF308 81 9B 00 00 */ lwz r12, 0(r27) /* 801B23AC 001AF30C 81 8C 02 C0 */ lwz r12, 0x2c0(r12) /* 801B23B0 001AF310 7D 89 03 A6 */ mtctr r12 -/* 801B23B4 001AF314 4E 80 04 21 */ bctrl +/* 801B23B4 001AF314 4E 80 04 21 */ bctrl /* 801B23B8 001AF318 FC 20 F0 90 */ fmr f1, f30 /* 801B23BC 001AF31C 7C 64 1B 78 */ mr r4, r3 /* 801B23C0 001AF320 7F 47 D3 78 */ mr r7, r26 @@ -6077,7 +6077,7 @@ lbl_801B259C: /* 801B25BC 001AF51C 81 9B 00 00 */ lwz r12, 0(r27) /* 801B25C0 001AF520 81 8C 02 C0 */ lwz r12, 0x2c0(r12) /* 801B25C4 001AF524 7D 89 03 A6 */ mtctr r12 -/* 801B25C8 001AF528 4E 80 04 21 */ bctrl +/* 801B25C8 001AF528 4E 80 04 21 */ bctrl /* 801B25CC 001AF52C FC 20 F0 90 */ fmr f1, f30 /* 801B25D0 001AF530 7C 64 1B 78 */ mr r4, r3 /* 801B25D4 001AF534 7F 47 D3 78 */ mr r7, r26 @@ -6270,7 +6270,7 @@ lbl_801B2868: /* 801B2894 001AF7F4 81 84 00 00 */ lwz r12, 0(r4) /* 801B2898 001AF7F8 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 801B289C 001AF7FC 7D 89 03 A6 */ mtctr r12 -/* 801B28A0 001AF800 4E 80 04 21 */ bctrl +/* 801B28A0 001AF800 4E 80 04 21 */ bctrl /* 801B28A4 001AF804 C0 41 00 7C */ lfs f2, 0x7c(r1) /* 801B28A8 001AF808 38 01 01 3C */ addi r0, r1, 0x13c /* 801B28AC 001AF80C C0 A1 03 CC */ lfs f5, 0x3cc(r1) @@ -6450,7 +6450,7 @@ lbl_801B2B18: /* 801B2B3C 001AFA9C 80 01 05 44 */ lwz r0, 0x544(r1) /* 801B2B40 001AFAA0 7C 08 03 A6 */ mtlr r0 /* 801B2B44 001AFAA4 38 21 05 40 */ addi r1, r1, 0x540 -/* 801B2B48 001AFAA8 4E 80 00 20 */ blr +/* 801B2B48 001AFAA8 4E 80 00 20 */ blr .global ProjectileInfo__9CFlaahgraFv ProjectileInfo__9CFlaahgraFv: @@ -6458,10 +6458,10 @@ ProjectileInfo__9CFlaahgraFv: /* 801B2B50 001AFAB0 54 00 FF FF */ rlwinm. r0, r0, 0x1f, 0x1f, 0x1f /* 801B2B54 001AFAB4 41 82 00 0C */ beq lbl_801B2B60 /* 801B2B58 001AFAB8 38 63 07 04 */ addi r3, r3, 0x704 -/* 801B2B5C 001AFABC 4E 80 00 20 */ blr +/* 801B2B5C 001AFABC 4E 80 00 20 */ blr lbl_801B2B60: /* 801B2B60 001AFAC0 38 63 06 DC */ addi r3, r3, 0x6dc -/* 801B2B64 001AFAC4 4E 80 00 20 */ blr +/* 801B2B64 001AFAC4 4E 80 00 20 */ blr .global GetAimPosition__9CFlaahgraCFRC13CStateManagerf GetAimPosition__9CFlaahgraCFRC13CStateManagerf: @@ -6471,7 +6471,7 @@ GetAimPosition__9CFlaahgraCFRC13CStateManagerf: /* 801B2B74 001AFAD4 D0 03 00 04 */ stfs f0, 4(r3) /* 801B2B78 001AFAD8 C0 04 08 28 */ lfs f0, 0x828(r4) /* 801B2B7C 001AFADC D0 03 00 08 */ stfs f0, 8(r3) -/* 801B2B80 001AFAE0 4E 80 00 20 */ blr +/* 801B2B80 001AFAE0 4E 80 00 20 */ blr .global AddToRenderer__9CFlaahgraCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__9CFlaahgraCFRC14CFrustumPlanesRC13CStateManager: @@ -6502,7 +6502,7 @@ lbl_801B2BC4: /* 801B2BE0 001AFB40 81 9E 00 00 */ lwz r12, 0(r30) /* 801B2BE4 001AFB44 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 801B2BE8 001AFB48 7D 89 03 A6 */ mtctr r12 -/* 801B2BEC 001AFB4C 4E 80 04 21 */ bctrl +/* 801B2BEC 001AFB4C 4E 80 04 21 */ bctrl /* 801B2BF0 001AFB50 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801B2BF4 001AFB54 41 82 00 20 */ beq lbl_801B2C14 /* 801B2BF8 001AFB58 7F C3 F3 78 */ mr r3, r30 @@ -6510,7 +6510,7 @@ lbl_801B2BC4: /* 801B2C00 001AFB60 81 9E 00 00 */ lwz r12, 0(r30) /* 801B2C04 001AFB64 81 8C 00 28 */ lwz r12, 0x28(r12) /* 801B2C08 001AFB68 7D 89 03 A6 */ mtctr r12 -/* 801B2C0C 001AFB6C 4E 80 04 21 */ bctrl +/* 801B2C0C 001AFB6C 4E 80 04 21 */ bctrl /* 801B2C10 001AFB70 48 00 00 10 */ b lbl_801B2C20 lbl_801B2C14: /* 801B2C14 001AFB74 7F C3 F3 78 */ mr r3, r30 @@ -6522,12 +6522,12 @@ lbl_801B2C20: /* 801B2C28 001AFB88 83 C1 00 08 */ lwz r30, 8(r1) /* 801B2C2C 001AFB8C 7C 08 03 A6 */ mtlr r0 /* 801B2C30 001AFB90 38 21 00 10 */ addi r1, r1, 0x10 -/* 801B2C34 001AFB94 4E 80 00 20 */ blr +/* 801B2C34 001AFB94 4E 80 00 20 */ blr .global CanRenderUnsorted__9CFlaahgraCFRC13CStateManager CanRenderUnsorted__9CFlaahgraCFRC13CStateManager: /* 801B2C38 001AFB98 38 60 00 01 */ li r3, 1 -/* 801B2C3C 001AFB9C 4E 80 00 20 */ blr +/* 801B2C3C 001AFB9C 4E 80 00 20 */ blr .global AcceptScriptMsg__9CFlaahgraF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__9CFlaahgraF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -6546,7 +6546,7 @@ AcceptScriptMsg__9CFlaahgraF20EScriptObjectMessage9TUniqueIdR13CStateManager: /* 801B2C70 001AFBD0 38 84 4D E0 */ addi r4, r4, lbl_803E4DE0@l /* 801B2C74 001AFBD4 7C 04 00 2E */ lwzx r0, r4, r0 /* 801B2C78 001AFBD8 7C 09 03 A6 */ mtctr r0 -/* 801B2C7C 001AFBDC 4E 80 04 20 */ bctr +/* 801B2C7C 001AFBDC 4E 80 04 20 */ bctr .global lbl_801B2C80 lbl_801B2C80: /* 801B2C80 001AFBE0 88 7F 08 E4 */ lbz r3, 0x8e4(r31) @@ -6704,7 +6704,7 @@ lbl_801B2EAC: /* 801B2EB0 001AFE10 7F C4 F3 78 */ mr r4, r30 /* 801B2EB4 001AFE14 81 8C 00 34 */ lwz r12, 0x34(r12) /* 801B2EB8 001AFE18 7D 89 03 A6 */ mtctr r12 -/* 801B2EBC 001AFE1C 4E 80 04 21 */ bctrl +/* 801B2EBC 001AFE1C 4E 80 04 21 */ bctrl /* 801B2EC0 001AFE20 C0 23 00 00 */ lfs f1, 0(r3) /* 801B2EC4 001AFE24 C0 02 A8 BC */ lfs f0, lbl_805AC5DC@sda21(r2) /* 801B2EC8 001AFE28 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -6737,7 +6737,7 @@ lbl_801B2EAC: /* 801B2F34 001AFE94 81 9F 00 00 */ lwz r12, 0(r31) /* 801B2F38 001AFE98 81 8C 02 B0 */ lwz r12, 0x2b0(r12) /* 801B2F3C 001AFE9C 7D 89 03 A6 */ mtctr r12 -/* 801B2F40 001AFEA0 4E 80 04 21 */ bctrl +/* 801B2F40 001AFEA0 4E 80 04 21 */ bctrl /* 801B2F44 001AFEA4 80 81 00 F8 */ lwz r4, 0xf8(r1) /* 801B2F48 001AFEA8 88 61 00 FC */ lbz r3, 0xfc(r1) /* 801B2F4C 001AFEAC C0 61 01 00 */ lfs f3, 0x100(r1) @@ -6827,7 +6827,7 @@ lbl_801B3084: /* 801B3088 001AFFE8 7F C4 F3 78 */ mr r4, r30 /* 801B308C 001AFFEC 81 8C 00 34 */ lwz r12, 0x34(r12) /* 801B3090 001AFFF0 7D 89 03 A6 */ mtctr r12 -/* 801B3094 001AFFF4 4E 80 04 21 */ bctrl +/* 801B3094 001AFFF4 4E 80 04 21 */ bctrl /* 801B3098 001AFFF8 C0 23 00 00 */ lfs f1, 0(r3) /* 801B309C 001AFFFC C0 02 A8 BC */ lfs f0, lbl_805AC5DC@sda21(r2) /* 801B30A0 001B0000 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -6875,7 +6875,7 @@ lbl_801B3138: /* 801B3144 001B00A4 C0 22 A8 BC */ lfs f1, lbl_805AC5DC@sda21(r2) /* 801B3148 001B00A8 81 8C 02 88 */ lwz r12, 0x288(r12) /* 801B314C 001B00AC 7D 89 03 A6 */ mtctr r12 -/* 801B3150 001B00B0 4E 80 04 21 */ bctrl +/* 801B3150 001B00B0 4E 80 04 21 */ bctrl /* 801B3154 001B00B4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801B3158 001B00B8 40 82 01 90 */ bne lbl_801B32E8 /* 801B315C 001B00BC 80 7F 04 50 */ lwz r3, 0x450(r31) @@ -6890,7 +6890,7 @@ lbl_801B3138: /* 801B3180 001B00E0 81 8C 00 90 */ lwz r12, 0x90(r12) /* 801B3184 001B00E4 38 84 66 A0 */ addi r4, r4, skZero3f@l /* 801B3188 001B00E8 7D 89 03 A6 */ mtctr r12 -/* 801B318C 001B00EC 4E 80 04 21 */ bctrl +/* 801B318C 001B00EC 4E 80 04 21 */ bctrl /* 801B3190 001B00F0 C0 3F 06 AC */ lfs f1, 0x6ac(r31) /* 801B3194 001B00F4 C0 1B 01 34 */ lfs f0, 0x134(r27) /* 801B3198 001B00F8 C0 5F 08 10 */ lfs f2, 0x810(r31) @@ -6990,7 +6990,7 @@ lbl_801B32E8: /* 801B3304 001B0264 81 8C 00 90 */ lwz r12, 0x90(r12) /* 801B3308 001B0268 38 84 66 A0 */ addi r4, r4, skZero3f@l /* 801B330C 001B026C 7D 89 03 A6 */ mtctr r12 -/* 801B3310 001B0270 4E 80 04 21 */ bctrl +/* 801B3310 001B0270 4E 80 04 21 */ bctrl lbl_801B3314: /* 801B3314 001B0274 A0 7D 00 00 */ lhz r3, 0(r29) /* 801B3318 001B0278 A0 1F 08 0C */ lhz r0, 0x80c(r31) @@ -7104,7 +7104,7 @@ lbl_801B345C: /* 801B347C 001B03DC 80 01 01 74 */ lwz r0, 0x174(r1) /* 801B3480 001B03E0 7C 08 03 A6 */ mtlr r0 /* 801B3484 001B03E4 38 21 01 70 */ addi r1, r1, 0x170 -/* 801B3488 001B03E8 4E 80 00 20 */ blr +/* 801B3488 001B03E8 4E 80 00 20 */ blr .global Accept__9CFlaahgraFR8IVisitor Accept__9CFlaahgraFR8IVisitor: @@ -7117,11 +7117,11 @@ Accept__9CFlaahgraFR8IVisitor: /* 801B34A4 001B0404 7C 04 03 78 */ mr r4, r0 /* 801B34A8 001B0408 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 801B34AC 001B040C 7D 89 03 A6 */ mtctr r12 -/* 801B34B0 001B0410 4E 80 04 21 */ bctrl +/* 801B34B0 001B0410 4E 80 04 21 */ bctrl /* 801B34B4 001B0414 80 01 00 14 */ lwz r0, 0x14(r1) /* 801B34B8 001B0418 7C 08 03 A6 */ mtlr r0 /* 801B34BC 001B041C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801B34C0 001B0420 4E 80 00 20 */ blr +/* 801B34C0 001B0420 4E 80 00 20 */ blr .global Think__9CFlaahgraFfR13CStateManager Think__9CFlaahgraFfR13CStateManager: @@ -7192,7 +7192,7 @@ lbl_801B35B0: /* 801B35C0 001B0520 83 C1 00 18 */ lwz r30, 0x18(r1) /* 801B35C4 001B0524 7C 08 03 A6 */ mtlr r0 /* 801B35C8 001B0528 38 21 00 30 */ addi r1, r1, 0x30 -/* 801B35CC 001B052C 4E 80 00 20 */ blr +/* 801B35CC 001B052C 4E 80 00 20 */ blr .global PreThink__9CFlaahgraFfR13CStateManager PreThink__9CFlaahgraFfR13CStateManager: @@ -7220,7 +7220,7 @@ lbl_801B3604: /* 801B3620 001B0580 83 C1 00 10 */ lwz r30, 0x10(r1) /* 801B3624 001B0584 7C 08 03 A6 */ mtlr r0 /* 801B3628 001B0588 38 21 00 20 */ addi r1, r1, 0x20 -/* 801B362C 001B058C 4E 80 00 20 */ blr +/* 801B362C 001B058C 4E 80 00 20 */ blr .global __dt__9CFlaahgraFv __dt__9CFlaahgraFv: @@ -7495,7 +7495,7 @@ lbl_801B39AC: /* 801B39C0 001B0920 83 81 00 20 */ lwz r28, 0x20(r1) /* 801B39C4 001B0924 7C 08 03 A6 */ mtlr r0 /* 801B39C8 001B0928 38 21 00 30 */ addi r1, r1, 0x30 -/* 801B39CC 001B092C 4E 80 00 20 */ blr +/* 801B39CC 001B092C 4E 80 00 20 */ blr .global "__ct__9CFlaahgraF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC14CPatternedInfoRC16CActorParametersRC13CFlaahgraData" "__ct__9CFlaahgraF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC14CPatternedInfoRC16CActorParametersRC13CFlaahgraData": @@ -7574,7 +7574,7 @@ lbl_801B39AC: /* 801B3AF0 001B0A50 81 84 00 00 */ lwz r12, 0(r4) /* 801B3AF4 001B0A54 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801B3AF8 001B0A58 7D 89 03 A6 */ mtctr r12 -/* 801B3AFC 001B0A5C 4E 80 04 21 */ bctrl +/* 801B3AFC 001B0A5C 4E 80 04 21 */ bctrl /* 801B3B00 001B0A60 38 7C 06 D4 */ addi r3, r28, 0x6d4 /* 801B3B04 001B0A64 38 81 00 2C */ addi r4, r1, 0x2c /* 801B3B08 001B0A68 48 18 D3 A1 */ bl __ct__6CTokenFRC6CToken @@ -7632,7 +7632,7 @@ lbl_801B39AC: /* 801B3BD8 001B0B38 81 9C 00 00 */ lwz r12, 0(r28) /* 801B3BDC 001B0B3C 81 8C 02 B0 */ lwz r12, 0x2b0(r12) /* 801B3BE0 001B0B40 7D 89 03 A6 */ mtctr r12 -/* 801B3BE4 001B0B44 4E 80 04 21 */ bctrl +/* 801B3BE4 001B0B44 4E 80 04 21 */ bctrl /* 801B3BE8 001B0B48 80 81 00 6C */ lwz r4, 0x6c(r1) /* 801B3BEC 001B0B4C 38 00 00 00 */ li r0, 0 /* 801B3BF0 001B0B50 C0 02 A8 BC */ lfs f0, lbl_805AC5DC@sda21(r2) @@ -7878,7 +7878,7 @@ lbl_801B3F54: /* 801B3F9C 001B0EFC 80 01 01 74 */ lwz r0, 0x174(r1) /* 801B3FA0 001B0F00 7C 08 03 A6 */ mtlr r0 /* 801B3FA4 001B0F04 38 21 01 70 */ addi r1, r1, 0x170 -/* 801B3FA8 001B0F08 4E 80 00 20 */ blr +/* 801B3FA8 001B0F08 4E 80 00 20 */ blr .global __ct__13CFlaahgraDataFRC13CFlaahgraData __ct__13CFlaahgraDataFRC13CFlaahgraData: @@ -8020,7 +8020,7 @@ __ct__13CFlaahgraDataFRC13CFlaahgraData: /* 801B41C8 001B1128 80 01 00 14 */ lwz r0, 0x14(r1) /* 801B41CC 001B112C 7C 08 03 A6 */ mtlr r0 /* 801B41D0 001B1130 38 21 00 10 */ addi r1, r1, 0x10 -/* 801B41D4 001B1134 4E 80 00 20 */ blr +/* 801B41D4 001B1134 4E 80 00 20 */ blr .global __ct__13CFlaahgraDataFR12CInputStream __ct__13CFlaahgraDataFR12CInputStream: @@ -8100,7 +8100,7 @@ __ct__13CFlaahgraDataFR12CInputStream: /* 801B42FC 001B125C 83 C1 00 88 */ lwz r30, 0x88(r1) /* 801B4300 001B1260 7C 08 03 A6 */ mtlr r0 /* 801B4304 001B1264 38 21 00 90 */ addi r1, r1, 0x90 -/* 801B4308 001B1268 4E 80 00 20 */ blr +/* 801B4308 001B1268 4E 80 00 20 */ blr .global AcceptScriptMsg__19CFlaahgraProjectileF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__19CFlaahgraProjectileF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -8151,7 +8151,7 @@ lbl_801B43A8: /* 801B43B4 001B1314 83 A1 00 24 */ lwz r29, 0x24(r1) /* 801B43B8 001B1318 7C 08 03 A6 */ mtlr r0 /* 801B43BC 001B131C 38 21 00 30 */ addi r1, r1, 0x30 -/* 801B43C0 001B1320 4E 80 00 20 */ blr +/* 801B43C0 001B1320 4E 80 00 20 */ blr .global "__ct__19CFlaahgraProjectileFbRC28TToken<18CWeaponDescription>RC12CTransform4fRC11CDamageInfo9TUniqueId7TAreaId9TUniqueId" "__ct__19CFlaahgraProjectileFbRC28TToken<18CWeaponDescription>RC12CTransform4fRC11CDamageInfo9TUniqueId7TAreaId9TUniqueId": @@ -8229,13 +8229,13 @@ lbl_801B44D0: /* 801B44D8 001B1438 80 01 00 94 */ lwz r0, 0x94(r1) /* 801B44DC 001B143C 7C 08 03 A6 */ mtlr r0 /* 801B44E0 001B1440 38 21 00 90 */ addi r1, r1, 0x90 -/* 801B44E4 001B1444 4E 80 00 20 */ blr +/* 801B44E4 001B1444 4E 80 00 20 */ blr .global GetTouchBounds__9CFlaahgraCFv GetTouchBounds__9CFlaahgraCFv: /* 801B44E8 001B1448 38 00 00 00 */ li r0, 0 /* 801B44EC 001B144C 98 03 00 18 */ stb r0, 0x18(r3) -/* 801B44F0 001B1450 4E 80 00 20 */ blr +/* 801B44F0 001B1450 4E 80 00 20 */ blr .global __dt__19CFlaahgraProjectileFv __dt__19CFlaahgraProjectileFv: @@ -8263,7 +8263,7 @@ lbl_801B4538: /* 801B4544 001B14A4 83 C1 00 08 */ lwz r30, 8(r1) /* 801B4548 001B14A8 7C 08 03 A6 */ mtlr r0 /* 801B454C 001B14AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801B4550 001B14B0 4E 80 00 20 */ blr +/* 801B4550 001B14B0 4E 80 00 20 */ blr .global __sinit_CFlaahgra_cpp __sinit_CFlaahgra_cpp: diff --git a/asm/MetroidPrime/Enemies/CFlaahgraPlants.s b/asm/MetroidPrime/Enemies/CFlaahgraPlants.s index 1195b265..f21eca18 100644 --- a/asm/MetroidPrime/Enemies/CFlaahgraPlants.s +++ b/asm/MetroidPrime/Enemies/CFlaahgraPlants.s @@ -99,13 +99,13 @@ lbl_80208454: /* 8020845C 002053BC 81 83 00 00 */ lwz r12, 0(r3) /* 80208460 002053C0 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80208464 002053C4 7D 89 03 A6 */ mtctr r12 -/* 80208468 002053C8 4E 80 04 21 */ bctrl +/* 80208468 002053C8 4E 80 04 21 */ bctrl /* 8020846C 002053CC 7F A3 EB 78 */ mr r3, r29 /* 80208470 002053D0 38 80 00 01 */ li r4, 1 /* 80208474 002053D4 81 9D 00 00 */ lwz r12, 0(r29) /* 80208478 002053D8 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 8020847C 002053DC 7D 89 03 A6 */ mtctr r12 -/* 80208480 002053E0 4E 80 04 21 */ bctrl +/* 80208480 002053E0 4E 80 04 21 */ bctrl /* 80208484 002053E4 A0 7D 01 6C */ lhz r3, 0x16c(r29) /* 80208488 002053E8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8020848C 002053EC 7C 03 00 40 */ cmplw r3, r0 @@ -238,7 +238,7 @@ lbl_80208678: /* 8020867C 002055DC 80 01 00 74 */ lwz r0, 0x74(r1) /* 80208680 002055E0 7C 08 03 A6 */ mtlr r0 /* 80208684 002055E4 38 21 00 70 */ addi r1, r1, 0x70 -/* 80208688 002055E8 4E 80 00 20 */ blr +/* 80208688 002055E8 4E 80 00 20 */ blr .global Think__15CFlaahgraPlantsFfR13CStateManager Think__15CFlaahgraPlantsFfR13CStateManager: @@ -258,14 +258,14 @@ Think__15CFlaahgraPlantsFfR13CStateManager: /* 802086C0 00205620 81 83 00 00 */ lwz r12, 0(r3) /* 802086C4 00205624 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802086C8 00205628 7D 89 03 A6 */ mtctr r12 -/* 802086CC 0020562C 4E 80 04 21 */ bctrl +/* 802086CC 0020562C 4E 80 04 21 */ bctrl /* 802086D0 00205630 D3 FE 01 2C */ stfs f31, 0x12c(r30) lbl_802086D4: /* 802086D4 00205634 80 7E 00 EC */ lwz r3, 0xec(r30) /* 802086D8 00205638 81 83 00 00 */ lwz r12, 0(r3) /* 802086DC 0020563C 81 8C 00 58 */ lwz r12, 0x58(r12) /* 802086E0 00205640 7D 89 03 A6 */ mtctr r12 -/* 802086E4 00205644 4E 80 04 21 */ bctrl +/* 802086E4 00205644 4E 80 04 21 */ bctrl /* 802086E8 00205648 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802086EC 0020564C 41 82 00 1C */ beq lbl_80208708 /* 802086F0 00205650 A0 1E 00 08 */ lhz r0, 8(r30) @@ -281,7 +281,7 @@ lbl_80208708: /* 80208714 00205674 83 C1 00 10 */ lwz r30, 0x10(r1) /* 80208718 00205678 7C 08 03 A6 */ mtlr r0 /* 8020871C 0020567C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80208720 00205680 4E 80 00 20 */ blr +/* 80208720 00205680 4E 80 00 20 */ blr .global Accept__15CFlaahgraPlantsFR8IVisitor Accept__15CFlaahgraPlantsFR8IVisitor: @@ -294,11 +294,11 @@ Accept__15CFlaahgraPlantsFR8IVisitor: /* 8020873C 0020569C 7C 04 03 78 */ mr r4, r0 /* 80208740 002056A0 81 8C 00 08 */ lwz r12, 8(r12) /* 80208744 002056A4 7D 89 03 A6 */ mtctr r12 -/* 80208748 002056A8 4E 80 04 21 */ bctrl +/* 80208748 002056A8 4E 80 04 21 */ bctrl /* 8020874C 002056AC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80208750 002056B0 7C 08 03 A6 */ mtlr r0 /* 80208754 002056B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80208758 002056B8 4E 80 00 20 */ blr +/* 80208758 002056B8 4E 80 00 20 */ blr .global AddToRenderer__15CFlaahgraPlantsCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__15CFlaahgraPlantsCFRC14CFrustumPlanesRC13CStateManager: @@ -316,7 +316,7 @@ AddToRenderer__15CFlaahgraPlantsCFRC14CFrustumPlanesRC13CStateManager: /* 80208788 002056E8 81 83 00 00 */ lwz r12, 0(r3) /* 8020878C 002056EC 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80208790 002056F0 7D 89 03 A6 */ mtctr r12 -/* 80208794 002056F4 4E 80 04 21 */ bctrl +/* 80208794 002056F4 4E 80 04 21 */ bctrl /* 80208798 002056F8 7F A3 EB 78 */ mr r3, r29 /* 8020879C 002056FC 7F C4 F3 78 */ mr r4, r30 /* 802087A0 00205700 7F E5 FB 78 */ mr r5, r31 @@ -327,7 +327,7 @@ AddToRenderer__15CFlaahgraPlantsCFRC14CFrustumPlanesRC13CStateManager: /* 802087B4 00205714 83 A1 00 14 */ lwz r29, 0x14(r1) /* 802087B8 00205718 7C 08 03 A6 */ mtlr r0 /* 802087BC 0020571C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802087C0 00205720 4E 80 00 20 */ blr +/* 802087C0 00205720 4E 80 00 20 */ blr .global GetTouchBounds__15CFlaahgraPlantsCFv GetTouchBounds__15CFlaahgraPlantsCFv: @@ -338,9 +338,9 @@ GetTouchBounds__15CFlaahgraPlantsCFv: /* 802087D4 00205734 98 03 00 18 */ stb r0, 0x18(r3) /* 802087D8 00205738 88 04 01 28 */ lbz r0, 0x128(r4) /* 802087DC 0020573C 28 00 00 00 */ cmplwi r0, 0 -/* 802087E0 00205740 4D 82 00 20 */ beqlr +/* 802087E0 00205740 4D 82 00 20 */ beqlr /* 802087E4 00205744 28 03 00 00 */ cmplwi r3, 0 -/* 802087E8 00205748 4D 82 00 20 */ beqlr +/* 802087E8 00205748 4D 82 00 20 */ beqlr /* 802087EC 0020574C C0 04 01 10 */ lfs f0, 0x110(r4) /* 802087F0 00205750 D0 03 00 00 */ stfs f0, 0(r3) /* 802087F4 00205754 C0 04 01 14 */ lfs f0, 0x114(r4) @@ -353,11 +353,11 @@ GetTouchBounds__15CFlaahgraPlantsCFv: /* 80208810 00205770 D0 03 00 10 */ stfs f0, 0x10(r3) /* 80208814 00205774 C0 04 01 24 */ lfs f0, 0x124(r4) /* 80208818 00205778 D0 03 00 14 */ stfs f0, 0x14(r3) -/* 8020881C 0020577C 4E 80 00 20 */ blr +/* 8020881C 0020577C 4E 80 00 20 */ blr lbl_80208820: /* 80208820 00205780 38 00 00 00 */ li r0, 0 /* 80208824 00205784 98 03 00 18 */ stb r0, 0x18(r3) -/* 80208828 00205788 4E 80 00 20 */ blr +/* 80208828 00205788 4E 80 00 20 */ blr .global Touch__15CFlaahgraPlantsFR6CActorR13CStateManager Touch__15CFlaahgraPlantsFR6CActorR13CStateManager: @@ -491,7 +491,7 @@ lbl_80208A10: /* 80208A1C 0020597C 83 A1 01 34 */ lwz r29, 0x134(r1) /* 80208A20 00205980 7C 08 03 A6 */ mtlr r0 /* 80208A24 00205984 38 21 01 40 */ addi r1, r1, 0x140 -/* 80208A28 00205988 4E 80 00 20 */ blr +/* 80208A28 00205988 4E 80 00 20 */ blr .global __dt__15CFlaahgraPlantsFv __dt__15CFlaahgraPlantsFv: @@ -523,7 +523,7 @@ lbl_80208A68: /* 80208A8C 002059EC 38 80 00 01 */ li r4, 1 /* 80208A90 002059F0 81 8C 00 08 */ lwz r12, 8(r12) /* 80208A94 002059F4 7D 89 03 A6 */ mtctr r12 -/* 80208A98 002059F8 4E 80 04 21 */ bctrl +/* 80208A98 002059F8 4E 80 04 21 */ bctrl lbl_80208A9C: /* 80208A9C 002059FC 7F C3 F3 78 */ mr r3, r30 /* 80208AA0 00205A00 38 80 00 00 */ li r4, 0 @@ -539,7 +539,7 @@ lbl_80208AB8: /* 80208AC4 00205A24 83 C1 00 08 */ lwz r30, 8(r1) /* 80208AC8 00205A28 7C 08 03 A6 */ mtlr r0 /* 80208ACC 00205A2C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80208AD0 00205A30 4E 80 00 20 */ blr +/* 80208AD0 00205A30 4E 80 00 20 */ blr .global "__ct__15CFlaahgraPlantsF25TToken<15CGenDescription>9TUniqueId9TUniqueIdRC12CTransform4fRC11CDamageInfoRC9CVector3f" "__ct__15CFlaahgraPlantsF25TToken<15CGenDescription>9TUniqueId9TUniqueIdRC12CTransform4fRC11CDamageInfoRC9CVector3f": @@ -696,7 +696,7 @@ lbl_80208C98: /* 80208D18 00205C78 81 99 00 00 */ lwz r12, 0(r25) /* 80208D1C 00205C7C 81 8C 00 14 */ lwz r12, 0x14(r12) /* 80208D20 00205C80 7D 89 03 A6 */ mtctr r12 -/* 80208D24 00205C84 4E 80 04 21 */ bctrl +/* 80208D24 00205C84 4E 80 04 21 */ bctrl /* 80208D28 00205C88 C0 5D 00 2C */ lfs f2, 0x2c(r29) /* 80208D2C 00205C8C 38 81 00 48 */ addi r4, r1, 0x48 /* 80208D30 00205C90 C0 3D 00 1C */ lfs f1, 0x1c(r29) @@ -708,7 +708,7 @@ lbl_80208C98: /* 80208D48 00205CA8 81 83 00 00 */ lwz r12, 0(r3) /* 80208D4C 00205CAC 81 8C 00 18 */ lwz r12, 0x18(r12) /* 80208D50 00205CB0 7D 89 03 A6 */ mtctr r12 -/* 80208D54 00205CB4 4E 80 04 21 */ bctrl +/* 80208D54 00205CB4 4E 80 04 21 */ bctrl /* 80208D58 00205CB8 80 98 00 EC */ lwz r4, 0xec(r24) /* 80208D5C 00205CBC 3C 60 80 5A */ lis r3, skIdentity4f@ha /* 80208D60 00205CC0 38 A3 66 70 */ addi r5, r3, skIdentity4f@l diff --git a/asm/MetroidPrime/Enemies/CFlaahgraTentacle.s b/asm/MetroidPrime/Enemies/CFlaahgraTentacle.s index 0eacd56a..2ef33de7 100644 --- a/asm/MetroidPrime/Enemies/CFlaahgraTentacle.s +++ b/asm/MetroidPrime/Enemies/CFlaahgraTentacle.s @@ -323,7 +323,7 @@ lbl_801F0130: /* 801F013C 001ED09C 83 A1 00 24 */ lwz r29, 0x24(r1) /* 801F0140 001ED0A0 7C 08 03 A6 */ mtlr r0 /* 801F0144 001ED0A4 38 21 00 30 */ addi r1, r1, 0x30 -/* 801F0148 001ED0A8 4E 80 00 20 */ blr +/* 801F0148 001ED0A8 4E 80 00 20 */ blr .global RetractTentacle__17CFlaahgraTentacleFR13CStateManager RetractTentacle__17CFlaahgraTentacleFR13CStateManager: @@ -363,7 +363,7 @@ lbl_801F01C4: /* 801F01CC 001ED12C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 801F01D0 001ED130 7C 08 03 A6 */ mtlr r0 /* 801F01D4 001ED134 38 21 00 20 */ addi r1, r1, 0x20 -/* 801F01D8 001ED138 4E 80 00 20 */ blr +/* 801F01D8 001ED138 4E 80 00 20 */ blr .global ExtractTentacle__17CFlaahgraTentacleFR13CStateManager ExtractTentacle__17CFlaahgraTentacleFR13CStateManager: @@ -378,7 +378,7 @@ ExtractTentacle__17CFlaahgraTentacleFR13CStateManager: /* 801F01FC 001ED15C 81 83 00 00 */ lwz r12, 0(r3) /* 801F0200 001ED160 81 8C 02 30 */ lwz r12, 0x230(r12) /* 801F0204 001ED164 7D 89 03 A6 */ mtctr r12 -/* 801F0208 001ED168 4E 80 04 21 */ bctrl +/* 801F0208 001ED168 4E 80 04 21 */ bctrl /* 801F020C 001ED16C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801F0210 001ED170 41 82 00 64 */ beq lbl_801F0274 /* 801F0214 001ED174 88 1E 05 8E */ lbz r0, 0x58e(r30) @@ -411,7 +411,7 @@ lbl_801F0274: /* 801F027C 001ED1DC 83 C1 00 18 */ lwz r30, 0x18(r1) /* 801F0280 001ED1E0 7C 08 03 A6 */ mtlr r0 /* 801F0284 001ED1E4 38 21 00 20 */ addi r1, r1, 0x20 -/* 801F0288 001ED1E8 4E 80 00 20 */ blr +/* 801F0288 001ED1E8 4E 80 00 20 */ blr .global "AddSphereCollisionList__17CFlaahgraTentacleFPCQ217CFlaahgraTentacle16SSphereJointInfoiRQ24rstl63vector<26CJointCollisionDescription,Q24rstl17rmemory_allocator>" "AddSphereCollisionList__17CFlaahgraTentacleFPCQ217CFlaahgraTentacle16SSphereJointInfoiRQ24rstl63vector<26CJointCollisionDescription,Q24rstl17rmemory_allocator>": @@ -509,7 +509,7 @@ lbl_801F03DC: /* 801F03E8 001ED348 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 801F03EC 001ED34C 7C 08 03 A6 */ mtlr r0 /* 801F03F0 001ED350 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 801F03F4 001ED354 4E 80 00 20 */ blr +/* 801F03F4 001ED354 4E 80 00 20 */ blr .global SetupCollisionManager__17CFlaahgraTentacleFR13CStateManager SetupCollisionManager__17CFlaahgraTentacleFR13CStateManager: @@ -622,7 +622,7 @@ lbl_801F04B0: /* 801F0598 001ED4F8 81 9D 00 00 */ lwz r12, 0(r29) /* 801F059C 001ED4FC 81 8C 00 38 */ lwz r12, 0x38(r12) /* 801F05A0 001ED500 7D 89 03 A6 */ mtctr r12 -/* 801F05A4 001ED504 4E 80 04 21 */ bctrl +/* 801F05A4 001ED504 4E 80 04 21 */ bctrl /* 801F05A8 001ED508 7C 64 1B 78 */ mr r4, r3 /* 801F05AC 001ED50C 7F 23 CB 78 */ mr r3, r25 /* 801F05B0 001ED510 4B FB 85 E9 */ bl SetDamageVulnerability__15CCollisionActorFRC20CDamageVulnerability @@ -667,7 +667,7 @@ lbl_801F05FC: /* 801F0644 001ED5A4 80 01 00 84 */ lwz r0, 0x84(r1) /* 801F0648 001ED5A8 7C 08 03 A6 */ mtlr r0 /* 801F064C 001ED5AC 38 21 00 80 */ addi r1, r1, 0x80 -/* 801F0650 001ED5B0 4E 80 00 20 */ blr +/* 801F0650 001ED5B0 4E 80 00 20 */ blr .global Dead__17CFlaahgraTentacleFR13CStateManager9EStateMsgf Dead__17CFlaahgraTentacleFR13CStateManager9EStateMsgf: @@ -680,7 +680,7 @@ Dead__17CFlaahgraTentacleFR13CStateManager9EStateMsgf: /* 801F066C 001ED5CC 80 01 00 14 */ lwz r0, 0x14(r1) /* 801F0670 001ED5D0 7C 08 03 A6 */ mtlr r0 /* 801F0674 001ED5D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F0678 001ED5D8 4E 80 00 20 */ blr +/* 801F0678 001ED5D8 4E 80 00 20 */ blr .global Attack__17CFlaahgraTentacleFR13CStateManager9EStateMsgf Attack__17CFlaahgraTentacleFR13CStateManager9EStateMsgf: @@ -798,7 +798,7 @@ lbl_801F0808: /* 801F080C 001ED76C 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 801F0810 001ED770 7C 08 03 A6 */ mtlr r0 /* 801F0814 001ED774 38 21 00 30 */ addi r1, r1, 0x30 -/* 801F0818 001ED778 4E 80 00 20 */ blr +/* 801F0818 001ED778 4E 80 00 20 */ blr .global Retreat__17CFlaahgraTentacleFR13CStateManager9EStateMsgf Retreat__17CFlaahgraTentacleFR13CStateManager9EStateMsgf: @@ -852,7 +852,7 @@ lbl_801F08BC: .global sub_801f08cc sub_801f08cc: -/* 801F08CC 001ED82C 4E 80 00 20 */ blr +/* 801F08CC 001ED82C 4E 80 00 20 */ blr .global InActive__17CFlaahgraTentacleFR13CStateManager9EStateMsgf InActive__17CFlaahgraTentacleFR13CStateManager9EStateMsgf: @@ -881,7 +881,7 @@ lbl_801F091C: /* 801F0920 001ED880 C0 22 AE B4 */ lfs f1, lbl_805ACBD4@sda21(r2) /* 801F0924 001ED884 81 8C 02 30 */ lwz r12, 0x230(r12) /* 801F0928 001ED888 7D 89 03 A6 */ mtctr r12 -/* 801F092C 001ED88C 4E 80 04 21 */ bctrl +/* 801F092C 001ED88C 4E 80 04 21 */ bctrl /* 801F0930 001ED890 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801F0934 001ED894 40 82 00 70 */ bne lbl_801F09A4 /* 801F0938 001ED898 A0 1E 05 8C */ lhz r0, 0x58c(r30) @@ -920,7 +920,7 @@ lbl_801F09A4: /* 801F09B4 001ED914 83 C1 00 18 */ lwz r30, 0x18(r1) /* 801F09B8 001ED918 7C 08 03 A6 */ mtlr r0 /* 801F09BC 001ED91C 38 21 00 30 */ addi r1, r1, 0x30 -/* 801F09C0 001ED920 4E 80 00 20 */ blr +/* 801F09C0 001ED920 4E 80 00 20 */ blr .global AnimOver__17CFlaahgraTentacleFR13CStateManagerf AnimOver__17CFlaahgraTentacleFR13CStateManagerf: @@ -928,7 +928,7 @@ AnimOver__17CFlaahgraTentacleFR13CStateManagerf: /* 801F09C8 001ED928 20 00 00 03 */ subfic r0, r0, 3 /* 801F09CC 001ED92C 7C 00 00 34 */ cntlzw r0, r0 /* 801F09D0 001ED930 54 03 D9 7E */ srwi r3, r0, 5 -/* 801F09D4 001ED934 4E 80 00 20 */ blr +/* 801F09D4 001ED934 4E 80 00 20 */ blr .global ShouldAttack__17CFlaahgraTentacleFR13CStateManagerf ShouldAttack__17CFlaahgraTentacleFR13CStateManagerf: @@ -1001,7 +1001,7 @@ lbl_801F0ACC: /* 801F0AD4 001EDA34 83 C1 00 28 */ lwz r30, 0x28(r1) /* 801F0AD8 001EDA38 7C 08 03 A6 */ mtlr r0 /* 801F0ADC 001EDA3C 38 21 00 30 */ addi r1, r1, 0x30 -/* 801F0AE0 001EDA40 4E 80 00 20 */ blr +/* 801F0AE0 001EDA40 4E 80 00 20 */ blr .global Inside__17CFlaahgraTentacleFR13CStateManagerf Inside__17CFlaahgraTentacleFR13CStateManagerf: @@ -1009,7 +1009,7 @@ Inside__17CFlaahgraTentacleFR13CStateManagerf: /* 801F0AE8 001EDA48 80 03 02 EC */ lwz r0, 0x2ec(r3) /* 801F0AEC 001EDA4C 7C 00 00 34 */ cntlzw r0, r0 /* 801F0AF0 001EDA50 54 03 D9 7E */ srwi r3, r0, 5 -/* 801F0AF4 001EDA54 4E 80 00 20 */ blr +/* 801F0AF4 001EDA54 4E 80 00 20 */ blr .global Death__17CFlaahgraTentacleFRC9CVector3fR13CStateManager Death__17CFlaahgraTentacleFRC9CVector3fR13CStateManager: @@ -1056,7 +1056,7 @@ lbl_801F0B88: /* 801F0B90 001EDAF0 83 C1 00 18 */ lwz r30, 0x18(r1) /* 801F0B94 001EDAF4 7C 08 03 A6 */ mtlr r0 /* 801F0B98 001EDAF8 38 21 00 20 */ addi r1, r1, 0x20 -/* 801F0B9C 001EDAFC 4E 80 00 20 */ blr +/* 801F0B9C 001EDAFC 4E 80 00 20 */ blr .global GetAimPosition__17CFlaahgraTentacleCFRC13CStateManagerf GetAimPosition__17CFlaahgraTentacleCFRC13CStateManagerf: @@ -1105,7 +1105,7 @@ lbl_801F0C2C: /* 801F0C40 001EDBA0 83 A1 00 24 */ lwz r29, 0x24(r1) /* 801F0C44 001EDBA4 7C 08 03 A6 */ mtlr r0 /* 801F0C48 001EDBA8 38 21 00 40 */ addi r1, r1, 0x40 -/* 801F0C4C 001EDBAC 4E 80 00 20 */ blr +/* 801F0C4C 001EDBAC 4E 80 00 20 */ blr .global AcceptScriptMsg__17CFlaahgraTentacleF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__17CFlaahgraTentacleF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -1125,7 +1125,7 @@ AcceptScriptMsg__17CFlaahgraTentacleF20EScriptObjectMessage9TUniqueIdR13CStateMa /* 801F0C84 001EDBE4 38 84 66 D4 */ addi r4, r4, lbl_803E66D4@l /* 801F0C88 001EDBE8 7C 04 00 2E */ lwzx r0, r4, r0 /* 801F0C8C 001EDBEC 7C 09 03 A6 */ mtctr r0 -/* 801F0C90 001EDBF0 4E 80 04 20 */ bctr +/* 801F0C90 001EDBF0 4E 80 04 20 */ bctr .global lbl_801F0C94 lbl_801F0C94: /* 801F0C94 001EDBF4 80 7C 04 50 */ lwz r3, 0x450(r28) @@ -1212,7 +1212,7 @@ lbl_801F0D10: /* 801F0DC8 001EDD28 B0 01 00 1C */ sth r0, 0x1c(r1) /* 801F0DCC 001EDD2C 81 8C 02 B0 */ lwz r12, 0x2b0(r12) /* 801F0DD0 001EDD30 7D 89 03 A6 */ mtctr r12 -/* 801F0DD4 001EDD34 4E 80 04 21 */ bctrl +/* 801F0DD4 001EDD34 4E 80 04 21 */ bctrl /* 801F0DD8 001EDD38 3C 80 80 5A */ lis r4, skZero3f@ha /* 801F0DDC 001EDD3C 7F E3 FB 78 */ mr r3, r31 /* 801F0DE0 001EDD40 39 24 66 A0 */ addi r9, r4, skZero3f@l @@ -1262,7 +1262,7 @@ lbl_801F0E40: /* 801F0E60 001EDDC0 80 01 00 94 */ lwz r0, 0x94(r1) /* 801F0E64 001EDDC4 7C 08 03 A6 */ mtlr r0 /* 801F0E68 001EDDC8 38 21 00 90 */ addi r1, r1, 0x90 -/* 801F0E6C 001EDDCC 4E 80 00 20 */ blr +/* 801F0E6C 001EDDCC 4E 80 00 20 */ blr .global Accept__17CFlaahgraTentacleFR8IVisitor Accept__17CFlaahgraTentacleFR8IVisitor: @@ -1275,11 +1275,11 @@ Accept__17CFlaahgraTentacleFR8IVisitor: /* 801F0E88 001EDDE8 7C 04 03 78 */ mr r4, r0 /* 801F0E8C 001EDDEC 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 801F0E90 001EDDF0 7D 89 03 A6 */ mtctr r12 -/* 801F0E94 001EDDF4 4E 80 04 21 */ bctrl +/* 801F0E94 001EDDF4 4E 80 04 21 */ bctrl /* 801F0E98 001EDDF8 80 01 00 14 */ lwz r0, 0x14(r1) /* 801F0E9C 001EDDFC 7C 08 03 A6 */ mtlr r0 /* 801F0EA0 001EDE00 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F0EA4 001EDE04 4E 80 00 20 */ blr +/* 801F0EA4 001EDE04 4E 80 00 20 */ blr .global Think__17CFlaahgraTentacleFfR13CStateManager Think__17CFlaahgraTentacleFfR13CStateManager: @@ -1323,7 +1323,7 @@ lbl_801F0F24: /* 801F0F34 001EDE94 83 C1 00 08 */ lwz r30, 8(r1) /* 801F0F38 001EDE98 7C 08 03 A6 */ mtlr r0 /* 801F0F3C 001EDE9C 38 21 00 20 */ addi r1, r1, 0x20 -/* 801F0F40 001EDEA0 4E 80 00 20 */ blr +/* 801F0F40 001EDEA0 4E 80 00 20 */ blr .global __dt__17CFlaahgraTentacleFv __dt__17CFlaahgraTentacleFv: @@ -1358,7 +1358,7 @@ lbl_801F0FA0: /* 801F0FAC 001EDF0C 83 C1 00 08 */ lwz r30, 8(r1) /* 801F0FB0 001EDF10 7C 08 03 A6 */ mtlr r0 /* 801F0FB4 001EDF14 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F0FB8 001EDF18 4E 80 00 20 */ blr +/* 801F0FB8 001EDF18 4E 80 00 20 */ blr .global "__ct__17CFlaahgraTentacleF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC14CPatternedInfoRC16CActorParameters" "__ct__17CFlaahgraTentacleF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC14CPatternedInfoRC16CActorParameters": diff --git a/asm/MetroidPrime/Enemies/CFlickerBat.s b/asm/MetroidPrime/Enemies/CFlickerBat.s index 82c49026..e95dfa0b 100644 --- a/asm/MetroidPrime/Enemies/CFlickerBat.s +++ b/asm/MetroidPrime/Enemies/CFlickerBat.s @@ -221,7 +221,7 @@ lbl_80130320: /* 80130330 0012D290 81 84 00 00 */ lwz r12, 0(r4) /* 80130334 0012D294 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 80130338 0012D298 7D 89 03 A6 */ mtctr r12 -/* 8013033C 0012D29C 4E 80 04 21 */ bctrl +/* 8013033C 0012D29C 4E 80 04 21 */ bctrl /* 80130340 0012D2A0 C0 21 00 18 */ lfs f1, 0x18(r1) /* 80130344 0012D2A4 38 61 00 08 */ addi r3, r1, 8 /* 80130348 0012D2A8 C0 1F 00 50 */ lfs f0, 0x50(r31) @@ -261,7 +261,7 @@ lbl_801303C8: /* 801303CC 0012D32C 83 E1 00 4C */ lwz r31, 0x4c(r1) /* 801303D0 0012D330 7C 08 03 A6 */ mtlr r0 /* 801303D4 0012D334 38 21 00 50 */ addi r1, r1, 0x50 -/* 801303D8 0012D338 4E 80 00 20 */ blr +/* 801303D8 0012D338 4E 80 00 20 */ blr .global InPosition__11CFlickerBatFR13CStateManagerf InPosition__11CFlickerBatFR13CStateManagerf: @@ -277,7 +277,7 @@ InPosition__11CFlickerBatFR13CStateManagerf: /* 80130400 0012D360 81 84 00 00 */ lwz r12, 0(r4) /* 80130404 0012D364 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 80130408 0012D368 7D 89 03 A6 */ mtctr r12 -/* 8013040C 0012D36C 4E 80 04 21 */ bctrl +/* 8013040C 0012D36C 4E 80 04 21 */ bctrl /* 80130410 0012D370 C0 21 00 18 */ lfs f1, 0x18(r1) /* 80130414 0012D374 C0 1F 00 50 */ lfs f0, 0x50(r31) /* 80130418 0012D378 C0 DF 00 48 */ lfs f6, 0x48(r31) @@ -304,7 +304,7 @@ InPosition__11CFlickerBatFR13CStateManagerf: /* 8013046C 0012D3CC 80 01 00 34 */ lwz r0, 0x34(r1) /* 80130470 0012D3D0 7C 08 03 A6 */ mtlr r0 /* 80130474 0012D3D4 38 21 00 30 */ addi r1, r1, 0x30 -/* 80130478 0012D3D8 4E 80 00 20 */ blr +/* 80130478 0012D3D8 4E 80 00 20 */ blr .global Render__11CFlickerBatCFRC13CStateManager Render__11CFlickerBatCFRC13CStateManager: @@ -394,7 +394,7 @@ lbl_801305A4: /* 801305AC 0012D50C 83 C1 00 28 */ lwz r30, 0x28(r1) /* 801305B0 0012D510 7C 08 03 A6 */ mtlr r0 /* 801305B4 0012D514 38 21 00 30 */ addi r1, r1, 0x30 -/* 801305B8 0012D518 4E 80 00 20 */ blr +/* 801305B8 0012D518 4E 80 00 20 */ blr .global Patrol__11CFlickerBatFR13CStateManager9EStateMsgf Patrol__11CFlickerBatFR13CStateManager9EStateMsgf: @@ -430,7 +430,7 @@ Patrol__11CFlickerBatFR13CStateManager9EStateMsgf: /* 80130630 0012D590 80 01 00 34 */ lwz r0, 0x34(r1) /* 80130634 0012D594 7C 08 03 A6 */ mtlr r0 /* 80130638 0012D598 38 21 00 30 */ addi r1, r1, 0x30 -/* 8013063C 0012D59C 4E 80 00 20 */ blr +/* 8013063C 0012D59C 4E 80 00 20 */ blr .global Shuffle__11CFlickerBatFR13CStateManager9EStateMsgf Shuffle__11CFlickerBatFR13CStateManager9EStateMsgf: @@ -493,7 +493,7 @@ lbl_801306FC: /* 80130714 0012D674 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80130718 0012D678 7C 08 03 A6 */ mtlr r0 /* 8013071C 0012D67C 38 21 00 40 */ addi r1, r1, 0x40 -/* 80130720 0012D680 4E 80 00 20 */ blr +/* 80130720 0012D680 4E 80 00 20 */ blr .global Taunt__11CFlickerBatFR13CStateManager9EStateMsgf Taunt__11CFlickerBatFR13CStateManager9EStateMsgf: @@ -517,7 +517,7 @@ lbl_8013075C: /* 80130760 0012D6C0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80130764 0012D6C4 7C 08 03 A6 */ mtlr r0 /* 80130768 0012D6C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8013076C 0012D6CC 4E 80 00 20 */ blr +/* 8013076C 0012D6CC 4E 80 00 20 */ blr .global HearShot__11CFlickerBatFR13CStateManagerf HearShot__11CFlickerBatFR13CStateManagerf: @@ -528,17 +528,17 @@ HearShot__11CFlickerBatFR13CStateManagerf: /* 80130780 0012D6E0 50 04 36 72 */ rlwimi r4, r0, 6, 0x19, 0x19 /* 80130784 0012D6E4 98 83 05 80 */ stb r4, 0x580(r3) /* 80130788 0012D6E8 38 60 00 01 */ li r3, 1 -/* 8013078C 0012D6EC 4E 80 00 20 */ blr +/* 8013078C 0012D6EC 4E 80 00 20 */ blr lbl_80130790: /* 80130790 0012D6F0 38 60 00 00 */ li r3, 0 -/* 80130794 0012D6F4 4E 80 00 20 */ blr +/* 80130794 0012D6F4 4E 80 00 20 */ blr .global SetHeardShot__11CFlickerBatFb SetHeardShot__11CFlickerBatFb: /* 80130798 0012D6F8 88 03 05 80 */ lbz r0, 0x580(r3) /* 8013079C 0012D6FC 50 80 36 72 */ rlwimi r0, r4, 6, 0x19, 0x19 /* 801307A0 0012D700 98 03 05 80 */ stb r0, 0x580(r3) -/* 801307A4 0012D704 4E 80 00 20 */ blr +/* 801307A4 0012D704 4E 80 00 20 */ blr .global NotifyNeighbors__11CFlickerBatFR13CStateManager NotifyNeighbors__11CFlickerBatFR13CStateManager: @@ -616,7 +616,7 @@ lbl_80130884: /* 801308B4 0012D814 83 A1 00 24 */ lwz r29, 0x24(r1) /* 801308B8 0012D818 7C 08 03 A6 */ mtlr r0 /* 801308BC 0012D81C 38 21 00 60 */ addi r1, r1, 0x60 -/* 801308C0 0012D820 4E 80 00 20 */ blr +/* 801308C0 0012D820 4E 80 00 20 */ blr .global CanBeShot__11CFlickerBatFRC13CStateManageri CanBeShot__11CFlickerBatFRC13CStateManageri: @@ -658,7 +658,7 @@ lbl_80130930: /* 80130944 0012D8A4 83 81 00 10 */ lwz r28, 0x10(r1) /* 80130948 0012D8A8 7C 08 03 A6 */ mtlr r0 /* 8013094C 0012D8AC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80130950 0012D8B0 4E 80 00 20 */ blr +/* 80130950 0012D8B0 4E 80 00 20 */ blr .global Touch__11CFlickerBatFR6CActorR13CStateManager Touch__11CFlickerBatFR6CActorR13CStateManager: @@ -707,7 +707,7 @@ Touch__11CFlickerBatFR6CActorR13CStateManager: /* 801309FC 0012D95C B0 01 00 18 */ sth r0, 0x18(r1) /* 80130A00 0012D960 81 8C 02 B0 */ lwz r12, 0x2b0(r12) /* 80130A04 0012D964 7D 89 03 A6 */ mtctr r12 -/* 80130A08 0012D968 4E 80 04 21 */ bctrl +/* 80130A08 0012D968 4E 80 04 21 */ bctrl /* 80130A0C 0012D96C 3C 80 80 5A */ lis r4, skZero3f@ha /* 80130A10 0012D970 7F C3 F3 78 */ mr r3, r30 /* 80130A14 0012D974 39 24 66 A0 */ addi r9, r4, skZero3f@l @@ -731,7 +731,7 @@ lbl_80130A38: /* 80130A58 0012D9B8 83 81 00 60 */ lwz r28, 0x60(r1) /* 80130A5C 0012D9BC 7C 08 03 A6 */ mtlr r0 /* 80130A60 0012D9C0 38 21 00 70 */ addi r1, r1, 0x70 -/* 80130A64 0012D9C4 4E 80 00 20 */ blr +/* 80130A64 0012D9C4 4E 80 00 20 */ blr .global Think__11CFlickerBatFfR13CStateManager Think__11CFlickerBatFfR13CStateManager: @@ -925,7 +925,7 @@ lbl_80130CF4: /* 80130D18 0012DC78 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80130D1C 0012DC7C 7C 08 03 A6 */ mtlr r0 /* 80130D20 0012DC80 38 21 00 50 */ addi r1, r1, 0x50 -/* 80130D24 0012DC84 4E 80 00 20 */ blr +/* 80130D24 0012DC84 4E 80 00 20 */ blr .global Death__11CFlickerBatFRC9CVector3fR13CStateManager Death__11CFlickerBatFRC9CVector3fR13CStateManager: @@ -958,7 +958,7 @@ Death__11CFlickerBatFRC9CVector3fR13CStateManager: /* 80130D90 0012DCF0 83 81 00 10 */ lwz r28, 0x10(r1) /* 80130D94 0012DCF4 7C 08 03 A6 */ mtlr r0 /* 80130D98 0012DCF8 38 21 00 20 */ addi r1, r1, 0x20 -/* 80130D9C 0012DCFC 4E 80 00 20 */ blr +/* 80130D9C 0012DCFC 4E 80 00 20 */ blr .global sub_80130da0 sub_80130da0: @@ -1048,7 +1048,7 @@ lbl_80130ED4: /* 80130EE4 0012DE44 83 C1 00 68 */ lwz r30, 0x68(r1) /* 80130EE8 0012DE48 7C 08 03 A6 */ mtlr r0 /* 80130EEC 0012DE4C 38 21 00 80 */ addi r1, r1, 0x80 -/* 80130EF0 0012DE50 4E 80 00 20 */ blr +/* 80130EF0 0012DE50 4E 80 00 20 */ blr .global FlickerBatStateChanged__11CFlickerBatFQ211CFlickerBat16EFlickerBatStateR13CStateManager FlickerBatStateChanged__11CFlickerBatFQ211CFlickerBat16EFlickerBatStateR13CStateManager: @@ -1132,12 +1132,12 @@ lbl_80130FFC: /* 80131004 0012DF64 83 C1 00 08 */ lwz r30, 8(r1) /* 80131008 0012DF68 7C 08 03 A6 */ mtlr r0 /* 8013100C 0012DF6C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80131010 0012DF70 4E 80 00 20 */ blr +/* 80131010 0012DF70 4E 80 00 20 */ blr .global GetFlickerBatState__11CFlickerBatCFv GetFlickerBatState__11CFlickerBatCFv: /* 80131014 0012DF74 80 63 05 74 */ lwz r3, 0x574(r3) -/* 80131018 0012DF78 4E 80 00 20 */ blr +/* 80131018 0012DF78 4E 80 00 20 */ blr .global SetFlickerBatState__11CFlickerBatFQ211CFlickerBat16EFlickerBatStateR13CStateManager SetFlickerBatState__11CFlickerBatFQ211CFlickerBat16EFlickerBatStateR13CStateManager: @@ -1159,7 +1159,7 @@ lbl_8013104C: /* 80131054 0012DFB4 83 C1 00 08 */ lwz r30, 8(r1) /* 80131058 0012DFB8 7C 08 03 A6 */ mtlr r0 /* 8013105C 0012DFBC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80131060 0012DFC0 4E 80 00 20 */ blr +/* 80131060 0012DFC0 4E 80 00 20 */ blr .global sub_80131064 sub_80131064: @@ -1199,7 +1199,7 @@ lbl_801310C0: /* 801310DC 0012E03C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801310E0 0012E040 7C 08 03 A6 */ mtlr r0 /* 801310E4 0012E044 38 21 00 10 */ addi r1, r1, 0x10 -/* 801310E8 0012E048 4E 80 00 20 */ blr +/* 801310E8 0012E048 4E 80 00 20 */ blr .global DoUserAnimEvent__11CFlickerBatFR13CStateManagerRC13CInt32POINode14EUserEventType DoUserAnimEvent__11CFlickerBatFR13CStateManagerRC13CInt32POINode14EUserEventType: @@ -1235,7 +1235,7 @@ lbl_8013114C: /* 80131154 0012E0B4 80 01 00 34 */ lwz r0, 0x34(r1) /* 80131158 0012E0B8 7C 08 03 A6 */ mtlr r0 /* 8013115C 0012E0BC 38 21 00 30 */ addi r1, r1, 0x30 -/* 80131160 0012E0C0 4E 80 00 20 */ blr +/* 80131160 0012E0C0 4E 80 00 20 */ blr .global AcceptScriptMsg__11CFlickerBatF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__11CFlickerBatF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -1308,7 +1308,7 @@ lbl_80131250: /* 80131254 0012E1B4 80 01 00 34 */ lwz r0, 0x34(r1) /* 80131258 0012E1B8 7C 08 03 A6 */ mtlr r0 /* 8013125C 0012E1BC 38 21 00 30 */ addi r1, r1, 0x30 -/* 80131260 0012E1C0 4E 80 00 20 */ blr +/* 80131260 0012E1C0 4E 80 00 20 */ blr .global Accept__11CFlickerBatFR8IVisitor Accept__11CFlickerBatFR8IVisitor: @@ -1321,11 +1321,11 @@ Accept__11CFlickerBatFR8IVisitor: /* 8013127C 0012E1DC 7C 04 03 78 */ mr r4, r0 /* 80131280 0012E1E0 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 80131284 0012E1E4 7D 89 03 A6 */ mtctr r12 -/* 80131288 0012E1E8 4E 80 04 21 */ bctrl +/* 80131288 0012E1E8 4E 80 04 21 */ bctrl /* 8013128C 0012E1EC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80131290 0012E1F0 7C 08 03 A6 */ mtlr r0 /* 80131294 0012E1F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80131298 0012E1F8 4E 80 00 20 */ blr +/* 80131298 0012E1F8 4E 80 00 20 */ blr .global __dt__11CFlickerBatFv __dt__11CFlickerBatFv: @@ -1353,7 +1353,7 @@ lbl_801312E0: /* 801312EC 0012E24C 83 C1 00 08 */ lwz r30, 8(r1) /* 801312F0 0012E250 7C 08 03 A6 */ mtlr r0 /* 801312F4 0012E254 38 21 00 10 */ addi r1, r1, 0x10 -/* 801312F8 0012E258 4E 80 00 20 */ blr +/* 801312F8 0012E258 4E 80 00 20 */ blr .global "__ct__11CFlickerBatF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>Q210CPatterned11EFlavorTypeRC11CEntityInfoRC12CTransform4fRC10CModelDataRC14CPatternedInfoQ210CPatterned13EColliderTypebRC16CActorParameters" "__ct__11CFlickerBatF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>Q210CPatterned11EFlavorTypeRC11CEntityInfoRC12CTransform4fRC10CModelDataRC14CPatternedInfoQ210CPatterned13EColliderTypebRC16CActorParameters": diff --git a/asm/MetroidPrime/Enemies/CFlyingPirate.s b/asm/MetroidPrime/Enemies/CFlyingPirate.s index ae1a4221..2cfc5273 100644 --- a/asm/MetroidPrime/Enemies/CFlyingPirate.s +++ b/asm/MetroidPrime/Enemies/CFlyingPirate.s @@ -455,7 +455,7 @@ lbl_8046C950: .global lbl_8046CA4C lbl_8046CA4C: .skip 0xF4 - + .section .text, "ax" .global FixedRandom__10CPatternedFR13CStateManagerf @@ -465,7 +465,7 @@ FixedRandom__10CPatternedFR13CStateManagerf: /* 801F40D0 001F1030 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 801F40D4 001F1034 7C 00 00 26 */ mfcr r0 /* 801F40D8 001F1038 54 03 0F FE */ srwi r3, r0, 0x1f -/* 801F40DC 001F103C 4E 80 00 20 */ blr +/* 801F40DC 001F103C 4E 80 00 20 */ blr .global Random__10CPatternedFR13CStateManagerf Random__10CPatternedFR13CStateManagerf: @@ -473,7 +473,7 @@ Random__10CPatternedFR13CStateManagerf: /* 801F40E4 001F1044 FC 00 08 40 */ fcmpo cr0, f0, f1 /* 801F40E8 001F1048 7C 00 00 26 */ mfcr r0 /* 801F40EC 001F104C 54 03 0F FE */ srwi r3, r0, 0x1f -/* 801F40F0 001F1050 4E 80 00 20 */ blr +/* 801F40F0 001F1050 4E 80 00 20 */ blr .global UpdatePatternDestPos__10CPatternedFR13CStateManager UpdatePatternDestPos__10CPatternedFR13CStateManager: @@ -659,7 +659,7 @@ lbl_801F4388: /* 801F4390 001F12F0 83 C1 00 78 */ lwz r30, 0x78(r1) /* 801F4394 001F12F4 7C 08 03 A6 */ mtlr r0 /* 801F4398 001F12F8 38 21 00 80 */ addi r1, r1, 0x80 -/* 801F439C 001F12FC 4E 80 00 20 */ blr +/* 801F439C 001F12FC 4E 80 00 20 */ blr .global SetupPattern__10CPatternedFR13CStateManager SetupPattern__10CPatternedFR13CStateManager: @@ -1015,7 +1015,7 @@ lbl_801F4868: /* 801F48C4 001F1824 80 01 01 64 */ lwz r0, 0x164(r1) /* 801F48C8 001F1828 7C 08 03 A6 */ mtlr r0 /* 801F48CC 001F182C 38 21 01 60 */ addi r1, r1, 0x160 -/* 801F48D0 001F1830 4E 80 00 20 */ blr +/* 801F48D0 001F1830 4E 80 00 20 */ blr .global GetDesiredAttackState__10CPatternedCFR13CStateManager GetDesiredAttackState__10CPatternedCFR13CStateManager: @@ -1061,7 +1061,7 @@ lbl_801F4968: /* 801F4968 001F18C8 38 60 00 0A */ li r3, 0xa lbl_801F496C: /* 801F496C 001F18CC 38 21 00 30 */ addi r1, r1, 0x30 -/* 801F4970 001F18D0 4E 80 00 20 */ blr +/* 801F4970 001F18D0 4E 80 00 20 */ blr .global GetDestWaypoints__10CPatternedCFR13CStateManager GetDestWaypoints__10CPatternedCFR13CStateManager: @@ -1107,7 +1107,7 @@ lbl_801F49F8: /* 801F4A0C 001F196C 83 A1 00 34 */ lwz r29, 0x34(r1) /* 801F4A10 001F1970 7C 08 03 A6 */ mtlr r0 /* 801F4A14 001F1974 38 21 00 40 */ addi r1, r1, 0x40 -/* 801F4A18 001F1978 4E 80 00 20 */ blr +/* 801F4A18 001F1978 4E 80 00 20 */ blr .global FindPatternRotation__10CPatternedFRC9CVector3f FindPatternRotation__10CPatternedFRC9CVector3f: @@ -1250,7 +1250,7 @@ lbl_801F4C04: /* 801F4C30 001F1B90 80 01 01 04 */ lwz r0, 0x104(r1) /* 801F4C34 001F1B94 7C 08 03 A6 */ mtlr r0 /* 801F4C38 001F1B98 38 21 01 00 */ addi r1, r1, 0x100 -/* 801F4C3C 001F1B9C 4E 80 00 20 */ blr +/* 801F4C3C 001F1B9C 4E 80 00 20 */ blr .global FindPatternDir__10CPatternedFR13CStateManager FindPatternDir__10CPatternedFR13CStateManager: @@ -1310,7 +1310,7 @@ lbl_801F4CFC: /* 801F4CFC 001F1C5C D0 83 00 00 */ stfs f4, 0(r3) /* 801F4D00 001F1C60 D0 43 00 04 */ stfs f2, 4(r3) /* 801F4D04 001F1C64 D0 03 00 08 */ stfs f0, 8(r3) -/* 801F4D08 001F1C68 4E 80 00 20 */ blr +/* 801F4D08 001F1C68 4E 80 00 20 */ blr .global GetStepDirection__10CPatternedFRC9CVector3f GetStepDirection__10CPatternedFRC9CVector3f: @@ -1366,7 +1366,7 @@ lbl_801F4DC0: /* 801F4DC0 001F1D20 80 01 00 24 */ lwz r0, 0x24(r1) /* 801F4DC4 001F1D24 7C 08 03 A6 */ mtlr r0 /* 801F4DC8 001F1D28 38 21 00 20 */ addi r1, r1, 0x20 -/* 801F4DCC 001F1D2C 4E 80 00 20 */ blr +/* 801F4DCC 001F1D2C 4E 80 00 20 */ blr .global IsPatternObstructed__10CPatternedCFR13CStateManagerRC9CVector3fRC9CVector3f IsPatternObstructed__10CPatternedCFR13CStateManagerRC9CVector3fRC9CVector3f: @@ -1488,7 +1488,7 @@ lbl_801F4F70: /* 801F4F88 001F1EE8 80 01 08 F4 */ lwz r0, 0x8f4(r1) /* 801F4F8C 001F1EEC 7C 08 03 A6 */ mtlr r0 /* 801F4F90 001F1EF0 38 21 08 F0 */ addi r1, r1, 0x8f0 -/* 801F4F94 001F1EF4 4E 80 00 20 */ blr +/* 801F4F94 001F1EF4 4E 80 00 20 */ blr .global GetWaypointForState__10CPatternedFR13CStateManager18EScriptObjectState GetWaypointForState__10CPatternedFR13CStateManager18EScriptObjectState: @@ -1623,7 +1623,7 @@ lbl_801F5158: /* 801F515C 001F20BC 80 01 00 54 */ lwz r0, 0x54(r1) /* 801F5160 001F20C0 7C 08 03 A6 */ mtlr r0 /* 801F5164 001F20C4 38 21 00 50 */ addi r1, r1, 0x50 -/* 801F5168 001F20C8 4E 80 00 20 */ blr +/* 801F5168 001F20C8 4E 80 00 20 */ blr .global UpdateActorKeyframe__10CPatternedFR13CStateManager UpdateActorKeyframe__10CPatternedFR13CStateManager: @@ -1703,7 +1703,7 @@ lbl_801F5270: /* 801F5280 001F21E0 83 81 00 40 */ lwz r28, 0x40(r1) /* 801F5284 001F21E4 7C 08 03 A6 */ mtlr r0 /* 801F5288 001F21E8 38 21 00 50 */ addi r1, r1, 0x50 -/* 801F528C 001F21EC 4E 80 00 20 */ blr +/* 801F528C 001F21EC 4E 80 00 20 */ blr .global UpdateDest__10CPatternedFR13CStateManager UpdateDest__10CPatternedFR13CStateManager: @@ -1950,7 +1950,7 @@ lbl_801F563C: /* 801F5640 001F25A0 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 801F5644 001F25A4 7C 08 03 A6 */ mtlr r0 /* 801F5648 001F25A8 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 801F564C 001F25AC 4E 80 00 20 */ blr +/* 801F564C 001F25AC 4E 80 00 20 */ blr .global ApproachDest__10CPatternedFR13CStateManager ApproachDest__10CPatternedFR13CStateManager: @@ -2103,7 +2103,7 @@ lbl_801F5840: /* 801F5878 001F27D8 81 9F 00 00 */ lwz r12, 0(r31) /* 801F587C 001F27DC 81 8C 02 94 */ lwz r12, 0x294(r12) /* 801F5880 001F27E0 7D 89 03 A6 */ mtctr r12 -/* 801F5884 001F27E4 4E 80 04 21 */ bctrl +/* 801F5884 001F27E4 4E 80 04 21 */ bctrl /* 801F5888 001F27E8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801F588C 001F27EC 40 82 00 50 */ bne lbl_801F58DC /* 801F5890 001F27F0 C0 3F 03 10 */ lfs f1, 0x310(r31) @@ -2264,13 +2264,13 @@ lbl_801F5AC0: /* 801F5AE0 001F2A40 83 C1 00 A8 */ lwz r30, 0xa8(r1) /* 801F5AE4 001F2A44 7C 08 03 A6 */ mtlr r0 /* 801F5AE8 001F2A48 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 801F5AEC 001F2A4C 4E 80 00 20 */ blr +/* 801F5AEC 001F2A4C 4E 80 00 20 */ blr .global CodeTrigger__10CPatternedFR13CStateManagerf CodeTrigger__10CPatternedFR13CStateManagerf: /* 801F5AF0 001F2A50 88 03 03 48 */ lbz r0, 0x348(r3) /* 801F5AF4 001F2A54 54 03 CF FE */ rlwinm r3, r0, 0x19, 0x1f, 0x1f -/* 801F5AF8 001F2A58 4E 80 00 20 */ blr +/* 801F5AF8 001F2A58 4E 80 00 20 */ blr .global FixedDelay__10CPatternedFR13CStateManagerf FixedDelay__10CPatternedFR13CStateManagerf: @@ -2279,7 +2279,7 @@ FixedDelay__10CPatternedFR13CStateManagerf: /* 801F5B04 001F2A64 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 801F5B08 001F2A68 7C 00 00 26 */ mfcr r0 /* 801F5B0C 001F2A6C 54 03 17 FE */ rlwinm r3, r0, 2, 0x1f, 0x1f -/* 801F5B10 001F2A70 4E 80 00 20 */ blr +/* 801F5B10 001F2A70 4E 80 00 20 */ blr .global RandomDelay__10CPatternedFR13CStateManagerf RandomDelay__10CPatternedFR13CStateManagerf: @@ -2289,7 +2289,7 @@ RandomDelay__10CPatternedFR13CStateManagerf: /* 801F5B20 001F2A80 FC 02 00 40 */ fcmpo cr0, f2, f0 /* 801F5B24 001F2A84 7C 00 00 26 */ mfcr r0 /* 801F5B28 001F2A88 54 03 17 FE */ rlwinm r3, r0, 2, 0x1f, 0x1f -/* 801F5B2C 001F2A8C 4E 80 00 20 */ blr +/* 801F5B2C 001F2A8C 4E 80 00 20 */ blr .global Delay__10CPatternedFR13CStateManagerf Delay__10CPatternedFR13CStateManagerf: @@ -2297,7 +2297,7 @@ Delay__10CPatternedFR13CStateManagerf: /* 801F5B34 001F2A94 FC 00 08 40 */ fcmpo cr0, f0, f1 /* 801F5B38 001F2A98 7C 00 00 26 */ mfcr r0 /* 801F5B3C 001F2A9C 54 03 17 FE */ rlwinm r3, r0, 2, 0x1f, 0x1f -/* 801F5B40 001F2AA0 4E 80 00 20 */ blr +/* 801F5B40 001F2AA0 4E 80 00 20 */ blr .global PatrolPathOver__10CPatternedFR13CStateManagerf PatrolPathOver__10CPatternedFR13CStateManagerf: @@ -2306,7 +2306,7 @@ PatrolPathOver__10CPatternedFR13CStateManagerf: /* 801F5B4C 001F2AAC 7C 03 00 50 */ subf r0, r3, r0 /* 801F5B50 001F2AB0 7C 00 00 34 */ cntlzw r0, r0 /* 801F5B54 001F2AB4 54 03 D9 7E */ srwi r3, r0, 5 -/* 801F5B58 001F2AB8 4E 80 00 20 */ blr +/* 801F5B58 001F2AB8 4E 80 00 20 */ blr .global Stuck__10CPatternedFR13CStateManagerf Stuck__10CPatternedFR13CStateManagerf: @@ -2315,7 +2315,7 @@ Stuck__10CPatternedFR13CStateManagerf: /* 801F5B64 001F2AC4 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 801F5B68 001F2AC8 7C 00 00 26 */ mfcr r0 /* 801F5B6C 001F2ACC 54 03 17 FE */ rlwinm r3, r0, 2, 0x1f, 0x1f -/* 801F5B70 001F2AD0 4E 80 00 20 */ blr +/* 801F5B70 001F2AD0 4E 80 00 20 */ blr .global AnimOver__10CPatternedFR13CStateManagerf AnimOver__10CPatternedFR13CStateManagerf: @@ -2323,13 +2323,13 @@ AnimOver__10CPatternedFR13CStateManagerf: /* 801F5B78 001F2AD8 20 00 00 03 */ subfic r0, r0, 3 /* 801F5B7C 001F2ADC 7C 00 00 34 */ cntlzw r0, r0 /* 801F5B80 001F2AE0 54 03 D9 7E */ srwi r3, r0, 5 -/* 801F5B84 001F2AE4 4E 80 00 20 */ blr +/* 801F5B84 001F2AE4 4E 80 00 20 */ blr .global InPosition__10CPatternedFR13CStateManagerf InPosition__10CPatternedFR13CStateManagerf: /* 801F5B88 001F2AE8 88 03 03 28 */ lbz r0, 0x328(r3) /* 801F5B8C 001F2AEC 54 03 CF FE */ rlwinm r3, r0, 0x19, 0x1f, 0x1f -/* 801F5B90 001F2AF0 4E 80 00 20 */ blr +/* 801F5B90 001F2AF0 4E 80 00 20 */ blr .global HasPatrolPath__10CPatternedFR13CStateManagerf HasPatrolPath__10CPatternedFR13CStateManagerf: @@ -2351,7 +2351,7 @@ HasPatrolPath__10CPatternedFR13CStateManagerf: /* 801F5BD0 001F2B30 80 01 00 14 */ lwz r0, 0x14(r1) /* 801F5BD4 001F2B34 7C 08 03 A6 */ mtlr r0 /* 801F5BD8 001F2B38 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F5BDC 001F2B3C 4E 80 00 20 */ blr +/* 801F5BDC 001F2B3C 4E 80 00 20 */ blr .global Attacked__10CPatternedFR13CStateManagerf Attacked__10CPatternedFR13CStateManagerf: @@ -2360,7 +2360,7 @@ Attacked__10CPatternedFR13CStateManagerf: /* 801F5BE8 001F2B48 7C 03 00 D0 */ neg r0, r3 /* 801F5BEC 001F2B4C 7C 00 1B 78 */ or r0, r0, r3 /* 801F5BF0 001F2B50 54 03 0F FE */ srwi r3, r0, 0x1f -/* 801F5BF4 001F2B54 4E 80 00 20 */ blr +/* 801F5BF4 001F2B54 4E 80 00 20 */ blr .global PatternShagged__10CPatternedFR13CStateManagerf PatternShagged__10CPatternedFR13CStateManagerf: @@ -2369,7 +2369,7 @@ PatternShagged__10CPatternedFR13CStateManagerf: /* 801F5C00 001F2B60 7C 03 00 D0 */ neg r0, r3 /* 801F5C04 001F2B64 7C 00 1B 78 */ or r0, r0, r3 /* 801F5C08 001F2B68 54 03 0F FE */ srwi r3, r0, 0x1f -/* 801F5C0C 001F2B6C 4E 80 00 20 */ blr +/* 801F5C0C 001F2B6C 4E 80 00 20 */ blr .global PatternOver__10CPatternedFR13CStateManagerf PatternOver__10CPatternedFR13CStateManagerf: @@ -2379,7 +2379,7 @@ PatternOver__10CPatternedFR13CStateManagerf: /* 801F5C1C 001F2B7C 54 03 0F FE */ srwi r3, r0, 0x1f /* 801F5C20 001F2B80 7C 00 28 10 */ subfc r0, r0, r5 /* 801F5C24 001F2B84 7C 64 19 14 */ adde r3, r4, r3 -/* 801F5C28 001F2B88 4E 80 00 20 */ blr +/* 801F5C28 001F2B88 4E 80 00 20 */ blr .global HasRetreatPattern__10CPatternedFR13CStateManagerf HasRetreatPattern__10CPatternedFR13CStateManagerf: @@ -2401,7 +2401,7 @@ HasRetreatPattern__10CPatternedFR13CStateManagerf: /* 801F5C68 001F2BC8 80 01 00 14 */ lwz r0, 0x14(r1) /* 801F5C6C 001F2BCC 7C 08 03 A6 */ mtlr r0 /* 801F5C70 001F2BD0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F5C74 001F2BD4 4E 80 00 20 */ blr +/* 801F5C74 001F2BD4 4E 80 00 20 */ blr .global HasAttackPattern__10CPatternedFR13CStateManagerf HasAttackPattern__10CPatternedFR13CStateManagerf: @@ -2423,7 +2423,7 @@ HasAttackPattern__10CPatternedFR13CStateManagerf: /* 801F5CB4 001F2C14 80 01 00 14 */ lwz r0, 0x14(r1) /* 801F5CB8 001F2C18 7C 08 03 A6 */ mtlr r0 /* 801F5CBC 001F2C1C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F5CC0 001F2C20 4E 80 00 20 */ blr +/* 801F5CC0 001F2C20 4E 80 00 20 */ blr .global NoPathNodes__10CPatternedFR13CStateManagerf NoPathNodes__10CPatternedFR13CStateManagerf: @@ -2435,7 +2435,7 @@ NoPathNodes__10CPatternedFR13CStateManagerf: /* 801F5CD8 001F2C38 81 83 00 00 */ lwz r12, 0(r3) /* 801F5CDC 001F2C3C 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801F5CE0 001F2C40 7D 89 03 A6 */ mtctr r12 -/* 801F5CE4 001F2C44 4E 80 04 21 */ bctrl +/* 801F5CE4 001F2C44 4E 80 04 21 */ bctrl /* 801F5CE8 001F2C48 28 03 00 00 */ cmplwi r3, 0 /* 801F5CEC 001F2C4C 41 82 00 48 */ beq lbl_801F5D34 /* 801F5CF0 001F2C50 C0 5F 00 60 */ lfs f2, 0x60(r31) @@ -2448,7 +2448,7 @@ NoPathNodes__10CPatternedFR13CStateManagerf: /* 801F5D0C 001F2C6C 81 9F 00 00 */ lwz r12, 0(r31) /* 801F5D10 001F2C70 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801F5D14 001F2C74 7D 89 03 A6 */ mtctr r12 -/* 801F5D18 001F2C78 4E 80 04 21 */ bctrl +/* 801F5D18 001F2C78 4E 80 04 21 */ bctrl /* 801F5D1C 001F2C7C 38 81 00 08 */ addi r4, r1, 8 /* 801F5D20 001F2C80 4B FD 0E 15 */ bl OnPath__15CPathFindSearchCFRC9CVector3f /* 801F5D24 001F2C84 7C 03 00 D0 */ neg r0, r3 @@ -2462,7 +2462,7 @@ lbl_801F5D38: /* 801F5D3C 001F2C9C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801F5D40 001F2CA0 7C 08 03 A6 */ mtlr r0 /* 801F5D44 001F2CA4 38 21 00 20 */ addi r1, r1, 0x20 -/* 801F5D48 001F2CA8 4E 80 00 20 */ blr +/* 801F5D48 001F2CA8 4E 80 00 20 */ blr .global PathShagged__10CPatternedFR13CStateManagerf PathShagged__10CPatternedFR13CStateManagerf: @@ -2480,14 +2480,14 @@ PathShagged__10CPatternedFR13CStateManagerf: /* 801F5D78 001F2CD8 7C 7F 1B 78 */ mr r31, r3 /* 801F5D7C 001F2CDC 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801F5D80 001F2CE0 7D 89 03 A6 */ mtctr r12 -/* 801F5D84 001F2CE4 4E 80 04 21 */ bctrl +/* 801F5D84 001F2CE4 4E 80 04 21 */ bctrl /* 801F5D88 001F2CE8 28 03 00 00 */ cmplwi r3, 0 /* 801F5D8C 001F2CEC 41 82 01 24 */ beq lbl_801F5EB0 /* 801F5D90 001F2CF0 7F E3 FB 78 */ mr r3, r31 /* 801F5D94 001F2CF4 81 9F 00 00 */ lwz r12, 0(r31) /* 801F5D98 001F2CF8 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801F5D9C 001F2CFC 7D 89 03 A6 */ mtctr r12 -/* 801F5DA0 001F2D00 4E 80 04 21 */ bctrl +/* 801F5DA0 001F2D00 4E 80 04 21 */ bctrl /* 801F5DA4 001F2D04 80 03 00 CC */ lwz r0, 0xcc(r3) /* 801F5DA8 001F2D08 2C 00 00 00 */ cmpwi r0, 0 /* 801F5DAC 001F2D0C 41 82 00 0C */ beq lbl_801F5DB8 @@ -2498,7 +2498,7 @@ lbl_801F5DB8: /* 801F5DBC 001F2D1C 81 9F 00 00 */ lwz r12, 0(r31) /* 801F5DC0 001F2D20 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801F5DC4 001F2D24 7D 89 03 A6 */ mtctr r12 -/* 801F5DC8 001F2D28 4E 80 04 21 */ bctrl +/* 801F5DC8 001F2D28 4E 80 04 21 */ bctrl /* 801F5DCC 001F2D2C 80 03 00 C8 */ lwz r0, 0xc8(r3) /* 801F5DD0 001F2D30 2C 00 00 00 */ cmpwi r0, 0 /* 801F5DD4 001F2D34 40 81 00 DC */ ble lbl_801F5EB0 @@ -2530,7 +2530,7 @@ lbl_801F5DB8: /* 801F5E3C 001F2D9C 81 9F 00 00 */ lwz r12, 0(r31) /* 801F5E40 001F2DA0 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801F5E44 001F2DA4 7D 89 03 A6 */ mtctr r12 -/* 801F5E48 001F2DA8 4E 80 04 21 */ bctrl +/* 801F5E48 001F2DA8 4E 80 04 21 */ bctrl /* 801F5E4C 001F2DAC 38 81 00 20 */ addi r4, r1, 0x20 /* 801F5E50 001F2DB0 38 A1 00 14 */ addi r5, r1, 0x14 /* 801F5E54 001F2DB4 4B FD 5F 59 */ bl GetSplinePoint__15CPathFindSearchCFR9CVector3fRC9CVector3f @@ -2569,7 +2569,7 @@ lbl_801F5EB4: /* 801F5ED0 001F2E30 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 801F5ED4 001F2E34 7C 08 03 A6 */ mtlr r0 /* 801F5ED8 001F2E38 38 21 00 70 */ addi r1, r1, 0x70 -/* 801F5EDC 001F2E3C 4E 80 00 20 */ blr +/* 801F5EDC 001F2E3C 4E 80 00 20 */ blr .global PathFound__10CPatternedFR13CStateManagerf PathFound__10CPatternedFR13CStateManagerf: @@ -2583,14 +2583,14 @@ PathFound__10CPatternedFR13CStateManagerf: /* 801F5EFC 001F2E5C 81 83 00 00 */ lwz r12, 0(r3) /* 801F5F00 001F2E60 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801F5F04 001F2E64 7D 89 03 A6 */ mtctr r12 -/* 801F5F08 001F2E68 4E 80 04 21 */ bctrl +/* 801F5F08 001F2E68 4E 80 04 21 */ bctrl /* 801F5F0C 001F2E6C 28 03 00 00 */ cmplwi r3, 0 /* 801F5F10 001F2E70 41 82 00 28 */ beq lbl_801F5F38 /* 801F5F14 001F2E74 7F C3 F3 78 */ mr r3, r30 /* 801F5F18 001F2E78 81 9E 00 00 */ lwz r12, 0(r30) /* 801F5F1C 001F2E7C 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801F5F20 001F2E80 7D 89 03 A6 */ mtctr r12 -/* 801F5F24 001F2E84 4E 80 04 21 */ bctrl +/* 801F5F24 001F2E84 4E 80 04 21 */ bctrl /* 801F5F28 001F2E88 80 03 00 CC */ lwz r0, 0xcc(r3) /* 801F5F2C 001F2E8C 2C 00 00 00 */ cmpwi r0, 0 /* 801F5F30 001F2E90 40 82 00 08 */ bne lbl_801F5F38 @@ -2602,7 +2602,7 @@ lbl_801F5F38: /* 801F5F44 001F2EA4 83 C1 00 08 */ lwz r30, 8(r1) /* 801F5F48 001F2EA8 7C 08 03 A6 */ mtlr r0 /* 801F5F4C 001F2EAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F5F50 001F2EB0 4E 80 00 20 */ blr +/* 801F5F50 001F2EB0 4E 80 00 20 */ blr .global PathOver__10CPatternedFR13CStateManagerf PathOver__10CPatternedFR13CStateManagerf: @@ -2615,7 +2615,7 @@ PathOver__10CPatternedFR13CStateManagerf: /* 801F5F6C 001F2ECC 81 83 00 00 */ lwz r12, 0(r3) /* 801F5F70 001F2ED0 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801F5F74 001F2ED4 7D 89 03 A6 */ mtctr r12 -/* 801F5F78 001F2ED8 4E 80 04 21 */ bctrl +/* 801F5F78 001F2ED8 4E 80 04 21 */ bctrl /* 801F5F7C 001F2EDC 28 03 00 00 */ cmplwi r3, 0 /* 801F5F80 001F2EE0 41 82 00 70 */ beq lbl_801F5FF0 /* 801F5F84 001F2EE4 88 7E 03 28 */ lbz r3, 0x328(r30) @@ -2629,7 +2629,7 @@ lbl_801F5F98: /* 801F5FA0 001F2F00 81 9E 00 00 */ lwz r12, 0(r30) /* 801F5FA4 001F2F04 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801F5FA8 001F2F08 7D 89 03 A6 */ mtctr r12 -/* 801F5FAC 001F2F0C 4E 80 04 21 */ bctrl +/* 801F5FAC 001F2F0C 4E 80 04 21 */ bctrl /* 801F5FB0 001F2F10 80 03 00 CC */ lwz r0, 0xcc(r3) /* 801F5FB4 001F2F14 2C 00 00 00 */ cmpwi r0, 0 /* 801F5FB8 001F2F18 40 82 00 30 */ bne lbl_801F5FE8 @@ -2637,7 +2637,7 @@ lbl_801F5F98: /* 801F5FC0 001F2F20 81 9E 00 00 */ lwz r12, 0(r30) /* 801F5FC4 001F2F24 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801F5FC8 001F2F28 7D 89 03 A6 */ mtctr r12 -/* 801F5FCC 001F2F2C 4E 80 04 21 */ bctrl +/* 801F5FCC 001F2F2C 4E 80 04 21 */ bctrl /* 801F5FD0 001F2F30 80 83 00 04 */ lwz r4, 4(r3) /* 801F5FD4 001F2F34 80 63 00 C8 */ lwz r3, 0xc8(r3) /* 801F5FD8 001F2F38 38 04 FF FF */ addi r0, r4, -1 @@ -2655,7 +2655,7 @@ lbl_801F5FF4: /* 801F5FFC 001F2F5C 83 C1 00 08 */ lwz r30, 8(r1) /* 801F6000 001F2F60 7C 08 03 A6 */ mtlr r0 /* 801F6004 001F2F64 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F6008 001F2F68 4E 80 00 20 */ blr +/* 801F6008 001F2F68 4E 80 00 20 */ blr .global Landed__10CPatternedFR13CStateManagerf Landed__10CPatternedFR13CStateManagerf: @@ -2671,7 +2671,7 @@ lbl_801F6028: /* 801F602C 001F2F8C 50 A0 1F 38 */ rlwimi r0, r5, 3, 0x1c, 0x1c /* 801F6030 001F2F90 98 03 03 28 */ stb r0, 0x328(r3) /* 801F6034 001F2F94 7C 83 23 78 */ mr r3, r4 -/* 801F6038 001F2F98 4E 80 00 20 */ blr +/* 801F6038 001F2F98 4E 80 00 20 */ blr .global PlayerSpot__10CPatternedFR13CStateManagerf PlayerSpot__10CPatternedFR13CStateManagerf: @@ -2694,7 +2694,7 @@ PlayerSpot__10CPatternedFR13CStateManagerf: /* 801F607C 001F2FDC C0 22 AF 20 */ lfs f1, lbl_805ACC40@sda21(r2) /* 801F6080 001F2FE0 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 801F6084 001F2FE4 7D 89 03 A6 */ mtctr r12 -/* 801F6088 001F2FE8 4E 80 04 21 */ bctrl +/* 801F6088 001F2FE8 4E 80 04 21 */ bctrl /* 801F608C 001F2FEC C0 41 00 20 */ lfs f2, 0x20(r1) /* 801F6090 001F2FF0 7F C4 F3 78 */ mr r4, r30 /* 801F6094 001F2FF4 C0 21 00 24 */ lfs f1, 0x24(r1) @@ -2788,7 +2788,7 @@ lbl_801F61DC: /* 801F61EC 001F314C 83 C1 00 C8 */ lwz r30, 0xc8(r1) /* 801F61F0 001F3150 7C 08 03 A6 */ mtlr r0 /* 801F61F4 001F3154 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 801F61F8 001F3158 4E 80 00 20 */ blr +/* 801F61F8 001F3158 4E 80 00 20 */ blr .global SpotPlayer__10CPatternedFR13CStateManagerf SpotPlayer__10CPatternedFR13CStateManagerf: @@ -2811,7 +2811,7 @@ SpotPlayer__10CPatternedFR13CStateManagerf: /* 801F623C 001F319C 81 84 00 00 */ lwz r12, 0(r4) /* 801F6240 001F31A0 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 801F6244 001F31A4 7D 89 03 A6 */ mtctr r12 -/* 801F6248 001F31A8 4E 80 04 21 */ bctrl +/* 801F6248 001F31A8 4E 80 04 21 */ bctrl /* 801F624C 001F31AC C0 21 00 24 */ lfs f1, 0x24(r1) /* 801F6250 001F31B0 C0 01 00 18 */ lfs f0, 0x18(r1) /* 801F6254 001F31B4 C0 DD 00 48 */ lfs f6, 0x48(r29) @@ -2850,7 +2850,7 @@ lbl_801F62C4: /* 801F62D4 001F3234 83 A1 00 34 */ lwz r29, 0x34(r1) /* 801F62D8 001F3238 7C 08 03 A6 */ mtlr r0 /* 801F62DC 001F323C 38 21 00 40 */ addi r1, r1, 0x40 -/* 801F62E0 001F3240 4E 80 00 20 */ blr +/* 801F62E0 001F3240 4E 80 00 20 */ blr .global Leash__10CPatternedFR13CStateManagerf Leash__10CPatternedFR13CStateManagerf: @@ -2888,7 +2888,7 @@ Leash__10CPatternedFR13CStateManagerf: lbl_801F6360: /* 801F6360 001F32C0 7C 03 03 78 */ mr r3, r0 /* 801F6364 001F32C4 38 21 00 20 */ addi r1, r1, 0x20 -/* 801F6368 001F32C8 4E 80 00 20 */ blr +/* 801F6368 001F32C8 4E 80 00 20 */ blr .global InDetectionRange__10CPatternedFR13CStateManagerf InDetectionRange__10CPatternedFR13CStateManagerf: @@ -2922,7 +2922,7 @@ InDetectionRange__10CPatternedFR13CStateManagerf: /* 801F63D8 001F3338 54 00 0F FE */ srwi r0, r0, 0x1f lbl_801F63DC: /* 801F63DC 001F333C 7C 03 03 78 */ mr r3, r0 -/* 801F63E0 001F3340 4E 80 00 20 */ blr +/* 801F63E0 001F3340 4E 80 00 20 */ blr .global InMaxRange__10CPatternedFR13CStateManagerf InMaxRange__10CPatternedFR13CStateManagerf: @@ -2954,7 +2954,7 @@ InMaxRange__10CPatternedFR13CStateManagerf: /* 801F6448 001F33A8 7C 00 00 26 */ mfcr r0 /* 801F644C 001F33AC 54 03 0F FE */ srwi r3, r0, 0x1f /* 801F6450 001F33B0 38 21 00 20 */ addi r1, r1, 0x20 -/* 801F6454 001F33B4 4E 80 00 20 */ blr +/* 801F6454 001F33B4 4E 80 00 20 */ blr .global TooClose__10CPatternedFR13CStateManagerf TooClose__10CPatternedFR13CStateManagerf: @@ -2986,7 +2986,7 @@ TooClose__10CPatternedFR13CStateManagerf: /* 801F64BC 001F341C 7C 00 00 26 */ mfcr r0 /* 801F64C0 001F3420 54 03 0F FE */ srwi r3, r0, 0x1f /* 801F64C4 001F3424 38 21 00 20 */ addi r1, r1, 0x20 -/* 801F64C8 001F3428 4E 80 00 20 */ blr +/* 801F64C8 001F3428 4E 80 00 20 */ blr .global InRange__10CPatternedFR13CStateManagerf InRange__10CPatternedFR13CStateManagerf: @@ -3022,7 +3022,7 @@ InRange__10CPatternedFR13CStateManagerf: /* 801F6540 001F34A0 7C 00 00 26 */ mfcr r0 /* 801F6544 001F34A4 54 03 0F FE */ srwi r3, r0, 0x1f /* 801F6548 001F34A8 38 21 00 20 */ addi r1, r1, 0x20 -/* 801F654C 001F34AC 4E 80 00 20 */ blr +/* 801F654C 001F34AC 4E 80 00 20 */ blr .global OffLine__10CPatternedFR13CStateManagerf OffLine__10CPatternedFR13CStateManagerf: @@ -3122,7 +3122,7 @@ lbl_801F6688: /* 801F66BC 001F361C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801F66C0 001F3620 7C 08 03 A6 */ mtlr r0 /* 801F66C4 001F3624 38 21 00 60 */ addi r1, r1, 0x60 -/* 801F66C8 001F3628 4E 80 00 20 */ blr +/* 801F66C8 001F3628 4E 80 00 20 */ blr .global PathFind__10CPatternedFR13CStateManager9EStateMsgf PathFind__10CPatternedFR13CStateManager9EStateMsgf: @@ -3138,7 +3138,7 @@ PathFind__10CPatternedFR13CStateManager9EStateMsgf: /* 801F66F0 001F3650 81 83 00 00 */ lwz r12, 0(r3) /* 801F66F4 001F3654 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801F66F8 001F3658 7D 89 03 A6 */ mtctr r12 -/* 801F66FC 001F365C 4E 80 04 21 */ bctrl +/* 801F66FC 001F365C 4E 80 04 21 */ bctrl /* 801F6700 001F3660 28 03 00 00 */ cmplwi r3, 0 /* 801F6704 001F3664 41 82 02 A4 */ beq lbl_801F69A8 /* 801F6708 001F3668 2C 1D 00 01 */ cmpwi r29, 1 @@ -3159,7 +3159,7 @@ lbl_801F6724: /* 801F6740 001F36A0 81 9E 00 00 */ lwz r12, 0(r30) /* 801F6744 001F36A4 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801F6748 001F36A8 7D 89 03 A6 */ mtctr r12 -/* 801F674C 001F36AC 4E 80 04 21 */ bctrl +/* 801F674C 001F36AC 4E 80 04 21 */ bctrl /* 801F6750 001F36B0 38 81 00 20 */ addi r4, r1, 0x20 /* 801F6754 001F36B4 38 BE 02 E0 */ addi r5, r30, 0x2e0 /* 801F6758 001F36B8 4B FD 15 15 */ bl Search__15CPathFindSearchFRC9CVector3fRC9CVector3f @@ -3175,7 +3175,7 @@ lbl_801F6724: /* 801F6780 001F36E0 81 9E 00 00 */ lwz r12, 0(r30) /* 801F6784 001F36E4 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801F6788 001F36E8 7D 89 03 A6 */ mtctr r12 -/* 801F678C 001F36EC 4E 80 04 21 */ bctrl +/* 801F678C 001F36EC 4E 80 04 21 */ bctrl /* 801F6790 001F36F0 80 A3 00 C8 */ lwz r5, 0xc8(r3) /* 801F6794 001F36F4 80 03 00 04 */ lwz r0, 4(r3) /* 801F6798 001F36F8 38 85 00 01 */ addi r4, r5, 1 @@ -3205,7 +3205,7 @@ lbl_801F67E8: /* 801F67EC 001F374C 81 9E 00 00 */ lwz r12, 0(r30) /* 801F67F0 001F3750 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801F67F4 001F3754 7D 89 03 A6 */ mtctr r12 -/* 801F67F8 001F3758 4E 80 04 21 */ bctrl +/* 801F67F8 001F3758 4E 80 04 21 */ bctrl /* 801F67FC 001F375C 80 83 00 04 */ lwz r4, 4(r3) /* 801F6800 001F3760 80 63 00 C8 */ lwz r3, 0xc8(r3) /* 801F6804 001F3764 38 04 FF FF */ addi r0, r4, -1 @@ -3288,7 +3288,7 @@ lbl_801F6844: /* 801F6930 001F3890 D0 C1 00 0C */ stfs f6, 0xc(r1) /* 801F6934 001F3894 D0 81 00 10 */ stfs f4, 0x10(r1) /* 801F6938 001F3898 7D 89 03 A6 */ mtctr r12 -/* 801F693C 001F389C 4E 80 04 21 */ bctrl +/* 801F693C 001F389C 4E 80 04 21 */ bctrl /* 801F6940 001F38A0 C0 22 88 F4 */ lfs f1, lbl_805AA614@sda21(r2) /* 801F6944 001F38A4 38 81 00 2C */ addi r4, r1, 0x2c /* 801F6948 001F38A8 C0 01 00 0C */ lfs f0, 0xc(r1) @@ -3302,7 +3302,7 @@ lbl_801F6844: /* 801F6968 001F38C8 81 9E 00 00 */ lwz r12, 0(r30) /* 801F696C 001F38CC 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801F6970 001F38D0 7D 89 03 A6 */ mtctr r12 -/* 801F6974 001F38D4 4E 80 04 21 */ bctrl +/* 801F6974 001F38D4 4E 80 04 21 */ bctrl /* 801F6978 001F38D8 38 81 00 38 */ addi r4, r1, 0x38 /* 801F697C 001F38DC 4B FD 56 C9 */ bl SegmentOver__15CPathFindSearchCFRC9CVector3f /* 801F6980 001F38E0 54 60 06 3F */ clrlwi. r0, r3, 0x18 @@ -3311,7 +3311,7 @@ lbl_801F6844: /* 801F698C 001F38EC 81 9E 00 00 */ lwz r12, 0(r30) /* 801F6990 001F38F0 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801F6994 001F38F4 7D 89 03 A6 */ mtctr r12 -/* 801F6998 001F38F8 4E 80 04 21 */ bctrl +/* 801F6998 001F38F8 4E 80 04 21 */ bctrl /* 801F699C 001F38FC 80 83 00 C8 */ lwz r4, 0xc8(r3) /* 801F69A0 001F3900 38 04 00 01 */ addi r0, r4, 1 /* 801F69A4 001F3904 90 03 00 C8 */ stw r0, 0xc8(r3) @@ -3322,7 +3322,7 @@ lbl_801F69A8: /* 801F69B4 001F3914 83 A1 00 54 */ lwz r29, 0x54(r1) /* 801F69B8 001F3918 7C 08 03 A6 */ mtlr r0 /* 801F69BC 001F391C 38 21 00 60 */ addi r1, r1, 0x60 -/* 801F69C0 001F3920 4E 80 00 20 */ blr +/* 801F69C0 001F3920 4E 80 00 20 */ blr .global Dead__10CPatternedFR13CStateManager9EStateMsgf Dead__10CPatternedFR13CStateManager9EStateMsgf: @@ -3373,7 +3373,7 @@ lbl_801F6A50: /* 801F6A68 001F39C8 81 83 00 00 */ lwz r12, 0(r3) /* 801F6A6C 001F39CC 81 8C 00 10 */ lwz r12, 0x10(r12) /* 801F6A70 001F39D0 7D 89 03 A6 */ mtctr r12 -/* 801F6A74 001F39D4 4E 80 04 21 */ bctrl +/* 801F6A74 001F39D4 4E 80 04 21 */ bctrl /* 801F6A78 001F39D8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801F6A7C 001F39DC 41 82 00 48 */ beq lbl_801F6AC4 /* 801F6A80 001F39E0 88 1E 04 00 */ lbz r0, 0x400(r30) @@ -3399,7 +3399,7 @@ lbl_801F6AC4: /* 801F6ACC 001F3A2C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 801F6AD0 001F3A30 7C 08 03 A6 */ mtlr r0 /* 801F6AD4 001F3A34 38 21 00 20 */ addi r1, r1, 0x20 -/* 801F6AD8 001F3A38 4E 80 00 20 */ blr +/* 801F6AD8 001F3A38 4E 80 00 20 */ blr .global TargetPlayer__10CPatternedFR13CStateManager9EStateMsgf TargetPlayer__10CPatternedFR13CStateManager9EStateMsgf: @@ -3439,7 +3439,7 @@ lbl_801F6B54: /* 801F6B58 001F3AB8 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801F6B5C 001F3ABC 7C 08 03 A6 */ mtlr r0 /* 801F6B60 001F3AC0 38 21 00 20 */ addi r1, r1, 0x20 -/* 801F6B64 001F3AC4 4E 80 00 20 */ blr +/* 801F6B64 001F3AC4 4E 80 00 20 */ blr .global TargetPatrol__10CPatternedFR13CStateManager9EStateMsgf TargetPatrol__10CPatternedFR13CStateManager9EStateMsgf: @@ -3499,7 +3499,7 @@ lbl_801F6C28: /* 801F6C30 001F3B90 83 C1 00 28 */ lwz r30, 0x28(r1) /* 801F6C34 001F3B94 7C 08 03 A6 */ mtlr r0 /* 801F6C38 001F3B98 38 21 00 30 */ addi r1, r1, 0x30 -/* 801F6C3C 001F3B9C 4E 80 00 20 */ blr +/* 801F6C3C 001F3B9C 4E 80 00 20 */ blr .global FollowPattern__10CPatternedFR13CStateManager9EStateMsgf FollowPattern__10CPatternedFR13CStateManager9EStateMsgf: @@ -3655,7 +3655,7 @@ lbl_801F6E5C: /* 801F6E64 001F3DC4 83 C1 00 38 */ lwz r30, 0x38(r1) /* 801F6E68 001F3DC8 7C 08 03 A6 */ mtlr r0 /* 801F6E6C 001F3DCC 38 21 00 40 */ addi r1, r1, 0x40 -/* 801F6E70 001F3DD0 4E 80 00 20 */ blr +/* 801F6E70 001F3DD0 4E 80 00 20 */ blr .global Patrol__10CPatternedFR13CStateManager9EStateMsgf Patrol__10CPatternedFR13CStateManager9EStateMsgf: @@ -3811,11 +3811,11 @@ lbl_801F708C: /* 801F7094 001F3FF4 83 C1 00 28 */ lwz r30, 0x28(r1) /* 801F7098 001F3FF8 7C 08 03 A6 */ mtlr r0 /* 801F709C 001F3FFC 38 21 00 30 */ addi r1, r1, 0x30 -/* 801F70A0 001F4000 4E 80 00 20 */ blr +/* 801F70A0 001F4000 4E 80 00 20 */ blr .global Start__10CPatternedFR13CStateManager9EStateMsgf Start__10CPatternedFR13CStateManager9EStateMsgf: -/* 801F70A4 001F4004 4E 80 00 20 */ blr +/* 801F70A4 001F4004 4E 80 00 20 */ blr .global "reserve__Q24rstl63vectorFi" "reserve__Q24rstl63vectorFi": @@ -3907,7 +3907,7 @@ lbl_801F71CC: /* 801F71D8 001F4138 83 A1 00 24 */ lwz r29, 0x24(r1) /* 801F71DC 001F413C 7C 08 03 A6 */ mtlr r0 /* 801F71E0 001F4140 38 21 00 30 */ addi r1, r1, 0x30 -/* 801F71E4 001F4144 4E 80 00 20 */ blr +/* 801F71E4 001F4144 4E 80 00 20 */ blr .global __dt__13CFlyingPirateFv __dt__13CFlyingPirateFv: @@ -4043,7 +4043,7 @@ lbl_801F7380: /* 801F73A4 001F4304 38 80 00 01 */ li r4, 1 /* 801F73A8 001F4308 81 8C 00 08 */ lwz r12, 8(r12) /* 801F73AC 001F430C 7D 89 03 A6 */ mtctr r12 -/* 801F73B0 001F4310 4E 80 04 21 */ bctrl +/* 801F73B0 001F4310 4E 80 04 21 */ bctrl lbl_801F73B4: /* 801F73B4 001F4314 3B 9C 00 08 */ addi r28, r28, 8 /* 801F73B8 001F4318 3B BD 00 01 */ addi r29, r29, 1 @@ -4095,7 +4095,7 @@ lbl_801F7440: /* 801F7454 001F43B4 83 81 00 10 */ lwz r28, 0x10(r1) /* 801F7458 001F43B8 7C 08 03 A6 */ mtlr r0 /* 801F745C 001F43BC 38 21 00 20 */ addi r1, r1, 0x20 -/* 801F7460 001F43C0 4E 80 00 20 */ blr +/* 801F7460 001F43C0 4E 80 00 20 */ blr .global sub_801f7464 sub_801f7464: @@ -4156,17 +4156,17 @@ lbl_801F751C: /* 801F7528 001F4488 83 C1 00 08 */ lwz r30, 8(r1) /* 801F752C 001F448C 7C 08 03 A6 */ mtlr r0 /* 801F7530 001F4490 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F7534 001F4494 4E 80 00 20 */ blr +/* 801F7534 001F4494 4E 80 00 20 */ blr .global GetSearchPath__13CFlyingPirateFv GetSearchPath__13CFlyingPirateFv: /* 801F7538 001F4498 38 63 06 A8 */ addi r3, r3, 0x6a8 -/* 801F753C 001F449C 4E 80 00 20 */ blr +/* 801F753C 001F449C 4E 80 00 20 */ blr .global IsListening__13CFlyingPirateCFv IsListening__13CFlyingPirateCFv: /* 801F7540 001F44A0 38 60 00 01 */ li r3, 1 -/* 801F7544 001F44A4 4E 80 00 20 */ blr +/* 801F7544 001F44A4 4E 80 00 20 */ blr .global GetGravityConstant__13CFlyingPirateCFv GetGravityConstant__13CFlyingPirateCFv: @@ -4174,15 +4174,15 @@ GetGravityConstant__13CFlyingPirateCFv: /* 801F754C 001F44AC 54 00 D7 FF */ rlwinm. r0, r0, 0x1a, 0x1f, 0x1f /* 801F7550 001F44B0 41 82 00 0C */ beq lbl_801F755C /* 801F7554 001F44B4 C0 22 AF 58 */ lfs f1, lbl_805ACC78@sda21(r2) -/* 801F7558 001F44B8 4E 80 00 20 */ blr +/* 801F7558 001F44B8 4E 80 00 20 */ blr lbl_801F755C: /* 801F755C 001F44BC C0 22 AF 54 */ lfs f1, lbl_805ACC74@sda21(r2) -/* 801F7560 001F44C0 4E 80 00 20 */ blr +/* 801F7560 001F44C0 4E 80 00 20 */ blr .global KnockbackWhenFrozen__13CFlyingPirateCFv KnockbackWhenFrozen__13CFlyingPirateCFv: /* 801F7564 001F44C4 38 60 00 00 */ li r3, 0 -/* 801F7568 001F44C8 4E 80 00 20 */ blr +/* 801F7568 001F44C8 4E 80 00 20 */ blr .global Think__13CFlyingPirateFfR13CStateManager Think__13CFlyingPirateFfR13CStateManager: @@ -4300,7 +4300,7 @@ lbl_801F7710: /* 801F7718 001F4678 81 83 00 00 */ lwz r12, 0(r3) /* 801F771C 001F467C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801F7720 001F4680 7D 89 03 A6 */ mtctr r12 -/* 801F7724 001F4684 4E 80 04 21 */ bctrl +/* 801F7724 001F4684 4E 80 04 21 */ bctrl /* 801F7728 001F4688 3B 5A 00 08 */ addi r26, r26, 8 /* 801F772C 001F468C 3B 7B 00 01 */ addi r27, r27, 1 lbl_801F7730: @@ -4445,7 +4445,7 @@ lbl_801F791C: /* 801F7940 001F48A0 81 83 00 00 */ lwz r12, 0(r3) /* 801F7944 001F48A4 81 8C 00 28 */ lwz r12, 0x28(r12) /* 801F7948 001F48A8 7D 89 03 A6 */ mtctr r12 -/* 801F794C 001F48AC 4E 80 04 21 */ bctrl +/* 801F794C 001F48AC 4E 80 04 21 */ bctrl /* 801F7950 001F48B0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801F7954 001F48B4 41 82 02 64 */ beq lbl_801F7BB8 /* 801F7958 001F48B8 88 1F 06 A0 */ lbz r0, 0x6a0(r31) @@ -4481,7 +4481,7 @@ lbl_801F7990: /* 801F79CC 001F492C 81 8C 01 B0 */ lwz r12, 0x1b0(r12) /* 801F79D0 001F4930 54 1A 00 3C */ rlwinm r26, r0, 0, 0, 0x1e /* 801F79D4 001F4934 7D 89 03 A6 */ mtctr r12 -/* 801F79D8 001F4938 4E 80 04 21 */ bctrl +/* 801F79D8 001F4938 4E 80 04 21 */ bctrl /* 801F79DC 001F493C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801F79E0 001F4940 40 82 00 08 */ bne lbl_801F79E8 /* 801F79E4 001F4944 3B 5A 00 01 */ addi r26, r26, 1 @@ -4506,7 +4506,7 @@ lbl_801F79E8: /* 801F7A2C 001F498C 81 84 00 00 */ lwz r12, 0(r4) /* 801F7A30 001F4990 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 801F7A34 001F4994 7D 89 03 A6 */ mtctr r12 -/* 801F7A38 001F4998 4E 80 04 21 */ bctrl +/* 801F7A38 001F4998 4E 80 04 21 */ bctrl /* 801F7A3C 001F499C 7F E4 FB 78 */ mr r4, r31 /* 801F7A40 001F49A0 38 61 01 F4 */ addi r3, r1, 0x1f4 /* 801F7A44 001F49A4 4B F2 2E E9 */ bl GetBoundingBox__13CPhysicsActorCFv @@ -5061,7 +5061,7 @@ lbl_801F824C: /* 801F828C 001F51EC 81 83 00 00 */ lwz r12, 0(r3) /* 801F8290 001F51F0 81 8C 00 08 */ lwz r12, 8(r12) /* 801F8294 001F51F4 7D 89 03 A6 */ mtctr r12 -/* 801F8298 001F51F8 4E 80 04 21 */ bctrl +/* 801F8298 001F51F8 4E 80 04 21 */ bctrl /* 801F829C 001F51FC C0 5F 00 60 */ lfs f2, 0x60(r31) /* 801F82A0 001F5200 3C 60 80 5A */ lis r3, skIdentity4f@ha /* 801F82A4 001F5204 C0 3F 00 50 */ lfs f1, 0x50(r31) @@ -5121,7 +5121,7 @@ lbl_801F8354: /* 801F8374 001F52D4 7F C4 F3 78 */ mr r4, r30 /* 801F8378 001F52D8 EC 20 00 72 */ fmuls f1, f0, f1 /* 801F837C 001F52DC 7D 89 03 A6 */ mtctr r12 -/* 801F8380 001F52E0 4E 80 04 21 */ bctrl +/* 801F8380 001F52E0 4E 80 04 21 */ bctrl /* 801F8384 001F52E4 80 7F 00 64 */ lwz r3, 0x64(r31) /* 801F8388 001F52E8 7F C5 F3 78 */ mr r5, r30 /* 801F838C 001F52EC C0 21 00 08 */ lfs f1, 8(r1) @@ -5214,7 +5214,7 @@ lbl_801F84C4: /* 801F84D8 001F5438 80 01 02 B4 */ lwz r0, 0x2b4(r1) /* 801F84DC 001F543C 7C 08 03 A6 */ mtlr r0 /* 801F84E0 001F5440 38 21 02 B0 */ addi r1, r1, 0x2b0 -/* 801F84E4 001F5444 4E 80 00 20 */ blr +/* 801F84E4 001F5444 4E 80 00 20 */ blr .global PreRender__13CFlyingPirateFR13CStateManagerRC14CFrustumPlanes PreRender__13CFlyingPirateFR13CStateManagerRC14CFrustumPlanes: @@ -5244,7 +5244,7 @@ PreRender__13CFlyingPirateFR13CStateManagerRC14CFrustumPlanes: /* 801F8544 001F54A4 81 83 00 00 */ lwz r12, 0(r3) /* 801F8548 001F54A8 81 8C 00 10 */ lwz r12, 0x10(r12) /* 801F854C 001F54AC 7D 89 03 A6 */ mtctr r12 -/* 801F8550 001F54B0 4E 80 04 21 */ bctrl +/* 801F8550 001F54B0 4E 80 04 21 */ bctrl lbl_801F8554: /* 801F8554 001F54B4 7F A3 EB 78 */ mr r3, r29 /* 801F8558 001F54B8 7F C4 F3 78 */ mr r4, r30 @@ -5271,7 +5271,7 @@ lbl_801F8554: /* 801F85AC 001F550C 83 A1 00 24 */ lwz r29, 0x24(r1) /* 801F85B0 001F5510 7C 08 03 A6 */ mtlr r0 /* 801F85B4 001F5514 38 21 00 30 */ addi r1, r1, 0x30 -/* 801F85B8 001F5518 4E 80 00 20 */ blr +/* 801F85B8 001F5518 4E 80 00 20 */ blr .global AddToRenderer__13CFlyingPirateCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__13CFlyingPirateCFRC14CFrustumPlanesRC13CStateManager: @@ -5292,7 +5292,7 @@ lbl_801F85E4: /* 801F85F0 001F5550 81 9F 00 00 */ lwz r12, 0(r31) /* 801F85F4 001F5554 81 8C 00 5C */ lwz r12, 0x5c(r12) /* 801F85F8 001F5558 7D 89 03 A6 */ mtctr r12 -/* 801F85FC 001F555C 4E 80 04 21 */ bctrl +/* 801F85FC 001F555C 4E 80 04 21 */ bctrl /* 801F8600 001F5560 7F 63 DB 78 */ mr r3, r27 /* 801F8604 001F5564 38 81 00 08 */ addi r4, r1, 8 /* 801F8608 001F5568 48 14 CB 81 */ bl "BoxInFrustumPlanes__14CFrustumPlanesCFRCQ24rstl24optional_object<6CAABox>" @@ -5305,7 +5305,7 @@ lbl_801F85E4: /* 801F8624 001F5584 81 83 00 00 */ lwz r12, 0(r3) /* 801F8628 001F5588 81 8C 00 34 */ lwz r12, 0x34(r12) /* 801F862C 001F558C 7D 89 03 A6 */ mtctr r12 -/* 801F8630 001F5590 4E 80 04 21 */ bctrl +/* 801F8630 001F5590 4E 80 04 21 */ bctrl lbl_801F8634: /* 801F8634 001F5594 3B DE 00 08 */ addi r30, r30, 8 /* 801F8638 001F5598 3B BD 00 01 */ addi r29, r29, 1 @@ -5321,7 +5321,7 @@ lbl_801F863C: /* 801F865C 001F55BC 80 01 00 44 */ lwz r0, 0x44(r1) /* 801F8660 001F55C0 7C 08 03 A6 */ mtlr r0 /* 801F8664 001F55C4 38 21 00 40 */ addi r1, r1, 0x40 -/* 801F8668 001F55C8 4E 80 00 20 */ blr +/* 801F8668 001F55C8 4E 80 00 20 */ blr .global CalculateRenderBounds__13CFlyingPirateFv CalculateRenderBounds__13CFlyingPirateFv: @@ -5389,7 +5389,7 @@ lbl_801F8754: /* 801F8758 001F56B8 83 E1 00 5C */ lwz r31, 0x5c(r1) /* 801F875C 001F56BC 7C 08 03 A6 */ mtlr r0 /* 801F8760 001F56C0 38 21 00 60 */ addi r1, r1, 0x60 -/* 801F8764 001F56C4 4E 80 00 20 */ blr +/* 801F8764 001F56C4 4E 80 00 20 */ blr .global DoUserAnimEvent__13CFlyingPirateFR13CStateManagerRC13CInt32POINode14EUserEventType DoUserAnimEvent__13CFlyingPirateFR13CStateManagerRC13CInt32POINode14EUserEventType: @@ -5612,7 +5612,7 @@ lbl_801F8A70: /* 801F8A84 001F59E4 81 98 00 00 */ lwz r12, 0(r24) /* 801F8A88 001F59E8 81 8C 00 34 */ lwz r12, 0x34(r12) /* 801F8A8C 001F59EC 7D 89 03 A6 */ mtctr r12 -/* 801F8A90 001F59F0 4E 80 04 21 */ bctrl +/* 801F8A90 001F59F0 4E 80 04 21 */ bctrl /* 801F8A94 001F59F4 C0 23 00 00 */ lfs f1, 0(r3) /* 801F8A98 001F59F8 C0 02 AF 60 */ lfs f0, lbl_805ACC80@sda21(r2) /* 801F8A9C 001F59FC FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -5655,7 +5655,7 @@ lbl_801F8B14: /* 801F8B20 001F5A80 80 01 02 04 */ lwz r0, 0x204(r1) /* 801F8B24 001F5A84 7C 08 03 A6 */ mtlr r0 /* 801F8B28 001F5A88 38 21 02 00 */ addi r1, r1, 0x200 -/* 801F8B2C 001F5A8C 4E 80 00 20 */ blr +/* 801F8B2C 001F5A8C 4E 80 00 20 */ blr .global FireProjectile__13CFlyingPirateFR13CStateManagerRC9CVector3f FireProjectile__13CFlyingPirateFR13CStateManagerRC9CVector3f: @@ -5750,12 +5750,12 @@ lbl_801F8C08: /* 801F8C88 001F5BE8 81 9C 00 00 */ lwz r12, 0(r28) /* 801F8C8C 001F5BEC 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 801F8C90 001F5BF0 7D 89 03 A6 */ mtctr r12 -/* 801F8C94 001F5BF4 4E 80 04 21 */ bctrl +/* 801F8C94 001F5BF4 4E 80 04 21 */ bctrl /* 801F8C98 001F5BF8 7F A3 EB 78 */ mr r3, r29 /* 801F8C9C 001F5BFC 81 9D 00 00 */ lwz r12, 0(r29) /* 801F8CA0 001F5C00 81 8C 02 C0 */ lwz r12, 0x2c0(r12) /* 801F8CA4 001F5C04 7D 89 03 A6 */ mtctr r12 -/* 801F8CA8 001F5C08 4E 80 04 21 */ bctrl +/* 801F8CA8 001F5C08 4E 80 04 21 */ bctrl /* 801F8CAC 001F5C0C FC 20 F8 90 */ fmr f1, f31 /* 801F8CB0 001F5C10 7C 64 1B 78 */ mr r4, r3 /* 801F8CB4 001F5C14 7F 87 E3 78 */ mr r7, r28 @@ -6026,12 +6026,12 @@ lbl_801F9094: /* 801F90B0 001F6010 83 81 02 30 */ lwz r28, 0x230(r1) /* 801F90B4 001F6014 7C 08 03 A6 */ mtlr r0 /* 801F90B8 001F6018 38 21 02 50 */ addi r1, r1, 0x250 -/* 801F90BC 001F601C 4E 80 00 20 */ blr +/* 801F90BC 001F601C 4E 80 00 20 */ blr .global ProjectileInfo__13CFlyingPirateFv ProjectileInfo__13CFlyingPirateFv: /* 801F90C0 001F6020 38 63 05 74 */ addi r3, r3, 0x574 -/* 801F90C4 001F6024 4E 80 00 20 */ blr +/* 801F90C4 001F6024 4E 80 00 20 */ blr .global ShouldRetreat__13CFlyingPirateFR13CStateManagerf ShouldRetreat__13CFlyingPirateFR13CStateManagerf: @@ -6132,17 +6132,17 @@ lbl_801F9228: /* 801F9238 001F6198 83 A1 00 44 */ lwz r29, 0x44(r1) /* 801F923C 001F619C 7C 08 03 A6 */ mtlr r0 /* 801F9240 001F61A0 38 21 00 50 */ addi r1, r1, 0x50 -/* 801F9244 001F61A4 4E 80 00 20 */ blr +/* 801F9244 001F61A4 4E 80 00 20 */ blr .global Deactivate__13CFlyingPirateFR13CStateManager9EStateMsgf Deactivate__13CFlyingPirateFR13CStateManager9EStateMsgf: /* 801F9248 001F61A8 2C 05 00 00 */ cmpwi r5, 0 -/* 801F924C 001F61AC 4C 82 00 20 */ bnelr +/* 801F924C 001F61AC 4C 82 00 20 */ bnelr /* 801F9250 001F61B0 88 03 04 01 */ lbz r0, 0x401(r3) /* 801F9254 001F61B4 38 80 00 01 */ li r4, 1 /* 801F9258 001F61B8 50 80 0F BC */ rlwimi r0, r4, 1, 0x1e, 0x1e /* 801F925C 001F61BC 98 03 04 01 */ stb r0, 0x401(r3) -/* 801F9260 001F61C0 4E 80 00 20 */ blr +/* 801F9260 001F61C0 4E 80 00 20 */ blr .global Explode__13CFlyingPirateFR13CStateManager9EStateMsgf Explode__13CFlyingPirateFR13CStateManager9EStateMsgf: @@ -6182,7 +6182,7 @@ lbl_801F929C: /* 801F92E4 001F6244 81 9E 00 00 */ lwz r12, 0(r30) /* 801F92E8 001F6248 81 8C 02 98 */ lwz r12, 0x298(r12) /* 801F92EC 001F624C 7D 89 03 A6 */ mtctr r12 -/* 801F92F0 001F6250 4E 80 04 21 */ bctrl +/* 801F92F0 001F6250 4E 80 04 21 */ bctrl /* 801F92F4 001F6254 48 00 00 18 */ b lbl_801F930C lbl_801F92F8: /* 801F92F8 001F6258 C0 3E 03 38 */ lfs f1, 0x338(r30) @@ -6196,7 +6196,7 @@ lbl_801F930C: /* 801F9314 001F6274 83 C1 00 08 */ lwz r30, 8(r1) /* 801F9318 001F6278 7C 08 03 A6 */ mtlr r0 /* 801F931C 001F627C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F9320 001F6280 4E 80 00 20 */ blr +/* 801F9320 001F6280 4E 80 00 20 */ blr .global AnimOver__13CFlyingPirateFR13CStateManagerf AnimOver__13CFlyingPirateFR13CStateManagerf: @@ -6215,7 +6215,7 @@ lbl_801F934C: /* 801F934C 001F62AC 80 01 00 14 */ lwz r0, 0x14(r1) /* 801F9350 001F62B0 7C 08 03 A6 */ mtlr r0 /* 801F9354 001F62B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F9358 001F62B8 4E 80 00 20 */ blr +/* 801F9358 001F62B8 4E 80 00 20 */ blr .global Dead__13CFlyingPirateFR13CStateManager9EStateMsgf Dead__13CFlyingPirateFR13CStateManager9EStateMsgf: @@ -6262,7 +6262,7 @@ lbl_801F93E8: /* 801F93F4 001F6354 83 A1 00 24 */ lwz r29, 0x24(r1) /* 801F93F8 001F6358 7C 08 03 A6 */ mtlr r0 /* 801F93FC 001F635C 38 21 00 30 */ addi r1, r1, 0x30 -/* 801F9400 001F6360 4E 80 00 20 */ blr +/* 801F9400 001F6360 4E 80 00 20 */ blr .global Enraged__13CFlyingPirateFR13CStateManager9EStateMsgf Enraged__13CFlyingPirateFR13CStateManager9EStateMsgf: @@ -6360,13 +6360,13 @@ lbl_801F9548: /* 801F9568 001F64C8 83 C1 00 48 */ lwz r30, 0x48(r1) /* 801F956C 001F64CC 7C 08 03 A6 */ mtlr r0 /* 801F9570 001F64D0 38 21 00 80 */ addi r1, r1, 0x80 -/* 801F9574 001F64D4 4E 80 00 20 */ blr +/* 801F9574 001F64D4 4E 80 00 20 */ blr .global AggressionCheck__13CFlyingPirateFR13CStateManagerf AggressionCheck__13CFlyingPirateFR13CStateManagerf: /* 801F9578 001F64D8 88 03 06 A2 */ lbz r0, 0x6a2(r3) /* 801F957C 001F64DC 54 03 CF FE */ rlwinm r3, r0, 0x19, 0x1f, 0x1f -/* 801F9580 001F64E0 4E 80 00 20 */ blr +/* 801F9580 001F64E0 4E 80 00 20 */ blr .global Stuck__13CFlyingPirateFR13CStateManagerf Stuck__13CFlyingPirateFR13CStateManagerf: @@ -6390,7 +6390,7 @@ Stuck__13CFlyingPirateFR13CStateManagerf: /* 801F95C8 001F6528 81 9D 00 00 */ lwz r12, 0(r29) /* 801F95CC 001F652C 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801F95D0 001F6530 7D 89 03 A6 */ mtctr r12 -/* 801F95D4 001F6534 4E 80 04 21 */ bctrl +/* 801F95D4 001F6534 4E 80 04 21 */ bctrl /* 801F95D8 001F6538 80 03 00 CC */ lwz r0, 0xcc(r3) /* 801F95DC 001F653C 2C 00 00 00 */ cmpwi r0, 0 /* 801F95E0 001F6540 40 82 00 08 */ bne lbl_801F95E8 @@ -6407,7 +6407,7 @@ lbl_801F95F4: /* 801F9604 001F6564 83 A1 00 14 */ lwz r29, 0x14(r1) /* 801F9608 001F6568 7C 08 03 A6 */ mtlr r0 /* 801F960C 001F656C 38 21 00 20 */ addi r1, r1, 0x20 -/* 801F9610 001F6570 4E 80 00 20 */ blr +/* 801F9610 001F6570 4E 80 00 20 */ blr .global ShouldMove__13CFlyingPirateFR13CStateManagerf ShouldMove__13CFlyingPirateFR13CStateManagerf: @@ -6517,7 +6517,7 @@ lbl_801F96B8: /* 801F97A8 001F6708 83 C1 00 38 */ lwz r30, 0x38(r1) /* 801F97AC 001F670C 7C 08 03 A6 */ mtlr r0 /* 801F97B0 001F6710 38 21 00 80 */ addi r1, r1, 0x80 -/* 801F97B4 001F6714 4E 80 00 20 */ blr +/* 801F97B4 001F6714 4E 80 00 20 */ blr .global ProjectileAttack__13CFlyingPirateFR13CStateManager9EStateMsgf ProjectileAttack__13CFlyingPirateFR13CStateManager9EStateMsgf: @@ -6570,7 +6570,7 @@ lbl_801F9858: /* 801F985C 001F67BC 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801F9860 001F67C0 7C 08 03 A6 */ mtlr r0 /* 801F9864 001F67C4 38 21 00 20 */ addi r1, r1, 0x20 -/* 801F9868 001F67C8 4E 80 00 20 */ blr +/* 801F9868 001F67C8 4E 80 00 20 */ blr .global Walk__13CFlyingPirateFR13CStateManager9EStateMsgf Walk__13CFlyingPirateFR13CStateManager9EStateMsgf: @@ -6684,7 +6684,7 @@ lbl_801F99F8: /* 801F9A00 001F6960 83 C1 00 48 */ lwz r30, 0x48(r1) /* 801F9A04 001F6964 7C 08 03 A6 */ mtlr r0 /* 801F9A08 001F6968 38 21 00 50 */ addi r1, r1, 0x50 -/* 801F9A0C 001F696C 4E 80 00 20 */ blr +/* 801F9A0C 001F696C 4E 80 00 20 */ blr .global Land__13CFlyingPirateFR13CStateManager9EStateMsgf Land__13CFlyingPirateFR13CStateManager9EStateMsgf: @@ -6752,7 +6752,7 @@ lbl_801F9AE8: /* 801F9AF0 001F6A50 83 C1 00 18 */ lwz r30, 0x18(r1) /* 801F9AF4 001F6A54 7C 08 03 A6 */ mtlr r0 /* 801F9AF8 001F6A58 38 21 00 20 */ addi r1, r1, 0x20 -/* 801F9AFC 001F6A5C 4E 80 00 20 */ blr +/* 801F9AFC 001F6A5C 4E 80 00 20 */ blr .global InPosition__13CFlyingPirateFR13CStateManagerf InPosition__13CFlyingPirateFR13CStateManagerf: @@ -6801,7 +6801,7 @@ lbl_801F9B94: /* 801F9B9C 001F6AFC 83 C1 00 18 */ lwz r30, 0x18(r1) /* 801F9BA0 001F6B00 7C 08 03 A6 */ mtlr r0 /* 801F9BA4 001F6B04 38 21 00 20 */ addi r1, r1, 0x20 -/* 801F9BA8 001F6B08 4E 80 00 20 */ blr +/* 801F9BA8 001F6B08 4E 80 00 20 */ blr .global Landed__13CFlyingPirateFR13CStateManagerf Landed__13CFlyingPirateFR13CStateManagerf: @@ -6810,7 +6810,7 @@ Landed__13CFlyingPirateFR13CStateManagerf: /* 801F9BB4 001F6B14 20 00 00 02 */ subfic r0, r0, 2 /* 801F9BB8 001F6B18 7C 00 00 34 */ cntlzw r0, r0 /* 801F9BBC 001F6B1C 54 03 D9 7E */ srwi r3, r0, 5 -/* 801F9BC0 001F6B20 4E 80 00 20 */ blr +/* 801F9BC0 001F6B20 4E 80 00 20 */ blr .global Jump__13CFlyingPirateFR13CStateManager9EStateMsgf Jump__13CFlyingPirateFR13CStateManager9EStateMsgf: @@ -6895,7 +6895,7 @@ lbl_801F9CDC: /* 801F9CEC 001F6C4C 83 C1 00 08 */ lwz r30, 8(r1) /* 801F9CF0 001F6C50 7C 08 03 A6 */ mtlr r0 /* 801F9CF4 001F6C54 38 21 00 20 */ addi r1, r1, 0x20 -/* 801F9CF8 001F6C58 4E 80 00 20 */ blr +/* 801F9CF8 001F6C58 4E 80 00 20 */ blr .global ShouldSpecialAttack__13CFlyingPirateFR13CStateManagerf ShouldSpecialAttack__13CFlyingPirateFR13CStateManagerf: @@ -6998,7 +6998,7 @@ lbl_801F9E64: /* 801F9E70 001F6DD0 83 A1 00 54 */ lwz r29, 0x54(r1) /* 801F9E74 001F6DD4 7C 08 03 A6 */ mtlr r0 /* 801F9E78 001F6DD8 38 21 00 60 */ addi r1, r1, 0x60 -/* 801F9E7C 001F6DDC 4E 80 00 20 */ blr +/* 801F9E7C 001F6DDC 4E 80 00 20 */ blr .global Attacked__13CFlyingPirateFR13CStateManagerf Attacked__13CFlyingPirateFR13CStateManagerf: @@ -7013,7 +7013,7 @@ lbl_801F9E98: /* 801F9E98 001F6DF8 FC 02 08 40 */ fcmpo cr0, f2, f1 /* 801F9E9C 001F6DFC 7C 00 00 26 */ mfcr r0 /* 801F9EA0 001F6E00 54 03 0F FE */ srwi r3, r0, 0x1f -/* 801F9EA4 001F6E04 4E 80 00 20 */ blr +/* 801F9EA4 001F6E04 4E 80 00 20 */ blr .global ShotAt__13CFlyingPirateFR13CStateManagerf ShotAt__13CFlyingPirateFR13CStateManagerf: @@ -7028,7 +7028,7 @@ lbl_801F9EC0: /* 801F9EC0 001F6E20 FC 02 08 40 */ fcmpo cr0, f2, f1 /* 801F9EC4 001F6E24 7C 00 00 26 */ mfcr r0 /* 801F9EC8 001F6E28 54 03 0F FE */ srwi r3, r0, 0x1f -/* 801F9ECC 001F6E2C 4E 80 00 20 */ blr +/* 801F9ECC 001F6E2C 4E 80 00 20 */ blr .global Dodge__13CFlyingPirateFR13CStateManager9EStateMsgf Dodge__13CFlyingPirateFR13CStateManager9EStateMsgf: @@ -7113,7 +7113,7 @@ lbl_801F9FE4: /* 801F9FEC 001F6F4C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 801F9FF0 001F6F50 7C 08 03 A6 */ mtlr r0 /* 801F9FF4 001F6F54 38 21 00 20 */ addi r1, r1, 0x20 -/* 801F9FF8 001F6F58 4E 80 00 20 */ blr +/* 801F9FF8 001F6F58 4E 80 00 20 */ blr .global ShouldDodge__13CFlyingPirateFR13CStateManagerf ShouldDodge__13CFlyingPirateFR13CStateManagerf: @@ -7186,7 +7186,7 @@ lbl_801FA0D8: /* 801FA0FC 001F705C 83 C1 00 28 */ lwz r30, 0x28(r1) /* 801FA100 001F7060 7C 08 03 A6 */ mtlr r0 /* 801FA104 001F7064 38 21 00 60 */ addi r1, r1, 0x60 -/* 801FA108 001F7068 4E 80 00 20 */ blr +/* 801FA108 001F7068 4E 80 00 20 */ blr .global TurnAround__13CFlyingPirateFR13CStateManager9EStateMsgf TurnAround__13CFlyingPirateFR13CStateManager9EStateMsgf: @@ -7274,7 +7274,7 @@ lbl_801FA238: /* 801FA23C 001F719C 83 E1 00 4C */ lwz r31, 0x4c(r1) /* 801FA240 001F71A0 7C 08 03 A6 */ mtlr r0 /* 801FA244 001F71A4 38 21 00 50 */ addi r1, r1, 0x50 -/* 801FA248 001F71A8 4E 80 00 20 */ blr +/* 801FA248 001F71A8 4E 80 00 20 */ blr .global Retreat__13CFlyingPirateFR13CStateManager9EStateMsgf Retreat__13CFlyingPirateFR13CStateManager9EStateMsgf: @@ -7339,7 +7339,7 @@ lbl_801FA2A0: /* 801FA330 001F7290 81 9E 00 00 */ lwz r12, 0(r30) /* 801FA334 001F7294 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801FA338 001F7298 7D 89 03 A6 */ mtctr r12 -/* 801FA33C 001F729C 4E 80 04 21 */ bctrl +/* 801FA33C 001F729C 4E 80 04 21 */ bctrl /* 801FA340 001F72A0 38 81 00 BC */ addi r4, r1, 0xbc /* 801FA344 001F72A4 4B FC C7 F1 */ bl OnPath__15CPathFindSearchCFRC9CVector3f /* 801FA348 001F72A8 2C 03 00 02 */ cmpwi r3, 2 @@ -7354,7 +7354,7 @@ lbl_801FA2A0: /* 801FA36C 001F72CC 81 9E 00 00 */ lwz r12, 0(r30) /* 801FA370 001F72D0 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801FA374 001F72D4 7D 89 03 A6 */ mtctr r12 -/* 801FA378 001F72D8 4E 80 04 21 */ bctrl +/* 801FA378 001F72D8 4E 80 04 21 */ bctrl /* 801FA37C 001F72DC 38 81 00 80 */ addi r4, r1, 0x80 /* 801FA380 001F72E0 38 A1 00 BC */ addi r5, r1, 0xbc /* 801FA384 001F72E4 4B FC CD 79 */ bl FindClosestReachablePoint__15CPathFindSearchCFRC9CVector3fR9CVector3f @@ -7416,7 +7416,7 @@ lbl_801FA2A0: /* 801FA464 001F73C4 81 9E 00 00 */ lwz r12, 0(r30) /* 801FA468 001F73C8 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801FA46C 001F73CC 7D 89 03 A6 */ mtctr r12 -/* 801FA470 001F73D0 4E 80 04 21 */ bctrl +/* 801FA470 001F73D0 4E 80 04 21 */ bctrl /* 801FA474 001F73D4 38 81 00 BC */ addi r4, r1, 0xbc /* 801FA478 001F73D8 4B FC C6 BD */ bl OnPath__15CPathFindSearchCFRC9CVector3f /* 801FA47C 001F73DC 2C 03 00 02 */ cmpwi r3, 2 @@ -7431,7 +7431,7 @@ lbl_801FA2A0: /* 801FA4A0 001F7400 81 9E 00 00 */ lwz r12, 0(r30) /* 801FA4A4 001F7404 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801FA4A8 001F7408 7D 89 03 A6 */ mtctr r12 -/* 801FA4AC 001F740C 4E 80 04 21 */ bctrl +/* 801FA4AC 001F740C 4E 80 04 21 */ bctrl /* 801FA4B0 001F7410 38 81 00 50 */ addi r4, r1, 0x50 /* 801FA4B4 001F7414 38 A1 00 BC */ addi r5, r1, 0xbc /* 801FA4B8 001F7418 4B FC CC 45 */ bl FindClosestReachablePoint__15CPathFindSearchCFRC9CVector3fR9CVector3f @@ -7450,7 +7450,7 @@ lbl_801FA4CC: /* 801FA4E8 001F7448 81 9E 00 00 */ lwz r12, 0(r30) /* 801FA4EC 001F744C 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801FA4F0 001F7450 7D 89 03 A6 */ mtctr r12 -/* 801FA4F4 001F7454 4E 80 04 21 */ bctrl +/* 801FA4F4 001F7454 4E 80 04 21 */ bctrl /* 801FA4F8 001F7458 38 81 00 44 */ addi r4, r1, 0x44 /* 801FA4FC 001F745C 38 A1 00 BC */ addi r5, r1, 0xbc /* 801FA500 001F7460 4B FC D7 6D */ bl Search__15CPathFindSearchFRC9CVector3fRC9CVector3f @@ -7471,7 +7471,7 @@ lbl_801FA51C: /* 801FA538 001F7498 81 83 00 00 */ lwz r12, 0(r3) /* 801FA53C 001F749C 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801FA540 001F74A0 7D 89 03 A6 */ mtctr r12 -/* 801FA544 001F74A4 4E 80 04 21 */ bctrl +/* 801FA544 001F74A4 4E 80 04 21 */ bctrl /* 801FA548 001F74A8 80 83 00 04 */ lwz r4, 4(r3) /* 801FA54C 001F74AC 80 63 00 C8 */ lwz r3, 0xc8(r3) /* 801FA550 001F74B0 38 04 FF FF */ addi r0, r4, -1 @@ -7496,7 +7496,7 @@ lbl_801FA51C: /* 801FA59C 001F74FC 81 9E 00 00 */ lwz r12, 0(r30) /* 801FA5A0 001F7500 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801FA5A4 001F7504 7D 89 03 A6 */ mtctr r12 -/* 801FA5A8 001F7508 4E 80 04 21 */ bctrl +/* 801FA5A8 001F7508 4E 80 04 21 */ bctrl /* 801FA5AC 001F750C C0 22 AF 7C */ lfs f1, lbl_805ACC9C@sda21(r2) /* 801FA5B0 001F7510 38 81 00 A4 */ addi r4, r1, 0xa4 /* 801FA5B4 001F7514 38 A1 00 38 */ addi r5, r1, 0x38 @@ -7505,7 +7505,7 @@ lbl_801FA51C: /* 801FA5C0 001F7520 81 9E 00 00 */ lwz r12, 0(r30) /* 801FA5C4 001F7524 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801FA5C8 001F7528 7D 89 03 A6 */ mtctr r12 -/* 801FA5CC 001F752C 4E 80 04 21 */ bctrl +/* 801FA5CC 001F752C 4E 80 04 21 */ bctrl /* 801FA5D0 001F7530 38 81 00 A4 */ addi r4, r1, 0xa4 /* 801FA5D4 001F7534 4B FD 1A 71 */ bl SegmentOver__15CPathFindSearchCFRC9CVector3f /* 801FA5D8 001F7538 54 60 06 3F */ clrlwi. r0, r3, 0x18 @@ -7514,7 +7514,7 @@ lbl_801FA51C: /* 801FA5E4 001F7544 81 9E 00 00 */ lwz r12, 0(r30) /* 801FA5E8 001F7548 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801FA5EC 001F754C 7D 89 03 A6 */ mtctr r12 -/* 801FA5F0 001F7550 4E 80 04 21 */ bctrl +/* 801FA5F0 001F7550 4E 80 04 21 */ bctrl /* 801FA5F4 001F7554 80 83 00 C8 */ lwz r4, 0xc8(r3) /* 801FA5F8 001F7558 38 04 00 01 */ addi r0, r4, 1 /* 801FA5FC 001F755C 90 03 00 C8 */ stw r0, 0xc8(r3) @@ -7654,7 +7654,7 @@ lbl_801FA7DC: /* 801FA7FC 001F775C 83 C1 00 E8 */ lwz r30, 0xe8(r1) /* 801FA800 001F7760 7C 08 03 A6 */ mtlr r0 /* 801FA804 001F7764 38 21 01 20 */ addi r1, r1, 0x120 -/* 801FA808 001F7768 4E 80 00 20 */ blr +/* 801FA808 001F7768 4E 80 00 20 */ blr .global PathFind__13CFlyingPirateFR13CStateManager9EStateMsgf PathFind__13CFlyingPirateFR13CStateManager9EStateMsgf: @@ -7690,7 +7690,7 @@ lbl_801FA868: /* 801FA878 001F77D8 81 84 00 00 */ lwz r12, 0(r4) /* 801FA87C 001F77DC 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 801FA880 001F77E0 7D 89 03 A6 */ mtctr r12 -/* 801FA884 001F77E4 4E 80 04 21 */ bctrl +/* 801FA884 001F77E4 4E 80 04 21 */ bctrl /* 801FA888 001F77E8 C0 41 00 6C */ lfs f2, 0x6c(r1) /* 801FA88C 001F77EC C0 21 00 70 */ lfs f1, 0x70(r1) /* 801FA890 001F77F0 C0 01 00 74 */ lfs f0, 0x74(r1) @@ -7733,7 +7733,7 @@ lbl_801FA900: /* 801FA91C 001F787C 81 9E 00 00 */ lwz r12, 0(r30) /* 801FA920 001F7880 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801FA924 001F7884 7D 89 03 A6 */ mtctr r12 -/* 801FA928 001F7888 4E 80 04 21 */ bctrl +/* 801FA928 001F7888 4E 80 04 21 */ bctrl /* 801FA92C 001F788C 38 81 00 60 */ addi r4, r1, 0x60 /* 801FA930 001F7890 38 A1 00 90 */ addi r5, r1, 0x90 /* 801FA934 001F7894 4B FC D3 39 */ bl Search__15CPathFindSearchFRC9CVector3fRC9CVector3f @@ -7743,7 +7743,7 @@ lbl_801FA900: /* 801FA944 001F78A4 81 9E 00 00 */ lwz r12, 0(r30) /* 801FA948 001F78A8 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801FA94C 001F78AC 7D 89 03 A6 */ mtctr r12 -/* 801FA950 001F78B0 4E 80 04 21 */ bctrl +/* 801FA950 001F78B0 4E 80 04 21 */ bctrl /* 801FA954 001F78B4 80 03 00 CC */ lwz r0, 0xcc(r3) /* 801FA958 001F78B8 2C 00 00 03 */ cmpwi r0, 3 /* 801FA95C 001F78BC 41 82 00 24 */ beq lbl_801FA980 @@ -7751,7 +7751,7 @@ lbl_801FA900: /* 801FA964 001F78C4 81 9E 00 00 */ lwz r12, 0(r30) /* 801FA968 001F78C8 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801FA96C 001F78CC 7D 89 03 A6 */ mtctr r12 -/* 801FA970 001F78D0 4E 80 04 21 */ bctrl +/* 801FA970 001F78D0 4E 80 04 21 */ bctrl /* 801FA974 001F78D4 80 03 00 CC */ lwz r0, 0xcc(r3) /* 801FA978 001F78D8 2C 00 00 04 */ cmpwi r0, 4 /* 801FA97C 001F78DC 40 82 00 7C */ bne lbl_801FA9F8 @@ -7766,7 +7766,7 @@ lbl_801FA980: /* 801FA99C 001F78FC 81 9E 00 00 */ lwz r12, 0(r30) /* 801FA9A0 001F7900 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801FA9A4 001F7904 7D 89 03 A6 */ mtctr r12 -/* 801FA9A8 001F7908 4E 80 04 21 */ bctrl +/* 801FA9A8 001F7908 4E 80 04 21 */ bctrl /* 801FA9AC 001F790C 38 81 00 54 */ addi r4, r1, 0x54 /* 801FA9B0 001F7910 38 A1 00 90 */ addi r5, r1, 0x90 /* 801FA9B4 001F7914 4B FC C7 49 */ bl FindClosestReachablePoint__15CPathFindSearchCFRC9CVector3fR9CVector3f @@ -7782,7 +7782,7 @@ lbl_801FA980: /* 801FA9DC 001F793C 81 9E 00 00 */ lwz r12, 0(r30) /* 801FA9E0 001F7940 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801FA9E4 001F7944 7D 89 03 A6 */ mtctr r12 -/* 801FA9E8 001F7948 4E 80 04 21 */ bctrl +/* 801FA9E8 001F7948 4E 80 04 21 */ bctrl /* 801FA9EC 001F794C 38 81 00 48 */ addi r4, r1, 0x48 /* 801FA9F0 001F7950 38 A1 00 90 */ addi r5, r1, 0x90 /* 801FA9F4 001F7954 4B FC D2 79 */ bl Search__15CPathFindSearchFRC9CVector3fRC9CVector3f @@ -7804,7 +7804,7 @@ lbl_801FAA10: /* 801FAA2C 001F798C 81 83 00 00 */ lwz r12, 0(r3) /* 801FAA30 001F7990 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801FAA34 001F7994 7D 89 03 A6 */ mtctr r12 -/* 801FAA38 001F7998 4E 80 04 21 */ bctrl +/* 801FAA38 001F7998 4E 80 04 21 */ bctrl /* 801FAA3C 001F799C 80 03 00 CC */ lwz r0, 0xcc(r3) /* 801FAA40 001F79A0 2C 00 00 00 */ cmpwi r0, 0 /* 801FAA44 001F79A4 40 82 01 18 */ bne lbl_801FAB5C @@ -7812,7 +7812,7 @@ lbl_801FAA10: /* 801FAA4C 001F79AC 81 9E 00 00 */ lwz r12, 0(r30) /* 801FAA50 001F79B0 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801FAA54 001F79B4 7D 89 03 A6 */ mtctr r12 -/* 801FAA58 001F79B8 4E 80 04 21 */ bctrl +/* 801FAA58 001F79B8 4E 80 04 21 */ bctrl /* 801FAA5C 001F79BC 80 83 00 04 */ lwz r4, 4(r3) /* 801FAA60 001F79C0 80 63 00 C8 */ lwz r3, 0xc8(r3) /* 801FAA64 001F79C4 38 04 FF FF */ addi r0, r4, -1 @@ -7837,7 +7837,7 @@ lbl_801FAA10: /* 801FAAB0 001F7A10 81 9E 00 00 */ lwz r12, 0(r30) /* 801FAAB4 001F7A14 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801FAAB8 001F7A18 7D 89 03 A6 */ mtctr r12 -/* 801FAABC 001F7A1C 4E 80 04 21 */ bctrl +/* 801FAABC 001F7A1C 4E 80 04 21 */ bctrl /* 801FAAC0 001F7A20 C0 22 AF 7C */ lfs f1, lbl_805ACC9C@sda21(r2) /* 801FAAC4 001F7A24 38 81 00 78 */ addi r4, r1, 0x78 /* 801FAAC8 001F7A28 38 A1 00 3C */ addi r5, r1, 0x3c @@ -7846,7 +7846,7 @@ lbl_801FAA10: /* 801FAAD4 001F7A34 81 9E 00 00 */ lwz r12, 0(r30) /* 801FAAD8 001F7A38 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801FAADC 001F7A3C 7D 89 03 A6 */ mtctr r12 -/* 801FAAE0 001F7A40 4E 80 04 21 */ bctrl +/* 801FAAE0 001F7A40 4E 80 04 21 */ bctrl /* 801FAAE4 001F7A44 38 81 00 78 */ addi r4, r1, 0x78 /* 801FAAE8 001F7A48 4B FD 15 5D */ bl SegmentOver__15CPathFindSearchCFRC9CVector3f /* 801FAAEC 001F7A4C 54 60 06 3F */ clrlwi. r0, r3, 0x18 @@ -7855,7 +7855,7 @@ lbl_801FAA10: /* 801FAAF8 001F7A58 81 9E 00 00 */ lwz r12, 0(r30) /* 801FAAFC 001F7A5C 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801FAB00 001F7A60 7D 89 03 A6 */ mtctr r12 -/* 801FAB04 001F7A64 4E 80 04 21 */ bctrl +/* 801FAB04 001F7A64 4E 80 04 21 */ bctrl /* 801FAB08 001F7A68 80 83 00 C8 */ lwz r4, 0xc8(r3) /* 801FAB0C 001F7A6C 38 04 00 01 */ addi r0, r4, 1 /* 801FAB10 001F7A70 90 03 00 C8 */ stw r0, 0xc8(r3) @@ -8001,7 +8001,7 @@ lbl_801FAD04: /* 801FAD24 001F7C84 83 C1 00 B8 */ lwz r30, 0xb8(r1) /* 801FAD28 001F7C88 7C 08 03 A6 */ mtlr r0 /* 801FAD2C 001F7C8C 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 801FAD30 001F7C90 4E 80 00 20 */ blr +/* 801FAD30 001F7C90 4E 80 00 20 */ blr .global InRange__13CFlyingPirateFR13CStateManagerf InRange__13CFlyingPirateFR13CStateManagerf: @@ -8025,7 +8025,7 @@ InRange__13CFlyingPirateFR13CStateManagerf: /* 801FAD78 001F7CD8 38 00 00 01 */ li r0, 1 lbl_801FAD7C: /* 801FAD7C 001F7CDC 7C 03 03 78 */ mr r3, r0 -/* 801FAD80 001F7CE0 4E 80 00 20 */ blr +/* 801FAD80 001F7CE0 4E 80 00 20 */ blr .global LineOfSight__13CFlyingPirateFR13CStateManagerf LineOfSight__13CFlyingPirateFR13CStateManagerf: @@ -8033,7 +8033,7 @@ LineOfSight__13CFlyingPirateFR13CStateManagerf: /* 801FAD88 001F7CE8 54 00 07 FE */ clrlwi r0, r0, 0x1f /* 801FAD8C 001F7CEC 7C 00 00 34 */ cntlzw r0, r0 /* 801FAD90 001F7CF0 54 03 D9 7E */ srwi r3, r0, 5 -/* 801FAD94 001F7CF4 4E 80 00 20 */ blr +/* 801FAD94 001F7CF4 4E 80 00 20 */ blr .global SpotPlayer__13CFlyingPirateFR13CStateManagerf SpotPlayer__13CFlyingPirateFR13CStateManagerf: @@ -8054,7 +8054,7 @@ SpotPlayer__13CFlyingPirateFR13CStateManagerf: /* 801FADD0 001F7D30 81 84 00 00 */ lwz r12, 0(r4) /* 801FADD4 001F7D34 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 801FADD8 001F7D38 7D 89 03 A6 */ mtctr r12 -/* 801FADDC 001F7D3C 4E 80 04 21 */ bctrl +/* 801FADDC 001F7D3C 4E 80 04 21 */ bctrl /* 801FADE0 001F7D40 C0 21 00 28 */ lfs f1, 0x28(r1) /* 801FADE4 001F7D44 38 61 00 2C */ addi r3, r1, 0x2c /* 801FADE8 001F7D48 C0 01 00 1C */ lfs f0, 0x1c(r1) @@ -8091,7 +8091,7 @@ SpotPlayer__13CFlyingPirateFR13CStateManagerf: /* 801FAE64 001F7DC4 80 01 00 44 */ lwz r0, 0x44(r1) /* 801FAE68 001F7DC8 7C 08 03 A6 */ mtlr r0 /* 801FAE6C 001F7DCC 38 21 00 40 */ addi r1, r1, 0x40 -/* 801FAE70 001F7DD0 4E 80 00 20 */ blr +/* 801FAE70 001F7DD0 4E 80 00 20 */ blr .global Attack__13CFlyingPirateFR13CStateManager9EStateMsgf Attack__13CFlyingPirateFR13CStateManager9EStateMsgf: @@ -8206,7 +8206,7 @@ lbl_801FAFF4: /* 801FB008 001F7F68 83 A1 00 44 */ lwz r29, 0x44(r1) /* 801FB00C 001F7F6C 7C 08 03 A6 */ mtlr r0 /* 801FB010 001F7F70 38 21 00 60 */ addi r1, r1, 0x60 -/* 801FB014 001F7F74 4E 80 00 20 */ blr +/* 801FB014 001F7F74 4E 80 00 20 */ blr .global ShouldAttack__13CFlyingPirateFR13CStateManagerf ShouldAttack__13CFlyingPirateFR13CStateManagerf: @@ -8309,7 +8309,7 @@ lbl_801FB168: /* 801FB188 001F80E8 83 A1 00 24 */ lwz r29, 0x24(r1) /* 801FB18C 001F80EC 7C 08 03 A6 */ mtlr r0 /* 801FB190 001F80F0 38 21 00 50 */ addi r1, r1, 0x50 -/* 801FB194 001F80F4 4E 80 00 20 */ blr +/* 801FB194 001F80F4 4E 80 00 20 */ blr .global CoverFind__13CFlyingPirateFR13CStateManagerf CoverFind__13CFlyingPirateFR13CStateManagerf: @@ -8425,7 +8425,7 @@ lbl_801FB328: /* 801FB338 001F8298 80 01 00 74 */ lwz r0, 0x74(r1) /* 801FB33C 001F829C 7C 08 03 A6 */ mtlr r0 /* 801FB340 001F82A0 38 21 00 70 */ addi r1, r1, 0x70 -/* 801FB344 001F82A4 4E 80 00 20 */ blr +/* 801FB344 001F82A4 4E 80 00 20 */ blr .global CoverCheck__13CFlyingPirateFR13CStateManagerf CoverCheck__13CFlyingPirateFR13CStateManagerf: @@ -8457,7 +8457,7 @@ lbl_801FB39C: /* 801FB3A4 001F8304 CB E1 00 10 */ lfd f31, 0x10(r1) /* 801FB3A8 001F8308 7C 08 03 A6 */ mtlr r0 /* 801FB3AC 001F830C 38 21 00 20 */ addi r1, r1, 0x20 -/* 801FB3B0 001F8310 4E 80 00 20 */ blr +/* 801FB3B0 001F8310 4E 80 00 20 */ blr .global Lurk__13CFlyingPirateFR13CStateManager9EStateMsgf Lurk__13CFlyingPirateFR13CStateManager9EStateMsgf: @@ -8595,7 +8595,7 @@ lbl_801FB5A0: /* 801FB5A8 001F8508 83 C1 00 58 */ lwz r30, 0x58(r1) /* 801FB5AC 001F850C 7C 08 03 A6 */ mtlr r0 /* 801FB5B0 001F8510 38 21 00 60 */ addi r1, r1, 0x60 -/* 801FB5B4 001F8514 4E 80 00 20 */ blr +/* 801FB5B4 001F8514 4E 80 00 20 */ blr .global Bounce__13CFlyingPirateFR13CStateManager9EStateMsgf Bounce__13CFlyingPirateFR13CStateManager9EStateMsgf: @@ -8691,7 +8691,7 @@ lbl_801FB6F8: /* 801FB6FC 001F865C 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 801FB700 001F8660 7C 08 03 A6 */ mtlr r0 /* 801FB704 001F8664 38 21 00 30 */ addi r1, r1, 0x30 -/* 801FB708 001F8668 4E 80 00 20 */ blr +/* 801FB708 001F8668 4E 80 00 20 */ blr .global GetUp__13CFlyingPirateFR13CStateManager9EStateMsgf GetUp__13CFlyingPirateFR13CStateManager9EStateMsgf: @@ -8776,7 +8776,7 @@ lbl_801FB824: /* 801FB82C 001F878C 83 C1 00 38 */ lwz r30, 0x38(r1) /* 801FB830 001F8790 7C 08 03 A6 */ mtlr r0 /* 801FB834 001F8794 38 21 00 40 */ addi r1, r1, 0x40 -/* 801FB838 001F8798 4E 80 00 20 */ blr +/* 801FB838 001F8798 4E 80 00 20 */ blr .global Taunt__13CFlyingPirateFR13CStateManager9EStateMsgf Taunt__13CFlyingPirateFR13CStateManager9EStateMsgf: @@ -8903,7 +8903,7 @@ lbl_801FB9F8: /* 801FB9FC 001F895C 80 01 00 54 */ lwz r0, 0x54(r1) /* 801FBA00 001F8960 7C 08 03 A6 */ mtlr r0 /* 801FBA04 001F8964 38 21 00 50 */ addi r1, r1, 0x50 -/* 801FBA08 001F8968 4E 80 00 20 */ blr +/* 801FBA08 001F8968 4E 80 00 20 */ blr .global HearPlayer__13CFlyingPirateFR13CStateManagerf HearPlayer__13CFlyingPirateFR13CStateManagerf: @@ -8939,7 +8939,7 @@ HearPlayer__13CFlyingPirateFR13CStateManagerf: /* 801FBA80 001F89E0 38 00 00 01 */ li r0, 1 lbl_801FBA84: /* 801FBA84 001F89E4 7C 03 03 78 */ mr r3, r0 -/* 801FBA88 001F89E8 4E 80 00 20 */ blr +/* 801FBA88 001F89E8 4E 80 00 20 */ blr .global HearShot__13CFlyingPirateFR13CStateManagerf HearShot__13CFlyingPirateFR13CStateManagerf: @@ -8949,7 +8949,7 @@ HearShot__13CFlyingPirateFR13CStateManagerf: /* 801FBA98 001F89F8 50 05 2E B4 */ rlwimi r5, r0, 5, 0x1a, 0x1a /* 801FBA9C 001F89FC 98 A3 06 A0 */ stb r5, 0x6a0(r3) /* 801FBAA0 001F8A00 7C 83 23 78 */ mr r3, r4 -/* 801FBAA4 001F8A04 4E 80 00 20 */ blr +/* 801FBAA4 001F8A04 4E 80 00 20 */ blr .global PatternOver__13CFlyingPirateFR13CStateManagerf PatternOver__13CFlyingPirateFR13CStateManagerf: @@ -8958,7 +8958,7 @@ PatternOver__13CFlyingPirateFR13CStateManagerf: /* 801FBAB0 001F8A10 7C 03 00 50 */ subf r0, r3, r0 /* 801FBAB4 001F8A14 7C 00 00 34 */ cntlzw r0, r0 /* 801FBAB8 001F8A18 54 03 D9 7E */ srwi r3, r0, 5 -/* 801FBABC 001F8A1C 4E 80 00 20 */ blr +/* 801FBABC 001F8A1C 4E 80 00 20 */ blr .global TargetPatrol__13CFlyingPirateFR13CStateManager9EStateMsgf TargetPatrol__13CFlyingPirateFR13CStateManager9EStateMsgf: @@ -9132,7 +9132,7 @@ lbl_801FBD10: /* 801FBD3C 001F8C9C 83 A1 00 44 */ lwz r29, 0x44(r1) /* 801FBD40 001F8CA0 7C 08 03 A6 */ mtlr r0 /* 801FBD44 001F8CA4 38 21 00 90 */ addi r1, r1, 0x90 -/* 801FBD48 001F8CA8 4E 80 00 20 */ blr +/* 801FBD48 001F8CA8 4E 80 00 20 */ blr .global Patrol__13CFlyingPirateFR13CStateManager9EStateMsgf Patrol__13CFlyingPirateFR13CStateManager9EStateMsgf: @@ -9291,7 +9291,7 @@ lbl_801FBF5C: /* 801FBF88 001F8EE8 83 A1 00 34 */ lwz r29, 0x34(r1) /* 801FBF8C 001F8EEC 7C 08 03 A6 */ mtlr r0 /* 801FBF90 001F8EF0 38 21 00 80 */ addi r1, r1, 0x80 -/* 801FBF94 001F8EF4 4E 80 00 20 */ blr +/* 801FBF94 001F8EF4 4E 80 00 20 */ blr .global Explode__13CFlyingPirateFR13CStateManager Explode__13CFlyingPirateFR13CStateManager: @@ -9444,7 +9444,7 @@ lbl_801FC1B0: /* 801FC1C0 001F9120 80 01 01 94 */ lwz r0, 0x194(r1) /* 801FC1C4 001F9124 7C 08 03 A6 */ mtlr r0 /* 801FC1C8 001F9128 38 21 01 90 */ addi r1, r1, 0x190 -/* 801FC1CC 001F912C 4E 80 00 20 */ blr +/* 801FC1CC 001F912C 4E 80 00 20 */ blr .global KnockBack__13CFlyingPirateFRC9CVector3fR13CStateManagerRC11CDamageInfo14EKnockBackTypef KnockBack__13CFlyingPirateFRC9CVector3fR13CStateManagerRC11CDamageInfo14EKnockBackTypef: @@ -9486,7 +9486,7 @@ lbl_801FC258: /* 801FC258 001F91B8 81 83 00 00 */ lwz r12, 0(r3) /* 801FC25C 001F91BC 81 8C 02 B8 */ lwz r12, 0x2b8(r12) /* 801FC260 001F91C0 7D 89 03 A6 */ mtctr r12 -/* 801FC264 001F91C4 4E 80 04 21 */ bctrl +/* 801FC264 001F91C4 4E 80 04 21 */ bctrl /* 801FC268 001F91C8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801FC26C 001F91CC 40 82 02 3C */ bne lbl_801FC4A8 /* 801FC270 001F91D0 C3 3A 06 20 */ lfs f25, 0x620(r26) @@ -9519,7 +9519,7 @@ lbl_801FC2BC: /* 801FC2D8 001F9238 81 9A 00 00 */ lwz r12, 0(r26) /* 801FC2DC 001F923C 81 8C 02 BC */ lwz r12, 0x2bc(r12) /* 801FC2E0 001F9240 7D 89 03 A6 */ mtctr r12 -/* 801FC2E4 001F9244 4E 80 04 21 */ bctrl +/* 801FC2E4 001F9244 4E 80 04 21 */ bctrl /* 801FC2E8 001F9248 FC 20 08 50 */ fneg f1, f1 /* 801FC2EC 001F924C C0 02 AF 60 */ lfs f0, lbl_805ACC80@sda21(r2) /* 801FC2F0 001F9250 D0 1A 01 50 */ stfs f0, 0x150(r26) @@ -9561,7 +9561,7 @@ lbl_801FC368: /* 801FC378 001F92D8 81 84 00 00 */ lwz r12, 0(r4) /* 801FC37C 001F92DC 81 8C 00 50 */ lwz r12, 0x50(r12) /* 801FC380 001F92E0 7D 89 03 A6 */ mtctr r12 -/* 801FC384 001F92E4 4E 80 04 21 */ bctrl +/* 801FC384 001F92E4 4E 80 04 21 */ bctrl /* 801FC388 001F92E8 C3 81 00 6C */ lfs f28, 0x6c(r1) /* 801FC38C 001F92EC 3C 60 80 5A */ lis r3, lbl_805A66F4@ha /* 801FC390 001F92F0 C0 3A 00 40 */ lfs f1, 0x40(r26) @@ -9741,7 +9741,7 @@ lbl_801FC5B0: /* 801FC630 001F9590 81 9A 00 00 */ lwz r12, 0(r26) /* 801FC634 001F9594 81 8C 02 BC */ lwz r12, 0x2bc(r12) /* 801FC638 001F9598 7D 89 03 A6 */ mtctr r12 -/* 801FC63C 001F959C 4E 80 04 21 */ bctrl +/* 801FC63C 001F959C 4E 80 04 21 */ bctrl /* 801FC640 001F95A0 FC 20 08 50 */ fneg f1, f1 /* 801FC644 001F95A4 C0 02 AF 60 */ lfs f0, lbl_805ACC80@sda21(r2) /* 801FC648 001F95A8 D0 1A 01 50 */ stfs f0, 0x150(r26) @@ -9767,7 +9767,7 @@ lbl_801FC658: /* 801FC694 001F95F4 80 01 01 14 */ lwz r0, 0x114(r1) /* 801FC698 001F95F8 7C 08 03 A6 */ mtlr r0 /* 801FC69C 001F95FC 38 21 01 10 */ addi r1, r1, 0x110 -/* 801FC6A0 001F9600 4E 80 00 20 */ blr +/* 801FC6A0 001F9600 4E 80 00 20 */ blr .global CanFireMissiles__13CFlyingPirateFR13CStateManager CanFireMissiles__13CFlyingPirateFR13CStateManager: @@ -9898,7 +9898,7 @@ lbl_801FC874: /* 801FC884 001F97E4 80 01 00 D4 */ lwz r0, 0xd4(r1) /* 801FC888 001F97E8 7C 08 03 A6 */ mtlr r0 /* 801FC88C 001F97EC 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 801FC890 001F97F0 4E 80 00 20 */ blr +/* 801FC890 001F97F0 4E 80 00 20 */ blr .global GetTargetPos__13CFlyingPirateFR13CStateManager GetTargetPos__13CFlyingPirateFR13CStateManager: @@ -9956,7 +9956,7 @@ lbl_801FC948: /* 801FC958 001F98B8 81 84 00 00 */ lwz r12, 0(r4) /* 801FC95C 001F98BC 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 801FC960 001F98C0 7D 89 03 A6 */ mtctr r12 -/* 801FC964 001F98C4 4E 80 04 21 */ bctrl +/* 801FC964 001F98C4 4E 80 04 21 */ bctrl lbl_801FC968: /* 801FC968 001F98C8 80 01 00 34 */ lwz r0, 0x34(r1) /* 801FC96C 001F98CC 83 E1 00 2C */ lwz r31, 0x2c(r1) @@ -9964,7 +9964,7 @@ lbl_801FC968: /* 801FC974 001F98D4 83 A1 00 24 */ lwz r29, 0x24(r1) /* 801FC978 001F98D8 7C 08 03 A6 */ mtlr r0 /* 801FC97C 001F98DC 38 21 00 30 */ addi r1, r1, 0x30 -/* 801FC980 001F98E0 4E 80 00 20 */ blr +/* 801FC980 001F98E0 4E 80 00 20 */ blr .global GetDodgeDirection__13CFlyingPirateFR13CStateManagerf GetDodgeDirection__13CFlyingPirateFR13CStateManagerf: @@ -10343,7 +10343,7 @@ lbl_801FCED0: /* 801FCEE8 001F9E48 80 01 01 74 */ lwz r0, 0x174(r1) /* 801FCEEC 001F9E4C 7C 08 03 A6 */ mtlr r0 /* 801FCEF0 001F9E50 38 21 01 70 */ addi r1, r1, 0x170 -/* 801FCEF4 001F9E54 4E 80 00 20 */ blr +/* 801FCEF4 001F9E54 4E 80 00 20 */ blr .global AvoidActors__13CFlyingPirateFR13CStateManager AvoidActors__13CFlyingPirateFR13CStateManager: @@ -10508,7 +10508,7 @@ lbl_801FD130: /* 801FD154 001FA0B4 80 01 08 E4 */ lwz r0, 0x8e4(r1) /* 801FD158 001FA0B8 7C 08 03 A6 */ mtlr r0 /* 801FD15C 001FA0BC 38 21 08 E0 */ addi r1, r1, 0x8e0 -/* 801FD160 001FA0C0 4E 80 00 20 */ blr +/* 801FD160 001FA0C0 4E 80 00 20 */ blr .global UpdateCantSeePlayer__13CFlyingPirateFR13CStateManager UpdateCantSeePlayer__13CFlyingPirateFR13CStateManager: @@ -10544,7 +10544,7 @@ UpdateCantSeePlayer__13CFlyingPirateFR13CStateManager: /* 801FD1D8 001FA138 81 84 00 00 */ lwz r12, 0(r4) /* 801FD1DC 001FA13C 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 801FD1E0 001FA140 7D 89 03 A6 */ mtctr r12 -/* 801FD1E4 001FA144 4E 80 04 21 */ bctrl +/* 801FD1E4 001FA144 4E 80 04 21 */ bctrl /* 801FD1E8 001FA148 C0 41 00 54 */ lfs f2, 0x54(r1) /* 801FD1EC 001FA14C 7F A4 EB 78 */ mr r4, r29 /* 801FD1F0 001FA150 C0 21 00 58 */ lfs f1, 0x58(r1) @@ -10665,7 +10665,7 @@ lbl_801FD384: /* 801FD3B4 001FA314 83 A1 00 74 */ lwz r29, 0x74(r1) /* 801FD3B8 001FA318 7C 08 03 A6 */ mtlr r0 /* 801FD3BC 001FA31C 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 801FD3C0 001FA320 4E 80 00 20 */ blr +/* 801FD3C0 001FA320 4E 80 00 20 */ blr .global LineOfSightTest__13CFlyingPirateFR13CStateManagerRC9CVector3fRC9CVector3f LineOfSightTest__13CFlyingPirateFR13CStateManagerRC9CVector3fRC9CVector3f: @@ -10702,7 +10702,7 @@ LineOfSightTest__13CFlyingPirateFR13CStateManagerRC9CVector3fRC9CVector3f: /* 801FD43C 001FA39C 80 01 00 54 */ lwz r0, 0x54(r1) /* 801FD440 001FA3A0 7C 08 03 A6 */ mtlr r0 /* 801FD444 001FA3A4 38 21 00 50 */ addi r1, r1, 0x50 -/* 801FD448 001FA3A8 4E 80 00 20 */ blr +/* 801FD448 001FA3A8 4E 80 00 20 */ blr .global CheckForProjectiles__13CFlyingPirateFR13CStateManager CheckForProjectiles__13CFlyingPirateFR13CStateManager: @@ -10909,7 +10909,7 @@ lbl_801FD724: /* 801FD740 001FA6A0 80 01 09 04 */ lwz r0, 0x904(r1) /* 801FD744 001FA6A4 7C 08 03 A6 */ mtlr r0 /* 801FD748 001FA6A8 38 21 09 00 */ addi r1, r1, 0x900 -/* 801FD74C 001FA6AC 4E 80 00 20 */ blr +/* 801FD74C 001FA6AC 4E 80 00 20 */ blr .global sub_801fd750 sub_801fd750: @@ -10956,7 +10956,7 @@ lbl_801FD7E4: /* 801FD7EC 001FA74C 83 C1 00 28 */ lwz r30, 0x28(r1) /* 801FD7F0 001FA750 7C 08 03 A6 */ mtlr r0 /* 801FD7F4 001FA754 38 21 00 30 */ addi r1, r1, 0x30 -/* 801FD7F8 001FA758 4E 80 00 20 */ blr +/* 801FD7F8 001FA758 4E 80 00 20 */ blr .global sub_801fd7fc sub_801fd7fc: @@ -11004,7 +11004,7 @@ lbl_801FD890: /* 801FD898 001FA7F8 83 C1 00 18 */ lwz r30, 0x18(r1) /* 801FD89C 001FA7FC 7C 08 03 A6 */ mtlr r0 /* 801FD8A0 001FA800 38 21 00 20 */ addi r1, r1, 0x20 -/* 801FD8A4 001FA804 4E 80 00 20 */ blr +/* 801FD8A4 001FA804 4E 80 00 20 */ blr .global GetOrigin__13CFlyingPirateCFv GetOrigin__13CFlyingPirateCFv: @@ -11014,7 +11014,7 @@ GetOrigin__13CFlyingPirateCFv: /* 801FD8B4 001FA814 D0 03 00 00 */ stfs f0, 0(r3) /* 801FD8B8 001FA818 D0 23 00 04 */ stfs f1, 4(r3) /* 801FD8BC 001FA81C D0 43 00 08 */ stfs f2, 8(r3) -/* 801FD8C0 001FA820 4E 80 00 20 */ blr +/* 801FD8C0 001FA820 4E 80 00 20 */ blr .global sub_801fd8c4 sub_801fd8c4: @@ -11171,7 +11171,7 @@ lbl_801FDAF0: /* 801FDB00 001FAA60 81 83 00 00 */ lwz r12, 0(r3) /* 801FDB04 001FAA64 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 801FDB08 001FAA68 7D 89 03 A6 */ mtctr r12 -/* 801FDB0C 001FAA6C 4E 80 04 21 */ bctrl +/* 801FDB0C 001FAA6C 4E 80 04 21 */ bctrl /* 801FDB10 001FAA70 C0 5E 00 60 */ lfs f2, 0x60(r30) /* 801FDB14 001FAA74 38 81 00 18 */ addi r4, r1, 0x18 /* 801FDB18 001FAA78 C0 3E 00 50 */ lfs f1, 0x50(r30) @@ -11186,7 +11186,7 @@ lbl_801FDAF0: /* 801FDB3C 001FAA9C D0 41 00 14 */ stfs f2, 0x14(r1) /* 801FDB40 001FAAA0 81 8C 00 18 */ lwz r12, 0x18(r12) /* 801FDB44 001FAAA4 7D 89 03 A6 */ mtctr r12 -/* 801FDB48 001FAAA8 4E 80 04 21 */ bctrl +/* 801FDB48 001FAAA8 4E 80 04 21 */ bctrl lbl_801FDB4C: /* 801FDB4C 001FAAAC 80 BE 00 64 */ lwz r5, 0x64(r30) /* 801FDB50 001FAAB0 3C 60 80 57 */ lis r3, lbl_80572108@ha @@ -11206,7 +11206,7 @@ lbl_801FDB78: /* 801FDB80 001FAAE0 81 83 00 00 */ lwz r12, 0(r3) /* 801FDB84 001FAAE4 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 801FDB88 001FAAE8 7D 89 03 A6 */ mtctr r12 -/* 801FDB8C 001FAAEC 4E 80 04 21 */ bctrl +/* 801FDB8C 001FAAEC 4E 80 04 21 */ bctrl /* 801FDB90 001FAAF0 3B BD 00 08 */ addi r29, r29, 8 /* 801FDB94 001FAAF4 3B 9C 00 01 */ addi r28, r28, 1 lbl_801FDB98: @@ -11230,7 +11230,7 @@ lbl_801FDBC0: /* 801FDBD8 001FAB38 83 81 00 E0 */ lwz r28, 0xe0(r1) /* 801FDBDC 001FAB3C 7C 08 03 A6 */ mtlr r0 /* 801FDBE0 001FAB40 38 21 01 00 */ addi r1, r1, 0x100 -/* 801FDBE4 001FAB44 4E 80 00 20 */ blr +/* 801FDBE4 001FAB44 4E 80 00 20 */ blr .global sub_801fdbe8 sub_801fdbe8: @@ -11326,7 +11326,7 @@ lbl_801FDD28: /* 801FDD34 001FAC94 80 01 00 34 */ lwz r0, 0x34(r1) /* 801FDD38 001FAC98 7C 08 03 A6 */ mtlr r0 /* 801FDD3C 001FAC9C 38 21 00 30 */ addi r1, r1, 0x30 -/* 801FDD40 001FACA0 4E 80 00 20 */ blr +/* 801FDD40 001FACA0 4E 80 00 20 */ blr .global sub_801fdd44 sub_801fdd44: @@ -11366,7 +11366,7 @@ lbl_801FDDC0: /* 801FDDC4 001FAD24 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801FDDC8 001FAD28 7C 08 03 A6 */ mtlr r0 /* 801FDDCC 001FAD2C 38 21 00 20 */ addi r1, r1, 0x20 -/* 801FDDD0 001FAD30 4E 80 00 20 */ blr +/* 801FDDD0 001FAD30 4E 80 00 20 */ blr .global Listen__13CFlyingPirateFRC9CVector3f16EListenNoiseType Listen__13CFlyingPirateFRC9CVector3f16EListenNoiseType: @@ -11413,7 +11413,7 @@ lbl_801FDE58: /* 801FDE6C 001FADCC 98 03 06 A0 */ stb r0, 0x6a0(r3) lbl_801FDE70: /* 801FDE70 001FADD0 54 C3 06 3E */ clrlwi r3, r6, 0x18 -/* 801FDE74 001FADD4 4E 80 00 20 */ blr +/* 801FDE74 001FADD4 4E 80 00 20 */ blr .global AcceptScriptMsg__13CFlyingPirateF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__13CFlyingPirateF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -11480,7 +11480,7 @@ lbl_801FDF24: /* 801FDF54 001FAEB4 38 63 6B 28 */ addi r3, r3, lbl_803E6B28@l /* 801FDF58 001FAEB8 7C 03 00 2E */ lwzx r0, r3, r0 /* 801FDF5C 001FAEBC 7C 09 03 A6 */ mtctr r0 -/* 801FDF60 001FAEC0 4E 80 04 20 */ bctr +/* 801FDF60 001FAEC0 4E 80 04 20 */ bctr .global lbl_801FDF64 lbl_801FDF64: /* 801FDF64 001FAEC4 83 FD 00 2C */ lwz r31, 0x2c(r29) @@ -11605,7 +11605,7 @@ lbl_801FE0E4: /* 801FE118 001FB078 81 9D 00 00 */ lwz r12, 0(r29) /* 801FE11C 001FB07C 81 8C 02 BC */ lwz r12, 0x2bc(r12) /* 801FE120 001FB080 7D 89 03 A6 */ mtctr r12 -/* 801FE124 001FB084 4E 80 04 21 */ bctrl +/* 801FE124 001FB084 4E 80 04 21 */ bctrl /* 801FE128 001FB088 FC 20 08 50 */ fneg f1, f1 /* 801FE12C 001FB08C C0 02 AF 60 */ lfs f0, lbl_805ACC80@sda21(r2) /* 801FE130 001FB090 D0 1D 01 50 */ stfs f0, 0x150(r29) @@ -11640,7 +11640,7 @@ lbl_801FE158: /* 801FE190 001FB0F0 C3 BD 00 E8 */ lfs f29, 0xe8(r29) /* 801FE194 001FB0F4 81 8C 02 BC */ lwz r12, 0x2bc(r12) /* 801FE198 001FB0F8 7D 89 03 A6 */ mtctr r12 -/* 801FE19C 001FB0FC 4E 80 04 21 */ bctrl +/* 801FE19C 001FB0FC 4E 80 04 21 */ bctrl /* 801FE1A0 001FB100 FC 40 E8 50 */ fneg f2, f29 /* 801FE1A4 001FB104 C0 02 AF 60 */ lfs f0, lbl_805ACC80@sda21(r2) /* 801FE1A8 001FB108 7F A3 EB 78 */ mr r3, r29 @@ -11682,7 +11682,7 @@ lbl_801FE158: /* 801FE238 001FB198 81 9D 00 00 */ lwz r12, 0(r29) /* 801FE23C 001FB19C 81 8C 02 BC */ lwz r12, 0x2bc(r12) /* 801FE240 001FB1A0 7D 89 03 A6 */ mtctr r12 -/* 801FE244 001FB1A4 4E 80 04 21 */ bctrl +/* 801FE244 001FB1A4 4E 80 04 21 */ bctrl /* 801FE248 001FB1A8 C0 02 AF 64 */ lfs f0, lbl_805ACC84@sda21(r2) /* 801FE24C 001FB1AC C0 81 00 74 */ lfs f4, 0x74(r1) /* 801FE250 001FB1B0 EC 40 00 72 */ fmuls f2, f0, f1 @@ -11782,7 +11782,7 @@ lbl_801FE378: /* 801FE3A0 001FB300 83 81 00 80 */ lwz r28, 0x80(r1) /* 801FE3A4 001FB304 7C 08 03 A6 */ mtlr r0 /* 801FE3A8 001FB308 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 801FE3AC 001FB30C 4E 80 00 20 */ blr +/* 801FE3AC 001FB30C 4E 80 00 20 */ blr .global Accept__13CFlyingPirateFR8IVisitor Accept__13CFlyingPirateFR8IVisitor: @@ -11795,11 +11795,11 @@ Accept__13CFlyingPirateFR8IVisitor: /* 801FE3C8 001FB328 7C 04 03 78 */ mr r4, r0 /* 801FE3CC 001FB32C 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 801FE3D0 001FB330 7D 89 03 A6 */ mtctr r12 -/* 801FE3D4 001FB334 4E 80 04 21 */ bctrl +/* 801FE3D4 001FB334 4E 80 04 21 */ bctrl /* 801FE3D8 001FB338 80 01 00 14 */ lwz r0, 0x14(r1) /* 801FE3DC 001FB33C 7C 08 03 A6 */ mtlr r0 /* 801FE3E0 001FB340 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FE3E4 001FB344 4E 80 00 20 */ blr +/* 801FE3E4 001FB344 4E 80 00 20 */ blr .global "__ct__13CFlyingPirateF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC16CActorParametersRC14CPatternedInfoffUiUiRC11CDamageInfoUsUiRC11CDamageInfoUiffUiRC11CDamageInfoifffUsUs" "__ct__13CFlyingPirateF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC16CActorParametersRC14CPatternedInfoffUiUiRC11CDamageInfoUsUiRC11CDamageInfoUiffUiRC11CDamageInfoifffUsUs": @@ -12131,7 +12131,7 @@ lbl_801FE7FC: /* 801FE8F4 001FB854 81 84 00 00 */ lwz r12, 0(r4) /* 801FE8F8 001FB858 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801FE8FC 001FB85C 7D 89 03 A6 */ mtctr r12 -/* 801FE900 001FB860 4E 80 04 21 */ bctrl +/* 801FE900 001FB860 4E 80 04 21 */ bctrl /* 801FE904 001FB864 3B 01 00 CC */ addi r24, r1, 0xcc /* 801FE908 001FB868 38 81 00 64 */ addi r4, r1, 0x64 /* 801FE90C 001FB86C 7F 03 C3 78 */ mr r3, r24 @@ -12174,7 +12174,7 @@ lbl_801FE958: /* 801FE99C 001FB8FC 81 84 00 00 */ lwz r12, 0(r4) /* 801FE9A0 001FB900 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801FE9A4 001FB904 7D 89 03 A6 */ mtctr r12 -/* 801FE9A8 001FB908 4E 80 04 21 */ bctrl +/* 801FE9A8 001FB908 4E 80 04 21 */ bctrl /* 801FE9AC 001FB90C 3B 01 00 C0 */ addi r24, r1, 0xc0 /* 801FE9B0 001FB910 38 81 00 54 */ addi r4, r1, 0x54 /* 801FE9B4 001FB914 7F 03 C3 78 */ mr r3, r24 @@ -12217,7 +12217,7 @@ lbl_801FEA00: /* 801FEA44 001FB9A4 81 84 00 00 */ lwz r12, 0(r4) /* 801FEA48 001FB9A8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801FEA4C 001FB9AC 7D 89 03 A6 */ mtctr r12 -/* 801FEA50 001FB9B0 4E 80 04 21 */ bctrl +/* 801FEA50 001FB9B0 4E 80 04 21 */ bctrl /* 801FEA54 001FB9B4 3B 01 00 B4 */ addi r24, r1, 0xb4 /* 801FEA58 001FB9B8 38 81 00 44 */ addi r4, r1, 0x44 /* 801FEA5C 001FB9BC 7F 03 C3 78 */ mr r3, r24 @@ -12304,7 +12304,7 @@ lbl_801FEB68: /* 801FEB90 001FBAF0 38 80 00 01 */ li r4, 1 /* 801FEB94 001FBAF4 81 8C 00 08 */ lwz r12, 8(r12) /* 801FEB98 001FBAF8 7D 89 03 A6 */ mtctr r12 -/* 801FEB9C 001FBAFC 4E 80 04 21 */ bctrl +/* 801FEB9C 001FBAFC 4E 80 04 21 */ bctrl lbl_801FEBA0: /* 801FEBA0 001FBB00 7F 20 07 75 */ extsb. r0, r25 /* 801FEBA4 001FBB04 41 82 00 10 */ beq lbl_801FEBB4 @@ -12318,7 +12318,7 @@ lbl_801FEBB4: /* 801FEBC0 001FBB20 81 83 00 00 */ lwz r12, 0(r3) /* 801FEBC4 001FBB24 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 801FEBC8 001FBB28 7D 89 03 A6 */ mtctr r12 -/* 801FEBCC 001FBB2C 4E 80 04 21 */ bctrl +/* 801FEBCC 001FBB2C 4E 80 04 21 */ bctrl /* 801FEBD0 001FBB30 3B DE 00 0C */ addi r30, r30, 0xc /* 801FEBD4 001FBB34 3B BD 00 08 */ addi r29, r29, 8 /* 801FEBD8 001FBB38 3B 7B 00 01 */ addi r27, r27, 1 @@ -12364,7 +12364,7 @@ lbl_801FEC54: /* 801FEC5C 001FBBBC 80 01 01 94 */ lwz r0, 0x194(r1) /* 801FEC60 001FBBC0 7C 08 03 A6 */ mtlr r0 /* 801FEC64 001FBBC4 38 21 01 90 */ addi r1, r1, 0x190 -/* 801FEC68 001FBBC8 4E 80 00 20 */ blr +/* 801FEC68 001FBBC8 4E 80 00 20 */ blr .global sub_801fec6c sub_801fec6c: @@ -12444,7 +12444,7 @@ sub_801fec6c: /* 801FED90 001FBCF0 81 84 00 00 */ lwz r12, 0(r4) /* 801FED94 001FBCF4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801FED98 001FBCF8 7D 89 03 A6 */ mtctr r12 -/* 801FED9C 001FBCFC 4E 80 04 21 */ bctrl +/* 801FED9C 001FBCFC 4E 80 04 21 */ bctrl /* 801FEDA0 001FBD00 3B 9D 00 90 */ addi r28, r29, 0x90 /* 801FEDA4 001FBD04 38 81 00 10 */ addi r4, r1, 0x10 /* 801FEDA8 001FBD08 7F 83 E3 78 */ mr r3, r28 @@ -12538,7 +12538,7 @@ lbl_801FEED0: /* 801FEF00 001FBE60 83 81 00 40 */ lwz r28, 0x40(r1) /* 801FEF04 001FBE64 7C 08 03 A6 */ mtlr r0 /* 801FEF08 001FBE68 38 21 00 50 */ addi r1, r1, 0x50 -/* 801FEF0C 001FBE6C 4E 80 00 20 */ blr +/* 801FEF0C 001FBE6C 4E 80 00 20 */ blr .global PreRender__20CFlyingPirateRagDollFRC9CVector3fR10CModelData PreRender__20CFlyingPirateRagDollFRC9CVector3fR10CModelData: @@ -12969,7 +12969,7 @@ lbl_801FF59C: /* 801FF5A0 001FC500 80 01 02 64 */ lwz r0, 0x264(r1) /* 801FF5A4 001FC504 7C 08 03 A6 */ mtlr r0 /* 801FF5A8 001FC508 38 21 02 60 */ addi r1, r1, 0x260 -/* 801FF5AC 001FC50C 4E 80 00 20 */ blr +/* 801FF5AC 001FC50C 4E 80 00 20 */ blr .global Update__20CFlyingPirateRagDollFR13CStateManagerf Update__20CFlyingPirateRagDollFR13CStateManagerf: @@ -13531,7 +13531,7 @@ lbl_801FFE14: /* 801FFE40 001FCDA0 83 A1 00 E4 */ lwz r29, 0xe4(r1) /* 801FFE44 001FCDA4 7C 08 03 A6 */ mtlr r0 /* 801FFE48 001FCDA8 38 21 01 30 */ addi r1, r1, 0x130 -/* 801FFE4C 001FCDAC 4E 80 00 20 */ blr +/* 801FFE4C 001FCDAC 4E 80 00 20 */ blr .global sub_801ffe50 sub_801ffe50: @@ -13581,7 +13581,7 @@ lbl_801FFED4: /* 801FFEF8 001FCE58 83 81 00 20 */ lwz r28, 0x20(r1) /* 801FFEFC 001FCE5C 7C 08 03 A6 */ mtlr r0 /* 801FFF00 001FCE60 38 21 00 30 */ addi r1, r1, 0x30 -/* 801FFF04 001FCE64 4E 80 00 20 */ blr +/* 801FFF04 001FCE64 4E 80 00 20 */ blr .global __dt__20CFlyingPirateRagDollFv __dt__20CFlyingPirateRagDollFv: @@ -13614,7 +13614,7 @@ lbl_801FFF60: /* 801FFF6C 001FCECC 83 C1 00 18 */ lwz r30, 0x18(r1) /* 801FFF70 001FCED0 7C 08 03 A6 */ mtlr r0 /* 801FFF74 001FCED4 38 21 00 20 */ addi r1, r1, 0x20 -/* 801FFF78 001FCED8 4E 80 00 20 */ blr +/* 801FFF78 001FCED8 4E 80 00 20 */ blr .global __ct__20CFlyingPirateRagDollFR13CStateManagerP13CFlyingPiratefUsUs __ct__20CFlyingPirateRagDollFR13CStateManagerP13CFlyingPiratefUsUs: @@ -13638,7 +13638,7 @@ __ct__20CFlyingPirateRagDollFR13CStateManagerP13CFlyingPiratefUsUs: /* 801FFFC0 001FCF20 C3 A2 AF 5C */ lfs f29, lbl_805ACC7C@sda21(r2) /* 801FFFC4 001FCF24 81 8C 02 BC */ lwz r12, 0x2bc(r12) /* 801FFFC8 001FCF28 7D 89 03 A6 */ mtctr r12 -/* 801FFFCC 001FCF2C 4E 80 04 21 */ bctrl +/* 801FFFCC 001FCF2C 4E 80 04 21 */ bctrl /* 801FFFD0 001FCF30 FC 20 08 50 */ fneg f1, f1 /* 801FFFD4 001FCF34 C0 62 AF EC */ lfs f3, lbl_805ACD0C@sda21(r2) /* 801FFFD8 001FCF38 FC 40 E8 50 */ fneg f2, f29 @@ -13702,7 +13702,7 @@ __ct__20CFlyingPirateRagDollFR13CStateManagerP13CFlyingPiratefUsUs: /* 802000C0 001FD020 81 83 00 00 */ lwz r12, 0(r3) /* 802000C4 001FD024 81 8C 00 34 */ lwz r12, 0x34(r12) /* 802000C8 001FD028 7D 89 03 A6 */ mtctr r12 -/* 802000CC 001FD02C 4E 80 04 21 */ bctrl +/* 802000CC 001FD02C 4E 80 04 21 */ bctrl /* 802000D0 001FD030 C0 02 B0 28 */ lfs f0, lbl_805ACD48@sda21(r2) /* 802000D4 001FD034 38 80 00 0F */ li r4, 0xf /* 802000D8 001FD038 D0 03 00 00 */ stfs f0, 0(r3) @@ -14084,7 +14084,7 @@ lbl_80200178: /* 802006B4 001FD614 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 802006B8 001FD618 7C 08 03 A6 */ mtlr r0 /* 802006BC 001FD61C 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 802006C0 001FD620 4E 80 00 20 */ blr +/* 802006C0 001FD620 4E 80 00 20 */ blr .global __sinit_CFlyingPirate_cpp __sinit_CFlyingPirate_cpp: diff --git a/asm/MetroidPrime/Enemies/CGrenadeLauncher.s b/asm/MetroidPrime/Enemies/CGrenadeLauncher.s index 7c6f8aae..debf5069 100644 --- a/asm/MetroidPrime/Enemies/CGrenadeLauncher.s +++ b/asm/MetroidPrime/Enemies/CGrenadeLauncher.s @@ -162,12 +162,12 @@ lbl_805A90EC: .global HealthInfo__16CGrenadeLauncherFR13CStateManager HealthInfo__16CGrenadeLauncherFR13CStateManager: /* 8022F68C 0022C5EC 38 63 02 5C */ addi r3, r3, 0x25c -/* 8022F690 0022C5F0 4E 80 00 20 */ blr +/* 8022F690 0022C5F0 4E 80 00 20 */ blr .global GetDamageVulnerability__16CGrenadeLauncherCFv GetDamageVulnerability__16CGrenadeLauncherCFv: /* 8022F694 0022C5F4 38 63 02 64 */ addi r3, r3, 0x264 -/* 8022F698 0022C5F8 4E 80 00 20 */ blr +/* 8022F698 0022C5F8 4E 80 00 20 */ blr .global sub_8022f69c sub_8022f69c: @@ -225,7 +225,7 @@ lbl_8022F758: /* 8022F760 0022C6C0 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8022F764 0022C6C4 7C 08 03 A6 */ mtlr r0 /* 8022F768 0022C6C8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8022F76C 0022C6CC 4E 80 00 20 */ blr +/* 8022F76C 0022C6CC 4E 80 00 20 */ blr .global sub_8022f770 sub_8022f770: @@ -341,7 +341,7 @@ lbl_8022F908: /* 8022F90C 0022C86C 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 8022F910 0022C870 7C 08 03 A6 */ mtlr r0 /* 8022F914 0022C874 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 8022F918 0022C878 4E 80 00 20 */ blr +/* 8022F918 0022C878 4E 80 00 20 */ blr .global sub_8022f91c sub_8022f91c: @@ -394,7 +394,7 @@ lbl_8022F9C8: /* 8022F9D0 0022C930 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8022F9D4 0022C934 7C 08 03 A6 */ mtlr r0 /* 8022F9D8 0022C938 38 21 00 20 */ addi r1, r1, 0x20 -/* 8022F9DC 0022C93C 4E 80 00 20 */ blr +/* 8022F9DC 0022C93C 4E 80 00 20 */ blr .global sub_8022f9e0 sub_8022f9e0: @@ -435,7 +435,7 @@ lbl_8022FA38: /* 8022FA64 0022C9C4 81 84 00 00 */ lwz r12, 0(r4) /* 8022FA68 0022C9C8 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 8022FA6C 0022C9CC 7D 89 03 A6 */ mtctr r12 -/* 8022FA70 0022C9D0 4E 80 04 21 */ bctrl +/* 8022FA70 0022C9D0 4E 80 04 21 */ bctrl /* 8022FA74 0022C9D4 C0 9F 00 60 */ lfs f4, 0x60(r31) /* 8022FA78 0022C9D8 38 9F 00 34 */ addi r4, r31, 0x34 /* 8022FA7C 0022C9DC C0 3F 00 60 */ lfs f1, 0x60(r31) @@ -715,7 +715,7 @@ lbl_8022FE58: /* 8022FE78 0022CDD8 83 C1 00 68 */ lwz r30, 0x68(r1) /* 8022FE7C 0022CDDC 7C 08 03 A6 */ mtlr r0 /* 8022FE80 0022CDE0 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8022FE84 0022CDE4 4E 80 00 20 */ blr +/* 8022FE84 0022CDE4 4E 80 00 20 */ blr .global sub_8022fe88 sub_8022fe88: @@ -755,7 +755,7 @@ sub_8022fe88: /* 8022FF0C 0022CE6C 80 01 00 94 */ lwz r0, 0x94(r1) /* 8022FF10 0022CE70 7C 08 03 A6 */ mtlr r0 /* 8022FF14 0022CE74 38 21 00 90 */ addi r1, r1, 0x90 -/* 8022FF18 0022CE78 4E 80 00 20 */ blr +/* 8022FF18 0022CE78 4E 80 00 20 */ blr .global sub_8022ff1c sub_8022ff1c: @@ -1101,7 +1101,7 @@ lbl_80230424: /* 80230428 0022D388 80 01 02 E4 */ lwz r0, 0x2e4(r1) /* 8023042C 0022D38C 7C 08 03 A6 */ mtlr r0 /* 80230430 0022D390 38 21 02 E0 */ addi r1, r1, 0x2e0 -/* 80230434 0022D394 4E 80 00 20 */ blr +/* 80230434 0022D394 4E 80 00 20 */ blr .global sub_80230438 sub_80230438: @@ -1227,7 +1227,7 @@ lbl_802305F4: /* 802305F8 0022D558 83 E1 00 CC */ lwz r31, 0xcc(r1) /* 802305FC 0022D55C 7C 08 03 A6 */ mtlr r0 /* 80230600 0022D560 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 80230604 0022D564 4E 80 00 20 */ blr +/* 80230604 0022D564 4E 80 00 20 */ blr .global sub_80230608 sub_80230608: @@ -1390,7 +1390,7 @@ lbl_802307E0: /* 80230854 0022D7B4 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80230858 0022D7B8 7C 08 03 A6 */ mtlr r0 /* 8023085C 0022D7BC 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 80230860 0022D7C0 4E 80 00 20 */ blr +/* 80230860 0022D7C0 4E 80 00 20 */ blr .global sub_80230864 sub_80230864: @@ -1414,7 +1414,7 @@ sub_80230864: /* 802308A8 0022D808 81 84 00 00 */ lwz r12, 0(r4) /* 802308AC 0022D80C 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 802308B0 0022D810 7D 89 03 A6 */ mtctr r12 -/* 802308B4 0022D814 4E 80 04 21 */ bctrl +/* 802308B4 0022D814 4E 80 04 21 */ bctrl /* 802308B8 0022D818 80 7F 08 4C */ lwz r3, 0x84c(r31) /* 802308BC 0022D81C C3 E1 00 08 */ lfs f31, 8(r1) /* 802308C0 0022D820 80 03 02 F8 */ lwz r0, 0x2f8(r3) @@ -1444,12 +1444,12 @@ lbl_802308F0: /* 8023091C 0022D87C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80230920 0022D880 7C 08 03 A6 */ mtlr r0 /* 80230924 0022D884 38 21 00 50 */ addi r1, r1, 0x50 -/* 80230928 0022D888 4E 80 00 20 */ blr +/* 80230928 0022D888 4E 80 00 20 */ blr .global GetCollisionPrimitive__16CGrenadeLauncherCFv GetCollisionPrimitive__16CGrenadeLauncherCFv: /* 8023092C 0022D88C 38 63 03 28 */ addi r3, r3, 0x328 -/* 80230930 0022D890 4E 80 00 20 */ blr +/* 80230930 0022D890 4E 80 00 20 */ blr .global GetTouchBounds__16CGrenadeLauncherCFv GetTouchBounds__16CGrenadeLauncherCFv: @@ -1465,7 +1465,7 @@ GetTouchBounds__16CGrenadeLauncherCFv: /* 80230958 0022D8B8 38 A5 00 34 */ addi r5, r5, 0x34 /* 8023095C 0022D8BC 81 8C 00 14 */ lwz r12, 0x14(r12) /* 80230960 0022D8C0 7D 89 03 A6 */ mtctr r12 -/* 80230964 0022D8C4 4E 80 04 21 */ bctrl +/* 80230964 0022D8C4 4E 80 04 21 */ bctrl /* 80230968 0022D8C8 38 00 00 01 */ li r0, 1 /* 8023096C 0022D8CC 28 1F 00 00 */ cmplwi r31, 0 /* 80230970 0022D8D0 98 1F 00 18 */ stb r0, 0x18(r31) @@ -1487,7 +1487,7 @@ lbl_802309A8: /* 802309AC 0022D90C 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 802309B0 0022D910 7C 08 03 A6 */ mtlr r0 /* 802309B4 0022D914 38 21 00 30 */ addi r1, r1, 0x30 -/* 802309B8 0022D918 4E 80 00 20 */ blr +/* 802309B8 0022D918 4E 80 00 20 */ blr .global Touch__16CGrenadeLauncherFR6CActorR13CStateManager Touch__16CGrenadeLauncherFR6CActorR13CStateManager: @@ -1513,7 +1513,7 @@ Touch__16CGrenadeLauncherFR6CActorR13CStateManager: /* 80230A08 0022D968 81 9D 00 00 */ lwz r12, 0(r29) /* 80230A0C 0022D96C 81 8C 00 38 */ lwz r12, 0x38(r12) /* 80230A10 0022D970 7D 89 03 A6 */ mtctr r12 -/* 80230A14 0022D974 4E 80 04 21 */ bctrl +/* 80230A14 0022D974 4E 80 04 21 */ bctrl /* 80230A18 0022D978 80 9F 00 F0 */ lwz r4, 0xf0(r31) /* 80230A1C 0022D97C 38 E0 00 00 */ li r7, 0 /* 80230A20 0022D980 88 01 00 20 */ lbz r0, 0x20(r1) @@ -1554,7 +1554,7 @@ lbl_80230A9C: /* 80230AA8 0022DA08 83 A1 00 34 */ lwz r29, 0x34(r1) /* 80230AAC 0022DA0C 7C 08 03 A6 */ mtlr r0 /* 80230AB0 0022DA10 38 21 00 40 */ addi r1, r1, 0x40 -/* 80230AB4 0022DA14 4E 80 00 20 */ blr +/* 80230AB4 0022DA14 4E 80 00 20 */ blr .global AddToRenderer__16CGrenadeLauncherCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__16CGrenadeLauncherCFRC14CFrustumPlanesRC13CStateManager: @@ -1565,7 +1565,7 @@ AddToRenderer__16CGrenadeLauncherCFRC14CFrustumPlanesRC13CStateManager: /* 80230AC8 0022DA28 80 01 00 14 */ lwz r0, 0x14(r1) /* 80230ACC 0022DA2C 7C 08 03 A6 */ mtlr r0 /* 80230AD0 0022DA30 38 21 00 10 */ addi r1, r1, 0x10 -/* 80230AD4 0022DA34 4E 80 00 20 */ blr +/* 80230AD4 0022DA34 4E 80 00 20 */ blr .global PreRender__16CGrenadeLauncherFR13CStateManagerRC14CFrustumPlanes PreRender__16CGrenadeLauncherFR13CStateManagerRC14CFrustumPlanes: @@ -1612,7 +1612,7 @@ lbl_80230B6C: /* 80230B70 0022DAD0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80230B74 0022DAD4 7C 08 03 A6 */ mtlr r0 /* 80230B78 0022DAD8 38 21 00 20 */ addi r1, r1, 0x20 -/* 80230B7C 0022DADC 4E 80 00 20 */ blr +/* 80230B7C 0022DADC 4E 80 00 20 */ blr .global Render__16CGrenadeLauncherCFRC13CStateManager Render__16CGrenadeLauncherCFRC13CStateManager: @@ -1627,7 +1627,7 @@ lbl_80230B9C: /* 80230B9C 0022DAFC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80230BA0 0022DB00 7C 08 03 A6 */ mtlr r0 /* 80230BA4 0022DB04 38 21 00 10 */ addi r1, r1, 0x10 -/* 80230BA8 0022DB08 4E 80 00 20 */ blr +/* 80230BA8 0022DB08 4E 80 00 20 */ blr .global Accept__16CGrenadeLauncherFR8IVisitor Accept__16CGrenadeLauncherFR8IVisitor: @@ -1640,11 +1640,11 @@ Accept__16CGrenadeLauncherFR8IVisitor: /* 80230BC4 0022DB24 7C 04 03 78 */ mr r4, r0 /* 80230BC8 0022DB28 81 8C 00 50 */ lwz r12, 0x50(r12) /* 80230BCC 0022DB2C 7D 89 03 A6 */ mtctr r12 -/* 80230BD0 0022DB30 4E 80 04 21 */ bctrl +/* 80230BD0 0022DB30 4E 80 04 21 */ bctrl /* 80230BD4 0022DB34 80 01 00 14 */ lwz r0, 0x14(r1) /* 80230BD8 0022DB38 7C 08 03 A6 */ mtlr r0 /* 80230BDC 0022DB3C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80230BE0 0022DB40 4E 80 00 20 */ blr +/* 80230BE0 0022DB40 4E 80 00 20 */ blr .global AcceptScriptMsg__16CGrenadeLauncherF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__16CGrenadeLauncherF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -1669,7 +1669,7 @@ AcceptScriptMsg__16CGrenadeLauncherF20EScriptObjectMessage9TUniqueIdR13CStateMan /* 80230C2C 0022DB8C 38 63 7F DC */ addi r3, r3, lbl_803E7FDC@l /* 80230C30 0022DB90 7C 03 00 2E */ lwzx r0, r3, r0 /* 80230C34 0022DB94 7C 09 03 A6 */ mtctr r0 -/* 80230C38 0022DB98 4E 80 04 20 */ bctr +/* 80230C38 0022DB98 4E 80 04 20 */ bctr .global lbl_80230C3C lbl_80230C3C: /* 80230C3C 0022DB9C 7F E3 FB 78 */ mr r3, r31 @@ -1727,7 +1727,7 @@ lbl_80230CD8: /* 80230CE4 0022DC44 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80230CE8 0022DC48 7C 08 03 A6 */ mtlr r0 /* 80230CEC 0022DC4C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80230CF0 0022DC50 4E 80 00 20 */ blr +/* 80230CF0 0022DC50 4E 80 00 20 */ blr .global Think__16CGrenadeLauncherFfR13CStateManager Think__16CGrenadeLauncherFfR13CStateManager: @@ -1812,7 +1812,7 @@ lbl_80230D44: /* 80230E28 0022DD88 81 9D 00 00 */ lwz r12, 0(r29) /* 80230E2C 0022DD8C 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80230E30 0022DD90 7D 89 03 A6 */ mtctr r12 -/* 80230E34 0022DD94 4E 80 04 21 */ bctrl +/* 80230E34 0022DD94 4E 80 04 21 */ bctrl /* 80230E38 0022DD98 C0 23 00 00 */ lfs f1, 0(r3) /* 80230E3C 0022DD9C C0 02 B6 64 */ lfs f0, lbl_805AD384@sda21(r2) /* 80230E40 0022DDA0 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -1845,7 +1845,7 @@ lbl_80230E90: /* 80230EA4 0022DE04 83 A1 00 64 */ lwz r29, 0x64(r1) /* 80230EA8 0022DE08 7C 08 03 A6 */ mtlr r0 /* 80230EAC 0022DE0C 38 21 00 80 */ addi r1, r1, 0x80 -/* 80230EB0 0022DE10 4E 80 00 20 */ blr +/* 80230EB0 0022DE10 4E 80 00 20 */ blr .global __dt__16CGrenadeLauncherFv __dt__16CGrenadeLauncherFv: @@ -1906,7 +1906,7 @@ lbl_80230F6C: /* 80230F78 0022DED8 83 C1 00 08 */ lwz r30, 8(r1) /* 80230F7C 0022DEDC 7C 08 03 A6 */ mtlr r0 /* 80230F80 0022DEE0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80230F84 0022DEE4 4E 80 00 20 */ blr +/* 80230F84 0022DEE4 4E 80 00 20 */ blr .global __ct__16CGrenadeLauncherF9TUniqueId __ct__16CGrenadeLauncherF9TUniqueId: @@ -2088,7 +2088,7 @@ __ct__16CGrenadeLauncherF9TUniqueId: /* 80231244 0022E1A4 81 84 00 00 */ lwz r12, 0(r4) /* 80231248 0022E1A8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8023124C 0022E1AC 7D 89 03 A6 */ mtctr r12 -/* 80231250 0022E1B0 4E 80 04 21 */ bctrl +/* 80231250 0022E1B0 4E 80 04 21 */ bctrl /* 80231254 0022E1B4 3A 61 00 94 */ addi r19, r1, 0x94 /* 80231258 0022E1B8 38 81 00 64 */ addi r4, r1, 0x64 /* 8023125C 0022E1BC 7E 63 9B 78 */ mr r3, r19 @@ -2291,7 +2291,7 @@ lbl_80231508: /* 80231530 0022E490 80 01 01 84 */ lwz r0, 0x184(r1) /* 80231534 0022E494 7C 08 03 A6 */ mtlr r0 /* 80231538 0022E498 38 21 01 80 */ addi r1, r1, 0x180 -/* 8023153C 0022E49C 4E 80 00 20 */ blr +/* 8023153C 0022E49C 4E 80 00 20 */ blr .global sub_80231540 sub_80231540: @@ -2341,7 +2341,7 @@ sub_80231540: /* 802315EC 0022E54C D0 03 00 50 */ stfs f0, 0x50(r3) /* 802315F0 0022E550 C0 04 00 54 */ lfs f0, 0x54(r4) /* 802315F4 0022E554 D0 03 00 54 */ stfs f0, 0x54(r3) -/* 802315F8 0022E558 4E 80 00 20 */ blr +/* 802315F8 0022E558 4E 80 00 20 */ blr .global __sinit_CGrenadeLauncher_cpp __sinit_CGrenadeLauncher_cpp: diff --git a/asm/MetroidPrime/Enemies/CIceSheegoth.s b/asm/MetroidPrime/Enemies/CIceSheegoth.s index cec8146c..66b1047f 100644 --- a/asm/MetroidPrime/Enemies/CIceSheegoth.s +++ b/asm/MetroidPrime/Enemies/CIceSheegoth.s @@ -342,22 +342,22 @@ GetSearchPath__12CIceSheegothFv: /* 8019E244 0019B1A4 2C 00 00 00 */ cmpwi r0, 0 /* 8019E248 0019B1A8 40 82 00 0C */ bne lbl_8019E254 /* 8019E24C 0019B1AC 38 63 07 60 */ addi r3, r3, 0x760 -/* 8019E250 0019B1B0 4E 80 00 20 */ blr +/* 8019E250 0019B1B0 4E 80 00 20 */ blr lbl_8019E254: /* 8019E254 0019B1B4 38 63 08 44 */ addi r3, r3, 0x844 -/* 8019E258 0019B1B8 4E 80 00 20 */ blr +/* 8019E258 0019B1B8 4E 80 00 20 */ blr .global GetCollisionPrimitive__12CIceSheegothCFv GetCollisionPrimitive__12CIceSheegothCFv: /* 8019E25C 0019B1BC 38 63 0A 30 */ addi r3, r3, 0xa30 -/* 8019E260 0019B1C0 4E 80 00 20 */ blr +/* 8019E260 0019B1C0 4E 80 00 20 */ blr .global GetGravityConstant__12CIceSheegothCFv GetGravityConstant__12CIceSheegothCFv: /* 8019E264 0019B1C4 C0 22 A7 50 */ lfs f1, lbl_805AC470@sda21(r2) /* 8019E268 0019B1C8 C0 02 96 A0 */ lfs f0, lbl_805AB3C0@sda21(r2) /* 8019E26C 0019B1CC EC 21 00 32 */ fmuls f1, f1, f0 -/* 8019E270 0019B1D0 4E 80 00 20 */ blr +/* 8019E270 0019B1D0 4E 80 00 20 */ blr .global GetSortingBounds__12CIceSheegothCFRC12CTransform4f GetSortingBounds__12CIceSheegothCFRC12CTransform4f: @@ -419,7 +419,7 @@ GetSortingBounds__12CIceSheegothCFRC12CTransform4f: /* 8019E350 0019B2B0 83 E1 00 6C */ lwz r31, 0x6c(r1) /* 8019E354 0019B2B4 7C 08 03 A6 */ mtlr r0 /* 8019E358 0019B2B8 38 21 00 70 */ addi r1, r1, 0x70 -/* 8019E35C 0019B2BC 4E 80 00 20 */ blr +/* 8019E35C 0019B2BC 4E 80 00 20 */ blr .global sub_8019e360 sub_8019e360: @@ -449,7 +449,7 @@ sub_8019e360: /* 8019E3BC 0019B31C 81 83 00 00 */ lwz r12, 0(r3) /* 8019E3C0 0019B320 81 8C 02 B8 */ lwz r12, 0x2b8(r12) /* 8019E3C4 0019B324 7D 89 03 A6 */ mtctr r12 -/* 8019E3C8 0019B328 4E 80 04 21 */ bctrl +/* 8019E3C8 0019B328 4E 80 04 21 */ bctrl /* 8019E3CC 0019B32C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8019E3D0 0019B330 41 82 02 DC */ beq lbl_8019E6AC /* 8019E3D4 0019B334 83 BF 08 4C */ lwz r29, 0x84c(r31) @@ -655,7 +655,7 @@ lbl_8019E6AC: /* 8019E6E0 0019B640 80 01 01 B4 */ lwz r0, 0x1b4(r1) /* 8019E6E4 0019B644 7C 08 03 A6 */ mtlr r0 /* 8019E6E8 0019B648 38 21 01 B0 */ addi r1, r1, 0x1b0 -/* 8019E6EC 0019B64C 4E 80 00 20 */ blr +/* 8019E6EC 0019B64C 4E 80 00 20 */ blr .global sub_8019e6f0 sub_8019e6f0: @@ -692,7 +692,7 @@ lbl_8019E75C: /* 8019E764 0019B6C4 83 C1 00 08 */ lwz r30, 8(r1) /* 8019E768 0019B6C8 7C 08 03 A6 */ mtlr r0 /* 8019E76C 0019B6CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8019E770 0019B6D0 4E 80 00 20 */ blr +/* 8019E770 0019B6D0 4E 80 00 20 */ blr .global sub_8019e774 sub_8019e774: @@ -768,7 +768,7 @@ lbl_8019E874: /* 8019E884 0019B7E4 83 81 00 60 */ lwz r28, 0x60(r1) /* 8019E888 0019B7E8 7C 08 03 A6 */ mtlr r0 /* 8019E88C 0019B7EC 38 21 00 70 */ addi r1, r1, 0x70 -/* 8019E890 0019B7F0 4E 80 00 20 */ blr +/* 8019E890 0019B7F0 4E 80 00 20 */ blr .global sub_8019e894 sub_8019e894: @@ -852,7 +852,7 @@ lbl_8019E9BC: /* 8019E9BC 0019B91C 80 01 00 84 */ lwz r0, 0x84(r1) /* 8019E9C0 0019B920 7C 08 03 A6 */ mtlr r0 /* 8019E9C4 0019B924 38 21 00 80 */ addi r1, r1, 0x80 -/* 8019E9C8 0019B928 4E 80 00 20 */ blr +/* 8019E9C8 0019B928 4E 80 00 20 */ blr .global sub_8019e9cc sub_8019e9cc: @@ -957,7 +957,7 @@ lbl_8019EB1C: /* 8019EB40 0019BAA0 83 81 00 80 */ lwz r28, 0x80(r1) /* 8019EB44 0019BAA4 7C 08 03 A6 */ mtlr r0 /* 8019EB48 0019BAA8 38 21 00 90 */ addi r1, r1, 0x90 -/* 8019EB4C 0019BAAC 4E 80 00 20 */ blr +/* 8019EB4C 0019BAAC 4E 80 00 20 */ blr .global sub_8019eb50 sub_8019eb50: @@ -1003,7 +1003,7 @@ lbl_8019EBC4: /* 8019EBE0 0019BB40 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8019EBE4 0019BB44 7C 08 03 A6 */ mtlr r0 /* 8019EBE8 0019BB48 38 21 00 30 */ addi r1, r1, 0x30 -/* 8019EBEC 0019BB4C 4E 80 00 20 */ blr +/* 8019EBEC 0019BB4C 4E 80 00 20 */ blr .global sub_8019ebf0 sub_8019ebf0: @@ -1059,7 +1059,7 @@ lbl_8019EC9C: /* 8019ECAC 0019BC0C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8019ECB0 0019BC10 7C 08 03 A6 */ mtlr r0 /* 8019ECB4 0019BC14 38 21 00 30 */ addi r1, r1, 0x30 -/* 8019ECB8 0019BC18 4E 80 00 20 */ blr +/* 8019ECB8 0019BC18 4E 80 00 20 */ blr .global sub_8019ecbc sub_8019ecbc: @@ -1067,11 +1067,11 @@ sub_8019ecbc: /* 8019ECC0 0019BC20 54 00 E7 FF */ rlwinm. r0, r0, 0x1c, 0x1f, 0x1f /* 8019ECC4 0019BC24 41 82 00 0C */ beq lbl_8019ECD0 /* 8019ECC8 0019BC28 38 60 00 01 */ li r3, 1 -/* 8019ECCC 0019BC2C 4E 80 00 20 */ blr +/* 8019ECCC 0019BC2C 4E 80 00 20 */ blr lbl_8019ECD0: /* 8019ECD0 0019BC30 88 03 0B 29 */ lbz r0, 0xb29(r3) /* 8019ECD4 0019BC34 54 03 DF FE */ rlwinm r3, r0, 0x1b, 0x1f, 0x1f -/* 8019ECD8 0019BC38 4E 80 00 20 */ blr +/* 8019ECD8 0019BC38 4E 80 00 20 */ blr .global sub_8019ecdc sub_8019ecdc: @@ -1098,7 +1098,7 @@ lbl_8019ED28: /* 8019ED28 0019BC88 81 84 00 00 */ lwz r12, 0(r4) /* 8019ED2C 0019BC8C 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 8019ED30 0019BC90 7D 89 03 A6 */ mtctr r12 -/* 8019ED34 0019BC94 4E 80 04 21 */ bctrl +/* 8019ED34 0019BC94 4E 80 04 21 */ bctrl /* 8019ED38 0019BC98 C0 41 00 44 */ lfs f2, 0x44(r1) /* 8019ED3C 0019BC9C 38 61 00 10 */ addi r3, r1, 0x10 /* 8019ED40 0019BCA0 C0 1F 00 50 */ lfs f0, 0x50(r31) @@ -1141,7 +1141,7 @@ lbl_8019ED28: /* 8019EDD4 0019BD34 83 E1 00 5C */ lwz r31, 0x5c(r1) /* 8019EDD8 0019BD38 7C 08 03 A6 */ mtlr r0 /* 8019EDDC 0019BD3C 38 21 00 70 */ addi r1, r1, 0x70 -/* 8019EDE0 0019BD40 4E 80 00 20 */ blr +/* 8019EDE0 0019BD40 4E 80 00 20 */ blr .global GetCollisionResponseType__12CIceSheegothCFRC9CVector3fRC9CVector3fRC11CWeaponModei GetCollisionResponseType__12CIceSheegothCFRC9CVector3fRC9CVector3fRC11CWeaponModei: @@ -1159,12 +1159,12 @@ lbl_8019EE08: /* 8019EE08 0019BD68 80 01 00 14 */ lwz r0, 0x14(r1) /* 8019EE0C 0019BD6C 7C 08 03 A6 */ mtlr r0 /* 8019EE10 0019BD70 38 21 00 10 */ addi r1, r1, 0x10 -/* 8019EE14 0019BD74 4E 80 00 20 */ blr +/* 8019EE14 0019BD74 4E 80 00 20 */ blr .global sub_8019ee18 sub_8019ee18: /* 8019EE18 0019BD78 90 83 09 28 */ stw r4, 0x928(r3) -/* 8019EE1C 0019BD7C 4E 80 00 20 */ blr +/* 8019EE1C 0019BD7C 4E 80 00 20 */ blr .global sub_8019ee20 sub_8019ee20: @@ -1234,25 +1234,25 @@ lbl_8019EEC0: /* 8019EF18 0019BE78 81 83 00 00 */ lwz r12, 0(r3) /* 8019EF1C 0019BE7C 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8019EF20 0019BE80 7D 89 03 A6 */ mtctr r12 -/* 8019EF24 0019BE84 4E 80 04 21 */ bctrl +/* 8019EF24 0019BE84 4E 80 04 21 */ bctrl /* 8019EF28 0019BE88 80 7F 0A B0 */ lwz r3, 0xab0(r31) /* 8019EF2C 0019BE8C 38 80 00 00 */ li r4, 0 /* 8019EF30 0019BE90 81 83 00 00 */ lwz r12, 0(r3) /* 8019EF34 0019BE94 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8019EF38 0019BE98 7D 89 03 A6 */ mtctr r12 -/* 8019EF3C 0019BE9C 4E 80 04 21 */ bctrl +/* 8019EF3C 0019BE9C 4E 80 04 21 */ bctrl /* 8019EF40 0019BEA0 80 7F 0A C4 */ lwz r3, 0xac4(r31) /* 8019EF44 0019BEA4 38 80 00 01 */ li r4, 1 /* 8019EF48 0019BEA8 81 83 00 00 */ lwz r12, 0(r3) /* 8019EF4C 0019BEAC 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8019EF50 0019BEB0 7D 89 03 A6 */ mtctr r12 -/* 8019EF54 0019BEB4 4E 80 04 21 */ bctrl +/* 8019EF54 0019BEB4 4E 80 04 21 */ bctrl /* 8019EF58 0019BEB8 80 7F 0A D8 */ lwz r3, 0xad8(r31) /* 8019EF5C 0019BEBC 38 80 00 01 */ li r4, 1 /* 8019EF60 0019BEC0 81 83 00 00 */ lwz r12, 0(r3) /* 8019EF64 0019BEC4 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8019EF68 0019BEC8 7D 89 03 A6 */ mtctr r12 -/* 8019EF6C 0019BECC 4E 80 04 21 */ bctrl +/* 8019EF6C 0019BECC 4E 80 04 21 */ bctrl /* 8019EF70 0019BED0 48 00 01 4C */ b lbl_8019F0BC lbl_8019EF74: /* 8019EF74 0019BED4 C0 02 A7 74 */ lfs f0, lbl_805AC494@sda21(r2) @@ -1265,25 +1265,25 @@ lbl_8019EF74: /* 8019EF90 0019BEF0 81 83 00 00 */ lwz r12, 0(r3) /* 8019EF94 0019BEF4 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8019EF98 0019BEF8 7D 89 03 A6 */ mtctr r12 -/* 8019EF9C 0019BEFC 4E 80 04 21 */ bctrl +/* 8019EF9C 0019BEFC 4E 80 04 21 */ bctrl /* 8019EFA0 0019BF00 80 7F 0A B0 */ lwz r3, 0xab0(r31) /* 8019EFA4 0019BF04 38 80 00 01 */ li r4, 1 /* 8019EFA8 0019BF08 81 83 00 00 */ lwz r12, 0(r3) /* 8019EFAC 0019BF0C 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8019EFB0 0019BF10 7D 89 03 A6 */ mtctr r12 -/* 8019EFB4 0019BF14 4E 80 04 21 */ bctrl +/* 8019EFB4 0019BF14 4E 80 04 21 */ bctrl /* 8019EFB8 0019BF18 80 7F 0A C4 */ lwz r3, 0xac4(r31) /* 8019EFBC 0019BF1C 38 80 00 00 */ li r4, 0 /* 8019EFC0 0019BF20 81 83 00 00 */ lwz r12, 0(r3) /* 8019EFC4 0019BF24 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8019EFC8 0019BF28 7D 89 03 A6 */ mtctr r12 -/* 8019EFCC 0019BF2C 4E 80 04 21 */ bctrl +/* 8019EFCC 0019BF2C 4E 80 04 21 */ bctrl /* 8019EFD0 0019BF30 80 7F 0A D8 */ lwz r3, 0xad8(r31) /* 8019EFD4 0019BF34 38 80 00 00 */ li r4, 0 /* 8019EFD8 0019BF38 81 83 00 00 */ lwz r12, 0(r3) /* 8019EFDC 0019BF3C 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8019EFE0 0019BF40 7D 89 03 A6 */ mtctr r12 -/* 8019EFE4 0019BF44 4E 80 04 21 */ bctrl +/* 8019EFE4 0019BF44 4E 80 04 21 */ bctrl /* 8019EFE8 0019BF48 48 00 00 D4 */ b lbl_8019F0BC lbl_8019EFEC: /* 8019EFEC 0019BF4C C0 02 A7 5C */ lfs f0, lbl_805AC47C@sda21(r2) @@ -1294,25 +1294,25 @@ lbl_8019EFEC: /* 8019F000 0019BF60 81 83 00 00 */ lwz r12, 0(r3) /* 8019F004 0019BF64 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8019F008 0019BF68 7D 89 03 A6 */ mtctr r12 -/* 8019F00C 0019BF6C 4E 80 04 21 */ bctrl +/* 8019F00C 0019BF6C 4E 80 04 21 */ bctrl /* 8019F010 0019BF70 80 7F 0A B0 */ lwz r3, 0xab0(r31) /* 8019F014 0019BF74 38 80 00 00 */ li r4, 0 /* 8019F018 0019BF78 81 83 00 00 */ lwz r12, 0(r3) /* 8019F01C 0019BF7C 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8019F020 0019BF80 7D 89 03 A6 */ mtctr r12 -/* 8019F024 0019BF84 4E 80 04 21 */ bctrl +/* 8019F024 0019BF84 4E 80 04 21 */ bctrl /* 8019F028 0019BF88 80 7F 0A C4 */ lwz r3, 0xac4(r31) /* 8019F02C 0019BF8C 38 80 00 00 */ li r4, 0 /* 8019F030 0019BF90 81 83 00 00 */ lwz r12, 0(r3) /* 8019F034 0019BF94 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8019F038 0019BF98 7D 89 03 A6 */ mtctr r12 -/* 8019F03C 0019BF9C 4E 80 04 21 */ bctrl +/* 8019F03C 0019BF9C 4E 80 04 21 */ bctrl /* 8019F040 0019BFA0 80 7F 0A D8 */ lwz r3, 0xad8(r31) /* 8019F044 0019BFA4 38 80 00 00 */ li r4, 0 /* 8019F048 0019BFA8 81 83 00 00 */ lwz r12, 0(r3) /* 8019F04C 0019BFAC 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8019F050 0019BFB0 7D 89 03 A6 */ mtctr r12 -/* 8019F054 0019BFB4 4E 80 04 21 */ bctrl +/* 8019F054 0019BFB4 4E 80 04 21 */ bctrl /* 8019F058 0019BFB8 48 00 00 64 */ b lbl_8019F0BC lbl_8019F05C: /* 8019F05C 0019BFBC 80 7F 0A 9C */ lwz r3, 0xa9c(r31) @@ -1320,25 +1320,25 @@ lbl_8019F05C: /* 8019F064 0019BFC4 81 83 00 00 */ lwz r12, 0(r3) /* 8019F068 0019BFC8 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8019F06C 0019BFCC 7D 89 03 A6 */ mtctr r12 -/* 8019F070 0019BFD0 4E 80 04 21 */ bctrl +/* 8019F070 0019BFD0 4E 80 04 21 */ bctrl /* 8019F074 0019BFD4 80 7F 0A B0 */ lwz r3, 0xab0(r31) /* 8019F078 0019BFD8 38 80 00 00 */ li r4, 0 /* 8019F07C 0019BFDC 81 83 00 00 */ lwz r12, 0(r3) /* 8019F080 0019BFE0 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8019F084 0019BFE4 7D 89 03 A6 */ mtctr r12 -/* 8019F088 0019BFE8 4E 80 04 21 */ bctrl +/* 8019F088 0019BFE8 4E 80 04 21 */ bctrl /* 8019F08C 0019BFEC 80 7F 0A C4 */ lwz r3, 0xac4(r31) /* 8019F090 0019BFF0 38 80 00 00 */ li r4, 0 /* 8019F094 0019BFF4 81 83 00 00 */ lwz r12, 0(r3) /* 8019F098 0019BFF8 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8019F09C 0019BFFC 7D 89 03 A6 */ mtctr r12 -/* 8019F0A0 0019C000 4E 80 04 21 */ bctrl +/* 8019F0A0 0019C000 4E 80 04 21 */ bctrl /* 8019F0A4 0019C004 80 7F 0A D8 */ lwz r3, 0xad8(r31) /* 8019F0A8 0019C008 38 80 00 00 */ li r4, 0 /* 8019F0AC 0019C00C 81 83 00 00 */ lwz r12, 0(r3) /* 8019F0B0 0019C010 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8019F0B4 0019C014 7D 89 03 A6 */ mtctr r12 -/* 8019F0B8 0019C018 4E 80 04 21 */ bctrl +/* 8019F0B8 0019C018 4E 80 04 21 */ bctrl lbl_8019F0BC: /* 8019F0BC 0019C01C 83 BF 0A 9C */ lwz r29, 0xa9c(r31) /* 8019F0C0 0019C020 38 61 01 44 */ addi r3, r1, 0x144 @@ -1349,7 +1349,7 @@ lbl_8019F0BC: /* 8019F0D4 0019C034 81 9D 00 00 */ lwz r12, 0(r29) /* 8019F0D8 0019C038 81 8C 00 14 */ lwz r12, 0x14(r12) /* 8019F0DC 0019C03C 7D 89 03 A6 */ mtctr r12 -/* 8019F0E0 0019C040 4E 80 04 21 */ bctrl +/* 8019F0E0 0019C040 4E 80 04 21 */ bctrl /* 8019F0E4 0019C044 C0 5E 00 60 */ lfs f2, 0x60(r30) /* 8019F0E8 0019C048 38 81 00 68 */ addi r4, r1, 0x68 /* 8019F0EC 0019C04C C0 3E 00 50 */ lfs f1, 0x50(r30) @@ -1361,7 +1361,7 @@ lbl_8019F0BC: /* 8019F104 0019C064 81 83 00 00 */ lwz r12, 0(r3) /* 8019F108 0019C068 81 8C 00 20 */ lwz r12, 0x20(r12) /* 8019F10C 0019C06C 7D 89 03 A6 */ mtctr r12 -/* 8019F110 0019C070 4E 80 04 21 */ bctrl +/* 8019F110 0019C070 4E 80 04 21 */ bctrl /* 8019F114 0019C074 83 BF 0A B0 */ lwz r29, 0xab0(r31) /* 8019F118 0019C078 38 61 01 14 */ addi r3, r1, 0x114 /* 8019F11C 0019C07C 38 9F 00 34 */ addi r4, r31, 0x34 @@ -1371,7 +1371,7 @@ lbl_8019F0BC: /* 8019F12C 0019C08C 81 9D 00 00 */ lwz r12, 0(r29) /* 8019F130 0019C090 81 8C 00 14 */ lwz r12, 0x14(r12) /* 8019F134 0019C094 7D 89 03 A6 */ mtctr r12 -/* 8019F138 0019C098 4E 80 04 21 */ bctrl +/* 8019F138 0019C098 4E 80 04 21 */ bctrl /* 8019F13C 0019C09C C0 5E 00 60 */ lfs f2, 0x60(r30) /* 8019F140 0019C0A0 38 81 00 5C */ addi r4, r1, 0x5c /* 8019F144 0019C0A4 C0 3E 00 50 */ lfs f1, 0x50(r30) @@ -1383,7 +1383,7 @@ lbl_8019F0BC: /* 8019F15C 0019C0BC 81 83 00 00 */ lwz r12, 0(r3) /* 8019F160 0019C0C0 81 8C 00 20 */ lwz r12, 0x20(r12) /* 8019F164 0019C0C4 7D 89 03 A6 */ mtctr r12 -/* 8019F168 0019C0C8 4E 80 04 21 */ bctrl +/* 8019F168 0019C0C8 4E 80 04 21 */ bctrl /* 8019F16C 0019C0CC 83 BF 0A C4 */ lwz r29, 0xac4(r31) /* 8019F170 0019C0D0 38 61 00 E4 */ addi r3, r1, 0xe4 /* 8019F174 0019C0D4 38 9F 00 34 */ addi r4, r31, 0x34 @@ -1393,7 +1393,7 @@ lbl_8019F0BC: /* 8019F184 0019C0E4 81 9D 00 00 */ lwz r12, 0(r29) /* 8019F188 0019C0E8 81 8C 00 14 */ lwz r12, 0x14(r12) /* 8019F18C 0019C0EC 7D 89 03 A6 */ mtctr r12 -/* 8019F190 0019C0F0 4E 80 04 21 */ bctrl +/* 8019F190 0019C0F0 4E 80 04 21 */ bctrl /* 8019F194 0019C0F4 C0 5E 00 60 */ lfs f2, 0x60(r30) /* 8019F198 0019C0F8 38 81 00 50 */ addi r4, r1, 0x50 /* 8019F19C 0019C0FC C0 3E 00 50 */ lfs f1, 0x50(r30) @@ -1405,7 +1405,7 @@ lbl_8019F0BC: /* 8019F1B4 0019C114 81 83 00 00 */ lwz r12, 0(r3) /* 8019F1B8 0019C118 81 8C 00 20 */ lwz r12, 0x20(r12) /* 8019F1BC 0019C11C 7D 89 03 A6 */ mtctr r12 -/* 8019F1C0 0019C120 4E 80 04 21 */ bctrl +/* 8019F1C0 0019C120 4E 80 04 21 */ bctrl /* 8019F1C4 0019C124 83 BF 0A D8 */ lwz r29, 0xad8(r31) /* 8019F1C8 0019C128 38 61 00 B4 */ addi r3, r1, 0xb4 /* 8019F1CC 0019C12C 38 9F 00 34 */ addi r4, r31, 0x34 @@ -1415,7 +1415,7 @@ lbl_8019F0BC: /* 8019F1DC 0019C13C 81 9D 00 00 */ lwz r12, 0(r29) /* 8019F1E0 0019C140 81 8C 00 14 */ lwz r12, 0x14(r12) /* 8019F1E4 0019C144 7D 89 03 A6 */ mtctr r12 -/* 8019F1E8 0019C148 4E 80 04 21 */ bctrl +/* 8019F1E8 0019C148 4E 80 04 21 */ bctrl /* 8019F1EC 0019C14C C0 5F 00 60 */ lfs f2, 0x60(r31) /* 8019F1F0 0019C150 38 81 00 44 */ addi r4, r1, 0x44 /* 8019F1F4 0019C154 C0 3F 00 50 */ lfs f1, 0x50(r31) @@ -1427,7 +1427,7 @@ lbl_8019F0BC: /* 8019F20C 0019C16C 81 83 00 00 */ lwz r12, 0(r3) /* 8019F210 0019C170 81 8C 00 20 */ lwz r12, 0x20(r12) /* 8019F214 0019C174 7D 89 03 A6 */ mtctr r12 -/* 8019F218 0019C178 4E 80 04 21 */ bctrl +/* 8019F218 0019C178 4E 80 04 21 */ bctrl /* 8019F21C 0019C17C 80 7F 0A EC */ lwz r3, 0xaec(r31) /* 8019F220 0019C180 28 03 00 00 */ cmplwi r3, 0 /* 8019F224 0019C184 41 82 01 20 */ beq lbl_8019F344 @@ -1435,7 +1435,7 @@ lbl_8019F0BC: /* 8019F22C 0019C18C 38 80 00 01 */ li r4, 1 /* 8019F230 0019C190 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8019F234 0019C194 7D 89 03 A6 */ mtctr r12 -/* 8019F238 0019C198 4E 80 04 21 */ bctrl +/* 8019F238 0019C198 4E 80 04 21 */ bctrl /* 8019F23C 0019C19C 83 BF 0A EC */ lwz r29, 0xaec(r31) /* 8019F240 0019C1A0 38 61 00 84 */ addi r3, r1, 0x84 /* 8019F244 0019C1A4 38 9F 00 34 */ addi r4, r31, 0x34 @@ -1445,7 +1445,7 @@ lbl_8019F0BC: /* 8019F254 0019C1B4 81 9D 00 00 */ lwz r12, 0(r29) /* 8019F258 0019C1B8 81 8C 00 14 */ lwz r12, 0x14(r12) /* 8019F25C 0019C1BC 7D 89 03 A6 */ mtctr r12 -/* 8019F260 0019C1C0 4E 80 04 21 */ bctrl +/* 8019F260 0019C1C0 4E 80 04 21 */ bctrl /* 8019F264 0019C1C4 C0 5F 00 60 */ lfs f2, 0x60(r31) /* 8019F268 0019C1C8 38 81 00 38 */ addi r4, r1, 0x38 /* 8019F26C 0019C1CC C0 3F 00 50 */ lfs f1, 0x50(r31) @@ -1457,7 +1457,7 @@ lbl_8019F0BC: /* 8019F284 0019C1E4 81 83 00 00 */ lwz r12, 0(r3) /* 8019F288 0019C1E8 81 8C 00 20 */ lwz r12, 0x20(r12) /* 8019F28C 0019C1EC 7D 89 03 A6 */ mtctr r12 -/* 8019F290 0019C1F0 4E 80 04 21 */ bctrl +/* 8019F290 0019C1F0 4E 80 04 21 */ bctrl /* 8019F294 0019C1F4 80 7F 00 64 */ lwz r3, 0x64(r31) /* 8019F298 0019C1F8 38 81 00 2C */ addi r4, r1, 0x2c /* 8019F29C 0019C1FC C0 03 00 00 */ lfs f0, 0(r3) @@ -1470,13 +1470,13 @@ lbl_8019F0BC: /* 8019F2B8 0019C218 81 83 00 00 */ lwz r12, 0(r3) /* 8019F2BC 0019C21C 81 8C 00 24 */ lwz r12, 0x24(r12) /* 8019F2C0 0019C220 7D 89 03 A6 */ mtctr r12 -/* 8019F2C4 0019C224 4E 80 04 21 */ bctrl +/* 8019F2C4 0019C224 4E 80 04 21 */ bctrl /* 8019F2C8 0019C228 80 7F 0A EC */ lwz r3, 0xaec(r31) /* 8019F2CC 0019C22C FC 20 F8 90 */ fmr f1, f31 /* 8019F2D0 0019C230 81 83 00 00 */ lwz r12, 0(r3) /* 8019F2D4 0019C234 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8019F2D8 0019C238 7D 89 03 A6 */ mtctr r12 -/* 8019F2DC 0019C23C 4E 80 04 21 */ bctrl +/* 8019F2DC 0019C23C 4E 80 04 21 */ bctrl /* 8019F2E0 0019C240 48 00 00 64 */ b lbl_8019F344 lbl_8019F2E4: /* 8019F2E4 0019C244 80 7F 0A 9C */ lwz r3, 0xa9c(r31) @@ -1484,50 +1484,50 @@ lbl_8019F2E4: /* 8019F2EC 0019C24C 81 83 00 00 */ lwz r12, 0(r3) /* 8019F2F0 0019C250 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8019F2F4 0019C254 7D 89 03 A6 */ mtctr r12 -/* 8019F2F8 0019C258 4E 80 04 21 */ bctrl +/* 8019F2F8 0019C258 4E 80 04 21 */ bctrl /* 8019F2FC 0019C25C 80 7F 0A B0 */ lwz r3, 0xab0(r31) /* 8019F300 0019C260 38 80 00 00 */ li r4, 0 /* 8019F304 0019C264 81 83 00 00 */ lwz r12, 0(r3) /* 8019F308 0019C268 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8019F30C 0019C26C 7D 89 03 A6 */ mtctr r12 -/* 8019F310 0019C270 4E 80 04 21 */ bctrl +/* 8019F310 0019C270 4E 80 04 21 */ bctrl /* 8019F314 0019C274 80 7F 0A C4 */ lwz r3, 0xac4(r31) /* 8019F318 0019C278 38 80 00 00 */ li r4, 0 /* 8019F31C 0019C27C 81 83 00 00 */ lwz r12, 0(r3) /* 8019F320 0019C280 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8019F324 0019C284 7D 89 03 A6 */ mtctr r12 -/* 8019F328 0019C288 4E 80 04 21 */ bctrl +/* 8019F328 0019C288 4E 80 04 21 */ bctrl /* 8019F32C 0019C28C 80 7F 0A D8 */ lwz r3, 0xad8(r31) /* 8019F330 0019C290 38 80 00 00 */ li r4, 0 /* 8019F334 0019C294 81 83 00 00 */ lwz r12, 0(r3) /* 8019F338 0019C298 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8019F33C 0019C29C 7D 89 03 A6 */ mtctr r12 -/* 8019F340 0019C2A0 4E 80 04 21 */ bctrl +/* 8019F340 0019C2A0 4E 80 04 21 */ bctrl lbl_8019F344: /* 8019F344 0019C2A4 80 7F 0A 9C */ lwz r3, 0xa9c(r31) /* 8019F348 0019C2A8 FC 20 F8 90 */ fmr f1, f31 /* 8019F34C 0019C2AC 81 83 00 00 */ lwz r12, 0(r3) /* 8019F350 0019C2B0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8019F354 0019C2B4 7D 89 03 A6 */ mtctr r12 -/* 8019F358 0019C2B8 4E 80 04 21 */ bctrl +/* 8019F358 0019C2B8 4E 80 04 21 */ bctrl /* 8019F35C 0019C2BC 80 7F 0A B0 */ lwz r3, 0xab0(r31) /* 8019F360 0019C2C0 FC 20 F8 90 */ fmr f1, f31 /* 8019F364 0019C2C4 81 83 00 00 */ lwz r12, 0(r3) /* 8019F368 0019C2C8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8019F36C 0019C2CC 7D 89 03 A6 */ mtctr r12 -/* 8019F370 0019C2D0 4E 80 04 21 */ bctrl +/* 8019F370 0019C2D0 4E 80 04 21 */ bctrl /* 8019F374 0019C2D4 80 7F 0A C4 */ lwz r3, 0xac4(r31) /* 8019F378 0019C2D8 FC 20 F8 90 */ fmr f1, f31 /* 8019F37C 0019C2DC 81 83 00 00 */ lwz r12, 0(r3) /* 8019F380 0019C2E0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8019F384 0019C2E4 7D 89 03 A6 */ mtctr r12 -/* 8019F388 0019C2E8 4E 80 04 21 */ bctrl +/* 8019F388 0019C2E8 4E 80 04 21 */ bctrl /* 8019F38C 0019C2EC 80 7F 0A D8 */ lwz r3, 0xad8(r31) /* 8019F390 0019C2F0 FC 20 F8 90 */ fmr f1, f31 /* 8019F394 0019C2F4 81 83 00 00 */ lwz r12, 0(r3) /* 8019F398 0019C2F8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8019F39C 0019C2FC 7D 89 03 A6 */ mtctr r12 -/* 8019F3A0 0019C300 4E 80 04 21 */ bctrl +/* 8019F3A0 0019C300 4E 80 04 21 */ bctrl /* 8019F3A4 0019C304 C0 22 A7 68 */ lfs f1, lbl_805AC488@sda21(r2) /* 8019F3A8 0019C308 C0 1F 06 DC */ lfs f0, 0x6dc(r31) /* 8019F3AC 0019C30C C0 42 A7 74 */ lfs f2, lbl_805AC494@sda21(r2) @@ -1578,7 +1578,7 @@ lbl_8019F444: /* 8019F458 0019C3B8 83 A1 01 E4 */ lwz r29, 0x1e4(r1) /* 8019F45C 0019C3BC 7C 08 03 A6 */ mtlr r0 /* 8019F460 0019C3C0 38 21 02 00 */ addi r1, r1, 0x200 -/* 8019F464 0019C3C4 4E 80 00 20 */ blr +/* 8019F464 0019C3C4 4E 80 00 20 */ blr .global CreateFlameThrower__12CIceSheegothFR13CStateManager CreateFlameThrower__12CIceSheegothFR13CStateManager: @@ -1673,7 +1673,7 @@ lbl_8019F5B8: /* 8019F5BC 0019C51C 80 01 00 94 */ lwz r0, 0x94(r1) /* 8019F5C0 0019C520 7C 08 03 A6 */ mtlr r0 /* 8019F5C4 0019C524 38 21 00 90 */ addi r1, r1, 0x90 -/* 8019F5C8 0019C528 4E 80 00 20 */ blr +/* 8019F5C8 0019C528 4E 80 00 20 */ blr .global sub_8019f5cc sub_8019f5cc: @@ -1729,7 +1729,7 @@ lbl_8019F65C: /* 8019F670 0019C5D0 80 01 00 24 */ lwz r0, 0x24(r1) /* 8019F674 0019C5D4 7C 08 03 A6 */ mtlr r0 /* 8019F678 0019C5D8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8019F67C 0019C5DC 4E 80 00 20 */ blr +/* 8019F67C 0019C5DC 4E 80 00 20 */ blr .global sub_8019f680 sub_8019f680: @@ -1761,7 +1761,7 @@ sub_8019f680: /* 8019F6E4 0019C644 7F A4 EB 78 */ mr r4, r29 /* 8019F6E8 0019C648 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8019F6EC 0019C64C 7D 89 03 A6 */ mtctr r12 -/* 8019F6F0 0019C650 4E 80 04 21 */ bctrl +/* 8019F6F0 0019C650 4E 80 04 21 */ bctrl /* 8019F6F4 0019C654 C0 03 00 00 */ lfs f0, 0(r3) /* 8019F6F8 0019C658 38 61 00 2C */ addi r3, r1, 0x2c /* 8019F6FC 0019C65C C0 3C 09 70 */ lfs f1, 0x970(r28) @@ -1791,7 +1791,7 @@ lbl_8019F724: /* 8019F754 0019C6B4 7F A4 EB 78 */ mr r4, r29 /* 8019F758 0019C6B8 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8019F75C 0019C6BC 7D 89 03 A6 */ mtctr r12 -/* 8019F760 0019C6C0 4E 80 04 21 */ bctrl +/* 8019F760 0019C6C0 4E 80 04 21 */ bctrl /* 8019F764 0019C6C4 C0 03 00 00 */ lfs f0, 0(r3) /* 8019F768 0019C6C8 38 61 00 2C */ addi r3, r1, 0x2c /* 8019F76C 0019C6CC C0 3C 09 70 */ lfs f1, 0x970(r28) @@ -1830,7 +1830,7 @@ lbl_8019F7B4: /* 8019F7E4 0019C744 7F A4 EB 78 */ mr r4, r29 /* 8019F7E8 0019C748 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8019F7EC 0019C74C 7D 89 03 A6 */ mtctr r12 -/* 8019F7F0 0019C750 4E 80 04 21 */ bctrl +/* 8019F7F0 0019C750 4E 80 04 21 */ bctrl /* 8019F7F4 0019C754 C0 03 00 00 */ lfs f0, 0(r3) /* 8019F7F8 0019C758 38 61 00 2C */ addi r3, r1, 0x2c /* 8019F7FC 0019C75C C0 3C 09 70 */ lfs f1, 0x970(r28) @@ -1853,7 +1853,7 @@ lbl_8019F81C: /* 8019F838 0019C798 81 9C 00 00 */ lwz r12, 0(r28) /* 8019F83C 0019C79C 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8019F840 0019C7A0 7D 89 03 A6 */ mtctr r12 -/* 8019F844 0019C7A4 4E 80 04 21 */ bctrl +/* 8019F844 0019C7A4 4E 80 04 21 */ bctrl /* 8019F848 0019C7A8 C0 23 00 00 */ lfs f1, 0(r3) /* 8019F84C 0019C7AC 7F 83 E3 78 */ mr r3, r28 /* 8019F850 0019C7B0 81 9C 00 00 */ lwz r12, 0(r28) @@ -1862,14 +1862,14 @@ lbl_8019F81C: /* 8019F85C 0019C7BC 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8019F860 0019C7C0 EF E1 00 28 */ fsubs f31, f1, f0 /* 8019F864 0019C7C4 7D 89 03 A6 */ mtctr r12 -/* 8019F868 0019C7C8 4E 80 04 21 */ bctrl +/* 8019F868 0019C7C8 4E 80 04 21 */ bctrl /* 8019F86C 0019C7CC D3 E3 00 00 */ stfs f31, 0(r3) /* 8019F870 0019C7D0 7F 83 E3 78 */ mr r3, r28 /* 8019F874 0019C7D4 7F A4 EB 78 */ mr r4, r29 /* 8019F878 0019C7D8 81 9C 00 00 */ lwz r12, 0(r28) /* 8019F87C 0019C7DC 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8019F880 0019C7E0 7D 89 03 A6 */ mtctr r12 -/* 8019F884 0019C7E4 4E 80 04 21 */ bctrl +/* 8019F884 0019C7E4 4E 80 04 21 */ bctrl /* 8019F888 0019C7E8 C0 23 00 00 */ lfs f1, 0(r3) /* 8019F88C 0019C7EC C0 02 A7 5C */ lfs f0, lbl_805AC47C@sda21(r2) /* 8019F890 0019C7F0 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -1883,7 +1883,7 @@ lbl_8019F81C: /* 8019F8B0 0019C810 7F A4 EB 78 */ mr r4, r29 /* 8019F8B4 0019C814 38 C0 00 14 */ li r6, 0x14 /* 8019F8B8 0019C818 7D 89 03 A6 */ mtctr r12 -/* 8019F8BC 0019C81C 4E 80 04 21 */ bctrl +/* 8019F8BC 0019C81C 4E 80 04 21 */ bctrl /* 8019F8C0 0019C820 88 1C 0B 28 */ lbz r0, 0xb28(r28) /* 8019F8C4 0019C824 38 60 00 01 */ li r3, 1 /* 8019F8C8 0019C828 50 60 2E B4 */ rlwimi r0, r3, 5, 0x1a, 0x1a @@ -1906,7 +1906,7 @@ lbl_8019F8D4: /* 8019F908 0019C868 C3 FC 09 70 */ lfs f31, 0x970(r28) /* 8019F90C 0019C86C 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8019F910 0019C870 7D 89 03 A6 */ mtctr r12 -/* 8019F914 0019C874 4E 80 04 21 */ bctrl +/* 8019F914 0019C874 4E 80 04 21 */ bctrl /* 8019F918 0019C878 D3 E3 00 00 */ stfs f31, 0(r3) lbl_8019F91C: /* 8019F91C 0019C87C 7F FB FB 78 */ mr r27, r31 @@ -1928,7 +1928,7 @@ lbl_8019F924: /* 8019F958 0019C8B8 C3 FC 09 70 */ lfs f31, 0x970(r28) /* 8019F95C 0019C8BC 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8019F960 0019C8C0 7D 89 03 A6 */ mtctr r12 -/* 8019F964 0019C8C4 4E 80 04 21 */ bctrl +/* 8019F964 0019C8C4 4E 80 04 21 */ bctrl /* 8019F968 0019C8C8 D3 E3 00 00 */ stfs f31, 0(r3) lbl_8019F96C: /* 8019F96C 0019C8CC 3B 7B 00 02 */ addi r27, r27, 2 @@ -1957,7 +1957,7 @@ lbl_8019F98C: /* 8019F9C0 0019C920 C3 FC 09 70 */ lfs f31, 0x970(r28) /* 8019F9C4 0019C924 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8019F9C8 0019C928 7D 89 03 A6 */ mtctr r12 -/* 8019F9CC 0019C92C 4E 80 04 21 */ bctrl +/* 8019F9CC 0019C92C 4E 80 04 21 */ bctrl /* 8019F9D0 0019C930 D3 E3 00 00 */ stfs f31, 0(r3) lbl_8019F9D4: /* 8019F9D4 0019C934 3B 7B 00 02 */ addi r27, r27, 2 @@ -1974,7 +1974,7 @@ lbl_8019F9EC: /* 8019F9F8 0019C958 80 01 00 94 */ lwz r0, 0x94(r1) /* 8019F9FC 0019C95C 7C 08 03 A6 */ mtlr r0 /* 8019FA00 0019C960 38 21 00 90 */ addi r1, r1, 0x90 -/* 8019FA04 0019C964 4E 80 00 20 */ blr +/* 8019FA04 0019C964 4E 80 00 20 */ blr .global sub_8019fa08 sub_8019fa08: @@ -1987,7 +1987,7 @@ sub_8019fa08: /* 8019FA20 0019C980 81 83 00 00 */ lwz r12, 0(r3) /* 8019FA24 0019C984 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8019FA28 0019C988 7D 89 03 A6 */ mtctr r12 -/* 8019FA2C 0019C98C 4E 80 04 21 */ bctrl +/* 8019FA2C 0019C98C 4E 80 04 21 */ bctrl /* 8019FA30 0019C990 7C 7F 1B 78 */ mr r31, r3 /* 8019FA34 0019C994 3B 9D 0B 00 */ addi r28, r29, 0xb00 /* 8019FA38 0019C998 C0 03 00 00 */ lfs f0, 0(r3) @@ -2010,7 +2010,7 @@ lbl_8019FA48: /* 8019FA78 0019C9D8 7F C4 F3 78 */ mr r4, r30 /* 8019FA7C 0019C9DC 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8019FA80 0019C9E0 7D 89 03 A6 */ mtctr r12 -/* 8019FA84 0019C9E4 4E 80 04 21 */ bctrl +/* 8019FA84 0019C9E4 4E 80 04 21 */ bctrl /* 8019FA88 0019C9E8 C0 1F 00 00 */ lfs f0, 0(r31) /* 8019FA8C 0019C9EC D0 03 00 00 */ stfs f0, 0(r3) /* 8019FA90 0019C9F0 C0 1F 00 04 */ lfs f0, 4(r31) @@ -2038,7 +2038,7 @@ lbl_8019FA9C: /* 8019FAE0 0019CA40 7F C4 F3 78 */ mr r4, r30 /* 8019FAE4 0019CA44 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8019FAE8 0019CA48 7D 89 03 A6 */ mtctr r12 -/* 8019FAEC 0019CA4C 4E 80 04 21 */ bctrl +/* 8019FAEC 0019CA4C 4E 80 04 21 */ bctrl /* 8019FAF0 0019CA50 C0 1F 00 00 */ lfs f0, 0(r31) /* 8019FAF4 0019CA54 D0 03 00 00 */ stfs f0, 0(r3) /* 8019FAF8 0019CA58 C0 1F 00 04 */ lfs f0, 4(r31) @@ -2063,7 +2063,7 @@ lbl_8019FB0C: /* 8019FB3C 0019CA9C 7F C4 F3 78 */ mr r4, r30 /* 8019FB40 0019CAA0 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8019FB44 0019CAA4 7D 89 03 A6 */ mtctr r12 -/* 8019FB48 0019CAA8 4E 80 04 21 */ bctrl +/* 8019FB48 0019CAA8 4E 80 04 21 */ bctrl /* 8019FB4C 0019CAAC C0 1F 00 00 */ lfs f0, 0(r31) /* 8019FB50 0019CAB0 D0 03 00 00 */ stfs f0, 0(r3) /* 8019FB54 0019CAB4 C0 1F 00 04 */ lfs f0, 4(r31) @@ -2080,7 +2080,7 @@ lbl_8019FB60: /* 8019FB78 0019CAD8 80 01 00 54 */ lwz r0, 0x54(r1) /* 8019FB7C 0019CADC 7C 08 03 A6 */ mtlr r0 /* 8019FB80 0019CAE0 38 21 00 50 */ addi r1, r1, 0x50 -/* 8019FB84 0019CAE4 4E 80 00 20 */ blr +/* 8019FB84 0019CAE4 4E 80 00 20 */ blr .global sub_8019fb88 sub_8019fb88: @@ -2132,7 +2132,7 @@ lbl_8019FC10: /* 8019FC30 0019CB90 83 81 00 20 */ lwz r28, 0x20(r1) /* 8019FC34 0019CB94 7C 08 03 A6 */ mtlr r0 /* 8019FC38 0019CB98 38 21 00 30 */ addi r1, r1, 0x30 -/* 8019FC3C 0019CB9C 4E 80 00 20 */ blr +/* 8019FC3C 0019CB9C 4E 80 00 20 */ blr .global sub_8019fc40 sub_8019fc40: @@ -2148,14 +2148,14 @@ lbl_8019FC58: /* 8019FC60 0019CBC0 7C 03 00 40 */ cmplw r3, r0 /* 8019FC64 0019CBC4 40 82 00 0C */ bne lbl_8019FC70 /* 8019FC68 0019CBC8 38 60 00 01 */ li r3, 1 -/* 8019FC6C 0019CBCC 4E 80 00 20 */ blr +/* 8019FC6C 0019CBCC 4E 80 00 20 */ blr lbl_8019FC70: /* 8019FC70 0019CBD0 38 C6 00 02 */ addi r6, r6, 2 lbl_8019FC74: /* 8019FC74 0019CBD4 7C 06 28 40 */ cmplw r6, r5 /* 8019FC78 0019CBD8 40 82 FF E0 */ bne lbl_8019FC58 /* 8019FC7C 0019CBDC 38 60 00 00 */ li r3, 0 -/* 8019FC80 0019CBE0 4E 80 00 20 */ blr +/* 8019FC80 0019CBE0 4E 80 00 20 */ blr .global sub_8019fc84 sub_8019fc84: @@ -2164,7 +2164,7 @@ sub_8019fc84: /* 8019FC8C 0019CBEC 7C 04 00 50 */ subf r0, r4, r0 /* 8019FC90 0019CBF0 7C 00 00 34 */ cntlzw r0, r0 /* 8019FC94 0019CBF4 54 03 D9 7E */ srwi r3, r0, 5 -/* 8019FC98 0019CBF8 4E 80 00 20 */ blr +/* 8019FC98 0019CBF8 4E 80 00 20 */ blr .global sub_8019fc9c sub_8019fc9c: @@ -2273,7 +2273,7 @@ lbl_8019FE14: /* 8019FE20 0019CD80 80 01 00 F4 */ lwz r0, 0xf4(r1) /* 8019FE24 0019CD84 7C 08 03 A6 */ mtlr r0 /* 8019FE28 0019CD88 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 8019FE2C 0019CD8C 4E 80 00 20 */ blr +/* 8019FE2C 0019CD8C 4E 80 00 20 */ blr .global sub_8019fe30 sub_8019fe30: @@ -2390,7 +2390,7 @@ lbl_8019FFCC: /* 8019FFD8 0019CF38 80 01 01 04 */ lwz r0, 0x104(r1) /* 8019FFDC 0019CF3C 7C 08 03 A6 */ mtlr r0 /* 8019FFE0 0019CF40 38 21 01 00 */ addi r1, r1, 0x100 -/* 8019FFE4 0019CF44 4E 80 00 20 */ blr +/* 8019FFE4 0019CF44 4E 80 00 20 */ blr .global sub_8019ffe8 sub_8019ffe8: @@ -2726,7 +2726,7 @@ lbl_801A039C: /* 801A04C0 0019D420 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 801A04C4 0019D424 7C 08 03 A6 */ mtlr r0 /* 801A04C8 0019D428 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 801A04CC 0019D42C 4E 80 00 20 */ blr +/* 801A04CC 0019D42C 4E 80 00 20 */ blr .global sub_801a04d0 sub_801a04d0: @@ -2755,7 +2755,7 @@ sub_801a04d0: /* 801A0528 0019D488 81 9E 00 00 */ lwz r12, 0(r30) /* 801A052C 0019D48C 81 8C 00 34 */ lwz r12, 0x34(r12) /* 801A0530 0019D490 7D 89 03 A6 */ mtctr r12 -/* 801A0534 0019D494 4E 80 04 21 */ bctrl +/* 801A0534 0019D494 4E 80 04 21 */ bctrl /* 801A0538 0019D498 C0 23 00 00 */ lfs f1, 0(r3) /* 801A053C 0019D49C C0 02 A7 5C */ lfs f0, lbl_805AC47C@sda21(r2) /* 801A0540 0019D4A0 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -2855,7 +2855,7 @@ lbl_801A063C: /* 801A06AC 0019D60C B0 01 00 18 */ sth r0, 0x18(r1) /* 801A06B0 0019D610 81 8C 02 B0 */ lwz r12, 0x2b0(r12) /* 801A06B4 0019D614 7D 89 03 A6 */ mtctr r12 -/* 801A06B8 0019D618 4E 80 04 21 */ bctrl +/* 801A06B8 0019D618 4E 80 04 21 */ bctrl /* 801A06BC 0019D61C 3C 80 80 5A */ lis r4, skZero3f@ha /* 801A06C0 0019D620 7F E3 FB 78 */ mr r3, r31 /* 801A06C4 0019D624 39 24 66 A0 */ addi r9, r4, skZero3f@l @@ -2875,7 +2875,7 @@ lbl_801A06E8: /* 801A06F8 0019D658 83 81 00 A0 */ lwz r28, 0xa0(r1) /* 801A06FC 0019D65C 7C 08 03 A6 */ mtlr r0 /* 801A0700 0019D660 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 801A0704 0019D664 4E 80 00 20 */ blr +/* 801A0704 0019D664 4E 80 00 20 */ blr .global sub_801a0708 sub_801a0708: @@ -3102,7 +3102,7 @@ lbl_801A0A04: /* 801A0A4C 0019D9AC 83 81 01 30 */ lwz r28, 0x130(r1) /* 801A0A50 0019D9B0 7C 08 03 A6 */ mtlr r0 /* 801A0A54 0019D9B4 38 21 01 B0 */ addi r1, r1, 0x1b0 -/* 801A0A58 0019D9B8 4E 80 00 20 */ blr +/* 801A0A58 0019D9B8 4E 80 00 20 */ blr .global sub_801a0a5c sub_801a0a5c: @@ -3132,7 +3132,7 @@ sub_801a0a5c: /* 801A0AB8 0019DA18 81 84 00 00 */ lwz r12, 0(r4) /* 801A0ABC 0019DA1C 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 801A0AC0 0019DA20 7D 89 03 A6 */ mtctr r12 -/* 801A0AC4 0019DA24 4E 80 04 21 */ bctrl +/* 801A0AC4 0019DA24 4E 80 04 21 */ bctrl /* 801A0AC8 0019DA28 C0 01 00 14 */ lfs f0, 0x14(r1) /* 801A0ACC 0019DA2C 38 61 00 20 */ addi r3, r1, 0x20 /* 801A0AD0 0019DA30 D0 1F 00 00 */ stfs f0, 0(r31) @@ -3182,7 +3182,7 @@ lbl_801A0B6C: /* 801A0B7C 0019DADC 83 C1 00 38 */ lwz r30, 0x38(r1) /* 801A0B80 0019DAE0 7C 08 03 A6 */ mtlr r0 /* 801A0B84 0019DAE4 38 21 00 50 */ addi r1, r1, 0x50 -/* 801A0B88 0019DAE8 4E 80 00 20 */ blr +/* 801A0B88 0019DAE8 4E 80 00 20 */ blr .global sub_801a0b8c sub_801a0b8c: @@ -3225,10 +3225,10 @@ lbl_801A0C04: /* 801A0C04 0019DB64 C0 43 09 68 */ lfs f2, 0x968(r3) /* 801A0C08 0019DB68 C0 03 07 4C */ lfs f0, 0x74c(r3) /* 801A0C0C 0019DB6C FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 801A0C10 0019DB70 4C 80 00 20 */ bgelr +/* 801A0C10 0019DB70 4C 80 00 20 */ bgelr /* 801A0C14 0019DB74 EC 02 08 2A */ fadds f0, f2, f1 /* 801A0C18 0019DB78 D0 03 09 68 */ stfs f0, 0x968(r3) -/* 801A0C1C 0019DB7C 4E 80 00 20 */ blr +/* 801A0C1C 0019DB7C 4E 80 00 20 */ blr .global sub_801a0c20 sub_801a0c20: @@ -3292,7 +3292,7 @@ sub_801a0c20: /* 801A0D04 0019DC64 80 01 00 54 */ lwz r0, 0x54(r1) /* 801A0D08 0019DC68 7C 08 03 A6 */ mtlr r0 /* 801A0D0C 0019DC6C 38 21 00 50 */ addi r1, r1, 0x50 -/* 801A0D10 0019DC70 4E 80 00 20 */ blr +/* 801A0D10 0019DC70 4E 80 00 20 */ blr .global sub_801a0d14 sub_801a0d14: @@ -3334,7 +3334,7 @@ lbl_801A0D90: /* 801A0D98 0019DCF8 83 C1 00 18 */ lwz r30, 0x18(r1) /* 801A0D9C 0019DCFC 7C 08 03 A6 */ mtlr r0 /* 801A0DA0 0019DD00 38 21 00 20 */ addi r1, r1, 0x20 -/* 801A0DA4 0019DD04 4E 80 00 20 */ blr +/* 801A0DA4 0019DD04 4E 80 00 20 */ blr .global sub_801a0da8 sub_801a0da8: @@ -3471,7 +3471,7 @@ lbl_801A0F80: /* 801A0F98 0019DEF8 83 81 00 50 */ lwz r28, 0x50(r1) /* 801A0F9C 0019DEFC 7C 08 03 A6 */ mtlr r0 /* 801A0FA0 0019DF00 38 21 00 70 */ addi r1, r1, 0x70 -/* 801A0FA4 0019DF04 4E 80 00 20 */ blr +/* 801A0FA4 0019DF04 4E 80 00 20 */ blr .global sub_801a0fa8 sub_801a0fa8: @@ -3548,7 +3548,7 @@ lbl_801A10A4: /* 801A10B0 0019E010 80 01 00 44 */ lwz r0, 0x44(r1) /* 801A10B4 0019E014 7C 08 03 A6 */ mtlr r0 /* 801A10B8 0019E018 38 21 00 40 */ addi r1, r1, 0x40 -/* 801A10BC 0019E01C 4E 80 00 20 */ blr +/* 801A10BC 0019E01C 4E 80 00 20 */ blr .global sub_801a10c0 sub_801a10c0: @@ -4001,7 +4001,7 @@ lbl_801A1738: /* 801A1784 0019E6E4 80 01 12 C4 */ lwz r0, 0x12c4(r1) /* 801A1788 0019E6E8 7C 08 03 A6 */ mtlr r0 /* 801A178C 0019E6EC 38 21 12 C0 */ addi r1, r1, 0x12c0 -/* 801A1790 0019E6F0 4E 80 00 20 */ blr +/* 801A1790 0019E6F0 4E 80 00 20 */ blr .global sub_801a1794 sub_801a1794: @@ -4013,7 +4013,7 @@ sub_801a1794: /* 801A17A8 0019E708 81 83 00 00 */ lwz r12, 0(r3) /* 801A17AC 0019E70C 81 8C 00 34 */ lwz r12, 0x34(r12) /* 801A17B0 0019E710 7D 89 03 A6 */ mtctr r12 -/* 801A17B4 0019E714 4E 80 04 21 */ bctrl +/* 801A17B4 0019E714 4E 80 04 21 */ bctrl /* 801A17B8 0019E718 28 03 00 00 */ cmplwi r3, 0 /* 801A17BC 0019E71C 41 82 00 24 */ beq lbl_801A17E0 /* 801A17C0 0019E720 C0 22 A7 C0 */ lfs f1, lbl_805AC4E0@sda21(r2) @@ -4031,7 +4031,7 @@ lbl_801A17E4: /* 801A17E8 0019E748 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801A17EC 0019E74C 7C 08 03 A6 */ mtlr r0 /* 801A17F0 0019E750 38 21 00 10 */ addi r1, r1, 0x10 -/* 801A17F4 0019E754 4E 80 00 20 */ blr +/* 801A17F4 0019E754 4E 80 00 20 */ blr .global Flinch__12CIceSheegothR13CStateManager9EStateMsgf Flinch__12CIceSheegothR13CStateManager9EStateMsgf: @@ -4145,7 +4145,7 @@ lbl_801A197C: /* 801A1984 0019E8E4 83 C1 00 28 */ lwz r30, 0x28(r1) /* 801A1988 0019E8E8 7C 08 03 A6 */ mtlr r0 /* 801A198C 0019E8EC 38 21 00 30 */ addi r1, r1, 0x30 -/* 801A1990 0019E8F0 4E 80 00 20 */ blr +/* 801A1990 0019E8F0 4E 80 00 20 */ blr .global TurnAround__12CIceSheegothR13CStateManager9EStateMsgf TurnAround__12CIceSheegothR13CStateManager9EStateMsgf: @@ -4216,7 +4216,7 @@ lbl_801A1A84: /* 801A1A84 0019E9E4 81 84 00 00 */ lwz r12, 0(r4) /* 801A1A88 0019E9E8 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 801A1A8C 0019E9EC 7D 89 03 A6 */ mtctr r12 -/* 801A1A90 0019E9F0 4E 80 04 21 */ bctrl +/* 801A1A90 0019E9F0 4E 80 04 21 */ bctrl /* 801A1A94 0019E9F4 C0 21 00 24 */ lfs f1, 0x24(r1) /* 801A1A98 0019E9F8 38 61 00 28 */ addi r3, r1, 0x28 /* 801A1A9C 0019E9FC C0 1E 00 60 */ lfs f0, 0x60(r30) @@ -4285,7 +4285,7 @@ lbl_801A1B74: /* 801A1B84 0019EAE4 83 C1 00 58 */ lwz r30, 0x58(r1) /* 801A1B88 0019EAE8 7C 08 03 A6 */ mtlr r0 /* 801A1B8C 0019EAEC 38 21 00 70 */ addi r1, r1, 0x70 -/* 801A1B90 0019EAF0 4E 80 00 20 */ blr +/* 801A1B90 0019EAF0 4E 80 00 20 */ blr .global Enraged__12CIceSheegothR13CStateManager9EStateMsgf Enraged__12CIceSheegothR13CStateManager9EStateMsgf: @@ -4388,7 +4388,7 @@ lbl_801A1CF8: /* 801A1CFC 0019EC5C 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 801A1D00 0019EC60 7C 08 03 A6 */ mtlr r0 /* 801A1D04 0019EC64 38 21 00 30 */ addi r1, r1, 0x30 -/* 801A1D08 0019EC68 4E 80 00 20 */ blr +/* 801A1D08 0019EC68 4E 80 00 20 */ blr .global Taunt__12CIceSheegothR13CStateManager9EStateMsgf Taunt__12CIceSheegothR13CStateManager9EStateMsgf: @@ -4479,7 +4479,7 @@ lbl_801A1E38: /* 801A1E3C 0019ED9C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801A1E40 0019EDA0 7C 08 03 A6 */ mtlr r0 /* 801A1E44 0019EDA4 38 21 00 20 */ addi r1, r1, 0x20 -/* 801A1E48 0019EDA8 4E 80 00 20 */ blr +/* 801A1E48 0019EDA8 4E 80 00 20 */ blr .global Crouch__12CIceSheegothR13CStateManager9EStateMsgf Crouch__12CIceSheegothR13CStateManager9EStateMsgf: @@ -4534,7 +4534,7 @@ lbl_801A1EF4: /* 801A1EFC 0019EE5C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 801A1F00 0019EE60 7C 08 03 A6 */ mtlr r0 /* 801A1F04 0019EE64 38 21 00 20 */ addi r1, r1, 0x20 -/* 801A1F08 0019EE68 4E 80 00 20 */ blr +/* 801A1F08 0019EE68 4E 80 00 20 */ blr .global Deactivate__12CIceSheegothR13CStateManager9EStateMsgf Deactivate__12CIceSheegothR13CStateManager9EStateMsgf: @@ -4726,7 +4726,7 @@ lbl_801A21C0: /* 801A21C4 0019F124 83 E1 00 7C */ lwz r31, 0x7c(r1) /* 801A21C8 0019F128 7C 08 03 A6 */ mtlr r0 /* 801A21CC 0019F12C 38 21 00 80 */ addi r1, r1, 0x80 -/* 801A21D0 0019F130 4E 80 00 20 */ blr +/* 801A21D0 0019F130 4E 80 00 20 */ blr .global Generate__12CIceSheegothR13CStateManager9EStateMsgf Generate__12CIceSheegothR13CStateManager9EStateMsgf: @@ -4848,7 +4848,7 @@ lbl_801A2374: /* 801A2384 0019F2E4 83 C1 00 28 */ lwz r30, 0x28(r1) /* 801A2388 0019F2E8 7C 08 03 A6 */ mtlr r0 /* 801A238C 0019F2EC 38 21 00 30 */ addi r1, r1, 0x30 -/* 801A2390 0019F2F0 4E 80 00 20 */ blr +/* 801A2390 0019F2F0 4E 80 00 20 */ blr .global TargetPatrol__12CIceSheegothR13CStateManager9EStateMsgf TargetPatrol__12CIceSheegothR13CStateManager9EStateMsgf: @@ -4884,7 +4884,7 @@ lbl_801A23DC: /* 801A2404 0019F364 81 9F 00 00 */ lwz r12, 0(r31) /* 801A2408 0019F368 81 8C 01 C0 */ lwz r12, 0x1c0(r12) /* 801A240C 0019F36C 7D 89 03 A6 */ mtctr r12 -/* 801A2410 0019F370 4E 80 04 21 */ bctrl +/* 801A2410 0019F370 4E 80 04 21 */ bctrl /* 801A2414 0019F374 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801A2418 0019F378 41 82 00 28 */ beq lbl_801A2440 /* 801A241C 0019F37C FC 20 F8 90 */ fmr f1, f31 @@ -4923,7 +4923,7 @@ lbl_801A244C: /* 801A2498 0019F3F8 81 9F 00 00 */ lwz r12, 0(r31) /* 801A249C 0019F3FC 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801A24A0 0019F400 7D 89 03 A6 */ mtctr r12 -/* 801A24A4 0019F404 4E 80 04 21 */ bctrl +/* 801A24A4 0019F404 4E 80 04 21 */ bctrl /* 801A24A8 0019F408 28 03 00 00 */ cmplwi r3, 0 /* 801A24AC 0019F40C 41 82 00 DC */ beq lbl_801A2588 /* 801A24B0 0019F410 7F E3 FB 78 */ mr r3, r31 @@ -5018,7 +5018,7 @@ lbl_801A25D8: /* 801A260C 0019F56C 81 9F 00 00 */ lwz r12, 0(r31) /* 801A2610 0019F570 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801A2614 0019F574 7D 89 03 A6 */ mtctr r12 -/* 801A2618 0019F578 4E 80 04 21 */ bctrl +/* 801A2618 0019F578 4E 80 04 21 */ bctrl /* 801A261C 0019F57C 28 03 00 00 */ cmplwi r3, 0 /* 801A2620 0019F580 41 82 01 00 */ beq lbl_801A2720 /* 801A2624 0019F584 7F E3 FB 78 */ mr r3, r31 @@ -5027,7 +5027,7 @@ lbl_801A25D8: /* 801A2630 0019F590 C0 22 A7 5C */ lfs f1, lbl_805AC47C@sda21(r2) /* 801A2634 0019F594 81 8C 01 90 */ lwz r12, 0x190(r12) /* 801A2638 0019F598 7D 89 03 A6 */ mtctr r12 -/* 801A263C 0019F59C 4E 80 04 21 */ bctrl +/* 801A263C 0019F59C 4E 80 04 21 */ bctrl /* 801A2640 0019F5A0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801A2644 0019F5A4 40 82 00 DC */ bne lbl_801A2720 /* 801A2648 0019F5A8 7F E3 FB 78 */ mr r3, r31 @@ -5113,7 +5113,7 @@ lbl_801A276C: /* 801A2780 0019F6E0 83 A1 00 F4 */ lwz r29, 0xf4(r1) /* 801A2784 0019F6E4 7C 08 03 A6 */ mtlr r0 /* 801A2788 0019F6E8 38 21 01 10 */ addi r1, r1, 0x110 -/* 801A278C 0019F6EC 4E 80 00 20 */ blr +/* 801A278C 0019F6EC 4E 80 00 20 */ blr .global Approach__12CIceSheegothR13CStateManager9EStateMsgf Approach__12CIceSheegothR13CStateManager9EStateMsgf: @@ -5270,7 +5270,7 @@ lbl_801A29BC: /* 801A29CC 0019F92C 81 9E 00 00 */ lwz r12, 0(r30) /* 801A29D0 0019F930 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801A29D4 0019F934 7D 89 03 A6 */ mtctr r12 -/* 801A29D8 0019F938 4E 80 04 21 */ bctrl +/* 801A29D8 0019F938 4E 80 04 21 */ bctrl /* 801A29DC 0019F93C 28 03 00 00 */ cmplwi r3, 0 /* 801A29E0 0019F940 41 82 00 54 */ beq lbl_801A2A34 /* 801A29E4 0019F944 7F C3 F3 78 */ mr r3, r30 @@ -5279,7 +5279,7 @@ lbl_801A29BC: /* 801A29F0 0019F950 C0 22 A7 5C */ lfs f1, lbl_805AC47C@sda21(r2) /* 801A29F4 0019F954 81 8C 01 90 */ lwz r12, 0x190(r12) /* 801A29F8 0019F958 7D 89 03 A6 */ mtctr r12 -/* 801A29FC 0019F95C 4E 80 04 21 */ bctrl +/* 801A29FC 0019F95C 4E 80 04 21 */ bctrl /* 801A2A00 0019F960 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801A2A04 0019F964 40 82 00 30 */ bne lbl_801A2A34 /* 801A2A08 0019F968 80 7E 08 48 */ lwz r3, 0x848(r30) @@ -5375,7 +5375,7 @@ lbl_801A2B44: /* 801A2B58 0019FAB8 83 A1 00 64 */ lwz r29, 0x64(r1) /* 801A2B5C 0019FABC 7C 08 03 A6 */ mtlr r0 /* 801A2B60 0019FAC0 38 21 00 80 */ addi r1, r1, 0x80 -/* 801A2B64 0019FAC4 4E 80 00 20 */ blr +/* 801A2B64 0019FAC4 4E 80 00 20 */ blr .global PathFind__12CIceSheegothR13CStateManager9EStateMsgf PathFind__12CIceSheegothR13CStateManager9EStateMsgf: @@ -5450,7 +5450,7 @@ lbl_801A2C54: /* 801A2C6C 0019FBCC 81 9F 00 00 */ lwz r12, 0(r31) /* 801A2C70 0019FBD0 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801A2C74 0019FBD4 7D 89 03 A6 */ mtctr r12 -/* 801A2C78 0019FBD8 4E 80 04 21 */ bctrl +/* 801A2C78 0019FBD8 4E 80 04 21 */ bctrl /* 801A2C7C 0019FBDC 28 03 00 00 */ cmplwi r3, 0 /* 801A2C80 0019FBE0 41 82 01 0C */ beq lbl_801A2D8C /* 801A2C84 0019FBE4 7F E3 FB 78 */ mr r3, r31 @@ -5459,7 +5459,7 @@ lbl_801A2C54: /* 801A2C90 0019FBF0 C0 22 A7 5C */ lfs f1, lbl_805AC47C@sda21(r2) /* 801A2C94 0019FBF4 81 8C 01 90 */ lwz r12, 0x190(r12) /* 801A2C98 0019FBF8 7D 89 03 A6 */ mtctr r12 -/* 801A2C9C 0019FBFC 4E 80 04 21 */ bctrl +/* 801A2C9C 0019FBFC 4E 80 04 21 */ bctrl /* 801A2CA0 0019FC00 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801A2CA4 0019FC04 40 82 00 E8 */ bne lbl_801A2D8C /* 801A2CA8 0019FC08 80 7F 07 64 */ lwz r3, 0x764(r31) @@ -5594,7 +5594,7 @@ lbl_801A2E80: /* 801A2E94 0019FDF4 83 A1 00 84 */ lwz r29, 0x84(r1) /* 801A2E98 0019FDF8 7C 08 03 A6 */ mtlr r0 /* 801A2E9C 0019FDFC 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 801A2EA0 0019FE00 4E 80 00 20 */ blr +/* 801A2EA0 0019FE00 4E 80 00 20 */ blr .global DoubleSnap__12CIceSheegothR13CStateManager9EStateMsgf DoubleSnap__12CIceSheegothR13CStateManager9EStateMsgf: @@ -5647,7 +5647,7 @@ lbl_801A2F48: /* 801A2F48 0019FEA8 81 83 00 00 */ lwz r12, 0(r3) /* 801A2F4C 0019FEAC 81 8C 02 B8 */ lwz r12, 0x2b8(r12) /* 801A2F50 0019FEB0 7D 89 03 A6 */ mtctr r12 -/* 801A2F54 0019FEB4 4E 80 04 21 */ bctrl +/* 801A2F54 0019FEB4 4E 80 04 21 */ bctrl /* 801A2F58 0019FEB8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801A2F5C 0019FEBC 41 82 01 30 */ beq lbl_801A308C /* 801A2F60 0019FEC0 3C 80 80 3E */ lis r4, lbl_803DAA68@ha @@ -5710,7 +5710,7 @@ lbl_801A3024: /* 801A303C 0019FF9C C0 22 A7 5C */ lfs f1, lbl_805AC47C@sda21(r2) /* 801A3040 0019FFA0 81 8C 01 9C */ lwz r12, 0x19c(r12) /* 801A3044 0019FFA4 7D 89 03 A6 */ mtctr r12 -/* 801A3048 0019FFA8 4E 80 04 21 */ bctrl +/* 801A3048 0019FFA8 4E 80 04 21 */ bctrl /* 801A304C 0019FFAC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801A3050 0019FFB0 40 82 00 1C */ bne lbl_801A306C lbl_801A3054: @@ -5735,7 +5735,7 @@ lbl_801A308C: /* 801A3094 0019FFF4 83 C1 00 28 */ lwz r30, 0x28(r1) /* 801A3098 0019FFF8 7C 08 03 A6 */ mtlr r0 /* 801A309C 0019FFFC 38 21 00 30 */ addi r1, r1, 0x30 -/* 801A30A0 001A0000 4E 80 00 20 */ blr +/* 801A30A0 001A0000 4E 80 00 20 */ blr .global SpecialAttack__12CIceSheegothR13CStateManager9EStateMsgf SpecialAttack__12CIceSheegothR13CStateManager9EStateMsgf: @@ -5850,7 +5850,7 @@ lbl_801A3228: /* 801A3230 001A0190 83 C1 00 18 */ lwz r30, 0x18(r1) /* 801A3234 001A0194 7C 08 03 A6 */ mtlr r0 /* 801A3238 001A0198 38 21 00 20 */ addi r1, r1, 0x20 -/* 801A323C 001A019C 4E 80 00 20 */ blr +/* 801A323C 001A019C 4E 80 00 20 */ blr .global Attack__12CIceSheegothR13CStateManager9EStateMsgf Attack__12CIceSheegothR13CStateManager9EStateMsgf: @@ -5894,7 +5894,7 @@ lbl_801A3294: /* 801A32CC 001A022C 81 84 00 00 */ lwz r12, 0(r4) /* 801A32D0 001A0230 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 801A32D4 001A0234 7D 89 03 A6 */ mtctr r12 -/* 801A32D8 001A0238 4E 80 04 21 */ bctrl +/* 801A32D8 001A0238 4E 80 04 21 */ bctrl /* 801A32DC 001A023C C0 01 00 08 */ lfs f0, 8(r1) /* 801A32E0 001A0240 7F C3 F3 78 */ mr r3, r30 /* 801A32E4 001A0244 38 80 00 00 */ li r4, 0 @@ -6025,7 +6025,7 @@ lbl_801A3450: /* 801A34C8 001A0428 81 9E 00 00 */ lwz r12, 0(r30) /* 801A34CC 001A042C 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801A34D0 001A0430 7D 89 03 A6 */ mtctr r12 -/* 801A34D4 001A0434 4E 80 04 21 */ bctrl +/* 801A34D4 001A0434 4E 80 04 21 */ bctrl /* 801A34D8 001A0438 28 03 00 00 */ cmplwi r3, 0 /* 801A34DC 001A043C 41 82 00 40 */ beq lbl_801A351C /* 801A34E0 001A0440 7F C3 F3 78 */ mr r3, r30 @@ -6034,7 +6034,7 @@ lbl_801A3450: /* 801A34EC 001A044C C0 22 A7 5C */ lfs f1, lbl_805AC47C@sda21(r2) /* 801A34F0 001A0450 81 8C 01 90 */ lwz r12, 0x190(r12) /* 801A34F4 001A0454 7D 89 03 A6 */ mtctr r12 -/* 801A34F8 001A0458 4E 80 04 21 */ bctrl +/* 801A34F8 001A0458 4E 80 04 21 */ bctrl /* 801A34FC 001A045C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801A3500 001A0460 40 82 00 1C */ bne lbl_801A351C /* 801A3504 001A0464 FC 20 F8 90 */ fmr f1, f31 @@ -6102,7 +6102,7 @@ lbl_801A35C4: /* 801A35E0 001A0540 83 A1 00 94 */ lwz r29, 0x94(r1) /* 801A35E4 001A0544 7C 08 03 A6 */ mtlr r0 /* 801A35E8 001A0548 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 801A35EC 001A054C 4E 80 00 20 */ blr +/* 801A35EC 001A054C 4E 80 00 20 */ blr .global ProjectileAttack__12CIceSheegothR13CStateManager9EStateMsgf ProjectileAttack__12CIceSheegothR13CStateManager9EStateMsgf: @@ -6269,7 +6269,7 @@ lbl_801A383C: /* 801A3844 001A07A4 83 C1 00 38 */ lwz r30, 0x38(r1) /* 801A3848 001A07A8 7C 08 03 A6 */ mtlr r0 /* 801A384C 001A07AC 38 21 00 40 */ addi r1, r1, 0x40 -/* 801A3850 001A07B0 4E 80 00 20 */ blr +/* 801A3850 001A07B0 4E 80 00 20 */ blr .global Patrol__12CIceSheegothR13CStateManager9EStateMsgf Patrol__12CIceSheegothR13CStateManager9EStateMsgf: @@ -6280,7 +6280,7 @@ Patrol__12CIceSheegothR13CStateManager9EStateMsgf: /* 801A3864 001A07C4 80 01 00 14 */ lwz r0, 0x14(r1) /* 801A3868 001A07C8 7C 08 03 A6 */ mtlr r0 /* 801A386C 001A07CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801A3870 001A07D0 4E 80 00 20 */ blr +/* 801A3870 001A07D0 4E 80 00 20 */ blr .global sub_801a3874 sub_801a3874: @@ -6288,7 +6288,7 @@ sub_801a3874: /* 801A3878 001A07D8 20 00 00 04 */ subfic r0, r0, 4 /* 801A387C 001A07DC 7C 00 00 34 */ cntlzw r0, r0 /* 801A3880 001A07E0 54 03 D9 7E */ srwi r3, r0, 5 -/* 801A3884 001A07E4 4E 80 00 20 */ blr +/* 801A3884 001A07E4 4E 80 00 20 */ blr .global SpotPlayer__12CIceSheegothR13CStateManagerf SpotPlayer__12CIceSheegothR13CStateManagerf: @@ -6307,7 +6307,7 @@ lbl_801A38AC: /* 801A38B0 001A0810 80 01 00 14 */ lwz r0, 0x14(r1) /* 801A38B4 001A0814 7C 08 03 A6 */ mtlr r0 /* 801A38B8 001A0818 38 21 00 10 */ addi r1, r1, 0x10 -/* 801A38BC 001A081C 4E 80 00 20 */ blr +/* 801A38BC 001A081C 4E 80 00 20 */ blr .global InDetectionRange__12CIceSheegothR13CStateManagerf InDetectionRange__12CIceSheegothR13CStateManagerf: @@ -6348,13 +6348,13 @@ lbl_801A3908: /* 801A3940 001A08A0 FC 03 00 40 */ fcmpo cr0, f3, f0 /* 801A3944 001A08A4 7C 00 00 26 */ mfcr r0 /* 801A3948 001A08A8 54 03 0F FE */ srwi r3, r0, 0x1f -/* 801A394C 001A08AC 4E 80 00 20 */ blr +/* 801A394C 001A08AC 4E 80 00 20 */ blr lbl_801A3950: /* 801A3950 001A08B0 38 60 00 01 */ li r3, 1 -/* 801A3954 001A08B4 4E 80 00 20 */ blr +/* 801A3954 001A08B4 4E 80 00 20 */ blr lbl_801A3958: /* 801A3958 001A08B8 7C 03 03 78 */ mr r3, r0 -/* 801A395C 001A08BC 4E 80 00 20 */ blr +/* 801A395C 001A08BC 4E 80 00 20 */ blr .global InPosition__12CIceSheegothR13CStateManagerf InPosition__12CIceSheegothR13CStateManagerf: @@ -6374,7 +6374,7 @@ InPosition__12CIceSheegothR13CStateManagerf: /* 801A3994 001A08F4 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 801A3998 001A08F8 7C 00 00 26 */ mfcr r0 /* 801A399C 001A08FC 54 03 0F FE */ srwi r3, r0, 0x1f -/* 801A39A0 001A0900 4E 80 00 20 */ blr +/* 801A39A0 001A0900 4E 80 00 20 */ blr .global AggressionCheck__12CIceSheegothR13CStateManagerf AggressionCheck__12CIceSheegothR13CStateManagerf: @@ -6398,7 +6398,7 @@ lbl_801A39E0: /* 801A39E0 001A0940 80 01 00 14 */ lwz r0, 0x14(r1) /* 801A39E4 001A0944 7C 08 03 A6 */ mtlr r0 /* 801A39E8 001A0948 38 21 00 10 */ addi r1, r1, 0x10 -/* 801A39EC 001A094C 4E 80 00 20 */ blr +/* 801A39EC 001A094C 4E 80 00 20 */ blr .global ShouldFlinch__12CIceSheegothR13CStateManagerf ShouldFlinch__12CIceSheegothR13CStateManagerf: @@ -6413,7 +6413,7 @@ ShouldFlinch__12CIceSheegothR13CStateManagerf: /* 801A3A10 001A0970 38 80 00 01 */ li r4, 1 lbl_801A3A14: /* 801A3A14 001A0974 7C 83 23 78 */ mr r3, r4 -/* 801A3A18 001A0978 4E 80 00 20 */ blr +/* 801A3A18 001A0978 4E 80 00 20 */ blr .global ShouldTurn__12CIceSheegothR13CStateManagerf ShouldTurn__12CIceSheegothR13CStateManagerf: @@ -6439,7 +6439,7 @@ lbl_801A3A54: /* 801A3A60 001A09C0 81 84 00 00 */ lwz r12, 0(r4) /* 801A3A64 001A09C4 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 801A3A68 001A09C8 7D 89 03 A6 */ mtctr r12 -/* 801A3A6C 001A09CC 4E 80 04 21 */ bctrl +/* 801A3A6C 001A09CC 4E 80 04 21 */ bctrl /* 801A3A70 001A09D0 C0 41 00 44 */ lfs f2, 0x44(r1) /* 801A3A74 001A09D4 38 61 00 10 */ addi r3, r1, 0x10 /* 801A3A78 001A09D8 C0 1F 00 50 */ lfs f0, 0x50(r31) @@ -6482,7 +6482,7 @@ lbl_801A3A54: /* 801A3B0C 001A0A6C 83 E1 00 5C */ lwz r31, 0x5c(r1) /* 801A3B10 001A0A70 7C 08 03 A6 */ mtlr r0 /* 801A3B14 001A0A74 38 21 00 70 */ addi r1, r1, 0x70 -/* 801A3B18 001A0A78 4E 80 00 20 */ blr +/* 801A3B18 001A0A78 4E 80 00 20 */ blr .global ShouldFire__12CIceSheegothR13CStateManagerf ShouldFire__12CIceSheegothR13CStateManagerf: @@ -6554,7 +6554,7 @@ ShouldFire__12CIceSheegothR13CStateManagerf: /* 801A3C20 001A0B80 C0 22 A7 C4 */ lfs f1, lbl_805AC4E4@sda21(r2) /* 801A3C24 001A0B84 81 8C 01 E8 */ lwz r12, 0x1e8(r12) /* 801A3C28 001A0B88 7D 89 03 A6 */ mtctr r12 -/* 801A3C2C 001A0B8C 4E 80 04 21 */ bctrl +/* 801A3C2C 001A0B8C 4E 80 04 21 */ bctrl /* 801A3C30 001A0B90 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801A3C34 001A0B94 40 82 00 28 */ bne lbl_801A3C5C /* 801A3C38 001A0B98 7F C3 F3 78 */ mr r3, r30 @@ -6574,7 +6574,7 @@ lbl_801A3C60: /* 801A3C68 001A0BC8 83 C1 00 98 */ lwz r30, 0x98(r1) /* 801A3C6C 001A0BCC 7C 08 03 A6 */ mtlr r0 /* 801A3C70 001A0BD0 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 801A3C74 001A0BD4 4E 80 00 20 */ blr +/* 801A3C74 001A0BD4 4E 80 00 20 */ blr .global ShouldDoubleSnap__12CIceSheegothR13CStateManagerf ShouldDoubleSnap__12CIceSheegothR13CStateManagerf: @@ -6619,7 +6619,7 @@ ShouldDoubleSnap__12CIceSheegothR13CStateManagerf: /* 801A3D10 001A0C70 EF E1 00 28 */ fsubs f31, f1, f0 /* 801A3D14 001A0C74 C0 22 A7 5C */ lfs f1, lbl_805AC47C@sda21(r2) /* 801A3D18 001A0C78 7D 89 03 A6 */ mtctr r12 -/* 801A3D1C 001A0C7C 4E 80 04 21 */ bctrl +/* 801A3D1C 001A0C7C 4E 80 04 21 */ bctrl /* 801A3D20 001A0C80 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801A3D24 001A0C84 40 82 00 30 */ bne lbl_801A3D54 /* 801A3D28 001A0C88 80 7E 08 48 */ lwz r3, 0x848(r30) @@ -6652,7 +6652,7 @@ lbl_801A3D64: /* 801A3D84 001A0CE4 83 C1 00 08 */ lwz r30, 8(r1) /* 801A3D88 001A0CE8 7C 08 03 A6 */ mtlr r0 /* 801A3D8C 001A0CEC 38 21 00 40 */ addi r1, r1, 0x40 -/* 801A3D90 001A0CF0 4E 80 00 20 */ blr +/* 801A3D90 001A0CF0 4E 80 00 20 */ blr .global ShouldSpecialAttack__12CIceSheegothR13CStateManagerf ShouldSpecialAttack__12CIceSheegothR13CStateManagerf: @@ -6690,7 +6690,7 @@ ShouldSpecialAttack__12CIceSheegothR13CStateManagerf: /* 801A3E10 001A0D70 81 84 00 00 */ lwz r12, 0(r4) /* 801A3E14 001A0D74 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 801A3E18 001A0D78 7D 89 03 A6 */ mtctr r12 -/* 801A3E1C 001A0D7C 4E 80 04 21 */ bctrl +/* 801A3E1C 001A0D7C 4E 80 04 21 */ bctrl /* 801A3E20 001A0D80 C0 41 00 08 */ lfs f2, 8(r1) /* 801A3E24 001A0D84 7F C4 F3 78 */ mr r4, r30 /* 801A3E28 001A0D88 C0 21 00 0C */ lfs f1, 0xc(r1) @@ -6730,7 +6730,7 @@ ShouldSpecialAttack__12CIceSheegothR13CStateManagerf: /* 801A3EB0 001A0E10 C0 22 A7 C4 */ lfs f1, lbl_805AC4E4@sda21(r2) /* 801A3EB4 001A0E14 81 8C 01 E8 */ lwz r12, 0x1e8(r12) /* 801A3EB8 001A0E18 7D 89 03 A6 */ mtctr r12 -/* 801A3EBC 001A0E1C 4E 80 04 21 */ bctrl +/* 801A3EBC 001A0E1C 4E 80 04 21 */ bctrl /* 801A3EC0 001A0E20 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801A3EC4 001A0E24 40 82 00 28 */ bne lbl_801A3EEC /* 801A3EC8 001A0E28 7F C3 F3 78 */ mr r3, r30 @@ -6750,7 +6750,7 @@ lbl_801A3EF0: /* 801A3EF8 001A0E58 83 C1 00 98 */ lwz r30, 0x98(r1) /* 801A3EFC 001A0E5C 7C 08 03 A6 */ mtlr r0 /* 801A3F00 001A0E60 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 801A3F04 001A0E64 4E 80 00 20 */ blr +/* 801A3F04 001A0E64 4E 80 00 20 */ blr .global ShouldAttack__12CIceSheegothR13CStateManagerf ShouldAttack__12CIceSheegothR13CStateManagerf: @@ -6785,7 +6785,7 @@ ShouldAttack__12CIceSheegothR13CStateManagerf: /* 801A3F78 001A0ED8 C0 22 A7 5C */ lfs f1, lbl_805AC47C@sda21(r2) /* 801A3F7C 001A0EDC 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 801A3F80 001A0EE0 7D 89 03 A6 */ mtctr r12 -/* 801A3F84 001A0EE4 4E 80 04 21 */ bctrl +/* 801A3F84 001A0EE4 4E 80 04 21 */ bctrl /* 801A3F88 001A0EE8 C0 A1 00 08 */ lfs f5, 8(r1) /* 801A3F8C 001A0EEC C0 41 00 0C */ lfs f2, 0xc(r1) /* 801A3F90 001A0EF0 C0 81 00 10 */ lfs f4, 0x10(r1) @@ -6831,7 +6831,7 @@ lbl_801A3FFC: /* 801A4028 001A0F88 C0 22 A7 C4 */ lfs f1, lbl_805AC4E4@sda21(r2) /* 801A402C 001A0F8C 81 8C 01 E8 */ lwz r12, 0x1e8(r12) /* 801A4030 001A0F90 7D 89 03 A6 */ mtctr r12 -/* 801A4034 001A0F94 4E 80 04 21 */ bctrl +/* 801A4034 001A0F94 4E 80 04 21 */ bctrl /* 801A4038 001A0F98 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801A403C 001A0F9C 40 82 00 5C */ bne lbl_801A4098 /* 801A4040 001A0FA0 7F A4 EB 78 */ mr r4, r29 @@ -6869,7 +6869,7 @@ lbl_801A409C: /* 801A40B8 001A1018 83 A1 00 94 */ lwz r29, 0x94(r1) /* 801A40BC 001A101C 7C 08 03 A6 */ mtlr r0 /* 801A40C0 001A1020 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 801A40C4 001A1024 4E 80 00 20 */ blr +/* 801A40C4 001A1024 4E 80 00 20 */ blr .global Leash__12CIceSheegothR13CStateManagerf Leash__12CIceSheegothR13CStateManagerf: @@ -6911,10 +6911,10 @@ Leash__12CIceSheegothR13CStateManagerf: /* 801A4154 001A10B4 38 00 00 01 */ li r0, 1 lbl_801A4158: /* 801A4158 001A10B8 7C 03 03 78 */ mr r3, r0 -/* 801A415C 001A10BC 4E 80 00 20 */ blr +/* 801A415C 001A10BC 4E 80 00 20 */ blr lbl_801A4160: /* 801A4160 001A10C0 38 60 00 00 */ li r3, 0 -/* 801A4164 001A10C4 4E 80 00 20 */ blr +/* 801A4164 001A10C4 4E 80 00 20 */ blr .global LostInterest__12CIceSheegothR13CStateManagerf LostInterest__12CIceSheegothR13CStateManagerf: @@ -6924,7 +6924,7 @@ LostInterest__12CIceSheegothR13CStateManagerf: /* 801A4174 001A10D4 4C 41 13 82 */ cror 2, 1, 2 /* 801A4178 001A10D8 7C 00 00 26 */ mfcr r0 /* 801A417C 001A10DC 54 03 1F FE */ rlwinm r3, r0, 3, 0x1f, 0x1f -/* 801A4180 001A10E0 4E 80 00 20 */ blr +/* 801A4180 001A10E0 4E 80 00 20 */ blr .global OffLine__12CIceSheegothR13CStateManagerf OffLine__12CIceSheegothR13CStateManagerf: @@ -6943,13 +6943,13 @@ OffLine__12CIceSheegothR13CStateManagerf: /* 801A41B4 001A1114 C0 22 A7 5C */ lfs f1, lbl_805AC47C@sda21(r2) /* 801A41B8 001A1118 81 8C 01 90 */ lwz r12, 0x190(r12) /* 801A41BC 001A111C 7D 89 03 A6 */ mtctr r12 -/* 801A41C0 001A1120 4E 80 04 21 */ bctrl +/* 801A41C0 001A1120 4E 80 04 21 */ bctrl /* 801A41C4 001A1124 80 01 00 14 */ lwz r0, 0x14(r1) /* 801A41C8 001A1128 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801A41CC 001A112C 83 C1 00 08 */ lwz r30, 8(r1) /* 801A41D0 001A1130 7C 08 03 A6 */ mtlr r0 /* 801A41D4 001A1134 38 21 00 10 */ addi r1, r1, 0x10 -/* 801A41D8 001A1138 4E 80 00 20 */ blr +/* 801A41D8 001A1138 4E 80 00 20 */ blr .global TooClose__12CIceSheegothR13CStateManagerf TooClose__12CIceSheegothR13CStateManagerf: @@ -6979,10 +6979,10 @@ TooClose__12CIceSheegothR13CStateManagerf: /* 801A4238 001A1198 38 00 00 01 */ li r0, 1 lbl_801A423C: /* 801A423C 001A119C 7C 03 03 78 */ mr r3, r0 -/* 801A4240 001A11A0 4E 80 00 20 */ blr +/* 801A4240 001A11A0 4E 80 00 20 */ blr lbl_801A4244: /* 801A4244 001A11A4 38 60 00 00 */ li r3, 0 -/* 801A4248 001A11A8 4E 80 00 20 */ blr +/* 801A4248 001A11A8 4E 80 00 20 */ blr .global ShotAt__12CIceSheegothR13CStateManagerf ShotAt__12CIceSheegothR13CStateManagerf: @@ -6991,7 +6991,7 @@ ShotAt__12CIceSheegothR13CStateManagerf: /* 801A4254 001A11B4 7C 03 00 D0 */ neg r0, r3 /* 801A4258 001A11B8 7C 00 1B 78 */ or r0, r0, r3 /* 801A425C 001A11BC 54 03 0F FE */ srwi r3, r0, 0x1f -/* 801A4260 001A11C0 4E 80 00 20 */ blr +/* 801A4260 001A11C0 4E 80 00 20 */ blr .global InMaxRange__12CIceSheegothR13CStateManagerf InMaxRange__12CIceSheegothR13CStateManagerf: @@ -7009,19 +7009,19 @@ lbl_801A4288: /* 801A4288 001A11E8 80 01 00 14 */ lwz r0, 0x14(r1) /* 801A428C 001A11EC 7C 08 03 A6 */ mtlr r0 /* 801A4290 001A11F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801A4294 001A11F4 4E 80 00 20 */ blr +/* 801A4294 001A11F4 4E 80 00 20 */ blr .global GetDamageVulnerability__12CIceSheegothCFRC9CVector3fRC9CVector3fRC11CDamageInfo GetDamageVulnerability__12CIceSheegothCFRC9CVector3fRC9CVector3fRC11CDamageInfo: /* 801A4298 001A11F8 3C 60 80 57 */ lis r3, lbl_8056D7E8@ha /* 801A429C 001A11FC 38 63 D7 E8 */ addi r3, r3, lbl_8056D7E8@l -/* 801A42A0 001A1200 4E 80 00 20 */ blr +/* 801A42A0 001A1200 4E 80 00 20 */ blr .global GetDamageVulnerability__12CIceSheegothCFv GetDamageVulnerability__12CIceSheegothCFv: /* 801A42A4 001A1204 3C 60 80 57 */ lis r3, lbl_8056D7E8@ha /* 801A42A8 001A1208 38 63 D7 E8 */ addi r3, r3, lbl_8056D7E8@l -/* 801A42AC 001A120C 4E 80 00 20 */ blr +/* 801A42AC 001A120C 4E 80 00 20 */ blr .global GetAimPosition__12CIceSheegothCFRC13CStateManagerf GetAimPosition__12CIceSheegothCFRC13CStateManagerf: @@ -7180,7 +7180,7 @@ lbl_801A44C4: /* 801A44E8 001A1448 80 01 00 94 */ lwz r0, 0x94(r1) /* 801A44EC 001A144C 7C 08 03 A6 */ mtlr r0 /* 801A44F0 001A1450 38 21 00 90 */ addi r1, r1, 0x90 -/* 801A44F4 001A1454 4E 80 00 20 */ blr +/* 801A44F4 001A1454 4E 80 00 20 */ blr .global DoUserAnimEvent__12CIceSheegothFR13CStateManagerRC13CInt32POINode14EUserEventType DoUserAnimEvent__12CIceSheegothFR13CStateManagerRC13CInt32POINode14EUserEventType: @@ -7209,7 +7209,7 @@ DoUserAnimEvent__12CIceSheegothFR13CStateManagerRC13CInt32POINode14EUserEventTyp /* 801A4550 001A14B0 38 A5 49 F4 */ addi r5, r5, lbl_803E49F4@l /* 801A4554 001A14B4 7C 05 00 2E */ lwzx r0, r5, r0 /* 801A4558 001A14B8 7C 09 03 A6 */ mtctr r0 -/* 801A455C 001A14BC 4E 80 04 20 */ bctr +/* 801A455C 001A14BC 4E 80 04 20 */ bctr .global lbl_801A4560 lbl_801A4560: /* 801A4560 001A14C0 7F 84 E3 78 */ mr r4, r28 @@ -7226,7 +7226,7 @@ lbl_801A4560: /* 801A458C 001A14EC 81 84 00 00 */ lwz r12, 0(r4) /* 801A4590 001A14F0 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 801A4594 001A14F4 7D 89 03 A6 */ mtctr r12 -/* 801A4598 001A14F8 4E 80 04 21 */ bctrl +/* 801A4598 001A14F8 4E 80 04 21 */ bctrl /* 801A459C 001A14FC C0 41 00 80 */ lfs f2, 0x80(r1) /* 801A45A0 001A1500 7F 83 E3 78 */ mr r3, r28 /* 801A45A4 001A1504 C0 21 00 84 */ lfs f1, 0x84(r1) @@ -7244,7 +7244,7 @@ lbl_801A4560: /* 801A45D4 001A1534 81 9C 00 00 */ lwz r12, 0(r28) /* 801A45D8 001A1538 81 8C 02 C0 */ lwz r12, 0x2c0(r12) /* 801A45DC 001A153C 7D 89 03 A6 */ mtctr r12 -/* 801A45E0 001A1540 4E 80 04 21 */ bctrl +/* 801A45E0 001A1540 4E 80 04 21 */ bctrl /* 801A45E4 001A1544 FC 20 F8 90 */ fmr f1, f31 /* 801A45E8 001A1548 7C 64 1B 78 */ mr r4, r3 /* 801A45EC 001A154C 7F 67 DB 78 */ mr r7, r27 @@ -7401,7 +7401,7 @@ lbl_801A4814: /* 801A4834 001A1794 C0 22 A7 5C */ lfs f1, lbl_805AC47C@sda21(r2) /* 801A4838 001A1798 81 8C 02 70 */ lwz r12, 0x270(r12) /* 801A483C 001A179C 7D 89 03 A6 */ mtctr r12 -/* 801A4840 001A17A0 4E 80 04 21 */ bctrl +/* 801A4840 001A17A0 4E 80 04 21 */ bctrl /* 801A4844 001A17A4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801A4848 001A17A8 40 82 00 34 */ bne lbl_801A487C /* 801A484C 001A17AC 3C 60 80 3E */ lis r3, lbl_803DAA68@ha @@ -7484,12 +7484,12 @@ lbl_801A492C: /* 801A4950 001A18B0 80 01 01 E4 */ lwz r0, 0x1e4(r1) /* 801A4954 001A18B4 7C 08 03 A6 */ mtlr r0 /* 801A4958 001A18B8 38 21 01 E0 */ addi r1, r1, 0x1e0 -/* 801A495C 001A18BC 4E 80 00 20 */ blr +/* 801A495C 001A18BC 4E 80 00 20 */ blr .global ProjectileInfo__12CIceSheegothFv ProjectileInfo__12CIceSheegothFv: /* 801A4960 001A18C0 38 63 0A 58 */ addi r3, r3, 0xa58 -/* 801A4964 001A18C4 4E 80 00 20 */ blr +/* 801A4964 001A18C4 4E 80 00 20 */ blr .global AddToRenderer__12CIceSheegothCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__12CIceSheegothCFRC14CFrustumPlanesRC13CStateManager: @@ -7546,7 +7546,7 @@ lbl_801A4A08: /* 801A4A20 001A1980 38 61 01 3C */ addi r3, r1, 0x13c /* 801A4A24 001A1984 81 8C 00 5C */ lwz r12, 0x5c(r12) /* 801A4A28 001A1988 7D 89 03 A6 */ mtctr r12 -/* 801A4A2C 001A198C 4E 80 04 21 */ bctrl +/* 801A4A2C 001A198C 4E 80 04 21 */ bctrl /* 801A4A30 001A1990 38 61 01 3C */ addi r3, r1, 0x13c /* 801A4A34 001A1994 38 A0 00 01 */ li r5, 1 /* 801A4A38 001A1998 48 00 00 14 */ b lbl_801A4A4C @@ -7594,7 +7594,7 @@ lbl_801A4AB4: /* 801A4ACC 001A1A2C 38 61 01 04 */ addi r3, r1, 0x104 /* 801A4AD0 001A1A30 81 8C 00 5C */ lwz r12, 0x5c(r12) /* 801A4AD4 001A1A34 7D 89 03 A6 */ mtctr r12 -/* 801A4AD8 001A1A38 4E 80 04 21 */ bctrl +/* 801A4AD8 001A1A38 4E 80 04 21 */ bctrl /* 801A4ADC 001A1A3C 38 61 01 04 */ addi r3, r1, 0x104 /* 801A4AE0 001A1A40 38 A0 00 01 */ li r5, 1 /* 801A4AE4 001A1A44 48 00 00 14 */ b lbl_801A4AF8 @@ -7642,7 +7642,7 @@ lbl_801A4B60: /* 801A4B78 001A1AD8 38 61 00 CC */ addi r3, r1, 0xcc /* 801A4B7C 001A1ADC 81 8C 00 5C */ lwz r12, 0x5c(r12) /* 801A4B80 001A1AE0 7D 89 03 A6 */ mtctr r12 -/* 801A4B84 001A1AE4 4E 80 04 21 */ bctrl +/* 801A4B84 001A1AE4 4E 80 04 21 */ bctrl /* 801A4B88 001A1AE8 38 61 00 CC */ addi r3, r1, 0xcc /* 801A4B8C 001A1AEC 38 A0 00 01 */ li r5, 1 /* 801A4B90 001A1AF0 48 00 00 14 */ b lbl_801A4BA4 @@ -7690,7 +7690,7 @@ lbl_801A4C0C: /* 801A4C24 001A1B84 38 61 00 94 */ addi r3, r1, 0x94 /* 801A4C28 001A1B88 81 8C 00 5C */ lwz r12, 0x5c(r12) /* 801A4C2C 001A1B8C 7D 89 03 A6 */ mtctr r12 -/* 801A4C30 001A1B90 4E 80 04 21 */ bctrl +/* 801A4C30 001A1B90 4E 80 04 21 */ bctrl /* 801A4C34 001A1B94 38 61 00 94 */ addi r3, r1, 0x94 /* 801A4C38 001A1B98 38 A0 00 01 */ li r5, 1 /* 801A4C3C 001A1B9C 48 00 00 14 */ b lbl_801A4C50 @@ -7738,7 +7738,7 @@ lbl_801A4CB8: /* 801A4CD0 001A1C30 38 61 00 5C */ addi r3, r1, 0x5c /* 801A4CD4 001A1C34 81 8C 00 5C */ lwz r12, 0x5c(r12) /* 801A4CD8 001A1C38 7D 89 03 A6 */ mtctr r12 -/* 801A4CDC 001A1C3C 4E 80 04 21 */ bctrl +/* 801A4CDC 001A1C3C 4E 80 04 21 */ bctrl /* 801A4CE0 001A1C40 38 61 00 5C */ addi r3, r1, 0x5c /* 801A4CE4 001A1C44 38 A0 00 01 */ li r5, 1 /* 801A4CE8 001A1C48 48 00 00 14 */ b lbl_801A4CFC @@ -7786,7 +7786,7 @@ lbl_801A4D64: /* 801A4D7C 001A1CDC 38 61 00 24 */ addi r3, r1, 0x24 /* 801A4D80 001A1CE0 81 8C 00 5C */ lwz r12, 0x5c(r12) /* 801A4D84 001A1CE4 7D 89 03 A6 */ mtctr r12 -/* 801A4D88 001A1CE8 4E 80 04 21 */ bctrl +/* 801A4D88 001A1CE8 4E 80 04 21 */ bctrl /* 801A4D8C 001A1CEC 38 61 00 24 */ addi r3, r1, 0x24 /* 801A4D90 001A1CF0 38 A0 00 01 */ li r5, 1 /* 801A4D94 001A1CF4 48 00 00 14 */ b lbl_801A4DA8 @@ -7916,32 +7916,32 @@ lbl_801A4F34: /* 801A4F58 001A1EB8 81 83 00 00 */ lwz r12, 0(r3) /* 801A4F5C 001A1EBC 81 8C 00 34 */ lwz r12, 0x34(r12) /* 801A4F60 001A1EC0 7D 89 03 A6 */ mtctr r12 -/* 801A4F64 001A1EC4 4E 80 04 21 */ bctrl +/* 801A4F64 001A1EC4 4E 80 04 21 */ bctrl lbl_801A4F68: /* 801A4F68 001A1EC8 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 801A4F6C 001A1ECC 80 9E 0A 9C */ lwz r4, 0xa9c(r30) /* 801A4F70 001A1ED0 81 83 00 00 */ lwz r12, 0(r3) /* 801A4F74 001A1ED4 81 8C 00 34 */ lwz r12, 0x34(r12) /* 801A4F78 001A1ED8 7D 89 03 A6 */ mtctr r12 -/* 801A4F7C 001A1EDC 4E 80 04 21 */ bctrl +/* 801A4F7C 001A1EDC 4E 80 04 21 */ bctrl /* 801A4F80 001A1EE0 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 801A4F84 001A1EE4 80 9E 0A B0 */ lwz r4, 0xab0(r30) /* 801A4F88 001A1EE8 81 83 00 00 */ lwz r12, 0(r3) /* 801A4F8C 001A1EEC 81 8C 00 34 */ lwz r12, 0x34(r12) /* 801A4F90 001A1EF0 7D 89 03 A6 */ mtctr r12 -/* 801A4F94 001A1EF4 4E 80 04 21 */ bctrl +/* 801A4F94 001A1EF4 4E 80 04 21 */ bctrl /* 801A4F98 001A1EF8 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 801A4F9C 001A1EFC 80 9E 0A C4 */ lwz r4, 0xac4(r30) /* 801A4FA0 001A1F00 81 83 00 00 */ lwz r12, 0(r3) /* 801A4FA4 001A1F04 81 8C 00 34 */ lwz r12, 0x34(r12) /* 801A4FA8 001A1F08 7D 89 03 A6 */ mtctr r12 -/* 801A4FAC 001A1F0C 4E 80 04 21 */ bctrl +/* 801A4FAC 001A1F0C 4E 80 04 21 */ bctrl /* 801A4FB0 001A1F10 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 801A4FB4 001A1F14 80 9E 0A D8 */ lwz r4, 0xad8(r30) /* 801A4FB8 001A1F18 81 83 00 00 */ lwz r12, 0(r3) /* 801A4FBC 001A1F1C 81 8C 00 34 */ lwz r12, 0x34(r12) /* 801A4FC0 001A1F20 7D 89 03 A6 */ mtctr r12 -/* 801A4FC4 001A1F24 4E 80 04 21 */ bctrl +/* 801A4FC4 001A1F24 4E 80 04 21 */ bctrl lbl_801A4FC8: /* 801A4FC8 001A1F28 38 00 00 00 */ li r0, 0 /* 801A4FCC 001A1F2C 98 01 01 88 */ stb r0, 0x188(r1) @@ -7957,7 +7957,7 @@ lbl_801A4FE4: /* 801A4FF0 001A1F50 83 A1 02 24 */ lwz r29, 0x224(r1) /* 801A4FF4 001A1F54 7C 08 03 A6 */ mtlr r0 /* 801A4FF8 001A1F58 38 21 02 30 */ addi r1, r1, 0x230 -/* 801A4FFC 001A1F5C 4E 80 00 20 */ blr +/* 801A4FFC 001A1F5C 4E 80 00 20 */ blr .global Render__12CIceSheegothCFRC13CStateManager Render__12CIceSheegothCFRC13CStateManager: @@ -7968,7 +7968,7 @@ Render__12CIceSheegothCFRC13CStateManager: /* 801A5010 001A1F70 80 01 00 14 */ lwz r0, 0x14(r1) /* 801A5014 001A1F74 7C 08 03 A6 */ mtlr r0 /* 801A5018 001A1F78 38 21 00 10 */ addi r1, r1, 0x10 -/* 801A501C 001A1F7C 4E 80 00 20 */ blr +/* 801A501C 001A1F7C 4E 80 00 20 */ blr .global AcceptScriptMsg__12CIceSheegothF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__12CIceSheegothF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -7989,7 +7989,7 @@ AcceptScriptMsg__12CIceSheegothF20EScriptObjectMessage9TUniqueIdR13CStateManager /* 801A5058 001A1FB8 38 84 4A 54 */ addi r4, r4, lbl_803E4A54@l /* 801A505C 001A1FBC 7C 04 00 2E */ lwzx r0, r4, r0 /* 801A5060 001A1FC0 7C 09 03 A6 */ mtctr r0 -/* 801A5064 001A1FC4 4E 80 04 20 */ bctr +/* 801A5064 001A1FC4 4E 80 04 20 */ bctr .global lbl_801A5068 lbl_801A5068: /* 801A5068 001A1FC8 81 83 00 00 */ lwz r12, 0(r3) @@ -7997,7 +7997,7 @@ lbl_801A5068: /* 801A5070 001A1FD0 C0 22 A7 5C */ lfs f1, lbl_805AC47C@sda21(r2) /* 801A5074 001A1FD4 81 8C 01 C0 */ lwz r12, 0x1c0(r12) /* 801A5078 001A1FD8 7D 89 03 A6 */ mtctr r12 -/* 801A507C 001A1FDC 4E 80 04 21 */ bctrl +/* 801A507C 001A1FDC 4E 80 04 21 */ bctrl /* 801A5080 001A1FE0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801A5084 001A1FE4 40 82 00 10 */ bne lbl_801A5094 /* 801A5088 001A1FE8 80 7F 04 50 */ lwz r3, 0x450(r31) @@ -8196,7 +8196,7 @@ lbl_801A52A8: /* 801A5348 001A22A8 81 83 00 00 */ lwz r12, 0(r3) /* 801A534C 001A22AC 81 8C 00 58 */ lwz r12, 0x58(r12) /* 801A5350 001A22B0 7D 89 03 A6 */ mtctr r12 -/* 801A5354 001A22B4 4E 80 04 21 */ bctrl +/* 801A5354 001A22B4 4E 80 04 21 */ bctrl /* 801A5358 001A22B8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801A535C 001A22BC 41 82 01 50 */ beq lbl_801A54AC lbl_801A5360: @@ -8239,7 +8239,7 @@ lbl_801A53AC: /* 801A53EC 001A234C 38 80 00 01 */ li r4, 1 /* 801A53F0 001A2350 81 8C 00 08 */ lwz r12, 8(r12) /* 801A53F4 001A2354 7D 89 03 A6 */ mtctr r12 -/* 801A53F8 001A2358 4E 80 04 21 */ bctrl +/* 801A53F8 001A2358 4E 80 04 21 */ bctrl lbl_801A53FC: /* 801A53FC 001A235C 88 61 00 88 */ lbz r3, 0x88(r1) /* 801A5400 001A2360 38 00 00 00 */ li r0, 0 @@ -8258,7 +8258,7 @@ lbl_801A5414: /* 801A5430 001A2390 38 80 00 01 */ li r4, 1 /* 801A5434 001A2394 81 8C 00 08 */ lwz r12, 8(r12) /* 801A5438 001A2398 7D 89 03 A6 */ mtctr r12 -/* 801A543C 001A239C 4E 80 04 21 */ bctrl +/* 801A543C 001A239C 4E 80 04 21 */ bctrl lbl_801A5440: /* 801A5440 001A23A0 7F 60 07 75 */ extsb. r0, r27 /* 801A5444 001A23A4 41 82 00 68 */ beq lbl_801A54AC @@ -8274,7 +8274,7 @@ lbl_801A5458: /* 801A5468 001A23C8 81 8C 00 90 */ lwz r12, 0x90(r12) /* 801A546C 001A23CC 38 84 66 A0 */ addi r4, r4, skZero3f@l /* 801A5470 001A23D0 7D 89 03 A6 */ mtctr r12 -/* 801A5474 001A23D4 4E 80 04 21 */ bctrl +/* 801A5474 001A23D4 4E 80 04 21 */ bctrl /* 801A5478 001A23D8 7F E3 FB 78 */ mr r3, r31 /* 801A547C 001A23DC 7F 44 D3 78 */ mr r4, r26 /* 801A5480 001A23E0 4B FF A7 C1 */ bl sub_8019fc40 @@ -8357,7 +8357,7 @@ lbl_801A550C: /* 801A55A4 001A2504 81 83 00 00 */ lwz r12, 0(r3) /* 801A55A8 001A2508 81 8C 00 58 */ lwz r12, 0x58(r12) /* 801A55AC 001A250C 7D 89 03 A6 */ mtctr r12 -/* 801A55B0 001A2510 4E 80 04 21 */ bctrl +/* 801A55B0 001A2510 4E 80 04 21 */ bctrl /* 801A55B4 001A2514 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801A55B8 001A2518 41 82 00 F8 */ beq lbl_801A56B0 lbl_801A55BC: @@ -8400,7 +8400,7 @@ lbl_801A5608: /* 801A5648 001A25A8 38 80 00 01 */ li r4, 1 /* 801A564C 001A25AC 81 8C 00 08 */ lwz r12, 8(r12) /* 801A5650 001A25B0 7D 89 03 A6 */ mtctr r12 -/* 801A5654 001A25B4 4E 80 04 21 */ bctrl +/* 801A5654 001A25B4 4E 80 04 21 */ bctrl lbl_801A5658: /* 801A5658 001A25B8 88 61 00 70 */ lbz r3, 0x70(r1) /* 801A565C 001A25BC 38 00 00 00 */ li r0, 0 @@ -8419,7 +8419,7 @@ lbl_801A5670: /* 801A568C 001A25EC 38 80 00 01 */ li r4, 1 /* 801A5690 001A25F0 81 8C 00 08 */ lwz r12, 8(r12) /* 801A5694 001A25F4 7D 89 03 A6 */ mtctr r12 -/* 801A5698 001A25F8 4E 80 04 21 */ bctrl +/* 801A5698 001A25F8 4E 80 04 21 */ bctrl lbl_801A569C: /* 801A569C 001A25FC 7F 60 07 75 */ extsb. r0, r27 /* 801A56A0 001A2600 41 82 00 10 */ beq lbl_801A56B0 @@ -8467,7 +8467,7 @@ lbl_801A570C: /* 801A5734 001A2694 80 01 01 04 */ lwz r0, 0x104(r1) /* 801A5738 001A2698 7C 08 03 A6 */ mtlr r0 /* 801A573C 001A269C 38 21 01 00 */ addi r1, r1, 0x100 -/* 801A5740 001A26A0 4E 80 00 20 */ blr +/* 801A5740 001A26A0 4E 80 00 20 */ blr .global Think__12CIceSheegothFfR13CStateManager Think__12CIceSheegothFfR13CStateManager: @@ -8518,7 +8518,7 @@ lbl_801A57D8: /* 801A57EC 001A274C 81 83 00 00 */ lwz r12, 0(r3) /* 801A57F0 001A2750 81 8C 00 14 */ lwz r12, 0x14(r12) /* 801A57F4 001A2754 7D 89 03 A6 */ mtctr r12 -/* 801A57F8 001A2758 4E 80 04 21 */ bctrl +/* 801A57F8 001A2758 4E 80 04 21 */ bctrl /* 801A57FC 001A275C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801A5800 001A2760 41 82 00 10 */ beq lbl_801A5810 /* 801A5804 001A2764 7F C3 F3 78 */ mr r3, r30 @@ -8628,7 +8628,7 @@ lbl_801A5984: /* 801A5998 001A28F8 83 A1 00 34 */ lwz r29, 0x34(r1) /* 801A599C 001A28FC 7C 08 03 A6 */ mtlr r0 /* 801A59A0 001A2900 38 21 00 50 */ addi r1, r1, 0x50 -/* 801A59A4 001A2904 4E 80 00 20 */ blr +/* 801A59A4 001A2904 4E 80 00 20 */ blr .global Accept__12CIceSheegothFR8IVisitor Accept__12CIceSheegothFR8IVisitor: @@ -8641,11 +8641,11 @@ Accept__12CIceSheegothFR8IVisitor: /* 801A59C0 001A2920 7C 04 03 78 */ mr r4, r0 /* 801A59C4 001A2924 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 801A59C8 001A2928 7D 89 03 A6 */ mtctr r12 -/* 801A59CC 001A292C 4E 80 04 21 */ bctrl +/* 801A59CC 001A292C 4E 80 04 21 */ bctrl /* 801A59D0 001A2930 80 01 00 14 */ lwz r0, 0x14(r1) /* 801A59D4 001A2934 7C 08 03 A6 */ mtlr r0 /* 801A59D8 001A2938 38 21 00 10 */ addi r1, r1, 0x10 -/* 801A59DC 001A293C 4E 80 00 20 */ blr +/* 801A59DC 001A293C 4E 80 00 20 */ blr .global __dt__12CIceSheegothFv __dt__12CIceSheegothFv: @@ -8756,7 +8756,7 @@ lbl_801A5B20: /* 801A5B44 001A2AA4 38 80 00 01 */ li r4, 1 /* 801A5B48 001A2AA8 81 8C 00 08 */ lwz r12, 8(r12) /* 801A5B4C 001A2AAC 7D 89 03 A6 */ mtctr r12 -/* 801A5B50 001A2AB0 4E 80 04 21 */ bctrl +/* 801A5B50 001A2AB0 4E 80 04 21 */ bctrl lbl_801A5B54: /* 801A5B54 001A2AB4 34 1E 0A DC */ addic. r0, r30, 0xadc /* 801A5B58 001A2AB8 41 82 00 18 */ beq lbl_801A5B70 @@ -8778,7 +8778,7 @@ lbl_801A5B70: /* 801A5B94 001A2AF4 38 80 00 01 */ li r4, 1 /* 801A5B98 001A2AF8 81 8C 00 08 */ lwz r12, 8(r12) /* 801A5B9C 001A2AFC 7D 89 03 A6 */ mtctr r12 -/* 801A5BA0 001A2B00 4E 80 04 21 */ bctrl +/* 801A5BA0 001A2B00 4E 80 04 21 */ bctrl lbl_801A5BA4: /* 801A5BA4 001A2B04 34 1E 0A C8 */ addic. r0, r30, 0xac8 /* 801A5BA8 001A2B08 41 82 00 18 */ beq lbl_801A5BC0 @@ -8800,7 +8800,7 @@ lbl_801A5BC0: /* 801A5BE4 001A2B44 38 80 00 01 */ li r4, 1 /* 801A5BE8 001A2B48 81 8C 00 08 */ lwz r12, 8(r12) /* 801A5BEC 001A2B4C 7D 89 03 A6 */ mtctr r12 -/* 801A5BF0 001A2B50 4E 80 04 21 */ bctrl +/* 801A5BF0 001A2B50 4E 80 04 21 */ bctrl lbl_801A5BF4: /* 801A5BF4 001A2B54 34 1E 0A B4 */ addic. r0, r30, 0xab4 /* 801A5BF8 001A2B58 41 82 00 18 */ beq lbl_801A5C10 @@ -8822,7 +8822,7 @@ lbl_801A5C10: /* 801A5C34 001A2B94 38 80 00 01 */ li r4, 1 /* 801A5C38 001A2B98 81 8C 00 08 */ lwz r12, 8(r12) /* 801A5C3C 001A2B9C 7D 89 03 A6 */ mtctr r12 -/* 801A5C40 001A2BA0 4E 80 04 21 */ bctrl +/* 801A5C40 001A2BA0 4E 80 04 21 */ bctrl lbl_801A5C44: /* 801A5C44 001A2BA4 34 1E 0A A0 */ addic. r0, r30, 0xaa0 /* 801A5C48 001A2BA8 41 82 00 18 */ beq lbl_801A5C60 @@ -8844,7 +8844,7 @@ lbl_801A5C60: /* 801A5C84 001A2BE4 38 80 00 01 */ li r4, 1 /* 801A5C88 001A2BE8 81 8C 00 08 */ lwz r12, 8(r12) /* 801A5C8C 001A2BEC 7D 89 03 A6 */ mtctr r12 -/* 801A5C90 001A2BF0 4E 80 04 21 */ bctrl +/* 801A5C90 001A2BF0 4E 80 04 21 */ bctrl lbl_801A5C94: /* 801A5C94 001A2BF4 34 1E 0A 8C */ addic. r0, r30, 0xa8c /* 801A5C98 001A2BF8 41 82 00 18 */ beq lbl_801A5CB0 @@ -8968,7 +8968,7 @@ lbl_801A5E20: /* 801A5E2C 001A2D8C 83 C1 00 08 */ lwz r30, 8(r1) /* 801A5E30 001A2D90 7C 08 03 A6 */ mtlr r0 /* 801A5E34 001A2D94 38 21 00 10 */ addi r1, r1, 0x10 -/* 801A5E38 001A2D98 4E 80 00 20 */ blr +/* 801A5E38 001A2D98 4E 80 00 20 */ blr .global "__ct__12CIceSheegothF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC14CPatternedInfoRC16CActorParametersRC16CIceSheegothData" "__ct__12CIceSheegothF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC14CPatternedInfoRC16CActorParametersRC16CIceSheegothData": @@ -9180,7 +9180,7 @@ lbl_801A5E20: /* 801A6170 001A30D0 81 84 00 00 */ lwz r12, 0(r4) /* 801A6174 001A30D4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801A6178 001A30D8 7D 89 03 A6 */ mtctr r12 -/* 801A617C 001A30DC 4E 80 04 21 */ bctrl +/* 801A617C 001A30DC 4E 80 04 21 */ bctrl /* 801A6180 001A30E0 38 81 00 DC */ addi r4, r1, 0xdc /* 801A6184 001A30E4 3B 80 00 01 */ li r28, 1 /* 801A6188 001A30E8 48 00 00 30 */ b lbl_801A61B8 @@ -9193,7 +9193,7 @@ lbl_801A618C: /* 801A61A0 001A3100 38 A5 00 AC */ addi r5, r5, 0xac /* 801A61A4 001A3104 81 8C 00 10 */ lwz r12, 0x10(r12) /* 801A61A8 001A3108 7D 89 03 A6 */ mtctr r12 -/* 801A61AC 001A310C 4E 80 04 21 */ bctrl +/* 801A61AC 001A310C 4E 80 04 21 */ bctrl /* 801A61B0 001A3110 3B C0 00 01 */ li r30, 1 /* 801A61B4 001A3114 38 81 00 D4 */ addi r4, r1, 0xd4 lbl_801A61B8: @@ -9222,7 +9222,7 @@ lbl_801A61E8: /* 801A6208 001A3168 81 84 00 00 */ lwz r12, 0(r4) /* 801A620C 001A316C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801A6210 001A3170 7D 89 03 A6 */ mtctr r12 -/* 801A6214 001A3174 4E 80 04 21 */ bctrl +/* 801A6214 001A3174 4E 80 04 21 */ bctrl /* 801A6218 001A3178 3B 9D 0A 8C */ addi r28, r29, 0xa8c /* 801A621C 001A317C 38 81 00 C4 */ addi r4, r1, 0xc4 /* 801A6220 001A3180 7F 83 E3 78 */ mr r3, r28 @@ -9276,7 +9276,7 @@ lbl_801A62B8: /* 801A62D8 001A3238 81 84 00 00 */ lwz r12, 0(r4) /* 801A62DC 001A323C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801A62E0 001A3240 7D 89 03 A6 */ mtctr r12 -/* 801A62E4 001A3244 4E 80 04 21 */ bctrl +/* 801A62E4 001A3244 4E 80 04 21 */ bctrl /* 801A62E8 001A3248 3B 9D 0A A0 */ addi r28, r29, 0xaa0 /* 801A62EC 001A324C 38 81 00 AC */ addi r4, r1, 0xac /* 801A62F0 001A3250 7F 83 E3 78 */ mr r3, r28 @@ -9330,7 +9330,7 @@ lbl_801A6388: /* 801A63A8 001A3308 81 84 00 00 */ lwz r12, 0(r4) /* 801A63AC 001A330C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801A63B0 001A3310 7D 89 03 A6 */ mtctr r12 -/* 801A63B4 001A3314 4E 80 04 21 */ bctrl +/* 801A63B4 001A3314 4E 80 04 21 */ bctrl /* 801A63B8 001A3318 3B 9D 0A B4 */ addi r28, r29, 0xab4 /* 801A63BC 001A331C 38 81 00 94 */ addi r4, r1, 0x94 /* 801A63C0 001A3320 7F 83 E3 78 */ mr r3, r28 @@ -9384,7 +9384,7 @@ lbl_801A6458: /* 801A6478 001A33D8 81 84 00 00 */ lwz r12, 0(r4) /* 801A647C 001A33DC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801A6480 001A33E0 7D 89 03 A6 */ mtctr r12 -/* 801A6484 001A33E4 4E 80 04 21 */ bctrl +/* 801A6484 001A33E4 4E 80 04 21 */ bctrl /* 801A6488 001A33E8 3B 9D 0A C8 */ addi r28, r29, 0xac8 /* 801A648C 001A33EC 38 81 00 7C */ addi r4, r1, 0x7c /* 801A6490 001A33F0 7F 83 E3 78 */ mr r3, r28 @@ -9436,7 +9436,7 @@ lbl_801A6520: /* 801A6540 001A34A0 81 84 00 00 */ lwz r12, 0(r4) /* 801A6544 001A34A4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801A6548 001A34A8 7D 89 03 A6 */ mtctr r12 -/* 801A654C 001A34AC 4E 80 04 21 */ bctrl +/* 801A654C 001A34AC 4E 80 04 21 */ bctrl /* 801A6550 001A34B0 3B 9D 0A DC */ addi r28, r29, 0xadc /* 801A6554 001A34B4 38 81 00 64 */ addi r4, r1, 0x64 /* 801A6558 001A34B8 7F 83 E3 78 */ mr r3, r28 @@ -9576,7 +9576,7 @@ lbl_801A6520: /* 801A6770 001A36D0 81 83 00 00 */ lwz r12, 0(r3) /* 801A6774 001A36D4 81 8C 00 24 */ lwz r12, 0x24(r12) /* 801A6778 001A36D8 7D 89 03 A6 */ mtctr r12 -/* 801A677C 001A36DC 4E 80 04 21 */ bctrl +/* 801A677C 001A36DC 4E 80 04 21 */ bctrl /* 801A6780 001A36E0 80 7D 00 64 */ lwz r3, 0x64(r29) /* 801A6784 001A36E4 38 81 01 04 */ addi r4, r1, 0x104 /* 801A6788 001A36E8 C0 03 00 00 */ lfs f0, 0(r3) @@ -9589,7 +9589,7 @@ lbl_801A6520: /* 801A67A4 001A3704 81 83 00 00 */ lwz r12, 0(r3) /* 801A67A8 001A3708 81 8C 00 24 */ lwz r12, 0x24(r12) /* 801A67AC 001A370C 7D 89 03 A6 */ mtctr r12 -/* 801A67B0 001A3710 4E 80 04 21 */ bctrl +/* 801A67B0 001A3710 4E 80 04 21 */ bctrl /* 801A67B4 001A3714 80 7D 00 64 */ lwz r3, 0x64(r29) /* 801A67B8 001A3718 38 81 00 F8 */ addi r4, r1, 0xf8 /* 801A67BC 001A371C C0 03 00 00 */ lfs f0, 0(r3) @@ -9602,7 +9602,7 @@ lbl_801A6520: /* 801A67D8 001A3738 81 83 00 00 */ lwz r12, 0(r3) /* 801A67DC 001A373C 81 8C 00 24 */ lwz r12, 0x24(r12) /* 801A67E0 001A3740 7D 89 03 A6 */ mtctr r12 -/* 801A67E4 001A3744 4E 80 04 21 */ bctrl +/* 801A67E4 001A3744 4E 80 04 21 */ bctrl /* 801A67E8 001A3748 80 7D 00 64 */ lwz r3, 0x64(r29) /* 801A67EC 001A374C 38 81 00 EC */ addi r4, r1, 0xec /* 801A67F0 001A3750 C0 03 00 00 */ lfs f0, 0(r3) @@ -9615,7 +9615,7 @@ lbl_801A6520: /* 801A680C 001A376C 81 83 00 00 */ lwz r12, 0(r3) /* 801A6810 001A3770 81 8C 00 24 */ lwz r12, 0x24(r12) /* 801A6814 001A3774 7D 89 03 A6 */ mtctr r12 -/* 801A6818 001A3778 4E 80 04 21 */ bctrl +/* 801A6818 001A3778 4E 80 04 21 */ bctrl /* 801A681C 001A377C 80 9D 04 50 */ lwz r4, 0x450(r29) /* 801A6820 001A3780 38 A0 00 01 */ li r5, 1 /* 801A6824 001A3784 7F A3 EB 78 */ mr r3, r29 @@ -9663,7 +9663,7 @@ lbl_801A68A4: /* 801A68B8 001A3818 83 81 01 A0 */ lwz r28, 0x1a0(r1) /* 801A68BC 001A381C 7C 08 03 A6 */ mtlr r0 /* 801A68C0 001A3820 38 21 01 B0 */ addi r1, r1, 0x1b0 -/* 801A68C4 001A3824 4E 80 00 20 */ blr +/* 801A68C4 001A3824 4E 80 00 20 */ blr .global __ct__16CIceSheegothDataFR16CIceSheegothData __ct__16CIceSheegothDataFR16CIceSheegothData: @@ -9917,7 +9917,7 @@ __ct__16CIceSheegothDataFR16CIceSheegothData: /* 801A6CA4 001A3C04 90 03 01 EC */ stw r0, 0x1ec(r3) /* 801A6CA8 001A3C08 88 04 01 F0 */ lbz r0, 0x1f0(r4) /* 801A6CAC 001A3C0C 98 03 01 F0 */ stb r0, 0x1f0(r3) -/* 801A6CB0 001A3C10 4E 80 00 20 */ blr +/* 801A6CB0 001A3C10 4E 80 00 20 */ blr .global __ct__16CIceSheegothDataFR12CInputStreami __ct__16CIceSheegothDataFR12CInputStreami: @@ -10045,7 +10045,7 @@ __ct__16CIceSheegothDataFR12CInputStreami: /* 801A6E98 001A3DF8 80 01 00 24 */ lwz r0, 0x24(r1) /* 801A6E9C 001A3DFC 7C 08 03 A6 */ mtlr r0 /* 801A6EA0 001A3E00 38 21 00 20 */ addi r1, r1, 0x20 -/* 801A6EA4 001A3E04 4E 80 00 20 */ blr +/* 801A6EA4 001A3E04 4E 80 00 20 */ blr .global __sinit_CIceSheegoth_cpp __sinit_CIceSheegoth_cpp: diff --git a/asm/MetroidPrime/Enemies/CJellyZap.s b/asm/MetroidPrime/Enemies/CJellyZap.s index e7e7096c..16417138 100644 --- a/asm/MetroidPrime/Enemies/CJellyZap.s +++ b/asm/MetroidPrime/Enemies/CJellyZap.s @@ -235,7 +235,7 @@ lbl_8046C920: .global lbl_805A9070 lbl_805A9070: .skip 0x8 - + .section .text, "ax" .global __dt__9CJellyZapFv @@ -264,7 +264,7 @@ lbl_801D7960: /* 801D796C 001D48CC 83 C1 00 08 */ lwz r30, 8(r1) /* 801D7970 001D48D0 7C 08 03 A6 */ mtlr r0 /* 801D7974 001D48D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D7978 001D48D8 4E 80 00 20 */ blr +/* 801D7978 001D48D8 4E 80 00 20 */ blr .global KnockBack__9CJellyZapFRC9CVector3fR13CStateManagerRC11CDamageInfo14EKnockBackTypef KnockBack__9CJellyZapFRC9CVector3fR13CStateManagerRC11CDamageInfo14EKnockBackTypef: @@ -303,14 +303,14 @@ KnockBack__9CJellyZapFRC9CVector3fR13CStateManagerRC11CDamageInfo14EKnockBackTyp /* 801D79FC 001D495C 81 9E 00 00 */ lwz r12, 0(r30) /* 801D7A00 001D4960 81 8C 02 90 */ lwz r12, 0x290(r12) /* 801D7A04 001D4964 7D 89 03 A6 */ mtctr r12 -/* 801D7A08 001D4968 4E 80 04 21 */ bctrl +/* 801D7A08 001D4968 4E 80 04 21 */ bctrl lbl_801D7A0C: /* 801D7A0C 001D496C 80 01 00 44 */ lwz r0, 0x44(r1) /* 801D7A10 001D4970 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 801D7A14 001D4974 83 C1 00 38 */ lwz r30, 0x38(r1) /* 801D7A18 001D4978 7C 08 03 A6 */ mtlr r0 /* 801D7A1C 001D497C 38 21 00 40 */ addi r1, r1, 0x40 -/* 801D7A20 001D4980 4E 80 00 20 */ blr +/* 801D7A20 001D4980 4E 80 00 20 */ blr .global ClosestToPlayer__9CJellyZapCFR13CStateManager ClosestToPlayer__9CJellyZapCFR13CStateManager: @@ -428,7 +428,7 @@ lbl_801D7B94: /* 801D7BC8 001D4B28 83 A1 00 34 */ lwz r29, 0x34(r1) /* 801D7BCC 001D4B2C 7C 08 03 A6 */ mtlr r0 /* 801D7BD0 001D4B30 38 21 00 90 */ addi r1, r1, 0x90 -/* 801D7BD4 001D4B34 4E 80 00 20 */ blr +/* 801D7BD4 001D4B34 4E 80 00 20 */ blr .global RemoveSelfFromFishCloud__9CJellyZapFR13CStateManager RemoveSelfFromFishCloud__9CJellyZapFR13CStateManager: @@ -499,7 +499,7 @@ lbl_801D7CA4: /* 801D7CCC 001D4C2C 83 81 00 30 */ lwz r28, 0x30(r1) /* 801D7CD0 001D4C30 7C 08 03 A6 */ mtlr r0 /* 801D7CD4 001D4C34 38 21 00 40 */ addi r1, r1, 0x40 -/* 801D7CD8 001D4C38 4E 80 00 20 */ blr +/* 801D7CD8 001D4C38 4E 80 00 20 */ blr .global AddSelfToFishCloud__9CJellyZapFR13CStateManagerffb AddSelfToFishCloud__9CJellyZapFR13CStateManagerffb: @@ -585,7 +585,7 @@ lbl_801D7DD8: /* 801D7E08 001D4D68 83 81 00 30 */ lwz r28, 0x30(r1) /* 801D7E0C 001D4D6C 7C 08 03 A6 */ mtlr r0 /* 801D7E10 001D4D70 38 21 00 50 */ addi r1, r1, 0x50 -/* 801D7E14 001D4D74 4E 80 00 20 */ blr +/* 801D7E14 001D4D74 4E 80 00 20 */ blr .global AddRepulsor__9CJellyZapFR13CStateManager AddRepulsor__9CJellyZapFR13CStateManager: @@ -599,7 +599,7 @@ AddRepulsor__9CJellyZapFR13CStateManager: /* 801D7E34 001D4D94 80 01 00 14 */ lwz r0, 0x14(r1) /* 801D7E38 001D4D98 7C 08 03 A6 */ mtlr r0 /* 801D7E3C 001D4D9C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D7E40 001D4DA0 4E 80 00 20 */ blr +/* 801D7E40 001D4DA0 4E 80 00 20 */ blr .global RemoveAllAttractors__9CJellyZapFR13CStateManager RemoveAllAttractors__9CJellyZapFR13CStateManager: @@ -610,7 +610,7 @@ RemoveAllAttractors__9CJellyZapFR13CStateManager: /* 801D7E54 001D4DB4 80 01 00 14 */ lwz r0, 0x14(r1) /* 801D7E58 001D4DB8 7C 08 03 A6 */ mtlr r0 /* 801D7E5C 001D4DBC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D7E60 001D4DC0 4E 80 00 20 */ blr +/* 801D7E60 001D4DC0 4E 80 00 20 */ blr .global AddAttractor__9CJellyZapFR13CStateManager AddAttractor__9CJellyZapFR13CStateManager: @@ -636,7 +636,7 @@ AddAttractor__9CJellyZapFR13CStateManager: /* 801D7EB0 001D4E10 83 C1 00 08 */ lwz r30, 8(r1) /* 801D7EB4 001D4E14 7C 08 03 A6 */ mtlr r0 /* 801D7EB8 001D4E18 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D7EBC 001D4E1C 4E 80 00 20 */ blr +/* 801D7EBC 001D4E1C 4E 80 00 20 */ blr .global Flinch__9CJellyZapFR13CStateManager9EStateMsgf Flinch__9CJellyZapFR13CStateManager9EStateMsgf: @@ -684,7 +684,7 @@ lbl_801D7F50: /* 801D7F50 001D4EB0 80 01 00 24 */ lwz r0, 0x24(r1) /* 801D7F54 001D4EB4 7C 08 03 A6 */ mtlr r0 /* 801D7F58 001D4EB8 38 21 00 20 */ addi r1, r1, 0x20 -/* 801D7F5C 001D4EBC 4E 80 00 20 */ blr +/* 801D7F5C 001D4EBC 4E 80 00 20 */ blr .global Attack__9CJellyZapFR13CStateManager9EStateMsgf Attack__9CJellyZapFR13CStateManager9EStateMsgf: @@ -801,7 +801,7 @@ lbl_801D80F4: /* 801D80FC 001D505C 83 C1 00 48 */ lwz r30, 0x48(r1) /* 801D8100 001D5060 7C 08 03 A6 */ mtlr r0 /* 801D8104 001D5064 38 21 00 50 */ addi r1, r1, 0x50 -/* 801D8108 001D5068 4E 80 00 20 */ blr +/* 801D8108 001D5068 4E 80 00 20 */ blr .global GetDamageVulnerability__9CJellyZapCFRC9CVector3fRC9CVector3fRC11CDamageInfo GetDamageVulnerability__9CJellyZapCFRC9CVector3fRC9CVector3fRC11CDamageInfo: @@ -824,7 +824,7 @@ lbl_801D8140: /* 801D8144 001D50A4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801D8148 001D50A8 7C 08 03 A6 */ mtlr r0 /* 801D814C 001D50AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D8150 001D50B0 4E 80 00 20 */ blr +/* 801D8150 001D50B0 4E 80 00 20 */ blr .global GetCollisionResponseType__9CJellyZapCFRC9CVector3fRC9CVector3fRC11CWeaponModei GetCollisionResponseType__9CJellyZapCFRC9CVector3fRC9CVector3fRC11CWeaponModei: @@ -843,7 +843,7 @@ lbl_801D8178: /* 801D8180 001D50E0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801D8184 001D50E4 7C 08 03 A6 */ mtlr r0 /* 801D8188 001D50E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D818C 001D50EC 4E 80 00 20 */ blr +/* 801D818C 001D50EC 4E 80 00 20 */ blr .global sub801d8190__9CJellyZapFv sub801d8190__9CJellyZapFv: @@ -852,7 +852,7 @@ sub801d8190__9CJellyZapFv: /* 801D8198 001D50F8 38 04 FF FF */ addi r0, r4, -1 /* 801D819C 001D50FC 7C 60 03 78 */ or r0, r3, r0 /* 801D81A0 001D5100 54 03 0F FE */ srwi r3, r0, 0x1f -/* 801D81A4 001D5104 4E 80 00 20 */ blr +/* 801D81A4 001D5104 4E 80 00 20 */ blr .global Suck__9CJellyZapFR13CStateManager9EStateMsgf Suck__9CJellyZapFR13CStateManager9EStateMsgf: @@ -1063,7 +1063,7 @@ lbl_801D8490: /* 801D84B0 001D5410 83 81 00 50 */ lwz r28, 0x50(r1) /* 801D84B4 001D5414 7C 08 03 A6 */ mtlr r0 /* 801D84B8 001D5418 38 21 00 80 */ addi r1, r1, 0x80 -/* 801D84BC 001D541C 4E 80 00 20 */ blr +/* 801D84BC 001D541C 4E 80 00 20 */ blr .global Active__9CJellyZapFR13CStateManager9EStateMsgf Active__9CJellyZapFR13CStateManager9EStateMsgf: @@ -1162,7 +1162,7 @@ lbl_801D8610: /* 801D861C 001D557C 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 801D8620 001D5580 7C 08 03 A6 */ mtlr r0 /* 801D8624 001D5584 38 21 00 50 */ addi r1, r1, 0x50 -/* 801D8628 001D5588 4E 80 00 20 */ blr +/* 801D8628 001D5588 4E 80 00 20 */ blr .global InActive__9CJellyZapFR13CStateManager9EStateMsgf InActive__9CJellyZapFR13CStateManager9EStateMsgf: @@ -1195,7 +1195,7 @@ lbl_801D8684: /* 801D868C 001D55EC 83 C1 00 08 */ lwz r30, 8(r1) /* 801D8690 001D55F0 7C 08 03 A6 */ mtlr r0 /* 801D8694 001D55F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D8698 001D55F8 4E 80 00 20 */ blr +/* 801D8698 001D55F8 4E 80 00 20 */ blr .global ShouldAttack__9CJellyZapFR13CStateManagerf ShouldAttack__9CJellyZapFR13CStateManagerf: @@ -1204,7 +1204,7 @@ ShouldAttack__9CJellyZapFR13CStateManagerf: /* 801D86A4 001D5604 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 801D86A8 001D5608 7C 00 00 26 */ mfcr r0 /* 801D86AC 001D560C 54 03 17 FE */ rlwinm r3, r0, 2, 0x1f, 0x1f -/* 801D86B0 001D5610 4E 80 00 20 */ blr +/* 801D86B0 001D5610 4E 80 00 20 */ blr .global ShouldSpecialAttack__9CJellyZapFR13CStateManagerf ShouldSpecialAttack__9CJellyZapFR13CStateManagerf: @@ -1215,7 +1215,7 @@ ShouldSpecialAttack__9CJellyZapFR13CStateManagerf: /* 801D86C4 001D5624 80 01 00 14 */ lwz r0, 0x14(r1) /* 801D86C8 001D5628 7C 08 03 A6 */ mtlr r0 /* 801D86CC 001D562C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D86D0 001D5630 4E 80 00 20 */ blr +/* 801D86D0 001D5630 4E 80 00 20 */ blr .global InAttackPosition__9CJellyZapFR13CStateManagerf InAttackPosition__9CJellyZapFR13CStateManagerf: @@ -1254,7 +1254,7 @@ lbl_801D86F0: /* 801D8750 001D56B0 54 03 0F FE */ srwi r3, r0, 0x1f lbl_801D8754: /* 801D8754 001D56B4 38 21 00 20 */ addi r1, r1, 0x20 -/* 801D8758 001D56B8 4E 80 00 20 */ blr +/* 801D8758 001D56B8 4E 80 00 20 */ blr .global InDetectionRange__9CJellyZapFR13CStateManagerf InDetectionRange__9CJellyZapFR13CStateManagerf: @@ -1273,7 +1273,7 @@ lbl_801D8784: /* 801D8784 001D56E4 80 01 00 14 */ lwz r0, 0x14(r1) /* 801D8788 001D56E8 7C 08 03 A6 */ mtlr r0 /* 801D878C 001D56EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D8790 001D56F0 4E 80 00 20 */ blr +/* 801D8790 001D56F0 4E 80 00 20 */ blr .global DoUserAnimEvent__9CJellyZapFR13CStateManagerRC13CInt32POINode14EUserEventType DoUserAnimEvent__9CJellyZapFR13CStateManagerRC13CInt32POINode14EUserEventType: @@ -1352,7 +1352,7 @@ lbl_801D888C: /* 801D88A4 001D5804 83 81 00 40 */ lwz r28, 0x40(r1) /* 801D88A8 001D5808 7C 08 03 A6 */ mtlr r0 /* 801D88AC 001D580C 38 21 00 60 */ addi r1, r1, 0x60 -/* 801D88B0 001D5810 4E 80 00 20 */ blr +/* 801D88B0 001D5810 4E 80 00 20 */ blr .global AcceptScriptMsg__9CJellyZapF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__9CJellyZapF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -1403,7 +1403,7 @@ lbl_801D8944: /* 801D8950 001D58B0 83 A1 00 14 */ lwz r29, 0x14(r1) /* 801D8954 001D58B4 7C 08 03 A6 */ mtlr r0 /* 801D8958 001D58B8 38 21 00 20 */ addi r1, r1, 0x20 -/* 801D895C 001D58BC 4E 80 00 20 */ blr +/* 801D895C 001D58BC 4E 80 00 20 */ blr .global Think__9CJellyZapFfR13CStateManager Think__9CJellyZapFfR13CStateManager: @@ -1482,7 +1482,7 @@ lbl_801D8A60: /* 801D8A70 001D59D0 83 C1 00 28 */ lwz r30, 0x28(r1) /* 801D8A74 001D59D4 7C 08 03 A6 */ mtlr r0 /* 801D8A78 001D59D8 38 21 00 40 */ addi r1, r1, 0x40 -/* 801D8A7C 001D59DC 4E 80 00 20 */ blr +/* 801D8A7C 001D59DC 4E 80 00 20 */ blr .global Accept__9CJellyZapFR8IVisitor Accept__9CJellyZapFR8IVisitor: @@ -1495,11 +1495,11 @@ Accept__9CJellyZapFR8IVisitor: /* 801D8A98 001D59F8 7C 04 03 78 */ mr r4, r0 /* 801D8A9C 001D59FC 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 801D8AA0 001D5A00 7D 89 03 A6 */ mtctr r12 -/* 801D8AA4 001D5A04 4E 80 04 21 */ bctrl +/* 801D8AA4 001D5A04 4E 80 04 21 */ bctrl /* 801D8AA8 001D5A08 80 01 00 14 */ lwz r0, 0x14(r1) /* 801D8AAC 001D5A0C 7C 08 03 A6 */ mtlr r0 /* 801D8AB0 001D5A10 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D8AB4 001D5A14 4E 80 00 20 */ blr +/* 801D8AB4 001D5A14 4E 80 00 20 */ blr .global "__ct__9CJellyZapF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC11CDamageInfofffffffffffRC14CPatternedInfoRC16CActorParameters" "__ct__9CJellyZapF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC11CDamageInfofffffffffffRC14CPatternedInfoRC16CActorParameters": diff --git a/asm/MetroidPrime/Enemies/CKnockBackController.s b/asm/MetroidPrime/Enemies/CKnockBackController.s index ec7a8cca..781f1855 100644 --- a/asm/MetroidPrime/Enemies/CKnockBackController.s +++ b/asm/MetroidPrime/Enemies/CKnockBackController.s @@ -80,7 +80,7 @@ lbl_80232D08: /* 80232D14 0022FC74 C3 E2 B6 F8 */ lfs f31, lbl_805AD418@sda21(r2) /* 80232D18 0022FC78 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80232D1C 0022FC7C 7D 89 03 A6 */ mtctr r12 -/* 80232D20 0022FC80 4E 80 04 21 */ bctrl +/* 80232D20 0022FC80 4E 80 04 21 */ bctrl /* 80232D24 0022FC84 28 03 00 00 */ cmplwi r3, 0 /* 80232D28 0022FC88 41 82 00 1C */ beq lbl_80232D44 /* 80232D2C 0022FC8C FC 20 F0 90 */ fmr f1, f30 @@ -94,7 +94,7 @@ lbl_80232D44: /* 80232D48 0022FCA8 81 9E 00 00 */ lwz r12, 0(r30) /* 80232D4C 0022FCAC 81 8C 02 BC */ lwz r12, 0x2bc(r12) /* 80232D50 0022FCB0 7D 89 03 A6 */ mtctr r12 -/* 80232D54 0022FCB4 4E 80 04 21 */ bctrl +/* 80232D54 0022FCB4 4E 80 04 21 */ bctrl /* 80232D58 0022FCB8 C0 02 B6 FC */ lfs f0, lbl_805AD41C@sda21(r2) /* 80232D5C 0022FCBC EC 00 07 F2 */ fmuls f0, f0, f31 /* 80232D60 0022FCC0 EC 20 00 72 */ fmuls f1, f0, f1 @@ -185,7 +185,7 @@ lbl_80232D44: /* 80232EB4 0022FE14 90 01 00 A4 */ stw r0, 0xa4(r1) /* 80232EB8 0022FE18 C3 FE 00 E8 */ lfs f31, 0xe8(r30) /* 80232EBC 0022FE1C 7D 89 03 A6 */ mtctr r12 -/* 80232EC0 0022FE20 4E 80 04 21 */ bctrl +/* 80232EC0 0022FE20 4E 80 04 21 */ bctrl /* 80232EC4 0022FE24 FC 40 F8 50 */ fneg f2, f31 /* 80232EC8 0022FE28 C0 02 B7 00 */ lfs f0, lbl_805AD420@sda21(r2) /* 80232ECC 0022FE2C D0 1E 01 50 */ stfs f0, 0x150(r30) @@ -380,7 +380,7 @@ lbl_80233180: /* 80233194 002300F4 80 01 01 54 */ lwz r0, 0x154(r1) /* 80233198 002300F8 7C 08 03 A6 */ mtlr r0 /* 8023319C 002300FC 38 21 01 50 */ addi r1, r1, 0x150 -/* 802331A0 00230100 4E 80 00 20 */ blr +/* 802331A0 00230100 4E 80 00 20 */ blr .global DoDeferredKnockBack__20CKnockBackControllerFR13CStateManagerR10CPatterned DoDeferredKnockBack__20CKnockBackControllerFR13CStateManagerR10CPatterned: @@ -422,7 +422,7 @@ DoDeferredKnockBack__20CKnockBackControllerFR13CStateManagerR10CPatterned: /* 80233230 00230190 81 9F 00 00 */ lwz r12, 0(r31) /* 80233234 00230194 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80233238 00230198 7D 89 03 A6 */ mtctr r12 -/* 8023323C 0023019C 4E 80 04 21 */ bctrl +/* 8023323C 0023019C 4E 80 04 21 */ bctrl /* 80233240 002301A0 28 03 00 00 */ cmplwi r3, 0 /* 80233244 002301A4 41 82 00 FC */ beq lbl_80233340 /* 80233248 002301A8 C0 5F 00 58 */ lfs f2, 0x58(r31) @@ -482,7 +482,7 @@ DoDeferredKnockBack__20CKnockBackControllerFR13CStateManagerR10CPatterned: /* 80233320 00230280 54 08 D7 FE */ rlwinm r8, r0, 0x1a, 0x1f, 0x1f /* 80233324 00230284 99 21 00 0C */ stb r9, 0xc(r1) /* 80233328 00230288 7D 89 03 A6 */ mtctr r12 -/* 8023332C 0023028C 4E 80 04 21 */ bctrl +/* 8023332C 0023028C 4E 80 04 21 */ bctrl /* 80233330 00230290 88 1D 00 82 */ lbz r0, 0x82(r29) /* 80233334 00230294 38 60 00 00 */ li r3, 0 /* 80233338 00230298 50 60 36 72 */ rlwimi r0, r3, 6, 0x19, 0x19 @@ -508,7 +508,7 @@ lbl_80233340: /* 80233384 002302E4 80 01 00 54 */ lwz r0, 0x54(r1) /* 80233388 002302E8 7C 08 03 A6 */ mtlr r0 /* 8023338C 002302EC 38 21 00 50 */ addi r1, r1, 0x50 -/* 80233390 002302F0 4E 80 00 20 */ blr +/* 80233390 002302F0 4E 80 00 20 */ blr .global ApplyImpulse__20CKnockBackControllerFfR10CPatterned ApplyImpulse__20CKnockBackControllerFfR10CPatterned: @@ -605,7 +605,7 @@ lbl_802334E0: /* 802334F0 00230450 83 C1 00 48 */ lwz r30, 0x48(r1) /* 802334F4 00230454 7C 08 03 A6 */ mtlr r0 /* 802334F8 00230458 38 21 00 60 */ addi r1, r1, 0x60 -/* 802334FC 0023045C 4E 80 00 20 */ blr +/* 802334FC 0023045C 4E 80 00 20 */ blr .global ResetKnockBackImpulse__20CKnockBackControllerFR10CPatternedRC9CVector3ff ResetKnockBackImpulse__20CKnockBackControllerFR10CPatternedRC9CVector3ff: @@ -693,7 +693,7 @@ lbl_8023361C: /* 80233630 00230590 83 A1 00 34 */ lwz r29, 0x34(r1) /* 80233634 00230594 7C 08 03 A6 */ mtlr r0 /* 80233638 00230598 38 21 00 50 */ addi r1, r1, 0x50 -/* 8023363C 0023059C 4E 80 00 20 */ blr +/* 8023363C 0023059C 4E 80 00 20 */ blr .global TickDeferredTimer__20CKnockBackControllerFf TickDeferredTimer__20CKnockBackControllerFf: @@ -709,10 +709,10 @@ TickDeferredTimer__20CKnockBackControllerFf: /* 80233664 002305C4 4C 40 13 82 */ cror 2, 0, 2 /* 80233668 002305C8 7C 00 00 26 */ mfcr r0 /* 8023366C 002305CC 54 03 1F FE */ rlwinm r3, r0, 3, 0x1f, 0x1f -/* 80233670 002305D0 4E 80 00 20 */ blr +/* 80233670 002305D0 4E 80 00 20 */ blr lbl_80233674: /* 80233674 002305D4 38 60 00 00 */ li r3, 0 -/* 80233678 002305D8 4E 80 00 20 */ blr +/* 80233678 002305D8 4E 80 00 20 */ blr .global ValidateState__20CKnockBackControllerFR10CPatterned ValidateState__20CKnockBackControllerFR10CPatterned: @@ -843,7 +843,7 @@ lbl_8023382C: /* 80233848 002307A8 38 63 81 50 */ addi r3, r3, lbl_803E8150@l /* 8023384C 002307AC 7C 03 00 2E */ lwzx r0, r3, r0 /* 80233850 002307B0 7C 09 03 A6 */ mtctr r0 -/* 80233854 002307B4 4E 80 04 20 */ bctr +/* 80233854 002307B4 4E 80 04 20 */ bctr .global lbl_80233858 lbl_80233858: /* 80233858 002307B8 88 1E 00 81 */ lbz r0, 0x81(r30) @@ -914,7 +914,7 @@ lbl_80233914: /* 80233920 00230880 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80233924 00230884 7C 08 03 A6 */ mtlr r0 /* 80233928 00230888 38 21 00 20 */ addi r1, r1, 0x20 -/* 8023392C 0023088C 4E 80 00 20 */ blr +/* 8023392C 0023088C 4E 80 00 20 */ blr .global CalculateExtraHurlVelocity__20CKnockBackControllerFR13CStateManagerff CalculateExtraHurlVelocity__20CKnockBackControllerFR13CStateManagerff: @@ -947,7 +947,7 @@ lbl_80233984: /* 80233994 002308F4 CB C1 00 10 */ lfd f30, 0x10(r1) /* 80233998 002308F8 7C 08 03 A6 */ mtlr r0 /* 8023399C 002308FC 38 21 00 30 */ addi r1, r1, 0x30 -/* 802339A0 00230900 4E 80 00 20 */ blr +/* 802339A0 00230900 4E 80 00 20 */ blr .global GetKnockBackCharacterState__20CKnockBackControllerFR10CPatterned GetKnockBackCharacterState__20CKnockBackControllerFR10CPatterned: @@ -958,15 +958,15 @@ GetKnockBackCharacterState__20CKnockBackControllerFR10CPatterned: /* 802339B4 00230914 88 04 04 00 */ lbz r0, 0x400(r4) /* 802339B8 00230918 38 60 00 03 */ li r3, 3 /* 802339BC 0023091C 54 00 D7 FF */ rlwinm. r0, r0, 0x1a, 0x1f, 0x1f -/* 802339C0 00230920 4D 82 00 20 */ beqlr +/* 802339C0 00230920 4D 82 00 20 */ beqlr /* 802339C4 00230924 38 60 00 02 */ li r3, 2 -/* 802339C8 00230928 4E 80 00 20 */ blr +/* 802339C8 00230928 4E 80 00 20 */ blr lbl_802339CC: /* 802339CC 0023092C 88 04 04 00 */ lbz r0, 0x400(r4) /* 802339D0 00230930 54 00 D7 FE */ rlwinm r0, r0, 0x1a, 0x1f, 0x1f /* 802339D4 00230934 7C 00 00 34 */ cntlzw r0, r0 /* 802339D8 00230938 54 03 D9 7E */ srwi r3, r0, 5 -/* 802339DC 0023093C 4E 80 00 20 */ blr +/* 802339DC 0023093C 4E 80 00 20 */ blr .global GetKnockBackWeaponType__20CKnockBackControllerFRC11CDamageInfo11EWeaponType14EKnockBackType GetKnockBackWeaponType__20CKnockBackControllerFRC11CDamageInfo11EWeaponType14EKnockBackType: @@ -983,53 +983,53 @@ lbl_802339FC: /* 80233A04 00230964 38 E0 00 02 */ li r7, 2 lbl_80233A08: /* 80233A08 00230968 28 05 00 08 */ cmplwi r5, 8 -/* 80233A0C 0023096C 4D 81 00 20 */ bgtlr +/* 80233A0C 0023096C 4D 81 00 20 */ bgtlr /* 80233A10 00230970 3C 80 80 3F */ lis r4, lbl_803E8178@ha /* 80233A14 00230974 54 A0 10 3A */ slwi r0, r5, 2 /* 80233A18 00230978 38 84 81 78 */ addi r4, r4, lbl_803E8178@l /* 80233A1C 0023097C 7C 04 00 2E */ lwzx r0, r4, r0 /* 80233A20 00230980 7C 09 03 A6 */ mtctr r0 -/* 80233A24 00230984 4E 80 04 20 */ bctr +/* 80233A24 00230984 4E 80 04 20 */ bctr .global lbl_80233A28 lbl_80233A28: /* 80233A28 00230988 54 C0 06 3F */ clrlwi. r0, r6, 0x18 /* 80233A2C 0023098C 7C E3 3B 78 */ mr r3, r7 -/* 80233A30 00230990 4C 82 00 20 */ bnelr +/* 80233A30 00230990 4C 82 00 20 */ bnelr /* 80233A34 00230994 38 67 00 01 */ addi r3, r7, 1 -/* 80233A38 00230998 4E 80 00 20 */ blr +/* 80233A38 00230998 4E 80 00 20 */ blr .global lbl_80233A3C lbl_80233A3C: /* 80233A3C 0023099C 54 C0 06 3F */ clrlwi. r0, r6, 0x18 /* 80233A40 002309A0 38 67 00 08 */ addi r3, r7, 8 -/* 80233A44 002309A4 4C 82 00 20 */ bnelr +/* 80233A44 002309A4 4C 82 00 20 */ bnelr /* 80233A48 002309A8 38 63 00 01 */ addi r3, r3, 1 -/* 80233A4C 002309AC 4E 80 00 20 */ blr +/* 80233A4C 002309AC 4E 80 00 20 */ blr .global lbl_80233A50 lbl_80233A50: /* 80233A50 002309B0 38 67 00 04 */ addi r3, r7, 4 -/* 80233A54 002309B4 4E 80 00 20 */ blr +/* 80233A54 002309B4 4E 80 00 20 */ blr .global lbl_80233A58 lbl_80233A58: /* 80233A58 002309B8 38 67 00 0C */ addi r3, r7, 0xc -/* 80233A5C 002309BC 4E 80 00 20 */ blr +/* 80233A5C 002309BC 4E 80 00 20 */ blr .global lbl_80233A60 lbl_80233A60: /* 80233A60 002309C0 38 60 00 10 */ li r3, 0x10 -/* 80233A64 002309C4 4E 80 00 20 */ blr +/* 80233A64 002309C4 4E 80 00 20 */ blr .global lbl_80233A68 lbl_80233A68: /* 80233A68 002309C8 38 60 00 11 */ li r3, 0x11 -/* 80233A6C 002309CC 4E 80 00 20 */ blr +/* 80233A6C 002309CC 4E 80 00 20 */ blr .global lbl_80233A70 lbl_80233A70: /* 80233A70 002309D0 38 60 00 0F */ li r3, 0xf -/* 80233A74 002309D4 4E 80 00 20 */ blr +/* 80233A74 002309D4 4E 80 00 20 */ blr .global lbl_80233A78 lbl_80233A78: /* 80233A78 002309D8 38 60 00 12 */ li r3, 0x12 .global lbl_80233A7C lbl_80233A7C: -/* 80233A7C 002309DC 4E 80 00 20 */ blr +/* 80233A7C 002309DC 4E 80 00 20 */ blr .global SelectDamageState__20CKnockBackControllerFR10CPatternedRC11CDamageInfo11EWeaponType14EKnockBackType SelectDamageState__20CKnockBackControllerFR10CPatternedRC11CDamageInfo11EWeaponType14EKnockBackType: @@ -1087,7 +1087,7 @@ lbl_80233B3C: /* 80233B48 00230AA8 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80233B4C 00230AAC 7C 08 03 A6 */ mtlr r0 /* 80233B50 00230AB0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80233B54 00230AB4 4E 80 00 20 */ blr +/* 80233B54 00230AB4 4E 80 00 20 */ blr .global Update__20CKnockBackControllerFfR13CStateManagerR10CPatterned Update__20CKnockBackControllerFfR13CStateManagerR10CPatterned: @@ -1146,7 +1146,7 @@ lbl_80233C0C: /* 80233C20 00230B80 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80233C24 00230B84 7C 08 03 A6 */ mtlr r0 /* 80233C28 00230B88 38 21 00 30 */ addi r1, r1, 0x30 -/* 80233C2C 00230B8C 4E 80 00 20 */ blr +/* 80233C2C 00230B8C 4E 80 00 20 */ blr .global KnockBack__C20CKnockBackControllerFRC9CVector3fR13CStateManagerR10CPatternedRC11CDamageInfo14EKnockBackTypef KnockBack__C20CKnockBackControllerFRC9CVector3fR13CStateManagerR10CPatternedRC11CDamageInfo14EKnockBackTypef: @@ -1213,31 +1213,31 @@ lbl_80233D0C: /* 80233D18 00230C78 80 01 00 54 */ lwz r0, 0x54(r1) /* 80233D1C 00230C7C 7C 08 03 A6 */ mtlr r0 /* 80233D20 00230C80 38 21 00 50 */ addi r1, r1, 0x50 -/* 80233D24 00230C84 4E 80 00 20 */ blr +/* 80233D24 00230C84 4E 80 00 20 */ blr .global SetKnockBackVariant__20CKnockBackControllerF17EKnockBackVariant SetKnockBackVariant__20CKnockBackControllerF17EKnockBackVariant: /* 80233D28 00230C88 90 83 00 00 */ stw r4, 0(r3) -/* 80233D2C 00230C8C 4E 80 00 20 */ blr +/* 80233D2C 00230C8C 4E 80 00 20 */ blr .global DeferKnockBack__20CKnockBackControllerF11EWeaponType DeferKnockBack__20CKnockBackControllerF11EWeaponType: /* 80233D30 00230C90 90 83 00 14 */ stw r4, 0x14(r3) /* 80233D34 00230C94 C0 02 B7 18 */ lfs f0, lbl_805AD438@sda21(r2) /* 80233D38 00230C98 D0 03 00 68 */ stfs f0, 0x68(r3) -/* 80233D3C 00230C9C 4E 80 00 20 */ blr +/* 80233D3C 00230C9C 4E 80 00 20 */ blr .global sub_80233d40 sub_80233d40: /* 80233D40 00230CA0 2C 04 00 00 */ cmpwi r4, 0 -/* 80233D44 00230CA4 4D 80 00 20 */ bltlr +/* 80233D44 00230CA4 4D 80 00 20 */ bltlr /* 80233D48 00230CA8 2C 04 00 04 */ cmpwi r4, 4 -/* 80233D4C 00230CAC 4D 81 00 20 */ bgtlr +/* 80233D4C 00230CAC 4D 81 00 20 */ bgtlr /* 80233D50 00230CB0 54 80 18 38 */ slwi r0, r4, 3 /* 80233D54 00230CB4 7C 63 02 14 */ add r3, r3, r0 /* 80233D58 00230CB8 D0 23 00 28 */ stfs f1, 0x28(r3) /* 80233D5C 00230CBC D0 43 00 2C */ stfs f2, 0x2c(r3) -/* 80233D60 00230CC0 4E 80 00 20 */ blr +/* 80233D60 00230CC0 4E 80 00 20 */ blr .global SetAutoResetImpulse__20CKnockBackControllerFb SetAutoResetImpulse__20CKnockBackControllerFb: @@ -1246,22 +1246,22 @@ SetAutoResetImpulse__20CKnockBackControllerFb: /* 80233D6C 00230CCC 98 03 00 81 */ stb r0, 0x81(r3) /* 80233D70 00230CD0 88 03 00 81 */ lbz r0, 0x81(r3) /* 80233D74 00230CD4 54 00 CF FF */ rlwinm. r0, r0, 0x19, 0x1f, 0x1f -/* 80233D78 00230CD8 4C 82 00 20 */ bnelr +/* 80233D78 00230CD8 4C 82 00 20 */ bnelr /* 80233D7C 00230CDC C0 02 B7 00 */ lfs f0, lbl_805AD420@sda21(r2) /* 80233D80 00230CE0 D0 03 00 5C */ stfs f0, 0x5c(r3) /* 80233D84 00230CE4 D0 03 00 60 */ stfs f0, 0x60(r3) -/* 80233D88 00230CE8 4E 80 00 20 */ blr +/* 80233D88 00230CE8 4E 80 00 20 */ blr .global SetImpulseDurationIdx__20CKnockBackControllerFi SetImpulseDurationIdx__20CKnockBackControllerFi: /* 80233D8C 00230CEC 90 83 00 20 */ stw r4, 0x20(r3) -/* 80233D90 00230CF0 4E 80 00 20 */ blr +/* 80233D90 00230CF0 4E 80 00 20 */ blr .global SetAnimationStateRange__20CKnockBackControllerF24EKnockBackAnimationState24EKnockBackAnimationState SetAnimationStateRange__20CKnockBackControllerF24EKnockBackAnimationState24EKnockBackAnimationState: /* 80233D94 00230CF4 90 83 00 18 */ stw r4, 0x18(r3) /* 80233D98 00230CF8 90 A3 00 1C */ stw r5, 0x1c(r3) -/* 80233D9C 00230CFC 4E 80 00 20 */ blr +/* 80233D9C 00230CFC 4E 80 00 20 */ blr .global TestAvailableState__20CKnockBackControllerCFi TestAvailableState__20CKnockBackControllerCFi: @@ -1273,7 +1273,7 @@ TestAvailableState__20CKnockBackControllerCFi: /* 80233DB4 00230D14 7C 03 00 D0 */ neg r0, r3 /* 80233DB8 00230D18 7C 00 1B 78 */ or r0, r0, r3 /* 80233DBC 00230D1C 54 03 0F FE */ srwi r3, r0, 0x1f -/* 80233DC0 00230D20 4E 80 00 20 */ blr +/* 80233DC0 00230D20 4E 80 00 20 */ blr .global SetAvailableState__20CKnockBackControllerFib SetAvailableState__20CKnockBackControllerFib: @@ -1285,12 +1285,12 @@ SetAvailableState__20CKnockBackControllerFib: /* 80233DD8 00230D38 88 03 00 80 */ lbz r0, 0x80(r3) /* 80233DDC 00230D3C 7C 00 23 78 */ or r0, r0, r4 /* 80233DE0 00230D40 98 03 00 80 */ stb r0, 0x80(r3) -/* 80233DE4 00230D44 4E 80 00 20 */ blr +/* 80233DE4 00230D44 4E 80 00 20 */ blr lbl_80233DE8: /* 80233DE8 00230D48 88 03 00 80 */ lbz r0, 0x80(r3) /* 80233DEC 00230D4C 7C 00 20 78 */ andc r0, r0, r4 /* 80233DF0 00230D50 98 03 00 80 */ stb r0, 0x80(r3) -/* 80233DF4 00230D54 4E 80 00 20 */ blr +/* 80233DF4 00230D54 4E 80 00 20 */ blr .global __ct__20CKnockBackController2F17EKnockBackVariant __ct__20CKnockBackController2F17EKnockBackVariant: diff --git a/asm/MetroidPrime/Enemies/CMagdolite.s b/asm/MetroidPrime/Enemies/CMagdolite.s index b64a1ff8..8994ffdc 100644 --- a/asm/MetroidPrime/Enemies/CMagdolite.s +++ b/asm/MetroidPrime/Enemies/CMagdolite.s @@ -435,7 +435,7 @@ lbl_8023478C: /* 80234798 002316F8 83 C1 00 08 */ lwz r30, 8(r1) /* 8023479C 002316FC 7C 08 03 A6 */ mtlr r0 /* 802347A0 00231700 38 21 00 10 */ addi r1, r1, 0x10 -/* 802347A4 00231704 4E 80 00 20 */ blr +/* 802347A4 00231704 4E 80 00 20 */ blr .global sub_802347a8 sub_802347a8: @@ -466,7 +466,7 @@ sub_802347a8: /* 80234808 00231768 81 9E 00 00 */ lwz r12, 0(r30) /* 8023480C 0023176C 81 8C 02 B0 */ lwz r12, 0x2b0(r12) /* 80234810 00231770 7D 89 03 A6 */ mtctr r12 -/* 80234814 00231774 4E 80 04 21 */ bctrl +/* 80234814 00231774 4E 80 04 21 */ bctrl /* 80234818 00231778 80 81 00 48 */ lwz r4, 0x48(r1) /* 8023481C 0023177C 38 BE 06 A0 */ addi r5, r30, 0x6a0 /* 80234820 00231780 88 61 00 4C */ lbz r3, 0x4c(r1) @@ -564,7 +564,7 @@ lbl_80234970: /* 8023497C 002318DC 83 A1 00 84 */ lwz r29, 0x84(r1) /* 80234980 002318E0 7C 08 03 A6 */ mtlr r0 /* 80234984 002318E4 38 21 00 90 */ addi r1, r1, 0x90 -/* 80234988 002318E8 4E 80 00 20 */ blr +/* 80234988 002318E8 4E 80 00 20 */ blr .global FluidFXThink__10CMagdoliteFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager FluidFXThink__10CMagdoliteFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager: @@ -617,7 +617,7 @@ FluidFXThink__10CMagdoliteFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager /* 80234A44 002319A4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80234A48 002319A8 B0 01 00 08 */ sth r0, 8(r1) /* 80234A4C 002319AC 7D 89 03 A6 */ mtctr r12 -/* 80234A50 002319B0 4E 80 04 21 */ bctrl +/* 80234A50 002319B0 4E 80 04 21 */ bctrl lbl_80234A54: /* 80234A54 002319B4 80 01 00 64 */ lwz r0, 0x64(r1) /* 80234A58 002319B8 83 E1 00 5C */ lwz r31, 0x5c(r1) @@ -625,7 +625,7 @@ lbl_80234A54: /* 80234A60 002319C0 83 A1 00 54 */ lwz r29, 0x54(r1) /* 80234A64 002319C4 7C 08 03 A6 */ mtlr r0 /* 80234A68 002319C8 38 21 00 60 */ addi r1, r1, 0x60 -/* 80234A6C 002319CC 4E 80 00 20 */ blr +/* 80234A6C 002319CC 4E 80 00 20 */ blr .global sub_80234a70 sub_80234a70: @@ -676,7 +676,7 @@ lbl_80234B04: /* 80234B10 00231A70 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80234B14 00231A74 7C 08 03 A6 */ mtlr r0 /* 80234B18 00231A78 38 21 00 20 */ addi r1, r1, 0x20 -/* 80234B1C 00231A7C 4E 80 00 20 */ blr +/* 80234B1C 00231A7C 4E 80 00 20 */ blr .global sub_80234b20 sub_80234b20: @@ -761,7 +761,7 @@ lbl_80234C3C: /* 80234C4C 00231BAC 83 81 00 50 */ lwz r28, 0x50(r1) /* 80234C50 00231BB0 7C 08 03 A6 */ mtlr r0 /* 80234C54 00231BB4 38 21 00 60 */ addi r1, r1, 0x60 -/* 80234C58 00231BB8 4E 80 00 20 */ blr +/* 80234C58 00231BB8 4E 80 00 20 */ blr .global SelectTarget__10CMagdoliteFR13CStateManager9EStateMsgf SelectTarget__10CMagdoliteFR13CStateManager9EStateMsgf: @@ -828,7 +828,7 @@ lbl_80234D38: /* 80234D40 00231CA0 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80234D44 00231CA4 7C 08 03 A6 */ mtlr r0 /* 80234D48 00231CA8 38 21 00 30 */ addi r1, r1, 0x30 -/* 80234D4C 00231CAC 4E 80 00 20 */ blr +/* 80234D4C 00231CAC 4E 80 00 20 */ blr .global HasAttackPattern__10CMagdoliteFR13CStateManagerf HasAttackPattern__10CMagdoliteFR13CStateManagerf: @@ -850,7 +850,7 @@ HasAttackPattern__10CMagdoliteFR13CStateManagerf: /* 80234D8C 00231CEC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80234D90 00231CF0 7C 08 03 A6 */ mtlr r0 /* 80234D94 00231CF4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80234D98 00231CF8 4E 80 00 20 */ blr +/* 80234D98 00231CF8 4E 80 00 20 */ blr .global sub_80234d9c sub_80234d9c: @@ -1023,7 +1023,7 @@ lbl_80234FDC: /* 8023500C 00231F6C 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 80235010 00231F70 7C 08 03 A6 */ mtlr r0 /* 80235014 00231F74 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 80235018 00231F78 4E 80 00 20 */ blr +/* 80235018 00231F78 4E 80 00 20 */ blr .global InAttackPosition__10CMagdoliteFR13CStateManagerf InAttackPosition__10CMagdoliteFR13CStateManagerf: @@ -1062,7 +1062,7 @@ InAttackPosition__10CMagdoliteFR13CStateManagerf: /* 8023509C 00231FFC 81 84 00 00 */ lwz r12, 0(r4) /* 802350A0 00232000 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 802350A4 00232004 7D 89 03 A6 */ mtctr r12 -/* 802350A8 00232008 4E 80 04 21 */ bctrl +/* 802350A8 00232008 4E 80 04 21 */ bctrl /* 802350AC 0023200C C0 61 00 10 */ lfs f3, 0x10(r1) /* 802350B0 00232010 C0 41 00 08 */ lfs f2, 8(r1) /* 802350B4 00232014 C0 21 00 0C */ lfs f1, 0xc(r1) @@ -1127,7 +1127,7 @@ lbl_8023516C: /* 80235194 002320F4 83 C1 00 68 */ lwz r30, 0x68(r1) /* 80235198 002320F8 7C 08 03 A6 */ mtlr r0 /* 8023519C 002320FC 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 802351A0 00232100 4E 80 00 20 */ blr +/* 802351A0 00232100 4E 80 00 20 */ blr .global LineOfSight__10CMagdoliteFR13CStateManagerf LineOfSight__10CMagdoliteFR13CStateManagerf: @@ -1248,7 +1248,7 @@ lbl_80235348: /* 80235364 002322C4 80 01 00 F4 */ lwz r0, 0xf4(r1) /* 80235368 002322C8 7C 08 03 A6 */ mtlr r0 /* 8023536C 002322CC 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 80235370 002322D0 4E 80 00 20 */ blr +/* 80235370 002322D0 4E 80 00 20 */ blr .global Leash__10CMagdoliteFR13CStateManagerf Leash__10CMagdoliteFR13CStateManagerf: @@ -1280,17 +1280,17 @@ Leash__10CMagdoliteFR13CStateManagerf: /* 802353D8 00232338 7C 00 00 26 */ mfcr r0 /* 802353DC 0023233C 54 03 0F FE */ srwi r3, r0, 0x1f /* 802353E0 00232340 38 21 00 20 */ addi r1, r1, 0x20 -/* 802353E4 00232344 4E 80 00 20 */ blr +/* 802353E4 00232344 4E 80 00 20 */ blr .global ShouldRetreat__10CMagdoliteFR13CStateManagerf ShouldRetreat__10CMagdoliteFR13CStateManagerf: /* 802353E8 00232348 88 03 07 54 */ lbz r0, 0x754(r3) /* 802353EC 0023234C 54 03 CF FE */ rlwinm r3, r0, 0x19, 0x1f, 0x1f -/* 802353F0 00232350 4E 80 00 20 */ blr +/* 802353F0 00232350 4E 80 00 20 */ blr .global Touch__10CMagdoliteFR6CActorR13CStateManager Touch__10CMagdoliteFR6CActorR13CStateManager: -/* 802353F4 00232354 4E 80 00 20 */ blr +/* 802353F4 00232354 4E 80 00 20 */ blr .global Death__10CMagdoliteFRC9CVector3fR13CStateManager Death__10CMagdoliteFRC9CVector3fR13CStateManager: @@ -1389,7 +1389,7 @@ lbl_8023554C: /* 8023555C 002324BC 83 81 00 80 */ lwz r28, 0x80(r1) /* 80235560 002324C0 7C 08 03 A6 */ mtlr r0 /* 80235564 002324C4 38 21 00 90 */ addi r1, r1, 0x90 -/* 80235568 002324C8 4E 80 00 20 */ blr +/* 80235568 002324C8 4E 80 00 20 */ blr .global Deactivate__10CMagdoliteFR13CStateManager9EStateMsgf Deactivate__10CMagdoliteFR13CStateManager9EStateMsgf: @@ -1447,7 +1447,7 @@ lbl_80235620: /* 80235624 00232584 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80235628 00232588 7C 08 03 A6 */ mtlr r0 /* 8023562C 0023258C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80235630 00232590 4E 80 00 20 */ blr +/* 80235630 00232590 4E 80 00 20 */ blr .global GetUp__10CMagdoliteFR13CStateManager9EStateMsgf GetUp__10CMagdoliteFR13CStateManager9EStateMsgf: @@ -1530,7 +1530,7 @@ lbl_80235744: /* 80235748 002326A8 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8023574C 002326AC 7C 08 03 A6 */ mtlr r0 /* 80235750 002326B0 38 21 00 30 */ addi r1, r1, 0x30 -/* 80235754 002326B4 4E 80 00 20 */ blr +/* 80235754 002326B4 4E 80 00 20 */ blr .global Generate__10CMagdoliteFR13CStateManager9EStateMsgf Generate__10CMagdoliteFR13CStateManager9EStateMsgf: @@ -1585,7 +1585,7 @@ lbl_80235800: /* 80235804 00232764 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80235808 00232768 7C 08 03 A6 */ mtlr r0 /* 8023580C 0023276C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80235810 00232770 4E 80 00 20 */ blr +/* 80235810 00232770 4E 80 00 20 */ blr .global Retreat__10CMagdoliteFR13CStateManager9EStateMsgf Retreat__10CMagdoliteFR13CStateManager9EStateMsgf: @@ -1665,7 +1665,7 @@ lbl_8023591C: /* 80235920 00232880 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 80235924 00232884 7C 08 03 A6 */ mtlr r0 /* 80235928 00232888 38 21 00 30 */ addi r1, r1, 0x30 -/* 8023592C 0023288C 4E 80 00 20 */ blr +/* 8023592C 0023288C 4E 80 00 20 */ blr .global Flinch__10CMagdoliteFR13CStateManager9EStateMsgf Flinch__10CMagdoliteFR13CStateManager9EStateMsgf: @@ -1715,7 +1715,7 @@ lbl_802359C8: /* 802359C8 00232928 80 01 00 24 */ lwz r0, 0x24(r1) /* 802359CC 0023292C 7C 08 03 A6 */ mtlr r0 /* 802359D0 00232930 38 21 00 20 */ addi r1, r1, 0x20 -/* 802359D4 00232934 4E 80 00 20 */ blr +/* 802359D4 00232934 4E 80 00 20 */ blr .global ProjectileAttack__10CMagdoliteFR13CStateManager9EStateMsgf ProjectileAttack__10CMagdoliteFR13CStateManager9EStateMsgf: @@ -1760,7 +1760,7 @@ lbl_80235A60: /* 80235A64 002329C4 C0 22 B7 20 */ lfs f1, lbl_805AD440@sda21(r2) /* 80235A68 002329C8 81 8C 01 9C */ lwz r12, 0x19c(r12) /* 80235A6C 002329CC 7D 89 03 A6 */ mtctr r12 -/* 80235A70 002329D0 4E 80 04 21 */ bctrl +/* 80235A70 002329D0 4E 80 04 21 */ bctrl /* 80235A74 002329D4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80235A78 002329D8 41 82 00 40 */ beq lbl_80235AB8 /* 80235A7C 002329DC 3C 80 80 3F */ lis r4, lbl_803E81E0@ha @@ -1826,7 +1826,7 @@ lbl_80235B54: /* 80235B5C 00232ABC 83 C1 00 38 */ lwz r30, 0x38(r1) /* 80235B60 00232AC0 7C 08 03 A6 */ mtlr r0 /* 80235B64 00232AC4 38 21 00 40 */ addi r1, r1, 0x40 -/* 80235B68 00232AC8 4E 80 00 20 */ blr +/* 80235B68 00232AC8 4E 80 00 20 */ blr .global Attack__10CMagdoliteFR13CStateManager9EStateMsgf Attack__10CMagdoliteFR13CStateManager9EStateMsgf: @@ -2081,7 +2081,7 @@ lbl_80235F0C: /* 80235F1C 00232E7C 83 C1 00 D8 */ lwz r30, 0xd8(r1) /* 80235F20 00232E80 7C 08 03 A6 */ mtlr r0 /* 80235F24 00232E84 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 80235F28 00232E88 4E 80 00 20 */ blr +/* 80235F28 00232E88 4E 80 00 20 */ blr .global Taunt__10CMagdoliteFR13CStateManager9EStateMsgf Taunt__10CMagdoliteFR13CStateManager9EStateMsgf: @@ -2130,7 +2130,7 @@ lbl_80235FC0: /* 80235FC0 00232F20 80 01 00 24 */ lwz r0, 0x24(r1) /* 80235FC4 00232F24 7C 08 03 A6 */ mtlr r0 /* 80235FC8 00232F28 38 21 00 20 */ addi r1, r1, 0x20 -/* 80235FCC 00232F2C 4E 80 00 20 */ blr +/* 80235FCC 00232F2C 4E 80 00 20 */ blr .global Active__10CMagdoliteFR13CStateManager9EStateMsgf Active__10CMagdoliteFR13CStateManager9EStateMsgf: @@ -2254,7 +2254,7 @@ lbl_80236180: /* 80236190 002330F0 83 C1 00 68 */ lwz r30, 0x68(r1) /* 80236194 002330F4 7C 08 03 A6 */ mtlr r0 /* 80236198 002330F8 38 21 00 80 */ addi r1, r1, 0x80 -/* 8023619C 002330FC 4E 80 00 20 */ blr +/* 8023619C 002330FC 4E 80 00 20 */ blr .global Lurk__10CMagdoliteFR13CStateManager9EStateMsgf Lurk__10CMagdoliteFR13CStateManager9EStateMsgf: @@ -2301,7 +2301,7 @@ lbl_80236228: /* 80236230 00233190 83 C1 00 08 */ lwz r30, 8(r1) /* 80236234 00233194 7C 08 03 A6 */ mtlr r0 /* 80236238 00233198 38 21 00 10 */ addi r1, r1, 0x10 -/* 8023623C 0023319C 4E 80 00 20 */ blr +/* 8023623C 0023319C 4E 80 00 20 */ blr .global InActive__10CMagdoliteFR13CStateManager9EStateMsgf InActive__10CMagdoliteFR13CStateManager9EStateMsgf: @@ -2358,7 +2358,7 @@ lbl_802362F0: /* 802362F8 00233258 83 C1 00 08 */ lwz r30, 8(r1) /* 802362FC 0023325C 7C 08 03 A6 */ mtlr r0 /* 80236300 00233260 38 21 00 10 */ addi r1, r1, 0x10 -/* 80236304 00233264 4E 80 00 20 */ blr +/* 80236304 00233264 4E 80 00 20 */ blr .global sub_80236308 sub_80236308: @@ -2458,7 +2458,7 @@ lbl_802363F0: /* 80236478 002333D8 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 8023647C 002333DC 7C 08 03 A6 */ mtlr r0 /* 80236480 002333E0 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 80236484 002333E4 4E 80 00 20 */ blr +/* 80236484 002333E4 4E 80 00 20 */ blr .global DoUserAnimEvent__10CMagdoliteFR13CStateManagerRC13CInt32POINode14EUserEventType DoUserAnimEvent__10CMagdoliteFR13CStateManagerRC13CInt32POINode14EUserEventType: @@ -2520,7 +2520,7 @@ lbl_80236544: /* 8023654C 002334AC 80 01 00 34 */ lwz r0, 0x34(r1) /* 80236550 002334B0 7C 08 03 A6 */ mtlr r0 /* 80236554 002334B4 38 21 00 30 */ addi r1, r1, 0x30 -/* 80236558 002334B8 4E 80 00 20 */ blr +/* 80236558 002334B8 4E 80 00 20 */ blr .global GetDamageVulnerability__10CMagdoliteCFRC9CVector3fRC9CVector3fRC11CDamageInfo GetDamageVulnerability__10CMagdoliteCFRC9CVector3fRC9CVector3fRC11CDamageInfo: @@ -2530,11 +2530,11 @@ GetDamageVulnerability__10CMagdoliteCFRC9CVector3fRC9CVector3fRC11CDamageInfo: /* 80236568 002334C8 81 83 00 00 */ lwz r12, 0(r3) /* 8023656C 002334CC 81 8C 00 38 */ lwz r12, 0x38(r12) /* 80236570 002334D0 7D 89 03 A6 */ mtctr r12 -/* 80236574 002334D4 4E 80 04 21 */ bctrl +/* 80236574 002334D4 4E 80 04 21 */ bctrl /* 80236578 002334D8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8023657C 002334DC 7C 08 03 A6 */ mtlr r0 /* 80236580 002334E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80236584 002334E4 4E 80 00 20 */ blr +/* 80236584 002334E4 4E 80 00 20 */ blr .global GetDamageVulnerability__10CMagdoliteCFv GetDamageVulnerability__10CMagdoliteCFv: @@ -2553,7 +2553,7 @@ lbl_802365B0: /* 802365B0 00233510 80 01 00 14 */ lwz r0, 0x14(r1) /* 802365B4 00233514 7C 08 03 A6 */ mtlr r0 /* 802365B8 00233518 38 21 00 10 */ addi r1, r1, 0x10 -/* 802365BC 0023351C 4E 80 00 20 */ blr +/* 802365BC 0023351C 4E 80 00 20 */ blr .global sub_802365c0 sub_802365c0: @@ -2869,7 +2869,7 @@ lbl_80236A38: /* 80236A58 002339B8 80 01 02 14 */ lwz r0, 0x214(r1) /* 80236A5C 002339BC 7C 08 03 A6 */ mtlr r0 /* 80236A60 002339C0 38 21 02 10 */ addi r1, r1, 0x210 -/* 80236A64 002339C4 4E 80 00 20 */ blr +/* 80236A64 002339C4 4E 80 00 20 */ blr .global AcceptScriptMsg__10CMagdoliteF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__10CMagdoliteF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -2890,7 +2890,7 @@ AcceptScriptMsg__10CMagdoliteF20EScriptObjectMessage9TUniqueIdR13CStateManager: /* 80236AA0 00233A00 38 84 85 0C */ addi r4, r4, lbl_803E850C@l /* 80236AA4 00233A04 7C 04 00 2E */ lwzx r0, r4, r0 /* 80236AA8 00233A08 7C 09 03 A6 */ mtctr r0 -/* 80236AAC 00233A0C 4E 80 04 20 */ bctr +/* 80236AAC 00233A0C 4E 80 04 20 */ bctr .global lbl_80236AB0 lbl_80236AB0: /* 80236AB0 00233A10 A0 1E 00 00 */ lhz r0, 0(r30) @@ -2937,7 +2937,7 @@ lbl_80236B48: /* 80236B50 00233AB0 81 9C 00 00 */ lwz r12, 0(r28) /* 80236B54 00233AB4 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80236B58 00233AB8 7D 89 03 A6 */ mtctr r12 -/* 80236B5C 00233ABC 4E 80 04 21 */ bctrl +/* 80236B5C 00233ABC 4E 80 04 21 */ bctrl /* 80236B60 00233AC0 C0 5C 07 0C */ lfs f2, 0x70c(r28) /* 80236B64 00233AC4 C0 23 00 00 */ lfs f1, 0(r3) /* 80236B68 00233AC8 C0 1C 05 74 */ lfs f0, 0x574(r28) @@ -2949,7 +2949,7 @@ lbl_80236B48: /* 80236B80 00233AE0 81 9C 00 00 */ lwz r12, 0(r28) /* 80236B84 00233AE4 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80236B88 00233AE8 7D 89 03 A6 */ mtctr r12 -/* 80236B8C 00233AEC 4E 80 04 21 */ bctrl +/* 80236B8C 00233AEC 4E 80 04 21 */ bctrl /* 80236B90 00233AF0 C0 03 00 00 */ lfs f0, 0(r3) /* 80236B94 00233AF4 38 60 00 01 */ li r3, 1 /* 80236B98 00233AF8 D0 1C 07 0C */ stfs f0, 0x70c(r28) @@ -3031,7 +3031,7 @@ lbl_80236BDC: /* 80236CB8 00233C18 81 9C 00 00 */ lwz r12, 0(r28) /* 80236CBC 00233C1C 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80236CC0 00233C20 7D 89 03 A6 */ mtctr r12 -/* 80236CC4 00233C24 4E 80 04 21 */ bctrl +/* 80236CC4 00233C24 4E 80 04 21 */ bctrl /* 80236CC8 00233C28 C0 03 00 00 */ lfs f0, 0(r3) /* 80236CCC 00233C2C D0 1C 07 0C */ stfs f0, 0x70c(r28) /* 80236CD0 00233C30 48 00 00 70 */ b lbl_80236D40 @@ -3084,7 +3084,7 @@ lbl_80236D64: /* 80236D68 00233CC8 80 01 00 74 */ lwz r0, 0x74(r1) /* 80236D6C 00233CCC 7C 08 03 A6 */ mtlr r0 /* 80236D70 00233CD0 38 21 00 70 */ addi r1, r1, 0x70 -/* 80236D74 00233CD4 4E 80 00 20 */ blr +/* 80236D74 00233CD4 4E 80 00 20 */ blr .global Render__10CMagdoliteCFRC13CStateManager Render__10CMagdoliteCFRC13CStateManager: @@ -3095,7 +3095,7 @@ Render__10CMagdoliteCFRC13CStateManager: /* 80236D88 00233CE8 80 01 00 14 */ lwz r0, 0x14(r1) /* 80236D8C 00233CEC 7C 08 03 A6 */ mtlr r0 /* 80236D90 00233CF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80236D94 00233CF4 4E 80 00 20 */ blr +/* 80236D94 00233CF4 4E 80 00 20 */ blr .global KnockBack__10CMagdoliteFRC9CVector3fR13CStateManagerRC11CDamageInfo14EKnockBackTypef KnockBack__10CMagdoliteFRC9CVector3fR13CStateManagerRC11CDamageInfo14EKnockBackTypef: @@ -3106,7 +3106,7 @@ KnockBack__10CMagdoliteFRC9CVector3fR13CStateManagerRC11CDamageInfo14EKnockBackT /* 80236DA8 00233D08 80 01 00 14 */ lwz r0, 0x14(r1) /* 80236DAC 00233D0C 7C 08 03 A6 */ mtlr r0 /* 80236DB0 00233D10 38 21 00 10 */ addi r1, r1, 0x10 -/* 80236DB4 00233D14 4E 80 00 20 */ blr +/* 80236DB4 00233D14 4E 80 00 20 */ blr .global Think__10CMagdoliteFfR13CStateManager Think__10CMagdoliteFfR13CStateManager: @@ -3191,7 +3191,7 @@ lbl_80236ECC: /* 80236EE8 00233E48 C3 C4 00 50 */ lfs f30, 0x50(r4) /* 80236EEC 00233E4C C3 E4 00 40 */ lfs f31, 0x40(r4) /* 80236EF0 00233E50 7D 89 03 A6 */ mtctr r12 -/* 80236EF4 00233E54 4E 80 04 21 */ bctrl +/* 80236EF4 00233E54 4E 80 04 21 */ bctrl /* 80236EF8 00233E58 C3 81 00 B4 */ lfs f28, 0xb4(r1) /* 80236EFC 00233E5C 38 61 00 A4 */ addi r3, r1, 0xa4 /* 80236F00 00233E60 C3 61 00 B8 */ lfs f27, 0xb8(r1) @@ -3501,7 +3501,7 @@ lbl_80237354: /* 80237398 002342F8 83 A1 02 44 */ lwz r29, 0x244(r1) /* 8023739C 002342FC 7C 08 03 A6 */ mtlr r0 /* 802373A0 00234300 38 21 02 C0 */ addi r1, r1, 0x2c0 -/* 802373A4 00234304 4E 80 00 20 */ blr +/* 802373A4 00234304 4E 80 00 20 */ blr .global Accept__10CMagdoliteFR8IVisitor Accept__10CMagdoliteFR8IVisitor: @@ -3514,11 +3514,11 @@ Accept__10CMagdoliteFR8IVisitor: /* 802373C0 00234320 7C 04 03 78 */ mr r4, r0 /* 802373C4 00234324 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 802373C8 00234328 7D 89 03 A6 */ mtctr r12 -/* 802373CC 0023432C 4E 80 04 21 */ bctrl +/* 802373CC 0023432C 4E 80 04 21 */ bctrl /* 802373D0 00234330 80 01 00 14 */ lwz r0, 0x14(r1) /* 802373D4 00234334 7C 08 03 A6 */ mtlr r0 /* 802373D8 00234338 38 21 00 10 */ addi r1, r1, 0x10 -/* 802373DC 0023433C 4E 80 00 20 */ blr +/* 802373DC 0023433C 4E 80 00 20 */ blr .global "__ct__10CMagdoliteF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfo" "__ct__10CMagdoliteF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfo": @@ -3743,7 +3743,7 @@ Accept__10CMagdoliteFR8IVisitor: /* 80237748 002346A8 81 84 00 00 */ lwz r12, 0(r4) /* 8023774C 002346AC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80237750 002346B0 7D 89 03 A6 */ mtctr r12 -/* 80237754 002346B4 4E 80 04 21 */ bctrl +/* 80237754 002346B4 4E 80 04 21 */ bctrl /* 80237758 002346B8 3A 81 00 60 */ addi r20, r1, 0x60 /* 8023775C 002346BC 38 81 00 34 */ addi r4, r1, 0x34 /* 80237760 002346C0 7E 83 A3 78 */ mr r3, r20 @@ -3764,7 +3764,7 @@ Accept__10CMagdoliteFR8IVisitor: /* 8023779C 002346FC 81 84 00 00 */ lwz r12, 0(r4) /* 802377A0 00234700 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802377A4 00234704 7D 89 03 A6 */ mtctr r12 -/* 802377A8 00234708 4E 80 04 21 */ bctrl +/* 802377A8 00234708 4E 80 04 21 */ bctrl /* 802377AC 0023470C 3A C1 00 6C */ addi r22, r1, 0x6c /* 802377B0 00234710 38 81 00 44 */ addi r4, r1, 0x44 /* 802377B4 00234714 7E C3 B3 78 */ mr r3, r22 @@ -3805,7 +3805,7 @@ lbl_802377FC: /* 8023783C 0023479C 38 80 00 01 */ li r4, 1 /* 80237840 002347A0 81 8C 00 08 */ lwz r12, 8(r12) /* 80237844 002347A4 7D 89 03 A6 */ mtctr r12 -/* 80237848 002347A8 4E 80 04 21 */ bctrl +/* 80237848 002347A8 4E 80 04 21 */ bctrl lbl_8023784C: /* 8023784C 002347AC 93 E1 00 5C */ stw r31, 0x5c(r1) /* 80237850 002347B0 7F 83 E3 78 */ mr r3, r28 @@ -3873,7 +3873,7 @@ lbl_802378D4: /* 80237938 00234898 81 84 00 00 */ lwz r12, 0(r4) /* 8023793C 0023489C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80237940 002348A0 7D 89 03 A6 */ mtctr r12 -/* 80237944 002348A4 4E 80 04 21 */ bctrl +/* 80237944 002348A4 4E 80 04 21 */ bctrl /* 80237948 002348A8 38 77 06 CC */ addi r3, r23, 0x6cc /* 8023794C 002348AC 38 81 00 2C */ addi r4, r1, 0x2c /* 80237950 002348B0 48 10 95 59 */ bl __ct__6CTokenFRC6CToken @@ -4001,7 +4001,7 @@ lbl_802378D4: /* 80237B38 00234A98 80 01 01 54 */ lwz r0, 0x154(r1) /* 80237B3C 00234A9C 7C 08 03 A6 */ mtlr r0 /* 80237B40 00234AA0 38 21 01 50 */ addi r1, r1, 0x150 -/* 80237B44 00234AA4 4E 80 00 20 */ blr +/* 80237B44 00234AA4 4E 80 00 20 */ blr .global __sinit_CMagdolite_cpp __sinit_CMagdolite_cpp: diff --git a/asm/MetroidPrime/Enemies/CMetaree.s b/asm/MetroidPrime/Enemies/CMetaree.s index dd6ff6f0..d9303b28 100644 --- a/asm/MetroidPrime/Enemies/CMetaree.s +++ b/asm/MetroidPrime/Enemies/CMetaree.s @@ -232,7 +232,7 @@ lbl_8014E148: /* 8014E154 0014B0B4 83 C1 00 08 */ lwz r30, 8(r1) /* 8014E158 0014B0B8 7C 08 03 A6 */ mtlr r0 /* 8014E15C 0014B0BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8014E160 0014B0C0 4E 80 00 20 */ blr +/* 8014E160 0014B0C0 4E 80 00 20 */ blr .global Delay__8CMetareeFR13CStateManagerf Delay__8CMetareeFR13CStateManagerf: @@ -241,7 +241,7 @@ Delay__8CMetareeFR13CStateManagerf: /* 8014E16C 0014B0CC FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8014E170 0014B0D0 7C 00 00 26 */ mfcr r0 /* 8014E174 0014B0D4 54 03 17 FE */ rlwinm r3, r0, 2, 0x1f, 0x1f -/* 8014E178 0014B0D8 4E 80 00 20 */ blr +/* 8014E178 0014B0D8 4E 80 00 20 */ blr .global Think__8CMetareeFfR13CStateManager Think__8CMetareeFfR13CStateManager: @@ -273,7 +273,7 @@ lbl_8014E1C8: /* 8014E1D8 0014B138 80 01 00 14 */ lwz r0, 0x14(r1) /* 8014E1DC 0014B13C 7C 08 03 A6 */ mtlr r0 /* 8014E1E0 0014B140 38 21 00 10 */ addi r1, r1, 0x10 -/* 8014E1E4 0014B144 4E 80 00 20 */ blr +/* 8014E1E4 0014B144 4E 80 00 20 */ blr .global Explode__8CMetareeFR13CStateManager9EStateMsgf Explode__8CMetareeFR13CStateManager9EStateMsgf: @@ -323,14 +323,14 @@ lbl_8014E210: /* 8014E290 0014B1F0 81 9E 00 00 */ lwz r12, 0(r30) /* 8014E294 0014B1F4 81 8C 02 98 */ lwz r12, 0x298(r12) /* 8014E298 0014B1F8 7D 89 03 A6 */ mtctr r12 -/* 8014E29C 0014B1FC 4E 80 04 21 */ bctrl +/* 8014E29C 0014B1FC 4E 80 04 21 */ bctrl lbl_8014E2A0: /* 8014E2A0 0014B200 80 01 00 44 */ lwz r0, 0x44(r1) /* 8014E2A4 0014B204 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 8014E2A8 0014B208 83 C1 00 38 */ lwz r30, 0x38(r1) /* 8014E2AC 0014B20C 7C 08 03 A6 */ mtlr r0 /* 8014E2B0 0014B210 38 21 00 40 */ addi r1, r1, 0x40 -/* 8014E2B4 0014B214 4E 80 00 20 */ blr +/* 8014E2B4 0014B214 4E 80 00 20 */ blr .global Flee__8CMetareeFR13CStateManager9EStateMsgf Flee__8CMetareeFR13CStateManager9EStateMsgf: @@ -373,7 +373,7 @@ lbl_8014E2F0: /* 8014E344 0014B2A4 81 9F 00 00 */ lwz r12, 0(r31) /* 8014E348 0014B2A8 81 8C 02 BC */ lwz r12, 0x2bc(r12) /* 8014E34C 0014B2AC 7D 89 03 A6 */ mtctr r12 -/* 8014E350 0014B2B0 4E 80 04 21 */ bctrl +/* 8014E350 0014B2B0 4E 80 04 21 */ bctrl /* 8014E354 0014B2B4 FC 20 08 50 */ fneg f1, f1 /* 8014E358 0014B2B8 C0 02 9D 8C */ lfs f0, lbl_805ABAAC@sda21(r2) /* 8014E35C 0014B2BC 38 61 00 38 */ addi r3, r1, 0x38 @@ -461,7 +461,7 @@ lbl_8014E488: /* 8014E494 0014B3F4 83 E1 00 6C */ lwz r31, 0x6c(r1) /* 8014E498 0014B3F8 7C 08 03 A6 */ mtlr r0 /* 8014E49C 0014B3FC 38 21 00 80 */ addi r1, r1, 0x80 -/* 8014E4A0 0014B400 4E 80 00 20 */ blr +/* 8014E4A0 0014B400 4E 80 00 20 */ blr .global Dead__8CMetareeFR13CStateManager9EStateMsgf Dead__8CMetareeFR13CStateManager9EStateMsgf: @@ -512,7 +512,7 @@ lbl_8014E544: /* 8014E54C 0014B4AC 83 C1 00 38 */ lwz r30, 0x38(r1) /* 8014E550 0014B4B0 7C 08 03 A6 */ mtlr r0 /* 8014E554 0014B4B4 38 21 00 40 */ addi r1, r1, 0x40 -/* 8014E558 0014B4B8 4E 80 00 20 */ blr +/* 8014E558 0014B4B8 4E 80 00 20 */ blr .global Attack__8CMetareeFR13CStateManager9EStateMsgf Attack__8CMetareeFR13CStateManager9EStateMsgf: @@ -620,7 +620,7 @@ lbl_8014E6C4: /* 8014E6E0 0014B640 83 E1 00 4C */ lwz r31, 0x4c(r1) /* 8014E6E4 0014B644 7C 08 03 A6 */ mtlr r0 /* 8014E6E8 0014B648 38 21 00 80 */ addi r1, r1, 0x80 -/* 8014E6EC 0014B64C 4E 80 00 20 */ blr +/* 8014E6EC 0014B64C 4E 80 00 20 */ blr .global Halt__8CMetareeFR13CStateManager9EStateMsgf Halt__8CMetareeFR13CStateManager9EStateMsgf: @@ -697,7 +697,7 @@ lbl_8014E7F8: /* 8014E800 0014B760 83 C1 00 48 */ lwz r30, 0x48(r1) /* 8014E804 0014B764 7C 08 03 A6 */ mtlr r0 /* 8014E808 0014B768 38 21 00 50 */ addi r1, r1, 0x50 -/* 8014E80C 0014B76C 4E 80 00 20 */ blr +/* 8014E80C 0014B76C 4E 80 00 20 */ blr .global Active__8CMetareeFR13CStateManager9EStateMsgf Active__8CMetareeFR13CStateManager9EStateMsgf: @@ -789,7 +789,7 @@ lbl_8014E854: /* 8014E95C 0014B8BC 90 01 00 2C */ stw r0, 0x2c(r1) /* 8014E960 0014B8C0 C3 FF 00 E8 */ lfs f31, 0xe8(r31) /* 8014E964 0014B8C4 7D 89 03 A6 */ mtctr r12 -/* 8014E968 0014B8C8 4E 80 04 21 */ bctrl +/* 8014E968 0014B8C8 4E 80 04 21 */ bctrl /* 8014E96C 0014B8CC FC 20 08 50 */ fneg f1, f1 /* 8014E970 0014B8D0 C0 02 9D 8C */ lfs f0, lbl_805ABAAC@sda21(r2) /* 8014E974 0014B8D4 D0 1F 01 50 */ stfs f0, 0x150(r31) @@ -841,7 +841,7 @@ lbl_8014EA10: /* 8014EA20 0014B980 83 C1 00 58 */ lwz r30, 0x58(r1) /* 8014EA24 0014B984 7C 08 03 A6 */ mtlr r0 /* 8014EA28 0014B988 38 21 00 70 */ addi r1, r1, 0x70 -/* 8014EA2C 0014B98C 4E 80 00 20 */ blr +/* 8014EA2C 0014B98C 4E 80 00 20 */ blr .global InActive__8CMetareeFR13CStateManager9EStateMsgf InActive__8CMetareeFR13CStateManager9EStateMsgf: @@ -880,7 +880,7 @@ lbl_8014EA9C: /* 8014EA9C 0014B9FC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8014EAA0 0014BA00 7C 08 03 A6 */ mtlr r0 /* 8014EAA4 0014BA04 38 21 00 10 */ addi r1, r1, 0x10 -/* 8014EAA8 0014BA08 4E 80 00 20 */ blr +/* 8014EAA8 0014BA08 4E 80 00 20 */ blr .global InRange__8CMetareeFR13CStateManagerf InRange__8CMetareeFR13CStateManagerf: @@ -903,7 +903,7 @@ lbl_8014EADC: /* 8014EAE4 0014BA44 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8014EAE8 0014BA48 7C 08 03 A6 */ mtlr r0 /* 8014EAEC 0014BA4C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8014EAF0 0014BA50 4E 80 00 20 */ blr +/* 8014EAF0 0014BA50 4E 80 00 20 */ blr .global ShouldAttack__8CMetareeFR13CStateManagerf ShouldAttack__8CMetareeFR13CStateManagerf: @@ -919,7 +919,7 @@ ShouldAttack__8CMetareeFR13CStateManagerf: /* 8014EB18 0014BA78 7C 00 00 26 */ mfcr r0 /* 8014EB1C 0014BA7C 54 03 0F FE */ srwi r3, r0, 0x1f /* 8014EB20 0014BA80 38 21 00 20 */ addi r1, r1, 0x20 -/* 8014EB24 0014BA84 4E 80 00 20 */ blr +/* 8014EB24 0014BA84 4E 80 00 20 */ blr .global Touch__8CMetareeFR6CActorR13CStateManager Touch__8CMetareeFR6CActorR13CStateManager: @@ -965,7 +965,7 @@ lbl_8014EBB8: /* 8014EBC0 0014BB20 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8014EBC4 0014BB24 7C 08 03 A6 */ mtlr r0 /* 8014EBC8 0014BB28 38 21 00 20 */ addi r1, r1, 0x20 -/* 8014EBCC 0014BB2C 4E 80 00 20 */ blr +/* 8014EBCC 0014BB2C 4E 80 00 20 */ blr .global CollidedWith__8CMetareeFRC9TUniqueIdRC18CCollisionInfoListR13CStateManager CollidedWith__8CMetareeFRC9TUniqueIdRC18CCollisionInfoListR13CStateManager: @@ -1019,18 +1019,18 @@ CollidedWith__8CMetareeFRC9TUniqueIdRC18CCollisionInfoListR13CStateManager: /* 8014EC8C 0014BBEC 81 9E 00 00 */ lwz r12, 0(r30) /* 8014EC90 0014BBF0 81 8C 02 98 */ lwz r12, 0x298(r12) /* 8014EC94 0014BBF4 7D 89 03 A6 */ mtctr r12 -/* 8014EC98 0014BBF8 4E 80 04 21 */ bctrl +/* 8014EC98 0014BBF8 4E 80 04 21 */ bctrl lbl_8014EC9C: /* 8014EC9C 0014BBFC 80 01 00 44 */ lwz r0, 0x44(r1) /* 8014ECA0 0014BC00 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 8014ECA4 0014BC04 83 C1 00 38 */ lwz r30, 0x38(r1) /* 8014ECA8 0014BC08 7C 08 03 A6 */ mtlr r0 /* 8014ECAC 0014BC0C 38 21 00 40 */ addi r1, r1, 0x40 -/* 8014ECB0 0014BC10 4E 80 00 20 */ blr +/* 8014ECB0 0014BC10 4E 80 00 20 */ blr .global ThinkAboutMove__8CMetareeFf ThinkAboutMove__8CMetareeFf: -/* 8014ECB4 0014BC14 4E 80 00 20 */ blr +/* 8014ECB4 0014BC14 4E 80 00 20 */ blr .global AcceptScriptMsg__8CMetareeF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__8CMetareeF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -1074,7 +1074,7 @@ lbl_8014ED30: /* 8014ED3C 0014BC9C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8014ED40 0014BCA0 7C 08 03 A6 */ mtlr r0 /* 8014ED44 0014BCA4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8014ED48 0014BCA8 4E 80 00 20 */ blr +/* 8014ED48 0014BCA8 4E 80 00 20 */ blr .global Accept__8CMetareeFR8IVisitor Accept__8CMetareeFR8IVisitor: @@ -1087,11 +1087,11 @@ Accept__8CMetareeFR8IVisitor: /* 8014ED64 0014BCC4 7C 04 03 78 */ mr r4, r0 /* 8014ED68 0014BCC8 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 8014ED6C 0014BCCC 7D 89 03 A6 */ mtctr r12 -/* 8014ED70 0014BCD0 4E 80 04 21 */ bctrl +/* 8014ED70 0014BCD0 4E 80 04 21 */ bctrl /* 8014ED74 0014BCD4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8014ED78 0014BCD8 7C 08 03 A6 */ mtlr r0 /* 8014ED7C 0014BCDC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8014ED80 0014BCE0 4E 80 00 20 */ blr +/* 8014ED80 0014BCE0 4E 80 00 20 */ blr .global "__ct__8CMetareeF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>Q210CPatterned11EFlavorTypeRC11CEntityInfoRC12CTransform4fRC10CModelDataRC14CPatternedInfoRC11CDamageInfofRC9CVector3ff9EBodyTypeffRC16CActorParameters" "__ct__8CMetareeF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>Q210CPatterned11EFlavorTypeRC11CEntityInfoRC12CTransform4fRC10CModelDataRC14CPatternedInfoRC11CDamageInfofRC9CVector3ff9EBodyTypeffRC16CActorParameters": diff --git a/asm/MetroidPrime/Enemies/CMetroid.s b/asm/MetroidPrime/Enemies/CMetroid.s index 3644dfe9..d7f524a8 100644 --- a/asm/MetroidPrime/Enemies/CMetroid.s +++ b/asm/MetroidPrime/Enemies/CMetroid.s @@ -389,12 +389,12 @@ lbl_805A8FF4: .global GetSearchPath__8CMetroidFv GetSearchPath__8CMetroidFv: /* 80169FB8 00166F18 38 63 06 C0 */ addi r3, r3, 0x6c0 -/* 80169FBC 00166F1C 4E 80 00 20 */ blr +/* 80169FBC 00166F1C 4E 80 00 20 */ blr .global IsListening__8CMetroidCFv IsListening__8CMetroidCFv: /* 80169FC0 00166F20 38 60 00 01 */ li r3, 1 -/* 80169FC4 00166F24 4E 80 00 20 */ blr +/* 80169FC4 00166F24 4E 80 00 20 */ blr .global sub_80169fc8 sub_80169fc8: @@ -469,7 +469,7 @@ lbl_8016A0B8: /* 8016A0C4 00167024 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8016A0C8 00167028 7C 08 03 A6 */ mtlr r0 /* 8016A0CC 0016702C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8016A0D0 00167030 4E 80 00 20 */ blr +/* 8016A0D0 00167030 4E 80 00 20 */ blr .global sub_8016a0d4 sub_8016a0d4: @@ -519,7 +519,7 @@ lbl_8016A160: /* 8016A170 001670D0 83 C1 00 08 */ lwz r30, 8(r1) /* 8016A174 001670D4 7C 08 03 A6 */ mtlr r0 /* 8016A178 001670D8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8016A17C 001670DC 4E 80 00 20 */ blr +/* 8016A17C 001670DC 4E 80 00 20 */ blr .global sub_8016a180 sub_8016a180: @@ -546,7 +546,7 @@ sub_8016a180: /* 8016A1D0 00167130 C0 22 A0 80 */ lfs f1, lbl_805ABDA0@sda21(r2) /* 8016A1D4 00167134 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 8016A1D8 00167138 7D 89 03 A6 */ mtctr r12 -/* 8016A1DC 0016713C 4E 80 04 21 */ bctrl +/* 8016A1DC 0016713C 4E 80 04 21 */ bctrl /* 8016A1E0 00167140 A0 1F 00 C4 */ lhz r0, 0xc4(r31) /* 8016A1E4 00167144 7F C3 F3 78 */ mr r3, r30 /* 8016A1E8 00167148 C3 E1 00 20 */ lfs f31, 0x20(r1) @@ -580,7 +580,7 @@ lbl_8016A23C: /* 8016A24C 001671AC 83 C1 00 48 */ lwz r30, 0x48(r1) /* 8016A250 001671B0 7C 08 03 A6 */ mtlr r0 /* 8016A254 001671B4 38 21 00 60 */ addi r1, r1, 0x60 -/* 8016A258 001671B8 4E 80 00 20 */ blr +/* 8016A258 001671B8 4E 80 00 20 */ blr .global GetOrigin__8CMetroidCFv GetOrigin__8CMetroidCFv: @@ -766,7 +766,7 @@ lbl_8016A4D4: /* 8016A50C 0016746C 83 A1 00 C4 */ lwz r29, 0xc4(r1) /* 8016A510 00167470 7C 08 03 A6 */ mtlr r0 /* 8016A514 00167474 38 21 01 10 */ addi r1, r1, 0x110 -/* 8016A518 00167478 4E 80 00 20 */ blr +/* 8016A518 00167478 4E 80 00 20 */ blr .global sub_8016a51c sub_8016a51c: @@ -825,7 +825,7 @@ lbl_8016A5CC: /* 8016A5D8 00167538 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8016A5DC 0016753C 7C 08 03 A6 */ mtlr r0 /* 8016A5E0 00167540 38 21 00 30 */ addi r1, r1, 0x30 -/* 8016A5E4 00167544 4E 80 00 20 */ blr +/* 8016A5E4 00167544 4E 80 00 20 */ blr .global sub_8016a5e8 sub_8016a5e8: @@ -885,7 +885,7 @@ lbl_8016A6A8: /* 8016A6B0 00167610 83 C1 00 28 */ lwz r30, 0x28(r1) /* 8016A6B4 00167614 7C 08 03 A6 */ mtlr r0 /* 8016A6B8 00167618 38 21 00 30 */ addi r1, r1, 0x30 -/* 8016A6BC 0016761C 4E 80 00 20 */ blr +/* 8016A6BC 0016761C 4E 80 00 20 */ blr .global sub_8016a6c0 sub_8016a6c0: @@ -957,7 +957,7 @@ lbl_8016A798: /* 8016A7B0 00167710 83 A1 00 94 */ lwz r29, 0x94(r1) /* 8016A7B4 00167714 7C 08 03 A6 */ mtlr r0 /* 8016A7B8 00167718 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 8016A7BC 0016771C 4E 80 00 20 */ blr +/* 8016A7BC 0016771C 4E 80 00 20 */ blr .global sub_8016a7c0 sub_8016a7c0: @@ -1109,7 +1109,7 @@ lbl_8016A9F4: /* 8016AA00 00167960 83 A1 01 A4 */ lwz r29, 0x1a4(r1) /* 8016AA04 00167964 7C 08 03 A6 */ mtlr r0 /* 8016AA08 00167968 38 21 01 B0 */ addi r1, r1, 0x1b0 -/* 8016AA0C 0016796C 4E 80 00 20 */ blr +/* 8016AA0C 0016796C 4E 80 00 20 */ blr .global sub_8016aa10 sub_8016aa10: @@ -1622,7 +1622,7 @@ lbl_8016B19C: /* 8016B1D8 00168138 80 01 03 64 */ lwz r0, 0x364(r1) /* 8016B1DC 0016813C 7C 08 03 A6 */ mtlr r0 /* 8016B1E0 00168140 38 21 03 60 */ addi r1, r1, 0x360 -/* 8016B1E4 00168144 4E 80 00 20 */ blr +/* 8016B1E4 00168144 4E 80 00 20 */ blr .global sub_8016b1e8 sub_8016b1e8: @@ -1679,7 +1679,7 @@ lbl_8016B298: /* 8016B2A8 00168208 83 81 00 20 */ lwz r28, 0x20(r1) /* 8016B2AC 0016820C 7C 08 03 A6 */ mtlr r0 /* 8016B2B0 00168210 38 21 00 30 */ addi r1, r1, 0x30 -/* 8016B2B4 00168214 4E 80 00 20 */ blr +/* 8016B2B4 00168214 4E 80 00 20 */ blr .global sub_8016b2b8 sub_8016b2b8: @@ -1776,7 +1776,7 @@ lbl_8016B3E8: /* 8016B3F4 00168354 80 01 00 44 */ lwz r0, 0x44(r1) /* 8016B3F8 00168358 7C 08 03 A6 */ mtlr r0 /* 8016B3FC 0016835C 38 21 00 40 */ addi r1, r1, 0x40 -/* 8016B400 00168360 4E 80 00 20 */ blr +/* 8016B400 00168360 4E 80 00 20 */ blr .global sub_8016b404 sub_8016b404: @@ -2055,7 +2055,7 @@ lbl_8016B81C: /* 8016B820 00168780 80 01 04 24 */ lwz r0, 0x424(r1) /* 8016B824 00168784 7C 08 03 A6 */ mtlr r0 /* 8016B828 00168788 38 21 04 20 */ addi r1, r1, 0x420 -/* 8016B82C 0016878C 4E 80 00 20 */ blr +/* 8016B82C 0016878C 4E 80 00 20 */ blr .global sub_8016b830 sub_8016b830: @@ -2233,7 +2233,7 @@ lbl_8016BA9C: lbl_8016BAD0: /* 8016BAD0 00168A30 88 04 01 28 */ lbz r0, 0x128(r4) /* 8016BAD4 00168A34 98 03 01 28 */ stb r0, 0x128(r3) -/* 8016BAD8 00168A38 4E 80 00 20 */ blr +/* 8016BAD8 00168A38 4E 80 00 20 */ blr .global sub_8016badc sub_8016badc: @@ -2274,7 +2274,7 @@ lbl_8016BB5C: /* 8016BB5C 00168ABC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8016BB60 00168AC0 7C 08 03 A6 */ mtlr r0 /* 8016BB64 00168AC4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8016BB68 00168AC8 4E 80 00 20 */ blr +/* 8016BB68 00168AC8 4E 80 00 20 */ blr .global sub_8016bb6c sub_8016bb6c: @@ -2375,7 +2375,7 @@ sub_8016bb6c: /* 8016BCE4 00168C44 83 E1 00 BC */ lwz r31, 0xbc(r1) /* 8016BCE8 00168C48 7C 08 03 A6 */ mtlr r0 /* 8016BCEC 00168C4C 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 8016BCF0 00168C50 4E 80 00 20 */ blr +/* 8016BCF0 00168C50 4E 80 00 20 */ blr .global sub_8016bcf4 sub_8016bcf4: @@ -2453,7 +2453,7 @@ lbl_8016BDD0: /* 8016BE00 00168D60 7F C4 F3 78 */ mr r4, r30 /* 8016BE04 00168D64 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8016BE08 00168D68 7D 89 03 A6 */ mtctr r12 -/* 8016BE0C 00168D6C 4E 80 04 21 */ bctrl +/* 8016BE0C 00168D6C 4E 80 04 21 */ bctrl /* 8016BE10 00168D70 28 03 00 00 */ cmplwi r3, 0 /* 8016BE14 00168D74 41 82 02 58 */ beq lbl_8016C06C /* 8016BE18 00168D78 C3 DD 06 3C */ lfs f30, 0x63c(r29) @@ -2607,7 +2607,7 @@ lbl_8016C04C: /* 8016C05C 00168FBC 81 8C 00 90 */ lwz r12, 0x90(r12) /* 8016C060 00168FC0 38 84 66 A0 */ addi r4, r4, skZero3f@l /* 8016C064 00168FC4 7D 89 03 A6 */ mtctr r12 -/* 8016C068 00168FC8 4E 80 04 21 */ bctrl +/* 8016C068 00168FC8 4E 80 04 21 */ bctrl lbl_8016C06C: /* 8016C06C 00168FCC 80 9E 08 4C */ lwz r4, 0x84c(r30) /* 8016C070 00168FD0 A0 1D 07 B0 */ lhz r0, 0x7b0(r29) @@ -2736,7 +2736,7 @@ lbl_8016C22C: /* 8016C248 001691A8 83 A1 01 74 */ lwz r29, 0x174(r1) /* 8016C24C 001691AC 7C 08 03 A6 */ mtlr r0 /* 8016C250 001691B0 38 21 01 A0 */ addi r1, r1, 0x1a0 -/* 8016C254 001691B4 4E 80 00 20 */ blr +/* 8016C254 001691B4 4E 80 00 20 */ blr .global sub_8016c258 sub_8016c258: @@ -2810,7 +2810,7 @@ lbl_8016C300: /* 8016C354 001692B4 81 83 00 00 */ lwz r12, 0(r3) /* 8016C358 001692B8 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8016C35C 001692BC 7D 89 03 A6 */ mtctr r12 -/* 8016C360 001692C0 4E 80 04 21 */ bctrl +/* 8016C360 001692C0 4E 80 04 21 */ bctrl /* 8016C364 001692C4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016C368 001692C8 40 82 00 08 */ bne lbl_8016C370 /* 8016C36C 001692CC 3B E0 00 00 */ li r31, 0 @@ -2831,7 +2831,7 @@ lbl_8016C384: /* 8016C398 001692F8 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8016C39C 001692FC 7C 08 03 A6 */ mtlr r0 /* 8016C3A0 00169300 38 21 00 30 */ addi r1, r1, 0x30 -/* 8016C3A4 00169304 4E 80 00 20 */ blr +/* 8016C3A4 00169304 4E 80 00 20 */ blr .global sub_8016c3a8 sub_8016c3a8: @@ -2881,7 +2881,7 @@ sub_8016c3a8: /* 8016C454 001693B4 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8016C458 001693B8 7C 08 03 A6 */ mtlr r0 /* 8016C45C 001693BC 38 21 00 30 */ addi r1, r1, 0x30 -/* 8016C460 001693C0 4E 80 00 20 */ blr +/* 8016C460 001693C0 4E 80 00 20 */ blr .global sub_8016c464 sub_8016c464: @@ -3135,7 +3135,7 @@ lbl_8016C808: /* 8016C818 00169778 83 81 09 10 */ lwz r28, 0x910(r1) /* 8016C81C 0016977C 7C 08 03 A6 */ mtlr r0 /* 8016C820 00169780 38 21 09 20 */ addi r1, r1, 0x920 -/* 8016C824 00169784 4E 80 00 20 */ blr +/* 8016C824 00169784 4E 80 00 20 */ blr .global sub_8016c828 sub_8016c828: @@ -3225,7 +3225,7 @@ lbl_8016C940: /* 8016C964 001698C4 81 9D 00 00 */ lwz r12, 0(r29) /* 8016C968 001698C8 81 8C 02 98 */ lwz r12, 0x298(r12) /* 8016C96C 001698CC 7D 89 03 A6 */ mtctr r12 -/* 8016C970 001698D0 4E 80 04 21 */ bctrl +/* 8016C970 001698D0 4E 80 04 21 */ bctrl /* 8016C974 001698D4 48 00 00 2C */ b lbl_8016C9A0 lbl_8016C978: /* 8016C978 001698D8 88 1D 09 BF */ lbz r0, 0x9bf(r29) @@ -3263,7 +3263,7 @@ lbl_8016C9D0: /* 8016C9EC 0016994C 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8016C9F0 00169950 7C 08 03 A6 */ mtlr r0 /* 8016C9F4 00169954 38 21 00 50 */ addi r1, r1, 0x50 -/* 8016C9F8 00169958 4E 80 00 20 */ blr +/* 8016C9F8 00169958 4E 80 00 20 */ blr .global sub_8016c9fc sub_8016c9fc: @@ -3583,7 +3583,7 @@ lbl_8016CE60: /* 8016CEAC 00169E0C 80 01 0A 54 */ lwz r0, 0xa54(r1) /* 8016CEB0 00169E10 7C 08 03 A6 */ mtlr r0 /* 8016CEB4 00169E14 38 21 0A 50 */ addi r1, r1, 0xa50 -/* 8016CEB8 00169E18 4E 80 00 20 */ blr +/* 8016CEB8 00169E18 4E 80 00 20 */ blr .global sub_8016cebc sub_8016cebc: @@ -3703,7 +3703,7 @@ lbl_8016D04C: /* 8016D078 00169FD8 C0 22 A0 80 */ lfs f1, lbl_805ABDA0@sda21(r2) /* 8016D07C 00169FDC 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 8016D080 00169FE0 7D 89 03 A6 */ mtctr r12 -/* 8016D084 00169FE4 4E 80 04 21 */ bctrl +/* 8016D084 00169FE4 4E 80 04 21 */ bctrl /* 8016D088 00169FE8 C0 01 00 20 */ lfs f0, 0x20(r1) /* 8016D08C 00169FEC D0 1D 08 0C */ stfs f0, 0x80c(r29) /* 8016D090 00169FF0 C0 01 00 24 */ lfs f0, 0x24(r1) @@ -3769,7 +3769,7 @@ lbl_8016D130: /* 8016D178 0016A0D8 80 01 01 54 */ lwz r0, 0x154(r1) /* 8016D17C 0016A0DC 7C 08 03 A6 */ mtlr r0 /* 8016D180 0016A0E0 38 21 01 50 */ addi r1, r1, 0x150 -/* 8016D184 0016A0E4 4E 80 00 20 */ blr +/* 8016D184 0016A0E4 4E 80 00 20 */ blr .global sub_8016d188 sub_8016d188: @@ -3815,7 +3815,7 @@ lbl_8016D210: /* 8016D218 0016A178 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8016D21C 0016A17C 7C 08 03 A6 */ mtlr r0 /* 8016D220 0016A180 38 21 00 20 */ addi r1, r1, 0x20 -/* 8016D224 0016A184 4E 80 00 20 */ blr +/* 8016D224 0016A184 4E 80 00 20 */ blr .global sub_8016d228 sub_8016d228: @@ -3860,7 +3860,7 @@ lbl_8016D2B4: /* 8016D2BC 0016A21C 83 C1 00 28 */ lwz r30, 0x28(r1) /* 8016D2C0 0016A220 7C 08 03 A6 */ mtlr r0 /* 8016D2C4 0016A224 38 21 00 30 */ addi r1, r1, 0x30 -/* 8016D2C8 0016A228 4E 80 00 20 */ blr +/* 8016D2C8 0016A228 4E 80 00 20 */ blr .global sub_8016d2cc sub_8016d2cc: @@ -3905,7 +3905,7 @@ lbl_8016D358: /* 8016D360 0016A2C0 83 C1 00 28 */ lwz r30, 0x28(r1) /* 8016D364 0016A2C4 7C 08 03 A6 */ mtlr r0 /* 8016D368 0016A2C8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8016D36C 0016A2CC 4E 80 00 20 */ blr +/* 8016D36C 0016A2CC 4E 80 00 20 */ blr .global sub_8016d370 sub_8016d370: @@ -4042,7 +4042,7 @@ lbl_8016D53C: /* 8016D56C 0016A4CC 83 C1 00 88 */ lwz r30, 0x88(r1) /* 8016D570 0016A4D0 7C 08 03 A6 */ mtlr r0 /* 8016D574 0016A4D4 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 8016D578 0016A4D8 4E 80 00 20 */ blr +/* 8016D578 0016A4D8 4E 80 00 20 */ blr .global sub_8016d57c sub_8016d57c: @@ -4176,7 +4176,7 @@ lbl_8016D768: /* 8016D76C 0016A6CC C0 22 A0 80 */ lfs f1, lbl_805ABDA0@sda21(r2) /* 8016D770 0016A6D0 81 8C 01 E8 */ lwz r12, 0x1e8(r12) /* 8016D774 0016A6D4 7D 89 03 A6 */ mtctr r12 -/* 8016D778 0016A6D8 4E 80 04 21 */ bctrl +/* 8016D778 0016A6D8 4E 80 04 21 */ bctrl /* 8016D77C 0016A6DC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016D780 0016A6E0 41 82 00 D8 */ beq lbl_8016D858 /* 8016D784 0016A6E4 A0 7F 07 B0 */ lhz r3, 0x7b0(r31) @@ -4239,7 +4239,7 @@ lbl_8016D858: /* 8016D864 0016A7C4 83 A1 00 F4 */ lwz r29, 0xf4(r1) /* 8016D868 0016A7C8 7C 08 03 A6 */ mtlr r0 /* 8016D86C 0016A7CC 38 21 01 00 */ addi r1, r1, 0x100 -/* 8016D870 0016A7D0 4E 80 00 20 */ blr +/* 8016D870 0016A7D0 4E 80 00 20 */ blr .global sub_8016d874 sub_8016d874: @@ -4355,7 +4355,7 @@ lbl_8016D9F4: /* 8016DA0C 0016A96C 83 81 00 50 */ lwz r28, 0x50(r1) /* 8016DA10 0016A970 7C 08 03 A6 */ mtlr r0 /* 8016DA14 0016A974 38 21 00 70 */ addi r1, r1, 0x70 -/* 8016DA18 0016A978 4E 80 00 20 */ blr +/* 8016DA18 0016A978 4E 80 00 20 */ blr .global sub_8016da1c sub_8016da1c: @@ -4375,7 +4375,7 @@ sub_8016da1c: /* 8016DA50 0016A9B0 81 83 00 00 */ lwz r12, 0(r3) /* 8016DA54 0016A9B4 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 8016DA58 0016A9B8 7D 89 03 A6 */ mtctr r12 -/* 8016DA5C 0016A9BC 4E 80 04 21 */ bctrl +/* 8016DA5C 0016A9BC 4E 80 04 21 */ bctrl /* 8016DA60 0016A9C0 28 03 00 00 */ cmplwi r3, 0 /* 8016DA64 0016A9C4 41 82 02 84 */ beq lbl_8016DCE8 /* 8016DA68 0016A9C8 A0 DE 00 08 */ lhz r6, 8(r30) @@ -4432,7 +4432,7 @@ lbl_8016DAB0: /* 8016DB30 0016AA90 81 8C 00 A0 */ lwz r12, 0xa0(r12) /* 8016DB34 0016AA94 B1 01 00 0C */ sth r8, 0xc(r1) /* 8016DB38 0016AA98 7D 89 03 A6 */ mtctr r12 -/* 8016DB3C 0016AA9C 4E 80 04 21 */ bctrl +/* 8016DB3C 0016AA9C 4E 80 04 21 */ bctrl /* 8016DB40 0016AAA0 C0 01 00 34 */ lfs f0, 0x34(r1) /* 8016DB44 0016AAA4 D0 1E 02 E0 */ stfs f0, 0x2e0(r30) /* 8016DB48 0016AAA8 C0 01 00 38 */ lfs f0, 0x38(r1) @@ -4549,7 +4549,7 @@ lbl_8016DCE8: /* 8016DCF8 0016AC58 83 81 00 F0 */ lwz r28, 0xf0(r1) /* 8016DCFC 0016AC5C 7C 08 03 A6 */ mtlr r0 /* 8016DD00 0016AC60 38 21 01 00 */ addi r1, r1, 0x100 -/* 8016DD04 0016AC64 4E 80 00 20 */ blr +/* 8016DD04 0016AC64 4E 80 00 20 */ blr .global sub_8016dd08 sub_8016dd08: @@ -4587,14 +4587,14 @@ sub_8016dd08: /* 8016DD84 0016ACE4 81 9F 00 00 */ lwz r12, 0(r31) /* 8016DD88 0016ACE8 81 8C 00 90 */ lwz r12, 0x90(r12) /* 8016DD8C 0016ACEC 7D 89 03 A6 */ mtctr r12 -/* 8016DD90 0016ACF0 4E 80 04 21 */ bctrl +/* 8016DD90 0016ACF0 4E 80 04 21 */ bctrl /* 8016DD94 0016ACF4 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 8016DD98 0016ACF8 80 01 00 34 */ lwz r0, 0x34(r1) /* 8016DD9C 0016ACFC CB E1 00 20 */ lfd f31, 0x20(r1) /* 8016DDA0 0016AD00 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8016DDA4 0016AD04 7C 08 03 A6 */ mtlr r0 /* 8016DDA8 0016AD08 38 21 00 30 */ addi r1, r1, 0x30 -/* 8016DDAC 0016AD0C 4E 80 00 20 */ blr +/* 8016DDAC 0016AD0C 4E 80 00 20 */ blr .global sub_8016ddb0 sub_8016ddb0: @@ -4699,7 +4699,7 @@ lbl_8016DF24: /* 8016DF30 0016AE90 83 A1 00 74 */ lwz r29, 0x74(r1) /* 8016DF34 0016AE94 7C 08 03 A6 */ mtlr r0 /* 8016DF38 0016AE98 38 21 00 80 */ addi r1, r1, 0x80 -/* 8016DF3C 0016AE9C 4E 80 00 20 */ blr +/* 8016DF3C 0016AE9C 4E 80 00 20 */ blr .global sub_8016df40 sub_8016df40: @@ -4714,7 +4714,7 @@ sub_8016df40: /* 8016DF60 0016AEC0 EC 20 10 7A */ fmadds f1, f0, f1, f2 /* 8016DF64 0016AEC4 7C 08 03 A6 */ mtlr r0 /* 8016DF68 0016AEC8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8016DF6C 0016AECC 4E 80 00 20 */ blr +/* 8016DF6C 0016AECC 4E 80 00 20 */ blr .global sub_8016df70 sub_8016df70: @@ -4725,7 +4725,7 @@ sub_8016df70: /* 8016DF80 0016AEE0 EC 01 00 24 */ fdivs f0, f1, f0 /* 8016DF84 0016AEE4 C0 22 A0 98 */ lfs f1, lbl_805ABDB8@sda21(r2) /* 8016DF88 0016AEE8 EC 21 00 2A */ fadds f1, f1, f0 -/* 8016DF8C 0016AEEC 4E 80 00 20 */ blr +/* 8016DF8C 0016AEEC 4E 80 00 20 */ blr lbl_8016DF90: /* 8016DF90 0016AEF0 C0 63 06 50 */ lfs f3, 0x650(r3) /* 8016DF94 0016AEF4 FC 01 18 40 */ fcmpo cr0, f1, f3 @@ -4735,10 +4735,10 @@ lbl_8016DF90: /* 8016DFA4 0016AF04 EC 03 00 28 */ fsubs f0, f3, f0 /* 8016DFA8 0016AF08 EC 01 00 24 */ fdivs f0, f1, f0 /* 8016DFAC 0016AF0C EC 22 00 2A */ fadds f1, f2, f0 -/* 8016DFB0 0016AF10 4E 80 00 20 */ blr +/* 8016DFB0 0016AF10 4E 80 00 20 */ blr lbl_8016DFB4: /* 8016DFB4 0016AF14 C0 22 A0 D8 */ lfs f1, lbl_805ABDF8@sda21(r2) -/* 8016DFB8 0016AF18 4E 80 00 20 */ blr +/* 8016DFB8 0016AF18 4E 80 00 20 */ blr .global sub_8016dfbc sub_8016dfbc: @@ -4843,7 +4843,7 @@ lbl_8016E124: /* 8016E134 0016B094 81 84 00 00 */ lwz r12, 0(r4) /* 8016E138 0016B098 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 8016E13C 0016B09C 7D 89 03 A6 */ mtctr r12 -/* 8016E140 0016B0A0 4E 80 04 21 */ bctrl +/* 8016E140 0016B0A0 4E 80 04 21 */ bctrl lbl_8016E144: /* 8016E144 0016B0A4 E3 E1 01 08 */ psq_l f31, 264(r1), 0, qr0 /* 8016E148 0016B0A8 CB E1 01 00 */ lfd f31, 0x100(r1) @@ -4857,7 +4857,7 @@ lbl_8016E144: /* 8016E168 0016B0C8 83 A1 00 D4 */ lwz r29, 0xd4(r1) /* 8016E16C 0016B0CC 7C 08 03 A6 */ mtlr r0 /* 8016E170 0016B0D0 38 21 01 10 */ addi r1, r1, 0x110 -/* 8016E174 0016B0D4 4E 80 00 20 */ blr +/* 8016E174 0016B0D4 4E 80 00 20 */ blr .global sub_8016e178 sub_8016e178: @@ -4876,7 +4876,7 @@ sub_8016e178: /* 8016E1A8 0016B108 81 83 00 00 */ lwz r12, 0(r3) /* 8016E1AC 0016B10C 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8016E1B0 0016B110 7D 89 03 A6 */ mtctr r12 -/* 8016E1B4 0016B114 4E 80 04 21 */ bctrl +/* 8016E1B4 0016B114 4E 80 04 21 */ bctrl /* 8016E1B8 0016B118 28 03 00 00 */ cmplwi r3, 0 /* 8016E1BC 0016B11C 38 00 00 00 */ li r0, 0 /* 8016E1C0 0016B120 41 82 00 18 */ beq lbl_8016E1D8 @@ -4894,7 +4894,7 @@ lbl_8016E1E4: /* 8016E1E4 0016B144 80 01 00 14 */ lwz r0, 0x14(r1) /* 8016E1E8 0016B148 7C 08 03 A6 */ mtlr r0 /* 8016E1EC 0016B14C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8016E1F0 0016B150 4E 80 00 20 */ blr +/* 8016E1F0 0016B150 4E 80 00 20 */ blr .global sub_8016e1f4 sub_8016e1f4: @@ -4909,7 +4909,7 @@ sub_8016e1f4: /* 8016E214 0016B174 38 80 00 01 */ li r4, 1 lbl_8016E218: /* 8016E218 0016B178 7C 83 23 78 */ mr r3, r4 -/* 8016E21C 0016B17C 4E 80 00 20 */ blr +/* 8016E21C 0016B17C 4E 80 00 20 */ blr .global Dodge__8CMetroidFR13CStateManager9EStateMsgf Dodge__8CMetroidFR13CStateManager9EStateMsgf: @@ -5010,7 +5010,7 @@ lbl_8016E378: /* 8016E380 0016B2E0 83 C1 00 28 */ lwz r30, 0x28(r1) /* 8016E384 0016B2E4 7C 08 03 A6 */ mtlr r0 /* 8016E388 0016B2E8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8016E38C 0016B2EC 4E 80 00 20 */ blr +/* 8016E38C 0016B2EC 4E 80 00 20 */ blr .global WallHang__8CMetroidFR13CStateManager9EStateMsgf WallHang__8CMetroidFR13CStateManager9EStateMsgf: @@ -5156,7 +5156,7 @@ lbl_8016E58C: /* 8016E594 0016B4F4 83 C1 00 28 */ lwz r30, 0x28(r1) /* 8016E598 0016B4F8 7C 08 03 A6 */ mtlr r0 /* 8016E59C 0016B4FC 38 21 00 30 */ addi r1, r1, 0x30 -/* 8016E5A0 0016B500 4E 80 00 20 */ blr +/* 8016E5A0 0016B500 4E 80 00 20 */ blr .global TelegraphAttack__8CMetroidFR13CStateManager9EStateMsgf TelegraphAttack__8CMetroidFR13CStateManager9EStateMsgf: @@ -5368,7 +5368,7 @@ lbl_8016E894: /* 8016E8AC 0016B80C C0 22 A0 80 */ lfs f1, lbl_805ABDA0@sda21(r2) /* 8016E8B0 0016B810 81 8C 01 8C */ lwz r12, 0x18c(r12) /* 8016E8B4 0016B814 7D 89 03 A6 */ mtctr r12 -/* 8016E8B8 0016B818 4E 80 04 21 */ bctrl +/* 8016E8B8 0016B818 4E 80 04 21 */ bctrl /* 8016E8BC 0016B81C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016E8C0 0016B820 40 82 00 28 */ bne lbl_8016E8E8 /* 8016E8C4 0016B824 7F E3 FB 78 */ mr r3, r31 @@ -5377,7 +5377,7 @@ lbl_8016E894: /* 8016E8D0 0016B830 C0 22 A0 80 */ lfs f1, lbl_805ABDA0@sda21(r2) /* 8016E8D4 0016B834 81 8C 01 B8 */ lwz r12, 0x1b8(r12) /* 8016E8D8 0016B838 7D 89 03 A6 */ mtctr r12 -/* 8016E8DC 0016B83C 4E 80 04 21 */ bctrl +/* 8016E8DC 0016B83C 4E 80 04 21 */ bctrl /* 8016E8E0 0016B840 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016E8E4 0016B844 41 82 00 30 */ beq lbl_8016E914 lbl_8016E8E8: @@ -5404,7 +5404,7 @@ lbl_8016E914: /* 8016E934 0016B894 83 C1 00 B8 */ lwz r30, 0xb8(r1) /* 8016E938 0016B898 7C 08 03 A6 */ mtlr r0 /* 8016E93C 0016B89C 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 8016E940 0016B8A0 4E 80 00 20 */ blr +/* 8016E940 0016B8A0 4E 80 00 20 */ blr .global Attack__8CMetroidFR13CStateManager9EStateMsgf Attack__8CMetroidFR13CStateManager9EStateMsgf: @@ -5651,7 +5651,7 @@ lbl_8016ECC8: /* 8016ECD0 0016BC30 83 C1 00 98 */ lwz r30, 0x98(r1) /* 8016ECD4 0016BC34 7C 08 03 A6 */ mtlr r0 /* 8016ECD8 0016BC38 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8016ECDC 0016BC3C 4E 80 00 20 */ blr +/* 8016ECDC 0016BC3C 4E 80 00 20 */ blr .global TurnAround__8CMetroidFR13CStateManager9EStateMsgf TurnAround__8CMetroidFR13CStateManager9EStateMsgf: @@ -5699,7 +5699,7 @@ lbl_8016ED08: /* 8016ED80 0016BCE0 81 9E 00 00 */ lwz r12, 0(r30) /* 8016ED84 0016BCE4 81 8C 01 E8 */ lwz r12, 0x1e8(r12) /* 8016ED88 0016BCE8 7D 89 03 A6 */ mtctr r12 -/* 8016ED8C 0016BCEC 4E 80 04 21 */ bctrl +/* 8016ED8C 0016BCEC 4E 80 04 21 */ bctrl /* 8016ED90 0016BCF0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016ED94 0016BCF4 41 82 00 6C */ beq lbl_8016EE00 /* 8016ED98 0016BCF8 38 61 00 20 */ addi r3, r1, 0x20 @@ -5734,7 +5734,7 @@ lbl_8016EE00: /* 8016EE08 0016BD68 83 C1 00 48 */ lwz r30, 0x48(r1) /* 8016EE0C 0016BD6C 7C 08 03 A6 */ mtlr r0 /* 8016EE10 0016BD70 38 21 00 50 */ addi r1, r1, 0x50 -/* 8016EE14 0016BD74 4E 80 00 20 */ blr +/* 8016EE14 0016BD74 4E 80 00 20 */ blr .global PathFind__8CMetroidFR13CStateManager9EStateMsgf PathFind__8CMetroidFR13CStateManager9EStateMsgf: @@ -5780,7 +5780,7 @@ lbl_8016EEA8: /* 8016EEA8 0016BE08 81 83 00 00 */ lwz r12, 0(r3) /* 8016EEAC 0016BE0C 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 8016EEB0 0016BE10 7D 89 03 A6 */ mtctr r12 -/* 8016EEB4 0016BE14 4E 80 04 21 */ bctrl +/* 8016EEB4 0016BE14 4E 80 04 21 */ bctrl /* 8016EEB8 0016BE18 28 03 00 00 */ cmplwi r3, 0 /* 8016EEBC 0016BE1C 41 82 00 64 */ beq lbl_8016EF20 /* 8016EEC0 0016BE20 7F A3 EB 78 */ mr r3, r29 @@ -5789,7 +5789,7 @@ lbl_8016EEA8: /* 8016EECC 0016BE2C C0 22 A0 80 */ lfs f1, lbl_805ABDA0@sda21(r2) /* 8016EED0 0016BE30 81 8C 01 90 */ lwz r12, 0x190(r12) /* 8016EED4 0016BE34 7D 89 03 A6 */ mtctr r12 -/* 8016EED8 0016BE38 4E 80 04 21 */ bctrl +/* 8016EED8 0016BE38 4E 80 04 21 */ bctrl /* 8016EEDC 0016BE3C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016EEE0 0016BE40 40 82 00 40 */ bne lbl_8016EF20 /* 8016EEE4 0016BE44 7F A3 EB 78 */ mr r3, r29 @@ -5798,7 +5798,7 @@ lbl_8016EEA8: /* 8016EEF0 0016BE50 C0 22 A0 80 */ lfs f1, lbl_805ABDA0@sda21(r2) /* 8016EEF4 0016BE54 81 8C 01 94 */ lwz r12, 0x194(r12) /* 8016EEF8 0016BE58 7D 89 03 A6 */ mtctr r12 -/* 8016EEFC 0016BE5C 4E 80 04 21 */ bctrl +/* 8016EEFC 0016BE5C 4E 80 04 21 */ bctrl /* 8016EF00 0016BE60 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016EF04 0016BE64 40 82 00 1C */ bne lbl_8016EF20 /* 8016EF08 0016BE68 FC 20 F8 90 */ fmr f1, f31 @@ -5865,7 +5865,7 @@ lbl_8016EF68: /* 8016EFF4 0016BF54 81 8C 00 A0 */ lwz r12, 0xa0(r12) /* 8016EFF8 0016BF58 B1 21 00 0C */ sth r9, 0xc(r1) /* 8016EFFC 0016BF5C 7D 89 03 A6 */ mtctr r12 -/* 8016F000 0016BF60 4E 80 04 21 */ bctrl +/* 8016F000 0016BF60 4E 80 04 21 */ bctrl /* 8016F004 0016BF64 C0 01 00 1C */ lfs f0, 0x1c(r1) /* 8016F008 0016BF68 D0 1D 07 A4 */ stfs f0, 0x7a4(r29) /* 8016F00C 0016BF6C C0 01 00 20 */ lfs f0, 0x20(r1) @@ -5896,7 +5896,7 @@ lbl_8016F04C: /* 8016F060 0016BFC0 83 A1 00 74 */ lwz r29, 0x74(r1) /* 8016F064 0016BFC4 7C 08 03 A6 */ mtlr r0 /* 8016F068 0016BFC8 38 21 00 90 */ addi r1, r1, 0x90 -/* 8016F06C 0016BFCC 4E 80 00 20 */ blr +/* 8016F06C 0016BFCC 4E 80 00 20 */ blr .global SelectTarget__8CMetroidFR13CStateManager9EStateMsgf SelectTarget__8CMetroidFR13CStateManager9EStateMsgf: @@ -6211,7 +6211,7 @@ lbl_8016F4F0: /* 8016F4FC 0016C45C 80 01 08 F4 */ lwz r0, 0x8f4(r1) /* 8016F500 0016C460 7C 08 03 A6 */ mtlr r0 /* 8016F504 0016C464 38 21 08 F0 */ addi r1, r1, 0x8f0 -/* 8016F508 0016C468 4E 80 00 20 */ blr +/* 8016F508 0016C468 4E 80 00 20 */ blr .global Generate__8CMetroidFR13CStateManager9EStateMsgf Generate__8CMetroidFR13CStateManager9EStateMsgf: @@ -6261,7 +6261,7 @@ lbl_8016F590: /* 8016F5AC 0016C50C 81 9F 00 00 */ lwz r12, 0(r31) /* 8016F5B0 0016C510 81 8C 02 98 */ lwz r12, 0x298(r12) /* 8016F5B4 0016C514 7D 89 03 A6 */ mtctr r12 -/* 8016F5B8 0016C518 4E 80 04 21 */ bctrl +/* 8016F5B8 0016C518 4E 80 04 21 */ bctrl lbl_8016F5BC: /* 8016F5BC 0016C51C 38 60 00 01 */ li r3, 1 /* 8016F5C0 0016C520 90 7F 05 68 */ stw r3, 0x568(r31) @@ -6308,7 +6308,7 @@ lbl_8016F64C: /* 8016F650 0016C5B0 C0 22 A0 80 */ lfs f1, lbl_805ABDA0@sda21(r2) /* 8016F654 0016C5B4 81 8C 01 8C */ lwz r12, 0x18c(r12) /* 8016F658 0016C5B8 7D 89 03 A6 */ mtctr r12 -/* 8016F65C 0016C5BC 4E 80 04 21 */ bctrl +/* 8016F65C 0016C5BC 4E 80 04 21 */ bctrl /* 8016F660 0016C5C0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016F664 0016C5C4 41 82 00 D4 */ beq lbl_8016F738 /* 8016F668 0016C5C8 3C C0 80 3E */ lis r6, lbl_803DAA68@ha @@ -6432,7 +6432,7 @@ lbl_8016F824: /* 8016F834 0016C794 C0 22 A0 D8 */ lfs f1, lbl_805ABDF8@sda21(r2) /* 8016F838 0016C798 81 8C 02 30 */ lwz r12, 0x230(r12) /* 8016F83C 0016C79C 7D 89 03 A6 */ mtctr r12 -/* 8016F840 0016C7A0 4E 80 04 21 */ bctrl +/* 8016F840 0016C7A0 4E 80 04 21 */ bctrl /* 8016F844 0016C7A4 7C 7E 1B 78 */ mr r30, r3 /* 8016F848 0016C7A8 7F E3 FB 78 */ mr r3, r31 /* 8016F84C 0016C7AC 81 9F 00 00 */ lwz r12, 0(r31) @@ -6440,7 +6440,7 @@ lbl_8016F824: /* 8016F854 0016C7B4 C0 22 A0 80 */ lfs f1, lbl_805ABDA0@sda21(r2) /* 8016F858 0016C7B8 81 8C 01 8C */ lwz r12, 0x18c(r12) /* 8016F85C 0016C7BC 7D 89 03 A6 */ mtctr r12 -/* 8016F860 0016C7C0 4E 80 04 21 */ bctrl +/* 8016F860 0016C7C0 4E 80 04 21 */ bctrl /* 8016F864 0016C7C4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016F868 0016C7C8 40 82 00 0C */ bne lbl_8016F874 /* 8016F86C 0016C7CC 57 C0 06 3F */ clrlwi. r0, r30, 0x18 @@ -6533,7 +6533,7 @@ lbl_8016F99C: /* 8016F9B4 0016C914 81 83 00 00 */ lwz r12, 0(r3) /* 8016F9B8 0016C918 81 8C 01 8C */ lwz r12, 0x18c(r12) /* 8016F9BC 0016C91C 7D 89 03 A6 */ mtctr r12 -/* 8016F9C0 0016C920 4E 80 04 21 */ bctrl +/* 8016F9C0 0016C920 4E 80 04 21 */ bctrl /* 8016F9C4 0016C924 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016F9C8 0016C928 41 82 00 28 */ beq lbl_8016F9F0 /* 8016F9CC 0016C92C C0 1F 07 F8 */ lfs f0, 0x7f8(r31) @@ -6563,7 +6563,7 @@ lbl_8016F9F8: /* 8016FA24 0016C984 83 A1 00 54 */ lwz r29, 0x54(r1) /* 8016FA28 0016C988 7C 08 03 A6 */ mtlr r0 /* 8016FA2C 0016C98C 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8016FA30 0016C990 4E 80 00 20 */ blr +/* 8016FA30 0016C990 4E 80 00 20 */ blr .global TargetPatrol__8CMetroidFR13CStateManager9EStateMsgf TargetPatrol__8CMetroidFR13CStateManager9EStateMsgf: @@ -6601,7 +6601,7 @@ lbl_8016FA7C: /* 8016FAAC 0016CA0C 81 9D 00 00 */ lwz r12, 0(r29) /* 8016FAB0 0016CA10 81 8C 01 C0 */ lwz r12, 0x1c0(r12) /* 8016FAB4 0016CA14 7D 89 03 A6 */ mtctr r12 -/* 8016FAB8 0016CA18 4E 80 04 21 */ bctrl +/* 8016FAB8 0016CA18 4E 80 04 21 */ bctrl /* 8016FABC 0016CA1C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016FAC0 0016CA20 41 82 00 28 */ beq lbl_8016FAE8 /* 8016FAC4 0016CA24 FC 20 F8 90 */ fmr f1, f31 @@ -6628,7 +6628,7 @@ lbl_8016FAF4: /* 8016FB10 0016CA70 81 9D 00 00 */ lwz r12, 0(r29) /* 8016FB14 0016CA74 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 8016FB18 0016CA78 7D 89 03 A6 */ mtctr r12 -/* 8016FB1C 0016CA7C 4E 80 04 21 */ bctrl +/* 8016FB1C 0016CA7C 4E 80 04 21 */ bctrl /* 8016FB20 0016CA80 28 03 00 00 */ cmplwi r3, 0 /* 8016FB24 0016CA84 41 82 00 94 */ beq lbl_8016FBB8 /* 8016FB28 0016CA88 FC 20 F8 90 */ fmr f1, f31 @@ -6641,7 +6641,7 @@ lbl_8016FB40: /* 8016FB40 0016CAA0 81 83 00 00 */ lwz r12, 0(r3) /* 8016FB44 0016CAA4 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 8016FB48 0016CAA8 7D 89 03 A6 */ mtctr r12 -/* 8016FB4C 0016CAAC 4E 80 04 21 */ bctrl +/* 8016FB4C 0016CAAC 4E 80 04 21 */ bctrl /* 8016FB50 0016CAB0 28 03 00 00 */ cmplwi r3, 0 /* 8016FB54 0016CAB4 41 82 00 40 */ beq lbl_8016FB94 /* 8016FB58 0016CAB8 7F A3 EB 78 */ mr r3, r29 @@ -6650,7 +6650,7 @@ lbl_8016FB40: /* 8016FB64 0016CAC4 C0 22 A0 80 */ lfs f1, lbl_805ABDA0@sda21(r2) /* 8016FB68 0016CAC8 81 8C 01 90 */ lwz r12, 0x190(r12) /* 8016FB6C 0016CACC 7D 89 03 A6 */ mtctr r12 -/* 8016FB70 0016CAD0 4E 80 04 21 */ bctrl +/* 8016FB70 0016CAD0 4E 80 04 21 */ bctrl /* 8016FB74 0016CAD4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016FB78 0016CAD8 40 82 00 1C */ bne lbl_8016FB94 /* 8016FB7C 0016CADC FC 20 F8 90 */ fmr f1, f31 @@ -6679,7 +6679,7 @@ lbl_8016FBB8: /* 8016FBCC 0016CB2C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8016FBD0 0016CB30 7C 08 03 A6 */ mtlr r0 /* 8016FBD4 0016CB34 38 21 00 30 */ addi r1, r1, 0x30 -/* 8016FBD8 0016CB38 4E 80 00 20 */ blr +/* 8016FBD8 0016CB38 4E 80 00 20 */ blr .global Patrol__8CMetroidFR13CStateManager9EStateMsgf Patrol__8CMetroidFR13CStateManager9EStateMsgf: @@ -6719,7 +6719,7 @@ lbl_8016FC34: /* 8016FC58 0016CBB8 83 A1 00 0C */ lwz r29, 0xc(r1) /* 8016FC5C 0016CBBC 7C 08 03 A6 */ mtlr r0 /* 8016FC60 0016CBC0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8016FC64 0016CBC4 4E 80 00 20 */ blr +/* 8016FC64 0016CBC4 4E 80 00 20 */ blr .global ShouldDodge__8CMetroidFR13CStateManagerf ShouldDodge__8CMetroidFR13CStateManagerf: @@ -6933,7 +6933,7 @@ lbl_8016FF54: /* 8016FF64 0016CEC4 83 81 08 A0 */ lwz r28, 0x8a0(r1) /* 8016FF68 0016CEC8 7C 08 03 A6 */ mtlr r0 /* 8016FF6C 0016CECC 38 21 08 B0 */ addi r1, r1, 0x8b0 -/* 8016FF70 0016CED0 4E 80 00 20 */ blr +/* 8016FF70 0016CED0 4E 80 00 20 */ blr .global Inside__8CMetroidFR13CStateManagerf Inside__8CMetroidFR13CStateManagerf: @@ -6998,13 +6998,13 @@ lbl_80170034: .global sub_8017004c sub_8017004c: -/* 8017004C 0016CFAC 4E 80 00 20 */ blr +/* 8017004C 0016CFAC 4E 80 00 20 */ blr .global ShouldWallHang__8CMetroidFR13CStateManagerf ShouldWallHang__8CMetroidFR13CStateManagerf: /* 80170050 0016CFB0 88 03 06 94 */ lbz r0, 0x694(r3) /* 80170054 0016CFB4 54 03 CF FE */ rlwinm r3, r0, 0x19, 0x1f, 0x1f -/* 80170058 0016CFB8 4E 80 00 20 */ blr +/* 80170058 0016CFB8 4E 80 00 20 */ blr .global Leash__8CMetroidFR13CStateManagerf Leash__8CMetroidFR13CStateManagerf: @@ -7091,7 +7091,7 @@ lbl_80170184: /* 8017018C 0016D0EC 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80170190 0016D0F0 7C 08 03 A6 */ mtlr r0 /* 80170194 0016D0F4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80170198 0016D0F8 4E 80 00 20 */ blr +/* 80170198 0016D0F8 4E 80 00 20 */ blr .global ShouldTurn__8CMetroidFR13CStateManagerf ShouldTurn__8CMetroidFR13CStateManagerf: @@ -7163,7 +7163,7 @@ lbl_80170294: /* 80170298 0016D1F8 83 E1 00 5C */ lwz r31, 0x5c(r1) /* 8017029C 0016D1FC 7C 08 03 A6 */ mtlr r0 /* 801702A0 0016D200 38 21 00 60 */ addi r1, r1, 0x60 -/* 801702A4 0016D204 4E 80 00 20 */ blr +/* 801702A4 0016D204 4E 80 00 20 */ blr .global AggressionCheck__8CMetroidFR13CStateManagerf AggressionCheck__8CMetroidFR13CStateManagerf: @@ -7247,7 +7247,7 @@ lbl_801703BC: /* 801703C8 0016D328 83 A1 00 24 */ lwz r29, 0x24(r1) /* 801703CC 0016D32C 7C 08 03 A6 */ mtlr r0 /* 801703D0 0016D330 38 21 00 30 */ addi r1, r1, 0x30 -/* 801703D4 0016D334 4E 80 00 20 */ blr +/* 801703D4 0016D334 4E 80 00 20 */ blr .global SpotPlayer__8CMetroidFR13CStateManagerf SpotPlayer__8CMetroidFR13CStateManagerf: @@ -7349,7 +7349,7 @@ lbl_8017052C: /* 80170538 0016D498 80 01 00 54 */ lwz r0, 0x54(r1) /* 8017053C 0016D49C 7C 08 03 A6 */ mtlr r0 /* 80170540 0016D4A0 38 21 00 50 */ addi r1, r1, 0x50 -/* 80170544 0016D4A4 4E 80 00 20 */ blr +/* 80170544 0016D4A4 4E 80 00 20 */ blr .global InDetectionRange__8CMetroidFR13CStateManagerf InDetectionRange__8CMetroidFR13CStateManagerf: @@ -7575,7 +7575,7 @@ lbl_80170864: /* 80170868 0016D7C8 80 01 08 B4 */ lwz r0, 0x8b4(r1) /* 8017086C 0016D7CC 7C 08 03 A6 */ mtlr r0 /* 80170870 0016D7D0 38 21 08 B0 */ addi r1, r1, 0x8b0 -/* 80170874 0016D7D4 4E 80 00 20 */ blr +/* 80170874 0016D7D4 4E 80 00 20 */ blr .global InRange__8CMetroidFR13CStateManagerf InRange__8CMetroidFR13CStateManagerf: @@ -7651,7 +7651,7 @@ lbl_80170974: /* 80170980 0016D8E0 83 A1 00 34 */ lwz r29, 0x34(r1) /* 80170984 0016D8E4 7C 08 03 A6 */ mtlr r0 /* 80170988 0016D8E8 38 21 00 40 */ addi r1, r1, 0x40 -/* 8017098C 0016D8EC 4E 80 00 20 */ blr +/* 8017098C 0016D8EC 4E 80 00 20 */ blr .global InPosition__8CMetroidFR13CStateManagerf InPosition__8CMetroidFR13CStateManagerf: @@ -7663,14 +7663,14 @@ InPosition__8CMetroidFR13CStateManagerf: /* 801709A4 0016D904 81 83 00 00 */ lwz r12, 0(r3) /* 801709A8 0016D908 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801709AC 0016D90C 7D 89 03 A6 */ mtctr r12 -/* 801709B0 0016D910 4E 80 04 21 */ bctrl +/* 801709B0 0016D910 4E 80 04 21 */ bctrl /* 801709B4 0016D914 28 03 00 00 */ cmplwi r3, 0 /* 801709B8 0016D918 41 82 00 38 */ beq lbl_801709F0 /* 801709BC 0016D91C 7F E3 FB 78 */ mr r3, r31 /* 801709C0 0016D920 81 9F 00 00 */ lwz r12, 0(r31) /* 801709C4 0016D924 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801709C8 0016D928 7D 89 03 A6 */ mtctr r12 -/* 801709CC 0016D92C 4E 80 04 21 */ bctrl +/* 801709CC 0016D92C 4E 80 04 21 */ bctrl /* 801709D0 0016D930 80 A3 00 C8 */ lwz r5, 0xc8(r3) /* 801709D4 0016D934 80 63 00 04 */ lwz r3, 4(r3) /* 801709D8 0016D938 7C A4 FE 70 */ srawi r4, r5, 0x1f @@ -7701,7 +7701,7 @@ lbl_80170A30: /* 80170A34 0016D994 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80170A38 0016D998 7C 08 03 A6 */ mtlr r0 /* 80170A3C 0016D99C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80170A40 0016D9A0 4E 80 00 20 */ blr +/* 80170A40 0016D9A0 4E 80 00 20 */ blr .global InAttackPosition__8CMetroidFR13CStateManagerf InAttackPosition__8CMetroidFR13CStateManagerf: @@ -7938,7 +7938,7 @@ lbl_80170D84: /* 80170DC4 0016DD24 83 81 00 E0 */ lwz r28, 0xe0(r1) /* 80170DC8 0016DD28 7C 08 03 A6 */ mtlr r0 /* 80170DCC 0016DD2C 38 21 01 50 */ addi r1, r1, 0x150 -/* 80170DD0 0016DD30 4E 80 00 20 */ blr +/* 80170DD0 0016DD30 4E 80 00 20 */ blr .global ShouldAttack__8CMetroidFR13CStateManagerf ShouldAttack__8CMetroidFR13CStateManagerf: @@ -7980,13 +7980,13 @@ lbl_80170E4C: /* 80170E54 0016DDB4 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80170E58 0016DDB8 7C 08 03 A6 */ mtlr r0 /* 80170E5C 0016DDBC 38 21 00 30 */ addi r1, r1, 0x30 -/* 80170E60 0016DDC0 4E 80 00 20 */ blr +/* 80170E60 0016DDC0 4E 80 00 20 */ blr .global ShotAt__8CMetroidFR13CStateManagerf ShotAt__8CMetroidFR13CStateManagerf: /* 80170E64 0016DDC4 88 03 09 BF */ lbz r0, 0x9bf(r3) /* 80170E68 0016DDC8 54 03 DF FE */ rlwinm r3, r0, 0x1b, 0x1f, 0x1f -/* 80170E6C 0016DDCC 4E 80 00 20 */ blr +/* 80170E6C 0016DDCC 4E 80 00 20 */ blr .global Attacked__8CMetroidFR13CStateManagerf Attacked__8CMetroidFR13CStateManagerf: @@ -8003,17 +8003,17 @@ Attacked__8CMetroidFR13CStateManagerf: /* 80170E98 0016DDF8 4C 41 13 82 */ cror 2, 1, 2 /* 80170E9C 0016DDFC 7C 00 00 26 */ mfcr r0 /* 80170EA0 0016DE00 54 03 1F FE */ rlwinm r3, r0, 3, 0x1f, 0x1f -/* 80170EA4 0016DE04 4E 80 00 20 */ blr +/* 80170EA4 0016DE04 4E 80 00 20 */ blr lbl_80170EA8: /* 80170EA8 0016DE08 C0 03 06 50 */ lfs f0, 0x650(r3) /* 80170EAC 0016DE0C FC 03 00 40 */ fcmpo cr0, f3, f0 /* 80170EB0 0016DE10 4C 41 13 82 */ cror 2, 1, 2 /* 80170EB4 0016DE14 40 82 00 0C */ bne lbl_80170EC0 /* 80170EB8 0016DE18 38 60 00 01 */ li r3, 1 -/* 80170EBC 0016DE1C 4E 80 00 20 */ blr +/* 80170EBC 0016DE1C 4E 80 00 20 */ blr lbl_80170EC0: /* 80170EC0 0016DE20 38 60 00 00 */ li r3, 0 -/* 80170EC4 0016DE24 4E 80 00 20 */ blr +/* 80170EC4 0016DE24 4E 80 00 20 */ blr .global PatternShagged__8CMetroidFR13CStateManagerf PatternShagged__8CMetroidFR13CStateManagerf: @@ -8074,7 +8074,7 @@ lbl_80170F84: /* 80170F8C 0016DEEC 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80170F90 0016DEF0 7C 08 03 A6 */ mtlr r0 /* 80170F94 0016DEF4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80170F98 0016DEF8 4E 80 00 20 */ blr +/* 80170F98 0016DEF8 4E 80 00 20 */ blr .global LostInterest__8CMetroidFR13CStateManagerf LostInterest__8CMetroidFR13CStateManagerf: @@ -8146,7 +8146,7 @@ lbl_80171080: /* 80171088 0016DFE8 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8017108C 0016DFEC 7C 08 03 A6 */ mtlr r0 /* 80171090 0016DFF0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80171094 0016DFF4 4E 80 00 20 */ blr +/* 80171094 0016DFF4 4E 80 00 20 */ blr .global AttackOver__8CMetroidFR13CStateManagerf AttackOver__8CMetroidFR13CStateManagerf: @@ -8217,7 +8217,7 @@ AttackOver__8CMetroidFR13CStateManagerf: /* 80171198 0016E0F8 81 9E 06 A0 */ lwz r12, 0x6a0(r30) /* 8017119C 0016E0FC 81 8C 00 14 */ lwz r12, 0x14(r12) /* 801711A0 0016E100 7D 89 03 A6 */ mtctr r12 -/* 801711A4 0016E104 4E 80 04 21 */ bctrl +/* 801711A4 0016E104 4E 80 04 21 */ bctrl /* 801711A8 0016E108 C0 01 00 44 */ lfs f0, 0x44(r1) /* 801711AC 0016E10C 38 61 00 74 */ addi r3, r1, 0x74 /* 801711B0 0016E110 C0 C1 00 48 */ lfs f6, 0x48(r1) @@ -8260,7 +8260,7 @@ lbl_8017122C: /* 8017123C 0016E19C 83 C1 00 C8 */ lwz r30, 0xc8(r1) /* 80171240 0016E1A0 7C 08 03 A6 */ mtlr r0 /* 80171244 0016E1A4 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 80171248 0016E1A8 4E 80 00 20 */ blr +/* 80171248 0016E1A8 4E 80 00 20 */ blr .global AnimOver__8CMetroidFR13CStateManagerf AnimOver__8CMetroidFR13CStateManagerf: @@ -8268,7 +8268,7 @@ AnimOver__8CMetroidFR13CStateManagerf: /* 80171250 0016E1B0 20 00 00 03 */ subfic r0, r0, 3 /* 80171254 0016E1B4 7C 00 00 34 */ cntlzw r0, r0 /* 80171258 0016E1B8 54 03 D9 7E */ srwi r3, r0, 5 -/* 8017125C 0016E1BC 4E 80 00 20 */ blr +/* 8017125C 0016E1BC 4E 80 00 20 */ blr .global Death__8CMetroidFRC9CVector3fR13CStateManager Death__8CMetroidFRC9CVector3fR13CStateManager: @@ -8295,7 +8295,7 @@ Death__8CMetroidFRC9CVector3fR13CStateManager: /* 801712B0 0016E210 83 C1 00 08 */ lwz r30, 8(r1) /* 801712B4 0016E214 7C 08 03 A6 */ mtlr r0 /* 801712B8 0016E218 38 21 00 10 */ addi r1, r1, 0x10 -/* 801712BC 0016E21C 4E 80 00 20 */ blr +/* 801712BC 0016E21C 4E 80 00 20 */ blr .global KnockBack__8CMetroidFRC9CVector3fR13CStateManagerRC11CDamageInfo14EKnockBackTypef KnockBack__8CMetroidFRC9CVector3fR13CStateManagerRC11CDamageInfo14EKnockBackTypef: @@ -8318,7 +8318,7 @@ KnockBack__8CMetroidFRC9CVector3fR13CStateManagerRC11CDamageInfo14EKnockBackType /* 80171300 0016E260 81 83 00 00 */ lwz r12, 0(r3) /* 80171304 0016E264 81 8C 00 38 */ lwz r12, 0x38(r12) /* 80171308 0016E268 7D 89 03 A6 */ mtctr r12 -/* 8017130C 0016E26C 4E 80 04 21 */ bctrl +/* 8017130C 0016E26C 4E 80 04 21 */ bctrl /* 80171310 0016E270 7C 60 1B 78 */ mr r0, r3 /* 80171314 0016E274 80 7C 04 50 */ lwz r3, 0x450(r28) /* 80171318 0016E278 7C 1B 03 78 */ mr r27, r0 @@ -8408,7 +8408,7 @@ lbl_80171448: /* 80171454 0016E3B4 80 01 00 44 */ lwz r0, 0x44(r1) /* 80171458 0016E3B8 7C 08 03 A6 */ mtlr r0 /* 8017145C 0016E3BC 38 21 00 40 */ addi r1, r1, 0x40 -/* 80171460 0016E3C0 4E 80 00 20 */ blr +/* 80171460 0016E3C0 4E 80 00 20 */ blr .global DoUserAnimEvent__8CMetroidFR13CStateManagerRC13CInt32POINode14EUserEventType DoUserAnimEvent__8CMetroidFR13CStateManagerRC13CInt32POINode14EUserEventType: @@ -8452,7 +8452,7 @@ lbl_801714D8: /* 801714EC 0016E44C 83 81 00 08 */ lwz r28, 8(r1) /* 801714F0 0016E450 7C 08 03 A6 */ mtlr r0 /* 801714F4 0016E454 38 21 00 20 */ addi r1, r1, 0x20 -/* 801714F8 0016E458 4E 80 00 20 */ blr +/* 801714F8 0016E458 4E 80 00 20 */ blr .global GetCollisionResponseType__8CMetroidCFRC9CVector3fRC9CVector3fRC11CWeaponModei GetCollisionResponseType__8CMetroidCFRC9CVector3fRC9CVector3fRC11CWeaponModei: @@ -8475,7 +8475,7 @@ GetCollisionResponseType__8CMetroidCFRC9CVector3fRC9CVector3fRC11CWeaponModei: /* 8017153C 0016E49C 54 1E 17 FE */ rlwinm r30, r0, 2, 0x1f, 0x1f /* 80171540 0016E4A0 81 8C 00 38 */ lwz r12, 0x38(r12) /* 80171544 0016E4A4 7D 89 03 A6 */ mtctr r12 -/* 80171548 0016E4A8 4E 80 04 21 */ bctrl +/* 80171548 0016E4A8 4E 80 04 21 */ bctrl /* 8017154C 0016E4AC 7F A4 EB 78 */ mr r4, r29 /* 80171550 0016E4B0 38 A0 00 00 */ li r5, 0 /* 80171554 0016E4B4 4B F9 11 B5 */ bl WeaponHurts__20CDamageVulnerabilityCFRC11CWeaponMode @@ -8492,7 +8492,7 @@ lbl_8017156C: /* 8017157C 0016E4DC 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80171580 0016E4E0 7C 08 03 A6 */ mtlr r0 /* 80171584 0016E4E4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80171588 0016E4E8 4E 80 00 20 */ blr +/* 80171588 0016E4E8 4E 80 00 20 */ blr .global GetDamageVulnerability__8CMetroidCFRC9CVector3fRC9CVector3fRC11CDamageInfo GetDamageVulnerability__8CMetroidCFRC9CVector3fRC9CVector3fRC11CDamageInfo: @@ -8502,11 +8502,11 @@ GetDamageVulnerability__8CMetroidCFRC9CVector3fRC9CVector3fRC11CDamageInfo: /* 80171598 0016E4F8 81 83 00 00 */ lwz r12, 0(r3) /* 8017159C 0016E4FC 81 8C 00 38 */ lwz r12, 0x38(r12) /* 801715A0 0016E500 7D 89 03 A6 */ mtctr r12 -/* 801715A4 0016E504 4E 80 04 21 */ bctrl +/* 801715A4 0016E504 4E 80 04 21 */ bctrl /* 801715A8 0016E508 80 01 00 14 */ lwz r0, 0x14(r1) /* 801715AC 0016E50C 7C 08 03 A6 */ mtlr r0 /* 801715B0 0016E510 38 21 00 10 */ addi r1, r1, 0x10 -/* 801715B4 0016E514 4E 80 00 20 */ blr +/* 801715B4 0016E514 4E 80 00 20 */ blr .global GetDamageVulnerability__8CMetroidCFv GetDamageVulnerability__8CMetroidCFv: @@ -8585,12 +8585,12 @@ lbl_801716A8: /* 801716AC 0016E60C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801716B0 0016E610 7C 08 03 A6 */ mtlr r0 /* 801716B4 0016E614 38 21 00 10 */ addi r1, r1, 0x10 -/* 801716B8 0016E618 4E 80 00 20 */ blr +/* 801716B8 0016E618 4E 80 00 20 */ blr .global GetCollisionPrimitive__8CMetroidCFv GetCollisionPrimitive__8CMetroidCFv: /* 801716BC 0016E61C 38 63 06 A0 */ addi r3, r3, 0x6a0 -/* 801716C0 0016E620 4E 80 00 20 */ blr +/* 801716C0 0016E620 4E 80 00 20 */ blr .global sub_801716c4 sub_801716c4: @@ -8631,7 +8631,7 @@ sub_801716c4: /* 8017174C 0016E6AC 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80171750 0016E6B0 7C 08 03 A6 */ mtlr r0 /* 80171754 0016E6B4 38 21 00 30 */ addi r1, r1, 0x30 -/* 80171758 0016E6B8 4E 80 00 20 */ blr +/* 80171758 0016E6B8 4E 80 00 20 */ blr .global sub_8017175c sub_8017175c: @@ -8678,7 +8678,7 @@ sub_8017175c: /* 801717FC 0016E75C 80 01 00 94 */ lwz r0, 0x94(r1) /* 80171800 0016E760 7C 08 03 A6 */ mtlr r0 /* 80171804 0016E764 38 21 00 90 */ addi r1, r1, 0x90 -/* 80171808 0016E768 4E 80 00 20 */ blr +/* 80171808 0016E768 4E 80 00 20 */ blr .global GetTouchBounds__8CMetroidCFv GetTouchBounds__8CMetroidCFv: @@ -8694,7 +8694,7 @@ GetTouchBounds__8CMetroidCFv: /* 80171830 0016E790 38 A5 00 34 */ addi r5, r5, 0x34 /* 80171834 0016E794 81 8C 00 14 */ lwz r12, 0x14(r12) /* 80171838 0016E798 7D 89 03 A6 */ mtctr r12 -/* 8017183C 0016E79C 4E 80 04 21 */ bctrl +/* 8017183C 0016E79C 4E 80 04 21 */ bctrl /* 80171840 0016E7A0 38 00 00 01 */ li r0, 1 /* 80171844 0016E7A4 28 1F 00 00 */ cmplwi r31, 0 /* 80171848 0016E7A8 98 1F 00 18 */ stb r0, 0x18(r31) @@ -8716,7 +8716,7 @@ lbl_80171880: /* 80171884 0016E7E4 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 80171888 0016E7E8 7C 08 03 A6 */ mtlr r0 /* 8017188C 0016E7EC 38 21 00 30 */ addi r1, r1, 0x30 -/* 80171890 0016E7F0 4E 80 00 20 */ blr +/* 80171890 0016E7F0 4E 80 00 20 */ blr .global Touch__8CMetroidFR6CActorR13CStateManager Touch__8CMetroidFR6CActorR13CStateManager: @@ -8749,7 +8749,7 @@ Touch__8CMetroidFR6CActorR13CStateManager: /* 801718FC 0016E85C 81 9C 00 00 */ lwz r12, 0(r28) /* 80171900 0016E860 81 8C 00 38 */ lwz r12, 0x38(r12) /* 80171904 0016E864 7D 89 03 A6 */ mtctr r12 -/* 80171908 0016E868 4E 80 04 21 */ bctrl +/* 80171908 0016E868 4E 80 04 21 */ bctrl /* 8017190C 0016E86C 80 1C 03 FC */ lwz r0, 0x3fc(r28) /* 80171910 0016E870 2C 00 00 02 */ cmpwi r0, 2 /* 80171914 0016E874 41 82 01 20 */ beq lbl_80171A34 @@ -8824,7 +8824,7 @@ lbl_80171984: /* 80171A24 0016E984 81 9C 00 00 */ lwz r12, 0(r28) /* 80171A28 0016E988 81 8C 02 90 */ lwz r12, 0x290(r12) /* 80171A2C 0016E98C 7D 89 03 A6 */ mtctr r12 -/* 80171A30 0016E990 4E 80 04 21 */ bctrl +/* 80171A30 0016E990 4E 80 04 21 */ bctrl lbl_80171A34: /* 80171A34 0016E994 88 1C 09 BF */ lbz r0, 0x9bf(r28) /* 80171A38 0016E998 38 60 00 01 */ li r3, 1 @@ -8845,7 +8845,7 @@ lbl_80171A54: /* 80171A6C 0016E9CC 83 81 00 60 */ lwz r28, 0x60(r1) /* 80171A70 0016E9D0 7C 08 03 A6 */ mtlr r0 /* 80171A74 0016E9D4 38 21 00 80 */ addi r1, r1, 0x80 -/* 80171A78 0016E9D8 4E 80 00 20 */ blr +/* 80171A78 0016E9D8 4E 80 00 20 */ blr .global Render__8CMetroidCFRC13CStateManager Render__8CMetroidCFRC13CStateManager: @@ -8856,7 +8856,7 @@ Render__8CMetroidCFRC13CStateManager: /* 80171A8C 0016E9EC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80171A90 0016E9F0 7C 08 03 A6 */ mtlr r0 /* 80171A94 0016E9F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80171A98 0016E9F8 4E 80 00 20 */ blr +/* 80171A98 0016E9F8 4E 80 00 20 */ blr .global AcceptScriptMsg__8CMetroidF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__8CMetroidF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -8923,7 +8923,7 @@ lbl_80171B48: /* 80171B78 0016EAD8 81 9F 00 00 */ lwz r12, 0(r31) /* 80171B7C 0016EADC 81 8C 00 38 */ lwz r12, 0x38(r12) /* 80171B80 0016EAE0 7D 89 03 A6 */ mtctr r12 -/* 80171B84 0016EAE4 4E 80 04 21 */ bctrl +/* 80171B84 0016EAE4 4E 80 04 21 */ bctrl /* 80171B88 0016EAE8 38 9E 01 2C */ addi r4, r30, 0x12c /* 80171B8C 0016EAEC 38 A0 00 00 */ li r5, 0 /* 80171B90 0016EAF0 4B F9 09 F5 */ bl WeaponHits__20CDamageVulnerabilityCFRC11CWeaponModei @@ -8976,7 +8976,7 @@ lbl_80171C28: /* 80171C38 0016EB98 83 81 00 30 */ lwz r28, 0x30(r1) /* 80171C3C 0016EB9C 7C 08 03 A6 */ mtlr r0 /* 80171C40 0016EBA0 38 21 00 40 */ addi r1, r1, 0x40 -/* 80171C44 0016EBA4 4E 80 00 20 */ blr +/* 80171C44 0016EBA4 4E 80 00 20 */ blr .global Think__8CMetroidFfR13CStateManager Think__8CMetroidFfR13CStateManager: @@ -9035,7 +9035,7 @@ lbl_80171D04: /* 80171D10 0016EC70 83 C1 00 20 */ lwz r30, 0x20(r1) /* 80171D14 0016EC74 7C 08 03 A6 */ mtlr r0 /* 80171D18 0016EC78 38 21 00 30 */ addi r1, r1, 0x30 -/* 80171D1C 0016EC7C 4E 80 00 20 */ blr +/* 80171D1C 0016EC7C 4E 80 00 20 */ blr .global Accept__8CMetroidFR8IVisitor Accept__8CMetroidFR8IVisitor: @@ -9048,11 +9048,11 @@ Accept__8CMetroidFR8IVisitor: /* 80171D38 0016EC98 7C 04 03 78 */ mr r4, r0 /* 80171D3C 0016EC9C 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 80171D40 0016ECA0 7D 89 03 A6 */ mtctr r12 -/* 80171D44 0016ECA4 4E 80 04 21 */ bctrl +/* 80171D44 0016ECA4 4E 80 04 21 */ bctrl /* 80171D48 0016ECA8 80 01 00 14 */ lwz r0, 0x14(r1) /* 80171D4C 0016ECAC 7C 08 03 A6 */ mtlr r0 /* 80171D50 0016ECB0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80171D54 0016ECB4 4E 80 00 20 */ blr +/* 80171D54 0016ECB4 4E 80 00 20 */ blr .global __dt__8CMetroid __dt__8CMetroid: @@ -9131,7 +9131,7 @@ lbl_80171E4C: /* 80171E58 0016EDB8 83 C1 00 08 */ lwz r30, 8(r1) /* 80171E5C 0016EDBC 7C 08 03 A6 */ mtlr r0 /* 80171E60 0016EDC0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80171E64 0016EDC4 4E 80 00 20 */ blr +/* 80171E64 0016EDC4 4E 80 00 20 */ blr .global "__ct__8CMetroidF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>Q210CPatterned11EFlavorTypeRC11CEntityInfoRC12CTransform4fRC10CModelDataRC14CPatternedInfoRC16CActorParametersRC12CMetroidData" "__ct__8CMetroidF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>Q210CPatterned11EFlavorTypeRC11CEntityInfoRC12CTransform4fRC10CModelDataRC14CPatternedInfoRC16CActorParametersRC12CMetroidData": @@ -9413,7 +9413,7 @@ lbl_80172274: /* 8017229C 0016F1FC 80 01 01 24 */ lwz r0, 0x124(r1) /* 801722A0 0016F200 7C 08 03 A6 */ mtlr r0 /* 801722A4 0016F204 38 21 01 20 */ addi r1, r1, 0x120 -/* 801722A8 0016F208 4E 80 00 20 */ blr +/* 801722A8 0016F208 4E 80 00 20 */ blr .global sub_801722ac sub_801722ac: @@ -9573,7 +9573,7 @@ sub_801722ac: /* 80172510 0016F470 90 03 01 30 */ stw r0, 0x130(r3) /* 80172514 0016F474 80 04 01 34 */ lwz r0, 0x134(r4) /* 80172518 0016F478 90 03 01 34 */ stw r0, 0x134(r3) -/* 8017251C 0016F47C 4E 80 00 20 */ blr +/* 8017251C 0016F47C 4E 80 00 20 */ blr .global sub_80172520 sub_80172520: @@ -9590,19 +9590,19 @@ lbl_8017253C: /* 80172544 0016F4A4 48 00 00 1C */ b lbl_80172560 lbl_80172548: /* 80172548 0016F4A8 38 63 00 E8 */ addi r3, r3, 0xe8 -/* 8017254C 0016F4AC 4E 80 00 20 */ blr +/* 8017254C 0016F4AC 4E 80 00 20 */ blr lbl_80172550: /* 80172550 0016F4B0 38 63 00 F8 */ addi r3, r3, 0xf8 -/* 80172554 0016F4B4 4E 80 00 20 */ blr +/* 80172554 0016F4B4 4E 80 00 20 */ blr lbl_80172558: /* 80172558 0016F4B8 38 63 01 08 */ addi r3, r3, 0x108 -/* 8017255C 0016F4BC 4E 80 00 20 */ blr +/* 8017255C 0016F4BC 4E 80 00 20 */ blr lbl_80172560: /* 80172560 0016F4C0 38 63 01 18 */ addi r3, r3, 0x118 -/* 80172564 0016F4C4 4E 80 00 20 */ blr +/* 80172564 0016F4C4 4E 80 00 20 */ blr lbl_80172568: /* 80172568 0016F4C8 38 63 00 E8 */ addi r3, r3, 0xe8 -/* 8017256C 0016F4CC 4E 80 00 20 */ blr +/* 8017256C 0016F4CC 4E 80 00 20 */ blr .global sub_80172570 sub_80172570: @@ -9628,7 +9628,7 @@ lbl_801725A4: /* 801725B0 0016F510 38 84 00 01 */ addi r4, r4, 1 lbl_801725B4: /* 801725B4 0016F514 7C 83 23 78 */ mr r3, r4 -/* 801725B8 0016F518 4E 80 00 20 */ blr +/* 801725B8 0016F518 4E 80 00 20 */ blr .global __ct__12CMetroidDataFR12CInputStream __ct__12CMetroidDataFR12CInputStream: @@ -9788,22 +9788,22 @@ lbl_801727D8: /* 80172800 0016F760 80 01 00 84 */ lwz r0, 0x84(r1) /* 80172804 0016F764 7C 08 03 A6 */ mtlr r0 /* 80172808 0016F768 38 21 00 80 */ addi r1, r1, 0x80 -/* 8017280C 0016F76C 4E 80 00 20 */ blr +/* 8017280C 0016F76C 4E 80 00 20 */ blr .global sub_80172810 sub_80172810: /* 80172810 0016F770 88 03 00 00 */ lbz r0, 0(r3) /* 80172814 0016F774 88 C4 00 00 */ lbz r6, 0(r4) /* 80172818 0016F778 7C 00 30 40 */ cmplw r0, r6 -/* 8017281C 0016F77C 4D 81 00 20 */ bgtlr +/* 8017281C 0016F77C 4D 81 00 20 */ bgtlr /* 80172820 0016F780 88 05 00 00 */ lbz r0, 0(r5) /* 80172824 0016F784 7C 00 30 40 */ cmplw r0, r6 /* 80172828 0016F788 40 80 00 0C */ bge lbl_80172834 /* 8017282C 0016F78C 7C A3 2B 78 */ mr r3, r5 -/* 80172830 0016F790 4E 80 00 20 */ blr +/* 80172830 0016F790 4E 80 00 20 */ blr lbl_80172834: /* 80172834 0016F794 7C 83 23 78 */ mr r3, r4 -/* 80172838 0016F798 4E 80 00 20 */ blr +/* 80172838 0016F798 4E 80 00 20 */ blr .global __sinit_CMetroid_cpp __sinit_CMetroid_cpp: diff --git a/asm/MetroidPrime/Enemies/CMetroidBeta.s b/asm/MetroidPrime/Enemies/CMetroidBeta.s index cc0a7afa..8f2c6143 100644 --- a/asm/MetroidPrime/Enemies/CMetroidBeta.s +++ b/asm/MetroidPrime/Enemies/CMetroidBeta.s @@ -382,17 +382,17 @@ lbl_805A906C: .global IsListening__12CMetroidBetaCFv IsListening__12CMetroidBetaCFv: /* 801C0D8C 001BDCEC 38 60 00 01 */ li r3, 1 -/* 801C0D90 001BDCF0 4E 80 00 20 */ blr +/* 801C0D90 001BDCF0 4E 80 00 20 */ blr .global GetCollisionPrimitive__12CMetroidBetaCFv GetCollisionPrimitive__12CMetroidBetaCFv: /* 801C0D94 001BDCF4 38 63 07 68 */ addi r3, r3, 0x768 -/* 801C0D98 001BDCF8 4E 80 00 20 */ blr +/* 801C0D98 001BDCF8 4E 80 00 20 */ blr .global GetSearchPath__12CMetroidBetaFv GetSearchPath__12CMetroidBetaFv: /* 801C0D9C 001BDCFC 38 63 06 7C */ addi r3, r3, 0x67c -/* 801C0DA0 001BDD00 4E 80 00 20 */ blr +/* 801C0DA0 001BDD00 4E 80 00 20 */ blr .global sub_801c0da4 sub_801c0da4: @@ -425,7 +425,7 @@ lbl_801C0DFC: /* 801C0DFC 001BDD5C C0 02 AA 98 */ lfs f0, lbl_805AC7B8@sda21(r2) lbl_801C0E00: /* 801C0E00 001BDD60 D0 03 08 3C */ stfs f0, 0x83c(r3) -/* 801C0E04 001BDD64 4E 80 00 20 */ blr +/* 801C0E04 001BDD64 4E 80 00 20 */ blr .global sub_801c0e08 sub_801c0e08: @@ -484,7 +484,7 @@ lbl_801C0ED0: /* 801C0ED4 001BDE34 83 E1 00 4C */ lwz r31, 0x4c(r1) /* 801C0ED8 001BDE38 7C 08 03 A6 */ mtlr r0 /* 801C0EDC 001BDE3C 38 21 00 50 */ addi r1, r1, 0x50 -/* 801C0EE0 001BDE40 4E 80 00 20 */ blr +/* 801C0EE0 001BDE40 4E 80 00 20 */ blr .global sub_801c0ee4 sub_801c0ee4: @@ -580,7 +580,7 @@ lbl_801C103C: /* 801C1040 001BDFA0 C0 22 AA 98 */ lfs f1, lbl_805AC7B8@sda21(r2) /* 801C1044 001BDFA4 81 8C 01 E8 */ lwz r12, 0x1e8(r12) /* 801C1048 001BDFA8 7D 89 03 A6 */ mtctr r12 -/* 801C104C 001BDFAC 4E 80 04 21 */ bctrl +/* 801C104C 001BDFAC 4E 80 04 21 */ bctrl /* 801C1050 001BDFB0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801C1054 001BDFB4 41 82 00 A0 */ beq lbl_801C10F4 /* 801C1058 001BDFB8 80 9E 08 4C */ lwz r4, 0x84c(r30) @@ -629,7 +629,7 @@ lbl_801C10F4: /* 801C1100 001BE060 83 A1 00 B4 */ lwz r29, 0xb4(r1) /* 801C1104 001BE064 7C 08 03 A6 */ mtlr r0 /* 801C1108 001BE068 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 801C110C 001BE06C 4E 80 00 20 */ blr +/* 801C110C 001BE06C 4E 80 00 20 */ blr .global sub_801c1110 sub_801c1110: @@ -725,7 +725,7 @@ lbl_801C1244: /* 801C125C 001BE1BC 83 81 00 50 */ lwz r28, 0x50(r1) /* 801C1260 001BE1C0 7C 08 03 A6 */ mtlr r0 /* 801C1264 001BE1C4 38 21 00 60 */ addi r1, r1, 0x60 -/* 801C1268 001BE1C8 4E 80 00 20 */ blr +/* 801C1268 001BE1C8 4E 80 00 20 */ blr .global sub_801c126c sub_801c126c: @@ -770,7 +770,7 @@ lbl_801C12F8: /* 801C1300 001BE260 83 C1 00 28 */ lwz r30, 0x28(r1) /* 801C1304 001BE264 7C 08 03 A6 */ mtlr r0 /* 801C1308 001BE268 38 21 00 30 */ addi r1, r1, 0x30 -/* 801C130C 001BE26C 4E 80 00 20 */ blr +/* 801C130C 001BE26C 4E 80 00 20 */ blr .global sub_801c1310 sub_801c1310: @@ -815,7 +815,7 @@ lbl_801C139C: /* 801C13A4 001BE304 83 C1 00 28 */ lwz r30, 0x28(r1) /* 801C13A8 001BE308 7C 08 03 A6 */ mtlr r0 /* 801C13AC 001BE30C 38 21 00 30 */ addi r1, r1, 0x30 -/* 801C13B0 001BE310 4E 80 00 20 */ blr +/* 801C13B0 001BE310 4E 80 00 20 */ blr .global sub_801c13b4 sub_801c13b4: @@ -826,7 +826,7 @@ sub_801c13b4: /* 801C13C4 001BE324 D0 03 00 04 */ stfs f0, 4(r3) /* 801C13C8 001BE328 C0 04 00 08 */ lfs f0, 8(r4) /* 801C13CC 001BE32C D0 03 00 08 */ stfs f0, 8(r3) -/* 801C13D0 001BE330 4E 80 00 20 */ blr +/* 801C13D0 001BE330 4E 80 00 20 */ blr .global sub_801c13d4 sub_801c13d4: @@ -885,7 +885,7 @@ sub_801c13d4: /* 801C14A4 001BE404 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 801C14A8 001BE408 7C 08 03 A6 */ mtlr r0 /* 801C14AC 001BE40C 38 21 00 50 */ addi r1, r1, 0x50 -/* 801C14B0 001BE410 4E 80 00 20 */ blr +/* 801C14B0 001BE410 4E 80 00 20 */ blr .global sub_801c14b4 sub_801c14b4: @@ -923,14 +923,14 @@ sub_801c14b4: /* 801C1530 001BE490 81 9F 00 00 */ lwz r12, 0(r31) /* 801C1534 001BE494 81 8C 00 90 */ lwz r12, 0x90(r12) /* 801C1538 001BE498 7D 89 03 A6 */ mtctr r12 -/* 801C153C 001BE49C 4E 80 04 21 */ bctrl +/* 801C153C 001BE49C 4E 80 04 21 */ bctrl /* 801C1540 001BE4A0 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 801C1544 001BE4A4 80 01 00 34 */ lwz r0, 0x34(r1) /* 801C1548 001BE4A8 CB E1 00 20 */ lfd f31, 0x20(r1) /* 801C154C 001BE4AC 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801C1550 001BE4B0 7C 08 03 A6 */ mtlr r0 /* 801C1554 001BE4B4 38 21 00 30 */ addi r1, r1, 0x30 -/* 801C1558 001BE4B8 4E 80 00 20 */ blr +/* 801C1558 001BE4B8 4E 80 00 20 */ blr .global sub_801c155c sub_801c155c: @@ -941,7 +941,7 @@ sub_801c155c: /* 801C156C 001BE4CC EC 01 00 24 */ fdivs f0, f1, f0 /* 801C1570 001BE4D0 C0 22 AA A4 */ lfs f1, lbl_805AC7C4@sda21(r2) /* 801C1574 001BE4D4 EC 21 00 2A */ fadds f1, f1, f0 -/* 801C1578 001BE4D8 4E 80 00 20 */ blr +/* 801C1578 001BE4D8 4E 80 00 20 */ blr lbl_801C157C: /* 801C157C 001BE4DC C0 63 06 5C */ lfs f3, 0x65c(r3) /* 801C1580 001BE4E0 FC 01 18 40 */ fcmpo cr0, f1, f3 @@ -951,10 +951,10 @@ lbl_801C157C: /* 801C1590 001BE4F0 EC 03 00 28 */ fsubs f0, f3, f0 /* 801C1594 001BE4F4 EC 01 00 24 */ fdivs f0, f1, f0 /* 801C1598 001BE4F8 EC 22 00 2A */ fadds f1, f2, f0 -/* 801C159C 001BE4FC 4E 80 00 20 */ blr +/* 801C159C 001BE4FC 4E 80 00 20 */ blr lbl_801C15A0: /* 801C15A0 001BE500 C0 22 AA B4 */ lfs f1, lbl_805AC7D4@sda21(r2) -/* 801C15A4 001BE504 4E 80 00 20 */ blr +/* 801C15A4 001BE504 4E 80 00 20 */ blr .global sub_801c15a8 sub_801c15a8: @@ -969,7 +969,7 @@ sub_801c15a8: /* 801C15C8 001BE528 EC 20 10 7A */ fmadds f1, f0, f1, f2 /* 801C15CC 001BE52C 7C 08 03 A6 */ mtlr r0 /* 801C15D0 001BE530 38 21 00 10 */ addi r1, r1, 0x10 -/* 801C15D4 001BE534 4E 80 00 20 */ blr +/* 801C15D4 001BE534 4E 80 00 20 */ blr .global sub_801c15d8 sub_801c15d8: @@ -1001,7 +1001,7 @@ lbl_801C162C: /* 801C1634 001BE594 C0 22 AA 98 */ lfs f1, lbl_805AC7B8@sda21(r2) /* 801C1638 001BE598 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 801C163C 001BE59C 7D 89 03 A6 */ mtctr r12 -/* 801C1640 001BE5A0 4E 80 04 21 */ bctrl +/* 801C1640 001BE5A0 4E 80 04 21 */ bctrl /* 801C1644 001BE5A4 C0 01 00 08 */ lfs f0, 8(r1) /* 801C1648 001BE5A8 C0 21 00 0C */ lfs f1, 0xc(r1) /* 801C164C 001BE5AC C0 41 00 10 */ lfs f2, 0x10(r1) @@ -1013,7 +1013,7 @@ lbl_801C1650: /* 801C1660 001BE5C0 80 01 00 24 */ lwz r0, 0x24(r1) /* 801C1664 001BE5C4 7C 08 03 A6 */ mtlr r0 /* 801C1668 001BE5C8 38 21 00 20 */ addi r1, r1, 0x20 -/* 801C166C 001BE5CC 4E 80 00 20 */ blr +/* 801C166C 001BE5CC 4E 80 00 20 */ blr .global sub_801c1670 sub_801c1670: @@ -1088,7 +1088,7 @@ sub_801c1670: /* 801C1780 001BE6E0 83 C1 00 D8 */ lwz r30, 0xd8(r1) /* 801C1784 001BE6E4 7C 08 03 A6 */ mtlr r0 /* 801C1788 001BE6E8 38 21 01 10 */ addi r1, r1, 0x110 -/* 801C178C 001BE6EC 4E 80 00 20 */ blr +/* 801C178C 001BE6EC 4E 80 00 20 */ blr .global sub_801c1790 sub_801c1790: @@ -1167,7 +1167,7 @@ lbl_801C189C: /* 801C18AC 001BE80C 83 C1 00 68 */ lwz r30, 0x68(r1) /* 801C18B0 001BE810 7C 08 03 A6 */ mtlr r0 /* 801C18B4 001BE814 38 21 00 80 */ addi r1, r1, 0x80 -/* 801C18B8 001BE818 4E 80 00 20 */ blr +/* 801C18B8 001BE818 4E 80 00 20 */ blr .global sub_801c18bc sub_801c18bc: @@ -1198,7 +1198,7 @@ lbl_801C1914: /* 801C1918 001BE878 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801C191C 001BE87C 7C 08 03 A6 */ mtlr r0 /* 801C1920 001BE880 38 21 00 20 */ addi r1, r1, 0x20 -/* 801C1924 001BE884 4E 80 00 20 */ blr +/* 801C1924 001BE884 4E 80 00 20 */ blr .global sub_801c1928 sub_801c1928: @@ -1230,7 +1230,7 @@ sub_801c1928: /* 801C198C 001BE8EC 81 9D 00 00 */ lwz r12, 0(r29) /* 801C1990 001BE8F0 81 8C 00 38 */ lwz r12, 0x38(r12) /* 801C1994 001BE8F4 7D 89 03 A6 */ mtctr r12 -/* 801C1998 001BE8F8 4E 80 04 21 */ bctrl +/* 801C1998 001BE8F8 4E 80 04 21 */ bctrl /* 801C199C 001BE8FC 7C 64 1B 78 */ mr r4, r3 /* 801C19A0 001BE900 7F E3 FB 78 */ mr r3, r31 /* 801C19A4 001BE904 4B FE 71 F5 */ bl SetDamageVulnerability__15CCollisionActorFRC20CDamageVulnerability @@ -1239,14 +1239,14 @@ sub_801c1928: /* 801C19B0 001BE910 81 9F 00 00 */ lwz r12, 0(r31) /* 801C19B4 001BE914 81 8C 00 34 */ lwz r12, 0x34(r12) /* 801C19B8 001BE918 7D 89 03 A6 */ mtctr r12 -/* 801C19BC 001BE91C 4E 80 04 21 */ bctrl +/* 801C19BC 001BE91C 4E 80 04 21 */ bctrl /* 801C19C0 001BE920 C3 E3 00 00 */ lfs f31, 0(r3) /* 801C19C4 001BE924 7F A3 EB 78 */ mr r3, r29 /* 801C19C8 001BE928 81 9D 00 00 */ lwz r12, 0(r29) /* 801C19CC 001BE92C 7F C4 F3 78 */ mr r4, r30 /* 801C19D0 001BE930 81 8C 00 34 */ lwz r12, 0x34(r12) /* 801C19D4 001BE934 7D 89 03 A6 */ mtctr r12 -/* 801C19D8 001BE938 4E 80 04 21 */ bctrl +/* 801C19D8 001BE938 4E 80 04 21 */ bctrl /* 801C19DC 001BE93C D3 E3 00 00 */ stfs f31, 0(r3) lbl_801C19E0: /* 801C19E0 001BE940 7F A3 EB 78 */ mr r3, r29 @@ -1254,7 +1254,7 @@ lbl_801C19E0: /* 801C19E8 001BE948 81 9D 00 00 */ lwz r12, 0(r29) /* 801C19EC 001BE94C 81 8C 00 34 */ lwz r12, 0x34(r12) /* 801C19F0 001BE950 7D 89 03 A6 */ mtctr r12 -/* 801C19F4 001BE954 4E 80 04 21 */ bctrl +/* 801C19F4 001BE954 4E 80 04 21 */ bctrl /* 801C19F8 001BE958 C0 23 00 00 */ lfs f1, 0(r3) /* 801C19FC 001BE95C C0 02 AA 98 */ lfs f0, lbl_805AC7B8@sda21(r2) /* 801C1A00 001BE960 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -1268,7 +1268,7 @@ lbl_801C19E0: /* 801C1A20 001BE980 7F C4 F3 78 */ mr r4, r30 /* 801C1A24 001BE984 38 C0 00 14 */ li r6, 0x14 /* 801C1A28 001BE988 7D 89 03 A6 */ mtctr r12 -/* 801C1A2C 001BE98C 4E 80 04 21 */ bctrl +/* 801C1A2C 001BE98C 4E 80 04 21 */ bctrl /* 801C1A30 001BE990 7F A3 EB 78 */ mr r3, r29 /* 801C1A34 001BE994 7F C4 F3 78 */ mr r4, r30 /* 801C1A38 001BE998 4B FF F8 35 */ bl sub_801c126c @@ -1286,7 +1286,7 @@ lbl_801C1A50: /* 801C1A64 001BE9C4 83 A1 00 24 */ lwz r29, 0x24(r1) /* 801C1A68 001BE9C8 7C 08 03 A6 */ mtlr r0 /* 801C1A6C 001BE9CC 38 21 00 40 */ addi r1, r1, 0x40 -/* 801C1A70 001BE9D0 4E 80 00 20 */ blr +/* 801C1A70 001BE9D0 4E 80 00 20 */ blr .global sub_801c1a74 sub_801c1a74: @@ -1302,7 +1302,7 @@ sub_801c1a74: /* 801C1A98 001BE9F8 81 83 00 00 */ lwz r12, 0(r3) /* 801C1A9C 001BE9FC 81 8C 00 34 */ lwz r12, 0x34(r12) /* 801C1AA0 001BEA00 7D 89 03 A6 */ mtctr r12 -/* 801C1AA4 001BEA04 4E 80 04 21 */ bctrl +/* 801C1AA4 001BEA04 4E 80 04 21 */ bctrl /* 801C1AA8 001BEA08 A0 1C 07 90 */ lhz r0, 0x790(r28) /* 801C1AAC 001BEA0C 7C 7F 1B 78 */ mr r31, r3 /* 801C1AB0 001BEA10 7F A3 EB 78 */ mr r3, r29 @@ -1320,7 +1320,7 @@ sub_801c1a74: /* 801C1AE0 001BEA40 81 9E 00 00 */ lwz r12, 0(r30) /* 801C1AE4 001BEA44 81 8C 00 34 */ lwz r12, 0x34(r12) /* 801C1AE8 001BEA48 7D 89 03 A6 */ mtctr r12 -/* 801C1AEC 001BEA4C 4E 80 04 21 */ bctrl +/* 801C1AEC 001BEA4C 4E 80 04 21 */ bctrl /* 801C1AF0 001BEA50 C0 1F 00 00 */ lfs f0, 0(r31) /* 801C1AF4 001BEA54 D0 03 00 00 */ stfs f0, 0(r3) /* 801C1AF8 001BEA58 C0 1F 00 04 */ lfs f0, 4(r31) @@ -1329,7 +1329,7 @@ sub_801c1a74: /* 801C1B04 001BEA64 81 9C 00 00 */ lwz r12, 0(r28) /* 801C1B08 001BEA68 81 8C 00 38 */ lwz r12, 0x38(r12) /* 801C1B0C 001BEA6C 7D 89 03 A6 */ mtctr r12 -/* 801C1B10 001BEA70 4E 80 04 21 */ bctrl +/* 801C1B10 001BEA70 4E 80 04 21 */ bctrl /* 801C1B14 001BEA74 7C 64 1B 78 */ mr r4, r3 /* 801C1B18 001BEA78 7F C3 F3 78 */ mr r3, r30 /* 801C1B1C 001BEA7C 4B FE 70 7D */ bl SetDamageVulnerability__15CCollisionActorFRC20CDamageVulnerability @@ -1341,7 +1341,7 @@ lbl_801C1B20: /* 801C1B30 001BEA90 83 81 00 20 */ lwz r28, 0x20(r1) /* 801C1B34 001BEA94 7C 08 03 A6 */ mtlr r0 /* 801C1B38 001BEA98 38 21 00 30 */ addi r1, r1, 0x30 -/* 801C1B3C 001BEA9C 4E 80 00 20 */ blr +/* 801C1B3C 001BEA9C 4E 80 00 20 */ blr .global sub_801c1b40 sub_801c1b40: @@ -1439,7 +1439,7 @@ lbl_801C1C90: /* 801C1C9C 001BEBFC 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 801C1CA0 001BEC00 7C 08 03 A6 */ mtlr r0 /* 801C1CA4 001BEC04 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 801C1CA8 001BEC08 4E 80 00 20 */ blr +/* 801C1CA8 001BEC08 4E 80 00 20 */ blr .global sub_801c1cac sub_801c1cac: @@ -1623,7 +1623,7 @@ lbl_801C1DEC: /* 801C1F60 001BEEC0 80 01 00 84 */ lwz r0, 0x84(r1) /* 801C1F64 001BEEC4 7C 08 03 A6 */ mtlr r0 /* 801C1F68 001BEEC8 38 21 00 80 */ addi r1, r1, 0x80 -/* 801C1F6C 001BEECC 4E 80 00 20 */ blr +/* 801C1F6C 001BEECC 4E 80 00 20 */ blr .global sub_801c1f70 sub_801c1f70: @@ -1644,13 +1644,13 @@ sub_801c1f70: /* 801C1FA8 001BEF08 81 83 00 00 */ lwz r12, 0(r3) /* 801C1FAC 001BEF0C 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 801C1FB0 001BEF10 7D 89 03 A6 */ mtctr r12 -/* 801C1FB4 001BEF14 4E 80 04 21 */ bctrl +/* 801C1FB4 001BEF14 4E 80 04 21 */ bctrl /* 801C1FB8 001BEF18 80 7D 08 2C */ lwz r3, 0x82c(r29) /* 801C1FBC 001BEF1C 38 80 00 00 */ li r4, 0 /* 801C1FC0 001BEF20 81 83 00 00 */ lwz r12, 0(r3) /* 801C1FC4 001BEF24 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 801C1FC8 001BEF28 7D 89 03 A6 */ mtctr r12 -/* 801C1FCC 001BEF2C 4E 80 04 21 */ bctrl +/* 801C1FCC 001BEF2C 4E 80 04 21 */ bctrl /* 801C1FD0 001BEF30 83 FF 08 4C */ lwz r31, 0x84c(r31) /* 801C1FD4 001BEF34 80 1F 02 F8 */ lwz r0, 0x2f8(r31) /* 801C1FD8 001BEF38 2C 00 00 01 */ cmpwi r0, 1 @@ -1665,7 +1665,7 @@ lbl_801C1FF0: /* 801C1FF8 001BEF58 81 83 00 00 */ lwz r12, 0(r3) /* 801C1FFC 001BEF5C 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 801C2000 001BEF60 7D 89 03 A6 */ mtctr r12 -/* 801C2004 001BEF64 4E 80 04 21 */ bctrl +/* 801C2004 001BEF64 4E 80 04 21 */ bctrl /* 801C2008 001BEF68 80 7F 07 68 */ lwz r3, 0x768(r31) /* 801C200C 001BEF6C 4B F3 6D F9 */ bl GetBallRadius__10CMorphBallCFv /* 801C2010 001BEF70 C0 1E 00 08 */ lfs f0, 8(r30) @@ -1683,7 +1683,7 @@ lbl_801C1FF0: /* 801C2040 001BEFA0 81 83 00 00 */ lwz r12, 0(r3) /* 801C2044 001BEFA4 81 8C 00 20 */ lwz r12, 0x20(r12) /* 801C2048 001BEFA8 7D 89 03 A6 */ mtctr r12 -/* 801C204C 001BEFAC 4E 80 04 21 */ bctrl +/* 801C204C 001BEFAC 4E 80 04 21 */ bctrl /* 801C2050 001BEFB0 80 7F 00 64 */ lwz r3, 0x64(r31) /* 801C2054 001BEFB4 38 81 00 20 */ addi r4, r1, 0x20 /* 801C2058 001BEFB8 C0 03 00 00 */ lfs f0, 0(r3) @@ -1696,7 +1696,7 @@ lbl_801C1FF0: /* 801C2074 001BEFD4 81 83 00 00 */ lwz r12, 0(r3) /* 801C2078 001BEFD8 81 8C 00 24 */ lwz r12, 0x24(r12) /* 801C207C 001BEFDC 7D 89 03 A6 */ mtctr r12 -/* 801C2080 001BEFE0 4E 80 04 21 */ bctrl +/* 801C2080 001BEFE0 4E 80 04 21 */ bctrl /* 801C2084 001BEFE4 48 00 00 DC */ b lbl_801C2160 lbl_801C2088: /* 801C2088 001BEFE8 80 7D 08 2C */ lwz r3, 0x82c(r29) @@ -1704,7 +1704,7 @@ lbl_801C2088: /* 801C2090 001BEFF0 81 83 00 00 */ lwz r12, 0(r3) /* 801C2094 001BEFF4 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 801C2098 001BEFF8 7D 89 03 A6 */ mtctr r12 -/* 801C209C 001BEFFC 4E 80 04 21 */ bctrl +/* 801C209C 001BEFFC 4E 80 04 21 */ bctrl /* 801C20A0 001BF000 80 9F 04 90 */ lwz r4, 0x490(r31) /* 801C20A4 001BF004 38 61 00 44 */ addi r3, r1, 0x44 /* 801C20A8 001BF008 C0 A2 AA D0 */ lfs f5, lbl_805AC7F0@sda21(r2) @@ -1731,13 +1731,13 @@ lbl_801C2088: /* 801C20FC 001BF05C 81 9F 00 00 */ lwz r12, 0(r31) /* 801C2100 001BF060 81 8C 00 14 */ lwz r12, 0x14(r12) /* 801C2104 001BF064 7D 89 03 A6 */ mtctr r12 -/* 801C2108 001BF068 4E 80 04 21 */ bctrl +/* 801C2108 001BF068 4E 80 04 21 */ bctrl /* 801C210C 001BF06C 80 7D 08 2C */ lwz r3, 0x82c(r29) /* 801C2110 001BF070 38 81 00 2C */ addi r4, r1, 0x2c /* 801C2114 001BF074 81 83 00 00 */ lwz r12, 0(r3) /* 801C2118 001BF078 81 8C 00 20 */ lwz r12, 0x20(r12) /* 801C211C 001BF07C 7D 89 03 A6 */ mtctr r12 -/* 801C2120 001BF080 4E 80 04 21 */ bctrl +/* 801C2120 001BF080 4E 80 04 21 */ bctrl /* 801C2124 001BF084 C0 02 AA A4 */ lfs f0, lbl_805AC7C4@sda21(r2) /* 801C2128 001BF088 38 81 00 14 */ addi r4, r1, 0x14 /* 801C212C 001BF08C C0 22 84 4C */ lfs f1, lbl_805AA16C@sda21(r2) @@ -1752,20 +1752,20 @@ lbl_801C2088: /* 801C2150 001BF0B0 81 83 00 00 */ lwz r12, 0(r3) /* 801C2154 001BF0B4 81 8C 00 24 */ lwz r12, 0x24(r12) /* 801C2158 001BF0B8 7D 89 03 A6 */ mtctr r12 -/* 801C215C 001BF0BC 4E 80 04 21 */ bctrl +/* 801C215C 001BF0BC 4E 80 04 21 */ bctrl lbl_801C2160: /* 801C2160 001BF0C0 80 7D 08 28 */ lwz r3, 0x828(r29) /* 801C2164 001BF0C4 FC 20 F8 90 */ fmr f1, f31 /* 801C2168 001BF0C8 81 83 00 00 */ lwz r12, 0(r3) /* 801C216C 001BF0CC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801C2170 001BF0D0 7D 89 03 A6 */ mtctr r12 -/* 801C2174 001BF0D4 4E 80 04 21 */ bctrl +/* 801C2174 001BF0D4 4E 80 04 21 */ bctrl /* 801C2178 001BF0D8 80 7D 08 2C */ lwz r3, 0x82c(r29) /* 801C217C 001BF0DC FC 20 F8 90 */ fmr f1, f31 /* 801C2180 001BF0E0 81 83 00 00 */ lwz r12, 0(r3) /* 801C2184 001BF0E4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801C2188 001BF0E8 7D 89 03 A6 */ mtctr r12 -/* 801C218C 001BF0EC 4E 80 04 21 */ bctrl +/* 801C218C 001BF0EC 4E 80 04 21 */ bctrl /* 801C2190 001BF0F0 E3 E1 00 98 */ psq_l f31, 152(r1), 0, qr0 /* 801C2194 001BF0F4 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 801C2198 001BF0F8 CB E1 00 90 */ lfd f31, 0x90(r1) @@ -1774,7 +1774,7 @@ lbl_801C2160: /* 801C21A4 001BF104 83 A1 00 84 */ lwz r29, 0x84(r1) /* 801C21A8 001BF108 7C 08 03 A6 */ mtlr r0 /* 801C21AC 001BF10C 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 801C21B0 001BF110 4E 80 00 20 */ blr +/* 801C21B0 001BF110 4E 80 00 20 */ blr .global sub_801c21b4 sub_801c21b4: @@ -1871,7 +1871,7 @@ sub_801c21b4: /* 801C231C 001BF27C 81 83 00 00 */ lwz r12, 0(r3) /* 801C2320 001BF280 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 801C2324 001BF284 7D 89 03 A6 */ mtctr r12 -/* 801C2328 001BF288 4E 80 04 21 */ bctrl +/* 801C2328 001BF288 4E 80 04 21 */ bctrl /* 801C232C 001BF28C C0 38 08 3C */ lfs f1, 0x83c(r24) /* 801C2330 001BF290 C0 02 AA 98 */ lfs f0, lbl_805AC7B8@sda21(r2) /* 801C2334 001BF294 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -1892,7 +1892,7 @@ lbl_801C235C: /* 801C2368 001BF2C8 81 83 00 00 */ lwz r12, 0(r3) /* 801C236C 001BF2CC 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 801C2370 001BF2D0 7D 89 03 A6 */ mtctr r12 -/* 801C2374 001BF2D4 4E 80 04 21 */ bctrl +/* 801C2374 001BF2D4 4E 80 04 21 */ bctrl /* 801C2378 001BF2D8 6F A0 80 00 */ xoris r0, r29, 0x8000 /* 801C237C 001BF2DC 3F E0 43 30 */ lis r31, 0x4330 /* 801C2380 001BF2E0 90 01 00 DC */ stw r0, 0xdc(r1) @@ -2005,7 +2005,7 @@ lbl_801C24B0: /* 801C2514 001BF474 81 83 00 00 */ lwz r12, 0(r3) /* 801C2518 001BF478 81 8C 00 18 */ lwz r12, 0x18(r12) /* 801C251C 001BF47C 7D 89 03 A6 */ mtctr r12 -/* 801C2520 001BF480 4E 80 04 21 */ bctrl +/* 801C2520 001BF480 4E 80 04 21 */ bctrl /* 801C2524 001BF484 80 78 08 20 */ lwz r3, 0x820(r24) /* 801C2528 001BF488 38 80 00 01 */ li r4, 1 /* 801C252C 001BF48C 48 15 A3 95 */ bl ForceParticleCreation__11CElementGenFi @@ -2030,13 +2030,13 @@ lbl_801C24B0: /* 801C2578 001BF4D8 81 83 00 00 */ lwz r12, 0(r3) /* 801C257C 001BF4DC 81 8C 00 18 */ lwz r12, 0x18(r12) /* 801C2580 001BF4E0 7D 89 03 A6 */ mtctr r12 -/* 801C2584 001BF4E4 4E 80 04 21 */ bctrl +/* 801C2584 001BF4E4 4E 80 04 21 */ bctrl /* 801C2588 001BF4E8 80 78 08 30 */ lwz r3, 0x830(r24) /* 801C258C 001BF4EC FC 20 B0 90 */ fmr f1, f22 /* 801C2590 001BF4F0 81 83 00 00 */ lwz r12, 0(r3) /* 801C2594 001BF4F4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801C2598 001BF4F8 7D 89 03 A6 */ mtctr r12 -/* 801C259C 001BF4FC 4E 80 04 21 */ bctrl +/* 801C259C 001BF4FC 4E 80 04 21 */ bctrl lbl_801C25A0: /* 801C25A0 001BF500 C0 41 00 50 */ lfs f2, 0x50(r1) /* 801C25A4 001BF504 3B 7B 00 80 */ addi r27, r27, 0x80 @@ -2054,13 +2054,13 @@ lbl_801C25C0: /* 801C25D0 001BF530 81 83 00 00 */ lwz r12, 0(r3) /* 801C25D4 001BF534 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 801C25D8 001BF538 7D 89 03 A6 */ mtctr r12 -/* 801C25DC 001BF53C 4E 80 04 21 */ bctrl +/* 801C25DC 001BF53C 4E 80 04 21 */ bctrl /* 801C25E0 001BF540 80 78 08 20 */ lwz r3, 0x820(r24) /* 801C25E4 001BF544 FC 20 B0 90 */ fmr f1, f22 /* 801C25E8 001BF548 81 83 00 00 */ lwz r12, 0(r3) /* 801C25EC 001BF54C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801C25F0 001BF550 7D 89 03 A6 */ mtctr r12 -/* 801C25F4 001BF554 4E 80 04 21 */ bctrl +/* 801C25F4 001BF554 4E 80 04 21 */ bctrl /* 801C25F8 001BF558 C0 58 08 34 */ lfs f2, 0x834(r24) /* 801C25FC 001BF55C FC 20 B0 90 */ fmr f1, f22 /* 801C2600 001BF560 C0 02 AA D8 */ lfs f0, lbl_805AC7F8@sda21(r2) @@ -2101,7 +2101,7 @@ lbl_801C261C: /* 801C2688 001BF5E8 80 01 01 E4 */ lwz r0, 0x1e4(r1) /* 801C268C 001BF5EC 7C 08 03 A6 */ mtlr r0 /* 801C2690 001BF5F0 38 21 01 E0 */ addi r1, r1, 0x1e0 -/* 801C2694 001BF5F4 4E 80 00 20 */ blr +/* 801C2694 001BF5F4 4E 80 00 20 */ blr .global sub_801c2698 sub_801c2698: @@ -2228,7 +2228,7 @@ lbl_801C284C: /* 801C2874 001BF7D4 83 A1 00 74 */ lwz r29, 0x74(r1) /* 801C2878 001BF7D8 7C 08 03 A6 */ mtlr r0 /* 801C287C 001BF7DC 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 801C2880 001BF7E0 4E 80 00 20 */ blr +/* 801C2880 001BF7E0 4E 80 00 20 */ blr .global sub_801c2884 sub_801c2884: @@ -2347,7 +2347,7 @@ lbl_801C2A14: /* 801C2A24 001BF984 83 C1 00 48 */ lwz r30, 0x48(r1) /* 801C2A28 001BF988 7C 08 03 A6 */ mtlr r0 /* 801C2A2C 001BF98C 38 21 00 60 */ addi r1, r1, 0x60 -/* 801C2A30 001BF990 4E 80 00 20 */ blr +/* 801C2A30 001BF990 4E 80 00 20 */ blr .global WallHang__12CMetroidBetaFR13CStateManager9EStateMsgf WallHang__12CMetroidBetaFR13CStateManager9EStateMsgf: @@ -2483,7 +2483,7 @@ lbl_801C2C08: /* 801C2C10 001BFB70 83 C1 00 28 */ lwz r30, 0x28(r1) /* 801C2C14 001BFB74 7C 08 03 A6 */ mtlr r0 /* 801C2C18 001BFB78 38 21 00 30 */ addi r1, r1, 0x30 -/* 801C2C1C 001BFB7C 4E 80 00 20 */ blr +/* 801C2C1C 001BFB7C 4E 80 00 20 */ blr .global Generate__12CMetroidBetaFR13CStateManager9EStateMsgf Generate__12CMetroidBetaFR13CStateManager9EStateMsgf: @@ -2513,7 +2513,7 @@ lbl_801C2C60: /* 801C2C74 001BFBD4 81 83 00 00 */ lwz r12, 0(r3) /* 801C2C78 001BFBD8 81 8C 02 98 */ lwz r12, 0x298(r12) /* 801C2C7C 001BFBDC 7D 89 03 A6 */ mtctr r12 -/* 801C2C80 001BFBE0 4E 80 04 21 */ bctrl +/* 801C2C80 001BFBE0 4E 80 04 21 */ bctrl lbl_801C2C84: /* 801C2C84 001BFBE4 38 60 00 01 */ li r3, 1 /* 801C2C88 001BFBE8 90 7F 05 68 */ stw r3, 0x568(r31) @@ -2560,7 +2560,7 @@ lbl_801C2D14: /* 801C2D18 001BFC78 C0 22 AA 98 */ lfs f1, lbl_805AC7B8@sda21(r2) /* 801C2D1C 001BFC7C 81 8C 01 8C */ lwz r12, 0x18c(r12) /* 801C2D20 001BFC80 7D 89 03 A6 */ mtctr r12 -/* 801C2D24 001BFC84 4E 80 04 21 */ bctrl +/* 801C2D24 001BFC84 4E 80 04 21 */ bctrl /* 801C2D28 001BFC88 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801C2D2C 001BFC8C 41 82 00 D4 */ beq lbl_801C2E00 /* 801C2D30 001BFC90 3C C0 80 3E */ lis r6, lbl_803DAA68@ha @@ -2681,7 +2681,7 @@ lbl_801C2EEC: /* 801C2EF0 001BFE50 C0 22 AA 98 */ lfs f1, lbl_805AC7B8@sda21(r2) /* 801C2EF4 001BFE54 81 8C 01 8C */ lwz r12, 0x18c(r12) /* 801C2EF8 001BFE58 7D 89 03 A6 */ mtctr r12 -/* 801C2EFC 001BFE5C 4E 80 04 21 */ bctrl +/* 801C2EFC 001BFE5C 4E 80 04 21 */ bctrl /* 801C2F00 001BFE60 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801C2F04 001BFE64 41 82 01 98 */ beq lbl_801C309C /* 801C2F08 001BFE68 80 7F 04 50 */ lwz r3, 0x450(r31) @@ -2778,7 +2778,7 @@ lbl_801C3050: /* 801C3068 001BFFC8 81 83 00 00 */ lwz r12, 0(r3) /* 801C306C 001BFFCC 81 8C 01 8C */ lwz r12, 0x18c(r12) /* 801C3070 001BFFD0 7D 89 03 A6 */ mtctr r12 -/* 801C3074 001BFFD4 4E 80 04 21 */ bctrl +/* 801C3074 001BFFD4 4E 80 04 21 */ bctrl /* 801C3078 001BFFD8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801C307C 001BFFDC 41 82 00 18 */ beq lbl_801C3094 /* 801C3080 001BFFE0 C0 1F 07 DC */ lfs f0, 0x7dc(r31) @@ -2796,7 +2796,7 @@ lbl_801C309C: /* 801C30A8 001C0008 83 E1 00 6C */ lwz r31, 0x6c(r1) /* 801C30AC 001C000C 7C 08 03 A6 */ mtlr r0 /* 801C30B0 001C0010 38 21 00 80 */ addi r1, r1, 0x80 -/* 801C30B4 001C0014 4E 80 00 20 */ blr +/* 801C30B4 001C0014 4E 80 00 20 */ blr .global TelegraphAttack__12CMetroidBetaFR13CStateManager9EStateMsgf TelegraphAttack__12CMetroidBetaFR13CStateManager9EStateMsgf: @@ -2893,7 +2893,7 @@ lbl_801C3204: /* 801C3208 001C0168 83 E1 00 4C */ lwz r31, 0x4c(r1) /* 801C320C 001C016C 7C 08 03 A6 */ mtlr r0 /* 801C3210 001C0170 38 21 00 50 */ addi r1, r1, 0x50 -/* 801C3214 001C0174 4E 80 00 20 */ blr +/* 801C3214 001C0174 4E 80 00 20 */ blr .global SelectTarget__12CMetroidBetaFR13CStateManager9EStateMsgf SelectTarget__12CMetroidBetaFR13CStateManager9EStateMsgf: @@ -3008,7 +3008,7 @@ lbl_801C33A8: /* 801C33AC 001C030C 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 801C33B0 001C0310 7C 08 03 A6 */ mtlr r0 /* 801C33B4 001C0314 38 21 00 30 */ addi r1, r1, 0x30 -/* 801C33B8 001C0318 4E 80 00 20 */ blr +/* 801C33B8 001C0318 4E 80 00 20 */ blr .global TargetPatrol__12CMetroidBetaFR13CStateManager9EStateMsgf TargetPatrol__12CMetroidBetaFR13CStateManager9EStateMsgf: @@ -3040,7 +3040,7 @@ lbl_801C3404: /* 801C341C 001C037C C0 22 AA 98 */ lfs f1, lbl_805AC7B8@sda21(r2) /* 801C3420 001C0380 81 8C 01 C0 */ lwz r12, 0x1c0(r12) /* 801C3424 001C0384 7D 89 03 A6 */ mtctr r12 -/* 801C3428 001C0388 4E 80 04 21 */ bctrl +/* 801C3428 001C0388 4E 80 04 21 */ bctrl /* 801C342C 001C038C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801C3430 001C0390 41 82 00 28 */ beq lbl_801C3458 /* 801C3434 001C0394 FC 20 F8 90 */ fmr f1, f31 @@ -3067,7 +3067,7 @@ lbl_801C3464: /* 801C3480 001C03E0 81 9D 00 00 */ lwz r12, 0(r29) /* 801C3484 001C03E4 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801C3488 001C03E8 7D 89 03 A6 */ mtctr r12 -/* 801C348C 001C03EC 4E 80 04 21 */ bctrl +/* 801C348C 001C03EC 4E 80 04 21 */ bctrl /* 801C3490 001C03F0 28 03 00 00 */ cmplwi r3, 0 /* 801C3494 001C03F4 41 82 00 E0 */ beq lbl_801C3574 /* 801C3498 001C03F8 FC 20 F8 90 */ fmr f1, f31 @@ -3080,7 +3080,7 @@ lbl_801C34B0: /* 801C34B0 001C0410 81 83 00 00 */ lwz r12, 0(r3) /* 801C34B4 001C0414 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801C34B8 001C0418 7D 89 03 A6 */ mtctr r12 -/* 801C34BC 001C041C 4E 80 04 21 */ bctrl +/* 801C34BC 001C041C 4E 80 04 21 */ bctrl /* 801C34C0 001C0420 28 03 00 00 */ cmplwi r3, 0 /* 801C34C4 001C0424 41 82 00 40 */ beq lbl_801C3504 /* 801C34C8 001C0428 7F A3 EB 78 */ mr r3, r29 @@ -3089,7 +3089,7 @@ lbl_801C34B0: /* 801C34D4 001C0434 C0 22 AA 98 */ lfs f1, lbl_805AC7B8@sda21(r2) /* 801C34D8 001C0438 81 8C 01 90 */ lwz r12, 0x190(r12) /* 801C34DC 001C043C 7D 89 03 A6 */ mtctr r12 -/* 801C34E0 001C0440 4E 80 04 21 */ bctrl +/* 801C34E0 001C0440 4E 80 04 21 */ bctrl /* 801C34E4 001C0444 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801C34E8 001C0448 40 82 00 1C */ bne lbl_801C3504 /* 801C34EC 001C044C FC 20 F8 90 */ fmr f1, f31 @@ -3137,7 +3137,7 @@ lbl_801C3574: /* 801C3588 001C04E8 83 A1 00 34 */ lwz r29, 0x34(r1) /* 801C358C 001C04EC 7C 08 03 A6 */ mtlr r0 /* 801C3590 001C04F0 38 21 00 50 */ addi r1, r1, 0x50 -/* 801C3594 001C04F4 4E 80 00 20 */ blr +/* 801C3594 001C04F4 4E 80 00 20 */ blr .global Patrol__12CMetroidBetaFR13CStateManager9EStateMsgf Patrol__12CMetroidBetaFR13CStateManager9EStateMsgf: @@ -3175,7 +3175,7 @@ lbl_801C35E8: /* 801C360C 001C056C 83 A1 00 0C */ lwz r29, 0xc(r1) /* 801C3610 001C0570 7C 08 03 A6 */ mtlr r0 /* 801C3614 001C0574 38 21 00 20 */ addi r1, r1, 0x20 -/* 801C3618 001C0578 4E 80 00 20 */ blr +/* 801C3618 001C0578 4E 80 00 20 */ blr .global SpecialAttack__12CMetroidBetaFR13CStateManager9EStateMsgf SpecialAttack__12CMetroidBetaFR13CStateManager9EStateMsgf: @@ -3252,7 +3252,7 @@ lbl_801C370C: /* 801C371C 001C067C 81 84 00 00 */ lwz r12, 0(r4) /* 801C3720 001C0680 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 801C3724 001C0684 7D 89 03 A6 */ mtctr r12 -/* 801C3728 001C0688 4E 80 04 21 */ bctrl +/* 801C3728 001C0688 4E 80 04 21 */ bctrl /* 801C372C 001C068C C0 81 00 20 */ lfs f4, 0x20(r1) /* 801C3730 001C0690 C0 41 00 24 */ lfs f2, 0x24(r1) /* 801C3734 001C0694 C0 C1 00 28 */ lfs f6, 0x28(r1) @@ -3352,7 +3352,7 @@ lbl_801C3894: /* 801C389C 001C07FC 83 C1 00 58 */ lwz r30, 0x58(r1) /* 801C38A0 001C0800 7C 08 03 A6 */ mtlr r0 /* 801C38A4 001C0804 38 21 00 60 */ addi r1, r1, 0x60 -/* 801C38A8 001C0808 4E 80 00 20 */ blr +/* 801C38A8 001C0808 4E 80 00 20 */ blr .global Attack__12CMetroidBetaFR13CStateManager9EStateMsgf Attack__12CMetroidBetaFR13CStateManager9EStateMsgf: @@ -3666,7 +3666,7 @@ lbl_801C3D28: /* 801C3D54 001C0CB4 83 A1 01 64 */ lwz r29, 0x164(r1) /* 801C3D58 001C0CB8 7C 08 03 A6 */ mtlr r0 /* 801C3D5C 001C0CBC 38 21 01 B0 */ addi r1, r1, 0x1b0 -/* 801C3D60 001C0CC0 4E 80 00 20 */ blr +/* 801C3D60 001C0CC0 4E 80 00 20 */ blr .global TurnAround__12CMetroidBetaFR13CStateManager9EStateMsgf TurnAround__12CMetroidBetaFR13CStateManager9EStateMsgf: @@ -3698,7 +3698,7 @@ lbl_801C3D8C: /* 801C3DC4 001C0D24 81 83 00 00 */ lwz r12, 0(r3) /* 801C3DC8 001C0D28 81 8C 01 E8 */ lwz r12, 0x1e8(r12) /* 801C3DCC 001C0D2C 7D 89 03 A6 */ mtctr r12 -/* 801C3DD0 001C0D30 4E 80 04 21 */ bctrl +/* 801C3DD0 001C0D30 4E 80 04 21 */ bctrl /* 801C3DD4 001C0D34 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801C3DD8 001C0D38 41 82 00 70 */ beq lbl_801C3E48 /* 801C3DDC 001C0D3C 38 61 00 64 */ addi r3, r1, 0x64 @@ -3778,7 +3778,7 @@ lbl_801C3E7C: /* 801C3EFC 001C0E5C 81 8C 00 A0 */ lwz r12, 0xa0(r12) /* 801C3F00 001C0E60 B1 01 00 0C */ sth r8, 0xc(r1) /* 801C3F04 001C0E64 7D 89 03 A6 */ mtctr r12 -/* 801C3F08 001C0E68 4E 80 04 21 */ bctrl +/* 801C3F08 001C0E68 4E 80 04 21 */ bctrl /* 801C3F0C 001C0E6C 38 C1 00 34 */ addi r6, r1, 0x34 lbl_801C3F10: /* 801C3F10 001C0E70 C0 9F 00 60 */ lfs f4, 0x60(r31) @@ -3828,7 +3828,7 @@ lbl_801C3FB4: /* 801C3FBC 001C0F1C 83 C1 00 D8 */ lwz r30, 0xd8(r1) /* 801C3FC0 001C0F20 7C 08 03 A6 */ mtlr r0 /* 801C3FC4 001C0F24 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 801C3FC8 001C0F28 4E 80 00 20 */ blr +/* 801C3FC8 001C0F28 4E 80 00 20 */ blr .global PathFind__12CMetroidBetaFR13CStateManager9EStateMsgf PathFind__12CMetroidBetaFR13CStateManager9EStateMsgf: @@ -3912,7 +3912,7 @@ lbl_801C4078: /* 801C40F8 001C1058 81 8C 00 A0 */ lwz r12, 0xa0(r12) /* 801C40FC 001C105C B1 01 00 20 */ sth r8, 0x20(r1) /* 801C4100 001C1060 7D 89 03 A6 */ mtctr r12 -/* 801C4104 001C1064 4E 80 04 21 */ bctrl +/* 801C4104 001C1064 4E 80 04 21 */ bctrl /* 801C4108 001C1068 C0 01 00 54 */ lfs f0, 0x54(r1) /* 801C410C 001C106C D0 1E 02 E0 */ stfs f0, 0x2e0(r30) /* 801C4110 001C1070 C0 01 00 58 */ lfs f0, 0x58(r1) @@ -3936,7 +3936,7 @@ lbl_801C4150: /* 801C4150 001C10B0 81 83 00 00 */ lwz r12, 0(r3) /* 801C4154 001C10B4 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801C4158 001C10B8 7D 89 03 A6 */ mtctr r12 -/* 801C415C 001C10BC 4E 80 04 21 */ bctrl +/* 801C415C 001C10BC 4E 80 04 21 */ bctrl /* 801C4160 001C10C0 28 03 00 00 */ cmplwi r3, 0 /* 801C4164 001C10C4 41 82 00 64 */ beq lbl_801C41C8 /* 801C4168 001C10C8 7F C3 F3 78 */ mr r3, r30 @@ -3945,7 +3945,7 @@ lbl_801C4150: /* 801C4174 001C10D4 C0 22 AA 98 */ lfs f1, lbl_805AC7B8@sda21(r2) /* 801C4178 001C10D8 81 8C 01 90 */ lwz r12, 0x190(r12) /* 801C417C 001C10DC 7D 89 03 A6 */ mtctr r12 -/* 801C4180 001C10E0 4E 80 04 21 */ bctrl +/* 801C4180 001C10E0 4E 80 04 21 */ bctrl /* 801C4184 001C10E4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801C4188 001C10E8 40 82 00 40 */ bne lbl_801C41C8 /* 801C418C 001C10EC 7F C3 F3 78 */ mr r3, r30 @@ -3954,7 +3954,7 @@ lbl_801C4150: /* 801C4198 001C10F8 C0 22 AA 98 */ lfs f1, lbl_805AC7B8@sda21(r2) /* 801C419C 001C10FC 81 8C 01 94 */ lwz r12, 0x194(r12) /* 801C41A0 001C1100 7D 89 03 A6 */ mtctr r12 -/* 801C41A4 001C1104 4E 80 04 21 */ bctrl +/* 801C41A4 001C1104 4E 80 04 21 */ bctrl /* 801C41A8 001C1108 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801C41AC 001C110C 40 82 00 1C */ bne lbl_801C41C8 /* 801C41B0 001C1110 FC 20 F8 90 */ fmr f1, f31 @@ -4018,7 +4018,7 @@ lbl_801C4210: /* 801C4290 001C11F0 81 8C 00 A0 */ lwz r12, 0xa0(r12) /* 801C4294 001C11F4 B1 01 00 0C */ sth r8, 0xc(r1) /* 801C4298 001C11F8 7D 89 03 A6 */ mtctr r12 -/* 801C429C 001C11FC 4E 80 04 21 */ bctrl +/* 801C429C 001C11FC 4E 80 04 21 */ bctrl /* 801C42A0 001C1200 C0 01 00 3C */ lfs f0, 0x3c(r1) /* 801C42A4 001C1204 D0 1E 07 A8 */ stfs f0, 0x7a8(r30) /* 801C42A8 001C1208 C0 01 00 40 */ lfs f0, 0x40(r1) @@ -4046,7 +4046,7 @@ lbl_801C42D4: /* 801C42F4 001C1254 83 A1 00 B4 */ lwz r29, 0xb4(r1) /* 801C42F8 001C1258 7C 08 03 A6 */ mtlr r0 /* 801C42FC 001C125C 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 801C4300 001C1260 4E 80 00 20 */ blr +/* 801C4300 001C1260 4E 80 00 20 */ blr .global sub_801c4304 sub_801c4304: @@ -4054,13 +4054,13 @@ sub_801c4304: /* 801C4308 001C1268 20 00 00 03 */ subfic r0, r0, 3 /* 801C430C 001C126C 7C 00 00 34 */ cntlzw r0, r0 /* 801C4310 001C1270 54 03 D9 7E */ srwi r3, r0, 5 -/* 801C4314 001C1274 4E 80 00 20 */ blr +/* 801C4314 001C1274 4E 80 00 20 */ blr .global ShouldWallHang__12CMetroidBetaFR13CStateManagerf ShouldWallHang__12CMetroidBetaFR13CStateManagerf: /* 801C4318 001C1278 88 03 06 74 */ lbz r0, 0x674(r3) /* 801C431C 001C127C 54 03 CF FE */ rlwinm r3, r0, 0x19, 0x1f, 0x1f -/* 801C4320 001C1280 4E 80 00 20 */ blr +/* 801C4320 001C1280 4E 80 00 20 */ blr .global ShouldTurn__12CMetroidBetaFR13CStateManagerf ShouldTurn__12CMetroidBetaFR13CStateManagerf: @@ -4114,7 +4114,7 @@ ShouldTurn__12CMetroidBetaFR13CStateManagerf: /* 801C43E0 001C1340 80 01 00 64 */ lwz r0, 0x64(r1) /* 801C43E4 001C1344 7C 08 03 A6 */ mtlr r0 /* 801C43E8 001C1348 38 21 00 60 */ addi r1, r1, 0x60 -/* 801C43EC 001C134C 4E 80 00 20 */ blr +/* 801C43EC 001C134C 4E 80 00 20 */ blr .global InPosition__12CMetroidBetaFR13CStateManagerf InPosition__12CMetroidBetaFR13CStateManagerf: @@ -4134,7 +4134,7 @@ InPosition__12CMetroidBetaFR13CStateManagerf: /* 801C4424 001C1384 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 801C4428 001C1388 7C 00 00 26 */ mfcr r0 /* 801C442C 001C138C 54 03 0F FE */ srwi r3, r0, 0x1f -/* 801C4430 001C1390 4E 80 00 20 */ blr +/* 801C4430 001C1390 4E 80 00 20 */ blr .global InDetectionRange__12CMetroidBetaFR13CStateManagerf InDetectionRange__12CMetroidBetaFR13CStateManagerf: @@ -4165,13 +4165,13 @@ lbl_801C4480: /* 801C448C 001C13EC 83 C1 00 08 */ lwz r30, 8(r1) /* 801C4490 001C13F0 7C 08 03 A6 */ mtlr r0 /* 801C4494 001C13F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801C4498 001C13F8 4E 80 00 20 */ blr +/* 801C4498 001C13F8 4E 80 00 20 */ blr .global BreakAttack__12CMetroidBetaFR13CStateManagerf BreakAttack__12CMetroidBetaFR13CStateManagerf: /* 801C449C 001C13FC 88 03 08 40 */ lbz r0, 0x840(r3) /* 801C44A0 001C1400 54 03 07 FE */ clrlwi r3, r0, 0x1f -/* 801C44A4 001C1404 4E 80 00 20 */ blr +/* 801C44A4 001C1404 4E 80 00 20 */ blr .global StartAttack__12CMetroidBetaFR13CStateManagerf StartAttack__12CMetroidBetaFR13CStateManagerf: @@ -4297,7 +4297,7 @@ lbl_801C4658: /* 801C4660 001C15C0 83 C1 00 58 */ lwz r30, 0x58(r1) /* 801C4664 001C15C4 7C 08 03 A6 */ mtlr r0 /* 801C4668 001C15C8 38 21 00 60 */ addi r1, r1, 0x60 -/* 801C466C 001C15CC 4E 80 00 20 */ blr +/* 801C466C 001C15CC 4E 80 00 20 */ blr .global InAttackPosition__12CMetroidBetaFR13CStateManager9EStateMsgf InAttackPosition__12CMetroidBetaFR13CStateManager9EStateMsgf: @@ -4439,7 +4439,7 @@ lbl_801C4854: /* 801C4880 001C17E0 83 A1 00 94 */ lwz r29, 0x94(r1) /* 801C4884 001C17E4 7C 08 03 A6 */ mtlr r0 /* 801C4888 001C17E8 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 801C488C 001C17EC 4E 80 00 20 */ blr +/* 801C488C 001C17EC 4E 80 00 20 */ blr .global ShouldSpecialAttack__12CMetroidBetaFR13CStateManagerf ShouldSpecialAttack__12CMetroidBetaFR13CStateManagerf: @@ -4465,7 +4465,7 @@ ShouldSpecialAttack__12CMetroidBetaFR13CStateManagerf: /* 801C48DC 001C183C 38 61 00 30 */ addi r3, r1, 0x30 /* 801C48E0 001C1840 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 801C48E4 001C1844 7D 89 03 A6 */ mtctr r12 -/* 801C48E8 001C1848 4E 80 04 21 */ bctrl +/* 801C48E8 001C1848 4E 80 04 21 */ bctrl /* 801C48EC 001C184C C0 81 00 30 */ lfs f4, 0x30(r1) /* 801C48F0 001C1850 C0 61 00 34 */ lfs f3, 0x34(r1) /* 801C48F4 001C1854 C0 41 00 38 */ lfs f2, 0x38(r1) @@ -4491,7 +4491,7 @@ ShouldSpecialAttack__12CMetroidBetaFR13CStateManagerf: /* 801C4944 001C18A4 C0 22 AA 98 */ lfs f1, lbl_805AC7B8@sda21(r2) /* 801C4948 001C18A8 81 8C 01 E8 */ lwz r12, 0x1e8(r12) /* 801C494C 001C18AC 7D 89 03 A6 */ mtctr r12 -/* 801C4950 001C18B0 4E 80 04 21 */ bctrl +/* 801C4950 001C18B0 4E 80 04 21 */ bctrl /* 801C4954 001C18B4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801C4958 001C18B8 40 82 00 A8 */ bne lbl_801C4A00 /* 801C495C 001C18BC C0 5E 00 60 */ lfs f2, 0x60(r30) @@ -4544,7 +4544,7 @@ lbl_801C4A04: /* 801C4A0C 001C196C 83 C1 00 48 */ lwz r30, 0x48(r1) /* 801C4A10 001C1970 7C 08 03 A6 */ mtlr r0 /* 801C4A14 001C1974 38 21 00 50 */ addi r1, r1, 0x50 -/* 801C4A18 001C1978 4E 80 00 20 */ blr +/* 801C4A18 001C1978 4E 80 00 20 */ blr .global ShouldAttack__12CMetroidBetaFR13CStateManagerf ShouldAttack__12CMetroidBetaFR13CStateManagerf: @@ -4667,13 +4667,13 @@ lbl_801C4BC0: /* 801C4BC8 001C1B28 83 C1 00 48 */ lwz r30, 0x48(r1) /* 801C4BCC 001C1B2C 7C 08 03 A6 */ mtlr r0 /* 801C4BD0 001C1B30 38 21 00 50 */ addi r1, r1, 0x50 -/* 801C4BD4 001C1B34 4E 80 00 20 */ blr +/* 801C4BD4 001C1B34 4E 80 00 20 */ blr .global ShotAt__12CMetroidBetaFR13CStateManagerf ShotAt__12CMetroidBetaFR13CStateManagerf: /* 801C4BD8 001C1B38 88 03 08 40 */ lbz r0, 0x840(r3) /* 801C4BDC 001C1B3C 54 03 E7 FE */ rlwinm r3, r0, 0x1c, 0x1f, 0x1f -/* 801C4BE0 001C1B40 4E 80 00 20 */ blr +/* 801C4BE0 001C1B40 4E 80 00 20 */ blr .global Attacked__12CMetroidBetaFR13CStateManagerf Attacked__12CMetroidBetaFR13CStateManagerf: @@ -4690,17 +4690,17 @@ Attacked__12CMetroidBetaFR13CStateManagerf: /* 801C4C0C 001C1B6C 4C 41 13 82 */ cror 2, 1, 2 /* 801C4C10 001C1B70 7C 00 00 26 */ mfcr r0 /* 801C4C14 001C1B74 54 03 1F FE */ rlwinm r3, r0, 3, 0x1f, 0x1f -/* 801C4C18 001C1B78 4E 80 00 20 */ blr +/* 801C4C18 001C1B78 4E 80 00 20 */ blr lbl_801C4C1C: /* 801C4C1C 001C1B7C C0 03 06 5C */ lfs f0, 0x65c(r3) /* 801C4C20 001C1B80 FC 03 00 40 */ fcmpo cr0, f3, f0 /* 801C4C24 001C1B84 4C 41 13 82 */ cror 2, 1, 2 /* 801C4C28 001C1B88 40 82 00 0C */ bne lbl_801C4C34 /* 801C4C2C 001C1B8C 38 60 00 01 */ li r3, 1 -/* 801C4C30 001C1B90 4E 80 00 20 */ blr +/* 801C4C30 001C1B90 4E 80 00 20 */ blr lbl_801C4C34: /* 801C4C34 001C1B94 38 60 00 00 */ li r3, 0 -/* 801C4C38 001C1B98 4E 80 00 20 */ blr +/* 801C4C38 001C1B98 4E 80 00 20 */ blr .global PathShagged__12CMetroidBetaFR13CStateManagerf PathShagged__12CMetroidBetaFR13CStateManagerf: @@ -4712,14 +4712,14 @@ PathShagged__12CMetroidBetaFR13CStateManagerf: /* 801C4C50 001C1BB0 81 83 00 00 */ lwz r12, 0(r3) /* 801C4C54 001C1BB4 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801C4C58 001C1BB8 7D 89 03 A6 */ mtctr r12 -/* 801C4C5C 001C1BBC 4E 80 04 21 */ bctrl +/* 801C4C5C 001C1BBC 4E 80 04 21 */ bctrl /* 801C4C60 001C1BC0 28 03 00 00 */ cmplwi r3, 0 /* 801C4C64 001C1BC4 41 82 00 2C */ beq lbl_801C4C90 /* 801C4C68 001C1BC8 7F E3 FB 78 */ mr r3, r31 /* 801C4C6C 001C1BCC 81 9F 00 00 */ lwz r12, 0(r31) /* 801C4C70 001C1BD0 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801C4C74 001C1BD4 7D 89 03 A6 */ mtctr r12 -/* 801C4C78 001C1BD8 4E 80 04 21 */ bctrl +/* 801C4C78 001C1BD8 4E 80 04 21 */ bctrl /* 801C4C7C 001C1BDC 80 63 00 CC */ lwz r3, 0xcc(r3) /* 801C4C80 001C1BE0 7C 03 00 D0 */ neg r0, r3 /* 801C4C84 001C1BE4 7C 00 1B 78 */ or r0, r0, r3 @@ -4732,12 +4732,12 @@ lbl_801C4C94: /* 801C4C98 001C1BF8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801C4C9C 001C1BFC 7C 08 03 A6 */ mtlr r0 /* 801C4CA0 001C1C00 38 21 00 10 */ addi r1, r1, 0x10 -/* 801C4CA4 001C1C04 4E 80 00 20 */ blr +/* 801C4CA4 001C1C04 4E 80 00 20 */ blr .global AttackOver__12CMetroidBetaFR13CStateManagerf AttackOver__12CMetroidBetaFR13CStateManagerf: /* 801C4CA8 001C1C08 38 60 00 00 */ li r3, 0 -/* 801C4CAC 001C1C0C 4E 80 00 20 */ blr +/* 801C4CAC 001C1C0C 4E 80 00 20 */ blr .global sub_801c4cb0 sub_801c4cb0: @@ -4752,7 +4752,7 @@ sub_801c4cb0: /* 801C4CD0 001C1C30 38 80 00 01 */ li r4, 1 lbl_801C4CD4: /* 801C4CD4 001C1C34 7C 83 23 78 */ mr r3, r4 -/* 801C4CD8 001C1C38 4E 80 00 20 */ blr +/* 801C4CD8 001C1C38 4E 80 00 20 */ blr .global GetCollisionResponseType__12CMetroidBetaCFRC9CVector3fRC9CVector3fRC11CWeaponModei GetCollisionResponseType__12CMetroidBetaCFRC9CVector3fRC9CVector3fRC11CWeaponModei: @@ -4775,7 +4775,7 @@ GetCollisionResponseType__12CMetroidBetaCFRC9CVector3fRC9CVector3fRC11CWeaponMod /* 801C4D1C 001C1C7C 54 1E 17 FE */ rlwinm r30, r0, 2, 0x1f, 0x1f /* 801C4D20 001C1C80 81 8C 00 38 */ lwz r12, 0x38(r12) /* 801C4D24 001C1C84 7D 89 03 A6 */ mtctr r12 -/* 801C4D28 001C1C88 4E 80 04 21 */ bctrl +/* 801C4D28 001C1C88 4E 80 04 21 */ bctrl /* 801C4D2C 001C1C8C 7F A4 EB 78 */ mr r4, r29 /* 801C4D30 001C1C90 38 A0 00 00 */ li r5, 0 /* 801C4D34 001C1C94 4B F3 D9 D5 */ bl WeaponHurts__20CDamageVulnerabilityCFRC11CWeaponMode @@ -4792,7 +4792,7 @@ lbl_801C4D4C: /* 801C4D5C 001C1CBC 83 A1 00 14 */ lwz r29, 0x14(r1) /* 801C4D60 001C1CC0 7C 08 03 A6 */ mtlr r0 /* 801C4D64 001C1CC4 38 21 00 20 */ addi r1, r1, 0x20 -/* 801C4D68 001C1CC8 4E 80 00 20 */ blr +/* 801C4D68 001C1CC8 4E 80 00 20 */ blr .global GetDamageVulnerability__12CMetroidBetaCFRC9CVector3fRC9CVector3fRC11CDamageInfo GetDamageVulnerability__12CMetroidBetaCFRC9CVector3fRC9CVector3fRC11CDamageInfo: @@ -4802,11 +4802,11 @@ GetDamageVulnerability__12CMetroidBetaCFRC9CVector3fRC9CVector3fRC11CDamageInfo: /* 801C4D78 001C1CD8 81 83 00 00 */ lwz r12, 0(r3) /* 801C4D7C 001C1CDC 81 8C 00 38 */ lwz r12, 0x38(r12) /* 801C4D80 001C1CE0 7D 89 03 A6 */ mtctr r12 -/* 801C4D84 001C1CE4 4E 80 04 21 */ bctrl +/* 801C4D84 001C1CE4 4E 80 04 21 */ bctrl /* 801C4D88 001C1CE8 80 01 00 14 */ lwz r0, 0x14(r1) /* 801C4D8C 001C1CEC 7C 08 03 A6 */ mtlr r0 /* 801C4D90 001C1CF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801C4D94 001C1CF4 4E 80 00 20 */ blr +/* 801C4D94 001C1CF4 4E 80 00 20 */ blr .global GetDamageVulnerability__12CMetroidBetaCFv GetDamageVulnerability__12CMetroidBetaCFv: @@ -4845,7 +4845,7 @@ lbl_801C4E04: /* 801C4E08 001C1D68 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801C4E0C 001C1D6C 7C 08 03 A6 */ mtlr r0 /* 801C4E10 001C1D70 38 21 00 10 */ addi r1, r1, 0x10 -/* 801C4E14 001C1D74 4E 80 00 20 */ blr +/* 801C4E14 001C1D74 4E 80 00 20 */ blr .global GetOrigin__12CMetroidBetaCFRC13CStateManagerRC11CTeamAiRole GetOrigin__12CMetroidBetaCFRC13CStateManagerRC11CTeamAiRole: @@ -4935,7 +4935,7 @@ lbl_801C4EE8: /* 801C4F5C 001C1EBC 83 A1 00 64 */ lwz r29, 0x64(r1) /* 801C4F60 001C1EC0 7C 08 03 A6 */ mtlr r0 /* 801C4F64 001C1EC4 38 21 00 90 */ addi r1, r1, 0x90 -/* 801C4F68 001C1EC8 4E 80 00 20 */ blr +/* 801C4F68 001C1EC8 4E 80 00 20 */ blr .global GetAimPosition__12CMetroidBetaCFRC13CStateManagerf GetAimPosition__12CMetroidBetaCFRC13CStateManagerf: @@ -4984,7 +4984,7 @@ lbl_801C4FF8: /* 801C500C 001C1F6C 83 A1 00 24 */ lwz r29, 0x24(r1) /* 801C5010 001C1F70 7C 08 03 A6 */ mtlr r0 /* 801C5014 001C1F74 38 21 00 40 */ addi r1, r1, 0x40 -/* 801C5018 001C1F78 4E 80 00 20 */ blr +/* 801C5018 001C1F78 4E 80 00 20 */ blr .global DoUserAnimEvent__12CMetroidBetaFR13CStateManagerRC13CInt32POINode14EUserEventType DoUserAnimEvent__12CMetroidBetaFR13CStateManagerRC13CInt32POINode14EUserEventType: @@ -5028,7 +5028,7 @@ lbl_801C5090: /* 801C50A4 001C2004 83 81 00 08 */ lwz r28, 8(r1) /* 801C50A8 001C2008 7C 08 03 A6 */ mtlr r0 /* 801C50AC 001C200C 38 21 00 20 */ addi r1, r1, 0x20 -/* 801C50B0 001C2010 4E 80 00 20 */ blr +/* 801C50B0 001C2010 4E 80 00 20 */ blr .global CollidedWith__12CMetroidBetaFRC9TUniqueIdRC18CCollisionInfoListR13CStateManager CollidedWith__12CMetroidBetaFRC9TUniqueIdRC18CCollisionInfoListR13CStateManager: @@ -5124,7 +5124,7 @@ lbl_801C51E4: /* 801C5208 001C2168 83 81 00 10 */ lwz r28, 0x10(r1) /* 801C520C 001C216C 7C 08 03 A6 */ mtlr r0 /* 801C5210 001C2170 38 21 00 20 */ addi r1, r1, 0x20 -/* 801C5214 001C2174 4E 80 00 20 */ blr +/* 801C5214 001C2174 4E 80 00 20 */ blr .global Touch__12CMetroidBetaFR6CActorR13CStateManager Touch__12CMetroidBetaFR6CActorR13CStateManager: @@ -5177,7 +5177,7 @@ lbl_801C52C8: /* 801C52CC 001C222C 81 9C 00 00 */ lwz r12, 0(r28) /* 801C52D0 001C2230 81 8C 00 38 */ lwz r12, 0x38(r12) /* 801C52D4 001C2234 7D 89 03 A6 */ mtctr r12 -/* 801C52D8 001C2238 4E 80 04 21 */ bctrl +/* 801C52D8 001C2238 4E 80 04 21 */ bctrl /* 801C52DC 001C223C 80 1F 00 E8 */ lwz r0, 0xe8(r31) /* 801C52E0 001C2240 54 00 07 38 */ rlwinm r0, r0, 0, 0x1c, 0x1c /* 801C52E4 001C2244 2C 00 00 08 */ cmpwi r0, 8 @@ -5249,7 +5249,7 @@ lbl_801C5348: /* 801C53E8 001C2348 81 9C 00 00 */ lwz r12, 0(r28) /* 801C53EC 001C234C 81 8C 02 90 */ lwz r12, 0x290(r12) /* 801C53F0 001C2350 7D 89 03 A6 */ mtctr r12 -/* 801C53F4 001C2354 4E 80 04 21 */ bctrl +/* 801C53F4 001C2354 4E 80 04 21 */ bctrl /* 801C53F8 001C2358 88 1C 08 40 */ lbz r0, 0x840(r28) /* 801C53FC 001C235C 38 60 00 00 */ li r3, 0 /* 801C5400 001C2360 50 60 3E 30 */ rlwimi r0, r3, 7, 0x18, 0x18 @@ -5279,7 +5279,7 @@ lbl_801C5438: /* 801C5450 001C23B0 83 81 00 60 */ lwz r28, 0x60(r1) /* 801C5454 001C23B4 7C 08 03 A6 */ mtlr r0 /* 801C5458 001C23B8 38 21 00 80 */ addi r1, r1, 0x80 -/* 801C545C 001C23BC 4E 80 00 20 */ blr +/* 801C545C 001C23BC 4E 80 00 20 */ blr .global AddToRenderer__12CMetroidBetaCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__12CMetroidBetaCFRC14CFrustumPlanesRC13CStateManager: @@ -5319,7 +5319,7 @@ lbl_801C54D4: /* 801C54DC 001C243C 81 9D 00 00 */ lwz r12, 0(r29) /* 801C54E0 001C2440 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 801C54E4 001C2444 7D 89 03 A6 */ mtctr r12 -/* 801C54E8 001C2448 4E 80 04 21 */ bctrl +/* 801C54E8 001C2448 4E 80 04 21 */ bctrl /* 801C54EC 001C244C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801C54F0 001C2450 41 82 00 20 */ beq lbl_801C5510 /* 801C54F4 001C2454 7F A3 EB 78 */ mr r3, r29 @@ -5327,7 +5327,7 @@ lbl_801C54D4: /* 801C54FC 001C245C 81 9D 00 00 */ lwz r12, 0(r29) /* 801C5500 001C2460 81 8C 00 28 */ lwz r12, 0x28(r12) /* 801C5504 001C2464 7D 89 03 A6 */ mtctr r12 -/* 801C5508 001C2468 4E 80 04 21 */ bctrl +/* 801C5508 001C2468 4E 80 04 21 */ bctrl /* 801C550C 001C246C 48 00 00 10 */ b lbl_801C551C lbl_801C5510: /* 801C5510 001C2470 7F A3 EB 78 */ mr r3, r29 @@ -5394,7 +5394,7 @@ lbl_801C551C: /* 801C5600 001C2560 39 00 00 00 */ li r8, 0 /* 801C5604 001C2564 81 8C 00 40 */ lwz r12, 0x40(r12) /* 801C5608 001C2568 7D 89 03 A6 */ mtctr r12 -/* 801C560C 001C256C 4E 80 04 21 */ bctrl +/* 801C560C 001C256C 4E 80 04 21 */ bctrl lbl_801C5610: /* 801C5610 001C2570 80 01 00 74 */ lwz r0, 0x74(r1) /* 801C5614 001C2574 83 E1 00 6C */ lwz r31, 0x6c(r1) @@ -5402,7 +5402,7 @@ lbl_801C5610: /* 801C561C 001C257C 83 A1 00 64 */ lwz r29, 0x64(r1) /* 801C5620 001C2580 7C 08 03 A6 */ mtlr r0 /* 801C5624 001C2584 38 21 00 70 */ addi r1, r1, 0x70 -/* 801C5628 001C2588 4E 80 00 20 */ blr +/* 801C5628 001C2588 4E 80 00 20 */ blr .global RenderHitGunEffect__12CMetroidBetaCFv RenderHitGunEffect__12CMetroidBetaCFv: @@ -5416,12 +5416,12 @@ RenderHitGunEffect__12CMetroidBetaCFv: /* 801C5648 001C25A8 81 83 00 00 */ lwz r12, 0(r3) /* 801C564C 001C25AC 81 8C 00 10 */ lwz r12, 0x10(r12) /* 801C5650 001C25B0 7D 89 03 A6 */ mtctr r12 -/* 801C5654 001C25B4 4E 80 04 21 */ bctrl +/* 801C5654 001C25B4 4E 80 04 21 */ bctrl lbl_801C5658: /* 801C5658 001C25B8 80 01 00 14 */ lwz r0, 0x14(r1) /* 801C565C 001C25BC 7C 08 03 A6 */ mtlr r0 /* 801C5660 001C25C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801C5664 001C25C4 4E 80 00 20 */ blr +/* 801C5664 001C25C4 4E 80 00 20 */ blr .global RenderHitBallEffect__12CMetroidBetaCFv RenderHitBallEffect__12CMetroidBetaCFv: @@ -5435,12 +5435,12 @@ RenderHitBallEffect__12CMetroidBetaCFv: /* 801C5684 001C25E4 81 83 00 00 */ lwz r12, 0(r3) /* 801C5688 001C25E8 81 8C 00 10 */ lwz r12, 0x10(r12) /* 801C568C 001C25EC 7D 89 03 A6 */ mtctr r12 -/* 801C5690 001C25F0 4E 80 04 21 */ bctrl +/* 801C5690 001C25F0 4E 80 04 21 */ bctrl lbl_801C5694: /* 801C5694 001C25F4 80 01 00 14 */ lwz r0, 0x14(r1) /* 801C5698 001C25F8 7C 08 03 A6 */ mtlr r0 /* 801C569C 001C25FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801C56A0 001C2600 4E 80 00 20 */ blr +/* 801C56A0 001C2600 4E 80 00 20 */ blr .global Render__12CMetroidBetaCFRC13CStateManager Render__12CMetroidBetaCFRC13CStateManager: @@ -5457,12 +5457,12 @@ Render__12CMetroidBetaCFRC13CStateManager: /* 801C56CC 001C262C 81 83 00 00 */ lwz r12, 0(r3) /* 801C56D0 001C2630 81 8C 00 10 */ lwz r12, 0x10(r12) /* 801C56D4 001C2634 7D 89 03 A6 */ mtctr r12 -/* 801C56D8 001C2638 4E 80 04 21 */ bctrl +/* 801C56D8 001C2638 4E 80 04 21 */ bctrl /* 801C56DC 001C263C 80 7F 08 24 */ lwz r3, 0x824(r31) /* 801C56E0 001C2640 81 83 00 00 */ lwz r12, 0(r3) /* 801C56E4 001C2644 81 8C 00 10 */ lwz r12, 0x10(r12) /* 801C56E8 001C2648 7D 89 03 A6 */ mtctr r12 -/* 801C56EC 001C264C 4E 80 04 21 */ bctrl +/* 801C56EC 001C264C 4E 80 04 21 */ bctrl /* 801C56F0 001C2650 C0 3F 08 3C */ lfs f1, 0x83c(r31) /* 801C56F4 001C2654 C0 02 AA 98 */ lfs f0, lbl_805AC7B8@sda21(r2) /* 801C56F8 001C2658 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -5471,13 +5471,13 @@ Render__12CMetroidBetaCFRC13CStateManager: /* 801C5704 001C2664 81 83 00 00 */ lwz r12, 0(r3) /* 801C5708 001C2668 81 8C 00 10 */ lwz r12, 0x10(r12) /* 801C570C 001C266C 7D 89 03 A6 */ mtctr r12 -/* 801C5710 001C2670 4E 80 04 21 */ bctrl +/* 801C5710 001C2670 4E 80 04 21 */ bctrl lbl_801C5714: /* 801C5714 001C2674 80 01 00 14 */ lwz r0, 0x14(r1) /* 801C5718 001C2678 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801C571C 001C267C 7C 08 03 A6 */ mtlr r0 /* 801C5720 001C2680 38 21 00 10 */ addi r1, r1, 0x10 -/* 801C5724 001C2684 4E 80 00 20 */ blr +/* 801C5724 001C2684 4E 80 00 20 */ blr .global AcceptScriptMsg__12CMetroidBetaF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__12CMetroidBetaF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -5500,7 +5500,7 @@ AcceptScriptMsg__12CMetroidBetaF20EScriptObjectMessage9TUniqueIdR13CStateManager /* 801C5768 001C26C8 38 63 56 54 */ addi r3, r3, lbl_803E5654@l /* 801C576C 001C26CC 7C 03 00 2E */ lwzx r0, r3, r0 /* 801C5770 001C26D0 7C 09 03 A6 */ mtctr r0 -/* 801C5774 001C26D4 4E 80 04 20 */ bctr +/* 801C5774 001C26D4 4E 80 04 20 */ bctr .global lbl_801C5778 lbl_801C5778: /* 801C5778 001C26D8 80 7D 04 50 */ lwz r3, 0x450(r29) @@ -5599,7 +5599,7 @@ lbl_801C584C: /* 801C58CC 001C282C 81 9C 00 00 */ lwz r12, 0(r28) /* 801C58D0 001C2830 81 8C 00 38 */ lwz r12, 0x38(r12) /* 801C58D4 001C2834 7D 89 03 A6 */ mtctr r12 -/* 801C58D8 001C2838 4E 80 04 21 */ bctrl +/* 801C58D8 001C2838 4E 80 04 21 */ bctrl /* 801C58DC 001C283C C0 3E 01 34 */ lfs f1, 0x134(r30) /* 801C58E0 001C2840 7C 7B 1B 78 */ mr r27, r3 /* 801C58E4 001C2844 3B 9E 01 2C */ addi r28, r30, 0x12c @@ -5652,7 +5652,7 @@ lbl_801C594C: /* 801C5998 001C28F8 81 9D 00 00 */ lwz r12, 0(r29) /* 801C599C 001C28FC 81 8C 00 88 */ lwz r12, 0x88(r12) /* 801C59A0 001C2900 7D 89 03 A6 */ mtctr r12 -/* 801C59A4 001C2904 4E 80 04 21 */ bctrl +/* 801C59A4 001C2904 4E 80 04 21 */ bctrl lbl_801C59A8: /* 801C59A8 001C2908 88 1D 08 40 */ lbz r0, 0x840(r29) /* 801C59AC 001C290C 54 00 D7 FF */ rlwinm. r0, r0, 0x1a, 0x1f, 0x1f @@ -5748,7 +5748,7 @@ lbl_801C5AC8: /* 801C5AFC 001C2A5C 81 9D 00 00 */ lwz r12, 0(r29) /* 801C5B00 001C2A60 81 8C 00 34 */ lwz r12, 0x34(r12) /* 801C5B04 001C2A64 7D 89 03 A6 */ mtctr r12 -/* 801C5B08 001C2A68 4E 80 04 21 */ bctrl +/* 801C5B08 001C2A68 4E 80 04 21 */ bctrl /* 801C5B0C 001C2A6C C0 23 00 00 */ lfs f1, 0(r3) /* 801C5B10 001C2A70 C0 02 AA 98 */ lfs f0, lbl_805AC7B8@sda21(r2) /* 801C5B14 001C2A74 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -5771,7 +5771,7 @@ lbl_801C5AC8: /* 801C5B58 001C2AB8 81 9D 00 00 */ lwz r12, 0(r29) /* 801C5B5C 001C2ABC 81 8C 02 B0 */ lwz r12, 0x2b0(r12) /* 801C5B60 001C2AC0 7D 89 03 A6 */ mtctr r12 -/* 801C5B64 001C2AC4 4E 80 04 21 */ bctrl +/* 801C5B64 001C2AC4 4E 80 04 21 */ bctrl /* 801C5B68 001C2AC8 C0 21 00 EC */ lfs f1, 0xec(r1) /* 801C5B6C 001C2ACC C0 02 AA AC */ lfs f0, lbl_805AC7CC@sda21(r2) /* 801C5B70 001C2AD0 80 81 00 E4 */ lwz r4, 0xe4(r1) @@ -5799,7 +5799,7 @@ lbl_801C5AC8: /* 801C5BC8 001C2B28 81 9D 00 00 */ lwz r12, 0(r29) /* 801C5BCC 001C2B2C 81 8C 02 B0 */ lwz r12, 0x2b0(r12) /* 801C5BD0 001C2B30 7D 89 03 A6 */ mtctr r12 -/* 801C5BD4 001C2B34 4E 80 04 21 */ bctrl +/* 801C5BD4 001C2B34 4E 80 04 21 */ bctrl /* 801C5BD8 001C2B38 80 81 00 C8 */ lwz r4, 0xc8(r1) /* 801C5BDC 001C2B3C 80 61 00 CC */ lwz r3, 0xcc(r1) /* 801C5BE0 001C2B40 C0 61 00 D0 */ lfs f3, 0xd0(r1) @@ -5891,7 +5891,7 @@ lbl_801C5D14: /* 801C5D18 001C2C78 80 01 01 74 */ lwz r0, 0x174(r1) /* 801C5D1C 001C2C7C 7C 08 03 A6 */ mtlr r0 /* 801C5D20 001C2C80 38 21 01 70 */ addi r1, r1, 0x170 -/* 801C5D24 001C2C84 4E 80 00 20 */ blr +/* 801C5D24 001C2C84 4E 80 00 20 */ blr .global Think__12CMetroidBetaFfR13CStateManager Think__12CMetroidBetaFfR13CStateManager: @@ -5949,7 +5949,7 @@ lbl_801C5DE0: /* 801C5DEC 001C2D4C 83 C1 00 20 */ lwz r30, 0x20(r1) /* 801C5DF0 001C2D50 7C 08 03 A6 */ mtlr r0 /* 801C5DF4 001C2D54 38 21 00 30 */ addi r1, r1, 0x30 -/* 801C5DF8 001C2D58 4E 80 00 20 */ blr +/* 801C5DF8 001C2D58 4E 80 00 20 */ blr .global Accept__12CMetroidBetaFR8IVisitor Accept__12CMetroidBetaFR8IVisitor: @@ -5962,11 +5962,11 @@ Accept__12CMetroidBetaFR8IVisitor: /* 801C5E14 001C2D74 7C 04 03 78 */ mr r4, r0 /* 801C5E18 001C2D78 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 801C5E1C 001C2D7C 7D 89 03 A6 */ mtctr r12 -/* 801C5E20 001C2D80 4E 80 04 21 */ bctrl +/* 801C5E20 001C2D80 4E 80 04 21 */ bctrl /* 801C5E24 001C2D84 80 01 00 14 */ lwz r0, 0x14(r1) /* 801C5E28 001C2D88 7C 08 03 A6 */ mtlr r0 /* 801C5E2C 001C2D8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801C5E30 001C2D90 4E 80 00 20 */ blr +/* 801C5E30 001C2D90 4E 80 00 20 */ blr .global __dt__12CMetroidBetaFv __dt__12CMetroidBetaFv: @@ -5990,7 +5990,7 @@ __dt__12CMetroidBetaFv: /* 801C5E78 001C2DD8 38 80 00 01 */ li r4, 1 /* 801C5E7C 001C2DDC 81 8C 00 08 */ lwz r12, 8(r12) /* 801C5E80 001C2DE0 7D 89 03 A6 */ mtctr r12 -/* 801C5E84 001C2DE4 4E 80 04 21 */ bctrl +/* 801C5E84 001C2DE4 4E 80 04 21 */ bctrl lbl_801C5E88: /* 801C5E88 001C2DE8 34 1E 08 2C */ addic. r0, r30, 0x82c /* 801C5E8C 001C2DEC 41 82 00 24 */ beq lbl_801C5EB0 @@ -6001,7 +6001,7 @@ lbl_801C5E88: /* 801C5EA0 001C2E00 38 80 00 01 */ li r4, 1 /* 801C5EA4 001C2E04 81 8C 00 08 */ lwz r12, 8(r12) /* 801C5EA8 001C2E08 7D 89 03 A6 */ mtctr r12 -/* 801C5EAC 001C2E0C 4E 80 04 21 */ bctrl +/* 801C5EAC 001C2E0C 4E 80 04 21 */ bctrl lbl_801C5EB0: /* 801C5EB0 001C2E10 34 1E 08 28 */ addic. r0, r30, 0x828 /* 801C5EB4 001C2E14 41 82 00 24 */ beq lbl_801C5ED8 @@ -6012,7 +6012,7 @@ lbl_801C5EB0: /* 801C5EC8 001C2E28 38 80 00 01 */ li r4, 1 /* 801C5ECC 001C2E2C 81 8C 00 08 */ lwz r12, 8(r12) /* 801C5ED0 001C2E30 7D 89 03 A6 */ mtctr r12 -/* 801C5ED4 001C2E34 4E 80 04 21 */ bctrl +/* 801C5ED4 001C2E34 4E 80 04 21 */ bctrl lbl_801C5ED8: /* 801C5ED8 001C2E38 34 1E 08 24 */ addic. r0, r30, 0x824 /* 801C5EDC 001C2E3C 41 82 00 24 */ beq lbl_801C5F00 @@ -6023,7 +6023,7 @@ lbl_801C5ED8: /* 801C5EF0 001C2E50 38 80 00 01 */ li r4, 1 /* 801C5EF4 001C2E54 81 8C 00 08 */ lwz r12, 8(r12) /* 801C5EF8 001C2E58 7D 89 03 A6 */ mtctr r12 -/* 801C5EFC 001C2E5C 4E 80 04 21 */ bctrl +/* 801C5EFC 001C2E5C 4E 80 04 21 */ bctrl lbl_801C5F00: /* 801C5F00 001C2E60 34 1E 08 20 */ addic. r0, r30, 0x820 /* 801C5F04 001C2E64 41 82 00 24 */ beq lbl_801C5F28 @@ -6034,7 +6034,7 @@ lbl_801C5F00: /* 801C5F18 001C2E78 38 80 00 01 */ li r4, 1 /* 801C5F1C 001C2E7C 81 8C 00 08 */ lwz r12, 8(r12) /* 801C5F20 001C2E80 7D 89 03 A6 */ mtctr r12 -/* 801C5F24 001C2E84 4E 80 04 21 */ bctrl +/* 801C5F24 001C2E84 4E 80 04 21 */ bctrl lbl_801C5F28: /* 801C5F28 001C2E88 34 1E 08 14 */ addic. r0, r30, 0x814 /* 801C5F2C 001C2E8C 41 82 00 18 */ beq lbl_801C5F44 @@ -6137,7 +6137,7 @@ lbl_801C6070: /* 801C607C 001C2FDC 83 C1 00 08 */ lwz r30, 8(r1) /* 801C6080 001C2FE0 7C 08 03 A6 */ mtlr r0 /* 801C6084 001C2FE4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801C6088 001C2FE8 4E 80 00 20 */ blr +/* 801C6088 001C2FE8 4E 80 00 20 */ blr .global "__ct__12CMetroidBetaF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC14CPatternedInfoRC16CActorParametersRC12CMetroidData" "__ct__12CMetroidBetaF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC14CPatternedInfoRC16CActorParametersRC12CMetroidData": @@ -6267,7 +6267,7 @@ lbl_801C6070: /* 801C6278 001C31D8 81 84 00 00 */ lwz r12, 0(r4) /* 801C627C 001C31DC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801C6280 001C31E0 7D 89 03 A6 */ mtctr r12 -/* 801C6284 001C31E4 4E 80 04 21 */ bctrl +/* 801C6284 001C31E4 4E 80 04 21 */ bctrl /* 801C6288 001C31E8 3B 9E 07 E4 */ addi r28, r30, 0x7e4 /* 801C628C 001C31EC 38 81 00 8C */ addi r4, r1, 0x8c /* 801C6290 001C31F0 7F 83 E3 78 */ mr r3, r28 @@ -6290,7 +6290,7 @@ lbl_801C6070: /* 801C62D4 001C3234 81 84 00 00 */ lwz r12, 0(r4) /* 801C62D8 001C3238 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801C62DC 001C323C 7D 89 03 A6 */ mtctr r12 -/* 801C62E0 001C3240 4E 80 04 21 */ bctrl +/* 801C62E0 001C3240 4E 80 04 21 */ bctrl /* 801C62E4 001C3244 3B 9E 07 F0 */ addi r28, r30, 0x7f0 /* 801C62E8 001C3248 38 81 00 7C */ addi r4, r1, 0x7c /* 801C62EC 001C324C 7F 83 E3 78 */ mr r3, r28 @@ -6313,7 +6313,7 @@ lbl_801C6070: /* 801C6330 001C3290 81 84 00 00 */ lwz r12, 0(r4) /* 801C6334 001C3294 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801C6338 001C3298 7D 89 03 A6 */ mtctr r12 -/* 801C633C 001C329C 4E 80 04 21 */ bctrl +/* 801C633C 001C329C 4E 80 04 21 */ bctrl /* 801C6340 001C32A0 3B 9E 07 FC */ addi r28, r30, 0x7fc /* 801C6344 001C32A4 38 81 00 6C */ addi r4, r1, 0x6c /* 801C6348 001C32A8 7F 83 E3 78 */ mr r3, r28 @@ -6336,7 +6336,7 @@ lbl_801C6070: /* 801C638C 001C32EC 81 84 00 00 */ lwz r12, 0(r4) /* 801C6390 001C32F0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801C6394 001C32F4 7D 89 03 A6 */ mtctr r12 -/* 801C6398 001C32F8 4E 80 04 21 */ bctrl +/* 801C6398 001C32F8 4E 80 04 21 */ bctrl /* 801C639C 001C32FC 3B 9E 08 08 */ addi r28, r30, 0x808 /* 801C63A0 001C3300 38 81 00 5C */ addi r4, r1, 0x5c /* 801C63A4 001C3304 7F 83 E3 78 */ mr r3, r28 @@ -6359,7 +6359,7 @@ lbl_801C6070: /* 801C63E8 001C3348 81 84 00 00 */ lwz r12, 0(r4) /* 801C63EC 001C334C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801C63F0 001C3350 7D 89 03 A6 */ mtctr r12 -/* 801C63F4 001C3354 4E 80 04 21 */ bctrl +/* 801C63F4 001C3354 4E 80 04 21 */ bctrl /* 801C63F8 001C3358 3B 9E 08 14 */ addi r28, r30, 0x814 /* 801C63FC 001C335C 38 81 00 4C */ addi r4, r1, 0x4c /* 801C6400 001C3360 7F 83 E3 78 */ mr r3, r28 @@ -6540,19 +6540,19 @@ lbl_801C6614: /* 801C6694 001C35F4 81 83 00 00 */ lwz r12, 0(r3) /* 801C6698 001C35F8 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 801C669C 001C35FC 7D 89 03 A6 */ mtctr r12 -/* 801C66A0 001C3600 4E 80 04 21 */ bctrl +/* 801C66A0 001C3600 4E 80 04 21 */ bctrl /* 801C66A4 001C3604 80 7E 08 28 */ lwz r3, 0x828(r30) /* 801C66A8 001C3608 38 80 00 00 */ li r4, 0 /* 801C66AC 001C360C 81 83 00 00 */ lwz r12, 0(r3) /* 801C66B0 001C3610 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 801C66B4 001C3614 7D 89 03 A6 */ mtctr r12 -/* 801C66B8 001C3618 4E 80 04 21 */ bctrl +/* 801C66B8 001C3618 4E 80 04 21 */ bctrl /* 801C66BC 001C361C 80 7E 08 2C */ lwz r3, 0x82c(r30) /* 801C66C0 001C3620 38 80 00 00 */ li r4, 0 /* 801C66C4 001C3624 81 83 00 00 */ lwz r12, 0(r3) /* 801C66C8 001C3628 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 801C66CC 001C362C 7D 89 03 A6 */ mtctr r12 -/* 801C66D0 001C3630 4E 80 04 21 */ bctrl +/* 801C66D0 001C3630 4E 80 04 21 */ bctrl /* 801C66D4 001C3634 83 BE 08 24 */ lwz r29, 0x824(r30) /* 801C66D8 001C3638 3B 80 00 00 */ li r28, 0 /* 801C66DC 001C363C 3B E0 00 01 */ li r31, 1 @@ -6567,7 +6567,7 @@ lbl_801C66E4: /* 801C66FC 001C365C 81 83 00 00 */ lwz r12, 0(r3) /* 801C6700 001C3660 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801C6704 001C3664 7D 89 03 A6 */ mtctr r12 -/* 801C6708 001C3668 4E 80 04 21 */ bctrl +/* 801C6708 001C3668 4E 80 04 21 */ bctrl /* 801C670C 001C366C 3B 9C 00 01 */ addi r28, r28, 1 lbl_801C6710: /* 801C6710 001C3670 80 7D 01 60 */ lwz r3, 0x160(r29) @@ -6621,7 +6621,7 @@ lbl_801C6710: /* 801C67D0 001C3730 80 01 01 04 */ lwz r0, 0x104(r1) /* 801C67D4 001C3734 7C 08 03 A6 */ mtlr r0 /* 801C67D8 001C3738 38 21 01 00 */ addi r1, r1, 0x100 -/* 801C67DC 001C373C 4E 80 00 20 */ blr +/* 801C67DC 001C373C 4E 80 00 20 */ blr .global sub_801c67e0 sub_801c67e0: @@ -6759,7 +6759,7 @@ sub_801c67e0: /* 801C69EC 001C394C 90 03 01 04 */ stw r0, 0x104(r3) /* 801C69F0 001C3950 88 04 01 08 */ lbz r0, 0x108(r4) /* 801C69F4 001C3954 98 03 01 08 */ stb r0, 0x108(r3) -/* 801C69F8 001C3958 4E 80 00 20 */ blr +/* 801C69F8 001C3958 4E 80 00 20 */ blr .global __ct__16CMetroidBetaDataFR12CInputStream __ct__16CMetroidBetaDataFR12CInputStream: @@ -6827,7 +6827,7 @@ __ct__16CMetroidBetaDataFR12CInputStream: /* 801C6AF0 001C3A50 80 01 00 14 */ lwz r0, 0x14(r1) /* 801C6AF4 001C3A54 7C 08 03 A6 */ mtlr r0 /* 801C6AF8 001C3A58 38 21 00 10 */ addi r1, r1, 0x10 -/* 801C6AFC 001C3A5C 4E 80 00 20 */ blr +/* 801C6AFC 001C3A5C 4E 80 00 20 */ blr .global __sinit_CMetroidBeta_cpp __sinit_CMetroidBeta_cpp: diff --git a/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s b/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s index fb54fdbe..22e5b4c5 100644 --- a/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s +++ b/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s @@ -409,7 +409,7 @@ lbl_805A84E4: .global GetSearchPath__20CMetroidPrimeEssenceFv GetSearchPath__20CMetroidPrimeEssenceFv: /* 8027CB38 00279A98 38 63 05 74 */ addi r3, r3, 0x574 -/* 8027CB3C 00279A9C 4E 80 00 20 */ blr +/* 8027CB3C 00279A9C 4E 80 00 20 */ blr .global sub_8027cb40 sub_8027cb40: @@ -517,7 +517,7 @@ lbl_8027CC1C: /* 8027CCD0 00279C30 83 81 00 50 */ lwz r28, 0x50(r1) /* 8027CCD4 00279C34 7C 08 03 A6 */ mtlr r0 /* 8027CCD8 00279C38 38 21 00 60 */ addi r1, r1, 0x60 -/* 8027CCDC 00279C3C 4E 80 00 20 */ blr +/* 8027CCDC 00279C3C 4E 80 00 20 */ blr .global sub_8027cce0 sub_8027cce0: @@ -592,7 +592,7 @@ lbl_8027CDE0: /* 8027CDEC 00279D4C 83 A1 00 44 */ lwz r29, 0x44(r1) /* 8027CDF0 00279D50 7C 08 03 A6 */ mtlr r0 /* 8027CDF4 00279D54 38 21 00 50 */ addi r1, r1, 0x50 -/* 8027CDF8 00279D58 4E 80 00 20 */ blr +/* 8027CDF8 00279D58 4E 80 00 20 */ blr .global sub_8027cdfc sub_8027cdfc: @@ -621,7 +621,7 @@ lbl_8027CE48: /* 8027CE4C 00279DAC 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8027CE50 00279DB0 7C 08 03 A6 */ mtlr r0 /* 8027CE54 00279DB4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8027CE58 00279DB8 4E 80 00 20 */ blr +/* 8027CE58 00279DB8 4E 80 00 20 */ blr .global sub_8027ce5c sub_8027ce5c: @@ -658,7 +658,7 @@ lbl_8027CEC4: /* 8027CED0 00279E30 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8027CED4 00279E34 7C 08 03 A6 */ mtlr r0 /* 8027CED8 00279E38 38 21 00 30 */ addi r1, r1, 0x30 -/* 8027CEDC 00279E3C 4E 80 00 20 */ blr +/* 8027CEDC 00279E3C 4E 80 00 20 */ blr .global sub_8027cee0 sub_8027cee0: @@ -672,7 +672,7 @@ sub_8027cee0: /* 8027CEFC 00279E5C 81 83 00 00 */ lwz r12, 0(r3) /* 8027CF00 00279E60 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8027CF04 00279E64 7D 89 03 A6 */ mtctr r12 -/* 8027CF08 00279E68 4E 80 04 21 */ bctrl +/* 8027CF08 00279E68 4E 80 04 21 */ bctrl /* 8027CF0C 00279E6C C0 5E 06 C4 */ lfs f2, 0x6c4(r30) /* 8027CF10 00279E70 C0 23 00 00 */ lfs f1, 0(r3) /* 8027CF14 00279E74 C0 02 BD 10 */ lfs f0, lbl_805ADA30@sda21(r2) @@ -728,7 +728,7 @@ lbl_8027CFBC: /* 8027CFC4 00279F24 83 C1 00 08 */ lwz r30, 8(r1) /* 8027CFC8 00279F28 7C 08 03 A6 */ mtlr r0 /* 8027CFCC 00279F2C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8027CFD0 00279F30 4E 80 00 20 */ blr +/* 8027CFD0 00279F30 4E 80 00 20 */ blr .global sub_8027cfd4 sub_8027cfd4: @@ -876,7 +876,7 @@ lbl_8027D1D0: /* 8027D1E4 0027A144 80 01 00 94 */ lwz r0, 0x94(r1) /* 8027D1E8 0027A148 7C 08 03 A6 */ mtlr r0 /* 8027D1EC 0027A14C 38 21 00 90 */ addi r1, r1, 0x90 -/* 8027D1F0 0027A150 4E 80 00 20 */ blr +/* 8027D1F0 0027A150 4E 80 00 20 */ blr .global sub_8027d1f4 sub_8027d1f4: @@ -942,7 +942,7 @@ lbl_8027D2CC: /* 8027D2DC 0027A23C 38 80 00 01 */ li r4, 1 /* 8027D2E0 0027A240 81 8C 00 08 */ lwz r12, 8(r12) /* 8027D2E4 0027A244 7D 89 03 A6 */ mtctr r12 -/* 8027D2E8 0027A248 4E 80 04 21 */ bctrl +/* 8027D2E8 0027A248 4E 80 04 21 */ bctrl lbl_8027D2EC: /* 8027D2EC 0027A24C 7F 60 07 75 */ extsb. r0, r27 /* 8027D2F0 0027A250 93 BE 06 5C */ stw r29, 0x65c(r30) @@ -970,7 +970,7 @@ lbl_8027D304: /* 8027D344 0027A2A4 81 83 00 00 */ lwz r12, 0(r3) /* 8027D348 0027A2A8 81 8C 00 24 */ lwz r12, 0x24(r12) /* 8027D34C 0027A2AC 7D 89 03 A6 */ mtctr r12 -/* 8027D350 0027A2B0 4E 80 04 21 */ bctrl +/* 8027D350 0027A2B0 4E 80 04 21 */ bctrl /* 8027D354 0027A2B4 83 BE 06 5C */ lwz r29, 0x65c(r30) /* 8027D358 0027A2B8 7F E4 FB 78 */ mr r4, r31 /* 8027D35C 0027A2BC 38 61 00 38 */ addi r3, r1, 0x38 @@ -980,7 +980,7 @@ lbl_8027D304: /* 8027D36C 0027A2CC 81 9D 00 00 */ lwz r12, 0(r29) /* 8027D370 0027A2D0 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 8027D374 0027A2D4 7D 89 03 A6 */ mtctr r12 -/* 8027D378 0027A2D8 4E 80 04 21 */ bctrl +/* 8027D378 0027A2D8 4E 80 04 21 */ bctrl /* 8027D37C 0027A2DC C0 5F 00 2C */ lfs f2, 0x2c(r31) /* 8027D380 0027A2E0 38 81 00 20 */ addi r4, r1, 0x20 /* 8027D384 0027A2E4 C0 3F 00 1C */ lfs f1, 0x1c(r31) @@ -992,7 +992,7 @@ lbl_8027D304: /* 8027D39C 0027A2FC 81 83 00 00 */ lwz r12, 0(r3) /* 8027D3A0 0027A300 81 8C 00 20 */ lwz r12, 0x20(r12) /* 8027D3A4 0027A304 7D 89 03 A6 */ mtctr r12 -/* 8027D3A8 0027A308 4E 80 04 21 */ bctrl +/* 8027D3A8 0027A308 4E 80 04 21 */ bctrl lbl_8027D3AC: /* 8027D3AC 0027A30C C0 5E 00 60 */ lfs f2, 0x60(r30) /* 8027D3B0 0027A310 3C 60 80 5A */ lis r3, skZero3f@ha @@ -1025,12 +1025,12 @@ lbl_8027D414: /* 8027D418 0027A378 80 01 00 84 */ lwz r0, 0x84(r1) /* 8027D41C 0027A37C 7C 08 03 A6 */ mtlr r0 /* 8027D420 0027A380 38 21 00 80 */ addi r1, r1, 0x80 -/* 8027D424 0027A384 4E 80 00 20 */ blr +/* 8027D424 0027A384 4E 80 00 20 */ blr .global sub_8027d428 sub_8027d428: /* 8027D428 0027A388 38 60 00 02 */ li r3, 2 -/* 8027D42C 0027A38C 4E 80 00 20 */ blr +/* 8027D42C 0027A38C 4E 80 00 20 */ blr .global sub_8027d430 sub_8027d430: @@ -1101,7 +1101,7 @@ lbl_8027D514: /* 8027D51C 0027A47C 83 C1 00 E8 */ lwz r30, 0xe8(r1) /* 8027D520 0027A480 7C 08 03 A6 */ mtlr r0 /* 8027D524 0027A484 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 8027D528 0027A488 4E 80 00 20 */ blr +/* 8027D528 0027A488 4E 80 00 20 */ blr .global sub_8027d52c sub_8027d52c: @@ -1228,7 +1228,7 @@ lbl_8027D6F0: /* 8027D6F4 0027A654 80 01 01 14 */ lwz r0, 0x114(r1) /* 8027D6F8 0027A658 7C 08 03 A6 */ mtlr r0 /* 8027D6FC 0027A65C 38 21 01 10 */ addi r1, r1, 0x110 -/* 8027D700 0027A660 4E 80 00 20 */ blr +/* 8027D700 0027A660 4E 80 00 20 */ blr .global sub_8027d704 sub_8027d704: @@ -1266,7 +1266,7 @@ sub_8027d704: /* 8027D780 0027A6E0 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8027D784 0027A6E4 7C 08 03 A6 */ mtlr r0 /* 8027D788 0027A6E8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8027D78C 0027A6EC 4E 80 00 20 */ blr +/* 8027D78C 0027A6EC 4E 80 00 20 */ blr .global sub_8027d790 sub_8027d790: @@ -1306,7 +1306,7 @@ sub_8027d790: /* 8027D814 0027A774 83 A1 00 34 */ lwz r29, 0x34(r1) /* 8027D818 0027A778 7C 08 03 A6 */ mtlr r0 /* 8027D81C 0027A77C 38 21 00 40 */ addi r1, r1, 0x40 -/* 8027D820 0027A780 4E 80 00 20 */ blr +/* 8027D820 0027A780 4E 80 00 20 */ blr .global sub_8027d824 sub_8027d824: @@ -1392,7 +1392,7 @@ lbl_8027D950: /* 8027D95C 0027A8BC 83 A1 00 B4 */ lwz r29, 0xb4(r1) /* 8027D960 0027A8C0 7C 08 03 A6 */ mtlr r0 /* 8027D964 0027A8C4 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 8027D968 0027A8C8 4E 80 00 20 */ blr +/* 8027D968 0027A8C8 4E 80 00 20 */ blr .global Death__20CMetroidPrimeEssenceFRC9CVector3fR13CStateManager Death__20CMetroidPrimeEssenceFRC9CVector3fR13CStateManager: @@ -1443,7 +1443,7 @@ lbl_8027DA04: /* 8027DA14 0027A974 83 81 00 20 */ lwz r28, 0x20(r1) /* 8027DA18 0027A978 7C 08 03 A6 */ mtlr r0 /* 8027DA1C 0027A97C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8027DA20 0027A980 4E 80 00 20 */ blr +/* 8027DA20 0027A980 4E 80 00 20 */ blr .global CoverFind__20CMetroidPrimeEssenceFR13CStateManagerf CoverFind__20CMetroidPrimeEssenceFR13CStateManagerf: @@ -1463,7 +1463,7 @@ CoverFind__20CMetroidPrimeEssenceFR13CStateManagerf: /* 8027DA58 0027A9B8 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8027DA5C 0027A9BC 7C 00 00 26 */ mfcr r0 /* 8027DA60 0027A9C0 54 03 0F FE */ srwi r3, r0, 0x1f -/* 8027DA64 0027A9C4 4E 80 00 20 */ blr +/* 8027DA64 0027A9C4 4E 80 00 20 */ blr .global ShouldMove__20CMetroidPrimeEssenceFR13CStateManagerf ShouldMove__20CMetroidPrimeEssenceFR13CStateManagerf: @@ -1471,7 +1471,7 @@ ShouldMove__20CMetroidPrimeEssenceFR13CStateManagerf: /* 8027DA6C 0027A9CC 54 00 07 FE */ clrlwi r0, r0, 0x1f /* 8027DA70 0027A9D0 7C 00 00 34 */ cntlzw r0, r0 /* 8027DA74 0027A9D4 54 03 D9 7E */ srwi r3, r0, 5 -/* 8027DA78 0027A9D8 4E 80 00 20 */ blr +/* 8027DA78 0027A9D8 4E 80 00 20 */ blr .global HasPatrolPath__20CMetroidPrimeEssenceFR13CStateManagerf HasPatrolPath__20CMetroidPrimeEssenceFR13CStateManagerf: @@ -1493,7 +1493,7 @@ lbl_8027DAAC: /* 8027DAB4 0027AA14 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8027DAB8 0027AA18 7C 08 03 A6 */ mtlr r0 /* 8027DABC 0027AA1C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8027DAC0 0027AA20 4E 80 00 20 */ blr +/* 8027DAC0 0027AA20 4E 80 00 20 */ blr .global InPosition__20CMetroidPrimeEssenceFR13CStateManagerf InPosition__20CMetroidPrimeEssenceFR13CStateManagerf: @@ -1505,7 +1505,7 @@ InPosition__20CMetroidPrimeEssenceFR13CStateManagerf: /* 8027DAD8 0027AA38 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8027DADC 0027AA3C 7C 00 00 26 */ mfcr r0 /* 8027DAE0 0027AA40 54 03 17 FE */ rlwinm r3, r0, 2, 0x1f, 0x1f -/* 8027DAE4 0027AA44 4E 80 00 20 */ blr +/* 8027DAE4 0027AA44 4E 80 00 20 */ blr .global ShouldTaunt__20CMetroidPrimeEssenceFR13CStateManagerf ShouldTaunt__20CMetroidPrimeEssenceFR13CStateManagerf: @@ -1519,7 +1519,7 @@ ShouldTaunt__20CMetroidPrimeEssenceFR13CStateManagerf: /* 8027DB04 0027AA64 81 83 00 00 */ lwz r12, 0(r3) /* 8027DB08 0027AA68 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8027DB0C 0027AA6C 7D 89 03 A6 */ mtctr r12 -/* 8027DB10 0027AA70 4E 80 04 21 */ bctrl +/* 8027DB10 0027AA70 4E 80 04 21 */ bctrl /* 8027DB14 0027AA74 28 03 00 00 */ cmplwi r3, 0 /* 8027DB18 0027AA78 41 82 00 58 */ beq lbl_8027DB70 /* 8027DB1C 0027AA7C C0 23 00 00 */ lfs f1, 0(r3) @@ -1551,7 +1551,7 @@ lbl_8027DB74: /* 8027DB7C 0027AADC 83 C1 00 08 */ lwz r30, 8(r1) /* 8027DB80 0027AAE0 7C 08 03 A6 */ mtlr r0 /* 8027DB84 0027AAE4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8027DB88 0027AAE8 4E 80 00 20 */ blr +/* 8027DB88 0027AAE8 4E 80 00 20 */ blr .global ShouldCrouch__20CMetroidPrimeEssenceFR13CStateManagerf ShouldCrouch__20CMetroidPrimeEssenceFR13CStateManagerf: @@ -1572,7 +1572,7 @@ lbl_8027DBC0: /* 8027DBC0 0027AB20 81 83 00 00 */ lwz r12, 0(r3) /* 8027DBC4 0027AB24 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8027DBC8 0027AB28 7D 89 03 A6 */ mtctr r12 -/* 8027DBCC 0027AB2C 4E 80 04 21 */ bctrl +/* 8027DBCC 0027AB2C 4E 80 04 21 */ bctrl /* 8027DBD0 0027AB30 C0 3F 06 C4 */ lfs f1, 0x6c4(r31) /* 8027DBD4 0027AB34 C0 03 00 00 */ lfs f0, 0(r3) /* 8027DBD8 0027AB38 C0 42 BD 3C */ lfs f2, lbl_805ADA5C@sda21(r2) @@ -1604,7 +1604,7 @@ lbl_8027DC30: /* 8027DC34 0027AB94 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8027DC38 0027AB98 7C 08 03 A6 */ mtlr r0 /* 8027DC3C 0027AB9C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8027DC40 0027ABA0 4E 80 00 20 */ blr +/* 8027DC40 0027ABA0 4E 80 00 20 */ blr .global ShouldAttack__20CMetroidPrimeEssenceFR13CStateManagerf ShouldAttack__20CMetroidPrimeEssenceFR13CStateManagerf: @@ -1612,10 +1612,10 @@ ShouldAttack__20CMetroidPrimeEssenceFR13CStateManagerf: /* 8027DC48 0027ABA8 54 60 07 FF */ clrlwi. r0, r3, 0x1f /* 8027DC4C 0027ABAC 41 82 00 0C */ beq lbl_8027DC58 /* 8027DC50 0027ABB0 54 63 D7 FE */ rlwinm r3, r3, 0x1a, 0x1f, 0x1f -/* 8027DC54 0027ABB4 4E 80 00 20 */ blr +/* 8027DC54 0027ABB4 4E 80 00 20 */ blr lbl_8027DC58: /* 8027DC58 0027ABB8 38 60 00 01 */ li r3, 1 -/* 8027DC5C 0027ABBC 4E 80 00 20 */ blr +/* 8027DC5C 0027ABBC 4E 80 00 20 */ blr .global Dead__20CMetroidPrimeEssenceFR13CStateManager9EStateMsgf Dead__20CMetroidPrimeEssenceFR13CStateManager9EStateMsgf: @@ -1661,7 +1661,7 @@ lbl_8027DCE4: /* 8027DCF4 0027AC54 83 A1 00 1C */ lwz r29, 0x1c(r1) /* 8027DCF8 0027AC58 7C 08 03 A6 */ mtlr r0 /* 8027DCFC 0027AC5C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8027DD00 0027AC60 4E 80 00 20 */ blr +/* 8027DD00 0027AC60 4E 80 00 20 */ blr .global Taunt__20CMetroidPrimeEssenceFR13CStateManager9EStateMsgf Taunt__20CMetroidPrimeEssenceFR13CStateManager9EStateMsgf: @@ -1703,7 +1703,7 @@ lbl_8027DD7C: /* 8027DD7C 0027ACDC 80 01 00 24 */ lwz r0, 0x24(r1) /* 8027DD80 0027ACE0 7C 08 03 A6 */ mtlr r0 /* 8027DD84 0027ACE4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8027DD88 0027ACE8 4E 80 00 20 */ blr +/* 8027DD88 0027ACE8 4E 80 00 20 */ blr .global Skid__20CMetroidPrimeEssenceFR13CStateManager9EStateMsgf Skid__20CMetroidPrimeEssenceFR13CStateManager9EStateMsgf: @@ -1745,7 +1745,7 @@ lbl_8027DE04: /* 8027DE04 0027AD64 80 01 00 24 */ lwz r0, 0x24(r1) /* 8027DE08 0027AD68 7C 08 03 A6 */ mtlr r0 /* 8027DE0C 0027AD6C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8027DE10 0027AD70 4E 80 00 20 */ blr +/* 8027DE10 0027AD70 4E 80 00 20 */ blr .global JumpBack__20CMetroidPrimeEssenceFR13CStateManager9EStateMsgf JumpBack__20CMetroidPrimeEssenceFR13CStateManager9EStateMsgf: @@ -1793,7 +1793,7 @@ lbl_8027DEA0: /* 8027DEA4 0027AE04 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8027DEA8 0027AE08 7C 08 03 A6 */ mtlr r0 /* 8027DEAC 0027AE0C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8027DEB0 0027AE10 4E 80 00 20 */ blr +/* 8027DEB0 0027AE10 4E 80 00 20 */ blr .global PathFindEx__20CMetroidPrimeEssenceFR13CStateManager9EStateMsgf PathFindEx__20CMetroidPrimeEssenceFR13CStateManager9EStateMsgf: @@ -1837,7 +1837,7 @@ lbl_8027DF2C: /* 8027DF34 0027AE94 83 C1 00 08 */ lwz r30, 8(r1) /* 8027DF38 0027AE98 7C 08 03 A6 */ mtlr r0 /* 8027DF3C 0027AE9C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8027DF40 0027AEA0 4E 80 00 20 */ blr +/* 8027DF40 0027AEA0 4E 80 00 20 */ blr .global PathFind__20CMetroidPrimeEssenceFR13CStateManager9EStateMsgf PathFind__20CMetroidPrimeEssenceFR13CStateManager9EStateMsgf: @@ -1872,11 +1872,11 @@ lbl_8027DFA0: /* 8027DFAC 0027AF0C 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8027DFB0 0027AF10 7C 08 03 A6 */ mtlr r0 /* 8027DFB4 0027AF14 38 21 00 30 */ addi r1, r1, 0x30 -/* 8027DFB8 0027AF18 4E 80 00 20 */ blr +/* 8027DFB8 0027AF18 4E 80 00 20 */ blr .global Halt__20CMetroidPrimeEssenceFR13CStateManager9EStateMsgf Halt__20CMetroidPrimeEssenceFR13CStateManager9EStateMsgf: -/* 8027DFBC 0027AF1C 4E 80 00 20 */ blr +/* 8027DFBC 0027AF1C 4E 80 00 20 */ blr .global Dodge__20CMetroidPrimeEssenceFR13CStateManager9EStateMsgf Dodge__20CMetroidPrimeEssenceFR13CStateManager9EStateMsgf: @@ -1924,7 +1924,7 @@ lbl_8027E04C: /* 8027E050 0027AFB0 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8027E054 0027AFB4 7C 08 03 A6 */ mtlr r0 /* 8027E058 0027AFB8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8027E05C 0027AFBC 4E 80 00 20 */ blr +/* 8027E05C 0027AFBC 4E 80 00 20 */ blr .global FadeOut__20CMetroidPrimeEssenceFR13CStateManager9EStateMsgf FadeOut__20CMetroidPrimeEssenceFR13CStateManager9EStateMsgf: @@ -1941,7 +1941,7 @@ lbl_8027E080: /* 8027E080 0027AFE0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8027E084 0027AFE4 7C 08 03 A6 */ mtlr r0 /* 8027E088 0027AFE8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8027E08C 0027AFEC 4E 80 00 20 */ blr +/* 8027E08C 0027AFEC 4E 80 00 20 */ blr .global FadeIn__20CMetroidPrimeEssenceFR13CStateManager9EStateMsgf FadeIn__20CMetroidPrimeEssenceFR13CStateManager9EStateMsgf: @@ -2003,7 +2003,7 @@ lbl_8027E154: /* 8027E158 0027B0B8 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8027E15C 0027B0BC 7C 08 03 A6 */ mtlr r0 /* 8027E160 0027B0C0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8027E164 0027B0C4 4E 80 00 20 */ blr +/* 8027E164 0027B0C4 4E 80 00 20 */ blr .global TelegraphAttack__20CMetroidPrimeEssenceFR13CStateManager9EStateMsgf TelegraphAttack__20CMetroidPrimeEssenceFR13CStateManager9EStateMsgf: @@ -2070,7 +2070,7 @@ lbl_8027E240: /* 8027E240 0027B1A0 80 01 00 24 */ lwz r0, 0x24(r1) /* 8027E244 0027B1A4 7C 08 03 A6 */ mtlr r0 /* 8027E248 0027B1A8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8027E24C 0027B1AC 4E 80 00 20 */ blr +/* 8027E24C 0027B1AC 4E 80 00 20 */ blr .global Generate__20CMetroidPrimeEssenceFR13CStateManager9EStateMsgf Generate__20CMetroidPrimeEssenceFR13CStateManager9EStateMsgf: @@ -2142,7 +2142,7 @@ lbl_8027E348: /* 8027E348 0027B2A8 81 83 00 00 */ lwz r12, 0(r3) /* 8027E34C 0027B2AC 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8027E350 0027B2B0 7D 89 03 A6 */ mtctr r12 -/* 8027E354 0027B2B4 4E 80 04 21 */ bctrl +/* 8027E354 0027B2B4 4E 80 04 21 */ bctrl /* 8027E358 0027B2B8 C0 23 00 00 */ lfs f1, 0(r3) /* 8027E35C 0027B2BC 7F E3 FB 78 */ mr r3, r31 /* 8027E360 0027B2C0 A0 1E 00 08 */ lhz r0, 8(r30) @@ -2161,7 +2161,7 @@ lbl_8027E388: /* 8027E390 0027B2F0 83 C1 00 98 */ lwz r30, 0x98(r1) /* 8027E394 0027B2F4 7C 08 03 A6 */ mtlr r0 /* 8027E398 0027B2F8 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8027E39C 0027B2FC 4E 80 00 20 */ blr +/* 8027E39C 0027B2FC 4E 80 00 20 */ blr .global AddToRenderer__20CMetroidPrimeEssenceCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__20CMetroidPrimeEssenceCFRC14CFrustumPlanesRC13CStateManager: @@ -2184,7 +2184,7 @@ AddToRenderer__20CMetroidPrimeEssenceCFRC14CFrustumPlanesRC13CStateManager: /* 8027E3E0 0027B340 81 83 00 00 */ lwz r12, 0(r3) /* 8027E3E4 0027B344 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8027E3E8 0027B348 7D 89 03 A6 */ mtctr r12 -/* 8027E3EC 0027B34C 4E 80 04 21 */ bctrl +/* 8027E3EC 0027B34C 4E 80 04 21 */ bctrl lbl_8027E3F0: /* 8027E3F0 0027B350 7F A3 EB 78 */ mr r3, r29 /* 8027E3F4 0027B354 7F C4 F3 78 */ mr r4, r30 @@ -2196,7 +2196,7 @@ lbl_8027E3F0: /* 8027E40C 0027B36C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8027E410 0027B370 7C 08 03 A6 */ mtlr r0 /* 8027E414 0027B374 38 21 00 20 */ addi r1, r1, 0x20 -/* 8027E418 0027B378 4E 80 00 20 */ blr +/* 8027E418 0027B378 4E 80 00 20 */ blr .global GetAimPosition__20CMetroidPrimeEssenceCFRC13CStateManagerf GetAimPosition__20CMetroidPrimeEssenceCFRC13CStateManagerf: @@ -2245,7 +2245,7 @@ lbl_8027E4A8: /* 8027E4BC 0027B41C 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8027E4C0 0027B420 7C 08 03 A6 */ mtlr r0 /* 8027E4C4 0027B424 38 21 00 40 */ addi r1, r1, 0x40 -/* 8027E4C8 0027B428 4E 80 00 20 */ blr +/* 8027E4C8 0027B428 4E 80 00 20 */ blr .global DoUserAnimEvent__20CMetroidPrimeEssenceFR13CStateManagerRC13CInt32POINode14EUserEventType DoUserAnimEvent__20CMetroidPrimeEssenceFR13CStateManagerRC13CInt32POINode14EUserEventType: @@ -2276,7 +2276,7 @@ DoUserAnimEvent__20CMetroidPrimeEssenceFR13CStateManagerRC13CInt32POINode14EUser /* 8027E52C 0027B48C 38 A5 B5 10 */ addi r5, r5, lbl_803EB510@l /* 8027E530 0027B490 7C 05 00 2E */ lwzx r0, r5, r0 /* 8027E534 0027B494 7C 09 03 A6 */ mtctr r0 -/* 8027E538 0027B498 4E 80 04 20 */ bctr +/* 8027E538 0027B498 4E 80 04 20 */ bctr .global lbl_8027E53C lbl_8027E53C: /* 8027E53C 0027B49C 88 1C 07 0E */ lbz r0, 0x70e(r28) @@ -2425,7 +2425,7 @@ lbl_8027E618: /* 8027E75C 0027B6BC 81 84 00 00 */ lwz r12, 0(r4) /* 8027E760 0027B6C0 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 8027E764 0027B6C4 7D 89 03 A6 */ mtctr r12 -/* 8027E768 0027B6C8 4E 80 04 21 */ bctrl +/* 8027E768 0027B6C8 4E 80 04 21 */ bctrl /* 8027E76C 0027B6CC 3C 80 80 5A */ lis r4, lbl_805A66F4@ha /* 8027E770 0027B6D0 38 61 00 44 */ addi r3, r1, 0x44 /* 8027E774 0027B6D4 38 C4 66 F4 */ addi r6, r4, lbl_805A66F4@l @@ -2496,7 +2496,7 @@ lbl_8027E834: /* 8027E860 0027B7C0 80 01 01 34 */ lwz r0, 0x134(r1) /* 8027E864 0027B7C4 7C 08 03 A6 */ mtlr r0 /* 8027E868 0027B7C8 38 21 01 30 */ addi r1, r1, 0x130 -/* 8027E86C 0027B7CC 4E 80 00 20 */ blr +/* 8027E86C 0027B7CC 4E 80 00 20 */ blr .global sub_8027e870 sub_8027e870: @@ -2916,7 +2916,7 @@ lbl_8027EE2C: /* 8027EE78 0027BDD8 80 01 15 D4 */ lwz r0, 0x15d4(r1) /* 8027EE7C 0027BDDC 7C 08 03 A6 */ mtlr r0 /* 8027EE80 0027BDE0 38 21 15 D0 */ addi r1, r1, 0x15d0 -/* 8027EE84 0027BDE4 4E 80 00 20 */ blr +/* 8027EE84 0027BDE4 4E 80 00 20 */ blr .global sub_8027ee88 sub_8027ee88: @@ -2955,7 +2955,7 @@ lbl_8027EEB8: /* 8027EF04 0027BE64 7F A4 EB 78 */ mr r4, r29 /* 8027EF08 0027BE68 81 8C 02 98 */ lwz r12, 0x298(r12) /* 8027EF0C 0027BE6C 7D 89 03 A6 */ mtctr r12 -/* 8027EF10 0027BE70 4E 80 04 21 */ bctrl +/* 8027EF10 0027BE70 4E 80 04 21 */ bctrl lbl_8027EF14: /* 8027EF14 0027BE74 2C 1E FF FF */ cmpwi r30, -1 /* 8027EF18 0027BE78 41 82 00 14 */ beq lbl_8027EF2C @@ -2975,7 +2975,7 @@ lbl_8027EF30: /* 8027EF48 0027BEA8 83 81 00 10 */ lwz r28, 0x10(r1) /* 8027EF4C 0027BEAC 7C 08 03 A6 */ mtlr r0 /* 8027EF50 0027BEB0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8027EF54 0027BEB4 4E 80 00 20 */ blr +/* 8027EF54 0027BEB4 4E 80 00 20 */ blr .global sub_8027ef58 sub_8027ef58: @@ -3031,7 +3031,7 @@ lbl_8027EFF8: /* 8027F00C 0027BF6C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8027F010 0027BF70 7C 08 03 A6 */ mtlr r0 /* 8027F014 0027BF74 38 21 00 20 */ addi r1, r1, 0x20 -/* 8027F018 0027BF78 4E 80 00 20 */ blr +/* 8027F018 0027BF78 4E 80 00 20 */ blr .global Render__20CMetroidPrimeEssenceCFRC13CStateManager Render__20CMetroidPrimeEssenceCFRC13CStateManager: @@ -3058,7 +3058,7 @@ lbl_8027F054: /* 8027F068 0027BFC8 83 C1 00 08 */ lwz r30, 8(r1) /* 8027F06C 0027BFCC 7C 08 03 A6 */ mtlr r0 /* 8027F070 0027BFD0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8027F074 0027BFD4 4E 80 00 20 */ blr +/* 8027F074 0027BFD4 4E 80 00 20 */ blr .global PreRender__20CMetroidPrimeEssenceFR13CStateManagerRC14CFrustumPlanes PreRender__20CMetroidPrimeEssenceFR13CStateManagerRC14CFrustumPlanes: @@ -3164,7 +3164,7 @@ lbl_8027F1D8: /* 8027F1E0 0027C140 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8027F1E4 0027C144 7C 08 03 A6 */ mtlr r0 /* 8027F1E8 0027C148 38 21 00 20 */ addi r1, r1, 0x20 -/* 8027F1EC 0027C14C 4E 80 00 20 */ blr +/* 8027F1EC 0027C14C 4E 80 00 20 */ blr .global sub_8027f1f0 sub_8027f1f0: @@ -3297,7 +3297,7 @@ lbl_8027F3C8: /* 8027F3D4 0027C334 81 83 00 00 */ lwz r12, 0(r3) /* 8027F3D8 0027C338 81 8C 00 58 */ lwz r12, 0x58(r12) /* 8027F3DC 0027C33C 7D 89 03 A6 */ mtctr r12 -/* 8027F3E0 0027C340 4E 80 04 21 */ bctrl +/* 8027F3E0 0027C340 4E 80 04 21 */ bctrl /* 8027F3E4 0027C344 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8027F3E8 0027C348 40 82 00 78 */ bne lbl_8027F460 /* 8027F3EC 0027C34C 83 FE 06 5C */ lwz r31, 0x65c(r30) @@ -3309,7 +3309,7 @@ lbl_8027F3C8: /* 8027F404 0027C364 81 9F 00 00 */ lwz r12, 0(r31) /* 8027F408 0027C368 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 8027F40C 0027C36C 7D 89 03 A6 */ mtctr r12 -/* 8027F410 0027C370 4E 80 04 21 */ bctrl +/* 8027F410 0027C370 4E 80 04 21 */ bctrl /* 8027F414 0027C374 C0 5D 00 2C */ lfs f2, 0x2c(r29) /* 8027F418 0027C378 38 81 00 0C */ addi r4, r1, 0xc /* 8027F41C 0027C37C C0 3D 00 1C */ lfs f1, 0x1c(r29) @@ -3321,13 +3321,13 @@ lbl_8027F3C8: /* 8027F434 0027C394 81 83 00 00 */ lwz r12, 0(r3) /* 8027F438 0027C398 81 8C 00 20 */ lwz r12, 0x20(r12) /* 8027F43C 0027C39C 7D 89 03 A6 */ mtctr r12 -/* 8027F440 0027C3A0 4E 80 04 21 */ bctrl +/* 8027F440 0027C3A0 4E 80 04 21 */ bctrl /* 8027F444 0027C3A4 80 7E 06 5C */ lwz r3, 0x65c(r30) /* 8027F448 0027C3A8 FC 20 F8 90 */ fmr f1, f31 /* 8027F44C 0027C3AC 81 83 00 00 */ lwz r12, 0(r3) /* 8027F450 0027C3B0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8027F454 0027C3B4 7D 89 03 A6 */ mtctr r12 -/* 8027F458 0027C3B8 4E 80 04 21 */ bctrl +/* 8027F458 0027C3B8 4E 80 04 21 */ bctrl /* 8027F45C 0027C3BC 48 00 00 2C */ b lbl_8027F488 lbl_8027F460: /* 8027F460 0027C3C0 80 7E 06 5C */ lwz r3, 0x65c(r30) @@ -3337,7 +3337,7 @@ lbl_8027F460: /* 8027F470 0027C3D0 38 80 00 01 */ li r4, 1 /* 8027F474 0027C3D4 81 8C 00 08 */ lwz r12, 8(r12) /* 8027F478 0027C3D8 7D 89 03 A6 */ mtctr r12 -/* 8027F47C 0027C3DC 4E 80 04 21 */ bctrl +/* 8027F47C 0027C3DC 4E 80 04 21 */ bctrl lbl_8027F480: /* 8027F480 0027C3E0 38 00 00 00 */ li r0, 0 /* 8027F484 0027C3E4 90 1E 06 5C */ stw r0, 0x65c(r30) @@ -3350,7 +3350,7 @@ lbl_8027F488: /* 8027F49C 0027C3FC 83 A1 00 54 */ lwz r29, 0x54(r1) /* 8027F4A0 0027C400 7C 08 03 A6 */ mtlr r0 /* 8027F4A4 0027C404 38 21 00 70 */ addi r1, r1, 0x70 -/* 8027F4A8 0027C408 4E 80 00 20 */ blr +/* 8027F4A8 0027C408 4E 80 00 20 */ blr .global Think__20CMetroidPrimeEssenceFfR13CStateManager Think__20CMetroidPrimeEssenceFfR13CStateManager: @@ -3438,7 +3438,7 @@ lbl_8027F5D4: /* 8027F5E4 0027C544 83 C1 00 28 */ lwz r30, 0x28(r1) /* 8027F5E8 0027C548 7C 08 03 A6 */ mtlr r0 /* 8027F5EC 0027C54C 38 21 00 40 */ addi r1, r1, 0x40 -/* 8027F5F0 0027C550 4E 80 00 20 */ blr +/* 8027F5F0 0027C550 4E 80 00 20 */ blr .global sub_8027f5f4 sub_8027f5f4: @@ -3470,7 +3470,7 @@ sub_8027f5f4: /* 8027F658 0027C5B8 81 9D 00 00 */ lwz r12, 0(r29) /* 8027F65C 0027C5BC 81 8C 00 38 */ lwz r12, 0x38(r12) /* 8027F660 0027C5C0 7D 89 03 A6 */ mtctr r12 -/* 8027F664 0027C5C4 4E 80 04 21 */ bctrl +/* 8027F664 0027C5C4 4E 80 04 21 */ bctrl /* 8027F668 0027C5C8 7C 64 1B 78 */ mr r4, r3 /* 8027F66C 0027C5CC 7F E3 FB 78 */ mr r3, r31 /* 8027F670 0027C5D0 4B F2 95 29 */ bl SetDamageVulnerability__15CCollisionActorFRC20CDamageVulnerability @@ -3479,7 +3479,7 @@ sub_8027f5f4: /* 8027F67C 0027C5DC 81 9F 00 00 */ lwz r12, 0(r31) /* 8027F680 0027C5E0 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8027F684 0027C5E4 7D 89 03 A6 */ mtctr r12 -/* 8027F688 0027C5E8 4E 80 04 21 */ bctrl +/* 8027F688 0027C5E8 4E 80 04 21 */ bctrl /* 8027F68C 0027C5EC C3 E3 00 00 */ lfs f31, 0(r3) /* 8027F690 0027C5F0 7F A3 EB 78 */ mr r3, r29 /* 8027F694 0027C5F4 7F C4 F3 78 */ mr r4, r30 @@ -3491,7 +3491,7 @@ lbl_8027F6A0: /* 8027F6A8 0027C608 81 9D 00 00 */ lwz r12, 0(r29) /* 8027F6AC 0027C60C 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8027F6B0 0027C610 7D 89 03 A6 */ mtctr r12 -/* 8027F6B4 0027C614 4E 80 04 21 */ bctrl +/* 8027F6B4 0027C614 4E 80 04 21 */ bctrl /* 8027F6B8 0027C618 C0 23 00 00 */ lfs f1, 0(r3) /* 8027F6BC 0027C61C C0 02 BD 10 */ lfs f0, lbl_805ADA30@sda21(r2) /* 8027F6C0 0027C620 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -3505,7 +3505,7 @@ lbl_8027F6A0: /* 8027F6E0 0027C640 7F C4 F3 78 */ mr r4, r30 /* 8027F6E4 0027C644 38 C0 00 14 */ li r6, 0x14 /* 8027F6E8 0027C648 7D 89 03 A6 */ mtctr r12 -/* 8027F6EC 0027C64C 4E 80 04 21 */ bctrl +/* 8027F6EC 0027C64C 4E 80 04 21 */ bctrl /* 8027F6F0 0027C650 7F A3 EB 78 */ mr r3, r29 /* 8027F6F4 0027C654 7F C6 F3 78 */ mr r6, r30 /* 8027F6F8 0027C658 38 80 00 29 */ li r4, 0x29 @@ -3520,7 +3520,7 @@ lbl_8027F704: /* 8027F718 0027C678 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8027F71C 0027C67C 7C 08 03 A6 */ mtlr r0 /* 8027F720 0027C680 38 21 00 40 */ addi r1, r1, 0x40 -/* 8027F724 0027C684 4E 80 00 20 */ blr +/* 8027F724 0027C684 4E 80 00 20 */ blr .global sub_8027f728 sub_8027f728: @@ -3536,7 +3536,7 @@ sub_8027f728: /* 8027F74C 0027C6AC 81 83 00 00 */ lwz r12, 0(r3) /* 8027F750 0027C6B0 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8027F754 0027C6B4 7D 89 03 A6 */ mtctr r12 -/* 8027F758 0027C6B8 4E 80 04 21 */ bctrl +/* 8027F758 0027C6B8 4E 80 04 21 */ bctrl /* 8027F75C 0027C6BC A0 1C 07 06 */ lhz r0, 0x706(r28) /* 8027F760 0027C6C0 7C 7F 1B 78 */ mr r31, r3 /* 8027F764 0027C6C4 7F A3 EB 78 */ mr r3, r29 @@ -3554,7 +3554,7 @@ sub_8027f728: /* 8027F794 0027C6F4 81 9E 00 00 */ lwz r12, 0(r30) /* 8027F798 0027C6F8 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8027F79C 0027C6FC 7D 89 03 A6 */ mtctr r12 -/* 8027F7A0 0027C700 4E 80 04 21 */ bctrl +/* 8027F7A0 0027C700 4E 80 04 21 */ bctrl /* 8027F7A4 0027C704 C0 1F 00 00 */ lfs f0, 0(r31) /* 8027F7A8 0027C708 D0 03 00 00 */ stfs f0, 0(r3) /* 8027F7AC 0027C70C C0 1F 00 04 */ lfs f0, 4(r31) @@ -3563,7 +3563,7 @@ sub_8027f728: /* 8027F7B8 0027C718 81 9C 00 00 */ lwz r12, 0(r28) /* 8027F7BC 0027C71C 81 8C 00 38 */ lwz r12, 0x38(r12) /* 8027F7C0 0027C720 7D 89 03 A6 */ mtctr r12 -/* 8027F7C4 0027C724 4E 80 04 21 */ bctrl +/* 8027F7C4 0027C724 4E 80 04 21 */ bctrl /* 8027F7C8 0027C728 7C 64 1B 78 */ mr r4, r3 /* 8027F7CC 0027C72C 7F C3 F3 78 */ mr r3, r30 /* 8027F7D0 0027C730 4B F2 93 C9 */ bl SetDamageVulnerability__15CCollisionActorFRC20CDamageVulnerability @@ -3575,7 +3575,7 @@ lbl_8027F7D4: /* 8027F7E4 0027C744 83 81 00 20 */ lwz r28, 0x20(r1) /* 8027F7E8 0027C748 7C 08 03 A6 */ mtlr r0 /* 8027F7EC 0027C74C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8027F7F0 0027C750 4E 80 00 20 */ blr +/* 8027F7F0 0027C750 4E 80 00 20 */ blr .global sub_8027f7f4 sub_8027f7f4: @@ -3673,7 +3673,7 @@ lbl_8027F944: /* 8027F950 0027C8B0 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 8027F954 0027C8B4 7C 08 03 A6 */ mtlr r0 /* 8027F958 0027C8B8 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 8027F95C 0027C8BC 4E 80 00 20 */ blr +/* 8027F95C 0027C8BC 4E 80 00 20 */ blr .global sub_8027f960 sub_8027f960: @@ -3816,7 +3816,7 @@ lbl_8027FAAC: /* 8027FB70 0027CAD0 83 81 00 60 */ lwz r28, 0x60(r1) /* 8027FB74 0027CAD4 7C 08 03 A6 */ mtlr r0 /* 8027FB78 0027CAD8 38 21 00 70 */ addi r1, r1, 0x70 -/* 8027FB7C 0027CADC 4E 80 00 20 */ blr +/* 8027FB7C 0027CADC 4E 80 00 20 */ blr .global AcceptScriptMsg__20CMetroidPrimeEssenceF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__20CMetroidPrimeEssenceF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -3842,7 +3842,7 @@ AcceptScriptMsg__20CMetroidPrimeEssenceF20EScriptObjectMessage9TUniqueIdR13CStat /* 8027FBCC 0027CB2C 38 63 B5 8C */ addi r3, r3, lbl_803EB58C@l /* 8027FBD0 0027CB30 7C 03 00 2E */ lwzx r0, r3, r0 /* 8027FBD4 0027CB34 7C 09 03 A6 */ mtctr r0 -/* 8027FBD8 0027CB38 4E 80 04 20 */ bctr +/* 8027FBD8 0027CB38 4E 80 04 20 */ bctr .global lbl_8027FBDC lbl_8027FBDC: /* 8027FBDC 0027CB3C 7F A3 EB 78 */ mr r3, r29 @@ -3872,7 +3872,7 @@ lbl_8027FBDC: /* 8027FC3C 0027CB9C 81 9D 00 00 */ lwz r12, 0(r29) /* 8027FC40 0027CBA0 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8027FC44 0027CBA4 7D 89 03 A6 */ mtctr r12 -/* 8027FC48 0027CBA8 4E 80 04 21 */ bctrl +/* 8027FC48 0027CBA8 4E 80 04 21 */ bctrl /* 8027FC4C 0027CBAC C0 43 00 00 */ lfs f2, 0(r3) /* 8027FC50 0027CBB0 C0 22 BD 70 */ lfs f1, lbl_805ADA90@sda21(r2) /* 8027FC54 0027CBB4 C0 02 BD 10 */ lfs f0, lbl_805ADA30@sda21(r2) @@ -3988,7 +3988,7 @@ lbl_8027FD28: /* 8027FDE0 0027CD40 B0 01 00 38 */ sth r0, 0x38(r1) /* 8027FDE4 0027CD44 81 8C 02 B0 */ lwz r12, 0x2b0(r12) /* 8027FDE8 0027CD48 7D 89 03 A6 */ mtctr r12 -/* 8027FDEC 0027CD4C 4E 80 04 21 */ bctrl +/* 8027FDEC 0027CD4C 4E 80 04 21 */ bctrl /* 8027FDF0 0027CD50 3C 80 80 5A */ lis r4, skZero3f@ha /* 8027FDF4 0027CD54 7F E3 FB 78 */ mr r3, r31 /* 8027FDF8 0027CD58 39 24 66 A0 */ addi r9, r4, skZero3f@l @@ -4038,7 +4038,7 @@ lbl_8027FE20: /* 8027FEA0 0027CE00 81 9C 00 00 */ lwz r12, 0(r28) /* 8027FEA4 0027CE04 81 8C 00 38 */ lwz r12, 0x38(r12) /* 8027FEA8 0027CE08 7D 89 03 A6 */ mtctr r12 -/* 8027FEAC 0027CE0C 4E 80 04 21 */ bctrl +/* 8027FEAC 0027CE0C 4E 80 04 21 */ bctrl /* 8027FEB0 0027CE10 3B DE 01 2C */ addi r30, r30, 0x12c /* 8027FEB4 0027CE14 38 A0 00 00 */ li r5, 0 /* 8027FEB8 0027CE18 7F C4 F3 78 */ mr r4, r30 @@ -4058,7 +4058,7 @@ lbl_8027FE20: /* 8027FEF0 0027CE50 81 8C 00 90 */ lwz r12, 0x90(r12) /* 8027FEF4 0027CE54 38 84 67 24 */ addi r4, r4, lbl_805A6724@l /* 8027FEF8 0027CE58 7D 89 03 A6 */ mtctr r12 -/* 8027FEFC 0027CE5C 4E 80 04 21 */ bctrl +/* 8027FEFC 0027CE5C 4E 80 04 21 */ bctrl /* 8027FF00 0027CE60 88 7D 07 0E */ lbz r3, 0x70e(r29) /* 8027FF04 0027CE64 54 60 CF FF */ rlwinm. r0, r3, 0x19, 0x1f, 0x1f /* 8027FF08 0027CE68 40 82 01 70 */ bne lbl_80280078 @@ -4167,7 +4167,7 @@ lbl_80280078: /* 80280088 0027CFE8 83 81 00 F0 */ lwz r28, 0xf0(r1) /* 8028008C 0027CFEC 7C 08 03 A6 */ mtlr r0 /* 80280090 0027CFF0 38 21 01 00 */ addi r1, r1, 0x100 -/* 80280094 0027CFF4 4E 80 00 20 */ blr +/* 80280094 0027CFF4 4E 80 00 20 */ blr .global __dt__20CMetroidPrimeEssenceFv __dt__20CMetroidPrimeEssenceFv: @@ -4191,7 +4191,7 @@ __dt__20CMetroidPrimeEssenceFv: /* 802800DC 0027D03C 38 80 00 01 */ li r4, 1 /* 802800E0 0027D040 81 8C 00 08 */ lwz r12, 8(r12) /* 802800E4 0027D044 7D 89 03 A6 */ mtctr r12 -/* 802800E8 0027D048 4E 80 04 21 */ bctrl +/* 802800E8 0027D048 4E 80 04 21 */ bctrl lbl_802800EC: /* 802800EC 0027D04C 34 1E 06 58 */ addic. r0, r30, 0x658 /* 802800F0 0027D050 41 82 00 10 */ beq lbl_80280100 @@ -4251,7 +4251,7 @@ lbl_8028019C: /* 802801A8 0027D108 83 C1 00 08 */ lwz r30, 8(r1) /* 802801AC 0027D10C 7C 08 03 A6 */ mtlr r0 /* 802801B0 0027D110 38 21 00 10 */ addi r1, r1, 0x10 -/* 802801B4 0027D114 4E 80 00 20 */ blr +/* 802801B4 0027D114 4E 80 00 20 */ blr .global __ct__20CMetroidPrimeEssence __ct__20CMetroidPrimeEssence: @@ -4300,7 +4300,7 @@ __ct__20CMetroidPrimeEssence: /* 80280260 0027D1C0 81 84 00 00 */ lwz r12, 0(r4) /* 80280264 0027D1C4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80280268 0027D1C8 7D 89 03 A6 */ mtctr r12 -/* 8028026C 0027D1CC 4E 80 04 21 */ bctrl +/* 8028026C 0027D1CC 4E 80 04 21 */ bctrl /* 80280270 0027D1D0 3B 3A 05 68 */ addi r25, r26, 0x568 /* 80280274 0027D1D4 38 81 00 24 */ addi r4, r1, 0x24 /* 80280278 0027D1D8 7F 23 CB 78 */ mr r3, r25 @@ -4421,7 +4421,7 @@ __ct__20CMetroidPrimeEssence: /* 80280444 0027D3A4 80 01 00 64 */ lwz r0, 0x64(r1) /* 80280448 0027D3A8 7C 08 03 A6 */ mtlr r0 /* 8028044C 0027D3AC 38 21 00 60 */ addi r1, r1, 0x60 -/* 80280450 0027D3B0 4E 80 00 20 */ blr +/* 80280450 0027D3B0 4E 80 00 20 */ blr .global __sinit_CMetroidPrimeEssence_cpp __sinit_CMetroidPrimeEssence_cpp: diff --git a/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s b/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s index dc639380..c65477a1 100644 --- a/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s +++ b/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s @@ -717,7 +717,7 @@ lbl_805A9144: .global lbl_805A9148 lbl_805A9148: .skip 0x8 - + .section .text, "ax" .global __dt__16CMetroidPrimeExo @@ -998,7 +998,7 @@ lbl_80271620: /* 80271644 0026E5A4 38 80 00 01 */ li r4, 1 /* 80271648 0026E5A8 81 8C 00 08 */ lwz r12, 8(r12) /* 8027164C 0026E5AC 7D 89 03 A6 */ mtctr r12 -/* 80271650 0026E5B0 4E 80 04 21 */ bctrl +/* 80271650 0026E5B0 4E 80 04 21 */ bctrl lbl_80271654: /* 80271654 0026E5B4 34 1E 10 1C */ addic. r0, r30, 0x101c /* 80271658 0026E5B8 41 82 00 10 */ beq lbl_80271668 @@ -1030,7 +1030,7 @@ lbl_80271690: /* 802716B4 0026E614 38 80 00 01 */ li r4, 1 /* 802716B8 0026E618 81 8C 00 08 */ lwz r12, 8(r12) /* 802716BC 0026E61C 7D 89 03 A6 */ mtctr r12 -/* 802716C0 0026E620 4E 80 04 21 */ bctrl +/* 802716C0 0026E620 4E 80 04 21 */ bctrl lbl_802716C4: /* 802716C4 0026E624 3B 9C 00 08 */ addi r28, r28, 8 /* 802716C8 0026E628 3B BD 00 01 */ addi r29, r29, 1 @@ -1059,7 +1059,7 @@ lbl_802716F4: /* 80271718 0026E678 38 80 00 01 */ li r4, 1 /* 8027171C 0026E67C 81 8C 00 08 */ lwz r12, 8(r12) /* 80271720 0026E680 7D 89 03 A6 */ mtctr r12 -/* 80271724 0026E684 4E 80 04 21 */ bctrl +/* 80271724 0026E684 4E 80 04 21 */ bctrl lbl_80271728: /* 80271728 0026E688 3B 9C 00 08 */ addi r28, r28, 8 /* 8027172C 0026E68C 3B BD 00 01 */ addi r29, r29, 1 @@ -1124,7 +1124,7 @@ lbl_802717CC: /* 802717F0 0026E750 38 80 00 01 */ li r4, 1 /* 802717F4 0026E754 81 8C 00 08 */ lwz r12, 8(r12) /* 802717F8 0026E758 7D 89 03 A6 */ mtctr r12 -/* 802717FC 0026E75C 4E 80 04 21 */ bctrl +/* 802717FC 0026E75C 4E 80 04 21 */ bctrl lbl_80271800: /* 80271800 0026E760 34 1E 0F A4 */ addic. r0, r30, 0xfa4 /* 80271804 0026E764 41 82 00 10 */ beq lbl_80271814 @@ -1231,7 +1231,7 @@ lbl_80271940: /* 80271964 0026E8C4 38 80 00 01 */ li r4, 1 /* 80271968 0026E8C8 81 8C 00 08 */ lwz r12, 8(r12) /* 8027196C 0026E8CC 7D 89 03 A6 */ mtctr r12 -/* 80271970 0026E8D0 4E 80 04 21 */ bctrl +/* 80271970 0026E8D0 4E 80 04 21 */ bctrl lbl_80271974: /* 80271974 0026E8D4 34 1E 0C 48 */ addic. r0, r30, 0xc48 /* 80271978 0026E8D8 41 82 00 10 */ beq lbl_80271988 @@ -1446,7 +1446,7 @@ lbl_80271C18: /* 80271C2C 0026EB8C 83 81 00 10 */ lwz r28, 0x10(r1) /* 80271C30 0026EB90 7C 08 03 A6 */ mtlr r0 /* 80271C34 0026EB94 38 21 00 20 */ addi r1, r1, 0x20 -/* 80271C38 0026EB98 4E 80 00 20 */ blr +/* 80271C38 0026EB98 4E 80 00 20 */ blr .global Approach__16CMetroidPrimeExoFR13CStateManager9EStateMsgf Approach__16CMetroidPrimeExoFR13CStateManager9EStateMsgf: @@ -1513,15 +1513,15 @@ lbl_80271D10: /* 80271D18 0026EC78 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80271D1C 0026EC7C 7C 08 03 A6 */ mtlr r0 /* 80271D20 0026EC80 38 21 00 20 */ addi r1, r1, 0x20 -/* 80271D24 0026EC84 4E 80 00 20 */ blr +/* 80271D24 0026EC84 4E 80 00 20 */ blr .global Growth__16CMetroidPrimeExoFR13CStateManager9EStateMsgf Growth__16CMetroidPrimeExoFR13CStateManager9EStateMsgf: /* 80271D28 0026EC88 2C 05 00 00 */ cmpwi r5, 0 -/* 80271D2C 0026EC8C 4C 82 00 20 */ bnelr +/* 80271D2C 0026EC8C 4C 82 00 20 */ bnelr /* 80271D30 0026EC90 C0 02 BB F4 */ lfs f0, lbl_805AD914@sda21(r2) /* 80271D34 0026EC94 D0 03 03 B4 */ stfs f0, 0x3b4(r3) -/* 80271D38 0026EC98 4E 80 00 20 */ blr +/* 80271D38 0026EC98 4E 80 00 20 */ blr .global Land__16CMetroidPrimeExoFR13CStateManager9EStateMsgf Land__16CMetroidPrimeExoFR13CStateManager9EStateMsgf: @@ -1535,7 +1535,7 @@ lbl_80271D54: /* 80271D54 0026ECB4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80271D58 0026ECB8 7C 08 03 A6 */ mtlr r0 /* 80271D5C 0026ECBC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80271D60 0026ECC0 4E 80 00 20 */ blr +/* 80271D60 0026ECC0 4E 80 00 20 */ blr .global Enraged__16CMetroidPrimeExoFR13CStateManager9EStateMsgf Enraged__16CMetroidPrimeExoFR13CStateManager9EStateMsgf: @@ -1551,7 +1551,7 @@ lbl_80271D80: /* 80271D80 0026ECE0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80271D84 0026ECE4 7C 08 03 A6 */ mtlr r0 /* 80271D88 0026ECE8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80271D8C 0026ECEC 4E 80 00 20 */ blr +/* 80271D8C 0026ECEC 4E 80 00 20 */ blr .global Dodge__16CMetroidPrimeExoFR13CStateManager9EStateMsgf Dodge__16CMetroidPrimeExoFR13CStateManager9EStateMsgf: @@ -1601,7 +1601,7 @@ lbl_80271E28: /* 80271E28 0026ED88 80 01 00 24 */ lwz r0, 0x24(r1) /* 80271E2C 0026ED8C 7C 08 03 A6 */ mtlr r0 /* 80271E30 0026ED90 38 21 00 20 */ addi r1, r1, 0x20 -/* 80271E34 0026ED94 4E 80 00 20 */ blr +/* 80271E34 0026ED94 4E 80 00 20 */ blr .global Crouch__16CMetroidPrimeExoFR13CStateManager9EStateMsgf Crouch__16CMetroidPrimeExoFR13CStateManager9EStateMsgf: @@ -1644,7 +1644,7 @@ lbl_80271EB4: /* 80271EB4 0026EE14 80 01 00 24 */ lwz r0, 0x24(r1) /* 80271EB8 0026EE18 7C 08 03 A6 */ mtlr r0 /* 80271EBC 0026EE1C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80271EC0 0026EE20 4E 80 00 20 */ blr +/* 80271EC0 0026EE20 4E 80 00 20 */ blr .global Retreat__16CMetroidPrimeExoFR13CStateManager9EStateMsgf Retreat__16CMetroidPrimeExoFR13CStateManager9EStateMsgf: @@ -1771,7 +1771,7 @@ lbl_80272080: /* 80272088 0026EFE8 83 C1 00 48 */ lwz r30, 0x48(r1) /* 8027208C 0026EFEC 7C 08 03 A6 */ mtlr r0 /* 80272090 0026EFF0 38 21 00 50 */ addi r1, r1, 0x50 -/* 80272094 0026EFF4 4E 80 00 20 */ blr +/* 80272094 0026EFF4 4E 80 00 20 */ blr .global Flinch__16CMetroidPrimeExoFR13CStateManager9EStateMsgf Flinch__16CMetroidPrimeExoFR13CStateManager9EStateMsgf: @@ -1852,7 +1852,7 @@ lbl_802721A4: /* 802721AC 0026F10C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 802721B0 0026F110 7C 08 03 A6 */ mtlr r0 /* 802721B4 0026F114 38 21 00 20 */ addi r1, r1, 0x20 -/* 802721B8 0026F118 4E 80 00 20 */ blr +/* 802721B8 0026F118 4E 80 00 20 */ blr .global Suck__16CMetroidPrimeExoFR13CStateManager9EStateMsgf Suck__16CMetroidPrimeExoFR13CStateManager9EStateMsgf: @@ -1999,7 +1999,7 @@ lbl_802723CC: /* 802723D8 0026F338 83 A1 00 64 */ lwz r29, 0x64(r1) /* 802723DC 0026F33C 7C 08 03 A6 */ mtlr r0 /* 802723E0 0026F340 38 21 00 70 */ addi r1, r1, 0x70 -/* 802723E4 0026F344 4E 80 00 20 */ blr +/* 802723E4 0026F344 4E 80 00 20 */ blr .global Run__16CMetroidPrimeExoFR13CStateManager9EStateMsgf Run__16CMetroidPrimeExoFR13CStateManager9EStateMsgf: @@ -2108,7 +2108,7 @@ lbl_80272558: /* 80272568 0026F4C8 83 81 00 30 */ lwz r28, 0x30(r1) /* 8027256C 0026F4CC 7C 08 03 A6 */ mtlr r0 /* 80272570 0026F4D0 38 21 00 40 */ addi r1, r1, 0x40 -/* 80272574 0026F4D4 4E 80 00 20 */ blr +/* 80272574 0026F4D4 4E 80 00 20 */ blr .global TurnAround__16CMetroidPrimeExoFR13CStateManager9EStateMsgf TurnAround__16CMetroidPrimeExoFR13CStateManager9EStateMsgf: @@ -2237,7 +2237,7 @@ lbl_80272724: /* 8027274C 0026F6AC 83 C1 00 58 */ lwz r30, 0x58(r1) /* 80272750 0026F6B0 7C 08 03 A6 */ mtlr r0 /* 80272754 0026F6B4 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 80272758 0026F6B8 4E 80 00 20 */ blr +/* 80272758 0026F6B8 4E 80 00 20 */ blr .global CoverAttack__16CMetroidPrimeExoFR13CStateManager9EStateMsgf CoverAttack__16CMetroidPrimeExoFR13CStateManager9EStateMsgf: @@ -2374,7 +2374,7 @@ lbl_80272928: /* 80272950 0026F8B0 83 C1 00 48 */ lwz r30, 0x48(r1) /* 80272954 0026F8B4 7C 08 03 A6 */ mtlr r0 /* 80272958 0026F8B8 38 21 00 90 */ addi r1, r1, 0x90 -/* 8027295C 0026F8BC 4E 80 00 20 */ blr +/* 8027295C 0026F8BC 4E 80 00 20 */ blr .global Cover__16CMetroidPrimeExoFR13CStateManager9EStateMsgf Cover__16CMetroidPrimeExoFR13CStateManager9EStateMsgf: @@ -2446,7 +2446,7 @@ lbl_80272A48: /* 80272A50 0026F9B0 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80272A54 0026F9B4 7C 08 03 A6 */ mtlr r0 /* 80272A58 0026F9B8 38 21 00 20 */ addi r1, r1, 0x20 -/* 80272A5C 0026F9BC 4E 80 00 20 */ blr +/* 80272A5C 0026F9BC 4E 80 00 20 */ blr .global SpecialAttack__16CMetroidPrimeExoFR13CStateManager9EStateMsgf SpecialAttack__16CMetroidPrimeExoFR13CStateManager9EStateMsgf: @@ -2545,7 +2545,7 @@ lbl_80272B9C: /* 80272BA4 0026FB04 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80272BA8 0026FB08 7C 08 03 A6 */ mtlr r0 /* 80272BAC 0026FB0C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80272BB0 0026FB10 4E 80 00 20 */ blr +/* 80272BB0 0026FB10 4E 80 00 20 */ blr .global Attack__16CMetroidPrimeExoFR13CStateManager9EStateMsgf Attack__16CMetroidPrimeExoFR13CStateManager9EStateMsgf: @@ -2605,7 +2605,7 @@ lbl_80272C6C: /* 80272C74 0026FBD4 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80272C78 0026FBD8 7C 08 03 A6 */ mtlr r0 /* 80272C7C 0026FBDC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80272C80 0026FBE0 4E 80 00 20 */ blr +/* 80272C80 0026FBE0 4E 80 00 20 */ blr .global ProjectileAttack__16CMetroidPrimeExoFR13CStateManager9EStateMsgf ProjectileAttack__16CMetroidPrimeExoFR13CStateManager9EStateMsgf: @@ -2676,7 +2676,7 @@ lbl_80272D54: /* 80272D74 0026FCD4 81 83 00 00 */ lwz r12, 0(r3) /* 80272D78 0026FCD8 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80272D7C 0026FCDC 7D 89 03 A6 */ mtctr r12 -/* 80272D80 0026FCE0 4E 80 04 21 */ bctrl +/* 80272D80 0026FCE0 4E 80 04 21 */ bctrl /* 80272D84 0026FCE4 7F C3 F3 78 */ mr r3, r30 /* 80272D88 0026FCE8 7F E4 FB 78 */ mr r4, r31 /* 80272D8C 0026FCEC 38 A0 00 00 */ li r5, 0 @@ -2689,7 +2689,7 @@ lbl_80272D9C: /* 80272DA4 0026FD04 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80272DA8 0026FD08 7C 08 03 A6 */ mtlr r0 /* 80272DAC 0026FD0C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80272DB0 0026FD10 4E 80 00 20 */ blr +/* 80272DB0 0026FD10 4E 80 00 20 */ blr .global Taunt__16CMetroidPrimeExoFR13CStateManager9EStateMsgf Taunt__16CMetroidPrimeExoFR13CStateManager9EStateMsgf: @@ -2735,7 +2735,7 @@ lbl_80272E3C: /* 80272E3C 0026FD9C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80272E40 0026FDA0 7C 08 03 A6 */ mtlr r0 /* 80272E44 0026FDA4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80272E48 0026FDA8 4E 80 00 20 */ blr +/* 80272E48 0026FDA8 4E 80 00 20 */ blr .global SelectTarget__16CMetroidPrimeExoFR13CStateManager9EStateMsgf SelectTarget__16CMetroidPrimeExoFR13CStateManager9EStateMsgf: @@ -2780,7 +2780,7 @@ lbl_80272ECC: /* 80272ED0 0026FE30 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80272ED4 0026FE34 7C 08 03 A6 */ mtlr r0 /* 80272ED8 0026FE38 38 21 00 20 */ addi r1, r1, 0x20 -/* 80272EDC 0026FE3C 4E 80 00 20 */ blr +/* 80272EDC 0026FE3C 4E 80 00 20 */ blr .global Active__16CMetroidPrimeExoFR13CStateManager9EStateMsgf Active__16CMetroidPrimeExoFR13CStateManager9EStateMsgf: @@ -2852,7 +2852,7 @@ lbl_80272FC8: /* 80272FCC 0026FF2C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80272FD0 0026FF30 7C 08 03 A6 */ mtlr r0 /* 80272FD4 0026FF34 38 21 00 10 */ addi r1, r1, 0x10 -/* 80272FD8 0026FF38 4E 80 00 20 */ blr +/* 80272FD8 0026FF38 4E 80 00 20 */ blr .global InActive__16CMetroidPrimeExoFR13CStateManager9EStateMsgf InActive__16CMetroidPrimeExoFR13CStateManager9EStateMsgf: @@ -2966,7 +2966,7 @@ lbl_8027316C: /* 80273174 002700D4 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80273178 002700D8 7C 08 03 A6 */ mtlr r0 /* 8027317C 002700DC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80273180 002700E0 4E 80 00 20 */ blr +/* 80273180 002700E0 4E 80 00 20 */ blr .global Stuck__16CMetroidPrimeExoFR13CStateManagerf Stuck__16CMetroidPrimeExoFR13CStateManagerf: @@ -3078,7 +3078,7 @@ lbl_8027330C: /* 8027331C 0027027C 83 C1 00 58 */ lwz r30, 0x58(r1) /* 80273320 00270280 7C 08 03 A6 */ mtlr r0 /* 80273324 00270284 38 21 00 70 */ addi r1, r1, 0x70 -/* 80273328 00270288 4E 80 00 20 */ blr +/* 80273328 00270288 4E 80 00 20 */ blr .global PlayerSpot__16CMetroidPrimeExoFR13CStateManagerf PlayerSpot__16CMetroidPrimeExoFR13CStateManagerf: @@ -3090,7 +3090,7 @@ PlayerSpot__16CMetroidPrimeExoFR13CStateManagerf: /* 80273340 002702A0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80273344 002702A4 7C 08 03 A6 */ mtlr r0 /* 80273348 002702A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8027334C 002702AC 4E 80 00 20 */ blr +/* 8027334C 002702AC 4E 80 00 20 */ blr .global CoverCheck__16CMetroidPrimeExoFR13CStateManagerf CoverCheck__16CMetroidPrimeExoFR13CStateManagerf: @@ -3102,7 +3102,7 @@ CoverCheck__16CMetroidPrimeExoFR13CStateManagerf: /* 80273364 002702C4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80273368 002702C8 7C 08 03 A6 */ mtlr r0 /* 8027336C 002702CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80273370 002702D0 4E 80 00 20 */ blr +/* 80273370 002702D0 4E 80 00 20 */ blr .global AggressionCheck__16CMetroidPrimeExoFR13CStateManagerf AggressionCheck__16CMetroidPrimeExoFR13CStateManagerf: @@ -3170,7 +3170,7 @@ AggressionCheck__16CMetroidPrimeExoFR13CStateManagerf: /* 80273468 002703C8 83 E1 00 5C */ lwz r31, 0x5c(r1) /* 8027346C 002703CC 7C 08 03 A6 */ mtlr r0 /* 80273470 002703D0 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 80273474 002703D4 4E 80 00 20 */ blr +/* 80273474 002703D4 4E 80 00 20 */ blr .global AIStage__16CMetroidPrimeExoFR13CStateManagerf AIStage__16CMetroidPrimeExoFR13CStateManagerf: @@ -3204,7 +3204,7 @@ lbl_802734D8: /* 802734D8 00270438 38 80 00 01 */ li r4, 1 lbl_802734DC: /* 802734DC 0027043C 7C 83 23 78 */ mr r3, r4 -/* 802734E0 00270440 4E 80 00 20 */ blr +/* 802734E0 00270440 4E 80 00 20 */ blr .global sub_802734e4 sub_802734e4: @@ -3212,7 +3212,7 @@ sub_802734e4: /* 802734E8 00270448 20 00 00 0B */ subfic r0, r0, 0xb /* 802734EC 0027044C 7C 00 00 34 */ cntlzw r0, r0 /* 802734F0 00270450 54 03 D9 7E */ srwi r3, r0, 5 -/* 802734F4 00270454 4E 80 00 20 */ blr +/* 802734F4 00270454 4E 80 00 20 */ blr .global AttackOver__16CMetroidPrimeExoFR13CStateManagerf AttackOver__16CMetroidPrimeExoFR13CStateManagerf: @@ -3229,7 +3229,7 @@ lbl_8027351C: /* 8027351C 0027047C 38 A0 00 01 */ li r5, 1 lbl_80273520: /* 80273520 00270480 7C A3 2B 78 */ mr r3, r5 -/* 80273524 00270484 4E 80 00 20 */ blr +/* 80273524 00270484 4E 80 00 20 */ blr .global sub_80273528 sub_80273528: @@ -3237,7 +3237,7 @@ sub_80273528: /* 8027352C 0027048C 20 00 00 0A */ subfic r0, r0, 0xa /* 80273530 00270490 7C 00 00 34 */ cntlzw r0, r0 /* 80273534 00270494 54 03 D9 7E */ srwi r3, r0, 5 -/* 80273538 00270498 4E 80 00 20 */ blr +/* 80273538 00270498 4E 80 00 20 */ blr .global sub_8027353c sub_8027353c: @@ -3245,7 +3245,7 @@ sub_8027353c: /* 80273540 002704A0 20 00 00 0C */ subfic r0, r0, 0xc /* 80273544 002704A4 7C 00 00 34 */ cntlzw r0, r0 /* 80273548 002704A8 54 03 D9 7E */ srwi r3, r0, 5 -/* 8027354C 002704AC 4E 80 00 20 */ blr +/* 8027354C 002704AC 4E 80 00 20 */ blr .global sub_80273550 sub_80273550: @@ -3253,7 +3253,7 @@ sub_80273550: /* 80273554 002704B4 20 00 00 09 */ subfic r0, r0, 9 /* 80273558 002704B8 7C 00 00 34 */ cntlzw r0, r0 /* 8027355C 002704BC 54 03 D9 7E */ srwi r3, r0, 5 -/* 80273560 002704C0 4E 80 00 20 */ blr +/* 80273560 002704C0 4E 80 00 20 */ blr .global sub_80273564 sub_80273564: @@ -3264,10 +3264,10 @@ sub_80273564: /* 80273574 002704D4 2C 00 00 07 */ cmpwi r0, 7 /* 80273578 002704D8 41 82 00 0C */ beq lbl_80273584 /* 8027357C 002704DC 2C 00 00 08 */ cmpwi r0, 8 -/* 80273580 002704E0 4C 82 00 20 */ bnelr +/* 80273580 002704E0 4C 82 00 20 */ bnelr lbl_80273584: /* 80273584 002704E4 38 60 00 01 */ li r3, 1 -/* 80273588 002704E8 4E 80 00 20 */ blr +/* 80273588 002704E8 4E 80 00 20 */ blr .global sub_8027358c sub_8027358c: @@ -3280,10 +3280,10 @@ sub_8027358c: /* 802735A4 00270504 2C 00 00 04 */ cmpwi r0, 4 /* 802735A8 00270508 41 82 00 0C */ beq lbl_802735B4 /* 802735AC 0027050C 2C 00 00 05 */ cmpwi r0, 5 -/* 802735B0 00270510 4C 82 00 20 */ bnelr +/* 802735B0 00270510 4C 82 00 20 */ bnelr lbl_802735B4: /* 802735B4 00270514 38 60 00 01 */ li r3, 1 -/* 802735B8 00270518 4E 80 00 20 */ blr +/* 802735B8 00270518 4E 80 00 20 */ blr .global ShouldTurn__16CMetroidPrimeExoFR13CStateManagerf ShouldTurn__16CMetroidPrimeExoFR13CStateManagerf: @@ -3329,7 +3329,7 @@ ShouldTurn__16CMetroidPrimeExoFR13CStateManagerf: /* 80273658 002705B8 CB E1 00 20 */ lfd f31, 0x20(r1) /* 8027365C 002705BC 7C 08 03 A6 */ mtlr r0 /* 80273660 002705C0 38 21 00 30 */ addi r1, r1, 0x30 -/* 80273664 002705C4 4E 80 00 20 */ blr +/* 80273664 002705C4 4E 80 00 20 */ blr .global InMaxRange__16CMetroidPrimeExoFR13CStateManagerf InMaxRange__16CMetroidPrimeExoFR13CStateManagerf: @@ -3379,7 +3379,7 @@ lbl_802736FC: /* 8027370C 0027066C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80273710 00270670 7C 08 03 A6 */ mtlr r0 /* 80273714 00270674 38 21 00 20 */ addi r1, r1, 0x20 -/* 80273718 00270678 4E 80 00 20 */ blr +/* 80273718 00270678 4E 80 00 20 */ blr .global TooClose__16CMetroidPrimeExoFR13CStateManagerf TooClose__16CMetroidPrimeExoFR13CStateManagerf: @@ -3390,7 +3390,7 @@ TooClose__16CMetroidPrimeExoFR13CStateManagerf: /* 8027372C 0027068C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80273730 00270690 7C 08 03 A6 */ mtlr r0 /* 80273734 00270694 38 21 00 10 */ addi r1, r1, 0x10 -/* 80273738 00270698 4E 80 00 20 */ blr +/* 80273738 00270698 4E 80 00 20 */ blr .global ShouldDoubleSnap__16CMetroidPrimeExoFR13CStateManagerf ShouldDoubleSnap__16CMetroidPrimeExoFR13CStateManagerf: @@ -3418,7 +3418,7 @@ lbl_80273780: /* 80273788 002706E8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8027378C 002706EC 7C 08 03 A6 */ mtlr r0 /* 80273790 002706F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80273794 002706F4 4E 80 00 20 */ blr +/* 80273794 002706F4 4E 80 00 20 */ blr .global sub_80273798 sub_80273798: @@ -3426,7 +3426,7 @@ sub_80273798: /* 8027379C 002706FC 20 00 00 0D */ subfic r0, r0, 0xd /* 802737A0 00270700 7C 00 00 34 */ cntlzw r0, r0 /* 802737A4 00270704 54 03 D9 7E */ srwi r3, r0, 5 -/* 802737A8 00270708 4E 80 00 20 */ blr +/* 802737A8 00270708 4E 80 00 20 */ blr .global sub_802737ac sub_802737ac: @@ -3434,7 +3434,7 @@ sub_802737ac: /* 802737B0 00270710 20 00 00 01 */ subfic r0, r0, 1 /* 802737B4 00270714 7C 00 00 34 */ cntlzw r0, r0 /* 802737B8 00270718 54 03 D9 7E */ srwi r3, r0, 5 -/* 802737BC 0027071C 4E 80 00 20 */ blr +/* 802737BC 0027071C 4E 80 00 20 */ blr .global StartAttack__16CMetroidPrimeExoFR13CStateManagerf StartAttack__16CMetroidPrimeExoFR13CStateManagerf: @@ -3444,19 +3444,19 @@ StartAttack__16CMetroidPrimeExoFR13CStateManagerf: /* 802737CC 0027072C 4C 40 13 82 */ cror 2, 0, 2 /* 802737D0 00270730 7C 00 00 26 */ mfcr r0 /* 802737D4 00270734 54 03 1F FE */ rlwinm r3, r0, 3, 0x1f, 0x1f -/* 802737D8 00270738 4E 80 00 20 */ blr +/* 802737D8 00270738 4E 80 00 20 */ blr .global ShouldRetreat__16CMetroidPrimeExoFR13CStateManagerf ShouldRetreat__16CMetroidPrimeExoFR13CStateManagerf: /* 802737DC 0027073C 88 03 08 F4 */ lbz r0, 0x8f4(r3) /* 802737E0 00270740 54 03 EF FE */ rlwinm r3, r0, 0x1d, 0x1f, 0x1f -/* 802737E4 00270744 4E 80 00 20 */ blr +/* 802737E4 00270744 4E 80 00 20 */ blr .global ShouldFlinch__16CMetroidPrimeExoFR13CStateManagerf ShouldFlinch__16CMetroidPrimeExoFR13CStateManagerf: /* 802737E8 00270748 88 03 08 F4 */ lbz r0, 0x8f4(r3) /* 802737EC 0027074C 54 03 E7 FE */ rlwinm r3, r0, 0x1c, 0x1f, 0x1f -/* 802737F0 00270750 4E 80 00 20 */ blr +/* 802737F0 00270750 4E 80 00 20 */ blr .global InPosition__16CMetroidPrimeExoFR13CStateManagerf InPosition__16CMetroidPrimeExoFR13CStateManagerf: @@ -3466,13 +3466,13 @@ InPosition__16CMetroidPrimeExoFR13CStateManagerf: /* 80273800 00270760 4C 40 13 82 */ cror 2, 0, 2 /* 80273804 00270764 7C 00 00 26 */ mfcr r0 /* 80273808 00270768 54 03 1F FE */ rlwinm r3, r0, 3, 0x1f, 0x1f -/* 8027380C 0027076C 4E 80 00 20 */ blr +/* 8027380C 0027076C 4E 80 00 20 */ blr .global CodeTrigger__16CMetroidPrimeExoFR13CStateManagerf CodeTrigger__16CMetroidPrimeExoFR13CStateManagerf: /* 80273810 00270770 88 03 14 44 */ lbz r0, 0x1444(r3) /* 80273814 00270774 54 03 CF FE */ rlwinm r3, r0, 0x19, 0x1f, 0x1f -/* 80273818 00270778 4E 80 00 20 */ blr +/* 80273818 00270778 4E 80 00 20 */ blr .global sub_8027381c sub_8027381c: @@ -3521,7 +3521,7 @@ sub_8027381c: /* 802738C4 00270824 80 01 00 34 */ lwz r0, 0x34(r1) /* 802738C8 00270828 7C 08 03 A6 */ mtlr r0 /* 802738CC 0027082C 38 21 00 30 */ addi r1, r1, 0x30 -/* 802738D0 00270830 4E 80 00 20 */ blr +/* 802738D0 00270830 4E 80 00 20 */ blr .global sub_802738d4 sub_802738d4: @@ -3539,7 +3539,7 @@ sub_802738d4: /* 80273900 00270860 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80273904 00270864 7C 08 03 A6 */ mtlr r0 /* 80273908 00270868 38 21 00 10 */ addi r1, r1, 0x10 -/* 8027390C 0027086C 4E 80 00 20 */ blr +/* 8027390C 0027086C 4E 80 00 20 */ blr .global sub_80273910 sub_80273910: @@ -3636,7 +3636,7 @@ lbl_80273A50: /* 80273A54 002709B4 80 01 00 74 */ lwz r0, 0x74(r1) /* 80273A58 002709B8 7C 08 03 A6 */ mtlr r0 /* 80273A5C 002709BC 38 21 00 70 */ addi r1, r1, 0x70 -/* 80273A60 002709C0 4E 80 00 20 */ blr +/* 80273A60 002709C0 4E 80 00 20 */ blr .global sub_80273a64 sub_80273a64: @@ -3756,7 +3756,7 @@ lbl_80273AF0: /* 80273C08 00270B68 B0 01 00 08 */ sth r0, 8(r1) /* 80273C0C 00270B6C 81 8C 00 18 */ lwz r12, 0x18(r12) /* 80273C10 00270B70 7D 89 03 A6 */ mtctr r12 -/* 80273C14 00270B74 4E 80 04 21 */ bctrl +/* 80273C14 00270B74 4E 80 04 21 */ bctrl /* 80273C18 00270B78 80 1D 10 6C */ lwz r0, 0x106c(r29) /* 80273C1C 00270B7C 54 00 08 3C */ slwi r0, r0, 1 /* 80273C20 00270B80 7C 7D 02 14 */ add r3, r29, r0 @@ -3784,7 +3784,7 @@ lbl_80273C64: /* 80273C68 00270BC8 80 01 00 94 */ lwz r0, 0x94(r1) /* 80273C6C 00270BCC 7C 08 03 A6 */ mtlr r0 /* 80273C70 00270BD0 38 21 00 90 */ addi r1, r1, 0x90 -/* 80273C74 00270BD4 4E 80 00 20 */ blr +/* 80273C74 00270BD4 4E 80 00 20 */ blr .global sub_80273c78 sub_80273c78: @@ -3839,7 +3839,7 @@ lbl_80273D0C: /* 80273D28 00270C88 83 81 00 10 */ lwz r28, 0x10(r1) /* 80273D2C 00270C8C 7C 08 03 A6 */ mtlr r0 /* 80273D30 00270C90 38 21 00 20 */ addi r1, r1, 0x20 -/* 80273D34 00270C94 4E 80 00 20 */ blr +/* 80273D34 00270C94 4E 80 00 20 */ blr .global sub_80273d38 sub_80273d38: @@ -3919,7 +3919,7 @@ lbl_80273DE0: /* 80273E48 00270DA8 B0 01 00 08 */ sth r0, 8(r1) /* 80273E4C 00270DAC 81 8C 00 18 */ lwz r12, 0x18(r12) /* 80273E50 00270DB0 7D 89 03 A6 */ mtctr r12 -/* 80273E54 00270DB4 4E 80 04 21 */ bctrl +/* 80273E54 00270DB4 4E 80 04 21 */ bctrl lbl_80273E58: /* 80273E58 00270DB8 80 1B 10 58 */ lwz r0, 0x1058(r27) /* 80273E5C 00270DBC 54 00 10 3A */ slwi r0, r0, 2 @@ -3975,7 +3975,7 @@ lbl_80273EFC: /* 80273F00 00270E60 80 01 00 64 */ lwz r0, 0x64(r1) /* 80273F04 00270E64 7C 08 03 A6 */ mtlr r0 /* 80273F08 00270E68 38 21 00 60 */ addi r1, r1, 0x60 -/* 80273F0C 00270E6C 4E 80 00 20 */ blr +/* 80273F0C 00270E6C 4E 80 00 20 */ blr .global sub_80273f10 sub_80273f10: @@ -4063,7 +4063,7 @@ lbl_80274038: /* 80274044 00270FA4 83 A1 00 54 */ lwz r29, 0x54(r1) /* 80274048 00270FA8 7C 08 03 A6 */ mtlr r0 /* 8027404C 00270FAC 38 21 00 60 */ addi r1, r1, 0x60 -/* 80274050 00270FB0 4E 80 00 20 */ blr +/* 80274050 00270FB0 4E 80 00 20 */ blr .global sub_80274054 sub_80274054: @@ -4097,7 +4097,7 @@ lbl_802740B8: /* 802740BC 0027101C 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 802740C0 00271020 7C 08 03 A6 */ mtlr r0 /* 802740C4 00271024 38 21 00 30 */ addi r1, r1, 0x30 -/* 802740C8 00271028 4E 80 00 20 */ blr +/* 802740C8 00271028 4E 80 00 20 */ blr .global sub_802740cc sub_802740cc: @@ -4112,7 +4112,7 @@ sub_802740cc: /* 802740EC 0027104C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802740F0 00271050 7C 08 03 A6 */ mtlr r0 /* 802740F4 00271054 38 21 00 10 */ addi r1, r1, 0x10 -/* 802740F8 00271058 4E 80 00 20 */ blr +/* 802740F8 00271058 4E 80 00 20 */ blr .global sub_802740fc sub_802740fc: @@ -4197,7 +4197,7 @@ lbl_80274210: /* 80274220 00271180 80 01 00 74 */ lwz r0, 0x74(r1) /* 80274224 00271184 7C 08 03 A6 */ mtlr r0 /* 80274228 00271188 38 21 00 70 */ addi r1, r1, 0x70 -/* 8027422C 0027118C 4E 80 00 20 */ blr +/* 8027422C 0027118C 4E 80 00 20 */ blr .global sub_80274230 sub_80274230: @@ -4308,7 +4308,7 @@ sub_80274230: /* 802743D0 00271330 80 01 01 64 */ lwz r0, 0x164(r1) /* 802743D4 00271334 7C 08 03 A6 */ mtlr r0 /* 802743D8 00271338 38 21 01 60 */ addi r1, r1, 0x160 -/* 802743DC 0027133C 4E 80 00 20 */ blr +/* 802743DC 0027133C 4E 80 00 20 */ blr .global sub_802743e0 sub_802743e0: @@ -4333,13 +4333,13 @@ sub_802743e0: /* 80274428 00271388 81 83 00 00 */ lwz r12, 0(r3) /* 8027442C 0027138C 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80274430 00271390 7D 89 03 A6 */ mtctr r12 -/* 80274434 00271394 4E 80 04 21 */ bctrl +/* 80274434 00271394 4E 80 04 21 */ bctrl lbl_80274438: /* 80274438 00271398 80 01 00 24 */ lwz r0, 0x24(r1) /* 8027443C 0027139C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80274440 002713A0 7C 08 03 A6 */ mtlr r0 /* 80274444 002713A4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80274448 002713A8 4E 80 00 20 */ blr +/* 80274448 002713A8 4E 80 00 20 */ blr .global sub_8027444c sub_8027444c: @@ -4354,7 +4354,7 @@ sub_8027444c: /* 8027446C 002713CC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80274470 002713D0 7C 08 03 A6 */ mtlr r0 /* 80274474 002713D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80274478 002713D8 4E 80 00 20 */ blr +/* 80274478 002713D8 4E 80 00 20 */ blr .global sub_8027447c sub_8027447c: @@ -4475,12 +4475,12 @@ lbl_80274604: /* 80274628 00271588 81 83 00 00 */ lwz r12, 0(r3) /* 8027462C 0027158C 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80274630 00271590 7D 89 03 A6 */ mtctr r12 -/* 80274634 00271594 4E 80 04 21 */ bctrl +/* 80274634 00271594 4E 80 04 21 */ bctrl /* 80274638 00271598 BB 21 00 64 */ lmw r25, 0x64(r1) /* 8027463C 0027159C 80 01 00 84 */ lwz r0, 0x84(r1) /* 80274640 002715A0 7C 08 03 A6 */ mtlr r0 /* 80274644 002715A4 38 21 00 80 */ addi r1, r1, 0x80 -/* 80274648 002715A8 4E 80 00 20 */ blr +/* 80274648 002715A8 4E 80 00 20 */ blr .global sub_8027464c sub_8027464c: @@ -4579,7 +4579,7 @@ lbl_8027477C: /* 802747A8 00271708 83 A1 00 24 */ lwz r29, 0x24(r1) /* 802747AC 0027170C 7C 08 03 A6 */ mtlr r0 /* 802747B0 00271710 38 21 00 70 */ addi r1, r1, 0x70 -/* 802747B4 00271714 4E 80 00 20 */ blr +/* 802747B4 00271714 4E 80 00 20 */ blr .global sub_802747b8 sub_802747b8: @@ -4724,7 +4724,7 @@ lbl_802749C4: /* 802749D8 00271938 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 802749DC 0027193C 7C 08 03 A6 */ mtlr r0 /* 802749E0 00271940 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 802749E4 00271944 4E 80 00 20 */ blr +/* 802749E4 00271944 4E 80 00 20 */ blr .global sub_802749e8 sub_802749e8: @@ -4834,7 +4834,7 @@ sub_802749e8: /* 80274B84 00271AE4 81 9F 00 00 */ lwz r12, 0(r31) /* 80274B88 00271AE8 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80274B8C 00271AEC 7D 89 03 A6 */ mtctr r12 -/* 80274B90 00271AF0 4E 80 04 21 */ bctrl +/* 80274B90 00271AF0 4E 80 04 21 */ bctrl /* 80274B94 00271AF4 6F 60 80 00 */ xoris r0, r27, 0x8000 /* 80274B98 00271AF8 3F 80 43 30 */ lis r28, 0x4330 /* 80274B9C 00271AFC 90 01 00 C4 */ stw r0, 0xc4(r1) @@ -4891,7 +4891,7 @@ lbl_80274C30: /* 80274C5C 00271BBC 81 9F 00 00 */ lwz r12, 0(r31) /* 80274C60 00271BC0 81 8C 00 18 */ lwz r12, 0x18(r12) /* 80274C64 00271BC4 7D 89 03 A6 */ mtctr r12 -/* 80274C68 00271BC8 4E 80 04 21 */ bctrl +/* 80274C68 00271BC8 4E 80 04 21 */ bctrl /* 80274C6C 00271BCC 7F E3 FB 78 */ mr r3, r31 /* 80274C70 00271BD0 38 80 00 01 */ li r4, 1 /* 80274C74 00271BD4 48 0A 7C 4D */ bl ForceParticleCreation__11CElementGenFi @@ -4910,7 +4910,7 @@ lbl_80274C94: /* 80274CA4 00271C04 81 9F 00 00 */ lwz r12, 0(r31) /* 80274CA8 00271C08 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80274CAC 00271C0C 7D 89 03 A6 */ mtctr r12 -/* 80274CB0 00271C10 4E 80 04 21 */ bctrl +/* 80274CB0 00271C10 4E 80 04 21 */ bctrl /* 80274CB4 00271C14 80 7E 01 60 */ lwz r3, 0x160(r30) /* 80274CB8 00271C18 3F 80 43 30 */ lis r28, 0x4330 /* 80274CBC 00271C1C 93 81 00 C0 */ stw r28, 0xc0(r1) @@ -5025,7 +5025,7 @@ lbl_80274DE8: /* 80274E5C 00271DBC 80 01 01 C4 */ lwz r0, 0x1c4(r1) /* 80274E60 00271DC0 7C 08 03 A6 */ mtlr r0 /* 80274E64 00271DC4 38 21 01 C0 */ addi r1, r1, 0x1c0 -/* 80274E68 00271DC8 4E 80 00 20 */ blr +/* 80274E68 00271DC8 4E 80 00 20 */ blr .global sub_80274e6c sub_80274e6c: @@ -5241,7 +5241,7 @@ lbl_80275198: /* 802751A0 00272100 81 83 00 00 */ lwz r12, 0(r3) /* 802751A4 00272104 81 8C 00 18 */ lwz r12, 0x18(r12) /* 802751A8 00272108 7D 89 03 A6 */ mtctr r12 -/* 802751AC 0027210C 4E 80 04 21 */ bctrl +/* 802751AC 0027210C 4E 80 04 21 */ bctrl /* 802751B0 00272110 48 00 00 C0 */ b lbl_80275270 lbl_802751B4: /* 802751B4 00272114 48 00 03 F1 */ bl sub_802755a4 @@ -5290,14 +5290,14 @@ lbl_802751B4: /* 80275260 002721C0 81 83 00 00 */ lwz r12, 0(r3) /* 80275264 002721C4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80275268 002721C8 7D 89 03 A6 */ mtctr r12 -/* 8027526C 002721CC 4E 80 04 21 */ bctrl +/* 8027526C 002721CC 4E 80 04 21 */ bctrl lbl_80275270: /* 80275270 002721D0 80 7A 00 04 */ lwz r3, 4(r26) /* 80275274 002721D4 FC 20 F8 90 */ fmr f1, f31 /* 80275278 002721D8 81 83 00 00 */ lwz r12, 0(r3) /* 8027527C 002721DC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80275280 002721E0 7D 89 03 A6 */ mtctr r12 -/* 80275284 002721E4 4E 80 04 21 */ bctrl +/* 80275284 002721E4 4E 80 04 21 */ bctrl /* 80275288 002721E8 3B 39 00 01 */ addi r25, r25, 1 /* 8027528C 002721EC 3B BD 00 04 */ addi r29, r29, 4 /* 80275290 002721F0 2C 19 00 02 */ cmpwi r25, 2 @@ -5311,7 +5311,7 @@ lbl_80275270: /* 802752B0 00272210 81 83 00 00 */ lwz r12, 0(r3) /* 802752B4 00272214 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802752B8 00272218 7D 89 03 A6 */ mtctr r12 -/* 802752BC 0027221C 4E 80 04 21 */ bctrl +/* 802752BC 0027221C 4E 80 04 21 */ bctrl /* 802752C0 00272220 C0 22 BC 80 */ lfs f1, lbl_805AD9A0@sda21(r2) /* 802752C4 00272224 C0 02 BC 88 */ lfs f0, lbl_805AD9A8@sda21(r2) /* 802752C8 00272228 EF 21 06 32 */ fmuls f25, f1, f24 @@ -5325,7 +5325,7 @@ lbl_80275270: /* 802752E8 00272248 81 83 00 00 */ lwz r12, 0(r3) /* 802752EC 0027224C 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 802752F0 00272250 7D 89 03 A6 */ mtctr r12 -/* 802752F4 00272254 4E 80 04 21 */ bctrl +/* 802752F4 00272254 4E 80 04 21 */ bctrl /* 802752F8 00272258 7E E3 BB 78 */ mr r3, r23 /* 802752FC 0027225C 7F 04 C3 78 */ mr r4, r24 /* 80275300 00272260 38 A0 00 01 */ li r5, 1 @@ -5508,12 +5508,12 @@ lbl_80275548: /* 80275594 002724F4 80 01 01 E4 */ lwz r0, 0x1e4(r1) /* 80275598 002724F8 7C 08 03 A6 */ mtlr r0 /* 8027559C 002724FC 38 21 01 E0 */ addi r1, r1, 0x1e0 -/* 802755A0 00272500 4E 80 00 20 */ blr +/* 802755A0 00272500 4E 80 00 20 */ blr .global sub_802755a4 sub_802755a4: /* 802755A4 00272504 80 6D A8 F8 */ lwz r3, lbl_805A94B8@sda21(r13) -/* 802755A8 00272508 4E 80 00 20 */ blr +/* 802755A8 00272508 4E 80 00 20 */ blr .global sub_802755ac sub_802755ac: @@ -5534,7 +5534,7 @@ lbl_802755D8: /* 802755E0 00272540 81 83 00 00 */ lwz r12, 0(r3) /* 802755E4 00272544 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 802755E8 00272548 7D 89 03 A6 */ mtctr r12 -/* 802755EC 0027254C 4E 80 04 21 */ bctrl +/* 802755EC 0027254C 4E 80 04 21 */ bctrl /* 802755F0 00272550 28 1D 00 00 */ cmplwi r29, 0 /* 802755F4 00272554 41 82 00 68 */ beq lbl_8027565C /* 802755F8 00272558 88 16 10 54 */ lbz r0, 0x1054(r22) @@ -5557,7 +5557,7 @@ lbl_80275620: /* 80275638 00272598 81 83 00 00 */ lwz r12, 0(r3) /* 8027563C 0027259C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80275640 002725A0 7D 89 03 A6 */ mtctr r12 -/* 80275644 002725A4 4E 80 04 21 */ bctrl +/* 80275644 002725A4 4E 80 04 21 */ bctrl /* 80275648 002725A8 3B 39 00 01 */ addi r25, r25, 1 lbl_8027564C: /* 8027564C 002725AC 80 1E 01 60 */ lwz r0, 0x160(r30) @@ -5570,7 +5570,7 @@ lbl_8027565C: /* 80275664 002725C4 81 83 00 00 */ lwz r12, 0(r3) /* 80275668 002725C8 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8027566C 002725CC 7D 89 03 A6 */ mtctr r12 -/* 80275670 002725D0 4E 80 04 21 */ bctrl +/* 80275670 002725D0 4E 80 04 21 */ bctrl /* 80275674 002725D4 7E C3 B3 78 */ mr r3, r22 /* 80275678 002725D8 7E E4 BB 78 */ mr r4, r23 /* 8027567C 002725DC 38 A0 00 00 */ li r5, 0 @@ -5588,7 +5588,7 @@ lbl_80275684: /* 802756A8 00272608 80 01 00 34 */ lwz r0, 0x34(r1) /* 802756AC 0027260C 7C 08 03 A6 */ mtlr r0 /* 802756B0 00272610 38 21 00 30 */ addi r1, r1, 0x30 -/* 802756B4 00272614 4E 80 00 20 */ blr +/* 802756B4 00272614 4E 80 00 20 */ blr .global sub_802756b8 sub_802756b8: @@ -5617,7 +5617,7 @@ lbl_80275708: /* 8027570C 0027266C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80275710 00272670 7C 08 03 A6 */ mtlr r0 /* 80275714 00272674 38 21 00 20 */ addi r1, r1, 0x20 -/* 80275718 00272678 4E 80 00 20 */ blr +/* 80275718 00272678 4E 80 00 20 */ blr .global sub_8027571c sub_8027571c: @@ -5646,7 +5646,7 @@ lbl_8027576C: /* 80275770 002726D0 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80275774 002726D4 7C 08 03 A6 */ mtlr r0 /* 80275778 002726D8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8027577C 002726DC 4E 80 00 20 */ blr +/* 8027577C 002726DC 4E 80 00 20 */ blr .global sub_80275780 sub_80275780: @@ -5682,7 +5682,7 @@ lbl_802757E4: /* 802757F0 00272750 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802757F4 00272754 7C 08 03 A6 */ mtlr r0 /* 802757F8 00272758 38 21 00 20 */ addi r1, r1, 0x20 -/* 802757FC 0027275C 4E 80 00 20 */ blr +/* 802757FC 0027275C 4E 80 00 20 */ blr .global sub_80275800 sub_80275800: @@ -5796,7 +5796,7 @@ lbl_8027597C: /* 80275998 002728F8 83 A1 00 44 */ lwz r29, 0x44(r1) /* 8027599C 002728FC 7C 08 03 A6 */ mtlr r0 /* 802759A0 00272900 38 21 00 50 */ addi r1, r1, 0x50 -/* 802759A4 00272904 4E 80 00 20 */ blr +/* 802759A4 00272904 4E 80 00 20 */ blr .global sub_802759a8 sub_802759a8: @@ -5893,7 +5893,7 @@ lbl_80275AE0: /* 80275AF4 00272A54 80 01 00 44 */ lwz r0, 0x44(r1) /* 80275AF8 00272A58 7C 08 03 A6 */ mtlr r0 /* 80275AFC 00272A5C 38 21 00 40 */ addi r1, r1, 0x40 -/* 80275B00 00272A60 4E 80 00 20 */ blr +/* 80275B00 00272A60 4E 80 00 20 */ blr .global sub_80275b04 sub_80275b04: @@ -5923,7 +5923,7 @@ lbl_80275B54: /* 80275B58 00272AB8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80275B5C 00272ABC 7C 08 03 A6 */ mtlr r0 /* 80275B60 00272AC0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80275B64 00272AC4 4E 80 00 20 */ blr +/* 80275B64 00272AC4 4E 80 00 20 */ blr .global sub_80275b68 sub_80275b68: @@ -5980,7 +5980,7 @@ lbl_80275C18: /* 80275C20 00272B80 EC 26 08 28 */ fsubs f1, f6, f1 /* 80275C24 00272B84 FC 20 0A 10 */ fabs f1, f1 /* 80275C28 00272B88 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80275C2C 00272B8C 4D 80 00 20 */ bltlr +/* 80275C2C 00272B8C 4D 80 00 20 */ bltlr /* 80275C30 00272B90 38 83 12 5C */ addi r4, r3, 0x125c /* 80275C34 00272B94 38 A0 00 00 */ li r5, 0 /* 80275C38 00272B98 48 00 00 18 */ b lbl_80275C50 @@ -5997,7 +5997,7 @@ lbl_80275C50: .global sub_80275c5c sub_80275c5c: -/* 80275C5C 00272BBC 4E 80 00 20 */ blr +/* 80275C5C 00272BBC 4E 80 00 20 */ blr .global sub_80275c60 sub_80275c60: @@ -6074,7 +6074,7 @@ lbl_80275D54: /* 80275D58 00272CB8 80 01 00 24 */ lwz r0, 0x24(r1) /* 80275D5C 00272CBC 7C 08 03 A6 */ mtlr r0 /* 80275D60 00272CC0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80275D64 00272CC4 4E 80 00 20 */ blr +/* 80275D64 00272CC4 4E 80 00 20 */ blr .global sub_80275d68 sub_80275d68: @@ -6107,7 +6107,7 @@ lbl_80275DAC: /* 80275DC8 00272D28 38 04 00 01 */ addi r0, r4, 1 /* 80275DCC 00272D2C 7C 60 03 78 */ or r0, r3, r0 /* 80275DD0 00272D30 54 03 0F FE */ srwi r3, r0, 0x1f -/* 80275DD4 00272D34 4E 80 00 20 */ blr +/* 80275DD4 00272D34 4E 80 00 20 */ blr lbl_80275DD8: /* 80275DD8 00272D38 80 03 10 78 */ lwz r0, 0x1078(r3) /* 80275DDC 00272D3C 1C 84 00 0C */ mulli r4, r4, 0xc @@ -6119,13 +6119,13 @@ lbl_80275DD8: /* 80275DF4 00272D54 38 04 00 01 */ addi r0, r4, 1 /* 80275DF8 00272D58 7C 60 03 78 */ or r0, r3, r0 /* 80275DFC 00272D5C 54 03 0F FE */ srwi r3, r0, 0x1f -/* 80275E00 00272D60 4E 80 00 20 */ blr +/* 80275E00 00272D60 4E 80 00 20 */ blr lbl_80275E04: /* 80275E04 00272D64 38 60 00 01 */ li r3, 1 -/* 80275E08 00272D68 4E 80 00 20 */ blr +/* 80275E08 00272D68 4E 80 00 20 */ blr lbl_80275E0C: /* 80275E0C 00272D6C 38 60 00 00 */ li r3, 0 -/* 80275E10 00272D70 4E 80 00 20 */ blr +/* 80275E10 00272D70 4E 80 00 20 */ blr .global sub_80275e14 sub_80275e14: @@ -6136,7 +6136,7 @@ sub_80275e14: /* 80275E24 00272D84 38 63 55 70 */ addi r3, r3, lbl_803D5570@l /* 80275E28 00272D88 7C 63 22 14 */ add r3, r3, r4 /* 80275E2C 00272D8C 7C 63 00 2E */ lwzx r3, r3, r0 -/* 80275E30 00272D90 4E 80 00 20 */ blr +/* 80275E30 00272D90 4E 80 00 20 */ blr .global sub_80275e34 sub_80275e34: @@ -6147,7 +6147,7 @@ sub_80275e34: /* 80275E44 00272DA4 38 63 54 C8 */ addi r3, r3, lbl_803D54C8@l /* 80275E48 00272DA8 7C 63 22 14 */ add r3, r3, r4 /* 80275E4C 00272DAC 7C 63 00 2E */ lwzx r3, r3, r0 -/* 80275E50 00272DB0 4E 80 00 20 */ blr +/* 80275E50 00272DB0 4E 80 00 20 */ blr .global sub_80275e54 sub_80275e54: @@ -6171,7 +6171,7 @@ sub_80275e54: /* 80275E98 00272DF8 81 9B 00 00 */ lwz r12, 0(r27) /* 80275E9C 00272DFC 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80275EA0 00272E00 7D 89 03 A6 */ mtctr r12 -/* 80275EA4 00272E04 4E 80 04 21 */ bctrl +/* 80275EA4 00272E04 4E 80 04 21 */ bctrl /* 80275EA8 00272E08 C0 5D 00 60 */ lfs f2, 0x60(r29) /* 80275EAC 00272E0C 38 81 00 5C */ addi r4, r1, 0x5c /* 80275EB0 00272E10 C0 3D 00 50 */ lfs f1, 0x50(r29) @@ -6183,7 +6183,7 @@ sub_80275e54: /* 80275EC8 00272E28 81 83 00 00 */ lwz r12, 0(r3) /* 80275ECC 00272E2C 81 8C 00 20 */ lwz r12, 0x20(r12) /* 80275ED0 00272E30 7D 89 03 A6 */ mtctr r12 -/* 80275ED4 00272E34 4E 80 04 21 */ bctrl +/* 80275ED4 00272E34 4E 80 04 21 */ bctrl /* 80275ED8 00272E38 80 7D 00 64 */ lwz r3, 0x64(r29) /* 80275EDC 00272E3C 38 81 00 50 */ addi r4, r1, 0x50 /* 80275EE0 00272E40 C0 03 00 00 */ lfs f0, 0(r3) @@ -6196,7 +6196,7 @@ sub_80275e54: /* 80275EFC 00272E5C 81 83 00 00 */ lwz r12, 0(r3) /* 80275F00 00272E60 81 8C 00 24 */ lwz r12, 0x24(r12) /* 80275F04 00272E64 7D 89 03 A6 */ mtctr r12 -/* 80275F08 00272E68 4E 80 04 21 */ bctrl +/* 80275F08 00272E68 4E 80 04 21 */ bctrl /* 80275F0C 00272E6C 88 1D 0F C0 */ lbz r0, 0xfc0(r29) /* 80275F10 00272E70 28 00 00 00 */ cmplwi r0, 0 /* 80275F14 00272E74 41 82 02 1C */ beq lbl_80276130 @@ -6225,7 +6225,7 @@ lbl_80275F5C: /* 80275F6C 00272ECC 83 65 00 10 */ lwz r27, 0x10(r5) /* 80275F70 00272ED0 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80275F74 00272ED4 7D 89 03 A6 */ mtctr r12 -/* 80275F78 00272ED8 4E 80 04 21 */ bctrl +/* 80275F78 00272ED8 4E 80 04 21 */ bctrl /* 80275F7C 00272EDC 3C 60 80 3F */ lis r3, lbl_803EAC74@ha /* 80275F80 00272EE0 3B E0 00 00 */ li r31, 0 /* 80275F84 00272EE4 3B 83 AC 74 */ addi r28, r3, lbl_803EAC74@l @@ -6329,7 +6329,7 @@ lbl_802760D0: /* 802760F0 00273050 81 83 00 00 */ lwz r12, 0(r3) /* 802760F4 00273054 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 802760F8 00273058 7D 89 03 A6 */ mtctr r12 -/* 802760FC 0027305C 4E 80 04 21 */ bctrl +/* 802760FC 0027305C 4E 80 04 21 */ bctrl /* 80276100 00273060 C0 3D 0F B4 */ lfs f1, 0xfb4(r29) /* 80276104 00273064 C0 02 BC 08 */ lfs f0, lbl_805AD928@sda21(r2) /* 80276108 00273068 EC 21 F8 28 */ fsubs f1, f1, f31 @@ -6348,7 +6348,7 @@ lbl_80276130: /* 80276138 00273098 81 83 00 00 */ lwz r12, 0(r3) /* 8027613C 0027309C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80276140 002730A0 7D 89 03 A6 */ mtctr r12 -/* 80276144 002730A4 4E 80 04 21 */ bctrl +/* 80276144 002730A4 4E 80 04 21 */ bctrl lbl_80276148: /* 80276148 002730A8 E3 E1 01 18 */ psq_l f31, 280(r1), 0, qr0 /* 8027614C 002730AC CB E1 01 10 */ lfd f31, 0x110(r1) @@ -6356,7 +6356,7 @@ lbl_80276148: /* 80276154 002730B4 80 01 01 24 */ lwz r0, 0x124(r1) /* 80276158 002730B8 7C 08 03 A6 */ mtlr r0 /* 8027615C 002730BC 38 21 01 20 */ addi r1, r1, 0x120 -/* 80276160 002730C0 4E 80 00 20 */ blr +/* 80276160 002730C0 4E 80 00 20 */ blr .global sub_80276164 sub_80276164: @@ -6401,7 +6401,7 @@ lbl_802761F0: /* 802761F4 00273154 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802761F8 00273158 7C 08 03 A6 */ mtlr r0 /* 802761FC 0027315C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80276200 00273160 4E 80 00 20 */ blr +/* 80276200 00273160 4E 80 00 20 */ blr .global sub_80276204 sub_80276204: @@ -6510,7 +6510,7 @@ lbl_80276384: /* 8027638C 002732EC 83 C1 00 48 */ lwz r30, 0x48(r1) /* 80276390 002732F0 7C 08 03 A6 */ mtlr r0 /* 80276394 002732F4 38 21 00 50 */ addi r1, r1, 0x50 -/* 80276398 002732F8 4E 80 00 20 */ blr +/* 80276398 002732F8 4E 80 00 20 */ blr .global sub_8027639c sub_8027639c: @@ -6592,7 +6592,7 @@ lbl_802764B0: /* 802764B4 00273414 80 01 00 54 */ lwz r0, 0x54(r1) /* 802764B8 00273418 7C 08 03 A6 */ mtlr r0 /* 802764BC 0027341C 38 21 00 50 */ addi r1, r1, 0x50 -/* 802764C0 00273420 4E 80 00 20 */ blr +/* 802764C0 00273420 4E 80 00 20 */ blr .global sub_802764c4 sub_802764c4: @@ -6621,7 +6621,7 @@ lbl_80276510: /* 80276518 00273478 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8027651C 0027347C 7C 08 03 A6 */ mtlr r0 /* 80276520 00273480 38 21 00 20 */ addi r1, r1, 0x20 -/* 80276524 00273484 4E 80 00 20 */ blr +/* 80276524 00273484 4E 80 00 20 */ blr .global sub_80276528 sub_80276528: @@ -6742,7 +6742,7 @@ lbl_802766C4: /* 802766D4 00273634 83 81 00 40 */ lwz r28, 0x40(r1) /* 802766D8 00273638 7C 08 03 A6 */ mtlr r0 /* 802766DC 0027363C 38 21 00 50 */ addi r1, r1, 0x50 -/* 802766E0 00273640 4E 80 00 20 */ blr +/* 802766E0 00273640 4E 80 00 20 */ blr .global sub_802766e4 sub_802766e4: @@ -6774,7 +6774,7 @@ lbl_8027673C: /* 80276744 002736A4 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80276748 002736A8 7C 08 03 A6 */ mtlr r0 /* 8027674C 002736AC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80276750 002736B0 4E 80 00 20 */ blr +/* 80276750 002736B0 4E 80 00 20 */ blr .global sub_80276754 sub_80276754: @@ -6880,12 +6880,12 @@ lbl_802768B4: /* 802768C0 00273820 83 A1 00 24 */ lwz r29, 0x24(r1) /* 802768C4 00273824 7C 08 03 A6 */ mtlr r0 /* 802768C8 00273828 38 21 00 30 */ addi r1, r1, 0x30 -/* 802768CC 0027382C 4E 80 00 20 */ blr +/* 802768CC 0027382C 4E 80 00 20 */ blr .global sub_802768d0 sub_802768d0: /* 802768D0 00273830 7C 03 20 40 */ cmplw r3, r4 -/* 802768D4 00273834 4D 82 00 20 */ beqlr +/* 802768D4 00273834 4D 82 00 20 */ beqlr /* 802768D8 00273838 39 03 00 04 */ addi r8, r3, 4 /* 802768DC 0027383C 38 A0 00 00 */ li r5, 0 /* 802768E0 00273840 48 00 00 70 */ b lbl_80276950 @@ -6963,7 +6963,7 @@ lbl_802769CC: /* 802769D0 00273930 40 82 FF B0 */ bne lbl_80276980 /* 802769D4 00273934 80 04 00 00 */ lwz r0, 0(r4) /* 802769D8 00273938 90 03 00 00 */ stw r0, 0(r3) -/* 802769DC 0027393C 4E 80 00 20 */ blr +/* 802769DC 0027393C 4E 80 00 20 */ blr .global sub_802769e0 sub_802769e0: @@ -7058,7 +7058,7 @@ lbl_80276B0C: /* 80276B2C 00273A8C 80 01 00 64 */ lwz r0, 0x64(r1) /* 80276B30 00273A90 7C 08 03 A6 */ mtlr r0 /* 80276B34 00273A94 38 21 00 60 */ addi r1, r1, 0x60 -/* 80276B38 00273A98 4E 80 00 20 */ blr +/* 80276B38 00273A98 4E 80 00 20 */ blr .global sub_80276b3c sub_80276b3c: @@ -7202,7 +7202,7 @@ lbl_80276D1C: /* 80276D20 00273C80 80 01 00 64 */ lwz r0, 0x64(r1) /* 80276D24 00273C84 7C 08 03 A6 */ mtlr r0 /* 80276D28 00273C88 38 21 00 60 */ addi r1, r1, 0x60 -/* 80276D2C 00273C8C 4E 80 00 20 */ blr +/* 80276D2C 00273C8C 4E 80 00 20 */ blr .global sub_80276d30 sub_80276d30: @@ -7311,7 +7311,7 @@ lbl_80276E94: /* 80276EB0 00273E10 80 01 00 64 */ lwz r0, 0x64(r1) /* 80276EB4 00273E14 7C 08 03 A6 */ mtlr r0 /* 80276EB8 00273E18 38 21 00 60 */ addi r1, r1, 0x60 -/* 80276EBC 00273E1C 4E 80 00 20 */ blr +/* 80276EBC 00273E1C 4E 80 00 20 */ blr .global sub_80276ec0 sub_80276ec0: @@ -7372,7 +7372,7 @@ lbl_80276F54: /* 80276F88 00273EE8 80 01 00 24 */ lwz r0, 0x24(r1) /* 80276F8C 00273EEC 7C 08 03 A6 */ mtlr r0 /* 80276F90 00273EF0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80276F94 00273EF4 4E 80 00 20 */ blr +/* 80276F94 00273EF4 4E 80 00 20 */ blr .global AddToRenderer__16CMetroidPrimeExoCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__16CMetroidPrimeExoCFRC14CFrustumPlanesRC13CStateManager: @@ -7388,7 +7388,7 @@ AddToRenderer__16CMetroidPrimeExoCFRC14CFrustumPlanesRC13CStateManager: /* 80276FBC 00273F1C 81 84 00 00 */ lwz r12, 0(r4) /* 80276FC0 00273F20 81 8C 00 5C */ lwz r12, 0x5c(r12) /* 80276FC4 00273F24 7D 89 03 A6 */ mtctr r12 -/* 80276FC8 00273F28 4E 80 04 21 */ bctrl +/* 80276FC8 00273F28 4E 80 04 21 */ bctrl /* 80276FCC 00273F2C 7F 83 E3 78 */ mr r3, r28 /* 80276FD0 00273F30 38 81 00 5C */ addi r4, r1, 0x5c /* 80276FD4 00273F34 48 0C E1 B5 */ bl "BoxInFrustumPlanes__14CFrustumPlanesCFRCQ24rstl24optional_object<6CAABox>" @@ -7401,14 +7401,14 @@ AddToRenderer__16CMetroidPrimeExoCFRC14CFrustumPlanesRC13CStateManager: /* 80276FF0 00273F50 81 83 00 00 */ lwz r12, 0(r3) /* 80276FF4 00273F54 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80276FF8 00273F58 7D 89 03 A6 */ mtctr r12 -/* 80276FFC 00273F5C 4E 80 04 21 */ bctrl +/* 80276FFC 00273F5C 4E 80 04 21 */ bctrl lbl_80277000: /* 80277000 00273F60 80 9B 0F B0 */ lwz r4, 0xfb0(r27) /* 80277004 00273F64 38 61 00 40 */ addi r3, r1, 0x40 /* 80277008 00273F68 81 84 00 00 */ lwz r12, 0(r4) /* 8027700C 00273F6C 81 8C 00 5C */ lwz r12, 0x5c(r12) /* 80277010 00273F70 7D 89 03 A6 */ mtctr r12 -/* 80277014 00273F74 4E 80 04 21 */ bctrl +/* 80277014 00273F74 4E 80 04 21 */ bctrl /* 80277018 00273F78 7F 83 E3 78 */ mr r3, r28 /* 8027701C 00273F7C 38 81 00 40 */ addi r4, r1, 0x40 /* 80277020 00273F80 48 0C E1 69 */ bl "BoxInFrustumPlanes__14CFrustumPlanesCFRCQ24rstl24optional_object<6CAABox>" @@ -7421,14 +7421,14 @@ lbl_80277000: /* 8027703C 00273F9C 81 83 00 00 */ lwz r12, 0(r3) /* 80277040 00273FA0 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80277044 00273FA4 7D 89 03 A6 */ mtctr r12 -/* 80277048 00273FA8 4E 80 04 21 */ bctrl +/* 80277048 00273FA8 4E 80 04 21 */ bctrl lbl_8027704C: /* 8027704C 00273FAC 80 9B 10 28 */ lwz r4, 0x1028(r27) /* 80277050 00273FB0 38 61 00 24 */ addi r3, r1, 0x24 /* 80277054 00273FB4 81 84 00 00 */ lwz r12, 0(r4) /* 80277058 00273FB8 81 8C 00 5C */ lwz r12, 0x5c(r12) /* 8027705C 00273FBC 7D 89 03 A6 */ mtctr r12 -/* 80277060 00273FC0 4E 80 04 21 */ bctrl +/* 80277060 00273FC0 4E 80 04 21 */ bctrl /* 80277064 00273FC4 7F 83 E3 78 */ mr r3, r28 /* 80277068 00273FC8 38 81 00 24 */ addi r4, r1, 0x24 /* 8027706C 00273FCC 48 0C E1 1D */ bl "BoxInFrustumPlanes__14CFrustumPlanesCFRCQ24rstl24optional_object<6CAABox>" @@ -7441,7 +7441,7 @@ lbl_8027704C: /* 80277088 00273FE8 81 83 00 00 */ lwz r12, 0(r3) /* 8027708C 00273FEC 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80277090 00273FF0 7D 89 03 A6 */ mtctr r12 -/* 80277094 00273FF4 4E 80 04 21 */ bctrl +/* 80277094 00273FF4 4E 80 04 21 */ bctrl lbl_80277098: /* 80277098 00273FF8 3B FB 0F F0 */ addi r31, r27, 0xff0 /* 8027709C 00273FFC 3B DB 10 04 */ addi r30, r27, 0x1004 @@ -7452,7 +7452,7 @@ lbl_802770A4: /* 802770AC 0027400C 81 84 00 00 */ lwz r12, 0(r4) /* 802770B0 00274010 81 8C 00 5C */ lwz r12, 0x5c(r12) /* 802770B4 00274014 7D 89 03 A6 */ mtctr r12 -/* 802770B8 00274018 4E 80 04 21 */ bctrl +/* 802770B8 00274018 4E 80 04 21 */ bctrl /* 802770BC 0027401C 7F 83 E3 78 */ mr r3, r28 /* 802770C0 00274020 38 81 00 08 */ addi r4, r1, 8 /* 802770C4 00274024 48 0C E0 C5 */ bl "BoxInFrustumPlanes__14CFrustumPlanesCFRCQ24rstl24optional_object<6CAABox>" @@ -7465,7 +7465,7 @@ lbl_802770A4: /* 802770E0 00274040 81 83 00 00 */ lwz r12, 0(r3) /* 802770E4 00274044 81 8C 00 34 */ lwz r12, 0x34(r12) /* 802770E8 00274048 7D 89 03 A6 */ mtctr r12 -/* 802770EC 0027404C 4E 80 04 21 */ bctrl +/* 802770EC 0027404C 4E 80 04 21 */ bctrl lbl_802770F0: /* 802770F0 00274050 88 1B 10 54 */ lbz r0, 0x1054(r27) /* 802770F4 00274054 54 00 CF FF */ rlwinm. r0, r0, 0x19, 0x1f, 0x1f @@ -7475,7 +7475,7 @@ lbl_802770F0: /* 80277104 00274064 81 83 00 00 */ lwz r12, 0(r3) /* 80277108 00274068 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8027710C 0027406C 7D 89 03 A6 */ mtctr r12 -/* 80277110 00274070 4E 80 04 21 */ bctrl +/* 80277110 00274070 4E 80 04 21 */ bctrl lbl_80277114: /* 80277114 00274074 3B BD 00 01 */ addi r29, r29, 1 /* 80277118 00274078 3B DE 00 08 */ addi r30, r30, 8 @@ -7486,7 +7486,7 @@ lbl_80277114: /* 8027712C 0027408C 80 01 00 94 */ lwz r0, 0x94(r1) /* 80277130 00274090 7C 08 03 A6 */ mtlr r0 /* 80277134 00274094 38 21 00 90 */ addi r1, r1, 0x90 -/* 80277138 00274098 4E 80 00 20 */ blr +/* 80277138 00274098 4E 80 00 20 */ blr .global CanRenderUnsorted__16CMetroidPrimeExoCFRC13CStateManager CanRenderUnsorted__16CMetroidPrimeExoCFRC13CStateManager: @@ -7497,7 +7497,7 @@ CanRenderUnsorted__16CMetroidPrimeExoCFRC13CStateManager: /* 8027714C 002740AC 38 04 FF FF */ addi r0, r4, -1 /* 80277150 002740B0 7C 60 03 78 */ or r0, r3, r0 /* 80277154 002740B4 54 03 0F FE */ srwi r3, r0, 0x1f -/* 80277158 002740B8 4E 80 00 20 */ blr +/* 80277158 002740B8 4E 80 00 20 */ blr .global Render__16CMetroidPrimeExoCFRC13CStateManager Render__16CMetroidPrimeExoCFRC13CStateManager: @@ -7513,7 +7513,7 @@ Render__16CMetroidPrimeExoCFRC13CStateManager: /* 80277180 002740E0 81 83 00 00 */ lwz r12, 0(r3) /* 80277184 002740E4 81 8C 00 FC */ lwz r12, 0xfc(r12) /* 80277188 002740E8 7D 89 03 A6 */ mtctr r12 -/* 8027718C 002740EC 4E 80 04 21 */ bctrl +/* 8027718C 002740EC 4E 80 04 21 */ bctrl /* 80277190 002740F0 7F C3 F3 78 */ mr r3, r30 /* 80277194 002740F4 7F E4 FB 78 */ mr r4, r31 /* 80277198 002740F8 4B E0 0E 95 */ bl Render__10CPatternedCFRC13CStateManager @@ -7522,7 +7522,7 @@ Render__16CMetroidPrimeExoCFRC13CStateManager: /* 802771A4 00274104 83 C1 00 08 */ lwz r30, 8(r1) /* 802771A8 00274108 7C 08 03 A6 */ mtlr r0 /* 802771AC 0027410C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802771B0 00274110 4E 80 00 20 */ blr +/* 802771B0 00274110 4E 80 00 20 */ blr .global PreRender__16CMetroidPrimeExoFR13CStateManagerRC14CFrustumPlanes PreRender__16CMetroidPrimeExoFR13CStateManagerRC14CFrustumPlanes: @@ -7552,11 +7552,11 @@ PreRender__16CMetroidPrimeExoFR13CStateManagerRC14CFrustumPlanes: /* 80277210 00274170 80 01 00 14 */ lwz r0, 0x14(r1) /* 80277214 00274174 7C 08 03 A6 */ mtlr r0 /* 80277218 00274178 38 21 00 10 */ addi r1, r1, 0x10 -/* 8027721C 0027417C 4E 80 00 20 */ blr +/* 8027721C 0027417C 4E 80 00 20 */ blr .global Touch__16CMetroidPrimeExoFR6CActorR13CStateManager Touch__16CMetroidPrimeExoFR6CActorR13CStateManager: -/* 80277220 00274180 4E 80 00 20 */ blr +/* 80277220 00274180 4E 80 00 20 */ blr .global sub_80277224 sub_80277224: @@ -7649,7 +7649,7 @@ lbl_80277358: /* 80277370 002742D0 83 C1 00 38 */ lwz r30, 0x38(r1) /* 80277374 002742D4 7C 08 03 A6 */ mtlr r0 /* 80277378 002742D8 38 21 00 60 */ addi r1, r1, 0x60 -/* 8027737C 002742DC 4E 80 00 20 */ blr +/* 8027737C 002742DC 4E 80 00 20 */ blr .global sub_80277380 sub_80277380: @@ -7740,7 +7740,7 @@ lbl_80277414: /* 802774CC 0027442C 38 C0 00 00 */ li r6, 0 /* 802774D0 00274430 81 8C 00 78 */ lwz r12, 0x78(r12) /* 802774D4 00274434 7D 89 03 A6 */ mtctr r12 -/* 802774D8 00274438 4E 80 04 21 */ bctrl +/* 802774D8 00274438 4E 80 04 21 */ bctrl /* 802774DC 0027443C 48 00 00 74 */ b lbl_80277550 lbl_802774E0: /* 802774E0 00274440 3B BE 0B 28 */ addi r29, r30, 0xb28 @@ -7766,7 +7766,7 @@ lbl_802774EC: /* 8027752C 0027448C 38 A0 00 00 */ li r5, 0 /* 80277530 00274490 81 8C 00 74 */ lwz r12, 0x74(r12) /* 80277534 00274494 7D 89 03 A6 */ mtctr r12 -/* 80277538 00274498 4E 80 04 21 */ bctrl +/* 80277538 00274498 4E 80 04 21 */ bctrl lbl_8027753C: /* 8027753C 0027449C 3B BD 00 02 */ addi r29, r29, 2 /* 80277540 002744A0 3B 9C 00 01 */ addi r28, r28, 1 @@ -7782,7 +7782,7 @@ lbl_80277550: /* 80277560 002744C0 83 81 01 00 */ lwz r28, 0x100(r1) /* 80277564 002744C4 7C 08 03 A6 */ mtlr r0 /* 80277568 002744C8 38 21 01 10 */ addi r1, r1, 0x110 -/* 8027756C 002744CC 4E 80 00 20 */ blr +/* 8027756C 002744CC 4E 80 00 20 */ blr .global sub_80277570 sub_80277570: @@ -7826,7 +7826,7 @@ sub_80277570: /* 80277604 00274564 81 83 00 00 */ lwz r12, 0(r3) /* 80277608 00274568 81 8C 00 18 */ lwz r12, 0x18(r12) /* 8027760C 0027456C 7D 89 03 A6 */ mtctr r12 -/* 80277610 00274570 4E 80 04 21 */ bctrl +/* 80277610 00274570 4E 80 04 21 */ bctrl /* 80277614 00274574 83 FD 0C 54 */ lwz r31, 0xc54(r29) /* 80277618 00274578 38 61 01 14 */ addi r3, r1, 0x114 /* 8027761C 0027457C 38 81 01 A4 */ addi r4, r1, 0x1a4 @@ -7836,13 +7836,13 @@ sub_80277570: /* 8027762C 0027458C 81 9F 00 00 */ lwz r12, 0(r31) /* 80277630 00274590 81 8C 00 14 */ lwz r12, 0x14(r12) /* 80277634 00274594 7D 89 03 A6 */ mtctr r12 -/* 80277638 00274598 4E 80 04 21 */ bctrl +/* 80277638 00274598 4E 80 04 21 */ bctrl /* 8027763C 0027459C 80 7D 0C 54 */ lwz r3, 0xc54(r29) /* 80277640 002745A0 FC 20 F8 90 */ fmr f1, f31 /* 80277644 002745A4 81 83 00 00 */ lwz r12, 0(r3) /* 80277648 002745A8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8027764C 002745AC 7D 89 03 A6 */ mtctr r12 -/* 80277650 002745B0 4E 80 04 21 */ bctrl +/* 80277650 002745B0 4E 80 04 21 */ bctrl /* 80277654 002745B4 80 1D 0C 58 */ lwz r0, 0xc58(r29) /* 80277658 002745B8 2C 00 00 00 */ cmpwi r0, 0 /* 8027765C 002745BC 41 80 02 2C */ blt lbl_80277888 @@ -7987,7 +7987,7 @@ lbl_80277868: /* 80277878 002747D8 38 81 01 74 */ addi r4, r1, 0x174 /* 8027787C 002747DC 81 8C 00 70 */ lwz r12, 0x70(r12) /* 80277880 002747E0 7D 89 03 A6 */ mtctr r12 -/* 80277884 002747E4 4E 80 04 21 */ bctrl +/* 80277884 002747E4 4E 80 04 21 */ bctrl lbl_80277888: /* 80277888 002747E8 E3 E1 02 28 */ psq_l f31, 552(r1), 0, qr0 /* 8027788C 002747EC CB E1 02 20 */ lfd f31, 0x220(r1) @@ -8003,7 +8003,7 @@ lbl_80277888: /* 802778B4 00274814 83 A1 01 E4 */ lwz r29, 0x1e4(r1) /* 802778B8 00274818 7C 08 03 A6 */ mtlr r0 /* 802778BC 0027481C 38 21 02 30 */ addi r1, r1, 0x230 -/* 802778C0 00274820 4E 80 00 20 */ blr +/* 802778C0 00274820 4E 80 00 20 */ blr .global sub_802778c4 sub_802778c4: @@ -8085,7 +8085,7 @@ lbl_80277988: /* 802779EC 0027494C C3 C4 00 50 */ lfs f30, 0x50(r4) /* 802779F0 00274950 C3 E4 00 40 */ lfs f31, 0x40(r4) /* 802779F4 00274954 7D 89 03 A6 */ mtctr r12 -/* 802779F8 00274958 4E 80 04 21 */ bctrl +/* 802779F8 00274958 4E 80 04 21 */ bctrl /* 802779FC 0027495C C0 01 00 14 */ lfs f0, 0x14(r1) /* 80277A00 00274960 3C 60 80 47 */ lis r3, lbl_8046E0C0@ha /* 80277A04 00274964 C0 21 00 0C */ lfs f1, 0xc(r1) @@ -8184,7 +8184,7 @@ lbl_80277B40: /* 80277B64 00274AC4 80 01 09 04 */ lwz r0, 0x904(r1) /* 80277B68 00274AC8 7C 08 03 A6 */ mtlr r0 /* 80277B6C 00274ACC 38 21 09 00 */ addi r1, r1, 0x900 -/* 80277B70 00274AD0 4E 80 00 20 */ blr +/* 80277B70 00274AD0 4E 80 00 20 */ blr .global sub_80277b74 sub_80277b74: @@ -8226,7 +8226,7 @@ lbl_80277BD8: /* 80277BF4 00274B54 83 81 00 10 */ lwz r28, 0x10(r1) /* 80277BF8 00274B58 7C 08 03 A6 */ mtlr r0 /* 80277BFC 00274B5C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80277C00 00274B60 4E 80 00 20 */ blr +/* 80277C00 00274B60 4E 80 00 20 */ blr .global sub_80277c04 sub_80277c04: @@ -8241,7 +8241,7 @@ sub_80277c04: /* 80277C24 00274B84 81 83 00 00 */ lwz r12, 0(r3) /* 80277C28 00274B88 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80277C2C 00274B8C 7D 89 03 A6 */ mtctr r12 -/* 80277C30 00274B90 4E 80 04 21 */ bctrl +/* 80277C30 00274B90 4E 80 04 21 */ bctrl /* 80277C34 00274B94 80 74 00 64 */ lwz r3, 0x64(r20) /* 80277C38 00274B98 38 81 00 50 */ addi r4, r1, 0x50 /* 80277C3C 00274B9C C0 03 00 00 */ lfs f0, 0(r3) @@ -8254,7 +8254,7 @@ sub_80277c04: /* 80277C58 00274BB8 81 83 00 00 */ lwz r12, 0(r3) /* 80277C5C 00274BBC 81 8C 00 24 */ lwz r12, 0x24(r12) /* 80277C60 00274BC0 7D 89 03 A6 */ mtctr r12 -/* 80277C64 00274BC4 4E 80 04 21 */ bctrl +/* 80277C64 00274BC4 4E 80 04 21 */ bctrl /* 80277C68 00274BC8 3C 60 80 3D */ lis r3, lbl_803D5618@ha /* 80277C6C 00274BCC 3B 74 0B 28 */ addi r27, r20, 0xb28 /* 80277C70 00274BD0 3B 54 0A 84 */ addi r26, r20, 0xa84 @@ -8373,7 +8373,7 @@ lbl_80277E10: /* 80277E20 00274D80 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 80277E24 00274D84 7C 08 03 A6 */ mtlr r0 /* 80277E28 00274D88 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 80277E2C 00274D8C 4E 80 00 20 */ blr +/* 80277E2C 00274D8C 4E 80 00 20 */ blr .global sub_80277e30 sub_80277e30: @@ -8453,7 +8453,7 @@ sub_80277e30: /* 80277F54 00274EB4 81 9F 00 00 */ lwz r12, 0(r31) /* 80277F58 00274EB8 81 8C 00 40 */ lwz r12, 0x40(r12) /* 80277F5C 00274EBC 7D 89 03 A6 */ mtctr r12 -/* 80277F60 00274EC0 4E 80 04 21 */ bctrl +/* 80277F60 00274EC0 4E 80 04 21 */ bctrl /* 80277F64 00274EC4 38 61 00 AC */ addi r3, r1, 0xac /* 80277F68 00274EC8 38 81 00 C8 */ addi r4, r1, 0xc8 /* 80277F6C 00274ECC 48 0B FC 19 */ bl DoBoundsOverlap__6CAABoxCFRC6CAABox @@ -8491,7 +8491,7 @@ sub_80277e30: /* 80277FEC 00274F4C B0 01 00 18 */ sth r0, 0x18(r1) /* 80277FF0 00274F50 81 8C 02 B0 */ lwz r12, 0x2b0(r12) /* 80277FF4 00274F54 7D 89 03 A6 */ mtctr r12 -/* 80277FF8 00274F58 4E 80 04 21 */ bctrl +/* 80277FF8 00274F58 4E 80 04 21 */ bctrl /* 80277FFC 00274F5C 3C 80 80 5A */ lis r4, skZero3f@ha /* 80278000 00274F60 7F C3 F3 78 */ mr r3, r30 /* 80278004 00274F64 39 24 66 A0 */ addi r9, r4, skZero3f@l @@ -8510,7 +8510,7 @@ lbl_80278028: /* 80278034 00274F94 83 A1 00 E4 */ lwz r29, 0xe4(r1) /* 80278038 00274F98 7C 08 03 A6 */ mtlr r0 /* 8027803C 00274F9C 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 80278040 00274FA0 4E 80 00 20 */ blr +/* 80278040 00274FA0 4E 80 00 20 */ blr .global sub_80278044 sub_80278044: @@ -8576,7 +8576,7 @@ lbl_80278118: /* 80278120 00275080 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80278124 00275084 7C 08 03 A6 */ mtlr r0 /* 80278128 00275088 38 21 00 30 */ addi r1, r1, 0x30 -/* 8027812C 0027508C 4E 80 00 20 */ blr +/* 8027812C 0027508C 4E 80 00 20 */ blr .global sub_80278130 sub_80278130: @@ -8590,7 +8590,7 @@ sub_80278130: /* 8027814C 002750AC 90 03 08 E0 */ stw r0, 0x8e0(r3) /* 80278150 002750B0 80 03 08 D8 */ lwz r0, 0x8d8(r3) /* 80278154 002750B4 90 03 08 DC */ stw r0, 0x8dc(r3) -/* 80278158 002750B8 4E 80 00 20 */ blr +/* 80278158 002750B8 4E 80 00 20 */ blr .global sub_8027815c sub_8027815c: @@ -8670,7 +8670,7 @@ lbl_80278268: /* 8027826C 002751CC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80278270 002751D0 7C 08 03 A6 */ mtlr r0 /* 80278274 002751D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80278278 002751D8 4E 80 00 20 */ blr +/* 80278278 002751D8 4E 80 00 20 */ blr .global sub_8027827c sub_8027827c: @@ -8717,7 +8717,7 @@ sub_8027827c: /* 8027831C 0027527C 81 9F 00 00 */ lwz r12, 0(r31) /* 80278320 00275280 81 8C 00 38 */ lwz r12, 0x38(r12) /* 80278324 00275284 7D 89 03 A6 */ mtctr r12 -/* 80278328 00275288 4E 80 04 21 */ bctrl +/* 80278328 00275288 4E 80 04 21 */ bctrl /* 8027832C 0027528C 38 9E 01 2C */ addi r4, r30, 0x12c /* 80278330 00275290 38 A0 00 00 */ li r5, 0 /* 80278334 00275294 4B E8 A3 D5 */ bl WeaponHurts__20CDamageVulnerabilityCFRC11CWeaponMode @@ -8746,7 +8746,7 @@ sub_8027827c: /* 80278390 002752F0 7F A4 EB 78 */ mr r4, r29 /* 80278394 002752F4 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80278398 002752F8 7D 89 03 A6 */ mtctr r12 -/* 8027839C 002752FC 4E 80 04 21 */ bctrl +/* 8027839C 002752FC 4E 80 04 21 */ bctrl /* 802783A0 00275300 28 03 00 00 */ cmplwi r3, 0 /* 802783A4 00275304 41 82 00 1C */ beq lbl_802783C0 /* 802783A8 00275308 C0 43 00 00 */ lfs f2, 0(r3) @@ -8836,13 +8836,13 @@ lbl_80278438: /* 802784E4 00275444 81 9C 00 00 */ lwz r12, 0(r28) /* 802784E8 00275448 81 8C 02 90 */ lwz r12, 0x290(r12) /* 802784EC 0027544C 7D 89 03 A6 */ mtctr r12 -/* 802784F0 00275450 4E 80 04 21 */ bctrl +/* 802784F0 00275450 4E 80 04 21 */ bctrl lbl_802784F4: /* 802784F4 00275454 BB 61 00 7C */ lmw r27, 0x7c(r1) /* 802784F8 00275458 80 01 00 94 */ lwz r0, 0x94(r1) /* 802784FC 0027545C 7C 08 03 A6 */ mtlr r0 /* 80278500 00275460 38 21 00 90 */ addi r1, r1, 0x90 -/* 80278504 00275464 4E 80 00 20 */ blr +/* 80278504 00275464 4E 80 00 20 */ blr .global sub_80278508 sub_80278508: @@ -8973,7 +8973,7 @@ lbl_802786E8: /* 802786EC 0027564C 80 01 00 84 */ lwz r0, 0x84(r1) /* 802786F0 00275650 7C 08 03 A6 */ mtlr r0 /* 802786F4 00275654 38 21 00 80 */ addi r1, r1, 0x80 -/* 802786F8 00275658 4E 80 00 20 */ blr +/* 802786F8 00275658 4E 80 00 20 */ blr .global sub_802786fc sub_802786fc: @@ -9047,7 +9047,7 @@ lbl_802787C8: /* 802787F0 00275750 80 01 00 24 */ lwz r0, 0x24(r1) /* 802787F4 00275754 7C 08 03 A6 */ mtlr r0 /* 802787F8 00275758 38 21 00 20 */ addi r1, r1, 0x20 -/* 802787FC 0027575C 4E 80 00 20 */ blr +/* 802787FC 0027575C 4E 80 00 20 */ blr .global sub_80278800 sub_80278800: @@ -9102,7 +9102,7 @@ lbl_802788AC: /* 802788B8 00275818 83 A1 00 24 */ lwz r29, 0x24(r1) /* 802788BC 0027581C 7C 08 03 A6 */ mtlr r0 /* 802788C0 00275820 38 21 00 30 */ addi r1, r1, 0x30 -/* 802788C4 00275824 4E 80 00 20 */ blr +/* 802788C4 00275824 4E 80 00 20 */ blr .global sub_802788c8 sub_802788c8: @@ -9128,7 +9128,7 @@ sub_802788c8: /* 80278914 00275874 7F E4 FB 78 */ mr r4, r31 /* 80278918 00275878 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8027891C 0027587C 7D 89 03 A6 */ mtctr r12 -/* 80278920 00275880 4E 80 04 21 */ bctrl +/* 80278920 00275880 4E 80 04 21 */ bctrl /* 80278924 00275884 C0 1E 08 C0 */ lfs f0, 0x8c0(r30) /* 80278928 00275888 D0 03 00 00 */ stfs f0, 0(r3) /* 8027892C 0027588C C0 1E 08 C4 */ lfs f0, 0x8c4(r30) @@ -9139,7 +9139,7 @@ lbl_80278934: /* 8027893C 0027589C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80278940 002758A0 7C 08 03 A6 */ mtlr r0 /* 80278944 002758A4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80278948 002758A8 4E 80 00 20 */ blr +/* 80278948 002758A8 4E 80 00 20 */ blr .global sub_8027894c sub_8027894c: @@ -9171,7 +9171,7 @@ sub_8027894c: /* 802789B0 00275910 81 9F 00 00 */ lwz r12, 0(r31) /* 802789B4 00275914 81 8C 00 34 */ lwz r12, 0x34(r12) /* 802789B8 00275918 7D 89 03 A6 */ mtctr r12 -/* 802789BC 0027591C 4E 80 04 21 */ bctrl +/* 802789BC 0027591C 4E 80 04 21 */ bctrl /* 802789C0 00275920 C0 23 00 00 */ lfs f1, 0(r3) /* 802789C4 00275924 C0 02 BC 08 */ lfs f0, lbl_805AD928@sda21(r2) /* 802789C8 00275928 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -9226,7 +9226,7 @@ lbl_80278A64: /* 80278A80 002759E0 38 A5 54 34 */ addi r5, r5, lbl_803D5434@l /* 80278A84 002759E4 7F E5 04 2E */ lfsx f31, r5, r0 /* 80278A88 002759E8 7D 89 03 A6 */ mtctr r12 -/* 80278A8C 002759EC 4E 80 04 21 */ bctrl +/* 80278A8C 002759EC 4E 80 04 21 */ bctrl /* 80278A90 002759F0 D3 E3 00 00 */ stfs f31, 0(r3) /* 80278A94 002759F4 48 00 00 A0 */ b lbl_80278B34 lbl_80278A98: @@ -9250,7 +9250,7 @@ lbl_80278A98: /* 80278ADC 00275A3C 7F E5 04 2E */ lfsx f31, r5, r0 /* 80278AE0 00275A40 EF C1 00 32 */ fmuls f30, f1, f0 /* 80278AE4 00275A44 7D 89 03 A6 */ mtctr r12 -/* 80278AE8 00275A48 4E 80 04 21 */ bctrl +/* 80278AE8 00275A48 4E 80 04 21 */ bctrl /* 80278AEC 00275A4C C0 23 00 00 */ lfs f1, 0(r3) /* 80278AF0 00275A50 C0 0D 98 84 */ lfs f0, lbl_805A8444@sda21(r13) /* 80278AF4 00275A54 D0 21 00 0C */ stfs f1, 0xc(r1) @@ -9269,7 +9269,7 @@ lbl_80278B0C: /* 80278B20 00275A80 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80278B24 00275A84 EF C1 00 2A */ fadds f30, f1, f0 /* 80278B28 00275A88 7D 89 03 A6 */ mtctr r12 -/* 80278B2C 00275A8C 4E 80 04 21 */ bctrl +/* 80278B2C 00275A8C 4E 80 04 21 */ bctrl /* 80278B30 00275A90 D3 C3 00 00 */ stfs f30, 0(r3) lbl_80278B34: /* 80278B34 00275A94 E3 E1 00 58 */ psq_l f31, 88(r1), 0, qr0 @@ -9282,7 +9282,7 @@ lbl_80278B34: /* 80278B50 00275AB0 83 A1 00 34 */ lwz r29, 0x34(r1) /* 80278B54 00275AB4 7C 08 03 A6 */ mtlr r0 /* 80278B58 00275AB8 38 21 00 60 */ addi r1, r1, 0x60 -/* 80278B5C 00275ABC 4E 80 00 20 */ blr +/* 80278B5C 00275ABC 4E 80 00 20 */ blr .global sub_80278b60 sub_80278b60: @@ -9317,7 +9317,7 @@ lbl_80278BB8: /* 80278BC8 00275B28 80 01 00 34 */ lwz r0, 0x34(r1) /* 80278BCC 00275B2C 7C 08 03 A6 */ mtlr r0 /* 80278BD0 00275B30 38 21 00 30 */ addi r1, r1, 0x30 -/* 80278BD4 00275B34 4E 80 00 20 */ blr +/* 80278BD4 00275B34 4E 80 00 20 */ blr .global sub_80278bd8 sub_80278bd8: @@ -9383,7 +9383,7 @@ lbl_80278CA0: /* 80278CB8 00275C18 83 81 00 20 */ lwz r28, 0x20(r1) /* 80278CBC 00275C1C 7C 08 03 A6 */ mtlr r0 /* 80278CC0 00275C20 38 21 00 40 */ addi r1, r1, 0x40 -/* 80278CC4 00275C24 4E 80 00 20 */ blr +/* 80278CC4 00275C24 4E 80 00 20 */ blr .global sub_80278cc8 sub_80278cc8: @@ -9418,7 +9418,7 @@ sub_80278cc8: /* 80278D38 00275C98 B0 01 00 3C */ sth r0, 0x3c(r1) /* 80278D3C 00275C9C 81 8C 02 B0 */ lwz r12, 0x2b0(r12) /* 80278D40 00275CA0 7D 89 03 A6 */ mtctr r12 -/* 80278D44 00275CA4 4E 80 04 21 */ bctrl +/* 80278D44 00275CA4 4E 80 04 21 */ bctrl /* 80278D48 00275CA8 80 7E 08 4C */ lwz r3, 0x84c(r30) /* 80278D4C 00275CAC 3B E1 00 88 */ addi r31, r1, 0x88 /* 80278D50 00275CB0 A0 81 00 3C */ lhz r4, 0x3c(r1) @@ -9536,7 +9536,7 @@ lbl_80278EF8: /* 80278F04 00275E64 83 A1 00 B4 */ lwz r29, 0xb4(r1) /* 80278F08 00275E68 7C 08 03 A6 */ mtlr r0 /* 80278F0C 00275E6C 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 80278F10 00275E70 4E 80 00 20 */ blr +/* 80278F10 00275E70 4E 80 00 20 */ blr .global sub_80278f14 sub_80278f14: @@ -9613,7 +9613,7 @@ sub_80278f14: /* 8027902C 00275F8C 83 E1 00 6C */ lwz r31, 0x6c(r1) /* 80279030 00275F90 7C 08 03 A6 */ mtlr r0 /* 80279034 00275F94 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 80279038 00275F98 4E 80 00 20 */ blr +/* 80279038 00275F98 4E 80 00 20 */ blr .global sub_8027903c sub_8027903c: @@ -9656,7 +9656,7 @@ lbl_802790A8: /* 802790C4 00276024 80 01 00 74 */ lwz r0, 0x74(r1) /* 802790C8 00276028 7C 08 03 A6 */ mtlr r0 /* 802790CC 0027602C 38 21 00 70 */ addi r1, r1, 0x70 -/* 802790D0 00276030 4E 80 00 20 */ blr +/* 802790D0 00276030 4E 80 00 20 */ blr .global sub_802790d4 sub_802790d4: @@ -9677,7 +9677,7 @@ sub_802790d4: /* 8027910C 0027606C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80279110 00276070 7C 08 03 A6 */ mtlr r0 /* 80279114 00276074 38 21 00 10 */ addi r1, r1, 0x10 -/* 80279118 00276078 4E 80 00 20 */ blr +/* 80279118 00276078 4E 80 00 20 */ blr .global sub_8027911c sub_8027911c: @@ -9691,7 +9691,7 @@ lbl_80279134: /* 80279134 00276094 80 01 00 14 */ lwz r0, 0x14(r1) /* 80279138 00276098 7C 08 03 A6 */ mtlr r0 /* 8027913C 0027609C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80279140 002760A0 4E 80 00 20 */ blr +/* 80279140 002760A0 4E 80 00 20 */ blr .global sub_80279144 sub_80279144: @@ -9731,7 +9731,7 @@ lbl_802791C0: /* 802791C4 00276124 B0 03 00 34 */ sth r0, 0x34(r3) /* 802791C8 00276128 88 04 00 36 */ lbz r0, 0x36(r4) /* 802791CC 0027612C 98 03 00 36 */ stb r0, 0x36(r3) -/* 802791D0 00276130 4E 80 00 20 */ blr +/* 802791D0 00276130 4E 80 00 20 */ blr .global sub_802791d4 sub_802791d4: @@ -10000,7 +10000,7 @@ lbl_80279584: /* 802795C8 00276528 81 9D 00 00 */ lwz r12, 0(r29) /* 802795CC 0027652C 81 8C 00 38 */ lwz r12, 0x38(r12) /* 802795D0 00276530 7D 89 03 A6 */ mtctr r12 -/* 802795D4 00276534 4E 80 04 21 */ bctrl +/* 802795D4 00276534 4E 80 04 21 */ bctrl /* 802795D8 00276538 7C 64 1B 78 */ mr r4, r3 /* 802795DC 0027653C 7F 43 D3 78 */ mr r3, r26 /* 802795E0 00276540 4B F2 F5 B9 */ bl SetDamageVulnerability__15CCollisionActorFRC20CDamageVulnerability @@ -10089,7 +10089,7 @@ lbl_802795E8: /* 80279724 00276684 80 01 02 34 */ lwz r0, 0x234(r1) /* 80279728 00276688 7C 08 03 A6 */ mtlr r0 /* 8027972C 0027668C 38 21 02 30 */ addi r1, r1, 0x230 -/* 80279730 00276690 4E 80 00 20 */ blr +/* 80279730 00276690 4E 80 00 20 */ blr .global ProjectileInfo__16CMetroidPrimeExoFv ProjectileInfo__16CMetroidPrimeExoFv: @@ -10102,13 +10102,13 @@ ProjectileInfo__16CMetroidPrimeExoFv: /* 8027974C 002766AC 48 00 00 14 */ b lbl_80279760 lbl_80279750: /* 80279750 002766B0 38 63 0C 78 */ addi r3, r3, 0xc78 -/* 80279754 002766B4 4E 80 00 20 */ blr +/* 80279754 002766B4 4E 80 00 20 */ blr lbl_80279758: /* 80279758 002766B8 38 63 0D 74 */ addi r3, r3, 0xd74 -/* 8027975C 002766BC 4E 80 00 20 */ blr +/* 8027975C 002766BC 4E 80 00 20 */ blr lbl_80279760: /* 80279760 002766C0 38 60 00 00 */ li r3, 0 -/* 80279764 002766C4 4E 80 00 20 */ blr +/* 80279764 002766C4 4E 80 00 20 */ blr .global Think__16CMetroidPrimeExoFfR13CStateManager Think__16CMetroidPrimeExoFfR13CStateManager: @@ -10183,7 +10183,7 @@ lbl_80279868: /* 80279874 002767D4 83 C1 00 10 */ lwz r30, 0x10(r1) /* 80279878 002767D8 7C 08 03 A6 */ mtlr r0 /* 8027987C 002767DC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80279880 002767E0 4E 80 00 20 */ blr +/* 80279880 002767E0 4E 80 00 20 */ blr .global PreThink__16CMetroidPrimeExoFfR13CStateManager PreThink__16CMetroidPrimeExoFfR13CStateManager: @@ -10213,7 +10213,7 @@ PreThink__16CMetroidPrimeExoFfR13CStateManager: /* 802798E0 00276840 7F E4 FB 78 */ mr r4, r31 /* 802798E4 00276844 81 8C 00 34 */ lwz r12, 0x34(r12) /* 802798E8 00276848 7D 89 03 A6 */ mtctr r12 -/* 802798EC 0027684C 4E 80 04 21 */ bctrl +/* 802798EC 0027684C 4E 80 04 21 */ bctrl /* 802798F0 00276850 28 03 00 00 */ cmplwi r3, 0 /* 802798F4 00276854 41 82 00 0C */ beq lbl_80279900 /* 802798F8 00276858 C0 03 00 00 */ lfs f0, 0(r3) @@ -10224,7 +10224,7 @@ lbl_80279900: /* 80279908 00276868 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8027990C 0027686C 7C 08 03 A6 */ mtlr r0 /* 80279910 00276870 38 21 00 20 */ addi r1, r1, 0x20 -/* 80279914 00276874 4E 80 00 20 */ blr +/* 80279914 00276874 4E 80 00 20 */ blr .global DoUserAnimEvent__16CMetroidPrimeExoFR13CStateManagerRC13CInt32POINode14EUserEventType DoUserAnimEvent__16CMetroidPrimeExoFR13CStateManagerRC13CInt32POINode14EUserEventType: @@ -10353,7 +10353,7 @@ lbl_802799D8: /* 80279AEC 00276A4C 81 84 00 00 */ lwz r12, 0(r4) /* 80279AF0 00276A50 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80279AF4 00276A54 7D 89 03 A6 */ mtctr r12 -/* 80279AF8 00276A58 4E 80 04 21 */ bctrl +/* 80279AF8 00276A58 4E 80 04 21 */ bctrl /* 80279AFC 00276A5C 38 61 00 B0 */ addi r3, r1, 0xb0 /* 80279B00 00276A60 38 81 00 B8 */ addi r4, r1, 0xb8 /* 80279B04 00276A64 3A C0 00 01 */ li r22, 1 @@ -10370,7 +10370,7 @@ lbl_802799D8: /* 80279B30 00276A90 81 84 00 00 */ lwz r12, 0(r4) /* 80279B34 00276A94 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80279B38 00276A98 7D 89 03 A6 */ mtctr r12 -/* 80279B3C 00276A9C 4E 80 04 21 */ bctrl +/* 80279B3C 00276A9C 4E 80 04 21 */ bctrl /* 80279B40 00276AA0 38 61 00 C8 */ addi r3, r1, 0xc8 /* 80279B44 00276AA4 38 81 00 D0 */ addi r4, r1, 0xd0 /* 80279B48 00276AA8 3B 00 00 01 */ li r24, 1 @@ -10387,7 +10387,7 @@ lbl_802799D8: /* 80279B74 00276AD4 81 84 00 00 */ lwz r12, 0(r4) /* 80279B78 00276AD8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80279B7C 00276ADC 7D 89 03 A6 */ mtctr r12 -/* 80279B80 00276AE0 4E 80 04 21 */ bctrl +/* 80279B80 00276AE0 4E 80 04 21 */ bctrl /* 80279B84 00276AE4 38 61 00 E0 */ addi r3, r1, 0xe0 /* 80279B88 00276AE8 38 81 00 E8 */ addi r4, r1, 0xe8 /* 80279B8C 00276AEC 3B 40 00 01 */ li r26, 1 @@ -10596,13 +10596,13 @@ lbl_80279CF4: /* 80279E98 00276DF8 81 9F 00 00 */ lwz r12, 0(r31) /* 80279E9C 00276DFC 81 8C 02 C0 */ lwz r12, 0x2c0(r12) /* 80279EA0 00276E00 7D 89 03 A6 */ mtctr r12 -/* 80279EA4 00276E04 4E 80 04 21 */ bctrl +/* 80279EA4 00276E04 4E 80 04 21 */ bctrl /* 80279EA8 00276E08 7C 7B 1B 78 */ mr r27, r3 /* 80279EAC 00276E0C 7F E3 FB 78 */ mr r3, r31 /* 80279EB0 00276E10 81 9F 00 00 */ lwz r12, 0(r31) /* 80279EB4 00276E14 81 8C 02 C0 */ lwz r12, 0x2c0(r12) /* 80279EB8 00276E18 7D 89 03 A6 */ mtctr r12 -/* 80279EBC 00276E1C 4E 80 04 21 */ bctrl +/* 80279EBC 00276E1C 4E 80 04 21 */ bctrl /* 80279EC0 00276E20 38 01 00 98 */ addi r0, r1, 0x98 /* 80279EC4 00276E24 7C 65 1B 78 */ mr r5, r3 /* 80279EC8 00276E28 90 01 00 08 */ stw r0, 8(r1) @@ -10782,13 +10782,13 @@ lbl_80279FE0: /* 8027A170 002770D0 81 9F 00 00 */ lwz r12, 0(r31) /* 8027A174 002770D4 81 8C 02 C0 */ lwz r12, 0x2c0(r12) /* 8027A178 002770D8 7D 89 03 A6 */ mtctr r12 -/* 8027A17C 002770DC 4E 80 04 21 */ bctrl +/* 8027A17C 002770DC 4E 80 04 21 */ bctrl /* 8027A180 002770E0 7C 7B 1B 78 */ mr r27, r3 /* 8027A184 002770E4 7F E3 FB 78 */ mr r3, r31 /* 8027A188 002770E8 81 9F 00 00 */ lwz r12, 0(r31) /* 8027A18C 002770EC 81 8C 02 C0 */ lwz r12, 0x2c0(r12) /* 8027A190 002770F0 7D 89 03 A6 */ mtctr r12 -/* 8027A194 002770F4 4E 80 04 21 */ bctrl +/* 8027A194 002770F4 4E 80 04 21 */ bctrl /* 8027A198 002770F8 38 01 00 8C */ addi r0, r1, 0x8c /* 8027A19C 002770FC 3C 80 00 01 */ lis r4, 0x00008400@ha /* 8027A1A0 00277100 90 01 00 08 */ stw r0, 8(r1) @@ -11467,7 +11467,7 @@ lbl_8027ABB0: /* 8027ABC4 00277B24 81 83 00 00 */ lwz r12, 0(r3) /* 8027ABC8 00277B28 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8027ABCC 00277B2C 7D 89 03 A6 */ mtctr r12 -/* 8027ABD0 00277B30 4E 80 04 21 */ bctrl +/* 8027ABD0 00277B30 4E 80 04 21 */ bctrl /* 8027ABD4 00277B34 80 1F 05 70 */ lwz r0, 0x570(r31) /* 8027ABD8 00277B38 7F C3 F3 78 */ mr r3, r30 /* 8027ABDC 00277B3C 38 81 00 34 */ addi r4, r1, 0x34 @@ -11489,7 +11489,7 @@ lbl_8027ABB0: /* 8027AC1C 00277B7C 81 83 00 00 */ lwz r12, 0(r3) /* 8027AC20 00277B80 81 8C 00 30 */ lwz r12, 0x30(r12) /* 8027AC24 00277B84 7D 89 03 A6 */ mtctr r12 -/* 8027AC28 00277B88 4E 80 04 21 */ bctrl +/* 8027AC28 00277B88 4E 80 04 21 */ bctrl /* 8027AC2C 00277B8C 48 00 00 1C */ b lbl_8027AC48 lbl_8027AC30: /* 8027AC30 00277B90 80 7F 0C 54 */ lwz r3, 0xc54(r31) @@ -11497,7 +11497,7 @@ lbl_8027AC30: /* 8027AC38 00277B98 81 83 00 00 */ lwz r12, 0(r3) /* 8027AC3C 00277B9C 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8027AC40 00277BA0 7D 89 03 A6 */ mtctr r12 -/* 8027AC44 00277BA4 4E 80 04 21 */ bctrl +/* 8027AC44 00277BA4 4E 80 04 21 */ bctrl lbl_8027AC48: /* 8027AC48 00277BA8 57 40 06 3F */ clrlwi. r0, r26, 0x18 /* 8027AC4C 00277BAC 40 82 00 1C */ bne lbl_8027AC68 @@ -11520,7 +11520,7 @@ lbl_8027AC68: /* 8027AC8C 00277BEC 80 01 06 A4 */ lwz r0, 0x6a4(r1) /* 8027AC90 00277BF0 7C 08 03 A6 */ mtlr r0 /* 8027AC94 00277BF4 38 21 06 A0 */ addi r1, r1, 0x6a0 -/* 8027AC98 00277BF8 4E 80 00 20 */ blr +/* 8027AC98 00277BF8 4E 80 00 20 */ blr .global AcceptScriptMsg__16CMetroidPrimeExoF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__16CMetroidPrimeExoF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -11540,7 +11540,7 @@ AcceptScriptMsg__16CMetroidPrimeExoF20EScriptObjectMessage9TUniqueIdR13CStateMan /* 8027ACD0 00277C30 38 84 B0 20 */ addi r4, r4, lbl_803EB020@l /* 8027ACD4 00277C34 7C 04 00 2E */ lwzx r0, r4, r0 /* 8027ACD8 00277C38 7C 09 03 A6 */ mtctr r0 -/* 8027ACDC 00277C3C 4E 80 04 20 */ bctr +/* 8027ACDC 00277C3C 4E 80 04 20 */ bctr .global lbl_8027ACE0 lbl_8027ACE0: /* 8027ACE0 00277C40 80 7B 05 6C */ lwz r3, 0x56c(r27) @@ -11625,7 +11625,7 @@ lbl_8027ADF0: /* 8027AE00 00277D60 38 80 00 00 */ li r4, 0 /* 8027AE04 00277D64 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8027AE08 00277D68 7D 89 03 A6 */ mtctr r12 -/* 8027AE0C 00277D6C 4E 80 04 21 */ bctrl +/* 8027AE0C 00277D6C 4E 80 04 21 */ bctrl /* 8027AE10 00277D70 48 00 00 90 */ b lbl_8027AEA0 .global lbl_8027AE14 lbl_8027AE14: @@ -11688,7 +11688,7 @@ lbl_8027AEC4: /* 8027AEC8 00277E28 80 01 00 34 */ lwz r0, 0x34(r1) /* 8027AECC 00277E2C 7C 08 03 A6 */ mtlr r0 /* 8027AED0 00277E30 38 21 00 30 */ addi r1, r1, 0x30 -/* 8027AED4 00277E34 4E 80 00 20 */ blr +/* 8027AED4 00277E34 4E 80 00 20 */ blr .global Accept__16CMetroidPrimeExoFR8IVisitor Accept__16CMetroidPrimeExoFR8IVisitor: @@ -11701,11 +11701,11 @@ Accept__16CMetroidPrimeExoFR8IVisitor: /* 8027AEF0 00277E50 7C 04 03 78 */ mr r4, r0 /* 8027AEF4 00277E54 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 8027AEF8 00277E58 7D 89 03 A6 */ mtctr r12 -/* 8027AEFC 00277E5C 4E 80 04 21 */ bctrl +/* 8027AEFC 00277E5C 4E 80 04 21 */ bctrl /* 8027AF00 00277E60 80 01 00 14 */ lwz r0, 0x14(r1) /* 8027AF04 00277E64 7C 08 03 A6 */ mtlr r0 /* 8027AF08 00277E68 38 21 00 10 */ addi r1, r1, 0x10 -/* 8027AF0C 00277E6C 4E 80 00 20 */ blr +/* 8027AF0C 00277E6C 4E 80 00 20 */ blr .global __ct__16CMetroidPrimeExo __ct__16CMetroidPrimeExo: @@ -11995,7 +11995,7 @@ lbl_8027B338: /* 8027B360 002782C0 81 84 00 00 */ lwz r12, 0(r4) /* 8027B364 002782C4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8027B368 002782C8 7D 89 03 A6 */ mtctr r12 -/* 8027B36C 002782CC 4E 80 04 21 */ bctrl +/* 8027B36C 002782CC 4E 80 04 21 */ bctrl /* 8027B370 002782D0 38 70 0C 48 */ addi r3, r16, 0xc48 /* 8027B374 002782D4 38 81 01 04 */ addi r4, r1, 0x104 /* 8027B378 002782D8 48 0C 5B 31 */ bl __ct__6CTokenFRC6CToken @@ -12122,14 +12122,14 @@ lbl_8027B3FC: /* 8027B554 002784B4 38 84 02 39 */ addi r4, r4, 0x239 /* 8027B558 002784B8 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 8027B55C 002784BC 7D 89 03 A6 */ mtctr r12 -/* 8027B560 002784C0 4E 80 04 21 */ bctrl +/* 8027B560 002784C0 4E 80 04 21 */ bctrl /* 8027B564 002784C4 80 8D A0 64 */ lwz r4, gpSimplePool@sda21(r13) /* 8027B568 002784C8 7C 65 1B 78 */ mr r5, r3 /* 8027B56C 002784CC 38 61 00 F4 */ addi r3, r1, 0xf4 /* 8027B570 002784D0 81 84 00 00 */ lwz r12, 0(r4) /* 8027B574 002784D4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8027B578 002784D8 7D 89 03 A6 */ mtctr r12 -/* 8027B57C 002784DC 4E 80 04 21 */ bctrl +/* 8027B57C 002784DC 4E 80 04 21 */ bctrl /* 8027B580 002784E0 38 70 0F A4 */ addi r3, r16, 0xfa4 /* 8027B584 002784E4 38 81 00 F4 */ addi r4, r1, 0xf4 /* 8027B588 002784E8 48 0C 59 21 */ bl __ct__6CTokenFRC6CToken @@ -12186,7 +12186,7 @@ lbl_8027B604: /* 8027B64C 002785AC 81 84 00 00 */ lwz r12, 0(r4) /* 8027B650 002785B0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8027B654 002785B4 7D 89 03 A6 */ mtctr r12 -/* 8027B658 002785B8 4E 80 04 21 */ bctrl +/* 8027B658 002785B8 4E 80 04 21 */ bctrl /* 8027B65C 002785BC 38 70 10 14 */ addi r3, r16, 0x1014 /* 8027B660 002785C0 38 81 00 DC */ addi r4, r1, 0xdc /* 8027B664 002785C4 48 0C 58 45 */ bl __ct__6CTokenFRC6CToken @@ -12204,7 +12204,7 @@ lbl_8027B604: /* 8027B694 002785F4 81 84 00 00 */ lwz r12, 0(r4) /* 8027B698 002785F8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8027B69C 002785FC 7D 89 03 A6 */ mtctr r12 -/* 8027B6A0 00278600 4E 80 04 21 */ bctrl +/* 8027B6A0 00278600 4E 80 04 21 */ bctrl /* 8027B6A4 00278604 38 70 10 1C */ addi r3, r16, 0x101c /* 8027B6A8 00278608 38 81 00 CC */ addi r4, r1, 0xcc /* 8027B6AC 0027860C 48 0C 57 FD */ bl __ct__6CTokenFRC6CToken @@ -12447,7 +12447,7 @@ lbl_8027B9E0: /* 8027BA40 002789A0 81 84 00 00 */ lwz r12, 0(r4) /* 8027BA44 002789A4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8027BA48 002789A8 7D 89 03 A6 */ mtctr r12 -/* 8027BA4C 002789AC 4E 80 04 21 */ bctrl +/* 8027BA4C 002789AC 4E 80 04 21 */ bctrl /* 8027BA50 002789B0 38 61 00 AC */ addi r3, r1, 0xac /* 8027BA54 002789B4 38 81 00 B4 */ addi r4, r1, 0xb4 /* 8027BA58 002789B8 48 0C 54 51 */ bl __ct__6CTokenFRC6CToken @@ -12479,7 +12479,7 @@ lbl_8027BA7C: /* 8027BABC 00278A1C 81 84 00 00 */ lwz r12, 0(r4) /* 8027BAC0 00278A20 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8027BAC4 00278A24 7D 89 03 A6 */ mtctr r12 -/* 8027BAC8 00278A28 4E 80 04 21 */ bctrl +/* 8027BAC8 00278A28 4E 80 04 21 */ bctrl /* 8027BACC 00278A2C 38 61 00 94 */ addi r3, r1, 0x94 /* 8027BAD0 00278A30 38 81 00 9C */ addi r4, r1, 0x9c /* 8027BAD4 00278A34 48 0C 53 D5 */ bl __ct__6CTokenFRC6CToken @@ -12511,7 +12511,7 @@ lbl_8027BAF8: /* 8027BB38 00278A98 81 84 00 00 */ lwz r12, 0(r4) /* 8027BB3C 00278A9C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8027BB40 00278AA0 7D 89 03 A6 */ mtctr r12 -/* 8027BB44 00278AA4 4E 80 04 21 */ bctrl +/* 8027BB44 00278AA4 4E 80 04 21 */ bctrl /* 8027BB48 00278AA8 38 61 00 7C */ addi r3, r1, 0x7c /* 8027BB4C 00278AAC 38 81 00 84 */ addi r4, r1, 0x84 /* 8027BB50 00278AB0 48 0C 53 59 */ bl __ct__6CTokenFRC6CToken @@ -12543,7 +12543,7 @@ lbl_8027BB74: /* 8027BBB4 00278B14 81 84 00 00 */ lwz r12, 0(r4) /* 8027BBB8 00278B18 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8027BBBC 00278B1C 7D 89 03 A6 */ mtctr r12 -/* 8027BBC0 00278B20 4E 80 04 21 */ bctrl +/* 8027BBC0 00278B20 4E 80 04 21 */ bctrl /* 8027BBC4 00278B24 38 61 00 64 */ addi r3, r1, 0x64 /* 8027BBC8 00278B28 38 81 00 6C */ addi r4, r1, 0x6c /* 8027BBCC 00278B2C 48 0C 52 DD */ bl __ct__6CTokenFRC6CToken @@ -12614,7 +12614,7 @@ lbl_8027BC9C: /* 8027BCC4 00278C24 38 80 00 01 */ li r4, 1 /* 8027BCC8 00278C28 81 8C 00 08 */ lwz r12, 8(r12) /* 8027BCCC 00278C2C 7D 89 03 A6 */ mtctr r12 -/* 8027BCD0 00278C30 4E 80 04 21 */ bctrl +/* 8027BCD0 00278C30 4E 80 04 21 */ bctrl lbl_8027BCD4: /* 8027BCD4 00278C34 7D E0 07 75 */ extsb. r0, r15 /* 8027BCD8 00278C38 41 82 00 10 */ beq lbl_8027BCE8 @@ -12671,7 +12671,7 @@ lbl_8027BD70: /* 8027BD98 00278CF8 38 80 00 01 */ li r4, 1 /* 8027BD9C 00278CFC 81 8C 00 08 */ lwz r12, 8(r12) /* 8027BDA0 00278D00 7D 89 03 A6 */ mtctr r12 -/* 8027BDA4 00278D04 4E 80 04 21 */ bctrl +/* 8027BDA4 00278D04 4E 80 04 21 */ bctrl lbl_8027BDA8: /* 8027BDA8 00278D08 7D E0 07 75 */ extsb. r0, r15 /* 8027BDAC 00278D0C 41 82 00 10 */ beq lbl_8027BDBC @@ -12727,7 +12727,7 @@ lbl_8027BE40: /* 8027BE68 00278DC8 38 80 00 01 */ li r4, 1 /* 8027BE6C 00278DCC 81 8C 00 08 */ lwz r12, 8(r12) /* 8027BE70 00278DD0 7D 89 03 A6 */ mtctr r12 -/* 8027BE74 00278DD4 4E 80 04 21 */ bctrl +/* 8027BE74 00278DD4 4E 80 04 21 */ bctrl lbl_8027BE78: /* 8027BE78 00278DD8 7D E0 07 75 */ extsb. r0, r15 /* 8027BE7C 00278DDC 41 82 00 10 */ beq lbl_8027BE8C @@ -12783,7 +12783,7 @@ lbl_8027BF10: /* 8027BF38 00278E98 38 80 00 01 */ li r4, 1 /* 8027BF3C 00278E9C 81 8C 00 08 */ lwz r12, 8(r12) /* 8027BF40 00278EA0 7D 89 03 A6 */ mtctr r12 -/* 8027BF44 00278EA4 4E 80 04 21 */ bctrl +/* 8027BF44 00278EA4 4E 80 04 21 */ bctrl lbl_8027BF48: /* 8027BF48 00278EA8 7D E0 07 75 */ extsb. r0, r15 /* 8027BF4C 00278EAC 41 82 00 10 */ beq lbl_8027BF5C @@ -12844,7 +12844,7 @@ lbl_8027C000: /* 8027C014 00278F74 80 01 01 C4 */ lwz r0, 0x1c4(r1) /* 8027C018 00278F78 7C 08 03 A6 */ mtlr r0 /* 8027C01C 00278F7C 38 21 01 C0 */ addi r1, r1, 0x1c0 -/* 8027C020 00278F80 4E 80 00 20 */ blr +/* 8027C020 00278F80 4E 80 00 20 */ blr .global sub_8027c024 sub_8027c024: @@ -12891,7 +12891,7 @@ lbl_8027C0C0: /* 8027C0C0 00279020 80 83 00 00 */ lwz r4, 0(r3) /* 8027C0C4 00279024 38 04 00 01 */ addi r0, r4, 1 /* 8027C0C8 00279028 90 03 00 00 */ stw r0, 0(r3) -/* 8027C0CC 0027902C 4E 80 00 20 */ blr +/* 8027C0CC 0027902C 4E 80 00 20 */ blr .global sub_8027c0d0 sub_8027c0d0: @@ -12904,11 +12904,11 @@ sub_8027c0d0: /* 8027C0E8 00279048 7C 04 03 78 */ mr r4, r0 /* 8027C0EC 0027904C 81 8C 00 50 */ lwz r12, 0x50(r12) /* 8027C0F0 00279050 7D 89 03 A6 */ mtctr r12 -/* 8027C0F4 00279054 4E 80 04 21 */ bctrl +/* 8027C0F4 00279054 4E 80 04 21 */ bctrl /* 8027C0F8 00279058 80 01 00 14 */ lwz r0, 0x14(r1) /* 8027C0FC 0027905C 7C 08 03 A6 */ mtlr r0 /* 8027C100 00279060 38 21 00 10 */ addi r1, r1, 0x10 -/* 8027C104 00279064 4E 80 00 20 */ blr +/* 8027C104 00279064 4E 80 00 20 */ blr .global sub_8027c108 sub_8027c108: @@ -12995,14 +12995,14 @@ lbl_8027C210: /* 8027C21C 0027917C 80 01 00 64 */ lwz r0, 0x64(r1) /* 8027C220 00279180 7C 08 03 A6 */ mtlr r0 /* 8027C224 00279184 38 21 00 60 */ addi r1, r1, 0x60 -/* 8027C228 00279188 4E 80 00 20 */ blr +/* 8027C228 00279188 4E 80 00 20 */ blr .global sub_8027c22c sub_8027c22c: /* 8027C22C 0027918C 54 80 10 3A */ slwi r0, r4, 2 /* 8027C230 00279190 7C 63 02 14 */ add r3, r3, r0 /* 8027C234 00279194 C0 23 00 04 */ lfs f1, 4(r3) -/* 8027C238 00279198 4E 80 00 20 */ blr +/* 8027C238 00279198 4E 80 00 20 */ blr .global __ct__18SPrimeExoRoomParmsFR12CInputStream __ct__18SPrimeExoRoomParmsFR12CInputStream: @@ -13061,7 +13061,7 @@ lbl_8027C2E0: /* 8027C2F0 00279250 80 01 00 54 */ lwz r0, 0x54(r1) /* 8027C2F4 00279254 7C 08 03 A6 */ mtlr r0 /* 8027C2F8 00279258 38 21 00 50 */ addi r1, r1, 0x50 -/* 8027C2FC 0027925C 4E 80 00 20 */ blr +/* 8027C2FC 0027925C 4E 80 00 20 */ blr .global __ct__13SPrimeStruct6FR12CInputStream __ct__13SPrimeStruct6FR12CInputStream: @@ -13093,7 +13093,7 @@ __ct__13SPrimeStruct6FR12CInputStream: /* 8027C364 002792C4 83 C1 00 08 */ lwz r30, 8(r1) /* 8027C368 002792C8 7C 08 03 A6 */ mtlr r0 /* 8027C36C 002792CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8027C370 002792D0 4E 80 00 20 */ blr +/* 8027C370 002792D0 4E 80 00 20 */ blr .global BuildCameraShakeData__FRC21SPrimeCameraShakeData BuildCameraShakeData__FRC21SPrimeCameraShakeData: @@ -13149,7 +13149,7 @@ lbl_8027C424: /* 8027C42C 0027938C 83 C1 00 C8 */ lwz r30, 0xc8(r1) /* 8027C430 00279390 7C 08 03 A6 */ mtlr r0 /* 8027C434 00279394 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 8027C438 00279398 4E 80 00 20 */ blr +/* 8027C438 00279398 4E 80 00 20 */ blr .global BuildCameraShakerComponent__FRC27SPrimeCameraShakerComponent BuildCameraShakerComponent__FRC27SPrimeCameraShakerComponent: @@ -13182,7 +13182,7 @@ BuildCameraShakerComponent__FRC27SPrimeCameraShakerComponent: /* 8027C4A4 00279404 83 A1 00 44 */ lwz r29, 0x44(r1) /* 8027C4A8 00279408 7C 08 03 A6 */ mtlr r0 /* 8027C4AC 0027940C 38 21 00 50 */ addi r1, r1, 0x50 -/* 8027C4B0 00279410 4E 80 00 20 */ blr +/* 8027C4B0 00279410 4E 80 00 20 */ blr .global BuildCameraShakePoint__FRC22SPrimeCameraShakePoint BuildCameraShakePoint__FRC22SPrimeCameraShakePoint: @@ -13199,7 +13199,7 @@ BuildCameraShakePoint__FRC22SPrimeCameraShakePoint: /* 8027C4DC 0027943C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8027C4E0 00279440 7C 08 03 A6 */ mtlr r0 /* 8027C4E4 00279444 38 21 00 10 */ addi r1, r1, 0x10 -/* 8027C4E8 00279448 4E 80 00 20 */ blr +/* 8027C4E8 00279448 4E 80 00 20 */ blr .global sub_8027c4ec sub_8027c4ec: @@ -13227,7 +13227,7 @@ lbl_8027C530: /* 8027C53C 0027949C 83 C1 00 08 */ lwz r30, 8(r1) /* 8027C540 002794A0 7C 08 03 A6 */ mtlr r0 /* 8027C544 002794A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8027C548 002794A8 4E 80 00 20 */ blr +/* 8027C548 002794A8 4E 80 00 20 */ blr .global __sinit_CMetroidPrimeExo_cpp __sinit_CMetroidPrimeExo_cpp: @@ -13262,4 +13262,4 @@ __sinit_CMetroidPrimeExo_cpp: /* 8027C5BC 0027951C 90 67 00 30 */ stw r3, 0x30(r7) /* 8027C5C0 00279520 90 07 00 34 */ stw r0, 0x34(r7) /* 8027C5C4 00279524 38 21 00 10 */ addi r1, r1, 0x10 -/* 8027C5C8 00279528 4E 80 00 20 */ blr +/* 8027C5C8 00279528 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/Enemies/CMetroidPrimeProjectile.s b/asm/MetroidPrime/Enemies/CMetroidPrimeProjectile.s index 3ec0ee62..3ef3f393 100644 --- a/asm/MetroidPrime/Enemies/CMetroidPrimeProjectile.s +++ b/asm/MetroidPrime/Enemies/CMetroidPrimeProjectile.s @@ -72,7 +72,7 @@ lbl_802A0398: /* 802A03A4 0029D304 83 C1 00 08 */ lwz r30, 8(r1) /* 802A03A8 0029D308 7C 08 03 A6 */ mtlr r0 /* 802A03AC 0029D30C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802A03B0 0029D310 4E 80 00 20 */ blr +/* 802A03B0 0029D310 4E 80 00 20 */ blr .global __ct__20SPrimeProjectileInfoFR12CInputStream __ct__20SPrimeProjectileInfoFR12CInputStream: @@ -98,7 +98,7 @@ __ct__20SPrimeProjectileInfoFR12CInputStream: /* 802A0400 0029D360 81 84 00 00 */ lwz r12, 0(r4) /* 802A0404 0029D364 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802A0408 0029D368 7D 89 03 A6 */ mtctr r12 -/* 802A040C 0029D36C 4E 80 04 21 */ bctrl +/* 802A040C 0029D36C 4E 80 04 21 */ bctrl /* 802A0410 0029D370 38 7E 00 04 */ addi r3, r30, 4 /* 802A0414 0029D374 38 81 00 08 */ addi r4, r1, 8 /* 802A0418 0029D378 48 0A 0A 91 */ bl __ct__6CTokenFRC6CToken @@ -146,7 +146,7 @@ __ct__20SPrimeProjectileInfoFR12CInputStream: /* 802A04C0 0029D420 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A04C4 0029D424 7C 08 03 A6 */ mtlr r0 /* 802A04C8 0029D428 38 21 00 20 */ addi r1, r1, 0x20 -/* 802A04CC 0029D42C 4E 80 00 20 */ blr +/* 802A04CC 0029D42C 4E 80 00 20 */ blr .global Explode__23CMetroidPrimeProjectileFRC9CVector3fRC9CVector3f29EWeaponCollisionResponseTypesR13CStateManagerRC20CDamageVulnerability9TUniqueId Explode__23CMetroidPrimeProjectileFRC9CVector3fRC9CVector3f29EWeaponCollisionResponseTypesR13CStateManagerRC20CDamageVulnerability9TUniqueId: @@ -262,7 +262,7 @@ lbl_802A0674: /* 802A067C 0029D5DC 80 01 01 44 */ lwz r0, 0x144(r1) /* 802A0680 0029D5E0 7C 08 03 A6 */ mtlr r0 /* 802A0684 0029D5E4 38 21 01 40 */ addi r1, r1, 0x140 -/* 802A0688 0029D5E8 4E 80 00 20 */ blr +/* 802A0688 0029D5E8 4E 80 00 20 */ blr .global Accept__23CMetroidPrimeProjectileFR8IVisitor Accept__23CMetroidPrimeProjectileFR8IVisitor: @@ -275,11 +275,11 @@ Accept__23CMetroidPrimeProjectileFR8IVisitor: /* 802A06A4 0029D604 7C 04 03 78 */ mr r4, r0 /* 802A06A8 0029D608 81 8C 00 20 */ lwz r12, 0x20(r12) /* 802A06AC 0029D60C 7D 89 03 A6 */ mtctr r12 -/* 802A06B0 0029D610 4E 80 04 21 */ bctrl +/* 802A06B0 0029D610 4E 80 04 21 */ bctrl /* 802A06B4 0029D614 80 01 00 14 */ lwz r0, 0x14(r1) /* 802A06B8 0029D618 7C 08 03 A6 */ mtlr r0 /* 802A06BC 0029D61C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802A06C0 0029D620 4E 80 00 20 */ blr +/* 802A06C0 0029D620 4E 80 00 20 */ blr .global "__ct__23CMetroidPrimeProjectileFbRC28TToken<18CWeaponDescription>11EWeaponTypeRC12CTransform4f14EMaterialTypesRC11CDamageInfo9TUniqueId7TAreaId9TUniqueIdUi9TUniqueIdUiRC9CVector3fRCQ24rstl50optional_object<31TLockedToken<15CGenDescription>>sb" "__ct__23CMetroidPrimeProjectileFbRC28TToken<18CWeaponDescription>11EWeaponTypeRC12CTransform4f14EMaterialTypesRC11CDamageInfo9TUniqueId7TAreaId9TUniqueIdUi9TUniqueIdUiRC9CVector3fRCQ24rstl50optional_object<31TLockedToken<15CGenDescription>>sb": diff --git a/asm/MetroidPrime/Enemies/CMetroidPrimeRelay.s b/asm/MetroidPrime/Enemies/CMetroidPrimeRelay.s index 009c4afb..91488cdc 100644 --- a/asm/MetroidPrime/Enemies/CMetroidPrimeRelay.s +++ b/asm/MetroidPrime/Enemies/CMetroidPrimeRelay.s @@ -91,7 +91,7 @@ lbl_80280548: /* 80280554 0027D4B4 83 C1 00 08 */ lwz r30, 8(r1) /* 80280558 0027D4B8 7C 08 03 A6 */ mtlr r0 /* 8028055C 0027D4BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80280560 0027D4C0 4E 80 00 20 */ blr +/* 80280560 0027D4C0 4E 80 00 20 */ blr .global GetOrBuildMetroidPrimeExo__18CMetroidPrimeRelayFR13CStateManager GetOrBuildMetroidPrimeExo__18CMetroidPrimeRelayFR13CStateManager: @@ -280,7 +280,7 @@ lbl_80280810: /* 80280814 0027D774 80 01 01 54 */ lwz r0, 0x154(r1) /* 80280818 0027D778 7C 08 03 A6 */ mtlr r0 /* 8028081C 0027D77C 38 21 01 50 */ addi r1, r1, 0x150 -/* 80280820 0027D780 4E 80 00 20 */ blr +/* 80280820 0027D780 4E 80 00 20 */ blr .global ForwardMessageToMetroidPrimeExo__18CMetroidPrimeRelayF20EScriptObjectMessageR13CStateManager ForwardMessageToMetroidPrimeExo__18CMetroidPrimeRelayF20EScriptObjectMessageR13CStateManager: @@ -323,7 +323,7 @@ lbl_802808A0: /* 802808AC 0027D80C 83 A1 00 24 */ lwz r29, 0x24(r1) /* 802808B0 0027D810 7C 08 03 A6 */ mtlr r0 /* 802808B4 0027D814 38 21 00 30 */ addi r1, r1, 0x30 -/* 802808B8 0027D818 4E 80 00 20 */ blr +/* 802808B8 0027D818 4E 80 00 20 */ blr .global AcceptScriptMsg__18CMetroidPrimeRelayF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__18CMetroidPrimeRelayF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -357,7 +357,7 @@ lbl_80280910: /* 8028091C 0027D87C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80280920 0027D880 7C 08 03 A6 */ mtlr r0 /* 80280924 0027D884 38 21 00 20 */ addi r1, r1, 0x20 -/* 80280928 0027D888 4E 80 00 20 */ blr +/* 80280928 0027D888 4E 80 00 20 */ blr .global Accept__18CMetroidPrimeRelay Accept__18CMetroidPrimeRelay: @@ -370,11 +370,11 @@ Accept__18CMetroidPrimeRelay: /* 80280944 0027D8A4 7C 04 03 78 */ mr r4, r0 /* 80280948 0027D8A8 81 8C 00 44 */ lwz r12, 0x44(r12) /* 8028094C 0027D8AC 7D 89 03 A6 */ mtctr r12 -/* 80280950 0027D8B0 4E 80 04 21 */ bctrl +/* 80280950 0027D8B0 4E 80 04 21 */ bctrl /* 80280954 0027D8B4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80280958 0027D8B8 7C 08 03 A6 */ mtlr r0 /* 8028095C 0027D8BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80280960 0027D8C0 4E 80 00 20 */ blr +/* 80280960 0027D8C0 4E 80 00 20 */ blr .global "__ct__18CMetroidPrimeRelayF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC16CActorParametersRC14CPatternedInfoRCQ24rstl47vector<10CModelData,Q24rstl17rmemory_allocator>RCQ24rstl47vector<10CModelData,Q24rstl17rmemory_allocator>RC11CEntityInfobRC12CTransform4fRC9CVector3fRC14SPrimeExoParmsibiRC11CHealthInfoRC11CHealthInfoiiiQ24rstl44reserved_vector<23SPrimeExoRoomParameters,4>" "__ct__18CMetroidPrimeRelayF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC16CActorParametersRC14CPatternedInfoRCQ24rstl47vector<10CModelData,Q24rstl17rmemory_allocator>RCQ24rstl47vector<10CModelData,Q24rstl17rmemory_allocator>RC11CEntityInfobRC12CTransform4fRC9CVector3fRC14SPrimeExoParmsibiRC11CHealthInfoRC11CHealthInfoiiiQ24rstl44reserved_vector<23SPrimeExoRoomParameters,4>": @@ -491,7 +491,7 @@ lbl_80280AE0: /* 80280B08 0027DA68 80 01 00 84 */ lwz r0, 0x84(r1) /* 80280B0C 0027DA6C 7C 08 03 A6 */ mtlr r0 /* 80280B10 0027DA70 38 21 00 80 */ addi r1, r1, 0x80 -/* 80280B14 0027DA74 4E 80 00 20 */ blr +/* 80280B14 0027DA74 4E 80 00 20 */ blr .global __ct__19SPrimeExoParametersFRC19SPrimeExoParameters __ct__19SPrimeExoParametersFRC19SPrimeExoParameters: @@ -732,7 +732,7 @@ lbl_80280EA8: /* 80280EB4 0027DE14 83 C1 00 08 */ lwz r30, 8(r1) /* 80280EB8 0027DE18 7C 08 03 A6 */ mtlr r0 /* 80280EBC 0027DE1C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80280EC0 0027DE20 4E 80 00 20 */ blr +/* 80280EC0 0027DE20 4E 80 00 20 */ blr .global sub_80280ec4 sub_80280ec4: @@ -752,7 +752,7 @@ sub_80280ec4: /* 80280EF8 0027DE58 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80280EFC 0027DE5C 7C 08 03 A6 */ mtlr r0 /* 80280F00 0027DE60 38 21 00 10 */ addi r1, r1, 0x10 -/* 80280F04 0027DE64 4E 80 00 20 */ blr +/* 80280F04 0027DE64 4E 80 00 20 */ blr .global sub_80280f08 sub_80280f08: @@ -786,7 +786,7 @@ lbl_80280F50: /* 80280F6C 0027DECC 83 81 00 10 */ lwz r28, 0x10(r1) /* 80280F70 0027DED0 7C 08 03 A6 */ mtlr r0 /* 80280F74 0027DED4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80280F78 0027DED8 4E 80 00 20 */ blr +/* 80280F78 0027DED8 4E 80 00 20 */ blr .global sub_80280f7c sub_80280f7c: @@ -800,7 +800,7 @@ lbl_80280F94: /* 80280F94 0027DEF4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80280F98 0027DEF8 7C 08 03 A6 */ mtlr r0 /* 80280F9C 0027DEFC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80280FA0 0027DF00 4E 80 00 20 */ blr +/* 80280FA0 0027DF00 4E 80 00 20 */ blr .global sub_80280fa4 sub_80280fa4: @@ -888,7 +888,7 @@ sub_80280fa4: /* 802810E8 0027E048 D0 03 00 A0 */ stfs f0, 0xa0(r3) /* 802810EC 0027E04C 88 04 00 A4 */ lbz r0, 0xa4(r4) /* 802810F0 0027E050 98 03 00 A4 */ stb r0, 0xa4(r3) -/* 802810F4 0027E054 4E 80 00 20 */ blr +/* 802810F4 0027E054 4E 80 00 20 */ blr .global LoadAndBuildPrimeCameraShakeData__FR12CInputStream LoadAndBuildPrimeCameraShakeData__FR12CInputStream: @@ -906,7 +906,7 @@ LoadAndBuildPrimeCameraShakeData__FR12CInputStream: /* 80281124 0027E084 83 E1 00 8C */ lwz r31, 0x8c(r1) /* 80281128 0027E088 7C 08 03 A6 */ mtlr r0 /* 8028112C 0027E08C 38 21 00 90 */ addi r1, r1, 0x90 -/* 80281130 0027E090 4E 80 00 20 */ blr +/* 80281130 0027E090 4E 80 00 20 */ blr .global LoadPrimeCameraShakeData__FR12CInputStream LoadPrimeCameraShakeData__FR12CInputStream: @@ -941,7 +941,7 @@ LoadPrimeCameraShakeData__FR12CInputStream: /* 802811A4 0027E104 83 C1 00 08 */ lwz r30, 8(r1) /* 802811A8 0027E108 7C 08 03 A6 */ mtlr r0 /* 802811AC 0027E10C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802811B0 0027E110 4E 80 00 20 */ blr +/* 802811B0 0027E110 4E 80 00 20 */ blr .global LoadPrimeCameraShakerComponent__FR12CInputStream LoadPrimeCameraShakerComponent__FR12CInputStream: @@ -985,7 +985,7 @@ LoadPrimeCameraShakerComponent__FR12CInputStream: /* 80281248 0027E1A8 83 C1 00 08 */ lwz r30, 8(r1) /* 8028124C 0027E1AC 7C 08 03 A6 */ mtlr r0 /* 80281250 0027E1B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80281254 0027E1B4 4E 80 00 20 */ blr +/* 80281254 0027E1B4 4E 80 00 20 */ blr .global LoadPrimeStruct6s__19SPrimeExoParametersFR12CInputStream LoadPrimeStruct6s__19SPrimeExoParametersFR12CInputStream: @@ -1183,7 +1183,7 @@ lbl_80281518: /* 80281530 0027E490 83 81 02 70 */ lwz r28, 0x270(r1) /* 80281534 0027E494 7C 08 03 A6 */ mtlr r0 /* 80281538 0027E498 38 21 02 80 */ addi r1, r1, 0x280 -/* 8028153C 0027E49C 4E 80 00 20 */ blr +/* 8028153C 0027E49C 4E 80 00 20 */ blr .global LoadPrimeStruct4s__19SPrimeExoParametersFR12CInputStream LoadPrimeStruct4s__19SPrimeExoParametersFR12CInputStream: @@ -1242,7 +1242,7 @@ lbl_802815E8: /* 802815FC 0027E55C 83 A1 03 64 */ lwz r29, 0x364(r1) /* 80281600 0027E560 7C 08 03 A6 */ mtlr r0 /* 80281604 0027E564 38 21 03 70 */ addi r1, r1, 0x370 -/* 80281608 0027E568 4E 80 00 20 */ blr +/* 80281608 0027E568 4E 80 00 20 */ blr .global sub_8028160c sub_8028160c: @@ -1263,7 +1263,7 @@ sub_8028160c: /* 80281644 0027E5A4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80281648 0027E5A8 7C 08 03 A6 */ mtlr r0 /* 8028164C 0027E5AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80281650 0027E5B0 4E 80 00 20 */ blr +/* 80281650 0027E5B0 4E 80 00 20 */ blr .global __ct__13SPrimeStruct4FR12CInputStream __ct__13SPrimeStruct4FR12CInputStream: @@ -1296,7 +1296,7 @@ __ct__13SPrimeStruct4FR12CInputStream: /* 802816BC 0027E61C 83 C1 00 08 */ lwz r30, 8(r1) /* 802816C0 0027E620 7C 08 03 A6 */ mtlr r0 /* 802816C4 0027E624 38 21 00 10 */ addi r1, r1, 0x10 -/* 802816C8 0027E628 4E 80 00 20 */ blr +/* 802816C8 0027E628 4E 80 00 20 */ blr .global __ct__13SPrimeStruct5FR12CInputStream __ct__13SPrimeStruct5FR12CInputStream: @@ -1340,7 +1340,7 @@ __ct__13SPrimeStruct5FR12CInputStream: /* 80281760 0027E6C0 83 C1 00 08 */ lwz r30, 8(r1) /* 80281764 0027E6C4 7C 08 03 A6 */ mtlr r0 /* 80281768 0027E6C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028176C 0027E6CC 4E 80 00 20 */ blr +/* 8028176C 0027E6CC 4E 80 00 20 */ blr .global sub_80281770 sub_80281770: @@ -1351,7 +1351,7 @@ sub_80281770: /* 80281780 0027E6E0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80281784 0027E6E4 7C 08 03 A6 */ mtlr r0 /* 80281788 0027E6E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028178C 0027E6EC 4E 80 00 20 */ blr +/* 8028178C 0027E6EC 4E 80 00 20 */ blr .global __ct__19SPrimeExoParametersFR12CInputStream __ct__19SPrimeExoParametersFR12CInputStream: @@ -1709,7 +1709,7 @@ lbl_80281C84: /* 80281C98 0027EBF8 80 01 0A 04 */ lwz r0, 0xa04(r1) /* 80281C9C 0027EBFC 7C 08 03 A6 */ mtlr r0 /* 80281CA0 0027EC00 38 21 0A 00 */ addi r1, r1, 0xa00 -/* 80281CA4 0027EC04 4E 80 00 20 */ blr +/* 80281CA4 0027EC04 4E 80 00 20 */ blr .global __ct__14SPrimeStruct2BFR12CInputStream __ct__14SPrimeStruct2BFR12CInputStream: diff --git a/asm/MetroidPrime/Enemies/CNewIntroBoss.s b/asm/MetroidPrime/Enemies/CNewIntroBoss.s index 57c92457..d13e22bf 100644 --- a/asm/MetroidPrime/Enemies/CNewIntroBoss.s +++ b/asm/MetroidPrime/Enemies/CNewIntroBoss.s @@ -256,7 +256,7 @@ lbl_80189E3C: /* 80189E48 00186DA8 83 C1 00 08 */ lwz r30, 8(r1) /* 80189E4C 00186DAC 7C 08 03 A6 */ mtlr r0 /* 80189E50 00186DB0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80189E54 00186DB4 4E 80 00 20 */ blr +/* 80189E54 00186DB4 4E 80 00 20 */ blr .global StopRumble__13CNewIntroBossFR13CStateManager StopRumble__13CNewIntroBossFR13CStateManager: @@ -278,7 +278,7 @@ lbl_80189E8C: /* 80189E90 00186DF0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80189E94 00186DF4 7C 08 03 A6 */ mtlr r0 /* 80189E98 00186DF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80189E9C 00186DFC 4E 80 00 20 */ blr +/* 80189E9C 00186DFC 4E 80 00 20 */ blr .global DeleteBeam__13CNewIntroBossFR13CStateManager DeleteBeam__13CNewIntroBossFR13CStateManager: @@ -333,7 +333,7 @@ lbl_80189F40: /* 80189F54 00186EB4 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80189F58 00186EB8 7C 08 03 A6 */ mtlr r0 /* 80189F5C 00186EBC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80189F60 00186EC0 4E 80 00 20 */ blr +/* 80189F60 00186EC0 4E 80 00 20 */ blr .global Accept__13CNewIntroBossFR8IVisitor Accept__13CNewIntroBossFR8IVisitor: @@ -346,11 +346,11 @@ Accept__13CNewIntroBossFR8IVisitor: /* 80189F7C 00186EDC 7C 04 03 78 */ mr r4, r0 /* 80189F80 00186EE0 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 80189F84 00186EE4 7D 89 03 A6 */ mtctr r12 -/* 80189F88 00186EE8 4E 80 04 21 */ bctrl +/* 80189F88 00186EE8 4E 80 04 21 */ bctrl /* 80189F8C 00186EEC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80189F90 00186EF0 7C 08 03 A6 */ mtlr r0 /* 80189F94 00186EF4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80189F98 00186EF8 4E 80 00 20 */ blr +/* 80189F98 00186EF8 4E 80 00 20 */ blr .global GetRenderBounds__13CNewIntroBossCFRC12CTransform4f GetRenderBounds__13CNewIntroBossCFRC12CTransform4f: @@ -383,7 +383,7 @@ GetRenderBounds__13CNewIntroBossCFRC12CTransform4f: /* 8018A004 00186F64 83 C1 00 38 */ lwz r30, 0x38(r1) /* 8018A008 00186F68 7C 08 03 A6 */ mtlr r0 /* 8018A00C 00186F6C 38 21 00 40 */ addi r1, r1, 0x40 -/* 8018A010 00186F70 4E 80 00 20 */ blr +/* 8018A010 00186F70 4E 80 00 20 */ blr .global AddToRenderer__13CNewIntroBossCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__13CNewIntroBossCFRC14CFrustumPlanesRC13CStateManager: @@ -395,7 +395,7 @@ AddToRenderer__13CNewIntroBossCFRC14CFrustumPlanesRC13CStateManager: /* 8018A028 00186F88 80 01 00 14 */ lwz r0, 0x14(r1) /* 8018A02C 00186F8C 7C 08 03 A6 */ mtlr r0 /* 8018A030 00186F90 38 21 00 10 */ addi r1, r1, 0x10 -/* 8018A034 00186F94 4E 80 00 20 */ blr +/* 8018A034 00186F94 4E 80 00 20 */ blr .global OnScanStateChange__13CNewIntroBossFQ26CActor10EScanStateR13CStateManager OnScanStateChange__13CNewIntroBossFQ26CActor10EScanStateR13CStateManager: @@ -451,7 +451,7 @@ lbl_8018A0E4: /* 8018A0F4 00187054 83 81 00 20 */ lwz r28, 0x20(r1) /* 8018A0F8 00187058 7C 08 03 A6 */ mtlr r0 /* 8018A0FC 0018705C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8018A100 00187060 4E 80 00 20 */ blr +/* 8018A100 00187060 4E 80 00 20 */ blr .global AcceptScriptMsg__13CNewIntroBossF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__13CNewIntroBossF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -1052,7 +1052,7 @@ lbl_8018A9E8: /* 8018AA0C 0018796C 81 9F 00 00 */ lwz r12, 0(r31) /* 8018AA10 00187970 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8018AA14 00187974 7D 89 03 A6 */ mtctr r12 -/* 8018AA18 00187978 4E 80 04 21 */ bctrl +/* 8018AA18 00187978 4E 80 04 21 */ bctrl /* 8018AA1C 0018797C C0 03 00 00 */ lfs f0, 0(r3) /* 8018AA20 00187980 3C 60 80 3D */ lis r3, lbl_803D07D4@ha /* 8018AA24 00187984 3B 63 07 D4 */ addi r27, r3, lbl_803D07D4@l @@ -1094,14 +1094,14 @@ lbl_8018AA34: /* 8018AAB0 00187A10 81 9F 00 00 */ lwz r12, 0(r31) /* 8018AAB4 00187A14 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8018AAB8 00187A18 7D 89 03 A6 */ mtctr r12 -/* 8018AABC 00187A1C 4E 80 04 21 */ bctrl +/* 8018AABC 00187A1C 4E 80 04 21 */ bctrl /* 8018AAC0 00187A20 7C 78 1B 78 */ mr r24, r3 /* 8018AAC4 00187A24 7F 43 D3 78 */ mr r3, r26 /* 8018AAC8 00187A28 81 9A 00 00 */ lwz r12, 0(r26) /* 8018AACC 00187A2C 7F C4 F3 78 */ mr r4, r30 /* 8018AAD0 00187A30 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8018AAD4 00187A34 7D 89 03 A6 */ mtctr r12 -/* 8018AAD8 00187A38 4E 80 04 21 */ bctrl +/* 8018AAD8 00187A38 4E 80 04 21 */ bctrl /* 8018AADC 00187A3C C0 18 00 00 */ lfs f0, 0(r24) /* 8018AAE0 00187A40 D0 03 00 00 */ stfs f0, 0(r3) /* 8018AAE4 00187A44 C0 18 00 04 */ lfs f0, 4(r24) @@ -1110,7 +1110,7 @@ lbl_8018AA34: /* 8018AAF0 00187A50 81 9F 00 00 */ lwz r12, 0(r31) /* 8018AAF4 00187A54 81 8C 00 38 */ lwz r12, 0x38(r12) /* 8018AAF8 00187A58 7D 89 03 A6 */ mtctr r12 -/* 8018AAFC 00187A5C 4E 80 04 21 */ bctrl +/* 8018AAFC 00187A5C 4E 80 04 21 */ bctrl /* 8018AB00 00187A60 7C 64 1B 78 */ mr r4, r3 /* 8018AB04 00187A64 7F 43 D3 78 */ mr r3, r26 /* 8018AB08 00187A68 48 01 E0 91 */ bl SetDamageVulnerability__15CCollisionActorFRC20CDamageVulnerability @@ -1142,14 +1142,14 @@ lbl_8018AB20: /* 8018AB6C 00187ACC 81 9F 00 00 */ lwz r12, 0(r31) /* 8018AB70 00187AD0 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8018AB74 00187AD4 7D 89 03 A6 */ mtctr r12 -/* 8018AB78 00187AD8 4E 80 04 21 */ bctrl +/* 8018AB78 00187AD8 4E 80 04 21 */ bctrl /* 8018AB7C 00187ADC 7C 78 1B 78 */ mr r24, r3 /* 8018AB80 00187AE0 7F 43 D3 78 */ mr r3, r26 /* 8018AB84 00187AE4 81 9A 00 00 */ lwz r12, 0(r26) /* 8018AB88 00187AE8 7F C4 F3 78 */ mr r4, r30 /* 8018AB8C 00187AEC 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8018AB90 00187AF0 7D 89 03 A6 */ mtctr r12 -/* 8018AB94 00187AF4 4E 80 04 21 */ bctrl +/* 8018AB94 00187AF4 4E 80 04 21 */ bctrl /* 8018AB98 00187AF8 C0 18 00 00 */ lfs f0, 0(r24) /* 8018AB9C 00187AFC 3C 80 80 57 */ lis r4, lbl_8056D578@ha /* 8018ABA0 00187B00 38 84 D5 78 */ addi r4, r4, lbl_8056D578@l @@ -1205,7 +1205,7 @@ lbl_8018AC40: /* 8018AC50 00187BB0 81 8C 00 90 */ lwz r12, 0x90(r12) /* 8018AC54 00187BB4 38 84 66 A0 */ addi r4, r4, skZero3f@l /* 8018AC58 00187BB8 7D 89 03 A6 */ mtctr r12 -/* 8018AC5C 00187BBC 4E 80 04 21 */ bctrl +/* 8018AC5C 00187BBC 4E 80 04 21 */ bctrl lbl_8018AC60: /* 8018AC60 00187BC0 88 BF 00 30 */ lbz r5, 0x30(r31) /* 8018AC64 00187BC4 7F E3 FB 78 */ mr r3, r31 @@ -1233,7 +1233,7 @@ lbl_8018ACB0: /* 8018ACB4 00187C14 80 01 04 04 */ lwz r0, 0x404(r1) /* 8018ACB8 00187C18 7C 08 03 A6 */ mtlr r0 /* 8018ACBC 00187C1C 38 21 04 00 */ addi r1, r1, 0x400 -/* 8018ACC0 00187C20 4E 80 00 20 */ blr +/* 8018ACC0 00187C20 4E 80 00 20 */ blr .global Generate__13CNewIntroBossFR13CStateManager9EStateMsgf Generate__13CNewIntroBossFR13CStateManager9EStateMsgf: @@ -1352,7 +1352,7 @@ lbl_8018AE60: /* 8018AE68 00187DC8 83 C1 00 28 */ lwz r30, 0x28(r1) /* 8018AE6C 00187DCC 7C 08 03 A6 */ mtlr r0 /* 8018AE70 00187DD0 38 21 00 30 */ addi r1, r1, 0x30 -/* 8018AE74 00187DD4 4E 80 00 20 */ blr +/* 8018AE74 00187DD4 4E 80 00 20 */ blr .global AIStage__13CNewIntroBossFR13CStateManagerf AIStage__13CNewIntroBossFR13CStateManagerf: @@ -1371,7 +1371,7 @@ AIStage__13CNewIntroBossFR13CStateManagerf: /* 8018AEA8 00187E08 80 01 00 14 */ lwz r0, 0x14(r1) /* 8018AEAC 00187E0C 7C 08 03 A6 */ mtlr r0 /* 8018AEB0 00187E10 38 21 00 10 */ addi r1, r1, 0x10 -/* 8018AEB4 00187E14 4E 80 00 20 */ blr +/* 8018AEB4 00187E14 4E 80 00 20 */ blr .global AnimOver__13CNewIntroBossFR13CStateManagerf AnimOver__13CNewIntroBossFR13CStateManagerf: @@ -1379,7 +1379,7 @@ AnimOver__13CNewIntroBossFR13CStateManagerf: /* 8018AEBC 00187E1C 20 00 00 03 */ subfic r0, r0, 3 /* 8018AEC0 00187E20 7C 00 00 34 */ cntlzw r0, r0 /* 8018AEC4 00187E24 54 03 D9 7E */ srwi r3, r0, 5 -/* 8018AEC8 00187E28 4E 80 00 20 */ blr +/* 8018AEC8 00187E28 4E 80 00 20 */ blr .global InAttackPosition__13CNewIntroBossFR13CStateManagerf InAttackPosition__13CNewIntroBossFR13CStateManagerf: @@ -1401,7 +1401,7 @@ InAttackPosition__13CNewIntroBossFR13CStateManagerf: /* 8018AF08 00187E68 C0 22 A3 C0 */ lfs f1, lbl_805AC0E0@sda21(r2) /* 8018AF0C 00187E6C 81 8C 01 E8 */ lwz r12, 0x1e8(r12) /* 8018AF10 00187E70 7D 89 03 A6 */ mtctr r12 -/* 8018AF14 00187E74 4E 80 04 21 */ bctrl +/* 8018AF14 00187E74 4E 80 04 21 */ bctrl /* 8018AF18 00187E78 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8018AF1C 00187E7C 40 82 00 0C */ bne lbl_8018AF28 /* 8018AF20 00187E80 38 60 00 01 */ li r3, 1 @@ -1412,7 +1412,7 @@ lbl_8018AF2C: /* 8018AF2C 00187E8C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8018AF30 00187E90 7C 08 03 A6 */ mtlr r0 /* 8018AF34 00187E94 38 21 00 10 */ addi r1, r1, 0x10 -/* 8018AF38 00187E98 4E 80 00 20 */ blr +/* 8018AF38 00187E98 4E 80 00 20 */ blr .global ShouldAttack__13CNewIntroBossFR13CStateManagerf ShouldAttack__13CNewIntroBossFR13CStateManagerf: @@ -1431,7 +1431,7 @@ ShouldAttack__13CNewIntroBossFR13CStateManagerf: /* 8018AF6C 00187ECC 81 83 00 00 */ lwz r12, 0(r3) /* 8018AF70 00187ED0 81 8C 01 E8 */ lwz r12, 0x1e8(r12) /* 8018AF74 00187ED4 7D 89 03 A6 */ mtctr r12 -/* 8018AF78 00187ED8 4E 80 04 21 */ bctrl +/* 8018AF78 00187ED8 4E 80 04 21 */ bctrl /* 8018AF7C 00187EDC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8018AF80 00187EE0 40 82 00 0C */ bne lbl_8018AF8C /* 8018AF84 00187EE4 38 60 00 01 */ li r3, 1 @@ -1442,7 +1442,7 @@ lbl_8018AF90: /* 8018AF90 00187EF0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8018AF94 00187EF4 7C 08 03 A6 */ mtlr r0 /* 8018AF98 00187EF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8018AF9C 00187EFC 4E 80 00 20 */ blr +/* 8018AF9C 00187EFC 4E 80 00 20 */ blr .global Attack__13CNewIntroBossFR13CStateManager9EStateMsgf Attack__13CNewIntroBossFR13CStateManager9EStateMsgf: @@ -1582,7 +1582,7 @@ lbl_8018B17C: /* 8018B184 001880E4 83 C1 00 28 */ lwz r30, 0x28(r1) /* 8018B188 001880E8 7C 08 03 A6 */ mtlr r0 /* 8018B18C 001880EC 38 21 00 30 */ addi r1, r1, 0x30 -/* 8018B190 001880F0 4E 80 00 20 */ blr +/* 8018B190 001880F0 4E 80 00 20 */ blr .global Patrol__13CNewIntroBossFR13CStateManager9EStateMsgf Patrol__13CNewIntroBossFR13CStateManager9EStateMsgf: @@ -1650,7 +1650,7 @@ lbl_8018B270: /* 8018B27C 001881DC C0 22 A3 C0 */ lfs f1, lbl_805AC0E0@sda21(r2) /* 8018B280 001881E0 81 8C 01 E8 */ lwz r12, 0x1e8(r12) /* 8018B284 001881E4 7D 89 03 A6 */ mtctr r12 -/* 8018B288 001881E8 4E 80 04 21 */ bctrl +/* 8018B288 001881E8 4E 80 04 21 */ bctrl /* 8018B28C 001881EC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8018B290 001881F0 41 82 00 94 */ beq lbl_8018B324 /* 8018B294 001881F4 38 00 00 00 */ li r0, 0 @@ -1697,7 +1697,7 @@ lbl_8018B324: /* 8018B334 00188294 83 C1 00 58 */ lwz r30, 0x58(r1) /* 8018B338 00188298 7C 08 03 A6 */ mtlr r0 /* 8018B33C 0018829C 38 21 00 70 */ addi r1, r1, 0x70 -/* 8018B340 001882A0 4E 80 00 20 */ blr +/* 8018B340 001882A0 4E 80 00 20 */ blr .global ShouldTurn__13CNewIntroBossFR13CStateManagerf ShouldTurn__13CNewIntroBossFR13CStateManagerf: @@ -1782,7 +1782,7 @@ ShouldTurn__13CNewIntroBossFR13CStateManagerf: /* 8018B47C 001883DC 83 E1 00 5C */ lwz r31, 0x5c(r1) /* 8018B480 001883E0 7C 08 03 A6 */ mtlr r0 /* 8018B484 001883E4 38 21 00 90 */ addi r1, r1, 0x90 -/* 8018B488 001883E8 4E 80 00 20 */ blr +/* 8018B488 001883E8 4E 80 00 20 */ blr .global Think__13CNewIntroBossFfR13CStateManager Think__13CNewIntroBossFfR13CStateManager: @@ -1972,7 +1972,7 @@ lbl_8018B620: /* 8018B750 001886B0 81 9F 00 00 */ lwz r12, 0(r31) /* 8018B754 001886B4 81 8C 00 70 */ lwz r12, 0x70(r12) /* 8018B758 001886B8 7D 89 03 A6 */ mtctr r12 -/* 8018B75C 001886BC 4E 80 04 21 */ bctrl +/* 8018B75C 001886BC 4E 80 04 21 */ bctrl /* 8018B760 001886C0 48 00 00 24 */ b lbl_8018B784 lbl_8018B764: /* 8018B764 001886C4 7F E3 FB 78 */ mr r3, r31 @@ -1982,7 +1982,7 @@ lbl_8018B764: /* 8018B774 001886D4 38 81 01 90 */ addi r4, r1, 0x190 /* 8018B778 001886D8 81 8C 00 70 */ lwz r12, 0x70(r12) /* 8018B77C 001886DC 7D 89 03 A6 */ mtctr r12 -/* 8018B780 001886E0 4E 80 04 21 */ bctrl +/* 8018B780 001886E0 4E 80 04 21 */ bctrl lbl_8018B784: /* 8018B784 001886E4 A0 1D 06 00 */ lhz r0, 0x600(r29) /* 8018B788 001886E8 7F C3 F3 78 */ mr r3, r30 @@ -2011,14 +2011,14 @@ lbl_8018B784: /* 8018B7E4 00188744 81 9A 00 00 */ lwz r12, 0(r26) /* 8018B7E8 00188748 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8018B7EC 0018874C 7D 89 03 A6 */ mtctr r12 -/* 8018B7F0 00188750 4E 80 04 21 */ bctrl +/* 8018B7F0 00188750 4E 80 04 21 */ bctrl /* 8018B7F4 00188754 C3 E3 00 00 */ lfs f31, 0(r3) /* 8018B7F8 00188758 7F 63 DB 78 */ mr r3, r27 /* 8018B7FC 0018875C 81 9B 00 00 */ lwz r12, 0(r27) /* 8018B800 00188760 7F C4 F3 78 */ mr r4, r30 /* 8018B804 00188764 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8018B808 00188768 7D 89 03 A6 */ mtctr r12 -/* 8018B80C 0018876C 4E 80 04 21 */ bctrl +/* 8018B80C 0018876C 4E 80 04 21 */ bctrl /* 8018B810 00188770 C0 03 00 00 */ lfs f0, 0(r3) /* 8018B814 00188774 FC 00 F8 40 */ fcmpo cr0, f0, f31 /* 8018B818 00188778 40 80 00 90 */ bge lbl_8018B8A8 @@ -2027,14 +2027,14 @@ lbl_8018B784: /* 8018B824 00188784 81 9B 00 00 */ lwz r12, 0(r27) /* 8018B828 00188788 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8018B82C 0018878C 7D 89 03 A6 */ mtctr r12 -/* 8018B830 00188790 4E 80 04 21 */ bctrl +/* 8018B830 00188790 4E 80 04 21 */ bctrl /* 8018B834 00188794 7C 7C 1B 78 */ mr r28, r3 /* 8018B838 00188798 7F A3 EB 78 */ mr r3, r29 /* 8018B83C 0018879C 81 9D 00 00 */ lwz r12, 0(r29) /* 8018B840 001887A0 7F C4 F3 78 */ mr r4, r30 /* 8018B844 001887A4 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8018B848 001887A8 7D 89 03 A6 */ mtctr r12 -/* 8018B84C 001887AC 4E 80 04 21 */ bctrl +/* 8018B84C 001887AC 4E 80 04 21 */ bctrl /* 8018B850 001887B0 C0 1C 00 00 */ lfs f0, 0(r28) /* 8018B854 001887B4 7F C4 F3 78 */ mr r4, r30 /* 8018B858 001887B8 D0 03 00 00 */ stfs f0, 0(r3) @@ -2044,14 +2044,14 @@ lbl_8018B784: /* 8018B868 001887C8 81 9B 00 00 */ lwz r12, 0(r27) /* 8018B86C 001887CC 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8018B870 001887D0 7D 89 03 A6 */ mtctr r12 -/* 8018B874 001887D4 4E 80 04 21 */ bctrl +/* 8018B874 001887D4 4E 80 04 21 */ bctrl /* 8018B878 001887D8 7C 7C 1B 78 */ mr r28, r3 /* 8018B87C 001887DC 7F 43 D3 78 */ mr r3, r26 /* 8018B880 001887E0 81 9A 00 00 */ lwz r12, 0(r26) /* 8018B884 001887E4 7F C4 F3 78 */ mr r4, r30 /* 8018B888 001887E8 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8018B88C 001887EC 7D 89 03 A6 */ mtctr r12 -/* 8018B890 001887F0 4E 80 04 21 */ bctrl +/* 8018B890 001887F0 4E 80 04 21 */ bctrl /* 8018B894 001887F4 C0 1C 00 00 */ lfs f0, 0(r28) /* 8018B898 001887F8 D0 03 00 00 */ stfs f0, 0(r3) /* 8018B89C 001887FC C0 1C 00 04 */ lfs f0, 4(r28) @@ -2065,14 +2065,14 @@ lbl_8018B8A8: /* 8018B8B8 00188818 81 9A 00 00 */ lwz r12, 0(r26) /* 8018B8BC 0018881C 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8018B8C0 00188820 7D 89 03 A6 */ mtctr r12 -/* 8018B8C4 00188824 4E 80 04 21 */ bctrl +/* 8018B8C4 00188824 4E 80 04 21 */ bctrl /* 8018B8C8 00188828 7C 7C 1B 78 */ mr r28, r3 /* 8018B8CC 0018882C 7F A3 EB 78 */ mr r3, r29 /* 8018B8D0 00188830 81 9D 00 00 */ lwz r12, 0(r29) /* 8018B8D4 00188834 7F C4 F3 78 */ mr r4, r30 /* 8018B8D8 00188838 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8018B8DC 0018883C 7D 89 03 A6 */ mtctr r12 -/* 8018B8E0 00188840 4E 80 04 21 */ bctrl +/* 8018B8E0 00188840 4E 80 04 21 */ bctrl /* 8018B8E4 00188844 C0 1C 00 00 */ lfs f0, 0(r28) /* 8018B8E8 00188848 7F C4 F3 78 */ mr r4, r30 /* 8018B8EC 0018884C D0 03 00 00 */ stfs f0, 0(r3) @@ -2082,14 +2082,14 @@ lbl_8018B8A8: /* 8018B8FC 0018885C 81 9A 00 00 */ lwz r12, 0(r26) /* 8018B900 00188860 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8018B904 00188864 7D 89 03 A6 */ mtctr r12 -/* 8018B908 00188868 4E 80 04 21 */ bctrl +/* 8018B908 00188868 4E 80 04 21 */ bctrl /* 8018B90C 0018886C 7C 7C 1B 78 */ mr r28, r3 /* 8018B910 00188870 7F 63 DB 78 */ mr r3, r27 /* 8018B914 00188874 81 9B 00 00 */ lwz r12, 0(r27) /* 8018B918 00188878 7F C4 F3 78 */ mr r4, r30 /* 8018B91C 0018887C 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8018B920 00188880 7D 89 03 A6 */ mtctr r12 -/* 8018B924 00188884 4E 80 04 21 */ bctrl +/* 8018B924 00188884 4E 80 04 21 */ bctrl /* 8018B928 00188888 C0 1C 00 00 */ lfs f0, 0(r28) /* 8018B92C 0018888C D0 03 00 00 */ stfs f0, 0(r3) /* 8018B930 00188890 C0 1C 00 04 */ lfs f0, 4(r28) @@ -2100,7 +2100,7 @@ lbl_8018B938: /* 8018B940 001888A0 81 9D 00 00 */ lwz r12, 0(r29) /* 8018B944 001888A4 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8018B948 001888A8 7D 89 03 A6 */ mtctr r12 -/* 8018B94C 001888AC 4E 80 04 21 */ bctrl +/* 8018B94C 001888AC 4E 80 04 21 */ bctrl /* 8018B950 001888B0 C0 23 00 00 */ lfs f1, 0(r3) /* 8018B954 001888B4 C0 02 A3 C0 */ lfs f0, lbl_805AC0E0@sda21(r2) /* 8018B958 001888B8 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -2117,7 +2117,7 @@ lbl_8018B938: /* 8018B984 001888E4 38 A0 00 01 */ li r5, 1 /* 8018B988 001888E8 81 8C 00 74 */ lwz r12, 0x74(r12) /* 8018B98C 001888EC 7D 89 03 A6 */ mtctr r12 -/* 8018B990 001888F0 4E 80 04 21 */ bctrl +/* 8018B990 001888F0 4E 80 04 21 */ bctrl lbl_8018B994: /* 8018B994 001888F4 80 7D 04 50 */ lwz r3, 0x450(r29) /* 8018B998 001888F8 C0 22 A3 9C */ lfs f1, lbl_805AC0BC@sda21(r2) @@ -2151,7 +2151,7 @@ lbl_8018B994: /* 8018BA08 00188968 81 9D 00 00 */ lwz r12, 0(r29) /* 8018BA0C 0018896C 81 8C 00 84 */ lwz r12, 0x84(r12) /* 8018BA10 00188970 7D 89 03 A6 */ mtctr r12 -/* 8018BA14 00188974 4E 80 04 21 */ bctrl +/* 8018BA14 00188974 4E 80 04 21 */ bctrl lbl_8018BA18: /* 8018BA18 00188978 E3 E1 01 E8 */ psq_l f31, 488(r1), 0, qr0 /* 8018BA1C 0018897C CB E1 01 E0 */ lfd f31, 0x1e0(r1) @@ -2159,13 +2159,13 @@ lbl_8018BA18: /* 8018BA24 00188984 80 01 01 F4 */ lwz r0, 0x1f4(r1) /* 8018BA28 00188988 7C 08 03 A6 */ mtlr r0 /* 8018BA2C 0018898C 38 21 01 F0 */ addi r1, r1, 0x1f0 -/* 8018BA30 00188990 4E 80 00 20 */ blr +/* 8018BA30 00188990 4E 80 00 20 */ blr .global GetTouchBounds__13CNewIntroBossCFv GetTouchBounds__13CNewIntroBossCFv: /* 8018BA34 00188994 38 00 00 00 */ li r0, 0 /* 8018BA38 00188998 98 03 00 18 */ stb r0, 0x18(r3) -/* 8018BA3C 0018899C 4E 80 00 20 */ blr +/* 8018BA3C 0018899C 4E 80 00 20 */ blr .global DoUserAnimEvent__13CNewIntroBossFR13CStateManagerRC13CInt32POINode14EUserEventType DoUserAnimEvent__13CNewIntroBossFR13CStateManagerRC13CInt32POINode14EUserEventType: @@ -2284,7 +2284,7 @@ lbl_8018BB7C: /* 8018BBEC 00188B4C 38 C0 00 00 */ li r6, 0 /* 8018BBF0 00188B50 81 8C 00 78 */ lwz r12, 0x78(r12) /* 8018BBF4 00188B54 7D 89 03 A6 */ mtctr r12 -/* 8018BBF8 00188B58 4E 80 04 21 */ bctrl +/* 8018BBF8 00188B58 4E 80 04 21 */ bctrl /* 8018BBFC 00188B5C A8 1C 06 74 */ lha r0, 0x674(r28) /* 8018BC00 00188B60 2C 00 FF FF */ cmpwi r0, -1 /* 8018BC04 00188B64 40 82 00 20 */ bne lbl_8018BC24 @@ -2311,7 +2311,7 @@ lbl_8018BC2C: /* 8018BC50 00188BB0 38 A0 00 00 */ li r5, 0 /* 8018BC54 00188BB4 81 8C 00 74 */ lwz r12, 0x74(r12) /* 8018BC58 00188BB8 7D 89 03 A6 */ mtctr r12 -/* 8018BC5C 00188BBC 4E 80 04 21 */ bctrl +/* 8018BC5C 00188BBC 4E 80 04 21 */ bctrl lbl_8018BC60: /* 8018BC60 00188BC0 7F 83 E3 78 */ mr r3, r28 /* 8018BC64 00188BC4 7F A4 EB 78 */ mr r4, r29 @@ -2345,7 +2345,7 @@ lbl_8018BCB4: /* 8018BCCC 00188C2C 83 81 00 F0 */ lwz r28, 0xf0(r1) /* 8018BCD0 00188C30 7C 08 03 A6 */ mtlr r0 /* 8018BCD4 00188C34 38 21 01 10 */ addi r1, r1, 0x110 -/* 8018BCD8 00188C38 4E 80 00 20 */ blr +/* 8018BCD8 00188C38 4E 80 00 20 */ blr .global PlayerPos__13CNewIntroBossCFRC13CStateManager PlayerPos__13CNewIntroBossCFRC13CStateManager: @@ -2453,12 +2453,12 @@ lbl_8018BE60: /* 8018BE68 00188DC8 83 C1 00 98 */ lwz r30, 0x98(r1) /* 8018BE6C 00188DCC 7C 08 03 A6 */ mtlr r0 /* 8018BE70 00188DD0 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8018BE74 00188DD4 4E 80 00 20 */ blr +/* 8018BE74 00188DD4 4E 80 00 20 */ blr .global ProjectileInfo__13CNewIntroBossFv ProjectileInfo__13CNewIntroBossFv: /* 8018BE78 00188DD8 38 63 05 AC */ addi r3, r3, 0x5ac -/* 8018BE7C 00188DDC 4E 80 00 20 */ blr +/* 8018BE7C 00188DDC 4E 80 00 20 */ blr .global "__ct__13CNewIntroBossF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC14CPatternedInfoRC16CActorParametersfUiRC11CDamageInfoUiUiUiUi" "__ct__13CNewIntroBossF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC14CPatternedInfoRC16CActorParametersfUiRC11CDamageInfoUiUiUiUi": @@ -2598,7 +2598,7 @@ ProjectileInfo__13CNewIntroBossFv: /* 8018C094 00188FF4 80 01 00 74 */ lwz r0, 0x74(r1) /* 8018C098 00188FF8 7C 08 03 A6 */ mtlr r0 /* 8018C09C 00188FFC 38 21 00 70 */ addi r1, r1, 0x70 -/* 8018C0A0 00189000 4E 80 00 20 */ blr +/* 8018C0A0 00189000 4E 80 00 20 */ blr .global GetNextAttackTime__13CNewIntroBossCFR13CStateManager GetNextAttackTime__13CNewIntroBossCFR13CStateManager: @@ -2621,7 +2621,7 @@ GetNextAttackTime__13CNewIntroBossCFR13CStateManager: /* 8018C0E4 00189044 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8018C0E8 00189048 EF E2 00 7A */ fmadds f31, f2, f1, f0 /* 8018C0EC 0018904C 7D 89 03 A6 */ mtctr r12 -/* 8018C0F0 00189050 4E 80 04 21 */ bctrl +/* 8018C0F0 00189050 4E 80 04 21 */ bctrl /* 8018C0F4 00189054 C0 02 A3 E8 */ lfs f0, lbl_805AC108@sda21(r2) /* 8018C0F8 00189058 C0 3E 06 40 */ lfs f1, 0x640(r30) /* 8018C0FC 0018905C C0 43 00 00 */ lfs f2, 0(r3) @@ -2649,7 +2649,7 @@ lbl_8018C138: /* 8018C148 001890A8 83 C1 00 08 */ lwz r30, 8(r1) /* 8018C14C 001890AC 7C 08 03 A6 */ mtlr r0 /* 8018C150 001890B0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8018C154 001890B4 4E 80 00 20 */ blr +/* 8018C154 001890B4 4E 80 00 20 */ blr .global GetGenerateForHealth__13CNewIntroBossCFRC13CStateManager GetGenerateForHealth__13CNewIntroBossCFRC13CStateManager: @@ -2661,7 +2661,7 @@ GetGenerateForHealth__13CNewIntroBossCFRC13CStateManager: /* 8018C16C 001890CC 81 83 00 00 */ lwz r12, 0(r3) /* 8018C170 001890D0 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8018C174 001890D4 7D 89 03 A6 */ mtctr r12 -/* 8018C178 001890D8 4E 80 04 21 */ bctrl +/* 8018C178 001890D8 4E 80 04 21 */ bctrl /* 8018C17C 001890DC C0 22 A3 F4 */ lfs f1, lbl_805AC114@sda21(r2) /* 8018C180 001890E0 C0 1F 06 40 */ lfs f0, 0x640(r31) /* 8018C184 001890E4 C0 43 00 00 */ lfs f2, 0(r3) @@ -2677,7 +2677,7 @@ lbl_8018C1A0: /* 8018C1A4 00189104 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8018C1A8 00189108 7C 08 03 A6 */ mtlr r0 /* 8018C1AC 0018910C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8018C1B0 00189110 4E 80 00 20 */ blr +/* 8018C1B0 00189110 4E 80 00 20 */ blr .global GetLocoForHealth__13CNewIntroBossCFRC13CStateManager GetLocoForHealth__13CNewIntroBossCFRC13CStateManager: @@ -2689,7 +2689,7 @@ GetLocoForHealth__13CNewIntroBossCFRC13CStateManager: /* 8018C1C8 00189128 81 83 00 00 */ lwz r12, 0(r3) /* 8018C1CC 0018912C 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8018C1D0 00189130 7D 89 03 A6 */ mtctr r12 -/* 8018C1D4 00189134 4E 80 04 21 */ bctrl +/* 8018C1D4 00189134 4E 80 04 21 */ bctrl /* 8018C1D8 00189138 C0 02 A3 E8 */ lfs f0, lbl_805AC108@sda21(r2) /* 8018C1DC 0018913C C0 3F 06 40 */ lfs f1, 0x640(r31) /* 8018C1E0 00189140 C0 43 00 00 */ lfs f2, 0(r3) @@ -2712,4 +2712,4 @@ lbl_8018C214: /* 8018C218 00189178 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8018C21C 0018917C 7C 08 03 A6 */ mtlr r0 /* 8018C220 00189180 38 21 00 10 */ addi r1, r1, 0x10 -/* 8018C224 00189184 4E 80 00 20 */ blr +/* 8018C224 00189184 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/Enemies/COmegaPirate.s b/asm/MetroidPrime/Enemies/COmegaPirate.s index 1019d720..6bc8cd3f 100644 --- a/asm/MetroidPrime/Enemies/COmegaPirate.s +++ b/asm/MetroidPrime/Enemies/COmegaPirate.s @@ -444,12 +444,12 @@ lbl_8028B4F4: /* 8028B500 00288460 83 C1 00 08 */ lwz r30, 8(r1) /* 8028B504 00288464 7C 08 03 A6 */ mtlr r0 /* 8028B508 00288468 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028B50C 0028846C 4E 80 00 20 */ blr +/* 8028B50C 0028846C 4E 80 00 20 */ blr .global sub_8028b510 sub_8028b510: /* 8028B510 00288470 38 60 00 00 */ li r3, 0 -/* 8028B514 00288474 4E 80 00 20 */ blr +/* 8028B514 00288474 4E 80 00 20 */ blr .global sub_8028b518 sub_8028b518: @@ -508,7 +508,7 @@ lbl_8028B5C0: /* 8028B5E4 00288544 38 80 00 00 */ li r4, 0 /* 8028B5E8 00288548 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 8028B5EC 0028854C 7D 89 03 A6 */ mtctr r12 -/* 8028B5F0 00288550 4E 80 04 21 */ bctrl +/* 8028B5F0 00288550 4E 80 04 21 */ bctrl /* 8028B5F4 00288554 7F 43 D3 78 */ mr r3, r26 /* 8028B5F8 00288558 7F E6 FB 78 */ mr r6, r31 /* 8028B5FC 0028855C 38 80 00 29 */ li r4, 0x29 @@ -573,7 +573,7 @@ lbl_8028B680: /* 8028B6D4 00288634 81 9A 00 00 */ lwz r12, 0(r26) /* 8028B6D8 00288638 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 8028B6DC 0028863C 7D 89 03 A6 */ mtctr r12 -/* 8028B6E0 00288640 4E 80 04 21 */ bctrl +/* 8028B6E0 00288640 4E 80 04 21 */ bctrl lbl_8028B6E4: /* 8028B6E4 00288644 28 1B 00 00 */ cmplwi r27, 0 /* 8028B6E8 00288648 41 82 00 1C */ beq lbl_8028B704 @@ -582,14 +582,14 @@ lbl_8028B6E4: /* 8028B6F4 00288654 81 9B 00 00 */ lwz r12, 0(r27) /* 8028B6F8 00288658 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 8028B6FC 0028865C 7D 89 03 A6 */ mtctr r12 -/* 8028B700 00288660 4E 80 04 21 */ bctrl +/* 8028B700 00288660 4E 80 04 21 */ bctrl lbl_8028B704: /* 8028B704 00288664 7F C3 F3 78 */ mr r3, r30 /* 8028B708 00288668 38 80 00 00 */ li r4, 0 /* 8028B70C 0028866C 81 9E 00 00 */ lwz r12, 0(r30) /* 8028B710 00288670 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 8028B714 00288674 7D 89 03 A6 */ mtctr r12 -/* 8028B718 00288678 4E 80 04 21 */ bctrl +/* 8028B718 00288678 4E 80 04 21 */ bctrl /* 8028B71C 0028867C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8028B720 00288680 7F E3 FB 78 */ mr r3, r31 /* 8028B724 00288684 C0 22 BE 9C */ lfs f1, lbl_805ADBBC@sda21(r2) @@ -609,7 +609,7 @@ lbl_8028B704: /* 8028B75C 002886BC 80 01 00 54 */ lwz r0, 0x54(r1) /* 8028B760 002886C0 7C 08 03 A6 */ mtlr r0 /* 8028B764 002886C4 38 21 00 50 */ addi r1, r1, 0x50 -/* 8028B768 002886C8 4E 80 00 20 */ blr +/* 8028B768 002886C8 4E 80 00 20 */ blr .global Accept__Q212COmegaPirate6CFlashFR8IVisitor Accept__Q212COmegaPirate6CFlashFR8IVisitor: @@ -622,11 +622,11 @@ Accept__Q212COmegaPirate6CFlashFR8IVisitor: /* 8028B784 002886E4 7C 04 03 78 */ mr r4, r0 /* 8028B788 002886E8 81 8C 00 08 */ lwz r12, 8(r12) /* 8028B78C 002886EC 7D 89 03 A6 */ mtctr r12 -/* 8028B790 002886F0 4E 80 04 21 */ bctrl +/* 8028B790 002886F0 4E 80 04 21 */ bctrl /* 8028B794 002886F4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8028B798 002886F8 7C 08 03 A6 */ mtlr r0 /* 8028B79C 002886FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028B7A0 00288700 4E 80 00 20 */ blr +/* 8028B7A0 00288700 4E 80 00 20 */ blr .global Think__Q212COmegaPirate6CFlashFfR13CStateManager Think__Q212COmegaPirate6CFlashFfR13CStateManager: @@ -730,7 +730,7 @@ lbl_8028B8EC: /* 8028B914 00288874 83 C1 00 28 */ lwz r30, 0x28(r1) /* 8028B918 00288878 7C 08 03 A6 */ mtlr r0 /* 8028B91C 0028887C 38 21 00 70 */ addi r1, r1, 0x70 -/* 8028B920 00288880 4E 80 00 20 */ blr +/* 8028B920 00288880 4E 80 00 20 */ blr .global PreRender__Q212COmegaPirate6CFlashFR13CStateManagerRC14CFrustumPlanes PreRender__Q212COmegaPirate6CFlashFR13CStateManagerRC14CFrustumPlanes: @@ -763,7 +763,7 @@ lbl_8028B984: /* 8028B988 002888E8 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8028B98C 002888EC 7C 08 03 A6 */ mtlr r0 /* 8028B990 002888F0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8028B994 002888F4 4E 80 00 20 */ blr +/* 8028B994 002888F4 4E 80 00 20 */ blr .global Render__Q212COmegaPirate6CFlashCFRC13CStateManager Render__Q212COmegaPirate6CFlashCFRC13CStateManager: @@ -991,11 +991,11 @@ lbl_8028BC88: /* 8028BCF0 00288C50 83 C1 00 78 */ lwz r30, 0x78(r1) /* 8028BCF4 00288C54 7C 08 03 A6 */ mtlr r0 /* 8028BCF8 00288C58 38 21 01 40 */ addi r1, r1, 0x140 -/* 8028BCFC 00288C5C 4E 80 00 20 */ blr +/* 8028BCFC 00288C5C 4E 80 00 20 */ blr .global AddToRenderer__Q212COmegaPirate6CFlashCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__Q212COmegaPirate6CFlashCFRC14CFrustumPlanesRC13CStateManager: -/* 8028BD00 00288C60 4E 80 00 20 */ blr +/* 8028BD00 00288C60 4E 80 00 20 */ blr .global "__ct__Q212COmegaPirate6CFlashF9TUniqueIdRC11CEntityInfoRC9CVector3fRC23TLockedToken<8CTexture>" "__ct__Q212COmegaPirate6CFlashF9TUniqueIdRC11CEntityInfoRC9CVector3fRC23TLockedToken<8CTexture>": @@ -1073,7 +1073,7 @@ AddToRenderer__Q212COmegaPirate6CFlashCFRC14CFrustumPlanesRC13CStateManager: /* 8028BE20 00288D80 80 01 01 44 */ lwz r0, 0x144(r1) /* 8028BE24 00288D84 7C 08 03 A6 */ mtlr r0 /* 8028BE28 00288D88 38 21 01 40 */ addi r1, r1, 0x140 -/* 8028BE2C 00288D8C 4E 80 00 20 */ blr +/* 8028BE2C 00288D8C 4E 80 00 20 */ blr .global CreateFlash__12COmegaPirateFR13CStateManagerf CreateFlash__12COmegaPirateFR13CStateManagerf: @@ -1178,7 +1178,7 @@ lbl_8028BF94: /* 8028BF9C 00288EFC 80 01 00 94 */ lwz r0, 0x94(r1) /* 8028BFA0 00288F00 7C 08 03 A6 */ mtlr r0 /* 8028BFA4 00288F04 38 21 00 90 */ addi r1, r1, 0x90 -/* 8028BFA8 00288F08 4E 80 00 20 */ blr +/* 8028BFA8 00288F08 4E 80 00 20 */ blr .global sub_8028bfac sub_8028bfac: @@ -1363,7 +1363,7 @@ lbl_8028C214: /* 8028C220 00289180 83 C1 00 28 */ lwz r30, 0x28(r1) /* 8028C224 00289184 7C 08 03 A6 */ mtlr r0 /* 8028C228 00289188 38 21 00 30 */ addi r1, r1, 0x30 -/* 8028C22C 0028918C 4E 80 00 20 */ blr +/* 8028C22C 0028918C 4E 80 00 20 */ blr .global sub_8028c230 sub_8028c230: @@ -1375,7 +1375,7 @@ sub_8028c230: /* 8028C244 002891A4 88 05 00 03 */ lbz r0, 3(r5) /* 8028C248 002891A8 7C 63 22 14 */ add r3, r3, r4 /* 8028C24C 002891AC 7C 63 02 14 */ add r3, r3, r0 -/* 8028C250 002891B0 4E 80 00 20 */ blr +/* 8028C250 002891B0 4E 80 00 20 */ blr .global Landed__12COmegaPirateFR13CStateManagerf Landed__12COmegaPirateFR13CStateManagerf: @@ -1386,7 +1386,7 @@ Landed__12COmegaPirateFR13CStateManagerf: /* 8028C264 002891C4 54 00 F8 7E */ srwi r0, r0, 1 /* 8028C268 002891C8 7C 00 18 50 */ subf r0, r0, r3 /* 8028C26C 002891CC 54 03 0F FE */ srwi r3, r0, 0x1f -/* 8028C270 002891D0 4E 80 00 20 */ blr +/* 8028C270 002891D0 4E 80 00 20 */ blr .global ShouldMove__12COmegaPirateFR13CStateManagerf ShouldMove__12COmegaPirateFR13CStateManagerf: @@ -1395,7 +1395,7 @@ ShouldMove__12COmegaPirateFR13CStateManagerf: /* 8028C27C 002891DC FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8028C280 002891E0 7C 00 00 26 */ mfcr r0 /* 8028C284 002891E4 54 03 17 FE */ rlwinm r3, r0, 2, 0x1f, 0x1f -/* 8028C288 002891E8 4E 80 00 20 */ blr +/* 8028C288 002891E8 4E 80 00 20 */ blr .global Attack__12COmegaPirateFR13CStateManager9EStateMsgf Attack__12COmegaPirateFR13CStateManager9EStateMsgf: @@ -1432,7 +1432,7 @@ lbl_8028C2F0: /* 8028C2F4 00289254 80 01 00 14 */ lwz r0, 0x14(r1) /* 8028C2F8 00289258 7C 08 03 A6 */ mtlr r0 /* 8028C2FC 0028925C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028C300 00289260 4E 80 00 20 */ blr +/* 8028C300 00289260 4E 80 00 20 */ blr .global sub_8028c304 sub_8028c304: @@ -1465,7 +1465,7 @@ sub_8028c304: /* 8028C36C 002892CC D0 43 00 30 */ stfs f2, 0x30(r3) /* 8028C370 002892D0 90 C3 00 34 */ stw r6, 0x34(r3) /* 8028C374 002892D4 B0 A3 00 38 */ sth r5, 0x38(r3) -/* 8028C378 002892D8 4E 80 00 20 */ blr +/* 8028C378 002892D8 4E 80 00 20 */ blr .global Enraged__12COmegaPirateFR13CStateManager9EStateMsgf Enraged__12COmegaPirateFR13CStateManager9EStateMsgf: @@ -1550,7 +1550,7 @@ lbl_8028C48C: /* 8028C490 002893F0 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8028C494 002893F4 7C 08 03 A6 */ mtlr r0 /* 8028C498 002893F8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8028C49C 002893FC 4E 80 00 20 */ blr +/* 8028C49C 002893FC 4E 80 00 20 */ blr .global Cover__12COmegaPirateFR13CStateManager9EStateMsgf Cover__12COmegaPirateFR13CStateManager9EStateMsgf: @@ -1587,7 +1587,7 @@ lbl_8028C500: /* 8028C508 00289468 83 C1 00 08 */ lwz r30, 8(r1) /* 8028C50C 0028946C 7C 08 03 A6 */ mtlr r0 /* 8028C510 00289470 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028C514 00289474 4E 80 00 20 */ blr +/* 8028C514 00289474 4E 80 00 20 */ blr .global TargetPatrol__12COmegaPirateFR13CStateManager9EStateMsgf TargetPatrol__12COmegaPirateFR13CStateManager9EStateMsgf: @@ -1637,7 +1637,7 @@ lbl_8028C5A8: /* 8028C5AC 0028950C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8028C5B0 00289510 7C 08 03 A6 */ mtlr r0 /* 8028C5B4 00289514 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028C5B8 00289518 4E 80 00 20 */ blr +/* 8028C5B8 00289518 4E 80 00 20 */ blr .global PathFind__12COmegaPirateFR13CStateManager9EStateMsgf PathFind__12COmegaPirateFR13CStateManager9EStateMsgf: @@ -1687,7 +1687,7 @@ lbl_8028C64C: /* 8028C650 002895B0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8028C654 002895B4 7C 08 03 A6 */ mtlr r0 /* 8028C658 002895B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028C65C 002895BC 4E 80 00 20 */ blr +/* 8028C65C 002895BC 4E 80 00 20 */ blr .global Run__12COmegaPirateFR13CStateManager9EStateMsgf Run__12COmegaPirateFR13CStateManager9EStateMsgf: @@ -1737,7 +1737,7 @@ lbl_8028C6F0: /* 8028C6F4 00289654 80 01 00 14 */ lwz r0, 0x14(r1) /* 8028C6F8 00289658 7C 08 03 A6 */ mtlr r0 /* 8028C6FC 0028965C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028C700 00289660 4E 80 00 20 */ blr +/* 8028C700 00289660 4E 80 00 20 */ blr .global sub_8028c704 sub_8028c704: @@ -1827,7 +1827,7 @@ lbl_8028C824: /* 8028C830 00289790 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8028C834 00289794 7C 08 03 A6 */ mtlr r0 /* 8028C838 00289798 38 21 00 20 */ addi r1, r1, 0x20 -/* 8028C83C 0028979C 4E 80 00 20 */ blr +/* 8028C83C 0028979C 4E 80 00 20 */ blr .global sub_8028c840 sub_8028c840: @@ -2095,7 +2095,7 @@ lbl_8028CBCC: /* 8028CBDC 00289B3C 83 81 00 50 */ lwz r28, 0x50(r1) /* 8028CBE0 00289B40 7C 08 03 A6 */ mtlr r0 /* 8028CBE4 00289B44 38 21 00 60 */ addi r1, r1, 0x60 -/* 8028CBE8 00289B48 4E 80 00 20 */ blr +/* 8028CBE8 00289B48 4E 80 00 20 */ blr .global sub_8028cbec sub_8028cbec: @@ -2176,7 +2176,7 @@ lbl_8028CCE4: /* 8028CCF4 00289C54 83 81 00 10 */ lwz r28, 0x10(r1) /* 8028CCF8 00289C58 7C 08 03 A6 */ mtlr r0 /* 8028CCFC 00289C5C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8028CD00 00289C60 4E 80 00 20 */ blr +/* 8028CD00 00289C60 4E 80 00 20 */ blr .global sub_8028cd04 sub_8028cd04: @@ -2216,7 +2216,7 @@ lbl_8028CD78: /* 8028CD78 00289CD8 C0 03 0A 84 */ lfs f0, 0xa84(r3) /* 8028CD7C 00289CDC EC 00 08 2A */ fadds f0, f0, f1 /* 8028CD80 00289CE0 D0 03 0A 84 */ stfs f0, 0xa84(r3) -/* 8028CD84 00289CE4 4E 80 00 20 */ blr +/* 8028CD84 00289CE4 4E 80 00 20 */ blr lbl_8028CD88: /* 8028CD88 00289CE8 C0 43 0A 90 */ lfs f2, 0xa90(r3) /* 8028CD8C 00289CEC C0 03 0A 84 */ lfs f0, 0xa84(r3) @@ -2242,7 +2242,7 @@ lbl_8028CDD0: /* 8028CDD0 00289D30 C0 03 0A 84 */ lfs f0, 0xa84(r3) /* 8028CDD4 00289D34 EC 00 08 2A */ fadds f0, f0, f1 /* 8028CDD8 00289D38 D0 03 0A 84 */ stfs f0, 0xa84(r3) -/* 8028CDDC 00289D3C 4E 80 00 20 */ blr +/* 8028CDDC 00289D3C 4E 80 00 20 */ blr lbl_8028CDE0: /* 8028CDE0 00289D40 C0 62 BE 9C */ lfs f3, lbl_805ADBBC@sda21(r2) /* 8028CDE4 00289D44 D0 63 0A 80 */ stfs f3, 0xa80(r3) @@ -2260,11 +2260,11 @@ lbl_8028CE10: /* 8028CE10 00289D70 C0 03 0A 84 */ lfs f0, 0xa84(r3) /* 8028CE14 00289D74 EC 00 08 2A */ fadds f0, f0, f1 /* 8028CE18 00289D78 D0 03 0A 84 */ stfs f0, 0xa84(r3) -/* 8028CE1C 00289D7C 4E 80 00 20 */ blr +/* 8028CE1C 00289D7C 4E 80 00 20 */ blr lbl_8028CE20: /* 8028CE20 00289D80 C0 02 BE A0 */ lfs f0, lbl_805ADBC0@sda21(r2) /* 8028CE24 00289D84 D0 03 0A 80 */ stfs f0, 0xa80(r3) -/* 8028CE28 00289D88 4E 80 00 20 */ blr +/* 8028CE28 00289D88 4E 80 00 20 */ blr .global sub_8028ce2c sub_8028ce2c: @@ -2408,7 +2408,7 @@ lbl_8028D034: /* 8028D040 00289FA0 80 01 01 44 */ lwz r0, 0x144(r1) /* 8028D044 00289FA4 7C 08 03 A6 */ mtlr r0 /* 8028D048 00289FA8 38 21 01 40 */ addi r1, r1, 0x140 -/* 8028D04C 00289FAC 4E 80 00 20 */ blr +/* 8028D04C 00289FAC 4E 80 00 20 */ blr .global sub_8028d050 sub_8028d050: @@ -2506,7 +2506,7 @@ lbl_8028D1A0: /* 8028D1AC 0028A10C 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 8028D1B0 0028A110 7C 08 03 A6 */ mtlr r0 /* 8028D1B4 0028A114 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 8028D1B8 0028A118 4E 80 00 20 */ blr +/* 8028D1B8 0028A118 4E 80 00 20 */ blr .global sub_8028d1bc sub_8028d1bc: @@ -2601,7 +2601,7 @@ lbl_8028D2FC: /* 8028D310 0028A270 80 01 00 64 */ lwz r0, 0x64(r1) /* 8028D314 0028A274 7C 08 03 A6 */ mtlr r0 /* 8028D318 0028A278 38 21 00 60 */ addi r1, r1, 0x60 -/* 8028D31C 0028A27C 4E 80 00 20 */ blr +/* 8028D31C 0028A27C 4E 80 00 20 */ blr .global sub_8028d320 sub_8028d320: @@ -2687,7 +2687,7 @@ lbl_8028D43C: /* 8028D450 0028A3B0 80 01 00 64 */ lwz r0, 0x64(r1) /* 8028D454 0028A3B4 7C 08 03 A6 */ mtlr r0 /* 8028D458 0028A3B8 38 21 00 60 */ addi r1, r1, 0x60 -/* 8028D45C 0028A3BC 4E 80 00 20 */ blr +/* 8028D45C 0028A3BC 4E 80 00 20 */ blr .global sub_8028d460 sub_8028d460: @@ -2759,14 +2759,14 @@ lbl_8028D508: /* 8028D560 0028A4C0 81 9E 00 00 */ lwz r12, 0(r30) /* 8028D564 0028A4C4 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8028D568 0028A4C8 7D 89 03 A6 */ mtctr r12 -/* 8028D56C 0028A4CC 4E 80 04 21 */ bctrl +/* 8028D56C 0028A4CC 4E 80 04 21 */ bctrl /* 8028D570 0028A4D0 7C 7D 1B 78 */ mr r29, r3 /* 8028D574 0028A4D4 7F 83 E3 78 */ mr r3, r28 /* 8028D578 0028A4D8 81 9C 00 00 */ lwz r12, 0(r28) /* 8028D57C 0028A4DC 7F E4 FB 78 */ mr r4, r31 /* 8028D580 0028A4E0 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8028D584 0028A4E4 7D 89 03 A6 */ mtctr r12 -/* 8028D588 0028A4E8 4E 80 04 21 */ bctrl +/* 8028D588 0028A4E8 4E 80 04 21 */ bctrl /* 8028D58C 0028A4EC C0 1D 00 00 */ lfs f0, 0(r29) /* 8028D590 0028A4F0 D0 03 00 00 */ stfs f0, 0(r3) /* 8028D594 0028A4F4 C0 1D 00 04 */ lfs f0, 4(r29) @@ -2833,7 +2833,7 @@ lbl_8028D624: /* 8028D680 0028A5E0 83 81 00 50 */ lwz r28, 0x50(r1) /* 8028D684 0028A5E4 7C 08 03 A6 */ mtlr r0 /* 8028D688 0028A5E8 38 21 00 60 */ addi r1, r1, 0x60 -/* 8028D68C 0028A5EC 4E 80 00 20 */ blr +/* 8028D68C 0028A5EC 4E 80 00 20 */ blr .global sub_8028d690 sub_8028d690: @@ -2934,7 +2934,7 @@ lbl_8028D7C8: /* 8028D7D4 0028A734 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8028D7D8 0028A738 7C 08 03 A6 */ mtlr r0 /* 8028D7DC 0028A73C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8028D7E0 0028A740 4E 80 00 20 */ blr +/* 8028D7E0 0028A740 4E 80 00 20 */ blr .global sub_8028d7e4 sub_8028d7e4: @@ -2962,7 +2962,7 @@ sub_8028d7e4: /* 8028D838 0028A798 38 63 B7 34 */ addi r3, r3, lbl_803EB734@l /* 8028D83C 0028A79C 7C 03 00 2E */ lwzx r0, r3, r0 /* 8028D840 0028A7A0 7C 09 03 A6 */ mtctr r0 -/* 8028D844 0028A7A4 4E 80 04 20 */ bctr +/* 8028D844 0028A7A4 4E 80 04 20 */ bctr .global lbl_8028D848 lbl_8028D848: /* 8028D848 0028A7A8 C0 42 BE 84 */ lfs f2, lbl_805ADBA4@sda21(r2) @@ -3301,11 +3301,11 @@ lbl_8028DC90: /* 8028DCAC 0028AC0C 80 01 00 84 */ lwz r0, 0x84(r1) /* 8028DCB0 0028AC10 7C 08 03 A6 */ mtlr r0 /* 8028DCB4 0028AC14 38 21 00 80 */ addi r1, r1, 0x80 -/* 8028DCB8 0028AC18 4E 80 00 20 */ blr +/* 8028DCB8 0028AC18 4E 80 00 20 */ blr .global WallHang__12COmegaPirateFR13CStateManager9EStateMsgf WallHang__12COmegaPirateFR13CStateManager9EStateMsgf: -/* 8028DCBC 0028AC1C 4E 80 00 20 */ blr +/* 8028DCBC 0028AC1C 4E 80 00 20 */ blr .global WallDetach__12COmegaPirateFR13CStateManager9EStateMsgf WallDetach__12COmegaPirateFR13CStateManager9EStateMsgf: @@ -3404,7 +3404,7 @@ lbl_8028DE08: /* 8028DE0C 0028AD6C 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8028DE10 0028AD70 7C 08 03 A6 */ mtlr r0 /* 8028DE14 0028AD74 38 21 00 30 */ addi r1, r1, 0x30 -/* 8028DE18 0028AD78 4E 80 00 20 */ blr +/* 8028DE18 0028AD78 4E 80 00 20 */ blr .global JumpBack__12COmegaPirateFR13CStateManager9EStateMsgf JumpBack__12COmegaPirateFR13CStateManager9EStateMsgf: @@ -3492,7 +3492,7 @@ lbl_8028DF34: /* 8028DF58 0028AEB8 38 80 00 00 */ li r4, 0 /* 8028DF5C 0028AEBC 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 8028DF60 0028AEC0 7D 89 03 A6 */ mtctr r12 -/* 8028DF64 0028AEC4 4E 80 04 21 */ bctrl +/* 8028DF64 0028AEC4 4E 80 04 21 */ bctrl lbl_8028DF68: /* 8028DF68 0028AEC8 3B 7B 00 01 */ addi r27, r27, 1 /* 8028DF6C 0028AECC 3B BD 00 14 */ addi r29, r29, 0x14 @@ -3520,7 +3520,7 @@ lbl_8028DFB0: /* 8028DFB4 0028AF14 80 01 00 44 */ lwz r0, 0x44(r1) /* 8028DFB8 0028AF18 7C 08 03 A6 */ mtlr r0 /* 8028DFBC 0028AF1C 38 21 00 40 */ addi r1, r1, 0x40 -/* 8028DFC0 0028AF20 4E 80 00 20 */ blr +/* 8028DFC0 0028AF20 4E 80 00 20 */ blr .global Retreat__12COmegaPirateFR13CStateManager9EStateMsgf Retreat__12COmegaPirateFR13CStateManager9EStateMsgf: @@ -3625,7 +3625,7 @@ lbl_8028E128: /* 8028E130 0028B090 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8028E134 0028B094 7C 08 03 A6 */ mtlr r0 /* 8028E138 0028B098 38 21 00 20 */ addi r1, r1, 0x20 -/* 8028E13C 0028B09C 4E 80 00 20 */ blr +/* 8028E13C 0028B09C 4E 80 00 20 */ blr .global DoubleSnap__12COmegaPirateFR13CStateManager9EStateMsgf DoubleSnap__12COmegaPirateFR13CStateManager9EStateMsgf: @@ -3677,7 +3677,7 @@ lbl_8028E1C4: /* 8028E1E8 0028B148 38 80 00 01 */ li r4, 1 /* 8028E1EC 0028B14C 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 8028E1F0 0028B150 7D 89 03 A6 */ mtctr r12 -/* 8028E1F4 0028B154 4E 80 04 21 */ bctrl +/* 8028E1F4 0028B154 4E 80 04 21 */ bctrl /* 8028E1F8 0028B158 7F 63 DB 78 */ mr r3, r27 /* 8028E1FC 0028B15C 38 9F 0A E4 */ addi r4, r31, 0xae4 /* 8028E200 0028B160 4B E2 2C 55 */ bl sub_800b0e54 @@ -3793,7 +3793,7 @@ lbl_8028E38C: /* 8028E390 0028B2F0 80 01 00 44 */ lwz r0, 0x44(r1) /* 8028E394 0028B2F4 7C 08 03 A6 */ mtlr r0 /* 8028E398 0028B2F8 38 21 00 40 */ addi r1, r1, 0x40 -/* 8028E39C 0028B2FC 4E 80 00 20 */ blr +/* 8028E39C 0028B2FC 4E 80 00 20 */ blr .global Faint__12COmegaPirateFR13CStateManager9EStateMsgf Faint__12COmegaPirateFR13CStateManager9EStateMsgf: @@ -3872,7 +3872,7 @@ lbl_8028E48C: /* 8028E4B0 0028B410 38 80 00 01 */ li r4, 1 /* 8028E4B4 0028B414 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 8028E4B8 0028B418 7D 89 03 A6 */ mtctr r12 -/* 8028E4BC 0028B41C 4E 80 04 21 */ bctrl +/* 8028E4BC 0028B41C 4E 80 04 21 */ bctrl lbl_8028E4C0: /* 8028E4C0 0028B420 3B DE 00 01 */ addi r30, r30, 1 /* 8028E4C4 0028B424 3B 5A 00 14 */ addi r26, r26, 0x14 @@ -4090,7 +4090,7 @@ lbl_8028E7BC: /* 8028E7D8 0028B738 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 8028E7DC 0028B73C 7C 08 03 A6 */ mtlr r0 /* 8028E7E0 0028B740 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8028E7E4 0028B744 4E 80 00 20 */ blr +/* 8028E7E4 0028B744 4E 80 00 20 */ blr .global Dizzy__12COmegaPirateFR13CStateManager9EStateMsgf Dizzy__12COmegaPirateFR13CStateManager9EStateMsgf: @@ -4157,7 +4157,7 @@ lbl_8028E8C0: /* 8028E8C4 0028B824 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8028E8C8 0028B828 7C 08 03 A6 */ mtlr r0 /* 8028E8CC 0028B82C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8028E8D0 0028B830 4E 80 00 20 */ blr +/* 8028E8D0 0028B830 4E 80 00 20 */ blr .global Growth__12COmegaPirateFR13CStateManager9EStateMsgf Growth__12COmegaPirateFR13CStateManager9EStateMsgf: @@ -4305,7 +4305,7 @@ lbl_8028EAE4: /* 8028EAEC 0028BA4C 83 C1 00 28 */ lwz r30, 0x28(r1) /* 8028EAF0 0028BA50 7C 08 03 A6 */ mtlr r0 /* 8028EAF4 0028BA54 38 21 00 30 */ addi r1, r1, 0x30 -/* 8028EAF8 0028BA58 4E 80 00 20 */ blr +/* 8028EAF8 0028BA58 4E 80 00 20 */ blr .global Explode__12COmegaPirateFR13CStateManager9EStateMsgf Explode__12COmegaPirateFR13CStateManager9EStateMsgf: @@ -4395,7 +4395,7 @@ lbl_8028EC20: /* 8028EC24 0028BB84 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8028EC28 0028BB88 7C 08 03 A6 */ mtlr r0 /* 8028EC2C 0028BB8C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8028EC30 0028BB90 4E 80 00 20 */ blr +/* 8028EC30 0028BB90 4E 80 00 20 */ blr .global Suck__12COmegaPirateFR13CStateManager9EStateMsgf Suck__12COmegaPirateFR13CStateManager9EStateMsgf: @@ -4552,7 +4552,7 @@ lbl_8028EE58: /* 8028EE5C 0028BDBC 80 01 00 44 */ lwz r0, 0x44(r1) /* 8028EE60 0028BDC0 7C 08 03 A6 */ mtlr r0 /* 8028EE64 0028BDC4 38 21 00 40 */ addi r1, r1, 0x40 -/* 8028EE68 0028BDC8 4E 80 00 20 */ blr +/* 8028EE68 0028BDC8 4E 80 00 20 */ blr .global Skid__12COmegaPirateFR13CStateManager9EStateMsgf Skid__12COmegaPirateFR13CStateManager9EStateMsgf: @@ -4632,21 +4632,21 @@ lbl_8028EF70: /* 8028EF74 0028BED4 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8028EF78 0028BED8 7C 08 03 A6 */ mtlr r0 /* 8028EF7C 0028BEDC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8028EF80 0028BEE0 4E 80 00 20 */ blr +/* 8028EF80 0028BEE0 4E 80 00 20 */ blr .global Shuffle__12COmegaPirateFR13CStateManager9EStateMsgf Shuffle__12COmegaPirateFR13CStateManager9EStateMsgf: -/* 8028EF84 0028BEE4 4E 80 00 20 */ blr +/* 8028EF84 0028BEE4 4E 80 00 20 */ blr .global CodeTrigger__12COmegaPirateFR13CStateManagerf CodeTrigger__12COmegaPirateFR13CStateManagerf: /* 8028EF88 0028BEE8 88 63 0B 78 */ lbz r3, 0xb78(r3) -/* 8028EF8C 0028BEEC 4E 80 00 20 */ blr +/* 8028EF8C 0028BEEC 4E 80 00 20 */ blr .global HearPlayer__12COmegaPirateFR13CStateManagerf HearPlayer__12COmegaPirateFR13CStateManagerf: /* 8028EF90 0028BEF0 88 63 0A 3C */ lbz r3, 0xa3c(r3) -/* 8028EF94 0028BEF4 4E 80 00 20 */ blr +/* 8028EF94 0028BEF4 4E 80 00 20 */ blr .global CoverBlown__12COmegaPirateFR13CStateManagerf CoverBlown__12COmegaPirateFR13CStateManagerf: @@ -4658,10 +4658,10 @@ CoverBlown__12COmegaPirateFR13CStateManagerf: /* 8028EFAC 0028BF0C 98 03 09 B4 */ stb r0, 0x9b4(r3) /* 8028EFB0 0028BF10 D0 03 0B 5C */ stfs f0, 0xb5c(r3) /* 8028EFB4 0028BF14 38 60 00 01 */ li r3, 1 -/* 8028EFB8 0028BF18 4E 80 00 20 */ blr +/* 8028EFB8 0028BF18 4E 80 00 20 */ blr lbl_8028EFBC: /* 8028EFBC 0028BF1C 38 60 00 00 */ li r3, 0 -/* 8028EFC0 0028BF20 4E 80 00 20 */ blr +/* 8028EFC0 0028BF20 4E 80 00 20 */ blr .global sub_8028efc4 sub_8028efc4: @@ -4893,7 +4893,7 @@ lbl_8028F180: /* 8028F338 0028C298 80 01 02 64 */ lwz r0, 0x264(r1) /* 8028F33C 0028C29C 7C 08 03 A6 */ mtlr r0 /* 8028F340 0028C2A0 38 21 02 60 */ addi r1, r1, 0x260 -/* 8028F344 0028C2A4 4E 80 00 20 */ blr +/* 8028F344 0028C2A4 4E 80 00 20 */ blr .global sub_8028f348 sub_8028f348: @@ -4950,7 +4950,7 @@ lbl_8028F3FC: /* 8028F408 0028C368 83 A1 00 54 */ lwz r29, 0x54(r1) /* 8028F40C 0028C36C 7C 08 03 A6 */ mtlr r0 /* 8028F410 0028C370 38 21 00 60 */ addi r1, r1, 0x60 -/* 8028F414 0028C374 4E 80 00 20 */ blr +/* 8028F414 0028C374 4E 80 00 20 */ blr .global Render__12COmegaPirateCFRC13CStateManager Render__12COmegaPirateCFRC13CStateManager: @@ -5044,7 +5044,7 @@ lbl_8028F528: /* 8028F570 0028C4D0 C0 42 BE A0 */ lfs f2, lbl_805ADBC0@sda21(r2) /* 8028F574 0028C4D4 81 8C 00 E0 */ lwz r12, 0xe0(r12) /* 8028F578 0028C4D8 7D 89 03 A6 */ mtctr r12 -/* 8028F57C 0028C4DC 4E 80 04 21 */ bctrl +/* 8028F57C 0028C4DC 4E 80 04 21 */ bctrl lbl_8028F580: /* 8028F580 0028C4E0 57 A0 06 3F */ clrlwi. r0, r29, 0x18 /* 8028F584 0028C4E4 41 82 00 84 */ beq lbl_8028F608 @@ -5099,7 +5099,7 @@ lbl_8028F634: /* 8028F640 0028C5A0 83 A1 01 74 */ lwz r29, 0x174(r1) /* 8028F644 0028C5A4 7C 08 03 A6 */ mtlr r0 /* 8028F648 0028C5A8 38 21 01 80 */ addi r1, r1, 0x180 -/* 8028F64C 0028C5AC 4E 80 00 20 */ blr +/* 8028F64C 0028C5AC 4E 80 00 20 */ blr .global PreRender__12COmegaPirateFR13CStateManagerRC14CFrustumPlanes PreRender__12COmegaPirateFR13CStateManagerRC14CFrustumPlanes: @@ -5143,7 +5143,7 @@ lbl_8028F6D8: /* 8028F6E0 0028C640 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8028F6E4 0028C644 7C 08 03 A6 */ mtlr r0 /* 8028F6E8 0028C648 38 21 00 20 */ addi r1, r1, 0x20 -/* 8028F6EC 0028C64C 4E 80 00 20 */ blr +/* 8028F6EC 0028C64C 4E 80 00 20 */ blr .global sub_8028f6f0 sub_8028f6f0: @@ -5387,7 +5387,7 @@ lbl_8028FA38: /* 8028FA54 0028C9B4 83 A1 00 44 */ lwz r29, 0x44(r1) /* 8028FA58 0028C9B8 7C 08 03 A6 */ mtlr r0 /* 8028FA5C 0028C9BC 38 21 00 70 */ addi r1, r1, 0x70 -/* 8028FA60 0028C9C0 4E 80 00 20 */ blr +/* 8028FA60 0028C9C0 4E 80 00 20 */ blr .global sub_8028fa64 sub_8028fa64: @@ -5414,7 +5414,7 @@ sub_8028fa64: /* 8028FAB4 0028CA14 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8028FAB8 0028CA18 7C 08 03 A6 */ mtlr r0 /* 8028FABC 0028CA1C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8028FAC0 0028CA20 4E 80 00 20 */ blr +/* 8028FAC0 0028CA20 4E 80 00 20 */ blr .global Think__12COmegaPirateFfR13CStateManager Think__12COmegaPirateFfR13CStateManager: @@ -5447,7 +5447,7 @@ Think__12COmegaPirateFfR13CStateManager: /* 8028FB2C 0028CA8C 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8028FB30 0028CA90 EF A0 07 B2 */ fmuls f29, f0, f30 /* 8028FB34 0028CA94 7D 89 03 A6 */ mtctr r12 -/* 8028FB38 0028CA98 4E 80 04 21 */ bctrl +/* 8028FB38 0028CA98 4E 80 04 21 */ bctrl /* 8028FB3C 0028CA9C C0 02 BE F8 */ lfs f0, lbl_805ADC18@sda21(r2) /* 8028FB40 0028CAA0 C0 23 00 00 */ lfs f1, 0(r3) /* 8028FB44 0028CAA4 EC 00 07 B2 */ fmuls f0, f0, f30 @@ -5463,7 +5463,7 @@ lbl_8028FB60: /* 8028FB68 0028CAC8 81 9E 00 00 */ lwz r12, 0(r30) /* 8028FB6C 0028CACC 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8028FB70 0028CAD0 7D 89 03 A6 */ mtctr r12 -/* 8028FB74 0028CAD4 4E 80 04 21 */ bctrl +/* 8028FB74 0028CAD4 4E 80 04 21 */ bctrl /* 8028FB78 0028CAD8 C0 03 00 00 */ lfs f0, 0(r3) /* 8028FB7C 0028CADC FC 00 E8 40 */ fcmpo cr0, f0, f29 /* 8028FB80 0028CAE0 4C 40 13 82 */ cror 2, 0, 2 @@ -5556,7 +5556,7 @@ lbl_8028FC8C: /* 8028FCCC 0028CC2C 38 80 00 00 */ li r4, 0 /* 8028FCD0 0028CC30 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 8028FCD4 0028CC34 7D 89 03 A6 */ mtctr r12 -/* 8028FCD8 0028CC38 4E 80 04 21 */ bctrl +/* 8028FCD8 0028CC38 4E 80 04 21 */ bctrl /* 8028FCDC 0028CC3C 48 00 00 C4 */ b lbl_8028FDA0 lbl_8028FCE0: /* 8028FCE0 0028CC40 7F C3 F3 78 */ mr r3, r30 @@ -5589,7 +5589,7 @@ lbl_8028FCE0: /* 8028FD4C 0028CCAC 38 80 00 01 */ li r4, 1 /* 8028FD50 0028CCB0 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 8028FD54 0028CCB4 7D 89 03 A6 */ mtctr r12 -/* 8028FD58 0028CCB8 4E 80 04 21 */ bctrl +/* 8028FD58 0028CCB8 4E 80 04 21 */ bctrl /* 8028FD5C 0028CCBC 48 00 00 44 */ b lbl_8028FDA0 lbl_8028FD60: /* 8028FD60 0028CCC0 80 7E 0A 9C */ lwz r3, 0xa9c(r30) @@ -5607,7 +5607,7 @@ lbl_8028FD60: /* 8028FD90 0028CCF0 38 80 00 00 */ li r4, 0 /* 8028FD94 0028CCF4 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 8028FD98 0028CCF8 7D 89 03 A6 */ mtctr r12 -/* 8028FD9C 0028CCFC 4E 80 04 21 */ bctrl +/* 8028FD9C 0028CCFC 4E 80 04 21 */ bctrl lbl_8028FDA0: /* 8028FDA0 0028CD00 FC 20 F8 90 */ fmr f1, f31 /* 8028FDA4 0028CD04 7F C3 F3 78 */ mr r3, r30 @@ -5635,21 +5635,21 @@ lbl_8028FDA0: /* 8028FDFC 0028CD5C 81 9E 00 00 */ lwz r12, 0(r30) /* 8028FE00 0028CD60 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8028FE04 0028CD64 7D 89 03 A6 */ mtctr r12 -/* 8028FE08 0028CD68 4E 80 04 21 */ bctrl +/* 8028FE08 0028CD68 4E 80 04 21 */ bctrl /* 8028FE0C 0028CD6C C3 C3 00 00 */ lfs f30, 0(r3) /* 8028FE10 0028CD70 7F A3 EB 78 */ mr r3, r29 /* 8028FE14 0028CD74 81 9D 00 00 */ lwz r12, 0(r29) /* 8028FE18 0028CD78 7F E4 FB 78 */ mr r4, r31 /* 8028FE1C 0028CD7C 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8028FE20 0028CD80 7D 89 03 A6 */ mtctr r12 -/* 8028FE24 0028CD84 4E 80 04 21 */ bctrl +/* 8028FE24 0028CD84 4E 80 04 21 */ bctrl /* 8028FE28 0028CD88 7C 7D 1B 78 */ mr r29, r3 /* 8028FE2C 0028CD8C 7F C3 F3 78 */ mr r3, r30 /* 8028FE30 0028CD90 81 9E 00 00 */ lwz r12, 0(r30) /* 8028FE34 0028CD94 7F E4 FB 78 */ mr r4, r31 /* 8028FE38 0028CD98 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8028FE3C 0028CD9C 7D 89 03 A6 */ mtctr r12 -/* 8028FE40 0028CDA0 4E 80 04 21 */ bctrl +/* 8028FE40 0028CDA0 4E 80 04 21 */ bctrl /* 8028FE44 0028CDA4 C0 1D 00 00 */ lfs f0, 0(r29) /* 8028FE48 0028CDA8 7F E4 FB 78 */ mr r4, r31 /* 8028FE4C 0028CDAC D0 03 00 00 */ stfs f0, 0(r3) @@ -5659,7 +5659,7 @@ lbl_8028FDA0: /* 8028FE5C 0028CDBC 81 9E 00 00 */ lwz r12, 0(r30) /* 8028FE60 0028CDC0 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8028FE64 0028CDC4 7D 89 03 A6 */ mtctr r12 -/* 8028FE68 0028CDC8 4E 80 04 21 */ bctrl +/* 8028FE68 0028CDC8 4E 80 04 21 */ bctrl /* 8028FE6C 0028CDCC C0 23 00 00 */ lfs f1, 0(r3) /* 8028FE70 0028CDD0 C0 1E 0B 5C */ lfs f0, 0xb5c(r30) /* 8028FE74 0028CDD4 EC 3E 08 28 */ fsubs f1, f30, f1 @@ -5674,7 +5674,7 @@ lbl_8028FE8C: /* 8028FE94 0028CDF4 81 9E 00 00 */ lwz r12, 0(r30) /* 8028FE98 0028CDF8 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8028FE9C 0028CDFC 7D 89 03 A6 */ mtctr r12 -/* 8028FEA0 0028CE00 4E 80 04 21 */ bctrl +/* 8028FEA0 0028CE00 4E 80 04 21 */ bctrl /* 8028FEA4 0028CE04 C0 23 00 00 */ lfs f1, 0(r3) /* 8028FEA8 0028CE08 C0 02 BE 9C */ lfs f0, lbl_805ADBBC@sda21(r2) /* 8028FEAC 0028CE0C FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -5997,7 +5997,7 @@ lbl_802902C0: /* 8029034C 0028D2AC 38 C0 00 19 */ li r6, 0x19 /* 80290350 0028D2B0 81 8C 00 68 */ lwz r12, 0x68(r12) /* 80290354 0028D2B4 7D 89 03 A6 */ mtctr r12 -/* 80290358 0028D2B8 4E 80 04 21 */ bctrl +/* 80290358 0028D2B8 4E 80 04 21 */ bctrl /* 8029035C 0028D2BC 3C 80 80 3E */ lis r4, lbl_803D9B98@ha /* 80290360 0028D2C0 34 61 01 10 */ addic. r3, r1, 0x110 /* 80290364 0028D2C4 38 04 9B 98 */ addi r0, r4, lbl_803D9B98@l @@ -6056,7 +6056,7 @@ lbl_80290408: /* 80290424 0028D384 80 01 01 74 */ lwz r0, 0x174(r1) /* 80290428 0028D388 7C 08 03 A6 */ mtlr r0 /* 8029042C 0028D38C 38 21 01 70 */ addi r1, r1, 0x170 -/* 80290430 0028D390 4E 80 00 20 */ blr +/* 80290430 0028D390 4E 80 00 20 */ blr .global sub_80290434 sub_80290434: @@ -6079,7 +6079,7 @@ sub_80290434: /* 80290474 0028D3D4 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80290478 0028D3D8 7C 08 03 A6 */ mtlr r0 /* 8029047C 0028D3DC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80290480 0028D3E0 4E 80 00 20 */ blr +/* 80290480 0028D3E0 4E 80 00 20 */ blr .global AggressionCheck__12COmegaPirateFR13CStateManagerf AggressionCheck__12COmegaPirateFR13CStateManagerf: @@ -6102,7 +6102,7 @@ lbl_802904B8: /* 802904C0 0028D420 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802904C4 0028D424 7C 08 03 A6 */ mtlr r0 /* 802904C8 0028D428 38 21 00 10 */ addi r1, r1, 0x10 -/* 802904CC 0028D42C 4E 80 00 20 */ blr +/* 802904CC 0028D42C 4E 80 00 20 */ blr .global ShotAt__12COmegaPirateFR13CStateManagerf ShotAt__12COmegaPirateFR13CStateManagerf: @@ -6113,7 +6113,7 @@ ShotAt__12COmegaPirateFR13CStateManagerf: /* 802904E0 0028D440 80 01 00 14 */ lwz r0, 0x14(r1) /* 802904E4 0028D444 7C 08 03 A6 */ mtlr r0 /* 802904E8 0028D448 38 21 00 10 */ addi r1, r1, 0x10 -/* 802904EC 0028D44C 4E 80 00 20 */ blr +/* 802904EC 0028D44C 4E 80 00 20 */ blr .global ShouldCallForBackup__12COmegaPirateFR13CStateManagerf ShouldCallForBackup__12COmegaPirateFR13CStateManagerf: @@ -6150,7 +6150,7 @@ lbl_80290550: /* 80290564 0028D4C4 83 A1 00 1C */ lwz r29, 0x1c(r1) /* 80290568 0028D4C8 7C 08 03 A6 */ mtlr r0 /* 8029056C 0028D4CC 38 21 00 30 */ addi r1, r1, 0x30 -/* 80290570 0028D4D0 4E 80 00 20 */ blr +/* 80290570 0028D4D0 4E 80 00 20 */ blr .global ShouldFire__12COmegaPirateFR13CStateManagerf ShouldFire__12COmegaPirateFR13CStateManagerf: @@ -6183,7 +6183,7 @@ lbl_802905C8: /* 802905D8 0028D538 83 A1 00 14 */ lwz r29, 0x14(r1) /* 802905DC 0028D53C 7C 08 03 A6 */ mtlr r0 /* 802905E0 0028D540 38 21 00 20 */ addi r1, r1, 0x20 -/* 802905E4 0028D544 4E 80 00 20 */ blr +/* 802905E4 0028D544 4E 80 00 20 */ blr .global DoUserAnimEvent__12COmegaPirateFR13CStateManagerRC13CInt32POINode14EUserEventType DoUserAnimEvent__12COmegaPirateFR13CStateManagerRC13CInt32POINode14EUserEventType: @@ -6201,7 +6201,7 @@ DoUserAnimEvent__12COmegaPirateFR13CStateManagerRC13CInt32POINode14EUserEventTyp /* 80290614 0028D574 38 E7 B7 54 */ addi r7, r7, lbl_803EB754@l /* 80290618 0028D578 7C 07 00 2E */ lwzx r0, r7, r0 /* 8029061C 0028D57C 7C 09 03 A6 */ mtctr r0 -/* 80290620 0028D580 4E 80 04 20 */ bctr +/* 80290620 0028D580 4E 80 04 20 */ bctr .global lbl_80290624 lbl_80290624: /* 80290624 0028D584 4B F9 BD DD */ bl DoUserAnimEvent__12CElitePirateFR13CStateManagerRC13CInt32POINode14EUserEventType @@ -6356,7 +6356,7 @@ lbl_802907FC: /* 80290804 0028D764 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80290808 0028D768 7C 08 03 A6 */ mtlr r0 /* 8029080C 0028D76C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80290810 0028D770 4E 80 00 20 */ blr +/* 80290810 0028D770 4E 80 00 20 */ blr .global GetOrbitPosition__12COmegaPirateCFRC13CStateManager GetOrbitPosition__12COmegaPirateCFRC13CStateManager: @@ -6400,7 +6400,7 @@ lbl_80290894: /* 802908A0 0028D800 83 A1 00 14 */ lwz r29, 0x14(r1) /* 802908A4 0028D804 7C 08 03 A6 */ mtlr r0 /* 802908A8 0028D808 38 21 00 20 */ addi r1, r1, 0x20 -/* 802908AC 0028D80C 4E 80 00 20 */ blr +/* 802908AC 0028D80C 4E 80 00 20 */ blr .global AcceptScriptMsg__12COmegaPirateF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__12COmegaPirateF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -6419,7 +6419,7 @@ AcceptScriptMsg__12COmegaPirateF20EScriptObjectMessage9TUniqueIdR13CStateManager /* 802908E0 0028D840 38 A5 B7 BC */ addi r5, r5, lbl_803EB7BC@l /* 802908E4 0028D844 7C 05 00 2E */ lwzx r0, r5, r0 /* 802908E8 0028D848 7C 09 03 A6 */ mtctr r0 -/* 802908EC 0028D84C 4E 80 04 20 */ bctr +/* 802908EC 0028D84C 4E 80 04 20 */ bctr .global lbl_802908F0 lbl_802908F0: /* 802908F0 0028D850 A0 14 00 00 */ lhz r0, 0(r20) @@ -6455,7 +6455,7 @@ lbl_802908F0: /* 80290968 0028D8C8 81 9F 00 00 */ lwz r12, 0(r31) /* 8029096C 0028D8CC 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80290970 0028D8D0 7D 89 03 A6 */ mtctr r12 -/* 80290974 0028D8D4 4E 80 04 21 */ bctrl +/* 80290974 0028D8D4 4E 80 04 21 */ bctrl /* 80290978 0028D8D8 C0 03 00 00 */ lfs f0, 0(r3) /* 8029097C 0028D8DC 7F C3 F3 78 */ mr r3, r30 /* 80290980 0028D8E0 38 81 00 90 */ addi r4, r1, 0x90 @@ -6519,7 +6519,7 @@ lbl_802909FC: /* 80290A58 0028D9B8 38 80 00 01 */ li r4, 1 /* 80290A5C 0028D9BC 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80290A60 0028D9C0 7D 89 03 A6 */ mtctr r12 -/* 80290A64 0028D9C4 4E 80 04 21 */ bctrl +/* 80290A64 0028D9C4 4E 80 04 21 */ bctrl /* 80290A68 0028D9C8 48 00 0C F8 */ b lbl_80291760 .global lbl_80290A6C lbl_80290A6C: @@ -6546,7 +6546,7 @@ lbl_80290A6C: /* 80290ABC 0028DA1C 38 80 00 00 */ li r4, 0 /* 80290AC0 0028DA20 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80290AC4 0028DA24 7D 89 03 A6 */ mtctr r12 -/* 80290AC8 0028DA28 4E 80 04 21 */ bctrl +/* 80290AC8 0028DA28 4E 80 04 21 */ bctrl /* 80290ACC 0028DA2C 48 00 0C 94 */ b lbl_80291760 .global lbl_80290AD0 lbl_80290AD0: @@ -6759,7 +6759,7 @@ lbl_80290CFC: /* 80290DD4 0028DD34 81 96 00 00 */ lwz r12, 0(r22) /* 80290DD8 0028DD38 81 8C 00 38 */ lwz r12, 0x38(r12) /* 80290DDC 0028DD3C 7D 89 03 A6 */ mtctr r12 -/* 80290DE0 0028DD40 4E 80 04 21 */ bctrl +/* 80290DE0 0028DD40 4E 80 04 21 */ bctrl /* 80290DE4 0028DD44 80 83 00 00 */ lwz r4, 0(r3) /* 80290DE8 0028DD48 80 03 00 04 */ lwz r0, 4(r3) /* 80290DEC 0028DD4C 90 9F 0A E4 */ stw r4, 0xae4(r31) @@ -7113,7 +7113,7 @@ lbl_80291218: /* 802912F0 0028E250 B0 01 00 34 */ sth r0, 0x34(r1) /* 802912F4 0028E254 81 8C 02 B0 */ lwz r12, 0x2b0(r12) /* 802912F8 0028E258 7D 89 03 A6 */ mtctr r12 -/* 802912FC 0028E25C 4E 80 04 21 */ bctrl +/* 802912FC 0028E25C 4E 80 04 21 */ bctrl /* 80291300 0028E260 3C 80 80 5A */ lis r4, skZero3f@ha /* 80291304 0028E264 7F C3 F3 78 */ mr r3, r30 /* 80291308 0028E268 39 24 66 A0 */ addi r9, r4, skZero3f@l @@ -7437,7 +7437,7 @@ lbl_80291760: /* 80291764 0028E6C4 80 01 02 64 */ lwz r0, 0x264(r1) /* 80291768 0028E6C8 7C 08 03 A6 */ mtlr r0 /* 8029176C 0028E6CC 38 21 02 60 */ addi r1, r1, 0x260 -/* 80291770 0028E6D0 4E 80 00 20 */ blr +/* 80291770 0028E6D0 4E 80 00 20 */ blr .global sub_80291774 sub_80291774: @@ -7520,7 +7520,7 @@ lbl_8029186C: /* 80291884 0028E7E4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80291888 0028E7E8 7C 08 03 A6 */ mtlr r0 /* 8029188C 0028E7EC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80291890 0028E7F0 4E 80 00 20 */ blr +/* 80291890 0028E7F0 4E 80 00 20 */ blr .global "__ct__12COmegaPirateF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC14CPatternedInfoRC16CActorParametersRC16CElitePirateDataiii" "__ct__12COmegaPirateF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC14CPatternedInfoRC16CActorParametersRC16CElitePirateDataiii": @@ -7582,7 +7582,7 @@ lbl_8029186C: /* 80291970 0028E8D0 81 84 00 00 */ lwz r12, 0(r4) /* 80291974 0028E8D4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80291978 0028E8D8 7D 89 03 A6 */ mtctr r12 -/* 8029197C 0028E8DC 4E 80 04 21 */ bctrl +/* 8029197C 0028E8DC 4E 80 04 21 */ bctrl /* 80291980 0028E8E0 3B A1 00 64 */ addi r29, r1, 0x64 /* 80291984 0028E8E4 38 81 00 3C */ addi r4, r1, 0x3c /* 80291988 0028E8E8 7F A3 EB 78 */ mr r3, r29 @@ -7601,7 +7601,7 @@ lbl_8029186C: /* 802919BC 0028E91C 81 84 00 00 */ lwz r12, 0(r4) /* 802919C0 0028E920 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802919C4 0028E924 7D 89 03 A6 */ mtctr r12 -/* 802919C8 0028E928 4E 80 04 21 */ bctrl +/* 802919C8 0028E928 4E 80 04 21 */ bctrl /* 802919CC 0028E92C 3B 81 00 58 */ addi r28, r1, 0x58 /* 802919D0 0028E930 38 81 00 2C */ addi r4, r1, 0x2c /* 802919D4 0028E934 7F 83 E3 78 */ mr r3, r28 @@ -7620,7 +7620,7 @@ lbl_8029186C: /* 80291A08 0028E968 81 84 00 00 */ lwz r12, 0(r4) /* 80291A0C 0028E96C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80291A10 0028E970 7D 89 03 A6 */ mtctr r12 -/* 80291A14 0028E974 4E 80 04 21 */ bctrl +/* 80291A14 0028E974 4E 80 04 21 */ bctrl /* 80291A18 0028E978 3B 61 00 4C */ addi r27, r1, 0x4c /* 80291A1C 0028E97C 38 81 00 1C */ addi r4, r1, 0x1c /* 80291A20 0028E980 7F 63 DB 78 */ mr r3, r27 @@ -7784,7 +7784,7 @@ lbl_8029186C: /* 80291C98 0028EBF8 81 84 00 00 */ lwz r12, 0(r4) /* 80291C9C 0028EBFC 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80291CA0 0028EC00 7D 89 03 A6 */ mtctr r12 -/* 80291CA4 0028EC04 4E 80 04 21 */ bctrl +/* 80291CA4 0028EC04 4E 80 04 21 */ bctrl /* 80291CA8 0028EC08 38 7F 0B 70 */ addi r3, r31, 0xb70 /* 80291CAC 0028EC0C 38 81 00 14 */ addi r4, r1, 0x14 /* 80291CB0 0028EC10 48 0A F1 F9 */ bl __ct__6CTokenFRC6CToken @@ -7888,7 +7888,7 @@ lbl_80291D78: /* 80291E28 0028ED88 81 9F 00 00 */ lwz r12, 0(r31) /* 80291E2C 0028ED8C 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 80291E30 0028ED90 7D 89 03 A6 */ mtctr r12 -/* 80291E34 0028ED94 4E 80 04 21 */ bctrl +/* 80291E34 0028ED94 4E 80 04 21 */ bctrl /* 80291E38 0028ED98 C0 02 BF 08 */ lfs f0, lbl_805ADC28@sda21(r2) /* 80291E3C 0028ED9C D0 03 00 D8 */ stfs f0, 0xd8(r3) /* 80291E40 0028EDA0 7F E3 FB 78 */ mr r3, r31 @@ -7896,7 +7896,7 @@ lbl_80291D78: /* 80291E48 0028EDA8 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 80291E4C 0028EDAC 7C 08 03 A6 */ mtlr r0 /* 80291E50 0028EDB0 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 80291E54 0028EDB4 4E 80 00 20 */ blr +/* 80291E54 0028EDB4 4E 80 00 20 */ blr .global sub_80291e58 sub_80291e58: @@ -7949,7 +7949,7 @@ lbl_80291EE8: /* 80291EFC 0028EE5C 83 81 00 20 */ lwz r28, 0x20(r1) /* 80291F00 0028EE60 7C 08 03 A6 */ mtlr r0 /* 80291F04 0028EE64 38 21 00 30 */ addi r1, r1, 0x30 -/* 80291F08 0028EE68 4E 80 00 20 */ blr +/* 80291F08 0028EE68 4E 80 00 20 */ blr .global sub_80291f0c sub_80291f0c: @@ -7989,7 +7989,7 @@ lbl_80291F7C: /* 80291F88 0028EEE8 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80291F8C 0028EEEC 7C 08 03 A6 */ mtlr r0 /* 80291F90 0028EEF0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80291F94 0028EEF4 4E 80 00 20 */ blr +/* 80291F94 0028EEF4 4E 80 00 20 */ blr .global sub_80291f98 sub_80291f98: @@ -8014,7 +8014,7 @@ lbl_80291FC4: /* 80291FD8 0028EF38 83 C1 00 08 */ lwz r30, 8(r1) /* 80291FDC 0028EF3C 7C 08 03 A6 */ mtlr r0 /* 80291FE0 0028EF40 38 21 00 10 */ addi r1, r1, 0x10 -/* 80291FE4 0028EF44 4E 80 00 20 */ blr +/* 80291FE4 0028EF44 4E 80 00 20 */ blr .global sub_80291fe8 sub_80291fe8: @@ -8047,7 +8047,7 @@ lbl_80292044: /* 80292044 0028EFA4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80292048 0028EFA8 7C 08 03 A6 */ mtlr r0 /* 8029204C 0028EFAC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80292050 0028EFB0 4E 80 00 20 */ blr +/* 80292050 0028EFB0 4E 80 00 20 */ blr .global __dt__12COmegaPirateFv __dt__12COmegaPirateFv: @@ -8150,12 +8150,12 @@ lbl_802921A0: /* 802921AC 0028F10C 83 C1 00 28 */ lwz r30, 0x28(r1) /* 802921B0 0028F110 7C 08 03 A6 */ mtlr r0 /* 802921B4 0028F114 38 21 00 30 */ addi r1, r1, 0x30 -/* 802921B8 0028F118 4E 80 00 20 */ blr +/* 802921B8 0028F118 4E 80 00 20 */ blr .global sub_802921bc sub_802921bc: /* 802921BC 0028F11C 38 60 00 00 */ li r3, 0 -/* 802921C0 0028F120 4E 80 00 20 */ blr +/* 802921C0 0028F120 4E 80 00 20 */ blr .global sub_802921c4 sub_802921c4: @@ -8215,7 +8215,7 @@ lbl_8029227C: /* 80292288 0028F1E8 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8029228C 0028F1EC 7C 08 03 A6 */ mtlr r0 /* 80292290 0028F1F0 38 21 00 30 */ addi r1, r1, 0x30 -/* 80292294 0028F1F4 4E 80 00 20 */ blr +/* 80292294 0028F1F4 4E 80 00 20 */ blr .global sub_80292298 sub_80292298: @@ -8239,7 +8239,7 @@ lbl_802922C4: /* 802922D4 0028F234 83 C1 00 08 */ lwz r30, 8(r1) /* 802922D8 0028F238 7C 08 03 A6 */ mtlr r0 /* 802922DC 0028F23C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802922E0 0028F240 4E 80 00 20 */ blr +/* 802922E0 0028F240 4E 80 00 20 */ blr .global sub_802922e4 sub_802922e4: @@ -8315,7 +8315,7 @@ lbl_802923BC: /* 802923D8 0028F338 83 A1 00 14 */ lwz r29, 0x14(r1) /* 802923DC 0028F33C 7C 08 03 A6 */ mtlr r0 /* 802923E0 0028F340 38 21 00 20 */ addi r1, r1, 0x20 -/* 802923E4 0028F344 4E 80 00 20 */ blr +/* 802923E4 0028F344 4E 80 00 20 */ blr .global sub_802923e8 sub_802923e8: @@ -8394,7 +8394,7 @@ lbl_802924DC: /* 802924E0 0028F440 80 01 00 34 */ lwz r0, 0x34(r1) /* 802924E4 0028F444 7C 08 03 A6 */ mtlr r0 /* 802924E8 0028F448 38 21 00 30 */ addi r1, r1, 0x30 -/* 802924EC 0028F44C 4E 80 00 20 */ blr +/* 802924EC 0028F44C 4E 80 00 20 */ blr .global sub_802924f0 sub_802924f0: diff --git a/asm/MetroidPrime/Enemies/CParasite.s b/asm/MetroidPrime/Enemies/CParasite.s index 8b89ce2d..f1b212c9 100644 --- a/asm/MetroidPrime/Enemies/CParasite.s +++ b/asm/MetroidPrime/Enemies/CParasite.s @@ -269,7 +269,7 @@ lbl_8046C770: .global lbl_8046C788 lbl_8046C788: .skip 0x18 - + .section .text, "ax" .global __dt__9CParasiteFv @@ -341,7 +341,7 @@ lbl_80156A54: /* 80156A64 001539C4 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80156A68 001539C8 7C 08 03 A6 */ mtlr r0 /* 80156A6C 001539CC 38 21 00 30 */ addi r1, r1, 0x30 -/* 80156A70 001539D0 4E 80 00 20 */ blr +/* 80156A70 001539D0 4E 80 00 20 */ blr .global __dt__11CWallWalkerFv __dt__11CWallWalkerFv: @@ -381,13 +381,13 @@ lbl_80156AE4: /* 80156AF0 00153A50 83 C1 00 08 */ lwz r30, 8(r1) /* 80156AF4 00153A54 7C 08 03 A6 */ mtlr r0 /* 80156AF8 00153A58 38 21 00 10 */ addi r1, r1, 0x10 -/* 80156AFC 00153A5C 4E 80 00 20 */ blr +/* 80156AFC 00153A5C 4E 80 00 20 */ blr .global IsOnGround__9CParasiteCFv IsOnGround__9CParasiteCFv: /* 80156B00 00153A60 88 03 07 42 */ lbz r0, 0x742(r3) /* 80156B04 00153A64 54 03 EF FE */ rlwinm r3, r0, 0x1d, 0x1f, 0x1f -/* 80156B08 00153A68 4E 80 00 20 */ blr +/* 80156B08 00153A68 4E 80 00 20 */ blr .global MassiveFrozenDeath__9CParasiteFR13CStateManager MassiveFrozenDeath__9CParasiteFR13CStateManager: @@ -398,7 +398,7 @@ MassiveFrozenDeath__9CParasiteFR13CStateManager: /* 80156B1C 00153A7C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80156B20 00153A80 7C 08 03 A6 */ mtlr r0 /* 80156B24 00153A84 38 21 00 10 */ addi r1, r1, 0x10 -/* 80156B28 00153A88 4E 80 00 20 */ blr +/* 80156B28 00153A88 4E 80 00 20 */ blr .global MassiveDeath__9CParasiteFR13CStateManager MassiveDeath__9CParasiteFR13CStateManager: @@ -409,7 +409,7 @@ MassiveDeath__9CParasiteFR13CStateManager: /* 80156B3C 00153A9C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80156B40 00153AA0 7C 08 03 A6 */ mtlr r0 /* 80156B44 00153AA4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80156B48 00153AA8 4E 80 00 20 */ blr +/* 80156B48 00153AA8 4E 80 00 20 */ blr .global UpdateCollisionActors__9CParasiteFR13CStateManager UpdateCollisionActors__9CParasiteFR13CStateManager: @@ -452,7 +452,7 @@ lbl_80156B98: /* 80156BD8 00153B38 7F C4 F3 78 */ mr r4, r30 /* 80156BDC 00153B3C 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80156BE0 00153B40 7D 89 03 A6 */ mtctr r12 -/* 80156BE4 00153B44 4E 80 04 21 */ bctrl +/* 80156BE4 00153B44 4E 80 04 21 */ bctrl /* 80156BE8 00153B48 C0 03 00 00 */ lfs f0, 0(r3) /* 80156BEC 00153B4C EF FF 00 2A */ fadds f31, f31, f0 lbl_80156BF0: @@ -494,7 +494,7 @@ lbl_80156C60: /* 80156C74 00153BD4 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80156C78 00153BD8 7C 08 03 A6 */ mtlr r0 /* 80156C7C 00153BDC 38 21 00 40 */ addi r1, r1, 0x40 -/* 80156C80 00153BE0 4E 80 00 20 */ blr +/* 80156C80 00153BE0 4E 80 00 20 */ blr .global SetupIceZoomerVulnerability__9CParasiteFR13CStateManagerRC20CDamageVulnerabilityRC11CHealthInfo SetupIceZoomerVulnerability__9CParasiteFR13CStateManagerRC20CDamageVulnerabilityRC11CHealthInfo: @@ -532,7 +532,7 @@ lbl_80156CAC: /* 80156CFC 00153C5C 81 9E 00 00 */ lwz r12, 0(r30) /* 80156D00 00153C60 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80156D04 00153C64 7D 89 03 A6 */ mtctr r12 -/* 80156D08 00153C68 4E 80 04 21 */ bctrl +/* 80156D08 00153C68 4E 80 04 21 */ bctrl /* 80156D0C 00153C6C C0 1D 00 00 */ lfs f0, 0(r29) /* 80156D10 00153C70 D0 03 00 00 */ stfs f0, 0(r3) /* 80156D14 00153C74 C0 1D 00 04 */ lfs f0, 4(r29) @@ -548,7 +548,7 @@ lbl_80156D20: /* 80156D34 00153C94 80 01 00 34 */ lwz r0, 0x34(r1) /* 80156D38 00153C98 7C 08 03 A6 */ mtlr r0 /* 80156D3C 00153C9C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80156D40 00153CA0 4E 80 00 20 */ blr +/* 80156D40 00153CA0 4E 80 00 20 */ blr .global DestroyActorManager__9CParasiteFR13CStateManager DestroyActorManager__9CParasiteFR13CStateManager: @@ -560,7 +560,7 @@ DestroyActorManager__9CParasiteFR13CStateManager: /* 80156D58 00153CB8 80 01 00 14 */ lwz r0, 0x14(r1) /* 80156D5C 00153CBC 7C 08 03 A6 */ mtlr r0 /* 80156D60 00153CC0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80156D64 00153CC4 4E 80 00 20 */ blr +/* 80156D64 00153CC4 4E 80 00 20 */ blr .global SetupIceZoomerCollision__9CParasiteFR13CStateManager SetupIceZoomerCollision__9CParasiteFR13CStateManager: @@ -690,7 +690,7 @@ lbl_80156F28: /* 80156F48 00153EA8 80 01 00 F4 */ lwz r0, 0xf4(r1) /* 80156F4C 00153EAC 7C 08 03 A6 */ mtlr r0 /* 80156F50 00153EB0 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 80156F54 00153EB4 4E 80 00 20 */ blr +/* 80156F54 00153EB4 4E 80 00 20 */ blr .global GetContactDamage__9CParasiteCFv GetContactDamage__9CParasiteCFv: @@ -732,7 +732,7 @@ lbl_80156FD0: /* 80156FD4 00153F34 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80156FD8 00153F38 7C 08 03 A6 */ mtlr r0 /* 80156FDC 00153F3C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80156FE0 00153F40 4E 80 00 20 */ blr +/* 80156FE0 00153F40 4E 80 00 20 */ blr .global GetDamageVulnerability__9CParasiteCFv GetDamageVulnerability__9CParasiteCFv: @@ -769,7 +769,7 @@ lbl_80157048: /* 80157048 00153FA8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8015704C 00153FAC 7C 08 03 A6 */ mtlr r0 /* 80157050 00153FB0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80157054 00153FB4 4E 80 00 20 */ blr +/* 80157054 00153FB4 4E 80 00 20 */ blr .global Render__9CParasiteCFRC13CStateManager Render__9CParasiteCFRC13CStateManager: @@ -780,7 +780,7 @@ Render__9CParasiteCFRC13CStateManager: /* 80157068 00153FC8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8015706C 00153FCC 7C 08 03 A6 */ mtlr r0 /* 80157070 00153FD0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80157074 00153FD4 4E 80 00 20 */ blr +/* 80157074 00153FD4 4E 80 00 20 */ blr .global DoFlockingBehavior__9CParasiteFR13CStateManager DoFlockingBehavior__9CParasiteFR13CStateManager: @@ -1381,11 +1381,11 @@ lbl_8015793C: /* 80157954 001548B4 80 01 12 84 */ lwz r0, 0x1284(r1) /* 80157958 001548B8 7C 08 03 A6 */ mtlr r0 /* 8015795C 001548BC 38 21 12 80 */ addi r1, r1, 0x1280 -/* 80157960 001548C0 4E 80 00 20 */ blr +/* 80157960 001548C0 4E 80 00 20 */ blr .global UpdatePFDestination__9CParasiteFR13CStateManager UpdatePFDestination__9CParasiteFR13CStateManager: -/* 80157964 001548C4 4E 80 00 20 */ blr +/* 80157964 001548C4 4E 80 00 20 */ blr .global Touch__9CParasiteFR6CActorR13CStateManager Touch__9CParasiteFR6CActorR13CStateManager: @@ -1396,7 +1396,7 @@ Touch__9CParasiteFR6CActorR13CStateManager: /* 80157978 001548D8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8015797C 001548DC 7C 08 03 A6 */ mtlr r0 /* 80157980 001548E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80157984 001548E4 4E 80 00 20 */ blr +/* 80157984 001548E4 4E 80 00 20 */ blr .global GetUp__9CParasiteFR13CStateManager9EStateMsgf GetUp__9CParasiteFR13CStateManager9EStateMsgf: @@ -1434,7 +1434,7 @@ lbl_801579FC: /* 80157A00 00154960 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80157A04 00154964 7C 08 03 A6 */ mtlr r0 /* 80157A08 00154968 38 21 00 20 */ addi r1, r1, 0x20 -/* 80157A0C 0015496C 4E 80 00 20 */ blr +/* 80157A0C 0015496C 4E 80 00 20 */ blr .global Crouch__9CParasiteFR13CStateManager9EStateMsgf Crouch__9CParasiteFR13CStateManager9EStateMsgf: @@ -1472,7 +1472,7 @@ lbl_80157A84: /* 80157A88 001549E8 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80157A8C 001549EC 7C 08 03 A6 */ mtlr r0 /* 80157A90 001549F0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80157A94 001549F4 4E 80 00 20 */ blr +/* 80157A94 001549F4 4E 80 00 20 */ blr .global Halt__9CParasiteFR13CStateManager9EStateMsgf Halt__9CParasiteFR13CStateManager9EStateMsgf: @@ -1569,7 +1569,7 @@ lbl_80157BE4: /* 80157BE8 00154B48 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 80157BEC 00154B4C 7C 08 03 A6 */ mtlr r0 /* 80157BF0 00154B50 38 21 00 40 */ addi r1, r1, 0x40 -/* 80157BF4 00154B54 4E 80 00 20 */ blr +/* 80157BF4 00154B54 4E 80 00 20 */ blr .global TelegraphAttack__9CParasiteFR13CStateManager9EStateMsgf TelegraphAttack__9CParasiteFR13CStateManager9EStateMsgf: @@ -1664,7 +1664,7 @@ lbl_80157D3C: /* 80157D40 00154CA0 80 01 00 44 */ lwz r0, 0x44(r1) /* 80157D44 00154CA4 7C 08 03 A6 */ mtlr r0 /* 80157D48 00154CA8 38 21 00 40 */ addi r1, r1, 0x40 -/* 80157D4C 00154CAC 4E 80 00 20 */ blr +/* 80157D4C 00154CAC 4E 80 00 20 */ blr .global Death__9CParasiteFRC9CVector3fR13CStateManager Death__9CParasiteFRC9CVector3fR13CStateManager: @@ -1687,12 +1687,12 @@ Death__9CParasiteFRC9CVector3fR13CStateManager: /* 80157D90 00154CF0 C0 22 9E 50 */ lfs f1, lbl_805ABB70@sda21(r2) /* 80157D94 00154CF4 81 8C 01 30 */ lwz r12, 0x130(r12) /* 80157D98 00154CF8 7D 89 03 A6 */ mtctr r12 -/* 80157D9C 00154CFC 4E 80 04 21 */ bctrl +/* 80157D9C 00154CFC 4E 80 04 21 */ bctrl /* 80157DA0 00154D00 7F 83 E3 78 */ mr r3, r28 /* 80157DA4 00154D04 81 9C 00 00 */ lwz r12, 0(r28) /* 80157DA8 00154D08 81 8C 00 80 */ lwz r12, 0x80(r12) /* 80157DAC 00154D0C 7D 89 03 A6 */ mtctr r12 -/* 80157DB0 00154D10 4E 80 04 21 */ bctrl +/* 80157DB0 00154D10 4E 80 04 21 */ bctrl /* 80157DB4 00154D14 C0 02 9E 50 */ lfs f0, lbl_805ABB70@sda21(r2) /* 80157DB8 00154D18 FC 20 08 50 */ fneg f1, f1 /* 80157DBC 00154D1C 7F 83 E3 78 */ mr r3, r28 @@ -1710,7 +1710,7 @@ Death__9CParasiteFRC9CVector3fR13CStateManager: /* 80157DEC 00154D4C 83 81 00 10 */ lwz r28, 0x10(r1) /* 80157DF0 00154D50 7C 08 03 A6 */ mtlr r0 /* 80157DF4 00154D54 38 21 00 20 */ addi r1, r1, 0x20 -/* 80157DF8 00154D58 4E 80 00 20 */ blr +/* 80157DF8 00154D58 4E 80 00 20 */ blr .global TargetPlayer__9CParasiteFR13CStateManager9EStateMsgf TargetPlayer__9CParasiteFR13CStateManager9EStateMsgf: @@ -1779,7 +1779,7 @@ lbl_80157EE4: /* 80157EE8 00154E48 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 80157EEC 00154E4C 7C 08 03 A6 */ mtlr r0 /* 80157EF0 00154E50 38 21 00 40 */ addi r1, r1, 0x40 -/* 80157EF4 00154E54 4E 80 00 20 */ blr +/* 80157EF4 00154E54 4E 80 00 20 */ blr .global Retreat__9CParasiteFR13CStateManager9EStateMsgf Retreat__9CParasiteFR13CStateManager9EStateMsgf: @@ -1950,7 +1950,7 @@ lbl_80158164: /* 8015816C 001550CC 83 C1 00 58 */ lwz r30, 0x58(r1) /* 80158170 001550D0 7C 08 03 A6 */ mtlr r0 /* 80158174 001550D4 38 21 00 60 */ addi r1, r1, 0x60 -/* 80158178 001550D8 4E 80 00 20 */ blr +/* 80158178 001550D8 4E 80 00 20 */ blr .global Attack__9CParasiteFR13CStateManager9EStateMsgf Attack__9CParasiteFR13CStateManager9EStateMsgf: @@ -2205,7 +2205,7 @@ lbl_80158504: /* 80158538 00155498 83 A1 00 84 */ lwz r29, 0x84(r1) /* 8015853C 0015549C 7C 08 03 A6 */ mtlr r0 /* 80158540 001554A0 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 80158544 001554A4 4E 80 00 20 */ blr +/* 80158544 001554A4 4E 80 00 20 */ blr .global FaceTarget__9CParasiteF9CVector3f FaceTarget__9CParasiteF9CVector3f: @@ -2281,7 +2281,7 @@ FaceTarget__9CParasiteF9CVector3f: /* 8015865C 001555BC 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 80158660 001555C0 7C 08 03 A6 */ mtlr r0 /* 80158664 001555C4 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 80158668 001555C8 4E 80 00 20 */ blr +/* 80158668 001555C8 4E 80 00 20 */ blr .global Patrol__9CParasiteFR13CStateManager9EStateMsgf Patrol__9CParasiteFR13CStateManager9EStateMsgf: @@ -2387,7 +2387,7 @@ lbl_801587D0: /* 801587D8 00155738 83 C1 00 08 */ lwz r30, 8(r1) /* 801587DC 0015573C 7C 08 03 A6 */ mtlr r0 /* 801587E0 00155740 38 21 00 10 */ addi r1, r1, 0x10 -/* 801587E4 00155744 4E 80 00 20 */ blr +/* 801587E4 00155744 4E 80 00 20 */ blr .global TargetPatrol__9CParasiteFR13CStateManager9EStateMsgf TargetPatrol__9CParasiteFR13CStateManager9EStateMsgf: @@ -2424,7 +2424,7 @@ lbl_80158854: /* 80158858 001557B8 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8015885C 001557BC 7C 08 03 A6 */ mtlr r0 /* 80158860 001557C0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80158864 001557C4 4E 80 00 20 */ blr +/* 80158864 001557C4 4E 80 00 20 */ blr .global Jump__9CParasiteFR13CStateManager9EStateMsgf Jump__9CParasiteFR13CStateManager9EStateMsgf: @@ -2451,7 +2451,7 @@ lbl_801588A0: /* 801588B0 00155810 81 9F 00 00 */ lwz r12, 0(r31) /* 801588B4 00155814 81 8C 00 80 */ lwz r12, 0x80(r12) /* 801588B8 00155818 7D 89 03 A6 */ mtctr r12 -/* 801588BC 0015581C 4E 80 04 21 */ bctrl +/* 801588BC 0015581C 4E 80 04 21 */ bctrl /* 801588C0 00155820 C0 02 9E 50 */ lfs f0, lbl_805ABB70@sda21(r2) /* 801588C4 00155824 FC 20 08 50 */ fneg f1, f1 /* 801588C8 00155828 38 80 00 00 */ li r4, 0 @@ -2476,7 +2476,7 @@ lbl_80158910: /* 80158910 00155870 81 83 00 00 */ lwz r12, 0(r3) /* 80158914 00155874 81 8C 00 80 */ lwz r12, 0x80(r12) /* 80158918 00155878 7D 89 03 A6 */ mtctr r12 -/* 8015891C 0015587C 4E 80 04 21 */ bctrl +/* 8015891C 0015587C 4E 80 04 21 */ bctrl /* 80158920 00155880 C0 02 9E 50 */ lfs f0, lbl_805ABB70@sda21(r2) /* 80158924 00155884 FC 20 08 50 */ fneg f1, f1 /* 80158928 00155888 D0 1F 01 50 */ stfs f0, 0x150(r31) @@ -2511,7 +2511,7 @@ lbl_80158990: /* 80158994 001558F4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80158998 001558F8 7C 08 03 A6 */ mtlr r0 /* 8015899C 001558FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801589A0 00155900 4E 80 00 20 */ blr +/* 801589A0 00155900 4E 80 00 20 */ blr .global PathFind__9CParasiteFR13CStateManager9EStateMsgf PathFind__9CParasiteFR13CStateManager9EStateMsgf: @@ -2583,11 +2583,11 @@ lbl_80158A88: /* 80158A90 001559F0 83 C1 00 08 */ lwz r30, 8(r1) /* 80158A94 001559F4 7C 08 03 A6 */ mtlr r0 /* 80158A98 001559F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80158A9C 001559FC 4E 80 00 20 */ blr +/* 80158A9C 001559FC 4E 80 00 20 */ blr .global Run__9CParasiteFR13CStateManager9EStateMsgf Run__9CParasiteFR13CStateManager9EStateMsgf: -/* 80158AA0 00155A00 4E 80 00 20 */ blr +/* 80158AA0 00155A00 4E 80 00 20 */ blr .global Deactivate__9CParasiteFR13CStateManager9EStateMsgf Deactivate__9CParasiteFR13CStateManager9EStateMsgf: @@ -2690,7 +2690,7 @@ lbl_80158C08: /* 80158C10 00155B70 83 C1 00 38 */ lwz r30, 0x38(r1) /* 80158C14 00155B74 7C 08 03 A6 */ mtlr r0 /* 80158C18 00155B78 38 21 00 40 */ addi r1, r1, 0x40 -/* 80158C1C 00155B7C 4E 80 00 20 */ blr +/* 80158C1C 00155B7C 4E 80 00 20 */ blr .global Generate__9CParasiteFR13CStateManager9EStateMsgf Generate__9CParasiteFR13CStateManager9EStateMsgf: @@ -2788,7 +2788,7 @@ lbl_80158D70: /* 80158D74 00155CD4 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 80158D78 00155CD8 7C 08 03 A6 */ mtlr r0 /* 80158D7C 00155CDC 38 21 00 30 */ addi r1, r1, 0x30 -/* 80158D80 00155CE0 4E 80 00 20 */ blr +/* 80158D80 00155CE0 4E 80 00 20 */ blr .global ShouldAttack__9CParasiteFR13CStateManagerf ShouldAttack__9CParasiteFR13CStateManagerf: @@ -2821,7 +2821,7 @@ lbl_80158DD8: /* 80158DE8 00155D48 3B E0 00 00 */ li r31, 0 /* 80158DEC 00155D4C 81 8C 01 9C */ lwz r12, 0x19c(r12) /* 80158DF0 00155D50 7D 89 03 A6 */ mtctr r12 -/* 80158DF4 00155D54 4E 80 04 21 */ bctrl +/* 80158DF4 00155D54 4E 80 04 21 */ bctrl /* 80158DF8 00155D58 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80158DFC 00155D5C 40 82 00 58 */ bne lbl_80158E54 /* 80158E00 00155D60 7F 83 E3 78 */ mr r3, r28 @@ -2830,7 +2830,7 @@ lbl_80158DD8: /* 80158E0C 00155D6C 7F A4 EB 78 */ mr r4, r29 /* 80158E10 00155D70 81 8C 01 A4 */ lwz r12, 0x1a4(r12) /* 80158E14 00155D74 7D 89 03 A6 */ mtctr r12 -/* 80158E18 00155D78 4E 80 04 21 */ bctrl +/* 80158E18 00155D78 4E 80 04 21 */ bctrl /* 80158E1C 00155D7C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80158E20 00155D80 41 82 00 34 */ beq lbl_80158E54 /* 80158E24 00155D84 57 C0 06 3F */ clrlwi. r0, r30, 0x18 @@ -2841,7 +2841,7 @@ lbl_80158DD8: /* 80158E38 00155D98 C0 22 9E 50 */ lfs f1, lbl_805ABB70@sda21(r2) /* 80158E3C 00155D9C 81 8C 01 A8 */ lwz r12, 0x1a8(r12) /* 80158E40 00155DA0 7D 89 03 A6 */ mtctr r12 -/* 80158E44 00155DA4 4E 80 04 21 */ bctrl +/* 80158E44 00155DA4 4E 80 04 21 */ bctrl /* 80158E48 00155DA8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80158E4C 00155DAC 41 82 00 08 */ beq lbl_80158E54 lbl_80158E50: @@ -2857,7 +2857,7 @@ lbl_80158E54: /* 80158E70 00155DD0 83 81 00 10 */ lwz r28, 0x10(r1) /* 80158E74 00155DD4 7C 08 03 A6 */ mtlr r0 /* 80158E78 00155DD8 38 21 00 30 */ addi r1, r1, 0x30 -/* 80158E7C 00155DDC 4E 80 00 20 */ blr +/* 80158E7C 00155DDC 4E 80 00 20 */ blr .global HitSomething__9CParasiteFR13CStateManagerf HitSomething__9CParasiteFR13CStateManagerf: @@ -2886,13 +2886,13 @@ lbl_80158EC8: /* 80158ED0 00155E30 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80158ED4 00155E34 7C 08 03 A6 */ mtlr r0 /* 80158ED8 00155E38 38 21 00 10 */ addi r1, r1, 0x10 -/* 80158EDC 00155E3C 4E 80 00 20 */ blr +/* 80158EDC 00155E3C 4E 80 00 20 */ blr .global Landed__9CParasiteFR13CStateManagerf Landed__9CParasiteFR13CStateManagerf: /* 80158EE0 00155E40 88 03 07 42 */ lbz r0, 0x742(r3) /* 80158EE4 00155E44 54 03 E7 FE */ rlwinm r3, r0, 0x1c, 0x1f, 0x1f -/* 80158EE8 00155E48 4E 80 00 20 */ blr +/* 80158EE8 00155E48 4E 80 00 20 */ blr .global AnimOver__9CParasiteFR13CStateManagerf AnimOver__9CParasiteFR13CStateManagerf: @@ -2900,7 +2900,7 @@ AnimOver__9CParasiteFR13CStateManagerf: /* 80158EF0 00155E50 20 00 00 02 */ subfic r0, r0, 2 /* 80158EF4 00155E54 7C 00 00 34 */ cntlzw r0, r0 /* 80158EF8 00155E58 54 03 D9 7E */ srwi r3, r0, 5 -/* 80158EFC 00155E5C 4E 80 00 20 */ blr +/* 80158EFC 00155E5C 4E 80 00 20 */ blr .global GetClosestWaypointForState__9CParasiteCF18EScriptObjectStateR13CStateManager GetClosestWaypointForState__9CParasiteCF18EScriptObjectStateR13CStateManager: @@ -2962,7 +2962,7 @@ lbl_80158FA8: /* 80158FD0 00155F30 80 01 00 54 */ lwz r0, 0x54(r1) /* 80158FD4 00155F34 7C 08 03 A6 */ mtlr r0 /* 80158FD8 00155F38 38 21 00 50 */ addi r1, r1, 0x50 -/* 80158FDC 00155F3C 4E 80 00 20 */ blr +/* 80158FDC 00155F3C 4E 80 00 20 */ blr .global RecursiveFindClosestWayPoint__9CParasiteCFR13CStateManager9TUniqueIdRf RecursiveFindClosestWayPoint__9CParasiteCFR13CStateManager9TUniqueIdRf: @@ -2994,7 +2994,7 @@ lbl_80159038: /* 80159040 00155FA0 81 9F 00 00 */ lwz r12, 0(r31) /* 80159044 00155FA4 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80159048 00155FA8 7D 89 03 A6 */ mtctr r12 -/* 8015904C 00155FAC 4E 80 04 21 */ bctrl +/* 8015904C 00155FAC 4E 80 04 21 */ bctrl /* 80159050 00155FB0 C0 DF 00 50 */ lfs f6, 0x50(r31) /* 80159054 00155FB4 C0 1A 00 50 */ lfs f0, 0x50(r26) /* 80159058 00155FB8 C0 3F 00 40 */ lfs f1, 0x40(r31) @@ -3078,14 +3078,14 @@ lbl_80159164: /* 80159184 001560E4 81 9F 00 00 */ lwz r12, 0(r31) /* 80159188 001560E8 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 8015918C 001560EC 7D 89 03 A6 */ mtctr r12 -/* 80159190 001560F0 4E 80 04 21 */ bctrl +/* 80159190 001560F0 4E 80 04 21 */ bctrl /* 80159194 001560F4 B3 D9 00 00 */ sth r30, 0(r25) lbl_80159198: /* 80159198 001560F8 BB 21 00 54 */ lmw r25, 0x54(r1) /* 8015919C 001560FC 80 01 00 74 */ lwz r0, 0x74(r1) /* 801591A0 00156100 7C 08 03 A6 */ mtlr r0 /* 801591A4 00156104 38 21 00 70 */ addi r1, r1, 0x70 -/* 801591A8 00156108 4E 80 00 20 */ blr +/* 801591A8 00156108 4E 80 00 20 */ blr .global CollidedWith__9CParasiteFRC9TUniqueIdRC18CCollisionInfoListR13CStateManager CollidedWith__9CParasiteFRC9TUniqueIdRC18CCollisionInfoListR13CStateManager: @@ -3178,7 +3178,7 @@ lbl_801592E0: /* 801592F0 00156250 83 81 00 20 */ lwz r28, 0x20(r1) /* 801592F4 00156254 7C 08 03 A6 */ mtlr r0 /* 801592F8 00156258 38 21 00 30 */ addi r1, r1, 0x30 -/* 801592FC 0015625C 4E 80 00 20 */ blr +/* 801592FC 0015625C 4E 80 00 20 */ blr .global CloseToWall__9CParasiteFR13CStateManager CloseToWall__9CParasiteFR13CStateManager: @@ -3272,7 +3272,7 @@ lbl_80159364: /* 80159458 001563B8 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 8015945C 001563BC 7C 08 03 A6 */ mtlr r0 /* 80159460 001563C0 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 80159464 001563C4 4E 80 00 20 */ blr +/* 80159464 001563C4 4E 80 00 20 */ blr .global ShotAt__9CParasiteFR13CStateManagerf ShotAt__9CParasiteFR13CStateManagerf: @@ -3284,17 +3284,17 @@ ShotAt__9CParasiteFR13CStateManagerf: /* 8015947C 001563DC 7C 03 00 D0 */ neg r0, r3 /* 80159480 001563E0 7C 00 1B 78 */ or r0, r0, r3 /* 80159484 001563E4 54 03 0F FE */ srwi r3, r0, 0x1f -/* 80159488 001563E8 4E 80 00 20 */ blr +/* 80159488 001563E8 4E 80 00 20 */ blr lbl_8015948C: /* 8015948C 001563EC 88 03 07 43 */ lbz r0, 0x743(r3) /* 80159490 001563F0 54 03 DF FE */ rlwinm r3, r0, 0x1b, 0x1f, 0x1f -/* 80159494 001563F4 4E 80 00 20 */ blr +/* 80159494 001563F4 4E 80 00 20 */ blr .global AttackOver__9CParasiteFR13CStateManagerf AttackOver__9CParasiteFR13CStateManagerf: /* 80159498 001563F8 88 03 07 42 */ lbz r0, 0x742(r3) /* 8015949C 001563FC 54 03 FF FE */ rlwinm r3, r0, 0x1f, 0x1f, 0x1f -/* 801594A0 00156400 4E 80 00 20 */ blr +/* 801594A0 00156400 4E 80 00 20 */ blr .global Stuck__9CParasiteFR13CStateManagerf Stuck__9CParasiteFR13CStateManagerf: @@ -3303,7 +3303,7 @@ Stuck__9CParasiteFR13CStateManagerf: /* 801594AC 0015640C FC 01 00 40 */ fcmpo cr0, f1, f0 /* 801594B0 00156410 7C 00 00 26 */ mfcr r0 /* 801594B4 00156414 54 03 17 FE */ rlwinm r3, r0, 2, 0x1f, 0x1f -/* 801594B8 00156418 4E 80 00 20 */ blr +/* 801594B8 00156418 4E 80 00 20 */ blr .global ThinkAboutMove__9CParasiteFf ThinkAboutMove__9CParasiteFf: @@ -3325,7 +3325,7 @@ lbl_801594F4: /* 801594F4 00156454 80 01 00 14 */ lwz r0, 0x14(r1) /* 801594F8 00156458 7C 08 03 A6 */ mtlr r0 /* 801594FC 0015645C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80159500 00156460 4E 80 00 20 */ blr +/* 80159500 00156460 4E 80 00 20 */ blr .global GetAimPosition__9CParasiteCFRC13CStateManagerf GetAimPosition__9CParasiteCFRC13CStateManagerf: @@ -3335,7 +3335,7 @@ GetAimPosition__9CParasiteCFRC13CStateManagerf: /* 80159510 00156470 D0 03 00 00 */ stfs f0, 0(r3) /* 80159514 00156474 D0 23 00 04 */ stfs f1, 4(r3) /* 80159518 00156478 D0 43 00 08 */ stfs f2, 8(r3) -/* 8015951C 0015647C 4E 80 00 20 */ blr +/* 8015951C 0015647C 4E 80 00 20 */ blr .global UpdateJumpVelocity__9CParasiteFv UpdateJumpVelocity__9CParasiteFv: @@ -3358,7 +3358,7 @@ UpdateJumpVelocity__9CParasiteFv: /* 80159560 001564C0 7C 7E 1B 78 */ mr r30, r3 /* 80159564 001564C4 81 8C 00 80 */ lwz r12, 0x80(r12) /* 80159568 001564C8 7D 89 03 A6 */ mtctr r12 -/* 8015956C 001564CC 4E 80 04 21 */ bctrl +/* 8015956C 001564CC 4E 80 04 21 */ bctrl /* 80159570 001564D0 C0 02 9E 50 */ lfs f0, lbl_805ABB70@sda21(r2) /* 80159574 001564D4 FC 20 08 50 */ fneg f1, f1 /* 80159578 001564D8 3C 60 80 5A */ lis r3, skZero3f@ha @@ -3507,7 +3507,7 @@ lbl_80159760: /* 8015979C 001566FC 83 C1 00 38 */ lwz r30, 0x38(r1) /* 801597A0 00156700 7C 08 03 A6 */ mtlr r0 /* 801597A4 00156704 38 21 00 90 */ addi r1, r1, 0x90 -/* 801597A8 00156708 4E 80 00 20 */ blr +/* 801597A8 00156708 4E 80 00 20 */ blr .global UpdateWalkerAnimation__9CParasiteFR13CStateManagerf UpdateWalkerAnimation__9CParasiteFR13CStateManagerf: @@ -3522,7 +3522,7 @@ UpdateWalkerAnimation__9CParasiteFR13CStateManagerf: /* 801597CC 0015672C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801597D0 00156730 7C 08 03 A6 */ mtlr r0 /* 801597D4 00156734 38 21 00 10 */ addi r1, r1, 0x10 -/* 801597D8 00156738 4E 80 00 20 */ blr +/* 801597D8 00156738 4E 80 00 20 */ blr .global Think__9CParasiteFfR13CStateManager Think__9CParasiteFfR13CStateManager: @@ -3752,7 +3752,7 @@ lbl_80159ACC: /* 80159B20 00156A80 81 9F 00 00 */ lwz r12, 0(r31) /* 80159B24 00156A84 81 8C 00 40 */ lwz r12, 0x40(r12) /* 80159B28 00156A88 7D 89 03 A6 */ mtctr r12 -/* 80159B2C 00156A8C 4E 80 04 21 */ bctrl +/* 80159B2C 00156A8C 4E 80 04 21 */ bctrl /* 80159B30 00156A90 88 01 00 EC */ lbz r0, 0xec(r1) /* 80159B34 00156A94 28 00 00 00 */ cmplwi r0, 0 /* 80159B38 00156A98 98 01 01 08 */ stb r0, 0x108(r1) @@ -3823,7 +3823,7 @@ lbl_80159BC8: /* 80159C34 00156B94 B0 01 00 18 */ sth r0, 0x18(r1) /* 80159C38 00156B98 81 8C 02 B0 */ lwz r12, 0x2b0(r12) /* 80159C3C 00156B9C 7D 89 03 A6 */ mtctr r12 -/* 80159C40 00156BA0 4E 80 04 21 */ bctrl +/* 80159C40 00156BA0 4E 80 04 21 */ bctrl /* 80159C44 00156BA4 3C 80 80 5A */ lis r4, skZero3f@ha /* 80159C48 00156BA8 7F C3 F3 78 */ mr r3, r30 /* 80159C4C 00156BAC 39 24 66 A0 */ addi r9, r4, skZero3f@l @@ -3909,7 +3909,7 @@ lbl_80159D60: /* 80159D7C 00156CDC 83 A1 01 64 */ lwz r29, 0x164(r1) /* 80159D80 00156CE0 7C 08 03 A6 */ mtlr r0 /* 80159D84 00156CE4 38 21 01 90 */ addi r1, r1, 0x190 -/* 80159D88 00156CE8 4E 80 00 20 */ blr +/* 80159D88 00156CE8 4E 80 00 20 */ blr .global PreThink__9CParasiteFfR13CStateManager PreThink__9CParasiteFfR13CStateManager: @@ -3927,7 +3927,7 @@ PreThink__9CParasiteFfR13CStateManager: /* 80159DB8 00156D18 80 01 00 14 */ lwz r0, 0x14(r1) /* 80159DBC 00156D1C 7C 08 03 A6 */ mtlr r0 /* 80159DC0 00156D20 38 21 00 10 */ addi r1, r1, 0x10 -/* 80159DC4 00156D24 4E 80 00 20 */ blr +/* 80159DC4 00156D24 4E 80 00 20 */ blr .global AddDoorRepulsors__9CParasiteFR13CStateManager AddDoorRepulsors__9CParasiteFR13CStateManager: @@ -4001,7 +4001,7 @@ lbl_80159E84: /* 80159EC0 00156E20 38 61 00 3C */ addi r3, r1, 0x3c /* 80159EC4 00156E24 81 8C 00 40 */ lwz r12, 0x40(r12) /* 80159EC8 00156E28 7D 89 03 A6 */ mtctr r12 -/* 80159ECC 00156E2C 4E 80 04 21 */ bctrl +/* 80159ECC 00156E2C 4E 80 04 21 */ bctrl /* 80159ED0 00156E30 88 01 00 54 */ lbz r0, 0x54(r1) /* 80159ED4 00156E34 28 00 00 00 */ cmplwi r0, 0 /* 80159ED8 00156E38 98 01 00 70 */ stb r0, 0x70(r1) @@ -4108,7 +4108,7 @@ lbl_8015A01C: /* 8015A04C 00156FAC 83 81 00 80 */ lwz r28, 0x80(r1) /* 8015A050 00156FB0 7C 08 03 A6 */ mtlr r0 /* 8015A054 00156FB4 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 8015A058 00156FB8 4E 80 00 20 */ blr +/* 8015A058 00156FB8 4E 80 00 20 */ blr .global AcceptScriptMsg__9CParasiteF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__9CParasiteF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -4216,7 +4216,7 @@ lbl_8015A138: /* 8015A1D8 00157138 81 9E 00 00 */ lwz r12, 0(r30) /* 8015A1DC 0015713C 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8015A1E0 00157140 7D 89 03 A6 */ mtctr r12 -/* 8015A1E4 00157144 4E 80 04 21 */ bctrl +/* 8015A1E4 00157144 4E 80 04 21 */ bctrl /* 8015A1E8 00157148 C0 23 00 04 */ lfs f1, 4(r3) /* 8015A1EC 0015714C 7F C3 F3 78 */ mr r3, r30 /* 8015A1F0 00157150 C0 1E 07 14 */ lfs f0, 0x714(r30) @@ -4303,19 +4303,19 @@ lbl_8015A294: /* 8015A324 00157284 D0 C1 00 40 */ stfs f6, 0x40(r1) /* 8015A328 00157288 D0 A1 00 44 */ stfs f5, 0x44(r1) /* 8015A32C 0015728C 7D 89 03 A6 */ mtctr r12 -/* 8015A330 00157290 4E 80 04 21 */ bctrl +/* 8015A330 00157290 4E 80 04 21 */ bctrl /* 8015A334 00157294 7F C4 F3 78 */ mr r4, r30 /* 8015A338 00157298 38 61 00 7C */ addi r3, r1, 0x7c /* 8015A33C 0015729C 81 9E 00 00 */ lwz r12, 0(r30) /* 8015A340 001572A0 81 8C 00 40 */ lwz r12, 0x40(r12) /* 8015A344 001572A4 7D 89 03 A6 */ mtctr r12 -/* 8015A348 001572A8 4E 80 04 21 */ bctrl +/* 8015A348 001572A8 4E 80 04 21 */ bctrl /* 8015A34C 001572AC 7F C4 F3 78 */ mr r4, r30 /* 8015A350 001572B0 38 61 00 60 */ addi r3, r1, 0x60 /* 8015A354 001572B4 81 9E 00 00 */ lwz r12, 0(r30) /* 8015A358 001572B8 81 8C 00 40 */ lwz r12, 0x40(r12) /* 8015A35C 001572BC 7D 89 03 A6 */ mtctr r12 -/* 8015A360 001572C0 4E 80 04 21 */ bctrl +/* 8015A360 001572C0 4E 80 04 21 */ bctrl /* 8015A364 001572C4 C0 61 00 70 */ lfs f3, 0x70(r1) /* 8015A368 001572C8 C0 41 00 64 */ lfs f2, 0x64(r1) /* 8015A36C 001572CC C0 21 00 90 */ lfs f1, 0x90(r1) @@ -4371,7 +4371,7 @@ lbl_8015A410: /* 8015A41C 0015737C 80 01 01 04 */ lwz r0, 0x104(r1) /* 8015A420 00157380 7C 08 03 A6 */ mtlr r0 /* 8015A424 00157384 38 21 01 00 */ addi r1, r1, 0x100 -/* 8015A428 00157388 4E 80 00 20 */ blr +/* 8015A428 00157388 4E 80 00 20 */ blr .global Accept__9CParasiteFR8IVisitor Accept__9CParasiteFR8IVisitor: @@ -4384,11 +4384,11 @@ Accept__9CParasiteFR8IVisitor: /* 8015A444 001573A4 7C 04 03 78 */ mr r4, r0 /* 8015A448 001573A8 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 8015A44C 001573AC 7D 89 03 A6 */ mtctr r12 -/* 8015A450 001573B0 4E 80 04 21 */ bctrl +/* 8015A450 001573B0 4E 80 04 21 */ bctrl /* 8015A454 001573B4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8015A458 001573B8 7C 08 03 A6 */ mtlr r0 /* 8015A45C 001573BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8015A460 001573C0 4E 80 00 20 */ blr +/* 8015A460 001573C0 4E 80 00 20 */ blr .global "__ct__9CParasiteF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>Q210CPatterned11EFlavorTypeRC11CEntityInfoRC12CTransform4fRC10CModelDataRC14CPatternedInfo9EBodyTypefffffffffffffffffbUiRC10Something1RC10Something2UsUsUsUiUifRC16CActorParameters" "__ct__9CParasiteF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>Q210CPatterned11EFlavorTypeRC11CEntityInfoRC12CTransform4fRC10CModelDataRC14CPatternedInfo9EBodyTypefffffffffffffffffbUiRC10Something1RC10Something2UsUsUsUiUifRC16CActorParameters": @@ -4714,7 +4714,7 @@ lbl_8015A8E4: /* 8015A950 001578B0 81 84 00 00 */ lwz r12, 0(r4) /* 8015A954 001578B4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8015A958 001578B8 7D 89 03 A6 */ mtctr r12 -/* 8015A95C 001578BC 4E 80 04 21 */ bctrl +/* 8015A95C 001578BC 4E 80 04 21 */ bctrl /* 8015A960 001578C0 3A E1 00 54 */ addi r23, r1, 0x54 /* 8015A964 001578C4 38 81 00 34 */ addi r4, r1, 0x34 /* 8015A968 001578C8 7E E3 BB 78 */ mr r3, r23 @@ -4735,7 +4735,7 @@ lbl_8015A8E4: /* 8015A9A4 00157904 81 84 00 00 */ lwz r12, 0(r4) /* 8015A9A8 00157908 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8015A9AC 0015790C 7D 89 03 A6 */ mtctr r12 -/* 8015A9B0 00157910 4E 80 04 21 */ bctrl +/* 8015A9B0 00157910 4E 80 04 21 */ bctrl /* 8015A9B4 00157914 3B 01 00 60 */ addi r24, r1, 0x60 /* 8015A9B8 00157918 38 81 00 44 */ addi r4, r1, 0x44 /* 8015A9BC 0015791C 7F 03 C3 78 */ mr r3, r24 @@ -4776,7 +4776,7 @@ lbl_8015AA04: /* 8015AA44 001579A4 38 80 00 01 */ li r4, 1 /* 8015AA48 001579A8 81 8C 00 08 */ lwz r12, 8(r12) /* 8015AA4C 001579AC 7D 89 03 A6 */ mtctr r12 -/* 8015AA50 001579B0 4E 80 04 21 */ bctrl +/* 8015AA50 001579B0 4E 80 04 21 */ bctrl lbl_8015AA54: /* 8015AA54 001579B4 93 BB 00 08 */ stw r29, 8(r27) /* 8015AA58 001579B8 7F 63 DB 78 */ mr r3, r27 @@ -4874,7 +4874,7 @@ lbl_8015AB28: /* 8015ABA8 00157B08 80 01 01 94 */ lwz r0, 0x194(r1) /* 8015ABAC 00157B0C 7C 08 03 A6 */ mtlr r0 /* 8015ABB0 00157B10 38 21 01 90 */ addi r1, r1, 0x190 -/* 8015ABB4 00157B14 4E 80 00 20 */ blr +/* 8015ABB4 00157B14 4E 80 00 20 */ blr .global sub_8015abb8 sub_8015abb8: @@ -4914,7 +4914,7 @@ lbl_8015AC1C: /* 8015AC38 00157B98 80 01 00 14 */ lwz r0, 0x14(r1) /* 8015AC3C 00157B9C 7C 08 03 A6 */ mtlr r0 /* 8015AC40 00157BA0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8015AC44 00157BA4 4E 80 00 20 */ blr +/* 8015AC44 00157BA4 4E 80 00 20 */ blr .global "reserve__Q24rstl57vectorFi" "reserve__Q24rstl57vectorFi": @@ -4992,7 +4992,7 @@ lbl_8015AD34: /* 8015AD40 00157CA0 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8015AD44 00157CA4 7C 08 03 A6 */ mtlr r0 /* 8015AD48 00157CA8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8015AD4C 00157CAC 4E 80 00 20 */ blr +/* 8015AD4C 00157CAC 4E 80 00 20 */ blr .global __sinit_CParasite_cpp __sinit_CParasite_cpp: diff --git a/asm/MetroidPrime/Enemies/CPatterned.s b/asm/MetroidPrime/Enemies/CPatterned.s index b768862c..3a04eaff 100644 --- a/asm/MetroidPrime/Enemies/CPatterned.s +++ b/asm/MetroidPrime/Enemies/CPatterned.s @@ -657,7 +657,7 @@ lbl_80077750: /* 80077760 000746C0 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80077764 000746C4 7C 08 03 A6 */ mtlr r0 /* 80077768 000746C8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8007776C 000746CC 4E 80 00 20 */ blr +/* 8007776C 000746CC 4E 80 00 20 */ blr .global GetTouchBounds__10CPatternedCFv GetTouchBounds__10CPatternedCFv: @@ -689,59 +689,59 @@ lbl_800777CC: /* 800777D0 00074730 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 800777D4 00074734 7C 08 03 A6 */ mtlr r0 /* 800777D8 00074738 38 21 00 30 */ addi r1, r1, 0x30 -/* 800777DC 0007473C 4E 80 00 20 */ blr +/* 800777DC 0007473C 4E 80 00 20 */ blr .global TakeDamage__10CPatternedFRC9CVector3ff TakeDamage__10CPatternedFRC9CVector3ff: /* 800777E0 00074740 C0 02 88 F0 */ lfs f0, lbl_805AA610@sda21(r2) /* 800777E4 00074744 D0 03 04 28 */ stfs f0, 0x428(r3) -/* 800777E8 00074748 4E 80 00 20 */ blr +/* 800777E8 00074748 4E 80 00 20 */ blr .global KnockbackWhenFrozen__10CPatternedCFv KnockbackWhenFrozen__10CPatternedCFv: /* 800777EC 0007474C 38 60 00 01 */ li r3, 1 -/* 800777F0 00074750 4E 80 00 20 */ blr +/* 800777F0 00074750 4E 80 00 20 */ blr .global Default__10CPatternedFR13CStateManagerf Default__10CPatternedFR13CStateManagerf: /* 800777F4 00074754 38 60 00 01 */ li r3, 1 -/* 800777F8 00074758 4E 80 00 20 */ blr +/* 800777F8 00074758 4E 80 00 20 */ blr .global GetSearchPath__10CPatternedFv GetSearchPath__10CPatternedFv: /* 800777FC 0007475C 38 60 00 00 */ li r3, 0 -/* 80077800 00074760 4E 80 00 20 */ blr +/* 80077800 00074760 4E 80 00 20 */ blr .global GetModelAlphau8__10CPatternedCFRC13CStateManager GetModelAlphau8__10CPatternedCFRC13CStateManager: /* 80077804 00074764 88 63 04 2F */ lbz r3, 0x42f(r3) -/* 80077808 00074768 4E 80 00 20 */ blr +/* 80077808 00074768 4E 80 00 20 */ blr .global IsOnGround__10CPatternedCFv IsOnGround__10CPatternedCFv: /* 8007780C 0007476C 88 03 03 28 */ lbz r0, 0x328(r3) /* 80077810 00074770 54 03 E7 FE */ rlwinm r3, r0, 0x1c, 0x1f, 0x1f -/* 80077814 00074774 4E 80 00 20 */ blr +/* 80077814 00074774 4E 80 00 20 */ blr .global GetGravityConstant__10CPatternedCFv GetGravityConstant__10CPatternedCFv: /* 80077818 00074778 C0 22 96 A0 */ lfs f1, lbl_805AB3C0@sda21(r2) -/* 8007781C 0007477C 4E 80 00 20 */ blr +/* 8007781C 0007477C 4E 80 00 20 */ blr .global GetProjectileInfo__10CPatternedFv GetProjectileInfo__10CPatternedFv: /* 80077820 00074780 38 60 00 00 */ li r3, 0 -/* 80077824 00074784 4E 80 00 20 */ blr +/* 80077824 00074784 4E 80 00 20 */ blr .global GetDeathExplosionParticle__10CPatternedCFv GetDeathExplosionParticle__10CPatternedCFv: /* 80077828 00074788 38 63 05 20 */ addi r3, r3, 0x520 -/* 8007782C 0007478C 4E 80 00 20 */ blr +/* 8007782C 0007478C 4E 80 00 20 */ blr .global IsListening__3CAiCFv IsListening__3CAiCFv: /* 80077830 00074790 38 60 00 00 */ li r3, 0 -/* 80077834 00074794 4E 80 00 20 */ blr +/* 80077834 00074794 4E 80 00 20 */ blr .global GetOrigin__3CAiCFv GetOrigin__3CAiCFv: @@ -751,7 +751,7 @@ GetOrigin__3CAiCFv: /* 80077844 000747A4 D0 03 00 00 */ stfs f0, 0(r3) /* 80077848 000747A8 D0 23 00 04 */ stfs f1, 4(r3) /* 8007784C 000747AC D0 43 00 08 */ stfs f2, 8(r3) -/* 80077850 000747B0 4E 80 00 20 */ blr +/* 80077850 000747B0 4E 80 00 20 */ blr .global UpdateThermalFrozenState__10CPatternedFb UpdateThermalFrozenState__10CPatternedFb: @@ -761,7 +761,7 @@ UpdateThermalFrozenState__10CPatternedFb: /* 80077860 000747C0 98 03 04 02 */ stb r0, 0x402(r3) /* 80077864 000747C4 88 03 04 03 */ lbz r0, 0x403(r3) /* 80077868 000747C8 54 00 CF FF */ rlwinm. r0, r0, 0x19, 0x1f, 0x1f -/* 8007786C 000747CC 4C 82 00 20 */ bnelr +/* 8007786C 000747CC 4C 82 00 20 */ bnelr /* 80077870 000747D0 28 04 00 00 */ cmplwi r4, 0 /* 80077874 000747D4 38 00 00 01 */ li r0, 1 /* 80077878 000747D8 41 82 00 08 */ beq lbl_80077880 @@ -771,7 +771,7 @@ lbl_80077880: /* 80077884 000747E4 88 03 00 E6 */ lbz r0, 0xe6(r3) /* 80077888 000747E8 50 80 1E F8 */ rlwimi r0, r4, 3, 0x1b, 0x1c /* 8007788C 000747EC 98 03 00 E6 */ stb r0, 0xe6(r3) -/* 80077890 000747F0 4E 80 00 20 */ blr +/* 80077890 000747F0 4E 80 00 20 */ blr .global MakeThermalColdAndHot__10CPatternedFv MakeThermalColdAndHot__10CPatternedFv: @@ -783,7 +783,7 @@ MakeThermalColdAndHot__10CPatternedFv: /* 800778A8 00074808 88 03 00 E6 */ lbz r0, 0xe6(r3) /* 800778AC 0007480C 50 80 1E F8 */ rlwimi r0, r4, 3, 0x1b, 0x1c /* 800778B0 00074810 98 03 00 E6 */ stb r0, 0xe6(r3) -/* 800778B4 00074814 4E 80 00 20 */ blr +/* 800778B4 00074814 4E 80 00 20 */ blr .global AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager: @@ -843,7 +843,7 @@ lbl_80077964: /* 80077980 000748E0 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80077984 000748E4 7C 08 03 A6 */ mtlr r0 /* 80077988 000748E8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8007798C 000748EC 4E 80 00 20 */ blr +/* 8007798C 000748EC 4E 80 00 20 */ blr .global PreThink__10CPatternedFfR13CStateManager PreThink__10CPatternedFfR13CStateManager: @@ -855,7 +855,7 @@ PreThink__10CPatternedFfR13CStateManager: /* 800779A4 00074904 80 01 00 14 */ lwz r0, 0x14(r1) /* 800779A8 00074908 7C 08 03 A6 */ mtlr r0 /* 800779AC 0007490C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800779B0 00074910 4E 80 00 20 */ blr +/* 800779B0 00074910 4E 80 00 20 */ blr .global GetCollisionResponseType__10CPatternedCFRC9CVector3fRC9CVector3fRC11CWeaponModei GetCollisionResponseType__10CPatternedCFRC9CVector3fRC9CVector3fRC11CWeaponModei: @@ -877,7 +877,7 @@ lbl_800779E8: /* 800779E8 00074948 80 01 00 14 */ lwz r0, 0x14(r1) /* 800779EC 0007494C 7C 08 03 A6 */ mtlr r0 /* 800779F0 00074950 38 21 00 10 */ addi r1, r1, 0x10 -/* 800779F4 00074954 4E 80 00 20 */ blr +/* 800779F4 00074954 4E 80 00 20 */ blr .global "LaunchProjectile__10CPatternedFRC12CTransform4fR13CStateManageriQ27CWeapon17EProjectileAttribbRCQ24rstl50optional_object<31TLockedToken<15CGenDescription>>sbRC9CVector3f" "LaunchProjectile__10CPatternedFRC12CTransform4fR13CStateManageriQ27CWeapon17EProjectileAttribbRCQ24rstl50optional_object<31TLockedToken<15CGenDescription>>sbRC9CVector3f": @@ -899,7 +899,7 @@ lbl_800779E8: /* 80077A34 00074994 81 83 00 00 */ lwz r12, 0(r3) /* 80077A38 00074998 81 8C 02 C0 */ lwz r12, 0x2c0(r12) /* 80077A3C 0007499C 7D 89 03 A6 */ mtctr r12 -/* 80077A40 000749A0 4E 80 04 21 */ bctrl +/* 80077A40 000749A0 4E 80 04 21 */ bctrl /* 80077A44 000749A4 7C 74 1B 78 */ mr r20, r3 /* 80077A48 000749A8 80 03 00 08 */ lwz r0, 8(r3) /* 80077A4C 000749AC 28 00 00 00 */ cmplwi r0, 0 @@ -968,13 +968,13 @@ lbl_80077AFC: /* 80077B34 00074A94 81 95 00 00 */ lwz r12, 0(r21) /* 80077B38 00074A98 81 8C 02 C0 */ lwz r12, 0x2c0(r12) /* 80077B3C 00074A9C 7D 89 03 A6 */ mtctr r12 -/* 80077B40 00074AA0 4E 80 04 21 */ bctrl +/* 80077B40 00074AA0 4E 80 04 21 */ bctrl /* 80077B44 00074AA4 7C 78 1B 78 */ mr r24, r3 /* 80077B48 00074AA8 7E A3 AB 78 */ mr r3, r21 /* 80077B4C 00074AAC 81 95 00 00 */ lwz r12, 0(r21) /* 80077B50 00074AB0 81 8C 02 C0 */ lwz r12, 0x2c0(r12) /* 80077B54 00074AB4 7D 89 03 A6 */ mtctr r12 -/* 80077B58 00074AB8 4E 80 04 21 */ bctrl +/* 80077B58 00074AB8 4E 80 04 21 */ bctrl /* 80077B5C 00074ABC 38 01 00 54 */ addi r0, r1, 0x54 /* 80077B60 00074AC0 7C 65 1B 78 */ mr r5, r3 /* 80077B64 00074AC4 90 01 00 08 */ stw r0, 8(r1) @@ -1010,7 +1010,7 @@ lbl_80077BCC: /* 80077BD4 00074B34 80 01 00 94 */ lwz r0, 0x94(r1) /* 80077BD8 00074B38 7C 08 03 A6 */ mtlr r0 /* 80077BDC 00074B3C 38 21 00 90 */ addi r1, r1, 0x90 -/* 80077BE0 00074B40 4E 80 00 20 */ blr +/* 80077BE0 00074B40 4E 80 00 20 */ blr .global RenderIceModelWithFlags__10CPatternedCFRC11CModelFlags RenderIceModelWithFlags__10CPatternedCFRC11CModelFlags: @@ -1056,7 +1056,7 @@ lbl_80077C70: /* 80077C7C 00074BDC 83 A1 00 64 */ lwz r29, 0x64(r1) /* 80077C80 00074BE0 7C 08 03 A6 */ mtlr r0 /* 80077C84 00074BE4 38 21 00 70 */ addi r1, r1, 0x70 -/* 80077C88 00074BE8 4E 80 00 20 */ blr +/* 80077C88 00074BE8 4E 80 00 20 */ blr .global sub_80077c8c sub_80077c8c: @@ -1080,7 +1080,7 @@ lbl_80077CC0: /* 80077CCC 00074C2C 83 C1 00 08 */ lwz r30, 8(r1) /* 80077CD0 00074C30 7C 08 03 A6 */ mtlr r0 /* 80077CD4 00074C34 38 21 00 10 */ addi r1, r1, 0x10 -/* 80077CD8 00074C38 4E 80 00 20 */ blr +/* 80077CD8 00074C38 4E 80 00 20 */ blr .global sub_80077cdc sub_80077cdc: @@ -1100,7 +1100,7 @@ lbl_80077D00: /* 80077D0C 00074C6C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80077D10 00074C70 7C 08 03 A6 */ mtlr r0 /* 80077D14 00074C74 38 21 00 10 */ addi r1, r1, 0x10 -/* 80077D18 00074C78 4E 80 00 20 */ blr +/* 80077D18 00074C78 4E 80 00 20 */ blr .global sub_80077d1c sub_80077d1c: @@ -1112,7 +1112,7 @@ sub_80077d1c: /* 80077D30 00074C90 80 01 00 14 */ lwz r0, 0x14(r1) /* 80077D34 00074C94 7C 08 03 A6 */ mtlr r0 /* 80077D38 00074C98 38 21 00 10 */ addi r1, r1, 0x10 -/* 80077D3C 00074C9C 4E 80 00 20 */ blr +/* 80077D3C 00074C9C 4E 80 00 20 */ blr .global __dt__18CVertexMorphEffectFv __dt__18CVertexMorphEffectFv: @@ -1177,7 +1177,7 @@ lbl_80077E00: /* 80077E0C 00074D6C 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80077E10 00074D70 7C 08 03 A6 */ mtlr r0 /* 80077E14 00074D74 38 21 00 30 */ addi r1, r1, 0x30 -/* 80077E18 00074D78 4E 80 00 20 */ blr +/* 80077E18 00074D78 4E 80 00 20 */ blr .global sub_80077e1c sub_80077e1c: @@ -1194,7 +1194,7 @@ sub_80077e1c: /* 80077E44 00074DA4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80077E48 00074DA8 7C 08 03 A6 */ mtlr r0 /* 80077E4C 00074DAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80077E50 00074DB0 4E 80 00 20 */ blr +/* 80077E50 00074DB0 4E 80 00 20 */ blr .global sub_80077e54 sub_80077e54: @@ -1208,7 +1208,7 @@ lbl_80077E6C: /* 80077E6C 00074DCC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80077E70 00074DD0 7C 08 03 A6 */ mtlr r0 /* 80077E74 00074DD4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80077E78 00074DD8 4E 80 00 20 */ blr +/* 80077E78 00074DD8 4E 80 00 20 */ blr .global sub_80077e7c sub_80077e7c: @@ -1331,7 +1331,7 @@ lbl_80078010: /* 8007801C 00074F7C 83 C1 00 08 */ lwz r30, 8(r1) /* 80078020 00074F80 7C 08 03 A6 */ mtlr r0 /* 80078024 00074F84 38 21 00 10 */ addi r1, r1, 0x10 -/* 80078028 00074F88 4E 80 00 20 */ blr +/* 80078028 00074F88 4E 80 00 20 */ blr .global Render__10CPatternedCFRC13CStateManager Render__10CPatternedCFRC13CStateManager: @@ -1397,7 +1397,7 @@ lbl_800780E0: /* 80078108 00075068 7F A4 EB 78 */ mr r4, r29 /* 8007810C 0007506C 81 8C 02 B4 */ lwz r12, 0x2b4(r12) /* 80078110 00075070 7D 89 03 A6 */ mtctr r12 -/* 80078114 00075074 4E 80 04 21 */ bctrl +/* 80078114 00075074 4E 80 04 21 */ bctrl /* 80078118 00075078 28 1E 00 00 */ cmplwi r30, 0 /* 8007811C 0007507C 98 61 00 08 */ stb r3, 8(r1) /* 80078120 00075080 41 82 00 D0 */ beq lbl_800781F0 @@ -1508,7 +1508,7 @@ lbl_80078280: /* 80078290 000751F0 83 81 00 20 */ lwz r28, 0x20(r1) /* 80078294 000751F4 7C 08 03 A6 */ mtlr r0 /* 80078298 000751F8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8007829C 000751FC 4E 80 00 20 */ blr +/* 8007829C 000751FC 4E 80 00 20 */ blr .global CanRenderUnsorted__10CPatternedCFRC13CStateManager CanRenderUnsorted__10CPatternedCFRC13CStateManager: @@ -1528,7 +1528,7 @@ lbl_800782CC: /* 800782CC 0007522C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800782D0 00075230 7C 08 03 A6 */ mtlr r0 /* 800782D4 00075234 38 21 00 10 */ addi r1, r1, 0x10 -/* 800782D8 00075238 4E 80 00 20 */ blr +/* 800782D8 00075238 4E 80 00 20 */ blr .global PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes: @@ -1568,7 +1568,7 @@ lbl_80078348: /* 80078358 000752B8 90 01 00 18 */ stw r0, 0x18(r1) /* 8007835C 000752BC 81 8C 02 B4 */ lwz r12, 0x2b4(r12) /* 80078360 000752C0 7D 89 03 A6 */ mtctr r12 -/* 80078364 000752C4 4E 80 04 21 */ bctrl +/* 80078364 000752C4 4E 80 04 21 */ bctrl /* 80078368 000752C8 88 1C 04 02 */ lbz r0, 0x402(r28) /* 8007836C 000752CC 7C 7F 1B 78 */ mr r31, r3 /* 80078370 000752D0 54 00 E7 FF */ rlwinm. r0, r0, 0x1c, 0x1f, 0x1f @@ -1722,7 +1722,7 @@ lbl_8007857C: /* 8007859C 000754FC 83 81 00 30 */ lwz r28, 0x30(r1) /* 800785A0 00075500 7C 08 03 A6 */ mtlr r0 /* 800785A4 00075504 38 21 00 40 */ addi r1, r1, 0x40 -/* 800785A8 00075508 4E 80 00 20 */ blr +/* 800785A8 00075508 4E 80 00 20 */ blr .global GetOrbitPosition__10CPatternedCFRC13CStateManager GetOrbitPosition__10CPatternedCFRC13CStateManager: @@ -1735,12 +1735,12 @@ GetOrbitPosition__10CPatternedCFRC13CStateManager: /* 800785C4 00075524 81 84 00 00 */ lwz r12, 0(r4) /* 800785C8 00075528 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 800785CC 0007552C 7D 89 03 A6 */ mtctr r12 -/* 800785D0 00075530 4E 80 04 21 */ bctrl +/* 800785D0 00075530 4E 80 04 21 */ bctrl /* 800785D4 00075534 80 01 00 14 */ lwz r0, 0x14(r1) /* 800785D8 00075538 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800785DC 0007553C 7C 08 03 A6 */ mtlr r0 /* 800785E0 00075540 38 21 00 10 */ addi r1, r1, 0x10 -/* 800785E4 00075544 4E 80 00 20 */ blr +/* 800785E4 00075544 4E 80 00 20 */ blr .global GetAimPosition__10CPatternedCFRC13CStateManagerf GetAimPosition__10CPatternedCFRC13CStateManagerf: @@ -1816,7 +1816,7 @@ lbl_80078650: /* 800786F8 00075658 81 9E 00 00 */ lwz r12, 0(r30) /* 800786FC 0007565C 81 8C 00 40 */ lwz r12, 0x40(r12) /* 80078700 00075660 7D 89 03 A6 */ mtctr r12 -/* 80078704 00075664 4E 80 04 21 */ bctrl +/* 80078704 00075664 4E 80 04 21 */ bctrl /* 80078708 00075668 88 61 00 E8 */ lbz r3, 0xe8(r1) /* 8007870C 0007566C 38 00 00 00 */ li r0, 0 /* 80078710 00075670 28 03 00 00 */ cmplwi r3, 0 @@ -1827,7 +1827,7 @@ lbl_80078650: /* 80078724 00075684 81 9E 00 00 */ lwz r12, 0(r30) /* 80078728 00075688 81 8C 00 40 */ lwz r12, 0x40(r12) /* 8007872C 0007568C 7D 89 03 A6 */ mtctr r12 -/* 80078730 00075690 4E 80 04 21 */ bctrl +/* 80078730 00075690 4E 80 04 21 */ bctrl /* 80078734 00075694 38 61 00 68 */ addi r3, r1, 0x68 /* 80078738 00075698 38 9E 00 34 */ addi r4, r30, 0x34 /* 8007873C 0007569C 38 A1 00 90 */ addi r5, r1, 0x90 @@ -1927,7 +1927,7 @@ lbl_80078878: /* 800788A8 00075808 83 A1 01 A4 */ lwz r29, 0x1a4(r1) /* 800788AC 0007580C 7C 08 03 A6 */ mtlr r0 /* 800788B0 00075810 38 21 01 E0 */ addi r1, r1, 0x1e0 -/* 800788B4 00075814 4E 80 00 20 */ blr +/* 800788B4 00075814 4E 80 00 20 */ blr .global GetLctrTransform__10CPatternedCFRC6CSegId GetLctrTransform__10CPatternedCFRC6CSegId: @@ -1978,7 +1978,7 @@ GetLctrTransform__10CPatternedCFRC6CSegId: /* 80078968 000758C8 83 C1 00 D8 */ lwz r30, 0xd8(r1) /* 8007896C 000758CC 7C 08 03 A6 */ mtlr r0 /* 80078970 000758D0 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 80078974 000758D4 4E 80 00 20 */ blr +/* 80078974 000758D4 4E 80 00 20 */ blr .global "GetLctrTransform__10CPatternedCFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" "GetLctrTransform__10CPatternedCFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>": @@ -2000,7 +2000,7 @@ GetLctrTransform__10CPatternedCFRC6CSegId: /* 800789B4 00075914 83 C1 00 38 */ lwz r30, 0x38(r1) /* 800789B8 00075918 7C 08 03 A6 */ mtlr r0 /* 800789BC 0007591C 38 21 00 40 */ addi r1, r1, 0x40 -/* 800789C0 00075920 4E 80 00 20 */ blr +/* 800789C0 00075920 4E 80 00 20 */ blr .global GetContactDamage__10CPatternedCFv GetContactDamage__10CPatternedCFv: @@ -2018,7 +2018,7 @@ GetContactDamage__10CPatternedCFv: /* 800789F0 00075950 D0 03 00 14 */ stfs f0, 0x14(r3) /* 800789F4 00075954 88 04 04 1C */ lbz r0, 0x41c(r4) /* 800789F8 00075958 98 03 00 18 */ stb r0, 0x18(r3) -/* 800789FC 0007595C 4E 80 00 20 */ blr +/* 800789FC 0007595C 4E 80 00 20 */ blr .global DeathDelete__10CPatternedFR13CStateManager DeathDelete__10CPatternedFR13CStateManager: @@ -2056,7 +2056,7 @@ lbl_80078A58: /* 80078A78 000759D8 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80078A7C 000759DC 7C 08 03 A6 */ mtlr r0 /* 80078A80 000759E0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80078A84 000759E4 4E 80 00 20 */ blr +/* 80078A84 000759E4 4E 80 00 20 */ blr .global CalcDyingThinkRate__10CPatternedFv CalcDyingThinkRate__10CPatternedFv: @@ -2082,7 +2082,7 @@ lbl_80078AB4: /* 80078ACC 00075A2C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80078AD0 00075A30 7C 08 03 A6 */ mtlr r0 /* 80078AD4 00075A34 38 21 00 10 */ addi r1, r1, 0x10 -/* 80078AD8 00075A38 4E 80 00 20 */ blr +/* 80078AD8 00075A38 4E 80 00 20 */ blr .global PhazeOut__10CPatternedFR13CStateManager PhazeOut__10CPatternedFR13CStateManager: @@ -2119,7 +2119,7 @@ lbl_80078B18: /* 80078B50 00075AB0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80078B54 00075AB4 7C 08 03 A6 */ mtlr r0 /* 80078B58 00075AB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80078B5C 00075ABC 4E 80 00 20 */ blr +/* 80078B5C 00075ABC 4E 80 00 20 */ blr .global Freeze__10CPatternedFRC9CVector3f13CUnitVector3ff Freeze__10CPatternedFRC9CVector3f13CUnitVector3ff: @@ -2227,7 +2227,7 @@ lbl_80078CC8: /* 80078CD8 00075C38 83 81 00 30 */ lwz r28, 0x30(r1) /* 80078CDC 00075C3C 7C 08 03 A6 */ mtlr r0 /* 80078CE0 00075C40 38 21 00 40 */ addi r1, r1, 0x40 -/* 80078CE4 00075C44 4E 80 00 20 */ blr +/* 80078CE4 00075C44 4E 80 00 20 */ blr .global Shock__10CPatternedFff Shock__10CPatternedFff: @@ -2257,7 +2257,7 @@ Shock__10CPatternedFff: /* 80078D44 00075CA4 81 83 00 00 */ lwz r12, 0(r3) /* 80078D48 00075CA8 81 8C 00 38 */ lwz r12, 0x38(r12) /* 80078D4C 00075CAC 7D 89 03 A6 */ mtctr r12 -/* 80078D50 00075CB0 4E 80 04 21 */ bctrl +/* 80078D50 00075CB0 4E 80 04 21 */ bctrl /* 80078D54 00075CB4 38 81 00 08 */ addi r4, r1, 8 /* 80078D58 00075CB8 38 A0 00 00 */ li r5, 0 /* 80078D5C 00075CBC 48 08 97 61 */ bl GetVulnerability__20CDamageVulnerabilityCFRC11CWeaponMode @@ -2290,7 +2290,7 @@ lbl_80078DA8: /* 80078DBC 00075D1C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80078DC0 00075D20 7C 08 03 A6 */ mtlr r0 /* 80078DC4 00075D24 38 21 00 40 */ addi r1, r1, 0x40 -/* 80078DC8 00075D28 4E 80 00 20 */ blr +/* 80078DC8 00075D28 4E 80 00 20 */ blr .global Burn__10CPatternedFff Burn__10CPatternedFff: @@ -2320,7 +2320,7 @@ Burn__10CPatternedFff: /* 80078E28 00075D88 81 83 00 00 */ lwz r12, 0(r3) /* 80078E2C 00075D8C 81 8C 00 38 */ lwz r12, 0x38(r12) /* 80078E30 00075D90 7D 89 03 A6 */ mtctr r12 -/* 80078E34 00075D94 4E 80 04 21 */ bctrl +/* 80078E34 00075D94 4E 80 04 21 */ bctrl /* 80078E38 00075D98 38 81 00 08 */ addi r4, r1, 8 /* 80078E3C 00075D9C 38 A0 00 00 */ li r5, 0 /* 80078E40 00075DA0 48 08 96 7D */ bl GetVulnerability__20CDamageVulnerabilityCFRC11CWeaponMode @@ -2353,7 +2353,7 @@ lbl_80078E8C: /* 80078EA0 00075E00 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80078EA4 00075E04 7C 08 03 A6 */ mtlr r0 /* 80078EA8 00075E08 38 21 00 40 */ addi r1, r1, 0x40 -/* 80078EAC 00075E0C 4E 80 00 20 */ blr +/* 80078EAC 00075E0C 4E 80 00 20 */ blr .global DoUserAnimEvent__10CPatternedFR13CStateManagerRC13CInt32POINode14EUserEventType DoUserAnimEvent__10CPatternedFR13CStateManagerRC13CInt32POINode14EUserEventType: @@ -2384,7 +2384,7 @@ DoUserAnimEvent__10CPatternedFR13CStateManagerRC13CInt32POINode14EUserEventType: /* 80078F10 00075E70 38 A5 A8 94 */ addi r5, r5, lbl_803DA894@l /* 80078F14 00075E74 7C 05 00 2E */ lwzx r0, r5, r0 /* 80078F18 00075E78 7C 09 03 A6 */ mtctr r0 -/* 80078F1C 00075E7C 4E 80 04 20 */ bctr +/* 80078F1C 00075E7C 4E 80 04 20 */ bctr .global lbl_80078F20 lbl_80078F20: /* 80078F20 00075E80 7F 84 E3 78 */ mr r4, r28 @@ -2401,7 +2401,7 @@ lbl_80078F20: /* 80078F4C 00075EAC 81 84 00 00 */ lwz r12, 0(r4) /* 80078F50 00075EB0 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 80078F54 00075EB4 7D 89 03 A6 */ mtctr r12 -/* 80078F58 00075EB8 4E 80 04 21 */ bctrl +/* 80078F58 00075EB8 4E 80 04 21 */ bctrl /* 80078F5C 00075EBC C0 01 00 A8 */ lfs f0, 0xa8(r1) /* 80078F60 00075EC0 38 61 00 9C */ addi r3, r1, 0x9c /* 80078F64 00075EC4 C0 41 00 AC */ lfs f2, 0xac(r1) @@ -2594,7 +2594,7 @@ lbl_80079100: /* 8007923C 0007619C B0 01 00 20 */ sth r0, 0x20(r1) /* 80079240 000761A0 81 8C 02 B0 */ lwz r12, 0x2b0(r12) /* 80079244 000761A4 7D 89 03 A6 */ mtctr r12 -/* 80079248 000761A8 4E 80 04 21 */ bctrl +/* 80079248 000761A8 4E 80 04 21 */ bctrl /* 8007924C 000761AC 3C 80 80 5A */ lis r4, skZero3f@ha /* 80079250 000761B0 7F A3 EB 78 */ mr r3, r29 /* 80079254 000761B4 39 24 66 A0 */ addi r9, r4, skZero3f@l @@ -2676,7 +2676,7 @@ lbl_8007930C: /* 80079354 000762B4 83 81 02 30 */ lwz r28, 0x230(r1) /* 80079358 000762B8 7C 08 03 A6 */ mtlr r0 /* 8007935C 000762BC 38 21 02 80 */ addi r1, r1, 0x280 -/* 80079360 000762C0 4E 80 00 20 */ blr +/* 80079360 000762C0 4E 80 00 20 */ blr .global ThinkAboutMove__10CPatternedFf ThinkAboutMove__10CPatternedFf: @@ -2810,7 +2810,7 @@ lbl_80079514: /* 80079534 00076494 81 83 00 00 */ lwz r12, 0(r3) /* 80079538 00076498 81 8C 00 24 */ lwz r12, 0x24(r12) /* 8007953C 0007649C 7D 89 03 A6 */ mtctr r12 -/* 80079540 000764A0 4E 80 04 21 */ bctrl +/* 80079540 000764A0 4E 80 04 21 */ bctrl /* 80079544 000764A4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80079548 000764A8 41 82 00 B8 */ beq lbl_80079600 /* 8007954C 000764AC C0 5E 02 E4 */ lfs f2, 0x2e4(r30) @@ -2876,12 +2876,12 @@ lbl_80079600: /* 80079638 00076598 83 C1 00 38 */ lwz r30, 0x38(r1) /* 8007963C 0007659C 7C 08 03 A6 */ mtlr r0 /* 80079640 000765A0 38 21 00 80 */ addi r1, r1, 0x80 -/* 80079644 000765A4 4E 80 00 20 */ blr +/* 80079644 000765A4 4E 80 00 20 */ blr .global ApplyAnimationDeltas__10CBodyStateCFv ApplyAnimationDeltas__10CBodyStateCFv: /* 80079648 000765A8 38 60 00 01 */ li r3, 1 -/* 8007964C 000765AC 4E 80 00 20 */ blr +/* 8007964C 000765AC 4E 80 00 20 */ blr .global CollidedWith__10CPatternedFRC9TUniqueIdRC18CCollisionInfoListR13CStateManager CollidedWith__10CPatternedFRC9TUniqueIdRC18CCollisionInfoListR13CStateManager: @@ -2939,7 +2939,7 @@ lbl_80079708: /* 80079710 00076670 81 9A 00 00 */ lwz r12, 0(r26) /* 80079714 00076674 81 8C 02 B0 */ lwz r12, 0x2b0(r12) /* 80079718 00076678 7D 89 03 A6 */ mtctr r12 -/* 8007971C 0007667C 4E 80 04 21 */ bctrl +/* 8007971C 0007667C 4E 80 04 21 */ bctrl /* 80079720 00076680 80 81 00 68 */ lwz r4, 0x68(r1) /* 80079724 00076684 88 61 00 6C */ lbz r3, 0x6c(r1) /* 80079728 00076688 C0 61 00 70 */ lfs f3, 0x70(r1) @@ -3178,7 +3178,7 @@ lbl_80079A8C: /* 80079A90 000769F0 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 80079A94 000769F4 7C 08 03 A6 */ mtlr r0 /* 80079A98 000769F8 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 80079A9C 000769FC 4E 80 00 20 */ blr +/* 80079A9C 000769FC 4E 80 00 20 */ blr .global Touch__10CPatternedFR6CActorR13CStateManager Touch__10CPatternedFR6CActorR13CStateManager: @@ -3212,7 +3212,7 @@ lbl_80079B00: /* 80079B08 00076A68 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80079B0C 00076A6C 7C 08 03 A6 */ mtlr r0 /* 80079B10 00076A70 38 21 00 20 */ addi r1, r1, 0x20 -/* 80079B14 00076A74 4E 80 00 20 */ blr +/* 80079B14 00076A74 4E 80 00 20 */ blr .global Think__10CPatternedFfR13CStateManager Think__10CPatternedFfR13CStateManager: @@ -3293,7 +3293,7 @@ lbl_80079BF4: /* 80079C30 00076B90 81 9E 00 00 */ lwz r12, 0(r30) /* 80079C34 00076B94 81 8C 02 9C */ lwz r12, 0x29c(r12) /* 80079C38 00076B98 7D 89 03 A6 */ mtctr r12 -/* 80079C3C 00076B9C 4E 80 04 21 */ bctrl +/* 80079C3C 00076B9C 4E 80 04 21 */ bctrl /* 80079C40 00076BA0 48 00 07 E8 */ b lbl_8007A428 lbl_80079C44: /* 80079C44 00076BA4 7F C3 F3 78 */ mr r3, r30 @@ -3306,7 +3306,7 @@ lbl_80079C44: /* 80079C60 00076BC0 81 9E 00 00 */ lwz r12, 0(r30) /* 80079C64 00076BC4 81 8C 02 98 */ lwz r12, 0x298(r12) /* 80079C68 00076BC8 7D 89 03 A6 */ mtctr r12 -/* 80079C6C 00076BCC 4E 80 04 21 */ bctrl +/* 80079C6C 00076BCC 4E 80 04 21 */ bctrl /* 80079C70 00076BD0 48 00 07 B8 */ b lbl_8007A428 lbl_80079C74: /* 80079C74 00076BD4 C0 1E 03 E0 */ lfs f0, 0x3e0(r30) @@ -3342,7 +3342,7 @@ lbl_80079C74: /* 80079CEC 00076C4C 81 9E 00 00 */ lwz r12, 0(r30) /* 80079CF0 00076C50 81 8C 02 98 */ lwz r12, 0x298(r12) /* 80079CF4 00076C54 7D 89 03 A6 */ mtctr r12 -/* 80079CF8 00076C58 4E 80 04 21 */ bctrl +/* 80079CF8 00076C58 4E 80 04 21 */ bctrl lbl_80079CFC: /* 80079CFC 00076C5C FC 20 F8 90 */ fmr f1, f31 /* 80079D00 00076C60 7F C3 F3 78 */ mr r3, r30 @@ -3353,7 +3353,7 @@ lbl_80079CFC: /* 80079D14 00076C74 81 9E 00 00 */ lwz r12, 0(r30) /* 80079D18 00076C78 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80079D1C 00076C7C 7D 89 03 A6 */ mtctr r12 -/* 80079D20 00076C80 4E 80 04 21 */ bctrl +/* 80079D20 00076C80 4E 80 04 21 */ bctrl /* 80079D24 00076C84 C0 03 00 00 */ lfs f0, 0(r3) /* 80079D28 00076C88 D0 1E 03 E4 */ stfs f0, 0x3e4(r30) /* 80079D2C 00076C8C 80 1E 03 34 */ lwz r0, 0x334(r30) @@ -3425,7 +3425,7 @@ lbl_80079DDC: /* 80079E24 00076D84 EC 20 08 2A */ fadds f1, f0, f1 /* 80079E28 00076D88 C0 42 89 3C */ lfs f2, lbl_805AA65C@sda21(r2) /* 80079E2C 00076D8C 7D 89 03 A6 */ mtctr r12 -/* 80079E30 00076D90 4E 80 04 21 */ bctrl +/* 80079E30 00076D90 4E 80 04 21 */ bctrl lbl_80079E34: /* 80079E34 00076D94 88 9E 04 01 */ lbz r4, 0x401(r30) /* 80079E38 00076D98 38 60 00 00 */ li r3, 0 @@ -3638,7 +3638,7 @@ lbl_8007A118: /* 8007A158 000770B8 81 9E 00 00 */ lwz r12, 0(r30) /* 8007A15C 000770BC 81 8C 00 84 */ lwz r12, 0x84(r12) /* 8007A160 000770C0 7D 89 03 A6 */ mtctr r12 -/* 8007A164 000770C4 4E 80 04 21 */ bctrl +/* 8007A164 000770C4 4E 80 04 21 */ bctrl lbl_8007A168: /* 8007A168 000770C8 88 1E 04 00 */ lbz r0, 0x400(r30) /* 8007A16C 000770CC 54 00 D7 FF */ rlwinm. r0, r0, 0x1a, 0x1f, 0x1f @@ -3700,7 +3700,7 @@ lbl_8007A238: /* 8007A240 000771A0 81 9E 00 00 */ lwz r12, 0(r30) /* 8007A244 000771A4 81 8C 02 A8 */ lwz r12, 0x2a8(r12) /* 8007A248 000771A8 7D 89 03 A6 */ mtctr r12 -/* 8007A24C 000771AC 4E 80 04 21 */ bctrl +/* 8007A24C 000771AC 4E 80 04 21 */ bctrl /* 8007A250 000771B0 FC 20 F0 90 */ fmr f1, f30 /* 8007A254 000771B4 7F E4 FB 78 */ mr r4, r31 /* 8007A258 000771B8 7F C5 F3 78 */ mr r5, r30 @@ -3839,7 +3839,7 @@ lbl_8007A428: /* 8007A444 000773A4 83 A1 01 C4 */ lwz r29, 0x1c4(r1) /* 8007A448 000773A8 7C 08 03 A6 */ mtlr r0 /* 8007A44C 000773AC 38 21 01 F0 */ addi r1, r1, 0x1f0 -/* 8007A450 000773B0 4E 80 00 20 */ blr +/* 8007A450 000773B0 4E 80 00 20 */ blr .global AreStateStringsEqual__10CPatternedFPCcPCc AreStateStringsEqual__10CPatternedFPCcPCc: @@ -3856,7 +3856,7 @@ AreStateStringsEqual__10CPatternedFPCcPCc: /* 8007A47C 000773DC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8007A480 000773E0 7C 08 03 A6 */ mtlr r0 /* 8007A484 000773E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8007A488 000773E8 4E 80 00 20 */ blr +/* 8007A488 000773E8 4E 80 00 20 */ blr .global CompareStateString__10CPatternedFPCcPCci CompareStateString__10CPatternedFPCcPCci: @@ -3949,7 +3949,7 @@ lbl_8007A5A8: lbl_8007A5AC: /* 8007A5AC 0007750C 7C 03 03 78 */ mr r3, r0 /* 8007A5B0 00077510 38 21 00 30 */ addi r1, r1, 0x30 -/* 8007A5B4 00077514 4E 80 00 20 */ blr +/* 8007A5B4 00077514 4E 80 00 20 */ blr .global UpdateDamageColor__10CPatternedFf UpdateDamageColor__10CPatternedFf: @@ -4006,7 +4006,7 @@ lbl_8007A670: /* 8007A67C 000775DC 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8007A680 000775E0 7C 08 03 A6 */ mtlr r0 /* 8007A684 000775E4 38 21 00 30 */ addi r1, r1, 0x30 -/* 8007A688 000775E8 4E 80 00 20 */ blr +/* 8007A688 000775E8 4E 80 00 20 */ blr .global UpdateAlphaDelta__10CPatternedFfR13CStateManager UpdateAlphaDelta__10CPatternedFfR13CStateManager: @@ -4072,7 +4072,7 @@ lbl_8007A758: /* 8007A76C 000776CC 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8007A770 000776D0 7C 08 03 A6 */ mtlr r0 /* 8007A774 000776D4 38 21 00 40 */ addi r1, r1, 0x40 -/* 8007A778 000776D8 4E 80 00 20 */ blr +/* 8007A778 000776D8 4E 80 00 20 */ blr .global KnockBack__10CPatternedFRC9CVector3fR13CStateManagerRC11CDamageInfo14EKnockBackTypef KnockBack__10CPatternedFRC9CVector3fR13CStateManagerRC11CDamageInfo14EKnockBackTypef: @@ -4092,7 +4092,7 @@ KnockBack__10CPatternedFRC9CVector3fR13CStateManagerRC11CDamageInfo14EKnockBackT /* 8007A7B0 00077710 7C FD 3B 78 */ mr r29, r7 /* 8007A7B4 00077714 7F E4 FB 78 */ mr r4, r31 /* 8007A7B8 00077718 7D 89 03 A6 */ mtctr r12 -/* 8007A7BC 0007771C 4E 80 04 21 */ bctrl +/* 8007A7BC 0007771C 4E 80 04 21 */ bctrl /* 8007A7C0 00077720 88 9E 04 01 */ lbz r4, 0x401(r30) /* 8007A7C4 00077724 54 80 E7 FF */ rlwinm. r0, r4, 0x1c, 0x1f, 0x1f /* 8007A7C8 00077728 40 82 03 50 */ bne lbl_8007AB18 @@ -4129,7 +4129,7 @@ lbl_8007A828: /* 8007A83C 0007779C 38 63 A8 F8 */ addi r3, r3, lbl_803DA8F8@l /* 8007A840 000777A0 7C 03 00 2E */ lwzx r0, r3, r0 /* 8007A844 000777A4 7C 09 03 A6 */ mtctr r0 -/* 8007A848 000777A8 4E 80 04 20 */ bctr +/* 8007A848 000777A8 4E 80 04 20 */ bctr .global lbl_8007A84C lbl_8007A84C: /* 8007A84C 000777AC C0 02 89 08 */ lfs f0, lbl_805AA628@sda21(r2) @@ -4157,7 +4157,7 @@ lbl_8007A84C: /* 8007A8A4 00077804 81 9E 00 00 */ lwz r12, 0(r30) /* 8007A8A8 00077808 81 8C 02 90 */ lwz r12, 0x290(r12) /* 8007A8AC 0007780C 7D 89 03 A6 */ mtctr r12 -/* 8007A8B0 00077810 4E 80 04 21 */ bctrl +/* 8007A8B0 00077810 4E 80 04 21 */ bctrl /* 8007A8B4 00077814 48 00 02 64 */ b lbl_8007AB18 .global lbl_8007A8B8 lbl_8007A8B8: @@ -4166,7 +4166,7 @@ lbl_8007A8B8: /* 8007A8C0 00077820 81 9E 00 00 */ lwz r12, 0(r30) /* 8007A8C4 00077824 81 8C 02 C4 */ lwz r12, 0x2c4(r12) /* 8007A8C8 00077828 7D 89 03 A6 */ mtctr r12 -/* 8007A8CC 0007782C 4E 80 04 21 */ bctrl +/* 8007A8CC 0007782C 4E 80 04 21 */ bctrl /* 8007A8D0 00077830 48 00 02 48 */ b lbl_8007AB18 .global lbl_8007A8D4 lbl_8007A8D4: @@ -4177,7 +4177,7 @@ lbl_8007A8D4: /* 8007A8E4 00077844 81 8C 02 A4 */ lwz r12, 0x2a4(r12) /* 8007A8E8 00077848 C0 42 89 48 */ lfs f2, lbl_805AA668@sda21(r2) /* 8007A8EC 0007784C 7D 89 03 A6 */ mtctr r12 -/* 8007A8F0 00077850 4E 80 04 21 */ bctrl +/* 8007A8F0 00077850 4E 80 04 21 */ bctrl /* 8007A8F4 00077854 48 00 02 24 */ b lbl_8007AB18 .global lbl_8007A8F8 lbl_8007A8F8: @@ -4187,7 +4187,7 @@ lbl_8007A8F8: /* 8007A904 00077864 C0 42 89 4C */ lfs f2, lbl_805AA66C@sda21(r2) /* 8007A908 00077868 81 8C 02 A0 */ lwz r12, 0x2a0(r12) /* 8007A90C 0007786C 7D 89 03 A6 */ mtctr r12 -/* 8007A910 00077870 4E 80 04 21 */ bctrl +/* 8007A910 00077870 4E 80 04 21 */ bctrl /* 8007A914 00077874 48 00 02 04 */ b lbl_8007AB18 .global lbl_8007A918 lbl_8007A918: @@ -4203,7 +4203,7 @@ lbl_8007A928: /* 8007A934 00077894 C0 42 89 48 */ lfs f2, lbl_805AA668@sda21(r2) /* 8007A938 00077898 81 8C 02 A0 */ lwz r12, 0x2a0(r12) /* 8007A93C 0007789C 7D 89 03 A6 */ mtctr r12 -/* 8007A940 000778A0 4E 80 04 21 */ bctrl +/* 8007A940 000778A0 4E 80 04 21 */ bctrl /* 8007A944 000778A4 81 9E 00 00 */ lwz r12, 0(r30) /* 8007A948 000778A8 3C 80 80 5A */ lis r4, skZero3f@ha /* 8007A94C 000778AC 38 A4 66 A0 */ addi r5, r4, skZero3f@l @@ -4212,7 +4212,7 @@ lbl_8007A928: /* 8007A958 000778B8 7F E4 FB 78 */ mr r4, r31 /* 8007A95C 000778BC 38 C0 00 14 */ li r6, 0x14 /* 8007A960 000778C0 7D 89 03 A6 */ mtctr r12 -/* 8007A964 000778C4 4E 80 04 21 */ bctrl +/* 8007A964 000778C4 4E 80 04 21 */ bctrl /* 8007A968 000778C8 88 1E 04 00 */ lbz r0, 0x400(r30) /* 8007A96C 000778CC 38 A0 00 00 */ li r5, 0 /* 8007A970 000778D0 50 A0 17 7A */ rlwimi r0, r5, 2, 0x1d, 0x1d @@ -4264,7 +4264,7 @@ lbl_8007AA0C: /* 8007AA20 00077980 7F E4 FB 78 */ mr r4, r31 /* 8007AA24 00077984 38 C0 00 14 */ li r6, 0x14 /* 8007AA28 00077988 7D 89 03 A6 */ mtctr r12 -/* 8007AA2C 0007798C 4E 80 04 21 */ bctrl +/* 8007AA2C 0007798C 4E 80 04 21 */ bctrl /* 8007AA30 00077990 48 00 00 E8 */ b lbl_8007AB18 .global lbl_8007AA34 lbl_8007AA34: @@ -4276,12 +4276,12 @@ lbl_8007AA34: /* 8007AA48 000779A8 7F E4 FB 78 */ mr r4, r31 /* 8007AA4C 000779AC 38 C0 00 14 */ li r6, 0x14 /* 8007AA50 000779B0 7D 89 03 A6 */ mtctr r12 -/* 8007AA54 000779B4 4E 80 04 21 */ bctrl +/* 8007AA54 000779B4 4E 80 04 21 */ bctrl /* 8007AA58 000779B8 7F C3 F3 78 */ mr r3, r30 /* 8007AA5C 000779BC 81 9E 00 00 */ lwz r12, 0(r30) /* 8007AA60 000779C0 81 8C 02 C8 */ lwz r12, 0x2c8(r12) /* 8007AA64 000779C4 7D 89 03 A6 */ mtctr r12 -/* 8007AA68 000779C8 4E 80 04 21 */ bctrl +/* 8007AA68 000779C8 4E 80 04 21 */ bctrl /* 8007AA6C 000779CC 88 03 00 0C */ lbz r0, 0xc(r3) /* 8007AA70 000779D0 28 00 00 00 */ cmplwi r0, 0 /* 8007AA74 000779D4 40 82 00 10 */ bne lbl_8007AA84 @@ -4294,7 +4294,7 @@ lbl_8007AA84: /* 8007AA8C 000779EC 81 9E 00 00 */ lwz r12, 0(r30) /* 8007AA90 000779F0 81 8C 02 98 */ lwz r12, 0x298(r12) /* 8007AA94 000779F4 7D 89 03 A6 */ mtctr r12 -/* 8007AA98 000779F8 4E 80 04 21 */ bctrl +/* 8007AA98 000779F8 4E 80 04 21 */ bctrl /* 8007AA9C 000779FC 48 00 00 7C */ b lbl_8007AB18 lbl_8007AAA0: /* 8007AAA0 00077A00 80 7E 04 50 */ lwz r3, 0x450(r30) @@ -4313,7 +4313,7 @@ lbl_8007AAB8: /* 8007AACC 00077A2C 7F E4 FB 78 */ mr r4, r31 /* 8007AAD0 00077A30 38 C0 00 14 */ li r6, 0x14 /* 8007AAD4 00077A34 7D 89 03 A6 */ mtctr r12 -/* 8007AAD8 00077A38 4E 80 04 21 */ bctrl +/* 8007AAD8 00077A38 4E 80 04 21 */ bctrl /* 8007AADC 00077A3C 88 1E 05 58 */ lbz r0, 0x558(r30) /* 8007AAE0 00077A40 28 00 00 00 */ cmplwi r0, 0 /* 8007AAE4 00077A44 41 82 00 20 */ beq lbl_8007AB04 @@ -4322,7 +4322,7 @@ lbl_8007AAB8: /* 8007AAF0 00077A50 81 9E 00 00 */ lwz r12, 0(r30) /* 8007AAF4 00077A54 81 8C 02 9C */ lwz r12, 0x29c(r12) /* 8007AAF8 00077A58 7D 89 03 A6 */ mtctr r12 -/* 8007AAFC 00077A5C 4E 80 04 21 */ bctrl +/* 8007AAFC 00077A5C 4E 80 04 21 */ bctrl /* 8007AB00 00077A60 48 00 00 18 */ b lbl_8007AB18 lbl_8007AB04: /* 8007AB04 00077A64 80 7E 04 50 */ lwz r3, 0x450(r30) @@ -4338,7 +4338,7 @@ lbl_8007AB18: /* 8007AB24 00077A84 80 01 00 64 */ lwz r0, 0x64(r1) /* 8007AB28 00077A88 7C 08 03 A6 */ mtlr r0 /* 8007AB2C 00077A8C 38 21 00 60 */ addi r1, r1, 0x60 -/* 8007AB30 00077A90 4E 80 00 20 */ blr +/* 8007AB30 00077A90 4E 80 00 20 */ blr .global MassiveFrozenDeath__10CPatternedFR13CStateManager MassiveFrozenDeath__10CPatternedFR13CStateManager: @@ -4454,7 +4454,7 @@ lbl_8007ACA4: /* 8007ACD8 00077C38 80 01 01 24 */ lwz r0, 0x124(r1) /* 8007ACDC 00077C3C 7C 08 03 A6 */ mtlr r0 /* 8007ACE0 00077C40 38 21 01 20 */ addi r1, r1, 0x120 -/* 8007ACE4 00077C44 4E 80 00 20 */ blr +/* 8007ACE4 00077C44 4E 80 00 20 */ blr .global MassiveDeath__10CPatternedFR13CStateManager MassiveDeath__10CPatternedFR13CStateManager: @@ -4510,7 +4510,7 @@ lbl_8007AD74: /* 8007ADA8 00077D08 80 01 00 24 */ lwz r0, 0x24(r1) /* 8007ADAC 00077D0C 7C 08 03 A6 */ mtlr r0 /* 8007ADB0 00077D10 38 21 00 20 */ addi r1, r1, 0x20 -/* 8007ADB4 00077D14 4E 80 00 20 */ blr +/* 8007ADB4 00077D14 4E 80 00 20 */ blr .global GenerateIceDeathExplosion__10CPatternedFR13CStateManager GenerateIceDeathExplosion__10CPatternedFR13CStateManager: @@ -4656,7 +4656,7 @@ lbl_8007AFC4: /* 8007AFC8 00077F28 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 8007AFCC 00077F2C 7C 08 03 A6 */ mtlr r0 /* 8007AFD0 00077F30 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 8007AFD4 00077F34 4E 80 00 20 */ blr +/* 8007AFD4 00077F34 4E 80 00 20 */ blr .global GenerateDeathExplosion__10CPatternedFR13CStateManager GenerateDeathExplosion__10CPatternedFR13CStateManager: @@ -4669,7 +4669,7 @@ GenerateDeathExplosion__10CPatternedFR13CStateManager: /* 8007AFF0 00077F50 81 83 00 00 */ lwz r12, 0(r3) /* 8007AFF4 00077F54 81 8C 02 C8 */ lwz r12, 0x2c8(r12) /* 8007AFF8 00077F58 7D 89 03 A6 */ mtctr r12 -/* 8007AFFC 00077F5C 4E 80 04 21 */ bctrl +/* 8007AFFC 00077F5C 4E 80 04 21 */ bctrl /* 8007B000 00077F60 88 03 00 0C */ lbz r0, 0xc(r3) /* 8007B004 00077F64 3B DC 05 30 */ addi r30, r28, 0x530 /* 8007B008 00077F68 7C 78 1B 78 */ mr r24, r3 @@ -4917,7 +4917,7 @@ lbl_8007B390: /* 8007B394 000782F4 80 01 01 44 */ lwz r0, 0x144(r1) /* 8007B398 000782F8 7C 08 03 A6 */ mtlr r0 /* 8007B39C 000782FC 38 21 01 40 */ addi r1, r1, 0x140 -/* 8007B3A0 00078300 4E 80 00 20 */ blr +/* 8007B3A0 00078300 4E 80 00 20 */ blr .global Death__10CPatternedFR13CStateManagerRC9CVector3f18EScriptObjectState Death__10CPatternedFR13CStateManagerRC9CVector3f18EScriptObjectState: @@ -4943,7 +4943,7 @@ Death__10CPatternedFR13CStateManagerRC9CVector3f18EScriptObjectState: /* 8007B3F0 00078350 81 83 00 00 */ lwz r12, 0(r3) /* 8007B3F4 00078354 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8007B3F8 00078358 7D 89 03 A6 */ mtctr r12 -/* 8007B3FC 0007835C 4E 80 04 21 */ bctrl +/* 8007B3FC 0007835C 4E 80 04 21 */ bctrl /* 8007B400 00078360 C0 5C 03 E4 */ lfs f2, 0x3e4(r28) /* 8007B404 00078364 C0 23 00 00 */ lfs f1, 0(r3) /* 8007B408 00078368 C0 1C 03 DC */ lfs f0, 0x3dc(r28) @@ -4976,7 +4976,7 @@ lbl_8007B468: /* 8007B470 000783D0 81 9C 00 00 */ lwz r12, 0(r28) /* 8007B474 000783D4 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8007B478 000783D8 7D 89 03 A6 */ mtctr r12 -/* 8007B47C 000783DC 4E 80 04 21 */ bctrl +/* 8007B47C 000783DC 4E 80 04 21 */ bctrl /* 8007B480 000783E0 C0 5C 03 E4 */ lfs f2, 0x3e4(r28) /* 8007B484 000783E4 C0 23 00 00 */ lfs f1, 0(r3) /* 8007B488 000783E8 C0 1C 03 D8 */ lfs f0, 0x3d8(r28) @@ -5218,7 +5218,7 @@ lbl_8007B804: /* 8007B814 00078774 83 81 01 30 */ lwz r28, 0x130(r1) /* 8007B818 00078778 7C 08 03 A6 */ mtlr r0 /* 8007B81C 0007877C 38 21 01 40 */ addi r1, r1, 0x140 -/* 8007B820 00078780 4E 80 00 20 */ blr +/* 8007B820 00078780 4E 80 00 20 */ blr .global __dt__15CBCKnockDownCmd __dt__15CBCKnockDownCmd: @@ -5246,7 +5246,7 @@ lbl_8007B868: /* 8007B870 000787D0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8007B874 000787D4 7C 08 03 A6 */ mtlr r0 /* 8007B878 000787D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8007B87C 000787DC 4E 80 00 20 */ blr +/* 8007B87C 000787DC 4E 80 00 20 */ blr .global __dt__12CBCHurledCmd __dt__12CBCHurledCmd: @@ -5274,7 +5274,7 @@ lbl_8007B8C4: /* 8007B8CC 0007882C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8007B8D0 00078830 7C 08 03 A6 */ mtlr r0 /* 8007B8D4 00078834 38 21 00 10 */ addi r1, r1, 0x10 -/* 8007B8D8 00078838 4E 80 00 20 */ blr +/* 8007B8D8 00078838 4E 80 00 20 */ blr .global __dt__13CBodyStateCmdFv __dt__13CBodyStateCmdFv: @@ -5296,7 +5296,7 @@ lbl_8007B90C: /* 8007B914 00078874 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8007B918 00078878 7C 08 03 A6 */ mtlr r0 /* 8007B91C 0007887C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8007B920 00078880 4E 80 00 20 */ blr +/* 8007B920 00078880 4E 80 00 20 */ blr .global sub_8007b924 sub_8007b924: @@ -5344,7 +5344,7 @@ sub_8007b924: /* 8007B9C8 00078928 80 01 00 34 */ lwz r0, 0x34(r1) /* 8007B9CC 0007892C 7C 08 03 A6 */ mtlr r0 /* 8007B9D0 00078930 38 21 00 30 */ addi r1, r1, 0x30 -/* 8007B9D4 00078934 4E 80 00 20 */ blr +/* 8007B9D4 00078934 4E 80 00 20 */ blr .global __dt__15CBCKnockBackCmd __dt__15CBCKnockBackCmd: @@ -5372,7 +5372,7 @@ lbl_8007BA1C: /* 8007BA24 00078984 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8007BA28 00078988 7C 08 03 A6 */ mtlr r0 /* 8007BA2C 0007898C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8007BA30 00078990 4E 80 00 20 */ blr +/* 8007BA30 00078990 4E 80 00 20 */ blr .global __dt__21CBCLoopHitReactionCmd __dt__21CBCLoopHitReactionCmd: @@ -5400,7 +5400,7 @@ lbl_8007BA78: /* 8007BA80 000789E0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8007BA84 000789E4 7C 08 03 A6 */ mtlr r0 /* 8007BA88 000789E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8007BA8C 000789EC 4E 80 00 20 */ blr +/* 8007BA8C 000789EC 4E 80 00 20 */ blr .global TryLoopReaction__10CPatternedFR13CStateManageri TryLoopReaction__10CPatternedFR13CStateManageri: @@ -5436,7 +5436,7 @@ TryLoopReaction__10CPatternedFR13CStateManageri: /* 8007BB04 00078A64 80 01 00 24 */ lwz r0, 0x24(r1) /* 8007BB08 00078A68 7C 08 03 A6 */ mtlr r0 /* 8007BB0C 00078A6C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8007BB10 00078A70 4E 80 00 20 */ blr +/* 8007BB10 00078A70 4E 80 00 20 */ blr .global __dt__18CBCLoopReactionCmd __dt__18CBCLoopReactionCmd: @@ -5464,7 +5464,7 @@ lbl_8007BB58: /* 8007BB60 00078AC0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8007BB64 00078AC4 7C 08 03 A6 */ mtlr r0 /* 8007BB68 00078AC8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8007BB6C 00078ACC 4E 80 00 20 */ blr +/* 8007BB6C 00078ACC 4E 80 00 20 */ blr .global TryTurn__10CPatternedFR13CStateManageri TryTurn__10CPatternedFR13CStateManageri: @@ -5512,7 +5512,7 @@ TryTurn__10CPatternedFR13CStateManageri: /* 8007BC14 00078B74 83 E1 00 4C */ lwz r31, 0x4c(r1) /* 8007BC18 00078B78 7C 08 03 A6 */ mtlr r0 /* 8007BC1C 00078B7C 38 21 00 50 */ addi r1, r1, 0x50 -/* 8007BC20 00078B80 4E 80 00 20 */ blr +/* 8007BC20 00078B80 4E 80 00 20 */ blr .global TryGetUp__10CPatternedFR13CStateManageri TryGetUp__10CPatternedFR13CStateManageri: @@ -5548,7 +5548,7 @@ TryGetUp__10CPatternedFR13CStateManageri: /* 8007BC98 00078BF8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8007BC9C 00078BFC 7C 08 03 A6 */ mtlr r0 /* 8007BCA0 00078C00 38 21 00 20 */ addi r1, r1, 0x20 -/* 8007BCA4 00078C04 4E 80 00 20 */ blr +/* 8007BCA4 00078C04 4E 80 00 20 */ blr .global __dt__11CBCGetupCmd __dt__11CBCGetupCmd: @@ -5576,7 +5576,7 @@ lbl_8007BCEC: /* 8007BCF4 00078C54 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8007BCF8 00078C58 7C 08 03 A6 */ mtlr r0 /* 8007BCFC 00078C5C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8007BD00 00078C60 4E 80 00 20 */ blr +/* 8007BD00 00078C60 4E 80 00 20 */ blr .global sub_8007bd04 sub_8007bd04: @@ -5624,7 +5624,7 @@ sub_8007bd04: /* 8007BDA8 00078D08 80 01 00 34 */ lwz r0, 0x34(r1) /* 8007BDAC 00078D0C 7C 08 03 A6 */ mtlr r0 /* 8007BDB0 00078D10 38 21 00 30 */ addi r1, r1, 0x30 -/* 8007BDB4 00078D14 4E 80 00 20 */ blr +/* 8007BDB4 00078D14 4E 80 00 20 */ blr .global TryTaunt__10CPatternedFR13CStateManageri TryTaunt__10CPatternedFR13CStateManageri: @@ -5660,7 +5660,7 @@ TryTaunt__10CPatternedFR13CStateManageri: /* 8007BE2C 00078D8C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8007BE30 00078D90 7C 08 03 A6 */ mtlr r0 /* 8007BE34 00078D94 38 21 00 20 */ addi r1, r1, 0x20 -/* 8007BE38 00078D98 4E 80 00 20 */ blr +/* 8007BE38 00078D98 4E 80 00 20 */ blr .global __dt__11CBCTauntCmd __dt__11CBCTauntCmd: @@ -5688,7 +5688,7 @@ lbl_8007BE80: /* 8007BE88 00078DE8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8007BE8C 00078DEC 7C 08 03 A6 */ mtlr r0 /* 8007BE90 00078DF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8007BE94 00078DF4 4E 80 00 20 */ blr +/* 8007BE94 00078DF4 4E 80 00 20 */ blr .global __dt__11CBCSlideCmd __dt__11CBCSlideCmd: @@ -5716,7 +5716,7 @@ lbl_8007BEDC: /* 8007BEE4 00078E44 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8007BEE8 00078E48 7C 08 03 A6 */ mtlr r0 /* 8007BEEC 00078E4C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8007BEF0 00078E50 4E 80 00 20 */ blr +/* 8007BEF0 00078E50 4E 80 00 20 */ blr .global TryJump__10CPatternedFR13CStateManageri TryJump__10CPatternedFR13CStateManageri: @@ -5787,7 +5787,7 @@ TryJump__10CPatternedFR13CStateManageri: /* 8007BFF4 00078F54 80 01 00 44 */ lwz r0, 0x44(r1) /* 8007BFF8 00078F58 7C 08 03 A6 */ mtlr r0 /* 8007BFFC 00078F5C 38 21 00 40 */ addi r1, r1, 0x40 -/* 8007C000 00078F60 4E 80 00 20 */ blr +/* 8007C000 00078F60 4E 80 00 20 */ blr .global __dt__10CBCJumpCmd __dt__10CBCJumpCmd: @@ -5815,7 +5815,7 @@ lbl_8007C048: /* 8007C050 00078FB0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8007C054 00078FB4 7C 08 03 A6 */ mtlr r0 /* 8007C058 00078FB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8007C05C 00078FBC 4E 80 00 20 */ blr +/* 8007C05C 00078FBC 4E 80 00 20 */ blr .global sub_8007c060 sub_8007c060: @@ -5877,7 +5877,7 @@ sub_8007c060: /* 8007C13C 0007909C 80 01 00 34 */ lwz r0, 0x34(r1) /* 8007C140 000790A0 7C 08 03 A6 */ mtlr r0 /* 8007C144 000790A4 38 21 00 30 */ addi r1, r1, 0x30 -/* 8007C148 000790A8 4E 80 00 20 */ blr +/* 8007C148 000790A8 4E 80 00 20 */ blr .global __dt__14CBCGenerateCmd __dt__14CBCGenerateCmd: @@ -5905,7 +5905,7 @@ lbl_8007C190: /* 8007C198 000790F8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8007C19C 000790FC 7C 08 03 A6 */ mtlr r0 /* 8007C1A0 00079100 38 21 00 10 */ addi r1, r1, 0x10 -/* 8007C1A4 00079104 4E 80 00 20 */ blr +/* 8007C1A4 00079104 4E 80 00 20 */ blr .global sub_8007c1a8 sub_8007c1a8: @@ -5968,7 +5968,7 @@ sub_8007c1a8: /* 8007C288 000791E8 80 01 00 34 */ lwz r0, 0x34(r1) /* 8007C28C 000791EC 7C 08 03 A6 */ mtlr r0 /* 8007C290 000791F0 38 21 00 30 */ addi r1, r1, 0x30 -/* 8007C294 000791F4 4E 80 00 20 */ blr +/* 8007C294 000791F4 4E 80 00 20 */ blr .global TryBreakDodge__10CPatternedFR13CStateManageri TryBreakDodge__10CPatternedFR13CStateManageri: @@ -6008,7 +6008,7 @@ TryBreakDodge__10CPatternedFR13CStateManageri: /* 8007C31C 0007927C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8007C320 00079280 7C 08 03 A6 */ mtlr r0 /* 8007C324 00079284 38 21 00 20 */ addi r1, r1, 0x20 -/* 8007C328 00079288 4E 80 00 20 */ blr +/* 8007C328 00079288 4E 80 00 20 */ blr .global __dt__10CBCStepCmd __dt__10CBCStepCmd: @@ -6036,7 +6036,7 @@ lbl_8007C370: /* 8007C378 000792D8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8007C37C 000792DC 7C 08 03 A6 */ mtlr r0 /* 8007C380 000792E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8007C384 000792E4 4E 80 00 20 */ blr +/* 8007C384 000792E4 4E 80 00 20 */ blr .global TryDodge__10CPatternedFR13CStateManageri TryDodge__10CPatternedFR13CStateManageri: @@ -6075,7 +6075,7 @@ TryDodge__10CPatternedFR13CStateManageri: /* 8007C408 00079368 80 01 00 24 */ lwz r0, 0x24(r1) /* 8007C40C 0007936C 7C 08 03 A6 */ mtlr r0 /* 8007C410 00079370 38 21 00 20 */ addi r1, r1, 0x20 -/* 8007C414 00079374 4E 80 00 20 */ blr +/* 8007C414 00079374 4E 80 00 20 */ blr .global sub_8007c418 sub_8007c418: @@ -6115,7 +6115,7 @@ sub_8007c418: /* 8007C49C 000793FC 80 01 00 24 */ lwz r0, 0x24(r1) /* 8007C4A0 00079400 7C 08 03 A6 */ mtlr r0 /* 8007C4A4 00079404 38 21 00 20 */ addi r1, r1, 0x20 -/* 8007C4A8 00079408 4E 80 00 20 */ blr +/* 8007C4A8 00079408 4E 80 00 20 */ blr .global sub_8007c4ac sub_8007c4ac: @@ -6167,7 +6167,7 @@ sub_8007c4ac: /* 8007C560 000794C0 80 01 00 34 */ lwz r0, 0x34(r1) /* 8007C564 000794C4 7C 08 03 A6 */ mtlr r0 /* 8007C568 000794C8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8007C56C 000794CC 4E 80 00 20 */ blr +/* 8007C56C 000794CC 4E 80 00 20 */ blr .global __dt__17CBCMeleeAttackCmd __dt__17CBCMeleeAttackCmd: @@ -6195,7 +6195,7 @@ lbl_8007C5B4: /* 8007C5BC 0007951C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8007C5C0 00079520 7C 08 03 A6 */ mtlr r0 /* 8007C5C4 00079524 38 21 00 10 */ addi r1, r1, 0x10 -/* 8007C5C8 00079528 4E 80 00 20 */ blr +/* 8007C5C8 00079528 4E 80 00 20 */ blr .global TryMeleeAttack__10CPatternedFR13CStateManageri TryMeleeAttack__10CPatternedFR13CStateManageri: @@ -6248,7 +6248,7 @@ TryMeleeAttack__10CPatternedFR13CStateManageri: /* 8007C684 000795E4 80 01 00 34 */ lwz r0, 0x34(r1) /* 8007C688 000795E8 7C 08 03 A6 */ mtlr r0 /* 8007C68C 000795EC 38 21 00 30 */ addi r1, r1, 0x30 -/* 8007C690 000795F0 4E 80 00 20 */ blr +/* 8007C690 000795F0 4E 80 00 20 */ blr .global TryProjectileAttack__10CPatternedFR13CStateManageri TryProjectileAttack__10CPatternedFR13CStateManageri: @@ -6300,7 +6300,7 @@ TryProjectileAttack__10CPatternedFR13CStateManageri: /* 8007C748 000796A8 80 01 00 34 */ lwz r0, 0x34(r1) /* 8007C74C 000796AC 7C 08 03 A6 */ mtlr r0 /* 8007C750 000796B0 38 21 00 30 */ addi r1, r1, 0x30 -/* 8007C754 000796B4 4E 80 00 20 */ blr +/* 8007C754 000796B4 4E 80 00 20 */ blr .global __dt__22CBCProjectileAttackCmdFv __dt__22CBCProjectileAttackCmdFv: @@ -6328,7 +6328,7 @@ lbl_8007C79C: /* 8007C7A4 00079704 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8007C7A8 00079708 7C 08 03 A6 */ mtlr r0 /* 8007C7AC 0007970C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8007C7B0 00079710 4E 80 00 20 */ blr +/* 8007C7B0 00079710 4E 80 00 20 */ blr .global TryCommand__10CPatternedFR13CStateManageriM10CPatternedFR13CStateManageri_vi TryCommand__10CPatternedFR13CStateManageriM10CPatternedFR13CStateManageri_vi: @@ -6349,7 +6349,7 @@ lbl_8007C7DC: /* 8007C7E8 00079748 7C E5 3B 78 */ mr r5, r7 /* 8007C7EC 0007974C 7C CC 33 78 */ mr r12, r6 /* 8007C7F0 00079750 48 30 D1 3D */ bl __ptmf_scall -/* 8007C7F4 00079754 60 00 00 00 */ nop +/* 8007C7F4 00079754 60 00 00 00 */ nop /* 8007C7F8 00079758 48 00 00 0C */ b lbl_8007C804 lbl_8007C7FC: /* 8007C7FC 0007975C 38 00 00 03 */ li r0, 3 @@ -6358,7 +6358,7 @@ lbl_8007C804: /* 8007C804 00079764 80 01 00 14 */ lwz r0, 0x14(r1) /* 8007C808 00079768 7C 08 03 A6 */ mtlr r0 /* 8007C80C 0007976C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8007C810 00079770 4E 80 00 20 */ blr +/* 8007C810 00079770 4E 80 00 20 */ blr .global SetCoverPoint__10CPatternedFP17CScriptCoverPointR9TUniqueId SetCoverPoint__10CPatternedFP17CScriptCoverPointR9TUniqueId: @@ -6379,7 +6379,7 @@ SetCoverPoint__10CPatternedFP17CScriptCoverPointR9TUniqueId: /* 8007C84C 000797AC 83 C1 00 08 */ lwz r30, 8(r1) /* 8007C850 000797B0 7C 08 03 A6 */ mtlr r0 /* 8007C854 000797B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8007C858 000797B8 4E 80 00 20 */ blr +/* 8007C858 000797B8 4E 80 00 20 */ blr .global ReleaseCoverPoint__10CPatternedFR13CStateManagerR9TUniqueId ReleaseCoverPoint__10CPatternedFR13CStateManagerR9TUniqueId: @@ -6403,7 +6403,7 @@ lbl_8007C898: /* 8007C89C 000797FC 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8007C8A0 00079800 7C 08 03 A6 */ mtlr r0 /* 8007C8A4 00079804 38 21 00 20 */ addi r1, r1, 0x20 -/* 8007C8A8 00079808 4E 80 00 20 */ blr +/* 8007C8A8 00079808 4E 80 00 20 */ blr .global GetCoverPoint__10CPatternedCFR13CStateManager9TUniqueId GetCoverPoint__10CPatternedCFR13CStateManager9TUniqueId: @@ -6427,7 +6427,7 @@ lbl_8007C8EC: /* 8007C8EC 0007984C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8007C8F0 00079850 7C 08 03 A6 */ mtlr r0 /* 8007C8F4 00079854 38 21 00 20 */ addi r1, r1, 0x20 -/* 8007C8F8 00079858 4E 80 00 20 */ blr +/* 8007C8F8 00079858 4E 80 00 20 */ blr .global SetupPlayerCollision__10CPatternedFb SetupPlayerCollision__10CPatternedFb: @@ -6497,7 +6497,7 @@ lbl_8007C9EC: /* 8007C9F0 00079950 80 01 00 54 */ lwz r0, 0x54(r1) /* 8007C9F4 00079954 7C 08 03 A6 */ mtlr r0 /* 8007C9F8 00079958 38 21 00 50 */ addi r1, r1, 0x50 -/* 8007C9FC 0007995C 4E 80 00 20 */ blr +/* 8007C9FC 0007995C 4E 80 00 20 */ blr .global func_8007CA00 func_8007CA00: @@ -6541,7 +6541,7 @@ lbl_8007CA7C: /* 8007CA90 000799F0 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8007CA94 000799F4 7C 08 03 A6 */ mtlr r0 /* 8007CA98 000799F8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8007CA9C 000799FC 4E 80 00 20 */ blr +/* 8007CA9C 000799FC 4E 80 00 20 */ blr .global ApplyBoneTracking__10CPatternedCFv ApplyBoneTracking__10CPatternedCFv: @@ -6557,7 +6557,7 @@ ApplyBoneTracking__10CPatternedCFv: /* 8007CAC4 00079A24 54 04 1F FE */ rlwinm r4, r0, 3, 0x1f, 0x1f lbl_8007CAC8: /* 8007CAC8 00079A28 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 8007CACC 00079A2C 4E 80 00 20 */ blr +/* 8007CACC 00079A2C 4E 80 00 20 */ blr .global GetGunEyePos__10CPatternedCFv GetGunEyePos__10CPatternedCFv: @@ -6595,7 +6595,7 @@ GetGunEyePos__10CPatternedCFv: /* 8007CB4C 00079AAC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8007CB50 00079AB0 7C 08 03 A6 */ mtlr r0 /* 8007CB54 00079AB4 38 21 00 40 */ addi r1, r1, 0x40 -/* 8007CB58 00079AB8 4E 80 00 20 */ blr +/* 8007CB58 00079AB8 4E 80 00 20 */ blr .global SetDestPos__10CPatternedFRC9CVector3f SetDestPos__10CPatternedFRC9CVector3f: @@ -6605,7 +6605,7 @@ SetDestPos__10CPatternedFRC9CVector3f: /* 8007CB68 00079AC8 D0 03 02 E4 */ stfs f0, 0x2e4(r3) /* 8007CB6C 00079ACC C0 04 00 08 */ lfs f0, 8(r4) /* 8007CB70 00079AD0 D0 03 02 E8 */ stfs f0, 0x2e8(r3) -/* 8007CB74 00079AD4 4E 80 00 20 */ blr +/* 8007CB74 00079AD4 4E 80 00 20 */ blr .global AcceptScriptMsg__10CPatternedF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__10CPatternedF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -6630,7 +6630,7 @@ AcceptScriptMsg__10CPatternedF20EScriptObjectMessage9TUniqueIdR13CStateManager: /* 8007CBC0 00079B20 38 63 A9 20 */ addi r3, r3, lbl_803DA920@l /* 8007CBC4 00079B24 7C 03 00 2E */ lwzx r0, r3, r0 /* 8007CBC8 00079B28 7C 09 03 A6 */ mtctr r0 -/* 8007CBCC 00079B2C 4E 80 04 20 */ bctr +/* 8007CBCC 00079B2C 4E 80 04 20 */ bctr .global lbl_8007CBD0 lbl_8007CBD0: /* 8007CBD0 00079B30 80 1E 05 08 */ lwz r0, 0x508(r30) @@ -6803,7 +6803,7 @@ lbl_8007CE1C: /* 8007CE40 00079DA0 81 9E 00 00 */ lwz r12, 0(r30) /* 8007CE44 00079DA4 81 8C 00 80 */ lwz r12, 0x80(r12) /* 8007CE48 00079DA8 7D 89 03 A6 */ mtctr r12 -/* 8007CE4C 00079DAC 4E 80 04 21 */ bctrl +/* 8007CE4C 00079DAC 4E 80 04 21 */ bctrl /* 8007CE50 00079DB0 C0 02 89 08 */ lfs f0, lbl_805AA628@sda21(r2) /* 8007CE54 00079DB4 FC 20 08 50 */ fneg f1, f1 /* 8007CE58 00079DB8 7F C3 F3 78 */ mr r3, r30 @@ -6843,7 +6843,7 @@ lbl_8007CEA4: /* 8007CECC 00079E2C 7F 4C D3 78 */ mr r12, r26 /* 8007CED0 00079E30 38 A0 00 02 */ li r5, 2 /* 8007CED4 00079E34 48 30 CA 59 */ bl __ptmf_scall -/* 8007CED8 00079E38 60 00 00 00 */ nop +/* 8007CED8 00079E38 60 00 00 00 */ nop /* 8007CEDC 00079E3C 48 00 01 E0 */ b lbl_8007D0BC .global lbl_8007CEE0 lbl_8007CEE0: @@ -6872,7 +6872,7 @@ lbl_8007CEE0: /* 8007CF38 00079E98 81 9E 00 00 */ lwz r12, 0(r30) /* 8007CF3C 00079E9C 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8007CF40 00079EA0 7D 89 03 A6 */ mtctr r12 -/* 8007CF44 00079EA4 4E 80 04 21 */ bctrl +/* 8007CF44 00079EA4 4E 80 04 21 */ bctrl /* 8007CF48 00079EA8 28 03 00 00 */ cmplwi r3, 0 /* 8007CF4C 00079EAC 41 82 00 F8 */ beq lbl_8007D044 /* 8007CF50 00079EB0 88 1E 04 01 */ lbz r0, 0x401(r30) @@ -6895,7 +6895,7 @@ lbl_8007CEE0: /* 8007CF94 00079EF4 81 9E 00 00 */ lwz r12, 0(r30) /* 8007CF98 00079EF8 81 8C 00 88 */ lwz r12, 0x88(r12) /* 8007CF9C 00079EFC 7D 89 03 A6 */ mtctr r12 -/* 8007CFA0 00079F00 4E 80 04 21 */ bctrl +/* 8007CFA0 00079F00 4E 80 04 21 */ bctrl /* 8007CFA4 00079F04 38 7E 04 60 */ addi r3, r30, 0x460 /* 8007CFA8 00079F08 38 80 00 02 */ li r4, 2 /* 8007CFAC 00079F0C 48 1B 6D 85 */ bl DeferKnockBack__20CKnockBackControllerF11EWeaponType @@ -6914,7 +6914,7 @@ lbl_8007CFB4: /* 8007CFDC 00079F3C 81 9E 00 00 */ lwz r12, 0(r30) /* 8007CFE0 00079F40 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8007CFE4 00079F44 7D 89 03 A6 */ mtctr r12 -/* 8007CFE8 00079F48 4E 80 04 21 */ bctrl +/* 8007CFE8 00079F48 4E 80 04 21 */ bctrl /* 8007CFEC 00079F4C 28 03 00 00 */ cmplwi r3, 0 /* 8007CFF0 00079F50 41 82 00 54 */ beq lbl_8007D044 /* 8007CFF4 00079F54 C0 3A 01 40 */ lfs f1, 0x140(r26) @@ -6933,7 +6933,7 @@ lbl_8007CFB4: /* 8007D028 00079F88 81 9E 00 00 */ lwz r12, 0(r30) /* 8007D02C 00079F8C 81 8C 00 88 */ lwz r12, 0x88(r12) /* 8007D030 00079F90 7D 89 03 A6 */ mtctr r12 -/* 8007D034 00079F94 4E 80 04 21 */ bctrl +/* 8007D034 00079F94 4E 80 04 21 */ bctrl /* 8007D038 00079F98 38 7E 04 60 */ addi r3, r30, 0x460 /* 8007D03C 00079F9C 38 80 00 03 */ li r4, 3 /* 8007D040 00079FA0 48 1B 6C F1 */ bl DeferKnockBack__20CKnockBackControllerF11EWeaponType @@ -6978,7 +6978,7 @@ lbl_8007D0BC: /* 8007D0C8 0007A028 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 8007D0CC 0007A02C 7C 08 03 A6 */ mtlr r0 /* 8007D0D0 0007A030 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8007D0D4 0007A034 4E 80 00 20 */ blr +/* 8007D0D4 0007A034 4E 80 00 20 */ blr .global Accept__10CPatternedFR8IVisitor Accept__10CPatternedFR8IVisitor: @@ -6991,11 +6991,11 @@ Accept__10CPatternedFR8IVisitor: /* 8007D0F0 0007A050 7C 04 03 78 */ mr r4, r0 /* 8007D0F4 0007A054 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 8007D0F8 0007A058 7D 89 03 A6 */ mtctr r12 -/* 8007D0FC 0007A05C 4E 80 04 21 */ bctrl +/* 8007D0FC 0007A05C 4E 80 04 21 */ bctrl /* 8007D100 0007A060 80 01 00 14 */ lwz r0, 0x14(r1) /* 8007D104 0007A064 7C 08 03 A6 */ mtlr r0 /* 8007D108 0007A068 38 21 00 10 */ addi r1, r1, 0x10 -/* 8007D10C 0007A06C 4E 80 00 20 */ blr +/* 8007D10C 0007A06C 4E 80 00 20 */ blr .global BuildBodyController__10CPatternedF9EBodyType BuildBodyController__10CPatternedF9EBodyType: @@ -7114,7 +7114,7 @@ lbl_8007D2A8: /* 8007D2B4 0007A214 83 A1 00 A4 */ lwz r29, 0xa4(r1) /* 8007D2B8 0007A218 7C 08 03 A6 */ mtlr r0 /* 8007D2BC 0007A21C 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 8007D2C0 0007A220 4E 80 00 20 */ blr +/* 8007D2C0 0007A220 4E 80 00 20 */ blr .global __ct__16CPASAnimParmDataFiRC12CPASAnimParmRC12CPASAnimParmRC12CPASAnimParmRC12CPASAnimParmRC12CPASAnimParmRC12CPASAnimParmRC12CPASAnimParmRC12CPASAnimParm __ct__16CPASAnimParmDataFiRC12CPASAnimParmRC12CPASAnimParmRC12CPASAnimParmRC12CPASAnimParmRC12CPASAnimParmRC12CPASAnimParmRC12CPASAnimParmRC12CPASAnimParm: @@ -7224,7 +7224,7 @@ lbl_8007D438: /* 8007D440 0007A3A0 90 03 00 04 */ stw r0, 4(r3) /* 8007D444 0007A3A4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8007D448 0007A3A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8007D44C 0007A3AC 4E 80 00 20 */ blr +/* 8007D44C 0007A3AC 4E 80 00 20 */ blr .global "__ct__10CPatternedFUi9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>Q210CPatterned11EFlavorTypeRC11CEntityInfoRC12CTransform4fRC10CModelDataRC14CPatternedInfoQ210CPatterned13EMovementTypeQ210CPatterned13EColliderType9EBodyTypeRC16CActorParametersUi" "__ct__10CPatternedFUi9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>Q210CPatterned11EFlavorTypeRC11CEntityInfoRC12CTransform4fRC10CModelDataRC14CPatternedInfoQ210CPatterned13EMovementTypeQ210CPatterned13EColliderType9EBodyTypeRC16CActorParametersUi": @@ -7654,7 +7654,7 @@ lbl_8007DA64: /* 8007DAE4 0007AA44 81 84 00 00 */ lwz r12, 0(r4) /* 8007DAE8 0007AA48 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8007DAEC 0007AA4C 7D 89 03 A6 */ mtctr r12 -/* 8007DAF0 0007AA50 4E 80 04 21 */ bctrl +/* 8007DAF0 0007AA50 4E 80 04 21 */ bctrl /* 8007DAF4 0007AA54 38 61 00 6C */ addi r3, r1, 0x6c /* 8007DAF8 0007AA58 38 81 00 44 */ addi r4, r1, 0x44 /* 8007DAFC 0007AA5C 48 2C 33 AD */ bl __ct__6CTokenFRC6CToken @@ -7705,7 +7705,7 @@ lbl_8007DB74: /* 8007DBA0 0007AB00 81 84 00 00 */ lwz r12, 0(r4) /* 8007DBA4 0007AB04 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8007DBA8 0007AB08 7D 89 03 A6 */ mtctr r12 -/* 8007DBAC 0007AB0C 4E 80 04 21 */ bctrl +/* 8007DBAC 0007AB0C 4E 80 04 21 */ bctrl /* 8007DBB0 0007AB10 38 61 00 60 */ addi r3, r1, 0x60 /* 8007DBB4 0007AB14 38 81 00 34 */ addi r4, r1, 0x34 /* 8007DBB8 0007AB18 48 2C 32 F1 */ bl __ct__6CTokenFRC6CToken @@ -7756,7 +7756,7 @@ lbl_8007DC30: /* 8007DC5C 0007ABBC 81 84 00 00 */ lwz r12, 0(r4) /* 8007DC60 0007ABC0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8007DC64 0007ABC4 7D 89 03 A6 */ mtctr r12 -/* 8007DC68 0007ABC8 4E 80 04 21 */ bctrl +/* 8007DC68 0007ABC8 4E 80 04 21 */ bctrl /* 8007DC6C 0007ABCC 38 61 00 54 */ addi r3, r1, 0x54 /* 8007DC70 0007ABD0 38 81 00 24 */ addi r4, r1, 0x24 /* 8007DC74 0007ABD4 48 2C 32 35 */ bl __ct__6CTokenFRC6CToken @@ -7834,7 +7834,7 @@ lbl_8007DD6C: /* 8007DD74 0007ACD4 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 8007DD78 0007ACD8 7C 08 03 A6 */ mtlr r0 /* 8007DD7C 0007ACDC 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 8007DD80 0007ACE0 4E 80 00 20 */ blr +/* 8007DD80 0007ACE0 4E 80 00 20 */ blr .global sub_8007dd84 sub_8007dd84: @@ -7861,16 +7861,16 @@ lbl_8007DDCC: /* 8007DDD0 0007AD30 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8007DDD4 0007AD34 7C 08 03 A6 */ mtlr r0 /* 8007DDD8 0007AD38 38 21 00 10 */ addi r1, r1, 0x10 -/* 8007DDDC 0007AD3C 4E 80 00 20 */ blr +/* 8007DDDC 0007AD3C 4E 80 00 20 */ blr .global "Min__5CMathFRCfRCf" "Min__5CMathFRCfRCf": /* 8007DDE0 0007AD40 C0 23 00 00 */ lfs f1, 0(r3) /* 8007DDE4 0007AD44 C0 04 00 00 */ lfs f0, 0(r4) /* 8007DDE8 0007AD48 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8007DDEC 0007AD4C 4D 80 00 20 */ bltlr +/* 8007DDEC 0007AD4C 4D 80 00 20 */ bltlr /* 8007DDF0 0007AD50 7C 83 23 78 */ mr r3, r4 -/* 8007DDF4 0007AD54 4E 80 00 20 */ blr +/* 8007DDF4 0007AD54 4E 80 00 20 */ blr .global __sinit_CPatterned_cpp __sinit_CPatterned_cpp: @@ -7999,4 +7999,4 @@ __sinit_CPatterned_cpp: /* 8007DFE0 0007AF40 80 01 00 14 */ lwz r0, 0x14(r1) /* 8007DFE4 0007AF44 7C 08 03 A6 */ mtlr r0 /* 8007DFE8 0007AF48 38 21 00 10 */ addi r1, r1, 0x10 -/* 8007DFEC 0007AF4C 4E 80 00 20 */ blr +/* 8007DFEC 0007AF4C 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/Enemies/CPatternedInfo.s b/asm/MetroidPrime/Enemies/CPatternedInfo.s index 571a49b3..23679498 100644 --- a/asm/MetroidPrime/Enemies/CPatternedInfo.s +++ b/asm/MetroidPrime/Enemies/CPatternedInfo.s @@ -24,7 +24,7 @@ lbl_8010585C: /* 80105868 001027C8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8010586C 001027CC 7C 08 03 A6 */ mtlr r0 /* 80105870 001027D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80105874 001027D4 4E 80 00 20 */ blr +/* 80105874 001027D4 4E 80 00 20 */ blr .global __ct__14CPatternedInfoFR12CInputStreamUi __ct__14CPatternedInfoFR12CInputStreamUi: diff --git a/asm/MetroidPrime/Enemies/CPhazonHealingNodule.s b/asm/MetroidPrime/Enemies/CPhazonHealingNodule.s index 810c51ca..62dcd655 100644 --- a/asm/MetroidPrime/Enemies/CPhazonHealingNodule.s +++ b/asm/MetroidPrime/Enemies/CPhazonHealingNodule.s @@ -277,11 +277,11 @@ lbl_80294DDC: /* 80294DE8 00291D48 83 C1 00 08 */ lwz r30, 8(r1) /* 80294DEC 00291D4C 7C 08 03 A6 */ mtlr r0 /* 80294DF0 00291D50 38 21 00 10 */ addi r1, r1, 0x10 -/* 80294DF4 00291D54 4E 80 00 20 */ blr +/* 80294DF4 00291D54 4E 80 00 20 */ blr .global KnockBack__20CPhazonHealingNoduleFRC9CVector3fR13CStateManagerRC11CDamageInfo14EKnockBackTypef KnockBack__20CPhazonHealingNoduleFRC9CVector3fR13CStateManagerRC11CDamageInfo14EKnockBackTypef: -/* 80294DF8 00291D58 4E 80 00 20 */ blr +/* 80294DF8 00291D58 4E 80 00 20 */ blr .global sub_80294dfc sub_80294dfc: @@ -294,11 +294,11 @@ sub_80294dfc: /* 80294E14 00291D74 81 83 00 00 */ lwz r12, 0(r3) /* 80294E18 00291D78 81 8C 00 84 */ lwz r12, 0x84(r12) /* 80294E1C 00291D7C 7D 89 03 A6 */ mtctr r12 -/* 80294E20 00291D80 4E 80 04 21 */ bctrl +/* 80294E20 00291D80 4E 80 04 21 */ bctrl /* 80294E24 00291D84 80 01 00 14 */ lwz r0, 0x14(r1) /* 80294E28 00291D88 7C 08 03 A6 */ mtlr r0 /* 80294E2C 00291D8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80294E30 00291D90 4E 80 00 20 */ blr +/* 80294E30 00291D90 4E 80 00 20 */ blr .global sub_80294e34 sub_80294e34: @@ -311,11 +311,11 @@ sub_80294e34: /* 80294E4C 00291DAC 81 83 00 00 */ lwz r12, 0(r3) /* 80294E50 00291DB0 81 8C 00 84 */ lwz r12, 0x84(r12) /* 80294E54 00291DB4 7D 89 03 A6 */ mtctr r12 -/* 80294E58 00291DB8 4E 80 04 21 */ bctrl +/* 80294E58 00291DB8 4E 80 04 21 */ bctrl /* 80294E5C 00291DBC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80294E60 00291DC0 7C 08 03 A6 */ mtlr r0 /* 80294E64 00291DC4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80294E68 00291DC8 4E 80 00 20 */ blr +/* 80294E68 00291DC8 4E 80 00 20 */ blr .global sub_80294e6c sub_80294e6c: @@ -328,11 +328,11 @@ sub_80294e6c: /* 80294E84 00291DE4 81 83 00 00 */ lwz r12, 0(r3) /* 80294E88 00291DE8 81 8C 00 84 */ lwz r12, 0x84(r12) /* 80294E8C 00291DEC 7D 89 03 A6 */ mtctr r12 -/* 80294E90 00291DF0 4E 80 04 21 */ bctrl +/* 80294E90 00291DF0 4E 80 04 21 */ bctrl /* 80294E94 00291DF4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80294E98 00291DF8 7C 08 03 A6 */ mtlr r0 /* 80294E9C 00291DFC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80294EA0 00291E00 4E 80 00 20 */ blr +/* 80294EA0 00291E00 4E 80 00 20 */ blr .global Death__20CPhazonHealingNoduleFRC9CVector3fR13CStateManager Death__20CPhazonHealingNoduleFRC9CVector3fR13CStateManager: @@ -357,7 +357,7 @@ Death__20CPhazonHealingNoduleFRC9CVector3fR13CStateManager: /* 80294EEC 00291E4C 83 C1 00 08 */ lwz r30, 8(r1) /* 80294EF0 00291E50 7C 08 03 A6 */ mtlr r0 /* 80294EF4 00291E54 38 21 00 10 */ addi r1, r1, 0x10 -/* 80294EF8 00291E58 4E 80 00 20 */ blr +/* 80294EF8 00291E58 4E 80 00 20 */ blr .global sub_80294efc sub_80294efc: @@ -453,7 +453,7 @@ lbl_80295028: /* 80295048 00291FA8 83 C1 00 88 */ lwz r30, 0x88(r1) /* 8029504C 00291FAC 7C 08 03 A6 */ mtlr r0 /* 80295050 00291FB0 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 80295054 00291FB4 4E 80 00 20 */ blr +/* 80295054 00291FB4 4E 80 00 20 */ blr .global sub_80295058 sub_80295058: @@ -461,7 +461,7 @@ sub_80295058: /* 8029505C 00291FBC 20 00 00 03 */ subfic r0, r0, 3 /* 80295060 00291FC0 7C 00 00 34 */ cntlzw r0, r0 /* 80295064 00291FC4 54 03 D9 7E */ srwi r3, r0, 5 -/* 80295068 00291FC8 4E 80 00 20 */ blr +/* 80295068 00291FC8 4E 80 00 20 */ blr .global Faint__20CPhazonHealingNoduleFR13CStateManager9EStateMsgf Faint__20CPhazonHealingNoduleFR13CStateManager9EStateMsgf: @@ -544,7 +544,7 @@ lbl_8029517C: /* 80295180 002920E0 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80295184 002920E4 7C 08 03 A6 */ mtlr r0 /* 80295188 002920E8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8029518C 002920EC 4E 80 00 20 */ blr +/* 8029518C 002920EC 4E 80 00 20 */ blr .global Growth__20CPhazonHealingNoduleFR13CStateManager9EStateMsgf Growth__20CPhazonHealingNoduleFR13CStateManager9EStateMsgf: @@ -627,7 +627,7 @@ lbl_802952A0: /* 802952A4 00292204 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802952A8 00292208 7C 08 03 A6 */ mtlr r0 /* 802952AC 0029220C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802952B0 00292210 4E 80 00 20 */ blr +/* 802952B0 00292210 4E 80 00 20 */ blr .global Render__20CPhazonHealingNoduleCFRC13CStateManager Render__20CPhazonHealingNoduleCFRC13CStateManager: @@ -645,7 +645,7 @@ Render__20CPhazonHealingNoduleCFRC13CStateManager: /* 802952E0 00292240 81 83 00 00 */ lwz r12, 0(r3) /* 802952E4 00292244 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802952E8 00292248 7D 89 03 A6 */ mtctr r12 -/* 802952EC 0029224C 4E 80 04 21 */ bctrl +/* 802952EC 0029224C 4E 80 04 21 */ bctrl lbl_802952F0: /* 802952F0 00292250 7F C3 F3 78 */ mr r3, r30 /* 802952F4 00292254 7F E4 FB 78 */ mr r4, r31 @@ -655,14 +655,14 @@ lbl_802952F0: /* 80295304 00292264 83 C1 00 08 */ lwz r30, 8(r1) /* 80295308 00292268 7C 08 03 A6 */ mtlr r0 /* 8029530C 0029226C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80295310 00292270 4E 80 00 20 */ blr +/* 80295310 00292270 4E 80 00 20 */ blr .global sub_80295314 sub_80295314: /* 80295314 00292274 80 03 05 68 */ lwz r0, 0x568(r3) /* 80295318 00292278 7C 00 00 34 */ cntlzw r0, r0 /* 8029531C 0029227C 54 03 D9 7E */ srwi r3, r0, 5 -/* 80295320 00292280 4E 80 00 20 */ blr +/* 80295320 00292280 4E 80 00 20 */ blr .global sub_80295324 sub_80295324: @@ -670,7 +670,7 @@ sub_80295324: /* 80295328 00292288 20 00 00 01 */ subfic r0, r0, 1 /* 8029532C 0029228C 7C 00 00 34 */ cntlzw r0, r0 /* 80295330 00292290 54 03 D9 7E */ srwi r3, r0, 5 -/* 80295334 00292294 4E 80 00 20 */ blr +/* 80295334 00292294 4E 80 00 20 */ blr .global Lurk__20CPhazonHealingNoduleFR13CStateManager9EStateMsgf Lurk__20CPhazonHealingNoduleFR13CStateManager9EStateMsgf: @@ -689,7 +689,7 @@ lbl_80295360: /* 80295360 002922C0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80295364 002922C4 7C 08 03 A6 */ mtlr r0 /* 80295368 002922C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8029536C 002922CC 4E 80 00 20 */ blr +/* 8029536C 002922CC 4E 80 00 20 */ blr .global Patrol__20CPhazonHealingNoduleFR13CStateManager9EStateMsgf Patrol__20CPhazonHealingNoduleFR13CStateManager9EStateMsgf: @@ -722,7 +722,7 @@ lbl_802953C8: /* 802953D0 00292330 83 C1 00 08 */ lwz r30, 8(r1) /* 802953D4 00292334 7C 08 03 A6 */ mtlr r0 /* 802953D8 00292338 38 21 00 10 */ addi r1, r1, 0x10 -/* 802953DC 0029233C 4E 80 00 20 */ blr +/* 802953DC 0029233C 4E 80 00 20 */ blr .global Think__20CPhazonHealingNoduleFfR13CStateManager Think__20CPhazonHealingNoduleFfR13CStateManager: @@ -745,7 +745,7 @@ Think__20CPhazonHealingNoduleFfR13CStateManager: /* 80295420 00292380 81 9E 00 00 */ lwz r12, 0(r30) /* 80295424 00292384 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80295428 00292388 7D 89 03 A6 */ mtctr r12 -/* 8029542C 0029238C 4E 80 04 21 */ bctrl +/* 8029542C 0029238C 4E 80 04 21 */ bctrl /* 80295430 00292390 C0 23 00 00 */ lfs f1, 0(r3) /* 80295434 00292394 C0 02 BF 90 */ lfs f0, lbl_805ADCB0@sda21(r2) /* 80295438 00292398 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -792,7 +792,7 @@ lbl_802954B0: /* 802954D8 00292438 81 83 00 00 */ lwz r12, 0(r3) /* 802954DC 0029243C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802954E0 00292440 7D 89 03 A6 */ mtctr r12 -/* 802954E4 00292444 4E 80 04 21 */ bctrl +/* 802954E4 00292444 4E 80 04 21 */ bctrl lbl_802954E8: /* 802954E8 00292448 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 802954EC 0029244C 80 01 00 34 */ lwz r0, 0x34(r1) @@ -801,7 +801,7 @@ lbl_802954E8: /* 802954F8 00292458 83 C1 00 18 */ lwz r30, 0x18(r1) /* 802954FC 0029245C 7C 08 03 A6 */ mtlr r0 /* 80295500 00292460 38 21 00 30 */ addi r1, r1, 0x30 -/* 80295504 00292464 4E 80 00 20 */ blr +/* 80295504 00292464 4E 80 00 20 */ blr .global DoUserAnimEvent__20CPhazonHealingNoduleFR13CStateManagerRC13CInt32POINode14EUserEventType DoUserAnimEvent__20CPhazonHealingNoduleFR13CStateManagerRC13CInt32POINode14EUserEventType: @@ -878,7 +878,7 @@ lbl_80295600: /* 8029560C 0029256C 81 83 00 00 */ lwz r12, 0(r3) /* 80295610 00292570 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80295614 00292574 7D 89 03 A6 */ mtctr r12 -/* 80295618 00292578 4E 80 04 21 */ bctrl +/* 80295618 00292578 4E 80 04 21 */ bctrl /* 8029561C 0029257C 48 00 00 38 */ b lbl_80295654 lbl_80295620: /* 80295620 00292580 38 00 00 00 */ li r0, 0 @@ -902,7 +902,7 @@ lbl_80295654: /* 80295660 002925C0 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80295664 002925C4 7C 08 03 A6 */ mtlr r0 /* 80295668 002925C8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8029566C 002925CC 4E 80 00 20 */ blr +/* 8029566C 002925CC 4E 80 00 20 */ blr .global AcceptScriptMsg__20CPhazonHealingNoduleF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__20CPhazonHealingNoduleF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -920,7 +920,7 @@ AcceptScriptMsg__20CPhazonHealingNoduleF20EScriptObjectMessage9TUniqueIdR13CStat /* 8029569C 002925FC 38 E7 BF 3C */ addi r7, r7, lbl_803EBF3C@l /* 802956A0 00292600 7C 07 00 2E */ lwzx r0, r7, r0 /* 802956A4 00292604 7C 09 03 A6 */ mtctr r0 -/* 802956A8 00292608 4E 80 04 20 */ bctr +/* 802956A8 00292608 4E 80 04 20 */ bctr .global lbl_802956AC lbl_802956AC: /* 802956AC 0029260C 80 7E 04 50 */ lwz r3, 0x450(r30) @@ -934,7 +934,7 @@ lbl_802956C4: /* 802956C8 00292628 81 9E 00 00 */ lwz r12, 0(r30) /* 802956CC 0029262C 81 8C 00 8C */ lwz r12, 0x8c(r12) /* 802956D0 00292630 7D 89 03 A6 */ mtctr r12 -/* 802956D4 00292634 4E 80 04 21 */ bctrl +/* 802956D4 00292634 4E 80 04 21 */ bctrl /* 802956D8 00292638 3C A0 80 57 */ lis r5, lbl_80570004@ha /* 802956DC 0029263C 84 C5 D7 18 */ lwzu r6, -0x28e8(r5) /* 802956E0 00292640 38 80 00 00 */ li r4, 0 @@ -1070,7 +1070,7 @@ lbl_802958B8: /* 802958BC 0029281C 7F E4 FB 78 */ mr r4, r31 /* 802958C0 00292820 81 8C 00 34 */ lwz r12, 0x34(r12) /* 802958C4 00292824 7D 89 03 A6 */ mtctr r12 -/* 802958C8 00292828 4E 80 04 21 */ bctrl +/* 802958C8 00292828 4E 80 04 21 */ bctrl /* 802958CC 0029282C C0 1E 05 80 */ lfs f0, 0x580(r30) /* 802958D0 00292830 D0 03 00 00 */ stfs f0, 0(r3) /* 802958D4 00292834 C0 1E 05 84 */ lfs f0, 0x584(r30) @@ -1089,7 +1089,7 @@ lbl_802958F8: /* 802958FC 0029285C 80 01 00 34 */ lwz r0, 0x34(r1) /* 80295900 00292860 7C 08 03 A6 */ mtlr r0 /* 80295904 00292864 38 21 00 30 */ addi r1, r1, 0x30 -/* 80295908 00292868 4E 80 00 20 */ blr +/* 80295908 00292868 4E 80 00 20 */ blr .global "__ct__20CPhazonHealingNoduleF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfo" "__ct__20CPhazonHealingNoduleF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfo": @@ -1142,7 +1142,7 @@ lbl_802958F8: /* 802959C4 00292924 81 84 00 00 */ lwz r12, 0(r4) /* 802959C8 00292928 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802959CC 0029292C 7D 89 03 A6 */ mtctr r12 -/* 802959D0 00292930 4E 80 04 21 */ bctrl +/* 802959D0 00292930 4E 80 04 21 */ bctrl /* 802959D4 00292934 3B 9E 05 70 */ addi r28, r30, 0x570 /* 802959D8 00292938 38 81 00 24 */ addi r4, r1, 0x24 /* 802959DC 0029293C 7F 83 E3 78 */ mr r3, r28 @@ -1206,7 +1206,7 @@ lbl_80295A30: /* 80295AC0 00292A20 83 81 00 50 */ lwz r28, 0x50(r1) /* 80295AC4 00292A24 7C 08 03 A6 */ mtlr r0 /* 80295AC8 00292A28 38 21 00 60 */ addi r1, r1, 0x60 -/* 80295ACC 00292A2C 4E 80 00 20 */ blr +/* 80295ACC 00292A2C 4E 80 00 20 */ blr .global sub_80295ad0 sub_80295ad0: @@ -1228,7 +1228,7 @@ sub_80295ad0: /* 80295B0C 00292A6C 38 80 00 01 */ li r4, 1 /* 80295B10 00292A70 81 8C 00 08 */ lwz r12, 8(r12) /* 80295B14 00292A74 7D 89 03 A6 */ mtctr r12 -/* 80295B18 00292A78 4E 80 04 21 */ bctrl +/* 80295B18 00292A78 4E 80 04 21 */ bctrl lbl_80295B1C: /* 80295B1C 00292A7C 80 7F 00 00 */ lwz r3, 0(r31) /* 80295B20 00292A80 28 03 00 00 */ cmplwi r3, 0 @@ -1239,4 +1239,4 @@ lbl_80295B2C: /* 80295B30 00292A90 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80295B34 00292A94 7C 08 03 A6 */ mtlr r0 /* 80295B38 00292A98 38 21 00 10 */ addi r1, r1, 0x10 -/* 80295B3C 00292A9C 4E 80 00 20 */ blr +/* 80295B3C 00292A9C 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/Enemies/CPhazonPool.s b/asm/MetroidPrime/Enemies/CPhazonPool.s index 444fc806..b20b1ead 100644 --- a/asm/MetroidPrime/Enemies/CPhazonPool.s +++ b/asm/MetroidPrime/Enemies/CPhazonPool.s @@ -96,12 +96,12 @@ sub_802925e0: /* 802925F8 0028F558 81 83 00 00 */ lwz r12, 0(r3) /* 802925FC 0028F55C 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80292600 0028F560 7D 89 03 A6 */ mtctr r12 -/* 80292604 0028F564 4E 80 04 21 */ bctrl +/* 80292604 0028F564 4E 80 04 21 */ bctrl lbl_80292608: /* 80292608 0028F568 80 01 00 14 */ lwz r0, 0x14(r1) /* 8029260C 0028F56C 7C 08 03 A6 */ mtlr r0 /* 80292610 0028F570 38 21 00 10 */ addi r1, r1, 0x10 -/* 80292614 0028F574 4E 80 00 20 */ blr +/* 80292614 0028F574 4E 80 00 20 */ blr .global sub_80292618 sub_80292618: @@ -147,7 +147,7 @@ lbl_80292698: /* 802926A8 0028F608 80 01 00 44 */ lwz r0, 0x44(r1) /* 802926AC 0028F60C 7C 08 03 A6 */ mtlr r0 /* 802926B0 0028F610 38 21 00 40 */ addi r1, r1, 0x40 -/* 802926B4 0028F614 4E 80 00 20 */ blr +/* 802926B4 0028F614 4E 80 00 20 */ blr .global UpdateInhabitants__11CPhazonPoolFR13CStateManager UpdateInhabitants__11CPhazonPoolFR13CStateManager: @@ -177,7 +177,7 @@ lbl_802926D8: /* 80292710 0028F670 81 9D 00 00 */ lwz r12, 0(r29) /* 80292714 0028F674 81 8C 00 40 */ lwz r12, 0x40(r12) /* 80292718 0028F678 7D 89 03 A6 */ mtctr r12 -/* 8029271C 0028F67C 4E 80 04 21 */ bctrl +/* 8029271C 0028F67C 4E 80 04 21 */ bctrl /* 80292720 0028F680 88 01 00 54 */ lbz r0, 0x54(r1) /* 80292724 0028F684 28 00 00 00 */ cmplwi r0, 0 /* 80292728 0028F688 98 01 00 70 */ stb r0, 0x70(r1) @@ -249,7 +249,7 @@ lbl_80292808: /* 80292818 0028F778 80 01 00 94 */ lwz r0, 0x94(r1) /* 8029281C 0028F77C 7C 08 03 A6 */ mtlr r0 /* 80292820 0028F780 38 21 00 90 */ addi r1, r1, 0x90 -/* 80292824 0028F784 4E 80 00 20 */ blr +/* 80292824 0028F784 4E 80 00 20 */ blr .global AddToRenderer__11CPhazonPoolCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__11CPhazonPoolCFRC14CFrustumPlanesRC13CStateManager: @@ -272,7 +272,7 @@ AddToRenderer__11CPhazonPoolCFRC14CFrustumPlanesRC13CStateManager: /* 80292868 0028F7C8 81 83 00 00 */ lwz r12, 0(r3) /* 8029286C 0028F7CC 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80292870 0028F7D0 7D 89 03 A6 */ mtctr r12 -/* 80292874 0028F7D4 4E 80 04 21 */ bctrl +/* 80292874 0028F7D4 4E 80 04 21 */ bctrl lbl_80292878: /* 80292878 0028F7D8 80 9D 01 74 */ lwz r4, 0x174(r29) /* 8029287C 0028F7DC 28 04 00 00 */ cmplwi r4, 0 @@ -281,7 +281,7 @@ lbl_80292878: /* 80292888 0028F7E8 81 83 00 00 */ lwz r12, 0(r3) /* 8029288C 0028F7EC 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80292890 0028F7F0 7D 89 03 A6 */ mtctr r12 -/* 80292894 0028F7F4 4E 80 04 21 */ bctrl +/* 80292894 0028F7F4 4E 80 04 21 */ bctrl lbl_80292898: /* 80292898 0028F7F8 7F A3 EB 78 */ mr r3, r29 /* 8029289C 0028F7FC 7F C4 F3 78 */ mr r4, r30 @@ -296,7 +296,7 @@ lbl_80292898: /* 802928C0 0028F820 83 A1 00 14 */ lwz r29, 0x14(r1) /* 802928C4 0028F824 7C 08 03 A6 */ mtlr r0 /* 802928C8 0028F828 38 21 00 20 */ addi r1, r1, 0x20 -/* 802928CC 0028F82C 4E 80 00 20 */ blr +/* 802928CC 0028F82C 4E 80 00 20 */ blr .global Accept__11CPhazonPoolFR8IVisitor Accept__11CPhazonPoolFR8IVisitor: @@ -309,11 +309,11 @@ Accept__11CPhazonPoolFR8IVisitor: /* 802928E8 0028F848 7C 04 03 78 */ mr r4, r0 /* 802928EC 0028F84C 81 8C 00 CC */ lwz r12, 0xcc(r12) /* 802928F0 0028F850 7D 89 03 A6 */ mtctr r12 -/* 802928F4 0028F854 4E 80 04 21 */ bctrl +/* 802928F4 0028F854 4E 80 04 21 */ bctrl /* 802928F8 0028F858 80 01 00 14 */ lwz r0, 0x14(r1) /* 802928FC 0028F85C 7C 08 03 A6 */ mtlr r0 /* 80292900 0028F860 38 21 00 10 */ addi r1, r1, 0x10 -/* 80292904 0028F864 4E 80 00 20 */ blr +/* 80292904 0028F864 4E 80 00 20 */ blr .global AcceptScriptMsg__11CPhazonPoolF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__11CPhazonPoolF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -335,7 +335,7 @@ AcceptScriptMsg__11CPhazonPoolF20EScriptObjectMessage9TUniqueIdR13CStateManager: /* 80292944 0028F8A4 38 84 BB C4 */ addi r4, r4, lbl_803EBBC4@l /* 80292948 0028F8A8 7C 04 00 2E */ lwzx r0, r4, r0 /* 8029294C 0028F8AC 7C 09 03 A6 */ mtctr r0 -/* 80292950 0028F8B0 4E 80 04 20 */ bctr +/* 80292950 0028F8B0 4E 80 04 20 */ bctr .global lbl_80292954 lbl_80292954: /* 80292954 0028F8B4 80 7C 01 70 */ lwz r3, 0x170(r28) @@ -351,7 +351,7 @@ lbl_80292954: /* 8029297C 0028F8DC 81 83 00 00 */ lwz r12, 0(r3) /* 80292980 0028F8E0 81 8C 00 20 */ lwz r12, 0x20(r12) /* 80292984 0028F8E4 7D 89 03 A6 */ mtctr r12 -/* 80292988 0028F8E8 4E 80 04 21 */ bctrl +/* 80292988 0028F8E8 4E 80 04 21 */ bctrl lbl_8029298C: /* 8029298C 0028F8EC 80 9C 01 68 */ lwz r4, 0x168(r28) /* 80292990 0028F8F0 28 04 00 00 */ cmplwi r4, 0 @@ -486,7 +486,7 @@ lbl_80292B38: /* 80292B64 0028FAC4 83 81 00 90 */ lwz r28, 0x90(r1) /* 80292B68 0028FAC8 7C 08 03 A6 */ mtlr r0 /* 80292B6C 0028FACC 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 80292B70 0028FAD0 4E 80 00 20 */ blr +/* 80292B70 0028FAD0 4E 80 00 20 */ blr .global GetTouchBounds__11CPhazonPoolCFv GetTouchBounds__11CPhazonPoolCFv: @@ -500,7 +500,7 @@ GetTouchBounds__11CPhazonPoolCFv: /* 80292B90 0028FAF0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80292B94 0028FAF4 7C 08 03 A6 */ mtlr r0 /* 80292B98 0028FAF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80292B9C 0028FAFC 4E 80 00 20 */ blr +/* 80292B9C 0028FAFC 4E 80 00 20 */ blr .global Touch__11CPhazonPoolFR6CActorR13CStateManager Touch__11CPhazonPoolFR6CActorR13CStateManager: @@ -551,7 +551,7 @@ lbl_80292C30: /* 80292C40 0028FBA0 81 9E 00 00 */ lwz r12, 0(r30) /* 80292C44 0028FBA4 81 8C 00 40 */ lwz r12, 0x40(r12) /* 80292C48 0028FBA8 7D 89 03 A6 */ mtctr r12 -/* 80292C4C 0028FBAC 4E 80 04 21 */ bctrl +/* 80292C4C 0028FBAC 4E 80 04 21 */ bctrl /* 80292C50 0028FBB0 88 01 00 28 */ lbz r0, 0x28(r1) /* 80292C54 0028FBB4 28 00 00 00 */ cmplwi r0, 0 /* 80292C58 0028FBB8 98 01 00 44 */ stb r0, 0x44(r1) @@ -625,7 +625,7 @@ lbl_80292D4C: /* 80292D50 0028FCB0 80 01 00 74 */ lwz r0, 0x74(r1) /* 80292D54 0028FCB4 7C 08 03 A6 */ mtlr r0 /* 80292D58 0028FCB8 38 21 00 70 */ addi r1, r1, 0x70 -/* 80292D5C 0028FCBC 4E 80 00 20 */ blr +/* 80292D5C 0028FCBC 4E 80 00 20 */ blr .global Think__11CPhazonPoolFfR13CStateManager Think__11CPhazonPoolFfR13CStateManager: @@ -772,7 +772,7 @@ lbl_80292F54: /* 80292F80 0028FEE0 7F A3 EB 78 */ mr r3, r29 /* 80292F84 0028FEE4 81 8C 00 30 */ lwz r12, 0x30(r12) /* 80292F88 0028FEE8 7D 89 03 A6 */ mtctr r12 -/* 80292F8C 0028FEEC 4E 80 04 21 */ bctrl +/* 80292F8C 0028FEEC 4E 80 04 21 */ bctrl /* 80292F90 0028FEF0 D3 E1 00 14 */ stfs f31, 0x14(r1) /* 80292F94 0028FEF4 38 81 00 14 */ addi r4, r1, 0x14 /* 80292F98 0028FEF8 D3 E1 00 18 */ stfs f31, 0x18(r1) @@ -781,13 +781,13 @@ lbl_80292F54: /* 80292FA4 0028FF04 81 83 00 00 */ lwz r12, 0(r3) /* 80292FA8 0028FF08 81 8C 00 24 */ lwz r12, 0x24(r12) /* 80292FAC 0028FF0C 7D 89 03 A6 */ mtctr r12 -/* 80292FB0 0028FF10 4E 80 04 21 */ bctrl +/* 80292FB0 0028FF10 4E 80 04 21 */ bctrl /* 80292FB4 0028FF14 80 7E 01 70 */ lwz r3, 0x170(r30) /* 80292FB8 0028FF18 FC 20 F0 90 */ fmr f1, f30 /* 80292FBC 0028FF1C 81 83 00 00 */ lwz r12, 0(r3) /* 80292FC0 0028FF20 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80292FC4 0028FF24 7D 89 03 A6 */ mtctr r12 -/* 80292FC8 0028FF28 4E 80 04 21 */ bctrl +/* 80292FC8 0028FF28 4E 80 04 21 */ bctrl lbl_80292FCC: /* 80292FCC 0028FF2C 80 7E 01 74 */ lwz r3, 0x174(r30) /* 80292FD0 0028FF30 28 03 00 00 */ cmplwi r3, 0 @@ -796,7 +796,7 @@ lbl_80292FCC: /* 80292FDC 0028FF3C FC 20 F0 90 */ fmr f1, f30 /* 80292FE0 0028FF40 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80292FE4 0028FF44 7D 89 03 A6 */ mtctr r12 -/* 80292FE8 0028FF48 4E 80 04 21 */ bctrl +/* 80292FE8 0028FF48 4E 80 04 21 */ bctrl lbl_80292FEC: /* 80292FEC 0028FF4C 80 1E 01 DC */ lwz r0, 0x1dc(r30) /* 80292FF0 0028FF50 3B A0 00 00 */ li r29, 0 @@ -840,7 +840,7 @@ lbl_80293018: /* 80293080 0028FFE0 38 80 00 00 */ li r4, 0 /* 80293084 0028FFE4 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80293088 0028FFE8 7D 89 03 A6 */ mtctr r12 -/* 8029308C 0028FFEC 4E 80 04 21 */ bctrl +/* 8029308C 0028FFEC 4E 80 04 21 */ bctrl /* 80293090 0028FFF0 48 00 01 20 */ b lbl_802931B0 lbl_80293094: /* 80293094 0028FFF4 88 7E 01 E0 */ lbz r3, 0x1e0(r30) @@ -945,7 +945,7 @@ lbl_802931D0: /* 802931FC 0029015C 83 A1 00 B4 */ lwz r29, 0xb4(r1) /* 80293200 00290160 7C 08 03 A6 */ mtlr r0 /* 80293204 00290164 38 21 01 00 */ addi r1, r1, 0x100 -/* 80293208 00290168 4E 80 00 20 */ blr +/* 80293208 00290168 4E 80 00 20 */ blr .global sub_8029320c sub_8029320c: @@ -997,13 +997,13 @@ sub_8029320c: /* 802932C0 00290220 81 83 00 00 */ lwz r12, 0(r3) /* 802932C4 00290224 81 8C 00 20 */ lwz r12, 0x20(r12) /* 802932C8 00290228 7D 89 03 A6 */ mtctr r12 -/* 802932CC 0029022C 4E 80 04 21 */ bctrl +/* 802932CC 0029022C 4E 80 04 21 */ bctrl /* 802932D0 00290230 80 7E 01 70 */ lwz r3, 0x170(r30) /* 802932D4 00290234 38 80 00 00 */ li r4, 0 /* 802932D8 00290238 81 83 00 00 */ lwz r12, 0(r3) /* 802932DC 0029023C 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 802932E0 00290240 7D 89 03 A6 */ mtctr r12 -/* 802932E4 00290244 4E 80 04 21 */ bctrl +/* 802932E4 00290244 4E 80 04 21 */ bctrl lbl_802932E8: /* 802932E8 00290248 80 7E 01 74 */ lwz r3, 0x174(r30) /* 802932EC 0029024C 28 03 00 00 */ cmplwi r3, 0 @@ -1018,20 +1018,20 @@ lbl_802932E8: /* 80293310 00290270 81 83 00 00 */ lwz r12, 0(r3) /* 80293314 00290274 81 8C 00 20 */ lwz r12, 0x20(r12) /* 80293318 00290278 7D 89 03 A6 */ mtctr r12 -/* 8029331C 0029027C 4E 80 04 21 */ bctrl +/* 8029331C 0029027C 4E 80 04 21 */ bctrl /* 80293320 00290280 80 7E 01 74 */ lwz r3, 0x174(r30) /* 80293324 00290284 38 80 00 01 */ li r4, 1 /* 80293328 00290288 81 83 00 00 */ lwz r12, 0(r3) /* 8029332C 0029028C 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80293330 00290290 7D 89 03 A6 */ mtctr r12 -/* 80293334 00290294 4E 80 04 21 */ bctrl +/* 80293334 00290294 4E 80 04 21 */ bctrl lbl_80293338: /* 80293338 00290298 80 01 00 34 */ lwz r0, 0x34(r1) /* 8029333C 0029029C 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 80293340 002902A0 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80293344 002902A4 7C 08 03 A6 */ mtlr r0 /* 80293348 002902A8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8029334C 002902AC 4E 80 00 20 */ blr +/* 8029334C 002902AC 4E 80 00 20 */ blr .global Render__11CPhazonPoolCFRC13CStateManager Render__11CPhazonPoolCFRC13CStateManager: @@ -1142,7 +1142,7 @@ lbl_802934E4: /* 802934E8 00290448 80 01 01 64 */ lwz r0, 0x164(r1) /* 802934EC 0029044C 7C 08 03 A6 */ mtlr r0 /* 802934F0 00290450 38 21 01 60 */ addi r1, r1, 0x160 -/* 802934F4 00290454 4E 80 00 20 */ blr +/* 802934F4 00290454 4E 80 00 20 */ blr .global __dt__11CPhazonPoolFv __dt__11CPhazonPoolFv: @@ -1166,7 +1166,7 @@ __dt__11CPhazonPoolFv: /* 8029353C 0029049C 38 80 00 01 */ li r4, 1 /* 80293540 002904A0 81 8C 00 08 */ lwz r12, 8(r12) /* 80293544 002904A4 7D 89 03 A6 */ mtctr r12 -/* 80293548 002904A8 4E 80 04 21 */ bctrl +/* 80293548 002904A8 4E 80 04 21 */ bctrl lbl_8029354C: /* 8029354C 002904AC 34 1E 01 70 */ addic. r0, r30, 0x170 /* 80293550 002904B0 41 82 00 24 */ beq lbl_80293574 @@ -1177,7 +1177,7 @@ lbl_8029354C: /* 80293564 002904C4 38 80 00 01 */ li r4, 1 /* 80293568 002904C8 81 8C 00 08 */ lwz r12, 8(r12) /* 8029356C 002904CC 7D 89 03 A6 */ mtctr r12 -/* 80293570 002904D0 4E 80 04 21 */ bctrl +/* 80293570 002904D0 4E 80 04 21 */ bctrl lbl_80293574: /* 80293574 002904D4 34 1E 01 6C */ addic. r0, r30, 0x16c /* 80293578 002904D8 41 82 00 10 */ beq lbl_80293588 @@ -1208,7 +1208,7 @@ lbl_802935C4: /* 802935D0 00290530 83 C1 00 08 */ lwz r30, 8(r1) /* 802935D4 00290534 7C 08 03 A6 */ mtlr r0 /* 802935D8 00290538 38 21 00 10 */ addi r1, r1, 0x10 -/* 802935DC 0029053C 4E 80 00 20 */ blr +/* 802935DC 0029053C 4E 80 00 20 */ blr .global __ct__11CPhazonPoolFv __ct__11CPhazonPoolFv: @@ -1372,7 +1372,7 @@ lbl_8029374C: /* 8029384C 002907AC 81 84 00 00 */ lwz r12, 0(r4) /* 80293850 002907B0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80293854 002907B4 7D 89 03 A6 */ mtctr r12 -/* 80293858 002907B8 4E 80 04 21 */ bctrl +/* 80293858 002907B8 4E 80 04 21 */ bctrl /* 8029385C 002907BC 3B 01 00 64 */ addi r24, r1, 0x64 /* 80293860 002907C0 38 81 00 3C */ addi r4, r1, 0x3c /* 80293864 002907C4 7F 03 C3 78 */ mr r3, r24 @@ -1421,7 +1421,7 @@ lbl_802938FC: /* 8029390C 0029086C 38 80 00 01 */ li r4, 1 /* 80293910 00290870 81 8C 00 08 */ lwz r12, 8(r12) /* 80293914 00290874 7D 89 03 A6 */ mtctr r12 -/* 80293918 00290878 4E 80 04 21 */ bctrl +/* 80293918 00290878 4E 80 04 21 */ bctrl lbl_8029391C: /* 8029391C 0029087C 7F 20 07 75 */ extsb. r0, r25 /* 80293920 00290880 93 1F 01 70 */ stw r24, 0x170(r31) @@ -1437,7 +1437,7 @@ lbl_80293934: /* 80293944 002908A4 38 80 00 00 */ li r4, 0 /* 80293948 002908A8 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8029394C 002908AC 7D 89 03 A6 */ mtctr r12 -/* 80293950 002908B0 4E 80 04 21 */ bctrl +/* 80293950 002908B0 4E 80 04 21 */ bctrl lbl_80293954: /* 80293954 002908B4 38 61 00 A8 */ addi r3, r1, 0xa8 /* 80293958 002908B8 38 80 00 00 */ li r4, 0 @@ -1457,7 +1457,7 @@ lbl_80293960: /* 8029398C 002908EC 81 84 00 00 */ lwz r12, 0(r4) /* 80293990 002908F0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80293994 002908F4 7D 89 03 A6 */ mtctr r12 -/* 80293998 002908F8 4E 80 04 21 */ bctrl +/* 80293998 002908F8 4E 80 04 21 */ bctrl /* 8029399C 002908FC 3B 01 00 58 */ addi r24, r1, 0x58 /* 802939A0 00290900 38 81 00 24 */ addi r4, r1, 0x24 /* 802939A4 00290904 7F 03 C3 78 */ mr r3, r24 @@ -1506,7 +1506,7 @@ lbl_80293A3C: /* 80293A4C 002909AC 38 80 00 01 */ li r4, 1 /* 80293A50 002909B0 81 8C 00 08 */ lwz r12, 8(r12) /* 80293A54 002909B4 7D 89 03 A6 */ mtctr r12 -/* 80293A58 002909B8 4E 80 04 21 */ bctrl +/* 80293A58 002909B8 4E 80 04 21 */ bctrl lbl_80293A5C: /* 80293A5C 002909BC 7F 20 07 75 */ extsb. r0, r25 /* 80293A60 002909C0 93 1F 01 74 */ stw r24, 0x174(r31) @@ -1526,13 +1526,13 @@ lbl_80293A74: /* 80293A94 002909F4 81 83 00 00 */ lwz r12, 0(r3) /* 80293A98 002909F8 81 8C 00 24 */ lwz r12, 0x24(r12) /* 80293A9C 002909FC 7D 89 03 A6 */ mtctr r12 -/* 80293AA0 00290A00 4E 80 04 21 */ bctrl +/* 80293AA0 00290A00 4E 80 04 21 */ bctrl /* 80293AA4 00290A04 80 7F 01 74 */ lwz r3, 0x174(r31) /* 80293AA8 00290A08 38 80 00 00 */ li r4, 0 /* 80293AAC 00290A0C 81 83 00 00 */ lwz r12, 0(r3) /* 80293AB0 00290A10 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80293AB4 00290A14 7D 89 03 A6 */ mtctr r12 -/* 80293AB8 00290A18 4E 80 04 21 */ bctrl +/* 80293AB8 00290A18 4E 80 04 21 */ bctrl lbl_80293ABC: /* 80293ABC 00290A1C 38 61 00 9C */ addi r3, r1, 0x9c /* 80293AC0 00290A20 38 80 00 00 */ li r4, 0 diff --git a/asm/MetroidPrime/Enemies/CPuddleSpore.s b/asm/MetroidPrime/Enemies/CPuddleSpore.s index 27f41418..77933543 100644 --- a/asm/MetroidPrime/Enemies/CPuddleSpore.s +++ b/asm/MetroidPrime/Enemies/CPuddleSpore.s @@ -266,7 +266,7 @@ lbl_80146B30: /* 80146B38 00143A98 81 9C 00 00 */ lwz r12, 0(r28) /* 80146B3C 00143A9C 81 8C 00 08 */ lwz r12, 8(r12) /* 80146B40 00143AA0 7D 89 03 A6 */ mtctr r12 -/* 80146B44 00143AA4 4E 80 04 21 */ bctrl +/* 80146B44 00143AA4 4E 80 04 21 */ bctrl /* 80146B48 00143AA8 3B 9C 03 40 */ addi r28, r28, 0x340 lbl_80146B4C: /* 80146B4C 00143AAC 7C 1C E8 40 */ cmplw r28, r29 @@ -311,7 +311,7 @@ lbl_80146BC4: /* 80146BD8 00143B38 83 81 00 20 */ lwz r28, 0x20(r1) /* 80146BDC 00143B3C 7C 08 03 A6 */ mtlr r0 /* 80146BE0 00143B40 38 21 00 30 */ addi r1, r1, 0x30 -/* 80146BE4 00143B44 4E 80 00 20 */ blr +/* 80146BE4 00143B44 4E 80 00 20 */ blr .global Attack__12CPuddleSporeFR13CStateManager9EStateMsgf Attack__12CPuddleSporeFR13CStateManager9EStateMsgf: @@ -355,7 +355,7 @@ lbl_80146C68: /* 80146C68 00143BC8 80 01 00 24 */ lwz r0, 0x24(r1) /* 80146C6C 00143BCC 7C 08 03 A6 */ mtlr r0 /* 80146C70 00143BD0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80146C74 00143BD4 4E 80 00 20 */ blr +/* 80146C74 00143BD4 4E 80 00 20 */ blr .global GetUp__12CPuddleSporeFR13CStateManager9EStateMsgf GetUp__12CPuddleSporeFR13CStateManager9EStateMsgf: @@ -475,7 +475,7 @@ lbl_80146E14: /* 80146E20 00143D80 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80146E24 00143D84 7C 08 03 A6 */ mtlr r0 /* 80146E28 00143D88 38 21 00 30 */ addi r1, r1, 0x30 -/* 80146E2C 00143D8C 4E 80 00 20 */ blr +/* 80146E2C 00143D8C 4E 80 00 20 */ blr .global TurnAround__12CPuddleSporeFR13CStateManager9EStateMsgf TurnAround__12CPuddleSporeFR13CStateManager9EStateMsgf: @@ -585,7 +585,7 @@ lbl_80146FA8: /* 80146FAC 00143F0C 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 80146FB0 00143F10 7C 08 03 A6 */ mtlr r0 /* 80146FB4 00143F14 38 21 00 30 */ addi r1, r1, 0x30 -/* 80146FB8 00143F18 4E 80 00 20 */ blr +/* 80146FB8 00143F18 4E 80 00 20 */ blr .global Run__12CPuddleSporeFR13CStateManager9EStateMsgf Run__12CPuddleSporeFR13CStateManager9EStateMsgf: @@ -700,7 +700,7 @@ lbl_80147144: /* 80147148 001440A8 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8014714C 001440AC 7C 08 03 A6 */ mtlr r0 /* 80147150 001440B0 38 21 00 30 */ addi r1, r1, 0x30 -/* 80147154 001440B4 4E 80 00 20 */ blr +/* 80147154 001440B4 4E 80 00 20 */ blr .global Active__12CPuddleSporeFR13CStateManager9EStateMsgf Active__12CPuddleSporeFR13CStateManager9EStateMsgf: @@ -748,7 +748,7 @@ lbl_801471E8: /* 801471EC 0014414C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801471F0 00144150 7C 08 03 A6 */ mtlr r0 /* 801471F4 00144154 38 21 00 10 */ addi r1, r1, 0x10 -/* 801471F8 00144158 4E 80 00 20 */ blr +/* 801471F8 00144158 4E 80 00 20 */ blr .global InActive__12CPuddleSporeFR13CStateManager9EStateMsgf InActive__12CPuddleSporeFR13CStateManager9EStateMsgf: @@ -777,7 +777,7 @@ lbl_80147248: /* 8014724C 001441AC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80147250 001441B0 7C 08 03 A6 */ mtlr r0 /* 80147254 001441B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80147258 001441B8 4E 80 00 20 */ blr +/* 80147258 001441B8 4E 80 00 20 */ blr .global AnimOver__12CPuddleSporeFR13CStateManagerf AnimOver__12CPuddleSporeFR13CStateManagerf: @@ -785,7 +785,7 @@ AnimOver__12CPuddleSporeFR13CStateManagerf: /* 80147260 001441C0 20 00 00 02 */ subfic r0, r0, 2 /* 80147264 001441C4 7C 00 00 34 */ cntlzw r0, r0 /* 80147268 001441C8 54 03 D9 7E */ srwi r3, r0, 5 -/* 8014726C 001441CC 4E 80 00 20 */ blr +/* 8014726C 001441CC 4E 80 00 20 */ blr .global ShouldTurn__12CPuddleSporeFR13CStateManagerf ShouldTurn__12CPuddleSporeFR13CStateManagerf: @@ -848,7 +848,7 @@ lbl_80147340: /* 80147348 001442A8 83 C1 00 38 */ lwz r30, 0x38(r1) /* 8014734C 001442AC 7C 08 03 A6 */ mtlr r0 /* 80147350 001442B0 38 21 00 40 */ addi r1, r1, 0x40 -/* 80147354 001442B4 4E 80 00 20 */ blr +/* 80147354 001442B4 4E 80 00 20 */ blr .global ShouldAttack__12CPuddleSporeFR13CStateManagerf ShouldAttack__12CPuddleSporeFR13CStateManagerf: @@ -858,7 +858,7 @@ ShouldAttack__12CPuddleSporeFR13CStateManagerf: /* 80147364 001442C4 4C 41 13 82 */ cror 2, 1, 2 /* 80147368 001442C8 7C 00 00 26 */ mfcr r0 /* 8014736C 001442CC 54 03 1F FE */ rlwinm r3, r0, 3, 0x1f, 0x1f -/* 80147370 001442D0 4E 80 00 20 */ blr +/* 80147370 001442D0 4E 80 00 20 */ blr .global InAttackPosition__12CPuddleSporeFR13CStateManagerf InAttackPosition__12CPuddleSporeFR13CStateManagerf: @@ -868,7 +868,7 @@ InAttackPosition__12CPuddleSporeFR13CStateManagerf: /* 80147380 001442E0 4C 41 13 82 */ cror 2, 1, 2 /* 80147384 001442E4 7C 00 00 26 */ mfcr r0 /* 80147388 001442E8 54 03 1F FE */ rlwinm r3, r0, 3, 0x1f, 0x1f -/* 8014738C 001442EC 4E 80 00 20 */ blr +/* 8014738C 001442EC 4E 80 00 20 */ blr .global UpdateBoundingState__12CPuddleSporeFRC6CAABoxR13CStateManager UpdateBoundingState__12CPuddleSporeFRC6CAABoxR13CStateManager: @@ -1093,7 +1093,7 @@ lbl_801476B8: /* 801476D8 00144638 83 81 01 A0 */ lwz r28, 0x1a0(r1) /* 801476DC 0014463C 7C 08 03 A6 */ mtlr r0 /* 801476E0 00144640 38 21 01 D0 */ addi r1, r1, 0x1d0 -/* 801476E4 00144644 4E 80 00 20 */ blr +/* 801476E4 00144644 4E 80 00 20 */ blr .global CalculateBoundingBox__12CPuddleSporeCFv CalculateBoundingBox__12CPuddleSporeCFv: @@ -1188,12 +1188,12 @@ CalculateBoundingBox__12CPuddleSporeCFv: /* 80147848 001447A8 83 C1 00 28 */ lwz r30, 0x28(r1) /* 8014784C 001447AC 7C 08 03 A6 */ mtlr r0 /* 80147850 001447B0 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 80147854 001447B4 4E 80 00 20 */ blr +/* 80147854 001447B4 4E 80 00 20 */ blr .global GetCollisionPrimitive__12CPuddleSporeCFv GetCollisionPrimitive__12CPuddleSporeCFv: /* 80147858 001447B8 38 63 05 A0 */ addi r3, r3, 0x5a0 -/* 8014785C 001447BC 4E 80 00 20 */ blr +/* 8014785C 001447BC 4E 80 00 20 */ blr .global KnockPlayer__12CPuddleSporeFR13CStateManagerf KnockPlayer__12CPuddleSporeFR13CStateManagerf: @@ -1296,7 +1296,7 @@ lbl_801479BC: /* 801479D8 00144938 83 A1 00 64 */ lwz r29, 0x64(r1) /* 801479DC 0014493C 7C 08 03 A6 */ mtlr r0 /* 801479E0 00144940 38 21 00 90 */ addi r1, r1, 0x90 -/* 801479E4 00144944 4E 80 00 20 */ blr +/* 801479E4 00144944 4E 80 00 20 */ blr .global CollidedWith__12CPuddleSporeFRC9TUniqueIdRC18CCollisionInfoListR13CStateManager CollidedWith__12CPuddleSporeFRC9TUniqueIdRC18CCollisionInfoListR13CStateManager: @@ -1311,7 +1311,7 @@ lbl_80147A04: /* 80147A04 00144964 80 01 00 14 */ lwz r0, 0x14(r1) /* 80147A08 00144968 7C 08 03 A6 */ mtlr r0 /* 80147A0C 0014496C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80147A10 00144970 4E 80 00 20 */ blr +/* 80147A10 00144970 4E 80 00 20 */ blr .global DoUserAnimEvent__12CPuddleSporeFR13CStateManagerRC13CInt32POINode14EUserEventType DoUserAnimEvent__12CPuddleSporeFR13CStateManagerRC13CInt32POINode14EUserEventType: @@ -1335,7 +1335,7 @@ lbl_80147A4C: /* 80147A54 001449B4 81 83 00 00 */ lwz r12, 0(r3) /* 80147A58 001449B8 81 8C 02 C0 */ lwz r12, 0x2c0(r12) /* 80147A5C 001449BC 7D 89 03 A6 */ mtctr r12 -/* 80147A60 001449C0 4E 80 04 21 */ bctrl +/* 80147A60 001449C0 4E 80 04 21 */ bctrl /* 80147A64 001449C4 7C 78 1B 78 */ mr r24, r3 /* 80147A68 001449C8 80 03 00 08 */ lwz r0, 8(r3) /* 80147A6C 001449CC 28 00 00 00 */ cmplwi r0, 0 @@ -1410,7 +1410,7 @@ lbl_80147AB0: /* 80147B74 00144AD4 81 9B 00 00 */ lwz r12, 0(r27) /* 80147B78 00144AD8 81 8C 02 C0 */ lwz r12, 0x2c0(r12) /* 80147B7C 00144ADC 7D 89 03 A6 */ mtctr r12 -/* 80147B80 00144AE0 4E 80 04 21 */ bctrl +/* 80147B80 00144AE0 4E 80 04 21 */ bctrl /* 80147B84 00144AE4 C0 41 00 F4 */ lfs f2, 0xf4(r1) /* 80147B88 00144AE8 7C 78 1B 78 */ mr r24, r3 /* 80147B8C 00144AEC C0 21 01 04 */ lfs f1, 0x104(r1) @@ -1422,7 +1422,7 @@ lbl_80147AB0: /* 80147BA4 00144B04 81 9B 00 00 */ lwz r12, 0(r27) /* 80147BA8 00144B08 81 8C 02 C0 */ lwz r12, 0x2c0(r12) /* 80147BAC 00144B0C 7D 89 03 A6 */ mtctr r12 -/* 80147BB0 00144B10 4E 80 04 21 */ bctrl +/* 80147BB0 00144B10 4E 80 04 21 */ bctrl /* 80147BB4 00144B14 7C 77 1B 78 */ mr r23, r3 /* 80147BB8 00144B18 38 61 00 88 */ addi r3, r1, 0x88 /* 80147BBC 00144B1C 38 81 00 60 */ addi r4, r1, 0x60 @@ -1500,7 +1500,7 @@ lbl_80147CB8: /* 80147CC4 00144C24 80 01 01 54 */ lwz r0, 0x154(r1) /* 80147CC8 00144C28 7C 08 03 A6 */ mtlr r0 /* 80147CCC 00144C2C 38 21 01 50 */ addi r1, r1, 0x150 -/* 80147CD0 00144C30 4E 80 00 20 */ blr +/* 80147CD0 00144C30 4E 80 00 20 */ blr .global KnockBack__12CPuddleSporeFRC9CVector3fR13CStateManagerRC11CDamageInfo14EKnockBackTypef KnockBack__12CPuddleSporeFRC9CVector3fR13CStateManagerRC11CDamageInfo14EKnockBackTypef: @@ -1515,7 +1515,7 @@ lbl_80147CF0: /* 80147CF0 00144C50 80 01 00 14 */ lwz r0, 0x14(r1) /* 80147CF4 00144C54 7C 08 03 A6 */ mtlr r0 /* 80147CF8 00144C58 38 21 00 10 */ addi r1, r1, 0x10 -/* 80147CFC 00144C5C 4E 80 00 20 */ blr +/* 80147CFC 00144C5C 4E 80 00 20 */ blr .global Touch__12CPuddleSporeFR6CActorR13CStateManager Touch__12CPuddleSporeFR6CActorR13CStateManager: @@ -1559,7 +1559,7 @@ lbl_80147D88: /* 80147D90 00144CF0 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80147D94 00144CF4 7C 08 03 A6 */ mtlr r0 /* 80147D98 00144CF8 38 21 00 30 */ addi r1, r1, 0x30 -/* 80147D9C 00144CFC 4E 80 00 20 */ blr +/* 80147D9C 00144CFC 4E 80 00 20 */ blr .global GetCollisionResponseType__12CPuddleSporeCFRC9CVector3fRC9CVector3fRC11CWeaponModei GetCollisionResponseType__12CPuddleSporeCFRC9CVector3fRC9CVector3fRC11CWeaponModei: @@ -1578,7 +1578,7 @@ lbl_80147DC4: /* 80147DCC 00144D2C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80147DD0 00144D30 7C 08 03 A6 */ mtlr r0 /* 80147DD4 00144D34 38 21 00 10 */ addi r1, r1, 0x10 -/* 80147DD8 00144D38 4E 80 00 20 */ blr +/* 80147DD8 00144D38 4E 80 00 20 */ blr .global HitShell__12CPuddleSporeCFRC9CVector3f HitShell__12CPuddleSporeCFRC9CVector3f: @@ -1638,12 +1638,12 @@ lbl_80147EA0: /* 80147EA8 00144E08 83 C1 00 48 */ lwz r30, 0x48(r1) /* 80147EAC 00144E0C 7C 08 03 A6 */ mtlr r0 /* 80147EB0 00144E10 38 21 00 50 */ addi r1, r1, 0x50 -/* 80147EB4 00144E14 4E 80 00 20 */ blr +/* 80147EB4 00144E14 4E 80 00 20 */ blr .global ProjectileInfo__12CPuddleSporeFv ProjectileInfo__12CPuddleSporeFv: /* 80147EB8 00144E18 38 63 05 EC */ addi r3, r3, 0x5ec -/* 80147EBC 00144E1C 4E 80 00 20 */ blr +/* 80147EBC 00144E1C 4E 80 00 20 */ blr .global AcceptScriptMsg__12CPuddleSporeF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__12CPuddleSporeF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -1684,7 +1684,7 @@ lbl_80147F34: /* 80147F38 00144E98 80 01 00 34 */ lwz r0, 0x34(r1) /* 80147F3C 00144E9C 7C 08 03 A6 */ mtlr r0 /* 80147F40 00144EA0 38 21 00 30 */ addi r1, r1, 0x30 -/* 80147F44 00144EA4 4E 80 00 20 */ blr +/* 80147F44 00144EA4 4E 80 00 20 */ blr .global FluidFXThink__12CPuddleSporeFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager FluidFXThink__12CPuddleSporeFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager: @@ -1734,7 +1734,7 @@ FluidFXThink__12CPuddleSporeFQ26CActor11EFluidStateR12CScriptWaterR13CStateManag /* 80147FF4 00144F54 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80147FF8 00144F58 B0 01 00 08 */ sth r0, 8(r1) /* 80147FFC 00144F5C 7D 89 03 A6 */ mtctr r12 -/* 80148000 00144F60 4E 80 04 21 */ bctrl +/* 80148000 00144F60 4E 80 04 21 */ bctrl lbl_80148004: /* 80148004 00144F64 80 01 00 64 */ lwz r0, 0x64(r1) /* 80148008 00144F68 83 E1 00 5C */ lwz r31, 0x5c(r1) @@ -1742,7 +1742,7 @@ lbl_80148004: /* 80148010 00144F70 83 A1 00 54 */ lwz r29, 0x54(r1) /* 80148014 00144F74 7C 08 03 A6 */ mtlr r0 /* 80148018 00144F78 38 21 00 60 */ addi r1, r1, 0x60 -/* 8014801C 00144F7C 4E 80 00 20 */ blr +/* 8014801C 00144F7C 4E 80 00 20 */ blr .global Render__12CPuddleSporeCFRC13CStateManager Render__12CPuddleSporeCFRC13CStateManager: @@ -1764,7 +1764,7 @@ lbl_80148054: /* 80148058 00144FB8 81 9F 00 00 */ lwz r12, 0(r31) /* 8014805C 00144FBC 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80148060 00144FC0 7D 89 03 A6 */ mtctr r12 -/* 80148064 00144FC4 4E 80 04 21 */ bctrl +/* 80148064 00144FC4 4E 80 04 21 */ bctrl /* 80148068 00144FC8 3B FF 03 40 */ addi r31, r31, 0x340 lbl_8014806C: /* 8014806C 00144FCC 80 1E 05 E0 */ lwz r0, 0x5e0(r30) @@ -1779,7 +1779,7 @@ lbl_80148084: /* 8014808C 00144FEC 83 C1 00 08 */ lwz r30, 8(r1) /* 80148090 00144FF0 7C 08 03 A6 */ mtlr r0 /* 80148094 00144FF4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80148098 00144FF8 4E 80 00 20 */ blr +/* 80148098 00144FF8 4E 80 00 20 */ blr .global Think__12CPuddleSporeFfR13CStateManager Think__12CPuddleSporeFfR13CStateManager: @@ -1813,7 +1813,7 @@ lbl_801480F8: /* 80148100 00145060 81 9E 00 00 */ lwz r12, 0(r30) /* 80148104 00145064 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80148108 00145068 7D 89 03 A6 */ mtctr r12 -/* 8014810C 0014506C 4E 80 04 21 */ bctrl +/* 8014810C 0014506C 4E 80 04 21 */ bctrl /* 80148110 00145070 C0 02 9C CC */ lfs f0, lbl_805AB9EC@sda21(r2) /* 80148114 00145074 C0 22 9C 98 */ lfs f1, lbl_805AB9B8@sda21(r2) /* 80148118 00145078 D0 03 00 00 */ stfs f0, 0(r3) @@ -1867,7 +1867,7 @@ lbl_80148190: /* 801481D4 00145134 81 83 00 00 */ lwz r12, 0(r3) /* 801481D8 00145138 81 8C 00 30 */ lwz r12, 0x30(r12) /* 801481DC 0014513C 7D 89 03 A6 */ mtctr r12 -/* 801481E0 00145140 4E 80 04 21 */ bctrl +/* 801481E0 00145140 4E 80 04 21 */ bctrl /* 801481E4 00145144 C0 41 00 74 */ lfs f2, 0x74(r1) /* 801481E8 00145148 38 81 00 1C */ addi r4, r1, 0x1c /* 801481EC 0014514C C0 21 00 84 */ lfs f1, 0x84(r1) @@ -1880,14 +1880,14 @@ lbl_80148190: /* 80148208 00145168 81 83 00 00 */ lwz r12, 0(r3) /* 8014820C 0014516C 81 8C 00 20 */ lwz r12, 0x20(r12) /* 80148210 00145170 7D 89 03 A6 */ mtctr r12 -/* 80148214 00145174 4E 80 04 21 */ bctrl +/* 80148214 00145174 4E 80 04 21 */ bctrl /* 80148218 00145178 80 1E 05 E8 */ lwz r0, 0x5e8(r30) /* 8014821C 0014517C FC 20 F0 90 */ fmr f1, f30 /* 80148220 00145180 7C 60 E2 14 */ add r3, r0, r28 /* 80148224 00145184 81 83 00 00 */ lwz r12, 0(r3) /* 80148228 00145188 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8014822C 0014518C 7D 89 03 A6 */ mtctr r12 -/* 80148230 00145190 4E 80 04 21 */ bctrl +/* 80148230 00145190 4E 80 04 21 */ bctrl /* 80148234 00145194 3B BD 00 04 */ addi r29, r29, 4 /* 80148238 00145198 3B 9C 03 40 */ addi r28, r28, 0x340 /* 8014823C 0014519C 3B 7B 00 01 */ addi r27, r27, 1 @@ -1907,7 +1907,7 @@ lbl_80148240: /* 80148270 001451D0 80 01 00 D4 */ lwz r0, 0xd4(r1) /* 80148274 001451D4 7C 08 03 A6 */ mtlr r0 /* 80148278 001451D8 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 8014827C 001451DC 4E 80 00 20 */ blr +/* 8014827C 001451DC 4E 80 00 20 */ blr .global PreThink__12CPuddleSporeFfR13CStateManager PreThink__12CPuddleSporeFfR13CStateManager: @@ -1966,7 +1966,7 @@ lbl_80148314: /* 80148348 001452A8 83 C1 00 38 */ lwz r30, 0x38(r1) /* 8014834C 001452AC 7C 08 03 A6 */ mtlr r0 /* 80148350 001452B0 38 21 00 50 */ addi r1, r1, 0x50 -/* 80148354 001452B4 4E 80 00 20 */ blr +/* 80148354 001452B4 4E 80 00 20 */ blr .global Accept__12CPuddleSporeFR8IVisitor Accept__12CPuddleSporeFR8IVisitor: @@ -1979,11 +1979,11 @@ Accept__12CPuddleSporeFR8IVisitor: /* 80148370 001452D0 7C 04 03 78 */ mr r4, r0 /* 80148374 001452D4 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 80148378 001452D8 7D 89 03 A6 */ mtctr r12 -/* 8014837C 001452DC 4E 80 04 21 */ bctrl +/* 8014837C 001452DC 4E 80 04 21 */ bctrl /* 80148380 001452E0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80148384 001452E4 7C 08 03 A6 */ mtlr r0 /* 80148388 001452E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8014838C 001452EC 4E 80 00 20 */ blr +/* 8014838C 001452EC 4E 80 00 20 */ blr .global "__ct__12CPuddleSporeF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>Q210CPatterned11EFlavorTypeRC11CEntityInfoRC12CTransform4fRC10CModelDataRC14CPatternedInfoQ210CPatterned13EColliderTypeUifffffRC16CActorParametersUiRC11CDamageInfo" "__ct__12CPuddleSporeF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>Q210CPatterned11EFlavorTypeRC11CEntityInfoRC12CTransform4fRC10CModelDataRC14CPatternedInfoQ210CPatterned13EColliderTypeUifffffRC16CActorParametersUiRC11CDamageInfo": @@ -2094,7 +2094,7 @@ Accept__12CPuddleSporeFR8IVisitor: /* 80148530 00145490 81 84 00 00 */ lwz r12, 0(r4) /* 80148534 00145494 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80148538 00145498 7D 89 03 A6 */ mtctr r12 -/* 8014853C 0014549C 4E 80 04 21 */ bctrl +/* 8014853C 0014549C 4E 80 04 21 */ bctrl /* 80148540 001454A0 3B 5F 05 D0 */ addi r26, r31, 0x5d0 /* 80148544 001454A4 38 81 00 2C */ addi r4, r1, 0x2c /* 80148548 001454A8 7F 43 D3 78 */ mr r3, r26 @@ -2169,7 +2169,7 @@ lbl_80148604: /* 80148654 001455B4 80 01 04 04 */ lwz r0, 0x404(r1) /* 80148658 001455B8 7C 08 03 A6 */ mtlr r0 /* 8014865C 001455BC 38 21 04 00 */ addi r1, r1, 0x400 -/* 80148660 001455C0 4E 80 00 20 */ blr +/* 80148660 001455C0 4E 80 00 20 */ blr .global sub_80148664 sub_80148664: @@ -2205,7 +2205,7 @@ lbl_801486A4: /* 801486D0 00145630 80 01 00 14 */ lwz r0, 0x14(r1) /* 801486D4 00145634 7C 08 03 A6 */ mtlr r0 /* 801486D8 00145638 38 21 00 10 */ addi r1, r1, 0x10 -/* 801486DC 0014563C 4E 80 00 20 */ blr +/* 801486DC 0014563C 4E 80 00 20 */ blr .global sub_801486e0 sub_801486e0: @@ -2219,7 +2219,7 @@ lbl_801486F8: /* 801486F8 00145658 80 01 00 14 */ lwz r0, 0x14(r1) /* 801486FC 0014565C 7C 08 03 A6 */ mtlr r0 /* 80148700 00145660 38 21 00 10 */ addi r1, r1, 0x10 -/* 80148704 00145664 4E 80 00 20 */ blr +/* 80148704 00145664 4E 80 00 20 */ blr .global sub_80148708 sub_80148708: @@ -2661,7 +2661,7 @@ lbl_80148C30: /* 80148D70 00145CD0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80148D74 00145CD4 7C 08 03 A6 */ mtlr r0 /* 80148D78 00145CD8 38 21 00 20 */ addi r1, r1, 0x20 -/* 80148D7C 00145CDC 4E 80 00 20 */ blr +/* 80148D7C 00145CDC 4E 80 00 20 */ blr .global sub_80148d80 sub_80148d80: @@ -2712,7 +2712,7 @@ lbl_80148E14: /* 80148E20 00145D80 83 C1 00 08 */ lwz r30, 8(r1) /* 80148E24 00145D84 7C 08 03 A6 */ mtlr r0 /* 80148E28 00145D88 38 21 00 10 */ addi r1, r1, 0x10 -/* 80148E2C 00145D8C 4E 80 00 20 */ blr +/* 80148E2C 00145D8C 4E 80 00 20 */ blr .global sub_80148e30 sub_80148e30: @@ -2756,7 +2756,7 @@ lbl_80148EB4: /* 80148EBC 00145E1C 42 00 FF 80 */ bdnz lbl_80148E3C lbl_80148EC0: /* 80148EC0 00145E20 7C A3 2B 78 */ mr r3, r5 -/* 80148EC4 00145E24 4E 80 00 20 */ blr +/* 80148EC4 00145E24 4E 80 00 20 */ blr .global sub_80148ec8 sub_80148ec8: @@ -2776,7 +2776,7 @@ sub_80148ec8: /* 80148EFC 00145E5C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80148F00 00145E60 7C 08 03 A6 */ mtlr r0 /* 80148F04 00145E64 38 21 00 10 */ addi r1, r1, 0x10 -/* 80148F08 00145E68 4E 80 00 20 */ blr +/* 80148F08 00145E68 4E 80 00 20 */ blr .global sub_80148f0c sub_80148f0c: @@ -2817,7 +2817,7 @@ sub_80148f0c: /* 80148F94 00145EF4 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 80148F98 00145EF8 7C 08 03 A6 */ mtlr r0 /* 80148F9C 00145EFC 38 21 00 30 */ addi r1, r1, 0x30 -/* 80148FA0 00145F00 4E 80 00 20 */ blr +/* 80148FA0 00145F00 4E 80 00 20 */ blr .global sub_80148fa4 sub_80148fa4: @@ -2870,7 +2870,7 @@ lbl_80149038: /* 80149048 00145FA8 80 01 00 34 */ lwz r0, 0x34(r1) /* 8014904C 00145FAC 7C 08 03 A6 */ mtlr r0 /* 80149050 00145FB0 38 21 00 30 */ addi r1, r1, 0x30 -/* 80149054 00145FB4 4E 80 00 20 */ blr +/* 80149054 00145FB4 4E 80 00 20 */ blr .global sub_80149058 sub_80149058: @@ -2912,7 +2912,7 @@ lbl_801490C0: /* 801490D4 00146034 83 81 00 10 */ lwz r28, 0x10(r1) /* 801490D8 00146038 7C 08 03 A6 */ mtlr r0 /* 801490DC 0014603C 38 21 00 20 */ addi r1, r1, 0x20 -/* 801490E0 00146040 4E 80 00 20 */ blr +/* 801490E0 00146040 4E 80 00 20 */ blr .global sub_801490e4 sub_801490e4: @@ -2962,7 +2962,7 @@ lbl_8014917C: /* 80149184 001460E4 81 9B 00 00 */ lwz r12, 0(r27) /* 80149188 001460E8 81 8C 00 08 */ lwz r12, 8(r12) /* 8014918C 001460EC 7D 89 03 A6 */ mtctr r12 -/* 80149190 001460F0 4E 80 04 21 */ bctrl +/* 80149190 001460F0 4E 80 04 21 */ bctrl /* 80149194 001460F4 3B 7B 03 40 */ addi r27, r27, 0x340 lbl_80149198: /* 80149198 001460F8 7C 1B E0 40 */ cmplw r27, r28 @@ -2979,7 +2979,7 @@ lbl_801491B8: /* 801491BC 0014611C 80 01 00 34 */ lwz r0, 0x34(r1) /* 801491C0 00146120 7C 08 03 A6 */ mtlr r0 /* 801491C4 00146124 38 21 00 30 */ addi r1, r1, 0x30 -/* 801491C8 00146128 4E 80 00 20 */ blr +/* 801491C8 00146128 4E 80 00 20 */ blr .global sub_801491cc sub_801491cc: @@ -3010,7 +3010,7 @@ lbl_80149208: /* 80149224 00146184 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80149228 00146188 7C 08 03 A6 */ mtlr r0 /* 8014922C 0014618C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80149230 00146190 4E 80 00 20 */ blr +/* 80149230 00146190 4E 80 00 20 */ blr .global sub_80149234 sub_80149234: @@ -3046,4 +3046,4 @@ lbl_80149288: /* 801492A0 00146200 80 01 00 14 */ lwz r0, 0x14(r1) /* 801492A4 00146204 7C 08 03 A6 */ mtlr r0 /* 801492A8 00146208 38 21 00 10 */ addi r1, r1, 0x10 -/* 801492AC 0014620C 4E 80 00 20 */ blr +/* 801492AC 0014620C 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/Enemies/CPuddleToadGamma.s b/asm/MetroidPrime/Enemies/CPuddleToadGamma.s index 258ce953..169156f0 100644 --- a/asm/MetroidPrime/Enemies/CPuddleToadGamma.s +++ b/asm/MetroidPrime/Enemies/CPuddleToadGamma.s @@ -267,7 +267,7 @@ lbl_8014B428: /* 8014B464 001483C4 38 80 00 01 */ li r4, 1 /* 8014B468 001483C8 81 8C 00 20 */ lwz r12, 0x20(r12) /* 8014B46C 001483CC 7D 89 03 A6 */ mtctr r12 -/* 8014B470 001483D0 4E 80 04 21 */ bctrl +/* 8014B470 001483D0 4E 80 04 21 */ bctrl lbl_8014B474: /* 8014B474 001483D4 7F C3 F3 78 */ mr r3, r30 /* 8014B478 001483D8 38 80 00 00 */ li r4, 0 @@ -283,7 +283,7 @@ lbl_8014B490: /* 8014B49C 001483FC 83 C1 00 08 */ lwz r30, 8(r1) /* 8014B4A0 00148400 7C 08 03 A6 */ mtlr r0 /* 8014B4A4 00148404 38 21 00 10 */ addi r1, r1, 0x10 -/* 8014B4A8 00148408 4E 80 00 20 */ blr +/* 8014B4A8 00148408 4E 80 00 20 */ blr .global GetPrimitiveTransform__16CPuddleToadGammaCFv GetPrimitiveTransform__16CPuddleToadGammaCFv: @@ -320,7 +320,7 @@ GetPrimitiveTransform__16CPuddleToadGammaCFv: /* 8014B524 00148484 83 C1 00 48 */ lwz r30, 0x48(r1) /* 8014B528 00148488 7C 08 03 A6 */ mtlr r0 /* 8014B52C 0014848C 38 21 00 50 */ addi r1, r1, 0x50 -/* 8014B530 00148490 4E 80 00 20 */ blr +/* 8014B530 00148490 4E 80 00 20 */ blr .global GetCollisionPrimitive__16CPuddleToadGammaCFv GetCollisionPrimitive__16CPuddleToadGammaCFv: @@ -338,7 +338,7 @@ lbl_8014B558: /* 8014B558 001484B8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8014B55C 001484BC 7C 08 03 A6 */ mtlr r0 /* 8014B560 001484C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8014B564 001484C4 4E 80 00 20 */ blr +/* 8014B564 001484C4 4E 80 00 20 */ blr .global GetTouchBounds__16CPuddleToadGammaCFv GetTouchBounds__16CPuddleToadGammaCFv: @@ -360,7 +360,7 @@ GetTouchBounds__16CPuddleToadGammaCFv: /* 8014B5A4 00148504 38 A5 00 34 */ addi r5, r5, 0x34 /* 8014B5A8 00148508 81 8C 00 14 */ lwz r12, 0x14(r12) /* 8014B5AC 0014850C 7D 89 03 A6 */ mtctr r12 -/* 8014B5B0 00148510 4E 80 04 21 */ bctrl +/* 8014B5B0 00148510 4E 80 04 21 */ bctrl /* 8014B5B4 00148514 38 00 00 01 */ li r0, 1 /* 8014B5B8 00148518 28 1F 00 00 */ cmplwi r31, 0 /* 8014B5BC 0014851C 98 1F 00 18 */ stb r0, 0x18(r31) @@ -406,7 +406,7 @@ lbl_8014B64C: /* 8014B650 001485B0 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 8014B654 001485B4 7C 08 03 A6 */ mtlr r0 /* 8014B658 001485B8 38 21 00 40 */ addi r1, r1, 0x40 -/* 8014B65C 001485BC 4E 80 00 20 */ blr +/* 8014B65C 001485BC 4E 80 00 20 */ blr .global Attack__16CPuddleToadGammaFR13CStateManager9EStateMsgf Attack__16CPuddleToadGammaFR13CStateManager9EStateMsgf: @@ -532,7 +532,7 @@ lbl_8014B828: /* 8014B82C 0014878C C0 22 9C F0 */ lfs f1, lbl_805ABA10@sda21(r2) /* 8014B830 00148790 81 8C 02 74 */ lwz r12, 0x274(r12) /* 8014B834 00148794 7D 89 03 A6 */ mtctr r12 -/* 8014B838 00148798 4E 80 04 21 */ bctrl +/* 8014B838 00148798 4E 80 04 21 */ bctrl /* 8014B83C 0014879C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8014B840 001487A0 41 82 00 4C */ beq lbl_8014B88C /* 8014B844 001487A4 7F A3 EB 78 */ mr r3, r29 @@ -561,7 +561,7 @@ lbl_8014B88C: /* 8014B898 001487F8 83 A1 00 A4 */ lwz r29, 0xa4(r1) /* 8014B89C 001487FC 7C 08 03 A6 */ mtlr r0 /* 8014B8A0 00148800 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 8014B8A4 00148804 4E 80 00 20 */ blr +/* 8014B8A4 00148804 4E 80 00 20 */ blr .global Crouch__16CPuddleToadGammaFR13CStateManager9EStateMsgf Crouch__16CPuddleToadGammaFR13CStateManager9EStateMsgf: @@ -706,7 +706,7 @@ lbl_8014BAA4: /* 8014BAAC 00148A0C 83 C1 00 98 */ lwz r30, 0x98(r1) /* 8014BAB0 00148A10 7C 08 03 A6 */ mtlr r0 /* 8014BAB4 00148A14 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8014BAB8 00148A18 4E 80 00 20 */ blr +/* 8014BAB8 00148A18 4E 80 00 20 */ blr .global LostInterest__16CPuddleToadGammaFR13CStateManagerf LostInterest__16CPuddleToadGammaFR13CStateManagerf: @@ -720,7 +720,7 @@ LostInterest__16CPuddleToadGammaFR13CStateManagerf: /* 8014BAD8 00148A38 81 84 00 00 */ lwz r12, 0(r4) /* 8014BADC 00148A3C 81 8C 00 40 */ lwz r12, 0x40(r12) /* 8014BAE0 00148A40 7D 89 03 A6 */ mtctr r12 -/* 8014BAE4 00148A44 4E 80 04 21 */ bctrl +/* 8014BAE4 00148A44 4E 80 04 21 */ bctrl /* 8014BAE8 00148A48 80 9F 08 4C */ lwz r4, 0x84c(r31) /* 8014BAEC 00148A4C 38 61 00 08 */ addi r3, r1, 8 /* 8014BAF0 00148A50 4B FC EE 3D */ bl GetBoundingBox__13CPhysicsActorCFv @@ -736,7 +736,7 @@ LostInterest__16CPuddleToadGammaFR13CStateManagerf: /* 8014BB18 00148A78 83 E1 00 4C */ lwz r31, 0x4c(r1) /* 8014BB1C 00148A7C 7C 08 03 A6 */ mtlr r0 /* 8014BB20 00148A80 38 21 00 50 */ addi r1, r1, 0x50 -/* 8014BB24 00148A84 4E 80 00 20 */ blr +/* 8014BB24 00148A84 4E 80 00 20 */ blr .global Suck__16CPuddleToadGammaFR13CStateManager9EStateMsgf Suck__16CPuddleToadGammaFR13CStateManager9EStateMsgf: @@ -830,7 +830,7 @@ lbl_8014BC60: /* 8014BC64 00148BC4 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8014BC68 00148BC8 7C 08 03 A6 */ mtlr r0 /* 8014BC6C 00148BCC 38 21 00 30 */ addi r1, r1, 0x30 -/* 8014BC70 00148BD0 4E 80 00 20 */ blr +/* 8014BC70 00148BD0 4E 80 00 20 */ blr .global Active__16CPuddleToadGammaFR13CStateManager9EStateMsgf Active__16CPuddleToadGammaFR13CStateManager9EStateMsgf: @@ -909,7 +909,7 @@ lbl_8014BD7C: /* 8014BD84 00148CE4 83 C1 00 88 */ lwz r30, 0x88(r1) /* 8014BD88 00148CE8 7C 08 03 A6 */ mtlr r0 /* 8014BD8C 00148CEC 38 21 00 90 */ addi r1, r1, 0x90 -/* 8014BD90 00148CF0 4E 80 00 20 */ blr +/* 8014BD90 00148CF0 4E 80 00 20 */ blr .global InActive__16CPuddleToadGammaFR13CStateManager9EStateMsgf InActive__16CPuddleToadGammaFR13CStateManager9EStateMsgf: @@ -943,7 +943,7 @@ lbl_8014BDF0: /* 8014BDF8 00148D58 83 C1 00 08 */ lwz r30, 8(r1) /* 8014BDFC 00148D5C 7C 08 03 A6 */ mtlr r0 /* 8014BE00 00148D60 38 21 00 10 */ addi r1, r1, 0x10 -/* 8014BE04 00148D64 4E 80 00 20 */ blr +/* 8014BE04 00148D64 4E 80 00 20 */ blr .global SpotPlayer__16CPuddleToadGammaFR13CStateManagerf SpotPlayer__16CPuddleToadGammaFR13CStateManagerf: @@ -953,7 +953,7 @@ SpotPlayer__16CPuddleToadGammaFR13CStateManagerf: /* 8014BE14 00148D74 4C 41 13 82 */ cror 2, 1, 2 /* 8014BE18 00148D78 7C 00 00 26 */ mfcr r0 /* 8014BE1C 00148D7C 54 03 1F FE */ rlwinm r3, r0, 3, 0x1f, 0x1f -/* 8014BE20 00148D80 4E 80 00 20 */ blr +/* 8014BE20 00148D80 4E 80 00 20 */ blr .global ShouldAttack__16CPuddleToadGammaFR13CStateManagerf ShouldAttack__16CPuddleToadGammaFR13CStateManagerf: @@ -963,7 +963,7 @@ ShouldAttack__16CPuddleToadGammaFR13CStateManagerf: /* 8014BE30 00148D90 4C 41 13 82 */ cror 2, 1, 2 /* 8014BE34 00148D94 7C 00 00 26 */ mfcr r0 /* 8014BE38 00148D98 54 03 1F FE */ rlwinm r3, r0, 3, 0x1f, 0x1f -/* 8014BE3C 00148D9C 4E 80 00 20 */ blr +/* 8014BE3C 00148D9C 4E 80 00 20 */ blr .global Inside__16CPuddleToadGammaFR13CStateManagerf Inside__16CPuddleToadGammaFR13CStateManagerf: @@ -1006,7 +1006,7 @@ lbl_8014BECC: /* 8014BECC 00148E2C 38 60 00 00 */ li r3, 0 lbl_8014BED0: /* 8014BED0 00148E30 38 21 00 20 */ addi r1, r1, 0x20 -/* 8014BED4 00148E34 4E 80 00 20 */ blr +/* 8014BED4 00148E34 4E 80 00 20 */ blr .global InAttackPosition__16CPuddleToadGammaFR13CStateManagerf InAttackPosition__16CPuddleToadGammaFR13CStateManagerf: @@ -1025,7 +1025,7 @@ lbl_8014BF00: /* 8014BF00 00148E60 80 01 00 14 */ lwz r0, 0x14(r1) /* 8014BF04 00148E64 7C 08 03 A6 */ mtlr r0 /* 8014BF08 00148E68 38 21 00 10 */ addi r1, r1, 0x10 -/* 8014BF0C 00148E6C 4E 80 00 20 */ blr +/* 8014BF0C 00148E6C 4E 80 00 20 */ blr .global sub_8014bf10 sub_8014bf10: @@ -1138,7 +1138,7 @@ lbl_8014C094: /* 8014C0A0 00149000 80 01 01 14 */ lwz r0, 0x114(r1) /* 8014C0A4 00149004 7C 08 03 A6 */ mtlr r0 /* 8014C0A8 00149008 38 21 01 10 */ addi r1, r1, 0x110 -/* 8014C0AC 0014900C 4E 80 00 20 */ blr +/* 8014C0AC 0014900C 4E 80 00 20 */ blr .global AcceptScriptMsg__16CPuddleToadGammaF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__16CPuddleToadGammaF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -1220,7 +1220,7 @@ lbl_8014C1C8: /* 8014C1D4 00149134 83 A1 00 94 */ lwz r29, 0x94(r1) /* 8014C1D8 00149138 7C 08 03 A6 */ mtlr r0 /* 8014C1DC 0014913C 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8014C1E0 00149140 4E 80 00 20 */ blr +/* 8014C1E0 00149140 4E 80 00 20 */ blr .global Accept__16CPuddleToadGammaFR8IVisitor Accept__16CPuddleToadGammaFR8IVisitor: @@ -1233,11 +1233,11 @@ Accept__16CPuddleToadGammaFR8IVisitor: /* 8014C1FC 0014915C 7C 04 03 78 */ mr r4, r0 /* 8014C200 00149160 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 8014C204 00149164 7D 89 03 A6 */ mtctr r12 -/* 8014C208 00149168 4E 80 04 21 */ bctrl +/* 8014C208 00149168 4E 80 04 21 */ bctrl /* 8014C20C 0014916C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8014C210 00149170 7C 08 03 A6 */ mtlr r0 /* 8014C214 00149174 38 21 00 10 */ addi r1, r1, 0x10 -/* 8014C218 00149178 4E 80 00 20 */ blr +/* 8014C218 00149178 4E 80 00 20 */ blr .global CenterPlayer__16CPuddleToadGammaFR13CStateManagerRC9CVector3f CenterPlayer__16CPuddleToadGammaFR13CStateManagerRC9CVector3f: @@ -1286,7 +1286,7 @@ CenterPlayer__16CPuddleToadGammaFR13CStateManagerRC9CVector3f: /* 8014C2C4 00149224 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 8014C2C8 00149228 7C 08 03 A6 */ mtlr r0 /* 8014C2CC 0014922C 38 21 00 50 */ addi r1, r1, 0x50 -/* 8014C2D0 00149230 4E 80 00 20 */ blr +/* 8014C2D0 00149230 4E 80 00 20 */ blr .global DoUserAnimEvent__16CPuddleToadGammaFR13CStateManagerRC13CInt32POINode14EUserEventType DoUserAnimEvent__16CPuddleToadGammaFR13CStateManagerRC13CInt32POINode14EUserEventType: @@ -1330,7 +1330,7 @@ lbl_8014C344: /* 8014C35C 001492BC 83 81 00 10 */ lwz r28, 0x10(r1) /* 8014C360 001492C0 7C 08 03 A6 */ mtlr r0 /* 8014C364 001492C4 38 21 00 30 */ addi r1, r1, 0x30 -/* 8014C368 001492C8 4E 80 00 20 */ blr +/* 8014C368 001492C8 4E 80 00 20 */ blr .global SetSolid__16CPuddleToadGammaFR13CStateManagerb SetSolid__16CPuddleToadGammaFR13CStateManagerb: @@ -1365,7 +1365,7 @@ lbl_8014C3CC: /* 8014C3D4 00149334 83 C1 00 08 */ lwz r30, 8(r1) /* 8014C3D8 00149338 7C 08 03 A6 */ mtlr r0 /* 8014C3DC 0014933C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8014C3E0 00149340 4E 80 00 20 */ blr +/* 8014C3E0 00149340 4E 80 00 20 */ blr .global ShootPlayer__16CPuddleToadGammaFR13CStateManagerf ShootPlayer__16CPuddleToadGammaFR13CStateManagerf: @@ -1568,7 +1568,7 @@ lbl_8014C6A4: /* 8014C6D4 00149634 83 81 08 B0 */ lwz r28, 0x8b0(r1) /* 8014C6D8 00149638 7C 08 03 A6 */ mtlr r0 /* 8014C6DC 0014963C 38 21 09 00 */ addi r1, r1, 0x900 -/* 8014C6E0 00149640 4E 80 00 20 */ blr +/* 8014C6E0 00149640 4E 80 00 20 */ blr .global GetDamageVulnerability__16CPuddleToadGammaCFRC9CVector3fRC9CVector3fRC11CDamageInfo GetDamageVulnerability__16CPuddleToadGammaCFRC9CVector3fRC9CVector3fRC11CDamageInfo: @@ -1607,13 +1607,13 @@ lbl_8014C75C: /* 8014C75C 001496BC 80 01 00 24 */ lwz r0, 0x24(r1) /* 8014C760 001496C0 7C 08 03 A6 */ mtlr r0 /* 8014C764 001496C4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8014C768 001496C8 4E 80 00 20 */ blr +/* 8014C768 001496C8 4E 80 00 20 */ blr .global GetDamageVulnerability__16CPuddleToadGammaCFv GetDamageVulnerability__16CPuddleToadGammaCFv: /* 8014C76C 001496CC 3C 60 80 57 */ lis r3, lbl_8056D718@ha /* 8014C770 001496D0 38 63 D7 18 */ addi r3, r3, lbl_8056D718@l -/* 8014C774 001496D4 4E 80 00 20 */ blr +/* 8014C774 001496D4 4E 80 00 20 */ blr .global sub_8014c778 sub_8014c778: @@ -1693,7 +1693,7 @@ lbl_8014C880: /* 8014C894 001497F4 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8014C898 001497F8 7C 08 03 A6 */ mtlr r0 /* 8014C89C 001497FC 38 21 00 40 */ addi r1, r1, 0x40 -/* 8014C8A0 00149800 4E 80 00 20 */ blr +/* 8014C8A0 00149800 4E 80 00 20 */ blr .global sub_8014c8a4 sub_8014c8a4: @@ -1905,7 +1905,7 @@ lbl_8014CB94: /* 8014CBC8 00149B28 80 01 01 A4 */ lwz r0, 0x1a4(r1) /* 8014CBCC 00149B2C 7C 08 03 A6 */ mtlr r0 /* 8014CBD0 00149B30 38 21 01 A0 */ addi r1, r1, 0x1a0 -/* 8014CBD4 00149B34 4E 80 00 20 */ blr +/* 8014CBD4 00149B34 4E 80 00 20 */ blr .global Think__16CPuddleToadGammaFfR13CStateManager Think__16CPuddleToadGammaFfR13CStateManager: @@ -1931,7 +1931,7 @@ lbl_8014CC14: /* 8014CC20 00149B80 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8014CC24 00149B84 7C 08 03 A6 */ mtlr r0 /* 8014CC28 00149B88 38 21 00 20 */ addi r1, r1, 0x20 -/* 8014CC2C 00149B8C 4E 80 00 20 */ blr +/* 8014CC2C 00149B8C 4E 80 00 20 */ blr .global "__ct__16CPuddleToadGammaF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>Q210CPatterned11EFlavorTypeRC11CEntityInfoRC12CTransform4fRC10CModelDataRC14CPatternedInfoRC16CActorParametersfff9CVector3ffffRC11CDamageInfoRC11CDamageInfo" "__ct__16CPuddleToadGammaF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>Q210CPatterned11EFlavorTypeRC11CEntityInfoRC12CTransform4fRC10CModelDataRC14CPatternedInfoRC16CActorParametersfff9CVector3ffffRC11CDamageInfoRC11CDamageInfo": @@ -2105,7 +2105,7 @@ lbl_8014CC14: /* 8014CECC 00149E2C 81 84 00 00 */ lwz r12, 0(r4) /* 8014CED0 00149E30 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8014CED4 00149E34 7D 89 03 A6 */ mtctr r12 -/* 8014CED8 00149E38 4E 80 04 21 */ bctrl +/* 8014CED8 00149E38 4E 80 04 21 */ bctrl /* 8014CEDC 00149E3C 3B 21 00 34 */ addi r25, r1, 0x34 /* 8014CEE0 00149E40 38 81 00 24 */ addi r4, r1, 0x24 /* 8014CEE4 00149E44 7F 23 CB 78 */ mr r3, r25 @@ -2148,7 +2148,7 @@ lbl_8014CF64: /* 8014CF74 00149ED4 38 80 00 01 */ li r4, 1 /* 8014CF78 00149ED8 81 8C 00 20 */ lwz r12, 0x20(r12) /* 8014CF7C 00149EDC 7D 89 03 A6 */ mtctr r12 -/* 8014CF80 00149EE0 4E 80 04 21 */ bctrl +/* 8014CF80 00149EE0 4E 80 04 21 */ bctrl lbl_8014CF84: /* 8014CF84 00149EE4 93 DD 05 E4 */ stw r30, 0x5e4(r29) /* 8014CF88 00149EE8 38 61 00 40 */ addi r3, r1, 0x40 @@ -2172,7 +2172,7 @@ lbl_8014CF94: /* 8014CFCC 00149F2C 80 01 00 D4 */ lwz r0, 0xd4(r1) /* 8014CFD0 00149F30 7C 08 03 A6 */ mtlr r0 /* 8014CFD4 00149F34 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 8014CFD8 00149F38 4E 80 00 20 */ blr +/* 8014CFD8 00149F38 4E 80 00 20 */ blr .global __sinit_CPuddleToadGamma_cpp __sinit_CPuddleToadGamma_cpp: diff --git a/asm/MetroidPrime/Enemies/CPuffer.s b/asm/MetroidPrime/Enemies/CPuffer.s index 64f4b8a0..eec681eb 100644 --- a/asm/MetroidPrime/Enemies/CPuffer.s +++ b/asm/MetroidPrime/Enemies/CPuffer.s @@ -312,7 +312,7 @@ lbl_8025C3B8: /* 8025C3C8 00259328 83 C1 00 58 */ lwz r30, 0x58(r1) /* 8025C3CC 0025932C 7C 08 03 A6 */ mtlr r0 /* 8025C3D0 00259330 38 21 00 70 */ addi r1, r1, 0x70 -/* 8025C3D4 00259334 4E 80 00 20 */ blr +/* 8025C3D4 00259334 4E 80 00 20 */ blr .global Death__7CPufferFRC9CVector3fR13CStateManager Death__7CPufferFRC9CVector3fR13CStateManager: @@ -446,7 +446,7 @@ lbl_8025C5C4: /* 8025C5D0 00259530 80 01 01 64 */ lwz r0, 0x164(r1) /* 8025C5D4 00259534 7C 08 03 A6 */ mtlr r0 /* 8025C5D8 00259538 38 21 01 60 */ addi r1, r1, 0x160 -/* 8025C5DC 0025953C 4E 80 00 20 */ blr +/* 8025C5DC 0025953C 4E 80 00 20 */ blr .global GetTouchBounds__7CPufferCFv GetTouchBounds__7CPufferCFv: @@ -561,7 +561,7 @@ lbl_8025C778: /* 8025C77C 002596DC 83 E1 00 7C */ lwz r31, 0x7c(r1) /* 8025C780 002596E0 7C 08 03 A6 */ mtlr r0 /* 8025C784 002596E4 38 21 00 80 */ addi r1, r1, 0x80 -/* 8025C788 002596E8 4E 80 00 20 */ blr +/* 8025C788 002596E8 4E 80 00 20 */ blr .global Touch__7CPufferR6CActorR13CStateManager Touch__7CPufferR6CActorR13CStateManager: @@ -594,7 +594,7 @@ lbl_8025C7E4: /* 8025C7F0 00259750 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8025C7F4 00259754 7C 08 03 A6 */ mtlr r0 /* 8025C7F8 00259758 38 21 00 20 */ addi r1, r1, 0x20 -/* 8025C7FC 0025975C 4E 80 00 20 */ blr +/* 8025C7FC 0025975C 4E 80 00 20 */ blr .global AcceptScriptMsg__7CPufferF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__7CPufferF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -656,7 +656,7 @@ lbl_8025C8C4: /* 8025C8D0 00259830 83 A1 00 34 */ lwz r29, 0x34(r1) /* 8025C8D4 00259834 7C 08 03 A6 */ mtlr r0 /* 8025C8D8 00259838 38 21 00 40 */ addi r1, r1, 0x40 -/* 8025C8DC 0025983C 4E 80 00 20 */ blr +/* 8025C8DC 0025983C 4E 80 00 20 */ blr .global Accept__7CPufferFR8IVisitor Accept__7CPufferFR8IVisitor: @@ -669,11 +669,11 @@ Accept__7CPufferFR8IVisitor: /* 8025C8F8 00259858 7C 04 03 78 */ mr r4, r0 /* 8025C8FC 0025985C 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 8025C900 00259860 7D 89 03 A6 */ mtctr r12 -/* 8025C904 00259864 4E 80 04 21 */ bctrl +/* 8025C904 00259864 4E 80 04 21 */ bctrl /* 8025C908 00259868 80 01 00 14 */ lwz r0, 0x14(r1) /* 8025C90C 0025986C 7C 08 03 A6 */ mtlr r0 /* 8025C910 00259870 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025C914 00259874 4E 80 00 20 */ blr +/* 8025C914 00259874 4E 80 00 20 */ blr .global __dt__7CPufferFv __dt__7CPufferFv: @@ -736,7 +736,7 @@ lbl_8025C9D0: /* 8025C9DC 0025993C 83 C1 00 08 */ lwz r30, 8(r1) /* 8025C9E0 00259940 7C 08 03 A6 */ mtlr r0 /* 8025C9E4 00259944 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025C9E8 00259948 4E 80 00 20 */ blr +/* 8025C9E8 00259948 4E 80 00 20 */ blr .global __ct__7CPuffer __ct__7CPuffer: @@ -800,7 +800,7 @@ __ct__7CPuffer: /* 8025CAD0 00259A30 81 84 00 00 */ lwz r12, 0(r4) /* 8025CAD4 00259A34 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8025CAD8 00259A38 7D 89 03 A6 */ mtctr r12 -/* 8025CADC 00259A3C 4E 80 04 21 */ bctrl +/* 8025CADC 00259A3C 4E 80 04 21 */ bctrl /* 8025CAE0 00259A40 38 77 05 74 */ addi r3, r23, 0x574 /* 8025CAE4 00259A44 38 81 00 24 */ addi r4, r1, 0x24 /* 8025CAE8 00259A48 48 0E 43 C1 */ bl __ct__6CTokenFRC6CToken diff --git a/asm/MetroidPrime/Enemies/CRidley.s b/asm/MetroidPrime/Enemies/CRidley.s index 5dae4409..440cc0da 100644 --- a/asm/MetroidPrime/Enemies/CRidley.s +++ b/asm/MetroidPrime/Enemies/CRidley.s @@ -609,7 +609,7 @@ lbl_8046D7E0: .global lbl_8046D9C0 lbl_8046D9C0: .skip 0x2D0 - + .section .text, "ax" .global __dt__7CRidleyFv @@ -671,7 +671,7 @@ lbl_80252634: /* 80252658 0024F5B8 38 80 00 01 */ li r4, 1 /* 8025265C 0024F5BC 81 8C 00 08 */ lwz r12, 8(r12) /* 80252660 0024F5C0 7D 89 03 A6 */ mtctr r12 -/* 80252664 0024F5C4 4E 80 04 21 */ bctrl +/* 80252664 0024F5C4 4E 80 04 21 */ bctrl lbl_80252668: /* 80252668 0024F5C8 34 1E 0C D0 */ addic. r0, r30, 0xcd0 /* 8025266C 0024F5CC 41 82 00 18 */ beq lbl_80252684 @@ -764,7 +764,7 @@ lbl_80252798: /* 802527A4 0024F704 83 C1 00 08 */ lwz r30, 8(r1) /* 802527A8 0024F708 7C 08 03 A6 */ mtlr r0 /* 802527AC 0024F70C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802527B0 0024F710 4E 80 00 20 */ blr +/* 802527B0 0024F710 4E 80 00 20 */ blr .global sub_802527b4 sub_802527b4: @@ -844,17 +844,17 @@ lbl_802528A8: /* 802528B0 0024F810 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802528B4 0024F814 7C 08 03 A6 */ mtlr r0 /* 802528B8 0024F818 38 21 00 10 */ addi r1, r1, 0x10 -/* 802528BC 0024F81C 4E 80 00 20 */ blr +/* 802528BC 0024F81C 4E 80 00 20 */ blr .global GetGravityConstant__7CRidleyCFv GetGravityConstant__7CRidleyCFv: /* 802528C0 0024F820 C0 22 B9 0C */ lfs f1, lbl_805AD62C@sda21(r2) -/* 802528C4 0024F824 4E 80 00 20 */ blr +/* 802528C4 0024F824 4E 80 00 20 */ blr .global GetCollisionResponseType__7CRidleyCFRC9CVector3fRC9CVector3fRC11CWeaponModei GetCollisionResponseType__7CRidleyCFRC9CVector3fRC9CVector3fRC11CWeaponModei: /* 802528C8 0024F828 38 60 00 10 */ li r3, 0x10 -/* 802528CC 0024F82C 4E 80 00 20 */ blr +/* 802528CC 0024F82C 4E 80 00 20 */ blr .global SetAIStage__7CRidleyFR13CStateManagerf SetAIStage__7CRidleyFR13CStateManagerf: @@ -865,7 +865,7 @@ SetAIStage__7CRidleyFR13CStateManagerf: /* 802528E0 0024F840 90 03 0C 64 */ stw r0, 0xc64(r3) /* 802528E4 0024F844 38 60 00 01 */ li r3, 1 /* 802528E8 0024F848 38 21 00 10 */ addi r1, r1, 0x10 -/* 802528EC 0024F84C 4E 80 00 20 */ blr +/* 802528EC 0024F84C 4E 80 00 20 */ blr .global HitSomething__7CRidleyFR13CStateManagerf HitSomething__7CRidleyFR13CStateManagerf: @@ -880,24 +880,24 @@ lbl_8025290C: /* 8025290C 0024F86C 38 80 00 01 */ li r4, 1 lbl_80252910: /* 80252910 0024F870 7C 83 23 78 */ mr r3, r4 -/* 80252914 0024F874 4E 80 00 20 */ blr +/* 80252914 0024F874 4E 80 00 20 */ blr .global Attacked__7CRidleyFR13CStateManagerf Attacked__7CRidleyFR13CStateManagerf: /* 80252918 0024F878 88 83 0A 31 */ lbz r4, 0xa31(r3) /* 8025291C 0024F87C 38 60 00 00 */ li r3, 0 /* 80252920 0024F880 54 80 CF FF */ rlwinm. r0, r4, 0x19, 0x1f, 0x1f -/* 80252924 0024F884 4D 82 00 20 */ beqlr +/* 80252924 0024F884 4D 82 00 20 */ beqlr /* 80252928 0024F888 54 80 DF FF */ rlwinm. r0, r4, 0x1b, 0x1f, 0x1f -/* 8025292C 0024F88C 4D 82 00 20 */ beqlr +/* 8025292C 0024F88C 4D 82 00 20 */ beqlr /* 80252930 0024F890 38 60 00 01 */ li r3, 1 -/* 80252934 0024F894 4E 80 00 20 */ blr +/* 80252934 0024F894 4E 80 00 20 */ blr .global ShotAt__7CRidleyFR13CStateManagerf ShotAt__7CRidleyFR13CStateManagerf: /* 80252938 0024F898 88 03 0A 32 */ lbz r0, 0xa32(r3) /* 8025293C 0024F89C 54 03 EF FE */ rlwinm r3, r0, 0x1d, 0x1f, 0x1f -/* 80252940 0024F8A0 4E 80 00 20 */ blr +/* 80252940 0024F8A0 4E 80 00 20 */ blr .global IsDizzy__7CRidleyFR13CStateManagerf IsDizzy__7CRidleyFR13CStateManagerf: @@ -959,7 +959,7 @@ lbl_80252A10: /* 80252A14 0024F974 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 80252A18 0024F978 7C 08 03 A6 */ mtlr r0 /* 80252A1C 0024F97C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80252A20 0024F980 4E 80 00 20 */ blr +/* 80252A20 0024F980 4E 80 00 20 */ blr .global ShouldMove__7CRidleyFR13CStateManagerf ShouldMove__7CRidleyFR13CStateManagerf: @@ -1034,7 +1034,7 @@ lbl_80252B24: /* 80252B28 0024FA88 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 80252B2C 0024FA8C 7C 08 03 A6 */ mtlr r0 /* 80252B30 0024FA90 38 21 00 30 */ addi r1, r1, 0x30 -/* 80252B34 0024FA94 4E 80 00 20 */ blr +/* 80252B34 0024FA94 4E 80 00 20 */ blr .global TooClose__7CRidleyFR13CStateManagerf TooClose__7CRidleyFR13CStateManagerf: @@ -1097,14 +1097,14 @@ lbl_80252C08: /* 80252C0C 0024FB6C 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 80252C10 0024FB70 7C 08 03 A6 */ mtlr r0 /* 80252C14 0024FB74 38 21 00 30 */ addi r1, r1, 0x30 -/* 80252C18 0024FB78 4E 80 00 20 */ blr +/* 80252C18 0024FB78 4E 80 00 20 */ blr .global AttackOver__7CRidleyFR13CStateManagerf AttackOver__7CRidleyFR13CStateManagerf: /* 80252C1C 0024FB7C 80 03 0C C4 */ lwz r0, 0xcc4(r3) /* 80252C20 0024FB80 7C 00 00 34 */ cntlzw r0, r0 /* 80252C24 0024FB84 54 03 D9 7E */ srwi r3, r0, 5 -/* 80252C28 0024FB88 4E 80 00 20 */ blr +/* 80252C28 0024FB88 4E 80 00 20 */ blr .global ShouldTurn__7CRidleyFR13CStateManagerf ShouldTurn__7CRidleyFR13CStateManagerf: @@ -1112,7 +1112,7 @@ ShouldTurn__7CRidleyFR13CStateManagerf: /* 80252C30 0024FB90 20 00 00 05 */ subfic r0, r0, 5 /* 80252C34 0024FB94 7C 00 00 34 */ cntlzw r0, r0 /* 80252C38 0024FB98 54 03 D9 7E */ srwi r3, r0, 5 -/* 80252C3C 0024FB9C 4E 80 00 20 */ blr +/* 80252C3C 0024FB9C 4E 80 00 20 */ blr .global ShouldDodge__7CRidleyFR13CStateManagerf ShouldDodge__7CRidleyFR13CStateManagerf: @@ -1120,13 +1120,13 @@ ShouldDodge__7CRidleyFR13CStateManagerf: /* 80252C44 0024FBA4 20 00 00 03 */ subfic r0, r0, 3 /* 80252C48 0024FBA8 7C 00 00 34 */ cntlzw r0, r0 /* 80252C4C 0024FBAC 54 03 D9 7E */ srwi r3, r0, 5 -/* 80252C50 0024FBB0 4E 80 00 20 */ blr +/* 80252C50 0024FBB0 4E 80 00 20 */ blr .global ShouldRetreat__7CRidleyFR13CStateManagerf ShouldRetreat__7CRidleyFR13CStateManagerf: /* 80252C54 0024FBB4 88 03 0A 34 */ lbz r0, 0xa34(r3) /* 80252C58 0024FBB8 54 03 DF FE */ rlwinm r3, r0, 0x1b, 0x1f, 0x1f -/* 80252C5C 0024FBBC 4E 80 00 20 */ blr +/* 80252C5C 0024FBBC 4E 80 00 20 */ blr .global ShouldCrouch__7CRidleyFR13CStateManagerf ShouldCrouch__7CRidleyFR13CStateManagerf: @@ -1134,7 +1134,7 @@ ShouldCrouch__7CRidleyFR13CStateManagerf: /* 80252C64 0024FBC4 20 00 00 01 */ subfic r0, r0, 1 /* 80252C68 0024FBC8 7C 00 00 34 */ cntlzw r0, r0 /* 80252C6C 0024FBCC 54 03 D9 7E */ srwi r3, r0, 5 -/* 80252C70 0024FBD0 4E 80 00 20 */ blr +/* 80252C70 0024FBD0 4E 80 00 20 */ blr .global InRange__7CRidleyFR13CStateManagerf InRange__7CRidleyFR13CStateManagerf: @@ -1165,7 +1165,7 @@ InRange__7CRidleyFR13CStateManagerf: /* 80252CD4 0024FC34 80 01 00 24 */ lwz r0, 0x24(r1) /* 80252CD8 0024FC38 7C 08 03 A6 */ mtlr r0 /* 80252CDC 0024FC3C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80252CE0 0024FC40 4E 80 00 20 */ blr +/* 80252CE0 0024FC40 4E 80 00 20 */ blr .global AIStage__7CRidleyFR13CStateManagerf AIStage__7CRidleyFR13CStateManagerf: @@ -1179,7 +1179,7 @@ AIStage__7CRidleyFR13CStateManagerf: /* 80252D00 0024FC60 7C 00 28 10 */ subfc r0, r0, r5 /* 80252D04 0024FC64 7C 64 19 14 */ adde r3, r4, r3 /* 80252D08 0024FC68 38 21 00 10 */ addi r1, r1, 0x10 -/* 80252D0C 0024FC6C 4E 80 00 20 */ blr +/* 80252D0C 0024FC6C 4E 80 00 20 */ blr .global ShouldAttack__7CRidleyFR13CStateManagerf ShouldAttack__7CRidleyFR13CStateManagerf: @@ -1203,7 +1203,7 @@ lbl_80252D40: /* 80252D4C 0024FCAC 54 04 D9 7E */ srwi r4, r0, 5 lbl_80252D50: /* 80252D50 0024FCB0 7C 83 23 78 */ mr r3, r4 -/* 80252D54 0024FCB4 4E 80 00 20 */ blr +/* 80252D54 0024FCB4 4E 80 00 20 */ blr .global ShouldFire__7CRidleyFR13CStateManagerf ShouldFire__7CRidleyFR13CStateManagerf: @@ -1219,7 +1219,7 @@ lbl_80252D6C: /* 80252D78 0024FCD8 54 04 D9 7E */ srwi r4, r0, 5 lbl_80252D7C: /* 80252D7C 0024FCDC 7C 83 23 78 */ mr r3, r4 -/* 80252D80 0024FCE0 4E 80 00 20 */ blr +/* 80252D80 0024FCE0 4E 80 00 20 */ blr .global ShouldTaunt__7CRidleyFR13CStateManagerf ShouldTaunt__7CRidleyFR13CStateManagerf: @@ -1244,7 +1244,7 @@ lbl_80252DB8: /* 80252DC4 0024FD24 54 04 D9 7E */ srwi r4, r0, 5 lbl_80252DC8: /* 80252DC8 0024FD28 7C 83 23 78 */ mr r3, r4 -/* 80252DCC 0024FD2C 4E 80 00 20 */ blr +/* 80252DCC 0024FD2C 4E 80 00 20 */ blr .global Dead__7CRidleyFR13CStateManager9EStateMsgf Dead__7CRidleyFR13CStateManager9EStateMsgf: @@ -1267,7 +1267,7 @@ lbl_80252E08: /* 80252E08 0024FD68 80 01 00 14 */ lwz r0, 0x14(r1) /* 80252E0C 0024FD6C 7C 08 03 A6 */ mtlr r0 /* 80252E10 0024FD70 38 21 00 10 */ addi r1, r1, 0x10 -/* 80252E14 0024FD74 4E 80 00 20 */ blr +/* 80252E14 0024FD74 4E 80 00 20 */ blr .global CoverAttack__7CRidleyFR13CStateManager9EStateMsgf CoverAttack__7CRidleyFR13CStateManager9EStateMsgf: @@ -1340,7 +1340,7 @@ lbl_80252EEC: /* 80252F10 0024FE70 81 9F 00 00 */ lwz r12, 0(r31) /* 80252F14 0024FE74 81 8C 02 B0 */ lwz r12, 0x2b0(r12) /* 80252F18 0024FE78 7D 89 03 A6 */ mtctr r12 -/* 80252F1C 0024FE7C 4E 80 04 21 */ bctrl +/* 80252F1C 0024FE7C 4E 80 04 21 */ bctrl /* 80252F20 0024FE80 80 81 00 14 */ lwz r4, 0x14(r1) /* 80252F24 0024FE84 7F E3 FB 78 */ mr r3, r31 /* 80252F28 0024FE88 80 01 00 18 */ lwz r0, 0x18(r1) @@ -1362,7 +1362,7 @@ lbl_80252F60: /* 80252F64 0024FEC4 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 80252F68 0024FEC8 7C 08 03 A6 */ mtlr r0 /* 80252F6C 0024FECC 38 21 00 40 */ addi r1, r1, 0x40 -/* 80252F70 0024FED0 4E 80 00 20 */ blr +/* 80252F70 0024FED0 4E 80 00 20 */ blr .global Dodge__7CRidleyFR13CStateManager9EStateMsgf Dodge__7CRidleyFR13CStateManager9EStateMsgf: @@ -1539,7 +1539,7 @@ lbl_802531EC: /* 802531FC 0025015C 83 C1 00 88 */ lwz r30, 0x88(r1) /* 80253200 00250160 7C 08 03 A6 */ mtlr r0 /* 80253204 00250164 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 80253208 00250168 4E 80 00 20 */ blr +/* 80253208 00250168 4E 80 00 20 */ blr .global Hurled__7CRidleyFR13CStateManager9EStateMsgf Hurled__7CRidleyFR13CStateManager9EStateMsgf: @@ -1595,7 +1595,7 @@ lbl_802532C4: /* 802532C8 00250228 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 802532CC 0025022C 7C 08 03 A6 */ mtlr r0 /* 802532D0 00250230 38 21 00 30 */ addi r1, r1, 0x30 -/* 802532D4 00250234 4E 80 00 20 */ blr +/* 802532D4 00250234 4E 80 00 20 */ blr .global Flinch__7CRidleyFR13CStateManager9EStateMsgf Flinch__7CRidleyFR13CStateManager9EStateMsgf: @@ -1646,7 +1646,7 @@ lbl_80253370: /* 80253374 002502D4 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80253378 002502D8 7C 08 03 A6 */ mtlr r0 /* 8025337C 002502DC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80253380 002502E0 4E 80 00 20 */ blr +/* 80253380 002502E0 4E 80 00 20 */ blr .global Jump__7CRidleyFR13CStateManager9EStateMsgf Jump__7CRidleyFR13CStateManager9EStateMsgf: @@ -1763,7 +1763,7 @@ lbl_802534F4: /* 80253524 00250484 81 9F 00 00 */ lwz r12, 0(r31) /* 80253528 00250488 81 8C 02 B0 */ lwz r12, 0x2b0(r12) /* 8025352C 0025048C 7D 89 03 A6 */ mtctr r12 -/* 80253530 00250490 4E 80 04 21 */ bctrl +/* 80253530 00250490 4E 80 04 21 */ bctrl /* 80253534 00250494 80 A1 00 20 */ lwz r5, 0x20(r1) /* 80253538 00250498 38 80 00 00 */ li r4, 0 /* 8025353C 0025049C 80 01 00 24 */ lwz r0, 0x24(r1) @@ -1793,7 +1793,7 @@ lbl_80253588: /* 80253598 002504F8 83 C1 00 48 */ lwz r30, 0x48(r1) /* 8025359C 002504FC 7C 08 03 A6 */ mtlr r0 /* 802535A0 00250500 38 21 00 60 */ addi r1, r1, 0x60 -/* 802535A4 00250504 4E 80 00 20 */ blr +/* 802535A4 00250504 4E 80 00 20 */ blr .global DoubleSnap__7CRidleyFR13CStateManager9EStateMsgf DoubleSnap__7CRidleyFR13CStateManager9EStateMsgf: @@ -1865,7 +1865,7 @@ lbl_80253678: /* 8025369C 002505FC 81 9F 00 00 */ lwz r12, 0(r31) /* 802536A0 00250600 81 8C 02 B0 */ lwz r12, 0x2b0(r12) /* 802536A4 00250604 7D 89 03 A6 */ mtctr r12 -/* 802536A8 00250608 4E 80 04 21 */ bctrl +/* 802536A8 00250608 4E 80 04 21 */ bctrl /* 802536AC 0025060C 80 61 00 14 */ lwz r3, 0x14(r1) /* 802536B0 00250610 80 01 00 18 */ lwz r0, 0x18(r1) /* 802536B4 00250614 90 7F 0C 8C */ stw r3, 0xc8c(r31) @@ -1885,19 +1885,19 @@ lbl_802536E4: /* 802536E8 00250648 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 802536EC 0025064C 7C 08 03 A6 */ mtlr r0 /* 802536F0 00250650 38 21 00 40 */ addi r1, r1, 0x40 -/* 802536F4 00250654 4E 80 00 20 */ blr +/* 802536F4 00250654 4E 80 00 20 */ blr .global ShouldDoubleSnap__7CRidleyFR13CStateManagerf ShouldDoubleSnap__7CRidleyFR13CStateManagerf: /* 802536F8 00250658 88 03 0A 33 */ lbz r0, 0xa33(r3) /* 802536FC 0025065C 54 03 FF FE */ rlwinm r3, r0, 0x1f, 0x1f, 0x1f -/* 80253700 00250660 4E 80 00 20 */ blr +/* 80253700 00250660 4E 80 00 20 */ blr .global ShouldStrafe__7CRidleyFR13CStateManagerf ShouldStrafe__7CRidleyFR13CStateManagerf: /* 80253704 00250664 88 03 0A 33 */ lbz r0, 0xa33(r3) /* 80253708 00250668 54 03 F7 FE */ rlwinm r3, r0, 0x1e, 0x1f, 0x1f -/* 8025370C 0025066C 4E 80 00 20 */ blr +/* 8025370C 0025066C 4E 80 00 20 */ blr .global sub_80253710 sub_80253710: @@ -2059,7 +2059,7 @@ lbl_80253948: /* 80253950 002508B0 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80253954 002508B4 7C 08 03 A6 */ mtlr r0 /* 80253958 002508B8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8025395C 002508BC 4E 80 00 20 */ blr +/* 8025395C 002508BC 4E 80 00 20 */ blr .global sub_80253960 sub_80253960: @@ -2106,7 +2106,7 @@ sub_80253960: /* 80253A00 00250960 80 01 00 24 */ lwz r0, 0x24(r1) /* 80253A04 00250964 7C 08 03 A6 */ mtlr r0 /* 80253A08 00250968 38 21 00 20 */ addi r1, r1, 0x20 -/* 80253A0C 0025096C 4E 80 00 20 */ blr +/* 80253A0C 0025096C 4E 80 00 20 */ blr .global FadeOut__7CRidleyFR13CStateManager9EStateMsgf FadeOut__7CRidleyFR13CStateManager9EStateMsgf: @@ -2197,7 +2197,7 @@ lbl_80253B34: /* 80253B44 00250AA4 83 81 00 20 */ lwz r28, 0x20(r1) /* 80253B48 00250AA8 7C 08 03 A6 */ mtlr r0 /* 80253B4C 00250AAC 38 21 00 30 */ addi r1, r1, 0x30 -/* 80253B50 00250AB0 4E 80 00 20 */ blr +/* 80253B50 00250AB0 4E 80 00 20 */ blr .global ProjectileAttack__7CRidleyFR13CStateManager9EStateMsgf ProjectileAttack__7CRidleyFR13CStateManager9EStateMsgf: @@ -2264,7 +2264,7 @@ lbl_80253C24: /* 80253C30 00250B90 83 C1 00 20 */ lwz r30, 0x20(r1) /* 80253C34 00250B94 7C 08 03 A6 */ mtlr r0 /* 80253C38 00250B98 38 21 00 30 */ addi r1, r1, 0x30 -/* 80253C3C 00250B9C 4E 80 00 20 */ blr +/* 80253C3C 00250B9C 4E 80 00 20 */ blr .global Crouch__7CRidleyFR13CStateManager9EStateMsgf Crouch__7CRidleyFR13CStateManager9EStateMsgf: @@ -2286,7 +2286,7 @@ lbl_80253C78: /* 80253C78 00250BD8 81 83 00 00 */ lwz r12, 0(r3) /* 80253C7C 00250BDC 81 8C 02 BC */ lwz r12, 0x2bc(r12) /* 80253C80 00250BE0 7D 89 03 A6 */ mtctr r12 -/* 80253C84 00250BE4 4E 80 04 21 */ bctrl +/* 80253C84 00250BE4 4E 80 04 21 */ bctrl /* 80253C88 00250BE8 3C 60 80 5A */ lis r3, lbl_805A6700@ha /* 80253C8C 00250BEC C4 03 67 00 */ lfsu f0, lbl_805A6700@l(r3) /* 80253C90 00250BF0 C0 63 00 04 */ lfs f3, 4(r3) @@ -2365,7 +2365,7 @@ lbl_80253DA4: /* 80253DAC 00250D0C 83 C1 00 58 */ lwz r30, 0x58(r1) /* 80253DB0 00250D10 7C 08 03 A6 */ mtlr r0 /* 80253DB4 00250D14 38 21 00 60 */ addi r1, r1, 0x60 -/* 80253DB8 00250D18 4E 80 00 20 */ blr +/* 80253DB8 00250D18 4E 80 00 20 */ blr .global JumpBack__7CRidleyFR13CStateManager9EStateMsgf JumpBack__7CRidleyFR13CStateManager9EStateMsgf: @@ -2634,7 +2634,7 @@ lbl_80254198: /* 802541B4 00251114 80 01 01 34 */ lwz r0, 0x134(r1) /* 802541B8 00251118 7C 08 03 A6 */ mtlr r0 /* 802541BC 0025111C 38 21 01 30 */ addi r1, r1, 0x130 -/* 802541C0 00251120 4E 80 00 20 */ blr +/* 802541C0 00251120 4E 80 00 20 */ blr .global Land__7CRidleyFR13CStateManager9EStateMsgf Land__7CRidleyFR13CStateManager9EStateMsgf: @@ -2854,7 +2854,7 @@ lbl_802544E4: /* 802544F0 00251450 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 802544F4 00251454 7C 08 03 A6 */ mtlr r0 /* 802544F8 00251458 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 802544FC 0025145C 4E 80 00 20 */ blr +/* 802544FC 0025145C 4E 80 00 20 */ blr .global Approach__7CRidleyFR13CStateManager9EStateMsgf Approach__7CRidleyFR13CStateManager9EStateMsgf: @@ -2970,7 +2970,7 @@ lbl_80254698: /* 802546A8 00251608 83 C1 00 58 */ lwz r30, 0x58(r1) /* 802546AC 0025160C 7C 08 03 A6 */ mtlr r0 /* 802546B0 00251610 38 21 00 70 */ addi r1, r1, 0x70 -/* 802546B4 00251614 4E 80 00 20 */ blr +/* 802546B4 00251614 4E 80 00 20 */ blr .global Explode__7CRidleyFR13CStateManager9EStateMsgf Explode__7CRidleyFR13CStateManager9EStateMsgf: @@ -3016,7 +3016,7 @@ lbl_80254740: /* 80254740 002516A0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80254744 002516A4 7C 08 03 A6 */ mtlr r0 /* 80254748 002516A8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8025474C 002516AC 4E 80 00 20 */ blr +/* 8025474C 002516AC 4E 80 00 20 */ blr .global LoopedAttack__7CRidleyFR13CStateManager9EStateMsgf LoopedAttack__7CRidleyFR13CStateManager9EStateMsgf: @@ -3573,7 +3573,7 @@ lbl_80254F6C: /* 80254F88 00251EE8 83 A1 00 D4 */ lwz r29, 0xd4(r1) /* 80254F8C 00251EEC 7C 08 03 A6 */ mtlr r0 /* 80254F90 00251EF0 38 21 01 00 */ addi r1, r1, 0x100 -/* 80254F94 00251EF4 4E 80 00 20 */ blr +/* 80254F94 00251EF4 4E 80 00 20 */ blr .global Enraged__7CRidleyFR13CStateManager9EStateMsgf Enraged__7CRidleyFR13CStateManager9EStateMsgf: @@ -3789,7 +3789,7 @@ lbl_802552A8: /* 802552B4 00252214 80 01 01 34 */ lwz r0, 0x134(r1) /* 802552B8 00252218 7C 08 03 A6 */ mtlr r0 /* 802552BC 0025221C 38 21 01 30 */ addi r1, r1, 0x130 -/* 802552C0 00252220 4E 80 00 20 */ blr +/* 802552C0 00252220 4E 80 00 20 */ blr .global Lurk__7CRidleyFR13CStateManager9EStateMsgf Lurk__7CRidleyFR13CStateManager9EStateMsgf: @@ -4004,7 +4004,7 @@ lbl_802555D4: /* 802555EC 0025254C 83 C1 00 D8 */ lwz r30, 0xd8(r1) /* 802555F0 00252550 7C 08 03 A6 */ mtlr r0 /* 802555F4 00252554 38 21 01 00 */ addi r1, r1, 0x100 -/* 802555F8 00252558 4E 80 00 20 */ blr +/* 802555F8 00252558 4E 80 00 20 */ blr .global Retreat__7CRidleyFR13CStateManager9EStateMsgf Retreat__7CRidleyFR13CStateManager9EStateMsgf: @@ -4046,7 +4046,7 @@ lbl_80255674: /* 80255674 002525D4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80255678 002525D8 7C 08 03 A6 */ mtlr r0 /* 8025567C 002525DC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80255680 002525E0 4E 80 00 20 */ blr +/* 80255680 002525E0 4E 80 00 20 */ blr .global Flee__7CRidleyFR13CStateManager9EStateMsgf Flee__7CRidleyFR13CStateManager9EStateMsgf: @@ -4147,7 +4147,7 @@ lbl_802557E4: /* 802557F0 00252750 83 E1 00 6C */ lwz r31, 0x6c(r1) /* 802557F4 00252754 7C 08 03 A6 */ mtlr r0 /* 802557F8 00252758 38 21 00 80 */ addi r1, r1, 0x80 -/* 802557FC 0025275C 4E 80 00 20 */ blr +/* 802557FC 0025275C 4E 80 00 20 */ blr .global TelegraphAttack__7CRidleyFR13CStateManager9EStateMsgf TelegraphAttack__7CRidleyFR13CStateManager9EStateMsgf: @@ -4213,7 +4213,7 @@ lbl_802558D0: /* 802558D8 00252838 83 C1 00 18 */ lwz r30, 0x18(r1) /* 802558DC 0025283C 7C 08 03 A6 */ mtlr r0 /* 802558E0 00252840 38 21 00 20 */ addi r1, r1, 0x20 -/* 802558E4 00252844 4E 80 00 20 */ blr +/* 802558E4 00252844 4E 80 00 20 */ blr .global Attack__7CRidleyFR13CStateManager9EStateMsgf Attack__7CRidleyFR13CStateManager9EStateMsgf: @@ -4358,7 +4358,7 @@ lbl_80255AE4: /* 80255AF4 00252A54 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80255AF8 00252A58 7C 08 03 A6 */ mtlr r0 /* 80255AFC 00252A5C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80255B00 00252A60 4E 80 00 20 */ blr +/* 80255B00 00252A60 4E 80 00 20 */ blr .global SpecialAttack__7CRidleyFR13CStateManager9EStateMsgf SpecialAttack__7CRidleyFR13CStateManager9EStateMsgf: @@ -4400,7 +4400,7 @@ lbl_80255B7C: /* 80255B7C 00252ADC 80 01 00 24 */ lwz r0, 0x24(r1) /* 80255B80 00252AE0 7C 08 03 A6 */ mtlr r0 /* 80255B84 00252AE4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80255B88 00252AE8 4E 80 00 20 */ blr +/* 80255B88 00252AE8 4E 80 00 20 */ blr .global Generate__7CRidleyFR13CStateManager9EStateMsgf Generate__7CRidleyFR13CStateManager9EStateMsgf: @@ -4450,7 +4450,7 @@ lbl_80255C2C: /* 80255C30 00252B90 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 80255C34 00252B94 7C 08 03 A6 */ mtlr r0 /* 80255C38 00252B98 38 21 00 30 */ addi r1, r1, 0x30 -/* 80255C3C 00252B9C 4E 80 00 20 */ blr +/* 80255C3C 00252B9C 4E 80 00 20 */ blr .global Taunt__7CRidleyFR13CStateManager9EStateMsgf Taunt__7CRidleyFR13CStateManager9EStateMsgf: @@ -4505,7 +4505,7 @@ lbl_80255CE0: /* 80255CEC 00252C4C 83 C1 00 20 */ lwz r30, 0x20(r1) /* 80255CF0 00252C50 7C 08 03 A6 */ mtlr r0 /* 80255CF4 00252C54 38 21 00 30 */ addi r1, r1, 0x30 -/* 80255CF8 00252C58 4E 80 00 20 */ blr +/* 80255CF8 00252C58 4E 80 00 20 */ blr .global Patrol__7CRidleyFR13CStateManager9EStateMsgf Patrol__7CRidleyFR13CStateManager9EStateMsgf: @@ -4533,7 +4533,7 @@ lbl_80255D44: /* 80255D48 00252CA8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80255D4C 00252CAC 7C 08 03 A6 */ mtlr r0 /* 80255D50 00252CB0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80255D54 00252CB4 4E 80 00 20 */ blr +/* 80255D54 00252CB4 4E 80 00 20 */ blr .global sub_80255d58 sub_80255d58: @@ -4606,7 +4606,7 @@ lbl_80255E2C: /* 80255E4C 00252DAC 80 01 00 24 */ lwz r0, 0x24(r1) /* 80255E50 00252DB0 7C 08 03 A6 */ mtlr r0 /* 80255E54 00252DB4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80255E58 00252DB8 4E 80 00 20 */ blr +/* 80255E58 00252DB8 4E 80 00 20 */ blr .global sub_80255e5c sub_80255e5c: @@ -4671,7 +4671,7 @@ lbl_80255F34: /* 80255F40 00252EA0 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 80255F44 00252EA4 7C 08 03 A6 */ mtlr r0 /* 80255F48 00252EA8 38 21 00 50 */ addi r1, r1, 0x50 -/* 80255F4C 00252EAC 4E 80 00 20 */ blr +/* 80255F4C 00252EAC 4E 80 00 20 */ blr .global sub_80255f50 sub_80255f50: @@ -4712,7 +4712,7 @@ sub_80255f50: /* 80255FD8 00252F38 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 80255FDC 00252F3C 7C 08 03 A6 */ mtlr r0 /* 80255FE0 00252F40 38 21 00 50 */ addi r1, r1, 0x50 -/* 80255FE4 00252F44 4E 80 00 20 */ blr +/* 80255FE4 00252F44 4E 80 00 20 */ blr .global sub_80255fe8 sub_80255fe8: @@ -4774,7 +4774,7 @@ lbl_802560B4: /* 802560C0 00253020 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802560C4 00253024 7C 08 03 A6 */ mtlr r0 /* 802560C8 00253028 38 21 00 30 */ addi r1, r1, 0x30 -/* 802560CC 0025302C 4E 80 00 20 */ blr +/* 802560CC 0025302C 4E 80 00 20 */ blr .global sub_802560d0 sub_802560d0: @@ -4888,7 +4888,7 @@ lbl_80256228: /* 80256270 002531D0 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80256274 002531D4 7C 08 03 A6 */ mtlr r0 /* 80256278 002531D8 38 21 00 70 */ addi r1, r1, 0x70 -/* 8025627C 002531DC 4E 80 00 20 */ blr +/* 8025627C 002531DC 4E 80 00 20 */ blr .global Think__7CRidleyR13CStateManager Think__7CRidleyR13CStateManager: @@ -4966,7 +4966,7 @@ lbl_80256388: /* 80256398 002532F8 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8025639C 002532FC 7C 08 03 A6 */ mtlr r0 /* 802563A0 00253300 38 21 00 30 */ addi r1, r1, 0x30 -/* 802563A4 00253304 4E 80 00 20 */ blr +/* 802563A4 00253304 4E 80 00 20 */ blr .global sub_802563a8 sub_802563a8: @@ -5088,20 +5088,20 @@ lbl_80256558: /* 8025656C 002534CC 83 E1 00 4C */ lwz r31, 0x4c(r1) /* 80256570 002534D0 7C 08 03 A6 */ mtlr r0 /* 80256574 002534D4 38 21 00 70 */ addi r1, r1, 0x70 -/* 80256578 002534D8 4E 80 00 20 */ blr +/* 80256578 002534D8 4E 80 00 20 */ blr .global nullsub_53 nullsub_53: -/* 8025657C 002534DC 4E 80 00 20 */ blr +/* 8025657C 002534DC 4E 80 00 20 */ blr .global sub_80256580 sub_80256580: /* 80256580 002534E0 88 03 0A 31 */ lbz r0, 0xa31(r3) /* 80256584 002534E4 54 00 CF FF */ rlwinm. r0, r0, 0x19, 0x1f, 0x1f -/* 80256588 002534E8 4C 82 00 20 */ bnelr +/* 80256588 002534E8 4C 82 00 20 */ bnelr /* 8025658C 002534EC C0 02 B9 8C */ lfs f0, lbl_805AD6AC@sda21(r2) /* 80256590 002534F0 D0 03 03 B4 */ stfs f0, 0x3b4(r3) -/* 80256594 002534F4 4E 80 00 20 */ blr +/* 80256594 002534F4 4E 80 00 20 */ blr .global GetAimPosition__7CRidleyCFRC13CStateManagerf GetAimPosition__7CRidleyCFRC13CStateManagerf: @@ -5141,7 +5141,7 @@ lbl_80256610: /* 80256614 00253574 83 E1 00 6C */ lwz r31, 0x6c(r1) /* 80256618 00253578 7C 08 03 A6 */ mtlr r0 /* 8025661C 0025357C 38 21 00 70 */ addi r1, r1, 0x70 -/* 80256620 00253580 4E 80 00 20 */ blr +/* 80256620 00253580 4E 80 00 20 */ blr .global sub_80256624 sub_80256624: @@ -5167,7 +5167,7 @@ sub_80256624: /* 80256670 002535D0 81 9E 00 00 */ lwz r12, 0(r30) /* 80256674 002535D4 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80256678 002535D8 7D 89 03 A6 */ mtctr r12 -/* 8025667C 002535DC 4E 80 04 21 */ bctrl +/* 8025667C 002535DC 4E 80 04 21 */ bctrl /* 80256680 002535E0 C0 5F 00 60 */ lfs f2, 0x60(r31) /* 80256684 002535E4 38 81 00 34 */ addi r4, r1, 0x34 /* 80256688 002535E8 C0 3F 00 50 */ lfs f1, 0x50(r31) @@ -5179,7 +5179,7 @@ sub_80256624: /* 802566A0 00253600 81 83 00 00 */ lwz r12, 0(r3) /* 802566A4 00253604 81 8C 00 20 */ lwz r12, 0x20(r12) /* 802566A8 00253608 7D 89 03 A6 */ mtctr r12 -/* 802566AC 0025360C 4E 80 04 21 */ bctrl +/* 802566AC 0025360C 4E 80 04 21 */ bctrl /* 802566B0 00253610 80 7F 00 64 */ lwz r3, 0x64(r31) /* 802566B4 00253614 38 81 00 28 */ addi r4, r1, 0x28 /* 802566B8 00253618 C0 03 00 00 */ lfs f0, 0(r3) @@ -5192,12 +5192,12 @@ sub_80256624: /* 802566D4 00253634 81 83 00 00 */ lwz r12, 0(r3) /* 802566D8 00253638 81 8C 00 24 */ lwz r12, 0x24(r12) /* 802566DC 0025363C 7D 89 03 A6 */ mtctr r12 -/* 802566E0 00253640 4E 80 04 21 */ bctrl +/* 802566E0 00253640 4E 80 04 21 */ bctrl /* 802566E4 00253644 80 7F 0C E0 */ lwz r3, 0xce0(r31) /* 802566E8 00253648 81 83 00 00 */ lwz r12, 0(r3) /* 802566EC 0025364C 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 802566F0 00253650 7D 89 03 A6 */ mtctr r12 -/* 802566F4 00253654 4E 80 04 21 */ bctrl +/* 802566F4 00253654 4E 80 04 21 */ bctrl /* 802566F8 00253658 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802566FC 0025365C 41 82 01 70 */ beq lbl_8025686C /* 80256700 00253660 C0 3F 0D 08 */ lfs f1, 0xd08(r31) @@ -5213,7 +5213,7 @@ sub_80256624: /* 80256728 00253688 81 83 00 00 */ lwz r12, 0(r3) /* 8025672C 0025368C 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80256730 00253690 7D 89 03 A6 */ mtctr r12 -/* 80256734 00253694 4E 80 04 21 */ bctrl +/* 80256734 00253694 4E 80 04 21 */ bctrl /* 80256738 00253698 80 1F 0D 0C */ lwz r0, 0xd0c(r31) /* 8025673C 0025369C 28 00 00 00 */ cmplwi r0, 0 /* 80256740 002536A0 41 82 01 2C */ beq lbl_8025686C @@ -5306,7 +5306,7 @@ lbl_8025686C: /* 80256874 002537D4 81 83 00 00 */ lwz r12, 0(r3) /* 80256878 002537D8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8025687C 002537DC 7D 89 03 A6 */ mtctr r12 -/* 80256880 002537E0 4E 80 04 21 */ bctrl +/* 80256880 002537E0 4E 80 04 21 */ bctrl /* 80256884 002537E4 48 00 00 28 */ b lbl_802568AC lbl_80256888: /* 80256888 002537E8 80 1F 0D 0C */ lwz r0, 0xd0c(r31) @@ -5345,7 +5345,7 @@ lbl_802568F0: /* 80256904 00253864 83 A1 00 D4 */ lwz r29, 0xd4(r1) /* 80256908 00253868 7C 08 03 A6 */ mtlr r0 /* 8025690C 0025386C 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 80256910 00253870 4E 80 00 20 */ blr +/* 80256910 00253870 4E 80 00 20 */ blr .global sub_80256914 sub_80256914: @@ -5366,7 +5366,7 @@ sub_80256914: /* 8025694C 002538AC 38 80 00 01 */ li r4, 1 /* 80256950 002538B0 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80256954 002538B4 7D 89 03 A6 */ mtctr r12 -/* 80256958 002538B8 4E 80 04 21 */ bctrl +/* 80256958 002538B8 4E 80 04 21 */ bctrl lbl_8025695C: /* 8025695C 002538BC 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 80256960 002538C0 41 82 00 10 */ beq lbl_80256970 @@ -5438,7 +5438,7 @@ lbl_80256A4C: /* 80256A5C 002539BC 83 C1 00 38 */ lwz r30, 0x38(r1) /* 80256A60 002539C0 7C 08 03 A6 */ mtlr r0 /* 80256A64 002539C4 38 21 00 50 */ addi r1, r1, 0x50 -/* 80256A68 002539C8 4E 80 00 20 */ blr +/* 80256A68 002539C8 4E 80 00 20 */ blr .global sub_80256a6c sub_80256a6c: @@ -5463,7 +5463,7 @@ sub_80256a6c: /* 80256AB4 00253A14 7F E5 FB 78 */ mr r5, r31 /* 80256AB8 00253A18 81 8C 00 74 */ lwz r12, 0x74(r12) /* 80256ABC 00253A1C 7D 89 03 A6 */ mtctr r12 -/* 80256AC0 00253A20 4E 80 04 21 */ bctrl +/* 80256AC0 00253A20 4E 80 04 21 */ bctrl /* 80256AC4 00253A24 88 1D 0A 31 */ lbz r0, 0xa31(r29) /* 80256AC8 00253A28 38 60 00 00 */ li r3, 0 /* 80256ACC 00253A2C 50 60 17 7A */ rlwimi r0, r3, 2, 0x1d, 0x1d @@ -5485,7 +5485,7 @@ lbl_80256AF8: /* 80256B04 00253A64 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80256B08 00253A68 7C 08 03 A6 */ mtlr r0 /* 80256B0C 00253A6C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80256B10 00253A70 4E 80 00 20 */ blr +/* 80256B10 00253A70 4E 80 00 20 */ blr .global sub_80256b14 sub_80256b14: @@ -5527,7 +5527,7 @@ sub_80256b14: /* 80256BA0 00253B00 38 81 00 E8 */ addi r4, r1, 0xe8 /* 80256BA4 00253B04 81 8C 00 70 */ lwz r12, 0x70(r12) /* 80256BA8 00253B08 7D 89 03 A6 */ mtctr r12 -/* 80256BAC 00253B0C 4E 80 04 21 */ bctrl +/* 80256BAC 00253B0C 4E 80 04 21 */ bctrl /* 80256BB0 00253B10 48 00 01 9C */ b lbl_80256D4C lbl_80256BB4: /* 80256BB4 00253B14 C0 41 00 F4 */ lfs f2, 0xf4(r1) @@ -5552,7 +5552,7 @@ lbl_80256BB4: /* 80256C00 00253B60 38 81 00 B8 */ addi r4, r1, 0xb8 /* 80256C04 00253B64 81 8C 00 70 */ lwz r12, 0x70(r12) /* 80256C08 00253B68 7D 89 03 A6 */ mtctr r12 -/* 80256C0C 00253B6C 4E 80 04 21 */ bctrl +/* 80256C0C 00253B6C 4E 80 04 21 */ bctrl /* 80256C10 00253B70 80 9E 08 4C */ lwz r4, 0x84c(r30) /* 80256C14 00253B74 3C 60 80 5A */ lis r3, lbl_805A66F4@ha /* 80256C18 00253B78 38 63 66 F4 */ addi r3, r3, lbl_805A66F4@l @@ -5662,7 +5662,7 @@ lbl_80256D90: /* 80256DA4 00253D04 83 A1 01 24 */ lwz r29, 0x124(r1) /* 80256DA8 00253D08 7C 08 03 A6 */ mtlr r0 /* 80256DAC 00253D0C 38 21 01 40 */ addi r1, r1, 0x140 -/* 80256DB0 00253D10 4E 80 00 20 */ blr +/* 80256DB0 00253D10 4E 80 00 20 */ blr .global sub_80256db4 sub_80256db4: @@ -5771,7 +5771,7 @@ lbl_80256F04: /* 80256F40 00253EA0 38 C0 00 00 */ li r6, 0 /* 80256F44 00253EA4 81 8C 00 78 */ lwz r12, 0x78(r12) /* 80256F48 00253EA8 7D 89 03 A6 */ mtctr r12 -/* 80256F4C 00253EAC 4E 80 04 21 */ bctrl +/* 80256F4C 00253EAC 4E 80 04 21 */ bctrl /* 80256F50 00253EB0 88 1D 0A 31 */ lbz r0, 0xa31(r29) /* 80256F54 00253EB4 39 80 00 01 */ li r12, 1 /* 80256F58 00253EB8 51 80 17 7A */ rlwimi r0, r12, 2, 0x1d, 0x1d @@ -5833,7 +5833,7 @@ lbl_80257024: /* 80257034 00253F94 83 81 00 D0 */ lwz r28, 0xd0(r1) /* 80257038 00253F98 7C 08 03 A6 */ mtlr r0 /* 8025703C 00253F9C 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 80257040 00253FA0 4E 80 00 20 */ blr +/* 80257040 00253FA0 4E 80 00 20 */ blr .global sub_80257044 sub_80257044: @@ -6187,7 +6187,7 @@ lbl_8025743C: /* 8025757C 002544DC 80 01 02 24 */ lwz r0, 0x224(r1) /* 80257580 002544E0 7C 08 03 A6 */ mtlr r0 /* 80257584 002544E4 38 21 02 20 */ addi r1, r1, 0x220 -/* 80257588 002544E8 4E 80 00 20 */ blr +/* 80257588 002544E8 4E 80 00 20 */ blr .global sub_8025758c sub_8025758c: @@ -6242,7 +6242,7 @@ lbl_80257618: /* 80257640 002545A0 83 81 00 20 */ lwz r28, 0x20(r1) /* 80257644 002545A4 7C 08 03 A6 */ mtlr r0 /* 80257648 002545A8 38 21 00 40 */ addi r1, r1, 0x40 -/* 8025764C 002545AC 4E 80 00 20 */ blr +/* 8025764C 002545AC 4E 80 00 20 */ blr .global sub_80257650 sub_80257650: @@ -6282,7 +6282,7 @@ lbl_8025767C: /* 802576D0 00254630 81 9F 00 00 */ lwz r12, 0(r31) /* 802576D4 00254634 81 8C 00 34 */ lwz r12, 0x34(r12) /* 802576D8 00254638 7D 89 03 A6 */ mtctr r12 -/* 802576DC 0025463C 4E 80 04 21 */ bctrl +/* 802576DC 0025463C 4E 80 04 21 */ bctrl /* 802576E0 00254640 C0 02 B9 9C */ lfs f0, lbl_805AD6BC@sda21(r2) /* 802576E4 00254644 38 80 00 01 */ li r4, 1 /* 802576E8 00254648 D0 03 00 00 */ stfs f0, 0(r3) @@ -6309,7 +6309,7 @@ lbl_802576F8: /* 80257734 00254694 80 01 00 34 */ lwz r0, 0x34(r1) /* 80257738 00254698 7C 08 03 A6 */ mtlr r0 /* 8025773C 0025469C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80257740 002546A0 4E 80 00 20 */ blr +/* 80257740 002546A0 4E 80 00 20 */ blr .global sub_80257744 sub_80257744: @@ -6354,7 +6354,7 @@ lbl_802577C8: /* 802577D4 00254734 81 9F 00 00 */ lwz r12, 0(r31) /* 802577D8 00254738 81 8C 00 34 */ lwz r12, 0x34(r12) /* 802577DC 0025473C 7D 89 03 A6 */ mtctr r12 -/* 802577E0 00254740 4E 80 04 21 */ bctrl +/* 802577E0 00254740 4E 80 04 21 */ bctrl /* 802577E4 00254744 C0 02 B9 9C */ lfs f0, lbl_805AD6BC@sda21(r2) /* 802577E8 00254748 38 80 00 01 */ li r4, 1 /* 802577EC 0025474C D0 03 00 00 */ stfs f0, 0(r3) @@ -6382,7 +6382,7 @@ lbl_802577FC: /* 8025783C 0025479C 80 01 00 34 */ lwz r0, 0x34(r1) /* 80257840 002547A0 7C 08 03 A6 */ mtlr r0 /* 80257844 002547A4 38 21 00 30 */ addi r1, r1, 0x30 -/* 80257848 002547A8 4E 80 00 20 */ blr +/* 80257848 002547A8 4E 80 00 20 */ blr .global sub_8025784c sub_8025784c: @@ -6427,7 +6427,7 @@ lbl_802578D0: /* 802578DC 0025483C 81 9F 00 00 */ lwz r12, 0(r31) /* 802578E0 00254840 81 8C 00 34 */ lwz r12, 0x34(r12) /* 802578E4 00254844 7D 89 03 A6 */ mtctr r12 -/* 802578E8 00254848 4E 80 04 21 */ bctrl +/* 802578E8 00254848 4E 80 04 21 */ bctrl /* 802578EC 0025484C C0 02 B9 9C */ lfs f0, lbl_805AD6BC@sda21(r2) /* 802578F0 00254850 38 80 00 01 */ li r4, 1 /* 802578F4 00254854 D0 03 00 00 */ stfs f0, 0(r3) @@ -6455,7 +6455,7 @@ lbl_80257904: /* 80257944 002548A4 80 01 00 34 */ lwz r0, 0x34(r1) /* 80257948 002548A8 7C 08 03 A6 */ mtlr r0 /* 8025794C 002548AC 38 21 00 30 */ addi r1, r1, 0x30 -/* 80257950 002548B0 4E 80 00 20 */ blr +/* 80257950 002548B0 4E 80 00 20 */ blr .global sub_80257954 sub_80257954: @@ -6492,7 +6492,7 @@ lbl_80257974: /* 802579C8 00254928 81 9D 00 00 */ lwz r12, 0(r29) /* 802579CC 0025492C 81 8C 00 34 */ lwz r12, 0x34(r12) /* 802579D0 00254930 7D 89 03 A6 */ mtctr r12 -/* 802579D4 00254934 4E 80 04 21 */ bctrl +/* 802579D4 00254934 4E 80 04 21 */ bctrl /* 802579D8 00254938 C0 02 B9 9C */ lfs f0, lbl_805AD6BC@sda21(r2) /* 802579DC 0025493C 38 80 00 01 */ li r4, 1 /* 802579E0 00254940 D0 03 00 00 */ stfs f0, 0(r3) @@ -6570,7 +6570,7 @@ lbl_80257AA0: /* 80257AF4 00254A54 81 9D 00 00 */ lwz r12, 0(r29) /* 80257AF8 00254A58 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80257AFC 00254A5C 7D 89 03 A6 */ mtctr r12 -/* 80257B00 00254A60 4E 80 04 21 */ bctrl +/* 80257B00 00254A60 4E 80 04 21 */ bctrl /* 80257B04 00254A64 C0 02 B9 9C */ lfs f0, lbl_805AD6BC@sda21(r2) /* 80257B08 00254A68 38 80 00 01 */ li r4, 1 /* 80257B0C 00254A6C D0 03 00 00 */ stfs f0, 0(r3) @@ -6625,7 +6625,7 @@ lbl_80257B70: /* 80257BC8 00254B28 80 01 00 84 */ lwz r0, 0x84(r1) /* 80257BCC 00254B2C 7C 08 03 A6 */ mtlr r0 /* 80257BD0 00254B30 38 21 00 80 */ addi r1, r1, 0x80 -/* 80257BD4 00254B34 4E 80 00 20 */ blr +/* 80257BD4 00254B34 4E 80 00 20 */ blr .global Render__7CRidleyCFRC13CStateManager Render__7CRidleyCFRC13CStateManager: @@ -6684,7 +6684,7 @@ lbl_80257C98: /* 80257CA0 00254C00 81 83 00 00 */ lwz r12, 0(r3) /* 80257CA4 00254C04 81 8C 00 FC */ lwz r12, 0xfc(r12) /* 80257CA8 00254C08 7D 89 03 A6 */ mtctr r12 -/* 80257CAC 00254C0C 4E 80 04 21 */ bctrl +/* 80257CAC 00254C0C 4E 80 04 21 */ bctrl /* 80257CB0 00254C10 88 7E 0A 31 */ lbz r3, 0xa31(r30) /* 80257CB4 00254C14 54 60 D7 FF */ rlwinm. r0, r3, 0x1a, 0x1f, 0x1f /* 80257CB8 00254C18 41 82 00 D0 */ beq lbl_80257D88 @@ -6792,7 +6792,7 @@ lbl_80257E1C: /* 80257E40 00254DA0 83 C1 00 F8 */ lwz r30, 0xf8(r1) /* 80257E44 00254DA4 7C 08 03 A6 */ mtlr r0 /* 80257E48 00254DA8 38 21 01 20 */ addi r1, r1, 0x120 -/* 80257E4C 00254DAC 4E 80 00 20 */ blr +/* 80257E4C 00254DAC 4E 80 00 20 */ blr .global PreRender__7CRidleyFR13CStateManagerRC14CFrustumPlanes PreRender__7CRidleyFR13CStateManagerRC14CFrustumPlanes: @@ -6996,7 +6996,7 @@ lbl_80258130: /* 8025813C 0025509C 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 80258140 002550A0 7C 08 03 A6 */ mtlr r0 /* 80258144 002550A4 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 80258148 002550A8 4E 80 00 20 */ blr +/* 80258148 002550A8 4E 80 00 20 */ blr .global AddToRenderer__7CRidleyCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__7CRidleyCFRC14CFrustumPlanesRC13CStateManager: @@ -7015,7 +7015,7 @@ AddToRenderer__7CRidleyCFRC14CFrustumPlanesRC13CStateManager: /* 8025817C 002550DC 38 61 00 08 */ addi r3, r1, 8 /* 80258180 002550E0 81 8C 00 5C */ lwz r12, 0x5c(r12) /* 80258184 002550E4 7D 89 03 A6 */ mtctr r12 -/* 80258188 002550E8 4E 80 04 21 */ bctrl +/* 80258188 002550E8 4E 80 04 21 */ bctrl /* 8025818C 002550EC 7F E3 FB 78 */ mr r3, r31 /* 80258190 002550F0 38 81 00 08 */ addi r4, r1, 8 /* 80258194 002550F4 48 0E CF F5 */ bl "BoxInFrustumPlanes__14CFrustumPlanesCFRCQ24rstl24optional_object<6CAABox>" @@ -7028,14 +7028,14 @@ AddToRenderer__7CRidleyCFRC14CFrustumPlanesRC13CStateManager: /* 802581B0 00255110 81 83 00 00 */ lwz r12, 0(r3) /* 802581B4 00255114 81 8C 00 34 */ lwz r12, 0x34(r12) /* 802581B8 00255118 7D 89 03 A6 */ mtctr r12 -/* 802581BC 0025511C 4E 80 04 21 */ bctrl +/* 802581BC 0025511C 4E 80 04 21 */ bctrl lbl_802581C0: /* 802581C0 00255120 80 01 00 34 */ lwz r0, 0x34(r1) /* 802581C4 00255124 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 802581C8 00255128 83 C1 00 28 */ lwz r30, 0x28(r1) /* 802581CC 0025512C 7C 08 03 A6 */ mtlr r0 /* 802581D0 00255130 38 21 00 30 */ addi r1, r1, 0x30 -/* 802581D4 00255134 4E 80 00 20 */ blr +/* 802581D4 00255134 4E 80 00 20 */ blr .global GetSortingBounds__7CRidleyCFRC12CTransform4f GetSortingBounds__7CRidleyCFRC12CTransform4f: @@ -7049,13 +7049,13 @@ GetSortingBounds__7CRidleyCFRC12CTransform4f: /* 802581F4 00255154 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802581F8 00255158 7C 08 03 A6 */ mtlr r0 /* 802581FC 0025515C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80258200 00255160 4E 80 00 20 */ blr +/* 80258200 00255160 4E 80 00 20 */ blr .global GetDamageVulnerability__7CRidleyCFv GetDamageVulnerability__7CRidleyCFv: /* 80258204 00255164 3C 60 80 57 */ lis r3, lbl_8056D718@ha /* 80258208 00255168 38 63 D7 18 */ addi r3, r3, lbl_8056D718@l -/* 8025820C 0025516C 4E 80 00 20 */ blr +/* 8025820C 0025516C 4E 80 00 20 */ blr .global DoUserAnimEvent__7CRidleyFR13CStateManagerRC13CInt32POINode14EUserEventType DoUserAnimEvent__7CRidleyFR13CStateManagerRC13CInt32POINode14EUserEventType: @@ -7082,7 +7082,7 @@ DoUserAnimEvent__7CRidleyFR13CStateManagerRC13CInt32POINode14EUserEventType: /* 80258260 002551C0 38 A5 95 24 */ addi r5, r5, lbl_803E9524@l /* 80258264 002551C4 7C 05 00 2E */ lwzx r0, r5, r0 /* 80258268 002551C8 7C 09 03 A6 */ mtctr r0 -/* 8025826C 002551CC 4E 80 04 20 */ bctr +/* 8025826C 002551CC 4E 80 04 20 */ bctr .global lbl_80258270 lbl_80258270: /* 80258270 002551D0 88 1C 0A 32 */ lbz r0, 0xa32(r28) @@ -7804,7 +7804,7 @@ lbl_80258CC0: /* 80258CDC 00255C3C 80 01 03 B4 */ lwz r0, 0x3b4(r1) /* 80258CE0 00255C40 7C 08 03 A6 */ mtlr r0 /* 80258CE4 00255C44 38 21 03 B0 */ addi r1, r1, 0x3b0 -/* 80258CE8 00255C48 4E 80 00 20 */ blr +/* 80258CE8 00255C48 4E 80 00 20 */ blr .global AcceptScriptMsg__7CRidleyF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__7CRidleyF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -7831,7 +7831,7 @@ AcceptScriptMsg__7CRidleyF20EScriptObjectMessage9TUniqueIdR13CStateManager: /* 80258D3C 00255C9C 38 63 95 A4 */ addi r3, r3, lbl_803E95A4@l /* 80258D40 00255CA0 7C 03 00 2E */ lwzx r0, r3, r0 /* 80258D44 00255CA4 7C 09 03 A6 */ mtctr r0 -/* 80258D48 00255CA8 4E 80 04 20 */ bctr +/* 80258D48 00255CA8 4E 80 04 20 */ bctr .global lbl_80258D4C lbl_80258D4C: /* 80258D4C 00255CAC 80 7F 04 50 */ lwz r3, 0x450(r31) @@ -7848,7 +7848,7 @@ lbl_80258D4C: /* 80258D78 00255CD8 81 9F 00 00 */ lwz r12, 0(r31) /* 80258D7C 00255CDC 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80258D80 00255CE0 7D 89 03 A6 */ mtctr r12 -/* 80258D84 00255CE4 4E 80 04 21 */ bctrl +/* 80258D84 00255CE4 4E 80 04 21 */ bctrl /* 80258D88 00255CE8 C0 03 00 00 */ lfs f0, 0(r3) /* 80258D8C 00255CEC C0 22 B9 1C */ lfs f1, lbl_805AD63C@sda21(r2) /* 80258D90 00255CF0 D0 1F 0C B8 */ stfs f0, 0xcb8(r31) @@ -7898,7 +7898,7 @@ lbl_80258DE4: /* 80258E30 00255D90 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80258E34 00255D94 EF E1 00 2A */ fadds f31, f1, f0 /* 80258E38 00255D98 7D 89 03 A6 */ mtctr r12 -/* 80258E3C 00255D9C 4E 80 04 21 */ bctrl +/* 80258E3C 00255D9C 4E 80 04 21 */ bctrl /* 80258E40 00255DA0 D3 E3 00 00 */ stfs f31, 0(r3) /* 80258E44 00255DA4 38 60 00 01 */ li r3, 1 /* 80258E48 00255DA8 C0 22 B9 B4 */ lfs f1, lbl_805AD6D4@sda21(r2) @@ -8136,7 +8136,7 @@ lbl_80259194: /* 802591C8 00256128 81 9D 00 00 */ lwz r12, 0(r29) /* 802591CC 0025612C 81 8C 00 34 */ lwz r12, 0x34(r12) /* 802591D0 00256130 7D 89 03 A6 */ mtctr r12 -/* 802591D4 00256134 4E 80 04 21 */ bctrl +/* 802591D4 00256134 4E 80 04 21 */ bctrl /* 802591D8 00256138 C0 03 00 00 */ lfs f0, 0(r3) /* 802591DC 0025613C 7F A3 EB 78 */ mr r3, r29 /* 802591E0 00256140 81 9D 00 00 */ lwz r12, 0(r29) @@ -8145,7 +8145,7 @@ lbl_80259194: /* 802591EC 0025614C 81 8C 00 34 */ lwz r12, 0x34(r12) /* 802591F0 00256150 EF E1 00 28 */ fsubs f31, f1, f0 /* 802591F4 00256154 7D 89 03 A6 */ mtctr r12 -/* 802591F8 00256158 4E 80 04 21 */ bctrl +/* 802591F8 00256158 4E 80 04 21 */ bctrl /* 802591FC 0025615C C0 02 B9 9C */ lfs f0, lbl_805AD6BC@sda21(r2) /* 80259200 00256160 3B 60 00 00 */ li r27, 0 /* 80259204 00256164 D0 03 00 00 */ stfs f0, 0(r3) @@ -8360,7 +8360,7 @@ lbl_80259510: /* 80259520 00256480 81 8C 00 90 */ lwz r12, 0x90(r12) /* 80259524 00256484 38 84 67 24 */ addi r4, r4, lbl_805A6724@l /* 80259528 00256488 7D 89 03 A6 */ mtctr r12 -/* 8025952C 0025648C 4E 80 04 21 */ bctrl +/* 8025952C 0025648C 4E 80 04 21 */ bctrl /* 80259530 00256490 C0 02 88 F0 */ lfs f0, lbl_805AA610@sda21(r2) /* 80259534 00256494 D0 1F 0B 20 */ stfs f0, 0xb20(r31) /* 80259538 00256498 88 1F 0A 32 */ lbz r0, 0xa32(r31) @@ -8568,7 +8568,7 @@ lbl_80259828: /* 80259844 002567A4 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80259848 002567A8 EF E1 00 2A */ fadds f31, f1, f0 /* 8025984C 002567AC 7D 89 03 A6 */ mtctr r12 -/* 80259850 002567B0 4E 80 04 21 */ bctrl +/* 80259850 002567B0 4E 80 04 21 */ bctrl /* 80259854 002567B4 57 60 06 3F */ clrlwi. r0, r27, 0x18 /* 80259858 002567B8 D3 E3 00 00 */ stfs f31, 0(r3) /* 8025985C 002567BC 40 82 04 50 */ bne lbl_80259CAC @@ -8609,7 +8609,7 @@ lbl_80259828: /* 802598E8 00256848 81 9F 00 00 */ lwz r12, 0(r31) /* 802598EC 0025684C 81 8C 00 88 */ lwz r12, 0x88(r12) /* 802598F0 00256850 7D 89 03 A6 */ mtctr r12 -/* 802598F4 00256854 4E 80 04 21 */ bctrl +/* 802598F4 00256854 4E 80 04 21 */ bctrl /* 802598F8 00256858 48 00 03 B4 */ b lbl_80259CAC .global lbl_802598FC lbl_802598FC: @@ -8766,7 +8766,7 @@ lbl_80259A58: /* 80259B3C 00256A9C 81 9B 00 00 */ lwz r12, 0(r27) /* 80259B40 00256AA0 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80259B44 00256AA4 7D 89 03 A6 */ mtctr r12 -/* 80259B48 00256AA8 4E 80 04 21 */ bctrl +/* 80259B48 00256AA8 4E 80 04 21 */ bctrl /* 80259B4C 00256AAC C0 03 00 00 */ lfs f0, 0(r3) /* 80259B50 00256AB0 3B 40 00 09 */ li r26, 9 /* 80259B54 00256AB4 C0 42 B9 28 */ lfs f2, lbl_805AD648@sda21(r2) @@ -8866,7 +8866,7 @@ lbl_80259CAC: /* 80259CC0 00256C20 80 01 03 54 */ lwz r0, 0x354(r1) /* 80259CC4 00256C24 7C 08 03 A6 */ mtlr r0 /* 80259CC8 00256C28 38 21 03 50 */ addi r1, r1, 0x350 -/* 80259CCC 00256C2C 4E 80 00 20 */ blr +/* 80259CCC 00256C2C 4E 80 00 20 */ blr .global Touch__7CRidleyFR6CActorR13CStateManager Touch__7CRidleyFR6CActorR13CStateManager: @@ -8877,7 +8877,7 @@ Touch__7CRidleyFR6CActorR13CStateManager: /* 80259CE0 00256C40 80 01 00 14 */ lwz r0, 0x14(r1) /* 80259CE4 00256C44 7C 08 03 A6 */ mtlr r0 /* 80259CE8 00256C48 38 21 00 10 */ addi r1, r1, 0x10 -/* 80259CEC 00256C4C 4E 80 00 20 */ blr +/* 80259CEC 00256C4C 4E 80 00 20 */ blr .global Accept__7CRidleyFR8IVisitor Accept__7CRidleyFR8IVisitor: @@ -8890,11 +8890,11 @@ Accept__7CRidleyFR8IVisitor: /* 80259D08 00256C68 7C 04 03 78 */ mr r4, r0 /* 80259D0C 00256C6C 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 80259D10 00256C70 7D 89 03 A6 */ mtctr r12 -/* 80259D14 00256C74 4E 80 04 21 */ bctrl +/* 80259D14 00256C74 4E 80 04 21 */ bctrl /* 80259D18 00256C78 80 01 00 14 */ lwz r0, 0x14(r1) /* 80259D1C 00256C7C 7C 08 03 A6 */ mtlr r0 /* 80259D20 00256C80 38 21 00 10 */ addi r1, r1, 0x10 -/* 80259D24 00256C84 4E 80 00 20 */ blr +/* 80259D24 00256C84 4E 80 00 20 */ blr .global "__ct__7CRidleyF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC6CAABoxRC10CModelDataRC14CPatternedInfoRC16CActorParametersRC12CInputStreamUi" "__ct__7CRidleyF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC6CAABoxRC10CModelDataRC14CPatternedInfoRC16CActorParametersRC12CInputStreamUi": @@ -8954,7 +8954,7 @@ Accept__7CRidleyFR8IVisitor: /* 80259DFC 00256D5C 81 84 00 00 */ lwz r12, 0(r4) /* 80259E00 00256D60 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80259E04 00256D64 7D 89 03 A6 */ mtctr r12 -/* 80259E08 00256D68 4E 80 04 21 */ bctrl +/* 80259E08 00256D68 4E 80 04 21 */ bctrl /* 80259E0C 00256D6C 3B 9F 09 8C */ addi r28, r31, 0x98c /* 80259E10 00256D70 38 81 00 94 */ addi r4, r1, 0x94 /* 80259E14 00256D74 7F 83 E3 78 */ mr r3, r28 @@ -9293,7 +9293,7 @@ Accept__7CRidleyFR8IVisitor: /* 8025A348 002572A8 81 9F 00 00 */ lwz r12, 0(r31) /* 8025A34C 002572AC 81 8C 02 B0 */ lwz r12, 0x2b0(r12) /* 8025A350 002572B0 7D 89 03 A6 */ mtctr r12 -/* 8025A354 002572B4 4E 80 04 21 */ bctrl +/* 8025A354 002572B4 4E 80 04 21 */ bctrl /* 8025A358 002572B8 80 01 01 28 */ lwz r0, 0x128(r1) /* 8025A35C 002572BC 3C 60 45 4C */ lis r3, 0x454C5343@ha /* 8025A360 002572C0 38 C0 00 00 */ li r6, 0 @@ -9331,7 +9331,7 @@ Accept__7CRidleyFR8IVisitor: /* 8025A3E0 00257340 81 84 00 00 */ lwz r12, 0(r4) /* 8025A3E4 00257344 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8025A3E8 00257348 7D 89 03 A6 */ mtctr r12 -/* 8025A3EC 0025734C 4E 80 04 21 */ bctrl +/* 8025A3EC 0025734C 4E 80 04 21 */ bctrl /* 8025A3F0 00257350 3B 9F 0C D0 */ addi r28, r31, 0xcd0 /* 8025A3F4 00257354 38 81 00 84 */ addi r4, r1, 0x84 /* 8025A3F8 00257358 7F 83 E3 78 */ mr r3, r28 @@ -9409,7 +9409,7 @@ lbl_8025A4D0: /* 8025A50C 0025746C 38 80 00 00 */ li r4, 0 /* 8025A510 00257470 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8025A514 00257474 7D 89 03 A6 */ mtctr r12 -/* 8025A518 00257478 4E 80 04 21 */ bctrl +/* 8025A518 00257478 4E 80 04 21 */ bctrl lbl_8025A51C: /* 8025A51C 0025747C 3C 60 80 47 */ lis r3, lbl_8046D7E0@ha /* 8025A520 00257480 3B BF 0C E4 */ addi r29, r31, 0xce4 @@ -9535,7 +9535,7 @@ lbl_8025A680: /* 8025A6E4 00257644 83 81 01 C0 */ lwz r28, 0x1c0(r1) /* 8025A6E8 00257648 7C 08 03 A6 */ mtlr r0 /* 8025A6EC 0025764C 38 21 01 D0 */ addi r1, r1, 0x1d0 -/* 8025A6F0 00257650 4E 80 00 20 */ blr +/* 8025A6F0 00257650 4E 80 00 20 */ blr .global sub_8025a6f4 sub_8025a6f4: @@ -9771,7 +9771,7 @@ lbl_8025AA14: /* 8025AA5C 002579BC 80 01 02 B4 */ lwz r0, 0x2b4(r1) /* 8025AA60 002579C0 7C 08 03 A6 */ mtlr r0 /* 8025AA64 002579C4 38 21 02 B0 */ addi r1, r1, 0x2b0 -/* 8025AA68 002579C8 4E 80 00 20 */ blr +/* 8025AA68 002579C8 4E 80 00 20 */ blr .global __sinit_CRidley_cpp __sinit_CRidley_cpp: @@ -11132,7 +11132,7 @@ __sinit_CRidley_cpp: /* 8025BF94 00258EF4 80 01 07 04 */ lwz r0, 0x704(r1) /* 8025BF98 00258EF8 7C 08 03 A6 */ mtlr r0 /* 8025BF9C 00258EFC 38 21 07 00 */ addi r1, r1, 0x700 -/* 8025BFA0 00258F00 4E 80 00 20 */ blr +/* 8025BFA0 00258F00 4E 80 00 20 */ blr .global sub_8025bfa4 sub_8025bfa4: diff --git a/asm/MetroidPrime/Enemies/CRipper.s b/asm/MetroidPrime/Enemies/CRipper.s index d737041d..6b78cd20 100644 --- a/asm/MetroidPrime/Enemies/CRipper.s +++ b/asm/MetroidPrime/Enemies/CRipper.s @@ -233,7 +233,7 @@ lbl_8015BE0C: /* 8015BE10 00158D70 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8015BE14 00158D74 7C 08 03 A6 */ mtlr r0 /* 8015BE18 00158D78 38 21 00 20 */ addi r1, r1, 0x20 -/* 8015BE1C 00158D7C 4E 80 00 20 */ blr +/* 8015BE1C 00158D7C 4E 80 00 20 */ blr .global AddPlatform__7CRipperFR13CStateManager AddPlatform__7CRipperFR13CStateManager: @@ -377,7 +377,7 @@ lbl_8015C020: /* 8015C024 00158F84 80 01 00 F4 */ lwz r0, 0xf4(r1) /* 8015C028 00158F88 7C 08 03 A6 */ mtlr r0 /* 8015C02C 00158F8C 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 8015C030 00158F90 4E 80 00 20 */ blr +/* 8015C030 00158F90 4E 80 00 20 */ blr .global sub_8015c034 sub_8015c034: @@ -424,7 +424,7 @@ lbl_8015C0C8: /* 8015C0D0 00159030 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8015C0D4 00159034 7C 08 03 A6 */ mtlr r0 /* 8015C0D8 00159038 38 21 00 20 */ addi r1, r1, 0x20 -/* 8015C0DC 0015903C 4E 80 00 20 */ blr +/* 8015C0DC 0015903C 4E 80 00 20 */ blr .global sub_8015c0e0 sub_8015c0e0: @@ -449,7 +449,7 @@ lbl_8015C120: /* 8015C124 00159084 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8015C128 00159088 7C 08 03 A6 */ mtlr r0 /* 8015C12C 0015908C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8015C130 00159090 4E 80 00 20 */ blr +/* 8015C130 00159090 4E 80 00 20 */ blr .global AddGrapplePoint__7CRipperFR13CStateManager AddGrapplePoint__7CRipperFR13CStateManager: @@ -539,7 +539,7 @@ lbl_8015C268: /* 8015C26C 001591CC 80 01 00 74 */ lwz r0, 0x74(r1) /* 8015C270 001591D0 7C 08 03 A6 */ mtlr r0 /* 8015C274 001591D4 38 21 00 70 */ addi r1, r1, 0x70 -/* 8015C278 001591D8 4E 80 00 20 */ blr +/* 8015C278 001591D8 4E 80 00 20 */ blr .global Patrol__7CRipperFR13CStateManager9EStateMsgf Patrol__7CRipperFR13CStateManager9EStateMsgf: @@ -576,12 +576,12 @@ Patrol__7CRipperFR13CStateManager9EStateMsgf: /* 8015C2F4 00159254 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8015C2F8 00159258 7C 08 03 A6 */ mtlr r0 /* 8015C2FC 0015925C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8015C300 00159260 4E 80 00 20 */ blr +/* 8015C300 00159260 4E 80 00 20 */ blr .global PathOver__7CRipperFR13CStateManagerf PathOver__7CRipperFR13CStateManagerf: /* 8015C304 00159264 38 60 00 00 */ li r3, 0 -/* 8015C308 00159268 4E 80 00 20 */ blr +/* 8015C308 00159268 4E 80 00 20 */ blr .global KnockBack__7CRipperFRC9CVector3fR13CStateManagerRC11CDamageInfo14EKnockBackTypef KnockBack__7CRipperFRC9CVector3fR13CStateManagerRC11CDamageInfo14EKnockBackTypef: @@ -638,7 +638,7 @@ KnockBack__7CRipperFRC9CVector3fR13CStateManagerRC11CDamageInfo14EKnockBackTypef /* 8015C3D4 00159334 80 01 00 34 */ lwz r0, 0x34(r1) /* 8015C3D8 00159338 7C 08 03 A6 */ mtlr r0 /* 8015C3DC 0015933C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8015C3E0 00159340 4E 80 00 20 */ blr +/* 8015C3E0 00159340 4E 80 00 20 */ blr .global GetCollisionResponseType__7CRipperFRC9CVector3fRC9CVector3fRC11CWeaponModei GetCollisionResponseType__7CRipperFRC9CVector3fRC9CVector3fRC11CWeaponModei: @@ -652,7 +652,7 @@ GetCollisionResponseType__7CRipperFRC9CVector3fRC9CVector3fRC11CWeaponModei: /* 8015C400 00159360 81 83 00 00 */ lwz r12, 0(r3) /* 8015C404 00159364 81 8C 00 38 */ lwz r12, 0x38(r12) /* 8015C408 00159368 7D 89 03 A6 */ mtctr r12 -/* 8015C40C 0015936C 4E 80 04 21 */ bctrl +/* 8015C40C 0015936C 4E 80 04 21 */ bctrl /* 8015C410 00159370 7F C4 F3 78 */ mr r4, r30 /* 8015C414 00159374 38 A0 00 00 */ li r5, 0 /* 8015C418 00159378 4B FA 61 6D */ bl WeaponHits__20CDamageVulnerabilityCFRC11CWeaponModei @@ -666,7 +666,7 @@ lbl_8015C428: /* 8015C434 00159394 83 C1 00 08 */ lwz r30, 8(r1) /* 8015C438 00159398 7C 08 03 A6 */ mtlr r0 /* 8015C43C 0015939C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8015C440 001593A0 4E 80 00 20 */ blr +/* 8015C440 001593A0 4E 80 00 20 */ blr .global AcceptScriptMsg__7CRipperF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__7CRipperF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -753,7 +753,7 @@ lbl_8015C55C: /* 8015C568 001594C8 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8015C56C 001594CC 7C 08 03 A6 */ mtlr r0 /* 8015C570 001594D0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8015C574 001594D4 4E 80 00 20 */ blr +/* 8015C574 001594D4 4E 80 00 20 */ blr .global Think__7CRipperFfR13CStateManager Think__7CRipperFfR13CStateManager: @@ -833,7 +833,7 @@ lbl_8015C67C: /* 8015C688 001595E8 83 C1 00 10 */ lwz r30, 0x10(r1) /* 8015C68C 001595EC 7C 08 03 A6 */ mtlr r0 /* 8015C690 001595F0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8015C694 001595F4 4E 80 00 20 */ blr +/* 8015C694 001595F4 4E 80 00 20 */ blr .global Accept__7CRipperFR8IVisitor Accept__7CRipperFR8IVisitor: @@ -846,11 +846,11 @@ Accept__7CRipperFR8IVisitor: /* 8015C6B0 00159610 7C 04 03 78 */ mr r4, r0 /* 8015C6B4 00159614 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 8015C6B8 00159618 7D 89 03 A6 */ mtctr r12 -/* 8015C6BC 0015961C 4E 80 04 21 */ bctrl +/* 8015C6BC 0015961C 4E 80 04 21 */ bctrl /* 8015C6C0 00159620 80 01 00 14 */ lwz r0, 0x14(r1) /* 8015C6C4 00159624 7C 08 03 A6 */ mtlr r0 /* 8015C6C8 00159628 38 21 00 10 */ addi r1, r1, 0x10 -/* 8015C6CC 0015962C 4E 80 00 20 */ blr +/* 8015C6CC 0015962C 4E 80 00 20 */ blr .global __dt__7CRipperFv __dt__7CRipperFv: @@ -878,7 +878,7 @@ lbl_8015C714: /* 8015C720 00159680 83 C1 00 08 */ lwz r30, 8(r1) /* 8015C724 00159684 7C 08 03 A6 */ mtlr r0 /* 8015C728 00159688 38 21 00 10 */ addi r1, r1, 0x10 -/* 8015C72C 0015968C 4E 80 00 20 */ blr +/* 8015C72C 0015968C 4E 80 00 20 */ blr .global "__ct__7CRipperF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>Q210CPatterned11EFlavorTypeRC11CEntityInfoRC12CTransform4fRC10CModelDataRC14CPatternedInfoRC16CActorParametersRC18CGrappleParameters" "__ct__7CRipperF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>Q210CPatterned11EFlavorTypeRC11CEntityInfoRC12CTransform4fRC10CModelDataRC14CPatternedInfoRC16CActorParametersRC18CGrappleParameters": diff --git a/asm/MetroidPrime/Enemies/CRipperControlledPlatform.s b/asm/MetroidPrime/Enemies/CRipperControlledPlatform.s index 3a42d61c..f56bb9a8 100644 --- a/asm/MetroidPrime/Enemies/CRipperControlledPlatform.s +++ b/asm/MetroidPrime/Enemies/CRipperControlledPlatform.s @@ -70,7 +70,7 @@ lbl_80232804: /* 80232810 0022F770 83 C1 00 08 */ lwz r30, 8(r1) /* 80232814 0022F774 7C 08 03 A6 */ mtlr r0 /* 80232818 0022F778 38 21 00 10 */ addi r1, r1, 0x10 -/* 8023281C 0022F77C 4E 80 00 20 */ blr +/* 8023281C 0022F77C 4E 80 00 20 */ blr .global Move__25CRipperControlledPlatformFR13CStateManager Move__25CRipperControlledPlatformFR13CStateManager: @@ -311,7 +311,7 @@ lbl_80232B78: /* 80232B88 0022FAE8 80 01 10 C4 */ lwz r0, 0x10c4(r1) /* 80232B8C 0022FAEC 7C 08 03 A6 */ mtlr r0 /* 80232B90 0022FAF0 38 21 10 C0 */ addi r1, r1, 0x10c0 -/* 80232B94 0022FAF4 4E 80 00 20 */ blr +/* 80232B94 0022FAF4 4E 80 00 20 */ blr .global "__ct__25CRipperControlledPlatformF9TUniqueId9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC6CAABoxbRCQ24rstl58optional_object<39TLockedToken<23CCollidableOBBTreeGroup>>" "__ct__25CRipperControlledPlatformF9TUniqueId9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC6CAABoxbRCQ24rstl58optional_object<39TLockedToken<23CCollidableOBBTreeGroup>>": diff --git a/asm/MetroidPrime/Enemies/CSeedling.s b/asm/MetroidPrime/Enemies/CSeedling.s index 00b877b9..d0e35587 100644 --- a/asm/MetroidPrime/Enemies/CSeedling.s +++ b/asm/MetroidPrime/Enemies/CSeedling.s @@ -213,7 +213,7 @@ lbl_805A83F8: .global GetSearchPath__9CSeedlingFv GetSearchPath__9CSeedlingFv: /* 80266040 00262FA0 38 63 05 D8 */ addi r3, r3, 0x5d8 -/* 80266044 00262FA4 4E 80 00 20 */ blr +/* 80266044 00262FA4 4E 80 00 20 */ blr .global sub_80266048 sub_80266048: @@ -266,7 +266,7 @@ lbl_802660E8: /* 802660FC 0026305C 83 C1 00 38 */ lwz r30, 0x38(r1) /* 80266100 00263060 7C 08 03 A6 */ mtlr r0 /* 80266104 00263064 38 21 00 40 */ addi r1, r1, 0x40 -/* 80266108 00263068 4E 80 00 20 */ blr +/* 80266108 00263068 4E 80 00 20 */ blr .global Touch__9CSeedlingFR6CActorR13CStateManager Touch__9CSeedlingFR6CActorR13CStateManager: @@ -292,7 +292,7 @@ Touch__9CSeedlingFR6CActorR13CStateManager: /* 80266158 002630B8 81 9D 00 00 */ lwz r12, 0(r29) /* 8026615C 002630BC 81 8C 02 98 */ lwz r12, 0x298(r12) /* 80266160 002630C0 7D 89 03 A6 */ mtctr r12 -/* 80266164 002630C4 4E 80 04 21 */ bctrl +/* 80266164 002630C4 4E 80 04 21 */ bctrl lbl_80266168: /* 80266168 002630C8 7F A3 EB 78 */ mr r3, r29 /* 8026616C 002630CC 7F C4 F3 78 */ mr r4, r30 @@ -304,7 +304,7 @@ lbl_80266168: /* 80266184 002630E4 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80266188 002630E8 7C 08 03 A6 */ mtlr r0 /* 8026618C 002630EC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80266190 002630F0 4E 80 00 20 */ blr +/* 80266190 002630F0 4E 80 00 20 */ blr .global GetTouchBounds__9CSeedlingCFv GetTouchBounds__9CSeedlingCFv: @@ -339,7 +339,7 @@ lbl_802661FC: /* 80266200 00263160 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 80266204 00263164 7C 08 03 A6 */ mtlr r0 /* 80266208 00263168 38 21 00 30 */ addi r1, r1, 0x30 -/* 8026620C 0026316C 4E 80 00 20 */ blr +/* 8026620C 0026316C 4E 80 00 20 */ blr .global ShouldAttack__9CSeedlingFR13CStateManagerf ShouldAttack__9CSeedlingFR13CStateManagerf: @@ -370,7 +370,7 @@ lbl_80266264: /* 8026626C 002631CC 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80266270 002631D0 7C 08 03 A6 */ mtlr r0 /* 80266274 002631D4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80266278 002631D8 4E 80 00 20 */ blr +/* 80266278 002631D8 4E 80 00 20 */ blr .global sub_8026627c sub_8026627c: @@ -453,7 +453,7 @@ lbl_8026636C: /* 802663A4 00263304 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 802663A8 00263308 7C 08 03 A6 */ mtlr r0 /* 802663AC 0026330C 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 802663B0 00263310 4E 80 00 20 */ blr +/* 802663B0 00263310 4E 80 00 20 */ blr .global DoUserAnimEvent__9CSeedlingFR13CStateManagerRC13CInt32POINode14EUserEventType DoUserAnimEvent__9CSeedlingFR13CStateManagerRC13CInt32POINode14EUserEventType: @@ -505,12 +505,12 @@ lbl_80266444: /* 80266458 002633B8 83 81 00 08 */ lwz r28, 8(r1) /* 8026645C 002633BC 7C 08 03 A6 */ mtlr r0 /* 80266460 002633C0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80266464 002633C4 4E 80 00 20 */ blr +/* 80266464 002633C4 4E 80 00 20 */ blr .global GetProjectileInfo__9CSeedlingCF GetProjectileInfo__9CSeedlingCF: /* 80266468 002633C8 38 63 06 C0 */ addi r3, r3, 0x6c0 -/* 8026646C 002633CC 4E 80 00 20 */ blr +/* 8026646C 002633CC 4E 80 00 20 */ blr .global Generate__9CSeedlingFR13CStateManager9EStateMsgf Generate__9CSeedlingFR13CStateManager9EStateMsgf: @@ -552,7 +552,7 @@ lbl_802664E8: /* 802664E8 00263448 80 01 00 24 */ lwz r0, 0x24(r1) /* 802664EC 0026344C 7C 08 03 A6 */ mtlr r0 /* 802664F0 00263450 38 21 00 20 */ addi r1, r1, 0x20 -/* 802664F4 00263454 4E 80 00 20 */ blr +/* 802664F4 00263454 4E 80 00 20 */ blr .global ProjectileAttack__9CSeedlingFR13CStateManager9EStateMsgf ProjectileAttack__9CSeedlingFR13CStateManager9EStateMsgf: @@ -603,7 +603,7 @@ lbl_80266590: /* 80266594 002634F4 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80266598 002634F8 7C 08 03 A6 */ mtlr r0 /* 8026659C 002634FC 38 21 00 20 */ addi r1, r1, 0x20 -/* 802665A0 00263500 4E 80 00 20 */ blr +/* 802665A0 00263500 4E 80 00 20 */ blr .global Enraged__9CSeedlingFR13CStateManager9EStateMsgf Enraged__9CSeedlingFR13CStateManager9EStateMsgf: @@ -622,7 +622,7 @@ lbl_802665CC: /* 802665CC 0026352C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802665D0 00263530 7C 08 03 A6 */ mtlr r0 /* 802665D4 00263534 38 21 00 10 */ addi r1, r1, 0x10 -/* 802665D8 00263538 4E 80 00 20 */ blr +/* 802665D8 00263538 4E 80 00 20 */ blr .global Active__9CSeedlingFR13CStateManager9EStateMsgf Active__9CSeedlingFR13CStateManager9EStateMsgf: @@ -657,7 +657,7 @@ lbl_80266620: /* 80266644 002635A4 83 A1 00 0C */ lwz r29, 0xc(r1) /* 80266648 002635A8 7C 08 03 A6 */ mtlr r0 /* 8026664C 002635AC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80266650 002635B0 4E 80 00 20 */ blr +/* 80266650 002635B0 4E 80 00 20 */ blr .global Patrol__9CSeedlingFR13CStateManager9EStateMsgf Patrol__9CSeedlingFR13CStateManager9EStateMsgf: @@ -849,7 +849,7 @@ lbl_80266914: /* 8026691C 0026387C 83 C1 00 D8 */ lwz r30, 0xd8(r1) /* 80266920 00263880 7C 08 03 A6 */ mtlr r0 /* 80266924 00263884 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 80266928 00263888 4E 80 00 20 */ blr +/* 80266928 00263888 4E 80 00 20 */ blr .global Think__9CSeedlingFfR13CStateManager Think__9CSeedlingFfR13CStateManager: @@ -1036,7 +1036,7 @@ lbl_80266BCC: /* 80266BE4 00263B44 83 C1 00 A8 */ lwz r30, 0xa8(r1) /* 80266BE8 00263B48 7C 08 03 A6 */ mtlr r0 /* 80266BEC 00263B4C 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 80266BF0 00263B50 4E 80 00 20 */ blr +/* 80266BF0 00263B50 4E 80 00 20 */ blr .global Render__9CSeedlingCFRC13CStateManager Render__9CSeedlingCFRC13CStateManager: @@ -1119,7 +1119,7 @@ lbl_80266CFC: /* 80266D0C 00263C6C 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 80266D10 00263C70 7C 08 03 A6 */ mtlr r0 /* 80266D14 00263C74 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 80266D18 00263C78 4E 80 00 20 */ blr +/* 80266D18 00263C78 4E 80 00 20 */ blr .global AcceptScriptMsg__9CSeedlingF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__9CSeedlingF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -1202,7 +1202,7 @@ lbl_80266E2C: /* 80266E38 00263D98 83 A1 00 34 */ lwz r29, 0x34(r1) /* 80266E3C 00263D9C 7C 08 03 A6 */ mtlr r0 /* 80266E40 00263DA0 38 21 00 40 */ addi r1, r1, 0x40 -/* 80266E44 00263DA4 4E 80 00 20 */ blr +/* 80266E44 00263DA4 4E 80 00 20 */ blr .global __dt__9CSeedlingFv __dt__9CSeedlingFv: @@ -1277,7 +1277,7 @@ lbl_80266F2C: /* 80266F38 00263E98 83 C1 00 08 */ lwz r30, 8(r1) /* 80266F3C 00263E9C 7C 08 03 A6 */ mtlr r0 /* 80266F40 00263EA0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80266F44 00263EA4 4E 80 00 20 */ blr +/* 80266F44 00263EA4 4E 80 00 20 */ blr .global __ct__9CSeedlingF __ct__9CSeedlingF: diff --git a/asm/MetroidPrime/Enemies/CSnakeWeedSwarm.s b/asm/MetroidPrime/Enemies/CSnakeWeedSwarm.s index 92aa6aff..98bcf43c 100644 --- a/asm/MetroidPrime/Enemies/CSnakeWeedSwarm.s +++ b/asm/MetroidPrime/Enemies/CSnakeWeedSwarm.s @@ -113,7 +113,7 @@ __dt__15CSnakeWeedSwarmFv: /* 8023B534 00238494 38 80 00 01 */ li r4, 1 /* 8023B538 00238498 81 8C 00 08 */ lwz r12, 8(r12) /* 8023B53C 0023849C 7D 89 03 A6 */ mtctr r12 -/* 8023B540 002384A0 4E 80 04 21 */ bctrl +/* 8023B540 002384A0 4E 80 04 21 */ bctrl lbl_8023B544: /* 8023B544 002384A4 34 1E 01 EC */ addic. r0, r30, 0x1ec /* 8023B548 002384A8 41 82 00 30 */ beq lbl_8023B578 @@ -127,7 +127,7 @@ lbl_8023B544: /* 8023B568 002384C8 38 80 00 01 */ li r4, 1 /* 8023B56C 002384CC 81 8C 00 08 */ lwz r12, 8(r12) /* 8023B570 002384D0 7D 89 03 A6 */ mtctr r12 -/* 8023B574 002384D4 4E 80 04 21 */ bctrl +/* 8023B574 002384D4 4E 80 04 21 */ bctrl lbl_8023B578: /* 8023B578 002384D8 34 1E 01 E4 */ addic. r0, r30, 0x1e4 /* 8023B57C 002384DC 41 82 00 34 */ beq lbl_8023B5B0 @@ -324,7 +324,7 @@ lbl_8023B7F0: /* 8023B804 00238764 83 81 00 40 */ lwz r28, 0x40(r1) /* 8023B808 00238768 7C 08 03 A6 */ mtlr r0 /* 8023B80C 0023876C 38 21 00 50 */ addi r1, r1, 0x50 -/* 8023B810 00238770 4E 80 00 20 */ blr +/* 8023B810 00238770 4E 80 00 20 */ blr .global sub_8023b814 sub_8023b814: @@ -342,13 +342,13 @@ sub_8023b814: /* 8023B840 002387A0 38 80 00 01 */ li r4, 1 /* 8023B844 002387A4 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8023B848 002387A8 7D 89 03 A6 */ mtctr r12 -/* 8023B84C 002387AC 4E 80 04 21 */ bctrl +/* 8023B84C 002387AC 4E 80 04 21 */ bctrl /* 8023B850 002387B0 80 7E 01 F0 */ lwz r3, 0x1f0(r30) /* 8023B854 002387B4 7F E4 FB 78 */ mr r4, r31 /* 8023B858 002387B8 81 83 00 00 */ lwz r12, 0(r3) /* 8023B85C 002387BC 81 8C 00 18 */ lwz r12, 0x18(r12) /* 8023B860 002387C0 7D 89 03 A6 */ mtctr r12 -/* 8023B864 002387C4 4E 80 04 21 */ bctrl +/* 8023B864 002387C4 4E 80 04 21 */ bctrl /* 8023B868 002387C8 80 7E 01 F0 */ lwz r3, 0x1f0(r30) /* 8023B86C 002387CC 80 9E 01 FC */ lwz r4, 0x1fc(r30) /* 8023B870 002387D0 48 0E 10 51 */ bl ForceParticleCreation__11CElementGenFi @@ -357,14 +357,14 @@ sub_8023b814: /* 8023B87C 002387DC 81 83 00 00 */ lwz r12, 0(r3) /* 8023B880 002387E0 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8023B884 002387E4 7D 89 03 A6 */ mtctr r12 -/* 8023B888 002387E8 4E 80 04 21 */ bctrl +/* 8023B888 002387E8 4E 80 04 21 */ bctrl lbl_8023B88C: /* 8023B88C 002387EC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8023B890 002387F0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8023B894 002387F4 83 C1 00 08 */ lwz r30, 8(r1) /* 8023B898 002387F8 7C 08 03 A6 */ mtlr r0 /* 8023B89C 002387FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8023B8A0 00238800 4E 80 00 20 */ blr +/* 8023B8A0 00238800 4E 80 00 20 */ blr .global sub_8023b8a4 sub_8023b8a4: @@ -382,13 +382,13 @@ sub_8023b8a4: /* 8023B8D0 00238830 38 80 00 01 */ li r4, 1 /* 8023B8D4 00238834 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8023B8D8 00238838 7D 89 03 A6 */ mtctr r12 -/* 8023B8DC 0023883C 4E 80 04 21 */ bctrl +/* 8023B8DC 0023883C 4E 80 04 21 */ bctrl /* 8023B8E0 00238840 80 7E 01 F8 */ lwz r3, 0x1f8(r30) /* 8023B8E4 00238844 7F E4 FB 78 */ mr r4, r31 /* 8023B8E8 00238848 81 83 00 00 */ lwz r12, 0(r3) /* 8023B8EC 0023884C 81 8C 00 18 */ lwz r12, 0x18(r12) /* 8023B8F0 00238850 7D 89 03 A6 */ mtctr r12 -/* 8023B8F4 00238854 4E 80 04 21 */ bctrl +/* 8023B8F4 00238854 4E 80 04 21 */ bctrl /* 8023B8F8 00238858 80 7E 01 F8 */ lwz r3, 0x1f8(r30) /* 8023B8FC 0023885C 38 80 00 01 */ li r4, 1 /* 8023B900 00238860 48 0E 0F C1 */ bl ForceParticleCreation__11CElementGenFi @@ -397,14 +397,14 @@ sub_8023b8a4: /* 8023B90C 0023886C 81 83 00 00 */ lwz r12, 0(r3) /* 8023B910 00238870 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8023B914 00238874 7D 89 03 A6 */ mtctr r12 -/* 8023B918 00238878 4E 80 04 21 */ bctrl +/* 8023B918 00238878 4E 80 04 21 */ bctrl lbl_8023B91C: /* 8023B91C 0023887C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8023B920 00238880 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8023B924 00238884 83 C1 00 08 */ lwz r30, 8(r1) /* 8023B928 00238888 7C 08 03 A6 */ mtlr r0 /* 8023B92C 0023888C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8023B930 00238890 4E 80 00 20 */ blr +/* 8023B930 00238890 4E 80 00 20 */ blr .global sub_8023b934 sub_8023b934: @@ -578,7 +578,7 @@ lbl_8023BB9C: /* 8023BBB8 00238B18 83 A1 00 D4 */ lwz r29, 0xd4(r1) /* 8023BBBC 00238B1C 7C 08 03 A6 */ mtlr r0 /* 8023BBC0 00238B20 38 21 01 00 */ addi r1, r1, 0x100 -/* 8023BBC4 00238B24 4E 80 00 20 */ blr +/* 8023BBC4 00238B24 4E 80 00 20 */ blr .global sub_8023bbc8 sub_8023bbc8: @@ -609,7 +609,7 @@ sub_8023bbc8: /* 8023BC28 00238B88 EC 02 00 78 */ fmsubs f0, f2, f1, f0 /* 8023BC2C 00238B8C EC 23 00 32 */ fmuls f1, f3, f0 /* 8023BC30 00238B90 38 21 00 20 */ addi r1, r1, 0x20 -/* 8023BC34 00238B94 4E 80 00 20 */ blr +/* 8023BC34 00238B94 4E 80 00 20 */ blr .global sub_8023bc38 sub_8023bc38: @@ -640,7 +640,7 @@ sub_8023bc38: /* 8023BC98 00238BF8 EC 02 00 78 */ fmsubs f0, f2, f1, f0 /* 8023BC9C 00238BFC EC 23 00 32 */ fmuls f1, f3, f0 /* 8023BCA0 00238C00 38 21 00 20 */ addi r1, r1, 0x20 -/* 8023BCA4 00238C04 4E 80 00 20 */ blr +/* 8023BCA4 00238C04 4E 80 00 20 */ blr .global sub_8023bca8 sub_8023bca8: @@ -853,7 +853,7 @@ lbl_8023BFA4: /* 8023BFA8 00238F08 80 01 00 D4 */ lwz r0, 0xd4(r1) /* 8023BFAC 00238F0C 7C 08 03 A6 */ mtlr r0 /* 8023BFB0 00238F10 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 8023BFB4 00238F14 4E 80 00 20 */ blr +/* 8023BFB4 00238F14 4E 80 00 20 */ blr .global sub_8023bfb8 sub_8023bfb8: @@ -943,7 +943,7 @@ lbl_8023C0DC: /* 8023C0EC 0023904C 83 81 00 30 */ lwz r28, 0x30(r1) /* 8023C0F0 00239050 7C 08 03 A6 */ mtlr r0 /* 8023C0F4 00239054 38 21 00 40 */ addi r1, r1, 0x40 -/* 8023C0F8 00239058 4E 80 00 20 */ blr +/* 8023C0F8 00239058 4E 80 00 20 */ blr .global sub_8023c0fc sub_8023c0fc: @@ -968,7 +968,7 @@ sub_8023c0fc: /* 8023C144 002390A4 80 01 00 34 */ lwz r0, 0x34(r1) /* 8023C148 002390A8 7C 08 03 A6 */ mtlr r0 /* 8023C14C 002390AC 38 21 00 30 */ addi r1, r1, 0x30 -/* 8023C150 002390B0 4E 80 00 20 */ blr +/* 8023C150 002390B0 4E 80 00 20 */ blr .global sub_8023c154 sub_8023c154: @@ -993,7 +993,7 @@ sub_8023c154: /* 8023C19C 002390FC 80 01 00 34 */ lwz r0, 0x34(r1) /* 8023C1A0 00239100 7C 08 03 A6 */ mtlr r0 /* 8023C1A4 00239104 38 21 00 30 */ addi r1, r1, 0x30 -/* 8023C1A8 00239108 4E 80 00 20 */ blr +/* 8023C1A8 00239108 4E 80 00 20 */ blr .global sub_8023c1ac sub_8023c1ac: @@ -1031,7 +1031,7 @@ sub_8023c1ac: /* 8023C228 00239188 83 A1 00 34 */ lwz r29, 0x34(r1) /* 8023C22C 0023918C 7C 08 03 A6 */ mtlr r0 /* 8023C230 00239190 38 21 00 40 */ addi r1, r1, 0x40 -/* 8023C234 00239194 4E 80 00 20 */ blr +/* 8023C234 00239194 4E 80 00 20 */ blr .global sub_8023c238 sub_8023c238: @@ -1200,7 +1200,7 @@ lbl_8023C488: /* 8023C4AC 0023940C 83 A1 00 E4 */ lwz r29, 0xe4(r1) /* 8023C4B0 00239410 7C 08 03 A6 */ mtlr r0 /* 8023C4B4 00239414 38 21 01 20 */ addi r1, r1, 0x120 -/* 8023C4B8 00239418 4E 80 00 20 */ blr +/* 8023C4B8 00239418 4E 80 00 20 */ blr .global sub_8023c4bc sub_8023c4bc: @@ -1260,7 +1260,7 @@ lbl_8023C568: /* 8023C574 002394D4 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8023C578 002394D8 7C 08 03 A6 */ mtlr r0 /* 8023C57C 002394DC 38 21 00 30 */ addi r1, r1, 0x30 -/* 8023C580 002394E0 4E 80 00 20 */ blr +/* 8023C580 002394E0 4E 80 00 20 */ blr .global AddToRenderer__15CSnakeWeedSwarmCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__15CSnakeWeedSwarmCFRC14CFrustumPlanesRC13CStateManager: @@ -1281,7 +1281,7 @@ AddToRenderer__15CSnakeWeedSwarmCFRC14CFrustumPlanesRC13CStateManager: /* 8023C5BC 0023951C 81 83 00 00 */ lwz r12, 0(r3) /* 8023C5C0 00239520 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8023C5C4 00239524 7D 89 03 A6 */ mtctr r12 -/* 8023C5C8 00239528 4E 80 04 21 */ bctrl +/* 8023C5C8 00239528 4E 80 04 21 */ bctrl lbl_8023C5CC: /* 8023C5CC 0023952C 80 9D 01 F8 */ lwz r4, 0x1f8(r29) /* 8023C5D0 00239530 28 04 00 00 */ cmplwi r4, 0 @@ -1290,7 +1290,7 @@ lbl_8023C5CC: /* 8023C5DC 0023953C 81 83 00 00 */ lwz r12, 0(r3) /* 8023C5E0 00239540 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8023C5E4 00239544 7D 89 03 A6 */ mtctr r12 -/* 8023C5E8 00239548 4E 80 04 21 */ bctrl +/* 8023C5E8 00239548 4E 80 04 21 */ bctrl lbl_8023C5EC: /* 8023C5EC 0023954C 80 7D 00 90 */ lwz r3, 0x90(r29) /* 8023C5F0 00239550 38 00 FF FF */ li r0, -1 @@ -1307,7 +1307,7 @@ lbl_8023C608: /* 8023C618 00239578 81 83 00 00 */ lwz r12, 0(r3) /* 8023C61C 0023957C 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 8023C620 00239580 7D 89 03 A6 */ mtctr r12 -/* 8023C624 00239584 4E 80 04 21 */ bctrl +/* 8023C624 00239584 4E 80 04 21 */ bctrl lbl_8023C628: /* 8023C628 00239588 83 FD 01 3C */ lwz r31, 0x13c(r29) /* 8023C62C 0023958C 3B C0 00 00 */ li r30, 0 @@ -1335,7 +1335,7 @@ lbl_8023C66C: /* 8023C678 002395D8 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8023C67C 002395DC 7C 08 03 A6 */ mtlr r0 /* 8023C680 002395E0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8023C684 002395E4 4E 80 00 20 */ blr +/* 8023C684 002395E4 4E 80 00 20 */ blr .global sub_8023c688 sub_8023c688: @@ -1410,7 +1410,7 @@ lbl_8023C724: /* 8023C794 002396F4 81 83 00 00 */ lwz r12, 0(r3) /* 8023C798 002396F8 81 8C 00 30 */ lwz r12, 0x30(r12) /* 8023C79C 002396FC 7D 89 03 A6 */ mtctr r12 -/* 8023C7A0 00239700 4E 80 04 21 */ bctrl +/* 8023C7A0 00239700 4E 80 04 21 */ bctrl /* 8023C7A4 00239704 C0 22 B7 74 */ lfs f1, lbl_805AD494@sda21(r2) /* 8023C7A8 00239708 38 80 00 00 */ li r4, 0 /* 8023C7AC 0023970C 38 00 00 03 */ li r0, 3 @@ -1437,7 +1437,7 @@ lbl_8023C724: /* 8023C800 00239760 80 01 01 34 */ lwz r0, 0x134(r1) /* 8023C804 00239764 7C 08 03 A6 */ mtlr r0 /* 8023C808 00239768 38 21 01 30 */ addi r1, r1, 0x130 -/* 8023C80C 0023976C 4E 80 00 20 */ blr +/* 8023C80C 0023976C 4E 80 00 20 */ blr .global PreRender__15CSnakeWeedSwarmFR13CStateManagerRC14CFrustumPlanes PreRender__15CSnakeWeedSwarmFR13CStateManagerRC14CFrustumPlanes: @@ -1573,7 +1573,7 @@ lbl_8023C9E4: /* 8023C9F4 00239954 83 81 00 30 */ lwz r28, 0x30(r1) /* 8023C9F8 00239958 7C 08 03 A6 */ mtlr r0 /* 8023C9FC 0023995C 38 21 00 40 */ addi r1, r1, 0x40 -/* 8023CA00 00239960 4E 80 00 20 */ blr +/* 8023CA00 00239960 4E 80 00 20 */ blr .global ApplyRadiusDamage__15CSnakeWeedSwarmF9CVector3ffR13CStateManager ApplyRadiusDamage__15CSnakeWeedSwarmF9CVector3ffR13CStateManager: @@ -1595,7 +1595,7 @@ lbl_8023CA38: /* 8023CA38 00239998 80 01 00 14 */ lwz r0, 0x14(r1) /* 8023CA3C 0023999C 7C 08 03 A6 */ mtlr r0 /* 8023CA40 002399A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8023CA44 002399A4 4E 80 00 20 */ blr +/* 8023CA44 002399A4 4E 80 00 20 */ blr .global sub_8023ca48 sub_8023ca48: @@ -1690,7 +1690,7 @@ lbl_8023CB68: /* 8023CB98 00239AF8 83 81 00 20 */ lwz r28, 0x20(r1) /* 8023CB9C 00239AFC 7C 08 03 A6 */ mtlr r0 /* 8023CBA0 00239B00 38 21 00 40 */ addi r1, r1, 0x40 -/* 8023CBA4 00239B04 4E 80 00 20 */ blr +/* 8023CBA4 00239B04 4E 80 00 20 */ blr .global Touch__15CSnakeWeedSwarmFR6CActorR13CStateManager Touch__15CSnakeWeedSwarmFR6CActorR13CStateManager: @@ -1797,7 +1797,7 @@ lbl_8023CCFC: /* 8023CD24 00239C84 83 81 00 40 */ lwz r28, 0x40(r1) /* 8023CD28 00239C88 7C 08 03 A6 */ mtlr r0 /* 8023CD2C 00239C8C 38 21 00 80 */ addi r1, r1, 0x80 -/* 8023CD30 00239C90 4E 80 00 20 */ blr +/* 8023CD30 00239C90 4E 80 00 20 */ blr .global Think__15CSnakeWeedSwarmFfR13CStateManager Think__15CSnakeWeedSwarmFfR13CStateManager: @@ -1823,7 +1823,7 @@ Think__15CSnakeWeedSwarmFfR13CStateManager: /* 8023CD80 00239CE0 FC 20 F8 90 */ fmr f1, f31 /* 8023CD84 00239CE4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8023CD88 00239CE8 7D 89 03 A6 */ mtctr r12 -/* 8023CD8C 00239CEC 4E 80 04 21 */ bctrl +/* 8023CD8C 00239CEC 4E 80 04 21 */ bctrl lbl_8023CD90: /* 8023CD90 00239CF0 80 7D 01 F8 */ lwz r3, 0x1f8(r29) /* 8023CD94 00239CF4 28 03 00 00 */ cmplwi r3, 0 @@ -1832,7 +1832,7 @@ lbl_8023CD90: /* 8023CDA0 00239D00 FC 20 F8 90 */ fmr f1, f31 /* 8023CDA4 00239D04 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8023CDA8 00239D08 7D 89 03 A6 */ mtctr r12 -/* 8023CDAC 00239D0C 4E 80 04 21 */ bctrl +/* 8023CDAC 00239D0C 4E 80 04 21 */ bctrl lbl_8023CDB0: /* 8023CDB0 00239D10 C0 3D 02 04 */ lfs f1, 0x204(r29) /* 8023CDB4 00239D14 3B E0 00 00 */ li r31, 0 @@ -2127,7 +2127,7 @@ lbl_8023D1E0: /* 8023D1F4 0023A154 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 8023D1F8 0023A158 7C 08 03 A6 */ mtlr r0 /* 8023D1FC 0023A15C 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 8023D200 0023A160 4E 80 00 20 */ blr +/* 8023D200 0023A160 4E 80 00 20 */ blr .global sub_8023d204 sub_8023d204: @@ -2235,7 +2235,7 @@ lbl_8023D368: /* 8023D388 0023A2E8 83 C1 00 58 */ lwz r30, 0x58(r1) /* 8023D38C 0023A2EC 7C 08 03 A6 */ mtlr r0 /* 8023D390 0023A2F0 38 21 00 70 */ addi r1, r1, 0x70 -/* 8023D394 0023A2F4 4E 80 00 20 */ blr +/* 8023D394 0023A2F4 4E 80 00 20 */ blr .global GetTouchBounds__15CSnakeWeedSwarmCFv GetTouchBounds__15CSnakeWeedSwarmCFv: @@ -2244,12 +2244,12 @@ GetTouchBounds__15CSnakeWeedSwarmCFv: /* 8023D3A0 0023A300 40 82 00 10 */ bne lbl_8023D3B0 /* 8023D3A4 0023A304 38 00 00 00 */ li r0, 0 /* 8023D3A8 0023A308 98 03 00 18 */ stb r0, 0x18(r3) -/* 8023D3AC 0023A30C 4E 80 00 20 */ blr +/* 8023D3AC 0023A30C 4E 80 00 20 */ blr lbl_8023D3B0: /* 8023D3B0 0023A310 38 00 00 01 */ li r0, 1 /* 8023D3B4 0023A314 28 03 00 00 */ cmplwi r3, 0 /* 8023D3B8 0023A318 98 03 00 18 */ stb r0, 0x18(r3) -/* 8023D3BC 0023A31C 4D 82 00 20 */ beqlr +/* 8023D3BC 0023A31C 4D 82 00 20 */ beqlr /* 8023D3C0 0023A320 C0 04 01 44 */ lfs f0, 0x144(r4) /* 8023D3C4 0023A324 D0 03 00 00 */ stfs f0, 0(r3) /* 8023D3C8 0023A328 C0 04 01 48 */ lfs f0, 0x148(r4) @@ -2262,7 +2262,7 @@ lbl_8023D3B0: /* 8023D3E4 0023A344 D0 03 00 10 */ stfs f0, 0x10(r3) /* 8023D3E8 0023A348 C0 04 01 58 */ lfs f0, 0x158(r4) /* 8023D3EC 0023A34C D0 03 00 14 */ stfs f0, 0x14(r3) -/* 8023D3F0 0023A350 4E 80 00 20 */ blr +/* 8023D3F0 0023A350 4E 80 00 20 */ blr .global sub_8023d3f4 sub_8023d3f4: @@ -2297,7 +2297,7 @@ sub_8023d3f4: /* 8023D464 0023A3C4 80 01 00 24 */ lwz r0, 0x24(r1) /* 8023D468 0023A3C8 7C 08 03 A6 */ mtlr r0 /* 8023D46C 0023A3CC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8023D470 0023A3D0 4E 80 00 20 */ blr +/* 8023D470 0023A3D0 4E 80 00 20 */ blr .global sub_8023d474 sub_8023d474: @@ -2448,7 +2448,7 @@ lbl_8023D5DC: /* 8023D688 0023A5E8 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 8023D68C 0023A5EC 7C 08 03 A6 */ mtlr r0 /* 8023D690 0023A5F0 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8023D694 0023A5F4 4E 80 00 20 */ blr +/* 8023D694 0023A5F4 4E 80 00 20 */ blr .global AcceptScriptMsg__15CSnakeWeedSwarmF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__15CSnakeWeedSwarmF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -2502,7 +2502,7 @@ lbl_8023D73C: /* 8023D748 0023A6A8 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8023D74C 0023A6AC 7C 08 03 A6 */ mtlr r0 /* 8023D750 0023A6B0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8023D754 0023A6B4 4E 80 00 20 */ blr +/* 8023D754 0023A6B4 4E 80 00 20 */ blr .global Accept__15CSnakeWeedSwarmFR8IVisitor Accept__15CSnakeWeedSwarmFR8IVisitor: @@ -2515,11 +2515,11 @@ Accept__15CSnakeWeedSwarmFR8IVisitor: /* 8023D770 0023A6D0 7C 04 03 78 */ mr r4, r0 /* 8023D774 0023A6D4 81 8C 00 DC */ lwz r12, 0xdc(r12) /* 8023D778 0023A6D8 7D 89 03 A6 */ mtctr r12 -/* 8023D77C 0023A6DC 4E 80 04 21 */ bctrl +/* 8023D77C 0023A6DC 4E 80 04 21 */ bctrl /* 8023D780 0023A6E0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8023D784 0023A6E4 7C 08 03 A6 */ mtlr r0 /* 8023D788 0023A6E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8023D78C 0023A6EC 4E 80 00 20 */ blr +/* 8023D78C 0023A6EC 4E 80 00 20 */ blr .global __ct__15CSnakeWeedSwarm __ct__15CSnakeWeedSwarm: @@ -3016,7 +3016,7 @@ lbl_8023DE94: /* 8023DEE0 0023AE40 81 84 00 00 */ lwz r12, 0(r4) /* 8023DEE4 0023AE44 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8023DEE8 0023AE48 7D 89 03 A6 */ mtctr r12 -/* 8023DEEC 0023AE4C 4E 80 04 21 */ bctrl +/* 8023DEEC 0023AE4C 4E 80 04 21 */ bctrl /* 8023DEF0 0023AE50 7E 23 8B 78 */ mr r3, r17 /* 8023DEF4 0023AE54 38 81 00 68 */ addi r4, r1, 0x68 /* 8023DEF8 0023AE58 3A 00 00 01 */ li r16, 1 @@ -3115,7 +3115,7 @@ lbl_8023E00C: /* 8023E04C 0023AFAC 38 80 00 01 */ li r4, 1 /* 8023E050 0023AFB0 81 8C 00 08 */ lwz r12, 8(r12) /* 8023E054 0023AFB4 7D 89 03 A6 */ mtctr r12 -/* 8023E058 0023AFB8 4E 80 04 21 */ bctrl +/* 8023E058 0023AFB8 4E 80 04 21 */ bctrl lbl_8023E05C: /* 8023E05C 0023AFBC 88 61 00 50 */ lbz r3, 0x50(r1) /* 8023E060 0023AFC0 38 00 00 00 */ li r0, 0 @@ -3134,7 +3134,7 @@ lbl_8023E074: /* 8023E090 0023AFF0 38 80 00 01 */ li r4, 1 /* 8023E094 0023AFF4 81 8C 00 08 */ lwz r12, 8(r12) /* 8023E098 0023AFF8 7D 89 03 A6 */ mtctr r12 -/* 8023E09C 0023AFFC 4E 80 04 21 */ bctrl +/* 8023E09C 0023AFFC 4E 80 04 21 */ bctrl lbl_8023E0A0: /* 8023E0A0 0023B000 7E 00 07 75 */ extsb. r0, r16 /* 8023E0A4 0023B004 41 82 00 10 */ beq lbl_8023E0B4 @@ -3164,7 +3164,7 @@ lbl_8023E0B4: /* 8023E100 0023B060 81 84 00 00 */ lwz r12, 0(r4) /* 8023E104 0023B064 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8023E108 0023B068 7D 89 03 A6 */ mtctr r12 -/* 8023E10C 0023B06C 4E 80 04 21 */ bctrl +/* 8023E10C 0023B06C 4E 80 04 21 */ bctrl /* 8023E110 0023B070 7E 23 8B 78 */ mr r3, r17 /* 8023E114 0023B074 38 81 00 40 */ addi r4, r1, 0x40 /* 8023E118 0023B078 3A 00 00 01 */ li r16, 1 @@ -3263,7 +3263,7 @@ lbl_8023E22C: /* 8023E26C 0023B1CC 38 80 00 01 */ li r4, 1 /* 8023E270 0023B1D0 81 8C 00 08 */ lwz r12, 8(r12) /* 8023E274 0023B1D4 7D 89 03 A6 */ mtctr r12 -/* 8023E278 0023B1D8 4E 80 04 21 */ bctrl +/* 8023E278 0023B1D8 4E 80 04 21 */ bctrl lbl_8023E27C: /* 8023E27C 0023B1DC 88 61 00 28 */ lbz r3, 0x28(r1) /* 8023E280 0023B1E0 38 00 00 00 */ li r0, 0 @@ -3282,7 +3282,7 @@ lbl_8023E294: /* 8023E2B0 0023B210 38 80 00 01 */ li r4, 1 /* 8023E2B4 0023B214 81 8C 00 08 */ lwz r12, 8(r12) /* 8023E2B8 0023B218 7D 89 03 A6 */ mtctr r12 -/* 8023E2BC 0023B21C 4E 80 04 21 */ bctrl +/* 8023E2BC 0023B21C 4E 80 04 21 */ bctrl lbl_8023E2C0: /* 8023E2C0 0023B220 7E 00 07 75 */ extsb. r0, r16 /* 8023E2C4 0023B224 41 82 00 10 */ beq lbl_8023E2D4 @@ -3325,56 +3325,56 @@ lbl_8023E2D4: /* 8023E354 0023B2B4 80 01 02 44 */ lwz r0, 0x244(r1) /* 8023E358 0023B2B8 7C 08 03 A6 */ mtlr r0 /* 8023E35C 0023B2BC 38 21 02 40 */ addi r1, r1, 0x240 -/* 8023E360 0023B2C0 4E 80 00 20 */ blr +/* 8023E360 0023B2C0 4E 80 00 20 */ blr .global sub_8023e364 sub_8023e364: /* 8023E364 0023B2C4 C0 23 00 20 */ lfs f1, 0x20(r3) -/* 8023E368 0023B2C8 4E 80 00 20 */ blr +/* 8023E368 0023B2C8 4E 80 00 20 */ blr .global sub_8023e36c sub_8023e36c: /* 8023E36C 0023B2CC D0 23 00 18 */ stfs f1, 0x18(r3) -/* 8023E370 0023B2D0 4E 80 00 20 */ blr +/* 8023E370 0023B2D0 4E 80 00 20 */ blr .global sub_8023e374 sub_8023e374: /* 8023E374 0023B2D4 C0 23 00 18 */ lfs f1, 0x18(r3) -/* 8023E378 0023B2D8 4E 80 00 20 */ blr +/* 8023E378 0023B2D8 4E 80 00 20 */ blr .global sub_8023e37c sub_8023e37c: /* 8023E37C 0023B2DC D0 23 00 14 */ stfs f1, 0x14(r3) -/* 8023E380 0023B2E0 4E 80 00 20 */ blr +/* 8023E380 0023B2E0 4E 80 00 20 */ blr .global sub_8023e384 sub_8023e384: /* 8023E384 0023B2E4 C0 23 00 14 */ lfs f1, 0x14(r3) -/* 8023E388 0023B2E8 4E 80 00 20 */ blr +/* 8023E388 0023B2E8 4E 80 00 20 */ blr .global sub_8023e38c sub_8023e38c: /* 8023E38C 0023B2EC D0 23 00 10 */ stfs f1, 0x10(r3) -/* 8023E390 0023B2F0 4E 80 00 20 */ blr +/* 8023E390 0023B2F0 4E 80 00 20 */ blr .global sub_8023e394 sub_8023e394: /* 8023E394 0023B2F4 C0 23 00 10 */ lfs f1, 0x10(r3) -/* 8023E398 0023B2F8 4E 80 00 20 */ blr +/* 8023E398 0023B2F8 4E 80 00 20 */ blr .global nullsub_21 nullsub_21: -/* 8023E39C 0023B2FC 4E 80 00 20 */ blr +/* 8023E39C 0023B2FC 4E 80 00 20 */ blr .global sub_8023e3a0 sub_8023e3a0: /* 8023E3A0 0023B300 80 63 00 0C */ lwz r3, 0xc(r3) -/* 8023E3A4 0023B304 4E 80 00 20 */ blr +/* 8023E3A4 0023B304 4E 80 00 20 */ blr .global sub_8023e3a8 sub_8023e3a8: /* 8023E3A8 0023B308 90 83 00 0C */ stw r4, 0xc(r3) -/* 8023E3AC 0023B30C 4E 80 00 20 */ blr +/* 8023E3AC 0023B30C 4E 80 00 20 */ blr .global sub_8023e3b0 sub_8023e3b0: @@ -3389,7 +3389,7 @@ sub_8023e3b0: /* 8023E3D0 0023B330 D0 23 00 14 */ stfs f1, 0x14(r3) /* 8023E3D4 0023B334 D0 43 00 18 */ stfs f2, 0x18(r3) /* 8023E3D8 0023B338 D0 63 00 20 */ stfs f3, 0x20(r3) -/* 8023E3DC 0023B33C 4E 80 00 20 */ blr +/* 8023E3DC 0023B33C 4E 80 00 20 */ blr .global sub_8023e3e0 sub_8023e3e0: @@ -3478,7 +3478,7 @@ lbl_8023E4F8: /* 8023E504 0023B464 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8023E508 0023B468 7C 08 03 A6 */ mtlr r0 /* 8023E50C 0023B46C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8023E510 0023B470 4E 80 00 20 */ blr +/* 8023E510 0023B470 4E 80 00 20 */ blr .global sub_8023e514 sub_8023e514: @@ -3550,4 +3550,4 @@ lbl_8023E5E8: /* 8023E5F4 0023B554 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8023E5F8 0023B558 7C 08 03 A6 */ mtlr r0 /* 8023E5FC 0023B55C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8023E600 0023B560 4E 80 00 20 */ blr +/* 8023E600 0023B560 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/Enemies/CSpacePirate.s b/asm/MetroidPrime/Enemies/CSpacePirate.s index 4be7ceec..a0d8d612 100644 --- a/asm/MetroidPrime/Enemies/CSpacePirate.s +++ b/asm/MetroidPrime/Enemies/CSpacePirate.s @@ -526,7 +526,7 @@ lbl_8046C570: .global lbl_8046C618 lbl_8046C618: .skip 0x108 - + .section .text, "ax" .global __dt__12CSpacePirateFv @@ -644,7 +644,7 @@ lbl_8012068C: /* 80120698 0011D5F8 83 C1 00 08 */ lwz r30, 8(r1) /* 8012069C 0011D5FC 7C 08 03 A6 */ mtlr r0 /* 801206A0 0011D600 38 21 00 10 */ addi r1, r1, 0x10 -/* 801206A4 0011D604 4E 80 00 20 */ blr +/* 801206A4 0011D604 4E 80 00 20 */ blr .global sub_801206a8 sub_801206a8: @@ -670,7 +670,7 @@ lbl_801206E4: /* 801206F0 0011D650 83 C1 00 08 */ lwz r30, 8(r1) /* 801206F4 0011D654 7C 08 03 A6 */ mtlr r0 /* 801206F8 0011D658 38 21 00 10 */ addi r1, r1, 0x10 -/* 801206FC 0011D65C 4E 80 00 20 */ blr +/* 801206FC 0011D65C 4E 80 00 20 */ blr .global __dt__14CPirateRagDollFv __dt__14CPirateRagDollFv: @@ -755,7 +755,7 @@ lbl_80120800: /* 8012080C 0011D76C 83 C1 00 08 */ lwz r30, 8(r1) /* 80120810 0011D770 7C 08 03 A6 */ mtlr r0 /* 80120814 0011D774 38 21 00 10 */ addi r1, r1, 0x10 -/* 80120818 0011D778 4E 80 00 20 */ blr +/* 80120818 0011D778 4E 80 00 20 */ blr .global __dt__8CRagDollFv __dt__8CRagDollFv: @@ -865,22 +865,22 @@ lbl_80120978: /* 80120984 0011D8E4 83 C1 00 48 */ lwz r30, 0x48(r1) /* 80120988 0011D8E8 7C 08 03 A6 */ mtlr r0 /* 8012098C 0011D8EC 38 21 00 50 */ addi r1, r1, 0x50 -/* 80120990 0011D8F0 4E 80 00 20 */ blr +/* 80120990 0011D8F0 4E 80 00 20 */ blr .global GetSearchPath__12CSpacePirateCFv GetSearchPath__12CSpacePirateCFv: /* 80120994 0011D8F4 38 63 06 60 */ addi r3, r3, 0x660 -/* 80120998 0011D8F8 4E 80 00 20 */ blr +/* 80120998 0011D8F8 4E 80 00 20 */ blr .global IsListening__12CSpacePirateCFv IsListening__12CSpacePirateCFv: /* 8012099C 0011D8FC 38 60 00 01 */ li r3, 1 -/* 801209A0 0011D900 4E 80 00 20 */ blr +/* 801209A0 0011D900 4E 80 00 20 */ blr .global GetGravityConstant__12CSpacePirateCFv GetGravityConstant__12CSpacePirateCFv: /* 801209A4 0011D904 C0 22 97 B0 */ lfs f1, lbl_805AB4D0@sda21(r2) -/* 801209A8 0011D908 4E 80 00 20 */ blr +/* 801209A8 0011D908 4E 80 00 20 */ blr .global Think__12CSpacePirateFfR13CStateManager Think__12CSpacePirateFfR13CStateManager: @@ -1140,7 +1140,7 @@ lbl_80120D38: /* 80120D5C 0011DCBC 80 DE 00 64 */ lwz r6, 0x64(r30) /* 80120D60 0011DCC0 81 8C 00 08 */ lwz r12, 8(r12) /* 80120D64 0011DCC4 7D 89 03 A6 */ mtctr r12 -/* 80120D68 0011DCC8 4E 80 04 21 */ bctrl +/* 80120D68 0011DCC8 4E 80 04 21 */ bctrl /* 80120D6C 0011DCCC C0 5E 00 60 */ lfs f2, 0x60(r30) /* 80120D70 0011DCD0 3C 60 80 5A */ lis r3, skIdentity4f@ha /* 80120D74 0011DCD4 C0 3E 00 50 */ lfs f1, 0x50(r30) @@ -1202,7 +1202,7 @@ lbl_80120E30: /* 80120E4C 0011DDAC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80120E50 0011DDB0 7F E4 FB 78 */ mr r4, r31 /* 80120E54 0011DDB4 7D 89 03 A6 */ mtctr r12 -/* 80120E58 0011DDB8 4E 80 04 21 */ bctrl +/* 80120E58 0011DDB8 4E 80 04 21 */ bctrl /* 80120E5C 0011DDBC FC 20 F8 90 */ fmr f1, f31 /* 80120E60 0011DDC0 80 7E 00 64 */ lwz r3, 0x64(r30) /* 80120E64 0011DDC4 7F E5 FB 78 */ mr r5, r31 @@ -1305,7 +1305,7 @@ lbl_80120FB8: /* 80120FD4 0011DF34 83 A1 00 84 */ lwz r29, 0x84(r1) /* 80120FD8 0011DF38 7C 08 03 A6 */ mtlr r0 /* 80120FDC 0011DF3C 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 80120FE0 0011DF40 4E 80 00 20 */ blr +/* 80120FE0 0011DF40 4E 80 00 20 */ blr .global sub_80120fe4 sub_80120fe4: @@ -1326,7 +1326,7 @@ sub_80120fe4: /* 8012101C 0011DF7C 83 C1 00 08 */ lwz r30, 8(r1) /* 80121020 0011DF80 7C 08 03 A6 */ mtlr r0 /* 80121024 0011DF84 38 21 00 10 */ addi r1, r1, 0x10 -/* 80121028 0011DF88 4E 80 00 20 */ blr +/* 80121028 0011DF88 4E 80 00 20 */ blr .global UpdateAimBodyState__12CSpacePirateFfR13CStateManager UpdateAimBodyState__12CSpacePirateFfR13CStateManager: @@ -1454,7 +1454,7 @@ lbl_801211F8: /* 80121204 0011E164 83 A1 00 44 */ lwz r29, 0x44(r1) /* 80121208 0011E168 7C 08 03 A6 */ mtlr r0 /* 8012120C 0011E16C 38 21 00 50 */ addi r1, r1, 0x50 -/* 80121210 0011E170 4E 80 00 20 */ blr +/* 80121210 0011E170 4E 80 00 20 */ blr .global UpdateAttacks__12CSpacePirateFfR13CStateManager UpdateAttacks__12CSpacePirateFfR13CStateManager: @@ -1479,7 +1479,7 @@ UpdateAttacks__12CSpacePirateFfR13CStateManager: /* 8012125C 0011E1BC 81 83 00 00 */ lwz r12, 0(r3) /* 80121260 0011E1C0 81 8C 00 28 */ lwz r12, 0x28(r12) /* 80121264 0011E1C4 7D 89 03 A6 */ mtctr r12 -/* 80121268 0011E1C8 4E 80 04 21 */ bctrl +/* 80121268 0011E1C8 4E 80 04 21 */ bctrl /* 8012126C 0011E1CC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80121270 0011E1D0 41 82 03 D4 */ beq lbl_80121644 /* 80121274 0011E1D4 88 1D 06 37 */ lbz r0, 0x637(r29) @@ -1594,7 +1594,7 @@ lbl_80121404: /* 80121410 0011E370 C0 22 97 BC */ lfs f1, lbl_805AB4DC@sda21(r2) /* 80121414 0011E374 81 8C 01 B0 */ lwz r12, 0x1b0(r12) /* 80121418 0011E378 7D 89 03 A6 */ mtctr r12 -/* 8012141C 0011E37C 4E 80 04 21 */ bctrl +/* 8012141C 0011E37C 4E 80 04 21 */ bctrl /* 80121420 0011E380 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80121424 0011E384 40 82 00 18 */ bne lbl_8012143C /* 80121428 0011E388 80 7D 07 C4 */ lwz r3, 0x7c4(r29) @@ -1619,7 +1619,7 @@ lbl_8012143C: /* 80121470 0011E3D0 81 84 00 00 */ lwz r12, 0(r4) /* 80121474 0011E3D4 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 80121478 0011E3D8 7D 89 03 A6 */ mtctr r12 -/* 8012147C 0011E3DC 4E 80 04 21 */ bctrl +/* 8012147C 0011E3DC 4E 80 04 21 */ bctrl /* 80121480 0011E3E0 7F A4 EB 78 */ mr r4, r29 /* 80121484 0011E3E4 38 61 00 3C */ addi r3, r1, 0x3c /* 80121488 0011E3E8 4B F5 B6 49 */ bl GetGunEyePos__10CPatternedCFv @@ -1761,12 +1761,12 @@ lbl_80121658: /* 80121684 0011E5E4 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 80121688 0011E5E8 7C 08 03 A6 */ mtlr r0 /* 8012168C 0011E5EC 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 80121690 0011E5F0 4E 80 00 20 */ blr +/* 80121690 0011E5F0 4E 80 00 20 */ blr .global CanShoot__10CBodyStateCFv CanShoot__10CBodyStateCFv: /* 80121694 0011E5F4 38 60 00 00 */ li r3, 0 -/* 80121698 0011E5F8 4E 80 00 20 */ blr +/* 80121698 0011E5F8 4E 80 00 20 */ blr .global UpdateCloak__12CSpacePirateFfRC13CStateManager UpdateCloak__12CSpacePirateFfRC13CStateManager: @@ -1937,7 +1937,7 @@ lbl_801218E8: /* 80121908 0011E868 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8012190C 0011E86C 7C 08 03 A6 */ mtlr r0 /* 80121910 0011E870 38 21 00 50 */ addi r1, r1, 0x50 -/* 80121914 0011E874 4E 80 00 20 */ blr +/* 80121914 0011E874 4E 80 00 20 */ blr .global ShouldFrenzy__12CSpacePirateFR13CStateManager ShouldFrenzy__12CSpacePirateFR13CStateManager: @@ -1988,7 +1988,7 @@ lbl_801219B4: /* 801219BC 0011E91C 81 9D 00 00 */ lwz r12, 0(r29) /* 801219C0 0011E920 81 8C 00 34 */ lwz r12, 0x34(r12) /* 801219C4 0011E924 7D 89 03 A6 */ mtctr r12 -/* 801219C8 0011E928 4E 80 04 21 */ bctrl +/* 801219C8 0011E928 4E 80 04 21 */ bctrl /* 801219CC 0011E92C C0 22 97 EC */ lfs f1, lbl_805AB50C@sda21(r2) /* 801219D0 0011E930 C0 1D 07 50 */ lfs f0, 0x750(r29) /* 801219D4 0011E934 C0 43 00 00 */ lfs f2, 0(r3) @@ -2032,7 +2032,7 @@ lbl_80121A44: /* 80121A64 0011E9C4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80121A68 0011E9C8 7C 08 03 A6 */ mtlr r0 /* 80121A6C 0011E9CC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80121A70 0011E9D0 4E 80 00 20 */ blr +/* 80121A70 0011E9D0 4E 80 00 20 */ blr .global GetSortingBounds__12CSpacePirateCFRC12CTransform4f GetSortingBounds__12CSpacePirateCFRC12CTransform4f: @@ -2097,7 +2097,7 @@ GetSortingBounds__12CSpacePirateCFRC12CTransform4f: /* 80121B5C 0011EABC 83 E1 00 6C */ lwz r31, 0x6c(r1) /* 80121B60 0011EAC0 7C 08 03 A6 */ mtlr r0 /* 80121B64 0011EAC4 38 21 00 70 */ addi r1, r1, 0x70 -/* 80121B68 0011EAC8 4E 80 00 20 */ blr +/* 80121B68 0011EAC8 4E 80 00 20 */ blr .global Render__12CSpacePirateCFRC13CStateManager Render__12CSpacePirateCFRC13CStateManager: @@ -2125,7 +2125,7 @@ lbl_80121BA0: /* 80121BB8 0011EB18 81 83 00 00 */ lwz r12, 0(r3) /* 80121BBC 0011EB1C 81 8C 00 FC */ lwz r12, 0xfc(r12) /* 80121BC0 0011EB20 7D 89 03 A6 */ mtctr r12 -/* 80121BC4 0011EB24 4E 80 04 21 */ bctrl +/* 80121BC4 0011EB24 4E 80 04 21 */ bctrl /* 80121BC8 0011EB28 7F C3 F3 78 */ mr r3, r30 /* 80121BCC 0011EB2C 7F E4 FB 78 */ mr r4, r31 /* 80121BD0 0011EB30 4B F5 64 5D */ bl Render__10CPatternedCFRC13CStateManager @@ -2137,7 +2137,7 @@ lbl_80121BA0: /* 80121BE8 0011EB48 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80121BEC 0011EB4C 7C 08 03 A6 */ mtlr r0 /* 80121BF0 0011EB50 38 21 00 20 */ addi r1, r1, 0x20 -/* 80121BF4 0011EB54 4E 80 00 20 */ blr +/* 80121BF4 0011EB54 4E 80 00 20 */ blr .global PreRender__12CSpacePirateFR13CStateManagerRC14CFrustumPlanes PreRender__12CSpacePirateFR13CStateManagerRC14CFrustumPlanes: @@ -2167,7 +2167,7 @@ PreRender__12CSpacePirateFR13CStateManagerRC14CFrustumPlanes: /* 80121C54 0011EBB4 81 83 00 00 */ lwz r12, 0(r3) /* 80121C58 0011EBB8 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80121C5C 0011EBBC 7D 89 03 A6 */ mtctr r12 -/* 80121C60 0011EBC0 4E 80 04 21 */ bctrl +/* 80121C60 0011EBC0 4E 80 04 21 */ bctrl lbl_80121C64: /* 80121C64 0011EBC4 7F A3 EB 78 */ mr r3, r29 /* 80121C68 0011EBC8 7F C4 F3 78 */ mr r4, r30 @@ -2215,7 +2215,7 @@ lbl_80121CFC: /* 80121D08 0011EC68 83 A1 00 34 */ lwz r29, 0x34(r1) /* 80121D0C 0011EC6C 7C 08 03 A6 */ mtlr r0 /* 80121D10 0011EC70 38 21 00 40 */ addi r1, r1, 0x40 -/* 80121D14 0011EC74 4E 80 00 20 */ blr +/* 80121D14 0011EC74 4E 80 00 20 */ blr .global CalculateRenderBounds__12CSpacePirateFv CalculateRenderBounds__12CSpacePirateFv: @@ -2283,7 +2283,7 @@ lbl_80121E00: /* 80121E04 0011ED64 83 E1 00 5C */ lwz r31, 0x5c(r1) /* 80121E08 0011ED68 7C 08 03 A6 */ mtlr r0 /* 80121E0C 0011ED6C 38 21 00 60 */ addi r1, r1, 0x60 -/* 80121E10 0011ED70 4E 80 00 20 */ blr +/* 80121E10 0011ED70 4E 80 00 20 */ blr .global GetModelAlphau8__12CSpacePirateCFRC13CStateManager GetModelAlphau8__12CSpacePirateCFRC13CStateManager: @@ -2332,7 +2332,7 @@ lbl_80121E9C: /* 80121EAC 0011EE0C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80121EB0 0011EE10 7C 08 03 A6 */ mtlr r0 /* 80121EB4 0011EE14 38 21 00 20 */ addi r1, r1, 0x20 -/* 80121EB8 0011EE18 4E 80 00 20 */ blr +/* 80121EB8 0011EE18 4E 80 00 20 */ blr .global DoUserAnimEvent__12CSpacePirateFR13CStateManagerRC13CInt32POINode14EUserEventType DoUserAnimEvent__12CSpacePirateFR13CStateManagerRC13CInt32POINode14EUserEventType: @@ -2359,7 +2359,7 @@ DoUserAnimEvent__12CSpacePirateFR13CStateManagerRC13CInt32POINode14EUserEventTyp /* 80121F0C 0011EE6C 38 84 0A CC */ addi r4, r4, lbl_803E0ACC@l /* 80121F10 0011EE70 7C 04 00 2E */ lwzx r0, r4, r0 /* 80121F14 0011EE74 7C 09 03 A6 */ mtctr r0 -/* 80121F18 0011EE78 4E 80 04 20 */ bctr +/* 80121F18 0011EE78 4E 80 04 20 */ bctr .global lbl_80121F1C lbl_80121F1C: /* 80121F1C 0011EE7C 7F A5 EB 78 */ mr r5, r29 @@ -2389,7 +2389,7 @@ lbl_80121F58: /* 80121F6C 0011EECC 81 9C 00 00 */ lwz r12, 0(r28) /* 80121F70 0011EED0 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80121F74 0011EED4 7D 89 03 A6 */ mtctr r12 -/* 80121F78 0011EED8 4E 80 04 21 */ bctrl +/* 80121F78 0011EED8 4E 80 04 21 */ bctrl /* 80121F7C 0011EEDC C0 23 00 00 */ lfs f1, 0(r3) /* 80121F80 0011EEE0 C0 02 97 BC */ lfs f0, lbl_805AB4DC@sda21(r2) /* 80121F84 0011EEE4 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -2488,7 +2488,7 @@ lbl_801220A4: /* 801220BC 0011F01C 83 81 00 70 */ lwz r28, 0x70(r1) /* 801220C0 0011F020 7C 08 03 A6 */ mtlr r0 /* 801220C4 0011F024 38 21 00 90 */ addi r1, r1, 0x90 -/* 801220C8 0011F028 4E 80 00 20 */ blr +/* 801220C8 0011F028 4E 80 00 20 */ blr .global FireProjectile__12CSpacePirateFfR13CStateManager FireProjectile__12CSpacePirateFfR13CStateManager: @@ -2583,12 +2583,12 @@ lbl_801221A4: /* 80122224 0011F184 81 9C 00 00 */ lwz r12, 0(r28) /* 80122228 0011F188 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 8012222C 0011F18C 7D 89 03 A6 */ mtctr r12 -/* 80122230 0011F190 4E 80 04 21 */ bctrl +/* 80122230 0011F190 4E 80 04 21 */ bctrl /* 80122234 0011F194 7F A3 EB 78 */ mr r3, r29 /* 80122238 0011F198 81 9D 00 00 */ lwz r12, 0(r29) /* 8012223C 0011F19C 81 8C 02 C0 */ lwz r12, 0x2c0(r12) /* 80122240 0011F1A0 7D 89 03 A6 */ mtctr r12 -/* 80122244 0011F1A4 4E 80 04 21 */ bctrl +/* 80122244 0011F1A4 4E 80 04 21 */ bctrl /* 80122248 0011F1A8 FC 20 F8 90 */ fmr f1, f31 /* 8012224C 0011F1AC 7C 64 1B 78 */ mr r4, r3 /* 80122250 0011F1B0 7F 87 E3 78 */ mr r7, r28 @@ -2894,27 +2894,27 @@ lbl_801226BC: /* 801226D8 0011F638 83 81 02 C0 */ lwz r28, 0x2c0(r1) /* 801226DC 0011F63C 7C 08 03 A6 */ mtlr r0 /* 801226E0 0011F640 38 21 02 E0 */ addi r1, r1, 0x2e0 -/* 801226E4 0011F644 4E 80 00 20 */ blr +/* 801226E4 0011F644 4E 80 00 20 */ blr .global ProjectileInfo__12CSpacePirateFv ProjectileInfo__12CSpacePirateFv: /* 801226E8 0011F648 38 63 05 88 */ addi r3, r3, 0x588 -/* 801226EC 0011F64C 4E 80 00 20 */ blr +/* 801226EC 0011F64C 4E 80 00 20 */ blr .global UpdateLeashTimer__12CSpacePirateFf UpdateLeashTimer__12CSpacePirateFf: /* 801226F0 0011F650 80 83 04 50 */ lwz r4, 0x450(r3) /* 801226F4 0011F654 88 04 03 00 */ lbz r0, 0x300(r4) /* 801226F8 0011F658 54 00 DF FF */ rlwinm. r0, r0, 0x1b, 0x1f, 0x1f -/* 801226FC 0011F65C 4C 82 00 20 */ bnelr +/* 801226FC 0011F65C 4C 82 00 20 */ bnelr /* 80122700 0011F660 C0 44 03 24 */ lfs f2, 0x324(r4) /* 80122704 0011F664 C0 02 97 BC */ lfs f0, lbl_805AB4DC@sda21(r2) /* 80122708 0011F668 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8012270C 0011F66C 4D 81 00 20 */ bgtlr +/* 8012270C 0011F66C 4D 81 00 20 */ bgtlr /* 80122710 0011F670 C0 03 08 DC */ lfs f0, 0x8dc(r3) /* 80122714 0011F674 EC 00 08 2A */ fadds f0, f0, f1 /* 80122718 0011F678 D0 03 08 DC */ stfs f0, 0x8dc(r3) -/* 8012271C 0011F67C 4E 80 00 20 */ blr +/* 8012271C 0011F67C 4E 80 00 20 */ blr .global Leash__12CSpacePirateFR13CStateManagerf Leash__12CSpacePirateFR13CStateManagerf: @@ -2922,7 +2922,7 @@ Leash__12CSpacePirateFR13CStateManagerf: /* 80122724 0011F684 FC 00 08 40 */ fcmpo cr0, f0, f1 /* 80122728 0011F688 7C 00 00 26 */ mfcr r0 /* 8012272C 0011F68C 54 03 17 FE */ rlwinm r3, r0, 2, 0x1f, 0x1f -/* 80122730 0011F690 4E 80 00 20 */ blr +/* 80122730 0011F690 4E 80 00 20 */ blr .global Jump__12CSpacePirateFR13CStateManager9EStateMsgf Jump__12CSpacePirateFR13CStateManager9EStateMsgf: @@ -2991,7 +2991,7 @@ lbl_8012280C: /* 80122818 0011F778 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8012281C 0011F77C 7C 08 03 A6 */ mtlr r0 /* 80122820 0011F780 38 21 00 30 */ addi r1, r1, 0x30 -/* 80122824 0011F784 4E 80 00 20 */ blr +/* 80122824 0011F784 4E 80 00 20 */ blr .global TryJumpInLoop__10CPatternedFR13CStateManageri TryJumpInLoop__10CPatternedFR13CStateManageri: @@ -3062,7 +3062,7 @@ TryJumpInLoop__10CPatternedFR13CStateManageri: /* 80122928 0011F888 80 01 00 44 */ lwz r0, 0x44(r1) /* 8012292C 0011F88C 7C 08 03 A6 */ mtlr r0 /* 80122930 0011F890 38 21 00 40 */ addi r1, r1, 0x40 -/* 80122934 0011F894 4E 80 00 20 */ blr +/* 80122934 0011F894 4E 80 00 20 */ blr .global Landed__12CSpacePirateFR13CStateManagerf Landed__12CSpacePirateFR13CStateManagerf: @@ -3072,11 +3072,11 @@ Landed__12CSpacePirateFR13CStateManagerf: /* 80122944 0011F8A4 81 83 00 00 */ lwz r12, 0(r3) /* 80122948 0011F8A8 81 8C 02 B8 */ lwz r12, 0x2b8(r12) /* 8012294C 0011F8AC 7D 89 03 A6 */ mtctr r12 -/* 80122950 0011F8B0 4E 80 04 21 */ bctrl +/* 80122950 0011F8B0 4E 80 04 21 */ bctrl /* 80122954 0011F8B4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80122958 0011F8B8 7C 08 03 A6 */ mtlr r0 /* 8012295C 0011F8BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80122960 0011F8C0 4E 80 00 20 */ blr +/* 80122960 0011F8C0 4E 80 00 20 */ blr .global OffLine__12CSpacePirateFR13CStateManagerf OffLine__12CSpacePirateFR13CStateManagerf: @@ -3086,24 +3086,24 @@ OffLine__12CSpacePirateFR13CStateManagerf: /* 80122970 0011F8D0 81 83 00 00 */ lwz r12, 0(r3) /* 80122974 0011F8D4 81 8C 02 B8 */ lwz r12, 0x2b8(r12) /* 80122978 0011F8D8 7D 89 03 A6 */ mtctr r12 -/* 8012297C 0011F8DC 4E 80 04 21 */ bctrl +/* 8012297C 0011F8DC 4E 80 04 21 */ bctrl /* 80122980 0011F8E0 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80122984 0011F8E4 7C 00 00 34 */ cntlzw r0, r0 /* 80122988 0011F8E8 54 03 D9 7E */ srwi r3, r0, 5 /* 8012298C 0011F8EC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80122990 0011F8F0 7C 08 03 A6 */ mtlr r0 /* 80122994 0011F8F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80122998 0011F8F8 4E 80 00 20 */ blr +/* 80122998 0011F8F8 4E 80 00 20 */ blr .global Deactivate__12CSpacePirateFR13CStateManager9EStateMsgf Deactivate__12CSpacePirateFR13CStateManager9EStateMsgf: /* 8012299C 0011F8FC 2C 05 00 00 */ cmpwi r5, 0 -/* 801229A0 0011F900 4C 82 00 20 */ bnelr +/* 801229A0 0011F900 4C 82 00 20 */ bnelr /* 801229A4 0011F904 88 03 04 01 */ lbz r0, 0x401(r3) /* 801229A8 0011F908 38 80 00 01 */ li r4, 1 /* 801229AC 0011F90C 50 80 0F BC */ rlwimi r0, r4, 1, 0x1e, 0x1e /* 801229B0 0011F910 98 03 04 01 */ stb r0, 0x401(r3) -/* 801229B4 0011F914 4E 80 00 20 */ blr +/* 801229B4 0011F914 4E 80 00 20 */ blr .global Dead__12CSpacePirateFR13CStateManager9EStateMsgf Dead__12CSpacePirateFR13CStateManager9EStateMsgf: @@ -3172,7 +3172,7 @@ lbl_80122A98: /* 80122AA4 0011FA04 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80122AA8 0011FA08 7C 08 03 A6 */ mtlr r0 /* 80122AAC 0011FA0C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80122AB0 0011FA10 4E 80 00 20 */ blr +/* 80122AB0 0011FA10 4E 80 00 20 */ blr .global Bounce__12CSpacePirateFR13CStateManager9EStateMsgf Bounce__12CSpacePirateFR13CStateManager9EStateMsgf: @@ -3292,7 +3292,7 @@ lbl_80122C64: /* 80122C6C 0011FBCC 83 C1 00 58 */ lwz r30, 0x58(r1) /* 80122C70 0011FBD0 7C 08 03 A6 */ mtlr r0 /* 80122C74 0011FBD4 38 21 00 60 */ addi r1, r1, 0x60 -/* 80122C78 0011FBD8 4E 80 00 20 */ blr +/* 80122C78 0011FBD8 4E 80 00 20 */ blr .global PathFindEx__12CSpacePirateFR13CStateManager9EStateMsgf PathFindEx__12CSpacePirateFR13CStateManager9EStateMsgf: @@ -3403,7 +3403,7 @@ lbl_80122DF4: /* 80122E08 0011FD68 83 A1 00 44 */ lwz r29, 0x44(r1) /* 80122E0C 0011FD6C 7C 08 03 A6 */ mtlr r0 /* 80122E10 0011FD70 38 21 00 60 */ addi r1, r1, 0x60 -/* 80122E14 0011FD74 4E 80 00 20 */ blr +/* 80122E14 0011FD74 4E 80 00 20 */ blr .global BounceFind__12CSpacePirateFR13CStateManagerf BounceFind__12CSpacePirateFR13CStateManagerf: @@ -3535,7 +3535,7 @@ lbl_80122E58: /* 80123008 0011FF68 81 99 00 00 */ lwz r12, 0(r25) /* 8012300C 0011FF6C 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 80123010 0011FF70 7D 89 03 A6 */ mtctr r12 -/* 80123014 0011FF74 4E 80 04 21 */ bctrl +/* 80123014 0011FF74 4E 80 04 21 */ bctrl /* 80123018 0011FF78 38 81 00 5C */ addi r4, r1, 0x5c /* 8012301C 0011FF7C 38 A1 00 50 */ addi r5, r1, 0x50 /* 80123020 0011FF80 48 0A 3C A9 */ bl PathExists__15CPathFindSearchCFRC9CVector3fRC9CVector3f @@ -3552,7 +3552,7 @@ lbl_80122E58: /* 8012304C 0011FFAC 81 99 00 00 */ lwz r12, 0(r25) /* 80123050 0011FFB0 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 80123054 0011FFB4 7D 89 03 A6 */ mtctr r12 -/* 80123058 0011FFB8 4E 80 04 21 */ bctrl +/* 80123058 0011FFB8 4E 80 04 21 */ bctrl /* 8012305C 0011FFBC 38 81 00 44 */ addi r4, r1, 0x44 /* 80123060 0011FFC0 38 B9 02 E0 */ addi r5, r25, 0x2e0 /* 80123064 0011FFC4 48 0A 3C 65 */ bl PathExists__15CPathFindSearchCFRC9CVector3fRC9CVector3f @@ -3630,13 +3630,13 @@ lbl_80123150: /* 80123168 001200C8 80 01 00 D4 */ lwz r0, 0xd4(r1) /* 8012316C 001200CC 7C 08 03 A6 */ mtlr r0 /* 80123170 001200D0 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 80123174 001200D4 4E 80 00 20 */ blr +/* 80123174 001200D4 4E 80 00 20 */ blr .global BreakAttack__12CSpacePirateFR13CStateManagerf BreakAttack__12CSpacePirateFR13CStateManagerf: /* 80123178 001200D8 88 03 06 35 */ lbz r0, 0x635(r3) /* 8012317C 001200DC 54 03 D7 FE */ rlwinm r3, r0, 0x1a, 0x1f, 0x1f -/* 80123180 001200E0 4E 80 00 20 */ blr +/* 80123180 001200E0 4E 80 00 20 */ blr .global StartAttack__12CSpacePirateFR13CStateManagerf StartAttack__12CSpacePirateFR13CStateManagerf: @@ -3647,10 +3647,10 @@ StartAttack__12CSpacePirateFR13CStateManagerf: /* 80123194 001200F4 50 04 07 FE */ rlwimi r4, r0, 0, 0x1f, 0x1f /* 80123198 001200F8 98 83 06 38 */ stb r4, 0x638(r3) /* 8012319C 001200FC 38 60 00 01 */ li r3, 1 -/* 801231A0 00120100 4E 80 00 20 */ blr +/* 801231A0 00120100 4E 80 00 20 */ blr lbl_801231A4: /* 801231A4 00120104 38 60 00 00 */ li r3, 0 -/* 801231A8 00120108 4E 80 00 20 */ blr +/* 801231A8 00120108 4E 80 00 20 */ blr .global SpecialAttack__12CSpacePirateFR13CStateManager9EStateMsgf SpecialAttack__12CSpacePirateFR13CStateManager9EStateMsgf: @@ -3684,7 +3684,7 @@ lbl_801231EC: /* 80123210 00120170 81 84 00 00 */ lwz r12, 0(r4) /* 80123214 00120174 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 80123218 00120178 7D 89 03 A6 */ mtctr r12 -/* 8012321C 0012017C 4E 80 04 21 */ bctrl +/* 8012321C 0012017C 4E 80 04 21 */ bctrl /* 80123220 00120180 C0 21 00 20 */ lfs f1, 0x20(r1) /* 80123224 00120184 C0 01 00 14 */ lfs f0, 0x14(r1) /* 80123228 00120188 C0 81 00 24 */ lfs f4, 0x24(r1) @@ -3731,7 +3731,7 @@ lbl_801232B8: /* 801232C0 00120220 83 C1 00 38 */ lwz r30, 0x38(r1) /* 801232C4 00120224 7C 08 03 A6 */ mtlr r0 /* 801232C8 00120228 38 21 00 40 */ addi r1, r1, 0x40 -/* 801232CC 0012022C 4E 80 00 20 */ blr +/* 801232CC 0012022C 4E 80 00 20 */ blr .global LostInterest__12CSpacePirateFR13CStateManagerf LostInterest__12CSpacePirateFR13CStateManagerf: @@ -3743,10 +3743,10 @@ LostInterest__12CSpacePirateFR13CStateManagerf: /* 801232E4 00120244 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 801232E8 00120248 40 80 00 0C */ bge lbl_801232F4 /* 801232EC 0012024C 38 60 00 01 */ li r3, 1 -/* 801232F0 00120250 4E 80 00 20 */ blr +/* 801232F0 00120250 4E 80 00 20 */ blr lbl_801232F4: /* 801232F4 00120254 38 60 00 00 */ li r3, 0 -/* 801232F8 00120258 4E 80 00 20 */ blr +/* 801232F8 00120258 4E 80 00 20 */ blr .global ShouldSpecialAttack__12CSpacePirateFR13CStateManagerf ShouldSpecialAttack__12CSpacePirateFR13CStateManagerf: @@ -3761,10 +3761,10 @@ ShouldSpecialAttack__12CSpacePirateFR13CStateManagerf: /* 8012331C 0012027C FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80123320 00120280 40 81 00 0C */ ble lbl_8012332C /* 80123324 00120284 38 60 00 01 */ li r3, 1 -/* 80123328 00120288 4E 80 00 20 */ blr +/* 80123328 00120288 4E 80 00 20 */ blr lbl_8012332C: /* 8012332C 0012028C 38 60 00 00 */ li r3, 0 -/* 80123330 00120290 4E 80 00 20 */ blr +/* 80123330 00120290 4E 80 00 20 */ blr .global JumpBack__12CSpacePirateFR13CStateManager9EStateMsgf JumpBack__12CSpacePirateFR13CStateManager9EStateMsgf: @@ -3786,7 +3786,7 @@ JumpBack__12CSpacePirateFR13CStateManager9EStateMsgf: /* 80123370 001202D0 7C BD 2B 78 */ mr r29, r5 /* 80123374 001202D4 81 8C 01 F0 */ lwz r12, 0x1f0(r12) /* 80123378 001202D8 7D 89 03 A6 */ mtctr r12 -/* 8012337C 001202DC 4E 80 04 21 */ bctrl +/* 8012337C 001202DC 4E 80 04 21 */ bctrl /* 80123380 001202E0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80123384 001202E4 41 82 03 80 */ beq lbl_80123704 /* 80123388 001202E8 2C 1D 00 01 */ cmpwi r29, 1 @@ -3826,7 +3826,7 @@ lbl_801233AC: /* 80123408 00120368 81 9E 00 00 */ lwz r12, 0(r30) /* 8012340C 0012036C 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 80123410 00120370 7D 89 03 A6 */ mtctr r12 -/* 80123414 00120374 4E 80 04 21 */ bctrl +/* 80123414 00120374 4E 80 04 21 */ bctrl /* 80123418 00120378 C3 E3 00 D0 */ lfs f31, 0xd0(r3) /* 8012341C 0012037C 7F C3 F3 78 */ mr r3, r30 /* 80123420 00120380 C0 02 98 1C */ lfs f0, lbl_805AB53C@sda21(r2) @@ -3854,7 +3854,7 @@ lbl_801233AC: /* 80123478 001203D8 81 9E 00 00 */ lwz r12, 0(r30) /* 8012347C 001203DC 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 80123480 001203E0 7D 89 03 A6 */ mtctr r12 -/* 80123484 001203E4 4E 80 04 21 */ bctrl +/* 80123484 001203E4 4E 80 04 21 */ bctrl /* 80123488 001203E8 38 81 00 48 */ addi r4, r1, 0x48 /* 8012348C 001203EC 38 A1 00 6C */ addi r5, r1, 0x6c /* 80123490 001203F0 48 0A 47 DD */ bl Search__15CPathFindSearchFRC9CVector3fRC9CVector3f @@ -3864,7 +3864,7 @@ lbl_801233AC: /* 801234A0 00120400 81 9E 00 00 */ lwz r12, 0(r30) /* 801234A4 00120404 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801234A8 00120408 7D 89 03 A6 */ mtctr r12 -/* 801234AC 0012040C 4E 80 04 21 */ bctrl +/* 801234AC 0012040C 4E 80 04 21 */ bctrl /* 801234B0 00120410 38 83 00 04 */ addi r4, r3, 4 /* 801234B4 00120414 C0 81 00 70 */ lfs f4, 0x70(r1) /* 801234B8 00120418 80 63 00 04 */ lwz r3, 4(r3) @@ -3900,7 +3900,7 @@ lbl_801233AC: /* 80123530 00120490 81 9E 00 00 */ lwz r12, 0(r30) /* 80123534 00120494 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 80123538 00120498 7D 89 03 A6 */ mtctr r12 -/* 8012353C 0012049C 4E 80 04 21 */ bctrl +/* 8012353C 0012049C 4E 80 04 21 */ bctrl /* 80123540 001204A0 38 81 00 30 */ addi r4, r1, 0x30 /* 80123544 001204A4 48 0A 85 2D */ bl RemainingPathDistance__15CPathFindSearchCFR9CVector3f /* 80123548 001204A8 C0 42 98 20 */ lfs f2, lbl_805AB540@sda21(r2) @@ -3914,7 +3914,7 @@ lbl_801233AC: /* 80123568 001204C8 81 9E 00 00 */ lwz r12, 0(r30) /* 8012356C 001204CC 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 80123570 001204D0 7D 89 03 A6 */ mtctr r12 -/* 80123574 001204D4 4E 80 04 21 */ bctrl +/* 80123574 001204D4 4E 80 04 21 */ bctrl /* 80123578 001204D8 38 A3 00 04 */ addi r5, r3, 4 /* 8012357C 001204DC C0 02 98 1C */ lfs f0, lbl_805AB53C@sda21(r2) /* 80123580 001204E0 80 83 00 04 */ lwz r4, 4(r3) @@ -3938,7 +3938,7 @@ lbl_801235C0: /* 801235C4 00120524 81 9E 00 00 */ lwz r12, 0(r30) /* 801235C8 00120528 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801235CC 0012052C 7D 89 03 A6 */ mtctr r12 -/* 801235D0 00120530 4E 80 04 21 */ bctrl +/* 801235D0 00120530 4E 80 04 21 */ bctrl /* 801235D4 00120534 D3 E3 00 D0 */ stfs f31, 0xd0(r3) /* 801235D8 00120538 48 00 01 2C */ b lbl_80123704 lbl_801235DC: @@ -4032,7 +4032,7 @@ lbl_80123704: /* 80123728 00120688 83 A1 00 84 */ lwz r29, 0x84(r1) /* 8012372C 0012068C 7C 08 03 A6 */ mtlr r0 /* 80123730 00120690 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 80123734 00120694 4E 80 00 20 */ blr +/* 80123734 00120694 4E 80 00 20 */ blr .global ShouldJumpBack__12CSpacePirateFR13CStateManagerf ShouldJumpBack__12CSpacePirateFR13CStateManagerf: @@ -4048,7 +4048,7 @@ lbl_80123758: /* 80123758 001206B8 38 80 00 01 */ li r4, 1 lbl_8012375C: /* 8012375C 001206BC 7C 83 23 78 */ mr r3, r4 -/* 80123760 001206C0 4E 80 00 20 */ blr +/* 80123760 001206C0 4E 80 00 20 */ blr .global AnimOver__12CSpacePirateFR13CStateManagerf AnimOver__12CSpacePirateFR13CStateManagerf: @@ -4071,7 +4071,7 @@ lbl_8012379C: /* 8012379C 001206FC 80 01 00 14 */ lwz r0, 0x14(r1) /* 801237A0 00120700 7C 08 03 A6 */ mtlr r0 /* 801237A4 00120704 38 21 00 10 */ addi r1, r1, 0x10 -/* 801237A8 00120708 4E 80 00 20 */ blr +/* 801237A8 00120708 4E 80 00 20 */ blr .global WallDetach__12CSpacePirateFR13CStateManager9EStateMsgf WallDetach__12CSpacePirateFR13CStateManager9EStateMsgf: @@ -4117,7 +4117,7 @@ lbl_80123834: /* 80123834 00120794 80 01 00 14 */ lwz r0, 0x14(r1) /* 80123838 00120798 7C 08 03 A6 */ mtlr r0 /* 8012383C 0012079C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80123840 001207A0 4E 80 00 20 */ blr +/* 80123840 001207A0 4E 80 00 20 */ blr .global WallHang__12CSpacePirateFR13CStateManager9EStateMsgf WallHang__12CSpacePirateFR13CStateManager9EStateMsgf: @@ -4258,7 +4258,7 @@ lbl_80123A28: /* 80123A38 00120998 83 81 00 30 */ lwz r28, 0x30(r1) /* 80123A3C 0012099C 7C 08 03 A6 */ mtlr r0 /* 80123A40 001209A0 38 21 00 40 */ addi r1, r1, 0x40 -/* 80123A44 001209A4 4E 80 00 20 */ blr +/* 80123A44 001209A4 4E 80 00 20 */ blr .global ShouldWallHang__12CSpacePirateFR13CStateManagerf ShouldWallHang__12CSpacePirateFR13CStateManagerf: @@ -4283,7 +4283,7 @@ lbl_80123A84: /* 80123A8C 001209EC 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80123A90 001209F0 7C 08 03 A6 */ mtlr r0 /* 80123A94 001209F4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80123A98 001209F8 4E 80 00 20 */ blr +/* 80123A98 001209F8 4E 80 00 20 */ blr .global TargetCover__12CSpacePirateFR13CStateManager9EStateMsgf TargetCover__12CSpacePirateFR13CStateManager9EStateMsgf: @@ -4326,7 +4326,7 @@ lbl_80123B1C: /* 80123B20 00120A80 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80123B24 00120A84 7C 08 03 A6 */ mtlr r0 /* 80123B28 00120A88 38 21 00 20 */ addi r1, r1, 0x20 -/* 80123B2C 00120A8C 4E 80 00 20 */ blr +/* 80123B2C 00120A8C 4E 80 00 20 */ blr .global HasTargetingPoint__12CSpacePirateFR13CStateManagerf HasTargetingPoint__12CSpacePirateFR13CStateManagerf: @@ -4484,7 +4484,7 @@ lbl_80123D5C: /* 80123D64 00120CC4 80 01 08 A4 */ lwz r0, 0x8a4(r1) /* 80123D68 00120CC8 7C 08 03 A6 */ mtlr r0 /* 80123D6C 00120CCC 38 21 08 A0 */ addi r1, r1, 0x8a0 -/* 80123D70 00120CD0 4E 80 00 20 */ blr +/* 80123D70 00120CD0 4E 80 00 20 */ blr .global Attacked__12CSpacePirateFR13CStateManagerf Attacked__12CSpacePirateFR13CStateManagerf: @@ -4499,7 +4499,7 @@ lbl_80123D8C: /* 80123D8C 00120CEC FC 02 08 40 */ fcmpo cr0, f2, f1 /* 80123D90 00120CF0 7C 00 00 26 */ mfcr r0 /* 80123D94 00120CF4 54 03 0F FE */ srwi r3, r0, 0x1f -/* 80123D98 00120CF8 4E 80 00 20 */ blr +/* 80123D98 00120CF8 4E 80 00 20 */ blr .global ShotAt__12CSpacePirateFR13CStateManagerf ShotAt__12CSpacePirateFR13CStateManagerf: @@ -4514,7 +4514,7 @@ lbl_80123DB4: /* 80123DB4 00120D14 FC 02 08 40 */ fcmpo cr0, f2, f1 /* 80123DB8 00120D18 7C 00 00 26 */ mfcr r0 /* 80123DBC 00120D1C 54 03 0F FE */ srwi r3, r0, 0x1f -/* 80123DC0 00120D20 4E 80 00 20 */ blr +/* 80123DC0 00120D20 4E 80 00 20 */ blr .global ShouldMove__12CSpacePirateFR13CStateManagerf ShouldMove__12CSpacePirateFR13CStateManagerf: @@ -4539,7 +4539,7 @@ lbl_80123E00: /* 80123E08 00120D68 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80123E0C 00120D6C 7C 08 03 A6 */ mtlr r0 /* 80123E10 00120D70 38 21 00 20 */ addi r1, r1, 0x20 -/* 80123E14 00120D74 4E 80 00 20 */ blr +/* 80123E14 00120D74 4E 80 00 20 */ blr .global ShouldRetreat__12CSpacePirateFR13CStateManagerf ShouldRetreat__12CSpacePirateFR13CStateManagerf: @@ -4654,7 +4654,7 @@ lbl_80123FA8: /* 80123FB8 00120F18 83 A1 00 54 */ lwz r29, 0x54(r1) /* 80123FBC 00120F1C 7C 08 03 A6 */ mtlr r0 /* 80123FC0 00120F20 38 21 00 60 */ addi r1, r1, 0x60 -/* 80123FC4 00120F24 4E 80 00 20 */ blr +/* 80123FC4 00120F24 4E 80 00 20 */ blr .global Dodge__12CSpacePirateFR13CStateManager9EStateMsgf Dodge__12CSpacePirateFR13CStateManager9EStateMsgf: @@ -4699,7 +4699,7 @@ lbl_8012401C: /* 80124058 00120FB8 81 83 00 00 */ lwz r12, 0(r3) /* 8012405C 00120FBC 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80124060 00120FC0 7D 89 03 A6 */ mtctr r12 -/* 80124064 00120FC4 4E 80 04 21 */ bctrl +/* 80124064 00120FC4 4E 80 04 21 */ bctrl /* 80124068 00120FC8 C0 03 00 00 */ lfs f0, 0(r3) /* 8012406C 00120FCC C0 9E 07 50 */ lfs f4, 0x750(r30) /* 80124070 00120FD0 C0 22 98 28 */ lfs f1, lbl_805AB548@sda21(r2) @@ -4849,7 +4849,7 @@ lbl_80124274: /* 80124288 001211E8 83 A1 00 44 */ lwz r29, 0x44(r1) /* 8012428C 001211EC 7C 08 03 A6 */ mtlr r0 /* 80124290 001211F0 38 21 00 60 */ addi r1, r1, 0x60 -/* 80124294 001211F4 4E 80 00 20 */ blr +/* 80124294 001211F4 4E 80 00 20 */ blr .global TryRollingDodge__10CPatternedFR13CStateManageri TryRollingDodge__10CPatternedFR13CStateManageri: @@ -4889,7 +4889,7 @@ TryRollingDodge__10CPatternedFR13CStateManageri: /* 8012431C 0012127C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80124320 00121280 7C 08 03 A6 */ mtlr r0 /* 80124324 00121284 38 21 00 20 */ addi r1, r1, 0x20 -/* 80124328 00121288 4E 80 00 20 */ blr +/* 80124328 00121288 4E 80 00 20 */ blr .global ShouldDodge__12CSpacePirateFR13CStateManagerf ShouldDodge__12CSpacePirateFR13CStateManagerf: @@ -5007,7 +5007,7 @@ lbl_801244B4: /* 801244DC 0012143C 83 A1 00 44 */ lwz r29, 0x44(r1) /* 801244E0 00121440 7C 08 03 A6 */ mtlr r0 /* 801244E4 00121444 38 21 00 80 */ addi r1, r1, 0x80 -/* 801244E8 00121448 4E 80 00 20 */ blr +/* 801244E8 00121448 4E 80 00 20 */ blr .global TurnAround__12CSpacePirateFR13CStateManager9EStateMsgf TurnAround__12CSpacePirateFR13CStateManager9EStateMsgf: @@ -5097,7 +5097,7 @@ lbl_8012461C: /* 80124624 00121584 83 C1 00 48 */ lwz r30, 0x48(r1) /* 80124628 00121588 7C 08 03 A6 */ mtlr r0 /* 8012462C 0012158C 38 21 00 50 */ addi r1, r1, 0x50 -/* 80124630 00121590 4E 80 00 20 */ blr +/* 80124630 00121590 4E 80 00 20 */ blr .global Shuffle__12CSpacePirateFR13CStateManager9EStateMsgf Shuffle__12CSpacePirateFR13CStateManager9EStateMsgf: @@ -5130,7 +5130,7 @@ lbl_8012467C: /* 80124698 001215F8 C0 22 97 BC */ lfs f1, lbl_805AB4DC@sda21(r2) /* 8012469C 001215FC 81 8C 01 9C */ lwz r12, 0x19c(r12) /* 801246A0 00121600 7D 89 03 A6 */ mtctr r12 -/* 801246A4 00121604 4E 80 04 21 */ bctrl +/* 801246A4 00121604 4E 80 04 21 */ bctrl /* 801246A8 00121608 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801246AC 0012160C 41 82 01 18 */ beq lbl_801247C4 /* 801246B0 00121610 C0 22 97 BC */ lfs f1, lbl_805AB4DC@sda21(r2) @@ -5336,13 +5336,13 @@ lbl_80124994: /* 801249B8 00121918 83 A1 00 E4 */ lwz r29, 0xe4(r1) /* 801249BC 0012191C 7C 08 03 A6 */ mtlr r0 /* 801249C0 00121920 38 21 01 20 */ addi r1, r1, 0x120 -/* 801249C4 00121924 4E 80 00 20 */ blr +/* 801249C4 00121924 4E 80 00 20 */ blr .global InRange__12CSpacePirateFR13CStateManagerf InRange__12CSpacePirateFR13CStateManagerf: /* 801249C8 00121928 88 03 06 39 */ lbz r0, 0x639(r3) /* 801249CC 0012192C 54 03 E7 FE */ rlwinm r3, r0, 0x1c, 0x1f, 0x1f -/* 801249D0 00121930 4E 80 00 20 */ blr +/* 801249D0 00121930 4E 80 00 20 */ blr .global PathFind__12CSpacePirateFR13CStateManager9EStateMsgf PathFind__12CSpacePirateFR13CStateManager9EStateMsgf: @@ -5407,7 +5407,7 @@ lbl_80124A94: /* 80124AB0 00121A10 81 9A 00 00 */ lwz r12, 0(r26) /* 80124AB4 00121A14 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 80124AB8 00121A18 7D 89 03 A6 */ mtctr r12 -/* 80124ABC 00121A1C 4E 80 04 21 */ bctrl +/* 80124ABC 00121A1C 4E 80 04 21 */ bctrl /* 80124AC0 00121A20 38 81 01 0C */ addi r4, r1, 0x10c /* 80124AC4 00121A24 38 BA 02 E0 */ addi r5, r26, 0x2e0 /* 80124AC8 00121A28 48 0A 31 A5 */ bl Search__15CPathFindSearchFRC9CVector3fRC9CVector3f @@ -5423,7 +5423,7 @@ lbl_80124A94: /* 80124AF0 00121A50 81 9A 00 00 */ lwz r12, 0(r26) /* 80124AF4 00121A54 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 80124AF8 00121A58 7D 89 03 A6 */ mtctr r12 -/* 80124AFC 00121A5C 4E 80 04 21 */ bctrl +/* 80124AFC 00121A5C 4E 80 04 21 */ bctrl /* 80124B00 00121A60 80 A3 00 C8 */ lwz r5, 0xc8(r3) /* 80124B04 00121A64 80 03 00 04 */ lwz r0, 4(r3) /* 80124B08 00121A68 38 85 00 01 */ addi r4, r5, 1 @@ -5604,7 +5604,7 @@ lbl_80124BE0: /* 80124DB4 00121D14 81 9A 00 00 */ lwz r12, 0(r26) /* 80124DB8 00121D18 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 80124DBC 00121D1C 7D 89 03 A6 */ mtctr r12 -/* 80124DC0 00121D20 4E 80 04 21 */ bctrl +/* 80124DC0 00121D20 4E 80 04 21 */ bctrl /* 80124DC4 00121D24 38 81 00 C4 */ addi r4, r1, 0xc4 /* 80124DC8 00121D28 38 A1 00 B8 */ addi r5, r1, 0xb8 /* 80124DCC 00121D2C 48 0A 1E FD */ bl PathExists__15CPathFindSearchCFRC9CVector3fRC9CVector3f @@ -5621,7 +5621,7 @@ lbl_80124BE0: /* 80124DF8 00121D58 81 9A 00 00 */ lwz r12, 0(r26) /* 80124DFC 00121D5C 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 80124E00 00121D60 7D 89 03 A6 */ mtctr r12 -/* 80124E04 00121D64 4E 80 04 21 */ bctrl +/* 80124E04 00121D64 4E 80 04 21 */ bctrl /* 80124E08 00121D68 38 81 00 AC */ addi r4, r1, 0xac /* 80124E0C 00121D6C 38 BA 02 E0 */ addi r5, r26, 0x2e0 /* 80124E10 00121D70 48 0A 1E B9 */ bl PathExists__15CPathFindSearchCFRC9CVector3fRC9CVector3f @@ -5673,7 +5673,7 @@ lbl_80124E74: /* 80124EB0 00121E10 81 9A 00 00 */ lwz r12, 0(r26) /* 80124EB4 00121E14 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 80124EB8 00121E18 7D 89 03 A6 */ mtctr r12 -/* 80124EBC 00121E1C 4E 80 04 21 */ bctrl +/* 80124EBC 00121E1C 4E 80 04 21 */ bctrl /* 80124EC0 00121E20 38 81 00 A0 */ addi r4, r1, 0xa0 /* 80124EC4 00121E24 38 BA 02 E0 */ addi r5, r26, 0x2e0 /* 80124EC8 00121E28 48 0A 2D A5 */ bl Search__15CPathFindSearchFRC9CVector3fRC9CVector3f @@ -5689,7 +5689,7 @@ lbl_80124E74: /* 80124EF0 00121E50 81 9A 00 00 */ lwz r12, 0(r26) /* 80124EF4 00121E54 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 80124EF8 00121E58 7D 89 03 A6 */ mtctr r12 -/* 80124EFC 00121E5C 4E 80 04 21 */ bctrl +/* 80124EFC 00121E5C 4E 80 04 21 */ bctrl /* 80124F00 00121E60 80 A3 00 C8 */ lwz r5, 0xc8(r3) /* 80124F04 00121E64 80 03 00 04 */ lwz r0, 4(r3) /* 80124F08 00121E68 38 85 00 01 */ addi r4, r5, 1 @@ -5948,7 +5948,7 @@ lbl_801252B8: /* 801252D4 00122234 80 01 01 A4 */ lwz r0, 0x1a4(r1) /* 801252D8 00122238 7C 08 03 A6 */ mtlr r0 /* 801252DC 0012223C 38 21 01 A0 */ addi r1, r1, 0x1a0 -/* 801252E0 00122240 4E 80 00 20 */ blr +/* 801252E0 00122240 4E 80 00 20 */ blr .global LineOfSight__12CSpacePirateFR13CStateManagerf LineOfSight__12CSpacePirateFR13CStateManagerf: @@ -5956,7 +5956,7 @@ LineOfSight__12CSpacePirateFR13CStateManagerf: /* 801252E8 00122248 54 00 EF FE */ rlwinm r0, r0, 0x1d, 0x1f, 0x1f /* 801252EC 0012224C 7C 00 00 34 */ cntlzw r0, r0 /* 801252F0 00122250 54 03 D9 7E */ srwi r3, r0, 5 -/* 801252F4 00122254 4E 80 00 20 */ blr +/* 801252F4 00122254 4E 80 00 20 */ blr .global SpotPlayer__12CSpacePirateFR13CStateManagerf SpotPlayer__12CSpacePirateFR13CStateManagerf: @@ -6001,7 +6001,7 @@ SpotPlayer__12CSpacePirateFR13CStateManagerf: /* 80125390 001222F0 80 01 00 34 */ lwz r0, 0x34(r1) /* 80125394 001222F4 7C 08 03 A6 */ mtlr r0 /* 80125398 001222F8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8012539C 001222FC 4E 80 00 20 */ blr +/* 8012539C 001222FC 4E 80 00 20 */ blr .global Approach__12CSpacePirateFR13CStateManager9EStateMsgf Approach__12CSpacePirateFR13CStateManager9EStateMsgf: @@ -6029,7 +6029,7 @@ lbl_801253E8: /* 801253E8 00122348 80 01 00 14 */ lwz r0, 0x14(r1) /* 801253EC 0012234C 7C 08 03 A6 */ mtlr r0 /* 801253F0 00122350 38 21 00 10 */ addi r1, r1, 0x10 -/* 801253F4 00122354 4E 80 00 20 */ blr +/* 801253F4 00122354 4E 80 00 20 */ blr .global Flee__12CSpacePirateFR13CStateManager9EStateMsgf Flee__12CSpacePirateFR13CStateManager9EStateMsgf: @@ -6102,7 +6102,7 @@ lbl_801254F0: /* 801254F4 00122454 83 E1 00 4C */ lwz r31, 0x4c(r1) /* 801254F8 00122458 7C 08 03 A6 */ mtlr r0 /* 801254FC 0012245C 38 21 00 50 */ addi r1, r1, 0x50 -/* 80125500 00122460 4E 80 00 20 */ blr +/* 80125500 00122460 4E 80 00 20 */ blr .global Skid__12CSpacePirateFR13CStateManager9EStateMsgf Skid__12CSpacePirateFR13CStateManager9EStateMsgf: @@ -6172,7 +6172,7 @@ lbl_801255E8: /* 801255EC 0012254C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801255F0 00122550 7C 08 03 A6 */ mtlr r0 /* 801255F4 00122554 38 21 00 20 */ addi r1, r1, 0x20 -/* 801255F8 00122558 4E 80 00 20 */ blr +/* 801255F8 00122558 4E 80 00 20 */ blr .global ShouldStrafe__12CSpacePirateFR13CStateManagerf ShouldStrafe__12CSpacePirateFR13CStateManagerf: @@ -6348,7 +6348,7 @@ lbl_80125864: /* 80125890 001227F0 83 81 00 90 */ lwz r28, 0x90(r1) /* 80125894 001227F4 7C 08 03 A6 */ mtlr r0 /* 80125898 001227F8 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 8012589C 001227FC 4E 80 00 20 */ blr +/* 8012589C 001227FC 4E 80 00 20 */ blr .global Crouch__12CSpacePirateFR13CStateManager9EStateMsgf Crouch__12CSpacePirateFR13CStateManager9EStateMsgf: @@ -6399,7 +6399,7 @@ lbl_80125930: /* 80125948 001228A8 81 9D 00 00 */ lwz r12, 0(r29) /* 8012594C 001228AC 81 8C 00 C0 */ lwz r12, 0xc0(r12) /* 80125950 001228B0 7D 89 03 A6 */ mtctr r12 -/* 80125954 001228B4 4E 80 04 21 */ bctrl +/* 80125954 001228B4 4E 80 04 21 */ bctrl /* 80125958 001228B8 38 00 FF FF */ li r0, -1 /* 8012595C 001228BC 90 1D 07 9C */ stw r0, 0x79c(r29) /* 80125960 001228C0 48 00 00 24 */ b lbl_80125984 @@ -6421,7 +6421,7 @@ lbl_80125984: /* 80125998 001228F8 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8012599C 001228FC 7C 08 03 A6 */ mtlr r0 /* 801259A0 00122900 38 21 00 30 */ addi r1, r1, 0x30 -/* 801259A4 00122904 4E 80 00 20 */ blr +/* 801259A4 00122904 4E 80 00 20 */ blr .global ShouldCrouch__12CSpacePirateFR13CStateManagerf ShouldCrouch__12CSpacePirateFR13CStateManagerf: @@ -6444,7 +6444,7 @@ lbl_801259DC: /* 801259E4 00122944 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801259E8 00122948 7C 08 03 A6 */ mtlr r0 /* 801259EC 0012294C 38 21 00 20 */ addi r1, r1, 0x20 -/* 801259F0 00122950 4E 80 00 20 */ blr +/* 801259F0 00122950 4E 80 00 20 */ blr .global DoubleSnap__12CSpacePirateFR13CStateManager9EStateMsgf DoubleSnap__12CSpacePirateFR13CStateManager9EStateMsgf: @@ -6686,7 +6686,7 @@ lbl_80125D50: /* 80125D78 00122CD8 83 C1 00 68 */ lwz r30, 0x68(r1) /* 80125D7C 00122CDC 7C 08 03 A6 */ mtlr r0 /* 80125D80 00122CE0 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 80125D84 00122CE4 4E 80 00 20 */ blr +/* 80125D84 00122CE4 4E 80 00 20 */ blr .global "remove__Q24rstl43list<9TUniqueId,Q24rstl17rmemory_allocator>FRC9TUniqueId" "remove__Q24rstl43list<9TUniqueId,Q24rstl17rmemory_allocator>FRC9TUniqueId": @@ -6724,7 +6724,7 @@ lbl_80125DE4: /* 80125DF8 00122D58 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80125DFC 00122D5C 7C 08 03 A6 */ mtlr r0 /* 80125E00 00122D60 38 21 00 20 */ addi r1, r1, 0x20 -/* 80125E04 00122D64 4E 80 00 20 */ blr +/* 80125E04 00122D64 4E 80 00 20 */ blr .global Attack__12CSpacePirateFR13CStateManager9EStateMsgf Attack__12CSpacePirateFR13CStateManager9EStateMsgf: @@ -6928,7 +6928,7 @@ lbl_801260E8: /* 801260F8 00123058 83 C1 00 78 */ lwz r30, 0x78(r1) /* 801260FC 0012305C 7C 08 03 A6 */ mtlr r0 /* 80126100 00123060 38 21 00 90 */ addi r1, r1, 0x90 -/* 80126104 00123064 4E 80 00 20 */ blr +/* 80126104 00123064 4E 80 00 20 */ blr .global Enraged__12CSpacePirateFR13CStateManager9EStateMsgf Enraged__12CSpacePirateFR13CStateManager9EStateMsgf: @@ -6955,7 +6955,7 @@ lbl_80126150: /* 80126150 001230B0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80126154 001230B4 7C 08 03 A6 */ mtlr r0 /* 80126158 001230B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8012615C 001230BC 4E 80 00 20 */ blr +/* 8012615C 001230BC 4E 80 00 20 */ blr .global CoverAttack__12CSpacePirateFR13CStateManager9EStateMsgf CoverAttack__12CSpacePirateFR13CStateManager9EStateMsgf: @@ -7008,7 +7008,7 @@ lbl_801261FC: /* 80126200 00123160 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80126204 00123164 7C 08 03 A6 */ mtlr r0 /* 80126208 00123168 38 21 00 20 */ addi r1, r1, 0x20 -/* 8012620C 0012316C 4E 80 00 20 */ blr +/* 8012620C 0012316C 4E 80 00 20 */ blr .global Cover__12CSpacePirateFR13CStateManager9EStateMsgf Cover__12CSpacePirateFR13CStateManager9EStateMsgf: @@ -7113,7 +7113,7 @@ lbl_80126374: /* 80126380 001232E0 83 A1 00 34 */ lwz r29, 0x34(r1) /* 80126384 001232E4 7C 08 03 A6 */ mtlr r0 /* 80126388 001232E8 38 21 00 40 */ addi r1, r1, 0x40 -/* 8012638C 001232EC 4E 80 00 20 */ blr +/* 8012638C 001232EC 4E 80 00 20 */ blr .global ShouldAttack__12CSpacePirateFR13CStateManagerf ShouldAttack__12CSpacePirateFR13CStateManagerf: @@ -7230,7 +7230,7 @@ lbl_8012650C: /* 80126534 00123494 80 01 00 94 */ lwz r0, 0x94(r1) /* 80126538 00123498 7C 08 03 A6 */ mtlr r0 /* 8012653C 0012349C 38 21 00 90 */ addi r1, r1, 0x90 -/* 80126540 001234A0 4E 80 00 20 */ blr +/* 80126540 001234A0 4E 80 00 20 */ blr .global CoveringFire__12CSpacePirateFR13CStateManagerf CoveringFire__12CSpacePirateFR13CStateManagerf: @@ -7286,7 +7286,7 @@ lbl_801265DC: /* 801265F8 00123558 83 81 00 10 */ lwz r28, 0x10(r1) /* 801265FC 0012355C 7C 08 03 A6 */ mtlr r0 /* 80126600 00123560 38 21 00 20 */ addi r1, r1, 0x20 -/* 80126604 00123564 4E 80 00 20 */ blr +/* 80126604 00123564 4E 80 00 20 */ blr .global CoverNearlyBlown__12CSpacePirateFR13CStateManagerf CoverNearlyBlown__12CSpacePirateFR13CStateManagerf: @@ -7330,7 +7330,7 @@ lbl_8012668C: /* 80126698 001235F8 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8012669C 001235FC 7C 08 03 A6 */ mtlr r0 /* 801266A0 00123600 38 21 00 20 */ addi r1, r1, 0x20 -/* 801266A4 00123604 4E 80 00 20 */ blr +/* 801266A4 00123604 4E 80 00 20 */ blr .global CoverBlown__12CSpacePirateFR13CStateManagerf CoverBlown__12CSpacePirateFR13CStateManagerf: @@ -7420,7 +7420,7 @@ lbl_801267DC: /* 801267F0 00123750 83 81 00 30 */ lwz r28, 0x30(r1) /* 801267F4 00123754 7C 08 03 A6 */ mtlr r0 /* 801267F8 00123758 38 21 00 40 */ addi r1, r1, 0x40 -/* 801267FC 0012375C 4E 80 00 20 */ blr +/* 801267FC 0012375C 4E 80 00 20 */ blr .global CoverFind__12CSpacePirateFR13CStateManagerf CoverFind__12CSpacePirateFR13CStateManagerf: @@ -7567,13 +7567,13 @@ lbl_80126A04: /* 80126A1C 0012397C 80 01 00 94 */ lwz r0, 0x94(r1) /* 80126A20 00123980 7C 08 03 A6 */ mtlr r0 /* 80126A24 00123984 38 21 00 90 */ addi r1, r1, 0x90 -/* 80126A28 00123988 4E 80 00 20 */ blr +/* 80126A28 00123988 4E 80 00 20 */ blr .global CoverCheck__12CSpacePirateFR13CStateManagerf CoverCheck__12CSpacePirateFR13CStateManagerf: /* 80126A2C 0012398C 88 03 06 38 */ lbz r0, 0x638(r3) /* 80126A30 00123990 54 03 E7 FE */ rlwinm r3, r0, 0x1c, 0x1f, 0x1f -/* 80126A34 00123994 4E 80 00 20 */ blr +/* 80126A34 00123994 4E 80 00 20 */ blr .global AggressionCheck__12CSpacePirateFR13CStateManagerf AggressionCheck__12CSpacePirateFR13CStateManagerf: @@ -7670,7 +7670,7 @@ lbl_80126B74: /* 80126B7C 00123ADC 80 01 00 44 */ lwz r0, 0x44(r1) /* 80126B80 00123AE0 7C 08 03 A6 */ mtlr r0 /* 80126B84 00123AE4 38 21 00 40 */ addi r1, r1, 0x40 -/* 80126B88 00123AE8 4E 80 00 20 */ blr +/* 80126B88 00123AE8 4E 80 00 20 */ blr .global Lurk__12CSpacePirateFR13CStateManager9EStateMsgf Lurk__12CSpacePirateFR13CStateManager9EStateMsgf: @@ -7891,7 +7891,7 @@ lbl_80126EAC: /* 80126EBC 00123E1C 83 C1 00 58 */ lwz r30, 0x58(r1) /* 80126EC0 00123E20 7C 08 03 A6 */ mtlr r0 /* 80126EC4 00123E24 38 21 00 70 */ addi r1, r1, 0x70 -/* 80126EC8 00123E28 4E 80 00 20 */ blr +/* 80126EC8 00123E28 4E 80 00 20 */ blr .global GetUp__12CSpacePirateFR13CStateManager9EStateMsgf GetUp__12CSpacePirateFR13CStateManager9EStateMsgf: @@ -7978,7 +7978,7 @@ lbl_80126FE0: /* 80126FF0 00123F50 83 C1 00 38 */ lwz r30, 0x38(r1) /* 80126FF4 00123F54 7C 08 03 A6 */ mtlr r0 /* 80126FF8 00123F58 38 21 00 50 */ addi r1, r1, 0x50 -/* 80126FFC 00123F5C 4E 80 00 20 */ blr +/* 80126FFC 00123F5C 4E 80 00 20 */ blr .global Taunt__12CSpacePirateFR13CStateManager9EStateMsgf Taunt__12CSpacePirateFR13CStateManager9EStateMsgf: @@ -8247,19 +8247,19 @@ lbl_801273B8: /* 801273C8 00124328 83 81 00 F0 */ lwz r28, 0xf0(r1) /* 801273CC 0012432C 7C 08 03 A6 */ mtlr r0 /* 801273D0 00124330 38 21 01 00 */ addi r1, r1, 0x100 -/* 801273D4 00124334 4E 80 00 20 */ blr +/* 801273D4 00124334 4E 80 00 20 */ blr .global Run__12CSpacePirateFR13CStateManager9EStateMsgf Run__12CSpacePirateFR13CStateManager9EStateMsgf: /* 801273D8 00124338 C0 02 97 D8 */ lfs f0, lbl_805AB4F8@sda21(r2) /* 801273DC 0012433C D0 03 06 44 */ stfs f0, 0x644(r3) -/* 801273E0 00124340 4E 80 00 20 */ blr +/* 801273E0 00124340 4E 80 00 20 */ blr .global Halt__12CSpacePirateFR13CStateManager9EStateMsgf Halt__12CSpacePirateFR13CStateManager9EStateMsgf: /* 801273E4 00124344 C0 02 97 BC */ lfs f0, lbl_805AB4DC@sda21(r2) /* 801273E8 00124348 D0 03 06 44 */ stfs f0, 0x644(r3) -/* 801273EC 0012434C 4E 80 00 20 */ blr +/* 801273EC 0012434C 4E 80 00 20 */ blr .global HearPlayer__12CSpacePirateFR13CStateManagerf HearPlayer__12CSpacePirateFR13CStateManagerf: @@ -8295,7 +8295,7 @@ HearPlayer__12CSpacePirateFR13CStateManagerf: /* 80127464 001243C4 38 00 00 01 */ li r0, 1 lbl_80127468: /* 80127468 001243C8 7C 03 03 78 */ mr r3, r0 -/* 8012746C 001243CC 4E 80 00 20 */ blr +/* 8012746C 001243CC 4E 80 00 20 */ blr .global HearShot__12CSpacePirateFR13CStateManagerf HearShot__12CSpacePirateFR13CStateManagerf: @@ -8305,7 +8305,7 @@ HearShot__12CSpacePirateFR13CStateManagerf: /* 8012747C 001243DC 50 05 36 72 */ rlwimi r5, r0, 6, 0x19, 0x19 /* 80127480 001243E0 98 A3 06 36 */ stb r5, 0x636(r3) /* 80127484 001243E4 7C 83 23 78 */ mr r3, r4 -/* 80127488 001243E8 4E 80 00 20 */ blr +/* 80127488 001243E8 4E 80 00 20 */ blr .global PatternOver__12CSpacePirateFR13CStateManagerf PatternOver__12CSpacePirateFR13CStateManagerf: @@ -8314,7 +8314,7 @@ PatternOver__12CSpacePirateFR13CStateManagerf: /* 80127494 001243F4 7C 03 00 50 */ subf r0, r3, r0 /* 80127498 001243F8 7C 00 00 34 */ cntlzw r0, r0 /* 8012749C 001243FC 54 03 D9 7E */ srwi r3, r0, 5 -/* 801274A0 00124400 4E 80 00 20 */ blr +/* 801274A0 00124400 4E 80 00 20 */ blr .global TargetPatrol__12CSpacePirateFR13CStateManager9EStateMsgf TargetPatrol__12CSpacePirateFR13CStateManager9EStateMsgf: @@ -8506,7 +8506,7 @@ lbl_80127730: /* 80127750 001246B0 83 81 00 50 */ lwz r28, 0x50(r1) /* 80127754 001246B4 7C 08 03 A6 */ mtlr r0 /* 80127758 001246B8 38 21 00 80 */ addi r1, r1, 0x80 -/* 8012775C 001246BC 4E 80 00 20 */ blr +/* 8012775C 001246BC 4E 80 00 20 */ blr .global Patrol__12CSpacePirateFR13CStateManager9EStateMsgf Patrol__12CSpacePirateFR13CStateManager9EStateMsgf: @@ -8626,7 +8626,7 @@ lbl_801278E0: /* 80127900 00124860 83 81 00 10 */ lwz r28, 0x10(r1) /* 80127904 00124864 7C 08 03 A6 */ mtlr r0 /* 80127908 00124868 38 21 00 40 */ addi r1, r1, 0x40 -/* 8012790C 0012486C 4E 80 00 20 */ blr +/* 8012790C 0012486C 4E 80 00 20 */ blr .global Generate__12CSpacePirateFR13CStateManager9EStateMsgf Generate__12CSpacePirateFR13CStateManager9EStateMsgf: @@ -8795,7 +8795,7 @@ lbl_80127B68: /* 80127B70 00124AD0 83 C1 00 38 */ lwz r30, 0x38(r1) /* 80127B74 00124AD4 7C 08 03 A6 */ mtlr r0 /* 80127B78 00124AD8 38 21 00 40 */ addi r1, r1, 0x40 -/* 80127B7C 00124ADC 4E 80 00 20 */ blr +/* 80127B7C 00124ADC 4E 80 00 20 */ blr .global PatternShagged__12CSpacePirateFR13CStateManagerf PatternShagged__12CSpacePirateFR13CStateManagerf: @@ -8830,7 +8830,7 @@ lbl_80127BD4: /* 80127BE8 00124B48 83 A1 00 0C */ lwz r29, 0xc(r1) /* 80127BEC 00124B4C 7C 08 03 A6 */ mtlr r0 /* 80127BF0 00124B50 38 21 00 20 */ addi r1, r1, 0x20 -/* 80127BF4 00124B54 4E 80 00 20 */ blr +/* 80127BF4 00124B54 4E 80 00 20 */ blr .global Stuck__12CSpacePirateFR13CStateManagerf Stuck__12CSpacePirateFR13CStateManagerf: @@ -8874,7 +8874,7 @@ lbl_80127C68: /* 80127C80 00124BE0 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80127C84 00124BE4 7C 08 03 A6 */ mtlr r0 /* 80127C88 00124BE8 38 21 00 30 */ addi r1, r1, 0x30 -/* 80127C8C 00124BEC 4E 80 00 20 */ blr +/* 80127C8C 00124BEC 4E 80 00 20 */ blr .global Death__12CSpacePirateFRC9CVector3fR13CStateManager Death__12CSpacePirateFRC9CVector3fR13CStateManager: @@ -8933,7 +8933,7 @@ lbl_80127D58: /* 80127D5C 00124CBC 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 80127D60 00124CC0 7C 08 03 A6 */ mtlr r0 /* 80127D64 00124CC4 38 21 00 30 */ addi r1, r1, 0x30 -/* 80127D68 00124CC8 4E 80 00 20 */ blr +/* 80127D68 00124CC8 4E 80 00 20 */ blr .global KnockBack__12CSpacePirateFRC9CVector3fR13CStateManagerRC11CDamageInfo14EKnockBackTypef KnockBack__12CSpacePirateFRC9CVector3fR13CStateManagerRC11CDamageInfo14EKnockBackTypef: @@ -8969,7 +8969,7 @@ lbl_80127DC0: /* 80127DDC 00124D3C 81 9A 00 00 */ lwz r12, 0(r26) /* 80127DE0 00124D40 81 8C 02 B8 */ lwz r12, 0x2b8(r12) /* 80127DE4 00124D44 7D 89 03 A6 */ mtctr r12 -/* 80127DE8 00124D48 4E 80 04 21 */ bctrl +/* 80127DE8 00124D48 4E 80 04 21 */ bctrl /* 80127DEC 00124D4C 7C 65 1B 78 */ mr r5, r3 /* 80127DF0 00124D50 38 7A 04 60 */ addi r3, r26, 0x460 /* 80127DF4 00124D54 38 80 00 02 */ li r4, 2 @@ -9150,7 +9150,7 @@ lbl_80128080: /* 8012808C 00124FEC 80 01 00 74 */ lwz r0, 0x74(r1) /* 80128090 00124FF0 7C 08 03 A6 */ mtlr r0 /* 80128094 00124FF4 38 21 00 70 */ addi r1, r1, 0x70 -/* 80128098 00124FF8 4E 80 00 20 */ blr +/* 80128098 00124FF8 4E 80 00 20 */ blr .global TryWallHang__10CPatternedFR13CStateManageri TryWallHang__10CPatternedFR13CStateManageri: @@ -9188,7 +9188,7 @@ TryWallHang__10CPatternedFR13CStateManageri: /* 80128118 00125078 80 01 00 24 */ lwz r0, 0x24(r1) /* 8012811C 0012507C 7C 08 03 A6 */ mtlr r0 /* 80128120 00125080 38 21 00 20 */ addi r1, r1, 0x20 -/* 80128124 00125084 4E 80 00 20 */ blr +/* 80128124 00125084 4E 80 00 20 */ blr .global __dt__14CBCWallHangCmdFv __dt__14CBCWallHangCmdFv: @@ -9216,7 +9216,7 @@ lbl_8012816C: /* 80128174 001250D4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80128178 001250D8 7C 08 03 A6 */ mtlr r0 /* 8012817C 001250DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80128180 001250E0 4E 80 00 20 */ blr +/* 80128180 001250E0 4E 80 00 20 */ blr .global TryCover__10CPatternedFR13CStateManageri TryCover__10CPatternedFR13CStateManageri: @@ -9289,7 +9289,7 @@ lbl_80128280: /* 80128288 001251E8 83 C1 00 38 */ lwz r30, 0x38(r1) /* 8012828C 001251EC 7C 08 03 A6 */ mtlr r0 /* 80128290 001251F0 38 21 00 40 */ addi r1, r1, 0x40 -/* 80128294 001251F4 4E 80 00 20 */ blr +/* 80128294 001251F4 4E 80 00 20 */ blr .global __dt__11CBCCoverCmdFv __dt__11CBCCoverCmdFv: @@ -9317,7 +9317,7 @@ lbl_801282DC: /* 801282E4 00125244 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801282E8 00125248 7C 08 03 A6 */ mtlr r0 /* 801282EC 0012524C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801282F0 00125250 4E 80 00 20 */ blr +/* 801282F0 00125250 4E 80 00 20 */ blr .global SetNonCinematicCollision__12CSpacePirateFR13CStateManager SetNonCinematicCollision__12CSpacePirateFR13CStateManager: @@ -9365,7 +9365,7 @@ SetNonCinematicCollision__12CSpacePirateFR13CStateManager: /* 80128398 001252F8 83 81 00 20 */ lwz r28, 0x20(r1) /* 8012839C 001252FC 7C 08 03 A6 */ mtlr r0 /* 801283A0 00125300 38 21 00 30 */ addi r1, r1, 0x30 -/* 801283A4 00125304 4E 80 00 20 */ blr +/* 801283A4 00125304 4E 80 00 20 */ blr .global SetCinematicCollision__12CSpacePirateFR13CStateManager SetCinematicCollision__12CSpacePirateFR13CStateManager: @@ -9407,7 +9407,7 @@ SetCinematicCollision__12CSpacePirateFR13CStateManager: /* 80128434 00125394 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80128438 00125398 7C 08 03 A6 */ mtlr r0 /* 8012843C 0012539C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80128440 001253A0 4E 80 00 20 */ blr +/* 80128440 001253A0 4E 80 00 20 */ blr .global GetTargetPos__12CSpacePirateFR13CStateManager GetTargetPos__12CSpacePirateFR13CStateManager: @@ -9472,7 +9472,7 @@ lbl_80128514: /* 80128520 00125480 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80128524 00125484 7C 08 03 A6 */ mtlr r0 /* 80128528 00125488 38 21 00 30 */ addi r1, r1, 0x30 -/* 8012852C 0012548C 4E 80 00 20 */ blr +/* 8012852C 0012548C 4E 80 00 20 */ blr .global CheckBlade__12CSpacePirateFR13CStateManager CheckBlade__12CSpacePirateFR13CStateManager: @@ -9583,7 +9583,7 @@ lbl_801286C0: /* 801286CC 0012562C 83 A1 00 F4 */ lwz r29, 0xf4(r1) /* 801286D0 00125630 7C 08 03 A6 */ mtlr r0 /* 801286D4 00125634 38 21 01 00 */ addi r1, r1, 0x100 -/* 801286D8 00125638 4E 80 00 20 */ blr +/* 801286D8 00125638 4E 80 00 20 */ blr .global GetStrafeDir__12CSpacePirateCFR13CStateManagerf GetStrafeDir__12CSpacePirateCFR13CStateManagerf: @@ -9750,7 +9750,7 @@ lbl_80128910: /* 80128928 00125888 80 01 00 84 */ lwz r0, 0x84(r1) /* 8012892C 0012588C 7C 08 03 A6 */ mtlr r0 /* 80128930 00125890 38 21 00 80 */ addi r1, r1, 0x80 -/* 80128934 00125894 4E 80 00 20 */ blr +/* 80128934 00125894 4E 80 00 20 */ blr .global CantJumpBack__12CSpacePirateFR13CStateManagerR9CVector3ff CantJumpBack__12CSpacePirateFR13CStateManagerR9CVector3ff: @@ -9921,7 +9921,7 @@ lbl_80128BB0: /* 80128BC0 00125B20 80 01 01 24 */ lwz r0, 0x124(r1) /* 80128BC4 00125B24 7C 08 03 A6 */ mtlr r0 /* 80128BC8 00125B28 38 21 01 20 */ addi r1, r1, 0x120 -/* 80128BCC 00125B2C 4E 80 00 20 */ blr +/* 80128BCC 00125B2C 4E 80 00 20 */ blr .global AvoidActors__12CSpacePirateFR13CStateManager AvoidActors__12CSpacePirateFR13CStateManager: @@ -10061,7 +10061,7 @@ lbl_80128DC0: /* 80128DCC 00125D2C 80 01 00 84 */ lwz r0, 0x84(r1) /* 80128DD0 00125D30 7C 08 03 A6 */ mtlr r0 /* 80128DD4 00125D34 38 21 00 80 */ addi r1, r1, 0x80 -/* 80128DD8 00125D38 4E 80 00 20 */ blr +/* 80128DD8 00125D38 4E 80 00 20 */ blr .global Random2f__FR13CStateManagerff Random2f__FR13CStateManagerff: @@ -10130,7 +10130,7 @@ lbl_80128E60: /* 80128ED0 00125E30 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80128ED4 00125E34 7C 08 03 A6 */ mtlr r0 /* 80128ED8 00125E38 38 21 00 50 */ addi r1, r1, 0x50 -/* 80128EDC 00125E3C 4E 80 00 20 */ blr +/* 80128EDC 00125E3C 4E 80 00 20 */ blr .global UpdateHeldPosition__12CSpacePirateFR13CStateManagerf UpdateHeldPosition__12CSpacePirateFR13CStateManagerf: @@ -10182,7 +10182,7 @@ lbl_80128F80: /* 80128F8C 00125EEC 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 80128F90 00125EF0 7C 08 03 A6 */ mtlr r0 /* 80128F94 00125EF4 38 21 00 50 */ addi r1, r1, 0x50 -/* 80128F98 00125EF8 4E 80 00 20 */ blr +/* 80128F98 00125EF8 4E 80 00 20 */ blr .global UpdateCantSeePlayer__12CSpacePirateFR13CStateManager UpdateCantSeePlayer__12CSpacePirateFR13CStateManager: @@ -10229,7 +10229,7 @@ UpdateCantSeePlayer__12CSpacePirateFR13CStateManager: /* 8012903C 00125F9C 81 84 00 00 */ lwz r12, 0(r4) /* 80129040 00125FA0 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 80129044 00125FA4 7D 89 03 A6 */ mtctr r12 -/* 80129048 00125FA8 4E 80 04 21 */ bctrl +/* 80129048 00125FA8 4E 80 04 21 */ bctrl /* 8012904C 00125FAC A0 1E 06 40 */ lhz r0, 0x640(r30) /* 80129050 00125FB0 7F C3 F3 78 */ mr r3, r30 /* 80129054 00125FB4 C3 E1 00 3C */ lfs f31, 0x3c(r1) @@ -10355,7 +10355,7 @@ lbl_801291B8: /* 80129224 00126184 81 84 00 00 */ lwz r12, 0(r4) /* 80129228 00126188 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 8012922C 0012618C 7D 89 03 A6 */ mtctr r12 -/* 80129230 00126190 4E 80 04 21 */ bctrl +/* 80129230 00126190 4E 80 04 21 */ bctrl /* 80129234 00126194 7F C3 F3 78 */ mr r3, r30 /* 80129238 00126198 7F E4 FB 78 */ mr r4, r31 /* 8012923C 0012619C 38 A1 00 48 */ addi r5, r1, 0x48 @@ -10379,7 +10379,7 @@ lbl_80129260: /* 80129280 001261E0 83 C1 00 58 */ lwz r30, 0x58(r1) /* 80129284 001261E4 7C 08 03 A6 */ mtlr r0 /* 80129288 001261E8 38 21 00 90 */ addi r1, r1, 0x90 -/* 8012928C 001261EC 4E 80 00 20 */ blr +/* 8012928C 001261EC 4E 80 00 20 */ blr .global LineOfSightTest__12CSpacePirateFR13CStateManagerRC9CVector3fRC9CVector3fRC13CMaterialList LineOfSightTest__12CSpacePirateFR13CStateManagerRC9CVector3fRC9CVector3fRC13CMaterialList: @@ -10416,7 +10416,7 @@ LineOfSightTest__12CSpacePirateFR13CStateManagerRC9CVector3fRC9CVector3fRC13CMat /* 80129308 00126268 80 01 00 54 */ lwz r0, 0x54(r1) /* 8012930C 0012626C 7C 08 03 A6 */ mtlr r0 /* 80129310 00126270 38 21 00 50 */ addi r1, r1, 0x50 -/* 80129314 00126274 4E 80 00 20 */ blr +/* 80129314 00126274 4E 80 00 20 */ blr .global CheckForProjectiles__12CSpacePirateFR13CStateManager CheckForProjectiles__12CSpacePirateFR13CStateManager: @@ -10442,7 +10442,7 @@ CheckForProjectiles__12CSpacePirateFR13CStateManager: /* 80129364 001262C4 81 84 00 00 */ lwz r12, 0(r4) /* 80129368 001262C8 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 8012936C 001262CC 7D 89 03 A6 */ mtctr r12 -/* 80129370 001262D0 4E 80 04 21 */ bctrl +/* 80129370 001262D0 4E 80 04 21 */ bctrl /* 80129374 001262D4 C0 21 00 48 */ lfs f1, 0x48(r1) /* 80129378 001262D8 38 61 00 98 */ addi r3, r1, 0x98 /* 8012937C 001262DC C0 82 98 1C */ lfs f4, lbl_805AB53C@sda21(r2) @@ -10630,7 +10630,7 @@ lbl_8012960C: /* 80129628 00126588 80 01 09 04 */ lwz r0, 0x904(r1) /* 8012962C 0012658C 7C 08 03 A6 */ mtlr r0 /* 80129630 00126590 38 21 09 00 */ addi r1, r1, 0x900 -/* 80129634 00126594 4E 80 00 20 */ blr +/* 80129634 00126594 4E 80 00 20 */ blr .global SquadReset__12CSpacePirateFR13CStateManager SquadReset__12CSpacePirateFR13CStateManager: @@ -10653,7 +10653,7 @@ SquadReset__12CSpacePirateFR13CStateManager: /* 80129678 001265D8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8012967C 001265DC 7C 08 03 A6 */ mtlr r0 /* 80129680 001265E0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80129684 001265E4 4E 80 00 20 */ blr +/* 80129684 001265E4 4E 80 00 20 */ blr .global SquadRemove__12CSpacePirateFR13CStateManager SquadRemove__12CSpacePirateFR13CStateManager: @@ -10700,7 +10700,7 @@ lbl_8012971C: /* 80129724 00126684 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80129728 00126688 7C 08 03 A6 */ mtlr r0 /* 8012972C 0012668C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80129730 00126690 4E 80 00 20 */ blr +/* 80129730 00126690 4E 80 00 20 */ blr .global SquadAdd__12CSpacePirateFR13CStateManager SquadAdd__12CSpacePirateFR13CStateManager: @@ -10753,7 +10753,7 @@ lbl_801297D8: /* 801297E0 00126740 83 C1 00 18 */ lwz r30, 0x18(r1) /* 801297E4 00126744 7C 08 03 A6 */ mtlr r0 /* 801297E8 00126748 38 21 00 20 */ addi r1, r1, 0x20 -/* 801297EC 0012674C 4E 80 00 20 */ blr +/* 801297EC 0012674C 4E 80 00 20 */ blr .global GetOrigin__12CSpacePirateCFv GetOrigin__12CSpacePirateCFv: @@ -10763,13 +10763,13 @@ GetOrigin__12CSpacePirateCFv: /* 801297FC 0012675C D0 03 00 00 */ stfs f0, 0(r3) /* 80129800 00126760 D0 23 00 04 */ stfs f1, 4(r3) /* 80129804 00126764 D0 43 00 08 */ stfs f2, 8(r3) -/* 80129808 00126768 4E 80 00 20 */ blr +/* 80129808 00126768 4E 80 00 20 */ blr .global DetachActorFromPirate__12CSpacePirateFv DetachActorFromPirate__12CSpacePirateFv: /* 8012980C 0012676C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80129810 00126770 B0 03 07 B4 */ sth r0, 0x7b4(r3) -/* 80129814 00126774 4E 80 00 20 */ blr +/* 80129814 00126774 4E 80 00 20 */ blr .global AttachActorToPirate__12CSpacePirateF9TUniqueId AttachActorToPirate__12CSpacePirateF9TUniqueId: @@ -10780,10 +10780,10 @@ AttachActorToPirate__12CSpacePirateF9TUniqueId: /* 80129828 00126788 A0 04 00 00 */ lhz r0, 0(r4) /* 8012982C 0012678C B0 03 07 B4 */ sth r0, 0x7b4(r3) /* 80129830 00126790 38 60 00 01 */ li r3, 1 -/* 80129834 00126794 4E 80 00 20 */ blr +/* 80129834 00126794 4E 80 00 20 */ blr lbl_80129838: /* 80129838 00126798 38 60 00 00 */ li r3, 0 -/* 8012983C 0012679C 4E 80 00 20 */ blr +/* 8012983C 0012679C 4E 80 00 20 */ blr .global SetAttackTarget__12CSpacePirateF9TUniqueId SetAttackTarget__12CSpacePirateF9TUniqueId: @@ -10793,7 +10793,7 @@ SetAttackTarget__12CSpacePirateF9TUniqueId: /* 8012984C 001267AC B0 83 07 C0 */ sth r4, 0x7c0(r3) /* 80129850 001267B0 90 03 07 C4 */ stw r0, 0x7c4(r3) /* 80129854 001267B4 D0 03 07 BC */ stfs f0, 0x7bc(r3) -/* 80129858 001267B8 4E 80 00 20 */ blr +/* 80129858 001267B8 4E 80 00 20 */ blr .global SetVelocityForJump__12CSpacePirateFv SetVelocityForJump__12CSpacePirateFv: @@ -10838,7 +10838,7 @@ SetVelocityForJump__12CSpacePirateFv: /* 801298F4 00126854 EF A1 10 28 */ fsubs f29, f1, f2 /* 801298F8 00126858 EF C0 18 28 */ fsubs f30, f0, f3 /* 801298FC 0012685C 7D 89 03 A6 */ mtctr r12 -/* 80129900 00126860 4E 80 04 21 */ bctrl +/* 80129900 00126860 4E 80 04 21 */ bctrl /* 80129904 00126864 FF E0 08 90 */ fmr f31, f1 /* 80129908 00126868 3B DD 08 30 */ addi r30, r29, 0x830 /* 8012990C 0012686C 7F C3 F3 78 */ mr r3, r30 @@ -10893,7 +10893,7 @@ lbl_80129998: /* 801299CC 0012692C 83 A1 00 24 */ lwz r29, 0x24(r1) /* 801299D0 00126930 7C 08 03 A6 */ mtlr r0 /* 801299D4 00126934 38 21 00 80 */ addi r1, r1, 0x80 -/* 801299D8 00126938 4E 80 00 20 */ blr +/* 801299D8 00126938 4E 80 00 20 */ blr .global CheckTargetable__12CSpacePirateFR13CStateManager CheckTargetable__12CSpacePirateFR13CStateManager: @@ -10903,14 +10903,14 @@ CheckTargetable__12CSpacePirateFR13CStateManager: /* 801299E8 00126948 81 83 00 00 */ lwz r12, 0(r3) /* 801299EC 0012694C 81 8C 02 B4 */ lwz r12, 0x2b4(r12) /* 801299F0 00126950 7D 89 03 A6 */ mtctr r12 -/* 801299F4 00126954 4E 80 04 21 */ bctrl +/* 801299F4 00126954 4E 80 04 21 */ bctrl /* 801299F8 00126958 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801299FC 0012695C 20 00 00 7F */ subfic r0, r0, 0x7f /* 80129A00 00126960 54 03 0F FE */ srwi r3, r0, 0x1f /* 80129A04 00126964 80 01 00 14 */ lwz r0, 0x14(r1) /* 80129A08 00126968 7C 08 03 A6 */ mtlr r0 /* 80129A0C 0012696C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80129A10 00126970 4E 80 00 20 */ blr +/* 80129A10 00126970 4E 80 00 20 */ blr .global SetEyeParticleActive__12CSpacePirateFR13CStateManagerb SetEyeParticleActive__12CSpacePirateFR13CStateManagerb: @@ -10947,7 +10947,7 @@ lbl_80129A80: /* 80129A80 001269E0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80129A84 001269E4 7C 08 03 A6 */ mtlr r0 /* 80129A88 001269E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80129A8C 001269EC 4E 80 00 20 */ blr +/* 80129A8C 001269EC 4E 80 00 20 */ blr .global Listen__12CSpacePirateFRC9CVector3f16EListenNoiseType Listen__12CSpacePirateFRC9CVector3f16EListenNoiseType: @@ -10994,7 +10994,7 @@ lbl_80129B14: /* 80129B28 00126A88 98 03 06 37 */ stb r0, 0x637(r3) lbl_80129B2C: /* 80129B2C 00126A8C 54 C3 06 3E */ clrlwi r3, r6, 0x18 -/* 80129B30 00126A90 4E 80 00 20 */ blr +/* 80129B30 00126A90 4E 80 00 20 */ blr .global Touch__12CSpacePirateFR6CActorR13CStateManager Touch__12CSpacePirateFR6CActorR13CStateManager: @@ -11047,7 +11047,7 @@ lbl_80129BE0: /* 80129BE8 00126B48 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80129BEC 00126B4C 7C 08 03 A6 */ mtlr r0 /* 80129BF0 00126B50 38 21 00 20 */ addi r1, r1, 0x20 -/* 80129BF4 00126B54 4E 80 00 20 */ blr +/* 80129BF4 00126B54 4E 80 00 20 */ blr .global AcceptScriptMsg__12CSpacePirateF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__12CSpacePirateF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -11086,7 +11086,7 @@ lbl_80129C50: /* 80129C70 00126BD0 81 83 00 00 */ lwz r12, 0(r3) /* 80129C74 00126BD4 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80129C78 00126BD8 7D 89 03 A6 */ mtctr r12 -/* 80129C7C 00126BDC 4E 80 04 21 */ bctrl +/* 80129C7C 00126BDC 4E 80 04 21 */ bctrl /* 80129C80 00126BE0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80129C84 00126BE4 41 82 00 50 */ beq lbl_80129CD4 lbl_80129C88: @@ -11106,7 +11106,7 @@ lbl_80129C88: /* 80129CBC 00126C1C 80 9B 00 18 */ lwz r4, 0x18(r27) /* 80129CC0 00126C20 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80129CC4 00126C24 7D 89 03 A6 */ mtctr r12 -/* 80129CC8 00126C28 4E 80 04 21 */ bctrl +/* 80129CC8 00126C28 4E 80 04 21 */ bctrl /* 80129CCC 00126C2C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80129CD0 00126C30 40 82 00 34 */ bne lbl_80129D04 lbl_80129CD4: @@ -11180,7 +11180,7 @@ lbl_80129D94: /* 80129DC4 00126D24 38 63 0A F8 */ addi r3, r3, lbl_803E0AF8@l /* 80129DC8 00126D28 7C 03 00 2E */ lwzx r0, r3, r0 /* 80129DCC 00126D2C 7C 09 03 A6 */ mtctr r0 -/* 80129DD0 00126D30 4E 80 04 20 */ bctr +/* 80129DD0 00126D30 4E 80 04 20 */ bctr .global lbl_80129DD4 lbl_80129DD4: /* 80129DD4 00126D34 83 7C 00 2C */ lwz r27, 0x2c(r28) @@ -11266,7 +11266,7 @@ lbl_80129E78: /* 80129F04 00126E64 81 9C 00 00 */ lwz r12, 0(r28) /* 80129F08 00126E68 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80129F0C 00126E6C 7D 89 03 A6 */ mtctr r12 -/* 80129F10 00126E70 4E 80 04 21 */ bctrl +/* 80129F10 00126E70 4E 80 04 21 */ bctrl /* 80129F14 00126E74 C0 02 98 68 */ lfs f0, lbl_805AB588@sda21(r2) /* 80129F18 00126E78 D0 03 00 00 */ stfs f0, 0(r3) /* 80129F1C 00126E7C 48 00 03 C8 */ b lbl_8012A2E4 @@ -11369,7 +11369,7 @@ lbl_8012A060: /* 8012A078 00126FD8 81 9C 00 00 */ lwz r12, 0(r28) /* 8012A07C 00126FDC 81 8C 02 BC */ lwz r12, 0x2bc(r12) /* 8012A080 00126FE0 7D 89 03 A6 */ mtctr r12 -/* 8012A084 00126FE4 4E 80 04 21 */ bctrl +/* 8012A084 00126FE4 4E 80 04 21 */ bctrl /* 8012A088 00126FE8 88 1C 06 34 */ lbz r0, 0x634(r28) /* 8012A08C 00126FEC EC 41 07 F2 */ fmuls f2, f1, f31 /* 8012A090 00126FF0 54 00 D7 FF */ rlwinm. r0, r0, 0x1a, 0x1f, 0x1f @@ -11413,7 +11413,7 @@ lbl_8012A0F0: /* 8012A114 00127074 81 9C 00 00 */ lwz r12, 0(r28) /* 8012A118 00127078 81 8C 02 BC */ lwz r12, 0x2bc(r12) /* 8012A11C 0012707C 7D 89 03 A6 */ mtctr r12 -/* 8012A120 00127080 4E 80 04 21 */ bctrl +/* 8012A120 00127080 4E 80 04 21 */ bctrl /* 8012A124 00127084 FC 20 08 50 */ fneg f1, f1 /* 8012A128 00127088 C0 02 97 BC */ lfs f0, lbl_805AB4DC@sda21(r2) /* 8012A12C 0012708C 7F 83 E3 78 */ mr r3, r28 @@ -11548,17 +11548,17 @@ lbl_8012A2E4: /* 8012A2F0 00127250 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 8012A2F4 00127254 7C 08 03 A6 */ mtlr r0 /* 8012A2F8 00127258 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 8012A2FC 0012725C 4E 80 00 20 */ blr +/* 8012A2FC 0012725C 4E 80 00 20 */ blr .global IsInAir__10CBodyStateCFRC15CBodyController IsInAir__10CBodyStateCFRC15CBodyController: /* 8012A300 00127260 38 60 00 00 */ li r3, 0 -/* 8012A304 00127264 4E 80 00 20 */ blr +/* 8012A304 00127264 4E 80 00 20 */ blr .global ApplyGravity__10CBodyStateCFv ApplyGravity__10CBodyStateCFv: /* 8012A308 00127268 38 60 00 01 */ li r3, 1 -/* 8012A30C 0012726C 4E 80 00 20 */ blr +/* 8012A30C 0012726C 4E 80 00 20 */ blr .global Accept__12CSpacePirateFR8IVisitor Accept__12CSpacePirateFR8IVisitor: @@ -11571,11 +11571,11 @@ Accept__12CSpacePirateFR8IVisitor: /* 8012A328 00127288 7C 04 03 78 */ mr r4, r0 /* 8012A32C 0012728C 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 8012A330 00127290 7D 89 03 A6 */ mtctr r12 -/* 8012A334 00127294 4E 80 04 21 */ bctrl +/* 8012A334 00127294 4E 80 04 21 */ bctrl /* 8012A338 00127298 80 01 00 14 */ lwz r0, 0x14(r1) /* 8012A33C 0012729C 7C 08 03 A6 */ mtlr r0 /* 8012A340 001272A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8012A344 001272A4 4E 80 00 20 */ blr +/* 8012A344 001272A4 4E 80 00 20 */ blr .global "__ct__12CSpacePirateF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC16CActorParametersRC14CPatternedInfoiififfUiUiRC11CDamageInfoUsRC11CDamageInfoiUi11CDamageInfoiUsffUsfi" "__ct__12CSpacePirateF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC16CActorParametersRC14CPatternedInfoiififfUiUiRC11CDamageInfoUsRC11CDamageInfoiUi11CDamageInfoiUsffUsfi": @@ -12245,7 +12245,7 @@ lbl_8012AD1C: /* 8012AD5C 00127CBC 81 9D 00 00 */ lwz r12, 0(r29) /* 8012AD60 00127CC0 81 8C 00 38 */ lwz r12, 0x38(r12) /* 8012AD64 00127CC4 7D 89 03 A6 */ mtctr r12 -/* 8012AD68 00127CC8 4E 80 04 21 */ bctrl +/* 8012AD68 00127CC8 4E 80 04 21 */ bctrl /* 8012AD6C 00127CCC 38 81 00 64 */ addi r4, r1, 0x64 /* 8012AD70 00127CD0 38 A0 00 00 */ li r5, 0 /* 8012AD74 00127CD4 4B FD 79 95 */ bl WeaponHurts__20CDamageVulnerabilityCFRC11CWeaponMode @@ -12272,7 +12272,7 @@ lbl_8012ADB0: /* 8012ADC0 00127D20 81 9D 00 00 */ lwz r12, 0(r29) /* 8012ADC4 00127D24 81 8C 00 38 */ lwz r12, 0x38(r12) /* 8012ADC8 00127D28 7D 89 03 A6 */ mtctr r12 -/* 8012ADCC 00127D2C 4E 80 04 21 */ bctrl +/* 8012ADCC 00127D2C 4E 80 04 21 */ bctrl /* 8012ADD0 00127D30 88 01 00 60 */ lbz r0, 0x60(r1) /* 8012ADD4 00127D34 38 80 00 00 */ li r4, 0 /* 8012ADD8 00127D38 50 80 3E 30 */ rlwimi r0, r4, 7, 0x18, 0x18 @@ -12391,7 +12391,7 @@ lbl_8012AF78: /* 8012AF8C 00127EEC 83 81 02 70 */ lwz r28, 0x270(r1) /* 8012AF90 00127EF0 7C 08 03 A6 */ mtlr r0 /* 8012AF94 00127EF4 38 21 02 80 */ addi r1, r1, 0x280 -/* 8012AF98 00127EF8 4E 80 00 20 */ blr +/* 8012AF98 00127EF8 4E 80 00 20 */ blr .global __ct__8CIkChainFv __ct__8CIkChainFv: @@ -12440,7 +12440,7 @@ __ct__8CIkChainFv: /* 8012B044 00127FA4 88 03 00 44 */ lbz r0, 0x44(r3) /* 8012B048 00127FA8 50 80 3E 30 */ rlwimi r0, r4, 7, 0x18, 0x18 /* 8012B04C 00127FAC 98 03 00 44 */ stb r0, 0x44(r3) -/* 8012B050 00127FB0 4E 80 00 20 */ blr +/* 8012B050 00127FB0 4E 80 00 20 */ blr .global __ct__Q212CSpacePirate16CSpacePirateDataFR12CInputStreamUi __ct__Q212CSpacePirate16CSpacePirateDataFR12CInputStreamUi: @@ -12568,7 +12568,7 @@ lbl_8012B20C: /* 8012B228 00128188 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8012B22C 0012818C 7C 08 03 A6 */ mtlr r0 /* 8012B230 00128190 38 21 00 20 */ addi r1, r1, 0x20 -/* 8012B234 00128194 4E 80 00 20 */ blr +/* 8012B234 00128194 4E 80 00 20 */ blr .global PreRender__14CPirateRagDollFRC9CVector3fR10CModelData PreRender__14CPirateRagDollFRC9CVector3fR10CModelData: @@ -13051,7 +13051,7 @@ lbl_8012B98C: /* 8012B990 001288F0 80 01 02 94 */ lwz r0, 0x294(r1) /* 8012B994 001288F4 7C 08 03 A6 */ mtlr r0 /* 8012B998 001288F8 38 21 02 90 */ addi r1, r1, 0x290 -/* 8012B99C 001288FC 4E 80 00 20 */ blr +/* 8012B99C 001288FC 4E 80 00 20 */ blr .global GetFromParentUnrotated__15CCharLayoutInfoCFRC6CSegId GetFromParentUnrotated__15CCharLayoutInfoCFRC6CSegId: @@ -13116,7 +13116,7 @@ lbl_8012BA68: /* 8012BA78 001289D8 C0 07 00 08 */ lfs f0, 8(r7) /* 8012BA7C 001289DC D0 03 00 08 */ stfs f0, 8(r3) /* 8012BA80 001289E0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8012BA84 001289E4 4E 80 00 20 */ blr +/* 8012BA84 001289E4 4E 80 00 20 */ blr .global Update__14CPirateRagDollFR13CStateManagerf Update__14CPirateRagDollFR13CStateManagerf: @@ -13590,7 +13590,7 @@ lbl_8012C180: /* 8012C19C 001290FC 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 8012C1A0 00129100 7C 08 03 A6 */ mtlr r0 /* 8012C1A4 00129104 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 8012C1A8 00129108 4E 80 00 20 */ blr +/* 8012C1A8 00129108 4E 80 00 20 */ blr .global Prime__14CPirateRagDollFR13CStateManagerRC12CTransform4fR10CModelData Prime__14CPirateRagDollFR13CStateManagerRC12CTransform4fR10CModelData: @@ -13637,7 +13637,7 @@ Prime__14CPirateRagDollFR13CStateManagerRC12CTransform4fR10CModelData: /* 8012C24C 001291AC 83 81 00 30 */ lwz r28, 0x30(r1) /* 8012C250 001291B0 7C 08 03 A6 */ mtlr r0 /* 8012C254 001291B4 38 21 00 40 */ addi r1, r1, 0x40 -/* 8012C258 001291B8 4E 80 00 20 */ blr +/* 8012C258 001291B8 4E 80 00 20 */ blr .global __ct__14CPirateRagDollFR13CStateManagerP12CSpacePiratefUsUi __ct__14CPirateRagDollFR13CStateManagerP12CSpacePiratefUsUi: @@ -13661,7 +13661,7 @@ __ct__14CPirateRagDollFR13CStateManagerP12CSpacePiratefUsUi: /* 8012C2A0 00129200 C3 A2 97 B4 */ lfs f29, lbl_805AB4D4@sda21(r2) /* 8012C2A4 00129204 81 8C 02 BC */ lwz r12, 0x2bc(r12) /* 8012C2A8 00129208 7D 89 03 A6 */ mtctr r12 -/* 8012C2AC 0012920C 4E 80 04 21 */ bctrl +/* 8012C2AC 0012920C 4E 80 04 21 */ bctrl /* 8012C2B0 00129210 FC 20 08 50 */ fneg f1, f1 /* 8012C2B4 00129214 C0 62 98 7C */ lfs f3, lbl_805AB59C@sda21(r2) /* 8012C2B8 00129218 FC 40 E8 50 */ fneg f2, f29 @@ -13707,7 +13707,7 @@ __ct__14CPirateRagDollFR13CStateManagerP12CSpacePiratefUsUi: /* 8012C358 001292B8 81 83 00 00 */ lwz r12, 0(r3) /* 8012C35C 001292BC 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8012C360 001292C0 7D 89 03 A6 */ mtctr r12 -/* 8012C364 001292C4 4E 80 04 21 */ bctrl +/* 8012C364 001292C4 4E 80 04 21 */ bctrl /* 8012C368 001292C8 C0 02 98 68 */ lfs f0, lbl_805AB588@sda21(r2) /* 8012C36C 001292CC 38 80 00 0E */ li r4, 0xe /* 8012C370 001292D0 D0 03 00 00 */ stfs f0, 0(r3) @@ -14180,7 +14180,7 @@ lbl_8012CA80: /* 8012CAA0 00129A00 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 8012CAA4 00129A04 7C 08 03 A6 */ mtlr r0 /* 8012CAA8 00129A08 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 8012CAAC 00129A0C 4E 80 00 20 */ blr +/* 8012CAAC 00129A0C 4E 80 00 20 */ blr .global sub_8012cab0 sub_8012cab0: @@ -14188,7 +14188,7 @@ sub_8012cab0: /* 8012CAB4 00129A14 88 04 00 00 */ lbz r0, 0(r4) /* 8012CAB8 00129A18 98 03 00 00 */ stb r0, 0(r3) /* 8012CABC 00129A1C B0 A3 00 02 */ sth r5, 2(r3) -/* 8012CAC0 00129A20 4E 80 00 20 */ blr +/* 8012CAC0 00129A20 4E 80 00 20 */ blr .global "reserve__Q24rstl64vectorFi" "reserve__Q24rstl64vectorFi": @@ -14252,7 +14252,7 @@ lbl_8012CB84: /* 8012CB90 00129AF0 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8012CB94 00129AF4 7C 08 03 A6 */ mtlr r0 /* 8012CB98 00129AF8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8012CB9C 00129AFC 4E 80 00 20 */ blr +/* 8012CB9C 00129AFC 4E 80 00 20 */ blr .global sub_8012cba0 sub_8012cba0: @@ -14301,7 +14301,7 @@ lbl_8012CC38: /* 8012CC3C 00129B9C 7C 03 00 40 */ cmplw r3, r0 /* 8012CC40 00129BA0 40 82 FF 68 */ bne lbl_8012CBA8 /* 8012CC44 00129BA4 7C A3 2B 78 */ mr r3, r5 -/* 8012CC48 00129BA8 4E 80 00 20 */ blr +/* 8012CC48 00129BA8 4E 80 00 20 */ blr .global "reserve__Q24rstl72vectorFi" "reserve__Q24rstl72vectorFi": @@ -14379,7 +14379,7 @@ lbl_8012CD38: /* 8012CD44 00129CA4 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8012CD48 00129CA8 7C 08 03 A6 */ mtlr r0 /* 8012CD4C 00129CAC 38 21 00 30 */ addi r1, r1, 0x30 -/* 8012CD50 00129CB0 4E 80 00 20 */ blr +/* 8012CD50 00129CB0 4E 80 00 20 */ blr .global "reserve__Q24rstl71vectorFi" "reserve__Q24rstl71vectorFi": @@ -14462,7 +14462,7 @@ lbl_8012CE54: /* 8012CE60 00129DC0 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8012CE64 00129DC4 7C 08 03 A6 */ mtlr r0 /* 8012CE68 00129DC8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8012CE6C 00129DCC 4E 80 00 20 */ blr +/* 8012CE6C 00129DCC 4E 80 00 20 */ blr .global "erase__Q24rstl43list<9TUniqueId,Q24rstl17rmemory_allocator>FRCQ34rstl43list<9TUniqueId,Q24rstl17rmemory_allocator>8iterator" "erase__Q24rstl43list<9TUniqueId,Q24rstl17rmemory_allocator>FRCQ34rstl43list<9TUniqueId,Q24rstl17rmemory_allocator>8iterator": @@ -14498,7 +14498,7 @@ lbl_8012CEC4: /* 8012CEDC 00129E3C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8012CEE0 00129E40 7C 08 03 A6 */ mtlr r0 /* 8012CEE4 00129E44 38 21 00 10 */ addi r1, r1, 0x10 -/* 8012CEE8 00129E48 4E 80 00 20 */ blr +/* 8012CEE8 00129E48 4E 80 00 20 */ blr .global __sinit_CSpacePirate_cpp __sinit_CSpacePirate_cpp: diff --git a/asm/MetroidPrime/Enemies/CSpankWeed.s b/asm/MetroidPrime/Enemies/CSpankWeed.s index e490ed07..4cde00a5 100644 --- a/asm/MetroidPrime/Enemies/CSpankWeed.s +++ b/asm/MetroidPrime/Enemies/CSpankWeed.s @@ -249,7 +249,7 @@ lbl_80154C64: /* 80154C70 00151BD0 83 C1 00 08 */ lwz r30, 8(r1) /* 80154C74 00151BD4 7C 08 03 A6 */ mtlr r0 /* 80154C78 00151BD8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80154C7C 00151BDC 4E 80 00 20 */ blr +/* 80154C7C 00151BDC 4E 80 00 20 */ blr .global Render__10CSpankWeedCFRC13CStateManager Render__10CSpankWeedCFRC13CStateManager: @@ -260,7 +260,7 @@ Render__10CSpankWeedCFRC13CStateManager: /* 80154C90 00151BF0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80154C94 00151BF4 7C 08 03 A6 */ mtlr r0 /* 80154C98 00151BF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80154C9C 00151BFC 4E 80 00 20 */ blr +/* 80154C9C 00151BFC 4E 80 00 20 */ blr .global Attacked__10CSpankWeedFR13CStateManagerf Attacked__10CSpankWeedFR13CStateManagerf: @@ -271,7 +271,7 @@ Attacked__10CSpankWeedFR13CStateManagerf: /* 80154CB0 00151C10 80 01 00 14 */ lwz r0, 0x14(r1) /* 80154CB4 00151C14 7C 08 03 A6 */ mtlr r0 /* 80154CB8 00151C18 38 21 00 10 */ addi r1, r1, 0x10 -/* 80154CBC 00151C1C 4E 80 00 20 */ blr +/* 80154CBC 00151C1C 4E 80 00 20 */ blr .global sub_80154cc0 sub_80154cc0: @@ -279,7 +279,7 @@ sub_80154cc0: /* 80154CC4 00151C24 20 00 00 03 */ subfic r0, r0, 3 /* 80154CC8 00151C28 7C 00 00 34 */ cntlzw r0, r0 /* 80154CCC 00151C2C 54 03 D9 7E */ srwi r3, r0, 5 -/* 80154CD0 00151C30 4E 80 00 20 */ blr +/* 80154CD0 00151C30 4E 80 00 20 */ blr .global sub_80154cd4 sub_80154cd4: @@ -306,7 +306,7 @@ sub_80154cd4: /* 80154D24 00151C84 D0 A1 00 18 */ stfs f5, 0x18(r1) /* 80154D28 00151C88 D0 81 00 1C */ stfs f4, 0x1c(r1) /* 80154D2C 00151C8C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80154D30 00151C90 4E 80 00 20 */ blr +/* 80154D30 00151C90 4E 80 00 20 */ blr .global GetOrbitPosition__10CSpankWeedCFRC13CStateManager GetOrbitPosition__10CSpankWeedCFRC13CStateManager: @@ -388,7 +388,7 @@ lbl_80154E44: /* 80154E4C 00151DAC 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80154E50 00151DB0 7C 08 03 A6 */ mtlr r0 /* 80154E54 00151DB4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80154E58 00151DB8 4E 80 00 20 */ blr +/* 80154E58 00151DB8 4E 80 00 20 */ blr .global GetAimPosition__10CSpankWeedCFRC13CStateManagerf GetAimPosition__10CSpankWeedCFRC13CStateManagerf: @@ -499,7 +499,7 @@ lbl_80154FC0: /* 80154FF0 00151F50 83 A1 01 04 */ lwz r29, 0x104(r1) /* 80154FF4 00151F54 7C 08 03 A6 */ mtlr r0 /* 80154FF8 00151F58 38 21 01 40 */ addi r1, r1, 0x140 -/* 80154FFC 00151F5C 4E 80 00 20 */ blr +/* 80154FFC 00151F5C 4E 80 00 20 */ blr .global Flinch__10CSpankWeedFR13CStateManager9EStateMsgf Flinch__10CSpankWeedFR13CStateManager9EStateMsgf: @@ -602,7 +602,7 @@ lbl_80155158: /* 8015515C 001520BC 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 80155160 001520C0 7C 08 03 A6 */ mtlr r0 /* 80155164 001520C4 38 21 00 30 */ addi r1, r1, 0x30 -/* 80155168 001520C8 4E 80 00 20 */ blr +/* 80155168 001520C8 4E 80 00 20 */ blr .global Delay__10CSpankWeedFR13CStateManagerf Delay__10CSpankWeedFR13CStateManagerf: @@ -618,13 +618,13 @@ Delay__10CSpankWeedFR13CStateManagerf: /* 80155190 001520F0 50 80 3E 30 */ rlwimi r0, r4, 7, 0x18, 0x18 /* 80155194 001520F4 98 03 04 00 */ stb r0, 0x400(r3) /* 80155198 001520F8 38 60 00 01 */ li r3, 1 -/* 8015519C 001520FC 4E 80 00 20 */ blr +/* 8015519C 001520FC 4E 80 00 20 */ blr lbl_801551A0: /* 801551A0 00152100 38 60 00 00 */ li r3, 0 -/* 801551A4 00152104 4E 80 00 20 */ blr +/* 801551A4 00152104 4E 80 00 20 */ blr lbl_801551A8: /* 801551A8 00152108 38 60 00 01 */ li r3, 1 -/* 801551AC 0015210C 4E 80 00 20 */ blr +/* 801551AC 0015210C 4E 80 00 20 */ blr .global InRange__10CSpankWeedFR13CStateManagerf InRange__10CSpankWeedFR13CStateManagerf: @@ -672,7 +672,7 @@ lbl_80155244: /* 8015524C 001521AC 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80155250 001521B0 7C 08 03 A6 */ mtlr r0 /* 80155254 001521B4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80155258 001521B8 4E 80 00 20 */ blr +/* 80155258 001521B8 4E 80 00 20 */ blr .global HearPlayer__10CSpankWeedFR13CStateManagerf HearPlayer__10CSpankWeedFR13CStateManagerf: @@ -720,7 +720,7 @@ lbl_801552F0: /* 801552F8 00152258 83 C1 00 18 */ lwz r30, 0x18(r1) /* 801552FC 0015225C 7C 08 03 A6 */ mtlr r0 /* 80155300 00152260 38 21 00 20 */ addi r1, r1, 0x20 -/* 80155304 00152264 4E 80 00 20 */ blr +/* 80155304 00152264 4E 80 00 20 */ blr .global InDetectionRage__10CSpankWeedFR13CStateManagerf InDetectionRage__10CSpankWeedFR13CStateManagerf: @@ -768,7 +768,7 @@ lbl_8015539C: /* 801553A4 00152304 83 C1 00 18 */ lwz r30, 0x18(r1) /* 801553A8 00152308 7C 08 03 A6 */ mtlr r0 /* 801553AC 0015230C 38 21 00 20 */ addi r1, r1, 0x20 -/* 801553B0 00152310 4E 80 00 20 */ blr +/* 801553B0 00152310 4E 80 00 20 */ blr .global Attack__10CSpankWeedFR13CStateManager9EStateMsgf Attack__10CSpankWeedFR13CStateManager9EStateMsgf: @@ -888,7 +888,7 @@ lbl_8015555C: /* 80155564 001524C4 83 C1 00 48 */ lwz r30, 0x48(r1) /* 80155568 001524C8 7C 08 03 A6 */ mtlr r0 /* 8015556C 001524CC 38 21 00 50 */ addi r1, r1, 0x50 -/* 80155570 001524D0 4E 80 00 20 */ blr +/* 80155570 001524D0 4E 80 00 20 */ blr .global TargetPatrol__10CSpankWeedFR13CStateManager9EStateMsgf TargetPatrol__10CSpankWeedFR13CStateManager9EStateMsgf: @@ -929,7 +929,7 @@ lbl_801555E4: /* 801555EC 0015254C 83 C1 00 08 */ lwz r30, 8(r1) /* 801555F0 00152550 7C 08 03 A6 */ mtlr r0 /* 801555F4 00152554 38 21 00 10 */ addi r1, r1, 0x10 -/* 801555F8 00152558 4E 80 00 20 */ blr +/* 801555F8 00152558 4E 80 00 20 */ blr .global Lurk__10CSpankWeedFR13CStateManager9EStateMsgf Lurk__10CSpankWeedFR13CStateManager9EStateMsgf: @@ -974,7 +974,7 @@ lbl_8015567C: /* 80155684 001525E4 83 C1 00 08 */ lwz r30, 8(r1) /* 80155688 001525E8 7C 08 03 A6 */ mtlr r0 /* 8015568C 001525EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80155690 001525F0 4E 80 00 20 */ blr +/* 80155690 001525F0 4E 80 00 20 */ blr .global FadeOut__10CSpankWeedFR13CStateManager9EStateMsgf FadeOut__10CSpankWeedFR13CStateManager9EStateMsgf: @@ -1064,7 +1064,7 @@ lbl_801557B8: /* 801557BC 0015271C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801557C0 00152720 7C 08 03 A6 */ mtlr r0 /* 801557C4 00152724 38 21 00 20 */ addi r1, r1, 0x20 -/* 801557C8 00152728 4E 80 00 20 */ blr +/* 801557C8 00152728 4E 80 00 20 */ blr .global FadeIn__10CSpankWeedFR13CStateManager9EStateMsgf FadeIn__10CSpankWeedFR13CStateManager9EStateMsgf: @@ -1162,7 +1162,7 @@ lbl_801558FC: /* 80155914 00152874 80 01 00 24 */ lwz r0, 0x24(r1) /* 80155918 00152878 7C 08 03 A6 */ mtlr r0 /* 8015591C 0015287C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80155920 00152880 4E 80 00 20 */ blr +/* 80155920 00152880 4E 80 00 20 */ blr .global Patrol__10CSpankWeedFR13CStateManager9EStateMsgf Patrol__10CSpankWeedFR13CStateManager9EStateMsgf: @@ -1236,7 +1236,7 @@ lbl_80155A18: /* 80155A20 00152980 83 C1 00 08 */ lwz r30, 8(r1) /* 80155A24 00152984 7C 08 03 A6 */ mtlr r0 /* 80155A28 00152988 38 21 00 10 */ addi r1, r1, 0x10 -/* 80155A2C 0015298C 4E 80 00 20 */ blr +/* 80155A2C 0015298C 4E 80 00 20 */ blr .global KnockBack__10CSpankWeedFRC9CVector3fR13CStateManagerRC11CDamageInfo14EKnockBackTypef KnockBack__10CSpankWeedFRC9CVector3fR13CStateManagerRC11CDamageInfo14EKnockBackTypef: @@ -1256,7 +1256,7 @@ lbl_80155A5C: /* 80155A60 001529C0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80155A64 001529C4 7C 08 03 A6 */ mtlr r0 /* 80155A68 001529C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80155A6C 001529CC 4E 80 00 20 */ blr +/* 80155A6C 001529CC 4E 80 00 20 */ blr .global Think__10CSpankWeedFfR13CStateManager Think__10CSpankWeedFfR13CStateManager: @@ -1288,7 +1288,7 @@ Think__10CSpankWeedFfR13CStateManager: /* 80155AD4 00152A34 81 83 00 00 */ lwz r12, 0(r3) /* 80155AD8 00152A38 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80155ADC 00152A3C 7D 89 03 A6 */ mtctr r12 -/* 80155AE0 00152A40 4E 80 04 21 */ bctrl +/* 80155AE0 00152A40 4E 80 04 21 */ bctrl /* 80155AE4 00152A44 C0 02 9E 34 */ lfs f0, lbl_805ABB54@sda21(r2) /* 80155AE8 00152A48 D0 03 00 00 */ stfs f0, 0(r3) /* 80155AEC 00152A4C 88 1E 05 98 */ lbz r0, 0x598(r30) @@ -1365,7 +1365,7 @@ lbl_80155BC0: /* 80155C00 00152B60 83 C1 00 68 */ lwz r30, 0x68(r1) /* 80155C04 00152B64 7C 08 03 A6 */ mtlr r0 /* 80155C08 00152B68 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 80155C0C 00152B6C 4E 80 00 20 */ blr +/* 80155C0C 00152B6C 4E 80 00 20 */ blr .global AcceptScriptMsg__10CSpankWeedF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__10CSpankWeedF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -1692,7 +1692,7 @@ lbl_80155FFC: /* 801560E8 00153048 B0 01 00 30 */ sth r0, 0x30(r1) /* 801560EC 0015304C 81 8C 02 B0 */ lwz r12, 0x2b0(r12) /* 801560F0 00153050 7D 89 03 A6 */ mtctr r12 -/* 801560F4 00153054 4E 80 04 21 */ bctrl +/* 801560F4 00153054 4E 80 04 21 */ bctrl /* 801560F8 00153058 3C 80 80 5A */ lis r4, skZero3f@ha /* 801560FC 0015305C 7F C3 F3 78 */ mr r3, r30 /* 80156100 00153060 39 24 66 A0 */ addi r9, r4, skZero3f@l @@ -1776,7 +1776,7 @@ lbl_80156204: /* 80156220 00153180 80 01 02 64 */ lwz r0, 0x264(r1) /* 80156224 00153184 7C 08 03 A6 */ mtlr r0 /* 80156228 00153188 38 21 02 60 */ addi r1, r1, 0x260 -/* 8015622C 0015318C 4E 80 00 20 */ blr +/* 8015622C 0015318C 4E 80 00 20 */ blr .global sub_80156230 sub_80156230: @@ -1845,7 +1845,7 @@ lbl_80156304: /* 8015631C 0015327C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80156320 00153280 7C 08 03 A6 */ mtlr r0 /* 80156324 00153284 38 21 00 20 */ addi r1, r1, 0x20 -/* 80156328 00153288 4E 80 00 20 */ blr +/* 80156328 00153288 4E 80 00 20 */ blr .global sub_8015632c sub_8015632c: @@ -1898,7 +1898,7 @@ lbl_801563BC: /* 801563D0 00153330 83 81 00 20 */ lwz r28, 0x20(r1) /* 801563D4 00153334 7C 08 03 A6 */ mtlr r0 /* 801563D8 00153338 38 21 00 30 */ addi r1, r1, 0x30 -/* 801563DC 0015333C 4E 80 00 20 */ blr +/* 801563DC 0015333C 4E 80 00 20 */ blr .global Accept__10CSpankWeedFR8IVisitor Accept__10CSpankWeedFR8IVisitor: @@ -1911,11 +1911,11 @@ Accept__10CSpankWeedFR8IVisitor: /* 801563F8 00153358 7C 04 03 78 */ mr r4, r0 /* 801563FC 0015335C 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 80156400 00153360 7D 89 03 A6 */ mtctr r12 -/* 80156404 00153364 4E 80 04 21 */ bctrl +/* 80156404 00153364 4E 80 04 21 */ bctrl /* 80156408 00153368 80 01 00 14 */ lwz r0, 0x14(r1) /* 8015640C 0015336C 7C 08 03 A6 */ mtlr r0 /* 80156410 00153370 38 21 00 10 */ addi r1, r1, 0x10 -/* 80156414 00153374 4E 80 00 20 */ blr +/* 80156414 00153374 4E 80 00 20 */ blr .global "__ct__10CSpankWeedF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC16CActorParametersRC14CPatternedInfoffff" "__ct__10CSpankWeedF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC16CActorParametersRC14CPatternedInfoffff": @@ -2153,7 +2153,7 @@ lbl_80156774: /* 801567A8 00153708 80 01 05 F4 */ lwz r0, 0x5f4(r1) /* 801567AC 0015370C 7C 08 03 A6 */ mtlr r0 /* 801567B0 00153710 38 21 05 F0 */ addi r1, r1, 0x5f0 -/* 801567B4 00153714 4E 80 00 20 */ blr +/* 801567B4 00153714 4E 80 00 20 */ blr .global "reserve__Q24rstl63vector<26CJointCollisionDescription,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl63vector<26CJointCollisionDescription,Q24rstl17rmemory_allocator>Fi": @@ -2221,7 +2221,7 @@ lbl_8015688C: /* 80156890 001537F0 80 01 00 34 */ lwz r0, 0x34(r1) /* 80156894 001537F4 7C 08 03 A6 */ mtlr r0 /* 80156898 001537F8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8015689C 001537FC 4E 80 00 20 */ blr +/* 8015689C 001537FC 4E 80 00 20 */ blr .global sub_801568a0 sub_801568a0: diff --git a/asm/MetroidPrime/Enemies/CStateMachine.s b/asm/MetroidPrime/Enemies/CStateMachine.s index 1534355a..09a88d1c 100644 --- a/asm/MetroidPrime/Enemies/CStateMachine.s +++ b/asm/MetroidPrime/Enemies/CStateMachine.s @@ -43,7 +43,7 @@ lbl_8007F654: /* 8007F664 0007C5C4 83 81 00 10 */ lwz r28, 0x10(r1) /* 8007F668 0007C5C8 7C 08 03 A6 */ mtlr r0 /* 8007F66C 0007C5CC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8007F670 0007C5D0 4E 80 00 20 */ blr +/* 8007F670 0007C5D0 4E 80 00 20 */ blr .global __ct__13CStateMachineFR12CInputStream __ct__13CStateMachineFR12CInputStream: @@ -406,7 +406,7 @@ lbl_8007FB74: /* 8007FB8C 0007CAEC 80 01 01 24 */ lwz r0, 0x124(r1) /* 8007FB90 0007CAF0 7C 08 03 A6 */ mtlr r0 /* 8007FB94 0007CAF4 38 21 01 20 */ addi r1, r1, 0x120 -/* 8007FB98 0007CAF8 4E 80 00 20 */ blr +/* 8007FB98 0007CAF8 4E 80 00 20 */ blr .global GetName__18CStateMachineStateCFv GetName__18CStateMachineStateCFv: @@ -414,10 +414,10 @@ GetName__18CStateMachineStateCFv: /* 8007FBA0 0007CB00 28 03 00 00 */ cmplwi r3, 0 /* 8007FBA4 0007CB04 41 82 00 0C */ beq lbl_8007FBB0 /* 8007FBA8 0007CB08 38 63 00 0C */ addi r3, r3, 0xc -/* 8007FBAC 0007CB0C 4E 80 00 20 */ blr +/* 8007FBAC 0007CB0C 4E 80 00 20 */ blr lbl_8007FBB0: /* 8007FBB0 0007CB10 38 60 00 00 */ li r3, 0 -/* 8007FBB4 0007CB14 4E 80 00 20 */ blr +/* 8007FBB4 0007CB14 4E 80 00 20 */ blr .global Setup__18CStateMachineStateFPC13CStateMachine Setup__18CStateMachineStateFPC13CStateMachine: @@ -428,7 +428,7 @@ Setup__18CStateMachineStateFPC13CStateMachine: /* 8007FBC8 0007CB28 D0 03 00 08 */ stfs f0, 8(r3) /* 8007FBCC 0007CB2C D0 03 00 0C */ stfs f0, 0xc(r3) /* 8007FBD0 0007CB30 D0 03 00 10 */ stfs f0, 0x10(r3) -/* 8007FBD4 0007CB34 4E 80 00 20 */ blr +/* 8007FBD4 0007CB34 4E 80 00 20 */ blr .global __ct__18CStateMachineStateFv __ct__18CStateMachineStateFv: @@ -442,7 +442,7 @@ __ct__18CStateMachineStateFv: /* 8007FBF4 0007CB54 88 03 00 18 */ lbz r0, 0x18(r3) /* 8007FBF8 0007CB58 50 80 3E 30 */ rlwimi r0, r4, 7, 0x18, 0x18 /* 8007FBFC 0007CB5C 98 03 00 18 */ stb r0, 0x18(r3) -/* 8007FC00 0007CB60 4E 80 00 20 */ blr +/* 8007FC00 0007CB60 4E 80 00 20 */ blr .global "SetState__18CStateMachineStateFR13CStateManagerR3CAiPC13CStateMachineRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" "SetState__18CStateMachineStateFR13CStateManagerR3CAiPC13CStateMachineRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>": @@ -476,7 +476,7 @@ lbl_8007FC64: /* 8007FC68 0007CBC8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8007FC6C 0007CBCC 7C 08 03 A6 */ mtlr r0 /* 8007FC70 0007CBD0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8007FC74 0007CBD4 4E 80 00 20 */ blr +/* 8007FC74 0007CBD4 4E 80 00 20 */ blr .global SetState__18CStateMachineStateFR13CStateManagerR3CAii SetState__18CStateMachineStateFR13CStateManagerR3CAii: @@ -506,7 +506,7 @@ SetState__18CStateMachineStateFR13CStateManagerR3CAii: /* 8007FCD4 0007CC34 7F CC F3 78 */ mr r12, r30 /* 8007FCD8 0007CC38 38 A0 00 02 */ li r5, 2 /* 8007FCDC 0007CC3C 48 30 9C 51 */ bl __ptmf_scall -/* 8007FCE0 0007CC40 60 00 00 00 */ nop +/* 8007FCE0 0007CC40 60 00 00 00 */ nop lbl_8007FCE4: /* 8007FCE4 0007CC44 93 FB 00 04 */ stw r31, 4(r27) /* 8007FCE8 0007CC48 C0 02 89 80 */ lfs f0, lbl_805AA6A0@sda21(r2) @@ -529,13 +529,13 @@ lbl_8007FCE4: /* 8007FD2C 0007CC8C 7F EC FB 78 */ mr r12, r31 /* 8007FD30 0007CC90 38 A0 00 00 */ li r5, 0 /* 8007FD34 0007CC94 48 30 9B F9 */ bl __ptmf_scall -/* 8007FD38 0007CC98 60 00 00 00 */ nop +/* 8007FD38 0007CC98 60 00 00 00 */ nop lbl_8007FD3C: /* 8007FD3C 0007CC9C BB 61 00 0C */ lmw r27, 0xc(r1) /* 8007FD40 0007CCA0 80 01 00 24 */ lwz r0, 0x24(r1) /* 8007FD44 0007CCA4 7C 08 03 A6 */ mtlr r0 /* 8007FD48 0007CCA8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8007FD4C 0007CCAC 4E 80 00 20 */ blr +/* 8007FD4C 0007CCAC 4E 80 00 20 */ blr .global Update__18CStateMachineStateFR13CStateManagerR3CAif Update__18CStateMachineStateFR13CStateManagerR3CAif: @@ -566,7 +566,7 @@ Update__18CStateMachineStateFR13CStateManagerR3CAif: /* 8007FDB0 0007CD10 7F 8C E3 78 */ mr r12, r28 /* 8007FDB4 0007CD14 38 A0 00 01 */ li r5, 1 /* 8007FDB8 0007CD18 48 30 9B 75 */ bl __ptmf_scall -/* 8007FDBC 0007CD1C 60 00 00 00 */ nop +/* 8007FDBC 0007CD1C 60 00 00 00 */ nop lbl_8007FDC0: /* 8007FDC0 0007CD20 3B 40 00 00 */ li r26, 0 /* 8007FDC4 0007CD24 3B 60 00 00 */ li r27, 0 @@ -589,7 +589,7 @@ lbl_8007FDE0: /* 8007FE00 0007CD60 7F C4 F3 78 */ mr r4, r30 /* 8007FE04 0007CD64 7F 2C CB 78 */ mr r12, r25 /* 8007FE08 0007CD68 48 30 9B 25 */ bl __ptmf_scall -/* 8007FE0C 0007CD6C 60 00 00 00 */ nop +/* 8007FE0C 0007CD6C 60 00 00 00 */ nop /* 8007FE10 0007CD70 88 19 00 18 */ lbz r0, 0x18(r25) /* 8007FE14 0007CD74 7C 7C 1B 78 */ mr r28, r3 /* 8007FE18 0007CD78 28 00 00 00 */ cmplwi r0, 0 @@ -624,7 +624,7 @@ lbl_8007FE50: /* 8007FE80 0007CDE0 7F 8C E3 78 */ mr r12, r28 /* 8007FE84 0007CDE4 38 A0 00 02 */ li r5, 2 /* 8007FE88 0007CDE8 48 30 9A A5 */ bl __ptmf_scall -/* 8007FE8C 0007CDEC 60 00 00 00 */ nop +/* 8007FE8C 0007CDEC 60 00 00 00 */ nop lbl_8007FE90: /* 8007FE90 0007CDF0 93 1D 00 04 */ stw r24, 4(r29) /* 8007FE94 0007CDF4 38 60 00 00 */ li r3, 0 @@ -647,7 +647,7 @@ lbl_8007FE90: /* 8007FED8 0007CE38 7F 8C E3 78 */ mr r12, r28 /* 8007FEDC 0007CE3C 38 A0 00 00 */ li r5, 0 /* 8007FEE0 0007CE40 48 30 9A 4D */ bl __ptmf_scall -/* 8007FEE4 0007CE44 60 00 00 00 */ nop +/* 8007FEE4 0007CE44 60 00 00 00 */ nop /* 8007FEE8 0007CE48 48 00 00 1C */ b lbl_8007FF04 lbl_8007FEEC: /* 8007FEEC 0007CE4C 3B 7B 00 1C */ addi r27, r27, 0x1c @@ -664,7 +664,7 @@ lbl_8007FF04: /* 8007FF10 0007CE70 80 01 00 44 */ lwz r0, 0x44(r1) /* 8007FF14 0007CE74 7C 08 03 A6 */ mtlr r0 /* 8007FF18 0007CE78 38 21 00 40 */ addi r1, r1, 0x40 -/* 8007FF1C 0007CE7C 4E 80 00 20 */ blr +/* 8007FF1C 0007CE7C 4E 80 00 20 */ blr .global "reserve__Q24rstl44vector<8CAiState,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl44vector<8CAiState,Q24rstl17rmemory_allocator>Fi": @@ -760,7 +760,7 @@ lbl_80080054: /* 80080060 0007CFC0 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80080064 0007CFC4 7C 08 03 A6 */ mtlr r0 /* 80080068 0007CFC8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8008006C 0007CFCC 4E 80 00 20 */ blr +/* 8008006C 0007CFCC 4E 80 00 20 */ blr .global "reserve__Q24rstl47vector<10CAiTrigger,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl47vector<10CAiTrigger,Q24rstl17rmemory_allocator>Fi": @@ -844,4 +844,4 @@ lbl_80080174: /* 80080180 0007D0E0 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80080184 0007D0E4 7C 08 03 A6 */ mtlr r0 /* 80080188 0007D0E8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8008018C 0007D0EC 4E 80 00 20 */ blr +/* 8008018C 0007D0EC 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/Enemies/CTeamAiMgr.s b/asm/MetroidPrime/Enemies/CTeamAiMgr.s index 1b71759b..4f66880b 100644 --- a/asm/MetroidPrime/Enemies/CTeamAiMgr.s +++ b/asm/MetroidPrime/Enemies/CTeamAiMgr.s @@ -106,7 +106,7 @@ lbl_80237C84: /* 80237C90 00234BF0 83 C1 00 38 */ lwz r30, 0x38(r1) /* 80237C94 00234BF4 7C 08 03 A6 */ mtlr r0 /* 80237C98 00234BF8 38 21 00 40 */ addi r1, r1, 0x40 -/* 80237C9C 00234BFC 4E 80 00 20 */ blr +/* 80237C9C 00234BFC 4E 80 00 20 */ blr .global UpdateTeamCaptain__10CTeamAiMgrFv UpdateTeamCaptain__10CTeamAiMgrFv: @@ -134,7 +134,7 @@ lbl_80237CD0: .global sub_80237ce8 sub_80237ce8: -/* 80237CE8 00234C48 4E 80 00 20 */ blr +/* 80237CE8 00234C48 4E 80 00 20 */ blr .global SpacingSort__10CTeamAiMgrFR13CStateManagerRC9CVector3f SpacingSort__10CTeamAiMgrFR13CStateManagerRC9CVector3f: @@ -351,7 +351,7 @@ lbl_80237F88: /* 80238014 00234F74 80 01 01 34 */ lwz r0, 0x134(r1) /* 80238018 00234F78 7C 08 03 A6 */ mtlr r0 /* 8023801C 00234F7C 38 21 01 30 */ addi r1, r1, 0x130 -/* 80238020 00234F80 4E 80 00 20 */ blr +/* 80238020 00234F80 4E 80 00 20 */ blr .global PositionTeam__10CTeamAiMgrFR13CStateManager PositionTeam__10CTeamAiMgrFR13CStateManager: @@ -370,7 +370,7 @@ PositionTeam__10CTeamAiMgrFR13CStateManager: /* 80238054 00234FB4 81 84 00 00 */ lwz r12, 0(r4) /* 80238058 00234FB8 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 8023805C 00234FBC 7D 89 03 A6 */ mtctr r12 -/* 80238060 00234FC0 4E 80 04 21 */ bctrl +/* 80238060 00234FC0 4E 80 04 21 */ bctrl /* 80238064 00234FC4 C0 41 00 24 */ lfs f2, 0x24(r1) /* 80238068 00234FC8 C0 21 00 28 */ lfs f1, 0x28(r1) /* 8023806C 00234FCC C0 01 00 2C */ lfs f0, 0x2c(r1) @@ -411,7 +411,7 @@ lbl_802380AC: /* 802380EC 0023504C 81 8C 00 A0 */ lwz r12, 0xa0(r12) /* 802380F0 00235050 38 E1 00 30 */ addi r7, r1, 0x30 /* 802380F4 00235054 7D 89 03 A6 */ mtctr r12 -/* 802380F8 00235058 4E 80 04 21 */ bctrl +/* 802380F8 00235058 4E 80 04 21 */ bctrl /* 802380FC 0023505C C0 01 00 18 */ lfs f0, 0x18(r1) /* 80238100 00235060 D0 1F 00 1C */ stfs f0, 0x1c(r31) /* 80238104 00235064 C0 01 00 1C */ lfs f0, 0x1c(r1) @@ -434,12 +434,12 @@ lbl_80238130: /* 8023813C 0023509C 83 A1 00 44 */ lwz r29, 0x44(r1) /* 80238140 002350A0 7C 08 03 A6 */ mtlr r0 /* 80238144 002350A4 38 21 00 50 */ addi r1, r1, 0x50 -/* 80238148 002350A8 4E 80 00 20 */ blr +/* 80238148 002350A8 4E 80 00 20 */ blr .global AssignRoles__10CTeamAiMgrFQ211CTeamAiRole11ETeamAiRoleQ211CTeamAiRole11ETeamAiRole AssignRoles__10CTeamAiMgrFQ211CTeamAiRole11ETeamAiRoleQ211CTeamAiRole11ETeamAiRole: /* 8023814C 002350AC 28 05 00 00 */ cmplwi r5, 0 -/* 80238150 002350B0 4D 82 00 20 */ beqlr +/* 80238150 002350B0 4D 82 00 20 */ beqlr /* 80238154 002350B4 80 E3 00 64 */ lwz r7, 0x64(r3) /* 80238158 002350B8 39 00 00 00 */ li r8, 0 /* 8023815C 002350BC 48 00 00 5C */ b lbl_802381B8 @@ -466,7 +466,7 @@ lbl_80238198: /* 802381A4 00235104 91 07 00 14 */ stw r8, 0x14(r7) /* 802381A8 00235108 39 08 00 01 */ addi r8, r8, 1 /* 802381AC 0023510C 7C 08 28 40 */ cmplw r8, r5 -/* 802381B0 00235110 4D 82 00 20 */ beqlr +/* 802381B0 00235110 4D 82 00 20 */ beqlr lbl_802381B4: /* 802381B4 00235114 38 E7 00 28 */ addi r7, r7, 0x28 lbl_802381B8: @@ -479,7 +479,7 @@ lbl_802381B8: .global sub_802381d0 sub_802381d0: -/* 802381D0 00235130 4E 80 00 20 */ blr +/* 802381D0 00235130 4E 80 00 20 */ blr .global ResetRoles__10CTeamAiMgrFR13CStateManager ResetRoles__10CTeamAiMgrFR13CStateManager: @@ -528,7 +528,7 @@ lbl_80238248: /* 80238270 002351D0 83 81 00 10 */ lwz r28, 0x10(r1) /* 80238274 002351D4 7C 08 03 A6 */ mtlr r0 /* 80238278 002351D8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8023827C 002351DC 4E 80 00 20 */ blr +/* 8023827C 002351DC 4E 80 00 20 */ blr .global UpdateRoles__10CTeamAiMgrFR13CStateManager UpdateRoles__10CTeamAiMgrFR13CStateManager: @@ -553,7 +553,7 @@ UpdateRoles__10CTeamAiMgrFR13CStateManager: /* 802382C8 00235228 81 84 00 00 */ lwz r12, 0(r4) /* 802382CC 0023522C 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 802382D0 00235230 7D 89 03 A6 */ mtctr r12 -/* 802382D4 00235234 4E 80 04 21 */ bctrl +/* 802382D4 00235234 4E 80 04 21 */ bctrl /* 802382D8 00235238 C3 A1 00 68 */ lfs f29, 0x68(r1) /* 802382DC 0023523C 39 00 00 01 */ li r8, 1 /* 802382E0 00235240 C3 E1 00 6C */ lfs f31, 0x6c(r1) @@ -653,7 +653,7 @@ lbl_802383B4: /* 80238448 002353A8 83 C1 00 78 */ lwz r30, 0x78(r1) /* 8023844C 002353AC 7C 08 03 A6 */ mtlr r0 /* 80238450 002353B0 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 80238454 002353B4 4E 80 00 20 */ blr +/* 80238454 002353B4 4E 80 00 20 */ blr .global ShouldUpdateRoles__10CTeamAiMgrFf ShouldUpdateRoles__10CTeamAiMgrFf: @@ -669,7 +669,7 @@ ShouldUpdateRoles__10CTeamAiMgrFf: /* 8023847C 002353DC 4C 41 13 82 */ cror 2, 1, 2 /* 80238480 002353E0 40 82 00 0C */ bne lbl_8023848C /* 80238484 002353E4 38 60 00 01 */ li r3, 1 -/* 80238488 002353E8 4E 80 00 20 */ blr +/* 80238488 002353E8 4E 80 00 20 */ blr lbl_8023848C: /* 8023848C 002353EC 80 03 00 5C */ lwz r0, 0x5c(r3) /* 80238490 002353F0 80 83 00 64 */ lwz r4, 0x64(r3) @@ -689,7 +689,7 @@ lbl_802384C0: /* 802384C0 00235420 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 802384C4 00235424 40 82 00 0C */ bne lbl_802384D0 /* 802384C8 00235428 38 60 00 01 */ li r3, 1 -/* 802384CC 0023542C 4E 80 00 20 */ blr +/* 802384CC 0023542C 4E 80 00 20 */ blr lbl_802384D0: /* 802384D0 00235430 38 84 00 28 */ addi r4, r4, 0x28 lbl_802384D4: @@ -697,7 +697,7 @@ lbl_802384D4: /* 802384D8 00235438 40 82 FF C8 */ bne lbl_802384A0 lbl_802384DC: /* 802384DC 0023543C 38 60 00 00 */ li r3, 0 -/* 802384E0 00235440 4E 80 00 20 */ blr +/* 802384E0 00235440 4E 80 00 20 */ blr .global RemoveProjectileAttacker__10CTeamAiMgrF9TUniqueId RemoveProjectileAttacker__10CTeamAiMgrF9TUniqueId: @@ -759,7 +759,7 @@ lbl_802385AC: /* 802385B4 00235514 83 C1 00 38 */ lwz r30, 0x38(r1) /* 802385B8 00235518 7C 08 03 A6 */ mtlr r0 /* 802385BC 0023551C 38 21 00 40 */ addi r1, r1, 0x40 -/* 802385C0 00235520 4E 80 00 20 */ blr +/* 802385C0 00235520 4E 80 00 20 */ blr .global AddProjectileAttacker__10CTeamAiMgrF9TUniqueId AddProjectileAttacker__10CTeamAiMgrF9TUniqueId: @@ -862,7 +862,7 @@ lbl_80238728: /* 80238730 00235690 83 C1 00 48 */ lwz r30, 0x48(r1) /* 80238734 00235694 7C 08 03 A6 */ mtlr r0 /* 80238738 00235698 38 21 00 50 */ addi r1, r1, 0x50 -/* 8023873C 0023569C 4E 80 00 20 */ blr +/* 8023873C 0023569C 4E 80 00 20 */ blr .global sub_80238740 sub_80238740: @@ -901,7 +901,7 @@ sub_80238740: /* 802387C0 00235720 83 A1 00 24 */ lwz r29, 0x24(r1) /* 802387C4 00235724 7C 08 03 A6 */ mtlr r0 /* 802387C8 00235728 38 21 00 30 */ addi r1, r1, 0x30 -/* 802387CC 0023572C 4E 80 00 20 */ blr +/* 802387CC 0023572C 4E 80 00 20 */ blr .global sub_802387d0 sub_802387d0: @@ -1070,7 +1070,7 @@ lbl_802389F0: /* 802389F4 00235954 80 01 00 34 */ lwz r0, 0x34(r1) /* 802389F8 00235958 7C 08 03 A6 */ mtlr r0 /* 802389FC 0023595C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80238A00 00235960 4E 80 00 20 */ blr +/* 80238A00 00235960 4E 80 00 20 */ blr .global CanAcceptProjectileAttacker__10CTeamAiMgrCF9TUniqueId CanAcceptProjectileAttacker__10CTeamAiMgrCF9TUniqueId: @@ -1141,7 +1141,7 @@ lbl_80238AE8: /* 80238AF0 00235A50 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80238AF4 00235A54 7C 08 03 A6 */ mtlr r0 /* 80238AF8 00235A58 38 21 00 30 */ addi r1, r1, 0x30 -/* 80238AFC 00235A5C 4E 80 00 20 */ blr +/* 80238AFC 00235A5C 4E 80 00 20 */ blr .global IsProjectileAttacker__10CTeamAiMgrCF9TUniqueId IsProjectileAttacker__10CTeamAiMgrCF9TUniqueId: @@ -1197,7 +1197,7 @@ lbl_80238B90: /* 80238BBC 00235B1C 80 01 00 34 */ lwz r0, 0x34(r1) /* 80238BC0 00235B20 7C 08 03 A6 */ mtlr r0 /* 80238BC4 00235B24 38 21 00 30 */ addi r1, r1, 0x30 -/* 80238BC8 00235B28 4E 80 00 20 */ blr +/* 80238BC8 00235B28 4E 80 00 20 */ blr .global RemoveMeleeAttacker__10CTeamAiMgrF9TUniqueId RemoveMeleeAttacker__10CTeamAiMgrF9TUniqueId: @@ -1259,7 +1259,7 @@ lbl_80238C94: /* 80238C9C 00235BFC 83 C1 00 38 */ lwz r30, 0x38(r1) /* 80238CA0 00235C00 7C 08 03 A6 */ mtlr r0 /* 80238CA4 00235C04 38 21 00 40 */ addi r1, r1, 0x40 -/* 80238CA8 00235C08 4E 80 00 20 */ blr +/* 80238CA8 00235C08 4E 80 00 20 */ blr .global AddMeleeAttacker__10CTeamAiMgrF9TUniqueId AddMeleeAttacker__10CTeamAiMgrF9TUniqueId: @@ -1362,7 +1362,7 @@ lbl_80238E10: /* 80238E18 00235D78 83 C1 00 48 */ lwz r30, 0x48(r1) /* 80238E1C 00235D7C 7C 08 03 A6 */ mtlr r0 /* 80238E20 00235D80 38 21 00 50 */ addi r1, r1, 0x50 -/* 80238E24 00235D84 4E 80 00 20 */ blr +/* 80238E24 00235D84 4E 80 00 20 */ blr .global CanAcceptMeleeAttacker__10CTeamAiMgrCF9TUniqueId CanAcceptMeleeAttacker__10CTeamAiMgrCF9TUniqueId: @@ -1433,7 +1433,7 @@ lbl_80238F0C: /* 80238F14 00235E74 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80238F18 00235E78 7C 08 03 A6 */ mtlr r0 /* 80238F1C 00235E7C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80238F20 00235E80 4E 80 00 20 */ blr +/* 80238F20 00235E80 4E 80 00 20 */ blr .global IsMeleeAttacker__10CTeamAiMgrCF9TUniqueId IsMeleeAttacker__10CTeamAiMgrCF9TUniqueId: @@ -1489,7 +1489,7 @@ lbl_80238FB4: /* 80238FE0 00235F40 80 01 00 34 */ lwz r0, 0x34(r1) /* 80238FE4 00235F44 7C 08 03 A6 */ mtlr r0 /* 80238FE8 00235F48 38 21 00 30 */ addi r1, r1, 0x30 -/* 80238FEC 00235F4C 4E 80 00 20 */ blr +/* 80238FEC 00235F4C 4E 80 00 20 */ blr .global IsPartOfTeam__10CTeamAiMgrCF9TUniqueId IsPartOfTeam__10CTeamAiMgrCF9TUniqueId: @@ -1563,7 +1563,7 @@ lbl_802390CC: /* 802390F4 00236054 80 01 00 64 */ lwz r0, 0x64(r1) /* 802390F8 00236058 7C 08 03 A6 */ mtlr r0 /* 802390FC 0023605C 38 21 00 60 */ addi r1, r1, 0x60 -/* 80239100 00236060 4E 80 00 20 */ blr +/* 80239100 00236060 4E 80 00 20 */ blr .global HasTeamAiRole__10CTeamAiMgrCF9TUniqueId HasTeamAiRole__10CTeamAiMgrCF9TUniqueId: @@ -1647,7 +1647,7 @@ lbl_80239224: /* 80239228 00236188 83 E1 00 5C */ lwz r31, 0x5c(r1) /* 8023922C 0023618C 7C 08 03 A6 */ mtlr r0 /* 80239230 00236190 38 21 00 60 */ addi r1, r1, 0x60 -/* 80239234 00236194 4E 80 00 20 */ blr +/* 80239234 00236194 4E 80 00 20 */ blr .global ClearTeamAiRole__10CTeamAiMgrF9TUniqueId ClearTeamAiRole__10CTeamAiMgrF9TUniqueId: @@ -1722,7 +1722,7 @@ lbl_80239338: /* 8023933C 0023629C 83 E1 00 5C */ lwz r31, 0x5c(r1) /* 80239340 002362A0 7C 08 03 A6 */ mtlr r0 /* 80239344 002362A4 38 21 00 60 */ addi r1, r1, 0x60 -/* 80239348 002362A8 4E 80 00 20 */ blr +/* 80239348 002362A8 4E 80 00 20 */ blr .global GetTeamAiRole__10CTeamAiMgrCF9TUniqueId GetTeamAiRole__10CTeamAiMgrCF9TUniqueId: @@ -1798,7 +1798,7 @@ lbl_8023944C: /* 80239450 002363B0 83 E1 00 5C */ lwz r31, 0x5c(r1) /* 80239454 002363B4 7C 08 03 A6 */ mtlr r0 /* 80239458 002363B8 38 21 00 60 */ addi r1, r1, 0x60 -/* 8023945C 002363BC 4E 80 00 20 */ blr +/* 8023945C 002363BC 4E 80 00 20 */ blr .global GetNumAssignedOfRole__10CTeamAiMgrCFQ211CTeamAiRole11ETeamAiRole GetNumAssignedOfRole__10CTeamAiMgrCFQ211CTeamAiRole11ETeamAiRole: @@ -1819,7 +1819,7 @@ lbl_8023948C: /* 8023948C 002363EC 7C 05 18 40 */ cmplw r5, r3 /* 80239490 002363F0 40 82 FF E8 */ bne lbl_80239478 /* 80239494 002363F4 7C C3 33 78 */ mr r3, r6 -/* 80239498 002363F8 4E 80 00 20 */ blr +/* 80239498 002363F8 4E 80 00 20 */ blr .global GetNumAssignedAiRoles__10CTeamAiMgrCFv GetNumAssignedAiRoles__10CTeamAiMgrCFv: @@ -1848,7 +1848,7 @@ lbl_802394E4: /* 802394E4 00236444 7C 04 18 40 */ cmplw r4, r3 /* 802394E8 00236448 40 82 FF CC */ bne lbl_802394B4 /* 802394EC 0023644C 7C C3 33 78 */ mr r3, r6 -/* 802394F0 00236450 4E 80 00 20 */ blr +/* 802394F0 00236450 4E 80 00 20 */ blr .global RemoveTeamAiRole__10CTeamAiMgrF9TUniqueId RemoveTeamAiRole__10CTeamAiMgrF9TUniqueId: @@ -1951,7 +1951,7 @@ lbl_80239638: /* 80239664 002365C4 83 C1 00 78 */ lwz r30, 0x78(r1) /* 80239668 002365C8 7C 08 03 A6 */ mtlr r0 /* 8023966C 002365CC 38 21 00 80 */ addi r1, r1, 0x80 -/* 80239670 002365D0 4E 80 00 20 */ blr +/* 80239670 002365D0 4E 80 00 20 */ blr .global sub_80239674 sub_80239674: @@ -1973,7 +1973,7 @@ sub_80239674: /* 802396B0 00236610 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802396B4 00236614 7C 08 03 A6 */ mtlr r0 /* 802396B8 00236618 38 21 00 20 */ addi r1, r1, 0x20 -/* 802396BC 0023661C 4E 80 00 20 */ blr +/* 802396BC 0023661C 4E 80 00 20 */ blr .global sub_802396c0 sub_802396c0: @@ -2040,7 +2040,7 @@ lbl_80239780: /* 8023979C 002366FC 80 05 00 00 */ lwz r0, 0(r5) /* 802397A0 00236700 90 03 00 00 */ stw r0, 0(r3) /* 802397A4 00236704 38 21 00 10 */ addi r1, r1, 0x10 -/* 802397A8 00236708 4E 80 00 20 */ blr +/* 802397A8 00236708 4E 80 00 20 */ blr .global AssignTeamAiRole__10CTeamAiMgrFRC3CAiiii AssignTeamAiRole__10CTeamAiMgrFRC3CAiiii: @@ -2165,7 +2165,7 @@ lbl_80239968: /* 8023996C 002368CC 83 E1 00 7C */ lwz r31, 0x7c(r1) /* 80239970 002368D0 7C 08 03 A6 */ mtlr r0 /* 80239974 002368D4 38 21 00 80 */ addi r1, r1, 0x80 -/* 80239978 002368D8 4E 80 00 20 */ blr +/* 80239978 002368D8 4E 80 00 20 */ blr .global sub_8023997c sub_8023997c: @@ -2207,7 +2207,7 @@ sub_8023997c: /* 80239A08 00236968 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80239A0C 0023696C 7C 08 03 A6 */ mtlr r0 /* 80239A10 00236970 38 21 00 30 */ addi r1, r1, 0x30 -/* 80239A14 00236974 4E 80 00 20 */ blr +/* 80239A14 00236974 4E 80 00 20 */ blr .global sub_80239a18 sub_80239a18: @@ -2476,7 +2476,7 @@ lbl_80239DC8: /* 80239DCC 00236D2C 80 01 00 34 */ lwz r0, 0x34(r1) /* 80239DD0 00236D30 7C 08 03 A6 */ mtlr r0 /* 80239DD4 00236D34 38 21 00 30 */ addi r1, r1, 0x30 -/* 80239DD8 00236D38 4E 80 00 20 */ blr +/* 80239DD8 00236D38 4E 80 00 20 */ blr .global Think__10CTeamAiMgrFfR13CStateManager Think__10CTeamAiMgrFfR13CStateManager: @@ -2516,7 +2516,7 @@ lbl_80239E28: /* 80239E5C 00236DBC 83 C1 00 08 */ lwz r30, 8(r1) /* 80239E60 00236DC0 7C 08 03 A6 */ mtlr r0 /* 80239E64 00236DC4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80239E68 00236DC8 4E 80 00 20 */ blr +/* 80239E68 00236DC8 4E 80 00 20 */ blr .global Accept__10CTeamAiMgrFR8IVisitor Accept__10CTeamAiMgrFR8IVisitor: @@ -2529,11 +2529,11 @@ Accept__10CTeamAiMgrFR8IVisitor: /* 80239E84 00236DE4 7C 04 03 78 */ mr r4, r0 /* 80239E88 00236DE8 81 8C 00 C4 */ lwz r12, 0xc4(r12) /* 80239E8C 00236DEC 7D 89 03 A6 */ mtctr r12 -/* 80239E90 00236DF0 4E 80 04 21 */ bctrl +/* 80239E90 00236DF0 4E 80 04 21 */ bctrl /* 80239E94 00236DF4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80239E98 00236DF8 7C 08 03 A6 */ mtlr r0 /* 80239E9C 00236DFC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80239EA0 00236E00 4E 80 00 20 */ blr +/* 80239EA0 00236E00 4E 80 00 20 */ blr .global AcceptScriptMsg__10CTeamAiMgrF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__10CTeamAiMgrF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -2547,7 +2547,7 @@ AcceptScriptMsg__10CTeamAiMgrF20EScriptObjectMessage9TUniqueIdR13CStateManager: /* 80239EC0 00236E20 80 01 00 14 */ lwz r0, 0x14(r1) /* 80239EC4 00236E24 7C 08 03 A6 */ mtlr r0 /* 80239EC8 00236E28 38 21 00 10 */ addi r1, r1, 0x10 -/* 80239ECC 00236E2C 4E 80 00 20 */ blr +/* 80239ECC 00236E2C 4E 80 00 20 */ blr .global ResetTeamAiRole__10CTeamAiMgrF11EAttackTypeR13CStateManager9TUniqueId9TUniqueIdb ResetTeamAiRole__10CTeamAiMgrF11EAttackTypeR13CStateManager9TUniqueId9TUniqueIdb: @@ -2625,7 +2625,7 @@ lbl_80239FD0: /* 80239FE0 00236F40 83 81 00 30 */ lwz r28, 0x30(r1) /* 80239FE4 00236F44 7C 08 03 A6 */ mtlr r0 /* 80239FE8 00236F48 38 21 00 40 */ addi r1, r1, 0x40 -/* 80239FEC 00236F4C 4E 80 00 20 */ blr +/* 80239FEC 00236F4C 4E 80 00 20 */ blr .global AddAttacker__10CTeamAiMgrF11EAttackTypeR13CStateManager9TUniqueId9TUniqueId AddAttacker__10CTeamAiMgrF11EAttackTypeR13CStateManager9TUniqueId9TUniqueId: @@ -2681,7 +2681,7 @@ lbl_8023A09C: /* 8023A0A8 00237008 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8023A0AC 0023700C 7C 08 03 A6 */ mtlr r0 /* 8023A0B0 00237010 38 21 00 30 */ addi r1, r1, 0x30 -/* 8023A0B4 00237014 4E 80 00 20 */ blr +/* 8023A0B4 00237014 4E 80 00 20 */ blr .global CanAcceptAttacker__10CTeamAiMgrF11EAttackTypeR13CStateManager9TUniqueId9TUniqueId CanAcceptAttacker__10CTeamAiMgrF11EAttackTypeR13CStateManager9TUniqueId9TUniqueId: @@ -2737,7 +2737,7 @@ lbl_8023A164: /* 8023A170 002370D0 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8023A174 002370D4 7C 08 03 A6 */ mtlr r0 /* 8023A178 002370D8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8023A17C 002370DC 4E 80 00 20 */ blr +/* 8023A17C 002370DC 4E 80 00 20 */ blr .global GetTeamAiRole__10CTeamAiMgrCFRC13CStateManager9TUniqueId9TUniqueId GetTeamAiRole__10CTeamAiMgrCFRC13CStateManager9TUniqueId9TUniqueId: @@ -2768,7 +2768,7 @@ lbl_8023A1D4: /* 8023A1D8 00237138 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8023A1DC 0023713C 7C 08 03 A6 */ mtlr r0 /* 8023A1E0 00237140 38 21 00 20 */ addi r1, r1, 0x20 -/* 8023A1E4 00237144 4E 80 00 20 */ blr +/* 8023A1E4 00237144 4E 80 00 20 */ blr .global GetTeamAiMgr__10CTeamAiMgrF3CAiRC13CStateManager GetTeamAiMgr__10CTeamAiMgrF3CAiRC13CStateManager: @@ -2830,7 +2830,7 @@ lbl_8023A2A4: /* 8023A2B4 00237214 83 81 00 20 */ lwz r28, 0x20(r1) /* 8023A2B8 00237218 7C 08 03 A6 */ mtlr r0 /* 8023A2BC 0023721C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8023A2C0 00237220 4E 80 00 20 */ blr +/* 8023A2C0 00237220 4E 80 00 20 */ blr .global "__ct__10CTeamAiMgrF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRCQ210CTeamAiMgr8CUnknown" "__ct__10CTeamAiMgrF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRCQ210CTeamAiMgr8CUnknown": @@ -2912,7 +2912,7 @@ lbl_8023A3D8: /* 8023A3E4 00237344 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8023A3E8 00237348 7C 08 03 A6 */ mtlr r0 /* 8023A3EC 0023734C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8023A3F0 00237350 4E 80 00 20 */ blr +/* 8023A3F0 00237350 4E 80 00 20 */ blr .global sub_8023a3f4 sub_8023a3f4: @@ -2971,7 +2971,7 @@ lbl_8023A4A0: /* 8023A4B4 00237414 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8023A4B8 00237418 7C 08 03 A6 */ mtlr r0 /* 8023A4BC 0023741C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8023A4C0 00237420 4E 80 00 20 */ blr +/* 8023A4C0 00237420 4E 80 00 20 */ blr .global __lt__11CTeamAiRoleCFRC11CTeamAiRole __lt__11CTeamAiRoleCFRC11CTeamAiRole: @@ -3045,7 +3045,7 @@ lbl_8023A5B0: /* 8023A5C0 00237520 54 03 0F FE */ srwi r3, r0, 0x1f lbl_8023A5C4: /* 8023A5C4 00237524 38 21 00 20 */ addi r1, r1, 0x20 -/* 8023A5C8 00237528 4E 80 00 20 */ blr +/* 8023A5C8 00237528 4E 80 00 20 */ blr .global "sort_with_custom_comparator>" "sort_with_custom_comparator>": @@ -3217,7 +3217,7 @@ lbl_8023A834: /* 8023A844 002377A4 83 81 00 A0 */ lwz r28, 0xa0(r1) /* 8023A848 002377A8 7C 08 03 A6 */ mtlr r0 /* 8023A84C 002377AC 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 8023A850 002377B0 4E 80 00 20 */ blr +/* 8023A850 002377B0 4E 80 00 20 */ blr .global __swap__11CTeamAiRoleFRC11CTeamAiRole __swap__11CTeamAiRoleFRC11CTeamAiRole: @@ -3287,7 +3287,7 @@ __swap__11CTeamAiRoleFRC11CTeamAiRole: /* 8023A950 002378B0 83 A1 00 34 */ lwz r29, 0x34(r1) /* 8023A954 002378B4 83 81 00 30 */ lwz r28, 0x30(r1) /* 8023A958 002378B8 38 21 00 40 */ addi r1, r1, 0x40 -/* 8023A95C 002378BC 4E 80 00 20 */ blr +/* 8023A95C 002378BC 4E 80 00 20 */ blr .global "lower_bound14const_iterator,11CTeamAiRole>__4rstlFQ34rstl46list<11CTeamAiRole,Q24rstl17rmemory_allocator>14iteratorQ34rstl46list<11CTeamAiRole,Q24rstl17rmemory_allocator>14iteratorRC11CTeamAiRole" "lower_bound14const_iterator,11CTeamAiRole>__4rstlFQ34rstl46list<11CTeamAiRole,Q24rstl17rmemory_allocator>14iteratorQ34rstl46list<11CTeamAiRole,Q24rstl17rmemory_allocator>14iteratorRC11CTeamAiRole": @@ -3343,7 +3343,7 @@ lbl_8023AA04: /* 8023AA18 00237978 80 01 00 34 */ lwz r0, 0x34(r1) /* 8023AA1C 0023797C 7C 08 03 A6 */ mtlr r0 /* 8023AA20 00237980 38 21 00 30 */ addi r1, r1, 0x30 -/* 8023AA24 00237984 4E 80 00 20 */ blr +/* 8023AA24 00237984 4E 80 00 20 */ blr .global "lower_bound_const8iterator,11CTeamAiRole>__4rstlFQ34rstl46list<11CTeamAiRole,Q24rstl17rmemory_allocator>8const_iteratorQ34rstl46list<11CTeamAiRole,Q24rstl17rmemory_allocator>8const_iteratorRC11CTeamAiRole" "lower_bound_const8iterator,11CTeamAiRole>__4rstlFQ34rstl46list<11CTeamAiRole,Q24rstl17rmemory_allocator>8const_iteratorQ34rstl46list<11CTeamAiRole,Q24rstl17rmemory_allocator>8const_iteratorRC11CTeamAiRole": @@ -3399,7 +3399,7 @@ lbl_8023AACC: /* 8023AAE0 00237A40 80 01 00 34 */ lwz r0, 0x34(r1) /* 8023AAE4 00237A44 7C 08 03 A6 */ mtlr r0 /* 8023AAE8 00237A48 38 21 00 30 */ addi r1, r1, 0x30 -/* 8023AAEC 00237A4C 4E 80 00 20 */ blr +/* 8023AAEC 00237A4C 4E 80 00 20 */ blr .global "lower_bound_const>" "lower_bound_const>": @@ -3453,7 +3453,7 @@ lbl_8023AB8C: /* 8023ABA0 00237B00 80 01 00 34 */ lwz r0, 0x34(r1) /* 8023ABA4 00237B04 7C 08 03 A6 */ mtlr r0 /* 8023ABA8 00237B08 38 21 00 30 */ addi r1, r1, 0x30 -/* 8023ABAC 00237B0C 4E 80 00 20 */ blr +/* 8023ABAC 00237B0C 4E 80 00 20 */ blr .global "lower_bound>" "lower_bound>": @@ -3507,7 +3507,7 @@ lbl_8023AC4C: /* 8023AC60 00237BC0 80 01 00 34 */ lwz r0, 0x34(r1) /* 8023AC64 00237BC4 7C 08 03 A6 */ mtlr r0 /* 8023AC68 00237BC8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8023AC6C 00237BCC 4E 80 00 20 */ blr +/* 8023AC6C 00237BCC 4E 80 00 20 */ blr .global sub_8023ac70 sub_8023ac70: @@ -3597,7 +3597,7 @@ lbl_8023AD8C: /* 8023AD98 00237CF8 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8023AD9C 00237CFC 7C 08 03 A6 */ mtlr r0 /* 8023ADA0 00237D00 38 21 00 30 */ addi r1, r1, 0x30 -/* 8023ADA4 00237D04 4E 80 00 20 */ blr +/* 8023ADA4 00237D04 4E 80 00 20 */ blr .global sub_8023ada8 sub_8023ada8: @@ -3611,7 +3611,7 @@ sub_8023ada8: /* 8023ADC4 00237D24 80 01 00 14 */ lwz r0, 0x14(r1) /* 8023ADC8 00237D28 7C 08 03 A6 */ mtlr r0 /* 8023ADCC 00237D2C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8023ADD0 00237D30 4E 80 00 20 */ blr +/* 8023ADD0 00237D30 4E 80 00 20 */ blr .global sub_8023add4 sub_8023add4: @@ -3625,7 +3625,7 @@ sub_8023add4: /* 8023ADF0 00237D50 80 01 00 14 */ lwz r0, 0x14(r1) /* 8023ADF4 00237D54 7C 08 03 A6 */ mtlr r0 /* 8023ADF8 00237D58 38 21 00 10 */ addi r1, r1, 0x10 -/* 8023ADFC 00237D5C 4E 80 00 20 */ blr +/* 8023ADFC 00237D5C 4E 80 00 20 */ blr .global sub_8023ae00 sub_8023ae00: @@ -3639,7 +3639,7 @@ sub_8023ae00: /* 8023AE1C 00237D7C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8023AE20 00237D80 7C 08 03 A6 */ mtlr r0 /* 8023AE24 00237D84 38 21 00 10 */ addi r1, r1, 0x10 -/* 8023AE28 00237D88 4E 80 00 20 */ blr +/* 8023AE28 00237D88 4E 80 00 20 */ blr .global sub_8023ae2c sub_8023ae2c: @@ -3653,7 +3653,7 @@ sub_8023ae2c: /* 8023AE48 00237DA8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8023AE4C 00237DAC 7C 08 03 A6 */ mtlr r0 /* 8023AE50 00237DB0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8023AE54 00237DB4 4E 80 00 20 */ blr +/* 8023AE54 00237DB4 4E 80 00 20 */ blr .global sub_8023ae58 sub_8023ae58: @@ -3661,7 +3661,7 @@ sub_8023ae58: /* 8023AE5C 00237DBC 54 80 08 3C */ slwi r0, r4, 1 /* 8023AE60 00237DC0 7C 05 02 14 */ add r0, r5, r0 /* 8023AE64 00237DC4 90 03 00 00 */ stw r0, 0(r3) -/* 8023AE68 00237DC8 4E 80 00 20 */ blr +/* 8023AE68 00237DC8 4E 80 00 20 */ blr .global sub_8023ae6c sub_8023ae6c: @@ -3669,7 +3669,7 @@ sub_8023ae6c: /* 8023AE70 00237DD0 54 80 08 3C */ slwi r0, r4, 1 /* 8023AE74 00237DD4 7C 05 02 14 */ add r0, r5, r0 /* 8023AE78 00237DD8 90 03 00 00 */ stw r0, 0(r3) -/* 8023AE7C 00237DDC 4E 80 00 20 */ blr +/* 8023AE7C 00237DDC 4E 80 00 20 */ blr .global sub_8023ae80 sub_8023ae80: @@ -3677,7 +3677,7 @@ sub_8023ae80: /* 8023AE84 00237DE4 80 83 00 00 */ lwz r4, 0(r3) /* 8023AE88 00237DE8 7C 04 02 14 */ add r0, r4, r0 /* 8023AE8C 00237DEC 90 03 00 00 */ stw r0, 0(r3) -/* 8023AE90 00237DF0 4E 80 00 20 */ blr +/* 8023AE90 00237DF0 4E 80 00 20 */ blr .global sub_8023ae94 sub_8023ae94: @@ -3685,7 +3685,7 @@ sub_8023ae94: /* 8023AE98 00237DF8 80 83 00 00 */ lwz r4, 0(r3) /* 8023AE9C 00237DFC 7C 04 02 14 */ add r0, r4, r0 /* 8023AEA0 00237E00 90 03 00 00 */ stw r0, 0(r3) -/* 8023AEA4 00237E04 4E 80 00 20 */ blr +/* 8023AEA4 00237E04 4E 80 00 20 */ blr .global sub_8023aea8 sub_8023aea8: @@ -3705,7 +3705,7 @@ sub_8023aea8: /* 8023AEDC 00237E3C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8023AEE0 00237E40 7C 08 03 A6 */ mtlr r0 /* 8023AEE4 00237E44 38 21 00 20 */ addi r1, r1, 0x20 -/* 8023AEE8 00237E48 4E 80 00 20 */ blr +/* 8023AEE8 00237E48 4E 80 00 20 */ blr .global sub_8023aeec sub_8023aeec: @@ -3725,7 +3725,7 @@ sub_8023aeec: /* 8023AF20 00237E80 80 01 00 24 */ lwz r0, 0x24(r1) /* 8023AF24 00237E84 7C 08 03 A6 */ mtlr r0 /* 8023AF28 00237E88 38 21 00 20 */ addi r1, r1, 0x20 -/* 8023AF2C 00237E8C 4E 80 00 20 */ blr +/* 8023AF2C 00237E8C 4E 80 00 20 */ blr .global sub_8023af30 sub_8023af30: @@ -3745,7 +3745,7 @@ sub_8023af30: /* 8023AF64 00237EC4 80 01 00 24 */ lwz r0, 0x24(r1) /* 8023AF68 00237EC8 7C 08 03 A6 */ mtlr r0 /* 8023AF6C 00237ECC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8023AF70 00237ED0 4E 80 00 20 */ blr +/* 8023AF70 00237ED0 4E 80 00 20 */ blr .global sub_8023af74 sub_8023af74: @@ -3765,7 +3765,7 @@ sub_8023af74: /* 8023AFA8 00237F08 80 01 00 24 */ lwz r0, 0x24(r1) /* 8023AFAC 00237F0C 7C 08 03 A6 */ mtlr r0 /* 8023AFB0 00237F10 38 21 00 20 */ addi r1, r1, 0x20 -/* 8023AFB4 00237F14 4E 80 00 20 */ blr +/* 8023AFB4 00237F14 4E 80 00 20 */ blr .global sub_8023afb8 sub_8023afb8: @@ -3775,7 +3775,7 @@ sub_8023afb8: /* 8023AFC4 00237F24 54 60 0F FE */ srwi r0, r3, 0x1f /* 8023AFC8 00237F28 7C 00 1A 14 */ add r0, r0, r3 /* 8023AFCC 00237F2C 7C 03 0E 70 */ srawi r3, r0, 1 -/* 8023AFD0 00237F30 4E 80 00 20 */ blr +/* 8023AFD0 00237F30 4E 80 00 20 */ blr .global sub_8023afd4 sub_8023afd4: @@ -3788,7 +3788,7 @@ sub_8023afd4: /* 8023AFEC 00237F4C 7C 00 26 70 */ srawi r0, r0, 4 /* 8023AFF0 00237F50 54 03 0F FE */ srwi r3, r0, 0x1f /* 8023AFF4 00237F54 7C 60 1A 14 */ add r3, r0, r3 -/* 8023AFF8 00237F58 4E 80 00 20 */ blr +/* 8023AFF8 00237F58 4E 80 00 20 */ blr .global sub_8023affc sub_8023affc: @@ -3801,7 +3801,7 @@ sub_8023affc: /* 8023B014 00237F74 7C 00 26 70 */ srawi r0, r0, 4 /* 8023B018 00237F78 54 03 0F FE */ srwi r3, r0, 0x1f /* 8023B01C 00237F7C 7C 60 1A 14 */ add r3, r0, r3 -/* 8023B020 00237F80 4E 80 00 20 */ blr +/* 8023B020 00237F80 4E 80 00 20 */ blr .global sub_8023b024 sub_8023b024: @@ -3811,7 +3811,7 @@ sub_8023b024: /* 8023B030 00237F90 54 60 0F FE */ srwi r0, r3, 0x1f /* 8023B034 00237F94 7C 00 1A 14 */ add r0, r0, r3 /* 8023B038 00237F98 7C 03 0E 70 */ srawi r3, r0, 1 -/* 8023B03C 00237F9C 4E 80 00 20 */ blr +/* 8023B03C 00237F9C 4E 80 00 20 */ blr .global sub_8023b040 sub_8023b040: @@ -3957,7 +3957,7 @@ lbl_8023B250: /* 8023B260 002381C0 83 81 00 30 */ lwz r28, 0x30(r1) /* 8023B264 002381C4 7C 08 03 A6 */ mtlr r0 /* 8023B268 002381C8 38 21 00 40 */ addi r1, r1, 0x40 -/* 8023B26C 002381CC 4E 80 00 20 */ blr +/* 8023B26C 002381CC 4E 80 00 20 */ blr .global sub_8023b270 sub_8023b270: @@ -4022,7 +4022,7 @@ sub_8023b270: /* 8023B358 002382B8 91 21 00 20 */ stw r9, 0x20(r1) /* 8023B35C 002382BC 83 A1 00 34 */ lwz r29, 0x34(r1) /* 8023B360 002382C0 38 21 00 40 */ addi r1, r1, 0x40 -/* 8023B364 002382C4 4E 80 00 20 */ blr +/* 8023B364 002382C4 4E 80 00 20 */ blr .global sub_8023b368 sub_8023b368: diff --git a/asm/MetroidPrime/Enemies/CThardus.s b/asm/MetroidPrime/Enemies/CThardus.s index 3c195df6..f59bf1cb 100644 --- a/asm/MetroidPrime/Enemies/CThardus.s +++ b/asm/MetroidPrime/Enemies/CThardus.s @@ -897,17 +897,17 @@ lbl_801DABFC: /* 801DAC10 001D7B70 83 81 00 C0 */ lwz r28, 0xc0(r1) /* 801DAC14 001D7B74 7C 08 03 A6 */ mtlr r0 /* 801DAC18 001D7B78 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 801DAC1C 001D7B7C 4E 80 00 20 */ blr +/* 801DAC1C 001D7B7C 4E 80 00 20 */ blr .global CanRenderUnsorted__8CThardusCFRC13CStateManager CanRenderUnsorted__8CThardusCFRC13CStateManager: /* 801DAC20 001D7B80 38 60 00 00 */ li r3, 0 -/* 801DAC24 001D7B84 4E 80 00 20 */ blr +/* 801DAC24 001D7B84 4E 80 00 20 */ blr .global GetSearchPath__8CThardusFv GetSearchPath__8CThardusFv: /* 801DAC28 001D7B88 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 801DAC2C 001D7B8C 4E 80 00 20 */ blr +/* 801DAC2C 001D7B8C 4E 80 00 20 */ blr .global sub_801dac30 sub_801dac30: @@ -1042,7 +1042,7 @@ lbl_801DAE00: /* 801DAE1C 001D7D7C 80 01 00 D4 */ lwz r0, 0xd4(r1) /* 801DAE20 001D7D80 7C 08 03 A6 */ mtlr r0 /* 801DAE24 001D7D84 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 801DAE28 001D7D88 4E 80 00 20 */ blr +/* 801DAE28 001D7D88 4E 80 00 20 */ blr .global sub_801dae2c sub_801dae2c: @@ -1105,7 +1105,7 @@ lbl_801DAEFC: /* 801DAF04 001D7E64 81 9F 00 00 */ lwz r12, 0(r31) /* 801DAF08 001D7E68 81 8C 00 34 */ lwz r12, 0x34(r12) /* 801DAF0C 001D7E6C 7D 89 03 A6 */ mtctr r12 -/* 801DAF10 001D7E70 4E 80 04 21 */ bctrl +/* 801DAF10 001D7E70 4E 80 04 21 */ bctrl /* 801DAF14 001D7E74 D3 E3 00 00 */ stfs f31, 0(r3) /* 801DAF18 001D7E78 7F A4 EB 78 */ mr r4, r29 /* 801DAF1C 001D7E7C C0 02 AC DC */ lfs f0, lbl_805AC9FC@sda21(r2) @@ -1114,7 +1114,7 @@ lbl_801DAEFC: /* 801DAF28 001D7E88 81 9A 00 00 */ lwz r12, 0(r26) /* 801DAF2C 001D7E8C 81 8C 00 34 */ lwz r12, 0x34(r12) /* 801DAF30 001D7E90 7D 89 03 A6 */ mtctr r12 -/* 801DAF34 001D7E94 4E 80 04 21 */ bctrl +/* 801DAF34 001D7E94 4E 80 04 21 */ bctrl /* 801DAF38 001D7E98 D3 E3 00 00 */ stfs f31, 0(r3) /* 801DAF3C 001D7E9C 38 00 00 01 */ li r0, 1 /* 801DAF40 001D7EA0 C0 02 AC DC */ lfs f0, lbl_805AC9FC@sda21(r2) @@ -1131,7 +1131,7 @@ lbl_801DAEFC: /* 801DAF6C 001D7ECC 38 80 00 01 */ li r4, 1 /* 801DAF70 001D7ED0 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 801DAF74 001D7ED4 7D 89 03 A6 */ mtctr r12 -/* 801DAF78 001D7ED8 4E 80 04 21 */ bctrl +/* 801DAF78 001D7ED8 4E 80 04 21 */ bctrl /* 801DAF7C 001D7EDC C0 02 AC E4 */ lfs f0, lbl_805ACA04@sda21(r2) /* 801DAF80 001D7EE0 D0 1F 03 2C */ stfs f0, 0x32c(r31) /* 801DAF84 001D7EE4 80 7D 08 B8 */ lwz r3, 0x8b8(r29) @@ -1192,7 +1192,7 @@ lbl_801DB048: /* 801DB054 001D7FB4 80 01 00 84 */ lwz r0, 0x84(r1) /* 801DB058 001D7FB8 7C 08 03 A6 */ mtlr r0 /* 801DB05C 001D7FBC 38 21 00 80 */ addi r1, r1, 0x80 -/* 801DB060 001D7FC0 4E 80 00 20 */ blr +/* 801DB060 001D7FC0 4E 80 00 20 */ blr .global GetSortingBounds__8CThardusCFRC12CTransform4f GetSortingBounds__8CThardusCFRC12CTransform4f: @@ -1252,7 +1252,7 @@ GetSortingBounds__8CThardusCFRC12CTransform4f: /* 801DB138 001D8098 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 801DB13C 001D809C 7C 08 03 A6 */ mtlr r0 /* 801DB140 001D80A0 38 21 00 70 */ addi r1, r1, 0x70 -/* 801DB144 001D80A4 4E 80 00 20 */ blr +/* 801DB144 001D80A4 4E 80 00 20 */ blr .global sub_801db148 sub_801db148: @@ -1299,7 +1299,7 @@ lbl_801DB1D4: /* 801DB1D8 001D8138 7F 64 DB 78 */ mr r4, r27 /* 801DB1DC 001D813C 81 8C 00 34 */ lwz r12, 0x34(r12) /* 801DB1E0 001D8140 7D 89 03 A6 */ mtctr r12 -/* 801DB1E4 001D8144 4E 80 04 21 */ bctrl +/* 801DB1E4 001D8144 4E 80 04 21 */ bctrl /* 801DB1E8 001D8148 C0 03 00 00 */ lfs f0, 0(r3) /* 801DB1EC 001D814C EF DE 00 2A */ fadds f30, f30, f0 lbl_801DB1F0: @@ -1313,7 +1313,7 @@ lbl_801DB1F8: /* 801DB208 001D8168 81 9A 00 00 */ lwz r12, 0(r26) /* 801DB20C 001D816C 81 8C 00 34 */ lwz r12, 0x34(r12) /* 801DB210 001D8170 7D 89 03 A6 */ mtctr r12 -/* 801DB214 001D8174 4E 80 04 21 */ bctrl +/* 801DB214 001D8174 4E 80 04 21 */ bctrl /* 801DB218 001D8178 D3 C3 00 00 */ stfs f30, 0(r3) /* 801DB21C 001D817C E3 E1 00 48 */ psq_l f31, 72(r1), 0, qr0 /* 801DB220 001D8180 CB E1 00 40 */ lfd f31, 0x40(r1) @@ -1323,12 +1323,12 @@ lbl_801DB1F8: /* 801DB230 001D8190 80 01 00 54 */ lwz r0, 0x54(r1) /* 801DB234 001D8194 7C 08 03 A6 */ mtlr r0 /* 801DB238 001D8198 38 21 00 50 */ addi r1, r1, 0x50 -/* 801DB23C 001D819C 4E 80 00 20 */ blr +/* 801DB23C 001D819C 4E 80 00 20 */ blr .global CodeTrigger__8CThardusFR13CStateManagerf CodeTrigger__8CThardusFR13CStateManagerf: /* 801DB240 001D81A0 88 63 09 5C */ lbz r3, 0x95c(r3) -/* 801DB244 001D81A4 4E 80 00 20 */ blr +/* 801DB244 001D81A4 4E 80 00 20 */ blr .global Faint__8CThardusFR13CStateManager9EStateMsgf Faint__8CThardusFR13CStateManager9EStateMsgf: @@ -1451,11 +1451,11 @@ lbl_801DB3EC: /* 801DB3F0 001D8350 80 01 00 44 */ lwz r0, 0x44(r1) /* 801DB3F4 001D8354 7C 08 03 A6 */ mtlr r0 /* 801DB3F8 001D8358 38 21 00 40 */ addi r1, r1, 0x40 -/* 801DB3FC 001D835C 4E 80 00 20 */ blr +/* 801DB3FC 001D835C 4E 80 00 20 */ blr .global DoubleSnap__8CThardusFR13CStateManager9EStateMsgf DoubleSnap__8CThardusFR13CStateManager9EStateMsgf: -/* 801DB400 001D8360 4E 80 00 20 */ blr +/* 801DB400 001D8360 4E 80 00 20 */ blr .global GetAimPosition__8CThardusCFRC13CStateManagerf GetAimPosition__8CThardusCFRC13CStateManagerf: @@ -1522,7 +1522,7 @@ lbl_801DB4BC: /* 801DB4E4 001D8444 83 81 00 90 */ lwz r28, 0x90(r1) /* 801DB4E8 001D8448 7C 08 03 A6 */ mtlr r0 /* 801DB4EC 001D844C 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 801DB4F0 001D8450 4E 80 00 20 */ blr +/* 801DB4F0 001D8450 4E 80 00 20 */ blr .global GetOrbitPosition__8CThardusCFRC13CStateManager GetOrbitPosition__8CThardusCFRC13CStateManager: @@ -1535,12 +1535,12 @@ GetOrbitPosition__8CThardusCFRC13CStateManager: /* 801DB50C 001D846C 81 84 00 00 */ lwz r12, 0(r4) /* 801DB510 001D8470 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 801DB514 001D8474 7D 89 03 A6 */ mtctr r12 -/* 801DB518 001D8478 4E 80 04 21 */ bctrl +/* 801DB518 001D8478 4E 80 04 21 */ bctrl /* 801DB51C 001D847C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801DB520 001D8480 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801DB524 001D8484 7C 08 03 A6 */ mtlr r0 /* 801DB528 001D8488 38 21 00 10 */ addi r1, r1, 0x10 -/* 801DB52C 001D848C 4E 80 00 20 */ blr +/* 801DB52C 001D848C 4E 80 00 20 */ blr .global IsDizzy__8CThardusFR13CStateManagerf IsDizzy__8CThardusFR13CStateManagerf: @@ -1549,7 +1549,7 @@ IsDizzy__8CThardusFR13CStateManagerf: /* 801DB538 001D8498 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 801DB53C 001D849C 7C 00 00 26 */ mfcr r0 /* 801DB540 001D84A0 54 03 17 FE */ rlwinm r3, r0, 2, 0x1f, 0x1f -/* 801DB544 001D84A4 4E 80 00 20 */ blr +/* 801DB544 001D84A4 4E 80 00 20 */ blr .global ShouldCallForBackup__8CThardusFR13CStateManagerf ShouldCallForBackup__8CThardusFR13CStateManagerf: @@ -1558,7 +1558,7 @@ ShouldCallForBackup__8CThardusFR13CStateManagerf: /* 801DB550 001D84B0 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 801DB554 001D84B4 7C 00 00 26 */ mfcr r0 /* 801DB558 001D84B8 54 03 17 FE */ rlwinm r3, r0, 2, 0x1f, 0x1f -/* 801DB55C 001D84BC 4E 80 00 20 */ blr +/* 801DB55C 001D84BC 4E 80 00 20 */ blr .global sub_801db560 sub_801db560: @@ -1585,7 +1585,7 @@ lbl_801DB5A4: /* 801DB5A4 001D8504 80 01 00 14 */ lwz r0, 0x14(r1) /* 801DB5A8 001D8508 7C 08 03 A6 */ mtlr r0 /* 801DB5AC 001D850C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801DB5B0 001D8510 4E 80 00 20 */ blr +/* 801DB5B0 001D8510 4E 80 00 20 */ blr .global sub_801db5b4 sub_801db5b4: @@ -1616,7 +1616,7 @@ lbl_801DB604: /* 801DB608 001D8568 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801DB60C 001D856C 7C 08 03 A6 */ mtlr r0 /* 801DB610 001D8570 38 21 00 10 */ addi r1, r1, 0x10 -/* 801DB614 001D8574 4E 80 00 20 */ blr +/* 801DB614 001D8574 4E 80 00 20 */ blr .global sub_801db618 sub_801db618: @@ -1758,12 +1758,12 @@ lbl_801DB7E4: /* 801DB824 001D8784 83 C1 00 48 */ lwz r30, 0x48(r1) /* 801DB828 001D8788 7C 08 03 A6 */ mtlr r0 /* 801DB82C 001D878C 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 801DB830 001D8790 4E 80 00 20 */ blr +/* 801DB830 001D8790 4E 80 00 20 */ blr .global StartAttack__8CThardusFR13CStateManagerf StartAttack__8CThardusFR13CStateManagerf: /* 801DB834 001D8794 38 60 00 01 */ li r3, 1 -/* 801DB838 001D8798 4E 80 00 20 */ blr +/* 801DB838 001D8798 4E 80 00 20 */ blr .global Suck__8CThardusFR13CStateManager9EStateMsgf Suck__8CThardusFR13CStateManager9EStateMsgf: @@ -1796,7 +1796,7 @@ lbl_801DB894: /* 801DB894 001D87F4 80 01 00 14 */ lwz r0, 0x14(r1) /* 801DB898 001D87F8 7C 08 03 A6 */ mtlr r0 /* 801DB89C 001D87FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801DB8A0 001D8800 4E 80 00 20 */ blr +/* 801DB8A0 001D8800 4E 80 00 20 */ blr .global Explode__8CThardusFR13CStateManager9EStateMsgf Explode__8CThardusFR13CStateManager9EStateMsgf: @@ -1903,7 +1903,7 @@ lbl_801DBA08: /* 801DBA10 001D8970 83 C1 00 28 */ lwz r30, 0x28(r1) /* 801DBA14 001D8974 7C 08 03 A6 */ mtlr r0 /* 801DBA18 001D8978 38 21 00 30 */ addi r1, r1, 0x30 -/* 801DBA1C 001D897C 4E 80 00 20 */ blr +/* 801DBA1C 001D897C 4E 80 00 20 */ blr .global sub_801dba20 sub_801dba20: @@ -2023,7 +2023,7 @@ lbl_801DBBA0: /* 801DBBCC 001D8B2C 83 A1 01 14 */ lwz r29, 0x114(r1) /* 801DBBD0 001D8B30 7C 08 03 A6 */ mtlr r0 /* 801DBBD4 001D8B34 38 21 01 60 */ addi r1, r1, 0x160 -/* 801DBBD8 001D8B38 4E 80 00 20 */ blr +/* 801DBBD8 001D8B38 4E 80 00 20 */ blr .global sub_801dbbdc sub_801dbbdc: @@ -2054,7 +2054,7 @@ lbl_801DBC1C: /* 801DBC30 001D8B90 D0 03 09 2C */ stfs f0, 0x92c(r3) /* 801DBC34 001D8B94 D0 23 09 30 */ stfs f1, 0x930(r3) /* 801DBC38 001D8B98 D0 43 09 34 */ stfs f2, 0x934(r3) -/* 801DBC3C 001D8B9C 4E 80 00 20 */ blr +/* 801DBC3C 001D8B9C 4E 80 00 20 */ blr .global sub_801dbc40 sub_801dbc40: @@ -2064,7 +2064,7 @@ sub_801dbc40: /* 801DBC4C 001D8BAC EC 01 00 2A */ fadds f0, f1, f0 /* 801DBC50 001D8BB0 D0 03 07 B8 */ stfs f0, 0x7b8(r3) /* 801DBC54 001D8BB4 98 03 09 38 */ stb r0, 0x938(r3) -/* 801DBC58 001D8BB8 4E 80 00 20 */ blr +/* 801DBC58 001D8BB8 4E 80 00 20 */ blr .global sub_801dbc5c sub_801dbc5c: @@ -2083,7 +2083,7 @@ lbl_801DBC88: /* 801DBC88 001D8BE8 80 01 00 14 */ lwz r0, 0x14(r1) /* 801DBC8C 001D8BEC 7C 08 03 A6 */ mtlr r0 /* 801DBC90 001D8BF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801DBC94 001D8BF4 4E 80 00 20 */ blr +/* 801DBC94 001D8BF4 4E 80 00 20 */ blr .global sub_801dbc98 sub_801dbc98: @@ -2101,7 +2101,7 @@ lbl_801DBCC0: /* 801DBCC0 001D8C20 80 01 00 14 */ lwz r0, 0x14(r1) /* 801DBCC4 001D8C24 7C 08 03 A6 */ mtlr r0 /* 801DBCC8 001D8C28 38 21 00 10 */ addi r1, r1, 0x10 -/* 801DBCCC 001D8C2C 4E 80 00 20 */ blr +/* 801DBCCC 001D8C2C 4E 80 00 20 */ blr .global PathFind__8CThardusFR13CStateManager9EStateMsgf PathFind__8CThardusFR13CStateManager9EStateMsgf: @@ -2261,12 +2261,12 @@ lbl_801DBEC0: /* 801DBF1C 001D8E7C 83 C1 00 88 */ lwz r30, 0x88(r1) /* 801DBF20 001D8E80 7C 08 03 A6 */ mtlr r0 /* 801DBF24 001D8E84 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 801DBF28 001D8E88 4E 80 00 20 */ blr +/* 801DBF28 001D8E88 4E 80 00 20 */ blr .global PathFound__8CThardusFR13CStateManagerf PathFound__8CThardusFR13CStateManagerf: /* 801DBF2C 001D8E8C 88 63 08 D4 */ lbz r3, 0x8d4(r3) -/* 801DBF30 001D8E90 4E 80 00 20 */ blr +/* 801DBF30 001D8E90 4E 80 00 20 */ blr .global sub_801dbf34 sub_801dbf34: @@ -2518,7 +2518,7 @@ lbl_801DC284: /* 801DC2B8 001D9218 83 A1 00 54 */ lwz r29, 0x54(r1) /* 801DC2BC 001D921C 7C 08 03 A6 */ mtlr r0 /* 801DC2C0 001D9220 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 801DC2C4 001D9224 4E 80 00 20 */ blr +/* 801DC2C4 001D9224 4E 80 00 20 */ blr .global sub_801dc2c8 sub_801dc2c8: @@ -2528,7 +2528,7 @@ sub_801dc2c8: /* 801DC2D4 001D9234 7C 03 00 50 */ subf r0, r3, r0 /* 801DC2D8 001D9238 7C 00 00 34 */ cntlzw r0, r0 /* 801DC2DC 001D923C 54 03 D9 7E */ srwi r3, r0, 5 -/* 801DC2E0 001D9240 4E 80 00 20 */ blr +/* 801DC2E0 001D9240 4E 80 00 20 */ blr .global CoverBlown__8CThardusFR13CStateManagerf CoverBlown__8CThardusFR13CStateManagerf: @@ -2544,7 +2544,7 @@ CoverBlown__8CThardusFR13CStateManagerf: /* 801DC308 001D9268 C0 22 AC DC */ lfs f1, lbl_805AC9FC@sda21(r2) /* 801DC30C 001D926C 81 8C 02 4C */ lwz r12, 0x24c(r12) /* 801DC310 001D9270 7D 89 03 A6 */ mtctr r12 -/* 801DC314 001D9274 4E 80 04 21 */ bctrl +/* 801DC314 001D9274 4E 80 04 21 */ bctrl /* 801DC318 001D9278 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801DC31C 001D927C 40 82 00 08 */ bne lbl_801DC324 /* 801DC320 001D9280 3B E0 00 01 */ li r31, 1 @@ -2554,7 +2554,7 @@ lbl_801DC324: /* 801DC32C 001D928C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801DC330 001D9290 7C 08 03 A6 */ mtlr r0 /* 801DC334 001D9294 38 21 00 10 */ addi r1, r1, 0x10 -/* 801DC338 001D9298 4E 80 00 20 */ blr +/* 801DC338 001D9298 4E 80 00 20 */ blr .global AttackOver__8CThardusFR13CStateManagerf AttackOver__8CThardusFR13CStateManagerf: @@ -2632,7 +2632,7 @@ lbl_801DC430: /* 801DC434 001D9394 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801DC438 001D9398 7C 08 03 A6 */ mtlr r0 /* 801DC43C 001D939C 38 21 00 20 */ addi r1, r1, 0x20 -/* 801DC440 001D93A0 4E 80 00 20 */ blr +/* 801DC440 001D93A0 4E 80 00 20 */ blr .global sub_801dc444 sub_801dc444: @@ -2749,7 +2749,7 @@ sub_801dc444: /* 801DC5FC 001D955C 83 81 00 D0 */ lwz r28, 0xd0(r1) /* 801DC600 001D9560 7C 08 03 A6 */ mtlr r0 /* 801DC604 001D9564 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 801DC608 001D9568 4E 80 00 20 */ blr +/* 801DC608 001D9568 4E 80 00 20 */ blr .global sub_801dc60c sub_801dc60c: @@ -2778,14 +2778,14 @@ sub_801dc60c: /* 801DC664 001D95C4 C3 FF 00 00 */ lfs f31, 0(r31) /* 801DC668 001D95C8 C3 DF 00 04 */ lfs f30, 4(r31) /* 801DC66C 001D95CC 7D 89 03 A6 */ mtctr r12 -/* 801DC670 001D95D0 4E 80 04 21 */ bctrl +/* 801DC670 001D95D0 4E 80 04 21 */ bctrl /* 801DC674 001D95D4 28 03 00 00 */ cmplwi r3, 0 /* 801DC678 001D95D8 41 82 00 C8 */ beq lbl_801DC740 /* 801DC67C 001D95DC 7F A3 EB 78 */ mr r3, r29 /* 801DC680 001D95E0 81 9D 00 00 */ lwz r12, 0(r29) /* 801DC684 001D95E4 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801DC688 001D95E8 7D 89 03 A6 */ mtctr r12 -/* 801DC68C 001D95EC 4E 80 04 21 */ bctrl +/* 801DC68C 001D95EC 4E 80 04 21 */ bctrl /* 801DC690 001D95F0 80 03 00 CC */ lwz r0, 0xcc(r3) /* 801DC694 001D95F4 2C 00 00 00 */ cmpwi r0, 0 /* 801DC698 001D95F8 41 82 00 88 */ beq lbl_801DC720 @@ -2807,7 +2807,7 @@ sub_801dc60c: /* 801DC6D8 001D9638 81 9D 00 00 */ lwz r12, 0(r29) /* 801DC6DC 001D963C 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 801DC6E0 001D9640 7D 89 03 A6 */ mtctr r12 -/* 801DC6E4 001D9644 4E 80 04 21 */ bctrl +/* 801DC6E4 001D9644 4E 80 04 21 */ bctrl /* 801DC6E8 001D9648 38 81 00 48 */ addi r4, r1, 0x48 /* 801DC6EC 001D964C 38 A1 00 60 */ addi r5, r1, 0x60 /* 801DC6F0 001D9650 4B FE AA 0D */ bl FindClosestReachablePoint__15CPathFindSearchCFRC9CVector3fR9CVector3f @@ -2913,7 +2913,7 @@ lbl_801DC840: /* 801DC868 001D97C8 83 81 00 70 */ lwz r28, 0x70(r1) /* 801DC86C 001D97CC 7C 08 03 A6 */ mtlr r0 /* 801DC870 001D97D0 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 801DC874 001D97D4 4E 80 00 20 */ blr +/* 801DC874 001D97D4 4E 80 00 20 */ blr .global sub_801dc878 sub_801dc878: @@ -2944,7 +2944,7 @@ sub_801dc878: /* 801DC8D8 001D9838 83 C1 00 18 */ lwz r30, 0x18(r1) /* 801DC8DC 001D983C 7C 08 03 A6 */ mtlr r0 /* 801DC8E0 001D9840 38 21 00 20 */ addi r1, r1, 0x20 -/* 801DC8E4 001D9844 4E 80 00 20 */ blr +/* 801DC8E4 001D9844 4E 80 00 20 */ blr .global sub_801dc8e8 sub_801dc8e8: @@ -2975,7 +2975,7 @@ sub_801dc8e8: /* 801DC948 001D98A8 83 C1 00 18 */ lwz r30, 0x18(r1) /* 801DC94C 001D98AC 7C 08 03 A6 */ mtlr r0 /* 801DC950 001D98B0 38 21 00 20 */ addi r1, r1, 0x20 -/* 801DC954 001D98B4 4E 80 00 20 */ blr +/* 801DC954 001D98B4 4E 80 00 20 */ blr .global sub_801dc958 sub_801dc958: @@ -3006,7 +3006,7 @@ sub_801dc958: /* 801DC9B8 001D9918 83 C1 00 18 */ lwz r30, 0x18(r1) /* 801DC9BC 001D991C 7C 08 03 A6 */ mtlr r0 /* 801DC9C0 001D9920 38 21 00 20 */ addi r1, r1, 0x20 -/* 801DC9C4 001D9924 4E 80 00 20 */ blr +/* 801DC9C4 001D9924 4E 80 00 20 */ blr .global sub_801dc9c8 sub_801dc9c8: @@ -3041,7 +3041,7 @@ lbl_801DCA2C: /* 801DCA34 001D9994 83 C1 00 18 */ lwz r30, 0x18(r1) /* 801DCA38 001D9998 7C 08 03 A6 */ mtlr r0 /* 801DCA3C 001D999C 38 21 00 20 */ addi r1, r1, 0x20 -/* 801DCA40 001D99A0 4E 80 00 20 */ blr +/* 801DCA40 001D99A0 4E 80 00 20 */ blr .global AggressionCheck__8CThardusFR13CStateManagerf AggressionCheck__8CThardusFR13CStateManagerf: @@ -3050,11 +3050,11 @@ AggressionCheck__8CThardusFR13CStateManagerf: /* 801DCA4C 001D99AC FC 01 00 40 */ fcmpo cr0, f1, f0 /* 801DCA50 001D99B0 7C 00 00 26 */ mfcr r0 /* 801DCA54 001D99B4 54 03 17 FE */ rlwinm r3, r0, 2, 0x1f, 0x1f -/* 801DCA58 001D99B8 4E 80 00 20 */ blr +/* 801DCA58 001D99B8 4E 80 00 20 */ blr .global Shuffle__8CThardusFR13CStateManager9EStateMsgf Shuffle__8CThardusFR13CStateManager9EStateMsgf: -/* 801DCA5C 001D99BC 4E 80 00 20 */ blr +/* 801DCA5C 001D99BC 4E 80 00 20 */ blr .global Enraged__8CThardusFR13CStateManager9EStateMsgf Enraged__8CThardusFR13CStateManager9EStateMsgf: @@ -3141,7 +3141,7 @@ lbl_801DCB78: /* 801DCB7C 001D9ADC 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801DCB80 001D9AE0 7C 08 03 A6 */ mtlr r0 /* 801DCB84 001D9AE4 38 21 00 20 */ addi r1, r1, 0x20 -/* 801DCB88 001D9AE8 4E 80 00 20 */ blr +/* 801DCB88 001D9AE8 4E 80 00 20 */ blr .global Growth__8CThardusFR13CStateManager9EStateMsgf Growth__8CThardusFR13CStateManager9EStateMsgf: @@ -3275,7 +3275,7 @@ lbl_801DCD5C: /* 801DCD64 001D9CC4 83 C1 00 48 */ lwz r30, 0x48(r1) /* 801DCD68 001D9CC8 7C 08 03 A6 */ mtlr r0 /* 801DCD6C 001D9CCC 38 21 00 50 */ addi r1, r1, 0x50 -/* 801DCD70 001D9CD0 4E 80 00 20 */ blr +/* 801DCD70 001D9CD0 4E 80 00 20 */ blr .global Flinch__8CThardusFR13CStateManager9EStateMsgf Flinch__8CThardusFR13CStateManager9EStateMsgf: @@ -3436,7 +3436,7 @@ lbl_801DCF90: /* 801DCF94 001D9EF4 80 01 00 44 */ lwz r0, 0x44(r1) /* 801DCF98 001D9EF8 7C 08 03 A6 */ mtlr r0 /* 801DCF9C 001D9EFC 38 21 00 40 */ addi r1, r1, 0x40 -/* 801DCFA0 001D9F00 4E 80 00 20 */ blr +/* 801DCFA0 001D9F00 4E 80 00 20 */ blr .global sub_801dcfa4 sub_801dcfa4: @@ -3493,7 +3493,7 @@ lbl_801DCFE0: /* 801DD068 001D9FC8 7F E5 CC 2E */ lfsx f31, r5, r25 /* 801DD06C 001D9FCC 81 8C 00 34 */ lwz r12, 0x34(r12) /* 801DD070 001D9FD0 7D 89 03 A6 */ mtctr r12 -/* 801DD074 001D9FD4 4E 80 04 21 */ bctrl +/* 801DD074 001D9FD4 4E 80 04 21 */ bctrl /* 801DD078 001D9FD8 D3 E3 00 00 */ stfs f31, 0(r3) /* 801DD07C 001D9FDC C0 02 AC DC */ lfs f0, lbl_805AC9FC@sda21(r2) /* 801DD080 001D9FE0 D0 03 00 04 */ stfs f0, 4(r3) @@ -3517,7 +3517,7 @@ lbl_801DD0B8: /* 801DD0BC 001DA01C 81 9C 00 00 */ lwz r12, 0(r28) /* 801DD0C0 001DA020 81 8C 00 38 */ lwz r12, 0x38(r12) /* 801DD0C4 001DA024 7D 89 03 A6 */ mtctr r12 -/* 801DD0C8 001DA028 4E 80 04 21 */ bctrl +/* 801DD0C8 001DA028 4E 80 04 21 */ bctrl /* 801DD0CC 001DA02C 7C 64 1B 78 */ mr r4, r3 /* 801DD0D0 001DA030 7F C3 F3 78 */ mr r3, r30 /* 801DD0D4 001DA034 4B FC BA C5 */ bl SetDamageVulnerability__15CCollisionActorFRC20CDamageVulnerability @@ -3529,7 +3529,7 @@ lbl_801DD0E0: /* 801DD0E8 001DA048 81 9E 00 00 */ lwz r12, 0(r30) /* 801DD0EC 001DA04C 81 8C 00 34 */ lwz r12, 0x34(r12) /* 801DD0F0 001DA050 7D 89 03 A6 */ mtctr r12 -/* 801DD0F4 001DA054 4E 80 04 21 */ bctrl +/* 801DD0F4 001DA054 4E 80 04 21 */ bctrl /* 801DD0F8 001DA058 7C 77 1B 79 */ or. r23, r3, r3 /* 801DD0FC 001DA05C 41 82 01 C0 */ beq lbl_801DD2BC /* 801DD100 001DA060 C0 37 00 00 */ lfs f1, 0(r23) @@ -3545,13 +3545,13 @@ lbl_801DD0E0: /* 801DD128 001DA088 81 9C 00 00 */ lwz r12, 0(r28) /* 801DD12C 001DA08C 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 801DD130 001DA090 7D 89 03 A6 */ mtctr r12 -/* 801DD134 001DA094 4E 80 04 21 */ bctrl +/* 801DD134 001DA094 4E 80 04 21 */ bctrl /* 801DD138 001DA098 7F C3 F3 78 */ mr r3, r30 /* 801DD13C 001DA09C 38 80 00 00 */ li r4, 0 /* 801DD140 001DA0A0 81 9E 00 00 */ lwz r12, 0(r30) /* 801DD144 001DA0A4 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 801DD148 001DA0A8 7D 89 03 A6 */ mtctr r12 -/* 801DD14C 001DA0AC 4E 80 04 21 */ bctrl +/* 801DD14C 001DA0AC 4E 80 04 21 */ bctrl /* 801DD150 001DA0B0 80 BA 06 CC */ lwz r5, 0x6cc(r26) /* 801DD154 001DA0B4 7F 63 DB 78 */ mr r3, r27 /* 801DD158 001DA0B8 38 81 00 10 */ addi r4, r1, 0x10 @@ -3562,7 +3562,7 @@ lbl_801DD0E0: /* 801DD16C 001DA0CC 38 80 00 00 */ li r4, 0 /* 801DD170 001DA0D0 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 801DD174 001DA0D4 7D 89 03 A6 */ mtctr r12 -/* 801DD178 001DA0D8 4E 80 04 21 */ bctrl +/* 801DD178 001DA0D8 4E 80 04 21 */ bctrl /* 801DD17C 001DA0DC 80 BA 06 48 */ lwz r5, 0x648(r26) /* 801DD180 001DA0E0 7F 43 D3 78 */ mr r3, r26 /* 801DD184 001DA0E4 7F 64 DB 78 */ mr r4, r27 @@ -3637,7 +3637,7 @@ lbl_801DD27C: /* 801DD284 001DA1E4 81 9C 00 00 */ lwz r12, 0(r28) /* 801DD288 001DA1E8 81 8C 00 34 */ lwz r12, 0x34(r12) /* 801DD28C 001DA1EC 7D 89 03 A6 */ mtctr r12 -/* 801DD290 001DA1F0 4E 80 04 21 */ bctrl +/* 801DD290 001DA1F0 4E 80 04 21 */ bctrl /* 801DD294 001DA1F4 C0 17 00 00 */ lfs f0, 0(r23) /* 801DD298 001DA1F8 D0 03 00 00 */ stfs f0, 0(r3) /* 801DD29C 001DA1FC C0 17 00 04 */ lfs f0, 4(r23) @@ -3661,7 +3661,7 @@ lbl_801DD2C8: /* 801DD2DC 001DA23C 80 01 00 74 */ lwz r0, 0x74(r1) /* 801DD2E0 001DA240 7C 08 03 A6 */ mtlr r0 /* 801DD2E4 001DA244 38 21 00 70 */ addi r1, r1, 0x70 -/* 801DD2E8 001DA248 4E 80 00 20 */ blr +/* 801DD2E8 001DA248 4E 80 00 20 */ blr .global sub_801dd2ec sub_801dd2ec: @@ -3715,7 +3715,7 @@ lbl_801DD390: /* 801DD398 001DA2F8 81 9E 00 00 */ lwz r12, 0(r30) /* 801DD39C 001DA2FC 81 8C 00 34 */ lwz r12, 0x34(r12) /* 801DD3A0 001DA300 7D 89 03 A6 */ mtctr r12 -/* 801DD3A4 001DA304 4E 80 04 21 */ bctrl +/* 801DD3A4 001DA304 4E 80 04 21 */ bctrl /* 801DD3A8 001DA308 C0 0D A4 B8 */ lfs f0, lbl_805A9078@sda21(r13) /* 801DD3AC 001DA30C D0 03 00 00 */ stfs f0, 0(r3) /* 801DD3B0 001DA310 C0 1D 00 04 */ lfs f0, 4(r29) @@ -3730,7 +3730,7 @@ lbl_801DD3C0: /* 801DD3CC 001DA32C 80 01 00 44 */ lwz r0, 0x44(r1) /* 801DD3D0 001DA330 7C 08 03 A6 */ mtlr r0 /* 801DD3D4 001DA334 38 21 00 40 */ addi r1, r1, 0x40 -/* 801DD3D8 001DA338 4E 80 00 20 */ blr +/* 801DD3D8 001DA338 4E 80 00 20 */ blr .global sub_801dd3dc sub_801dd3dc: @@ -3811,7 +3811,7 @@ lbl_801DD4E0: /* 801DD4EC 001DA44C 80 01 00 64 */ lwz r0, 0x64(r1) /* 801DD4F0 001DA450 7C 08 03 A6 */ mtlr r0 /* 801DD4F4 001DA454 38 21 00 60 */ addi r1, r1, 0x60 -/* 801DD4F8 001DA458 4E 80 00 20 */ blr +/* 801DD4F8 001DA458 4E 80 00 20 */ blr .global sub_801dd4fc sub_801dd4fc: @@ -3890,7 +3890,7 @@ lbl_801DD5EC: /* 801DD5F8 001DA558 80 01 00 54 */ lwz r0, 0x54(r1) /* 801DD5FC 001DA55C 7C 08 03 A6 */ mtlr r0 /* 801DD600 001DA560 38 21 00 50 */ addi r1, r1, 0x50 -/* 801DD604 001DA564 4E 80 00 20 */ blr +/* 801DD604 001DA564 4E 80 00 20 */ blr .global sub_801dd608 sub_801dd608: @@ -4010,7 +4010,7 @@ lbl_801DD7B0: /* 801DD7BC 001DA71C 80 01 01 94 */ lwz r0, 0x194(r1) /* 801DD7C0 001DA720 7C 08 03 A6 */ mtlr r0 /* 801DD7C4 001DA724 38 21 01 90 */ addi r1, r1, 0x190 -/* 801DD7C8 001DA728 4E 80 00 20 */ blr +/* 801DD7C8 001DA728 4E 80 00 20 */ blr .global sub_801dd7cc sub_801dd7cc: @@ -4114,7 +4114,7 @@ lbl_801DD934: /* 801DD940 001DA8A0 80 01 00 F4 */ lwz r0, 0xf4(r1) /* 801DD944 001DA8A4 7C 08 03 A6 */ mtlr r0 /* 801DD948 001DA8A8 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 801DD94C 001DA8AC 4E 80 00 20 */ blr +/* 801DD94C 001DA8AC 4E 80 00 20 */ blr .global sub_801dd950 sub_801dd950: @@ -4212,7 +4212,7 @@ lbl_801DDAA0: /* 801DDAAC 001DAA0C 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 801DDAB0 001DAA10 7C 08 03 A6 */ mtlr r0 /* 801DDAB4 001DAA14 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 801DDAB8 001DAA18 4E 80 00 20 */ blr +/* 801DDAB8 001DAA18 4E 80 00 20 */ blr .global sub_801ddabc sub_801ddabc: @@ -4292,7 +4292,7 @@ lbl_801DDBC0: /* 801DDBD4 001DAB34 80 01 00 64 */ lwz r0, 0x64(r1) /* 801DDBD8 001DAB38 7C 08 03 A6 */ mtlr r0 /* 801DDBDC 001DAB3C 38 21 00 60 */ addi r1, r1, 0x60 -/* 801DDBE0 001DAB40 4E 80 00 20 */ blr +/* 801DDBE0 001DAB40 4E 80 00 20 */ blr .global sub_801ddbe4 sub_801ddbe4: @@ -4494,7 +4494,7 @@ lbl_801DDEDC: /* 801DDEDC 001DAE3C 81 83 00 00 */ lwz r12, 0(r3) /* 801DDEE0 001DAE40 81 8C 00 38 */ lwz r12, 0x38(r12) /* 801DDEE4 001DAE44 7D 89 03 A6 */ mtctr r12 -/* 801DDEE8 001DAE48 4E 80 04 21 */ bctrl +/* 801DDEE8 001DAE48 4E 80 04 21 */ bctrl /* 801DDEEC 001DAE4C 7C 64 1B 78 */ mr r4, r3 /* 801DDEF0 001DAE50 7F 43 D3 78 */ mr r3, r26 /* 801DDEF4 001DAE54 4B FC AC A5 */ bl SetDamageVulnerability__15CCollisionActorFRC20CDamageVulnerability @@ -4506,14 +4506,14 @@ lbl_801DDF00: /* 801DDF08 001DAE68 81 9C 00 00 */ lwz r12, 0(r28) /* 801DDF0C 001DAE6C 81 8C 00 34 */ lwz r12, 0x34(r12) /* 801DDF10 001DAE70 7D 89 03 A6 */ mtctr r12 -/* 801DDF14 001DAE74 4E 80 04 21 */ bctrl +/* 801DDF14 001DAE74 4E 80 04 21 */ bctrl /* 801DDF18 001DAE78 7C 7C 1B 78 */ mr r28, r3 /* 801DDF1C 001DAE7C 7F 43 D3 78 */ mr r3, r26 /* 801DDF20 001DAE80 81 9A 00 00 */ lwz r12, 0(r26) /* 801DDF24 001DAE84 7F E4 FB 78 */ mr r4, r31 /* 801DDF28 001DAE88 81 8C 00 34 */ lwz r12, 0x34(r12) /* 801DDF2C 001DAE8C 7D 89 03 A6 */ mtctr r12 -/* 801DDF30 001DAE90 4E 80 04 21 */ bctrl +/* 801DDF30 001DAE90 4E 80 04 21 */ bctrl /* 801DDF34 001DAE94 C0 1C 00 00 */ lfs f0, 0(r28) /* 801DDF38 001DAE98 D0 03 00 00 */ stfs f0, 0(r3) /* 801DDF3C 001DAE9C C0 1C 00 04 */ lfs f0, 4(r28) @@ -4537,7 +4537,7 @@ lbl_801DDF4C: /* 801DDF7C 001DAEDC 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 801DDF80 001DAEE0 7C 08 03 A6 */ mtlr r0 /* 801DDF84 001DAEE4 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 801DDF88 001DAEE8 4E 80 00 20 */ blr +/* 801DDF88 001DAEE8 4E 80 00 20 */ blr .global Generate__8CThardusFR13CStateManager9EStateMsgf Generate__8CThardusFR13CStateManager9EStateMsgf: @@ -4620,16 +4620,16 @@ lbl_801DE094: /* 801DE098 001DAFF8 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801DE09C 001DAFFC 7C 08 03 A6 */ mtlr r0 /* 801DE0A0 001DB000 38 21 00 20 */ addi r1, r1, 0x20 -/* 801DE0A4 001DB004 4E 80 00 20 */ blr +/* 801DE0A4 001DB004 4E 80 00 20 */ blr .global HearPlayer__8CThardusFR13CStateManagerf HearPlayer__8CThardusFR13CStateManagerf: /* 801DE0A8 001DB008 88 63 05 C8 */ lbz r3, 0x5c8(r3) -/* 801DE0AC 001DB00C 4E 80 00 20 */ blr +/* 801DE0AC 001DB00C 4E 80 00 20 */ blr .global Touch__8CThardusFR6CActorR13CStateManager Touch__8CThardusFR6CActorR13CStateManager: -/* 801DE0B0 001DB010 4E 80 00 20 */ blr +/* 801DE0B0 001DB010 4E 80 00 20 */ blr .global sub_801de0b4 sub_801de0b4: @@ -4637,7 +4637,7 @@ sub_801de0b4: /* 801DE0B8 001DB018 20 00 00 03 */ subfic r0, r0, 3 /* 801DE0BC 001DB01C 7C 00 00 34 */ cntlzw r0, r0 /* 801DE0C0 001DB020 54 03 D9 7E */ srwi r3, r0, 5 -/* 801DE0C4 001DB024 4E 80 00 20 */ blr +/* 801DE0C4 001DB024 4E 80 00 20 */ blr .global Cover__8CThardusFR13CStateManager9EStateMsgf Cover__8CThardusFR13CStateManager9EStateMsgf: @@ -4687,7 +4687,7 @@ lbl_801DE158: /* 801DE160 001DB0C0 83 C1 00 08 */ lwz r30, 8(r1) /* 801DE164 001DB0C4 7C 08 03 A6 */ mtlr r0 /* 801DE168 001DB0C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801DE16C 001DB0CC 4E 80 00 20 */ blr +/* 801DE16C 001DB0CC 4E 80 00 20 */ blr .global GetUp__8CThardusFR13CStateManager9EStateMsgf GetUp__8CThardusFR13CStateManager9EStateMsgf: @@ -4706,7 +4706,7 @@ lbl_801DE198: /* 801DE198 001DB0F8 80 01 00 14 */ lwz r0, 0x14(r1) /* 801DE19C 001DB0FC 7C 08 03 A6 */ mtlr r0 /* 801DE1A0 001DB100 38 21 00 10 */ addi r1, r1, 0x10 -/* 801DE1A4 001DB104 4E 80 00 20 */ blr +/* 801DE1A4 001DB104 4E 80 00 20 */ blr .global sub_801de1a8 sub_801de1a8: @@ -4729,7 +4729,7 @@ sub_801de1a8: /* 801DE1E8 001DB148 81 9D 00 00 */ lwz r12, 0(r29) /* 801DE1EC 001DB14C 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 801DE1F0 001DB150 7D 89 03 A6 */ mtctr r12 -/* 801DE1F4 001DB154 4E 80 04 21 */ bctrl +/* 801DE1F4 001DB154 4E 80 04 21 */ bctrl /* 801DE1F8 001DB158 80 1F 00 00 */ lwz r0, 0(r31) /* 801DE1FC 001DB15C A0 9D 00 08 */ lhz r4, 8(r29) /* 801DE200 001DB160 54 00 08 3C */ slwi r0, r0, 1 @@ -4784,13 +4784,13 @@ lbl_801DE2A4: /* 801DE2B4 001DB214 81 9D 00 00 */ lwz r12, 0(r29) /* 801DE2B8 001DB218 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 801DE2BC 001DB21C 7D 89 03 A6 */ mtctr r12 -/* 801DE2C0 001DB220 4E 80 04 21 */ bctrl +/* 801DE2C0 001DB220 4E 80 04 21 */ bctrl lbl_801DE2C4: /* 801DE2C4 001DB224 BB 21 00 24 */ lmw r25, 0x24(r1) /* 801DE2C8 001DB228 80 01 00 44 */ lwz r0, 0x44(r1) /* 801DE2CC 001DB22C 7C 08 03 A6 */ mtlr r0 /* 801DE2D0 001DB230 38 21 00 40 */ addi r1, r1, 0x40 -/* 801DE2D4 001DB234 4E 80 00 20 */ blr +/* 801DE2D4 001DB234 4E 80 00 20 */ blr .global Render__8CThardusCFRC13CStateManager Render__8CThardusCFRC13CStateManager: @@ -4820,7 +4820,7 @@ lbl_801DE328: /* 801DE330 001DB290 83 C1 00 08 */ lwz r30, 8(r1) /* 801DE334 001DB294 7C 08 03 A6 */ mtlr r0 /* 801DE338 001DB298 38 21 00 10 */ addi r1, r1, 0x10 -/* 801DE33C 001DB29C 4E 80 00 20 */ blr +/* 801DE33C 001DB29C 4E 80 00 20 */ blr .global PreRender__8CThardusFR13CStateManagerRC14CFrustumPlanes PreRender__8CThardusFR13CStateManagerRC14CFrustumPlanes: @@ -4886,7 +4886,7 @@ lbl_801DE41C: /* 801DE424 001DB384 83 C1 00 18 */ lwz r30, 0x18(r1) /* 801DE428 001DB388 7C 08 03 A6 */ mtlr r0 /* 801DE42C 001DB38C 38 21 00 20 */ addi r1, r1, 0x20 -/* 801DE430 001DB390 4E 80 00 20 */ blr +/* 801DE430 001DB390 4E 80 00 20 */ blr .global sub_801de434 sub_801de434: @@ -4962,7 +4962,7 @@ lbl_801DE530: /* 801DE540 001DB4A0 83 81 00 20 */ lwz r28, 0x20(r1) /* 801DE544 001DB4A4 7C 08 03 A6 */ mtlr r0 /* 801DE548 001DB4A8 38 21 00 30 */ addi r1, r1, 0x30 -/* 801DE54C 001DB4AC 4E 80 00 20 */ blr +/* 801DE54C 001DB4AC 4E 80 00 20 */ blr .global sub_801de550 sub_801de550: @@ -5281,7 +5281,7 @@ lbl_801DE9CC: /* 801DE9E8 001DB948 80 01 01 A4 */ lwz r0, 0x1a4(r1) /* 801DE9EC 001DB94C 7C 08 03 A6 */ mtlr r0 /* 801DE9F0 001DB950 38 21 01 A0 */ addi r1, r1, 0x1a0 -/* 801DE9F4 001DB954 4E 80 00 20 */ blr +/* 801DE9F4 001DB954 4E 80 00 20 */ blr .global sub_801de9f8 sub_801de9f8: @@ -5348,7 +5348,7 @@ lbl_801DEAC0: /* 801DEACC 001DBA2C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801DEAD0 001DBA30 7C 08 03 A6 */ mtlr r0 /* 801DEAD4 001DBA34 38 21 00 30 */ addi r1, r1, 0x30 -/* 801DEAD8 001DBA38 4E 80 00 20 */ blr +/* 801DEAD8 001DBA38 4E 80 00 20 */ blr .global sub_801deadc sub_801deadc: @@ -5387,7 +5387,7 @@ lbl_801DEB48: /* 801DEB50 001DBAB0 83 C1 00 08 */ lwz r30, 8(r1) /* 801DEB54 001DBAB4 7C 08 03 A6 */ mtlr r0 /* 801DEB58 001DBAB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801DEB5C 001DBABC 4E 80 00 20 */ blr +/* 801DEB5C 001DBABC 4E 80 00 20 */ blr .global ShouldTurn__8CThardusFR13CStateManagerf ShouldTurn__8CThardusFR13CStateManagerf: @@ -5443,7 +5443,7 @@ ShouldTurn__8CThardusFR13CStateManagerf: /* 801DEC24 001DBB84 80 01 00 64 */ lwz r0, 0x64(r1) /* 801DEC28 001DBB88 7C 08 03 A6 */ mtlr r0 /* 801DEC2C 001DBB8C 38 21 00 60 */ addi r1, r1, 0x60 -/* 801DEC30 001DBB90 4E 80 00 20 */ blr +/* 801DEC30 001DBB90 4E 80 00 20 */ blr .global HitSomething__8CThardusFR13CStateManagerf HitSomething__8CThardusFR13CStateManagerf: @@ -5455,7 +5455,7 @@ HitSomething__8CThardusFR13CStateManagerf: /* 801DEC48 001DBBA8 80 01 00 14 */ lwz r0, 0x14(r1) /* 801DEC4C 001DBBAC 7C 08 03 A6 */ mtlr r0 /* 801DEC50 001DBBB0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801DEC54 001DBBB4 4E 80 00 20 */ blr +/* 801DEC54 001DBBB4 4E 80 00 20 */ blr .global sub_801dec58 sub_801dec58: @@ -5470,13 +5470,13 @@ lbl_801DEC74: /* 801DEC74 001DBBD4 38 80 00 01 */ li r4, 1 lbl_801DEC78: /* 801DEC78 001DBBD8 7C 83 23 78 */ mr r3, r4 -/* 801DEC7C 001DBBDC 4E 80 00 20 */ blr +/* 801DEC7C 001DBBDC 4E 80 00 20 */ blr .global sub_801dec80 sub_801dec80: /* 801DEC80 001DBBE0 38 00 4E 20 */ li r0, 0x4e20 /* 801DEC84 001DBBE4 90 03 06 8C */ stw r0, 0x68c(r3) -/* 801DEC88 001DBBE8 4E 80 00 20 */ blr +/* 801DEC88 001DBBE8 4E 80 00 20 */ blr .global ShouldMove__8CThardusFR13CStateManagerf ShouldMove__8CThardusFR13CStateManagerf: @@ -5492,7 +5492,7 @@ lbl_801DECAC: /* 801DECAC 001DBC0C 38 A0 00 01 */ li r5, 1 lbl_801DECB0: /* 801DECB0 001DBC10 7C A3 2B 78 */ mr r3, r5 -/* 801DECB4 001DBC14 4E 80 00 20 */ blr +/* 801DECB4 001DBC14 4E 80 00 20 */ blr .global CoveringFire__8CThardusFR13CStateManagerf CoveringFire__8CThardusFR13CStateManagerf: @@ -5508,7 +5508,7 @@ CoveringFire__8CThardusFR13CStateManagerf: /* 801DECDC 001DBC3C C0 22 AC DC */ lfs f1, lbl_805AC9FC@sda21(r2) /* 801DECE0 001DBC40 81 8C 02 4C */ lwz r12, 0x24c(r12) /* 801DECE4 001DBC44 7D 89 03 A6 */ mtctr r12 -/* 801DECE8 001DBC48 4E 80 04 21 */ bctrl +/* 801DECE8 001DBC48 4E 80 04 21 */ bctrl /* 801DECEC 001DBC4C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801DECF0 001DBC50 40 82 00 08 */ bne lbl_801DECF8 /* 801DECF4 001DBC54 3B E0 00 01 */ li r31, 1 @@ -5518,7 +5518,7 @@ lbl_801DECF8: /* 801DED00 001DBC60 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801DED04 001DBC64 7C 08 03 A6 */ mtlr r0 /* 801DED08 001DBC68 38 21 00 10 */ addi r1, r1, 0x10 -/* 801DED0C 001DBC6C 4E 80 00 20 */ blr +/* 801DED0C 001DBC6C 4E 80 00 20 */ blr .global HasAttackPattern__8CThardusFR13CStateManagerf HasAttackPattern__8CThardusFR13CStateManagerf: @@ -5534,7 +5534,7 @@ HasAttackPattern__8CThardusFR13CStateManagerf: /* 801DED34 001DBC94 C0 22 AC DC */ lfs f1, lbl_805AC9FC@sda21(r2) /* 801DED38 001DBC98 81 8C 02 4C */ lwz r12, 0x24c(r12) /* 801DED3C 001DBC9C 7D 89 03 A6 */ mtctr r12 -/* 801DED40 001DBCA0 4E 80 04 21 */ bctrl +/* 801DED40 001DBCA0 4E 80 04 21 */ bctrl /* 801DED44 001DBCA4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801DED48 001DBCA8 40 82 00 08 */ bne lbl_801DED50 /* 801DED4C 001DBCAC 3B E0 00 01 */ li r31, 1 @@ -5544,7 +5544,7 @@ lbl_801DED50: /* 801DED58 001DBCB8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801DED5C 001DBCBC 7C 08 03 A6 */ mtlr r0 /* 801DED60 001DBCC0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801DED64 001DBCC4 4E 80 00 20 */ blr +/* 801DED64 001DBCC4 4E 80 00 20 */ blr .global InRange__8CThardusFR13CStateManagerf InRange__8CThardusFR13CStateManagerf: @@ -5595,12 +5595,12 @@ InRange__8CThardusFR13CStateManagerf: /* 801DEE18 001DBD78 83 E1 00 4C */ lwz r31, 0x4c(r1) /* 801DEE1C 001DBD7C 7C 08 03 A6 */ mtlr r0 /* 801DEE20 001DBD80 38 21 00 60 */ addi r1, r1, 0x60 -/* 801DEE24 001DBD84 4E 80 00 20 */ blr +/* 801DEE24 001DBD84 4E 80 00 20 */ blr .global ShouldTaunt__8CThardusFR13CStateManagerf ShouldTaunt__8CThardusFR13CStateManagerf: /* 801DEE28 001DBD88 38 60 00 00 */ li r3, 0 -/* 801DEE2C 001DBD8C 4E 80 00 20 */ blr +/* 801DEE2C 001DBD8C 4E 80 00 20 */ blr .global InPosition__8CThardusFR13CStateManagerf InPosition__8CThardusFR13CStateManagerf: @@ -5610,7 +5610,7 @@ InPosition__8CThardusFR13CStateManagerf: /* 801DEE3C 001DBD9C 7C 00 00 34 */ cntlzw r0, r0 /* 801DEE40 001DBDA0 7C 60 00 30 */ slw r0, r3, r0 /* 801DEE44 001DBDA4 54 03 0F FE */ srwi r3, r0, 0x1f -/* 801DEE48 001DBDA8 4E 80 00 20 */ blr +/* 801DEE48 001DBDA8 4E 80 00 20 */ blr .global Dead__8CThardusFR13CStateManager9EStateMsgf Dead__8CThardusFR13CStateManager9EStateMsgf: @@ -5658,7 +5658,7 @@ lbl_801DEEC4: /* 801DEEE8 001DBE48 83 A1 00 0C */ lwz r29, 0xc(r1) /* 801DEEEC 001DBE4C 7C 08 03 A6 */ mtlr r0 /* 801DEEF0 001DBE50 38 21 00 20 */ addi r1, r1, 0x20 -/* 801DEEF4 001DBE54 4E 80 00 20 */ blr +/* 801DEEF4 001DBE54 4E 80 00 20 */ blr .global Attack__8CThardusFR13CStateManager9EStateMsgf Attack__8CThardusFR13CStateManager9EStateMsgf: @@ -5813,7 +5813,7 @@ lbl_801DF11C: /* 801DF124 001DC084 83 C1 00 48 */ lwz r30, 0x48(r1) /* 801DF128 001DC088 7C 08 03 A6 */ mtlr r0 /* 801DF12C 001DC08C 38 21 00 50 */ addi r1, r1, 0x50 -/* 801DF130 001DC090 4E 80 00 20 */ blr +/* 801DF130 001DC090 4E 80 00 20 */ blr .global LoopedAttack__8CThardusFR13CStateManager9EStateMsgf LoopedAttack__8CThardusFR13CStateManager9EStateMsgf: @@ -6125,7 +6125,7 @@ lbl_801DF5B0: /* 801DF5D0 001DC530 83 81 01 B0 */ lwz r28, 0x1b0(r1) /* 801DF5D4 001DC534 7C 08 03 A6 */ mtlr r0 /* 801DF5D8 001DC538 38 21 01 E0 */ addi r1, r1, 0x1e0 -/* 801DF5DC 001DC53C 4E 80 00 20 */ blr +/* 801DF5DC 001DC53C 4E 80 00 20 */ blr .global TelegraphAttack__8CThardusFR13CStateManager9EStateMsgf TelegraphAttack__8CThardusFR13CStateManager9EStateMsgf: @@ -6224,7 +6224,7 @@ lbl_801DF72C: /* 801DF734 001DC694 83 C1 00 28 */ lwz r30, 0x28(r1) /* 801DF738 001DC698 7C 08 03 A6 */ mtlr r0 /* 801DF73C 001DC69C 38 21 00 30 */ addi r1, r1, 0x30 -/* 801DF740 001DC6A0 4E 80 00 20 */ blr +/* 801DF740 001DC6A0 4E 80 00 20 */ blr .global ProjectileAttack__8CThardusFR13CStateManager9EStateMsgf ProjectileAttack__8CThardusFR13CStateManager9EStateMsgf: @@ -6322,7 +6322,7 @@ lbl_801DF88C: /* 801DF894 001DC7F4 83 C1 00 28 */ lwz r30, 0x28(r1) /* 801DF898 001DC7F8 7C 08 03 A6 */ mtlr r0 /* 801DF89C 001DC7FC 38 21 00 30 */ addi r1, r1, 0x30 -/* 801DF8A0 001DC800 4E 80 00 20 */ blr +/* 801DF8A0 001DC800 4E 80 00 20 */ blr .global Taunt__8CThardusFR13CStateManager9EStateMsgf Taunt__8CThardusFR13CStateManager9EStateMsgf: @@ -6399,7 +6399,7 @@ lbl_801DF99C: /* 801DF9A0 001DC900 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801DF9A4 001DC904 7C 08 03 A6 */ mtlr r0 /* 801DF9A8 001DC908 38 21 00 20 */ addi r1, r1, 0x20 -/* 801DF9AC 001DC90C 4E 80 00 20 */ blr +/* 801DF9AC 001DC90C 4E 80 00 20 */ blr .global TargetPatrol__8CThardusFR13CStateManager9EStateMsgf TargetPatrol__8CThardusFR13CStateManager9EStateMsgf: @@ -6426,7 +6426,7 @@ lbl_801DF9E8: /* 801DF9FC 001DC95C 81 83 00 00 */ lwz r12, 0(r3) /* 801DFA00 001DC960 81 8C 00 34 */ lwz r12, 0x34(r12) /* 801DFA04 001DC964 7D 89 03 A6 */ mtctr r12 -/* 801DFA08 001DC968 4E 80 04 21 */ bctrl +/* 801DFA08 001DC968 4E 80 04 21 */ bctrl /* 801DFA0C 001DC96C C0 23 00 00 */ lfs f1, 0(r3) /* 801DFA10 001DC970 7F E3 FB 78 */ mr r3, r31 /* 801DFA14 001DC974 A0 1E 00 08 */ lhz r0, 8(r30) @@ -6497,7 +6497,7 @@ lbl_801DFAF8: /* 801DFB00 001DCA60 83 C1 00 28 */ lwz r30, 0x28(r1) /* 801DFB04 001DCA64 7C 08 03 A6 */ mtlr r0 /* 801DFB08 001DCA68 38 21 00 30 */ addi r1, r1, 0x30 -/* 801DFB0C 001DCA6C 4E 80 00 20 */ blr +/* 801DFB0C 001DCA6C 4E 80 00 20 */ blr .global Patrol__8CThardusFR13CStateManager9EStateMsgf Patrol__8CThardusFR13CStateManager9EStateMsgf: @@ -6534,7 +6534,7 @@ lbl_801DFB78: /* 801DFB7C 001DCADC C0 22 AC DC */ lfs f1, lbl_805AC9FC@sda21(r2) /* 801DFB80 001DCAE0 81 8C 01 E8 */ lwz r12, 0x1e8(r12) /* 801DFB84 001DCAE4 7D 89 03 A6 */ mtctr r12 -/* 801DFB88 001DCAE8 4E 80 04 21 */ bctrl +/* 801DFB88 001DCAE8 4E 80 04 21 */ bctrl /* 801DFB8C 001DCAEC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801DFB90 001DCAF0 41 82 01 74 */ beq lbl_801DFD04 /* 801DFB94 001DCAF4 80 BF 08 4C */ lwz r5, 0x84c(r31) @@ -6636,7 +6636,7 @@ lbl_801DFD04: /* 801DFD0C 001DCC6C 83 C1 00 D8 */ lwz r30, 0xd8(r1) /* 801DFD10 001DCC70 7C 08 03 A6 */ mtlr r0 /* 801DFD14 001DCC74 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 801DFD18 001DCC78 4E 80 00 20 */ blr +/* 801DFD18 001DCC78 4E 80 00 20 */ blr .global Think__8CThardusFfR13CStateManager Think__8CThardusFfR13CStateManager: @@ -6855,7 +6855,7 @@ lbl_801DFFD4: /* 801E004C 001DCFAC 7F 64 DB 78 */ mr r4, r27 /* 801E0050 001DCFB0 38 C0 00 14 */ li r6, 0x14 /* 801E0054 001DCFB4 7D 89 03 A6 */ mtctr r12 -/* 801E0058 001DCFB8 4E 80 04 21 */ bctrl +/* 801E0058 001DCFB8 4E 80 04 21 */ bctrl lbl_801E005C: /* 801E005C 001DCFBC 80 7B 08 B8 */ lwz r3, 0x8b8(r27) /* 801E0060 001DCFC0 80 63 00 00 */ lwz r3, 0(r3) @@ -7199,7 +7199,7 @@ lbl_801E0544: /* 801E0550 001DD4B0 80 01 01 C4 */ lwz r0, 0x1c4(r1) /* 801E0554 001DD4B4 7C 08 03 A6 */ mtlr r0 /* 801E0558 001DD4B8 38 21 01 C0 */ addi r1, r1, 0x1c0 -/* 801E055C 001DD4BC 4E 80 00 20 */ blr +/* 801E055C 001DD4BC 4E 80 00 20 */ blr .global DoUserAnimEvent__8CThardusFR13CStateManagerRC13CInt32POINode14EUserEventType DoUserAnimEvent__8CThardusFR13CStateManagerRC13CInt32POINode14EUserEventType: @@ -7226,7 +7226,7 @@ DoUserAnimEvent__8CThardusFR13CStateManagerRC13CInt32POINode14EUserEventType: /* 801E05B0 001DD510 38 E7 5F AC */ addi r7, r7, lbl_803E5FAC@l /* 801E05B4 001DD514 7C 07 00 2E */ lwzx r0, r7, r0 /* 801E05B8 001DD518 7C 09 03 A6 */ mtctr r0 -/* 801E05BC 001DD51C 4E 80 04 20 */ bctr +/* 801E05BC 001DD51C 4E 80 04 20 */ bctr .global lbl_801E05C0 lbl_801E05C0: /* 801E05C0 001DD520 80 7F 09 00 */ lwz r3, 0x900(r31) @@ -7289,7 +7289,7 @@ lbl_801E0640: /* 801E0694 001DD5F4 38 80 00 01 */ li r4, 1 /* 801E0698 001DD5F8 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 801E069C 001DD5FC 7D 89 03 A6 */ mtctr r12 -/* 801E06A0 001DD600 4E 80 04 21 */ bctrl +/* 801E06A0 001DD600 4E 80 04 21 */ bctrl /* 801E06A4 001DD604 7F 43 D3 78 */ mr r3, r26 /* 801E06A8 001DD608 7F E4 FB 78 */ mr r4, r31 /* 801E06AC 001DD60C 38 A0 00 01 */ li r5, 1 @@ -7565,7 +7565,7 @@ lbl_801E0A50: /* 801E0AA4 001DDA04 81 97 00 00 */ lwz r12, 0(r23) /* 801E0AA8 001DDA08 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 801E0AAC 001DDA0C 7D 89 03 A6 */ mtctr r12 -/* 801E0AB0 001DDA10 4E 80 04 21 */ bctrl +/* 801E0AB0 001DDA10 4E 80 04 21 */ bctrl /* 801E0AB4 001DDA14 7F C3 F3 78 */ mr r3, r30 /* 801E0AB8 001DDA18 7F E5 FB 78 */ mr r5, r31 /* 801E0ABC 001DDA1C 38 80 00 09 */ li r4, 9 @@ -7576,7 +7576,7 @@ lbl_801E0A50: /* 801E0AD0 001DDA30 81 97 00 00 */ lwz r12, 0(r23) /* 801E0AD4 001DDA34 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 801E0AD8 001DDA38 7D 89 03 A6 */ mtctr r12 -/* 801E0ADC 001DDA3C 4E 80 04 21 */ bctrl +/* 801E0ADC 001DDA3C 4E 80 04 21 */ bctrl lbl_801E0AE0: /* 801E0AE0 001DDA40 3B 18 00 01 */ addi r24, r24, 1 lbl_801E0AE4: @@ -7706,7 +7706,7 @@ lbl_801E0B30: /* 801E0CC0 001DDC20 81 84 00 00 */ lwz r12, 0(r4) /* 801E0CC4 001DDC24 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801E0CC8 001DDC28 7D 89 03 A6 */ mtctr r12 -/* 801E0CCC 001DDC2C 4E 80 04 21 */ bctrl +/* 801E0CCC 001DDC2C 4E 80 04 21 */ bctrl /* 801E0CD0 001DDC30 38 61 00 8C */ addi r3, r1, 0x8c /* 801E0CD4 001DDC34 38 81 00 94 */ addi r4, r1, 0x94 /* 801E0CD8 001DDC38 3B 00 00 01 */ li r24, 1 @@ -7723,7 +7723,7 @@ lbl_801E0B30: /* 801E0D04 001DDC64 81 84 00 00 */ lwz r12, 0(r4) /* 801E0D08 001DDC68 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801E0D0C 001DDC6C 7D 89 03 A6 */ mtctr r12 -/* 801E0D10 001DDC70 4E 80 04 21 */ bctrl +/* 801E0D10 001DDC70 4E 80 04 21 */ bctrl /* 801E0D14 001DDC74 38 61 00 A4 */ addi r3, r1, 0xa4 /* 801E0D18 001DDC78 38 81 00 AC */ addi r4, r1, 0xac /* 801E0D1C 001DDC7C 3B 80 00 01 */ li r28, 1 @@ -7740,7 +7740,7 @@ lbl_801E0B30: /* 801E0D48 001DDCA8 81 84 00 00 */ lwz r12, 0(r4) /* 801E0D4C 001DDCAC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801E0D50 001DDCB0 7D 89 03 A6 */ mtctr r12 -/* 801E0D54 001DDCB4 4E 80 04 21 */ bctrl +/* 801E0D54 001DDCB4 4E 80 04 21 */ bctrl /* 801E0D58 001DDCB8 38 61 00 BC */ addi r3, r1, 0xbc /* 801E0D5C 001DDCBC 38 81 00 C4 */ addi r4, r1, 0xc4 /* 801E0D60 001DDCC0 3B 40 00 01 */ li r26, 1 @@ -7980,7 +7980,7 @@ lbl_801E107C: /* 801E10A8 001DE008 80 01 05 74 */ lwz r0, 0x574(r1) /* 801E10AC 001DE00C 7C 08 03 A6 */ mtlr r0 /* 801E10B0 001DE010 38 21 05 70 */ addi r1, r1, 0x570 -/* 801E10B4 001DE014 4E 80 00 20 */ blr +/* 801E10B4 001DE014 4E 80 00 20 */ blr .global AcceptScriptMsg__8CThardusF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__8CThardusF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -8006,7 +8006,7 @@ AcceptScriptMsg__8CThardusF20EScriptObjectMessage9TUniqueIdR13CStateManager: /* 801E1104 001DE064 38 63 5F F4 */ addi r3, r3, lbl_803E5FF4@l /* 801E1108 001DE068 7C 03 00 2E */ lwzx r0, r3, r0 /* 801E110C 001DE06C 7C 09 03 A6 */ mtctr r0 -/* 801E1110 001DE070 4E 80 04 20 */ bctr +/* 801E1110 001DE070 4E 80 04 20 */ bctr .global lbl_801E1114 lbl_801E1114: /* 801E1114 001DE074 88 1F 05 C8 */ lbz r0, 0x5c8(r31) @@ -8329,7 +8329,7 @@ lbl_801E15B8: /* 801E15C0 001DE520 81 93 00 00 */ lwz r12, 0(r19) /* 801E15C4 001DE524 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 801E15C8 001DE528 7D 89 03 A6 */ mtctr r12 -/* 801E15CC 001DE52C 4E 80 04 21 */ bctrl +/* 801E15CC 001DE52C 4E 80 04 21 */ bctrl /* 801E15D0 001DE530 7F C3 F3 78 */ mr r3, r30 /* 801E15D4 001DE534 7E 64 9B 78 */ mr r4, r19 /* 801E15D8 001DE538 4B E6 B5 3D */ bl AddObject__13CStateManagerFR7CEntity @@ -8600,7 +8600,7 @@ lbl_801E195C: /* 801E199C 001DE8FC 81 83 00 00 */ lwz r12, 0(r3) /* 801E19A0 001DE900 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 801E19A4 001DE904 7D 89 03 A6 */ mtctr r12 -/* 801E19A8 001DE908 4E 80 04 21 */ bctrl +/* 801E19A8 001DE908 4E 80 04 21 */ bctrl /* 801E19AC 001DE90C 48 00 01 B8 */ b lbl_801E1B64 lbl_801E19B0: /* 801E19B0 001DE910 A0 01 00 C4 */ lhz r0, 0xc4(r1) @@ -8684,7 +8684,7 @@ lbl_801E1ABC: /* 801E1AD0 001DEA30 81 92 00 00 */ lwz r12, 0(r18) /* 801E1AD4 001DEA34 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 801E1AD8 001DEA38 7D 89 03 A6 */ mtctr r12 -/* 801E1ADC 001DEA3C 4E 80 04 21 */ bctrl +/* 801E1ADC 001DEA3C 4E 80 04 21 */ bctrl /* 801E1AE0 001DEA40 48 00 00 84 */ b lbl_801E1B64 lbl_801E1AE4: /* 801E1AE4 001DEA44 2C 00 00 0E */ cmpwi r0, 0xe @@ -8836,7 +8836,7 @@ lbl_801E1CC8: /* 801E1D04 001DEC64 81 9F 00 00 */ lwz r12, 0(r31) /* 801E1D08 001DEC68 81 8C 02 B0 */ lwz r12, 0x2b0(r12) /* 801E1D0C 001DEC6C 7D 89 03 A6 */ mtctr r12 -/* 801E1D10 001DEC70 4E 80 04 21 */ bctrl +/* 801E1D10 001DEC70 4E 80 04 21 */ bctrl /* 801E1D14 001DEC74 80 1F 06 44 */ lwz r0, 0x644(r31) /* 801E1D18 001DEC78 3C 60 80 5A */ lis r3, skZero3f@ha /* 801E1D1C 001DEC7C 80 81 02 1C */ lwz r4, 0x21c(r1) @@ -9043,7 +9043,7 @@ lbl_801E2004: /* 801E201C 001DEF7C 81 93 00 00 */ lwz r12, 0(r19) /* 801E2020 001DEF80 81 8C 00 90 */ lwz r12, 0x90(r12) /* 801E2024 001DEF84 7D 89 03 A6 */ mtctr r12 -/* 801E2028 001DEF88 4E 80 04 21 */ bctrl +/* 801E2028 001DEF88 4E 80 04 21 */ bctrl /* 801E202C 001DEF8C C0 54 00 60 */ lfs f2, 0x60(r20) /* 801E2030 001DEF90 C0 34 00 50 */ lfs f1, 0x50(r20) /* 801E2034 001DEF94 C0 14 00 40 */ lfs f0, 0x40(r20) @@ -9114,7 +9114,7 @@ lbl_801E2110: /* 801E2124 001DF084 7F C4 F3 78 */ mr r4, r30 /* 801E2128 001DF088 38 C0 00 14 */ li r6, 0x14 /* 801E212C 001DF08C 7D 89 03 A6 */ mtctr r12 -/* 801E2130 001DF090 4E 80 04 21 */ bctrl +/* 801E2130 001DF090 4E 80 04 21 */ bctrl /* 801E2134 001DF094 48 00 00 9C */ b lbl_801E21D0 .global lbl_801E2138 lbl_801E2138: @@ -9137,7 +9137,7 @@ lbl_801E214C: /* 801E2174 001DF0D4 38 80 00 00 */ li r4, 0 /* 801E2178 001DF0D8 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 801E217C 001DF0DC 7D 89 03 A6 */ mtctr r12 -/* 801E2180 001DF0E0 4E 80 04 21 */ bctrl +/* 801E2180 001DF0E0 4E 80 04 21 */ bctrl lbl_801E2184: /* 801E2184 001DF0E4 80 7F 06 48 */ lwz r3, 0x648(r31) /* 801E2188 001DF0E8 3A 94 00 01 */ addi r20, r20, 1 @@ -9169,7 +9169,7 @@ lbl_801E21D0: /* 801E21DC 001DF13C 80 01 04 64 */ lwz r0, 0x464(r1) /* 801E21E0 001DF140 7C 08 03 A6 */ mtlr r0 /* 801E21E4 001DF144 38 21 04 60 */ addi r1, r1, 0x460 -/* 801E21E8 001DF148 4E 80 00 20 */ blr +/* 801E21E8 001DF148 4E 80 00 20 */ blr .global Accept__8CThardusFR8IVisitor Accept__8CThardusFR8IVisitor: @@ -9182,11 +9182,11 @@ Accept__8CThardusFR8IVisitor: /* 801E2204 001DF164 7C 04 03 78 */ mr r4, r0 /* 801E2208 001DF168 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 801E220C 001DF16C 7D 89 03 A6 */ mtctr r12 -/* 801E2210 001DF170 4E 80 04 21 */ bctrl +/* 801E2210 001DF170 4E 80 04 21 */ bctrl /* 801E2214 001DF174 80 01 00 14 */ lwz r0, 0x14(r1) /* 801E2218 001DF178 7C 08 03 A6 */ mtlr r0 /* 801E221C 001DF17C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801E2220 001DF180 4E 80 00 20 */ blr +/* 801E2220 001DF180 4E 80 00 20 */ blr .global "__ct__8CThardusF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC16CActorParametersRC14CPatternedInfoRCQ24rstl47vector<10CModelData,Q24rstl17rmemory_allocator>RCQ24rstl47vector<10CModelData,Q24rstl17rmemory_allocator>UiUiUifffffff" "__ct__8CThardusF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC16CActorParametersRC14CPatternedInfoRCQ24rstl47vector<10CModelData,Q24rstl17rmemory_allocator>RCQ24rstl47vector<10CModelData,Q24rstl17rmemory_allocator>UiUiUifffffff": @@ -9436,7 +9436,7 @@ Accept__8CThardusFR8IVisitor: /* 801E25F0 001DF550 81 84 00 00 */ lwz r12, 0(r4) /* 801E25F4 001DF554 81 8C 00 10 */ lwz r12, 0x10(r12) /* 801E25F8 001DF558 7D 89 03 A6 */ mtctr r12 -/* 801E25FC 001DF55C 4E 80 04 21 */ bctrl +/* 801E25FC 001DF55C 4E 80 04 21 */ bctrl /* 801E2600 001DF560 3A 0F 09 1C */ addi r16, r15, 0x91c /* 801E2604 001DF564 38 81 00 64 */ addi r4, r1, 0x64 /* 801E2608 001DF568 7E 03 83 78 */ mr r3, r16 @@ -9799,7 +9799,7 @@ lbl_801E2AEC: /* 801E2B24 001DFA84 80 01 01 B4 */ lwz r0, 0x1b4(r1) /* 801E2B28 001DFA88 7C 08 03 A6 */ mtlr r0 /* 801E2B2C 001DFA8C 38 21 01 B0 */ addi r1, r1, 0x1b0 -/* 801E2B30 001DFA90 4E 80 00 20 */ blr +/* 801E2B30 001DFA90 4E 80 00 20 */ blr .global sub_801e2b34 sub_801e2b34: @@ -9993,7 +9993,7 @@ lbl_801E2DB8: /* 801E2DC0 001DFD20 80 01 00 24 */ lwz r0, 0x24(r1) /* 801E2DC4 001DFD24 7C 08 03 A6 */ mtlr r0 /* 801E2DC8 001DFD28 38 21 00 20 */ addi r1, r1, 0x20 -/* 801E2DCC 001DFD2C 4E 80 00 20 */ blr +/* 801E2DCC 001DFD2C 4E 80 00 20 */ blr .global sub_801e2dd0 sub_801e2dd0: @@ -10011,7 +10011,7 @@ sub_801e2dd0: /* 801E2DFC 001DFD5C 88 03 00 10 */ lbz r0, 0x10(r3) /* 801E2E00 001DFD60 50 80 3E 30 */ rlwimi r0, r4, 7, 0x18, 0x18 /* 801E2E04 001DFD64 98 03 00 10 */ stb r0, 0x10(r3) -/* 801E2E08 001DFD68 4E 80 00 20 */ blr +/* 801E2E08 001DFD68 4E 80 00 20 */ blr .global sub_801e2e0c sub_801e2e0c: @@ -10062,7 +10062,7 @@ lbl_801E2EA0: /* 801E2EAC 001DFE0C 83 C1 00 08 */ lwz r30, 8(r1) /* 801E2EB0 001DFE10 7C 08 03 A6 */ mtlr r0 /* 801E2EB4 001DFE14 38 21 00 10 */ addi r1, r1, 0x10 -/* 801E2EB8 001DFE18 4E 80 00 20 */ blr +/* 801E2EB8 001DFE18 4E 80 00 20 */ blr .global sub_801e2ebc sub_801e2ebc: @@ -10096,7 +10096,7 @@ lbl_801E2F04: /* 801E2F20 001DFE80 83 81 00 10 */ lwz r28, 0x10(r1) /* 801E2F24 001DFE84 7C 08 03 A6 */ mtlr r0 /* 801E2F28 001DFE88 38 21 00 20 */ addi r1, r1, 0x20 -/* 801E2F2C 001DFE8C 4E 80 00 20 */ blr +/* 801E2F2C 001DFE8C 4E 80 00 20 */ blr .global sub_801e2f30 sub_801e2f30: @@ -10116,7 +10116,7 @@ lbl_801E2F48: .global CanRenderUnsorted__16CDestroyableRockCFRC13CStateManager CanRenderUnsorted__16CDestroyableRockCFRC13CStateManager: /* 801E2F58 001DFEB8 38 60 00 01 */ li r3, 1 -/* 801E2F5C 001DFEBC 4E 80 00 20 */ blr +/* 801E2F5C 001DFEBC 4E 80 00 20 */ blr .global UsePhazonModel__16CDestroyableRockFv UsePhazonModel__16CDestroyableRockFv: @@ -10133,7 +10133,7 @@ UsePhazonModel__16CDestroyableRockFv: /* 801E2F88 001DFEE8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801E2F8C 001DFEEC 7C 08 03 A6 */ mtlr r0 /* 801E2F90 001DFEF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801E2F94 001DFEF4 4E 80 00 20 */ blr +/* 801E2F94 001DFEF4 4E 80 00 20 */ blr .global TakeDamage__16CDestroyableRockFRC9CVector3ff TakeDamage__16CDestroyableRockFRC9CVector3ff: @@ -10141,7 +10141,7 @@ TakeDamage__16CDestroyableRockFRC9CVector3ff: /* 801E2F9C 001DFEFC C0 02 AC E0 */ lfs f0, lbl_805ACA00@sda21(r2) /* 801E2FA0 001DFF00 D0 23 03 24 */ stfs f1, 0x324(r3) /* 801E2FA4 001DFF04 D0 03 03 28 */ stfs f0, 0x328(r3) -/* 801E2FA8 001DFF08 4E 80 00 20 */ blr +/* 801E2FA8 001DFF08 4E 80 00 20 */ blr .global GetAimPosition__16CDestroyableRockCFRC13CStateManagerf GetAimPosition__16CDestroyableRockCFRC13CStateManagerf: @@ -10151,7 +10151,7 @@ GetAimPosition__16CDestroyableRockCFRC13CStateManagerf: /* 801E2FB8 001DFF18 D0 03 00 00 */ stfs f0, 0(r3) /* 801E2FBC 001DFF1C D0 23 00 04 */ stfs f1, 4(r3) /* 801E2FC0 001DFF20 D0 43 00 08 */ stfs f2, 8(r3) -/* 801E2FC4 001DFF24 4E 80 00 20 */ blr +/* 801E2FC4 001DFF24 4E 80 00 20 */ blr .global GetOrbitPosition__16CDestroyableRockCFRC13CStateManager GetOrbitPosition__16CDestroyableRockCFRC13CStateManager: @@ -10161,17 +10161,17 @@ GetOrbitPosition__16CDestroyableRockCFRC13CStateManager: /* 801E2FD4 001DFF34 D0 03 00 00 */ stfs f0, 0(r3) /* 801E2FD8 001DFF38 D0 23 00 04 */ stfs f1, 4(r3) /* 801E2FDC 001DFF3C D0 43 00 08 */ stfs f2, 8(r3) -/* 801E2FE0 001DFF40 4E 80 00 20 */ blr +/* 801E2FE0 001DFF40 4E 80 00 20 */ blr .global KnockBack__16CDestroyableRockFRC9CVector3fR13CStateManagerRC11CDamageInfo14EKnockBackTypef KnockBack__16CDestroyableRockFRC9CVector3fR13CStateManagerRC11CDamageInfo14EKnockBackTypef: -/* 801E2FE4 001DFF44 4E 80 00 20 */ blr +/* 801E2FE4 001DFF44 4E 80 00 20 */ blr .global Death__16CDestroyableRockFRC9CVector3fR13CStateManager Death__16CDestroyableRockFRC9CVector3fR13CStateManager: /* 801E2FE8 001DFF48 38 00 00 01 */ li r0, 1 /* 801E2FEC 001DFF4C 98 03 03 34 */ stb r0, 0x334(r3) -/* 801E2FF0 001DFF50 4E 80 00 20 */ blr +/* 801E2FF0 001DFF50 4E 80 00 20 */ blr .global GetTouchBounds__16CDestroyableRockCFv GetTouchBounds__16CDestroyableRockCFv: @@ -10206,7 +10206,7 @@ lbl_801E305C: /* 801E3060 001DFFC0 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 801E3064 001DFFC4 7C 08 03 A6 */ mtlr r0 /* 801E3068 001DFFC8 38 21 00 30 */ addi r1, r1, 0x30 -/* 801E306C 001DFFCC 4E 80 00 20 */ blr +/* 801E306C 001DFFCC 4E 80 00 20 */ blr .global AcceptScriptMsg__16CDestroyableRockF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__16CDestroyableRockF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -10242,7 +10242,7 @@ lbl_801E30D0: /* 801E30DC 001E003C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 801E30E0 001E0040 7C 08 03 A6 */ mtlr r0 /* 801E30E4 001E0044 38 21 00 20 */ addi r1, r1, 0x20 -/* 801E30E8 001E0048 4E 80 00 20 */ blr +/* 801E30E8 001E0048 4E 80 00 20 */ blr .global Accept__16CDestroyableRockFR8IVisitor Accept__16CDestroyableRockFR8IVisitor: @@ -10255,11 +10255,11 @@ Accept__16CDestroyableRockFR8IVisitor: /* 801E3104 001E0064 7C 04 03 78 */ mr r4, r0 /* 801E3108 001E0068 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 801E310C 001E006C 7D 89 03 A6 */ mtctr r12 -/* 801E3110 001E0070 4E 80 04 21 */ bctrl +/* 801E3110 001E0070 4E 80 04 21 */ bctrl /* 801E3114 001E0074 80 01 00 14 */ lwz r0, 0x14(r1) /* 801E3118 001E0078 7C 08 03 A6 */ mtlr r0 /* 801E311C 001E007C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801E3120 001E0080 4E 80 00 20 */ blr +/* 801E3120 001E0080 4E 80 00 20 */ blr .global Render__16CDestroyableRockCFRC13CStateManager Render__16CDestroyableRockCFRC13CStateManager: @@ -10270,7 +10270,7 @@ Render__16CDestroyableRockCFRC13CStateManager: /* 801E3134 001E0094 80 01 00 14 */ lwz r0, 0x14(r1) /* 801E3138 001E0098 7C 08 03 A6 */ mtlr r0 /* 801E313C 001E009C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801E3140 001E00A0 4E 80 00 20 */ blr +/* 801E3140 001E00A0 4E 80 00 20 */ blr .global PreRender__16CDestroyableRockFR13CStateManagerRC14CFrustumPlanes PreRender__16CDestroyableRockFR13CStateManagerRC14CFrustumPlanes: @@ -10363,7 +10363,7 @@ lbl_801E3274: /* 801E3290 001E01F0 83 A1 00 24 */ lwz r29, 0x24(r1) /* 801E3294 001E01F4 7C 08 03 A6 */ mtlr r0 /* 801E3298 001E01F8 38 21 00 30 */ addi r1, r1, 0x30 -/* 801E329C 001E01FC 4E 80 00 20 */ blr +/* 801E329C 001E01FC 4E 80 00 20 */ blr .global sub_801e32a0 sub_801e32a0: @@ -10543,7 +10543,7 @@ lbl_801E34EC: /* 801E3550 001E04B0 83 E1 00 7C */ lwz r31, 0x7c(r1) /* 801E3554 001E04B4 7C 08 03 A6 */ mtlr r0 /* 801E3558 001E04B8 38 21 01 40 */ addi r1, r1, 0x140 -/* 801E355C 001E04BC 4E 80 00 20 */ blr +/* 801E355C 001E04BC 4E 80 00 20 */ blr .global Think__16CDestroyableRockFfR13CStateManager Think__16CDestroyableRockFfR13CStateManager: @@ -10623,7 +10623,7 @@ lbl_801E365C: /* 801E3678 001E05D8 83 A1 00 24 */ lwz r29, 0x24(r1) /* 801E367C 001E05DC 7C 08 03 A6 */ mtlr r0 /* 801E3680 001E05E0 38 21 00 50 */ addi r1, r1, 0x50 -/* 801E3684 001E05E4 4E 80 00 20 */ blr +/* 801E3684 001E05E4 4E 80 00 20 */ blr .global PreThink__16CDestroyableRockFfR13CStateManager PreThink__16CDestroyableRockFfR13CStateManager: @@ -10634,7 +10634,7 @@ PreThink__16CDestroyableRockFfR13CStateManager: /* 801E3698 001E05F8 80 01 00 14 */ lwz r0, 0x14(r1) /* 801E369C 001E05FC 7C 08 03 A6 */ mtlr r0 /* 801E36A0 001E0600 38 21 00 10 */ addi r1, r1, 0x10 -/* 801E36A4 001E0604 4E 80 00 20 */ blr +/* 801E36A4 001E0604 4E 80 00 20 */ blr .global "__ct__16CDestroyableRockF9TUniqueIdbRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDatafRC11CHealthInfoRC20CDamageVulnerabilityRC13CMaterialListUiRC16CActorParametersRC10CModelData" "__ct__16CDestroyableRockF9TUniqueIdbRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDatafRC11CHealthInfoRC20CDamageVulnerabilityRC13CMaterialListUiRC16CActorParametersRC10CModelData": @@ -10724,7 +10724,7 @@ PreThink__16CDestroyableRockFfR13CStateManager: /* 801E37F4 001E0754 80 01 00 94 */ lwz r0, 0x94(r1) /* 801E37F8 001E0758 7C 08 03 A6 */ mtlr r0 /* 801E37FC 001E075C 38 21 00 90 */ addi r1, r1, 0x90 -/* 801E3800 001E0760 4E 80 00 20 */ blr +/* 801E3800 001E0760 4E 80 00 20 */ blr .global __dt__16CDestroyableRockFv __dt__16CDestroyableRockFv: @@ -10756,7 +10756,7 @@ lbl_801E3858: /* 801E3864 001E07C4 83 C1 00 08 */ lwz r30, 8(r1) /* 801E3868 001E07C8 7C 08 03 A6 */ mtlr r0 /* 801E386C 001E07CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801E3870 001E07D0 4E 80 00 20 */ blr +/* 801E3870 001E07D0 4E 80 00 20 */ blr .global __sinit_CThardus_cpp __sinit_CThardus_cpp: diff --git a/asm/MetroidPrime/Enemies/CThardusRockProjectile.s b/asm/MetroidPrime/Enemies/CThardusRockProjectile.s index 3d9fe768..04489050 100644 --- a/asm/MetroidPrime/Enemies/CThardusRockProjectile.s +++ b/asm/MetroidPrime/Enemies/CThardusRockProjectile.s @@ -333,7 +333,7 @@ lbl_80203800: /* 80203814 00200774 83 81 00 30 */ lwz r28, 0x30(r1) /* 80203818 00200778 7C 08 03 A6 */ mtlr r0 /* 8020381C 0020077C 38 21 00 40 */ addi r1, r1, 0x40 -/* 80203820 00200780 4E 80 00 20 */ blr +/* 80203820 00200780 4E 80 00 20 */ blr .global sub_80203824 sub_80203824: @@ -381,7 +381,7 @@ sub_80203824: /* 802038C8 00200828 81 84 00 00 */ lwz r12, 0(r4) /* 802038CC 0020082C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802038D0 00200830 7D 89 03 A6 */ mtctr r12 -/* 802038D4 00200834 4E 80 04 21 */ bctrl +/* 802038D4 00200834 4E 80 04 21 */ bctrl /* 802038D8 00200838 3A A1 00 5C */ addi r21, r1, 0x5c /* 802038DC 0020083C 38 81 00 4C */ addi r4, r1, 0x4c /* 802038E0 00200840 7E A3 AB 78 */ mr r3, r21 @@ -502,7 +502,7 @@ lbl_80203A74: /* 80203A84 002009E4 80 01 05 04 */ lwz r0, 0x504(r1) /* 80203A88 002009E8 7C 08 03 A6 */ mtlr r0 /* 80203A8C 002009EC 38 21 05 00 */ addi r1, r1, 0x500 -/* 80203A90 002009F0 4E 80 00 20 */ blr +/* 80203A90 002009F0 4E 80 00 20 */ blr .global sub_80203a94 sub_80203a94: @@ -582,14 +582,14 @@ sub_80203a94: /* 80203BB8 00200B18 81 9D 00 00 */ lwz r12, 0(r29) /* 80203BBC 00200B1C 81 8C 02 B0 */ lwz r12, 0x2b0(r12) /* 80203BC0 00200B20 7D 89 03 A6 */ mtctr r12 -/* 80203BC4 00200B24 4E 80 04 21 */ bctrl +/* 80203BC4 00200B24 4E 80 04 21 */ bctrl /* 80203BC8 00200B28 7F A4 EB 78 */ mr r4, r29 /* 80203BCC 00200B2C 38 61 00 80 */ addi r3, r1, 0x80 /* 80203BD0 00200B30 81 9D 00 00 */ lwz r12, 0(r29) /* 80203BD4 00200B34 C3 E1 00 78 */ lfs f31, 0x78(r1) /* 80203BD8 00200B38 81 8C 02 B0 */ lwz r12, 0x2b0(r12) /* 80203BDC 00200B3C 7D 89 03 A6 */ mtctr r12 -/* 80203BE0 00200B40 4E 80 04 21 */ bctrl +/* 80203BE0 00200B40 4E 80 04 21 */ bctrl /* 80203BE4 00200B44 C0 02 B0 90 */ lfs f0, lbl_805ACDB0@sda21(r2) /* 80203BE8 00200B48 39 00 00 09 */ li r8, 9 /* 80203BEC 00200B4C C0 21 00 88 */ lfs f1, 0x88(r1) @@ -684,7 +684,7 @@ lbl_80203D28: /* 80203D48 00200CA8 83 81 00 C0 */ lwz r28, 0xc0(r1) /* 80203D4C 00200CAC 7C 08 03 A6 */ mtlr r0 /* 80203D50 00200CB0 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 80203D54 00200CB4 4E 80 00 20 */ blr +/* 80203D54 00200CB4 4E 80 00 20 */ blr .global sub_80203d58 sub_80203d58: @@ -702,7 +702,7 @@ sub_80203d58: /* 80203D84 00200CE4 81 9F 00 00 */ lwz r12, 0(r31) /* 80203D88 00200CE8 81 8C 00 80 */ lwz r12, 0x80(r12) /* 80203D8C 00200CEC 7D 89 03 A6 */ mtctr r12 -/* 80203D90 00200CF0 4E 80 04 21 */ bctrl +/* 80203D90 00200CF0 4E 80 04 21 */ bctrl /* 80203D94 00200CF4 C0 02 B0 A0 */ lfs f0, lbl_805ACDC0@sda21(r2) /* 80203D98 00200CF8 FC 40 08 50 */ fneg f2, f1 /* 80203D9C 00200CFC C0 22 B0 9C */ lfs f1, lbl_805ACDBC@sda21(r2) @@ -716,7 +716,7 @@ sub_80203d58: /* 80203DBC 00200D1C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80203DC0 00200D20 7C 08 03 A6 */ mtlr r0 /* 80203DC4 00200D24 38 21 00 10 */ addi r1, r1, 0x10 -/* 80203DC8 00200D28 4E 80 00 20 */ blr +/* 80203DC8 00200D28 4E 80 00 20 */ blr .global Render__22CThardusRockProjectileCFRC13CStateManager Render__22CThardusRockProjectileCFRC13CStateManager: @@ -727,7 +727,7 @@ Render__22CThardusRockProjectileCFRC13CStateManager: /* 80203DDC 00200D3C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80203DE0 00200D40 7C 08 03 A6 */ mtlr r0 /* 80203DE4 00200D44 38 21 00 10 */ addi r1, r1, 0x10 -/* 80203DE8 00200D48 4E 80 00 20 */ blr +/* 80203DE8 00200D48 4E 80 00 20 */ blr .global sub_80203dec sub_80203dec: @@ -809,7 +809,7 @@ lbl_80203EF8: /* 80203F04 00200E64 80 01 00 54 */ lwz r0, 0x54(r1) /* 80203F08 00200E68 7C 08 03 A6 */ mtlr r0 /* 80203F0C 00200E6C 38 21 00 50 */ addi r1, r1, 0x50 -/* 80203F10 00200E70 4E 80 00 20 */ blr +/* 80203F10 00200E70 4E 80 00 20 */ blr .global SetChildrenActive__22CThardusRockProjectileFR13CStateManagerb SetChildrenActive__22CThardusRockProjectileFR13CStateManagerb: @@ -852,13 +852,13 @@ lbl_80203F40: /* 80203FA0 00200F00 81 9B 00 00 */ lwz r12, 0(r27) /* 80203FA4 00200F04 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80203FA8 00200F08 7D 89 03 A6 */ mtctr r12 -/* 80203FAC 00200F0C 4E 80 04 21 */ bctrl +/* 80203FAC 00200F0C 4E 80 04 21 */ bctrl /* 80203FB0 00200F10 7F 43 D3 78 */ mr r3, r26 /* 80203FB4 00200F14 7F C4 F3 78 */ mr r4, r30 /* 80203FB8 00200F18 81 9A 00 00 */ lwz r12, 0(r26) /* 80203FBC 00200F1C 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80203FC0 00200F20 7D 89 03 A6 */ mtctr r12 -/* 80203FC4 00200F24 4E 80 04 21 */ bctrl +/* 80203FC4 00200F24 4E 80 04 21 */ bctrl lbl_80203FC8: /* 80203FC8 00200F28 3B 9C 00 01 */ addi r28, r28, 1 /* 80203FCC 00200F2C 3B FF 00 02 */ addi r31, r31, 2 @@ -869,7 +869,7 @@ lbl_80203FD0: /* 80203FDC 00200F3C 80 01 00 44 */ lwz r0, 0x44(r1) /* 80203FE0 00200F40 7C 08 03 A6 */ mtlr r0 /* 80203FE4 00200F44 38 21 00 40 */ addi r1, r1, 0x40 -/* 80203FE8 00200F48 4E 80 00 20 */ blr +/* 80203FE8 00200F48 4E 80 00 20 */ blr .global UpdateDestroyableRockCollisionActors__22CThardusRockProjectileFR13CStateManager UpdateDestroyableRockCollisionActors__22CThardusRockProjectileFR13CStateManager: @@ -916,7 +916,7 @@ lbl_8020401C: /* 80204088 00200FE8 81 83 00 00 */ lwz r12, 0(r3) /* 8020408C 00200FEC 81 8C 00 38 */ lwz r12, 0x38(r12) /* 80204090 00200FF0 7D 89 03 A6 */ mtctr r12 -/* 80204094 00200FF4 4E 80 04 21 */ bctrl +/* 80204094 00200FF4 4E 80 04 21 */ bctrl /* 80204098 00200FF8 7C 64 1B 78 */ mr r4, r3 /* 8020409C 00200FFC 7F A3 EB 78 */ mr r3, r29 /* 802040A0 00201000 4B FA 4A F9 */ bl SetDamageVulnerability__15CCollisionActorFRC20CDamageVulnerability @@ -925,14 +925,14 @@ lbl_8020401C: /* 802040AC 0020100C 81 9D 00 00 */ lwz r12, 0(r29) /* 802040B0 00201010 81 8C 00 34 */ lwz r12, 0x34(r12) /* 802040B4 00201014 7D 89 03 A6 */ mtctr r12 -/* 802040B8 00201018 4E 80 04 21 */ bctrl +/* 802040B8 00201018 4E 80 04 21 */ bctrl /* 802040BC 0020101C 7C 7F 1B 78 */ mr r31, r3 /* 802040C0 00201020 7F 63 DB 78 */ mr r3, r27 /* 802040C4 00201024 81 9B 00 00 */ lwz r12, 0(r27) /* 802040C8 00201028 7F 44 D3 78 */ mr r4, r26 /* 802040CC 0020102C 81 8C 00 34 */ lwz r12, 0x34(r12) /* 802040D0 00201030 7D 89 03 A6 */ mtctr r12 -/* 802040D4 00201034 4E 80 04 21 */ bctrl +/* 802040D4 00201034 4E 80 04 21 */ bctrl /* 802040D8 00201038 C0 1F 00 00 */ lfs f0, 0(r31) /* 802040DC 0020103C 38 80 00 00 */ li r4, 0 /* 802040E0 00201040 D0 03 00 00 */ stfs f0, 0(r3) @@ -979,7 +979,7 @@ lbl_80204174: /* 80204178 002010D8 81 9D 00 00 */ lwz r12, 0(r29) /* 8020417C 002010DC 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 80204180 002010E0 7D 89 03 A6 */ mtctr r12 -/* 80204184 002010E4 4E 80 04 21 */ bctrl +/* 80204184 002010E4 4E 80 04 21 */ bctrl /* 80204188 002010E8 7C 64 1B 78 */ mr r4, r3 /* 8020418C 002010EC 7F 43 D3 78 */ mr r3, r26 /* 80204190 002010F0 7E E6 BB 78 */ mr r6, r23 @@ -1001,13 +1001,13 @@ lbl_802041C4: /* 802041CC 0020112C 81 9B 00 00 */ lwz r12, 0(r27) /* 802041D0 00201130 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 802041D4 00201134 7D 89 03 A6 */ mtctr r12 -/* 802041D8 00201138 4E 80 04 21 */ bctrl +/* 802041D8 00201138 4E 80 04 21 */ bctrl /* 802041DC 0020113C 7F A3 EB 78 */ mr r3, r29 /* 802041E0 00201140 38 80 00 00 */ li r4, 0 /* 802041E4 00201144 81 9D 00 00 */ lwz r12, 0(r29) /* 802041E8 00201148 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 802041EC 0020114C 7D 89 03 A6 */ mtctr r12 -/* 802041F0 00201150 4E 80 04 21 */ bctrl +/* 802041F0 00201150 4E 80 04 21 */ bctrl /* 802041F4 00201154 80 79 05 A0 */ lwz r3, 0x5a0(r25) /* 802041F8 00201158 C0 02 B0 A0 */ lfs f0, lbl_805ACDC0@sda21(r2) /* 802041FC 0020115C 38 03 00 01 */ addi r0, r3, 1 @@ -1028,7 +1028,7 @@ lbl_80204224: /* 80204230 00201190 80 01 00 84 */ lwz r0, 0x84(r1) /* 80204234 00201194 7C 08 03 A6 */ mtlr r0 /* 80204238 00201198 38 21 00 80 */ addi r1, r1, 0x80 -/* 8020423C 0020119C 4E 80 00 20 */ blr +/* 8020423C 0020119C 4E 80 00 20 */ blr .global UpdateDestroyableRockPositions__22CThardusRockProjectileFR13CStateManager UpdateDestroyableRockPositions__22CThardusRockProjectileFR13CStateManager: @@ -1117,7 +1117,7 @@ lbl_80204370: /* 8020437C 002012DC 80 01 01 54 */ lwz r0, 0x154(r1) /* 80204380 002012E0 7C 08 03 A6 */ mtlr r0 /* 80204384 002012E4 38 21 01 50 */ addi r1, r1, 0x150 -/* 80204388 002012E8 4E 80 00 20 */ blr +/* 80204388 002012E8 4E 80 00 20 */ blr .global sub_8020438c sub_8020438c: @@ -1215,7 +1215,7 @@ lbl_802044DC: /* 802044E8 00201448 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 802044EC 0020144C 7C 08 03 A6 */ mtlr r0 /* 802044F0 00201450 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 802044F4 00201454 4E 80 00 20 */ blr +/* 802044F4 00201454 4E 80 00 20 */ blr .global "SetMaterialProperties__22CThardusRockProjectileFRQ24rstl36single_ptr<22CCollisionActorManager>R13CStateManager" "SetMaterialProperties__22CThardusRockProjectileFRQ24rstl36single_ptr<22CCollisionActorManager>R13CStateManager": @@ -1283,7 +1283,7 @@ lbl_802045CC: /* 802045E0 00201540 80 01 00 64 */ lwz r0, 0x64(r1) /* 802045E4 00201544 7C 08 03 A6 */ mtlr r0 /* 802045E8 00201548 38 21 00 60 */ addi r1, r1, 0x60 -/* 802045EC 0020154C 4E 80 00 20 */ blr +/* 802045EC 0020154C 4E 80 00 20 */ blr .global InitializeCollisionManager__22CThardusRockProjectileFR13CStateManager InitializeCollisionManager__22CThardusRockProjectileFR13CStateManager: @@ -1371,7 +1371,7 @@ lbl_802046C4: /* 8020472C 0020168C 81 9C 00 00 */ lwz r12, 0(r28) /* 80204730 00201690 81 8C 00 38 */ lwz r12, 0x38(r12) /* 80204734 00201694 7D 89 03 A6 */ mtctr r12 -/* 80204738 00201698 4E 80 04 21 */ bctrl +/* 80204738 00201698 4E 80 04 21 */ bctrl /* 8020473C 0020169C 7C 64 1B 78 */ mr r4, r3 /* 80204740 002016A0 7F 43 D3 78 */ mr r3, r26 /* 80204744 002016A4 4B FA 44 55 */ bl SetDamageVulnerability__15CCollisionActorFRC20CDamageVulnerability @@ -1380,14 +1380,14 @@ lbl_802046C4: /* 80204750 002016B0 81 9C 00 00 */ lwz r12, 0(r28) /* 80204754 002016B4 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80204758 002016B8 7D 89 03 A6 */ mtctr r12 -/* 8020475C 002016BC 4E 80 04 21 */ bctrl +/* 8020475C 002016BC 4E 80 04 21 */ bctrl /* 80204760 002016C0 7C 7C 1B 78 */ mr r28, r3 /* 80204764 002016C4 7F 43 D3 78 */ mr r3, r26 /* 80204768 002016C8 81 9A 00 00 */ lwz r12, 0(r26) /* 8020476C 002016CC 7F E4 FB 78 */ mr r4, r31 /* 80204770 002016D0 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80204774 002016D4 7D 89 03 A6 */ mtctr r12 -/* 80204778 002016D8 4E 80 04 21 */ bctrl +/* 80204778 002016D8 4E 80 04 21 */ bctrl /* 8020477C 002016DC C0 1C 00 00 */ lfs f0, 0(r28) /* 80204780 002016E0 D0 03 00 00 */ stfs f0, 0(r3) /* 80204784 002016E4 C0 1C 00 04 */ lfs f0, 4(r28) @@ -1405,7 +1405,7 @@ lbl_80204794: /* 802047AC 0020170C 80 01 00 64 */ lwz r0, 0x64(r1) /* 802047B0 00201710 7C 08 03 A6 */ mtlr r0 /* 802047B4 00201714 38 21 00 60 */ addi r1, r1, 0x60 -/* 802047B8 00201718 4E 80 00 20 */ blr +/* 802047B8 00201718 4E 80 00 20 */ blr .global Delay__22CThardusRockProjectileFR13CStateManagerf Delay__22CThardusRockProjectileFR13CStateManagerf: @@ -1414,7 +1414,7 @@ Delay__22CThardusRockProjectileFR13CStateManagerf: /* 802047C4 00201724 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 802047C8 00201728 7C 00 00 26 */ mfcr r0 /* 802047CC 0020172C 54 03 17 FE */ rlwinm r3, r0, 2, 0x1f, 0x1f -/* 802047D0 00201730 4E 80 00 20 */ blr +/* 802047D0 00201730 4E 80 00 20 */ blr .global sub_802047d4 sub_802047d4: @@ -1422,12 +1422,12 @@ sub_802047d4: /* 802047D8 00201738 20 00 00 03 */ subfic r0, r0, 3 /* 802047DC 0020173C 7C 00 00 34 */ cntlzw r0, r0 /* 802047E0 00201740 54 03 D9 7E */ srwi r3, r0, 5 -/* 802047E4 00201744 4E 80 00 20 */ blr +/* 802047E4 00201744 4E 80 00 20 */ blr .global HitSomething__22CThardusRockProjectileFR13CStateManagerf HitSomething__22CThardusRockProjectileFR13CStateManagerf: /* 802047E8 00201748 88 63 05 72 */ lbz r3, 0x572(r3) -/* 802047EC 0020174C 4E 80 00 20 */ blr +/* 802047EC 0020174C 4E 80 00 20 */ blr .global ShouldAttack__22CThardusRockProjectileFR13CStateManagerf ShouldAttack__22CThardusRockProjectileFR13CStateManagerf: @@ -1441,10 +1441,10 @@ ShouldAttack__22CThardusRockProjectileFR13CStateManagerf: /* 8020480C 0020176C 38 00 00 02 */ li r0, 2 /* 80204810 00201770 90 03 05 6C */ stw r0, 0x56c(r3) /* 80204814 00201774 38 60 00 01 */ li r3, 1 -/* 80204818 00201778 4E 80 00 20 */ blr +/* 80204818 00201778 4E 80 00 20 */ blr lbl_8020481C: /* 8020481C 0020177C 38 60 00 00 */ li r3, 0 -/* 80204820 00201780 4E 80 00 20 */ blr +/* 80204820 00201780 4E 80 00 20 */ blr .global ShouldMove__22CThardusRockProjectileFR13CStateManagerf ShouldMove__22CThardusRockProjectileFR13CStateManagerf: @@ -1454,7 +1454,7 @@ ShouldMove__22CThardusRockProjectileFR13CStateManagerf: /* 80204830 00201790 7C A4 FE 70 */ srawi r4, r5, 0x1f /* 80204834 00201794 7C 00 28 10 */ subfc r0, r0, r5 /* 80204838 00201798 7C 64 19 14 */ adde r3, r4, r3 -/* 8020483C 0020179C 4E 80 00 20 */ blr +/* 8020483C 0020179C 4E 80 00 20 */ blr .global Lurk__22CThardusRockProjectileFR13CStateManager9EStateMsgf Lurk__22CThardusRockProjectileFR13CStateManager9EStateMsgf: @@ -1509,7 +1509,7 @@ lbl_802048F4: /* 802048F8 00201858 83 E1 00 4C */ lwz r31, 0x4c(r1) /* 802048FC 0020185C 7C 08 03 A6 */ mtlr r0 /* 80204900 00201860 38 21 00 50 */ addi r1, r1, 0x50 -/* 80204904 00201864 4E 80 00 20 */ blr +/* 80204904 00201864 4E 80 00 20 */ blr .global Dead__22CThardusRockProjectileFR13CStateManager9EStateMsgf Dead__22CThardusRockProjectileFR13CStateManager9EStateMsgf: @@ -1545,7 +1545,7 @@ lbl_8020496C: /* 80204974 002018D4 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80204978 002018D8 7C 08 03 A6 */ mtlr r0 /* 8020497C 002018DC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80204980 002018E0 4E 80 00 20 */ blr +/* 80204980 002018E0 4E 80 00 20 */ blr .global LoopedAttack__22CThardusRockProjectileFR13CStateManager9EStateMsgf LoopedAttack__22CThardusRockProjectileFR13CStateManager9EStateMsgf: @@ -1583,7 +1583,7 @@ lbl_802049E8: /* 802049F8 00201958 81 84 00 00 */ lwz r12, 0(r4) /* 802049FC 0020195C 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 80204A00 00201960 7D 89 03 A6 */ mtctr r12 -/* 80204A04 00201964 4E 80 04 21 */ bctrl +/* 80204A04 00201964 4E 80 04 21 */ bctrl /* 80204A08 00201968 C0 A1 00 50 */ lfs f5, 0x50(r1) /* 80204A0C 0020196C C0 81 00 54 */ lfs f4, 0x54(r1) /* 80204A10 00201970 C0 61 00 58 */ lfs f3, 0x58(r1) @@ -1738,7 +1738,7 @@ lbl_80204C2C: /* 80204C54 00201BB4 83 C1 01 08 */ lwz r30, 0x108(r1) /* 80204C58 00201BB8 7C 08 03 A6 */ mtlr r0 /* 80204C5C 00201BBC 38 21 01 50 */ addi r1, r1, 0x150 -/* 80204C60 00201BC0 4E 80 00 20 */ blr +/* 80204C60 00201BC0 4E 80 00 20 */ blr .global Patrol__22CThardusRockProjectileFR13CStateManager9EStateMsgf Patrol__22CThardusRockProjectileFR13CStateManager9EStateMsgf: @@ -1793,7 +1793,7 @@ lbl_80204D18: /* 80204D1C 00201C7C 83 E1 00 4C */ lwz r31, 0x4c(r1) /* 80204D20 00201C80 7C 08 03 A6 */ mtlr r0 /* 80204D24 00201C84 38 21 00 50 */ addi r1, r1, 0x50 -/* 80204D28 00201C88 4E 80 00 20 */ blr +/* 80204D28 00201C88 4E 80 00 20 */ blr .global GetUp__22CThardusRockProjectileFR13CStateManager9EStateMsgf GetUp__22CThardusRockProjectileFR13CStateManager9EStateMsgf: @@ -2028,7 +2028,7 @@ lbl_80205084: /* 80205090 00201FF0 83 A1 01 C4 */ lwz r29, 0x1c4(r1) /* 80205094 00201FF4 7C 08 03 A6 */ mtlr r0 /* 80205098 00201FF8 38 21 01 D0 */ addi r1, r1, 0x1d0 -/* 8020509C 00201FFC 4E 80 00 20 */ blr +/* 8020509C 00201FFC 4E 80 00 20 */ blr .global Think__22CThardusRockProjectileFfR13CStateManager Think__22CThardusRockProjectileFfR13CStateManager: @@ -2148,7 +2148,7 @@ lbl_80205240: /* 80205250 002021B0 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80205254 002021B4 7C 08 03 A6 */ mtlr r0 /* 80205258 002021B8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8020525C 002021BC 4E 80 00 20 */ blr +/* 8020525C 002021BC 4E 80 00 20 */ blr .global AcceptScriptMsg__22CThardusRockProjectileF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__22CThardusRockProjectileF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -2287,7 +2287,7 @@ lbl_80205314: /* 80205460 002023C0 3A A0 00 01 */ li r21, 1 /* 80205464 002023C4 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80205468 002023C8 7D 89 03 A6 */ mtctr r12 -/* 8020546C 002023CC 4E 80 04 21 */ bctrl +/* 8020546C 002023CC 4E 80 04 21 */ bctrl /* 80205470 002023D0 80 DF 05 88 */ lwz r6, 0x588(r31) /* 80205474 002023D4 3C 80 80 57 */ lis r4, lbl_8056D410@ha /* 80205478 002023D8 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) @@ -2428,7 +2428,7 @@ lbl_80205630: /* 80205668 002025C8 81 9F 00 00 */ lwz r12, 0(r31) /* 8020566C 002025CC 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80205670 002025D0 7D 89 03 A6 */ mtctr r12 -/* 80205674 002025D4 4E 80 04 21 */ bctrl +/* 80205674 002025D4 4E 80 04 21 */ bctrl /* 80205678 002025D8 7F E3 FB 78 */ mr r3, r31 /* 8020567C 002025DC 7F C4 F3 78 */ mr r4, r30 /* 80205680 002025E0 38 A0 00 00 */ li r5, 0 @@ -2508,7 +2508,7 @@ lbl_80205758: /* 80205788 002026E8 81 83 00 00 */ lwz r12, 0(r3) /* 8020578C 002026EC 81 8C 00 90 */ lwz r12, 0x90(r12) /* 80205790 002026F0 7D 89 03 A6 */ mtctr r12 -/* 80205794 002026F4 4E 80 04 21 */ bctrl +/* 80205794 002026F4 4E 80 04 21 */ bctrl /* 80205798 002026F8 7E 64 9B 78 */ mr r4, r19 /* 8020579C 002026FC 38 61 00 54 */ addi r3, r1, 0x54 /* 802057A0 00202700 4B FA 33 ED */ bl GetLastTouchedObject__15CCollisionActorCFv @@ -2628,7 +2628,7 @@ lbl_802058D0: /* 8020595C 002028BC 81 9F 00 00 */ lwz r12, 0(r31) /* 80205960 002028C0 81 8C 02 B0 */ lwz r12, 0x2b0(r12) /* 80205964 002028C4 7D 89 03 A6 */ mtctr r12 -/* 80205968 002028C8 4E 80 04 21 */ bctrl +/* 80205968 002028C8 4E 80 04 21 */ bctrl /* 8020596C 002028CC 80 AD 93 50 */ lwz r5, lbl_805A7F10@sda21(r13) /* 80205970 002028D0 38 60 00 00 */ li r3, 0 /* 80205974 002028D4 38 80 00 01 */ li r4, 1 @@ -2654,7 +2654,7 @@ lbl_802058D0: /* 802059C4 00202924 B0 01 00 38 */ sth r0, 0x38(r1) /* 802059C8 00202928 81 8C 02 B0 */ lwz r12, 0x2b0(r12) /* 802059CC 0020292C 7D 89 03 A6 */ mtctr r12 -/* 802059D0 00202930 4E 80 04 21 */ bctrl +/* 802059D0 00202930 4E 80 04 21 */ bctrl /* 802059D4 00202934 3C 80 80 5A */ lis r4, skZero3f@ha /* 802059D8 00202938 7F C3 F3 78 */ mr r3, r30 /* 802059DC 0020293C 39 24 66 A0 */ addi r9, r4, skZero3f@l @@ -2718,13 +2718,13 @@ lbl_80205A74: /* 80205AB0 00202A10 38 80 00 00 */ li r4, 0 /* 80205AB4 00202A14 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80205AB8 00202A18 7D 89 03 A6 */ mtctr r12 -/* 80205ABC 00202A1C 4E 80 04 21 */ bctrl +/* 80205ABC 00202A1C 4E 80 04 21 */ bctrl /* 80205AC0 00202A20 7E 23 8B 78 */ mr r3, r17 /* 80205AC4 00202A24 38 80 00 00 */ li r4, 0 /* 80205AC8 00202A28 81 91 00 00 */ lwz r12, 0(r17) /* 80205ACC 00202A2C 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80205AD0 00202A30 7D 89 03 A6 */ mtctr r12 -/* 80205AD4 00202A34 4E 80 04 21 */ bctrl +/* 80205AD4 00202A34 4E 80 04 21 */ bctrl /* 80205AD8 00202A38 80 7F 05 A0 */ lwz r3, 0x5a0(r31) /* 80205ADC 00202A3C 38 03 00 01 */ addi r0, r3, 1 /* 80205AE0 00202A40 90 1F 05 A0 */ stw r0, 0x5a0(r31) @@ -2745,7 +2745,7 @@ lbl_80205B0C: /* 80205B10 00202A70 80 01 02 84 */ lwz r0, 0x284(r1) /* 80205B14 00202A74 7C 08 03 A6 */ mtlr r0 /* 80205B18 00202A78 38 21 02 80 */ addi r1, r1, 0x280 -/* 80205B1C 00202A7C 4E 80 00 20 */ blr +/* 80205B1C 00202A7C 4E 80 00 20 */ blr .global Accept__22CThardusRockProjectileFR8IVisitor Accept__22CThardusRockProjectileFR8IVisitor: @@ -2758,11 +2758,11 @@ Accept__22CThardusRockProjectileFR8IVisitor: /* 80205B38 00202A98 7C 04 03 78 */ mr r4, r0 /* 80205B3C 00202A9C 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 80205B40 00202AA0 7D 89 03 A6 */ mtctr r12 -/* 80205B44 00202AA4 4E 80 04 21 */ bctrl +/* 80205B44 00202AA4 4E 80 04 21 */ bctrl /* 80205B48 00202AA8 80 01 00 14 */ lwz r0, 0x14(r1) /* 80205B4C 00202AAC 7C 08 03 A6 */ mtlr r0 /* 80205B50 00202AB0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80205B54 00202AB4 4E 80 00 20 */ blr +/* 80205B54 00202AB4 4E 80 00 20 */ blr .global "__ct__22CThardusRockProjectileF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC16CActorParametersRC14CPatternedInfoRCQ24rstl47vector<10CModelData,Q24rstl17rmemory_allocator>Ui" "__ct__22CThardusRockProjectileF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC16CActorParametersRC14CPatternedInfoRCQ24rstl47vector<10CModelData,Q24rstl17rmemory_allocator>Ui": diff --git a/asm/MetroidPrime/Enemies/CTryclops.s b/asm/MetroidPrime/Enemies/CTryclops.s index 9268bc5a..c09984f3 100644 --- a/asm/MetroidPrime/Enemies/CTryclops.s +++ b/asm/MetroidPrime/Enemies/CTryclops.s @@ -283,12 +283,12 @@ lbl_805A9120: .global sub_8025dbc0 sub_8025dbc0: /* 8025DBC0 0025AB20 38 63 05 68 */ addi r3, r3, 0x568 -/* 8025DBC4 0025AB24 4E 80 00 20 */ blr +/* 8025DBC4 0025AB24 4E 80 00 20 */ blr .global sub_8025dbc8 sub_8025dbc8: /* 8025DBC8 0025AB28 38 60 00 01 */ li r3, 1 -/* 8025DBCC 0025AB2C 4E 80 00 20 */ blr +/* 8025DBCC 0025AB2C 4E 80 00 20 */ blr .global sub_8025dbd0 sub_8025dbd0: @@ -479,12 +479,12 @@ lbl_8025DE54: /* 8025DE94 0025ADF4 81 99 00 00 */ lwz r12, 0(r25) /* 8025DE98 0025ADF8 81 8C 00 70 */ lwz r12, 0x70(r12) /* 8025DE9C 0025ADFC 7D 89 03 A6 */ mtctr r12 -/* 8025DEA0 0025AE00 4E 80 04 21 */ bctrl +/* 8025DEA0 0025AE00 4E 80 04 21 */ bctrl /* 8025DEA4 0025AE04 7F 23 CB 78 */ mr r3, r25 /* 8025DEA8 0025AE08 81 99 00 00 */ lwz r12, 0(r25) /* 8025DEAC 0025AE0C 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 8025DEB0 0025AE10 7D 89 03 A6 */ mtctr r12 -/* 8025DEB4 0025AE14 4E 80 04 21 */ bctrl +/* 8025DEB4 0025AE14 4E 80 04 21 */ bctrl /* 8025DEB8 0025AE18 3C 80 80 5A */ lis r4, lbl_8059FD18@ha /* 8025DEBC 0025AE1C 90 61 00 E0 */ stw r3, 0xe0(r1) /* 8025DEC0 0025AE20 38 04 FD 18 */ addi r0, r4, lbl_8059FD18@l @@ -590,7 +590,7 @@ lbl_8025E000: /* 8025E024 0025AF84 80 01 0A 24 */ lwz r0, 0xa24(r1) /* 8025E028 0025AF88 7C 08 03 A6 */ mtlr r0 /* 8025E02C 0025AF8C 38 21 0A 20 */ addi r1, r1, 0xa20 -/* 8025E030 0025AF90 4E 80 00 20 */ blr +/* 8025E030 0025AF90 4E 80 00 20 */ blr .global sub_8025e034 sub_8025e034: @@ -694,7 +694,7 @@ lbl_8025E198: /* 8025E1A4 0025B104 83 A1 00 94 */ lwz r29, 0x94(r1) /* 8025E1A8 0025B108 7C 08 03 A6 */ mtlr r0 /* 8025E1AC 0025B10C 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8025E1B0 0025B110 4E 80 00 20 */ blr +/* 8025E1B0 0025B110 4E 80 00 20 */ blr .global sub_8025e1b4 sub_8025e1b4: @@ -743,7 +743,7 @@ lbl_8025E248: /* 8025E254 0025B1B4 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8025E258 0025B1B8 7C 08 03 A6 */ mtlr r0 /* 8025E25C 0025B1BC 38 21 00 30 */ addi r1, r1, 0x30 -/* 8025E260 0025B1C0 4E 80 00 20 */ blr +/* 8025E260 0025B1C0 4E 80 00 20 */ blr .global sub_8025e264 sub_8025e264: @@ -780,7 +780,7 @@ lbl_8025E2C4: /* 8025E2D0 0025B230 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8025E2D4 0025B234 7C 08 03 A6 */ mtlr r0 /* 8025E2D8 0025B238 38 21 00 20 */ addi r1, r1, 0x20 -/* 8025E2DC 0025B23C 4E 80 00 20 */ blr +/* 8025E2DC 0025B23C 4E 80 00 20 */ blr .global sub_8025e2e0 sub_8025e2e0: @@ -876,7 +876,7 @@ lbl_8025E414: /* 8025E42C 0025B38C 83 81 00 50 */ lwz r28, 0x50(r1) /* 8025E430 0025B390 7C 08 03 A6 */ mtlr r0 /* 8025E434 0025B394 38 21 00 60 */ addi r1, r1, 0x60 -/* 8025E438 0025B398 4E 80 00 20 */ blr +/* 8025E438 0025B398 4E 80 00 20 */ blr .global sub_8025e43c sub_8025e43c: @@ -924,13 +924,13 @@ lbl_8025E4D0: /* 8025E4D8 0025B438 83 C1 00 28 */ lwz r30, 0x28(r1) /* 8025E4DC 0025B43C 7C 08 03 A6 */ mtlr r0 /* 8025E4E0 0025B440 38 21 00 30 */ addi r1, r1, 0x30 -/* 8025E4E4 0025B444 4E 80 00 20 */ blr +/* 8025E4E4 0025B444 4E 80 00 20 */ blr .global sub_8025e4e8 sub_8025e4e8: /* 8025E4E8 0025B448 88 03 06 98 */ lbz r0, 0x698(r3) /* 8025E4EC 0025B44C 54 03 E7 FE */ rlwinm r3, r0, 0x1c, 0x1f, 0x1f -/* 8025E4F0 0025B450 4E 80 00 20 */ blr +/* 8025E4F0 0025B450 4E 80 00 20 */ blr .global sub_8025e4f4 sub_8025e4f4: @@ -959,7 +959,7 @@ lbl_8025E540: /* 8025E540 0025B4A0 80 01 00 24 */ lwz r0, 0x24(r1) /* 8025E544 0025B4A4 7C 08 03 A6 */ mtlr r0 /* 8025E548 0025B4A8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8025E54C 0025B4AC 4E 80 00 20 */ blr +/* 8025E54C 0025B4AC 4E 80 00 20 */ blr .global sub_8025e550 sub_8025e550: @@ -995,7 +995,7 @@ lbl_8025E5B4: /* 8025E5B8 0025B518 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8025E5BC 0025B51C 7C 08 03 A6 */ mtlr r0 /* 8025E5C0 0025B520 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025E5C4 0025B524 4E 80 00 20 */ blr +/* 8025E5C4 0025B524 4E 80 00 20 */ blr .global sub_8025e5c8 sub_8025e5c8: @@ -1030,7 +1030,7 @@ lbl_8025E60C: /* 8025E630 0025B590 83 A1 00 0C */ lwz r29, 0xc(r1) /* 8025E634 0025B594 7C 08 03 A6 */ mtlr r0 /* 8025E638 0025B598 38 21 00 20 */ addi r1, r1, 0x20 -/* 8025E63C 0025B59C 4E 80 00 20 */ blr +/* 8025E63C 0025B59C 4E 80 00 20 */ blr .global sub_8025e640 sub_8025e640: @@ -1095,7 +1095,7 @@ lbl_8025E704: /* 8025E71C 0025B67C 80 01 00 34 */ lwz r0, 0x34(r1) /* 8025E720 0025B680 7C 08 03 A6 */ mtlr r0 /* 8025E724 0025B684 38 21 00 30 */ addi r1, r1, 0x30 -/* 8025E728 0025B688 4E 80 00 20 */ blr +/* 8025E728 0025B688 4E 80 00 20 */ blr .global sub_8025e72c sub_8025e72c: @@ -1114,7 +1114,7 @@ lbl_8025E754: /* 8025E754 0025B6B4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8025E758 0025B6B8 7C 08 03 A6 */ mtlr r0 /* 8025E75C 0025B6BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025E760 0025B6C0 4E 80 00 20 */ blr +/* 8025E760 0025B6C0 4E 80 00 20 */ blr .global sub_8025e764 sub_8025e764: @@ -1133,7 +1133,7 @@ lbl_8025E78C: /* 8025E78C 0025B6EC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8025E790 0025B6F0 7C 08 03 A6 */ mtlr r0 /* 8025E794 0025B6F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025E798 0025B6F8 4E 80 00 20 */ blr +/* 8025E798 0025B6F8 4E 80 00 20 */ blr .global sub_8025e79c sub_8025e79c: @@ -1211,7 +1211,7 @@ lbl_8025E87C: /* 8025E89C 0025B7FC 83 81 00 70 */ lwz r28, 0x70(r1) /* 8025E8A0 0025B800 7C 08 03 A6 */ mtlr r0 /* 8025E8A4 0025B804 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8025E8A8 0025B808 4E 80 00 20 */ blr +/* 8025E8A8 0025B808 4E 80 00 20 */ blr .global sub_8025e8ac sub_8025e8ac: @@ -1427,7 +1427,7 @@ lbl_8025EBAC: /* 8025EBC8 0025BB28 83 A1 00 F4 */ lwz r29, 0xf4(r1) /* 8025EBCC 0025BB2C 7C 08 03 A6 */ mtlr r0 /* 8025EBD0 0025BB30 38 21 01 20 */ addi r1, r1, 0x120 -/* 8025EBD4 0025BB34 4E 80 00 20 */ blr +/* 8025EBD4 0025BB34 4E 80 00 20 */ blr .global sub_8025ebd8 sub_8025ebd8: @@ -1499,7 +1499,7 @@ lbl_8025ECCC: /* 8025ECD4 0025BC34 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8025ECD8 0025BC38 7C 08 03 A6 */ mtlr r0 /* 8025ECDC 0025BC3C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8025ECE0 0025BC40 4E 80 00 20 */ blr +/* 8025ECE0 0025BC40 4E 80 00 20 */ blr .global sub_8025ece4 sub_8025ece4: @@ -1584,7 +1584,7 @@ lbl_8025EDCC: /* 8025EE18 0025BD78 83 A1 00 34 */ lwz r29, 0x34(r1) /* 8025EE1C 0025BD7C 7C 08 03 A6 */ mtlr r0 /* 8025EE20 0025BD80 38 21 00 70 */ addi r1, r1, 0x70 -/* 8025EE24 0025BD84 4E 80 00 20 */ blr +/* 8025EE24 0025BD84 4E 80 00 20 */ blr .global sub_8025ee28 sub_8025ee28: @@ -1706,7 +1706,7 @@ sub_8025ee28: /* 8025EFF4 0025BF54 B0 01 00 18 */ sth r0, 0x18(r1) /* 8025EFF8 0025BF58 81 8C 02 B0 */ lwz r12, 0x2b0(r12) /* 8025EFFC 0025BF5C 7D 89 03 A6 */ mtctr r12 -/* 8025F000 0025BF60 4E 80 04 21 */ bctrl +/* 8025F000 0025BF60 4E 80 04 21 */ bctrl /* 8025F004 0025BF64 3C 80 80 5A */ lis r4, skZero3f@ha /* 8025F008 0025BF68 7F A3 EB 78 */ mr r3, r29 /* 8025F00C 0025BF6C 39 24 66 A0 */ addi r9, r4, skZero3f@l @@ -1732,7 +1732,7 @@ lbl_8025F028: /* 8025F058 0025BFB8 83 81 00 F0 */ lwz r28, 0xf0(r1) /* 8025F05C 0025BFBC 7C 08 03 A6 */ mtlr r0 /* 8025F060 0025BFC0 38 21 01 40 */ addi r1, r1, 0x140 -/* 8025F064 0025BFC4 4E 80 00 20 */ blr +/* 8025F064 0025BFC4 4E 80 00 20 */ blr .global sub_8025f068 sub_8025f068: @@ -1790,7 +1790,7 @@ lbl_8025F118: /* 8025F120 0025C080 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8025F124 0025C084 7C 08 03 A6 */ mtlr r0 /* 8025F128 0025C088 38 21 00 20 */ addi r1, r1, 0x20 -/* 8025F12C 0025C08C 4E 80 00 20 */ blr +/* 8025F12C 0025C08C 4E 80 00 20 */ blr .global sub_8025f130 sub_8025f130: @@ -1892,7 +1892,7 @@ lbl_8025F288: /* 8025F294 0025C1F4 83 A1 00 94 */ lwz r29, 0x94(r1) /* 8025F298 0025C1F8 7C 08 03 A6 */ mtlr r0 /* 8025F29C 0025C1FC 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8025F2A0 0025C200 4E 80 00 20 */ blr +/* 8025F2A0 0025C200 4E 80 00 20 */ blr .global sub_8025f2a4 sub_8025f2a4: @@ -1958,7 +1958,7 @@ lbl_8025F384: /* 8025F38C 0025C2EC 83 C1 00 88 */ lwz r30, 0x88(r1) /* 8025F390 0025C2F0 7C 08 03 A6 */ mtlr r0 /* 8025F394 0025C2F4 38 21 00 90 */ addi r1, r1, 0x90 -/* 8025F398 0025C2F8 4E 80 00 20 */ blr +/* 8025F398 0025C2F8 4E 80 00 20 */ blr .global sub_8025f39c sub_8025f39c: @@ -2023,7 +2023,7 @@ sub_8025f39c: /* 8025F484 0025C3E4 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 8025F488 0025C3E8 7C 08 03 A6 */ mtlr r0 /* 8025F48C 0025C3EC 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 8025F490 0025C3F0 4E 80 00 20 */ blr +/* 8025F490 0025C3F0 4E 80 00 20 */ blr .global sub_8025f494 sub_8025f494: @@ -2099,7 +2099,7 @@ lbl_8025F58C: /* 8025F59C 0025C4FC 83 81 00 90 */ lwz r28, 0x90(r1) /* 8025F5A0 0025C500 7C 08 03 A6 */ mtlr r0 /* 8025F5A4 0025C504 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8025F5A8 0025C508 4E 80 00 20 */ blr +/* 8025F5A8 0025C508 4E 80 00 20 */ blr .global sub_8025f5ac sub_8025f5ac: @@ -2132,7 +2132,7 @@ lbl_8025F600: /* 8025F60C 0025C56C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8025F610 0025C570 7C 08 03 A6 */ mtlr r0 /* 8025F614 0025C574 38 21 00 20 */ addi r1, r1, 0x20 -/* 8025F618 0025C578 4E 80 00 20 */ blr +/* 8025F618 0025C578 4E 80 00 20 */ blr .global sub_8025f61c sub_8025f61c: @@ -2142,11 +2142,11 @@ sub_8025f61c: /* 8025F628 0025C588 81 83 00 00 */ lwz r12, 0(r3) /* 8025F62C 0025C58C 81 8C 00 B0 */ lwz r12, 0xb0(r12) /* 8025F630 0025C590 7D 89 03 A6 */ mtctr r12 -/* 8025F634 0025C594 4E 80 04 21 */ bctrl +/* 8025F634 0025C594 4E 80 04 21 */ bctrl /* 8025F638 0025C598 80 01 00 14 */ lwz r0, 0x14(r1) /* 8025F63C 0025C59C 7C 08 03 A6 */ mtlr r0 /* 8025F640 0025C5A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025F644 0025C5A4 4E 80 00 20 */ blr +/* 8025F644 0025C5A4 4E 80 00 20 */ blr .global sub_8025f648 sub_8025f648: @@ -2212,7 +2212,7 @@ lbl_8025F71C: /* 8025F730 0025C690 83 C1 00 48 */ lwz r30, 0x48(r1) /* 8025F734 0025C694 7C 08 03 A6 */ mtlr r0 /* 8025F738 0025C698 38 21 00 50 */ addi r1, r1, 0x50 -/* 8025F73C 0025C69C 4E 80 00 20 */ blr +/* 8025F73C 0025C69C 4E 80 00 20 */ blr .global sub_8025f740 sub_8025f740: @@ -2300,7 +2300,7 @@ lbl_8025F864: /* 8025F86C 0025C7CC 83 C1 00 38 */ lwz r30, 0x38(r1) /* 8025F870 0025C7D0 7C 08 03 A6 */ mtlr r0 /* 8025F874 0025C7D4 38 21 00 40 */ addi r1, r1, 0x40 -/* 8025F878 0025C7D8 4E 80 00 20 */ blr +/* 8025F878 0025C7D8 4E 80 00 20 */ blr .global sub_8025f87c sub_8025f87c: @@ -2426,7 +2426,7 @@ lbl_8025FA2C: /* 8025FA3C 0025C99C 83 81 00 B0 */ lwz r28, 0xb0(r1) /* 8025FA40 0025C9A0 7C 08 03 A6 */ mtlr r0 /* 8025FA44 0025C9A4 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 8025FA48 0025C9A8 4E 80 00 20 */ blr +/* 8025FA48 0025C9A8 4E 80 00 20 */ blr .global sub_8025fa4c sub_8025fa4c: @@ -2484,7 +2484,7 @@ sub_8025fa4c: /* 8025FB18 0025CA78 83 C1 00 38 */ lwz r30, 0x38(r1) /* 8025FB1C 0025CA7C 7C 08 03 A6 */ mtlr r0 /* 8025FB20 0025CA80 38 21 00 50 */ addi r1, r1, 0x50 -/* 8025FB24 0025CA84 4E 80 00 20 */ blr +/* 8025FB24 0025CA84 4E 80 00 20 */ blr .global sub_8025fb28 sub_8025fb28: @@ -2564,7 +2564,7 @@ lbl_8025FC38: /* 8025FC48 0025CBA8 83 C1 00 A8 */ lwz r30, 0xa8(r1) /* 8025FC4C 0025CBAC 7C 08 03 A6 */ mtlr r0 /* 8025FC50 0025CBB0 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 8025FC54 0025CBB4 4E 80 00 20 */ blr +/* 8025FC54 0025CBB4 4E 80 00 20 */ blr .global sub_8025fc58 sub_8025fc58: @@ -2662,7 +2662,7 @@ lbl_8025FDA8: /* 8025FDBC 0025CD1C 83 A1 00 A4 */ lwz r29, 0xa4(r1) /* 8025FDC0 0025CD20 7C 08 03 A6 */ mtlr r0 /* 8025FDC4 0025CD24 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 8025FDC8 0025CD28 4E 80 00 20 */ blr +/* 8025FDC8 0025CD28 4E 80 00 20 */ blr .global sub_8025fdcc sub_8025fdcc: @@ -2700,7 +2700,7 @@ lbl_8025FE38: /* 8025FE3C 0025CD9C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8025FE40 0025CDA0 7C 08 03 A6 */ mtlr r0 /* 8025FE44 0025CDA4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025FE48 0025CDA8 4E 80 00 20 */ blr +/* 8025FE48 0025CDA8 4E 80 00 20 */ blr .global sub_8025fe4c sub_8025fe4c: @@ -2744,7 +2744,7 @@ lbl_8025FEC8: /* 8025FECC 0025CE2C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8025FED0 0025CE30 7C 08 03 A6 */ mtlr r0 /* 8025FED4 0025CE34 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025FED8 0025CE38 4E 80 00 20 */ blr +/* 8025FED8 0025CE38 4E 80 00 20 */ blr .global sub_8025fedc sub_8025fedc: @@ -2790,7 +2790,7 @@ lbl_8025FF68: /* 8025FF6C 0025CECC 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8025FF70 0025CED0 7C 08 03 A6 */ mtlr r0 /* 8025FF74 0025CED4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8025FF78 0025CED8 4E 80 00 20 */ blr +/* 8025FF78 0025CED8 4E 80 00 20 */ blr .global sub_8025ff7c sub_8025ff7c: @@ -2837,7 +2837,7 @@ lbl_80260008: /* 80260014 0025CF74 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 80260018 0025CF78 7C 08 03 A6 */ mtlr r0 /* 8026001C 0025CF7C 38 21 00 40 */ addi r1, r1, 0x40 -/* 80260020 0025CF80 4E 80 00 20 */ blr +/* 80260020 0025CF80 4E 80 00 20 */ blr .global sub_80260024 sub_80260024: @@ -2881,7 +2881,7 @@ sub_80260024: /* 802600B8 0025D018 83 C1 00 48 */ lwz r30, 0x48(r1) /* 802600BC 0025D01C 7C 08 03 A6 */ mtlr r0 /* 802600C0 0025D020 38 21 00 60 */ addi r1, r1, 0x60 -/* 802600C4 0025D024 4E 80 00 20 */ blr +/* 802600C4 0025D024 4E 80 00 20 */ blr .global sub_802600c8 sub_802600c8: @@ -2930,7 +2930,7 @@ sub_802600c8: /* 80260170 0025D0D0 83 C1 00 78 */ lwz r30, 0x78(r1) /* 80260174 0025D0D4 7C 08 03 A6 */ mtlr r0 /* 80260178 0025D0D8 38 21 00 90 */ addi r1, r1, 0x90 -/* 8026017C 0025D0DC 4E 80 00 20 */ blr +/* 8026017C 0025D0DC 4E 80 00 20 */ blr .global sub_80260180 sub_80260180: @@ -3146,7 +3146,7 @@ lbl_8026048C: /* 802604B0 0025D410 80 01 01 94 */ lwz r0, 0x194(r1) /* 802604B4 0025D414 7C 08 03 A6 */ mtlr r0 /* 802604B8 0025D418 38 21 01 90 */ addi r1, r1, 0x190 -/* 802604BC 0025D41C 4E 80 00 20 */ blr +/* 802604BC 0025D41C 4E 80 00 20 */ blr .global sub_802604c0 sub_802604c0: @@ -3182,7 +3182,7 @@ sub_802604c0: /* 80260534 0025D494 81 84 00 00 */ lwz r12, 0(r4) /* 80260538 0025D498 81 8C 00 40 */ lwz r12, 0x40(r12) /* 8026053C 0025D49C 7D 89 03 A6 */ mtctr r12 -/* 80260540 0025D4A0 4E 80 04 21 */ bctrl +/* 80260540 0025D4A0 4E 80 04 21 */ bctrl /* 80260544 0025D4A4 38 81 00 14 */ addi r4, r1, 0x14 /* 80260548 0025D4A8 7F C3 F3 78 */ mr r3, r30 /* 8026054C 0025D4AC 7C 85 23 78 */ mr r5, r4 @@ -3200,7 +3200,7 @@ lbl_8026056C: /* 80260574 0025D4D4 83 C1 00 48 */ lwz r30, 0x48(r1) /* 80260578 0025D4D8 7C 08 03 A6 */ mtlr r0 /* 8026057C 0025D4DC 38 21 00 50 */ addi r1, r1, 0x50 -/* 80260580 0025D4E0 4E 80 00 20 */ blr +/* 80260580 0025D4E0 4E 80 00 20 */ blr .global sub_80260584 sub_80260584: @@ -3265,7 +3265,7 @@ lbl_80260658: /* 80260664 0025D5C4 83 A1 00 54 */ lwz r29, 0x54(r1) /* 80260668 0025D5C8 7C 08 03 A6 */ mtlr r0 /* 8026066C 0025D5CC 38 21 00 60 */ addi r1, r1, 0x60 -/* 80260670 0025D5D0 4E 80 00 20 */ blr +/* 80260670 0025D5D0 4E 80 00 20 */ blr .global sub_80260674 sub_80260674: @@ -3317,7 +3317,7 @@ lbl_80260714: /* 8026071C 0025D67C 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80260720 0025D680 7C 08 03 A6 */ mtlr r0 /* 80260724 0025D684 38 21 00 30 */ addi r1, r1, 0x30 -/* 80260728 0025D688 4E 80 00 20 */ blr +/* 80260728 0025D688 4E 80 00 20 */ blr .global Think__9CTryclopsFfR13CStateManager Think__9CTryclopsFfR13CStateManager: @@ -3375,7 +3375,7 @@ lbl_802607D8: /* 802607EC 0025D74C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 802607F0 0025D750 7C 08 03 A6 */ mtlr r0 /* 802607F4 0025D754 38 21 00 30 */ addi r1, r1, 0x30 -/* 802607F8 0025D758 4E 80 00 20 */ blr +/* 802607F8 0025D758 4E 80 00 20 */ blr .global sub_802607fc sub_802607fc: @@ -3423,7 +3423,7 @@ lbl_80260890: /* 80260898 0025D7F8 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8026089C 0025D7FC 7C 08 03 A6 */ mtlr r0 /* 802608A0 0025D800 38 21 00 20 */ addi r1, r1, 0x20 -/* 802608A4 0025D804 4E 80 00 20 */ blr +/* 802608A4 0025D804 4E 80 00 20 */ blr .global sub_802608a8 sub_802608a8: @@ -3651,7 +3651,7 @@ lbl_80260BBC: /* 80260BE0 0025DB40 80 01 08 F4 */ lwz r0, 0x8f4(r1) /* 80260BE4 0025DB44 7C 08 03 A6 */ mtlr r0 /* 80260BE8 0025DB48 38 21 08 F0 */ addi r1, r1, 0x8f0 -/* 80260BEC 0025DB4C 4E 80 00 20 */ blr +/* 80260BEC 0025DB4C 4E 80 00 20 */ blr .global sub_80260bf0 sub_80260bf0: @@ -3702,7 +3702,7 @@ lbl_80260C84: /* 80260C90 0025DBF0 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80260C94 0025DBF4 7C 08 03 A6 */ mtlr r0 /* 80260C98 0025DBF8 38 21 00 30 */ addi r1, r1, 0x30 -/* 80260C9C 0025DBFC 4E 80 00 20 */ blr +/* 80260C9C 0025DBFC 4E 80 00 20 */ blr .global __dt__9CTryclopsFv __dt__9CTryclopsFv: @@ -3761,7 +3761,7 @@ lbl_80260D4C: /* 80260D58 0025DCB8 83 C1 00 08 */ lwz r30, 8(r1) /* 80260D5C 0025DCBC 7C 08 03 A6 */ mtlr r0 /* 80260D60 0025DCC0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80260D64 0025DCC4 4E 80 00 20 */ blr +/* 80260D64 0025DCC4 4E 80 00 20 */ blr .global __ct__9CTryclops __ct__9CTryclops: @@ -3874,7 +3874,7 @@ __ct__9CTryclops: /* 80260F10 0025DE70 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80260F14 0025DE74 7C 08 03 A6 */ mtlr r0 /* 80260F18 0025DE78 38 21 00 70 */ addi r1, r1, 0x70 -/* 80260F1C 0025DE7C 4E 80 00 20 */ blr +/* 80260F1C 0025DE7C 4E 80 00 20 */ blr .global __sinit_CTryclops_cpp __sinit_CTryclops_cpp: diff --git a/asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s b/asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s index 3cf11f08..fbe23a2e 100644 --- a/asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s +++ b/asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s @@ -142,13 +142,13 @@ lbl_805AF468: .global lbl_805AF46C lbl_805AF46C: .skip 0x4 - + .section .bss .global lbl_8046C938 lbl_8046C938: .skip 0x18 - + .section .text, "ax" .global UpdateEffects__17CWallCrawlerSwarmFR13CStateManagerR9CAnimData @@ -289,7 +289,7 @@ lbl_801E7734: /* 801E7750 001E46B0 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 801E7754 001E46B4 7C 08 03 A6 */ mtlr r0 /* 801E7758 001E46B8 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 801E775C 001E46BC 4E 80 00 20 */ blr +/* 801E775C 001E46BC 4E 80 00 20 */ blr .global FindClosestCell__17CWallCrawlerSwarmCFRC9CVector3f FindClosestCell__17CWallCrawlerSwarmCFRC9CVector3f: @@ -407,7 +407,7 @@ lbl_801E78A4: /* 801E790C 001E486C 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 801E7910 001E4870 7C 08 03 A6 */ mtlr r0 /* 801E7914 001E4874 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 801E7918 001E4878 4E 80 00 20 */ blr +/* 801E7918 001E4878 4E 80 00 20 */ blr .global FreezeCollision__17CWallCrawlerSwarmFRC11CMarkerGridf FreezeCollision__17CWallCrawlerSwarmFRC11CMarkerGridf: @@ -499,7 +499,7 @@ lbl_801E7A30: /* 801E7A64 001E49C4 83 A1 00 74 */ lwz r29, 0x74(r1) /* 801E7A68 001E49C8 7C 08 03 A6 */ mtlr r0 /* 801E7A6C 001E49CC 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 801E7A70 001E49D0 4E 80 00 20 */ blr +/* 801E7A70 001E49D0 4E 80 00 20 */ blr .global RenderParticles__17CWallCrawlerSwarmCFv RenderParticles__17CWallCrawlerSwarmCFv: @@ -519,7 +519,7 @@ lbl_801E7A9C: /* 801E7AA4 001E4A04 81 83 00 00 */ lwz r12, 0(r3) /* 801E7AA8 001E4A08 81 8C 00 34 */ lwz r12, 0x34(r12) /* 801E7AAC 001E4A0C 7D 89 03 A6 */ mtctr r12 -/* 801E7AB0 001E4A10 4E 80 04 21 */ bctrl +/* 801E7AB0 001E4A10 4E 80 04 21 */ bctrl /* 801E7AB4 001E4A14 3B FF 00 08 */ addi r31, r31, 8 /* 801E7AB8 001E4A18 3B DE 00 01 */ addi r30, r30, 1 lbl_801E7ABC: @@ -532,7 +532,7 @@ lbl_801E7ABC: /* 801E7AD4 001E4A34 83 A1 00 14 */ lwz r29, 0x14(r1) /* 801E7AD8 001E4A38 7C 08 03 A6 */ mtlr r0 /* 801E7ADC 001E4A3C 38 21 00 20 */ addi r1, r1, 0x20 -/* 801E7AE0 001E4A40 4E 80 00 20 */ blr +/* 801E7AE0 001E4A40 4E 80 00 20 */ blr .global UpdateParticles__17CWallCrawlerSwarmFf UpdateParticles__17CWallCrawlerSwarmFf: @@ -554,7 +554,7 @@ lbl_801E7B14: /* 801E7B1C 001E4A7C 81 83 00 00 */ lwz r12, 0(r3) /* 801E7B20 001E4A80 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801E7B24 001E4A84 7D 89 03 A6 */ mtctr r12 -/* 801E7B28 001E4A88 4E 80 04 21 */ bctrl +/* 801E7B28 001E4A88 4E 80 04 21 */ bctrl /* 801E7B2C 001E4A8C 3B FF 00 08 */ addi r31, r31, 8 /* 801E7B30 001E4A90 3B DE 00 01 */ addi r30, r30, 1 lbl_801E7B34: @@ -568,7 +568,7 @@ lbl_801E7B34: /* 801E7B50 001E4AB0 83 A1 00 0C */ lwz r29, 0xc(r1) /* 801E7B54 001E4AB4 7C 08 03 A6 */ mtlr r0 /* 801E7B58 001E4AB8 38 21 00 20 */ addi r1, r1, 0x20 -/* 801E7B5C 001E4ABC 4E 80 00 20 */ blr +/* 801E7B5C 001E4ABC 4E 80 00 20 */ blr .global AddParticle__17CWallCrawlerSwarmFRC12CTransform4f AddParticle__17CWallCrawlerSwarmFRC12CTransform4f: @@ -589,7 +589,7 @@ lbl_801E7B8C: /* 801E7B94 001E4AF4 81 83 00 00 */ lwz r12, 0(r3) /* 801E7B98 001E4AF8 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 801E7B9C 001E4AFC 7D 89 03 A6 */ mtctr r12 -/* 801E7BA0 001E4B00 4E 80 04 21 */ bctrl +/* 801E7BA0 001E4B00 4E 80 04 21 */ bctrl /* 801E7BA4 001E4B04 C0 5C 00 2C */ lfs f2, 0x2c(r28) /* 801E7BA8 001E4B08 38 81 00 08 */ addi r4, r1, 8 /* 801E7BAC 001E4B0C C0 3C 00 1C */ lfs f1, 0x1c(r28) @@ -601,7 +601,7 @@ lbl_801E7B8C: /* 801E7BC4 001E4B24 81 83 00 00 */ lwz r12, 0(r3) /* 801E7BC8 001E4B28 81 8C 00 18 */ lwz r12, 0x18(r12) /* 801E7BCC 001E4B2C 7D 89 03 A6 */ mtctr r12 -/* 801E7BD0 001E4B30 4E 80 04 21 */ bctrl +/* 801E7BD0 001E4B30 4E 80 04 21 */ bctrl /* 801E7BD4 001E4B34 80 7F 00 04 */ lwz r3, 4(r31) /* 801E7BD8 001E4B38 80 9E 00 00 */ lwz r4, 0(r30) /* 801E7BDC 001E4B3C 48 13 4C E5 */ bl ForceParticleCreation__11CElementGenFi @@ -610,7 +610,7 @@ lbl_801E7B8C: /* 801E7BE8 001E4B48 81 83 00 00 */ lwz r12, 0(r3) /* 801E7BEC 001E4B4C 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 801E7BF0 001E4B50 7D 89 03 A6 */ mtctr r12 -/* 801E7BF4 001E4B54 4E 80 04 21 */ bctrl +/* 801E7BF4 001E4B54 4E 80 04 21 */ bctrl /* 801E7BF8 001E4B58 3B FF 00 08 */ addi r31, r31, 8 /* 801E7BFC 001E4B5C 3B DE 00 04 */ addi r30, r30, 4 /* 801E7C00 001E4B60 3B BD 00 01 */ addi r29, r29, 1 @@ -622,7 +622,7 @@ lbl_801E7C04: /* 801E7C14 001E4B74 80 01 00 34 */ lwz r0, 0x34(r1) /* 801E7C18 001E4B78 7C 08 03 A6 */ mtlr r0 /* 801E7C1C 001E4B7C 38 21 00 30 */ addi r1, r1, 0x30 -/* 801E7C20 001E4B80 4E 80 00 20 */ blr +/* 801E7C20 001E4B80 4E 80 00 20 */ blr .global KillBoid__17CWallCrawlerSwarmFRQ217CWallCrawlerSwarm5CBoidR13CStateManagerff KillBoid__17CWallCrawlerSwarmFRQ217CWallCrawlerSwarm5CBoidR13CStateManagerff: @@ -687,7 +687,7 @@ lbl_801E7CE0: /* 801E7D04 001E4C64 83 A1 00 14 */ lwz r29, 0x14(r1) /* 801E7D08 001E4C68 7C 08 03 A6 */ mtlr r0 /* 801E7D0C 001E4C6C 38 21 00 50 */ addi r1, r1, 0x50 -/* 801E7D10 001E4C70 4E 80 00 20 */ blr +/* 801E7D10 001E4C70 4E 80 00 20 */ blr .global sub_801e7d14 sub_801e7d14: @@ -700,7 +700,7 @@ sub_801e7d14: /* 801E7D2C 001E4C8C D0 03 00 04 */ stfs f0, 4(r3) /* 801E7D30 001E4C90 C0 04 01 2C */ lfs f0, 0x12c(r4) /* 801E7D34 001E4C94 D0 03 00 08 */ stfs f0, 8(r3) -/* 801E7D38 001E4C98 4E 80 00 20 */ blr +/* 801E7D38 001E4C98 4E 80 00 20 */ blr lbl_801E7D3C: /* 801E7D3C 001E4C9C 1C 00 00 84 */ mulli r0, r0, 0x84 /* 801E7D40 001E4CA0 80 A4 01 14 */ lwz r5, 0x114(r4) @@ -717,7 +717,7 @@ lbl_801E7D3C: /* 801E7D6C 001E4CCC D0 03 00 04 */ stfs f0, 4(r3) /* 801E7D70 001E4CD0 C0 04 01 2C */ lfs f0, 0x12c(r4) /* 801E7D74 001E4CD4 D0 03 00 08 */ stfs f0, 8(r3) -/* 801E7D78 001E4CD8 4E 80 00 20 */ blr +/* 801E7D78 001E4CD8 4E 80 00 20 */ blr .global sub_801e7d7c sub_801e7d7c: @@ -730,7 +730,7 @@ sub_801e7d7c: /* 801E7D94 001E4CF4 D0 03 00 04 */ stfs f0, 4(r3) /* 801E7D98 001E4CF8 C0 04 01 2C */ lfs f0, 0x12c(r4) /* 801E7D9C 001E4CFC D0 03 00 08 */ stfs f0, 8(r3) -/* 801E7DA0 001E4D00 4E 80 00 20 */ blr +/* 801E7DA0 001E4D00 4E 80 00 20 */ blr lbl_801E7DA4: /* 801E7DA4 001E4D04 1C A0 00 84 */ mulli r5, r0, 0x84 /* 801E7DA8 001E4D08 80 04 01 14 */ lwz r0, 0x114(r4) @@ -751,7 +751,7 @@ lbl_801E7DA4: /* 801E7DE4 001E4D44 D0 03 00 00 */ stfs f0, 0(r3) /* 801E7DE8 001E4D48 D0 43 00 04 */ stfs f2, 4(r3) /* 801E7DEC 001E4D4C D0 23 00 08 */ stfs f1, 8(r3) -/* 801E7DF0 001E4D50 4E 80 00 20 */ blr +/* 801E7DF0 001E4D50 4E 80 00 20 */ blr .global sub_801e7df4 sub_801e7df4: @@ -932,7 +932,7 @@ lbl_801E805C: /* 801E8094 001E4FF4 83 81 00 E0 */ lwz r28, 0xe0(r1) /* 801E8098 001E4FF8 7C 08 03 A6 */ mtlr r0 /* 801E809C 001E4FFC 38 21 01 40 */ addi r1, r1, 0x140 -/* 801E80A0 001E5000 4E 80 00 20 */ blr +/* 801E80A0 001E5000 4E 80 00 20 */ blr .global sub_801e80a4 sub_801e80a4: @@ -981,7 +981,7 @@ sub_801e80a4: /* 801E814C 001E50AC 83 A1 00 44 */ lwz r29, 0x44(r1) /* 801E8150 001E50B0 7C 08 03 A6 */ mtlr r0 /* 801E8154 001E50B4 38 21 00 50 */ addi r1, r1, 0x50 -/* 801E8158 001E50B8 4E 80 00 20 */ blr +/* 801E8158 001E50B8 4E 80 00 20 */ blr .global sub_801e815c sub_801e815c: @@ -1040,7 +1040,7 @@ lbl_801E820C: /* 801E821C 001E517C 7C 06 00 40 */ cmplw r6, r0 /* 801E8220 001E5180 40 82 FF 50 */ bne lbl_801E8170 /* 801E8224 001E5184 38 21 00 20 */ addi r1, r1, 0x20 -/* 801E8228 001E5188 4E 80 00 20 */ blr +/* 801E8228 001E5188 4E 80 00 20 */ blr .global Touch__17CWallCrawlerSwarmFR6CActorR13CStateManager Touch__17CWallCrawlerSwarmFR6CActorR13CStateManager: @@ -1074,7 +1074,7 @@ Touch__17CWallCrawlerSwarmFR6CActorR13CStateManager: /* 801E8298 001E51F8 81 9A 00 00 */ lwz r12, 0(r26) /* 801E829C 001E51FC 81 8C 00 40 */ lwz r12, 0x40(r12) /* 801E82A0 001E5200 7D 89 03 A6 */ mtctr r12 -/* 801E82A4 001E5204 4E 80 04 21 */ bctrl +/* 801E82A4 001E5204 4E 80 04 21 */ bctrl /* 801E82A8 001E5208 88 01 01 88 */ lbz r0, 0x188(r1) /* 801E82AC 001E520C 28 00 00 00 */ cmplwi r0, 0 /* 801E82B0 001E5210 98 01 02 1C */ stb r0, 0x21c(r1) @@ -1195,7 +1195,7 @@ lbl_801E8458: /* 801E8460 001E53C0 81 9F 00 00 */ lwz r12, 0(r31) /* 801E8464 001E53C4 81 8C 00 40 */ lwz r12, 0x40(r12) /* 801E8468 001E53C8 7D 89 03 A6 */ mtctr r12 -/* 801E846C 001E53CC 4E 80 04 21 */ bctrl +/* 801E846C 001E53CC 4E 80 04 21 */ bctrl /* 801E8470 001E53D0 C0 A1 01 54 */ lfs f5, 0x154(r1) /* 801E8474 001E53D4 38 00 00 00 */ li r0, 0 /* 801E8478 001E53D8 C0 81 01 58 */ lfs f4, 0x158(r1) @@ -1458,7 +1458,7 @@ lbl_801E884C: /* 801E8860 001E57C0 80 01 02 64 */ lwz r0, 0x264(r1) /* 801E8864 001E57C4 7C 08 03 A6 */ mtlr r0 /* 801E8868 001E57C8 38 21 02 60 */ addi r1, r1, 0x260 -/* 801E886C 001E57CC 4E 80 00 20 */ blr +/* 801E886C 001E57CC 4E 80 00 20 */ blr .global ApplyRadiusDamage__17CWallCrawlerSwarmF9CVector3ffR13CStateManager ApplyRadiusDamage__17CWallCrawlerSwarmF9CVector3ffR13CStateManager: @@ -1531,7 +1531,7 @@ lbl_801E8948: /* 801E896C 001E58CC 80 01 00 44 */ lwz r0, 0x44(r1) /* 801E8970 001E58D0 7C 08 03 A6 */ mtlr r0 /* 801E8974 001E58D4 38 21 00 40 */ addi r1, r1, 0x40 -/* 801E8978 001E58D8 4E 80 00 20 */ blr +/* 801E8978 001E58D8 4E 80 00 20 */ blr .global GetWaypointForState__17CWallCrawlerSwarmF18EScriptObjectStateR13CStateManager GetWaypointForState__17CWallCrawlerSwarmF18EScriptObjectStateR13CStateManager: @@ -1572,7 +1572,7 @@ lbl_801E89F0: /* 801E89F4 001E5954 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801E89F8 001E5958 7C 08 03 A6 */ mtlr r0 /* 801E89FC 001E595C 38 21 00 20 */ addi r1, r1, 0x20 -/* 801E8A00 001E5960 4E 80 00 20 */ blr +/* 801E8A00 001E5960 4E 80 00 20 */ blr .global MoveToWayPoint__17CWallCrawlerSwarmFRQ217CWallCrawlerSwarm5CBoidR13CStateManagerR9CVector3f MoveToWayPoint__17CWallCrawlerSwarmFRQ217CWallCrawlerSwarm5CBoidR13CStateManagerR9CVector3f: @@ -1697,7 +1697,7 @@ lbl_801E8BC0: /* 801E8BCC 001E5B2C 80 01 00 94 */ lwz r0, 0x94(r1) /* 801E8BD0 001E5B30 7C 08 03 A6 */ mtlr r0 /* 801E8BD4 001E5B34 38 21 00 90 */ addi r1, r1, 0x90 -/* 801E8BD8 001E5B38 4E 80 00 20 */ blr +/* 801E8BD8 001E5B38 4E 80 00 20 */ blr .global "ApplyAlignment__17CWallCrawlerSwarmFRQ217CWallCrawlerSwarm5CBoidRCQ24rstl48reserved_vectorR9CVector3f" "ApplyAlignment__17CWallCrawlerSwarmFRQ217CWallCrawlerSwarm5CBoidRCQ24rstl48reserved_vectorR9CVector3f": @@ -1793,7 +1793,7 @@ lbl_801E8D2C: /* 801E8D34 001E5C94 83 C1 00 28 */ lwz r30, 0x28(r1) /* 801E8D38 001E5C98 7C 08 03 A6 */ mtlr r0 /* 801E8D3C 001E5C9C 38 21 00 30 */ addi r1, r1, 0x30 -/* 801E8D40 001E5CA0 4E 80 00 20 */ blr +/* 801E8D40 001E5CA0 4E 80 00 20 */ blr .global ApplyAttraction__17CWallCrawlerSwarmFRQ217CWallCrawlerSwarm5CBoidRC9CVector3fffR9CVector3f ApplyAttraction__17CWallCrawlerSwarmFRQ217CWallCrawlerSwarm5CBoidRC9CVector3fffR9CVector3f: @@ -1872,7 +1872,7 @@ lbl_801E8E44: /* 801E8E58 001E5DB8 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 801E8E5C 001E5DBC 7C 08 03 A6 */ mtlr r0 /* 801E8E60 001E5DC0 38 21 00 50 */ addi r1, r1, 0x50 -/* 801E8E64 001E5DC4 4E 80 00 20 */ blr +/* 801E8E64 001E5DC4 4E 80 00 20 */ blr .global ApplyCohesion__17CWallCrawlerSwarmFRQ217CWallCrawlerSwarm5CBoidRC9CVector3fffR9CVector3f ApplyCohesion__17CWallCrawlerSwarmFRQ217CWallCrawlerSwarm5CBoidRC9CVector3fffR9CVector3f: @@ -1949,7 +1949,7 @@ lbl_801E8F60: /* 801E8F74 001E5ED4 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 801E8F78 001E5ED8 7C 08 03 A6 */ mtlr r0 /* 801E8F7C 001E5EDC 38 21 00 50 */ addi r1, r1, 0x50 -/* 801E8F80 001E5EE0 4E 80 00 20 */ blr +/* 801E8F80 001E5EE0 4E 80 00 20 */ blr .global "ApplyCohesion__17CWallCrawlerSwarmFRQ217CWallCrawlerSwarm5CBoidRCQ24rstl48reserved_vectorR9CVector3f" "ApplyCohesion__17CWallCrawlerSwarmFRQ217CWallCrawlerSwarm5CBoidRCQ24rstl48reserved_vectorR9CVector3f": @@ -2013,7 +2013,7 @@ lbl_801E905C: /* 801E905C 001E5FBC 80 01 00 24 */ lwz r0, 0x24(r1) /* 801E9060 001E5FC0 7C 08 03 A6 */ mtlr r0 /* 801E9064 001E5FC4 38 21 00 20 */ addi r1, r1, 0x20 -/* 801E9068 001E5FC8 4E 80 00 20 */ blr +/* 801E9068 001E5FC8 4E 80 00 20 */ blr .global ApplySeparation__17CWallCrawlerSwarmFRQ217CWallCrawlerSwarm5CBoidRC9CVector3fffR9CVector3f ApplySeparation__17CWallCrawlerSwarmFRQ217CWallCrawlerSwarm5CBoidRC9CVector3fffR9CVector3f: @@ -2088,7 +2088,7 @@ lbl_801E9164: /* 801E9178 001E60D8 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 801E917C 001E60DC 7C 08 03 A6 */ mtlr r0 /* 801E9180 001E60E0 38 21 00 50 */ addi r1, r1, 0x50 -/* 801E9184 001E60E4 4E 80 00 20 */ blr +/* 801E9184 001E60E4 4E 80 00 20 */ blr .global "ApplySeparation__17CWallCrawlerSwarmFRQ217CWallCrawlerSwarm5CBoidRCQ24rstl48reserved_vectorR9CVector3f" "ApplySeparation__17CWallCrawlerSwarmFRQ217CWallCrawlerSwarm5CBoidRCQ24rstl48reserved_vectorR9CVector3f": @@ -2144,7 +2144,7 @@ lbl_801E923C: /* 801E923C 001E619C 80 01 00 24 */ lwz r0, 0x24(r1) /* 801E9240 001E61A0 7C 08 03 A6 */ mtlr r0 /* 801E9244 001E61A4 38 21 00 20 */ addi r1, r1, 0x20 -/* 801E9248 001E61A8 4E 80 00 20 */ blr +/* 801E9248 001E61A8 4E 80 00 20 */ blr .global "BuildBoidNearList__17CWallCrawlerSwarmFRCQ217CWallCrawlerSwarm5CBoidfRQ24rstl48reserved_vector" "BuildBoidNearList__17CWallCrawlerSwarmFRCQ217CWallCrawlerSwarm5CBoidfRQ24rstl48reserved_vector": @@ -2219,7 +2219,7 @@ lbl_801E9338: /* 801E9348 001E62A8 83 C1 00 38 */ lwz r30, 0x38(r1) /* 801E934C 001E62AC 7C 08 03 A6 */ mtlr r0 /* 801E9350 001E62B0 38 21 00 50 */ addi r1, r1, 0x50 -/* 801E9354 001E62B4 4E 80 00 20 */ blr +/* 801E9354 001E62B4 4E 80 00 20 */ blr .global Render__17CWallCrawlerSwarmCFRC13CStateManager Render__17CWallCrawlerSwarmCFRC13CStateManager: @@ -2247,7 +2247,7 @@ Render__17CWallCrawlerSwarmCFRC13CStateManager: /* 801E93AC 001E630C 81 83 00 00 */ lwz r12, 0(r3) /* 801E93B0 001E6310 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 801E93B4 001E6314 7D 89 03 A6 */ mtctr r12 -/* 801E93B8 001E6318 4E 80 04 21 */ bctrl +/* 801E93B8 001E6318 4E 80 04 21 */ bctrl lbl_801E93BC: /* 801E93BC 001E631C C0 22 AD B4 */ lfs f1, lbl_805ACAD4@sda21(r2) /* 801E93C0 001E6320 38 80 00 00 */ li r4, 0 @@ -2522,7 +2522,7 @@ lbl_801E978C: /* 801E97A4 001E6704 80 01 00 F4 */ lwz r0, 0xf4(r1) /* 801E97A8 001E6708 7C 08 03 A6 */ mtlr r0 /* 801E97AC 001E670C 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 801E97B0 001E6710 4E 80 00 20 */ blr +/* 801E97B0 001E6710 4E 80 00 20 */ blr .global AddToRenderer__17CWallCrawlerSwarmCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__17CWallCrawlerSwarmCFRC14CFrustumPlanesRC13CStateManager: @@ -2545,7 +2545,7 @@ AddToRenderer__17CWallCrawlerSwarmCFRC14CFrustumPlanesRC13CStateManager: /* 801E97F4 001E6754 81 9E 00 00 */ lwz r12, 0(r30) /* 801E97F8 001E6758 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 801E97FC 001E675C 7D 89 03 A6 */ mtctr r12 -/* 801E9800 001E6760 4E 80 04 21 */ bctrl +/* 801E9800 001E6760 4E 80 04 21 */ bctrl /* 801E9804 001E6764 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801E9808 001E6768 41 82 00 20 */ beq lbl_801E9828 /* 801E980C 001E676C 7F C3 F3 78 */ mr r3, r30 @@ -2553,7 +2553,7 @@ AddToRenderer__17CWallCrawlerSwarmCFRC14CFrustumPlanesRC13CStateManager: /* 801E9814 001E6774 81 9E 00 00 */ lwz r12, 0(r30) /* 801E9818 001E6778 81 8C 00 28 */ lwz r12, 0x28(r12) /* 801E981C 001E677C 7D 89 03 A6 */ mtctr r12 -/* 801E9820 001E6780 4E 80 04 21 */ bctrl +/* 801E9820 001E6780 4E 80 04 21 */ bctrl /* 801E9824 001E6784 48 00 00 10 */ b lbl_801E9834 lbl_801E9828: /* 801E9828 001E6788 7F C3 F3 78 */ mr r3, r30 @@ -2565,7 +2565,7 @@ lbl_801E9834: /* 801E983C 001E679C 83 C1 00 08 */ lwz r30, 8(r1) /* 801E9840 001E67A0 7C 08 03 A6 */ mtlr r0 /* 801E9844 001E67A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801E9848 001E67A8 4E 80 00 20 */ blr +/* 801E9848 001E67A8 4E 80 00 20 */ blr .global RenderBoid__17CWallCrawlerSwarmCFPQ217CWallCrawlerSwarm5CBoidPb RenderBoid__17CWallCrawlerSwarmCFPQ217CWallCrawlerSwarm5CBoidPb: @@ -2637,13 +2637,13 @@ lbl_801E9934: /* 801E993C 001E689C 81 83 00 00 */ lwz r12, 0(r3) /* 801E9940 001E68A0 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 801E9944 001E68A4 7D 89 03 A6 */ mtctr r12 -/* 801E9948 001E68A8 4E 80 04 21 */ bctrl +/* 801E9948 001E68A8 4E 80 04 21 */ bctrl /* 801E994C 001E68AC 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 801E9950 001E68B0 7E E4 BB 78 */ mr r4, r23 /* 801E9954 001E68B4 81 83 00 00 */ lwz r12, 0(r3) /* 801E9958 001E68B8 81 8C 00 30 */ lwz r12, 0x30(r12) /* 801E995C 001E68BC 7D 89 03 A6 */ mtctr r12 -/* 801E9960 001E68C0 4E 80 04 21 */ bctrl +/* 801E9960 001E68C0 4E 80 04 21 */ bctrl /* 801E9964 001E68C4 C3 F7 00 48 */ lfs f31, 0x48(r23) /* 801E9968 001E68C8 57 A0 18 38 */ slwi r0, r29, 3 /* 801E996C 001E68CC C0 02 AD A0 */ lfs f0, lbl_805ACAC0@sda21(r2) @@ -2680,7 +2680,7 @@ lbl_801E9934: /* 801E99E8 001E6948 81 83 00 00 */ lwz r12, 0(r3) /* 801E99EC 001E694C 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 801E99F0 001E6950 7D 89 03 A6 */ mtctr r12 -/* 801E99F4 001E6954 4E 80 04 21 */ bctrl +/* 801E99F4 001E6954 4E 80 04 21 */ bctrl /* 801E99F8 001E6958 C0 22 AD B4 */ lfs f1, lbl_805ACAD4@sda21(r2) /* 801E99FC 001E695C 38 00 00 00 */ li r0, 0 /* 801E9A00 001E6960 82 DF 00 EC */ lwz r22, 0xec(r31) @@ -2769,12 +2769,12 @@ lbl_801E9B30: /* 801E9B40 001E6AA0 80 01 01 14 */ lwz r0, 0x114(r1) /* 801E9B44 001E6AA4 7C 08 03 A6 */ mtlr r0 /* 801E9B48 001E6AA8 38 21 01 10 */ addi r1, r1, 0x110 -/* 801E9B4C 001E6AAC 4E 80 00 20 */ blr +/* 801E9B4C 001E6AAC 4E 80 00 20 */ blr .global CanRenderUnsorted__17CWallCrawlerSwarmCFRC13CStateManager CanRenderUnsorted__17CWallCrawlerSwarmCFRC13CStateManager: /* 801E9B50 001E6AB0 38 60 00 01 */ li r3, 1 -/* 801E9B54 001E6AB4 4E 80 00 20 */ blr +/* 801E9B54 001E6AB4 4E 80 00 20 */ blr .global SoftwareLight__17CWallCrawlerSwarmCFRC13CStateManagerRC6CAABox SoftwareLight__17CWallCrawlerSwarmCFRC13CStateManagerRC6CAABox: @@ -2935,7 +2935,7 @@ lbl_801E9D54: /* 801E9DB0 001E6D10 83 81 03 30 */ lwz r28, 0x330(r1) /* 801E9DB4 001E6D14 7C 08 03 A6 */ mtlr r0 /* 801E9DB8 001E6D18 38 21 03 90 */ addi r1, r1, 0x390 -/* 801E9DBC 001E6D1C 4E 80 00 20 */ blr +/* 801E9DBC 001E6D1C 4E 80 00 20 */ blr .global HardwareLight__17CWallCrawlerSwarmCFRC13CStateManagerRC6CAABox HardwareLight__17CWallCrawlerSwarmCFRC13CStateManagerRC6CAABox: @@ -3003,7 +3003,7 @@ HardwareLight__17CWallCrawlerSwarmCFRC13CStateManagerRC6CAABox: /* 801E9EB4 001E6E14 83 A1 03 04 */ lwz r29, 0x304(r1) /* 801E9EB8 001E6E18 7C 08 03 A6 */ mtlr r0 /* 801E9EBC 001E6E1C 38 21 03 10 */ addi r1, r1, 0x310 -/* 801E9EC0 001E6E20 4E 80 00 20 */ blr +/* 801E9EC0 001E6E20 4E 80 00 20 */ blr .global PreRender__17CWallCrawlerSwarmFR13CStateManagerRC14CFrustumPlanes PreRender__17CWallCrawlerSwarmFR13CStateManagerRC14CFrustumPlanes: @@ -3074,7 +3074,7 @@ lbl_801E9F80: /* 801E9FB0 001E6F10 80 01 00 44 */ lwz r0, 0x44(r1) /* 801E9FB4 001E6F14 7C 08 03 A6 */ mtlr r0 /* 801E9FB8 001E6F18 38 21 00 40 */ addi r1, r1, 0x40 -/* 801E9FBC 001E6F1C 4E 80 00 20 */ blr +/* 801E9FBC 001E6F1C 4E 80 00 20 */ blr .global BoxForPosition__17CWallCrawlerSwarmCFiiif BoxForPosition__17CWallCrawlerSwarmCFiiif: @@ -3187,7 +3187,7 @@ BoxForPosition__17CWallCrawlerSwarmCFiiif: /* 801EA168 001E70C8 83 81 00 80 */ lwz r28, 0x80(r1) /* 801EA16C 001E70CC 7C 08 03 A6 */ mtlr r0 /* 801EA170 001E70D0 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 801EA174 001E70D4 4E 80 00 20 */ blr +/* 801EA174 001E70D4 4E 80 00 20 */ blr .global GetListAt__17CWallCrawlerSwarmFRC9CVector3f GetListAt__17CWallCrawlerSwarmFRC9CVector3f: @@ -3258,7 +3258,7 @@ lbl_801EA264: /* 801EA26C 001E71CC 83 C1 00 58 */ lwz r30, 0x58(r1) /* 801EA270 001E71D0 7C 08 03 A6 */ mtlr r0 /* 801EA274 001E71D4 38 21 00 60 */ addi r1, r1, 0x60 -/* 801EA278 001E71D8 4E 80 00 20 */ blr +/* 801EA278 001E71D8 4E 80 00 20 */ blr .global UpdatePartition__17CWallCrawlerSwarmFv UpdatePartition__17CWallCrawlerSwarmFv: @@ -3442,7 +3442,7 @@ lbl_801EA4E4: /* 801EA504 001E7464 83 C1 00 68 */ lwz r30, 0x68(r1) /* 801EA508 001E7468 7C 08 03 A6 */ mtlr r0 /* 801EA50C 001E746C 38 21 00 70 */ addi r1, r1, 0x70 -/* 801EA510 001E7470 4E 80 00 20 */ blr +/* 801EA510 001E7470 4E 80 00 20 */ blr .global LaunchBoid__17CWallCrawlerSwarmFRQ217CWallCrawlerSwarm5CBoidRC9CVector3f LaunchBoid__17CWallCrawlerSwarmFRQ217CWallCrawlerSwarm5CBoidRC9CVector3f: @@ -3653,7 +3653,7 @@ lbl_801EA790: /* 801EA82C 001E778C 83 A1 00 B4 */ lwz r29, 0xb4(r1) /* 801EA830 001E7790 7C 08 03 A6 */ mtlr r0 /* 801EA834 001E7794 38 21 01 40 */ addi r1, r1, 0x140 -/* 801EA838 001E7798 4E 80 00 20 */ blr +/* 801EA838 001E7798 4E 80 00 20 */ blr .global sub_801ea83c sub_801ea83c: @@ -3757,7 +3757,7 @@ sub_801ea83c: /* 801EA9C0 001E7920 83 A1 00 A4 */ lwz r29, 0xa4(r1) /* 801EA9C4 001E7924 7C 08 03 A6 */ mtlr r0 /* 801EA9C8 001E7928 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 801EA9CC 001E792C 4E 80 00 20 */ blr +/* 801EA9CC 001E792C 4E 80 00 20 */ blr .global Think__17CWallCrawlerSwarmFfR13CStateManager Think__17CWallCrawlerSwarmFfR13CStateManager: @@ -4803,7 +4803,7 @@ lbl_801EB8BC: /* 801EB8E4 001E8844 80 01 39 24 */ lwz r0, 0x3924(r1) /* 801EB8E8 001E8848 7C 08 03 A6 */ mtlr r0 /* 801EB8EC 001E884C 38 21 39 20 */ addi r1, r1, 0x3920 -/* 801EB8F0 001E8850 4E 80 00 20 */ blr +/* 801EB8F0 001E8850 4E 80 00 20 */ blr .global AddDoorRepulsors__17CWallCrawlerSwarmFR13CStateManager AddDoorRepulsors__17CWallCrawlerSwarmFR13CStateManager: @@ -4877,7 +4877,7 @@ lbl_801EB9B0: /* 801EB9EC 001E894C 38 61 00 3C */ addi r3, r1, 0x3c /* 801EB9F0 001E8950 81 8C 00 40 */ lwz r12, 0x40(r12) /* 801EB9F4 001E8954 7D 89 03 A6 */ mtctr r12 -/* 801EB9F8 001E8958 4E 80 04 21 */ bctrl +/* 801EB9F8 001E8958 4E 80 04 21 */ bctrl /* 801EB9FC 001E895C 88 01 00 54 */ lbz r0, 0x54(r1) /* 801EBA00 001E8960 28 00 00 00 */ cmplwi r0, 0 /* 801EBA04 001E8964 98 01 00 70 */ stb r0, 0x70(r1) @@ -4984,7 +4984,7 @@ lbl_801EBB48: /* 801EBB78 001E8AD8 83 81 00 80 */ lwz r28, 0x80(r1) /* 801EBB7C 001E8ADC 7C 08 03 A6 */ mtlr r0 /* 801EBB80 001E8AE0 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 801EBB84 001E8AE4 4E 80 00 20 */ blr +/* 801EBB84 001E8AE4 4E 80 00 20 */ blr .global UpdateBoid__17CWallCrawlerSwarmFR19CAreaCollisionCacheR13CStateManagerfRQ217CWallCrawlerSwarm5CBoid UpdateBoid__17CWallCrawlerSwarmFR19CAreaCollisionCacheR13CStateManagerfRQ217CWallCrawlerSwarm5CBoid: @@ -5469,7 +5469,7 @@ lbl_801EC2C0: /* 801EC2CC 001E922C 38 63 63 74 */ addi r3, r3, lbl_803E6374@l /* 801EC2D0 001E9230 7C 03 E0 2E */ lwzx r0, r3, r28 /* 801EC2D4 001E9234 7C 09 03 A6 */ mtctr r0 -/* 801EC2D8 001E9238 4E 80 04 20 */ bctr +/* 801EC2D8 001E9238 4E 80 04 20 */ bctr .global lbl_801EC2DC lbl_801EC2DC: /* 801EC2DC 001E923C 83 FB 04 EC */ lwz r31, 0x4ec(r27) @@ -5681,7 +5681,7 @@ lbl_801EC554: /* 801EC5C0 001E9520 80 01 05 24 */ lwz r0, 0x524(r1) /* 801EC5C4 001E9524 7C 08 03 A6 */ mtlr r0 /* 801EC5C8 001E9528 38 21 05 20 */ addi r1, r1, 0x520 -/* 801EC5CC 001E952C 4E 80 00 20 */ blr +/* 801EC5CC 001E952C 4E 80 00 20 */ blr .global FindBestSurface__17CWallCrawlerSwarmFRC19CAreaCollisionCache9CVector3ffR17CCollisionSurface FindBestSurface__17CWallCrawlerSwarmFRC19CAreaCollisionCache9CVector3ffR17CCollisionSurface: @@ -5836,7 +5836,7 @@ lbl_801EC7D4: /* 801EC7F8 001E9758 80 01 00 D4 */ lwz r0, 0xd4(r1) /* 801EC7FC 001E975C 7C 08 03 A6 */ mtlr r0 /* 801EC800 001E9760 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 801EC804 001E9764 4E 80 00 20 */ blr +/* 801EC804 001E9764 4E 80 00 20 */ blr .global FindBestCollisionInBox__17CWallCrawlerSwarmFR13CStateManagerRC9CVector3f FindBestCollisionInBox__17CWallCrawlerSwarmFR13CStateManagerRC9CVector3f: @@ -6143,7 +6143,7 @@ lbl_801ECBF0: /* 801ECC6C 001E9BCC 80 01 1C D4 */ lwz r0, 0x1cd4(r1) /* 801ECC70 001E9BD0 7C 08 03 A6 */ mtlr r0 /* 801ECC74 001E9BD4 38 21 1C D0 */ addi r1, r1, 0x1cd0 -/* 801ECC78 001E9BD8 4E 80 00 20 */ blr +/* 801ECC78 001E9BD8 4E 80 00 20 */ blr .global PointOnSurface__17CWallCrawlerSwarmFRC17CCollisionSurfaceRC9CVector3fRC6CPlane PointOnSurface__17CWallCrawlerSwarmFRC17CCollisionSurfaceRC9CVector3fRC6CPlane: @@ -6220,7 +6220,7 @@ lbl_801ECD74: /* 801ECD84 001E9CE4 83 C1 00 18 */ lwz r30, 0x18(r1) /* 801ECD88 001E9CE8 7C 08 03 A6 */ mtlr r0 /* 801ECD8C 001E9CEC 38 21 00 30 */ addi r1, r1, 0x30 -/* 801ECD90 001E9CF0 4E 80 00 20 */ blr +/* 801ECD90 001E9CF0 4E 80 00 20 */ blr .global ProjectVectorToPlane__17CWallCrawlerSwarmFRC9CVector3fRC9CVector3f ProjectVectorToPlane__17CWallCrawlerSwarmFRC9CVector3fRC9CVector3f: @@ -6242,7 +6242,7 @@ ProjectVectorToPlane__17CWallCrawlerSwarmFRC9CVector3fRC9CVector3f: /* 801ECDD0 001E9D30 D0 43 00 00 */ stfs f2, 0(r3) /* 801ECDD4 001E9D34 D0 23 00 04 */ stfs f1, 4(r3) /* 801ECDD8 001E9D38 D0 03 00 08 */ stfs f0, 8(r3) -/* 801ECDDC 001E9D3C 4E 80 00 20 */ blr +/* 801ECDDC 001E9D3C 4E 80 00 20 */ blr .global ProjectPointToPlane__17CWallCrawlerSwarmFRC9CVector3fRC9CVector3fRC9CVector3f ProjectPointToPlane__17CWallCrawlerSwarmFRC9CVector3fRC9CVector3fRC9CVector3f: @@ -6275,14 +6275,14 @@ ProjectPointToPlane__17CWallCrawlerSwarmFRC9CVector3fRC9CVector3fRC9CVector3f: /* 801ECE48 001E9DA8 D0 23 00 04 */ stfs f1, 4(r3) /* 801ECE4C 001E9DAC D0 03 00 08 */ stfs f0, 8(r3) /* 801ECE50 001E9DB0 38 21 00 20 */ addi r1, r1, 0x20 -/* 801ECE54 001E9DB4 4E 80 00 20 */ blr +/* 801ECE54 001E9DB4 4E 80 00 20 */ blr .global GetTouchBounds__17CWallCrawlerSwarmCFv GetTouchBounds__17CWallCrawlerSwarmCFv: /* 801ECE58 001E9DB8 38 00 00 01 */ li r0, 1 /* 801ECE5C 001E9DBC 28 03 00 00 */ cmplwi r3, 0 /* 801ECE60 001E9DC0 98 03 00 18 */ stb r0, 0x18(r3) -/* 801ECE64 001E9DC4 4D 82 00 20 */ beqlr +/* 801ECE64 001E9DC4 4D 82 00 20 */ beqlr /* 801ECE68 001E9DC8 C0 04 00 E8 */ lfs f0, 0xe8(r4) /* 801ECE6C 001E9DCC D0 03 00 00 */ stfs f0, 0(r3) /* 801ECE70 001E9DD0 C0 04 00 EC */ lfs f0, 0xec(r4) @@ -6295,7 +6295,7 @@ GetTouchBounds__17CWallCrawlerSwarmCFv: /* 801ECE8C 001E9DEC D0 03 00 10 */ stfs f0, 0x10(r3) /* 801ECE90 001E9DF0 C0 04 00 FC */ lfs f0, 0xfc(r4) /* 801ECE94 001E9DF4 D0 03 00 14 */ stfs f0, 0x14(r3) -/* 801ECE98 001E9DF8 4E 80 00 20 */ blr +/* 801ECE98 001E9DF8 4E 80 00 20 */ blr .global GetBoundingBox__17CWallCrawlerSwarmCFv GetBoundingBox__17CWallCrawlerSwarmCFv: @@ -6335,7 +6335,7 @@ GetBoundingBox__17CWallCrawlerSwarmCFv: /* 801ECF20 001E9E80 83 C1 00 38 */ lwz r30, 0x38(r1) /* 801ECF24 001E9E84 7C 08 03 A6 */ mtlr r0 /* 801ECF28 001E9E88 38 21 00 40 */ addi r1, r1, 0x40 -/* 801ECF2C 001E9E8C 4E 80 00 20 */ blr +/* 801ECF2C 001E9E8C 4E 80 00 20 */ blr .global CalculateRenderBounds__17CWallCrawlerSwarmFv CalculateRenderBounds__17CWallCrawlerSwarmFv: @@ -6375,7 +6375,7 @@ CalculateRenderBounds__17CWallCrawlerSwarmFv: /* 801ECFB4 001E9F14 80 01 00 44 */ lwz r0, 0x44(r1) /* 801ECFB8 001E9F18 7C 08 03 A6 */ mtlr r0 /* 801ECFBC 001E9F1C 38 21 00 40 */ addi r1, r1, 0x40 -/* 801ECFC0 001E9F20 4E 80 00 20 */ blr +/* 801ECFC0 001E9F20 4E 80 00 20 */ blr .global CreateBoid__17CWallCrawlerSwarmFR13CStateManageri CreateBoid__17CWallCrawlerSwarmFR13CStateManageri: @@ -6598,7 +6598,7 @@ lbl_801ED2EC: /* 801ED318 001EA278 83 A1 01 B4 */ lwz r29, 0x1b4(r1) /* 801ED31C 001EA27C 7C 08 03 A6 */ mtlr r0 /* 801ED320 001EA280 38 21 02 00 */ addi r1, r1, 0x200 -/* 801ED324 001EA284 4E 80 00 20 */ blr +/* 801ED324 001EA284 4E 80 00 20 */ blr .global AllocateSkinnedModels__17CWallCrawlerSwarmFR13CStateManagerQ210CModelData11EWhichModel AllocateSkinnedModels__17CWallCrawlerSwarmFR13CStateManagerQ210CModelData11EWhichModel: @@ -6789,7 +6789,7 @@ lbl_801ED5AC: /* 801ED5D0 001EA530 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 801ED5D4 001EA534 7C 08 03 A6 */ mtlr r0 /* 801ED5D8 001EA538 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 801ED5DC 001EA53C 4E 80 00 20 */ blr +/* 801ED5DC 001EA53C 4E 80 00 20 */ blr .global AcceptScriptMsg__17CWallCrawlerSwarmF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__17CWallCrawlerSwarmF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -6856,7 +6856,7 @@ lbl_801ED6AC: /* 801ED6BC 001EA61C 83 81 00 90 */ lwz r28, 0x90(r1) /* 801ED6C0 001EA620 7C 08 03 A6 */ mtlr r0 /* 801ED6C4 001EA624 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 801ED6C8 001EA628 4E 80 00 20 */ blr +/* 801ED6C8 001EA628 4E 80 00 20 */ blr .global sub_801ed6cc sub_801ed6cc: @@ -6892,7 +6892,7 @@ lbl_801ED70C: /* 801ED738 001EA698 80 01 00 14 */ lwz r0, 0x14(r1) /* 801ED73C 001EA69C 7C 08 03 A6 */ mtlr r0 /* 801ED740 001EA6A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801ED744 001EA6A4 4E 80 00 20 */ blr +/* 801ED744 001EA6A4 4E 80 00 20 */ blr .global sub_801ed748 sub_801ed748: @@ -6906,7 +6906,7 @@ lbl_801ED760: /* 801ED760 001EA6C0 80 01 00 14 */ lwz r0, 0x14(r1) /* 801ED764 001EA6C4 7C 08 03 A6 */ mtlr r0 /* 801ED768 001EA6C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801ED76C 001EA6CC 4E 80 00 20 */ blr +/* 801ED76C 001EA6CC 4E 80 00 20 */ blr .global sub_801ed770 sub_801ed770: @@ -6966,7 +6966,7 @@ sub_801ed770: /* 801ED844 001EA7A4 80 01 00 14 */ lwz r0, 0x14(r1) /* 801ED848 001EA7A8 7C 08 03 A6 */ mtlr r0 /* 801ED84C 001EA7AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801ED850 001EA7B0 4E 80 00 20 */ blr +/* 801ED850 001EA7B0 4E 80 00 20 */ blr .global Accept__17CWallCrawlerSwarmFR8IVisitor Accept__17CWallCrawlerSwarmFR8IVisitor: @@ -6979,11 +6979,11 @@ Accept__17CWallCrawlerSwarmFR8IVisitor: /* 801ED86C 001EA7CC 7C 04 03 78 */ mr r4, r0 /* 801ED870 001EA7D0 81 8C 00 E4 */ lwz r12, 0xe4(r12) /* 801ED874 001EA7D4 7D 89 03 A6 */ mtctr r12 -/* 801ED878 001EA7D8 4E 80 04 21 */ bctrl +/* 801ED878 001EA7D8 4E 80 04 21 */ bctrl /* 801ED87C 001EA7DC 80 01 00 14 */ lwz r0, 0x14(r1) /* 801ED880 001EA7E0 7C 08 03 A6 */ mtlr r0 /* 801ED884 001EA7E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801ED888 001EA7E8 4E 80 00 20 */ blr +/* 801ED888 001EA7E8 4E 80 00 20 */ blr .global __dt__17CWallCrawlerSwarmFv __dt__17CWallCrawlerSwarmFv: @@ -7018,7 +7018,7 @@ lbl_801ED8D4: /* 801ED8F8 001EA858 38 80 00 01 */ li r4, 1 /* 801ED8FC 001EA85C 81 8C 00 08 */ lwz r12, 8(r12) /* 801ED900 001EA860 7D 89 03 A6 */ mtctr r12 -/* 801ED904 001EA864 4E 80 04 21 */ bctrl +/* 801ED904 001EA864 4E 80 04 21 */ bctrl lbl_801ED908: /* 801ED908 001EA868 3B 9C 00 08 */ addi r28, r28, 8 /* 801ED90C 001EA86C 3B BD 00 01 */ addi r29, r29, 1 @@ -7209,7 +7209,7 @@ lbl_801EDB60: /* 801EDB74 001EAAD4 83 81 00 30 */ lwz r28, 0x30(r1) /* 801EDB78 001EAAD8 7C 08 03 A6 */ mtlr r0 /* 801EDB7C 001EAADC 38 21 00 40 */ addi r1, r1, 0x40 -/* 801EDB80 001EAAE0 4E 80 00 20 */ blr +/* 801EDB80 001EAAE0 4E 80 00 20 */ blr .global "__ct__17CWallCrawlerSwarmF9TUniqueIdbRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC9CVector3fRC12CTransform4fRC8CAnimResRC8CAnimResUiUiUiUiRC11CDamageInfoffffiiffffffffi16CActorParameters" "__ct__17CWallCrawlerSwarmF9TUniqueIdbRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC9CVector3fRC12CTransform4fRC8CAnimResRC8CAnimResUiUiUiUiRC11CDamageInfoffffiiffffffffi16CActorParameters": @@ -8075,7 +8075,7 @@ lbl_801EE820: /* 801EE848 001EB7A8 81 84 00 00 */ lwz r12, 0(r4) /* 801EE84C 001EB7AC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801EE850 001EB7B0 7D 89 03 A6 */ mtctr r12 -/* 801EE854 001EB7B4 4E 80 04 21 */ bctrl +/* 801EE854 001EB7B4 4E 80 04 21 */ bctrl /* 801EE858 001EB7B8 39 C1 00 CC */ addi r14, r1, 0xcc /* 801EE85C 001EB7BC 38 81 00 90 */ addi r4, r1, 0x90 /* 801EE860 001EB7C0 7D C3 73 78 */ mr r3, r14 @@ -8121,7 +8121,7 @@ lbl_801EE8D0: /* 801EE8F8 001EB858 81 84 00 00 */ lwz r12, 0(r4) /* 801EE8FC 001EB85C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801EE900 001EB860 7D 89 03 A6 */ mtctr r12 -/* 801EE904 001EB864 4E 80 04 21 */ bctrl +/* 801EE904 001EB864 4E 80 04 21 */ bctrl /* 801EE908 001EB868 39 C1 00 C0 */ addi r14, r1, 0xc0 /* 801EE90C 001EB86C 38 81 00 80 */ addi r4, r1, 0x80 /* 801EE910 001EB870 7D C3 73 78 */ mr r3, r14 @@ -8167,7 +8167,7 @@ lbl_801EE980: /* 801EE9A8 001EB908 81 84 00 00 */ lwz r12, 0(r4) /* 801EE9AC 001EB90C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801EE9B0 001EB910 7D 89 03 A6 */ mtctr r12 -/* 801EE9B4 001EB914 4E 80 04 21 */ bctrl +/* 801EE9B4 001EB914 4E 80 04 21 */ bctrl /* 801EE9B8 001EB918 39 C1 00 B4 */ addi r14, r1, 0xb4 /* 801EE9BC 001EB91C 38 81 00 70 */ addi r4, r1, 0x70 /* 801EE9C0 001EB920 7D C3 73 78 */ mr r3, r14 @@ -8213,7 +8213,7 @@ lbl_801EEA30: /* 801EEA58 001EB9B8 81 84 00 00 */ lwz r12, 0(r4) /* 801EEA5C 001EB9BC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801EEA60 001EB9C0 7D 89 03 A6 */ mtctr r12 -/* 801EEA64 001EB9C4 4E 80 04 21 */ bctrl +/* 801EEA64 001EB9C4 4E 80 04 21 */ bctrl /* 801EEA68 001EB9C8 39 C1 00 A8 */ addi r14, r1, 0xa8 /* 801EEA6C 001EB9CC 38 81 00 60 */ addi r4, r1, 0x60 /* 801EEA70 001EB9D0 7D C3 73 78 */ mr r3, r14 @@ -8301,7 +8301,7 @@ lbl_801EEB7C: /* 801EEBA4 001EBB04 38 80 00 01 */ li r4, 1 /* 801EEBA8 001EBB08 81 8C 00 08 */ lwz r12, 8(r12) /* 801EEBAC 001EBB0C 7D 89 03 A6 */ mtctr r12 -/* 801EEBB0 001EBB10 4E 80 04 21 */ bctrl +/* 801EEBB0 001EBB10 4E 80 04 21 */ bctrl lbl_801EEBB4: /* 801EEBB4 001EBB14 7E 80 07 75 */ extsb. r0, r20 /* 801EEBB8 001EBB18 41 82 00 10 */ beq lbl_801EEBC8 @@ -8315,7 +8315,7 @@ lbl_801EEBC8: /* 801EEBD4 001EBB34 81 83 00 00 */ lwz r12, 0(r3) /* 801EEBD8 001EBB38 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 801EEBDC 001EBB3C 7D 89 03 A6 */ mtctr r12 -/* 801EEBE0 001EBB40 4E 80 04 21 */ bctrl +/* 801EEBE0 001EBB40 4E 80 04 21 */ bctrl /* 801EEBE4 001EBB44 3A 10 00 0C */ addi r16, r16, 0xc /* 801EEBE8 001EBB48 3A 31 00 08 */ addi r17, r17, 8 /* 801EEBEC 001EBB4C 3A 73 00 01 */ addi r19, r19, 1 @@ -8360,7 +8360,7 @@ lbl_801EEBF0: /* 801EEC84 001EBBE4 80 01 02 C4 */ lwz r0, 0x2c4(r1) /* 801EEC88 001EBBE8 7C 08 03 A6 */ mtlr r0 /* 801EEC8C 001EBBEC 38 21 02 C0 */ addi r1, r1, 0x2c0 -/* 801EEC90 001EBBF0 4E 80 00 20 */ blr +/* 801EEC90 001EBBF0 4E 80 00 20 */ blr .global __ct__Q217CWallCrawlerSwarm5CBoidFRC12CTransform4fUi __ct__Q217CWallCrawlerSwarm5CBoidFRC12CTransform4fUi: @@ -8433,7 +8433,7 @@ __ct__Q217CWallCrawlerSwarm5CBoidFRC12CTransform4fUi: /* 801EED9C 001EBCFC 80 01 00 44 */ lwz r0, 0x44(r1) /* 801EEDA0 001EBD00 7C 08 03 A6 */ mtlr r0 /* 801EEDA4 001EBD04 38 21 00 40 */ addi r1, r1, 0x40 -/* 801EEDA8 001EBD08 4E 80 00 20 */ blr +/* 801EEDA8 001EBD08 4E 80 00 20 */ blr .global LookAt__F9CVector3f9CVector3ff LookAt__F9CVector3f9CVector3ff: @@ -8566,7 +8566,7 @@ lbl_801EEF84: /* 801EEF8C 001EBEEC 83 C1 00 68 */ lwz r30, 0x68(r1) /* 801EEF90 001EBEF0 7C 08 03 A6 */ mtlr r0 /* 801EEF94 001EBEF4 38 21 00 70 */ addi r1, r1, 0x70 -/* 801EEF98 001EBEF8 4E 80 00 20 */ blr +/* 801EEF98 001EBEF8 4E 80 00 20 */ blr .global sub_801eef9c sub_801eef9c: @@ -8631,7 +8631,7 @@ lbl_801EF060: /* 801EF06C 001EBFCC 83 A1 00 24 */ lwz r29, 0x24(r1) /* 801EF070 001EBFD0 7C 08 03 A6 */ mtlr r0 /* 801EF074 001EBFD4 38 21 00 30 */ addi r1, r1, 0x30 -/* 801EF078 001EBFD8 4E 80 00 20 */ blr +/* 801EF078 001EBFD8 4E 80 00 20 */ blr .global sub_801ef07c sub_801ef07c: @@ -8662,7 +8662,7 @@ lbl_801EF0B8: /* 801EF0D4 001EC034 83 A1 00 14 */ lwz r29, 0x14(r1) /* 801EF0D8 001EC038 7C 08 03 A6 */ mtlr r0 /* 801EF0DC 001EC03C 38 21 00 20 */ addi r1, r1, 0x20 -/* 801EF0E0 001EC040 4E 80 00 20 */ blr +/* 801EF0E0 001EC040 4E 80 00 20 */ blr .global sub_801ef0e4 sub_801ef0e4: diff --git a/asm/MetroidPrime/Enemies/CWallWalker.s b/asm/MetroidPrime/Enemies/CWallWalker.s index 957acdce..c09d23b3 100644 --- a/asm/MetroidPrime/Enemies/CWallWalker.s +++ b/asm/MetroidPrime/Enemies/CWallWalker.s @@ -185,7 +185,7 @@ lbl_803EA0F0: .4byte PhazeOut__10CPatternedFR13CStateManager .4byte GetDeathExplosionParticle__10CPatternedCFv .4byte 0 - + .section .text, "ax" @@ -283,7 +283,7 @@ lbl_802686B0: /* 802686BC 0026561C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802686C0 00265620 7C 08 03 A6 */ mtlr r0 /* 802686C4 00265624 38 21 00 20 */ addi r1, r1, 0x20 -/* 802686C8 00265628 4E 80 00 20 */ blr +/* 802686C8 00265628 4E 80 00 20 */ blr .global Render__11CWallWalkerCFRC13CStateManager Render__11CWallWalkerCFRC13CStateManager: @@ -294,7 +294,7 @@ Render__11CWallWalkerCFRC13CStateManager: /* 802686DC 0026563C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802686E0 00265640 7C 08 03 A6 */ mtlr r0 /* 802686E4 00265644 38 21 00 10 */ addi r1, r1, 0x10 -/* 802686E8 00265648 4E 80 00 20 */ blr +/* 802686E8 00265648 4E 80 00 20 */ blr .global GotoNextWaypoint__11CWallWalkerFR13CStateManager GotoNextWaypoint__11CWallWalkerFR13CStateManager: @@ -381,7 +381,7 @@ lbl_80268814: /* 80268820 00265780 83 A1 00 44 */ lwz r29, 0x44(r1) /* 80268824 00265784 7C 08 03 A6 */ mtlr r0 /* 80268828 00265788 38 21 00 50 */ addi r1, r1, 0x50 -/* 8026882C 0026578C 4E 80 00 20 */ blr +/* 8026882C 0026578C 4E 80 00 20 */ blr .global PreThink__11CWallWalkerFfR13CStateManager PreThink__11CWallWalkerFfR13CStateManager: @@ -518,12 +518,12 @@ lbl_80268A24: /* 80268A30 00265990 83 E1 00 CC */ lwz r31, 0xcc(r1) /* 80268A34 00265994 7C 08 03 A6 */ mtlr r0 /* 80268A38 00265998 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 80268A3C 0026599C 4E 80 00 20 */ blr +/* 80268A3C 0026599C 4E 80 00 20 */ blr .global GetCollisionPrimitive__11CWallWalkerCFv GetCollisionPrimitive__11CWallWalkerCFv: /* 80268A40 002659A0 38 63 05 90 */ addi r3, r3, 0x590 -/* 80268A44 002659A4 4E 80 00 20 */ blr +/* 80268A44 002659A4 4E 80 00 20 */ blr .global AlignToFloor__11CWallWalkerFR13CStateManagerfRC9CVector3ff AlignToFloor__11CWallWalkerFR13CStateManagerfRC9CVector3ff: @@ -833,7 +833,7 @@ lbl_80268E84: /* 80268EAC 00265E0C 80 01 1C 74 */ lwz r0, 0x1c74(r1) /* 80268EB0 00265E10 7C 08 03 A6 */ mtlr r0 /* 80268EB4 00265E14 38 21 1C 70 */ addi r1, r1, 0x1c70 -/* 80268EB8 00265E18 4E 80 00 20 */ blr +/* 80268EB8 00265E18 4E 80 00 20 */ blr .global OrientToSurfaceNormal__11CWallWalkerFRC9CVector3ff OrientToSurfaceNormal__11CWallWalkerFRC9CVector3ff: @@ -935,7 +935,7 @@ lbl_80269030: /* 80269034 00265F94 83 E1 00 DC */ lwz r31, 0xdc(r1) /* 80269038 00265F98 7C 08 03 A6 */ mtlr r0 /* 8026903C 00265F9C 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 80269040 00265FA0 4E 80 00 20 */ blr +/* 80269040 00265FA0 4E 80 00 20 */ blr .global PointOnSurface__11CWallWalkerFRC17CCollisionSurfaceRC9CVector3f PointOnSurface__11CWallWalkerFRC17CCollisionSurfaceRC9CVector3f: @@ -1027,7 +1027,7 @@ lbl_8026916C: /* 8026918C 002660EC 83 C1 00 38 */ lwz r30, 0x38(r1) /* 80269190 002660F0 7C 08 03 A6 */ mtlr r0 /* 80269194 002660F4 38 21 00 70 */ addi r1, r1, 0x70 -/* 80269198 002660F8 4E 80 00 20 */ blr +/* 80269198 002660F8 4E 80 00 20 */ blr .global ProjectVectorToPlane__11CWallWalkerFRC9CVector3fRC9CVector3f ProjectVectorToPlane__11CWallWalkerFRC9CVector3fRC9CVector3f: @@ -1049,7 +1049,7 @@ ProjectVectorToPlane__11CWallWalkerFRC9CVector3fRC9CVector3f: /* 802691D8 00266138 D0 43 00 00 */ stfs f2, 0(r3) /* 802691DC 0026613C D0 23 00 04 */ stfs f1, 4(r3) /* 802691E0 00266140 D0 03 00 08 */ stfs f0, 8(r3) -/* 802691E4 00266144 4E 80 00 20 */ blr +/* 802691E4 00266144 4E 80 00 20 */ blr .global ProjectPointToPlane__11CWallWalkerFRC9CVector3fRC9CVector3fRC9CVector3f ProjectPointToPlane__11CWallWalkerFRC9CVector3fRC9CVector3fRC9CVector3f: @@ -1082,7 +1082,7 @@ ProjectPointToPlane__11CWallWalkerFRC9CVector3fRC9CVector3fRC9CVector3f: /* 80269250 002661B0 D0 23 00 04 */ stfs f1, 4(r3) /* 80269254 002661B4 D0 03 00 08 */ stfs f0, 8(r3) /* 80269258 002661B8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8026925C 002661BC 4E 80 00 20 */ blr +/* 8026925C 002661BC 4E 80 00 20 */ blr .global "__ct__11CWallWalkerFUi9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>Q210CPatterned11EFlavorTypeRC11CEntityInfoRC12CTransform4fRC10CModelDataRC14CPatternedInfoQ210CPatterned13EMovementTypeQ210CPatterned13EColliderType9EBodyTypeRC16CActorParametersUiUi" "__ct__11CWallWalkerFUi9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>Q210CPatterned11EFlavorTypeRC11CEntityInfoRC12CTransform4fRC10CModelDataRC14CPatternedInfoQ210CPatterned13EMovementTypeQ210CPatterned13EColliderType9EBodyTypeRC16CActorParametersUiUi": diff --git a/asm/MetroidPrime/Enemies/CWarWasp.s b/asm/MetroidPrime/Enemies/CWarWasp.s index 14698629..6c443bb6 100644 --- a/asm/MetroidPrime/Enemies/CWarWasp.s +++ b/asm/MetroidPrime/Enemies/CWarWasp.s @@ -262,12 +262,12 @@ lbl_805A75E8: .global GetSearchPath__8CWarWaspFv GetSearchPath__8CWarWaspFv: /* 8010ADC4 00107D24 38 63 05 90 */ addi r3, r3, 0x590 -/* 8010ADC8 00107D28 4E 80 00 20 */ blr +/* 8010ADC8 00107D28 4E 80 00 20 */ blr .global IsListening__8CWarWaspCFv IsListening__8CWarWaspCFv: /* 8010ADCC 00107D2C 38 60 00 01 */ li r3, 1 -/* 8010ADD0 00107D30 4E 80 00 20 */ blr +/* 8010ADD0 00107D30 4E 80 00 20 */ blr .global UpdateTelegraphMoveSpeed__8CWarWaspFR13CStateManager UpdateTelegraphMoveSpeed__8CWarWaspFR13CStateManager: @@ -346,7 +346,7 @@ lbl_8010AEDC: /* 8010AEE4 00107E44 83 C1 00 28 */ lwz r30, 0x28(r1) /* 8010AEE8 00107E48 7C 08 03 A6 */ mtlr r0 /* 8010AEEC 00107E4C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8010AEF0 00107E50 4E 80 00 20 */ blr +/* 8010AEF0 00107E50 4E 80 00 20 */ blr .global CalcOffTotemAngle__8CWarWaspFR13CStateManager CalcOffTotemAngle__8CWarWaspFR13CStateManager: @@ -361,7 +361,7 @@ CalcOffTotemAngle__8CWarWaspFR13CStateManager: /* 8010AF14 00107E74 EC 22 00 7A */ fmadds f1, f2, f1, f0 /* 8010AF18 00107E78 7C 08 03 A6 */ mtlr r0 /* 8010AF1C 00107E7C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8010AF20 00107E80 4E 80 00 20 */ blr +/* 8010AF20 00107E80 4E 80 00 20 */ blr .global GetTeamZStratum__8CWarWaspFi GetTeamZStratum__8CWarWaspFi: @@ -397,7 +397,7 @@ lbl_8010AF70: /* 8010AF94 00107EF4 EC 22 00 32 */ fmuls f1, f2, f0 lbl_8010AF98: /* 8010AF98 00107EF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8010AF9C 00107EFC 4E 80 00 20 */ blr +/* 8010AF9C 00107EFC 4E 80 00 20 */ blr .global GetAttackTeamSize__8CWarWaspFR13CStateManageri GetAttackTeamSize__8CWarWaspFR13CStateManageri: @@ -462,7 +462,7 @@ lbl_8010B070: /* 8010B078 00107FD8 80 01 00 44 */ lwz r0, 0x44(r1) /* 8010B07C 00107FDC 7C 08 03 A6 */ mtlr r0 /* 8010B080 00107FE0 38 21 00 40 */ addi r1, r1, 0x40 -/* 8010B084 00107FE4 4E 80 00 20 */ blr +/* 8010B084 00107FE4 4E 80 00 20 */ blr .global GetAttackTeamLeader__8CWarWaspFR13CStateManageri GetAttackTeamLeader__8CWarWaspFR13CStateManageri: @@ -531,7 +531,7 @@ lbl_8010B168: /* 8010B16C 001080CC 80 01 00 44 */ lwz r0, 0x44(r1) /* 8010B170 001080D0 7C 08 03 A6 */ mtlr r0 /* 8010B174 001080D4 38 21 00 40 */ addi r1, r1, 0x40 -/* 8010B178 001080D8 4E 80 00 20 */ blr +/* 8010B178 001080D8 4E 80 00 20 */ blr .global TryCircleTeamMerge__8CWarWaspFR13CStateManager TryCircleTeamMerge__8CWarWaspFR13CStateManager: @@ -613,7 +613,7 @@ lbl_8010B294: /* 8010B298 001081F8 80 01 00 54 */ lwz r0, 0x54(r1) /* 8010B29C 001081FC 7C 08 03 A6 */ mtlr r0 /* 8010B2A0 00108200 38 21 00 50 */ addi r1, r1, 0x50 -/* 8010B2A4 00108204 4E 80 00 20 */ blr +/* 8010B2A4 00108204 4E 80 00 20 */ blr .global SetUpCircleTelegraphTeam__8CWarWaspFR13CStateManager SetUpCircleTelegraphTeam__8CWarWaspFR13CStateManager: @@ -723,7 +723,7 @@ lbl_8010B41C: /* 8010B420 00108380 80 01 00 54 */ lwz r0, 0x54(r1) /* 8010B424 00108384 7C 08 03 A6 */ mtlr r0 /* 8010B428 00108388 38 21 00 50 */ addi r1, r1, 0x50 -/* 8010B42C 0010838C 4E 80 00 20 */ blr +/* 8010B42C 0010838C 4E 80 00 20 */ blr .global CheckCircleAttackSpread__8CWarWaspFR13CStateManageri CheckCircleAttackSpread__8CWarWaspFR13CStateManageri: @@ -898,7 +898,7 @@ lbl_8010B678: /* 8010B6B4 00108614 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 8010B6B8 00108618 7C 08 03 A6 */ mtlr r0 /* 8010B6BC 0010861C 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 8010B6C0 00108620 4E 80 00 20 */ blr +/* 8010B6C0 00108620 4E 80 00 20 */ blr .global CalcSeekMagnitude__8CWarWaspFR13CStateManager CalcSeekMagnitude__8CWarWaspFR13CStateManager: @@ -1108,7 +1108,7 @@ lbl_8010B984: /* 8010B9C8 00108928 83 81 00 50 */ lwz r28, 0x50(r1) /* 8010B9CC 0010892C 7C 08 03 A6 */ mtlr r0 /* 8010B9D0 00108930 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 8010B9D4 00108934 4E 80 00 20 */ blr +/* 8010B9D4 00108934 4E 80 00 20 */ blr .global SetUpCircleBurstWaypoint__8CWarWaspFR13CStateManager SetUpCircleBurstWaypoint__8CWarWaspFR13CStateManager: @@ -1181,7 +1181,7 @@ lbl_8010BAC4: /* 8010BAD0 00108A30 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8010BAD4 00108A34 7C 08 03 A6 */ mtlr r0 /* 8010BAD8 00108A38 38 21 00 30 */ addi r1, r1, 0x30 -/* 8010BADC 00108A3C 4E 80 00 20 */ blr +/* 8010BADC 00108A3C 4E 80 00 20 */ blr .global GetCloseInPos__8CWarWaspCFR13CStateManagerRC9CVector3f GetCloseInPos__8CWarWaspCFR13CStateManagerRC9CVector3f: @@ -1287,7 +1287,7 @@ lbl_8010BC18: /* 8010BC5C 00108BBC 83 A1 00 54 */ lwz r29, 0x54(r1) /* 8010BC60 00108BC0 7C 08 03 A6 */ mtlr r0 /* 8010BC64 00108BC4 38 21 00 90 */ addi r1, r1, 0x90 -/* 8010BC68 00108BC8 4E 80 00 20 */ blr +/* 8010BC68 00108BC8 4E 80 00 20 */ blr .global GetCloseInZBasis__8CWarWaspCFR13CStateManager GetCloseInZBasis__8CWarWaspCFR13CStateManager: @@ -1309,7 +1309,7 @@ GetCloseInZBasis__8CWarWaspCFR13CStateManager: /* 8010BCA8 00108C08 80 01 00 24 */ lwz r0, 0x24(r1) /* 8010BCAC 00108C0C 7C 08 03 A6 */ mtlr r0 /* 8010BCB0 00108C10 38 21 00 20 */ addi r1, r1, 0x20 -/* 8010BCB4 00108C14 4E 80 00 20 */ blr +/* 8010BCB4 00108C14 4E 80 00 20 */ blr .global CalcShuffleDest__8CWarWaspFR13CStateManager CalcShuffleDest__8CWarWaspFR13CStateManager: @@ -1382,7 +1382,7 @@ lbl_8010BD50: /* 8010BDB8 00108D18 83 A1 00 34 */ lwz r29, 0x34(r1) /* 8010BDBC 00108D1C 7C 08 03 A6 */ mtlr r0 /* 8010BDC0 00108D20 38 21 00 60 */ addi r1, r1, 0x60 -/* 8010BDC4 00108D24 4E 80 00 20 */ blr +/* 8010BDC4 00108D24 4E 80 00 20 */ blr .global CalcTimeToNextAttack__8CWarWaspFR13CStateManager CalcTimeToNextAttack__8CWarWaspFR13CStateManager: @@ -1444,7 +1444,7 @@ lbl_8010BE64: /* 8010BE90 00108DF0 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8010BE94 00108DF4 7C 08 03 A6 */ mtlr r0 /* 8010BE98 00108DF8 38 21 00 40 */ addi r1, r1, 0x40 -/* 8010BE9C 00108DFC 4E 80 00 20 */ blr +/* 8010BE9C 00108DFC 4E 80 00 20 */ blr .global GetProjectileAimPos__8CWarWaspFR13CStateManagerf GetProjectileAimPos__8CWarWaspFR13CStateManagerf: @@ -1464,7 +1464,7 @@ GetProjectileAimPos__8CWarWaspFR13CStateManagerf: /* 8010BED4 00108E34 81 84 00 00 */ lwz r12, 0(r4) /* 8010BED8 00108E38 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 8010BEDC 00108E3C 7D 89 03 A6 */ mtctr r12 -/* 8010BEE0 00108E40 4E 80 04 21 */ bctrl +/* 8010BEE0 00108E40 4E 80 04 21 */ bctrl /* 8010BEE4 00108E44 80 7F 08 4C */ lwz r3, 0x84c(r31) /* 8010BEE8 00108E48 C0 21 00 08 */ lfs f1, 8(r1) /* 8010BEEC 00108E4C 80 03 02 F8 */ lwz r0, 0x2f8(r3) @@ -1487,7 +1487,7 @@ lbl_8010BF10: /* 8010BF2C 00108E8C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8010BF30 00108E90 7C 08 03 A6 */ mtlr r0 /* 8010BF34 00108E94 38 21 00 30 */ addi r1, r1, 0x30 -/* 8010BF38 00108E98 4E 80 00 20 */ blr +/* 8010BF38 00108E98 4E 80 00 20 */ blr .global ApplyDamage__8CWarWaspFR13CStateManager ApplyDamage__8CWarWaspFR13CStateManager: @@ -1585,7 +1585,7 @@ ApplyDamage__8CWarWaspFR13CStateManager: /* 8010C0A8 00109008 B0 01 00 1C */ sth r0, 0x1c(r1) /* 8010C0AC 0010900C 81 8C 02 B0 */ lwz r12, 0x2b0(r12) /* 8010C0B0 00109010 7D 89 03 A6 */ mtctr r12 -/* 8010C0B4 00109014 4E 80 04 21 */ bctrl +/* 8010C0B4 00109014 4E 80 04 21 */ bctrl /* 8010C0B8 00109018 3C 80 80 5A */ lis r4, skZero3f@ha /* 8010C0BC 0010901C 7F C3 F3 78 */ mr r3, r30 /* 8010C0C0 00109020 39 24 66 A0 */ addi r9, r4, skZero3f@l @@ -1617,7 +1617,7 @@ lbl_8010C0EC: /* 8010C124 00109084 83 C1 00 D8 */ lwz r30, 0xd8(r1) /* 8010C128 00109088 7C 08 03 A6 */ mtlr r0 /* 8010C12C 0010908C 38 21 01 40 */ addi r1, r1, 0x140 -/* 8010C130 00109090 4E 80 00 20 */ blr +/* 8010C130 00109090 4E 80 00 20 */ blr .global UpdateTouchBounds__8CWarWaspFv UpdateTouchBounds__8CWarWaspFv: @@ -1679,7 +1679,7 @@ UpdateTouchBounds__8CWarWaspFv: /* 8010C210 00109170 83 E1 00 CC */ lwz r31, 0xcc(r1) /* 8010C214 00109174 7C 08 03 A6 */ mtlr r0 /* 8010C218 00109178 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 8010C21C 0010917C 4E 80 00 20 */ blr +/* 8010C21C 0010917C 4E 80 00 20 */ blr .global SetUpPathFindBehavior__8CWarWaspFR13CStateManager SetUpPathFindBehavior__8CWarWaspFR13CStateManager: @@ -1699,7 +1699,7 @@ SetUpPathFindBehavior__8CWarWaspFR13CStateManager: /* 8010C254 001091B4 81 83 00 00 */ lwz r12, 0(r3) /* 8010C258 001091B8 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 8010C25C 001091BC 7D 89 03 A6 */ mtctr r12 -/* 8010C260 001091C0 4E 80 04 21 */ bctrl +/* 8010C260 001091C0 4E 80 04 21 */ bctrl /* 8010C264 001091C4 28 03 00 00 */ cmplwi r3, 0 /* 8010C268 001091C8 41 82 02 8C */ beq lbl_8010C4F4 /* 8010C26C 001091CC 7F E3 FB 78 */ mr r3, r31 @@ -1876,7 +1876,7 @@ lbl_8010C4F4: /* 8010C504 00109464 83 81 01 00 */ lwz r28, 0x100(r1) /* 8010C508 00109468 7C 08 03 A6 */ mtlr r0 /* 8010C50C 0010946C 38 21 01 10 */ addi r1, r1, 0x110 -/* 8010C510 00109470 4E 80 00 20 */ blr +/* 8010C510 00109470 4E 80 00 20 */ blr .global PathToHiveIsClear__8CWarWaspFR13CStateManager PathToHiveIsClear__8CWarWaspFR13CStateManager: @@ -2099,7 +2099,7 @@ lbl_8010C808: /* 8010C83C 0010979C 80 01 08 F4 */ lwz r0, 0x8f4(r1) /* 8010C840 001097A0 7C 08 03 A6 */ mtlr r0 /* 8010C844 001097A4 38 21 08 F0 */ addi r1, r1, 0x8f0 -/* 8010C848 001097A8 4E 80 00 20 */ blr +/* 8010C848 001097A8 4E 80 00 20 */ blr .global SteerToDeactivatePos__8CWarWaspFR13CStateManager9EStateMsgf SteerToDeactivatePos__8CWarWaspFR13CStateManager9EStateMsgf: @@ -2238,7 +2238,7 @@ lbl_8010CA0C: /* 8010CA4C 001099AC 81 9F 00 00 */ lwz r12, 0(r31) /* 8010CA50 001099B0 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 8010CA54 001099B4 7D 89 03 A6 */ mtctr r12 -/* 8010CA58 001099B8 4E 80 04 21 */ bctrl +/* 8010CA58 001099B8 4E 80 04 21 */ bctrl /* 8010CA5C 001099BC 28 03 00 00 */ cmplwi r3, 0 /* 8010CA60 001099C0 41 82 00 68 */ beq lbl_8010CAC8 /* 8010CA64 001099C4 7F E3 FB 78 */ mr r3, r31 @@ -2247,14 +2247,14 @@ lbl_8010CA0C: /* 8010CA70 001099D0 C0 22 94 F0 */ lfs f1, lbl_805AB210@sda21(r2) /* 8010CA74 001099D4 81 8C 01 90 */ lwz r12, 0x190(r12) /* 8010CA78 001099D8 7D 89 03 A6 */ mtctr r12 -/* 8010CA7C 001099DC 4E 80 04 21 */ bctrl +/* 8010CA7C 001099DC 4E 80 04 21 */ bctrl /* 8010CA80 001099E0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8010CA84 001099E4 40 82 00 44 */ bne lbl_8010CAC8 /* 8010CA88 001099E8 7F E3 FB 78 */ mr r3, r31 /* 8010CA8C 001099EC 81 9F 00 00 */ lwz r12, 0(r31) /* 8010CA90 001099F0 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 8010CA94 001099F4 7D 89 03 A6 */ mtctr r12 -/* 8010CA98 001099F8 4E 80 04 21 */ bctrl +/* 8010CA98 001099F8 4E 80 04 21 */ bctrl /* 8010CA9C 001099FC 80 83 00 04 */ lwz r4, 4(r3) /* 8010CAA0 00109A00 80 63 00 C8 */ lwz r3, 0xc8(r3) /* 8010CAA4 00109A04 38 04 FF FF */ addi r0, r4, -1 @@ -2461,7 +2461,7 @@ lbl_8010CD68: /* 8010CDAC 00109D0C 83 A1 01 94 */ lwz r29, 0x194(r1) /* 8010CDB0 00109D10 7C 08 03 A6 */ mtlr r0 /* 8010CDB4 00109D14 38 21 02 10 */ addi r1, r1, 0x210 -/* 8010CDB8 00109D18 4E 80 00 20 */ blr +/* 8010CDB8 00109D18 4E 80 00 20 */ blr .global ApplyNormalSteering__8CWarWaspFR13CStateManager ApplyNormalSteering__8CWarWaspFR13CStateManager: @@ -2741,7 +2741,7 @@ lbl_8010D1D0: /* 8010D1DC 0010A13C C0 22 95 38 */ lfs f1, lbl_805AB258@sda21(r2) /* 8010D1E0 0010A140 81 8C 01 E8 */ lwz r12, 0x1e8(r12) /* 8010D1E4 0010A144 7D 89 03 A6 */ mtctr r12 -/* 8010D1E8 0010A148 4E 80 04 21 */ bctrl +/* 8010D1E8 0010A148 4E 80 04 21 */ bctrl /* 8010D1EC 0010A14C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8010D1F0 0010A150 41 82 00 6C */ beq lbl_8010D25C /* 8010D1F4 0010A154 38 61 00 CC */ addi r3, r1, 0xcc @@ -2785,7 +2785,7 @@ lbl_8010D25C: /* 8010D288 0010A1E8 83 C1 01 38 */ lwz r30, 0x138(r1) /* 8010D28C 0010A1EC 7C 08 03 A6 */ mtlr r0 /* 8010D290 0010A1F0 38 21 01 50 */ addi r1, r1, 0x150 -/* 8010D294 0010A1F4 4E 80 00 20 */ blr +/* 8010D294 0010A1F4 4E 80 00 20 */ blr .global ApplySeparationBehavior__8CWarWaspFR13CStateManagerf ApplySeparationBehavior__8CWarWaspFR13CStateManagerf: @@ -2906,7 +2906,7 @@ lbl_8010D424: /* 8010D440 0010A3A0 80 01 00 94 */ lwz r0, 0x94(r1) /* 8010D444 0010A3A4 7C 08 03 A6 */ mtlr r0 /* 8010D448 0010A3A8 38 21 00 90 */ addi r1, r1, 0x90 -/* 8010D44C 0010A3AC 4E 80 00 20 */ blr +/* 8010D44C 0010A3AC 4E 80 00 20 */ blr .global SwarmRemove__8CWarWaspFR13CStateManager SwarmRemove__8CWarWaspFR13CStateManager: @@ -2951,7 +2951,7 @@ lbl_8010D4DC: /* 8010D4E4 0010A444 83 C1 00 28 */ lwz r30, 0x28(r1) /* 8010D4E8 0010A448 7C 08 03 A6 */ mtlr r0 /* 8010D4EC 0010A44C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8010D4F0 0010A450 4E 80 00 20 */ blr +/* 8010D4F0 0010A450 4E 80 00 20 */ blr .global SwarmAdd__8CWarWaspFR13CStateManager SwarmAdd__8CWarWaspFR13CStateManager: @@ -3004,7 +3004,7 @@ lbl_8010D598: /* 8010D5A4 0010A504 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8010D5A8 0010A508 7C 08 03 A6 */ mtlr r0 /* 8010D5AC 0010A50C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8010D5B0 0010A510 4E 80 00 20 */ blr +/* 8010D5B0 0010A510 4E 80 00 20 */ blr .global JoinCircleAttackTeam__8CWarWaspFiR13CStateManager JoinCircleAttackTeam__8CWarWaspFiR13CStateManager: @@ -3059,7 +3059,7 @@ lbl_8010D658: /* 8010D664 0010A5C4 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8010D668 0010A5C8 7C 08 03 A6 */ mtlr r0 /* 8010D66C 0010A5CC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8010D670 0010A5D0 4E 80 00 20 */ blr +/* 8010D670 0010A5D0 4E 80 00 20 */ blr .global SpecialAttack__8CWarWaspFR13CStateManager9EStateMsgf SpecialAttack__8CWarWaspFR13CStateManager9EStateMsgf: @@ -3214,7 +3214,7 @@ lbl_8010D894: /* 8010D89C 0010A7FC 83 C1 00 38 */ lwz r30, 0x38(r1) /* 8010D8A0 0010A800 7C 08 03 A6 */ mtlr r0 /* 8010D8A4 0010A804 38 21 00 40 */ addi r1, r1, 0x40 -/* 8010D8A8 0010A808 4E 80 00 20 */ blr +/* 8010D8A8 0010A808 4E 80 00 20 */ blr .global TelegraphAttack__8CWarWaspFR13CStateManager9EStateMsgf TelegraphAttack__8CWarWaspFR13CStateManager9EStateMsgf: @@ -3429,7 +3429,7 @@ lbl_8010DB80: /* 8010DBC8 0010AB28 83 C1 00 68 */ lwz r30, 0x68(r1) /* 8010DBCC 0010AB2C 7C 08 03 A6 */ mtlr r0 /* 8010DBD0 0010AB30 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 8010DBD4 0010AB34 4E 80 00 20 */ blr +/* 8010DBD4 0010AB34 4E 80 00 20 */ blr .global TargetPatrol__8CWarWaspFR13CStateManager9EStateMsgf TargetPatrol__8CWarWaspFR13CStateManager9EStateMsgf: @@ -3476,7 +3476,7 @@ lbl_8010DC20: /* 8010DC74 0010ABD4 81 9D 00 00 */ lwz r12, 0(r29) /* 8010DC78 0010ABD8 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 8010DC7C 0010ABDC 7D 89 03 A6 */ mtctr r12 -/* 8010DC80 0010ABE0 4E 80 04 21 */ bctrl +/* 8010DC80 0010ABE0 4E 80 04 21 */ bctrl /* 8010DC84 0010ABE4 28 03 00 00 */ cmplwi r3, 0 /* 8010DC88 0010ABE8 41 82 00 94 */ beq lbl_8010DD1C /* 8010DC8C 0010ABEC FC 20 F8 90 */ fmr f1, f31 @@ -3489,7 +3489,7 @@ lbl_8010DCA4: /* 8010DCA4 0010AC04 81 83 00 00 */ lwz r12, 0(r3) /* 8010DCA8 0010AC08 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 8010DCAC 0010AC0C 7D 89 03 A6 */ mtctr r12 -/* 8010DCB0 0010AC10 4E 80 04 21 */ bctrl +/* 8010DCB0 0010AC10 4E 80 04 21 */ bctrl /* 8010DCB4 0010AC14 28 03 00 00 */ cmplwi r3, 0 /* 8010DCB8 0010AC18 41 82 00 40 */ beq lbl_8010DCF8 /* 8010DCBC 0010AC1C 7F A3 EB 78 */ mr r3, r29 @@ -3498,7 +3498,7 @@ lbl_8010DCA4: /* 8010DCC8 0010AC28 C0 22 94 F0 */ lfs f1, lbl_805AB210@sda21(r2) /* 8010DCCC 0010AC2C 81 8C 01 90 */ lwz r12, 0x190(r12) /* 8010DCD0 0010AC30 7D 89 03 A6 */ mtctr r12 -/* 8010DCD4 0010AC34 4E 80 04 21 */ bctrl +/* 8010DCD4 0010AC34 4E 80 04 21 */ bctrl /* 8010DCD8 0010AC38 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8010DCDC 0010AC3C 40 82 00 1C */ bne lbl_8010DCF8 /* 8010DCE0 0010AC40 FC 20 F8 90 */ fmr f1, f31 @@ -3527,7 +3527,7 @@ lbl_8010DD1C: /* 8010DD30 0010AC90 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8010DD34 0010AC94 7C 08 03 A6 */ mtlr r0 /* 8010DD38 0010AC98 38 21 00 30 */ addi r1, r1, 0x30 -/* 8010DD3C 0010AC9C 4E 80 00 20 */ blr +/* 8010DD3C 0010AC9C 4E 80 00 20 */ blr .global Dodge__8CWarWaspFR13CStateManager9EStateMsgf Dodge__8CWarWaspFR13CStateManager9EStateMsgf: @@ -3613,7 +3613,7 @@ lbl_8010DE5C: /* 8010DE64 0010ADC4 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8010DE68 0010ADC8 7C 08 03 A6 */ mtlr r0 /* 8010DE6C 0010ADCC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8010DE70 0010ADD0 4E 80 00 20 */ blr +/* 8010DE70 0010ADD0 4E 80 00 20 */ blr .global Deactivate__8CWarWaspFR13CStateManager9EStateMsgf Deactivate__8CWarWaspFR13CStateManager9EStateMsgf: @@ -3663,7 +3663,7 @@ lbl_8010DEC0: /* 8010DF1C 0010AE7C 81 9D 00 00 */ lwz r12, 0(r29) /* 8010DF20 0010AE80 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 8010DF24 0010AE84 7D 89 03 A6 */ mtctr r12 -/* 8010DF28 0010AE88 4E 80 04 21 */ bctrl +/* 8010DF28 0010AE88 4E 80 04 21 */ bctrl /* 8010DF2C 0010AE8C 28 03 00 00 */ cmplwi r3, 0 /* 8010DF30 0010AE90 41 82 01 9C */ beq lbl_8010E0CC /* 8010DF34 0010AE94 FC 20 F8 90 */ fmr f1, f31 @@ -3783,7 +3783,7 @@ lbl_8010E0CC: /* 8010E0E0 0010B040 83 A1 00 34 */ lwz r29, 0x34(r1) /* 8010E0E4 0010B044 7C 08 03 A6 */ mtlr r0 /* 8010E0E8 0010B048 38 21 00 50 */ addi r1, r1, 0x50 -/* 8010E0EC 0010B04C 4E 80 00 20 */ blr +/* 8010E0EC 0010B04C 4E 80 00 20 */ blr .global Patrol__8CWarWaspFR13CStateManager9EStateMsgf Patrol__8CWarWaspFR13CStateManager9EStateMsgf: @@ -3862,7 +3862,7 @@ lbl_8010E1CC: /* 8010E1FC 0010B15C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8010E200 0010B160 7C 08 03 A6 */ mtlr r0 /* 8010E204 0010B164 38 21 00 40 */ addi r1, r1, 0x40 -/* 8010E208 0010B168 4E 80 00 20 */ blr +/* 8010E208 0010B168 4E 80 00 20 */ blr .global Retreat__8CWarWaspFR13CStateManager9EStateMsgf Retreat__8CWarWaspFR13CStateManager9EStateMsgf: @@ -3935,7 +3935,7 @@ lbl_8010E2FC: /* 8010E300 0010B260 83 E1 00 4C */ lwz r31, 0x4c(r1) /* 8010E304 0010B264 7C 08 03 A6 */ mtlr r0 /* 8010E308 0010B268 38 21 00 50 */ addi r1, r1, 0x50 -/* 8010E30C 0010B26C 4E 80 00 20 */ blr +/* 8010E30C 0010B26C 4E 80 00 20 */ blr .global JumpBack__8CWarWaspFR13CStateManager9EStateMsgf JumpBack__8CWarWaspFR13CStateManager9EStateMsgf: @@ -4046,7 +4046,7 @@ lbl_8010E488: /* 8010E48C 0010B3EC 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8010E490 0010B3F0 7C 08 03 A6 */ mtlr r0 /* 8010E494 0010B3F4 38 21 00 30 */ addi r1, r1, 0x30 -/* 8010E498 0010B3F8 4E 80 00 20 */ blr +/* 8010E498 0010B3F8 4E 80 00 20 */ blr .global Shuffle__8CWarWaspFR13CStateManager9EStateMsgf Shuffle__8CWarWaspFR13CStateManager9EStateMsgf: @@ -4269,7 +4269,7 @@ lbl_8010E7C4: /* 8010E7D0 0010B730 83 A1 00 D4 */ lwz r29, 0xd4(r1) /* 8010E7D4 0010B734 7C 08 03 A6 */ mtlr r0 /* 8010E7D8 0010B738 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 8010E7DC 0010B73C 4E 80 00 20 */ blr +/* 8010E7DC 0010B73C 4E 80 00 20 */ blr .global PathFind__8CWarWaspFR13CStateManager9EStateMsgf PathFind__8CWarWaspFR13CStateManager9EStateMsgf: @@ -4320,7 +4320,7 @@ lbl_8010E878: /* 8010E87C 0010B7DC 81 9D 00 00 */ lwz r12, 0(r29) /* 8010E880 0010B7E0 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 8010E884 0010B7E4 7D 89 03 A6 */ mtctr r12 -/* 8010E888 0010B7E8 4E 80 04 21 */ bctrl +/* 8010E888 0010B7E8 4E 80 04 21 */ bctrl /* 8010E88C 0010B7EC 28 03 00 00 */ cmplwi r3, 0 /* 8010E890 0010B7F0 41 82 00 68 */ beq lbl_8010E8F8 /* 8010E894 0010B7F4 7F A3 EB 78 */ mr r3, r29 @@ -4329,14 +4329,14 @@ lbl_8010E878: /* 8010E8A0 0010B800 C0 22 94 F0 */ lfs f1, lbl_805AB210@sda21(r2) /* 8010E8A4 0010B804 81 8C 01 90 */ lwz r12, 0x190(r12) /* 8010E8A8 0010B808 7D 89 03 A6 */ mtctr r12 -/* 8010E8AC 0010B80C 4E 80 04 21 */ bctrl +/* 8010E8AC 0010B80C 4E 80 04 21 */ bctrl /* 8010E8B0 0010B810 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8010E8B4 0010B814 40 82 00 44 */ bne lbl_8010E8F8 /* 8010E8B8 0010B818 7F A3 EB 78 */ mr r3, r29 /* 8010E8BC 0010B81C 81 9D 00 00 */ lwz r12, 0(r29) /* 8010E8C0 0010B820 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 8010E8C4 0010B824 7D 89 03 A6 */ mtctr r12 -/* 8010E8C8 0010B828 4E 80 04 21 */ bctrl +/* 8010E8C8 0010B828 4E 80 04 21 */ bctrl /* 8010E8CC 0010B82C 80 83 00 04 */ lwz r4, 4(r3) /* 8010E8D0 0010B830 80 63 00 C8 */ lwz r3, 0xc8(r3) /* 8010E8D4 0010B834 38 04 FF FF */ addi r0, r4, -1 @@ -4403,7 +4403,7 @@ lbl_8010E9A0: /* 8010E9B4 0010B914 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8010E9B8 0010B918 7C 08 03 A6 */ mtlr r0 /* 8010E9BC 0010B91C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8010E9C0 0010B920 4E 80 00 20 */ blr +/* 8010E9C0 0010B920 4E 80 00 20 */ blr .global ProjectileAttack__8CWarWaspFR13CStateManager9EStateMsgf ProjectileAttack__8CWarWaspFR13CStateManager9EStateMsgf: @@ -4569,7 +4569,7 @@ lbl_8010EC0C: /* 8010EC14 0010BB74 83 C1 00 48 */ lwz r30, 0x48(r1) /* 8010EC18 0010BB78 7C 08 03 A6 */ mtlr r0 /* 8010EC1C 0010BB7C 38 21 00 50 */ addi r1, r1, 0x50 -/* 8010EC20 0010BB80 4E 80 00 20 */ blr +/* 8010EC20 0010BB80 4E 80 00 20 */ blr .global Attack__8CWarWaspFR13CStateManager9EStateMsgf Attack__8CWarWaspFR13CStateManager9EStateMsgf: @@ -4776,7 +4776,7 @@ lbl_8010EEF0: /* 8010EF10 0010BE70 83 C1 00 68 */ lwz r30, 0x68(r1) /* 8010EF14 0010BE74 7C 08 03 A6 */ mtlr r0 /* 8010EF18 0010BE78 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8010EF1C 0010BE7C 4E 80 00 20 */ blr +/* 8010EF1C 0010BE7C 4E 80 00 20 */ blr .global Generate__8CWarWaspFR13CStateManager9EStateMsgf Generate__8CWarWaspFR13CStateManager9EStateMsgf: @@ -5094,7 +5094,7 @@ lbl_8010F39C: /* 8010F3B8 0010C318 83 A1 01 04 */ lwz r29, 0x104(r1) /* 8010F3BC 0010C31C 7C 08 03 A6 */ mtlr r0 /* 8010F3C0 0010C320 38 21 01 30 */ addi r1, r1, 0x130 -/* 8010F3C4 0010C324 4E 80 00 20 */ blr +/* 8010F3C4 0010C324 4E 80 00 20 */ blr .global AnimOver__8CWarWaspFR13CStateManagerf AnimOver__8CWarWaspFR13CStateManagerf: @@ -5102,7 +5102,7 @@ AnimOver__8CWarWaspFR13CStateManagerf: /* 8010F3CC 0010C32C 20 00 00 03 */ subfic r0, r0, 3 /* 8010F3D0 0010C330 7C 00 00 34 */ cntlzw r0, r0 /* 8010F3D4 0010C334 54 03 D9 7E */ srwi r3, r0, 5 -/* 8010F3D8 0010C338 4E 80 00 20 */ blr +/* 8010F3D8 0010C338 4E 80 00 20 */ blr .global InPosition__8CWarWaspFR13CStateManagerf InPosition__8CWarWaspFR13CStateManagerf: @@ -5114,14 +5114,14 @@ InPosition__8CWarWaspFR13CStateManagerf: /* 8010F3F0 0010C350 81 83 00 00 */ lwz r12, 0(r3) /* 8010F3F4 0010C354 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 8010F3F8 0010C358 7D 89 03 A6 */ mtctr r12 -/* 8010F3FC 0010C35C 4E 80 04 21 */ bctrl +/* 8010F3FC 0010C35C 4E 80 04 21 */ bctrl /* 8010F400 0010C360 28 03 00 00 */ cmplwi r3, 0 /* 8010F404 0010C364 41 82 00 38 */ beq lbl_8010F43C /* 8010F408 0010C368 7F E3 FB 78 */ mr r3, r31 /* 8010F40C 0010C36C 81 9F 00 00 */ lwz r12, 0(r31) /* 8010F410 0010C370 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 8010F414 0010C374 7D 89 03 A6 */ mtctr r12 -/* 8010F418 0010C378 4E 80 04 21 */ bctrl +/* 8010F418 0010C378 4E 80 04 21 */ bctrl /* 8010F41C 0010C37C 80 A3 00 C8 */ lwz r5, 0xc8(r3) /* 8010F420 0010C380 80 63 00 04 */ lwz r3, 4(r3) /* 8010F424 0010C384 7C A4 FE 70 */ srawi r4, r5, 0x1f @@ -5152,7 +5152,7 @@ lbl_8010F47C: /* 8010F480 0010C3E0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8010F484 0010C3E4 7C 08 03 A6 */ mtlr r0 /* 8010F488 0010C3E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8010F48C 0010C3EC 4E 80 00 20 */ blr +/* 8010F48C 0010C3EC 4E 80 00 20 */ blr .global Leash__8CWarWaspFR13CStateManagerf Leash__8CWarWaspFR13CStateManagerf: @@ -5194,10 +5194,10 @@ Leash__8CWarWaspFR13CStateManagerf: /* 8010F51C 0010C47C 38 00 00 01 */ li r0, 1 lbl_8010F520: /* 8010F520 0010C480 7C 03 03 78 */ mr r3, r0 -/* 8010F524 0010C484 4E 80 00 20 */ blr +/* 8010F524 0010C484 4E 80 00 20 */ blr lbl_8010F528: /* 8010F528 0010C488 38 60 00 00 */ li r3, 0 -/* 8010F52C 0010C48C 4E 80 00 20 */ blr +/* 8010F52C 0010C48C 4E 80 00 20 */ blr .global ShouldDodge__8CWarWaspFR13CStateManagerf ShouldDodge__8CWarWaspFR13CStateManagerf: @@ -5385,7 +5385,7 @@ lbl_8010F7B8: /* 8010F7C8 0010C728 83 81 08 A0 */ lwz r28, 0x8a0(r1) /* 8010F7CC 0010C72C 7C 08 03 A6 */ mtlr r0 /* 8010F7D0 0010C730 38 21 08 B0 */ addi r1, r1, 0x8b0 -/* 8010F7D4 0010C734 4E 80 00 20 */ blr +/* 8010F7D4 0010C734 4E 80 00 20 */ blr .global ShouldTurn__8CWarWaspFR13CStateManagerf ShouldTurn__8CWarWaspFR13CStateManagerf: @@ -5445,7 +5445,7 @@ ShouldTurn__8CWarWaspFR13CStateManagerf: /* 8010F8AC 0010C80C 83 E1 00 5C */ lwz r31, 0x5c(r1) /* 8010F8B0 0010C810 7C 08 03 A6 */ mtlr r0 /* 8010F8B4 0010C814 38 21 00 70 */ addi r1, r1, 0x70 -/* 8010F8B8 0010C818 4E 80 00 20 */ blr +/* 8010F8B8 0010C818 4E 80 00 20 */ blr .global ShouldSpecialAttack__8CWarWaspFR13CStateManagerf ShouldSpecialAttack__8CWarWaspFR13CStateManagerf: @@ -5631,7 +5631,7 @@ lbl_8010FB6C: /* 8010FB74 0010CAD4 83 C1 00 B8 */ lwz r30, 0xb8(r1) /* 8010FB78 0010CAD8 7C 08 03 A6 */ mtlr r0 /* 8010FB7C 0010CADC 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 8010FB80 0010CAE0 4E 80 00 20 */ blr +/* 8010FB80 0010CAE0 4E 80 00 20 */ blr .global ShouldFire__8CWarWaspFR13CStateManagerf ShouldFire__8CWarWaspFR13CStateManagerf: @@ -5776,7 +5776,7 @@ lbl_8010FD80: /* 8010FDA0 0010CD00 83 C1 00 68 */ lwz r30, 0x68(r1) /* 8010FDA4 0010CD04 7C 08 03 A6 */ mtlr r0 /* 8010FDA8 0010CD08 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8010FDAC 0010CD0C 4E 80 00 20 */ blr +/* 8010FDAC 0010CD0C 4E 80 00 20 */ blr .global ShouldAttack__8CWarWaspFR13CStateManagerf ShouldAttack__8CWarWaspFR13CStateManagerf: @@ -5880,7 +5880,7 @@ lbl_8010FF20: /* 8010FF28 0010CE88 83 C1 00 58 */ lwz r30, 0x58(r1) /* 8010FF2C 0010CE8C 7C 08 03 A6 */ mtlr r0 /* 8010FF30 0010CE90 38 21 00 60 */ addi r1, r1, 0x60 -/* 8010FF34 0010CE94 4E 80 00 20 */ blr +/* 8010FF34 0010CE94 4E 80 00 20 */ blr .global InAttackPosition__8CWarWaspFR13CStateManagerf InAttackPosition__8CWarWaspFR13CStateManagerf: @@ -5941,7 +5941,7 @@ InAttackPosition__8CWarWaspFR13CStateManagerf: /* 80110010 0010CF70 C0 22 95 64 */ lfs f1, lbl_805AB284@sda21(r2) /* 80110014 0010CF74 81 8C 01 E8 */ lwz r12, 0x1e8(r12) /* 80110018 0010CF78 7D 89 03 A6 */ mtctr r12 -/* 8011001C 0010CF7C 4E 80 04 21 */ bctrl +/* 8011001C 0010CF7C 4E 80 04 21 */ bctrl /* 80110020 0010CF80 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80110024 0010CF84 40 82 00 08 */ bne lbl_8011002C /* 80110028 0010CF88 3B E0 00 01 */ li r31, 1 @@ -6031,7 +6031,7 @@ lbl_80110148: /* 80110164 0010D0C4 83 81 00 B0 */ lwz r28, 0xb0(r1) /* 80110168 0010D0C8 7C 08 03 A6 */ mtlr r0 /* 8011016C 0010D0CC 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 80110170 0010D0D0 4E 80 00 20 */ blr +/* 80110170 0010D0D0 4E 80 00 20 */ blr .global HearShot__8CWarWaspFR13CStateManagerf HearShot__8CWarWaspFR13CStateManagerf: @@ -6070,7 +6070,7 @@ lbl_801101E4: /* 801101E4 0010D144 80 01 00 24 */ lwz r0, 0x24(r1) /* 801101E8 0010D148 7C 08 03 A6 */ mtlr r0 /* 801101EC 0010D14C 38 21 00 20 */ addi r1, r1, 0x20 -/* 801101F0 0010D150 4E 80 00 20 */ blr +/* 801101F0 0010D150 4E 80 00 20 */ blr .global PathShagged__8CWarWaspFR13CStateManagerf PathShagged__8CWarWaspFR13CStateManagerf: @@ -6082,14 +6082,14 @@ PathShagged__8CWarWaspFR13CStateManagerf: /* 80110208 0010D168 81 83 00 00 */ lwz r12, 0(r3) /* 8011020C 0010D16C 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 80110210 0010D170 7D 89 03 A6 */ mtctr r12 -/* 80110214 0010D174 4E 80 04 21 */ bctrl +/* 80110214 0010D174 4E 80 04 21 */ bctrl /* 80110218 0010D178 28 03 00 00 */ cmplwi r3, 0 /* 8011021C 0010D17C 41 82 00 2C */ beq lbl_80110248 /* 80110220 0010D180 7F E3 FB 78 */ mr r3, r31 /* 80110224 0010D184 81 9F 00 00 */ lwz r12, 0(r31) /* 80110228 0010D188 81 8C 02 AC */ lwz r12, 0x2ac(r12) /* 8011022C 0010D18C 7D 89 03 A6 */ mtctr r12 -/* 80110230 0010D190 4E 80 04 21 */ bctrl +/* 80110230 0010D190 4E 80 04 21 */ bctrl /* 80110234 0010D194 80 63 00 CC */ lwz r3, 0xcc(r3) /* 80110238 0010D198 7C 03 00 D0 */ neg r0, r3 /* 8011023C 0010D19C 7C 00 1B 78 */ or r0, r0, r3 @@ -6102,7 +6102,7 @@ lbl_8011024C: /* 80110250 0010D1B0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80110254 0010D1B4 7C 08 03 A6 */ mtlr r0 /* 80110258 0010D1B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011025C 0010D1BC 4E 80 00 20 */ blr +/* 8011025C 0010D1BC 4E 80 00 20 */ blr .global GetOrigin__8CWarWaspCFv GetOrigin__8CWarWaspCFv: @@ -6149,7 +6149,7 @@ lbl_801102EC: /* 801102F0 0010D250 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801102F4 0010D254 7C 08 03 A6 */ mtlr r0 /* 801102F8 0010D258 38 21 00 20 */ addi r1, r1, 0x20 -/* 801102FC 0010D25C 4E 80 00 20 */ blr +/* 801102FC 0010D25C 4E 80 00 20 */ blr .global Listen__8CWarWaspFRC9CVector3f16EListenNoiseType Listen__8CWarWaspFRC9CVector3f16EListenNoiseType: @@ -6180,10 +6180,10 @@ lbl_80110314: /* 8011035C 0010D2BC 50 80 07 FE */ rlwimi r0, r4, 0, 0x1f, 0x1f /* 80110360 0010D2C0 98 03 07 2E */ stb r0, 0x72e(r3) /* 80110364 0010D2C4 38 60 00 01 */ li r3, 1 -/* 80110368 0010D2C8 4E 80 00 20 */ blr +/* 80110368 0010D2C8 4E 80 00 20 */ blr lbl_8011036C: /* 8011036C 0010D2CC 38 60 00 00 */ li r3, 0 -/* 80110370 0010D2D0 4E 80 00 20 */ blr +/* 80110370 0010D2D0 4E 80 00 20 */ blr .global DoUserAnimEvent__8CWarWaspFR13CStateManagerRC13CInt32POINode14EUserEventType DoUserAnimEvent__8CWarWaspFR13CStateManagerRC13CInt32POINode14EUserEventType: @@ -6206,7 +6206,7 @@ DoUserAnimEvent__8CWarWaspFR13CStateManagerRC13CInt32POINode14EUserEventType: /* 801103B4 0010D314 38 84 02 5C */ addi r4, r4, lbl_803E025C@l /* 801103B8 0010D318 7C 04 00 2E */ lwzx r0, r4, r0 /* 801103BC 0010D31C 7C 09 03 A6 */ mtctr r0 -/* 801103C0 0010D320 4E 80 04 20 */ bctr +/* 801103C0 0010D320 4E 80 04 20 */ bctr .global lbl_801103C4 lbl_801103C4: /* 801103C4 0010D324 7F 84 E3 78 */ mr r4, r28 @@ -6350,7 +6350,7 @@ lbl_801105B4: /* 801105D4 0010D534 81 9C 00 00 */ lwz r12, 0(r28) /* 801105D8 0010D538 81 8C 02 C0 */ lwz r12, 0x2c0(r12) /* 801105DC 0010D53C 7D 89 03 A6 */ mtctr r12 -/* 801105E0 0010D540 4E 80 04 21 */ bctrl +/* 801105E0 0010D540 4E 80 04 21 */ bctrl /* 801105E4 0010D544 FC 20 F8 90 */ fmr f1, f31 /* 801105E8 0010D548 7C 64 1B 78 */ mr r4, r3 /* 801105EC 0010D54C 7F 67 DB 78 */ mr r7, r27 @@ -6451,12 +6451,12 @@ lbl_80110730: /* 8011073C 0010D69C 80 01 0A 24 */ lwz r0, 0xa24(r1) /* 80110740 0010D6A0 7C 08 03 A6 */ mtlr r0 /* 80110744 0010D6A4 38 21 0A 20 */ addi r1, r1, 0xa20 -/* 80110748 0010D6A8 4E 80 00 20 */ blr +/* 80110748 0010D6A8 4E 80 00 20 */ blr .global GetCollisionPrimitive__8CWarWaspCFv GetCollisionPrimitive__8CWarWaspCFv: /* 8011074C 0010D6AC 38 63 05 70 */ addi r3, r3, 0x570 -/* 80110750 0010D6B0 4E 80 00 20 */ blr +/* 80110750 0010D6B0 4E 80 00 20 */ blr .global GetTouchBounds__8CWarWaspCFv GetTouchBounds__8CWarWaspCFv: @@ -6472,7 +6472,7 @@ GetTouchBounds__8CWarWaspCFv: /* 80110778 0010D6D8 38 A5 00 34 */ addi r5, r5, 0x34 /* 8011077C 0010D6DC 81 8C 00 14 */ lwz r12, 0x14(r12) /* 80110780 0010D6E0 7D 89 03 A6 */ mtctr r12 -/* 80110784 0010D6E4 4E 80 04 21 */ bctrl +/* 80110784 0010D6E4 4E 80 04 21 */ bctrl /* 80110788 0010D6E8 38 00 00 01 */ li r0, 1 /* 8011078C 0010D6EC 28 1F 00 00 */ cmplwi r31, 0 /* 80110790 0010D6F0 98 1F 00 18 */ stb r0, 0x18(r31) @@ -6494,12 +6494,12 @@ lbl_801107C8: /* 801107CC 0010D72C 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 801107D0 0010D730 7C 08 03 A6 */ mtlr r0 /* 801107D4 0010D734 38 21 00 30 */ addi r1, r1, 0x30 -/* 801107D8 0010D738 4E 80 00 20 */ blr +/* 801107D8 0010D738 4E 80 00 20 */ blr .global ProjectileInfo__8CWarWaspFv ProjectileInfo__8CWarWaspFv: /* 801107DC 0010D73C 38 63 06 D4 */ addi r3, r3, 0x6d4 -/* 801107E0 0010D740 4E 80 00 20 */ blr +/* 801107E0 0010D740 4E 80 00 20 */ blr .global Think__8CWarWaspFfR13CStateManager Think__8CWarWaspFfR13CStateManager: @@ -6575,7 +6575,7 @@ lbl_801108CC: /* 801108EC 0010D84C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 801108F0 0010D850 7C 08 03 A6 */ mtlr r0 /* 801108F4 0010D854 38 21 00 50 */ addi r1, r1, 0x50 -/* 801108F8 0010D858 4E 80 00 20 */ blr +/* 801108F8 0010D858 4E 80 00 20 */ blr .global Death__8CWarWaspFRC9CVector3fR13CStateManager Death__8CWarWaspFRC9CVector3fR13CStateManager: @@ -6603,7 +6603,7 @@ Death__8CWarWaspFRC9CVector3fR13CStateManager: /* 80110950 0010D8B0 83 C1 00 08 */ lwz r30, 8(r1) /* 80110954 0010D8B4 7C 08 03 A6 */ mtlr r0 /* 80110958 0010D8B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011095C 0010D8BC 4E 80 00 20 */ blr +/* 8011095C 0010D8BC 4E 80 00 20 */ blr .global AcceptScriptMsg__8CWarWaspF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__8CWarWaspF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -6684,7 +6684,7 @@ lbl_80110A60: /* 80110A6C 0010D9CC 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80110A70 0010D9D0 7C 08 03 A6 */ mtlr r0 /* 80110A74 0010D9D4 38 21 00 30 */ addi r1, r1, 0x30 -/* 80110A78 0010D9D8 4E 80 00 20 */ blr +/* 80110A78 0010D9D8 4E 80 00 20 */ blr .global Accept__8CWarWaspFR8IVisitor Accept__8CWarWaspFR8IVisitor: @@ -6697,11 +6697,11 @@ Accept__8CWarWaspFR8IVisitor: /* 80110A94 0010D9F4 7C 04 03 78 */ mr r4, r0 /* 80110A98 0010D9F8 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 80110A9C 0010D9FC 7D 89 03 A6 */ mtctr r12 -/* 80110AA0 0010DA00 4E 80 04 21 */ bctrl +/* 80110AA0 0010DA00 4E 80 04 21 */ bctrl /* 80110AA4 0010DA04 80 01 00 14 */ lwz r0, 0x14(r1) /* 80110AA8 0010DA08 7C 08 03 A6 */ mtlr r0 /* 80110AAC 0010DA0C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80110AB0 0010DA10 4E 80 00 20 */ blr +/* 80110AB0 0010DA10 4E 80 00 20 */ blr .global __dt__8CWarWaspFv __dt__8CWarWaspFv: @@ -6796,7 +6796,7 @@ lbl_80110BE0: /* 80110BEC 0010DB4C 83 C1 00 08 */ lwz r30, 8(r1) /* 80110BF0 0010DB50 7C 08 03 A6 */ mtlr r0 /* 80110BF4 0010DB54 38 21 00 10 */ addi r1, r1, 0x10 -/* 80110BF8 0010DB58 4E 80 00 20 */ blr +/* 80110BF8 0010DB58 4E 80 00 20 */ blr .global "__ct__8CWarWaspF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC14CPatternedInfoQ210CPatterned11EFlavorTypeQ210CPatterned13EColliderTypeRC11CDamageInfoRC16CActorParametersUiRC11CDamageInfoUiUi" "__ct__8CWarWaspF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC14CPatternedInfoQ210CPatterned11EFlavorTypeQ210CPatterned13EColliderTypeRC11CDamageInfoRC16CActorParametersUiRC11CDamageInfoUiUi": @@ -6979,7 +6979,7 @@ lbl_80110E7C: /* 80110EB8 0010DE18 81 84 00 00 */ lwz r12, 0(r4) /* 80110EBC 0010DE1C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80110EC0 0010DE20 7D 89 03 A6 */ mtctr r12 -/* 80110EC4 0010DE24 4E 80 04 21 */ bctrl +/* 80110EC4 0010DE24 4E 80 04 21 */ bctrl /* 80110EC8 0010DE28 3A E1 00 34 */ addi r23, r1, 0x34 /* 80110ECC 0010DE2C 38 81 00 24 */ addi r4, r1, 0x24 /* 80110ED0 0010DE30 7E E3 BB 78 */ mr r3, r23 diff --git a/asm/MetroidPrime/Enemies/PatternedCastTo.s b/asm/MetroidPrime/Enemies/PatternedCastTo.s index 91cd25aa..8b051dd6 100644 --- a/asm/MetroidPrime/Enemies/PatternedCastTo.s +++ b/asm/MetroidPrime/Enemies/PatternedCastTo.s @@ -14,12 +14,12 @@ /* 800A5358 000A22B8 80 01 00 14 */ lwz r0, 0x14(r1) /* 800A535C 000A22BC 7C 08 03 A6 */ mtlr r0 /* 800A5360 000A22C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A5364 000A22C4 4E 80 00 20 */ blr +/* 800A5364 000A22C4 4E 80 00 20 */ blr .global sub_800a5368 sub_800a5368: /* 800A5368 000A22C8 90 83 00 00 */ stw r4, 0(r3) -/* 800A536C 000A22CC 4E 80 00 20 */ blr +/* 800A536C 000A22CC 4E 80 00 20 */ blr .global "CastTo<22CThardusRockProjectile>__10CPatternedFP7CEntity" "CastTo<22CThardusRockProjectile>__10CPatternedFP7CEntity": @@ -33,12 +33,12 @@ sub_800a5368: /* 800A538C 000A22EC 80 01 00 14 */ lwz r0, 0x14(r1) /* 800A5390 000A22F0 7C 08 03 A6 */ mtlr r0 /* 800A5394 000A22F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A5398 000A22F8 4E 80 00 20 */ blr +/* 800A5398 000A22F8 4E 80 00 20 */ blr .global sub_800a539c sub_800a539c: /* 800A539C 000A22FC 90 83 00 00 */ stw r4, 0(r3) -/* 800A53A0 000A2300 4E 80 00 20 */ blr +/* 800A53A0 000A2300 4E 80 00 20 */ blr .global "CastTo<12CSpacePirate>__10CPatternedFP7CEntity" "CastTo<12CSpacePirate>__10CPatternedFP7CEntity": @@ -52,12 +52,12 @@ sub_800a539c: /* 800A53C0 000A2320 80 01 00 14 */ lwz r0, 0x14(r1) /* 800A53C4 000A2324 7C 08 03 A6 */ mtlr r0 /* 800A53C8 000A2328 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A53CC 000A232C 4E 80 00 20 */ blr +/* 800A53CC 000A232C 4E 80 00 20 */ blr .global sub_800a53d0 sub_800a53d0: /* 800A53D0 000A2330 90 83 00 00 */ stw r4, 0(r3) -/* 800A53D4 000A2334 4E 80 00 20 */ blr +/* 800A53D4 000A2334 4E 80 00 20 */ blr .global "CastTo<11CPuddleToad>__10CPatternedFP7CEntity" "CastTo<11CPuddleToad>__10CPatternedFP7CEntity": @@ -71,12 +71,12 @@ sub_800a53d0: /* 800A53F4 000A2354 80 01 00 14 */ lwz r0, 0x14(r1) /* 800A53F8 000A2358 7C 08 03 A6 */ mtlr r0 /* 800A53FC 000A235C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A5400 000A2360 4E 80 00 20 */ blr +/* 800A5400 000A2360 4E 80 00 20 */ blr .global sub_800a5404 sub_800a5404: /* 800A5404 000A2364 90 83 00 00 */ stw r4, 0(r3) -/* 800A5408 000A2368 4E 80 00 20 */ blr +/* 800A5408 000A2368 4E 80 00 20 */ blr .global "CastTo<9CParasite>__10CPatternedFP7CEntity" "CastTo<9CParasite>__10CPatternedFP7CEntity": @@ -90,12 +90,12 @@ sub_800a5404: /* 800A5428 000A2388 80 01 00 14 */ lwz r0, 0x14(r1) /* 800A542C 000A238C 7C 08 03 A6 */ mtlr r0 /* 800A5430 000A2390 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A5434 000A2394 4E 80 00 20 */ blr +/* 800A5434 000A2394 4E 80 00 20 */ blr .global sub_800a5438 sub_800a5438: /* 800A5438 000A2398 90 83 00 00 */ stw r4, 0(r3) -/* 800A543C 000A239C 4E 80 00 20 */ blr +/* 800A543C 000A239C 4E 80 00 20 */ blr .global "CastTo<16CMetroidPrimeExo>__10CPatternedFP7CEntity" "CastTo<16CMetroidPrimeExo>__10CPatternedFP7CEntity": @@ -109,12 +109,12 @@ sub_800a5438: /* 800A545C 000A23BC 80 01 00 14 */ lwz r0, 0x14(r1) /* 800A5460 000A23C0 7C 08 03 A6 */ mtlr r0 /* 800A5464 000A23C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A5468 000A23C8 4E 80 00 20 */ blr +/* 800A5468 000A23C8 4E 80 00 20 */ blr .global sub_800a546c sub_800a546c: /* 800A546C 000A23CC 90 83 00 00 */ stw r4, 0(r3) -/* 800A5470 000A23D0 4E 80 00 20 */ blr +/* 800A5470 000A23D0 4E 80 00 20 */ blr .global "CastTo<12CMetroidBeta>__10CPatternedFP7CEntity" "CastTo<12CMetroidBeta>__10CPatternedFP7CEntity": @@ -128,12 +128,12 @@ sub_800a546c: /* 800A5490 000A23F0 80 01 00 14 */ lwz r0, 0x14(r1) /* 800A5494 000A23F4 7C 08 03 A6 */ mtlr r0 /* 800A5498 000A23F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A549C 000A23FC 4E 80 00 20 */ blr +/* 800A549C 000A23FC 4E 80 00 20 */ blr .global sub_800a54a0 sub_800a54a0: /* 800A54A0 000A2400 90 83 00 00 */ stw r4, 0(r3) -/* 800A54A4 000A2404 4E 80 00 20 */ blr +/* 800A54A4 000A2404 4E 80 00 20 */ blr .global "CastTo<8CMetroid>__10CPatternedFP7CEntity" "CastTo<8CMetroid>__10CPatternedFP7CEntity": @@ -147,12 +147,12 @@ sub_800a54a0: /* 800A54C4 000A2424 80 01 00 14 */ lwz r0, 0x14(r1) /* 800A54C8 000A2428 7C 08 03 A6 */ mtlr r0 /* 800A54CC 000A242C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A54D0 000A2430 4E 80 00 20 */ blr +/* 800A54D0 000A2430 4E 80 00 20 */ blr .global sub_800a54d4 sub_800a54d4: /* 800A54D4 000A2434 90 83 00 00 */ stw r4, 0(r3) -/* 800A54D8 000A2438 4E 80 00 20 */ blr +/* 800A54D8 000A2438 4E 80 00 20 */ blr .global "CastTo<9CJellyZap>__10CPatternedFP7CEntity" "CastTo<9CJellyZap>__10CPatternedFP7CEntity": @@ -166,12 +166,12 @@ sub_800a54d4: /* 800A54F8 000A2458 80 01 00 14 */ lwz r0, 0x14(r1) /* 800A54FC 000A245C 7C 08 03 A6 */ mtlr r0 /* 800A5500 000A2460 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A5504 000A2464 4E 80 00 20 */ blr +/* 800A5504 000A2464 4E 80 00 20 */ blr .global sub_800a5508 sub_800a5508: /* 800A5508 000A2468 90 83 00 00 */ stw r4, 0(r3) -/* 800A550C 000A246C 4E 80 00 20 */ blr +/* 800A550C 000A246C 4E 80 00 20 */ blr .global "CastTo<12CIceSheegoth>__10CPatternedFP7CEntity" "CastTo<12CIceSheegoth>__10CPatternedFP7CEntity": @@ -185,12 +185,12 @@ sub_800a5508: /* 800A552C 000A248C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800A5530 000A2490 7C 08 03 A6 */ mtlr r0 /* 800A5534 000A2494 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A5538 000A2498 4E 80 00 20 */ blr +/* 800A5538 000A2498 4E 80 00 20 */ blr .global sub_800a553c sub_800a553c: /* 800A553C 000A249C 90 83 00 00 */ stw r4, 0(r3) -/* 800A5540 000A24A0 4E 80 00 20 */ blr +/* 800A5540 000A24A0 4E 80 00 20 */ blr .global "CastTo<11CFlickerBat>__10CPatternedFP7CEntity" "CastTo<11CFlickerBat>__10CPatternedFP7CEntity": @@ -204,12 +204,12 @@ sub_800a553c: /* 800A5560 000A24C0 80 01 00 14 */ lwz r0, 0x14(r1) /* 800A5564 000A24C4 7C 08 03 A6 */ mtlr r0 /* 800A5568 000A24C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A556C 000A24CC 4E 80 00 20 */ blr +/* 800A556C 000A24CC 4E 80 00 20 */ blr .global sub_800a5570 sub_800a5570: /* 800A5570 000A24D0 90 83 00 00 */ stw r4, 0(r3) -/* 800A5574 000A24D4 4E 80 00 20 */ blr +/* 800A5574 000A24D4 4E 80 00 20 */ blr .global "CastTo<11CEnergyBall>__10CPatternedFP7CEntity" "CastTo<11CEnergyBall>__10CPatternedFP7CEntity": @@ -223,12 +223,12 @@ sub_800a5570: /* 800A5594 000A24F4 80 01 00 14 */ lwz r0, 0x14(r1) /* 800A5598 000A24F8 7C 08 03 A6 */ mtlr r0 /* 800A559C 000A24FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A55A0 000A2500 4E 80 00 20 */ blr +/* 800A55A0 000A2500 4E 80 00 20 */ blr .global sub_800a55a4 sub_800a55a4: /* 800A55A4 000A2504 90 83 00 00 */ stw r4, 0(r3) -/* 800A55A8 000A2508 4E 80 00 20 */ blr +/* 800A55A8 000A2508 4E 80 00 20 */ blr .global CastPatternedCharacter__FQ210CPatterned10ECharacterP7CEntity CastPatternedCharacter__FQ210CPatterned10ECharacterP7CEntity: @@ -253,4 +253,4 @@ lbl_800A55E8: /* 800A55EC 000A254C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 800A55F0 000A2550 7C 08 03 A6 */ mtlr r0 /* 800A55F4 000A2554 38 21 00 20 */ addi r1, r1, 0x20 -/* 800A55F8 000A2558 4E 80 00 20 */ blr +/* 800A55F8 000A2558 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/Enemies/SPositionHistory.s b/asm/MetroidPrime/Enemies/SPositionHistory.s index 338e2885..a1630545 100644 --- a/asm/MetroidPrime/Enemies/SPositionHistory.s +++ b/asm/MetroidPrime/Enemies/SPositionHistory.s @@ -87,13 +87,13 @@ lbl_802A08F0: /* 802A0920 0029D880 80 01 00 84 */ lwz r0, 0x84(r1) /* 802A0924 0029D884 7C 08 03 A6 */ mtlr r0 /* 802A0928 0029D888 38 21 00 80 */ addi r1, r1, 0x80 -/* 802A092C 0029D88C 4E 80 00 20 */ blr +/* 802A092C 0029D88C 4E 80 00 20 */ blr .global sub_802a0930 sub_802a0930: /* 802A0930 0029D890 80 C3 00 04 */ lwz r6, 4(r3) /* 802A0934 0029D894 2C 06 00 10 */ cmpwi r6, 0x10 -/* 802A0938 0029D898 4C 80 00 20 */ bgelr +/* 802A0938 0029D898 4C 80 00 20 */ bgelr /* 802A093C 0029D89C 2C 06 00 00 */ cmpwi r6, 0 /* 802A0940 0029D8A0 40 82 00 3C */ bne lbl_802A097C /* 802A0944 0029D8A4 1C 06 00 0C */ mulli r0, r6, 0xc @@ -110,7 +110,7 @@ lbl_802A096C: /* 802A096C 0029D8CC 80 83 00 04 */ lwz r4, 4(r3) /* 802A0970 0029D8D0 38 04 00 01 */ addi r0, r4, 1 /* 802A0974 0029D8D4 90 03 00 04 */ stw r0, 4(r3) -/* 802A0978 0029D8D8 4E 80 00 20 */ blr +/* 802A0978 0029D8D8 4E 80 00 20 */ blr lbl_802A097C: /* 802A097C 0029D8DC 38 06 FF FF */ addi r0, r6, -1 /* 802A0980 0029D8E0 38 E3 00 08 */ addi r7, r3, 8 @@ -130,7 +130,7 @@ lbl_802A097C: /* 802A09B8 0029D918 EC 24 09 3A */ fmadds f1, f4, f4, f1 /* 802A09BC 0029D91C EC 22 08 BA */ fmadds f1, f2, f2, f1 /* 802A09C0 0029D920 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 802A09C4 0029D924 4C 81 00 20 */ blelr +/* 802A09C4 0029D924 4C 81 00 20 */ blelr /* 802A09C8 0029D928 1C 06 00 0C */ mulli r0, r6, 0xc /* 802A09CC 0029D92C 7C A7 02 15 */ add. r5, r7, r0 /* 802A09D0 0029D930 41 82 00 18 */ beq lbl_802A09E8 @@ -143,7 +143,7 @@ lbl_802A09E8: /* 802A09E8 0029D948 80 83 00 04 */ lwz r4, 4(r3) /* 802A09EC 0029D94C 38 04 00 01 */ addi r0, r4, 1 /* 802A09F0 0029D950 90 03 00 04 */ stw r0, 4(r3) -/* 802A09F4 0029D954 4E 80 00 20 */ blr +/* 802A09F4 0029D954 4E 80 00 20 */ blr .global sub_802a09f8 sub_802a09f8: diff --git a/asm/MetroidPrime/Factories/CAssetFactory.s b/asm/MetroidPrime/Factories/CAssetFactory.s index 3cb583a2..d973c133 100644 --- a/asm/MetroidPrime/Factories/CAssetFactory.s +++ b/asm/MetroidPrime/Factories/CAssetFactory.s @@ -22,18 +22,18 @@ lbl_803D9CA8: .4byte sub_80034c54 .4byte 0 - + .section .text, "ax" .global CanBuild__Q224CCharacterFactoryBuilder13CDummyFactoryFRC10SObjectTag CanBuild__Q224CCharacterFactoryBuilder13CDummyFactoryFRC10SObjectTag: /* 8003484C 000317AC 38 60 00 01 */ li r3, 1 -/* 80034850 000317B0 4E 80 00 20 */ blr +/* 80034850 000317B0 4E 80 00 20 */ blr .global GetResourceIdByName__Q224CCharacterFactoryBuilder13CDummyFactoryCFPCc GetResourceIdByName__Q224CCharacterFactoryBuilder13CDummyFactoryCFPCc: /* 80034854 000317B4 38 60 00 00 */ li r3, 0 -/* 80034858 000317B8 4E 80 00 20 */ blr +/* 80034858 000317B8 4E 80 00 20 */ blr .global __dt__Q224CCharacterFactoryBuilder13CDummyFactoryFv __dt__Q224CCharacterFactoryBuilder13CDummyFactoryFv: @@ -61,7 +61,7 @@ lbl_800348A0: /* 800348A8 00031808 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800348AC 0003180C 7C 08 03 A6 */ mtlr r0 /* 800348B0 00031810 38 21 00 10 */ addi r1, r1, 0x10 -/* 800348B4 00031814 4E 80 00 20 */ blr +/* 800348B4 00031814 4E 80 00 20 */ blr .global GetFactory__24CCharacterFactoryBuilderFRC8CAnimRes GetFactory__24CCharacterFactoryBuilderFRC8CAnimRes: @@ -88,7 +88,7 @@ GetFactory__24CCharacterFactoryBuilderFRC8CAnimRes: /* 80034908 00031868 81 9E 00 04 */ lwz r12, 4(r30) /* 8003490C 0003186C 81 8C 00 08 */ lwz r12, 8(r12) /* 80034910 00031870 7D 89 03 A6 */ mtctr r12 -/* 80034914 00031874 4E 80 04 21 */ bctrl +/* 80034914 00031874 4E 80 04 21 */ bctrl /* 80034918 00031878 7F A3 EB 78 */ mr r3, r29 /* 8003491C 0003187C 38 81 00 0C */ addi r4, r1, 0xc /* 80034920 00031880 48 30 C5 89 */ bl __ct__6CTokenFRC6CToken @@ -103,7 +103,7 @@ GetFactory__24CCharacterFactoryBuilderFRC8CAnimRes: /* 80034944 000318A4 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80034948 000318A8 7C 08 03 A6 */ mtlr r0 /* 8003494C 000318AC 38 21 00 30 */ addi r1, r1, 0x30 -/* 80034950 000318B0 4E 80 00 20 */ blr +/* 80034950 000318B0 4E 80 00 20 */ blr .global Null__15CVParamTransferFv Null__15CVParamTransferFv: @@ -113,7 +113,7 @@ Null__15CVParamTransferFv: /* 80034960 000318C0 80 64 00 04 */ lwz r3, 4(r4) /* 80034964 000318C4 38 03 00 01 */ addi r0, r3, 1 /* 80034968 000318C8 90 04 00 04 */ stw r0, 4(r4) -/* 8003496C 000318CC 4E 80 00 20 */ blr +/* 8003496C 000318CC 4E 80 00 20 */ blr .global __dt__24CCharacterFactoryBuilderFv __dt__24CCharacterFactoryBuilderFv: @@ -149,7 +149,7 @@ lbl_800349D0: /* 800349DC 0003193C 83 C1 00 08 */ lwz r30, 8(r1) /* 800349E0 00031940 7C 08 03 A6 */ mtlr r0 /* 800349E4 00031944 38 21 00 10 */ addi r1, r1, 0x10 -/* 800349E8 00031948 4E 80 00 20 */ blr +/* 800349E8 00031948 4E 80 00 20 */ blr .global __ct__24CCharacterFactoryBuilderFv __ct__24CCharacterFactoryBuilderFv: @@ -173,11 +173,11 @@ __ct__24CCharacterFactoryBuilderFv: /* 80034A30 00031990 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80034A34 00031994 7C 08 03 A6 */ mtlr r0 /* 80034A38 00031998 38 21 00 10 */ addi r1, r1, 0x10 -/* 80034A3C 0003199C 4E 80 00 20 */ blr +/* 80034A3C 0003199C 4E 80 00 20 */ blr .global CancelBuild__Q224CCharacterFactoryBuilder13CDummyFactoryFRC10SObjectTag CancelBuild__Q224CCharacterFactoryBuilder13CDummyFactoryFRC10SObjectTag: -/* 80034A40 000319A0 4E 80 00 20 */ blr +/* 80034A40 000319A0 4E 80 00 20 */ blr .global BuildAsync__Q224CCharacterFactoryBuilder13CDummyFactoryFRC10SObjectTagRC15CVParamTransferPP4IObj BuildAsync__Q224CCharacterFactoryBuilder13CDummyFactoryFRC10SObjectTagRC15CVParamTransferPP4IObj: @@ -195,7 +195,7 @@ BuildAsync__Q224CCharacterFactoryBuilder13CDummyFactoryFRC10SObjectTagRC15CVPara /* 80034A70 000319D0 38 61 00 08 */ addi r3, r1, 8 /* 80034A74 000319D4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80034A78 000319D8 7D 89 03 A6 */ mtctr r12 -/* 80034A7C 000319DC 4E 80 04 21 */ bctrl +/* 80034A7C 000319DC 4E 80 04 21 */ bctrl /* 80034A80 000319E0 38 00 00 00 */ li r0, 0 /* 80034A84 000319E4 80 61 00 0C */ lwz r3, 0xc(r1) /* 80034A88 000319E8 98 01 00 08 */ stb r0, 8(r1) @@ -210,13 +210,13 @@ BuildAsync__Q224CCharacterFactoryBuilder13CDummyFactoryFRC10SObjectTagRC15CVPara /* 80034AAC 00031A0C 38 80 00 01 */ li r4, 1 /* 80034AB0 00031A10 81 8C 00 08 */ lwz r12, 8(r12) /* 80034AB4 00031A14 7D 89 03 A6 */ mtctr r12 -/* 80034AB8 00031A18 4E 80 04 21 */ bctrl +/* 80034AB8 00031A18 4E 80 04 21 */ bctrl lbl_80034ABC: /* 80034ABC 00031A1C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80034AC0 00031A20 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80034AC4 00031A24 7C 08 03 A6 */ mtlr r0 /* 80034AC8 00031A28 38 21 00 20 */ addi r1, r1, 0x20 -/* 80034ACC 00031A2C 4E 80 00 20 */ blr +/* 80034ACC 00031A2C 4E 80 00 20 */ blr .global Build__Q224CCharacterFactoryBuilder13CDummyFactoryFRC10SObjectTagRC15CVParamTransfer Build__Q224CCharacterFactoryBuilder13CDummyFactoryFRC10SObjectTagRC15CVParamTransfer: @@ -238,7 +238,7 @@ Build__Q224CCharacterFactoryBuilder13CDummyFactoryFRC10SObjectTagRC15CVParamTran /* 80034B0C 00031A6C 81 84 00 00 */ lwz r12, 0(r4) /* 80034B10 00031A70 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80034B14 00031A74 7D 89 03 A6 */ mtctr r12 -/* 80034B18 00031A78 4E 80 04 21 */ bctrl +/* 80034B18 00031A78 4E 80 04 21 */ bctrl /* 80034B1C 00031A7C 38 61 00 30 */ addi r3, r1, 0x30 /* 80034B20 00031A80 38 81 00 20 */ addi r4, r1, 0x20 /* 80034B24 00031A84 48 30 C3 85 */ bl __ct__6CTokenFRC6CToken @@ -283,7 +283,7 @@ lbl_80034B70: /* 80034BBC 00031B1C 38 80 00 01 */ li r4, 1 /* 80034BC0 00031B20 81 8C 00 08 */ lwz r12, 8(r12) /* 80034BC4 00031B24 7D 89 03 A6 */ mtctr r12 -/* 80034BC8 00031B28 4E 80 04 21 */ bctrl +/* 80034BC8 00031B28 4E 80 04 21 */ bctrl lbl_80034BCC: /* 80034BCC 00031B2C 88 01 00 08 */ lbz r0, 8(r1) /* 80034BD0 00031B30 28 00 00 00 */ cmplwi r0, 0 @@ -295,7 +295,7 @@ lbl_80034BCC: /* 80034BE8 00031B48 38 80 00 01 */ li r4, 1 /* 80034BEC 00031B4C 81 8C 00 08 */ lwz r12, 8(r12) /* 80034BF0 00031B50 7D 89 03 A6 */ mtctr r12 -/* 80034BF4 00031B54 4E 80 04 21 */ bctrl +/* 80034BF4 00031B54 4E 80 04 21 */ bctrl lbl_80034BF8: /* 80034BF8 00031B58 88 81 00 18 */ lbz r4, 0x18(r1) /* 80034BFC 00031B5C 38 00 00 00 */ li r0, 0 @@ -309,7 +309,7 @@ lbl_80034BF8: /* 80034C1C 00031B7C 38 80 00 01 */ li r4, 1 /* 80034C20 00031B80 81 8C 00 08 */ lwz r12, 8(r12) /* 80034C24 00031B84 7D 89 03 A6 */ mtctr r12 -/* 80034C28 00031B88 4E 80 04 21 */ bctrl +/* 80034C28 00031B88 4E 80 04 21 */ bctrl lbl_80034C2C: /* 80034C2C 00031B8C 38 61 00 30 */ addi r3, r1, 0x30 /* 80034C30 00031B90 38 80 00 00 */ li r4, 0 @@ -320,7 +320,7 @@ lbl_80034C2C: /* 80034C44 00031BA4 83 A1 00 44 */ lwz r29, 0x44(r1) /* 80034C48 00031BA8 7C 08 03 A6 */ mtlr r0 /* 80034C4C 00031BAC 38 21 00 50 */ addi r1, r1, 0x50 -/* 80034C50 00031BB0 4E 80 00 20 */ blr +/* 80034C50 00031BB0 4E 80 00 20 */ blr .global sub_80034c54 sub_80034c54: @@ -343,7 +343,7 @@ sub_80034c54: /* 80034C94 00031BF4 38 80 00 01 */ li r4, 1 /* 80034C98 00031BF8 81 8C 00 08 */ lwz r12, 8(r12) /* 80034C9C 00031BFC 7D 89 03 A6 */ mtctr r12 -/* 80034CA0 00031C00 4E 80 04 21 */ bctrl +/* 80034CA0 00031C00 4E 80 04 21 */ bctrl lbl_80034CA4: /* 80034CA4 00031C04 28 1E 00 00 */ cmplwi r30, 0 /* 80034CA8 00031C08 41 82 00 20 */ beq lbl_80034CC8 @@ -366,7 +366,7 @@ lbl_80034CD8: /* 80034CE4 00031C44 83 C1 00 08 */ lwz r30, 8(r1) /* 80034CE8 00031C48 7C 08 03 A6 */ mtlr r0 /* 80034CEC 00031C4C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80034CF0 00031C50 4E 80 00 20 */ blr +/* 80034CF0 00031C50 4E 80 00 20 */ blr .global sub_80034cf4 sub_80034cf4: @@ -380,7 +380,7 @@ sub_80034cf4: /* 80034D10 00031C70 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80034D14 00031C74 7C 08 03 A6 */ mtlr r0 /* 80034D18 00031C78 38 21 00 10 */ addi r1, r1, 0x10 -/* 80034D1C 00031C7C 4E 80 00 20 */ blr +/* 80034D1C 00031C7C 4E 80 00 20 */ blr .global sub_80034d20 sub_80034d20: @@ -423,7 +423,7 @@ lbl_80034D90: /* 80034DAC 00031D0C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80034DB0 00031D10 7C 08 03 A6 */ mtlr r0 /* 80034DB4 00031D14 38 21 00 10 */ addi r1, r1, 0x10 -/* 80034DB8 00031D18 4E 80 00 20 */ blr +/* 80034DB8 00031D18 4E 80 00 20 */ blr .global sub_80034dbc sub_80034dbc: @@ -445,4 +445,4 @@ lbl_80034DEC: /* 80034DF4 00031D54 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80034DF8 00031D58 7C 08 03 A6 */ mtlr r0 /* 80034DFC 00031D5C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80034E00 00031D60 4E 80 00 20 */ blr +/* 80034E00 00031D60 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/Factories/CCharacterFactory.s b/asm/MetroidPrime/Factories/CCharacterFactory.s index f4777266..2a5c8665 100644 --- a/asm/MetroidPrime/Factories/CCharacterFactory.s +++ b/asm/MetroidPrime/Factories/CCharacterFactory.s @@ -109,7 +109,7 @@ lbl_803D9C70: .4byte 0 .4byte 0 .4byte 0 - + .section .text, "ax" .global "__dt__Q24rstl35reserved_vector<13CSoundPOINode,20>Fv" @@ -133,7 +133,7 @@ lbl_80031A60: /* 80031A68 0002E9C8 81 9E 00 00 */ lwz r12, 0(r30) /* 80031A6C 0002E9CC 81 8C 00 08 */ lwz r12, 8(r12) /* 80031A70 0002E9D0 7D 89 03 A6 */ mtctr r12 -/* 80031A74 0002E9D4 4E 80 04 21 */ bctrl +/* 80031A74 0002E9D4 4E 80 04 21 */ bctrl /* 80031A78 0002E9D8 3B DE 00 44 */ addi r30, r30, 0x44 /* 80031A7C 0002E9DC 3B FF 00 01 */ addi r31, r31, 1 lbl_80031A80: @@ -155,7 +155,7 @@ lbl_80031AA4: /* 80031AB8 0002EA18 83 81 00 10 */ lwz r28, 0x10(r1) /* 80031ABC 0002EA1C 7C 08 03 A6 */ mtlr r0 /* 80031AC0 0002EA20 38 21 00 20 */ addi r1, r1, 0x20 -/* 80031AC4 0002EA24 4E 80 00 20 */ blr +/* 80031AC4 0002EA24 4E 80 00 20 */ blr .global "__dt__Q24rstl38reserved_vector<16CParticlePOINode,20>Fv" "__dt__Q24rstl38reserved_vector<16CParticlePOINode,20>Fv": @@ -178,7 +178,7 @@ lbl_80031AFC: /* 80031B04 0002EA64 81 9E 00 00 */ lwz r12, 0(r30) /* 80031B08 0002EA68 81 8C 00 08 */ lwz r12, 8(r12) /* 80031B0C 0002EA6C 7D 89 03 A6 */ mtctr r12 -/* 80031B10 0002EA70 4E 80 04 21 */ bctrl +/* 80031B10 0002EA70 4E 80 04 21 */ bctrl /* 80031B14 0002EA74 3B DE 00 5C */ addi r30, r30, 0x5c /* 80031B18 0002EA78 3B FF 00 01 */ addi r31, r31, 1 lbl_80031B1C: @@ -200,7 +200,7 @@ lbl_80031B40: /* 80031B54 0002EAB4 83 81 00 10 */ lwz r28, 0x10(r1) /* 80031B58 0002EAB8 7C 08 03 A6 */ mtlr r0 /* 80031B5C 0002EABC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80031B60 0002EAC0 4E 80 00 20 */ blr +/* 80031B60 0002EAC0 4E 80 00 20 */ blr .global "__dt__Q24rstl35reserved_vector<13CInt32POINode,16>Fv" "__dt__Q24rstl35reserved_vector<13CInt32POINode,16>Fv": @@ -223,7 +223,7 @@ lbl_80031B98: /* 80031BA0 0002EB00 81 9E 00 00 */ lwz r12, 0(r30) /* 80031BA4 0002EB04 81 8C 00 08 */ lwz r12, 8(r12) /* 80031BA8 0002EB08 7D 89 03 A6 */ mtctr r12 -/* 80031BAC 0002EB0C 4E 80 04 21 */ bctrl +/* 80031BAC 0002EB0C 4E 80 04 21 */ bctrl /* 80031BB0 0002EB10 3B DE 00 4C */ addi r30, r30, 0x4c /* 80031BB4 0002EB14 3B FF 00 01 */ addi r31, r31, 1 lbl_80031BB8: @@ -245,7 +245,7 @@ lbl_80031BDC: /* 80031BF0 0002EB50 83 81 00 10 */ lwz r28, 0x10(r1) /* 80031BF4 0002EB54 7C 08 03 A6 */ mtlr r0 /* 80031BF8 0002EB58 38 21 00 20 */ addi r1, r1, 0x20 -/* 80031BFC 0002EB5C 4E 80 00 20 */ blr +/* 80031BFC 0002EB5C 4E 80 00 20 */ blr .global "__dt__Q24rstl33reserved_vector<12CBoolPOINode,8>Fv" "__dt__Q24rstl33reserved_vector<12CBoolPOINode,8>Fv": @@ -268,7 +268,7 @@ lbl_80031C34: /* 80031C3C 0002EB9C 81 9E 00 00 */ lwz r12, 0(r30) /* 80031C40 0002EBA0 81 8C 00 08 */ lwz r12, 8(r12) /* 80031C44 0002EBA4 7D 89 03 A6 */ mtctr r12 -/* 80031C48 0002EBA8 4E 80 04 21 */ bctrl +/* 80031C48 0002EBA8 4E 80 04 21 */ bctrl /* 80031C4C 0002EBAC 3B DE 00 3C */ addi r30, r30, 0x3c /* 80031C50 0002EBB0 3B FF 00 01 */ addi r31, r31, 1 lbl_80031C54: @@ -290,17 +290,17 @@ lbl_80031C78: /* 80031C8C 0002EBEC 83 81 00 10 */ lwz r28, 0x10(r1) /* 80031C90 0002EBF0 7C 08 03 A6 */ mtlr r0 /* 80031C94 0002EBF4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80031C98 0002EBF8 4E 80 00 20 */ blr +/* 80031C98 0002EBF8 4E 80 00 20 */ blr .global CanBuild__Q217CCharacterFactory13CDummyFactoryFRC10SObjectTag CanBuild__Q217CCharacterFactory13CDummyFactoryFRC10SObjectTag: /* 80031C9C 0002EBFC 38 60 00 01 */ li r3, 1 -/* 80031CA0 0002EC00 4E 80 00 20 */ blr +/* 80031CA0 0002EC00 4E 80 00 20 */ blr .global GetResourceIdByName__Q217CCharacterFactory13CDummyFactoryCFPCc GetResourceIdByName__Q217CCharacterFactory13CDummyFactoryCFPCc: /* 80031CA4 0002EC04 38 60 00 00 */ li r3, 0 -/* 80031CA8 0002EC08 4E 80 00 20 */ blr +/* 80031CA8 0002EC08 4E 80 00 20 */ blr .global __dt__Q217CCharacterFactory13CDummyFactoryFv __dt__Q217CCharacterFactory13CDummyFactoryFv: @@ -328,7 +328,7 @@ lbl_80031CF0: /* 80031CF8 0002EC58 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80031CFC 0002EC5C 7C 08 03 A6 */ mtlr r0 /* 80031D00 0002EC60 38 21 00 10 */ addi r1, r1, 0x10 -/* 80031D04 0002EC64 4E 80 00 20 */ blr +/* 80031D04 0002EC64 4E 80 00 20 */ blr .global GetEventResourceIdForAnimResourceId__17CCharacterFactoryCFi GetEventResourceIdForAnimResourceId__17CCharacterFactoryCFi: @@ -389,7 +389,7 @@ lbl_80031DCC: /* 80031DD0 0002ED30 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 80031DD4 0002ED34 7C 08 03 A6 */ mtlr r0 /* 80031DD8 0002ED38 38 21 00 40 */ addi r1, r1, 0x40 -/* 80031DDC 0002ED3C 4E 80 00 20 */ blr +/* 80031DDC 0002ED3C 4E 80 00 20 */ blr .global sub_80031de0 sub_80031de0: @@ -425,7 +425,7 @@ lbl_80031E30: /* 80031E50 0002EDB0 81 9C 00 00 */ lwz r12, 0(r28) /* 80031E54 0002EDB4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80031E58 0002EDB8 7D 89 03 A6 */ mtctr r12 -/* 80031E5C 0002EDBC 4E 80 04 21 */ bctrl +/* 80031E5C 0002EDBC 4E 80 04 21 */ bctrl /* 80031E60 0002EDC0 38 61 00 28 */ addi r3, r1, 0x28 /* 80031E64 0002EDC4 38 81 00 18 */ addi r4, r1, 0x18 /* 80031E68 0002EDC8 48 30 F0 41 */ bl __ct__6CTokenFRC6CToken @@ -538,7 +538,7 @@ lbl_80031FD4: /* 80031FD8 0002EF38 80 01 00 64 */ lwz r0, 0x64(r1) /* 80031FDC 0002EF3C 7C 08 03 A6 */ mtlr r0 /* 80031FE0 0002EF40 38 21 00 60 */ addi r1, r1, 0x60 -/* 80031FE4 0002EF44 4E 80 00 20 */ blr +/* 80031FE4 0002EF44 4E 80 00 20 */ blr .global sub_80031fe8 sub_80031fe8: @@ -581,7 +581,7 @@ lbl_80032044: /* 80032070 0002EFD0 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80032074 0002EFD4 7C 08 03 A6 */ mtlr r0 /* 80032078 0002EFD8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8003207C 0002EFDC 4E 80 00 20 */ blr +/* 8003207C 0002EFDC 4E 80 00 20 */ blr .global sub_80032080 sub_80032080: @@ -631,7 +631,7 @@ lbl_80032110: /* 8003211C 0002F07C 83 C1 00 08 */ lwz r30, 8(r1) /* 80032120 0002F080 7C 08 03 A6 */ mtlr r0 /* 80032124 0002F084 38 21 00 10 */ addi r1, r1, 0x10 -/* 80032128 0002F088 4E 80 00 20 */ blr +/* 80032128 0002F088 4E 80 00 20 */ blr .global sub_8003212c sub_8003212c: @@ -665,7 +665,7 @@ lbl_80032174: /* 80032190 0002F0F0 83 81 00 10 */ lwz r28, 0x10(r1) /* 80032194 0002F0F4 7C 08 03 A6 */ mtlr r0 /* 80032198 0002F0F8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8003219C 0002F0FC 4E 80 00 20 */ blr +/* 8003219C 0002F0FC 4E 80 00 20 */ blr .global sub_800321a0 sub_800321a0: @@ -679,7 +679,7 @@ lbl_800321B8: /* 800321B8 0002F118 80 01 00 14 */ lwz r0, 0x14(r1) /* 800321BC 0002F11C 7C 08 03 A6 */ mtlr r0 /* 800321C0 0002F120 38 21 00 10 */ addi r1, r1, 0x10 -/* 800321C4 0002F124 4E 80 00 20 */ blr +/* 800321C4 0002F124 4E 80 00 20 */ blr .global sub_800321c8 sub_800321c8: @@ -715,7 +715,7 @@ lbl_80032208: /* 80032234 0002F194 80 01 00 14 */ lwz r0, 0x14(r1) /* 80032238 0002F198 7C 08 03 A6 */ mtlr r0 /* 8003223C 0002F19C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80032240 0002F1A0 4E 80 00 20 */ blr +/* 80032240 0002F1A0 4E 80 00 20 */ blr .global sub_80032244 sub_80032244: @@ -755,7 +755,7 @@ lbl_800322B4: /* 800322C0 0002F220 83 C1 00 18 */ lwz r30, 0x18(r1) /* 800322C4 0002F224 7C 08 03 A6 */ mtlr r0 /* 800322C8 0002F228 38 21 00 20 */ addi r1, r1, 0x20 -/* 800322CC 0002F22C 4E 80 00 20 */ blr +/* 800322CC 0002F22C 4E 80 00 20 */ blr .global sub_800322d0 sub_800322d0: @@ -780,7 +780,7 @@ lbl_800322FC: /* 80032310 0002F270 83 C1 00 08 */ lwz r30, 8(r1) /* 80032314 0002F274 7C 08 03 A6 */ mtlr r0 /* 80032318 0002F278 38 21 00 10 */ addi r1, r1, 0x10 -/* 8003231C 0002F27C 4E 80 00 20 */ blr +/* 8003231C 0002F27C 4E 80 00 20 */ blr .global sub_80032320 sub_80032320: @@ -792,14 +792,14 @@ sub_80032320: /* 80032334 0002F294 80 01 00 14 */ lwz r0, 0x14(r1) /* 80032338 0002F298 7C 08 03 A6 */ mtlr r0 /* 8003233C 0002F29C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80032340 0002F2A0 4E 80 00 20 */ blr +/* 80032340 0002F2A0 4E 80 00 20 */ blr .global sub_80032344 sub_80032344: /* 80032344 0002F2A4 1C 04 00 C0 */ mulli r0, r4, 0xc0 /* 80032348 0002F2A8 80 63 00 10 */ lwz r3, 0x10(r3) /* 8003234C 0002F2AC 7C 63 02 14 */ add r3, r3, r0 -/* 80032350 0002F2B0 4E 80 00 20 */ blr +/* 80032350 0002F2B0 4E 80 00 20 */ blr .global "CreateCharacter__17CCharacterFactoryCFibRC33TLockedToken<17CCharacterFactory>i" "CreateCharacter__17CCharacterFactoryCFibRC33TLockedToken<17CCharacterFactory>i": @@ -857,7 +857,7 @@ lbl_80032404: /* 80032418 0002F378 38 C1 00 24 */ addi r6, r1, 0x24 /* 8003241C 0002F37C 81 8C 00 08 */ lwz r12, 8(r12) /* 80032420 0002F380 7D 89 03 A6 */ mtctr r12 -/* 80032424 0002F384 4E 80 04 21 */ bctrl +/* 80032424 0002F384 4E 80 04 21 */ bctrl /* 80032428 0002F388 38 61 00 40 */ addi r3, r1, 0x40 /* 8003242C 0002F38C 38 81 00 30 */ addi r4, r1, 0x30 /* 80032430 0002F390 48 30 EA 79 */ bl __ct__6CTokenFRC6CToken @@ -914,7 +914,7 @@ lbl_800324E0: /* 800324F4 0002F454 38 C1 00 20 */ addi r6, r1, 0x20 /* 800324F8 0002F458 81 8C 00 08 */ lwz r12, 8(r12) /* 800324FC 0002F45C 7D 89 03 A6 */ mtctr r12 -/* 80032500 0002F460 4E 80 04 21 */ bctrl +/* 80032500 0002F460 4E 80 04 21 */ bctrl /* 80032504 0002F464 3B E1 00 5C */ addi r31, r1, 0x5c /* 80032508 0002F468 38 81 00 28 */ addi r4, r1, 0x28 /* 8003250C 0002F46C 7F E3 FB 78 */ mr r3, r31 @@ -1024,7 +1024,7 @@ lbl_80032678: /* 80032690 0002F5F0 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 80032694 0002F5F4 7C 08 03 A6 */ mtlr r0 /* 80032698 0002F5F8 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8003269C 0002F5FC 4E 80 00 20 */ blr +/* 8003269C 0002F5FC 4E 80 00 20 */ blr .global sub_800326a0 sub_800326a0: @@ -1052,7 +1052,7 @@ lbl_800326E4: /* 800326EC 0002F64C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800326F0 0002F650 7C 08 03 A6 */ mtlr r0 /* 800326F4 0002F654 38 21 00 10 */ addi r1, r1, 0x10 -/* 800326F8 0002F658 4E 80 00 20 */ blr +/* 800326F8 0002F658 4E 80 00 20 */ blr .global __ct__17CCharacterFactoryFR11CSimplePoolRC17CAnimCharacterSetUi __ct__17CCharacterFactoryFR11CSimplePoolRC17CAnimCharacterSetUi: @@ -1317,7 +1317,7 @@ lbl_80032A68: /* 80032AA4 0002FA04 38 80 00 01 */ li r4, 1 /* 80032AA8 0002FA08 81 8C 00 08 */ lwz r12, 8(r12) /* 80032AAC 0002FA0C 7D 89 03 A6 */ mtctr r12 -/* 80032AB0 0002FA10 4E 80 04 21 */ bctrl +/* 80032AB0 0002FA10 4E 80 04 21 */ bctrl lbl_80032AB4: /* 80032AB4 0002FA14 3C 60 80 3D */ lis r3, lbl_803CCD78@ha /* 80032AB8 0002FA18 3B 00 00 00 */ li r24, 0 @@ -1357,7 +1357,7 @@ lbl_80032B00: /* 80032B3C 0002FA9C 38 80 00 01 */ li r4, 1 /* 80032B40 0002FAA0 81 8C 00 08 */ lwz r12, 8(r12) /* 80032B44 0002FAA4 7D 89 03 A6 */ mtctr r12 -/* 80032B48 0002FAA8 4E 80 04 21 */ bctrl +/* 80032B48 0002FAA8 4E 80 04 21 */ bctrl lbl_80032B4C: /* 80032B4C 0002FAAC 7F 00 07 75 */ extsb. r0, r24 /* 80032B50 0002FAB0 41 82 00 0C */ beq lbl_80032B5C @@ -1567,7 +1567,7 @@ lbl_80032E14: /* 80032E48 0002FDA8 81 83 00 00 */ lwz r12, 0(r3) /* 80032E4C 0002FDAC 81 8C 00 14 */ lwz r12, 0x14(r12) /* 80032E50 0002FDB0 7D 89 03 A6 */ mtctr r12 -/* 80032E54 0002FDB4 4E 80 04 21 */ bctrl +/* 80032E54 0002FDB4 4E 80 04 21 */ bctrl /* 80032E58 0002FDB8 38 61 00 48 */ addi r3, r1, 0x48 /* 80032E5C 0002FDBC 38 80 00 00 */ li r4, 0 /* 80032E60 0002FDC0 48 30 DF E1 */ bl __dt__6CTokenFv @@ -1591,7 +1591,7 @@ lbl_80032E8C: /* 80032EA4 0002FE04 81 9E 00 00 */ lwz r12, 0(r30) /* 80032EA8 0002FE08 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80032EAC 0002FE0C 7D 89 03 A6 */ mtctr r12 -/* 80032EB0 0002FE10 4E 80 04 21 */ bctrl +/* 80032EB0 0002FE10 4E 80 04 21 */ bctrl /* 80032EB4 0002FE14 38 61 00 78 */ addi r3, r1, 0x78 /* 80032EB8 0002FE18 38 81 00 40 */ addi r4, r1, 0x40 /* 80032EBC 0002FE1C 48 30 DF ED */ bl __ct__6CTokenFRC6CToken @@ -1651,7 +1651,7 @@ lbl_80032F40: /* 80032F84 0002FEE4 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 80032F88 0002FEE8 7C 08 03 A6 */ mtlr r0 /* 80032F8C 0002FEEC 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 80032F90 0002FEF0 4E 80 00 20 */ blr +/* 80032F90 0002FEF0 4E 80 00 20 */ blr .global sub_80032f94 sub_80032f94: @@ -1662,7 +1662,7 @@ sub_80032f94: /* 80032FA4 0002FF04 80 01 00 14 */ lwz r0, 0x14(r1) /* 80032FA8 0002FF08 7C 08 03 A6 */ mtlr r0 /* 80032FAC 0002FF0C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80032FB0 0002FF10 4E 80 00 20 */ blr +/* 80032FB0 0002FF10 4E 80 00 20 */ blr .global sub_80032fb4 sub_80032fb4: @@ -1715,7 +1715,7 @@ lbl_80033044: /* 80033058 0002FFB8 83 81 00 20 */ lwz r28, 0x20(r1) /* 8003305C 0002FFBC 7C 08 03 A6 */ mtlr r0 /* 80033060 0002FFC0 38 21 00 30 */ addi r1, r1, 0x30 -/* 80033064 0002FFC4 4E 80 00 20 */ blr +/* 80033064 0002FFC4 4E 80 00 20 */ blr .global sub_80033068 sub_80033068: @@ -1757,7 +1757,7 @@ lbl_800330DC: /* 800330E8 00030048 83 C1 00 08 */ lwz r30, 8(r1) /* 800330EC 0003004C 7C 08 03 A6 */ mtlr r0 /* 800330F0 00030050 38 21 00 10 */ addi r1, r1, 0x10 -/* 800330F4 00030054 4E 80 00 20 */ blr +/* 800330F4 00030054 4E 80 00 20 */ blr .global sub_800330f8 sub_800330f8: @@ -1812,7 +1812,7 @@ lbl_8003319C: /* 800331A8 00030108 83 C1 00 08 */ lwz r30, 8(r1) /* 800331AC 0003010C 7C 08 03 A6 */ mtlr r0 /* 800331B0 00030110 38 21 00 10 */ addi r1, r1, 0x10 -/* 800331B4 00030114 4E 80 00 20 */ blr +/* 800331B4 00030114 4E 80 00 20 */ blr .global sub_800331b8 sub_800331b8: @@ -1865,7 +1865,7 @@ lbl_80033248: /* 8003325C 000301BC 83 81 00 20 */ lwz r28, 0x20(r1) /* 80033260 000301C0 7C 08 03 A6 */ mtlr r0 /* 80033264 000301C4 38 21 00 30 */ addi r1, r1, 0x30 -/* 80033268 000301C8 4E 80 00 20 */ blr +/* 80033268 000301C8 4E 80 00 20 */ blr .global sub_8003326c sub_8003326c: @@ -1918,7 +1918,7 @@ lbl_800332FC: /* 80033310 00030270 83 81 00 20 */ lwz r28, 0x20(r1) /* 80033314 00030274 7C 08 03 A6 */ mtlr r0 /* 80033318 00030278 38 21 00 30 */ addi r1, r1, 0x30 -/* 8003331C 0003027C 4E 80 00 20 */ blr +/* 8003331C 0003027C 4E 80 00 20 */ blr .global sub_80033320 sub_80033320: @@ -1958,7 +1958,7 @@ lbl_80033384: /* 800333A0 00030300 80 01 00 14 */ lwz r0, 0x14(r1) /* 800333A4 00030304 7C 08 03 A6 */ mtlr r0 /* 800333A8 00030308 38 21 00 10 */ addi r1, r1, 0x10 -/* 800333AC 0003030C 4E 80 00 20 */ blr +/* 800333AC 0003030C 4E 80 00 20 */ blr .global sub_800333b0 sub_800333b0: @@ -2000,7 +2000,7 @@ lbl_80033424: /* 80033430 00030390 83 C1 00 08 */ lwz r30, 8(r1) /* 80033434 00030394 7C 08 03 A6 */ mtlr r0 /* 80033438 00030398 38 21 00 10 */ addi r1, r1, 0x10 -/* 8003343C 0003039C 4E 80 00 20 */ blr +/* 8003343C 0003039C 4E 80 00 20 */ blr .global sub_80033440 sub_80033440: @@ -2074,7 +2074,7 @@ lbl_8003351C: /* 80033530 00030490 83 81 00 20 */ lwz r28, 0x20(r1) /* 80033534 00030494 7C 08 03 A6 */ mtlr r0 /* 80033538 00030498 38 21 00 30 */ addi r1, r1, 0x30 -/* 8003353C 0003049C 4E 80 00 20 */ blr +/* 8003353C 0003049C 4E 80 00 20 */ blr .global "GetNewDerivedObject__50TObjOwnerDerivedFromIObj<22CAnimationDatabaseGame>FP22CAnimationDatabaseGame" "GetNewDerivedObject__50TObjOwnerDerivedFromIObj<22CAnimationDatabaseGame>FP22CAnimationDatabaseGame": @@ -2114,7 +2114,7 @@ lbl_800335A4: /* 800335C0 00030520 80 01 00 14 */ lwz r0, 0x14(r1) /* 800335C4 00030524 7C 08 03 A6 */ mtlr r0 /* 800335C8 00030528 38 21 00 10 */ addi r1, r1, 0x10 -/* 800335CC 0003052C 4E 80 00 20 */ blr +/* 800335CC 0003052C 4E 80 00 20 */ blr .global "__dt__Q24rstl20rc_ptr<10IMetaTrans>Fv" "__dt__Q24rstl20rc_ptr<10IMetaTrans>Fv": @@ -2167,11 +2167,11 @@ lbl_80033660: /* 80033674 000305D4 83 81 00 20 */ lwz r28, 0x20(r1) /* 80033678 000305D8 7C 08 03 A6 */ mtlr r0 /* 8003367C 000305DC 38 21 00 30 */ addi r1, r1, 0x30 -/* 80033680 000305E0 4E 80 00 20 */ blr +/* 80033680 000305E0 4E 80 00 20 */ blr .global CancelBuild__Q217CCharacterFactory13CDummyFactoryFRC10SObjectTag CancelBuild__Q217CCharacterFactory13CDummyFactoryFRC10SObjectTag: -/* 80033684 000305E4 4E 80 00 20 */ blr +/* 80033684 000305E4 4E 80 00 20 */ blr .global BuildAsync__Q217CCharacterFactory13CDummyFactoryFRC10SObjectTagRC15CVParamTransferPP4IObj BuildAsync__Q217CCharacterFactory13CDummyFactoryFRC10SObjectTagRC15CVParamTransferPP4IObj: @@ -2189,7 +2189,7 @@ BuildAsync__Q217CCharacterFactory13CDummyFactoryFRC10SObjectTagRC15CVParamTransf /* 800336B4 00030614 38 61 00 08 */ addi r3, r1, 8 /* 800336B8 00030618 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800336BC 0003061C 7D 89 03 A6 */ mtctr r12 -/* 800336C0 00030620 4E 80 04 21 */ bctrl +/* 800336C0 00030620 4E 80 04 21 */ bctrl /* 800336C4 00030624 38 00 00 00 */ li r0, 0 /* 800336C8 00030628 80 61 00 0C */ lwz r3, 0xc(r1) /* 800336CC 0003062C 98 01 00 08 */ stb r0, 8(r1) @@ -2204,13 +2204,13 @@ BuildAsync__Q217CCharacterFactory13CDummyFactoryFRC10SObjectTagRC15CVParamTransf /* 800336F0 00030650 38 80 00 01 */ li r4, 1 /* 800336F4 00030654 81 8C 00 08 */ lwz r12, 8(r12) /* 800336F8 00030658 7D 89 03 A6 */ mtctr r12 -/* 800336FC 0003065C 4E 80 04 21 */ bctrl +/* 800336FC 0003065C 4E 80 04 21 */ bctrl lbl_80033700: /* 80033700 00030660 80 01 00 24 */ lwz r0, 0x24(r1) /* 80033704 00030664 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80033708 00030668 7C 08 03 A6 */ mtlr r0 /* 8003370C 0003066C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80033710 00030670 4E 80 00 20 */ blr +/* 80033710 00030670 4E 80 00 20 */ blr .global Build__Q217CCharacterFactory13CDummyFactoryFRC10SObjectTagRC15CVParamTransfer Build__Q217CCharacterFactory13CDummyFactoryFRC10SObjectTagRC15CVParamTransfer: @@ -2259,7 +2259,7 @@ lbl_80033764: /* 800337B8 00030718 81 84 00 00 */ lwz r12, 0(r4) /* 800337BC 0003071C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800337C0 00030720 7D 89 03 A6 */ mtctr r12 -/* 800337C4 00030724 4E 80 04 21 */ bctrl +/* 800337C4 00030724 4E 80 04 21 */ bctrl /* 800337C8 00030728 3A E1 00 B0 */ addi r23, r1, 0xb0 /* 800337CC 0003072C 38 81 00 5C */ addi r4, r1, 0x5c /* 800337D0 00030730 7E E3 BB 78 */ mr r3, r23 @@ -2281,7 +2281,7 @@ lbl_80033764: /* 80033810 00030770 81 84 00 00 */ lwz r12, 0(r4) /* 80033814 00030774 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80033818 00030778 7D 89 03 A6 */ mtctr r12 -/* 8003381C 0003077C 4E 80 04 21 */ bctrl +/* 8003381C 0003077C 4E 80 04 21 */ bctrl /* 80033820 00030780 3B 21 00 BC */ addi r25, r1, 0xbc /* 80033824 00030784 38 81 00 6C */ addi r4, r1, 0x6c /* 80033828 00030788 7F 23 CB 78 */ mr r3, r25 @@ -2303,7 +2303,7 @@ lbl_80033764: /* 80033868 000307C8 81 84 00 00 */ lwz r12, 0(r4) /* 8003386C 000307CC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80033870 000307D0 7D 89 03 A6 */ mtctr r12 -/* 80033874 000307D4 4E 80 04 21 */ bctrl +/* 80033874 000307D4 4E 80 04 21 */ bctrl /* 80033878 000307D8 3B 61 00 C8 */ addi r27, r1, 0xc8 /* 8003387C 000307DC 38 81 00 7C */ addi r4, r1, 0x7c /* 80033880 000307E0 7F 63 DB 78 */ mr r3, r27 @@ -2344,7 +2344,7 @@ lbl_800338BC: /* 80033908 00030868 38 80 00 01 */ li r4, 1 /* 8003390C 0003086C 81 8C 00 08 */ lwz r12, 8(r12) /* 80033910 00030870 7D 89 03 A6 */ mtctr r12 -/* 80033914 00030874 4E 80 04 21 */ bctrl +/* 80033914 00030874 4E 80 04 21 */ bctrl lbl_80033918: /* 80033918 00030878 88 01 00 0C */ lbz r0, 0xc(r1) /* 8003391C 0003087C 28 00 00 00 */ cmplwi r0, 0 @@ -2356,7 +2356,7 @@ lbl_80033918: /* 80033934 00030894 38 80 00 01 */ li r4, 1 /* 80033938 00030898 81 8C 00 08 */ lwz r12, 8(r12) /* 8003393C 0003089C 7D 89 03 A6 */ mtctr r12 -/* 80033940 000308A0 4E 80 04 21 */ bctrl +/* 80033940 000308A0 4E 80 04 21 */ bctrl lbl_80033944: /* 80033944 000308A4 88 81 00 54 */ lbz r4, 0x54(r1) /* 80033948 000308A8 38 00 00 00 */ li r0, 0 @@ -2370,7 +2370,7 @@ lbl_80033944: /* 80033968 000308C8 38 80 00 01 */ li r4, 1 /* 8003396C 000308CC 81 8C 00 08 */ lwz r12, 8(r12) /* 80033970 000308D0 7D 89 03 A6 */ mtctr r12 -/* 80033974 000308D4 4E 80 04 21 */ bctrl +/* 80033974 000308D4 4E 80 04 21 */ bctrl lbl_80033978: /* 80033978 000308D8 7E E0 07 75 */ extsb. r0, r23 /* 8003397C 000308DC 41 82 00 10 */ beq lbl_8003398C @@ -2437,7 +2437,7 @@ lbl_800339FC: /* 80033A54 000309B4 81 84 00 00 */ lwz r12, 0(r4) /* 80033A58 000309B8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80033A5C 000309BC 7D 89 03 A6 */ mtctr r12 -/* 80033A60 000309C0 4E 80 04 21 */ bctrl +/* 80033A60 000309C0 4E 80 04 21 */ bctrl /* 80033A64 000309C4 3A C1 00 8C */ addi r22, r1, 0x8c /* 80033A68 000309C8 38 81 00 24 */ addi r4, r1, 0x24 /* 80033A6C 000309CC 7E C3 B3 78 */ mr r3, r22 @@ -2459,7 +2459,7 @@ lbl_800339FC: /* 80033AAC 00030A0C 81 84 00 00 */ lwz r12, 0(r4) /* 80033AB0 00030A10 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80033AB4 00030A14 7D 89 03 A6 */ mtctr r12 -/* 80033AB8 00030A18 4E 80 04 21 */ bctrl +/* 80033AB8 00030A18 4E 80 04 21 */ bctrl /* 80033ABC 00030A1C 3A C1 00 98 */ addi r22, r1, 0x98 /* 80033AC0 00030A20 38 81 00 34 */ addi r4, r1, 0x34 /* 80033AC4 00030A24 7E C3 B3 78 */ mr r3, r22 @@ -2481,7 +2481,7 @@ lbl_800339FC: /* 80033B04 00030A64 81 84 00 00 */ lwz r12, 0(r4) /* 80033B08 00030A68 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80033B0C 00030A6C 7D 89 03 A6 */ mtctr r12 -/* 80033B10 00030A70 4E 80 04 21 */ bctrl +/* 80033B10 00030A70 4E 80 04 21 */ bctrl /* 80033B14 00030A74 3A C1 00 A4 */ addi r22, r1, 0xa4 /* 80033B18 00030A78 38 81 00 44 */ addi r4, r1, 0x44 /* 80033B1C 00030A7C 7E C3 B3 78 */ mr r3, r22 @@ -2519,7 +2519,7 @@ lbl_80033B68: /* 80033B98 00030AF8 38 80 00 01 */ li r4, 1 /* 80033B9C 00030AFC 81 8C 00 08 */ lwz r12, 8(r12) /* 80033BA0 00030B00 7D 89 03 A6 */ mtctr r12 -/* 80033BA4 00030B04 4E 80 04 21 */ bctrl +/* 80033BA4 00030B04 4E 80 04 21 */ bctrl lbl_80033BA8: /* 80033BA8 00030B08 7E C0 07 75 */ extsb. r0, r22 /* 80033BAC 00030B0C 41 82 00 10 */ beq lbl_80033BBC @@ -2577,7 +2577,7 @@ lbl_80033C54: /* 80033C58 00030BB8 80 01 01 44 */ lwz r0, 0x144(r1) /* 80033C5C 00030BBC 7C 08 03 A6 */ mtlr r0 /* 80033C60 00030BC0 38 21 01 40 */ addi r1, r1, 0x140 -/* 80033C64 00030BC4 4E 80 00 20 */ blr +/* 80033C64 00030BC4 4E 80 00 20 */ blr .global sub_80033c68 sub_80033c68: @@ -2613,7 +2613,7 @@ sub_80033c68: /* 80033CDC 00030C3C 38 80 00 01 */ li r4, 1 /* 80033CE0 00030C40 81 8C 00 08 */ lwz r12, 8(r12) /* 80033CE4 00030C44 7D 89 03 A6 */ mtctr r12 -/* 80033CE8 00030C48 4E 80 04 21 */ bctrl +/* 80033CE8 00030C48 4E 80 04 21 */ bctrl lbl_80033CEC: /* 80033CEC 00030C4C 88 01 00 10 */ lbz r0, 0x10(r1) /* 80033CF0 00030C50 28 00 00 00 */ cmplwi r0, 0 @@ -2641,7 +2641,7 @@ lbl_80033D34: /* 80033D40 00030CA0 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80033D44 00030CA4 7C 08 03 A6 */ mtlr r0 /* 80033D48 00030CA8 38 21 00 20 */ addi r1, r1, 0x20 -/* 80033D4C 00030CAC 4E 80 00 20 */ blr +/* 80033D4C 00030CAC 4E 80 00 20 */ blr .global sub_80033d50 sub_80033d50: @@ -2697,7 +2697,7 @@ lbl_80033DF4: /* 80033E04 00030D64 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80033E08 00030D68 7C 08 03 A6 */ mtlr r0 /* 80033E0C 00030D6C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80033E10 00030D70 4E 80 00 20 */ blr +/* 80033E10 00030D70 4E 80 00 20 */ blr .global sub_80033e14 sub_80033e14: @@ -2711,7 +2711,7 @@ sub_80033e14: /* 80033E30 00030D90 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80033E34 00030D94 7C 08 03 A6 */ mtlr r0 /* 80033E38 00030D98 38 21 00 10 */ addi r1, r1, 0x10 -/* 80033E3C 00030D9C 4E 80 00 20 */ blr +/* 80033E3C 00030D9C 4E 80 00 20 */ blr .global sub_80033e40 sub_80033e40: @@ -2754,7 +2754,7 @@ lbl_80033EB0: /* 80033ECC 00030E2C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80033ED0 00030E30 7C 08 03 A6 */ mtlr r0 /* 80033ED4 00030E34 38 21 00 10 */ addi r1, r1, 0x10 -/* 80033ED8 00030E38 4E 80 00 20 */ blr +/* 80033ED8 00030E38 4E 80 00 20 */ blr .global sub_80033edc sub_80033edc: @@ -2777,7 +2777,7 @@ sub_80033edc: /* 80033F1C 00030E7C 38 80 00 01 */ li r4, 1 /* 80033F20 00030E80 81 8C 00 08 */ lwz r12, 8(r12) /* 80033F24 00030E84 7D 89 03 A6 */ mtctr r12 -/* 80033F28 00030E88 4E 80 04 21 */ bctrl +/* 80033F28 00030E88 4E 80 04 21 */ bctrl lbl_80033F2C: /* 80033F2C 00030E8C 28 1E 00 00 */ cmplwi r30, 0 /* 80033F30 00030E90 41 82 00 20 */ beq lbl_80033F50 @@ -2800,7 +2800,7 @@ lbl_80033F60: /* 80033F6C 00030ECC 83 C1 00 08 */ lwz r30, 8(r1) /* 80033F70 00030ED0 7C 08 03 A6 */ mtlr r0 /* 80033F74 00030ED4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80033F78 00030ED8 4E 80 00 20 */ blr +/* 80033F78 00030ED8 4E 80 00 20 */ blr .global sub_80033f7c sub_80033f7c: @@ -2814,7 +2814,7 @@ sub_80033f7c: /* 80033F98 00030EF8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80033F9C 00030EFC 7C 08 03 A6 */ mtlr r0 /* 80033FA0 00030F00 38 21 00 10 */ addi r1, r1, 0x10 -/* 80033FA4 00030F04 4E 80 00 20 */ blr +/* 80033FA4 00030F04 4E 80 00 20 */ blr .global sub_80033fa8 sub_80033fa8: @@ -2857,7 +2857,7 @@ lbl_80034018: /* 80034034 00030F94 80 01 00 14 */ lwz r0, 0x14(r1) /* 80034038 00030F98 7C 08 03 A6 */ mtlr r0 /* 8003403C 00030F9C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80034040 00030FA0 4E 80 00 20 */ blr +/* 80034040 00030FA0 4E 80 00 20 */ blr .global __dt__17CCharacterFactoryFv __dt__17CCharacterFactoryFv: @@ -2996,7 +2996,7 @@ lbl_80034204: /* 80034218 00031178 83 81 00 40 */ lwz r28, 0x40(r1) /* 8003421C 0003117C 7C 08 03 A6 */ mtlr r0 /* 80034220 00031180 38 21 00 50 */ addi r1, r1, 0x50 -/* 80034224 00031184 4E 80 00 20 */ blr +/* 80034224 00031184 4E 80 00 20 */ blr .global sub_80034228 sub_80034228: @@ -3028,7 +3028,7 @@ lbl_8003427C: /* 80034284 000311E4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80034288 000311E8 7C 08 03 A6 */ mtlr r0 /* 8003428C 000311EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80034290 000311F0 4E 80 00 20 */ blr +/* 80034290 000311F0 4E 80 00 20 */ blr .global __dt__17CMetaTransFactoryFv __dt__17CMetaTransFactoryFv: @@ -3050,7 +3050,7 @@ __dt__17CMetaTransFactoryFv: /* 800342D0 00031230 38 80 00 01 */ li r4, 1 /* 800342D4 00031234 81 8C 00 08 */ lwz r12, 8(r12) /* 800342D8 00031238 7D 89 03 A6 */ mtctr r12 -/* 800342DC 0003123C 4E 80 04 21 */ bctrl +/* 800342DC 0003123C 4E 80 04 21 */ bctrl lbl_800342E0: /* 800342E0 00031240 80 7F 00 00 */ lwz r3, 0(r31) /* 800342E4 00031244 28 03 00 00 */ cmplwi r3, 0 @@ -3061,7 +3061,7 @@ lbl_800342F0: /* 800342F4 00031254 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800342F8 00031258 7C 08 03 A6 */ mtlr r0 /* 800342FC 0003125C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80034300 00031260 4E 80 00 20 */ blr +/* 80034300 00031260 4E 80 00 20 */ blr .global sub_80034304 sub_80034304: @@ -3083,7 +3083,7 @@ sub_80034304: /* 80034340 000312A0 38 80 00 01 */ li r4, 1 /* 80034344 000312A4 81 8C 00 08 */ lwz r12, 8(r12) /* 80034348 000312A8 7D 89 03 A6 */ mtctr r12 -/* 8003434C 000312AC 4E 80 04 21 */ bctrl +/* 8003434C 000312AC 4E 80 04 21 */ bctrl lbl_80034350: /* 80034350 000312B0 80 7F 00 00 */ lwz r3, 0(r31) /* 80034354 000312B4 28 03 00 00 */ cmplwi r3, 0 @@ -3094,7 +3094,7 @@ lbl_80034360: /* 80034364 000312C4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80034368 000312C8 7C 08 03 A6 */ mtlr r0 /* 8003436C 000312CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80034370 000312D0 4E 80 00 20 */ blr +/* 80034370 000312D0 4E 80 00 20 */ blr .global sub_80034374 sub_80034374: @@ -3148,7 +3148,7 @@ lbl_80034410: /* 80034424 00031384 80 01 00 34 */ lwz r0, 0x34(r1) /* 80034428 00031388 7C 08 03 A6 */ mtlr r0 /* 8003442C 0003138C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80034430 00031390 4E 80 00 20 */ blr +/* 80034430 00031390 4E 80 00 20 */ blr .global sub_80034434 sub_80034434: @@ -3207,7 +3207,7 @@ lbl_800344E8: /* 800344F4 00031454 83 A1 00 24 */ lwz r29, 0x24(r1) /* 800344F8 00031458 7C 08 03 A6 */ mtlr r0 /* 800344FC 0003145C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80034500 00031460 4E 80 00 20 */ blr +/* 80034500 00031460 4E 80 00 20 */ blr .global sub_80034504 sub_80034504: @@ -3231,7 +3231,7 @@ lbl_80034530: /* 80034540 000314A0 83 C1 00 08 */ lwz r30, 8(r1) /* 80034544 000314A4 7C 08 03 A6 */ mtlr r0 /* 80034548 000314A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8003454C 000314AC 4E 80 00 20 */ blr +/* 8003454C 000314AC 4E 80 00 20 */ blr .global sub_80034550 sub_80034550: @@ -3262,7 +3262,7 @@ lbl_8003458C: /* 800345A8 00031508 83 A1 00 14 */ lwz r29, 0x14(r1) /* 800345AC 0003150C 7C 08 03 A6 */ mtlr r0 /* 800345B0 00031510 38 21 00 20 */ addi r1, r1, 0x20 -/* 800345B4 00031514 4E 80 00 20 */ blr +/* 800345B4 00031514 4E 80 00 20 */ blr .global sub_800345b8 sub_800345b8: @@ -3336,7 +3336,7 @@ lbl_80034698: /* 8003469C 000315FC 80 01 00 34 */ lwz r0, 0x34(r1) /* 800346A0 00031600 7C 08 03 A6 */ mtlr r0 /* 800346A4 00031604 38 21 00 30 */ addi r1, r1, 0x30 -/* 800346A8 00031608 4E 80 00 20 */ blr +/* 800346A8 00031608 4E 80 00 20 */ blr .global "reserve__Q24rstl74vector<37TCachedToken<21CAllFormatsAnimSource>,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl74vector<37TCachedToken<21CAllFormatsAnimSource>,Q24rstl17rmemory_allocator>Fi": @@ -3414,7 +3414,7 @@ lbl_8003479C: /* 800347A0 00031700 80 01 00 34 */ lwz r0, 0x34(r1) /* 800347A4 00031704 7C 08 03 A6 */ mtlr r0 /* 800347A8 00031708 38 21 00 30 */ addi r1, r1, 0x30 -/* 800347AC 0003170C 4E 80 00 20 */ blr +/* 800347AC 0003170C 4E 80 00 20 */ blr .global "advance,Q24rstl52vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,i>__4rstlFRQ24rstl130const_pointer_iterator,Q24rstl52vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>i" "advance,Q24rstl52vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,i>__4rstlFRQ24rstl130const_pointer_iterator,Q24rstl52vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>i": @@ -3428,7 +3428,7 @@ lbl_8003479C: /* 800347CC 0003172C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800347D0 00031730 7C 08 03 A6 */ mtlr r0 /* 800347D4 00031734 38 21 00 10 */ addi r1, r1, 0x10 -/* 800347D8 00031738 4E 80 00 20 */ blr +/* 800347D8 00031738 4E 80 00 20 */ blr .global "__advance,Q24rstl52vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,i>__4rstlFRQ24rstl130const_pointer_iterator,Q24rstl52vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>iQ24rstl26random_access_iterator_tag" "__advance,Q24rstl52vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,i>__4rstlFRQ24rstl130const_pointer_iterator,Q24rstl52vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>iQ24rstl26random_access_iterator_tag": @@ -3436,7 +3436,7 @@ lbl_8003479C: /* 800347E0 00031740 54 80 18 38 */ slwi r0, r4, 3 /* 800347E4 00031744 7C 05 02 14 */ add r0, r5, r0 /* 800347E8 00031748 90 03 00 00 */ stw r0, 0(r3) -/* 800347EC 0003174C 4E 80 00 20 */ blr +/* 800347EC 0003174C 4E 80 00 20 */ blr .global "distance,Q24rstl52vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl130const_pointer_iterator,Q24rstl52vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl130const_pointer_iterator,Q24rstl52vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>" "distance,Q24rstl52vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl130const_pointer_iterator,Q24rstl52vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl130const_pointer_iterator,Q24rstl52vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>": @@ -3456,7 +3456,7 @@ lbl_8003479C: /* 80034824 00031784 80 01 00 24 */ lwz r0, 0x24(r1) /* 80034828 00031788 7C 08 03 A6 */ mtlr r0 /* 8003482C 0003178C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80034830 00031790 4E 80 00 20 */ blr +/* 80034830 00031790 4E 80 00 20 */ blr .global "__distance,Q24rstl52vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl130const_pointer_iterator,Q24rstl52vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl130const_pointer_iterator,Q24rstl52vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl26random_access_iterator_tag" "__distance,Q24rstl52vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl130const_pointer_iterator,Q24rstl52vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl130const_pointer_iterator,Q24rstl52vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl26random_access_iterator_tag": @@ -3465,4 +3465,4 @@ lbl_8003479C: /* 8003483C 0003179C 7C 03 00 50 */ subf r0, r3, r0 /* 80034840 000317A0 7C 00 1E 70 */ srawi r0, r0, 3 /* 80034844 000317A4 7C 60 01 94 */ addze r3, r0 -/* 80034848 000317A8 4E 80 00 20 */ blr +/* 80034848 000317A8 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/Factories/CSaveWorldFactory.s b/asm/MetroidPrime/Factories/CSaveWorldFactory.s index 91b64ba1..f27307eb 100644 --- a/asm/MetroidPrime/Factories/CSaveWorldFactory.s +++ b/asm/MetroidPrime/Factories/CSaveWorldFactory.s @@ -29,7 +29,7 @@ lbl_8026ADA4: /* 8026ADB4 00267D14 83 C1 00 08 */ lwz r30, 8(r1) /* 8026ADB8 00267D18 7C 08 03 A6 */ mtlr r0 /* 8026ADBC 00267D1C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8026ADC0 00267D20 4E 80 00 20 */ blr +/* 8026ADC0 00267D20 4E 80 00 20 */ blr .global sub_8026adc4 sub_8026adc4: @@ -64,7 +64,7 @@ sub_8026adc4: /* 8026AE34 00267D94 38 80 00 01 */ li r4, 1 /* 8026AE38 00267D98 81 8C 00 08 */ lwz r12, 8(r12) /* 8026AE3C 00267D9C 7D 89 03 A6 */ mtctr r12 -/* 8026AE40 00267DA0 4E 80 04 21 */ bctrl +/* 8026AE40 00267DA0 4E 80 04 21 */ bctrl lbl_8026AE44: /* 8026AE44 00267DA4 38 61 00 10 */ addi r3, r1, 0x10 /* 8026AE48 00267DA8 38 80 FF FF */ li r4, -1 @@ -74,7 +74,7 @@ lbl_8026AE44: /* 8026AE58 00267DB8 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8026AE5C 00267DBC 7C 08 03 A6 */ mtlr r0 /* 8026AE60 00267DC0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8026AE64 00267DC4 4E 80 00 20 */ blr +/* 8026AE64 00267DC4 4E 80 00 20 */ blr .global sub_8026ae68 sub_8026ae68: @@ -116,7 +116,7 @@ lbl_8026AEDC: /* 8026AEE8 00267E48 83 C1 00 08 */ lwz r30, 8(r1) /* 8026AEEC 00267E4C 7C 08 03 A6 */ mtlr r0 /* 8026AEF0 00267E50 38 21 00 10 */ addi r1, r1, 0x10 -/* 8026AEF4 00267E54 4E 80 00 20 */ blr +/* 8026AEF4 00267E54 4E 80 00 20 */ blr .global sub_8026aef8 sub_8026aef8: @@ -244,7 +244,7 @@ lbl_8026B090: /* 8026B09C 00267FFC 83 C1 00 58 */ lwz r30, 0x58(r1) /* 8026B0A0 00268000 7C 08 03 A6 */ mtlr r0 /* 8026B0A4 00268004 38 21 00 60 */ addi r1, r1, 0x60 -/* 8026B0A8 00268008 4E 80 00 20 */ blr +/* 8026B0A8 00268008 4E 80 00 20 */ blr .global sub_8026b0ac sub_8026b0ac: @@ -258,7 +258,7 @@ sub_8026b0ac: /* 8026B0C8 00268028 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8026B0CC 0026802C 7C 08 03 A6 */ mtlr r0 /* 8026B0D0 00268030 38 21 00 10 */ addi r1, r1, 0x10 -/* 8026B0D4 00268034 4E 80 00 20 */ blr +/* 8026B0D4 00268034 4E 80 00 20 */ blr .global sub_8026b0d8 sub_8026b0d8: @@ -301,7 +301,7 @@ lbl_8026B148: /* 8026B164 002680C4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8026B168 002680C8 7C 08 03 A6 */ mtlr r0 /* 8026B16C 002680CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8026B170 002680D0 4E 80 00 20 */ blr +/* 8026B170 002680D0 4E 80 00 20 */ blr .global sub_8026b174 sub_8026b174: @@ -331,7 +331,7 @@ lbl_8026B1BC: /* 8026B1C8 00268128 83 C1 00 08 */ lwz r30, 8(r1) /* 8026B1CC 0026812C 7C 08 03 A6 */ mtlr r0 /* 8026B1D0 00268130 38 21 00 10 */ addi r1, r1, 0x10 -/* 8026B1D4 00268134 4E 80 00 20 */ blr +/* 8026B1D4 00268134 4E 80 00 20 */ blr .global GetRelayIndex__10CSaveWorldCFRC9TEditorId GetRelayIndex__10CSaveWorldCFRC9TEditorId: @@ -350,14 +350,14 @@ lbl_8026B1F0: /* 8026B204 00268164 7C 05 00 40 */ cmplw r5, r0 /* 8026B208 00268168 40 82 00 0C */ bne lbl_8026B214 /* 8026B20C 0026816C 7C E3 3B 78 */ mr r3, r7 -/* 8026B210 00268170 4E 80 00 20 */ blr +/* 8026B210 00268170 4E 80 00 20 */ blr lbl_8026B214: /* 8026B214 00268174 38 C6 00 04 */ addi r6, r6, 4 /* 8026B218 00268178 38 E7 00 01 */ addi r7, r7, 1 /* 8026B21C 0026817C 42 00 FF D4 */ bdnz lbl_8026B1F0 lbl_8026B220: /* 8026B220 00268180 38 60 FF FF */ li r3, -1 -/* 8026B224 00268184 4E 80 00 20 */ blr +/* 8026B224 00268184 4E 80 00 20 */ blr .global __ct__10CSaveWorldFR12CinputStream __ct__10CSaveWorldFR12CinputStream: @@ -1006,7 +1006,7 @@ lbl_8026BAE4: /* 8026BAEC 00268A4C 80 01 01 34 */ lwz r0, 0x134(r1) /* 8026BAF0 00268A50 7C 08 03 A6 */ mtlr r0 /* 8026BAF4 00268A54 38 21 01 30 */ addi r1, r1, 0x130 -/* 8026BAF8 00268A58 4E 80 00 20 */ blr +/* 8026BAF8 00268A58 4E 80 00 20 */ blr .global "reserve__Q24rstl48vector<11SLayerState,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl48vector<11SLayerState,Q24rstl17rmemory_allocator>Fi": diff --git a/asm/MetroidPrime/Factories/CScannableObjectInfo.s b/asm/MetroidPrime/Factories/CScannableObjectInfo.s index 866bb9e0..de8f20b2 100644 --- a/asm/MetroidPrime/Factories/CScannableObjectInfo.s +++ b/asm/MetroidPrime/Factories/CScannableObjectInfo.s @@ -62,7 +62,7 @@ lbl_80169970: /* 801699CC 0016692C 38 80 00 01 */ li r4, 1 /* 801699D0 00166930 81 8C 00 08 */ lwz r12, 8(r12) /* 801699D4 00166934 7D 89 03 A6 */ mtctr r12 -/* 801699D8 00166938 4E 80 04 21 */ bctrl +/* 801699D8 00166938 4E 80 04 21 */ bctrl lbl_801699DC: /* 801699DC 0016693C 88 01 00 08 */ lbz r0, 8(r1) /* 801699E0 00166940 28 00 00 00 */ cmplwi r0, 0 @@ -106,7 +106,7 @@ lbl_80169A54: /* 80169A60 001669C0 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80169A64 001669C4 7C 08 03 A6 */ mtlr r0 /* 80169A68 001669C8 38 21 00 30 */ addi r1, r1, 0x30 -/* 80169A6C 001669CC 4E 80 00 20 */ blr +/* 80169A6C 001669CC 4E 80 00 20 */ blr .global sub_80169a70 sub_80169a70: @@ -176,7 +176,7 @@ lbl_80169B40: /* 80169B4C 00166AAC 83 C1 00 08 */ lwz r30, 8(r1) /* 80169B50 00166AB0 7C 08 03 A6 */ mtlr r0 /* 80169B54 00166AB4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80169B58 00166AB8 4E 80 00 20 */ blr +/* 80169B58 00166AB8 4E 80 00 20 */ blr .global "GetIObjObjectFor__30TToken<20CScannableObjectInfo>FRCQ24rstl32auto_ptr<20CScannableObjectInfo>" "GetIObjObjectFor__30TToken<20CScannableObjectInfo>FRCQ24rstl32auto_ptr<20CScannableObjectInfo>": @@ -190,7 +190,7 @@ lbl_80169B40: /* 80169B78 00166AD8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80169B7C 00166ADC 7C 08 03 A6 */ mtlr r0 /* 80169B80 00166AE0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80169B84 00166AE4 4E 80 00 20 */ blr +/* 80169B84 00166AE4 4E 80 00 20 */ blr .global sub_80169b88 sub_80169b88: @@ -233,7 +233,7 @@ lbl_80169BF8: /* 80169C14 00166B74 80 01 00 14 */ lwz r0, 0x14(r1) /* 80169C18 00166B78 7C 08 03 A6 */ mtlr r0 /* 80169C1C 00166B7C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80169C20 00166B80 4E 80 00 20 */ blr +/* 80169C20 00166B80 4E 80 00 20 */ blr .global LoadVersion4or5__20CScannableObjectInfoFR12CInputStreamUi LoadVersion4or5__20CScannableObjectInfoFR12CInputStreamUi: @@ -356,7 +356,7 @@ lbl_80169DA4: /* 80169DC8 00166D28 80 01 00 64 */ lwz r0, 0x64(r1) /* 80169DCC 00166D2C 7C 08 03 A6 */ mtlr r0 /* 80169DD0 00166D30 38 21 00 60 */ addi r1, r1, 0x60 -/* 80169DD4 00166D34 4E 80 00 20 */ blr +/* 80169DD4 00166D34 4E 80 00 20 */ blr .global __ct__20CScannableObjectInfoFR12CInputStreamUi __ct__20CScannableObjectInfoFR12CInputStreamUi: @@ -473,7 +473,7 @@ lbl_80169F44: /* 80169F60 00166EC0 83 C1 00 08 */ lwz r30, 8(r1) /* 80169F64 00166EC4 7C 08 03 A6 */ mtlr r0 /* 80169F68 00166EC8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80169F6C 00166ECC 4E 80 00 20 */ blr +/* 80169F6C 00166ECC 4E 80 00 20 */ blr .global GetImagePaneName__16CPauseScreenBaseFUi GetImagePaneName__16CPauseScreenBaseFUi: diff --git a/asm/MetroidPrime/Factories/CStateMachineFactory.s b/asm/MetroidPrime/Factories/CStateMachineFactory.s index 320684d3..ae3596e6 100644 --- a/asm/MetroidPrime/Factories/CStateMachineFactory.s +++ b/asm/MetroidPrime/Factories/CStateMachineFactory.s @@ -39,7 +39,7 @@ lbl_800DE840: /* 800DE850 000DB7B0 83 C1 00 08 */ lwz r30, 8(r1) /* 800DE854 000DB7B4 7C 08 03 A6 */ mtlr r0 /* 800DE858 000DB7B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800DE85C 000DB7BC 4E 80 00 20 */ blr +/* 800DE85C 000DB7BC 4E 80 00 20 */ blr .global "__ct<13CStateMachine>__16CFactoryFnReturnFP13CStateMachine" "__ct<13CStateMachine>__16CFactoryFnReturnFP13CStateMachine": @@ -74,7 +74,7 @@ lbl_800DE840: /* 800DE8D0 000DB830 38 80 00 01 */ li r4, 1 /* 800DE8D4 000DB834 81 8C 00 08 */ lwz r12, 8(r12) /* 800DE8D8 000DB838 7D 89 03 A6 */ mtctr r12 -/* 800DE8DC 000DB83C 4E 80 04 21 */ bctrl +/* 800DE8DC 000DB83C 4E 80 04 21 */ bctrl lbl_800DE8E0: /* 800DE8E0 000DB840 38 61 00 10 */ addi r3, r1, 0x10 /* 800DE8E4 000DB844 38 80 FF FF */ li r4, -1 @@ -84,7 +84,7 @@ lbl_800DE8E0: /* 800DE8F4 000DB854 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 800DE8F8 000DB858 7C 08 03 A6 */ mtlr r0 /* 800DE8FC 000DB85C 38 21 00 20 */ addi r1, r1, 0x20 -/* 800DE900 000DB860 4E 80 00 20 */ blr +/* 800DE900 000DB860 4E 80 00 20 */ blr .global sub_800de904 sub_800de904: @@ -126,7 +126,7 @@ lbl_800DE978: /* 800DE984 000DB8E4 83 C1 00 08 */ lwz r30, 8(r1) /* 800DE988 000DB8E8 7C 08 03 A6 */ mtlr r0 /* 800DE98C 000DB8EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800DE990 000DB8F0 4E 80 00 20 */ blr +/* 800DE990 000DB8F0 4E 80 00 20 */ blr .global sub_800de994 sub_800de994: @@ -191,7 +191,7 @@ lbl_800DEA54: /* 800DEA60 000DB9C0 83 C1 00 28 */ lwz r30, 0x28(r1) /* 800DEA64 000DB9C4 7C 08 03 A6 */ mtlr r0 /* 800DEA68 000DB9C8 38 21 00 30 */ addi r1, r1, 0x30 -/* 800DEA6C 000DB9CC 4E 80 00 20 */ blr +/* 800DEA6C 000DB9CC 4E 80 00 20 */ blr .global "GetIObjObjectFor__23TToken<13CStateMachine>FRCQ24rstl25auto_ptr<13CStateMachine>" "GetIObjObjectFor__23TToken<13CStateMachine>FRCQ24rstl25auto_ptr<13CStateMachine>": @@ -205,7 +205,7 @@ lbl_800DEA54: /* 800DEA8C 000DB9EC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800DEA90 000DB9F0 7C 08 03 A6 */ mtlr r0 /* 800DEA94 000DB9F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800DEA98 000DB9F8 4E 80 00 20 */ blr +/* 800DEA98 000DB9F8 4E 80 00 20 */ blr .global "GetNewDerivedObject__41TObjOwnerDerivedFromIObj<13CStateMachine>FRCQ24rstl25auto_ptr<13CStateMachine>" "GetNewDerivedObject__41TObjOwnerDerivedFromIObj<13CStateMachine>FRCQ24rstl25auto_ptr<13CStateMachine>": @@ -248,7 +248,7 @@ lbl_800DEB0C: /* 800DEB28 000DBA88 80 01 00 14 */ lwz r0, 0x14(r1) /* 800DEB2C 000DBA8C 7C 08 03 A6 */ mtlr r0 /* 800DEB30 000DBA90 38 21 00 10 */ addi r1, r1, 0x10 -/* 800DEB34 000DBA94 4E 80 00 20 */ blr +/* 800DEB34 000DBA94 4E 80 00 20 */ blr .global "__dt__Q24rstl53auto_ptr<41TObjOwnerDerivedFromIObj<13CStateMachine>>Fv" "__dt__Q24rstl53auto_ptr<41TObjOwnerDerivedFromIObj<13CStateMachine>>Fv": @@ -278,4 +278,4 @@ lbl_800DEB80: /* 800DEB8C 000DBAEC 83 C1 00 08 */ lwz r30, 8(r1) /* 800DEB90 000DBAF0 7C 08 03 A6 */ mtlr r0 /* 800DEB94 000DBAF4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800DEB98 000DBAF8 4E 80 00 20 */ blr +/* 800DEB98 000DBAF8 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/GameObjectLists.s b/asm/MetroidPrime/GameObjectLists.s index 90540130..4ac3fab1 100644 --- a/asm/MetroidPrime/GameObjectLists.s +++ b/asm/MetroidPrime/GameObjectLists.s @@ -68,7 +68,7 @@ IsQualified__14CGameLightListFRC7CEntity: /* 801B84A0 001B5400 80 01 00 14 */ lwz r0, 0x14(r1) /* 801B84A4 001B5404 7C 08 03 A6 */ mtlr r0 /* 801B84A8 001B5408 38 21 00 10 */ addi r1, r1, 0x10 -/* 801B84AC 001B540C 4E 80 00 20 */ blr +/* 801B84AC 001B540C 4E 80 00 20 */ blr .global __ct__14CGameLightListFv __ct__14CGameLightListFv: @@ -87,7 +87,7 @@ __ct__14CGameLightListFv: /* 801B84E0 001B5440 80 01 00 14 */ lwz r0, 0x14(r1) /* 801B84E4 001B5444 7C 08 03 A6 */ mtlr r0 /* 801B84E8 001B5448 38 21 00 10 */ addi r1, r1, 0x10 -/* 801B84EC 001B544C 4E 80 00 20 */ blr +/* 801B84EC 001B544C 4E 80 00 20 */ blr .global IsQualified__20CPlatformAndDoorListFRC7CEntity IsQualified__20CPlatformAndDoorListFRC7CEntity: @@ -115,7 +115,7 @@ lbl_801B8530: /* 801B853C 001B549C 83 C1 00 08 */ lwz r30, 8(r1) /* 801B8540 001B54A0 7C 08 03 A6 */ mtlr r0 /* 801B8544 001B54A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801B8548 001B54A8 4E 80 00 20 */ blr +/* 801B8548 001B54A8 4E 80 00 20 */ blr .global IsDoor__20CPlatformAndDoorListFPC7CEntity IsDoor__20CPlatformAndDoorListFPC7CEntity: @@ -132,7 +132,7 @@ IsDoor__20CPlatformAndDoorListFPC7CEntity: /* 801B8574 001B54D4 80 01 00 14 */ lwz r0, 0x14(r1) /* 801B8578 001B54D8 7C 08 03 A6 */ mtlr r0 /* 801B857C 001B54DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801B8580 001B54E0 4E 80 00 20 */ blr +/* 801B8580 001B54E0 4E 80 00 20 */ blr .global IsPlatform__20CPlatformAndDoorListFPC7CEntity IsPlatform__20CPlatformAndDoorListFPC7CEntity: @@ -149,7 +149,7 @@ IsPlatform__20CPlatformAndDoorListFPC7CEntity: /* 801B85AC 001B550C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801B85B0 001B5510 7C 08 03 A6 */ mtlr r0 /* 801B85B4 001B5514 38 21 00 10 */ addi r1, r1, 0x10 -/* 801B85B8 001B5518 4E 80 00 20 */ blr +/* 801B85B8 001B5518 4E 80 00 20 */ blr .global __ct__20CPlatformAndDoorListFv __ct__20CPlatformAndDoorListFv: @@ -168,7 +168,7 @@ __ct__20CPlatformAndDoorListFv: /* 801B85EC 001B554C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801B85F0 001B5550 7C 08 03 A6 */ mtlr r0 /* 801B85F4 001B5554 38 21 00 10 */ addi r1, r1, 0x10 -/* 801B85F8 001B5558 4E 80 00 20 */ blr +/* 801B85F8 001B5558 4E 80 00 20 */ blr .global IsQualified__15CAiWaypointListFRC7CEntity IsQualified__15CAiWaypointListFRC7CEntity: @@ -201,7 +201,7 @@ lbl_801B8650: /* 801B865C 001B55BC 83 C1 00 18 */ lwz r30, 0x18(r1) /* 801B8660 001B55C0 7C 08 03 A6 */ mtlr r0 /* 801B8664 001B55C4 38 21 00 20 */ addi r1, r1, 0x20 -/* 801B8668 001B55C8 4E 80 00 20 */ blr +/* 801B8668 001B55C8 4E 80 00 20 */ blr .global __ct__15CAiWaypointListFv __ct__15CAiWaypointListFv: @@ -220,7 +220,7 @@ __ct__15CAiWaypointListFv: /* 801B869C 001B55FC 80 01 00 14 */ lwz r0, 0x14(r1) /* 801B86A0 001B5600 7C 08 03 A6 */ mtlr r0 /* 801B86A4 001B5604 38 21 00 10 */ addi r1, r1, 0x10 -/* 801B86A8 001B5608 4E 80 00 20 */ blr +/* 801B86A8 001B5608 4E 80 00 20 */ blr .global IsQualified__16CListeningAiListFRC7CEntity IsQualified__16CListeningAiListFRC7CEntity: @@ -237,7 +237,7 @@ IsQualified__16CListeningAiListFRC7CEntity: /* 801B86D4 001B5634 81 83 00 00 */ lwz r12, 0(r3) /* 801B86D8 001B5638 81 8C 00 98 */ lwz r12, 0x98(r12) /* 801B86DC 001B563C 7D 89 03 A6 */ mtctr r12 -/* 801B86E0 001B5640 4E 80 04 21 */ bctrl +/* 801B86E0 001B5640 4E 80 04 21 */ bctrl /* 801B86E4 001B5644 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801B86E8 001B5648 41 82 00 08 */ beq lbl_801B86F0 /* 801B86EC 001B564C 3B E0 00 01 */ li r31, 1 @@ -247,7 +247,7 @@ lbl_801B86F0: /* 801B86F8 001B5658 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801B86FC 001B565C 7C 08 03 A6 */ mtlr r0 /* 801B8700 001B5660 38 21 00 20 */ addi r1, r1, 0x20 -/* 801B8704 001B5664 4E 80 00 20 */ blr +/* 801B8704 001B5664 4E 80 00 20 */ blr .global __ct__16CListeningAiListFv __ct__16CListeningAiListFv: @@ -266,7 +266,7 @@ __ct__16CListeningAiListFv: /* 801B8738 001B5698 80 01 00 14 */ lwz r0, 0x14(r1) /* 801B873C 001B569C 7C 08 03 A6 */ mtlr r0 /* 801B8740 001B56A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801B8744 001B56A4 4E 80 00 20 */ blr +/* 801B8744 001B56A4 4E 80 00 20 */ blr .global IsQualified__15CGameCameraListFRC7CEntity IsQualified__15CGameCameraListFRC7CEntity: @@ -282,7 +282,7 @@ IsQualified__15CGameCameraListFRC7CEntity: /* 801B876C 001B56CC 80 01 00 14 */ lwz r0, 0x14(r1) /* 801B8770 001B56D0 7C 08 03 A6 */ mtlr r0 /* 801B8774 001B56D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801B8778 001B56D8 4E 80 00 20 */ blr +/* 801B8778 001B56D8 4E 80 00 20 */ blr .global __ct__15CGameCameraListFv __ct__15CGameCameraListFv: @@ -301,7 +301,7 @@ __ct__15CGameCameraListFv: /* 801B87AC 001B570C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801B87B0 001B5710 7C 08 03 A6 */ mtlr r0 /* 801B87B4 001B5714 38 21 00 10 */ addi r1, r1, 0x10 -/* 801B87B8 001B5718 4E 80 00 20 */ blr +/* 801B87B8 001B5718 4E 80 00 20 */ blr .global IsQualified__17CPhysicsActorListFRC7CEntity IsQualified__17CPhysicsActorListFRC7CEntity: @@ -317,7 +317,7 @@ IsQualified__17CPhysicsActorListFRC7CEntity: /* 801B87E0 001B5740 80 01 00 14 */ lwz r0, 0x14(r1) /* 801B87E4 001B5744 7C 08 03 A6 */ mtlr r0 /* 801B87E8 001B5748 38 21 00 10 */ addi r1, r1, 0x10 -/* 801B87EC 001B574C 4E 80 00 20 */ blr +/* 801B87EC 001B574C 4E 80 00 20 */ blr .global __ct__17CPhysicsActorListFv __ct__17CPhysicsActorListFv: @@ -336,7 +336,7 @@ __ct__17CPhysicsActorListFv: /* 801B8820 001B5780 80 01 00 14 */ lwz r0, 0x14(r1) /* 801B8824 001B5784 7C 08 03 A6 */ mtlr r0 /* 801B8828 001B5788 38 21 00 10 */ addi r1, r1, 0x10 -/* 801B882C 001B578C 4E 80 00 20 */ blr +/* 801B882C 001B578C 4E 80 00 20 */ blr .global IsQualified__10CActorListFRC7CEntity IsQualified__10CActorListFRC7CEntity: @@ -352,7 +352,7 @@ IsQualified__10CActorListFRC7CEntity: /* 801B8854 001B57B4 80 01 00 14 */ lwz r0, 0x14(r1) /* 801B8858 001B57B8 7C 08 03 A6 */ mtlr r0 /* 801B885C 001B57BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801B8860 001B57C0 4E 80 00 20 */ blr +/* 801B8860 001B57C0 4E 80 00 20 */ blr .global __ct__10CActorListFv __ct__10CActorListFv: diff --git a/asm/MetroidPrime/HUD/CHudBallInterface.s b/asm/MetroidPrime/HUD/CHudBallInterface.s index 1163bbac..d338bb70 100644 --- a/asm/MetroidPrime/HUD/CHudBallInterface.s +++ b/asm/MetroidPrime/HUD/CHudBallInterface.s @@ -84,7 +84,7 @@ lbl_801CD588: /* 801CD59C 001CA4FC 83 A1 00 14 */ lwz r29, 0x14(r1) /* 801CD5A0 001CA500 7C 08 03 A6 */ mtlr r0 /* 801CD5A4 001CA504 38 21 00 20 */ addi r1, r1, 0x20 -/* 801CD5A8 001CA508 4E 80 00 20 */ blr +/* 801CD5A8 001CA508 4E 80 00 20 */ blr .global SetBallModeFactor__17CHudBallInterfaceFf SetBallModeFactor__17CHudBallInterfaceFf: @@ -122,7 +122,7 @@ SetBallModeFactor__17CHudBallInterfaceFf: /* 801CD628 001CA588 83 E1 00 4C */ lwz r31, 0x4c(r1) /* 801CD62C 001CA58C 7C 08 03 A6 */ mtlr r0 /* 801CD630 001CA590 38 21 00 50 */ addi r1, r1, 0x50 -/* 801CD634 001CA594 4E 80 00 20 */ blr +/* 801CD634 001CA594 4E 80 00 20 */ blr .global SetBombParams__17CHudBallInterfaceFiiibbb SetBombParams__17CHudBallInterfaceFiiibbb: @@ -232,7 +232,7 @@ lbl_801CD7A4: /* 801CD7B0 001CA710 80 01 00 44 */ lwz r0, 0x44(r1) /* 801CD7B4 001CA714 7C 08 03 A6 */ mtlr r0 /* 801CD7B8 001CA718 38 21 00 40 */ addi r1, r1, 0x40 -/* 801CD7BC 001CA71C 4E 80 00 20 */ blr +/* 801CD7BC 001CA71C 4E 80 00 20 */ blr .global __ct__17CHudBallInterfaceFR9CGuiFrameiiibb __ct__17CHudBallInterfaceFR9CGuiFrameiiibb: @@ -305,14 +305,14 @@ lbl_801CD888: /* 801CD8C4 001CA824 38 80 00 01 */ li r4, 1 /* 801CD8C8 001CA828 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 801CD8CC 001CA82C 7D 89 03 A6 */ mtctr r12 -/* 801CD8D0 001CA830 4E 80 04 21 */ bctrl +/* 801CD8D0 001CA830 4E 80 04 21 */ bctrl /* 801CD8D4 001CA834 81 9C 00 00 */ lwz r12, 0(r28) /* 801CD8D8 001CA838 7C 7D 1B 78 */ mr r29, r3 /* 801CD8DC 001CA83C 7F 83 E3 78 */ mr r3, r28 /* 801CD8E0 001CA840 38 80 00 00 */ li r4, 0 /* 801CD8E4 001CA844 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 801CD8E8 001CA848 7D 89 03 A6 */ mtctr r12 -/* 801CD8EC 001CA84C 4E 80 04 21 */ bctrl +/* 801CD8EC 001CA84C 4E 80 04 21 */ bctrl /* 801CD8F0 001CA850 80 1B 00 00 */ lwz r0, 0(r27) /* 801CD8F4 001CA854 7C 7C 1B 78 */ mr r28, r3 /* 801CD8F8 001CA858 54 00 10 3A */ slwi r0, r0, 2 diff --git a/asm/MetroidPrime/HUD/CHudDecoInterface.s b/asm/MetroidPrime/HUD/CHudDecoInterface.s index fac190ed..df15357c 100644 --- a/asm/MetroidPrime/HUD/CHudDecoInterface.s +++ b/asm/MetroidPrime/HUD/CHudDecoInterface.s @@ -457,12 +457,12 @@ lbl_8018F458: /* 8018F46C 0018C3CC 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8018F470 0018C3D0 7C 08 03 A6 */ mtlr r0 /* 8018F474 0018C3D4 38 21 00 40 */ addi r1, r1, 0x40 -/* 8018F478 0018C3D8 4E 80 00 20 */ blr +/* 8018F478 0018C3D8 4E 80 00 20 */ blr .global SetAlpha__23CHudBossEnergyInterfaceFf SetAlpha__23CHudBossEnergyInterfaceFf: /* 8018F47C 0018C3DC D0 23 00 00 */ stfs f1, 0(r3) -/* 8018F480 0018C3E0 4E 80 00 20 */ blr +/* 8018F480 0018C3E0 4E 80 00 20 */ blr .global "SetBossParams__23CHudBossEnergyInterfaceFbRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" "SetBossParams__23CHudBossEnergyInterfaceFbRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>": @@ -513,7 +513,7 @@ lbl_8018F510: /* 8018F530 0018C490 83 C1 00 08 */ lwz r30, 8(r1) /* 8018F534 0018C494 7C 08 03 A6 */ mtlr r0 /* 8018F538 0018C498 38 21 00 30 */ addi r1, r1, 0x30 -/* 8018F53C 0018C49C 4E 80 00 20 */ blr +/* 8018F53C 0018C49C 4E 80 00 20 */ blr .global __ct__23CHudBossEnergyInterfaceFR9CGuiFrame __ct__23CHudBossEnergyInterfaceFR9CGuiFrame: @@ -572,7 +572,7 @@ __ct__23CHudBossEnergyInterfaceFR9CGuiFrame: /* 8018F610 0018C570 80 01 00 14 */ lwz r0, 0x14(r1) /* 8018F614 0018C574 7C 08 03 A6 */ mtlr r0 /* 8018F618 0018C578 38 21 00 10 */ addi r1, r1, 0x10 -/* 8018F61C 0018C57C 4E 80 00 20 */ blr +/* 8018F61C 0018C57C 4E 80 00 20 */ blr .global Update__19CHudEnergyInterfaceFff Update__19CHudEnergyInterfaceFff: @@ -785,7 +785,7 @@ lbl_8018F8E0: /* 8018F920 0018C880 83 A1 00 74 */ lwz r29, 0x74(r1) /* 8018F924 0018C884 7C 08 03 A6 */ mtlr r0 /* 8018F928 0018C888 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 8018F92C 0018C88C 4E 80 00 20 */ blr +/* 8018F92C 0018C88C 4E 80 00 20 */ blr .global SetEnergyLow__19CHudEnergyInterfaceFb SetEnergyLow__19CHudEnergyInterfaceFb: @@ -868,7 +868,7 @@ lbl_8018FA34: /* 8018FA44 0018C9A4 83 81 00 40 */ lwz r28, 0x40(r1) /* 8018FA48 0018C9A8 7C 08 03 A6 */ mtlr r0 /* 8018FA4C 0018C9AC 38 21 00 50 */ addi r1, r1, 0x50 -/* 8018FA50 0018C9B0 4E 80 00 20 */ blr +/* 8018FA50 0018C9B0 4E 80 00 20 */ blr .global SetFlashMagnitude__19CHudEnergyInterfaceFf SetFlashMagnitude__19CHudEnergyInterfaceFf: @@ -888,7 +888,7 @@ SetFlashMagnitude__19CHudEnergyInterfaceFf: /* 8018FA88 0018C9E8 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8018FA8C 0018C9EC 7C 08 03 A6 */ mtlr r0 /* 8018FA90 0018C9F0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8018FA94 0018C9F4 4E 80 00 20 */ blr +/* 8018FA94 0018C9F4 4E 80 00 20 */ blr .global SetNumFilledEnergyTanks__19CHudEnergyInterfaceFi SetNumFilledEnergyTanks__19CHudEnergyInterfaceFi: @@ -901,7 +901,7 @@ SetNumFilledEnergyTanks__19CHudEnergyInterfaceFi: /* 8018FAB0 0018CA10 80 01 00 14 */ lwz r0, 0x14(r1) /* 8018FAB4 0018CA14 7C 08 03 A6 */ mtlr r0 /* 8018FAB8 0018CA18 38 21 00 10 */ addi r1, r1, 0x10 -/* 8018FABC 0018CA1C 4E 80 00 20 */ blr +/* 8018FABC 0018CA1C 4E 80 00 20 */ blr .global SetNumTotalEnergyTanks__19CHudEnergyInterfaceFi SetNumTotalEnergyTanks__19CHudEnergyInterfaceFi: @@ -914,7 +914,7 @@ SetNumTotalEnergyTanks__19CHudEnergyInterfaceFi: /* 8018FAD8 0018CA38 80 01 00 14 */ lwz r0, 0x14(r1) /* 8018FADC 0018CA3C 7C 08 03 A6 */ mtlr r0 /* 8018FAE0 0018CA40 38 21 00 10 */ addi r1, r1, 0x10 -/* 8018FAE4 0018CA44 4E 80 00 20 */ blr +/* 8018FAE4 0018CA44 4E 80 00 20 */ blr .global SetCurrEnergy__19CHudEnergyInterfaceFf SetCurrEnergy__19CHudEnergyInterfaceFf: @@ -938,7 +938,7 @@ lbl_8018FB20: /* 8018FB24 0018CA84 80 01 00 14 */ lwz r0, 0x14(r1) /* 8018FB28 0018CA88 7C 08 03 A6 */ mtlr r0 /* 8018FB2C 0018CA8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8018FB30 0018CA90 4E 80 00 20 */ blr +/* 8018FB30 0018CA90 4E 80 00 20 */ blr .global __ct__19CHudEnergyInterfaceFR9CGuiFramefiibi __ct__19CHudEnergyInterfaceFR9CGuiFramefiibi: @@ -1123,21 +1123,21 @@ lbl_8018FDDC: /* 8018FDE4 0018CD44 81 83 00 00 */ lwz r12, 0(r3) /* 8018FDE8 0018CD48 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 8018FDEC 0018CD4C 7D 89 03 A6 */ mtctr r12 -/* 8018FDF0 0018CD50 4E 80 04 21 */ bctrl +/* 8018FDF0 0018CD50 4E 80 04 21 */ bctrl /* 8018FDF4 0018CD54 81 83 00 00 */ lwz r12, 0(r3) /* 8018FDF8 0018CD58 7C 60 1B 78 */ mr r0, r3 /* 8018FDFC 0018CD5C 38 80 00 00 */ li r4, 0 /* 8018FE00 0018CD60 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 8018FE04 0018CD64 7C 1D 03 78 */ mr r29, r0 /* 8018FE08 0018CD68 7D 89 03 A6 */ mtctr r12 -/* 8018FE0C 0018CD6C 4E 80 04 21 */ bctrl +/* 8018FE0C 0018CD6C 4E 80 04 21 */ bctrl /* 8018FE10 0018CD70 81 9D 00 00 */ lwz r12, 0(r29) /* 8018FE14 0018CD74 7C 7F 1B 78 */ mr r31, r3 /* 8018FE18 0018CD78 7F A3 EB 78 */ mr r3, r29 /* 8018FE1C 0018CD7C 38 80 00 01 */ li r4, 1 /* 8018FE20 0018CD80 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 8018FE24 0018CD84 7D 89 03 A6 */ mtctr r12 -/* 8018FE28 0018CD88 4E 80 04 21 */ bctrl +/* 8018FE28 0018CD88 4E 80 04 21 */ bctrl /* 8018FE2C 0018CD8C 28 1F 00 00 */ cmplwi r31, 0 /* 8018FE30 0018CD90 7C 7D 1B 78 */ mr r29, r3 /* 8018FE34 0018CD94 41 82 00 10 */ beq lbl_8018FE44 @@ -1159,7 +1159,7 @@ lbl_8018FE58: /* 8018FE6C 0018CDCC 80 01 00 94 */ lwz r0, 0x94(r1) /* 8018FE70 0018CDD0 7C 08 03 A6 */ mtlr r0 /* 8018FE74 0018CDD4 38 21 00 90 */ addi r1, r1, 0x90 -/* 8018FE78 0018CDD8 4E 80 00 20 */ blr +/* 8018FE78 0018CDD8 4E 80 00 20 */ blr .global XRayEnergyCoordFunc__19CHudEnergyInterfaceFf XRayEnergyCoordFunc__19CHudEnergyInterfaceFf: @@ -1201,7 +1201,7 @@ XRayEnergyCoordFunc__19CHudEnergyInterfaceFf: /* 8018FF08 0018CE68 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8018FF0C 0018CE6C 7C 08 03 A6 */ mtlr r0 /* 8018FF10 0018CE70 38 21 00 30 */ addi r1, r1, 0x30 -/* 8018FF14 0018CE74 4E 80 00 20 */ blr +/* 8018FF14 0018CE74 4E 80 00 20 */ blr .global ThermalEnergyCoordFunc__19CHudEnergyInterfaceFf ThermalEnergyCoordFunc__19CHudEnergyInterfaceFf: @@ -1215,7 +1215,7 @@ ThermalEnergyCoordFunc__19CHudEnergyInterfaceFf: /* 8018FF34 0018CE94 D0 23 00 0C */ stfs f1, 0xc(r3) /* 8018FF38 0018CE98 D0 43 00 10 */ stfs f2, 0x10(r3) /* 8018FF3C 0018CE9C D0 03 00 14 */ stfs f0, 0x14(r3) -/* 8018FF40 0018CEA0 4E 80 00 20 */ blr +/* 8018FF40 0018CEA0 4E 80 00 20 */ blr .global BallEnergyCoordFunc__19CHudEnergyInterfaceFf BallEnergyCoordFunc__19CHudEnergyInterfaceFf: @@ -1229,7 +1229,7 @@ BallEnergyCoordFunc__19CHudEnergyInterfaceFf: /* 8018FF60 0018CEC0 D0 23 00 0C */ stfs f1, 0xc(r3) /* 8018FF64 0018CEC4 D0 43 00 10 */ stfs f2, 0x10(r3) /* 8018FF68 0018CEC8 D0 03 00 14 */ stfs f0, 0x14(r3) -/* 8018FF6C 0018CECC 4E 80 00 20 */ blr +/* 8018FF6C 0018CECC 4E 80 00 20 */ blr .global BossEnergyCoordFunc__23CHudBossEnergyInterfaceFf BossEnergyCoordFunc__23CHudBossEnergyInterfaceFf: @@ -1244,7 +1244,7 @@ BossEnergyCoordFunc__23CHudBossEnergyInterfaceFf: /* 8018FF90 0018CEF0 D0 23 00 0C */ stfs f1, 0xc(r3) /* 8018FF94 0018CEF4 D0 43 00 10 */ stfs f2, 0x10(r3) /* 8018FF98 0018CEF8 D0 03 00 14 */ stfs f0, 0x14(r3) -/* 8018FF9C 0018CEFC 4E 80 00 20 */ blr +/* 8018FF9C 0018CEFC 4E 80 00 20 */ blr .global CombatEnergyCoordFunc__19CHudEnergyInterfaceFf CombatEnergyCoordFunc__19CHudEnergyInterfaceFf: @@ -1288,7 +1288,7 @@ CombatEnergyCoordFunc__19CHudEnergyInterfaceFf: .global sub_80190034 sub_80190034: -/* 80190034 0018CF94 4E 80 00 20 */ blr +/* 80190034 0018CF94 4E 80 00 20 */ blr .global __dt__21CHudFreeLookInterfaceFv __dt__21CHudFreeLookInterfaceFv: @@ -1316,7 +1316,7 @@ lbl_8019007C: /* 80190084 0018CFE4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80190088 0018CFE8 7C 08 03 A6 */ mtlr r0 /* 8019008C 0018CFEC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80190090 0018CFF0 4E 80 00 20 */ blr +/* 80190090 0018CFF0 4E 80 00 20 */ blr .global Update__21CHudFreeLookInterfaceFf Update__21CHudFreeLookInterfaceFf: @@ -1400,7 +1400,7 @@ lbl_80190194: .global sub_80190198 sub_80190198: -/* 80190198 0018D0F8 4E 80 00 20 */ blr +/* 80190198 0018D0F8 4E 80 00 20 */ blr .global UpdateVisibility__21CHudFreeLookInterfaceFv UpdateVisibility__21CHudFreeLookInterfaceFv: @@ -1435,7 +1435,7 @@ lbl_801901D4: /* 80190208 0018D168 81 9D 00 00 */ lwz r12, 0(r29) /* 8019020C 0018D16C 81 8C 00 14 */ lwz r12, 0x14(r12) /* 80190210 0018D170 7D 89 03 A6 */ mtctr r12 -/* 80190214 0018D174 4E 80 04 21 */ bctrl +/* 80190214 0018D174 4E 80 04 21 */ bctrl lbl_80190218: /* 80190218 0018D178 80 01 00 24 */ lwz r0, 0x24(r1) /* 8019021C 0018D17C 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -1443,7 +1443,7 @@ lbl_80190218: /* 80190224 0018D184 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80190228 0018D188 7C 08 03 A6 */ mtlr r0 /* 8019022C 0018D18C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80190230 0018D190 4E 80 00 20 */ blr +/* 80190230 0018D190 4E 80 00 20 */ blr .global SetIsVisibleGame__21CHudFreeLookInterfaceFb SetIsVisibleGame__21CHudFreeLookInterfaceFb: @@ -1457,7 +1457,7 @@ SetIsVisibleGame__21CHudFreeLookInterfaceFb: /* 80190250 0018D1B0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80190254 0018D1B4 7C 08 03 A6 */ mtlr r0 /* 80190258 0018D1B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8019025C 0018D1BC 4E 80 00 20 */ blr +/* 8019025C 0018D1BC 4E 80 00 20 */ blr .global SetIsVisibleDebug__21CHudFreeLookInterfaceFb SetIsVisibleDebug__21CHudFreeLookInterfaceFb: @@ -1471,7 +1471,7 @@ SetIsVisibleDebug__21CHudFreeLookInterfaceFb: /* 8019027C 0018D1DC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80190280 0018D1E0 7C 08 03 A6 */ mtlr r0 /* 80190284 0018D1E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80190288 0018D1E8 4E 80 00 20 */ blr +/* 80190288 0018D1E8 4E 80 00 20 */ blr .global SetFreeLookState__21CHudFreeLookInterfaceFbbbf SetFreeLookState__21CHudFreeLookInterfaceFbbbf: @@ -1609,7 +1609,7 @@ lbl_80190464: /* 8019048C 0018D3EC 83 C1 00 D8 */ lwz r30, 0xd8(r1) /* 80190490 0018D3F0 7C 08 03 A6 */ mtlr r0 /* 80190494 0018D3F4 38 21 01 20 */ addi r1, r1, 0x120 -/* 80190498 0018D3F8 4E 80 00 20 */ blr +/* 80190498 0018D3F8 4E 80 00 20 */ blr .global __ct__21CHudFreeLookInterfaceFR9CGuiFrame8EHudTypebbb __ct__21CHudFreeLookInterfaceFR9CGuiFrame8EHudTypebbb: @@ -1725,7 +1725,7 @@ lbl_80190540: /* 80190644 0018D5A4 80 01 00 34 */ lwz r0, 0x34(r1) /* 80190648 0018D5A8 7C 08 03 A6 */ mtlr r0 /* 8019064C 0018D5AC 38 21 00 30 */ addi r1, r1, 0x30 -/* 80190650 0018D5B0 4E 80 00 20 */ blr +/* 80190650 0018D5B0 4E 80 00 20 */ blr .global Update__25CHudFreeLookInterfaceXRayFf Update__25CHudFreeLookInterfaceXRayFf: @@ -1769,7 +1769,7 @@ lbl_801906D0: /* 801906D4 0018D634 D0 03 00 1C */ stfs f0, 0x1c(r3) lbl_801906D8: /* 801906D8 0018D638 38 21 00 10 */ addi r1, r1, 0x10 -/* 801906DC 0018D63C 4E 80 00 20 */ blr +/* 801906DC 0018D63C 4E 80 00 20 */ blr .global UpdateVisibility__25CHudFreeLookInterfaceXRayFv UpdateVisibility__25CHudFreeLookInterfaceXRayFv: @@ -1804,7 +1804,7 @@ lbl_80190718: /* 8019074C 0018D6AC 81 9D 00 00 */ lwz r12, 0(r29) /* 80190750 0018D6B0 81 8C 00 14 */ lwz r12, 0x14(r12) /* 80190754 0018D6B4 7D 89 03 A6 */ mtctr r12 -/* 80190758 0018D6B8 4E 80 04 21 */ bctrl +/* 80190758 0018D6B8 4E 80 04 21 */ bctrl lbl_8019075C: /* 8019075C 0018D6BC 80 01 00 24 */ lwz r0, 0x24(r1) /* 80190760 0018D6C0 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -1812,7 +1812,7 @@ lbl_8019075C: /* 80190768 0018D6C8 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8019076C 0018D6CC 7C 08 03 A6 */ mtlr r0 /* 80190770 0018D6D0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80190774 0018D6D4 4E 80 00 20 */ blr +/* 80190774 0018D6D4 4E 80 00 20 */ blr .global SetIsVisibleGame__25CHudFreeLookInterfaceXRayFb SetIsVisibleGame__25CHudFreeLookInterfaceXRayFb: @@ -1826,7 +1826,7 @@ SetIsVisibleGame__25CHudFreeLookInterfaceXRayFb: /* 80190794 0018D6F4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80190798 0018D6F8 7C 08 03 A6 */ mtlr r0 /* 8019079C 0018D6FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801907A0 0018D700 4E 80 00 20 */ blr +/* 801907A0 0018D700 4E 80 00 20 */ blr .global SetIsVisibleDebug__25CHudFreeLookInterfaceXRayFb SetIsVisibleDebug__25CHudFreeLookInterfaceXRayFb: @@ -1840,7 +1840,7 @@ SetIsVisibleDebug__25CHudFreeLookInterfaceXRayFb: /* 801907C0 0018D720 80 01 00 14 */ lwz r0, 0x14(r1) /* 801907C4 0018D724 7C 08 03 A6 */ mtlr r0 /* 801907C8 0018D728 38 21 00 10 */ addi r1, r1, 0x10 -/* 801907CC 0018D72C 4E 80 00 20 */ blr +/* 801907CC 0018D72C 4E 80 00 20 */ blr .global SetFreeLookState__25CHudFreeLookInterfaceXRayFbbbf SetFreeLookState__25CHudFreeLookInterfaceXRayFbbbf: @@ -1921,7 +1921,7 @@ lbl_801908D8: /* 801908F0 0018D850 83 C1 00 C8 */ lwz r30, 0xc8(r1) /* 801908F4 0018D854 7C 08 03 A6 */ mtlr r0 /* 801908F8 0018D858 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 801908FC 0018D85C 4E 80 00 20 */ blr +/* 801908FC 0018D85C 4E 80 00 20 */ blr .global __ct__25CHudFreeLookInterfaceXRayFR9CGuiFramebbUi __ct__25CHudFreeLookInterfaceXRayFR9CGuiFramebbUi: @@ -2014,7 +2014,7 @@ __ct__25CHudFreeLookInterfaceXRayFR9CGuiFramebbUi: /* 80190A58 0018D9B8 80 01 00 34 */ lwz r0, 0x34(r1) /* 80190A5C 0018D9BC 7C 08 03 A6 */ mtlr r0 /* 80190A60 0018D9C0 38 21 00 30 */ addi r1, r1, 0x30 -/* 80190A64 0018D9C4 4E 80 00 20 */ blr +/* 80190A64 0018D9C4 4E 80 00 20 */ blr .global __dt__25CHudFreeLookInterfaceXRayFv __dt__25CHudFreeLookInterfaceXRayFv: @@ -2042,7 +2042,7 @@ lbl_80190AAC: /* 80190AB4 0018DA14 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80190AB8 0018DA18 7C 08 03 A6 */ mtlr r0 /* 80190ABC 0018DA1C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80190AC0 0018DA20 4E 80 00 20 */ blr +/* 80190AC0 0018DA20 4E 80 00 20 */ blr .global Update__19CHudHelmetInterfaceFf Update__19CHudHelmetInterfaceFf: @@ -2084,7 +2084,7 @@ lbl_80190B48: /* 80190B4C 0018DAAC 83 E1 00 4C */ lwz r31, 0x4c(r1) /* 80190B50 0018DAB0 7C 08 03 A6 */ mtlr r0 /* 80190B54 0018DAB4 38 21 00 50 */ addi r1, r1, 0x50 -/* 80190B58 0018DAB8 4E 80 00 20 */ blr +/* 80190B58 0018DAB8 4E 80 00 20 */ blr .global SetHudLagOffset__19CHudHelmetInterfaceFRC9CVector3f SetHudLagOffset__19CHudHelmetInterfaceFRC9CVector3f: @@ -2098,7 +2098,7 @@ SetHudLagOffset__19CHudHelmetInterfaceFRC9CVector3f: /* 80190B78 0018DAD8 88 03 00 3C */ lbz r0, 0x3c(r3) /* 80190B7C 0018DADC 50 A0 1F 38 */ rlwimi r0, r5, 3, 0x1c, 0x1c /* 80190B80 0018DAE0 98 03 00 3C */ stb r0, 0x3c(r3) -/* 80190B84 0018DAE4 4E 80 00 20 */ blr +/* 80190B84 0018DAE4 4E 80 00 20 */ blr .global SetHudLagRotation__19CHudHelmetInterfaceFRC9CMatrix3f SetHudLagRotation__19CHudHelmetInterfaceFRC9CMatrix3f: @@ -2116,7 +2116,7 @@ SetHudLagRotation__19CHudHelmetInterfaceFRC9CMatrix3f: /* 80190BB4 0018DB14 80 01 00 14 */ lwz r0, 0x14(r1) /* 80190BB8 0018DB18 7C 08 03 A6 */ mtlr r0 /* 80190BBC 0018DB1C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80190BC0 0018DB20 4E 80 00 20 */ blr +/* 80190BC0 0018DB20 4E 80 00 20 */ blr .global AddHelmetLightValue__19CHudHelmetInterfaceFf AddHelmetLightValue__19CHudHelmetInterfaceFf: @@ -2142,7 +2142,7 @@ AddHelmetLightValue__19CHudHelmetInterfaceFf: /* 80190C10 0018DB70 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80190C14 0018DB74 7C 08 03 A6 */ mtlr r0 /* 80190C18 0018DB78 38 21 00 20 */ addi r1, r1, 0x20 -/* 80190C1C 0018DB7C 4E 80 00 20 */ blr +/* 80190C1C 0018DB7C 4E 80 00 20 */ blr .global UpdateCameraDebugSettings__19CHudHelmetInterfaceFfff UpdateCameraDebugSettings__19CHudHelmetInterfaceFfff: @@ -2200,7 +2200,7 @@ UpdateCameraDebugSettings__19CHudHelmetInterfaceFfff: /* 80190CEC 0018DC4C 83 E1 00 9C */ lwz r31, 0x9c(r1) /* 80190CF0 0018DC50 7C 08 03 A6 */ mtlr r0 /* 80190CF4 0018DC54 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 80190CF8 0018DC58 4E 80 00 20 */ blr +/* 80190CF8 0018DC58 4E 80 00 20 */ blr .global UpdateVisibility__19CHudHelmetInterfaceFv UpdateVisibility__19CHudHelmetInterfaceFv: @@ -2239,7 +2239,7 @@ lbl_80190D4C: /* 80190D74 0018DCD4 83 C1 00 08 */ lwz r30, 8(r1) /* 80190D78 0018DCD8 7C 08 03 A6 */ mtlr r0 /* 80190D7C 0018DCDC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80190D80 0018DCE0 4E 80 00 20 */ blr +/* 80190D80 0018DCE0 4E 80 00 20 */ blr .global UpdateHelmetAlpha__19CHudHelmetInterfaceFv UpdateHelmetAlpha__19CHudHelmetInterfaceFv: @@ -2275,7 +2275,7 @@ UpdateHelmetAlpha__19CHudHelmetInterfaceFv: /* 80190DF8 0018DD58 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80190DFC 0018DD5C 7C 08 03 A6 */ mtlr r0 /* 80190E00 0018DD60 38 21 00 40 */ addi r1, r1, 0x40 -/* 80190E04 0018DD64 4E 80 00 20 */ blr +/* 80190E04 0018DD64 4E 80 00 20 */ blr .global SetIsVisibleDebug__19CHudHelmetInterfaceFbb SetIsVisibleDebug__19CHudHelmetInterfaceFbb: @@ -2292,7 +2292,7 @@ SetIsVisibleDebug__19CHudHelmetInterfaceFbb: /* 80190E30 0018DD90 80 01 00 14 */ lwz r0, 0x14(r1) /* 80190E34 0018DD94 7C 08 03 A6 */ mtlr r0 /* 80190E38 0018DD98 38 21 00 10 */ addi r1, r1, 0x10 -/* 80190E3C 0018DD9C 4E 80 00 20 */ blr +/* 80190E3C 0018DD9C 4E 80 00 20 */ blr .global __ct__19CHudHelmetInterfaceFR9CGuiFrame __ct__19CHudHelmetInterfaceFR9CGuiFrame: @@ -2397,7 +2397,7 @@ __ct__19CHudHelmetInterfaceFR9CGuiFrame: /* 80190FC8 0018DF28 83 A1 00 54 */ lwz r29, 0x54(r1) /* 80190FCC 0018DF2C 7C 08 03 A6 */ mtlr r0 /* 80190FD0 0018DF30 38 21 00 60 */ addi r1, r1, 0x60 -/* 80190FD4 0018DF34 4E 80 00 20 */ blr +/* 80190FD4 0018DF34 4E 80 00 20 */ blr .global Update__20CHudMissileInterfaceFfRC13CStateManager Update__20CHudMissileInterfaceFfRC13CStateManager: @@ -2970,7 +2970,7 @@ lbl_801917D4: /* 801917F8 0018E758 80 01 01 A4 */ lwz r0, 0x1a4(r1) /* 801917FC 0018E75C 7C 08 03 A6 */ mtlr r0 /* 80191800 0018E760 38 21 01 A0 */ addi r1, r1, 0x1a0 -/* 80191804 0018E764 4E 80 00 20 */ blr +/* 80191804 0018E764 4E 80 00 20 */ blr .global UpdateVisibility__20CHudMissileInterfaceFRC13CStateManager UpdateVisibility__20CHudMissileInterfaceFRC13CStateManager: @@ -3014,7 +3014,7 @@ lbl_80191884: /* 80191894 0018E7F4 83 81 00 10 */ lwz r28, 0x10(r1) /* 80191898 0018E7F8 7C 08 03 A6 */ mtlr r0 /* 8019189C 0018E7FC 38 21 00 20 */ addi r1, r1, 0x20 -/* 801918A0 0018E800 4E 80 00 20 */ blr +/* 801918A0 0018E800 4E 80 00 20 */ blr .global SetIsVisibleGame__20CHudMissileInterfaceFbRC13CStateManager SetIsVisibleGame__20CHudMissileInterfaceFbRC13CStateManager: @@ -3029,19 +3029,19 @@ SetIsVisibleGame__20CHudMissileInterfaceFbRC13CStateManager: /* 801918C4 0018E824 80 01 00 14 */ lwz r0, 0x14(r1) /* 801918C8 0018E828 7C 08 03 A6 */ mtlr r0 /* 801918CC 0018E82C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801918D0 0018E830 4E 80 00 20 */ blr +/* 801918D0 0018E830 4E 80 00 20 */ blr .global SetIsMissilesActive__20CHudMissileInterfaceFb SetIsMissilesActive__20CHudMissileInterfaceFb: /* 801918D4 0018E834 88 03 00 58 */ lbz r0, 0x58(r3) /* 801918D8 0018E838 50 80 3E 30 */ rlwimi r0, r4, 7, 0x18, 0x18 /* 801918DC 0018E83C 98 03 00 58 */ stb r0, 0x58(r3) -/* 801918E0 0018E840 4E 80 00 20 */ blr +/* 801918E0 0018E840 4E 80 00 20 */ blr .global SetChargeBeamFactor__20CHudMissileInterfaceFf SetChargeBeamFactor__20CHudMissileInterfaceFf: /* 801918E4 0018E844 D0 23 00 4C */ stfs f1, 0x4c(r3) -/* 801918E8 0018E848 4E 80 00 20 */ blr +/* 801918E8 0018E848 4E 80 00 20 */ blr .global SetNumMissiles__20CHudMissileInterfaceFiRC13CStateManager SetNumMissiles__20CHudMissileInterfaceFiRC13CStateManager: @@ -3111,12 +3111,12 @@ lbl_801919CC: /* 801919DC 0018E93C 83 C1 00 28 */ lwz r30, 0x28(r1) /* 801919E0 0018E940 7C 08 03 A6 */ mtlr r0 /* 801919E4 0018E944 38 21 00 30 */ addi r1, r1, 0x30 -/* 801919E8 0018E948 4E 80 00 20 */ blr +/* 801919E8 0018E948 4E 80 00 20 */ blr .global SetMissileCapacity__20CHudMissileInterfaceFf SetMissileCapacity__20CHudMissileInterfaceFf: /* 801919EC 0018E94C 90 83 00 04 */ stw r4, 4(r3) -/* 801919F0 0018E950 4E 80 00 20 */ blr +/* 801919F0 0018E950 4E 80 00 20 */ blr .global __ct__20CHudMissileInterfaceFR9CGuiFrameiifbUiRC13CStateManager __ct__20CHudMissileInterfaceFR9CGuiFrameiifbUiRC13CStateManager: @@ -3334,7 +3334,7 @@ lbl_80191D04: /* 80191D30 0018EC90 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 80191D34 0018EC94 7C 08 03 A6 */ mtlr r0 /* 80191D38 0018EC98 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 80191D3C 0018EC9C 4E 80 00 20 */ blr +/* 80191D3C 0018EC9C 4E 80 00 20 */ blr .global GetMissileInventoryStatus__20CHudMissileInterfaceFv GetMissileInventoryStatus__20CHudMissileInterfaceFv: @@ -3362,7 +3362,7 @@ lbl_80191D88: /* 80191D88 0018ECE8 80 01 00 14 */ lwz r0, 0x14(r1) /* 80191D8C 0018ECEC 7C 08 03 A6 */ mtlr r0 /* 80191D90 0018ECF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80191D94 0018ECF4 4E 80 00 20 */ blr +/* 80191D94 0018ECF4 4E 80 00 20 */ blr .global XRayMissileBarCoordFunc__20CHudMissileInterfaceFf XRayMissileBarCoordFunc__20CHudMissileInterfaceFf: @@ -3404,7 +3404,7 @@ XRayMissileBarCoordFunc__20CHudMissileInterfaceFf: /* 80191E24 0018ED84 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80191E28 0018ED88 7C 08 03 A6 */ mtlr r0 /* 80191E2C 0018ED8C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80191E30 0018ED90 4E 80 00 20 */ blr +/* 80191E30 0018ED90 4E 80 00 20 */ blr .global ThermalMissileBarCoordFunc__20CHudMissileInterfaceFf ThermalMissileBarCoordFunc__20CHudMissileInterfaceFf: @@ -3441,7 +3441,7 @@ lbl_80191E80: /* 80191EA0 0018EE00 D0 03 00 0C */ stfs f0, 0xc(r3) /* 80191EA4 0018EE04 D0 23 00 10 */ stfs f1, 0x10(r3) /* 80191EA8 0018EE08 D0 83 00 14 */ stfs f4, 0x14(r3) -/* 80191EAC 0018EE0C 4E 80 00 20 */ blr +/* 80191EAC 0018EE0C 4E 80 00 20 */ blr .global CombatMissileBarCoordFunc__20CHudMissileInterfaceFf CombatMissileBarCoordFunc__20CHudMissileInterfaceFf: @@ -3456,7 +3456,7 @@ CombatMissileBarCoordFunc__20CHudMissileInterfaceFf: /* 80191ED0 0018EE30 D0 03 00 0C */ stfs f0, 0xc(r3) /* 80191ED4 0018EE34 D0 43 00 10 */ stfs f2, 0x10(r3) /* 80191ED8 0018EE38 D0 23 00 14 */ stfs f1, 0x14(r3) -/* 80191EDC 0018EE3C 4E 80 00 20 */ blr +/* 80191EDC 0018EE3C 4E 80 00 20 */ blr .global DoDrawRadarPaint__18CHudRadarInterfaceCFf DoDrawRadarPaint__18CHudRadarInterfaceCFf: @@ -3516,7 +3516,7 @@ DoDrawRadarPaint__18CHudRadarInterfaceCFf: /* 80191FB4 0018EF14 CB C1 00 40 */ lfd f30, 0x40(r1) /* 80191FB8 0018EF18 7C 08 03 A6 */ mtlr r0 /* 80191FBC 0018EF1C 38 21 00 60 */ addi r1, r1, 0x60 -/* 80191FC0 0018EF20 4E 80 00 20 */ blr +/* 80191FC0 0018EF20 4E 80 00 20 */ blr .global DrawRadarPaint__18CHudRadarInterfaceCFRC9CVector3fffRCQ218CHudRadarInterface20SRadarPaintDrawParms DrawRadarPaint__18CHudRadarInterfaceCFRC9CVector3fffRCQ218CHudRadarInterface20SRadarPaintDrawParms: @@ -3616,7 +3616,7 @@ lbl_801920A0: /* 80192134 0018F094 81 83 00 00 */ lwz r12, 0(r3) /* 80192138 0018F098 81 8C 00 30 */ lwz r12, 0x30(r12) /* 8019213C 0018F09C 7D 89 03 A6 */ mtctr r12 -/* 80192140 0018F0A0 4E 80 04 21 */ bctrl +/* 80192140 0018F0A0 4E 80 04 21 */ bctrl /* 80192144 0018F0A4 80 8D A1 3C */ lwz r4, gpTweakGuiColors@sda21(r13) /* 80192148 0018F0A8 3C 00 43 30 */ lis r0, 0x4330 /* 8019214C 0018F0AC C0 1F 00 74 */ lfs f0, 0x74(r31) @@ -3653,7 +3653,7 @@ lbl_80192198: /* 801921C4 0018F124 83 A1 00 D4 */ lwz r29, 0xd4(r1) /* 801921C8 0018F128 7C 08 03 A6 */ mtlr r0 /* 801921CC 0018F12C 38 21 01 20 */ addi r1, r1, 0x120 -/* 801921D0 0018F130 4E 80 00 20 */ blr +/* 801921D0 0018F130 4E 80 00 20 */ blr .global Draw__18CHudRadarInterfaceCFRC13CStateManagerf Draw__18CHudRadarInterfaceCFRC13CStateManagerf: @@ -3795,7 +3795,7 @@ lbl_8019235C: /* 801923D0 0018F330 81 83 00 00 */ lwz r12, 0(r3) /* 801923D4 0018F334 81 8C 00 10 */ lwz r12, 0x10(r12) /* 801923D8 0018F338 7D 89 03 A6 */ mtctr r12 -/* 801923DC 0018F33C 4E 80 04 21 */ bctrl +/* 801923DC 0018F33C 4E 80 04 21 */ bctrl /* 801923E0 0018F340 80 98 00 40 */ lwz r4, 0x40(r24) /* 801923E4 0018F344 38 61 01 00 */ addi r3, r1, 0x100 /* 801923E8 0018F348 38 84 00 34 */ addi r4, r4, 0x34 @@ -3805,12 +3805,12 @@ lbl_8019235C: /* 801923F8 0018F358 81 83 00 00 */ lwz r12, 0(r3) /* 801923FC 0018F35C 81 8C 00 30 */ lwz r12, 0x30(r12) /* 80192400 0018F360 7D 89 03 A6 */ mtctr r12 -/* 80192404 0018F364 4E 80 04 21 */ bctrl +/* 80192404 0018F364 4E 80 04 21 */ bctrl /* 80192408 0018F368 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 8019240C 0018F36C 81 83 00 00 */ lwz r12, 0(r3) /* 80192410 0018F370 81 8C 00 64 */ lwz r12, 0x64(r12) /* 80192414 0018F374 7D 89 03 A6 */ mtctr r12 -/* 80192418 0018F378 4E 80 04 21 */ bctrl +/* 80192418 0018F378 4E 80 04 21 */ bctrl /* 8019241C 0018F37C 7F C3 F3 78 */ mr r3, r30 /* 80192420 0018F380 38 80 00 00 */ li r4, 0 /* 80192424 0018F384 38 A0 00 01 */ li r5, 1 @@ -3825,7 +3825,7 @@ lbl_8019235C: /* 80192448 0018F3A8 81 83 00 00 */ lwz r12, 0(r3) /* 8019244C 0018F3AC 81 8C 00 60 */ lwz r12, 0x60(r12) /* 80192450 0018F3B0 7D 89 03 A6 */ mtctr r12 -/* 80192454 0018F3B4 4E 80 04 21 */ bctrl +/* 80192454 0018F3B4 4E 80 04 21 */ bctrl /* 80192458 0018F3B8 80 8D A1 3C */ lwz r4, gpTweakGuiColors@sda21(r13) /* 8019245C 0018F3BC 3C 00 43 30 */ lis r0, 0x4330 /* 80192460 0018F3C0 90 01 0A 00 */ stw r0, 0xa00(r1) @@ -4027,7 +4027,7 @@ lbl_8019273C: /* 80192748 0018F6A8 81 83 00 00 */ lwz r12, 0(r3) /* 8019274C 0018F6AC 81 8C 00 60 */ lwz r12, 0x60(r12) /* 80192750 0018F6B0 7D 89 03 A6 */ mtctr r12 -/* 80192754 0018F6B4 4E 80 04 21 */ bctrl +/* 80192754 0018F6B4 4E 80 04 21 */ bctrl /* 80192758 0018F6B8 80 A1 01 E8 */ lwz r5, 0x1e8(r1) /* 8019275C 0018F6BC 38 60 00 00 */ li r3, 0 /* 80192760 0018F6C0 2C 05 00 00 */ cmpwi r5, 0 @@ -4082,7 +4082,7 @@ lbl_801927AC: /* 80192810 0018F770 80 01 0A F4 */ lwz r0, 0xaf4(r1) /* 80192814 0018F774 7C 08 03 A6 */ mtlr r0 /* 80192818 0018F778 38 21 0A F0 */ addi r1, r1, 0xaf0 -/* 8019281C 0018F77C 4E 80 00 20 */ blr +/* 8019281C 0018F77C 4E 80 00 20 */ blr .global Update__18CHudRadarInterfaceFfRC13CStateManager Update__18CHudRadarInterfaceFfRC13CStateManager: @@ -4182,7 +4182,7 @@ lbl_80192968: /* 8019297C 0018F8DC 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80192980 0018F8E0 7C 08 03 A6 */ mtlr r0 /* 80192984 0018F8E4 38 21 00 40 */ addi r1, r1, 0x40 -/* 80192988 0018F8E8 4E 80 00 20 */ blr +/* 80192988 0018F8E8 4E 80 00 20 */ blr .global SetIsVisibleGame__18CHudRadarInterfaceFb SetIsVisibleGame__18CHudRadarInterfaceFb: @@ -4206,7 +4206,7 @@ lbl_801929C4: /* 801929CC 0018F92C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801929D0 0018F930 7C 08 03 A6 */ mtlr r0 /* 801929D4 0018F934 38 21 00 10 */ addi r1, r1, 0x10 -/* 801929D8 0018F938 4E 80 00 20 */ blr +/* 801929D8 0018F938 4E 80 00 20 */ blr .global __ct__18CHudRadarInterfaceFR9CGuiFrameRC13CStateManager __ct__18CHudRadarInterfaceFR9CGuiFrameRC13CStateManager: @@ -4224,7 +4224,7 @@ __ct__18CHudRadarInterfaceFR9CGuiFrameRC13CStateManager: /* 80192A08 0018F968 81 84 00 00 */ lwz r12, 0(r4) /* 80192A0C 0018F96C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80192A10 0018F970 7D 89 03 A6 */ mtctr r12 -/* 80192A14 0018F974 4E 80 04 21 */ bctrl +/* 80192A14 0018F974 4E 80 04 21 */ bctrl /* 80192A18 0018F978 7F C3 F3 78 */ mr r3, r30 /* 80192A1C 0018F97C 38 81 00 08 */ addi r4, r1, 8 /* 80192A20 0018F980 48 1A E4 89 */ bl __ct__6CTokenFRC6CToken @@ -4272,7 +4272,7 @@ __ct__18CHudRadarInterfaceFR9CGuiFrameRC13CStateManager: /* 80192AC8 0018FA28 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80192ACC 0018FA2C 7C 08 03 A6 */ mtlr r0 /* 80192AD0 0018FA30 38 21 00 30 */ addi r1, r1, 0x30 -/* 80192AD4 0018FA34 4E 80 00 20 */ blr +/* 80192AD4 0018FA34 4E 80 00 20 */ blr .global __dt__19CHudThreatInterfaceFv __dt__19CHudThreatInterfaceFv: @@ -4300,7 +4300,7 @@ lbl_80192B1C: /* 80192B24 0018FA84 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80192B28 0018FA88 7C 08 03 A6 */ mtlr r0 /* 80192B2C 0018FA8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80192B30 0018FA90 4E 80 00 20 */ blr +/* 80192B30 0018FA90 4E 80 00 20 */ blr .global Update__19CHudThreatInterfaceFf Update__19CHudThreatInterfaceFf: @@ -4848,7 +4848,7 @@ lbl_801932AC: /* 801932E0 00190240 80 01 01 A4 */ lwz r0, 0x1a4(r1) /* 801932E4 00190244 7C 08 03 A6 */ mtlr r0 /* 801932E8 00190248 38 21 01 A0 */ addi r1, r1, 0x1a0 -/* 801932EC 0019024C 4E 80 00 20 */ blr +/* 801932EC 0019024C 4E 80 00 20 */ blr .global UpdateVisibility__19CHudThreatInterfaceFv UpdateVisibility__19CHudThreatInterfaceFv: @@ -4877,14 +4877,14 @@ lbl_80193324: /* 80193344 001902A4 81 9E 00 00 */ lwz r12, 0(r30) /* 80193348 001902A8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8019334C 001902AC 7D 89 03 A6 */ mtctr r12 -/* 80193350 001902B0 4E 80 04 21 */ bctrl +/* 80193350 001902B0 4E 80 04 21 */ bctrl lbl_80193354: /* 80193354 001902B4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80193358 001902B8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8019335C 001902BC 83 C1 00 08 */ lwz r30, 8(r1) /* 80193360 001902C0 7C 08 03 A6 */ mtlr r0 /* 80193364 001902C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80193368 001902C8 4E 80 00 20 */ blr +/* 80193368 001902C8 4E 80 00 20 */ blr .global SetIsVisibleGame__19CHudThreatInterfaceFb SetIsVisibleGame__19CHudThreatInterfaceFb: @@ -4898,7 +4898,7 @@ SetIsVisibleGame__19CHudThreatInterfaceFb: /* 80193388 001902E8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8019338C 001902EC 7C 08 03 A6 */ mtlr r0 /* 80193390 001902F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80193394 001902F4 4E 80 00 20 */ blr +/* 80193394 001902F4 4E 80 00 20 */ blr .global SetIsVisibleDebug__19CHudThreatInterfaceFb SetIsVisibleDebug__19CHudThreatInterfaceFb: @@ -4912,12 +4912,12 @@ SetIsVisibleDebug__19CHudThreatInterfaceFb: /* 801933B4 00190314 80 01 00 14 */ lwz r0, 0x14(r1) /* 801933B8 00190318 7C 08 03 A6 */ mtlr r0 /* 801933BC 0019031C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801933C0 00190320 4E 80 00 20 */ blr +/* 801933C0 00190320 4E 80 00 20 */ blr .global SetThreatDistance__19CHudThreatInterfaceFf SetThreatDistance__19CHudThreatInterfaceFf: /* 801933C4 00190324 D0 23 00 10 */ stfs f1, 0x10(r3) -/* 801933C8 00190328 4E 80 00 20 */ blr +/* 801933C8 00190328 4E 80 00 20 */ blr .global __ct__19CHudThreatInterfaceFR9CGuiFramef __ct__19CHudThreatInterfaceFR9CGuiFramef: @@ -5097,7 +5097,7 @@ lbl_80193658: /* 8019366C 001905CC 83 81 00 20 */ lwz r28, 0x20(r1) /* 80193670 001905D0 7C 08 03 A6 */ mtlr r0 /* 80193674 001905D4 38 21 00 30 */ addi r1, r1, 0x30 -/* 80193678 001905D8 4E 80 00 20 */ blr +/* 80193678 001905D8 4E 80 00 20 */ blr .global XRayThreatBarCoordFunc__19CHudThreatInterfaceFf XRayThreatBarCoordFunc__19CHudThreatInterfaceFf: @@ -5137,7 +5137,7 @@ XRayThreatBarCoordFunc__19CHudThreatInterfaceFf: /* 80193700 00190660 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80193704 00190664 7C 08 03 A6 */ mtlr r0 /* 80193708 00190668 38 21 00 20 */ addi r1, r1, 0x20 -/* 8019370C 0019066C 4E 80 00 20 */ blr +/* 8019370C 0019066C 4E 80 00 20 */ blr .global ThermalThreatBarCoordFunc__19CHudThreatInterfaceFf ThermalThreatBarCoordFunc__19CHudThreatInterfaceFf: @@ -5173,7 +5173,7 @@ lbl_8019375C: /* 80193778 001906D8 D0 03 00 0C */ stfs f0, 0xc(r3) /* 8019377C 001906DC D0 23 00 10 */ stfs f1, 0x10(r3) /* 80193780 001906E0 D0 83 00 14 */ stfs f4, 0x14(r3) -/* 80193784 001906E4 4E 80 00 20 */ blr +/* 80193784 001906E4 4E 80 00 20 */ blr .global CombatThreatBarCoordFunc__19CHudThreatInterfaceFf CombatThreatBarCoordFunc__19CHudThreatInterfaceFf: @@ -5188,7 +5188,7 @@ CombatThreatBarCoordFunc__19CHudThreatInterfaceFf: /* 801937A8 00190708 D0 03 00 0C */ stfs f0, 0xc(r3) /* 801937AC 0019070C D0 03 00 10 */ stfs f0, 0x10(r3) /* 801937B0 00190710 D0 23 00 14 */ stfs f1, 0x14(r3) -/* 801937B4 00190714 4E 80 00 20 */ blr +/* 801937B4 00190714 4E 80 00 20 */ blr .global UpdateMenuWidgetTransform__17CHudVisorBeamMenuFiR10CGuiWidgetf UpdateMenuWidgetTransform__17CHudVisorBeamMenuFiR10CGuiWidgetf: @@ -5339,7 +5339,7 @@ lbl_801939C0: /* 801939D0 00190930 83 C1 03 08 */ lwz r30, 0x308(r1) /* 801939D4 00190934 7C 08 03 A6 */ mtlr r0 /* 801939D8 00190938 38 21 03 20 */ addi r1, r1, 0x320 -/* 801939DC 0019093C 4E 80 00 20 */ blr +/* 801939DC 0019093C 4E 80 00 20 */ blr .global SetIsVisibleGame__17CHudVisorBeamMenuFb SetIsVisibleGame__17CHudVisorBeamMenuFb: @@ -5376,7 +5376,7 @@ lbl_80193A48: /* 80193A50 001909B0 83 C1 00 08 */ lwz r30, 8(r1) /* 80193A54 001909B4 7C 08 03 A6 */ mtlr r0 /* 80193A58 001909B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80193A5C 001909BC 4E 80 00 20 */ blr +/* 80193A5C 001909BC 4E 80 00 20 */ blr .global Update__17CHudVisorBeamMenuFfb Update__17CHudVisorBeamMenuFfb: @@ -5993,7 +5993,7 @@ lbl_801942A4: /* 801942C8 00191228 80 01 01 04 */ lwz r0, 0x104(r1) /* 801942CC 0019122C 7C 08 03 A6 */ mtlr r0 /* 801942D0 00191230 38 21 01 00 */ addi r1, r1, 0x100 -/* 801942D4 00191234 4E 80 00 20 */ blr +/* 801942D4 00191234 4E 80 00 20 */ blr .global UpdateHudAlpha__17CHudVisorBeamMenuFf UpdateHudAlpha__17CHudVisorBeamMenuFf: @@ -6035,7 +6035,7 @@ UpdateHudAlpha__17CHudVisorBeamMenuFf: /* 80194364 001912C4 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80194368 001912C8 7C 08 03 A6 */ mtlr r0 /* 8019436C 001912CC 38 21 00 50 */ addi r1, r1, 0x50 -/* 80194370 001912D0 4E 80 00 20 */ blr +/* 80194370 001912D0 4E 80 00 20 */ blr .global "SetPlayerHas__17CHudVisorBeamMenuFRCQ24rstl20reserved_vector" "SetPlayerHas__17CHudVisorBeamMenuFRCQ24rstl20reserved_vector": @@ -6067,12 +6067,12 @@ lbl_801943B4: lbl_801943D0: /* 801943D0 00191330 C0 23 00 68 */ lfs f1, 0x68(r3) /* 801943D4 00191334 FC 02 08 00 */ fcmpu cr0, f2, f1 -/* 801943D8 00191338 4C 82 00 20 */ bnelr +/* 801943D8 00191338 4C 82 00 20 */ bnelr /* 801943DC 0019133C 88 04 00 07 */ lbz r0, 7(r4) /* 801943E0 00191340 28 00 00 00 */ cmplwi r0, 0 -/* 801943E4 00191344 4D 82 00 20 */ beqlr +/* 801943E4 00191344 4D 82 00 20 */ beqlr /* 801943E8 00191348 D0 03 00 68 */ stfs f0, 0x68(r3) -/* 801943EC 0019134C 4E 80 00 20 */ blr +/* 801943EC 0019134C 4E 80 00 20 */ blr .global SetSelection__17CHudVisorBeamMenuFiif SetSelection__17CHudVisorBeamMenuFiif: @@ -6178,7 +6178,7 @@ lbl_8019454C: /* 80194560 001914C0 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80194564 001914C4 7C 08 03 A6 */ mtlr r0 /* 80194568 001914C8 38 21 00 40 */ addi r1, r1, 0x40 -/* 8019456C 001914CC 4E 80 00 20 */ blr +/* 8019456C 001914CC 4E 80 00 20 */ blr .global "__ct__17CHudVisorBeamMenuFR9CGuiFrameQ217CHudVisorBeamMenu14EVisorBeamMenuRCQ24rstl20reserved_vector" "__ct__17CHudVisorBeamMenuFR9CGuiFrameQ217CHudVisorBeamMenu14EVisorBeamMenuRCQ24rstl20reserved_vector": @@ -6461,7 +6461,7 @@ lbl_80194910: /* 8019496C 001918CC 80 01 00 64 */ lwz r0, 0x64(r1) /* 80194970 001918D0 7C 08 03 A6 */ mtlr r0 /* 80194974 001918D4 38 21 00 60 */ addi r1, r1, 0x60 -/* 80194978 001918D8 4E 80 00 20 */ blr +/* 80194978 001918D8 4E 80 00 20 */ blr .global __dt__24CHudDecoInterfaceThermalFv __dt__24CHudDecoInterfaceThermalFv: @@ -6514,7 +6514,7 @@ lbl_80194A14: /* 80194A20 00191980 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80194A24 00191984 7C 08 03 A6 */ mtlr r0 /* 80194A28 00191988 38 21 00 20 */ addi r1, r1, 0x20 -/* 80194A2C 0019198C 4E 80 00 20 */ blr +/* 80194A2C 0019198C 4E 80 00 20 */ blr .global UpdateCameraDebugSettings__24CHudDecoInterfaceThermalFfff UpdateCameraDebugSettings__24CHudDecoInterfaceThermalFfff: @@ -6551,7 +6551,7 @@ UpdateCameraDebugSettings__24CHudDecoInterfaceThermalFfff: /* 80194AA8 00191A08 90 81 00 34 */ stw r4, 0x34(r1) /* 80194AAC 00191A0C D0 63 00 34 */ stfs f3, 0x34(r3) /* 80194AB0 00191A10 38 21 00 40 */ addi r1, r1, 0x40 -/* 80194AB4 00191A14 4E 80 00 20 */ blr +/* 80194AB4 00191A14 4E 80 00 20 */ blr .global Update__24CHudDecoInterfaceThermalFfRC13CStateManager Update__24CHudDecoInterfaceThermalFfRC13CStateManager: @@ -6697,11 +6697,11 @@ lbl_80194BE8: /* 80194CBC 00191C1C 83 A1 00 F4 */ lwz r29, 0xf4(r1) /* 80194CC0 00191C20 7C 08 03 A6 */ mtlr r0 /* 80194CC4 00191C24 38 21 01 20 */ addi r1, r1, 0x120 -/* 80194CC8 00191C28 4E 80 00 20 */ blr +/* 80194CC8 00191C28 4E 80 00 20 */ blr .global SetDamageTransform__24CHudDecoInterfaceThermalFRC9CMatrix3fRC9CVector3f SetDamageTransform__24CHudDecoInterfaceThermalFRC9CMatrix3fRC9CVector3f: -/* 80194CCC 00191C2C 4E 80 00 20 */ blr +/* 80194CCC 00191C2C 4E 80 00 20 */ blr .global SetHudOffset__24CHudDecoInterfaceThermalFRC9CVector3f SetHudOffset__24CHudDecoInterfaceThermalFRC9CVector3f: @@ -6711,7 +6711,7 @@ SetHudOffset__24CHudDecoInterfaceThermalFRC9CVector3f: /* 80194CDC 00191C3C D0 03 00 24 */ stfs f0, 0x24(r3) /* 80194CE0 00191C40 C0 04 00 08 */ lfs f0, 8(r4) /* 80194CE4 00191C44 D0 03 00 28 */ stfs f0, 0x28(r3) -/* 80194CE8 00191C48 4E 80 00 20 */ blr +/* 80194CE8 00191C48 4E 80 00 20 */ blr .global SetReticuleTransform__24CHudDecoInterfaceThermalFRC9CMatrix3f SetReticuleTransform__24CHudDecoInterfaceThermalFRC9CMatrix3f: @@ -6723,7 +6723,7 @@ SetReticuleTransform__24CHudDecoInterfaceThermalFRC9CMatrix3f: /* 80194D00 00191C60 80 01 00 14 */ lwz r0, 0x14(r1) /* 80194D04 00191C64 7C 08 03 A6 */ mtlr r0 /* 80194D08 00191C68 38 21 00 10 */ addi r1, r1, 0x10 -/* 80194D0C 00191C6C 4E 80 00 20 */ blr +/* 80194D0C 00191C6C 4E 80 00 20 */ blr .global SetHudRotation__24CHudDecoInterfaceThermalFRC11CQuaternion SetHudRotation__24CHudDecoInterfaceThermalFRC11CQuaternion: @@ -6735,11 +6735,11 @@ SetHudRotation__24CHudDecoInterfaceThermalFRC11CQuaternion: /* 80194D24 00191C84 90 03 00 0C */ stw r0, 0xc(r3) /* 80194D28 00191C88 80 04 00 0C */ lwz r0, 0xc(r4) /* 80194D2C 00191C8C 90 03 00 10 */ stw r0, 0x10(r3) -/* 80194D30 00191C90 4E 80 00 20 */ blr +/* 80194D30 00191C90 4E 80 00 20 */ blr .global UpdateVisibility__24CHudDecoInterfaceThermalFv UpdateVisibility__24CHudDecoInterfaceThermalFv: -/* 80194D34 00191C94 4E 80 00 20 */ blr +/* 80194D34 00191C94 4E 80 00 20 */ blr .global UpdateHudAlpha__24CHudDecoInterfaceThermalFv UpdateHudAlpha__24CHudDecoInterfaceThermalFv: @@ -6759,7 +6759,7 @@ UpdateHudAlpha__24CHudDecoInterfaceThermalFv: /* 80194D6C 00191CCC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80194D70 00191CD0 7C 08 03 A6 */ mtlr r0 /* 80194D74 00191CD4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80194D78 00191CD8 4E 80 00 20 */ blr +/* 80194D78 00191CD8 4E 80 00 20 */ blr .global SetIsVisibleGame__24CHudDecoInterfaceThermalFb SetIsVisibleGame__24CHudDecoInterfaceThermalFb: @@ -6773,7 +6773,7 @@ SetIsVisibleGame__24CHudDecoInterfaceThermalFb: /* 80194D98 00191CF8 80 01 00 14 */ lwz r0, 0x14(r1) /* 80194D9C 00191CFC 7C 08 03 A6 */ mtlr r0 /* 80194DA0 00191D00 38 21 00 10 */ addi r1, r1, 0x10 -/* 80194DA4 00191D04 4E 80 00 20 */ blr +/* 80194DA4 00191D04 4E 80 00 20 */ blr .global SetIsVisibleDebug__24CHudDecoInterfaceThermalFb SetIsVisibleDebug__24CHudDecoInterfaceThermalFb: @@ -6787,7 +6787,7 @@ SetIsVisibleDebug__24CHudDecoInterfaceThermalFb: /* 80194DC4 00191D24 80 01 00 14 */ lwz r0, 0x14(r1) /* 80194DC8 00191D28 7C 08 03 A6 */ mtlr r0 /* 80194DCC 00191D2C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80194DD0 00191D30 4E 80 00 20 */ blr +/* 80194DD0 00191D30 4E 80 00 20 */ blr .global __ct__24CHudDecoInterfaceThermalFR9CGuiFrame __ct__24CHudDecoInterfaceThermalFR9CGuiFrame: @@ -7048,13 +7048,13 @@ lbl_80195178: /* 80195198 001920F8 81 9D 00 00 */ lwz r12, 0(r29) /* 8019519C 001920FC 81 8C 00 38 */ lwz r12, 0x38(r12) /* 801951A0 00192100 7D 89 03 A6 */ mtctr r12 -/* 801951A4 00192104 4E 80 04 21 */ bctrl +/* 801951A4 00192104 4E 80 04 21 */ bctrl /* 801951A8 00192108 7F A3 EB 78 */ mr r3, r29 /* 801951AC 0019210C BB 61 00 AC */ lmw r27, 0xac(r1) /* 801951B0 00192110 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 801951B4 00192114 7C 08 03 A6 */ mtlr r0 /* 801951B8 00192118 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 801951BC 0019211C 4E 80 00 20 */ blr +/* 801951BC 0019211C 4E 80 00 20 */ blr .global sub_801951c0 sub_801951c0: @@ -7072,7 +7072,7 @@ sub_801951c0: /* 801951EC 0019214C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801951F0 00192150 7C 08 03 A6 */ mtlr r0 /* 801951F4 00192154 38 21 00 10 */ addi r1, r1, 0x10 -/* 801951F8 00192158 4E 80 00 20 */ blr +/* 801951F8 00192158 4E 80 00 20 */ blr .global GetMessageTextAlpha__21CHudDecoInterfaceScanCFv GetMessageTextAlpha__21CHudDecoInterfaceScanCFv: @@ -7101,7 +7101,7 @@ lbl_80195240: /* 80195244 001921A4 C0 03 00 00 */ lfs f0, 0(r3) /* 80195248 001921A8 EC 21 00 28 */ fsubs f1, f1, f0 /* 8019524C 001921AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80195250 001921B0 4E 80 00 20 */ blr +/* 80195250 001921B0 4E 80 00 20 */ blr .global GetCurrScanInfo__21CHudDecoInterfaceScanCFRC13CStateManager GetCurrScanInfo__21CHudDecoInterfaceScanCFRC13CStateManager: @@ -7133,7 +7133,7 @@ lbl_801952AC: /* 801952AC 0019220C 80 01 00 24 */ lwz r0, 0x24(r1) /* 801952B0 00192210 7C 08 03 A6 */ mtlr r0 /* 801952B4 00192214 38 21 00 20 */ addi r1, r1, 0x20 -/* 801952B8 00192218 4E 80 00 20 */ blr +/* 801952B8 00192218 4E 80 00 20 */ blr .global UpdateScanDisplay__21CHudDecoInterfaceScanFRC13CStateManagerf UpdateScanDisplay__21CHudDecoInterfaceScanFRC13CStateManagerf: @@ -7488,7 +7488,7 @@ lbl_80195794: /* 801957C4 00192724 83 81 00 90 */ lwz r28, 0x90(r1) /* 801957C8 00192728 7C 08 03 A6 */ mtlr r0 /* 801957CC 0019272C 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 801957D0 00192730 4E 80 00 20 */ blr +/* 801957D0 00192730 4E 80 00 20 */ blr .global UpdateCameraDebugSettings__21CHudDecoInterfaceScanFfff UpdateCameraDebugSettings__21CHudDecoInterfaceScanFfff: @@ -7525,7 +7525,7 @@ UpdateCameraDebugSettings__21CHudDecoInterfaceScanFfff: /* 8019584C 001927AC 90 81 00 34 */ stw r4, 0x34(r1) /* 80195850 001927B0 D0 63 02 14 */ stfs f3, 0x214(r3) /* 80195854 001927B4 38 21 00 40 */ addi r1, r1, 0x40 -/* 80195858 001927B8 4E 80 00 20 */ blr +/* 80195858 001927B8 4E 80 00 20 */ blr .global ProcessInput__21CHudDecoInterfaceScanFRC11CFinalInput ProcessInput__21CHudDecoInterfaceScanFRC11CFinalInput: @@ -7537,7 +7537,7 @@ ProcessInput__21CHudDecoInterfaceScanFRC11CFinalInput: /* 80195870 001927D0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80195874 001927D4 7C 08 03 A6 */ mtlr r0 /* 80195878 001927D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8019587C 001927DC 4E 80 00 20 */ blr +/* 8019587C 001927DC 4E 80 00 20 */ blr .global Draw__21CHudDecoInterfaceScanCFv Draw__21CHudDecoInterfaceScanCFv: @@ -7559,7 +7559,7 @@ lbl_801958B4: /* 801958B8 00192818 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801958BC 0019281C 7C 08 03 A6 */ mtlr r0 /* 801958C0 00192820 38 21 00 10 */ addi r1, r1, 0x10 -/* 801958C4 00192824 4E 80 00 20 */ blr +/* 801958C4 00192824 4E 80 00 20 */ blr .global Update__21CHudDecoInterfaceScanFfRC13CStateManager Update__21CHudDecoInterfaceScanFfRC13CStateManager: @@ -7749,7 +7749,7 @@ lbl_80195B58: /* 80195B68 00192AC8 83 C1 00 88 */ lwz r30, 0x88(r1) /* 80195B6C 00192ACC 7C 08 03 A6 */ mtlr r0 /* 80195B70 00192AD0 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 80195B74 00192AD4 4E 80 00 20 */ blr +/* 80195B74 00192AD4 4E 80 00 20 */ blr .global InitializeFlatFrame__21CHudDecoInterfaceScanFv InitializeFlatFrame__21CHudDecoInterfaceScanFv: @@ -7912,15 +7912,15 @@ InitializeFlatFrame__21CHudDecoInterfaceScanFv: /* 80195DE8 00192D48 80 01 00 94 */ lwz r0, 0x94(r1) /* 80195DEC 00192D4C 7C 08 03 A6 */ mtlr r0 /* 80195DF0 00192D50 38 21 00 90 */ addi r1, r1, 0x90 -/* 80195DF4 00192D54 4E 80 00 20 */ blr +/* 80195DF4 00192D54 4E 80 00 20 */ blr .global SetFrameColorValue__21CHudDecoInterfaceScanFf SetFrameColorValue__21CHudDecoInterfaceScanFf: -/* 80195DF8 00192D58 4E 80 00 20 */ blr +/* 80195DF8 00192D58 4E 80 00 20 */ blr .global SetDamageTransform__21CHudDecoInterfaceScanFRC9CMatrix3fRC9CVector3f SetDamageTransform__21CHudDecoInterfaceScanFRC9CMatrix3fRC9CVector3f: -/* 80195DFC 00192D5C 4E 80 00 20 */ blr +/* 80195DFC 00192D5C 4E 80 00 20 */ blr .global SetHudOffset__21CHudDecoInterfaceScanFRC9CVector3f SetHudOffset__21CHudDecoInterfaceScanFRC9CVector3f: @@ -7930,11 +7930,11 @@ SetHudOffset__21CHudDecoInterfaceScanFRC9CVector3f: /* 80195E0C 00192D6C D0 03 02 04 */ stfs f0, 0x204(r3) /* 80195E10 00192D70 C0 04 00 08 */ lfs f0, 8(r4) /* 80195E14 00192D74 D0 03 02 08 */ stfs f0, 0x208(r3) -/* 80195E18 00192D78 4E 80 00 20 */ blr +/* 80195E18 00192D78 4E 80 00 20 */ blr .global SetReticuleTransform__21CHudDecoInterfaceScanFRC9CMatrix3f SetReticuleTransform__21CHudDecoInterfaceScanFRC9CMatrix3f: -/* 80195E1C 00192D7C 4E 80 00 20 */ blr +/* 80195E1C 00192D7C 4E 80 00 20 */ blr .global SetHudRotation__21CHudDecoInterfaceScanFRC11CQuaternion SetHudRotation__21CHudDecoInterfaceScanFRC11CQuaternion: @@ -7946,11 +7946,11 @@ SetHudRotation__21CHudDecoInterfaceScanFRC11CQuaternion: /* 80195E34 00192D94 90 03 01 EC */ stw r0, 0x1ec(r3) /* 80195E38 00192D98 80 04 00 0C */ lwz r0, 0xc(r4) /* 80195E3C 00192D9C 90 03 01 F0 */ stw r0, 0x1f0(r3) -/* 80195E40 00192DA0 4E 80 00 20 */ blr +/* 80195E40 00192DA0 4E 80 00 20 */ blr .global UpdateVisibility__21CHudDecoInterfaceScanFv UpdateVisibility__21CHudDecoInterfaceScanFv: -/* 80195E44 00192DA4 4E 80 00 20 */ blr +/* 80195E44 00192DA4 4E 80 00 20 */ blr .global SetIsVisibleGame__21CHudDecoInterfaceScanFb SetIsVisibleGame__21CHudDecoInterfaceScanFb: @@ -7964,7 +7964,7 @@ SetIsVisibleGame__21CHudDecoInterfaceScanFb: /* 80195E64 00192DC4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80195E68 00192DC8 7C 08 03 A6 */ mtlr r0 /* 80195E6C 00192DCC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80195E70 00192DD0 4E 80 00 20 */ blr +/* 80195E70 00192DD0 4E 80 00 20 */ blr .global SetIsVisibleDebug__21CHudDecoInterfaceScanFb SetIsVisibleDebug__21CHudDecoInterfaceScanFb: @@ -7978,7 +7978,7 @@ SetIsVisibleDebug__21CHudDecoInterfaceScanFb: /* 80195E90 00192DF0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80195E94 00192DF4 7C 08 03 A6 */ mtlr r0 /* 80195E98 00192DF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80195E9C 00192DFC 4E 80 00 20 */ blr +/* 80195E9C 00192DFC 4E 80 00 20 */ blr .global UpdateHudAlpha__21CHudDecoInterfaceScanFv UpdateHudAlpha__21CHudDecoInterfaceScanFv: @@ -8014,7 +8014,7 @@ UpdateHudAlpha__21CHudDecoInterfaceScanFv: /* 80195F14 00192E74 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80195F18 00192E78 7C 08 03 A6 */ mtlr r0 /* 80195F1C 00192E7C 38 21 00 40 */ addi r1, r1, 0x40 -/* 80195F20 00192E80 4E 80 00 20 */ blr +/* 80195F20 00192E80 4E 80 00 20 */ blr .global __ct__21CHudDecoInterfaceScanFR9CGuiFrame __ct__21CHudDecoInterfaceScanFR9CGuiFrame: @@ -8043,7 +8043,7 @@ __ct__21CHudDecoInterfaceScanFR9CGuiFrame: /* 80195F7C 00192EDC 81 84 00 00 */ lwz r12, 0(r4) /* 80195F80 00192EE0 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80195F84 00192EE4 7D 89 03 A6 */ mtctr r12 -/* 80195F88 00192EE8 4E 80 04 21 */ bctrl +/* 80195F88 00192EE8 4E 80 04 21 */ bctrl /* 80195F8C 00192EEC 3B 9D 00 04 */ addi r28, r29, 4 /* 80195F90 00192EF0 38 81 00 18 */ addi r4, r1, 0x18 /* 80195F94 00192EF4 7F 83 E3 78 */ mr r3, r28 @@ -8387,7 +8387,7 @@ lbl_80196418: /* 801964C8 00193428 81 9D 00 00 */ lwz r12, 0(r29) /* 801964CC 0019342C 81 8C 00 38 */ lwz r12, 0x38(r12) /* 801964D0 00193430 7D 89 03 A6 */ mtctr r12 -/* 801964D4 00193434 4E 80 04 21 */ bctrl +/* 801964D4 00193434 4E 80 04 21 */ bctrl /* 801964D8 00193438 80 01 02 A4 */ lwz r0, 0x2a4(r1) /* 801964DC 0019343C 7F A3 EB 78 */ mr r3, r29 /* 801964E0 00193440 83 E1 02 9C */ lwz r31, 0x29c(r1) @@ -8396,7 +8396,7 @@ lbl_80196418: /* 801964EC 0019344C 83 81 02 90 */ lwz r28, 0x290(r1) /* 801964F0 00193450 7C 08 03 A6 */ mtlr r0 /* 801964F4 00193454 38 21 02 A0 */ addi r1, r1, 0x2a0 -/* 801964F8 00193458 4E 80 00 20 */ blr +/* 801964F8 00193458 4E 80 00 20 */ blr .global __dt__12CScanDisplayFv __dt__12CScanDisplayFv: @@ -8535,7 +8535,7 @@ lbl_801966B0: /* 801966BC 0019361C 83 C1 00 08 */ lwz r30, 8(r1) /* 801966C0 00193620 7C 08 03 A6 */ mtlr r0 /* 801966C4 00193624 38 21 00 10 */ addi r1, r1, 0x10 -/* 801966C8 00193628 4E 80 00 20 */ blr +/* 801966C8 00193628 4E 80 00 20 */ blr .global UpdateCameraDebugSettings__21CHudDecoInterfaceXrayFfff UpdateCameraDebugSettings__21CHudDecoInterfaceXrayFfff: @@ -8572,7 +8572,7 @@ UpdateCameraDebugSettings__21CHudDecoInterfaceXrayFfff: /* 80196744 001936A4 90 81 00 34 */ stw r4, 0x34(r1) /* 80196748 001936A8 D0 63 00 38 */ stfs f3, 0x38(r3) /* 8019674C 001936AC 38 21 00 40 */ addi r1, r1, 0x40 -/* 80196750 001936B0 4E 80 00 20 */ blr +/* 80196750 001936B0 4E 80 00 20 */ blr .global Update__21CHudDecoInterfaceXrayFfRC13CStateManager Update__21CHudDecoInterfaceXrayFfRC13CStateManager: @@ -8665,15 +8665,15 @@ lbl_801967DC: /* 80196894 001937F4 83 E1 00 CC */ lwz r31, 0xcc(r1) /* 80196898 001937F8 7C 08 03 A6 */ mtlr r0 /* 8019689C 001937FC 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 801968A0 00193800 4E 80 00 20 */ blr +/* 801968A0 00193800 4E 80 00 20 */ blr .global SetFrameColorValue__21CHudDecoInterfaceXrayFf SetFrameColorValue__21CHudDecoInterfaceXrayFf: -/* 801968A4 00193804 4E 80 00 20 */ blr +/* 801968A4 00193804 4E 80 00 20 */ blr .global SetDamageTransform__21CHudDecoInterfaceXrayFRC9CMatrix3fRC9CVector3f SetDamageTransform__21CHudDecoInterfaceXrayFRC9CMatrix3fRC9CVector3f: -/* 801968A8 00193808 4E 80 00 20 */ blr +/* 801968A8 00193808 4E 80 00 20 */ blr .global SetHudOffset__21CHudDecoInterfaceXrayFRC9CVector3f SetHudOffset__21CHudDecoInterfaceXrayFRC9CVector3f: @@ -8683,7 +8683,7 @@ SetHudOffset__21CHudDecoInterfaceXrayFRC9CVector3f: /* 801968B8 00193818 D0 03 00 28 */ stfs f0, 0x28(r3) /* 801968BC 0019381C C0 04 00 08 */ lfs f0, 8(r4) /* 801968C0 00193820 D0 03 00 2C */ stfs f0, 0x2c(r3) -/* 801968C4 00193824 4E 80 00 20 */ blr +/* 801968C4 00193824 4E 80 00 20 */ blr .global SetDecoRotation__21CHudDecoInterfaceXrayFf SetDecoRotation__21CHudDecoInterfaceXrayFf: @@ -8713,7 +8713,7 @@ SetDecoRotation__21CHudDecoInterfaceXrayFf: /* 80196924 00193884 83 E1 00 7C */ lwz r31, 0x7c(r1) /* 80196928 00193888 7C 08 03 A6 */ mtlr r0 /* 8019692C 0019388C 38 21 00 80 */ addi r1, r1, 0x80 -/* 80196930 00193890 4E 80 00 20 */ blr +/* 80196930 00193890 4E 80 00 20 */ blr .global SetReticuleTransform__21CHudDecoInterfaceXrayFRC9CMatrix3f SetReticuleTransform__21CHudDecoInterfaceXrayFRC9CMatrix3f: @@ -8725,7 +8725,7 @@ SetReticuleTransform__21CHudDecoInterfaceXrayFRC9CMatrix3f: /* 80196948 001938A8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8019694C 001938AC 7C 08 03 A6 */ mtlr r0 /* 80196950 001938B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80196954 001938B4 4E 80 00 20 */ blr +/* 80196954 001938B4 4E 80 00 20 */ blr .global SetHudRotation__21CHudDecoInterfaceXrayFRC11CQuaternion SetHudRotation__21CHudDecoInterfaceXrayFRC11CQuaternion: @@ -8737,11 +8737,11 @@ SetHudRotation__21CHudDecoInterfaceXrayFRC11CQuaternion: /* 8019696C 001938CC 90 03 00 10 */ stw r0, 0x10(r3) /* 80196970 001938D0 80 04 00 0C */ lwz r0, 0xc(r4) /* 80196974 001938D4 90 03 00 14 */ stw r0, 0x14(r3) -/* 80196978 001938D8 4E 80 00 20 */ blr +/* 80196978 001938D8 4E 80 00 20 */ blr .global UpdateVisibility__21CHudDecoInterfaceXrayFv UpdateVisibility__21CHudDecoInterfaceXrayFv: -/* 8019697C 001938DC 4E 80 00 20 */ blr +/* 8019697C 001938DC 4E 80 00 20 */ blr .global SetIsVisibleGame__21CHudDecoInterfaceXrayFb SetIsVisibleGame__21CHudDecoInterfaceXrayFb: @@ -8755,7 +8755,7 @@ SetIsVisibleGame__21CHudDecoInterfaceXrayFb: /* 8019699C 001938FC 80 01 00 14 */ lwz r0, 0x14(r1) /* 801969A0 00193900 7C 08 03 A6 */ mtlr r0 /* 801969A4 00193904 38 21 00 10 */ addi r1, r1, 0x10 -/* 801969A8 00193908 4E 80 00 20 */ blr +/* 801969A8 00193908 4E 80 00 20 */ blr .global SetIsVisibleDebug__21CHudDecoInterfaceXrayFb SetIsVisibleDebug__21CHudDecoInterfaceXrayFb: @@ -8769,7 +8769,7 @@ SetIsVisibleDebug__21CHudDecoInterfaceXrayFb: /* 801969C8 00193928 80 01 00 14 */ lwz r0, 0x14(r1) /* 801969CC 0019392C 7C 08 03 A6 */ mtlr r0 /* 801969D0 00193930 38 21 00 10 */ addi r1, r1, 0x10 -/* 801969D4 00193934 4E 80 00 20 */ blr +/* 801969D4 00193934 4E 80 00 20 */ blr .global UpdateHudAlpha__21CHudDecoInterfaceXrayFv UpdateHudAlpha__21CHudDecoInterfaceXrayFv: @@ -8789,7 +8789,7 @@ UpdateHudAlpha__21CHudDecoInterfaceXrayFv: /* 80196A0C 0019396C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80196A10 00193970 7C 08 03 A6 */ mtlr r0 /* 80196A14 00193974 38 21 00 10 */ addi r1, r1, 0x10 -/* 80196A18 00193978 4E 80 00 20 */ blr +/* 80196A18 00193978 4E 80 00 20 */ blr .global __ct__21CHudDecoInterfaceXRayFR9CGuiFrame __ct__21CHudDecoInterfaceXRayFR9CGuiFrame: @@ -8996,7 +8996,7 @@ lbl_80196D1C: /* 80196D20 00193C80 81 9E 00 00 */ lwz r12, 0(r30) /* 80196D24 00193C84 81 8C 00 38 */ lwz r12, 0x38(r12) /* 80196D28 00193C88 7D 89 03 A6 */ mtctr r12 -/* 80196D2C 00193C8C 4E 80 04 21 */ bctrl +/* 80196D2C 00193C8C 4E 80 04 21 */ bctrl /* 80196D30 00193C90 80 01 00 34 */ lwz r0, 0x34(r1) /* 80196D34 00193C94 7F C3 F3 78 */ mr r3, r30 /* 80196D38 00193C98 83 E1 00 2C */ lwz r31, 0x2c(r1) @@ -9004,7 +9004,7 @@ lbl_80196D1C: /* 80196D40 00193CA0 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80196D44 00193CA4 7C 08 03 A6 */ mtlr r0 /* 80196D48 00193CA8 38 21 00 30 */ addi r1, r1, 0x30 -/* 80196D4C 00193CAC 4E 80 00 20 */ blr +/* 80196D4C 00193CAC 4E 80 00 20 */ blr .global UpdateCameraDebugSettings__23CHudDecoInterfaceCombatFfff UpdateCameraDebugSettings__23CHudDecoInterfaceCombatFfff: @@ -9041,7 +9041,7 @@ UpdateCameraDebugSettings__23CHudDecoInterfaceCombatFfff: /* 80196DC8 00193D28 90 81 00 34 */ stw r4, 0x34(r1) /* 80196DCC 00193D2C D0 63 00 34 */ stfs f3, 0x34(r3) /* 80196DD0 00193D30 38 21 00 40 */ addi r1, r1, 0x40 -/* 80196DD4 00193D34 4E 80 00 20 */ blr +/* 80196DD4 00193D34 4E 80 00 20 */ blr .global Update__23CHudDecoInterfaceCombatFfRC13CStateManager Update__23CHudDecoInterfaceCombatFfRC13CStateManager: @@ -9074,7 +9074,7 @@ Update__23CHudDecoInterfaceCombatFfRC13CStateManager: /* 80196E40 00193DA0 83 E1 00 4C */ lwz r31, 0x4c(r1) /* 80196E44 00193DA4 7C 08 03 A6 */ mtlr r0 /* 80196E48 00193DA8 38 21 00 50 */ addi r1, r1, 0x50 -/* 80196E4C 00193DAC 4E 80 00 20 */ blr +/* 80196E4C 00193DAC 4E 80 00 20 */ blr .global SetFrameColorValue__23CHudDecoInterfaceCombatFf SetFrameColorValue__23CHudDecoInterfaceCombatFf: @@ -9101,7 +9101,7 @@ lbl_80196E80: /* 80196E98 00193DF8 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80196E9C 00193DFC 7C 08 03 A6 */ mtlr r0 /* 80196EA0 00193E00 38 21 00 20 */ addi r1, r1, 0x20 -/* 80196EA4 00193E04 4E 80 00 20 */ blr +/* 80196EA4 00193E04 4E 80 00 20 */ blr .global SetDamageTransform__23CHudDecoInterfaceCombatFRC9CMatrix3fRC9CVector3f SetDamageTransform__23CHudDecoInterfaceCombatFRC9CMatrix3fRC9CVector3f: @@ -9139,7 +9139,7 @@ SetDamageTransform__23CHudDecoInterfaceCombatFRC9CMatrix3fRC9CVector3f: /* 80196F24 00193E84 83 E1 00 6C */ lwz r31, 0x6c(r1) /* 80196F28 00193E88 7C 08 03 A6 */ mtlr r0 /* 80196F2C 00193E8C 38 21 00 70 */ addi r1, r1, 0x70 -/* 80196F30 00193E90 4E 80 00 20 */ blr +/* 80196F30 00193E90 4E 80 00 20 */ blr .global SetHudOffset__23CHudDecoInterfaceCombatFRC9CVector3f SetHudOffset__23CHudDecoInterfaceCombatFRC9CVector3f: @@ -9149,7 +9149,7 @@ SetHudOffset__23CHudDecoInterfaceCombatFRC9CVector3f: /* 80196F40 00193EA0 D0 03 00 24 */ stfs f0, 0x24(r3) /* 80196F44 00193EA4 C0 04 00 08 */ lfs f0, 8(r4) /* 80196F48 00193EA8 D0 03 00 28 */ stfs f0, 0x28(r3) -/* 80196F4C 00193EAC 4E 80 00 20 */ blr +/* 80196F4C 00193EAC 4E 80 00 20 */ blr .global SetHudRotation__23CHudDecoInterfaceCombatFRC11CQuaternion SetHudRotation__23CHudDecoInterfaceCombatFRC11CQuaternion: @@ -9161,7 +9161,7 @@ SetHudRotation__23CHudDecoInterfaceCombatFRC11CQuaternion: /* 80196F64 00193EC4 90 03 00 0C */ stw r0, 0xc(r3) /* 80196F68 00193EC8 80 04 00 0C */ lwz r0, 0xc(r4) /* 80196F6C 00193ECC 90 03 00 10 */ stw r0, 0x10(r3) -/* 80196F70 00193ED0 4E 80 00 20 */ blr +/* 80196F70 00193ED0 4E 80 00 20 */ blr .global UpdateVisibility__23CHudDecoInterfaceCombatFv UpdateVisibility__23CHudDecoInterfaceCombatFv: @@ -9193,7 +9193,7 @@ lbl_80196FAC: /* 80196FD4 00193F34 83 C1 00 08 */ lwz r30, 8(r1) /* 80196FD8 00193F38 7C 08 03 A6 */ mtlr r0 /* 80196FDC 00193F3C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80196FE0 00193F40 4E 80 00 20 */ blr +/* 80196FE0 00193F40 4E 80 00 20 */ blr .global UpdateHudAlpha__23CHudDecoInterfaceCombatFv UpdateHudAlpha__23CHudDecoInterfaceCombatFv: @@ -9213,7 +9213,7 @@ UpdateHudAlpha__23CHudDecoInterfaceCombatFv: /* 80197018 00193F78 80 01 00 14 */ lwz r0, 0x14(r1) /* 8019701C 00193F7C 7C 08 03 A6 */ mtlr r0 /* 80197020 00193F80 38 21 00 10 */ addi r1, r1, 0x10 -/* 80197024 00193F84 4E 80 00 20 */ blr +/* 80197024 00193F84 4E 80 00 20 */ blr .global SetIsVisibleGame__23CHudDecoInterfaceCombatFb SetIsVisibleGame__23CHudDecoInterfaceCombatFb: @@ -9227,7 +9227,7 @@ SetIsVisibleGame__23CHudDecoInterfaceCombatFb: /* 80197044 00193FA4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80197048 00193FA8 7C 08 03 A6 */ mtlr r0 /* 8019704C 00193FAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80197050 00193FB0 4E 80 00 20 */ blr +/* 80197050 00193FB0 4E 80 00 20 */ blr .global SetIsVisibleDebug__23CHudDecoInterfaceCombatFb SetIsVisibleDebug__23CHudDecoInterfaceCombatFb: @@ -9241,7 +9241,7 @@ SetIsVisibleDebug__23CHudDecoInterfaceCombatFb: /* 80197070 00193FD0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80197074 00193FD4 7C 08 03 A6 */ mtlr r0 /* 80197078 00193FD8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8019707C 00193FDC 4E 80 00 20 */ blr +/* 8019707C 00193FDC 4E 80 00 20 */ blr .global __ct__23CHudDecoInterfaceCombatFR9CGuiFrame __ct__23CHudDecoInterfaceCombatFR9CGuiFrame: @@ -9364,7 +9364,7 @@ __ct__23CHudDecoInterfaceCombatFR9CGuiFrame: /* 80197250 001941B0 81 9F 00 00 */ lwz r12, 0(r31) /* 80197254 001941B4 81 8C 00 38 */ lwz r12, 0x38(r12) /* 80197258 001941B8 7D 89 03 A6 */ mtctr r12 -/* 8019725C 001941BC 4E 80 04 21 */ bctrl +/* 8019725C 001941BC 4E 80 04 21 */ bctrl /* 80197260 001941C0 80 01 00 54 */ lwz r0, 0x54(r1) /* 80197264 001941C4 7F E3 FB 78 */ mr r3, r31 /* 80197268 001941C8 83 E1 00 4C */ lwz r31, 0x4c(r1) @@ -9372,7 +9372,7 @@ __ct__23CHudDecoInterfaceCombatFR9CGuiFrame: /* 80197270 001941D0 83 A1 00 44 */ lwz r29, 0x44(r1) /* 80197274 001941D4 7C 08 03 A6 */ mtlr r0 /* 80197278 001941D8 38 21 00 50 */ addi r1, r1, 0x50 -/* 8019727C 001941DC 4E 80 00 20 */ blr +/* 8019727C 001941DC 4E 80 00 20 */ blr .global __dt__21CHudDecoInterfaceScanFv __dt__21CHudDecoInterfaceScanFv: @@ -9415,7 +9415,7 @@ lbl_801972F8: /* 80197304 00194264 83 C1 00 08 */ lwz r30, 8(r1) /* 80197308 00194268 7C 08 03 A6 */ mtlr r0 /* 8019730C 0019426C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80197310 00194270 4E 80 00 20 */ blr +/* 80197310 00194270 4E 80 00 20 */ blr .global __dt__21CHudDecoInterfaceXrayFv __dt__21CHudDecoInterfaceXrayFv: @@ -9443,7 +9443,7 @@ lbl_80197358: /* 80197360 001942C0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80197364 001942C4 7C 08 03 A6 */ mtlr r0 /* 80197368 001942C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8019736C 001942CC 4E 80 00 20 */ blr +/* 8019736C 001942CC 4E 80 00 20 */ blr .global __dt__23CHudDecoInterfaceCombatFv __dt__23CHudDecoInterfaceCombatFv: @@ -9471,7 +9471,7 @@ lbl_801973B4: /* 801973BC 0019431C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801973C0 00194320 7C 08 03 A6 */ mtlr r0 /* 801973C4 00194324 38 21 00 10 */ addi r1, r1, 0x10 -/* 801973C8 00194328 4E 80 00 20 */ blr +/* 801973C8 00194328 4E 80 00 20 */ blr .global sub_801973cc sub_801973cc: @@ -9543,4 +9543,4 @@ lbl_801974A8: /* 801974AC 0019440C 80 01 00 34 */ lwz r0, 0x34(r1) /* 801974B0 00194410 7C 08 03 A6 */ mtlr r0 /* 801974B4 00194414 38 21 00 30 */ addi r1, r1, 0x30 -/* 801974B8 00194418 4E 80 00 20 */ blr +/* 801974B8 00194418 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/HUD/CSamusHud.s b/asm/MetroidPrime/HUD/CSamusHud.s index 38196a04..4d253a62 100644 --- a/asm/MetroidPrime/HUD/CSamusHud.s +++ b/asm/MetroidPrime/HUD/CSamusHud.s @@ -8,7 +8,7 @@ lbl_803DA298: .4byte 0 .4byte 0 .4byte __dt__9CSamusHudFv - + .global lbl_803DA2A4 lbl_803DA2A4: # ROM: 0x3D72A4 @@ -286,7 +286,7 @@ lbl_805A8DE8: /* 8006482C 0006178C 81 83 00 00 */ lwz r12, 0(r3) /* 80064830 00061790 81 8C 00 20 */ lwz r12, 0x20(r12) /* 80064834 00061794 7D 89 03 A6 */ mtctr r12 -/* 80064838 00061798 4E 80 04 21 */ bctrl +/* 80064838 00061798 4E 80 04 21 */ bctrl /* 8006483C 0006179C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80064840 000617A0 7C 7F 1B 78 */ mr r31, r3 /* 80064844 000617A4 41 82 00 10 */ beq lbl_80064854 @@ -425,13 +425,13 @@ lbl_80064A24: /* 80064A34 00061994 83 81 00 30 */ lwz r28, 0x30(r1) /* 80064A38 00061998 7C 08 03 A6 */ mtlr r0 /* 80064A3C 0006199C 38 21 00 40 */ addi r1, r1, 0x40 -/* 80064A40 000619A0 4E 80 00 20 */ blr +/* 80064A40 000619A0 4E 80 00 20 */ blr .global GetIsVisible__10CGuiWidgetCFv GetIsVisible__10CGuiWidgetCFv: /* 80064A44 000619A4 88 03 00 B6 */ lbz r0, 0xb6(r3) /* 80064A48 000619A8 54 03 D7 FE */ rlwinm r3, r0, 0x1a, 0x1f, 0x1f -/* 80064A4C 000619AC 4E 80 00 20 */ blr +/* 80064A4C 000619AC 4E 80 00 20 */ blr .global UpdateCameraDebugSettings__9CSamusHudFv UpdateCameraDebugSettings__9CSamusHudFv: @@ -476,7 +476,7 @@ lbl_80064ACC: /* 80064AE4 00061A44 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80064AE8 00061A48 FC 60 E8 90 */ fmr f3, f29 /* 80064AEC 00061A4C 7D 89 03 A6 */ mtctr r12 -/* 80064AF0 00061A50 4E 80 04 21 */ bctrl +/* 80064AF0 00061A50 4E 80 04 21 */ bctrl lbl_80064AF4: /* 80064AF4 00061A54 80 7F 02 74 */ lwz r3, 0x274(r31) /* 80064AF8 00061A58 C0 02 87 34 */ lfs f0, lbl_805AA454@sda21(r2) @@ -514,7 +514,7 @@ lbl_80064AF4: /* 80064B78 00061AD8 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 80064B7C 00061ADC 7C 08 03 A6 */ mtlr r0 /* 80064B80 00061AE0 38 21 00 60 */ addi r1, r1, 0x60 -/* 80064B84 00061AE4 4E 80 00 20 */ blr +/* 80064B84 00061AE4 4E 80 00 20 */ blr .global ApplyClassicLag__9CSamusHudFRC13CUnitVector3fR11CQuaternionRC13CStateManagerfb ApplyClassicLag__9CSamusHudFRC13CUnitVector3fR11CQuaternionRC13CStateManagerfb: @@ -714,7 +714,7 @@ lbl_80064DE4: /* 80064E7C 00061DDC 83 81 01 30 */ lwz r28, 0x130(r1) /* 80064E80 00061DE0 7C 08 03 A6 */ mtlr r0 /* 80064E84 00061DE4 38 21 01 80 */ addi r1, r1, 0x180 -/* 80064E88 00061DE8 4E 80 00 20 */ blr +/* 80064E88 00061DE8 4E 80 00 20 */ blr .global UpdateHudLag__9CSamusHudFfRC13CStateManager UpdateHudLag__9CSamusHudFfRC13CStateManager: @@ -737,7 +737,7 @@ UpdateHudLag__9CSamusHudFfRC13CStateManager: /* 80064ECC 00061E2C 81 83 00 00 */ lwz r12, 0(r3) /* 80064ED0 00061E30 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80064ED4 00061E34 7D 89 03 A6 */ mtctr r12 -/* 80064ED8 00061E38 4E 80 04 21 */ bctrl +/* 80064ED8 00061E38 4E 80 04 21 */ bctrl lbl_80064EDC: /* 80064EDC 00061E3C 80 6D A0 80 */ lwz r3, gpGameState@sda21(r13) /* 80064EE0 00061E40 88 03 01 E4 */ lbz r0, 0x1e4(r3) @@ -762,21 +762,21 @@ lbl_80064F14: /* 80064F28 00061E88 38 84 65 FC */ addi r4, r4, lbl_805A65FC@l /* 80064F2C 00061E8C 81 8C 00 18 */ lwz r12, 0x18(r12) /* 80064F30 00061E90 7D 89 03 A6 */ mtctr r12 -/* 80064F34 00061E94 4E 80 04 21 */ bctrl +/* 80064F34 00061E94 4E 80 04 21 */ bctrl /* 80064F38 00061E98 80 7E 02 9C */ lwz r3, 0x29c(r30) /* 80064F3C 00061E9C 3C 80 80 5A */ lis r4, lbl_805A6660@ha /* 80064F40 00061EA0 38 84 66 60 */ addi r4, r4, lbl_805A6660@l /* 80064F44 00061EA4 81 83 00 00 */ lwz r12, 0(r3) /* 80064F48 00061EA8 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80064F4C 00061EAC 7D 89 03 A6 */ mtctr r12 -/* 80064F50 00061EB0 4E 80 04 21 */ bctrl +/* 80064F50 00061EB0 4E 80 04 21 */ bctrl /* 80064F54 00061EB4 80 7E 02 9C */ lwz r3, 0x29c(r30) /* 80064F58 00061EB8 3C 80 80 5A */ lis r4, skZero3f@ha /* 80064F5C 00061EBC 38 84 66 A0 */ addi r4, r4, skZero3f@l /* 80064F60 00061EC0 81 83 00 00 */ lwz r12, 0(r3) /* 80064F64 00061EC4 81 8C 00 14 */ lwz r12, 0x14(r12) /* 80064F68 00061EC8 7D 89 03 A6 */ mtctr r12 -/* 80064F6C 00061ECC 4E 80 04 21 */ bctrl +/* 80064F6C 00061ECC 4E 80 04 21 */ bctrl lbl_80064F70: /* 80064F70 00061ED0 80 9E 05 88 */ lwz r4, 0x588(r30) /* 80064F74 00061ED4 38 61 00 78 */ addi r3, r1, 0x78 @@ -962,19 +962,19 @@ lbl_80065218: /* 80065238 00062198 81 9F 00 00 */ lwz r12, 0(r31) /* 8006523C 0006219C 81 8C 00 18 */ lwz r12, 0x18(r12) /* 80065240 000621A0 7D 89 03 A6 */ mtctr r12 -/* 80065244 000621A4 4E 80 04 21 */ bctrl +/* 80065244 000621A4 4E 80 04 21 */ bctrl /* 80065248 000621A8 80 7E 02 9C */ lwz r3, 0x29c(r30) /* 8006524C 000621AC 38 81 00 84 */ addi r4, r1, 0x84 /* 80065250 000621B0 81 83 00 00 */ lwz r12, 0(r3) /* 80065254 000621B4 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80065258 000621B8 7D 89 03 A6 */ mtctr r12 -/* 8006525C 000621BC 4E 80 04 21 */ bctrl +/* 8006525C 000621BC 4E 80 04 21 */ bctrl /* 80065260 000621C0 80 7E 02 9C */ lwz r3, 0x29c(r30) /* 80065264 000621C4 38 81 00 94 */ addi r4, r1, 0x94 /* 80065268 000621C8 81 83 00 00 */ lwz r12, 0(r3) /* 8006526C 000621CC 81 8C 00 14 */ lwz r12, 0x14(r12) /* 80065270 000621D0 7D 89 03 A6 */ mtctr r12 -/* 80065274 000621D4 4E 80 04 21 */ bctrl +/* 80065274 000621D4 4E 80 04 21 */ bctrl lbl_80065278: /* 80065278 000621D8 C0 3E 03 08 */ lfs f1, 0x308(r30) /* 8006527C 000621DC 38 61 00 BC */ addi r3, r1, 0xbc @@ -1012,15 +1012,15 @@ lbl_800652E8: /* 800652F8 00062258 83 C1 01 E8 */ lwz r30, 0x1e8(r1) /* 800652FC 0006225C 7C 08 03 A6 */ mtlr r0 /* 80065300 00062260 38 21 02 00 */ addi r1, r1, 0x200 -/* 80065304 00062264 4E 80 00 20 */ blr +/* 80065304 00062264 4E 80 00 20 */ blr .global SetReticuleTransform__17CHudDecoInterfaceFRC9CMatrix3f SetReticuleTransform__17CHudDecoInterfaceFRC9CMatrix3f: -/* 80065308 00062268 4E 80 00 20 */ blr +/* 80065308 00062268 4E 80 00 20 */ blr .global SetDecoRotation__17IHudDecoInterfaceFf SetDecoRotation__17IHudDecoInterfaceFf: -/* 8006530C 0006226C 4E 80 00 20 */ blr +/* 8006530C 0006226C 4E 80 00 20 */ blr .global ShowDamage__9CSamusHudF9CVector3fffRC13CStateManager ShowDamage__9CSamusHudF9CVector3fffRC13CStateManager: @@ -1175,7 +1175,7 @@ lbl_80065538: /* 8006554C 000624AC 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 80065550 000624B0 7C 08 03 A6 */ mtlr r0 /* 80065554 000624B4 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 80065558 000624B8 4E 80 00 20 */ blr +/* 80065558 000624B8 4E 80 00 20 */ blr .global GetRelativeDirection__9CSamusHudCFRC9CVector3fRC13CStateManager GetRelativeDirection__9CSamusHudCFRC9CVector3fRC13CStateManager: @@ -1395,7 +1395,7 @@ lbl_80065868: /* 80065890 000627F0 83 C1 00 D8 */ lwz r30, 0xd8(r1) /* 80065894 000627F4 7C 08 03 A6 */ mtlr r0 /* 80065898 000627F8 38 21 01 20 */ addi r1, r1, 0x120 -/* 8006589C 000627FC 4E 80 00 20 */ blr +/* 8006589C 000627FC 4E 80 00 20 */ blr .global GetDesiredHudState__9CSamusHudCFRC13CStateManager GetDesiredHudState__9CSamusHudCFRC13CStateManager: @@ -1408,7 +1408,7 @@ GetDesiredHudState__9CSamusHudCFRC13CStateManager: /* 800658B8 00062818 40 82 00 0C */ bne lbl_800658C4 lbl_800658BC: /* 800658BC 0006281C 38 60 00 04 */ li r3, 4 -/* 800658C0 00062820 4E 80 00 20 */ blr +/* 800658C0 00062820 4E 80 00 20 */ blr lbl_800658C4: /* 800658C4 00062824 80 64 08 B8 */ lwz r3, 0x8b8(r4) /* 800658C8 00062828 80 63 00 00 */ lwz r3, 0(r3) @@ -1426,24 +1426,24 @@ lbl_800658EC: /* 800658F4 00062854 48 00 00 1C */ b lbl_80065910 lbl_800658F8: /* 800658F8 00062858 38 60 00 00 */ li r3, 0 -/* 800658FC 0006285C 4E 80 00 20 */ blr +/* 800658FC 0006285C 4E 80 00 20 */ blr lbl_80065900: /* 80065900 00062860 38 60 00 01 */ li r3, 1 -/* 80065904 00062864 4E 80 00 20 */ blr +/* 80065904 00062864 4E 80 00 20 */ blr lbl_80065908: /* 80065908 00062868 38 60 00 03 */ li r3, 3 -/* 8006590C 0006286C 4E 80 00 20 */ blr +/* 8006590C 0006286C 4E 80 00 20 */ blr lbl_80065910: /* 80065910 00062870 38 60 00 02 */ li r3, 2 -/* 80065914 00062874 4E 80 00 20 */ blr +/* 80065914 00062874 4E 80 00 20 */ blr lbl_80065918: /* 80065918 00062878 38 60 00 05 */ li r3, 5 -/* 8006591C 0006287C 4E 80 00 20 */ blr +/* 8006591C 0006287C 4E 80 00 20 */ blr .global GetTargetingManager__9CSamusHudCFv GetTargetingManager__9CSamusHudCFv: /* 80065920 00062880 38 63 00 08 */ addi r3, r3, 8 -/* 80065924 00062884 4E 80 00 20 */ blr +/* 80065924 00062884 4E 80 00 20 */ blr .global ProcessControllerInput__9CSamusHudFRC11CFinalInput ProcessControllerInput__9CSamusHudFRC11CFinalInput: @@ -1456,16 +1456,16 @@ ProcessControllerInput__9CSamusHudFRC11CFinalInput: /* 80065940 000628A0 81 83 00 00 */ lwz r12, 0(r3) /* 80065944 000628A4 81 8C 00 30 */ lwz r12, 0x30(r12) /* 80065948 000628A8 7D 89 03 A6 */ mtctr r12 -/* 8006594C 000628AC 4E 80 04 21 */ bctrl +/* 8006594C 000628AC 4E 80 04 21 */ bctrl lbl_80065950: /* 80065950 000628B0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80065954 000628B4 7C 08 03 A6 */ mtlr r0 /* 80065958 000628B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8006595C 000628BC 4E 80 00 20 */ blr +/* 8006595C 000628BC 4E 80 00 20 */ blr .global ProcessInput__17IHudDecoInterfaceFRC11CFinalInput ProcessInput__17IHudDecoInterfaceFRC11CFinalInput: -/* 80065960 000628C0 4E 80 00 20 */ blr +/* 80065960 000628C0 4E 80 00 20 */ blr .global Draw__9CSamusHudCFRC13CStateManagerfUibb Draw__9CSamusHudCFRC13CStateManagerfUibb: @@ -1674,7 +1674,7 @@ lbl_80065C58: /* 80065C70 00062BD0 81 83 00 00 */ lwz r12, 0(r3) /* 80065C74 00062BD4 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80065C78 00062BD8 7D 89 03 A6 */ mtctr r12 -/* 80065C7C 00062BDC 4E 80 04 21 */ bctrl +/* 80065C7C 00062BDC 4E 80 04 21 */ bctrl /* 80065C80 00062BE0 7F B6 EB 78 */ mr r22, r29 /* 80065C84 00062BE4 7F 3E CB 78 */ mr r30, r25 /* 80065C88 00062BE8 48 31 F7 21 */ bl OSGetTime @@ -1741,7 +1741,7 @@ lbl_80065D5C: /* 80065D68 00062CC8 81 83 00 00 */ lwz r12, 0(r3) /* 80065D6C 00062CCC 81 8C 00 60 */ lwz r12, 0x60(r12) /* 80065D70 00062CD0 7D 89 03 A6 */ mtctr r12 -/* 80065D74 00062CD4 4E 80 04 21 */ bctrl +/* 80065D74 00062CD4 4E 80 04 21 */ bctrl lbl_80065D78: /* 80065D78 00062CD8 48 31 F6 31 */ bl OSGetTime /* 80065D7C 00062CDC 3C A0 80 5A */ lis r5, mData__10CStopwatch@ha @@ -1760,11 +1760,11 @@ lbl_80065DA0: /* 80065DAC 00062D0C 80 01 00 84 */ lwz r0, 0x84(r1) /* 80065DB0 00062D10 7C 08 03 A6 */ mtlr r0 /* 80065DB4 00062D14 38 21 00 80 */ addi r1, r1, 0x80 -/* 80065DB8 00062D18 4E 80 00 20 */ blr +/* 80065DB8 00062D18 4E 80 00 20 */ blr .global Draw__17IHudDecoInterfaceCFv Draw__17IHudDecoInterfaceCFv: -/* 80065DBC 00062D1C 4E 80 00 20 */ blr +/* 80065DBC 00062D1C 4E 80 00 20 */ blr .global DrawHelmet__9CSamusHudFRC13CStateManagerf DrawHelmet__9CSamusHudFRC13CStateManagerf: @@ -1813,7 +1813,7 @@ lbl_80065E58: /* 80065E58 00062DB8 80 01 00 24 */ lwz r0, 0x24(r1) /* 80065E5C 00062DBC 7C 08 03 A6 */ mtlr r0 /* 80065E60 00062DC0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80065E64 00062DC4 4E 80 00 20 */ blr +/* 80065E64 00062DC4 4E 80 00 20 */ blr .global LeaveFirstPerson__9CSamusHudFRC13CStateManager LeaveFirstPerson__9CSamusHudFRC13CStateManager: @@ -1836,7 +1836,7 @@ LeaveFirstPerson__9CSamusHudFRC13CStateManager: /* 80065EA8 00062E08 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80065EAC 00062E0C 7C 08 03 A6 */ mtlr r0 /* 80065EB0 00062E10 38 21 00 20 */ addi r1, r1, 0x20 -/* 80065EB4 00062E14 4E 80 00 20 */ blr +/* 80065EB4 00062E14 4E 80 00 20 */ blr .global EnterFirstPerson__9CSamusHudFRC13CStateManager EnterFirstPerson__9CSamusHudFRC13CStateManager: @@ -1859,7 +1859,7 @@ EnterFirstPerson__9CSamusHudFRC13CStateManager: /* 80065EF8 00062E58 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80065EFC 00062E5C 7C 08 03 A6 */ mtlr r0 /* 80065F00 00062E60 38 21 00 20 */ addi r1, r1, 0x20 -/* 80065F04 00062E64 4E 80 00 20 */ blr +/* 80065F04 00062E64 4E 80 00 20 */ blr .global BuildPlayerHasBeams__9CSamusHudCFRC13CStateManager BuildPlayerHasBeams__9CSamusHudCFRC13CStateManager: @@ -1966,7 +1966,7 @@ lbl_80066058: /* 8006606C 00062FCC 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80066070 00062FD0 7C 08 03 A6 */ mtlr r0 /* 80066074 00062FD4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80066078 00062FD8 4E 80 00 20 */ blr +/* 80066078 00062FD8 4E 80 00 20 */ blr .global BuildPlayerHasVisors__9CSamusHudCFRC13CStateManager BuildPlayerHasVisors__9CSamusHudCFRC13CStateManager: @@ -2073,7 +2073,7 @@ lbl_800661CC: /* 800661E0 00063140 83 A1 00 14 */ lwz r29, 0x14(r1) /* 800661E4 00063144 7C 08 03 A6 */ mtlr r0 /* 800661E8 00063148 38 21 00 20 */ addi r1, r1, 0x20 -/* 800661EC 0006314C 4E 80 00 20 */ blr +/* 800661EC 0006314C 4E 80 00 20 */ blr .global DrawAttachedEnemyEffect__9CSamusHudCFRC13CStateManager DrawAttachedEnemyEffect__9CSamusHudCFRC13CStateManager: @@ -2160,7 +2160,7 @@ lbl_80066304: /* 80066318 00063278 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8006631C 0006327C 7C 08 03 A6 */ mtlr r0 /* 80066320 00063280 38 21 00 40 */ addi r1, r1, 0x40 -/* 80066324 00063284 4E 80 00 20 */ blr +/* 80066324 00063284 4E 80 00 20 */ blr .global Touch__9CSamusHudCFv Touch__9CSamusHudCFv: @@ -2188,7 +2188,7 @@ lbl_8006636C: /* 80066370 000632D0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80066374 000632D4 7C 08 03 A6 */ mtlr r0 /* 80066378 000632D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8006637C 000632DC 4E 80 00 20 */ blr +/* 8006637C 000632DC 4E 80 00 20 */ blr .global Update__9CSamusHudFfRC13CStateManagerUibb Update__9CSamusHudFfRC13CStateManagerUibb: @@ -2349,7 +2349,7 @@ lbl_80066588: /* 80066598 000634F8 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 8006659C 000634FC 81 8C 00 08 */ lwz r12, 8(r12) /* 800665A0 00063500 7D 89 03 A6 */ mtctr r12 -/* 800665A4 00063504 4E 80 04 21 */ bctrl +/* 800665A4 00063504 4E 80 04 21 */ bctrl lbl_800665A8: /* 800665A8 00063508 80 7F 02 A0 */ lwz r3, 0x2a0(r31) /* 800665AC 0006350C 28 03 00 00 */ cmplwi r3, 0 @@ -2558,7 +2558,7 @@ lbl_80066848: /* 800668B4 00063814 81 83 00 00 */ lwz r12, 0(r3) /* 800668B8 00063818 81 8C 00 20 */ lwz r12, 0x20(r12) /* 800668BC 0006381C 7D 89 03 A6 */ mtctr r12 -/* 800668C0 00063820 4E 80 04 21 */ bctrl +/* 800668C0 00063820 4E 80 04 21 */ bctrl /* 800668C4 00063824 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800668C8 00063828 41 82 00 28 */ beq lbl_800668F0 /* 800668CC 0006382C C0 02 87 34 */ lfs f0, lbl_805AA454@sda21(r2) @@ -2593,7 +2593,7 @@ lbl_80066930: /* 80066930 00063890 81 83 00 00 */ lwz r12, 0(r3) /* 80066934 00063894 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 80066938 00063898 7D 89 03 A6 */ mtctr r12 -/* 8006693C 0006389C 4E 80 04 21 */ bctrl +/* 8006693C 0006389C 4E 80 04 21 */ bctrl lbl_80066940: /* 80066940 000638A0 C0 42 87 28 */ lfs f2, lbl_805AA448@sda21(r2) /* 80066944 000638A4 D0 21 00 50 */ stfs f1, 0x50(r1) @@ -2618,14 +2618,14 @@ lbl_80066980: /* 80066984 000638E4 81 83 00 00 */ lwz r12, 0(r3) /* 80066988 000638E8 81 8C 00 20 */ lwz r12, 0x20(r12) /* 8006698C 000638EC 7D 89 03 A6 */ mtctr r12 -/* 80066990 000638F0 4E 80 04 21 */ bctrl +/* 80066990 000638F0 4E 80 04 21 */ bctrl /* 80066994 000638F4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80066998 000638F8 40 82 00 28 */ bne lbl_800669C0 /* 8006699C 000638FC 80 7F 05 98 */ lwz r3, 0x598(r31) /* 800669A0 00063900 81 83 00 00 */ lwz r12, 0(r3) /* 800669A4 00063904 81 8C 00 20 */ lwz r12, 0x20(r12) /* 800669A8 00063908 7D 89 03 A6 */ mtctr r12 -/* 800669AC 0006390C 4E 80 04 21 */ bctrl +/* 800669AC 0006390C 4E 80 04 21 */ bctrl /* 800669B0 00063910 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800669B4 00063914 40 82 00 0C */ bne lbl_800669C0 /* 800669B8 00063918 C0 02 87 34 */ lfs f0, lbl_805AA454@sda21(r2) @@ -2718,7 +2718,7 @@ lbl_80066AE8: /* 80066AF0 00063A50 81 83 00 00 */ lwz r12, 0(r3) /* 80066AF4 00063A54 81 8C 00 20 */ lwz r12, 0x20(r12) /* 80066AF8 00063A58 7D 89 03 A6 */ mtctr r12 -/* 80066AFC 00063A5C 4E 80 04 21 */ bctrl +/* 80066AFC 00063A5C 4E 80 04 21 */ bctrl /* 80066B00 00063A60 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80066B04 00063A64 41 82 00 0C */ beq lbl_80066B10 /* 80066B08 00063A68 83 5F 05 98 */ lwz r26, 0x598(r31) @@ -2848,7 +2848,7 @@ lbl_80066C90: /* 80066CC0 00063C20 81 83 00 00 */ lwz r12, 0(r3) /* 80066CC4 00063C24 81 8C 00 20 */ lwz r12, 0x20(r12) /* 80066CC8 00063C28 7D 89 03 A6 */ mtctr r12 -/* 80066CCC 00063C2C 4E 80 04 21 */ bctrl +/* 80066CCC 00063C2C 4E 80 04 21 */ bctrl /* 80066CD0 00063C30 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80066CD4 00063C34 41 82 00 10 */ beq lbl_80066CE4 /* 80066CD8 00063C38 C0 02 87 28 */ lfs f0, lbl_805AA448@sda21(r2) @@ -2993,7 +2993,7 @@ lbl_80066EC8: /* 80066ED8 00063E38 FC 20 E0 90 */ fmr f1, f28 /* 80066EDC 00063E3C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80066EE0 00063E40 7D 89 03 A6 */ mtctr r12 -/* 80066EE4 00063E44 4E 80 04 21 */ bctrl +/* 80066EE4 00063E44 4E 80 04 21 */ bctrl lbl_80066EE8: /* 80066EE8 00063E48 80 7F 02 94 */ lwz r3, 0x294(r31) /* 80066EEC 00063E4C 28 03 00 00 */ cmplwi r3, 0 @@ -3009,7 +3009,7 @@ lbl_80066F00: /* 80066F10 00063E70 FC 20 E0 90 */ fmr f1, f28 /* 80066F14 00063E74 81 8C 00 14 */ lwz r12, 0x14(r12) /* 80066F18 00063E78 7D 89 03 A6 */ mtctr r12 -/* 80066F1C 00063E7C 4E 80 04 21 */ bctrl +/* 80066F1C 00063E7C 4E 80 04 21 */ bctrl lbl_80066F20: /* 80066F20 00063E80 80 7F 02 A0 */ lwz r3, 0x2a0(r31) /* 80066F24 00063E84 28 03 00 00 */ cmplwi r3, 0 @@ -3113,7 +3113,7 @@ lbl_80067054: /* 80067070 00063FD0 7F C4 F3 78 */ mr r4, r30 /* 80067074 00063FD4 81 8C 00 28 */ lwz r12, 0x28(r12) /* 80067078 00063FD8 7D 89 03 A6 */ mtctr r12 -/* 8006707C 00063FDC 4E 80 04 21 */ bctrl +/* 8006707C 00063FDC 4E 80 04 21 */ bctrl lbl_80067080: /* 80067080 00063FE0 E3 E1 01 98 */ psq_l f31, 408(r1), 0, qr0 /* 80067084 00063FE4 CB E1 01 90 */ lfd f31, 0x190(r1) @@ -3131,12 +3131,12 @@ lbl_80067080: /* 800670B4 00064014 80 01 01 A4 */ lwz r0, 0x1a4(r1) /* 800670B8 00064018 7C 08 03 A6 */ mtlr r0 /* 800670BC 0006401C 38 21 01 A0 */ addi r1, r1, 0x1a0 -/* 800670C0 00064020 4E 80 00 20 */ blr +/* 800670C0 00064020 4E 80 00 20 */ blr .global GetMessageTextAlpha__17IHudDecoInterfaceCFv GetMessageTextAlpha__17IHudDecoInterfaceCFv: /* 800670C4 00064024 C0 22 87 28 */ lfs f1, lbl_805AA448@sda21(r2) -/* 800670C8 00064028 4E 80 00 20 */ blr +/* 800670C8 00064028 4E 80 00 20 */ blr .global UpdateStateTransition__9CSamusHudFfRC13CStateManager UpdateStateTransition__9CSamusHudFfRC13CStateManager: @@ -3302,7 +3302,7 @@ lbl_800672F4: /* 80067300 00064260 81 84 00 00 */ lwz r12, 0(r4) /* 80067304 00064264 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80067308 00064268 7D 89 03 A6 */ mtctr r12 -/* 8006730C 0006426C 4E 80 04 21 */ bctrl +/* 8006730C 0006426C 4E 80 04 21 */ bctrl /* 80067310 00064270 38 61 00 78 */ addi r3, r1, 0x78 /* 80067314 00064274 38 81 00 30 */ addi r4, r1, 0x30 /* 80067318 00064278 48 2D 9B 91 */ bl __ct__6CTokenFRC6CToken @@ -3346,7 +3346,7 @@ lbl_80067394: /* 800673A0 00064300 81 84 00 00 */ lwz r12, 0(r4) /* 800673A4 00064304 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800673A8 00064308 7D 89 03 A6 */ mtctr r12 -/* 800673AC 0006430C 4E 80 04 21 */ bctrl +/* 800673AC 0006430C 4E 80 04 21 */ bctrl /* 800673B0 00064310 38 61 00 6C */ addi r3, r1, 0x6c /* 800673B4 00064314 38 81 00 28 */ addi r4, r1, 0x28 /* 800673B8 00064318 48 2D 9A F1 */ bl __ct__6CTokenFRC6CToken @@ -3390,7 +3390,7 @@ lbl_80067434: /* 80067440 000643A0 81 84 00 00 */ lwz r12, 0(r4) /* 80067444 000643A4 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80067448 000643A8 7D 89 03 A6 */ mtctr r12 -/* 8006744C 000643AC 4E 80 04 21 */ bctrl +/* 8006744C 000643AC 4E 80 04 21 */ bctrl /* 80067450 000643B0 38 61 00 60 */ addi r3, r1, 0x60 /* 80067454 000643B4 38 81 00 20 */ addi r4, r1, 0x20 /* 80067458 000643B8 48 2D 9A 51 */ bl __ct__6CTokenFRC6CToken @@ -3434,7 +3434,7 @@ lbl_800674D4: /* 800674E0 00064440 81 84 00 00 */ lwz r12, 0(r4) /* 800674E4 00064444 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800674E8 00064448 7D 89 03 A6 */ mtctr r12 -/* 800674EC 0006444C 4E 80 04 21 */ bctrl +/* 800674EC 0006444C 4E 80 04 21 */ bctrl /* 800674F0 00064450 38 61 00 54 */ addi r3, r1, 0x54 /* 800674F4 00064454 38 81 00 18 */ addi r4, r1, 0x18 /* 800674F8 00064458 48 2D 99 B1 */ bl __ct__6CTokenFRC6CToken @@ -3478,7 +3478,7 @@ lbl_80067574: /* 80067580 000644E0 81 84 00 00 */ lwz r12, 0(r4) /* 80067584 000644E4 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80067588 000644E8 7D 89 03 A6 */ mtctr r12 -/* 8006758C 000644EC 4E 80 04 21 */ bctrl +/* 8006758C 000644EC 4E 80 04 21 */ bctrl /* 80067590 000644F0 38 61 00 48 */ addi r3, r1, 0x48 /* 80067594 000644F4 38 81 00 10 */ addi r4, r1, 0x10 /* 80067598 000644F8 48 2D 99 11 */ bl __ct__6CTokenFRC6CToken @@ -3662,7 +3662,7 @@ lbl_800677F4: /* 8006780C 0006476C 83 81 00 A0 */ lwz r28, 0xa0(r1) /* 80067810 00064770 7C 08 03 A6 */ mtlr r0 /* 80067814 00064774 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 80067818 00064778 4E 80 00 20 */ blr +/* 80067818 00064778 4E 80 00 20 */ blr .global UpdateHudDamage__9CSamusHudFfRC13CStateManagerUi UpdateHudDamage__9CSamusHudFfRC13CStateManagerUi: @@ -3960,7 +3960,7 @@ lbl_80067C34: /* 80067C54 00064BB4 FC 20 D8 90 */ fmr f1, f27 /* 80067C58 00064BB8 81 8C 00 24 */ lwz r12, 0x24(r12) /* 80067C5C 00064BBC 7D 89 03 A6 */ mtctr r12 -/* 80067C60 00064BC0 4E 80 04 21 */ bctrl +/* 80067C60 00064BC0 4E 80 04 21 */ bctrl /* 80067C64 00064BC4 C0 02 87 34 */ lfs f0, lbl_805AA454@sda21(r2) /* 80067C68 00064BC8 FC 1B 00 40 */ fcmpo cr0, f27, f0 /* 80067C6C 00064BCC 40 81 00 58 */ ble lbl_80067CC4 @@ -3983,7 +3983,7 @@ lbl_80067C34: /* 80067CB0 00064C10 81 83 00 00 */ lwz r12, 0(r3) /* 80067CB4 00064C14 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 80067CB8 00064C18 7D 89 03 A6 */ mtctr r12 -/* 80067CBC 00064C1C 4E 80 04 21 */ bctrl +/* 80067CBC 00064C1C 4E 80 04 21 */ bctrl /* 80067CC0 00064C20 48 00 00 1C */ b lbl_80067CDC lbl_80067CC4: /* 80067CC4 00064C24 80 7D 03 D4 */ lwz r3, 0x3d4(r29) @@ -3991,7 +3991,7 @@ lbl_80067CC4: /* 80067CCC 00064C2C 81 83 00 00 */ lwz r12, 0(r3) /* 80067CD0 00064C30 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 80067CD4 00064C34 7D 89 03 A6 */ mtctr r12 -/* 80067CD8 00064C38 4E 80 04 21 */ bctrl +/* 80067CD8 00064C38 4E 80 04 21 */ bctrl lbl_80067CDC: /* 80067CDC 00064C3C C0 3D 04 14 */ lfs f1, 0x414(r29) /* 80067CE0 00064C40 38 00 00 00 */ li r0, 0 @@ -4228,7 +4228,7 @@ lbl_80067FE8: /* 80068050 00064FB0 81 83 00 00 */ lwz r12, 0(r3) /* 80068054 00064FB4 81 8C 00 20 */ lwz r12, 0x20(r12) /* 80068058 00064FB8 7D 89 03 A6 */ mtctr r12 -/* 8006805C 00064FBC 4E 80 04 21 */ bctrl +/* 8006805C 00064FBC 4E 80 04 21 */ bctrl lbl_80068060: /* 80068060 00064FC0 E3 E1 01 98 */ psq_l f31, 408(r1), 0, qr0 /* 80068064 00064FC4 CB E1 01 90 */ lfd f31, 0x190(r1) @@ -4244,11 +4244,11 @@ lbl_80068060: /* 8006808C 00064FEC 80 01 01 A4 */ lwz r0, 0x1a4(r1) /* 80068090 00064FF0 7C 08 03 A6 */ mtlr r0 /* 80068094 00064FF4 38 21 01 A0 */ addi r1, r1, 0x1a0 -/* 80068098 00064FF8 4E 80 00 20 */ blr +/* 80068098 00064FF8 4E 80 00 20 */ blr .global SetFrameColorValue__17IHudDecoInterfaceFf SetFrameColorValue__17IHudDecoInterfaceFf: -/* 8006809C 00064FFC 4E 80 00 20 */ blr +/* 8006809C 00064FFC 4E 80 00 20 */ blr .global GetVisorHudLightColor__9CSamusHudFRC6CColorRC13CStateManager GetVisorHudLightColor__9CSamusHudFRC6CColorRC13CStateManager: @@ -4340,7 +4340,7 @@ lbl_800681C4: /* 800681E0 00065140 83 A1 00 34 */ lwz r29, 0x34(r1) /* 800681E4 00065144 7C 08 03 A6 */ mtlr r0 /* 800681E8 00065148 38 21 00 50 */ addi r1, r1, 0x50 -/* 800681EC 0006514C 4E 80 00 20 */ blr +/* 800681EC 0006514C 4E 80 00 20 */ blr .global UpdateHudDynamicLights__9CSamusHudFfRC13CStateManager UpdateHudDynamicLights__9CSamusHudFfRC13CStateManager: @@ -5166,7 +5166,7 @@ lbl_80068DCC: /* 80068E28 00065D88 80 01 04 34 */ lwz r0, 0x434(r1) /* 80068E2C 00065D8C 7C 08 03 A6 */ mtlr r0 /* 80068E30 00065D90 38 21 04 30 */ addi r1, r1, 0x430 -/* 80068E34 00065D94 4E 80 00 20 */ blr +/* 80068E34 00065D94 4E 80 00 20 */ blr .global FindEmptyHudLightSlot__9CSamusHudCFRC6CLight FindEmptyHudLightSlot__9CSamusHudCFRC6CLight: @@ -5175,22 +5175,22 @@ FindEmptyHudLightSlot__9CSamusHudCFRC6CLight: /* 80068E40 00065DA0 FC 01 00 00 */ fcmpu cr0, f1, f0 /* 80068E44 00065DA4 40 82 00 0C */ bne lbl_80068E50 /* 80068E48 00065DA8 38 60 00 00 */ li r3, 0 -/* 80068E4C 00065DAC 4E 80 00 20 */ blr +/* 80068E4C 00065DAC 4E 80 00 20 */ blr lbl_80068E50: /* 80068E50 00065DB0 C0 03 03 80 */ lfs f0, 0x380(r3) /* 80068E54 00065DB4 FC 01 00 00 */ fcmpu cr0, f1, f0 /* 80068E58 00065DB8 40 82 00 0C */ bne lbl_80068E64 /* 80068E5C 00065DBC 38 60 00 01 */ li r3, 1 -/* 80068E60 00065DC0 4E 80 00 20 */ blr +/* 80068E60 00065DC0 4E 80 00 20 */ blr lbl_80068E64: /* 80068E64 00065DC4 C0 03 03 A0 */ lfs f0, 0x3a0(r3) /* 80068E68 00065DC8 FC 01 00 00 */ fcmpu cr0, f1, f0 /* 80068E6C 00065DCC 40 82 00 0C */ bne lbl_80068E78 /* 80068E70 00065DD0 38 60 00 02 */ li r3, 2 -/* 80068E74 00065DD4 4E 80 00 20 */ blr +/* 80068E74 00065DD4 4E 80 00 20 */ blr lbl_80068E78: /* 80068E78 00065DD8 38 60 FF FF */ li r3, -1 -/* 80068E7C 00065DDC 4E 80 00 20 */ blr +/* 80068E7C 00065DDC 4E 80 00 20 */ blr .global IsAreaLightInCachedLights__9CSamusHudCFRC6CLight IsAreaLightInCachedLights__9CSamusHudCFRC6CLight: @@ -5224,12 +5224,12 @@ lbl_80068EE4: /* 80068EE4 00065E44 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 80068EE8 00065E48 41 82 00 0C */ beq lbl_80068EF4 /* 80068EEC 00065E4C 38 60 00 01 */ li r3, 1 -/* 80068EF0 00065E50 4E 80 00 20 */ blr +/* 80068EF0 00065E50 4E 80 00 20 */ blr lbl_80068EF4: /* 80068EF4 00065E54 38 A5 00 20 */ addi r5, r5, 0x20 /* 80068EF8 00065E58 42 00 FF 98 */ bdnz lbl_80068E90 /* 80068EFC 00065E5C 38 60 00 00 */ li r3, 0 -/* 80068F00 00065E60 4E 80 00 20 */ blr +/* 80068F00 00065E60 4E 80 00 20 */ blr .global IsCachedLightInAreaLights__9CSamusHudCFRCQ29CSamusHud15SCachedHudLightRC12CActorLights IsCachedLightInAreaLights__9CSamusHudCFRCQ29CSamusHud15SCachedHudLightRC12CActorLights: @@ -5284,11 +5284,11 @@ lbl_80068FA4: /* 80068FB0 00065F10 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80068FB4 00065F14 7C 08 03 A6 */ mtlr r0 /* 80068FB8 00065F18 38 21 00 20 */ addi r1, r1, 0x20 -/* 80068FBC 00065F1C 4E 80 00 20 */ blr +/* 80068FBC 00065F1C 4E 80 00 20 */ blr .global OnNewInGameGuiState__9CSamusHudF15EInGameGuiStateR13CStateManager OnNewInGameGuiState__9CSamusHudF15EInGameGuiStateR13CStateManager: -/* 80068FC0 00065F20 4E 80 00 20 */ blr +/* 80068FC0 00065F20 4E 80 00 20 */ blr .global UpdateBallMode__9CSamusHudFRC13CStateManagerb UpdateBallMode__9CSamusHudFRC13CStateManagerb: @@ -5347,7 +5347,7 @@ lbl_80069080: /* 80069084 00065FE4 80 01 00 34 */ lwz r0, 0x34(r1) /* 80069088 00065FE8 7C 08 03 A6 */ mtlr r0 /* 8006908C 00065FEC 38 21 00 30 */ addi r1, r1, 0x30 -/* 80069090 00065FF0 4E 80 00 20 */ blr +/* 80069090 00065FF0 4E 80 00 20 */ blr .global UpdateMissile__9CSamusHudFfRC13CStateManagerb UpdateMissile__9CSamusHudFfRC13CStateManagerb: @@ -5431,7 +5431,7 @@ lbl_800691A4: /* 800691A8 00066108 80 01 00 34 */ lwz r0, 0x34(r1) /* 800691AC 0006610C 7C 08 03 A6 */ mtlr r0 /* 800691B0 00066110 38 21 00 30 */ addi r1, r1, 0x30 -/* 800691B4 00066114 4E 80 00 20 */ blr +/* 800691B4 00066114 4E 80 00 20 */ blr .global UpdateEnergy__9CSamusHudFfRC13CStateManagerb UpdateEnergy__9CSamusHudFfRC13CStateManagerb: @@ -5563,7 +5563,7 @@ lbl_80069344: /* 80069384 000662E4 7F C4 F3 78 */ mr r4, r30 /* 80069388 000662E8 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8006938C 000662EC 7D 89 03 A6 */ mtctr r12 -/* 80069390 000662F0 4E 80 04 21 */ bctrl +/* 80069390 000662F0 4E 80 04 21 */ bctrl /* 80069394 000662F4 28 03 00 00 */ cmplwi r3, 0 /* 80069398 000662F8 41 82 00 64 */ beq lbl_800693FC /* 8006939C 000662FC C0 23 00 00 */ lfs f1, 0(r3) @@ -5631,7 +5631,7 @@ lbl_80069460: /* 80069488 000663E8 83 81 00 60 */ lwz r28, 0x60(r1) /* 8006948C 000663EC 7C 08 03 A6 */ mtlr r0 /* 80069490 000663F0 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 80069494 000663F4 4E 80 00 20 */ blr +/* 80069494 000663F4 4E 80 00 20 */ blr .global UpdateStaticSfx__9CSamusHudFR10CSfxHandleRfUsfff UpdateStaticSfx__9CSamusHudFR10CSfxHandleRfUsfff: @@ -5713,7 +5713,7 @@ lbl_800695A0: /* 800695A4 00066504 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 800695A8 00066508 7C 08 03 A6 */ mtlr r0 /* 800695AC 0006650C 38 21 00 20 */ addi r1, r1, 0x20 -/* 800695B0 00066510 4E 80 00 20 */ blr +/* 800695B0 00066510 4E 80 00 20 */ blr .global UpdateStaticInterference__9CSamusHudFfRC13CStateManager UpdateStaticInterference__9CSamusHudFfRC13CStateManager: @@ -5814,7 +5814,7 @@ lbl_800696F0: /* 8006970C 0006666C 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 80069710 00066670 7C 08 03 A6 */ mtlr r0 /* 80069714 00066674 38 21 00 60 */ addi r1, r1, 0x60 -/* 80069718 00066678 4E 80 00 20 */ blr +/* 80069718 00066678 4E 80 00 20 */ blr .global UpdateVideoBands__9CSamusHudFfRC13CStateManager UpdateVideoBands__9CSamusHudFfRC13CStateManager: @@ -5841,7 +5841,7 @@ lbl_8006974C: /* 80069764 000666C4 83 C1 00 08 */ lwz r30, 8(r1) /* 80069768 000666C8 7C 08 03 A6 */ mtlr r0 /* 8006976C 000666CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80069770 000666D0 4E 80 00 20 */ blr +/* 80069770 000666D0 4E 80 00 20 */ blr .global UpdateFreeLook__9CSamusHudFfRC13CStateManager UpdateFreeLook__9CSamusHudFfRC13CStateManager: @@ -6091,7 +6091,7 @@ lbl_80069AC0: /* 80069AF4 00066A54 7C C0 03 78 */ or r0, r6, r0 /* 80069AF8 00066A58 54 06 0F FE */ srwi r6, r0, 0x1f /* 80069AFC 00066A5C 7D 89 03 A6 */ mtctr r12 -/* 80069B00 00066A60 4E 80 04 21 */ bctrl +/* 80069B00 00066A60 4E 80 04 21 */ bctrl lbl_80069B04: /* 80069B04 00066A64 80 1B 05 64 */ lwz r0, 0x564(r27) /* 80069B08 00066A68 28 00 00 00 */ cmplwi r0, 0 @@ -6123,7 +6123,7 @@ lbl_80069B5C: /* 80069B68 00066AC8 80 01 00 D4 */ lwz r0, 0xd4(r1) /* 80069B6C 00066ACC 7C 08 03 A6 */ mtlr r0 /* 80069B70 00066AD0 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 80069B74 00066AD4 4E 80 00 20 */ blr +/* 80069B74 00066AD4 4E 80 00 20 */ blr .global UpdateVisorAndBeamMenus__9CSamusHudFfRC13CStateManager UpdateVisorAndBeamMenus__9CSamusHudFfRC13CStateManager: @@ -6242,7 +6242,7 @@ lbl_80069CFC: /* 80069D10 00066C70 80 01 00 64 */ lwz r0, 0x64(r1) /* 80069D14 00066C74 7C 08 03 A6 */ mtlr r0 /* 80069D18 00066C78 38 21 00 60 */ addi r1, r1, 0x60 -/* 80069D1C 00066C7C 4E 80 00 20 */ blr +/* 80069D1C 00066C7C 4E 80 00 20 */ blr .global CheckLoadComplete__9CSamusHudFRC13CStateManager CheckLoadComplete__9CSamusHudFRC13CStateManager: @@ -6316,7 +6316,7 @@ lbl_80069DFC: /* 80069E04 00066D64 83 C1 00 08 */ lwz r30, 8(r1) /* 80069E08 00066D68 7C 08 03 A6 */ mtlr r0 /* 80069E0C 00066D6C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80069E10 00066D70 4E 80 00 20 */ blr +/* 80069E10 00066D70 4E 80 00 20 */ blr .global __dt__9CSamusHudFv __dt__9CSamusHudFv: @@ -6721,7 +6721,7 @@ lbl_8006A33C: /* 8006A354 000672B4 38 80 00 01 */ li r4, 1 /* 8006A358 000672B8 81 8C 00 40 */ lwz r12, 0x40(r12) /* 8006A35C 000672BC 7D 89 03 A6 */ mtctr r12 -/* 8006A360 000672C0 4E 80 04 21 */ bctrl +/* 8006A360 000672C0 4E 80 04 21 */ bctrl lbl_8006A364: /* 8006A364 000672C4 34 1E 02 98 */ addic. r0, r30, 0x298 /* 8006A368 000672C8 41 82 00 24 */ beq lbl_8006A38C @@ -6732,7 +6732,7 @@ lbl_8006A364: /* 8006A37C 000672DC 38 80 00 01 */ li r4, 1 /* 8006A380 000672E0 81 8C 00 18 */ lwz r12, 0x18(r12) /* 8006A384 000672E4 7D 89 03 A6 */ mtctr r12 -/* 8006A388 000672E8 4E 80 04 21 */ bctrl +/* 8006A388 000672E8 4E 80 04 21 */ bctrl lbl_8006A38C: /* 8006A38C 000672EC 34 1E 02 94 */ addic. r0, r30, 0x294 /* 8006A390 000672F0 41 82 00 0C */ beq lbl_8006A39C @@ -6748,7 +6748,7 @@ lbl_8006A39C: /* 8006A3B4 00067314 38 80 00 01 */ li r4, 1 /* 8006A3B8 00067318 81 8C 00 18 */ lwz r12, 0x18(r12) /* 8006A3BC 0006731C 7D 89 03 A6 */ mtctr r12 -/* 8006A3C0 00067320 4E 80 04 21 */ bctrl +/* 8006A3C0 00067320 4E 80 04 21 */ bctrl lbl_8006A3C4: /* 8006A3C4 00067324 34 1E 02 8C */ addic. r0, r30, 0x28c /* 8006A3C8 00067328 41 82 00 0C */ beq lbl_8006A3D4 @@ -6801,7 +6801,7 @@ lbl_8006A45C: /* 8006A46C 000673CC 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8006A470 000673D0 7C 08 03 A6 */ mtlr r0 /* 8006A474 000673D4 38 21 00 30 */ addi r1, r1, 0x30 -/* 8006A478 000673D8 4E 80 00 20 */ blr +/* 8006A478 000673D8 4E 80 00 20 */ blr .global sub_8006a47c sub_8006a47c: @@ -6836,7 +6836,7 @@ lbl_8006A4D8: /* 8006A4E4 00067444 83 C1 00 08 */ lwz r30, 8(r1) /* 8006A4E8 00067448 7C 08 03 A6 */ mtlr r0 /* 8006A4EC 0006744C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8006A4F0 00067450 4E 80 00 20 */ blr +/* 8006A4F0 00067450 4E 80 00 20 */ blr .global sub_8006a4f4 sub_8006a4f4: @@ -6968,7 +6968,7 @@ lbl_8006A6A4: /* 8006A6B0 00067610 83 C1 00 08 */ lwz r30, 8(r1) /* 8006A6B4 00067614 7C 08 03 A6 */ mtlr r0 /* 8006A6B8 00067618 38 21 00 10 */ addi r1, r1, 0x10 -/* 8006A6BC 0006761C 4E 80 00 20 */ blr +/* 8006A6BC 0006761C 4E 80 00 20 */ blr .global sub_8006a6c0 sub_8006a6c0: @@ -7022,7 +7022,7 @@ lbl_8006A754: /* 8006A768 000676C8 83 81 00 20 */ lwz r28, 0x20(r1) /* 8006A76C 000676CC 7C 08 03 A6 */ mtlr r0 /* 8006A770 000676D0 38 21 00 30 */ addi r1, r1, 0x30 -/* 8006A774 000676D4 4E 80 00 20 */ blr +/* 8006A774 000676D4 4E 80 00 20 */ blr .global __dt__19IHudThreatInterfaceFv __dt__19IHudThreatInterfaceFv: @@ -7044,7 +7044,7 @@ lbl_8006A7A8: /* 8006A7B0 00067710 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8006A7B4 00067714 7C 08 03 A6 */ mtlr r0 /* 8006A7B8 00067718 38 21 00 10 */ addi r1, r1, 0x10 -/* 8006A7BC 0006771C 4E 80 00 20 */ blr +/* 8006A7BC 0006771C 4E 80 00 20 */ blr .global __dt__21IHudFreeLookInterfaceFv __dt__21IHudFreeLookInterfaceFv: @@ -7066,7 +7066,7 @@ lbl_8006A7F0: /* 8006A7F8 00067758 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8006A7FC 0006775C 7C 08 03 A6 */ mtlr r0 /* 8006A800 00067760 38 21 00 10 */ addi r1, r1, 0x10 -/* 8006A804 00067764 4E 80 00 20 */ blr +/* 8006A804 00067764 4E 80 00 20 */ blr .global __dt__17IHudDecoInterfaceFv __dt__17IHudDecoInterfaceFv: @@ -7088,7 +7088,7 @@ lbl_8006A838: /* 8006A840 000677A0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8006A844 000677A4 7C 08 03 A6 */ mtlr r0 /* 8006A848 000677A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8006A84C 000677AC 4E 80 00 20 */ blr +/* 8006A84C 000677AC 4E 80 00 20 */ blr .global UpdateEnergyLow__9CSamusHudFfRC13CStateManager UpdateEnergyLow__9CSamusHudFfRC13CStateManager: @@ -7157,7 +7157,7 @@ lbl_8006A924: /* 8006A93C 0006789C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8006A940 000678A0 7C 08 03 A6 */ mtlr r0 /* 8006A944 000678A4 38 21 00 40 */ addi r1, r1, 0x40 -/* 8006A948 000678A8 4E 80 00 20 */ blr +/* 8006A948 000678A8 4E 80 00 20 */ blr .global __ct__9CSamusHudFRC13CStateManager __ct__9CSamusHudFRC13CStateManager: @@ -7181,7 +7181,7 @@ __ct__9CSamusHudFRC13CStateManager: /* 8006A990 000678F0 38 61 00 20 */ addi r3, r1, 0x20 /* 8006A994 000678F4 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8006A998 000678F8 7D 89 03 A6 */ mtctr r12 -/* 8006A99C 000678FC 4E 80 04 21 */ bctrl +/* 8006A99C 000678FC 4E 80 04 21 */ bctrl /* 8006A9A0 00067900 3B 5F 02 58 */ addi r26, r31, 0x258 /* 8006A9A4 00067904 38 81 00 20 */ addi r4, r1, 0x20 /* 8006A9A8 00067908 7F 43 D3 78 */ mr r3, r26 @@ -7202,7 +7202,7 @@ __ct__9CSamusHudFRC13CStateManager: /* 8006A9E4 00067944 81 84 00 00 */ lwz r12, 0(r4) /* 8006A9E8 00067948 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8006A9EC 0006794C 7D 89 03 A6 */ mtctr r12 -/* 8006A9F0 00067950 4E 80 04 21 */ bctrl +/* 8006A9F0 00067950 4E 80 04 21 */ bctrl /* 8006A9F4 00067954 3B 5F 02 68 */ addi r26, r31, 0x268 /* 8006A9F8 00067958 38 81 00 18 */ addi r4, r1, 0x18 /* 8006A9FC 0006795C 7F 43 D3 78 */ mr r3, r26 @@ -8069,7 +8069,7 @@ lbl_8006B654: /* 8006B6A4 00068604 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 8006B6A8 00068608 7C 08 03 A6 */ mtlr r0 /* 8006B6AC 0006860C 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8006B6B0 00068610 4E 80 00 20 */ blr +/* 8006B6B0 00068610 4E 80 00 20 */ blr .global UpdateThreatAssessment__9CSamusHudFfRC13CStateManager UpdateThreatAssessment__9CSamusHudFfRC13CStateManager: @@ -8125,7 +8125,7 @@ UpdateThreatAssessment__9CSamusHudFfRC13CStateManager: /* 8006B778 000686D8 90 C1 00 80 */ stw r6, 0x80(r1) /* 8006B77C 000686DC 81 8C 00 40 */ lwz r12, 0x40(r12) /* 8006B780 000686E0 7D 89 03 A6 */ mtctr r12 -/* 8006B784 000686E4 4E 80 04 21 */ bctrl +/* 8006B784 000686E4 4E 80 04 21 */ bctrl /* 8006B788 000686E8 88 01 00 68 */ lbz r0, 0x68(r1) /* 8006B78C 000686EC 28 00 00 00 */ cmplwi r0, 0 /* 8006B790 000686F0 98 01 00 EC */ stb r0, 0xec(r1) @@ -8234,7 +8234,7 @@ lbl_8006B8D4: /* 8006B920 00068880 38 61 00 34 */ addi r3, r1, 0x34 /* 8006B924 00068884 81 8C 00 40 */ lwz r12, 0x40(r12) /* 8006B928 00068888 7D 89 03 A6 */ mtctr r12 -/* 8006B92C 0006888C 4E 80 04 21 */ bctrl +/* 8006B92C 0006888C 4E 80 04 21 */ bctrl /* 8006B930 00068890 88 01 00 4C */ lbz r0, 0x4c(r1) /* 8006B934 00068894 28 00 00 00 */ cmplwi r0, 0 /* 8006B938 00068898 98 01 00 B8 */ stb r0, 0xb8(r1) @@ -8324,7 +8324,7 @@ lbl_8006BA58: /* 8006BA68 000689C8 C0 21 00 10 */ lfs f1, 0x10(r1) /* 8006BA6C 000689CC 81 8C 00 08 */ lwz r12, 8(r12) /* 8006BA70 000689D0 7D 89 03 A6 */ mtctr r12 -/* 8006BA74 000689D4 4E 80 04 21 */ bctrl +/* 8006BA74 000689D4 4E 80 04 21 */ bctrl lbl_8006BA78: /* 8006BA78 000689D8 80 A1 01 20 */ lwz r5, 0x120(r1) /* 8006BA7C 000689DC 38 60 00 00 */ li r3, 0 @@ -8367,7 +8367,7 @@ lbl_8006BAC4: /* 8006BB00 00068A60 83 81 09 30 */ lwz r28, 0x930(r1) /* 8006BB04 00068A64 7C 08 03 A6 */ mtlr r0 /* 8006BB08 00068A68 38 21 09 80 */ addi r1, r1, 0x980 -/* 8006BB0C 00068A6C 4E 80 00 20 */ blr +/* 8006BB0C 00068A6C 4E 80 00 20 */ blr .global _DeferHintMemo__9CSamusHudFUiUiRC12SHudMemoInfo _DeferHintMemo__9CSamusHudFUiUiRC12SHudMemoInfo: @@ -8405,7 +8405,7 @@ _DeferHintMemo__9CSamusHudFUiUiRC12SHudMemoInfo: /* 8006BB8C 00068AEC 81 84 00 00 */ lwz r12, 0(r4) /* 8006BB90 00068AF0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8006BB94 00068AF4 7D 89 03 A6 */ mtctr r12 -/* 8006BB98 00068AF8 4E 80 04 21 */ bctrl +/* 8006BB98 00068AF8 4E 80 04 21 */ bctrl /* 8006BB9C 00068AFC 7F E3 FB 78 */ mr r3, r31 /* 8006BBA0 00068B00 38 81 00 08 */ addi r4, r1, 8 /* 8006BBA4 00068B04 3B 60 00 01 */ li r27, 1 @@ -8434,7 +8434,7 @@ lbl_8006BBE4: /* 8006BBF4 00068B54 80 01 00 34 */ lwz r0, 0x34(r1) /* 8006BBF8 00068B58 7C 08 03 A6 */ mtlr r0 /* 8006BBFC 00068B5C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8006BC00 00068B60 4E 80 00 20 */ blr +/* 8006BC00 00068B60 4E 80 00 20 */ blr .global "InternalDisplayHudMemo__9CSamusHudFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC13CHUDMemoParms" "InternalDisplayHudMemo__9CSamusHudFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC13CHUDMemoParms": @@ -8445,7 +8445,7 @@ lbl_8006BBE4: /* 8006BC14 00068B74 80 01 00 14 */ lwz r0, 0x14(r1) /* 8006BC18 00068B78 7C 08 03 A6 */ mtlr r0 /* 8006BC1C 00068B7C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8006BC20 00068B80 4E 80 00 20 */ blr +/* 8006BC20 00068B80 4E 80 00 20 */ blr .global DeferHintMemo__9CSamusHudFUiUiRC12SHudMemoInfo DeferHintMemo__9CSamusHudFUiUiRC12SHudMemoInfo: @@ -8466,7 +8466,7 @@ lbl_8006BC58: /* 8006BC58 00068BB8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8006BC5C 00068BBC 7C 08 03 A6 */ mtlr r0 /* 8006BC60 00068BC0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8006BC64 00068BC4 4E 80 00 20 */ blr +/* 8006BC64 00068BC4 4E 80 00 20 */ blr .global DisplayHudMemo__9CSamusHudFRC7wstringRC12SHudMemoInfo DisplayHudMemo__9CSamusHudFRC7wstringRC12SHudMemoInfo: @@ -8485,7 +8485,7 @@ lbl_8006BC94: /* 8006BC94 00068BF4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8006BC98 00068BF8 7C 08 03 A6 */ mtlr r0 /* 8006BC9C 00068BFC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8006BCA0 00068C00 4E 80 00 20 */ blr +/* 8006BCA0 00068C00 4E 80 00 20 */ blr .global UninitializeFrameGlueMutable__9CSamusHudFv UninitializeFrameGlueMutable__9CSamusHudFv: @@ -8509,7 +8509,7 @@ UninitializeFrameGlueMutable__9CSamusHudFv: /* 8006BCE8 00068C48 38 80 00 01 */ li r4, 1 /* 8006BCEC 00068C4C 81 8C 00 40 */ lwz r12, 0x40(r12) /* 8006BCF0 00068C50 7D 89 03 A6 */ mtctr r12 -/* 8006BCF4 00068C54 4E 80 04 21 */ bctrl +/* 8006BCF4 00068C54 4E 80 04 21 */ bctrl lbl_8006BCF8: /* 8006BCF8 00068C58 38 00 00 00 */ li r0, 0 /* 8006BCFC 00068C5C 90 1F 02 9C */ stw r0, 0x29c(r31) @@ -8520,7 +8520,7 @@ lbl_8006BCF8: /* 8006BD10 00068C70 38 80 00 01 */ li r4, 1 /* 8006BD14 00068C74 81 8C 00 18 */ lwz r12, 0x18(r12) /* 8006BD18 00068C78 7D 89 03 A6 */ mtctr r12 -/* 8006BD1C 00068C7C 4E 80 04 21 */ bctrl +/* 8006BD1C 00068C7C 4E 80 04 21 */ bctrl lbl_8006BD20: /* 8006BD20 00068C80 38 00 00 00 */ li r0, 0 /* 8006BD24 00068C84 90 1F 02 90 */ stw r0, 0x290(r31) @@ -8535,7 +8535,7 @@ lbl_8006BD20: /* 8006BD48 00068CA8 38 80 00 01 */ li r4, 1 /* 8006BD4C 00068CAC 81 8C 00 18 */ lwz r12, 0x18(r12) /* 8006BD50 00068CB0 7D 89 03 A6 */ mtctr r12 -/* 8006BD54 00068CB4 4E 80 04 21 */ bctrl +/* 8006BD54 00068CB4 4E 80 04 21 */ bctrl lbl_8006BD58: /* 8006BD58 00068CB8 38 80 00 00 */ li r4, 0 /* 8006BD5C 00068CBC 90 9F 02 98 */ stw r4, 0x298(r31) @@ -8606,7 +8606,7 @@ lbl_8006BE24: /* 8006BE34 00068D94 80 01 00 14 */ lwz r0, 0x14(r1) /* 8006BE38 00068D98 7C 08 03 A6 */ mtlr r0 /* 8006BE3C 00068D9C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8006BE40 00068DA0 4E 80 00 20 */ blr +/* 8006BE40 00068DA0 4E 80 00 20 */ blr .global InitializeFrameGlueMutable__9CSamusHudFRC13CStateManager InitializeFrameGlueMutable__9CSamusHudFRC13CStateManager: @@ -8727,7 +8727,7 @@ lbl_8006BFE0: /* 8006BFF0 00068F50 38 80 00 01 */ li r4, 1 /* 8006BFF4 00068F54 81 8C 00 18 */ lwz r12, 0x18(r12) /* 8006BFF8 00068F58 7D 89 03 A6 */ mtctr r12 -/* 8006BFFC 00068F5C 4E 80 04 21 */ bctrl +/* 8006BFFC 00068F5C 4E 80 04 21 */ bctrl lbl_8006C000: /* 8006C000 00068F60 93 5F 02 90 */ stw r26, 0x290(r31) /* 8006C004 00068F64 48 00 00 18 */ b lbl_8006C01C @@ -8736,7 +8736,7 @@ lbl_8006C008: /* 8006C00C 00068F6C 38 80 00 01 */ li r4, 1 /* 8006C010 00068F70 81 8C 00 14 */ lwz r12, 0x14(r12) /* 8006C014 00068F74 7D 89 03 A6 */ mtctr r12 -/* 8006C018 00068F78 4E 80 04 21 */ bctrl +/* 8006C018 00068F78 4E 80 04 21 */ bctrl lbl_8006C01C: /* 8006C01C 00068F7C 80 7F 02 94 */ lwz r3, 0x294(r31) /* 8006C020 00068F80 28 03 00 00 */ cmplwi r3, 0 @@ -8795,7 +8795,7 @@ lbl_8006C0D4: /* 8006C0E4 00069044 38 80 00 01 */ li r4, 1 /* 8006C0E8 00069048 81 8C 00 18 */ lwz r12, 0x18(r12) /* 8006C0EC 0006904C 7D 89 03 A6 */ mtctr r12 -/* 8006C0F0 00069050 4E 80 04 21 */ bctrl +/* 8006C0F0 00069050 4E 80 04 21 */ bctrl lbl_8006C0F4: /* 8006C0F4 00069054 93 5F 02 98 */ stw r26, 0x298(r31) /* 8006C0F8 00069058 48 00 00 18 */ b lbl_8006C110 @@ -8804,7 +8804,7 @@ lbl_8006C0FC: /* 8006C100 00069060 38 80 00 01 */ li r4, 1 /* 8006C104 00069064 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8006C108 00069068 7D 89 03 A6 */ mtctr r12 -/* 8006C10C 0006906C 4E 80 04 21 */ bctrl +/* 8006C10C 0006906C 4E 80 04 21 */ bctrl lbl_8006C110: /* 8006C110 00069070 80 7F 02 9C */ lwz r3, 0x29c(r31) /* 8006C114 00069074 28 03 00 00 */ cmplwi r3, 0 @@ -8828,7 +8828,7 @@ lbl_8006C148: /* 8006C158 000690B8 38 80 00 01 */ li r4, 1 /* 8006C15C 000690BC 81 8C 00 40 */ lwz r12, 0x40(r12) /* 8006C160 000690C0 7D 89 03 A6 */ mtctr r12 -/* 8006C164 000690C4 4E 80 04 21 */ bctrl +/* 8006C164 000690C4 4E 80 04 21 */ bctrl lbl_8006C168: /* 8006C168 000690C8 93 5F 02 9C */ stw r26, 0x29c(r31) /* 8006C16C 000690CC 48 00 00 18 */ b lbl_8006C184 @@ -8837,7 +8837,7 @@ lbl_8006C170: /* 8006C174 000690D4 38 80 00 01 */ li r4, 1 /* 8006C178 000690D8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8006C17C 000690DC 7D 89 03 A6 */ mtctr r12 -/* 8006C180 000690E0 4E 80 04 21 */ bctrl +/* 8006C180 000690E0 4E 80 04 21 */ bctrl lbl_8006C184: /* 8006C184 000690E4 80 7F 02 AC */ lwz r3, 0x2ac(r31) /* 8006C188 000690E8 38 80 00 01 */ li r4, 1 @@ -9002,7 +9002,7 @@ lbl_8006C3A4: /* 8006C3C0 00069320 38 80 00 01 */ li r4, 1 /* 8006C3C4 00069324 81 8C 00 18 */ lwz r12, 0x18(r12) /* 8006C3C8 00069328 7D 89 03 A6 */ mtctr r12 -/* 8006C3CC 0006932C 4E 80 04 21 */ bctrl +/* 8006C3CC 0006932C 4E 80 04 21 */ bctrl lbl_8006C3D0: /* 8006C3D0 00069330 38 00 00 00 */ li r0, 0 /* 8006C3D4 00069334 90 1F 02 90 */ stw r0, 0x290(r31) @@ -9017,7 +9017,7 @@ lbl_8006C3D0: /* 8006C3F8 00069358 38 80 00 01 */ li r4, 1 /* 8006C3FC 0006935C 81 8C 00 18 */ lwz r12, 0x18(r12) /* 8006C400 00069360 7D 89 03 A6 */ mtctr r12 -/* 8006C404 00069364 4E 80 04 21 */ bctrl +/* 8006C404 00069364 4E 80 04 21 */ bctrl lbl_8006C408: /* 8006C408 00069368 38 00 00 00 */ li r0, 0 /* 8006C40C 0006936C 90 1F 02 98 */ stw r0, 0x298(r31) @@ -9028,7 +9028,7 @@ lbl_8006C408: /* 8006C420 00069380 38 80 00 01 */ li r4, 1 /* 8006C424 00069384 81 8C 00 40 */ lwz r12, 0x40(r12) /* 8006C428 00069388 7D 89 03 A6 */ mtctr r12 -/* 8006C42C 0006938C 4E 80 04 21 */ bctrl +/* 8006C42C 0006938C 4E 80 04 21 */ bctrl lbl_8006C430: /* 8006C430 00069390 38 00 00 00 */ li r0, 0 /* 8006C434 00069394 38 80 00 00 */ li r4, 0 @@ -9081,7 +9081,7 @@ lbl_8006C4CC: /* 8006C4E8 00069448 38 80 00 01 */ li r4, 1 /* 8006C4EC 0006944C 81 8C 00 18 */ lwz r12, 0x18(r12) /* 8006C4F0 00069450 7D 89 03 A6 */ mtctr r12 -/* 8006C4F4 00069454 4E 80 04 21 */ bctrl +/* 8006C4F4 00069454 4E 80 04 21 */ bctrl lbl_8006C4F8: /* 8006C4F8 00069458 38 00 00 00 */ li r0, 0 /* 8006C4FC 0006945C 90 1F 02 90 */ stw r0, 0x290(r31) @@ -9113,7 +9113,7 @@ lbl_8006C550: /* 8006C560 000694C0 38 80 00 01 */ li r4, 1 /* 8006C564 000694C4 81 8C 00 18 */ lwz r12, 0x18(r12) /* 8006C568 000694C8 7D 89 03 A6 */ mtctr r12 -/* 8006C56C 000694CC 4E 80 04 21 */ bctrl +/* 8006C56C 000694CC 4E 80 04 21 */ bctrl lbl_8006C570: /* 8006C570 000694D0 3C 60 80 3D */ lis r3, lbl_803CD0C0@ha /* 8006C574 000694D4 93 1F 02 98 */ stw r24, 0x298(r31) @@ -9135,7 +9135,7 @@ lbl_8006C5A0: /* 8006C5B0 00069510 38 80 00 01 */ li r4, 1 /* 8006C5B4 00069514 81 8C 00 40 */ lwz r12, 0x40(r12) /* 8006C5B8 00069518 7D 89 03 A6 */ mtctr r12 -/* 8006C5BC 0006951C 4E 80 04 21 */ bctrl +/* 8006C5BC 0006951C 4E 80 04 21 */ bctrl lbl_8006C5C0: /* 8006C5C0 00069520 93 1F 02 9C */ stw r24, 0x29c(r31) /* 8006C5C4 00069524 7F E3 FB 78 */ mr r3, r31 @@ -9204,7 +9204,7 @@ lbl_8006C6A0: /* 8006C6B0 00069610 38 80 00 01 */ li r4, 1 /* 8006C6B4 00069614 81 8C 00 18 */ lwz r12, 0x18(r12) /* 8006C6B8 00069618 7D 89 03 A6 */ mtctr r12 -/* 8006C6BC 0006961C 4E 80 04 21 */ bctrl +/* 8006C6BC 0006961C 4E 80 04 21 */ bctrl lbl_8006C6C0: /* 8006C6C0 00069620 3C 60 80 3D */ lis r3, lbl_803CD0C0@ha /* 8006C6C4 00069624 93 1F 02 90 */ stw r24, 0x290(r31) @@ -9251,7 +9251,7 @@ lbl_8006C750: /* 8006C760 000696C0 38 80 00 01 */ li r4, 1 /* 8006C764 000696C4 81 8C 00 18 */ lwz r12, 0x18(r12) /* 8006C768 000696C8 7D 89 03 A6 */ mtctr r12 -/* 8006C76C 000696CC 4E 80 04 21 */ bctrl +/* 8006C76C 000696CC 4E 80 04 21 */ bctrl lbl_8006C770: /* 8006C770 000696D0 3C 60 80 3D */ lis r3, lbl_803CD0C0@ha /* 8006C774 000696D4 93 1F 02 98 */ stw r24, 0x298(r31) @@ -9273,7 +9273,7 @@ lbl_8006C7A0: /* 8006C7B0 00069710 38 80 00 01 */ li r4, 1 /* 8006C7B4 00069714 81 8C 00 40 */ lwz r12, 0x40(r12) /* 8006C7B8 00069718 7D 89 03 A6 */ mtctr r12 -/* 8006C7BC 0006971C 4E 80 04 21 */ bctrl +/* 8006C7BC 0006971C 4E 80 04 21 */ bctrl lbl_8006C7C0: /* 8006C7C0 00069720 93 1F 02 9C */ stw r24, 0x29c(r31) /* 8006C7C4 00069724 7F E3 FB 78 */ mr r3, r31 @@ -9348,7 +9348,7 @@ lbl_8006C8B8: /* 8006C8C8 00069828 38 80 00 01 */ li r4, 1 /* 8006C8CC 0006982C 81 8C 00 18 */ lwz r12, 0x18(r12) /* 8006C8D0 00069830 7D 89 03 A6 */ mtctr r12 -/* 8006C8D4 00069834 4E 80 04 21 */ bctrl +/* 8006C8D4 00069834 4E 80 04 21 */ bctrl lbl_8006C8D8: /* 8006C8D8 00069838 3C 60 80 3D */ lis r3, lbl_803CD0C0@ha /* 8006C8DC 0006983C 93 1F 02 90 */ stw r24, 0x290(r31) @@ -9396,7 +9396,7 @@ lbl_8006C96C: /* 8006C97C 000698DC 38 80 00 01 */ li r4, 1 /* 8006C980 000698E0 81 8C 00 18 */ lwz r12, 0x18(r12) /* 8006C984 000698E4 7D 89 03 A6 */ mtctr r12 -/* 8006C988 000698E8 4E 80 04 21 */ bctrl +/* 8006C988 000698E8 4E 80 04 21 */ bctrl lbl_8006C98C: /* 8006C98C 000698EC 3C 60 80 3D */ lis r3, lbl_803CD0C0@ha /* 8006C990 000698F0 93 1F 02 98 */ stw r24, 0x298(r31) @@ -9418,7 +9418,7 @@ lbl_8006C9BC: /* 8006C9CC 0006992C 38 80 00 01 */ li r4, 1 /* 8006C9D0 00069930 81 8C 00 40 */ lwz r12, 0x40(r12) /* 8006C9D4 00069934 7D 89 03 A6 */ mtctr r12 -/* 8006C9D8 00069938 4E 80 04 21 */ bctrl +/* 8006C9D8 00069938 4E 80 04 21 */ bctrl lbl_8006C9DC: /* 8006C9DC 0006993C 93 1F 02 9C */ stw r24, 0x29c(r31) /* 8006C9E0 00069940 7F E3 FB 78 */ mr r3, r31 @@ -9447,7 +9447,7 @@ lbl_8006CA20: /* 8006CA34 00069994 80 01 00 64 */ lwz r0, 0x64(r1) /* 8006CA38 00069998 7C 08 03 A6 */ mtlr r0 /* 8006CA3C 0006999C 38 21 00 60 */ addi r1, r1, 0x60 -/* 8006CA40 000699A0 4E 80 00 20 */ blr +/* 8006CA40 000699A0 4E 80 00 20 */ blr .global InitializeDamageLight__9CSamusHudFv InitializeDamageLight__9CSamusHudFv: @@ -9985,7 +9985,7 @@ lbl_8006D1D4: /* 8006D20C 0006A16C 83 A1 06 84 */ lwz r29, 0x684(r1) /* 8006D210 0006A170 7C 08 03 A6 */ mtlr r0 /* 8006D214 0006A174 38 21 06 D0 */ addi r1, r1, 0x6d0 -/* 8006D218 0006A178 4E 80 00 20 */ blr +/* 8006D218 0006A178 4E 80 00 20 */ blr .global RefreshHudOptions__9CSamusHudFv RefreshHudOptions__9CSamusHudFv: @@ -10000,7 +10000,7 @@ RefreshHudOptions__9CSamusHudFv: /* 8006D23C 0006A19C 81 83 00 00 */ lwz r12, 0(r3) /* 8006D240 0006A1A0 81 8C 00 38 */ lwz r12, 0x38(r12) /* 8006D244 0006A1A4 7D 89 03 A6 */ mtctr r12 -/* 8006D248 0006A1A8 4E 80 04 21 */ bctrl +/* 8006D248 0006A1A8 4E 80 04 21 */ bctrl lbl_8006D24C: /* 8006D24C 0006A1AC 80 7F 02 A0 */ lwz r3, 0x2a0(r31) /* 8006D250 0006A1B0 28 03 00 00 */ cmplwi r3, 0 @@ -10011,7 +10011,7 @@ lbl_8006D25C: /* 8006D260 0006A1C0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8006D264 0006A1C4 7C 08 03 A6 */ mtlr r0 /* 8006D268 0006A1C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8006D26C 0006A1CC 4E 80 00 20 */ blr +/* 8006D26C 0006A1CC 4E 80 00 20 */ blr .global InitializeFrameGluePermanent__9CSamusHudFRC13CStateManager InitializeFrameGluePermanent__9CSamusHudFRC13CStateManager: @@ -10222,7 +10222,7 @@ lbl_8006D3FC: /* 8006D590 0006A4F0 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 8006D594 0006A4F4 7C 08 03 A6 */ mtlr r0 /* 8006D598 0006A4F8 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 8006D59C 0006A4FC 4E 80 00 20 */ blr +/* 8006D59C 0006A4FC 4E 80 00 20 */ blr .global BuildFinalCameraTransform__9CSamusHudFRC11CQuaternionRC9CVector3fRC9CVector3f BuildFinalCameraTransform__9CSamusHudFRC11CQuaternionRC9CVector3fRC9CVector3f: @@ -10313,7 +10313,7 @@ BuildFinalCameraTransform__9CSamusHudFRC11CQuaternionRC9CVector3fRC9CVector3f: /* 8006D6F0 0006A650 83 A1 00 84 */ lwz r29, 0x84(r1) /* 8006D6F4 0006A654 7C 08 03 A6 */ mtlr r0 /* 8006D6F8 0006A658 38 21 00 90 */ addi r1, r1, 0x90 -/* 8006D6FC 0006A65C 4E 80 00 20 */ blr +/* 8006D6FC 0006A65C 4E 80 00 20 */ blr .global "reserve__Q24rstl49vector<12CTransform4f,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl49vector<12CTransform4f,Q24rstl17rmemory_allocator>Fi": @@ -10383,7 +10383,7 @@ lbl_8006D7D4: /* 8006D7D8 0006A738 80 01 00 34 */ lwz r0, 0x34(r1) /* 8006D7DC 0006A73C 7C 08 03 A6 */ mtlr r0 /* 8006D7E0 0006A740 38 21 00 30 */ addi r1, r1, 0x30 -/* 8006D7E4 0006A744 4E 80 00 20 */ blr +/* 8006D7E4 0006A744 4E 80 00 20 */ blr .global __sinit_CSamusHud_cpp __sinit_CSamusHud_cpp: @@ -10395,4 +10395,4 @@ __sinit_CSamusHud_cpp: /* 8006D7FC 0006A75C C0 04 00 08 */ lfs f0, 8(r4) /* 8006D800 0006A760 D0 23 00 04 */ stfs f1, 4(r3) /* 8006D804 0006A764 D0 03 00 08 */ stfs f0, 8(r3) -/* 8006D808 0006A768 4E 80 00 20 */ blr +/* 8006D808 0006A768 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/PathFinding/CPathFindArea.s b/asm/MetroidPrime/PathFinding/CPathFindArea.s index bc6a4038..7e806d21 100644 --- a/asm/MetroidPrime/PathFinding/CPathFindArea.s +++ b/asm/MetroidPrime/PathFinding/CPathFindArea.s @@ -43,7 +43,7 @@ lbl_801CA1BC: /* 801CA1D0 001C7130 83 A1 00 14 */ lwz r29, 0x14(r1) /* 801CA1D4 001C7134 7C 08 03 A6 */ mtlr r0 /* 801CA1D8 001C7138 38 21 00 20 */ addi r1, r1, 0x20 -/* 801CA1DC 001C713C 4E 80 00 20 */ blr +/* 801CA1DC 001C713C 4E 80 00 20 */ blr .global "GetIObjObjectFor__16TToken<7CPFArea>FRCQ24rstl18auto_ptr<7CPFArea>" "GetIObjObjectFor__16TToken<7CPFArea>FRCQ24rstl18auto_ptr<7CPFArea>": @@ -78,7 +78,7 @@ lbl_801CA1BC: /* 801CA250 001C71B0 38 80 00 01 */ li r4, 1 /* 801CA254 001C71B4 81 8C 00 08 */ lwz r12, 8(r12) /* 801CA258 001C71B8 7D 89 03 A6 */ mtctr r12 -/* 801CA25C 001C71BC 4E 80 04 21 */ bctrl +/* 801CA25C 001C71BC 4E 80 04 21 */ bctrl lbl_801CA260: /* 801CA260 001C71C0 38 61 00 10 */ addi r3, r1, 0x10 /* 801CA264 001C71C4 38 80 FF FF */ li r4, -1 @@ -88,7 +88,7 @@ lbl_801CA260: /* 801CA274 001C71D4 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801CA278 001C71D8 7C 08 03 A6 */ mtlr r0 /* 801CA27C 001C71DC 38 21 00 20 */ addi r1, r1, 0x20 -/* 801CA280 001C71E0 4E 80 00 20 */ blr +/* 801CA280 001C71E0 4E 80 00 20 */ blr .global sub_801ca284 sub_801ca284: @@ -130,7 +130,7 @@ lbl_801CA2F8: /* 801CA304 001C7264 83 C1 00 08 */ lwz r30, 8(r1) /* 801CA308 001C7268 7C 08 03 A6 */ mtlr r0 /* 801CA30C 001C726C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CA310 001C7270 4E 80 00 20 */ blr +/* 801CA310 001C7270 4E 80 00 20 */ blr .global __dt__7CPFAreaFv __dt__7CPFAreaFv: @@ -200,7 +200,7 @@ lbl_801CA3E4: /* 801CA3F0 001C7350 83 C1 00 28 */ lwz r30, 0x28(r1) /* 801CA3F4 001C7354 7C 08 03 A6 */ mtlr r0 /* 801CA3F8 001C7358 38 21 00 30 */ addi r1, r1, 0x30 -/* 801CA3FC 001C735C 4E 80 00 20 */ blr +/* 801CA3FC 001C735C 4E 80 00 20 */ blr .global "GetNewDerivedObject__34TObjOwnerDerivedFromIObj<7CPFArea>FRCQ24rstl18auto_ptr<7CPFArea>" "GetNewDerivedObject__34TObjOwnerDerivedFromIObj<7CPFArea>FRCQ24rstl18auto_ptr<7CPFArea>": @@ -214,7 +214,7 @@ lbl_801CA3E4: /* 801CA41C 001C737C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801CA420 001C7380 7C 08 03 A6 */ mtlr r0 /* 801CA424 001C7384 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CA428 001C7388 4E 80 00 20 */ blr +/* 801CA428 001C7388 4E 80 00 20 */ blr .global "__ct__34TObjOwnerDerivedFromIObj<7CPFArea>FRCQ24rstl18auto_ptr<7CPFArea>" "__ct__34TObjOwnerDerivedFromIObj<7CPFArea>FRCQ24rstl18auto_ptr<7CPFArea>": @@ -257,7 +257,7 @@ lbl_801CA49C: /* 801CA4B8 001C7418 80 01 00 14 */ lwz r0, 0x14(r1) /* 801CA4BC 001C741C 7C 08 03 A6 */ mtlr r0 /* 801CA4C0 001C7420 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CA4C4 001C7424 4E 80 00 20 */ blr +/* 801CA4C4 001C7424 4E 80 00 20 */ blr .global "__dt__34TObjOwnerDerivedFromIObj<7CPFArea>Fv" "__dt__34TObjOwnerDerivedFromIObj<7CPFArea>Fv": @@ -287,7 +287,7 @@ lbl_801CA510: /* 801CA51C 001C747C 83 C1 00 08 */ lwz r30, 8(r1) /* 801CA520 001C7480 7C 08 03 A6 */ mtlr r0 /* 801CA524 001C7484 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CA528 001C7488 4E 80 00 20 */ blr +/* 801CA528 001C7488 4E 80 00 20 */ blr .global PathExists__7CPFAreaCFPC9CPFRegionPC9CPFRegionUi PathExists__7CPFAreaCFPC9CPFRegionPC9CPFRegionUi: @@ -297,7 +297,7 @@ PathExists__7CPFAreaCFPC9CPFRegionPC9CPFRegionUi: /* 801CA538 001C7498 41 82 00 0C */ beq lbl_801CA544 lbl_801CA53C: /* 801CA53C 001C749C 38 60 00 01 */ li r3, 1 -/* 801CA540 001C74A0 4E 80 00 20 */ blr +/* 801CA540 001C74A0 4E 80 00 20 */ blr lbl_801CA544: /* 801CA544 001C74A4 80 04 00 24 */ lwz r0, 0x24(r4) /* 801CA548 001C74A8 80 85 00 24 */ lwz r4, 0x24(r5) @@ -332,7 +332,7 @@ lbl_801CA568: /* 801CA5B8 001C7518 7C 64 18 2E */ lwzx r3, r4, r3 /* 801CA5BC 001C751C 7C 60 04 30 */ srw r0, r3, r0 /* 801CA5C0 001C7520 54 03 07 FE */ clrlwi r3, r0, 0x1f -/* 801CA5C4 001C7524 4E 80 00 20 */ blr +/* 801CA5C4 001C7524 4E 80 00 20 */ blr lbl_801CA5C8: /* 801CA5C8 001C7528 80 83 01 6C */ lwz r4, 0x16c(r3) /* 801CA5CC 001C752C 54 03 E8 FA */ rlwinm r3, r0, 0x1d, 3, 0x1d @@ -340,7 +340,7 @@ lbl_801CA5C8: /* 801CA5D4 001C7534 7C 64 18 2E */ lwzx r3, r4, r3 /* 801CA5D8 001C7538 7C 60 04 30 */ srw r0, r3, r0 /* 801CA5DC 001C753C 54 03 07 FE */ clrlwi r3, r0, 0x1f -/* 801CA5E0 001C7540 4E 80 00 20 */ blr +/* 801CA5E0 001C7540 4E 80 00 20 */ blr .global "FindClosestReachablePoint__7CPFAreaFRQ24rstl30reserved_vectorRC9CVector3fUi" "FindClosestReachablePoint__7CPFAreaFRQ24rstl30reserved_vectorRC9CVector3fUi": @@ -463,7 +463,7 @@ lbl_801CA778: /* 801CA78C 001C76EC D1 43 00 08 */ stfs f10, 8(r3) /* 801CA790 001C76F0 BB 21 00 24 */ lmw r25, 0x24(r1) /* 801CA794 001C76F4 38 21 00 40 */ addi r1, r1, 0x40 -/* 801CA798 001C76F8 4E 80 00 20 */ blr +/* 801CA798 001C76F8 4E 80 00 20 */ blr .global FindClosestRegion__7CPFAreaFRC9CVector3fUif FindClosestRegion__7CPFAreaFRC9CVector3fUif: @@ -651,7 +651,7 @@ lbl_801CAA1C: /* 801CAA34 001C7994 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 801CAA38 001C7998 7C 08 03 A6 */ mtlr r0 /* 801CAA3C 001C799C 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 801CAA40 001C79A0 4E 80 00 20 */ blr +/* 801CAA40 001C79A0 4E 80 00 20 */ blr .global "FindRegions__7CPFAreaFRQ24rstl30reserved_vectorRC9CVector3fUiUi" "FindRegions__7CPFAreaFRQ24rstl30reserved_vectorRC9CVector3fUiUi": @@ -723,7 +723,7 @@ lbl_801CAB28: /* 801CAB30 001C7A90 80 01 00 34 */ lwz r0, 0x34(r1) /* 801CAB34 001C7A94 7C 08 03 A6 */ mtlr r0 /* 801CAB38 001C7A98 38 21 00 30 */ addi r1, r1, 0x30 -/* 801CAB3C 001C7A9C 4E 80 00 20 */ blr +/* 801CAB3C 001C7A9C 4E 80 00 20 */ blr .global GetOctreeRegionList__7CPFAreaFRC9CVector3f GetOctreeRegionList__7CPFAreaFRC9CVector3f: @@ -759,7 +759,7 @@ lbl_801CABA4: /* 801CABAC 001C7B0C 83 C1 00 08 */ lwz r30, 8(r1) /* 801CABB0 001C7B10 7C 08 03 A6 */ mtlr r0 /* 801CABB4 001C7B14 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CABB8 001C7B18 4E 80 00 20 */ blr +/* 801CABB8 001C7B18 4E 80 00 20 */ blr .global "__ct__7CPFAreaFRCQ24rstl12auto_ptri" "__ct__7CPFAreaFRCQ24rstl12auto_ptri": @@ -1183,7 +1183,7 @@ lbl_801CB18C: /* 801CB1D4 001C8134 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 801CB1D8 001C8138 7C 08 03 A6 */ mtlr r0 /* 801CB1DC 001C813C 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 801CB1E0 001C8140 4E 80 00 20 */ blr +/* 801CB1E0 001C8140 4E 80 00 20 */ blr .global "GetRegionListList__13CPFAreaOctreeFRQ24rstl54reserved_vector,32>RC9CVector3ff" "GetRegionListList__13CPFAreaOctreeFRQ24rstl54reserved_vector,32>RC9CVector3ff": @@ -1419,7 +1419,7 @@ lbl_801CB530: /* 801CB544 001C84A4 80 01 00 64 */ lwz r0, 0x64(r1) /* 801CB548 001C84A8 7C 08 03 A6 */ mtlr r0 /* 801CB54C 001C84AC 38 21 00 60 */ addi r1, r1, 0x60 -/* 801CB550 001C84B0 4E 80 00 20 */ blr +/* 801CB550 001C84B0 4E 80 00 20 */ blr .global IsPointInsidePaddedAABox__13CPFAreaOctreeCFRC9CVector3ff IsPointInsidePaddedAABox__13CPFAreaOctreeCFRC9CVector3ff: @@ -1460,7 +1460,7 @@ IsPointInsidePaddedAABox__13CPFAreaOctreeCFRC9CVector3ff: /* 801CB5DC 001C853C 38 00 00 01 */ li r0, 1 lbl_801CB5E0: /* 801CB5E0 001C8540 7C 03 03 78 */ mr r3, r0 -/* 801CB5E4 001C8544 4E 80 00 20 */ blr +/* 801CB5E4 001C8544 4E 80 00 20 */ blr .global "push_back__Q24rstl54reserved_vector,32>FRCP31prereserved_vector" "push_back__Q24rstl54reserved_vector,32>FRCP31prereserved_vector": @@ -1475,53 +1475,53 @@ lbl_801CB604: /* 801CB604 001C8564 80 83 00 00 */ lwz r4, 0(r3) /* 801CB608 001C8568 38 04 00 01 */ addi r0, r4, 1 /* 801CB60C 001C856C 90 03 00 00 */ stw r0, 0(r3) -/* 801CB610 001C8570 4E 80 00 20 */ blr +/* 801CB610 001C8570 4E 80 00 20 */ blr .global "capacity__Q24rstl54reserved_vector,32>CFv" "capacity__Q24rstl54reserved_vector,32>CFv": /* 801CB614 001C8574 38 60 00 20 */ li r3, 0x20 -/* 801CB618 001C8578 4E 80 00 20 */ blr +/* 801CB618 001C8578 4E 80 00 20 */ blr .global "size__Q24rstl54reserved_vector,32>CFv" "size__Q24rstl54reserved_vector,32>CFv": /* 801CB61C 001C857C 80 63 00 00 */ lwz r3, 0(r3) -/* 801CB620 001C8580 4E 80 00 20 */ blr +/* 801CB620 001C8580 4E 80 00 20 */ blr .global sub_801cb624 sub_801cb624: /* 801CB624 001C8584 38 63 00 08 */ addi r3, r3, 8 -/* 801CB628 001C8588 4E 80 00 20 */ blr +/* 801CB628 001C8588 4E 80 00 20 */ blr .global sub_801cb62c sub_801cb62c: /* 801CB62C 001C858C 38 63 00 04 */ addi r3, r3, 4 -/* 801CB630 001C8590 4E 80 00 20 */ blr +/* 801CB630 001C8590 4E 80 00 20 */ blr .global sub_801cb634 sub_801cb634: /* 801CB634 001C8594 38 63 00 0C */ addi r3, r3, 0xc -/* 801CB638 001C8598 4E 80 00 20 */ blr +/* 801CB638 001C8598 4E 80 00 20 */ blr .global nullsub_44 nullsub_44: -/* 801CB63C 001C859C 4E 80 00 20 */ blr +/* 801CB63C 001C859C 4E 80 00 20 */ blr .global nullsub_45 nullsub_45: -/* 801CB640 001C85A0 4E 80 00 20 */ blr +/* 801CB640 001C85A0 4E 80 00 20 */ blr .global sub_801cb644 sub_801cb644: /* 801CB644 001C85A4 28 03 00 00 */ cmplwi r3, 0 -/* 801CB648 001C85A8 4D 82 00 20 */ beqlr +/* 801CB648 001C85A8 4D 82 00 20 */ beqlr /* 801CB64C 001C85AC 80 04 00 00 */ lwz r0, 0(r4) /* 801CB650 001C85B0 90 03 00 00 */ stw r0, 0(r3) -/* 801CB654 001C85B4 4E 80 00 20 */ blr +/* 801CB654 001C85B4 4E 80 00 20 */ blr .global "data__Q24rstl54reserved_vector,32>Fv" "data__Q24rstl54reserved_vector,32>Fv": /* 801CB658 001C85B8 38 63 00 04 */ addi r3, r3, 4 -/* 801CB65C 001C85BC 4E 80 00 20 */ blr +/* 801CB65C 001C85BC 4E 80 00 20 */ blr .global GetRegionList__13CPFAreaOctreeFRC9CVector3f GetRegionList__13CPFAreaOctreeFRC9CVector3f: @@ -1706,7 +1706,7 @@ lbl_801CB8BC: /* 801CB8D0 001C8830 83 A1 00 14 */ lwz r29, 0x14(r1) /* 801CB8D4 001C8834 7C 08 03 A6 */ mtlr r0 /* 801CB8D8 001C8838 38 21 00 30 */ addi r1, r1, 0x30 -/* 801CB8DC 001C883C 4E 80 00 20 */ blr +/* 801CB8DC 001C883C 4E 80 00 20 */ blr .global GetChildIndex__13CPFAreaOctreeCFRC9CVector3f GetChildIndex__13CPFAreaOctreeCFRC9CVector3f: @@ -1730,7 +1730,7 @@ lbl_801CB90C: /* 801CB91C 001C887C 60 00 00 04 */ ori r0, r0, 4 lbl_801CB920: /* 801CB920 001C8880 7C 03 03 78 */ mr r3, r0 -/* 801CB924 001C8884 4E 80 00 20 */ blr +/* 801CB924 001C8884 4E 80 00 20 */ blr .global "reserve__Q24rstl50vector<13CPFRegionData,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl50vector<13CPFRegionData,Q24rstl17rmemory_allocator>Fi": @@ -1824,7 +1824,7 @@ lbl_801CBA54: /* 801CBA60 001C89C0 83 A1 00 24 */ lwz r29, 0x24(r1) /* 801CBA64 001C89C4 7C 08 03 A6 */ mtlr r0 /* 801CBA68 001C89C8 38 21 00 30 */ addi r1, r1, 0x30 -/* 801CBA6C 001C89CC 4E 80 00 20 */ blr +/* 801CBA6C 001C89CC 4E 80 00 20 */ blr .global RemainingPathDistance__15CPathFindSearchCFR9CVector3f RemainingPathDistance__15CPathFindSearchCFR9CVector3f: @@ -1904,7 +1904,7 @@ lbl_801CBB6C: /* 801CBB88 001C8AE8 83 81 00 20 */ lwz r28, 0x20(r1) /* 801CBB8C 001C8AEC 7C 08 03 A6 */ mtlr r0 /* 801CBB90 001C8AF0 38 21 00 40 */ addi r1, r1, 0x40 -/* 801CBB94 001C8AF4 4E 80 00 20 */ blr +/* 801CBB94 001C8AF4 4E 80 00 20 */ blr .global GetSplinePointWithLookahead__15CPathFindSearchCFR9CVector3fRC9CVector3ff GetSplinePointWithLookahead__15CPathFindSearchCFR9CVector3fRC9CVector3ff: @@ -1916,7 +1916,7 @@ GetSplinePointWithLookahead__15CPathFindSearchCFR9CVector3fRC9CVector3ff: /* 801CBBAC 001C8B0C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801CBBB0 001C8B10 7C 08 03 A6 */ mtlr r0 /* 801CBBB4 001C8B14 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CBBB8 001C8B18 4E 80 00 20 */ blr +/* 801CBBB8 001C8B18 4E 80 00 20 */ blr .global GetSplinePointWithLookahead__15CPathFindSearchCFR9CVector3fRC9CVector3fif GetSplinePointWithLookahead__15CPathFindSearchCFR9CVector3fRC9CVector3fif: @@ -2047,7 +2047,7 @@ lbl_801CBD90: /* 801CBD9C 001C8CFC 80 01 00 64 */ lwz r0, 0x64(r1) /* 801CBDA0 001C8D00 7C 08 03 A6 */ mtlr r0 /* 801CBDA4 001C8D04 38 21 00 60 */ addi r1, r1, 0x60 -/* 801CBDA8 001C8D08 4E 80 00 20 */ blr +/* 801CBDA8 001C8D08 4E 80 00 20 */ blr .global GetSplinePoint__15CPathFindSearchCFR9CVector3fRC9CVector3f GetSplinePoint__15CPathFindSearchCFR9CVector3fRC9CVector3f: @@ -2059,7 +2059,7 @@ GetSplinePoint__15CPathFindSearchCFR9CVector3fRC9CVector3f: /* 801CBDC0 001C8D20 80 01 00 14 */ lwz r0, 0x14(r1) /* 801CBDC4 001C8D24 7C 08 03 A6 */ mtlr r0 /* 801CBDC8 001C8D28 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CBDCC 001C8D2C 4E 80 00 20 */ blr +/* 801CBDCC 001C8D2C 4E 80 00 20 */ blr .global GetSplinePoint__15CPathFindSearchCFR9CVector3fRC9CVector3fi GetSplinePoint__15CPathFindSearchCFR9CVector3fRC9CVector3fi: @@ -2225,7 +2225,7 @@ lbl_801CC024: /* 801CC034 001C8F94 83 81 00 80 */ lwz r28, 0x80(r1) /* 801CC038 001C8F98 7C 08 03 A6 */ mtlr r0 /* 801CC03C 001C8F9C 38 21 00 90 */ addi r1, r1, 0x90 -/* 801CC040 001C8FA0 4E 80 00 20 */ blr +/* 801CC040 001C8FA0 4E 80 00 20 */ blr .global SegmentOver__15CPathFindSearchCFRC9CVector3f SegmentOver__15CPathFindSearchCFRC9CVector3f: diff --git a/asm/MetroidPrime/PathFinding/CPathFindRegion.s b/asm/MetroidPrime/PathFinding/CPathFindRegion.s index e27054be..859f93d9 100644 --- a/asm/MetroidPrime/PathFinding/CPathFindRegion.s +++ b/asm/MetroidPrime/PathFinding/CPathFindRegion.s @@ -230,7 +230,7 @@ lbl_801C91B4: /* 801C9214 001C6174 80 01 01 34 */ lwz r0, 0x134(r1) /* 801C9218 001C6178 7C 08 03 A6 */ mtlr r0 /* 801C921C 001C617C 38 21 01 30 */ addi r1, r1, 0x130 -/* 801C9220 001C6180 4E 80 00 20 */ blr +/* 801C9220 001C6180 4E 80 00 20 */ blr .global FitThroughLink2d__9CPFRegionCFRC9CVector3fRC7CPFLinkRC9CVector3ff FitThroughLink2d__9CPFRegionCFRC9CVector3fRC7CPFLinkRC9CVector3ff: @@ -388,7 +388,7 @@ lbl_801C9414: /* 801C947C 001C63DC 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 801C9480 001C63E0 7C 08 03 A6 */ mtlr r0 /* 801C9484 001C63E4 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 801C9488 001C63E8 4E 80 00 20 */ blr +/* 801C9488 001C63E8 4E 80 00 20 */ blr .global GetLinkMidPoint__9CPFRegionCFRC7CPFLink GetLinkMidPoint__9CPFRegionCFRC7CPFLink: @@ -419,7 +419,7 @@ GetLinkMidPoint__9CPFRegionCFRC7CPFLink: /* 801C94EC 001C644C D0 03 00 00 */ stfs f0, 0(r3) /* 801C94F0 001C6450 D0 43 00 04 */ stfs f2, 4(r3) /* 801C94F4 001C6454 D0 23 00 08 */ stfs f1, 8(r3) -/* 801C94F8 001C6458 4E 80 00 20 */ blr +/* 801C94F8 001C6458 4E 80 00 20 */ blr .global DropToGround__9CPFRegionCFR9CVector3f DropToGround__9CPFRegionCFR9CVector3f: @@ -448,7 +448,7 @@ DropToGround__9CPFRegionCFR9CVector3f: /* 801C9554 001C64B4 EC 01 00 28 */ fsubs f0, f1, f0 /* 801C9558 001C64B8 D0 04 00 08 */ stfs f0, 8(r4) /* 801C955C 001C64BC 38 21 00 20 */ addi r1, r1, 0x20 -/* 801C9560 001C64C0 4E 80 00 20 */ blr +/* 801C9560 001C64C0 4E 80 00 20 */ blr .global SetLinkTo__9CPFRegionFi SetLinkTo__9CPFRegionFi: @@ -457,7 +457,7 @@ SetLinkTo__9CPFRegionFi: /* 801C956C 001C64CC 38 C0 00 00 */ li r6, 0 /* 801C9570 001C64D0 7C 09 03 A6 */ mtctr r0 /* 801C9574 001C64D4 2C 00 00 00 */ cmpwi r0, 0 -/* 801C9578 001C64D8 4C 81 00 20 */ blelr +/* 801C9578 001C64D8 4C 81 00 20 */ blelr lbl_801C957C: /* 801C957C 001C64DC 80 A3 00 0C */ lwz r5, 0xc(r3) /* 801C9580 001C64E0 38 06 00 04 */ addi r0, r6, 4 @@ -466,7 +466,7 @@ lbl_801C957C: /* 801C958C 001C64EC 40 82 00 10 */ bne lbl_801C959C /* 801C9590 001C64F0 80 63 00 4C */ lwz r3, 0x4c(r3) /* 801C9594 001C64F4 90 E3 00 2C */ stw r7, 0x2c(r3) -/* 801C9598 001C64F8 4E 80 00 20 */ blr +/* 801C9598 001C64F8 4E 80 00 20 */ blr lbl_801C959C: /* 801C959C 001C64FC 38 C6 00 10 */ addi r6, r6, 0x10 /* 801C95A0 001C6500 38 E7 00 01 */ addi r7, r7, 1 @@ -474,7 +474,7 @@ lbl_801C959C: .global sub_801c95a8 sub_801c95a8: -/* 801C95A8 001C6508 4E 80 00 20 */ blr +/* 801C95A8 001C6508 4E 80 00 20 */ blr .global "FindBestPoint__9CPFRegionFRQ24rstl45vector<9CVector3f,Q24rstl17rmemory_allocator>RC9CVector3fUif" "FindBestPoint__9CPFRegionFRQ24rstl45vector<9CVector3f,Q24rstl17rmemory_allocator>RC9CVector3fUif": @@ -810,7 +810,7 @@ lbl_801C9A48: /* 801C9A50 001C69B0 80 01 00 74 */ lwz r0, 0x74(r1) /* 801C9A54 001C69B4 7C 08 03 A6 */ mtlr r0 /* 801C9A58 001C69B8 38 21 00 70 */ addi r1, r1, 0x70 -/* 801C9A5C 001C69BC 4E 80 00 20 */ blr +/* 801C9A5C 001C69BC 4E 80 00 20 */ blr .global "FindClosestPointOnPolygon__9CPFRegionFRCQ24rstl45vector<9CVector3f,Q24rstl17rmemory_allocator>RC9CVector3fRC9CVector3fb" "FindClosestPointOnPolygon__9CPFRegionFRCQ24rstl45vector<9CVector3f,Q24rstl17rmemory_allocator>RC9CVector3fRC9CVector3fb": @@ -1077,7 +1077,7 @@ lbl_801C9E2C: /* 801C9E4C 001C6DAC 80 01 00 74 */ lwz r0, 0x74(r1) /* 801C9E50 001C6DB0 7C 08 03 A6 */ mtlr r0 /* 801C9E54 001C6DB4 38 21 00 70 */ addi r1, r1, 0x70 -/* 801C9E58 001C6DB8 4E 80 00 20 */ blr +/* 801C9E58 001C6DB8 4E 80 00 20 */ blr .global PointHeight__9CPFRegionCFRC9CVector3f PointHeight__9CPFRegionCFRC9CVector3f: @@ -1097,7 +1097,7 @@ PointHeight__9CPFRegionCFRC9CVector3f: /* 801C9E90 001C6DF0 C0 63 00 20 */ lfs f3, 0x20(r3) /* 801C9E94 001C6DF4 EC 02 00 7A */ fmadds f0, f2, f1, f0 /* 801C9E98 001C6DF8 EC 24 00 FA */ fmadds f1, f4, f3, f0 -/* 801C9E9C 001C6DFC 4E 80 00 20 */ blr +/* 801C9E9C 001C6DFC 4E 80 00 20 */ blr .global IsPointInside__9CPFRegionCFRC9CVector3f IsPointInside__9CPFRegionCFRC9CVector3f: @@ -1194,7 +1194,7 @@ lbl_801C9FEC: /* 801C9FFC 001C6F5C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 801CA000 001C6F60 7C 08 03 A6 */ mtlr r0 /* 801CA004 001C6F64 38 21 00 20 */ addi r1, r1, 0x20 -/* 801CA008 001C6F68 4E 80 00 20 */ blr +/* 801CA008 001C6F68 4E 80 00 20 */ blr .global __ct__9CPFRegionFv __ct__9CPFRegionFv: @@ -1233,7 +1233,7 @@ __ct__9CPFRegionFv: /* 801CA08C 001C6FEC D0 03 00 44 */ stfs f0, 0x44(r3) /* 801CA090 001C6FF0 C0 04 00 14 */ lfs f0, 0x14(r4) /* 801CA094 001C6FF4 D0 03 00 48 */ stfs f0, 0x48(r3) -/* 801CA098 001C6FF8 4E 80 00 20 */ blr +/* 801CA098 001C6FF8 4E 80 00 20 */ blr .global Fixup__9CPFRegionFR7CPFAreaRi Fixup__9CPFRegionFR7CPFAreaRi: @@ -1269,9 +1269,9 @@ lbl_801CA0E8: /* 801CA100 001C7060 80 63 00 00 */ lwz r3, 0(r3) /* 801CA104 001C7064 80 05 00 00 */ lwz r0, 0(r5) /* 801CA108 001C7068 7C 03 00 00 */ cmpw r3, r0 -/* 801CA10C 001C706C 4C 81 00 20 */ blelr +/* 801CA10C 001C706C 4C 81 00 20 */ blelr /* 801CA110 001C7070 90 65 00 00 */ stw r3, 0(r5) -/* 801CA114 001C7074 4E 80 00 20 */ blr +/* 801CA114 001C7074 4E 80 00 20 */ blr .global __ct__13CPFRegionDataFv __ct__13CPFRegionDataFv: diff --git a/asm/MetroidPrime/PathFinding/CPathFindSearch.s b/asm/MetroidPrime/PathFinding/CPathFindSearch.s index f2220c73..739d2874 100644 --- a/asm/MetroidPrime/PathFinding/CPathFindSearch.s +++ b/asm/MetroidPrime/PathFinding/CPathFindSearch.s @@ -116,7 +116,7 @@ lbl_801C6CB4: /* 801C6CB8 001C3C18 83 E1 00 4C */ lwz r31, 0x4c(r1) /* 801C6CBC 001C3C1C 7C 08 03 A6 */ mtlr r0 /* 801C6CC0 001C3C20 38 21 00 50 */ addi r1, r1, 0x50 -/* 801C6CC4 001C3C24 4E 80 00 20 */ blr +/* 801C6CC4 001C3C24 4E 80 00 20 */ blr .global PathExists__15CPathFindSearchCFRC9CVector3fRC9CVector3f PathExists__15CPathFindSearchCFRC9CVector3fRC9CVector3f: @@ -427,7 +427,7 @@ lbl_801C70E8: /* 801C70EC 001C404C 80 01 00 94 */ lwz r0, 0x94(r1) /* 801C70F0 001C4050 7C 08 03 A6 */ mtlr r0 /* 801C70F4 001C4054 38 21 00 90 */ addi r1, r1, 0x90 -/* 801C70F8 001C4058 4E 80 00 20 */ blr +/* 801C70F8 001C4058 4E 80 00 20 */ blr .global FindClosestReachablePoint__15CPathFindSearchCFRC9CVector3fR9CVector3f FindClosestReachablePoint__15CPathFindSearchCFRC9CVector3fR9CVector3f: @@ -618,7 +618,7 @@ lbl_801C739C: /* 801C73A4 001C4304 83 C1 00 88 */ lwz r30, 0x88(r1) /* 801C73A8 001C4308 7C 08 03 A6 */ mtlr r0 /* 801C73AC 001C430C 38 21 00 90 */ addi r1, r1, 0x90 -/* 801C73B0 001C4310 4E 80 00 20 */ blr +/* 801C73B0 001C4310 4E 80 00 20 */ blr .global "Search__15CPathFindSearchFRQ24rstl30reserved_vectorRC9CVector3fRQ24rstl30reserved_vectorRC9CVector3f" "Search__15CPathFindSearchFRQ24rstl30reserved_vectorRC9CVector3fRQ24rstl30reserved_vectorRC9CVector3f": @@ -1233,7 +1233,7 @@ lbl_801C7C50: /* 801C7C5C 001C4BBC 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 801C7C60 001C4BC0 7C 08 03 A6 */ mtlr r0 /* 801C7C64 001C4BC4 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 801C7C68 001C4BC8 4E 80 00 20 */ blr +/* 801C7C68 001C4BC8 4E 80 00 20 */ blr .global Search__15CPathFindSearchFRC9CVector3fRC9CVector3f Search__15CPathFindSearchFRC9CVector3fRC9CVector3f: @@ -2484,7 +2484,7 @@ lbl_801C8D60: /* 801C8D84 001C5CE4 80 01 02 64 */ lwz r0, 0x264(r1) /* 801C8D88 001C5CE8 7C 08 03 A6 */ mtlr r0 /* 801C8D8C 001C5CEC 38 21 02 60 */ addi r1, r1, 0x260 -/* 801C8D90 001C5CF0 4E 80 00 20 */ blr +/* 801C8D90 001C5CF0 4E 80 00 20 */ blr .global __ct__15CPathFindSearchFP7CPFAreaUiff __ct__15CPathFindSearchFP7CPFAreaUiff: @@ -2500,7 +2500,7 @@ __ct__15CPathFindSearchFP7CPFAreaUiff: /* 801C8DB8 001C5D18 D0 03 00 D8 */ stfs f0, 0xd8(r3) /* 801C8DBC 001C5D1C 90 A3 00 DC */ stw r5, 0xdc(r3) /* 801C8DC0 001C5D20 90 03 00 E0 */ stw r0, 0xe0(r3) -/* 801C8DC4 001C5D24 4E 80 00 20 */ blr +/* 801C8DC4 001C5D24 4E 80 00 20 */ blr .global __ct__11CPFOpenListFv __ct__11CPFOpenListFv: @@ -2559,4 +2559,4 @@ __ct__11CPFOpenListFv: /* 801C8E98 001C5DF8 80 01 00 14 */ lwz r0, 0x14(r1) /* 801C8E9C 001C5DFC 7C 08 03 A6 */ mtlr r0 /* 801C8EA0 001C5E00 38 21 00 10 */ addi r1, r1, 0x10 -/* 801C8EA4 001C5E04 4E 80 00 20 */ blr +/* 801C8EA4 001C5E04 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/Player/CFaceplateDecoration.s b/asm/MetroidPrime/Player/CFaceplateDecoration.s index 17ca6304..b726a814 100644 --- a/asm/MetroidPrime/Player/CFaceplateDecoration.s +++ b/asm/MetroidPrime/Player/CFaceplateDecoration.s @@ -64,7 +64,7 @@ lbl_80175B88: /* 80175BA0 00172B00 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80175BA4 00172B04 7C 08 03 A6 */ mtlr r0 /* 80175BA8 00172B08 38 21 00 50 */ addi r1, r1, 0x50 -/* 80175BAC 00172B0C 4E 80 00 20 */ blr +/* 80175BAC 00172B0C 4E 80 00 20 */ blr .global Update__20CFaceplateDecorationFfRC13CStateManager Update__20CFaceplateDecorationFfRC13CStateManager: @@ -104,7 +104,7 @@ lbl_80175BF4: /* 80175C30 00172B90 81 84 00 00 */ lwz r12, 0(r4) /* 80175C34 00172B94 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80175C38 00172B98 7D 89 03 A6 */ mtctr r12 -/* 80175C3C 00172B9C 4E 80 04 21 */ bctrl +/* 80175C3C 00172B9C 4E 80 04 21 */ bctrl /* 80175C40 00172BA0 38 61 00 08 */ addi r3, r1, 8 /* 80175C44 00172BA4 38 81 00 10 */ addi r4, r1, 0x10 /* 80175C48 00172BA8 48 1C B2 61 */ bl __ct__6CTokenFRC6CToken @@ -141,7 +141,7 @@ lbl_80175CAC: /* 80175CB4 00172C14 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80175CB8 00172C18 7C 08 03 A6 */ mtlr r0 /* 80175CBC 00172C1C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80175CC0 00172C20 4E 80 00 20 */ blr +/* 80175CC0 00172C20 4E 80 00 20 */ blr .global __ct__20CFaceplateDecorationFR13CStateManager __ct__20CFaceplateDecorationFR13CStateManager: @@ -149,4 +149,4 @@ __ct__20CFaceplateDecorationFR13CStateManager: /* 80175CC8 00172C28 90 03 00 00 */ stw r0, 0(r3) /* 80175CCC 00172C2C 38 00 00 00 */ li r0, 0 /* 80175CD0 00172C30 98 03 00 0C */ stb r0, 0xc(r3) -/* 80175CD4 00172C34 4E 80 00 20 */ blr +/* 80175CD4 00172C34 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/Player/CFidget.s b/asm/MetroidPrime/Player/CFidget.s index 356315e9..38d2005a 100644 --- a/asm/MetroidPrime/Player/CFidget.s +++ b/asm/MetroidPrime/Player/CFidget.s @@ -298,13 +298,13 @@ lbl_80154B40: /* 80154B48 00151AA8 83 C1 00 08 */ lwz r30, 8(r1) /* 80154B4C 00151AAC 7C 08 03 A6 */ mtlr r0 /* 80154B50 00151AB0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80154B54 00151AB4 4E 80 00 20 */ blr +/* 80154B54 00151AB4 4E 80 00 20 */ blr .global ResetMinor__7CFidgetFv ResetMinor__7CFidgetFv: /* 80154B58 00151AB8 38 00 00 00 */ li r0, 0 /* 80154B5C 00151ABC 90 03 00 00 */ stw r0, 0(r3) -/* 80154B60 00151AC0 4E 80 00 20 */ blr +/* 80154B60 00151AC0 4E 80 00 20 */ blr .global ResetAll__7CFidgetFv ResetAll__7CFidgetFv: @@ -326,7 +326,7 @@ ResetAll__7CFidgetFv: /* 80154BA0 00151B00 88 03 00 34 */ lbz r0, 0x34(r3) /* 80154BA4 00151B04 50 A0 3E 30 */ rlwimi r0, r5, 7, 0x18, 0x18 /* 80154BA8 00151B08 98 03 00 34 */ stb r0, 0x34(r3) -/* 80154BAC 00151B0C 4E 80 00 20 */ blr +/* 80154BAC 00151B0C 4E 80 00 20 */ blr .global __ct__7CFidgetFv __ct__7CFidgetFv: diff --git a/asm/MetroidPrime/Player/CGameHintInfo.s b/asm/MetroidPrime/Player/CGameHintInfo.s index 4447fb69..87506742 100644 --- a/asm/MetroidPrime/Player/CGameHintInfo.s +++ b/asm/MetroidPrime/Player/CGameHintInfo.s @@ -55,7 +55,7 @@ lbl_802671A4: /* 802671B8 00264118 83 A1 00 14 */ lwz r29, 0x14(r1) /* 802671BC 0026411C 7C 08 03 A6 */ mtlr r0 /* 802671C0 00264120 38 21 00 20 */ addi r1, r1, 0x20 -/* 802671C4 00264124 4E 80 00 20 */ blr +/* 802671C4 00264124 4E 80 00 20 */ blr .global sub_802671c8 sub_802671c8: @@ -90,7 +90,7 @@ sub_802671c8: /* 80267238 00264198 38 80 00 01 */ li r4, 1 /* 8026723C 0026419C 81 8C 00 08 */ lwz r12, 8(r12) /* 80267240 002641A0 7D 89 03 A6 */ mtctr r12 -/* 80267244 002641A4 4E 80 04 21 */ bctrl +/* 80267244 002641A4 4E 80 04 21 */ bctrl lbl_80267248: /* 80267248 002641A8 38 61 00 10 */ addi r3, r1, 0x10 /* 8026724C 002641AC 38 80 FF FF */ li r4, -1 @@ -100,7 +100,7 @@ lbl_80267248: /* 8026725C 002641BC 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80267260 002641C0 7C 08 03 A6 */ mtlr r0 /* 80267264 002641C4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80267268 002641C8 4E 80 00 20 */ blr +/* 80267268 002641C8 4E 80 00 20 */ blr .global sub_8026726c sub_8026726c: @@ -142,7 +142,7 @@ lbl_802672E0: /* 802672EC 0026424C 83 C1 00 08 */ lwz r30, 8(r1) /* 802672F0 00264250 7C 08 03 A6 */ mtlr r0 /* 802672F4 00264254 38 21 00 10 */ addi r1, r1, 0x10 -/* 802672F8 00264258 4E 80 00 20 */ blr +/* 802672F8 00264258 4E 80 00 20 */ blr .global sub_802672fc sub_802672fc: @@ -167,7 +167,7 @@ lbl_80267334: /* 80267340 002642A0 83 C1 00 08 */ lwz r30, 8(r1) /* 80267344 002642A4 7C 08 03 A6 */ mtlr r0 /* 80267348 002642A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8026734C 002642AC 4E 80 00 20 */ blr +/* 8026734C 002642AC 4E 80 00 20 */ blr .global sub_80267350 sub_80267350: @@ -207,7 +207,7 @@ lbl_802673C0: /* 802673CC 0026432C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 802673D0 00264330 7C 08 03 A6 */ mtlr r0 /* 802673D4 00264334 38 21 00 20 */ addi r1, r1, 0x20 -/* 802673D8 00264338 4E 80 00 20 */ blr +/* 802673D8 00264338 4E 80 00 20 */ blr .global sub_802673dc sub_802673dc: @@ -232,7 +232,7 @@ lbl_80267408: /* 8026741C 0026437C 83 C1 00 08 */ lwz r30, 8(r1) /* 80267420 00264380 7C 08 03 A6 */ mtlr r0 /* 80267424 00264384 38 21 00 10 */ addi r1, r1, 0x10 -/* 80267428 00264388 4E 80 00 20 */ blr +/* 80267428 00264388 4E 80 00 20 */ blr .global sub_8026742c sub_8026742c: @@ -244,7 +244,7 @@ sub_8026742c: /* 80267440 002643A0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80267444 002643A4 7C 08 03 A6 */ mtlr r0 /* 80267448 002643A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8026744C 002643AC 4E 80 00 20 */ blr +/* 8026744C 002643AC 4E 80 00 20 */ blr .global __dt__Q213CGameHintInfo9CGameHintFv __dt__Q213CGameHintInfo9CGameHintFv: @@ -293,7 +293,7 @@ lbl_802674D8: /* 802674E4 00264444 83 C1 00 18 */ lwz r30, 0x18(r1) /* 802674E8 00264448 7C 08 03 A6 */ mtlr r0 /* 802674EC 0026444C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802674F0 00264450 4E 80 00 20 */ blr +/* 802674F0 00264450 4E 80 00 20 */ blr .global sub_802674f4 sub_802674f4: @@ -307,7 +307,7 @@ sub_802674f4: /* 80267510 00264470 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80267514 00264474 7C 08 03 A6 */ mtlr r0 /* 80267518 00264478 38 21 00 10 */ addi r1, r1, 0x10 -/* 8026751C 0026447C 4E 80 00 20 */ blr +/* 8026751C 0026447C 4E 80 00 20 */ blr .global sub_80267520 sub_80267520: @@ -350,7 +350,7 @@ lbl_80267590: /* 802675AC 0026450C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802675B0 00264510 7C 08 03 A6 */ mtlr r0 /* 802675B4 00264514 38 21 00 10 */ addi r1, r1, 0x10 -/* 802675B8 00264518 4E 80 00 20 */ blr +/* 802675B8 00264518 4E 80 00 20 */ blr .global sub_802675bc sub_802675bc: @@ -380,13 +380,13 @@ lbl_80267604: /* 80267610 00264570 83 C1 00 08 */ lwz r30, 8(r1) /* 80267614 00264574 7C 08 03 A6 */ mtlr r0 /* 80267618 00264578 38 21 00 10 */ addi r1, r1, 0x10 -/* 8026761C 0026457C 4E 80 00 20 */ blr +/* 8026761C 0026457C 4E 80 00 20 */ blr .global DismissDisplayedHint__12CHintOptionsFv DismissDisplayedHint__12CHintOptionsFv: /* 80267620 00264580 80 03 00 10 */ lwz r0, 0x10(r3) /* 80267624 00264584 2C 00 FF FF */ cmpwi r0, -1 -/* 80267628 00264588 4D 82 00 20 */ beqlr +/* 80267628 00264588 4D 82 00 20 */ beqlr /* 8026762C 0026458C 80 8D A0 84 */ lwz r4, gpMemoryCard@sda21(r13) /* 80267630 00264590 1C A0 00 0C */ mulli r5, r0, 0xc /* 80267634 00264594 80 C3 00 0C */ lwz r6, 0xc(r3) @@ -398,12 +398,12 @@ DismissDisplayedHint__12CHintOptionsFv: /* 8026764C 002645AC 7C 63 02 14 */ add r3, r3, r0 /* 80267650 002645B0 C0 03 00 1C */ lfs f0, 0x1c(r3) /* 80267654 002645B4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80267658 002645B8 4C 80 00 20 */ bgelr +/* 80267658 002645B8 4C 80 00 20 */ bgelr /* 8026765C 002645BC C0 03 00 14 */ lfs f0, 0x14(r3) /* 80267660 002645C0 38 00 00 01 */ li r0, 1 /* 80267664 002645C4 D0 04 00 04 */ stfs f0, 4(r4) /* 80267668 002645C8 98 04 00 08 */ stb r0, 8(r4) -/* 8026766C 002645CC 4E 80 00 20 */ blr +/* 8026766C 002645CC 4E 80 00 20 */ blr .global FindHintIndex__13CGameHintInfoFPCc FindHintIndex__13CGameHintInfoFPCc: @@ -445,7 +445,7 @@ lbl_802676DC: /* 802676EC 0026464C 83 81 00 10 */ lwz r28, 0x10(r1) /* 802676F0 00264650 7C 08 03 A6 */ mtlr r0 /* 802676F4 00264654 38 21 00 20 */ addi r1, r1, 0x20 -/* 802676F8 00264658 4E 80 00 20 */ blr +/* 802676F8 00264658 4E 80 00 20 */ blr .global GetNextHintIdx__12CHintOptionsFv GetNextHintIdx__12CHintOptionsFv: @@ -454,10 +454,10 @@ GetNextHintIdx__12CHintOptionsFv: /* 80267704 00264664 54 00 EF FF */ rlwinm. r0, r0, 0x1d, 0x1f, 0x1f /* 80267708 00264668 41 82 00 0C */ beq lbl_80267714 /* 8026770C 0026466C 80 63 00 10 */ lwz r3, 0x10(r3) -/* 80267710 00264670 4E 80 00 20 */ blr +/* 80267710 00264670 4E 80 00 20 */ blr lbl_80267714: /* 80267714 00264674 38 60 FF FF */ li r3, -1 -/* 80267718 00264678 4E 80 00 20 */ blr +/* 80267718 00264678 4E 80 00 20 */ blr .global GetCurrentDisplayedHint__12CHintOptionsCFv GetCurrentDisplayedHint__12CHintOptionsCFv: @@ -469,7 +469,7 @@ GetCurrentDisplayedHint__12CHintOptionsCFv: /* 80267730 00264690 2C 00 FF FF */ cmpwi r0, -1 /* 80267734 00264694 40 82 00 0C */ bne lbl_80267740 /* 80267738 00264698 38 60 00 00 */ li r3, 0 -/* 8026773C 0026469C 4E 80 00 20 */ blr +/* 8026773C 0026469C 4E 80 00 20 */ blr lbl_80267740: /* 80267740 002646A0 80 AD A0 84 */ lwz r5, gpMemoryCard@sda21(r13) /* 80267744 002646A4 1C 80 00 30 */ mulli r4, r0, 0x30 @@ -485,24 +485,24 @@ lbl_80267740: /* 8026776C 002646CC 4C 41 13 82 */ cror 2, 1, 2 /* 80267770 002646D0 40 82 00 0C */ bne lbl_8026777C /* 80267774 002646D4 38 60 00 00 */ li r3, 0 -/* 80267778 002646D8 4E 80 00 20 */ blr +/* 80267778 002646D8 4E 80 00 20 */ blr lbl_8026777C: /* 8026777C 002646DC C0 02 BA DC */ lfs f0, lbl_805AD7FC@sda21(r2) /* 80267780 002646E0 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80267784 002646E4 4C 41 13 82 */ cror 2, 1, 2 -/* 80267788 002646E8 4C 82 00 20 */ bnelr +/* 80267788 002646E8 4C 82 00 20 */ bnelr /* 8026778C 002646EC 88 03 00 08 */ lbz r0, 8(r3) /* 80267790 002646F0 28 00 00 00 */ cmplwi r0, 0 -/* 80267794 002646F4 4D 82 00 20 */ beqlr +/* 80267794 002646F4 4D 82 00 20 */ beqlr /* 80267798 002646F8 38 60 00 00 */ li r3, 0 -/* 8026779C 002646FC 4E 80 00 20 */ blr +/* 8026779C 002646FC 4E 80 00 20 */ blr .global sub_802677a0 sub_802677a0: -/* 802677A0 00264700 4E 80 00 20 */ blr +/* 802677A0 00264700 4E 80 00 20 */ blr lbl_802677A4: /* 802677A4 00264704 38 60 00 00 */ li r3, 0 -/* 802677A8 00264708 4E 80 00 20 */ blr +/* 802677A8 00264708 4E 80 00 20 */ blr .global ActivateContinueDelayHintTimer__12CHintOptionsFPCc ActivateContinueDelayHintTimer__12CHintOptionsFPCc: @@ -538,7 +538,7 @@ lbl_80267814: /* 80267818 00264778 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8026781C 0026477C 7C 08 03 A6 */ mtlr r0 /* 80267820 00264780 38 21 00 10 */ addi r1, r1, 0x10 -/* 80267824 00264784 4E 80 00 20 */ blr +/* 80267824 00264784 4E 80 00 20 */ blr .global DelayHint__12CHintOptionsFPCc DelayHint__12CHintOptionsFPCc: @@ -579,7 +579,7 @@ lbl_8026789C: /* 802678A0 00264800 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802678A4 00264804 7C 08 03 A6 */ mtlr r0 /* 802678A8 00264808 38 21 00 10 */ addi r1, r1, 0x10 -/* 802678AC 0026480C 4E 80 00 20 */ blr +/* 802678AC 0026480C 4E 80 00 20 */ blr .global ActivateImmediateHintTimer__12CHintOptionsFPCc ActivateImmediateHintTimer__12CHintOptionsFPCc: @@ -612,7 +612,7 @@ lbl_80267910: /* 80267914 00264874 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80267918 00264878 7C 08 03 A6 */ mtlr r0 /* 8026791C 0026487C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80267920 00264880 4E 80 00 20 */ blr +/* 80267920 00264880 4E 80 00 20 */ blr .global Update__12CHintOptionsfRC13CStateManager Update__12CHintOptionsfRC13CStateManager: @@ -721,7 +721,7 @@ lbl_80267A94: /* 80267A98 002649F8 42 00 FF BC */ bdnz lbl_80267A54 lbl_80267A9C: /* 80267A9C 002649FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80267AA0 00264A00 4E 80 00 20 */ blr +/* 80267AA0 00264A00 4E 80 00 20 */ blr .global InitializeMemoryState__12CHintOptionsFv InitializeMemoryState__12CHintOptionsFv: @@ -745,7 +745,7 @@ InitializeMemoryState__12CHintOptionsFv: /* 80267AE8 00264A48 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80267AEC 00264A4C 7C 08 03 A6 */ mtlr r0 /* 80267AF0 00264A50 38 21 00 20 */ addi r1, r1, 0x20 -/* 80267AF4 00264A54 4E 80 00 20 */ blr +/* 80267AF4 00264A54 4E 80 00 20 */ blr .global sub_80267af8 sub_80267af8: @@ -819,7 +819,7 @@ lbl_80267BD0: /* 80267BE8 00264B48 83 81 00 20 */ lwz r28, 0x20(r1) /* 80267BEC 00264B4C 7C 08 03 A6 */ mtlr r0 /* 80267BF0 00264B50 38 21 00 30 */ addi r1, r1, 0x30 -/* 80267BF4 00264B54 4E 80 00 20 */ blr +/* 80267BF4 00264B54 4E 80 00 20 */ blr .global PutTo__16CGameHintManagerFR16CMemoryStreamOut PutTo__16CGameHintManagerFR16CMemoryStreamOut: @@ -858,13 +858,13 @@ lbl_80267C4C: /* 80267C70 00264BD0 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80267C74 00264BD4 7C 08 03 A6 */ mtlr r0 /* 80267C78 00264BD8 38 21 00 20 */ addi r1, r1, 0x20 -/* 80267C7C 00264BDC 4E 80 00 20 */ blr +/* 80267C7C 00264BDC 4E 80 00 20 */ blr .global SetHintNextTime__12CHintOptionsFv SetHintNextTime__12CHintOptionsFv: /* 80267C80 00264BE0 80 E3 00 10 */ lwz r7, 0x10(r3) /* 80267C84 00264BE4 2C 07 FF FF */ cmpwi r7, -1 -/* 80267C88 00264BE8 4D 82 00 20 */ beqlr +/* 80267C88 00264BE8 4D 82 00 20 */ beqlr /* 80267C8C 00264BEC 80 AD A0 84 */ lwz r5, gpMemoryCard@sda21(r13) /* 80267C90 00264BF0 1C 87 00 30 */ mulli r4, r7, 0x30 /* 80267C94 00264BF4 C0 22 BA E8 */ lfs f1, lbl_805AD808@sda21(r2) @@ -877,7 +877,7 @@ SetHintNextTime__12CHintOptionsFv: /* 80267CB0 00264C10 7C 66 22 14 */ add r3, r6, r4 /* 80267CB4 00264C14 EC 01 00 2A */ fadds f0, f1, f0 /* 80267CB8 00264C18 D0 03 00 04 */ stfs f0, 4(r3) -/* 80267CBC 00264C1C 4E 80 00 20 */ blr +/* 80267CBC 00264C1C 4E 80 00 20 */ blr .global __ct__12CHintOptionsFR12CInputStream __ct__12CHintOptionsFR12CInputStream: @@ -981,7 +981,7 @@ lbl_80267E00: /* 80267E20 00264D80 83 81 00 20 */ lwz r28, 0x20(r1) /* 80267E24 00264D84 7C 08 03 A6 */ mtlr r0 /* 80267E28 00264D88 38 21 00 30 */ addi r1, r1, 0x30 -/* 80267E2C 00264D8C 4E 80 00 20 */ blr +/* 80267E2C 00264D8C 4E 80 00 20 */ blr .global __ct__12CHintOptionsFv __ct__12CHintOptionsFv: @@ -991,7 +991,7 @@ __ct__12CHintOptionsFv: /* 80267E3C 00264D9C 90 83 00 08 */ stw r4, 8(r3) /* 80267E40 00264DA0 90 83 00 0C */ stw r4, 0xc(r3) /* 80267E44 00264DA4 90 03 00 10 */ stw r0, 0x10(r3) -/* 80267E48 00264DA8 4E 80 00 20 */ blr +/* 80267E48 00264DA8 4E 80 00 20 */ blr .global CanContinue__Q212CHintOptions10SHintStateFv CanContinue__Q212CHintOptions10SHintStateFv: @@ -1002,7 +1002,7 @@ CanContinue__Q212CHintOptions10SHintStateFv: /* 80267E5C 00264DBC FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80267E60 00264DC0 7C 00 00 26 */ mfcr r0 /* 80267E64 00264DC4 54 03 0F FE */ srwi r3, r0, 0x1f -/* 80267E68 00264DC8 4E 80 00 20 */ blr +/* 80267E68 00264DC8 4E 80 00 20 */ blr .global sub_80267e6c sub_80267e6c: @@ -1010,7 +1010,7 @@ sub_80267e6c: /* 80267E70 00264DD0 38 00 00 00 */ li r0, 0 /* 80267E74 00264DD4 D0 23 00 04 */ stfs f1, 4(r3) /* 80267E78 00264DD8 98 03 00 08 */ stb r0, 8(r3) -/* 80267E7C 00264DDC 4E 80 00 20 */ blr +/* 80267E7C 00264DDC 4E 80 00 20 */ blr .global sub_80267e80 sub_80267e80: @@ -1019,7 +1019,7 @@ sub_80267e80: /* 80267E88 00264DE8 90 03 00 00 */ stw r0, 0(r3) /* 80267E8C 00264DEC D0 03 00 04 */ stfs f0, 4(r3) /* 80267E90 00264DF0 98 03 00 08 */ stb r0, 8(r3) -/* 80267E94 00264DF4 4E 80 00 20 */ blr +/* 80267E94 00264DF4 4E 80 00 20 */ blr .global __ct__13CGameHintInfoFR12CInputStreamUi __ct__13CGameHintInfoFR12CInputStreamUi: @@ -1068,7 +1068,7 @@ lbl_80267F18: /* 80267F38 00264E98 83 81 00 40 */ lwz r28, 0x40(r1) /* 80267F3C 00264E9C 7C 08 03 A6 */ mtlr r0 /* 80267F40 00264EA0 38 21 00 50 */ addi r1, r1, 0x50 -/* 80267F44 00264EA4 4E 80 00 20 */ blr +/* 80267F44 00264EA4 4E 80 00 20 */ blr .global "push_back__Q24rstl62vectorFRCQ213CGameHintInfo9CGameHint" "push_back__Q24rstl62vectorFRCQ213CGameHintInfo9CGameHint": @@ -1104,7 +1104,7 @@ lbl_80267F88: /* 80267FB4 00264F14 80 01 00 14 */ lwz r0, 0x14(r1) /* 80267FB8 00264F18 7C 08 03 A6 */ mtlr r0 /* 80267FBC 00264F1C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80267FC0 00264F20 4E 80 00 20 */ blr +/* 80267FC0 00264F20 4E 80 00 20 */ blr .global "construct__4rstlFRCQ213CGameHintInfo9CGameHint" "construct__4rstlFRCQ213CGameHintInfo9CGameHint": @@ -1118,7 +1118,7 @@ lbl_80267FDC: /* 80267FDC 00264F3C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80267FE0 00264F40 7C 08 03 A6 */ mtlr r0 /* 80267FE4 00264F44 38 21 00 10 */ addi r1, r1, 0x10 -/* 80267FE8 00264F48 4E 80 00 20 */ blr +/* 80267FE8 00264F48 4E 80 00 20 */ blr .global __ct__Q213CGameHintInfo9CGameHintFRCQ213CGameHintInfo9CGameHint __ct__Q213CGameHintInfo9CGameHintFRCQ213CGameHintInfo9CGameHint: @@ -1193,7 +1193,7 @@ lbl_802680D8: /* 802680E4 00265044 83 C1 00 08 */ lwz r30, 8(r1) /* 802680E8 00265048 7C 08 03 A6 */ mtlr r0 /* 802680EC 0026504C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802680F0 00265050 4E 80 00 20 */ blr +/* 802680F0 00265050 4E 80 00 20 */ blr .global __ct__Q213CGameHintInfo9CGameHintFR12CInputStreamUi __ct__Q213CGameHintInfo9CGameHintFR12CInputStreamUi: @@ -1293,7 +1293,7 @@ lbl_80268230: /* 8026824C 002651AC 83 81 00 30 */ lwz r28, 0x30(r1) /* 80268250 002651B0 7C 08 03 A6 */ mtlr r0 /* 80268254 002651B4 38 21 00 40 */ addi r1, r1, 0x40 -/* 80268258 002651B8 4E 80 00 20 */ blr +/* 80268258 002651B8 4E 80 00 20 */ blr .global __ct__Q213CGameHintInfo13SHintLocationFR12CInputStream __ct__Q213CGameHintInfo13SHintLocationFR12CInputStream: @@ -1322,7 +1322,7 @@ __ct__Q213CGameHintInfo13SHintLocationFR12CInputStream: /* 802682B4 00265214 83 C1 00 08 */ lwz r30, 8(r1) /* 802682B8 00265218 7C 08 03 A6 */ mtlr r0 /* 802682BC 0026521C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802682C0 00265220 4E 80 00 20 */ blr +/* 802682C0 00265220 4E 80 00 20 */ blr .global GetBitCount__16CGameHintManagerFi GetBitCount__16CGameHintManagerFi: @@ -1335,7 +1335,7 @@ lbl_802682D4: /* 802682D4 00265234 28 03 00 00 */ cmplwi r3, 0 /* 802682D8 00265238 40 82 FF F4 */ bne lbl_802682CC /* 802682DC 0026523C 7C 83 23 78 */ mr r3, r4 -/* 802682E0 00265240 4E 80 00 20 */ blr +/* 802682E0 00265240 4E 80 00 20 */ blr .global "reserve__Q24rstl67vectorFi" "reserve__Q24rstl67vectorFi": @@ -1412,7 +1412,7 @@ lbl_802683CC: /* 802683D8 00265338 83 A1 00 24 */ lwz r29, 0x24(r1) /* 802683DC 0026533C 7C 08 03 A6 */ mtlr r0 /* 802683E0 00265340 38 21 00 30 */ addi r1, r1, 0x30 -/* 802683E4 00265344 4E 80 00 20 */ blr +/* 802683E4 00265344 4E 80 00 20 */ blr .global "reserve__Q24rstl62vectorFi" "reserve__Q24rstl62vectorFi": @@ -1471,7 +1471,7 @@ lbl_8026849C: /* 802684A8 00265408 83 A1 00 24 */ lwz r29, 0x24(r1) /* 802684AC 0026540C 7C 08 03 A6 */ mtlr r0 /* 802684B0 00265410 38 21 00 30 */ addi r1, r1, 0x30 -/* 802684B4 00265414 4E 80 00 20 */ blr +/* 802684B4 00265414 4E 80 00 20 */ blr .global sub_802684b8 sub_802684b8: @@ -1495,7 +1495,7 @@ lbl_802684E4: /* 802684F4 00265454 83 C1 00 08 */ lwz r30, 8(r1) /* 802684F8 00265458 7C 08 03 A6 */ mtlr r0 /* 802684FC 0026545C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80268500 00265460 4E 80 00 20 */ blr +/* 80268500 00265460 4E 80 00 20 */ blr .global sub_80268504 sub_80268504: @@ -1526,4 +1526,4 @@ lbl_80268540: /* 8026855C 002654BC 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80268560 002654C0 7C 08 03 A6 */ mtlr r0 /* 80268564 002654C4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80268568 002654C8 4E 80 00 20 */ blr +/* 80268568 002654C8 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/Player/CGameOptions.s b/asm/MetroidPrime/Player/CGameOptions.s index 208dea2e..7aba5a18 100644 --- a/asm/MetroidPrime/Player/CGameOptions.s +++ b/asm/MetroidPrime/Player/CGameOptions.s @@ -208,7 +208,7 @@ lbl_8020E9D0: /* 8020E9D4 0020B934 80 01 00 14 */ lwz r0, 0x14(r1) /* 8020E9D8 0020B938 7C 08 03 A6 */ mtlr r0 /* 8020E9DC 0020B93C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8020E9E0 0020B940 4E 80 00 20 */ blr +/* 8020E9E0 0020B940 4E 80 00 20 */ blr .global ResetControllerAssets__12CGameOptionsFv ResetControllerAssets__12CGameOptionsFv: @@ -407,7 +407,7 @@ lbl_8020ECA0: /* 8020ECA4 0020BC04 80 01 00 D4 */ lwz r0, 0xd4(r1) /* 8020ECA8 0020BC08 7C 08 03 A6 */ mtlr r0 /* 8020ECAC 0020BC0C 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 8020ECB0 0020BC10 4E 80 00 20 */ blr +/* 8020ECB0 0020BC10 4E 80 00 20 */ blr .global ToggleControls__12CGameOptionsFb ToggleControls__12CGameOptionsFb: @@ -429,40 +429,40 @@ lbl_8020ECE8: /* 8020ECE8 0020BC48 80 01 00 14 */ lwz r0, 0x14(r1) /* 8020ECEC 0020BC4C 7C 08 03 A6 */ mtlr r0 /* 8020ECF0 0020BC50 38 21 00 10 */ addi r1, r1, 0x10 -/* 8020ECF4 0020BC54 4E 80 00 20 */ blr +/* 8020ECF4 0020BC54 4E 80 00 20 */ blr .global SetIsRumbleEnabled__12CGameOptionsFb SetIsRumbleEnabled__12CGameOptionsFb: /* 8020ECF8 0020BC58 88 03 00 68 */ lbz r0, 0x68(r3) /* 8020ECFC 0020BC5C 50 80 2E B4 */ rlwimi r0, r4, 5, 0x1a, 0x1a /* 8020ED00 0020BC60 98 03 00 68 */ stb r0, 0x68(r3) -/* 8020ED04 0020BC64 4E 80 00 20 */ blr +/* 8020ED04 0020BC64 4E 80 00 20 */ blr .global SetInvertYAxis__12CGameOptionsFb SetInvertYAxis__12CGameOptionsFb: /* 8020ED08 0020BC68 88 03 00 68 */ lbz r0, 0x68(r3) /* 8020ED0C 0020BC6C 50 80 36 72 */ rlwimi r0, r4, 6, 0x19, 0x19 /* 8020ED10 0020BC70 98 03 00 68 */ stb r0, 0x68(r3) -/* 8020ED14 0020BC74 4E 80 00 20 */ blr +/* 8020ED14 0020BC74 4E 80 00 20 */ blr .global SetIsHintSystemEnabled__12CGameOptionsFb SetIsHintSystemEnabled__12CGameOptionsFb: /* 8020ED18 0020BC78 88 03 00 68 */ lbz r0, 0x68(r3) /* 8020ED1C 0020BC7C 50 80 1F 38 */ rlwimi r0, r4, 3, 0x1c, 0x1c /* 8020ED20 0020BC80 98 03 00 68 */ stb r0, 0x68(r3) -/* 8020ED24 0020BC84 4E 80 00 20 */ blr +/* 8020ED24 0020BC84 4E 80 00 20 */ blr .global SetHUDLag__12CGameOptionsFb SetHUDLag__12CGameOptionsFb: /* 8020ED28 0020BC88 88 03 00 68 */ lbz r0, 0x68(r3) /* 8020ED2C 0020BC8C 50 80 3E 30 */ rlwimi r0, r4, 7, 0x18, 0x18 /* 8020ED30 0020BC90 98 03 00 68 */ stb r0, 0x68(r3) -/* 8020ED34 0020BC94 4E 80 00 20 */ blr +/* 8020ED34 0020BC94 4E 80 00 20 */ blr .global SetHelmetAlpha__12CGameOptionsFi SetHelmetAlpha__12CGameOptionsFi: /* 8020ED38 0020BC98 90 83 00 64 */ stw r4, 0x64(r3) -/* 8020ED3C 0020BC9C 4E 80 00 20 */ blr +/* 8020ED3C 0020BC9C 4E 80 00 20 */ blr .global GetHelmetAlpha__12CGameOptionsCFv GetHelmetAlpha__12CGameOptionsCFv: @@ -478,7 +478,7 @@ GetHelmetAlpha__12CGameOptionsCFv: /* 8020ED64 0020BCC4 EC 00 08 28 */ fsubs f0, f0, f1 /* 8020ED68 0020BCC8 EC 22 00 32 */ fmuls f1, f2, f0 /* 8020ED6C 0020BCCC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8020ED70 0020BCD0 4E 80 00 20 */ blr +/* 8020ED70 0020BCD0 4E 80 00 20 */ blr .global GetHudAlpha__12CGameOptionsCFv GetHudAlpha__12CGameOptionsCFv: @@ -494,7 +494,7 @@ GetHudAlpha__12CGameOptionsCFv: /* 8020ED98 0020BCF8 EC 00 08 28 */ fsubs f0, f0, f1 /* 8020ED9C 0020BCFC EC 22 00 32 */ fmuls f1, f2, f0 /* 8020EDA0 0020BD00 38 21 00 10 */ addi r1, r1, 0x10 -/* 8020EDA4 0020BD04 4E 80 00 20 */ blr +/* 8020EDA4 0020BD04 4E 80 00 20 */ blr .global SetSurroundMode__12CGameOptionsFQ29CAudioSys14ESurroundModesi SetSurroundMode__12CGameOptionsFQ29CAudioSys14ESurroundModesi: @@ -522,7 +522,7 @@ lbl_8020EDF0: /* 8020EDF8 0020BD58 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8020EDFC 0020BD5C 7C 08 03 A6 */ mtlr r0 /* 8020EE00 0020BD60 38 21 00 20 */ addi r1, r1, 0x20 -/* 8020EE04 0020BD64 4E 80 00 20 */ blr +/* 8020EE04 0020BD64 4E 80 00 20 */ blr .global SetMusicVolume__12CGameOptionsFib SetMusicVolume__12CGameOptionsFib: @@ -550,7 +550,7 @@ lbl_8020EE50: /* 8020EE58 0020BDB8 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8020EE5C 0020BDBC 7C 08 03 A6 */ mtlr r0 /* 8020EE60 0020BDC0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8020EE64 0020BDC4 4E 80 00 20 */ blr +/* 8020EE64 0020BDC4 4E 80 00 20 */ blr .global SetSfxVolume__12CGameOptionsFib SetSfxVolume__12CGameOptionsFib: @@ -587,7 +587,7 @@ lbl_8020EED4: /* 8020EEDC 0020BE3C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8020EEE0 0020BE40 7C 08 03 A6 */ mtlr r0 /* 8020EEE4 0020BE44 38 21 00 20 */ addi r1, r1, 0x20 -/* 8020EEE8 0020BE48 4E 80 00 20 */ blr +/* 8020EEE8 0020BE48 4E 80 00 20 */ blr .global SetScreenStretch__12CGameOptionsFib SetScreenStretch__12CGameOptionsFib: @@ -621,7 +621,7 @@ lbl_8020EF4C: /* 8020EF54 0020BEB4 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8020EF58 0020BEB8 7C 08 03 A6 */ mtlr r0 /* 8020EF5C 0020BEBC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8020EF60 0020BEC0 4E 80 00 20 */ blr +/* 8020EF60 0020BEC0 4E 80 00 20 */ blr .global SetScreenPositionY__12CGameOptionsFib SetScreenPositionY__12CGameOptionsFib: @@ -655,7 +655,7 @@ lbl_8020EFC4: /* 8020EFCC 0020BF2C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8020EFD0 0020BF30 7C 08 03 A6 */ mtlr r0 /* 8020EFD4 0020BF34 38 21 00 20 */ addi r1, r1, 0x20 -/* 8020EFD8 0020BF38 4E 80 00 20 */ blr +/* 8020EFD8 0020BF38 4E 80 00 20 */ blr .global SetScreenPositionX__12CGameOptionsFib SetScreenPositionX__12CGameOptionsFib: @@ -689,7 +689,7 @@ lbl_8020F03C: /* 8020F044 0020BFA4 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8020F048 0020BFA8 7C 08 03 A6 */ mtlr r0 /* 8020F04C 0020BFAC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8020F050 0020BFB0 4E 80 00 20 */ blr +/* 8020F050 0020BFB0 4E 80 00 20 */ blr .global TuneScreenBrightness__12CGameOptionsFv TuneScreenBrightness__12CGameOptionsFv: @@ -709,7 +709,7 @@ TuneScreenBrightness__12CGameOptionsFv: /* 8020F088 0020BFE8 EC 22 00 72 */ fmuls f1, f2, f1 /* 8020F08C 0020BFEC EC 24 00 7A */ fmadds f1, f4, f1, f0 /* 8020F090 0020BFF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8020F094 0020BFF4 4E 80 00 20 */ blr +/* 8020F094 0020BFF4 4E 80 00 20 */ blr .global SetScreenBrightness__12CGameOptionsFib SetScreenBrightness__12CGameOptionsFib: @@ -738,7 +738,7 @@ lbl_8020F0E4: /* 8020F0EC 0020C04C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8020F0F0 0020C050 7C 08 03 A6 */ mtlr r0 /* 8020F0F4 0020C054 38 21 00 20 */ addi r1, r1, 0x20 -/* 8020F0F8 0020C058 4E 80 00 20 */ blr +/* 8020F0F8 0020C058 4E 80 00 20 */ blr .global EnsureOptions__12CGameOptionsFv EnsureOptions__12CGameOptionsFv: @@ -801,7 +801,7 @@ EnsureOptions__12CGameOptionsFv: /* 8020F1DC 0020C13C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8020F1E0 0020C140 7C 08 03 A6 */ mtlr r0 /* 8020F1E4 0020C144 38 21 00 10 */ addi r1, r1, 0x10 -/* 8020F1E8 0020C148 4E 80 00 20 */ blr +/* 8020F1E8 0020C148 4E 80 00 20 */ blr .global ResetToDefaults__12CGameOptionsFv ResetToDefaults__12CGameOptionsFv: @@ -846,7 +846,7 @@ ResetToDefaults__12CGameOptionsFv: /* 8020F284 0020C1E4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8020F288 0020C1E8 7C 08 03 A6 */ mtlr r0 /* 8020F28C 0020C1EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8020F290 0020C1F0 4E 80 00 20 */ blr +/* 8020F290 0020C1F0 4E 80 00 20 */ blr .global PutTo__12CGameOptionsFR16CMemoryStreamOut PutTo__12CGameOptionsFR16CMemoryStreamOut: @@ -983,7 +983,7 @@ lbl_8020F2D4: /* 8020F494 0020C3F4 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8020F498 0020C3F8 7C 08 03 A6 */ mtlr r0 /* 8020F49C 0020C3FC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8020F4A0 0020C400 4E 80 00 20 */ blr +/* 8020F4A0 0020C400 4E 80 00 20 */ blr .global __ct__12CGameOptionsFR12CInputStream __ct__12CGameOptionsFR12CInputStream: @@ -1200,7 +1200,7 @@ lbl_8020F608: /* 8020F7C0 0020C720 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8020F7C4 0020C724 7C 08 03 A6 */ mtlr r0 /* 8020F7C8 0020C728 38 21 00 20 */ addi r1, r1, 0x20 -/* 8020F7CC 0020C72C 4E 80 00 20 */ blr +/* 8020F7CC 0020C72C 4E 80 00 20 */ blr .global __ct__12CGameOptionsFv __ct__12CGameOptionsFv: @@ -1298,7 +1298,7 @@ lbl_8020F87C: /* 8020F918 0020C878 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8020F91C 0020C87C 7C 08 03 A6 */ mtlr r0 /* 8020F920 0020C880 38 21 00 10 */ addi r1, r1, 0x10 -/* 8020F924 0020C884 4E 80 00 20 */ blr +/* 8020F924 0020C884 4E 80 00 20 */ blr .global InitSoundMode__12CGameOptionsFi InitSoundMode__12CGameOptionsFi: @@ -1326,7 +1326,7 @@ lbl_8020F96C: /* 8020F970 0020C8D0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8020F974 0020C8D4 7C 08 03 A6 */ mtlr r0 /* 8020F978 0020C8D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8020F97C 0020C8DC 4E 80 00 20 */ blr +/* 8020F97C 0020C8DC 4E 80 00 20 */ blr .global CalculateBits__Fi CalculateBits__Fi: @@ -1463,7 +1463,7 @@ lbl_8020FB44: /* 8020FB54 0020CAB4 83 81 00 40 */ lwz r28, 0x40(r1) /* 8020FB58 0020CAB8 7C 08 03 A6 */ mtlr r0 /* 8020FB5C 0020CABC 38 21 00 50 */ addi r1, r1, 0x50 -/* 8020FB60 0020CAC0 4E 80 00 20 */ blr +/* 8020FB60 0020CAC0 4E 80 00 20 */ blr .global sub_8020fb64 sub_8020fb64: @@ -1481,7 +1481,7 @@ lbl_8020FB8C: /* 8020FB8C 0020CAEC 80 E5 00 00 */ lwz r7, 0(r5) /* 8020FB90 0020CAF0 80 04 00 00 */ lwz r0, 0(r4) /* 8020FB94 0020CAF4 7C 07 00 40 */ cmplw r7, r0 -/* 8020FB98 0020CAF8 4C 80 00 20 */ bgelr +/* 8020FB98 0020CAF8 4C 80 00 20 */ bgelr /* 8020FB9C 0020CAFC 80 C5 00 04 */ lwz r6, 4(r5) /* 8020FBA0 0020CB00 90 05 00 00 */ stw r0, 0(r5) /* 8020FBA4 0020CB04 80 04 00 04 */ lwz r0, 4(r4) @@ -1494,11 +1494,11 @@ lbl_8020FB8C: /* 8020FBC0 0020CB20 90 04 00 04 */ stw r0, 4(r4) /* 8020FBC4 0020CB24 90 E3 00 00 */ stw r7, 0(r3) /* 8020FBC8 0020CB28 90 C3 00 04 */ stw r6, 4(r3) -/* 8020FBCC 0020CB2C 4E 80 00 20 */ blr +/* 8020FBCC 0020CB2C 4E 80 00 20 */ blr lbl_8020FBD0: /* 8020FBD0 0020CB30 90 E4 00 00 */ stw r7, 0(r4) /* 8020FBD4 0020CB34 90 C4 00 04 */ stw r6, 4(r4) -/* 8020FBD8 0020CB38 4E 80 00 20 */ blr +/* 8020FBD8 0020CB38 4E 80 00 20 */ blr .global sub_8020fbdc sub_8020fbdc: diff --git a/asm/MetroidPrime/Player/CGameState.s b/asm/MetroidPrime/Player/CGameState.s index 7b5de719..2be522e8 100644 --- a/asm/MetroidPrime/Player/CGameState.s +++ b/asm/MetroidPrime/Player/CGameState.s @@ -62,7 +62,7 @@ lbl_805A7D70: # ROM: 0x3F5710 .4byte 0 .4byte 0 - + .section .text, "ax" .global SetDeferPowerupInit__10CGameStateFb @@ -70,26 +70,26 @@ SetDeferPowerupInit__10CGameStateFb: /* 801D389C 001D07FC 88 03 02 28 */ lbz r0, 0x228(r3) /* 801D38A0 001D0800 50 80 36 72 */ rlwimi r0, r4, 6, 0x19, 0x19 /* 801D38A4 001D0804 98 03 02 28 */ stb r0, 0x228(r3) -/* 801D38A8 001D0808 4E 80 00 20 */ blr +/* 801D38A8 001D0808 4E 80 00 20 */ blr .global GetHardModeWeaponMultiplier__10CGameStateCFv GetHardModeWeaponMultiplier__10CGameStateCFv: /* 801D38AC 001D080C 80 6D A1 20 */ lwz r3, gpTweakGame@sda21(r13) /* 801D38B0 001D0810 C0 23 00 64 */ lfs f1, 0x64(r3) -/* 801D38B4 001D0814 4E 80 00 20 */ blr +/* 801D38B4 001D0814 4E 80 00 20 */ blr .global GetHardModeDamageMultiplier__10CGameStateCFv GetHardModeDamageMultiplier__10CGameStateCFv: /* 801D38B8 001D0818 80 6D A1 20 */ lwz r3, gpTweakGame@sda21(r13) /* 801D38BC 001D081C C0 23 00 60 */ lfs f1, 0x60(r3) -/* 801D38C0 001D0820 4E 80 00 20 */ blr +/* 801D38C0 001D0820 4E 80 00 20 */ blr .global SetHardMode__10CGameStateFb SetHardMode__10CGameStateFb: /* 801D38C4 001D0824 88 03 02 28 */ lbz r0, 0x228(r3) /* 801D38C8 001D0828 50 80 3E 30 */ rlwimi r0, r4, 7, 0x18, 0x18 /* 801D38CC 001D082C 98 03 02 28 */ stb r0, 0x228(r3) -/* 801D38D0 001D0830 4E 80 00 20 */ blr +/* 801D38D0 001D0830 4E 80 00 20 */ blr .global SetTotalPlayTime__10CGameStateFd SetTotalPlayTime__10CGameStateFd: @@ -109,12 +109,12 @@ SetTotalPlayTime__10CGameStateFd: /* 801D3908 001D0868 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801D390C 001D086C 7C 08 03 A6 */ mtlr r0 /* 801D3910 001D0870 38 21 00 20 */ addi r1, r1, 0x20 -/* 801D3914 001D0874 4E 80 00 20 */ blr +/* 801D3914 001D0874 4E 80 00 20 */ blr .global WorldTransitionManager__10CGameStateFv WorldTransitionManager__10CGameStateFv: /* 801D3918 001D0878 38 63 00 9C */ addi r3, r3, 0x9c -/* 801D391C 001D087C 4E 80 00 20 */ blr +/* 801D391C 001D087C 4E 80 00 20 */ blr .global GetPlayerState__10CGameStateCFv GetPlayerState__10CGameStateCFv: @@ -124,12 +124,12 @@ GetPlayerState__10CGameStateCFv: /* 801D392C 001D088C 80 64 00 04 */ lwz r3, 4(r4) /* 801D3930 001D0890 38 03 00 01 */ addi r0, r3, 1 /* 801D3934 001D0894 90 04 00 04 */ stw r0, 4(r4) -/* 801D3938 001D0898 4E 80 00 20 */ blr +/* 801D3938 001D0898 4E 80 00 20 */ blr .global PlayerState__10CGameStateFv PlayerState__10CGameStateFv: /* 801D393C 001D089C 38 63 00 98 */ addi r3, r3, 0x98 -/* 801D3940 001D08A0 4E 80 00 20 */ blr +/* 801D3940 001D08A0 4E 80 00 20 */ blr .global SetCurrentWorldId__10CGameStateFUi SetCurrentWorldId__10CGameStateFUi: @@ -149,7 +149,7 @@ SetCurrentWorldId__10CGameStateFUi: /* 801D3978 001D08D8 83 C1 00 08 */ lwz r30, 8(r1) /* 801D397C 001D08DC 7C 08 03 A6 */ mtlr r0 /* 801D3980 001D08E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D3984 001D08E4 4E 80 00 20 */ blr +/* 801D3984 001D08E4 4E 80 00 20 */ blr .global GetCurrentWorldState__10CGameStateCFv GetCurrentWorldState__10CGameStateCFv: @@ -161,7 +161,7 @@ GetCurrentWorldState__10CGameStateCFv: /* 801D399C 001D08FC 80 01 00 14 */ lwz r0, 0x14(r1) /* 801D39A0 001D0900 7C 08 03 A6 */ mtlr r0 /* 801D39A4 001D0904 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D39A8 001D0908 4E 80 00 20 */ blr +/* 801D39A8 001D0908 4E 80 00 20 */ blr .global CurrentWorldState__10CGameStateFv CurrentWorldState__10CGameStateFv: @@ -173,12 +173,12 @@ CurrentWorldState__10CGameStateFv: /* 801D39C0 001D0920 80 01 00 14 */ lwz r0, 0x14(r1) /* 801D39C4 001D0924 7C 08 03 A6 */ mtlr r0 /* 801D39C8 001D0928 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D39CC 001D092C 4E 80 00 20 */ blr +/* 801D39CC 001D092C 4E 80 00 20 */ blr .global CurrentWorldAssetId__10CGameStateCFv CurrentWorldAssetId__10CGameStateCFv: /* 801D39D0 001D0930 80 63 00 84 */ lwz r3, 0x84(r3) -/* 801D39D4 001D0934 4E 80 00 20 */ blr +/* 801D39D4 001D0934 4E 80 00 20 */ blr .global StateForWorld__10CGameStateFUi StateForWorld__10CGameStateFUi: @@ -254,7 +254,7 @@ lbl_801D3AC0: /* 801D3ACC 001D0A2C 83 A1 00 24 */ lwz r29, 0x24(r1) /* 801D3AD0 001D0A30 7C 08 03 A6 */ mtlr r0 /* 801D3AD4 001D0A34 38 21 00 30 */ addi r1, r1, 0x30 -/* 801D3AD8 001D0A38 4E 80 00 20 */ blr +/* 801D3AD8 001D0A38 4E 80 00 20 */ blr .global __ct__11CWorldStateFRC11CWorldState __ct__11CWorldStateFRC11CWorldState: @@ -314,7 +314,7 @@ lbl_801D3B90: /* 801D3BA4 001D0B04 80 01 00 14 */ lwz r0, 0x14(r1) /* 801D3BA8 001D0B08 7C 08 03 A6 */ mtlr r0 /* 801D3BAC 001D0B0C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D3BB0 001D0B10 4E 80 00 20 */ blr +/* 801D3BB0 001D0B10 4E 80 00 20 */ blr .global WriteBackupBuf__10CGameStateFv WriteBackupBuf__10CGameStateFv: @@ -343,7 +343,7 @@ WriteBackupBuf__10CGameStateFv: /* 801D3C0C 001D0B6C 83 E1 00 9C */ lwz r31, 0x9c(r1) /* 801D3C10 001D0B70 7C 08 03 A6 */ mtlr r0 /* 801D3C14 001D0B74 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 801D3C18 001D0B78 4E 80 00 20 */ blr +/* 801D3C18 001D0B78 4E 80 00 20 */ blr .global "resize__Q24rstl37vectorFiRCUc" "resize__Q24rstl37vectorFiRCUc": @@ -412,7 +412,7 @@ lbl_801D3CE0: /* 801D3CF8 001D0C58 83 81 00 20 */ lwz r28, 0x20(r1) /* 801D3CFC 001D0C5C 7C 08 03 A6 */ mtlr r0 /* 801D3D00 001D0C60 38 21 00 30 */ addi r1, r1, 0x30 -/* 801D3D04 001D0C64 4E 80 00 20 */ blr +/* 801D3D04 001D0C64 4E 80 00 20 */ blr .global ExportPersistentOptions__10CGameStateFRC14CSystemOptions ExportPersistentOptions__10CGameStateFRC14CSystemOptions: @@ -546,7 +546,7 @@ lbl_801D3EB4: /* 801D3EBC 001D0E1C 83 C1 00 08 */ lwz r30, 8(r1) /* 801D3EC0 001D0E20 7C 08 03 A6 */ mtlr r0 /* 801D3EC4 001D0E24 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D3EC8 001D0E28 4E 80 00 20 */ blr +/* 801D3EC8 001D0E28 4E 80 00 20 */ blr .global ImportPersistentOptions__10CGameStateFRC14CSystemOptions ImportPersistentOptions__10CGameStateFRC14CSystemOptions: @@ -643,7 +643,7 @@ lbl_801D3FC0: /* 801D400C 001D0F6C 83 C1 00 08 */ lwz r30, 8(r1) /* 801D4010 001D0F70 7C 08 03 A6 */ mtlr r0 /* 801D4014 001D0F74 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D4018 001D0F78 4E 80 00 20 */ blr +/* 801D4018 001D0F78 4E 80 00 20 */ blr .global sub_801d401c sub_801d401c: @@ -655,7 +655,7 @@ sub_801d401c: /* 801D4030 001D0F90 80 01 00 14 */ lwz r0, 0x14(r1) /* 801D4034 001D0F94 7C 08 03 A6 */ mtlr r0 /* 801D4038 001D0F98 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D403C 001D0F9C 4E 80 00 20 */ blr +/* 801D403C 001D0F9C 4E 80 00 20 */ blr .global ReadSystemOptions__10CGameStateFR12CInputStream ReadSystemOptions__10CGameStateFR12CInputStream: @@ -676,7 +676,7 @@ ReadSystemOptions__10CGameStateFR12CInputStream: /* 801D4078 001D0FD8 83 E1 00 EC */ lwz r31, 0xec(r1) /* 801D407C 001D0FDC 7C 08 03 A6 */ mtlr r0 /* 801D4080 001D0FE0 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 801D4084 001D0FE4 4E 80 00 20 */ blr +/* 801D4084 001D0FE4 4E 80 00 20 */ blr .global PutTo__10CGameStateFR16CMemoryStreamOut PutTo__10CGameStateFR16CMemoryStreamOut: @@ -765,7 +765,7 @@ lbl_801D41A8: /* 801D41C4 001D1124 81 84 00 00 */ lwz r12, 0(r4) /* 801D41C8 001D1128 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801D41CC 001D112C 7D 89 03 A6 */ mtctr r12 -/* 801D41D0 001D1130 4E 80 04 21 */ bctrl +/* 801D41D0 001D1130 4E 80 04 21 */ bctrl /* 801D41D4 001D1134 7F 03 C3 78 */ mr r3, r24 /* 801D41D8 001D1138 38 81 00 08 */ addi r4, r1, 8 /* 801D41DC 001D113C 48 16 CC CD */ bl __ct__6CTokenFRC6CToken @@ -798,7 +798,7 @@ lbl_801D4228: /* 801D4244 001D11A4 80 01 00 54 */ lwz r0, 0x54(r1) /* 801D4248 001D11A8 7C 08 03 A6 */ mtlr r0 /* 801D424C 001D11AC 38 21 00 50 */ addi r1, r1, 0x50 -/* 801D4250 001D11B0 4E 80 00 20 */ blr +/* 801D4250 001D11B0 4E 80 00 20 */ blr .global LoadGameFileState__10CGameStateFPCv LoadGameFileState__10CGameStateFPCv: @@ -929,7 +929,7 @@ lbl_801D43D4: /* 801D4430 001D1390 83 A1 02 14 */ lwz r29, 0x214(r1) /* 801D4434 001D1394 7C 08 03 A6 */ mtlr r0 /* 801D4438 001D1398 38 21 02 20 */ addi r1, r1, 0x220 -/* 801D443C 001D139C 4E 80 00 20 */ blr +/* 801D443C 001D139C 4E 80 00 20 */ blr .global InitializeMemoryWorlds__10CGameStateFv InitializeMemoryWorlds__10CGameStateFv: @@ -988,7 +988,7 @@ lbl_801D44E4: /* 801D4508 001D1468 83 A1 00 24 */ lwz r29, 0x24(r1) /* 801D450C 001D146C 7C 08 03 A6 */ mtlr r0 /* 801D4510 001D1470 38 21 00 30 */ addi r1, r1, 0x30 -/* 801D4514 001D1474 4E 80 00 20 */ blr +/* 801D4514 001D1474 4E 80 00 20 */ blr .global InitializeMemoryStates__10CGameStateFv InitializeMemoryStates__10CGameStateFv: @@ -1010,7 +1010,7 @@ InitializeMemoryStates__10CGameStateFv: /* 801D4554 001D14B4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801D4558 001D14B8 7C 08 03 A6 */ mtlr r0 /* 801D455C 001D14BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D4560 001D14C0 4E 80 00 20 */ blr +/* 801D4560 001D14C0 4E 80 00 20 */ blr .global __ct__10CGameStateFR12CInputStreami __ct__10CGameStateFR12CInputStreami: @@ -1271,7 +1271,7 @@ lbl_801D48F0: /* 801D490C 001D186C 81 84 00 00 */ lwz r12, 0(r4) /* 801D4910 001D1870 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801D4914 001D1874 7D 89 03 A6 */ mtctr r12 -/* 801D4918 001D1878 4E 80 04 21 */ bctrl +/* 801D4918 001D1878 4E 80 04 21 */ bctrl /* 801D491C 001D187C 7E C3 B3 78 */ mr r3, r22 /* 801D4920 001D1880 38 81 00 18 */ addi r4, r1, 0x18 /* 801D4924 001D1884 48 16 C5 85 */ bl __ct__6CTokenFRC6CToken @@ -1328,7 +1328,7 @@ lbl_801D49B0: /* 801D49E0 001D1940 80 01 01 14 */ lwz r0, 0x114(r1) /* 801D49E4 001D1944 7C 08 03 A6 */ mtlr r0 /* 801D49E8 001D1948 38 21 01 10 */ addi r1, r1, 0x110 -/* 801D49EC 001D194C 4E 80 00 20 */ blr +/* 801D49EC 001D194C 4E 80 00 20 */ blr .global __ct__12CHintOptionsFR12CHintOptions __ct__12CHintOptionsFR12CHintOptions: @@ -1348,7 +1348,7 @@ __ct__12CHintOptionsFR12CHintOptions: /* 801D4A24 001D1984 80 01 00 14 */ lwz r0, 0x14(r1) /* 801D4A28 001D1988 7C 08 03 A6 */ mtlr r0 /* 801D4A2C 001D198C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D4A30 001D1990 4E 80 00 20 */ blr +/* 801D4A30 001D1990 4E 80 00 20 */ blr .global sub_801d4a34 sub_801d4a34: @@ -1426,7 +1426,7 @@ lbl_801D4B20: /* 801D4B28 001D1A88 83 C1 00 18 */ lwz r30, 0x18(r1) /* 801D4B2C 001D1A8C 7C 08 03 A6 */ mtlr r0 /* 801D4B30 001D1A90 38 21 00 20 */ addi r1, r1, 0x20 -/* 801D4B34 001D1A94 4E 80 00 20 */ blr +/* 801D4B34 001D1A94 4E 80 00 20 */ blr .global __ct__10CGameStateFv __ct__10CGameStateFv: @@ -1571,33 +1571,33 @@ lbl_801D4D18: /* 801D4D28 001D1C88 7C 08 03 A6 */ mtlr r0 /* 801D4D2C 001D1C8C 38 21 00 10 */ addi r1, r1, 0x10 /* 801D4D30 001D1C90 4E 80 00 20 */ blr - + .global GetLayerState__11CWorldStateFv GetLayerState__11CWorldStateFv: /* 801D4D34 001D1C94 38 63 00 14 */ addi r3, r3, 0x14 -/* 801D4D38 001D1C98 4E 80 00 20 */ blr +/* 801D4D38 001D1C98 4E 80 00 20 */ blr .global SetDesiredAreaAssetId__11CWorldStateFUi SetDesiredAreaAssetId__11CWorldStateFUi: /* 801D4D3C 001D1C9C 90 83 00 10 */ stw r4, 0x10(r3) -/* 801D4D40 001D1CA0 4E 80 00 20 */ blr +/* 801D4D40 001D1CA0 4E 80 00 20 */ blr .global GetDesiredAreaAssetId__11CWorldStateCFv GetDesiredAreaAssetId__11CWorldStateCFv: /* 801D4D44 001D1CA4 80 63 00 10 */ lwz r3, 0x10(r3) -/* 801D4D48 001D1CA8 4E 80 00 20 */ blr +/* 801D4D48 001D1CA8 4E 80 00 20 */ blr .global SetAreaId__11CWorldStateF7TAreaId SetAreaId__11CWorldStateF7TAreaId: /* 801D4D4C 001D1CAC 80 04 00 00 */ lwz r0, 0(r4) /* 801D4D50 001D1CB0 90 03 00 04 */ stw r0, 4(r3) -/* 801D4D54 001D1CB4 4E 80 00 20 */ blr +/* 801D4D54 001D1CB4 4E 80 00 20 */ blr .global GetCurrentArea__11CWorldStateCFv GetCurrentArea__11CWorldStateCFv: /* 801D4D58 001D1CB8 80 04 00 04 */ lwz r0, 4(r4) /* 801D4D5C 001D1CBC 90 03 00 00 */ stw r0, 0(r3) -/* 801D4D60 001D1CC0 4E 80 00 20 */ blr +/* 801D4D60 001D1CC0 4E 80 00 20 */ blr .global GetMapWorldInfo__11CWorldStateCFv GetMapWorldInfo__11CWorldStateCFv: @@ -1607,22 +1607,22 @@ GetMapWorldInfo__11CWorldStateCFv: /* 801D4D70 001D1CD0 80 64 00 04 */ lwz r3, 4(r4) /* 801D4D74 001D1CD4 38 03 00 01 */ addi r0, r3, 1 /* 801D4D78 001D1CD8 90 04 00 04 */ stw r0, 4(r4) -/* 801D4D7C 001D1CDC 4E 80 00 20 */ blr +/* 801D4D7C 001D1CDC 4E 80 00 20 */ blr .global MapWorldInfo__11CWorldStateFv MapWorldInfo__11CWorldStateFv: /* 801D4D80 001D1CE0 38 63 00 0C */ addi r3, r3, 0xc -/* 801D4D84 001D1CE4 4E 80 00 20 */ blr +/* 801D4D84 001D1CE4 4E 80 00 20 */ blr .global Mailbox__11CWorldStateFv Mailbox__11CWorldStateFv: /* 801D4D88 001D1CE8 38 63 00 08 */ addi r3, r3, 8 -/* 801D4D8C 001D1CEC 4E 80 00 20 */ blr +/* 801D4D8C 001D1CEC 4E 80 00 20 */ blr .global GetWorldAssetId__11CWorldStateCFv GetWorldAssetId__11CWorldStateCFv: /* 801D4D90 001D1CF0 80 63 00 00 */ lwz r3, 0(r3) -/* 801D4D94 001D1CF4 4E 80 00 20 */ blr +/* 801D4D94 001D1CF4 4E 80 00 20 */ blr .global PutTo__11CWorldStateFR16CMemoryStreamOut PutTo__11CWorldStateFR16CMemoryStreamOut: @@ -1665,7 +1665,7 @@ PutTo__11CWorldStateFR16CMemoryStreamOut: /* 801D4E28 001D1D88 83 A1 00 14 */ lwz r29, 0x14(r1) /* 801D4E2C 001D1D8C 7C 08 03 A6 */ mtlr r0 /* 801D4E30 001D1D90 38 21 00 20 */ addi r1, r1, 0x20 -/* 801D4E34 001D1D94 4E 80 00 20 */ blr +/* 801D4E34 001D1D94 4E 80 00 20 */ blr .global __ct__11CWorldStateFR12CInputStreamPCvR10CSaveWorld __ct__11CWorldStateFR12CInputStreamPCvR10CSaveWorld: @@ -1819,7 +1819,7 @@ lbl_801D5048: /* 801D5060 001D1FC0 83 81 00 10 */ lwz r28, 0x10(r1) /* 801D5064 001D1FC4 7C 08 03 A6 */ mtlr r0 /* 801D5068 001D1FC8 38 21 00 20 */ addi r1, r1, 0x20 -/* 801D506C 001D1FCC 4E 80 00 20 */ blr +/* 801D506C 001D1FCC 4E 80 00 20 */ blr .global __ct__11CWorldStateFUi __ct__11CWorldStateFUi: @@ -1907,63 +1907,63 @@ lbl_801D5188: /* 801D519C 001D20FC 7C 08 03 A6 */ mtlr r0 /* 801D51A0 001D2100 38 21 00 10 */ addi r1, r1, 0x10 /* 801D51A4 001D2104 4E 80 00 20 */ blr - + .global SetAutoMapperKeyState__14CSystemOptionsFi SetAutoMapperKeyState__14CSystemOptionsFi: /* 801D51A8 001D2108 90 83 00 BC */ stw r4, 0xbc(r3) -/* 801D51AC 001D210C 4E 80 00 20 */ blr +/* 801D51AC 001D210C 4E 80 00 20 */ blr .global SetAllItemsCollected__14CSystemOptionsFb SetAllItemsCollected__14CSystemOptionsFb: /* 801D51B0 001D2110 88 03 00 D0 */ lbz r0, 0xd0(r3) /* 801D51B4 001D2114 50 80 17 7A */ rlwimi r0, r4, 2, 0x1d, 0x1d /* 801D51B8 001D2118 98 03 00 D0 */ stb r0, 0xd0(r3) -/* 801D51BC 001D211C 4E 80 00 20 */ blr +/* 801D51BC 001D211C 4E 80 00 20 */ blr .global SetHasFusion__14CSystemOptionsFb SetHasFusion__14CSystemOptionsFb: /* 801D51C0 001D2120 88 03 00 D0 */ lbz r0, 0xd0(r3) /* 801D51C4 001D2124 50 80 1F 38 */ rlwimi r0, r4, 3, 0x1c, 0x1c /* 801D51C8 001D2128 98 03 00 D0 */ stb r0, 0xd0(r3) -/* 801D51CC 001D212C 4E 80 00 20 */ blr +/* 801D51CC 001D212C 4E 80 00 20 */ blr .global sub_801d51d0 sub_801d51d0: /* 801D51D0 001D2130 88 03 00 D0 */ lbz r0, 0xd0(r3) /* 801D51D4 001D2134 50 80 26 F6 */ rlwimi r0, r4, 4, 0x1b, 0x1b /* 801D51D8 001D2138 98 03 00 D0 */ stb r0, 0xd0(r3) -/* 801D51DC 001D213C 4E 80 00 20 */ blr +/* 801D51DC 001D213C 4E 80 00 20 */ blr .global SetHardModeBeat__14CSystemOptionsFb SetHardModeBeat__14CSystemOptionsFb: /* 801D51E0 001D2140 88 03 00 D0 */ lbz r0, 0xd0(r3) /* 801D51E4 001D2144 50 80 2E B4 */ rlwimi r0, r4, 5, 0x1a, 0x1a /* 801D51E8 001D2148 98 03 00 D0 */ stb r0, 0xd0(r3) -/* 801D51EC 001D214C 4E 80 00 20 */ blr +/* 801D51EC 001D214C 4E 80 00 20 */ blr .global SetHasHardMode__14CSystemOptionsFb SetHasHardMode__14CSystemOptionsFb: /* 801D51F0 001D2150 88 03 00 D0 */ lbz r0, 0xd0(r3) /* 801D51F4 001D2154 50 80 36 72 */ rlwimi r0, r4, 6, 0x19, 0x19 /* 801D51F8 001D2158 98 03 00 D0 */ stb r0, 0xd0(r3) -/* 801D51FC 001D215C 4E 80 00 20 */ blr +/* 801D51FC 001D215C 4E 80 00 20 */ blr .global SetLogScanCount__14CSystemOptionsFi SetLogScanCount__14CSystemOptionsFi: /* 801D5200 001D2160 90 83 00 CC */ stw r4, 0xcc(r3) -/* 801D5204 001D2164 4E 80 00 20 */ blr +/* 801D5204 001D2164 4E 80 00 20 */ blr .global GetLogScanCount__14CSystemOptionsFv GetLogScanCount__14CSystemOptionsFv: /* 801D5208 001D2168 80 63 00 CC */ lwz r3, 0xcc(r3) -/* 801D520C 001D216C 4E 80 00 20 */ blr +/* 801D520C 001D216C 4E 80 00 20 */ blr .global sub_801d5210 sub_801d5210: /* 801D5210 001D2170 88 03 00 D0 */ lbz r0, 0xd0(r3) /* 801D5214 001D2174 50 80 3E 30 */ rlwimi r0, r4, 7, 0x18, 0x18 /* 801D5218 001D2178 98 03 00 D0 */ stb r0, 0xd0(r3) -/* 801D521C 001D217C 4E 80 00 20 */ blr +/* 801D521C 001D217C 4E 80 00 20 */ blr .global sub_801d5220 sub_801d5220: @@ -1980,7 +1980,7 @@ lbl_801D5244: /* 801D5244 001D21A4 80 04 00 00 */ lwz r0, 0(r4) /* 801D5248 001D21A8 90 03 00 C8 */ stw r0, 0xc8(r3) /* 801D524C 001D21AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D5250 001D21B0 4E 80 00 20 */ blr +/* 801D5250 001D21B0 4E 80 00 20 */ blr .global sub_801d5254 sub_801d5254: @@ -1990,7 +1990,7 @@ sub_801d5254: /* 801D5260 001D21C0 7C 00 00 34 */ cntlzw r0, r0 /* 801D5264 001D21C4 7C 60 00 30 */ slw r0, r3, r0 /* 801D5268 001D21C8 54 03 0F FE */ srwi r3, r0, 0x1f -/* 801D526C 001D21CC 4E 80 00 20 */ blr +/* 801D526C 001D21CC 4E 80 00 20 */ blr .global IncrementFrozenBallCount__14CSystemOptionsFv IncrementFrozenBallCount__14CSystemOptionsFv: @@ -2007,7 +2007,7 @@ lbl_801D5294: /* 801D5294 001D21F4 80 04 00 00 */ lwz r0, 0(r4) /* 801D5298 001D21F8 90 03 00 C4 */ stw r0, 0xc4(r3) /* 801D529C 001D21FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D52A0 001D2200 4E 80 00 20 */ blr +/* 801D52A0 001D2200 4E 80 00 20 */ blr .global GetShowFrozenBallMessage__14CSystemOptionsCFv GetShowFrozenBallMessage__14CSystemOptionsCFv: @@ -2017,7 +2017,7 @@ GetShowFrozenBallMessage__14CSystemOptionsCFv: /* 801D52B0 001D2210 7C 00 00 34 */ cntlzw r0, r0 /* 801D52B4 001D2214 7C 60 00 30 */ slw r0, r3, r0 /* 801D52B8 001D2218 54 03 0F FE */ srwi r3, r0, 0x1f -/* 801D52BC 001D221C 4E 80 00 20 */ blr +/* 801D52BC 001D221C 4E 80 00 20 */ blr .global IncrementFrozenFpsCount__14CSystemOptionsFv IncrementFrozenFpsCount__14CSystemOptionsFv: @@ -2034,7 +2034,7 @@ lbl_801D52E4: /* 801D52E4 001D2244 80 04 00 00 */ lwz r0, 0(r4) /* 801D52E8 001D2248 90 03 00 C0 */ stw r0, 0xc0(r3) /* 801D52EC 001D224C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D52F0 001D2250 4E 80 00 20 */ blr +/* 801D52F0 001D2250 4E 80 00 20 */ blr .global GetShowFrozenFpsMessage__14CSystemOptionsCFv GetShowFrozenFpsMessage__14CSystemOptionsCFv: @@ -2044,7 +2044,7 @@ GetShowFrozenFpsMessage__14CSystemOptionsCFv: /* 801D5300 001D2260 7C 00 00 34 */ cntlzw r0, r0 /* 801D5304 001D2264 7C 60 00 30 */ slw r0, r3, r0 /* 801D5308 001D2268 54 03 0F FE */ srwi r3, r0, 0x1f -/* 801D530C 001D226C 4E 80 00 20 */ blr +/* 801D530C 001D226C 4E 80 00 20 */ blr .global SetCinematicState__14CSystemOptionsFUi9TEditorIdb SetCinematicState__14CSystemOptionsFUi9TEditorIdb: @@ -2131,7 +2131,7 @@ lbl_801D5428: /* 801D5430 001D2390 83 C1 00 18 */ lwz r30, 0x18(r1) /* 801D5434 001D2394 7C 08 03 A6 */ mtlr r0 /* 801D5438 001D2398 38 21 00 20 */ addi r1, r1, 0x20 -/* 801D543C 001D239C 4E 80 00 20 */ blr +/* 801D543C 001D239C 4E 80 00 20 */ blr .global sub_801d5440 sub_801d5440: @@ -2153,7 +2153,7 @@ sub_801d5440: /* 801D547C 001D23DC 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801D5480 001D23E0 7C 08 03 A6 */ mtlr r0 /* 801D5484 001D23E4 38 21 00 20 */ addi r1, r1, 0x20 -/* 801D5488 001D23E8 4E 80 00 20 */ blr +/* 801D5488 001D23E8 4E 80 00 20 */ blr .global sub_801d548c sub_801d548c: @@ -2200,7 +2200,7 @@ lbl_801D54FC: /* 801D5518 001D2478 80 05 00 00 */ lwz r0, 0(r5) /* 801D551C 001D247C 90 03 00 00 */ stw r0, 0(r3) /* 801D5520 001D2480 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D5524 001D2484 4E 80 00 20 */ blr +/* 801D5524 001D2484 4E 80 00 20 */ blr .global "GetCinematicState__14CSystemOptionsFRCQ24rstl19pair" "GetCinematicState__14CSystemOptionsFRCQ24rstl19pair": @@ -2226,14 +2226,14 @@ lbl_801D556C: /* 801D556C 001D24CC 54 A0 06 3F */ clrlwi. r0, r5, 0x18 /* 801D5570 001D24D0 41 82 00 0C */ beq lbl_801D557C /* 801D5574 001D24D4 38 60 00 01 */ li r3, 1 -/* 801D5578 001D24D8 4E 80 00 20 */ blr +/* 801D5578 001D24D8 4E 80 00 20 */ blr lbl_801D557C: /* 801D557C 001D24DC 38 E7 00 08 */ addi r7, r7, 8 lbl_801D5580: /* 801D5580 001D24E0 7C 07 30 40 */ cmplw r7, r6 /* 801D5584 001D24E4 40 82 FF B8 */ bne lbl_801D553C /* 801D5588 001D24E8 38 60 00 00 */ li r3, 0 -/* 801D558C 001D24EC 4E 80 00 20 */ blr +/* 801D558C 001D24EC 4E 80 00 20 */ blr .global PutTo__14CSystemOptionsFR13COutputStream PutTo__14CSystemOptionsFR13COutputStream: @@ -2349,7 +2349,7 @@ lbl_801D5720: /* 801D5738 001D2698 81 84 00 00 */ lwz r12, 0(r4) /* 801D573C 001D269C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801D5740 001D26A0 7D 89 03 A6 */ mtctr r12 -/* 801D5744 001D26A4 4E 80 04 21 */ bctrl +/* 801D5744 001D26A4 4E 80 04 21 */ bctrl /* 801D5748 001D26A8 7F 03 C3 78 */ mr r3, r24 /* 801D574C 001D26AC 38 81 00 38 */ addi r4, r1, 0x38 /* 801D5750 001D26B0 48 16 B7 59 */ bl __ct__6CTokenFRC6CToken @@ -2397,7 +2397,7 @@ lbl_801D57D4: /* 801D57F0 001D2750 81 84 00 00 */ lwz r12, 0(r4) /* 801D57F4 001D2754 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801D57F8 001D2758 7D 89 03 A6 */ mtctr r12 -/* 801D57FC 001D275C 4E 80 04 21 */ bctrl +/* 801D57FC 001D275C 4E 80 04 21 */ bctrl /* 801D5800 001D2760 7E A3 AB 78 */ mr r3, r21 /* 801D5804 001D2764 38 81 00 28 */ addi r4, r1, 0x28 /* 801D5808 001D2768 48 16 B6 A1 */ bl __ct__6CTokenFRC6CToken @@ -2498,7 +2498,7 @@ lbl_801D5954: /* 801D5958 001D28B8 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 801D595C 001D28BC 7C 08 03 A6 */ mtlr r0 /* 801D5960 001D28C0 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 801D5964 001D28C4 4E 80 00 20 */ blr +/* 801D5964 001D28C4 4E 80 00 20 */ blr .global __ct__14CSystemOptionsFRC12CInputStream __ct__14CSystemOptionsFRC12CInputStream: @@ -2740,7 +2740,7 @@ lbl_801D5CAC: /* 801D5CC4 001D2C24 81 84 00 00 */ lwz r12, 0(r4) /* 801D5CC8 001D2C28 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801D5CCC 001D2C2C 7D 89 03 A6 */ mtctr r12 -/* 801D5CD0 001D2C30 4E 80 04 21 */ bctrl +/* 801D5CD0 001D2C30 4E 80 04 21 */ bctrl /* 801D5CD4 001D2C34 7E C3 B3 78 */ mr r3, r22 /* 801D5CD8 001D2C38 38 81 00 38 */ addi r4, r1, 0x38 /* 801D5CDC 001D2C3C 48 16 B1 CD */ bl __ct__6CTokenFRC6CToken @@ -2826,7 +2826,7 @@ lbl_801D5DDC: /* 801D5DF8 001D2D58 81 84 00 00 */ lwz r12, 0(r4) /* 801D5DFC 001D2D5C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801D5E00 001D2D60 7D 89 03 A6 */ mtctr r12 -/* 801D5E04 001D2D64 4E 80 04 21 */ bctrl +/* 801D5E04 001D2D64 4E 80 04 21 */ bctrl /* 801D5E08 001D2D68 7F A3 EB 78 */ mr r3, r29 /* 801D5E0C 001D2D6C 38 81 00 28 */ addi r4, r1, 0x28 /* 801D5E10 001D2D70 48 16 B0 99 */ bl __ct__6CTokenFRC6CToken @@ -2897,7 +2897,7 @@ lbl_801D5EF0: /* 801D5EF8 001D2E58 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 801D5EFC 001D2E5C 7C 08 03 A6 */ mtlr r0 /* 801D5F00 001D2E60 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 801D5F04 001D2E64 4E 80 00 20 */ blr +/* 801D5F04 001D2E64 4E 80 00 20 */ blr .global __ct__14CSystemOptionsFv __ct__14CSystemOptionsFv: @@ -3023,7 +3023,7 @@ lbl_801D6034: /* 801D60A0 001D3000 88 03 00 D0 */ lbz r0, 0xd0(r3) /* 801D60A4 001D3004 50 80 17 7A */ rlwimi r0, r4, 2, 0x1d, 0x1d /* 801D60A8 001D3008 98 03 00 D0 */ stb r0, 0xd0(r3) -/* 801D60AC 001D300C 4E 80 00 20 */ blr +/* 801D60AC 001D300C 4E 80 00 20 */ blr .global sub_801d60b0 sub_801d60b0: @@ -3044,15 +3044,15 @@ lbl_801D60C0: /* 801D60D0 001D3030 C8 03 00 00 */ lfd f0, 0(r3) /* 801D60D4 001D3034 C8 24 00 00 */ lfd f1, 0(r4) /* 801D60D8 001D3038 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 801D60DC 001D303C 4D 81 00 20 */ bgtlr +/* 801D60DC 001D303C 4D 81 00 20 */ bgtlr /* 801D60E0 001D3040 C8 05 00 00 */ lfd f0, 0(r5) /* 801D60E4 001D3044 FC 00 08 40 */ fcmpo cr0, f0, f1 /* 801D60E8 001D3048 40 80 00 0C */ bge lbl_801D60F4 /* 801D60EC 001D304C 7C A3 2B 78 */ mr r3, r5 -/* 801D60F0 001D3050 4E 80 00 20 */ blr +/* 801D60F0 001D3050 4E 80 00 20 */ blr lbl_801D60F4: /* 801D60F4 001D3054 7C 83 23 78 */ mr r3, r4 -/* 801D60F8 001D3058 4E 80 00 20 */ blr +/* 801D60F8 001D3058 4E 80 00 20 */ blr .global sub_801d60fc sub_801d60fc: @@ -3128,7 +3128,7 @@ lbl_801D61E0: /* 801D61EC 001D314C 83 A1 00 24 */ lwz r29, 0x24(r1) /* 801D61F0 001D3150 7C 08 03 A6 */ mtlr r0 /* 801D61F4 001D3154 38 21 00 30 */ addi r1, r1, 0x30 -/* 801D61F8 001D3158 4E 80 00 20 */ blr +/* 801D61F8 001D3158 4E 80 00 20 */ blr .global "reserve__Q24rstl37vectorFi" "reserve__Q24rstl37vectorFi": @@ -3199,7 +3199,7 @@ lbl_801D62CC: /* 801D62D8 001D3238 83 A1 00 24 */ lwz r29, 0x24(r1) /* 801D62DC 001D323C 7C 08 03 A6 */ mtlr r0 /* 801D62E0 001D3240 38 21 00 30 */ addi r1, r1, 0x30 -/* 801D62E4 001D3244 4E 80 00 20 */ blr +/* 801D62E4 001D3244 4E 80 00 20 */ blr .global "reserve__Q24rstl48vector<11CWorldState,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl48vector<11CWorldState,Q24rstl17rmemory_allocator>Fi": @@ -3323,4 +3323,4 @@ lbl_801D647C: /* 801D6480 001D33E0 7C 07 00 40 */ cmplw r7, r0 /* 801D6484 001D33E4 40 82 FF 88 */ bne lbl_801D640C /* 801D6488 001D33E8 7C A3 2B 78 */ mr r3, r5 -/* 801D648C 001D33EC 4E 80 00 20 */ blr +/* 801D648C 001D33EC 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/Player/CGrappleArm.s b/asm/MetroidPrime/Player/CGrappleArm.s index 725c93b1..b0f2d6e8 100644 --- a/asm/MetroidPrime/Player/CGrappleArm.s +++ b/asm/MetroidPrime/Player/CGrappleArm.s @@ -72,7 +72,7 @@ DisconnectGrappleBeam__11CGrappleArmFv: /* 8011D4D0 0011A430 81 83 00 00 */ lwz r12, 0(r3) /* 8011D4D4 0011A434 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8011D4D8 0011A438 7D 89 03 A6 */ mtctr r12 -/* 8011D4DC 0011A43C 4E 80 04 21 */ bctrl +/* 8011D4DC 0011A43C 4E 80 04 21 */ bctrl /* 8011D4E0 0011A440 88 1F 03 B2 */ lbz r0, 0x3b2(r31) /* 8011D4E4 0011A444 38 60 00 00 */ li r3, 0 /* 8011D4E8 0011A448 50 60 36 72 */ rlwimi r0, r3, 6, 0x19, 0x19 @@ -83,7 +83,7 @@ DisconnectGrappleBeam__11CGrappleArmFv: /* 8011D4FC 0011A45C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8011D500 0011A460 7C 08 03 A6 */ mtlr r0 /* 8011D504 0011A464 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011D508 0011A468 4E 80 00 20 */ blr +/* 8011D508 0011A468 4E 80 00 20 */ blr .global PointGenerator__11CGrappleArmFPvPC9CVector3fPC9CVector3fi PointGenerator__11CGrappleArmFPvPC9CVector3fPC9CVector3fi: @@ -97,7 +97,7 @@ lbl_8011D524: /* 8011D524 0011A484 80 01 00 14 */ lwz r0, 0x14(r1) /* 8011D528 0011A488 7C 08 03 A6 */ mtlr r0 /* 8011D52C 0011A48C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011D530 0011A490 4E 80 00 20 */ blr +/* 8011D530 0011A490 4E 80 00 20 */ blr .global RenderXRayModel__11CGrappleArmFRC13CStateManagerRC12CTransform4fRC11CModelFlags RenderXRayModel__11CGrappleArmFRC13CStateManagerRC12CTransform4fRC11CModelFlags: @@ -134,7 +134,7 @@ RenderXRayModel__11CGrappleArmFRC13CStateManagerRC12CTransform4fRC11CModelFlags: /* 8011D5AC 0011A50C 81 83 00 00 */ lwz r12, 0(r3) /* 8011D5B0 0011A510 81 8C 00 30 */ lwz r12, 0x30(r12) /* 8011D5B4 0011A514 7D 89 03 A6 */ mtctr r12 -/* 8011D5B8 0011A518 4E 80 04 21 */ bctrl +/* 8011D5B8 0011A518 4E 80 04 21 */ bctrl /* 8011D5BC 0011A51C 48 1E F3 C1 */ bl DisableAllLights__9CGraphicsFv /* 8011D5C0 0011A520 48 22 C9 ED */ bl White__6CColorFv /* 8011D5C4 0011A524 7C 64 1B 78 */ mr r4, r3 @@ -142,7 +142,7 @@ RenderXRayModel__11CGrappleArmFRC13CStateManagerRC12CTransform4fRC11CModelFlags: /* 8011D5CC 0011A52C 81 83 00 00 */ lwz r12, 0(r3) /* 8011D5D0 0011A530 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 8011D5D4 0011A534 7D 89 03 A6 */ mtctr r12 -/* 8011D5D8 0011A538 4E 80 04 21 */ bctrl +/* 8011D5D8 0011A538 4E 80 04 21 */ bctrl /* 8011D5DC 0011A53C 38 00 00 00 */ li r0, 0 /* 8011D5E0 0011A540 80 9E 00 60 */ lwz r4, 0x60(r30) /* 8011D5E4 0011A544 98 01 00 EC */ stb r0, 0xec(r1) @@ -161,14 +161,14 @@ RenderXRayModel__11CGrappleArmFRC13CStateManagerRC12CTransform4fRC11CModelFlags: /* 8011D618 0011A578 81 83 00 00 */ lwz r12, 0(r3) /* 8011D61C 0011A57C 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 8011D620 0011A580 7D 89 03 A6 */ mtctr r12 -/* 8011D624 0011A584 4E 80 04 21 */ bctrl +/* 8011D624 0011A584 4E 80 04 21 */ bctrl /* 8011D628 0011A588 48 1E F3 55 */ bl DisableAllLights__9CGraphicsFv /* 8011D62C 0011A58C 80 01 01 04 */ lwz r0, 0x104(r1) /* 8011D630 0011A590 83 E1 00 FC */ lwz r31, 0xfc(r1) /* 8011D634 0011A594 83 C1 00 F8 */ lwz r30, 0xf8(r1) /* 8011D638 0011A598 7C 08 03 A6 */ mtlr r0 /* 8011D63C 0011A59C 38 21 01 00 */ addi r1, r1, 0x100 -/* 8011D640 0011A5A0 4E 80 00 20 */ blr +/* 8011D640 0011A5A0 4E 80 00 20 */ blr .global BuildSuitDependencyList__11CGrappleArmFv BuildSuitDependencyList__11CGrappleArmFv: @@ -192,7 +192,7 @@ lbl_8011D678: /* 8011D684 0011A5E4 81 84 00 00 */ lwz r12, 0(r4) /* 8011D688 0011A5E8 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8011D68C 0011A5EC 7D 89 03 A6 */ mtctr r12 -/* 8011D690 0011A5F0 4E 80 04 21 */ bctrl +/* 8011D690 0011A5F0 4E 80 04 21 */ bctrl /* 8011D694 0011A5F4 7F 23 CB 78 */ mr r3, r25 /* 8011D698 0011A5F8 38 81 00 18 */ addi r4, r1, 0x18 /* 8011D69C 0011A5FC 48 22 38 0D */ bl __ct__6CTokenFRC6CToken @@ -294,7 +294,7 @@ lbl_8011D7C0: /* 8011D7F4 0011A754 80 01 00 74 */ lwz r0, 0x74(r1) /* 8011D7F8 0011A758 7C 08 03 A6 */ mtlr r0 /* 8011D7FC 0011A75C 38 21 00 70 */ addi r1, r1, 0x70 -/* 8011D800 0011A760 4E 80 00 20 */ blr +/* 8011D800 0011A760 4E 80 00 20 */ blr .global "FillTokenVector__11CGrappleArmFRCQ24rstl47vector<10SObjectTag,Q24rstl17rmemory_allocator>RQ24rstl42vector<6CToken,Q24rstl17rmemory_allocator>" "FillTokenVector__11CGrappleArmFRCQ24rstl47vector<10SObjectTag,Q24rstl17rmemory_allocator>RQ24rstl42vector<6CToken,Q24rstl17rmemory_allocator>": @@ -318,7 +318,7 @@ lbl_8011D838: /* 8011D844 0011A7A4 81 84 00 00 */ lwz r12, 0(r4) /* 8011D848 0011A7A8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8011D84C 0011A7AC 7D 89 03 A6 */ mtctr r12 -/* 8011D850 0011A7B0 4E 80 04 21 */ bctrl +/* 8011D850 0011A7B0 4E 80 04 21 */ bctrl /* 8011D854 0011A7B4 38 61 00 10 */ addi r3, r1, 0x10 /* 8011D858 0011A7B8 38 81 00 08 */ addi r4, r1, 8 /* 8011D85C 0011A7BC 48 22 36 4D */ bl __ct__6CTokenFRC6CToken @@ -365,7 +365,7 @@ lbl_8011D8CC: /* 8011D8F0 0011A850 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8011D8F4 0011A854 7C 08 03 A6 */ mtlr r0 /* 8011D8F8 0011A858 38 21 00 30 */ addi r1, r1, 0x30 -/* 8011D8FC 0011A85C 4E 80 00 20 */ blr +/* 8011D8FC 0011A85C 4E 80 00 20 */ blr .global AcceptScriptMsg__11CGrappleArmF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__11CGrappleArmF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -382,7 +382,7 @@ lbl_8011D920: /* 8011D920 0011A880 80 01 00 14 */ lwz r0, 0x14(r1) /* 8011D924 0011A884 7C 08 03 A6 */ mtlr r0 /* 8011D928 0011A888 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011D92C 0011A88C 4E 80 00 20 */ blr +/* 8011D92C 0011A88C 4E 80 00 20 */ blr .global BuildXRayModel__11CGrappleArmFv BuildXRayModel__11CGrappleArmFv: @@ -430,7 +430,7 @@ lbl_8011D95C: /* 8011D9CC 0011A92C 80 01 00 84 */ lwz r0, 0x84(r1) /* 8011D9D0 0011A930 7C 08 03 A6 */ mtlr r0 /* 8011D9D4 0011A934 38 21 00 80 */ addi r1, r1, 0x80 -/* 8011D9D8 0011A938 4E 80 00 20 */ blr +/* 8011D9D8 0011A938 4E 80 00 20 */ blr .global LoadSuitPoll__11CGrappleArmFv LoadSuitPoll__11CGrappleArmFv: @@ -497,7 +497,7 @@ lbl_8011DAC0: /* 8011DAC4 0011AA24 83 E1 00 7C */ lwz r31, 0x7c(r1) /* 8011DAC8 0011AA28 7C 08 03 A6 */ mtlr r0 /* 8011DACC 0011AA2C 38 21 00 80 */ addi r1, r1, 0x80 -/* 8011DAD0 0011AA30 4E 80 00 20 */ blr +/* 8011DAD0 0011AA30 4E 80 00 20 */ blr .global "__as__Q24rstl28single_ptr<14CGunController>FRC14CGunController" "__as__Q24rstl28single_ptr<14CGunController>FRC14CGunController": @@ -518,7 +518,7 @@ lbl_8011DAC0: /* 8011DB0C 0011AA6C 83 C1 00 08 */ lwz r30, 8(r1) /* 8011DB10 0011AA70 7C 08 03 A6 */ mtlr r0 /* 8011DB14 0011AA74 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011DB18 0011AA78 4E 80 00 20 */ blr +/* 8011DB18 0011AA78 4E 80 00 20 */ blr .global __dt__14CGunControllerFv __dt__14CGunControllerFv: @@ -571,7 +571,7 @@ lbl_8011DBB0: /* 8011DBC4 0011AB24 83 81 00 20 */ lwz r28, 0x20(r1) /* 8011DBC8 0011AB28 7C 08 03 A6 */ mtlr r0 /* 8011DBCC 0011AB2C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8011DBD0 0011AB30 4E 80 00 20 */ blr +/* 8011DBD0 0011AB30 4E 80 00 20 */ blr .global AsyncLoadSuit__11CGrappleArmFR13CStateManager AsyncLoadSuit__11CGrappleArmFR13CStateManager: @@ -676,7 +676,7 @@ lbl_8011DD2C: /* 8011DD3C 0011AC9C 83 81 00 80 */ lwz r28, 0x80(r1) /* 8011DD40 0011ACA0 7C 08 03 A6 */ mtlr r0 /* 8011DD44 0011ACA4 38 21 00 90 */ addi r1, r1, 0x90 -/* 8011DD48 0011ACA8 4E 80 00 20 */ blr +/* 8011DD48 0011ACA8 4E 80 00 20 */ blr .global sub_8011dd4c sub_8011dd4c: @@ -710,7 +710,7 @@ lbl_8011DDA0: /* 8011DDA4 0011AD04 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8011DDA8 0011AD08 7C 08 03 A6 */ mtlr r0 /* 8011DDAC 0011AD0C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011DDB0 0011AD10 4E 80 00 20 */ blr +/* 8011DDB0 0011AD10 4E 80 00 20 */ blr .global ResetAuxParams__11CGrappleArmFb ResetAuxParams__11CGrappleArmFb: @@ -745,7 +745,7 @@ lbl_8011DE18: /* 8011DE20 0011AD80 83 C1 00 08 */ lwz r30, 8(r1) /* 8011DE24 0011AD84 7C 08 03 A6 */ mtlr r0 /* 8011DE28 0011AD88 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011DE2C 0011AD8C 4E 80 00 20 */ blr +/* 8011DE2C 0011AD8C 4E 80 00 20 */ blr .global EnterStruck__11CGrappleArmFR13CStateManagerf EnterStruck__11CGrappleArmFR13CStateManagerf: @@ -800,7 +800,7 @@ lbl_8011DED0: /* 8011DEE4 0011AE44 83 81 00 08 */ lwz r28, 8(r1) /* 8011DEE8 0011AE48 7C 08 03 A6 */ mtlr r0 /* 8011DEEC 0011AE4C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8011DEF0 0011AE50 4E 80 00 20 */ blr +/* 8011DEF0 0011AE50 4E 80 00 20 */ blr .global EnterIdle__11CGrappleArmFR13CStateManager EnterIdle__11CGrappleArmFR13CStateManager: @@ -816,7 +816,7 @@ lbl_8011DF14: /* 8011DF14 0011AE74 80 01 00 14 */ lwz r0, 0x14(r1) /* 8011DF18 0011AE78 7C 08 03 A6 */ mtlr r0 /* 8011DF1C 0011AE7C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011DF20 0011AE80 4E 80 00 20 */ blr +/* 8011DF20 0011AE80 4E 80 00 20 */ blr .global ReturnToDefault__11CGrappleArmFR13CStateManagerf ReturnToDefault__11CGrappleArmFR13CStateManagerf: @@ -832,7 +832,7 @@ lbl_8011DF44: /* 8011DF44 0011AEA4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8011DF48 0011AEA8 7C 08 03 A6 */ mtlr r0 /* 8011DF4C 0011AEAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011DF50 0011AEB0 4E 80 00 20 */ blr +/* 8011DF50 0011AEB0 4E 80 00 20 */ blr .global EnterComboFire__11CGrappleArmFiR13CStateManager EnterComboFire__11CGrappleArmFiR13CStateManager: @@ -859,7 +859,7 @@ lbl_8011DFA0: /* 8011DFA0 0011AF00 80 01 00 14 */ lwz r0, 0x14(r1) /* 8011DFA4 0011AF04 7C 08 03 A6 */ mtlr r0 /* 8011DFA8 0011AF08 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011DFAC 0011AF0C 4E 80 00 20 */ blr +/* 8011DFAC 0011AF0C 4E 80 00 20 */ blr .global EnterFidget__11CGrappleArmFR13CStateManageriii EnterFidget__11CGrappleArmFR13CStateManageriii: @@ -883,7 +883,7 @@ lbl_8011DFF0: /* 8011DFF0 0011AF50 80 01 00 14 */ lwz r0, 0x14(r1) /* 8011DFF4 0011AF54 7C 08 03 A6 */ mtlr r0 /* 8011DFF8 0011AF58 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011DFFC 0011AF5C 4E 80 00 20 */ blr +/* 8011DFFC 0011AF5C 4E 80 00 20 */ blr .global EnterFreeLook__11CGrappleArmFiiR13CStateManager EnterFreeLook__11CGrappleArmFiiR13CStateManager: @@ -912,7 +912,7 @@ lbl_8011E054: /* 8011E054 0011AFB4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8011E058 0011AFB8 7C 08 03 A6 */ mtlr r0 /* 8011E05C 0011AFBC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011E060 0011AFC0 4E 80 00 20 */ blr +/* 8011E060 0011AFC0 4E 80 00 20 */ blr .global LoadAnimations__11CGrappleArmFv LoadAnimations__11CGrappleArmFv: @@ -945,7 +945,7 @@ lbl_8011E0BC: /* 8011E0C8 0011B028 83 E1 00 5C */ lwz r31, 0x5c(r1) /* 8011E0CC 0011B02C 7C 08 03 A6 */ mtlr r0 /* 8011E0D0 0011B030 38 21 00 60 */ addi r1, r1, 0x60 -/* 8011E0D4 0011B034 4E 80 00 20 */ blr +/* 8011E0D4 0011B034 4E 80 00 20 */ blr .global GrappleBeamDisconnected__11CGrappleArmFv GrappleBeamDisconnected__11CGrappleArmFv: @@ -968,7 +968,7 @@ lbl_8011E110: /* 8011E114 0011B074 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8011E118 0011B078 7C 08 03 A6 */ mtlr r0 /* 8011E11C 0011B07C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8011E120 0011B080 4E 80 00 20 */ blr +/* 8011E120 0011B080 4E 80 00 20 */ blr .global GrappleBeamConnected__11CGrappleArmFv GrappleBeamConnected__11CGrappleArmFv: @@ -993,7 +993,7 @@ lbl_8011E164: /* 8011E168 0011B0C8 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8011E16C 0011B0CC 7C 08 03 A6 */ mtlr r0 /* 8011E170 0011B0D0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8011E174 0011B0D4 4E 80 00 20 */ blr +/* 8011E174 0011B0D4 4E 80 00 20 */ blr .global DoUserAnimEvent__11CGrappleArmFR13CStateManagerRC13CInt32POINode14EUserEventType DoUserAnimEvent__11CGrappleArmFR13CStateManagerRC13CInt32POINode14EUserEventType: @@ -1050,7 +1050,7 @@ lbl_8011E224: /* 8011E234 0011B194 38 80 00 01 */ li r4, 1 /* 8011E238 0011B198 81 8C 00 08 */ lwz r12, 8(r12) /* 8011E23C 0011B19C 7D 89 03 A6 */ mtctr r12 -/* 8011E240 0011B1A0 4E 80 04 21 */ bctrl +/* 8011E240 0011B1A0 4E 80 04 21 */ bctrl lbl_8011E244: /* 8011E244 0011B1A4 7F 80 07 75 */ extsb. r0, r28 /* 8011E248 0011B1A8 93 BE 03 98 */ stw r29, 0x398(r30) @@ -1086,7 +1086,7 @@ lbl_8011E2A8: /* 8011E2B8 0011B218 38 80 00 01 */ li r4, 1 /* 8011E2BC 0011B21C 81 8C 00 08 */ lwz r12, 8(r12) /* 8011E2C0 0011B220 7D 89 03 A6 */ mtctr r12 -/* 8011E2C4 0011B224 4E 80 04 21 */ bctrl +/* 8011E2C4 0011B224 4E 80 04 21 */ bctrl lbl_8011E2C8: /* 8011E2C8 0011B228 7F 80 07 75 */ extsb. r0, r28 /* 8011E2CC 0011B22C 93 BE 03 9C */ stw r29, 0x39c(r30) @@ -1108,13 +1108,13 @@ lbl_8011E2E0: /* 8011E308 0011B268 81 83 00 00 */ lwz r12, 0(r3) /* 8011E30C 0011B26C 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8011E310 0011B270 7D 89 03 A6 */ mtctr r12 -/* 8011E314 0011B274 4E 80 04 21 */ bctrl +/* 8011E314 0011B274 4E 80 04 21 */ bctrl /* 8011E318 0011B278 80 7E 03 94 */ lwz r3, 0x394(r30) /* 8011E31C 0011B27C 38 80 00 01 */ li r4, 1 /* 8011E320 0011B280 81 83 00 00 */ lwz r12, 0(r3) /* 8011E324 0011B284 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8011E328 0011B288 7D 89 03 A6 */ mtctr r12 -/* 8011E32C 0011B28C 4E 80 04 21 */ bctrl +/* 8011E32C 0011B28C 4E 80 04 21 */ bctrl /* 8011E330 0011B290 38 61 00 08 */ addi r3, r1, 8 /* 8011E334 0011B294 38 80 05 F6 */ li r4, 0x5f6 /* 8011E338 0011B298 38 A0 00 00 */ li r5, 0 @@ -1135,7 +1135,7 @@ lbl_8011E360: /* 8011E370 0011B2D0 83 81 00 20 */ lwz r28, 0x20(r1) /* 8011E374 0011B2D4 7C 08 03 A6 */ mtlr r0 /* 8011E378 0011B2D8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8011E37C 0011B2DC 4E 80 00 20 */ blr +/* 8011E37C 0011B2DC 4E 80 00 20 */ blr .global DoUserAnimEvents__11CGrappleArmFR13CStateManager DoUserAnimEvents__11CGrappleArmFR13CStateManager: @@ -1270,7 +1270,7 @@ lbl_8011E54C: /* 8011E550 0011B4B0 80 01 00 54 */ lwz r0, 0x54(r1) /* 8011E554 0011B4B4 7C 08 03 A6 */ mtlr r0 /* 8011E558 0011B4B8 38 21 00 50 */ addi r1, r1, 0x50 -/* 8011E55C 0011B4BC 4E 80 00 20 */ blr +/* 8011E55C 0011B4BC 4E 80 00 20 */ blr .global SetAnimState__11CGrappleArmFQ211CGrappleArm9EArmState SetAnimState__11CGrappleArmFQ211CGrappleArm9EArmState: @@ -1304,7 +1304,7 @@ SetAnimState__11CGrappleArmFQ211CGrappleArm9EArmState: /* 8011E5CC 0011B52C 38 84 06 B0 */ addi r4, r4, lbl_803E06B0@l /* 8011E5D0 0011B530 7C 04 00 2E */ lwzx r0, r4, r0 /* 8011E5D4 0011B534 7C 09 03 A6 */ mtctr r0 -/* 8011E5D8 0011B538 4E 80 04 20 */ bctr +/* 8011E5D8 0011B538 4E 80 04 20 */ bctr .global lbl_8011E5DC lbl_8011E5DC: /* 8011E5DC 0011B53C 38 80 00 01 */ li r4, 1 @@ -1458,7 +1458,7 @@ lbl_8011E7E4: /* 8011E7F0 0011B750 83 A1 01 04 */ lwz r29, 0x104(r1) /* 8011E7F4 0011B754 7C 08 03 A6 */ mtlr r0 /* 8011E7F8 0011B758 38 21 01 10 */ addi r1, r1, 0x110 -/* 8011E7FC 0011B75C 4E 80 00 20 */ blr +/* 8011E7FC 0011B75C 4E 80 00 20 */ blr .global Activate__11CGrappleArmFb Activate__11CGrappleArmFb: @@ -1474,7 +1474,7 @@ lbl_8011E81C: /* 8011E820 0011B780 80 01 00 14 */ lwz r0, 0x14(r1) /* 8011E824 0011B784 7C 08 03 A6 */ mtlr r0 /* 8011E828 0011B788 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011E82C 0011B78C 4E 80 00 20 */ blr +/* 8011E82C 0011B78C 4E 80 00 20 */ blr .global UpdateGrappleBeamFX__11CGrappleArmFRC9CVector3fRC9CVector3fR13CStateManager UpdateGrappleBeamFX__11CGrappleArmFRC9CVector3fRC9CVector3fR13CStateManager: @@ -1510,13 +1510,13 @@ UpdateGrappleBeamFX__11CGrappleArmFRC9CVector3fRC9CVector3fR13CStateManager: /* 8011E8A4 0011B804 81 83 00 00 */ lwz r12, 0(r3) /* 8011E8A8 0011B808 81 8C 00 18 */ lwz r12, 0x18(r12) /* 8011E8AC 0011B80C 7D 89 03 A6 */ mtctr r12 -/* 8011E8B0 0011B810 4E 80 04 21 */ bctrl +/* 8011E8B0 0011B810 4E 80 04 21 */ bctrl /* 8011E8B4 0011B814 80 7B 03 90 */ lwz r3, 0x390(r27) /* 8011E8B8 0011B818 38 80 00 01 */ li r4, 1 /* 8011E8BC 0011B81C 81 83 00 00 */ lwz r12, 0(r3) /* 8011E8C0 0011B820 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8011E8C4 0011B824 7D 89 03 A6 */ mtctr r12 -/* 8011E8C8 0011B828 4E 80 04 21 */ bctrl +/* 8011E8C8 0011B828 4E 80 04 21 */ bctrl /* 8011E8CC 0011B82C C0 39 00 04 */ lfs f1, 4(r25) /* 8011E8D0 0011B830 38 61 00 44 */ addi r3, r1, 0x44 /* 8011E8D4 0011B834 C0 1C 00 04 */ lfs f0, 4(r28) @@ -1617,7 +1617,7 @@ lbl_8011EA18: /* 8011EA44 0011B9A4 81 83 00 00 */ lwz r12, 0(r3) /* 8011EA48 0011B9A8 81 8C 00 18 */ lwz r12, 0x18(r12) /* 8011EA4C 0011B9AC 7D 89 03 A6 */ mtctr r12 -/* 8011EA50 0011B9B0 4E 80 04 21 */ bctrl +/* 8011EA50 0011B9B0 4E 80 04 21 */ bctrl /* 8011EA54 0011B9B4 80 7B 03 90 */ lwz r3, 0x390(r27) /* 8011EA58 0011B9B8 38 80 00 01 */ li r4, 1 /* 8011EA5C 0011B9BC 48 1F DE 65 */ bl ForceParticleCreation__11CElementGenFi @@ -1636,7 +1636,7 @@ lbl_8011EA7C: /* 8011EA8C 0011B9EC 81 83 00 00 */ lwz r12, 0(r3) /* 8011EA90 0011B9F0 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8011EA94 0011B9F4 7D 89 03 A6 */ mtctr r12 -/* 8011EA98 0011B9F8 4E 80 04 21 */ bctrl +/* 8011EA98 0011B9F8 4E 80 04 21 */ bctrl /* 8011EA9C 0011B9FC 83 3B 03 A0 */ lwz r25, 0x3a0(r27) /* 8011EAA0 0011BA00 3B A0 00 00 */ li r29, 0 /* 8011EAA4 0011BA04 C3 3C 00 00 */ lfs f25, 0(r28) @@ -1730,7 +1730,7 @@ lbl_8011EB94: /* 8011EBF4 0011BB54 80 01 01 54 */ lwz r0, 0x154(r1) /* 8011EBF8 0011BB58 7C 08 03 A6 */ mtlr r0 /* 8011EBFC 0011BB5C 38 21 01 50 */ addi r1, r1, 0x150 -/* 8011EC00 0011BB60 4E 80 00 20 */ blr +/* 8011EC00 0011BB60 4E 80 00 20 */ blr .global UpdateGrappleBeam__11CGrappleArmFfRC12CTransform4fR13CStateManager UpdateGrappleBeam__11CGrappleArmFfRC12CTransform4fR13CStateManager: @@ -1895,13 +1895,13 @@ lbl_8011EE1C: /* 8011EE54 0011BDB4 81 83 00 00 */ lwz r12, 0(r3) /* 8011EE58 0011BDB8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8011EE5C 0011BDBC 7D 89 03 A6 */ mtctr r12 -/* 8011EE60 0011BDC0 4E 80 04 21 */ bctrl +/* 8011EE60 0011BDC0 4E 80 04 21 */ bctrl /* 8011EE64 0011BDC4 80 7C 03 90 */ lwz r3, 0x390(r28) /* 8011EE68 0011BDC8 FC 20 F8 90 */ fmr f1, f31 /* 8011EE6C 0011BDCC 81 83 00 00 */ lwz r12, 0(r3) /* 8011EE70 0011BDD0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8011EE74 0011BDD4 7D 89 03 A6 */ mtctr r12 -/* 8011EE78 0011BDD8 4E 80 04 21 */ bctrl +/* 8011EE78 0011BDD8 4E 80 04 21 */ bctrl lbl_8011EE7C: /* 8011EE7C 0011BDDC 57 E3 06 3E */ clrlwi r3, r31, 0x18 /* 8011EE80 0011BDE0 E3 E1 00 A8 */ psq_l f31, 168(r1), 0, qr0 @@ -1913,7 +1913,7 @@ lbl_8011EE7C: /* 8011EE98 0011BDF8 83 81 00 90 */ lwz r28, 0x90(r1) /* 8011EE9C 0011BDFC 7C 08 03 A6 */ mtlr r0 /* 8011EEA0 0011BE00 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 8011EEA4 0011BE04 4E 80 00 20 */ blr +/* 8011EEA4 0011BE04 4E 80 00 20 */ blr .global Update__11CGrappleArmFffR13CStateManager Update__11CGrappleArmFffR13CStateManager: @@ -2082,7 +2082,7 @@ lbl_8011F0E8: /* 8011F100 0011C060 83 C1 01 38 */ lwz r30, 0x138(r1) /* 8011F104 0011C064 7C 08 03 A6 */ mtlr r0 /* 8011F108 0011C068 38 21 01 60 */ addi r1, r1, 0x160 -/* 8011F10C 0011C06C 4E 80 00 20 */ blr +/* 8011F10C 0011C06C 4E 80 00 20 */ blr .global UpdateArmMovement__11CGrappleArmFfR13CStateManager UpdateArmMovement__11CGrappleArmFfR13CStateManager: @@ -2114,7 +2114,7 @@ lbl_8011F160: /* 8011F16C 0011C0CC 83 C1 00 10 */ lwz r30, 0x10(r1) /* 8011F170 0011C0D0 7C 08 03 A6 */ mtlr r0 /* 8011F174 0011C0D4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8011F178 0011C0D8 4E 80 00 20 */ blr +/* 8011F178 0011C0D8 4E 80 00 20 */ blr .global UpdateSwingAction__11CGrappleArmFffR13CStateManager UpdateSwingAction__11CGrappleArmFffR13CStateManager: @@ -2224,7 +2224,7 @@ lbl_8011F2B4: /* 8011F304 0011C264 38 63 06 DC */ addi r3, r3, lbl_803E06DC@l /* 8011F308 0011C268 7C 03 00 2E */ lwzx r0, r3, r0 /* 8011F30C 0011C26C 7C 09 03 A6 */ mtctr r0 -/* 8011F310 0011C270 4E 80 04 20 */ bctr +/* 8011F310 0011C270 4E 80 04 20 */ bctr .global lbl_8011F314 lbl_8011F314: /* 8011F314 0011C274 7F C3 F3 78 */ mr r3, r30 @@ -2247,7 +2247,7 @@ lbl_8011F324: /* 8011F350 0011C2B0 81 83 00 00 */ lwz r12, 0(r3) /* 8011F354 0011C2B4 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8011F358 0011C2B8 7D 89 03 A6 */ mtctr r12 -/* 8011F35C 0011C2BC 4E 80 04 21 */ bctrl +/* 8011F35C 0011C2BC 4E 80 04 21 */ bctrl /* 8011F360 0011C2C0 7F C3 F3 78 */ mr r3, r30 /* 8011F364 0011C2C4 4B FF ED C1 */ bl GrappleBeamConnected__11CGrappleArmFv /* 8011F368 0011C2C8 A8 9E 03 B0 */ lha r4, 0x3b0(r30) @@ -2297,13 +2297,13 @@ lbl_8011F3D0: /* 8011F3FC 0011C35C 81 83 00 00 */ lwz r12, 0(r3) /* 8011F400 0011C360 81 8C 00 18 */ lwz r12, 0x18(r12) /* 8011F404 0011C364 7D 89 03 A6 */ mtctr r12 -/* 8011F408 0011C368 4E 80 04 21 */ bctrl +/* 8011F408 0011C368 4E 80 04 21 */ bctrl /* 8011F40C 0011C36C 80 7E 03 9C */ lwz r3, 0x39c(r30) /* 8011F410 0011C370 FC 20 F8 90 */ fmr f1, f31 /* 8011F414 0011C374 81 83 00 00 */ lwz r12, 0(r3) /* 8011F418 0011C378 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8011F41C 0011C37C 7D 89 03 A6 */ mtctr r12 -/* 8011F420 0011C380 4E 80 04 21 */ bctrl +/* 8011F420 0011C380 4E 80 04 21 */ bctrl /* 8011F424 0011C384 88 1E 03 B2 */ lbz r0, 0x3b2(r30) /* 8011F428 0011C388 54 00 DF FF */ rlwinm. r0, r0, 0x1b, 0x1f, 0x1f /* 8011F42C 0011C38C 41 82 00 5C */ beq lbl_8011F488 @@ -2311,7 +2311,7 @@ lbl_8011F3D0: /* 8011F434 0011C394 81 83 00 00 */ lwz r12, 0(r3) /* 8011F438 0011C398 81 8C 00 58 */ lwz r12, 0x58(r12) /* 8011F43C 0011C39C 7D 89 03 A6 */ mtctr r12 -/* 8011F440 0011C3A0 4E 80 04 21 */ bctrl +/* 8011F440 0011C3A0 4E 80 04 21 */ bctrl /* 8011F444 0011C3A4 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 8011F448 0011C3A8 88 1E 03 B2 */ lbz r0, 0x3b2(r30) /* 8011F44C 0011C3AC 7C 63 00 34 */ cntlzw r3, r3 @@ -2322,13 +2322,13 @@ lbl_8011F3D0: /* 8011F460 0011C3C0 81 83 00 00 */ lwz r12, 0(r3) /* 8011F464 0011C3C4 81 8C 00 18 */ lwz r12, 0x18(r12) /* 8011F468 0011C3C8 7D 89 03 A6 */ mtctr r12 -/* 8011F46C 0011C3CC 4E 80 04 21 */ bctrl +/* 8011F46C 0011C3CC 4E 80 04 21 */ bctrl /* 8011F470 0011C3D0 80 7E 03 98 */ lwz r3, 0x398(r30) /* 8011F474 0011C3D4 FC 20 F8 90 */ fmr f1, f31 /* 8011F478 0011C3D8 81 83 00 00 */ lwz r12, 0(r3) /* 8011F47C 0011C3DC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8011F480 0011C3E0 7D 89 03 A6 */ mtctr r12 -/* 8011F484 0011C3E4 4E 80 04 21 */ bctrl +/* 8011F484 0011C3E4 4E 80 04 21 */ bctrl lbl_8011F488: /* 8011F488 0011C3E8 E3 E1 00 C8 */ psq_l f31, 200(r1), 0, qr0 /* 8011F48C 0011C3EC CB E1 00 C0 */ lfd f31, 0xc0(r1) @@ -2341,7 +2341,7 @@ lbl_8011F488: /* 8011F4A8 0011C408 83 81 00 A0 */ lwz r28, 0xa0(r1) /* 8011F4AC 0011C40C 7C 08 03 A6 */ mtlr r0 /* 8011F4B0 0011C410 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 8011F4B4 0011C414 4E 80 00 20 */ blr +/* 8011F4B4 0011C414 4E 80 00 20 */ blr .global RenderGrappleBeam__11CGrappleArmCFRC13CStateManagerRC9CVector3f RenderGrappleBeam__11CGrappleArmCFRC13CStateManagerRC9CVector3f: @@ -2379,23 +2379,23 @@ lbl_8011F4E8: /* 8011F530 0011C490 81 83 00 00 */ lwz r12, 0(r3) /* 8011F534 0011C494 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8011F538 0011C498 7D 89 03 A6 */ mtctr r12 -/* 8011F53C 0011C49C 4E 80 04 21 */ bctrl +/* 8011F53C 0011C49C 4E 80 04 21 */ bctrl lbl_8011F540: /* 8011F540 0011C4A0 80 7F 03 94 */ lwz r3, 0x394(r31) /* 8011F544 0011C4A4 81 83 00 00 */ lwz r12, 0(r3) /* 8011F548 0011C4A8 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8011F54C 0011C4AC 7D 89 03 A6 */ mtctr r12 -/* 8011F550 0011C4B0 4E 80 04 21 */ bctrl +/* 8011F550 0011C4B0 4E 80 04 21 */ bctrl /* 8011F554 0011C4B4 80 7F 03 A0 */ lwz r3, 0x3a0(r31) /* 8011F558 0011C4B8 81 83 00 00 */ lwz r12, 0(r3) /* 8011F55C 0011C4BC 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8011F560 0011C4C0 7D 89 03 A6 */ mtctr r12 -/* 8011F564 0011C4C4 4E 80 04 21 */ bctrl +/* 8011F564 0011C4C4 4E 80 04 21 */ bctrl /* 8011F568 0011C4C8 80 7F 03 90 */ lwz r3, 0x390(r31) /* 8011F56C 0011C4CC 81 83 00 00 */ lwz r12, 0(r3) /* 8011F570 0011C4D0 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8011F574 0011C4D4 7D 89 03 A6 */ mtctr r12 -/* 8011F578 0011C4D8 4E 80 04 21 */ bctrl +/* 8011F578 0011C4D8 4E 80 04 21 */ bctrl /* 8011F57C 0011C4DC 3C 80 80 5A */ lis r4, lbl_805A61D4@ha /* 8011F580 0011C4E0 38 61 00 C8 */ addi r3, r1, 0xc8 /* 8011F584 0011C4E4 38 84 61 D4 */ addi r4, r4, lbl_805A61D4@l @@ -2415,12 +2415,12 @@ lbl_8011F540: /* 8011F5BC 0011C51C 81 83 00 00 */ lwz r12, 0(r3) /* 8011F5C0 0011C520 81 8C 00 30 */ lwz r12, 0x30(r12) /* 8011F5C4 0011C524 7D 89 03 A6 */ mtctr r12 -/* 8011F5C8 0011C528 4E 80 04 21 */ bctrl +/* 8011F5C8 0011C528 4E 80 04 21 */ bctrl /* 8011F5CC 0011C52C 80 7F 03 9C */ lwz r3, 0x39c(r31) /* 8011F5D0 0011C530 81 83 00 00 */ lwz r12, 0(r3) /* 8011F5D4 0011C534 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8011F5D8 0011C538 7D 89 03 A6 */ mtctr r12 -/* 8011F5DC 0011C53C 4E 80 04 21 */ bctrl +/* 8011F5DC 0011C53C 4E 80 04 21 */ bctrl /* 8011F5E0 0011C540 38 61 00 C8 */ addi r3, r1, 0xc8 /* 8011F5E4 0011C544 48 1E D1 69 */ bl SetViewPointMatrix__9CGraphicsFRC12CTransform4f lbl_8011F5E8: @@ -2428,7 +2428,7 @@ lbl_8011F5E8: /* 8011F5EC 0011C54C 83 E1 01 2C */ lwz r31, 0x12c(r1) /* 8011F5F0 0011C550 7C 08 03 A6 */ mtlr r0 /* 8011F5F4 0011C554 38 21 01 30 */ addi r1, r1, 0x130 -/* 8011F5F8 0011C558 4E 80 00 20 */ blr +/* 8011F5F8 0011C558 4E 80 00 20 */ blr .global Render__11CGrappleArmCFRC13CStateManagerRC9CVector3fRC11CModelFlagsPC12CActorLights Render__11CGrappleArmCFRC13CStateManagerRC9CVector3fRC11CModelFlagsPC12CActorLights: @@ -2581,7 +2581,7 @@ lbl_8011F81C: /* 8011F820 0011C780 80 01 01 84 */ lwz r0, 0x184(r1) /* 8011F824 0011C784 7C 08 03 A6 */ mtlr r0 /* 8011F828 0011C788 38 21 01 80 */ addi r1, r1, 0x180 -/* 8011F82C 0011C78C 4E 80 00 20 */ blr +/* 8011F82C 0011C78C 4E 80 00 20 */ blr .global PreRender__11CGrappleArmFR13CStateManagerRC14CFrustumPlanesRC9CVector3f PreRender__11CGrappleArmFR13CStateManagerRC14CFrustumPlanesRC9CVector3f: @@ -2612,7 +2612,7 @@ lbl_8011F884: /* 8011F888 0011C7E8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8011F88C 0011C7EC 7C 08 03 A6 */ mtlr r0 /* 8011F890 0011C7F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011F894 0011C7F4 4E 80 00 20 */ blr +/* 8011F894 0011C7F4 4E 80 00 20 */ blr .global TouchModel__11CGrappleArmCFRC13CStateManager TouchModel__11CGrappleArmCFRC13CStateManager: @@ -2669,7 +2669,7 @@ lbl_8011F94C: /* 8011F954 0011C8B4 83 C1 00 08 */ lwz r30, 8(r1) /* 8011F958 0011C8B8 7C 08 03 A6 */ mtlr r0 /* 8011F95C 0011C8BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011F960 0011C8C0 4E 80 00 20 */ blr +/* 8011F960 0011C8C0 4E 80 00 20 */ blr .global __dt__11CGrappleArmFv __dt__11CGrappleArmFv: @@ -2695,7 +2695,7 @@ __dt__11CGrappleArmFv: /* 8011F9B0 0011C910 38 80 00 01 */ li r4, 1 /* 8011F9B4 0011C914 81 8C 00 08 */ lwz r12, 8(r12) /* 8011F9B8 0011C918 7D 89 03 A6 */ mtctr r12 -/* 8011F9BC 0011C91C 4E 80 04 21 */ bctrl +/* 8011F9BC 0011C91C 4E 80 04 21 */ bctrl lbl_8011F9C0: /* 8011F9C0 0011C920 34 1E 03 9C */ addic. r0, r30, 0x39c /* 8011F9C4 0011C924 41 82 00 24 */ beq lbl_8011F9E8 @@ -2706,7 +2706,7 @@ lbl_8011F9C0: /* 8011F9D8 0011C938 38 80 00 01 */ li r4, 1 /* 8011F9DC 0011C93C 81 8C 00 08 */ lwz r12, 8(r12) /* 8011F9E0 0011C940 7D 89 03 A6 */ mtctr r12 -/* 8011F9E4 0011C944 4E 80 04 21 */ bctrl +/* 8011F9E4 0011C944 4E 80 04 21 */ bctrl lbl_8011F9E8: /* 8011F9E8 0011C948 34 1E 03 98 */ addic. r0, r30, 0x398 /* 8011F9EC 0011C94C 41 82 00 24 */ beq lbl_8011FA10 @@ -2717,7 +2717,7 @@ lbl_8011F9E8: /* 8011FA00 0011C960 38 80 00 01 */ li r4, 1 /* 8011FA04 0011C964 81 8C 00 08 */ lwz r12, 8(r12) /* 8011FA08 0011C968 7D 89 03 A6 */ mtctr r12 -/* 8011FA0C 0011C96C 4E 80 04 21 */ bctrl +/* 8011FA0C 0011C96C 4E 80 04 21 */ bctrl lbl_8011FA10: /* 8011FA10 0011C970 34 1E 03 94 */ addic. r0, r30, 0x394 /* 8011FA14 0011C974 41 82 00 24 */ beq lbl_8011FA38 @@ -2728,7 +2728,7 @@ lbl_8011FA10: /* 8011FA28 0011C988 38 80 00 01 */ li r4, 1 /* 8011FA2C 0011C98C 81 8C 00 08 */ lwz r12, 8(r12) /* 8011FA30 0011C990 7D 89 03 A6 */ mtctr r12 -/* 8011FA34 0011C994 4E 80 04 21 */ bctrl +/* 8011FA34 0011C994 4E 80 04 21 */ bctrl lbl_8011FA38: /* 8011FA38 0011C998 34 1E 03 90 */ addic. r0, r30, 0x390 /* 8011FA3C 0011C99C 41 82 00 24 */ beq lbl_8011FA60 @@ -2739,7 +2739,7 @@ lbl_8011FA38: /* 8011FA50 0011C9B0 38 80 00 01 */ li r4, 1 /* 8011FA54 0011C9B4 81 8C 00 08 */ lwz r12, 8(r12) /* 8011FA58 0011C9B8 7D 89 03 A6 */ mtctr r12 -/* 8011FA5C 0011C9BC 4E 80 04 21 */ bctrl +/* 8011FA5C 0011C9BC 4E 80 04 21 */ bctrl lbl_8011FA60: /* 8011FA60 0011C9C0 34 1E 03 84 */ addic. r0, r30, 0x384 /* 8011FA64 0011C9C4 41 82 00 18 */ beq lbl_8011FA7C @@ -2863,7 +2863,7 @@ lbl_8011FBF0: /* 8011FC04 0011CB64 83 81 00 20 */ lwz r28, 0x20(r1) /* 8011FC08 0011CB68 7C 08 03 A6 */ mtlr r0 /* 8011FC0C 0011CB6C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8011FC10 0011CB70 4E 80 00 20 */ blr +/* 8011FC10 0011CB70 4E 80 00 20 */ blr .global sub_8011fc14 sub_8011fc14: @@ -2887,7 +2887,7 @@ lbl_8011FC48: /* 8011FC54 0011CBB4 83 C1 00 08 */ lwz r30, 8(r1) /* 8011FC58 0011CBB8 7C 08 03 A6 */ mtlr r0 /* 8011FC5C 0011CBBC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011FC60 0011CBC0 4E 80 00 20 */ blr +/* 8011FC60 0011CBC0 4E 80 00 20 */ blr .global "clear__Q24rstl70reserved_vector,4>Fv" "clear__Q24rstl70reserved_vector,4>Fv": @@ -2936,7 +2936,7 @@ lbl_8011FCE0: /* 8011FCF8 0011CC58 80 01 00 34 */ lwz r0, 0x34(r1) /* 8011FCFC 0011CC5C 7C 08 03 A6 */ mtlr r0 /* 8011FD00 0011CC60 38 21 00 30 */ addi r1, r1, 0x30 -/* 8011FD04 0011CC64 4E 80 00 20 */ blr +/* 8011FD04 0011CC64 4E 80 00 20 */ blr .global "__dt__Q24rstl28single_ptr<14CGunController>Fv" "__dt__Q24rstl28single_ptr<14CGunController>Fv": @@ -2962,7 +2962,7 @@ lbl_8011FD44: /* 8011FD50 0011CCB0 83 C1 00 08 */ lwz r30, 8(r1) /* 8011FD54 0011CCB4 7C 08 03 A6 */ mtlr r0 /* 8011FD58 0011CCB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011FD5C 0011CCBC 4E 80 00 20 */ blr +/* 8011FD5C 0011CCBC 4E 80 00 20 */ blr .global __ct__11CGrappleArmFRC9CVector3f __ct__11CGrappleArmFRC9CVector3f: @@ -3049,7 +3049,7 @@ __ct__11CGrappleArmFRC9CVector3f: /* 8011FEA0 0011CE00 81 84 00 00 */ lwz r12, 0(r4) /* 8011FEA4 0011CE04 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8011FEA8 0011CE08 7D 89 03 A6 */ mtctr r12 -/* 8011FEAC 0011CE0C 4E 80 04 21 */ bctrl +/* 8011FEAC 0011CE0C 4E 80 04 21 */ bctrl /* 8011FEB0 0011CE10 38 7F 01 84 */ addi r3, r31, 0x184 /* 8011FEB4 0011CE14 38 81 00 80 */ addi r4, r1, 0x80 /* 8011FEB8 0011CE18 48 22 0F F1 */ bl __ct__6CTokenFRC6CToken @@ -3122,7 +3122,7 @@ __ct__11CGrappleArmFRC9CVector3f: /* 8011FFC4 0011CF24 81 84 00 00 */ lwz r12, 0(r4) /* 8011FFC8 0011CF28 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8011FFCC 0011CF2C 7D 89 03 A6 */ mtctr r12 -/* 8011FFD0 0011CF30 4E 80 04 21 */ bctrl +/* 8011FFD0 0011CF30 4E 80 04 21 */ bctrl /* 8011FFD4 0011CF34 3B 9F 03 54 */ addi r28, r31, 0x354 /* 8011FFD8 0011CF38 38 81 00 70 */ addi r4, r1, 0x70 /* 8011FFDC 0011CF3C 7F 83 E3 78 */ mr r3, r28 @@ -3146,7 +3146,7 @@ __ct__11CGrappleArmFRC9CVector3f: /* 80120024 0011CF84 81 84 00 00 */ lwz r12, 0(r4) /* 80120028 0011CF88 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8012002C 0011CF8C 7D 89 03 A6 */ mtctr r12 -/* 80120030 0011CF90 4E 80 04 21 */ bctrl +/* 80120030 0011CF90 4E 80 04 21 */ bctrl /* 80120034 0011CF94 3B 9F 03 60 */ addi r28, r31, 0x360 /* 80120038 0011CF98 38 81 00 60 */ addi r4, r1, 0x60 /* 8012003C 0011CF9C 7F 83 E3 78 */ mr r3, r28 @@ -3170,7 +3170,7 @@ __ct__11CGrappleArmFRC9CVector3f: /* 80120084 0011CFE4 81 84 00 00 */ lwz r12, 0(r4) /* 80120088 0011CFE8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8012008C 0011CFEC 7D 89 03 A6 */ mtctr r12 -/* 80120090 0011CFF0 4E 80 04 21 */ bctrl +/* 80120090 0011CFF0 4E 80 04 21 */ bctrl /* 80120094 0011CFF4 3B 9F 03 6C */ addi r28, r31, 0x36c /* 80120098 0011CFF8 38 81 00 50 */ addi r4, r1, 0x50 /* 8012009C 0011CFFC 7F 83 E3 78 */ mr r3, r28 @@ -3194,7 +3194,7 @@ __ct__11CGrappleArmFRC9CVector3f: /* 801200E4 0011D044 81 84 00 00 */ lwz r12, 0(r4) /* 801200E8 0011D048 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801200EC 0011D04C 7D 89 03 A6 */ mtctr r12 -/* 801200F0 0011D050 4E 80 04 21 */ bctrl +/* 801200F0 0011D050 4E 80 04 21 */ bctrl /* 801200F4 0011D054 3B 9F 03 78 */ addi r28, r31, 0x378 /* 801200F8 0011D058 38 81 00 40 */ addi r4, r1, 0x40 /* 801200FC 0011D05C 7F 83 E3 78 */ mr r3, r28 @@ -3218,7 +3218,7 @@ __ct__11CGrappleArmFRC9CVector3f: /* 80120144 0011D0A4 81 84 00 00 */ lwz r12, 0(r4) /* 80120148 0011D0A8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8012014C 0011D0AC 7D 89 03 A6 */ mtctr r12 -/* 80120150 0011D0B0 4E 80 04 21 */ bctrl +/* 80120150 0011D0B0 4E 80 04 21 */ bctrl /* 80120154 0011D0B4 3B 9F 03 84 */ addi r28, r31, 0x384 /* 80120158 0011D0B8 38 81 00 30 */ addi r4, r1, 0x30 /* 8012015C 0011D0BC 7F 83 E3 78 */ mr r3, r28 @@ -3432,13 +3432,13 @@ lbl_801203AC: /* 80120470 0011D3D0 81 83 00 00 */ lwz r12, 0(r3) /* 80120474 0011D3D4 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80120478 0011D3D8 7D 89 03 A6 */ mtctr r12 -/* 8012047C 0011D3DC 4E 80 04 21 */ bctrl +/* 8012047C 0011D3DC 4E 80 04 21 */ bctrl /* 80120480 0011D3E0 80 7F 03 90 */ lwz r3, 0x390(r31) /* 80120484 0011D3E4 38 80 00 00 */ li r4, 0 /* 80120488 0011D3E8 81 83 00 00 */ lwz r12, 0(r3) /* 8012048C 0011D3EC 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80120490 0011D3F0 7D 89 03 A6 */ mtctr r12 -/* 80120494 0011D3F4 4E 80 04 21 */ bctrl +/* 80120494 0011D3F4 4E 80 04 21 */ bctrl /* 80120498 0011D3F8 83 BF 03 A0 */ lwz r29, 0x3a0(r31) /* 8012049C 0011D3FC 3B 80 00 00 */ li r28, 0 /* 801204A0 0011D400 3B C0 00 01 */ li r30, 1 @@ -3453,7 +3453,7 @@ lbl_801204A8: /* 801204C0 0011D420 81 83 00 00 */ lwz r12, 0(r3) /* 801204C4 0011D424 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801204C8 0011D428 7D 89 03 A6 */ mtctr r12 -/* 801204CC 0011D42C 4E 80 04 21 */ bctrl +/* 801204CC 0011D42C 4E 80 04 21 */ bctrl /* 801204D0 0011D430 3B 9C 00 01 */ addi r28, r28, 1 lbl_801204D4: /* 801204D4 0011D434 80 7D 01 60 */ lwz r3, 0x160(r29) diff --git a/asm/MetroidPrime/Player/CMorphBall.s b/asm/MetroidPrime/Player/CMorphBall.s index 442351ee..6414bb71 100644 --- a/asm/MetroidPrime/Player/CMorphBall.s +++ b/asm/MetroidPrime/Player/CMorphBall.s @@ -248,7 +248,7 @@ lbl_805A74A8: .4byte 0xFFFFFFFF .4byte 0 -.section .bss +.section .bss .global lbl_8046C4F8 lbl_8046C4F8: @@ -297,7 +297,7 @@ DeleteBallShadow__10CMorphBallFv: /* 800ED818 000EA778 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800ED81C 000EA77C 7C 08 03 A6 */ mtlr r0 /* 800ED820 000EA780 38 21 00 10 */ addi r1, r1, 0x10 -/* 800ED824 000EA784 4E 80 00 20 */ blr +/* 800ED824 000EA784 4E 80 00 20 */ blr .global CreateBallShadow__10CMorphBallFv CreateBallShadow__10CMorphBallFv: @@ -330,7 +330,7 @@ CreateBallShadow__10CMorphBallFv: /* 800ED890 000EA7F0 38 A5 00 E3 */ addi r5, r5, 0xe3 /* 800ED894 000EA7F4 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800ED898 000EA7F8 7D 89 03 A6 */ mtctr r12 -/* 800ED89C 000EA7FC 4E 80 04 21 */ bctrl +/* 800ED89C 000EA7FC 4E 80 04 21 */ bctrl /* 800ED8A0 000EA800 38 61 00 08 */ addi r3, r1, 8 /* 800ED8A4 000EA804 38 81 00 10 */ addi r4, r1, 0x10 /* 800ED8A8 000EA808 3B A0 00 01 */ li r29, 1 @@ -366,7 +366,7 @@ lbl_800ED904: /* 800ED914 000EA874 83 81 00 20 */ lwz r28, 0x20(r1) /* 800ED918 000EA878 7C 08 03 A6 */ mtlr r0 /* 800ED91C 000EA87C 38 21 00 30 */ addi r1, r1, 0x30 -/* 800ED920 000EA880 4E 80 00 20 */ blr +/* 800ED920 000EA880 4E 80 00 20 */ blr .global RenderToShadowTex__10CMorphBallFR13CStateManager RenderToShadowTex__10CMorphBallFR13CStateManager: @@ -432,7 +432,7 @@ lbl_800ED9FC: /* 800EDA0C 000EA96C 83 C1 00 48 */ lwz r30, 0x48(r1) /* 800EDA10 000EA970 7C 08 03 A6 */ mtlr r0 /* 800EDA14 000EA974 38 21 00 60 */ addi r1, r1, 0x60 -/* 800EDA18 000EA978 4E 80 00 20 */ blr +/* 800EDA18 000EA978 4E 80 00 20 */ blr .global DrawBallShadow__10CMorphBallFR13CStateManager DrawBallShadow__10CMorphBallFR13CStateManager: @@ -508,7 +508,7 @@ lbl_800EDB04: /* 800EDB0C 000EAA6C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 800EDB10 000EAA70 7C 08 03 A6 */ mtlr r0 /* 800EDB14 000EAA74 38 21 00 20 */ addi r1, r1, 0x20 -/* 800EDB18 000EAA78 4E 80 00 20 */ blr +/* 800EDB18 000EAA78 4E 80 00 20 */ blr .global InitializeWakeEffects__10CMorphBallFv InitializeWakeEffects__10CMorphBallFv: @@ -585,7 +585,7 @@ lbl_800EDBE4: /* 800EDC20 000EAB80 38 80 00 01 */ li r4, 1 /* 800EDC24 000EAB84 81 8C 00 08 */ lwz r12, 8(r12) /* 800EDC28 000EAB88 7D 89 03 A6 */ mtctr r12 -/* 800EDC2C 000EAB8C 4E 80 04 21 */ bctrl +/* 800EDC2C 000EAB8C 4E 80 04 21 */ bctrl lbl_800EDC30: /* 800EDC30 000EAB90 80 7F 1B 84 */ lwz r3, 0x1b84(r31) /* 800EDC34 000EAB94 2C 03 00 08 */ cmpwi r3, 8 @@ -622,7 +622,7 @@ lbl_800EDC80: /* 800EDCA0 000EAC00 38 A5 00 F1 */ addi r5, r5, 0xf1 /* 800EDCA4 000EAC04 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800EDCA8 000EAC08 7D 89 03 A6 */ mtctr r12 -/* 800EDCAC 000EAC0C 4E 80 04 21 */ bctrl +/* 800EDCAC 000EAC0C 4E 80 04 21 */ bctrl /* 800EDCB0 000EAC10 38 61 01 08 */ addi r3, r1, 0x108 /* 800EDCB4 000EAC14 38 81 01 10 */ addi r4, r1, 0x110 /* 800EDCB8 000EAC18 48 25 31 F1 */ bl __ct__6CTokenFRC6CToken @@ -645,7 +645,7 @@ lbl_800EDC80: /* 800EDCFC 000EAC5C 38 A5 00 FA */ addi r5, r5, 0xfa /* 800EDD00 000EAC60 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800EDD04 000EAC64 7D 89 03 A6 */ mtctr r12 -/* 800EDD08 000EAC68 4E 80 04 21 */ bctrl +/* 800EDD08 000EAC68 4E 80 04 21 */ bctrl /* 800EDD0C 000EAC6C 38 61 00 F8 */ addi r3, r1, 0xf8 /* 800EDD10 000EAC70 38 81 01 00 */ addi r4, r1, 0x100 /* 800EDD14 000EAC74 48 25 31 95 */ bl __ct__6CTokenFRC6CToken @@ -666,7 +666,7 @@ lbl_800EDC80: /* 800EDD50 000EACB0 38 A5 01 05 */ addi r5, r5, 0x105 /* 800EDD54 000EACB4 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800EDD58 000EACB8 7D 89 03 A6 */ mtctr r12 -/* 800EDD5C 000EACBC 4E 80 04 21 */ bctrl +/* 800EDD5C 000EACBC 4E 80 04 21 */ bctrl /* 800EDD60 000EACC0 38 61 00 E8 */ addi r3, r1, 0xe8 /* 800EDD64 000EACC4 38 81 00 F0 */ addi r4, r1, 0xf0 /* 800EDD68 000EACC8 48 25 31 41 */ bl __ct__6CTokenFRC6CToken @@ -688,7 +688,7 @@ lbl_800EDC80: /* 800EDDA8 000EAD08 38 A5 01 16 */ addi r5, r5, 0x116 /* 800EDDAC 000EAD0C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800EDDB0 000EAD10 7D 89 03 A6 */ mtctr r12 -/* 800EDDB4 000EAD14 4E 80 04 21 */ bctrl +/* 800EDDB4 000EAD14 4E 80 04 21 */ bctrl /* 800EDDB8 000EAD18 38 61 00 D8 */ addi r3, r1, 0xd8 /* 800EDDBC 000EAD1C 38 81 00 E0 */ addi r4, r1, 0xe0 /* 800EDDC0 000EAD20 48 25 30 E9 */ bl __ct__6CTokenFRC6CToken @@ -710,7 +710,7 @@ lbl_800EDC80: /* 800EDE00 000EAD60 38 A5 01 1F */ addi r5, r5, 0x11f /* 800EDE04 000EAD64 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800EDE08 000EAD68 7D 89 03 A6 */ mtctr r12 -/* 800EDE0C 000EAD6C 4E 80 04 21 */ bctrl +/* 800EDE0C 000EAD6C 4E 80 04 21 */ bctrl /* 800EDE10 000EAD70 38 61 00 C8 */ addi r3, r1, 0xc8 /* 800EDE14 000EAD74 38 81 00 D0 */ addi r4, r1, 0xd0 /* 800EDE18 000EAD78 48 25 30 91 */ bl __ct__6CTokenFRC6CToken @@ -732,7 +732,7 @@ lbl_800EDC80: /* 800EDE58 000EADB8 38 A5 01 28 */ addi r5, r5, 0x128 /* 800EDE5C 000EADBC 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800EDE60 000EADC0 7D 89 03 A6 */ mtctr r12 -/* 800EDE64 000EADC4 4E 80 04 21 */ bctrl +/* 800EDE64 000EADC4 4E 80 04 21 */ bctrl /* 800EDE68 000EADC8 38 61 00 B8 */ addi r3, r1, 0xb8 /* 800EDE6C 000EADCC 38 81 00 C0 */ addi r4, r1, 0xc0 /* 800EDE70 000EADD0 48 25 30 39 */ bl __ct__6CTokenFRC6CToken @@ -754,7 +754,7 @@ lbl_800EDC80: /* 800EDEB0 000EAE10 38 A5 01 30 */ addi r5, r5, 0x130 /* 800EDEB4 000EAE14 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800EDEB8 000EAE18 7D 89 03 A6 */ mtctr r12 -/* 800EDEBC 000EAE1C 4E 80 04 21 */ bctrl +/* 800EDEBC 000EAE1C 4E 80 04 21 */ bctrl /* 800EDEC0 000EAE20 38 61 00 A8 */ addi r3, r1, 0xa8 /* 800EDEC4 000EAE24 38 81 00 B0 */ addi r4, r1, 0xb0 /* 800EDEC8 000EAE28 48 25 2F E1 */ bl __ct__6CTokenFRC6CToken @@ -776,7 +776,7 @@ lbl_800EDC80: /* 800EDF08 000EAE68 38 A5 01 39 */ addi r5, r5, 0x139 /* 800EDF0C 000EAE6C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800EDF10 000EAE70 7D 89 03 A6 */ mtctr r12 -/* 800EDF14 000EAE74 4E 80 04 21 */ bctrl +/* 800EDF14 000EAE74 4E 80 04 21 */ bctrl /* 800EDF18 000EAE78 38 61 00 98 */ addi r3, r1, 0x98 /* 800EDF1C 000EAE7C 38 81 00 A0 */ addi r4, r1, 0xa0 /* 800EDF20 000EAE80 48 25 2F 89 */ bl __ct__6CTokenFRC6CToken @@ -827,7 +827,7 @@ lbl_800EDFA8: /* 800EDFC4 000EAF24 38 80 00 01 */ li r4, 1 /* 800EDFC8 000EAF28 81 8C 00 08 */ lwz r12, 8(r12) /* 800EDFCC 000EAF2C 7D 89 03 A6 */ mtctr r12 -/* 800EDFD0 000EAF30 4E 80 04 21 */ bctrl +/* 800EDFD0 000EAF30 4E 80 04 21 */ bctrl lbl_800EDFD4: /* 800EDFD4 000EAF34 3C 60 80 3D */ lis r3, lbl_803CEBF4@ha /* 800EDFD8 000EAF38 3A C0 00 00 */ li r22, 0 @@ -869,7 +869,7 @@ lbl_800EE020: /* 800EE064 000EAFC4 38 80 00 01 */ li r4, 1 /* 800EE068 000EAFC8 81 8C 00 08 */ lwz r12, 8(r12) /* 800EE06C 000EAFCC 7D 89 03 A6 */ mtctr r12 -/* 800EE070 000EAFD0 4E 80 04 21 */ bctrl +/* 800EE070 000EAFD0 4E 80 04 21 */ bctrl lbl_800EE074: /* 800EE074 000EAFD4 88 61 00 80 */ lbz r3, 0x80(r1) /* 800EE078 000EAFD8 38 00 00 00 */ li r0, 0 @@ -888,7 +888,7 @@ lbl_800EE08C: /* 800EE0A8 000EB008 38 80 00 01 */ li r4, 1 /* 800EE0AC 000EB00C 81 8C 00 08 */ lwz r12, 8(r12) /* 800EE0B0 000EB010 7D 89 03 A6 */ mtctr r12 -/* 800EE0B4 000EB014 4E 80 04 21 */ bctrl +/* 800EE0B4 000EB014 4E 80 04 21 */ bctrl lbl_800EE0B8: /* 800EE0B8 000EB018 7E C0 07 75 */ extsb. r0, r22 /* 800EE0BC 000EB01C 41 82 00 10 */ beq lbl_800EE0CC @@ -934,7 +934,7 @@ lbl_800EE118: /* 800EE154 000EB0B4 38 80 00 01 */ li r4, 1 /* 800EE158 000EB0B8 81 8C 00 08 */ lwz r12, 8(r12) /* 800EE15C 000EB0BC 7D 89 03 A6 */ mtctr r12 -/* 800EE160 000EB0C0 4E 80 04 21 */ bctrl +/* 800EE160 000EB0C0 4E 80 04 21 */ bctrl lbl_800EE164: /* 800EE164 000EB0C4 88 61 00 70 */ lbz r3, 0x70(r1) /* 800EE168 000EB0C8 38 00 00 00 */ li r0, 0 @@ -953,7 +953,7 @@ lbl_800EE17C: /* 800EE198 000EB0F8 38 80 00 01 */ li r4, 1 /* 800EE19C 000EB0FC 81 8C 00 08 */ lwz r12, 8(r12) /* 800EE1A0 000EB100 7D 89 03 A6 */ mtctr r12 -/* 800EE1A4 000EB104 4E 80 04 21 */ bctrl +/* 800EE1A4 000EB104 4E 80 04 21 */ bctrl lbl_800EE1A8: /* 800EE1A8 000EB108 7E C0 07 75 */ extsb. r0, r22 /* 800EE1AC 000EB10C 41 82 00 10 */ beq lbl_800EE1BC @@ -1000,7 +1000,7 @@ lbl_800EE208: /* 800EE248 000EB1A8 38 80 00 01 */ li r4, 1 /* 800EE24C 000EB1AC 81 8C 00 08 */ lwz r12, 8(r12) /* 800EE250 000EB1B0 7D 89 03 A6 */ mtctr r12 -/* 800EE254 000EB1B4 4E 80 04 21 */ bctrl +/* 800EE254 000EB1B4 4E 80 04 21 */ bctrl lbl_800EE258: /* 800EE258 000EB1B8 88 61 00 60 */ lbz r3, 0x60(r1) /* 800EE25C 000EB1BC 38 00 00 00 */ li r0, 0 @@ -1019,7 +1019,7 @@ lbl_800EE270: /* 800EE28C 000EB1EC 38 80 00 01 */ li r4, 1 /* 800EE290 000EB1F0 81 8C 00 08 */ lwz r12, 8(r12) /* 800EE294 000EB1F4 7D 89 03 A6 */ mtctr r12 -/* 800EE298 000EB1F8 4E 80 04 21 */ bctrl +/* 800EE298 000EB1F8 4E 80 04 21 */ bctrl lbl_800EE29C: /* 800EE29C 000EB1FC 7E C0 07 75 */ extsb. r0, r22 /* 800EE2A0 000EB200 41 82 00 10 */ beq lbl_800EE2B0 @@ -1066,7 +1066,7 @@ lbl_800EE2FC: /* 800EE33C 000EB29C 38 80 00 01 */ li r4, 1 /* 800EE340 000EB2A0 81 8C 00 08 */ lwz r12, 8(r12) /* 800EE344 000EB2A4 7D 89 03 A6 */ mtctr r12 -/* 800EE348 000EB2A8 4E 80 04 21 */ bctrl +/* 800EE348 000EB2A8 4E 80 04 21 */ bctrl lbl_800EE34C: /* 800EE34C 000EB2AC 88 61 00 50 */ lbz r3, 0x50(r1) /* 800EE350 000EB2B0 38 00 00 00 */ li r0, 0 @@ -1085,7 +1085,7 @@ lbl_800EE364: /* 800EE380 000EB2E0 38 80 00 01 */ li r4, 1 /* 800EE384 000EB2E4 81 8C 00 08 */ lwz r12, 8(r12) /* 800EE388 000EB2E8 7D 89 03 A6 */ mtctr r12 -/* 800EE38C 000EB2EC 4E 80 04 21 */ bctrl +/* 800EE38C 000EB2EC 4E 80 04 21 */ bctrl lbl_800EE390: /* 800EE390 000EB2F0 7E C0 07 75 */ extsb. r0, r22 /* 800EE394 000EB2F4 41 82 00 10 */ beq lbl_800EE3A4 @@ -1132,7 +1132,7 @@ lbl_800EE3F0: /* 800EE430 000EB390 38 80 00 01 */ li r4, 1 /* 800EE434 000EB394 81 8C 00 08 */ lwz r12, 8(r12) /* 800EE438 000EB398 7D 89 03 A6 */ mtctr r12 -/* 800EE43C 000EB39C 4E 80 04 21 */ bctrl +/* 800EE43C 000EB39C 4E 80 04 21 */ bctrl lbl_800EE440: /* 800EE440 000EB3A0 88 61 00 40 */ lbz r3, 0x40(r1) /* 800EE444 000EB3A4 38 00 00 00 */ li r0, 0 @@ -1151,7 +1151,7 @@ lbl_800EE458: /* 800EE474 000EB3D4 38 80 00 01 */ li r4, 1 /* 800EE478 000EB3D8 81 8C 00 08 */ lwz r12, 8(r12) /* 800EE47C 000EB3DC 7D 89 03 A6 */ mtctr r12 -/* 800EE480 000EB3E0 4E 80 04 21 */ bctrl +/* 800EE480 000EB3E0 4E 80 04 21 */ bctrl lbl_800EE484: /* 800EE484 000EB3E4 7E C0 07 75 */ extsb. r0, r22 /* 800EE488 000EB3E8 41 82 00 10 */ beq lbl_800EE498 @@ -1198,7 +1198,7 @@ lbl_800EE4E4: /* 800EE524 000EB484 38 80 00 01 */ li r4, 1 /* 800EE528 000EB488 81 8C 00 08 */ lwz r12, 8(r12) /* 800EE52C 000EB48C 7D 89 03 A6 */ mtctr r12 -/* 800EE530 000EB490 4E 80 04 21 */ bctrl +/* 800EE530 000EB490 4E 80 04 21 */ bctrl lbl_800EE534: /* 800EE534 000EB494 88 61 00 30 */ lbz r3, 0x30(r1) /* 800EE538 000EB498 38 00 00 00 */ li r0, 0 @@ -1217,7 +1217,7 @@ lbl_800EE54C: /* 800EE568 000EB4C8 38 80 00 01 */ li r4, 1 /* 800EE56C 000EB4CC 81 8C 00 08 */ lwz r12, 8(r12) /* 800EE570 000EB4D0 7D 89 03 A6 */ mtctr r12 -/* 800EE574 000EB4D4 4E 80 04 21 */ bctrl +/* 800EE574 000EB4D4 4E 80 04 21 */ bctrl lbl_800EE578: /* 800EE578 000EB4D8 7E C0 07 75 */ extsb. r0, r22 /* 800EE57C 000EB4DC 41 82 00 10 */ beq lbl_800EE58C @@ -1264,7 +1264,7 @@ lbl_800EE5D8: /* 800EE618 000EB578 38 80 00 01 */ li r4, 1 /* 800EE61C 000EB57C 81 8C 00 08 */ lwz r12, 8(r12) /* 800EE620 000EB580 7D 89 03 A6 */ mtctr r12 -/* 800EE624 000EB584 4E 80 04 21 */ bctrl +/* 800EE624 000EB584 4E 80 04 21 */ bctrl lbl_800EE628: /* 800EE628 000EB588 88 61 00 20 */ lbz r3, 0x20(r1) /* 800EE62C 000EB58C 38 00 00 00 */ li r0, 0 @@ -1283,7 +1283,7 @@ lbl_800EE640: /* 800EE65C 000EB5BC 38 80 00 01 */ li r4, 1 /* 800EE660 000EB5C0 81 8C 00 08 */ lwz r12, 8(r12) /* 800EE664 000EB5C4 7D 89 03 A6 */ mtctr r12 -/* 800EE668 000EB5C8 4E 80 04 21 */ bctrl +/* 800EE668 000EB5C8 4E 80 04 21 */ bctrl lbl_800EE66C: /* 800EE66C 000EB5CC 7E C0 07 75 */ extsb. r0, r22 /* 800EE670 000EB5D0 41 82 00 10 */ beq lbl_800EE680 @@ -1330,7 +1330,7 @@ lbl_800EE6CC: /* 800EE70C 000EB66C 38 80 00 01 */ li r4, 1 /* 800EE710 000EB670 81 8C 00 08 */ lwz r12, 8(r12) /* 800EE714 000EB674 7D 89 03 A6 */ mtctr r12 -/* 800EE718 000EB678 4E 80 04 21 */ bctrl +/* 800EE718 000EB678 4E 80 04 21 */ bctrl lbl_800EE71C: /* 800EE71C 000EB67C 88 61 00 10 */ lbz r3, 0x10(r1) /* 800EE720 000EB680 38 00 00 00 */ li r0, 0 @@ -1349,7 +1349,7 @@ lbl_800EE734: /* 800EE750 000EB6B0 38 80 00 01 */ li r4, 1 /* 800EE754 000EB6B4 81 8C 00 08 */ lwz r12, 8(r12) /* 800EE758 000EB6B8 7D 89 03 A6 */ mtctr r12 -/* 800EE75C 000EB6BC 4E 80 04 21 */ bctrl +/* 800EE75C 000EB6BC 4E 80 04 21 */ bctrl lbl_800EE760: /* 800EE760 000EB6C0 7E C0 07 75 */ extsb. r0, r22 /* 800EE764 000EB6C4 41 82 00 10 */ beq lbl_800EE774 @@ -1361,7 +1361,7 @@ lbl_800EE774: /* 800EE778 000EB6D8 80 01 01 54 */ lwz r0, 0x154(r1) /* 800EE77C 000EB6DC 7C 08 03 A6 */ mtlr r0 /* 800EE780 000EB6E0 38 21 01 50 */ addi r1, r1, 0x150 -/* 800EE784 000EB6E4 4E 80 00 20 */ blr +/* 800EE784 000EB6E4 4E 80 00 20 */ blr .global PointGenerator__10CMorphBallFPvPC9CVector3fPC9CVector3fi PointGenerator__10CMorphBallFPvPC9CVector3fPC9CVector3fi: @@ -1375,7 +1375,7 @@ lbl_800EE7A0: /* 800EE7A0 000EB700 80 01 00 14 */ lwz r0, 0x14(r1) /* 800EE7A4 000EB704 7C 08 03 A6 */ mtlr r0 /* 800EE7A8 000EB708 38 21 00 10 */ addi r1, r1, 0x10 -/* 800EE7AC 000EB70C 4E 80 00 20 */ blr +/* 800EE7AC 000EB70C 4E 80 00 20 */ blr .global StartLandingSfx__10CMorphBallFv StartLandingSfx__10CMorphBallFv: @@ -1426,7 +1426,7 @@ lbl_800EE850: /* 800EE85C 000EB7BC 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 800EE860 000EB7C0 7C 08 03 A6 */ mtlr r0 /* 800EE864 000EB7C4 38 21 00 30 */ addi r1, r1, 0x30 -/* 800EE868 000EB7C8 4E 80 00 20 */ blr +/* 800EE868 000EB7C8 4E 80 00 20 */ blr .global StopSounds__10CMorphBallFv StopSounds__10CMorphBallFv: @@ -1459,7 +1459,7 @@ lbl_800EE8C8: /* 800EE8CC 000EB82C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 800EE8D0 000EB830 7C 08 03 A6 */ mtlr r0 /* 800EE8D4 000EB834 38 21 00 20 */ addi r1, r1, 0x20 -/* 800EE8D8 000EB838 4E 80 00 20 */ blr +/* 800EE8D8 000EB838 4E 80 00 20 */ blr .global UpdateMorphBallSound__10CMorphBallFf UpdateMorphBallSound__10CMorphBallFf: @@ -1664,7 +1664,7 @@ lbl_800EEBB0: /* 800EEBCC 000EBB2C 83 E1 00 8C */ lwz r31, 0x8c(r1) /* 800EEBD0 000EBB30 7C 08 03 A6 */ mtlr r0 /* 800EEBD4 000EBB34 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 800EEBD8 000EBB38 4E 80 00 20 */ blr +/* 800EEBD8 000EBB38 4E 80 00 20 */ blr .global SelectMorphBallSounds__10CMorphBallFRC13CMaterialList SelectMorphBallSounds__10CMorphBallFRC13CMaterialList: @@ -1736,7 +1736,7 @@ lbl_800EECA0: /* 800EECCC 000EBC2C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 800EECD0 000EBC30 7C 08 03 A6 */ mtlr r0 /* 800EECD4 000EBC34 38 21 00 20 */ addi r1, r1, 0x20 -/* 800EECD8 000EBC38 4E 80 00 20 */ blr +/* 800EECD8 000EBC38 4E 80 00 20 */ blr .global TakeDamage__10CMorphBallFf TakeDamage__10CMorphBallFf: @@ -1746,7 +1746,7 @@ TakeDamage__10CMorphBallFf: /* 800EECE8 000EBC48 40 82 00 10 */ bne lbl_800EECF8 /* 800EECEC 000EBC4C D0 03 1E 44 */ stfs f0, 0x1e44(r3) /* 800EECF0 000EBC50 D0 03 1E 48 */ stfs f0, 0x1e48(r3) -/* 800EECF4 000EBC54 4E 80 00 20 */ blr +/* 800EECF4 000EBC54 4E 80 00 20 */ blr lbl_800EECF8: /* 800EECF8 000EBC58 C0 02 91 8C */ lfs f0, lbl_805AAEAC@sda21(r2) /* 800EECFC 000EBC5C FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -1773,7 +1773,7 @@ lbl_800EED40: lbl_800EED48: /* 800EED48 000EBCA8 C0 02 91 5C */ lfs f0, lbl_805AAE7C@sda21(r2) /* 800EED4C 000EBCAC D0 03 1E 44 */ stfs f0, 0x1e44(r3) -/* 800EED50 000EBCB0 4E 80 00 20 */ blr +/* 800EED50 000EBCB0 4E 80 00 20 */ blr .global "LoadAnimationTokens__10CMorphBallFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" "LoadAnimationTokens__10CMorphBallFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>": @@ -1808,7 +1808,7 @@ lbl_800EED48: /* 800EEDC4 000EBD24 81 84 00 00 */ lwz r12, 0(r4) /* 800EEDC8 000EBD28 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800EEDCC 000EBD2C 7D 89 03 A6 */ mtctr r12 -/* 800EEDD0 000EBD30 4E 80 04 21 */ bctrl +/* 800EEDD0 000EBD30 4E 80 04 21 */ bctrl /* 800EEDD4 000EBD34 3B 81 00 60 */ addi r28, r1, 0x60 /* 800EEDD8 000EBD38 38 81 00 20 */ addi r4, r1, 0x20 /* 800EEDDC 000EBD3C 7F 83 E3 78 */ mr r3, r28 @@ -1872,7 +1872,7 @@ lbl_800EEE80: /* 800EEEB4 000EBE14 81 84 00 00 */ lwz r12, 0(r4) /* 800EEEB8 000EBE18 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800EEEBC 000EBE1C 7D 89 03 A6 */ mtctr r12 -/* 800EEEC0 000EBE20 4E 80 04 21 */ bctrl +/* 800EEEC0 000EBE20 4E 80 04 21 */ bctrl /* 800EEEC4 000EBE24 38 61 00 28 */ addi r3, r1, 0x28 /* 800EEEC8 000EBE28 38 81 00 18 */ addi r4, r1, 0x18 /* 800EEECC 000EBE2C 48 25 1F DD */ bl __ct__6CTokenFRC6CToken @@ -1928,33 +1928,33 @@ lbl_800EEF44: /* 800EEF80 000EBEE0 83 81 00 80 */ lwz r28, 0x80(r1) /* 800EEF84 000EBEE4 7C 08 03 A6 */ mtlr r0 /* 800EEF88 000EBEE8 38 21 00 90 */ addi r1, r1, 0x90 -/* 800EEF8C 000EBEEC 4E 80 00 20 */ blr +/* 800EEF8C 000EBEEC 4E 80 00 20 */ blr .global SetBombJumpState__10CMorphBallFQ210CMorphBall14EBombJumpState SetBombJumpState__10CMorphBallFQ210CMorphBall14EBombJumpState: /* 800EEF90 000EBEF0 90 83 1E 40 */ stw r4, 0x1e40(r3) -/* 800EEF94 000EBEF4 4E 80 00 20 */ blr +/* 800EEF94 000EBEF4 4E 80 00 20 */ blr .global GetBombJumpState__10CMorphBallCFv GetBombJumpState__10CMorphBallCFv: /* 800EEF98 000EBEF8 80 63 1E 40 */ lwz r3, 0x1e40(r3) -/* 800EEF9C 000EBEFC 4E 80 00 20 */ blr +/* 800EEF9C 000EBEFC 4E 80 00 20 */ blr .global SetBallBoostState__10CMorphBallFQ210CMorphBall15EBallBoostState SetBallBoostState__10CMorphBallFQ210CMorphBall15EBallBoostState: /* 800EEFA0 000EBF00 90 83 1E 3C */ stw r4, 0x1e3c(r3) -/* 800EEFA4 000EBF04 4E 80 00 20 */ blr +/* 800EEFA4 000EBF04 4E 80 00 20 */ blr .global GetBallBoostState__10CMorphBallCFv GetBallBoostState__10CMorphBallCFv: /* 800EEFA8 000EBF08 80 63 1E 3C */ lwz r3, 0x1e3c(r3) -/* 800EEFAC 000EBF0C 4E 80 00 20 */ blr +/* 800EEFAC 000EBF0C 4E 80 00 20 */ blr .global SetAsProjectile__10CMorphBallFv SetAsProjectile__10CMorphBallFv: /* 800EEFB0 000EBF10 38 00 00 01 */ li r0, 1 /* 800EEFB4 000EBF14 98 03 19 54 */ stb r0, 0x1954(r3) -/* 800EEFB8 000EBF18 4E 80 00 20 */ blr +/* 800EEFB8 000EBF18 4E 80 00 20 */ blr .global TouchModel__10CMorphBallCFRC13CStateManager TouchModel__10CMorphBallCFRC13CStateManager: @@ -1990,7 +1990,7 @@ lbl_800EF014: /* 800EF02C 000EBF8C 83 C1 00 08 */ lwz r30, 8(r1) /* 800EF030 000EBF90 7C 08 03 A6 */ mtlr r0 /* 800EF034 000EBF94 38 21 00 10 */ addi r1, r1, 0x10 -/* 800EF038 000EBF98 4E 80 00 20 */ blr +/* 800EF038 000EBF98 4E 80 00 20 */ blr .global RenderEnergyDrainEffects__10CMorphBallCFRC13CStateManager RenderEnergyDrainEffects__10CMorphBallCFRC13CStateManager: @@ -2035,7 +2035,7 @@ lbl_800EF0B8: /* 800EF0C4 000EC024 83 A1 00 24 */ lwz r29, 0x24(r1) /* 800EF0C8 000EC028 7C 08 03 A6 */ mtlr r0 /* 800EF0CC 000EC02C 38 21 00 30 */ addi r1, r1, 0x30 -/* 800EF0D0 000EC030 4E 80 00 20 */ blr +/* 800EF0D0 000EC030 4E 80 00 20 */ blr .global RenderSpiderBallElectricalEffects__10CMorphBallCFv RenderSpiderBallElectricalEffects__10CMorphBallCFv: @@ -2057,7 +2057,7 @@ lbl_800EF0FC: /* 800EF10C 000EC06C 81 83 00 00 */ lwz r12, 0(r3) /* 800EF110 000EC070 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800EF114 000EC074 7D 89 03 A6 */ mtctr r12 -/* 800EF118 000EC078 4E 80 04 21 */ bctrl +/* 800EF118 000EC078 4E 80 04 21 */ bctrl /* 800EF11C 000EC07C 83 FF 00 04 */ lwz r31, 4(r31) lbl_800EF120: /* 800EF120 000EC080 80 1D 1B 70 */ lwz r0, 0x1b70(r29) @@ -2069,7 +2069,7 @@ lbl_800EF120: /* 800EF138 000EC098 83 A1 00 14 */ lwz r29, 0x14(r1) /* 800EF13C 000EC09C 7C 08 03 A6 */ mtlr r0 /* 800EF140 000EC0A0 38 21 00 20 */ addi r1, r1, 0x20 -/* 800EF144 000EC0A4 4E 80 00 20 */ blr +/* 800EF144 000EC0A4 4E 80 00 20 */ blr .global UpdateSpiderBallElectricalEffects__10CMorphBallFv UpdateSpiderBallElectricalEffects__10CMorphBallFv: @@ -2145,7 +2145,7 @@ lbl_800EF1F8: /* 800EF254 000EC1B4 7F 83 E3 78 */ mr r3, r28 /* 800EF258 000EC1B8 81 8C 00 30 */ lwz r12, 0x30(r12) /* 800EF25C 000EC1BC 7D 89 03 A6 */ mtctr r12 -/* 800EF260 000EC1C0 4E 80 04 21 */ bctrl +/* 800EF260 000EC1C0 4E 80 04 21 */ bctrl /* 800EF264 000EC1C4 80 1F 00 08 */ lwz r0, 8(r31) /* 800EF268 000EC1C8 38 81 00 0C */ addi r4, r1, 0xc /* 800EF26C 000EC1CC 1C 60 00 0C */ mulli r3, r0, 0xc @@ -2154,7 +2154,7 @@ lbl_800EF1F8: /* 800EF278 000EC1D8 81 83 00 00 */ lwz r12, 0(r3) /* 800EF27C 000EC1DC 81 8C 00 20 */ lwz r12, 0x20(r12) /* 800EF280 000EC1E0 7D 89 03 A6 */ mtctr r12 -/* 800EF284 000EC1E4 4E 80 04 21 */ bctrl +/* 800EF284 000EC1E4 4E 80 04 21 */ bctrl /* 800EF288 000EC1E8 80 1F 00 08 */ lwz r0, 8(r31) /* 800EF28C 000EC1EC 38 81 00 48 */ addi r4, r1, 0x48 /* 800EF290 000EC1F0 1C 60 00 0C */ mulli r3, r0, 0xc @@ -2163,7 +2163,7 @@ lbl_800EF1F8: /* 800EF29C 000EC1FC 81 83 00 00 */ lwz r12, 0(r3) /* 800EF2A0 000EC200 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 800EF2A4 000EC204 7D 89 03 A6 */ mtctr r12 -/* 800EF2A8 000EC208 4E 80 04 21 */ bctrl +/* 800EF2A8 000EC208 4E 80 04 21 */ bctrl /* 800EF2AC 000EC20C 80 7F 00 10 */ lwz r3, 0x10(r31) /* 800EF2B0 000EC210 38 03 00 01 */ addi r0, r3, 1 /* 800EF2B4 000EC214 90 1F 00 10 */ stw r0, 0x10(r31) @@ -2179,7 +2179,7 @@ lbl_800EF2BC: /* 800EF2D8 000EC238 83 81 00 90 */ lwz r28, 0x90(r1) /* 800EF2DC 000EC23C 7C 08 03 A6 */ mtlr r0 /* 800EF2E0 000EC240 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 800EF2E4 000EC244 4E 80 00 20 */ blr +/* 800EF2E4 000EC244 4E 80 00 20 */ blr .global AddSpiderBallElectricalEffect__10CMorphBallFv AddSpiderBallElectricalEffect__10CMorphBallFv: @@ -2338,7 +2338,7 @@ lbl_800EF410: /* 800EF530 000EC490 81 9C 00 00 */ lwz r12, 0(r28) /* 800EF534 000EC494 81 8C 00 14 */ lwz r12, 0x14(r12) /* 800EF538 000EC498 7D 89 03 A6 */ mtctr r12 -/* 800EF53C 000EC49C 4E 80 04 21 */ bctrl +/* 800EF53C 000EC49C 4E 80 04 21 */ bctrl /* 800EF540 000EC4A0 3B 40 00 00 */ li r26, 0 lbl_800EF544: /* 800EF544 000EC4A4 7F 83 E3 78 */ mr r3, r28 @@ -2346,7 +2346,7 @@ lbl_800EF544: /* 800EF54C 000EC4AC 81 9C 00 00 */ lwz r12, 0(r28) /* 800EF550 000EC4B0 81 8C 00 18 */ lwz r12, 0x18(r12) /* 800EF554 000EC4B4 7D 89 03 A6 */ mtctr r12 -/* 800EF558 000EC4B8 4E 80 04 21 */ bctrl +/* 800EF558 000EC4B8 4E 80 04 21 */ bctrl /* 800EF55C 000EC4BC 88 1C 01 D0 */ lbz r0, 0x1d0(r28) /* 800EF560 000EC4C0 38 60 00 01 */ li r3, 1 /* 800EF564 000EC4C4 50 60 2E B4 */ rlwimi r0, r3, 5, 0x1a, 0x1a @@ -2356,7 +2356,7 @@ lbl_800EF544: /* 800EF574 000EC4D4 81 9C 00 00 */ lwz r12, 0(r28) /* 800EF578 000EC4D8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800EF57C 000EC4DC 7D 89 03 A6 */ mtctr r12 -/* 800EF580 000EC4E0 4E 80 04 21 */ bctrl +/* 800EF580 000EC4E0 4E 80 04 21 */ bctrl /* 800EF584 000EC4E4 C0 21 00 08 */ lfs f1, 8(r1) /* 800EF588 000EC4E8 3B 5A 00 01 */ addi r26, r26, 1 /* 800EF58C 000EC4EC C0 01 00 14 */ lfs f0, 0x14(r1) @@ -2394,7 +2394,7 @@ lbl_800EF5D0: /* 800EF604 000EC564 80 01 00 D4 */ lwz r0, 0xd4(r1) /* 800EF608 000EC568 7C 08 03 A6 */ mtlr r0 /* 800EF60C 000EC56C 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 800EF610 000EC570 4E 80 00 20 */ blr +/* 800EF610 000EC570 4E 80 00 20 */ blr .global "GetMorphBallModel__10CMorphBallFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>f" "GetMorphBallModel__10CMorphBallFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>f": @@ -2410,7 +2410,7 @@ lbl_800EF5D0: /* 800EF638 000EC598 81 83 00 00 */ lwz r12, 0(r3) /* 800EF63C 000EC59C 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 800EF640 000EC5A0 7D 89 03 A6 */ mtctr r12 -/* 800EF644 000EC5A4 4E 80 04 21 */ bctrl +/* 800EF644 000EC5A4 4E 80 04 21 */ bctrl /* 800EF648 000EC5A8 80 83 00 00 */ lwz r4, 0(r3) /* 800EF64C 000EC5AC 80 63 00 04 */ lwz r3, 4(r3) /* 800EF650 000EC5B0 3C 04 BC B3 */ addis r0, r4, 0xbcb3 @@ -2471,7 +2471,7 @@ lbl_800EF714: /* 800EF71C 000EC67C CB E1 00 40 */ lfd f31, 0x40(r1) /* 800EF720 000EC680 7C 08 03 A6 */ mtlr r0 /* 800EF724 000EC684 38 21 00 50 */ addi r1, r1, 0x50 -/* 800EF728 000EC688 4E 80 00 20 */ blr +/* 800EF728 000EC688 4E 80 00 20 */ blr .global LoadMorphBallModel__10CMorphBallFR13CStateManager LoadMorphBallModel__10CMorphBallFR13CStateManager: @@ -2639,7 +2639,7 @@ lbl_800EF98C: /* 800EF990 000EC8F0 80 01 00 74 */ lwz r0, 0x74(r1) /* 800EF994 000EC8F4 7C 08 03 A6 */ mtlr r0 /* 800EF998 000EC8F8 38 21 00 70 */ addi r1, r1, 0x70 -/* 800EF99C 000EC8FC 4E 80 00 20 */ blr +/* 800EF99C 000EC8FC 4E 80 00 20 */ blr .global FluidFXThink__10CMorphBallFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager FluidFXThink__10CMorphBallFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager: @@ -2770,7 +2770,7 @@ lbl_800EFB38: /* 800EFB7C 000ECADC 81 83 00 00 */ lwz r12, 0(r3) /* 800EFB80 000ECAE0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800EFB84 000ECAE4 7D 89 03 A6 */ mtctr r12 -/* 800EFB88 000ECAE8 4E 80 04 21 */ bctrl +/* 800EFB88 000ECAE8 4E 80 04 21 */ bctrl lbl_800EFB8C: /* 800EFB8C 000ECAEC E3 E1 00 88 */ psq_l f31, 136(r1), 0, qr0 /* 800EFB90 000ECAF0 CB E1 00 80 */ lfd f31, 0x80(r1) @@ -2783,7 +2783,7 @@ lbl_800EFB8C: /* 800EFBAC 000ECB0C 83 81 00 60 */ lwz r28, 0x60(r1) /* 800EFBB0 000ECB10 7C 08 03 A6 */ mtlr r0 /* 800EFBB4 000ECB14 38 21 00 90 */ addi r1, r1, 0x90 -/* 800EFBB8 000ECB18 4E 80 00 20 */ blr +/* 800EFBB8 000ECB18 4E 80 00 20 */ blr .global IsClimbable__10CMorphBallCFRC14CCollisionInfo IsClimbable__10CMorphBallCFRC14CCollisionInfo: @@ -2829,7 +2829,7 @@ lbl_800EFC40: /* 800EFC50 000ECBB0 83 C1 00 38 */ lwz r30, 0x38(r1) /* 800EFC54 000ECBB4 7C 08 03 A6 */ mtlr r0 /* 800EFC58 000ECBB8 38 21 00 50 */ addi r1, r1, 0x50 -/* 800EFC5C 000ECBBC 4E 80 00 20 */ blr +/* 800EFC5C 000ECBBC 4E 80 00 20 */ blr .global Touch__10CMorphBallFR6CActorR13CStateManager Touch__10CMorphBallFR6CActorR13CStateManager: @@ -2937,7 +2937,7 @@ lbl_800EFDE0: /* 800EFDEC 000ECD4C 83 A1 00 54 */ lwz r29, 0x54(r1) /* 800EFDF0 000ECD50 7C 08 03 A6 */ mtlr r0 /* 800EFDF4 000ECD54 38 21 00 60 */ addi r1, r1, 0x60 -/* 800EFDF8 000ECD58 4E 80 00 20 */ blr +/* 800EFDF8 000ECD58 4E 80 00 20 */ blr .global ComputeMaxSpeed__10CMorphBallCFv ComputeMaxSpeed__10CMorphBallCFv: @@ -2989,7 +2989,7 @@ lbl_800EFE90: /* 800EFE98 000ECDF8 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 800EFE9C 000ECDFC 7C 08 03 A6 */ mtlr r0 /* 800EFEA0 000ECE00 38 21 00 20 */ addi r1, r1, 0x20 -/* 800EFEA4 000ECE04 4E 80 00 20 */ blr +/* 800EFEA4 000ECE04 4E 80 00 20 */ blr .global SpinToSpeed__10CMorphBallFfRC9CVector3ff SpinToSpeed__10CMorphBallFfRC9CVector3ff: @@ -3040,7 +3040,7 @@ SpinToSpeed__10CMorphBallFfRC9CVector3ff: /* 800EFF58 000ECEB8 83 C1 00 28 */ lwz r30, 0x28(r1) /* 800EFF5C 000ECEBC 7C 08 03 A6 */ mtlr r0 /* 800EFF60 000ECEC0 38 21 00 50 */ addi r1, r1, 0x50 -/* 800EFF64 000ECEC4 4E 80 00 20 */ blr +/* 800EFF64 000ECEC4 4E 80 00 20 */ blr .global ApplyGravity__10CMorphBallFR13CStateManager ApplyGravity__10CMorphBallFR13CStateManager: @@ -3087,7 +3087,7 @@ lbl_800EFFF8: /* 800F0000 000ECF60 83 C1 00 08 */ lwz r30, 8(r1) /* 800F0004 000ECF64 7C 08 03 A6 */ mtlr r0 /* 800F0008 000ECF68 38 21 00 10 */ addi r1, r1, 0x10 -/* 800F000C 000ECF6C 4E 80 00 20 */ blr +/* 800F000C 000ECF6C 4E 80 00 20 */ blr .global CalculateSurfaceFriction__10CMorphBallCFv CalculateSurfaceFriction__10CMorphBallCFv: @@ -3127,7 +3127,7 @@ lbl_800F0058: /* 800F0088 000ECFE8 EC 21 00 32 */ fmuls f1, f1, f0 lbl_800F008C: /* 800F008C 000ECFEC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800F0090 000ECFF0 4E 80 00 20 */ blr +/* 800F0090 000ECFF0 4E 80 00 20 */ blr .global ComputeLiftForces__10CMorphBallFRC9CVector3fRC9CVector3fRC13CStateManager ComputeLiftForces__10CMorphBallFRC9CVector3fRC9CVector3fRC13CStateManager: @@ -3253,7 +3253,7 @@ lbl_800F01D8: /* 800F0258 000ED1B8 81 84 00 00 */ lwz r12, 0(r4) /* 800F025C 000ED1BC 81 8C 00 70 */ lwz r12, 0x70(r12) /* 800F0260 000ED1C0 7D 89 03 A6 */ mtctr r12 -/* 800F0264 000ED1C4 4E 80 04 21 */ bctrl +/* 800F0264 000ED1C4 4E 80 04 21 */ bctrl /* 800F0268 000ED1C8 38 61 01 88 */ addi r3, r1, 0x188 /* 800F026C 000ED1CC 38 81 01 58 */ addi r4, r1, 0x158 /* 800F0270 000ED1D0 48 22 29 05 */ bl __ct__12CTransform4fFRC12CTransform4f @@ -3261,14 +3261,14 @@ lbl_800F01D8: /* 800F0278 000ED1D8 81 83 00 00 */ lwz r12, 0(r3) /* 800F027C 000ED1DC 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 800F0280 000ED1E0 7D 89 03 A6 */ mtctr r12 -/* 800F0284 000ED1E4 4E 80 04 21 */ bctrl +/* 800F0284 000ED1E4 4E 80 04 21 */ bctrl /* 800F0288 000ED1E8 7C 64 1B 78 */ mr r4, r3 /* 800F028C 000ED1EC 38 61 00 B8 */ addi r3, r1, 0xb8 /* 800F0290 000ED1F0 81 84 00 00 */ lwz r12, 0(r4) /* 800F0294 000ED1F4 38 A1 01 88 */ addi r5, r1, 0x188 /* 800F0298 000ED1F8 81 8C 00 14 */ lwz r12, 0x14(r12) /* 800F029C 000ED1FC 7D 89 03 A6 */ mtctr r12 -/* 800F02A0 000ED200 4E 80 04 21 */ bctrl +/* 800F02A0 000ED200 4E 80 04 21 */ bctrl /* 800F02A4 000ED204 C0 21 00 C4 */ lfs f1, 0xc4(r1) /* 800F02A8 000ED208 38 61 00 E8 */ addi r3, r1, 0xe8 /* 800F02AC 000ED20C C0 E2 91 E4 */ lfs f7, lbl_805AAF04@sda21(r2) @@ -3449,7 +3449,7 @@ lbl_800F0540: /* 800F055C 000ED4BC 83 A1 01 C4 */ lwz r29, 0x1c4(r1) /* 800F0560 000ED4C0 7C 08 03 A6 */ mtlr r0 /* 800F0564 000ED4C4 38 21 01 F0 */ addi r1, r1, 0x1f0 -/* 800F0568 000ED4C8 4E 80 00 20 */ blr +/* 800F0568 000ED4C8 4E 80 00 20 */ blr .global "GetAverage__22TReservedAverageCFv" "GetAverage__22TReservedAverageCFv": @@ -3478,7 +3478,7 @@ lbl_800F05B8: /* 800F05BC 000ED51C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800F05C0 000ED520 7C 08 03 A6 */ mtlr r0 /* 800F05C4 000ED524 38 21 00 10 */ addi r1, r1, 0x10 -/* 800F05C8 000ED528 4E 80 00 20 */ blr +/* 800F05C8 000ED528 4E 80 00 20 */ blr .global "GetAverage__31TReservedAverage<9CVector3f,15>CFv" "GetAverage__31TReservedAverage<9CVector3f,15>CFv": @@ -3512,7 +3512,7 @@ lbl_800F062C: /* 800F0630 000ED590 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 800F0634 000ED594 7C 08 03 A6 */ mtlr r0 /* 800F0638 000ED598 38 21 00 20 */ addi r1, r1, 0x20 -/* 800F063C 000ED59C 4E 80 00 20 */ blr +/* 800F063C 000ED59C 4E 80 00 20 */ blr .global sub_800f0640 sub_800f0640: @@ -3608,7 +3608,7 @@ lbl_800F0780: /* 800F078C 000ED6EC D0 03 00 08 */ stfs f0, 8(r3) /* 800F0790 000ED6F0 C0 04 00 08 */ lfs f0, 8(r4) /* 800F0794 000ED6F4 D0 03 00 0C */ stfs f0, 0xc(r3) -/* 800F0798 000ED6F8 4E 80 00 20 */ blr +/* 800F0798 000ED6F8 4E 80 00 20 */ blr .global IsInFrustum__10CMorphBallCFRC14CFrustumPlanes IsInFrustum__10CMorphBallCFRC14CFrustumPlanes: @@ -3637,7 +3637,7 @@ lbl_800F07E0: /* 800F07F0 000ED750 81 84 00 00 */ lwz r12, 0(r4) /* 800F07F4 000ED754 81 8C 00 5C */ lwz r12, 0x5c(r12) /* 800F07F8 000ED758 7D 89 03 A6 */ mtctr r12 -/* 800F07FC 000ED75C 4E 80 04 21 */ bctrl +/* 800F07FC 000ED75C 4E 80 04 21 */ bctrl /* 800F0800 000ED760 88 01 00 20 */ lbz r0, 0x20(r1) /* 800F0804 000ED764 28 00 00 00 */ cmplwi r0, 0 /* 800F0808 000ED768 98 01 00 3C */ stb r0, 0x3c(r1) @@ -3678,7 +3678,7 @@ lbl_800F0888: /* 800F088C 000ED7EC 81 83 00 00 */ lwz r12, 0(r3) /* 800F0890 000ED7F0 81 8C 00 50 */ lwz r12, 0x50(r12) /* 800F0894 000ED7F4 7D 89 03 A6 */ mtctr r12 -/* 800F0898 000ED7F8 4E 80 04 21 */ bctrl +/* 800F0898 000ED7F8 4E 80 04 21 */ bctrl /* 800F089C 000ED7FC E0 43 A0 03 */ psq_l f2, 3(r3), 1, qr2 /* 800F08A0 000ED800 C0 02 92 34 */ lfs f0, lbl_805AAF54@sda21(r2) /* 800F08A4 000ED804 C0 22 91 50 */ lfs f1, lbl_805AAE70@sda21(r2) @@ -3709,7 +3709,7 @@ lbl_800F08F0: /* 800F08FC 000ED85C 83 A1 00 74 */ lwz r29, 0x74(r1) /* 800F0900 000ED860 7C 08 03 A6 */ mtlr r0 /* 800F0904 000ED864 38 21 00 80 */ addi r1, r1, 0x80 -/* 800F0908 000ED868 4E 80 00 20 */ blr +/* 800F0908 000ED868 4E 80 00 20 */ blr .global CollidedWith__10CMorphBallFRC9TUniqueIdRC18CCollisionInfoListR13CStateManager CollidedWith__10CMorphBallFRC9TUniqueIdRC18CCollisionInfoListR13CStateManager: @@ -3818,13 +3818,13 @@ lbl_800F0A88: /* 800F0A90 000ED9F0 81 83 00 00 */ lwz r12, 0(r3) /* 800F0A94 000ED9F4 81 8C 00 18 */ lwz r12, 0x18(r12) /* 800F0A98 000ED9F8 7D 89 03 A6 */ mtctr r12 -/* 800F0A9C 000ED9FC 4E 80 04 21 */ bctrl +/* 800F0A9C 000ED9FC 4E 80 04 21 */ bctrl /* 800F0AA0 000EDA00 80 7D 19 CC */ lwz r3, 0x19cc(r29) /* 800F0AA4 000EDA04 38 80 00 01 */ li r4, 1 /* 800F0AA8 000EDA08 81 83 00 00 */ lwz r12, 0(r3) /* 800F0AAC 000EDA0C 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 800F0AB0 000EDA10 7D 89 03 A6 */ mtctr r12 -/* 800F0AB4 000EDA14 4E 80 04 21 */ bctrl +/* 800F0AB4 000EDA14 4E 80 04 21 */ bctrl /* 800F0AB8 000EDA18 38 00 00 07 */ li r0, 7 /* 800F0ABC 000EDA1C 90 1D 1E 38 */ stw r0, 0x1e38(r29) lbl_800F0AC0: @@ -3943,7 +3943,7 @@ lbl_800F0C38: /* 800F0C5C 000EDBBC 81 83 00 00 */ lwz r12, 0(r3) /* 800F0C60 000EDBC0 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 800F0C64 000EDBC4 7D 89 03 A6 */ mtctr r12 -/* 800F0C68 000EDBC8 4E 80 04 21 */ bctrl +/* 800F0C68 000EDBC8 4E 80 04 21 */ bctrl lbl_800F0C6C: /* 800F0C6C 000EDBCC 92 9D 1C 0C */ stw r20, 0x1c0c(r29) lbl_800F0C70: @@ -3955,7 +3955,7 @@ lbl_800F0C70: /* 800F0C84 000EDBE4 81 83 00 00 */ lwz r12, 0(r3) /* 800F0C88 000EDBE8 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 800F0C8C 000EDBEC 7D 89 03 A6 */ mtctr r12 -/* 800F0C90 000EDBF0 4E 80 04 21 */ bctrl +/* 800F0C90 000EDBF0 4E 80 04 21 */ bctrl /* 800F0C94 000EDBF4 80 1D 1C 0C */ lwz r0, 0x1c0c(r29) /* 800F0C98 000EDBF8 7F 04 C3 78 */ mr r4, r24 /* 800F0C9C 000EDBFC 54 03 18 38 */ slwi r3, r0, 3 @@ -3964,7 +3964,7 @@ lbl_800F0C70: /* 800F0CA8 000EDC08 81 83 00 00 */ lwz r12, 0(r3) /* 800F0CAC 000EDC0C 81 8C 00 18 */ lwz r12, 0x18(r12) /* 800F0CB0 000EDC10 7D 89 03 A6 */ mtctr r12 -/* 800F0CB4 000EDC14 4E 80 04 21 */ bctrl +/* 800F0CB4 000EDC14 4E 80 04 21 */ bctrl lbl_800F0CB8: /* 800F0CB8 000EDC18 3B 18 00 60 */ addi r24, r24, 0x60 lbl_800F0CBC: @@ -4022,7 +4022,7 @@ lbl_800F0D60: /* 800F0D84 000EDCE4 81 83 00 00 */ lwz r12, 0(r3) /* 800F0D88 000EDCE8 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 800F0D8C 000EDCEC 7D 89 03 A6 */ mtctr r12 -/* 800F0D90 000EDCF0 4E 80 04 21 */ bctrl +/* 800F0D90 000EDCF0 4E 80 04 21 */ bctrl lbl_800F0D94: /* 800F0D94 000EDCF4 88 1D 19 54 */ lbz r0, 0x1954(r29) /* 800F0D98 000EDCF8 28 00 00 00 */ cmplwi r0, 0 @@ -4404,7 +4404,7 @@ lbl_800F12DC: /* 800F1318 000EE278 80 01 01 34 */ lwz r0, 0x134(r1) /* 800F131C 000EE27C 7C 08 03 A6 */ mtlr r0 /* 800F1320 000EE280 38 21 01 30 */ addi r1, r1, 0x130 -/* 800F1324 000EE284 4E 80 00 20 */ blr +/* 800F1324 000EE284 4E 80 00 20 */ blr .global __as__18CCollisionInfoListFRC18CCollisionInfoList __as__18CCollisionInfoListFRC18CCollisionInfoList: @@ -4419,7 +4419,7 @@ __as__18CCollisionInfoListFRC18CCollisionInfoList: /* 800F1348 000EE2A8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800F134C 000EE2AC 7C 08 03 A6 */ mtlr r0 /* 800F1350 000EE2B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800F1354 000EE2B4 4E 80 00 20 */ blr +/* 800F1354 000EE2B4 4E 80 00 20 */ blr .global sub_800f1358 sub_800f1358: @@ -4475,7 +4475,7 @@ lbl_800F13FC: /* 800F1404 000EE364 83 C1 00 08 */ lwz r30, 8(r1) /* 800F1408 000EE368 7C 08 03 A6 */ mtlr r0 /* 800F140C 000EE36C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800F1410 000EE370 4E 80 00 20 */ blr +/* 800F1410 000EE370 4E 80 00 20 */ blr .global sub_800f1414 sub_800f1414: @@ -4505,7 +4505,7 @@ lbl_800F1450: /* 800F1468 000EE3C8 83 A1 00 14 */ lwz r29, 0x14(r1) /* 800F146C 000EE3CC 7C 08 03 A6 */ mtlr r0 /* 800F1470 000EE3D0 38 21 00 20 */ addi r1, r1, 0x20 -/* 800F1474 000EE3D4 4E 80 00 20 */ blr +/* 800F1474 000EE3D4 4E 80 00 20 */ blr .global sub_800f1478 sub_800f1478: @@ -4519,7 +4519,7 @@ lbl_800F1490: /* 800F1490 000EE3F0 80 01 00 14 */ lwz r0, 0x14(r1) /* 800F1494 000EE3F4 7C 08 03 A6 */ mtlr r0 /* 800F1498 000EE3F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800F149C 000EE3FC 4E 80 00 20 */ blr +/* 800F149C 000EE3FC 4E 80 00 20 */ blr .global __ct__14CCollisionInfoFRC14CCollisionInfo __ct__14CCollisionInfoFRC14CCollisionInfo: @@ -4571,7 +4571,7 @@ __ct__14CCollisionInfoFRC14CCollisionInfo: /* 800F1554 000EE4B4 D0 03 00 58 */ stfs f0, 0x58(r3) /* 800F1558 000EE4B8 C0 04 00 5C */ lfs f0, 0x5c(r4) /* 800F155C 000EE4BC D0 03 00 5C */ stfs f0, 0x5c(r3) -/* 800F1560 000EE4C0 4E 80 00 20 */ blr +/* 800F1560 000EE4C0 4E 80 00 20 */ blr .global BallCloseToCollision__10CMorphBallCFRC13CStateManagerfRC15CMaterialFilter BallCloseToCollision__10CMorphBallCFRC13CStateManagerfRC15CMaterialFilter: @@ -4709,12 +4709,12 @@ lbl_800F1724: /* 800F1758 000EE6B8 81 99 00 00 */ lwz r12, 0(r25) /* 800F175C 000EE6BC 81 8C 00 70 */ lwz r12, 0x70(r12) /* 800F1760 000EE6C0 7D 89 03 A6 */ mtctr r12 -/* 800F1764 000EE6C4 4E 80 04 21 */ bctrl +/* 800F1764 000EE6C4 4E 80 04 21 */ bctrl /* 800F1768 000EE6C8 7F 23 CB 78 */ mr r3, r25 /* 800F176C 000EE6CC 81 99 00 00 */ lwz r12, 0(r25) /* 800F1770 000EE6D0 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 800F1774 000EE6D4 7D 89 03 A6 */ mtctr r12 -/* 800F1778 000EE6D8 4E 80 04 21 */ bctrl +/* 800F1778 000EE6D8 4E 80 04 21 */ bctrl /* 800F177C 000EE6DC 3C 80 80 5A */ lis r4, lbl_8059FD18@ha /* 800F1780 000EE6E0 90 61 00 88 */ stw r3, 0x88(r1) /* 800F1784 000EE6E4 38 04 FD 18 */ addi r0, r4, lbl_8059FD18@l @@ -4819,7 +4819,7 @@ lbl_800F18C0: /* 800F18E4 000EE844 80 01 09 64 */ lwz r0, 0x964(r1) /* 800F18E8 000EE848 7C 08 03 A6 */ mtlr r0 /* 800F18EC 000EE84C 38 21 09 60 */ addi r1, r1, 0x960 -/* 800F18F0 000EE850 4E 80 00 20 */ blr +/* 800F18F0 000EE850 4E 80 00 20 */ blr .global DisableHalfPipeStatus__10CMorphBallFv DisableHalfPipeStatus__10CMorphBallFv: @@ -4859,46 +4859,46 @@ DisableHalfPipeStatus__10CMorphBallFv: /* 800F1978 000EE8D8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800F197C 000EE8DC 7C 08 03 A6 */ mtlr r0 /* 800F1980 000EE8E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800F1984 000EE8E4 4E 80 00 20 */ blr +/* 800F1984 000EE8E4 4E 80 00 20 */ blr .global SetTouchedHalfPipeRecently__10CMorphBallFb SetTouchedHalfPipeRecently__10CMorphBallFb: /* 800F1988 000EE8E8 88 03 1D F8 */ lbz r0, 0x1df8(r3) /* 800F198C 000EE8EC 50 80 2E B4 */ rlwimi r0, r4, 5, 0x1a, 0x1a /* 800F1990 000EE8F0 98 03 1D F8 */ stb r0, 0x1df8(r3) -/* 800F1994 000EE8F4 4E 80 00 20 */ blr +/* 800F1994 000EE8F4 4E 80 00 20 */ blr .global GetTouchedHalfPipeRecently__10CMorphBallCFv GetTouchedHalfPipeRecently__10CMorphBallCFv: /* 800F1998 000EE8F8 88 03 1D F8 */ lbz r0, 0x1df8(r3) /* 800F199C 000EE8FC 54 03 DF FE */ rlwinm r3, r0, 0x1b, 0x1f, 0x1f -/* 800F19A0 000EE900 4E 80 00 20 */ blr +/* 800F19A0 000EE900 4E 80 00 20 */ blr .global SetIsInHalfPipeModeInAir__10CMorphBallFb SetIsInHalfPipeModeInAir__10CMorphBallFb: /* 800F19A4 000EE904 88 03 1D F8 */ lbz r0, 0x1df8(r3) /* 800F19A8 000EE908 50 80 36 72 */ rlwimi r0, r4, 6, 0x19, 0x19 /* 800F19AC 000EE90C 98 03 1D F8 */ stb r0, 0x1df8(r3) -/* 800F19B0 000EE910 4E 80 00 20 */ blr +/* 800F19B0 000EE910 4E 80 00 20 */ blr .global GetIsInHalfPipeModeInAir__10CMorphBallCFv GetIsInHalfPipeModeInAir__10CMorphBallCFv: /* 800F19B4 000EE914 88 03 1D F8 */ lbz r0, 0x1df8(r3) /* 800F19B8 000EE918 54 03 D7 FE */ rlwinm r3, r0, 0x1a, 0x1f, 0x1f -/* 800F19BC 000EE91C 4E 80 00 20 */ blr +/* 800F19BC 000EE91C 4E 80 00 20 */ blr .global SetIsInHalfPipeMode__10CMorphBallFb SetIsInHalfPipeMode__10CMorphBallFb: /* 800F19C0 000EE920 88 03 1D F8 */ lbz r0, 0x1df8(r3) /* 800F19C4 000EE924 50 80 3E 30 */ rlwimi r0, r4, 7, 0x18, 0x18 /* 800F19C8 000EE928 98 03 1D F8 */ stb r0, 0x1df8(r3) -/* 800F19CC 000EE92C 4E 80 00 20 */ blr +/* 800F19CC 000EE92C 4E 80 00 20 */ blr .global GetIsInHalfPipeMode__10CMorphBallCFv GetIsInHalfPipeMode__10CMorphBallCFv: /* 800F19D0 000EE930 88 03 1D F8 */ lbz r0, 0x1df8(r3) /* 800F19D4 000EE934 54 03 CF FE */ rlwinm r3, r0, 0x19, 0x1f, 0x1f -/* 800F19D8 000EE938 4E 80 00 20 */ blr +/* 800F19D8 000EE938 4E 80 00 20 */ blr .global UpdateHalfPipeStatus__10CMorphBallFR13CStateManagerf UpdateHalfPipeStatus__10CMorphBallFR13CStateManagerf: @@ -5019,7 +5019,7 @@ lbl_800F1B70: /* 800F1B7C 000EEADC 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 800F1B80 000EEAE0 7C 08 03 A6 */ mtlr r0 /* 800F1B84 000EEAE4 38 21 00 30 */ addi r1, r1, 0x30 -/* 800F1B88 000EEAE8 4E 80 00 20 */ blr +/* 800F1B88 000EEAE8 4E 80 00 20 */ blr .global RenderDamageEffects__10CMorphBallCFRC13CStateManagerRC12CTransform4f RenderDamageEffects__10CMorphBallCFRC13CStateManagerRC12CTransform4f: @@ -5135,7 +5135,7 @@ lbl_800F1C54: /* 800F1D3C 000EEC9C 83 A1 00 C4 */ lwz r29, 0xc4(r1) /* 800F1D40 000EECA0 7C 08 03 A6 */ mtlr r0 /* 800F1D44 000EECA4 38 21 01 30 */ addi r1, r1, 0x130 -/* 800F1D48 000EECA8 4E 80 00 20 */ blr +/* 800F1D48 000EECA8 4E 80 00 20 */ blr .global RenderIceBreakEffect__10CMorphBallCFRC13CStateManager RenderIceBreakEffect__10CMorphBallCFRC13CStateManager: @@ -5148,12 +5148,12 @@ RenderIceBreakEffect__10CMorphBallCFRC13CStateManager: /* 800F1D64 000EECC4 81 83 00 00 */ lwz r12, 0(r3) /* 800F1D68 000EECC8 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800F1D6C 000EECCC 7D 89 03 A6 */ mtctr r12 -/* 800F1D70 000EECD0 4E 80 04 21 */ bctrl +/* 800F1D70 000EECD0 4E 80 04 21 */ bctrl lbl_800F1D74: /* 800F1D74 000EECD4 80 01 00 14 */ lwz r0, 0x14(r1) /* 800F1D78 000EECD8 7C 08 03 A6 */ mtlr r0 /* 800F1D7C 000EECDC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800F1D80 000EECE0 4E 80 00 20 */ blr +/* 800F1D80 000EECE0 4E 80 00 20 */ blr .global UpdateIceBreakEffect__10CMorphBallFf UpdateIceBreakEffect__10CMorphBallFf: @@ -5204,7 +5204,7 @@ lbl_800F1E20: /* 800F1E30 000EED90 38 80 00 01 */ li r4, 1 /* 800F1E34 000EED94 81 8C 00 08 */ lwz r12, 8(r12) /* 800F1E38 000EED98 7D 89 03 A6 */ mtctr r12 -/* 800F1E3C 000EED9C 4E 80 04 21 */ bctrl +/* 800F1E3C 000EED9C 4E 80 04 21 */ bctrl lbl_800F1E40: /* 800F1E40 000EEDA0 7F A0 07 75 */ extsb. r0, r29 /* 800F1E44 000EEDA4 93 DF 19 E0 */ stw r30, 0x19e0(r31) @@ -5223,7 +5223,7 @@ lbl_800F1E58: /* 800F1E74 000EEDD4 81 9E 00 00 */ lwz r12, 0(r30) /* 800F1E78 000EEDD8 81 8C 00 14 */ lwz r12, 0x14(r12) /* 800F1E7C 000EEDDC 7D 89 03 A6 */ mtctr r12 -/* 800F1E80 000EEDE0 4E 80 04 21 */ bctrl +/* 800F1E80 000EEDE0 4E 80 04 21 */ bctrl lbl_800F1E84: /* 800F1E84 000EEDE4 80 7F 19 E0 */ lwz r3, 0x19e0(r31) /* 800F1E88 000EEDE8 28 03 00 00 */ cmplwi r3, 0 @@ -5231,7 +5231,7 @@ lbl_800F1E84: /* 800F1E90 000EEDF0 81 83 00 00 */ lwz r12, 0(r3) /* 800F1E94 000EEDF4 81 8C 00 58 */ lwz r12, 0x58(r12) /* 800F1E98 000EEDF8 7D 89 03 A6 */ mtctr r12 -/* 800F1E9C 000EEDFC 4E 80 04 21 */ bctrl +/* 800F1E9C 000EEDFC 4E 80 04 21 */ bctrl /* 800F1EA0 000EEE00 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800F1EA4 000EEE04 41 82 00 38 */ beq lbl_800F1EDC /* 800F1EA8 000EEE08 80 7F 19 E0 */ lwz r3, 0x19e0(r31) @@ -5241,7 +5241,7 @@ lbl_800F1E84: /* 800F1EB8 000EEE18 38 80 00 01 */ li r4, 1 /* 800F1EBC 000EEE1C 81 8C 00 08 */ lwz r12, 8(r12) /* 800F1EC0 000EEE20 7D 89 03 A6 */ mtctr r12 -/* 800F1EC4 000EEE24 4E 80 04 21 */ bctrl +/* 800F1EC4 000EEE24 4E 80 04 21 */ bctrl lbl_800F1EC8: /* 800F1EC8 000EEE28 38 00 00 00 */ li r0, 0 /* 800F1ECC 000EEE2C 38 7F 19 B0 */ addi r3, r31, 0x19b0 @@ -5263,13 +5263,13 @@ lbl_800F1EDC: /* 800F1F08 000EEE68 81 83 00 00 */ lwz r12, 0(r3) /* 800F1F0C 000EEE6C 81 8C 00 20 */ lwz r12, 0x20(r12) /* 800F1F10 000EEE70 7D 89 03 A6 */ mtctr r12 -/* 800F1F14 000EEE74 4E 80 04 21 */ bctrl +/* 800F1F14 000EEE74 4E 80 04 21 */ bctrl /* 800F1F18 000EEE78 80 7F 19 E0 */ lwz r3, 0x19e0(r31) /* 800F1F1C 000EEE7C FC 20 F8 90 */ fmr f1, f31 /* 800F1F20 000EEE80 81 83 00 00 */ lwz r12, 0(r3) /* 800F1F24 000EEE84 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800F1F28 000EEE88 7D 89 03 A6 */ mtctr r12 -/* 800F1F2C 000EEE8C 4E 80 04 21 */ bctrl +/* 800F1F2C 000EEE8C 4E 80 04 21 */ bctrl lbl_800F1F30: /* 800F1F30 000EEE90 E3 E1 00 98 */ psq_l f31, 152(r1), 0, qr0 /* 800F1F34 000EEE94 80 01 00 A4 */ lwz r0, 0xa4(r1) @@ -5279,7 +5279,7 @@ lbl_800F1F30: /* 800F1F44 000EEEA4 83 A1 00 84 */ lwz r29, 0x84(r1) /* 800F1F48 000EEEA8 7C 08 03 A6 */ mtlr r0 /* 800F1F4C 000EEEAC 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 800F1F50 000EEEB0 4E 80 00 20 */ blr +/* 800F1F50 000EEEB0 4E 80 00 20 */ blr .global Stop__10CMorphBallFv Stop__10CMorphBallFv: @@ -5297,7 +5297,7 @@ Stop__10CMorphBallFv: /* 800F1F80 000EEEE0 38 80 00 01 */ li r4, 1 /* 800F1F84 000EEEE4 81 8C 00 08 */ lwz r12, 8(r12) /* 800F1F88 000EEEE8 7D 89 03 A6 */ mtctr r12 -/* 800F1F8C 000EEEEC 4E 80 04 21 */ bctrl +/* 800F1F8C 000EEEEC 4E 80 04 21 */ bctrl lbl_800F1F90: /* 800F1F90 000EEEF0 38 00 00 00 */ li r0, 0 /* 800F1F94 000EEEF4 90 1F 19 E0 */ stw r0, 0x19e0(r31) @@ -5305,7 +5305,7 @@ lbl_800F1F90: /* 800F1F9C 000EEEFC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800F1FA0 000EEF00 7C 08 03 A6 */ mtlr r0 /* 800F1FA4 000EEF04 38 21 00 10 */ addi r1, r1, 0x10 -/* 800F1FA8 000EEF08 4E 80 00 20 */ blr +/* 800F1FA8 000EEF08 4E 80 00 20 */ blr .global IsMorphBallTransitionFlashValid__10CMorphBallCFv IsMorphBallTransitionFlashValid__10CMorphBallCFv: @@ -5313,7 +5313,7 @@ IsMorphBallTransitionFlashValid__10CMorphBallCFv: /* 800F1FB0 000EEF10 7C 03 00 D0 */ neg r0, r3 /* 800F1FB4 000EEF14 7C 00 1B 78 */ or r0, r0, r3 /* 800F1FB8 000EEF18 54 03 0F FE */ srwi r3, r0, 0x1f -/* 800F1FBC 000EEF1C 4E 80 00 20 */ blr +/* 800F1FBC 000EEF1C 4E 80 00 20 */ blr .global RenderMorphBallTransitionFlash__10CMorphBallCFRC13CStateManager RenderMorphBallTransitionFlash__10CMorphBallCFRC13CStateManager: @@ -5342,18 +5342,18 @@ RenderMorphBallTransitionFlash__10CMorphBallCFRC13CStateManager: /* 800F2018 000EEF78 81 83 00 00 */ lwz r12, 0(r3) /* 800F201C 000EEF7C 81 8C 00 30 */ lwz r12, 0x30(r12) /* 800F2020 000EEF80 7D 89 03 A6 */ mtctr r12 -/* 800F2024 000EEF84 4E 80 04 21 */ bctrl +/* 800F2024 000EEF84 4E 80 04 21 */ bctrl /* 800F2028 000EEF88 80 7F 19 DC */ lwz r3, 0x19dc(r31) /* 800F202C 000EEF8C 81 83 00 00 */ lwz r12, 0(r3) /* 800F2030 000EEF90 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800F2034 000EEF94 7D 89 03 A6 */ mtctr r12 -/* 800F2038 000EEF98 4E 80 04 21 */ bctrl +/* 800F2038 000EEF98 4E 80 04 21 */ bctrl lbl_800F203C: /* 800F203C 000EEF9C 80 01 00 24 */ lwz r0, 0x24(r1) /* 800F2040 000EEFA0 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 800F2044 000EEFA4 7C 08 03 A6 */ mtlr r0 /* 800F2048 000EEFA8 38 21 00 20 */ addi r1, r1, 0x20 -/* 800F204C 000EEFAC 4E 80 00 20 */ blr +/* 800F204C 000EEFAC 4E 80 00 20 */ blr .global UpdateMorphBallTransitionFlash__10CMorphBallFf UpdateMorphBallTransitionFlash__10CMorphBallFf: @@ -5404,7 +5404,7 @@ lbl_800F20EC: /* 800F20FC 000EF05C 38 80 00 01 */ li r4, 1 /* 800F2100 000EF060 81 8C 00 08 */ lwz r12, 8(r12) /* 800F2104 000EF064 7D 89 03 A6 */ mtctr r12 -/* 800F2108 000EF068 4E 80 04 21 */ bctrl +/* 800F2108 000EF068 4E 80 04 21 */ bctrl lbl_800F210C: /* 800F210C 000EF06C 7F A0 07 75 */ extsb. r0, r29 /* 800F2110 000EF070 93 DF 19 DC */ stw r30, 0x19dc(r31) @@ -5423,7 +5423,7 @@ lbl_800F2124: /* 800F2140 000EF0A0 81 9E 00 00 */ lwz r12, 0(r30) /* 800F2144 000EF0A4 81 8C 00 14 */ lwz r12, 0x14(r12) /* 800F2148 000EF0A8 7D 89 03 A6 */ mtctr r12 -/* 800F214C 000EF0AC 4E 80 04 21 */ bctrl +/* 800F214C 000EF0AC 4E 80 04 21 */ bctrl lbl_800F2150: /* 800F2150 000EF0B0 80 7F 19 DC */ lwz r3, 0x19dc(r31) /* 800F2154 000EF0B4 28 03 00 00 */ cmplwi r3, 0 @@ -5431,7 +5431,7 @@ lbl_800F2150: /* 800F215C 000EF0BC 81 83 00 00 */ lwz r12, 0(r3) /* 800F2160 000EF0C0 81 8C 00 58 */ lwz r12, 0x58(r12) /* 800F2164 000EF0C4 7D 89 03 A6 */ mtctr r12 -/* 800F2168 000EF0C8 4E 80 04 21 */ bctrl +/* 800F2168 000EF0C8 4E 80 04 21 */ bctrl /* 800F216C 000EF0CC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800F2170 000EF0D0 41 82 00 38 */ beq lbl_800F21A8 /* 800F2174 000EF0D4 80 7F 19 DC */ lwz r3, 0x19dc(r31) @@ -5441,7 +5441,7 @@ lbl_800F2150: /* 800F2184 000EF0E4 38 80 00 01 */ li r4, 1 /* 800F2188 000EF0E8 81 8C 00 08 */ lwz r12, 8(r12) /* 800F218C 000EF0EC 7D 89 03 A6 */ mtctr r12 -/* 800F2190 000EF0F0 4E 80 04 21 */ bctrl +/* 800F2190 000EF0F0 4E 80 04 21 */ bctrl lbl_800F2194: /* 800F2194 000EF0F4 38 00 00 00 */ li r0, 0 /* 800F2198 000EF0F8 38 7F 19 A8 */ addi r3, r31, 0x19a8 @@ -5463,13 +5463,13 @@ lbl_800F21A8: /* 800F21D4 000EF134 81 83 00 00 */ lwz r12, 0(r3) /* 800F21D8 000EF138 81 8C 00 20 */ lwz r12, 0x20(r12) /* 800F21DC 000EF13C 7D 89 03 A6 */ mtctr r12 -/* 800F21E0 000EF140 4E 80 04 21 */ bctrl +/* 800F21E0 000EF140 4E 80 04 21 */ bctrl /* 800F21E4 000EF144 80 7F 19 DC */ lwz r3, 0x19dc(r31) /* 800F21E8 000EF148 FC 20 F8 90 */ fmr f1, f31 /* 800F21EC 000EF14C 81 83 00 00 */ lwz r12, 0(r3) /* 800F21F0 000EF150 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800F21F4 000EF154 7D 89 03 A6 */ mtctr r12 -/* 800F21F8 000EF158 4E 80 04 21 */ bctrl +/* 800F21F8 000EF158 4E 80 04 21 */ bctrl lbl_800F21FC: /* 800F21FC 000EF15C E3 E1 00 98 */ psq_l f31, 152(r1), 0, qr0 /* 800F2200 000EF160 80 01 00 A4 */ lwz r0, 0xa4(r1) @@ -5479,7 +5479,7 @@ lbl_800F21FC: /* 800F2210 000EF170 83 A1 00 84 */ lwz r29, 0x84(r1) /* 800F2214 000EF174 7C 08 03 A6 */ mtlr r0 /* 800F2218 000EF178 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 800F221C 000EF17C 4E 80 00 20 */ blr +/* 800F221C 000EF17C 4E 80 00 20 */ blr .global ResetMorphBallTransitionFlash__10CMorphBallFv ResetMorphBallTransitionFlash__10CMorphBallFv: @@ -5497,7 +5497,7 @@ ResetMorphBallTransitionFlash__10CMorphBallFv: /* 800F224C 000EF1AC 38 80 00 01 */ li r4, 1 /* 800F2250 000EF1B0 81 8C 00 08 */ lwz r12, 8(r12) /* 800F2254 000EF1B4 7D 89 03 A6 */ mtctr r12 -/* 800F2258 000EF1B8 4E 80 04 21 */ bctrl +/* 800F2258 000EF1B8 4E 80 04 21 */ bctrl lbl_800F225C: /* 800F225C 000EF1BC 38 00 00 00 */ li r0, 0 /* 800F2260 000EF1C0 90 1F 19 DC */ stw r0, 0x19dc(r31) @@ -5505,7 +5505,7 @@ lbl_800F225C: /* 800F2268 000EF1C8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800F226C 000EF1CC 7C 08 03 A6 */ mtlr r0 /* 800F2270 000EF1D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800F2274 000EF1D4 4E 80 00 20 */ blr +/* 800F2274 000EF1D4 4E 80 00 20 */ blr .global Render__10CMorphBallCFRC13CStateManagerPC12CActorLights_0 Render__10CMorphBallCFRC13CStateManagerPC12CActorLights_0: @@ -5922,45 +5922,45 @@ lbl_800F2880: /* 800F28A4 000EF804 81 83 00 00 */ lwz r12, 0(r3) /* 800F28A8 000EF808 81 8C 00 30 */ lwz r12, 0x30(r12) /* 800F28AC 000EF80C 7D 89 03 A6 */ mtctr r12 -/* 800F28B0 000EF810 4E 80 04 21 */ bctrl +/* 800F28B0 000EF810 4E 80 04 21 */ bctrl /* 800F28B4 000EF814 80 7D 19 B8 */ lwz r3, 0x19b8(r29) /* 800F28B8 000EF818 81 83 00 00 */ lwz r12, 0(r3) /* 800F28BC 000EF81C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800F28C0 000EF820 7D 89 03 A6 */ mtctr r12 -/* 800F28C4 000EF824 4E 80 04 21 */ bctrl +/* 800F28C4 000EF824 4E 80 04 21 */ bctrl /* 800F28C8 000EF828 80 7D 19 BC */ lwz r3, 0x19bc(r29) /* 800F28CC 000EF82C 38 81 00 40 */ addi r4, r1, 0x40 /* 800F28D0 000EF830 81 83 00 00 */ lwz r12, 0(r3) /* 800F28D4 000EF834 81 8C 00 30 */ lwz r12, 0x30(r12) /* 800F28D8 000EF838 7D 89 03 A6 */ mtctr r12 -/* 800F28DC 000EF83C 4E 80 04 21 */ bctrl +/* 800F28DC 000EF83C 4E 80 04 21 */ bctrl /* 800F28E0 000EF840 80 7D 19 BC */ lwz r3, 0x19bc(r29) /* 800F28E4 000EF844 81 83 00 00 */ lwz r12, 0(r3) /* 800F28E8 000EF848 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800F28EC 000EF84C 7D 89 03 A6 */ mtctr r12 -/* 800F28F0 000EF850 4E 80 04 21 */ bctrl +/* 800F28F0 000EF850 4E 80 04 21 */ bctrl /* 800F28F4 000EF854 80 7D 19 C0 */ lwz r3, 0x19c0(r29) /* 800F28F8 000EF858 38 81 00 40 */ addi r4, r1, 0x40 /* 800F28FC 000EF85C 81 83 00 00 */ lwz r12, 0(r3) /* 800F2900 000EF860 81 8C 00 30 */ lwz r12, 0x30(r12) /* 800F2904 000EF864 7D 89 03 A6 */ mtctr r12 -/* 800F2908 000EF868 4E 80 04 21 */ bctrl +/* 800F2908 000EF868 4E 80 04 21 */ bctrl /* 800F290C 000EF86C 80 7D 19 C0 */ lwz r3, 0x19c0(r29) /* 800F2910 000EF870 81 83 00 00 */ lwz r12, 0(r3) /* 800F2914 000EF874 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800F2918 000EF878 7D 89 03 A6 */ mtctr r12 -/* 800F291C 000EF87C 4E 80 04 21 */ bctrl +/* 800F291C 000EF87C 4E 80 04 21 */ bctrl /* 800F2920 000EF880 80 7D 19 C4 */ lwz r3, 0x19c4(r29) /* 800F2924 000EF884 38 81 00 40 */ addi r4, r1, 0x40 /* 800F2928 000EF888 81 83 00 00 */ lwz r12, 0(r3) /* 800F292C 000EF88C 81 8C 00 30 */ lwz r12, 0x30(r12) /* 800F2930 000EF890 7D 89 03 A6 */ mtctr r12 -/* 800F2934 000EF894 4E 80 04 21 */ bctrl +/* 800F2934 000EF894 4E 80 04 21 */ bctrl /* 800F2938 000EF898 80 7D 19 C4 */ lwz r3, 0x19c4(r29) /* 800F293C 000EF89C 81 83 00 00 */ lwz r12, 0(r3) /* 800F2940 000EF8A0 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800F2944 000EF8A4 7D 89 03 A6 */ mtctr r12 -/* 800F2948 000EF8A8 4E 80 04 21 */ bctrl +/* 800F2948 000EF8A8 4E 80 04 21 */ bctrl /* 800F294C 000EF8AC C0 3D 1D F4 */ lfs f1, 0x1df4(r29) /* 800F2950 000EF8B0 C0 02 91 50 */ lfs f0, lbl_805AAE70@sda21(r2) /* 800F2954 000EF8B4 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -6004,12 +6004,12 @@ lbl_800F2880: /* 800F29EC 000EF94C 81 83 00 00 */ lwz r12, 0(r3) /* 800F29F0 000EF950 81 8C 00 30 */ lwz r12, 0x30(r12) /* 800F29F4 000EF954 7D 89 03 A6 */ mtctr r12 -/* 800F29F8 000EF958 4E 80 04 21 */ bctrl +/* 800F29F8 000EF958 4E 80 04 21 */ bctrl /* 800F29FC 000EF95C 80 7D 19 C8 */ lwz r3, 0x19c8(r29) /* 800F2A00 000EF960 81 83 00 00 */ lwz r12, 0(r3) /* 800F2A04 000EF964 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800F2A08 000EF968 7D 89 03 A6 */ mtctr r12 -/* 800F2A0C 000EF96C 4E 80 04 21 */ bctrl +/* 800F2A0C 000EF96C 4E 80 04 21 */ bctrl lbl_800F2A10: /* 800F2A10 000EF970 7F A3 EB 78 */ mr r3, r29 /* 800F2A14 000EF974 4B FF C6 C1 */ bl RenderSpiderBallElectricalEffects__10CMorphBallCFv @@ -6083,13 +6083,13 @@ lbl_800F2B0C: /* 800F2B10 000EFA70 81 83 00 00 */ lwz r12, 0(r3) /* 800F2B14 000EFA74 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800F2B18 000EFA78 7D 89 03 A6 */ mtctr r12 -/* 800F2B1C 000EFA7C 4E 80 04 21 */ bctrl +/* 800F2B1C 000EFA7C 4E 80 04 21 */ bctrl /* 800F2B20 000EFA80 3A FD 1B CC */ addi r23, r29, 0x1bcc /* 800F2B24 000EFA84 80 7D 1C 08 */ lwz r3, 0x1c08(r29) /* 800F2B28 000EFA88 81 83 00 00 */ lwz r12, 0(r3) /* 800F2B2C 000EFA8C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800F2B30 000EFA90 7D 89 03 A6 */ mtctr r12 -/* 800F2B34 000EFA94 4E 80 04 21 */ bctrl +/* 800F2B34 000EFA94 4E 80 04 21 */ bctrl /* 800F2B38 000EFA98 80 1D 1C 0C */ lwz r0, 0x1c0c(r29) /* 800F2B3C 000EFA9C 2C 00 FF FF */ cmpwi r0, -1 /* 800F2B40 000EFAA0 41 82 00 20 */ beq lbl_800F2B60 @@ -6099,7 +6099,7 @@ lbl_800F2B0C: /* 800F2B50 000EFAB0 81 83 00 00 */ lwz r12, 0(r3) /* 800F2B54 000EFAB4 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800F2B58 000EFAB8 7D 89 03 A6 */ mtctr r12 -/* 800F2B5C 000EFABC 4E 80 04 21 */ bctrl +/* 800F2B5C 000EFABC 4E 80 04 21 */ bctrl lbl_800F2B60: /* 800F2B60 000EFAC0 80 7D 00 08 */ lwz r3, 8(r29) /* 800F2B64 000EFAC4 38 00 00 FF */ li r0, 0xff @@ -6118,7 +6118,7 @@ lbl_800F2B60: /* 800F2B98 000EFAF8 81 83 00 00 */ lwz r12, 0(r3) /* 800F2B9C 000EFAFC 81 8C 00 30 */ lwz r12, 0x30(r12) /* 800F2BA0 000EFB00 7D 89 03 A6 */ mtctr r12 -/* 800F2BA4 000EFB04 4E 80 04 21 */ bctrl +/* 800F2BA4 000EFB04 4E 80 04 21 */ bctrl /* 800F2BA8 000EFB08 80 7D 19 D0 */ lwz r3, 0x19d0(r29) /* 800F2BAC 000EFB0C 48 22 4A F1 */ bl GetNumActiveChildParticles__11CElementGenCFv /* 800F2BB0 000EFB10 2C 03 00 00 */ cmpwi r3, 0 @@ -6142,7 +6142,7 @@ lbl_800F2B60: /* 800F2BF8 000EFB58 81 83 00 00 */ lwz r12, 0(r3) /* 800F2BFC 000EFB5C 81 8C 00 30 */ lwz r12, 0x30(r12) /* 800F2C00 000EFB60 7D 89 03 A6 */ mtctr r12 -/* 800F2C04 000EFB64 4E 80 04 21 */ bctrl +/* 800F2C04 000EFB64 4E 80 04 21 */ bctrl /* 800F2C08 000EFB68 80 7D 19 D0 */ lwz r3, 0x19d0(r29) /* 800F2C0C 000EFB6C 48 22 4A 91 */ bl GetNumActiveChildParticles__11CElementGenCFv /* 800F2C10 000EFB70 2C 03 00 01 */ cmpwi r3, 1 @@ -6166,18 +6166,18 @@ lbl_800F2B60: /* 800F2C58 000EFBB8 81 83 00 00 */ lwz r12, 0(r3) /* 800F2C5C 000EFBBC 81 8C 00 30 */ lwz r12, 0x30(r12) /* 800F2C60 000EFBC0 7D 89 03 A6 */ mtctr r12 -/* 800F2C64 000EFBC4 4E 80 04 21 */ bctrl +/* 800F2C64 000EFBC4 4E 80 04 21 */ bctrl lbl_800F2C68: /* 800F2C68 000EFBC8 80 7D 19 D0 */ lwz r3, 0x19d0(r29) /* 800F2C6C 000EFBCC 81 83 00 00 */ lwz r12, 0(r3) /* 800F2C70 000EFBD0 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800F2C74 000EFBD4 7D 89 03 A6 */ mtctr r12 -/* 800F2C78 000EFBD8 4E 80 04 21 */ bctrl +/* 800F2C78 000EFBD8 4E 80 04 21 */ bctrl /* 800F2C7C 000EFBDC 80 7D 19 D4 */ lwz r3, 0x19d4(r29) /* 800F2C80 000EFBE0 81 83 00 00 */ lwz r12, 0(r3) /* 800F2C84 000EFBE4 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800F2C88 000EFBE8 7D 89 03 A6 */ mtctr r12 -/* 800F2C8C 000EFBEC 4E 80 04 21 */ bctrl +/* 800F2C8C 000EFBEC 4E 80 04 21 */ bctrl /* 800F2C90 000EFBF0 7F A3 EB 78 */ mr r3, r29 /* 800F2C94 000EFBF4 7F C4 F3 78 */ mr r4, r30 /* 800F2C98 000EFBF8 4B FF C3 A5 */ bl RenderEnergyDrainEffects__10CMorphBallCFRC13CStateManager @@ -6185,7 +6185,7 @@ lbl_800F2C68: /* 800F2CA0 000EFC00 81 83 00 00 */ lwz r12, 0(r3) /* 800F2CA4 000EFC04 81 8C 00 50 */ lwz r12, 0x50(r12) /* 800F2CA8 000EFC08 7D 89 03 A6 */ mtctr r12 -/* 800F2CAC 000EFC0C 4E 80 04 21 */ bctrl +/* 800F2CAC 000EFC0C 4E 80 04 21 */ bctrl /* 800F2CB0 000EFC10 80 03 00 00 */ lwz r0, 0(r3) /* 800F2CB4 000EFC14 28 00 00 00 */ cmplwi r0, 0 /* 800F2CB8 000EFC18 41 82 00 18 */ beq lbl_800F2CD0 @@ -6193,7 +6193,7 @@ lbl_800F2C68: /* 800F2CC0 000EFC20 81 83 00 00 */ lwz r12, 0(r3) /* 800F2CC4 000EFC24 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800F2CC8 000EFC28 7D 89 03 A6 */ mtctr r12 -/* 800F2CCC 000EFC2C 4E 80 04 21 */ bctrl +/* 800F2CCC 000EFC2C 4E 80 04 21 */ bctrl lbl_800F2CD0: /* 800F2CD0 000EFC30 7F A3 EB 78 */ mr r3, r29 /* 800F2CD4 000EFC34 7F C4 F3 78 */ mr r4, r30 @@ -6265,7 +6265,7 @@ lbl_800F2D80: /* 800F2DD8 000EFD38 80 01 03 E4 */ lwz r0, 0x3e4(r1) /* 800F2DDC 000EFD3C 7C 08 03 A6 */ mtlr r0 /* 800F2DE0 000EFD40 38 21 03 E0 */ addi r1, r1, 0x3e0 -/* 800F2DE4 000EFD44 4E 80 00 20 */ blr +/* 800F2DE4 000EFD44 4E 80 00 20 */ blr .global "GetEntry__33TReservedAverage<11CQuaternion,5>CFi" "GetEntry__33TReservedAverage<11CQuaternion,5>CFi": @@ -6274,14 +6274,14 @@ lbl_800F2D80: /* 800F2DF0 000EFD50 41 80 00 10 */ blt lbl_800F2E00 /* 800F2DF4 000EFD54 38 00 00 00 */ li r0, 0 /* 800F2DF8 000EFD58 98 03 00 10 */ stb r0, 0x10(r3) -/* 800F2DFC 000EFD5C 4E 80 00 20 */ blr +/* 800F2DFC 000EFD5C 4E 80 00 20 */ blr lbl_800F2E00: /* 800F2E00 000EFD60 38 00 00 01 */ li r0, 1 /* 800F2E04 000EFD64 28 03 00 00 */ cmplwi r3, 0 /* 800F2E08 000EFD68 54 A5 20 36 */ slwi r5, r5, 4 /* 800F2E0C 000EFD6C 98 03 00 10 */ stb r0, 0x10(r3) /* 800F2E10 000EFD70 7C 84 2A 14 */ add r4, r4, r5 -/* 800F2E14 000EFD74 4D 82 00 20 */ beqlr +/* 800F2E14 000EFD74 4D 82 00 20 */ beqlr /* 800F2E18 000EFD78 C0 04 00 04 */ lfs f0, 4(r4) /* 800F2E1C 000EFD7C D0 03 00 00 */ stfs f0, 0(r3) /* 800F2E20 000EFD80 C0 04 00 08 */ lfs f0, 8(r4) @@ -6290,7 +6290,7 @@ lbl_800F2E00: /* 800F2E2C 000EFD8C D0 03 00 08 */ stfs f0, 8(r3) /* 800F2E30 000EFD90 C0 04 00 10 */ lfs f0, 0x10(r4) /* 800F2E34 000EFD94 D0 03 00 0C */ stfs f0, 0xc(r3) -/* 800F2E38 000EFD98 4E 80 00 20 */ blr +/* 800F2E38 000EFD98 4E 80 00 20 */ blr .global "GetEntry__30TReservedAverage<9CVector3f,5>CFi" "GetEntry__30TReservedAverage<9CVector3f,5>CFi": @@ -6299,21 +6299,21 @@ lbl_800F2E00: /* 800F2E44 000EFDA4 41 80 00 10 */ blt lbl_800F2E54 /* 800F2E48 000EFDA8 38 00 00 00 */ li r0, 0 /* 800F2E4C 000EFDAC 98 03 00 0C */ stb r0, 0xc(r3) -/* 800F2E50 000EFDB0 4E 80 00 20 */ blr +/* 800F2E50 000EFDB0 4E 80 00 20 */ blr lbl_800F2E54: /* 800F2E54 000EFDB4 1C A5 00 0C */ mulli r5, r5, 0xc /* 800F2E58 000EFDB8 38 00 00 01 */ li r0, 1 /* 800F2E5C 000EFDBC 28 03 00 00 */ cmplwi r3, 0 /* 800F2E60 000EFDC0 98 03 00 0C */ stb r0, 0xc(r3) /* 800F2E64 000EFDC4 7C 84 2A 14 */ add r4, r4, r5 -/* 800F2E68 000EFDC8 4D 82 00 20 */ beqlr +/* 800F2E68 000EFDC8 4D 82 00 20 */ beqlr /* 800F2E6C 000EFDCC C0 04 00 04 */ lfs f0, 4(r4) /* 800F2E70 000EFDD0 D0 03 00 00 */ stfs f0, 0(r3) /* 800F2E74 000EFDD4 C0 04 00 08 */ lfs f0, 8(r4) /* 800F2E78 000EFDD8 D0 03 00 04 */ stfs f0, 4(r3) /* 800F2E7C 000EFDDC C0 04 00 0C */ lfs f0, 0xc(r4) /* 800F2E80 000EFDE0 D0 03 00 08 */ stfs f0, 8(r3) -/* 800F2E84 000EFDE4 4E 80 00 20 */ blr +/* 800F2E84 000EFDE4 4E 80 00 20 */ blr .global PreRender__10CMorphBallFR13CStateManagerRC14CFrustumPlanes PreRender__10CMorphBallFR13CStateManagerRC14CFrustumPlanes: @@ -6556,7 +6556,7 @@ lbl_800F3218: /* 800F321C 000F017C 80 01 01 54 */ lwz r0, 0x154(r1) /* 800F3220 000F0180 7C 08 03 A6 */ mtlr r0 /* 800F3224 000F0184 38 21 01 50 */ addi r1, r1, 0x150 -/* 800F3228 000F0188 4E 80 00 20 */ blr +/* 800F3228 000F0188 4E 80 00 20 */ blr .global sub_800f322c sub_800f322c: @@ -6625,7 +6625,7 @@ sub_800f322c: /* 800F3324 000F0284 80 01 00 14 */ lwz r0, 0x14(r1) /* 800F3328 000F0288 7C 08 03 A6 */ mtlr r0 /* 800F332C 000F028C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800F3330 000F0290 4E 80 00 20 */ blr +/* 800F3330 000F0290 4E 80 00 20 */ blr .global sub_800f3334 sub_800f3334: @@ -6681,7 +6681,7 @@ lbl_800F33D8: /* 800F33E0 000F0340 83 C1 00 08 */ lwz r30, 8(r1) /* 800F33E4 000F0344 7C 08 03 A6 */ mtlr r0 /* 800F33E8 000F0348 38 21 00 10 */ addi r1, r1, 0x10 -/* 800F33EC 000F034C 4E 80 00 20 */ blr +/* 800F33EC 000F034C 4E 80 00 20 */ blr .global sub_800f33f0 sub_800f33f0: @@ -6711,7 +6711,7 @@ lbl_800F342C: /* 800F3444 000F03A4 83 A1 00 14 */ lwz r29, 0x14(r1) /* 800F3448 000F03A8 7C 08 03 A6 */ mtlr r0 /* 800F344C 000F03AC 38 21 00 20 */ addi r1, r1, 0x20 -/* 800F3450 000F03B0 4E 80 00 20 */ blr +/* 800F3450 000F03B0 4E 80 00 20 */ blr .global sub_800f3454 sub_800f3454: @@ -6725,7 +6725,7 @@ lbl_800F346C: /* 800F346C 000F03CC 80 01 00 14 */ lwz r0, 0x14(r1) /* 800F3470 000F03D0 7C 08 03 A6 */ mtlr r0 /* 800F3474 000F03D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800F3478 000F03D8 4E 80 00 20 */ blr +/* 800F3478 000F03D8 4E 80 00 20 */ blr .global GetMinimumAlignmentSpeed__10CMorphBallCFv GetMinimumAlignmentSpeed__10CMorphBallCFv: @@ -6733,11 +6733,11 @@ GetMinimumAlignmentSpeed__10CMorphBallCFv: /* 800F3480 000F03E0 2C 00 00 01 */ cmpwi r0, 1 /* 800F3484 000F03E4 40 82 00 0C */ bne lbl_800F3490 /* 800F3488 000F03E8 C0 22 91 50 */ lfs f1, lbl_805AAE70@sda21(r2) -/* 800F348C 000F03EC 4E 80 00 20 */ blr +/* 800F348C 000F03EC 4E 80 00 20 */ blr lbl_800F3490: /* 800F3490 000F03F0 80 6D A1 1C */ lwz r3, gpTweakBall@sda21(r13) /* 800F3494 000F03F4 C0 23 01 DC */ lfs f1, 0x1dc(r3) -/* 800F3498 000F03F8 4E 80 00 20 */ blr +/* 800F3498 000F03F8 4E 80 00 20 */ blr .global DampLinearAndAngularVelocities__10CMorphBallFff DampLinearAndAngularVelocities__10CMorphBallFff: @@ -6788,7 +6788,7 @@ DampLinearAndAngularVelocities__10CMorphBallFff: /* 800F354C 000F04AC 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 800F3550 000F04B0 7C 08 03 A6 */ mtlr r0 /* 800F3554 000F04B4 38 21 00 40 */ addi r1, r1, 0x40 -/* 800F3558 000F04B8 4E 80 00 20 */ blr +/* 800F3558 000F04B8 4E 80 00 20 */ blr .global ApplyFriction__10CMorphBallFf ApplyFriction__10CMorphBallFf: @@ -6845,7 +6845,7 @@ lbl_800F3604: /* 800F361C 000F057C 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 800F3620 000F0580 7C 08 03 A6 */ mtlr r0 /* 800F3624 000F0584 38 21 00 40 */ addi r1, r1, 0x40 -/* 800F3628 000F0588 4E 80 00 20 */ blr +/* 800F3628 000F0588 4E 80 00 20 */ blr .global UpdateMarbleDynamics__10CMorphBallFR13CStateManagerfRC9CVector3f UpdateMarbleDynamics__10CMorphBallFR13CStateManagerfRC9CVector3f: @@ -7365,7 +7365,7 @@ lbl_800F3D80: /* 800F3DD4 000F0D34 83 81 01 A0 */ lwz r28, 0x1a0(r1) /* 800F3DD8 000F0D38 7C 08 03 A6 */ mtlr r0 /* 800F3DDC 000F0D3C 38 21 02 30 */ addi r1, r1, 0x230 -/* 800F3DE0 000F0D40 4E 80 00 20 */ blr +/* 800F3DE0 000F0D40 4E 80 00 20 */ blr .global "GetEntry__22TReservedAverageCFi" "GetEntry__22TReservedAverageCFi": @@ -7374,17 +7374,17 @@ lbl_800F3D80: /* 800F3DEC 000F0D4C 41 80 00 10 */ blt lbl_800F3DFC /* 800F3DF0 000F0D50 38 00 00 00 */ li r0, 0 /* 800F3DF4 000F0D54 98 03 00 04 */ stb r0, 4(r3) -/* 800F3DF8 000F0D58 4E 80 00 20 */ blr +/* 800F3DF8 000F0D58 4E 80 00 20 */ blr lbl_800F3DFC: /* 800F3DFC 000F0D5C 38 00 00 01 */ li r0, 1 /* 800F3E00 000F0D60 28 03 00 00 */ cmplwi r3, 0 /* 800F3E04 000F0D64 54 A5 10 3A */ slwi r5, r5, 2 /* 800F3E08 000F0D68 98 03 00 04 */ stb r0, 4(r3) /* 800F3E0C 000F0D6C 7C 84 2A 14 */ add r4, r4, r5 -/* 800F3E10 000F0D70 4D 82 00 20 */ beqlr +/* 800F3E10 000F0D70 4D 82 00 20 */ beqlr /* 800F3E14 000F0D74 C0 04 00 04 */ lfs f0, 4(r4) /* 800F3E18 000F0D78 D0 03 00 00 */ stfs f0, 0(r3) -/* 800F3E1C 000F0D7C 4E 80 00 20 */ blr +/* 800F3E1C 000F0D7C 4E 80 00 20 */ blr .global CancelBoosting__10CMorphBallFv CancelBoosting__10CMorphBallFv: @@ -7429,7 +7429,7 @@ lbl_800F3EB0: /* 800F3EB4 000F0E14 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 800F3EB8 000F0E18 7C 08 03 A6 */ mtlr r0 /* 800F3EBC 000F0E1C 38 21 00 40 */ addi r1, r1, 0x40 -/* 800F3EC0 000F0E20 4E 80 00 20 */ blr +/* 800F3EC0 000F0E20 4E 80 00 20 */ blr .global LeaveBoosting__10CMorphBallFv LeaveBoosting__10CMorphBallFv: @@ -7446,7 +7446,7 @@ lbl_800F3EDC: /* 800F3EE8 000F0E48 C0 02 91 50 */ lfs f0, lbl_805AAE70@sda21(r2) /* 800F3EEC 000F0E4C 98 03 1D E4 */ stb r0, 0x1de4(r3) /* 800F3EF0 000F0E50 D0 03 1D F4 */ stfs f0, 0x1df4(r3) -/* 800F3EF4 000F0E54 4E 80 00 20 */ blr +/* 800F3EF4 000F0E54 4E 80 00 20 */ blr .global EnterBoosting__10CMorphBallFR13CStateManager EnterBoosting__10CMorphBallFR13CStateManager: @@ -7771,7 +7771,7 @@ lbl_800F42B0: /* 800F439C 000F12FC 83 C1 00 78 */ lwz r30, 0x78(r1) /* 800F43A0 000F1300 7C 08 03 A6 */ mtlr r0 /* 800F43A4 000F1304 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 800F43A8 000F1308 4E 80 00 20 */ blr +/* 800F43A8 000F1308 4E 80 00 20 */ blr .global ComputeBoostBallMovement__10CMorphBallFRC11CFinalInputRC13CStateManagerf ComputeBoostBallMovement__10CMorphBallFRC11CFinalInputRC13CStateManagerf: @@ -8089,7 +8089,7 @@ lbl_800F4844: /* 800F4858 000F17B8 83 A1 01 34 */ lwz r29, 0x134(r1) /* 800F485C 000F17BC 7C 08 03 A6 */ mtlr r0 /* 800F4860 000F17C0 38 21 01 50 */ addi r1, r1, 0x150 -/* 800F4864 000F17C4 4E 80 00 20 */ blr +/* 800F4864 000F17C4 4E 80 00 20 */ blr .global UpdateEffects__10CMorphBallFfR13CStateManager UpdateEffects__10CMorphBallFfR13CStateManager: @@ -8139,7 +8139,7 @@ UpdateEffects__10CMorphBallFfR13CStateManager: /* 800F4914 000F1874 81 83 00 00 */ lwz r12, 0(r3) /* 800F4918 000F1878 81 8C 00 18 */ lwz r12, 0x18(r12) /* 800F491C 000F187C 7D 89 03 A6 */ mtctr r12 -/* 800F4920 000F1880 4E 80 04 21 */ bctrl +/* 800F4920 000F1880 4E 80 04 21 */ bctrl /* 800F4924 000F1884 83 FD 19 B8 */ lwz r31, 0x19b8(r29) /* 800F4928 000F1888 38 61 02 40 */ addi r3, r1, 0x240 /* 800F492C 000F188C 38 81 02 D0 */ addi r4, r1, 0x2d0 @@ -8149,7 +8149,7 @@ UpdateEffects__10CMorphBallFfR13CStateManager: /* 800F493C 000F189C 81 9F 00 00 */ lwz r12, 0(r31) /* 800F4940 000F18A0 81 8C 00 14 */ lwz r12, 0x14(r12) /* 800F4944 000F18A4 7D 89 03 A6 */ mtctr r12 -/* 800F4948 000F18A8 4E 80 04 21 */ bctrl +/* 800F4948 000F18A8 4E 80 04 21 */ bctrl /* 800F494C 000F18AC 80 7D 19 B8 */ lwz r3, 0x19b8(r29) /* 800F4950 000F18B0 38 80 00 01 */ li r4, 1 /* 800F4954 000F18B4 C8 22 91 D0 */ lfd f1, lbl_805AAEF0@sda21(r2) @@ -8160,7 +8160,7 @@ UpdateEffects__10CMorphBallFfR13CStateManager: /* 800F4968 000F18C8 81 83 00 00 */ lwz r12, 0(r3) /* 800F496C 000F18CC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800F4970 000F18D0 7D 89 03 A6 */ mtctr r12 -/* 800F4974 000F18D4 4E 80 04 21 */ bctrl +/* 800F4974 000F18D4 4E 80 04 21 */ bctrl /* 800F4978 000F18D8 C0 02 91 50 */ lfs f0, lbl_805AAE70@sda21(r2) /* 800F497C 000F18DC 38 61 01 20 */ addi r3, r1, 0x120 /* 800F4980 000F18E0 C0 22 92 C4 */ lfs f1, lbl_805AAFE4@sda21(r2) @@ -8187,7 +8187,7 @@ UpdateEffects__10CMorphBallFfR13CStateManager: /* 800F49D4 000F1934 81 83 00 00 */ lwz r12, 0(r3) /* 800F49D8 000F1938 81 8C 00 18 */ lwz r12, 0x18(r12) /* 800F49DC 000F193C 7D 89 03 A6 */ mtctr r12 -/* 800F49E0 000F1940 4E 80 04 21 */ bctrl +/* 800F49E0 000F1940 4E 80 04 21 */ bctrl /* 800F49E4 000F1944 83 FD 19 BC */ lwz r31, 0x19bc(r29) /* 800F49E8 000F1948 38 61 02 10 */ addi r3, r1, 0x210 /* 800F49EC 000F194C 38 81 02 D0 */ addi r4, r1, 0x2d0 @@ -8197,7 +8197,7 @@ UpdateEffects__10CMorphBallFfR13CStateManager: /* 800F49FC 000F195C 81 9F 00 00 */ lwz r12, 0(r31) /* 800F4A00 000F1960 81 8C 00 14 */ lwz r12, 0x14(r12) /* 800F4A04 000F1964 7D 89 03 A6 */ mtctr r12 -/* 800F4A08 000F1968 4E 80 04 21 */ bctrl +/* 800F4A08 000F1968 4E 80 04 21 */ bctrl /* 800F4A0C 000F196C 80 7D 19 BC */ lwz r3, 0x19bc(r29) /* 800F4A10 000F1970 38 80 00 01 */ li r4, 1 /* 800F4A14 000F1974 C8 22 91 D0 */ lfd f1, lbl_805AAEF0@sda21(r2) @@ -8208,7 +8208,7 @@ UpdateEffects__10CMorphBallFfR13CStateManager: /* 800F4A28 000F1988 81 83 00 00 */ lwz r12, 0(r3) /* 800F4A2C 000F198C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800F4A30 000F1990 7D 89 03 A6 */ mtctr r12 -/* 800F4A34 000F1994 4E 80 04 21 */ bctrl +/* 800F4A34 000F1994 4E 80 04 21 */ bctrl /* 800F4A38 000F1998 C0 22 91 50 */ lfs f1, lbl_805AAE70@sda21(r2) /* 800F4A3C 000F199C 38 61 00 FC */ addi r3, r1, 0xfc /* 800F4A40 000F19A0 C0 02 91 F4 */ lfs f0, lbl_805AAF14@sda21(r2) @@ -8235,7 +8235,7 @@ UpdateEffects__10CMorphBallFfR13CStateManager: /* 800F4A94 000F19F4 81 83 00 00 */ lwz r12, 0(r3) /* 800F4A98 000F19F8 81 8C 00 18 */ lwz r12, 0x18(r12) /* 800F4A9C 000F19FC 7D 89 03 A6 */ mtctr r12 -/* 800F4AA0 000F1A00 4E 80 04 21 */ bctrl +/* 800F4AA0 000F1A00 4E 80 04 21 */ bctrl /* 800F4AA4 000F1A04 83 FD 19 C0 */ lwz r31, 0x19c0(r29) /* 800F4AA8 000F1A08 38 61 01 E0 */ addi r3, r1, 0x1e0 /* 800F4AAC 000F1A0C 38 81 02 D0 */ addi r4, r1, 0x2d0 @@ -8245,7 +8245,7 @@ UpdateEffects__10CMorphBallFfR13CStateManager: /* 800F4ABC 000F1A1C 81 9F 00 00 */ lwz r12, 0(r31) /* 800F4AC0 000F1A20 81 8C 00 14 */ lwz r12, 0x14(r12) /* 800F4AC4 000F1A24 7D 89 03 A6 */ mtctr r12 -/* 800F4AC8 000F1A28 4E 80 04 21 */ bctrl +/* 800F4AC8 000F1A28 4E 80 04 21 */ bctrl /* 800F4ACC 000F1A2C 80 7D 19 C0 */ lwz r3, 0x19c0(r29) /* 800F4AD0 000F1A30 38 80 00 01 */ li r4, 1 /* 800F4AD4 000F1A34 C8 22 91 D0 */ lfd f1, lbl_805AAEF0@sda21(r2) @@ -8256,7 +8256,7 @@ UpdateEffects__10CMorphBallFfR13CStateManager: /* 800F4AE8 000F1A48 81 83 00 00 */ lwz r12, 0(r3) /* 800F4AEC 000F1A4C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800F4AF0 000F1A50 7D 89 03 A6 */ mtctr r12 -/* 800F4AF4 000F1A54 4E 80 04 21 */ bctrl +/* 800F4AF4 000F1A54 4E 80 04 21 */ bctrl /* 800F4AF8 000F1A58 C0 22 91 50 */ lfs f1, lbl_805AAE70@sda21(r2) /* 800F4AFC 000F1A5C 38 61 00 D8 */ addi r3, r1, 0xd8 /* 800F4B00 000F1A60 C0 02 92 C8 */ lfs f0, lbl_805AAFE8@sda21(r2) @@ -8283,7 +8283,7 @@ UpdateEffects__10CMorphBallFfR13CStateManager: /* 800F4B54 000F1AB4 81 83 00 00 */ lwz r12, 0(r3) /* 800F4B58 000F1AB8 81 8C 00 18 */ lwz r12, 0x18(r12) /* 800F4B5C 000F1ABC 7D 89 03 A6 */ mtctr r12 -/* 800F4B60 000F1AC0 4E 80 04 21 */ bctrl +/* 800F4B60 000F1AC0 4E 80 04 21 */ bctrl /* 800F4B64 000F1AC4 83 FD 19 C4 */ lwz r31, 0x19c4(r29) /* 800F4B68 000F1AC8 38 61 01 B0 */ addi r3, r1, 0x1b0 /* 800F4B6C 000F1ACC 38 81 02 D0 */ addi r4, r1, 0x2d0 @@ -8293,7 +8293,7 @@ UpdateEffects__10CMorphBallFfR13CStateManager: /* 800F4B7C 000F1ADC 81 9F 00 00 */ lwz r12, 0(r31) /* 800F4B80 000F1AE0 81 8C 00 14 */ lwz r12, 0x14(r12) /* 800F4B84 000F1AE4 7D 89 03 A6 */ mtctr r12 -/* 800F4B88 000F1AE8 4E 80 04 21 */ bctrl +/* 800F4B88 000F1AE8 4E 80 04 21 */ bctrl /* 800F4B8C 000F1AEC 80 7D 19 C4 */ lwz r3, 0x19c4(r29) /* 800F4B90 000F1AF0 38 80 00 01 */ li r4, 1 /* 800F4B94 000F1AF4 C8 22 91 D0 */ lfd f1, lbl_805AAEF0@sda21(r2) @@ -8304,7 +8304,7 @@ UpdateEffects__10CMorphBallFfR13CStateManager: /* 800F4BA8 000F1B08 81 83 00 00 */ lwz r12, 0(r3) /* 800F4BAC 000F1B0C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800F4BB0 000F1B10 7D 89 03 A6 */ mtctr r12 -/* 800F4BB4 000F1B14 4E 80 04 21 */ bctrl +/* 800F4BB4 000F1B14 4E 80 04 21 */ bctrl /* 800F4BB8 000F1B18 C0 41 02 DC */ lfs f2, 0x2dc(r1) /* 800F4BBC 000F1B1C 38 81 00 B4 */ addi r4, r1, 0xb4 /* 800F4BC0 000F1B20 C0 21 02 EC */ lfs f1, 0x2ec(r1) @@ -8316,7 +8316,7 @@ UpdateEffects__10CMorphBallFfR13CStateManager: /* 800F4BD8 000F1B38 81 83 00 00 */ lwz r12, 0(r3) /* 800F4BDC 000F1B3C 81 8C 00 18 */ lwz r12, 0x18(r12) /* 800F4BE0 000F1B40 7D 89 03 A6 */ mtctr r12 -/* 800F4BE4 000F1B44 4E 80 04 21 */ bctrl +/* 800F4BE4 000F1B44 4E 80 04 21 */ bctrl /* 800F4BE8 000F1B48 83 FD 19 C8 */ lwz r31, 0x19c8(r29) /* 800F4BEC 000F1B4C 38 61 01 80 */ addi r3, r1, 0x180 /* 800F4BF0 000F1B50 38 81 02 D0 */ addi r4, r1, 0x2d0 @@ -8326,7 +8326,7 @@ UpdateEffects__10CMorphBallFfR13CStateManager: /* 800F4C00 000F1B60 81 9F 00 00 */ lwz r12, 0(r31) /* 800F4C04 000F1B64 81 8C 00 14 */ lwz r12, 0x14(r12) /* 800F4C08 000F1B68 7D 89 03 A6 */ mtctr r12 -/* 800F4C0C 000F1B6C 4E 80 04 21 */ bctrl +/* 800F4C0C 000F1B6C 4E 80 04 21 */ bctrl /* 800F4C10 000F1B70 80 7D 19 C8 */ lwz r3, 0x19c8(r29) /* 800F4C14 000F1B74 38 80 00 01 */ li r4, 1 /* 800F4C18 000F1B78 C8 22 91 D0 */ lfd f1, lbl_805AAEF0@sda21(r2) @@ -8337,20 +8337,20 @@ UpdateEffects__10CMorphBallFfR13CStateManager: /* 800F4C2C 000F1B8C 81 83 00 00 */ lwz r12, 0(r3) /* 800F4C30 000F1B90 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800F4C34 000F1B94 7D 89 03 A6 */ mtctr r12 -/* 800F4C38 000F1B98 4E 80 04 21 */ bctrl +/* 800F4C38 000F1B98 4E 80 04 21 */ bctrl /* 800F4C3C 000F1B9C 80 7D 19 CC */ lwz r3, 0x19cc(r29) /* 800F4C40 000F1BA0 FC 20 F8 90 */ fmr f1, f31 /* 800F4C44 000F1BA4 81 83 00 00 */ lwz r12, 0(r3) /* 800F4C48 000F1BA8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800F4C4C 000F1BAC 7D 89 03 A6 */ mtctr r12 -/* 800F4C50 000F1BB0 4E 80 04 21 */ bctrl +/* 800F4C50 000F1BB0 4E 80 04 21 */ bctrl /* 800F4C54 000F1BB4 3B FD 1B CC */ addi r31, r29, 0x1bcc /* 800F4C58 000F1BB8 FC 20 F8 90 */ fmr f1, f31 /* 800F4C5C 000F1BBC 80 7D 1C 08 */ lwz r3, 0x1c08(r29) /* 800F4C60 000F1BC0 81 83 00 00 */ lwz r12, 0(r3) /* 800F4C64 000F1BC4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800F4C68 000F1BC8 7D 89 03 A6 */ mtctr r12 -/* 800F4C6C 000F1BCC 4E 80 04 21 */ bctrl +/* 800F4C6C 000F1BCC 4E 80 04 21 */ bctrl /* 800F4C70 000F1BD0 80 7D 00 00 */ lwz r3, 0(r29) /* 800F4C74 000F1BD4 3B 80 00 00 */ li r28, 0 /* 800F4C78 000F1BD8 7F 84 E3 78 */ mr r4, r28 @@ -8386,7 +8386,7 @@ lbl_800F4CDC: /* 800F4CE4 000F1C44 81 83 00 00 */ lwz r12, 0(r3) /* 800F4CE8 000F1C48 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 800F4CEC 000F1C4C 7D 89 03 A6 */ mtctr r12 -/* 800F4CF0 000F1C50 4E 80 04 21 */ bctrl +/* 800F4CF0 000F1C50 4E 80 04 21 */ bctrl /* 800F4CF4 000F1C54 80 7D 00 00 */ lwz r3, 0(r29) /* 800F4CF8 000F1C58 C3 C3 04 FC */ lfs f30, 0x4fc(r3) /* 800F4CFC 000F1C5C 48 19 0C D5 */ bl GetBallMaxVelocity__7CPlayerCFv @@ -8410,7 +8410,7 @@ lbl_800F4D34: /* 800F4D3C 000F1C9C 81 83 00 00 */ lwz r12, 0(r3) /* 800F4D40 000F1CA0 81 8C 00 34 */ lwz r12, 0x34(r12) /* 800F4D44 000F1CA4 7D 89 03 A6 */ mtctr r12 -/* 800F4D48 000F1CA8 4E 80 04 21 */ bctrl +/* 800F4D48 000F1CA8 4E 80 04 21 */ bctrl /* 800F4D4C 000F1CAC 80 7D 00 00 */ lwz r3, 0(r29) /* 800F4D50 000F1CB0 38 81 00 A8 */ addi r4, r1, 0xa8 /* 800F4D54 000F1CB4 C0 43 00 60 */ lfs f2, 0x60(r3) @@ -8423,7 +8423,7 @@ lbl_800F4D34: /* 800F4D70 000F1CD0 81 83 00 00 */ lwz r12, 0(r3) /* 800F4D74 000F1CD4 81 8C 00 18 */ lwz r12, 0x18(r12) /* 800F4D78 000F1CD8 7D 89 03 A6 */ mtctr r12 -/* 800F4D7C 000F1CDC 4E 80 04 21 */ bctrl +/* 800F4D7C 000F1CDC 4E 80 04 21 */ bctrl /* 800F4D80 000F1CE0 57 80 06 3F */ clrlwi. r0, r28, 0x18 /* 800F4D84 000F1CE4 41 82 00 8C */ beq lbl_800F4E10 /* 800F4D88 000F1CE8 80 FD 00 00 */ lwz r7, 0(r29) @@ -8459,7 +8459,7 @@ lbl_800F4D34: /* 800F4E00 000F1D60 81 83 00 00 */ lwz r12, 0(r3) /* 800F4E04 000F1D64 81 8C 00 14 */ lwz r12, 0x14(r12) /* 800F4E08 000F1D68 7D 89 03 A6 */ mtctr r12 -/* 800F4E0C 000F1D6C 4E 80 04 21 */ bctrl +/* 800F4E0C 000F1D6C 4E 80 04 21 */ bctrl lbl_800F4E10: /* 800F4E10 000F1D70 80 1D 1C 0C */ lwz r0, 0x1c0c(r29) /* 800F4E14 000F1D74 2C 00 FF FF */ cmpwi r0, -1 @@ -8471,7 +8471,7 @@ lbl_800F4E10: /* 800F4E2C 000F1D8C 81 83 00 00 */ lwz r12, 0(r3) /* 800F4E30 000F1D90 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800F4E34 000F1D94 7D 89 03 A6 */ mtctr r12 -/* 800F4E38 000F1D98 4E 80 04 21 */ bctrl +/* 800F4E38 000F1D98 4E 80 04 21 */ bctrl lbl_800F4E3C: /* 800F4E3C 000F1D9C 80 7D 1E 38 */ lwz r3, 0x1e38(r29) /* 800F4E40 000F1DA0 2C 03 00 00 */ cmpwi r3, 0 @@ -8486,7 +8486,7 @@ lbl_800F4E3C: /* 800F4E64 000F1DC4 81 83 00 00 */ lwz r12, 0(r3) /* 800F4E68 000F1DC8 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 800F4E6C 000F1DCC 7D 89 03 A6 */ mtctr r12 -/* 800F4E70 000F1DD0 4E 80 04 21 */ bctrl +/* 800F4E70 000F1DD0 4E 80 04 21 */ bctrl lbl_800F4E74: /* 800F4E74 000F1DD4 C0 41 02 DC */ lfs f2, 0x2dc(r1) /* 800F4E78 000F1DD8 38 81 00 78 */ addi r4, r1, 0x78 @@ -8499,13 +8499,13 @@ lbl_800F4E74: /* 800F4E94 000F1DF4 81 83 00 00 */ lwz r12, 0(r3) /* 800F4E98 000F1DF8 81 8C 00 20 */ lwz r12, 0x20(r12) /* 800F4E9C 000F1DFC 7D 89 03 A6 */ mtctr r12 -/* 800F4EA0 000F1E00 4E 80 04 21 */ bctrl +/* 800F4EA0 000F1E00 4E 80 04 21 */ bctrl /* 800F4EA4 000F1E04 80 7D 19 D0 */ lwz r3, 0x19d0(r29) /* 800F4EA8 000F1E08 FC 20 F8 90 */ fmr f1, f31 /* 800F4EAC 000F1E0C 81 83 00 00 */ lwz r12, 0(r3) /* 800F4EB0 000F1E10 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800F4EB4 000F1E14 7D 89 03 A6 */ mtctr r12 -/* 800F4EB8 000F1E18 4E 80 04 21 */ bctrl +/* 800F4EB8 000F1E18 4E 80 04 21 */ bctrl /* 800F4EBC 000F1E1C C0 22 91 50 */ lfs f1, lbl_805AAE70@sda21(r2) /* 800F4EC0 000F1E20 C0 1D 1D E8 */ lfs f0, 0x1de8(r29) /* 800F4EC4 000F1E24 FC 01 00 00 */ fcmpu cr0, f1, f0 @@ -8520,7 +8520,7 @@ lbl_800F4E74: /* 800F4EE8 000F1E48 81 83 00 00 */ lwz r12, 0(r3) /* 800F4EEC 000F1E4C 81 8C 00 30 */ lwz r12, 0x30(r12) /* 800F4EF0 000F1E50 7D 89 03 A6 */ mtctr r12 -/* 800F4EF4 000F1E54 4E 80 04 21 */ bctrl +/* 800F4EF4 000F1E54 4E 80 04 21 */ bctrl /* 800F4EF8 000F1E58 48 00 00 E8 */ b lbl_800F4FE0 lbl_800F4EFC: /* 800F4EFC 000F1E5C C0 41 02 DC */ lfs f2, 0x2dc(r1) @@ -8534,7 +8534,7 @@ lbl_800F4EFC: /* 800F4F1C 000F1E7C 81 83 00 00 */ lwz r12, 0(r3) /* 800F4F20 000F1E80 81 8C 00 20 */ lwz r12, 0x20(r12) /* 800F4F24 000F1E84 7D 89 03 A6 */ mtctr r12 -/* 800F4F28 000F1E88 4E 80 04 21 */ bctrl +/* 800F4F28 000F1E88 4E 80 04 21 */ bctrl /* 800F4F2C 000F1E8C C0 02 91 50 */ lfs f0, lbl_805AAE70@sda21(r2) /* 800F4F30 000F1E90 C0 5D 1D F4 */ lfs f2, 0x1df4(r29) /* 800F4F34 000F1E94 FC 00 10 00 */ fcmpu cr0, f0, f2 @@ -8575,20 +8575,20 @@ lbl_800F4F64: /* 800F4FB8 000F1F18 81 9C 00 00 */ lwz r12, 0(r28) /* 800F4FBC 000F1F1C 81 8C 00 30 */ lwz r12, 0x30(r12) /* 800F4FC0 000F1F20 7D 89 03 A6 */ mtctr r12 -/* 800F4FC4 000F1F24 4E 80 04 21 */ bctrl +/* 800F4FC4 000F1F24 4E 80 04 21 */ bctrl /* 800F4FC8 000F1F28 80 7D 19 D8 */ lwz r3, 0x19d8(r29) /* 800F4FCC 000F1F2C FC 20 F8 90 */ fmr f1, f31 /* 800F4FD0 000F1F30 81 83 00 00 */ lwz r12, 0(r3) /* 800F4FD4 000F1F34 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800F4FD8 000F1F38 7D 89 03 A6 */ mtctr r12 -/* 800F4FDC 000F1F3C 4E 80 04 21 */ bctrl +/* 800F4FDC 000F1F3C 4E 80 04 21 */ bctrl lbl_800F4FE0: /* 800F4FE0 000F1F40 80 7D 19 D4 */ lwz r3, 0x19d4(r29) /* 800F4FE4 000F1F44 FC 20 F8 90 */ fmr f1, f31 /* 800F4FE8 000F1F48 81 83 00 00 */ lwz r12, 0(r3) /* 800F4FEC 000F1F4C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800F4FF0 000F1F50 7D 89 03 A6 */ mtctr r12 -/* 800F4FF4 000F1F54 4E 80 04 21 */ bctrl +/* 800F4FF4 000F1F54 4E 80 04 21 */ bctrl /* 800F4FF8 000F1F58 C0 3D 1C 30 */ lfs f1, 0x1c30(r29) /* 800F4FFC 000F1F5C C0 02 92 CC */ lfs f0, lbl_805AAFEC@sda21(r2) /* 800F5000 000F1F60 EC 01 00 28 */ fsubs f0, f1, f0 @@ -8708,7 +8708,7 @@ lbl_800F50E4: /* 800F519C 000F20FC 81 83 00 00 */ lwz r12, 0(r3) /* 800F51A0 000F2100 81 8C 00 64 */ lwz r12, 0x64(r12) /* 800F51A4 000F2104 7D 89 03 A6 */ mtctr r12 -/* 800F51A8 000F2108 4E 80 04 21 */ bctrl +/* 800F51A8 000F2108 4E 80 04 21 */ bctrl /* 800F51AC 000F210C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800F51B0 000F2110 41 82 00 2C */ beq lbl_800F51DC /* 800F51B4 000F2114 80 9D 19 DC */ lwz r4, 0x19dc(r29) @@ -8716,7 +8716,7 @@ lbl_800F50E4: /* 800F51BC 000F211C 81 84 00 00 */ lwz r12, 0(r4) /* 800F51C0 000F2120 81 8C 00 68 */ lwz r12, 0x68(r12) /* 800F51C4 000F2124 7D 89 03 A6 */ mtctr r12 -/* 800F51C8 000F2128 4E 80 04 21 */ bctrl +/* 800F51C8 000F2128 4E 80 04 21 */ bctrl /* 800F51CC 000F212C 38 61 03 F0 */ addi r3, r1, 0x3f0 /* 800F51D0 000F2130 38 81 03 50 */ addi r4, r1, 0x350 /* 800F51D4 000F2134 48 00 02 C5 */ bl sub_800f5498 @@ -8728,7 +8728,7 @@ lbl_800F51DC: /* 800F51E8 000F2148 81 83 00 00 */ lwz r12, 0(r3) /* 800F51EC 000F214C 81 8C 00 64 */ lwz r12, 0x64(r12) /* 800F51F0 000F2150 7D 89 03 A6 */ mtctr r12 -/* 800F51F4 000F2154 4E 80 04 21 */ bctrl +/* 800F51F4 000F2154 4E 80 04 21 */ bctrl /* 800F51F8 000F2158 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800F51FC 000F215C 41 82 00 28 */ beq lbl_800F5224 /* 800F5200 000F2160 80 9D 19 D0 */ lwz r4, 0x19d0(r29) @@ -8736,7 +8736,7 @@ lbl_800F51DC: /* 800F5208 000F2168 81 84 00 00 */ lwz r12, 0(r4) /* 800F520C 000F216C 81 8C 00 68 */ lwz r12, 0x68(r12) /* 800F5210 000F2170 7D 89 03 A6 */ mtctr r12 -/* 800F5214 000F2174 4E 80 04 21 */ bctrl +/* 800F5214 000F2174 4E 80 04 21 */ bctrl /* 800F5218 000F2178 38 61 03 F0 */ addi r3, r1, 0x3f0 /* 800F521C 000F217C 38 81 03 00 */ addi r4, r1, 0x300 /* 800F5220 000F2180 48 00 02 79 */ bl sub_800f5498 @@ -8914,7 +8914,7 @@ lbl_800F5460: /* 800F5488 000F23E8 83 81 04 50 */ lwz r28, 0x450(r1) /* 800F548C 000F23EC 7C 08 03 A6 */ mtlr r0 /* 800F5490 000F23F0 38 21 04 80 */ addi r1, r1, 0x480 -/* 800F5494 000F23F4 4E 80 00 20 */ blr +/* 800F5494 000F23F4 4E 80 00 20 */ blr .global sub_800f5498 sub_800f5498: @@ -8929,7 +8929,7 @@ sub_800f5498: /* 800F54B8 000F2418 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800F54BC 000F241C 7C 08 03 A6 */ mtlr r0 /* 800F54C0 000F2420 38 21 00 10 */ addi r1, r1, 0x10 -/* 800F54C4 000F2424 4E 80 00 20 */ blr +/* 800F54C4 000F2424 4E 80 00 20 */ blr .global sub_800f54c8 sub_800f54c8: @@ -8991,7 +8991,7 @@ lbl_800F5598: /* 800F559C 000F24FC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800F55A0 000F2500 7C 08 03 A6 */ mtlr r0 /* 800F55A4 000F2504 38 21 00 10 */ addi r1, r1, 0x10 -/* 800F55A8 000F2508 4E 80 00 20 */ blr +/* 800F55A8 000F2508 4E 80 00 20 */ blr .global StopEffects__10CMorphBallFv StopEffects__10CMorphBallFv: @@ -9006,14 +9006,14 @@ StopEffects__10CMorphBallFv: /* 800F55CC 000F252C 81 83 00 00 */ lwz r12, 0(r3) /* 800F55D0 000F2530 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 800F55D4 000F2534 7D 89 03 A6 */ mtctr r12 -/* 800F55D8 000F2538 4E 80 04 21 */ bctrl +/* 800F55D8 000F2538 4E 80 04 21 */ bctrl /* 800F55DC 000F253C 3B FE 1B CC */ addi r31, r30, 0x1bcc /* 800F55E0 000F2540 38 80 00 00 */ li r4, 0 /* 800F55E4 000F2544 80 7E 1C 08 */ lwz r3, 0x1c08(r30) /* 800F55E8 000F2548 81 83 00 00 */ lwz r12, 0(r3) /* 800F55EC 000F254C 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 800F55F0 000F2550 7D 89 03 A6 */ mtctr r12 -/* 800F55F4 000F2554 4E 80 04 21 */ bctrl +/* 800F55F4 000F2554 4E 80 04 21 */ bctrl /* 800F55F8 000F2558 80 1E 1C 0C */ lwz r0, 0x1c0c(r30) /* 800F55FC 000F255C 2C 00 FF FF */ cmpwi r0, -1 /* 800F5600 000F2560 41 82 00 24 */ beq lbl_800F5624 @@ -9024,14 +9024,14 @@ StopEffects__10CMorphBallFv: /* 800F5614 000F2574 81 83 00 00 */ lwz r12, 0(r3) /* 800F5618 000F2578 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 800F561C 000F257C 7D 89 03 A6 */ mtctr r12 -/* 800F5620 000F2580 4E 80 04 21 */ bctrl +/* 800F5620 000F2580 4E 80 04 21 */ bctrl lbl_800F5624: /* 800F5624 000F2584 80 01 00 14 */ lwz r0, 0x14(r1) /* 800F5628 000F2588 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800F562C 000F258C 83 C1 00 08 */ lwz r30, 8(r1) /* 800F5630 000F2590 7C 08 03 A6 */ mtlr r0 /* 800F5634 000F2594 38 21 00 10 */ addi r1, r1, 0x10 -/* 800F5638 000F2598 4E 80 00 20 */ blr +/* 800F5638 000F2598 4E 80 00 20 */ blr .global LeaveMorphBallState__10CMorphBallFR13CStateManager LeaveMorphBallState__10CMorphBallFR13CStateManager: @@ -9053,7 +9053,7 @@ LeaveMorphBallState__10CMorphBallFR13CStateManager: /* 800F5678 000F25D8 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 800F567C 000F25DC 7C 08 03 A6 */ mtlr r0 /* 800F5680 000F25E0 38 21 00 20 */ addi r1, r1, 0x20 -/* 800F5684 000F25E4 4E 80 00 20 */ blr +/* 800F5684 000F25E4 4E 80 00 20 */ blr .global EnterMorphBallState__10CMorphBallFR13CStateManager EnterMorphBallState__10CMorphBallFR13CStateManager: @@ -9102,7 +9102,7 @@ EnterMorphBallState__10CMorphBallFR13CStateManager: /* 800F5730 000F2690 80 01 00 44 */ lwz r0, 0x44(r1) /* 800F5734 000F2694 7C 08 03 A6 */ mtlr r0 /* 800F5738 000F2698 38 21 00 40 */ addi r1, r1, 0x40 -/* 800F573C 000F269C 4E 80 00 20 */ blr +/* 800F573C 000F269C 4E 80 00 20 */ blr .global SetBallLightActive__10CMorphBallFR13CStateManagerb SetBallLightActive__10CMorphBallFR13CStateManagerb: @@ -9130,13 +9130,13 @@ SetBallLightActive__10CMorphBallFR13CStateManagerb: /* 800F5794 000F26F4 57 E4 06 3E */ clrlwi r4, r31, 0x18 /* 800F5798 000F26F8 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 800F579C 000F26FC 7D 89 03 A6 */ mtctr r12 -/* 800F57A0 000F2700 4E 80 04 21 */ bctrl +/* 800F57A0 000F2700 4E 80 04 21 */ bctrl lbl_800F57A4: /* 800F57A4 000F2704 80 01 00 24 */ lwz r0, 0x24(r1) /* 800F57A8 000F2708 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 800F57AC 000F270C 7C 08 03 A6 */ mtlr r0 /* 800F57B0 000F2710 38 21 00 20 */ addi r1, r1, 0x20 -/* 800F57B4 000F2714 4E 80 00 20 */ blr +/* 800F57B4 000F2714 4E 80 00 20 */ blr .global DeleteLight__10CMorphBallFR13CStateManager DeleteLight__10CMorphBallFR13CStateManager: @@ -9161,7 +9161,7 @@ lbl_800F57F8: /* 800F57FC 000F275C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 800F5800 000F2760 7C 08 03 A6 */ mtlr r0 /* 800F5804 000F2764 38 21 00 20 */ addi r1, r1, 0x20 -/* 800F5808 000F2768 4E 80 00 20 */ blr +/* 800F5808 000F2768 4E 80 00 20 */ blr .global AcceptScriptMsg__10CMorphBallF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__10CMorphBallF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -9184,7 +9184,7 @@ lbl_800F583C: /* 800F5848 000F27A8 81 83 00 00 */ lwz r12, 0(r3) /* 800F584C 000F27AC 81 8C 00 64 */ lwz r12, 0x64(r12) /* 800F5850 000F27B0 7D 89 03 A6 */ mtctr r12 -/* 800F5854 000F27B4 4E 80 04 21 */ bctrl +/* 800F5854 000F27B4 4E 80 04 21 */ bctrl /* 800F5858 000F27B8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800F585C 000F27BC 41 82 01 04 */ beq lbl_800F5960 /* 800F5860 000F27C0 7F E4 FB 78 */ mr r4, r31 @@ -9223,7 +9223,7 @@ lbl_800F583C: /* 800F58E4 000F2844 81 84 00 00 */ lwz r12, 0(r4) /* 800F58E8 000F2848 81 8C 00 68 */ lwz r12, 0x68(r12) /* 800F58EC 000F284C 7D 89 03 A6 */ mtctr r12 -/* 800F58F0 000F2850 4E 80 04 21 */ bctrl +/* 800F58F0 000F2850 4E 80 04 21 */ bctrl /* 800F58F4 000F2854 7F C4 F3 78 */ mr r4, r30 /* 800F58F8 000F2858 38 61 00 34 */ addi r3, r1, 0x34 /* 800F58FC 000F285C 48 00 0D F9 */ bl GetBallToWorld__10CMorphBallCFv @@ -9258,7 +9258,7 @@ lbl_800F5960: /* 800F5964 000F28C4 80 01 00 D4 */ lwz r0, 0xd4(r1) /* 800F5968 000F28C8 7C 08 03 A6 */ mtlr r0 /* 800F596C 000F28CC 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 800F5970 000F28D0 4E 80 00 20 */ blr +/* 800F5970 000F28D0 4E 80 00 20 */ blr .global Update__10CMorphBallFfR13CStateManager Update__10CMorphBallFfR13CStateManager: @@ -9374,7 +9374,7 @@ lbl_800F5AEC: /* 800F5B08 000F2A68 83 C1 00 68 */ lwz r30, 0x68(r1) /* 800F5B0C 000F2A6C 7C 08 03 A6 */ mtlr r0 /* 800F5B10 000F2A70 38 21 00 80 */ addi r1, r1, 0x80 -/* 800F5B14 000F2A74 4E 80 00 20 */ blr +/* 800F5B14 000F2A74 4E 80 00 20 */ blr .global SwitchToTire__10CMorphBallFv SwitchToTire__10CMorphBallFv: @@ -9385,7 +9385,7 @@ SwitchToTire__10CMorphBallFv: /* 800F5B28 000F2A88 98 03 1C 2C */ stb r0, 0x1c2c(r3) /* 800F5B2C 000F2A8C D0 23 00 30 */ stfs f1, 0x30(r3) /* 800F5B30 000F2A90 D0 03 1C 28 */ stfs f0, 0x1c28(r3) -/* 800F5B34 000F2A94 4E 80 00 20 */ blr +/* 800F5B34 000F2A94 4E 80 00 20 */ blr .global SwitchToMarble__10CMorphBallFv SwitchToMarble__10CMorphBallFv: @@ -9457,7 +9457,7 @@ SwitchToMarble__10CMorphBallFv: /* 800F5C3C 000F2B9C 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 800F5C40 000F2BA0 7C 08 03 A6 */ mtlr r0 /* 800F5C44 000F2BA4 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 800F5C48 000F2BA8 4E 80 00 20 */ blr +/* 800F5C48 000F2BA8 4E 80 00 20 */ blr .global UpdateBallDynamics__10CMorphBallFR13CStateManagerf UpdateBallDynamics__10CMorphBallFR13CStateManagerf: @@ -9837,7 +9837,7 @@ lbl_800F6140: /* 800F61B4 000F3114 83 C1 01 98 */ lwz r30, 0x198(r1) /* 800F61B8 000F3118 7C 08 03 A6 */ mtlr r0 /* 800F61BC 000F311C 38 21 01 C0 */ addi r1, r1, 0x1c0 -/* 800F61C0 000F3120 4E 80 00 20 */ blr +/* 800F61C0 000F3120 4E 80 00 20 */ blr .global sub_800f61c4 sub_800f61c4: @@ -9933,7 +9933,7 @@ lbl_800F6304: /* 800F6310 000F3270 D0 03 00 08 */ stfs f0, 8(r3) /* 800F6314 000F3274 C0 04 00 08 */ lfs f0, 8(r4) /* 800F6318 000F3278 D0 03 00 0C */ stfs f0, 0xc(r3) -/* 800F631C 000F327C 4E 80 00 20 */ blr +/* 800F631C 000F327C 4E 80 00 20 */ blr .global sub_800f6320 sub_800f6320: @@ -10043,7 +10043,7 @@ lbl_800F6490: /* 800F64A4 000F3404 90 03 00 0C */ stw r0, 0xc(r3) /* 800F64A8 000F3408 80 04 00 0C */ lwz r0, 0xc(r4) /* 800F64AC 000F340C 90 03 00 10 */ stw r0, 0x10(r3) -/* 800F64B0 000F3410 4E 80 00 20 */ blr +/* 800F64B0 000F3410 4E 80 00 20 */ blr .global BallTurnInput__10CMorphBallCFRC11CFinalInput BallTurnInput__10CMorphBallCFRC11CFinalInput: @@ -10075,7 +10075,7 @@ lbl_800F6504: /* 800F6510 000F3470 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800F6514 000F3474 7C 08 03 A6 */ mtlr r0 /* 800F6518 000F3478 38 21 00 20 */ addi r1, r1, 0x20 -/* 800F651C 000F347C 4E 80 00 20 */ blr +/* 800F651C 000F347C 4E 80 00 20 */ blr .global CalculateBallContactInfo__10CMorphBallCFR9CVector3fR9CVector3f CalculateBallContactInfo__10CMorphBallCFR9CVector3fR9CVector3f: @@ -10095,10 +10095,10 @@ CalculateBallContactInfo__10CMorphBallCFR9CVector3fR9CVector3f: /* 800F6554 000F34B4 C0 03 00 80 */ lfs f0, 0x80(r3) /* 800F6558 000F34B8 38 60 00 01 */ li r3, 1 /* 800F655C 000F34BC D0 05 00 08 */ stfs f0, 8(r5) -/* 800F6560 000F34C0 4E 80 00 20 */ blr +/* 800F6560 000F34C0 4E 80 00 20 */ blr lbl_800F6564: /* 800F6564 000F34C4 38 60 00 00 */ li r3, 0 -/* 800F6568 000F34C8 4E 80 00 20 */ blr +/* 800F6568 000F34C8 4E 80 00 20 */ blr .global CalculateSurfaceToWorld__10CMorphBallCFRC9CVector3fRC9CVector3fRC9CVector3f CalculateSurfaceToWorld__10CMorphBallCFRC9CVector3fRC9CVector3fRC9CVector3f: @@ -10201,7 +10201,7 @@ lbl_800F66D4: /* 800F66E4 000F3644 83 81 00 60 */ lwz r28, 0x60(r1) /* 800F66E8 000F3648 7C 08 03 A6 */ mtlr r0 /* 800F66EC 000F364C 38 21 00 70 */ addi r1, r1, 0x70 -/* 800F66F0 000F3650 4E 80 00 20 */ blr +/* 800F66F0 000F3650 4E 80 00 20 */ blr .global GetBallToWorld__10CMorphBallCFv GetBallToWorld__10CMorphBallCFv: @@ -10250,7 +10250,7 @@ GetBallToWorld__10CMorphBallCFv: /* 800F679C 000F36FC 83 A1 00 B4 */ lwz r29, 0xb4(r1) /* 800F67A0 000F3700 7C 08 03 A6 */ mtlr r0 /* 800F67A4 000F3704 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 800F67A8 000F3708 4E 80 00 20 */ blr +/* 800F67A8 000F3708 4E 80 00 20 */ blr .global GetSwooshToWorld__10CMorphBallCFv GetSwooshToWorld__10CMorphBallCFv: @@ -10304,7 +10304,7 @@ GetSwooshToWorld__10CMorphBallCFv: /* 800F6868 000F37C8 83 C1 01 18 */ lwz r30, 0x118(r1) /* 800F686C 000F37CC 7C 08 03 A6 */ mtlr r0 /* 800F6870 000F37D0 38 21 01 20 */ addi r1, r1, 0x120 -/* 800F6874 000F37D4 4E 80 00 20 */ blr +/* 800F6874 000F37D4 4E 80 00 20 */ blr .global ComputeMarioMovement__10CMorphBallFRC11CFinalInputR13CStateManagerf ComputeMarioMovement__10CMorphBallFRC11CFinalInputR13CStateManagerf: @@ -10951,7 +10951,7 @@ lbl_800F71B0: /* 800F71FC 000F415C 83 A1 01 74 */ lwz r29, 0x174(r1) /* 800F7200 000F4160 7C 08 03 A6 */ mtlr r0 /* 800F7204 000F4164 38 21 02 00 */ addi r1, r1, 0x200 -/* 800F7208 000F4168 4E 80 00 20 */ blr +/* 800F7208 000F4168 4E 80 00 20 */ blr .global CreateSpiderBallParticles__10CMorphBallFRC9CVector3fRC9CVector3f CreateSpiderBallParticles__10CMorphBallFRC9CVector3fRC9CVector3f: @@ -10967,7 +10967,7 @@ CreateSpiderBallParticles__10CMorphBallFRC9CVector3fRC9CVector3f: /* 800F7230 000F4190 81 83 00 00 */ lwz r12, 0(r3) /* 800F7234 000F4194 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 800F7238 000F4198 7D 89 03 A6 */ mtctr r12 -/* 800F723C 000F419C 4E 80 04 21 */ bctrl +/* 800F723C 000F419C 4E 80 04 21 */ bctrl /* 800F7240 000F41A0 C0 3D 00 04 */ lfs f1, 4(r29) /* 800F7244 000F41A4 38 61 00 14 */ addi r3, r1, 0x14 /* 800F7248 000F41A8 C0 1C 00 04 */ lfs f0, 4(r28) @@ -11029,7 +11029,7 @@ lbl_800F7318: /* 800F7320 000F4280 81 83 00 00 */ lwz r12, 0(r3) /* 800F7324 000F4284 81 8C 00 18 */ lwz r12, 0x18(r12) /* 800F7328 000F4288 7D 89 03 A6 */ mtctr r12 -/* 800F732C 000F428C 4E 80 04 21 */ bctrl +/* 800F732C 000F428C 4E 80 04 21 */ bctrl /* 800F7330 000F4290 80 7B 19 D4 */ lwz r3, 0x19d4(r27) /* 800F7334 000F4294 38 80 00 01 */ li r4, 1 /* 800F7338 000F4298 48 22 55 89 */ bl ForceParticleCreation__11CElementGenFi @@ -11058,12 +11058,12 @@ lbl_800F737C: /* 800F738C 000F42EC 81 83 00 00 */ lwz r12, 0(r3) /* 800F7390 000F42F0 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 800F7394 000F42F4 7D 89 03 A6 */ mtctr r12 -/* 800F7398 000F42F8 4E 80 04 21 */ bctrl +/* 800F7398 000F42F8 4E 80 04 21 */ bctrl /* 800F739C 000F42FC BB 61 00 3C */ lmw r27, 0x3c(r1) /* 800F73A0 000F4300 80 01 00 54 */ lwz r0, 0x54(r1) /* 800F73A4 000F4304 7C 08 03 A6 */ mtlr r0 /* 800F73A8 000F4308 38 21 00 50 */ addi r1, r1, 0x50 -/* 800F73AC 000F430C 4E 80 00 20 */ blr +/* 800F73AC 000F430C 4E 80 00 20 */ blr .global GetSpiderBallSwingControllerMovementScalar__10CMorphBallCFv GetSpiderBallSwingControllerMovementScalar__10CMorphBallCFv: @@ -11090,7 +11090,7 @@ lbl_800F73F4: /* 800F73F4 000F4354 C0 23 00 00 */ lfs f1, 0(r3) lbl_800F73F8: /* 800F73F8 000F4358 38 21 00 10 */ addi r1, r1, 0x10 -/* 800F73FC 000F435C 4E 80 00 20 */ blr +/* 800F73FC 000F435C 4E 80 00 20 */ blr .global UpdateSpiderBallSwingControllerMovementTimer__10CMorphBallFff UpdateSpiderBallSwingControllerMovementTimer__10CMorphBallFff: @@ -11133,14 +11133,14 @@ lbl_800F7478: /* 800F7484 000F43E4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800F7488 000F43E8 7C 08 03 A6 */ mtlr r0 /* 800F748C 000F43EC 38 21 00 20 */ addi r1, r1, 0x20 -/* 800F7490 000F43F0 4E 80 00 20 */ blr +/* 800F7490 000F43F0 4E 80 00 20 */ blr .global ResetSpiderBallSwingControllerMovementTimer__10CMorphBallFv ResetSpiderBallSwingControllerMovementTimer__10CMorphBallFv: /* 800F7494 000F43F4 C0 02 91 50 */ lfs f0, lbl_805AAE70@sda21(r2) /* 800F7498 000F43F8 D0 03 19 04 */ stfs f0, 0x1904(r3) /* 800F749C 000F43FC D0 03 19 08 */ stfs f0, 0x1908(r3) -/* 800F74A0 000F4400 4E 80 00 20 */ blr +/* 800F74A0 000F4400 4E 80 00 20 */ blr .global GetSpiderBallControllerMovement__10CMorphBallCFRC11CFinalInput GetSpiderBallControllerMovement__10CMorphBallCFRC11CFinalInput: @@ -11212,7 +11212,7 @@ lbl_800F7580: /* 800F7594 000F44F4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800F7598 000F44F8 7C 08 03 A6 */ mtlr r0 /* 800F759C 000F44FC 38 21 00 30 */ addi r1, r1, 0x30 -/* 800F75A0 000F4500 4E 80 00 20 */ blr +/* 800F75A0 000F4500 4E 80 00 20 */ blr .global SetSpiderBallSwingingState__10CMorphBallFb SetSpiderBallSwingingState__10CMorphBallFb: @@ -11237,7 +11237,7 @@ lbl_800F75DC: /* 800F75E8 000F4548 83 C1 00 08 */ lwz r30, 8(r1) /* 800F75EC 000F454C 7C 08 03 A6 */ mtlr r0 /* 800F75F0 000F4550 38 21 00 10 */ addi r1, r1, 0x10 -/* 800F75F4 000F4554 4E 80 00 20 */ blr +/* 800F75F4 000F4554 4E 80 00 20 */ blr .global FindClosestSpiderBallWaypoint__10CMorphBallCFR13CStateManagerRC9CVector3fR9CVector3fR9CVector3fR9CVector3fRfR9CVector3fRbR12CTransform4f FindClosestSpiderBallWaypoint__10CMorphBallCFR13CStateManagerRC9CVector3fR9CVector3fR9CVector3fR9CVector3fRfR9CVector3fRbR12CTransform4f: @@ -11634,7 +11634,7 @@ lbl_800F7BB8: /* 800F7BE8 000F4B48 80 01 0B 14 */ lwz r0, 0xb14(r1) /* 800F7BEC 000F4B4C 7C 08 03 A6 */ mtlr r0 /* 800F7BF0 000F4B50 38 21 0B 10 */ addi r1, r1, 0xb10 -/* 800F7BF4 000F4B54 4E 80 00 20 */ blr +/* 800F7BF4 000F4B54 4E 80 00 20 */ blr .global CheckForSwitchToSpiderBallSwinging__10CMorphBallCFR13CStateManager CheckForSwitchToSpiderBallSwinging__10CMorphBallCFR13CStateManager: @@ -11737,7 +11737,7 @@ lbl_800F7D58: /* 800F7D60 000F4CC0 83 C1 00 B8 */ lwz r30, 0xb8(r1) /* 800F7D64 000F4CC4 7C 08 03 A6 */ mtlr r0 /* 800F7D68 000F4CC8 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 800F7D6C 000F4CCC 4E 80 00 20 */ blr +/* 800F7D6C 000F4CCC 4E 80 00 20 */ blr .global ApplySpiderBallRollForces__10CMorphBallFRC11CFinalInputR13CStateManagerf ApplySpiderBallRollForces__10CMorphBallFRC11CFinalInputR13CStateManagerf: @@ -12314,7 +12314,7 @@ lbl_800F85A0: /* 800F85DC 000F553C 80 01 02 04 */ lwz r0, 0x204(r1) /* 800F85E0 000F5540 7C 08 03 A6 */ mtlr r0 /* 800F85E4 000F5544 38 21 02 00 */ addi r1, r1, 0x200 -/* 800F85E8 000F5548 4E 80 00 20 */ blr +/* 800F85E8 000F5548 4E 80 00 20 */ blr .global ResetSpiderBallForces__10CMorphBallFv ResetSpiderBallForces__10CMorphBallFv: @@ -12340,7 +12340,7 @@ ResetSpiderBallForces__10CMorphBallFv: /* 800F8638 000F5598 80 01 00 24 */ lwz r0, 0x24(r1) /* 800F863C 000F559C 7C 08 03 A6 */ mtlr r0 /* 800F8640 000F55A0 38 21 00 20 */ addi r1, r1, 0x20 -/* 800F8644 000F55A4 4E 80 00 20 */ blr +/* 800F8644 000F55A4 4E 80 00 20 */ blr .global CalculateSpiderBallAttractionSurfaceForces__10CMorphBallCFRC11CFinalInput CalculateSpiderBallAttractionSurfaceForces__10CMorphBallCFRC11CFinalInput: @@ -12395,7 +12395,7 @@ lbl_800F86E8: /* 800F8700 000F5660 83 C1 00 08 */ lwz r30, 8(r1) /* 800F8704 000F5664 7C 08 03 A6 */ mtlr r0 /* 800F8708 000F5668 38 21 00 30 */ addi r1, r1, 0x30 -/* 800F870C 000F566C 4E 80 00 20 */ blr +/* 800F870C 000F566C 4E 80 00 20 */ blr .global TransformSpiderBallForcesXY__10CMorphBallFR9CVector2fR13CStateManager TransformSpiderBallForcesXY__10CMorphBallFR9CVector2fR13CStateManager: @@ -12438,7 +12438,7 @@ TransformSpiderBallForcesXY__10CMorphBallFR9CVector2fR13CStateManager: /* 800F87A0 000F5700 80 01 00 44 */ lwz r0, 0x44(r1) /* 800F87A4 000F5704 7C 08 03 A6 */ mtlr r0 /* 800F87A8 000F5708 38 21 00 40 */ addi r1, r1, 0x40 -/* 800F87AC 000F570C 4E 80 00 20 */ blr +/* 800F87AC 000F570C 4E 80 00 20 */ blr .global TransformSpiderBallForcesXZ__10CMorphBallFR9CVector2fR13CStateManager TransformSpiderBallForcesXZ__10CMorphBallFR9CVector2fR13CStateManager: @@ -12481,7 +12481,7 @@ TransformSpiderBallForcesXZ__10CMorphBallFR9CVector2fR13CStateManager: /* 800F8840 000F57A0 80 01 00 44 */ lwz r0, 0x44(r1) /* 800F8844 000F57A4 7C 08 03 A6 */ mtlr r0 /* 800F8848 000F57A8 38 21 00 40 */ addi r1, r1, 0x40 -/* 800F884C 000F57AC 4E 80 00 20 */ blr +/* 800F884C 000F57AC 4E 80 00 20 */ blr .global ApplySpiderBallSwingingForces__10CMorphBallFRC11CFinalInputR13CStateManagerf ApplySpiderBallSwingingForces__10CMorphBallFRC11CFinalInputR13CStateManagerf: @@ -12721,7 +12721,7 @@ lbl_800F8B60: /* 800F8BE8 000F5B48 83 C1 00 68 */ lwz r30, 0x68(r1) /* 800F8BEC 000F5B4C 7C 08 03 A6 */ mtlr r0 /* 800F8BF0 000F5B50 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 800F8BF4 000F5B54 4E 80 00 20 */ blr +/* 800F8BF4 000F5B54 4E 80 00 20 */ blr .global UpdateSpiderBall__10CMorphBallFRC11CFinalInputR13CStateManagerf UpdateSpiderBall__10CMorphBallFRC11CFinalInputR13CStateManagerf: @@ -12764,12 +12764,12 @@ lbl_800F8C70: /* 800F8C80 000F5BE0 83 A1 00 0C */ lwz r29, 0xc(r1) /* 800F8C84 000F5BE4 7C 08 03 A6 */ mtlr r0 /* 800F8C88 000F5BE8 38 21 00 20 */ addi r1, r1, 0x20 -/* 800F8C8C 000F5BEC 4E 80 00 20 */ blr +/* 800F8C8C 000F5BEC 4E 80 00 20 */ blr .global SetDamageTimer__10CMorphBallFf SetDamageTimer__10CMorphBallFf: /* 800F8C90 000F5BF0 D0 23 19 1C */ stfs f1, 0x191c(r3) -/* 800F8C94 000F5BF4 4E 80 00 20 */ blr +/* 800F8C94 000F5BF4 4E 80 00 20 */ blr .global IsMovementAllowed__10CMorphBallCFv IsMovementAllowed__10CMorphBallCFv: @@ -12812,7 +12812,7 @@ lbl_800F8D14: /* 800F8D18 000F5C78 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800F8D1C 000F5C7C 7C 08 03 A6 */ mtlr r0 /* 800F8D20 000F5C80 38 21 00 10 */ addi r1, r1, 0x10 -/* 800F8D24 000F5C84 4E 80 00 20 */ blr +/* 800F8D24 000F5C84 4E 80 00 20 */ blr .global ComputeBallMovement__10CMorphBallFRC11CFinalInputR13CStateManagerf ComputeBallMovement__10CMorphBallFRC11CFinalInputR13CStateManagerf: @@ -12840,7 +12840,7 @@ ComputeBallMovement__10CMorphBallFRC11CFinalInputR13CStateManagerf: /* 800F8D7C 000F5CDC 83 A1 00 0C */ lwz r29, 0xc(r1) /* 800F8D80 000F5CE0 7C 08 03 A6 */ mtlr r0 /* 800F8D84 000F5CE4 38 21 00 20 */ addi r1, r1, 0x20 -/* 800F8D88 000F5CE8 4E 80 00 20 */ blr +/* 800F8D88 000F5CE8 4E 80 00 20 */ blr .global ForwardInput__10CMorphBallCFRC11CFinalInput ForwardInput__10CMorphBallCFRC11CFinalInput: @@ -12872,19 +12872,19 @@ lbl_800F8DDC: /* 800F8DE8 000F5D48 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800F8DEC 000F5D4C 7C 08 03 A6 */ mtlr r0 /* 800F8DF0 000F5D50 38 21 00 20 */ addi r1, r1, 0x20 -/* 800F8DF4 000F5D54 4E 80 00 20 */ blr +/* 800F8DF4 000F5D54 4E 80 00 20 */ blr .global GetBallTouchRadius__10CMorphBallCFv GetBallTouchRadius__10CMorphBallCFv: /* 800F8DF8 000F5D58 80 6D A1 1C */ lwz r3, gpTweakBall@sda21(r13) /* 800F8DFC 000F5D5C C0 23 02 04 */ lfs f1, 0x204(r3) -/* 800F8E00 000F5D60 4E 80 00 20 */ blr +/* 800F8E00 000F5D60 4E 80 00 20 */ blr .global GetBallRadius__10CMorphBallCFv GetBallRadius__10CMorphBallCFv: /* 800F8E04 000F5D64 80 6D A1 18 */ lwz r3, gpTweakPlayer@sda21(r13) /* 800F8E08 000F5D68 C0 23 02 7C */ lfs f1, 0x27c(r3) -/* 800F8E0C 000F5D6C 4E 80 00 20 */ blr +/* 800F8E0C 000F5D6C 4E 80 00 20 */ blr .global sub_800f8e10 sub_800f8e10: @@ -13057,7 +13057,7 @@ lbl_800F9024: /* 800F9048 000F5FA8 38 80 00 01 */ li r4, 1 /* 800F904C 000F5FAC 81 8C 00 08 */ lwz r12, 8(r12) /* 800F9050 000F5FB0 7D 89 03 A6 */ mtctr r12 -/* 800F9054 000F5FB4 4E 80 04 21 */ bctrl +/* 800F9054 000F5FB4 4E 80 04 21 */ bctrl lbl_800F9058: /* 800F9058 000F5FB8 3B 9C 00 08 */ addi r28, r28, 8 /* 800F905C 000F5FBC 3B BD 00 01 */ addi r29, r29, 1 @@ -13111,7 +13111,7 @@ lbl_800F90D8: /* 800F9100 000F6060 38 80 00 01 */ li r4, 1 /* 800F9104 000F6064 81 8C 00 08 */ lwz r12, 8(r12) /* 800F9108 000F6068 7D 89 03 A6 */ mtctr r12 -/* 800F910C 000F606C 4E 80 04 21 */ bctrl +/* 800F910C 000F606C 4E 80 04 21 */ bctrl lbl_800F9110: /* 800F9110 000F6070 3B 9C 00 0C */ addi r28, r28, 0xc /* 800F9114 000F6074 3B BD 00 01 */ addi r29, r29, 1 @@ -13131,7 +13131,7 @@ lbl_800F912C: /* 800F9144 000F60A4 38 80 00 01 */ li r4, 1 /* 800F9148 000F60A8 81 8C 00 08 */ lwz r12, 8(r12) /* 800F914C 000F60AC 7D 89 03 A6 */ mtctr r12 -/* 800F9150 000F60B0 4E 80 04 21 */ bctrl +/* 800F9150 000F60B0 4E 80 04 21 */ bctrl lbl_800F9154: /* 800F9154 000F60B4 34 1E 19 DC */ addic. r0, r30, 0x19dc /* 800F9158 000F60B8 41 82 00 24 */ beq lbl_800F917C @@ -13142,7 +13142,7 @@ lbl_800F9154: /* 800F916C 000F60CC 38 80 00 01 */ li r4, 1 /* 800F9170 000F60D0 81 8C 00 08 */ lwz r12, 8(r12) /* 800F9174 000F60D4 7D 89 03 A6 */ mtctr r12 -/* 800F9178 000F60D8 4E 80 04 21 */ bctrl +/* 800F9178 000F60D8 4E 80 04 21 */ bctrl lbl_800F917C: /* 800F917C 000F60DC 34 1E 19 D8 */ addic. r0, r30, 0x19d8 /* 800F9180 000F60E0 41 82 00 24 */ beq lbl_800F91A4 @@ -13153,7 +13153,7 @@ lbl_800F917C: /* 800F9194 000F60F4 38 80 00 01 */ li r4, 1 /* 800F9198 000F60F8 81 8C 00 08 */ lwz r12, 8(r12) /* 800F919C 000F60FC 7D 89 03 A6 */ mtctr r12 -/* 800F91A0 000F6100 4E 80 04 21 */ bctrl +/* 800F91A0 000F6100 4E 80 04 21 */ bctrl lbl_800F91A4: /* 800F91A4 000F6104 34 1E 19 D4 */ addic. r0, r30, 0x19d4 /* 800F91A8 000F6108 41 82 00 24 */ beq lbl_800F91CC @@ -13164,7 +13164,7 @@ lbl_800F91A4: /* 800F91BC 000F611C 38 80 00 01 */ li r4, 1 /* 800F91C0 000F6120 81 8C 00 08 */ lwz r12, 8(r12) /* 800F91C4 000F6124 7D 89 03 A6 */ mtctr r12 -/* 800F91C8 000F6128 4E 80 04 21 */ bctrl +/* 800F91C8 000F6128 4E 80 04 21 */ bctrl lbl_800F91CC: /* 800F91CC 000F612C 34 1E 19 D0 */ addic. r0, r30, 0x19d0 /* 800F91D0 000F6130 41 82 00 24 */ beq lbl_800F91F4 @@ -13175,7 +13175,7 @@ lbl_800F91CC: /* 800F91E4 000F6144 38 80 00 01 */ li r4, 1 /* 800F91E8 000F6148 81 8C 00 08 */ lwz r12, 8(r12) /* 800F91EC 000F614C 7D 89 03 A6 */ mtctr r12 -/* 800F91F0 000F6150 4E 80 04 21 */ bctrl +/* 800F91F0 000F6150 4E 80 04 21 */ bctrl lbl_800F91F4: /* 800F91F4 000F6154 34 1E 19 CC */ addic. r0, r30, 0x19cc /* 800F91F8 000F6158 41 82 00 24 */ beq lbl_800F921C @@ -13186,7 +13186,7 @@ lbl_800F91F4: /* 800F920C 000F616C 38 80 00 01 */ li r4, 1 /* 800F9210 000F6170 81 8C 00 08 */ lwz r12, 8(r12) /* 800F9214 000F6174 7D 89 03 A6 */ mtctr r12 -/* 800F9218 000F6178 4E 80 04 21 */ bctrl +/* 800F9218 000F6178 4E 80 04 21 */ bctrl lbl_800F921C: /* 800F921C 000F617C 34 1E 19 C8 */ addic. r0, r30, 0x19c8 /* 800F9220 000F6180 41 82 00 24 */ beq lbl_800F9244 @@ -13197,7 +13197,7 @@ lbl_800F921C: /* 800F9234 000F6194 38 80 00 01 */ li r4, 1 /* 800F9238 000F6198 81 8C 00 08 */ lwz r12, 8(r12) /* 800F923C 000F619C 7D 89 03 A6 */ mtctr r12 -/* 800F9240 000F61A0 4E 80 04 21 */ bctrl +/* 800F9240 000F61A0 4E 80 04 21 */ bctrl lbl_800F9244: /* 800F9244 000F61A4 34 1E 19 C4 */ addic. r0, r30, 0x19c4 /* 800F9248 000F61A8 41 82 00 24 */ beq lbl_800F926C @@ -13208,7 +13208,7 @@ lbl_800F9244: /* 800F925C 000F61BC 38 80 00 01 */ li r4, 1 /* 800F9260 000F61C0 81 8C 00 08 */ lwz r12, 8(r12) /* 800F9264 000F61C4 7D 89 03 A6 */ mtctr r12 -/* 800F9268 000F61C8 4E 80 04 21 */ bctrl +/* 800F9268 000F61C8 4E 80 04 21 */ bctrl lbl_800F926C: /* 800F926C 000F61CC 34 1E 19 C0 */ addic. r0, r30, 0x19c0 /* 800F9270 000F61D0 41 82 00 24 */ beq lbl_800F9294 @@ -13219,7 +13219,7 @@ lbl_800F926C: /* 800F9284 000F61E4 38 80 00 01 */ li r4, 1 /* 800F9288 000F61E8 81 8C 00 08 */ lwz r12, 8(r12) /* 800F928C 000F61EC 7D 89 03 A6 */ mtctr r12 -/* 800F9290 000F61F0 4E 80 04 21 */ bctrl +/* 800F9290 000F61F0 4E 80 04 21 */ bctrl lbl_800F9294: /* 800F9294 000F61F4 34 1E 19 BC */ addic. r0, r30, 0x19bc /* 800F9298 000F61F8 41 82 00 24 */ beq lbl_800F92BC @@ -13230,7 +13230,7 @@ lbl_800F9294: /* 800F92AC 000F620C 38 80 00 01 */ li r4, 1 /* 800F92B0 000F6210 81 8C 00 08 */ lwz r12, 8(r12) /* 800F92B4 000F6214 7D 89 03 A6 */ mtctr r12 -/* 800F92B8 000F6218 4E 80 04 21 */ bctrl +/* 800F92B8 000F6218 4E 80 04 21 */ bctrl lbl_800F92BC: /* 800F92BC 000F621C 34 1E 19 B8 */ addic. r0, r30, 0x19b8 /* 800F92C0 000F6220 41 82 00 24 */ beq lbl_800F92E4 @@ -13241,7 +13241,7 @@ lbl_800F92BC: /* 800F92D4 000F6234 38 80 00 01 */ li r4, 1 /* 800F92D8 000F6238 81 8C 00 08 */ lwz r12, 8(r12) /* 800F92DC 000F623C 7D 89 03 A6 */ mtctr r12 -/* 800F92E0 000F6240 4E 80 04 21 */ bctrl +/* 800F92E0 000F6240 4E 80 04 21 */ bctrl lbl_800F92E4: /* 800F92E4 000F6244 34 1E 19 B0 */ addic. r0, r30, 0x19b0 /* 800F92E8 000F6248 41 82 00 10 */ beq lbl_800F92F8 @@ -13435,7 +13435,7 @@ lbl_800F9550: /* 800F9564 000F64C4 83 81 00 20 */ lwz r28, 0x20(r1) /* 800F9568 000F64C8 7C 08 03 A6 */ mtlr r0 /* 800F956C 000F64CC 38 21 00 30 */ addi r1, r1, 0x30 -/* 800F9570 000F64D0 4E 80 00 20 */ blr +/* 800F9570 000F64D0 4E 80 00 20 */ blr .global __ct__10CMorphBallFR7CPlayerf __ct__10CMorphBallFR7CPlayerf: @@ -13634,7 +13634,7 @@ __ct__10CMorphBallFR7CPlayerf: /* 800F9874 000F67D4 81 84 00 00 */ lwz r12, 0(r4) /* 800F9878 000F67D8 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800F987C 000F67DC 7D 89 03 A6 */ mtctr r12 -/* 800F9880 000F67E0 4E 80 04 21 */ bctrl +/* 800F9880 000F67E0 4E 80 04 21 */ bctrl /* 800F9884 000F67E4 38 7F 19 68 */ addi r3, r31, 0x1968 /* 800F9888 000F67E8 38 81 00 A8 */ addi r4, r1, 0xa8 /* 800F988C 000F67EC 48 24 76 1D */ bl __ct__6CTokenFRC6CToken @@ -13649,7 +13649,7 @@ __ct__10CMorphBallFR7CPlayerf: /* 800F98B0 000F6810 38 A5 01 65 */ addi r5, r5, 0x165 /* 800F98B4 000F6814 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800F98B8 000F6818 7D 89 03 A6 */ mtctr r12 -/* 800F98BC 000F681C 4E 80 04 21 */ bctrl +/* 800F98BC 000F681C 4E 80 04 21 */ bctrl /* 800F98C0 000F6820 38 7F 19 70 */ addi r3, r31, 0x1970 /* 800F98C4 000F6824 38 81 00 A0 */ addi r4, r1, 0xa0 /* 800F98C8 000F6828 48 24 75 E1 */ bl __ct__6CTokenFRC6CToken @@ -13664,7 +13664,7 @@ __ct__10CMorphBallFR7CPlayerf: /* 800F98EC 000F684C 38 A5 01 79 */ addi r5, r5, 0x179 /* 800F98F0 000F6850 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800F98F4 000F6854 7D 89 03 A6 */ mtctr r12 -/* 800F98F8 000F6858 4E 80 04 21 */ bctrl +/* 800F98F8 000F6858 4E 80 04 21 */ bctrl /* 800F98FC 000F685C 38 7F 19 78 */ addi r3, r31, 0x1978 /* 800F9900 000F6860 38 81 00 98 */ addi r4, r1, 0x98 /* 800F9904 000F6864 48 24 75 A5 */ bl __ct__6CTokenFRC6CToken @@ -13679,7 +13679,7 @@ __ct__10CMorphBallFR7CPlayerf: /* 800F9928 000F6888 38 A5 01 84 */ addi r5, r5, 0x184 /* 800F992C 000F688C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800F9930 000F6890 7D 89 03 A6 */ mtctr r12 -/* 800F9934 000F6894 4E 80 04 21 */ bctrl +/* 800F9934 000F6894 4E 80 04 21 */ bctrl /* 800F9938 000F6898 38 7F 19 80 */ addi r3, r31, 0x1980 /* 800F993C 000F689C 38 81 00 90 */ addi r4, r1, 0x90 /* 800F9940 000F68A0 48 24 75 69 */ bl __ct__6CTokenFRC6CToken @@ -13694,7 +13694,7 @@ __ct__10CMorphBallFR7CPlayerf: /* 800F9964 000F68C4 38 A5 01 8E */ addi r5, r5, 0x18e /* 800F9968 000F68C8 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800F996C 000F68CC 7D 89 03 A6 */ mtctr r12 -/* 800F9970 000F68D0 4E 80 04 21 */ bctrl +/* 800F9970 000F68D0 4E 80 04 21 */ bctrl /* 800F9974 000F68D4 38 7F 19 88 */ addi r3, r31, 0x1988 /* 800F9978 000F68D8 38 81 00 88 */ addi r4, r1, 0x88 /* 800F997C 000F68DC 48 24 75 2D */ bl __ct__6CTokenFRC6CToken @@ -13709,7 +13709,7 @@ __ct__10CMorphBallFR7CPlayerf: /* 800F99A0 000F6900 38 A5 01 9C */ addi r5, r5, 0x19c /* 800F99A4 000F6904 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800F99A8 000F6908 7D 89 03 A6 */ mtctr r12 -/* 800F99AC 000F690C 4E 80 04 21 */ bctrl +/* 800F99AC 000F690C 4E 80 04 21 */ bctrl /* 800F99B0 000F6910 38 7F 19 90 */ addi r3, r31, 0x1990 /* 800F99B4 000F6914 38 81 00 80 */ addi r4, r1, 0x80 /* 800F99B8 000F6918 48 24 74 F1 */ bl __ct__6CTokenFRC6CToken @@ -13724,7 +13724,7 @@ __ct__10CMorphBallFR7CPlayerf: /* 800F99DC 000F693C 38 A5 01 B3 */ addi r5, r5, 0x1b3 /* 800F99E0 000F6940 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800F99E4 000F6944 7D 89 03 A6 */ mtctr r12 -/* 800F99E8 000F6948 4E 80 04 21 */ bctrl +/* 800F99E8 000F6948 4E 80 04 21 */ bctrl /* 800F99EC 000F694C 38 7F 19 98 */ addi r3, r31, 0x1998 /* 800F99F0 000F6950 38 81 00 78 */ addi r4, r1, 0x78 /* 800F99F4 000F6954 48 24 74 B5 */ bl __ct__6CTokenFRC6CToken @@ -13739,7 +13739,7 @@ __ct__10CMorphBallFR7CPlayerf: /* 800F9A18 000F6978 38 A5 01 C1 */ addi r5, r5, 0x1c1 /* 800F9A1C 000F697C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800F9A20 000F6980 7D 89 03 A6 */ mtctr r12 -/* 800F9A24 000F6984 4E 80 04 21 */ bctrl +/* 800F9A24 000F6984 4E 80 04 21 */ bctrl /* 800F9A28 000F6988 38 7F 19 A0 */ addi r3, r31, 0x19a0 /* 800F9A2C 000F698C 38 81 00 70 */ addi r4, r1, 0x70 /* 800F9A30 000F6990 48 24 74 79 */ bl __ct__6CTokenFRC6CToken @@ -13754,7 +13754,7 @@ __ct__10CMorphBallFR7CPlayerf: /* 800F9A54 000F69B4 38 A5 01 D0 */ addi r5, r5, 0x1d0 /* 800F9A58 000F69B8 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800F9A5C 000F69BC 7D 89 03 A6 */ mtctr r12 -/* 800F9A60 000F69C0 4E 80 04 21 */ bctrl +/* 800F9A60 000F69C0 4E 80 04 21 */ bctrl /* 800F9A64 000F69C4 38 7F 19 A8 */ addi r3, r31, 0x19a8 /* 800F9A68 000F69C8 38 81 00 68 */ addi r4, r1, 0x68 /* 800F9A6C 000F69CC 48 24 74 3D */ bl __ct__6CTokenFRC6CToken @@ -13769,7 +13769,7 @@ __ct__10CMorphBallFR7CPlayerf: /* 800F9A90 000F69F0 38 A5 01 E9 */ addi r5, r5, 0x1e9 /* 800F9A94 000F69F4 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800F9A98 000F69F8 7D 89 03 A6 */ mtctr r12 -/* 800F9A9C 000F69FC 4E 80 04 21 */ bctrl +/* 800F9A9C 000F69FC 4E 80 04 21 */ bctrl /* 800F9AA0 000F6A00 38 7F 19 B0 */ addi r3, r31, 0x19b0 /* 800F9AA4 000F6A04 38 81 00 60 */ addi r4, r1, 0x60 /* 800F9AA8 000F6A08 48 24 74 01 */ bl __ct__6CTokenFRC6CToken @@ -14307,13 +14307,13 @@ lbl_800FA140: /* 800FA264 000F71C4 81 83 00 00 */ lwz r12, 0(r3) /* 800FA268 000F71C8 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 800FA26C 000F71CC 7D 89 03 A6 */ mtctr r12 -/* 800FA270 000F71D0 4E 80 04 21 */ bctrl +/* 800FA270 000F71D0 4E 80 04 21 */ bctrl /* 800FA274 000F71D4 80 7F 19 D4 */ lwz r3, 0x19d4(r31) /* 800FA278 000F71D8 C8 22 93 30 */ lfd f1, lbl_805AB050@sda21(r2) /* 800FA27C 000F71DC 81 83 00 00 */ lwz r12, 0(r3) /* 800FA280 000F71E0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800FA284 000F71E4 7D 89 03 A6 */ mtctr r12 -/* 800FA288 000F71E8 4E 80 04 21 */ bctrl +/* 800FA288 000F71E8 4E 80 04 21 */ bctrl /* 800FA28C 000F71EC 7F E3 FB 78 */ mr r3, r31 /* 800FA290 000F71F0 4B FF EB 75 */ bl GetBallRadius__10CMorphBallCFv /* 800FA294 000F71F4 C0 02 91 E8 */ lfs f0, lbl_805AAF08@sda21(r2) @@ -14375,7 +14375,7 @@ lbl_800FA340: /* 800FA368 000F72C8 38 80 00 01 */ li r4, 1 /* 800FA36C 000F72CC 81 8C 00 08 */ lwz r12, 8(r12) /* 800FA370 000F72D0 7D 89 03 A6 */ mtctr r12 -/* 800FA374 000F72D4 4E 80 04 21 */ bctrl +/* 800FA374 000F72D4 4E 80 04 21 */ bctrl lbl_800FA378: /* 800FA378 000F72D8 88 01 00 08 */ lbz r0, 8(r1) /* 800FA37C 000F72DC 28 00 00 00 */ cmplwi r0, 0 @@ -14387,7 +14387,7 @@ lbl_800FA378: /* 800FA394 000F72F4 38 80 00 01 */ li r4, 1 /* 800FA398 000F72F8 81 8C 00 08 */ lwz r12, 8(r12) /* 800FA39C 000F72FC 7D 89 03 A6 */ mtctr r12 -/* 800FA3A0 000F7300 4E 80 04 21 */ bctrl +/* 800FA3A0 000F7300 4E 80 04 21 */ bctrl lbl_800FA3A4: /* 800FA3A4 000F7304 7F 60 07 75 */ extsb. r0, r27 /* 800FA3A8 000F7308 41 82 00 10 */ beq lbl_800FA3B8 @@ -14415,7 +14415,7 @@ lbl_800FA3B8: /* 800FA3FC 000F735C 80 01 01 64 */ lwz r0, 0x164(r1) /* 800FA400 000F7360 7C 08 03 A6 */ mtlr r0 /* 800FA404 000F7364 38 21 01 60 */ addi r1, r1, 0x160 -/* 800FA408 000F7368 4E 80 00 20 */ blr +/* 800FA408 000F7368 4E 80 00 20 */ blr .global sub_800fa40c sub_800fa40c: @@ -14429,7 +14429,7 @@ sub_800fa40c: /* 800FA428 000F7388 80 01 00 14 */ lwz r0, 0x14(r1) /* 800FA42C 000F738C 7C 08 03 A6 */ mtlr r0 /* 800FA430 000F7390 38 21 00 10 */ addi r1, r1, 0x10 -/* 800FA434 000F7394 4E 80 00 20 */ blr +/* 800FA434 000F7394 4E 80 00 20 */ blr .global sub_800fa438 sub_800fa438: @@ -14465,7 +14465,7 @@ lbl_800FA48C: /* 800FA4A4 000F7404 80 01 00 14 */ lwz r0, 0x14(r1) /* 800FA4A8 000F7408 7C 08 03 A6 */ mtlr r0 /* 800FA4AC 000F740C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800FA4B0 000F7410 4E 80 00 20 */ blr +/* 800FA4B0 000F7410 4E 80 00 20 */ blr .global sub_800fa4b4 sub_800fa4b4: @@ -14501,7 +14501,7 @@ lbl_800FA50C: /* 800FA51C 000F747C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 800FA520 000F7480 7C 08 03 A6 */ mtlr r0 /* 800FA524 000F7484 38 21 00 20 */ addi r1, r1, 0x20 -/* 800FA528 000F7488 4E 80 00 20 */ blr +/* 800FA528 000F7488 4E 80 00 20 */ blr .global __sinit_CMorphBall_cpp __sinit_CMorphBall_cpp: @@ -14529,7 +14529,7 @@ __sinit_CMorphBall_cpp: /* 800FA580 000F74E0 80 01 00 14 */ lwz r0, 0x14(r1) /* 800FA584 000F74E4 7C 08 03 A6 */ mtlr r0 /* 800FA588 000F74E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800FA58C 000F74EC 4E 80 00 20 */ blr +/* 800FA58C 000F74EC 4E 80 00 20 */ blr .global sub_800fa590 sub_800fa590: diff --git a/asm/MetroidPrime/Player/CMorphBallShadow.s b/asm/MetroidPrime/Player/CMorphBallShadow.s index b0011f5b..f41240f1 100644 --- a/asm/MetroidPrime/Player/CMorphBallShadow.s +++ b/asm/MetroidPrime/Player/CMorphBallShadow.s @@ -8,7 +8,7 @@ lbl_805AF470: .global lbl_805AF474 lbl_805AF474: .skip 0x4 - + .section .text, "ax" .global AreasValid__16CMorphBallShadowCFRC13CStateManager @@ -34,14 +34,14 @@ lbl_80295B70: /* 80295B7C 00292ADC 7C 05 00 40 */ cmplw r5, r0 /* 80295B80 00292AE0 40 82 00 0C */ bne lbl_80295B8C /* 80295B84 00292AE4 38 60 00 00 */ li r3, 0 -/* 80295B88 00292AE8 4E 80 00 20 */ blr +/* 80295B88 00292AE8 4E 80 00 20 */ blr lbl_80295B8C: /* 80295B8C 00292AEC 80 85 00 08 */ lwz r4, 8(r5) /* 80295B90 00292AF0 80 06 00 04 */ lwz r0, 4(r6) /* 80295B94 00292AF4 7C 04 00 00 */ cmpw r4, r0 /* 80295B98 00292AF8 41 82 00 0C */ beq lbl_80295BA4 /* 80295B9C 00292AFC 38 60 00 00 */ li r3, 0 -/* 80295BA0 00292B00 4E 80 00 20 */ blr +/* 80295BA0 00292B00 4E 80 00 20 */ blr lbl_80295BA4: /* 80295BA4 00292B04 80 A5 00 04 */ lwz r5, 4(r5) lbl_80295BA8: @@ -50,7 +50,7 @@ lbl_80295BAC: /* 80295BAC 00292B0C 7C 06 38 40 */ cmplw r6, r7 /* 80295BB0 00292B10 40 82 FF A4 */ bne lbl_80295B54 /* 80295BB4 00292B14 38 60 00 01 */ li r3, 1 -/* 80295BB8 00292B18 4E 80 00 20 */ blr +/* 80295BB8 00292B18 4E 80 00 20 */ blr .global GatherAreas__16CMorphBallShadowFR13CStateManager GatherAreas__16CMorphBallShadowFR13CStateManager: @@ -124,7 +124,7 @@ lbl_80295C90: /* 80295CA0 00292C00 80 01 00 24 */ lwz r0, 0x24(r1) /* 80295CA4 00292C04 7C 08 03 A6 */ mtlr r0 /* 80295CA8 00292C08 38 21 00 20 */ addi r1, r1, 0x20 -/* 80295CAC 00292C0C 4E 80 00 20 */ blr +/* 80295CAC 00292C0C 4E 80 00 20 */ blr .global Render__16CMorphBallShadowFR13CStateManagerf Render__16CMorphBallShadowFR13CStateManagerf: @@ -434,7 +434,7 @@ lbl_802960F4: /* 80296154 002930B4 81 83 00 00 */ lwz r12, 0(r3) /* 80296158 002930B8 81 8C 00 30 */ lwz r12, 0x30(r12) /* 8029615C 002930BC 7D 89 03 A6 */ mtctr r12 -/* 80296160 002930C0 4E 80 04 21 */ bctrl +/* 80296160 002930C0 4E 80 04 21 */ bctrl /* 80296164 002930C4 38 61 00 50 */ addi r3, r1, 0x50 /* 80296168 002930C8 38 81 01 D0 */ addi r4, r1, 0x1d0 /* 8029616C 002930CC 38 A1 01 A0 */ addi r5, r1, 0x1a0 @@ -474,7 +474,7 @@ lbl_802961C8: /* 802961F0 00293150 81 83 00 00 */ lwz r12, 0(r3) /* 802961F4 00293154 81 8C 00 30 */ lwz r12, 0x30(r12) /* 802961F8 00293158 7D 89 03 A6 */ mtctr r12 -/* 802961FC 0029315C 4E 80 04 21 */ bctrl +/* 802961FC 0029315C 4E 80 04 21 */ bctrl /* 80296200 00293160 7F E3 FB 78 */ mr r3, r31 /* 80296204 00293164 7F 44 D3 78 */ mr r4, r26 /* 80296208 00293168 38 BE 00 30 */ addi r5, r30, 0x30 @@ -499,7 +499,7 @@ lbl_80296244: /* 80296250 002931B0 80 01 02 D4 */ lwz r0, 0x2d4(r1) /* 80296254 002931B4 7C 08 03 A6 */ mtlr r0 /* 80296258 002931B8 38 21 02 D0 */ addi r1, r1, 0x2d0 -/* 8029625C 002931BC 4E 80 00 20 */ blr +/* 8029625C 002931BC 4E 80 00 20 */ blr .global RenderIdBuffer__16CMorphBallShadowFRC6CAABoxR13CStateManagerR7CPlayer RenderIdBuffer__16CMorphBallShadowFRC6CAABoxR13CStateManagerR7CPlayer: @@ -697,7 +697,7 @@ lbl_802963B0: /* 8029653C 0029349C 7C A7 00 50 */ subf r5, r7, r0 /* 80296540 002934A0 80 DF 00 B0 */ lwz r6, 0xb0(r31) /* 80296544 002934A4 7D 89 03 A6 */ mtctr r12 -/* 80296548 002934A8 4E 80 04 21 */ bctrl +/* 80296548 002934A8 4E 80 04 21 */ bctrl /* 8029654C 002934AC 38 00 00 00 */ li r0, 0 /* 80296550 002934B0 3C 60 80 5A */ lis r3, lbl_8059FD18@ha /* 80296554 002934B4 90 01 01 D0 */ stw r0, 0x1d0(r1) @@ -749,14 +749,14 @@ lbl_802963B0: /* 8029660C 0029356C 81 83 00 00 */ lwz r12, 0(r3) /* 80296610 00293570 81 8C 00 A4 */ lwz r12, 0xa4(r12) /* 80296614 00293574 7D 89 03 A6 */ mtctr r12 -/* 80296618 00293578 4E 80 04 21 */ bctrl +/* 80296618 00293578 4E 80 04 21 */ bctrl /* 8029661C 0029357C 48 0B 39 81 */ bl Red__6CColorFv /* 80296620 00293580 7C 64 1B 78 */ mr r4, r3 /* 80296624 00293584 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 80296628 00293588 81 83 00 00 */ lwz r12, 0(r3) /* 8029662C 0029358C 81 8C 00 B4 */ lwz r12, 0xb4(r12) /* 80296630 00293590 7D 89 03 A6 */ mtctr r12 -/* 80296634 00293594 4E 80 04 21 */ bctrl +/* 80296634 00293594 4E 80 04 21 */ bctrl /* 80296638 00293598 C0 02 BF AC */ lfs f0, lbl_805ADCCC@sda21(r2) /* 8029663C 0029359C 38 81 00 54 */ addi r4, r1, 0x54 /* 80296640 002935A0 D3 81 00 54 */ stfs f28, 0x54(r1) @@ -767,7 +767,7 @@ lbl_802963B0: /* 80296654 002935B4 81 83 00 00 */ lwz r12, 0(r3) /* 80296658 002935B8 81 8C 00 A8 */ lwz r12, 0xa8(r12) /* 8029665C 002935BC 7D 89 03 A6 */ mtctr r12 -/* 80296660 002935C0 4E 80 04 21 */ bctrl +/* 80296660 002935C0 4E 80 04 21 */ bctrl /* 80296664 002935C4 D3 81 00 48 */ stfs f28, 0x48(r1) /* 80296668 002935C8 38 81 00 48 */ addi r4, r1, 0x48 /* 8029666C 002935CC 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) @@ -776,7 +776,7 @@ lbl_802963B0: /* 80296678 002935D8 81 83 00 00 */ lwz r12, 0(r3) /* 8029667C 002935DC 81 8C 00 A8 */ lwz r12, 0xa8(r12) /* 80296680 002935E0 7D 89 03 A6 */ mtctr r12 -/* 80296684 002935E4 4E 80 04 21 */ bctrl +/* 80296684 002935E4 4E 80 04 21 */ bctrl /* 80296688 002935E8 D3 41 00 3C */ stfs f26, 0x3c(r1) /* 8029668C 002935EC 38 81 00 3C */ addi r4, r1, 0x3c /* 80296690 002935F0 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) @@ -785,7 +785,7 @@ lbl_802963B0: /* 8029669C 002935FC 81 83 00 00 */ lwz r12, 0(r3) /* 802966A0 00293600 81 8C 00 A8 */ lwz r12, 0xa8(r12) /* 802966A4 00293604 7D 89 03 A6 */ mtctr r12 -/* 802966A8 00293608 4E 80 04 21 */ bctrl +/* 802966A8 00293608 4E 80 04 21 */ bctrl /* 802966AC 0029360C D3 41 00 30 */ stfs f26, 0x30(r1) /* 802966B0 00293610 38 81 00 30 */ addi r4, r1, 0x30 /* 802966B4 00293614 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) @@ -794,12 +794,12 @@ lbl_802963B0: /* 802966C0 00293620 81 83 00 00 */ lwz r12, 0(r3) /* 802966C4 00293624 81 8C 00 A8 */ lwz r12, 0xa8(r12) /* 802966C8 00293628 7D 89 03 A6 */ mtctr r12 -/* 802966CC 0029362C 4E 80 04 21 */ bctrl +/* 802966CC 0029362C 4E 80 04 21 */ bctrl /* 802966D0 00293630 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 802966D4 00293634 81 83 00 00 */ lwz r12, 0(r3) /* 802966D8 00293638 81 8C 00 B8 */ lwz r12, 0xb8(r12) /* 802966DC 0029363C 7D 89 03 A6 */ mtctr r12 -/* 802966E0 00293640 4E 80 04 21 */ bctrl +/* 802966E0 00293640 4E 80 04 21 */ bctrl /* 802966E4 00293644 38 60 00 01 */ li r3, 1 /* 802966E8 00293648 48 07 53 89 */ bl SetCullMode__9CGraphicsF12ERglCullMode /* 802966EC 0029364C 38 61 01 70 */ addi r3, r1, 0x170 @@ -881,7 +881,7 @@ lbl_80296798: /* 8029680C 0029376C 81 83 00 00 */ lwz r12, 0(r3) /* 80296810 00293770 81 8C 00 30 */ lwz r12, 0x30(r12) /* 80296814 00293774 7D 89 03 A6 */ mtctr r12 -/* 80296818 00293778 4E 80 04 21 */ bctrl +/* 80296818 00293778 4E 80 04 21 */ bctrl /* 8029681C 0029377C C0 22 BF A0 */ lfs f1, lbl_805ADCC0@sda21(r2) /* 80296820 00293780 38 80 00 00 */ li r4, 0 /* 80296824 00293784 38 00 00 03 */ li r0, 3 @@ -987,7 +987,7 @@ lbl_80296888: /* 802969A8 00293908 80 C1 00 84 */ lwz r6, 0x84(r1) /* 802969AC 0029390C 80 E1 00 88 */ lwz r7, 0x88(r1) /* 802969B0 00293910 7D 89 03 A6 */ mtctr r12 -/* 802969B4 00293914 4E 80 04 21 */ bctrl +/* 802969B4 00293914 4E 80 04 21 */ bctrl /* 802969B8 00293918 FC 20 F8 90 */ fmr f1, f31 /* 802969BC 0029391C FC 40 F0 90 */ fmr f2, f30 /* 802969C0 00293920 48 07 3A 21 */ bl SetDepthRange__9CGraphicsFff @@ -1035,7 +1035,7 @@ lbl_80296A18: /* 80296A54 002939B4 80 01 0A 84 */ lwz r0, 0xa84(r1) /* 80296A58 002939B8 7C 08 03 A6 */ mtlr r0 /* 80296A5C 002939BC 38 21 0A 80 */ addi r1, r1, 0xa80 -/* 80296A60 002939C0 4E 80 00 20 */ blr +/* 80296A60 002939C0 4E 80 00 20 */ blr .global __dt__16CMorphBallShadowFv __dt__16CMorphBallShadowFv: @@ -1096,7 +1096,7 @@ lbl_80296B1C: /* 80296B28 00293A88 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80296B2C 00293A8C 7C 08 03 A6 */ mtlr r0 /* 80296B30 00293A90 38 21 00 20 */ addi r1, r1, 0x20 -/* 80296B34 00293A94 4E 80 00 20 */ blr +/* 80296B34 00293A94 4E 80 00 20 */ blr .global "__ct__16CMorphBallShadowFiiRC17TToken<8CTexture>" "__ct__16CMorphBallShadowFiiRC17TToken<8CTexture>": @@ -1164,7 +1164,7 @@ lbl_80296B1C: /* 80296C2C 00293B8C 83 81 00 10 */ lwz r28, 0x10(r1) /* 80296C30 00293B90 7C 08 03 A6 */ mtlr r0 /* 80296C34 00293B94 38 21 00 20 */ addi r1, r1, 0x20 -/* 80296C38 00293B98 4E 80 00 20 */ blr +/* 80296C38 00293B98 4E 80 00 20 */ blr .global sub_80296c3c sub_80296c3c: @@ -1200,7 +1200,7 @@ lbl_80296C90: /* 80296CA8 00293C08 80 01 00 14 */ lwz r0, 0x14(r1) /* 80296CAC 00293C0C 7C 08 03 A6 */ mtlr r0 /* 80296CB0 00293C10 38 21 00 10 */ addi r1, r1, 0x10 -/* 80296CB4 00293C14 4E 80 00 20 */ blr +/* 80296CB4 00293C14 4E 80 00 20 */ blr .global sub_80296cb8 sub_80296cb8: @@ -1236,7 +1236,7 @@ lbl_80296D10: /* 80296D20 00293C80 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80296D24 00293C84 7C 08 03 A6 */ mtlr r0 /* 80296D28 00293C88 38 21 00 20 */ addi r1, r1, 0x20 -/* 80296D2C 00293C8C 4E 80 00 20 */ blr +/* 80296D2C 00293C8C 4E 80 00 20 */ blr .global sub_80296d30 sub_80296d30: @@ -1272,7 +1272,7 @@ lbl_80296D84: /* 80296D9C 00293CFC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80296DA0 00293D00 7C 08 03 A6 */ mtlr r0 /* 80296DA4 00293D04 38 21 00 10 */ addi r1, r1, 0x10 -/* 80296DA8 00293D08 4E 80 00 20 */ blr +/* 80296DA8 00293D08 4E 80 00 20 */ blr .global sub_80296dac sub_80296dac: @@ -1308,4 +1308,4 @@ lbl_80296E04: /* 80296E14 00293D74 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80296E18 00293D78 7C 08 03 A6 */ mtlr r0 /* 80296E1C 00293D7C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80296E20 00293D80 4E 80 00 20 */ blr +/* 80296E20 00293D80 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/Player/CPlayer.s b/asm/MetroidPrime/Player/CPlayer.s index 920a23d3..9a7fece9 100644 --- a/asm/MetroidPrime/Player/CPlayer.s +++ b/asm/MetroidPrime/Player/CPlayer.s @@ -90,7 +90,7 @@ lbl_803D97E4: .4byte __dt__19CCollisionPrimitiveFv .4byte 0 .4byte 0 - + .section .bss .global lbl_80457908 lbl_80457908: @@ -151,7 +151,7 @@ skRightStepSounds_7CPlayer: .2byte 0x05D8, 0x05DB, 0xFFFF, 0xFFFF .2byte 0xFFFF, 0xFFFF, 0x05FA, 0x062A - + .global lbl_803CC4F8 lbl_803CC4F8: .asciz "GUN_LCTR" @@ -396,7 +396,7 @@ lbl_805A6CD0: lbl_805A6CD4: # ROM: 0x3F4674 .4byte 0 - + .section .text, "ax" .global __dt__7CPlayerFv @@ -947,7 +947,7 @@ lbl_80010850: .global sub_80010870 sub_80010870: -/* 80010870 0000D7D0 4E 80 00 20 */ blr +/* 80010870 0000D7D0 4E 80 00 20 */ blr .global sub_80010874 sub_80010874: @@ -973,7 +973,7 @@ lbl_800108B0: /* 800108BC 0000D81C 83 C1 00 08 */ lwz r30, 8(r1) /* 800108C0 0000D820 7C 08 03 A6 */ mtlr r0 /* 800108C4 0000D824 38 21 00 10 */ addi r1, r1, 0x10 -/* 800108C8 0000D828 4E 80 00 20 */ blr +/* 800108C8 0000D828 4E 80 00 20 */ blr .global __dt__10CMorphBallFv __dt__10CMorphBallFv: @@ -1115,7 +1115,7 @@ lbl_80010A80: .global sub_80010a94 sub_80010a94: -/* 80010A94 0000D9F4 4E 80 00 20 */ blr +/* 80010A94 0000D9F4 4E 80 00 20 */ blr .global IsTransparent__7CPlayerCFv IsTransparent__7CPlayerCFv: @@ -1124,7 +1124,7 @@ IsTransparent__7CPlayerCFv: /* 80010AA0 0000DA00 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80010AA4 0000DA04 7C 00 00 26 */ mfcr r0 /* 80010AA8 0000DA08 54 03 0F FE */ srwi r3, r0, 0x1f -/* 80010AAC 0000DA0C 4E 80 00 20 */ blr +/* 80010AAC 0000DA0C 4E 80 00 20 */ blr .global IsEnergyLow__7CPlayerCFRC13CStateManager IsEnergyLow__7CPlayerCFRC13CStateManager: @@ -1138,7 +1138,7 @@ IsEnergyLow__7CPlayerCFRC13CStateManager: /* 80010ACC 0000DA2C 7C 9F 23 78 */ mr r31, r4 /* 80010AD0 0000DA30 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80010AD4 0000DA34 7D 89 03 A6 */ mtctr r12 -/* 80010AD8 0000DA38 4E 80 04 21 */ bctrl +/* 80010AD8 0000DA38 4E 80 04 21 */ bctrl /* 80010ADC 0000DA3C 80 BF 08 B8 */ lwz r5, 0x8b8(r31) /* 80010AE0 0000DA40 38 80 00 18 */ li r4, 0x18 /* 80010AE4 0000DA44 C3 E3 00 00 */ lfs f31, 0(r3) @@ -1160,7 +1160,7 @@ lbl_80010B04: /* 80010B1C 0000DA7C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80010B20 0000DA80 7C 08 03 A6 */ mtlr r0 /* 80010B24 0000DA84 38 21 00 20 */ addi r1, r1, 0x20 -/* 80010B28 0000DA88 4E 80 00 20 */ blr +/* 80010B28 0000DA88 4E 80 00 20 */ blr .global FinishNewScan__7CPlayerFR13CStateManager FinishNewScan__7CPlayerFR13CStateManager: @@ -1240,12 +1240,12 @@ lbl_80010C3C: /* 80010C48 0000DBA8 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80010C4C 0000DBAC 7C 08 03 A6 */ mtlr r0 /* 80010C50 0000DBB0 38 21 00 30 */ addi r1, r1, 0x30 -/* 80010C54 0000DBB4 4E 80 00 20 */ blr +/* 80010C54 0000DBB4 4E 80 00 20 */ blr .global GetAttachedActorStruggle__7CPlayerCFv GetAttachedActorStruggle__7CPlayerCFv: /* 80010C58 0000DBB8 C0 23 0A 28 */ lfs f1, 0xa28(r3) -/* 80010C5C 0000DBBC 4E 80 00 20 */ blr +/* 80010C5C 0000DBBC 4E 80 00 20 */ blr .global StartSamusVoiceSfx__7CPlayerFUssi StartSamusVoiceSfx__7CPlayerFUssi: @@ -1304,7 +1304,7 @@ lbl_80010D1C: /* 80010D20 0000DC80 80 01 00 34 */ lwz r0, 0x34(r1) /* 80010D24 0000DC84 7C 08 03 A6 */ mtlr r0 /* 80010D28 0000DC88 38 21 00 30 */ addi r1, r1, 0x30 -/* 80010D2C 0000DC8C 4E 80 00 20 */ blr +/* 80010D2C 0000DC8C 4E 80 00 20 */ blr .global PostUpdate__7CPlayerFfR13CStateManager PostUpdate__7CPlayerFfR13CStateManager: @@ -1437,7 +1437,7 @@ lbl_80010EA4: /* 80010EF4 0000DE54 83 C1 01 18 */ lwz r30, 0x118(r1) /* 80010EF8 0000DE58 7C 08 03 A6 */ mtlr r0 /* 80010EFC 0000DE5C 38 21 01 50 */ addi r1, r1, 0x150 -/* 80010F00 0000DE60 4E 80 00 20 */ blr +/* 80010F00 0000DE60 4E 80 00 20 */ blr .global __ct__16CPlayerCameraBobFRC16CPlayerCameraBob __ct__16CPlayerCameraBobFRC16CPlayerCameraBob: @@ -1612,7 +1612,7 @@ lbl_80011124: /* 80011164 0000E0C4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80011168 0000E0C8 7C 08 03 A6 */ mtlr r0 /* 8001116C 0000E0CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80011170 0000E0D0 4E 80 00 20 */ blr +/* 80011170 0000E0D0 4E 80 00 20 */ blr .global SetPlayerHitWallDuringMove__7CPlayerFv SetPlayerHitWallDuringMove__7CPlayerFv: @@ -1621,7 +1621,7 @@ SetPlayerHitWallDuringMove__7CPlayerFv: /* 8001117C 0000E0DC 50 80 17 7A */ rlwimi r0, r4, 2, 0x1d, 0x1d /* 80011180 0000E0E0 98 03 09 C5 */ stb r0, 0x9c5(r3) /* 80011184 0000E0E4 90 83 02 D0 */ stw r4, 0x2d0(r3) -/* 80011188 0000E0E8 4E 80 00 20 */ blr +/* 80011188 0000E0E8 4E 80 00 20 */ blr .global ApplySubmergedPitchBend__7CPlayerFR10CSfxHandle ApplySubmergedPitchBend__7CPlayerFR10CSfxHandle: @@ -1643,7 +1643,7 @@ lbl_800111C0: /* 800111C4 0000E124 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 800111C8 0000E128 7C 08 03 A6 */ mtlr r0 /* 800111CC 0000E12C 38 21 00 20 */ addi r1, r1, 0x20 -/* 800111D0 0000E130 4E 80 00 20 */ blr +/* 800111D0 0000E130 4E 80 00 20 */ blr .global UpdatePhazonDamage__7CPlayerFfR13CStateManager UpdatePhazonDamage__7CPlayerFfR13CStateManager: @@ -1751,14 +1751,14 @@ lbl_800112F8: /* 80011354 0000E2B4 81 9E 00 00 */ lwz r12, 0(r30) /* 80011358 0000E2B8 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 8001135C 0000E2BC 7D 89 03 A6 */ mtctr r12 -/* 80011360 0000E2C0 4E 80 04 21 */ bctrl +/* 80011360 0000E2C0 4E 80 04 21 */ bctrl /* 80011364 0000E2C4 7C 64 1B 78 */ mr r4, r3 /* 80011368 0000E2C8 38 61 00 90 */ addi r3, r1, 0x90 /* 8001136C 0000E2CC 81 84 00 00 */ lwz r12, 0(r4) /* 80011370 0000E2D0 38 BE 00 34 */ addi r5, r30, 0x34 /* 80011374 0000E2D4 81 8C 00 14 */ lwz r12, 0x14(r12) /* 80011378 0000E2D8 7D 89 03 A6 */ mtctr r12 -/* 8001137C 0000E2DC 4E 80 04 21 */ bctrl +/* 8001137C 0000E2DC 4E 80 04 21 */ bctrl /* 80011380 0000E2E0 38 61 00 50 */ addi r3, r1, 0x50 /* 80011384 0000E2E4 38 81 00 90 */ addi r4, r1, 0x90 /* 80011388 0000E2E8 48 32 62 85 */ bl GetCenterPoint__6CAABoxCFv @@ -1819,12 +1819,12 @@ lbl_80011428: /* 8001145C 0000E3BC 81 97 00 00 */ lwz r12, 0(r23) /* 80011460 0000E3C0 81 8C 00 70 */ lwz r12, 0x70(r12) /* 80011464 0000E3C4 7D 89 03 A6 */ mtctr r12 -/* 80011468 0000E3C8 4E 80 04 21 */ bctrl +/* 80011468 0000E3C8 4E 80 04 21 */ bctrl /* 8001146C 0000E3CC 7E E3 BB 78 */ mr r3, r23 /* 80011470 0000E3D0 81 97 00 00 */ lwz r12, 0(r23) /* 80011474 0000E3D4 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 80011478 0000E3D8 7D 89 03 A6 */ mtctr r12 -/* 8001147C 0000E3DC 4E 80 04 21 */ bctrl +/* 8001147C 0000E3DC 4E 80 04 21 */ bctrl /* 80011480 0000E3E0 3C 80 80 5A */ lis r4, lbl_8059FD18@ha /* 80011484 0000E3E4 90 61 01 48 */ stw r3, 0x148(r1) /* 80011488 0000E3E8 38 04 FD 18 */ addi r0, r4, lbl_8059FD18@l @@ -2023,7 +2023,7 @@ lbl_80011718: /* 8001173C 0000E69C 80 01 0A 34 */ lwz r0, 0xa34(r1) /* 80011740 0000E6A0 7C 08 03 A6 */ mtlr r0 /* 80011744 0000E6A4 38 21 0A 30 */ addi r1, r1, 0xa30 -/* 80011748 0000E6A8 4E 80 00 20 */ blr +/* 80011748 0000E6A8 4E 80 00 20 */ blr .global __dt__17CCollidableSphere __dt__17CCollidableSphere: @@ -2051,7 +2051,7 @@ lbl_80011790: /* 80011798 0000E6F8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8001179C 0000E6FC 7C 08 03 A6 */ mtlr r0 /* 800117A0 0000E700 38 21 00 10 */ addi r1, r1, 0x10 -/* 800117A4 0000E704 4E 80 00 20 */ blr +/* 800117A4 0000E704 4E 80 00 20 */ blr .global __dt__19CCollisionPrimitiveFv __dt__19CCollisionPrimitiveFv: @@ -2073,7 +2073,7 @@ lbl_800117D8: /* 800117E0 0000E740 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800117E4 0000E744 7C 08 03 A6 */ mtlr r0 /* 800117E8 0000E748 38 21 00 10 */ addi r1, r1, 0x10 -/* 800117EC 0000E74C 4E 80 00 20 */ blr +/* 800117EC 0000E74C 4E 80 00 20 */ blr .global UpdatePhazonCameraShake__7CPlayerFfR13CStateManager UpdatePhazonCameraShake__7CPlayerFfR13CStateManager: @@ -2169,16 +2169,16 @@ lbl_80011924: /* 80011934 0000E894 83 C1 01 B8 */ lwz r30, 0x1b8(r1) /* 80011938 0000E898 7C 08 03 A6 */ mtlr r0 /* 8001193C 0000E89C 38 21 01 D0 */ addi r1, r1, 0x1d0 -/* 80011940 0000E8A0 4E 80 00 20 */ blr +/* 80011940 0000E8A0 4E 80 00 20 */ blr .global DecrementPhazon__7CPlayerFv DecrementPhazon__7CPlayerFv: /* 80011944 0000E8A4 80 83 0A 10 */ lwz r4, 0xa10(r3) /* 80011948 0000E8A8 2C 04 00 00 */ cmpwi r4, 0 -/* 8001194C 0000E8AC 4D 82 00 20 */ beqlr +/* 8001194C 0000E8AC 4D 82 00 20 */ beqlr /* 80011950 0000E8B0 38 04 FF FF */ addi r0, r4, -1 /* 80011954 0000E8B4 90 03 0A 10 */ stw r0, 0xa10(r3) -/* 80011958 0000E8B8 4E 80 00 20 */ blr +/* 80011958 0000E8B8 4E 80 00 20 */ blr .global IncrementPhazon__7CPlayerFv IncrementPhazon__7CPlayerFv: @@ -2191,7 +2191,7 @@ lbl_80011970: /* 80011970 0000E8D0 80 83 0A 10 */ lwz r4, 0xa10(r3) /* 80011974 0000E8D4 38 04 00 01 */ addi r0, r4, 1 /* 80011978 0000E8D8 90 03 0A 10 */ stw r0, 0xa10(r3) -/* 8001197C 0000E8DC 4E 80 00 20 */ blr +/* 8001197C 0000E8DC 4E 80 00 20 */ blr .global DoPreThink__7CPlayerfRC13CStateManager DoPreThink__7CPlayerfRC13CStateManager: @@ -2207,7 +2207,7 @@ DoPreThink__7CPlayerfRC13CStateManager: /* 800119A4 0000E904 81 83 00 00 */ lwz r12, 0(r3) /* 800119A8 0000E908 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800119AC 0000E90C 7D 89 03 A6 */ mtctr r12 -/* 800119B0 0000E910 4E 80 04 21 */ bctrl +/* 800119B0 0000E910 4E 80 04 21 */ bctrl /* 800119B4 0000E914 A0 1E 0A 00 */ lhz r0, 0xa00(r30) /* 800119B8 0000E918 7F E3 FB 78 */ mr r3, r31 /* 800119BC 0000E91C 38 81 00 08 */ addi r4, r1, 8 @@ -2220,7 +2220,7 @@ DoPreThink__7CPlayerfRC13CStateManager: /* 800119D8 0000E938 7F E4 FB 78 */ mr r4, r31 /* 800119DC 0000E93C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800119E0 0000E940 7D 89 03 A6 */ mtctr r12 -/* 800119E4 0000E944 4E 80 04 21 */ bctrl +/* 800119E4 0000E944 4E 80 04 21 */ bctrl lbl_800119E8: /* 800119E8 0000E948 80 01 00 24 */ lwz r0, 0x24(r1) /* 800119EC 0000E94C CB E1 00 18 */ lfd f31, 0x18(r1) @@ -2228,7 +2228,7 @@ lbl_800119E8: /* 800119F4 0000E954 83 C1 00 10 */ lwz r30, 0x10(r1) /* 800119F8 0000E958 7C 08 03 A6 */ mtlr r0 /* 800119FC 0000E95C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80011A00 0000E960 4E 80 00 20 */ blr +/* 80011A00 0000E960 4E 80 00 20 */ blr .global DoThink__7CPlayerFfRC13CStateManager DoThink__7CPlayerFfRC13CStateManager: @@ -2244,7 +2244,7 @@ DoThink__7CPlayerFfRC13CStateManager: /* 80011A28 0000E988 81 83 00 00 */ lwz r12, 0(r3) /* 80011A2C 0000E98C 81 8C 00 14 */ lwz r12, 0x14(r12) /* 80011A30 0000E990 7D 89 03 A6 */ mtctr r12 -/* 80011A34 0000E994 4E 80 04 21 */ bctrl +/* 80011A34 0000E994 4E 80 04 21 */ bctrl /* 80011A38 0000E998 A0 1E 0A 00 */ lhz r0, 0xa00(r30) /* 80011A3C 0000E99C 7F E3 FB 78 */ mr r3, r31 /* 80011A40 0000E9A0 38 81 00 08 */ addi r4, r1, 8 @@ -2257,7 +2257,7 @@ DoThink__7CPlayerFfRC13CStateManager: /* 80011A5C 0000E9BC 7F E4 FB 78 */ mr r4, r31 /* 80011A60 0000E9C0 81 8C 00 14 */ lwz r12, 0x14(r12) /* 80011A64 0000E9C4 7D 89 03 A6 */ mtctr r12 -/* 80011A68 0000E9C8 4E 80 04 21 */ bctrl +/* 80011A68 0000E9C8 4E 80 04 21 */ bctrl lbl_80011A6C: /* 80011A6C 0000E9CC 80 01 00 24 */ lwz r0, 0x24(r1) /* 80011A70 0000E9D0 CB E1 00 18 */ lfd f31, 0x18(r1) @@ -2265,7 +2265,7 @@ lbl_80011A6C: /* 80011A78 0000E9D8 83 C1 00 10 */ lwz r30, 0x10(r1) /* 80011A7C 0000E9DC 7C 08 03 A6 */ mtlr r0 /* 80011A80 0000E9E0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80011A84 0000E9E4 4E 80 00 20 */ blr +/* 80011A84 0000E9E4 4E 80 00 20 */ blr .global ResetControlDirectionInterpolation__7CPlayerFv ResetControlDirectionInterpolation__7CPlayerFv: @@ -2275,7 +2275,7 @@ ResetControlDirectionInterpolation__7CPlayerFv: /* 80011A94 0000E9F4 C0 02 81 0C */ lfs f0, lbl_805A9E2C@sda21(r2) /* 80011A98 0000E9F8 98 03 09 C6 */ stb r0, 0x9c6(r3) /* 80011A9C 0000E9FC D0 03 09 F8 */ stfs f0, 0x9f8(r3) -/* 80011AA0 0000EA00 4E 80 00 20 */ blr +/* 80011AA0 0000EA00 4E 80 00 20 */ blr .global SetControlDirectionInterpolation__7CPlayerFf SetControlDirectionInterpolation__7CPlayerFf: @@ -2286,7 +2286,7 @@ SetControlDirectionInterpolation__7CPlayerFf: /* 80011AB4 0000EA14 98 03 09 C6 */ stb r0, 0x9c6(r3) /* 80011AB8 0000EA18 D0 03 09 F8 */ stfs f0, 0x9f8(r3) /* 80011ABC 0000EA1C D0 23 09 FC */ stfs f1, 0x9fc(r3) -/* 80011AC0 0000EA20 4E 80 00 20 */ blr +/* 80011AC0 0000EA20 4E 80 00 20 */ blr .global IsPlayerDeadEnough__7CPlayerCFv IsPlayerDeadEnough__7CPlayerCFv: @@ -2307,20 +2307,20 @@ lbl_80011AEC: /* 80011AF4 0000EA54 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80011AF8 0000EA58 7C 00 00 26 */ mfcr r0 /* 80011AFC 0000EA5C 54 03 17 FE */ rlwinm r3, r0, 2, 0x1f, 0x1f -/* 80011B00 0000EA60 4E 80 00 20 */ blr +/* 80011B00 0000EA60 4E 80 00 20 */ blr lbl_80011B04: /* 80011B04 0000EA64 C0 23 09 F4 */ lfs f1, 0x9f4(r3) /* 80011B08 0000EA68 C0 02 81 3C */ lfs f0, lbl_805A9E5C@sda21(r2) /* 80011B0C 0000EA6C FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80011B10 0000EA70 7C 00 00 26 */ mfcr r0 /* 80011B14 0000EA74 54 03 17 FE */ rlwinm r3, r0, 2, 0x1f, 0x1f -/* 80011B18 0000EA78 4E 80 00 20 */ blr +/* 80011B18 0000EA78 4E 80 00 20 */ blr lbl_80011B1C: /* 80011B1C 0000EA7C 38 60 00 00 */ li r3, 0 -/* 80011B20 0000EA80 4E 80 00 20 */ blr +/* 80011B20 0000EA80 4E 80 00 20 */ blr lbl_80011B24: /* 80011B24 0000EA84 38 60 00 00 */ li r3, 0 -/* 80011B28 0000EA88 4E 80 00 20 */ blr +/* 80011B28 0000EA88 4E 80 00 20 */ blr .global AsyncLoadSuit__7CPlayerFR13CStateManager AsyncLoadSuit__7CPlayerFR13CStateManager: @@ -2332,7 +2332,7 @@ AsyncLoadSuit__7CPlayerFR13CStateManager: /* 80011B40 0000EAA0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80011B44 0000EAA4 7C 08 03 A6 */ mtlr r0 /* 80011B48 0000EAA8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80011B4C 0000EAAC 4E 80 00 20 */ blr +/* 80011B4C 0000EAAC 4E 80 00 20 */ blr .global LoadAnimationTokens__7CPlayerFv LoadAnimationTokens__7CPlayerFv: @@ -2351,7 +2351,7 @@ LoadAnimationTokens__7CPlayerFv: /* 80011B80 0000EAE0 81 84 00 00 */ lwz r12, 0(r4) /* 80011B84 0000EAE4 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80011B88 0000EAE8 7D 89 03 A6 */ mtctr r12 -/* 80011B8C 0000EAEC 4E 80 04 21 */ bctrl +/* 80011B8C 0000EAEC 4E 80 04 21 */ bctrl /* 80011B90 0000EAF0 3B C1 00 20 */ addi r30, r1, 0x20 /* 80011B94 0000EAF4 38 81 00 10 */ addi r4, r1, 0x10 /* 80011B98 0000EAF8 7F C3 F3 78 */ mr r3, r30 @@ -2386,7 +2386,7 @@ lbl_80011BD4: /* 80011C08 0000EB68 81 84 00 00 */ lwz r12, 0(r4) /* 80011C0C 0000EB6C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80011C10 0000EB70 7D 89 03 A6 */ mtctr r12 -/* 80011C14 0000EB74 4E 80 04 21 */ bctrl +/* 80011C14 0000EB74 4E 80 04 21 */ bctrl /* 80011C18 0000EB78 38 61 00 18 */ addi r3, r1, 0x18 /* 80011C1C 0000EB7C 38 81 00 08 */ addi r4, r1, 8 /* 80011C20 0000EB80 48 32 F2 89 */ bl __ct__6CTokenFRC6CToken @@ -2442,28 +2442,28 @@ lbl_80011C98: .global sub_80011cd4 sub_80011cd4: -/* 80011CD4 0000EC34 4E 80 00 20 */ blr +/* 80011CD4 0000EC34 4E 80 00 20 */ blr .global HasTransitionBeamModel__7CPlayerCFv HasTransitionBeamModel__7CPlayerCFv: /* 80011CD8 0000EC38 80 83 07 F0 */ lwz r4, 0x7f0(r3) /* 80011CDC 0000EC3C 38 60 00 00 */ li r3, 0 /* 80011CE0 0000EC40 28 04 00 00 */ cmplwi r4, 0 -/* 80011CE4 0000EC44 4D 82 00 20 */ beqlr +/* 80011CE4 0000EC44 4D 82 00 20 */ beqlr /* 80011CE8 0000EC48 80 04 00 10 */ lwz r0, 0x10(r4) /* 80011CEC 0000EC4C 28 00 00 00 */ cmplwi r0, 0 /* 80011CF0 0000EC50 40 82 00 10 */ bne lbl_80011D00 /* 80011CF4 0000EC54 88 04 00 28 */ lbz r0, 0x28(r4) /* 80011CF8 0000EC58 28 00 00 00 */ cmplwi r0, 0 -/* 80011CFC 0000EC5C 4D 82 00 20 */ beqlr +/* 80011CFC 0000EC5C 4D 82 00 20 */ beqlr lbl_80011D00: /* 80011D00 0000EC60 38 60 00 01 */ li r3, 1 -/* 80011D04 0000EC64 4E 80 00 20 */ blr +/* 80011D04 0000EC64 4E 80 00 20 */ blr .global CanRenderUnsorted__7CPlayerCFRC13CStateManager CanRenderUnsorted__7CPlayerCFRC13CStateManager: /* 80011D08 0000EC68 38 60 00 00 */ li r3, 0 -/* 80011D0C 0000EC6C 4E 80 00 20 */ blr +/* 80011D0C 0000EC6C 4E 80 00 20 */ blr .global GetDamageVulnerability__7CPlayerCFRC9CVector3fRC9CVector3fRC11CDamageInfo GetDamageVulnerability__7CPlayerCFRC9CVector3fRC9CVector3fRC11CDamageInfo: @@ -2479,11 +2479,11 @@ GetDamageVulnerability__7CPlayerCFRC9CVector3fRC9CVector3fRC11CDamageInfo: /* 80011D34 0000EC94 40 82 00 10 */ bne lbl_80011D44 /* 80011D38 0000EC98 3C 60 80 57 */ lis r3, lbl_8056D718@ha /* 80011D3C 0000EC9C 38 63 D7 18 */ addi r3, r3, lbl_8056D718@l -/* 80011D40 0000ECA0 4E 80 00 20 */ blr +/* 80011D40 0000ECA0 4E 80 00 20 */ blr lbl_80011D44: /* 80011D44 0000ECA4 3C 60 80 57 */ lis r3, lbl_8056D578@ha /* 80011D48 0000ECA8 38 63 D5 78 */ addi r3, r3, lbl_8056D578@l -/* 80011D4C 0000ECAC 4E 80 00 20 */ blr +/* 80011D4C 0000ECAC 4E 80 00 20 */ blr .global GetDamageVulnerability__7CPlayerCFv GetDamageVulnerability__7CPlayerCFv: @@ -2519,11 +2519,11 @@ GetDamageVulnerability__7CPlayerCFv: /* 80011DC4 0000ED24 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 80011DC8 0000ED28 98 E1 00 0C */ stb r7, 0xc(r1) /* 80011DCC 0000ED2C 7D 89 03 A6 */ mtctr r12 -/* 80011DD0 0000ED30 4E 80 04 21 */ bctrl +/* 80011DD0 0000ED30 4E 80 04 21 */ bctrl /* 80011DD4 0000ED34 80 01 00 34 */ lwz r0, 0x34(r1) /* 80011DD8 0000ED38 7C 08 03 A6 */ mtlr r0 /* 80011DDC 0000ED3C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80011DE0 0000ED40 4E 80 00 20 */ blr +/* 80011DE0 0000ED40 4E 80 00 20 */ blr .global GetHomingPosition__7CPlayerCFRC13CStateManagerf GetHomingPosition__7CPlayerCFRC13CStateManagerf: @@ -2565,7 +2565,7 @@ lbl_80011E60: /* 80011E68 0000EDC8 83 C1 00 48 */ lwz r30, 0x48(r1) /* 80011E6C 0000EDCC 7C 08 03 A6 */ mtlr r0 /* 80011E70 0000EDD0 38 21 00 50 */ addi r1, r1, 0x50 -/* 80011E74 0000EDD4 4E 80 00 20 */ blr +/* 80011E74 0000EDD4 4E 80 00 20 */ blr .global GetAimPosition__7CPlayerCFRC13CStateManagerf GetAimPosition__7CPlayerCFRC13CStateManagerf: @@ -2646,7 +2646,7 @@ lbl_80011F64: /* 80011F90 0000EEF0 83 C1 00 68 */ lwz r30, 0x68(r1) /* 80011F94 0000EEF4 7C 08 03 A6 */ mtlr r0 /* 80011F98 0000EEF8 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 80011F9C 0000EEFC 4E 80 00 20 */ blr +/* 80011F9C 0000EEFC 4E 80 00 20 */ blr .global ObjectInScanningRange__7CPlayerF9TUniqueIdRC13CStateManager ObjectInScanningRange__7CPlayerF9TUniqueIdRC13CStateManager: @@ -2701,7 +2701,7 @@ lbl_8001204C: /* 80012058 0000EFB8 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8001205C 0000EFBC 7C 08 03 A6 */ mtlr r0 /* 80012060 0000EFC0 38 21 00 40 */ addi r1, r1, 0x40 -/* 80012064 0000EFC4 4E 80 00 20 */ blr +/* 80012064 0000EFC4 4E 80 00 20 */ blr .global FluidFXThink__7CPlayerFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager FluidFXThink__7CPlayerFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager: @@ -2964,7 +2964,7 @@ lbl_800123B0: /* 80012444 0000F3A4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80012448 0000F3A8 B0 01 00 10 */ sth r0, 0x10(r1) /* 8001244C 0000F3AC 7D 89 03 A6 */ mtctr r12 -/* 80012450 0000F3B0 4E 80 04 21 */ bctrl +/* 80012450 0000F3B0 4E 80 04 21 */ bctrl /* 80012454 0000F3B4 48 00 00 74 */ b lbl_800124C8 lbl_80012458: /* 80012458 0000F3B8 7F A4 EB 78 */ mr r4, r29 @@ -3014,7 +3014,7 @@ lbl_800124C8: .global sub_80012504 sub_80012504: -/* 80012504 0000F464 4E 80 00 20 */ blr +/* 80012504 0000F464 4E 80 00 20 */ blr .global GetDamageLocationWR__7CPlayerCFv GetDamageLocationWR__7CPlayerCFv: @@ -3024,22 +3024,22 @@ GetDamageLocationWR__7CPlayerCFv: /* 80012514 0000F474 D0 03 00 04 */ stfs f0, 4(r3) /* 80012518 0000F478 C0 04 05 6C */ lfs f0, 0x56c(r4) /* 8001251C 0000F47C D0 03 00 08 */ stfs f0, 8(r3) -/* 80012520 0000F480 4E 80 00 20 */ blr +/* 80012520 0000F480 4E 80 00 20 */ blr .global GetPrevDamageAmount__7CPlayerCFv GetPrevDamageAmount__7CPlayerCFv: /* 80012524 0000F484 C0 23 05 60 */ lfs f1, 0x560(r3) -/* 80012528 0000F488 4E 80 00 20 */ blr +/* 80012528 0000F488 4E 80 00 20 */ blr .global GetDamageAmount__7CPlayerCFv GetDamageAmount__7CPlayerCFv: /* 8001252C 0000F48C C0 23 05 5C */ lfs f1, 0x55c(r3) -/* 80012530 0000F490 4E 80 00 20 */ blr +/* 80012530 0000F490 4E 80 00 20 */ blr .global WasDamaged__7CPlayerCFv WasDamaged__7CPlayerCFv: /* 80012534 0000F494 88 63 05 58 */ lbz r3, 0x558(r3) -/* 80012538 0000F498 4E 80 00 20 */ blr +/* 80012538 0000F498 4E 80 00 20 */ blr .global TakeDamage__7CPlayerFbRC9CVector3ff11EWeaponTypeR13CStateManager TakeDamage__7CPlayerFbRC9CVector3ff11EWeaponTypeR13CStateManager: @@ -3098,7 +3098,7 @@ lbl_800125B8: /* 80012600 0000F560 38 63 97 70 */ addi r3, r3, lbl_803D9770@l /* 80012604 0000F564 7C 03 00 2E */ lwzx r0, r3, r0 /* 80012608 0000F568 7C 09 03 A6 */ mtctr r0 -/* 8001260C 0000F56C 4E 80 04 20 */ bctr +/* 8001260C 0000F56C 4E 80 04 20 */ bctr .global lbl_80012610 lbl_80012610: /* 80012610 0000F570 3B C0 0C 2A */ li r30, 0xc2a @@ -3297,7 +3297,7 @@ lbl_8001289C: /* 800128A8 0000F808 80 01 00 54 */ lwz r0, 0x54(r1) /* 800128AC 0000F80C 7C 08 03 A6 */ mtlr r0 /* 800128B0 0000F810 38 21 00 50 */ addi r1, r1, 0x50 -/* 800128B4 0000F814 4E 80 00 20 */ blr +/* 800128B4 0000F814 4E 80 00 20 */ blr .global Accept__7CPlayerFR8IVisitor Accept__7CPlayerFR8IVisitor: @@ -3310,18 +3310,18 @@ Accept__7CPlayerFR8IVisitor: /* 800128D0 0000F830 7C 04 03 78 */ mr r4, r0 /* 800128D4 0000F834 81 8C 00 54 */ lwz r12, 0x54(r12) /* 800128D8 0000F838 7D 89 03 A6 */ mtctr r12 -/* 800128DC 0000F83C 4E 80 04 21 */ bctrl +/* 800128DC 0000F83C 4E 80 04 21 */ bctrl /* 800128E0 0000F840 80 01 00 14 */ lwz r0, 0x14(r1) /* 800128E4 0000F844 7C 08 03 A6 */ mtlr r0 /* 800128E8 0000F848 38 21 00 10 */ addi r1, r1, 0x10 -/* 800128EC 0000F84C 4E 80 00 20 */ blr +/* 800128EC 0000F84C 4E 80 00 20 */ blr .global HealthInfo__7CPlayerFR13CStateManager HealthInfo__7CPlayerFR13CStateManager: /* 800128F0 0000F850 80 64 08 B8 */ lwz r3, 0x8b8(r4) /* 800128F4 0000F854 80 63 00 00 */ lwz r3, 0(r3) /* 800128F8 0000F858 38 63 00 0C */ addi r3, r3, 0xc -/* 800128FC 0000F85C 4E 80 00 20 */ blr +/* 800128FC 0000F85C 4E 80 00 20 */ blr .global GetTransitionAlpha__7CPlayerCFRC9CVector3ff GetTransitionAlpha__7CPlayerCFRC9CVector3ff: @@ -3383,7 +3383,7 @@ lbl_800129BC: /* 800129D4 0000F934 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 800129D8 0000F938 7C 08 03 A6 */ mtlr r0 /* 800129DC 0000F93C 38 21 00 50 */ addi r1, r1, 0x50 -/* 800129E0 0000F940 4E 80 00 20 */ blr +/* 800129E0 0000F940 4E 80 00 20 */ blr .global IsUnderBetaMetroidAttack__7CPlayerCFR13CStateManager IsUnderBetaMetroidAttack__7CPlayerCFR13CStateManager: @@ -3435,7 +3435,7 @@ lbl_80012A78: /* 80012A84 0000F9E4 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80012A88 0000F9E8 7C 08 03 A6 */ mtlr r0 /* 80012A8C 0000F9EC 38 21 00 30 */ addi r1, r1, 0x30 -/* 80012A90 0000F9F0 4E 80 00 20 */ blr +/* 80012A90 0000F9F0 4E 80 00 20 */ blr .global CanLeaveMorphBallState__7CPlayerCFR13CStateManagerR9CVector3f CanLeaveMorphBallState__7CPlayerCFR13CStateManagerR9CVector3f: @@ -3711,7 +3711,7 @@ lbl_80012E6C: /* 80012E90 0000FDF0 80 01 09 84 */ lwz r0, 0x984(r1) /* 80012E94 0000FDF4 7C 08 03 A6 */ mtlr r0 /* 80012E98 0000FDF8 38 21 09 80 */ addi r1, r1, 0x980 -/* 80012E9C 0000FDFC 4E 80 00 20 */ blr +/* 80012E9C 0000FDFC 4E 80 00 20 */ blr .global __dt__16CCollidableAABoxFv __dt__16CCollidableAABoxFv: @@ -3739,7 +3739,7 @@ lbl_80012EE4: /* 80012EEC 0000FE4C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80012EF0 0000FE50 7C 08 03 A6 */ mtlr r0 /* 80012EF4 0000FE54 38 21 00 10 */ addi r1, r1, 0x10 -/* 80012EF8 0000FE58 4E 80 00 20 */ blr +/* 80012EF8 0000FE58 4E 80 00 20 */ blr .global CanEnterMorphBallState__7CPlayerCFR13CStateManagerf CanEnterMorphBallState__7CPlayerCFR13CStateManagerf: @@ -3850,7 +3850,7 @@ lbl_80013058: /* 8001305C 0000FFBC 83 E1 08 1C */ lwz r31, 0x81c(r1) /* 80013060 0000FFC0 7C 08 03 A6 */ mtlr r0 /* 80013064 0000FFC4 38 21 08 20 */ addi r1, r1, 0x820 -/* 80013068 0000FFC8 4E 80 00 20 */ blr +/* 80013068 0000FFC8 4E 80 00 20 */ blr .global SetHudDisable__7CPlayerFfff SetHudDisable__7CPlayerFfff: @@ -3860,16 +3860,16 @@ SetHudDisable__7CPlayerFfff: /* 80013078 0000FFD8 D0 63 07 48 */ stfs f3, 0x748(r3) /* 8001307C 0000FFDC C0 03 07 44 */ lfs f0, 0x744(r3) /* 80013080 0000FFE0 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 80013084 0000FFE4 4C 82 00 20 */ bnelr +/* 80013084 0000FFE4 4C 82 00 20 */ bnelr /* 80013088 0000FFE8 C0 03 07 40 */ lfs f0, 0x740(r3) /* 8001308C 0000FFEC FC 01 00 00 */ fcmpu cr0, f1, f0 /* 80013090 0000FFF0 40 82 00 10 */ bne lbl_800130A0 /* 80013094 0000FFF4 C0 02 81 00 */ lfs f0, lbl_805A9E20@sda21(r2) /* 80013098 0000FFF8 D0 03 07 4C */ stfs f0, 0x74c(r3) -/* 8001309C 0000FFFC 4E 80 00 20 */ blr +/* 8001309C 0000FFFC 4E 80 00 20 */ blr lbl_800130A0: /* 800130A0 00010000 D0 23 07 4C */ stfs f1, 0x74c(r3) -/* 800130A4 00010004 4E 80 00 20 */ blr +/* 800130A4 00010004 4E 80 00 20 */ blr .global GetTouchBounds__7CPlayerCFv GetTouchBounds__7CPlayerCFv: @@ -3962,7 +3962,7 @@ lbl_800131E0: /* 800131F8 00010158 83 C1 00 58 */ lwz r30, 0x58(r1) /* 800131FC 0001015C 7C 08 03 A6 */ mtlr r0 /* 80013200 00010160 38 21 00 80 */ addi r1, r1, 0x80 -/* 80013204 00010164 4E 80 00 20 */ blr +/* 80013204 00010164 4E 80 00 20 */ blr .global Touch__7CPlayerFR6CActorR13CStateManager Touch__7CPlayerFR6CActorR13CStateManager: @@ -3978,7 +3978,7 @@ lbl_80013228: /* 80013228 00010188 80 01 00 14 */ lwz r0, 0x14(r1) /* 8001322C 0001018C 7C 08 03 A6 */ mtlr r0 /* 80013230 00010190 38 21 00 10 */ addi r1, r1, 0x10 -/* 80013234 00010194 4E 80 00 20 */ blr +/* 80013234 00010194 4E 80 00 20 */ blr .global UpdateScanningState__7CPlayerFRC11CFinalInputR13CStateManagerf UpdateScanningState__7CPlayerFRC11CFinalInputR13CStateManagerf: @@ -4173,7 +4173,7 @@ lbl_800134E0: /* 800134F4 00010454 83 A1 00 34 */ lwz r29, 0x34(r1) /* 800134F8 00010458 7C 08 03 A6 */ mtlr r0 /* 800134FC 0001045C 38 21 00 50 */ addi r1, r1, 0x50 -/* 80013500 00010460 4E 80 00 20 */ blr +/* 80013500 00010460 4E 80 00 20 */ blr .global ValidateScanning__7CPlayerFRC11CFinalInputR13CStateManager ValidateScanning__7CPlayerFRC11CFinalInputR13CStateManager: @@ -4249,7 +4249,7 @@ lbl_80013600: /* 80013610 00010570 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80013614 00010574 7C 08 03 A6 */ mtlr r0 /* 80013618 00010578 38 21 00 40 */ addi r1, r1, 0x40 -/* 8001361C 0001057C 4E 80 00 20 */ blr +/* 8001361C 0001057C 4E 80 00 20 */ blr .global SetScanningState__7CPlayerFQ27CPlayer16EPlayerScanStateR13CStateManager SetScanningState__7CPlayerFQ27CPlayer16EPlayerScanStateR13CStateManager: @@ -4288,7 +4288,7 @@ SetScanningState__7CPlayerFQ27CPlayer16EPlayerScanStateR13CStateManager: /* 800136A0 00010600 38 80 00 02 */ li r4, 2 /* 800136A4 00010604 81 8C 00 60 */ lwz r12, 0x60(r12) /* 800136A8 00010608 7D 89 03 A6 */ mtctr r12 -/* 800136AC 0001060C 4E 80 04 21 */ bctrl +/* 800136AC 0001060C 4E 80 04 21 */ bctrl lbl_800136B0: /* 800136B0 00010610 2C 1E 00 01 */ cmpwi r30, 1 /* 800136B4 00010614 41 82 01 08 */ beq lbl_800137BC @@ -4387,7 +4387,7 @@ lbl_800137F0: /* 80013800 00010760 83 81 00 30 */ lwz r28, 0x30(r1) /* 80013804 00010764 7C 08 03 A6 */ mtlr r0 /* 80013808 00010768 38 21 00 40 */ addi r1, r1, 0x40 -/* 8001380C 0001076C 4E 80 00 20 */ blr +/* 8001380C 0001076C 4E 80 00 20 */ blr .global GetExplorationMode__7CPlayerCFv GetExplorationMode__7CPlayerCFv: @@ -4401,13 +4401,13 @@ GetExplorationMode__7CPlayerCFv: /* 8001382C 0001078C 48 00 00 14 */ b lbl_80013840 lbl_80013830: /* 80013830 00010790 38 60 00 00 */ li r3, 0 -/* 80013834 00010794 4E 80 00 20 */ blr +/* 80013834 00010794 4E 80 00 20 */ blr lbl_80013838: /* 80013838 00010798 38 60 00 01 */ li r3, 1 -/* 8001383C 0001079C 4E 80 00 20 */ blr +/* 8001383C 0001079C 4E 80 00 20 */ blr lbl_80013840: /* 80013840 000107A0 38 60 00 00 */ li r3, 0 -/* 80013844 000107A4 4E 80 00 20 */ blr +/* 80013844 000107A4 4E 80 00 20 */ blr .global GetCombatMode__7CPlayerCFv GetCombatMode__7CPlayerCFv: @@ -4421,13 +4421,13 @@ GetCombatMode__7CPlayerCFv: /* 80013864 000107C4 48 00 00 14 */ b lbl_80013878 lbl_80013868: /* 80013868 000107C8 38 60 00 01 */ li r3, 1 -/* 8001386C 000107CC 4E 80 00 20 */ blr +/* 8001386C 000107CC 4E 80 00 20 */ blr lbl_80013870: /* 80013870 000107D0 38 60 00 00 */ li r3, 0 -/* 80013874 000107D4 4E 80 00 20 */ blr +/* 80013874 000107D4 4E 80 00 20 */ blr lbl_80013878: /* 80013878 000107D8 38 60 00 00 */ li r3, 0 -/* 8001387C 000107DC 4E 80 00 20 */ blr +/* 8001387C 000107DC 4E 80 00 20 */ blr .global RenderGun__7CPlayerCFRC13CStateManagerRC9CVector3f RenderGun__7CPlayerCFRC13CStateManagerRC9CVector3f: @@ -4519,7 +4519,7 @@ lbl_800139B0: /* 800139C0 00010920 83 81 00 10 */ lwz r28, 0x10(r1) /* 800139C4 00010924 7C 08 03 A6 */ mtlr r0 /* 800139C8 00010928 38 21 00 20 */ addi r1, r1, 0x20 -/* 800139CC 0001092C 4E 80 00 20 */ blr +/* 800139CC 0001092C 4E 80 00 20 */ blr .global Render__7CPlayerCFRC13CStateManager Render__7CPlayerCFRC13CStateManager: @@ -4996,7 +4996,7 @@ lbl_8001409C: /* 800140C8 00011028 80 01 02 A4 */ lwz r0, 0x2a4(r1) /* 800140CC 0001102C 7C 08 03 A6 */ mtlr r0 /* 800140D0 00011030 38 21 02 A0 */ addi r1, r1, 0x2a0 -/* 800140D4 00011034 4E 80 00 20 */ blr +/* 800140D4 00011034 4E 80 00 20 */ blr .global "GetEntry__34TReservedAverage<12CTransform4f,4>CFi" "GetEntry__34TReservedAverage<12CTransform4f,4>CFi": @@ -5025,7 +5025,7 @@ lbl_80014124: /* 80014128 00011088 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8001412C 0001108C 7C 08 03 A6 */ mtlr r0 /* 80014130 00011090 38 21 00 10 */ addi r1, r1, 0x10 -/* 80014134 00011094 4E 80 00 20 */ blr +/* 80014134 00011094 4E 80 00 20 */ blr .global "GetEntry__21TReservedAverageCFi" "GetEntry__21TReservedAverageCFi": @@ -5034,17 +5034,17 @@ lbl_80014124: /* 80014140 000110A0 41 80 00 10 */ blt lbl_80014150 /* 80014144 000110A4 38 00 00 00 */ li r0, 0 /* 80014148 000110A8 98 03 00 04 */ stb r0, 4(r3) -/* 8001414C 000110AC 4E 80 00 20 */ blr +/* 8001414C 000110AC 4E 80 00 20 */ blr lbl_80014150: /* 80014150 000110B0 38 00 00 01 */ li r0, 1 /* 80014154 000110B4 28 03 00 00 */ cmplwi r3, 0 /* 80014158 000110B8 54 A5 10 3A */ slwi r5, r5, 2 /* 8001415C 000110BC 98 03 00 04 */ stb r0, 4(r3) /* 80014160 000110C0 7C 84 2A 14 */ add r4, r4, r5 -/* 80014164 000110C4 4D 82 00 20 */ beqlr +/* 80014164 000110C4 4D 82 00 20 */ beqlr /* 80014168 000110C8 C0 04 00 04 */ lfs f0, 4(r4) /* 8001416C 000110CC D0 03 00 00 */ stfs f0, 0(r3) -/* 80014170 000110D0 4E 80 00 20 */ blr +/* 80014170 000110D0 4E 80 00 20 */ blr .global RenderReflectedPlayer__7CPlayerFR13CStateManager RenderReflectedPlayer__7CPlayerFR13CStateManager: @@ -5139,7 +5139,7 @@ lbl_800142A0: /* 800142B0 00011210 83 C1 00 78 */ lwz r30, 0x78(r1) /* 800142B4 00011214 7C 08 03 A6 */ mtlr r0 /* 800142B8 00011218 38 21 00 80 */ addi r1, r1, 0x80 -/* 800142BC 0001121C 4E 80 00 20 */ blr +/* 800142BC 0001121C 4E 80 00 20 */ blr .global PreRender__7CPlayerFR13CStateManagerRC14CFrustumPlanes PreRender__7CPlayerFR13CStateManagerRC14CFrustumPlanes: @@ -5222,7 +5222,7 @@ lbl_800143CC: /* 800143D0 00011330 80 01 00 34 */ lwz r0, 0x34(r1) /* 800143D4 00011334 7C 08 03 A6 */ mtlr r0 /* 800143D8 00011338 38 21 00 30 */ addi r1, r1, 0x30 -/* 800143DC 0001133C 4E 80 00 20 */ blr +/* 800143DC 0001133C 4E 80 00 20 */ blr .global CalculateRenderBounds__7CPlayerFv CalculateRenderBounds__7CPlayerFv: @@ -5275,7 +5275,7 @@ lbl_8001448C: /* 80014490 000113F0 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 80014494 000113F4 7C 08 03 A6 */ mtlr r0 /* 80014498 000113F8 38 21 00 40 */ addi r1, r1, 0x40 -/* 8001449C 000113FC 4E 80 00 20 */ blr +/* 8001449C 000113FC 4E 80 00 20 */ blr .global AddToRenderer__7CPlayerCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__7CPlayerCFRC14CFrustumPlanesRC13CStateManager: @@ -5324,7 +5324,7 @@ lbl_80014530: /* 8001453C 0001149C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80014540 000114A0 7C 08 03 A6 */ mtlr r0 /* 80014544 000114A4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80014548 000114A8 4E 80 00 20 */ blr +/* 80014548 000114A8 4E 80 00 20 */ blr .global UpdateGunAlpha__7CPlayerFRC13CStateManager UpdateGunAlpha__7CPlayerFRC13CStateManager: @@ -5384,7 +5384,7 @@ lbl_80014604: /* 80014608 00011568 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8001460C 0001156C 7C 08 03 A6 */ mtlr r0 /* 80014610 00011570 38 21 00 20 */ addi r1, r1, 0x20 -/* 80014614 00011574 4E 80 00 20 */ blr +/* 80014614 00011574 4E 80 00 20 */ blr .global ComputeFreeLook__7CPlayerFRC11CFinalInput ComputeFreeLook__7CPlayerFRC11CFinalInput: @@ -5527,7 +5527,7 @@ lbl_800147E8: /* 80014810 00011770 83 C1 00 08 */ lwz r30, 8(r1) /* 80014814 00011774 7C 08 03 A6 */ mtlr r0 /* 80014818 00011778 38 21 00 50 */ addi r1, r1, 0x50 -/* 8001481C 0001177C 4E 80 00 20 */ blr +/* 8001481C 0001177C 4E 80 00 20 */ blr .global UpdateFreeLook__7CPlayerFf UpdateFreeLook__7CPlayerFf: @@ -5633,7 +5633,7 @@ lbl_80014978: /* 80014994 000118F4 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80014998 000118F8 7C 08 03 A6 */ mtlr r0 /* 8001499C 000118FC 38 21 00 50 */ addi r1, r1, 0x50 -/* 800149A0 00011900 4E 80 00 20 */ blr +/* 800149A0 00011900 4E 80 00 20 */ blr .global DetachActorFromPlayer__7CPlayerFv DetachActorFromPlayer__7CPlayerFv: @@ -5647,7 +5647,7 @@ DetachActorFromPlayer__7CPlayerFv: /* 800149C0 00011920 88 03 08 35 */ lbz r0, 0x835(r3) /* 800149C4 00011924 50 80 07 FE */ rlwimi r0, r4, 0, 0x1f, 0x1f /* 800149C8 00011928 98 03 08 35 */ stb r0, 0x835(r3) -/* 800149CC 0001192C 4E 80 00 20 */ blr +/* 800149CC 0001192C 4E 80 00 20 */ blr .global AttachActorToPlayer__7CPlayerF9TUniqueId AttachActorToPlayer__7CPlayerF9TUniqueId: @@ -5681,7 +5681,7 @@ lbl_80014A30: /* 80014A30 00011990 80 01 00 14 */ lwz r0, 0x14(r1) /* 80014A34 00011994 7C 08 03 A6 */ mtlr r0 /* 80014A38 00011998 38 21 00 10 */ addi r1, r1, 0x10 -/* 80014A3C 0001199C 4E 80 00 20 */ blr +/* 80014A3C 0001199C 4E 80 00 20 */ blr .global CalculateLeftStickEdgePosition__7CPlayerCFff CalculateLeftStickEdgePosition__7CPlayerCFff: @@ -5751,7 +5751,7 @@ lbl_80014AE4: /* 80014B30 00011A90 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80014B34 00011A94 7C 08 03 A6 */ mtlr r0 /* 80014B38 00011A98 38 21 00 40 */ addi r1, r1, 0x40 -/* 80014B3C 00011A9C 4E 80 00 20 */ blr +/* 80014B3C 00011A9C 4E 80 00 20 */ blr .global GetMaximumPlayerPositiveVerticalVelocity__7CPlayerCFRC13CStateManager GetMaximumPlayerPositiveVerticalVelocity__7CPlayerCFRC13CStateManager: @@ -5772,7 +5772,7 @@ lbl_80014B70: /* 80014B70 00011AD0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80014B74 00011AD4 7C 08 03 A6 */ mtlr r0 /* 80014B78 00011AD8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80014B7C 00011ADC 4E 80 00 20 */ blr +/* 80014B7C 00011ADC 4E 80 00 20 */ blr .global UpdateMorphBallState__7CPlayerFfRC11CFinalInputR13CStateManager UpdateMorphBallState__7CPlayerFfRC11CFinalInputR13CStateManager: @@ -5899,7 +5899,7 @@ lbl_80014D3C: /* 80014D4C 00011CAC 83 C1 00 38 */ lwz r30, 0x38(r1) /* 80014D50 00011CB0 7C 08 03 A6 */ mtlr r0 /* 80014D54 00011CB4 38 21 00 50 */ addi r1, r1, 0x50 -/* 80014D58 00011CB8 4E 80 00 20 */ blr +/* 80014D58 00011CB8 4E 80 00 20 */ blr .global ProcessInput__7CPlayerFRC11CFinalInputR13CStateManager ProcessInput__7CPlayerFRC11CFinalInputR13CStateManager: @@ -5999,17 +5999,17 @@ lbl_80014E9C: /* 80014EBC 00011E1C 81 9D 00 00 */ lwz r12, 0(r29) /* 80014EC0 00011E20 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 80014EC4 00011E24 7D 89 03 A6 */ mtctr r12 -/* 80014EC8 00011E28 4E 80 04 21 */ bctrl +/* 80014EC8 00011E28 4E 80 04 21 */ bctrl /* 80014ECC 00011E2C 3B 43 00 10 */ addi r26, r3, 0x10 /* 80014ED0 00011E30 7F A3 EB 78 */ mr r3, r29 /* 80014ED4 00011E34 81 9D 00 00 */ lwz r12, 0(r29) /* 80014ED8 00011E38 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 80014EDC 00011E3C 7D 89 03 A6 */ mtctr r12 -/* 80014EE0 00011E40 4E 80 04 21 */ bctrl +/* 80014EE0 00011E40 4E 80 04 21 */ bctrl /* 80014EE4 00011E44 81 83 00 00 */ lwz r12, 0(r3) /* 80014EE8 00011E48 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80014EEC 00011E4C 7D 89 03 A6 */ mtctr r12 -/* 80014EF0 00011E50 4E 80 04 21 */ bctrl +/* 80014EF0 00011E50 4E 80 04 21 */ bctrl /* 80014EF4 00011E54 C0 5A 00 10 */ lfs f2, 0x10(r26) /* 80014EF8 00011E58 7C 79 1B 78 */ mr r25, r3 /* 80014EFC 00011E5C C0 62 81 20 */ lfs f3, lbl_805A9E40@sda21(r2) @@ -6561,12 +6561,12 @@ lbl_800156D4: /* 800156FC 0001265C 80 01 25 A4 */ lwz r0, 0x25a4(r1) /* 80015700 00012660 7C 08 03 A6 */ mtlr r0 /* 80015704 00012664 38 21 25 A0 */ addi r1, r1, 0x25a0 -/* 80015708 00012668 4E 80 00 20 */ blr +/* 80015708 00012668 4E 80 00 20 */ blr .global GetMaterial__19CCollisionPrimitiveCFv GetMaterial__19CCollisionPrimitiveCFv: /* 8001570C 0001266C 38 63 00 08 */ addi r3, r3, 8 -/* 80015710 00012670 4E 80 00 20 */ blr +/* 80015710 00012670 4E 80 00 20 */ blr .global StartLandingControlFreeze__7CPlayerFv StartLandingControlFreeze__7CPlayerFv: @@ -6574,7 +6574,7 @@ StartLandingControlFreeze__7CPlayerFv: /* 80015718 00012678 C0 02 81 4C */ lfs f0, lbl_805A9E6C@sda21(r2) /* 8001571C 0001267C 98 03 07 60 */ stb r0, 0x760(r3) /* 80015720 00012680 D0 03 07 64 */ stfs f0, 0x764(r3) -/* 80015724 00012684 4E 80 00 20 */ blr +/* 80015724 00012684 4E 80 00 20 */ blr .global ProcessFrozenInput__7CPlayerFfR13CStateManager ProcessFrozenInput__7CPlayerFfR13CStateManager: @@ -6628,7 +6628,7 @@ lbl_800157C8: /* 800157D8 00012738 83 C1 00 38 */ lwz r30, 0x38(r1) /* 800157DC 0001273C 7C 08 03 A6 */ mtlr r0 /* 800157E0 00012740 38 21 00 50 */ addi r1, r1, 0x50 -/* 800157E4 00012744 4E 80 00 20 */ blr +/* 800157E4 00012744 4E 80 00 20 */ blr .global EndLandingControlFreeze__7CPlayerFv EndLandingControlFreeze__7CPlayerFv: @@ -6636,7 +6636,7 @@ EndLandingControlFreeze__7CPlayerFv: /* 800157EC 0001274C C0 02 81 0C */ lfs f0, lbl_805A9E2C@sda21(r2) /* 800157F0 00012750 98 03 07 60 */ stb r0, 0x760(r3) /* 800157F4 00012754 D0 03 07 64 */ stfs f0, 0x764(r3) -/* 800157F8 00012758 4E 80 00 20 */ blr +/* 800157F8 00012758 4E 80 00 20 */ blr .global UpdateFrozenState__7CPlayerFRC11CFinalInputR13CStateManager UpdateFrozenState__7CPlayerFRC11CFinalInputR13CStateManager: @@ -6774,7 +6774,7 @@ lbl_800159D4: /* 800159E0 00012940 83 A1 00 34 */ lwz r29, 0x34(r1) /* 800159E4 00012944 7C 08 03 A6 */ mtlr r0 /* 800159E8 00012948 38 21 00 40 */ addi r1, r1, 0x40 -/* 800159EC 0001294C 4E 80 00 20 */ blr +/* 800159EC 0001294C 4E 80 00 20 */ blr .global wstring_l__4rstlFPCw wstring_l__4rstlFPCw: @@ -6794,7 +6794,7 @@ lbl_80015A08: /* 80015A1C 0001297C 7C 00 22 14 */ add r0, r0, r4 /* 80015A20 00012980 7C 00 0E 70 */ srawi r0, r0, 1 /* 80015A24 00012984 90 03 00 08 */ stw r0, 8(r3) -/* 80015A28 00012988 4E 80 00 20 */ blr +/* 80015A28 00012988 4E 80 00 20 */ blr .global UnFreeze__7CPlayerFR13CStateManager UnFreeze__7CPlayerFR13CStateManager: @@ -6851,7 +6851,7 @@ UnFreeze__7CPlayerFR13CStateManager: /* 80015AF4 00012A54 81 84 00 00 */ lwz r12, 0(r4) /* 80015AF8 00012A58 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80015AFC 00012A5C 7D 89 03 A6 */ mtctr r12 -/* 80015B00 00012A60 4E 80 04 21 */ bctrl +/* 80015B00 00012A60 4E 80 04 21 */ bctrl /* 80015B04 00012A64 38 61 00 24 */ addi r3, r1, 0x24 /* 80015B08 00012A68 38 81 00 2C */ addi r4, r1, 0x2c /* 80015B0C 00012A6C 3B 40 00 01 */ li r26, 1 @@ -6988,7 +6988,7 @@ lbl_80015CE8: /* 80015CEC 00012C4C 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 80015CF0 00012C50 7C 08 03 A6 */ mtlr r0 /* 80015CF4 00012C54 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 80015CF8 00012C58 4E 80 00 20 */ blr +/* 80015CF8 00012C58 4E 80 00 20 */ blr .global GetFrozenState__7CPlayerCFv GetFrozenState__7CPlayerCFv: @@ -6997,7 +6997,7 @@ GetFrozenState__7CPlayerCFv: /* 80015D04 00012C64 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80015D08 00012C68 7C 00 00 26 */ mfcr r0 /* 80015D0C 00012C6C 54 03 17 FE */ rlwinm r3, r0, 2, 0x1f, 0x1f -/* 80015D10 00012C70 4E 80 00 20 */ blr +/* 80015D10 00012C70 4E 80 00 20 */ blr .global Freeze__7CPlayerFR13CStateManagerUiUsUi Freeze__7CPlayerFR13CStateManagerUiUsUi: @@ -7109,7 +7109,7 @@ lbl_80015E9C: /* 80015EA0 00012E00 80 01 00 44 */ lwz r0, 0x44(r1) /* 80015EA4 00012E04 7C 08 03 A6 */ mtlr r0 /* 80015EA8 00012E08 38 21 00 40 */ addi r1, r1, 0x40 -/* 80015EAC 00012E0C 4E 80 00 20 */ blr +/* 80015EAC 00012E0C 4E 80 00 20 */ blr .global Think__7CPlayerFfR13CStateManager Think__7CPlayerFfR13CStateManager: @@ -7495,7 +7495,7 @@ lbl_80016418: .global sub_80016448 sub_80016448: -/* 80016448 000133A8 4E 80 00 20 */ blr +/* 80016448 000133A8 4E 80 00 20 */ blr .global UpdateWaterSurfaceCameraBias__7CPlayerFR13CStateManager UpdateWaterSurfaceCameraBias__7CPlayerFR13CStateManager: @@ -7561,7 +7561,7 @@ lbl_80016524: /* 80016530 00013490 83 E1 00 4C */ lwz r31, 0x4c(r1) /* 80016534 00013494 7C 08 03 A6 */ mtlr r0 /* 80016538 00013498 38 21 00 60 */ addi r1, r1, 0x60 -/* 8001653C 0001349C 4E 80 00 20 */ blr +/* 8001653C 0001349C 4E 80 00 20 */ blr .global PreThink__7CPlayerFfR13CStateManager PreThink__7CPlayerFfR13CStateManager: @@ -7578,7 +7578,7 @@ PreThink__7CPlayerFfR13CStateManager: /* 80016568 000134C8 C0 04 00 08 */ lfs f0, 8(r4) /* 8001656C 000134CC D0 03 05 6C */ stfs f0, 0x56c(r3) /* 80016570 000134D0 D0 23 0A 04 */ stfs f1, 0xa04(r3) -/* 80016574 000134D4 4E 80 00 20 */ blr +/* 80016574 000134D4 4E 80 00 20 */ blr .global AcceptScriptMsg__7CPlayerF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__7CPlayerF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -7602,7 +7602,7 @@ AcceptScriptMsg__7CPlayerF20EScriptObjectMessage9TUniqueIdR13CStateManager: /* 800165BC 0001351C 38 84 97 8C */ addi r4, r4, lbl_803D978C@l /* 800165C0 00013520 7C 04 00 2E */ lwzx r0, r4, r0 /* 800165C4 00013524 7C 09 03 A6 */ mtctr r0 -/* 800165C8 00013528 4E 80 04 20 */ bctr +/* 800165C8 00013528 4E 80 04 20 */ bctr .global lbl_800165CC lbl_800165CC: /* 800165CC 0001352C 80 7B 02 58 */ lwz r3, 0x258(r27) @@ -8161,7 +8161,7 @@ lbl_80016D24: /* 80016D8C 00013CEC 80 01 02 04 */ lwz r0, 0x204(r1) /* 80016D90 00013CF0 7C 08 03 A6 */ mtlr r0 /* 80016D94 00013CF4 38 21 02 00 */ addi r1, r1, 0x200 -/* 80016D98 00013CF8 4E 80 00 20 */ blr +/* 80016D98 00013CF8 4E 80 00 20 */ blr .global UpdateCameraTimers__7CPlayerFfRC11CFinalInput UpdateCameraTimers__7CPlayerFfRC11CFinalInput: @@ -8253,7 +8253,7 @@ lbl_80016EC4: /* 80016ED4 00013E34 83 C1 00 08 */ lwz r30, 8(r1) /* 80016ED8 00013E38 7C 08 03 A6 */ mtlr r0 /* 80016EDC 00013E3C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80016EE0 00013E40 4E 80 00 20 */ blr +/* 80016EE0 00013E40 4E 80 00 20 */ blr .global UpdateFreeLookState__7CPlayerFRC11CFinalInputfR13CStateManager UpdateFreeLookState__7CPlayerFRC11CFinalInputfR13CStateManager: @@ -8511,7 +8511,7 @@ lbl_80017268: /* 8001728C 000141EC 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80017290 000141F0 7C 08 03 A6 */ mtlr r0 /* 80017294 000141F4 38 21 00 60 */ addi r1, r1, 0x60 -/* 80017298 000141F8 4E 80 00 20 */ blr +/* 80017298 000141F8 4E 80 00 20 */ blr .global SetCameraState__7CPlayerFQ27CPlayer18EPlayerCameraStateR13CStateManager SetCameraState__7CPlayerFQ27CPlayer18EPlayerCameraStateR13CStateManager: @@ -8608,7 +8608,7 @@ lbl_800173D8: /* 800173E4 00014344 83 A1 00 34 */ lwz r29, 0x34(r1) /* 800173E8 00014348 7C 08 03 A6 */ mtlr r0 /* 800173EC 0001434C 38 21 00 40 */ addi r1, r1, 0x40 -/* 800173F0 00014350 4E 80 00 20 */ blr +/* 800173F0 00014350 4E 80 00 20 */ blr .global UpdateCameraState__7CPlayerFR13CStateManager UpdateCameraState__7CPlayerFR13CStateManager: @@ -8619,7 +8619,7 @@ UpdateCameraState__7CPlayerFR13CStateManager: /* 80017404 00014364 80 01 00 14 */ lwz r0, 0x14(r1) /* 80017408 00014368 7C 08 03 A6 */ mtlr r0 /* 8001740C 0001436C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80017410 00014370 4E 80 00 20 */ blr +/* 80017410 00014370 4E 80 00 20 */ blr .global UpdateCinematicState__7CPlayerFR13CStateManager UpdateCinematicState__7CPlayerFR13CStateManager: @@ -8774,14 +8774,14 @@ lbl_80017600: /* 80017644 000145A4 38 81 00 20 */ addi r4, r1, 0x20 /* 80017648 000145A8 81 8C 00 70 */ lwz r12, 0x70(r12) /* 8001764C 000145AC 7D 89 03 A6 */ mtctr r12 -/* 80017650 000145B0 4E 80 04 21 */ bctrl +/* 80017650 000145B0 4E 80 04 21 */ bctrl lbl_80017654: /* 80017654 000145B4 80 01 00 64 */ lwz r0, 0x64(r1) /* 80017658 000145B8 83 E1 00 5C */ lwz r31, 0x5c(r1) /* 8001765C 000145BC 83 C1 00 58 */ lwz r30, 0x58(r1) /* 80017660 000145C0 7C 08 03 A6 */ mtlr r0 /* 80017664 000145C4 38 21 00 60 */ addi r1, r1, 0x60 -/* 80017668 000145C8 4E 80 00 20 */ blr +/* 80017668 000145C8 4E 80 00 20 */ blr .global SetSpawnedMorphBallState__7CPlayerFQ27CPlayer21EPlayerMorphBallStateR13CStateManager SetSpawnedMorphBallState__7CPlayerFQ27CPlayer21EPlayerMorphBallStateR13CStateManager: @@ -8874,14 +8874,14 @@ lbl_80017778: /* 800177BC 0001471C 38 81 00 20 */ addi r4, r1, 0x20 /* 800177C0 00014720 81 8C 00 70 */ lwz r12, 0x70(r12) /* 800177C4 00014724 7D 89 03 A6 */ mtctr r12 -/* 800177C8 00014728 4E 80 04 21 */ bctrl +/* 800177C8 00014728 4E 80 04 21 */ bctrl lbl_800177CC: /* 800177CC 0001472C 80 01 00 64 */ lwz r0, 0x64(r1) /* 800177D0 00014730 83 E1 00 5C */ lwz r31, 0x5c(r1) /* 800177D4 00014734 83 C1 00 58 */ lwz r30, 0x58(r1) /* 800177D8 00014738 7C 08 03 A6 */ mtlr r0 /* 800177DC 0001473C 38 21 00 60 */ addi r1, r1, 0x60 -/* 800177E0 00014740 4E 80 00 20 */ blr +/* 800177E0 00014740 4E 80 00 20 */ blr .global SetMorphBallState__7CPlayerFQ27CPlayer21EPlayerMorphBallStateR13CStateManager SetMorphBallState__7CPlayerFQ27CPlayer21EPlayerMorphBallStateR13CStateManager: @@ -9054,7 +9054,7 @@ lbl_80017A4C: /* 80017A50 000149B0 80 01 00 94 */ lwz r0, 0x94(r1) /* 80017A54 000149B4 7C 08 03 A6 */ mtlr r0 /* 80017A58 000149B8 38 21 00 90 */ addi r1, r1, 0x90 -/* 80017A5C 000149BC 4E 80 00 20 */ blr +/* 80017A5C 000149BC 4E 80 00 20 */ blr .global GetVisorRunoffEffect__FRC7CPlayerRC13CStateManager GetVisorRunoffEffect__FRC7CPlayerRC13CStateManager: @@ -9079,7 +9079,7 @@ lbl_80017AA4: /* 80017AA4 00014A04 80 01 00 24 */ lwz r0, 0x24(r1) /* 80017AA8 00014A08 7C 08 03 A6 */ mtlr r0 /* 80017AAC 00014A0C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80017AB0 00014A10 4E 80 00 20 */ blr +/* 80017AB0 00014A10 4E 80 00 20 */ blr .global SetVisorSteam__7CPlayerFfffUib SetVisorSteam__7CPlayerFfffUib: @@ -9091,7 +9091,7 @@ SetVisorSteam__7CPlayerFfffUib: /* 80017AC8 00014A28 80 01 00 14 */ lwz r0, 0x14(r1) /* 80017ACC 00014A2C 7C 08 03 A6 */ mtlr r0 /* 80017AD0 00014A30 38 21 00 10 */ addi r1, r1, 0x10 -/* 80017AD4 00014A34 4E 80 00 20 */ blr +/* 80017AD4 00014A34 4E 80 00 20 */ blr .global SetSteam__Q27CPlayer11CVisorSteamFfffUib SetSteam__Q27CPlayer11CVisorSteamFfffUib: @@ -9109,7 +9109,7 @@ lbl_80017AF4: /* 80017B00 00014A60 90 83 00 1C */ stw r4, 0x1c(r3) lbl_80017B04: /* 80017B04 00014A64 98 A3 00 28 */ stb r5, 0x28(r3) -/* 80017B08 00014A68 4E 80 00 20 */ blr +/* 80017B08 00014A68 4E 80 00 20 */ blr .global Update__Q27CPlayer11CVisorSteamFf Update__Q27CPlayer11CVisorSteamFf: @@ -9193,7 +9193,7 @@ lbl_80017C0C: /* 80017C2C 00014B8C 81 84 00 00 */ lwz r12, 0(r4) /* 80017C30 00014B90 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80017C34 00014B94 7D 89 03 A6 */ mtctr r12 -/* 80017C38 00014B98 4E 80 04 21 */ bctrl +/* 80017C38 00014B98 4E 80 04 21 */ bctrl /* 80017C3C 00014B9C 80 A1 00 08 */ lwz r5, 8(r1) /* 80017C40 00014BA0 38 61 00 08 */ addi r3, r1, 8 /* 80017C44 00014BA4 38 80 FF FF */ li r4, -1 @@ -9225,7 +9225,7 @@ lbl_80017C94: /* 80017CA4 00014C04 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80017CA8 00014C08 7C 08 03 A6 */ mtlr r0 /* 80017CAC 00014C0C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80017CB0 00014C10 4E 80 00 20 */ blr +/* 80017CB0 00014C10 4E 80 00 20 */ blr .global __ct__Q27CPlayer11CVisorSteamFv __ct__Q27CPlayer11CVisorSteamFv: @@ -9243,7 +9243,7 @@ __ct__Q27CPlayer11CVisorSteamFv: /* 80017CE0 00014C40 D0 03 00 20 */ stfs f0, 0x20(r3) /* 80017CE4 00014C44 D0 03 00 24 */ stfs f0, 0x24(r3) /* 80017CE8 00014C48 98 03 00 28 */ stb r0, 0x28(r3) -/* 80017CEC 00014C4C 4E 80 00 20 */ blr +/* 80017CEC 00014C4C 4E 80 00 20 */ blr .global UpdateFootstepSounds__7CPlayerFRC11CFinalInputR13CStateManagerf UpdateFootstepSounds__7CPlayerFRC11CFinalInputR13CStateManagerf: @@ -9540,7 +9540,7 @@ lbl_800180F4: /* 80018124 00015084 83 81 00 50 */ lwz r28, 0x50(r1) /* 80018128 00015088 7C 08 03 A6 */ mtlr r0 /* 8001812C 0001508C 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 80018130 00015090 4E 80 00 20 */ blr +/* 80018130 00015090 4E 80 00 20 */ blr .global GetMaterialSoundUnderPlayer__7CPlayerFR13CStateManagerPCUsiUs GetMaterialSoundUnderPlayer__7CPlayerFR13CStateManagerPCUsiUs: @@ -9706,7 +9706,7 @@ lbl_80018388: /* 80018394 000152F4 80 01 08 F4 */ lwz r0, 0x8f4(r1) /* 80018398 000152F8 7C 08 03 A6 */ mtlr r0 /* 8001839C 000152FC 38 21 08 F0 */ addi r1, r1, 0x8f0 -/* 800183A0 00015300 4E 80 00 20 */ blr +/* 800183A0 00015300 4E 80 00 20 */ blr .global SfxIdFromMaterial__7CPlayerFRC13CMaterialListPCUsiUs SfxIdFromMaterial__7CPlayerFRC13CMaterialListPCUsiUs: @@ -9749,7 +9749,7 @@ lbl_80018414: /* 80018428 00015388 80 01 00 24 */ lwz r0, 0x24(r1) /* 8001842C 0001538C 7C 08 03 A6 */ mtlr r0 /* 80018430 00015390 38 21 00 20 */ addi r1, r1, 0x20 -/* 80018434 00015394 4E 80 00 20 */ blr +/* 80018434 00015394 4E 80 00 20 */ blr .global UpdatePlayerSounds__7CPlayerFf UpdatePlayerSounds__7CPlayerFf: @@ -9779,7 +9779,7 @@ lbl_8001848C: /* 80018490 000153F0 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80018494 000153F4 7C 08 03 A6 */ mtlr r0 /* 80018498 000153F8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8001849C 000153FC 4E 80 00 20 */ blr +/* 8001849C 000153FC 4E 80 00 20 */ blr .global UpdateCrosshairsState__7CPlayerFRC11CFinalInput UpdateCrosshairsState__7CPlayerFRC11CFinalInput: @@ -9797,7 +9797,7 @@ UpdateCrosshairsState__7CPlayerFRC11CFinalInput: /* 800184CC 0001542C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800184D0 00015430 7C 08 03 A6 */ mtlr r0 /* 800184D4 00015434 38 21 00 10 */ addi r1, r1, 0x10 -/* 800184D8 00015438 4E 80 00 20 */ blr +/* 800184D8 00015438 4E 80 00 20 */ blr .global UpdateVisorTransition__7CPlayerFfR13CStateManager UpdateVisorTransition__7CPlayerFfR13CStateManager: @@ -9822,7 +9822,7 @@ lbl_80018518: /* 80018520 00015480 83 E1 00 14 */ lwz r31, 0x14(r1) /* 80018524 00015484 7C 08 03 A6 */ mtlr r0 /* 80018528 00015488 38 21 00 20 */ addi r1, r1, 0x20 -/* 8001852C 0001548C 4E 80 00 20 */ blr +/* 8001852C 0001548C 4E 80 00 20 */ blr .global UpdateVisorState__7CPlayerFRC11CFinalInputfR13CStateManager UpdateVisorState__7CPlayerFRC11CFinalInputfR13CStateManager: @@ -9942,7 +9942,7 @@ lbl_800186D0: /* 800186D4 00015634 80 01 00 44 */ lwz r0, 0x44(r1) /* 800186D8 00015638 7C 08 03 A6 */ mtlr r0 /* 800186DC 0001563C 38 21 00 40 */ addi r1, r1, 0x40 -/* 800186E0 00015640 4E 80 00 20 */ blr +/* 800186E0 00015640 4E 80 00 20 */ blr .global ShouldSampleFailsafe__7CPlayerCFv ShouldSampleFailsafe__7CPlayerCFv: @@ -9983,7 +9983,7 @@ lbl_80018758: /* 80018760 000156C0 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80018764 000156C4 7C 08 03 A6 */ mtlr r0 /* 80018768 000156C8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8001876C 000156CC 4E 80 00 20 */ blr +/* 8001876C 000156CC 4E 80 00 20 */ blr .global Update__7CPlayerFfR13CStateManager Update__7CPlayerFfR13CStateManager: @@ -10411,7 +10411,7 @@ lbl_80018D68: /* 80018D7C 00015CDC 83 A1 01 34 */ lwz r29, 0x134(r1) /* 80018D80 00015CE0 7C 08 03 A6 */ mtlr r0 /* 80018D84 00015CE4 38 21 01 50 */ addi r1, r1, 0x150 -/* 80018D88 00015CE8 4E 80 00 20 */ blr +/* 80018D88 00015CE8 4E 80 00 20 */ blr .global __ct__10CModelDataFRC10CModelData __ct__10CModelDataFRC10CModelData: @@ -10496,7 +10496,7 @@ lbl_80018EA4: /* 80018EB8 00015E18 83 81 00 10 */ lwz r28, 0x10(r1) /* 80018EBC 00015E1C 7C 08 03 A6 */ mtlr r0 /* 80018EC0 00015E20 38 21 00 20 */ addi r1, r1, 0x20 -/* 80018EC4 00015E24 4E 80 00 20 */ blr +/* 80018EC4 00015E24 4E 80 00 20 */ blr .global ForceGunOrientation__7CPlayerFRC12CTransform4fR13CStateManager ForceGunOrientation__7CPlayerFRC12CTransform4fR13CStateManager: @@ -10534,7 +10534,7 @@ ForceGunOrientation__7CPlayerFRC12CTransform4fR13CStateManager: /* 80018F44 00015EA4 83 A1 00 44 */ lwz r29, 0x44(r1) /* 80018F48 00015EA8 7C 08 03 A6 */ mtlr r0 /* 80018F4C 00015EAC 38 21 00 50 */ addi r1, r1, 0x50 -/* 80018F50 00015EB0 4E 80 00 20 */ blr +/* 80018F50 00015EB0 4E 80 00 20 */ blr .global UpdateArmAndGunTransforms__7CPlayerFfR13CStateManager UpdateArmAndGunTransforms__7CPlayerFfR13CStateManager: @@ -10634,11 +10634,11 @@ lbl_80019030: /* 800190B8 00016018 83 C1 00 68 */ lwz r30, 0x68(r1) /* 800190BC 0001601C 7C 08 03 A6 */ mtlr r0 /* 800190C0 00016020 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 800190C4 00016024 4E 80 00 20 */ blr +/* 800190C4 00016024 4E 80 00 20 */ blr .global UpdateDebugCamera__7CPlayerFR13CStateManager UpdateDebugCamera__7CPlayerFR13CStateManager: -/* 800190C8 00016028 4E 80 00 20 */ blr +/* 800190C8 00016028 4E 80 00 20 */ blr .global GetFirstPersonCameraTransform__7CPlayerCFR13CStateManager GetFirstPersonCameraTransform__7CPlayerCFR13CStateManager: @@ -10651,7 +10651,7 @@ GetFirstPersonCameraTransform__7CPlayerCFR13CStateManager: /* 800190E4 00016044 80 01 00 14 */ lwz r0, 0x14(r1) /* 800190E8 00016048 7C 08 03 A6 */ mtlr r0 /* 800190EC 0001604C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800190F0 00016050 4E 80 00 20 */ blr +/* 800190F0 00016050 4E 80 00 20 */ blr .global UpdateGunTransform__7CPlayerFRC9CVector3fR13CStateManager UpdateGunTransform__7CPlayerFRC9CVector3fR13CStateManager: @@ -10946,7 +10946,7 @@ lbl_800194DC: /* 80019548 000164A8 83 A1 03 B4 */ lwz r29, 0x3b4(r1) /* 8001954C 000164AC 7C 08 03 A6 */ mtlr r0 /* 80019550 000164B0 38 21 03 F0 */ addi r1, r1, 0x3f0 -/* 80019554 000164B4 4E 80 00 20 */ blr +/* 80019554 000164B4 4E 80 00 20 */ blr .global UpdateAssistedAiming__7CPlayerFRC12CTransform4fR13CStateManager UpdateAssistedAiming__7CPlayerFRC12CTransform4fR13CStateManager: @@ -11208,7 +11208,7 @@ lbl_800198E8: /* 80019930 00016890 83 81 00 C0 */ lwz r28, 0xc0(r1) /* 80019934 00016894 7C 08 03 A6 */ mtlr r0 /* 80019938 00016898 38 21 01 20 */ addi r1, r1, 0x120 -/* 8001993C 0001689C 4E 80 00 20 */ blr +/* 8001993C 0001689C 4E 80 00 20 */ blr .global UpdateAimTargetPrediction__7CPlayerFRC12CTransform4fR13CStateManager UpdateAimTargetPrediction__7CPlayerFRC12CTransform4fR13CStateManager: @@ -11269,7 +11269,7 @@ UpdateAimTargetPrediction__7CPlayerFRC12CTransform4fR13CStateManager: /* 80019A18 00016978 81 9E 00 00 */ lwz r12, 0(r30) /* 80019A1C 0001697C 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 80019A20 00016980 7D 89 03 A6 */ mtctr r12 -/* 80019A24 00016984 4E 80 04 21 */ bctrl +/* 80019A24 00016984 4E 80 04 21 */ bctrl /* 80019A28 00016988 C3 61 00 58 */ lfs f27, 0x58(r1) /* 80019A2C 0001698C C0 1C 00 0C */ lfs f0, 0xc(r28) /* 80019A30 00016990 C3 C1 00 5C */ lfs f30, 0x5c(r1) @@ -11294,7 +11294,7 @@ UpdateAimTargetPrediction__7CPlayerFRC12CTransform4fR13CStateManager: /* 80019A7C 000169DC 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 80019A80 000169E0 38 61 00 4C */ addi r3, r1, 0x4c /* 80019A84 000169E4 7D 89 03 A6 */ mtctr r12 -/* 80019A88 000169E8 4E 80 04 21 */ bctrl +/* 80019A88 000169E8 4E 80 04 21 */ bctrl /* 80019A8C 000169EC C3 41 00 4C */ lfs f26, 0x4c(r1) /* 80019A90 000169F0 38 61 00 64 */ addi r3, r1, 0x64 /* 80019A94 000169F4 C3 E1 00 50 */ lfs f31, 0x50(r1) @@ -11380,7 +11380,7 @@ lbl_80019B74: /* 80019BC4 00016B24 83 81 00 80 */ lwz r28, 0x80(r1) /* 80019BC8 00016B28 7C 08 03 A6 */ mtlr r0 /* 80019BCC 00016B2C 38 21 01 10 */ addi r1, r1, 0x110 -/* 80019BD0 00016B30 4E 80 00 20 */ blr +/* 80019BD0 00016B30 4E 80 00 20 */ blr .global "GetAverage__31TReservedAverage<9CVector3f,20>CFv" "GetAverage__31TReservedAverage<9CVector3f,20>CFv": @@ -11414,7 +11414,7 @@ lbl_80019C34: /* 80019C38 00016B98 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80019C3C 00016B9C 7C 08 03 A6 */ mtlr r0 /* 80019C40 00016BA0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80019C44 00016BA4 4E 80 00 20 */ blr +/* 80019C44 00016BA4 4E 80 00 20 */ blr .global sub_80019c48 sub_80019c48: @@ -11510,7 +11510,7 @@ lbl_80019D88: /* 80019D94 00016CF4 D0 03 00 08 */ stfs f0, 8(r3) /* 80019D98 00016CF8 C0 04 00 08 */ lfs f0, 8(r4) /* 80019D9C 00016CFC D0 03 00 0C */ stfs f0, 0xc(r3) -/* 80019DA0 00016D00 4E 80 00 20 */ blr +/* 80019DA0 00016D00 4E 80 00 20 */ blr .global ResetAimTargetPrediction__7CPlayerF9TUniqueId ResetAimTargetPrediction__7CPlayerF9TUniqueId: @@ -11550,7 +11550,7 @@ lbl_80019E0C: lbl_80019E14: /* 80019E14 00016D74 A0 04 00 00 */ lhz r0, 0(r4) /* 80019E18 00016D78 B0 03 03 F4 */ sth r0, 0x3f4(r3) -/* 80019E1C 00016D7C 4E 80 00 20 */ blr +/* 80019E1C 00016D7C 4E 80 00 20 */ blr .global UpdateGunState__7CPlayerFRC11CFinalInputR13CStateManager UpdateGunState__7CPlayerFRC11CFinalInputR13CStateManager: @@ -11733,7 +11733,7 @@ lbl_8001A084: /* 8001A09C 00016FFC 83 81 00 10 */ lwz r28, 0x10(r1) /* 8001A0A0 00017000 7C 08 03 A6 */ mtlr r0 /* 8001A0A4 00017004 38 21 00 30 */ addi r1, r1, 0x30 -/* 8001A0A8 00017008 4E 80 00 20 */ blr +/* 8001A0A8 00017008 4E 80 00 20 */ blr .global DrawGun__7CPlayerFR13CStateManager DrawGun__7CPlayerFR13CStateManager: @@ -11765,7 +11765,7 @@ lbl_8001A100: /* 8001A108 00017068 83 C1 00 08 */ lwz r30, 8(r1) /* 8001A10C 0001706C 7C 08 03 A6 */ mtlr r0 /* 8001A110 00017070 38 21 00 10 */ addi r1, r1, 0x10 -/* 8001A114 00017074 4E 80 00 20 */ blr +/* 8001A114 00017074 4E 80 00 20 */ blr .global ResetGun__7CPlayerFR13CStateManager ResetGun__7CPlayerFR13CStateManager: @@ -11789,7 +11789,7 @@ ResetGun__7CPlayerFR13CStateManager: /* 8001A15C 000170BC 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8001A160 000170C0 7C 08 03 A6 */ mtlr r0 /* 8001A164 000170C4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8001A168 000170C8 4E 80 00 20 */ blr +/* 8001A168 000170C8 4E 80 00 20 */ blr .global HolsterGun__7CPlayerFR13CStateManager HolsterGun__7CPlayerFR13CStateManager: @@ -11839,7 +11839,7 @@ lbl_8001A200: /* 8001A204 00017164 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8001A208 00017168 7C 08 03 A6 */ mtlr r0 /* 8001A20C 0001716C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8001A210 00017170 4E 80 00 20 */ blr +/* 8001A210 00017170 4E 80 00 20 */ blr .global IsMorphBallTransitioning__7CPlayerCFv IsMorphBallTransitioning__7CPlayerCFv: @@ -11851,10 +11851,10 @@ IsMorphBallTransitioning__7CPlayerCFv: /* 8001A228 00017188 48 00 00 0C */ b lbl_8001A234 lbl_8001A22C: /* 8001A22C 0001718C 38 60 00 01 */ li r3, 1 -/* 8001A230 00017190 4E 80 00 20 */ blr +/* 8001A230 00017190 4E 80 00 20 */ blr lbl_8001A234: /* 8001A234 00017194 38 60 00 00 */ li r3, 0 -/* 8001A238 00017198 4E 80 00 20 */ blr +/* 8001A238 00017198 4E 80 00 20 */ blr .global __ct__7CPlayerF9TUniqueIdRC12CTransform4fRC6CAABoxUi9CVector3fffffRC13CMaterialList __ct__7CPlayerF9TUniqueIdRC12CTransform4fRC6CAABoxUi9CVector3fffffRC13CMaterialList: @@ -12639,7 +12639,7 @@ lbl_8001AD78: /* 8001AE28 00017D88 80 01 02 B4 */ lwz r0, 0x2b4(r1) /* 8001AE2C 00017D8C 7C 08 03 A6 */ mtlr r0 /* 8001AE30 00017D90 38 21 02 B0 */ addi r1, r1, 0x2b0 -/* 8001AE34 00017D94 4E 80 00 20 */ blr +/* 8001AE34 00017D94 4E 80 00 20 */ blr .global None__16CActorParametersFv None__16CActorParametersFv: @@ -12650,7 +12650,7 @@ None__16CActorParametersFv: /* 8001AE48 00017DA8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8001AE4C 00017DAC 7C 08 03 A6 */ mtlr r0 /* 8001AE50 00017DB0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8001AE54 00017DB4 4E 80 00 20 */ blr +/* 8001AE54 00017DB4 4E 80 00 20 */ blr .global MakePlayerAnimres__FUiRC9CVector3f MakePlayerAnimres__FUiRC9CVector3f: @@ -12667,7 +12667,7 @@ MakePlayerAnimres__FUiRC9CVector3f: /* 8001AE80 00017DE0 D0 03 00 10 */ stfs f0, 0x10(r3) /* 8001AE84 00017DE4 98 83 00 14 */ stb r4, 0x14(r3) /* 8001AE88 00017DE8 90 03 00 18 */ stw r0, 0x18(r3) -/* 8001AE8C 00017DEC 4E 80 00 20 */ blr +/* 8001AE8C 00017DEC 4E 80 00 20 */ blr .global SetMaterial__19CCollisionPrimitiveFRC13CMaterialList SetMaterial__19CCollisionPrimitiveFRC13CMaterialList: @@ -12675,7 +12675,7 @@ SetMaterial__19CCollisionPrimitiveFRC13CMaterialList: /* 8001AE94 00017DF4 80 84 00 04 */ lwz r4, 4(r4) /* 8001AE98 00017DF8 90 83 00 0C */ stw r4, 0xc(r3) /* 8001AE9C 00017DFC 90 03 00 08 */ stw r0, 8(r3) -/* 8001AEA0 00017E00 4E 80 00 20 */ blr +/* 8001AEA0 00017E00 4E 80 00 20 */ blr .global "__nw__24TOneStatic<10CPlayerGun>FUlPCcPCc" "__nw__24TOneStatic<10CPlayerGun>FUlPCcPCc": @@ -12690,13 +12690,13 @@ SetMaterial__19CCollisionPrimitiveFRC13CMaterialList: /* 8001AEC4 00017E24 80 01 00 14 */ lwz r0, 0x14(r1) /* 8001AEC8 00017E28 7C 08 03 A6 */ mtlr r0 /* 8001AECC 00017E2C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8001AED0 00017E30 4E 80 00 20 */ blr +/* 8001AED0 00017E30 4E 80 00 20 */ blr .global "GetAllocSpace__24TOneStatic<10CPlayerGun>Fv" "GetAllocSpace__24TOneStatic<10CPlayerGun>Fv": /* 8001AED4 00017E34 3C 60 80 45 */ lis r3, lbl_80457A10@ha /* 8001AED8 00017E38 38 63 7A 10 */ addi r3, r3, lbl_80457A10@l -/* 8001AEDC 00017E3C 4E 80 00 20 */ blr +/* 8001AEDC 00017E3C 4E 80 00 20 */ blr .global "ReferenceCount__24TOneStatic<10CPlayerGun>Fv" "ReferenceCount__24TOneStatic<10CPlayerGun>Fv": @@ -12709,7 +12709,7 @@ SetMaterial__19CCollisionPrimitiveFRC13CMaterialList: /* 8001AEF8 00017E58 98 0D A0 D0 */ stb r0, lbl_805A8C90@sda21(r13) lbl_8001AEFC: /* 8001AEFC 00017E5C 38 6D A0 CC */ addi r3, r13, lbl_805A8C8C@sda21 -/* 8001AF00 00017E60 4E 80 00 20 */ blr +/* 8001AF00 00017E60 4E 80 00 20 */ blr .global "__nw__30TOneStatic<16CPlayerCameraBob>FUlPCcPCc" "__nw__30TOneStatic<16CPlayerCameraBob>FUlPCcPCc": @@ -12724,7 +12724,7 @@ lbl_8001AEFC: /* 8001AF24 00017E84 80 01 00 14 */ lwz r0, 0x14(r1) /* 8001AF28 00017E88 7C 08 03 A6 */ mtlr r0 /* 8001AF2C 00017E8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8001AF30 00017E90 4E 80 00 20 */ blr +/* 8001AF30 00017E90 4E 80 00 20 */ blr .global "__dl__30TOneStatic<16CPlayerCameraBob>FPv" "__dl__30TOneStatic<16CPlayerCameraBob>FPv": @@ -12738,13 +12738,13 @@ lbl_8001AEFC: /* 8001AF50 00017EB0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8001AF54 00017EB4 7C 08 03 A6 */ mtlr r0 /* 8001AF58 00017EB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8001AF5C 00017EBC 4E 80 00 20 */ blr +/* 8001AF5C 00017EBC 4E 80 00 20 */ blr .global "GetAllocSpace__30TOneStatic<16CPlayerCameraBob>Fv" "GetAllocSpace__30TOneStatic<16CPlayerCameraBob>Fv": /* 8001AF60 00017EC0 3C 60 80 46 */ lis r3, lbl_80458248@ha /* 8001AF64 00017EC4 38 63 82 48 */ addi r3, r3, lbl_80458248@l -/* 8001AF68 00017EC8 4E 80 00 20 */ blr +/* 8001AF68 00017EC8 4E 80 00 20 */ blr .global "ReferenceCount__30TOneStatic<16CPlayerCameraBob>Fv" "ReferenceCount__30TOneStatic<16CPlayerCameraBob>Fv": @@ -12757,7 +12757,7 @@ lbl_8001AEFC: /* 8001AF84 00017EE4 98 0D A0 D8 */ stb r0, lbl_805A8C98@sda21(r13) lbl_8001AF88: /* 8001AF88 00017EE8 38 6D A0 D4 */ addi r3, r13, lbl_805A8C94@sda21 -/* 8001AF8C 00017EEC 4E 80 00 20 */ blr +/* 8001AF8C 00017EEC 4E 80 00 20 */ blr .global "__nw__24TOneStatic<10CMorphBall>FUlPCcPCc" "__nw__24TOneStatic<10CMorphBall>FUlPCcPCc": @@ -12772,13 +12772,13 @@ lbl_8001AF88: /* 8001AFB0 00017F10 80 01 00 14 */ lwz r0, 0x14(r1) /* 8001AFB4 00017F14 7C 08 03 A6 */ mtlr r0 /* 8001AFB8 00017F18 38 21 00 10 */ addi r1, r1, 0x10 -/* 8001AFBC 00017F1C 4E 80 00 20 */ blr +/* 8001AFBC 00017F1C 4E 80 00 20 */ blr .global "GetAllocSpace__24TOneStatic<10CMorphBall>Fv" "GetAllocSpace__24TOneStatic<10CMorphBall>Fv": /* 8001AFC0 00017F20 3C 60 80 46 */ lis r3, lbl_80458350@ha /* 8001AFC4 00017F24 38 63 83 50 */ addi r3, r3, lbl_80458350@l -/* 8001AFC8 00017F28 4E 80 00 20 */ blr +/* 8001AFC8 00017F28 4E 80 00 20 */ blr .global "ReferenceCount__24TOneStatic<10CMorphBall>Fv" "ReferenceCount__24TOneStatic<10CMorphBall>Fv": @@ -12791,7 +12791,7 @@ lbl_8001AF88: /* 8001AFE4 00017F44 98 0D A0 E0 */ stb r0, lbl_805A8CA0@sda21(r13) lbl_8001AFE8: /* 8001AFE8 00017F48 38 6D A0 DC */ addi r3, r13, lbl_805A8C9C@sda21 -/* 8001AFEC 00017F4C 4E 80 00 20 */ blr +/* 8001AFEC 00017F4C 4E 80 00 20 */ blr .global "__dl__20TOneStatic<7CPlayer>FPv" "__dl__20TOneStatic<7CPlayer>FPv": @@ -12805,7 +12805,7 @@ lbl_8001AFE8: /* 8001B00C 00017F6C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8001B010 00017F70 7C 08 03 A6 */ mtlr r0 /* 8001B014 00017F74 38 21 00 10 */ addi r1, r1, 0x10 -/* 8001B018 00017F78 4E 80 00 20 */ blr +/* 8001B018 00017F78 4E 80 00 20 */ blr .global "ReferenceCount__20TOneStatic<7CPlayer>Fv" "ReferenceCount__20TOneStatic<7CPlayer>Fv": @@ -12818,7 +12818,7 @@ lbl_8001AFE8: /* 8001B034 00017F94 98 0D A0 E8 */ stb r0, lbl_805A8CA8@sda21(r13) lbl_8001B038: /* 8001B038 00017F98 38 6D A0 E4 */ addi r3, r13, lbl_805A8CA4@sda21 -/* 8001B03C 00017F9C 4E 80 00 20 */ blr +/* 8001B03C 00017F9C 4E 80 00 20 */ blr .global "GetAverageValue<9CVector3f>__FPC9CVector3fi" "GetAverageValue<9CVector3f>__FPC9CVector3fi": @@ -12919,7 +12919,7 @@ lbl_8001B174: /* 8001B1A8 00018108 D0 23 00 04 */ stfs f1, 4(r3) /* 8001B1AC 0001810C D0 03 00 08 */ stfs f0, 8(r3) /* 8001B1B0 00018110 38 21 00 10 */ addi r1, r1, 0x10 -/* 8001B1B4 00018114 4E 80 00 20 */ blr +/* 8001B1B4 00018114 4E 80 00 20 */ blr .global "reserve__Q24rstl66vector,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl66vector,Q24rstl17rmemory_allocator>Fi": @@ -13000,7 +13000,7 @@ lbl_8001B2B4: /* 8001B2B8 00018218 80 01 00 34 */ lwz r0, 0x34(r1) /* 8001B2BC 0001821C 7C 08 03 A6 */ mtlr r0 /* 8001B2C0 00018220 38 21 00 30 */ addi r1, r1, 0x30 -/* 8001B2C4 00018224 4E 80 00 20 */ blr +/* 8001B2C4 00018224 4E 80 00 20 */ blr .global __sinit_CPlayer_cpp __sinit_CPlayer_cpp: @@ -13090,4 +13090,4 @@ __sinit_CPlayer_cpp: /* 8001B414 00018374 80 01 00 44 */ lwz r0, 0x44(r1) /* 8001B418 00018378 7C 08 03 A6 */ mtlr r0 /* 8001B41C 0001837C 38 21 00 40 */ addi r1, r1, 0x40 -/* 8001B420 00018380 4E 80 00 20 */ blr +/* 8001B420 00018380 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/Player/CPlayerCameraBob.s b/asm/MetroidPrime/Player/CPlayerCameraBob.s index 03818450..fd5a8d86 100644 --- a/asm/MetroidPrime/Player/CPlayerCameraBob.s +++ b/asm/MetroidPrime/Player/CPlayerCameraBob.s @@ -140,7 +140,7 @@ lbl_805A8ED8: .global GetViewWanderTransform__16CPlayerCameraBobCFv GetViewWanderTransform__16CPlayerCameraBobCFv: /* 800E9570 000E64D0 38 63 00 D0 */ addi r3, r3, 0xd0 -/* 800E9574 000E64D4 4E 80 00 20 */ blr +/* 800E9574 000E64D4 4E 80 00 20 */ blr .global UpdateViewWander__16CPlayerCameraBobFfR13CStateManager UpdateViewWander__16CPlayerCameraBobFfR13CStateManager: @@ -313,7 +313,7 @@ lbl_800E97F4: /* 800E980C 000E676C 83 81 00 D0 */ lwz r28, 0xd0(r1) /* 800E9810 000E6770 7C 08 03 A6 */ mtlr r0 /* 800E9814 000E6774 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 800E9818 000E6778 4E 80 00 20 */ blr +/* 800E9818 000E6778 4E 80 00 20 */ blr .global CalculateRandomViewWanderPitch__16CPlayerCameraBobFR13CStateManager CalculateRandomViewWanderPitch__16CPlayerCameraBobFR13CStateManager: @@ -333,7 +333,7 @@ CalculateRandomViewWanderPitch__16CPlayerCameraBobFR13CStateManager: /* 800E9850 000E67B0 80 01 00 14 */ lwz r0, 0x14(r1) /* 800E9854 000E67B4 7C 08 03 A6 */ mtlr r0 /* 800E9858 000E67B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E985C 000E67BC 4E 80 00 20 */ blr +/* 800E985C 000E67BC 4E 80 00 20 */ blr .global CalculateRandomViewWanderPosition__16CPlayerCameraBobFR13CStateManager CalculateRandomViewWanderPosition__16CPlayerCameraBobFR13CStateManager: @@ -381,7 +381,7 @@ CalculateRandomViewWanderPosition__16CPlayerCameraBobFR13CStateManager: /* 800E9904 000E6864 83 C1 00 08 */ lwz r30, 8(r1) /* 800E9908 000E6868 7C 08 03 A6 */ mtlr r0 /* 800E990C 000E686C 38 21 00 40 */ addi r1, r1, 0x40 -/* 800E9910 000E6870 4E 80 00 20 */ blr +/* 800E9910 000E6870 4E 80 00 20 */ blr .global InitViewWander__16CPlayerCameraBobFR13CStateManager InitViewWander__16CPlayerCameraBobFR13CStateManager: @@ -449,7 +449,7 @@ InitViewWander__16CPlayerCameraBobFR13CStateManager: /* 800E9A08 000E6968 83 C1 00 18 */ lwz r30, 0x18(r1) /* 800E9A0C 000E696C 7C 08 03 A6 */ mtlr r0 /* 800E9A10 000E6970 38 21 00 30 */ addi r1, r1, 0x30 -/* 800E9A14 000E6974 4E 80 00 20 */ blr +/* 800E9A14 000E6974 4E 80 00 20 */ blr .global SetPlayerVelocity__16CPlayerCameraBobFRC9CVector3f SetPlayerVelocity__16CPlayerCameraBobFRC9CVector3f: @@ -468,7 +468,7 @@ SetPlayerVelocity__16CPlayerCameraBobFRC9CVector3f: lbl_800E9A48: /* 800E9A48 000E69A8 C0 05 00 00 */ lfs f0, 0(r5) /* 800E9A4C 000E69AC D0 03 00 68 */ stfs f0, 0x68(r3) -/* 800E9A50 000E69B0 4E 80 00 20 */ blr +/* 800E9A50 000E69B0 4E 80 00 20 */ blr .global SetState__16CPlayerCameraBobFQ216CPlayerCameraBob15ECameraBobStateR13CStateManager SetState__16CPlayerCameraBobFQ216CPlayerCameraBob15ECameraBobStateR13CStateManager: @@ -530,13 +530,13 @@ lbl_800E9B1C: /* 800E9B1C 000E6A7C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800E9B20 000E6A80 7C 08 03 A6 */ mtlr r0 /* 800E9B24 000E6A84 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E9B28 000E6A88 4E 80 00 20 */ blr +/* 800E9B28 000E6A88 4E 80 00 20 */ blr .global ResetCameraBobTime__16CPlayerCameraBobFv ResetCameraBobTime__16CPlayerCameraBobFv: /* 800E9B2C 000E6A8C C0 02 90 78 */ lfs f0, lbl_805AAD98@sda21(r2) /* 800E9B30 000E6A90 D0 03 00 1C */ stfs f0, 0x1c(r3) -/* 800E9B34 000E6A94 4E 80 00 20 */ blr +/* 800E9B34 000E6A94 4E 80 00 20 */ blr .global CalculateMovingTranslation__16CPlayerCameraBobCFRfRf CalculateMovingTranslation__16CPlayerCameraBobCFRfRf: @@ -650,12 +650,12 @@ lbl_800E9CB4: /* 800E9CD0 000E6C30 83 A1 00 14 */ lwz r29, 0x14(r1) /* 800E9CD4 000E6C34 7C 08 03 A6 */ mtlr r0 /* 800E9CD8 000E6C38 38 21 00 40 */ addi r1, r1, 0x40 -/* 800E9CDC 000E6C3C 4E 80 00 20 */ blr +/* 800E9CDC 000E6C3C 4E 80 00 20 */ blr .global CalculateLandingTranslation__16CPlayerCameraBobCFv CalculateLandingTranslation__16CPlayerCameraBobCFv: /* 800E9CE0 000E6C40 C0 23 00 70 */ lfs f1, 0x70(r3) -/* 800E9CE4 000E6C44 4E 80 00 20 */ blr +/* 800E9CE4 000E6C44 4E 80 00 20 */ blr .global GetHelmetBobTranslation__16CPlayerCameraBobCFv GetHelmetBobTranslation__16CPlayerCameraBobCFv: @@ -674,7 +674,7 @@ GetHelmetBobTranslation__16CPlayerCameraBobCFv: /* 800E9D18 000E6C78 EC 04 00 72 */ fmuls f0, f4, f1 /* 800E9D1C 000E6C7C D0 43 00 04 */ stfs f2, 4(r3) /* 800E9D20 000E6C80 D0 03 00 08 */ stfs f0, 8(r3) -/* 800E9D24 000E6C84 4E 80 00 20 */ blr +/* 800E9D24 000E6C84 4E 80 00 20 */ blr .global GetGunBobTransformation__16CPlayerCameraBobCFv GetGunBobTransformation__16CPlayerCameraBobCFv: @@ -708,7 +708,7 @@ GetGunBobTransformation__16CPlayerCameraBobCFv: /* 800E9D94 000E6CF4 83 E1 00 5C */ lwz r31, 0x5c(r1) /* 800E9D98 000E6CF8 7C 08 03 A6 */ mtlr r0 /* 800E9D9C 000E6CFC 38 21 00 60 */ addi r1, r1, 0x60 -/* 800E9DA0 000E6D00 4E 80 00 20 */ blr +/* 800E9DA0 000E6D00 4E 80 00 20 */ blr .global GetCameraBobTransformation__16CPlayerCameraBobCFv GetCameraBobTransformation__16CPlayerCameraBobCFv: @@ -720,7 +720,7 @@ GetCameraBobTransformation__16CPlayerCameraBobCFv: /* 800E9DB8 000E6D18 80 01 00 14 */ lwz r0, 0x14(r1) /* 800E9DBC 000E6D1C 7C 08 03 A6 */ mtlr r0 /* 800E9DC0 000E6D20 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E9DC4 000E6D24 4E 80 00 20 */ blr +/* 800E9DC4 000E6D24 4E 80 00 20 */ blr .global CalculateCameraBobTransformation__16CPlayerCameraBobCFv CalculateCameraBobTransformation__16CPlayerCameraBobCFv: @@ -757,7 +757,7 @@ lbl_800E9E20: /* 800E9E3C 000E6D9C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 800E9E40 000E6DA0 7C 08 03 A6 */ mtlr r0 /* 800E9E44 000E6DA4 38 21 00 20 */ addi r1, r1, 0x20 -/* 800E9E48 000E6DA8 4E 80 00 20 */ blr +/* 800E9E48 000E6DA8 4E 80 00 20 */ blr .global SetBobMagnitude__16CPlayerCameraBobFf SetBobMagnitude__16CPlayerCameraBobFf: @@ -784,7 +784,7 @@ lbl_800E9E8C: lbl_800E9E90: /* 800E9E90 000E6DF0 C0 04 00 00 */ lfs f0, 0(r4) /* 800E9E94 000E6DF4 D0 03 00 10 */ stfs f0, 0x10(r3) -/* 800E9E98 000E6DF8 4E 80 00 20 */ blr +/* 800E9E98 000E6DF8 4E 80 00 20 */ blr .global SetBobTimeScale__16CPlayerCameraBobFf SetBobTimeScale__16CPlayerCameraBobFf: @@ -811,7 +811,7 @@ lbl_800E9EDC: lbl_800E9EE0: /* 800E9EE0 000E6E40 C0 04 00 00 */ lfs f0, 0(r4) /* 800E9EE4 000E6E44 D0 03 00 18 */ stfs f0, 0x18(r3) -/* 800E9EE8 000E6E48 4E 80 00 20 */ blr +/* 800E9EE8 000E6E48 4E 80 00 20 */ blr .global Update__16CPlayerCameraBobFfR13CStateManager Update__16CPlayerCameraBobFfR13CStateManager: @@ -986,7 +986,7 @@ lbl_800EA0C4: /* 800EA174 000E70D4 83 C1 00 D8 */ lwz r30, 0xd8(r1) /* 800EA178 000E70D8 7C 08 03 A6 */ mtlr r0 /* 800EA17C 000E70DC 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 800EA180 000E70E0 4E 80 00 20 */ blr +/* 800EA180 000E70E0 4E 80 00 20 */ blr .global ReadTweaks__16CPlayerCameraBobFR12CInputStream ReadTweaks__16CPlayerCameraBobFR12CInputStream: @@ -1040,7 +1040,7 @@ ReadTweaks__16CPlayerCameraBobFR12CInputStream: /* 800EA240 000E71A0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800EA244 000E71A4 7C 08 03 A6 */ mtlr r0 /* 800EA248 000E71A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800EA24C 000E71AC 4E 80 00 20 */ blr +/* 800EA24C 000E71AC 4E 80 00 20 */ blr .global __ct__16CPlayerCameraBobFQ216CPlayerCameraBob14ECameraBobTypeRC9CVector2ff __ct__16CPlayerCameraBobFQ216CPlayerCameraBob14ECameraBobTypeRC9CVector2ff: @@ -1194,7 +1194,7 @@ lbl_800EA468: /* 800EA47C 000E73DC 80 01 00 14 */ lwz r0, 0x14(r1) /* 800EA480 000E73E0 7C 08 03 A6 */ mtlr r0 /* 800EA484 000E73E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800EA488 000E73E8 4E 80 00 20 */ blr +/* 800EA488 000E73E8 4E 80 00 20 */ blr .global __sinit_CPlayerCameraBob_cpp __sinit_CPlayerCameraBob_cpp: diff --git a/asm/MetroidPrime/Player/CPlayerDynamics.s b/asm/MetroidPrime/Player/CPlayerDynamics.s index 3cc82233..f51f72d6 100644 --- a/asm/MetroidPrime/Player/CPlayerDynamics.s +++ b/asm/MetroidPrime/Player/CPlayerDynamics.s @@ -118,7 +118,7 @@ lbl_805A9158: .global lbl_805A915C lbl_805A915C: .skip 0x4 - + .section .text, "ax" .global UpdateMorphBallTransition__7CPlayerFfR13CStateManager @@ -724,19 +724,19 @@ lbl_8028262C: /* 80282634 0027F594 81 9C 00 00 */ lwz r12, 0(r28) /* 80282638 0027F598 81 8C 00 70 */ lwz r12, 0x70(r12) /* 8028263C 0027F59C 7D 89 03 A6 */ mtctr r12 -/* 80282640 0027F5A0 4E 80 04 21 */ bctrl +/* 80282640 0027F5A0 4E 80 04 21 */ bctrl /* 80282644 0027F5A4 7F 83 E3 78 */ mr r3, r28 /* 80282648 0027F5A8 81 9C 00 00 */ lwz r12, 0(r28) /* 8028264C 0027F5AC 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 80282650 0027F5B0 7D 89 03 A6 */ mtctr r12 -/* 80282654 0027F5B4 4E 80 04 21 */ bctrl +/* 80282654 0027F5B4 4E 80 04 21 */ bctrl /* 80282658 0027F5B8 7C 64 1B 78 */ mr r4, r3 /* 8028265C 0027F5BC 38 61 00 A8 */ addi r3, r1, 0xa8 /* 80282660 0027F5C0 81 84 00 00 */ lwz r12, 0(r4) /* 80282664 0027F5C4 38 A1 01 48 */ addi r5, r1, 0x148 /* 80282668 0027F5C8 81 8C 00 14 */ lwz r12, 0x14(r12) /* 8028266C 0027F5CC 7D 89 03 A6 */ mtctr r12 -/* 80282670 0027F5D0 4E 80 04 21 */ bctrl +/* 80282670 0027F5D0 4E 80 04 21 */ bctrl /* 80282674 0027F5D4 C0 A1 00 A8 */ lfs f5, 0xa8(r1) /* 80282678 0027F5D8 38 61 00 74 */ addi r3, r1, 0x74 /* 8028267C 0027F5DC C0 81 00 AC */ lfs f4, 0xac(r1) @@ -946,7 +946,7 @@ lbl_8028295C: /* 80282978 0027F8D8 80 01 02 74 */ lwz r0, 0x274(r1) /* 8028297C 0027F8DC 7C 08 03 A6 */ mtlr r0 /* 80282980 0027F8E0 38 21 02 70 */ addi r1, r1, 0x270 -/* 80282984 0027F8E4 4E 80 00 20 */ blr +/* 80282984 0027F8E4 4E 80 00 20 */ blr .global sub_80282988 sub_80282988: @@ -968,7 +968,7 @@ sub_80282988: /* 802829C4 0027F924 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802829C8 0027F928 7C 08 03 A6 */ mtlr r0 /* 802829CC 0027F92C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802829D0 0027F930 4E 80 00 20 */ blr +/* 802829D0 0027F930 4E 80 00 20 */ blr .global "erase__Q24rstl66vector,Q24rstl17rmemory_allocator>FQ24rstl152pointer_iterator,Q24rstl66vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl152pointer_iterator,Q24rstl66vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>" "erase__Q24rstl66vector,Q24rstl17rmemory_allocator>FQ24rstl152pointer_iterator,Q24rstl66vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl152pointer_iterator,Q24rstl66vector,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>": @@ -1045,7 +1045,7 @@ lbl_80282AA8: /* 80282AD0 0027FA30 80 01 00 34 */ lwz r0, 0x34(r1) /* 80282AD4 0027FA34 7C 08 03 A6 */ mtlr r0 /* 80282AD8 0027FA38 38 21 00 30 */ addi r1, r1, 0x30 -/* 80282ADC 0027FA3C 4E 80 00 20 */ blr +/* 80282ADC 0027FA3C 4E 80 00 20 */ blr .global Clone__11IAnimReaderCFv Clone__11IAnimReaderCFv: @@ -1057,12 +1057,12 @@ Clone__11IAnimReaderCFv: /* 80282AF4 0027FA54 81 84 00 00 */ lwz r12, 0(r4) /* 80282AF8 0027FA58 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 80282AFC 0027FA5C 7D 89 03 A6 */ mtctr r12 -/* 80282B00 0027FA60 4E 80 04 21 */ bctrl +/* 80282B00 0027FA60 4E 80 04 21 */ bctrl /* 80282B04 0027FA64 80 01 00 14 */ lwz r0, 0x14(r1) /* 80282B08 0027FA68 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80282B0C 0027FA6C 7C 08 03 A6 */ mtlr r0 /* 80282B10 0027FA70 38 21 00 10 */ addi r1, r1, 0x10 -/* 80282B14 0027FA74 4E 80 00 20 */ blr +/* 80282B14 0027FA74 4E 80 00 20 */ blr .global UpdateTransitionFilter__7CPlayerFfR13CStateManager UpdateTransitionFilter__7CPlayerFfR13CStateManager: @@ -1164,7 +1164,7 @@ lbl_80282C78: /* 80282C78 0027FBD8 80 01 00 14 */ lwz r0, 0x14(r1) /* 80282C7C 0027FBDC 7C 08 03 A6 */ mtlr r0 /* 80282C80 0027FBE0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80282C84 0027FBE4 4E 80 00 20 */ blr +/* 80282C84 0027FBE4 4E 80 00 20 */ blr .global InitializeBallTransition__7CPlayerFv InitializeBallTransition__7CPlayerFv: @@ -1206,7 +1206,7 @@ lbl_80282D0C: /* 80282D0C 0027FC6C 80 01 00 34 */ lwz r0, 0x34(r1) /* 80282D10 0027FC70 7C 08 03 A6 */ mtlr r0 /* 80282D14 0027FC74 38 21 00 30 */ addi r1, r1, 0x30 -/* 80282D18 0027FC78 4E 80 00 20 */ blr +/* 80282D18 0027FC78 4E 80 00 20 */ blr .global LeaveMorphBallState__7CPlayerFR13CStateManager LeaveMorphBallState__7CPlayerFR13CStateManager: @@ -1314,7 +1314,7 @@ lbl_80282D88: /* 80282EA4 0027FE04 81 83 00 00 */ lwz r12, 0(r3) /* 80282EA8 0027FE08 81 8C 00 14 */ lwz r12, 0x14(r12) /* 80282EAC 0027FE0C 7D 89 03 A6 */ mtctr r12 -/* 80282EB0 0027FE10 4E 80 04 21 */ bctrl +/* 80282EB0 0027FE10 4E 80 04 21 */ bctrl /* 80282EB4 0027FE14 7F C3 F3 78 */ mr r3, r30 /* 80282EB8 0027FE18 7F E5 FB 78 */ mr r5, r31 /* 80282EBC 0027FE1C 38 9E 00 34 */ addi r4, r30, 0x34 @@ -1329,7 +1329,7 @@ lbl_80282D88: /* 80282EE0 0027FE40 83 81 00 20 */ lwz r28, 0x20(r1) /* 80282EE4 0027FE44 7C 08 03 A6 */ mtlr r0 /* 80282EE8 0027FE48 38 21 00 30 */ addi r1, r1, 0x30 -/* 80282EEC 0027FE4C 4E 80 00 20 */ blr +/* 80282EEC 0027FE4C 4E 80 00 20 */ blr .global EnterMorphBallState__7CPlayerFR13CStateManager EnterMorphBallState__7CPlayerFR13CStateManager: @@ -1414,7 +1414,7 @@ lbl_80282F80: /* 8028301C 0027FF7C 83 81 00 30 */ lwz r28, 0x30(r1) /* 80283020 0027FF80 7C 08 03 A6 */ mtlr r0 /* 80283024 0027FF84 38 21 00 50 */ addi r1, r1, 0x50 -/* 80283028 0027FF88 4E 80 00 20 */ blr +/* 80283028 0027FF88 4E 80 00 20 */ blr .global ActivateMorphBallCamera__7CPlayerFR13CStateManager ActivateMorphBallCamera__7CPlayerFR13CStateManager: @@ -1435,7 +1435,7 @@ ActivateMorphBallCamera__7CPlayerFR13CStateManager: /* 80283064 0027FFC4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80283068 0027FFC8 7C 08 03 A6 */ mtlr r0 /* 8028306C 0027FFCC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80283070 0027FFD0 4E 80 00 20 */ blr +/* 80283070 0027FFD0 4E 80 00 20 */ blr .global TransitionFromMorphBallState__7CPlayerFR13CStateManager TransitionFromMorphBallState__7CPlayerFR13CStateManager: @@ -1683,7 +1683,7 @@ lbl_802833A0: /* 8028341C 0028037C C3 7D 00 50 */ lfs f27, 0x50(r29) /* 80283420 00280380 C3 9D 00 40 */ lfs f28, 0x40(r29) /* 80283424 00280384 7D 89 03 A6 */ mtctr r12 -/* 80283428 00280388 4E 80 04 21 */ bctrl +/* 80283428 00280388 4E 80 04 21 */ bctrl /* 8028342C 0028038C C0 01 00 C4 */ lfs f0, 0xc4(r1) /* 80283430 00280390 38 61 01 10 */ addi r3, r1, 0x110 /* 80283434 00280394 C0 61 00 BC */ lfs f3, 0xbc(r1) @@ -2019,7 +2019,7 @@ lbl_80283900: /* 8028393C 0028089C 83 A1 02 44 */ lwz r29, 0x244(r1) /* 80283940 002808A0 7C 08 03 A6 */ mtlr r0 /* 80283944 002808A4 38 21 02 B0 */ addi r1, r1, 0x2b0 -/* 80283948 002808A8 4E 80 00 20 */ blr +/* 80283948 002808A8 4E 80 00 20 */ blr .global TransitionToMorphBallState__7CPlayerFfR13CStateManager TransitionToMorphBallState__7CPlayerFfR13CStateManager: @@ -2218,7 +2218,7 @@ lbl_80283BF8: /* 80283C34 00280B94 83 A1 00 84 */ lwz r29, 0x84(r1) /* 80283C38 00280B98 7C 08 03 A6 */ mtlr r0 /* 80283C3C 00280B9C 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 80283C40 00280BA0 4E 80 00 20 */ blr +/* 80283C40 00280BA0 4E 80 00 20 */ blr .global GetNextBallTransitionAnim__7CPlayerFfRbR13CStateManager GetNextBallTransitionAnim__7CPlayerFfRbR13CStateManager: @@ -2303,7 +2303,7 @@ lbl_80283D50: /* 80283D74 00280CD4 83 81 00 30 */ lwz r28, 0x30(r1) /* 80283D78 00280CD8 7C 08 03 A6 */ mtlr r0 /* 80283D7C 00280CDC 38 21 00 60 */ addi r1, r1, 0x60 -/* 80283D80 00280CE0 4E 80 00 20 */ blr +/* 80283D80 00280CE0 4E 80 00 20 */ blr .global ChoseTransitionToAnimation__7CPlayerCFR13CStateManager ChoseTransitionToAnimation__7CPlayerCFR13CStateManager: @@ -2419,7 +2419,7 @@ lbl_80283F04: /* 80283F18 00280E78 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 80283F1C 00280E7C 7C 08 03 A6 */ mtlr r0 /* 80283F20 00280E80 38 21 00 60 */ addi r1, r1, 0x60 -/* 80283F24 00280E84 4E 80 00 20 */ blr +/* 80283F24 00280E84 4E 80 00 20 */ blr .global SetIntoBallReadyAnimation__7CPlayerFR13CStateManager SetIntoBallReadyAnimation__7CPlayerFR13CStateManager: @@ -2480,7 +2480,7 @@ SetIntoBallReadyAnimation__7CPlayerFR13CStateManager: /* 80284000 00280F60 80 01 00 64 */ lwz r0, 0x64(r1) /* 80284004 00280F64 7C 08 03 A6 */ mtlr r0 /* 80284008 00280F68 38 21 00 60 */ addi r1, r1, 0x60 -/* 8028400C 00280F6C 4E 80 00 20 */ blr +/* 8028400C 00280F6C 4E 80 00 20 */ blr .global UpdateCameraBob__7CPlayerFfR13CStateManager UpdateCameraBob__7CPlayerFfR13CStateManager: @@ -2713,12 +2713,12 @@ lbl_802842CC: /* 8028435C 002812BC 83 A1 00 54 */ lwz r29, 0x54(r1) /* 80284360 002812C0 7C 08 03 A6 */ mtlr r0 /* 80284364 002812C4 38 21 00 90 */ addi r1, r1, 0x90 -/* 80284368 002812C8 4E 80 00 20 */ blr +/* 80284368 002812C8 4E 80 00 20 */ blr .global SetEyeZBias__7CPlayerFf SetEyeZBias__7CPlayerFf: /* 8028436C 002812CC D0 23 09 C8 */ stfs f1, 0x9c8(r3) -/* 80284370 002812D0 4E 80 00 20 */ blr +/* 80284370 002812D0 4E 80 00 20 */ blr .global AddToPlayerHintRemoveList__7CPlayerF9TUniqueIdR13CStateManager AddToPlayerHintRemoveList__7CPlayerF9TUniqueIdR13CStateManager: @@ -2773,7 +2773,7 @@ lbl_80284418: /* 80284420 00281380 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80284424 00281384 7C 08 03 A6 */ mtlr r0 /* 80284428 00281388 38 21 00 20 */ addi r1, r1, 0x20 -/* 8028442C 0028138C 4E 80 00 20 */ blr +/* 8028442C 0028138C 4E 80 00 20 */ blr .global DeactivatePlayerHint__7CPlayerF9TUniqueIdR13CStateManager DeactivatePlayerHint__7CPlayerF9TUniqueIdR13CStateManager: @@ -2834,7 +2834,7 @@ lbl_802844E8: /* 802844F4 00281454 83 A1 00 24 */ lwz r29, 0x24(r1) /* 802844F8 00281458 7C 08 03 A6 */ mtlr r0 /* 802844FC 0028145C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80284500 00281460 4E 80 00 20 */ blr +/* 80284500 00281460 4E 80 00 20 */ blr .global AddToPlayerHintAddList__7CPlayerF9TUniqueIdR13CStateManager AddToPlayerHintAddList__7CPlayerF9TUniqueIdR13CStateManager: @@ -2892,7 +2892,7 @@ lbl_802845B4: /* 802845BC 0028151C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 802845C0 00281520 7C 08 03 A6 */ mtlr r0 /* 802845C4 00281524 38 21 00 20 */ addi r1, r1, 0x20 -/* 802845C8 00281528 4E 80 00 20 */ blr +/* 802845C8 00281528 4E 80 00 20 */ blr .global UpdatePlayerHints__7CPlayerFRC13CStateManager UpdatePlayerHints__7CPlayerFRC13CStateManager: @@ -3250,7 +3250,7 @@ lbl_80284A94: /* 80284A98 002819F8 80 01 00 74 */ lwz r0, 0x74(r1) /* 80284A9C 002819FC 7C 08 03 A6 */ mtlr r0 /* 80284AA0 00281A00 38 21 00 70 */ addi r1, r1, 0x70 -/* 80284AA4 00281A04 4E 80 00 20 */ blr +/* 80284AA4 00281A04 4E 80 00 20 */ blr .global SetAreaPlayerHint__7CPlayerFRC17CScriptPlayerHintRC13CStateManager SetAreaPlayerHint__7CPlayerFRC17CScriptPlayerHintRC13CStateManager: @@ -3389,7 +3389,7 @@ lbl_80284C88: /* 80284C94 00281BF4 83 C1 00 08 */ lwz r30, 8(r1) /* 80284C98 00281BF8 7C 08 03 A6 */ mtlr r0 /* 80284C9C 00281BFC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80284CA0 00281C00 4E 80 00 20 */ blr +/* 80284CA0 00281C00 4E 80 00 20 */ blr .global ResetPlayerHintState__7CPlayerFv ResetPlayerHintState__7CPlayerFv: @@ -3433,7 +3433,7 @@ ResetPlayerHintState__7CPlayerFv: /* 80284D38 00281C98 80 01 00 14 */ lwz r0, 0x14(r1) /* 80284D3C 00281C9C 7C 08 03 A6 */ mtlr r0 /* 80284D40 00281CA0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80284D44 00281CA4 4E 80 00 20 */ blr +/* 80284D44 00281CA4 4E 80 00 20 */ blr .global GetBallPosition__7CPlayerCFv GetBallPosition__7CPlayerCFv: @@ -3449,7 +3449,7 @@ GetBallPosition__7CPlayerCFv: /* 80284D6C 00281CCC EC 02 08 2A */ fadds f0, f2, f1 /* 80284D70 00281CD0 D0 63 00 04 */ stfs f3, 4(r3) /* 80284D74 00281CD4 D0 03 00 08 */ stfs f0, 8(r3) -/* 80284D78 00281CD8 4E 80 00 20 */ blr +/* 80284D78 00281CD8 4E 80 00 20 */ blr .global GetEyePosition__7CPlayerCFv GetEyePosition__7CPlayerCFv: @@ -3477,7 +3477,7 @@ GetEyePosition__7CPlayerCFv: /* 80284DD0 00281D30 83 C1 00 08 */ lwz r30, 8(r1) /* 80284DD4 00281D34 7C 08 03 A6 */ mtlr r0 /* 80284DD8 00281D38 38 21 00 10 */ addi r1, r1, 0x10 -/* 80284DDC 00281D3C 4E 80 00 20 */ blr +/* 80284DDC 00281D3C 4E 80 00 20 */ blr .global GetEyeHeight__7CPlayerCFv GetEyeHeight__7CPlayerCFv: @@ -3494,7 +3494,7 @@ GetEyeHeight__7CPlayerCFv: /* 80284E08 00281D68 D0 41 00 08 */ stfs f2, 8(r1) /* 80284E0C 00281D6C D0 61 00 10 */ stfs f3, 0x10(r1) /* 80284E10 00281D70 38 21 00 20 */ addi r1, r1, 0x20 -/* 80284E14 00281D74 4E 80 00 20 */ blr +/* 80284E14 00281D74 4E 80 00 20 */ blr .global GetUnbiasedEyeHeight__7CPlayerCFv GetUnbiasedEyeHeight__7CPlayerCFv: @@ -3509,7 +3509,7 @@ GetUnbiasedEyeHeight__7CPlayerCFv: /* 80284E38 00281D98 D0 41 00 08 */ stfs f2, 8(r1) /* 80284E3C 00281D9C D0 61 00 10 */ stfs f3, 0x10(r1) /* 80284E40 00281DA0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80284E44 00281DA4 4E 80 00 20 */ blr +/* 80284E44 00281DA4 4E 80 00 20 */ blr .global GetStepUpHeight__7CPlayerCFv GetStepUpHeight__7CPlayerCFv: @@ -3530,7 +3530,7 @@ lbl_80284E74: /* 80284E74 00281DD4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80284E78 00281DD8 7C 08 03 A6 */ mtlr r0 /* 80284E7C 00281DDC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80284E80 00281DE0 4E 80 00 20 */ blr +/* 80284E80 00281DE0 4E 80 00 20 */ blr .global GetStepDownHeight__7CPlayerCFv GetStepDownHeight__7CPlayerCFv: @@ -3553,7 +3553,7 @@ lbl_80284EB8: /* 80284EB8 00281E18 80 01 00 14 */ lwz r0, 0x14(r1) /* 80284EBC 00281E1C 7C 08 03 A6 */ mtlr r0 /* 80284EC0 00281E20 38 21 00 10 */ addi r1, r1, 0x10 -/* 80284EC4 00281E24 4E 80 00 20 */ blr +/* 80284EC4 00281E24 4E 80 00 20 */ blr .global UpdateSubmerged__7CPlayerFRC13CStateManager UpdateSubmerged__7CPlayerFRC13CStateManager: @@ -3639,7 +3639,7 @@ lbl_80284FDC: /* 80284FFC 00281F5C 83 C1 00 58 */ lwz r30, 0x58(r1) /* 80285000 00281F60 7C 08 03 A6 */ mtlr r0 /* 80285004 00281F64 38 21 00 90 */ addi r1, r1, 0x90 -/* 80285008 00281F68 4E 80 00 20 */ blr +/* 80285008 00281F68 4E 80 00 20 */ blr .global CheckSubmerged__7CPlayerCFv CheckSubmerged__7CPlayerCFv: @@ -3681,7 +3681,7 @@ lbl_80285080: /* 8028508C 00281FEC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80285090 00281FF0 7C 08 03 A6 */ mtlr r0 /* 80285094 00281FF4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80285098 00281FF8 4E 80 00 20 */ blr +/* 80285098 00281FF8 4E 80 00 20 */ blr .global Teleport__7CPlayerFRC12CTransform4fR13CStateManagerb Teleport__7CPlayerFRC12CTransform4fR13CStateManagerb: @@ -3876,7 +3876,7 @@ lbl_80285294: /* 80285374 002822D4 81 83 00 00 */ lwz r12, 0(r3) /* 80285378 002822D8 81 8C 00 70 */ lwz r12, 0x70(r12) /* 8028537C 002822DC 7D 89 03 A6 */ mtctr r12 -/* 80285380 002822E0 4E 80 04 21 */ bctrl +/* 80285380 002822E0 4E 80 04 21 */ bctrl /* 80285384 002822E4 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 80285388 002822E8 41 82 00 24 */ beq lbl_802853AC /* 8028538C 002822EC 80 7E 08 70 */ lwz r3, 0x870(r30) @@ -3886,7 +3886,7 @@ lbl_80285294: /* 8028539C 002822FC 81 83 00 00 */ lwz r12, 0(r3) /* 802853A0 00282300 81 8C 00 70 */ lwz r12, 0x70(r12) /* 802853A4 00282304 7D 89 03 A6 */ mtctr r12 -/* 802853A8 00282308 4E 80 04 21 */ bctrl +/* 802853A8 00282308 4E 80 04 21 */ bctrl lbl_802853AC: /* 802853AC 0028230C 7F A3 EB 78 */ mr r3, r29 /* 802853B0 00282310 7F C5 F3 78 */ mr r5, r30 @@ -3903,7 +3903,7 @@ lbl_802853AC: /* 802853DC 0028233C 83 81 00 D0 */ lwz r28, 0xd0(r1) /* 802853E0 00282340 7C 08 03 A6 */ mtlr r0 /* 802853E4 00282344 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 802853E8 00282348 4E 80 00 20 */ blr +/* 802853E8 00282348 4E 80 00 20 */ blr .global BombJump__7CPlayerFRC9CVector3fR13CStateManager BombJump__7CPlayerFRC9CVector3fR13CStateManager: @@ -4112,7 +4112,7 @@ lbl_802856C4: /* 802856D8 00282638 83 A1 00 34 */ lwz r29, 0x34(r1) /* 802856DC 0028263C 7C 08 03 A6 */ mtlr r0 /* 802856E0 00282640 38 21 00 50 */ addi r1, r1, 0x50 -/* 802856E4 00282644 4E 80 00 20 */ blr +/* 802856E4 00282644 4E 80 00 20 */ blr .global CreateTransformFromMovementDirection__7CPlayerCFv CreateTransformFromMovementDirection__7CPlayerCFv: @@ -4168,7 +4168,7 @@ lbl_8028574C: /* 802857A4 00282704 83 C1 00 38 */ lwz r30, 0x38(r1) /* 802857A8 00282708 7C 08 03 A6 */ mtlr r0 /* 802857AC 0028270C 38 21 00 40 */ addi r1, r1, 0x40 -/* 802857B0 00282710 4E 80 00 20 */ blr +/* 802857B0 00282710 4E 80 00 20 */ blr .global GetCollisionPrimitive__7CPlayerCFv GetCollisionPrimitive__7CPlayerCFv: @@ -4201,13 +4201,13 @@ lbl_80285804: /* 80285804 00282764 80 01 00 14 */ lwz r0, 0x14(r1) /* 80285808 00282768 7C 08 03 A6 */ mtlr r0 /* 8028580C 0028276C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80285810 00282770 4E 80 00 20 */ blr +/* 80285810 00282770 4E 80 00 20 */ blr .global sub_80285814 sub_80285814: /* 80285814 00282774 80 63 07 68 */ lwz r3, 0x768(r3) /* 80285818 00282778 38 63 00 38 */ addi r3, r3, 0x38 -/* 8028581C 0028277C 4E 80 00 20 */ blr +/* 8028581C 0028277C 4E 80 00 20 */ blr .global GetPrimitiveTransform__7CPlayerCFv GetPrimitiveTransform__7CPlayerCFv: @@ -4221,7 +4221,7 @@ GetPrimitiveTransform__7CPlayerCFv: /* 8028583C 0028279C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80285840 002827A0 7C 08 03 A6 */ mtlr r0 /* 80285844 002827A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80285848 002827A8 4E 80 00 20 */ blr +/* 80285848 002827A8 4E 80 00 20 */ blr .global CollidedWith__7CPlayerFRC9TUniqueIdRC18CCollisionInfoListR13CStateManager CollidedWith__7CPlayerFRC9TUniqueIdRC18CCollisionInfoListR13CStateManager: @@ -4237,7 +4237,7 @@ lbl_8028586C: /* 8028586C 002827CC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80285870 002827D0 7C 08 03 A6 */ mtlr r0 /* 80285874 002827D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80285878 002827D8 4E 80 00 20 */ blr +/* 80285878 002827D8 4E 80 00 20 */ blr .global GetActualBallMaxVelocity__7CPlayerCFf GetActualBallMaxVelocity__7CPlayerCFf: @@ -4281,7 +4281,7 @@ lbl_802858E0: /* 802858F8 00282858 EC 00 20 28 */ fsubs f0, f0, f4 /* 802858FC 0028285C EC 00 18 28 */ fsubs f0, f0, f3 /* 80285900 00282860 FC 20 00 50 */ fneg f1, f0 -/* 80285904 00282864 4E 80 00 20 */ blr +/* 80285904 00282864 4E 80 00 20 */ blr .global GetActualFirstPersonMaxVelocity__7CPlayerCFv GetActualFirstPersonMaxVelocity__7CPlayerCFv: @@ -4346,7 +4346,7 @@ lbl_802859A8: /* 802859C0 00282920 EC 00 20 28 */ fsubs f0, f0, f4 /* 802859C4 00282924 EC 00 18 28 */ fsubs f0, f0, f3 /* 802859C8 00282928 FC 20 00 50 */ fneg f1, f0 -/* 802859CC 0028292C 4E 80 00 20 */ blr +/* 802859CC 0028292C 4E 80 00 20 */ blr .global GetBallMaxVelocity__7CPlayerCFv GetBallMaxVelocity__7CPlayerCFv: @@ -4362,7 +4362,7 @@ lbl_802859E8: /* 802859EC 0028294C 54 00 10 3A */ slwi r0, r0, 2 /* 802859F0 00282950 7C 63 02 14 */ add r3, r3, r0 /* 802859F4 00282954 C0 23 00 44 */ lfs f1, 0x44(r3) -/* 802859F8 00282958 4E 80 00 20 */ blr +/* 802859F8 00282958 4E 80 00 20 */ blr .global CalculateLeaveMorphBallDirection__7CPlayerFRC11CFinalInput CalculateLeaveMorphBallDirection__7CPlayerFRC11CFinalInput: @@ -4437,7 +4437,7 @@ lbl_80285AE0: /* 80285B00 00282A60 83 C1 00 08 */ lwz r30, 8(r1) /* 80285B04 00282A64 7C 08 03 A6 */ mtlr r0 /* 80285B08 00282A68 38 21 00 40 */ addi r1, r1, 0x40 -/* 80285B0C 00282A6C 4E 80 00 20 */ blr +/* 80285B0C 00282A6C 4E 80 00 20 */ blr .global CalculatePlayerControlDirection__7CPlayerFR13CStateManager CalculatePlayerControlDirection__7CPlayerFR13CStateManager: @@ -4677,7 +4677,7 @@ lbl_80285E7C: /* 80285E88 00282DE8 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 80285E8C 00282DEC 7C 08 03 A6 */ mtlr r0 /* 80285E90 00282DF0 38 21 00 50 */ addi r1, r1, 0x50 -/* 80285E94 00282DF4 4E 80 00 20 */ blr +/* 80285E94 00282DF4 4E 80 00 20 */ blr .global UpdatePlayerControlDirection__7CPlayerFfR13CStateManager UpdatePlayerControlDirection__7CPlayerFfR13CStateManager: @@ -4782,7 +4782,7 @@ lbl_80285FD8: /* 80286014 00282F74 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80286018 00282F78 7C 08 03 A6 */ mtlr r0 /* 8028601C 00282F7C 38 21 00 80 */ addi r1, r1, 0x80 -/* 80286020 00282F80 4E 80 00 20 */ blr +/* 80286020 00282F80 4E 80 00 20 */ blr .global CalculatePlayerMovementDirection__7CPlayerFf CalculatePlayerMovementDirection__7CPlayerFf: @@ -5043,7 +5043,7 @@ lbl_802863D0: /* 802863DC 0028333C 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 802863E0 00283340 7C 08 03 A6 */ mtlr r0 /* 802863E4 00283344 38 21 00 50 */ addi r1, r1, 0x50 -/* 802863E8 00283348 4E 80 00 20 */ blr +/* 802863E8 00283348 4E 80 00 20 */ blr .global SetMoveState__7CPlayerFQ27NPlayer20EPlayerMovementStateR13CStateManager SetMoveState__7CPlayerFQ27NPlayer20EPlayerMovementStateR13CStateManager: @@ -5252,7 +5252,7 @@ lbl_802866D4: /* 802866DC 0028363C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 802866E0 00283640 7C 08 03 A6 */ mtlr r0 /* 802866E4 00283644 38 21 00 20 */ addi r1, r1, 0x20 -/* 802866E8 00283648 4E 80 00 20 */ blr +/* 802866E8 00283648 4E 80 00 20 */ blr .global JumpInput__7CPlayerFRC11CFinalInputR13CStateManager JumpInput__7CPlayerFRC11CFinalInputR13CStateManager: @@ -5504,7 +5504,7 @@ lbl_80286A30: /* 80286A6C 002839CC 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80286A70 002839D0 7C 08 03 A6 */ mtlr r0 /* 80286A74 002839D4 38 21 00 90 */ addi r1, r1, 0x90 -/* 80286A78 002839D8 4E 80 00 20 */ blr +/* 80286A78 002839D8 4E 80 00 20 */ blr .global TurnInput__7CPlayerCFRC11CFinalInput TurnInput__7CPlayerCFRC11CFinalInput: @@ -5635,7 +5635,7 @@ lbl_80286C20: /* 80286C40 00283BA0 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80286C44 00283BA4 7C 08 03 A6 */ mtlr r0 /* 80286C48 00283BA8 38 21 00 50 */ addi r1, r1, 0x50 -/* 80286C4C 00283BAC 4E 80 00 20 */ blr +/* 80286C4C 00283BAC 4E 80 00 20 */ blr .global StrafeInput__7CPlayerCFRC11CFinalInput StrafeInput__7CPlayerCFRC11CFinalInput: @@ -5674,7 +5674,7 @@ lbl_80286CB4: /* 80286CC4 00283C24 83 C1 00 08 */ lwz r30, 8(r1) /* 80286CC8 00283C28 7C 08 03 A6 */ mtlr r0 /* 80286CCC 00283C2C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80286CD0 00283C30 4E 80 00 20 */ blr +/* 80286CD0 00283C30 4E 80 00 20 */ blr .global ForwardInput__7CPlayerCFRC11CFinalInputf ForwardInput__7CPlayerCFRC11CFinalInputf: @@ -5857,7 +5857,7 @@ lbl_80286F44: /* 80286F64 00283EC4 83 C1 00 38 */ lwz r30, 0x38(r1) /* 80286F68 00283EC8 7C 08 03 A6 */ mtlr r0 /* 80286F6C 00283ECC 38 21 00 70 */ addi r1, r1, 0x70 -/* 80286F70 00283ED0 4E 80 00 20 */ blr +/* 80286F70 00283ED0 4E 80 00 20 */ blr .global ComputeMovement__7CPlayerFRC11CFinalInputR13CStateManagerf ComputeMovement__7CPlayerFRC11CFinalInputR13CStateManagerf: @@ -6516,7 +6516,7 @@ lbl_8028781C: /* 80287864 002847C4 83 81 00 F0 */ lwz r28, 0xf0(r1) /* 80287868 002847C8 7C 08 03 A6 */ mtlr r0 /* 8028786C 002847CC 38 21 01 60 */ addi r1, r1, 0x160 -/* 80287870 002847D0 4E 80 00 20 */ blr +/* 80287870 002847D0 4E 80 00 20 */ blr .global ComputeDash__7CPlayerFRC11CFinalInputfR13CStateManager ComputeDash__7CPlayerFRC11CFinalInputfR13CStateManager: @@ -6956,7 +6956,7 @@ lbl_80287E84: /* 80287ECC 00284E2C 83 81 00 B0 */ lwz r28, 0xb0(r1) /* 80287ED0 00284E30 7C 08 03 A6 */ mtlr r0 /* 80287ED4 00284E34 38 21 01 30 */ addi r1, r1, 0x130 -/* 80287ED8 00284E38 4E 80 00 20 */ blr +/* 80287ED8 00284E38 4E 80 00 20 */ blr .global FinishSidewaysDash__7CPlayerFv FinishSidewaysDash__7CPlayerFv: @@ -6971,7 +6971,7 @@ lbl_80287EF0: /* 80287EF8 00284E58 98 03 03 7C */ stb r0, 0x37c(r3) /* 80287EFC 00284E5C D0 03 03 80 */ stfs f0, 0x380(r3) /* 80287F00 00284E60 D0 03 03 84 */ stfs f0, 0x384(r3) -/* 80287F04 00284E64 4E 80 00 20 */ blr +/* 80287F04 00284E64 4E 80 00 20 */ blr .global SidewaysDashAllowed__7CPlayerCFffRC11CFinalInputR13CStateManager SidewaysDashAllowed__7CPlayerCFffRC11CFinalInputR13CStateManager: @@ -7090,7 +7090,7 @@ lbl_802880A0: /* 802880B4 00285014 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 802880B8 00285018 7C 08 03 A6 */ mtlr r0 /* 802880BC 0028501C 38 21 00 50 */ addi r1, r1, 0x50 -/* 802880C0 00285020 4E 80 00 20 */ blr +/* 802880C0 00285020 4E 80 00 20 */ blr .global UpdateStepCameraZBias__7CPlayerFf UpdateStepCameraZBias__7CPlayerFf: @@ -7145,14 +7145,14 @@ UpdateStepCameraZBias__7CPlayerFf: /* 80288184 002850E4 81 9F 00 00 */ lwz r12, 0(r31) /* 80288188 002850E8 81 8C 00 7C */ lwz r12, 0x7c(r12) /* 8028818C 002850EC 7D 89 03 A6 */ mtctr r12 -/* 80288190 002850F0 4E 80 04 21 */ bctrl +/* 80288190 002850F0 4E 80 04 21 */ bctrl /* 80288194 002850F4 FC 1D 08 40 */ fcmpo cr0, f29, f1 /* 80288198 002850F8 40 81 00 20 */ ble lbl_802881B8 /* 8028819C 002850FC 7F E3 FB 78 */ mr r3, r31 /* 802881A0 00285100 81 9F 00 00 */ lwz r12, 0(r31) /* 802881A4 00285104 81 8C 00 7C */ lwz r12, 0x7c(r12) /* 802881A8 00285108 7D 89 03 A6 */ mtctr r12 -/* 802881AC 0028510C 4E 80 04 21 */ bctrl +/* 802881AC 0028510C 4E 80 04 21 */ bctrl /* 802881B0 00285110 EC 1D 08 28 */ fsubs f0, f29, f1 /* 802881B4 00285114 EF 9C 00 2A */ fadds f28, f28, f0 lbl_802881B8: @@ -7169,7 +7169,7 @@ lbl_802881C4: /* 802881DC 0028513C 81 9F 00 00 */ lwz r12, 0(r31) /* 802881E0 00285140 81 8C 00 78 */ lwz r12, 0x78(r12) /* 802881E4 00285144 7D 89 03 A6 */ mtctr r12 -/* 802881E8 00285148 4E 80 04 21 */ bctrl +/* 802881E8 00285148 4E 80 04 21 */ bctrl /* 802881EC 0028514C FC 00 08 50 */ fneg f0, f1 /* 802881F0 00285150 FC 1D 00 40 */ fcmpo cr0, f29, f0 /* 802881F4 00285154 40 80 00 24 */ bge lbl_80288218 @@ -7177,7 +7177,7 @@ lbl_802881C4: /* 802881FC 0028515C 81 9F 00 00 */ lwz r12, 0(r31) /* 80288200 00285160 81 8C 00 78 */ lwz r12, 0x78(r12) /* 80288204 00285164 7D 89 03 A6 */ mtctr r12 -/* 80288208 00285168 4E 80 04 21 */ bctrl +/* 80288208 00285168 4E 80 04 21 */ bctrl /* 8028820C 0028516C FC 00 E8 50 */ fneg f0, f29 /* 80288210 00285170 EC 00 08 28 */ fsubs f0, f0, f1 /* 80288214 00285174 EF 9C 00 2A */ fadds f28, f28, f0 @@ -7211,7 +7211,7 @@ lbl_8028823C: /* 80288274 002851D4 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80288278 002851D8 7C 08 03 A6 */ mtlr r0 /* 8028827C 002851DC 38 21 00 60 */ addi r1, r1, 0x60 -/* 80288280 002851E0 4E 80 00 20 */ blr +/* 80288280 002851E0 4E 80 00 20 */ blr .global UpdateBombJumpStuff__7CPlayerFv UpdateBombJumpStuff__7CPlayerFv: @@ -7255,7 +7255,7 @@ lbl_8028830C: /* 80288310 00285270 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80288314 00285274 7C 08 03 A6 */ mtlr r0 /* 80288318 00285278 38 21 00 20 */ addi r1, r1, 0x20 -/* 8028831C 0028527C 4E 80 00 20 */ blr +/* 8028831C 0028527C 4E 80 00 20 */ blr .global GetWeight__7CPlayerCFv GetWeight__7CPlayerCFv: @@ -7273,7 +7273,7 @@ GetWeight__7CPlayerCFv: /* 8028834C 002852AC CB E1 00 10 */ lfd f31, 0x10(r1) /* 80288350 002852B0 7C 08 03 A6 */ mtlr r0 /* 80288354 002852B4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80288358 002852B8 4E 80 00 20 */ blr +/* 80288358 002852B8 4E 80 00 20 */ blr .global GetGravity__7CPlayerCFv GetGravity__7CPlayerCFv: @@ -7317,7 +7317,7 @@ lbl_802883DC: /* 802883E4 00285344 83 C1 00 18 */ lwz r30, 0x18(r1) /* 802883E8 00285348 7C 08 03 A6 */ mtlr r0 /* 802883EC 0028534C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802883F0 00285350 4E 80 00 20 */ blr +/* 802883F0 00285350 4E 80 00 20 */ blr .global GetAcceleration__7CPlayerCFv GetAcceleration__7CPlayerCFv: @@ -7329,12 +7329,12 @@ GetAcceleration__7CPlayerCFv: /* 80288408 00285368 54 00 10 3A */ slwi r0, r0, 2 /* 8028840C 0028536C 7C 63 02 14 */ add r3, r3, r0 /* 80288410 00285370 C0 23 02 B8 */ lfs f1, 0x2b8(r3) -/* 80288414 00285374 4E 80 00 20 */ blr +/* 80288414 00285374 4E 80 00 20 */ blr lbl_80288418: /* 80288418 00285378 54 00 10 3A */ slwi r0, r0, 2 /* 8028841C 0028537C 7C 63 02 14 */ add r3, r3, r0 /* 80288420 00285380 C0 23 02 B8 */ lfs f1, 0x2b8(r3) -/* 80288424 00285384 4E 80 00 20 */ blr +/* 80288424 00285384 4E 80 00 20 */ blr .global GetAverageSpeed__7CPlayerCFv GetAverageSpeed__7CPlayerCFv: @@ -7365,7 +7365,7 @@ lbl_8028847C: /* 80288480 002853E0 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80288484 002853E4 7C 08 03 A6 */ mtlr r0 /* 80288488 002853E8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8028848C 002853EC 4E 80 00 20 */ blr +/* 8028848C 002853EC 4E 80 00 20 */ blr .global sub_80288490 sub_80288490: @@ -7394,7 +7394,7 @@ lbl_802884DC: /* 802884E0 00285440 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802884E4 00285444 7C 08 03 A6 */ mtlr r0 /* 802884E8 00285448 38 21 00 10 */ addi r1, r1, 0x10 -/* 802884EC 0028544C 4E 80 00 20 */ blr +/* 802884EC 0028544C 4E 80 00 20 */ blr .global GetDampedClampedVelocityWR__7CPlayerCFv GetDampedClampedVelocityWR__7CPlayerCFv: @@ -7542,7 +7542,7 @@ lbl_802886C0: /* 802886E0 00285640 83 C1 00 38 */ lwz r30, 0x38(r1) /* 802886E4 00285644 7C 08 03 A6 */ mtlr r0 /* 802886E8 00285648 38 21 00 50 */ addi r1, r1, 0x50 -/* 802886EC 0028564C 4E 80 00 20 */ blr +/* 802886EC 0028564C 4E 80 00 20 */ blr .global __sinit_CPlayerDynamics_cpp __sinit_CPlayerDynamics_cpp: diff --git a/asm/MetroidPrime/Player/CPlayerEnergyDrain.s b/asm/MetroidPrime/Player/CPlayerEnergyDrain.s index 8b402eca..2605ebfa 100644 --- a/asm/MetroidPrime/Player/CPlayerEnergyDrain.s +++ b/asm/MetroidPrime/Player/CPlayerEnergyDrain.s @@ -58,7 +58,7 @@ lbl_801B466C: /* 801B4684 001B15E4 83 A1 00 24 */ lwz r29, 0x24(r1) /* 801B4688 001B15E8 7C 08 03 A6 */ mtlr r0 /* 801B468C 001B15EC 38 21 00 40 */ addi r1, r1, 0x40 -/* 801B4690 001B15F0 4E 80 00 20 */ blr +/* 801B4690 001B15F0 4E 80 00 20 */ blr .global GetEnergyDrainIntensity__18CPlayerEnergyDrainCFv GetEnergyDrainIntensity__18CPlayerEnergyDrainCFv: @@ -75,7 +75,7 @@ lbl_801B46AC: lbl_801B46B8: /* 801B46B8 001B1618 7C 03 00 40 */ cmplw r3, r0 /* 801B46BC 001B161C 40 82 FF F0 */ bne lbl_801B46AC -/* 801B46C0 001B1620 4E 80 00 20 */ blr +/* 801B46C0 001B1620 4E 80 00 20 */ blr .global RemoveEnergyDrainSource__18CPlayerEnergyDrainF9TUniqueId RemoveEnergyDrainSource__18CPlayerEnergyDrainF9TUniqueId: @@ -139,7 +139,7 @@ lbl_801B4798: /* 801B479C 001B16FC 83 E1 00 4C */ lwz r31, 0x4c(r1) /* 801B47A0 001B1700 7C 08 03 A6 */ mtlr r0 /* 801B47A4 001B1704 38 21 00 50 */ addi r1, r1, 0x50 -/* 801B47A8 001B1708 4E 80 00 20 */ blr +/* 801B47A8 001B1708 4E 80 00 20 */ blr .global sub_801b47ac sub_801b47ac: @@ -161,7 +161,7 @@ sub_801b47ac: /* 801B47E8 001B1748 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801B47EC 001B174C 7C 08 03 A6 */ mtlr r0 /* 801B47F0 001B1750 38 21 00 20 */ addi r1, r1, 0x20 -/* 801B47F4 001B1754 4E 80 00 20 */ blr +/* 801B47F4 001B1754 4E 80 00 20 */ blr .global sub_801b47f8 sub_801b47f8: @@ -208,7 +208,7 @@ lbl_801B4868: /* 801B4884 001B17E4 80 05 00 00 */ lwz r0, 0(r5) /* 801B4888 001B17E8 90 03 00 00 */ stw r0, 0(r3) /* 801B488C 001B17EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801B4890 001B17F0 4E 80 00 20 */ blr +/* 801B4890 001B17F0 4E 80 00 20 */ blr .global sub_801b4894 sub_801b4894: @@ -297,7 +297,7 @@ lbl_801B49C0: /* 801B49C8 001B1928 83 E1 00 54 */ lwz r31, 0x54(r1) /* 801B49CC 001B192C 7C 08 03 A6 */ mtlr r0 /* 801B49D0 001B1930 38 21 00 60 */ addi r1, r1, 0x60 -/* 801B49D4 001B1934 4E 80 00 20 */ blr +/* 801B49D4 001B1934 4E 80 00 20 */ blr .global sub_801b49d8 sub_801b49d8: @@ -335,7 +335,7 @@ sub_801b49d8: /* 801B4A54 001B19B4 83 A1 00 24 */ lwz r29, 0x24(r1) /* 801B4A58 001B19B8 7C 08 03 A6 */ mtlr r0 /* 801B4A5C 001B19BC 38 21 00 30 */ addi r1, r1, 0x30 -/* 801B4A60 001B19C0 4E 80 00 20 */ blr +/* 801B4A60 001B19C0 4E 80 00 20 */ blr .global sub_801b4a64 sub_801b4a64: @@ -515,7 +515,7 @@ lbl_801B4CB0: /* 801B4CB4 001B1C14 80 01 00 34 */ lwz r0, 0x34(r1) /* 801B4CB8 001B1C18 7C 08 03 A6 */ mtlr r0 /* 801B4CBC 001B1C1C 38 21 00 30 */ addi r1, r1, 0x30 -/* 801B4CC0 001B1C20 4E 80 00 20 */ blr +/* 801B4CC0 001B1C20 4E 80 00 20 */ blr .global __ct__18CPlayerEnergyDrainFUi __ct__18CPlayerEnergyDrainFUi: @@ -536,7 +536,7 @@ __ct__18CPlayerEnergyDrainFUi: /* 801B4CFC 001B1C5C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801B4D00 001B1C60 7C 08 03 A6 */ mtlr r0 /* 801B4D04 001B1C64 38 21 00 10 */ addi r1, r1, 0x10 -/* 801B4D08 001B1C68 4E 80 00 20 */ blr +/* 801B4D08 001B1C68 4E 80 00 20 */ blr .global "lower_bound,Q24rstl17rmemory_allocator>,18CEnergyDrainSource>__4rstlFQ24rstl130pointer_iterator<18CEnergyDrainSource,Q24rstl55vector<18CEnergyDrainSource,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl130pointer_iterator<18CEnergyDrainSource,Q24rstl55vector<18CEnergyDrainSource,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>RC18CEnergyDrainSource" "lower_bound,Q24rstl17rmemory_allocator>,18CEnergyDrainSource>__4rstlFQ24rstl130pointer_iterator<18CEnergyDrainSource,Q24rstl55vector<18CEnergyDrainSource,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl130pointer_iterator<18CEnergyDrainSource,Q24rstl55vector<18CEnergyDrainSource,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>RC18CEnergyDrainSource": @@ -590,7 +590,7 @@ lbl_801B4DA8: /* 801B4DBC 001B1D1C 80 01 00 34 */ lwz r0, 0x34(r1) /* 801B4DC0 001B1D20 7C 08 03 A6 */ mtlr r0 /* 801B4DC4 001B1D24 38 21 00 30 */ addi r1, r1, 0x30 -/* 801B4DC8 001B1D28 4E 80 00 20 */ blr +/* 801B4DC8 001B1D28 4E 80 00 20 */ blr .global "reserve__Q24rstl55vector<18CEnergyDrainSource,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl55vector<18CEnergyDrainSource,Q24rstl17rmemory_allocator>Fi": @@ -663,7 +663,7 @@ lbl_801B4EA4: /* 801B4EB0 001B1E10 83 A1 00 24 */ lwz r29, 0x24(r1) /* 801B4EB4 001B1E14 7C 08 03 A6 */ mtlr r0 /* 801B4EB8 001B1E18 38 21 00 30 */ addi r1, r1, 0x30 -/* 801B4EBC 001B1E1C 4E 80 00 20 */ blr +/* 801B4EBC 001B1E1C 4E 80 00 20 */ blr .global "advance,Q24rstl17rmemory_allocator>,i>__4rstlFRQ24rstl130pointer_iterator<18CEnergyDrainSource,Q24rstl55vector<18CEnergyDrainSource,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>i" "advance,Q24rstl17rmemory_allocator>,i>__4rstlFRQ24rstl130pointer_iterator<18CEnergyDrainSource,Q24rstl55vector<18CEnergyDrainSource,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>i": @@ -677,7 +677,7 @@ lbl_801B4EA4: /* 801B4EDC 001B1E3C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801B4EE0 001B1E40 7C 08 03 A6 */ mtlr r0 /* 801B4EE4 001B1E44 38 21 00 10 */ addi r1, r1, 0x10 -/* 801B4EE8 001B1E48 4E 80 00 20 */ blr +/* 801B4EE8 001B1E48 4E 80 00 20 */ blr .global "__advance,Q24rstl17rmemory_allocator>,i>__4rstlFRQ24rstl130pointer_iterator<18CEnergyDrainSource,Q24rstl55vector<18CEnergyDrainSource,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>iQ24rstl26random_access_iterator_tag" "__advance,Q24rstl17rmemory_allocator>,i>__4rstlFRQ24rstl130pointer_iterator<18CEnergyDrainSource,Q24rstl55vector<18CEnergyDrainSource,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>iQ24rstl26random_access_iterator_tag": @@ -685,7 +685,7 @@ lbl_801B4EA4: /* 801B4EF0 001B1E50 54 80 18 38 */ slwi r0, r4, 3 /* 801B4EF4 001B1E54 7C 05 02 14 */ add r0, r5, r0 /* 801B4EF8 001B1E58 90 03 00 00 */ stw r0, 0(r3) -/* 801B4EFC 001B1E5C 4E 80 00 20 */ blr +/* 801B4EFC 001B1E5C 4E 80 00 20 */ blr .global "distance,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl130pointer_iterator<18CEnergyDrainSource,Q24rstl55vector<18CEnergyDrainSource,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl130pointer_iterator<18CEnergyDrainSource,Q24rstl55vector<18CEnergyDrainSource,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>" "distance,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl130pointer_iterator<18CEnergyDrainSource,Q24rstl55vector<18CEnergyDrainSource,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl130pointer_iterator<18CEnergyDrainSource,Q24rstl55vector<18CEnergyDrainSource,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>": @@ -705,7 +705,7 @@ lbl_801B4EA4: /* 801B4F34 001B1E94 80 01 00 24 */ lwz r0, 0x24(r1) /* 801B4F38 001B1E98 7C 08 03 A6 */ mtlr r0 /* 801B4F3C 001B1E9C 38 21 00 20 */ addi r1, r1, 0x20 -/* 801B4F40 001B1EA0 4E 80 00 20 */ blr +/* 801B4F40 001B1EA0 4E 80 00 20 */ blr .global "__distance,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl130pointer_iterator<18CEnergyDrainSource,Q24rstl55vector<18CEnergyDrainSource,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl130pointer_iterator<18CEnergyDrainSource,Q24rstl55vector<18CEnergyDrainSource,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl26random_access_iterator_tag" "__distance,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl130pointer_iterator<18CEnergyDrainSource,Q24rstl55vector<18CEnergyDrainSource,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl130pointer_iterator<18CEnergyDrainSource,Q24rstl55vector<18CEnergyDrainSource,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl26random_access_iterator_tag": diff --git a/asm/MetroidPrime/Player/CPlayerGun.s b/asm/MetroidPrime/Player/CPlayerGun.s index 63313a4d..a586001c 100644 --- a/asm/MetroidPrime/Player/CPlayerGun.s +++ b/asm/MetroidPrime/Player/CPlayerGun.s @@ -138,7 +138,7 @@ lbl_805A6E18: # ROM: 0x3F47B8 .4byte 0x00000012 .4byte 0 - + .section .bss .global lbl_8045C518 @@ -184,7 +184,7 @@ CModelDataNull__10CModelDataFv: /* 8003A7B4 00037714 80 01 00 14 */ lwz r0, 0x14(r1) /* 8003A7B8 00037718 7C 08 03 A6 */ mtlr r0 /* 8003A7BC 0003771C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8003A7C0 00037720 4E 80 00 20 */ blr +/* 8003A7C0 00037720 4E 80 00 20 */ blr .global clear_transform__FRC12CTransform4f clear_transform__FRC12CTransform4f: @@ -210,7 +210,7 @@ clear_transform__FRC12CTransform4f: /* 8003A810 00037770 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 8003A814 00037774 7C 08 03 A6 */ mtlr r0 /* 8003A818 00037778 38 21 00 40 */ addi r1, r1, 0x40 -/* 8003A81C 0003777C 4E 80 00 20 */ blr +/* 8003A81C 0003777C 4E 80 00 20 */ blr .global SetPhazonBeamFeedback__10CPlayerGunFb SetPhazonBeamFeedback__10CPlayerGunFb: @@ -272,7 +272,7 @@ lbl_8003A8EC: /* 8003A8F4 00037854 83 C1 00 38 */ lwz r30, 0x38(r1) /* 8003A8F8 00037858 7C 08 03 A6 */ mtlr r0 /* 8003A8FC 0003785C 38 21 00 40 */ addi r1, r1, 0x40 -/* 8003A900 00037860 4E 80 00 20 */ blr +/* 8003A900 00037860 4E 80 00 20 */ blr .global DropPowerBomb__10CPlayerGunCFR13CStateManager DropPowerBomb__10CPlayerGunCFR13CStateManager: @@ -399,7 +399,7 @@ lbl_8003AAB4: /* 8003AAD4 00037A34 80 01 00 D4 */ lwz r0, 0xd4(r1) /* 8003AAD8 00037A38 7C 08 03 A6 */ mtlr r0 /* 8003AADC 00037A3C 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 8003AAE0 00037A40 4E 80 00 20 */ blr +/* 8003AAE0 00037A40 4E 80 00 20 */ blr .global ReturnToRestPose__10CPlayerGunFv ReturnToRestPose__10CPlayerGunFv: @@ -437,7 +437,7 @@ lbl_8003AB50: /* 8003AB54 00037AB4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8003AB58 00037AB8 7C 08 03 A6 */ mtlr r0 /* 8003AB5C 00037ABC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8003AB60 00037AC0 4E 80 00 20 */ blr +/* 8003AB60 00037AC0 4E 80 00 20 */ blr .global AsyncLoadSuit__10CPlayerGunFR13CStateManager AsyncLoadSuit__10CPlayerGunFR13CStateManager: @@ -458,7 +458,7 @@ AsyncLoadSuit__10CPlayerGunFR13CStateManager: /* 8003AB9C 00037AFC 83 C1 00 08 */ lwz r30, 8(r1) /* 8003ABA0 00037B00 7C 08 03 A6 */ mtlr r0 /* 8003ABA4 00037B04 38 21 00 10 */ addi r1, r1, 0x10 -/* 8003ABA8 00037B08 4E 80 00 20 */ blr +/* 8003ABA8 00037B08 4E 80 00 20 */ blr .global SetFidgetAnimBits__10CPlayerGunFib SetFidgetAnimBits__10CPlayerGunFib: @@ -468,24 +468,24 @@ SetFidgetAnimBits__10CPlayerGunFib: /* 8003ABB8 00037B18 41 82 00 10 */ beq lbl_8003ABC8 /* 8003ABBC 00037B1C 38 00 00 02 */ li r0, 2 /* 8003ABC0 00037B20 90 03 02 FC */ stw r0, 0x2fc(r3) -/* 8003ABC4 00037B24 4E 80 00 20 */ blr +/* 8003ABC4 00037B24 4E 80 00 20 */ blr lbl_8003ABC8: /* 8003ABC8 00037B28 80 03 03 A8 */ lwz r0, 0x3a8(r3) /* 8003ABCC 00037B2C 2C 00 00 01 */ cmpwi r0, 1 /* 8003ABD0 00037B30 41 82 00 38 */ beq lbl_8003AC08 -/* 8003ABD4 00037B34 4C 80 00 20 */ bgelr +/* 8003ABD4 00037B34 4C 80 00 20 */ bgelr /* 8003ABD8 00037B38 2C 00 00 00 */ cmpwi r0, 0 -/* 8003ABDC 00037B3C 4D 80 00 20 */ bltlr +/* 8003ABDC 00037B3C 4D 80 00 20 */ bltlr /* 8003ABE0 00037B40 38 00 00 01 */ li r0, 1 /* 8003ABE4 00037B44 2C 04 00 00 */ cmpwi r4, 0 /* 8003ABE8 00037B48 90 03 02 FC */ stw r0, 0x2fc(r3) -/* 8003ABEC 00037B4C 4C 81 00 20 */ blelr +/* 8003ABEC 00037B4C 4C 81 00 20 */ blelr /* 8003ABF0 00037B50 2C 04 00 02 */ cmpwi r4, 2 -/* 8003ABF4 00037B54 4C 80 00 20 */ bgelr +/* 8003ABF4 00037B54 4C 80 00 20 */ bgelr /* 8003ABF8 00037B58 80 03 02 FC */ lwz r0, 0x2fc(r3) /* 8003ABFC 00037B5C 60 00 00 04 */ ori r0, r0, 4 /* 8003AC00 00037B60 90 03 02 FC */ stw r0, 0x2fc(r3) -/* 8003AC04 00037B64 4E 80 00 20 */ blr +/* 8003AC04 00037B64 4E 80 00 20 */ blr lbl_8003AC08: /* 8003AC08 00037B68 2C 04 00 06 */ cmpwi r4, 6 /* 8003AC0C 00037B6C 40 80 00 0C */ bge lbl_8003AC18 @@ -502,7 +502,7 @@ lbl_8003AC2C: /* 8003AC2C 00037B8C 80 03 02 FC */ lwz r0, 0x2fc(r3) /* 8003AC30 00037B90 60 00 00 04 */ ori r0, r0, 4 /* 8003AC34 00037B94 90 03 02 FC */ stw r0, 0x2fc(r3) -/* 8003AC38 00037B98 4E 80 00 20 */ blr +/* 8003AC38 00037B98 4E 80 00 20 */ blr .global IsFidgetLoaded__10CPlayerGunFv IsFidgetLoaded__10CPlayerGunFv: @@ -557,7 +557,7 @@ lbl_8003ACD8: /* 8003ACF0 00037C50 80 01 00 14 */ lwz r0, 0x14(r1) /* 8003ACF4 00037C54 7C 08 03 A6 */ mtlr r0 /* 8003ACF8 00037C58 38 21 00 10 */ addi r1, r1, 0x10 -/* 8003ACFC 00037C5C 4E 80 00 20 */ blr +/* 8003ACFC 00037C5C 4E 80 00 20 */ blr .global UnLoadFidget__10CPlayerGunFv UnLoadFidget__10CPlayerGunFv: @@ -598,7 +598,7 @@ lbl_8003AD70: /* 8003AD7C 00037CDC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8003AD80 00037CE0 7C 08 03 A6 */ mtlr r0 /* 8003AD84 00037CE4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8003AD88 00037CE8 4E 80 00 20 */ blr +/* 8003AD88 00037CE8 4E 80 00 20 */ blr .global AsyncLoadFidget__10CPlayerGunFR13CStateManager AsyncLoadFidget__10CPlayerGunFR13CStateManager: @@ -672,7 +672,7 @@ lbl_8003AE7C: /* 8003AE80 00037DE0 80 01 00 24 */ lwz r0, 0x24(r1) /* 8003AE84 00037DE4 7C 08 03 A6 */ mtlr r0 /* 8003AE88 00037DE8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8003AE8C 00037DEC 4E 80 00 20 */ blr +/* 8003AE8C 00037DEC 4E 80 00 20 */ blr .global ProcessGunMorph__10CPlayerGunFfR13CStateManager ProcessGunMorph__10CPlayerGunFfR13CStateManager: @@ -721,7 +721,7 @@ lbl_8003AF28: /* 8003AF2C 00037E8C 81 83 00 00 */ lwz r12, 0(r3) /* 8003AF30 00037E90 81 8C 00 40 */ lwz r12, 0x40(r12) /* 8003AF34 00037E94 7D 89 03 A6 */ mtctr r12 -/* 8003AF38 00037E98 4E 80 04 21 */ bctrl +/* 8003AF38 00037E98 4E 80 04 21 */ bctrl /* 8003AF3C 00037E9C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8003AF40 00037EA0 41 82 00 EC */ beq lbl_8003B02C /* 8003AF44 00037EA4 80 7C 07 44 */ lwz r3, 0x744(r28) @@ -767,7 +767,7 @@ lbl_8003AFCC: /* 8003AFD8 00037F38 81 83 00 00 */ lwz r12, 0(r3) /* 8003AFDC 00037F3C 81 8C 00 24 */ lwz r12, 0x24(r12) /* 8003AFE0 00037F40 7D 89 03 A6 */ mtctr r12 -/* 8003AFE4 00037F44 4E 80 04 21 */ bctrl +/* 8003AFE4 00037F44 4E 80 04 21 */ bctrl /* 8003AFE8 00037F48 C0 3C 06 78 */ lfs f1, 0x678(r28) /* 8003AFEC 00037F4C 38 81 00 10 */ addi r4, r1, 0x10 /* 8003AFF0 00037F50 C0 02 84 6C */ lfs f0, lbl_805AA18C@sda21(r2) @@ -778,13 +778,13 @@ lbl_8003AFCC: /* 8003B004 00037F64 81 83 00 00 */ lwz r12, 0(r3) /* 8003B008 00037F68 81 8C 00 20 */ lwz r12, 0x20(r12) /* 8003B00C 00037F6C 7D 89 03 A6 */ mtctr r12 -/* 8003B010 00037F70 4E 80 04 21 */ bctrl +/* 8003B010 00037F70 4E 80 04 21 */ bctrl /* 8003B014 00037F74 80 7C 07 78 */ lwz r3, 0x778(r28) /* 8003B018 00037F78 FC 20 F8 90 */ fmr f1, f31 /* 8003B01C 00037F7C 81 83 00 00 */ lwz r12, 0(r3) /* 8003B020 00037F80 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8003B024 00037F84 7D 89 03 A6 */ mtctr r12 -/* 8003B028 00037F88 4E 80 04 21 */ bctrl +/* 8003B028 00037F88 4E 80 04 21 */ bctrl lbl_8003B02C: /* 8003B02C 00037F8C FC 60 F8 90 */ fmr f3, f31 /* 8003B030 00037F90 C0 22 84 70 */ lfs f1, lbl_805AA190@sda21(r2) @@ -819,7 +819,7 @@ lbl_8003B080: /* 8003B09C 00037FFC 7F A4 EB 78 */ mr r4, r29 /* 8003B0A0 00038000 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 8003B0A4 00038004 7D 89 03 A6 */ mtctr r12 -/* 8003B0A8 00038008 4E 80 04 21 */ bctrl +/* 8003B0A8 00038008 4E 80 04 21 */ bctrl /* 8003B0AC 0003800C 38 00 00 00 */ li r0, 0 /* 8003B0B0 00038010 90 1C 07 30 */ stw r0, 0x730(r28) lbl_8003B0B4: @@ -844,7 +844,7 @@ lbl_8003B0E4: /* 8003B0F8 00038058 81 83 00 00 */ lwz r12, 0(r3) /* 8003B0FC 0003805C 81 8C 00 24 */ lwz r12, 0x24(r12) /* 8003B100 00038060 7D 89 03 A6 */ mtctr r12 -/* 8003B104 00038064 4E 80 04 21 */ bctrl +/* 8003B104 00038064 4E 80 04 21 */ bctrl /* 8003B108 00038068 7F 83 E3 78 */ mr r3, r28 /* 8003B10C 0003806C 38 80 00 0A */ li r4, 0xa /* 8003B110 00038070 38 A0 00 00 */ li r5, 0 @@ -899,11 +899,11 @@ lbl_8003B1A4: /* 8003B1BC 0003811C 83 81 00 20 */ lwz r28, 0x20(r1) /* 8003B1C0 00038120 7C 08 03 A6 */ mtlr r0 /* 8003B1C4 00038124 38 21 00 40 */ addi r1, r1, 0x40 -/* 8003B1C8 00038128 4E 80 00 20 */ blr +/* 8003B1C8 00038128 4E 80 00 20 */ blr .global EnableFx__10CGunWeaponFb EnableFx__10CGunWeaponFb: -/* 8003B1CC 0003812C 4E 80 00 20 */ blr +/* 8003B1CC 0003812C 4E 80 00 20 */ blr .global ProcessPhazonGunMorph__10CPlayerGunFfR13CStateManager ProcessPhazonGunMorph__10CPlayerGunFfR13CStateManager: @@ -959,12 +959,12 @@ lbl_8003B278: /* 8003B288 000381E8 7F C4 F3 78 */ mr r4, r30 /* 8003B28C 000381EC 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8003B290 000381F0 7D 89 03 A6 */ mtctr r12 -/* 8003B294 000381F4 4E 80 04 21 */ bctrl +/* 8003B294 000381F4 4E 80 04 21 */ bctrl /* 8003B298 000381F8 80 7F 07 5C */ lwz r3, 0x75c(r31) /* 8003B29C 000381FC 81 83 00 00 */ lwz r12, 0(r3) /* 8003B2A0 00038200 81 8C 00 40 */ lwz r12, 0x40(r12) /* 8003B2A4 00038204 7D 89 03 A6 */ mtctr r12 -/* 8003B2A8 00038208 4E 80 04 21 */ bctrl +/* 8003B2A8 00038208 4E 80 04 21 */ bctrl /* 8003B2AC 0003820C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8003B2B0 00038210 41 82 00 BC */ beq lbl_8003B36C /* 8003B2B4 00038214 80 DE 08 B8 */ lwz r6, 0x8b8(r30) @@ -989,12 +989,12 @@ lbl_8003B2EC: /* 8003B2FC 0003825C 7F C4 F3 78 */ mr r4, r30 /* 8003B300 00038260 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8003B304 00038264 7D 89 03 A6 */ mtctr r12 -/* 8003B308 00038268 4E 80 04 21 */ bctrl +/* 8003B308 00038268 4E 80 04 21 */ bctrl /* 8003B30C 0003826C 80 7F 07 38 */ lwz r3, 0x738(r31) /* 8003B310 00038270 81 83 00 00 */ lwz r12, 0(r3) /* 8003B314 00038274 81 8C 00 40 */ lwz r12, 0x40(r12) /* 8003B318 00038278 7D 89 03 A6 */ mtctr r12 -/* 8003B31C 0003827C 4E 80 04 21 */ bctrl +/* 8003B31C 0003827C 4E 80 04 21 */ bctrl /* 8003B320 00038280 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8003B324 00038284 41 82 00 48 */ beq lbl_8003B36C /* 8003B328 00038288 88 1F 08 35 */ lbz r0, 0x835(r31) @@ -1020,7 +1020,7 @@ lbl_8003B36C: /* 8003B374 000382D4 83 C1 00 08 */ lwz r30, 8(r1) /* 8003B378 000382D8 7C 08 03 A6 */ mtlr r0 /* 8003B37C 000382DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8003B380 000382E0 4E 80 00 20 */ blr +/* 8003B380 000382E0 4E 80 00 20 */ blr .global LoadHandAnimTokens__10CPlayerGunFv LoadHandAnimTokens__10CPlayerGunFv: @@ -1084,7 +1084,7 @@ lbl_8003B440: /* 8003B460 000383C0 80 01 00 84 */ lwz r0, 0x84(r1) /* 8003B464 000383C4 7C 08 03 A6 */ mtlr r0 /* 8003B468 000383C8 38 21 00 80 */ addi r1, r1, 0x80 -/* 8003B46C 000383CC 4E 80 00 20 */ blr +/* 8003B46C 000383CC 4E 80 00 20 */ blr .global SetGunLightActive__10CPlayerGunFbR13CStateManager SetGunLightActive__10CPlayerGunFbR13CStateManager: @@ -1116,7 +1116,7 @@ SetGunLightActive__10CPlayerGunFbR13CStateManager: /* 8003B4D4 00038434 81 9F 00 00 */ lwz r12, 0(r31) /* 8003B4D8 00038438 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 8003B4DC 0003843C 7D 89 03 A6 */ mtctr r12 -/* 8003B4E0 00038440 4E 80 04 21 */ bctrl +/* 8003B4E0 00038440 4E 80 04 21 */ bctrl /* 8003B4E4 00038444 57 C0 06 3F */ clrlwi. r0, r30, 0x18 /* 8003B4E8 00038448 41 82 00 6C */ beq lbl_8003B554 /* 8003B4EC 0003844C 80 7D 07 2C */ lwz r3, 0x72c(r29) @@ -1126,7 +1126,7 @@ SetGunLightActive__10CPlayerGunFbR13CStateManager: /* 8003B4FC 0003845C 81 83 00 00 */ lwz r12, 0(r3) /* 8003B500 00038460 81 8C 00 64 */ lwz r12, 0x64(r12) /* 8003B504 00038464 7D 89 03 A6 */ mtctr r12 -/* 8003B508 00038468 4E 80 04 21 */ bctrl +/* 8003B508 00038468 4E 80 04 21 */ bctrl /* 8003B50C 0003846C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8003B510 00038470 41 82 00 44 */ beq lbl_8003B554 /* 8003B514 00038474 7F C4 F3 78 */ mr r4, r30 @@ -1134,7 +1134,7 @@ SetGunLightActive__10CPlayerGunFbR13CStateManager: /* 8003B51C 0003847C 81 9E 00 00 */ lwz r12, 0(r30) /* 8003B520 00038480 81 8C 00 68 */ lwz r12, 0x68(r12) /* 8003B524 00038484 7D 89 03 A6 */ mtctr r12 -/* 8003B528 00038488 4E 80 04 21 */ bctrl +/* 8003B528 00038488 4E 80 04 21 */ bctrl /* 8003B52C 0003848C 38 61 00 64 */ addi r3, r1, 0x64 /* 8003B530 00038490 38 81 00 14 */ addi r4, r1, 0x14 /* 8003B534 00038494 48 00 00 3D */ bl __ct__6CLightFCR6CLight @@ -1152,7 +1152,7 @@ lbl_8003B554: /* 8003B560 000384C0 83 A1 00 C4 */ lwz r29, 0xc4(r1) /* 8003B564 000384C4 7C 08 03 A6 */ mtlr r0 /* 8003B568 000384C8 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 8003B56C 000384CC 4E 80 00 20 */ blr +/* 8003B56C 000384CC 4E 80 00 20 */ blr .global __ct__6CLightFCR6CLight __ct__6CLightFCR6CLight: @@ -1196,7 +1196,7 @@ __ct__6CLightFCR6CLight: /* 8003B604 00038564 D0 03 00 48 */ stfs f0, 0x48(r3) /* 8003B608 00038568 88 04 00 4C */ lbz r0, 0x4c(r4) /* 8003B60C 0003856C 98 03 00 4C */ stb r0, 0x4c(r3) -/* 8003B610 00038570 4E 80 00 20 */ blr +/* 8003B610 00038570 4E 80 00 20 */ blr .global UpdateGunLight__10CPlayerGunFRC12CTransform4fR13CStateManager UpdateGunLight__10CPlayerGunFRC12CTransform4fR13CStateManager: @@ -1261,7 +1261,7 @@ UpdateGunLight__10CPlayerGunFRC12CTransform4fR13CStateManager: /* 8003B6FC 0003865C 81 9D 00 00 */ lwz r12, 0(r29) /* 8003B700 00038660 81 8C 00 64 */ lwz r12, 0x64(r12) /* 8003B704 00038664 7D 89 03 A6 */ mtctr r12 -/* 8003B708 00038668 4E 80 04 21 */ bctrl +/* 8003B708 00038668 4E 80 04 21 */ bctrl /* 8003B70C 0003866C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8003B710 00038670 41 82 00 54 */ beq lbl_8003B764 /* 8003B714 00038674 7F A4 EB 78 */ mr r4, r29 @@ -1269,7 +1269,7 @@ UpdateGunLight__10CPlayerGunFRC12CTransform4fR13CStateManager: /* 8003B71C 0003867C 81 9D 00 00 */ lwz r12, 0(r29) /* 8003B720 00038680 81 8C 00 68 */ lwz r12, 0x68(r12) /* 8003B724 00038684 7D 89 03 A6 */ mtctr r12 -/* 8003B728 00038688 4E 80 04 21 */ bctrl +/* 8003B728 00038688 4E 80 04 21 */ bctrl /* 8003B72C 0003868C 38 61 00 74 */ addi r3, r1, 0x74 /* 8003B730 00038690 38 81 00 24 */ addi r4, r1, 0x24 /* 8003B734 00038694 4B FF FE 3D */ bl __ct__6CLightFCR6CLight @@ -1292,7 +1292,7 @@ lbl_8003B764: /* 8003B774 000386D4 83 81 00 D0 */ lwz r28, 0xd0(r1) /* 8003B778 000386D8 7C 08 03 A6 */ mtlr r0 /* 8003B77C 000386DC 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 8003B780 000386E0 4E 80 00 20 */ blr +/* 8003B780 000386E0 4E 80 00 20 */ blr .global DeleteGunLight__10CPlayerGunFR13CStateManager DeleteGunLight__10CPlayerGunFR13CStateManager: @@ -1317,7 +1317,7 @@ lbl_8003B7C4: /* 8003B7C8 00038728 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8003B7CC 0003872C 7C 08 03 A6 */ mtlr r0 /* 8003B7D0 00038730 38 21 00 20 */ addi r1, r1, 0x20 -/* 8003B7D4 00038734 4E 80 00 20 */ blr +/* 8003B7D4 00038734 4E 80 00 20 */ blr .global CreateGunLight__10CPlayerGunFR13CStateManager CreateGunLight__10CPlayerGunFR13CStateManager: @@ -1391,7 +1391,7 @@ lbl_8003B8D8: /* 8003B8DC 0003883C 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 8003B8E0 00038840 7C 08 03 A6 */ mtlr r0 /* 8003B8E4 00038844 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8003B8E8 00038848 4E 80 00 20 */ blr +/* 8003B8E8 00038848 4E 80 00 20 */ blr .global CancelLockOn__10CPlayerGunFv CancelLockOn__10CPlayerGunFv: @@ -1419,7 +1419,7 @@ lbl_8003B93C: /* 8003B93C 0003889C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8003B940 000388A0 7C 08 03 A6 */ mtlr r0 /* 8003B944 000388A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8003B948 000388A8 4E 80 00 20 */ blr +/* 8003B948 000388A8 4E 80 00 20 */ blr .global UpdateAuxWeapons__10CPlayerGunFfRC12CTransform4fR13CStateManager UpdateAuxWeapons__10CPlayerGunFfRC12CTransform4fR13CStateManager: @@ -1542,7 +1542,7 @@ lbl_8003BB00: /* 8003BB08 00038A68 81 83 00 00 */ lwz r12, 0(r3) /* 8003BB0C 00038A6C 81 8C 00 28 */ lwz r12, 0x28(r12) /* 8003BB10 00038A70 7D 89 03 A6 */ mtctr r12 -/* 8003BB14 00038A74 4E 80 04 21 */ bctrl +/* 8003BB14 00038A74 4E 80 04 21 */ bctrl /* 8003BB18 00038A78 57 A0 06 3F */ clrlwi. r0, r29, 0x18 /* 8003BB1C 00038A7C 41 82 00 D4 */ beq lbl_8003BBF0 /* 8003BB20 00038A80 38 00 00 0A */ li r0, 0xa @@ -1616,12 +1616,12 @@ lbl_8003BBF0: /* 8003BC20 00038B80 83 81 00 90 */ lwz r28, 0x90(r1) /* 8003BC24 00038B84 7C 08 03 A6 */ mtlr r0 /* 8003BC28 00038B88 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 8003BC2C 00038B8C 4E 80 00 20 */ blr +/* 8003BC2C 00038B8C 4E 80 00 20 */ blr .global EnableSecondaryFx__10CGunWeaponFQ210CGunWeapon16ESecondaryFxType EnableSecondaryFx__10CGunWeaponFQ210CGunWeapon16ESecondaryFxType: /* 8003BC30 00038B90 90 83 01 CC */ stw r4, 0x1cc(r3) -/* 8003BC34 00038B94 4E 80 00 20 */ blr +/* 8003BC34 00038B94 4E 80 00 20 */ blr .global ReturnArmAndGunToDefault__10CPlayerGunFR13CStateManagerb ReturnArmAndGunToDefault__10CPlayerGunFR13CStateManagerb: @@ -1664,7 +1664,7 @@ lbl_8003BCA4: /* 8003BCBC 00038C1C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8003BCC0 00038C20 7C 08 03 A6 */ mtlr r0 /* 8003BCC4 00038C24 38 21 00 10 */ addi r1, r1, 0x10 -/* 8003BCC8 00038C28 4E 80 00 20 */ blr +/* 8003BCC8 00038C28 4E 80 00 20 */ blr .global UpdateLeftArmTransform__10CPlayerGunFRC10CModelDataRC13CStateManager UpdateLeftArmTransform__10CPlayerGunFRC10CModelDataRC13CStateManager: @@ -1728,7 +1728,7 @@ lbl_8003BD64: /* 8003BDA8 00038D08 83 A1 00 34 */ lwz r29, 0x34(r1) /* 8003BDAC 00038D0C 7C 08 03 A6 */ mtlr r0 /* 8003BDB0 00038D10 38 21 00 40 */ addi r1, r1, 0x40 -/* 8003BDB4 00038D14 4E 80 00 20 */ blr +/* 8003BDB4 00038D14 4E 80 00 20 */ blr .global EnterFidget__10CPlayerGunFR13CStateManager EnterFidget__10CPlayerGunFR13CStateManager: @@ -1802,7 +1802,7 @@ lbl_8003BE84: /* 8003BEAC 00038E0C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8003BEB0 00038E10 7C 08 03 A6 */ mtlr r0 /* 8003BEB4 00038E14 38 21 00 20 */ addi r1, r1, 0x20 -/* 8003BEB8 00038E18 4E 80 00 20 */ blr +/* 8003BEB8 00038E18 4E 80 00 20 */ blr .global EnterFreeLook__10CPlayerGunFR13CStateManager EnterFreeLook__10CPlayerGunFR13CStateManager: @@ -1843,7 +1843,7 @@ lbl_8003BF28: /* 8003BF38 00038E98 83 C1 00 08 */ lwz r30, 8(r1) /* 8003BF3C 00038E9C 7C 08 03 A6 */ mtlr r0 /* 8003BF40 00038EA0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8003BF44 00038EA4 4E 80 00 20 */ blr +/* 8003BF44 00038EA4 4E 80 00 20 */ blr .global CancelCharge__10CPlayerGunFR13CStateManagerb CancelCharge__10CPlayerGunFR13CStateManagerb: @@ -1863,7 +1863,7 @@ CancelCharge__10CPlayerGunFR13CStateManagerb: /* 8003BF7C 00038EDC 81 83 00 00 */ lwz r12, 0(r3) /* 8003BF80 00038EE0 81 8C 00 28 */ lwz r12, 0x28(r12) /* 8003BF84 00038EE4 7D 89 03 A6 */ mtctr r12 -/* 8003BF88 00038EE8 4E 80 04 21 */ bctrl +/* 8003BF88 00038EE8 4E 80 04 21 */ bctrl /* 8003BF8C 00038EEC 48 00 00 1C */ b lbl_8003BFA8 lbl_8003BF90: /* 8003BF90 00038EF0 80 7E 07 2C */ lwz r3, 0x72c(r30) @@ -1871,7 +1871,7 @@ lbl_8003BF90: /* 8003BF98 00038EF8 81 83 00 00 */ lwz r12, 0(r3) /* 8003BF9C 00038EFC 81 8C 00 28 */ lwz r12, 0x28(r12) /* 8003BFA0 00038F00 7D 89 03 A6 */ mtctr r12 -/* 8003BFA4 00038F04 4E 80 04 21 */ bctrl +/* 8003BFA4 00038F04 4E 80 04 21 */ bctrl lbl_8003BFA8: /* 8003BFA8 00038F08 88 1E 08 34 */ lbz r0, 0x834(r30) /* 8003BFAC 00038F0C 38 60 00 00 */ li r3, 0 @@ -1892,7 +1892,7 @@ lbl_8003BFA8: /* 8003BFE8 00038F48 83 C1 00 08 */ lwz r30, 8(r1) /* 8003BFEC 00038F4C 7C 08 03 A6 */ mtlr r0 /* 8003BFF0 00038F50 38 21 00 10 */ addi r1, r1, 0x10 -/* 8003BFF4 00038F54 4E 80 00 20 */ blr +/* 8003BFF4 00038F54 4E 80 00 20 */ blr .global DoUserAnimEvent__10CPlayerGunFfR13CStateManagerRC13CInt32POINode14EUserEventType DoUserAnimEvent__10CPlayerGunFfR13CStateManagerRC13CInt32POINode14EUserEventType: @@ -1961,7 +1961,7 @@ lbl_8003C0B4: /* 8003C0D4 00039034 81 83 00 00 */ lwz r12, 0(r3) /* 8003C0D8 00039038 81 8C 00 28 */ lwz r12, 0x28(r12) /* 8003C0DC 0003903C 7D 89 03 A6 */ mtctr r12 -/* 8003C0E0 00039040 4E 80 04 21 */ bctrl +/* 8003C0E0 00039040 4E 80 04 21 */ bctrl lbl_8003C0E4: /* 8003C0E4 00039044 80 01 00 24 */ lwz r0, 0x24(r1) /* 8003C0E8 00039048 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -1969,7 +1969,7 @@ lbl_8003C0E4: /* 8003C0F0 00039050 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8003C0F4 00039054 7C 08 03 A6 */ mtlr r0 /* 8003C0F8 00039058 38 21 00 20 */ addi r1, r1, 0x20 -/* 8003C0FC 0003905C 4E 80 00 20 */ blr +/* 8003C0FC 0003905C 4E 80 00 20 */ blr .global DoUserAnimEvents__10CPlayerGunFfR13CStateManager DoUserAnimEvents__10CPlayerGunFfR13CStateManager: @@ -2108,7 +2108,7 @@ lbl_8003C2D4: /* 8003C2E0 00039240 80 01 00 64 */ lwz r0, 0x64(r1) /* 8003C2E4 00039244 7C 08 03 A6 */ mtlr r0 /* 8003C2E8 00039248 38 21 00 60 */ addi r1, r1, 0x60 -/* 8003C2EC 0003924C 4E 80 00 20 */ blr +/* 8003C2EC 0003924C 4E 80 00 20 */ blr .global RenderEnergyDrainEffects__10CPlayerGunCFRC13CStateManager RenderEnergyDrainEffects__10CPlayerGunCFRC13CStateManager: @@ -2163,7 +2163,7 @@ lbl_8003C394: /* 8003C3A0 00039300 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8003C3A4 00039304 7C 08 03 A6 */ mtlr r0 /* 8003C3A8 00039308 38 21 00 30 */ addi r1, r1, 0x30 -/* 8003C3AC 0003930C 4E 80 00 20 */ blr +/* 8003C3AC 0003930C 4E 80 00 20 */ blr .global StopContinuousBeam__10CPlayerGunFR13CStateManagerb StopContinuousBeam__10CPlayerGunFR13CStateManagerb: @@ -2216,7 +2216,7 @@ lbl_8003C458: /* 8003C458 000393B8 81 83 00 00 */ lwz r12, 0(r3) /* 8003C45C 000393BC 81 8C 00 28 */ lwz r12, 0x28(r12) /* 8003C460 000393C0 7D 89 03 A6 */ mtctr r12 -/* 8003C464 000393C4 4E 80 04 21 */ bctrl +/* 8003C464 000393C4 4E 80 04 21 */ bctrl /* 8003C468 000393C8 48 00 00 68 */ b lbl_8003C4D0 lbl_8003C46C: /* 8003C46C 000393CC 88 1F 08 33 */ lbz r0, 0x833(r31) @@ -2252,7 +2252,7 @@ lbl_8003C4D0: /* 8003C4DC 0003943C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8003C4E0 00039440 7C 08 03 A6 */ mtlr r0 /* 8003C4E4 00039444 38 21 00 20 */ addi r1, r1, 0x20 -/* 8003C4E8 00039448 4E 80 00 20 */ blr +/* 8003C4E8 00039448 4E 80 00 20 */ blr .global AcceptScriptMsg__10CPlayerGunF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__10CPlayerGunF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -2280,7 +2280,7 @@ AcceptScriptMsg__10CPlayerGunF20EScriptObjectMessage9TUniqueIdR13CStateManager: /* 8003C540 000394A0 38 84 9D 74 */ addi r4, r4, lbl_803D9D74@l /* 8003C544 000394A4 7C 04 00 2E */ lwzx r0, r4, r0 /* 8003C548 000394A8 7C 09 03 A6 */ mtctr r0 -/* 8003C54C 000394AC 4E 80 04 20 */ bctr +/* 8003C54C 000394AC 4E 80 04 20 */ bctr .global lbl_8003C550 lbl_8003C550: /* 8003C550 000394B0 7F E4 FB 78 */ mr r4, r31 @@ -2306,7 +2306,7 @@ lbl_8003C550: /* 8003C5A0 00039500 81 83 00 00 */ lwz r12, 0(r3) /* 8003C5A4 00039504 81 8C 00 38 */ lwz r12, 0x38(r12) /* 8003C5A8 00039508 7D 89 03 A6 */ mtctr r12 -/* 8003C5AC 0003950C 4E 80 04 21 */ bctrl +/* 8003C5AC 0003950C 4E 80 04 21 */ bctrl /* 8003C5B0 00039510 80 1D 07 48 */ lwz r0, 0x748(r29) /* 8003C5B4 00039514 7F E5 FB 78 */ mr r5, r31 /* 8003C5B8 00039518 80 7D 07 2C */ lwz r3, 0x72c(r29) @@ -2627,7 +2627,7 @@ lbl_8003C9CC: /* 8003CA48 000399A8 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 8003CA4C 000399AC 7C 08 03 A6 */ mtlr r0 /* 8003CA50 000399B0 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 8003CA54 000399B4 4E 80 00 20 */ blr +/* 8003CA54 000399B4 4E 80 00 20 */ blr .global CancelFiring__10CPlayerGunFR13CStateManager CancelFiring__10CPlayerGunFR13CStateManager: @@ -2697,7 +2697,7 @@ lbl_8003CB1C: /* 8003CB44 00039AA4 83 C1 00 08 */ lwz r30, 8(r1) /* 8003CB48 00039AA8 7C 08 03 A6 */ mtlr r0 /* 8003CB4C 00039AAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8003CB50 00039AB0 4E 80 00 20 */ blr +/* 8003CB50 00039AB0 4E 80 00 20 */ blr .global StopChargeSound__10CPlayerGunFR13CStateManager StopChargeSound__10CPlayerGunFR13CStateManager: @@ -2731,7 +2731,7 @@ lbl_8003CBB0: /* 8003CBB8 00039B18 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8003CBBC 00039B1C 7C 08 03 A6 */ mtlr r0 /* 8003CBC0 00039B20 38 21 00 20 */ addi r1, r1, 0x20 -/* 8003CBC4 00039B24 4E 80 00 20 */ blr +/* 8003CBC4 00039B24 4E 80 00 20 */ blr .global TakeDamage__10CPlayerGunFbbR13CStateManager TakeDamage__10CPlayerGunFbbR13CStateManager: @@ -2860,7 +2860,7 @@ lbl_8003CD5C: /* 8003CD98 00039CF8 83 81 00 30 */ lwz r28, 0x30(r1) /* 8003CD9C 00039CFC 7C 08 03 A6 */ mtlr r0 /* 8003CDA0 00039D00 38 21 00 50 */ addi r1, r1, 0x50 -/* 8003CDA4 00039D04 4E 80 00 20 */ blr +/* 8003CDA4 00039D04 4E 80 00 20 */ blr .global DamageRumble__10CPlayerGunFRC9CVector3fRC13CStateManager DamageRumble__10CPlayerGunFRC9CVector3fRC13CStateManager: @@ -2871,7 +2871,7 @@ DamageRumble__10CPlayerGunFRC9CVector3fRC13CStateManager: /* 8003CDB8 00039D18 D0 03 03 E0 */ stfs f0, 0x3e0(r3) /* 8003CDBC 00039D1C C0 04 00 08 */ lfs f0, 8(r4) /* 8003CDC0 00039D20 D0 03 03 E4 */ stfs f0, 0x3e4(r3) -/* 8003CDC4 00039D24 4E 80 00 20 */ blr +/* 8003CDC4 00039D24 4E 80 00 20 */ blr .global Update__Q210CPlayerGun12CMotionStateFbfR12CTransform4fR13CStateManager Update__Q210CPlayerGun12CMotionStateFbfR12CTransform4fR13CStateManager: @@ -3163,7 +3163,7 @@ lbl_8003D1E4: /* 8003D1F8 0003A158 83 A1 02 64 */ lwz r29, 0x264(r1) /* 8003D1FC 0003A15C 7C 08 03 A6 */ mtlr r0 /* 8003D200 0003A160 38 21 02 80 */ addi r1, r1, 0x280 -/* 8003D204 0003A164 4E 80 00 20 */ blr +/* 8003D204 0003A164 4E 80 00 20 */ blr .global UpdateGunIdle__10CPlayerGunFbffR13CStateManager UpdateGunIdle__10CPlayerGunFbffR13CStateManager: @@ -3671,7 +3671,7 @@ lbl_8003D914: /* 8003D928 0003A888 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 8003D92C 0003A88C 7C 08 03 A6 */ mtlr r0 /* 8003D930 0003A890 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8003D934 0003A894 4E 80 00 20 */ blr +/* 8003D934 0003A894 4E 80 00 20 */ blr .global ResetIdle__10CPlayerGunFR13CStateManager ResetIdle__10CPlayerGunFR13CStateManager: @@ -3727,7 +3727,7 @@ lbl_8003D9E0: /* 8003D9EC 0003A94C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8003D9F0 0003A950 7C 08 03 A6 */ mtlr r0 /* 8003D9F4 0003A954 38 21 00 20 */ addi r1, r1, 0x20 -/* 8003D9F8 0003A958 4E 80 00 20 */ blr +/* 8003D9F8 0003A958 4E 80 00 20 */ blr .global UpdateWeaponFire__10CPlayerGunFfR12CPlayerStateR13CStateManager UpdateWeaponFire__10CPlayerGunFfR12CPlayerStateR13CStateManager: @@ -4101,7 +4101,7 @@ lbl_8003DF50: /* 8003DF5C 0003AEBC 80 01 00 54 */ lwz r0, 0x54(r1) /* 8003DF60 0003AEC0 7C 08 03 A6 */ mtlr r0 /* 8003DF64 0003AEC4 38 21 00 50 */ addi r1, r1, 0x50 -/* 8003DF68 0003AEC8 4E 80 00 20 */ blr +/* 8003DF68 0003AEC8 4E 80 00 20 */ blr .global Update__Q210CPlayerGun9CGunMorphFfff Update__Q210CPlayerGun9CGunMorphFfff: @@ -4209,7 +4209,7 @@ lbl_8003E0C4: /* 8003E0E4 0003B044 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8003E0E8 0003B048 7C 08 03 A6 */ mtlr r0 /* 8003E0EC 0003B04C 38 21 00 40 */ addi r1, r1, 0x40 -/* 8003E0F0 0003B050 4E 80 00 20 */ blr +/* 8003E0F0 0003B050 4E 80 00 20 */ blr .global StartWipe__Q210CPlayerGun9CGunMorphFQ310CPlayerGun9CGunMorph4EDir StartWipe__Q210CPlayerGun9CGunMorphFQ310CPlayerGun9CGunMorph4EDir: @@ -4219,7 +4219,7 @@ StartWipe__Q210CPlayerGun9CGunMorphFQ310CPlayerGun9CGunMorph4EDir: /* 8003E100 0003B060 40 82 00 10 */ bne lbl_8003E110 /* 8003E104 0003B064 80 03 00 20 */ lwz r0, 0x20(r3) /* 8003E108 0003B068 2C 00 00 00 */ cmpwi r0, 0 -/* 8003E10C 0003B06C 4D 82 00 20 */ beqlr +/* 8003E10C 0003B06C 4D 82 00 20 */ beqlr lbl_8003E110: /* 8003E110 0003B070 80 03 00 1C */ lwz r0, 0x1c(r3) /* 8003E114 0003B074 7C 00 20 00 */ cmpw r0, r4 @@ -4255,7 +4255,7 @@ lbl_8003E178: /* 8003E180 0003B0E0 88 03 00 24 */ lbz r0, 0x24(r3) /* 8003E184 0003B0E4 50 80 3E 30 */ rlwimi r0, r4, 7, 0x18, 0x18 /* 8003E188 0003B0E8 98 03 00 24 */ stb r0, 0x24(r3) -/* 8003E18C 0003B0EC 4E 80 00 20 */ blr +/* 8003E18C 0003B0EC 4E 80 00 20 */ blr .global __ct__Q210CPlayerGun9CGunMorphFff __ct__Q210CPlayerGun9CGunMorphFff: @@ -4285,7 +4285,7 @@ __ct__Q210CPlayerGun9CGunMorphFff: /* 8003E1EC 0003B14C 88 03 00 24 */ lbz r0, 0x24(r3) /* 8003E1F0 0003B150 50 80 36 72 */ rlwimi r0, r4, 6, 0x19, 0x19 /* 8003E1F4 0003B154 98 03 00 24 */ stb r0, 0x24(r3) -/* 8003E1F8 0003B158 4E 80 00 20 */ blr +/* 8003E1F8 0003B158 4E 80 00 20 */ blr .global GetTargetId__10CPlayerGunFR13CStateManager GetTargetId__10CPlayerGunFR13CStateManager: @@ -4349,7 +4349,7 @@ lbl_8003E2C8: /* 8003E2D4 0003B234 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8003E2D8 0003B238 7C 08 03 A6 */ mtlr r0 /* 8003E2DC 0003B23C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8003E2E0 0003B240 4E 80 00 20 */ blr +/* 8003E2E0 0003B240 4E 80 00 20 */ blr .global GetBeamVelocity__10CPlayerGunCFv GetBeamVelocity__10CPlayerGunCFv: @@ -4362,7 +4362,7 @@ GetBeamVelocity__10CPlayerGunCFv: /* 8003E2FC 0003B25C 81 83 00 00 */ lwz r12, 0(r3) /* 8003E300 0003B260 81 8C 00 40 */ lwz r12, 0x40(r12) /* 8003E304 0003B264 7D 89 03 A6 */ mtctr r12 -/* 8003E308 0003B268 4E 80 04 21 */ bctrl +/* 8003E308 0003B268 4E 80 04 21 */ bctrl /* 8003E30C 0003B26C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8003E310 0003B270 41 82 00 1C */ beq lbl_8003E32C /* 8003E314 0003B274 80 1F 03 30 */ lwz r0, 0x330(r31) @@ -4378,7 +4378,7 @@ lbl_8003E330: /* 8003E334 0003B294 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8003E338 0003B298 7C 08 03 A6 */ mtlr r0 /* 8003E33C 0003B29C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8003E340 0003B2A0 4E 80 00 20 */ blr +/* 8003E340 0003B2A0 4E 80 00 20 */ blr .global InitCTData__10CPlayerGunFv InitCTData__10CPlayerGunFv: @@ -4404,7 +4404,7 @@ InitCTData__10CPlayerGunFv: /* 8003E390 0003B2F0 38 80 00 01 */ li r4, 1 /* 8003E394 0003B2F4 81 8C 00 08 */ lwz r12, 8(r12) /* 8003E398 0003B2F8 7D 89 03 A6 */ mtctr r12 -/* 8003E39C 0003B2FC 4E 80 04 21 */ bctrl +/* 8003E39C 0003B2FC 4E 80 04 21 */ bctrl lbl_8003E3A0: /* 8003E3A0 0003B300 88 61 00 08 */ lbz r3, 8(r1) /* 8003E3A4 0003B304 38 00 00 00 */ li r0, 0 @@ -4423,13 +4423,13 @@ lbl_8003E3B8: /* 8003E3D4 0003B334 38 80 00 01 */ li r4, 1 /* 8003E3D8 0003B338 81 8C 00 08 */ lwz r12, 8(r12) /* 8003E3DC 0003B33C 7D 89 03 A6 */ mtctr r12 -/* 8003E3E0 0003B340 4E 80 04 21 */ bctrl +/* 8003E3E0 0003B340 4E 80 04 21 */ bctrl lbl_8003E3E4: /* 8003E3E4 0003B344 80 01 00 24 */ lwz r0, 0x24(r1) /* 8003E3E8 0003B348 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8003E3EC 0003B34C 7C 08 03 A6 */ mtlr r0 /* 8003E3F0 0003B350 38 21 00 20 */ addi r1, r1, 0x20 -/* 8003E3F4 0003B354 4E 80 00 20 */ blr +/* 8003E3F4 0003B354 4E 80 00 20 */ blr .global InitMuzzleData__10CPlayerGunFv InitMuzzleData__10CPlayerGunFv: @@ -4469,7 +4469,7 @@ lbl_8003E458: /* 8003E46C 0003B3CC 81 84 00 00 */ lwz r12, 0(r4) /* 8003E470 0003B3D0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8003E474 0003B3D4 7D 89 03 A6 */ mtctr r12 -/* 8003E478 0003B3D8 4E 80 04 21 */ bctrl +/* 8003E478 0003B3D8 4E 80 04 21 */ bctrl /* 8003E47C 0003B3DC 7F 03 C3 78 */ mr r3, r24 /* 8003E480 0003B3E0 38 81 00 18 */ addi r4, r1, 0x18 /* 8003E484 0003B3E4 48 30 2A 25 */ bl __ct__6CTokenFRC6CToken @@ -4527,7 +4527,7 @@ lbl_8003E540: /* 8003E548 0003B4A8 81 96 00 00 */ lwz r12, 0(r22) /* 8003E54C 0003B4AC 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8003E550 0003B4B0 7D 89 03 A6 */ mtctr r12 -/* 8003E554 0003B4B4 4E 80 04 21 */ bctrl +/* 8003E554 0003B4B4 4E 80 04 21 */ bctrl /* 8003E558 0003B4B8 80 19 08 00 */ lwz r0, 0x800(r25) /* 8003E55C 0003B4BC 7C 76 00 D0 */ neg r3, r22 /* 8003E560 0003B4C0 7C 63 B3 78 */ or r3, r3, r22 @@ -4555,7 +4555,7 @@ lbl_8003E58C: /* 8003E5B4 0003B514 38 80 00 01 */ li r4, 1 /* 8003E5B8 0003B518 81 8C 00 08 */ lwz r12, 8(r12) /* 8003E5BC 0003B51C 7D 89 03 A6 */ mtctr r12 -/* 8003E5C0 0003B520 4E 80 04 21 */ bctrl +/* 8003E5C0 0003B520 4E 80 04 21 */ bctrl lbl_8003E5C4: /* 8003E5C4 0003B524 3B 5A 00 01 */ addi r26, r26, 1 /* 8003E5C8 0003B528 3A F7 00 04 */ addi r23, r23, 4 @@ -4566,7 +4566,7 @@ lbl_8003E5C4: /* 8003E5DC 0003B53C 80 01 00 74 */ lwz r0, 0x74(r1) /* 8003E5E0 0003B540 7C 08 03 A6 */ mtlr r0 /* 8003E5E4 0003B544 38 21 00 70 */ addi r1, r1, 0x70 -/* 8003E5E8 0003B548 4E 80 00 20 */ blr +/* 8003E5E8 0003B548 4E 80 00 20 */ blr .global InitBombData__10CPlayerGunFv InitBombData__10CPlayerGunFv: @@ -4645,7 +4645,7 @@ lbl_8003E6A8: /* 8003E6EC 0003B64C 81 84 00 00 */ lwz r12, 0(r4) /* 8003E6F0 0003B650 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8003E6F4 0003B654 7D 89 03 A6 */ mtctr r12 -/* 8003E6F8 0003B658 4E 80 04 21 */ bctrl +/* 8003E6F8 0003B658 4E 80 04 21 */ bctrl /* 8003E6FC 0003B65C 38 61 00 48 */ addi r3, r1, 0x48 /* 8003E700 0003B660 38 81 00 28 */ addi r4, r1, 0x28 /* 8003E704 0003B664 48 30 27 A5 */ bl __ct__6CTokenFRC6CToken @@ -4664,7 +4664,7 @@ lbl_8003E6A8: /* 8003E738 0003B698 81 84 00 00 */ lwz r12, 0(r4) /* 8003E73C 0003B69C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8003E740 0003B6A0 7D 89 03 A6 */ mtctr r12 -/* 8003E744 0003B6A4 4E 80 04 21 */ bctrl +/* 8003E744 0003B6A4 4E 80 04 21 */ bctrl /* 8003E748 0003B6A8 38 61 00 40 */ addi r3, r1, 0x40 /* 8003E74C 0003B6AC 38 81 00 18 */ addi r4, r1, 0x18 /* 8003E750 0003B6B0 48 30 27 59 */ bl __ct__6CTokenFRC6CToken @@ -4683,7 +4683,7 @@ lbl_8003E6A8: /* 8003E784 0003B6E4 81 84 00 00 */ lwz r12, 0(r4) /* 8003E788 0003B6E8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8003E78C 0003B6EC 7D 89 03 A6 */ mtctr r12 -/* 8003E790 0003B6F0 4E 80 04 21 */ bctrl +/* 8003E790 0003B6F0 4E 80 04 21 */ bctrl /* 8003E794 0003B6F4 38 61 00 38 */ addi r3, r1, 0x38 /* 8003E798 0003B6F8 38 81 00 08 */ addi r4, r1, 8 /* 8003E79C 0003B6FC 48 30 27 0D */ bl __ct__6CTokenFRC6CToken @@ -4812,7 +4812,7 @@ lbl_8003E938: /* 8003E978 0003B8D8 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 8003E97C 0003B8DC 7C 08 03 A6 */ mtlr r0 /* 8003E980 0003B8E0 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 8003E984 0003B8E4 4E 80 00 20 */ blr +/* 8003E984 0003B8E4 4E 80 00 20 */ blr .global InitBeamData__10CPlayerGunFv InitBeamData__10CPlayerGunFv: @@ -4836,11 +4836,11 @@ InitBeamData__10CPlayerGunFv: /* 8003E9CC 0003B92C 81 83 00 00 */ lwz r12, 0(r3) /* 8003E9D0 0003B930 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8003E9D4 0003B934 7D 89 03 A6 */ mtctr r12 -/* 8003E9D8 0003B938 4E 80 04 21 */ bctrl +/* 8003E9D8 0003B938 4E 80 04 21 */ bctrl /* 8003E9DC 0003B93C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8003E9E0 0003B940 7C 08 03 A6 */ mtlr r0 /* 8003E9E4 0003B944 38 21 00 10 */ addi r1, r1, 0x10 -/* 8003E9E8 0003B948 4E 80 00 20 */ blr +/* 8003E9E8 0003B948 4E 80 00 20 */ blr .global HandlePhazonBeamChange__10CPlayerGunFR13CStateManager HandlePhazonBeamChange__10CPlayerGunFR13CStateManager: @@ -4925,7 +4925,7 @@ lbl_8003EB08: /* 8003EB10 0003BA70 83 C1 00 08 */ lwz r30, 8(r1) /* 8003EB14 0003BA74 7C 08 03 A6 */ mtlr r0 /* 8003EB18 0003BA78 38 21 00 10 */ addi r1, r1, 0x10 -/* 8003EB1C 0003BA7C 4E 80 00 20 */ blr +/* 8003EB1C 0003BA7C 4E 80 00 20 */ blr .global SetPhazonBeamMorph__10CPlayerGunFb SetPhazonBeamMorph__10CPlayerGunFb: @@ -4945,7 +4945,7 @@ lbl_8003EB34: /* 8003EB4C 0003BAAC 88 03 08 35 */ lbz r0, 0x835(r3) /* 8003EB50 0003BAB0 50 80 2E B4 */ rlwimi r0, r4, 5, 0x1a, 0x1a /* 8003EB54 0003BAB4 98 03 08 35 */ stb r0, 0x835(r3) -/* 8003EB58 0003BAB8 4E 80 00 20 */ blr +/* 8003EB58 0003BAB8 4E 80 00 20 */ blr .global HandleBeamChange__10CPlayerGunFRC11CFinalInputR13CStateManager HandleBeamChange__10CPlayerGunFRC11CFinalInputR13CStateManager: @@ -5051,7 +5051,7 @@ lbl_8003ECCC: /* 8003ECD4 0003BC34 81 83 00 00 */ lwz r12, 0(r3) /* 8003ECD8 0003BC38 81 8C 00 28 */ lwz r12, 0x28(r12) /* 8003ECDC 0003BC3C 7D 89 03 A6 */ mtctr r12 -/* 8003ECE0 0003BC40 4E 80 04 21 */ bctrl +/* 8003ECE0 0003BC40 4E 80 04 21 */ bctrl /* 8003ECE4 0003BC44 38 60 00 05 */ li r3, 5 /* 8003ECE8 0003BC48 38 00 00 00 */ li r0, 0 /* 8003ECEC 0003BC4C 90 7E 03 38 */ stw r3, 0x338(r30) @@ -5098,7 +5098,7 @@ lbl_8003ED70: /* 8003ED84 0003BCE4 80 01 00 54 */ lwz r0, 0x54(r1) /* 8003ED88 0003BCE8 7C 08 03 A6 */ mtlr r0 /* 8003ED8C 0003BCEC 38 21 00 50 */ addi r1, r1, 0x50 -/* 8003ED90 0003BCF0 4E 80 00 20 */ blr +/* 8003ED90 0003BCF0 4E 80 00 20 */ blr .global HandleWeaponChange__10CPlayerGunFRC11CFinalInputR13CStateManager HandleWeaponChange__10CPlayerGunFRC11CFinalInputR13CStateManager: @@ -5147,7 +5147,7 @@ lbl_8003EE24: /* 8003EE30 0003BD90 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8003EE34 0003BD94 7C 08 03 A6 */ mtlr r0 /* 8003EE38 0003BD98 38 21 00 20 */ addi r1, r1, 0x20 -/* 8003EE3C 0003BD9C 4E 80 00 20 */ blr +/* 8003EE3C 0003BD9C 4E 80 00 20 */ blr .global StartPhazonBeamTransition__10CPlayerGunFbR13CStateManagerR12CPlayerState StartPhazonBeamTransition__10CPlayerGunFbR13CStateManagerR12CPlayerState: @@ -5172,7 +5172,7 @@ StartPhazonBeamTransition__10CPlayerGunFbR13CStateManagerR12CPlayerState: /* 8003EE88 0003BDE8 81 83 00 00 */ lwz r12, 0(r3) /* 8003EE8C 0003BDEC 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 8003EE90 0003BDF0 7D 89 03 A6 */ mtctr r12 -/* 8003EE94 0003BDF4 4E 80 04 21 */ bctrl +/* 8003EE94 0003BDF4 4E 80 04 21 */ bctrl /* 8003EE98 0003BDF8 57 60 06 3F */ clrlwi. r0, r27, 0x18 /* 8003EE9C 0003BDFC 41 82 00 0C */ beq lbl_8003EEA8 /* 8003EEA0 0003BE00 80 FE 07 5C */ lwz r7, 0x75c(r30) @@ -5206,7 +5206,7 @@ lbl_8003EEAC: /* 8003EF08 0003BE68 81 83 00 00 */ lwz r12, 0(r3) /* 8003EF0C 0003BE6C 81 8C 00 24 */ lwz r12, 0x24(r12) /* 8003EF10 0003BE70 7D 89 03 A6 */ mtctr r12 -/* 8003EF14 0003BE74 4E 80 04 21 */ bctrl +/* 8003EF14 0003BE74 4E 80 04 21 */ bctrl /* 8003EF18 0003BE78 80 DE 07 2C */ lwz r6, 0x72c(r30) /* 8003EF1C 0003BE7C 38 A0 00 00 */ li r5, 0 /* 8003EF20 0003BE80 7F C3 F3 78 */ mr r3, r30 @@ -5241,7 +5241,7 @@ lbl_8003EF84: /* 8003EF88 0003BEE8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8003EF8C 0003BEEC 7C 08 03 A6 */ mtlr r0 /* 8003EF90 0003BEF0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8003EF94 0003BEF4 4E 80 00 20 */ blr +/* 8003EF94 0003BEF4 4E 80 00 20 */ blr .global ChangeWeapon__10CPlayerGunFRC12CPlayerStateR13CStateManager ChangeWeapon__10CPlayerGunFRC12CPlayerStateR13CStateManager: @@ -5264,7 +5264,7 @@ ChangeWeapon__10CPlayerGunFRC12CPlayerStateR13CStateManager: /* 8003EFD8 0003BF38 7F E4 FB 78 */ mr r4, r31 /* 8003EFDC 0003BF3C 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 8003EFE0 0003BF40 7D 89 03 A6 */ mtctr r12 -/* 8003EFE4 0003BF44 4E 80 04 21 */ bctrl +/* 8003EFE4 0003BF44 4E 80 04 21 */ bctrl lbl_8003EFE8: /* 8003EFE8 0003BF48 80 1D 03 14 */ lwz r0, 0x314(r29) /* 8003EFEC 0003BF4C 54 00 10 3A */ slwi r0, r0, 2 @@ -5282,7 +5282,7 @@ lbl_8003EFE8: /* 8003F01C 0003BF7C 38 A0 00 00 */ li r5, 0 /* 8003F020 0003BF80 81 8C 00 38 */ lwz r12, 0x38(r12) /* 8003F024 0003BF84 7D 89 03 A6 */ mtctr r12 -/* 8003F028 0003BF88 4E 80 04 21 */ bctrl +/* 8003F028 0003BF88 4E 80 04 21 */ bctrl /* 8003F02C 0003BF8C 80 7D 07 44 */ lwz r3, 0x744(r29) /* 8003F030 0003BF90 7F E5 FB 78 */ mr r5, r31 /* 8003F034 0003BF94 80 9D 03 14 */ lwz r4, 0x314(r29) @@ -5293,7 +5293,7 @@ lbl_8003F03C: /* 8003F044 0003BFA4 81 83 00 00 */ lwz r12, 0(r3) /* 8003F048 0003BFA8 81 8C 00 24 */ lwz r12, 0x24(r12) /* 8003F04C 0003BFAC 7D 89 03 A6 */ mtctr r12 -/* 8003F050 0003BFB0 4E 80 04 21 */ bctrl +/* 8003F050 0003BFB0 4E 80 04 21 */ bctrl /* 8003F054 0003BFB4 80 FD 03 2C */ lwz r7, 0x32c(r29) /* 8003F058 0003BFB8 7F A3 EB 78 */ mr r3, r29 /* 8003F05C 0003BFBC 88 1D 08 34 */ lbz r0, 0x834(r29) @@ -5314,7 +5314,7 @@ lbl_8003F03C: /* 8003F098 0003BFF8 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8003F09C 0003BFFC 7C 08 03 A6 */ mtlr r0 /* 8003F0A0 0003C000 38 21 00 20 */ addi r1, r1, 0x20 -/* 8003F0A4 0003C004 4E 80 00 20 */ blr +/* 8003F0A4 0003C004 4E 80 00 20 */ blr .global ResetBeamParams__10CPlayerGunFR13CStateManagerRC12CPlayerStateb ResetBeamParams__10CPlayerGunFR13CStateManagerRC12CPlayerStateb: @@ -5396,7 +5396,7 @@ lbl_8003F198: /* 8003F1CC 0003C12C 80 01 00 54 */ lwz r0, 0x54(r1) /* 8003F1D0 0003C130 7C 08 03 A6 */ mtlr r0 /* 8003F1D4 0003C134 38 21 00 50 */ addi r1, r1, 0x50 -/* 8003F1D8 0003C138 4E 80 00 20 */ blr +/* 8003F1D8 0003C138 4E 80 00 20 */ blr .global ResetCharge__10CPlayerGunFR13CStateManagerb ResetCharge__10CPlayerGunFR13CStateManagerb: @@ -5448,7 +5448,7 @@ lbl_8003F270: /* 8003F280 0003C1E0 81 83 00 00 */ lwz r12, 0(r3) /* 8003F284 0003C1E4 81 8C 00 28 */ lwz r12, 0x28(r12) /* 8003F288 0003C1E8 7D 89 03 A6 */ mtctr r12 -/* 8003F28C 0003C1EC 4E 80 04 21 */ bctrl +/* 8003F28C 0003C1EC 4E 80 04 21 */ bctrl lbl_8003F290: /* 8003F290 0003C1F0 80 7F 02 F8 */ lwz r3, 0x2f8(r31) /* 8003F294 0003C1F4 54 60 07 BC */ rlwinm r0, r3, 0, 0x1e, 0x1e @@ -5496,7 +5496,7 @@ lbl_8003F2E0: /* 8003F330 0003C290 80 01 00 24 */ lwz r0, 0x24(r1) /* 8003F334 0003C294 7C 08 03 A6 */ mtlr r0 /* 8003F338 0003C298 38 21 00 20 */ addi r1, r1, 0x20 -/* 8003F33C 0003C29C 4E 80 00 20 */ blr +/* 8003F33C 0003C29C 4E 80 00 20 */ blr .global Reset__10CPlayerGunFR13CStateManager Reset__10CPlayerGunFR13CStateManager: @@ -5513,7 +5513,7 @@ Reset__10CPlayerGunFR13CStateManager: /* 8003F368 0003C2C8 81 83 00 00 */ lwz r12, 0(r3) /* 8003F36C 0003C2CC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8003F370 0003C2D0 7D 89 03 A6 */ mtctr r12 -/* 8003F374 0003C2D4 4E 80 04 21 */ bctrl +/* 8003F374 0003C2D4 4E 80 04 21 */ bctrl /* 8003F378 0003C2D8 88 1F 08 32 */ lbz r0, 0x832(r31) /* 8003F37C 0003C2DC 38 C0 00 00 */ li r6, 0 /* 8003F380 0003C2E0 50 C0 36 72 */ rlwimi r0, r6, 6, 0x19, 0x19 @@ -5565,7 +5565,7 @@ lbl_8003F420: /* 8003F42C 0003C38C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8003F430 0003C390 7C 08 03 A6 */ mtlr r0 /* 8003F434 0003C394 38 21 00 20 */ addi r1, r1, 0x20 -/* 8003F438 0003C398 4E 80 00 20 */ blr +/* 8003F438 0003C398 4E 80 00 20 */ blr .global UpdateChargeState__10CPlayerGunFfR13CStateManager UpdateChargeState__10CPlayerGunFfR13CStateManager: @@ -5587,7 +5587,7 @@ UpdateChargeState__10CPlayerGunFfR13CStateManager: /* 8003F478 0003C3D8 38 A5 9D D8 */ addi r5, r5, lbl_803D9DD8@l /* 8003F47C 0003C3DC 7C 05 00 2E */ lwzx r0, r5, r0 /* 8003F480 0003C3E0 7C 09 03 A6 */ mtctr r0 -/* 8003F484 0003C3E4 4E 80 04 20 */ bctr +/* 8003F484 0003C3E4 4E 80 04 20 */ bctr .global lbl_8003F488 lbl_8003F488: /* 8003F488 0003C3E8 C0 02 84 6C */ lfs f0, lbl_805AA18C@sda21(r2) @@ -5817,7 +5817,7 @@ lbl_8003F79C: /* 8003F7AC 0003C70C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8003F7B0 0003C710 7C 08 03 A6 */ mtlr r0 /* 8003F7B4 0003C714 38 21 00 30 */ addi r1, r1, 0x30 -/* 8003F7B8 0003C718 4E 80 00 20 */ blr +/* 8003F7B8 0003C718 4E 80 00 20 */ blr .global EnableChargeFx__10CPlayerGunFQ212CPlayerState12EChargeStageR13CStateManager EnableChargeFx__10CPlayerGunFQ212CPlayerState12EChargeStageR13CStateManager: @@ -5843,7 +5843,7 @@ EnableChargeFx__10CPlayerGunFQ212CPlayerState12EChargeStageR13CStateManager: /* 8003F808 0003C768 81 83 00 00 */ lwz r12, 0(r3) /* 8003F80C 0003C76C 81 8C 00 28 */ lwz r12, 0x28(r12) /* 8003F810 0003C770 7D 89 03 A6 */ mtctr r12 -/* 8003F814 0003C774 4E 80 04 21 */ bctrl +/* 8003F814 0003C774 4E 80 04 21 */ bctrl /* 8003F818 0003C778 7F C3 F3 78 */ mr r3, r30 /* 8003F81C 0003C77C 7F 84 E3 78 */ mr r4, r28 /* 8003F820 0003C780 38 A0 00 00 */ li r5, 0 @@ -5916,7 +5916,7 @@ lbl_8003F8D4: /* 8003F920 0003C880 38 80 00 01 */ li r4, 1 /* 8003F924 0003C884 81 8C 00 08 */ lwz r12, 8(r12) /* 8003F928 0003C888 7D 89 03 A6 */ mtctr r12 -/* 8003F92C 0003C88C 4E 80 04 21 */ bctrl +/* 8003F92C 0003C88C 4E 80 04 21 */ bctrl lbl_8003F930: /* 8003F930 0003C890 88 61 00 08 */ lbz r3, 8(r1) /* 8003F934 0003C894 38 00 00 00 */ li r0, 0 @@ -5935,7 +5935,7 @@ lbl_8003F948: /* 8003F964 0003C8C4 38 80 00 01 */ li r4, 1 /* 8003F968 0003C8C8 81 8C 00 08 */ lwz r12, 8(r12) /* 8003F96C 0003C8CC 7D 89 03 A6 */ mtctr r12 -/* 8003F970 0003C8D0 4E 80 04 21 */ bctrl +/* 8003F970 0003C8D0 4E 80 04 21 */ bctrl lbl_8003F974: /* 8003F974 0003C8D4 7F A0 07 75 */ extsb. r0, r29 /* 8003F978 0003C8D8 41 82 00 10 */ beq lbl_8003F988 @@ -5951,7 +5951,7 @@ lbl_8003F988: /* 8003F99C 0003C8FC 81 83 00 00 */ lwz r12, 0(r3) /* 8003F9A0 0003C900 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8003F9A4 0003C904 7D 89 03 A6 */ mtctr r12 -/* 8003F9A8 0003C908 4E 80 04 21 */ bctrl +/* 8003F9A8 0003C908 4E 80 04 21 */ bctrl /* 8003F9AC 0003C90C 80 01 00 34 */ lwz r0, 0x34(r1) /* 8003F9B0 0003C910 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8003F9B4 0003C914 83 C1 00 28 */ lwz r30, 0x28(r1) @@ -5959,7 +5959,7 @@ lbl_8003F988: /* 8003F9BC 0003C91C 83 81 00 20 */ lwz r28, 0x20(r1) /* 8003F9C0 0003C920 7C 08 03 A6 */ mtlr r0 /* 8003F9C4 0003C924 38 21 00 30 */ addi r1, r1, 0x30 -/* 8003F9C8 0003C928 4E 80 00 20 */ blr +/* 8003F9C8 0003C928 4E 80 00 20 */ blr .global ActivateCombo__10CPlayerGunFR13CStateManager ActivateCombo__10CPlayerGunFR13CStateManager: @@ -6066,7 +6066,7 @@ lbl_8003FB08: /* 8003FB48 0003CAA8 38 80 00 01 */ li r4, 1 /* 8003FB4C 0003CAAC 81 8C 00 08 */ lwz r12, 8(r12) /* 8003FB50 0003CAB0 7D 89 03 A6 */ mtctr r12 -/* 8003FB54 0003CAB4 4E 80 04 21 */ bctrl +/* 8003FB54 0003CAB4 4E 80 04 21 */ bctrl lbl_8003FB58: /* 8003FB58 0003CAB8 88 61 00 10 */ lbz r3, 0x10(r1) /* 8003FB5C 0003CABC 38 00 00 00 */ li r0, 0 @@ -6085,7 +6085,7 @@ lbl_8003FB70: /* 8003FB8C 0003CAEC 38 80 00 01 */ li r4, 1 /* 8003FB90 0003CAF0 81 8C 00 08 */ lwz r12, 8(r12) /* 8003FB94 0003CAF4 7D 89 03 A6 */ mtctr r12 -/* 8003FB98 0003CAF8 4E 80 04 21 */ bctrl +/* 8003FB98 0003CAF8 4E 80 04 21 */ bctrl lbl_8003FB9C: /* 8003FB9C 0003CAFC 7F A0 07 75 */ extsb. r0, r29 /* 8003FBA0 0003CB00 41 82 00 10 */ beq lbl_8003FBB0 @@ -6099,7 +6099,7 @@ lbl_8003FBB0: /* 8003FBBC 0003CB1C 81 83 00 00 */ lwz r12, 0(r3) /* 8003FBC0 0003CB20 81 8C 00 24 */ lwz r12, 0x24(r12) /* 8003FBC4 0003CB24 7D 89 03 A6 */ mtctr r12 -/* 8003FBC8 0003CB28 4E 80 04 21 */ bctrl +/* 8003FBC8 0003CB28 4E 80 04 21 */ bctrl lbl_8003FBCC: /* 8003FBCC 0003CB2C 80 BE 07 2C */ lwz r5, 0x72c(r30) /* 8003FBD0 0003CB30 38 C0 00 01 */ li r6, 1 @@ -6132,7 +6132,7 @@ lbl_8003FC30: /* 8003FC34 0003CB94 80 01 00 44 */ lwz r0, 0x44(r1) /* 8003FC38 0003CB98 7C 08 03 A6 */ mtlr r0 /* 8003FC3C 0003CB9C 38 21 00 40 */ addi r1, r1, 0x40 -/* 8003FC40 0003CBA0 4E 80 00 20 */ blr +/* 8003FC40 0003CBA0 4E 80 00 20 */ blr .global DropBomb__10CPlayerGunFQ210CPlayerGun8EBWeaponR13CStateManager DropBomb__10CPlayerGunFQ210CPlayerGun8EBWeaponR13CStateManager: @@ -6289,7 +6289,7 @@ lbl_8003FE70: /* 8003FE7C 0003CDDC 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 8003FE80 0003CDE0 7C 08 03 A6 */ mtlr r0 /* 8003FE84 0003CDE4 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 8003FE88 0003CDE8 4E 80 00 20 */ blr +/* 8003FE88 0003CDE8 4E 80 00 20 */ blr .global FireSecondary__10CPlayerGunFfR13CStateManager FireSecondary__10CPlayerGunFfR13CStateManager: @@ -6539,7 +6539,7 @@ lbl_800401EC: /* 8004021C 0003D17C 83 81 01 00 */ lwz r28, 0x100(r1) /* 80040220 0003D180 7C 08 03 A6 */ mtlr r0 /* 80040224 0003D184 38 21 01 50 */ addi r1, r1, 0x150 -/* 80040228 0003D188 4E 80 00 20 */ blr +/* 80040228 0003D188 4E 80 00 20 */ blr .global UpdateNormalShotCycle__10CPlayerGunFfR13CStateManager UpdateNormalShotCycle__10CPlayerGunFfR13CStateManager: @@ -6677,7 +6677,7 @@ lbl_800403E8: /* 80040418 0003D378 54 04 E7 FE */ rlwinm r4, r0, 0x1c, 0x1f, 0x1f /* 8004041C 0003D37C 80 BE 03 30 */ lwz r5, 0x330(r30) /* 80040420 0003D380 7D 89 03 A6 */ mtctr r12 -/* 80040424 0003D384 4E 80 04 21 */ bctrl +/* 80040424 0003D384 4E 80 04 21 */ bctrl /* 80040428 0003D388 38 61 00 28 */ addi r3, r1, 0x28 /* 8004042C 0003D38C 38 9E 04 A8 */ addi r4, r30, 0x4a8 /* 80040430 0003D390 48 2D 27 45 */ bl __ct__12CTransform4fFRC12CTransform4f @@ -6706,7 +6706,7 @@ lbl_8004045C: /* 80040488 0003D3E8 83 A1 00 F4 */ lwz r29, 0xf4(r1) /* 8004048C 0003D3EC 7C 08 03 A6 */ mtlr r0 /* 80040490 0003D3F0 38 21 01 40 */ addi r1, r1, 0x140 -/* 80040494 0003D3F4 4E 80 00 20 */ blr +/* 80040494 0003D3F4 4E 80 00 20 */ blr .global ExitMissile__10CPlayerGunFv ExitMissile__10CPlayerGunFv: @@ -6737,7 +6737,7 @@ lbl_800404EC: /* 800404EC 0003D44C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800404F0 0003D450 7C 08 03 A6 */ mtlr r0 /* 800404F4 0003D454 38 21 00 10 */ addi r1, r1, 0x10 -/* 800404F8 0003D458 4E 80 00 20 */ blr +/* 800404F8 0003D458 4E 80 00 20 */ blr .global ProcessNormalState__10CPlayerGunFiiR13CStateManagerf ProcessNormalState__10CPlayerGunFiiR13CStateManagerf: @@ -6772,7 +6772,7 @@ lbl_80040560: /* 80040560 0003D4C0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80040564 0003D4C4 7C 08 03 A6 */ mtlr r0 /* 80040568 0003D4C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8004056C 0003D4CC 4E 80 00 20 */ blr +/* 8004056C 0003D4CC 4E 80 00 20 */ blr .global ResetCharged__10CPlayerGunFfR13CStateManager ResetCharged__10CPlayerGunFfR13CStateManager: @@ -6825,7 +6825,7 @@ lbl_80040614: /* 8004061C 0003D57C 83 C1 00 08 */ lwz r30, 8(r1) /* 80040620 0003D580 7C 08 03 A6 */ mtlr r0 /* 80040624 0003D584 38 21 00 10 */ addi r1, r1, 0x10 -/* 80040628 0003D588 4E 80 00 20 */ blr +/* 80040628 0003D588 4E 80 00 20 */ blr .global ResetNormal__10CPlayerGunFR13CStateManager ResetNormal__10CPlayerGunFR13CStateManager: @@ -6844,7 +6844,7 @@ ResetNormal__10CPlayerGunFR13CStateManager: /* 8004065C 0003D5BC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80040660 0003D5C0 7C 08 03 A6 */ mtlr r0 /* 80040664 0003D5C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80040668 0003D5C8 4E 80 00 20 */ blr +/* 80040668 0003D5C8 4E 80 00 20 */ blr .global ProcessChargeState__10CPlayerGunFiiR13CStateManagerf ProcessChargeState__10CPlayerGunFiiR13CStateManagerf: @@ -6930,7 +6930,7 @@ lbl_80040780: /* 80040798 0003D6F8 83 81 00 10 */ lwz r28, 0x10(r1) /* 8004079C 0003D6FC 7C 08 03 A6 */ mtlr r0 /* 800407A0 0003D700 38 21 00 30 */ addi r1, r1, 0x30 -/* 800407A4 0003D704 4E 80 00 20 */ blr +/* 800407A4 0003D704 4E 80 00 20 */ blr .global ProcessInput__10CPlayerGunFRC11CFinalInputR13CStateManager ProcessInput__10CPlayerGunFRC11CFinalInputR13CStateManager: @@ -7040,7 +7040,7 @@ lbl_80040920: /* 80040924 0003D884 80 01 00 24 */ lwz r0, 0x24(r1) /* 80040928 0003D888 7C 08 03 A6 */ mtlr r0 /* 8004092C 0003D88C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80040930 0003D890 4E 80 00 20 */ blr +/* 80040930 0003D890 4E 80 00 20 */ blr .global Update__10CPlayerGunFfffR13CStateManager Update__10CPlayerGunFfffR13CStateManager: @@ -7161,7 +7161,7 @@ lbl_80040AA0: /* 80040AD4 0003DA34 81 83 00 00 */ lwz r12, 0(r3) /* 80040AD8 0003DA38 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80040ADC 0003DA3C 7D 89 03 A6 */ mtctr r12 -/* 80040AE0 0003DA40 4E 80 04 21 */ bctrl +/* 80040AE0 0003DA40 4E 80 04 21 */ bctrl lbl_80040AE4: /* 80040AE4 0003DA44 80 7C 07 44 */ lwz r3, 0x744(r28) /* 80040AE8 0003DA48 88 03 00 80 */ lbz r0, 0x80(r3) @@ -7176,7 +7176,7 @@ lbl_80040AF8: /* 80040B08 0003DA68 81 83 00 00 */ lwz r12, 0(r3) /* 80040B0C 0003DA6C 81 8C 00 28 */ lwz r12, 0x28(r12) /* 80040B10 0003DA70 7D 89 03 A6 */ mtctr r12 -/* 80040B14 0003DA74 4E 80 04 21 */ bctrl +/* 80040B14 0003DA74 4E 80 04 21 */ bctrl /* 80040B18 0003DA78 80 7C 07 2C */ lwz r3, 0x72c(r28) /* 80040B1C 0003DA7C 38 80 00 01 */ li r4, 1 /* 80040B20 0003DA80 48 17 97 A9 */ bl EnableFrozenEffect__10CGunWeaponF13EFrozenFxType @@ -7206,7 +7206,7 @@ lbl_80040B64: /* 80040B70 0003DAD0 81 83 00 00 */ lwz r12, 0(r3) /* 80040B74 0003DAD4 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80040B78 0003DAD8 7D 89 03 A6 */ mtctr r12 -/* 80040B7C 0003DADC 4E 80 04 21 */ bctrl +/* 80040B7C 0003DADC 4E 80 04 21 */ bctrl /* 80040B80 0003DAE0 C0 1C 03 70 */ lfs f0, 0x370(r28) /* 80040B84 0003DAE4 7F A4 EB 78 */ mr r4, r29 /* 80040B88 0003DAE8 80 7C 07 3C */ lwz r3, 0x73c(r28) @@ -7261,7 +7261,7 @@ lbl_80040C2C: /* 80040C44 0003DBA4 38 63 9E 04 */ addi r3, r3, lbl_803D9E04@l /* 80040C48 0003DBA8 7C 03 00 2E */ lwzx r0, r3, r0 /* 80040C4C 0003DBAC 7C 09 03 A6 */ mtctr r0 -/* 80040C50 0003DBB0 4E 80 04 20 */ bctr +/* 80040C50 0003DBB0 4E 80 04 20 */ bctr .global lbl_80040C54 lbl_80040C54: /* 80040C54 0003DBB4 80 7C 02 F8 */ lwz r3, 0x2f8(r28) @@ -7350,7 +7350,7 @@ lbl_80040D64: /* 80040D68 0003DCC8 81 83 00 00 */ lwz r12, 0(r3) /* 80040D6C 0003DCCC 81 8C 00 40 */ lwz r12, 0x40(r12) /* 80040D70 0003DCD0 7D 89 03 A6 */ mtctr r12 -/* 80040D74 0003DCD4 4E 80 04 21 */ bctrl +/* 80040D74 0003DCD4 4E 80 04 21 */ bctrl /* 80040D78 0003DCD8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80040D7C 0003DCDC 40 82 00 94 */ bne lbl_80040E10 /* 80040D80 0003DCE0 80 7C 07 2C */ lwz r3, 0x72c(r28) @@ -7364,7 +7364,7 @@ lbl_80040D64: /* 80040DA0 0003DD00 81 83 00 00 */ lwz r12, 0(r3) /* 80040DA4 0003DD04 81 8C 00 38 */ lwz r12, 0x38(r12) /* 80040DA8 0003DD08 7D 89 03 A6 */ mtctr r12 -/* 80040DAC 0003DD0C 4E 80 04 21 */ bctrl +/* 80040DAC 0003DD0C 4E 80 04 21 */ bctrl /* 80040DB0 0003DD10 38 00 00 01 */ li r0, 1 /* 80040DB4 0003DD14 90 1C 03 3C */ stw r0, 0x33c(r28) /* 80040DB8 0003DD18 48 00 00 58 */ b lbl_80040E10 @@ -7374,7 +7374,7 @@ lbl_80040DBC: /* 80040DC0 0003DD20 81 83 00 00 */ lwz r12, 0(r3) /* 80040DC4 0003DD24 81 8C 00 40 */ lwz r12, 0x40(r12) /* 80040DC8 0003DD28 7D 89 03 A6 */ mtctr r12 -/* 80040DCC 0003DD2C 4E 80 04 21 */ bctrl +/* 80040DCC 0003DD2C 4E 80 04 21 */ bctrl /* 80040DD0 0003DD30 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80040DD4 0003DD34 40 82 00 3C */ bne lbl_80040E10 /* 80040DD8 0003DD38 80 7C 07 2C */ lwz r3, 0x72c(r28) @@ -7388,7 +7388,7 @@ lbl_80040DBC: /* 80040DF8 0003DD58 81 83 00 00 */ lwz r12, 0(r3) /* 80040DFC 0003DD5C 81 8C 00 38 */ lwz r12, 0x38(r12) /* 80040E00 0003DD60 7D 89 03 A6 */ mtctr r12 -/* 80040E04 0003DD64 4E 80 04 21 */ bctrl +/* 80040E04 0003DD64 4E 80 04 21 */ bctrl /* 80040E08 0003DD68 38 00 00 02 */ li r0, 2 /* 80040E0C 0003DD6C 90 1C 03 3C */ stw r0, 0x33c(r28) .global lbl_80040E10 @@ -7458,7 +7458,7 @@ lbl_80040EF4: /* 80040EF8 0003DE58 81 83 00 00 */ lwz r12, 0(r3) /* 80040EFC 0003DE5C 81 8C 00 40 */ lwz r12, 0x40(r12) /* 80040F00 0003DE60 7D 89 03 A6 */ mtctr r12 -/* 80040F04 0003DE64 4E 80 04 21 */ bctrl +/* 80040F04 0003DE64 4E 80 04 21 */ bctrl /* 80040F08 0003DE68 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80040F0C 0003DE6C 41 82 09 7C */ beq lbl_80041888 /* 80040F10 0003DE70 80 BC 07 2C */ lwz r5, 0x72c(r28) @@ -7573,7 +7573,7 @@ lbl_800410AC: /* 800410B8 0003E018 38 DC 05 08 */ addi r6, r28, 0x508 /* 800410BC 0003E01C 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 800410C0 0003E020 7D 89 03 A6 */ mtctr r12 -/* 800410C4 0003E024 4E 80 04 21 */ bctrl +/* 800410C4 0003E024 4E 80 04 21 */ bctrl /* 800410C8 0003E028 38 61 02 10 */ addi r3, r1, 0x210 /* 800410CC 0003E02C 38 9C 04 A8 */ addi r4, r28, 0x4a8 /* 800410D0 0003E030 48 2D 1A A5 */ bl __ct__12CTransform4fFRC12CTransform4f @@ -7852,7 +7852,7 @@ lbl_80041470: /* 800414DC 0003E43C 81 83 00 00 */ lwz r12, 0(r3) /* 800414E0 0003E440 81 8C 00 24 */ lwz r12, 0x24(r12) /* 800414E4 0003E444 7D 89 03 A6 */ mtctr r12 -/* 800414E8 0003E448 4E 80 04 21 */ bctrl +/* 800414E8 0003E448 4E 80 04 21 */ bctrl /* 800414EC 0003E44C 80 1C 03 20 */ lwz r0, 0x320(r28) /* 800414F0 0003E450 7F 24 CB 78 */ mr r4, r25 /* 800414F4 0003E454 54 03 18 38 */ slwi r3, r0, 3 @@ -7861,7 +7861,7 @@ lbl_80041470: /* 80041500 0003E460 81 83 00 00 */ lwz r12, 0(r3) /* 80041504 0003E464 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80041508 0003E468 7D 89 03 A6 */ mtctr r12 -/* 8004150C 0003E46C 4E 80 04 21 */ bctrl +/* 8004150C 0003E46C 4E 80 04 21 */ bctrl /* 80041510 0003E470 80 1C 03 20 */ lwz r0, 0x320(r28) /* 80041514 0003E474 FC 20 E0 90 */ fmr f1, f28 /* 80041518 0003E478 54 03 18 38 */ slwi r3, r0, 3 @@ -7870,7 +7870,7 @@ lbl_80041470: /* 80041524 0003E484 81 83 00 00 */ lwz r12, 0(r3) /* 80041528 0003E488 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8004152C 0003E48C 7D 89 03 A6 */ mtctr r12 -/* 80041530 0003E490 4E 80 04 21 */ bctrl +/* 80041530 0003E490 4E 80 04 21 */ bctrl lbl_80041534: /* 80041534 0003E494 80 7C 07 48 */ lwz r3, 0x748(r28) /* 80041538 0003E498 28 03 00 00 */ cmplwi r3, 0 @@ -7911,7 +7911,7 @@ lbl_80041588: /* 800415BC 0003E51C 81 83 00 00 */ lwz r12, 0(r3) /* 800415C0 0003E520 81 8C 00 20 */ lwz r12, 0x20(r12) /* 800415C4 0003E524 7D 89 03 A6 */ mtctr r12 -/* 800415C8 0003E528 4E 80 04 21 */ bctrl +/* 800415C8 0003E528 4E 80 04 21 */ bctrl /* 800415CC 0003E52C 83 1C 07 80 */ lwz r24, 0x780(r28) /* 800415D0 0003E530 38 61 01 1C */ addi r3, r1, 0x11c /* 800415D4 0003E534 38 9C 04 18 */ addi r4, r28, 0x418 @@ -7921,13 +7921,13 @@ lbl_80041588: /* 800415E4 0003E544 81 98 00 00 */ lwz r12, 0(r24) /* 800415E8 0003E548 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 800415EC 0003E54C 7D 89 03 A6 */ mtctr r12 -/* 800415F0 0003E550 4E 80 04 21 */ bctrl +/* 800415F0 0003E550 4E 80 04 21 */ bctrl /* 800415F4 0003E554 80 7C 07 80 */ lwz r3, 0x780(r28) /* 800415F8 0003E558 FC 20 E0 90 */ fmr f1, f28 /* 800415FC 0003E55C 81 83 00 00 */ lwz r12, 0(r3) /* 80041600 0003E560 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80041604 0003E564 7D 89 03 A6 */ mtctr r12 -/* 80041608 0003E568 4E 80 04 21 */ bctrl +/* 80041608 0003E568 4E 80 04 21 */ bctrl /* 8004160C 0003E56C C0 22 85 04 */ lfs f1, lbl_805AA224@sda21(r2) /* 80041610 0003E570 C0 1C 03 44 */ lfs f0, 0x344(r28) /* 80041614 0003E574 EC 01 07 3A */ fmadds f0, f1, f28, f0 @@ -8114,7 +8114,7 @@ lbl_80041888: /* 800418B4 0003E814 80 01 0C 44 */ lwz r0, 0xc44(r1) /* 800418B8 0003E818 7C 08 03 A6 */ mtlr r0 /* 800418BC 0003E81C 38 21 0C 40 */ addi r1, r1, 0xc40 -/* 800418C0 0003E820 4E 80 00 20 */ blr +/* 800418C0 0003E820 4E 80 00 20 */ blr .global PlayAnim__10CPlayerGunFQ212NWeaponTypes12EGunAnimTypeb PlayAnim__10CPlayerGunFQ212NWeaponTypes12EGunAnimTypeb: @@ -8132,7 +8132,7 @@ PlayAnim__10CPlayerGunFQ212NWeaponTypes12EGunAnimTypeb: /* 800418F0 0003E850 81 83 00 00 */ lwz r12, 0(r3) /* 800418F4 0003E854 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800418F8 0003E858 7D 89 03 A6 */ mtctr r12 -/* 800418FC 0003E85C 4E 80 04 21 */ bctrl +/* 800418FC 0003E85C 4E 80 04 21 */ bctrl lbl_80041900: /* 80041900 0003E860 2C 1E 00 07 */ cmpwi r30, 7 /* 80041904 0003E864 A0 62 C5 FC */ lhz r3, lbl_805AE31C@sda21(r2) @@ -8190,7 +8190,7 @@ lbl_800419B0: /* 800419B8 0003E918 83 C1 00 18 */ lwz r30, 0x18(r1) /* 800419BC 0003E91C 7C 08 03 A6 */ mtlr r0 /* 800419C0 0003E920 38 21 00 20 */ addi r1, r1, 0x20 -/* 800419C4 0003E924 4E 80 00 20 */ blr +/* 800419C4 0003E924 4E 80 00 20 */ blr .global "GetLctrWithShake__10CPlayerGunFR12CTransform4fRC10CModelDataRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>bb" "GetLctrWithShake__10CPlayerGunFR12CTransform4fRC10CModelDataRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>bb": @@ -8245,7 +8245,7 @@ lbl_80041A70: /* 80041A7C 0003E9DC 83 A1 00 74 */ lwz r29, 0x74(r1) /* 80041A80 0003E9E0 7C 08 03 A6 */ mtlr r0 /* 80041A84 0003E9E4 38 21 00 80 */ addi r1, r1, 0x80 -/* 80041A88 0003E9E8 4E 80 00 20 */ blr +/* 80041A88 0003E9E8 4E 80 00 20 */ blr .global Render__10CPlayerGunCFRC13CStateManagerRC9CVector3fRC11CModelFlags Render__10CPlayerGunCFRC13CStateManagerRC9CVector3fRC11CModelFlags: @@ -8373,7 +8373,7 @@ lbl_80041C1C: /* 80041C60 0003EBC0 81 83 00 00 */ lwz r12, 0(r3) /* 80041C64 0003EBC4 81 8C 00 30 */ lwz r12, 0x30(r12) /* 80041C68 0003EBC8 7D 89 03 A6 */ mtctr r12 -/* 80041C6C 0003EBCC 4E 80 04 21 */ bctrl +/* 80041C6C 0003EBCC 4E 80 04 21 */ bctrl /* 80041C70 0003EBD0 80 1C 03 2C */ lwz r0, 0x32c(r28) /* 80041C74 0003EBD4 2C 00 00 04 */ cmpwi r0, 4 /* 80041C78 0003EBD8 41 80 00 2C */ blt lbl_80041CA4 @@ -8386,7 +8386,7 @@ lbl_80041C1C: /* 80041C94 0003EBF4 81 83 00 00 */ lwz r12, 0(r3) /* 80041C98 0003EBF8 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80041C9C 0003EBFC 7D 89 03 A6 */ mtctr r12 -/* 80041CA0 0003EC00 4E 80 04 21 */ bctrl +/* 80041CA0 0003EC00 4E 80 04 21 */ bctrl lbl_80041CA4: /* 80041CA4 0003EC04 88 1C 08 32 */ lbz r0, 0x832(r28) /* 80041CA8 0003EC08 54 00 D7 FF */ rlwinm. r0, r0, 0x1a, 0x1f, 0x1f @@ -8404,7 +8404,7 @@ lbl_80041CCC: /* 80041CD4 0003EC34 81 83 00 00 */ lwz r12, 0(r3) /* 80041CD8 0003EC38 81 8C 00 30 */ lwz r12, 0x30(r12) /* 80041CDC 0003EC3C 7D 89 03 A6 */ mtctr r12 -/* 80041CE0 0003EC40 4E 80 04 21 */ bctrl +/* 80041CE0 0003EC40 4E 80 04 21 */ bctrl lbl_80041CE4: /* 80041CE4 0003EC44 2C 16 00 02 */ cmpwi r22, 2 /* 80041CE8 0003EC48 41 82 00 0C */ beq lbl_80041CF4 @@ -8415,7 +8415,7 @@ lbl_80041CF4: /* 80041CF8 0003EC58 81 83 00 00 */ lwz r12, 0(r3) /* 80041CFC 0003EC5C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80041D00 0003EC60 7D 89 03 A6 */ mtctr r12 -/* 80041D04 0003EC64 4E 80 04 21 */ bctrl +/* 80041D04 0003EC64 4E 80 04 21 */ bctrl lbl_80041D08: /* 80041D08 0003EC68 38 61 03 B4 */ addi r3, r1, 0x3b4 /* 80041D0C 0003EC6C 48 2C AA 41 */ bl SetViewPointMatrix__9CGraphicsFRC12CTransform4f @@ -8432,7 +8432,7 @@ lbl_80041D28: /* 80041D34 0003EC94 81 83 00 00 */ lwz r12, 0(r3) /* 80041D38 0003EC98 81 8C 00 14 */ lwz r12, 0x14(r12) /* 80041D3C 0003EC9C 7D 89 03 A6 */ mtctr r12 -/* 80041D40 0003ECA0 4E 80 04 21 */ bctrl +/* 80041D40 0003ECA0 4E 80 04 21 */ bctrl /* 80041D44 0003ECA4 80 7C 07 40 */ lwz r3, 0x740(r28) /* 80041D48 0003ECA8 3B 40 00 00 */ li r26, 0 /* 80041D4C 0003ECAC 88 03 03 B2 */ lbz r0, 0x3b2(r3) @@ -8507,7 +8507,7 @@ lbl_80041E1C: /* 80041E48 0003EDA8 38 C1 04 14 */ addi r6, r1, 0x414 /* 80041E4C 0003EDAC 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80041E50 0003EDB0 7D 89 03 A6 */ mtctr r12 -/* 80041E54 0003EDB4 4E 80 04 21 */ bctrl +/* 80041E54 0003EDB4 4E 80 04 21 */ bctrl /* 80041E58 0003EDB8 80 7C 08 2C */ lwz r3, 0x82c(r28) /* 80041E5C 0003EDBC 48 0C F1 3D */ bl DisableModelProjectedShadow__12CWorldShadowCFv /* 80041E60 0003EDC0 48 00 02 30 */ b lbl_80042090 @@ -8592,7 +8592,7 @@ lbl_80041F88: /* 80041F90 0003EEF0 81 83 00 00 */ lwz r12, 0(r3) /* 80041F94 0003EEF4 81 8C 00 30 */ lwz r12, 0x30(r12) /* 80041F98 0003EEF8 7D 89 03 A6 */ mtctr r12 -/* 80041F9C 0003EEFC 4E 80 04 21 */ bctrl +/* 80041F9C 0003EEFC 4E 80 04 21 */ bctrl /* 80041FA0 0003EF00 38 7C 06 C8 */ addi r3, r28, 0x6c8 /* 80041FA4 0003EF04 48 17 7C A9 */ bl DrawClipCube__FRC6CAABox /* 80041FA8 0003EF08 80 7C 07 2C */ lwz r3, 0x72c(r28) @@ -8604,7 +8604,7 @@ lbl_80041F88: /* 80041FC0 0003EF20 38 C1 04 14 */ addi r6, r1, 0x414 /* 80041FC4 0003EF24 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80041FC8 0003EF28 7D 89 03 A6 */ mtctr r12 -/* 80041FCC 0003EF2C 4E 80 04 21 */ bctrl +/* 80041FCC 0003EF2C 4E 80 04 21 */ bctrl /* 80041FD0 0003EF30 7F 83 E3 78 */ mr r3, r28 /* 80041FD4 0003EF34 7F A4 EB 78 */ mr r4, r29 /* 80041FD8 0003EF38 7F C5 F3 78 */ mr r5, r30 @@ -8676,14 +8676,14 @@ lbl_80042090: /* 800420D0 0003F030 81 83 00 00 */ lwz r12, 0(r3) /* 800420D4 0003F034 81 8C 00 30 */ lwz r12, 0x30(r12) /* 800420D8 0003F038 7D 89 03 A6 */ mtctr r12 -/* 800420DC 0003F03C 4E 80 04 21 */ bctrl +/* 800420DC 0003F03C 4E 80 04 21 */ bctrl /* 800420E0 0003F040 80 7C 07 2C */ lwz r3, 0x72c(r28) /* 800420E4 0003F044 7F A4 EB 78 */ mr r4, r29 /* 800420E8 0003F048 38 A1 04 14 */ addi r5, r1, 0x414 /* 800420EC 0003F04C 81 83 00 00 */ lwz r12, 0(r3) /* 800420F0 0003F050 81 8C 00 18 */ lwz r12, 0x18(r12) /* 800420F4 0003F054 7D 89 03 A6 */ mtctr r12 -/* 800420F8 0003F058 4E 80 04 21 */ bctrl +/* 800420F8 0003F058 4E 80 04 21 */ bctrl /* 800420FC 0003F05C 88 1C 08 32 */ lbz r0, 0x832(r28) /* 80042100 0003F060 54 00 DF FF */ rlwinm. r0, r0, 0x1b, 0x1f, 0x1f /* 80042104 0003F064 41 82 00 20 */ beq lbl_80042124 @@ -8693,7 +8693,7 @@ lbl_80042090: /* 80042114 0003F074 81 83 00 00 */ lwz r12, 0(r3) /* 80042118 0003F078 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8004211C 0003F07C 7D 89 03 A6 */ mtctr r12 -/* 80042120 0003F080 4E 80 04 21 */ bctrl +/* 80042120 0003F080 4E 80 04 21 */ bctrl lbl_80042124: /* 80042124 0003F084 38 61 02 F4 */ addi r3, r1, 0x2f4 /* 80042128 0003F088 48 2C A6 25 */ bl SetViewPointMatrix__9CGraphicsFRC12CTransform4f @@ -8709,7 +8709,7 @@ lbl_80042124: /* 80042150 0003F0B0 80 01 04 74 */ lwz r0, 0x474(r1) /* 80042154 0003F0B4 7C 08 03 A6 */ mtlr r0 /* 80042158 0003F0B8 38 21 04 70 */ addi r1, r1, 0x470 -/* 8004215C 0003F0BC 4E 80 00 20 */ blr +/* 8004215C 0003F0BC 4E 80 00 20 */ blr .global DrawArm__10CPlayerGunCFRC13CStateManagerRC9CVector3fRC11CModelFlags DrawArm__10CPlayerGunCFRC13CStateManagerRC9CVector3fRC11CModelFlags: @@ -8795,11 +8795,11 @@ lbl_8004227C: /* 8004228C 0003F1EC 83 81 00 60 */ lwz r28, 0x60(r1) /* 80042290 0003F1F0 7C 08 03 A6 */ mtlr r0 /* 80042294 0003F1F4 38 21 00 70 */ addi r1, r1, 0x70 -/* 80042298 0003F1F8 4E 80 00 20 */ blr +/* 80042298 0003F1F8 4E 80 00 20 */ blr .global PreRenderGunFx__10CGunWeaponFRC13CStateManagerRC12CTransform4f PreRenderGunFx__10CGunWeaponFRC13CStateManagerRC12CTransform4f: -/* 8004229C 0003F1FC 4E 80 00 20 */ blr +/* 8004229C 0003F1FC 4E 80 00 20 */ blr .global ConvertToScreenSpace__10CPlayerGunCFRC9CVector3fRC11CGameCamera ConvertToScreenSpace__10CPlayerGunCFRC9CVector3fRC11CGameCamera: @@ -8861,7 +8861,7 @@ lbl_80042368: /* 8004236C 0003F2CC 83 E1 00 7C */ lwz r31, 0x7c(r1) /* 80042370 0003F2D0 7C 08 03 A6 */ mtlr r0 /* 80042374 0003F2D4 38 21 00 80 */ addi r1, r1, 0x80 -/* 80042378 0003F2D8 4E 80 00 20 */ blr +/* 80042378 0003F2D8 4E 80 00 20 */ blr .global TouchModel__10CPlayerGunCFRC13CStateManager TouchModel__10CPlayerGunCFRC13CStateManager: @@ -8938,7 +8938,7 @@ lbl_80042470: /* 80042478 0003F3D8 83 C1 00 08 */ lwz r30, 8(r1) /* 8004247C 0003F3DC 7C 08 03 A6 */ mtlr r0 /* 80042480 0003F3E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80042484 0003F3E4 4E 80 00 20 */ blr +/* 80042484 0003F3E4 4E 80 00 20 */ blr .global DrawScreenTex__Ff DrawScreenTex__Ff: @@ -9008,12 +9008,12 @@ DrawScreenTex__Ff: /* 80042584 0003F4E4 81 83 00 00 */ lwz r12, 0(r3) /* 80042588 0003F4E8 81 8C 00 30 */ lwz r12, 0x30(r12) /* 8004258C 0003F4EC 7D 89 03 A6 */ mtctr r12 -/* 80042590 0003F4F0 4E 80 04 21 */ bctrl +/* 80042590 0003F4F0 4E 80 04 21 */ bctrl /* 80042594 0003F4F4 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 80042598 0003F4F8 81 83 00 00 */ lwz r12, 0(r3) /* 8004259C 0003F4FC 81 8C 00 68 */ lwz r12, 0x68(r12) /* 800425A0 0003F500 7D 89 03 A6 */ mtctr r12 -/* 800425A4 0003F504 4E 80 04 21 */ bctrl +/* 800425A4 0003F504 4E 80 04 21 */ bctrl /* 800425A8 0003F508 38 60 00 01 */ li r3, 1 /* 800425AC 0003F50C 38 80 00 06 */ li r4, 6 /* 800425B0 0003F510 38 A0 00 01 */ li r5, 1 @@ -9103,7 +9103,7 @@ DrawScreenTex__Ff: /* 80042700 0003F660 CB E1 00 90 */ lfd f31, 0x90(r1) /* 80042704 0003F664 7C 08 03 A6 */ mtlr r0 /* 80042708 0003F668 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8004270C 0003F66C 4E 80 00 20 */ blr +/* 8004270C 0003F66C 4E 80 00 20 */ blr .global CopyScreenTex__Fv CopyScreenTex__Fv: @@ -9127,7 +9127,7 @@ CopyScreenTex__Fv: /* 80042754 0003F6B4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80042758 0003F6B8 7C 08 03 A6 */ mtlr r0 /* 8004275C 0003F6BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80042760 0003F6C0 4E 80 00 20 */ blr +/* 80042760 0003F6C0 4E 80 00 20 */ blr .global PreRender__10CPlayerGunFR13CStateManagerRC14CFrustumPlanesRC9CVector3f PreRender__10CPlayerGunFR13CStateManagerRC14CFrustumPlanesRC9CVector3f: @@ -9239,7 +9239,7 @@ lbl_800428D8: /* 800428FC 0003F85C 81 83 00 00 */ lwz r12, 0(r3) /* 80042900 0003F860 81 8C 00 40 */ lwz r12, 0x40(r12) /* 80042904 0003F864 7D 89 03 A6 */ mtctr r12 -/* 80042908 0003F868 4E 80 04 21 */ bctrl +/* 80042908 0003F868 4E 80 04 21 */ bctrl /* 8004290C 0003F86C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80042910 0003F870 41 82 00 3C */ beq lbl_8004294C /* 80042914 0003F874 80 1C 08 CC */ lwz r0, 0x8cc(r28) @@ -9286,7 +9286,7 @@ lbl_8004299C: /* 800429A0 0003F900 80 01 01 34 */ lwz r0, 0x134(r1) /* 800429A4 0003F904 7C 08 03 A6 */ mtlr r0 /* 800429A8 0003F908 38 21 01 30 */ addi r1, r1, 0x130 -/* 800429AC 0003F90C 4E 80 00 20 */ blr +/* 800429AC 0003F90C 4E 80 00 20 */ blr .global AddToRenderer__10CPlayerGunCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__10CPlayerGunCFRC14CFrustumPlanesRC13CStateManager: @@ -9303,7 +9303,7 @@ lbl_800429D4: /* 800429D4 0003F934 80 01 00 14 */ lwz r0, 0x14(r1) /* 800429D8 0003F938 7C 08 03 A6 */ mtlr r0 /* 800429DC 0003F93C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800429E0 0003F940 4E 80 00 20 */ blr +/* 800429E0 0003F940 4E 80 00 20 */ blr .global __dt__10CPlayerGunFv __dt__10CPlayerGunFv: @@ -9341,7 +9341,7 @@ lbl_80042A34: /* 80042A58 0003F9B8 38 80 00 01 */ li r4, 1 /* 80042A5C 0003F9BC 81 8C 00 08 */ lwz r12, 8(r12) /* 80042A60 0003F9C0 7D 89 03 A6 */ mtctr r12 -/* 80042A64 0003F9C4 4E 80 04 21 */ bctrl +/* 80042A64 0003F9C4 4E 80 04 21 */ bctrl lbl_80042A68: /* 80042A68 0003F9C8 3B 9C 00 08 */ addi r28, r28, 8 /* 80042A6C 0003F9CC 3B BD 00 01 */ addi r29, r29, 1 @@ -9389,7 +9389,7 @@ lbl_80042ACC: /* 80042AFC 0003FA5C 38 80 00 01 */ li r4, 1 /* 80042B00 0003FA60 81 8C 00 08 */ lwz r12, 8(r12) /* 80042B04 0003FA64 7D 89 03 A6 */ mtctr r12 -/* 80042B08 0003FA68 4E 80 04 21 */ bctrl +/* 80042B08 0003FA68 4E 80 04 21 */ bctrl lbl_80042B0C: /* 80042B0C 0003FA6C 34 1E 07 74 */ addic. r0, r30, 0x774 /* 80042B10 0003FA70 41 82 00 30 */ beq lbl_80042B40 @@ -9403,7 +9403,7 @@ lbl_80042B0C: /* 80042B30 0003FA90 38 80 00 01 */ li r4, 1 /* 80042B34 0003FA94 81 8C 00 08 */ lwz r12, 8(r12) /* 80042B38 0003FA98 7D 89 03 A6 */ mtctr r12 -/* 80042B3C 0003FA9C 4E 80 04 21 */ bctrl +/* 80042B3C 0003FA9C 4E 80 04 21 */ bctrl lbl_80042B40: /* 80042B40 0003FAA0 34 1E 07 60 */ addic. r0, r30, 0x760 /* 80042B44 0003FAA4 41 82 00 58 */ beq lbl_80042B9C @@ -9442,7 +9442,7 @@ lbl_80042B9C: /* 80042BB4 0003FB14 38 80 00 01 */ li r4, 1 /* 80042BB8 0003FB18 81 8C 00 08 */ lwz r12, 8(r12) /* 80042BBC 0003FB1C 7D 89 03 A6 */ mtctr r12 -/* 80042BC0 0003FB20 4E 80 04 21 */ bctrl +/* 80042BC0 0003FB20 4E 80 04 21 */ bctrl lbl_80042BC4: /* 80042BC4 0003FB24 34 1E 07 58 */ addic. r0, r30, 0x758 /* 80042BC8 0003FB28 41 82 00 24 */ beq lbl_80042BEC @@ -9453,7 +9453,7 @@ lbl_80042BC4: /* 80042BDC 0003FB3C 38 80 00 01 */ li r4, 1 /* 80042BE0 0003FB40 81 8C 00 08 */ lwz r12, 8(r12) /* 80042BE4 0003FB44 7D 89 03 A6 */ mtctr r12 -/* 80042BE8 0003FB48 4E 80 04 21 */ bctrl +/* 80042BE8 0003FB48 4E 80 04 21 */ bctrl lbl_80042BEC: /* 80042BEC 0003FB4C 34 1E 07 54 */ addic. r0, r30, 0x754 /* 80042BF0 0003FB50 41 82 00 24 */ beq lbl_80042C14 @@ -9464,7 +9464,7 @@ lbl_80042BEC: /* 80042C04 0003FB64 38 80 00 01 */ li r4, 1 /* 80042C08 0003FB68 81 8C 00 08 */ lwz r12, 8(r12) /* 80042C0C 0003FB6C 7D 89 03 A6 */ mtctr r12 -/* 80042C10 0003FB70 4E 80 04 21 */ bctrl +/* 80042C10 0003FB70 4E 80 04 21 */ bctrl lbl_80042C14: /* 80042C14 0003FB74 34 1E 07 50 */ addic. r0, r30, 0x750 /* 80042C18 0003FB78 41 82 00 24 */ beq lbl_80042C3C @@ -9475,7 +9475,7 @@ lbl_80042C14: /* 80042C2C 0003FB8C 38 80 00 01 */ li r4, 1 /* 80042C30 0003FB90 81 8C 00 08 */ lwz r12, 8(r12) /* 80042C34 0003FB94 7D 89 03 A6 */ mtctr r12 -/* 80042C38 0003FB98 4E 80 04 21 */ bctrl +/* 80042C38 0003FB98 4E 80 04 21 */ bctrl lbl_80042C3C: /* 80042C3C 0003FB9C 34 1E 07 4C */ addic. r0, r30, 0x74c /* 80042C40 0003FBA0 41 82 00 24 */ beq lbl_80042C64 @@ -9486,7 +9486,7 @@ lbl_80042C3C: /* 80042C54 0003FBB4 38 80 00 01 */ li r4, 1 /* 80042C58 0003FBB8 81 8C 00 08 */ lwz r12, 8(r12) /* 80042C5C 0003FBBC 7D 89 03 A6 */ mtctr r12 -/* 80042C60 0003FBC0 4E 80 04 21 */ bctrl +/* 80042C60 0003FBC0 4E 80 04 21 */ bctrl lbl_80042C64: /* 80042C64 0003FBC4 38 7E 07 48 */ addi r3, r30, 0x748 /* 80042C68 0003FBC8 38 80 FF FF */ li r4, -1 @@ -9607,7 +9607,7 @@ lbl_80042DE0: /* 80042DF4 0003FD54 83 81 00 20 */ lwz r28, 0x20(r1) /* 80042DF8 0003FD58 7C 08 03 A6 */ mtlr r0 /* 80042DFC 0003FD5C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80042E00 0003FD60 4E 80 00 20 */ blr +/* 80042E00 0003FD60 4E 80 00 20 */ blr .global "__dt__Q24rstl24single_ptr<10CAuxWeapon>" "__dt__Q24rstl24single_ptr<10CAuxWeapon>": @@ -9633,7 +9633,7 @@ lbl_80042E40: /* 80042E4C 0003FDAC 83 C1 00 08 */ lwz r30, 8(r1) /* 80042E50 0003FDB0 7C 08 03 A6 */ mtlr r0 /* 80042E54 0003FDB4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80042E58 0003FDB8 4E 80 00 20 */ blr +/* 80042E58 0003FDB8 4E 80 00 20 */ blr .global __dt__10CAuxWeaponFv __dt__10CAuxWeaponFv: @@ -9678,7 +9678,7 @@ lbl_80042ECC: /* 80042EE4 0003FE44 38 80 00 01 */ li r4, 1 /* 80042EE8 0003FE48 81 8C 00 08 */ lwz r12, 8(r12) /* 80042EEC 0003FE4C 7D 89 03 A6 */ mtctr r12 -/* 80042EF0 0003FE50 4E 80 04 21 */ bctrl +/* 80042EF0 0003FE50 4E 80 04 21 */ bctrl lbl_80042EF4: /* 80042EF4 0003FE54 34 1C 00 18 */ addic. r0, r28, 0x18 /* 80042EF8 0003FE58 41 82 00 18 */ beq lbl_80042F10 @@ -9716,7 +9716,7 @@ lbl_80042F54: /* 80042F68 0003FEC8 83 81 00 10 */ lwz r28, 0x10(r1) /* 80042F6C 0003FECC 7C 08 03 A6 */ mtlr r0 /* 80042F70 0003FED0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80042F74 0003FED4 4E 80 00 20 */ blr +/* 80042F74 0003FED4 4E 80 00 20 */ blr .global "__dt__Q24rstl34single_ptr<20CRainSplashGenerator>" "__dt__Q24rstl34single_ptr<20CRainSplashGenerator>": @@ -9742,7 +9742,7 @@ lbl_80042FB4: /* 80042FC0 0003FF20 83 C1 00 08 */ lwz r30, 8(r1) /* 80042FC4 0003FF24 7C 08 03 A6 */ mtlr r0 /* 80042FC8 0003FF28 38 21 00 10 */ addi r1, r1, 0x10 -/* 80042FCC 0003FF2C 4E 80 00 20 */ blr +/* 80042FCC 0003FF2C 4E 80 00 20 */ blr .global __dt__20CRainSplashGeneratorFv __dt__20CRainSplashGeneratorFv: @@ -9767,7 +9767,7 @@ lbl_80043008: /* 80043014 0003FF74 83 C1 00 08 */ lwz r30, 8(r1) /* 80043018 0003FF78 7C 08 03 A6 */ mtlr r0 /* 8004301C 0003FF7C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80043020 0003FF80 4E 80 00 20 */ blr +/* 80043020 0003FF80 4E 80 00 20 */ blr .global sub_80043024 sub_80043024: @@ -9839,7 +9839,7 @@ lbl_800430F8: /* 80043104 00040064 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80043108 00040068 7C 08 03 A6 */ mtlr r0 /* 8004310C 0004006C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80043110 00040070 4E 80 00 20 */ blr +/* 80043110 00040070 4E 80 00 20 */ blr .global sub_80043114 sub_80043114: @@ -9894,7 +9894,7 @@ lbl_800431B0: /* 800431B8 00040118 80 01 00 34 */ lwz r0, 0x34(r1) /* 800431BC 0004011C 7C 08 03 A6 */ mtlr r0 /* 800431C0 00040120 38 21 00 30 */ addi r1, r1, 0x30 -/* 800431C4 00040124 4E 80 00 20 */ blr +/* 800431C4 00040124 4E 80 00 20 */ blr .global __ct__10CPlayerGunF9TUniqueId __ct__10CPlayerGunF9TUniqueId: @@ -10322,7 +10322,7 @@ lbl_800437DC: /* 80043828 00040788 81 84 00 00 */ lwz r12, 0(r4) /* 8004382C 0004078C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80043830 00040790 7D 89 03 A6 */ mtctr r12 -/* 80043834 00040794 4E 80 04 21 */ bctrl +/* 80043834 00040794 4E 80 04 21 */ bctrl /* 80043838 00040798 38 61 00 20 */ addi r3, r1, 0x20 /* 8004383C 0004079C 38 81 00 28 */ addi r4, r1, 0x28 /* 80043840 000407A0 3B 80 00 01 */ li r28, 1 @@ -10523,7 +10523,7 @@ lbl_800438EC: /* 80043B3C 00040A9C 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 80043B40 00040AA0 7C 08 03 A6 */ mtlr r0 /* 80043B44 00040AA4 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 80043B48 00040AA8 4E 80 00 20 */ blr +/* 80043B48 00040AA8 4E 80 00 20 */ blr .global "__dl__24TOneStatic<10CPlayerGun>FPv" "__dl__24TOneStatic<10CPlayerGun>FPv": @@ -10537,7 +10537,7 @@ lbl_800438EC: /* 80043B68 00040AC8 80 01 00 14 */ lwz r0, 0x14(r1) /* 80043B6C 00040ACC 7C 08 03 A6 */ mtlr r0 /* 80043B70 00040AD0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80043B74 00040AD4 4E 80 00 20 */ blr +/* 80043B74 00040AD4 4E 80 00 20 */ blr .global __sinit_CPlayerGun_cpp __sinit_CPlayerGun_cpp: @@ -10694,4 +10694,4 @@ __sinit_CPlayerGun_cpp: /* 80043DD0 00040D30 80 01 00 54 */ lwz r0, 0x54(r1) /* 80043DD4 00040D34 7C 08 03 A6 */ mtlr r0 /* 80043DD8 00040D38 38 21 00 50 */ addi r1, r1, 0x50 -/* 80043DDC 00040D3C 4E 80 00 20 */ blr +/* 80043DDC 00040D3C 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/Player/CPlayerInputFilter.s b/asm/MetroidPrime/Player/CPlayerInputFilter.s index 6feb382c..94166f02 100644 --- a/asm/MetroidPrime/Player/CPlayerInputFilter.s +++ b/asm/MetroidPrime/Player/CPlayerInputFilter.s @@ -101,7 +101,7 @@ lbl_80296F5C: lbl_80296F60: /* 80296F60 00293EC0 38 00 00 00 */ li r0, 0 /* 80296F64 00293EC4 90 03 02 3C */ stw r0, 0x23c(r3) -/* 80296F68 00293EC8 4E 80 00 20 */ blr +/* 80296F68 00293EC8 4E 80 00 20 */ blr .global Passes__Q27CPlayer12CInputFilterFv Passes__Q27CPlayer12CInputFilterFv: @@ -404,7 +404,7 @@ lbl_802973B8: /* 802973DC 0029433C 83 A1 01 94 */ lwz r29, 0x194(r1) /* 802973E0 00294340 7C 08 03 A6 */ mtlr r0 /* 802973E4 00294344 38 21 01 D0 */ addi r1, r1, 0x1d0 -/* 802973E8 00294348 4E 80 00 20 */ blr +/* 802973E8 00294348 4E 80 00 20 */ blr .global "_getElementBoundsCheck>__FRCQ24rstl18reserved_vectori" "_getElementBoundsCheck>__FRCQ24rstl18reserved_vectori": @@ -413,17 +413,17 @@ lbl_802973B8: /* 802973F4 00294354 41 80 00 10 */ blt lbl_80297404 /* 802973F8 00294358 38 00 00 00 */ li r0, 0 /* 802973FC 0029435C 98 03 00 04 */ stb r0, 4(r3) -/* 80297400 00294360 4E 80 00 20 */ blr +/* 80297400 00294360 4E 80 00 20 */ blr lbl_80297404: /* 80297404 00294364 38 00 00 01 */ li r0, 1 /* 80297408 00294368 28 03 00 00 */ cmplwi r3, 0 /* 8029740C 0029436C 54 A5 10 3A */ slwi r5, r5, 2 /* 80297410 00294370 98 03 00 04 */ stb r0, 4(r3) /* 80297414 00294374 7C 84 2A 14 */ add r4, r4, r5 -/* 80297418 00294378 4D 82 00 20 */ beqlr +/* 80297418 00294378 4D 82 00 20 */ beqlr /* 8029741C 0029437C 80 04 00 04 */ lwz r0, 4(r4) /* 80297420 00294380 90 03 00 00 */ stw r0, 0(r3) -/* 80297424 00294384 4E 80 00 20 */ blr +/* 80297424 00294384 4E 80 00 20 */ blr .global "_getElementBoundsCheck>__FRCQ24rstl27reserved_vector<9CVector2f>i" "_getElementBoundsCheck>__FRCQ24rstl27reserved_vector<9CVector2f>i": @@ -432,19 +432,19 @@ lbl_80297404: /* 80297430 00294390 41 80 00 10 */ blt lbl_80297440 /* 80297434 00294394 38 00 00 00 */ li r0, 0 /* 80297438 00294398 98 03 00 08 */ stb r0, 8(r3) -/* 8029743C 0029439C 4E 80 00 20 */ blr +/* 8029743C 0029439C 4E 80 00 20 */ blr lbl_80297440: /* 80297440 002943A0 38 00 00 01 */ li r0, 1 /* 80297444 002943A4 28 03 00 00 */ cmplwi r3, 0 /* 80297448 002943A8 54 A5 18 38 */ slwi r5, r5, 3 /* 8029744C 002943AC 98 03 00 08 */ stb r0, 8(r3) /* 80297450 002943B0 7C 84 2A 14 */ add r4, r4, r5 -/* 80297454 002943B4 4D 82 00 20 */ beqlr +/* 80297454 002943B4 4D 82 00 20 */ beqlr /* 80297458 002943B8 C0 04 00 04 */ lfs f0, 4(r4) /* 8029745C 002943BC D0 03 00 00 */ stfs f0, 0(r3) /* 80297460 002943C0 C0 04 00 08 */ lfs f0, 8(r4) /* 80297464 002943C4 D0 03 00 04 */ stfs f0, 4(r3) -/* 80297468 002943C8 4E 80 00 20 */ blr +/* 80297468 002943C8 4E 80 00 20 */ blr .global "_getElementBoundsCheck>__FRCQ24rstl27reserved_vector<9CVector3f>i" "_getElementBoundsCheck>__FRCQ24rstl27reserved_vector<9CVector3f>i": @@ -453,21 +453,21 @@ lbl_80297440: /* 80297474 002943D4 41 80 00 10 */ blt lbl_80297484 /* 80297478 002943D8 38 00 00 00 */ li r0, 0 /* 8029747C 002943DC 98 03 00 0C */ stb r0, 0xc(r3) -/* 80297480 002943E0 4E 80 00 20 */ blr +/* 80297480 002943E0 4E 80 00 20 */ blr lbl_80297484: /* 80297484 002943E4 1C A5 00 0C */ mulli r5, r5, 0xc /* 80297488 002943E8 38 00 00 01 */ li r0, 1 /* 8029748C 002943EC 28 03 00 00 */ cmplwi r3, 0 /* 80297490 002943F0 98 03 00 0C */ stb r0, 0xc(r3) /* 80297494 002943F4 7C 84 2A 14 */ add r4, r4, r5 -/* 80297498 002943F8 4D 82 00 20 */ beqlr +/* 80297498 002943F8 4D 82 00 20 */ beqlr /* 8029749C 002943FC C0 04 00 04 */ lfs f0, 4(r4) /* 802974A0 00294400 D0 03 00 00 */ stfs f0, 0(r3) /* 802974A4 00294404 C0 04 00 08 */ lfs f0, 8(r4) /* 802974A8 00294408 D0 03 00 04 */ stfs f0, 4(r3) /* 802974AC 0029440C C0 04 00 0C */ lfs f0, 0xc(r4) /* 802974B0 00294410 D0 03 00 08 */ stfs f0, 8(r3) -/* 802974B4 00294414 4E 80 00 20 */ blr +/* 802974B4 00294414 4E 80 00 20 */ blr .global AddSample__Q27CPlayer12CInputFilterFiRC9CVector3fRC9CVector3fRC9CVector2f AddSample__Q27CPlayer12CInputFilterFiRC9CVector3fRC9CVector3fRC9CVector2f: @@ -819,7 +819,7 @@ lbl_802979B0: /* 802979BC 0029491C D0 09 00 04 */ stfs f0, 4(r9) /* 802979C0 00294920 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802979C4 00294924 38 21 00 10 */ addi r1, r1, 0x10 -/* 802979C8 00294928 4E 80 00 20 */ blr +/* 802979C8 00294928 4E 80 00 20 */ blr .global __ct__Q27CPlayer12CInputFilterFv __ct__Q27CPlayer12CInputFilterFv: diff --git a/asm/MetroidPrime/Player/CPlayerOrbit.s b/asm/MetroidPrime/Player/CPlayerOrbit.s index f0e37857..e9d0bf39 100644 --- a/asm/MetroidPrime/Player/CPlayerOrbit.s +++ b/asm/MetroidPrime/Player/CPlayerOrbit.s @@ -110,7 +110,7 @@ lbl_805A9018: .global lbl_805A901C lbl_805A901C: .skip 0x4 - + .section .text, "ax" .global UpdateGrappleArmTransform__7CPlayerFRC9CVector3fR13CStateManagerf @@ -318,7 +318,7 @@ lbl_80179678: /* 8017969C 001765FC 83 A1 01 64 */ lwz r29, 0x164(r1) /* 801796A0 00176600 7C 08 03 A6 */ mtlr r0 /* 801796A4 00176604 38 21 01 A0 */ addi r1, r1, 0x1a0 -/* 801796A8 00176608 4E 80 00 20 */ blr +/* 801796A8 00176608 4E 80 00 20 */ blr .global ApplyGrappleForces__7CPlayerFRC11CFinalInputR13CStateManagerf ApplyGrappleForces__7CPlayerFRC11CFinalInputR13CStateManagerf: @@ -1169,7 +1169,7 @@ lbl_8017A2AC: /* 8017A368 001772C8 80 01 03 D4 */ lwz r0, 0x3d4(r1) /* 8017A36C 001772CC 7C 08 03 A6 */ mtlr r0 /* 8017A370 001772D0 38 21 03 D0 */ addi r1, r1, 0x3d0 -/* 8017A374 001772D4 4E 80 00 20 */ blr +/* 8017A374 001772D4 4E 80 00 20 */ blr .global ValidateFPPosition__7CPlayerF9CVector3fR13CStateManager ValidateFPPosition__7CPlayerF9CVector3fR13CStateManager: @@ -1370,7 +1370,7 @@ lbl_8017A64C: /* 8017A658 001775B8 83 A1 08 F4 */ lwz r29, 0x8f4(r1) /* 8017A65C 001775BC 7C 08 03 A6 */ mtlr r0 /* 8017A660 001775C0 38 21 09 00 */ addi r1, r1, 0x900 -/* 8017A664 001775C4 4E 80 00 20 */ blr +/* 8017A664 001775C4 4E 80 00 20 */ blr .global UpdateGrappleState__7CPlayerFRC11CFinalInputR13CStateManager UpdateGrappleState__7CPlayerFRC11CFinalInputR13CStateManager: @@ -1888,7 +1888,7 @@ lbl_8017ADC4: /* 8017ADDC 00177D3C 83 81 01 00 */ lwz r28, 0x100(r1) /* 8017ADE0 00177D40 7C 08 03 A6 */ mtlr r0 /* 8017ADE4 00177D44 38 21 01 20 */ addi r1, r1, 0x120 -/* 8017ADE8 00177D48 4E 80 00 20 */ blr +/* 8017ADE8 00177D48 4E 80 00 20 */ blr .global ApplyGrappleJump__7CPlayerFR13CStateManager ApplyGrappleJump__7CPlayerFR13CStateManager: @@ -2036,7 +2036,7 @@ lbl_8017AFF4: /* 8017B010 00177F70 83 E1 00 7C */ lwz r31, 0x7c(r1) /* 8017B014 00177F74 7C 08 03 A6 */ mtlr r0 /* 8017B018 00177F78 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 8017B01C 00177F7C 4E 80 00 20 */ blr +/* 8017B01C 00177F7C 4E 80 00 20 */ blr .global BeginGrapple__7CPlayerFR9CVector3fR13CStateManager BeginGrapple__7CPlayerFR9CVector3fR13CStateManager: @@ -2081,7 +2081,7 @@ lbl_8017B0A8: /* 8017B0B4 00178014 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8017B0B8 00178018 7C 08 03 A6 */ mtlr r0 /* 8017B0BC 0017801C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8017B0C0 00178020 4E 80 00 20 */ blr +/* 8017B0C0 00178020 4E 80 00 20 */ blr .global BreakGrapple__7CPlayerF19EPlayerOrbitRequestR13CStateManager BreakGrapple__7CPlayerF19EPlayerOrbitRequestR13CStateManager: @@ -2140,7 +2140,7 @@ lbl_8017B180: /* 8017B18C 001780EC 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8017B190 001780F0 7C 08 03 A6 */ mtlr r0 /* 8017B194 001780F4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8017B198 001780F8 4E 80 00 20 */ blr +/* 8017B198 001780F8 4E 80 00 20 */ blr .global SetOrbitRequest__7CPlayerF19EPlayerOrbitRequestR13CStateManager SetOrbitRequest__7CPlayerF19EPlayerOrbitRequestR13CStateManager: @@ -2193,7 +2193,7 @@ lbl_8017B240: /* 8017B244 001781A4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8017B248 001781A8 7C 08 03 A6 */ mtlr r0 /* 8017B24C 001781AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8017B250 001781B0 4E 80 00 20 */ blr +/* 8017B250 001781B0 4E 80 00 20 */ blr .global SetOrbitRequestForTarget__7CPlayerF9TUniqueId19EPlayerOrbitRequestR13CStateManager SetOrbitRequestForTarget__7CPlayerF9TUniqueId19EPlayerOrbitRequestR13CStateManager: @@ -2219,7 +2219,7 @@ lbl_8017B298: /* 8017B298 001781F8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8017B29C 001781FC 7C 08 03 A6 */ mtlr r0 /* 8017B2A0 00178200 38 21 00 10 */ addi r1, r1, 0x10 -/* 8017B2A4 00178204 4E 80 00 20 */ blr +/* 8017B2A4 00178204 4E 80 00 20 */ blr .global InGrappleJumpCooldown__7CPlayerCFv InGrappleJumpCooldown__7CPlayerCFv: @@ -2235,10 +2235,10 @@ InGrappleJumpCooldown__7CPlayerCFv: /* 8017B2CC 0017822C 40 82 00 0C */ bne lbl_8017B2D8 lbl_8017B2D0: /* 8017B2D0 00178230 38 60 00 01 */ li r3, 1 -/* 8017B2D4 00178234 4E 80 00 20 */ blr +/* 8017B2D4 00178234 4E 80 00 20 */ blr lbl_8017B2D8: /* 8017B2D8 00178238 38 60 00 00 */ li r3, 0 -/* 8017B2DC 0017823C 4E 80 00 20 */ blr +/* 8017B2DC 0017823C 4E 80 00 20 */ blr .global PreventFallingCameraPitch__7CPlayerFv PreventFallingCameraPitch__7CPlayerFv: @@ -2248,7 +2248,7 @@ PreventFallingCameraPitch__7CPlayerFv: /* 8017B2EC 0017824C D0 23 02 94 */ stfs f1, 0x294(r3) /* 8017B2F0 00178250 D0 03 02 9C */ stfs f0, 0x29c(r3) /* 8017B2F4 00178254 98 03 02 A4 */ stb r0, 0x2a4(r3) -/* 8017B2F8 00178258 4E 80 00 20 */ blr +/* 8017B2F8 00178258 4E 80 00 20 */ blr .global OrbitCarcass__7CPlayerFR13CStateManager OrbitCarcass__7CPlayerFR13CStateManager: @@ -2267,7 +2267,7 @@ lbl_8017B328: /* 8017B328 00178288 80 01 00 14 */ lwz r0, 0x14(r1) /* 8017B32C 0017828C 7C 08 03 A6 */ mtlr r0 /* 8017B330 00178290 38 21 00 10 */ addi r1, r1, 0x10 -/* 8017B334 00178294 4E 80 00 20 */ blr +/* 8017B334 00178294 4E 80 00 20 */ blr .global OrbitPoint__7CPlayerFQ27CPlayer16EPlayerOrbitTypeR13CStateManager OrbitPoint__7CPlayerFQ27CPlayer16EPlayerOrbitTypeR13CStateManager: @@ -2294,7 +2294,7 @@ OrbitPoint__7CPlayerFQ27CPlayer16EPlayerOrbitTypeR13CStateManager: /* 8017B388 001782E8 83 C1 00 08 */ lwz r30, 8(r1) /* 8017B38C 001782EC 7C 08 03 A6 */ mtlr r0 /* 8017B390 001782F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8017B394 001782F4 4E 80 00 20 */ blr +/* 8017B394 001782F4 4E 80 00 20 */ blr .global CalculateOrbitZBasedDistance__7CPlayerF16EPlayerOrbitType CalculateOrbitZBasedDistance__7CPlayerF16EPlayerOrbitType: @@ -2332,7 +2332,7 @@ CalculateOrbitZBasedDistance__7CPlayerF16EPlayerOrbitType: /* 8017B414 00178374 CB E1 00 20 */ lfd f31, 0x20(r1) /* 8017B418 00178378 7C 08 03 A6 */ mtlr r0 /* 8017B41C 0017837C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8017B420 00178380 4E 80 00 20 */ blr +/* 8017B420 00178380 4E 80 00 20 */ blr .global GetHUDOrbitTargetPosition__7CPlayerCFv GetHUDOrbitTargetPosition__7CPlayerCFv: @@ -2363,7 +2363,7 @@ GetHUDOrbitTargetPosition__7CPlayerCFv: /* 8017B484 001783E4 83 C1 00 38 */ lwz r30, 0x38(r1) /* 8017B488 001783E8 7C 08 03 A6 */ mtlr r0 /* 8017B48C 001783EC 38 21 00 40 */ addi r1, r1, 0x40 -/* 8017B490 001783F0 4E 80 00 20 */ blr +/* 8017B490 001783F0 4E 80 00 20 */ blr .global SetOrbitState__7CPlayerFQ27CPlayer17EPlayerOrbitStateR13CStateManager SetOrbitState__7CPlayerFQ27CPlayer17EPlayerOrbitStateR13CStateManager: @@ -2460,7 +2460,7 @@ lbl_8017B5D4: /* 8017B5DC 0017853C 83 C1 00 38 */ lwz r30, 0x38(r1) /* 8017B5E0 00178540 7C 08 03 A6 */ mtlr r0 /* 8017B5E4 00178544 38 21 00 40 */ addi r1, r1, 0x40 -/* 8017B5E8 00178548 4E 80 00 20 */ blr +/* 8017B5E8 00178548 4E 80 00 20 */ blr .global SetOrbitTargetId__7CPlayerF9TUniqueIdR13CStateManager SetOrbitTargetId__7CPlayerF9TUniqueIdR13CStateManager: @@ -2541,7 +2541,7 @@ lbl_8017B700: /* 8017B704 00178664 80 01 00 54 */ lwz r0, 0x54(r1) /* 8017B708 00178668 7C 08 03 A6 */ mtlr r0 /* 8017B70C 0017866C 38 21 00 50 */ addi r1, r1, 0x50 -/* 8017B710 00178670 4E 80 00 20 */ blr +/* 8017B710 00178670 4E 80 00 20 */ blr .global UpdateOrbitPosition__7CPlayerFfR13CStateManager UpdateOrbitPosition__7CPlayerFfR13CStateManager: @@ -2586,7 +2586,7 @@ lbl_8017B75C: /* 8017B7A4 00178704 38 61 00 18 */ addi r3, r1, 0x18 /* 8017B7A8 00178708 81 8C 00 48 */ lwz r12, 0x48(r12) /* 8017B7AC 0017870C 7D 89 03 A6 */ mtctr r12 -/* 8017B7B0 00178710 4E 80 04 21 */ bctrl +/* 8017B7B0 00178710 4E 80 04 21 */ bctrl /* 8017B7B4 00178714 C0 01 00 18 */ lfs f0, 0x18(r1) /* 8017B7B8 00178718 D0 1E 03 14 */ stfs f0, 0x314(r30) /* 8017B7BC 0017871C C0 01 00 1C */ lfs f0, 0x1c(r1) @@ -2599,7 +2599,7 @@ lbl_8017B7CC: /* 8017B7D4 00178734 83 C1 00 28 */ lwz r30, 0x28(r1) /* 8017B7D8 00178738 7C 08 03 A6 */ mtlr r0 /* 8017B7DC 0017873C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8017B7E0 00178740 4E 80 00 20 */ blr +/* 8017B7E0 00178740 4E 80 00 20 */ blr .global UpdateOrbitZPosition__7CPlayerFv UpdateOrbitZPosition__7CPlayerFv: @@ -2640,7 +2640,7 @@ lbl_8017B858: /* 8017B864 001787C4 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8017B868 001787C8 7C 08 03 A6 */ mtlr r0 /* 8017B86C 001787CC 38 21 00 30 */ addi r1, r1, 0x30 -/* 8017B870 001787D0 4E 80 00 20 */ blr +/* 8017B870 001787D0 4E 80 00 20 */ blr .global UpdateOrbitFixedPosition__7CPlayerFv UpdateOrbitFixedPosition__7CPlayerFv: @@ -2684,7 +2684,7 @@ UpdateOrbitFixedPosition__7CPlayerFv: /* 8017B908 00178868 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8017B90C 0017886C 7C 08 03 A6 */ mtlr r0 /* 8017B910 00178870 38 21 00 60 */ addi r1, r1, 0x60 -/* 8017B914 00178874 4E 80 00 20 */ blr +/* 8017B914 00178874 4E 80 00 20 */ blr .global SetOrbitPosition__7CPlayerFfR13CStateManager SetOrbitPosition__7CPlayerFfR13CStateManager: @@ -2787,7 +2787,7 @@ lbl_8017B9E8: /* 8017BA90 001789F0 83 E1 00 7C */ lwz r31, 0x7c(r1) /* 8017BA94 001789F4 7C 08 03 A6 */ mtlr r0 /* 8017BA98 001789F8 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 8017BA9C 001789FC 4E 80 00 20 */ blr +/* 8017BA9C 001789FC 4E 80 00 20 */ blr .global UpdateAimTarget__7CPlayerFR13CStateManager UpdateAimTarget__7CPlayerFR13CStateManager: @@ -2975,21 +2975,21 @@ lbl_8017BD34: /* 8017BD44 00178CA4 83 81 00 70 */ lwz r28, 0x70(r1) /* 8017BD48 00178CA8 7C 08 03 A6 */ mtlr r0 /* 8017BD4C 00178CAC 38 21 00 80 */ addi r1, r1, 0x80 -/* 8017BD50 00178CB0 4E 80 00 20 */ blr +/* 8017BD50 00178CB0 4E 80 00 20 */ blr .global UpdateAimTargetTimer__7CPlayerFf UpdateAimTargetTimer__7CPlayerFf: /* 8017BD54 00178CB4 A0 83 03 F4 */ lhz r4, 0x3f4(r3) /* 8017BD58 00178CB8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8017BD5C 00178CBC 7C 04 00 40 */ cmplw r4, r0 -/* 8017BD60 00178CC0 4D 82 00 20 */ beqlr +/* 8017BD60 00178CC0 4D 82 00 20 */ beqlr /* 8017BD64 00178CC4 C0 43 04 8C */ lfs f2, 0x48c(r3) /* 8017BD68 00178CC8 C0 02 A2 30 */ lfs f0, lbl_805ABF50@sda21(r2) /* 8017BD6C 00178CCC FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8017BD70 00178CD0 4C 81 00 20 */ blelr +/* 8017BD70 00178CD0 4C 81 00 20 */ blelr /* 8017BD74 00178CD4 EC 02 08 28 */ fsubs f0, f2, f1 /* 8017BD78 00178CD8 D0 03 04 8C */ stfs f0, 0x48c(r3) -/* 8017BD7C 00178CDC 4E 80 00 20 */ blr +/* 8017BD7C 00178CDC 4E 80 00 20 */ blr .global ValidateAimTargetId__7CPlayerF9TUniqueIdR13CStateManager ValidateAimTargetId__7CPlayerF9TUniqueIdR13CStateManager: @@ -3121,7 +3121,7 @@ lbl_8017BEF8: /* 8017BF48 00178EA8 C0 22 A2 30 */ lfs f1, lbl_805ABF50@sda21(r2) /* 8017BF4C 00178EAC 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 8017BF50 00178EB0 7D 89 03 A6 */ mtctr r12 -/* 8017BF54 00178EB4 4E 80 04 21 */ bctrl +/* 8017BF54 00178EB4 4E 80 04 21 */ bctrl /* 8017BF58 00178EB8 C0 41 00 44 */ lfs f2, 0x44(r1) /* 8017BF5C 00178EBC 7F 84 E3 78 */ mr r4, r28 /* 8017BF60 00178EC0 C0 21 00 48 */ lfs f1, 0x48(r1) @@ -3328,7 +3328,7 @@ lbl_8017C238: /* 8017C250 001791B0 83 81 08 E0 */ lwz r28, 0x8e0(r1) /* 8017C254 001791B4 7C 08 03 A6 */ mtlr r0 /* 8017C258 001791B8 38 21 09 00 */ addi r1, r1, 0x900 -/* 8017C25C 001791BC 4E 80 00 20 */ blr +/* 8017C25C 001791BC 4E 80 00 20 */ blr .global ValidateObjectForMode__7CPlayerCF9TUniqueIdR13CStateManager ValidateObjectForMode__7CPlayerCF9TUniqueIdR13CStateManager: @@ -3385,7 +3385,7 @@ lbl_8017C304: /* 8017C31C 0017927C 81 9F 00 00 */ lwz r12, 0(r31) /* 8017C320 00179280 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8017C324 00179284 7D 89 03 A6 */ mtctr r12 -/* 8017C328 00179288 4E 80 04 21 */ bctrl +/* 8017C328 00179288 4E 80 04 21 */ bctrl /* 8017C32C 0017928C 28 03 00 00 */ cmplwi r3, 0 /* 8017C330 00179290 41 82 00 34 */ beq lbl_8017C364 /* 8017C334 00179294 7F E3 FB 78 */ mr r3, r31 @@ -3393,7 +3393,7 @@ lbl_8017C304: /* 8017C33C 0017929C 81 9F 00 00 */ lwz r12, 0(r31) /* 8017C340 001792A0 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8017C344 001792A4 7D 89 03 A6 */ mtctr r12 -/* 8017C348 001792A8 4E 80 04 21 */ bctrl +/* 8017C348 001792A8 4E 80 04 21 */ bctrl /* 8017C34C 001792AC C0 23 00 00 */ lfs f1, 0(r3) /* 8017C350 001792B0 C0 02 A2 30 */ lfs f0, lbl_805ABF50@sda21(r2) /* 8017C354 001792B4 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -3472,7 +3472,7 @@ lbl_8017C44C: /* 8017C464 001793C4 81 9F 00 00 */ lwz r12, 0(r31) /* 8017C468 001793C8 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8017C46C 001793CC 7D 89 03 A6 */ mtctr r12 -/* 8017C470 001793D0 4E 80 04 21 */ bctrl +/* 8017C470 001793D0 4E 80 04 21 */ bctrl /* 8017C474 001793D4 28 03 00 00 */ cmplwi r3, 0 /* 8017C478 001793D8 40 82 00 98 */ bne lbl_8017C510 /* 8017C47C 001793DC A0 1D 00 00 */ lhz r0, 0(r29) @@ -3528,7 +3528,7 @@ lbl_8017C51C: /* 8017C534 00179494 83 81 00 50 */ lwz r28, 0x50(r1) /* 8017C538 00179498 7C 08 03 A6 */ mtlr r0 /* 8017C53C 0017949C 38 21 00 70 */ addi r1, r1, 0x70 -/* 8017C540 001794A0 4E 80 00 20 */ blr +/* 8017C540 001794A0 4E 80 00 20 */ blr .global FindAimTargetId__7CPlayerFR13CStateManager FindAimTargetId__7CPlayerFR13CStateManager: @@ -3628,7 +3628,7 @@ lbl_8017C690: /* 8017C6A4 00179604 83 A1 08 74 */ lwz r29, 0x874(r1) /* 8017C6A8 00179608 7C 08 03 A6 */ mtlr r0 /* 8017C6AC 0017960C 38 21 08 80 */ addi r1, r1, 0x880 -/* 8017C6B0 00179610 4E 80 00 20 */ blr +/* 8017C6B0 00179610 4E 80 00 20 */ blr .global "CheckEnemiesAgainstOrbitZone__7CPlayerCFRCQ24rstl32reserved_vector<9TUniqueId,1024>Q27CPlayer15EPlayerZoneInfoQ27CPlayer15EPlayerZoneTypeR13CStateManager" "CheckEnemiesAgainstOrbitZone__7CPlayerCFRCQ24rstl32reserved_vector<9TUniqueId,1024>Q27CPlayer15EPlayerZoneInfoQ27CPlayer15EPlayerZoneTypeR13CStateManager": @@ -3759,7 +3759,7 @@ lbl_8017C844: /* 8017C8A0 00179800 C0 22 A2 30 */ lfs f1, lbl_805ABF50@sda21(r2) /* 8017C8A4 00179804 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 8017C8A8 00179808 7D 89 03 A6 */ mtctr r12 -/* 8017C8AC 0017980C 4E 80 04 21 */ bctrl +/* 8017C8AC 0017980C 4E 80 04 21 */ bctrl /* 8017C8B0 00179810 C0 41 00 28 */ lfs f2, 0x28(r1) /* 8017C8B4 00179814 7E C4 B3 78 */ mr r4, r22 /* 8017C8B8 00179818 C0 21 00 2C */ lfs f1, 0x2c(r1) @@ -4012,7 +4012,7 @@ lbl_8017CBF8: /* 8017CC60 00179BC0 80 01 11 B4 */ lwz r0, 0x11b4(r1) /* 8017CC64 00179BC4 7C 08 03 A6 */ mtlr r0 /* 8017CC68 00179BC8 38 21 11 B0 */ addi r1, r1, 0x11b0 -/* 8017CC6C 00179BCC 4E 80 00 20 */ blr +/* 8017CC6C 00179BCC 4E 80 00 20 */ blr .global FindOrbitTargetId__7CPlayerFR13CStateManager FindOrbitTargetId__7CPlayerFR13CStateManager: @@ -4029,7 +4029,7 @@ FindOrbitTargetId__7CPlayerFR13CStateManager: /* 8017CC98 00179BF8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8017CC9C 00179BFC 7C 08 03 A6 */ mtlr r0 /* 8017CCA0 00179C00 38 21 00 10 */ addi r1, r1, 0x10 -/* 8017CCA4 00179C04 4E 80 00 20 */ blr +/* 8017CCA4 00179C04 4E 80 00 20 */ blr .global UpdateOrbitableObjects__7CPlayerFR13CStateManager UpdateOrbitableObjects__7CPlayerFR13CStateManager: @@ -4240,7 +4240,7 @@ lbl_8017CF98: /* 8017CFA4 00179F04 83 A1 08 C4 */ lwz r29, 0x8c4(r1) /* 8017CFA8 00179F08 7C 08 03 A6 */ mtlr r0 /* 8017CFAC 00179F0C 38 21 08 D0 */ addi r1, r1, 0x8d0 -/* 8017CFB0 00179F10 4E 80 00 20 */ blr +/* 8017CFB0 00179F10 4E 80 00 20 */ blr .global "FindBestOrbitableObject__7CPlayerCFRCQ24rstl45vector<9TUniqueId,Q24rstl17rmemory_allocator>Q27CPlayer15EPlayerZoneInfoR13CStateManager" "FindBestOrbitableObject__7CPlayerCFRCQ24rstl45vector<9TUniqueId,Q24rstl17rmemory_allocator>Q27CPlayer15EPlayerZoneInfoR13CStateManager": @@ -4375,7 +4375,7 @@ lbl_8017D178: /* 8017D1B0 0017A110 38 61 00 70 */ addi r3, r1, 0x70 /* 8017D1B4 0017A114 81 8C 00 48 */ lwz r12, 0x48(r12) /* 8017D1B8 0017A118 7D 89 03 A6 */ mtctr r12 -/* 8017D1BC 0017A11C 4E 80 04 21 */ bctrl +/* 8017D1BC 0017A11C 4E 80 04 21 */ bctrl /* 8017D1C0 0017A120 C0 A1 00 70 */ lfs f5, 0x70(r1) /* 8017D1C4 0017A124 38 61 00 94 */ addi r3, r1, 0x94 /* 8017D1C8 0017A128 C0 81 00 74 */ lfs f4, 0x74(r1) @@ -4925,7 +4925,7 @@ lbl_8017D8FC: /* 8017D994 0017A8F4 80 01 1A 74 */ lwz r0, 0x1a74(r1) /* 8017D998 0017A8F8 7C 08 03 A6 */ mtlr r0 /* 8017D99C 0017A8FC 38 21 1A 70 */ addi r1, r1, 0x1a70 -/* 8017D9A0 0017A900 4E 80 00 20 */ blr +/* 8017D9A0 0017A900 4E 80 00 20 */ blr .global "FindOrbitableObjects__7CPlayerCFRCQ24rstl32reserved_vector<9TUniqueId,1024>RQ24rstl45vector<9TUniqueId,Q24rstl17rmemory_allocator>Q27CPlayer15EPlayerZoneInfoQ27CPlayer15EPlayerZoneTypeR13CStateManagerb" "FindOrbitableObjects__7CPlayerCFRCQ24rstl32reserved_vector<9TUniqueId,1024>RQ24rstl45vector<9TUniqueId,Q24rstl17rmemory_allocator>Q27CPlayer15EPlayerZoneInfoQ27CPlayer15EPlayerZoneTypeR13CStateManagerb": @@ -4998,7 +4998,7 @@ lbl_8017DA40: /* 8017DAA8 0017AA08 38 61 00 28 */ addi r3, r1, 0x28 /* 8017DAAC 0017AA0C 81 8C 00 48 */ lwz r12, 0x48(r12) /* 8017DAB0 0017AA10 7D 89 03 A6 */ mtctr r12 -/* 8017DAB4 0017AA14 4E 80 04 21 */ bctrl +/* 8017DAB4 0017AA14 4E 80 04 21 */ bctrl /* 8017DAB8 0017AA18 C0 41 00 28 */ lfs f2, 0x28(r1) /* 8017DABC 0017AA1C 7F C4 F3 78 */ mr r4, r30 /* 8017DAC0 0017AA20 C0 21 00 2C */ lfs f1, 0x2c(r1) @@ -5139,7 +5139,7 @@ lbl_8017DC80: /* 8017DCBC 0017AC1C 80 01 01 04 */ lwz r0, 0x104(r1) /* 8017DCC0 0017AC20 7C 08 03 A6 */ mtlr r0 /* 8017DCC4 0017AC24 38 21 01 00 */ addi r1, r1, 0x100 -/* 8017DCC8 0017AC28 4E 80 00 20 */ blr +/* 8017DCC8 0017AC28 4E 80 00 20 */ blr .global WithinOrbitScreenBox__7CPlayerCFRC9CVector3fQ27CPlayer15EPlayerZoneInfoQ27CPlayer15EPlayerZoneType WithinOrbitScreenBox__7CPlayerCFRC9CVector3fQ27CPlayer15EPlayerZoneInfoQ27CPlayer15EPlayerZoneType: @@ -5220,7 +5220,7 @@ lbl_8017DDDC: /* 8017DDDC 0017AD3C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8017DDE0 0017AD40 7C 08 03 A6 */ mtlr r0 /* 8017DDE4 0017AD44 38 21 00 20 */ addi r1, r1, 0x20 -/* 8017DDE8 0017AD48 4E 80 00 20 */ blr +/* 8017DDE8 0017AD48 4E 80 00 20 */ blr .global WithinOrbitScreenEllipse__7CPlayerCFRC9CVector3fQ27CPlayer15EPlayerZoneInfo WithinOrbitScreenEllipse__7CPlayerCFRC9CVector3fQ27CPlayer15EPlayerZoneInfo: @@ -5283,7 +5283,7 @@ lbl_8017DE0C: /* 8017DEC8 0017AE28 54 03 1F FE */ rlwinm r3, r0, 3, 0x1f, 0x1f lbl_8017DECC: /* 8017DECC 0017AE2C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8017DED0 0017AE30 4E 80 00 20 */ blr +/* 8017DED0 0017AE30 4E 80 00 20 */ blr .global CheckOrbitDisableSourceList__7CPlayerFRC13CStateManager CheckOrbitDisableSourceList__7CPlayerFRC13CStateManager: @@ -5350,7 +5350,7 @@ lbl_8017DF7C: /* 8017DFAC 0017AF0C 83 81 00 10 */ lwz r28, 0x10(r1) /* 8017DFB0 0017AF10 7C 08 03 A6 */ mtlr r0 /* 8017DFB4 0017AF14 38 21 00 20 */ addi r1, r1, 0x20 -/* 8017DFB8 0017AF18 4E 80 00 20 */ blr +/* 8017DFB8 0017AF18 4E 80 00 20 */ blr .global CheckOrbitDisableSourceList__7CPlayerCFv CheckOrbitDisableSourceList__7CPlayerCFv: @@ -5358,7 +5358,7 @@ CheckOrbitDisableSourceList__7CPlayerCFv: /* 8017DFC0 0017AF20 7C 03 00 D0 */ neg r0, r3 /* 8017DFC4 0017AF24 7C 00 1B 78 */ or r0, r0, r3 /* 8017DFC8 0017AF28 54 03 0F FE */ srwi r3, r0, 0x1f -/* 8017DFCC 0017AF2C 4E 80 00 20 */ blr +/* 8017DFCC 0017AF2C 4E 80 00 20 */ blr .global RemoveOrbitDisableSource__7CPlayerF9TUniqueId RemoveOrbitDisableSource__7CPlayerF9TUniqueId: @@ -5374,9 +5374,9 @@ lbl_8017DFE8: /* 8017DFF0 0017AF50 7C 05 00 40 */ cmplw r5, r0 /* 8017DFF4 0017AF54 40 82 00 4C */ bne lbl_8017E040 /* 8017DFF8 0017AF58 7C 08 38 40 */ cmplw r8, r7 -/* 8017DFFC 0017AF5C 4D 80 00 20 */ bltlr +/* 8017DFFC 0017AF5C 4D 80 00 20 */ bltlr /* 8017E000 0017AF60 7C 08 30 40 */ cmplw r8, r6 -/* 8017E004 0017AF64 4C 80 00 20 */ bgelr +/* 8017E004 0017AF64 4C 80 00 20 */ bgelr /* 8017E008 0017AF68 7D 06 43 78 */ mr r6, r8 /* 8017E00C 0017AF6C 48 00 00 10 */ b lbl_8017E01C lbl_8017E010: @@ -5392,7 +5392,7 @@ lbl_8017E01C: /* 8017E030 0017AF90 41 80 FF E0 */ blt lbl_8017E010 /* 8017E034 0017AF94 38 05 FF FF */ addi r0, r5, -1 /* 8017E038 0017AF98 90 03 09 E4 */ stw r0, 0x9e4(r3) -/* 8017E03C 0017AF9C 4E 80 00 20 */ blr +/* 8017E03C 0017AF9C 4E 80 00 20 */ blr lbl_8017E040: /* 8017E040 0017AFA0 39 08 00 02 */ addi r8, r8, 2 lbl_8017E044: @@ -5401,7 +5401,7 @@ lbl_8017E044: .global sub_8017e04c sub_8017e04c: -/* 8017E04C 0017AFAC 4E 80 00 20 */ blr +/* 8017E04C 0017AFAC 4E 80 00 20 */ blr .global AddOrbitDisableSource__7CPlayerFR13CStateManager9TUniqueId AddOrbitDisableSource__7CPlayerFR13CStateManager9TUniqueId: @@ -5466,17 +5466,17 @@ lbl_8017E120: /* 8017E128 0017B088 83 C1 00 28 */ lwz r30, 0x28(r1) /* 8017E12C 0017B08C 7C 08 03 A6 */ mtlr r0 /* 8017E130 0017B090 38 21 00 30 */ addi r1, r1, 0x30 -/* 8017E134 0017B094 4E 80 00 20 */ blr +/* 8017E134 0017B094 4E 80 00 20 */ blr .global UpdateOrbitPreventionTimer__7CPlayerFf UpdateOrbitPreventionTimer__7CPlayerFf: /* 8017E138 0017B098 C0 43 03 78 */ lfs f2, 0x378(r3) /* 8017E13C 0017B09C C0 02 A2 30 */ lfs f0, lbl_805ABF50@sda21(r2) /* 8017E140 0017B0A0 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8017E144 0017B0A4 4C 81 00 20 */ blelr +/* 8017E144 0017B0A4 4C 81 00 20 */ blelr /* 8017E148 0017B0A8 EC 02 08 28 */ fsubs f0, f2, f1 /* 8017E14C 0017B0AC D0 03 03 78 */ stfs f0, 0x378(r3) -/* 8017E150 0017B0B0 4E 80 00 20 */ blr +/* 8017E150 0017B0B0 4E 80 00 20 */ blr .global UpdateOrbitModeTimer__7CPlayerFf UpdateOrbitModeTimer__7CPlayerFf: @@ -5489,11 +5489,11 @@ UpdateOrbitModeTimer__7CPlayerFf: /* 8017E16C 0017B0CC 40 81 00 10 */ ble lbl_8017E17C /* 8017E170 0017B0D0 EC 02 08 28 */ fsubs f0, f2, f1 /* 8017E174 0017B0D4 D0 03 03 2C */ stfs f0, 0x32c(r3) -/* 8017E178 0017B0D8 4E 80 00 20 */ blr +/* 8017E178 0017B0D8 4E 80 00 20 */ blr lbl_8017E17C: /* 8017E17C 0017B0DC C0 02 A2 30 */ lfs f0, lbl_805ABF50@sda21(r2) /* 8017E180 0017B0E0 D0 03 03 2C */ stfs f0, 0x32c(r3) -/* 8017E184 0017B0E4 4E 80 00 20 */ blr +/* 8017E184 0017B0E4 4E 80 00 20 */ blr .global UpdateOrbitZone__7CPlayerFR13CStateManager UpdateOrbitZone__7CPlayerFR13CStateManager: @@ -5507,7 +5507,7 @@ UpdateOrbitZone__7CPlayerFR13CStateManager: /* 8017E1A4 0017B104 90 83 03 34 */ stw r4, 0x334(r3) /* 8017E1A8 0017B108 90 83 03 38 */ stw r4, 0x338(r3) /* 8017E1AC 0017B10C 90 03 03 30 */ stw r0, 0x330(r3) -/* 8017E1B0 0017B110 4E 80 00 20 */ blr +/* 8017E1B0 0017B110 4E 80 00 20 */ blr lbl_8017E1B4: /* 8017E1B4 0017B114 38 00 00 00 */ li r0, 0 /* 8017E1B8 0017B118 38 80 00 02 */ li r4, 2 @@ -5515,7 +5515,7 @@ lbl_8017E1B4: /* 8017E1C0 0017B120 38 00 00 01 */ li r0, 1 /* 8017E1C4 0017B124 90 83 03 38 */ stw r4, 0x338(r3) /* 8017E1C8 0017B128 90 03 03 30 */ stw r0, 0x330(r3) -/* 8017E1CC 0017B12C 4E 80 00 20 */ blr +/* 8017E1CC 0017B12C 4E 80 00 20 */ blr .global UpdateOrbitInput__7CPlayerFRC11CFinalInputR13CStateManager UpdateOrbitInput__7CPlayerFRC11CFinalInputR13CStateManager: @@ -6006,7 +6006,7 @@ lbl_8017E8C8: /* 8017E8D4 0017B834 83 A1 00 84 */ lwz r29, 0x84(r1) /* 8017E8D8 0017B838 7C 08 03 A6 */ mtlr r0 /* 8017E8DC 0017B83C 38 21 00 90 */ addi r1, r1, 0x90 -/* 8017E8E0 0017B840 4E 80 00 20 */ blr +/* 8017E8E0 0017B840 4E 80 00 20 */ blr .global ActivateOrbitSource__7CPlayerFR13CStateManager ActivateOrbitSource__7CPlayerFR13CStateManager: @@ -6044,7 +6044,7 @@ lbl_8017E948: /* 8017E948 0017B8A8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8017E94C 0017B8AC 7C 08 03 A6 */ mtlr r0 /* 8017E950 0017B8B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8017E954 0017B8B4 4E 80 00 20 */ blr +/* 8017E954 0017B8B4 4E 80 00 20 */ blr .global UpdateOrbitSelection__7CPlayerFRC11CFinalInputR13CStateManager UpdateOrbitSelection__7CPlayerFRC11CFinalInputR13CStateManager: @@ -6144,7 +6144,7 @@ lbl_8017EAAC: /* 8017EABC 0017BA1C 83 81 00 40 */ lwz r28, 0x40(r1) /* 8017EAC0 0017BA20 7C 08 03 A6 */ mtlr r0 /* 8017EAC4 0017BA24 38 21 00 50 */ addi r1, r1, 0x50 -/* 8017EAC8 0017BA28 4E 80 00 20 */ blr +/* 8017EAC8 0017BA28 4E 80 00 20 */ blr .global UpdateOrbitOrientation__7CPlayerFR13CStateManager UpdateOrbitOrientation__7CPlayerFR13CStateManager: @@ -6239,7 +6239,7 @@ lbl_8017EC14: /* 8017EC18 0017BB78 83 E1 00 7C */ lwz r31, 0x7c(r1) /* 8017EC1C 0017BB7C 7C 08 03 A6 */ mtlr r0 /* 8017EC20 0017BB80 38 21 00 80 */ addi r1, r1, 0x80 -/* 8017EC24 0017BB84 4E 80 00 20 */ blr +/* 8017EC24 0017BB84 4E 80 00 20 */ blr .global UpdateOrbitTarget__7CPlayerFR13CStateManager UpdateOrbitTarget__7CPlayerFR13CStateManager: @@ -6522,7 +6522,7 @@ lbl_8017F014: /* 8017F024 0017BF84 83 C1 00 58 */ lwz r30, 0x58(r1) /* 8017F028 0017BF88 7C 08 03 A6 */ mtlr r0 /* 8017F02C 0017BF8C 38 21 00 70 */ addi r1, r1, 0x70 -/* 8017F030 0017BF90 4E 80 00 20 */ blr +/* 8017F030 0017BF90 4E 80 00 20 */ blr .global GetOrbitMaxLockDistance__7CPlayerCFRC13CStateManager GetOrbitMaxLockDistance__7CPlayerCFRC13CStateManager: @@ -6532,9 +6532,9 @@ GetOrbitMaxLockDistance__7CPlayerCFRC13CStateManager: /* 8017F040 0017BFA0 C0 24 01 A0 */ lfs f1, 0x1a0(r4) /* 8017F044 0017BFA4 80 03 00 14 */ lwz r0, 0x14(r3) /* 8017F048 0017BFA8 2C 00 00 02 */ cmpwi r0, 2 -/* 8017F04C 0017BFAC 4C 82 00 20 */ bnelr +/* 8017F04C 0017BFAC 4C 82 00 20 */ bnelr /* 8017F050 0017BFB0 C0 24 02 24 */ lfs f1, 0x224(r4) -/* 8017F054 0017BFB4 4E 80 00 20 */ blr +/* 8017F054 0017BFB4 4E 80 00 20 */ blr .global GetOrbitMaxTargetDistance__7CPlayerCFRC13CStateManager GetOrbitMaxTargetDistance__7CPlayerCFRC13CStateManager: @@ -6544,9 +6544,9 @@ GetOrbitMaxTargetDistance__7CPlayerCFRC13CStateManager: /* 8017F064 0017BFC4 C0 24 01 9C */ lfs f1, 0x19c(r4) /* 8017F068 0017BFC8 80 03 00 14 */ lwz r0, 0x14(r3) /* 8017F06C 0017BFCC 2C 00 00 02 */ cmpwi r0, 2 -/* 8017F070 0017BFD0 4C 82 00 20 */ bnelr +/* 8017F070 0017BFD0 4C 82 00 20 */ bnelr /* 8017F074 0017BFD4 C0 24 02 20 */ lfs f1, 0x220(r4) -/* 8017F078 0017BFD8 4E 80 00 20 */ blr +/* 8017F078 0017BFD8 4E 80 00 20 */ blr .global ValidateOrbitTargetId__7CPlayerCF9TUniqueIdR13CStateManager ValidateOrbitTargetId__7CPlayerCF9TUniqueIdR13CStateManager: @@ -6604,7 +6604,7 @@ lbl_8017F12C: /* 8017F138 0017C098 38 61 00 20 */ addi r3, r1, 0x20 /* 8017F13C 0017C09C 81 8C 00 48 */ lwz r12, 0x48(r12) /* 8017F140 0017C0A0 7D 89 03 A6 */ mtctr r12 -/* 8017F144 0017C0A4 4E 80 04 21 */ bctrl +/* 8017F144 0017C0A4 4E 80 04 21 */ bctrl /* 8017F148 0017C0A8 C3 E1 00 20 */ lfs f31, 0x20(r1) /* 8017F14C 0017C0AC 7F C4 F3 78 */ mr r4, r30 /* 8017F150 0017C0B0 C3 C1 00 24 */ lfs f30, 0x24(r1) @@ -6734,7 +6734,7 @@ lbl_8017F2F0: /* 8017F314 0017C274 83 A1 00 54 */ lwz r29, 0x54(r1) /* 8017F318 0017C278 7C 08 03 A6 */ mtlr r0 /* 8017F31C 0017C27C 38 21 00 90 */ addi r1, r1, 0x90 -/* 8017F320 0017C280 4E 80 00 20 */ blr +/* 8017F320 0017C280 4E 80 00 20 */ blr .global ValidateCurrentOrbitTargetId__7CPlayerFR13CStateManager ValidateCurrentOrbitTargetId__7CPlayerFR13CStateManager: @@ -6874,7 +6874,7 @@ lbl_8017F4D4: /* 8017F514 0017C474 81 9E 00 00 */ lwz r12, 0(r30) /* 8017F518 0017C478 81 8C 00 48 */ lwz r12, 0x48(r12) /* 8017F51C 0017C47C 7D 89 03 A6 */ mtctr r12 -/* 8017F520 0017C480 4E 80 04 21 */ bctrl +/* 8017F520 0017C480 4E 80 04 21 */ bctrl /* 8017F524 0017C484 C0 21 00 8C */ lfs f1, 0x8c(r1) /* 8017F528 0017C488 38 61 00 AC */ addi r3, r1, 0xac /* 8017F52C 0017C48C C0 01 00 BC */ lfs f0, 0xbc(r1) @@ -7071,7 +7071,7 @@ lbl_8017F7CC: /* 8017F7D8 0017C738 38 61 00 64 */ addi r3, r1, 0x64 /* 8017F7DC 0017C73C 81 8C 00 48 */ lwz r12, 0x48(r12) /* 8017F7E0 0017C740 7D 89 03 A6 */ mtctr r12 -/* 8017F7E4 0017C744 4E 80 04 21 */ bctrl +/* 8017F7E4 0017C744 4E 80 04 21 */ bctrl /* 8017F7E8 0017C748 C3 A1 00 64 */ lfs f29, 0x64(r1) /* 8017F7EC 0017C74C 7F 44 D3 78 */ mr r4, r26 /* 8017F7F0 0017C750 C3 C1 00 68 */ lfs f30, 0x68(r1) @@ -7150,7 +7150,7 @@ lbl_8017F8E4: /* 8017F900 0017C860 80 01 09 54 */ lwz r0, 0x954(r1) /* 8017F904 0017C864 7C 08 03 A6 */ mtlr r0 /* 8017F908 0017C868 38 21 09 50 */ addi r1, r1, 0x950 -/* 8017F90C 0017C86C 4E 80 00 20 */ blr +/* 8017F90C 0017C86C 4E 80 00 20 */ blr .global ValidateOrbitTargetIdAndPointer__7CPlayerCF9TUniqueIdR13CStateManager ValidateOrbitTargetIdAndPointer__7CPlayerCF9TUniqueIdR13CStateManager: @@ -7179,7 +7179,7 @@ lbl_8017F960: /* 8017F960 0017C8C0 80 01 00 24 */ lwz r0, 0x24(r1) /* 8017F964 0017C8C4 7C 08 03 A6 */ mtlr r0 /* 8017F968 0017C8C8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8017F96C 0017C8CC 4E 80 00 20 */ blr +/* 8017F96C 0017C8CC 4E 80 00 20 */ blr .global BuildNearListBox__FbRC12CTransform4ffff BuildNearListBox__FbRC12CTransform4ffff: @@ -7210,7 +7210,7 @@ lbl_8017F9A0: /* 8017F9C8 0017C928 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8017F9CC 0017C92C 7C 08 03 A6 */ mtlr r0 /* 8017F9D0 0017C930 38 21 00 30 */ addi r1, r1, 0x30 -/* 8017F9D4 0017C934 4E 80 00 20 */ blr +/* 8017F9D4 0017C934 4E 80 00 20 */ blr .global __sinit_CPlayerOrbit_cpp __sinit_CPlayerOrbit_cpp: diff --git a/asm/MetroidPrime/Player/CPlayerState.s b/asm/MetroidPrime/Player/CPlayerState.s index dac6f717..3b90f29d 100644 --- a/asm/MetroidPrime/Player/CPlayerState.s +++ b/asm/MetroidPrime/Player/CPlayerState.s @@ -67,7 +67,7 @@ lbl_805A7158: .global GetMissileComboChargeFactor__12CPlayerStateFv GetMissileComboChargeFactor__12CPlayerStateFv: /* 800911FC 0008E15C C0 22 8B 08 */ lfs f1, lbl_805AA828@sda21(r2) -/* 80091200 0008E160 4E 80 00 20 */ blr +/* 80091200 0008E160 4E 80 00 20 */ blr .global GetComboFireAmmoPeriod__12CPlayerStateCFv GetComboFireAmmoPeriod__12CPlayerStateCFv: @@ -76,7 +76,7 @@ GetComboFireAmmoPeriod__12CPlayerStateCFv: /* 8009120C 0008E16C 38 63 D7 78 */ addi r3, r3, lbl_803CD778@l /* 80091210 0008E170 54 00 10 3A */ slwi r0, r0, 2 /* 80091214 0008E174 7C 23 04 2E */ lfsx f1, r3, r0 -/* 80091218 0008E178 4E 80 00 20 */ blr +/* 80091218 0008E178 4E 80 00 20 */ blr .global GetMissileCostForAltAttack__12CPlayerStateCFv GetMissileCostForAltAttack__12CPlayerStateCFv: @@ -85,7 +85,7 @@ GetMissileCostForAltAttack__12CPlayerStateCFv: /* 80091224 0008E184 38 63 D7 64 */ addi r3, r3, lbl_803CD764@l /* 80091228 0008E188 54 00 10 3A */ slwi r0, r0, 2 /* 8009122C 0008E18C 7C 63 00 2E */ lwzx r3, r3, r0 -/* 80091230 0008E190 4E 80 00 20 */ blr +/* 80091230 0008E190 4E 80 00 20 */ blr .global CalculateItemCollectionRate__12CPlayerStateFv CalculateItemCollectionRate__12CPlayerStateFv: @@ -247,19 +247,19 @@ lbl_8009126C: /* 8009149C 0008E3FC 83 81 00 10 */ lwz r28, 0x10(r1) /* 800914A0 0008E400 7C 08 03 A6 */ mtlr r0 /* 800914A4 0008E404 38 21 00 20 */ addi r1, r1, 0x20 -/* 800914A8 0008E408 4E 80 00 20 */ blr +/* 800914A8 0008E408 4E 80 00 20 */ blr .global GetTotalPickupCount__12CPlayerStateFv GetTotalPickupCount__12CPlayerStateFv: /* 800914AC 0008E40C 38 60 00 63 */ li r3, 0x63 -/* 800914B0 0008E410 4E 80 00 20 */ blr +/* 800914B0 0008E410 4E 80 00 20 */ blr .global SetIsFusionEnabled__12CPlayerStateFb SetIsFusionEnabled__12CPlayerStateFb: /* 800914B4 0008E414 88 03 00 00 */ lbz r0, 0(r3) /* 800914B8 0008E418 50 80 2E B4 */ rlwimi r0, r4, 5, 0x1a, 0x1a /* 800914BC 0008E41C 98 03 00 00 */ stb r0, 0(r3) -/* 800914C0 0008E420 4E 80 00 20 */ blr +/* 800914C0 0008E420 4E 80 00 20 */ blr .global GetIsFusionEnabled__12CPlayerStateFv GetIsFusionEnabled__12CPlayerStateFv: @@ -268,7 +268,7 @@ GetIsFusionEnabled__12CPlayerStateFv: /* 800914CC 0008E42C 7C 03 00 D0 */ neg r0, r3 /* 800914D0 0008E430 7C 00 1B 78 */ or r0, r0, r3 /* 800914D4 0008E434 54 03 0F FE */ srwi r3, r0, 0x1f -/* 800914D8 0008E438 4E 80 00 20 */ blr +/* 800914D8 0008E438 4E 80 00 20 */ blr .global GetCurrentSuit__12CPlayerStateFv GetCurrentSuit__12CPlayerStateFv: @@ -289,7 +289,7 @@ lbl_80091508: /* 8009150C 0008E46C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80091510 0008E470 7C 08 03 A6 */ mtlr r0 /* 80091514 0008E474 38 21 00 10 */ addi r1, r1, 0x10 -/* 80091518 0008E478 4E 80 00 20 */ blr +/* 80091518 0008E478 4E 80 00 20 */ blr .global CanVisorSeeFog__12CPlayerStateCFRC13CStateManager CanVisorSeeFog__12CPlayerStateCFRC13CStateManager: @@ -309,7 +309,7 @@ lbl_80091544: /* 80091548 0008E4A8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009154C 0008E4AC 7C 08 03 A6 */ mtlr r0 /* 80091550 0008E4B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80091554 0008E4B4 4E 80 00 20 */ blr +/* 80091554 0008E4B4 4E 80 00 20 */ blr .global GetActiveVisor__12CPlayerStateCFRC13CStateManager GetActiveVisor__12CPlayerStateCFRC13CStateManager: @@ -335,7 +335,7 @@ lbl_80091598: /* 8009159C 0008E4FC 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 800915A0 0008E500 7C 08 03 A6 */ mtlr r0 /* 800915A4 0008E504 38 21 00 20 */ addi r1, r1, 0x20 -/* 800915A8 0008E508 4E 80 00 20 */ blr +/* 800915A8 0008E508 4E 80 00 20 */ blr .global UpdateStaticInterference__12CPlayerStateFR13CStateManagerRCf UpdateStaticInterference__12CPlayerStateFR13CStateManagerRCf: @@ -348,7 +348,7 @@ UpdateStaticInterference__12CPlayerStateFR13CStateManagerRCf: /* 800915C4 0008E524 80 01 00 14 */ lwz r0, 0x14(r1) /* 800915C8 0008E528 7C 08 03 A6 */ mtlr r0 /* 800915CC 0008E52C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800915D0 0008E530 4E 80 00 20 */ blr +/* 800915D0 0008E530 4E 80 00 20 */ blr .global SetScanTime__12CPlayerStateFUif SetScanTime__12CPlayerStateFUif: @@ -400,7 +400,7 @@ lbl_80091674: /* 80091680 0008E5E0 CB E1 00 38 */ lfd f31, 0x38(r1) /* 80091684 0008E5E4 7C 08 03 A6 */ mtlr r0 /* 80091688 0008E5E8 38 21 00 40 */ addi r1, r1, 0x40 -/* 8009168C 0008E5EC 4E 80 00 20 */ blr +/* 8009168C 0008E5EC 4E 80 00 20 */ blr .global GetScanTime__12CPlayerStateCFUi GetScanTime__12CPlayerStateCFUi: @@ -448,7 +448,7 @@ lbl_80091724: /* 8009172C 0008E68C C0 23 00 04 */ lfs f1, 4(r3) /* 80091730 0008E690 7C 08 03 A6 */ mtlr r0 /* 80091734 0008E694 38 21 00 40 */ addi r1, r1, 0x40 -/* 80091738 0008E698 4E 80 00 20 */ blr +/* 80091738 0008E698 4E 80 00 20 */ blr .global InitializeScanTimes__12CPlayerStateFv InitializeScanTimes__12CPlayerStateFv: @@ -515,17 +515,17 @@ lbl_800917FC: /* 80091814 0008E774 83 81 00 10 */ lwz r28, 0x10(r1) /* 80091818 0008E778 7C 08 03 A6 */ mtlr r0 /* 8009181C 0008E77C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80091820 0008E780 4E 80 00 20 */ blr +/* 80091820 0008E780 4E 80 00 20 */ blr .global GetEnergyTankCapacity__12CPlayerStateFv GetEnergyTankCapacity__12CPlayerStateFv: /* 80091824 0008E784 C0 22 8B 0C */ lfs f1, lbl_805AA82C@sda21(r2) -/* 80091828 0008E788 4E 80 00 20 */ blr +/* 80091828 0008E788 4E 80 00 20 */ blr .global GetBaseHealthCapacity__12CPlayerStateFv GetBaseHealthCapacity__12CPlayerStateFv: /* 8009182C 0008E78C C0 22 8B 10 */ lfs f1, lbl_805AA830@sda21(r2) -/* 80091830 0008E790 4E 80 00 20 */ blr +/* 80091830 0008E790 4E 80 00 20 */ blr .global GetIsVisorTransitioning__12CPlayerStateCFv GetIsVisorTransitioning__12CPlayerStateCFv: @@ -542,14 +542,14 @@ lbl_80091858: /* 80091858 0008E7B8 38 A0 00 01 */ li r5, 1 lbl_8009185C: /* 8009185C 0008E7BC 7C A3 2B 78 */ mr r3, r5 -/* 80091860 0008E7C0 4E 80 00 20 */ blr +/* 80091860 0008E7C0 4E 80 00 20 */ blr .global GetVisorTransitionFactor__12CPlayerStateCFv GetVisorTransitionFactor__12CPlayerStateCFv: /* 80091864 0008E7C4 C0 23 00 1C */ lfs f1, 0x1c(r3) /* 80091868 0008E7C8 C0 02 8B 14 */ lfs f0, lbl_805AA834@sda21(r2) /* 8009186C 0008E7CC EC 21 00 24 */ fdivs f1, f1, f0 -/* 80091870 0008E7D0 4E 80 00 20 */ blr +/* 80091870 0008E7D0 4E 80 00 20 */ blr .global UpdateVisorTransition__12CPlayerStateFf UpdateVisorTransition__12CPlayerStateFf: @@ -614,18 +614,18 @@ lbl_80091938: /* 80091944 0008E8A4 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80091948 0008E8A8 7C 08 03 A6 */ mtlr r0 /* 8009194C 0008E8AC 38 21 00 30 */ addi r1, r1, 0x30 -/* 80091950 0008E8B0 4E 80 00 20 */ blr +/* 80091950 0008E8B0 4E 80 00 20 */ blr .global StartTransitionToVisor__12CPlayerStateFQ212CPlayerState12EPlayerVisor StartTransitionToVisor__12CPlayerStateFQ212CPlayerState12EPlayerVisor: /* 80091954 0008E8B4 80 03 00 18 */ lwz r0, 0x18(r3) /* 80091958 0008E8B8 7C 04 00 00 */ cmpw r4, r0 -/* 8009195C 0008E8BC 4D 82 00 20 */ beqlr +/* 8009195C 0008E8BC 4D 82 00 20 */ beqlr /* 80091960 0008E8C0 90 83 00 18 */ stw r4, 0x18(r3) /* 80091964 0008E8C4 80 83 00 18 */ lwz r4, 0x18(r3) /* 80091968 0008E8C8 80 03 00 14 */ lwz r0, 0x14(r3) /* 8009196C 0008E8CC 7C 04 00 00 */ cmpw r4, r0 -/* 80091970 0008E8D0 4E 80 00 20 */ blr +/* 80091970 0008E8D0 4E 80 00 20 */ blr .global ResetVisor__12CPlayerStateFv ResetVisor__12CPlayerStateFv: @@ -634,7 +634,7 @@ ResetVisor__12CPlayerStateFv: /* 8009197C 0008E8DC 90 03 00 18 */ stw r0, 0x18(r3) /* 80091980 0008E8E0 90 03 00 14 */ stw r0, 0x14(r3) /* 80091984 0008E8E4 D0 03 00 1C */ stfs f0, 0x1c(r3) -/* 80091988 0008E8E8 4E 80 00 20 */ blr +/* 80091988 0008E8E8 4E 80 00 20 */ blr .global ItemEnabled__12CPlayerStateCFQ212CPlayerState9EItemType ItemEnabled__12CPlayerStateCFQ212CPlayerState9EItemType: @@ -664,7 +664,7 @@ lbl_800919D8: /* 800919E0 0008E940 83 C1 00 08 */ lwz r30, 8(r1) /* 800919E4 0008E944 7C 08 03 A6 */ mtlr r0 /* 800919E8 0008E948 38 21 00 10 */ addi r1, r1, 0x10 -/* 800919EC 0008E94C 4E 80 00 20 */ blr +/* 800919EC 0008E94C 4E 80 00 20 */ blr .global DisableItem__12CPlayerStateFQ212CPlayerState9EItemType DisableItem__12CPlayerStateFQ212CPlayerState9EItemType: @@ -689,7 +689,7 @@ lbl_80091A2C: /* 80091A34 0008E994 83 C1 00 08 */ lwz r30, 8(r1) /* 80091A38 0008E998 7C 08 03 A6 */ mtlr r0 /* 80091A3C 0008E99C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80091A40 0008E9A0 4E 80 00 20 */ blr +/* 80091A40 0008E9A0 4E 80 00 20 */ blr .global EnableItem__12CPlayerStateFQ212CPlayerState9EItemType EnableItem__12CPlayerStateFQ212CPlayerState9EItemType: @@ -714,7 +714,7 @@ lbl_80091A80: /* 80091A88 0008E9E8 83 C1 00 08 */ lwz r30, 8(r1) /* 80091A8C 0008E9EC 7C 08 03 A6 */ mtlr r0 /* 80091A90 0008E9F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80091A94 0008E9F4 4E 80 00 20 */ blr +/* 80091A94 0008E9F4 4E 80 00 20 */ blr .global GetPowerUp__12CPlayerStateFQ212CPlayerState9EItemType GetPowerUp__12CPlayerStateFQ212CPlayerState9EItemType: @@ -724,12 +724,12 @@ GetPowerUp__12CPlayerStateFQ212CPlayerState9EItemType: /* 80091AA4 0008EA04 40 81 00 0C */ ble lbl_80091AB0 lbl_80091AA8: /* 80091AA8 0008EA08 38 60 00 00 */ li r3, 0 -/* 80091AAC 0008EA0C 4E 80 00 20 */ blr +/* 80091AAC 0008EA0C 4E 80 00 20 */ blr lbl_80091AB0: /* 80091AB0 0008EA10 54 80 18 38 */ slwi r0, r4, 3 /* 80091AB4 0008EA14 7C 63 02 14 */ add r3, r3, r0 /* 80091AB8 0008EA18 80 63 00 2C */ lwz r3, 0x2c(r3) -/* 80091ABC 0008EA1C 4E 80 00 20 */ blr +/* 80091ABC 0008EA1C 4E 80 00 20 */ blr .global HasPowerUp__12CPlayerStateCFQ212CPlayerState9EItemType HasPowerUp__12CPlayerStateCFQ212CPlayerState9EItemType: @@ -739,7 +739,7 @@ HasPowerUp__12CPlayerStateCFQ212CPlayerState9EItemType: /* 80091ACC 0008EA2C 40 81 00 0C */ ble lbl_80091AD8 lbl_80091AD0: /* 80091AD0 0008EA30 38 60 00 00 */ li r3, 0 -/* 80091AD4 0008EA34 4E 80 00 20 */ blr +/* 80091AD4 0008EA34 4E 80 00 20 */ blr lbl_80091AD8: /* 80091AD8 0008EA38 54 80 18 38 */ slwi r0, r4, 3 /* 80091ADC 0008EA3C 7C 63 02 14 */ add r3, r3, r0 @@ -747,7 +747,7 @@ lbl_80091AD8: /* 80091AE4 0008EA44 7C 03 00 D0 */ neg r0, r3 /* 80091AE8 0008EA48 7C 00 18 78 */ andc r0, r0, r3 /* 80091AEC 0008EA4C 54 03 0F FE */ srwi r3, r0, 0x1f -/* 80091AF0 0008EA50 4E 80 00 20 */ blr +/* 80091AF0 0008EA50 4E 80 00 20 */ blr .global GetItemCapacity__12CPlayerStateCFQ212CPlayerState9EItemType GetItemCapacity__12CPlayerStateCFQ212CPlayerState9EItemType: @@ -757,12 +757,12 @@ GetItemCapacity__12CPlayerStateCFQ212CPlayerState9EItemType: /* 80091B00 0008EA60 40 81 00 0C */ ble lbl_80091B0C lbl_80091B04: /* 80091B04 0008EA64 38 60 00 00 */ li r3, 0 -/* 80091B08 0008EA68 4E 80 00 20 */ blr +/* 80091B08 0008EA68 4E 80 00 20 */ blr lbl_80091B0C: /* 80091B0C 0008EA6C 54 80 18 38 */ slwi r0, r4, 3 /* 80091B10 0008EA70 7C 63 02 14 */ add r3, r3, r0 /* 80091B14 0008EA74 80 63 00 2C */ lwz r3, 0x2c(r3) -/* 80091B18 0008EA78 4E 80 00 20 */ blr +/* 80091B18 0008EA78 4E 80 00 20 */ blr .global GetItemAmount__12CPlayerStateCFQ212CPlayerState9EItemType GetItemAmount__12CPlayerStateCFQ212CPlayerState9EItemType: @@ -772,7 +772,7 @@ GetItemAmount__12CPlayerStateCFQ212CPlayerState9EItemType: /* 80091B28 0008EA88 40 81 00 0C */ ble lbl_80091B34 lbl_80091B2C: /* 80091B2C 0008EA8C 38 60 00 00 */ li r3, 0 -/* 80091B30 0008EA90 4E 80 00 20 */ blr +/* 80091B30 0008EA90 4E 80 00 20 */ blr lbl_80091B34: /* 80091B34 0008EA94 2C 04 00 0F */ cmpwi r4, 0xf /* 80091B38 0008EA98 41 82 00 44 */ beq lbl_80091B7C @@ -799,21 +799,21 @@ lbl_80091B7C: /* 80091B7C 0008EADC 54 80 18 38 */ slwi r0, r4, 3 /* 80091B80 0008EAE0 7C 63 02 14 */ add r3, r3, r0 /* 80091B84 0008EAE4 80 63 00 28 */ lwz r3, 0x28(r3) -/* 80091B88 0008EAE8 4E 80 00 20 */ blr +/* 80091B88 0008EAE8 4E 80 00 20 */ blr lbl_80091B8C: /* 80091B8C 0008EAEC 38 60 00 00 */ li r3, 0 -/* 80091B90 0008EAF0 4E 80 00 20 */ blr +/* 80091B90 0008EAF0 4E 80 00 20 */ blr .global DecrPickUp__12CPlayerStateFQ212CPlayerState9EItemTypei DecrPickUp__12CPlayerStateFQ212CPlayerState9EItemTypei: /* 80091B94 0008EAF4 2C 04 00 00 */ cmpwi r4, 0 -/* 80091B98 0008EAF8 4D 80 00 20 */ bltlr +/* 80091B98 0008EAF8 4D 80 00 20 */ bltlr /* 80091B9C 0008EAFC 2C 04 00 28 */ cmpwi r4, 0x28 /* 80091BA0 0008EB00 40 81 00 08 */ ble lbl_80091BA8 .global sub_80091ba4 sub_80091ba4: -/* 80091BA4 0008EB04 4E 80 00 20 */ blr +/* 80091BA4 0008EB04 4E 80 00 20 */ blr lbl_80091BA8: /* 80091BA8 0008EB08 2C 04 00 07 */ cmpwi r4, 7 /* 80091BAC 0008EB0C 40 80 00 10 */ bge lbl_80091BBC @@ -822,10 +822,10 @@ lbl_80091BA8: .global sub_80091bb8 sub_80091bb8: -/* 80091BB8 0008EB18 4E 80 00 20 */ blr +/* 80091BB8 0008EB18 4E 80 00 20 */ blr lbl_80091BBC: /* 80091BBC 0008EB1C 2C 04 00 09 */ cmpwi r4, 9 -/* 80091BC0 0008EB20 4C 80 00 20 */ bgelr +/* 80091BC0 0008EB20 4C 80 00 20 */ bgelr lbl_80091BC4: /* 80091BC4 0008EB24 54 80 18 38 */ slwi r0, r4, 3 /* 80091BC8 0008EB28 7C 63 02 14 */ add r3, r3, r0 @@ -834,10 +834,10 @@ lbl_80091BC4: /* 80091BD4 0008EB34 90 03 00 28 */ stw r0, 0x28(r3) /* 80091BD8 0008EB38 80 03 00 28 */ lwz r0, 0x28(r3) /* 80091BDC 0008EB3C 2C 00 00 00 */ cmpwi r0, 0 -/* 80091BE0 0008EB40 4C 80 00 20 */ bgelr +/* 80091BE0 0008EB40 4C 80 00 20 */ bgelr /* 80091BE4 0008EB44 38 00 00 00 */ li r0, 0 /* 80091BE8 0008EB48 90 03 00 28 */ stw r0, 0x28(r3) -/* 80091BEC 0008EB4C 4E 80 00 20 */ blr +/* 80091BEC 0008EB4C 4E 80 00 20 */ blr .global IncrPickUp__12CPlayerStateFQ212CPlayerState9EItemTypei IncrPickUp__12CPlayerStateFQ212CPlayerState9EItemTypei: @@ -866,7 +866,7 @@ lbl_80091C28: /* 80091C44 0008EBA4 38 84 AD 40 */ addi r4, r4, lbl_803DAD40@l /* 80091C48 0008EBA8 7C 04 00 2E */ lwzx r0, r4, r0 /* 80091C4C 0008EBAC 7C 09 03 A6 */ mtctr r0 -/* 80091C50 0008EBB0 4E 80 04 20 */ bctr +/* 80091C50 0008EBB0 4E 80 04 20 */ bctr .global lbl_80091C54 lbl_80091C54: /* 80091C54 0008EBB4 57 C0 18 38 */ slwi r0, r30, 3 @@ -917,7 +917,7 @@ lbl_80091CDC: /* 80091CF0 0008EC50 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80091CF4 0008EC54 7C 08 03 A6 */ mtlr r0 /* 80091CF8 0008EC58 38 21 00 30 */ addi r1, r1, 0x30 -/* 80091CFC 0008EC5C 4E 80 00 20 */ blr +/* 80091CFC 0008EC5C 4E 80 00 20 */ blr .global ResetAndIncrPickUp__12CPlayerStateFQ212CPlayerState9EItemTypei ResetAndIncrPickUp__12CPlayerStateFQ212CPlayerState9EItemTypei: @@ -932,7 +932,7 @@ ResetAndIncrPickUp__12CPlayerStateFQ212CPlayerState9EItemTypei: /* 80091D20 0008EC80 80 01 00 14 */ lwz r0, 0x14(r1) /* 80091D24 0008EC84 7C 08 03 A6 */ mtlr r0 /* 80091D28 0008EC88 38 21 00 10 */ addi r1, r1, 0x10 -/* 80091D2C 0008EC8C 4E 80 00 20 */ blr +/* 80091D2C 0008EC8C 4E 80 00 20 */ blr .global CalculateHealth__12CPlayerStateFUi CalculateHealth__12CPlayerStateFUi: @@ -949,7 +949,7 @@ CalculateHealth__12CPlayerStateFUi: /* 80091D58 0008ECB8 EC 21 10 28 */ fsubs f1, f1, f2 /* 80091D5C 0008ECBC EC 23 00 7A */ fmadds f1, f3, f1, f0 /* 80091D60 0008ECC0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80091D64 0008ECC4 4E 80 00 20 */ blr +/* 80091D64 0008ECC4 4E 80 00 20 */ blr .global InitializePowerUp__12CPlayerStateFQ212CPlayerState9EItemTypei InitializePowerUp__12CPlayerStateFQ212CPlayerState9EItemTypei: @@ -1032,7 +1032,7 @@ lbl_80091E70: /* 80091E7C 0008EDDC 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80091E80 0008EDE0 7C 08 03 A6 */ mtlr r0 /* 80091E84 0008EDE4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80091E88 0008EDE8 4E 80 00 20 */ blr +/* 80091E88 0008EDE8 4E 80 00 20 */ blr .global ReInitializePowerUp__12CPlayerStateFQ212CPlayerState9EItemTypei ReInitializePowerUp__12CPlayerStateFQ212CPlayerState9EItemTypei: @@ -1047,7 +1047,7 @@ ReInitializePowerUp__12CPlayerStateFQ212CPlayerState9EItemTypei: /* 80091EAC 0008EE0C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80091EB0 0008EE10 7C 08 03 A6 */ mtlr r0 /* 80091EB4 0008EE14 38 21 00 10 */ addi r1, r1, 0x10 -/* 80091EB8 0008EE18 4E 80 00 20 */ blr +/* 80091EB8 0008EE18 4E 80 00 20 */ blr .global PutTo__12CPlayerStateFR13COutPutStream PutTo__12CPlayerStateFR13COutPutStream: @@ -1147,7 +1147,7 @@ lbl_80091FC4: /* 80092018 0008EF78 80 01 00 44 */ lwz r0, 0x44(r1) /* 8009201C 0008EF7C 7C 08 03 A6 */ mtlr r0 /* 80092020 0008EF80 38 21 00 40 */ addi r1, r1, 0x40 -/* 80092024 0008EF84 4E 80 00 20 */ blr +/* 80092024 0008EF84 4E 80 00 20 */ blr .global __ct__12CPlayerStateFR12CInputStream __ct__12CPlayerStateFR12CInputStream: @@ -1328,7 +1328,7 @@ lbl_80092260: /* 800922B8 0008F218 80 01 00 54 */ lwz r0, 0x54(r1) /* 800922BC 0008F21C 7C 08 03 A6 */ mtlr r0 /* 800922C0 0008F220 38 21 00 50 */ addi r1, r1, 0x50 -/* 800922C4 0008F224 4E 80 00 20 */ blr +/* 800922C4 0008F224 4E 80 00 20 */ blr .global __ct__12CPlayerStateFv __ct__12CPlayerStateFv: @@ -1392,13 +1392,13 @@ lbl_80092370: /* 800923A4 0008F304 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 800923A8 0008F308 7C 08 03 A6 */ mtlr r0 /* 800923AC 0008F30C 38 21 00 20 */ addi r1, r1, 0x20 -/* 800923B0 0008F310 4E 80 00 20 */ blr +/* 800923B0 0008F310 4E 80 00 20 */ blr .global __ct__Q212CPlayerState8CPowerUpFii __ct__Q212CPlayerState8CPowerUpFii: /* 800923B4 0008F314 90 83 00 00 */ stw r4, 0(r3) /* 800923B8 0008F318 90 A3 00 04 */ stw r5, 4(r3) -/* 800923BC 0008F31C 4E 80 00 20 */ blr +/* 800923BC 0008F31C 4E 80 00 20 */ blr .global GetBitCount__12CPlayerStateFUi GetBitCount__12CPlayerStateFUi: @@ -1411,7 +1411,7 @@ lbl_800923D0: /* 800923D0 0008F330 28 03 00 00 */ cmplwi r3, 0 /* 800923D4 0008F334 40 82 FF F4 */ bne lbl_800923C8 /* 800923D8 0008F338 7C 83 23 78 */ mr r3, r4 -/* 800923DC 0008F33C 4E 80 00 20 */ blr +/* 800923DC 0008F33C 4E 80 00 20 */ blr .global "lower_bound,Ui,Q24rstl56pair_sorter_finder,Q24rstl8less>>__4rstlFPCQ24rstl10pairPCQ24rstl10pairRCUiQ24rstl56pair_sorter_finder,Q24rstl8less>" "lower_bound,Ui,Q24rstl56pair_sorter_finder,Q24rstl8less>>__4rstlFPCQ24rstl10pairPCQ24rstl10pairRCUiQ24rstl56pair_sorter_finder,Q24rstl8less>": @@ -1465,7 +1465,7 @@ lbl_8009247C: /* 80092490 0008F3F0 80 01 00 34 */ lwz r0, 0x34(r1) /* 80092494 0008F3F4 7C 08 03 A6 */ mtlr r0 /* 80092498 0008F3F8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8009249C 0008F3FC 4E 80 00 20 */ blr +/* 8009249C 0008F3FC 4E 80 00 20 */ blr .global "lower_bound,Ui,Q24rstl56pair_sorter_finder,Q24rstl8less>>__4rstlFPQ24rstl10pairPQ24rstl10pairRCUiQ24rstl56pair_sorter_finder,Q24rstl8less>" "lower_bound,Ui,Q24rstl56pair_sorter_finder,Q24rstl8less>>__4rstlFPQ24rstl10pairPQ24rstl10pairRCUiQ24rstl56pair_sorter_finder,Q24rstl8less>": @@ -1519,7 +1519,7 @@ lbl_8009253C: /* 80092550 0008F4B0 80 01 00 34 */ lwz r0, 0x34(r1) /* 80092554 0008F4B4 7C 08 03 A6 */ mtlr r0 /* 80092558 0008F4B8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8009255C 0008F4BC 4E 80 00 20 */ blr +/* 8009255C 0008F4BC 4E 80 00 20 */ blr .global sub_80092560 sub_80092560: @@ -1593,7 +1593,7 @@ lbl_8009263C: /* 80092648 0008F5A8 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8009264C 0008F5AC 7C 08 03 A6 */ mtlr r0 /* 80092650 0008F5B0 38 21 00 30 */ addi r1, r1, 0x30 -/* 80092654 0008F5B4 4E 80 00 20 */ blr +/* 80092654 0008F5B4 4E 80 00 20 */ blr .global "advance,i>__4rstlFRPCQ24rstl10pairi" "advance,i>__4rstlFRPCQ24rstl10pairi": @@ -1607,7 +1607,7 @@ lbl_8009263C: /* 80092674 0008F5D4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80092678 0008F5D8 7C 08 03 A6 */ mtlr r0 /* 8009267C 0008F5DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80092680 0008F5E0 4E 80 00 20 */ blr +/* 80092680 0008F5E0 4E 80 00 20 */ blr .global "advance,i>__4rstlFRPQ24rstl10pairi" "advance,i>__4rstlFRPQ24rstl10pairi": @@ -1621,7 +1621,7 @@ lbl_8009263C: /* 800926A0 0008F600 80 01 00 14 */ lwz r0, 0x14(r1) /* 800926A4 0008F604 7C 08 03 A6 */ mtlr r0 /* 800926A8 0008F608 38 21 00 10 */ addi r1, r1, 0x10 -/* 800926AC 0008F60C 4E 80 00 20 */ blr +/* 800926AC 0008F60C 4E 80 00 20 */ blr .global "__advance,i>__4rstlFRPCQ24rstl10pairiQ24rstl26random_access_iterator_tag" "__advance,i>__4rstlFRPCQ24rstl10pairiQ24rstl26random_access_iterator_tag": @@ -1629,7 +1629,7 @@ lbl_8009263C: /* 800926B4 0008F614 54 80 18 38 */ slwi r0, r4, 3 /* 800926B8 0008F618 7C 05 02 14 */ add r0, r5, r0 /* 800926BC 0008F61C 90 03 00 00 */ stw r0, 0(r3) -/* 800926C0 0008F620 4E 80 00 20 */ blr +/* 800926C0 0008F620 4E 80 00 20 */ blr .global sub_800926c4 sub_800926c4: @@ -1637,7 +1637,7 @@ sub_800926c4: /* 800926C8 0008F628 54 80 18 38 */ slwi r0, r4, 3 /* 800926CC 0008F62C 7C 05 02 14 */ add r0, r5, r0 /* 800926D0 0008F630 90 03 00 00 */ stw r0, 0(r3) -/* 800926D4 0008F634 4E 80 00 20 */ blr +/* 800926D4 0008F634 4E 80 00 20 */ blr .global "distance>__4rstlFPCQ24rstl10pairPCQ24rstl10pair" "distance>__4rstlFPCQ24rstl10pairPCQ24rstl10pair": @@ -1657,7 +1657,7 @@ sub_800926c4: /* 8009270C 0008F66C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80092710 0008F670 7C 08 03 A6 */ mtlr r0 /* 80092714 0008F674 38 21 00 20 */ addi r1, r1, 0x20 -/* 80092718 0008F678 4E 80 00 20 */ blr +/* 80092718 0008F678 4E 80 00 20 */ blr .global "distance>__4rstlFPQ24rstl10pairPQ24rstl10pair" "distance>__4rstlFPQ24rstl10pairPQ24rstl10pair": @@ -1677,7 +1677,7 @@ sub_800926c4: /* 80092750 0008F6B0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80092754 0008F6B4 7C 08 03 A6 */ mtlr r0 /* 80092758 0008F6B8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8009275C 0008F6BC 4E 80 00 20 */ blr +/* 8009275C 0008F6BC 4E 80 00 20 */ blr .global "__distance>__4rstlFPCQ24rstl10pairPCQ24rstl10pairQ24rstl26random_access_iterator_tag" "__distance>__4rstlFPCQ24rstl10pairPCQ24rstl10pairQ24rstl26random_access_iterator_tag": @@ -1686,7 +1686,7 @@ sub_800926c4: /* 80092768 0008F6C8 7C 03 00 50 */ subf r0, r3, r0 /* 8009276C 0008F6CC 7C 00 1E 70 */ srawi r0, r0, 3 /* 80092770 0008F6D0 7C 60 01 94 */ addze r3, r0 -/* 80092774 0008F6D4 4E 80 00 20 */ blr +/* 80092774 0008F6D4 4E 80 00 20 */ blr .global "__advance,i>__4rstlFRPQ24rstl10pairiQ24rstl26random_access_iterator_tag" "__advance,i>__4rstlFRPQ24rstl10pairiQ24rstl26random_access_iterator_tag": @@ -1695,4 +1695,4 @@ sub_800926c4: /* 80092780 0008F6E0 7C 03 00 50 */ subf r0, r3, r0 /* 80092784 0008F6E4 7C 00 1E 70 */ srawi r0, r0, 3 /* 80092788 0008F6E8 7C 60 01 94 */ addze r3, r0 -/* 8009278C 0008F6EC 4E 80 00 20 */ blr +/* 8009278C 0008F6EC 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/Player/CPlayerVisor.s b/asm/MetroidPrime/Player/CPlayerVisor.s index cef87402..2879a4fc 100644 --- a/asm/MetroidPrime/Player/CPlayerVisor.s +++ b/asm/MetroidPrime/Player/CPlayerVisor.s @@ -76,13 +76,13 @@ FindEmptyInactiveScanTarget__12CPlayerVisorCFv: lbl_80111E3C: /* 80111E3C 0010ED9C C0 04 00 04 */ lfs f0, 4(r4) /* 80111E40 0010EDA0 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 80111E44 0010EDA4 4D 82 00 20 */ beqlr +/* 80111E44 0010EDA4 4D 82 00 20 */ beqlr /* 80111E48 0010EDA8 38 84 00 10 */ addi r4, r4, 0x10 /* 80111E4C 0010EDAC 38 63 00 01 */ addi r3, r3, 1 /* 80111E50 0010EDB0 42 00 FF EC */ bdnz lbl_80111E3C lbl_80111E54: /* 80111E54 0010EDB4 38 60 FF FF */ li r3, -1 -/* 80111E58 0010EDB8 4E 80 00 20 */ blr +/* 80111E58 0010EDB8 4E 80 00 20 */ blr .global FindCachedInactiveScanTarget__12CPlayerVisorCF9TUniqueId FindCachedInactiveScanTarget__12CPlayerVisorCF9TUniqueId: @@ -100,14 +100,14 @@ lbl_80111E78: /* 80111E84 0010EDE4 40 82 00 10 */ bne lbl_80111E94 /* 80111E88 0010EDE8 C0 26 00 04 */ lfs f1, 4(r6) /* 80111E8C 0010EDEC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80111E90 0010EDF0 4D 81 00 20 */ bgtlr +/* 80111E90 0010EDF0 4D 81 00 20 */ bgtlr lbl_80111E94: /* 80111E94 0010EDF4 38 C6 00 10 */ addi r6, r6, 0x10 /* 80111E98 0010EDF8 38 63 00 01 */ addi r3, r3, 1 /* 80111E9C 0010EDFC 42 00 FF DC */ bdnz lbl_80111E78 lbl_80111EA0: /* 80111EA0 0010EE00 38 60 FF FF */ li r3, -1 -/* 80111EA4 0010EE04 4E 80 00 20 */ blr +/* 80111EA4 0010EE04 4E 80 00 20 */ blr .global DrawScanObjectIndicators__12CPlayerVisorCFRC13CStateManager DrawScanObjectIndicators__12CPlayerVisorCFRC13CStateManager: @@ -202,7 +202,7 @@ lbl_80111FC4: /* 80111FE4 0010EF44 C0 42 95 D4 */ lfs f2, lbl_805AB2F4@sda21(r2) /* 80111FE8 0010EF48 81 8C 00 54 */ lwz r12, 0x54(r12) /* 80111FEC 0010EF4C 7D 89 03 A6 */ mtctr r12 -/* 80111FF0 0010EF50 4E 80 04 21 */ bctrl +/* 80111FF0 0010EF50 4E 80 04 21 */ bctrl /* 80111FF4 0010EF54 C0 62 95 D8 */ lfs f3, lbl_805AB2F8@sda21(r2) /* 80111FF8 0010EF58 38 61 01 18 */ addi r3, r1, 0x118 /* 80111FFC 0010EF5C C0 3A 00 48 */ lfs f1, 0x48(r26) @@ -216,7 +216,7 @@ lbl_80111FC4: /* 8011201C 0010EF7C 81 83 00 00 */ lwz r12, 0(r3) /* 80112020 0010EF80 81 8C 00 30 */ lwz r12, 0x30(r12) /* 80112024 0010EF84 7D 89 03 A6 */ mtctr r12 -/* 80112028 0010EF88 4E 80 04 21 */ bctrl +/* 80112028 0010EF88 4E 80 04 21 */ bctrl /* 8011202C 0010EF8C 38 A0 00 00 */ li r5, 0 /* 80112030 0010EF90 38 60 00 05 */ li r3, 5 /* 80112034 0010EF94 38 00 00 03 */ li r0, 3 @@ -255,7 +255,7 @@ lbl_80111FC4: /* 801120B8 0010F018 81 83 00 00 */ lwz r12, 0(r3) /* 801120BC 0010F01C 81 8C 00 58 */ lwz r12, 0x58(r12) /* 801120C0 0010F020 7D 89 03 A6 */ mtctr r12 -/* 801120C4 0010F024 4E 80 04 21 */ bctrl +/* 801120C4 0010F024 4E 80 04 21 */ bctrl /* 801120C8 0010F028 3C 60 80 3F */ lis r3, lbl_803ED910@ha /* 801120CC 0010F02C 3C 80 43 30 */ lis r4, 0x4330 /* 801120D0 0010F030 38 C3 D9 10 */ addi r6, r3, lbl_803ED910@l @@ -279,7 +279,7 @@ lbl_80111FC4: /* 80112118 0010F078 C0 B9 01 64 */ lfs f5, 0x164(r25) /* 8011211C 0010F07C EC 60 18 28 */ fsubs f3, f0, f3 /* 80112120 0010F080 7D 89 03 A6 */ mtctr r12 -/* 80112124 0010F084 4E 80 04 21 */ bctrl +/* 80112124 0010F084 4E 80 04 21 */ bctrl /* 80112128 0010F088 38 61 00 C4 */ addi r3, r1, 0xc4 /* 8011212C 0010F08C 38 81 01 9C */ addi r4, r1, 0x19c /* 80112130 0010F090 48 20 0F C5 */ bl BuildMatrix3f__12CTransform4fCFv @@ -354,7 +354,7 @@ lbl_8011221C: /* 80112228 0010F188 38 61 00 54 */ addi r3, r1, 0x54 /* 8011222C 0010F18C 81 8C 00 54 */ lwz r12, 0x54(r12) /* 80112230 0010F190 7D 89 03 A6 */ mtctr r12 -/* 80112234 0010F194 4E 80 04 21 */ bctrl +/* 80112234 0010F194 4E 80 04 21 */ bctrl /* 80112238 0010F198 C0 41 00 54 */ lfs f2, 0x54(r1) /* 8011223C 0010F19C 7F 64 DB 78 */ mr r4, r27 /* 80112240 0010F1A0 C0 21 00 58 */ lfs f1, 0x58(r1) @@ -461,7 +461,7 @@ lbl_801123B8: /* 801123C0 0010F320 81 83 00 00 */ lwz r12, 0(r3) /* 801123C4 0010F324 81 8C 00 30 */ lwz r12, 0x30(r12) /* 801123C8 0010F328 7D 89 03 A6 */ mtctr r12 -/* 801123CC 0010F32C 4E 80 04 21 */ bctrl +/* 801123CC 0010F32C 4E 80 04 21 */ bctrl /* 801123D0 0010F330 88 61 00 1B */ lbz r3, 0x1b(r1) /* 801123D4 0010F334 3C 00 43 30 */ lis r0, 0x4330 /* 801123D8 0010F338 90 01 02 38 */ stw r0, 0x238(r1) @@ -546,7 +546,7 @@ lbl_801124BC: /* 801124F8 0010F458 80 01 02 E4 */ lwz r0, 0x2e4(r1) /* 801124FC 0010F45C 7C 08 03 A6 */ mtlr r0 /* 80112500 0010F460 38 21 02 E0 */ addi r1, r1, 0x2e0 -/* 80112504 0010F464 4E 80 00 20 */ blr +/* 80112504 0010F464 4E 80 00 20 */ blr .global UpdateScanObjectIndicators__12CPlayerVisorFRC13CStateManagerf UpdateScanObjectIndicators__12CPlayerVisorFRC13CStateManagerf: @@ -641,7 +641,7 @@ lbl_801125FC: /* 80112644 0010F5A4 81 8C 00 48 */ lwz r12, 0x48(r12) /* 80112648 0010F5A8 38 61 00 58 */ addi r3, r1, 0x58 /* 8011264C 0010F5AC 7D 89 03 A6 */ mtctr r12 -/* 80112650 0010F5B0 4E 80 04 21 */ bctrl +/* 80112650 0010F5B0 4E 80 04 21 */ bctrl /* 80112654 0010F5B4 7F 24 CB 78 */ mr r4, r25 /* 80112658 0010F5B8 38 61 00 64 */ addi r3, r1, 0x64 /* 8011265C 0010F5BC 38 A1 00 58 */ addi r5, r1, 0x58 @@ -849,7 +849,7 @@ lbl_8011290C: /* 80112938 0010F898 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 8011293C 0010F89C 7C 08 03 A6 */ mtlr r0 /* 80112940 0010F8A0 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 80112944 0010F8A4 4E 80 00 20 */ blr +/* 80112944 0010F8A4 4E 80 00 20 */ blr .global UpdateScanWindow__12CPlayerVisorFfRC13CStateManager UpdateScanWindow__12CPlayerVisorFfRC13CStateManager: @@ -1131,7 +1131,7 @@ lbl_80112D0C: /* 80112D24 0010FC84 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80112D28 0010FC88 7C 08 03 A6 */ mtlr r0 /* 80112D2C 0010FC8C 38 21 00 50 */ addi r1, r1, 0x50 -/* 80112D30 0010FC90 4E 80 00 20 */ blr +/* 80112D30 0010FC90 4E 80 00 20 */ blr .global GetDesiredScanWindowState__12CPlayerVisorCFRC13CStateManager GetDesiredScanWindowState__12CPlayerVisorCFRC13CStateManager: @@ -1148,13 +1148,13 @@ GetDesiredScanWindowState__12CPlayerVisorCFRC13CStateManager: /* 80112D5C 0010FCBC 40 82 00 0C */ bne lbl_80112D68 lbl_80112D60: /* 80112D60 0010FCC0 38 60 00 02 */ li r3, 2 -/* 80112D64 0010FCC4 4E 80 00 20 */ blr +/* 80112D64 0010FCC4 4E 80 00 20 */ blr lbl_80112D68: /* 80112D68 0010FCC8 38 60 00 01 */ li r3, 1 -/* 80112D6C 0010FCCC 4E 80 00 20 */ blr +/* 80112D6C 0010FCCC 4E 80 00 20 */ blr lbl_80112D70: /* 80112D70 0010FCD0 38 60 00 00 */ li r3, 0 -/* 80112D74 0010FCD4 4E 80 00 20 */ blr +/* 80112D74 0010FCD4 4E 80 00 20 */ blr .global LockUnlockAssets__12CPlayerVisorFQ212CPlayerState12EPlayerVisorQ212CPlayerState12EPlayerVisor LockUnlockAssets__12CPlayerVisorFQ212CPlayerState12EPlayerVisorQ212CPlayerState12EPlayerVisor: @@ -1372,7 +1372,7 @@ lbl_80113090: /* 80113094 0010FFF4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80113098 0010FFF8 7C 08 03 A6 */ mtlr r0 /* 8011309C 0010FFFC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801130A0 00110000 4E 80 00 20 */ blr +/* 801130A0 00110000 4E 80 00 20 */ blr .global DrawScanEffect__12CPlayerVisorCFRC13CStateManagerPC17CTargetingManager DrawScanEffect__12CPlayerVisorCFRC13CStateManagerPC17CTargetingManager: @@ -1525,7 +1525,7 @@ lbl_801131B0: /* 801132D0 00110230 C0 42 95 D0 */ lfs f2, lbl_805AB2F0@sda21(r2) /* 801132D4 00110234 81 8C 00 54 */ lwz r12, 0x54(r12) /* 801132D8 00110238 7D 89 03 A6 */ mtctr r12 -/* 801132DC 0011023C 4E 80 04 21 */ bctrl +/* 801132DC 0011023C 4E 80 04 21 */ bctrl /* 801132E0 00110240 C0 3C 00 48 */ lfs f1, 0x48(r28) /* 801132E4 00110244 38 61 06 F4 */ addi r3, r1, 0x6f4 /* 801132E8 00110248 C0 42 95 D0 */ lfs f2, lbl_805AB2F0@sda21(r2) @@ -1570,7 +1570,7 @@ lbl_801131B0: /* 80113384 001102E4 81 83 00 00 */ lwz r12, 0(r3) /* 80113388 001102E8 81 8C 00 30 */ lwz r12, 0x30(r12) /* 8011338C 001102EC 7D 89 03 A6 */ mtctr r12 -/* 80113390 001102F0 4E 80 04 21 */ bctrl +/* 80113390 001102F0 4E 80 04 21 */ bctrl /* 80113394 001102F4 7F A3 EB 78 */ mr r3, r29 /* 80113398 001102F8 7F 64 DB 78 */ mr r4, r27 /* 8011339C 001102FC 7F C6 F3 78 */ mr r6, r30 @@ -1683,7 +1683,7 @@ lbl_80113418: /* 80113544 001104A4 81 83 00 00 */ lwz r12, 0(r3) /* 80113548 001104A8 81 8C 00 30 */ lwz r12, 0x30(r12) /* 8011354C 001104AC 7D 89 03 A6 */ mtctr r12 -/* 80113550 001104B0 4E 80 04 21 */ bctrl +/* 80113550 001104B0 4E 80 04 21 */ bctrl /* 80113554 001104B4 7F A3 EB 78 */ mr r3, r29 /* 80113558 001104B8 38 81 00 4C */ addi r4, r1, 0x4c /* 8011355C 001104BC 48 24 26 79 */ bl Draw__6CModelCFRC11CModelFlags @@ -1696,7 +1696,7 @@ lbl_80113418: /* 80113578 001104D8 81 83 00 00 */ lwz r12, 0(r3) /* 8011357C 001104DC 81 8C 00 30 */ lwz r12, 0x30(r12) /* 80113580 001104E0 7D 89 03 A6 */ mtctr r12 -/* 80113584 001104E4 4E 80 04 21 */ bctrl +/* 80113584 001104E4 4E 80 04 21 */ bctrl /* 80113588 001104E8 7F A3 EB 78 */ mr r3, r29 /* 8011358C 001104EC 38 81 00 4C */ addi r4, r1, 0x4c /* 80113590 001104F0 48 24 26 45 */ bl Draw__6CModelCFRC11CModelFlags @@ -1734,7 +1734,7 @@ lbl_80113594: /* 8011360C 0011056C 81 83 00 00 */ lwz r12, 0(r3) /* 80113610 00110570 81 8C 00 30 */ lwz r12, 0x30(r12) /* 80113614 00110574 7D 89 03 A6 */ mtctr r12 -/* 80113618 00110578 4E 80 04 21 */ bctrl +/* 80113618 00110578 4E 80 04 21 */ bctrl /* 8011361C 0011057C 7F A3 EB 78 */ mr r3, r29 /* 80113620 00110580 38 81 00 4C */ addi r4, r1, 0x4c /* 80113624 00110584 48 24 25 B1 */ bl Draw__6CModelCFRC11CModelFlags @@ -1747,7 +1747,7 @@ lbl_80113594: /* 80113640 001105A0 81 83 00 00 */ lwz r12, 0(r3) /* 80113644 001105A4 81 8C 00 30 */ lwz r12, 0x30(r12) /* 80113648 001105A8 7D 89 03 A6 */ mtctr r12 -/* 8011364C 001105AC 4E 80 04 21 */ bctrl +/* 8011364C 001105AC 4E 80 04 21 */ bctrl /* 80113650 001105B0 7F A3 EB 78 */ mr r3, r29 /* 80113654 001105B4 38 81 00 4C */ addi r4, r1, 0x4c /* 80113658 001105B8 48 24 25 7D */ bl Draw__6CModelCFRC11CModelFlags @@ -1786,7 +1786,7 @@ lbl_8011365C: /* 801136D8 00110638 81 83 00 00 */ lwz r12, 0(r3) /* 801136DC 0011063C 81 8C 00 30 */ lwz r12, 0x30(r12) /* 801136E0 00110640 7D 89 03 A6 */ mtctr r12 -/* 801136E4 00110644 4E 80 04 21 */ bctrl +/* 801136E4 00110644 4E 80 04 21 */ bctrl /* 801136E8 00110648 7F A3 EB 78 */ mr r3, r29 /* 801136EC 0011064C 38 81 00 4C */ addi r4, r1, 0x4c /* 801136F0 00110650 48 24 24 E5 */ bl Draw__6CModelCFRC11CModelFlags @@ -1799,7 +1799,7 @@ lbl_8011365C: /* 8011370C 0011066C 81 83 00 00 */ lwz r12, 0(r3) /* 80113710 00110670 81 8C 00 30 */ lwz r12, 0x30(r12) /* 80113714 00110674 7D 89 03 A6 */ mtctr r12 -/* 80113718 00110678 4E 80 04 21 */ bctrl +/* 80113718 00110678 4E 80 04 21 */ bctrl /* 8011371C 0011067C 7F A3 EB 78 */ mr r3, r29 /* 80113720 00110680 38 81 00 4C */ addi r4, r1, 0x4c /* 80113724 00110684 48 24 24 B1 */ bl Draw__6CModelCFRC11CModelFlags @@ -1812,7 +1812,7 @@ lbl_8011365C: /* 80113740 001106A0 81 83 00 00 */ lwz r12, 0(r3) /* 80113744 001106A4 81 8C 00 30 */ lwz r12, 0x30(r12) /* 80113748 001106A8 7D 89 03 A6 */ mtctr r12 -/* 8011374C 001106AC 4E 80 04 21 */ bctrl +/* 8011374C 001106AC 4E 80 04 21 */ bctrl /* 80113750 001106B0 7F A3 EB 78 */ mr r3, r29 /* 80113754 001106B4 38 81 00 4C */ addi r4, r1, 0x4c /* 80113758 001106B8 48 24 24 7D */ bl Draw__6CModelCFRC11CModelFlags @@ -1829,7 +1829,7 @@ lbl_8011365C: /* 80113784 001106E4 81 83 00 00 */ lwz r12, 0(r3) /* 80113788 001106E8 81 8C 00 30 */ lwz r12, 0x30(r12) /* 8011378C 001106EC 7D 89 03 A6 */ mtctr r12 -/* 80113790 001106F0 4E 80 04 21 */ bctrl +/* 80113790 001106F0 4E 80 04 21 */ bctrl /* 80113794 001106F4 7F A3 EB 78 */ mr r3, r29 /* 80113798 001106F8 38 81 00 4C */ addi r4, r1, 0x4c /* 8011379C 001106FC 48 24 24 39 */ bl Draw__6CModelCFRC11CModelFlags @@ -1878,7 +1878,7 @@ lbl_801137A0: /* 80113844 001107A4 81 83 00 00 */ lwz r12, 0(r3) /* 80113848 001107A8 81 8C 00 30 */ lwz r12, 0x30(r12) /* 8011384C 001107AC 7D 89 03 A6 */ mtctr r12 -/* 80113850 001107B0 4E 80 04 21 */ bctrl +/* 80113850 001107B0 4E 80 04 21 */ bctrl /* 80113854 001107B4 7F A3 EB 78 */ mr r3, r29 /* 80113858 001107B8 38 81 00 4C */ addi r4, r1, 0x4c /* 8011385C 001107BC 48 24 23 79 */ bl Draw__6CModelCFRC11CModelFlags @@ -1891,7 +1891,7 @@ lbl_801137A0: /* 80113878 001107D8 81 83 00 00 */ lwz r12, 0(r3) /* 8011387C 001107DC 81 8C 00 30 */ lwz r12, 0x30(r12) /* 80113880 001107E0 7D 89 03 A6 */ mtctr r12 -/* 80113884 001107E4 4E 80 04 21 */ bctrl +/* 80113884 001107E4 4E 80 04 21 */ bctrl /* 80113888 001107E8 7F A3 EB 78 */ mr r3, r29 /* 8011388C 001107EC 38 81 00 4C */ addi r4, r1, 0x4c /* 80113890 001107F0 48 24 23 45 */ bl Draw__6CModelCFRC11CModelFlags @@ -1904,7 +1904,7 @@ lbl_801137A0: /* 801138AC 0011080C 81 83 00 00 */ lwz r12, 0(r3) /* 801138B0 00110810 81 8C 00 30 */ lwz r12, 0x30(r12) /* 801138B4 00110814 7D 89 03 A6 */ mtctr r12 -/* 801138B8 00110818 4E 80 04 21 */ bctrl +/* 801138B8 00110818 4E 80 04 21 */ bctrl /* 801138BC 0011081C 7F A3 EB 78 */ mr r3, r29 /* 801138C0 00110820 38 81 00 4C */ addi r4, r1, 0x4c /* 801138C4 00110824 48 24 23 11 */ bl Draw__6CModelCFRC11CModelFlags @@ -1921,7 +1921,7 @@ lbl_801137A0: /* 801138F0 00110850 81 83 00 00 */ lwz r12, 0(r3) /* 801138F4 00110854 81 8C 00 30 */ lwz r12, 0x30(r12) /* 801138F8 00110858 7D 89 03 A6 */ mtctr r12 -/* 801138FC 0011085C 4E 80 04 21 */ bctrl +/* 801138FC 0011085C 4E 80 04 21 */ bctrl /* 80113900 00110860 7F A3 EB 78 */ mr r3, r29 /* 80113904 00110864 38 81 00 4C */ addi r4, r1, 0x4c /* 80113908 00110868 48 24 22 CD */ bl Draw__6CModelCFRC11CModelFlags @@ -1961,7 +1961,7 @@ lbl_8011390C: /* 8011398C 001108EC 81 83 00 00 */ lwz r12, 0(r3) /* 80113990 001108F0 81 8C 00 30 */ lwz r12, 0x30(r12) /* 80113994 001108F4 7D 89 03 A6 */ mtctr r12 -/* 80113998 001108F8 4E 80 04 21 */ bctrl +/* 80113998 001108F8 4E 80 04 21 */ bctrl /* 8011399C 001108FC 7F 83 E3 78 */ mr r3, r28 /* 801139A0 00110900 38 81 00 4C */ addi r4, r1, 0x4c /* 801139A4 00110904 48 24 22 31 */ bl Draw__6CModelCFRC11CModelFlags @@ -1974,7 +1974,7 @@ lbl_8011390C: /* 801139C0 00110920 81 83 00 00 */ lwz r12, 0(r3) /* 801139C4 00110924 81 8C 00 30 */ lwz r12, 0x30(r12) /* 801139C8 00110928 7D 89 03 A6 */ mtctr r12 -/* 801139CC 0011092C 4E 80 04 21 */ bctrl +/* 801139CC 0011092C 4E 80 04 21 */ bctrl /* 801139D0 00110930 7F 83 E3 78 */ mr r3, r28 /* 801139D4 00110934 38 81 00 4C */ addi r4, r1, 0x4c /* 801139D8 00110938 48 24 21 FD */ bl Draw__6CModelCFRC11CModelFlags @@ -1987,7 +1987,7 @@ lbl_8011390C: /* 801139F4 00110954 81 83 00 00 */ lwz r12, 0(r3) /* 801139F8 00110958 81 8C 00 30 */ lwz r12, 0x30(r12) /* 801139FC 0011095C 7D 89 03 A6 */ mtctr r12 -/* 80113A00 00110960 4E 80 04 21 */ bctrl +/* 80113A00 00110960 4E 80 04 21 */ bctrl /* 80113A04 00110964 7F 83 E3 78 */ mr r3, r28 /* 80113A08 00110968 38 81 00 4C */ addi r4, r1, 0x4c /* 80113A0C 0011096C 48 24 21 C9 */ bl Draw__6CModelCFRC11CModelFlags @@ -2004,7 +2004,7 @@ lbl_8011390C: /* 80113A38 00110998 81 83 00 00 */ lwz r12, 0(r3) /* 80113A3C 0011099C 81 8C 00 30 */ lwz r12, 0x30(r12) /* 80113A40 001109A0 7D 89 03 A6 */ mtctr r12 -/* 80113A44 001109A4 4E 80 04 21 */ bctrl +/* 80113A44 001109A4 4E 80 04 21 */ bctrl /* 80113A48 001109A8 7F 83 E3 78 */ mr r3, r28 /* 80113A4C 001109AC 38 81 00 4C */ addi r4, r1, 0x4c /* 80113A50 001109B0 48 24 21 85 */ bl Draw__6CModelCFRC11CModelFlags @@ -2025,7 +2025,7 @@ lbl_80113A54: /* 80113A88 001109E8 80 01 09 84 */ lwz r0, 0x984(r1) /* 80113A8C 001109EC 7C 08 03 A6 */ mtlr r0 /* 80113A90 001109F0 38 21 09 80 */ addi r1, r1, 0x980 -/* 80113A94 001109F4 4E 80 00 20 */ blr +/* 80113A94 001109F4 4E 80 00 20 */ blr .global DrawXRayEffect__12CPlayerVisorCFRC13CStateManager DrawXRayEffect__12CPlayerVisorCFRC13CStateManager: @@ -2037,11 +2037,11 @@ DrawXRayEffect__12CPlayerVisorCFRC13CStateManager: /* 80113AAC 00110A0C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80113AB0 00110A10 7C 08 03 A6 */ mtlr r0 /* 80113AB4 00110A14 38 21 00 10 */ addi r1, r1, 0x10 -/* 80113AB8 00110A18 4E 80 00 20 */ blr +/* 80113AB8 00110A18 4E 80 00 20 */ blr .global DrawThermalEffect__12CPlayerVisorCFRC13CStateManager DrawThermalEffect__12CPlayerVisorCFRC13CStateManager: -/* 80113ABC 00110A1C 4E 80 00 20 */ blr +/* 80113ABC 00110A1C 4E 80 00 20 */ blr .global Touch__12CPlayerVisorCFv Touch__12CPlayerVisorCFv: @@ -2066,7 +2066,7 @@ lbl_80113AFC: /* 80113B00 00110A60 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80113B04 00110A64 7C 08 03 A6 */ mtlr r0 /* 80113B08 00110A68 38 21 00 10 */ addi r1, r1, 0x10 -/* 80113B0C 00110A6C 4E 80 00 20 */ blr +/* 80113B0C 00110A6C 4E 80 00 20 */ blr .global Draw__12CPlayerVisorCFRC13CStateManagerPC17CTargetingManager Draw__12CPlayerVisorCFRC13CStateManagerPC17CTargetingManager: @@ -2119,7 +2119,7 @@ lbl_80113BA8: /* 80113BB4 00110B14 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80113BB8 00110B18 7C 08 03 A6 */ mtlr r0 /* 80113BBC 00110B1C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80113BC0 00110B20 4E 80 00 20 */ blr +/* 80113BC0 00110B20 4E 80 00 20 */ blr .global Update__12CPlayerVisorFfRC13CStateManager Update__12CPlayerVisorFfRC13CStateManager: @@ -2319,7 +2319,7 @@ lbl_80113E6C: /* 80113E78 00110DD8 80 01 00 74 */ lwz r0, 0x74(r1) /* 80113E7C 00110DDC 7C 08 03 A6 */ mtlr r0 /* 80113E80 00110DE0 38 21 00 70 */ addi r1, r1, 0x70 -/* 80113E84 00110DE4 4E 80 00 20 */ blr +/* 80113E84 00110DE4 4E 80 00 20 */ blr .global UpdateCurrentVisor__12CPlayerVisorFf UpdateCurrentVisor__12CPlayerVisorFf: @@ -2374,7 +2374,7 @@ lbl_80113F30: /* 80113F3C 00110E9C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80113F40 00110EA0 7C 08 03 A6 */ mtlr r0 /* 80113F44 00110EA4 38 21 00 30 */ addi r1, r1, 0x30 -/* 80113F48 00110EA8 4E 80 00 20 */ blr +/* 80113F48 00110EA8 4E 80 00 20 */ blr .global FinishTransitionIn__12CPlayerVisorFv FinishTransitionIn__12CPlayerVisorFv: @@ -2479,7 +2479,7 @@ lbl_801140B8: /* 801140BC 0011101C 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 801140C0 00111020 7C 08 03 A6 */ mtlr r0 /* 801140C4 00111024 38 21 00 30 */ addi r1, r1, 0x30 -/* 801140C8 00111028 4E 80 00 20 */ blr +/* 801140C8 00111028 4E 80 00 20 */ blr .global BeginTransitionIn__12CPlayerVisorFRC13CStateManager BeginTransitionIn__12CPlayerVisorFRC13CStateManager: @@ -2555,7 +2555,7 @@ lbl_801141C8: /* 801141CC 0011112C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801141D0 00111130 7C 08 03 A6 */ mtlr r0 /* 801141D4 00111134 38 21 00 20 */ addi r1, r1, 0x20 -/* 801141D8 00111138 4E 80 00 20 */ blr +/* 801141D8 00111138 4E 80 00 20 */ blr .global FinishTransitionOut__12CPlayerVisorFRC13CStateManager FinishTransitionOut__12CPlayerVisorFRC13CStateManager: @@ -2601,7 +2601,7 @@ lbl_80114260: /* 80114264 001111C4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80114268 001111C8 7C 08 03 A6 */ mtlr r0 /* 8011426C 001111CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80114270 001111D0 4E 80 00 20 */ blr +/* 80114270 001111D0 4E 80 00 20 */ blr .global BeginTransitionOut__12CPlayerVisorFv BeginTransitionOut__12CPlayerVisorFv: @@ -2677,7 +2677,7 @@ lbl_80114368: /* 8011436C 001112CC 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 80114370 001112D0 7C 08 03 A6 */ mtlr r0 /* 80114374 001112D4 38 21 00 30 */ addi r1, r1, 0x30 -/* 80114378 001112D8 4E 80 00 20 */ blr +/* 80114378 001112D8 4E 80 00 20 */ blr .global GetDesiredViewportScaleY__12CPlayerVisorCFRC13CStateManager GetDesiredViewportScaleY__12CPlayerVisorCFRC13CStateManager: @@ -2700,7 +2700,7 @@ lbl_801143B0: /* 801143B4 00111314 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801143B8 00111318 7C 08 03 A6 */ mtlr r0 /* 801143BC 0011131C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801143C0 00111320 4E 80 00 20 */ blr +/* 801143C0 00111320 4E 80 00 20 */ blr .global GetDesiredViewportScaleX__12CPlayerVisorCFRC13CStateManager GetDesiredViewportScaleX__12CPlayerVisorCFRC13CStateManager: @@ -2723,7 +2723,7 @@ lbl_801143F8: /* 801143FC 0011135C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80114400 00111360 7C 08 03 A6 */ mtlr r0 /* 80114404 00111364 38 21 00 10 */ addi r1, r1, 0x10 -/* 80114408 00111368 4E 80 00 20 */ blr +/* 80114408 00111368 4E 80 00 20 */ blr .global __dt__12CPlayerVisorFv __dt__12CPlayerVisorFv: @@ -2927,7 +2927,7 @@ lbl_801146AC: /* 801146BC 0011161C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 801146C0 00111620 7C 08 03 A6 */ mtlr r0 /* 801146C4 00111624 38 21 00 20 */ addi r1, r1, 0x20 -/* 801146C8 00111628 4E 80 00 20 */ blr +/* 801146C8 00111628 4E 80 00 20 */ blr .global __ct__12CPlayerVisorFRC13CStateManager __ct__12CPlayerVisorFRC13CStateManager: @@ -2987,7 +2987,7 @@ __ct__12CPlayerVisorFRC13CStateManager: /* 801147A0 00111700 81 84 00 00 */ lwz r12, 0(r4) /* 801147A4 00111704 81 8C 00 10 */ lwz r12, 0x10(r12) /* 801147A8 00111708 7D 89 03 A6 */ mtctr r12 -/* 801147AC 0011170C 4E 80 04 21 */ bctrl +/* 801147AC 0011170C 4E 80 04 21 */ bctrl /* 801147B0 00111710 3B DF 00 CC */ addi r30, r31, 0xcc /* 801147B4 00111714 38 81 00 64 */ addi r4, r1, 0x64 /* 801147B8 00111718 7F C3 F3 78 */ mr r3, r30 @@ -3005,7 +3005,7 @@ __ct__12CPlayerVisorFRC13CStateManager: /* 801147E8 00111748 38 A5 00 15 */ addi r5, r5, 0x15 /* 801147EC 0011174C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 801147F0 00111750 7D 89 03 A6 */ mtctr r12 -/* 801147F4 00111754 4E 80 04 21 */ bctrl +/* 801147F4 00111754 4E 80 04 21 */ bctrl /* 801147F8 00111758 3B DF 00 D8 */ addi r30, r31, 0xd8 /* 801147FC 0011175C 38 81 00 5C */ addi r4, r1, 0x5c /* 80114800 00111760 7F C3 F3 78 */ mr r3, r30 @@ -3023,7 +3023,7 @@ __ct__12CPlayerVisorFRC13CStateManager: /* 80114830 00111790 38 A5 00 2E */ addi r5, r5, 0x2e /* 80114834 00111794 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80114838 00111798 7D 89 03 A6 */ mtctr r12 -/* 8011483C 0011179C 4E 80 04 21 */ bctrl +/* 8011483C 0011179C 4E 80 04 21 */ bctrl /* 80114840 001117A0 3B DF 00 E4 */ addi r30, r31, 0xe4 /* 80114844 001117A4 38 81 00 54 */ addi r4, r1, 0x54 /* 80114848 001117A8 7F C3 F3 78 */ mr r3, r30 @@ -3041,7 +3041,7 @@ __ct__12CPlayerVisorFRC13CStateManager: /* 80114878 001117D8 38 A5 00 46 */ addi r5, r5, 0x46 /* 8011487C 001117DC 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80114880 001117E0 7D 89 03 A6 */ mtctr r12 -/* 80114884 001117E4 4E 80 04 21 */ bctrl +/* 80114884 001117E4 4E 80 04 21 */ bctrl /* 80114888 001117E8 3B DF 00 F0 */ addi r30, r31, 0xf0 /* 8011488C 001117EC 38 81 00 4C */ addi r4, r1, 0x4c /* 80114890 001117F0 7F C3 F3 78 */ mr r3, r30 @@ -3059,7 +3059,7 @@ __ct__12CPlayerVisorFRC13CStateManager: /* 801148C0 00111820 38 A5 00 60 */ addi r5, r5, 0x60 /* 801148C4 00111824 81 8C 00 10 */ lwz r12, 0x10(r12) /* 801148C8 00111828 7D 89 03 A6 */ mtctr r12 -/* 801148CC 0011182C 4E 80 04 21 */ bctrl +/* 801148CC 0011182C 4E 80 04 21 */ bctrl /* 801148D0 00111830 3B DF 00 FC */ addi r30, r31, 0xfc /* 801148D4 00111834 38 81 00 44 */ addi r4, r1, 0x44 /* 801148D8 00111838 7F C3 F3 78 */ mr r3, r30 @@ -3077,7 +3077,7 @@ __ct__12CPlayerVisorFRC13CStateManager: /* 80114908 00111868 38 A5 00 79 */ addi r5, r5, 0x79 /* 8011490C 0011186C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80114910 00111870 7D 89 03 A6 */ mtctr r12 -/* 80114914 00111874 4E 80 04 21 */ bctrl +/* 80114914 00111874 4E 80 04 21 */ bctrl /* 80114918 00111878 3B DF 01 08 */ addi r30, r31, 0x108 /* 8011491C 0011187C 38 81 00 3C */ addi r4, r1, 0x3c /* 80114920 00111880 7F C3 F3 78 */ mr r3, r30 @@ -3095,7 +3095,7 @@ __ct__12CPlayerVisorFRC13CStateManager: /* 80114950 001118B0 38 A5 00 8A */ addi r5, r5, 0x8a /* 80114954 001118B4 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80114958 001118B8 7D 89 03 A6 */ mtctr r12 -/* 8011495C 001118BC 4E 80 04 21 */ bctrl +/* 8011495C 001118BC 4E 80 04 21 */ bctrl /* 80114960 001118C0 3B DF 01 14 */ addi r30, r31, 0x114 /* 80114964 001118C4 38 81 00 34 */ addi r4, r1, 0x34 /* 80114968 001118C8 7F C3 F3 78 */ mr r3, r30 @@ -3115,7 +3115,7 @@ __ct__12CPlayerVisorFRC13CStateManager: /* 801149A0 00111900 81 84 00 00 */ lwz r12, 0(r4) /* 801149A4 00111904 81 8C 00 10 */ lwz r12, 0x10(r12) /* 801149A8 00111908 7D 89 03 A6 */ mtctr r12 -/* 801149AC 0011190C 4E 80 04 21 */ bctrl +/* 801149AC 0011190C 4E 80 04 21 */ bctrl /* 801149B0 00111910 3B DF 01 24 */ addi r30, r31, 0x124 /* 801149B4 00111914 38 81 00 2C */ addi r4, r1, 0x2c /* 801149B8 00111918 7F C3 F3 78 */ mr r3, r30 @@ -3133,7 +3133,7 @@ __ct__12CPlayerVisorFRC13CStateManager: /* 801149E8 00111948 38 A5 00 B3 */ addi r5, r5, 0xb3 /* 801149EC 0011194C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 801149F0 00111950 7D 89 03 A6 */ mtctr r12 -/* 801149F4 00111954 4E 80 04 21 */ bctrl +/* 801149F4 00111954 4E 80 04 21 */ bctrl /* 801149F8 00111958 3B DF 01 30 */ addi r30, r31, 0x130 /* 801149FC 0011195C 38 81 00 24 */ addi r4, r1, 0x24 /* 80114A00 00111960 7F C3 F3 78 */ mr r3, r30 @@ -3222,7 +3222,7 @@ lbl_80114B08: /* 80114B28 00111A88 38 A5 00 C9 */ addi r5, r5, 0xc9 /* 80114B2C 00111A8C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80114B30 00111A90 7D 89 03 A6 */ mtctr r12 -/* 80114B34 00111A94 4E 80 04 21 */ bctrl +/* 80114B34 00111A94 4E 80 04 21 */ bctrl /* 80114B38 00111A98 3B DF 05 40 */ addi r30, r31, 0x540 /* 80114B3C 00111A9C 38 81 00 1C */ addi r4, r1, 0x1c /* 80114B40 00111AA0 7F C3 F3 78 */ mr r3, r30 diff --git a/asm/MetroidPrime/Player/CSamusFaceReflection.s b/asm/MetroidPrime/Player/CSamusFaceReflection.s index 52077921..efcbfabb 100644 --- a/asm/MetroidPrime/Player/CSamusFaceReflection.s +++ b/asm/MetroidPrime/Player/CSamusFaceReflection.s @@ -17,7 +17,7 @@ lbl_805A786C: .global lbl_8046C7A0 lbl_8046C7A0: .skip 0x30 - + .section .text, "ax" .global Draw__20CSamusFaceReflectionCFRC13CStateManager @@ -288,7 +288,7 @@ lbl_8015B154: /* 8015B1C8 00158128 83 A1 01 54 */ lwz r29, 0x154(r1) /* 8015B1CC 0015812C 7C 08 03 A6 */ mtlr r0 /* 8015B1D0 00158130 38 21 02 30 */ addi r1, r1, 0x230 -/* 8015B1D4 00158134 4E 80 00 20 */ blr +/* 8015B1D4 00158134 4E 80 00 20 */ blr .global PreDraw__20CSamusFaceReflectionFRC13CStateManager PreDraw__20CSamusFaceReflectionFRC13CStateManager: @@ -336,7 +336,7 @@ lbl_8015B264: /* 8015B26C 001581CC 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8015B270 001581D0 7C 08 03 A6 */ mtlr r0 /* 8015B274 001581D4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8015B278 001581D8 4E 80 00 20 */ blr +/* 8015B278 001581D8 4E 80 00 20 */ blr .global Update__20CSamusFaceReflectionFfRC13CStateManagerR9CRandom16 Update__20CSamusFaceReflectionFfRC13CStateManagerR9CRandom16: @@ -587,7 +587,7 @@ lbl_8015B610: /* 8015B640 001585A0 83 81 01 C0 */ lwz r28, 0x1c0(r1) /* 8015B644 001585A4 7C 08 03 A6 */ mtlr r0 /* 8015B648 001585A8 38 21 02 10 */ addi r1, r1, 0x210 -/* 8015B64C 001585AC 4E 80 00 20 */ blr +/* 8015B64C 001585AC 4E 80 00 20 */ blr .global __ct__20CSamusFaceReflectionFRC13CStateManager __ct__20CSamusFaceReflectionFRC13CStateManager: @@ -601,7 +601,7 @@ __ct__20CSamusFaceReflectionFRC13CStateManager: /* 8015B66C 001585CC 81 83 00 00 */ lwz r12, 0(r3) /* 8015B670 001585D0 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 8015B674 001585D4 7D 89 03 A6 */ mtctr r12 -/* 8015B678 001585D8 4E 80 04 21 */ bctrl +/* 8015B678 001585D8 4E 80 04 21 */ bctrl /* 8015B67C 001585DC 80 83 00 04 */ lwz r4, 4(r3) /* 8015B680 001585E0 38 A0 00 01 */ li r5, 1 /* 8015B684 001585E4 C0 02 9E AC */ lfs f0, lbl_805ABBCC@sda21(r2) @@ -694,7 +694,7 @@ lbl_8015B738: /* 8015B7DC 0015873C 83 E1 00 AC */ lwz r31, 0xac(r1) /* 8015B7E0 00158740 7C 08 03 A6 */ mtlr r0 /* 8015B7E4 00158744 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 8015B7E8 00158748 4E 80 00 20 */ blr +/* 8015B7E8 00158748 4E 80 00 20 */ blr .global __sinit_CSamusFaceReflection_cpp __sinit_CSamusFaceReflection_cpp: diff --git a/asm/MetroidPrime/Player/CSaveWorld.s b/asm/MetroidPrime/Player/CSaveWorld.s index 5f0ec29b..2161b8b1 100644 --- a/asm/MetroidPrime/Player/CSaveWorld.s +++ b/asm/MetroidPrime/Player/CSaveWorld.s @@ -81,7 +81,7 @@ lbl_80248EB0: /* 80248EB8 00245E18 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80248EBC 00245E1C 7C 08 03 A6 */ mtlr r0 /* 80248EC0 00245E20 38 21 00 30 */ addi r1, r1, 0x30 -/* 80248EC4 00245E24 4E 80 00 20 */ blr +/* 80248EC4 00245E24 4E 80 00 20 */ blr .global GetFrontEndName__16CSaveWorldMemoryCFv GetFrontEndName__16CSaveWorldMemoryCFv: @@ -103,7 +103,7 @@ lbl_80248EFC: /* 80248EFC 00245E5C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80248F00 00245E60 7C 08 03 A6 */ mtlr r0 /* 80248F04 00245E64 38 21 00 10 */ addi r1, r1, 0x10 -/* 80248F08 00245E68 4E 80 00 20 */ blr +/* 80248F08 00245E68 4E 80 00 20 */ blr .global GetSaveWorldMemory__14CMemoryCardSysCFi GetSaveWorldMemory__14CMemoryCardSysCFi: @@ -151,7 +151,7 @@ lbl_80248FA0: /* 80248FA8 00245F08 38 63 00 04 */ addi r3, r3, 4 /* 80248FAC 00245F0C 7C 08 03 A6 */ mtlr r0 /* 80248FB0 00245F10 38 21 00 40 */ addi r1, r1, 0x40 -/* 80248FB4 00245F14 4E 80 00 20 */ blr +/* 80248FB4 00245F14 4E 80 00 20 */ blr .global HasSaveWorldMemory__15CMemoryCardSysFi HasSaveWorldMemory__15CMemoryCardSysFi: @@ -209,7 +209,7 @@ lbl_80249054: /* 8024907C 00245FDC 80 01 00 44 */ lwz r0, 0x44(r1) /* 80249080 00245FE0 7C 08 03 A6 */ mtlr r0 /* 80249084 00245FE4 38 21 00 40 */ addi r1, r1, 0x40 -/* 80249088 00245FE8 4E 80 00 20 */ blr +/* 80249088 00245FE8 4E 80 00 20 */ blr .global InitializePump__14CMemoryCardSysFv InitializePump__14CMemoryCardSysFv: @@ -475,7 +475,7 @@ lbl_80249404: /* 80249420 00246380 81 83 00 00 */ lwz r12, 0(r3) /* 80249424 00246384 81 8C 00 18 */ lwz r12, 0x18(r12) /* 80249428 00246388 7D 89 03 A6 */ mtctr r12 -/* 8024942C 0024638C 4E 80 04 21 */ bctrl +/* 8024942C 0024638C 4E 80 04 21 */ bctrl /* 80249430 00246390 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80249434 00246394 41 82 00 A8 */ beq lbl_802494DC /* 80249438 00246398 80 8D A0 64 */ lwz r4, gpSimplePool@sda21(r13) @@ -484,7 +484,7 @@ lbl_80249404: /* 80249444 002463A4 81 84 00 00 */ lwz r12, 0(r4) /* 80249448 002463A8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8024944C 002463AC 7D 89 03 A6 */ mtctr r12 -/* 80249450 002463B0 4E 80 04 21 */ bctrl +/* 80249450 002463B0 4E 80 04 21 */ bctrl /* 80249454 002463B4 38 61 00 50 */ addi r3, r1, 0x50 /* 80249458 002463B8 38 81 00 38 */ addi r4, r1, 0x38 /* 8024945C 002463BC 48 0F 7A 4D */ bl __ct__6CTokenFRC6CToken @@ -560,7 +560,7 @@ lbl_80249550: /* 80249554 002464B4 80 01 00 84 */ lwz r0, 0x84(r1) /* 80249558 002464B8 7C 08 03 A6 */ mtlr r0 /* 8024955C 002464BC 38 21 00 80 */ addi r1, r1, 0x80 -/* 80249560 002464C0 4E 80 00 20 */ blr +/* 80249560 002464C0 4E 80 00 20 */ blr .global sub_80249564 sub_80249564: @@ -581,7 +581,7 @@ sub_80249564: /* 8024959C 002464FC 83 C1 00 08 */ lwz r30, 8(r1) /* 802495A0 00246500 7C 08 03 A6 */ mtlr r0 /* 802495A4 00246504 38 21 00 10 */ addi r1, r1, 0x10 -/* 802495A8 00246508 4E 80 00 20 */ blr +/* 802495A8 00246508 4E 80 00 20 */ blr .global sub_802495ac sub_802495ac: @@ -621,7 +621,7 @@ lbl_8024961C: /* 80249628 00246588 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8024962C 0024658C 7C 08 03 A6 */ mtlr r0 /* 80249630 00246590 38 21 00 20 */ addi r1, r1, 0x20 -/* 80249634 00246594 4E 80 00 20 */ blr +/* 80249634 00246594 4E 80 00 20 */ blr .global sub_80249638 sub_80249638: @@ -646,7 +646,7 @@ lbl_80249664: /* 80249678 002465D8 83 C1 00 08 */ lwz r30, 8(r1) /* 8024967C 002465DC 7C 08 03 A6 */ mtlr r0 /* 80249680 002465E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80249684 002465E4 4E 80 00 20 */ blr +/* 80249684 002465E4 4E 80 00 20 */ blr .global sub_80249688 sub_80249688: @@ -658,7 +658,7 @@ sub_80249688: /* 8024969C 002465FC 80 01 00 14 */ lwz r0, 0x14(r1) /* 802496A0 00246600 7C 08 03 A6 */ mtlr r0 /* 802496A4 00246604 38 21 00 10 */ addi r1, r1, 0x10 -/* 802496A8 00246608 4E 80 00 20 */ blr +/* 802496A8 00246608 4E 80 00 20 */ blr .global sub_802496ac sub_802496ac: @@ -699,7 +699,7 @@ lbl_80249708: /* 8024972C 0024668C 38 80 00 01 */ li r4, 1 /* 80249730 00246690 81 8C 00 08 */ lwz r12, 8(r12) /* 80249734 00246694 7D 89 03 A6 */ mtctr r12 -/* 80249738 00246698 4E 80 04 21 */ bctrl +/* 80249738 00246698 4E 80 04 21 */ bctrl lbl_8024973C: /* 8024973C 0024669C 34 1E 00 1C */ addic. r0, r30, 0x1c /* 80249740 002466A0 41 82 00 44 */ beq lbl_80249784 @@ -755,7 +755,7 @@ lbl_802497DC: /* 802497EC 0024674C 83 A1 00 34 */ lwz r29, 0x34(r1) /* 802497F0 00246750 7C 08 03 A6 */ mtlr r0 /* 802497F4 00246754 38 21 00 40 */ addi r1, r1, 0x40 -/* 802497F8 00246758 4E 80 00 20 */ blr +/* 802497F8 00246758 4E 80 00 20 */ blr .global InitializePump__20CMemorySomethingElseFv InitializePump__20CMemorySomethingElseFv: @@ -770,7 +770,7 @@ InitializePump__20CMemorySomethingElseFv: /* 8024981C 0024677C 81 83 00 00 */ lwz r12, 0(r3) /* 80249820 00246780 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80249824 00246784 7D 89 03 A6 */ mtctr r12 -/* 80249828 00246788 4E 80 04 21 */ bctrl +/* 80249828 00246788 4E 80 04 21 */ bctrl /* 8024982C 0024678C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80249830 00246790 41 82 03 60 */ beq lbl_80249B90 /* 80249834 00246794 83 BF 00 30 */ lwz r29, 0x30(r31) @@ -778,19 +778,19 @@ InitializePump__20CMemorySomethingElseFv: /* 8024983C 0024679C 7F A3 EB 78 */ mr r3, r29 /* 80249840 002467A0 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80249844 002467A4 7D 89 03 A6 */ mtctr r12 -/* 80249848 002467A8 4E 80 04 21 */ bctrl +/* 80249848 002467A8 4E 80 04 21 */ bctrl /* 8024984C 002467AC 90 7F 00 04 */ stw r3, 4(r31) /* 80249850 002467B0 7F A3 EB 78 */ mr r3, r29 /* 80249854 002467B4 81 9D 00 00 */ lwz r12, 0(r29) /* 80249858 002467B8 81 8C 00 14 */ lwz r12, 0x14(r12) /* 8024985C 002467BC 7D 89 03 A6 */ mtctr r12 -/* 80249860 002467C0 4E 80 04 21 */ bctrl +/* 80249860 002467C0 4E 80 04 21 */ bctrl /* 80249864 002467C4 90 7F 00 08 */ stw r3, 8(r31) /* 80249868 002467C8 7F A3 EB 78 */ mr r3, r29 /* 8024986C 002467CC 81 9D 00 00 */ lwz r12, 0(r29) /* 80249870 002467D0 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80249874 002467D4 7D 89 03 A6 */ mtctr r12 -/* 80249878 002467D8 4E 80 04 21 */ bctrl +/* 80249878 002467D8 4E 80 04 21 */ bctrl /* 8024987C 002467DC 7C 60 1B 78 */ mr r0, r3 /* 80249880 002467E0 38 7F 00 0C */ addi r3, r31, 0xc /* 80249884 002467E4 7C 1C 03 78 */ mr r28, r0 @@ -806,11 +806,11 @@ lbl_80249898: /* 802498A8 00246808 93 61 00 08 */ stw r27, 8(r1) /* 802498AC 0024680C 81 8C 00 20 */ lwz r12, 0x20(r12) /* 802498B0 00246810 7D 89 03 A6 */ mtctr r12 -/* 802498B4 00246814 4E 80 04 21 */ bctrl +/* 802498B4 00246814 4E 80 04 21 */ bctrl /* 802498B8 00246818 81 83 00 00 */ lwz r12, 0(r3) /* 802498BC 0024681C 81 8C 00 24 */ lwz r12, 0x24(r12) /* 802498C0 00246820 7D 89 03 A6 */ mtctr r12 -/* 802498C4 00246824 4E 80 04 21 */ bctrl +/* 802498C4 00246824 4E 80 04 21 */ bctrl /* 802498C8 00246828 80 1F 00 10 */ lwz r0, 0x10(r31) /* 802498CC 0024682C 7C 7E 1B 78 */ mr r30, r3 /* 802498D0 00246830 80 BF 00 14 */ lwz r5, 0x14(r31) @@ -842,7 +842,7 @@ lbl_8024991C: /* 80249928 00246888 81 9D 00 00 */ lwz r12, 0(r29) /* 8024992C 0024688C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80249930 00246890 7D 89 03 A6 */ mtctr r12 -/* 80249934 00246894 4E 80 04 21 */ bctrl +/* 80249934 00246894 4E 80 04 21 */ bctrl /* 80249938 00246898 7C 64 1B 78 */ mr r4, r3 /* 8024993C 0024689C 80 6D A0 80 */ lwz r3, gpGameState@sda21(r13) /* 80249940 002468A0 4B F8 A0 99 */ bl StateForWorld__10CGameStateFUi @@ -876,7 +876,7 @@ lbl_8024991C: /* 802499B0 00246910 81 84 00 00 */ lwz r12, 0(r4) /* 802499B4 00246914 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802499B8 00246918 7D 89 03 A6 */ mtctr r12 -/* 802499BC 0024691C 4E 80 04 21 */ bctrl +/* 802499BC 0024691C 4E 80 04 21 */ bctrl /* 802499C0 00246920 7F A3 EB 78 */ mr r3, r29 /* 802499C4 00246924 38 81 00 20 */ addi r4, r1, 0x20 /* 802499C8 00246928 3B C0 00 01 */ li r30, 1 @@ -954,7 +954,7 @@ lbl_80249A90: /* 80249AC8 00246A28 38 80 00 01 */ li r4, 1 /* 80249ACC 00246A2C 81 8C 00 08 */ lwz r12, 8(r12) /* 80249AD0 00246A30 7D 89 03 A6 */ mtctr r12 -/* 80249AD4 00246A34 4E 80 04 21 */ bctrl +/* 80249AD4 00246A34 4E 80 04 21 */ bctrl lbl_80249AD8: /* 80249AD8 00246A38 88 61 00 10 */ lbz r3, 0x10(r1) /* 80249ADC 00246A3C 38 00 00 00 */ li r0, 0 @@ -973,7 +973,7 @@ lbl_80249AF0: /* 80249B0C 00246A6C 38 80 00 01 */ li r4, 1 /* 80249B10 00246A70 81 8C 00 08 */ lwz r12, 8(r12) /* 80249B14 00246A74 7D 89 03 A6 */ mtctr r12 -/* 80249B18 00246A78 4E 80 04 21 */ bctrl +/* 80249B18 00246A78 4E 80 04 21 */ bctrl /* 80249B1C 00246A7C 48 00 00 74 */ b lbl_80249B90 lbl_80249B20: /* 80249B20 00246A80 83 BF 00 38 */ lwz r29, 0x38(r31) @@ -1015,7 +1015,7 @@ lbl_80249B94: /* 80249B98 00246AF8 80 01 00 54 */ lwz r0, 0x54(r1) /* 80249B9C 00246AFC 7C 08 03 A6 */ mtlr r0 /* 80249BA0 00246B00 38 21 00 50 */ addi r1, r1, 0x50 -/* 80249BA4 00246B04 4E 80 00 20 */ blr +/* 80249BA4 00246B04 4E 80 00 20 */ blr .global __ct__20CMemorySomethingElseFUiUi __ct__20CMemorySomethingElseFUiUi: @@ -1071,7 +1071,7 @@ lbl_80249C28: /* 80249C68 00246BC8 38 80 00 01 */ li r4, 1 /* 80249C6C 00246BCC 81 8C 00 08 */ lwz r12, 8(r12) /* 80249C70 00246BD0 7D 89 03 A6 */ mtctr r12 -/* 80249C74 00246BD4 4E 80 04 21 */ bctrl +/* 80249C74 00246BD4 4E 80 04 21 */ bctrl lbl_80249C78: /* 80249C78 00246BD8 88 61 00 20 */ lbz r3, 0x20(r1) /* 80249C7C 00246BDC 38 00 00 00 */ li r0, 0 @@ -1090,7 +1090,7 @@ lbl_80249C90: /* 80249CAC 00246C0C 38 80 00 01 */ li r4, 1 /* 80249CB0 00246C10 81 8C 00 08 */ lwz r12, 8(r12) /* 80249CB4 00246C14 7D 89 03 A6 */ mtctr r12 -/* 80249CB8 00246C18 4E 80 04 21 */ bctrl +/* 80249CB8 00246C18 4E 80 04 21 */ bctrl /* 80249CBC 00246C1C 48 00 01 20 */ b lbl_80249DDC lbl_80249CC0: /* 80249CC0 00246C20 3C 60 80 3D */ lis r3, lbl_803D4780@ha @@ -1111,7 +1111,7 @@ lbl_80249CC0: /* 80249CFC 00246C5C 81 84 00 00 */ lwz r12, 0(r4) /* 80249D00 00246C60 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80249D04 00246C64 7D 89 03 A6 */ mtctr r12 -/* 80249D08 00246C68 4E 80 04 21 */ bctrl +/* 80249D08 00246C68 4E 80 04 21 */ bctrl /* 80249D0C 00246C6C 7F 63 DB 78 */ mr r3, r27 /* 80249D10 00246C70 38 81 00 10 */ addi r4, r1, 0x10 /* 80249D14 00246C74 3B 80 00 01 */ li r28, 1 @@ -1181,7 +1181,7 @@ lbl_80249DDC: /* 80249DF4 00246D54 80 01 00 44 */ lwz r0, 0x44(r1) /* 80249DF8 00246D58 7C 08 03 A6 */ mtlr r0 /* 80249DFC 00246D5C 38 21 00 40 */ addi r1, r1, 0x40 -/* 80249E00 00246D60 4E 80 00 20 */ blr +/* 80249E00 00246D60 4E 80 00 20 */ blr .global __dt__14CMemoryCardSysFv __dt__14CMemoryCardSysFv: @@ -1266,7 +1266,7 @@ lbl_80249F08: /* 80249F14 00246E74 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80249F18 00246E78 7C 08 03 A6 */ mtlr r0 /* 80249F1C 00246E7C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80249F20 00246E80 4E 80 00 20 */ blr +/* 80249F20 00246E80 4E 80 00 20 */ blr .global sub_80249f24 sub_80249f24: @@ -1306,7 +1306,7 @@ lbl_80249F94: /* 80249FA0 00246F00 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80249FA4 00246F04 7C 08 03 A6 */ mtlr r0 /* 80249FA8 00246F08 38 21 00 20 */ addi r1, r1, 0x20 -/* 80249FAC 00246F0C 4E 80 00 20 */ blr +/* 80249FAC 00246F0C 4E 80 00 20 */ blr .global sub_80249fb0 sub_80249fb0: @@ -1331,7 +1331,7 @@ lbl_80249FDC: /* 80249FF0 00246F50 83 C1 00 08 */ lwz r30, 8(r1) /* 80249FF4 00246F54 7C 08 03 A6 */ mtlr r0 /* 80249FF8 00246F58 38 21 00 10 */ addi r1, r1, 0x10 -/* 80249FFC 00246F5C 4E 80 00 20 */ blr +/* 80249FFC 00246F5C 4E 80 00 20 */ blr .global sub_8024a000 sub_8024a000: @@ -1343,7 +1343,7 @@ sub_8024a000: /* 8024A014 00246F74 80 01 00 14 */ lwz r0, 0x14(r1) /* 8024A018 00246F78 7C 08 03 A6 */ mtlr r0 /* 8024A01C 00246F7C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024A020 00246F80 4E 80 00 20 */ blr +/* 8024A020 00246F80 4E 80 00 20 */ blr .global sub_8024a024 sub_8024a024: @@ -1369,7 +1369,7 @@ lbl_8024A060: /* 8024A06C 00246FCC 83 C1 00 08 */ lwz r30, 8(r1) /* 8024A070 00246FD0 7C 08 03 A6 */ mtlr r0 /* 8024A074 00246FD4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024A078 00246FD8 4E 80 00 20 */ blr +/* 8024A078 00246FD8 4E 80 00 20 */ blr .global sub_8024a07c sub_8024a07c: @@ -1461,7 +1461,7 @@ lbl_8024A198: /* 8024A1A4 00247104 83 C1 00 28 */ lwz r30, 0x28(r1) /* 8024A1A8 00247108 7C 08 03 A6 */ mtlr r0 /* 8024A1AC 0024710C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8024A1B0 00247110 4E 80 00 20 */ blr +/* 8024A1B0 00247110 4E 80 00 20 */ blr .global sub_8024a1b4 sub_8024a1b4: @@ -1487,7 +1487,7 @@ lbl_8024A1F0: /* 8024A1FC 0024715C 83 C1 00 08 */ lwz r30, 8(r1) /* 8024A200 00247160 7C 08 03 A6 */ mtlr r0 /* 8024A204 00247164 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024A208 00247168 4E 80 00 20 */ blr +/* 8024A208 00247168 4E 80 00 20 */ blr .global __ct__14CMemoryCardSysFv __ct__14CMemoryCardSysFv: @@ -1504,7 +1504,7 @@ __ct__14CMemoryCardSysFv: /* 8024A234 00247194 81 84 00 00 */ lwz r12, 0(r4) /* 8024A238 00247198 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8024A23C 0024719C 7D 89 03 A6 */ mtctr r12 -/* 8024A240 002471A0 4E 80 04 21 */ bctrl +/* 8024A240 002471A0 4E 80 04 21 */ bctrl /* 8024A244 002471A4 7F A3 EB 78 */ mr r3, r29 /* 8024A248 002471A8 38 81 00 38 */ addi r4, r1, 0x38 /* 8024A24C 002471AC 48 0F 6C 5D */ bl __ct__6CTokenFRC6CToken @@ -1731,7 +1731,7 @@ lbl_8024A54C: /* 8024A578 002474D8 80 01 01 54 */ lwz r0, 0x154(r1) /* 8024A57C 002474DC 7C 08 03 A6 */ mtlr r0 /* 8024A580 002474E0 38 21 01 50 */ addi r1, r1, 0x150 -/* 8024A584 002474E4 4E 80 00 20 */ blr +/* 8024A584 002474E4 4E 80 00 20 */ blr .global sub_8024a588 sub_8024a588: @@ -1767,7 +1767,7 @@ lbl_8024A5C8: /* 8024A5F4 00247554 80 01 00 14 */ lwz r0, 0x14(r1) /* 8024A5F8 00247558 7C 08 03 A6 */ mtlr r0 /* 8024A5FC 0024755C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024A600 00247560 4E 80 00 20 */ blr +/* 8024A600 00247560 4E 80 00 20 */ blr .global sub_8024a604 sub_8024a604: @@ -1781,7 +1781,7 @@ lbl_8024A61C: /* 8024A61C 0024757C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8024A620 00247580 7C 08 03 A6 */ mtlr r0 /* 8024A624 00247584 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024A628 00247588 4E 80 00 20 */ blr +/* 8024A628 00247588 4E 80 00 20 */ blr .global sub_8024a62c sub_8024a62c: @@ -1905,7 +1905,7 @@ lbl_8024A798: /* 8024A7D0 00247730 80 01 00 14 */ lwz r0, 0x14(r1) /* 8024A7D4 00247734 7C 08 03 A6 */ mtlr r0 /* 8024A7D8 00247738 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024A7DC 0024773C 4E 80 00 20 */ blr +/* 8024A7DC 0024773C 4E 80 00 20 */ blr .global sub_8024a7e0 sub_8024a7e0: @@ -1947,7 +1947,7 @@ sub_8024a7e0: /* 8024A86C 002477CC 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8024A870 002477D0 7C 08 03 A6 */ mtlr r0 /* 8024A874 002477D4 38 21 00 30 */ addi r1, r1, 0x30 -/* 8024A878 002477D8 4E 80 00 20 */ blr +/* 8024A878 002477D8 4E 80 00 20 */ blr .global sub_8024a87c sub_8024a87c: @@ -2115,7 +2115,7 @@ lbl_8024AAB4: /* 8024AAB8 00247A18 80 01 00 44 */ lwz r0, 0x44(r1) /* 8024AABC 00247A1C 7C 08 03 A6 */ mtlr r0 /* 8024AAC0 00247A20 38 21 00 40 */ addi r1, r1, 0x40 -/* 8024AAC4 00247A24 4E 80 00 20 */ blr +/* 8024AAC4 00247A24 4E 80 00 20 */ blr .global sub_8024aac8 sub_8024aac8: @@ -2139,7 +2139,7 @@ lbl_8024AAF4: /* 8024AB04 00247A64 83 C1 00 08 */ lwz r30, 8(r1) /* 8024AB08 00247A68 7C 08 03 A6 */ mtlr r0 /* 8024AB0C 00247A6C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024AB10 00247A70 4E 80 00 20 */ blr +/* 8024AB10 00247A70 4E 80 00 20 */ blr .global sub_8024ab14 sub_8024ab14: @@ -2153,7 +2153,7 @@ lbl_8024AB2C: /* 8024AB2C 00247A8C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8024AB30 00247A90 7C 08 03 A6 */ mtlr r0 /* 8024AB34 00247A94 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024AB38 00247A98 4E 80 00 20 */ blr +/* 8024AB38 00247A98 4E 80 00 20 */ blr .global sub_8024ab3c sub_8024ab3c: @@ -2172,7 +2172,7 @@ sub_8024ab3c: /* 8024AB6C 00247ACC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8024AB70 00247AD0 7C 08 03 A6 */ mtlr r0 /* 8024AB74 00247AD4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024AB78 00247AD8 4E 80 00 20 */ blr +/* 8024AB78 00247AD8 4E 80 00 20 */ blr .global __ct__16CSaveWorldMemoryFRC16CSaveWorldMemory __ct__16CSaveWorldMemoryFRC16CSaveWorldMemory: @@ -2313,7 +2313,7 @@ lbl_8024AD48: /* 8024AD5C 00247CBC 83 81 00 10 */ lwz r28, 0x10(r1) /* 8024AD60 00247CC0 7C 08 03 A6 */ mtlr r0 /* 8024AD64 00247CC4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8024AD68 00247CC8 4E 80 00 20 */ blr +/* 8024AD68 00247CC8 4E 80 00 20 */ blr .global sub_8024ad6c sub_8024ad6c: @@ -2332,7 +2332,7 @@ sub_8024ad6c: /* 8024AD9C 00247CFC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8024ADA0 00247D00 7C 08 03 A6 */ mtlr r0 /* 8024ADA4 00247D04 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024ADA8 00247D08 4E 80 00 20 */ blr +/* 8024ADA8 00247D08 4E 80 00 20 */ blr .global sub_8024adac sub_8024adac: @@ -2352,7 +2352,7 @@ sub_8024adac: /* 8024ADE0 00247D40 80 01 00 24 */ lwz r0, 0x24(r1) /* 8024ADE4 00247D44 7C 08 03 A6 */ mtlr r0 /* 8024ADE8 00247D48 38 21 00 20 */ addi r1, r1, 0x20 -/* 8024ADEC 00247D4C 4E 80 00 20 */ blr +/* 8024ADEC 00247D4C 4E 80 00 20 */ blr .global sub_8024adf0 sub_8024adf0: @@ -2361,7 +2361,7 @@ sub_8024adf0: /* 8024ADF8 00247D58 7C 03 00 50 */ subf r0, r3, r0 /* 8024ADFC 00247D5C 7C 00 16 70 */ srawi r0, r0, 2 /* 8024AE00 00247D60 7C 60 01 94 */ addze r3, r0 -/* 8024AE04 00247D64 4E 80 00 20 */ blr +/* 8024AE04 00247D64 4E 80 00 20 */ blr .global sub_8024ae08 sub_8024ae08: @@ -2415,7 +2415,7 @@ lbl_8024AEA4: /* 8024AEB8 00247E18 80 01 00 34 */ lwz r0, 0x34(r1) /* 8024AEBC 00247E1C 7C 08 03 A6 */ mtlr r0 /* 8024AEC0 00247E20 38 21 00 30 */ addi r1, r1, 0x30 -/* 8024AEC4 00247E24 4E 80 00 20 */ blr +/* 8024AEC4 00247E24 4E 80 00 20 */ blr .global sub_8024aec8 sub_8024aec8: @@ -2469,7 +2469,7 @@ lbl_8024AF64: /* 8024AF78 00247ED8 80 01 00 34 */ lwz r0, 0x34(r1) /* 8024AF7C 00247EDC 7C 08 03 A6 */ mtlr r0 /* 8024AF80 00247EE0 38 21 00 30 */ addi r1, r1, 0x30 -/* 8024AF84 00247EE4 4E 80 00 20 */ blr +/* 8024AF84 00247EE4 4E 80 00 20 */ blr .global sub_8024af88 sub_8024af88: @@ -2528,7 +2528,7 @@ lbl_8024B03C: /* 8024B048 00247FA8 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8024B04C 00247FAC 7C 08 03 A6 */ mtlr r0 /* 8024B050 00247FB0 38 21 00 30 */ addi r1, r1, 0x30 -/* 8024B054 00247FB4 4E 80 00 20 */ blr +/* 8024B054 00247FB4 4E 80 00 20 */ blr .global sub_8024b058 sub_8024b058: @@ -2559,7 +2559,7 @@ lbl_8024B094: /* 8024B0B0 00248010 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8024B0B4 00248014 7C 08 03 A6 */ mtlr r0 /* 8024B0B8 00248018 38 21 00 20 */ addi r1, r1, 0x20 -/* 8024B0BC 0024801C 4E 80 00 20 */ blr +/* 8024B0BC 0024801C 4E 80 00 20 */ blr .global sub_8024b0c0 sub_8024b0c0: @@ -2618,7 +2618,7 @@ lbl_8024B174: /* 8024B180 002480E0 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8024B184 002480E4 7C 08 03 A6 */ mtlr r0 /* 8024B188 002480E8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8024B18C 002480EC 4E 80 00 20 */ blr +/* 8024B18C 002480EC 4E 80 00 20 */ blr .global sub_8024b190 sub_8024b190: @@ -2642,7 +2642,7 @@ lbl_8024B1BC: /* 8024B1CC 0024812C 83 C1 00 08 */ lwz r30, 8(r1) /* 8024B1D0 00248130 7C 08 03 A6 */ mtlr r0 /* 8024B1D4 00248134 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024B1D8 00248138 4E 80 00 20 */ blr +/* 8024B1D8 00248138 4E 80 00 20 */ blr .global sub_8024b1dc sub_8024b1dc: @@ -2673,7 +2673,7 @@ lbl_8024B218: /* 8024B234 00248194 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8024B238 00248198 7C 08 03 A6 */ mtlr r0 /* 8024B23C 0024819C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8024B240 002481A0 4E 80 00 20 */ blr +/* 8024B240 002481A0 4E 80 00 20 */ blr .global sub_8024b244 sub_8024b244: @@ -2687,7 +2687,7 @@ sub_8024b244: /* 8024B260 002481C0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8024B264 002481C4 7C 08 03 A6 */ mtlr r0 /* 8024B268 002481C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024B26C 002481CC 4E 80 00 20 */ blr +/* 8024B26C 002481CC 4E 80 00 20 */ blr .global sub_8024b270 sub_8024b270: @@ -2701,7 +2701,7 @@ sub_8024b270: /* 8024B28C 002481EC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8024B290 002481F0 7C 08 03 A6 */ mtlr r0 /* 8024B294 002481F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024B298 002481F8 4E 80 00 20 */ blr +/* 8024B298 002481F8 4E 80 00 20 */ blr .global sub_8024b29c sub_8024b29c: @@ -2709,7 +2709,7 @@ sub_8024b29c: /* 8024B2A0 00248200 80 83 00 00 */ lwz r4, 0(r3) /* 8024B2A4 00248204 7C 04 02 14 */ add r0, r4, r0 /* 8024B2A8 00248208 90 03 00 00 */ stw r0, 0(r3) -/* 8024B2AC 0024820C 4E 80 00 20 */ blr +/* 8024B2AC 0024820C 4E 80 00 20 */ blr .global sub_8024b2b0 sub_8024b2b0: @@ -2717,7 +2717,7 @@ sub_8024b2b0: /* 8024B2B4 00248214 80 83 00 00 */ lwz r4, 0(r3) /* 8024B2B8 00248218 7C 04 02 14 */ add r0, r4, r0 /* 8024B2BC 0024821C 90 03 00 00 */ stw r0, 0(r3) -/* 8024B2C0 00248220 4E 80 00 20 */ blr +/* 8024B2C0 00248220 4E 80 00 20 */ blr .global sub_8024b2c4 sub_8024b2c4: @@ -2737,7 +2737,7 @@ sub_8024b2c4: /* 8024B2F8 00248258 80 01 00 24 */ lwz r0, 0x24(r1) /* 8024B2FC 0024825C 7C 08 03 A6 */ mtlr r0 /* 8024B300 00248260 38 21 00 20 */ addi r1, r1, 0x20 -/* 8024B304 00248264 4E 80 00 20 */ blr +/* 8024B304 00248264 4E 80 00 20 */ blr .global sub_8024b308 sub_8024b308: @@ -2757,7 +2757,7 @@ sub_8024b308: /* 8024B33C 0024829C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8024B340 002482A0 7C 08 03 A6 */ mtlr r0 /* 8024B344 002482A4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8024B348 002482A8 4E 80 00 20 */ blr +/* 8024B348 002482A8 4E 80 00 20 */ blr .global sub_8024b34c sub_8024b34c: @@ -2770,7 +2770,7 @@ sub_8024b34c: /* 8024B364 002482C4 7C 00 2E 70 */ srawi r0, r0, 5 /* 8024B368 002482C8 54 03 0F FE */ srwi r3, r0, 0x1f /* 8024B36C 002482CC 7C 60 1A 14 */ add r3, r0, r3 -/* 8024B370 002482D0 4E 80 00 20 */ blr +/* 8024B370 002482D0 4E 80 00 20 */ blr .global sub_8024b374 sub_8024b374: diff --git a/asm/MetroidPrime/Player/CScanDisplay.s b/asm/MetroidPrime/Player/CScanDisplay.s index c6afa85a..db843d5e 100644 --- a/asm/MetroidPrime/Player/CScanDisplay.s +++ b/asm/MetroidPrime/Player/CScanDisplay.s @@ -92,7 +92,7 @@ lbl_80172B14: /* 80172B24 0016FA84 CB C1 00 10 */ lfd f30, 0x10(r1) /* 80172B28 0016FA88 7C 08 03 A6 */ mtlr r0 /* 80172B2C 0016FA8C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80172B30 0016FA90 4E 80 00 20 */ blr +/* 80172B30 0016FA90 4E 80 00 20 */ blr .global GetDownloadStartTime__12CScanDisplayFi GetDownloadStartTime__12CScanDisplayFi: @@ -176,7 +176,7 @@ lbl_80172C24: /* 80172C34 0016FB94 D0 21 00 0C */ stfs f1, 0xc(r1) lbl_80172C38: /* 80172C38 0016FB98 38 21 00 10 */ addi r1, r1, 0x10 -/* 80172C3C 0016FB9C 4E 80 00 20 */ blr +/* 80172C3C 0016FB9C 4E 80 00 20 */ blr .global Draw__12CScanDisplayCFv Draw__12CScanDisplayCFv: @@ -198,7 +198,7 @@ Draw__12CScanDisplayCFv: /* 80172C7C 0016FBDC 81 83 00 00 */ lwz r12, 0(r3) /* 80172C80 0016FBE0 81 8C 00 60 */ lwz r12, 0x60(r12) /* 80172C84 0016FBE4 7D 89 03 A6 */ mtctr r12 -/* 80172C88 0016FBE8 4E 80 04 21 */ bctrl +/* 80172C88 0016FBE8 4E 80 04 21 */ bctrl /* 80172C8C 0016FBEC 80 8D A0 68 */ lwz r4, gpRender@sda21(r13) /* 80172C90 0016FBF0 38 61 00 0C */ addi r3, r1, 0xc /* 80172C94 0016FBF4 C0 22 A1 18 */ lfs f1, lbl_805ABE38@sda21(r2) @@ -207,12 +207,12 @@ Draw__12CScanDisplayCFv: /* 80172CA0 0016FC00 C0 42 A1 1C */ lfs f2, lbl_805ABE3C@sda21(r2) /* 80172CA4 0016FC04 81 8C 00 54 */ lwz r12, 0x54(r12) /* 80172CA8 0016FC08 7D 89 03 A6 */ mtctr r12 -/* 80172CAC 0016FC0C 4E 80 04 21 */ bctrl +/* 80172CAC 0016FC0C 4E 80 04 21 */ bctrl /* 80172CB0 0016FC10 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 80172CB4 0016FC14 81 83 00 00 */ lwz r12, 0(r3) /* 80172CB8 0016FC18 81 8C 00 64 */ lwz r12, 0x64(r12) /* 80172CBC 0016FC1C 7D 89 03 A6 */ mtctr r12 -/* 80172CC0 0016FC20 4E 80 04 21 */ bctrl +/* 80172CC0 0016FC20 4E 80 04 21 */ bctrl /* 80172CC4 0016FC24 3C 80 80 5A */ lis r4, lbl_805A5EBC@ha /* 80172CC8 0016FC28 38 60 00 00 */ li r3, 0 /* 80172CCC 0016FC2C 38 84 5E BC */ addi r4, r4, lbl_805A5EBC@l @@ -246,7 +246,7 @@ lbl_80172D20: /* 80172D34 0016FC94 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80172D38 0016FC98 7C 08 03 A6 */ mtlr r0 /* 80172D3C 0016FC9C 38 21 00 40 */ addi r1, r1, 0x40 -/* 80172D40 0016FCA0 4E 80 00 20 */ blr +/* 80172D40 0016FCA0 4E 80 00 20 */ blr .global ProcessInput__12CScanDisplayFRC11CFinalInput ProcessInput__12CScanDisplayFRC11CFinalInput: @@ -527,7 +527,7 @@ lbl_80173104: /* 80173144 001700A4 83 81 00 30 */ lwz r28, 0x30(r1) /* 80173148 001700A8 7C 08 03 A6 */ mtlr r0 /* 8017314C 001700AC 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 80173150 001700B0 4E 80 00 20 */ blr +/* 80173150 001700B0 4E 80 00 20 */ blr .global Update__12CScanDisplayFff Update__12CScanDisplayFff: @@ -1393,7 +1393,7 @@ lbl_80173D54: /* 80173D88 00170CE8 80 01 02 14 */ lwz r0, 0x214(r1) /* 80173D8C 00170CEC 7C 08 03 A6 */ mtlr r0 /* 80173D90 00170CF0 38 21 02 10 */ addi r1, r1, 0x210 -/* 80173D94 00170CF4 4E 80 00 20 */ blr +/* 80173D94 00170CF4 4E 80 00 20 */ blr .global sub_80173d98 sub_80173d98: @@ -1454,7 +1454,7 @@ lbl_80173E48: /* 80173E4C 00170DAC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80173E50 00170DB0 7C 08 03 A6 */ mtlr r0 /* 80173E54 00170DB4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80173E58 00170DB8 4E 80 00 20 */ blr +/* 80173E58 00170DB8 4E 80 00 20 */ blr .global sub_80173e5c sub_80173e5c: @@ -1477,7 +1477,7 @@ lbl_80173E90: /* 80173E94 00170DF4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80173E98 00170DF8 7C 08 03 A6 */ mtlr r0 /* 80173E9C 00170DFC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80173EA0 00170E00 4E 80 00 20 */ blr +/* 80173EA0 00170E00 4E 80 00 20 */ blr .global sub_80173ea4 sub_80173ea4: @@ -1505,12 +1505,12 @@ sub_80173ea4: /* 80173EF8 00170E58 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80173EFC 00170E5C 7C 08 03 A6 */ mtlr r0 /* 80173F00 00170E60 38 21 00 10 */ addi r1, r1, 0x10 -/* 80173F04 00170E64 4E 80 00 20 */ blr +/* 80173F04 00170E64 4E 80 00 20 */ blr .global sub_80173f08 sub_80173f08: /* 80173F08 00170E68 7C 03 20 40 */ cmplw r3, r4 -/* 80173F0C 00170E6C 4D 82 00 20 */ beqlr +/* 80173F0C 00170E6C 4D 82 00 20 */ beqlr /* 80173F10 00170E70 80 E3 00 00 */ lwz r7, 0(r3) /* 80173F14 00170E74 38 A0 00 00 */ li r5, 0 /* 80173F18 00170E78 2C 07 00 00 */ cmpwi r7, 0 @@ -1568,7 +1568,7 @@ lbl_80173FC8: /* 80173FCC 00170F2C 40 82 FF B4 */ bne lbl_80173F80 /* 80173FD0 00170F30 80 04 00 00 */ lwz r0, 0(r4) /* 80173FD4 00170F34 90 03 00 00 */ stw r0, 0(r3) -/* 80173FD8 00170F38 4E 80 00 20 */ blr +/* 80173FD8 00170F38 4E 80 00 20 */ blr .global sub_80173fdc sub_80173fdc: @@ -1582,7 +1582,7 @@ lbl_80173FF4: /* 80173FF4 00170F54 80 01 00 14 */ lwz r0, 0x14(r1) /* 80173FF8 00170F58 7C 08 03 A6 */ mtlr r0 /* 80173FFC 00170F5C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80174000 00170F60 4E 80 00 20 */ blr +/* 80174000 00170F60 4E 80 00 20 */ blr .global sub_80174004 sub_80174004: @@ -1603,7 +1603,7 @@ sub_80174004: /* 8017403C 00170F9C 80 03 00 14 */ lwz r0, 0x14(r3) /* 80174040 00170FA0 7C 09 03 A6 */ mtctr r0 /* 80174044 00170FA4 2C 00 00 00 */ cmpwi r0, 0 -/* 80174048 00170FA8 4C 81 00 20 */ blelr +/* 80174048 00170FA8 4C 81 00 20 */ blelr lbl_8017404C: /* 8017404C 00170FAC 28 05 00 00 */ cmplwi r5, 0 /* 80174050 00170FB0 41 82 00 3C */ beq lbl_8017408C @@ -1628,25 +1628,25 @@ lbl_8017408C: .global sub_80174098 sub_80174098: -/* 80174098 00170FF8 4E 80 00 20 */ blr +/* 80174098 00170FF8 4E 80 00 20 */ blr .global StopScan__12CScanDisplayFv StopScan__12CScanDisplayFv: /* 8017409C 00170FFC 80 03 00 0C */ lwz r0, 0xc(r3) /* 801740A0 00171000 2C 00 00 04 */ cmpwi r0, 4 -/* 801740A4 00171004 4D 82 00 20 */ beqlr -/* 801740A8 00171008 4C 80 00 20 */ bgelr +/* 801740A4 00171004 4D 82 00 20 */ beqlr +/* 801740A8 00171008 4C 80 00 20 */ bgelr /* 801740AC 0017100C 2C 00 00 00 */ cmpwi r0, 0 -/* 801740B0 00171010 4D 82 00 20 */ beqlr +/* 801740B0 00171010 4D 82 00 20 */ beqlr /* 801740B4 00171014 40 80 00 0C */ bge lbl_801740C0 .global sub_801740b8 sub_801740b8: -/* 801740B8 00171018 4E 80 00 20 */ blr +/* 801740B8 00171018 4E 80 00 20 */ blr .global sub_801740bc sub_801740bc: -/* 801740BC 0017101C 4E 80 00 20 */ blr +/* 801740BC 0017101C 4E 80 00 20 */ blr lbl_801740C0: /* 801740C0 00171020 38 00 00 04 */ li r0, 4 /* 801740C4 00171024 C0 02 A1 10 */ lfs f0, lbl_805ABE30@sda21(r2) @@ -1655,7 +1655,7 @@ lbl_801740C0: /* 801740D0 00171030 D0 03 01 14 */ stfs f0, 0x114(r3) /* 801740D4 00171034 D0 03 01 40 */ stfs f0, 0x140(r3) /* 801740D8 00171038 D0 03 01 6C */ stfs f0, 0x16c(r3) -/* 801740DC 0017103C 4E 80 00 20 */ blr +/* 801740DC 0017103C 4E 80 00 20 */ blr .global StartScan__12CScanDisplayF9TUniqueIdRC20CScannableObjectInfoP12CGuiTextPaneP10CGuiWidgetf StartScan__12CScanDisplayF9TUniqueIdRC20CScannableObjectInfoP12CGuiTextPaneP10CGuiWidgetf: @@ -1857,7 +1857,7 @@ lbl_80174384: /* 801743BC 0017131C 81 84 00 00 */ lwz r12, 0(r4) /* 801743C0 00171320 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801743C4 00171324 7D 89 03 A6 */ mtctr r12 -/* 801743C8 00171328 4E 80 04 21 */ bctrl +/* 801743C8 00171328 4E 80 04 21 */ bctrl /* 801743CC 0017132C 38 61 00 30 */ addi r3, r1, 0x30 /* 801743D0 00171330 38 81 00 18 */ addi r4, r1, 0x18 /* 801743D4 00171334 48 1C CA D5 */ bl __ct__6CTokenFRC6CToken @@ -1947,7 +1947,7 @@ lbl_801744D4: /* 80174504 00171464 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 80174508 00171468 7C 08 03 A6 */ mtlr r0 /* 8017450C 0017146C 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 80174510 00171470 4E 80 00 20 */ blr +/* 80174510 00171470 4E 80 00 20 */ blr .global sub_80174514 sub_80174514: @@ -1962,7 +1962,7 @@ sub_80174514: /* 80174534 00171494 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80174538 00171498 7C 08 03 A6 */ mtlr r0 /* 8017453C 0017149C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80174540 001714A0 4E 80 00 20 */ blr +/* 80174540 001714A0 4E 80 00 20 */ blr .global __ct__12CScanDisplayFv __ct__12CScanDisplayFv: @@ -1980,7 +1980,7 @@ __ct__12CScanDisplayFv: /* 80174570 001714D0 81 84 00 00 */ lwz r12, 0(r4) /* 80174574 001714D4 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80174578 001714D8 7D 89 03 A6 */ mtctr r12 -/* 8017457C 001714DC 4E 80 04 21 */ bctrl +/* 8017457C 001714DC 4E 80 04 21 */ bctrl /* 80174580 001714E0 7F C3 F3 78 */ mr r3, r30 /* 80174584 001714E4 38 81 00 08 */ addi r4, r1, 8 /* 80174588 001714E8 48 1C C9 21 */ bl __ct__6CTokenFRC6CToken @@ -2102,7 +2102,7 @@ lbl_8017470C: /* 8017473C 0017169C 80 01 00 54 */ lwz r0, 0x54(r1) /* 80174740 001716A0 7C 08 03 A6 */ mtlr r0 /* 80174744 001716A4 38 21 00 50 */ addi r1, r1, 0x50 -/* 80174748 001716A8 4E 80 00 20 */ blr +/* 80174748 001716A8 4E 80 00 20 */ blr .global SetDestPosition__Q212CScanDisplay8CDataDotFRC9CVector2f SetDestPosition__Q212CScanDisplay8CDataDotFRC9CVector2f: @@ -2114,13 +2114,13 @@ SetDestPosition__Q212CScanDisplay8CDataDotFRC9CVector2f: /* 80174760 001716C0 D0 03 00 14 */ stfs f0, 0x14(r3) /* 80174764 001716C4 C0 04 00 04 */ lfs f0, 4(r4) /* 80174768 001716C8 D0 03 00 18 */ stfs f0, 0x18(r3) -/* 8017476C 001716CC 4E 80 00 20 */ blr +/* 8017476C 001716CC 4E 80 00 20 */ blr lbl_80174770: /* 80174770 001716D0 C0 04 00 00 */ lfs f0, 0(r4) /* 80174774 001716D4 D0 03 00 0C */ stfs f0, 0xc(r3) /* 80174778 001716D8 C0 04 00 04 */ lfs f0, 4(r4) /* 8017477C 001716DC D0 03 00 10 */ stfs f0, 0x10(r3) -/* 80174780 001716E0 4E 80 00 20 */ blr +/* 80174780 001716E0 4E 80 00 20 */ blr .global Update__Q212CScanDisplay8CDataDotFf Update__Q212CScanDisplay8CDataDotFf: @@ -2212,7 +2212,7 @@ lbl_801748A4: /* 801748B0 00171810 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 801748B4 00171814 7C 08 03 A6 */ mtlr r0 /* 801748B8 00171818 38 21 00 40 */ addi r1, r1, 0x40 -/* 801748BC 0017181C 4E 80 00 20 */ blr +/* 801748BC 0017181C 4E 80 00 20 */ blr .global StartTransitionTo__Q212CScanDisplay8CDataDotFRC9CVector2ff StartTransitionTo__Q212CScanDisplay8CDataDotFRC9CVector2ff: @@ -2226,7 +2226,7 @@ StartTransitionTo__Q212CScanDisplay8CDataDotFRC9CVector2ff: /* 801748DC 0017183C D0 03 00 14 */ stfs f0, 0x14(r3) /* 801748E0 00171840 C0 04 00 04 */ lfs f0, 4(r4) /* 801748E4 00171844 D0 03 00 18 */ stfs f0, 0x18(r3) -/* 801748E8 00171848 4E 80 00 20 */ blr +/* 801748E8 00171848 4E 80 00 20 */ blr .global Draw__Q212CScanDisplay8CDataDotCF6CColorf Draw__Q212CScanDisplay8CDataDotCF6CColorf: @@ -2260,7 +2260,7 @@ lbl_8017493C: /* 80174954 001718B4 81 83 00 00 */ lwz r12, 0(r3) /* 80174958 001718B8 81 8C 00 30 */ lwz r12, 0x30(r12) /* 8017495C 001718BC 7D 89 03 A6 */ mtctr r12 -/* 80174960 001718C0 4E 80 04 21 */ bctrl +/* 80174960 001718C0 4E 80 04 21 */ bctrl /* 80174964 001718C4 38 60 00 98 */ li r3, 0x98 /* 80174968 001718C8 48 19 6D 01 */ bl StreamBegin__9CGraphicsF13ERglPrimitive /* 8017496C 001718CC 88 7F 00 03 */ lbz r3, 3(r31) @@ -2327,7 +2327,7 @@ lbl_80174A44: /* 80174A5C 001719BC 83 C1 00 78 */ lwz r30, 0x78(r1) /* 80174A60 001719C0 7C 08 03 A6 */ mtlr r0 /* 80174A64 001719C4 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 80174A68 001719C8 4E 80 00 20 */ blr +/* 80174A68 001719C8 4E 80 00 20 */ blr .global __ct__Q212CScanDisplay8CDataDotFv __ct__Q212CScanDisplay8CDataDotFv: @@ -2351,7 +2351,7 @@ __ct__Q212CScanDisplay8CDataDotFv: /* 80174AB0 00171A10 D0 03 00 20 */ stfs f0, 0x20(r3) /* 80174AB4 00171A14 D0 03 00 24 */ stfs f0, 0x24(r3) /* 80174AB8 00171A18 D0 03 00 28 */ stfs f0, 0x28(r3) -/* 80174ABC 00171A1C 4E 80 00 20 */ blr +/* 80174ABC 00171A1C 4E 80 00 20 */ blr .global SetScanMessageTypeEffect__12CScanDisplayFP12CGuiTextPaneb SetScanMessageTypeEffect__12CScanDisplayFP12CGuiTextPaneb: diff --git a/asm/MetroidPrime/Player/CStaticInterference.s b/asm/MetroidPrime/Player/CStaticInterference.s index 09bcaf54..910af202 100644 --- a/asm/MetroidPrime/Player/CStaticInterference.s +++ b/asm/MetroidPrime/Player/CStaticInterference.s @@ -128,7 +128,7 @@ lbl_801C08FC: /* 801C0914 001BD874 83 C1 00 38 */ lwz r30, 0x38(r1) /* 801C0918 001BD878 7C 08 03 A6 */ mtlr r0 /* 801C091C 001BD87C 38 21 00 60 */ addi r1, r1, 0x60 -/* 801C0920 001BD880 4E 80 00 20 */ blr +/* 801C0920 001BD880 4E 80 00 20 */ blr .global GetTotalInterference__19CStaticInterferenceCFv GetTotalInterference__19CStaticInterferenceCFv: @@ -174,7 +174,7 @@ lbl_801C09A4: lbl_801C09A8: /* 801C09A8 001BD908 C0 23 00 00 */ lfs f1, 0(r3) /* 801C09AC 001BD90C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801C09B0 001BD910 4E 80 00 20 */ blr +/* 801C09B0 001BD910 4E 80 00 20 */ blr .global sub_801c09b4 sub_801c09b4: @@ -214,7 +214,7 @@ lbl_801C0A28: /* 801C0A28 001BD988 80 01 00 24 */ lwz r0, 0x24(r1) /* 801C0A2C 001BD98C 7C 08 03 A6 */ mtlr r0 /* 801C0A30 001BD990 38 21 00 20 */ addi r1, r1, 0x20 -/* 801C0A34 001BD994 4E 80 00 20 */ blr +/* 801C0A34 001BD994 4E 80 00 20 */ blr .global sub_801c0a38 sub_801c0a38: @@ -236,7 +236,7 @@ sub_801c0a38: /* 801C0A74 001BD9D4 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801C0A78 001BD9D8 7C 08 03 A6 */ mtlr r0 /* 801C0A7C 001BD9DC 38 21 00 20 */ addi r1, r1, 0x20 -/* 801C0A80 001BD9E0 4E 80 00 20 */ blr +/* 801C0A80 001BD9E0 4E 80 00 20 */ blr .global sub_801c0a84 sub_801c0a84: @@ -289,7 +289,7 @@ lbl_801C0B0C: /* 801C0B28 001BDA88 80 05 00 00 */ lwz r0, 0(r5) /* 801C0B2C 001BDA8C 90 03 00 00 */ stw r0, 0(r3) /* 801C0B30 001BDA90 38 21 00 10 */ addi r1, r1, 0x10 -/* 801C0B34 001BDA94 4E 80 00 20 */ blr +/* 801C0B34 001BDA94 4E 80 00 20 */ blr .global AddSource__19CStaticInterferenceF9TUniqueId AddSource__19CStaticInterferenceF9TUniqueId: @@ -369,7 +369,7 @@ lbl_801C0C24: /* 801C0C3C 001BDB9C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 801C0C40 001BDBA0 7C 08 03 A6 */ mtlr r0 /* 801C0C44 001BDBA4 38 21 00 40 */ addi r1, r1, 0x40 -/* 801C0C48 001BDBA8 4E 80 00 20 */ blr +/* 801C0C48 001BDBA8 4E 80 00 20 */ blr .global __ct__19CStaticInterferenceFi __ct__19CStaticInterferenceFi: @@ -388,7 +388,7 @@ __ct__19CStaticInterferenceFi: /* 801C0C7C 001BDBDC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801C0C80 001BDBE0 7C 08 03 A6 */ mtlr r0 /* 801C0C84 001BDBE4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801C0C88 001BDBE8 4E 80 00 20 */ blr +/* 801C0C88 001BDBE8 4E 80 00 20 */ blr .global sub_801c0c8c sub_801c0c8c: diff --git a/asm/MetroidPrime/Player/CWorldLayerState.s b/asm/MetroidPrime/Player/CWorldLayerState.s index 1c0d23d3..dbe8758b 100644 --- a/asm/MetroidPrime/Player/CWorldLayerState.s +++ b/asm/MetroidPrime/Player/CWorldLayerState.s @@ -22,7 +22,7 @@ lbl_8046D34C: .global nullsub_5 nullsub_5: -/* 80233FB0 00230F10 4E 80 00 20 */ blr +/* 80233FB0 00230F10 4E 80 00 20 */ blr .global GetAreaLayerCount__16CWorldLayerStateFi GetAreaLayerCount__16CWorldLayerStateFi: @@ -32,7 +32,7 @@ GetAreaLayerCount__16CWorldLayerStateFi: /* 80233FC0 00230F20 7C 63 00 2E */ lwzx r3, r3, r0 .global lbl_80233FC4 lbl_80233FC4: -/* 80233FC4 00230F24 4E 80 00 20 */ blr +/* 80233FC4 00230F24 4E 80 00 20 */ blr .global "InitializeWorldLayers__16CWorldLayerStateFQ24rstl6vector" "InitializeWorldLayers__16CWorldLayerStateFQ24rstl6vector": @@ -131,7 +131,7 @@ lbl_80234118: /* 8023411C 0023107C 80 01 00 74 */ lwz r0, 0x74(r1) /* 80234120 00231080 7C 08 03 A6 */ mtlr r0 /* 80234124 00231084 38 21 00 70 */ addi r1, r1, 0x70 -/* 80234128 00231088 4E 80 00 20 */ blr +/* 80234128 00231088 4E 80 00 20 */ blr .global sub_8023412c sub_8023412c: @@ -150,7 +150,7 @@ sub_8023412c: /* 8023415C 002310BC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80234160 002310C0 7C 08 03 A6 */ mtlr r0 /* 80234164 002310C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80234168 002310C8 4E 80 00 20 */ blr +/* 80234168 002310C8 4E 80 00 20 */ blr .global sub_8023416c sub_8023416c: @@ -228,7 +228,7 @@ lbl_80234258: /* 80234260 002311C0 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80234264 002311C4 7C 08 03 A6 */ mtlr r0 /* 80234268 002311C8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8023426C 002311CC 4E 80 00 20 */ blr +/* 8023426C 002311CC 4E 80 00 20 */ blr .global IsLayerActive__16CWorldLayerStateFii IsLayerActive__16CWorldLayerStateFii: @@ -251,7 +251,7 @@ IsLayerActive__16CWorldLayerStateFii: /* 802342B0 00231210 7C 03 1B 78 */ or r3, r0, r3 /* 802342B4 00231214 30 03 FF FF */ addic r0, r3, -1 /* 802342B8 00231218 7C 60 19 10 */ subfe r3, r0, r3 -/* 802342BC 0023121C 4E 80 00 20 */ blr +/* 802342BC 0023121C 4E 80 00 20 */ blr .global SetLayerActive__16CWorldLayerStateFiib SetLayerActive__16CWorldLayerStateFiib: @@ -271,7 +271,7 @@ SetLayerActive__16CWorldLayerStateFiib: /* 802342F4 00231254 90 06 00 0C */ stw r0, 0xc(r6) /* 802342F8 00231258 7C 80 1B 78 */ or r0, r4, r3 /* 802342FC 0023125C 90 06 00 08 */ stw r0, 8(r6) -/* 80234300 00231260 4E 80 00 20 */ blr +/* 80234300 00231260 4E 80 00 20 */ blr lbl_80234304: /* 80234304 00231264 38 00 00 01 */ li r0, 1 /* 80234308 00231268 80 A6 00 0C */ lwz r5, 0xc(r6) @@ -283,7 +283,7 @@ lbl_80234304: /* 80234320 00231280 90 06 00 0C */ stw r0, 0xc(r6) /* 80234324 00231284 7C 80 18 38 */ and r0, r4, r3 /* 80234328 00231288 90 06 00 08 */ stw r0, 8(r6) -/* 8023432C 0023128C 4E 80 00 20 */ blr +/* 8023432C 0023128C 4E 80 00 20 */ blr .global PutTo__16CWorldLayerStateFR16CMemoryStreamOut PutTo__16CWorldLayerStateFR16CMemoryStreamOut: @@ -352,7 +352,7 @@ lbl_80234404: /* 80234410 00231370 80 01 00 44 */ lwz r0, 0x44(r1) /* 80234414 00231374 7C 08 03 A6 */ mtlr r0 /* 80234418 00231378 38 21 00 40 */ addi r1, r1, 0x40 -/* 8023441C 0023137C 4E 80 00 20 */ blr +/* 8023441C 0023137C 4E 80 00 20 */ blr .global __ct__16CWorldLayerStateFR16CBitStreamReaderRC10CSaveWorld __ct__16CWorldLayerStateFR16CBitStreamReaderRC10CSaveWorld: @@ -472,7 +472,7 @@ lbl_802345B4: /* 802345C4 00231524 80 01 00 24 */ lwz r0, 0x24(r1) /* 802345C8 00231528 7C 08 03 A6 */ mtlr r0 /* 802345CC 0023152C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802345D0 00231530 4E 80 00 20 */ blr +/* 802345D0 00231530 4E 80 00 20 */ blr .global __ct__13CGLXMemoryInfoFi __ct__13CGLXMemoryInfoFi: @@ -484,7 +484,7 @@ __ct__13CGLXMemoryInfoFi: /* 802345E8 00231548 90 03 00 18 */ stw r0, 0x18(r3) /* 802345EC 0023154C 90 03 00 1C */ stw r0, 0x1c(r3) /* 802345F0 00231550 90 03 00 20 */ stw r0, 0x20(r3) -/* 802345F4 00231554 4E 80 00 20 */ blr +/* 802345F4 00231554 4E 80 00 20 */ blr .global __sinit_CScriptLayerManager_cpp __sinit_CScriptLayerManager_cpp: diff --git a/asm/MetroidPrime/ScriptLoader.s b/asm/MetroidPrime/ScriptLoader.s index 0557b712..53ff1f31 100644 --- a/asm/MetroidPrime/ScriptLoader.s +++ b/asm/MetroidPrime/ScriptLoader.s @@ -293,7 +293,7 @@ lbl_800C55E0: /* 800C560C 000C256C 80 01 04 04 */ lwz r0, 0x404(r1) /* 800C5610 000C2570 7C 08 03 A6 */ mtlr r0 /* 800C5614 000C2574 38 21 04 00 */ addi r1, r1, 0x400 -/* 800C5618 000C2578 4E 80 00 20 */ blr +/* 800C5618 000C2578 4E 80 00 20 */ blr .global __ct__16CActorParametersFRC16CActorParameters __ct__16CActorParametersFRC16CActorParameters: @@ -352,7 +352,7 @@ __ct__16CActorParametersFRC16CActorParameters: /* 800C56EC 000C264C D0 03 00 60 */ stfs f0, 0x60(r3) /* 800C56F0 000C2650 C0 04 00 64 */ lfs f0, 0x64(r4) /* 800C56F4 000C2654 D0 03 00 64 */ stfs f0, 0x64(r3) -/* 800C56F8 000C2658 4E 80 00 20 */ blr +/* 800C56F8 000C2658 4E 80 00 20 */ blr .global LoadShadowProjector__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadShadowProjector__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -445,7 +445,7 @@ lbl_800C583C: /* 800C5848 000C27A8 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 800C584C 000C27AC 7C 08 03 A6 */ mtlr r0 /* 800C5850 000C27B0 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 800C5854 000C27B4 4E 80 00 20 */ blr +/* 800C5854 000C27B4 4E 80 00 20 */ blr .global LoadPhazonHealingNodule__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadPhazonHealingNodule__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -579,7 +579,7 @@ lbl_800C5A38: /* 800C5A3C 000C299C 80 01 03 14 */ lwz r0, 0x314(r1) /* 800C5A40 000C29A0 7C 08 03 A6 */ mtlr r0 /* 800C5A44 000C29A4 38 21 03 10 */ addi r1, r1, 0x310 -/* 800C5A48 000C29A8 4E 80 00 20 */ blr +/* 800C5A48 000C29A8 4E 80 00 20 */ blr .global LoadPhazonPool__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadPhazonPool__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -735,7 +735,7 @@ lbl_800C5C70: /* 800C5C94 000C2BF4 80 01 01 84 */ lwz r0, 0x184(r1) /* 800C5C98 000C2BF8 7C 08 03 A6 */ mtlr r0 /* 800C5C9C 000C2BFC 38 21 01 80 */ addi r1, r1, 0x180 -/* 800C5CA0 000C2C00 4E 80 00 20 */ blr +/* 800C5CA0 000C2C00 4E 80 00 20 */ blr .global LoadOmegaPirate__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadOmegaPirate__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -884,7 +884,7 @@ lbl_800C5EB8: /* 800C5EBC 000C2E1C 80 01 04 34 */ lwz r0, 0x434(r1) /* 800C5EC0 000C2E20 7C 08 03 A6 */ mtlr r0 /* 800C5EC4 000C2E24 38 21 04 30 */ addi r1, r1, 0x430 -/* 800C5EC8 000C2E28 4E 80 00 20 */ blr +/* 800C5EC8 000C2E28 4E 80 00 20 */ blr .global LoadMazeNode__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadMazeNode__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -963,7 +963,7 @@ lbl_800C5FDC: /* 800C5FE0 000C2F40 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 800C5FE4 000C2F44 7C 08 03 A6 */ mtlr r0 /* 800C5FE8 000C2F48 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 800C5FEC 000C2F4C 4E 80 00 20 */ blr +/* 800C5FEC 000C2F4C 4E 80 00 20 */ blr .global LoadMetroidPrimeEssence__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadMetroidPrimeEssence__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -1127,7 +1127,7 @@ lbl_800C6248: /* 800C624C 000C31AC 80 01 03 74 */ lwz r0, 0x374(r1) /* 800C6250 000C31B0 7C 08 03 A6 */ mtlr r0 /* 800C6254 000C31B4 38 21 03 70 */ addi r1, r1, 0x370 -/* 800C6258 000C31B8 4E 80 00 20 */ blr +/* 800C6258 000C31B8 4E 80 00 20 */ blr .global LoadWorldLightFader__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadWorldLightFader__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -1225,7 +1225,7 @@ lbl_800C639C: /* 800C63BC 000C331C 83 81 00 40 */ lwz r28, 0x40(r1) /* 800C63C0 000C3320 7C 08 03 A6 */ mtlr r0 /* 800C63C4 000C3324 38 21 00 70 */ addi r1, r1, 0x70 -/* 800C63C8 000C3328 4E 80 00 20 */ blr +/* 800C63C8 000C3328 4E 80 00 20 */ blr .global LoadScriptBeam__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadScriptBeam__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -1292,7 +1292,7 @@ lbl_800C6444: /* 800C64B4 000C3414 81 84 00 00 */ lwz r12, 0(r4) /* 800C64B8 000C3418 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800C64BC 000C341C 7D 89 03 A6 */ mtctr r12 -/* 800C64C0 000C3420 4E 80 04 21 */ bctrl +/* 800C64C0 000C3420 4E 80 04 21 */ bctrl /* 800C64C4 000C3424 38 61 00 18 */ addi r3, r1, 0x18 /* 800C64C8 000C3428 38 81 00 20 */ addi r4, r1, 0x20 /* 800C64CC 000C342C 3B 40 00 01 */ li r26, 1 @@ -1331,7 +1331,7 @@ lbl_800C653C: /* 800C6540 000C34A0 80 01 00 F4 */ lwz r0, 0xf4(r1) /* 800C6544 000C34A4 7C 08 03 A6 */ mtlr r0 /* 800C6548 000C34A8 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 800C654C 000C34AC 4E 80 00 20 */ blr +/* 800C654C 000C34AC 4E 80 00 20 */ blr .global __ct__9CBeamInfoFR12CInputStream __ct__9CBeamInfoFR12CInputStream: @@ -1402,7 +1402,7 @@ __ct__9CBeamInfoFR12CInputStream: /* 800C6650 000C35B0 83 C1 00 18 */ lwz r30, 0x18(r1) /* 800C6654 000C35B4 7C 08 03 A6 */ mtlr r0 /* 800C6658 000C35B8 38 21 00 20 */ addi r1, r1, 0x20 -/* 800C665C 000C35BC 4E 80 00 20 */ blr +/* 800C665C 000C35BC 4E 80 00 20 */ blr .global LoadMetroidPrimeRelay__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadMetroidPrimeRelay__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -1927,7 +1927,7 @@ lbl_800C6D60: /* 800C6D7C 000C3CDC 80 01 0E F4 */ lwz r0, 0xef4(r1) /* 800C6D80 000C3CE0 7C 08 03 A6 */ mtlr r0 /* 800C6D84 000C3CE4 38 21 0E F0 */ addi r1, r1, 0xef0 -/* 800C6D88 000C3CE8 4E 80 00 20 */ blr +/* 800C6D88 000C3CE8 4E 80 00 20 */ blr .global sub_800c6d8c sub_800c6d8c: @@ -2139,7 +2139,7 @@ lbl_800C7038: /* 800C7044 000C3FA4 83 C1 00 08 */ lwz r30, 8(r1) /* 800C7048 000C3FA8 7C 08 03 A6 */ mtlr r0 /* 800C704C 000C3FAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C7050 000C3FB0 4E 80 00 20 */ blr +/* 800C7050 000C3FB0 4E 80 00 20 */ blr .global LoadBurrower__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadBurrower__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -2301,7 +2301,7 @@ lbl_800C72A4: /* 800C72A8 000C4208 80 01 03 64 */ lwz r0, 0x364(r1) /* 800C72AC 000C420C 7C 08 03 A6 */ mtlr r0 /* 800C72B0 000C4210 38 21 03 60 */ addi r1, r1, 0x360 -/* 800C72B4 000C4214 4E 80 00 20 */ blr +/* 800C72B4 000C4214 4E 80 00 20 */ blr .global LoadThermalHeatFader__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadThermalHeatFader__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -2399,7 +2399,7 @@ lbl_800C73F8: /* 800C7418 000C4378 83 81 00 40 */ lwz r28, 0x40(r1) /* 800C741C 000C437C 7C 08 03 A6 */ mtlr r0 /* 800C7420 000C4380 38 21 00 70 */ addi r1, r1, 0x70 -/* 800C7424 000C4384 4E 80 00 20 */ blr +/* 800C7424 000C4384 4E 80 00 20 */ blr .global LoadSeedling__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadSeedling__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -2600,7 +2600,7 @@ lbl_800C76E8: /* 800C7718 000C4678 83 81 03 60 */ lwz r28, 0x360(r1) /* 800C771C 000C467C 7C 08 03 A6 */ mtlr r0 /* 800C7720 000C4680 38 21 03 B0 */ addi r1, r1, 0x3b0 -/* 800C7724 000C4684 4E 80 00 20 */ blr +/* 800C7724 000C4684 4E 80 00 20 */ blr .global LoadTryclops__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadTryclops__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -2753,7 +2753,7 @@ lbl_800C7928: /* 800C7958 000C48B8 83 81 02 E0 */ lwz r28, 0x2e0(r1) /* 800C795C 000C48BC 7C 08 03 A6 */ mtlr r0 /* 800C7960 000C48C0 38 21 03 30 */ addi r1, r1, 0x330 -/* 800C7964 000C48C4 4E 80 00 20 */ blr +/* 800C7964 000C48C4 4E 80 00 20 */ blr .global LoadPuffer__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadPuffer__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -2918,7 +2918,7 @@ lbl_800C7BB4: /* 800C7BC8 000C4B28 80 01 03 84 */ lwz r0, 0x384(r1) /* 800C7BCC 000C4B2C 7C 08 03 A6 */ mtlr r0 /* 800C7BD0 000C4B30 38 21 03 80 */ addi r1, r1, 0x380 -/* 800C7BD4 000C4B34 4E 80 00 20 */ blr +/* 800C7BD4 000C4B34 4E 80 00 20 */ blr .global LoadRidley__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadRidley__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -3040,7 +3040,7 @@ lbl_800C7D88: /* 800C7D8C 000C4CEC 80 01 03 04 */ lwz r0, 0x304(r1) /* 800C7D90 000C4CF0 7C 08 03 A6 */ mtlr r0 /* 800C7D94 000C4CF4 38 21 03 00 */ addi r1, r1, 0x300 -/* 800C7D98 000C4CF8 4E 80 00 20 */ blr +/* 800C7D98 000C4CF8 4E 80 00 20 */ blr .global LoadIceZoomer__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadIceZoomer__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -3275,7 +3275,7 @@ lbl_800C80D8: /* 800C8114 000C5074 80 01 04 54 */ lwz r0, 0x454(r1) /* 800C8118 000C5078 7C 08 03 A6 */ mtlr r0 /* 800C811C 000C507C 38 21 04 50 */ addi r1, r1, 0x450 -/* 800C8120 000C5080 4E 80 00 20 */ blr +/* 800C8120 000C5080 4E 80 00 20 */ blr .global LoadAtomicBeta__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadAtomicBeta__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -3480,7 +3480,7 @@ lbl_800C83E8: /* 800C8424 000C5384 80 01 04 14 */ lwz r0, 0x414(r1) /* 800C8428 000C5388 7C 08 03 A6 */ mtlr r0 /* 800C842C 000C538C 38 21 04 10 */ addi r1, r1, 0x410 -/* 800C8430 000C5390 4E 80 00 20 */ blr +/* 800C8430 000C5390 4E 80 00 20 */ blr .global LoadAmbientAI__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadAmbientAI__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -3741,7 +3741,7 @@ lbl_800C87E4: /* 800C8800 000C5760 80 01 03 24 */ lwz r0, 0x324(r1) /* 800C8804 000C5764 7C 08 03 A6 */ mtlr r0 /* 800C8808 000C5768 38 21 03 20 */ addi r1, r1, 0x320 -/* 800C880C 000C576C 4E 80 00 20 */ blr +/* 800C880C 000C576C 4E 80 00 20 */ blr .global LoadRumbleEffect__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadRumbleEffect__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -3881,7 +3881,7 @@ lbl_800C8A08: /* 800C8A14 000C5974 80 01 01 04 */ lwz r0, 0x104(r1) /* 800C8A18 000C5978 7C 08 03 A6 */ mtlr r0 /* 800C8A1C 000C597C 38 21 01 00 */ addi r1, r1, 0x100 -/* 800C8A20 000C5980 4E 80 00 20 */ blr +/* 800C8A20 000C5980 4E 80 00 20 */ blr .global LoadAtomicAlpha__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadAtomicAlpha__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -4040,7 +4040,7 @@ lbl_800C8C50: /* 800C8C6C 000C5BCC 80 01 03 64 */ lwz r0, 0x364(r1) /* 800C8C70 000C5BD0 7C 08 03 A6 */ mtlr r0 /* 800C8C74 000C5BD4 38 21 03 60 */ addi r1, r1, 0x360 -/* 800C8C78 000C5BD8 4E 80 00 20 */ blr +/* 800C8C78 000C5BD8 4E 80 00 20 */ blr .global LoadGeemer__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadGeemer__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -4276,7 +4276,7 @@ lbl_800C8FBC: /* 800C8FF8 000C5F58 80 01 03 F4 */ lwz r0, 0x3f4(r1) /* 800C8FFC 000C5F5C 7C 08 03 A6 */ mtlr r0 /* 800C9000 000C5F60 38 21 03 F0 */ addi r1, r1, 0x3f0 -/* 800C9004 000C5F64 4E 80 00 20 */ blr +/* 800C9004 000C5F64 4E 80 00 20 */ blr .global LoadOcculus__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadOcculus__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -4488,7 +4488,7 @@ lbl_800C92E8: /* 800C9324 000C6284 80 01 04 44 */ lwz r0, 0x444(r1) /* 800C9328 000C6288 7C 08 03 A6 */ mtlr r0 /* 800C932C 000C628C 38 21 04 40 */ addi r1, r1, 0x440 -/* 800C9330 000C6290 4E 80 00 20 */ blr +/* 800C9330 000C6290 4E 80 00 20 */ blr .global LoadActorContraption__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadActorContraption__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -4756,7 +4756,7 @@ lbl_800C9708: /* 800C971C 000C667C 80 01 03 54 */ lwz r0, 0x354(r1) /* 800C9720 000C6680 7C 08 03 A6 */ mtlr r0 /* 800C9724 000C6684 38 21 03 50 */ addi r1, r1, 0x350 -/* 800C9728 000C6688 4E 80 00 20 */ blr +/* 800C9728 000C6688 4E 80 00 20 */ blr .global LoadSnakeWeedSwarm__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadSnakeWeedSwarm__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -5040,7 +5040,7 @@ lbl_800C9ACC: /* 800C9B50 000C6AB0 80 01 02 C4 */ lwz r0, 0x2c4(r1) /* 800C9B54 000C6AB4 7C 08 03 A6 */ mtlr r0 /* 800C9B58 000C6AB8 38 21 02 C0 */ addi r1, r1, 0x2c0 -/* 800C9B5C 000C6ABC 4E 80 00 20 */ blr +/* 800C9B5C 000C6ABC 4E 80 00 20 */ blr .global LoadTeamAiMgr__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadTeamAiMgr__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -5101,7 +5101,7 @@ lbl_800C9C1C: /* 800C9C2C 000C6B8C 83 81 00 50 */ lwz r28, 0x50(r1) /* 800C9C30 000C6B90 7C 08 03 A6 */ mtlr r0 /* 800C9C34 000C6B94 38 21 00 60 */ addi r1, r1, 0x60 -/* 800C9C38 000C6B98 4E 80 00 20 */ blr +/* 800C9C38 000C6B98 4E 80 00 20 */ blr .global LoadMagdolite__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadMagdolite__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -5324,7 +5324,7 @@ lbl_800C9F38: /* 800C9F84 000C6EE4 80 01 04 D4 */ lwz r0, 0x4d4(r1) /* 800C9F88 000C6EE8 7C 08 03 A6 */ mtlr r0 /* 800C9F8C 000C6EEC 38 21 04 D0 */ addi r1, r1, 0x4d0 -/* 800C9F90 000C6EF0 4E 80 00 20 */ blr +/* 800C9F90 000C6EF0 4E 80 00 20 */ blr .global sub_800c9f94 sub_800c9f94: @@ -5362,7 +5362,7 @@ sub_800c9f94: /* 800CA010 000C6F70 83 C1 00 08 */ lwz r30, 8(r1) /* 800CA014 000C6F74 7C 08 03 A6 */ mtlr r0 /* 800CA018 000C6F78 38 21 00 10 */ addi r1, r1, 0x10 -/* 800CA01C 000C6F7C 4E 80 00 20 */ blr +/* 800CA01C 000C6F7C 4E 80 00 20 */ blr .global LoadEnvFxDensityController__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadEnvFxDensityController__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -5486,7 +5486,7 @@ lbl_800CA1D8: /* 800CA1E4 000C7144 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 800CA1E8 000C7148 7C 08 03 A6 */ mtlr r0 /* 800CA1EC 000C714C 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 800CA1F0 000C7150 4E 80 00 20 */ blr +/* 800CA1F0 000C7150 4E 80 00 20 */ blr .global LoadElitePirate__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadElitePirate__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -5628,7 +5628,7 @@ lbl_800CA3E0: /* 800CA3F0 000C7350 83 81 04 00 */ lwz r28, 0x400(r1) /* 800CA3F4 000C7354 7C 08 03 A6 */ mtlr r0 /* 800CA3F8 000C7358 38 21 04 10 */ addi r1, r1, 0x410 -/* 800CA3FC 000C735C 4E 80 00 20 */ blr +/* 800CA3FC 000C735C 4E 80 00 20 */ blr .global LoadScriptCameraPitchVolume__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadScriptCameraPitchVolume__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -5717,7 +5717,7 @@ lbl_800CA514: /* 800CA53C 000C749C 83 81 00 70 */ lwz r28, 0x70(r1) /* 800CA540 000C74A0 7C 08 03 A6 */ mtlr r0 /* 800CA544 000C74A4 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 800CA548 000C74A8 4E 80 00 20 */ blr +/* 800CA548 000C74A8 4E 80 00 20 */ blr .global LoadRadialDamage__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadRadialDamage__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -5836,7 +5836,7 @@ lbl_800CA6F0: /* 800CA6FC 000C765C 80 01 01 04 */ lwz r0, 0x104(r1) /* 800CA700 000C7660 7C 08 03 A6 */ mtlr r0 /* 800CA704 000C7664 38 21 01 00 */ addi r1, r1, 0x100 -/* 800CA708 000C7668 4E 80 00 20 */ blr +/* 800CA708 000C7668 4E 80 00 20 */ blr .global LoadEyeBall__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadEyeBall__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -6037,7 +6037,7 @@ lbl_800CA9E8: /* 800CA9FC 000C795C 80 01 03 C4 */ lwz r0, 0x3c4(r1) /* 800CAA00 000C7960 7C 08 03 A6 */ mtlr r0 /* 800CAA04 000C7964 38 21 03 C0 */ addi r1, r1, 0x3c0 -/* 800CAA08 000C7968 4E 80 00 20 */ blr +/* 800CAA08 000C7968 4E 80 00 20 */ blr .global LoadBabygoth__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadBabygoth__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -6169,7 +6169,7 @@ lbl_800CABD8: /* 800CABE8 000C7B48 83 81 04 60 */ lwz r28, 0x460(r1) /* 800CABEC 000C7B4C 7C 08 03 A6 */ mtlr r0 /* 800CABF0 000C7B50 38 21 04 70 */ addi r1, r1, 0x470 -/* 800CABF4 000C7B54 4E 80 00 20 */ blr +/* 800CABF4 000C7B54 4E 80 00 20 */ blr .global LoadGunTurret__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadGunTurret__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -6395,7 +6395,7 @@ lbl_800CAF30: /* 800CAF34 000C7E94 80 01 03 B4 */ lwz r0, 0x3b4(r1) /* 800CAF38 000C7E98 7C 08 03 A6 */ mtlr r0 /* 800CAF3C 000C7E9C 38 21 03 B0 */ addi r1, r1, 0x3b0 -/* 800CAF40 000C7EA0 4E 80 00 20 */ blr +/* 800CAF40 000C7EA0 4E 80 00 20 */ blr .global LoadRepulsor__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadRepulsor__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -6463,7 +6463,7 @@ lbl_800CB018: /* 800CB02C 000C7F8C 83 81 00 38 */ lwz r28, 0x38(r1) /* 800CB030 000C7F90 7C 08 03 A6 */ mtlr r0 /* 800CB034 000C7F94 38 21 00 50 */ addi r1, r1, 0x50 -/* 800CB038 000C7F98 4E 80 00 20 */ blr +/* 800CB038 000C7F98 4E 80 00 20 */ blr .global LoadStreamedMusic__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadStreamedMusic__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -6551,7 +6551,7 @@ lbl_800CB168: /* 800CB174 000C80D4 80 01 00 74 */ lwz r0, 0x74(r1) /* 800CB178 000C80D8 7C 08 03 A6 */ mtlr r0 /* 800CB17C 000C80DC 38 21 00 70 */ addi r1, r1, 0x70 -/* 800CB180 000C80E0 4E 80 00 20 */ blr +/* 800CB180 000C80E0 4E 80 00 20 */ blr .global LoadMidi__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadMidi__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -6623,7 +6623,7 @@ lbl_800CB270: /* 800CB27C 000C81DC 80 01 00 54 */ lwz r0, 0x54(r1) /* 800CB280 000C81E0 7C 08 03 A6 */ mtlr r0 /* 800CB284 000C81E4 38 21 00 50 */ addi r1, r1, 0x50 -/* 800CB288 000C81E8 4E 80 00 20 */ blr +/* 800CB288 000C81E8 4E 80 00 20 */ blr .global LoadThardusRockProjectile__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadThardusRockProjectile__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -6805,7 +6805,7 @@ lbl_800CB518: /* 800CB524 000C8484 80 01 03 84 */ lwz r0, 0x384(r1) /* 800CB528 000C8488 7C 08 03 A6 */ mtlr r0 /* 800CB52C 000C848C 38 21 03 80 */ addi r1, r1, 0x380 -/* 800CB530 000C8490 4E 80 00 20 */ blr +/* 800CB530 000C8490 4E 80 00 20 */ blr .global "construct<10CModelData>__4rstlFPvRC10CModelData" "construct<10CModelData>__4rstlFPvRC10CModelData": @@ -6841,7 +6841,7 @@ lbl_800CB574: /* 800CB5A0 000C8500 80 01 00 14 */ lwz r0, 0x14(r1) /* 800CB5A4 000C8504 7C 08 03 A6 */ mtlr r0 /* 800CB5A8 000C8508 38 21 00 10 */ addi r1, r1, 0x10 -/* 800CB5AC 000C850C 4E 80 00 20 */ blr +/* 800CB5AC 000C850C 4E 80 00 20 */ blr .global sub_800cb5b0 sub_800cb5b0: @@ -6855,7 +6855,7 @@ lbl_800CB5C8: /* 800CB5C8 000C8528 80 01 00 14 */ lwz r0, 0x14(r1) /* 800CB5CC 000C852C 7C 08 03 A6 */ mtlr r0 /* 800CB5D0 000C8530 38 21 00 10 */ addi r1, r1, 0x10 -/* 800CB5D4 000C8534 4E 80 00 20 */ blr +/* 800CB5D4 000C8534 4E 80 00 20 */ blr .global LoadFlaahgraTentacle__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadFlaahgraTentacle__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -6979,7 +6979,7 @@ lbl_800CB784: /* 800CB794 000C86F4 83 81 02 E0 */ lwz r28, 0x2e0(r1) /* 800CB798 000C86F8 7C 08 03 A6 */ mtlr r0 /* 800CB79C 000C86FC 38 21 02 F0 */ addi r1, r1, 0x2f0 -/* 800CB7A0 000C8700 4E 80 00 20 */ blr +/* 800CB7A0 000C8700 4E 80 00 20 */ blr .global LoadWallCrawlerSwarm__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadWallCrawlerSwarm__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -7274,7 +7274,7 @@ lbl_800CBB90: /* 800CBC14 000C8B74 80 01 04 14 */ lwz r0, 0x414(r1) /* 800CBC18 000C8B78 7C 08 03 A6 */ mtlr r0 /* 800CBC1C 000C8B7C 38 21 04 10 */ addi r1, r1, 0x410 -/* 800CBC20 000C8B80 4E 80 00 20 */ blr +/* 800CBC20 000C8B80 4E 80 00 20 */ blr .global LoadThardus__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadThardus__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -7827,7 +7827,7 @@ lbl_800CC440: /* 800CC474 000C93D4 80 01 09 54 */ lwz r0, 0x954(r1) /* 800CC478 000C93D8 7C 08 03 A6 */ mtlr r0 /* 800CC47C 000C93DC 38 21 09 50 */ addi r1, r1, 0x950 -/* 800CC480 000C93E0 4E 80 00 20 */ blr +/* 800CC480 000C93E0 4E 80 00 20 */ blr .global LoadJellyZap__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadJellyZap__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -8054,7 +8054,7 @@ lbl_800CC778: /* 800CC7DC 000C973C 80 01 03 E4 */ lwz r0, 0x3e4(r1) /* 800CC7E0 000C9740 7C 08 03 A6 */ mtlr r0 /* 800CC7E4 000C9744 38 21 03 E0 */ addi r1, r1, 0x3e0 -/* 800CC7E8 000C9748 4E 80 00 20 */ blr +/* 800CC7E8 000C9748 4E 80 00 20 */ blr .global LoadVisorGoo__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadVisorGoo__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -8165,12 +8165,12 @@ lbl_800CC970: /* 800CC97C 000C98DC 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 800CC980 000C98E0 7C 08 03 A6 */ mtlr r0 /* 800CC984 000C98E4 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 800CC988 000C98E8 4E 80 00 20 */ blr +/* 800CC988 000C98E8 4E 80 00 20 */ blr .global LoadSaveStation__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadSaveStation__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: /* 800CC98C 000C98EC 38 60 00 00 */ li r3, 0 -/* 800CC990 000C98F0 4E 80 00 20 */ blr +/* 800CC990 000C98F0 4E 80 00 20 */ blr .global LoadPlayerStateChange__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadPlayerStateChange__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -8242,7 +8242,7 @@ lbl_800CCA88: /* 800CCA8C 000C99EC 80 01 00 54 */ lwz r0, 0x54(r1) /* 800CCA90 000C99F0 7C 08 03 A6 */ mtlr r0 /* 800CCA94 000C99F4 38 21 00 50 */ addi r1, r1, 0x50 -/* 800CCA98 000C99F8 4E 80 00 20 */ blr +/* 800CCA98 000C99F8 4E 80 00 20 */ blr .global LoadSwitch__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadSwitch__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -8302,7 +8302,7 @@ lbl_800CCB60: /* 800CCB64 000C9AC4 80 01 00 44 */ lwz r0, 0x44(r1) /* 800CCB68 000C9AC8 7C 08 03 A6 */ mtlr r0 /* 800CCB6C 000C9ACC 38 21 00 40 */ addi r1, r1, 0x40 -/* 800CCB70 000C9AD0 4E 80 00 20 */ blr +/* 800CCB70 000C9AD0 4E 80 00 20 */ blr .global LoadControllerAction__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadControllerAction__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -8392,7 +8392,7 @@ lbl_800CCC9C: /* 800CCCA0 000C9C00 80 01 00 54 */ lwz r0, 0x54(r1) /* 800CCCA4 000C9C04 7C 08 03 A6 */ mtlr r0 /* 800CCCA8 000C9C08 38 21 00 50 */ addi r1, r1, 0x50 -/* 800CCCAC 000C9C0C 4E 80 00 20 */ blr +/* 800CCCAC 000C9C0C 4E 80 00 20 */ blr .global LoadWorldTeleporter__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadWorldTeleporter__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -8674,7 +8674,7 @@ lbl_800CD070: /* 800CD08C 000C9FEC 80 01 01 14 */ lwz r0, 0x114(r1) /* 800CD090 000C9FF0 7C 08 03 A6 */ mtlr r0 /* 800CD094 000C9FF4 38 21 01 10 */ addi r1, r1, 0x110 -/* 800CD098 000C9FF8 4E 80 00 20 */ blr +/* 800CD098 000C9FF8 4E 80 00 20 */ blr .global LoadVisorFlare__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadVisorFlare__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -9170,7 +9170,7 @@ lbl_800CD78C: /* 800CD7A8 000CA708 80 01 01 94 */ lwz r0, 0x194(r1) /* 800CD7AC 000CA70C 7C 08 03 A6 */ mtlr r0 /* 800CD7B0 000CA710 38 21 01 90 */ addi r1, r1, 0x190 -/* 800CD7B4 000CA714 4E 80 00 20 */ blr +/* 800CD7B4 000CA714 4E 80 00 20 */ blr .global sub_800cd7b8 sub_800cd7b8: @@ -9223,7 +9223,7 @@ lbl_800CD848: /* 800CD85C 000CA7BC 83 81 00 20 */ lwz r28, 0x20(r1) /* 800CD860 000CA7C0 7C 08 03 A6 */ mtlr r0 /* 800CD864 000CA7C4 38 21 00 30 */ addi r1, r1, 0x30 -/* 800CD868 000CA7C8 4E 80 00 20 */ blr +/* 800CD868 000CA7C8 4E 80 00 20 */ blr .global LoadDrone__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadDrone__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -10041,7 +10041,7 @@ lbl_800CE3C8: /* 800CE45C 000CB3BC 80 01 06 34 */ lwz r0, 0x634(r1) /* 800CE460 000CB3C0 7C 08 03 A6 */ mtlr r0 /* 800CE464 000CB3C4 38 21 06 30 */ addi r1, r1, 0x630 -/* 800CE468 000CB3C8 4E 80 00 20 */ blr +/* 800CE468 000CB3C8 4E 80 00 20 */ blr .global sub_800ce46c sub_800ce46c: @@ -10110,7 +10110,7 @@ lbl_800CE540: /* 800CE548 000CB4A8 80 01 00 24 */ lwz r0, 0x24(r1) /* 800CE54C 000CB4AC 7C 08 03 A6 */ mtlr r0 /* 800CE550 000CB4B0 38 21 00 20 */ addi r1, r1, 0x20 -/* 800CE554 000CB4B4 4E 80 00 20 */ blr +/* 800CE554 000CB4B4 4E 80 00 20 */ blr .global LoadFlareDef__FR12CInputStream LoadFlareDef__FR12CInputStream: @@ -10155,7 +10155,7 @@ LoadFlareDef__FR12CInputStream: /* 800CE5F0 000CB550 81 84 00 00 */ lwz r12, 0(r4) /* 800CE5F4 000CB554 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800CE5F8 000CB558 7D 89 03 A6 */ mtctr r12 -/* 800CE5FC 000CB55C 4E 80 04 21 */ bctrl +/* 800CE5FC 000CB55C 4E 80 04 21 */ bctrl /* 800CE600 000CB560 38 61 00 1C */ addi r3, r1, 0x1c /* 800CE604 000CB564 38 81 00 0C */ addi r4, r1, 0xc /* 800CE608 000CB568 48 27 28 A1 */ bl __ct__6CTokenFRC6CToken @@ -10205,7 +10205,7 @@ lbl_800CE690: /* 800CE6AC 000CB60C 83 A1 00 44 */ lwz r29, 0x44(r1) /* 800CE6B0 000CB610 7C 08 03 A6 */ mtlr r0 /* 800CE6B4 000CB614 38 21 00 70 */ addi r1, r1, 0x70 -/* 800CE6B8 000CB618 4E 80 00 20 */ blr +/* 800CE6B8 000CB618 4E 80 00 20 */ blr .global LoadFishCloudModifier__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadFishCloudModifier__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -10297,7 +10297,7 @@ lbl_800CE7EC: /* 800CE7F8 000CB758 80 01 00 64 */ lwz r0, 0x64(r1) /* 800CE7FC 000CB75C 7C 08 03 A6 */ mtlr r0 /* 800CE800 000CB760 38 21 00 60 */ addi r1, r1, 0x60 -/* 800CE804 000CB764 4E 80 00 20 */ blr +/* 800CE804 000CB764 4E 80 00 20 */ blr .global LoadFishCloud__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadFishCloud__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -10578,7 +10578,7 @@ lbl_800CEBC8: /* 800CEC3C 000CBB9C 80 01 02 84 */ lwz r0, 0x284(r1) /* 800CEC40 000CBBA0 7C 08 03 A6 */ mtlr r0 /* 800CEC44 000CBBA4 38 21 02 80 */ addi r1, r1, 0x280 -/* 800CEC48 000CBBA8 4E 80 00 20 */ blr +/* 800CEC48 000CBBA8 4E 80 00 20 */ blr .global LoadRoomAcoustics__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadRoomAcoustics__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -10754,7 +10754,7 @@ lbl_800CEED8: /* 800CEEE4 000CBE44 80 01 01 34 */ lwz r0, 0x134(r1) /* 800CEEE8 000CBE48 7C 08 03 A6 */ mtlr r0 /* 800CEEEC 000CBE4C 38 21 01 30 */ addi r1, r1, 0x130 -/* 800CEEF0 000CBE50 4E 80 00 20 */ blr +/* 800CEEF0 000CBE50 4E 80 00 20 */ blr .global LoadPlayerActor__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadPlayerActor__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -11036,7 +11036,7 @@ lbl_800CF2EC: /* 800CF300 000CC260 80 01 03 14 */ lwz r0, 0x314(r1) /* 800CF304 000CC264 7C 08 03 A6 */ mtlr r0 /* 800CF308 000CC268 38 21 03 10 */ addi r1, r1, 0x310 -/* 800CF30C 000CC26C 4E 80 00 20 */ blr +/* 800CF30C 000CC26C 4E 80 00 20 */ blr .global LoadIceSheegoth__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadIceSheegoth__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -11168,7 +11168,7 @@ lbl_800CF4DC: /* 800CF4EC 000CC44C 83 81 04 D0 */ lwz r28, 0x4d0(r1) /* 800CF4F0 000CC450 7C 08 03 A6 */ mtlr r0 /* 800CF4F4 000CC454 38 21 04 E0 */ addi r1, r1, 0x4e0 -/* 800CF4F8 000CC458 4E 80 00 20 */ blr +/* 800CF4F8 000CC458 4E 80 00 20 */ blr .global LoadEMPulse__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadEMPulse__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -11256,7 +11256,7 @@ lbl_800CF628: /* 800CF634 000CC594 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 800CF638 000CC598 7C 08 03 A6 */ mtlr r0 /* 800CF63C 000CC59C 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 800CF640 000CC5A0 4E 80 00 20 */ blr +/* 800CF640 000CC5A0 4E 80 00 20 */ blr .global LoadTargetingPoint__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadTargetingPoint__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -11314,7 +11314,7 @@ lbl_800CF6F4: /* 800CF704 000CC664 83 81 00 50 */ lwz r28, 0x50(r1) /* 800CF708 000CC668 7C 08 03 A6 */ mtlr r0 /* 800CF70C 000CC66C 38 21 00 60 */ addi r1, r1, 0x60 -/* 800CF710 000CC670 4E 80 00 20 */ blr +/* 800CF710 000CC670 4E 80 00 20 */ blr .global LoadBallTrigger__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadBallTrigger__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -11417,7 +11417,7 @@ lbl_800CF86C: /* 800CF888 000CC7E8 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 800CF88C 000CC7EC 7C 08 03 A6 */ mtlr r0 /* 800CF890 000CC7F0 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 800CF894 000CC7F4 4E 80 00 20 */ blr +/* 800CF894 000CC7F4 4E 80 00 20 */ blr .global LoadMetroidBeta__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadMetroidBeta__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -11559,7 +11559,7 @@ lbl_800CFA8C: /* 800CFA9C 000CC9FC 83 81 04 20 */ lwz r28, 0x420(r1) /* 800CFAA0 000CCA00 7C 08 03 A6 */ mtlr r0 /* 800CFAA4 000CCA04 38 21 04 30 */ addi r1, r1, 0x430 -/* 800CFAA8 000CCA08 4E 80 00 20 */ blr +/* 800CFAA8 000CCA08 4E 80 00 20 */ blr .global LoadMetroid__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadMetroid__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -11724,7 +11724,7 @@ lbl_800CFD04: /* 800CFD08 000CCC68 80 01 04 64 */ lwz r0, 0x464(r1) /* 800CFD0C 000CCC6C 7C 08 03 A6 */ mtlr r0 /* 800CFD10 000CCC70 38 21 04 60 */ addi r1, r1, 0x460 -/* 800CFD14 000CCC74 4E 80 00 20 */ blr +/* 800CFD14 000CCC74 4E 80 00 20 */ blr .global sub_800cfd18 sub_800cfd18: @@ -11764,7 +11764,7 @@ lbl_800CFD80: /* 800CFD88 000CCCE8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800CFD8C 000CCCEC 7C 08 03 A6 */ mtlr r0 /* 800CFD90 000CCCF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800CFD94 000CCCF4 4E 80 00 20 */ blr +/* 800CFD94 000CCCF4 4E 80 00 20 */ blr .global LoadPickupGenerator__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadPickupGenerator__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -11832,7 +11832,7 @@ lbl_800CFE6C: /* 800CFE80 000CCDE0 83 81 00 38 */ lwz r28, 0x38(r1) /* 800CFE84 000CCDE4 7C 08 03 A6 */ mtlr r0 /* 800CFE88 000CCDE8 38 21 00 50 */ addi r1, r1, 0x50 -/* 800CFE8C 000CCDEC 4E 80 00 20 */ blr +/* 800CFE8C 000CCDEC 4E 80 00 20 */ blr .global LoadRipper__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadRipper__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -11996,7 +11996,7 @@ lbl_800D00E8: /* 800D00EC 000CD04C 80 01 03 94 */ lwz r0, 0x394(r1) /* 800D00F0 000CD050 7C 08 03 A6 */ mtlr r0 /* 800D00F4 000CD054 38 21 03 90 */ addi r1, r1, 0x390 -/* 800D00F8 000CD058 4E 80 00 20 */ blr +/* 800D00F8 000CD058 4E 80 00 20 */ blr .global LoadParasite__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadParasite__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -12312,7 +12312,7 @@ lbl_800D052C: /* 800D05B8 000CD518 80 01 04 B4 */ lwz r0, 0x4b4(r1) /* 800D05BC 000CD51C 7C 08 03 A6 */ mtlr r0 /* 800D05C0 000CD520 38 21 04 B0 */ addi r1, r1, 0x4b0 -/* 800D05C4 000CD524 4E 80 00 20 */ blr +/* 800D05C4 000CD524 4E 80 00 20 */ blr .global LoadFlaahgra__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadFlaahgra__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -12470,7 +12470,7 @@ lbl_800D07F4: /* 800D0804 000CD764 83 81 04 20 */ lwz r28, 0x420(r1) /* 800D0808 000CD768 7C 08 03 A6 */ mtlr r0 /* 800D080C 000CD76C 38 21 04 30 */ addi r1, r1, 0x430 -/* 800D0810 000CD770 4E 80 00 20 */ blr +/* 800D0810 000CD770 4E 80 00 20 */ blr .global LoadNewIntroBoss__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadNewIntroBoss__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -12621,7 +12621,7 @@ lbl_800D0A30: /* 800D0A3C 000CD99C 80 01 03 44 */ lwz r0, 0x344(r1) /* 800D0A40 000CD9A0 7C 08 03 A6 */ mtlr r0 /* 800D0A44 000CD9A4 38 21 03 40 */ addi r1, r1, 0x340 -/* 800D0A48 000CD9A8 4E 80 00 20 */ blr +/* 800D0A48 000CD9A8 4E 80 00 20 */ blr .global LoadMetaree__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadMetaree__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -12804,7 +12804,7 @@ lbl_800D0CC4: /* 800D0CF4 000CDC54 83 81 03 40 */ lwz r28, 0x340(r1) /* 800D0CF8 000CDC58 7C 08 03 A6 */ mtlr r0 /* 800D0CFC 000CDC5C 38 21 03 90 */ addi r1, r1, 0x390 -/* 800D0D00 000CDC60 4E 80 00 20 */ blr +/* 800D0D00 000CDC60 4E 80 00 20 */ blr .global LoadDockAreaChange__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadDockAreaChange__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -12860,7 +12860,7 @@ lbl_800D0DB8: /* 800D0DBC 000CDD1C 80 01 00 44 */ lwz r0, 0x44(r1) /* 800D0DC0 000CDD20 7C 08 03 A6 */ mtlr r0 /* 800D0DC4 000CDD24 38 21 00 40 */ addi r1, r1, 0x40 -/* 800D0DC8 000CDD28 4E 80 00 20 */ blr +/* 800D0DC8 000CDD28 4E 80 00 20 */ blr .global LoadAreaAttributes__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadAreaAttributes__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -12947,7 +12947,7 @@ lbl_800D0EF0: /* 800D0EFC 000CDE5C 80 01 00 54 */ lwz r0, 0x54(r1) /* 800D0F00 000CDE60 7C 08 03 A6 */ mtlr r0 /* 800D0F04 000CDE64 38 21 00 50 */ addi r1, r1, 0x50 -/* 800D0F08 000CDE68 4E 80 00 20 */ blr +/* 800D0F08 000CDE68 4E 80 00 20 */ blr .global LoadDistanceFog__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadDistanceFog__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -13081,7 +13081,7 @@ lbl_800D10CC: /* 800D10D8 000CE038 80 01 00 74 */ lwz r0, 0x74(r1) /* 800D10DC 000CE03C 7C 08 03 A6 */ mtlr r0 /* 800D10E0 000CE040 38 21 00 70 */ addi r1, r1, 0x70 -/* 800D10E4 000CE044 4E 80 00 20 */ blr +/* 800D10E4 000CE044 4E 80 00 20 */ blr .global LoadSpankWeed__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadSpankWeed__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -13239,7 +13239,7 @@ lbl_800D12FC: /* 800D132C 000CE28C 83 81 02 E0 */ lwz r28, 0x2e0(r1) /* 800D1330 000CE290 7C 08 03 A6 */ mtlr r0 /* 800D1334 000CE294 38 21 03 30 */ addi r1, r1, 0x330 -/* 800D1338 000CE298 4E 80 00 20 */ blr +/* 800D1338 000CE298 4E 80 00 20 */ blr .global LoadFireFlea__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadFireFlea__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -13375,7 +13375,7 @@ lbl_800D1510: /* 800D1528 000CE488 83 81 02 E0 */ lwz r28, 0x2e0(r1) /* 800D152C 000CE48C 7C 08 03 A6 */ mtlr r0 /* 800D1530 000CE490 38 21 03 00 */ addi r1, r1, 0x300 -/* 800D1534 000CE494 4E 80 00 20 */ blr +/* 800D1534 000CE494 4E 80 00 20 */ blr .global LoadPuddleToadGamma__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadPuddleToadGamma__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -13569,7 +13569,7 @@ lbl_800D17DC: /* 800D1810 000CE770 80 01 03 F4 */ lwz r0, 0x3f4(r1) /* 800D1814 000CE774 7C 08 03 A6 */ mtlr r0 /* 800D1818 000CE778 38 21 03 F0 */ addi r1, r1, 0x3f0 -/* 800D181C 000CE77C 4E 80 00 20 */ blr +/* 800D181C 000CE77C 4E 80 00 20 */ blr .global LoadDebugCameraWaypoint__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadDebugCameraWaypoint__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -13627,7 +13627,7 @@ lbl_800D18D0: /* 800D18E0 000CE840 83 81 00 50 */ lwz r28, 0x50(r1) /* 800D18E4 000CE844 7C 08 03 A6 */ mtlr r0 /* 800D18E8 000CE848 38 21 00 60 */ addi r1, r1, 0x60 -/* 800D18EC 000CE84C 4E 80 00 20 */ blr +/* 800D18EC 000CE84C 4E 80 00 20 */ blr .global LoadSpiderBallAttractionSurface__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadSpiderBallAttractionSurface__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -13686,7 +13686,7 @@ lbl_800D19A4: /* 800D19B4 000CE914 83 81 00 60 */ lwz r28, 0x60(r1) /* 800D19B8 000CE918 7C 08 03 A6 */ mtlr r0 /* 800D19BC 000CE91C 38 21 00 70 */ addi r1, r1, 0x70 -/* 800D19C0 000CE920 4E 80 00 20 */ blr +/* 800D19C0 000CE920 4E 80 00 20 */ blr .global LoadPuddleSpore__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadPuddleSpore__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -13883,7 +13883,7 @@ lbl_800D1C78: /* 800D1CA4 000CEC04 80 01 03 B4 */ lwz r0, 0x3b4(r1) /* 800D1CA8 000CEC08 7C 08 03 A6 */ mtlr r0 /* 800D1CAC 000CEC0C 38 21 03 B0 */ addi r1, r1, 0x3b0 -/* 800D1CB0 000CEC10 4E 80 00 20 */ blr +/* 800D1CB0 000CEC10 4E 80 00 20 */ blr .global LoadChozoGhost__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadChozoGhost__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -14153,7 +14153,7 @@ lbl_800D206C: /* 800D20B8 000CF018 80 01 04 94 */ lwz r0, 0x494(r1) /* 800D20BC 000CF01C 7C 08 03 A6 */ mtlr r0 /* 800D20C0 000CF020 38 21 04 90 */ addi r1, r1, 0x490 -/* 800D20C4 000CF024 4E 80 00 20 */ blr +/* 800D20C4 000CF024 4E 80 00 20 */ blr .global LoadFlickerBat__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadFlickerBat__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -14307,7 +14307,7 @@ lbl_800D22F8: /* 800D22FC 000CF25C 80 01 03 44 */ lwz r0, 0x344(r1) /* 800D2300 000CF260 7C 08 03 A6 */ mtlr r0 /* 800D2304 000CF264 38 21 03 40 */ addi r1, r1, 0x340 -/* 800D2308 000CF268 4E 80 00 20 */ blr +/* 800D2308 000CF268 4E 80 00 20 */ blr .global LoadGrapplePoint__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadGrapplePoint__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -14410,7 +14410,7 @@ lbl_800D246C: /* 800D247C 000CF3DC 83 81 00 D0 */ lwz r28, 0xd0(r1) /* 800D2480 000CF3E0 7C 08 03 A6 */ mtlr r0 /* 800D2484 000CF3E4 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 800D2488 000CF3E8 4E 80 00 20 */ blr +/* 800D2488 000CF3E8 4E 80 00 20 */ blr .global LoadBloodFlower__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadBloodFlower__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -14587,7 +14587,7 @@ lbl_800D2710: /* 800D271C 000CF67C 80 01 03 A4 */ lwz r0, 0x3a4(r1) /* 800D2720 000CF680 7C 08 03 A6 */ mtlr r0 /* 800D2724 000CF684 38 21 03 A0 */ addi r1, r1, 0x3a0 -/* 800D2728 000CF688 4E 80 00 20 */ blr +/* 800D2728 000CF688 4E 80 00 20 */ blr .global LoadSpiderBallWaypoint__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadSpiderBallWaypoint__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -14643,7 +14643,7 @@ lbl_800D27E0: /* 800D27E4 000CF744 80 01 00 74 */ lwz r0, 0x74(r1) /* 800D27E8 000CF748 7C 08 03 A6 */ mtlr r0 /* 800D27EC 000CF74C 38 21 00 70 */ addi r1, r1, 0x70 -/* 800D27F0 000CF750 4E 80 00 20 */ blr +/* 800D27F0 000CF750 4E 80 00 20 */ blr .global LoadAiJumpPoint__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadAiJumpPoint__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -14707,7 +14707,7 @@ lbl_800D28B8: /* 800D28CC 000CF82C 83 81 00 58 */ lwz r28, 0x58(r1) /* 800D28D0 000CF830 7C 08 03 A6 */ mtlr r0 /* 800D28D4 000CF834 38 21 00 70 */ addi r1, r1, 0x70 -/* 800D28D8 000CF838 4E 80 00 20 */ blr +/* 800D28D8 000CF838 4E 80 00 20 */ blr .global LoadCoverPoint__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadCoverPoint__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -14785,7 +14785,7 @@ lbl_800D29DC: /* 800D29EC 000CF94C 80 01 00 84 */ lwz r0, 0x84(r1) /* 800D29F0 000CF950 7C 08 03 A6 */ mtlr r0 /* 800D29F4 000CF954 38 21 00 80 */ addi r1, r1, 0x80 -/* 800D29F8 000CF958 4E 80 00 20 */ blr +/* 800D29F8 000CF958 4E 80 00 20 */ blr .global LoadFlyingPirate__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadFlyingPirate__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -14910,7 +14910,7 @@ lbl_800D2BB8: /* 800D2BBC 000CFB1C 80 01 03 04 */ lwz r0, 0x304(r1) /* 800D2BC0 000CFB20 7C 08 03 A6 */ mtlr r0 /* 800D2BC4 000CFB24 38 21 03 00 */ addi r1, r1, 0x300 -/* 800D2BC8 000CFB28 4E 80 00 20 */ blr +/* 800D2BC8 000CFB28 4E 80 00 20 */ blr .global LoadSpacePirate__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadSpacePirate__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -15072,12 +15072,12 @@ lbl_800D2E18: /* 800D2E1C 000CFD7C 80 01 03 54 */ lwz r0, 0x354(r1) /* 800D2E20 000CFD80 7C 08 03 A6 */ mtlr r0 /* 800D2E24 000CFD84 38 21 03 50 */ addi r1, r1, 0x350 -/* 800D2E28 000CFD88 4E 80 00 20 */ blr +/* 800D2E28 000CFD88 4E 80 00 20 */ blr .global LoadMapStation__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadMapStation__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: /* 800D2E2C 000CFD8C 38 60 00 00 */ li r3, 0 -/* 800D2E30 000CFD90 4E 80 00 20 */ blr +/* 800D2E30 000CFD90 4E 80 00 20 */ blr .global LoadFogVolume__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadFogVolume__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -15228,7 +15228,7 @@ lbl_800D3050: /* 800D3064 000CFFC4 80 01 01 04 */ lwz r0, 0x104(r1) /* 800D3068 000CFFC8 7C 08 03 A6 */ mtlr r0 /* 800D306C 000CFFCC 38 21 01 00 */ addi r1, r1, 0x100 -/* 800D3070 000CFFD0 4E 80 00 20 */ blr +/* 800D3070 000CFFD0 4E 80 00 20 */ blr .global LoadSpecialFunction__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadSpecialFunction__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -15393,7 +15393,7 @@ lbl_800D32B4: /* 800D32D8 000D0238 80 01 01 24 */ lwz r0, 0x124(r1) /* 800D32DC 000D023C 7C 08 03 A6 */ mtlr r0 /* 800D32E0 000D0240 38 21 01 20 */ addi r1, r1, 0x120 -/* 800D32E4 000D0244 4E 80 00 20 */ blr +/* 800D32E4 000D0244 4E 80 00 20 */ blr .global LoadActorRotate__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadActorRotate__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -15463,7 +15463,7 @@ lbl_800D33D0: /* 800D33D8 000D0338 80 01 00 54 */ lwz r0, 0x54(r1) /* 800D33DC 000D033C 7C 08 03 A6 */ mtlr r0 /* 800D33E0 000D0340 38 21 00 50 */ addi r1, r1, 0x50 -/* 800D33E4 000D0344 4E 80 00 20 */ blr +/* 800D33E4 000D0344 4E 80 00 20 */ blr .global LoadColorModulate__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadColorModulate__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -15560,7 +15560,7 @@ lbl_800D3538: /* 800D3544 000D04A4 80 01 00 84 */ lwz r0, 0x84(r1) /* 800D3548 000D04A8 7C 08 03 A6 */ mtlr r0 /* 800D354C 000D04AC 38 21 00 80 */ addi r1, r1, 0x80 -/* 800D3550 000D04B0 4E 80 00 20 */ blr +/* 800D3550 000D04B0 4E 80 00 20 */ blr .global LoadAIKeyframe__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadAIKeyframe__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -15578,7 +15578,7 @@ lbl_800D357C: /* 800D357C 000D04DC 80 01 00 14 */ lwz r0, 0x14(r1) /* 800D3580 000D04E0 7C 08 03 A6 */ mtlr r0 /* 800D3584 000D04E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D3588 000D04E8 4E 80 00 20 */ blr +/* 800D3588 000D04E8 4E 80 00 20 */ blr .global LoadActorKeyframe__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadActorKeyframe__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -15693,7 +15693,7 @@ lbl_800D3720: /* 800D372C 000D068C 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 800D3730 000D0690 7C 08 03 A6 */ mtlr r0 /* 800D3734 000D0694 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 800D3738 000D0698 4E 80 00 20 */ blr +/* 800D3738 000D0698 4E 80 00 20 */ blr .global LoadNewCameraShaker__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadNewCameraShaker__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -15926,7 +15926,7 @@ lbl_800D3A80: /* 800D3A94 000D09F4 80 01 02 A4 */ lwz r0, 0x2a4(r1) /* 800D3A98 000D09F8 7C 08 03 A6 */ mtlr r0 /* 800D3A9C 000D09FC 38 21 02 A0 */ addi r1, r1, 0x2a0 -/* 800D3AA0 000D0A00 4E 80 00 20 */ blr +/* 800D3AA0 000D0A00 4E 80 00 20 */ blr .global LoadCameraShaker__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadCameraShaker__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -16027,7 +16027,7 @@ lbl_800D3BE8: /* 800D3BF8 000D0B58 83 81 01 D0 */ lwz r28, 0x1d0(r1) /* 800D3BFC 000D0B5C 7C 08 03 A6 */ mtlr r0 /* 800D3C00 000D0B60 38 21 01 E0 */ addi r1, r1, 0x1e0 -/* 800D3C04 000D0B64 4E 80 00 20 */ blr +/* 800D3C04 000D0B64 4E 80 00 20 */ blr .global LoadDebrisExtended__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadDebrisExtended__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -16321,7 +16321,7 @@ lbl_800D4004: /* 800D4068 000D0FC8 80 01 03 A4 */ lwz r0, 0x3a4(r1) /* 800D406C 000D0FCC 7C 08 03 A6 */ mtlr r0 /* 800D4070 000D0FD0 38 21 03 A0 */ addi r1, r1, 0x3a0 -/* 800D4074 000D0FD4 4E 80 00 20 */ blr +/* 800D4074 000D0FD4 4E 80 00 20 */ blr .global LoadDebris__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadDebris__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -16485,7 +16485,7 @@ lbl_800D42B4: /* 800D42D8 000D1238 80 01 02 34 */ lwz r0, 0x234(r1) /* 800D42DC 000D123C 7C 08 03 A6 */ mtlr r0 /* 800D42E0 000D1240 38 21 02 30 */ addi r1, r1, 0x230 -/* 800D42E4 000D1244 4E 80 00 20 */ blr +/* 800D42E4 000D1244 4E 80 00 20 */ blr .global LoadCameraBlurKeyframe__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadCameraBlurKeyframe__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -16563,7 +16563,7 @@ lbl_800D43E8: /* 800D43F8 000D1358 80 01 00 54 */ lwz r0, 0x54(r1) /* 800D43FC 000D135C 7C 08 03 A6 */ mtlr r0 /* 800D4400 000D1360 38 21 00 50 */ addi r1, r1, 0x50 -/* 800D4404 000D1364 4E 80 00 20 */ blr +/* 800D4404 000D1364 4E 80 00 20 */ blr .global LoadCameraFilterKeyframe__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadCameraFilterKeyframe__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -16663,7 +16663,7 @@ lbl_800D455C: /* 800D4570 000D14D0 80 01 00 84 */ lwz r0, 0x84(r1) /* 800D4574 000D14D4 7C 08 03 A6 */ mtlr r0 /* 800D4578 000D14D8 38 21 00 80 */ addi r1, r1, 0x80 -/* 800D457C 000D14DC 4E 80 00 20 */ blr +/* 800D457C 000D14DC 4E 80 00 20 */ blr .global LoadHUDMemo__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadHUDMemo__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -16741,7 +16741,7 @@ lbl_800D4680: /* 800D4684 000D15E4 80 01 00 44 */ lwz r0, 0x44(r1) /* 800D4688 000D15E8 7C 08 03 A6 */ mtlr r0 /* 800D468C 000D15EC 38 21 00 40 */ addi r1, r1, 0x40 -/* 800D4690 000D15F0 4E 80 00 20 */ blr +/* 800D4690 000D15F0 4E 80 00 20 */ blr .global LoadFaultyRelay__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadFaultyRelay__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -16815,7 +16815,7 @@ lbl_800D477C: /* 800D478C 000D16EC 83 81 00 20 */ lwz r28, 0x20(r1) /* 800D4790 000D16F0 7C 08 03 A6 */ mtlr r0 /* 800D4794 000D16F4 38 21 00 30 */ addi r1, r1, 0x30 -/* 800D4798 000D16F8 4E 80 00 20 */ blr +/* 800D4798 000D16F8 4E 80 00 20 */ blr .global LoadRandomRelay__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadRandomRelay__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -16881,7 +16881,7 @@ lbl_800D4878: /* 800D487C 000D17DC 80 01 00 44 */ lwz r0, 0x44(r1) /* 800D4880 000D17E0 7C 08 03 A6 */ mtlr r0 /* 800D4884 000D17E4 38 21 00 40 */ addi r1, r1, 0x40 -/* 800D4888 000D17E8 4E 80 00 20 */ blr +/* 800D4888 000D17E8 4E 80 00 20 */ blr .global LoadRelay__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadRelay__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -16955,7 +16955,7 @@ lbl_800D4980: /* 800D4984 000D18E4 80 01 00 44 */ lwz r0, 0x44(r1) /* 800D4988 000D18E8 7C 08 03 A6 */ mtlr r0 /* 800D498C 000D18EC 38 21 00 40 */ addi r1, r1, 0x40 -/* 800D4990 000D18F0 4E 80 00 20 */ blr +/* 800D4990 000D18F0 4E 80 00 20 */ blr .global LoadSpindleCamera__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadSpindleCamera__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -17574,7 +17574,7 @@ lbl_800D52F4: /* 800D5318 000D2278 80 01 05 F4 */ lwz r0, 0x5f4(r1) /* 800D531C 000D227C 7C 08 03 A6 */ mtlr r0 /* 800D5320 000D2280 38 21 05 F0 */ addi r1, r1, 0x5f0 -/* 800D5324 000D2284 4E 80 00 20 */ blr +/* 800D5324 000D2284 4E 80 00 20 */ blr .global LoadPathCamera__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadPathCamera__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -17660,7 +17660,7 @@ lbl_800D544C: /* 800D5458 000D23B8 80 01 00 94 */ lwz r0, 0x94(r1) /* 800D545C 000D23BC 7C 08 03 A6 */ mtlr r0 /* 800D5460 000D23C0 38 21 00 90 */ addi r1, r1, 0x90 -/* 800D5464 000D23C4 4E 80 00 20 */ blr +/* 800D5464 000D23C4 4E 80 00 20 */ blr .global LoadCamera__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadCamera__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -17851,7 +17851,7 @@ lbl_800D5704: /* 800D5730 000D2690 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 800D5734 000D2694 7C 08 03 A6 */ mtlr r0 /* 800D5738 000D2698 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 800D573C 000D269C 4E 80 00 20 */ blr +/* 800D573C 000D269C 4E 80 00 20 */ blr .global LoadCameraWaypoint__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadCameraWaypoint__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -17913,7 +17913,7 @@ lbl_800D5808: /* 800D5810 000D2770 80 01 00 74 */ lwz r0, 0x74(r1) /* 800D5814 000D2774 7C 08 03 A6 */ mtlr r0 /* 800D5818 000D2778 38 21 00 70 */ addi r1, r1, 0x70 -/* 800D581C 000D277C 4E 80 00 20 */ blr +/* 800D581C 000D277C 4E 80 00 20 */ blr .global LoadPlatform__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadPlatform__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -18051,7 +18051,7 @@ lbl_800D5990: /* 800D5A24 000D2984 81 84 00 00 */ lwz r12, 0(r4) /* 800D5A28 000D2988 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800D5A2C 000D298C 7D 89 03 A6 */ mtctr r12 -/* 800D5A30 000D2990 4E 80 04 21 */ bctrl +/* 800D5A30 000D2990 4E 80 04 21 */ bctrl /* 800D5A34 000D2994 3B 01 00 60 */ addi r24, r1, 0x60 /* 800D5A38 000D2998 38 81 00 38 */ addi r4, r1, 0x38 /* 800D5A3C 000D299C 7F 03 C3 78 */ mr r3, r24 @@ -18246,7 +18246,7 @@ lbl_800D5CF0: /* 800D5D04 000D2C64 80 01 04 44 */ lwz r0, 0x444(r1) /* 800D5D08 000D2C68 7C 08 03 A6 */ mtlr r0 /* 800D5D0C 000D2C6C 38 21 04 40 */ addi r1, r1, 0x440 -/* 800D5D10 000D2C70 4E 80 00 20 */ blr +/* 800D5D10 000D2C70 4E 80 00 20 */ blr .global __as__10CModelDataFRC10CModelData __as__10CModelDataFRC10CModelData: @@ -18427,7 +18427,7 @@ lbl_800D5F74: /* 800D5F88 000D2EE8 83 81 00 10 */ lwz r28, 0x10(r1) /* 800D5F8C 000D2EEC 7C 08 03 A6 */ mtlr r0 /* 800D5F90 000D2EF0 38 21 00 20 */ addi r1, r1, 0x20 -/* 800D5F94 000D2EF4 4E 80 00 20 */ blr +/* 800D5F94 000D2EF4 4E 80 00 20 */ blr .global LoadSound__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadSound__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -18559,7 +18559,7 @@ lbl_800D616C: /* 800D617C 000D30DC 80 01 00 F4 */ lwz r0, 0xf4(r1) /* 800D6180 000D30E0 7C 08 03 A6 */ mtlr r0 /* 800D6184 000D30E4 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 800D6188 000D30E8 4E 80 00 20 */ blr +/* 800D6188 000D30E8 4E 80 00 20 */ blr .global LoadGenerator__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadGenerator__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -18640,7 +18640,7 @@ lbl_800D629C: /* 800D62A8 000D3208 80 01 00 74 */ lwz r0, 0x74(r1) /* 800D62AC 000D320C 7C 08 03 A6 */ mtlr r0 /* 800D62B0 000D3210 38 21 00 70 */ addi r1, r1, 0x70 -/* 800D62B4 000D3214 4E 80 00 20 */ blr +/* 800D62B4 000D3214 4E 80 00 20 */ blr .global LoadCounter__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadCounter__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -18704,7 +18704,7 @@ lbl_800D638C: /* 800D6390 000D32F0 80 01 00 44 */ lwz r0, 0x44(r1) /* 800D6394 000D32F4 7C 08 03 A6 */ mtlr r0 /* 800D6398 000D32F8 38 21 00 40 */ addi r1, r1, 0x40 -/* 800D639C 000D32FC 4E 80 00 20 */ blr +/* 800D639C 000D32FC 4E 80 00 20 */ blr .global LoadTimer__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadTimer__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -18776,7 +18776,7 @@ lbl_800D648C: /* 800D6498 000D33F8 80 01 00 54 */ lwz r0, 0x54(r1) /* 800D649C 000D33FC 7C 08 03 A6 */ mtlr r0 /* 800D64A0 000D3400 38 21 00 50 */ addi r1, r1, 0x50 -/* 800D64A4 000D3404 4E 80 00 20 */ blr +/* 800D64A4 000D3404 4E 80 00 20 */ blr .global LoadEffect__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadEffect__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -19004,7 +19004,7 @@ lbl_800D67CC: /* 800D6808 000D3768 80 01 01 C4 */ lwz r0, 0x1c4(r1) /* 800D680C 000D376C 7C 08 03 A6 */ mtlr r0 /* 800D6810 000D3770 38 21 01 C0 */ addi r1, r1, 0x1c0 -/* 800D6814 000D3774 4E 80 00 20 */ blr +/* 800D6814 000D3774 4E 80 00 20 */ blr .global LoadDoor__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadDoor__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -19224,7 +19224,7 @@ lbl_800D6B3C: /* 800D6B48 000D3AA8 80 01 02 A4 */ lwz r0, 0x2a4(r1) /* 800D6B4C 000D3AAC 7C 08 03 A6 */ mtlr r0 /* 800D6B50 000D3AB0 38 21 02 A0 */ addi r1, r1, 0x2a0 -/* 800D6B54 000D3AB4 4E 80 00 20 */ blr +/* 800D6B54 000D3AB4 4E 80 00 20 */ blr .global LoadWaypoint__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadWaypoint__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -19316,7 +19316,7 @@ lbl_800D6C94: /* 800D6CA0 000D3C00 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 800D6CA4 000D3C04 7C 08 03 A6 */ mtlr r0 /* 800D6CA8 000D3C08 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 800D6CAC 000D3C0C 4E 80 00 20 */ blr +/* 800D6CAC 000D3C0C 4E 80 00 20 */ blr .global LoadWarWasp__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadWarWasp__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -19497,7 +19497,7 @@ lbl_800D6F4C: /* 800D6F50 000D3EB0 80 01 03 B4 */ lwz r0, 0x3b4(r1) /* 800D6F54 000D3EB4 7C 08 03 A6 */ mtlr r0 /* 800D6F58 000D3EB8 38 21 03 B0 */ addi r1, r1, 0x3b0 -/* 800D6F5C 000D3EBC 4E 80 00 20 */ blr +/* 800D6F5C 000D3EBC 4E 80 00 20 */ blr .global LoadBeetle__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadBeetle__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -19744,12 +19744,12 @@ lbl_800D72DC: /* 800D72F8 000D4258 80 01 04 A4 */ lwz r0, 0x4a4(r1) /* 800D72FC 000D425C 7C 08 03 A6 */ mtlr r0 /* 800D7300 000D4260 38 21 04 A0 */ addi r1, r1, 0x4a0 -/* 800D7304 000D4264 4E 80 00 20 */ blr +/* 800D7304 000D4264 4E 80 00 20 */ blr .global LoadEnemy__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadEnemy__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: /* 800D7308 000D4268 38 60 00 00 */ li r3, 0 -/* 800D730C 000D426C 4E 80 00 20 */ blr +/* 800D730C 000D426C 4E 80 00 20 */ blr .global LoadPickup__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadPickup__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -20039,7 +20039,7 @@ lbl_800D7724: /* 800D7748 000D46A8 80 01 03 C4 */ lwz r0, 0x3c4(r1) /* 800D774C 000D46AC 7C 08 03 A6 */ mtlr r0 /* 800D7750 000D46B0 38 21 03 C0 */ addi r1, r1, 0x3c0 -/* 800D7754 000D46B4 4E 80 00 20 */ blr +/* 800D7754 000D46B4 4E 80 00 20 */ blr .global LoadActor__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadActor__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -20380,7 +20380,7 @@ lbl_800D7C34: /* 800D7C50 000D4BB0 80 01 04 54 */ lwz r0, 0x454(r1) /* 800D7C54 000D4BB4 7C 08 03 A6 */ mtlr r0 /* 800D7C58 000D4BB8 38 21 04 50 */ addi r1, r1, 0x450 -/* 800D7C5C 000D4BBC 4E 80 00 20 */ blr +/* 800D7C5C 000D4BBC 4E 80 00 20 */ blr .global LoadPointOfInterest__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadPointOfInterest__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -20450,7 +20450,7 @@ lbl_800D7D3C: /* 800D7D50 000D4CB0 83 81 00 58 */ lwz r28, 0x58(r1) /* 800D7D54 000D4CB4 7C 08 03 A6 */ mtlr r0 /* 800D7D58 000D4CB8 38 21 00 70 */ addi r1, r1, 0x70 -/* 800D7D5C 000D4CBC 4E 80 00 20 */ blr +/* 800D7D5C 000D4CBC 4E 80 00 20 */ blr .global LoadPlayerHint__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadPlayerHint__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -20511,7 +20511,7 @@ lbl_800D7E28: /* 800D7E2C 000D4D8C 80 01 00 74 */ lwz r0, 0x74(r1) /* 800D7E30 000D4D90 7C 08 03 A6 */ mtlr r0 /* 800D7E34 000D4D94 38 21 00 70 */ addi r1, r1, 0x70 -/* 800D7E38 000D4D98 4E 80 00 20 */ blr +/* 800D7E38 000D4D98 4E 80 00 20 */ blr .global LoadCameraHint__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadCameraHint__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -20774,7 +20774,7 @@ lbl_800D819C: /* 800D8208 000D5168 80 01 01 A4 */ lwz r0, 0x1a4(r1) /* 800D820C 000D516C 7C 08 03 A6 */ mtlr r0 /* 800D8210 000D5170 38 21 01 A0 */ addi r1, r1, 0x1a0 -/* 800D8214 000D5174 4E 80 00 20 */ blr +/* 800D8214 000D5174 4E 80 00 20 */ blr .global LoadDock__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadDock__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -20851,12 +20851,12 @@ lbl_800D8320: /* 800D8324 000D5284 80 01 00 74 */ lwz r0, 0x74(r1) /* 800D8328 000D5288 7C 08 03 A6 */ mtlr r0 /* 800D832C 000D528C 38 21 00 70 */ addi r1, r1, 0x70 -/* 800D8330 000D5290 4E 80 00 20 */ blr +/* 800D8330 000D5290 4E 80 00 20 */ blr .global LoadJumpPoint__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadJumpPoint__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: /* 800D8334 000D5294 38 60 00 00 */ li r3, 0 -/* 800D8338 000D5298 4E 80 00 20 */ blr +/* 800D8338 000D5298 4E 80 00 20 */ blr .global LoadSpawnPoint__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadSpawnPoint__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -21047,7 +21047,7 @@ lbl_800D85C0: /* 800D85C4 000D5524 80 01 01 E4 */ lwz r0, 0x1e4(r1) /* 800D85C8 000D5528 7C 08 03 A6 */ mtlr r0 /* 800D85CC 000D552C 38 21 01 E0 */ addi r1, r1, 0x1e0 -/* 800D85D0 000D5530 4E 80 00 20 */ blr +/* 800D85D0 000D5530 4E 80 00 20 */ blr .global LoadRipple__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadRipple__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -21115,7 +21115,7 @@ lbl_800D86A8: /* 800D86BC 000D561C 83 81 00 38 */ lwz r28, 0x38(r1) /* 800D86C0 000D5620 7C 08 03 A6 */ mtlr r0 /* 800D86C4 000D5624 38 21 00 50 */ addi r1, r1, 0x50 -/* 800D86C8 000D5628 4E 80 00 20 */ blr +/* 800D86C8 000D5628 4E 80 00 20 */ blr .global LoadSteam__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadSteam__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -21259,7 +21259,7 @@ lbl_800D88C0: /* 800D88E4 000D5844 80 01 01 24 */ lwz r0, 0x124(r1) /* 800D88E8 000D5848 7C 08 03 A6 */ mtlr r0 /* 800D88EC 000D584C 38 21 01 20 */ addi r1, r1, 0x120 -/* 800D88F0 000D5850 4E 80 00 20 */ blr +/* 800D88F0 000D5850 4E 80 00 20 */ blr .global LoadWater__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadWater__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -21829,7 +21829,7 @@ lbl_800D90E4: /* 800D9178 000D60D8 80 01 04 24 */ lwz r0, 0x424(r1) /* 800D917C 000D60DC 7C 08 03 A6 */ mtlr r0 /* 800D9180 000D60E0 38 21 04 20 */ addi r1, r1, 0x420 -/* 800D9184 000D60E4 4E 80 00 20 */ blr +/* 800D9184 000D60E4 4E 80 00 20 */ blr .global LoadFluidUVMotion__FR12CInputStream LoadFluidUVMotion__FR12CInputStream: @@ -21958,7 +21958,7 @@ LoadFluidUVMotion__FR12CInputStream: /* 800D9370 000D62D0 83 A1 00 54 */ lwz r29, 0x54(r1) /* 800D9374 000D62D4 7C 08 03 A6 */ mtlr r0 /* 800D9378 000D62D8 38 21 00 90 */ addi r1, r1, 0x90 -/* 800D937C 000D62DC 4E 80 00 20 */ blr +/* 800D937C 000D62DC 4E 80 00 20 */ blr .global LoadDamageableTrigger__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadDamageableTrigger__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -22063,7 +22063,7 @@ lbl_800D94F8: /* 800D94FC 000D645C 80 01 01 04 */ lwz r0, 0x104(r1) /* 800D9500 000D6460 7C 08 03 A6 */ mtlr r0 /* 800D9504 000D6464 38 21 01 00 */ addi r1, r1, 0x100 -/* 800D9508 000D6468 4E 80 00 20 */ blr +/* 800D9508 000D6468 4E 80 00 20 */ blr .global TransformDamageableTriggerFlags__FR13CStateManager7TAreaIdUi TransformDamageableTriggerFlags__FR13CStateManager7TAreaIdUi: @@ -22159,7 +22159,7 @@ lbl_800D964C: /* 800D9658 000D65B8 83 C1 00 B8 */ lwz r30, 0xb8(r1) /* 800D965C 000D65BC 7C 08 03 A6 */ mtlr r0 /* 800D9660 000D65C0 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 800D9664 000D65C4 4E 80 00 20 */ blr +/* 800D9664 000D65C4 4E 80 00 20 */ blr .global ClassifyVector__FRC9CVector3f ClassifyVector__FRC9CVector3f: @@ -22259,7 +22259,7 @@ lbl_800D97BC: /* 800D97BC 000D671C 38 60 00 00 */ li r3, 0 lbl_800D97C0: /* 800D97C0 000D6720 38 21 00 20 */ addi r1, r1, 0x20 -/* 800D97C4 000D6724 4E 80 00 20 */ blr +/* 800D97C4 000D6724 4E 80 00 20 */ blr .global LoadCameraHintTrigger__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadCameraHintTrigger__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -22424,7 +22424,7 @@ lbl_800D9A28: /* 800D9A2C 000D698C 80 01 01 34 */ lwz r0, 0x134(r1) /* 800D9A30 000D6990 7C 08 03 A6 */ mtlr r0 /* 800D9A34 000D6994 38 21 01 30 */ addi r1, r1, 0x130 -/* 800D9A38 000D6998 4E 80 00 20 */ blr +/* 800D9A38 000D6998 4E 80 00 20 */ blr .global LoadTrigger__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo LoadTrigger__12ScriptLoaderFR13CStateManagerR12CInputStreamiRC11CEntityInfo: @@ -22545,7 +22545,7 @@ lbl_800D9BE8: .global sub_800d9bf8 sub_800d9bf8: -/* 800D9BF8 000D6B58 4E 80 00 20 */ blr +/* 800D9BF8 000D6B58 4E 80 00 20 */ blr .global LoadParameterFlags__FR12CInputStream LoadParameterFlags__FR12CInputStream: @@ -22577,7 +22577,7 @@ lbl_800D9C44: /* 800D9C54 000D6BB4 80 01 00 24 */ lwz r0, 0x24(r1) /* 800D9C58 000D6BB8 7C 08 03 A6 */ mtlr r0 /* 800D9C5C 000D6BBC 38 21 00 20 */ addi r1, r1, 0x20 -/* 800D9C60 000D6BC0 4E 80 00 20 */ blr +/* 800D9C60 000D6BC0 4E 80 00 20 */ blr .global LoadGrappleParameters__FR12CInputStream LoadGrappleParameters__FR12CInputStream: @@ -22648,7 +22648,7 @@ LoadGrappleParameters__FR12CInputStream: /* 800D9D64 000D6CC4 83 C1 00 10 */ lwz r30, 0x10(r1) /* 800D9D68 000D6CC8 7C 08 03 A6 */ mtlr r0 /* 800D9D6C 000D6CCC 38 21 00 70 */ addi r1, r1, 0x70 -/* 800D9D70 000D6CD0 4E 80 00 20 */ blr +/* 800D9D70 000D6CD0 4E 80 00 20 */ blr .global LoadActorParameters__FR12CInputStream LoadActorParameters__FR12CInputStream: @@ -22911,7 +22911,7 @@ lbl_800DA0EC: /* 800DA108 000D7068 80 01 01 44 */ lwz r0, 0x144(r1) /* 800DA10C 000D706C 7C 08 03 A6 */ mtlr r0 /* 800DA110 000D7070 38 21 01 40 */ addi r1, r1, 0x140 -/* 800DA114 000D7074 4E 80 00 20 */ blr +/* 800DA114 000D7074 4E 80 00 20 */ blr .global LoadVisorParameters__FR12CInputStream LoadVisorParameters__FR12CInputStream: @@ -22978,7 +22978,7 @@ lbl_800DA1EC: /* 800DA1F0 000D7150 80 01 00 24 */ lwz r0, 0x24(r1) /* 800DA1F4 000D7154 7C 08 03 A6 */ mtlr r0 /* 800DA1F8 000D7158 38 21 00 20 */ addi r1, r1, 0x20 -/* 800DA1FC 000D715C 4E 80 00 20 */ blr +/* 800DA1FC 000D715C 4E 80 00 20 */ blr .global LoadScannableParameters__FR12CInputStream LoadScannableParameters__FR12CInputStream: @@ -23006,7 +23006,7 @@ lbl_800DA244: /* 800DA24C 000D71AC 83 C1 00 08 */ lwz r30, 8(r1) /* 800DA250 000D71B0 7C 08 03 A6 */ mtlr r0 /* 800DA254 000D71B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800DA258 000D71B8 4E 80 00 20 */ blr +/* 800DA258 000D71B8 4E 80 00 20 */ blr .global LoadLightParameters__FR12CInputStream LoadLightParameters__FR12CInputStream: @@ -23119,7 +23119,7 @@ lbl_800DA3CC: /* 800DA3DC 000D733C 80 01 00 74 */ lwz r0, 0x74(r1) /* 800DA3E0 000D7340 7C 08 03 A6 */ mtlr r0 /* 800DA3E4 000D7344 38 21 00 70 */ addi r1, r1, 0x70 -/* 800DA3E8 000D7348 4E 80 00 20 */ blr +/* 800DA3E8 000D7348 4E 80 00 20 */ blr .global None__16CLightParametersFv None__16CLightParametersFv: @@ -23130,7 +23130,7 @@ None__16CLightParametersFv: /* 800DA3FC 000D735C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800DA400 000D7360 7C 08 03 A6 */ mtlr r0 /* 800DA404 000D7364 38 21 00 10 */ addi r1, r1, 0x10 -/* 800DA408 000D7368 4E 80 00 20 */ blr +/* 800DA408 000D7368 4E 80 00 20 */ blr .global LoadAnimationParameters__FR12CInputStream LoadAnimationParameters__FR12CInputStream: @@ -23164,7 +23164,7 @@ LoadAnimationParameters__FR12CInputStream: .global sub_800da478 sub_800da478: -/* 800DA478 000D73D8 4E 80 00 20 */ blr +/* 800DA478 000D73D8 4E 80 00 20 */ blr .global LoadScaledActorHead__FR12CInputStreamR13CStateManager LoadScaledActorHead__FR12CInputStreamR13CStateManager: @@ -23185,7 +23185,7 @@ LoadScaledActorHead__FR12CInputStreamR13CStateManager: /* 800DA4B4 000D7414 83 C1 00 08 */ lwz r30, 8(r1) /* 800DA4B8 000D7418 7C 08 03 A6 */ mtlr r0 /* 800DA4BC 000D741C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800DA4C0 000D7420 4E 80 00 20 */ blr +/* 800DA4C0 000D7420 4E 80 00 20 */ blr .global LoadActorHead__FR12CInputStreamR13CStateManager LoadActorHead__FR12CInputStreamR13CStateManager: @@ -23213,7 +23213,7 @@ LoadActorHead__FR12CInputStreamR13CStateManager: /* 800DA518 000D7478 83 C1 00 38 */ lwz r30, 0x38(r1) /* 800DA51C 000D747C 7C 08 03 A6 */ mtlr r0 /* 800DA520 000D7480 38 21 00 40 */ addi r1, r1, 0x40 -/* 800DA524 000D7484 4E 80 00 20 */ blr +/* 800DA524 000D7484 4E 80 00 20 */ blr .global LoadEditorTransformPivotOnly__FR12CInputStream LoadEditorTransformPivotOnly__FR12CInputStream: @@ -23241,7 +23241,7 @@ LoadEditorTransformPivotOnly__FR12CInputStream: /* 800DA57C 000D74DC 83 C1 00 28 */ lwz r30, 0x28(r1) /* 800DA580 000D74E0 7C 08 03 A6 */ mtlr r0 /* 800DA584 000D74E4 38 21 00 30 */ addi r1, r1, 0x30 -/* 800DA588 000D74E8 4E 80 00 20 */ blr +/* 800DA588 000D74E8 4E 80 00 20 */ blr .global LoadEditorTransform__FR12CInputStream LoadEditorTransform__FR12CInputStream: @@ -23266,7 +23266,7 @@ LoadEditorTransform__FR12CInputStream: /* 800DA5D4 000D7534 83 C1 00 28 */ lwz r30, 0x28(r1) /* 800DA5D8 000D7538 7C 08 03 A6 */ mtlr r0 /* 800DA5DC 000D753C 38 21 00 30 */ addi r1, r1, 0x30 -/* 800DA5E0 000D7540 4E 80 00 20 */ blr +/* 800DA5E0 000D7540 4E 80 00 20 */ blr .global ConvertEditorEulerToTransform4f__FRC9CVector3fRC9CVector3f ConvertEditorEulerToTransform4f__FRC9CVector3fRC9CVector3f: @@ -23347,7 +23347,7 @@ ConvertEditorEulerToTransform4f__FRC9CVector3fRC9CVector3f: /* 800DA70C 000D766C 83 C1 00 E8 */ lwz r30, 0xe8(r1) /* 800DA710 000D7670 7C 08 03 A6 */ mtlr r0 /* 800DA714 000D7674 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 800DA718 000D7678 4E 80 00 20 */ blr +/* 800DA718 000D7678 4E 80 00 20 */ blr .global GetCollisionBox__FR13CStateManager7TAreaIdRC9CVector3fRC9CVector3f GetCollisionBox__FR13CStateManager7TAreaIdRC9CVector3fRC9CVector3f: @@ -23396,7 +23396,7 @@ GetCollisionBox__FR13CStateManager7TAreaIdRC9CVector3fRC9CVector3f: /* 800DA7C4 000D7724 83 E1 00 5C */ lwz r31, 0x5c(r1) /* 800DA7C8 000D7728 7C 08 03 A6 */ mtlr r0 /* 800DA7CC 000D772C 38 21 00 60 */ addi r1, r1, 0x60 -/* 800DA7D0 000D7730 4E 80 00 20 */ blr +/* 800DA7D0 000D7730 4E 80 00 20 */ blr .global sub_800da7d4 sub_800da7d4: @@ -23479,7 +23479,7 @@ lbl_800DA8D8: /* 800DA8DC 000D783C 80 01 00 34 */ lwz r0, 0x34(r1) /* 800DA8E0 000D7840 7C 08 03 A6 */ mtlr r0 /* 800DA8E4 000D7844 38 21 00 30 */ addi r1, r1, 0x30 -/* 800DA8E8 000D7848 4E 80 00 20 */ blr +/* 800DA8E8 000D7848 4E 80 00 20 */ blr .global sub_800da8ec sub_800da8ec: @@ -23543,7 +23543,7 @@ lbl_800DA9B4: /* 800DA9B8 000D7918 80 01 00 34 */ lwz r0, 0x34(r1) /* 800DA9BC 000D791C 7C 08 03 A6 */ mtlr r0 /* 800DA9C0 000D7920 38 21 00 30 */ addi r1, r1, 0x30 -/* 800DA9C4 000D7924 4E 80 00 20 */ blr +/* 800DA9C4 000D7924 4E 80 00 20 */ blr .global sub_800da9c8 sub_800da9c8: @@ -23574,4 +23574,4 @@ lbl_800DAA04: /* 800DAA20 000D7980 83 A1 00 14 */ lwz r29, 0x14(r1) /* 800DAA24 000D7984 7C 08 03 A6 */ mtlr r0 /* 800DAA28 000D7988 38 21 00 20 */ addi r1, r1, 0x20 -/* 800DAA2C 000D798C 4E 80 00 20 */ blr +/* 800DAA2C 000D798C 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/ScriptObjects/CEnergyBall.s b/asm/MetroidPrime/ScriptObjects/CEnergyBall.s index 1a0cbf38..13eaa8a2 100644 --- a/asm/MetroidPrime/ScriptObjects/CEnergyBall.s +++ b/asm/MetroidPrime/ScriptObjects/CEnergyBall.s @@ -197,7 +197,7 @@ lbl_803EC370: .4byte sub_802a0164 .4byte sub_802a0100 .4byte SetActive__7CEntityFb - + .section .sdata @@ -310,7 +310,7 @@ lbl_8029F3F4: /* 8029F404 0029C364 80 01 00 64 */ lwz r0, 0x64(r1) /* 8029F408 0029C368 7C 08 03 A6 */ mtlr r0 /* 8029F40C 0029C36C 38 21 00 60 */ addi r1, r1, 0x60 -/* 8029F410 0029C370 4E 80 00 20 */ blr +/* 8029F410 0029C370 4E 80 00 20 */ blr .global Death__11CEnergyBallFRC9CVector3fR13CStateManager Death__11CEnergyBallFRC9CVector3fR13CStateManager: @@ -326,7 +326,7 @@ Death__11CEnergyBallFRC9CVector3fR13CStateManager: /* 8029F438 0029C398 81 83 00 00 */ lwz r12, 0(r3) /* 8029F43C 0029C39C 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8029F440 0029C3A0 7D 89 03 A6 */ mtctr r12 -/* 8029F444 0029C3A4 4E 80 04 21 */ bctrl +/* 8029F444 0029C3A4 4E 80 04 21 */ bctrl /* 8029F448 0029C3A8 28 03 00 00 */ cmplwi r3, 0 /* 8029F44C 0029C3AC 41 82 00 2C */ beq lbl_8029F478 /* 8029F450 0029C3B0 C0 23 00 00 */ lfs f1, 0(r3) @@ -352,7 +352,7 @@ lbl_8029F48C: /* 8029F498 0029C3F8 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8029F49C 0029C3FC 7C 08 03 A6 */ mtlr r0 /* 8029F4A0 0029C400 38 21 00 20 */ addi r1, r1, 0x20 -/* 8029F4A4 0029C404 4E 80 00 20 */ blr +/* 8029F4A4 0029C404 4E 80 00 20 */ blr .global sub_8029f4a8 sub_8029f4a8: @@ -601,12 +601,12 @@ lbl_8029F7C8: /* 8029F83C 0029C79C 81 9D 00 00 */ lwz r12, 0(r29) /* 8029F840 0029C7A0 81 8C 02 98 */ lwz r12, 0x298(r12) /* 8029F844 0029C7A4 7D 89 03 A6 */ mtctr r12 -/* 8029F848 0029C7A8 4E 80 04 21 */ bctrl +/* 8029F848 0029C7A8 4E 80 04 21 */ bctrl /* 8029F84C 0029C7AC BB 41 00 E8 */ lmw r26, 0xe8(r1) /* 8029F850 0029C7B0 80 01 01 04 */ lwz r0, 0x104(r1) /* 8029F854 0029C7B4 7C 08 03 A6 */ mtlr r0 /* 8029F858 0029C7B8 38 21 01 00 */ addi r1, r1, 0x100 -/* 8029F85C 0029C7BC 4E 80 00 20 */ blr +/* 8029F85C 0029C7BC 4E 80 00 20 */ blr .global Think__11CEnergyBallFfR13CStateManager Think__11CEnergyBallFfR13CStateManager: @@ -707,7 +707,7 @@ lbl_8029F9A8: /* 8029F9B4 0029C914 7F E4 FB 78 */ mr r4, r31 /* 8029F9B8 0029C918 81 8C 01 A4 */ lwz r12, 0x1a4(r12) /* 8029F9BC 0029C91C 7D 89 03 A6 */ mtctr r12 -/* 8029F9C0 0029C920 4E 80 04 21 */ bctrl +/* 8029F9C0 0029C920 4E 80 04 21 */ bctrl /* 8029F9C4 0029C924 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8029F9C8 0029C928 41 82 00 08 */ beq lbl_8029F9D0 /* 8029F9CC 0029C92C 3B 60 00 01 */ li r27, 1 @@ -724,7 +724,7 @@ lbl_8029F9E4: /* 8029F9F0 0029C950 80 01 00 44 */ lwz r0, 0x44(r1) /* 8029F9F4 0029C954 7C 08 03 A6 */ mtlr r0 /* 8029F9F8 0029C958 38 21 00 40 */ addi r1, r1, 0x40 -/* 8029F9FC 0029C95C 4E 80 00 20 */ blr +/* 8029F9FC 0029C95C 4E 80 00 20 */ blr .global Attack__11CEnergyBallFR13CStateManager9EStateMsgf Attack__11CEnergyBallFR13CStateManager9EStateMsgf: @@ -780,7 +780,7 @@ lbl_8029FAB0: /* 8029FABC 0029CA1C 83 E1 00 4C */ lwz r31, 0x4c(r1) /* 8029FAC0 0029CA20 7C 08 03 A6 */ mtlr r0 /* 8029FAC4 0029CA24 38 21 00 60 */ addi r1, r1, 0x60 -/* 8029FAC8 0029CA28 4E 80 00 20 */ blr +/* 8029FAC8 0029CA28 4E 80 00 20 */ blr .global Generate__11CEnergyBallFR13CStateManager9EStateMsgf Generate__11CEnergyBallFR13CStateManager9EStateMsgf: @@ -825,7 +825,7 @@ lbl_8029FB48: /* 8029FB50 0029CAB0 83 C1 00 08 */ lwz r30, 8(r1) /* 8029FB54 0029CAB4 7C 08 03 A6 */ mtlr r0 /* 8029FB58 0029CAB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8029FB5C 0029CABC 4E 80 00 20 */ blr +/* 8029FB5C 0029CABC 4E 80 00 20 */ blr .global AcceptScriptMsg__11CEnergyBallF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__11CEnergyBallF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -875,7 +875,7 @@ lbl_8029FBDC: /* 8029FC08 0029CB68 83 81 00 30 */ lwz r28, 0x30(r1) /* 8029FC0C 0029CB6C 7C 08 03 A6 */ mtlr r0 /* 8029FC10 0029CB70 38 21 00 40 */ addi r1, r1, 0x40 -/* 8029FC14 0029CB74 4E 80 00 20 */ blr +/* 8029FC14 0029CB74 4E 80 00 20 */ blr .global Accept__11CEnergyBallFR8IVisitor Accept__11CEnergyBallFR8IVisitor: @@ -888,11 +888,11 @@ Accept__11CEnergyBallFR8IVisitor: /* 8029FC30 0029CB90 7C 04 03 78 */ mr r4, r0 /* 8029FC34 0029CB94 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 8029FC38 0029CB98 7D 89 03 A6 */ mtctr r12 -/* 8029FC3C 0029CB9C 4E 80 04 21 */ bctrl +/* 8029FC3C 0029CB9C 4E 80 04 21 */ bctrl /* 8029FC40 0029CBA0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8029FC44 0029CBA4 7C 08 03 A6 */ mtlr r0 /* 8029FC48 0029CBA8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8029FC4C 0029CBAC 4E 80 00 20 */ blr +/* 8029FC4C 0029CBAC 4E 80 00 20 */ blr .global __dt__11CEnergyBall __dt__11CEnergyBall: @@ -947,7 +947,7 @@ lbl_8029FCF0: /* 8029FCFC 0029CC5C 83 C1 00 08 */ lwz r30, 8(r1) /* 8029FD00 0029CC60 7C 08 03 A6 */ mtlr r0 /* 8029FD04 0029CC64 38 21 00 10 */ addi r1, r1, 0x10 -/* 8029FD08 0029CC68 4E 80 00 20 */ blr +/* 8029FD08 0029CC68 4E 80 00 20 */ blr .global __ct__11CEnergyBall __ct__11CEnergyBall: @@ -1039,7 +1039,7 @@ __ct__11CEnergyBall: /* 8029FE60 0029CDC0 81 84 00 00 */ lwz r12, 0(r4) /* 8029FE64 0029CDC4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8029FE68 0029CDC8 7D 89 03 A6 */ mtctr r12 -/* 8029FE6C 0029CDCC 4E 80 04 21 */ bctrl +/* 8029FE6C 0029CDCC 4E 80 04 21 */ bctrl /* 8029FE70 0029CDD0 38 61 00 3C */ addi r3, r1, 0x3c /* 8029FE74 0029CDD4 38 81 00 44 */ addi r4, r1, 0x44 /* 8029FE78 0029CDD8 48 0A 10 31 */ bl __ct__6CTokenFRC6CToken @@ -1069,7 +1069,7 @@ lbl_8029FE94: /* 8029FED4 0029CE34 81 84 00 00 */ lwz r12, 0(r4) /* 8029FED8 0029CE38 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8029FEDC 0029CE3C 7D 89 03 A6 */ mtctr r12 -/* 8029FEE0 0029CE40 4E 80 04 21 */ bctrl +/* 8029FEE0 0029CE40 4E 80 04 21 */ bctrl /* 8029FEE4 0029CE44 38 61 00 24 */ addi r3, r1, 0x24 /* 8029FEE8 0029CE48 38 81 00 2C */ addi r4, r1, 0x2c /* 8029FEEC 0029CE4C 48 0A 0F BD */ bl __ct__6CTokenFRC6CToken @@ -1148,7 +1148,7 @@ lbl_8029FF08: /* 802A000C 0029CF6C 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 802A0010 0029CF70 7C 08 03 A6 */ mtlr r0 /* 802A0014 0029CF74 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 802A0018 0029CF78 4E 80 00 20 */ blr +/* 802A0018 0029CF78 4E 80 00 20 */ blr .global sub_802a001c sub_802a001c: @@ -1176,7 +1176,7 @@ lbl_802A0060: /* 802A006C 0029CFCC 83 C1 00 08 */ lwz r30, 8(r1) /* 802A0070 0029CFD0 7C 08 03 A6 */ mtlr r0 /* 802A0074 0029CFD4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802A0078 0029CFD8 4E 80 00 20 */ blr +/* 802A0078 0029CFD8 4E 80 00 20 */ blr .global sub_802a007c sub_802a007c: @@ -1189,11 +1189,11 @@ sub_802a007c: /* 802A0094 0029CFF4 7C 04 03 78 */ mr r4, r0 /* 802A0098 0029CFF8 81 8C 00 24 */ lwz r12, 0x24(r12) /* 802A009C 0029CFFC 7D 89 03 A6 */ mtctr r12 -/* 802A00A0 0029D000 4E 80 04 21 */ bctrl +/* 802A00A0 0029D000 4E 80 04 21 */ bctrl /* 802A00A4 0029D004 80 01 00 14 */ lwz r0, 0x14(r1) /* 802A00A8 0029D008 7C 08 03 A6 */ mtlr r0 /* 802A00AC 0029D00C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802A00B0 0029D010 4E 80 00 20 */ blr +/* 802A00B0 0029D010 4E 80 00 20 */ blr .global sub_802a00b4 sub_802a00b4: @@ -1216,7 +1216,7 @@ lbl_802A00EC: /* 802A00F0 0029D050 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802A00F4 0029D054 7C 08 03 A6 */ mtlr r0 /* 802A00F8 0029D058 38 21 00 10 */ addi r1, r1, 0x10 -/* 802A00FC 0029D05C 4E 80 00 20 */ blr +/* 802A00FC 0029D05C 4E 80 00 20 */ blr .global sub_802a0100 sub_802a0100: @@ -1247,7 +1247,7 @@ lbl_802A0150: /* 802A0154 0029D0B4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802A0158 0029D0B8 7C 08 03 A6 */ mtlr r0 /* 802A015C 0029D0BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802A0160 0029D0C0 4E 80 00 20 */ blr +/* 802A0160 0029D0C0 4E 80 00 20 */ blr .global sub_802a0164 sub_802a0164: @@ -1323,7 +1323,7 @@ lbl_802A025C: /* 802A026C 0029D1CC 83 C1 00 68 */ lwz r30, 0x68(r1) /* 802A0270 0029D1D0 7C 08 03 A6 */ mtlr r0 /* 802A0274 0029D1D4 38 21 00 80 */ addi r1, r1, 0x80 -/* 802A0278 0029D1D8 4E 80 00 20 */ blr +/* 802A0278 0029D1D8 4E 80 00 20 */ blr .global sub_802a027c sub_802a027c: diff --git a/asm/MetroidPrime/ScriptObjects/CFire.s b/asm/MetroidPrime/ScriptObjects/CFire.s index c86ab571..521a8c15 100644 --- a/asm/MetroidPrime/ScriptObjects/CFire.s +++ b/asm/MetroidPrime/ScriptObjects/CFire.s @@ -70,20 +70,20 @@ lbl_8025CC5C: /* 8025CC64 00259BC4 81 83 00 00 */ lwz r12, 0(r3) /* 8025CC68 00259BC8 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8025CC6C 00259BCC 7D 89 03 A6 */ mtctr r12 -/* 8025CC70 00259BD0 4E 80 04 21 */ bctrl +/* 8025CC70 00259BD0 4E 80 04 21 */ bctrl /* 8025CC74 00259BD4 7F C3 F3 78 */ mr r3, r30 /* 8025CC78 00259BD8 38 80 00 01 */ li r4, 1 /* 8025CC7C 00259BDC 81 9E 00 00 */ lwz r12, 0(r30) /* 8025CC80 00259BE0 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 8025CC84 00259BE4 7D 89 03 A6 */ mtctr r12 -/* 8025CC88 00259BE8 4E 80 04 21 */ bctrl +/* 8025CC88 00259BE8 4E 80 04 21 */ bctrl lbl_8025CC8C: /* 8025CC8C 00259BEC 80 01 00 24 */ lwz r0, 0x24(r1) /* 8025CC90 00259BF0 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8025CC94 00259BF4 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8025CC98 00259BF8 7C 08 03 A6 */ mtlr r0 /* 8025CC9C 00259BFC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8025CCA0 00259C00 4E 80 00 20 */ blr +/* 8025CCA0 00259C00 4E 80 00 20 */ blr .global Think__5CFireFfR13CStateManager Think__5CFireFfR13CStateManager: @@ -105,7 +105,7 @@ Think__5CFireFfR13CStateManager: /* 8025CCE0 00259C40 81 9D 00 00 */ lwz r12, 0(r29) /* 8025CCE4 00259C44 81 8C 00 60 */ lwz r12, 0x60(r12) /* 8025CCE8 00259C48 7D 89 03 A6 */ mtctr r12 -/* 8025CCEC 00259C4C 4E 80 04 21 */ bctrl +/* 8025CCEC 00259C4C 4E 80 04 21 */ bctrl /* 8025CCF0 00259C50 3C A0 43 30 */ lis r5, 0x4330 /* 8025CCF4 00259C54 6C 66 80 00 */ xoris r6, r3, 0x8000 /* 8025CCF8 00259C58 80 9D 00 90 */ lwz r4, 0x90(r29) @@ -129,7 +129,7 @@ Think__5CFireFfR13CStateManager: /* 8025CD40 00259CA0 EC 3E 00 32 */ fmuls f1, f30, f0 /* 8025CD44 00259CA4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8025CD48 00259CA8 7D 89 03 A6 */ mtctr r12 -/* 8025CD4C 00259CAC 4E 80 04 21 */ bctrl +/* 8025CD4C 00259CAC 4E 80 04 21 */ bctrl /* 8025CD50 00259CB0 C0 02 B9 FC */ lfs f0, lbl_805AD71C@sda21(r2) /* 8025CD54 00259CB4 38 61 00 48 */ addi r3, r1, 0x48 /* 8025CD58 00259CB8 38 9E 00 F0 */ addi r4, r30, 0xf0 @@ -162,7 +162,7 @@ lbl_8025CDB0: /* 8025CDB8 00259D18 81 83 00 00 */ lwz r12, 0(r3) /* 8025CDBC 00259D1C 81 8C 00 58 */ lwz r12, 0x58(r12) /* 8025CDC0 00259D20 7D 89 03 A6 */ mtctr r12 -/* 8025CDC4 00259D24 4E 80 04 21 */ bctrl +/* 8025CDC4 00259D24 4E 80 04 21 */ bctrl /* 8025CDC8 00259D28 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8025CDCC 00259D2C 41 82 00 08 */ beq lbl_8025CDD4 /* 8025CDD0 00259D30 3B A0 00 01 */ li r29, 1 @@ -175,13 +175,13 @@ lbl_8025CDD4: /* 8025CDE8 00259D48 81 84 00 00 */ lwz r12, 0(r4) /* 8025CDEC 00259D4C 81 8C 00 40 */ lwz r12, 0x40(r12) /* 8025CDF0 00259D50 7D 89 03 A6 */ mtctr r12 -/* 8025CDF4 00259D54 4E 80 04 21 */ bctrl +/* 8025CDF4 00259D54 4E 80 04 21 */ bctrl /* 8025CDF8 00259D58 7F C4 F3 78 */ mr r4, r30 /* 8025CDFC 00259D5C 38 61 00 10 */ addi r3, r1, 0x10 /* 8025CE00 00259D60 81 9E 00 00 */ lwz r12, 0(r30) /* 8025CE04 00259D64 81 8C 00 40 */ lwz r12, 0x40(r12) /* 8025CE08 00259D68 7D 89 03 A6 */ mtctr r12 -/* 8025CE0C 00259D6C 4E 80 04 21 */ bctrl +/* 8025CE0C 00259D6C 4E 80 04 21 */ bctrl /* 8025CE10 00259D70 38 61 00 2C */ addi r3, r1, 0x2c /* 8025CE14 00259D74 38 81 00 10 */ addi r4, r1, 0x10 /* 8025CE18 00259D78 48 0D AD 6D */ bl DoBoundsOverlap__6CAABoxCFRC6CAABox @@ -241,7 +241,7 @@ lbl_8025CEC4: /* 8025CEE0 00259E40 83 A1 00 84 */ lwz r29, 0x84(r1) /* 8025CEE4 00259E44 7C 08 03 A6 */ mtlr r0 /* 8025CEE8 00259E48 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 8025CEEC 00259E4C 4E 80 00 20 */ blr +/* 8025CEEC 00259E4C 4E 80 00 20 */ blr .global Accept__5CFireFR8IVisitor Accept__5CFireFR8IVisitor: @@ -254,11 +254,11 @@ Accept__5CFireFR8IVisitor: /* 8025CF08 00259E68 7C 04 03 78 */ mr r4, r0 /* 8025CF0C 00259E6C 81 8C 00 08 */ lwz r12, 8(r12) /* 8025CF10 00259E70 7D 89 03 A6 */ mtctr r12 -/* 8025CF14 00259E74 4E 80 04 21 */ bctrl +/* 8025CF14 00259E74 4E 80 04 21 */ bctrl /* 8025CF18 00259E78 80 01 00 14 */ lwz r0, 0x14(r1) /* 8025CF1C 00259E7C 7C 08 03 A6 */ mtlr r0 /* 8025CF20 00259E80 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025CF24 00259E84 4E 80 00 20 */ blr +/* 8025CF24 00259E84 4E 80 00 20 */ blr .global Render__5CFireCFRC13CStateManager Render__5CFireCFRC13CStateManager: @@ -313,7 +313,7 @@ lbl_8025CFC4: /* 8025CFD4 00259F34 81 83 00 00 */ lwz r12, 0(r3) /* 8025CFD8 00259F38 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8025CFDC 00259F3C 7D 89 03 A6 */ mtctr r12 -/* 8025CFE0 00259F40 4E 80 04 21 */ bctrl +/* 8025CFE0 00259F40 4E 80 04 21 */ bctrl lbl_8025CFE4: /* 8025CFE4 00259F44 7F 83 E3 78 */ mr r3, r28 /* 8025CFE8 00259F48 7F A4 EB 78 */ mr r4, r29 @@ -326,7 +326,7 @@ lbl_8025CFE4: /* 8025D004 00259F64 83 81 00 10 */ lwz r28, 0x10(r1) /* 8025D008 00259F68 7C 08 03 A6 */ mtlr r0 /* 8025D00C 00259F6C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8025D010 00259F70 4E 80 00 20 */ blr +/* 8025D010 00259F70 4E 80 00 20 */ blr .global GetTouchBounds__5CFireCFv GetTouchBounds__5CFireCFv: @@ -337,9 +337,9 @@ GetTouchBounds__5CFireCFv: /* 8025D024 00259F84 98 03 00 18 */ stb r0, 0x18(r3) /* 8025D028 00259F88 88 04 01 40 */ lbz r0, 0x140(r4) /* 8025D02C 00259F8C 28 00 00 00 */ cmplwi r0, 0 -/* 8025D030 00259F90 4D 82 00 20 */ beqlr +/* 8025D030 00259F90 4D 82 00 20 */ beqlr /* 8025D034 00259F94 28 03 00 00 */ cmplwi r3, 0 -/* 8025D038 00259F98 4D 82 00 20 */ beqlr +/* 8025D038 00259F98 4D 82 00 20 */ beqlr /* 8025D03C 00259F9C C0 04 01 28 */ lfs f0, 0x128(r4) /* 8025D040 00259FA0 D0 03 00 00 */ stfs f0, 0(r3) /* 8025D044 00259FA4 C0 04 01 2C */ lfs f0, 0x12c(r4) @@ -352,11 +352,11 @@ GetTouchBounds__5CFireCFv: /* 8025D060 00259FC0 D0 03 00 10 */ stfs f0, 0x10(r3) /* 8025D064 00259FC4 C0 04 01 3C */ lfs f0, 0x13c(r4) /* 8025D068 00259FC8 D0 03 00 14 */ stfs f0, 0x14(r3) -/* 8025D06C 00259FCC 4E 80 00 20 */ blr +/* 8025D06C 00259FCC 4E 80 00 20 */ blr lbl_8025D070: /* 8025D070 00259FD0 38 00 00 00 */ li r0, 0 /* 8025D074 00259FD4 98 03 00 18 */ stb r0, 0x18(r3) -/* 8025D078 00259FD8 4E 80 00 20 */ blr +/* 8025D078 00259FD8 4E 80 00 20 */ blr .global Touch__5CFireFR6CActorR13CStateManager Touch__5CFireFR6CActorR13CStateManager: @@ -409,7 +409,7 @@ lbl_8025D124: /* 8025D130 0025A090 83 A1 00 44 */ lwz r29, 0x44(r1) /* 8025D134 0025A094 7C 08 03 A6 */ mtlr r0 /* 8025D138 0025A098 38 21 00 50 */ addi r1, r1, 0x50 -/* 8025D13C 0025A09C 4E 80 00 20 */ blr +/* 8025D13C 0025A09C 4E 80 00 20 */ blr .global __dt__5CFireFv __dt__5CFireFv: @@ -438,7 +438,7 @@ lbl_8025D17C: /* 8025D194 0025A0F4 38 80 00 01 */ li r4, 1 /* 8025D198 0025A0F8 81 8C 00 08 */ lwz r12, 8(r12) /* 8025D19C 0025A0FC 7D 89 03 A6 */ mtctr r12 -/* 8025D1A0 0025A100 4E 80 04 21 */ bctrl +/* 8025D1A0 0025A100 4E 80 04 21 */ bctrl lbl_8025D1A4: /* 8025D1A4 0025A104 7F C3 F3 78 */ mr r3, r30 /* 8025D1A8 0025A108 38 80 00 00 */ li r4, 0 @@ -454,7 +454,7 @@ lbl_8025D1C0: /* 8025D1CC 0025A12C 83 C1 00 08 */ lwz r30, 8(r1) /* 8025D1D0 0025A130 7C 08 03 A6 */ mtlr r0 /* 8025D1D4 0025A134 38 21 00 10 */ addi r1, r1, 0x10 -/* 8025D1D8 0025A138 4E 80 00 20 */ blr +/* 8025D1D8 0025A138 4E 80 00 20 */ blr .global __ct__5CFire __ct__5CFire: @@ -684,7 +684,7 @@ lbl_8025D4F4: /* 8025D53C 0025A49C 81 83 00 00 */ lwz r12, 0(r3) /* 8025D540 0025A4A0 81 8C 00 24 */ lwz r12, 0x24(r12) /* 8025D544 0025A4A4 7D 89 03 A6 */ mtctr r12 -/* 8025D548 0025A4A8 4E 80 04 21 */ bctrl +/* 8025D548 0025A4A8 4E 80 04 21 */ bctrl /* 8025D54C 0025A4AC C0 58 00 2C */ lfs f2, 0x2c(r24) /* 8025D550 0025A4B0 38 81 00 48 */ addi r4, r1, 0x48 /* 8025D554 0025A4B4 C0 38 00 1C */ lfs f1, 0x1c(r24) @@ -696,7 +696,7 @@ lbl_8025D4F4: /* 8025D56C 0025A4CC 81 83 00 00 */ lwz r12, 0(r3) /* 8025D570 0025A4D0 81 8C 00 18 */ lwz r12, 0x18(r12) /* 8025D574 0025A4D4 7D 89 03 A6 */ mtctr r12 -/* 8025D578 0025A4D8 4E 80 04 21 */ bctrl +/* 8025D578 0025A4D8 4E 80 04 21 */ bctrl /* 8025D57C 0025A4DC 7E A3 AB 78 */ mr r3, r21 /* 8025D580 0025A4E0 E3 E1 01 A8 */ psq_l f31, 424(r1), 0, qr0 /* 8025D584 0025A4E4 CB E1 01 A0 */ lfd f31, 0x1a0(r1) diff --git a/asm/MetroidPrime/ScriptObjects/CFishCloud.s b/asm/MetroidPrime/ScriptObjects/CFishCloud.s index 915a9c42..4e200059 100644 --- a/asm/MetroidPrime/ScriptObjects/CFishCloud.s +++ b/asm/MetroidPrime/ScriptObjects/CFishCloud.s @@ -149,7 +149,7 @@ lbl_801CE258: /* 801CE27C 001CB1DC 38 80 00 01 */ li r4, 1 /* 801CE280 001CB1E0 81 8C 00 08 */ lwz r12, 8(r12) /* 801CE284 001CB1E4 7D 89 03 A6 */ mtctr r12 -/* 801CE288 001CB1E8 4E 80 04 21 */ bctrl +/* 801CE288 001CB1E8 4E 80 04 21 */ bctrl lbl_801CE28C: /* 801CE28C 001CB1EC 3B 9C 00 08 */ addi r28, r28, 8 /* 801CE290 001CB1F0 3B BD 00 01 */ addi r29, r29, 1 @@ -333,7 +333,7 @@ lbl_801CE4D0: /* 801CE4E4 001CB444 83 81 00 40 */ lwz r28, 0x40(r1) /* 801CE4E8 001CB448 7C 08 03 A6 */ mtlr r0 /* 801CE4EC 001CB44C 38 21 00 50 */ addi r1, r1, 0x50 -/* 801CE4F0 001CB450 4E 80 00 20 */ blr +/* 801CE4F0 001CB450 4E 80 00 20 */ blr .global sub_801ce4f4 sub_801ce4f4: @@ -353,7 +353,7 @@ lbl_801CE51C: /* 801CE524 001CB484 81 83 00 00 */ lwz r12, 0(r3) /* 801CE528 001CB488 81 8C 00 34 */ lwz r12, 0x34(r12) /* 801CE52C 001CB48C 7D 89 03 A6 */ mtctr r12 -/* 801CE530 001CB490 4E 80 04 21 */ bctrl +/* 801CE530 001CB490 4E 80 04 21 */ bctrl /* 801CE534 001CB494 3B FF 00 08 */ addi r31, r31, 8 /* 801CE538 001CB498 3B DE 00 01 */ addi r30, r30, 1 lbl_801CE53C: @@ -366,7 +366,7 @@ lbl_801CE53C: /* 801CE554 001CB4B4 83 A1 00 14 */ lwz r29, 0x14(r1) /* 801CE558 001CB4B8 7C 08 03 A6 */ mtlr r0 /* 801CE55C 001CB4BC 38 21 00 20 */ addi r1, r1, 0x20 -/* 801CE560 001CB4C0 4E 80 00 20 */ blr +/* 801CE560 001CB4C0 4E 80 00 20 */ blr .global sub_801ce564 sub_801ce564: @@ -388,7 +388,7 @@ lbl_801CE594: /* 801CE59C 001CB4FC 81 83 00 00 */ lwz r12, 0(r3) /* 801CE5A0 001CB500 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801CE5A4 001CB504 7D 89 03 A6 */ mtctr r12 -/* 801CE5A8 001CB508 4E 80 04 21 */ bctrl +/* 801CE5A8 001CB508 4E 80 04 21 */ bctrl /* 801CE5AC 001CB50C 3B FF 00 08 */ addi r31, r31, 8 /* 801CE5B0 001CB510 3B DE 00 01 */ addi r30, r30, 1 lbl_801CE5B4: @@ -402,7 +402,7 @@ lbl_801CE5B4: /* 801CE5D0 001CB530 83 A1 00 0C */ lwz r29, 0xc(r1) /* 801CE5D4 001CB534 7C 08 03 A6 */ mtlr r0 /* 801CE5D8 001CB538 38 21 00 20 */ addi r1, r1, 0x20 -/* 801CE5DC 001CB53C 4E 80 00 20 */ blr +/* 801CE5DC 001CB53C 4E 80 00 20 */ blr .global sub_801ce5e0 sub_801ce5e0: @@ -422,13 +422,13 @@ lbl_801CE608: /* 801CE610 001CB570 81 83 00 00 */ lwz r12, 0(r3) /* 801CE614 001CB574 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 801CE618 001CB578 7D 89 03 A6 */ mtctr r12 -/* 801CE61C 001CB57C 4E 80 04 21 */ bctrl +/* 801CE61C 001CB57C 4E 80 04 21 */ bctrl /* 801CE620 001CB580 80 7F 00 04 */ lwz r3, 4(r31) /* 801CE624 001CB584 7F 84 E3 78 */ mr r4, r28 /* 801CE628 001CB588 81 83 00 00 */ lwz r12, 0(r3) /* 801CE62C 001CB58C 81 8C 00 18 */ lwz r12, 0x18(r12) /* 801CE630 001CB590 7D 89 03 A6 */ mtctr r12 -/* 801CE634 001CB594 4E 80 04 21 */ bctrl +/* 801CE634 001CB594 4E 80 04 21 */ bctrl /* 801CE638 001CB598 80 7F 00 04 */ lwz r3, 4(r31) /* 801CE63C 001CB59C 80 9E 00 00 */ lwz r4, 0(r30) /* 801CE640 001CB5A0 48 14 E2 81 */ bl ForceParticleCreation__11CElementGenFi @@ -437,7 +437,7 @@ lbl_801CE608: /* 801CE64C 001CB5AC 81 83 00 00 */ lwz r12, 0(r3) /* 801CE650 001CB5B0 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 801CE654 001CB5B4 7D 89 03 A6 */ mtctr r12 -/* 801CE658 001CB5B8 4E 80 04 21 */ bctrl +/* 801CE658 001CB5B8 4E 80 04 21 */ bctrl /* 801CE65C 001CB5BC 3B FF 00 08 */ addi r31, r31, 8 /* 801CE660 001CB5C0 3B DE 00 04 */ addi r30, r30, 4 /* 801CE664 001CB5C4 3B BD 00 01 */ addi r29, r29, 1 @@ -449,7 +449,7 @@ lbl_801CE668: /* 801CE678 001CB5D8 80 01 00 24 */ lwz r0, 0x24(r1) /* 801CE67C 001CB5DC 7C 08 03 A6 */ mtlr r0 /* 801CE680 001CB5E0 38 21 00 20 */ addi r1, r1, 0x20 -/* 801CE684 001CB5E4 4E 80 00 20 */ blr +/* 801CE684 001CB5E4 4E 80 00 20 */ blr .global ApplyContainment__10CFishCloudFRQ210CFishCloud5CBoidRC6CAABox ApplyContainment__10CFishCloudFRQ210CFishCloud5CBoidRC6CAABox: @@ -515,7 +515,7 @@ lbl_801CE75C: /* 801CE770 001CB6D0 83 A1 00 34 */ lwz r29, 0x34(r1) /* 801CE774 001CB6D4 7C 08 03 A6 */ mtlr r0 /* 801CE778 001CB6D8 38 21 00 50 */ addi r1, r1, 0x50 -/* 801CE77C 001CB6DC 4E 80 00 20 */ blr +/* 801CE77C 001CB6DC 4E 80 00 20 */ blr .global ApplyRepulsion__10CFishCloudFRQ210CFishCloud5CBoidRC9CVector3fff ApplyRepulsion__10CFishCloudFRQ210CFishCloud5CBoidRC9CVector3fff: @@ -526,7 +526,7 @@ ApplyRepulsion__10CFishCloudFRQ210CFishCloud5CBoidRC9CVector3fff: /* 801CE790 001CB6F0 80 01 00 14 */ lwz r0, 0x14(r1) /* 801CE794 001CB6F4 7C 08 03 A6 */ mtlr r0 /* 801CE798 001CB6F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CE79C 001CB6FC 4E 80 00 20 */ blr +/* 801CE79C 001CB6FC 4E 80 00 20 */ blr .global ApplyAttraction__10CFishCloudFRQ210CFishCloud5CBoidRC9CVector3fff ApplyAttraction__10CFishCloudFRQ210CFishCloud5CBoidRC9CVector3fff: @@ -601,7 +601,7 @@ lbl_801CE898: /* 801CE8AC 001CB80C 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 801CE8B0 001CB810 7C 08 03 A6 */ mtlr r0 /* 801CE8B4 001CB814 38 21 00 50 */ addi r1, r1, 0x50 -/* 801CE8B8 001CB818 4E 80 00 20 */ blr +/* 801CE8B8 001CB818 4E 80 00 20 */ blr .global ApplySeparation__10CFishCloudFRQ210CFishCloud5CBoidRC9CVector3fff ApplySeparation__10CFishCloudFRQ210CFishCloud5CBoidRC9CVector3fff: @@ -676,7 +676,7 @@ lbl_801CE9B4: /* 801CE9C8 001CB928 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 801CE9CC 001CB92C 7C 08 03 A6 */ mtlr r0 /* 801CE9D0 001CB930 38 21 00 50 */ addi r1, r1, 0x50 -/* 801CE9D4 001CB934 4E 80 00 20 */ blr +/* 801CE9D4 001CB934 4E 80 00 20 */ blr .global "ApplySeparation__10CFishCloudFRQ210CFishCloud5CBoidRCQ24rstl41reserved_vector" "ApplySeparation__10CFishCloudFRQ210CFishCloud5CBoidRCQ24rstl41reserved_vector": @@ -730,7 +730,7 @@ lbl_801CEA84: /* 801CEA84 001CB9E4 80 01 00 24 */ lwz r0, 0x24(r1) /* 801CEA88 001CB9E8 7C 08 03 A6 */ mtlr r0 /* 801CEA8C 001CB9EC 38 21 00 20 */ addi r1, r1, 0x20 -/* 801CEA90 001CB9F0 4E 80 00 20 */ blr +/* 801CEA90 001CB9F0 4E 80 00 20 */ blr .global ApplyCohesion__10CFishCloudFRQ210CFishCloud5CBoidRC9CVector3fff ApplyCohesion__10CFishCloudFRQ210CFishCloud5CBoidRC9CVector3fff: @@ -806,7 +806,7 @@ lbl_801CEB88: /* 801CEB9C 001CBAFC 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 801CEBA0 001CBB00 7C 08 03 A6 */ mtlr r0 /* 801CEBA4 001CBB04 38 21 00 50 */ addi r1, r1, 0x50 -/* 801CEBA8 001CBB08 4E 80 00 20 */ blr +/* 801CEBA8 001CBB08 4E 80 00 20 */ blr .global "ApplyCohesion__10CFishCloudFRQ210CFishCloud5CBoidRCQ24rstl41reserved_vector" "ApplyCohesion__10CFishCloudFRQ210CFishCloud5CBoidRCQ24rstl41reserved_vector": @@ -870,7 +870,7 @@ lbl_801CEC84: /* 801CEC84 001CBBE4 80 01 00 24 */ lwz r0, 0x24(r1) /* 801CEC88 001CBBE8 7C 08 03 A6 */ mtlr r0 /* 801CEC8C 001CBBEC 38 21 00 20 */ addi r1, r1, 0x20 -/* 801CEC90 001CBBF0 4E 80 00 20 */ blr +/* 801CEC90 001CBBF0 4E 80 00 20 */ blr .global sub_801cec94 sub_801cec94: @@ -942,7 +942,7 @@ sub_801cec94: /* 801CED98 001CBCF8 83 C1 00 08 */ lwz r30, 8(r1) /* 801CED9C 001CBCFC 7C 08 03 A6 */ mtlr r0 /* 801CEDA0 001CBD00 38 21 00 60 */ addi r1, r1, 0x60 -/* 801CEDA4 001CBD04 4E 80 00 20 */ blr +/* 801CEDA4 001CBD04 4E 80 00 20 */ blr .global "ApplyAlignment__10CFishCloudFRQ210CFishCloud5CBoidRCQ24rstl41reserved_vector" "ApplyAlignment__10CFishCloudFRQ210CFishCloud5CBoidRCQ24rstl41reserved_vector": @@ -1038,7 +1038,7 @@ lbl_801CEEF8: /* 801CEF00 001CBE60 83 C1 00 28 */ lwz r30, 0x28(r1) /* 801CEF04 001CBE64 7C 08 03 A6 */ mtlr r0 /* 801CEF08 001CBE68 38 21 00 30 */ addi r1, r1, 0x30 -/* 801CEF0C 001CBE6C 4E 80 00 20 */ blr +/* 801CEF0C 001CBE6C 4E 80 00 20 */ blr .global sub_801cef10 sub_801cef10: @@ -1182,7 +1182,7 @@ lbl_801CF0A4: /* 801CF124 001CC084 83 C1 00 68 */ lwz r30, 0x68(r1) /* 801CF128 001CC088 7C 08 03 A6 */ mtlr r0 /* 801CF12C 001CC08C 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 801CF130 001CC090 4E 80 00 20 */ blr +/* 801CF130 001CC090 4E 80 00 20 */ blr .global "BuildBoidNearList__10CFishCloudFRC9CVector3ffRQ24rstl41reserved_vector" "BuildBoidNearList__10CFishCloudFRC9CVector3ffRQ24rstl41reserved_vector": @@ -1248,7 +1248,7 @@ lbl_801CF1F8: /* 801CF20C 001CC16C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 801CF210 001CC170 7C 08 03 A6 */ mtlr r0 /* 801CF214 001CC174 38 21 00 30 */ addi r1, r1, 0x30 -/* 801CF218 001CC178 4E 80 00 20 */ blr +/* 801CF218 001CC178 4E 80 00 20 */ blr .global sub_801cf21c sub_801cf21c: @@ -1475,7 +1475,7 @@ lbl_801CF500: /* 801CF53C 001CC49C 83 A1 00 74 */ lwz r29, 0x74(r1) /* 801CF540 001CC4A0 7C 08 03 A6 */ mtlr r0 /* 801CF544 001CC4A4 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 801CF548 001CC4A8 4E 80 00 20 */ blr +/* 801CF548 001CC4A8 4E 80 00 20 */ blr .global GetListAt__10CFishCloudFRC9CVector3f GetListAt__10CFishCloudFRC9CVector3f: @@ -1542,7 +1542,7 @@ lbl_801CF628: /* 801CF630 001CC590 83 C1 00 58 */ lwz r30, 0x58(r1) /* 801CF634 001CC594 7C 08 03 A6 */ mtlr r0 /* 801CF638 001CC598 38 21 00 60 */ addi r1, r1, 0x60 -/* 801CF63C 001CC59C 4E 80 00 20 */ blr +/* 801CF63C 001CC59C 4E 80 00 20 */ blr .global UpdatePartitionList__10CFishCloudFv UpdatePartitionList__10CFishCloudFv: @@ -1668,7 +1668,7 @@ lbl_801CF7D0: /* 801CF7F4 001CC754 83 A1 00 64 */ lwz r29, 0x64(r1) /* 801CF7F8 001CC758 7C 08 03 A6 */ mtlr r0 /* 801CF7FC 001CC75C 38 21 00 70 */ addi r1, r1, 0x70 -/* 801CF800 001CC760 4E 80 00 20 */ blr +/* 801CF800 001CC760 4E 80 00 20 */ blr .global CreatePartitionList__10CFishCloudFv CreatePartitionList__10CFishCloudFv: @@ -1687,7 +1687,7 @@ CreatePartitionList__10CFishCloudFv: /* 801CF834 001CC794 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 801CF838 001CC798 7C 08 03 A6 */ mtlr r0 /* 801CF83C 001CC79C 38 21 00 30 */ addi r1, r1, 0x30 -/* 801CF840 001CC7A0 4E 80 00 20 */ blr +/* 801CF840 001CC7A0 4E 80 00 20 */ blr .global Touch__10CFishCloudFR6CActorR13CStateManager Touch__10CFishCloudFR6CActorR13CStateManager: @@ -1768,7 +1768,7 @@ lbl_801CF938: /* 801CF95C 001CC8BC 81 9F 00 00 */ lwz r12, 0(r31) /* 801CF960 001CC8C0 81 8C 00 40 */ lwz r12, 0x40(r12) /* 801CF964 001CC8C4 7D 89 03 A6 */ mtctr r12 -/* 801CF968 001CC8C8 4E 80 04 21 */ bctrl +/* 801CF968 001CC8C8 4E 80 04 21 */ bctrl /* 801CF96C 001CC8CC 88 01 00 60 */ lbz r0, 0x60(r1) /* 801CF970 001CC8D0 28 00 00 00 */ cmplwi r0, 0 /* 801CF974 001CC8D4 98 01 00 AC */ stb r0, 0xac(r1) @@ -1933,7 +1933,7 @@ lbl_801CFB90: /* 801CFBC4 001CCB24 80 01 01 34 */ lwz r0, 0x134(r1) /* 801CFBC8 001CCB28 7C 08 03 A6 */ mtlr r0 /* 801CFBCC 001CCB2C 38 21 01 30 */ addi r1, r1, 0x130 -/* 801CFBD0 001CCB30 4E 80 00 20 */ blr +/* 801CFBD0 001CCB30 4E 80 00 20 */ blr .global sub_801cfbd4 sub_801cfbd4: @@ -1997,7 +1997,7 @@ sub_801cfbd4: /* 801CFCB8 001CCC18 83 C1 00 38 */ lwz r30, 0x38(r1) /* 801CFCBC 001CCC1C 7C 08 03 A6 */ mtlr r0 /* 801CFCC0 001CCC20 38 21 00 40 */ addi r1, r1, 0x40 -/* 801CFCC4 001CCC24 4E 80 00 20 */ blr +/* 801CFCC4 001CCC24 4E 80 00 20 */ blr .global Render__10CFishCloudCFRC13CStateManager Render__10CFishCloudCFRC13CStateManager: @@ -2075,7 +2075,7 @@ lbl_801CFDBC: /* 801CFDDC 001CCD3C 81 83 00 00 */ lwz r12, 0(r3) /* 801CFDE0 001CCD40 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 801CFDE4 001CCD44 7D 89 03 A6 */ mtctr r12 -/* 801CFDE8 001CCD48 4E 80 04 21 */ bctrl +/* 801CFDE8 001CCD48 4E 80 04 21 */ bctrl /* 801CFDEC 001CCD4C 48 13 CB 91 */ bl DisableAllLights__9CGraphicsFv /* 801CFDF0 001CCD50 38 00 FF FF */ li r0, -1 /* 801CFDF4 001CCD54 83 DD 00 F4 */ lwz r30, 0xf4(r29) @@ -2112,7 +2112,7 @@ lbl_801CFE50: /* 801CFE60 001CCDC0 81 83 00 00 */ lwz r12, 0(r3) /* 801CFE64 001CCDC4 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 801CFE68 001CCDC8 7D 89 03 A6 */ mtctr r12 -/* 801CFE6C 001CCDCC 4E 80 04 21 */ bctrl +/* 801CFE6C 001CCDCC 4E 80 04 21 */ bctrl /* 801CFE70 001CCDD0 48 13 CB 0D */ bl DisableAllLights__9CGraphicsFv /* 801CFE74 001CCDD4 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 801CFE78 001CCDD8 3C 80 80 5A */ lis r4, skIdentity4f@ha @@ -2120,7 +2120,7 @@ lbl_801CFE50: /* 801CFE80 001CCDE0 81 83 00 00 */ lwz r12, 0(r3) /* 801CFE84 001CCDE4 81 8C 00 30 */ lwz r12, 0x30(r12) /* 801CFE88 001CCDE8 7D 89 03 A6 */ mtctr r12 -/* 801CFE8C 001CCDEC 4E 80 04 21 */ bctrl +/* 801CFE8C 001CCDEC 4E 80 04 21 */ bctrl /* 801CFE90 001CCDF0 83 9D 00 F4 */ lwz r28, 0xf4(r29) /* 801CFE94 001CCDF4 48 00 00 84 */ b lbl_801CFF18 lbl_801CFE98: @@ -2172,7 +2172,7 @@ lbl_801CFF30: /* 801CFF40 001CCEA0 83 81 00 60 */ lwz r28, 0x60(r1) /* 801CFF44 001CCEA4 7C 08 03 A6 */ mtlr r0 /* 801CFF48 001CCEA8 38 21 00 70 */ addi r1, r1, 0x70 -/* 801CFF4C 001CCEAC 4E 80 00 20 */ blr +/* 801CFF4C 001CCEAC 4E 80 00 20 */ blr .global sub_801cff50 sub_801cff50: @@ -2239,7 +2239,7 @@ lbl_801CFFEC: /* 801D003C 001CCF9C 81 83 00 00 */ lwz r12, 0(r3) /* 801D0040 001CCFA0 81 8C 00 30 */ lwz r12, 0x30(r12) /* 801D0044 001CCFA4 7D 89 03 A6 */ mtctr r12 -/* 801D0048 001CCFA8 4E 80 04 21 */ bctrl +/* 801D0048 001CCFA8 4E 80 04 21 */ bctrl /* 801D004C 001CCFAC 57 C3 18 38 */ slwi r3, r30, 3 /* 801D0050 001CCFB0 57 40 06 3F */ clrlwi. r0, r26, 0x18 /* 801D0054 001CCFB4 7C 97 1A 14 */ add r4, r23, r3 @@ -2296,7 +2296,7 @@ lbl_801D0110: /* 801D0118 001CD078 80 01 00 D4 */ lwz r0, 0xd4(r1) /* 801D011C 001CD07C 7C 08 03 A6 */ mtlr r0 /* 801D0120 001CD080 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 801D0124 001CD084 4E 80 00 20 */ blr +/* 801D0124 001CD084 4E 80 00 20 */ blr .global PreRender__10CFishCloudFR13CStateManagerRC14CFrustumPlanes PreRender__10CFishCloudFR13CStateManagerRC14CFrustumPlanes: @@ -2336,7 +2336,7 @@ lbl_801D017C: .global sub_801d01a4 sub_801d01a4: -/* 801D01A4 001CD104 4E 80 00 20 */ blr +/* 801D01A4 001CD104 4E 80 00 20 */ blr .global Think__10CFishCloudFfR13CStateManager Think__10CFishCloudFfR13CStateManager: @@ -2874,7 +2874,7 @@ lbl_801D0908: /* 801D091C 001CD87C 80 01 01 54 */ lwz r0, 0x154(r1) /* 801D0920 001CD880 7C 08 03 A6 */ mtlr r0 /* 801D0924 001CD884 38 21 01 50 */ addi r1, r1, 0x150 -/* 801D0928 001CD888 4E 80 00 20 */ blr +/* 801D0928 001CD888 4E 80 00 20 */ blr .global GetTouchBounds__10CFishCloudCFv GetTouchBounds__10CFishCloudCFv: @@ -2906,7 +2906,7 @@ lbl_801D0988: /* 801D098C 001CD8EC 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 801D0990 001CD8F0 7C 08 03 A6 */ mtlr r0 /* 801D0994 001CD8F4 38 21 00 30 */ addi r1, r1, 0x30 -/* 801D0998 001CD8F8 4E 80 00 20 */ blr +/* 801D0998 001CD8F8 4E 80 00 20 */ blr .global sub_801d099c sub_801d099c: @@ -2973,7 +2973,7 @@ lbl_801D0A78: /* 801D0A80 001CD9E0 83 C1 00 48 */ lwz r30, 0x48(r1) /* 801D0A84 001CD9E4 7C 08 03 A6 */ mtlr r0 /* 801D0A88 001CD9E8 38 21 00 50 */ addi r1, r1, 0x50 -/* 801D0A8C 001CD9EC 4E 80 00 20 */ blr +/* 801D0A8C 001CD9EC 4E 80 00 20 */ blr .global sub_801d0a90 sub_801d0a90: @@ -2995,7 +2995,7 @@ sub_801d0a90: /* 801D0ACC 001CDA2C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801D0AD0 001CDA30 7C 08 03 A6 */ mtlr r0 /* 801D0AD4 001CDA34 38 21 00 20 */ addi r1, r1, 0x20 -/* 801D0AD8 001CDA38 4E 80 00 20 */ blr +/* 801D0AD8 001CDA38 4E 80 00 20 */ blr .global sub_801d0adc sub_801d0adc: @@ -3048,7 +3048,7 @@ lbl_801D0B64: /* 801D0B80 001CDAE0 80 05 00 00 */ lwz r0, 0(r5) /* 801D0B84 001CDAE4 90 03 00 00 */ stw r0, 0(r3) /* 801D0B88 001CDAE8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D0B8C 001CDAEC 4E 80 00 20 */ blr +/* 801D0B8C 001CDAEC 4E 80 00 20 */ blr .global sub_801d0b90 sub_801d0b90: @@ -3115,7 +3115,7 @@ lbl_801D0C6C: /* 801D0C74 001CDBD4 83 C1 00 48 */ lwz r30, 0x48(r1) /* 801D0C78 001CDBD8 7C 08 03 A6 */ mtlr r0 /* 801D0C7C 001CDBDC 38 21 00 50 */ addi r1, r1, 0x50 -/* 801D0C80 001CDBE0 4E 80 00 20 */ blr +/* 801D0C80 001CDBE0 4E 80 00 20 */ blr .global sub_801d0c84 sub_801d0c84: @@ -3210,7 +3210,7 @@ lbl_801D0DC0: /* 801D0DD0 001CDD30 83 C1 00 58 */ lwz r30, 0x58(r1) /* 801D0DD4 001CDD34 7C 08 03 A6 */ mtlr r0 /* 801D0DD8 001CDD38 38 21 00 70 */ addi r1, r1, 0x70 -/* 801D0DDC 001CDD3C 4E 80 00 20 */ blr +/* 801D0DDC 001CDD3C 4E 80 00 20 */ blr .global sub_801d0de0 sub_801d0de0: @@ -3248,7 +3248,7 @@ sub_801d0de0: /* 801D0E5C 001CDDBC 83 A1 00 24 */ lwz r29, 0x24(r1) /* 801D0E60 001CDDC0 7C 08 03 A6 */ mtlr r0 /* 801D0E64 001CDDC4 38 21 00 30 */ addi r1, r1, 0x30 -/* 801D0E68 001CDDC8 4E 80 00 20 */ blr +/* 801D0E68 001CDDC8 4E 80 00 20 */ blr .global sub_801d0e6c sub_801d0e6c: @@ -3458,7 +3458,7 @@ lbl_801D1130: /* 801D1134 001CE094 80 01 00 34 */ lwz r0, 0x34(r1) /* 801D1138 001CE098 7C 08 03 A6 */ mtlr r0 /* 801D113C 001CE09C 38 21 00 30 */ addi r1, r1, 0x30 -/* 801D1140 001CE0A0 4E 80 00 20 */ blr +/* 801D1140 001CE0A0 4E 80 00 20 */ blr .global sub_801d1144 sub_801d1144: @@ -3553,7 +3553,7 @@ lbl_801D1280: /* 801D1290 001CE1F0 83 C1 00 58 */ lwz r30, 0x58(r1) /* 801D1294 001CE1F4 7C 08 03 A6 */ mtlr r0 /* 801D1298 001CE1F8 38 21 00 70 */ addi r1, r1, 0x70 -/* 801D129C 001CE1FC 4E 80 00 20 */ blr +/* 801D129C 001CE1FC 4E 80 00 20 */ blr .global AcceptScriptMsg__10CFishCloudF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__10CFishCloudF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -3764,7 +3764,7 @@ lbl_801D1540: /* 801D15B0 001CE510 83 81 00 90 */ lwz r28, 0x90(r1) /* 801D15B4 001CE514 7C 08 03 A6 */ mtlr r0 /* 801D15B8 001CE518 38 21 01 60 */ addi r1, r1, 0x160 -/* 801D15BC 001CE51C 4E 80 00 20 */ blr +/* 801D15BC 001CE51C 4E 80 00 20 */ blr .global PlaceBoid__10CFishCloudFR13CStateManagerRQ210CFishCloud5CBoidRC6CAABox PlaceBoid__10CFishCloudFR13CStateManagerRQ210CFishCloud5CBoidRC6CAABox: @@ -3934,7 +3934,7 @@ lbl_801D181C: /* 801D1844 001CE7A4 83 81 00 70 */ lwz r28, 0x70(r1) /* 801D1848 001CE7A8 7C 08 03 A6 */ mtlr r0 /* 801D184C 001CE7AC 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 801D1850 001CE7B0 4E 80 00 20 */ blr +/* 801D1850 001CE7B0 4E 80 00 20 */ blr .global FindClosestPlane__10CFishCloudCFRC6CAABoxRC9CVector3f FindClosestPlane__10CFishCloudCFRC6CAABoxRC9CVector3f: @@ -4226,7 +4226,7 @@ lbl_801D1C84: /* 801D1CB0 001CEC10 80 01 02 B4 */ lwz r0, 0x2b4(r1) /* 801D1CB4 001CEC14 7C 08 03 A6 */ mtlr r0 /* 801D1CB8 001CEC18 38 21 02 B0 */ addi r1, r1, 0x2b0 -/* 801D1CBC 001CEC1C 4E 80 00 20 */ blr +/* 801D1CBC 001CEC1C 4E 80 00 20 */ blr .global PointInBox__10CFishCloudCFRC6CAABoxRC9CVector3f PointInBox__10CFishCloudCFRC6CAABoxRC9CVector3f: @@ -4277,7 +4277,7 @@ lbl_801D1D64: /* 801D1D68 001CECC8 83 E1 00 4C */ lwz r31, 0x4c(r1) /* 801D1D6C 001CECCC 7C 08 03 A6 */ mtlr r0 /* 801D1D70 001CECD0 38 21 00 50 */ addi r1, r1, 0x50 -/* 801D1D74 001CECD4 4E 80 00 20 */ blr +/* 801D1D74 001CECD4 4E 80 00 20 */ blr .global GetUntransformedBoundingBox__10CFishCloudCFv GetUntransformedBoundingBox__10CFishCloudCFv: @@ -4306,7 +4306,7 @@ GetUntransformedBoundingBox__10CFishCloudCFv: /* 801D1DD0 001CED30 80 01 00 24 */ lwz r0, 0x24(r1) /* 801D1DD4 001CED34 7C 08 03 A6 */ mtlr r0 /* 801D1DD8 001CED38 38 21 00 20 */ addi r1, r1, 0x20 -/* 801D1DDC 001CED3C 4E 80 00 20 */ blr +/* 801D1DDC 001CED3C 4E 80 00 20 */ blr .global GetBoundingBox__10CFishCloudCFv GetBoundingBox__10CFishCloudCFv: @@ -4340,7 +4340,7 @@ GetBoundingBox__10CFishCloudCFv: /* 801D1E4C 001CEDAC 83 C1 00 38 */ lwz r30, 0x38(r1) /* 801D1E50 001CEDB0 7C 08 03 A6 */ mtlr r0 /* 801D1E54 001CEDB4 38 21 00 40 */ addi r1, r1, 0x40 -/* 801D1E58 001CEDB8 4E 80 00 20 */ blr +/* 801D1E58 001CEDB8 4E 80 00 20 */ blr .global CalculateRenderBounds__10CFishCloudFv CalculateRenderBounds__10CFishCloudFv: @@ -4380,7 +4380,7 @@ CalculateRenderBounds__10CFishCloudFv: /* 801D1EE0 001CEE40 80 01 00 44 */ lwz r0, 0x44(r1) /* 801D1EE4 001CEE44 7C 08 03 A6 */ mtlr r0 /* 801D1EE8 001CEE48 38 21 00 40 */ addi r1, r1, 0x40 -/* 801D1EEC 001CEE4C 4E 80 00 20 */ blr +/* 801D1EEC 001CEE4C 4E 80 00 20 */ blr .global Accept__10CFishCloudFR8IVisitor Accept__10CFishCloudFR8IVisitor: @@ -4393,11 +4393,11 @@ Accept__10CFishCloudFR8IVisitor: /* 801D1F08 001CEE68 7C 04 03 78 */ mr r4, r0 /* 801D1F0C 001CEE6C 81 8C 00 30 */ lwz r12, 0x30(r12) /* 801D1F10 001CEE70 7D 89 03 A6 */ mtctr r12 -/* 801D1F14 001CEE74 4E 80 04 21 */ bctrl +/* 801D1F14 001CEE74 4E 80 04 21 */ bctrl /* 801D1F18 001CEE78 80 01 00 14 */ lwz r0, 0x14(r1) /* 801D1F1C 001CEE7C 7C 08 03 A6 */ mtlr r0 /* 801D1F20 001CEE80 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D1F24 001CEE84 4E 80 00 20 */ blr +/* 801D1F24 001CEE84 4E 80 00 20 */ blr .global sub_801d1f28 sub_801d1f28: @@ -4548,7 +4548,7 @@ lbl_801D2090: /* 801D213C 001CF09C 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 801D2140 001CF0A0 7C 08 03 A6 */ mtlr r0 /* 801D2144 001CF0A4 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 801D2148 001CF0A8 4E 80 00 20 */ blr +/* 801D2148 001CF0A8 4E 80 00 20 */ blr .global "__ct__10CFishCloudF9TUniqueIdbRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC9CVector3fRC12CTransform4fRC10CModelDatafffff" "__ct__10CFishCloudF9TUniqueIdbRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC9CVector3fRC12CTransform4fRC10CModelDatafffff": @@ -5063,7 +5063,7 @@ lbl_801D28BC: /* 801D28E4 001CF844 81 84 00 00 */ lwz r12, 0(r4) /* 801D28E8 001CF848 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801D28EC 001CF84C 7D 89 03 A6 */ mtctr r12 -/* 801D28F0 001CF850 4E 80 04 21 */ bctrl +/* 801D28F0 001CF850 4E 80 04 21 */ bctrl /* 801D28F4 001CF854 39 C1 00 A4 */ addi r14, r1, 0xa4 /* 801D28F8 001CF858 38 81 00 68 */ addi r4, r1, 0x68 /* 801D28FC 001CF85C 7D C3 73 78 */ mr r3, r14 @@ -5109,7 +5109,7 @@ lbl_801D296C: /* 801D2994 001CF8F4 81 84 00 00 */ lwz r12, 0(r4) /* 801D2998 001CF8F8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801D299C 001CF8FC 7D 89 03 A6 */ mtctr r12 -/* 801D29A0 001CF900 4E 80 04 21 */ bctrl +/* 801D29A0 001CF900 4E 80 04 21 */ bctrl /* 801D29A4 001CF904 39 C1 00 98 */ addi r14, r1, 0x98 /* 801D29A8 001CF908 38 81 00 58 */ addi r4, r1, 0x58 /* 801D29AC 001CF90C 7D C3 73 78 */ mr r3, r14 @@ -5155,7 +5155,7 @@ lbl_801D2A1C: /* 801D2A44 001CF9A4 81 84 00 00 */ lwz r12, 0(r4) /* 801D2A48 001CF9A8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801D2A4C 001CF9AC 7D 89 03 A6 */ mtctr r12 -/* 801D2A50 001CF9B0 4E 80 04 21 */ bctrl +/* 801D2A50 001CF9B0 4E 80 04 21 */ bctrl /* 801D2A54 001CF9B4 39 C1 00 8C */ addi r14, r1, 0x8c /* 801D2A58 001CF9B8 38 81 00 48 */ addi r4, r1, 0x48 /* 801D2A5C 001CF9BC 7D C3 73 78 */ mr r3, r14 @@ -5201,7 +5201,7 @@ lbl_801D2ACC: /* 801D2AF4 001CFA54 81 84 00 00 */ lwz r12, 0(r4) /* 801D2AF8 001CFA58 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801D2AFC 001CFA5C 7D 89 03 A6 */ mtctr r12 -/* 801D2B00 001CFA60 4E 80 04 21 */ bctrl +/* 801D2B00 001CFA60 4E 80 04 21 */ bctrl /* 801D2B04 001CFA64 39 C1 00 80 */ addi r14, r1, 0x80 /* 801D2B08 001CFA68 38 81 00 38 */ addi r4, r1, 0x38 /* 801D2B0C 001CFA6C 7D C3 73 78 */ mr r3, r14 @@ -5289,7 +5289,7 @@ lbl_801D2C18: /* 801D2C40 001CFBA0 38 80 00 01 */ li r4, 1 /* 801D2C44 001CFBA4 81 8C 00 08 */ lwz r12, 8(r12) /* 801D2C48 001CFBA8 7D 89 03 A6 */ mtctr r12 -/* 801D2C4C 001CFBAC 4E 80 04 21 */ bctrl +/* 801D2C4C 001CFBAC 4E 80 04 21 */ bctrl lbl_801D2C50: /* 801D2C50 001CFBB0 7E 80 07 75 */ extsb. r0, r20 /* 801D2C54 001CFBB4 41 82 00 10 */ beq lbl_801D2C64 @@ -5303,7 +5303,7 @@ lbl_801D2C64: /* 801D2C70 001CFBD0 81 83 00 00 */ lwz r12, 0(r3) /* 801D2C74 001CFBD4 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 801D2C78 001CFBD8 7D 89 03 A6 */ mtctr r12 -/* 801D2C7C 001CFBDC 4E 80 04 21 */ bctrl +/* 801D2C7C 001CFBDC 4E 80 04 21 */ bctrl /* 801D2C80 001CFBE0 3A 10 00 0C */ addi r16, r16, 0xc /* 801D2C84 001CFBE4 3A 31 00 08 */ addi r17, r17, 8 /* 801D2C88 001CFBE8 3A 73 00 01 */ addi r19, r19, 1 @@ -5421,7 +5421,7 @@ lbl_801D2D3C: /* 801D2E34 001CFD94 80 01 02 F4 */ lwz r0, 0x2f4(r1) /* 801D2E38 001CFD98 7C 08 03 A6 */ mtlr r0 /* 801D2E3C 001CFD9C 38 21 02 F0 */ addi r1, r1, 0x2f0 -/* 801D2E40 001CFDA0 4E 80 00 20 */ blr +/* 801D2E40 001CFDA0 4E 80 00 20 */ blr .global __ct__Q210CFishCloud5CBoidFRC9CVector3fRC9CVector3ff __ct__Q210CFishCloud5CBoidFRC9CVector3fRC9CVector3ff: @@ -5442,7 +5442,7 @@ __ct__Q210CFishCloud5CBoidFRC9CVector3fRC9CVector3ff: /* 801D2E7C 001CFDDC D0 23 00 18 */ stfs f1, 0x18(r3) /* 801D2E80 001CFDE0 90 C3 00 1C */ stw r6, 0x1c(r3) /* 801D2E84 001CFDE4 98 03 00 20 */ stb r0, 0x20(r3) -/* 801D2E88 001CFDE8 4E 80 00 20 */ blr +/* 801D2E88 001CFDE8 4E 80 00 20 */ blr .global __lt__Q210CFishCloud15CModifierSourceCFRCQ210CFishCloud15CModifierSource __lt__Q210CFishCloud15CModifierSourceCFRCQ210CFishCloud15CModifierSource: @@ -5454,11 +5454,11 @@ __lt__Q210CFishCloud15CModifierSourceCFRCQ210CFishCloud15CModifierSource: /* 801D2EA0 001CFE00 88 04 00 0C */ lbz r0, 0xc(r4) /* 801D2EA4 001CFE04 7C 00 18 50 */ subf r0, r0, r3 /* 801D2EA8 001CFE08 54 03 0F FE */ srwi r3, r0, 0x1f -/* 801D2EAC 001CFE0C 4E 80 00 20 */ blr +/* 801D2EAC 001CFE0C 4E 80 00 20 */ blr lbl_801D2EB0: /* 801D2EB0 001CFE10 7C 00 28 50 */ subf r0, r0, r5 /* 801D2EB4 001CFE14 54 03 0F FE */ srwi r3, r0, 0x1f -/* 801D2EB8 001CFE18 4E 80 00 20 */ blr +/* 801D2EB8 001CFE18 4E 80 00 20 */ blr .global __ct__Q210CFishCloud15CModifierSourceFRC9TUniqueIdbff __ct__Q210CFishCloud15CModifierSourceFRC9TUniqueIdbff: @@ -5468,7 +5468,7 @@ __ct__Q210CFishCloud15CModifierSourceFRC9TUniqueIdbff: /* 801D2EC8 001CFE28 D0 43 00 08 */ stfs f2, 8(r3) /* 801D2ECC 001CFE2C 98 A3 00 0C */ stb r5, 0xc(r3) /* 801D2ED0 001CFE30 98 C3 00 0D */ stb r6, 0xd(r3) -/* 801D2ED4 001CFE34 4E 80 00 20 */ blr +/* 801D2ED4 001CFE34 4E 80 00 20 */ blr .global RemoveSelf__18CFishCloudModifierFR13CStateManager RemoveSelf__18CFishCloudModifierFR13CStateManager: @@ -5540,7 +5540,7 @@ lbl_801D2FA8: /* 801D2FCC 001CFF2C 83 A1 00 34 */ lwz r29, 0x34(r1) /* 801D2FD0 001CFF30 7C 08 03 A6 */ mtlr r0 /* 801D2FD4 001CFF34 38 21 00 40 */ addi r1, r1, 0x40 -/* 801D2FD8 001CFF38 4E 80 00 20 */ blr +/* 801D2FD8 001CFF38 4E 80 00 20 */ blr .global AddSelf__18CFishCloudModifierFR13CStateManager AddSelf__18CFishCloudModifierFR13CStateManager: @@ -5618,7 +5618,7 @@ lbl_801D30C4: /* 801D30E8 001D0048 83 A1 00 34 */ lwz r29, 0x34(r1) /* 801D30EC 001D004C 7C 08 03 A6 */ mtlr r0 /* 801D30F0 001D0050 38 21 00 40 */ addi r1, r1, 0x40 -/* 801D30F4 001D0054 4E 80 00 20 */ blr +/* 801D30F4 001D0054 4E 80 00 20 */ blr .global AcceptScriptMsg__18CFishCloudModifierF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__18CFishCloudModifierF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -5667,7 +5667,7 @@ lbl_801D3184: /* 801D3190 001D00F0 83 A1 00 14 */ lwz r29, 0x14(r1) /* 801D3194 001D00F4 7C 08 03 A6 */ mtlr r0 /* 801D3198 001D00F8 38 21 00 20 */ addi r1, r1, 0x20 -/* 801D319C 001D00FC 4E 80 00 20 */ blr +/* 801D319C 001D00FC 4E 80 00 20 */ blr .global Accept__18CFishCloudModifierFR8IVisitor Accept__18CFishCloudModifierFR8IVisitor: @@ -5680,11 +5680,11 @@ Accept__18CFishCloudModifierFR8IVisitor: /* 801D31B8 001D0118 7C 04 03 78 */ mr r4, r0 /* 801D31BC 001D011C 81 8C 00 08 */ lwz r12, 8(r12) /* 801D31C0 001D0120 7D 89 03 A6 */ mtctr r12 -/* 801D31C4 001D0124 4E 80 04 21 */ bctrl +/* 801D31C4 001D0124 4E 80 04 21 */ bctrl /* 801D31C8 001D0128 80 01 00 14 */ lwz r0, 0x14(r1) /* 801D31CC 001D012C 7C 08 03 A6 */ mtlr r0 /* 801D31D0 001D0130 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D31D4 001D0134 4E 80 00 20 */ blr +/* 801D31D4 001D0134 4E 80 00 20 */ blr .global "__ct__18CFishCloudModifierF9TUniqueIdbRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC9CVector3fbff" "__ct__18CFishCloudModifierF9TUniqueIdbRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC9CVector3fbff": @@ -5761,7 +5761,7 @@ Accept__18CFishCloudModifierFR8IVisitor: /* 801D32F0 001D0250 80 01 01 44 */ lwz r0, 0x144(r1) /* 801D32F4 001D0254 7C 08 03 A6 */ mtlr r0 /* 801D32F8 001D0258 38 21 01 40 */ addi r1, r1, 0x140 -/* 801D32FC 001D025C 4E 80 00 20 */ blr +/* 801D32FC 001D025C 4E 80 00 20 */ blr .global __dt__18CFishCloudModifierFv __dt__18CFishCloudModifierFv: @@ -5789,7 +5789,7 @@ lbl_801D3344: /* 801D3350 001D02B0 83 C1 00 08 */ lwz r30, 8(r1) /* 801D3354 001D02B4 7C 08 03 A6 */ mtlr r0 /* 801D3358 001D02B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D335C 001D02BC 4E 80 00 20 */ blr +/* 801D335C 001D02BC 4E 80 00 20 */ blr .global sub_801d3360 sub_801d3360: @@ -5816,7 +5816,7 @@ lbl_801D33A8: /* 801D33AC 001D030C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801D33B0 001D0310 7C 08 03 A6 */ mtlr r0 /* 801D33B4 001D0314 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D33B8 001D0318 4E 80 00 20 */ blr +/* 801D33B8 001D0318 4E 80 00 20 */ blr .global "lower_bound,Q24rstl17rmemory_allocator>,Q210CFishCloud15CModifierSource>__4rstlFQ24rstl152pointer_iterator,Q24rstl17rmemory_allocator>Q24rstl152pointer_iterator,Q24rstl17rmemory_allocator>,Q210CFishCloud15CModifierSource>__4rstlFQ24rstl152pointer_iterator,Q24rstl17rmemory_allocator>Q24rstl152pointer_iteratorFi" "reserve__Q24rstl66vectorFi": @@ -5950,7 +5950,7 @@ lbl_801D3570: /* 801D357C 001D04DC 83 A1 00 24 */ lwz r29, 0x24(r1) /* 801D3580 001D04E0 7C 08 03 A6 */ mtlr r0 /* 801D3584 001D04E4 38 21 00 30 */ addi r1, r1, 0x30 -/* 801D3588 001D04E8 4E 80 00 20 */ blr +/* 801D3588 001D04E8 4E 80 00 20 */ blr .global "reserve__Q24rstl56vectorFi" "reserve__Q24rstl56vectorFi": @@ -6021,7 +6021,7 @@ lbl_801D365C: /* 801D3668 001D05C8 83 A1 00 24 */ lwz r29, 0x24(r1) /* 801D366C 001D05CC 7C 08 03 A6 */ mtlr r0 /* 801D3670 001D05D0 38 21 00 30 */ addi r1, r1, 0x30 -/* 801D3674 001D05D4 4E 80 00 20 */ blr +/* 801D3674 001D05D4 4E 80 00 20 */ blr .global "reserve__Q24rstl55vectorFi" "reserve__Q24rstl55vectorFi": @@ -6109,7 +6109,7 @@ lbl_801D378C: /* 801D3798 001D06F8 83 A1 00 24 */ lwz r29, 0x24(r1) /* 801D379C 001D06FC 7C 08 03 A6 */ mtlr r0 /* 801D37A0 001D0700 38 21 00 30 */ addi r1, r1, 0x30 -/* 801D37A4 001D0704 4E 80 00 20 */ blr +/* 801D37A4 001D0704 4E 80 00 20 */ blr .global "advance,Q24rstl17rmemory_allocator>,i>__4rstlFRQ24rstl152pointer_iterator,Q24rstl17rmemory_allocator>i" "advance,Q24rstl17rmemory_allocator>,i>__4rstlFRQ24rstl152pointer_iterator,Q24rstl17rmemory_allocator>i": @@ -6123,7 +6123,7 @@ lbl_801D378C: /* 801D37C4 001D0724 80 01 00 14 */ lwz r0, 0x14(r1) /* 801D37C8 001D0728 7C 08 03 A6 */ mtlr r0 /* 801D37CC 001D072C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D37D0 001D0730 4E 80 00 20 */ blr +/* 801D37D0 001D0730 4E 80 00 20 */ blr .global "__advance,Q24rstl17rmemory_allocator>,i>__4rstlFRQ24rstl152pointer_iterator,Q24rstl17rmemory_allocator>iQ24rstl26random_access_iterator_tag" "__advance,Q24rstl17rmemory_allocator>,i>__4rstlFRQ24rstl152pointer_iterator,Q24rstl17rmemory_allocator>iQ24rstl26random_access_iterator_tag": @@ -6131,7 +6131,7 @@ lbl_801D378C: /* 801D37D8 001D0738 54 80 20 36 */ slwi r0, r4, 4 /* 801D37DC 001D073C 7C 05 02 14 */ add r0, r5, r0 /* 801D37E0 001D0740 90 03 00 00 */ stw r0, 0(r3) -/* 801D37E4 001D0744 4E 80 00 20 */ blr +/* 801D37E4 001D0744 4E 80 00 20 */ blr .global "distance,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl152pointer_iterator,Q24rstl17rmemory_allocator>Q24rstl152pointer_iterator,Q24rstl17rmemory_allocator>" "distance,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl152pointer_iterator,Q24rstl17rmemory_allocator>Q24rstl152pointer_iterator,Q24rstl17rmemory_allocator>": @@ -6151,7 +6151,7 @@ lbl_801D378C: /* 801D381C 001D077C 80 01 00 24 */ lwz r0, 0x24(r1) /* 801D3820 001D0780 7C 08 03 A6 */ mtlr r0 /* 801D3824 001D0784 38 21 00 20 */ addi r1, r1, 0x20 -/* 801D3828 001D0788 4E 80 00 20 */ blr +/* 801D3828 001D0788 4E 80 00 20 */ blr .global "__distance,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl152pointer_iterator,Q24rstl17rmemory_allocator>Q24rstl152pointer_iterator,Q24rstl17rmemory_allocator>Q24r" "__distance,Q24rstl17rmemory_allocator>>__4rstlFQ24rstl152pointer_iterator,Q24rstl17rmemory_allocator>Q24rstl152pointer_iterator,Q24rstl17rmemory_allocator>Q24r": diff --git a/asm/MetroidPrime/ScriptObjects/CHUDBillboardEffect.s b/asm/MetroidPrime/ScriptObjects/CHUDBillboardEffect.s index cce802ed..2d83fcfb 100644 --- a/asm/MetroidPrime/ScriptObjects/CHUDBillboardEffect.s +++ b/asm/MetroidPrime/ScriptObjects/CHUDBillboardEffect.s @@ -74,11 +74,11 @@ Accept__19CHUDBillboardEffectFR8IVisitor: /* 8012FAF0 0012CA50 7C 04 03 78 */ mr r4, r0 /* 8012FAF4 0012CA54 81 8C 00 40 */ lwz r12, 0x40(r12) /* 8012FAF8 0012CA58 7D 89 03 A6 */ mtctr r12 -/* 8012FAFC 0012CA5C 4E 80 04 21 */ bctrl +/* 8012FAFC 0012CA5C 4E 80 04 21 */ bctrl /* 8012FB00 0012CA60 80 01 00 14 */ lwz r0, 0x14(r1) /* 8012FB04 0012CA64 7C 08 03 A6 */ mtlr r0 /* 8012FB08 0012CA68 38 21 00 10 */ addi r1, r1, 0x10 -/* 8012FB0C 0012CA6C 4E 80 00 20 */ blr +/* 8012FB0C 0012CA6C 4E 80 00 20 */ blr .global Think__19CHUDBillboardEffectFfR13CStateManager Think__19CHUDBillboardEffectFfR13CStateManager: @@ -110,7 +110,7 @@ Think__19CHUDBillboardEffectFfR13CStateManager: /* 8012FB74 0012CAD4 81 83 00 00 */ lwz r12, 0(r3) /* 8012FB78 0012CAD8 81 8C 00 54 */ lwz r12, 0x54(r12) /* 8012FB7C 0012CADC 7D 89 03 A6 */ mtctr r12 -/* 8012FB80 0012CAE0 4E 80 04 21 */ bctrl +/* 8012FB80 0012CAE0 4E 80 04 21 */ bctrl /* 8012FB84 0012CAE4 FF E0 08 90 */ fmr f31, f1 /* 8012FB88 0012CAE8 83 FD 00 E8 */ lwz r31, 0xe8(r29) /* 8012FB8C 0012CAEC 48 00 06 D9 */ bl CalcGenRate__19CHudBillboardEffectFv @@ -119,19 +119,19 @@ Think__19CHUDBillboardEffectFfR13CStateManager: /* 8012FB98 0012CAF8 7F E3 FB 78 */ mr r3, r31 /* 8012FB9C 0012CAFC 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8012FBA0 0012CB00 7D 89 03 A6 */ mtctr r12 -/* 8012FBA4 0012CB04 4E 80 04 21 */ bctrl +/* 8012FBA4 0012CB04 4E 80 04 21 */ bctrl /* 8012FBA8 0012CB08 80 7D 00 E8 */ lwz r3, 0xe8(r29) /* 8012FBAC 0012CB0C FC 20 F0 90 */ fmr f1, f30 /* 8012FBB0 0012CB10 81 83 00 00 */ lwz r12, 0(r3) /* 8012FBB4 0012CB14 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8012FBB8 0012CB18 7D 89 03 A6 */ mtctr r12 -/* 8012FBBC 0012CB1C 4E 80 04 21 */ bctrl +/* 8012FBBC 0012CB1C 4E 80 04 21 */ bctrl /* 8012FBC0 0012CB20 80 7D 00 E8 */ lwz r3, 0xe8(r29) /* 8012FBC4 0012CB24 FC 20 F8 90 */ fmr f1, f31 /* 8012FBC8 0012CB28 81 83 00 00 */ lwz r12, 0(r3) /* 8012FBCC 0012CB2C 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8012FBD0 0012CB30 7D 89 03 A6 */ mtctr r12 -/* 8012FBD4 0012CB34 4E 80 04 21 */ bctrl +/* 8012FBD4 0012CB34 4E 80 04 21 */ bctrl /* 8012FBD8 0012CB38 88 1D 01 04 */ lbz r0, 0x104(r29) /* 8012FBDC 0012CB3C 54 00 E7 FF */ rlwinm. r0, r0, 0x1c, 0x1f, 0x1f /* 8012FBE0 0012CB40 40 82 00 3C */ bne lbl_8012FC1C @@ -154,7 +154,7 @@ lbl_8012FC1C: /* 8012FC20 0012CB80 81 83 00 00 */ lwz r12, 0(r3) /* 8012FC24 0012CB84 81 8C 00 58 */ lwz r12, 0x58(r12) /* 8012FC28 0012CB88 7D 89 03 A6 */ mtctr r12 -/* 8012FC2C 0012CB8C 4E 80 04 21 */ bctrl +/* 8012FC2C 0012CB8C 4E 80 04 21 */ bctrl /* 8012FC30 0012CB90 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8012FC34 0012CB94 41 82 00 1C */ beq lbl_8012FC50 /* 8012FC38 0012CB98 A0 1D 00 08 */ lhz r0, 8(r29) @@ -174,16 +174,16 @@ lbl_8012FC50: /* 8012FC6C 0012CBCC 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8012FC70 0012CBD0 7C 08 03 A6 */ mtlr r0 /* 8012FC74 0012CBD4 38 21 00 50 */ addi r1, r1, 0x50 -/* 8012FC78 0012CBD8 4E 80 00 20 */ blr +/* 8012FC78 0012CBD8 4E 80 00 20 */ blr .global SetGeneratorRate__12CParticleGenFf SetGeneratorRate__12CParticleGenFf: -/* 8012FC7C 0012CBDC 4E 80 00 20 */ blr +/* 8012FC7C 0012CBDC 4E 80 00 20 */ blr .global GetGeneratorRate__12CParticleGenCFv GetGeneratorRate__12CParticleGenCFv: /* 8012FC80 0012CBE0 C0 22 99 3C */ lfs f1, lbl_805AB65C@sda21(r2) -/* 8012FC84 0012CBE4 4E 80 00 20 */ blr +/* 8012FC84 0012CBE4 4E 80 00 20 */ blr .global Render__19CHUDBillboardEffectCFRC13CStateManager Render__19CHUDBillboardEffectCFRC13CStateManager: @@ -199,12 +199,12 @@ Render__19CHUDBillboardEffectCFRC13CStateManager: /* 8012FCAC 0012CC0C 81 83 00 00 */ lwz r12, 0(r3) /* 8012FCB0 0012CC10 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8012FCB4 0012CC14 7D 89 03 A6 */ mtctr r12 -/* 8012FCB8 0012CC18 4E 80 04 21 */ bctrl +/* 8012FCB8 0012CC18 4E 80 04 21 */ bctrl lbl_8012FCBC: /* 8012FCBC 0012CC1C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8012FCC0 0012CC20 7C 08 03 A6 */ mtlr r0 /* 8012FCC4 0012CC24 38 21 00 10 */ addi r1, r1, 0x10 -/* 8012FCC8 0012CC28 4E 80 00 20 */ blr +/* 8012FCC8 0012CC28 4E 80 00 20 */ blr .global PreRender__19CHUDBillboardEffectFR13CStateManagerRC14CFrustumPlanes PreRender__19CHUDBillboardEffectFR13CStateManagerRC14CFrustumPlanes: @@ -237,13 +237,13 @@ PreRender__19CHUDBillboardEffectFR13CStateManagerRC14CFrustumPlanes: /* 8012FD34 0012CC94 81 9F 00 00 */ lwz r12, 0(r31) /* 8012FD38 0012CC98 81 8C 00 20 */ lwz r12, 0x20(r12) /* 8012FD3C 0012CC9C 7D 89 03 A6 */ mtctr r12 -/* 8012FD40 0012CCA0 4E 80 04 21 */ bctrl +/* 8012FD40 0012CCA0 4E 80 04 21 */ bctrl /* 8012FD44 0012CCA4 80 7D 00 E8 */ lwz r3, 0xe8(r29) /* 8012FD48 0012CCA8 38 81 00 48 */ addi r4, r1, 0x48 /* 8012FD4C 0012CCAC 81 83 00 00 */ lwz r12, 0(r3) /* 8012FD50 0012CCB0 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 8012FD54 0012CCB4 7D 89 03 A6 */ mtctr r12 -/* 8012FD58 0012CCB8 4E 80 04 21 */ bctrl +/* 8012FD58 0012CCB8 4E 80 04 21 */ bctrl /* 8012FD5C 0012CCBC 88 1D 01 04 */ lbz r0, 0x104(r29) /* 8012FD60 0012CCC0 38 60 00 01 */ li r3, 1 /* 8012FD64 0012CCC4 50 60 36 72 */ rlwimi r0, r3, 6, 0x19, 0x19 @@ -271,7 +271,7 @@ lbl_8012FD80: /* 8012FDB4 0012CD14 83 A1 00 84 */ lwz r29, 0x84(r1) /* 8012FDB8 0012CD18 7C 08 03 A6 */ mtlr r0 /* 8012FDBC 0012CD1C 38 21 00 90 */ addi r1, r1, 0x90 -/* 8012FDC0 0012CD20 4E 80 00 20 */ blr +/* 8012FDC0 0012CD20 4E 80 00 20 */ blr .global AddToRenderer__19CHUDBillboardEffectCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__19CHUDBillboardEffectCFRC14CFrustumPlanesRC13CStateManager: @@ -289,12 +289,12 @@ AddToRenderer__19CHUDBillboardEffectCFRC14CFrustumPlanesRC13CStateManager: /* 8012FDF0 0012CD50 81 83 00 00 */ lwz r12, 0(r3) /* 8012FDF4 0012CD54 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8012FDF8 0012CD58 7D 89 03 A6 */ mtctr r12 -/* 8012FDFC 0012CD5C 4E 80 04 21 */ bctrl +/* 8012FDFC 0012CD5C 4E 80 04 21 */ bctrl lbl_8012FE00: /* 8012FE00 0012CD60 80 01 00 14 */ lwz r0, 0x14(r1) /* 8012FE04 0012CD64 7C 08 03 A6 */ mtlr r0 /* 8012FE08 0012CD68 38 21 00 10 */ addi r1, r1, 0x10 -/* 8012FE0C 0012CD6C 4E 80 00 20 */ blr +/* 8012FE0C 0012CD6C 4E 80 00 20 */ blr .global __dt__19CHUDBillboardEffectFv __dt__19CHUDBillboardEffectFv: @@ -316,7 +316,7 @@ __dt__19CHUDBillboardEffectFv: /* 8012FE4C 0012CDAC 81 83 00 00 */ lwz r12, 0(r3) /* 8012FE50 0012CDB0 81 8C 00 74 */ lwz r12, 0x74(r12) /* 8012FE54 0012CDB4 7D 89 03 A6 */ mtctr r12 -/* 8012FE58 0012CDB8 4E 80 04 21 */ bctrl +/* 8012FE58 0012CDB8 4E 80 04 21 */ bctrl /* 8012FE5C 0012CDBC 3C 03 AF BF */ addis r0, r3, 0xafbf /* 8012FE60 0012CDC0 28 00 52 54 */ cmplwi r0, 0x5254 /* 8012FE64 0012CDC4 40 82 00 20 */ bne lbl_8012FE84 @@ -337,7 +337,7 @@ lbl_8012FE84: /* 8012FE9C 0012CDFC 38 80 00 01 */ li r4, 1 /* 8012FEA0 0012CE00 81 8C 00 08 */ lwz r12, 8(r12) /* 8012FEA4 0012CE04 7D 89 03 A6 */ mtctr r12 -/* 8012FEA8 0012CE08 4E 80 04 21 */ bctrl +/* 8012FEA8 0012CE08 4E 80 04 21 */ bctrl lbl_8012FEAC: /* 8012FEAC 0012CE0C 28 1E 00 00 */ cmplwi r30, 0 /* 8012FEB0 0012CE10 41 82 00 1C */ beq lbl_8012FECC @@ -359,7 +359,7 @@ lbl_8012FEDC: /* 8012FEE8 0012CE48 83 C1 00 08 */ lwz r30, 8(r1) /* 8012FEEC 0012CE4C 7C 08 03 A6 */ mtlr r0 /* 8012FEF0 0012CE50 38 21 00 10 */ addi r1, r1, 0x10 -/* 8012FEF4 0012CE54 4E 80 00 20 */ blr +/* 8012FEF4 0012CE54 4E 80 00 20 */ blr .global "__ct__19CHUDBillboardEffectFRCQ24rstl44optional_object<25TToken<15CGenDescription>>RCQ24rstl49optional_object<30TToken<20CElectricDescription>>9TUniqueIdbRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>fRC9CVector3fRC6CColorRC9CVector3fRC9CVector3f" "__ct__19CHUDBillboardEffectFRCQ24rstl44optional_object<25TToken<15CGenDescription>>RCQ24rstl49optional_object<30TToken<20CElectricDescription>>9TUniqueIdbRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>fRC9CVector3fRC6CColorRC9CVector3fRC9CVector3f": @@ -491,7 +491,7 @@ lbl_801300CC: /* 801300DC 0012D03C 38 80 00 01 */ li r4, 1 /* 801300E0 0012D040 81 8C 00 08 */ lwz r12, 8(r12) /* 801300E4 0012D044 7D 89 03 A6 */ mtctr r12 -/* 801300E8 0012D048 4E 80 04 21 */ bctrl +/* 801300E8 0012D048 4E 80 04 21 */ bctrl lbl_801300EC: /* 801300EC 0012D04C 7E C0 07 75 */ extsb. r0, r22 /* 801300F0 0012D050 93 5F 00 E8 */ stw r26, 0xe8(r31) @@ -533,7 +533,7 @@ lbl_80130164: /* 80130174 0012D0D4 38 80 00 01 */ li r4, 1 /* 80130178 0012D0D8 81 8C 00 08 */ lwz r12, 8(r12) /* 8013017C 0012D0DC 7D 89 03 A6 */ mtctr r12 -/* 80130180 0012D0E0 4E 80 04 21 */ bctrl +/* 80130180 0012D0E0 4E 80 04 21 */ bctrl lbl_80130184: /* 80130184 0012D0E4 7E C0 07 75 */ extsb. r0, r22 /* 80130188 0012D0E8 93 3F 00 E8 */ stw r25, 0xe8(r31) @@ -550,13 +550,13 @@ lbl_8013019C: /* 801301B0 0012D110 81 83 00 00 */ lwz r12, 0(r3) /* 801301B4 0012D114 81 8C 00 30 */ lwz r12, 0x30(r12) /* 801301B8 0012D118 7D 89 03 A6 */ mtctr r12 -/* 801301BC 0012D11C 4E 80 04 21 */ bctrl +/* 801301BC 0012D11C 4E 80 04 21 */ bctrl /* 801301C0 0012D120 80 7F 00 E8 */ lwz r3, 0xe8(r31) /* 801301C4 0012D124 38 9F 00 F8 */ addi r4, r31, 0xf8 /* 801301C8 0012D128 81 83 00 00 */ lwz r12, 0(r3) /* 801301CC 0012D12C 81 8C 00 28 */ lwz r12, 0x28(r12) /* 801301D0 0012D130 7D 89 03 A6 */ mtctr r12 -/* 801301D4 0012D134 4E 80 04 21 */ bctrl +/* 801301D4 0012D134 4E 80 04 21 */ bctrl /* 801301D8 0012D138 7F E3 FB 78 */ mr r3, r31 /* 801301DC 0012D13C E3 E1 00 88 */ psq_l f31, 136(r1), 0, qr0 /* 801301E0 0012D140 CB E1 00 80 */ lfd f31, 0x80(r1) @@ -564,7 +564,7 @@ lbl_8013019C: /* 801301E8 0012D148 80 01 00 94 */ lwz r0, 0x94(r1) /* 801301EC 0012D14C 7C 08 03 A6 */ mtlr r0 /* 801301F0 0012D150 38 21 00 90 */ addi r1, r1, 0x90 -/* 801301F4 0012D154 4E 80 00 20 */ blr +/* 801301F4 0012D154 4E 80 00 20 */ blr .global GetNearClipDistance__19CHUDBillboardEffectFRC13CStateManager GetNearClipDistance__19CHUDBillboardEffectFRC13CStateManager: @@ -580,7 +580,7 @@ GetNearClipDistance__19CHUDBillboardEffectFRC13CStateManager: /* 8013021C 0012D17C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80130220 0012D180 7C 08 03 A6 */ mtlr r0 /* 80130224 0012D184 38 21 00 10 */ addi r1, r1, 0x10 -/* 80130228 0012D188 4E 80 00 20 */ blr +/* 80130228 0012D188 4E 80 00 20 */ blr .global GetScaleForPOV__19CHUDBillboardEffectFRC13CStateManager GetScaleForPOV__19CHUDBillboardEffectFRC13CStateManager: @@ -598,7 +598,7 @@ GetScaleForPOV__19CHUDBillboardEffectFRC13CStateManager: lbl_80130258: /* 80130258 0012D1B8 3C 60 80 47 */ lis r3, lbl_8046C738@ha /* 8013025C 0012D1BC 38 63 C7 38 */ addi r3, r3, lbl_8046C738@l -/* 80130260 0012D1C0 4E 80 00 20 */ blr +/* 80130260 0012D1C0 4E 80 00 20 */ blr .global CalcGenRate__19CHudBillboardEffectFv CalcGenRate__19CHudBillboardEffectFv: diff --git a/asm/MetroidPrime/ScriptObjects/CRepulsor.s b/asm/MetroidPrime/ScriptObjects/CRepulsor.s index 62741d6d..3f77ebe4 100644 --- a/asm/MetroidPrime/ScriptObjects/CRepulsor.s +++ b/asm/MetroidPrime/ScriptObjects/CRepulsor.s @@ -71,7 +71,7 @@ lbl_8020FC8C: /* 8020FC98 0020CBF8 83 C1 00 08 */ lwz r30, 8(r1) /* 8020FC9C 0020CBFC 7C 08 03 A6 */ mtlr r0 /* 8020FCA0 0020CC00 38 21 00 10 */ addi r1, r1, 0x10 -/* 8020FCA4 0020CC04 4E 80 00 20 */ blr +/* 8020FCA4 0020CC04 4E 80 00 20 */ blr .global AcceptScriptMsg__9CRepulsorF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__9CRepulsorF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -85,7 +85,7 @@ AcceptScriptMsg__9CRepulsorF20EScriptObjectMessage9TUniqueIdR13CStateManager: /* 8020FCC4 0020CC24 80 01 00 14 */ lwz r0, 0x14(r1) /* 8020FCC8 0020CC28 7C 08 03 A6 */ mtlr r0 /* 8020FCCC 0020CC2C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8020FCD0 0020CC30 4E 80 00 20 */ blr +/* 8020FCD0 0020CC30 4E 80 00 20 */ blr .global Accept__9CRepulsorFR8IVisitor Accept__9CRepulsorFR8IVisitor: @@ -98,11 +98,11 @@ Accept__9CRepulsorFR8IVisitor: /* 8020FCEC 0020CC4C 7C 04 03 78 */ mr r4, r0 /* 8020FCF0 0020CC50 81 8C 00 58 */ lwz r12, 0x58(r12) /* 8020FCF4 0020CC54 7D 89 03 A6 */ mtctr r12 -/* 8020FCF8 0020CC58 4E 80 04 21 */ bctrl +/* 8020FCF8 0020CC58 4E 80 04 21 */ bctrl /* 8020FCFC 0020CC5C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8020FD00 0020CC60 7C 08 03 A6 */ mtlr r0 /* 8020FD04 0020CC64 38 21 00 10 */ addi r1, r1, 0x10 -/* 8020FD08 0020CC68 4E 80 00 20 */ blr +/* 8020FD08 0020CC68 4E 80 00 20 */ blr .global "__ct__9CRepulsorF9TUniqueIdbRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC9CVector3ff" "__ct__9CRepulsorF9TUniqueIdbRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC9CVector3ff": diff --git a/asm/MetroidPrime/ScriptObjects/CScriptActor.s b/asm/MetroidPrime/ScriptObjects/CScriptActor.s index c89994ac..875a0460 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptActor.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptActor.s @@ -78,7 +78,7 @@ lbl_80074FC8: /* 80074FD4 00071F34 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80074FD8 00071F38 7C 08 03 A6 */ mtlr r0 /* 80074FDC 00071F3C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80074FE0 00071F40 4E 80 00 20 */ blr +/* 80074FE0 00071F40 4E 80 00 20 */ blr .global GetCollisionResponseType__12CScriptActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei GetCollisionResponseType__12CScriptActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei: @@ -94,7 +94,7 @@ GetCollisionResponseType__12CScriptActorCFRC9CVector3fRC9CVector3fRC11CWeaponMod /* 80075008 00071F68 81 83 00 00 */ lwz r12, 0(r3) /* 8007500C 00071F6C 81 8C 00 38 */ lwz r12, 0x38(r12) /* 80075010 00071F70 7D 89 03 A6 */ mtctr r12 -/* 80075014 00071F74 4E 80 04 21 */ bctrl +/* 80075014 00071F74 4E 80 04 21 */ bctrl /* 80075018 00071F78 7F A4 EB 78 */ mr r4, r29 /* 8007501C 00071F7C 7C 7F 1B 78 */ mr r31, r3 /* 80075020 00071F80 38 A0 00 00 */ li r5, 0 @@ -124,7 +124,7 @@ lbl_80075070: /* 80075074 00071FD4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80075078 00071FD8 7C 08 03 A6 */ mtlr r0 /* 8007507C 00071FDC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80075080 00071FE0 4E 80 00 20 */ blr +/* 80075080 00071FE0 4E 80 00 20 */ blr .global Accept__12CScriptActorFR8IVisitor Accept__12CScriptActorFR8IVisitor: @@ -137,11 +137,11 @@ Accept__12CScriptActorFR8IVisitor: /* 8007509C 00071FFC 7C 04 03 78 */ mr r4, r0 /* 800750A0 00072000 81 8C 00 5C */ lwz r12, 0x5c(r12) /* 800750A4 00072004 7D 89 03 A6 */ mtctr r12 -/* 800750A8 00072008 4E 80 04 21 */ bctrl +/* 800750A8 00072008 4E 80 04 21 */ bctrl /* 800750AC 0007200C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800750B0 00072010 7C 08 03 A6 */ mtlr r0 /* 800750B4 00072014 38 21 00 10 */ addi r1, r1, 0x10 -/* 800750B8 00072018 4E 80 00 20 */ blr +/* 800750B8 00072018 4E 80 00 20 */ blr .global PreRender__12CScriptActorFR13CStateManagerRC14CFrustumPlanes PreRender__12CScriptActorFR13CStateManagerRC14CFrustumPlanes: @@ -297,7 +297,7 @@ lbl_800752EC: /* 800752F0 00072250 80 01 00 44 */ lwz r0, 0x44(r1) /* 800752F4 00072254 7C 08 03 A6 */ mtlr r0 /* 800752F8 00072258 38 21 00 40 */ addi r1, r1, 0x40 -/* 800752FC 0007225C 4E 80 00 20 */ blr +/* 800752FC 0007225C 4E 80 00 20 */ blr .global AcceptScriptMsg__12CScriptActorF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__12CScriptActorF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -446,7 +446,7 @@ lbl_800754DC: /* 800754FC 0007245C 80 01 00 84 */ lwz r0, 0x84(r1) /* 80075500 00072460 7C 08 03 A6 */ mtlr r0 /* 80075504 00072464 38 21 00 80 */ addi r1, r1, 0x80 -/* 80075508 00072468 4E 80 00 20 */ blr +/* 80075508 00072468 4E 80 00 20 */ blr .global Think__12CScriptActorFfR13CStateManager Think__12CScriptActorFfR13CStateManager: @@ -593,7 +593,7 @@ lbl_80075710: /* 80075724 00072684 81 9E 00 00 */ lwz r12, 0(r30) /* 80075728 00072688 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8007572C 0007268C 7D 89 03 A6 */ mtctr r12 -/* 80075730 00072690 4E 80 04 21 */ bctrl +/* 80075730 00072690 4E 80 04 21 */ bctrl /* 80075734 00072694 C0 23 00 00 */ lfs f1, 0(r3) /* 80075738 00072698 C0 02 88 B8 */ lfs f0, lbl_805AA5D8@sda21(r2) /* 8007573C 0007269C FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -615,7 +615,7 @@ lbl_8007576C: /* 80075778 000726D8 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 8007577C 000726DC 7C 08 03 A6 */ mtlr r0 /* 80075780 000726E0 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 80075784 000726E4 4E 80 00 20 */ blr +/* 80075784 000726E4 4E 80 00 20 */ blr .global GetTouchBounds__12CScriptActorCFv GetTouchBounds__12CScriptActorCFv: @@ -664,21 +664,21 @@ lbl_80075824: /* 80075828 00072788 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8007582C 0007278C 7C 08 03 A6 */ mtlr r0 /* 80075830 00072790 38 21 00 30 */ addi r1, r1, 0x30 -/* 80075834 00072794 4E 80 00 20 */ blr +/* 80075834 00072794 4E 80 00 20 */ blr .global Touch__12CScriptActorFR6CActorR13CStateManager Touch__12CScriptActorFR6CActorR13CStateManager: -/* 80075838 00072798 4E 80 00 20 */ blr +/* 80075838 00072798 4E 80 00 20 */ blr .global GetDamageVulnerability__12CScriptActorCFv GetDamageVulnerability__12CScriptActorCFv: /* 8007583C 0007279C 38 63 02 68 */ addi r3, r3, 0x268 -/* 80075840 000727A0 4E 80 00 20 */ blr +/* 80075840 000727A0 4E 80 00 20 */ blr .global GetHealthInfo__12CScriptActorCFRC13CStateManager GetHealthInfo__12CScriptActorCFRC13CStateManager: /* 80075844 000727A4 38 63 02 60 */ addi r3, r3, 0x260 -/* 80075848 000727A8 4E 80 00 20 */ blr +/* 80075848 000727A8 4E 80 00 20 */ blr .global __dt__12CScriptActorFv __dt__12CScriptActorFv: @@ -706,7 +706,7 @@ lbl_80075890: /* 8007589C 000727FC 83 C1 00 08 */ lwz r30, 8(r1) /* 800758A0 00072800 7C 08 03 A6 */ mtlr r0 /* 800758A4 00072804 38 21 00 10 */ addi r1, r1, 0x10 -/* 800758A8 00072808 4E 80 00 20 */ blr +/* 800758A8 00072808 4E 80 00 20 */ blr .global "__ct__12CScriptActorF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC6CAABoxRC13CMaterialListffRC11CHealthInfoRC20CDamageVulnerabilityRC16CActorParametersbbUibbbb" "__ct__12CScriptActorF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC6CAABoxRC13CMaterialListffRC11CHealthInfoRC20CDamageVulnerabilityRC16CActorParametersbbUibbbb": @@ -953,4 +953,4 @@ lbl_80075C1C: /* 80075C50 00072BB0 80 01 00 D4 */ lwz r0, 0xd4(r1) /* 80075C54 00072BB4 7C 08 03 A6 */ mtlr r0 /* 80075C58 00072BB8 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 80075C5C 00072BBC 4E 80 00 20 */ blr +/* 80075C5C 00072BBC 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/ScriptObjects/CScriptActorKeyframe.s b/asm/MetroidPrime/ScriptObjects/CScriptActorKeyframe.s index ad1bf374..d661722b 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptActorKeyframe.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptActorKeyframe.s @@ -50,7 +50,7 @@ lbl_800FE080: /* 800FE08C 000FAFEC 83 C1 00 08 */ lwz r30, 8(r1) /* 800FE090 000FAFF0 7C 08 03 A6 */ mtlr r0 /* 800FE094 000FAFF4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800FE098 000FAFF8 4E 80 00 20 */ blr +/* 800FE098 000FAFF8 4E 80 00 20 */ blr .global Think__20CScriptActorKeyframeFfR13CStateManager Think__20CScriptActorKeyframeFfR13CStateManager: @@ -206,7 +206,7 @@ lbl_800FE2B4: /* 800FE2D0 000FB230 80 01 00 64 */ lwz r0, 0x64(r1) /* 800FE2D4 000FB234 7C 08 03 A6 */ mtlr r0 /* 800FE2D8 000FB238 38 21 00 60 */ addi r1, r1, 0x60 -/* 800FE2DC 000FB23C 4E 80 00 20 */ blr +/* 800FE2DC 000FB23C 4E 80 00 20 */ blr .global UpdateEntity__20CScriptActorKeyframeF9TUniqueIdR13CStateManager UpdateEntity__20CScriptActorKeyframeF9TUniqueIdR13CStateManager: @@ -394,7 +394,7 @@ lbl_800FE588: /* 800FE598 000FB4F8 83 81 00 70 */ lwz r28, 0x70(r1) /* 800FE59C 000FB4FC 7C 08 03 A6 */ mtlr r0 /* 800FE5A0 000FB500 38 21 00 80 */ addi r1, r1, 0x80 -/* 800FE5A4 000FB504 4E 80 00 20 */ blr +/* 800FE5A4 000FB504 4E 80 00 20 */ blr .global __dt__14CBCScriptedCmdFv __dt__14CBCScriptedCmdFv: @@ -422,7 +422,7 @@ lbl_800FE5EC: /* 800FE5F4 000FB554 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800FE5F8 000FB558 7C 08 03 A6 */ mtlr r0 /* 800FE5FC 000FB55C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800FE600 000FB560 4E 80 00 20 */ blr +/* 800FE600 000FB560 4E 80 00 20 */ blr .global Accept__20CScriptActorKeyframeFR8IVisitor Accept__20CScriptActorKeyframeFR8IVisitor: @@ -435,11 +435,11 @@ Accept__20CScriptActorKeyframeFR8IVisitor: /* 800FE61C 000FB57C 7C 04 03 78 */ mr r4, r0 /* 800FE620 000FB580 81 8C 00 60 */ lwz r12, 0x60(r12) /* 800FE624 000FB584 7D 89 03 A6 */ mtctr r12 -/* 800FE628 000FB588 4E 80 04 21 */ bctrl +/* 800FE628 000FB588 4E 80 04 21 */ bctrl /* 800FE62C 000FB58C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800FE630 000FB590 7C 08 03 A6 */ mtlr r0 /* 800FE634 000FB594 38 21 00 10 */ addi r1, r1, 0x10 -/* 800FE638 000FB598 4E 80 00 20 */ blr +/* 800FE638 000FB598 4E 80 00 20 */ blr .global AcceptScriptMsg__20CScriptActorKeyframeF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__20CScriptActorKeyframeF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -546,7 +546,7 @@ lbl_800FE780: /* 800FE7A0 000FB700 80 01 00 54 */ lwz r0, 0x54(r1) /* 800FE7A4 000FB704 7C 08 03 A6 */ mtlr r0 /* 800FE7A8 000FB708 38 21 00 50 */ addi r1, r1, 0x50 -/* 800FE7AC 000FB70C 4E 80 00 20 */ blr +/* 800FE7AC 000FB70C 4E 80 00 20 */ blr .global "__ct__20CScriptActorKeyframeF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoibfbUib" "__ct__20CScriptActorKeyframeF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoibfbUib": @@ -602,4 +602,4 @@ lbl_800FE780: /* 800FE874 000FB7D4 80 01 00 44 */ lwz r0, 0x44(r1) /* 800FE878 000FB7D8 7C 08 03 A6 */ mtlr r0 /* 800FE87C 000FB7DC 38 21 00 40 */ addi r1, r1, 0x40 -/* 800FE880 000FB7E0 4E 80 00 20 */ blr +/* 800FE880 000FB7E0 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/ScriptObjects/CScriptActorRotate.s b/asm/MetroidPrime/ScriptObjects/CScriptActorRotate.s index ec281e66..2acbfea8 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptActorRotate.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptActorRotate.s @@ -65,7 +65,7 @@ lbl_80153ABC: /* 80153AC8 00150A28 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80153ACC 00150A2C 7C 08 03 A6 */ mtlr r0 /* 80153AD0 00150A30 38 21 00 20 */ addi r1, r1, 0x20 -/* 80153AD4 00150A34 4E 80 00 20 */ blr +/* 80153AD4 00150A34 4E 80 00 20 */ blr .global Accept__18CScriptActorRotateFR8IVisitor Accept__18CScriptActorRotateFR8IVisitor: @@ -78,11 +78,11 @@ Accept__18CScriptActorRotateFR8IVisitor: /* 80153AF0 00150A50 7C 04 03 78 */ mr r4, r0 /* 80153AF4 00150A54 81 8C 00 24 */ lwz r12, 0x24(r12) /* 80153AF8 00150A58 7D 89 03 A6 */ mtctr r12 -/* 80153AFC 00150A5C 4E 80 04 21 */ bctrl +/* 80153AFC 00150A5C 4E 80 04 21 */ bctrl /* 80153B00 00150A60 80 01 00 14 */ lwz r0, 0x14(r1) /* 80153B04 00150A64 7C 08 03 A6 */ mtlr r0 /* 80153B08 00150A68 38 21 00 10 */ addi r1, r1, 0x10 -/* 80153B0C 00150A6C 4E 80 00 20 */ blr +/* 80153B0C 00150A6C 4E 80 00 20 */ blr .global AcceptScriptMsg__18CScriptActorRotateF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__18CScriptActorRotateF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -143,7 +143,7 @@ lbl_80153BCC: /* 80153BD0 00150B30 80 01 00 34 */ lwz r0, 0x34(r1) /* 80153BD4 00150B34 7C 08 03 A6 */ mtlr r0 /* 80153BD8 00150B38 38 21 00 30 */ addi r1, r1, 0x30 -/* 80153BDC 00150B3C 4E 80 00 20 */ blr +/* 80153BDC 00150B3C 4E 80 00 20 */ blr .global UpdateActors__18CScriptActorRotateFbR13CStateManager UpdateActors__18CScriptActorRotateFbR13CStateManager: @@ -323,7 +323,7 @@ lbl_80153E50: /* 80153E54 00150DB4 80 01 00 F4 */ lwz r0, 0xf4(r1) /* 80153E58 00150DB8 7C 08 03 A6 */ mtlr r0 /* 80153E5C 00150DBC 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 80153E60 00150DC0 4E 80 00 20 */ blr +/* 80153E60 00150DC0 4E 80 00 20 */ blr .global Think__18CScriptActorRotateFfR13CStateManager Think__18CScriptActorRotateFfR13CStateManager: @@ -493,7 +493,7 @@ lbl_801540BC: /* 801540D4 00151034 83 81 01 B0 */ lwz r28, 0x1b0(r1) /* 801540D8 00151038 7C 08 03 A6 */ mtlr r0 /* 801540DC 0015103C 38 21 01 D0 */ addi r1, r1, 0x1d0 -/* 801540E0 00151040 4E 80 00 20 */ blr +/* 801540E0 00151040 4E 80 00 20 */ blr .global RebuildSpiderBallWaypoints__18CScriptActorRotateFR13CStateManager RebuildSpiderBallWaypoints__18CScriptActorRotateFR13CStateManager: @@ -589,7 +589,7 @@ lbl_80154214: /* 80154220 00151180 80 01 08 34 */ lwz r0, 0x834(r1) /* 80154224 00151184 7C 08 03 A6 */ mtlr r0 /* 80154228 00151188 38 21 08 30 */ addi r1, r1, 0x830 -/* 8015422C 0015118C 4E 80 00 20 */ blr +/* 8015422C 0015118C 4E 80 00 20 */ blr .global sub_80154230 sub_80154230: @@ -622,7 +622,7 @@ sub_80154230: /* 80154298 001511F8 83 81 00 10 */ lwz r28, 0x10(r1) /* 8015429C 001511FC 7C 08 03 A6 */ mtlr r0 /* 801542A0 00151200 38 21 00 20 */ addi r1, r1, 0x20 -/* 801542A4 00151204 4E 80 00 20 */ blr +/* 801542A4 00151204 4E 80 00 20 */ blr .global sub_801542a8 sub_801542a8: @@ -758,7 +758,7 @@ lbl_80154480: /* 8015449C 001513FC 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 801544A0 00151400 7C 08 03 A6 */ mtlr r0 /* 801544A4 00151404 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 801544A8 00151408 4E 80 00 20 */ blr +/* 801544A8 00151408 4E 80 00 20 */ blr .global "__ct__18CScriptActorRotateF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC9CVector3ffbbb" "__ct__18CScriptActorRotateF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC9CVector3ffbbb": @@ -822,7 +822,7 @@ lbl_80154480: /* 80154590 001514F0 83 81 00 10 */ lwz r28, 0x10(r1) /* 80154594 001514F4 7C 08 03 A6 */ mtlr r0 /* 80154598 001514F8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8015459C 001514FC 4E 80 00 20 */ blr +/* 8015459C 001514FC 4E 80 00 20 */ blr .global "distance,1,Q24rstl52select1st>,Q24rstl21less<13TGameScriptId>,Q24rstl17rmemory_allocator>14const_iterator>__4rstlFQ34rstl195red_black_tree<13TGameScriptId,Q24rstl32pair<13TGameScriptId,9TUniqueId>,1,Q24rstl52select1st>,Q24rstl21less<13TGameScriptId>,Q24rstl17rmemory_allocator>14const_iteratorQ34rstl195red_black_tree<13TGameScriptId,Q24rstl32" "distance,1,Q24rstl52select1st>,Q24rstl21less<13TGameScriptId>,Q24rstl17rmemory_allocator>14const_iterator>__4rstlFQ34rstl195red_black_tree<13TGameScriptId,Q24rstl32pair<13TGameScriptId,9TUniqueId>,1,Q24rstl52select1st>,Q24rstl21less<13TGameScriptId>,Q24rstl17rmemory_allocator>14const_iteratorQ34rstl195red_black_tree<13TGameScriptId,Q24rstl32": @@ -846,7 +846,7 @@ lbl_80154480: /* 801545E4 00151544 80 01 00 24 */ lwz r0, 0x24(r1) /* 801545E8 00151548 7C 08 03 A6 */ mtlr r0 /* 801545EC 0015154C 38 21 00 20 */ addi r1, r1, 0x20 -/* 801545F0 00151550 4E 80 00 20 */ blr +/* 801545F0 00151550 4E 80 00 20 */ blr .global "__distance,1,Q24rstl52select1st>,Q24rstl21less<13TGameScriptId>,Q24rstl17rmemory_allocator>14const_iterator>__4rstlFQ34rstl195red_black_tree<13TGameScriptId,Q24rstl32pair<13TGameScriptId,9TUniqueId>,1,Q24rstl52select1st>,Q24rstl21less<13TGameScriptId>,Q24rstl17rmemory_allocator>14const_iteratorQ34rstl195red_black_tree<13TGameScriptId,Q24rstl" "__distance,1,Q24rstl52select1st>,Q24rstl21less<13TGameScriptId>,Q24rstl17rmemory_allocator>14const_iterator>__4rstlFQ34rstl195red_black_tree<13TGameScriptId,Q24rstl32pair<13TGameScriptId,9TUniqueId>,1,Q24rstl52select1st>,Q24rstl21less<13TGameScriptId>,Q24rstl17rmemory_allocator>14const_iteratorQ34rstl195red_black_tree<13TGameScriptId,Q24rstl": @@ -887,7 +887,7 @@ lbl_80154654: /* 8015466C 001515CC 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80154670 001515D0 7C 08 03 A6 */ mtlr r0 /* 80154674 001515D4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80154678 001515D8 4E 80 00 20 */ blr +/* 80154678 001515D8 4E 80 00 20 */ blr .global "reserve__Q24rstl75vector,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl75vector,Q24rstl17rmemory_allocator>Fi": diff --git a/asm/MetroidPrime/ScriptObjects/CScriptAiJumpPoint.s b/asm/MetroidPrime/ScriptObjects/CScriptAiJumpPoint.s index c7d659aa..f462d509 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptAiJumpPoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptAiJumpPoint.s @@ -76,7 +76,7 @@ lbl_801EF244: /* 801EF250 001EC1B0 83 C1 00 08 */ lwz r30, 8(r1) /* 801EF254 001EC1B4 7C 08 03 A6 */ mtlr r0 /* 801EF258 001EC1B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801EF25C 001EC1BC 4E 80 00 20 */ blr +/* 801EF25C 001EC1BC 4E 80 00 20 */ blr .global GetTouchBounds__18CScriptAiJumpPointCFv GetTouchBounds__18CScriptAiJumpPointCFv: @@ -84,9 +84,9 @@ GetTouchBounds__18CScriptAiJumpPointCFv: /* 801EF264 001EC1C4 98 03 00 18 */ stb r0, 0x18(r3) /* 801EF268 001EC1C8 88 04 01 04 */ lbz r0, 0x104(r4) /* 801EF26C 001EC1CC 28 00 00 00 */ cmplwi r0, 0 -/* 801EF270 001EC1D0 4D 82 00 20 */ beqlr +/* 801EF270 001EC1D0 4D 82 00 20 */ beqlr /* 801EF274 001EC1D4 28 03 00 00 */ cmplwi r3, 0 -/* 801EF278 001EC1D8 4D 82 00 20 */ beqlr +/* 801EF278 001EC1D8 4D 82 00 20 */ beqlr /* 801EF27C 001EC1DC C0 04 00 EC */ lfs f0, 0xec(r4) /* 801EF280 001EC1E0 D0 03 00 00 */ stfs f0, 0(r3) /* 801EF284 001EC1E4 C0 04 00 F0 */ lfs f0, 0xf0(r4) @@ -99,25 +99,25 @@ GetTouchBounds__18CScriptAiJumpPointCFv: /* 801EF2A0 001EC200 D0 03 00 10 */ stfs f0, 0x10(r3) /* 801EF2A4 001EC204 C0 04 01 00 */ lfs f0, 0x100(r4) /* 801EF2A8 001EC208 D0 03 00 14 */ stfs f0, 0x14(r3) -/* 801EF2AC 001EC20C 4E 80 00 20 */ blr +/* 801EF2AC 001EC20C 4E 80 00 20 */ blr .global Render__18CScriptAiJumpPointCFRC13CStateManager Render__18CScriptAiJumpPointCFRC13CStateManager: -/* 801EF2B0 001EC210 4E 80 00 20 */ blr +/* 801EF2B0 001EC210 4E 80 00 20 */ blr .global AddToRenderer__18CScriptAiJumpPointCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__18CScriptAiJumpPointCFRC14CFrustumPlanesRC13CStateManager: -/* 801EF2B4 001EC214 4E 80 00 20 */ blr +/* 801EF2B4 001EC214 4E 80 00 20 */ blr .global Think__18CScriptAiJumpPointFfR13CStateManager Think__18CScriptAiJumpPointFfR13CStateManager: /* 801EF2B8 001EC218 C0 43 01 10 */ lfs f2, 0x110(r3) /* 801EF2BC 001EC21C C0 02 AE 40 */ lfs f0, lbl_805ACB60@sda21(r2) /* 801EF2C0 001EC220 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 801EF2C4 001EC224 4C 81 00 20 */ blelr +/* 801EF2C4 001EC224 4C 81 00 20 */ blelr /* 801EF2C8 001EC228 EC 02 08 28 */ fsubs f0, f2, f1 /* 801EF2CC 001EC22C D0 03 01 10 */ stfs f0, 0x110(r3) -/* 801EF2D0 001EC230 4E 80 00 20 */ blr +/* 801EF2D0 001EC230 4E 80 00 20 */ blr .global GetInUse__18CScriptAiJumpPointCF9TUniqueId GetInUse__18CScriptAiJumpPointCF9TUniqueId: @@ -142,7 +142,7 @@ lbl_801EF318: /* 801EF318 001EC278 38 A0 00 01 */ li r5, 1 lbl_801EF31C: /* 801EF31C 001EC27C 7C A3 2B 78 */ mr r3, r5 -/* 801EF320 001EC280 4E 80 00 20 */ blr +/* 801EF320 001EC280 4E 80 00 20 */ blr .global AcceptScriptMsg__18CScriptAiJumpPointF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__18CScriptAiJumpPointF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -214,7 +214,7 @@ lbl_801EF408: /* 801EF414 001EC374 83 A1 00 34 */ lwz r29, 0x34(r1) /* 801EF418 001EC378 7C 08 03 A6 */ mtlr r0 /* 801EF41C 001EC37C 38 21 00 40 */ addi r1, r1, 0x40 -/* 801EF420 001EC380 4E 80 00 20 */ blr +/* 801EF420 001EC380 4E 80 00 20 */ blr .global Accept__18CScriptAiJumpPointFR8IVisitor Accept__18CScriptAiJumpPointFR8IVisitor: @@ -227,11 +227,11 @@ Accept__18CScriptAiJumpPointFR8IVisitor: /* 801EF43C 001EC39C 7C 04 03 78 */ mr r4, r0 /* 801EF440 001EC3A0 81 8C 00 64 */ lwz r12, 0x64(r12) /* 801EF444 001EC3A4 7D 89 03 A6 */ mtctr r12 -/* 801EF448 001EC3A8 4E 80 04 21 */ bctrl +/* 801EF448 001EC3A8 4E 80 04 21 */ bctrl /* 801EF44C 001EC3AC 80 01 00 14 */ lwz r0, 0x14(r1) /* 801EF450 001EC3B0 7C 08 03 A6 */ mtlr r0 /* 801EF454 001EC3B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801EF458 001EC3B8 4E 80 00 20 */ blr +/* 801EF458 001EC3B8 4E 80 00 20 */ blr .global "__ct__18CScriptAiJumpPointF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fbf" "__ct__18CScriptAiJumpPointF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fbf": diff --git a/asm/MetroidPrime/ScriptObjects/CScriptAreaAttributes.s b/asm/MetroidPrime/ScriptObjects/CScriptAreaAttributes.s index dcc2a628..e0d74a66 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptAreaAttributes.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptAreaAttributes.s @@ -42,7 +42,7 @@ lbl_801BD48C: /* 801BD498 001BA3F8 83 C1 00 08 */ lwz r30, 8(r1) /* 801BD49C 001BA3FC 7C 08 03 A6 */ mtlr r0 /* 801BD4A0 001BA400 38 21 00 10 */ addi r1, r1, 0x10 -/* 801BD4A4 001BA404 4E 80 00 20 */ blr +/* 801BD4A4 001BA404 4E 80 00 20 */ blr .global Accept__21CScriptAreaAttributesFR8IVisitor Accept__21CScriptAreaAttributesFR8IVisitor: @@ -55,11 +55,11 @@ Accept__21CScriptAreaAttributesFR8IVisitor: /* 801BD4C0 001BA420 7C 04 03 78 */ mr r4, r0 /* 801BD4C4 001BA424 81 8C 00 24 */ lwz r12, 0x24(r12) /* 801BD4C8 001BA428 7D 89 03 A6 */ mtctr r12 -/* 801BD4CC 001BA42C 4E 80 04 21 */ bctrl +/* 801BD4CC 001BA42C 4E 80 04 21 */ bctrl /* 801BD4D0 001BA430 80 01 00 14 */ lwz r0, 0x14(r1) /* 801BD4D4 001BA434 7C 08 03 A6 */ mtlr r0 /* 801BD4D8 001BA438 38 21 00 10 */ addi r1, r1, 0x10 -/* 801BD4DC 001BA43C 4E 80 00 20 */ blr +/* 801BD4DC 001BA43C 4E 80 00 20 */ blr .global AcceptScriptMsg__21CScriptAreaAttributesF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__21CScriptAreaAttributesF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -123,7 +123,7 @@ lbl_801BD5AC: /* 801BD5B8 001BA518 83 A1 00 34 */ lwz r29, 0x34(r1) /* 801BD5BC 001BA51C 7C 08 03 A6 */ mtlr r0 /* 801BD5C0 001BA520 38 21 00 40 */ addi r1, r1, 0x40 -/* 801BD5C4 001BA524 4E 80 00 20 */ blr +/* 801BD5C4 001BA524 4E 80 00 20 */ blr .global __ct__21CScriptAreaAttributesF9TUniqueIdRC11CEntityInfob10EEnvFxTypeffffi11EPhazonType __ct__21CScriptAreaAttributesF9TUniqueIdRC11CEntityInfob10EEnvFxTypeffffi11EPhazonType: diff --git a/asm/MetroidPrime/ScriptObjects/CScriptBallTrigger.s b/asm/MetroidPrime/ScriptObjects/CScriptBallTrigger.s index e2fa952f..0ffd856f 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptBallTrigger.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptBallTrigger.s @@ -81,7 +81,7 @@ lbl_8017653C: /* 80176568 001734C8 83 81 00 10 */ lwz r28, 0x10(r1) /* 8017656C 001734CC 7C 08 03 A6 */ mtlr r0 /* 80176570 001734D0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80176574 001734D4 4E 80 00 20 */ blr +/* 80176574 001734D4 4E 80 00 20 */ blr .global Accept__18CScriptBallTriggerFR8IVisitor Accept__18CScriptBallTriggerFR8IVisitor: @@ -94,11 +94,11 @@ Accept__18CScriptBallTriggerFR8IVisitor: /* 80176590 001734F0 7C 04 03 78 */ mr r4, r0 /* 80176594 001734F4 81 8C 00 CC */ lwz r12, 0xcc(r12) /* 80176598 001734F8 7D 89 03 A6 */ mtctr r12 -/* 8017659C 001734FC 4E 80 04 21 */ bctrl +/* 8017659C 001734FC 4E 80 04 21 */ bctrl /* 801765A0 00173500 80 01 00 14 */ lwz r0, 0x14(r1) /* 801765A4 00173504 7C 08 03 A6 */ mtlr r0 /* 801765A8 00173508 38 21 00 10 */ addi r1, r1, 0x10 -/* 801765AC 0017350C 4E 80 00 20 */ blr +/* 801765AC 0017350C 4E 80 00 20 */ blr .global Think__18CScriptBallTriggerFfR13CStateManager Think__18CScriptBallTriggerFfR13CStateManager: @@ -270,7 +270,7 @@ lbl_801767F0: /* 80176828 00173788 83 C1 00 58 */ lwz r30, 0x58(r1) /* 8017682C 0017378C 7C 08 03 A6 */ mtlr r0 /* 80176830 00173790 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 80176834 00173794 4E 80 00 20 */ blr +/* 80176834 00173794 4E 80 00 20 */ blr .global InhabitantExited__18CScriptBallTriggerFR6CActorR13CStateManager InhabitantExited__18CScriptBallTriggerFR6CActorR13CStateManager: @@ -296,7 +296,7 @@ lbl_8017687C: /* 80176880 001737E0 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80176884 001737E4 7C 08 03 A6 */ mtlr r0 /* 80176888 001737E8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8017688C 001737EC 4E 80 00 20 */ blr +/* 8017688C 001737EC 4E 80 00 20 */ blr .global InhabitantAdded__18CScriptBallTriggerFR6CActorR13CStateManager InhabitantAdded__18CScriptBallTriggerFR6CActorR13CStateManager: @@ -315,7 +315,7 @@ lbl_801768BC: /* 801768BC 0017381C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801768C0 00173820 7C 08 03 A6 */ mtlr r0 /* 801768C4 00173824 38 21 00 10 */ addi r1, r1, 0x10 -/* 801768C8 00173828 4E 80 00 20 */ blr +/* 801768C8 00173828 4E 80 00 20 */ blr .global __dt__18CScriptBallTriggerFv __dt__18CScriptBallTriggerFv: @@ -343,7 +343,7 @@ lbl_80176910: /* 8017691C 0017387C 83 C1 00 08 */ lwz r30, 8(r1) /* 80176920 00173880 7C 08 03 A6 */ mtlr r0 /* 80176924 00173884 38 21 00 10 */ addi r1, r1, 0x10 -/* 80176928 00173888 4E 80 00 20 */ blr +/* 80176928 00173888 4E 80 00 20 */ blr .global "__ct__18CScriptBallTriggerF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC9CVector3fRC9CVector3fbfff9CVector3f" "__ct__18CScriptBallTriggerF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC9CVector3fRC9CVector3fbfff9CVector3f": @@ -454,7 +454,7 @@ lbl_80176AA8: /* 80176AC8 00173A28 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 80176ACC 00173A2C 7C 08 03 A6 */ mtlr r0 /* 80176AD0 00173A30 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 80176AD4 00173A34 4E 80 00 20 */ blr +/* 80176AD4 00173A34 4E 80 00 20 */ blr .global calculate_ball_aabox__Fv calculate_ball_aabox__Fv: @@ -478,4 +478,4 @@ calculate_ball_aabox__Fv: /* 80176B1C 00173A7C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80176B20 00173A80 7C 08 03 A6 */ mtlr r0 /* 80176B24 00173A84 38 21 00 20 */ addi r1, r1, 0x20 -/* 80176B28 00173A88 4E 80 00 20 */ blr +/* 80176B28 00173A88 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/ScriptObjects/CScriptBeam.s b/asm/MetroidPrime/ScriptObjects/CScriptBeam.s index 87c72bcd..da2955b9 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptBeam.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptBeam.s @@ -72,7 +72,7 @@ lbl_8027C630: /* 8027C63C 0027959C 83 C1 00 08 */ lwz r30, 8(r1) /* 8027C640 002795A0 7C 08 03 A6 */ mtlr r0 /* 8027C644 002795A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8027C648 002795A8 4E 80 00 20 */ blr +/* 8027C648 002795A8 4E 80 00 20 */ blr .global Think__11CScriptBeamFfR13CStateManager Think__11CScriptBeamFfR13CStateManager: @@ -101,7 +101,7 @@ Think__11CScriptBeamFfR13CStateManager: /* 8027C6A4 00279604 38 9E 00 34 */ addi r4, r30, 0x34 /* 8027C6A8 00279608 81 8C 00 70 */ lwz r12, 0x70(r12) /* 8027C6AC 0027960C 7D 89 03 A6 */ mtctr r12 -/* 8027C6B0 00279610 4E 80 04 21 */ bctrl +/* 8027C6B0 00279610 4E 80 04 21 */ bctrl /* 8027C6B4 00279614 48 00 00 0C */ b lbl_8027C6C0 lbl_8027C6B8: /* 8027C6B8 00279618 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) @@ -113,7 +113,7 @@ lbl_8027C6C0: /* 8027C6CC 0027962C 83 C1 00 10 */ lwz r30, 0x10(r1) /* 8027C6D0 00279630 7C 08 03 A6 */ mtlr r0 /* 8027C6D4 00279634 38 21 00 20 */ addi r1, r1, 0x20 -/* 8027C6D8 00279638 4E 80 00 20 */ blr +/* 8027C6D8 00279638 4E 80 00 20 */ blr .global Accept__11CScriptBeamFR8IVisitor Accept__11CScriptBeamFR8IVisitor: @@ -126,11 +126,11 @@ Accept__11CScriptBeamFR8IVisitor: /* 8027C6F4 00279654 7C 04 03 78 */ mr r4, r0 /* 8027C6F8 00279658 81 8C 00 08 */ lwz r12, 8(r12) /* 8027C6FC 0027965C 7D 89 03 A6 */ mtctr r12 -/* 8027C700 00279660 4E 80 04 21 */ bctrl +/* 8027C700 00279660 4E 80 04 21 */ bctrl /* 8027C704 00279664 80 01 00 14 */ lwz r0, 0x14(r1) /* 8027C708 00279668 7C 08 03 A6 */ mtlr r0 /* 8027C70C 0027966C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8027C710 00279670 4E 80 00 20 */ blr +/* 8027C710 00279670 4E 80 00 20 */ blr .global AcceptScriptMsg__11CScriptBeamF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__11CScriptBeamF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -257,7 +257,7 @@ lbl_8027C8B8: /* 8027C8DC 0027983C 38 A0 00 01 */ li r5, 1 /* 8027C8E0 00279840 81 8C 00 74 */ lwz r12, 0x74(r12) /* 8027C8E4 00279844 7D 89 03 A6 */ mtctr r12 -/* 8027C8E8 00279848 4E 80 04 21 */ bctrl +/* 8027C8E8 00279848 4E 80 04 21 */ bctrl /* 8027C8EC 0027984C 7F 23 CB 78 */ mr r3, r25 /* 8027C8F0 00279850 7F C5 F3 78 */ mr r5, r30 /* 8027C8F4 00279854 81 99 00 00 */ lwz r12, 0(r25) @@ -265,7 +265,7 @@ lbl_8027C8B8: /* 8027C8FC 0027985C 38 C0 00 00 */ li r6, 0 /* 8027C900 00279860 81 8C 00 78 */ lwz r12, 0x78(r12) /* 8027C904 00279864 7D 89 03 A6 */ mtctr r12 -/* 8027C908 00279868 4E 80 04 21 */ bctrl +/* 8027C908 00279868 4E 80 04 21 */ bctrl /* 8027C90C 0027986C 48 00 00 44 */ b lbl_8027C950 lbl_8027C910: /* 8027C910 00279870 A0 1B 01 54 */ lhz r0, 0x154(r27) @@ -283,7 +283,7 @@ lbl_8027C910: /* 8027C940 002798A0 38 A0 00 00 */ li r5, 0 /* 8027C944 002798A4 81 8C 00 74 */ lwz r12, 0x74(r12) /* 8027C948 002798A8 7D 89 03 A6 */ mtctr r12 -/* 8027C94C 002798AC 4E 80 04 21 */ bctrl +/* 8027C94C 002798AC 4E 80 04 21 */ bctrl lbl_8027C950: /* 8027C950 002798B0 A0 1D 00 00 */ lhz r0, 0(r29) /* 8027C954 002798B4 7F 63 DB 78 */ mr r3, r27 @@ -296,7 +296,7 @@ lbl_8027C950: /* 8027C970 002798D0 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 8027C974 002798D4 7C 08 03 A6 */ mtlr r0 /* 8027C978 002798D8 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 8027C97C 002798DC 4E 80 00 20 */ blr +/* 8027C97C 002798DC 4E 80 00 20 */ blr .global "__ct__11CScriptBeamF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fbRC34TLockedToken<18CWeaponDescription>RC9CBeamInfoRC11CDamageInfo" "__ct__11CScriptBeamF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fbRC34TLockedToken<18CWeaponDescription>RC9CBeamInfoRC11CDamageInfo": diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCameraBlurKeyframe.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraBlurKeyframe.s index 46be9964..57ee283f 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCameraBlurKeyframe.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCameraBlurKeyframe.s @@ -27,11 +27,11 @@ Accept__25CScriptCameraBlurKeyframeFR8IVisitor: /* 800EA770 000E76D0 7C 04 03 78 */ mr r4, r0 /* 800EA774 000E76D4 81 8C 00 24 */ lwz r12, 0x24(r12) /* 800EA778 000E76D8 7D 89 03 A6 */ mtctr r12 -/* 800EA77C 000E76DC 4E 80 04 21 */ bctrl +/* 800EA77C 000E76DC 4E 80 04 21 */ bctrl /* 800EA780 000E76E0 80 01 00 14 */ lwz r0, 0x14(r1) /* 800EA784 000E76E4 7C 08 03 A6 */ mtlr r0 /* 800EA788 000E76E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800EA78C 000E76EC 4E 80 00 20 */ blr +/* 800EA78C 000E76EC 4E 80 00 20 */ blr .global AcceptScriptMsg__25CScriptCameraBlurKeyframeF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__25CScriptCameraBlurKeyframeF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -81,7 +81,7 @@ lbl_800EA824: /* 800EA830 000E7790 83 A1 00 14 */ lwz r29, 0x14(r1) /* 800EA834 000E7794 7C 08 03 A6 */ mtlr r0 /* 800EA838 000E7798 38 21 00 20 */ addi r1, r1, 0x20 -/* 800EA83C 000E779C 4E 80 00 20 */ blr +/* 800EA83C 000E779C 4E 80 00 20 */ blr .global __dt__25CScriptCameraBlurKeyframeFv __dt__25CScriptCameraBlurKeyframeFv: @@ -109,7 +109,7 @@ lbl_800EA884: /* 800EA890 000E77F0 83 C1 00 08 */ lwz r30, 8(r1) /* 800EA894 000E77F4 7C 08 03 A6 */ mtlr r0 /* 800EA898 000E77F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800EA89C 000E77FC 4E 80 00 20 */ blr +/* 800EA89C 000E77FC 4E 80 00 20 */ blr .global "__ct__25CScriptCameraBlurKeyframeF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoUifUiffb" "__ct__25CScriptCameraBlurKeyframeF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoUifUiffb": diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCameraFilterKeyframe.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraFilterKeyframe.s index d2eb6776..b541733e 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCameraFilterKeyframe.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCameraFilterKeyframe.s @@ -27,11 +27,11 @@ Accept__27CScriptCameraFilterKeyframeFR8IVisitor: /* 800EA4FC 000E745C 7C 04 03 78 */ mr r4, r0 /* 800EA500 000E7460 81 8C 00 24 */ lwz r12, 0x24(r12) /* 800EA504 000E7464 7D 89 03 A6 */ mtctr r12 -/* 800EA508 000E7468 4E 80 04 21 */ bctrl +/* 800EA508 000E7468 4E 80 04 21 */ bctrl /* 800EA50C 000E746C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800EA510 000E7470 7C 08 03 A6 */ mtlr r0 /* 800EA514 000E7474 38 21 00 10 */ addi r1, r1, 0x10 -/* 800EA518 000E7478 4E 80 00 20 */ blr +/* 800EA518 000E7478 4E 80 00 20 */ blr .global AcceptScriptMsg__27CScriptCameraFilterKeyframeF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__27CScriptCameraFilterKeyframeF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -106,7 +106,7 @@ lbl_800EA5F0: /* 800EA61C 000E757C 83 81 00 10 */ lwz r28, 0x10(r1) /* 800EA620 000E7580 7C 08 03 A6 */ mtlr r0 /* 800EA624 000E7584 38 21 00 20 */ addi r1, r1, 0x20 -/* 800EA628 000E7588 4E 80 00 20 */ blr +/* 800EA628 000E7588 4E 80 00 20 */ blr .global __dt__27CScriptCameraFilterKeyframeFv __dt__27CScriptCameraFilterKeyframeFv: @@ -134,7 +134,7 @@ lbl_800EA670: /* 800EA67C 000E75DC 83 C1 00 08 */ lwz r30, 8(r1) /* 800EA680 000E75E0 7C 08 03 A6 */ mtlr r0 /* 800EA684 000E75E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800EA688 000E75E8 4E 80 00 20 */ blr +/* 800EA688 000E75E8 4E 80 00 20 */ blr .global "__ct__27CScriptCameraFilterKeyframeF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoUiUiUiUiffffffUib" "__ct__27CScriptCameraFilterKeyframeF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoUiUiUiUiffffffUib": diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCameraHint.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraHint.s index 4cb91911..3bfeabeb 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCameraHint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCameraHint.s @@ -55,11 +55,11 @@ Accept__17CScriptCameraHintFR8IVisitor: /* 800C46A4 000C1604 7C 04 03 78 */ mr r4, r0 /* 800C46A8 000C1608 81 8C 00 68 */ lwz r12, 0x68(r12) /* 800C46AC 000C160C 7D 89 03 A6 */ mtctr r12 -/* 800C46B0 000C1610 4E 80 04 21 */ bctrl +/* 800C46B0 000C1610 4E 80 04 21 */ bctrl /* 800C46B4 000C1614 80 01 00 14 */ lwz r0, 0x14(r1) /* 800C46B8 000C1618 7C 08 03 A6 */ mtlr r0 /* 800C46BC 000C161C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C46C0 000C1620 4E 80 00 20 */ blr +/* 800C46C0 000C1620 4E 80 00 20 */ blr .global AcceptScriptMsg__17CScriptCameraHintF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__17CScriptCameraHintF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -150,7 +150,7 @@ lbl_800C47E0: /* 800C47F4 000C1754 81 9B 00 00 */ lwz r12, 0(r27) /* 800C47F8 000C1758 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 800C47FC 000C175C 7D 89 03 A6 */ mtctr r12 -/* 800C4800 000C1760 4E 80 04 21 */ bctrl +/* 800C4800 000C1760 4E 80 04 21 */ bctrl /* 800C4804 000C1764 A0 1D 00 00 */ lhz r0, 0(r29) /* 800C4808 000C1768 7F C3 F3 78 */ mr r3, r30 /* 800C480C 000C176C 38 81 00 18 */ addi r4, r1, 0x18 @@ -258,7 +258,7 @@ lbl_800C4974: /* 800C4994 000C18F4 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 800C4998 000C18F8 7C 08 03 A6 */ mtlr r0 /* 800C499C 000C18FC 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 800C49A0 000C1900 4E 80 00 20 */ blr +/* 800C49A0 000C1900 4E 80 00 20 */ blr .global InitializeInArea__17CScriptCameraHintFR13CStateManager InitializeInArea__17CScriptCameraHintFR13CStateManager: @@ -400,7 +400,7 @@ lbl_800C4B7C: /* 800C4B88 000C1AE8 80 01 00 74 */ lwz r0, 0x74(r1) /* 800C4B8C 000C1AEC 7C 08 03 A6 */ mtlr r0 /* 800C4B90 000C1AF0 38 21 00 70 */ addi r1, r1, 0x70 -/* 800C4B94 000C1AF4 4E 80 00 20 */ blr +/* 800C4B94 000C1AF4 4E 80 00 20 */ blr .global sub_800c4b98 sub_800c4b98: @@ -422,7 +422,7 @@ sub_800c4b98: /* 800C4BD4 000C1B34 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 800C4BD8 000C1B38 7C 08 03 A6 */ mtlr r0 /* 800C4BDC 000C1B3C 38 21 00 20 */ addi r1, r1, 0x20 -/* 800C4BE0 000C1B40 4E 80 00 20 */ blr +/* 800C4BE0 000C1B40 4E 80 00 20 */ blr .global sub_800c4be4 sub_800c4be4: @@ -475,13 +475,13 @@ lbl_800C4C6C: /* 800C4C88 000C1BE8 80 05 00 00 */ lwz r0, 0(r5) /* 800C4C8C 000C1BEC 90 03 00 00 */ stw r0, 0(r3) /* 800C4C90 000C1BF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C4C94 000C1BF4 4E 80 00 20 */ blr +/* 800C4C94 000C1BF4 4E 80 00 20 */ blr .global RemoveHelper__17CScriptCameraHintF9TUniqueId RemoveHelper__17CScriptCameraHintF9TUniqueId: /* 800C4C98 000C1BF8 80 03 01 50 */ lwz r0, 0x150(r3) /* 800C4C9C 000C1BFC 2C 00 00 00 */ cmpwi r0, 0 -/* 800C4CA0 000C1C00 4D 82 00 20 */ beqlr +/* 800C4CA0 000C1C00 4D 82 00 20 */ beqlr /* 800C4CA4 000C1C04 38 E3 01 54 */ addi r7, r3, 0x154 /* 800C4CA8 000C1C08 54 00 08 3C */ slwi r0, r0, 1 /* 800C4CAC 000C1C0C 7C E6 3B 78 */ mr r6, r7 @@ -500,9 +500,9 @@ lbl_800C4CD4: /* 800C4CD4 000C1C34 7C 06 40 40 */ cmplw r6, r8 /* 800C4CD8 000C1C38 40 82 00 4C */ bne lbl_800C4D24 /* 800C4CDC 000C1C3C 7C 07 38 40 */ cmplw r7, r7 -/* 800C4CE0 000C1C40 4D 80 00 20 */ bltlr +/* 800C4CE0 000C1C40 4D 80 00 20 */ bltlr /* 800C4CE4 000C1C44 7C 07 40 40 */ cmplw r7, r8 -/* 800C4CE8 000C1C48 4C 80 00 20 */ bgelr +/* 800C4CE8 000C1C48 4C 80 00 20 */ bgelr /* 800C4CEC 000C1C4C 7C E6 3B 78 */ mr r6, r7 /* 800C4CF0 000C1C50 48 00 00 10 */ b lbl_800C4D00 lbl_800C4CF4: @@ -518,12 +518,12 @@ lbl_800C4D00: /* 800C4D14 000C1C74 41 80 FF E0 */ blt lbl_800C4CF4 /* 800C4D18 000C1C78 38 05 FF FF */ addi r0, r5, -1 /* 800C4D1C 000C1C7C 90 03 01 50 */ stw r0, 0x150(r3) -/* 800C4D20 000C1C80 4E 80 00 20 */ blr +/* 800C4D20 000C1C80 4E 80 00 20 */ blr lbl_800C4D24: /* 800C4D24 000C1C84 7C 06 38 40 */ cmplw r6, r7 -/* 800C4D28 000C1C88 4D 80 00 20 */ bltlr +/* 800C4D28 000C1C88 4D 80 00 20 */ bltlr /* 800C4D2C 000C1C8C 7C 06 40 40 */ cmplw r6, r8 -/* 800C4D30 000C1C90 4C 80 00 20 */ bgelr +/* 800C4D30 000C1C90 4C 80 00 20 */ bgelr /* 800C4D34 000C1C94 48 00 00 10 */ b lbl_800C4D44 lbl_800C4D38: /* 800C4D38 000C1C98 A0 06 00 02 */ lhz r0, 2(r6) @@ -538,7 +538,7 @@ lbl_800C4D44: /* 800C4D58 000C1CB8 41 80 FF E0 */ blt lbl_800C4D38 /* 800C4D5C 000C1CBC 38 05 FF FF */ addi r0, r5, -1 /* 800C4D60 000C1CC0 90 03 01 50 */ stw r0, 0x150(r3) -/* 800C4D64 000C1CC4 4E 80 00 20 */ blr +/* 800C4D64 000C1CC4 4E 80 00 20 */ blr .global AddHelper__17CScriptCameraHintF9TUniqueId AddHelper__17CScriptCameraHintF9TUniqueId: @@ -558,7 +558,7 @@ lbl_800C4D80: /* 800C4D94 000C1CF4 40 82 FF E8 */ bne lbl_800C4D7C lbl_800C4D98: /* 800C4D98 000C1CF8 7C 06 38 40 */ cmplw r6, r7 -/* 800C4D9C 000C1CFC 4C 82 00 20 */ bnelr +/* 800C4D9C 000C1CFC 4C 82 00 20 */ bnelr /* 800C4DA0 000C1D00 28 07 00 00 */ cmplwi r7, 0 /* 800C4DA4 000C1D04 41 82 00 0C */ beq lbl_800C4DB0 /* 800C4DA8 000C1D08 A0 04 00 00 */ lhz r0, 0(r4) @@ -567,7 +567,7 @@ lbl_800C4DB0: /* 800C4DB0 000C1D10 80 83 01 50 */ lwz r4, 0x150(r3) /* 800C4DB4 000C1D14 38 04 00 01 */ addi r0, r4, 1 /* 800C4DB8 000C1D18 90 03 01 50 */ stw r0, 0x150(r3) -/* 800C4DBC 000C1D1C 4E 80 00 20 */ blr +/* 800C4DBC 000C1D1C 4E 80 00 20 */ blr .global ClearIdList__17CScriptCameraHintFv ClearIdList__17CScriptCameraHintFv: @@ -596,7 +596,7 @@ lbl_800C4E08: lbl_800C4E0C: /* 800C4E0C 000C1D6C 38 00 00 00 */ li r0, 0 /* 800C4E10 000C1D70 90 03 01 50 */ stw r0, 0x150(r3) -/* 800C4E14 000C1D74 4E 80 00 20 */ blr +/* 800C4E14 000C1D74 4E 80 00 20 */ blr .global GetFirstHelper__17CScriptCameraHintCFv GetFirstHelper__17CScriptCameraHintCFv: @@ -605,11 +605,11 @@ GetFirstHelper__17CScriptCameraHintCFv: /* 800C4E20 000C1D80 40 81 00 10 */ ble lbl_800C4E30 /* 800C4E24 000C1D84 A0 04 01 54 */ lhz r0, 0x154(r4) /* 800C4E28 000C1D88 B0 03 00 00 */ sth r0, 0(r3) -/* 800C4E2C 000C1D8C 4E 80 00 20 */ blr +/* 800C4E2C 000C1D8C 4E 80 00 20 */ blr lbl_800C4E30: /* 800C4E30 000C1D90 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800C4E34 000C1D94 B0 03 00 00 */ sth r0, 0(r3) -/* 800C4E38 000C1D98 4E 80 00 20 */ blr +/* 800C4E38 000C1D98 4E 80 00 20 */ blr .global __dt__17CScriptCameraHintFv __dt__17CScriptCameraHintFv: @@ -672,7 +672,7 @@ lbl_800C4EF4: /* 800C4F00 000C1E60 83 C1 00 08 */ lwz r30, 8(r1) /* 800C4F04 000C1E64 7C 08 03 A6 */ mtlr r0 /* 800C4F08 000C1E68 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C4F0C 000C1E6C 4E 80 00 20 */ blr +/* 800C4F0C 000C1E6C 4E 80 00 20 */ blr .global "__ct__17CScriptCameraHintF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fbiQ211CBallCamera20EBallCameraBehaviourifffRC13CCameraSpringRC13CCameraSpringfRC9CVector3fRC9CVector3ff" "__ct__17CScriptCameraHintF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fbiQ211CBallCamera20EBallCameraBehaviourifffRC13CCameraSpringRC13CCameraSpringfRC9CVector3fRC9CVector3ff": diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.s index 1cd11346..2996c7d2 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.s @@ -70,7 +70,7 @@ lbl_8024B3E0: /* 8024B3EC 0024834C 83 C1 00 08 */ lwz r30, 8(r1) /* 8024B3F0 00248350 7C 08 03 A6 */ mtlr r0 /* 8024B3F4 00248354 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024B3F8 00248358 4E 80 00 20 */ blr +/* 8024B3F8 00248358 4E 80 00 20 */ blr .global AcceptScriptMsg__24CScriptCameraHintTriggerF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__24CScriptCameraHintTriggerF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -150,7 +150,7 @@ lbl_8024B508: /* 8024B510 00248470 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8024B514 00248474 7C 08 03 A6 */ mtlr r0 /* 8024B518 00248478 38 21 00 20 */ addi r1, r1, 0x20 -/* 8024B51C 0024847C 4E 80 00 20 */ blr +/* 8024B51C 0024847C 4E 80 00 20 */ blr .global Touch__24CScriptCameraHintTriggerFR6CActorR13CStateManager Touch__24CScriptCameraHintTriggerFR6CActorR13CStateManager: @@ -171,7 +171,7 @@ Touch__24CScriptCameraHintTriggerFR6CActorR13CStateManager: /* 8024B558 002484B8 81 9F 00 00 */ lwz r12, 0(r31) /* 8024B55C 002484BC 81 8C 00 40 */ lwz r12, 0x40(r12) /* 8024B560 002484C0 7D 89 03 A6 */ mtctr r12 -/* 8024B564 002484C4 4E 80 04 21 */ bctrl +/* 8024B564 002484C4 4E 80 04 21 */ bctrl /* 8024B568 002484C8 88 01 00 28 */ lbz r0, 0x28(r1) /* 8024B56C 002484CC 28 00 00 00 */ cmplwi r0, 0 /* 8024B570 002484D0 98 01 00 44 */ stb r0, 0x44(r1) @@ -225,7 +225,7 @@ lbl_8024B61C: /* 8024B624 00248584 83 C1 00 C8 */ lwz r30, 0xc8(r1) /* 8024B628 00248588 7C 08 03 A6 */ mtlr r0 /* 8024B62C 0024858C 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 8024B630 00248590 4E 80 00 20 */ blr +/* 8024B630 00248590 4E 80 00 20 */ blr .global GetTouchBounds__24CScriptCameraHintTriggerCFv GetTouchBounds__24CScriptCameraHintTriggerCFv: @@ -260,7 +260,7 @@ lbl_8024B69C: /* 8024B6A0 00248600 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8024B6A4 00248604 7C 08 03 A6 */ mtlr r0 /* 8024B6A8 00248608 38 21 00 30 */ addi r1, r1, 0x30 -/* 8024B6AC 0024860C 4E 80 00 20 */ blr +/* 8024B6AC 0024860C 4E 80 00 20 */ blr .global Accept__24CScriptCameraHintTriggerFR8IVisitor Accept__24CScriptCameraHintTriggerFR8IVisitor: @@ -273,11 +273,11 @@ Accept__24CScriptCameraHintTriggerFR8IVisitor: /* 8024B6C8 00248628 7C 04 03 78 */ mr r4, r0 /* 8024B6CC 0024862C 81 8C 00 08 */ lwz r12, 8(r12) /* 8024B6D0 00248630 7D 89 03 A6 */ mtctr r12 -/* 8024B6D4 00248634 4E 80 04 21 */ bctrl +/* 8024B6D4 00248634 4E 80 04 21 */ bctrl /* 8024B6D8 00248638 80 01 00 14 */ lwz r0, 0x14(r1) /* 8024B6DC 0024863C 7C 08 03 A6 */ mtlr r0 /* 8024B6E0 00248640 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024B6E4 00248644 4E 80 00 20 */ blr +/* 8024B6E4 00248644 4E 80 00 20 */ blr .global "__ct__24CScriptCameraHintTriggerF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC9CVector3fRC12CTransform4fbb" "__ct__24CScriptCameraHintTriggerF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC9CVector3fRC12CTransform4fbb": diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.s index b241d38e..eb54020b 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.s @@ -71,7 +71,7 @@ lbl_80226518: /* 80226524 00223484 83 C1 00 08 */ lwz r30, 8(r1) /* 80226528 00223488 7C 08 03 A6 */ mtlr r0 /* 8022652C 0022348C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80226530 00223490 4E 80 00 20 */ blr +/* 80226530 00223490 4E 80 00 20 */ blr .global Exited__24CScriptCameraPitchVolumeFR13CStateManager Exited__24CScriptCameraPitchVolumeFR13CStateManager: @@ -86,7 +86,7 @@ Exited__24CScriptCameraPitchVolumeFR13CStateManager: /* 80226554 002234B4 B0 01 00 08 */ sth r0, 8(r1) /* 80226558 002234B8 B0 03 01 C4 */ sth r0, 0x1c4(r3) /* 8022655C 002234BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80226560 002234C0 4E 80 00 20 */ blr +/* 80226560 002234C0 4E 80 00 20 */ blr .global Entered__24CScriptCameraPitchVolumeFR13CStateManager Entered__24CScriptCameraPitchVolumeFR13CStateManager: @@ -102,7 +102,7 @@ Entered__24CScriptCameraPitchVolumeFR13CStateManager: /* 80226588 002234E8 B0 01 00 0C */ sth r0, 0xc(r1) /* 8022658C 002234EC B0 03 01 C4 */ sth r0, 0x1c4(r3) /* 80226590 002234F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80226594 002234F4 4E 80 00 20 */ blr +/* 80226594 002234F4 4E 80 00 20 */ blr .global Think__24CScriptCameraPitchVolumeFfR13CStateManager Think__24CScriptCameraPitchVolumeFfR13CStateManager: @@ -142,7 +142,7 @@ lbl_80226608: /* 80226610 00223570 83 C1 00 08 */ lwz r30, 8(r1) /* 80226614 00223574 7C 08 03 A6 */ mtlr r0 /* 80226618 00223578 38 21 00 10 */ addi r1, r1, 0x10 -/* 8022661C 0022357C 4E 80 00 20 */ blr +/* 8022661C 0022357C 4E 80 00 20 */ blr .global Touch__24CScriptCameraPitchVolumeFR6CActorR13CStateManager Touch__24CScriptCameraPitchVolumeFR6CActorR13CStateManager: @@ -163,7 +163,7 @@ Touch__24CScriptCameraPitchVolumeFR6CActorR13CStateManager: /* 80226658 002235B8 81 9F 00 00 */ lwz r12, 0(r31) /* 8022665C 002235BC 81 8C 00 40 */ lwz r12, 0x40(r12) /* 80226660 002235C0 7D 89 03 A6 */ mtctr r12 -/* 80226664 002235C4 4E 80 04 21 */ bctrl +/* 80226664 002235C4 4E 80 04 21 */ bctrl /* 80226668 002235C8 88 01 00 28 */ lbz r0, 0x28(r1) /* 8022666C 002235CC 28 00 00 00 */ cmplwi r0, 0 /* 80226670 002235D0 98 01 00 44 */ stb r0, 0x44(r1) @@ -217,7 +217,7 @@ lbl_8022671C: /* 80226724 00223684 83 C1 00 C8 */ lwz r30, 0xc8(r1) /* 80226728 00223688 7C 08 03 A6 */ mtlr r0 /* 8022672C 0022368C 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 80226730 00223690 4E 80 00 20 */ blr +/* 80226730 00223690 4E 80 00 20 */ blr .global GetTouchBounds__24CScriptCameraPitchVolumeCFv GetTouchBounds__24CScriptCameraPitchVolumeCFv: @@ -252,7 +252,7 @@ lbl_8022679C: /* 802267A0 00223700 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 802267A4 00223704 7C 08 03 A6 */ mtlr r0 /* 802267A8 00223708 38 21 00 30 */ addi r1, r1, 0x30 -/* 802267AC 0022370C 4E 80 00 20 */ blr +/* 802267AC 0022370C 4E 80 00 20 */ blr .global Accept__24CScriptCameraPitchVolumeFR8IVisitor Accept__24CScriptCameraPitchVolumeFR8IVisitor: @@ -265,11 +265,11 @@ Accept__24CScriptCameraPitchVolumeFR8IVisitor: /* 802267C8 00223728 7C 04 03 78 */ mr r4, r0 /* 802267CC 0022372C 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 802267D0 00223730 7D 89 03 A6 */ mtctr r12 -/* 802267D4 00223734 4E 80 04 21 */ bctrl +/* 802267D4 00223734 4E 80 04 21 */ bctrl /* 802267D8 00223738 80 01 00 14 */ lwz r0, 0x14(r1) /* 802267DC 0022373C 7C 08 03 A6 */ mtlr r0 /* 802267E0 00223740 38 21 00 10 */ addi r1, r1, 0x10 -/* 802267E4 00223744 4E 80 00 20 */ blr +/* 802267E4 00223744 4E 80 00 20 */ blr .global "__ct__24CScriptCameraPitchVolumeF9TUniqueIdbRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC9CVector3fRC12CTransform4fRC9CRelAngleRC9CRelAnglef" "__ct__24CScriptCameraPitchVolumeF9TUniqueIdbRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC9CVector3fRC12CTransform4fRC9CRelAngleRC9CRelAnglef": @@ -383,7 +383,7 @@ Accept__24CScriptCameraPitchVolumeFR8IVisitor: /* 80226994 002238F4 80 01 01 24 */ lwz r0, 0x124(r1) /* 80226998 002238F8 7C 08 03 A6 */ mtlr r0 /* 8022699C 002238FC 38 21 01 20 */ addi r1, r1, 0x120 -/* 802269A0 00223900 4E 80 00 20 */ blr +/* 802269A0 00223900 4E 80 00 20 */ blr .global __sinit_CScriptCameraPitchVolume_cpp __sinit_CScriptCameraPitchVolume_cpp: diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCameraShaker.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraShaker.s index adcd3cf5..4a84e556 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCameraShaker.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCameraShaker.s @@ -63,7 +63,7 @@ lbl_800FDE6C: /* 800FDE78 000FADD8 83 C1 00 08 */ lwz r30, 8(r1) /* 800FDE7C 000FADDC 7C 08 03 A6 */ mtlr r0 /* 800FDE80 000FADE0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800FDE84 000FADE4 4E 80 00 20 */ blr +/* 800FDE84 000FADE4 4E 80 00 20 */ blr .global Accept__19CScriptCameraShakerFR8IVisitor Accept__19CScriptCameraShakerFR8IVisitor: @@ -76,11 +76,11 @@ Accept__19CScriptCameraShakerFR8IVisitor: /* 800FDEA0 000FAE00 7C 04 03 78 */ mr r4, r0 /* 800FDEA4 000FAE04 81 8C 00 24 */ lwz r12, 0x24(r12) /* 800FDEA8 000FAE08 7D 89 03 A6 */ mtctr r12 -/* 800FDEAC 000FAE0C 4E 80 04 21 */ bctrl +/* 800FDEAC 000FAE0C 4E 80 04 21 */ bctrl /* 800FDEB0 000FAE10 80 01 00 14 */ lwz r0, 0x14(r1) /* 800FDEB4 000FAE14 7C 08 03 A6 */ mtlr r0 /* 800FDEB8 000FAE18 38 21 00 10 */ addi r1, r1, 0x10 -/* 800FDEBC 000FAE1C 4E 80 00 20 */ blr +/* 800FDEBC 000FAE1C 4E 80 00 20 */ blr .global AcceptScriptMsg__19CScriptCameraShakerF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__19CScriptCameraShakerF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -155,7 +155,7 @@ lbl_800FDF90: /* 800FDFBC 000FAF1C 83 81 00 20 */ lwz r28, 0x20(r1) /* 800FDFC0 000FAF20 7C 08 03 A6 */ mtlr r0 /* 800FDFC4 000FAF24 38 21 00 30 */ addi r1, r1, 0x30 -/* 800FDFC8 000FAF28 4E 80 00 20 */ blr +/* 800FDFC8 000FAF28 4E 80 00 20 */ blr .global "__ct__19CScriptCameraShakerF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfobRC16CCameraShakeData" "__ct__19CScriptCameraShakerF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfobRC16CCameraShakeData": diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCameraWaypoint.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraWaypoint.s index b7c78a40..d1d8695f 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCameraWaypoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCameraWaypoint.s @@ -56,19 +56,19 @@ Accept__21CScriptCameraWaypointFR8IVisitor: /* 800B51E0 000B2140 7C 04 03 78 */ mr r4, r0 /* 800B51E4 000B2144 81 8C 00 70 */ lwz r12, 0x70(r12) /* 800B51E8 000B2148 7D 89 03 A6 */ mtctr r12 -/* 800B51EC 000B214C 4E 80 04 21 */ bctrl +/* 800B51EC 000B214C 4E 80 04 21 */ bctrl /* 800B51F0 000B2150 80 01 00 14 */ lwz r0, 0x14(r1) /* 800B51F4 000B2154 7C 08 03 A6 */ mtlr r0 /* 800B51F8 000B2158 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B51FC 000B215C 4E 80 00 20 */ blr +/* 800B51FC 000B215C 4E 80 00 20 */ blr .global Render__21CScriptCameraWaypointCFRC13CStateManager Render__21CScriptCameraWaypointCFRC13CStateManager: -/* 800B5200 000B2160 4E 80 00 20 */ blr +/* 800B5200 000B2160 4E 80 00 20 */ blr .global AddToRenderer__21CScriptCameraWaypointCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__21CScriptCameraWaypointCFRC14CFrustumPlanesRC13CStateManager: -/* 800B5204 000B2164 4E 80 00 20 */ blr +/* 800B5204 000B2164 4E 80 00 20 */ blr .global GetRandomNextWaypointId__21CScriptCameraWaypointCFRC13CStateManager GetRandomNextWaypointId__21CScriptCameraWaypointCFRC13CStateManager: @@ -193,7 +193,7 @@ lbl_800B53AC: /* 800B53B0 000B2310 80 01 00 64 */ lwz r0, 0x64(r1) /* 800B53B4 000B2314 7C 08 03 A6 */ mtlr r0 /* 800B53B8 000B2318 38 21 00 60 */ addi r1, r1, 0x60 -/* 800B53BC 000B231C 4E 80 00 20 */ blr +/* 800B53BC 000B231C 4E 80 00 20 */ blr .global AcceptScriptMsg__21CScriptCameraWaypointF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__21CScriptCameraWaypointF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -229,7 +229,7 @@ lbl_800B5420: /* 800B542C 000B238C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 800B5430 000B2390 7C 08 03 A6 */ mtlr r0 /* 800B5434 000B2394 38 21 00 20 */ addi r1, r1, 0x20 -/* 800B5438 000B2398 4E 80 00 20 */ blr +/* 800B5438 000B2398 4E 80 00 20 */ blr .global __dt__21CScriptCameraWaypointFv __dt__21CScriptCameraWaypointFv: @@ -257,7 +257,7 @@ lbl_800B5480: /* 800B548C 000B23EC 83 C1 00 08 */ lwz r30, 8(r1) /* 800B5490 000B23F0 7C 08 03 A6 */ mtlr r0 /* 800B5494 000B23F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B5498 000B23F8 4E 80 00 20 */ blr +/* 800B5498 000B23F8 4E 80 00 20 */ blr .global "__ct__21CScriptCameraWaypointF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fbfUi" "__ct__21CScriptCameraWaypointF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fbfUi": @@ -325,4 +325,4 @@ lbl_800B5480: /* 800B5590 000B24F0 80 01 01 04 */ lwz r0, 0x104(r1) /* 800B5594 000B24F4 7C 08 03 A6 */ mtlr r0 /* 800B5598 000B24F8 38 21 01 00 */ addi r1, r1, 0x100 -/* 800B559C 000B24FC 4E 80 00 20 */ blr +/* 800B559C 000B24FC 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/ScriptObjects/CScriptColorModulate.s b/asm/MetroidPrime/ScriptObjects/CScriptColorModulate.s index 6cbecf26..ae1aec59 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptColorModulate.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptColorModulate.s @@ -54,7 +54,7 @@ lbl_80200C1C: /* 80200C28 001FDB88 83 C1 00 08 */ lwz r30, 8(r1) /* 80200C2C 001FDB8C 7C 08 03 A6 */ mtlr r0 /* 80200C30 001FDB90 38 21 00 10 */ addi r1, r1, 0x10 -/* 80200C34 001FDB94 4E 80 00 20 */ blr +/* 80200C34 001FDB94 4E 80 00 20 */ blr .global Accept__20CScriptColorModulateFR8IVisitor Accept__20CScriptColorModulateFR8IVisitor: @@ -67,11 +67,11 @@ Accept__20CScriptColorModulateFR8IVisitor: /* 80200C50 001FDBB0 7C 04 03 78 */ mr r4, r0 /* 80200C54 001FDBB4 81 8C 00 24 */ lwz r12, 0x24(r12) /* 80200C58 001FDBB8 7D 89 03 A6 */ mtctr r12 -/* 80200C5C 001FDBBC 4E 80 04 21 */ bctrl +/* 80200C5C 001FDBBC 4E 80 04 21 */ bctrl /* 80200C60 001FDBC0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80200C64 001FDBC4 7C 08 03 A6 */ mtlr r0 /* 80200C68 001FDBC8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80200C6C 001FDBCC 4E 80 00 20 */ blr +/* 80200C6C 001FDBCC 4E 80 00 20 */ blr .global AcceptScriptMsg__20CScriptColorModulateF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__20CScriptColorModulateF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -198,7 +198,7 @@ lbl_80200E18: /* 80200E24 001FDD84 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80200E28 001FDD88 7C 08 03 A6 */ mtlr r0 /* 80200E2C 001FDD8C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80200E30 001FDD90 4E 80 00 20 */ blr +/* 80200E30 001FDD90 4E 80 00 20 */ blr .global Think__20CScriptColorModulateFfR13CStateManager Think__20CScriptColorModulateFfR13CStateManager: @@ -324,7 +324,7 @@ lbl_80200FD8: /* 80200FE0 001FDF40 83 C1 00 38 */ lwz r30, 0x38(r1) /* 80200FE4 001FDF44 7C 08 03 A6 */ mtlr r0 /* 80200FE8 001FDF48 38 21 00 40 */ addi r1, r1, 0x40 -/* 80200FEC 001FDF4C 4E 80 00 20 */ blr +/* 80200FEC 001FDF4C 4E 80 00 20 */ blr .global CalculateFlags__20CScriptColorModulateCFRC6CColor CalculateFlags__20CScriptColorModulateCFRC6CColor: @@ -655,7 +655,7 @@ lbl_802014B0: /* 802014BC 001FE41C 83 A1 00 94 */ lwz r29, 0x94(r1) /* 802014C0 001FE420 7C 08 03 A6 */ mtlr r0 /* 802014C4 001FE424 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 802014C8 001FE428 4E 80 00 20 */ blr +/* 802014C8 001FE428 4E 80 00 20 */ blr .global End__20CScriptColorModulateFR13CStateManager End__20CScriptColorModulateFR13CStateManager: @@ -741,7 +741,7 @@ lbl_802015F0: /* 802015F8 001FE558 83 C1 00 28 */ lwz r30, 0x28(r1) /* 802015FC 001FE55C 7C 08 03 A6 */ mtlr r0 /* 80201600 001FE560 38 21 00 30 */ addi r1, r1, 0x30 -/* 80201604 001FE564 4E 80 00 20 */ blr +/* 80201604 001FE564 4E 80 00 20 */ blr .global SetTargetFlags__20CScriptColorModulateFR13CStateManagerRC11CModelFlags SetTargetFlags__20CScriptColorModulateFR13CStateManagerRC11CModelFlags: @@ -845,7 +845,7 @@ lbl_80201764: /* 80201768 001FE6C8 80 01 00 64 */ lwz r0, 0x64(r1) /* 8020176C 001FE6CC 7C 08 03 A6 */ mtlr r0 /* 80201770 001FE6D0 38 21 00 60 */ addi r1, r1, 0x60 -/* 80201774 001FE6D4 4E 80 00 20 */ blr +/* 80201774 001FE6D4 4E 80 00 20 */ blr .global FadeOutHelper__20CScriptColorModulateFR13CStateManager9TUniqueIdf FadeOutHelper__20CScriptColorModulateFR13CStateManager9TUniqueIdf: @@ -983,7 +983,7 @@ lbl_80201924: /* 8020196C 001FE8CC C0 22 B0 30 */ lfs f1, lbl_805ACD50@sda21(r2) /* 80201970 001FE8D0 81 8C 00 14 */ lwz r12, 0x14(r12) /* 80201974 001FE8D4 7D 89 03 A6 */ mtctr r12 -/* 80201978 001FE8D8 4E 80 04 21 */ bctrl +/* 80201978 001FE8D8 4E 80 04 21 */ bctrl /* 8020197C 001FE8DC A0 01 00 2C */ lhz r0, 0x2c(r1) /* 80201980 001FE8E0 38 61 00 5C */ addi r3, r1, 0x5c /* 80201984 001FE8E4 B0 1D 00 00 */ sth r0, 0(r29) @@ -994,7 +994,7 @@ lbl_80201924: /* 80201998 001FE8F8 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 8020199C 001FE8FC 7C 08 03 A6 */ mtlr r0 /* 802019A0 001FE900 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 802019A4 001FE904 4E 80 00 20 */ blr +/* 802019A4 001FE904 4E 80 00 20 */ blr .global FadeInHelper__20CScriptColorModulateFR13CStateManager9TUniqueIdf FadeInHelper__20CScriptColorModulateFR13CStateManager9TUniqueIdf: @@ -1129,7 +1129,7 @@ lbl_80201B54: /* 80201B90 001FEAF0 C0 22 B0 30 */ lfs f1, lbl_805ACD50@sda21(r2) /* 80201B94 001FEAF4 81 8C 00 14 */ lwz r12, 0x14(r12) /* 80201B98 001FEAF8 7D 89 03 A6 */ mtctr r12 -/* 80201B9C 001FEAFC 4E 80 04 21 */ bctrl +/* 80201B9C 001FEAFC 4E 80 04 21 */ bctrl /* 80201BA0 001FEB00 A0 01 00 2C */ lhz r0, 0x2c(r1) /* 80201BA4 001FEB04 38 61 00 5C */ addi r3, r1, 0x5c /* 80201BA8 001FEB08 B0 1D 00 00 */ sth r0, 0(r29) @@ -1140,7 +1140,7 @@ lbl_80201B54: /* 80201BBC 001FEB1C 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 80201BC0 001FEB20 7C 08 03 A6 */ mtlr r0 /* 80201BC4 001FEB24 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 80201BC8 001FEB28 4E 80 00 20 */ blr +/* 80201BC8 001FEB28 4E 80 00 20 */ blr .global "__ct__20CScriptColorModulateF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC6CColorRC6CColorQ220CScriptColorModulate10EBlendModeffbbbbbb" "__ct__20CScriptColorModulateF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC6CColorRC6CColorQ220CScriptColorModulate10EBlendModeffbbbbbb": diff --git a/asm/MetroidPrime/ScriptObjects/CScriptControllerAction.s b/asm/MetroidPrime/ScriptObjects/CScriptControllerAction.s index f964dc06..6822bdd3 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptControllerAction.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptControllerAction.s @@ -42,11 +42,11 @@ lbl_801D8D38: /* 801D8D44 001D5CA4 83 C1 00 08 */ lwz r30, 8(r1) /* 801D8D48 001D5CA8 7C 08 03 A6 */ mtlr r0 /* 801D8D4C 001D5CAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D8D50 001D5CB0 4E 80 00 20 */ blr +/* 801D8D50 001D5CB0 4E 80 00 20 */ blr .global nullsub_51 nullsub_51: -/* 801D8D54 001D5CB4 4E 80 00 20 */ blr +/* 801D8D54 001D5CB4 4E 80 00 20 */ blr .global Think__23CScriptControllerActionFfR13CStateManager Think__23CScriptControllerActionFfR13CStateManager: @@ -126,7 +126,7 @@ lbl_801D8E3C: /* 801D8E64 001D5DC4 81 9D 00 00 */ lwz r12, 0(r29) /* 801D8E68 001D5DC8 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 801D8E6C 001D5DCC 7D 89 03 A6 */ mtctr r12 -/* 801D8E70 001D5DD0 4E 80 04 21 */ bctrl +/* 801D8E70 001D5DD0 4E 80 04 21 */ bctrl /* 801D8E74 001D5DD4 7F A3 EB 78 */ mr r3, r29 /* 801D8E78 001D5DD8 7F C5 F3 78 */ mr r5, r30 /* 801D8E7C 001D5DDC 38 80 00 05 */ li r4, 5 @@ -139,7 +139,7 @@ lbl_801D8E88: /* 801D8E94 001D5DF4 83 A1 00 14 */ lwz r29, 0x14(r1) /* 801D8E98 001D5DF8 7C 08 03 A6 */ mtlr r0 /* 801D8E9C 001D5DFC 38 21 00 20 */ addi r1, r1, 0x20 -/* 801D8EA0 001D5E00 4E 80 00 20 */ blr +/* 801D8EA0 001D5E00 4E 80 00 20 */ blr .global Accept__23CScriptControllerActionFR8IVisitor Accept__23CScriptControllerActionFR8IVisitor: @@ -152,11 +152,11 @@ Accept__23CScriptControllerActionFR8IVisitor: /* 801D8EBC 001D5E1C 7C 04 03 78 */ mr r4, r0 /* 801D8EC0 001D5E20 81 8C 00 24 */ lwz r12, 0x24(r12) /* 801D8EC4 001D5E24 7D 89 03 A6 */ mtctr r12 -/* 801D8EC8 001D5E28 4E 80 04 21 */ bctrl +/* 801D8EC8 001D5E28 4E 80 04 21 */ bctrl /* 801D8ECC 001D5E2C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801D8ED0 001D5E30 7C 08 03 A6 */ mtlr r0 /* 801D8ED4 001D5E34 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D8ED8 001D5E38 4E 80 00 20 */ blr +/* 801D8ED8 001D5E38 4E 80 00 20 */ blr .global "__ct__23CScriptControllerActionF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfobQ223CScriptControllerAction9ECommandsb" "__ct__23CScriptControllerActionF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfobQ223CScriptControllerAction9ECommandsb": diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCounter.s b/asm/MetroidPrime/ScriptObjects/CScriptCounter.s index 4a0dde32..19617ff6 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCounter.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCounter.s @@ -41,11 +41,11 @@ Accept__14CScriptCounterFR8IVisitor: /* 8009E400 0009B360 7C 04 03 78 */ mr r4, r0 /* 8009E404 0009B364 81 8C 00 24 */ lwz r12, 0x24(r12) /* 8009E408 0009B368 7D 89 03 A6 */ mtctr r12 -/* 8009E40C 0009B36C 4E 80 04 21 */ bctrl +/* 8009E40C 0009B36C 4E 80 04 21 */ bctrl /* 8009E410 0009B370 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009E414 0009B374 7C 08 03 A6 */ mtlr r0 /* 8009E418 0009B378 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009E41C 0009B37C 4E 80 00 20 */ blr +/* 8009E41C 0009B37C 4E 80 00 20 */ blr .global AcceptScriptMsg__14CScriptCounterF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__14CScriptCounterF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -68,7 +68,7 @@ AcceptScriptMsg__14CScriptCounterF20EScriptObjectMessage9TUniqueIdR13CStateManag /* 8009E460 0009B3C0 38 84 AF 10 */ addi r4, r4, lbl_803DAF10@l /* 8009E464 0009B3C4 7C 04 00 2E */ lwzx r0, r4, r0 /* 8009E468 0009B3C8 7C 09 03 A6 */ mtctr r0 -/* 8009E46C 0009B3CC 4E 80 04 20 */ bctr +/* 8009E46C 0009B3CC 4E 80 04 20 */ bctr .global lbl_8009E470 lbl_8009E470: /* 8009E470 0009B3D0 88 1C 00 30 */ lbz r0, 0x30(r28) @@ -174,7 +174,7 @@ lbl_8009E5AC: /* 8009E5D8 0009B538 83 81 00 10 */ lwz r28, 0x10(r1) /* 8009E5DC 0009B53C 7C 08 03 A6 */ mtlr r0 /* 8009E5E0 0009B540 38 21 00 20 */ addi r1, r1, 0x20 -/* 8009E5E4 0009B544 4E 80 00 20 */ blr +/* 8009E5E4 0009B544 4E 80 00 20 */ blr .global __dt__14CScriptCounterFv __dt__14CScriptCounterFv: @@ -202,7 +202,7 @@ lbl_8009E62C: /* 8009E638 0009B598 83 C1 00 08 */ lwz r30, 8(r1) /* 8009E63C 0009B59C 7C 08 03 A6 */ mtlr r0 /* 8009E640 0009B5A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009E644 0009B5A4 4E 80 00 20 */ blr +/* 8009E644 0009B5A4 4E 80 00 20 */ blr .global "__ct__14CScriptCounterF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoiibb" "__ct__14CScriptCounterF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoiibb": diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCoverPoint.s b/asm/MetroidPrime/ScriptObjects/CScriptCoverPoint.s index 4309735d..64a2172b 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCoverPoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCoverPoint.s @@ -76,7 +76,7 @@ lbl_8012D360: /* 8012D36C 0012A2CC 83 C1 00 08 */ lwz r30, 8(r1) /* 8012D370 0012A2D0 7C 08 03 A6 */ mtlr r0 /* 8012D374 0012A2D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8012D378 0012A2D8 4E 80 00 20 */ blr +/* 8012D378 0012A2D8 4E 80 00 20 */ blr .global GetTouchBounds__17CScriptCoverPointCFv GetTouchBounds__17CScriptCoverPointCFv: @@ -84,9 +84,9 @@ GetTouchBounds__17CScriptCoverPointCFv: /* 8012D380 0012A2E0 98 03 00 18 */ stb r0, 0x18(r3) /* 8012D384 0012A2E4 88 04 01 18 */ lbz r0, 0x118(r4) /* 8012D388 0012A2E8 28 00 00 00 */ cmplwi r0, 0 -/* 8012D38C 0012A2EC 4D 82 00 20 */ beqlr +/* 8012D38C 0012A2EC 4D 82 00 20 */ beqlr /* 8012D390 0012A2F0 28 03 00 00 */ cmplwi r3, 0 -/* 8012D394 0012A2F4 4D 82 00 20 */ beqlr +/* 8012D394 0012A2F4 4D 82 00 20 */ beqlr /* 8012D398 0012A2F8 C0 04 01 00 */ lfs f0, 0x100(r4) /* 8012D39C 0012A2FC D0 03 00 00 */ stfs f0, 0(r3) /* 8012D3A0 0012A300 C0 04 01 04 */ lfs f0, 0x104(r4) @@ -99,25 +99,25 @@ GetTouchBounds__17CScriptCoverPointCFv: /* 8012D3BC 0012A31C D0 03 00 10 */ stfs f0, 0x10(r3) /* 8012D3C0 0012A320 C0 04 01 14 */ lfs f0, 0x114(r4) /* 8012D3C4 0012A324 D0 03 00 14 */ stfs f0, 0x14(r3) -/* 8012D3C8 0012A328 4E 80 00 20 */ blr +/* 8012D3C8 0012A328 4E 80 00 20 */ blr .global Render__17CScriptCoverPointCFRC13CStateManager Render__17CScriptCoverPointCFRC13CStateManager: -/* 8012D3CC 0012A32C 4E 80 00 20 */ blr +/* 8012D3CC 0012A32C 4E 80 00 20 */ blr .global AddToRenderer__17CScriptCoverPointCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__17CScriptCoverPointCFRC14CFrustumPlanesRC13CStateManager: -/* 8012D3D0 0012A330 4E 80 00 20 */ blr +/* 8012D3D0 0012A330 4E 80 00 20 */ blr .global Think__17CScriptCoverPointFfR13CStateManager Think__17CScriptCoverPointFfR13CStateManager: /* 8012D3D4 0012A334 C0 43 01 1C */ lfs f2, 0x11c(r3) /* 8012D3D8 0012A338 C0 02 98 98 */ lfs f0, lbl_805AB5B8@sda21(r2) /* 8012D3DC 0012A33C FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8012D3E0 0012A340 4C 81 00 20 */ blelr +/* 8012D3E0 0012A340 4C 81 00 20 */ blelr /* 8012D3E4 0012A344 EC 02 08 28 */ fsubs f0, f2, f1 /* 8012D3E8 0012A348 D0 03 01 1C */ stfs f0, 0x11c(r3) -/* 8012D3EC 0012A34C 4E 80 00 20 */ blr +/* 8012D3EC 0012A34C 4E 80 00 20 */ blr .global SetInUse__17CScriptCoverPointFb SetInUse__17CScriptCoverPointFb: @@ -126,10 +126,10 @@ SetInUse__17CScriptCoverPointFb: /* 8012D3F8 0012A358 98 03 00 F8 */ stb r0, 0xf8(r3) /* 8012D3FC 0012A35C 88 03 00 F8 */ lbz r0, 0xf8(r3) /* 8012D400 0012A360 54 00 D7 FF */ rlwinm. r0, r0, 0x1a, 0x1f, 0x1f -/* 8012D404 0012A364 4C 82 00 20 */ bnelr +/* 8012D404 0012A364 4C 82 00 20 */ bnelr /* 8012D408 0012A368 C0 03 00 F4 */ lfs f0, 0xf4(r3) /* 8012D40C 0012A36C D0 03 01 1C */ stfs f0, 0x11c(r3) -/* 8012D410 0012A370 4E 80 00 20 */ blr +/* 8012D410 0012A370 4E 80 00 20 */ blr .global GetInUse__17CScriptCoverPointCF9TUniqueId GetInUse__17CScriptCoverPointCF9TUniqueId: @@ -154,7 +154,7 @@ lbl_8012D458: /* 8012D458 0012A3B8 38 A0 00 01 */ li r5, 1 lbl_8012D45C: /* 8012D45C 0012A3BC 7C A3 2B 78 */ mr r3, r5 -/* 8012D460 0012A3C0 4E 80 00 20 */ blr +/* 8012D460 0012A3C0 4E 80 00 20 */ blr .global Blown__17CScriptCoverPointCFRC9CVector3f Blown__17CScriptCoverPointCFRC9CVector3f: @@ -254,47 +254,47 @@ lbl_8012D5B8: /* 8012D5D0 0012A530 83 A1 00 44 */ lwz r29, 0x44(r1) /* 8012D5D4 0012A534 7C 08 03 A6 */ mtlr r0 /* 8012D5D8 0012A538 38 21 00 60 */ addi r1, r1, 0x60 -/* 8012D5DC 0012A53C 4E 80 00 20 */ blr +/* 8012D5DC 0012A53C 4E 80 00 20 */ blr .global GetSinSqVerticalAngle__17CScriptCoverPointCFv GetSinSqVerticalAngle__17CScriptCoverPointCFv: /* 8012D5E0 0012A540 C0 03 00 F0 */ lfs f0, 0xf0(r3) /* 8012D5E4 0012A544 EC 20 00 32 */ fmuls f1, f0, f0 -/* 8012D5E8 0012A548 4E 80 00 20 */ blr +/* 8012D5E8 0012A548 4E 80 00 20 */ blr .global GetCosHorizontalAngle__17CScriptCoverPointCFv GetCosHorizontalAngle__17CScriptCoverPointCFv: /* 8012D5EC 0012A54C C0 23 00 EC */ lfs f1, 0xec(r3) -/* 8012D5F0 0012A550 4E 80 00 20 */ blr +/* 8012D5F0 0012A550 4E 80 00 20 */ blr .global ShouldLandHere__17CScriptCoverPointCFv ShouldLandHere__17CScriptCoverPointCFv: /* 8012D5F4 0012A554 80 03 00 E8 */ lwz r0, 0xe8(r3) /* 8012D5F8 0012A558 54 03 DF FE */ rlwinm r3, r0, 0x1b, 0x1f, 0x1f -/* 8012D5FC 0012A55C 4E 80 00 20 */ blr +/* 8012D5FC 0012A55C 4E 80 00 20 */ blr .global ShouldWallHang__17CScriptCoverPointCFv ShouldWallHang__17CScriptCoverPointCFv: /* 8012D600 0012A560 80 03 00 E8 */ lwz r0, 0xe8(r3) /* 8012D604 0012A564 54 03 E7 FE */ rlwinm r3, r0, 0x1c, 0x1f, 0x1f -/* 8012D608 0012A568 4E 80 00 20 */ blr +/* 8012D608 0012A568 4E 80 00 20 */ blr .global ShouldStay__17CScriptCoverPointCFv ShouldStay__17CScriptCoverPointCFv: /* 8012D60C 0012A56C 80 03 00 E8 */ lwz r0, 0xe8(r3) /* 8012D610 0012A570 54 03 EF FE */ rlwinm r3, r0, 0x1d, 0x1f, 0x1f -/* 8012D614 0012A574 4E 80 00 20 */ blr +/* 8012D614 0012A574 4E 80 00 20 */ blr .global ShouldCrouch__17CScriptCoverPointCFv ShouldCrouch__17CScriptCoverPointCFv: /* 8012D618 0012A578 88 03 00 F8 */ lbz r0, 0xf8(r3) /* 8012D61C 0012A57C 54 03 CF FE */ rlwinm r3, r0, 0x19, 0x1f, 0x1f -/* 8012D620 0012A580 4E 80 00 20 */ blr +/* 8012D620 0012A580 4E 80 00 20 */ blr .global GetAttackDirection__17CScriptCoverPointCFv GetAttackDirection__17CScriptCoverPointCFv: /* 8012D624 0012A584 80 63 00 E8 */ lwz r3, 0xe8(r3) -/* 8012D628 0012A588 4E 80 00 20 */ blr +/* 8012D628 0012A588 4E 80 00 20 */ blr .global AcceptScriptMsg__17CScriptCoverPointF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__17CScriptCoverPointF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -346,7 +346,7 @@ lbl_8012D6C0: /* 8012D6CC 0012A62C 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8012D6D0 0012A630 7C 08 03 A6 */ mtlr r0 /* 8012D6D4 0012A634 38 21 00 30 */ addi r1, r1, 0x30 -/* 8012D6D8 0012A638 4E 80 00 20 */ blr +/* 8012D6D8 0012A638 4E 80 00 20 */ blr .global Accept__17CScriptCoverPointFR8IVisitor Accept__17CScriptCoverPointFR8IVisitor: @@ -359,11 +359,11 @@ Accept__17CScriptCoverPointFR8IVisitor: /* 8012D6F4 0012A654 7C 04 03 78 */ mr r4, r0 /* 8012D6F8 0012A658 81 8C 00 74 */ lwz r12, 0x74(r12) /* 8012D6FC 0012A65C 7D 89 03 A6 */ mtctr r12 -/* 8012D700 0012A660 4E 80 04 21 */ bctrl +/* 8012D700 0012A660 4E 80 04 21 */ bctrl /* 8012D704 0012A664 80 01 00 14 */ lwz r0, 0x14(r1) /* 8012D708 0012A668 7C 08 03 A6 */ mtlr r0 /* 8012D70C 0012A66C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8012D710 0012A670 4E 80 00 20 */ blr +/* 8012D710 0012A670 4E 80 00 20 */ blr .global "__ct__17CScriptCoverPointF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fbUibfff" "__ct__17CScriptCoverPointF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fbUibfff": diff --git a/asm/MetroidPrime/ScriptObjects/CScriptDamageableTrigger.s b/asm/MetroidPrime/ScriptObjects/CScriptDamageableTrigger.s index b1eb3e90..e73c138c 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptDamageableTrigger.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptDamageableTrigger.s @@ -81,7 +81,7 @@ lbl_805A74D0: # ROM: 0x3F4E70 .4byte 0x00000038 .4byte 0 - + .section .text, "ax" .global Accept__24CScriptDamageableTriggerFR8IVisitor @@ -95,11 +95,11 @@ Accept__24CScriptDamageableTriggerFR8IVisitor: /* 800FA63C 000F759C 7C 04 03 78 */ mr r4, r0 /* 800FA640 000F75A0 81 8C 00 08 */ lwz r12, 8(r12) /* 800FA644 000F75A4 7D 89 03 A6 */ mtctr r12 -/* 800FA648 000F75A8 4E 80 04 21 */ bctrl +/* 800FA648 000F75A8 4E 80 04 21 */ bctrl /* 800FA64C 000F75AC 80 01 00 14 */ lwz r0, 0x14(r1) /* 800FA650 000F75B0 7C 08 03 A6 */ mtlr r0 /* 800FA654 000F75B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800FA658 000F75B8 4E 80 00 20 */ blr +/* 800FA658 000F75B8 4E 80 00 20 */ blr .global GetCollisionResponseType__24CScriptDamageableTriggerCFRC9CVector3fRC9CVector3fRC11CWeaponModei GetCollisionResponseType__24CScriptDamageableTriggerCFRC9CVector3fRC9CVector3fRC11CWeaponModei: @@ -118,7 +118,7 @@ lbl_800FA688: /* 800FA688 000F75E8 80 01 00 14 */ lwz r0, 0x14(r1) /* 800FA68C 000F75EC 7C 08 03 A6 */ mtlr r0 /* 800FA690 000F75F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800FA694 000F75F4 4E 80 00 20 */ blr +/* 800FA694 000F75F4 4E 80 00 20 */ blr .global Render__24CScriptDamageableTriggerCFRC13CStateManager Render__24CScriptDamageableTriggerCFRC13CStateManager: @@ -214,7 +214,7 @@ Render__24CScriptDamageableTriggerCFRC13CStateManager: /* 800FA7FC 000F775C C0 3E 01 E0 */ lfs f1, 0x1e0(r30) /* 800FA800 000F7760 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 800FA804 000F7764 7D 89 03 A6 */ mtctr r12 -/* 800FA808 000F7768 4E 80 04 21 */ bctrl +/* 800FA808 000F7768 4E 80 04 21 */ bctrl /* 800FA80C 000F776C 38 61 00 48 */ addi r3, r1, 0x48 /* 800FA810 000F7770 38 80 FF FF */ li r4, -1 /* 800FA814 000F7774 48 00 00 2D */ bl sub_800fa840 @@ -227,11 +227,11 @@ lbl_800FA818: /* 800FA82C 000F778C 83 C1 01 48 */ lwz r30, 0x148(r1) /* 800FA830 000F7790 7C 08 03 A6 */ mtlr r0 /* 800FA834 000F7794 38 21 01 50 */ addi r1, r1, 0x150 -/* 800FA838 000F7798 4E 80 00 20 */ blr +/* 800FA838 000F7798 4E 80 00 20 */ blr .global "Render__11CFluidPlaneCFRC13CStateManagerRC6CAABoxRC12CTransform4fRC12CTransform4fbRC14CFrustumPlanesRCQ24rstl33optional_object<14CRippleManager>9TUniqueIdPCbiiRC9CVector3f" "Render__11CFluidPlaneCFRC13CStateManagerRC6CAABoxRC12CTransform4fRC12CTransform4fbRC14CFrustumPlanesRCQ24rstl33optional_object<14CRippleManager>9TUniqueIdPCbiiRC9CVector3f": -/* 800FA83C 000F779C 4E 80 00 20 */ blr +/* 800FA83C 000F779C 4E 80 00 20 */ blr .global sub_800fa840 sub_800fa840: @@ -255,7 +255,7 @@ lbl_800FA874: /* 800FA880 000F77E0 83 C1 00 08 */ lwz r30, 8(r1) /* 800FA884 000F77E4 7C 08 03 A6 */ mtlr r0 /* 800FA888 000F77E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800FA88C 000F77EC 4E 80 00 20 */ blr +/* 800FA88C 000F77EC 4E 80 00 20 */ blr .global sub_800fa890 sub_800fa890: @@ -275,7 +275,7 @@ lbl_800FA8B4: /* 800FA8C0 000F7820 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800FA8C4 000F7824 7C 08 03 A6 */ mtlr r0 /* 800FA8C8 000F7828 38 21 00 10 */ addi r1, r1, 0x10 -/* 800FA8CC 000F782C 4E 80 00 20 */ blr +/* 800FA8CC 000F782C 4E 80 00 20 */ blr .global sub_800fa8d0 sub_800fa8d0: @@ -308,7 +308,7 @@ lbl_800FA92C: /* 800FA92C 000F788C 80 01 00 24 */ lwz r0, 0x24(r1) /* 800FA930 000F7890 7C 08 03 A6 */ mtlr r0 /* 800FA934 000F7894 38 21 00 20 */ addi r1, r1, 0x20 -/* 800FA938 000F7898 4E 80 00 20 */ blr +/* 800FA938 000F7898 4E 80 00 20 */ blr .global AddToRenderer__24CScriptDamageableTriggerCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__24CScriptDamageableTriggerCFRC14CFrustumPlanesRC13CStateManager: @@ -339,7 +339,7 @@ AddToRenderer__24CScriptDamageableTriggerCFRC14CFrustumPlanesRC13CStateManager: /* 800FA99C 000F78FC 81 9E 00 00 */ lwz r12, 0(r30) /* 800FA9A0 000F7900 81 8C 00 64 */ lwz r12, 0x64(r12) /* 800FA9A4 000F7904 7D 89 03 A6 */ mtctr r12 -/* 800FA9A8 000F7908 4E 80 04 21 */ bctrl +/* 800FA9A8 000F7908 4E 80 04 21 */ bctrl /* 800FA9AC 000F790C 7F C3 F3 78 */ mr r3, r30 /* 800FA9B0 000F7910 7F E4 FB 78 */ mr r4, r31 /* 800FA9B4 000F7914 38 A1 00 08 */ addi r5, r1, 8 @@ -351,7 +351,7 @@ lbl_800FA9C0: /* 800FA9C8 000F7928 83 C1 00 38 */ lwz r30, 0x38(r1) /* 800FA9CC 000F792C 7C 08 03 A6 */ mtlr r0 /* 800FA9D0 000F7930 38 21 00 40 */ addi r1, r1, 0x40 -/* 800FA9D4 000F7934 4E 80 00 20 */ blr +/* 800FA9D4 000F7934 4E 80 00 20 */ blr .global PreRender__24CScriptDamageableTriggerFR13CStateManagerRC14CFrustumPlanes PreRender__24CScriptDamageableTriggerFR13CStateManagerRC14CFrustumPlanes: @@ -457,17 +457,17 @@ lbl_800FAB34: /* 800FAB40 000F7AA0 83 A1 00 44 */ lwz r29, 0x44(r1) /* 800FAB44 000F7AA4 7C 08 03 A6 */ mtlr r0 /* 800FAB48 000F7AA8 38 21 00 50 */ addi r1, r1, 0x50 -/* 800FAB4C 000F7AAC 4E 80 00 20 */ blr +/* 800FAB4C 000F7AAC 4E 80 00 20 */ blr .global GetDamageVulnerability__24CScriptDamageableTriggerCFv GetDamageVulnerability__24CScriptDamageableTriggerCFv: /* 800FAB50 000F7AB0 38 63 01 74 */ addi r3, r3, 0x174 -/* 800FAB54 000F7AB4 4E 80 00 20 */ blr +/* 800FAB54 000F7AB4 4E 80 00 20 */ blr .global GetHealthInfo__24CScriptDamageableTriggerCFRC13CStateManager GetHealthInfo__24CScriptDamageableTriggerCFRC13CStateManager: /* 800FAB58 000F7AB8 38 63 01 6C */ addi r3, r3, 0x16c -/* 800FAB5C 000F7ABC 4E 80 00 20 */ blr +/* 800FAB5C 000F7ABC 4E 80 00 20 */ blr .global Think__24CScriptDamageableTriggerFfR13CStateManager Think__24CScriptDamageableTriggerFfR13CStateManager: @@ -520,7 +520,7 @@ lbl_800FABD4: /* 800FAC10 000F7B70 81 9E 00 00 */ lwz r12, 0(r30) /* 800FAC14 000F7B74 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 800FAC18 000F7B78 7D 89 03 A6 */ mtctr r12 -/* 800FAC1C 000F7B7C 4E 80 04 21 */ bctrl +/* 800FAC1C 000F7B7C 4E 80 04 21 */ bctrl /* 800FAC20 000F7B80 83 BE 00 2C */ lwz r29, 0x2c(r30) /* 800FAC24 000F7B84 48 00 00 78 */ b lbl_800FAC9C lbl_800FAC28: @@ -551,7 +551,7 @@ lbl_800FAC28: /* 800FAC88 000F7BE8 38 80 00 00 */ li r4, 0 /* 800FAC8C 000F7BEC 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 800FAC90 000F7BF0 7D 89 03 A6 */ mtctr r12 -/* 800FAC94 000F7BF4 4E 80 04 21 */ bctrl +/* 800FAC94 000F7BF4 4E 80 04 21 */ bctrl lbl_800FAC98: /* 800FAC98 000F7BF8 3B BD 00 0C */ addi r29, r29, 0xc lbl_800FAC9C: @@ -620,7 +620,7 @@ lbl_800FAD70: /* 800FAD84 000F7CE4 83 A1 00 34 */ lwz r29, 0x34(r1) /* 800FAD88 000F7CE8 7C 08 03 A6 */ mtlr r0 /* 800FAD8C 000F7CEC 38 21 00 50 */ addi r1, r1, 0x50 -/* 800FAD90 000F7CF0 4E 80 00 20 */ blr +/* 800FAD90 000F7CF0 4E 80 00 20 */ blr .global SetLinkedObjectAlpha__24CScriptDamageableTriggerFfR13CStateManager SetLinkedObjectAlpha__24CScriptDamageableTriggerFfR13CStateManager: @@ -668,7 +668,7 @@ lbl_800FADC4: /* 800FAE34 000F7D94 81 9B 00 00 */ lwz r12, 0(r27) /* 800FAE38 000F7D98 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 800FAE3C 000F7D9C 7D 89 03 A6 */ mtctr r12 -/* 800FAE40 000F7DA0 4E 80 04 21 */ bctrl +/* 800FAE40 000F7DA0 4E 80 04 21 */ bctrl lbl_800FAE44: /* 800FAE44 000F7DA4 C0 22 93 48 */ lfs f1, lbl_805AB068@sda21(r2) /* 800FAE48 000F7DA8 38 60 00 05 */ li r3, 5 @@ -705,7 +705,7 @@ lbl_800FAE98: /* 800FAEBC 000F7E1C 80 01 00 54 */ lwz r0, 0x54(r1) /* 800FAEC0 000F7E20 7C 08 03 A6 */ mtlr r0 /* 800FAEC4 000F7E24 38 21 00 50 */ addi r1, r1, 0x50 -/* 800FAEC8 000F7E28 4E 80 00 20 */ blr +/* 800FAEC8 000F7E28 4E 80 00 20 */ blr .global GetPuddleAlphaScale__24CScriptDamageableTriggerCFv GetPuddleAlphaScale__24CScriptDamageableTriggerCFv: @@ -720,19 +720,19 @@ GetPuddleAlphaScale__24CScriptDamageableTriggerCFv: /* 800FAEEC 000F7E4C EC 01 00 24 */ fdivs f0, f1, f0 /* 800FAEF0 000F7E50 C0 22 93 48 */ lfs f1, lbl_805AB068@sda21(r2) /* 800FAEF4 000F7E54 EC 21 00 28 */ fsubs f1, f1, f0 -/* 800FAEF8 000F7E58 4E 80 00 20 */ blr +/* 800FAEF8 000F7E58 4E 80 00 20 */ blr lbl_800FAEFC: /* 800FAEFC 000F7E5C EC 21 00 24 */ fdivs f1, f1, f0 -/* 800FAF00 000F7E60 4E 80 00 20 */ blr +/* 800FAF00 000F7E60 4E 80 00 20 */ blr lbl_800FAF04: /* 800FAF04 000F7E64 88 03 03 00 */ lbz r0, 0x300(r3) /* 800FAF08 000F7E68 54 00 D7 FF */ rlwinm. r0, r0, 0x1a, 0x1f, 0x1f /* 800FAF0C 000F7E6C 41 82 00 0C */ beq lbl_800FAF18 /* 800FAF10 000F7E70 C0 22 93 38 */ lfs f1, lbl_805AB058@sda21(r2) -/* 800FAF14 000F7E74 4E 80 00 20 */ blr +/* 800FAF14 000F7E74 4E 80 00 20 */ blr lbl_800FAF18: /* 800FAF18 000F7E78 C0 22 93 48 */ lfs f1, lbl_805AB068@sda21(r2) -/* 800FAF1C 000F7E7C 4E 80 00 20 */ blr +/* 800FAF1C 000F7E7C 4E 80 00 20 */ blr .global AcceptScriptMsg__24CScriptDamageableTriggerF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__24CScriptDamageableTriggerF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -839,7 +839,7 @@ lbl_800FB078: /* 800FB088 000F7FE8 83 81 00 10 */ lwz r28, 0x10(r1) /* 800FB08C 000F7FEC 7C 08 03 A6 */ mtlr r0 /* 800FB090 000F7FF0 38 21 00 20 */ addi r1, r1, 0x20 -/* 800FB094 000F7FF4 4E 80 00 20 */ blr +/* 800FB094 000F7FF4 4E 80 00 20 */ blr .global GetTouchBounds__24CScriptDamageableTriggerCFv GetTouchBounds__24CScriptDamageableTriggerCFv: @@ -904,7 +904,7 @@ lbl_800FB174: /* 800FB178 000F80D8 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 800FB17C 000F80DC 7C 08 03 A6 */ mtlr r0 /* 800FB180 000F80E0 38 21 00 40 */ addi r1, r1, 0x40 -/* 800FB184 000F80E4 4E 80 00 20 */ blr +/* 800FB184 000F80E4 4E 80 00 20 */ blr .global __dt__24CScriptDamageableTriggerFv __dt__24CScriptDamageableTriggerFv: @@ -966,7 +966,7 @@ lbl_800FB240: /* 800FB24C 000F81AC 83 C1 00 08 */ lwz r30, 8(r1) /* 800FB250 000F81B0 7C 08 03 A6 */ mtlr r0 /* 800FB254 000F81B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800FB258 000F81B8 4E 80 00 20 */ blr +/* 800FB258 000F81B8 4E 80 00 20 */ blr .global "__ct__24CScriptDamageableTriggerF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC9CVector3fRC9CVector3fRC11CHealthInfoRC20CDamageVulnerabilityUiUiUiUiQ224CScriptDamageableTrigger9ECanOrbitbRC16CVisorParameters" "__ct__24CScriptDamageableTriggerF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC9CVector3fRC9CVector3fRC11CHealthInfoRC20CDamageVulnerabilityUiUiUiUiQ224CScriptDamageableTrigger9ECanOrbitbRC16CVisorParameters": diff --git a/asm/MetroidPrime/ScriptObjects/CScriptDebris.s b/asm/MetroidPrime/ScriptObjects/CScriptDebris.s index 3dedfbfc..244fb127 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptDebris.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptDebris.s @@ -203,7 +203,7 @@ lbl_800FB934: /* 800FB93C 000F889C 83 C1 00 08 */ lwz r30, 8(r1) /* 800FB940 000F88A0 7C 08 03 A6 */ mtlr r0 /* 800FB944 000F88A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800FB948 000F88A8 4E 80 00 20 */ blr +/* 800FB948 000F88A8 4E 80 00 20 */ blr .global Accept__13CScriptDebrisFR8IVisitor Accept__13CScriptDebrisFR8IVisitor: @@ -216,11 +216,11 @@ Accept__13CScriptDebrisFR8IVisitor: /* 800FB964 000F88C4 7C 04 03 78 */ mr r4, r0 /* 800FB968 000F88C8 81 8C 00 50 */ lwz r12, 0x50(r12) /* 800FB96C 000F88CC 7D 89 03 A6 */ mtctr r12 -/* 800FB970 000F88D0 4E 80 04 21 */ bctrl +/* 800FB970 000F88D0 4E 80 04 21 */ bctrl /* 800FB974 000F88D4 80 01 00 14 */ lwz r0, 0x14(r1) /* 800FB978 000F88D8 7C 08 03 A6 */ mtlr r0 /* 800FB97C 000F88DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800FB980 000F88E0 4E 80 00 20 */ blr +/* 800FB980 000F88E0 4E 80 00 20 */ blr .global AddToRenderer__13CScriptDebrisCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__13CScriptDebrisCFRC14CFrustumPlanesRC13CStateManager: @@ -248,7 +248,7 @@ lbl_800FB9D0: /* 800FB9D4 000F8934 81 83 00 00 */ lwz r12, 0(r3) /* 800FB9D8 000F8938 81 8C 00 34 */ lwz r12, 0x34(r12) /* 800FB9DC 000F893C 7D 89 03 A6 */ mtctr r12 -/* 800FB9E0 000F8940 4E 80 04 21 */ bctrl +/* 800FB9E0 000F8940 4E 80 04 21 */ bctrl lbl_800FB9E4: /* 800FB9E4 000F8944 80 9D 02 D8 */ lwz r4, 0x2d8(r29) /* 800FB9E8 000F8948 28 04 00 00 */ cmplwi r4, 0 @@ -265,7 +265,7 @@ lbl_800FBA0C: /* 800FBA10 000F8970 81 83 00 00 */ lwz r12, 0(r3) /* 800FBA14 000F8974 81 8C 00 34 */ lwz r12, 0x34(r12) /* 800FBA18 000F8978 7D 89 03 A6 */ mtctr r12 -/* 800FBA1C 000F897C 4E 80 04 21 */ bctrl +/* 800FBA1C 000F897C 4E 80 04 21 */ bctrl lbl_800FBA20: /* 800FBA20 000F8980 88 1D 02 81 */ lbz r0, 0x281(r29) /* 800FBA24 000F8984 54 00 F7 FF */ rlwinm. r0, r0, 0x1e, 0x1f, 0x1f @@ -275,7 +275,7 @@ lbl_800FBA20: /* 800FBA34 000F8994 81 83 00 00 */ lwz r12, 0(r3) /* 800FBA38 000F8998 81 8C 00 34 */ lwz r12, 0x34(r12) /* 800FBA3C 000F899C 7D 89 03 A6 */ mtctr r12 -/* 800FBA40 000F89A0 4E 80 04 21 */ bctrl +/* 800FBA40 000F89A0 4E 80 04 21 */ bctrl lbl_800FBA44: /* 800FBA44 000F89A4 80 9D 00 64 */ lwz r4, 0x64(r29) /* 800FBA48 000F89A8 38 60 00 00 */ li r3, 0 @@ -307,7 +307,7 @@ lbl_800FBA98: /* 800FBAA4 000F8A04 83 A1 00 14 */ lwz r29, 0x14(r1) /* 800FBAA8 000F8A08 7C 08 03 A6 */ mtlr r0 /* 800FBAAC 000F8A0C 38 21 00 20 */ addi r1, r1, 0x20 -/* 800FBAB0 000F8A10 4E 80 00 20 */ blr +/* 800FBAB0 000F8A10 4E 80 00 20 */ blr .global Render__13CScriptDebrisCFRC13CStateManager Render__13CScriptDebrisCFRC13CStateManager: @@ -318,7 +318,7 @@ Render__13CScriptDebrisCFRC13CStateManager: /* 800FBAC4 000F8A24 80 01 00 14 */ lwz r0, 0x14(r1) /* 800FBAC8 000F8A28 7C 08 03 A6 */ mtlr r0 /* 800FBACC 000F8A2C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800FBAD0 000F8A30 4E 80 00 20 */ blr +/* 800FBAD0 000F8A30 4E 80 00 20 */ blr .global PreRender__13CScriptDebrisFR13CStateManagerRC14CFrustumPlanes PreRender__13CScriptDebrisFR13CStateManagerRC14CFrustumPlanes: @@ -388,7 +388,7 @@ lbl_800FBB54: /* 800FBBC4 000F8B24 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 800FBBC8 000F8B28 7C 08 03 A6 */ mtlr r0 /* 800FBBCC 000F8B2C 38 21 00 30 */ addi r1, r1, 0x30 -/* 800FBBD0 000F8B30 4E 80 00 20 */ blr +/* 800FBBD0 000F8B30 4E 80 00 20 */ blr .global AcceptScriptMsg__13CScriptDebrisF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__13CScriptDebrisF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -635,7 +635,7 @@ lbl_800FBF70: /* 800FBF80 000F8EE0 38 80 00 01 */ li r4, 1 /* 800FBF84 000F8EE4 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 800FBF88 000F8EE8 7D 89 03 A6 */ mtctr r12 -/* 800FBF8C 000F8EEC 4E 80 04 21 */ bctrl +/* 800FBF8C 000F8EEC 4E 80 04 21 */ bctrl lbl_800FBF90: /* 800FBF90 000F8EF0 80 7C 02 D8 */ lwz r3, 0x2d8(r28) /* 800FBF94 000F8EF4 28 03 00 00 */ cmplwi r3, 0 @@ -644,7 +644,7 @@ lbl_800FBF90: /* 800FBFA0 000F8F00 38 80 00 01 */ li r4, 1 /* 800FBFA4 000F8F04 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 800FBFA8 000F8F08 7D 89 03 A6 */ mtctr r12 -/* 800FBFAC 000F8F0C 4E 80 04 21 */ bctrl +/* 800FBFAC 000F8F0C 4E 80 04 21 */ bctrl /* 800FBFB0 000F8F10 48 00 00 78 */ b lbl_800FC028 lbl_800FBFB4: /* 800FBFB4 000F8F14 88 1C 02 82 */ lbz r0, 0x282(r28) @@ -697,7 +697,7 @@ lbl_800FC028: /* 800FC06C 000F8FCC 83 81 00 A0 */ lwz r28, 0xa0(r1) /* 800FC070 000F8FD0 7C 08 03 A6 */ mtlr r0 /* 800FC074 000F8FD4 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 800FC078 000F8FD8 4E 80 00 20 */ blr +/* 800FC078 000F8FD8 4E 80 00 20 */ blr .global GetTouchBounds__13CScriptDebrisCFv GetTouchBounds__13CScriptDebrisCFv: @@ -736,7 +736,7 @@ lbl_800FC0F0: /* 800FC0F4 000F9054 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 800FC0F8 000F9058 7C 08 03 A6 */ mtlr r0 /* 800FC0FC 000F905C 38 21 00 30 */ addi r1, r1, 0x30 -/* 800FC100 000F9060 4E 80 00 20 */ blr +/* 800FC100 000F9060 4E 80 00 20 */ blr .global Touch__13CScriptDebrisFR6CActorR13CStateManager Touch__13CScriptDebrisFR6CActorR13CStateManager: @@ -772,7 +772,7 @@ lbl_800FC16C: /* 800FC174 000F90D4 83 C1 00 18 */ lwz r30, 0x18(r1) /* 800FC178 000F90D8 7C 08 03 A6 */ mtlr r0 /* 800FC17C 000F90DC 38 21 00 20 */ addi r1, r1, 0x20 -/* 800FC180 000F90E0 4E 80 00 20 */ blr +/* 800FC180 000F90E0 4E 80 00 20 */ blr .global Think__13CScriptDebrisFfR13CStateManager Think__13CScriptDebrisFfR13CStateManager: @@ -807,7 +807,7 @@ Think__13CScriptDebrisFfR13CStateManager: /* 800FC1F4 000F9154 38 80 00 00 */ li r4, 0 /* 800FC1F8 000F9158 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 800FC1FC 000F915C 7D 89 03 A6 */ mtctr r12 -/* 800FC200 000F9160 4E 80 04 21 */ bctrl +/* 800FC200 000F9160 4E 80 04 21 */ bctrl /* 800FC204 000F9164 48 00 01 78 */ b lbl_800FC37C lbl_800FC208: /* 800FC208 000F9168 88 1D 02 81 */ lbz r0, 0x281(r29) @@ -823,7 +823,7 @@ lbl_800FC208: /* 800FC230 000F9190 81 83 00 00 */ lwz r12, 0(r3) /* 800FC234 000F9194 81 8C 00 20 */ lwz r12, 0x20(r12) /* 800FC238 000F9198 7D 89 03 A6 */ mtctr r12 -/* 800FC23C 000F919C 4E 80 04 21 */ bctrl +/* 800FC23C 000F919C 4E 80 04 21 */ bctrl /* 800FC240 000F91A0 48 00 00 30 */ b lbl_800FC270 lbl_800FC244: /* 800FC244 000F91A4 C0 5D 00 60 */ lfs f2, 0x60(r29) @@ -836,7 +836,7 @@ lbl_800FC244: /* 800FC260 000F91C0 81 83 00 00 */ lwz r12, 0(r3) /* 800FC264 000F91C4 81 8C 00 18 */ lwz r12, 0x18(r12) /* 800FC268 000F91C8 7D 89 03 A6 */ mtctr r12 -/* 800FC26C 000F91CC 4E 80 04 21 */ bctrl +/* 800FC26C 000F91CC 4E 80 04 21 */ bctrl lbl_800FC270: /* 800FC270 000F91D0 88 1D 02 83 */ lbz r0, 0x283(r29) /* 800FC274 000F91D4 7C 00 07 74 */ extsb r0, r0 @@ -893,7 +893,7 @@ lbl_800FC2FC: /* 800FC338 000F9298 81 9C 00 00 */ lwz r12, 0(r28) /* 800FC33C 000F929C 81 8C 00 14 */ lwz r12, 0x14(r12) /* 800FC340 000F92A0 7D 89 03 A6 */ mtctr r12 -/* 800FC344 000F92A4 4E 80 04 21 */ bctrl +/* 800FC344 000F92A4 4E 80 04 21 */ bctrl /* 800FC348 000F92A8 48 00 00 34 */ b lbl_800FC37C lbl_800FC34C: /* 800FC34C 000F92AC 2C 00 00 02 */ cmpwi r0, 2 @@ -907,7 +907,7 @@ lbl_800FC34C: /* 800FC36C 000F92CC 81 9C 00 00 */ lwz r12, 0(r28) /* 800FC370 000F92D0 81 8C 00 14 */ lwz r12, 0x14(r12) /* 800FC374 000F92D4 7D 89 03 A6 */ mtctr r12 -/* 800FC378 000F92D8 4E 80 04 21 */ bctrl +/* 800FC378 000F92D8 4E 80 04 21 */ bctrl lbl_800FC37C: /* 800FC37C 000F92DC 88 1D 02 81 */ lbz r0, 0x281(r29) /* 800FC380 000F92E0 54 00 DF FF */ rlwinm. r0, r0, 0x1b, 0x1f, 0x1f @@ -916,7 +916,7 @@ lbl_800FC37C: /* 800FC38C 000F92EC 81 83 00 00 */ lwz r12, 0(r3) /* 800FC390 000F92F0 81 8C 00 60 */ lwz r12, 0x60(r12) /* 800FC394 000F92F4 7D 89 03 A6 */ mtctr r12 -/* 800FC398 000F92F8 4E 80 04 21 */ bctrl +/* 800FC398 000F92F8 4E 80 04 21 */ bctrl /* 800FC39C 000F92FC 2C 03 00 00 */ cmpwi r3, 0 /* 800FC3A0 000F9300 41 82 00 08 */ beq lbl_800FC3A8 /* 800FC3A4 000F9304 3B E0 00 00 */ li r31, 0 @@ -934,7 +934,7 @@ lbl_800FC3C4: /* 800FC3CC 000F932C 81 83 00 00 */ lwz r12, 0(r3) /* 800FC3D0 000F9330 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800FC3D4 000F9334 7D 89 03 A6 */ mtctr r12 -/* 800FC3D8 000F9338 4E 80 04 21 */ bctrl +/* 800FC3D8 000F9338 4E 80 04 21 */ bctrl lbl_800FC3DC: /* 800FC3DC 000F933C 80 7D 02 D8 */ lwz r3, 0x2d8(r29) /* 800FC3E0 000F9340 28 03 00 00 */ cmplwi r3, 0 @@ -948,7 +948,7 @@ lbl_800FC3DC: /* 800FC400 000F9360 38 80 00 00 */ li r4, 0 /* 800FC404 000F9364 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 800FC408 000F9368 7D 89 03 A6 */ mtctr r12 -/* 800FC40C 000F936C 4E 80 04 21 */ bctrl +/* 800FC40C 000F936C 4E 80 04 21 */ bctrl /* 800FC410 000F9370 48 00 01 78 */ b lbl_800FC588 lbl_800FC414: /* 800FC414 000F9374 88 1D 02 81 */ lbz r0, 0x281(r29) @@ -964,7 +964,7 @@ lbl_800FC414: /* 800FC43C 000F939C 81 83 00 00 */ lwz r12, 0(r3) /* 800FC440 000F93A0 81 8C 00 20 */ lwz r12, 0x20(r12) /* 800FC444 000F93A4 7D 89 03 A6 */ mtctr r12 -/* 800FC448 000F93A8 4E 80 04 21 */ bctrl +/* 800FC448 000F93A8 4E 80 04 21 */ bctrl /* 800FC44C 000F93AC 48 00 00 30 */ b lbl_800FC47C lbl_800FC450: /* 800FC450 000F93B0 C0 5D 00 60 */ lfs f2, 0x60(r29) @@ -977,7 +977,7 @@ lbl_800FC450: /* 800FC46C 000F93CC 81 83 00 00 */ lwz r12, 0(r3) /* 800FC470 000F93D0 81 8C 00 18 */ lwz r12, 0x18(r12) /* 800FC474 000F93D4 7D 89 03 A6 */ mtctr r12 -/* 800FC478 000F93D8 4E 80 04 21 */ bctrl +/* 800FC478 000F93D8 4E 80 04 21 */ bctrl lbl_800FC47C: /* 800FC47C 000F93DC 88 1D 02 84 */ lbz r0, 0x284(r29) /* 800FC480 000F93E0 7C 00 07 74 */ extsb r0, r0 @@ -1034,7 +1034,7 @@ lbl_800FC508: /* 800FC544 000F94A4 81 9C 00 00 */ lwz r12, 0(r28) /* 800FC548 000F94A8 81 8C 00 14 */ lwz r12, 0x14(r12) /* 800FC54C 000F94AC 7D 89 03 A6 */ mtctr r12 -/* 800FC550 000F94B0 4E 80 04 21 */ bctrl +/* 800FC550 000F94B0 4E 80 04 21 */ bctrl /* 800FC554 000F94B4 48 00 00 34 */ b lbl_800FC588 lbl_800FC558: /* 800FC558 000F94B8 2C 00 00 02 */ cmpwi r0, 2 @@ -1048,7 +1048,7 @@ lbl_800FC558: /* 800FC578 000F94D8 81 9C 00 00 */ lwz r12, 0(r28) /* 800FC57C 000F94DC 81 8C 00 14 */ lwz r12, 0x14(r12) /* 800FC580 000F94E0 7D 89 03 A6 */ mtctr r12 -/* 800FC584 000F94E4 4E 80 04 21 */ bctrl +/* 800FC584 000F94E4 4E 80 04 21 */ bctrl lbl_800FC588: /* 800FC588 000F94E8 88 1D 02 81 */ lbz r0, 0x281(r29) /* 800FC58C 000F94EC 54 00 EF FF */ rlwinm. r0, r0, 0x1d, 0x1f, 0x1f @@ -1057,7 +1057,7 @@ lbl_800FC588: /* 800FC598 000F94F8 81 83 00 00 */ lwz r12, 0(r3) /* 800FC59C 000F94FC 81 8C 00 60 */ lwz r12, 0x60(r12) /* 800FC5A0 000F9500 7D 89 03 A6 */ mtctr r12 -/* 800FC5A4 000F9504 4E 80 04 21 */ bctrl +/* 800FC5A4 000F9504 4E 80 04 21 */ bctrl /* 800FC5A8 000F9508 2C 03 00 00 */ cmpwi r3, 0 /* 800FC5AC 000F950C 41 82 00 08 */ beq lbl_800FC5B4 /* 800FC5B0 000F9510 3B E0 00 00 */ li r31, 0 @@ -1075,7 +1075,7 @@ lbl_800FC5D0: /* 800FC5D8 000F9538 81 83 00 00 */ lwz r12, 0(r3) /* 800FC5DC 000F953C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800FC5E0 000F9540 7D 89 03 A6 */ mtctr r12 -/* 800FC5E4 000F9544 4E 80 04 21 */ bctrl +/* 800FC5E4 000F9544 4E 80 04 21 */ bctrl lbl_800FC5E8: /* 800FC5E8 000F9548 80 7D 02 DC */ lwz r3, 0x2dc(r29) /* 800FC5EC 000F954C 28 03 00 00 */ cmplwi r3, 0 @@ -1098,7 +1098,7 @@ lbl_800FC5E8: /* 800FC630 000F9590 81 83 00 00 */ lwz r12, 0(r3) /* 800FC634 000F9594 81 8C 00 20 */ lwz r12, 0x20(r12) /* 800FC638 000F9598 7D 89 03 A6 */ mtctr r12 -/* 800FC63C 000F959C 4E 80 04 21 */ bctrl +/* 800FC63C 000F959C 4E 80 04 21 */ bctrl /* 800FC640 000F95A0 88 1D 02 85 */ lbz r0, 0x285(r29) /* 800FC644 000F95A4 7C 00 07 74 */ extsb r0, r0 /* 800FC648 000F95A8 2C 00 00 01 */ cmpwi r0, 1 @@ -1154,7 +1154,7 @@ lbl_800FC6CC: /* 800FC708 000F9668 81 9C 00 00 */ lwz r12, 0(r28) /* 800FC70C 000F966C 81 8C 00 14 */ lwz r12, 0x14(r12) /* 800FC710 000F9670 7D 89 03 A6 */ mtctr r12 -/* 800FC714 000F9674 4E 80 04 21 */ bctrl +/* 800FC714 000F9674 4E 80 04 21 */ bctrl /* 800FC718 000F9678 48 00 01 08 */ b lbl_800FC820 lbl_800FC71C: /* 800FC71C 000F967C 2C 00 00 02 */ cmpwi r0, 2 @@ -1168,7 +1168,7 @@ lbl_800FC71C: /* 800FC73C 000F969C 81 9C 00 00 */ lwz r12, 0(r28) /* 800FC740 000F96A0 81 8C 00 14 */ lwz r12, 0x14(r12) /* 800FC744 000F96A4 7D 89 03 A6 */ mtctr r12 -/* 800FC748 000F96A8 4E 80 04 21 */ bctrl +/* 800FC748 000F96A8 4E 80 04 21 */ bctrl /* 800FC74C 000F96AC 48 00 00 D4 */ b lbl_800FC820 lbl_800FC750: /* 800FC750 000F96B0 2C 00 00 03 */ cmpwi r0, 3 @@ -1224,7 +1224,7 @@ lbl_800FC7F8: /* 800FC810 000F9770 81 83 00 00 */ lwz r12, 0(r3) /* 800FC814 000F9774 81 8C 00 14 */ lwz r12, 0x14(r12) /* 800FC818 000F9778 7D 89 03 A6 */ mtctr r12 -/* 800FC81C 000F977C 4E 80 04 21 */ bctrl +/* 800FC81C 000F977C 4E 80 04 21 */ bctrl lbl_800FC820: /* 800FC820 000F9780 88 1D 02 81 */ lbz r0, 0x281(r29) /* 800FC824 000F9784 38 60 00 01 */ li r3, 1 @@ -1239,12 +1239,12 @@ lbl_800FC830: /* 800FC844 000F97A4 81 83 00 00 */ lwz r12, 0(r3) /* 800FC848 000F97A8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800FC84C 000F97AC 7D 89 03 A6 */ mtctr r12 -/* 800FC850 000F97B0 4E 80 04 21 */ bctrl +/* 800FC850 000F97B0 4E 80 04 21 */ bctrl /* 800FC854 000F97B4 80 7D 02 DC */ lwz r3, 0x2dc(r29) /* 800FC858 000F97B8 81 83 00 00 */ lwz r12, 0(r3) /* 800FC85C 000F97BC 81 8C 00 58 */ lwz r12, 0x58(r12) /* 800FC860 000F97C0 7D 89 03 A6 */ mtctr r12 -/* 800FC864 000F97C4 4E 80 04 21 */ bctrl +/* 800FC864 000F97C4 4E 80 04 21 */ bctrl /* 800FC868 000F97C8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800FC86C 000F97CC 40 82 00 08 */ bne lbl_800FC874 /* 800FC870 000F97D0 3B E0 00 00 */ li r31, 0 @@ -1454,7 +1454,7 @@ lbl_800FCB5C: /* 800FCB68 000F9AC8 80 01 02 D4 */ lwz r0, 0x2d4(r1) /* 800FCB6C 000F9ACC 7C 08 03 A6 */ mtlr r0 /* 800FCB70 000F9AD0 38 21 02 D0 */ addi r1, r1, 0x2d0 -/* 800FCB74 000F9AD4 4E 80 00 20 */ blr +/* 800FCB74 000F9AD4 4E 80 00 20 */ blr .global "GetAverage__21TReservedAverageCFv" "GetAverage__21TReservedAverageCFv": @@ -1483,12 +1483,12 @@ lbl_800FCBC4: /* 800FCBC8 000F9B28 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800FCBCC 000F9B2C 7C 08 03 A6 */ mtlr r0 /* 800FCBD0 000F9B30 38 21 00 10 */ addi r1, r1, 0x10 -/* 800FCBD4 000F9B34 4E 80 00 20 */ blr +/* 800FCBD4 000F9B34 4E 80 00 20 */ blr .global GetParticleCount__11CElementGenCFv GetParticleCount__11CElementGenCFv: /* 800FCBD8 000F9B38 80 63 02 5C */ lwz r3, 0x25c(r3) -/* 800FCBDC 000F9B3C 4E 80 00 20 */ blr +/* 800FCBDC 000F9B3C 4E 80 00 20 */ blr .global __dt__13CScriptDebrisFv __dt__13CScriptDebrisFv: @@ -1542,7 +1542,7 @@ lbl_800FCC70: /* 800FCC88 000F9BE8 38 80 00 01 */ li r4, 1 /* 800FCC8C 000F9BEC 81 8C 00 08 */ lwz r12, 8(r12) /* 800FCC90 000F9BF0 7D 89 03 A6 */ mtctr r12 -/* 800FCC94 000F9BF4 4E 80 04 21 */ bctrl +/* 800FCC94 000F9BF4 4E 80 04 21 */ bctrl lbl_800FCC98: /* 800FCC98 000F9BF8 34 1F 02 D8 */ addic. r0, r31, 0x2d8 /* 800FCC9C 000F9BFC 41 82 00 24 */ beq lbl_800FCCC0 @@ -1553,7 +1553,7 @@ lbl_800FCC98: /* 800FCCB0 000F9C10 38 80 00 01 */ li r4, 1 /* 800FCCB4 000F9C14 81 8C 00 08 */ lwz r12, 8(r12) /* 800FCCB8 000F9C18 7D 89 03 A6 */ mtctr r12 -/* 800FCCBC 000F9C1C 4E 80 04 21 */ bctrl +/* 800FCCBC 000F9C1C 4E 80 04 21 */ bctrl lbl_800FCCC0: /* 800FCCC0 000F9C20 34 1F 02 D4 */ addic. r0, r31, 0x2d4 /* 800FCCC4 000F9C24 41 82 00 24 */ beq lbl_800FCCE8 @@ -1564,7 +1564,7 @@ lbl_800FCCC0: /* 800FCCD8 000F9C38 38 80 00 01 */ li r4, 1 /* 800FCCDC 000F9C3C 81 8C 00 08 */ lwz r12, 8(r12) /* 800FCCE0 000F9C40 7D 89 03 A6 */ mtctr r12 -/* 800FCCE4 000F9C44 4E 80 04 21 */ bctrl +/* 800FCCE4 000F9C44 4E 80 04 21 */ bctrl lbl_800FCCE8: /* 800FCCE8 000F9C48 7F E3 FB 78 */ mr r3, r31 /* 800FCCEC 000F9C4C 38 80 00 00 */ li r4, 0 @@ -1580,7 +1580,7 @@ lbl_800FCD04: /* 800FCD10 000F9C70 83 C1 00 08 */ lwz r30, 8(r1) /* 800FCD14 000F9C74 7C 08 03 A6 */ mtlr r0 /* 800FCD18 000F9C78 38 21 00 10 */ addi r1, r1, 0x10 -/* 800FCD1C 000F9C7C 4E 80 00 20 */ blr +/* 800FCD1C 000F9C7C 4E 80 00 20 */ blr .global "__ct__13CScriptDebrisF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC16CActorParametersfffffffffRC6CColorRC6CColorfRC9CVector3fRC9CVector3fffRC9CVector3fUiRC9CVector3fbbQ213CScriptDebris16EOrientationTypeUiRC9CVector3fbbQ213CScriptDebris16EOrientationTypeUiRC9CVector3fQ213CScriptDebris16EOrientationTypebbb" "__ct__13CScriptDebrisF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC16CActorParametersfffffffffRC6CColorRC6CColorfRC9CVector3fRC9CVector3fffRC9CVector3fUiRC9CVector3fbbQ213CScriptDebris16EOrientationTypeUiRC9CVector3fbbQ213CScriptDebris16EOrientationTypeUiRC9CVector3fQ213CScriptDebris16EOrientationTypebbb": @@ -1988,7 +1988,7 @@ lbl_800FD30C: /* 800FD340 000FA2A0 81 84 00 00 */ lwz r12, 0(r4) /* 800FD344 000FA2A4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800FD348 000FA2A8 7D 89 03 A6 */ mtctr r12 -/* 800FD34C 000FA2AC 4E 80 04 21 */ bctrl +/* 800FD34C 000FA2AC 4E 80 04 21 */ bctrl /* 800FD350 000FA2B0 38 61 00 80 */ addi r3, r1, 0x80 /* 800FD354 000FA2B4 38 81 00 54 */ addi r4, r1, 0x54 /* 800FD358 000FA2B8 48 24 3B 51 */ bl __ct__6CTokenFRC6CToken @@ -2021,7 +2021,7 @@ lbl_800FD3B0: /* 800FD3C0 000FA320 38 80 00 01 */ li r4, 1 /* 800FD3C4 000FA324 81 8C 00 08 */ lwz r12, 8(r12) /* 800FD3C8 000FA328 7D 89 03 A6 */ mtctr r12 -/* 800FD3CC 000FA32C 4E 80 04 21 */ bctrl +/* 800FD3CC 000FA32C 4E 80 04 21 */ bctrl lbl_800FD3D0: /* 800FD3D0 000FA330 7D E0 07 75 */ extsb. r0, r15 /* 800FD3D4 000FA334 91 D1 02 D4 */ stw r14, 0x2d4(r17) @@ -2035,7 +2035,7 @@ lbl_800FD3E8: /* 800FD3F0 000FA350 81 83 00 00 */ lwz r12, 0(r3) /* 800FD3F4 000FA354 81 8C 00 24 */ lwz r12, 0x24(r12) /* 800FD3F8 000FA358 7D 89 03 A6 */ mtctr r12 -/* 800FD3FC 000FA35C 4E 80 04 21 */ bctrl +/* 800FD3FC 000FA35C 4E 80 04 21 */ bctrl /* 800FD400 000FA360 38 61 00 80 */ addi r3, r1, 0x80 /* 800FD404 000FA364 38 80 00 00 */ li r4, 0 /* 800FD408 000FA368 48 24 3A 39 */ bl __dt__6CTokenFv @@ -2056,7 +2056,7 @@ lbl_800FD40C: /* 800FD440 000FA3A0 81 84 00 00 */ lwz r12, 0(r4) /* 800FD444 000FA3A4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800FD448 000FA3A8 7D 89 03 A6 */ mtctr r12 -/* 800FD44C 000FA3AC 4E 80 04 21 */ bctrl +/* 800FD44C 000FA3AC 4E 80 04 21 */ bctrl /* 800FD450 000FA3B0 38 61 00 78 */ addi r3, r1, 0x78 /* 800FD454 000FA3B4 38 81 00 3C */ addi r4, r1, 0x3c /* 800FD458 000FA3B8 48 24 3A 51 */ bl __ct__6CTokenFRC6CToken @@ -2089,7 +2089,7 @@ lbl_800FD4B0: /* 800FD4C0 000FA420 38 80 00 01 */ li r4, 1 /* 800FD4C4 000FA424 81 8C 00 08 */ lwz r12, 8(r12) /* 800FD4C8 000FA428 7D 89 03 A6 */ mtctr r12 -/* 800FD4CC 000FA42C 4E 80 04 21 */ bctrl +/* 800FD4CC 000FA42C 4E 80 04 21 */ bctrl lbl_800FD4D0: /* 800FD4D0 000FA430 7D E0 07 75 */ extsb. r0, r15 /* 800FD4D4 000FA434 91 D1 02 D8 */ stw r14, 0x2d8(r17) @@ -2103,7 +2103,7 @@ lbl_800FD4E8: /* 800FD4F0 000FA450 81 83 00 00 */ lwz r12, 0(r3) /* 800FD4F4 000FA454 81 8C 00 24 */ lwz r12, 0x24(r12) /* 800FD4F8 000FA458 7D 89 03 A6 */ mtctr r12 -/* 800FD4FC 000FA45C 4E 80 04 21 */ bctrl +/* 800FD4FC 000FA45C 4E 80 04 21 */ bctrl /* 800FD500 000FA460 38 61 00 78 */ addi r3, r1, 0x78 /* 800FD504 000FA464 38 80 00 00 */ li r4, 0 /* 800FD508 000FA468 48 24 39 39 */ bl __dt__6CTokenFv @@ -2124,7 +2124,7 @@ lbl_800FD50C: /* 800FD540 000FA4A0 81 84 00 00 */ lwz r12, 0(r4) /* 800FD544 000FA4A4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800FD548 000FA4A8 7D 89 03 A6 */ mtctr r12 -/* 800FD54C 000FA4AC 4E 80 04 21 */ bctrl +/* 800FD54C 000FA4AC 4E 80 04 21 */ bctrl /* 800FD550 000FA4B0 38 61 00 70 */ addi r3, r1, 0x70 /* 800FD554 000FA4B4 38 81 00 24 */ addi r4, r1, 0x24 /* 800FD558 000FA4B8 48 24 39 51 */ bl __ct__6CTokenFRC6CToken @@ -2157,7 +2157,7 @@ lbl_800FD5B0: /* 800FD5C0 000FA520 38 80 00 01 */ li r4, 1 /* 800FD5C4 000FA524 81 8C 00 08 */ lwz r12, 8(r12) /* 800FD5C8 000FA528 7D 89 03 A6 */ mtctr r12 -/* 800FD5CC 000FA52C 4E 80 04 21 */ bctrl +/* 800FD5CC 000FA52C 4E 80 04 21 */ bctrl lbl_800FD5D0: /* 800FD5D0 000FA530 7D E0 07 75 */ extsb. r0, r15 /* 800FD5D4 000FA534 91 D1 02 DC */ stw r14, 0x2dc(r17) @@ -2171,7 +2171,7 @@ lbl_800FD5E8: /* 800FD5F0 000FA550 81 83 00 00 */ lwz r12, 0(r3) /* 800FD5F4 000FA554 81 8C 00 24 */ lwz r12, 0x24(r12) /* 800FD5F8 000FA558 7D 89 03 A6 */ mtctr r12 -/* 800FD5FC 000FA55C 4E 80 04 21 */ bctrl +/* 800FD5FC 000FA55C 4E 80 04 21 */ bctrl /* 800FD600 000FA560 38 61 00 70 */ addi r3, r1, 0x70 /* 800FD604 000FA564 38 80 00 00 */ li r4, 0 /* 800FD608 000FA568 48 24 38 39 */ bl __dt__6CTokenFv @@ -2212,7 +2212,7 @@ lbl_800FD60C: /* 800FD690 000FA5F0 80 01 02 A4 */ lwz r0, 0x2a4(r1) /* 800FD694 000FA5F4 7C 08 03 A6 */ mtlr r0 /* 800FD698 000FA5F8 38 21 02 A0 */ addi r1, r1, 0x2a0 -/* 800FD69C 000FA5FC 4E 80 00 20 */ blr +/* 800FD69C 000FA5FC 4E 80 00 20 */ blr .global "__ct__13CScriptDebrisF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC16CActorParametersUiRC9CVector3ffRC9CVector3fRC6CColorfffQ213CScriptDebris10EScaleTypebbb" "__ct__13CScriptDebrisF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC16CActorParametersUiRC9CVector3ffRC9CVector3fRC6CColorfffQ213CScriptDebris10EScaleTypebbb": @@ -2535,7 +2535,7 @@ lbl_800FDA94: /* 800FDB68 000FAAC8 81 84 00 00 */ lwz r12, 0(r4) /* 800FDB6C 000FAACC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800FDB70 000FAAD0 7D 89 03 A6 */ mtctr r12 -/* 800FDB74 000FAAD4 4E 80 04 21 */ bctrl +/* 800FDB74 000FAAD4 4E 80 04 21 */ bctrl /* 800FDB78 000FAAD8 38 61 00 40 */ addi r3, r1, 0x40 /* 800FDB7C 000FAADC 38 81 00 24 */ addi r4, r1, 0x24 /* 800FDB80 000FAAE0 48 24 33 29 */ bl __ct__6CTokenFRC6CToken @@ -2568,7 +2568,7 @@ lbl_800FDBD8: /* 800FDBE8 000FAB48 38 80 00 01 */ li r4, 1 /* 800FDBEC 000FAB4C 81 8C 00 08 */ lwz r12, 8(r12) /* 800FDBF0 000FAB50 7D 89 03 A6 */ mtctr r12 -/* 800FDBF4 000FAB54 4E 80 04 21 */ bctrl +/* 800FDBF4 000FAB54 4E 80 04 21 */ bctrl lbl_800FDBF8: /* 800FDBF8 000FAB58 7E 20 07 75 */ extsb. r0, r17 /* 800FDBFC 000FAB5C 92 1D 02 D4 */ stw r16, 0x2d4(r29) @@ -2582,7 +2582,7 @@ lbl_800FDC10: /* 800FDC18 000FAB78 81 83 00 00 */ lwz r12, 0(r3) /* 800FDC1C 000FAB7C 81 8C 00 24 */ lwz r12, 0x24(r12) /* 800FDC20 000FAB80 7D 89 03 A6 */ mtctr r12 -/* 800FDC24 000FAB84 4E 80 04 21 */ bctrl +/* 800FDC24 000FAB84 4E 80 04 21 */ bctrl /* 800FDC28 000FAB88 38 61 00 40 */ addi r3, r1, 0x40 /* 800FDC2C 000FAB8C 38 80 00 00 */ li r4, 0 /* 800FDC30 000FAB90 48 24 32 11 */ bl __dt__6CTokenFv @@ -2616,7 +2616,7 @@ lbl_800FDC70: /* 800FDC98 000FABF8 80 01 01 84 */ lwz r0, 0x184(r1) /* 800FDC9C 000FABFC 7C 08 03 A6 */ mtlr r0 /* 800FDCA0 000FAC00 38 21 01 80 */ addi r1, r1, 0x180 -/* 800FDCA4 000FAC04 4E 80 00 20 */ blr +/* 800FDCA4 000FAC04 4E 80 00 20 */ blr .global debris_cone__FR13CStateManagerfff debris_cone__FR13CStateManagerfff: diff --git a/asm/MetroidPrime/ScriptObjects/CScriptDebugCameraWaypoint.s b/asm/MetroidPrime/ScriptObjects/CScriptDebugCameraWaypoint.s index 6163b510..a2813697 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptDebugCameraWaypoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptDebugCameraWaypoint.s @@ -69,7 +69,7 @@ lbl_8014AC28: /* 8014AC34 00147B94 83 C1 00 08 */ lwz r30, 8(r1) /* 8014AC38 00147B98 7C 08 03 A6 */ mtlr r0 /* 8014AC3C 00147B9C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8014AC40 00147BA0 4E 80 00 20 */ blr +/* 8014AC40 00147BA0 4E 80 00 20 */ blr .global Accept__26CScriptDebugCameraWaypointFR8IVisitor Accept__26CScriptDebugCameraWaypointFR8IVisitor: @@ -82,11 +82,11 @@ Accept__26CScriptDebugCameraWaypointFR8IVisitor: /* 8014AC5C 00147BBC 7C 04 03 78 */ mr r4, r0 /* 8014AC60 00147BC0 81 8C 00 78 */ lwz r12, 0x78(r12) /* 8014AC64 00147BC4 7D 89 03 A6 */ mtctr r12 -/* 8014AC68 00147BC8 4E 80 04 21 */ bctrl +/* 8014AC68 00147BC8 4E 80 04 21 */ bctrl /* 8014AC6C 00147BCC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8014AC70 00147BD0 7C 08 03 A6 */ mtlr r0 /* 8014AC74 00147BD4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8014AC78 00147BD8 4E 80 00 20 */ blr +/* 8014AC78 00147BD8 4E 80 00 20 */ blr .global "__ct__26CScriptDebugCameraWaypointF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fUi" "__ct__26CScriptDebugCameraWaypointF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fUi": diff --git a/asm/MetroidPrime/ScriptObjects/CScriptDistanceFog.s b/asm/MetroidPrime/ScriptObjects/CScriptDistanceFog.s index 408b8046..07890064 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptDistanceFog.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptDistanceFog.s @@ -137,7 +137,7 @@ lbl_8014D1A4: /* 8014D1B0 0014A110 83 A1 00 34 */ lwz r29, 0x34(r1) /* 8014D1B4 0014A114 7C 08 03 A6 */ mtlr r0 /* 8014D1B8 0014A118 38 21 00 40 */ addi r1, r1, 0x40 -/* 8014D1BC 0014A11C 4E 80 00 20 */ blr +/* 8014D1BC 0014A11C 4E 80 00 20 */ blr .global Accept__18CScriptDistanceFogFR8IVisitor Accept__18CScriptDistanceFogFR8IVisitor: @@ -150,11 +150,11 @@ Accept__18CScriptDistanceFogFR8IVisitor: /* 8014D1D8 0014A138 7C 04 03 78 */ mr r4, r0 /* 8014D1DC 0014A13C 81 8C 00 7C */ lwz r12, 0x7c(r12) /* 8014D1E0 0014A140 7D 89 03 A6 */ mtctr r12 -/* 8014D1E4 0014A144 4E 80 04 21 */ bctrl +/* 8014D1E4 0014A144 4E 80 04 21 */ bctrl /* 8014D1E8 0014A148 80 01 00 14 */ lwz r0, 0x14(r1) /* 8014D1EC 0014A14C 7C 08 03 A6 */ mtlr r0 /* 8014D1F0 0014A150 38 21 00 10 */ addi r1, r1, 0x10 -/* 8014D1F4 0014A154 4E 80 00 20 */ blr +/* 8014D1F4 0014A154 4E 80 00 20 */ blr .global __dt__18CScriptDistanceFogFv __dt__18CScriptDistanceFogFv: @@ -182,7 +182,7 @@ lbl_8014D23C: /* 8014D248 0014A1A8 83 C1 00 08 */ lwz r30, 8(r1) /* 8014D24C 0014A1AC 7C 08 03 A6 */ mtlr r0 /* 8014D250 0014A1B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8014D254 0014A1B4 4E 80 00 20 */ blr +/* 8014D254 0014A1B4 4E 80 00 20 */ blr .global "__ct__18CScriptDistanceFogF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC11ERglFogModeRC6CColorRC9CVector2ff9CVector2fbbffff" "__ct__18CScriptDistanceFogF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC11ERglFogModeRC6CColorRC9CVector2ff9CVector2fbbffff": diff --git a/asm/MetroidPrime/ScriptObjects/CScriptDock.s b/asm/MetroidPrime/ScriptObjects/CScriptDock.s index ee77ca79..c055362f 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptDock.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptDock.s @@ -143,7 +143,7 @@ lbl_800C3784: /* 800C378C 000C06EC 83 C1 00 18 */ lwz r30, 0x18(r1) /* 800C3790 000C06F0 7C 08 03 A6 */ mtlr r0 /* 800C3794 000C06F4 38 21 00 20 */ addi r1, r1, 0x20 -/* 800C3798 000C06F8 4E 80 00 20 */ blr +/* 800C3798 000C06F8 4E 80 00 20 */ blr .global UpdateAreaActivateFlags__11CScriptDockFR13CStateManager UpdateAreaActivateFlags__11CScriptDockFR13CStateManager: @@ -213,7 +213,7 @@ lbl_800C3884: /* 800C3888 000C07E8 80 01 00 44 */ lwz r0, 0x44(r1) /* 800C388C 000C07EC 7C 08 03 A6 */ mtlr r0 /* 800C3890 000C07F0 38 21 00 40 */ addi r1, r1, 0x40 -/* 800C3894 000C07F4 4E 80 00 20 */ blr +/* 800C3894 000C07F4 4E 80 00 20 */ blr .global SetDockReference__11CScriptDockFi SetDockReference__11CScriptDockFi: @@ -243,7 +243,7 @@ SetDockReference__11CScriptDockFi: /* 800C38F4 000C0854 80 01 00 24 */ lwz r0, 0x24(r1) /* 800C38F8 000C0858 7C 08 03 A6 */ mtlr r0 /* 800C38FC 000C085C 38 21 00 20 */ addi r1, r1, 0x20 -/* 800C3900 000C0860 4E 80 00 20 */ blr +/* 800C3900 000C0860 4E 80 00 20 */ blr .global GetDockReference__11CScriptDockCFv GetDockReference__11CScriptDockCFv: @@ -265,7 +265,7 @@ GetDockReference__11CScriptDockCFv: /* 800C3940 000C08A0 80 01 00 14 */ lwz r0, 0x14(r1) /* 800C3944 000C08A4 7C 08 03 A6 */ mtlr r0 /* 800C3948 000C08A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C394C 000C08AC 4E 80 00 20 */ blr +/* 800C394C 000C08AC 4E 80 00 20 */ blr .global Accept__11CScriptDockFR8IVisitor Accept__11CScriptDockFR8IVisitor: @@ -278,11 +278,11 @@ Accept__11CScriptDockFR8IVisitor: /* 800C3968 000C08C8 7C 04 03 78 */ mr r4, r0 /* 800C396C 000C08CC 81 8C 00 80 */ lwz r12, 0x80(r12) /* 800C3970 000C08D0 7D 89 03 A6 */ mtctr r12 -/* 800C3974 000C08D4 4E 80 04 21 */ bctrl +/* 800C3974 000C08D4 4E 80 04 21 */ bctrl /* 800C3978 000C08D8 80 01 00 14 */ lwz r0, 0x14(r1) /* 800C397C 000C08DC 7C 08 03 A6 */ mtlr r0 /* 800C3980 000C08E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C3984 000C08E4 4E 80 00 20 */ blr +/* 800C3984 000C08E4 4E 80 00 20 */ blr .global GetPlane__11CScriptDockCFRC13CStateManager GetPlane__11CScriptDockCFRC13CStateManager: @@ -320,7 +320,7 @@ GetPlane__11CScriptDockCFRC13CStateManager: /* 800C3A04 000C0964 80 01 00 34 */ lwz r0, 0x34(r1) /* 800C3A08 000C0968 7C 08 03 A6 */ mtlr r0 /* 800C3A0C 000C096C 38 21 00 30 */ addi r1, r1, 0x30 -/* 800C3A10 000C0970 4E 80 00 20 */ blr +/* 800C3A10 000C0970 4E 80 00 20 */ blr .global HasPointCrossedDock__11CScriptDockCFRC13CStateManagerRC9CVector3f HasPointCrossedDock__11CScriptDockCFRC13CStateManagerRC9CVector3f: @@ -364,7 +364,7 @@ HasPointCrossedDock__11CScriptDockCFRC13CStateManagerRC9CVector3f: /* 800C3AA8 000C0A08 80 01 00 34 */ lwz r0, 0x34(r1) /* 800C3AAC 000C0A0C 7C 08 03 A6 */ mtlr r0 /* 800C3AB0 000C0A10 38 21 00 30 */ addi r1, r1, 0x30 -/* 800C3AB4 000C0A14 4E 80 00 20 */ blr +/* 800C3AB4 000C0A14 4E 80 00 20 */ blr .global Think__11CScriptDockFfR13CStateManager Think__11CScriptDockFfR13CStateManager: @@ -562,7 +562,7 @@ lbl_800C3D80: /* 800C3D84 000C0CE4 80 01 00 64 */ lwz r0, 0x64(r1) /* 800C3D88 000C0CE8 7C 08 03 A6 */ mtlr r0 /* 800C3D8C 000C0CEC 38 21 00 60 */ addi r1, r1, 0x60 -/* 800C3D90 000C0CF0 4E 80 00 20 */ blr +/* 800C3D90 000C0CF0 4E 80 00 20 */ blr .global AcceptScriptMsg__11CScriptDockF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__11CScriptDockF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -584,7 +584,7 @@ AcceptScriptMsg__11CScriptDockF20EScriptObjectMessage9TUniqueIdR13CStateManager: /* 800C3DD0 000C0D30 38 84 F6 04 */ addi r4, r4, lbl_803DF604@l /* 800C3DD4 000C0D34 7C 04 00 2E */ lwzx r0, r4, r0 /* 800C3DD8 000C0D38 7C 09 03 A6 */ mtctr r0 -/* 800C3DDC 000C0D3C 4E 80 04 20 */ bctr +/* 800C3DDC 000C0D3C 4E 80 04 20 */ bctr .global lbl_800C3DE0 lbl_800C3DE0: /* 800C3DE0 000C0D40 80 BD 02 60 */ lwz r5, 0x260(r29) @@ -800,7 +800,7 @@ lbl_800C40BC: /* 800C40CC 000C102C 83 81 00 60 */ lwz r28, 0x60(r1) /* 800C40D0 000C1030 7C 08 03 A6 */ mtlr r0 /* 800C40D4 000C1034 38 21 00 70 */ addi r1, r1, 0x70 -/* 800C40D8 000C1038 4E 80 00 20 */ blr +/* 800C40D8 000C1038 4E 80 00 20 */ blr .global PropogateAreaChain__6CWorldFQ29CGameArea15EOcclusionStateP9CGameAreaP6CWorld PropogateAreaChain__6CWorldFQ29CGameArea15EOcclusionStateP9CGameAreaP6CWorld: @@ -893,11 +893,11 @@ lbl_800C41EC: /* 800C41FC 000C115C 83 81 00 10 */ lwz r28, 0x10(r1) /* 800C4200 000C1160 7C 08 03 A6 */ mtlr r0 /* 800C4204 000C1164 38 21 00 20 */ addi r1, r1, 0x20 -/* 800C4208 000C1168 4E 80 00 20 */ blr +/* 800C4208 000C1168 4E 80 00 20 */ blr .global nullsub_41 nullsub_41: -/* 800C420C 000C116C 4E 80 00 20 */ blr +/* 800C420C 000C116C 4E 80 00 20 */ blr .global AreaLoaded__11CScriptDockFR13CStateManager AreaLoaded__11CScriptDockFR13CStateManager: @@ -910,7 +910,7 @@ AreaLoaded__11CScriptDockFR13CStateManager: /* 800C4228 000C1188 80 01 00 14 */ lwz r0, 0x14(r1) /* 800C422C 000C118C 7C 08 03 A6 */ mtlr r0 /* 800C4230 000C1190 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C4234 000C1194 4E 80 00 20 */ blr +/* 800C4234 000C1194 4E 80 00 20 */ blr .global SetLoadConnected__11CScriptDockFR13CStateManagerb SetLoadConnected__11CScriptDockFR13CStateManagerb: @@ -961,7 +961,7 @@ lbl_800C42D4: /* 800C42E4 000C1244 83 81 00 10 */ lwz r28, 0x10(r1) /* 800C42E8 000C1248 7C 08 03 A6 */ mtlr r0 /* 800C42EC 000C124C 38 21 00 20 */ addi r1, r1, 0x20 -/* 800C42F0 000C1250 4E 80 00 20 */ blr +/* 800C42F0 000C1250 4E 80 00 20 */ blr .global GetTouchBounds__11CScriptDockCFv GetTouchBounds__11CScriptDockCFv: @@ -1000,7 +1000,7 @@ lbl_800C4368: /* 800C436C 000C12CC 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 800C4370 000C12D0 7C 08 03 A6 */ mtlr r0 /* 800C4374 000C12D4 38 21 00 30 */ addi r1, r1, 0x30 -/* 800C4378 000C12D8 4E 80 00 20 */ blr +/* 800C4378 000C12D8 4E 80 00 20 */ blr .global Touch__11CScriptDockFR6CActorR13CStateManager Touch__11CScriptDockFR6CActorR13CStateManager: @@ -1024,7 +1024,7 @@ lbl_800C43B8: /* 800C43BC 000C131C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 800C43C0 000C1320 7C 08 03 A6 */ mtlr r0 /* 800C43C4 000C1324 38 21 00 20 */ addi r1, r1, 0x20 -/* 800C43C8 000C1328 4E 80 00 20 */ blr +/* 800C43C8 000C1328 4E 80 00 20 */ blr .global __dt__11CScriptDockFv __dt__11CScriptDockFv: @@ -1052,7 +1052,7 @@ lbl_800C4410: /* 800C441C 000C137C 83 C1 00 08 */ lwz r30, 8(r1) /* 800C4420 000C1380 7C 08 03 A6 */ mtlr r0 /* 800C4424 000C1384 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C4428 000C1388 4E 80 00 20 */ blr +/* 800C4428 000C1388 4E 80 00 20 */ blr .global "__ct__11CScriptDockF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC9CVector3fRC9CVector3fi7TAreaIdbib" "__ct__11CScriptDockF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC9CVector3fRC9CVector3fi7TAreaIdbib": @@ -1207,4 +1207,4 @@ lbl_800C4410: /* 800C467C 000C15DC 80 01 01 A4 */ lwz r0, 0x1a4(r1) /* 800C4680 000C15E0 7C 08 03 A6 */ mtlr r0 /* 800C4684 000C15E4 38 21 01 A0 */ addi r1, r1, 0x1a0 -/* 800C4688 000C15E8 4E 80 00 20 */ blr +/* 800C4688 000C15E8 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/ScriptObjects/CScriptDockAreaChange.s b/asm/MetroidPrime/ScriptObjects/CScriptDockAreaChange.s index 1be803fc..90283388 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptDockAreaChange.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptDockAreaChange.s @@ -42,7 +42,7 @@ lbl_8014EF98: /* 8014EFA4 0014BF04 83 C1 00 08 */ lwz r30, 8(r1) /* 8014EFA8 0014BF08 7C 08 03 A6 */ mtlr r0 /* 8014EFAC 0014BF0C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8014EFB0 0014BF10 4E 80 00 20 */ blr +/* 8014EFB0 0014BF10 4E 80 00 20 */ blr .global Accept__21CScriptDockAreaChangeFR8IVisitor Accept__21CScriptDockAreaChangeFR8IVisitor: @@ -55,11 +55,11 @@ Accept__21CScriptDockAreaChangeFR8IVisitor: /* 8014EFCC 0014BF2C 7C 04 03 78 */ mr r4, r0 /* 8014EFD0 0014BF30 81 8C 00 24 */ lwz r12, 0x24(r12) /* 8014EFD4 0014BF34 7D 89 03 A6 */ mtctr r12 -/* 8014EFD8 0014BF38 4E 80 04 21 */ bctrl +/* 8014EFD8 0014BF38 4E 80 04 21 */ bctrl /* 8014EFDC 0014BF3C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8014EFE0 0014BF40 7C 08 03 A6 */ mtlr r0 /* 8014EFE4 0014BF44 38 21 00 10 */ addi r1, r1, 0x10 -/* 8014EFE8 0014BF48 4E 80 00 20 */ blr +/* 8014EFE8 0014BF48 4E 80 00 20 */ blr .global AcceptScriptMsg__21CScriptDockAreaChangeF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__21CScriptDockAreaChangeF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -155,7 +155,7 @@ lbl_8014F108: /* 8014F128 0014C088 80 01 00 64 */ lwz r0, 0x64(r1) /* 8014F12C 0014C08C 7C 08 03 A6 */ mtlr r0 /* 8014F130 0014C090 38 21 00 60 */ addi r1, r1, 0x60 -/* 8014F134 0014C094 4E 80 00 20 */ blr +/* 8014F134 0014C094 4E 80 00 20 */ blr .global "__ct__21CScriptDockAreaChangeF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoib" "__ct__21CScriptDockAreaChangeF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoib": diff --git a/asm/MetroidPrime/ScriptObjects/CScriptDoor.s b/asm/MetroidPrime/ScriptObjects/CScriptDoor.s index 3e02a7c9..eb736187 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptDoor.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptDoor.s @@ -153,7 +153,7 @@ lbl_8007E034: /* 8007E040 0007AFA0 83 C1 00 08 */ lwz r30, 8(r1) /* 8007E044 0007AFA4 7C 08 03 A6 */ mtlr r0 /* 8007E048 0007AFA8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8007E04C 0007AFAC 4E 80 00 20 */ blr +/* 8007E04C 0007AFAC 4E 80 00 20 */ blr .global Accept__11CScriptDoorFR8IVisitor Accept__11CScriptDoorFR8IVisitor: @@ -166,15 +166,15 @@ Accept__11CScriptDoorFR8IVisitor: /* 8007E068 0007AFC8 7C 04 03 78 */ mr r4, r0 /* 8007E06C 0007AFCC 81 8C 00 84 */ lwz r12, 0x84(r12) /* 8007E070 0007AFD0 7D 89 03 A6 */ mtctr r12 -/* 8007E074 0007AFD4 4E 80 04 21 */ bctrl +/* 8007E074 0007AFD4 4E 80 04 21 */ bctrl /* 8007E078 0007AFD8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8007E07C 0007AFDC 7C 08 03 A6 */ mtlr r0 /* 8007E080 0007AFE0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8007E084 0007AFE4 4E 80 00 20 */ blr +/* 8007E084 0007AFE4 4E 80 00 20 */ blr .global Render__11CScriptDoorCFRC13CStateManager Render__11CScriptDoorCFRC13CStateManager: -/* 8007E088 0007AFE8 4E 80 00 20 */ blr +/* 8007E088 0007AFE8 4E 80 00 20 */ blr .global AddToRenderer__11CScriptDoorCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__11CScriptDoorCFRC14CFrustumPlanesRC13CStateManager: @@ -190,7 +190,7 @@ lbl_8007E0AC: /* 8007E0AC 0007B00C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8007E0B0 0007B010 7C 08 03 A6 */ mtlr r0 /* 8007E0B4 0007B014 38 21 00 10 */ addi r1, r1, 0x10 -/* 8007E0B8 0007B018 4E 80 00 20 */ blr +/* 8007E0B8 0007B018 4E 80 00 20 */ blr .global ForceClosed__11CScriptDoorFR13CStateManager ForceClosed__11CScriptDoorFR13CStateManager: @@ -261,7 +261,7 @@ lbl_8007E1AC: /* 8007E1B4 0007B114 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8007E1B8 0007B118 7C 08 03 A6 */ mtlr r0 /* 8007E1BC 0007B11C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8007E1C0 0007B120 4E 80 00 20 */ blr +/* 8007E1C0 0007B120 4E 80 00 20 */ blr .global IsConnectedToArea__11CScriptDoorCFRC13CStateManager7TAreaId IsConnectedToArea__11CScriptDoorCFRC13CStateManager7TAreaId: @@ -321,7 +321,7 @@ lbl_8007E284: /* 8007E28C 0007B1EC 83 C1 00 28 */ lwz r30, 0x28(r1) /* 8007E290 0007B1F0 7C 08 03 A6 */ mtlr r0 /* 8007E294 0007B1F4 38 21 00 30 */ addi r1, r1, 0x30 -/* 8007E298 0007B1F8 4E 80 00 20 */ blr +/* 8007E298 0007B1F8 4E 80 00 20 */ blr .global Think__11CScriptDoorFfR13CStateManager Think__11CScriptDoorFfR13CStateManager: @@ -506,7 +506,7 @@ lbl_8007E530: /* 8007E540 0007B4A0 83 C1 00 38 */ lwz r30, 0x38(r1) /* 8007E544 0007B4A4 7C 08 03 A6 */ mtlr r0 /* 8007E548 0007B4A8 38 21 00 50 */ addi r1, r1, 0x50 -/* 8007E54C 0007B4AC 4E 80 00 20 */ blr +/* 8007E54C 0007B4AC 4E 80 00 20 */ blr .global AcceptScriptMsg__11CScriptDoorF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__11CScriptDoorF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -527,7 +527,7 @@ AcceptScriptMsg__11CScriptDoorF20EScriptObjectMessage9TUniqueIdR13CStateManager: /* 8007E588 0007B4E8 38 63 AA FC */ addi r3, r3, lbl_803DAAFC@l /* 8007E58C 0007B4EC 7C 03 00 2E */ lwzx r0, r3, r0 /* 8007E590 0007B4F0 7C 09 03 A6 */ mtctr r0 -/* 8007E594 0007B4F4 4E 80 04 20 */ bctr +/* 8007E594 0007B4F4 4E 80 04 20 */ bctr .global lbl_8007E598 lbl_8007E598: /* 8007E598 0007B4F8 88 1D 00 30 */ lbz r0, 0x30(r29) @@ -827,7 +827,7 @@ lbl_8007E9B4: /* 8007E9C0 0007B920 83 A1 00 94 */ lwz r29, 0x94(r1) /* 8007E9C4 0007B924 7C 08 03 A6 */ mtlr r0 /* 8007E9C8 0007B928 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8007E9CC 0007B92C 4E 80 00 20 */ blr +/* 8007E9CC 0007B92C 4E 80 00 20 */ blr .global SetDoorAnimation__11CScriptDoorFQ211CScriptDoor13EDoorAnimType SetDoorAnimation__11CScriptDoorFQ211CScriptDoor13EDoorAnimType: @@ -869,7 +869,7 @@ lbl_8007EA54: /* 8007EA54 0007B9B4 80 01 00 34 */ lwz r0, 0x34(r1) /* 8007EA58 0007B9B8 7C 08 03 A6 */ mtlr r0 /* 8007EA5C 0007B9BC 38 21 00 30 */ addi r1, r1, 0x30 -/* 8007EA60 0007B9C0 4E 80 00 20 */ blr +/* 8007EA60 0007B9C0 4E 80 00 20 */ blr .global OpenDoor__11CScriptDoorF9TUniqueIdR13CStateManager OpenDoor__11CScriptDoorF9TUniqueIdR13CStateManager: @@ -1070,7 +1070,7 @@ lbl_8007ED38: /* 8007ED3C 0007BC9C 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 8007ED40 0007BCA0 7C 08 03 A6 */ mtlr r0 /* 8007ED44 0007BCA4 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8007ED48 0007BCA8 4E 80 00 20 */ blr +/* 8007ED48 0007BCA8 4E 80 00 20 */ blr .global GetDoorOpenCondition__11CScriptDoorFR13CStateManager GetDoorOpenCondition__11CScriptDoorFR13CStateManager: @@ -1288,7 +1288,7 @@ lbl_8007F040: /* 8007F044 0007BFA4 80 01 00 74 */ lwz r0, 0x74(r1) /* 8007F048 0007BFA8 7C 08 03 A6 */ mtlr r0 /* 8007F04C 0007BFAC 38 21 00 70 */ addi r1, r1, 0x70 -/* 8007F050 0007BFB0 4E 80 00 20 */ blr +/* 8007F050 0007BFB0 4E 80 00 20 */ blr .global GetOrbitPosition__11CScriptDoorCFRC13CStateManager GetOrbitPosition__11CScriptDoorCFRC13CStateManager: @@ -1304,7 +1304,7 @@ GetOrbitPosition__11CScriptDoorCFRC13CStateManager: /* 8007F078 0007BFD8 EC 02 08 2A */ fadds f0, f2, f1 /* 8007F07C 0007BFDC D0 63 00 04 */ stfs f3, 4(r3) /* 8007F080 0007BFE0 D0 03 00 08 */ stfs f0, 8(r3) -/* 8007F084 0007BFE4 4E 80 00 20 */ blr +/* 8007F084 0007BFE4 4E 80 00 20 */ blr .global GetProjectileBounds__11CScriptDoorCFv GetProjectileBounds__11CScriptDoorCFv: @@ -1366,7 +1366,7 @@ lbl_8007F158: /* 8007F15C 0007C0BC 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 8007F160 0007C0C0 7C 08 03 A6 */ mtlr r0 /* 8007F164 0007C0C4 38 21 00 40 */ addi r1, r1, 0x40 -/* 8007F168 0007C0C8 4E 80 00 20 */ blr +/* 8007F168 0007C0C8 4E 80 00 20 */ blr .global GetTouchBounds__11CScriptDoorCFv GetTouchBounds__11CScriptDoorCFv: @@ -1415,7 +1415,7 @@ lbl_8007F208: /* 8007F20C 0007C16C 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8007F210 0007C170 7C 08 03 A6 */ mtlr r0 /* 8007F214 0007C174 38 21 00 30 */ addi r1, r1, 0x30 -/* 8007F218 0007C178 4E 80 00 20 */ blr +/* 8007F218 0007C178 4E 80 00 20 */ blr .global "__ct__11CScriptDoorF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC16CActorParametersRC9CVector3fRC6CAABoxbbfb" "__ct__11CScriptDoorF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC16CActorParametersRC9CVector3fRC6CAABoxbbfb": @@ -1663,4 +1663,4 @@ lbl_8007F5B8: /* 8007F5D4 0007C534 80 01 01 24 */ lwz r0, 0x124(r1) /* 8007F5D8 0007C538 7C 08 03 A6 */ mtlr r0 /* 8007F5DC 0007C53C 38 21 01 20 */ addi r1, r1, 0x120 -/* 8007F5E0 0007C540 4E 80 00 20 */ blr +/* 8007F5E0 0007C540 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/ScriptObjects/CScriptEMPulse.s b/asm/MetroidPrime/ScriptObjects/CScriptEMPulse.s index 217e94b8..8513f8c5 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptEMPulse.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptEMPulse.s @@ -66,7 +66,7 @@ __dt__14CScriptEMPulseFv: /* 8018EBF8 0018BB58 38 80 00 01 */ li r4, 1 /* 8018EBFC 0018BB5C 81 8C 00 08 */ lwz r12, 8(r12) /* 8018EC00 0018BB60 7D 89 03 A6 */ mtctr r12 -/* 8018EC04 0018BB64 4E 80 04 21 */ bctrl +/* 8018EC04 0018BB64 4E 80 04 21 */ bctrl lbl_8018EC08: /* 8018EC08 0018BB68 34 1E 01 08 */ addic. r0, r30, 0x108 /* 8018EC0C 0018BB6C 41 82 00 18 */ beq lbl_8018EC24 @@ -90,7 +90,7 @@ lbl_8018EC40: /* 8018EC4C 0018BBAC 83 C1 00 08 */ lwz r30, 8(r1) /* 8018EC50 0018BBB0 7C 08 03 A6 */ mtlr r0 /* 8018EC54 0018BBB4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8018EC58 0018BBB8 4E 80 00 20 */ blr +/* 8018EC58 0018BBB8 4E 80 00 20 */ blr .global AddToRenderer__14CScriptEMPulseCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__14CScriptEMPulseCFRC14CFrustumPlanesRC13CStateManager: @@ -108,13 +108,13 @@ AddToRenderer__14CScriptEMPulseCFRC14CFrustumPlanesRC13CStateManager: /* 8018EC88 0018BBE8 81 83 00 00 */ lwz r12, 0(r3) /* 8018EC8C 0018BBEC 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8018EC90 0018BBF0 7D 89 03 A6 */ mtctr r12 -/* 8018EC94 0018BBF4 4E 80 04 21 */ bctrl +/* 8018EC94 0018BBF4 4E 80 04 21 */ bctrl lbl_8018EC98: /* 8018EC98 0018BBF8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8018EC9C 0018BBFC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8018ECA0 0018BC00 7C 08 03 A6 */ mtlr r0 /* 8018ECA4 0018BC04 38 21 00 10 */ addi r1, r1, 0x10 -/* 8018ECA8 0018BC08 4E 80 00 20 */ blr +/* 8018ECA8 0018BC08 4E 80 00 20 */ blr .global Touch__14CScriptEMPulseFR6CActorR13CStateManager Touch__14CScriptEMPulseFR6CActorR13CStateManager: @@ -208,7 +208,7 @@ lbl_8018EDE4: /* 8018EE00 0018BD60 83 A1 00 44 */ lwz r29, 0x44(r1) /* 8018EE04 0018BD64 7C 08 03 A6 */ mtlr r0 /* 8018EE08 0018BD68 38 21 00 70 */ addi r1, r1, 0x70 -/* 8018EE0C 0018BD6C 4E 80 00 20 */ blr +/* 8018EE0C 0018BD6C 4E 80 00 20 */ blr .global CalculateRenderBounds__14CScriptEMPulseFv CalculateRenderBounds__14CScriptEMPulseFv: @@ -236,7 +236,7 @@ CalculateRenderBounds__14CScriptEMPulseFv: /* 8018EE64 0018BDC4 80 01 00 34 */ lwz r0, 0x34(r1) /* 8018EE68 0018BDC8 7C 08 03 A6 */ mtlr r0 /* 8018EE6C 0018BDCC 38 21 00 30 */ addi r1, r1, 0x30 -/* 8018EE70 0018BDD0 4E 80 00 20 */ blr +/* 8018EE70 0018BDD0 4E 80 00 20 */ blr .global GetTouchBounds__14CScriptEMPulseCFv GetTouchBounds__14CScriptEMPulseCFv: @@ -268,7 +268,7 @@ lbl_8018EED0: /* 8018EED4 0018BE34 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8018EED8 0018BE38 7C 08 03 A6 */ mtlr r0 /* 8018EEDC 0018BE3C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8018EEE0 0018BE40 4E 80 00 20 */ blr +/* 8018EEE0 0018BE40 4E 80 00 20 */ blr .global CalculateBoundingBox__14CScriptEMPulseCFv CalculateBoundingBox__14CScriptEMPulseCFv: @@ -297,7 +297,7 @@ CalculateBoundingBox__14CScriptEMPulseCFv: /* 8018EF3C 0018BE9C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8018EF40 0018BEA0 7C 08 03 A6 */ mtlr r0 /* 8018EF44 0018BEA4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8018EF48 0018BEA8 4E 80 00 20 */ blr +/* 8018EF48 0018BEA8 4E 80 00 20 */ blr .global Think__14CScriptEMPulseFfR13CStateManager Think__14CScriptEMPulseFfR13CStateManager: @@ -337,7 +337,7 @@ lbl_8018EFC4: /* 8018EFCC 0018BF2C 81 83 00 00 */ lwz r12, 0(r3) /* 8018EFD0 0018BF30 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8018EFD4 0018BF34 7D 89 03 A6 */ mtctr r12 -/* 8018EFD8 0018BF38 4E 80 04 21 */ bctrl +/* 8018EFD8 0018BF38 4E 80 04 21 */ bctrl lbl_8018EFDC: /* 8018EFDC 0018BF3C E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 8018EFE0 0018BF40 80 01 00 34 */ lwz r0, 0x34(r1) @@ -345,7 +345,7 @@ lbl_8018EFDC: /* 8018EFE8 0018BF48 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8018EFEC 0018BF4C 7C 08 03 A6 */ mtlr r0 /* 8018EFF0 0018BF50 38 21 00 30 */ addi r1, r1, 0x30 -/* 8018EFF4 0018BF54 4E 80 00 20 */ blr +/* 8018EFF4 0018BF54 4E 80 00 20 */ blr .global Accept__14CScriptEMPulseFR8IVisitor Accept__14CScriptEMPulseFR8IVisitor: @@ -358,11 +358,11 @@ Accept__14CScriptEMPulseFR8IVisitor: /* 8018F010 0018BF70 7C 04 03 78 */ mr r4, r0 /* 8018F014 0018BF74 81 8C 00 08 */ lwz r12, 8(r12) /* 8018F018 0018BF78 7D 89 03 A6 */ mtctr r12 -/* 8018F01C 0018BF7C 4E 80 04 21 */ bctrl +/* 8018F01C 0018BF7C 4E 80 04 21 */ bctrl /* 8018F020 0018BF80 80 01 00 14 */ lwz r0, 0x14(r1) /* 8018F024 0018BF84 7C 08 03 A6 */ mtlr r0 /* 8018F028 0018BF88 38 21 00 10 */ addi r1, r1, 0x10 -/* 8018F02C 0018BF8C 4E 80 00 20 */ blr +/* 8018F02C 0018BF8C 4E 80 00 20 */ blr .global AcceptScriptMsg__14CScriptEMPulseF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__14CScriptEMPulseF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -410,7 +410,7 @@ lbl_8018F0BC: /* 8018F0CC 0018C02C 38 80 00 01 */ li r4, 1 /* 8018F0D0 0018C030 81 8C 00 08 */ lwz r12, 8(r12) /* 8018F0D4 0018C034 7D 89 03 A6 */ mtctr r12 -/* 8018F0D8 0018C038 4E 80 04 21 */ bctrl +/* 8018F0D8 0018C038 4E 80 04 21 */ bctrl lbl_8018F0DC: /* 8018F0DC 0018C03C 7F 80 07 75 */ extsb. r0, r28 /* 8018F0E0 0018C040 93 FD 01 14 */ stw r31, 0x114(r29) @@ -428,7 +428,7 @@ lbl_8018F0F4: /* 8018F10C 0018C06C 81 9F 00 00 */ lwz r12, 0(r31) /* 8018F110 0018C070 81 8C 00 14 */ lwz r12, 0x14(r12) /* 8018F114 0018C074 7D 89 03 A6 */ mtctr r12 -/* 8018F118 0018C078 4E 80 04 21 */ bctrl +/* 8018F118 0018C078 4E 80 04 21 */ bctrl /* 8018F11C 0018C07C C0 5D 00 60 */ lfs f2, 0x60(r29) /* 8018F120 0018C080 38 81 00 1C */ addi r4, r1, 0x1c /* 8018F124 0018C084 C0 3D 00 50 */ lfs f1, 0x50(r29) @@ -440,13 +440,13 @@ lbl_8018F0F4: /* 8018F13C 0018C09C 81 83 00 00 */ lwz r12, 0(r3) /* 8018F140 0018C0A0 81 8C 00 20 */ lwz r12, 0x20(r12) /* 8018F144 0018C0A4 7D 89 03 A6 */ mtctr r12 -/* 8018F148 0018C0A8 4E 80 04 21 */ bctrl +/* 8018F148 0018C0A8 4E 80 04 21 */ bctrl /* 8018F14C 0018C0AC 80 7D 01 14 */ lwz r3, 0x114(r29) /* 8018F150 0018C0B0 38 80 00 01 */ li r4, 1 /* 8018F154 0018C0B4 81 83 00 00 */ lwz r12, 0(r3) /* 8018F158 0018C0B8 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8018F15C 0018C0BC 7D 89 03 A6 */ mtctr r12 -/* 8018F160 0018C0C0 4E 80 04 21 */ bctrl +/* 8018F160 0018C0C0 4E 80 04 21 */ bctrl /* 8018F164 0018C0C4 A0 1D 00 08 */ lhz r0, 8(r29) /* 8018F168 0018C0C8 38 81 00 0C */ addi r4, r1, 0xc /* 8018F16C 0018C0CC B0 01 00 0C */ sth r0, 0xc(r1) @@ -465,7 +465,7 @@ lbl_8018F18C: /* 8018F19C 0018C0FC 83 81 00 60 */ lwz r28, 0x60(r1) /* 8018F1A0 0018C100 7C 08 03 A6 */ mtlr r0 /* 8018F1A4 0018C104 38 21 00 70 */ addi r1, r1, 0x70 -/* 8018F1A8 0018C108 4E 80 00 20 */ blr +/* 8018F1A8 0018C108 4E 80 00 20 */ blr .global "__ct__14CScriptEMPulseF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fbfffffUi" "__ct__14CScriptEMPulseF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fbfffffUi": @@ -557,7 +557,7 @@ lbl_8018F18C: /* 8018F300 0018C260 81 84 00 00 */ lwz r12, 0(r4) /* 8018F304 0018C264 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8018F308 0018C268 7D 89 03 A6 */ mtctr r12 -/* 8018F30C 0018C26C 4E 80 04 21 */ bctrl +/* 8018F30C 0018C26C 4E 80 04 21 */ bctrl /* 8018F310 0018C270 3B 3F 01 08 */ addi r25, r31, 0x108 /* 8018F314 0018C274 38 81 00 18 */ addi r4, r1, 0x18 /* 8018F318 0018C278 7F 23 CB 78 */ mr r3, r25 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptEffect.s b/asm/MetroidPrime/ScriptObjects/CScriptEffect.s index 380ba281..f05240b6 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptEffect.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptEffect.s @@ -106,7 +106,7 @@ lbl_8008DAB0: /* 8008DAC8 0008AA28 38 80 00 01 */ li r4, 1 /* 8008DACC 0008AA2C 81 8C 00 08 */ lwz r12, 8(r12) /* 8008DAD0 0008AA30 7D 89 03 A6 */ mtctr r12 -/* 8008DAD4 0008AA34 4E 80 04 21 */ bctrl +/* 8008DAD4 0008AA34 4E 80 04 21 */ bctrl lbl_8008DAD8: /* 8008DAD8 0008AA38 34 1E 00 F8 */ addic. r0, r30, 0xf8 /* 8008DADC 0008AA3C 41 82 00 18 */ beq lbl_8008DAF4 @@ -125,7 +125,7 @@ lbl_8008DAF4: /* 8008DB0C 0008AA6C 38 80 00 01 */ li r4, 1 /* 8008DB10 0008AA70 81 8C 00 08 */ lwz r12, 8(r12) /* 8008DB14 0008AA74 7D 89 03 A6 */ mtctr r12 -/* 8008DB18 0008AA78 4E 80 04 21 */ bctrl +/* 8008DB18 0008AA78 4E 80 04 21 */ bctrl lbl_8008DB1C: /* 8008DB1C 0008AA7C 34 1E 00 E8 */ addic. r0, r30, 0xe8 /* 8008DB20 0008AA80 41 82 00 18 */ beq lbl_8008DB38 @@ -149,7 +149,7 @@ lbl_8008DB54: /* 8008DB60 0008AAC0 83 C1 00 08 */ lwz r30, 8(r1) /* 8008DB64 0008AAC4 7C 08 03 A6 */ mtlr r0 /* 8008DB68 0008AAC8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8008DB6C 0008AACC 4E 80 00 20 */ blr +/* 8008DB6C 0008AACC 4E 80 00 20 */ blr .global SetActive__13CScriptEffectFb SetActive__13CScriptEffectFb: @@ -167,7 +167,7 @@ SetActive__13CScriptEffectFb: /* 8008DB9C 0008AAFC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8008DBA0 0008AB00 7C 08 03 A6 */ mtlr r0 /* 8008DBA4 0008AB04 38 21 00 10 */ addi r1, r1, 0x10 -/* 8008DBA8 0008AB08 4E 80 00 20 */ blr +/* 8008DBA8 0008AB08 4E 80 00 20 */ blr .global GetSortingBounds__13CScriptEffectCFRC12CTransform4f GetSortingBounds__13CScriptEffectCFRC12CTransform4f: @@ -210,7 +210,7 @@ lbl_8008DC2C: /* 8008DC34 0008AB94 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8008DC38 0008AB98 7C 08 03 A6 */ mtlr r0 /* 8008DC3C 0008AB9C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8008DC40 0008ABA0 4E 80 00 20 */ blr +/* 8008DC40 0008ABA0 4E 80 00 20 */ blr .global CalculateRenderBounds__13CScriptEffectFv CalculateRenderBounds__13CScriptEffectFv: @@ -229,7 +229,7 @@ CalculateRenderBounds__13CScriptEffectFv: /* 8008DC74 0008ABD4 38 61 00 80 */ addi r3, r1, 0x80 /* 8008DC78 0008ABD8 81 8C 00 5C */ lwz r12, 0x5c(r12) /* 8008DC7C 0008ABDC 7D 89 03 A6 */ mtctr r12 -/* 8008DC80 0008ABE0 4E 80 04 21 */ bctrl +/* 8008DC80 0008ABE0 4E 80 04 21 */ bctrl /* 8008DC84 0008ABE4 38 61 00 80 */ addi r3, r1, 0x80 /* 8008DC88 0008ABE8 38 A0 00 01 */ li r5, 1 /* 8008DC8C 0008ABEC 48 00 00 14 */ b lbl_8008DCA0 @@ -277,7 +277,7 @@ lbl_8008DD08: /* 8008DD20 0008AC80 38 61 00 48 */ addi r3, r1, 0x48 /* 8008DD24 0008AC84 81 8C 00 5C */ lwz r12, 0x5c(r12) /* 8008DD28 0008AC88 7D 89 03 A6 */ mtctr r12 -/* 8008DD2C 0008AC8C 4E 80 04 21 */ bctrl +/* 8008DD2C 0008AC8C 4E 80 04 21 */ bctrl /* 8008DD30 0008AC90 38 61 00 48 */ addi r3, r1, 0x48 /* 8008DD34 0008AC94 38 A0 00 01 */ li r5, 1 /* 8008DD38 0008AC98 48 00 00 14 */ b lbl_8008DD4C @@ -410,12 +410,12 @@ lbl_8008DEF8: /* 8008DF0C 0008AE6C 80 01 01 04 */ lwz r0, 0x104(r1) /* 8008DF10 0008AE70 7C 08 03 A6 */ mtlr r0 /* 8008DF14 0008AE74 38 21 01 00 */ addi r1, r1, 0x100 -/* 8008DF18 0008AE78 4E 80 00 20 */ blr +/* 8008DF18 0008AE78 4E 80 00 20 */ blr .global CanRenderUnsorted__13CScriptEffectCFRC13CStateManager CanRenderUnsorted__13CScriptEffectCFRC13CStateManager: /* 8008DF1C 0008AE7C 38 60 00 00 */ li r3, 0 -/* 8008DF20 0008AE80 4E 80 00 20 */ blr +/* 8008DF20 0008AE80 4E 80 00 20 */ blr .global sub_8008df24 sub_8008df24: @@ -432,7 +432,7 @@ sub_8008df24: /* 8008DF4C 0008AEAC 81 83 00 00 */ lwz r12, 0(r3) /* 8008DF50 0008AEB0 81 8C 00 58 */ lwz r12, 0x58(r12) /* 8008DF54 0008AEB4 7D 89 03 A6 */ mtctr r12 -/* 8008DF58 0008AEB8 4E 80 04 21 */ bctrl +/* 8008DF58 0008AEB8 4E 80 04 21 */ bctrl /* 8008DF5C 0008AEBC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8008DF60 0008AEC0 41 82 00 2C */ beq lbl_8008DF8C lbl_8008DF64: @@ -442,7 +442,7 @@ lbl_8008DF64: /* 8008DF70 0008AED0 81 83 00 00 */ lwz r12, 0(r3) /* 8008DF74 0008AED4 81 8C 00 58 */ lwz r12, 0x58(r12) /* 8008DF78 0008AED8 7D 89 03 A6 */ mtctr r12 -/* 8008DF7C 0008AEDC 4E 80 04 21 */ bctrl +/* 8008DF7C 0008AEDC 4E 80 04 21 */ bctrl /* 8008DF80 0008AEE0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8008DF84 0008AEE4 41 82 00 08 */ beq lbl_8008DF8C lbl_8008DF88: @@ -454,14 +454,14 @@ lbl_8008DF8C: /* 8008DF98 0008AEF8 83 C1 00 08 */ lwz r30, 8(r1) /* 8008DF9C 0008AEFC 7C 08 03 A6 */ mtlr r0 /* 8008DFA0 0008AF00 38 21 00 10 */ addi r1, r1, 0x10 -/* 8008DFA4 0008AF04 4E 80 00 20 */ blr +/* 8008DFA4 0008AF04 4E 80 00 20 */ blr .global ResetParticleCounts__13CScriptEffectFv ResetParticleCounts__13CScriptEffectFv: /* 8008DFA8 0008AF08 38 00 00 00 */ li r0, 0 /* 8008DFAC 0008AF0C 90 0D A2 98 */ stw r0, lbl_805A8E58@sda21(r13) /* 8008DFB0 0008AF10 90 0D A2 9C */ stw r0, lbl_805A8E5C@sda21(r13) -/* 8008DFB4 0008AF14 4E 80 00 20 */ blr +/* 8008DFB4 0008AF14 4E 80 00 20 */ blr .global Accept__13CScriptEffectFR8IVisitor Accept__13CScriptEffectFR8IVisitor: @@ -474,11 +474,11 @@ Accept__13CScriptEffectFR8IVisitor: /* 8008DFD0 0008AF30 7C 04 03 78 */ mr r4, r0 /* 8008DFD4 0008AF34 81 8C 00 88 */ lwz r12, 0x88(r12) /* 8008DFD8 0008AF38 7D 89 03 A6 */ mtctr r12 -/* 8008DFDC 0008AF3C 4E 80 04 21 */ bctrl +/* 8008DFDC 0008AF3C 4E 80 04 21 */ bctrl /* 8008DFE0 0008AF40 80 01 00 14 */ lwz r0, 0x14(r1) /* 8008DFE4 0008AF44 7C 08 03 A6 */ mtlr r0 /* 8008DFE8 0008AF48 38 21 00 10 */ addi r1, r1, 0x10 -/* 8008DFEC 0008AF4C 4E 80 00 20 */ blr +/* 8008DFEC 0008AF4C 4E 80 00 20 */ blr .global PreRender__13CScriptEffectFR13CStateManagerRC14CFrustumPlanes PreRender__13CScriptEffectFR13CStateManagerRC14CFrustumPlanes: @@ -595,7 +595,7 @@ lbl_8008E178: /* 8008E180 0008B0E0 81 83 00 00 */ lwz r12, 0(r3) /* 8008E184 0008B0E4 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8008E188 0008B0E8 7D 89 03 A6 */ mtctr r12 -/* 8008E18C 0008B0EC 4E 80 04 21 */ bctrl +/* 8008E18C 0008B0EC 4E 80 04 21 */ bctrl lbl_8008E190: /* 8008E190 0008B0F0 A0 1E 01 3C */ lhz r0, 0x13c(r30) /* 8008E194 0008B0F4 7F E3 FB 78 */ mr r3, r31 @@ -620,7 +620,7 @@ lbl_8008E1B4: /* 8008E1DC 0008B13C 83 C1 00 38 */ lwz r30, 0x38(r1) /* 8008E1E0 0008B140 7C 08 03 A6 */ mtlr r0 /* 8008E1E4 0008B144 38 21 00 80 */ addi r1, r1, 0x80 -/* 8008E1E8 0008B148 4E 80 00 20 */ blr +/* 8008E1E8 0008B148 4E 80 00 20 */ blr .global Render__13CScriptEffectCFRC13CStateManager Render__13CScriptEffectCFRC13CStateManager: @@ -647,7 +647,7 @@ lbl_8008E210: /* 8008E238 0008B198 81 83 00 00 */ lwz r12, 0(r3) /* 8008E23C 0008B19C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8008E240 0008B1A0 7D 89 03 A6 */ mtctr r12 -/* 8008E244 0008B1A4 4E 80 04 21 */ bctrl +/* 8008E244 0008B1A4 4E 80 04 21 */ bctrl lbl_8008E248: /* 8008E248 0008B1A8 80 7F 00 F4 */ lwz r3, 0xf4(r31) /* 8008E24C 0008B1AC 28 03 00 00 */ cmplwi r3, 0 @@ -655,7 +655,7 @@ lbl_8008E248: /* 8008E254 0008B1B4 81 83 00 00 */ lwz r12, 0(r3) /* 8008E258 0008B1B8 81 8C 00 60 */ lwz r12, 0x60(r12) /* 8008E25C 0008B1BC 7D 89 03 A6 */ mtctr r12 -/* 8008E260 0008B1C0 4E 80 04 21 */ bctrl +/* 8008E260 0008B1C0 4E 80 04 21 */ bctrl /* 8008E264 0008B1C4 2C 03 00 00 */ cmpwi r3, 0 /* 8008E268 0008B1C8 40 81 00 24 */ ble lbl_8008E28C /* 8008E26C 0008B1CC 80 0D A2 98 */ lwz r0, lbl_805A8E58@sda21(r13) @@ -665,13 +665,13 @@ lbl_8008E248: /* 8008E27C 0008B1DC 81 83 00 00 */ lwz r12, 0(r3) /* 8008E280 0008B1E0 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8008E284 0008B1E4 7D 89 03 A6 */ mtctr r12 -/* 8008E288 0008B1E8 4E 80 04 21 */ bctrl +/* 8008E288 0008B1E8 4E 80 04 21 */ bctrl lbl_8008E28C: /* 8008E28C 0008B1EC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8008E290 0008B1F0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8008E294 0008B1F4 7C 08 03 A6 */ mtlr r0 /* 8008E298 0008B1F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8008E29C 0008B1FC 4E 80 00 20 */ blr +/* 8008E29C 0008B1FC 4E 80 00 20 */ blr .global AddToRenderer__13CScriptEffectCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__13CScriptEffectCFRC14CFrustumPlanesRC13CStateManager: @@ -793,7 +793,7 @@ lbl_8008E438: /* 8008E43C 0008B39C 80 01 00 64 */ lwz r0, 0x64(r1) /* 8008E440 0008B3A0 7C 08 03 A6 */ mtlr r0 /* 8008E444 0008B3A4 38 21 00 60 */ addi r1, r1, 0x60 -/* 8008E448 0008B3A8 4E 80 00 20 */ blr +/* 8008E448 0008B3A8 4E 80 00 20 */ blr .global AcceptScriptMsg__13CScriptEffectF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__13CScriptEffectF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -893,7 +893,7 @@ lbl_8008E580: /* 8008E58C 0008B4EC 81 83 00 00 */ lwz r12, 0(r3) /* 8008E590 0008B4F0 81 8C 00 64 */ lwz r12, 0x64(r12) /* 8008E594 0008B4F4 7D 89 03 A6 */ mtctr r12 -/* 8008E598 0008B4F8 4E 80 04 21 */ bctrl +/* 8008E598 0008B4F8 4E 80 04 21 */ bctrl /* 8008E59C 0008B4FC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8008E5A0 0008B500 41 82 04 68 */ beq lbl_8008EA08 /* 8008E5A4 0008B504 7F C4 F3 78 */ mr r4, r30 @@ -938,7 +938,7 @@ lbl_8008E580: /* 8008E640 0008B5A0 81 84 00 00 */ lwz r12, 0(r4) /* 8008E644 0008B5A4 81 8C 00 68 */ lwz r12, 0x68(r12) /* 8008E648 0008B5A8 7D 89 03 A6 */ mtctr r12 -/* 8008E64C 0008B5AC 4E 80 04 21 */ bctrl +/* 8008E64C 0008B5AC 4E 80 04 21 */ bctrl /* 8008E650 0008B5B0 92 C1 00 08 */ stw r22, 8(r1) /* 8008E654 0008B5B4 38 00 00 01 */ li r0, 1 /* 8008E658 0008B5B8 C0 22 8A C8 */ lfs f1, lbl_805AA7E8@sda21(r2) @@ -990,7 +990,7 @@ lbl_8008E6E8: /* 8008E700 0008B660 81 83 00 00 */ lwz r12, 0(r3) /* 8008E704 0008B664 81 8C 00 48 */ lwz r12, 0x48(r12) /* 8008E708 0008B668 7D 89 03 A6 */ mtctr r12 -/* 8008E70C 0008B66C 4E 80 04 21 */ bctrl +/* 8008E70C 0008B66C 4E 80 04 21 */ bctrl /* 8008E710 0008B670 C0 03 00 00 */ lfs f0, 0(r3) /* 8008E714 0008B674 D0 01 00 F0 */ stfs f0, 0xf0(r1) /* 8008E718 0008B678 C0 03 00 04 */ lfs f0, 4(r3) @@ -1001,7 +1001,7 @@ lbl_8008E6E8: /* 8008E72C 0008B68C 81 83 00 00 */ lwz r12, 0(r3) /* 8008E730 0008B690 81 8C 00 50 */ lwz r12, 0x50(r12) /* 8008E734 0008B694 7D 89 03 A6 */ mtctr r12 -/* 8008E738 0008B698 4E 80 04 21 */ bctrl +/* 8008E738 0008B698 4E 80 04 21 */ bctrl /* 8008E73C 0008B69C 80 03 00 00 */ lwz r0, 0(r3) /* 8008E740 0008B6A0 3C 60 80 3D */ lis r3, lbl_803CD690@ha /* 8008E744 0008B6A4 38 83 D6 90 */ addi r4, r3, lbl_803CD690@l @@ -1030,7 +1030,7 @@ lbl_8008E78C: /* 8008E79C 0008B6FC 38 80 00 01 */ li r4, 1 /* 8008E7A0 0008B700 81 8C 00 08 */ lwz r12, 8(r12) /* 8008E7A4 0008B704 7D 89 03 A6 */ mtctr r12 -/* 8008E7A8 0008B708 4E 80 04 21 */ bctrl +/* 8008E7A8 0008B708 4E 80 04 21 */ bctrl lbl_8008E7AC: /* 8008E7AC 0008B70C 7E C0 07 75 */ extsb. r0, r22 /* 8008E7B0 0008B710 93 5F 01 04 */ stw r26, 0x104(r31) @@ -1058,7 +1058,7 @@ lbl_8008E7C4: /* 8008E804 0008B764 81 83 00 00 */ lwz r12, 0(r3) /* 8008E808 0008B768 81 8C 00 14 */ lwz r12, 0x14(r12) /* 8008E80C 0008B76C 7D 89 03 A6 */ mtctr r12 -/* 8008E810 0008B770 4E 80 04 21 */ bctrl +/* 8008E810 0008B770 4E 80 04 21 */ bctrl /* 8008E814 0008B774 C0 5F 00 60 */ lfs f2, 0x60(r31) /* 8008E818 0008B778 38 81 00 98 */ addi r4, r1, 0x98 /* 8008E81C 0008B77C C0 3F 00 50 */ lfs f1, 0x50(r31) @@ -1070,13 +1070,13 @@ lbl_8008E7C4: /* 8008E834 0008B794 81 83 00 00 */ lwz r12, 0(r3) /* 8008E838 0008B798 81 8C 00 20 */ lwz r12, 0x20(r12) /* 8008E83C 0008B79C 7D 89 03 A6 */ mtctr r12 -/* 8008E840 0008B7A0 4E 80 04 21 */ bctrl +/* 8008E840 0008B7A0 4E 80 04 21 */ bctrl /* 8008E844 0008B7A4 80 7F 01 04 */ lwz r3, 0x104(r31) /* 8008E848 0008B7A8 38 81 00 F0 */ addi r4, r1, 0xf0 /* 8008E84C 0008B7AC 81 83 00 00 */ lwz r12, 0(r3) /* 8008E850 0008B7B0 81 8C 00 24 */ lwz r12, 0x24(r12) /* 8008E854 0008B7B4 7D 89 03 A6 */ mtctr r12 -/* 8008E858 0008B7B8 4E 80 04 21 */ bctrl +/* 8008E858 0008B7B8 4E 80 04 21 */ bctrl /* 8008E85C 0008B7BC 80 BF 01 38 */ lwz r5, 0x138(r31) /* 8008E860 0008B7C0 38 81 00 60 */ addi r4, r1, 0x60 /* 8008E864 0008B7C4 80 7F 01 04 */ lwz r3, 0x104(r31) @@ -1089,7 +1089,7 @@ lbl_8008E7C4: /* 8008E880 0008B7E0 81 83 00 00 */ lwz r12, 0(r3) /* 8008E884 0008B7E4 81 8C 00 30 */ lwz r12, 0x30(r12) /* 8008E888 0008B7E8 7D 89 03 A6 */ mtctr r12 -/* 8008E88C 0008B7EC 4E 80 04 21 */ bctrl +/* 8008E88C 0008B7EC 4E 80 04 21 */ bctrl lbl_8008E890: /* 8008E890 0008B7F0 80 7F 00 F4 */ lwz r3, 0xf4(r31) /* 8008E894 0008B7F4 28 03 00 00 */ cmplwi r3, 0 @@ -1097,7 +1097,7 @@ lbl_8008E890: /* 8008E89C 0008B7FC 81 83 00 00 */ lwz r12, 0(r3) /* 8008E8A0 0008B800 81 8C 00 48 */ lwz r12, 0x48(r12) /* 8008E8A4 0008B804 7D 89 03 A6 */ mtctr r12 -/* 8008E8A8 0008B808 4E 80 04 21 */ bctrl +/* 8008E8A8 0008B808 4E 80 04 21 */ bctrl /* 8008E8AC 0008B80C C0 03 00 00 */ lfs f0, 0(r3) /* 8008E8B0 0008B810 D0 01 00 E4 */ stfs f0, 0xe4(r1) /* 8008E8B4 0008B814 C0 03 00 04 */ lfs f0, 4(r3) @@ -1108,7 +1108,7 @@ lbl_8008E890: /* 8008E8C8 0008B828 81 83 00 00 */ lwz r12, 0(r3) /* 8008E8CC 0008B82C 81 8C 00 50 */ lwz r12, 0x50(r12) /* 8008E8D0 0008B830 7D 89 03 A6 */ mtctr r12 -/* 8008E8D4 0008B834 4E 80 04 21 */ bctrl +/* 8008E8D4 0008B834 4E 80 04 21 */ bctrl /* 8008E8D8 0008B838 80 03 00 00 */ lwz r0, 0(r3) /* 8008E8DC 0008B83C 3C 60 80 3D */ lis r3, lbl_803CD690@ha /* 8008E8E0 0008B840 38 83 D6 90 */ addi r4, r3, lbl_803CD690@l @@ -1135,7 +1135,7 @@ lbl_8008E920: /* 8008E930 0008B890 38 80 00 01 */ li r4, 1 /* 8008E934 0008B894 81 8C 00 08 */ lwz r12, 8(r12) /* 8008E938 0008B898 7D 89 03 A6 */ mtctr r12 -/* 8008E93C 0008B89C 4E 80 04 21 */ bctrl +/* 8008E93C 0008B89C 4E 80 04 21 */ bctrl lbl_8008E940: /* 8008E940 0008B8A0 7E C0 07 75 */ extsb. r0, r22 /* 8008E944 0008B8A4 93 5F 00 F4 */ stw r26, 0xf4(r31) @@ -1163,7 +1163,7 @@ lbl_8008E958: /* 8008E998 0008B8F8 81 83 00 00 */ lwz r12, 0(r3) /* 8008E99C 0008B8FC 81 8C 00 14 */ lwz r12, 0x14(r12) /* 8008E9A0 0008B900 7D 89 03 A6 */ mtctr r12 -/* 8008E9A4 0008B904 4E 80 04 21 */ bctrl +/* 8008E9A4 0008B904 4E 80 04 21 */ bctrl /* 8008E9A8 0008B908 C0 5F 00 60 */ lfs f2, 0x60(r31) /* 8008E9AC 0008B90C 38 81 00 8C */ addi r4, r1, 0x8c /* 8008E9B0 0008B910 C0 3F 00 50 */ lfs f1, 0x50(r31) @@ -1175,19 +1175,19 @@ lbl_8008E958: /* 8008E9C8 0008B928 81 83 00 00 */ lwz r12, 0(r3) /* 8008E9CC 0008B92C 81 8C 00 20 */ lwz r12, 0x20(r12) /* 8008E9D0 0008B930 7D 89 03 A6 */ mtctr r12 -/* 8008E9D4 0008B934 4E 80 04 21 */ bctrl +/* 8008E9D4 0008B934 4E 80 04 21 */ bctrl /* 8008E9D8 0008B938 80 7F 00 F4 */ lwz r3, 0xf4(r31) /* 8008E9DC 0008B93C 38 81 00 E4 */ addi r4, r1, 0xe4 /* 8008E9E0 0008B940 81 83 00 00 */ lwz r12, 0(r3) /* 8008E9E4 0008B944 81 8C 00 24 */ lwz r12, 0x24(r12) /* 8008E9E8 0008B948 7D 89 03 A6 */ mtctr r12 -/* 8008E9EC 0008B94C 4E 80 04 21 */ bctrl +/* 8008E9EC 0008B94C 4E 80 04 21 */ bctrl /* 8008E9F0 0008B950 80 7F 00 F4 */ lwz r3, 0xf4(r31) /* 8008E9F4 0008B954 38 81 00 5C */ addi r4, r1, 0x5c /* 8008E9F8 0008B958 81 83 00 00 */ lwz r12, 0(r3) /* 8008E9FC 0008B95C 81 8C 00 30 */ lwz r12, 0x30(r12) /* 8008EA00 0008B960 7D 89 03 A6 */ mtctr r12 -/* 8008EA04 0008B964 4E 80 04 21 */ bctrl +/* 8008EA04 0008B964 4E 80 04 21 */ bctrl lbl_8008EA08: /* 8008EA08 0008B968 A0 1C 00 00 */ lhz r0, 0(r28) /* 8008EA0C 0008B96C 7F E3 FB 78 */ mr r3, r31 @@ -1366,7 +1366,7 @@ lbl_8008EC74: /* 8008EC98 0008BBF8 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8008EC9C 0008BBFC 54 04 CF FE */ rlwinm r4, r0, 0x19, 0x1f, 0x1f /* 8008ECA0 0008BC00 7D 89 03 A6 */ mtctr r12 -/* 8008ECA4 0008BC04 4E 80 04 21 */ bctrl +/* 8008ECA4 0008BC04 4E 80 04 21 */ bctrl lbl_8008ECA8: /* 8008ECA8 0008BC08 80 7F 00 F4 */ lwz r3, 0xf4(r31) /* 8008ECAC 0008BC0C 28 03 00 00 */ cmplwi r3, 0 @@ -1376,7 +1376,7 @@ lbl_8008ECA8: /* 8008ECBC 0008BC1C 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8008ECC0 0008BC20 54 04 CF FE */ rlwinm r4, r0, 0x19, 0x1f, 0x1f /* 8008ECC4 0008BC24 7D 89 03 A6 */ mtctr r12 -/* 8008ECC8 0008BC28 4E 80 04 21 */ bctrl +/* 8008ECC8 0008BC28 4E 80 04 21 */ bctrl lbl_8008ECCC: /* 8008ECCC 0008BC2C 88 1F 00 30 */ lbz r0, 0x30(r31) /* 8008ECD0 0008BC30 54 00 CF FF */ rlwinm. r0, r0, 0x19, 0x1f, 0x1f @@ -1397,22 +1397,22 @@ lbl_8008ECFC: /* 8008ED00 0008BC60 80 01 02 54 */ lwz r0, 0x254(r1) /* 8008ED04 0008BC64 7C 08 03 A6 */ mtlr r0 /* 8008ED08 0008BC68 38 21 02 50 */ addi r1, r1, 0x250 -/* 8008ED0C 0008BC6C 4E 80 00 20 */ blr +/* 8008ED0C 0008BC6C 4E 80 00 20 */ blr .global GetModulationColor__17CParticleElectricFv GetModulationColor__17CParticleElectricFv: /* 8008ED10 0008BC70 38 63 01 B8 */ addi r3, r3, 0x1b8 -/* 8008ED14 0008BC74 4E 80 00 20 */ blr +/* 8008ED14 0008BC74 4E 80 00 20 */ blr .global GetGlobalScale__17CParticleElectricFv GetGlobalScale__17CParticleElectricFv: /* 8008ED18 0008BC78 38 63 00 E0 */ addi r3, r3, 0xe0 -/* 8008ED1C 0008BC7C 4E 80 00 20 */ blr +/* 8008ED1C 0008BC7C 4E 80 00 20 */ blr .global GetGlobalScale__11CElementGenCFv GetGlobalScale__11CElementGenCFv: /* 8008ED20 0008BC80 38 63 01 00 */ addi r3, r3, 0x100 -/* 8008ED24 0008BC84 4E 80 00 20 */ blr +/* 8008ED24 0008BC84 4E 80 00 20 */ blr .global Think__13CScriptEffectFfR13CStateManager Think__13CScriptEffectFfR13CStateManager: @@ -1452,7 +1452,7 @@ Think__13CScriptEffectFfR13CStateManager: /* 8008EDAC 0008BD0C 81 83 00 00 */ lwz r12, 0(r3) /* 8008EDB0 0008BD10 81 8C 00 14 */ lwz r12, 0x14(r12) /* 8008EDB4 0008BD14 7D 89 03 A6 */ mtctr r12 -/* 8008EDB8 0008BD18 4E 80 04 21 */ bctrl +/* 8008EDB8 0008BD18 4E 80 04 21 */ bctrl /* 8008EDBC 0008BD1C C0 5E 00 60 */ lfs f2, 0x60(r30) /* 8008EDC0 0008BD20 38 81 00 48 */ addi r4, r1, 0x48 /* 8008EDC4 0008BD24 C0 3E 00 50 */ lfs f1, 0x50(r30) @@ -1464,7 +1464,7 @@ Think__13CScriptEffectFfR13CStateManager: /* 8008EDDC 0008BD3C 81 83 00 00 */ lwz r12, 0(r3) /* 8008EDE0 0008BD40 81 8C 00 20 */ lwz r12, 0x20(r12) /* 8008EDE4 0008BD44 7D 89 03 A6 */ mtctr r12 -/* 8008EDE8 0008BD48 4E 80 04 21 */ bctrl +/* 8008EDE8 0008BD48 4E 80 04 21 */ bctrl lbl_8008EDEC: /* 8008EDEC 0008BD4C 80 1E 00 F4 */ lwz r0, 0xf4(r30) /* 8008EDF0 0008BD50 28 00 00 00 */ cmplwi r0, 0 @@ -1488,7 +1488,7 @@ lbl_8008EDEC: /* 8008EE38 0008BD98 81 83 00 00 */ lwz r12, 0(r3) /* 8008EE3C 0008BD9C 81 8C 00 14 */ lwz r12, 0x14(r12) /* 8008EE40 0008BDA0 7D 89 03 A6 */ mtctr r12 -/* 8008EE44 0008BDA4 4E 80 04 21 */ bctrl +/* 8008EE44 0008BDA4 4E 80 04 21 */ bctrl /* 8008EE48 0008BDA8 C0 5E 00 60 */ lfs f2, 0x60(r30) /* 8008EE4C 0008BDAC 38 81 00 3C */ addi r4, r1, 0x3c /* 8008EE50 0008BDB0 C0 3E 00 50 */ lfs f1, 0x50(r30) @@ -1500,7 +1500,7 @@ lbl_8008EDEC: /* 8008EE68 0008BDC8 81 83 00 00 */ lwz r12, 0(r3) /* 8008EE6C 0008BDCC 81 8C 00 20 */ lwz r12, 0x20(r12) /* 8008EE70 0008BDD0 7D 89 03 A6 */ mtctr r12 -/* 8008EE74 0008BDD4 4E 80 04 21 */ bctrl +/* 8008EE74 0008BDD4 4E 80 04 21 */ bctrl lbl_8008EE78: /* 8008EE78 0008BDD8 A0 1E 01 08 */ lhz r0, 0x108(r30) /* 8008EE7C 0008BDDC 7F E3 FB 78 */ mr r3, r31 @@ -1580,7 +1580,7 @@ lbl_8008EF64: /* 8008EF8C 0008BEEC FC 20 F8 90 */ fmr f1, f31 /* 8008EF90 0008BEF0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8008EF94 0008BEF4 7D 89 03 A6 */ mtctr r12 -/* 8008EF98 0008BEF8 4E 80 04 21 */ bctrl +/* 8008EF98 0008BEF8 4E 80 04 21 */ bctrl /* 8008EF9C 0008BEFC 80 7E 01 04 */ lwz r3, 0x104(r30) /* 8008EFA0 0008BF00 48 28 8F 4D */ bl GetParticleCountAll__11CElementGenCFv /* 8008EFA4 0008BF04 80 0D A2 9C */ lwz r0, lbl_805A8E5C@sda21(r13) @@ -1594,12 +1594,12 @@ lbl_8008EFB0: /* 8008EFC0 0008BF20 FC 20 F8 90 */ fmr f1, f31 /* 8008EFC4 0008BF24 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8008EFC8 0008BF28 7D 89 03 A6 */ mtctr r12 -/* 8008EFCC 0008BF2C 4E 80 04 21 */ bctrl +/* 8008EFCC 0008BF2C 4E 80 04 21 */ bctrl /* 8008EFD0 0008BF30 80 7E 00 F4 */ lwz r3, 0xf4(r30) /* 8008EFD4 0008BF34 81 83 00 00 */ lwz r12, 0(r3) /* 8008EFD8 0008BF38 81 8C 00 60 */ lwz r12, 0x60(r12) /* 8008EFDC 0008BF3C 7D 89 03 A6 */ mtctr r12 -/* 8008EFE0 0008BF40 4E 80 04 21 */ bctrl +/* 8008EFE0 0008BF40 4E 80 04 21 */ bctrl /* 8008EFE4 0008BF44 80 0D A2 9C */ lwz r0, lbl_805A8E5C@sda21(r13) /* 8008EFE8 0008BF48 7C 00 1A 14 */ add r0, r0, r3 /* 8008EFEC 0008BF4C 90 0D A2 9C */ stw r0, lbl_805A8E5C@sda21(r13) @@ -1627,7 +1627,7 @@ lbl_8008EFF0: /* 8008F040 0008BFA0 81 84 00 00 */ lwz r12, 0(r4) /* 8008F044 0008BFA4 81 8C 00 68 */ lwz r12, 0x68(r12) /* 8008F048 0008BFA8 7D 89 03 A6 */ mtctr r12 -/* 8008F04C 0008BFAC 4E 80 04 21 */ bctrl +/* 8008F04C 0008BFAC 4E 80 04 21 */ bctrl /* 8008F050 0008BFB0 7F A3 EB 78 */ mr r3, r29 /* 8008F054 0008BFB4 38 81 01 14 */ addi r4, r1, 0x114 /* 8008F058 0008BFB8 48 02 66 ED */ bl SetLight__10CGameLightFRC6CLight @@ -1672,7 +1672,7 @@ lbl_8008F0CC: /* 8008F0E8 0008C048 38 9E 00 B8 */ addi r4, r30, 0xb8 /* 8008F0EC 0008C04C 81 8C 00 30 */ lwz r12, 0x30(r12) /* 8008F0F0 0008C050 7D 89 03 A6 */ mtctr r12 -/* 8008F0F4 0008C054 4E 80 04 21 */ bctrl +/* 8008F0F4 0008C054 4E 80 04 21 */ bctrl /* 8008F0F8 0008C058 48 00 00 24 */ b lbl_8008F11C lbl_8008F0FC: /* 8008F0FC 0008C05C 38 00 FF FF */ li r0, -1 @@ -1682,7 +1682,7 @@ lbl_8008F0FC: /* 8008F10C 0008C06C 81 83 00 00 */ lwz r12, 0(r3) /* 8008F110 0008C070 81 8C 00 30 */ lwz r12, 0x30(r12) /* 8008F114 0008C074 7D 89 03 A6 */ mtctr r12 -/* 8008F118 0008C078 4E 80 04 21 */ bctrl +/* 8008F118 0008C078 4E 80 04 21 */ bctrl lbl_8008F11C: /* 8008F11C 0008C07C E3 E1 01 88 */ psq_l f31, 392(r1), 0, qr0 /* 8008F120 0008C080 80 01 01 94 */ lwz r0, 0x194(r1) @@ -1692,7 +1692,7 @@ lbl_8008F11C: /* 8008F130 0008C090 83 A1 01 74 */ lwz r29, 0x174(r1) /* 8008F134 0008C094 7C 08 03 A6 */ mtlr r0 /* 8008F138 0008C098 38 21 01 90 */ addi r1, r1, 0x190 -/* 8008F13C 0008C09C 4E 80 00 20 */ blr +/* 8008F13C 0008C09C 4E 80 00 20 */ blr .global "__ct__13CScriptEffectF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC9CVector3fUiUibbbbbffff" "__ct__13CScriptEffectF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC9CVector3fUiUibbbbbffff": @@ -1808,7 +1808,7 @@ lbl_8008F11C: /* 8008F2F4 0008C254 38 80 00 01 */ li r4, 1 /* 8008F2F8 0008C258 81 8C 00 08 */ lwz r12, 8(r12) /* 8008F2FC 0008C25C 7D 89 03 A6 */ mtctr r12 -/* 8008F300 0008C260 4E 80 04 21 */ bctrl +/* 8008F300 0008C260 4E 80 04 21 */ bctrl lbl_8008F304: /* 8008F304 0008C264 38 00 00 00 */ li r0, 0 /* 8008F308 0008C268 7E 03 83 78 */ mr r3, r16 @@ -1835,7 +1835,7 @@ lbl_8008F304: /* 8008F35C 0008C2BC 38 80 00 01 */ li r4, 1 /* 8008F360 0008C2C0 81 8C 00 08 */ lwz r12, 8(r12) /* 8008F364 0008C2C4 7D 89 03 A6 */ mtctr r12 -/* 8008F368 0008C2C8 4E 80 04 21 */ bctrl +/* 8008F368 0008C2C8 4E 80 04 21 */ bctrl lbl_8008F36C: /* 8008F36C 0008C2CC 38 00 00 00 */ li r0, 0 /* 8008F370 0008C2D0 7E 03 83 78 */ mr r3, r16 @@ -1930,7 +1930,7 @@ lbl_8008F494: /* 8008F4CC 0008C42C 81 84 00 00 */ lwz r12, 0(r4) /* 8008F4D0 0008C430 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8008F4D4 0008C434 7D 89 03 A6 */ mtctr r12 -/* 8008F4D8 0008C438 4E 80 04 21 */ bctrl +/* 8008F4D8 0008C438 4E 80 04 21 */ bctrl /* 8008F4DC 0008C43C 39 C1 00 8C */ addi r14, r1, 0x8c /* 8008F4E0 0008C440 38 81 00 48 */ addi r4, r1, 0x48 /* 8008F4E4 0008C444 7D C3 73 78 */ mr r3, r14 @@ -1976,7 +1976,7 @@ lbl_8008F570: /* 8008F580 0008C4E0 38 80 00 01 */ li r4, 1 /* 8008F584 0008C4E4 81 8C 00 08 */ lwz r12, 8(r12) /* 8008F588 0008C4E8 7D 89 03 A6 */ mtctr r12 -/* 8008F58C 0008C4EC 4E 80 04 21 */ bctrl +/* 8008F58C 0008C4EC 4E 80 04 21 */ bctrl lbl_8008F590: /* 8008F590 0008C4F0 7E 00 07 75 */ extsb. r0, r16 /* 8008F594 0008C4F4 91 CF 01 04 */ stw r14, 0x104(r15) @@ -2004,7 +2004,7 @@ lbl_8008F5A8: /* 8008F5E8 0008C548 81 83 00 00 */ lwz r12, 0(r3) /* 8008F5EC 0008C54C 81 8C 00 14 */ lwz r12, 0x14(r12) /* 8008F5F0 0008C550 7D 89 03 A6 */ mtctr r12 -/* 8008F5F4 0008C554 4E 80 04 21 */ bctrl +/* 8008F5F4 0008C554 4E 80 04 21 */ bctrl /* 8008F5F8 0008C558 C0 53 00 2C */ lfs f2, 0x2c(r19) /* 8008F5FC 0008C55C 38 81 00 80 */ addi r4, r1, 0x80 /* 8008F600 0008C560 C0 33 00 1C */ lfs f1, 0x1c(r19) @@ -2016,25 +2016,25 @@ lbl_8008F5A8: /* 8008F618 0008C578 81 83 00 00 */ lwz r12, 0(r3) /* 8008F61C 0008C57C 81 8C 00 20 */ lwz r12, 0x20(r12) /* 8008F620 0008C580 7D 89 03 A6 */ mtctr r12 -/* 8008F624 0008C584 4E 80 04 21 */ bctrl +/* 8008F624 0008C584 4E 80 04 21 */ bctrl /* 8008F628 0008C588 80 6F 01 04 */ lwz r3, 0x104(r15) /* 8008F62C 0008C58C 7E 84 A3 78 */ mr r4, r20 /* 8008F630 0008C590 81 83 00 00 */ lwz r12, 0(r3) /* 8008F634 0008C594 81 8C 00 24 */ lwz r12, 0x24(r12) /* 8008F638 0008C598 7D 89 03 A6 */ mtctr r12 -/* 8008F63C 0008C59C 4E 80 04 21 */ bctrl +/* 8008F63C 0008C59C 4E 80 04 21 */ bctrl /* 8008F640 0008C5A0 80 6F 01 04 */ lwz r3, 0x104(r15) /* 8008F644 0008C5A4 7F 44 D3 78 */ mr r4, r26 /* 8008F648 0008C5A8 81 83 00 00 */ lwz r12, 0(r3) /* 8008F64C 0008C5AC 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8008F650 0008C5B0 7D 89 03 A6 */ mtctr r12 -/* 8008F654 0008C5B4 4E 80 04 21 */ bctrl +/* 8008F654 0008C5B4 4E 80 04 21 */ bctrl /* 8008F658 0008C5B8 80 6F 01 04 */ lwz r3, 0x104(r15) /* 8008F65C 0008C5BC 38 9F 00 18 */ addi r4, r31, 0x18 /* 8008F660 0008C5C0 81 83 00 00 */ lwz r12, 0(r3) /* 8008F664 0008C5C4 81 8C 00 30 */ lwz r12, 0x30(r12) /* 8008F668 0008C5C8 7D 89 03 A6 */ mtctr r12 -/* 8008F66C 0008C5CC 4E 80 04 21 */ bctrl +/* 8008F66C 0008C5CC 4E 80 04 21 */ bctrl /* 8008F670 0008C5D0 80 6F 01 38 */ lwz r3, 0x138(r15) /* 8008F674 0008C5D4 80 8F 01 04 */ lwz r4, 0x104(r15) /* 8008F678 0008C5D8 7C 03 00 D0 */ neg r0, r3 @@ -2056,7 +2056,7 @@ lbl_8008F68C: /* 8008F6B4 0008C614 81 84 00 00 */ lwz r12, 0(r4) /* 8008F6B8 0008C618 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8008F6BC 0008C61C 7D 89 03 A6 */ mtctr r12 -/* 8008F6C0 0008C620 4E 80 04 21 */ bctrl +/* 8008F6C0 0008C620 4E 80 04 21 */ bctrl /* 8008F6C4 0008C624 39 C1 00 74 */ addi r14, r1, 0x74 /* 8008F6C8 0008C628 38 81 00 30 */ addi r4, r1, 0x30 /* 8008F6CC 0008C62C 7D C3 73 78 */ mr r3, r14 @@ -2100,7 +2100,7 @@ lbl_8008F750: /* 8008F760 0008C6C0 38 80 00 01 */ li r4, 1 /* 8008F764 0008C6C4 81 8C 00 08 */ lwz r12, 8(r12) /* 8008F768 0008C6C8 7D 89 03 A6 */ mtctr r12 -/* 8008F76C 0008C6CC 4E 80 04 21 */ bctrl +/* 8008F76C 0008C6CC 4E 80 04 21 */ bctrl lbl_8008F770: /* 8008F770 0008C6D0 7E 00 07 75 */ extsb. r0, r16 /* 8008F774 0008C6D4 91 CF 00 F4 */ stw r14, 0xf4(r15) @@ -2128,7 +2128,7 @@ lbl_8008F788: /* 8008F7C8 0008C728 81 83 00 00 */ lwz r12, 0(r3) /* 8008F7CC 0008C72C 81 8C 00 14 */ lwz r12, 0x14(r12) /* 8008F7D0 0008C730 7D 89 03 A6 */ mtctr r12 -/* 8008F7D4 0008C734 4E 80 04 21 */ bctrl +/* 8008F7D4 0008C734 4E 80 04 21 */ bctrl /* 8008F7D8 0008C738 C0 53 00 2C */ lfs f2, 0x2c(r19) /* 8008F7DC 0008C73C 38 81 00 68 */ addi r4, r1, 0x68 /* 8008F7E0 0008C740 C0 33 00 1C */ lfs f1, 0x1c(r19) @@ -2140,25 +2140,25 @@ lbl_8008F788: /* 8008F7F8 0008C758 81 83 00 00 */ lwz r12, 0(r3) /* 8008F7FC 0008C75C 81 8C 00 20 */ lwz r12, 0x20(r12) /* 8008F800 0008C760 7D 89 03 A6 */ mtctr r12 -/* 8008F804 0008C764 4E 80 04 21 */ bctrl +/* 8008F804 0008C764 4E 80 04 21 */ bctrl /* 8008F808 0008C768 80 6F 00 F4 */ lwz r3, 0xf4(r15) /* 8008F80C 0008C76C 7E 84 A3 78 */ mr r4, r20 /* 8008F810 0008C770 81 83 00 00 */ lwz r12, 0(r3) /* 8008F814 0008C774 81 8C 00 24 */ lwz r12, 0x24(r12) /* 8008F818 0008C778 7D 89 03 A6 */ mtctr r12 -/* 8008F81C 0008C77C 4E 80 04 21 */ bctrl +/* 8008F81C 0008C77C 4E 80 04 21 */ bctrl /* 8008F820 0008C780 80 6F 00 F4 */ lwz r3, 0xf4(r15) /* 8008F824 0008C784 7F 44 D3 78 */ mr r4, r26 /* 8008F828 0008C788 81 83 00 00 */ lwz r12, 0(r3) /* 8008F82C 0008C78C 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8008F830 0008C790 7D 89 03 A6 */ mtctr r12 -/* 8008F834 0008C794 4E 80 04 21 */ bctrl +/* 8008F834 0008C794 4E 80 04 21 */ bctrl /* 8008F838 0008C798 80 6F 00 F4 */ lwz r3, 0xf4(r15) /* 8008F83C 0008C79C 38 9F 00 18 */ addi r4, r31, 0x18 /* 8008F840 0008C7A0 81 83 00 00 */ lwz r12, 0(r3) /* 8008F844 0008C7A4 81 8C 00 30 */ lwz r12, 0x30(r12) /* 8008F848 0008C7A8 7D 89 03 A6 */ mtctr r12 -/* 8008F84C 0008C7AC 4E 80 04 21 */ bctrl +/* 8008F84C 0008C7AC 4E 80 04 21 */ bctrl lbl_8008F850: /* 8008F850 0008C7B0 88 0F 00 E7 */ lbz r0, 0xe7(r15) /* 8008F854 0008C7B4 38 60 00 01 */ li r3, 1 @@ -2183,7 +2183,7 @@ lbl_8008F850: /* 8008F8A0 0008C800 80 01 03 34 */ lwz r0, 0x334(r1) /* 8008F8A4 0008C804 7C 08 03 A6 */ mtlr r0 /* 8008F8A8 0008C808 38 21 03 30 */ addi r1, r1, 0x330 -/* 8008F8AC 0008C80C 4E 80 00 20 */ blr +/* 8008F8AC 0008C80C 4E 80 00 20 */ blr .global "__dt__43TObjOwnerDerivedFromIObj<15CGenDescription>Fv" "__dt__43TObjOwnerDerivedFromIObj<15CGenDescription>Fv": @@ -2225,7 +2225,7 @@ lbl_8008F924: /* 8008F930 0008C890 83 C1 00 08 */ lwz r30, 8(r1) /* 8008F934 0008C894 7C 08 03 A6 */ mtlr r0 /* 8008F938 0008C898 38 21 00 10 */ addi r1, r1, 0x10 -/* 8008F93C 0008C89C 4E 80 00 20 */ blr +/* 8008F93C 0008C89C 4E 80 00 20 */ blr .global "GetNewDerivedObject__43TObjOwnerDerivedFromIObj<15CGenDescription>FP15CGenDescription" "GetNewDerivedObject__43TObjOwnerDerivedFromIObj<15CGenDescription>FP15CGenDescription": @@ -2265,7 +2265,7 @@ lbl_8008F9A4: /* 8008F9C0 0008C920 80 01 00 14 */ lwz r0, 0x14(r1) /* 8008F9C4 0008C924 7C 08 03 A6 */ mtlr r0 /* 8008F9C8 0008C928 38 21 00 10 */ addi r1, r1, 0x10 -/* 8008F9CC 0008C92C 4E 80 00 20 */ blr +/* 8008F9CC 0008C92C 4E 80 00 20 */ blr .global "__dt__48TObjOwnerDerivedFromIObj<20CElectricDescription>Fv" "__dt__48TObjOwnerDerivedFromIObj<20CElectricDescription>Fv": @@ -2307,7 +2307,7 @@ lbl_8008FA44: /* 8008FA50 0008C9B0 83 C1 00 08 */ lwz r30, 8(r1) /* 8008FA54 0008C9B4 7C 08 03 A6 */ mtlr r0 /* 8008FA58 0008C9B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8008FA5C 0008C9BC 4E 80 00 20 */ blr +/* 8008FA5C 0008C9BC 4E 80 00 20 */ blr .global "GetNewDerivedObject__48TObjOwnerDerivedFromIObj<20CElectricDescription>FP20CElectricDescription" "GetNewDerivedObject__48TObjOwnerDerivedFromIObj<20CElectricDescription>FP20CElectricDescription": @@ -2347,4 +2347,4 @@ lbl_8008FAC4: /* 8008FAE0 0008CA40 80 01 00 14 */ lwz r0, 0x14(r1) /* 8008FAE4 0008CA44 7C 08 03 A6 */ mtlr r0 /* 8008FAE8 0008CA48 38 21 00 10 */ addi r1, r1, 0x10 -/* 8008FAEC 0008CA4C 4E 80 00 20 */ blr +/* 8008FAEC 0008CA4C 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/ScriptObjects/CScriptGenerator.s b/asm/MetroidPrime/ScriptObjects/CScriptGenerator.s index be447e69..5ce7d9b1 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptGenerator.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptGenerator.s @@ -27,11 +27,11 @@ Accept__16CScriptGeneratorFR8IVisitor: /* 800B4520 000B1480 7C 04 03 78 */ mr r4, r0 /* 800B4524 000B1484 81 8C 00 24 */ lwz r12, 0x24(r12) /* 800B4528 000B1488 7D 89 03 A6 */ mtctr r12 -/* 800B452C 000B148C 4E 80 04 21 */ bctrl +/* 800B452C 000B148C 4E 80 04 21 */ bctrl /* 800B4530 000B1490 80 01 00 14 */ lwz r0, 0x14(r1) /* 800B4534 000B1494 7C 08 03 A6 */ mtlr r0 /* 800B4538 000B1498 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B453C 000B149C 4E 80 00 20 */ blr +/* 800B453C 000B149C 4E 80 00 20 */ blr .global AcceptScriptMsg__16CScriptGeneratorF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__16CScriptGeneratorF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -692,7 +692,7 @@ lbl_800B4E7C: /* 800B4EAC 000B1E0C 80 01 01 E4 */ lwz r0, 0x1e4(r1) /* 800B4EB0 000B1E10 7C 08 03 A6 */ mtlr r0 /* 800B4EB4 000B1E14 38 21 01 E0 */ addi r1, r1, 0x1e0 -/* 800B4EB8 000B1E18 4E 80 00 20 */ blr +/* 800B4EB8 000B1E18 4E 80 00 20 */ blr .global sub_800b4ebc sub_800b4ebc: @@ -714,7 +714,7 @@ sub_800b4ebc: /* 800B4EF8 000B1E58 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 800B4EFC 000B1E5C 7C 08 03 A6 */ mtlr r0 /* 800B4F00 000B1E60 38 21 00 20 */ addi r1, r1, 0x20 -/* 800B4F04 000B1E64 4E 80 00 20 */ blr +/* 800B4F04 000B1E64 4E 80 00 20 */ blr .global sub_800b4f08 sub_800b4f08: @@ -761,7 +761,7 @@ lbl_800B4F78: /* 800B4F94 000B1EF4 80 05 00 00 */ lwz r0, 0(r5) /* 800B4F98 000B1EF8 90 03 00 00 */ stw r0, 0(r3) /* 800B4F9C 000B1EFC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B4FA0 000B1F00 4E 80 00 20 */ blr +/* 800B4FA0 000B1F00 4E 80 00 20 */ blr .global __dt__16CScriptGenerator __dt__16CScriptGenerator: @@ -789,7 +789,7 @@ lbl_800B4FE8: /* 800B4FF4 000B1F54 83 C1 00 08 */ lwz r30, 8(r1) /* 800B4FF8 000B1F58 7C 08 03 A6 */ mtlr r0 /* 800B4FFC 000B1F5C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B5000 000B1F60 4E 80 00 20 */ blr +/* 800B5000 000B1F60 4E 80 00 20 */ blr .global "__ct__16CScriptGeneratorF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoibRC9CVector3fbbff" "__ct__16CScriptGeneratorF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoibRC9CVector3fbbff": @@ -844,7 +844,7 @@ lbl_800B4FE8: /* 800B50C4 000B2024 80 01 00 54 */ lwz r0, 0x54(r1) /* 800B50C8 000B2028 7C 08 03 A6 */ mtlr r0 /* 800B50CC 000B202C 38 21 00 50 */ addi r1, r1, 0x50 -/* 800B50D0 000B2030 4E 80 00 20 */ blr +/* 800B50D0 000B2030 4E 80 00 20 */ blr .global "reserve__Q24rstl71vector,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl71vector,Q24rstl17rmemory_allocator>Fi": @@ -917,4 +917,4 @@ lbl_800B51AC: /* 800B51B8 000B2118 83 A1 00 24 */ lwz r29, 0x24(r1) /* 800B51BC 000B211C 7C 08 03 A6 */ mtlr r0 /* 800B51C0 000B2120 38 21 00 30 */ addi r1, r1, 0x30 -/* 800B51C4 000B2124 4E 80 00 20 */ blr +/* 800B51C4 000B2124 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/ScriptObjects/CScriptGrapplePoint.s b/asm/MetroidPrime/ScriptObjects/CScriptGrapplePoint.s index d1f6f180..aa556f8e 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptGrapplePoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptGrapplePoint.s @@ -55,11 +55,11 @@ Accept__19CScriptGrapplePointFR8IVisitor: /* 8012F78C 0012C6EC 7C 04 03 78 */ mr r4, r0 /* 8012F790 0012C6F0 81 8C 00 8C */ lwz r12, 0x8c(r12) /* 8012F794 0012C6F4 7D 89 03 A6 */ mtctr r12 -/* 8012F798 0012C6F8 4E 80 04 21 */ bctrl +/* 8012F798 0012C6F8 4E 80 04 21 */ bctrl /* 8012F79C 0012C6FC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8012F7A0 0012C700 7C 08 03 A6 */ mtlr r0 /* 8012F7A4 0012C704 38 21 00 10 */ addi r1, r1, 0x10 -/* 8012F7A8 0012C708 4E 80 00 20 */ blr +/* 8012F7A8 0012C708 4E 80 00 20 */ blr .global AcceptScriptMsg__19CScriptGrapplePointF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__19CScriptGrapplePointF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -86,7 +86,7 @@ lbl_8012F7D8: /* 8012F7F8 0012C758 81 9F 00 00 */ lwz r12, 0(r31) /* 8012F7FC 0012C75C 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 8012F800 0012C760 7D 89 03 A6 */ mtctr r12 -/* 8012F804 0012C764 4E 80 04 21 */ bctrl +/* 8012F804 0012C764 4E 80 04 21 */ bctrl /* 8012F808 0012C768 48 00 00 34 */ b lbl_8012F83C lbl_8012F80C: /* 8012F80C 0012C76C 88 1F 00 30 */ lbz r0, 0x30(r31) @@ -100,28 +100,28 @@ lbl_8012F80C: /* 8012F82C 0012C78C 81 9F 00 00 */ lwz r12, 0(r31) /* 8012F830 0012C790 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 8012F834 0012C794 7D 89 03 A6 */ mtctr r12 -/* 8012F838 0012C798 4E 80 04 21 */ bctrl +/* 8012F838 0012C798 4E 80 04 21 */ bctrl lbl_8012F83C: /* 8012F83C 0012C79C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8012F840 0012C7A0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8012F844 0012C7A4 7C 08 03 A6 */ mtlr r0 /* 8012F848 0012C7A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8012F84C 0012C7AC 4E 80 00 20 */ blr +/* 8012F84C 0012C7AC 4E 80 00 20 */ blr .global Think__19CScriptGrapplePointFfR13CStateManager Think__19CScriptGrapplePointFfR13CStateManager: -/* 8012F850 0012C7B0 4E 80 00 20 */ blr +/* 8012F850 0012C7B0 4E 80 00 20 */ blr .global Render__19CScriptGrapplePointCFRC13CStateManager Render__19CScriptGrapplePointCFRC13CStateManager: -/* 8012F854 0012C7B4 4E 80 00 20 */ blr +/* 8012F854 0012C7B4 4E 80 00 20 */ blr .global GetTouchBounds__19CScriptGrapplePointCFv GetTouchBounds__19CScriptGrapplePointCFv: /* 8012F858 0012C7B8 38 00 00 01 */ li r0, 1 /* 8012F85C 0012C7BC 28 03 00 00 */ cmplwi r3, 0 /* 8012F860 0012C7C0 98 03 00 18 */ stb r0, 0x18(r3) -/* 8012F864 0012C7C4 4D 82 00 20 */ beqlr +/* 8012F864 0012C7C4 4D 82 00 20 */ beqlr /* 8012F868 0012C7C8 C0 04 00 E8 */ lfs f0, 0xe8(r4) /* 8012F86C 0012C7CC D0 03 00 00 */ stfs f0, 0(r3) /* 8012F870 0012C7D0 C0 04 00 EC */ lfs f0, 0xec(r4) @@ -134,7 +134,7 @@ GetTouchBounds__19CScriptGrapplePointCFv: /* 8012F88C 0012C7EC D0 03 00 10 */ stfs f0, 0x10(r3) /* 8012F890 0012C7F0 C0 04 00 FC */ lfs f0, 0xfc(r4) /* 8012F894 0012C7F4 D0 03 00 14 */ stfs f0, 0x14(r3) -/* 8012F898 0012C7F8 4E 80 00 20 */ blr +/* 8012F898 0012C7F8 4E 80 00 20 */ blr .global AddToRenderer__19CScriptGrapplePointCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__19CScriptGrapplePointCFRC14CFrustumPlanesRC13CStateManager: @@ -146,7 +146,7 @@ AddToRenderer__19CScriptGrapplePointCFRC14CFrustumPlanesRC13CStateManager: /* 8012F8B0 0012C810 80 01 00 14 */ lwz r0, 0x14(r1) /* 8012F8B4 0012C814 7C 08 03 A6 */ mtlr r0 /* 8012F8B8 0012C818 38 21 00 10 */ addi r1, r1, 0x10 -/* 8012F8BC 0012C81C 4E 80 00 20 */ blr +/* 8012F8BC 0012C81C 4E 80 00 20 */ blr .global __dt__19CScriptGrapplePointFv __dt__19CScriptGrapplePointFv: @@ -174,7 +174,7 @@ lbl_8012F904: /* 8012F910 0012C870 83 C1 00 08 */ lwz r30, 8(r1) /* 8012F914 0012C874 7C 08 03 A6 */ mtlr r0 /* 8012F918 0012C878 38 21 00 10 */ addi r1, r1, 0x10 -/* 8012F91C 0012C87C 4E 80 00 20 */ blr +/* 8012F91C 0012C87C 4E 80 00 20 */ blr .global "__ct__19CScriptGrapplePointF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fbRC18CGrappleParameters" "__ct__19CScriptGrapplePointF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fbRC18CGrappleParameters": diff --git a/asm/MetroidPrime/ScriptObjects/CScriptGunTurret.s b/asm/MetroidPrime/ScriptObjects/CScriptGunTurret.s index d6c787dd..e7af7033 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptGunTurret.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptGunTurret.s @@ -206,12 +206,12 @@ lbl_805A90CC: .global HealthInfo__16CScriptGunTurretFR13CStateManager HealthInfo__16CScriptGunTurretFR13CStateManager: /* 80215890 002127F0 38 63 02 64 */ addi r3, r3, 0x264 -/* 80215894 002127F4 4E 80 00 20 */ blr +/* 80215894 002127F4 4E 80 00 20 */ blr .global GetDamageVulnerability__16CScriptGunTurretCFv GetDamageVulnerability__16CScriptGunTurretCFv: /* 80215898 002127F8 38 63 02 6C */ addi r3, r3, 0x26c -/* 8021589C 002127FC 4E 80 00 20 */ blr +/* 8021589C 002127FC 4E 80 00 20 */ blr .global PlayerInsideTurretSphere__16CScriptGunTurretFR13CStateManager PlayerInsideTurretSphere__16CScriptGunTurretFR13CStateManager: @@ -252,7 +252,7 @@ PlayerInsideTurretSphere__16CScriptGunTurretFR13CStateManager: /* 80215928 00212888 81 84 00 00 */ lwz r12, 0(r4) /* 8021592C 0021288C 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 80215930 00212890 7D 89 03 A6 */ mtctr r12 -/* 80215934 00212894 4E 80 04 21 */ bctrl +/* 80215934 00212894 4E 80 04 21 */ bctrl /* 80215938 00212898 C0 7D 00 60 */ lfs f3, 0x60(r29) /* 8021593C 0021289C C0 01 00 1C */ lfs f0, 0x1c(r1) /* 80215940 002128A0 C0 9D 00 50 */ lfs f4, 0x50(r29) @@ -306,7 +306,7 @@ lbl_802159CC: /* 802159F8 00212958 83 A1 00 34 */ lwz r29, 0x34(r1) /* 802159FC 0021295C 7C 08 03 A6 */ mtlr r0 /* 80215A00 00212960 38 21 00 80 */ addi r1, r1, 0x80 -/* 80215A04 00212964 4E 80 00 20 */ blr +/* 80215A04 00212964 4E 80 00 20 */ blr .global UpdateFrozenState__16CScriptGunTurretFfR13CStateManager UpdateFrozenState__16CScriptGunTurretFfR13CStateManager: @@ -365,7 +365,7 @@ lbl_80215AC8: /* 80215ACC 00212A2C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80215AD0 00212A30 7C 08 03 A6 */ mtlr r0 /* 80215AD4 00212A34 38 21 00 20 */ addi r1, r1, 0x20 -/* 80215AD8 00212A38 4E 80 00 20 */ blr +/* 80215AD8 00212A38 4E 80 00 20 */ blr .global UpdateGunCollisionManager__16CScriptGunTurretFfR13CStateManager UpdateGunCollisionManager__16CScriptGunTurretFfR13CStateManager: @@ -398,7 +398,7 @@ UpdateGunCollisionManager__16CScriptGunTurretFfR13CStateManager: /* 80215B44 00212AA4 7C 80 03 78 */ or r0, r4, r0 /* 80215B48 00212AA8 54 04 0F FE */ srwi r4, r0, 0x1f /* 80215B4C 00212AAC 7D 89 03 A6 */ mtctr r12 -/* 80215B50 00212AB0 4E 80 04 21 */ bctrl +/* 80215B50 00212AB0 4E 80 04 21 */ bctrl lbl_80215B54: /* 80215B54 00212AB4 FC 20 F8 90 */ fmr f1, f31 /* 80215B58 00212AB8 80 7E 04 9C */ lwz r3, 0x49c(r30) @@ -411,7 +411,7 @@ lbl_80215B54: /* 80215B74 00212AD4 83 C1 00 20 */ lwz r30, 0x20(r1) /* 80215B78 00212AD8 7C 08 03 A6 */ mtlr r0 /* 80215B7C 00212ADC 38 21 00 30 */ addi r1, r1, 0x30 -/* 80215B80 00212AE0 4E 80 00 20 */ blr +/* 80215B80 00212AE0 4E 80 00 20 */ blr .global SetupCollisionManager__16CScriptGunTurretFR13CStateManager SetupCollisionManager__16CScriptGunTurretFR13CStateManager: @@ -687,7 +687,7 @@ lbl_80215F88: /* 80215F98 00212EF8 80 01 01 F4 */ lwz r0, 0x1f4(r1) /* 80215F9C 00212EFC 7C 08 03 A6 */ mtlr r0 /* 80215FA0 00212F00 38 21 01 F0 */ addi r1, r1, 0x1f0 -/* 80215FA4 00212F04 4E 80 00 20 */ blr +/* 80215FA4 00212F04 4E 80 00 20 */ blr .global LineOfSightTest__16CScriptGunTurretCFR13CStateManager LineOfSightTest__16CScriptGunTurretCFR13CStateManager: @@ -770,7 +770,7 @@ lbl_80216038: /* 802160D0 00213030 81 84 00 00 */ lwz r12, 0(r4) /* 802160D4 00213034 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 802160D8 00213038 7D 89 03 A6 */ mtctr r12 -/* 802160DC 0021303C 4E 80 04 21 */ bctrl +/* 802160DC 0021303C 4E 80 04 21 */ bctrl /* 802160E0 00213040 C0 21 00 1C */ lfs f1, 0x1c(r1) /* 802160E4 00213044 38 61 00 4C */ addi r3, r1, 0x4c /* 802160E8 00213048 C0 01 00 5C */ lfs f0, 0x5c(r1) @@ -882,7 +882,7 @@ lbl_80216260: /* 80216278 002131D8 83 81 09 30 */ lwz r28, 0x930(r1) /* 8021627C 002131DC 7C 08 03 A6 */ mtlr r0 /* 80216280 002131E0 38 21 09 50 */ addi r1, r1, 0x950 -/* 80216284 002131E4 4E 80 00 20 */ blr +/* 80216284 002131E4 4E 80 00 20 */ blr .global UpdateTargettingSound__16CScriptGunTurretFf UpdateTargettingSound__16CScriptGunTurretFf: @@ -1092,7 +1092,7 @@ lbl_80216558: /* 80216584 002134E4 83 E1 00 7C */ lwz r31, 0x7c(r1) /* 80216588 002134E8 7C 08 03 A6 */ mtlr r0 /* 8021658C 002134EC 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 80216590 002134F0 4E 80 00 20 */ blr +/* 80216590 002134F0 4E 80 00 20 */ blr .global UpdateBurstType__16CScriptGunTurretFR13CStateManager UpdateBurstType__16CScriptGunTurretFR13CStateManager: @@ -1188,7 +1188,7 @@ lbl_802166A4: /* 802166DC 0021363C 80 01 00 34 */ lwz r0, 0x34(r1) /* 802166E0 00213640 7C 08 03 A6 */ mtlr r0 /* 802166E4 00213644 38 21 00 30 */ addi r1, r1, 0x30 -/* 802166E8 00213648 4E 80 00 20 */ blr +/* 802166E8 00213648 4E 80 00 20 */ blr .global UpdateGunParticles__16CScriptGunTurretFfR13CStateManager UpdateGunParticles__16CScriptGunTurretFfR13CStateManager: @@ -1262,7 +1262,7 @@ lbl_80216750: /* 802167F4 00213754 81 9F 00 00 */ lwz r12, 0(r31) /* 802167F8 00213758 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 802167FC 0021375C 7D 89 03 A6 */ mtctr r12 -/* 80216800 00213760 4E 80 04 21 */ bctrl +/* 80216800 00213760 4E 80 04 21 */ bctrl lbl_80216804: /* 80216804 00213764 80 1E 05 20 */ lwz r0, 0x520(r30) /* 80216808 00213768 2C 00 00 06 */ cmpwi r0, 6 @@ -1286,37 +1286,37 @@ lbl_80216840: /* 80216848 002137A8 81 83 00 00 */ lwz r12, 0(r3) /* 8021684C 002137AC 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80216850 002137B0 7D 89 03 A6 */ mtctr r12 -/* 80216854 002137B4 4E 80 04 21 */ bctrl +/* 80216854 002137B4 4E 80 04 21 */ bctrl /* 80216858 002137B8 80 7E 04 74 */ lwz r3, 0x474(r30) /* 8021685C 002137BC 38 80 00 01 */ li r4, 1 /* 80216860 002137C0 81 83 00 00 */ lwz r12, 0(r3) /* 80216864 002137C4 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80216868 002137C8 7D 89 03 A6 */ mtctr r12 -/* 8021686C 002137CC 4E 80 04 21 */ bctrl +/* 8021686C 002137CC 4E 80 04 21 */ bctrl /* 80216870 002137D0 80 7E 04 7C */ lwz r3, 0x47c(r30) /* 80216874 002137D4 38 80 00 00 */ li r4, 0 /* 80216878 002137D8 81 83 00 00 */ lwz r12, 0(r3) /* 8021687C 002137DC 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80216880 002137E0 7D 89 03 A6 */ mtctr r12 -/* 80216884 002137E4 4E 80 04 21 */ bctrl +/* 80216884 002137E4 4E 80 04 21 */ bctrl /* 80216888 002137E8 80 7E 04 84 */ lwz r3, 0x484(r30) /* 8021688C 002137EC 38 80 00 00 */ li r4, 0 /* 80216890 002137F0 81 83 00 00 */ lwz r12, 0(r3) /* 80216894 002137F4 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80216898 002137F8 7D 89 03 A6 */ mtctr r12 -/* 8021689C 002137FC 4E 80 04 21 */ bctrl +/* 8021689C 002137FC 4E 80 04 21 */ bctrl /* 802168A0 00213800 80 7E 04 8C */ lwz r3, 0x48c(r30) /* 802168A4 00213804 38 80 00 00 */ li r4, 0 /* 802168A8 00213808 81 83 00 00 */ lwz r12, 0(r3) /* 802168AC 0021380C 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 802168B0 00213810 7D 89 03 A6 */ mtctr r12 -/* 802168B4 00213814 4E 80 04 21 */ bctrl +/* 802168B4 00213814 4E 80 04 21 */ bctrl /* 802168B8 00213818 80 7E 04 94 */ lwz r3, 0x494(r30) /* 802168BC 0021381C 38 80 00 00 */ li r4, 0 /* 802168C0 00213820 81 83 00 00 */ lwz r12, 0(r3) /* 802168C4 00213824 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 802168C8 00213828 7D 89 03 A6 */ mtctr r12 -/* 802168CC 0021382C 4E 80 04 21 */ bctrl +/* 802168CC 0021382C 4E 80 04 21 */ bctrl /* 802168D0 00213830 83 BE 04 74 */ lwz r29, 0x474(r30) /* 802168D4 00213834 38 61 01 F0 */ addi r3, r1, 0x1f0 /* 802168D8 00213838 38 9E 00 34 */ addi r4, r30, 0x34 @@ -1326,13 +1326,13 @@ lbl_80216840: /* 802168E8 00213848 81 9D 00 00 */ lwz r12, 0(r29) /* 802168EC 0021384C 81 8C 00 14 */ lwz r12, 0x14(r12) /* 802168F0 00213850 7D 89 03 A6 */ mtctr r12 -/* 802168F4 00213854 4E 80 04 21 */ bctrl +/* 802168F4 00213854 4E 80 04 21 */ bctrl /* 802168F8 00213858 80 7E 04 74 */ lwz r3, 0x474(r30) /* 802168FC 0021385C 38 81 00 C4 */ addi r4, r1, 0xc4 /* 80216900 00213860 81 83 00 00 */ lwz r12, 0(r3) /* 80216904 00213864 81 8C 00 20 */ lwz r12, 0x20(r12) /* 80216908 00213868 7D 89 03 A6 */ mtctr r12 -/* 8021690C 0021386C 4E 80 04 21 */ bctrl +/* 8021690C 0021386C 4E 80 04 21 */ bctrl /* 80216910 00213870 80 7E 00 64 */ lwz r3, 0x64(r30) /* 80216914 00213874 38 81 00 84 */ addi r4, r1, 0x84 /* 80216918 00213878 C0 03 00 00 */ lfs f0, 0(r3) @@ -1345,20 +1345,20 @@ lbl_80216840: /* 80216934 00213894 81 83 00 00 */ lwz r12, 0(r3) /* 80216938 00213898 81 8C 00 24 */ lwz r12, 0x24(r12) /* 8021693C 0021389C 7D 89 03 A6 */ mtctr r12 -/* 80216940 002138A0 4E 80 04 21 */ bctrl +/* 80216940 002138A0 4E 80 04 21 */ bctrl /* 80216944 002138A4 80 7E 04 74 */ lwz r3, 0x474(r30) /* 80216948 002138A8 FC 20 F8 90 */ fmr f1, f31 /* 8021694C 002138AC 81 83 00 00 */ lwz r12, 0(r3) /* 80216950 002138B0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80216954 002138B4 7D 89 03 A6 */ mtctr r12 -/* 80216958 002138B8 4E 80 04 21 */ bctrl +/* 80216958 002138B8 4E 80 04 21 */ bctrl /* 8021695C 002138BC 28 1F 00 00 */ cmplwi r31, 0 /* 80216960 002138C0 41 82 07 9C */ beq lbl_802170FC /* 80216964 002138C4 80 7E 04 74 */ lwz r3, 0x474(r30) /* 80216968 002138C8 81 83 00 00 */ lwz r12, 0(r3) /* 8021696C 002138CC 81 8C 00 64 */ lwz r12, 0x64(r12) /* 80216970 002138D0 7D 89 03 A6 */ mtctr r12 -/* 80216974 002138D4 4E 80 04 21 */ bctrl +/* 80216974 002138D4 4E 80 04 21 */ bctrl /* 80216978 002138D8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8021697C 002138DC 41 82 00 2C */ beq lbl_802169A8 /* 80216980 002138E0 80 9E 04 74 */ lwz r4, 0x474(r30) @@ -1366,7 +1366,7 @@ lbl_80216840: /* 80216988 002138E8 81 84 00 00 */ lwz r12, 0(r4) /* 8021698C 002138EC 81 8C 00 68 */ lwz r12, 0x68(r12) /* 80216990 002138F0 7D 89 03 A6 */ mtctr r12 -/* 80216994 002138F4 4E 80 04 21 */ bctrl +/* 80216994 002138F4 4E 80 04 21 */ bctrl /* 80216998 002138F8 7F E3 FB 78 */ mr r3, r31 /* 8021699C 002138FC 38 81 03 00 */ addi r4, r1, 0x300 /* 802169A0 00213900 4B E9 ED A5 */ bl SetLight__10CGameLightFRC6CLight @@ -1377,7 +1377,7 @@ lbl_802169A8: /* 802169B0 00213910 81 9F 00 00 */ lwz r12, 0(r31) /* 802169B4 00213914 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 802169B8 00213918 7D 89 03 A6 */ mtctr r12 -/* 802169BC 0021391C 4E 80 04 21 */ bctrl +/* 802169BC 0021391C 4E 80 04 21 */ bctrl /* 802169C0 00213920 48 00 07 3C */ b lbl_802170FC lbl_802169C4: /* 802169C4 00213924 80 7E 04 6C */ lwz r3, 0x46c(r30) @@ -1385,37 +1385,37 @@ lbl_802169C4: /* 802169CC 0021392C 81 83 00 00 */ lwz r12, 0(r3) /* 802169D0 00213930 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 802169D4 00213934 7D 89 03 A6 */ mtctr r12 -/* 802169D8 00213938 4E 80 04 21 */ bctrl +/* 802169D8 00213938 4E 80 04 21 */ bctrl /* 802169DC 0021393C 80 7E 04 74 */ lwz r3, 0x474(r30) /* 802169E0 00213940 38 80 00 00 */ li r4, 0 /* 802169E4 00213944 81 83 00 00 */ lwz r12, 0(r3) /* 802169E8 00213948 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 802169EC 0021394C 7D 89 03 A6 */ mtctr r12 -/* 802169F0 00213950 4E 80 04 21 */ bctrl +/* 802169F0 00213950 4E 80 04 21 */ bctrl /* 802169F4 00213954 80 7E 04 7C */ lwz r3, 0x47c(r30) /* 802169F8 00213958 38 80 00 00 */ li r4, 0 /* 802169FC 0021395C 81 83 00 00 */ lwz r12, 0(r3) /* 80216A00 00213960 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80216A04 00213964 7D 89 03 A6 */ mtctr r12 -/* 80216A08 00213968 4E 80 04 21 */ bctrl +/* 80216A08 00213968 4E 80 04 21 */ bctrl /* 80216A0C 0021396C 80 7E 04 84 */ lwz r3, 0x484(r30) /* 80216A10 00213970 38 80 00 00 */ li r4, 0 /* 80216A14 00213974 81 83 00 00 */ lwz r12, 0(r3) /* 80216A18 00213978 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80216A1C 0021397C 7D 89 03 A6 */ mtctr r12 -/* 80216A20 00213980 4E 80 04 21 */ bctrl +/* 80216A20 00213980 4E 80 04 21 */ bctrl /* 80216A24 00213984 80 7E 04 8C */ lwz r3, 0x48c(r30) /* 80216A28 00213988 38 80 00 00 */ li r4, 0 /* 80216A2C 0021398C 81 83 00 00 */ lwz r12, 0(r3) /* 80216A30 00213990 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80216A34 00213994 7D 89 03 A6 */ mtctr r12 -/* 80216A38 00213998 4E 80 04 21 */ bctrl +/* 80216A38 00213998 4E 80 04 21 */ bctrl /* 80216A3C 0021399C 80 7E 04 94 */ lwz r3, 0x494(r30) /* 80216A40 002139A0 38 80 00 00 */ li r4, 0 /* 80216A44 002139A4 81 83 00 00 */ lwz r12, 0(r3) /* 80216A48 002139A8 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80216A4C 002139AC 7D 89 03 A6 */ mtctr r12 -/* 80216A50 002139B0 4E 80 04 21 */ bctrl +/* 80216A50 002139B0 4E 80 04 21 */ bctrl /* 80216A54 002139B4 83 BE 04 6C */ lwz r29, 0x46c(r30) /* 80216A58 002139B8 38 61 01 C0 */ addi r3, r1, 0x1c0 /* 80216A5C 002139BC 38 9E 00 34 */ addi r4, r30, 0x34 @@ -1425,13 +1425,13 @@ lbl_802169C4: /* 80216A6C 002139CC 81 9D 00 00 */ lwz r12, 0(r29) /* 80216A70 002139D0 81 8C 00 14 */ lwz r12, 0x14(r12) /* 80216A74 002139D4 7D 89 03 A6 */ mtctr r12 -/* 80216A78 002139D8 4E 80 04 21 */ bctrl +/* 80216A78 002139D8 4E 80 04 21 */ bctrl /* 80216A7C 002139DC 80 7E 04 6C */ lwz r3, 0x46c(r30) /* 80216A80 002139E0 38 81 00 C4 */ addi r4, r1, 0xc4 /* 80216A84 002139E4 81 83 00 00 */ lwz r12, 0(r3) /* 80216A88 002139E8 81 8C 00 20 */ lwz r12, 0x20(r12) /* 80216A8C 002139EC 7D 89 03 A6 */ mtctr r12 -/* 80216A90 002139F0 4E 80 04 21 */ bctrl +/* 80216A90 002139F0 4E 80 04 21 */ bctrl /* 80216A94 002139F4 80 7E 00 64 */ lwz r3, 0x64(r30) /* 80216A98 002139F8 38 81 00 78 */ addi r4, r1, 0x78 /* 80216A9C 002139FC C0 03 00 00 */ lfs f0, 0(r3) @@ -1444,13 +1444,13 @@ lbl_802169C4: /* 80216AB8 00213A18 81 83 00 00 */ lwz r12, 0(r3) /* 80216ABC 00213A1C 81 8C 00 24 */ lwz r12, 0x24(r12) /* 80216AC0 00213A20 7D 89 03 A6 */ mtctr r12 -/* 80216AC4 00213A24 4E 80 04 21 */ bctrl +/* 80216AC4 00213A24 4E 80 04 21 */ bctrl /* 80216AC8 00213A28 80 7E 04 6C */ lwz r3, 0x46c(r30) /* 80216ACC 00213A2C FC 20 F8 90 */ fmr f1, f31 /* 80216AD0 00213A30 81 83 00 00 */ lwz r12, 0(r3) /* 80216AD4 00213A34 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80216AD8 00213A38 7D 89 03 A6 */ mtctr r12 -/* 80216ADC 00213A3C 4E 80 04 21 */ bctrl +/* 80216ADC 00213A3C 4E 80 04 21 */ bctrl /* 80216AE0 00213A40 28 1F 00 00 */ cmplwi r31, 0 /* 80216AE4 00213A44 41 82 06 18 */ beq lbl_802170FC /* 80216AE8 00213A48 7F E3 FB 78 */ mr r3, r31 @@ -1458,7 +1458,7 @@ lbl_802169C4: /* 80216AF0 00213A50 81 9F 00 00 */ lwz r12, 0(r31) /* 80216AF4 00213A54 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80216AF8 00213A58 7D 89 03 A6 */ mtctr r12 -/* 80216AFC 00213A5C 4E 80 04 21 */ bctrl +/* 80216AFC 00213A5C 4E 80 04 21 */ bctrl /* 80216B00 00213A60 48 00 05 FC */ b lbl_802170FC lbl_80216B04: /* 80216B04 00213A64 80 7E 04 6C */ lwz r3, 0x46c(r30) @@ -1466,37 +1466,37 @@ lbl_80216B04: /* 80216B0C 00213A6C 81 83 00 00 */ lwz r12, 0(r3) /* 80216B10 00213A70 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80216B14 00213A74 7D 89 03 A6 */ mtctr r12 -/* 80216B18 00213A78 4E 80 04 21 */ bctrl +/* 80216B18 00213A78 4E 80 04 21 */ bctrl /* 80216B1C 00213A7C 80 7E 04 74 */ lwz r3, 0x474(r30) /* 80216B20 00213A80 38 80 00 00 */ li r4, 0 /* 80216B24 00213A84 81 83 00 00 */ lwz r12, 0(r3) /* 80216B28 00213A88 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80216B2C 00213A8C 7D 89 03 A6 */ mtctr r12 -/* 80216B30 00213A90 4E 80 04 21 */ bctrl +/* 80216B30 00213A90 4E 80 04 21 */ bctrl /* 80216B34 00213A94 80 7E 04 7C */ lwz r3, 0x47c(r30) /* 80216B38 00213A98 38 80 00 00 */ li r4, 0 /* 80216B3C 00213A9C 81 83 00 00 */ lwz r12, 0(r3) /* 80216B40 00213AA0 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80216B44 00213AA4 7D 89 03 A6 */ mtctr r12 -/* 80216B48 00213AA8 4E 80 04 21 */ bctrl +/* 80216B48 00213AA8 4E 80 04 21 */ bctrl /* 80216B4C 00213AAC 80 7E 04 84 */ lwz r3, 0x484(r30) /* 80216B50 00213AB0 38 80 00 00 */ li r4, 0 /* 80216B54 00213AB4 81 83 00 00 */ lwz r12, 0(r3) /* 80216B58 00213AB8 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80216B5C 00213ABC 7D 89 03 A6 */ mtctr r12 -/* 80216B60 00213AC0 4E 80 04 21 */ bctrl +/* 80216B60 00213AC0 4E 80 04 21 */ bctrl /* 80216B64 00213AC4 80 7E 04 8C */ lwz r3, 0x48c(r30) /* 80216B68 00213AC8 38 80 00 00 */ li r4, 0 /* 80216B6C 00213ACC 81 83 00 00 */ lwz r12, 0(r3) /* 80216B70 00213AD0 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80216B74 00213AD4 7D 89 03 A6 */ mtctr r12 -/* 80216B78 00213AD8 4E 80 04 21 */ bctrl +/* 80216B78 00213AD8 4E 80 04 21 */ bctrl /* 80216B7C 00213ADC 80 7E 04 94 */ lwz r3, 0x494(r30) /* 80216B80 00213AE0 38 80 00 01 */ li r4, 1 /* 80216B84 00213AE4 81 83 00 00 */ lwz r12, 0(r3) /* 80216B88 00213AE8 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80216B8C 00213AEC 7D 89 03 A6 */ mtctr r12 -/* 80216B90 00213AF0 4E 80 04 21 */ bctrl +/* 80216B90 00213AF0 4E 80 04 21 */ bctrl /* 80216B94 00213AF4 83 BE 04 94 */ lwz r29, 0x494(r30) /* 80216B98 00213AF8 38 61 01 90 */ addi r3, r1, 0x190 /* 80216B9C 00213AFC 38 9E 00 34 */ addi r4, r30, 0x34 @@ -1506,13 +1506,13 @@ lbl_80216B04: /* 80216BAC 00213B0C 81 9D 00 00 */ lwz r12, 0(r29) /* 80216BB0 00213B10 81 8C 00 14 */ lwz r12, 0x14(r12) /* 80216BB4 00213B14 7D 89 03 A6 */ mtctr r12 -/* 80216BB8 00213B18 4E 80 04 21 */ bctrl +/* 80216BB8 00213B18 4E 80 04 21 */ bctrl /* 80216BBC 00213B1C 80 7E 04 94 */ lwz r3, 0x494(r30) /* 80216BC0 00213B20 38 81 00 C4 */ addi r4, r1, 0xc4 /* 80216BC4 00213B24 81 83 00 00 */ lwz r12, 0(r3) /* 80216BC8 00213B28 81 8C 00 20 */ lwz r12, 0x20(r12) /* 80216BCC 00213B2C 7D 89 03 A6 */ mtctr r12 -/* 80216BD0 00213B30 4E 80 04 21 */ bctrl +/* 80216BD0 00213B30 4E 80 04 21 */ bctrl /* 80216BD4 00213B34 80 7E 00 64 */ lwz r3, 0x64(r30) /* 80216BD8 00213B38 38 81 00 6C */ addi r4, r1, 0x6c /* 80216BDC 00213B3C C0 03 00 00 */ lfs f0, 0(r3) @@ -1525,13 +1525,13 @@ lbl_80216B04: /* 80216BF8 00213B58 81 83 00 00 */ lwz r12, 0(r3) /* 80216BFC 00213B5C 81 8C 00 24 */ lwz r12, 0x24(r12) /* 80216C00 00213B60 7D 89 03 A6 */ mtctr r12 -/* 80216C04 00213B64 4E 80 04 21 */ bctrl +/* 80216C04 00213B64 4E 80 04 21 */ bctrl /* 80216C08 00213B68 80 7E 04 94 */ lwz r3, 0x494(r30) /* 80216C0C 00213B6C FC 20 F8 90 */ fmr f1, f31 /* 80216C10 00213B70 81 83 00 00 */ lwz r12, 0(r3) /* 80216C14 00213B74 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80216C18 00213B78 7D 89 03 A6 */ mtctr r12 -/* 80216C1C 00213B7C 4E 80 04 21 */ bctrl +/* 80216C1C 00213B7C 4E 80 04 21 */ bctrl /* 80216C20 00213B80 28 1F 00 00 */ cmplwi r31, 0 /* 80216C24 00213B84 41 82 04 D8 */ beq lbl_802170FC /* 80216C28 00213B88 7F E3 FB 78 */ mr r3, r31 @@ -1539,7 +1539,7 @@ lbl_80216B04: /* 80216C30 00213B90 81 9F 00 00 */ lwz r12, 0(r31) /* 80216C34 00213B94 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80216C38 00213B98 7D 89 03 A6 */ mtctr r12 -/* 80216C3C 00213B9C 4E 80 04 21 */ bctrl +/* 80216C3C 00213B9C 4E 80 04 21 */ bctrl /* 80216C40 00213BA0 48 00 04 BC */ b lbl_802170FC lbl_80216C44: /* 80216C44 00213BA4 2C 00 00 0A */ cmpwi r0, 0xa @@ -1555,31 +1555,31 @@ lbl_80216C5C: /* 80216C64 00213BC4 81 83 00 00 */ lwz r12, 0(r3) /* 80216C68 00213BC8 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80216C6C 00213BCC 7D 89 03 A6 */ mtctr r12 -/* 80216C70 00213BD0 4E 80 04 21 */ bctrl +/* 80216C70 00213BD0 4E 80 04 21 */ bctrl /* 80216C74 00213BD4 80 7E 04 74 */ lwz r3, 0x474(r30) /* 80216C78 00213BD8 38 80 00 00 */ li r4, 0 /* 80216C7C 00213BDC 81 83 00 00 */ lwz r12, 0(r3) /* 80216C80 00213BE0 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80216C84 00213BE4 7D 89 03 A6 */ mtctr r12 -/* 80216C88 00213BE8 4E 80 04 21 */ bctrl +/* 80216C88 00213BE8 4E 80 04 21 */ bctrl /* 80216C8C 00213BEC 80 7E 04 7C */ lwz r3, 0x47c(r30) /* 80216C90 00213BF0 38 80 00 01 */ li r4, 1 /* 80216C94 00213BF4 81 83 00 00 */ lwz r12, 0(r3) /* 80216C98 00213BF8 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80216C9C 00213BFC 7D 89 03 A6 */ mtctr r12 -/* 80216CA0 00213C00 4E 80 04 21 */ bctrl +/* 80216CA0 00213C00 4E 80 04 21 */ bctrl /* 80216CA4 00213C04 80 7E 04 84 */ lwz r3, 0x484(r30) /* 80216CA8 00213C08 38 80 00 00 */ li r4, 0 /* 80216CAC 00213C0C 81 83 00 00 */ lwz r12, 0(r3) /* 80216CB0 00213C10 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80216CB4 00213C14 7D 89 03 A6 */ mtctr r12 -/* 80216CB8 00213C18 4E 80 04 21 */ bctrl +/* 80216CB8 00213C18 4E 80 04 21 */ bctrl /* 80216CBC 00213C1C 80 7E 04 8C */ lwz r3, 0x48c(r30) /* 80216CC0 00213C20 7F A4 EB 78 */ mr r4, r29 /* 80216CC4 00213C24 81 83 00 00 */ lwz r12, 0(r3) /* 80216CC8 00213C28 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80216CCC 00213C2C 7D 89 03 A6 */ mtctr r12 -/* 80216CD0 00213C30 4E 80 04 21 */ bctrl +/* 80216CD0 00213C30 4E 80 04 21 */ bctrl /* 80216CD4 00213C34 83 9E 04 7C */ lwz r28, 0x47c(r30) /* 80216CD8 00213C38 38 61 01 60 */ addi r3, r1, 0x160 /* 80216CDC 00213C3C 38 9E 00 34 */ addi r4, r30, 0x34 @@ -1589,13 +1589,13 @@ lbl_80216C5C: /* 80216CEC 00213C4C 81 9C 00 00 */ lwz r12, 0(r28) /* 80216CF0 00213C50 81 8C 00 14 */ lwz r12, 0x14(r12) /* 80216CF4 00213C54 7D 89 03 A6 */ mtctr r12 -/* 80216CF8 00213C58 4E 80 04 21 */ bctrl +/* 80216CF8 00213C58 4E 80 04 21 */ bctrl /* 80216CFC 00213C5C 80 7E 04 7C */ lwz r3, 0x47c(r30) /* 80216D00 00213C60 38 81 00 C4 */ addi r4, r1, 0xc4 /* 80216D04 00213C64 81 83 00 00 */ lwz r12, 0(r3) /* 80216D08 00213C68 81 8C 00 20 */ lwz r12, 0x20(r12) /* 80216D0C 00213C6C 7D 89 03 A6 */ mtctr r12 -/* 80216D10 00213C70 4E 80 04 21 */ bctrl +/* 80216D10 00213C70 4E 80 04 21 */ bctrl /* 80216D14 00213C74 80 7E 00 64 */ lwz r3, 0x64(r30) /* 80216D18 00213C78 38 81 00 60 */ addi r4, r1, 0x60 /* 80216D1C 00213C7C C0 03 00 00 */ lfs f0, 0(r3) @@ -1608,18 +1608,18 @@ lbl_80216C5C: /* 80216D38 00213C98 81 83 00 00 */ lwz r12, 0(r3) /* 80216D3C 00213C9C 81 8C 00 24 */ lwz r12, 0x24(r12) /* 80216D40 00213CA0 7D 89 03 A6 */ mtctr r12 -/* 80216D44 00213CA4 4E 80 04 21 */ bctrl +/* 80216D44 00213CA4 4E 80 04 21 */ bctrl /* 80216D48 00213CA8 80 7E 04 7C */ lwz r3, 0x47c(r30) /* 80216D4C 00213CAC FC 20 F8 90 */ fmr f1, f31 /* 80216D50 00213CB0 81 83 00 00 */ lwz r12, 0(r3) /* 80216D54 00213CB4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80216D58 00213CB8 7D 89 03 A6 */ mtctr r12 -/* 80216D5C 00213CBC 4E 80 04 21 */ bctrl +/* 80216D5C 00213CBC 4E 80 04 21 */ bctrl /* 80216D60 00213CC0 80 7E 04 7C */ lwz r3, 0x47c(r30) /* 80216D64 00213CC4 81 83 00 00 */ lwz r12, 0(r3) /* 80216D68 00213CC8 81 8C 00 64 */ lwz r12, 0x64(r12) /* 80216D6C 00213CCC 7D 89 03 A6 */ mtctr r12 -/* 80216D70 00213CD0 4E 80 04 21 */ bctrl +/* 80216D70 00213CD0 4E 80 04 21 */ bctrl /* 80216D74 00213CD4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80216D78 00213CD8 41 82 00 2C */ beq lbl_80216DA4 /* 80216D7C 00213CDC 80 9E 04 7C */ lwz r4, 0x47c(r30) @@ -1627,7 +1627,7 @@ lbl_80216C5C: /* 80216D84 00213CE4 81 84 00 00 */ lwz r12, 0(r4) /* 80216D88 00213CE8 81 8C 00 68 */ lwz r12, 0x68(r12) /* 80216D8C 00213CEC 7D 89 03 A6 */ mtctr r12 -/* 80216D90 00213CF0 4E 80 04 21 */ bctrl +/* 80216D90 00213CF0 4E 80 04 21 */ bctrl /* 80216D94 00213CF4 7F E3 FB 78 */ mr r3, r31 /* 80216D98 00213CF8 38 81 02 B0 */ addi r4, r1, 0x2b0 /* 80216D9C 00213CFC 4B E9 E9 A9 */ bl SetLight__10CGameLightFRC6CLight @@ -1638,7 +1638,7 @@ lbl_80216DA4: /* 80216DAC 00213D0C 81 9F 00 00 */ lwz r12, 0(r31) /* 80216DB0 00213D10 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80216DB4 00213D14 7D 89 03 A6 */ mtctr r12 -/* 80216DB8 00213D18 4E 80 04 21 */ bctrl +/* 80216DB8 00213D18 4E 80 04 21 */ bctrl lbl_80216DBC: /* 80216DBC 00213D1C 57 A0 06 3F */ clrlwi. r0, r29, 0x18 /* 80216DC0 00213D20 41 82 03 3C */ beq lbl_802170FC @@ -1685,13 +1685,13 @@ lbl_80216DBC: /* 80216E64 00213DC4 81 9C 00 00 */ lwz r12, 0(r28) /* 80216E68 00213DC8 81 8C 00 14 */ lwz r12, 0x14(r12) /* 80216E6C 00213DCC 7D 89 03 A6 */ mtctr r12 -/* 80216E70 00213DD0 4E 80 04 21 */ bctrl +/* 80216E70 00213DD0 4E 80 04 21 */ bctrl /* 80216E74 00213DD4 80 7E 04 8C */ lwz r3, 0x48c(r30) /* 80216E78 00213DD8 38 81 00 B8 */ addi r4, r1, 0xb8 /* 80216E7C 00213DDC 81 83 00 00 */ lwz r12, 0(r3) /* 80216E80 00213DE0 81 8C 00 20 */ lwz r12, 0x20(r12) /* 80216E84 00213DE4 7D 89 03 A6 */ mtctr r12 -/* 80216E88 00213DE8 4E 80 04 21 */ bctrl +/* 80216E88 00213DE8 4E 80 04 21 */ bctrl /* 80216E8C 00213DEC 80 7E 00 64 */ lwz r3, 0x64(r30) /* 80216E90 00213DF0 38 81 00 2C */ addi r4, r1, 0x2c /* 80216E94 00213DF4 C0 03 00 00 */ lfs f0, 0(r3) @@ -1704,13 +1704,13 @@ lbl_80216DBC: /* 80216EB0 00213E10 81 83 00 00 */ lwz r12, 0(r3) /* 80216EB4 00213E14 81 8C 00 24 */ lwz r12, 0x24(r12) /* 80216EB8 00213E18 7D 89 03 A6 */ mtctr r12 -/* 80216EBC 00213E1C 4E 80 04 21 */ bctrl +/* 80216EBC 00213E1C 4E 80 04 21 */ bctrl /* 80216EC0 00213E20 80 7E 04 8C */ lwz r3, 0x48c(r30) /* 80216EC4 00213E24 FC 20 F8 90 */ fmr f1, f31 /* 80216EC8 00213E28 81 83 00 00 */ lwz r12, 0(r3) /* 80216ECC 00213E2C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80216ED0 00213E30 7D 89 03 A6 */ mtctr r12 -/* 80216ED4 00213E34 4E 80 04 21 */ bctrl +/* 80216ED4 00213E34 4E 80 04 21 */ bctrl /* 80216ED8 00213E38 48 00 02 24 */ b lbl_802170FC lbl_80216EDC: /* 80216EDC 00213E3C 80 7E 04 6C */ lwz r3, 0x46c(r30) @@ -1718,43 +1718,43 @@ lbl_80216EDC: /* 80216EE4 00213E44 81 83 00 00 */ lwz r12, 0(r3) /* 80216EE8 00213E48 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80216EEC 00213E4C 7D 89 03 A6 */ mtctr r12 -/* 80216EF0 00213E50 4E 80 04 21 */ bctrl +/* 80216EF0 00213E50 4E 80 04 21 */ bctrl /* 80216EF4 00213E54 80 7E 04 74 */ lwz r3, 0x474(r30) /* 80216EF8 00213E58 38 80 00 00 */ li r4, 0 /* 80216EFC 00213E5C 81 83 00 00 */ lwz r12, 0(r3) /* 80216F00 00213E60 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80216F04 00213E64 7D 89 03 A6 */ mtctr r12 -/* 80216F08 00213E68 4E 80 04 21 */ bctrl +/* 80216F08 00213E68 4E 80 04 21 */ bctrl /* 80216F0C 00213E6C 80 7E 04 7C */ lwz r3, 0x47c(r30) /* 80216F10 00213E70 38 80 00 00 */ li r4, 0 /* 80216F14 00213E74 81 83 00 00 */ lwz r12, 0(r3) /* 80216F18 00213E78 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80216F1C 00213E7C 7D 89 03 A6 */ mtctr r12 -/* 80216F20 00213E80 4E 80 04 21 */ bctrl +/* 80216F20 00213E80 4E 80 04 21 */ bctrl /* 80216F24 00213E84 80 7E 04 84 */ lwz r3, 0x484(r30) /* 80216F28 00213E88 38 80 00 00 */ li r4, 0 /* 80216F2C 00213E8C 81 83 00 00 */ lwz r12, 0(r3) /* 80216F30 00213E90 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80216F34 00213E94 7D 89 03 A6 */ mtctr r12 -/* 80216F38 00213E98 4E 80 04 21 */ bctrl +/* 80216F38 00213E98 4E 80 04 21 */ bctrl /* 80216F3C 00213E9C 80 7E 04 8C */ lwz r3, 0x48c(r30) /* 80216F40 00213EA0 38 80 00 00 */ li r4, 0 /* 80216F44 00213EA4 81 83 00 00 */ lwz r12, 0(r3) /* 80216F48 00213EA8 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80216F4C 00213EAC 7D 89 03 A6 */ mtctr r12 -/* 80216F50 00213EB0 4E 80 04 21 */ bctrl +/* 80216F50 00213EB0 4E 80 04 21 */ bctrl /* 80216F54 00213EB4 80 7E 04 94 */ lwz r3, 0x494(r30) /* 80216F58 00213EB8 38 80 00 00 */ li r4, 0 /* 80216F5C 00213EBC 81 83 00 00 */ lwz r12, 0(r3) /* 80216F60 00213EC0 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80216F64 00213EC4 7D 89 03 A6 */ mtctr r12 -/* 80216F68 00213EC8 4E 80 04 21 */ bctrl +/* 80216F68 00213EC8 4E 80 04 21 */ bctrl /* 80216F6C 00213ECC 80 7E 04 94 */ lwz r3, 0x494(r30) /* 80216F70 00213ED0 FC 20 F8 90 */ fmr f1, f31 /* 80216F74 00213ED4 81 83 00 00 */ lwz r12, 0(r3) /* 80216F78 00213ED8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80216F7C 00213EDC 7D 89 03 A6 */ mtctr r12 -/* 80216F80 00213EE0 4E 80 04 21 */ bctrl +/* 80216F80 00213EE0 4E 80 04 21 */ bctrl /* 80216F84 00213EE4 28 1F 00 00 */ cmplwi r31, 0 /* 80216F88 00213EE8 41 82 01 74 */ beq lbl_802170FC /* 80216F8C 00213EEC 7F E3 FB 78 */ mr r3, r31 @@ -1762,7 +1762,7 @@ lbl_80216EDC: /* 80216F94 00213EF4 81 9F 00 00 */ lwz r12, 0(r31) /* 80216F98 00213EF8 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80216F9C 00213EFC 7D 89 03 A6 */ mtctr r12 -/* 80216FA0 00213F00 4E 80 04 21 */ bctrl +/* 80216FA0 00213F00 4E 80 04 21 */ bctrl /* 80216FA4 00213F04 48 00 01 58 */ b lbl_802170FC lbl_80216FA8: /* 80216FA8 00213F08 80 7E 04 6C */ lwz r3, 0x46c(r30) @@ -1770,37 +1770,37 @@ lbl_80216FA8: /* 80216FB0 00213F10 81 83 00 00 */ lwz r12, 0(r3) /* 80216FB4 00213F14 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80216FB8 00213F18 7D 89 03 A6 */ mtctr r12 -/* 80216FBC 00213F1C 4E 80 04 21 */ bctrl +/* 80216FBC 00213F1C 4E 80 04 21 */ bctrl /* 80216FC0 00213F20 80 7E 04 74 */ lwz r3, 0x474(r30) /* 80216FC4 00213F24 38 80 00 00 */ li r4, 0 /* 80216FC8 00213F28 81 83 00 00 */ lwz r12, 0(r3) /* 80216FCC 00213F2C 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80216FD0 00213F30 7D 89 03 A6 */ mtctr r12 -/* 80216FD4 00213F34 4E 80 04 21 */ bctrl +/* 80216FD4 00213F34 4E 80 04 21 */ bctrl /* 80216FD8 00213F38 80 7E 04 7C */ lwz r3, 0x47c(r30) /* 80216FDC 00213F3C 38 80 00 00 */ li r4, 0 /* 80216FE0 00213F40 81 83 00 00 */ lwz r12, 0(r3) /* 80216FE4 00213F44 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80216FE8 00213F48 7D 89 03 A6 */ mtctr r12 -/* 80216FEC 00213F4C 4E 80 04 21 */ bctrl +/* 80216FEC 00213F4C 4E 80 04 21 */ bctrl /* 80216FF0 00213F50 80 7E 04 84 */ lwz r3, 0x484(r30) /* 80216FF4 00213F54 38 80 00 01 */ li r4, 1 /* 80216FF8 00213F58 81 83 00 00 */ lwz r12, 0(r3) /* 80216FFC 00213F5C 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80217000 00213F60 7D 89 03 A6 */ mtctr r12 -/* 80217004 00213F64 4E 80 04 21 */ bctrl +/* 80217004 00213F64 4E 80 04 21 */ bctrl /* 80217008 00213F68 80 7E 04 8C */ lwz r3, 0x48c(r30) /* 8021700C 00213F6C 38 80 00 00 */ li r4, 0 /* 80217010 00213F70 81 83 00 00 */ lwz r12, 0(r3) /* 80217014 00213F74 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80217018 00213F78 7D 89 03 A6 */ mtctr r12 -/* 8021701C 00213F7C 4E 80 04 21 */ bctrl +/* 8021701C 00213F7C 4E 80 04 21 */ bctrl /* 80217020 00213F80 80 7E 04 94 */ lwz r3, 0x494(r30) /* 80217024 00213F84 38 80 00 00 */ li r4, 0 /* 80217028 00213F88 81 83 00 00 */ lwz r12, 0(r3) /* 8021702C 00213F8C 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80217030 00213F90 7D 89 03 A6 */ mtctr r12 -/* 80217034 00213F94 4E 80 04 21 */ bctrl +/* 80217034 00213F94 4E 80 04 21 */ bctrl /* 80217038 00213F98 83 9E 04 84 */ lwz r28, 0x484(r30) /* 8021703C 00213F9C 38 61 00 D0 */ addi r3, r1, 0xd0 /* 80217040 00213FA0 38 9E 00 34 */ addi r4, r30, 0x34 @@ -1810,7 +1810,7 @@ lbl_80216FA8: /* 80217050 00213FB0 81 9C 00 00 */ lwz r12, 0(r28) /* 80217054 00213FB4 81 8C 00 14 */ lwz r12, 0x14(r12) /* 80217058 00213FB8 7D 89 03 A6 */ mtctr r12 -/* 8021705C 00213FBC 4E 80 04 21 */ bctrl +/* 8021705C 00213FBC 4E 80 04 21 */ bctrl /* 80217060 00213FC0 C0 5E 00 60 */ lfs f2, 0x60(r30) /* 80217064 00213FC4 38 81 00 20 */ addi r4, r1, 0x20 /* 80217068 00213FC8 C0 3E 00 50 */ lfs f1, 0x50(r30) @@ -1822,7 +1822,7 @@ lbl_80216FA8: /* 80217080 00213FE0 81 83 00 00 */ lwz r12, 0(r3) /* 80217084 00213FE4 81 8C 00 20 */ lwz r12, 0x20(r12) /* 80217088 00213FE8 7D 89 03 A6 */ mtctr r12 -/* 8021708C 00213FEC 4E 80 04 21 */ bctrl +/* 8021708C 00213FEC 4E 80 04 21 */ bctrl /* 80217090 00213FF0 80 7E 00 64 */ lwz r3, 0x64(r30) /* 80217094 00213FF4 38 81 00 14 */ addi r4, r1, 0x14 /* 80217098 00213FF8 C0 03 00 00 */ lfs f0, 0(r3) @@ -1835,13 +1835,13 @@ lbl_80216FA8: /* 802170B4 00214014 81 83 00 00 */ lwz r12, 0(r3) /* 802170B8 00214018 81 8C 00 24 */ lwz r12, 0x24(r12) /* 802170BC 0021401C 7D 89 03 A6 */ mtctr r12 -/* 802170C0 00214020 4E 80 04 21 */ bctrl +/* 802170C0 00214020 4E 80 04 21 */ bctrl /* 802170C4 00214024 80 7E 04 84 */ lwz r3, 0x484(r30) /* 802170C8 00214028 FC 20 F8 90 */ fmr f1, f31 /* 802170CC 0021402C 81 83 00 00 */ lwz r12, 0(r3) /* 802170D0 00214030 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802170D4 00214034 7D 89 03 A6 */ mtctr r12 -/* 802170D8 00214038 4E 80 04 21 */ bctrl +/* 802170D8 00214038 4E 80 04 21 */ bctrl /* 802170DC 0021403C 28 1F 00 00 */ cmplwi r31, 0 /* 802170E0 00214040 41 82 00 1C */ beq lbl_802170FC /* 802170E4 00214044 7F E3 FB 78 */ mr r3, r31 @@ -1849,7 +1849,7 @@ lbl_80216FA8: /* 802170EC 0021404C 81 9F 00 00 */ lwz r12, 0(r31) /* 802170F0 00214050 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 802170F4 00214054 7D 89 03 A6 */ mtctr r12 -/* 802170F8 00214058 4E 80 04 21 */ bctrl +/* 802170F8 00214058 4E 80 04 21 */ bctrl lbl_802170FC: /* 802170FC 0021405C E3 E1 03 68 */ psq_l f31, 872(r1), 0, qr0 /* 80217100 00214060 80 01 03 74 */ lwz r0, 0x374(r1) @@ -1860,7 +1860,7 @@ lbl_802170FC: /* 80217114 00214074 83 81 03 50 */ lwz r28, 0x350(r1) /* 80217118 00214078 7C 08 03 A6 */ mtlr r0 /* 8021711C 0021407C 38 21 03 70 */ addi r1, r1, 0x370 -/* 80217120 00214080 4E 80 00 20 */ blr +/* 80217120 00214080 4E 80 00 20 */ blr .global PlayAdditiveChargingAnimation__16CScriptGunTurretFR13CStateManager PlayAdditiveChargingAnimation__16CScriptGunTurretFR13CStateManager: @@ -1971,7 +1971,7 @@ lbl_802172A0: /* 802172A8 00214208 83 C1 00 A8 */ lwz r30, 0xa8(r1) /* 802172AC 0021420C 7C 08 03 A6 */ mtlr r0 /* 802172B0 00214210 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 802172B4 00214214 4E 80 00 20 */ blr +/* 802172B4 00214214 4E 80 00 20 */ blr .global PlayAdditiveFlinchAnimation__16CScriptGunTurretFR13CStateManager PlayAdditiveFlinchAnimation__16CScriptGunTurretFR13CStateManager: @@ -2064,7 +2064,7 @@ lbl_802173F0: /* 802173F8 00214358 83 C1 00 A8 */ lwz r30, 0xa8(r1) /* 802173FC 0021435C 7C 08 03 A6 */ mtlr r0 /* 80217400 00214360 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 80217404 00214364 4E 80 00 20 */ blr +/* 80217404 00214364 4E 80 00 20 */ blr .global LaunchProjectile__16CScriptGunTurretFR13CStateManager LaunchProjectile__16CScriptGunTurretFR13CStateManager: @@ -2418,7 +2418,7 @@ lbl_80217918: /* 80217940 002148A0 83 81 02 50 */ lwz r28, 0x250(r1) /* 80217944 002148A4 7C 08 03 A6 */ mtlr r0 /* 80217948 002148A8 38 21 02 90 */ addi r1, r1, 0x290 -/* 8021794C 002148AC 4E 80 00 20 */ blr +/* 8021794C 002148AC 4E 80 00 20 */ blr .global ShouldFire__16CScriptGunTurretCFR13CStateManager ShouldFire__16CScriptGunTurretCFR13CStateManager: @@ -2444,7 +2444,7 @@ lbl_80217994: /* 80217994 002148F4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80217998 002148F8 7C 08 03 A6 */ mtlr r0 /* 8021799C 002148FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802179A0 00214900 4E 80 00 20 */ blr +/* 802179A0 00214900 4E 80 00 20 */ blr .global InDetectionRange__16CScriptGunTurretCFR13CStateManager InDetectionRange__16CScriptGunTurretCFR13CStateManager: @@ -2528,7 +2528,7 @@ lbl_80217AC0: /* 80217AC8 00214A28 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80217ACC 00214A2C 7C 08 03 A6 */ mtlr r0 /* 80217AD0 00214A30 38 21 00 30 */ addi r1, r1, 0x30 -/* 80217AD4 00214A34 4E 80 00 20 */ blr +/* 80217AD4 00214A34 4E 80 00 20 */ blr .global IsPlayerInFiringRange__16CScriptGunTurretCFR13CStateManager IsPlayerInFiringRange__16CScriptGunTurretCFR13CStateManager: @@ -2618,7 +2618,7 @@ lbl_80217C08: /* 80217C14 00214B74 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 80217C18 00214B78 7C 08 03 A6 */ mtlr r0 /* 80217C1C 00214B7C 38 21 00 40 */ addi r1, r1, 0x40 -/* 80217C20 00214B80 4E 80 00 20 */ blr +/* 80217C20 00214B80 4E 80 00 20 */ blr .global IsInsignificantRotation__16CScriptGunTurretCFf IsInsignificantRotation__16CScriptGunTurretCFf: @@ -2664,7 +2664,7 @@ IsInsignificantRotation__16CScriptGunTurretCFf: /* 80217CC0 00214C20 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 80217CC4 00214C24 7C 08 03 A6 */ mtlr r0 /* 80217CC8 00214C28 38 21 00 50 */ addi r1, r1, 0x50 -/* 80217CCC 00214C2C 4E 80 00 20 */ blr +/* 80217CCC 00214C2C 4E 80 00 20 */ blr .global UpdateHealthInfo__16CScriptGunTurretFR13CStateManager UpdateHealthInfo__16CScriptGunTurretFR13CStateManager: @@ -2733,7 +2733,7 @@ lbl_80217DA4: /* 80217DBC 00214D1C 81 83 00 00 */ lwz r12, 0(r3) /* 80217DC0 00214D20 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80217DC4 00214D24 7D 89 03 A6 */ mtctr r12 -/* 80217DC8 00214D28 4E 80 04 21 */ bctrl +/* 80217DC8 00214D28 4E 80 04 21 */ bctrl /* 80217DCC 00214D2C C0 23 00 00 */ lfs f1, 0(r3) /* 80217DD0 00214D30 C0 02 B3 5C */ lfs f0, lbl_805AD07C@sda21(r2) /* 80217DD4 00214D34 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -2760,7 +2760,7 @@ lbl_80217E1C: /* 80217E24 00214D84 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80217E28 00214D88 7C 08 03 A6 */ mtlr r0 /* 80217E2C 00214D8C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80217E30 00214D90 4E 80 00 20 */ blr +/* 80217E30 00214D90 4E 80 00 20 */ blr .global UpdateExtensionModelState__16CScriptGunTurretFf UpdateExtensionModelState__16CScriptGunTurretFf: @@ -2845,7 +2845,7 @@ lbl_80217F48: /* 80217F4C 00214EAC D0 43 00 04 */ stfs f2, 4(r3) /* 80217F50 00214EB0 D0 03 00 08 */ stfs f0, 8(r3) /* 80217F54 00214EB4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80217F58 00214EB8 4E 80 00 20 */ blr +/* 80217F58 00214EB8 4E 80 00 20 */ blr .global UpdateGunOrientation__16CScriptGunTurretFfR13CStateManager UpdateGunOrientation__16CScriptGunTurretFfR13CStateManager: @@ -3446,7 +3446,7 @@ lbl_802187F4: /* 80218820 00215780 83 A1 03 E4 */ lwz r29, 0x3e4(r1) /* 80218824 00215784 7C 08 03 A6 */ mtlr r0 /* 80218828 00215788 38 21 04 30 */ addi r1, r1, 0x430 -/* 8021882C 0021578C 4E 80 00 20 */ blr +/* 8021882C 0021578C 4E 80 00 20 */ blr .global UpdateTargettingMode__16CScriptGunTurretFfR13CStateManager UpdateTargettingMode__16CScriptGunTurretFfR13CStateManager: @@ -3556,7 +3556,7 @@ lbl_80218998: /* 802189B8 00215918 83 C1 00 18 */ lwz r30, 0x18(r1) /* 802189BC 0021591C 7C 08 03 A6 */ mtlr r0 /* 802189C0 00215920 38 21 00 50 */ addi r1, r1, 0x50 -/* 802189C4 00215924 4E 80 00 20 */ blr +/* 802189C4 00215924 4E 80 00 20 */ blr .global UpdateTurretAnimation__16CScriptGunTurretFv UpdateTurretAnimation__16CScriptGunTurretFv: @@ -3689,7 +3689,7 @@ lbl_80218B9C: /* 80218BA4 00215B04 83 C1 00 C8 */ lwz r30, 0xc8(r1) /* 80218BA8 00215B08 7C 08 03 A6 */ mtlr r0 /* 80218BAC 00215B0C 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 80218BB0 00215B10 4E 80 00 20 */ blr +/* 80218BB0 00215B10 4E 80 00 20 */ blr .global ProcessFrenzyState__16CScriptGunTurretFfR13CStateManager ProcessFrenzyState__16CScriptGunTurretFfR13CStateManager: @@ -3858,7 +3858,7 @@ lbl_80218E14: /* 80218E24 00215D84 83 C1 00 38 */ lwz r30, 0x38(r1) /* 80218E28 00215D88 7C 08 03 A6 */ mtlr r0 /* 80218E2C 00215D8C 38 21 00 50 */ addi r1, r1, 0x50 -/* 80218E30 00215D90 4E 80 00 20 */ blr +/* 80218E30 00215D90 4E 80 00 20 */ blr .global ProcessExitTargettingState__16CScriptGunTurretFfR13CStateManager ProcessExitTargettingState__16CScriptGunTurretFfR13CStateManager: @@ -3934,7 +3934,7 @@ lbl_80218F34: /* 80218F40 00215EA0 83 A1 00 D4 */ lwz r29, 0xd4(r1) /* 80218F44 00215EA4 7C 08 03 A6 */ mtlr r0 /* 80218F48 00215EA8 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 80218F4C 00215EAC 4E 80 00 20 */ blr +/* 80218F4C 00215EAC 4E 80 00 20 */ blr .global ProcessTargettingState__16CScriptGunTurretFfR13CStateManager ProcessTargettingState__16CScriptGunTurretFfR13CStateManager: @@ -4047,7 +4047,7 @@ lbl_80218FE4: /* 802190E8 00216048 81 84 00 00 */ lwz r12, 0(r4) /* 802190EC 0021604C 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 802190F0 00216050 7D 89 03 A6 */ mtctr r12 -/* 802190F4 00216054 4E 80 04 21 */ bctrl +/* 802190F4 00216054 4E 80 04 21 */ bctrl /* 802190F8 00216058 C0 01 00 90 */ lfs f0, 0x90(r1) /* 802190FC 0021605C 7F 85 E3 78 */ mr r5, r28 /* 80219100 00216060 38 61 00 78 */ addi r3, r1, 0x78 @@ -4062,7 +4062,7 @@ lbl_80218FE4: /* 80219124 00216084 7C 9E 23 78 */ mr r30, r4 /* 80219128 00216088 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 8021912C 0021608C 7D 89 03 A6 */ mtctr r12 -/* 80219130 00216090 4E 80 04 21 */ bctrl +/* 80219130 00216090 4E 80 04 21 */ bctrl /* 80219134 00216094 FC 20 F8 90 */ fmr f1, f31 /* 80219138 00216098 7F C7 F3 78 */ mr r7, r30 /* 8021913C 0021609C 38 61 00 84 */ addi r3, r1, 0x84 @@ -4261,7 +4261,7 @@ lbl_802193EC: /* 8021941C 0021637C 83 81 01 80 */ lwz r28, 0x180(r1) /* 80219420 00216380 7C 08 03 A6 */ mtlr r0 /* 80219424 00216384 38 21 01 D0 */ addi r1, r1, 0x1d0 -/* 80219428 00216388 4E 80 00 20 */ blr +/* 80219428 00216388 4E 80 00 20 */ blr .global ProcessPanningState__16CScriptGunTurretFfR13CStateManager ProcessPanningState__16CScriptGunTurretFfR13CStateManager: @@ -4370,7 +4370,7 @@ lbl_8021959C: /* 802195AC 0021650C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 802195B0 00216510 7C 08 03 A6 */ mtlr r0 /* 802195B4 00216514 38 21 00 30 */ addi r1, r1, 0x30 -/* 802195B8 00216518 4E 80 00 20 */ blr +/* 802195B8 00216518 4E 80 00 20 */ blr .global ProcessReadyState__16CScriptGunTurretFfR13CStateManager ProcessReadyState__16CScriptGunTurretFfR13CStateManager: @@ -4443,7 +4443,7 @@ lbl_802196AC: /* 802196B4 00216614 83 C1 00 18 */ lwz r30, 0x18(r1) /* 802196B8 00216618 7C 08 03 A6 */ mtlr r0 /* 802196BC 0021661C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802196C0 00216620 4E 80 00 20 */ blr +/* 802196C0 00216620 4E 80 00 20 */ blr .global ProcessInactiveState__16CScriptGunTurretFfR13CStateManager ProcessInactiveState__16CScriptGunTurretFfR13CStateManager: @@ -4491,7 +4491,7 @@ lbl_80219718: /* 80219760 002166C0 7F C4 F3 78 */ mr r4, r30 /* 80219764 002166C4 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80219768 002166C8 7D 89 03 A6 */ mtctr r12 -/* 8021976C 002166CC 4E 80 04 21 */ bctrl +/* 8021976C 002166CC 4E 80 04 21 */ bctrl /* 80219770 002166D0 C0 03 00 00 */ lfs f0, 0(r3) /* 80219774 002166D4 D0 1D 02 60 */ stfs f0, 0x260(r29) /* 80219778 002166D8 48 00 01 98 */ b lbl_80219910 @@ -4516,7 +4516,7 @@ lbl_8021977C: /* 802197C0 00216720 7F C4 F3 78 */ mr r4, r30 /* 802197C4 00216724 81 8C 00 34 */ lwz r12, 0x34(r12) /* 802197C8 00216728 7D 89 03 A6 */ mtctr r12 -/* 802197CC 0021672C 4E 80 04 21 */ bctrl +/* 802197CC 0021672C 4E 80 04 21 */ bctrl /* 802197D0 00216730 C0 23 00 00 */ lfs f1, 0(r3) /* 802197D4 00216734 C0 1D 02 60 */ lfs f0, 0x260(r29) /* 802197D8 00216738 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -4574,7 +4574,7 @@ lbl_80219884: /* 8021988C 002167EC 81 83 00 00 */ lwz r12, 0(r3) /* 80219890 002167F0 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80219894 002167F4 7D 89 03 A6 */ mtctr r12 -/* 80219898 002167F8 4E 80 04 21 */ bctrl +/* 80219898 002167F8 4E 80 04 21 */ bctrl /* 8021989C 002167FC 48 00 00 74 */ b lbl_80219910 lbl_802198A0: /* 802198A0 00216800 88 1D 05 60 */ lbz r0, 0x560(r29) @@ -4586,7 +4586,7 @@ lbl_802198A0: /* 802198B8 00216818 81 83 00 00 */ lwz r12, 0(r3) /* 802198BC 0021681C 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 802198C0 00216820 7D 89 03 A6 */ mtctr r12 -/* 802198C4 00216824 4E 80 04 21 */ bctrl +/* 802198C4 00216824 4E 80 04 21 */ bctrl /* 802198C8 00216828 A0 1D 02 5C */ lhz r0, 0x25c(r29) /* 802198CC 0021682C 7F C3 F3 78 */ mr r3, r30 /* 802198D0 00216830 38 81 00 08 */ addi r4, r1, 8 @@ -4602,7 +4602,7 @@ lbl_802198A0: /* 802198F8 00216858 7F C4 F3 78 */ mr r4, r30 /* 802198FC 0021685C 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80219900 00216860 7D 89 03 A6 */ mtctr r12 -/* 80219904 00216864 4E 80 04 21 */ bctrl +/* 80219904 00216864 4E 80 04 21 */ bctrl /* 80219908 00216868 C0 03 00 00 */ lfs f0, 0(r3) /* 8021990C 0021686C D0 1D 02 60 */ stfs f0, 0x260(r29) lbl_80219910: @@ -4615,7 +4615,7 @@ lbl_80219910: /* 80219928 00216888 83 81 00 30 */ lwz r28, 0x30(r1) /* 8021992C 0021688C 7C 08 03 A6 */ mtlr r0 /* 80219930 00216890 38 21 00 50 */ addi r1, r1, 0x50 -/* 80219934 00216894 4E 80 00 20 */ blr +/* 80219934 00216894 4E 80 00 20 */ blr .global ProcessDeactivatingState__16CScriptGunTurretFfR13CStateManager ProcessDeactivatingState__16CScriptGunTurretFfR13CStateManager: @@ -4642,7 +4642,7 @@ lbl_8021997C: /* 8021997C 002168DC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80219980 002168E0 7C 08 03 A6 */ mtlr r0 /* 80219984 002168E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80219988 002168E8 4E 80 00 20 */ blr +/* 80219988 002168E8 4E 80 00 20 */ blr .global ProcessCurrentState__16CScriptGunTurretFfR13CStateManager ProcessCurrentState__16CScriptGunTurretFfR13CStateManager: @@ -4657,7 +4657,7 @@ ProcessCurrentState__16CScriptGunTurretFfR13CStateManager: /* 802199AC 0021690C 38 C6 72 70 */ addi r6, r6, lbl_803E7270@l /* 802199B0 00216910 7C 06 00 2E */ lwzx r0, r6, r0 /* 802199B4 00216914 7C 09 03 A6 */ mtctr r0 -/* 802199B8 00216918 4E 80 04 20 */ bctr +/* 802199B8 00216918 4E 80 04 20 */ bctr .global lbl_802199BC lbl_802199BC: /* 802199BC 0021691C 4B FF FF 7D */ bl ProcessDeactivatingState__16CScriptGunTurretFfR13CStateManager @@ -4690,7 +4690,7 @@ lbl_802199F0: /* 802199F0 00216950 80 01 00 14 */ lwz r0, 0x14(r1) /* 802199F4 00216954 7C 08 03 A6 */ mtlr r0 /* 802199F8 00216958 38 21 00 10 */ addi r1, r1, 0x10 -/* 802199FC 0021695C 4E 80 00 20 */ blr +/* 802199FC 0021695C 4E 80 00 20 */ blr .global ProcessGunStateMachine__16CScriptGunTurretFfR13CStateManager ProcessGunStateMachine__16CScriptGunTurretFfR13CStateManager: @@ -4765,7 +4765,7 @@ lbl_80219AF4: /* 80219B08 00216A68 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80219B0C 00216A6C 7C 08 03 A6 */ mtlr r0 /* 80219B10 00216A70 38 21 00 40 */ addi r1, r1, 0x40 -/* 80219B14 00216A74 4E 80 00 20 */ blr +/* 80219B14 00216A74 4E 80 00 20 */ blr .global SetTurretState__16CScriptGunTurretFQ216CScriptGunTurret12ETurretState SetTurretState__16CScriptGunTurretFQ216CScriptGunTurret12ETurretState: @@ -4802,7 +4802,7 @@ lbl_80219B7C: /* 80219B88 00216AE8 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80219B8C 00216AEC 7C 08 03 A6 */ mtlr r0 /* 80219B90 00216AF0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80219B94 00216AF4 4E 80 00 20 */ blr +/* 80219B94 00216AF4 4E 80 00 20 */ blr .global GetOrbitPosition__16CScriptGunTurretCFRC13CStateManager GetOrbitPosition__16CScriptGunTurretCFRC13CStateManager: @@ -4815,12 +4815,12 @@ GetOrbitPosition__16CScriptGunTurretCFRC13CStateManager: /* 80219BB0 00216B10 81 84 00 00 */ lwz r12, 0(r4) /* 80219BB4 00216B14 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 80219BB8 00216B18 7D 89 03 A6 */ mtctr r12 -/* 80219BBC 00216B1C 4E 80 04 21 */ bctrl +/* 80219BBC 00216B1C 4E 80 04 21 */ bctrl /* 80219BC0 00216B20 80 01 00 14 */ lwz r0, 0x14(r1) /* 80219BC4 00216B24 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80219BC8 00216B28 7C 08 03 A6 */ mtlr r0 /* 80219BCC 00216B2C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80219BD0 00216B30 4E 80 00 20 */ blr +/* 80219BD0 00216B30 4E 80 00 20 */ blr .global GetAimPosition__16CScriptGunTurretCFRC13CStateManagerf GetAimPosition__16CScriptGunTurretCFRC13CStateManagerf: @@ -4882,7 +4882,7 @@ lbl_80219CA0: /* 80219CA8 00216C08 83 C1 00 98 */ lwz r30, 0x98(r1) /* 80219CAC 00216C0C 7C 08 03 A6 */ mtlr r0 /* 80219CB0 00216C10 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 80219CB4 00216C14 4E 80 00 20 */ blr +/* 80219CB4 00216C14 4E 80 00 20 */ blr .global Touch__16CScriptGunTurretFR6CActorR13CStateManager Touch__16CScriptGunTurretFR6CActorR13CStateManager: @@ -4915,7 +4915,7 @@ Touch__16CScriptGunTurretFR6CActorR13CStateManager: /* 80219D20 00216C80 81 9E 00 00 */ lwz r12, 0(r30) /* 80219D24 00216C84 81 8C 00 38 */ lwz r12, 0x38(r12) /* 80219D28 00216C88 7D 89 03 A6 */ mtctr r12 -/* 80219D2C 00216C8C 4E 80 04 21 */ bctrl +/* 80219D2C 00216C8C 4E 80 04 21 */ bctrl /* 80219D30 00216C90 88 1E 05 60 */ lbz r0, 0x560(r30) /* 80219D34 00216C94 54 00 CF FF */ rlwinm. r0, r0, 0x19, 0x1f, 0x1f /* 80219D38 00216C98 40 82 00 AC */ bne lbl_80219DE4 @@ -4978,7 +4978,7 @@ lbl_80219DF8: /* 80219E14 00216D74 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80219E18 00216D78 7C 08 03 A6 */ mtlr r0 /* 80219E1C 00216D7C 38 21 00 50 */ addi r1, r1, 0x50 -/* 80219E20 00216D80 4E 80 00 20 */ blr +/* 80219E20 00216D80 4E 80 00 20 */ blr .global GetTouchBounds__16CScriptGunTurretCFv GetTouchBounds__16CScriptGunTurretCFv: @@ -5027,7 +5027,7 @@ lbl_80219EC0: /* 80219EC4 00216E24 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 80219EC8 00216E28 7C 08 03 A6 */ mtlr r0 /* 80219ECC 00216E2C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80219ED0 00216E30 4E 80 00 20 */ blr +/* 80219ED0 00216E30 4E 80 00 20 */ blr .global AddToRenderer__16CScriptGunTurretCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__16CScriptGunTurretCFRC14CFrustumPlanesRC13CStateManager: @@ -5064,7 +5064,7 @@ lbl_80219F3C: /* 80219F44 00216EA4 81 83 00 00 */ lwz r12, 0(r3) /* 80219F48 00216EA8 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80219F4C 00216EAC 7D 89 03 A6 */ mtctr r12 -/* 80219F50 00216EB0 4E 80 04 21 */ bctrl +/* 80219F50 00216EB0 4E 80 04 21 */ bctrl /* 80219F54 00216EB4 48 00 00 9C */ b lbl_80219FF0 lbl_80219F58: /* 80219F58 00216EB8 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) @@ -5072,7 +5072,7 @@ lbl_80219F58: /* 80219F60 00216EC0 81 83 00 00 */ lwz r12, 0(r3) /* 80219F64 00216EC4 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80219F68 00216EC8 7D 89 03 A6 */ mtctr r12 -/* 80219F6C 00216ECC 4E 80 04 21 */ bctrl +/* 80219F6C 00216ECC 4E 80 04 21 */ bctrl /* 80219F70 00216ED0 48 00 00 80 */ b lbl_80219FF0 lbl_80219F74: /* 80219F74 00216ED4 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) @@ -5080,7 +5080,7 @@ lbl_80219F74: /* 80219F7C 00216EDC 81 83 00 00 */ lwz r12, 0(r3) /* 80219F80 00216EE0 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80219F84 00216EE4 7D 89 03 A6 */ mtctr r12 -/* 80219F88 00216EE8 4E 80 04 21 */ bctrl +/* 80219F88 00216EE8 4E 80 04 21 */ bctrl /* 80219F8C 00216EEC 48 00 00 64 */ b lbl_80219FF0 lbl_80219F90: /* 80219F90 00216EF0 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) @@ -5088,7 +5088,7 @@ lbl_80219F90: /* 80219F98 00216EF8 81 83 00 00 */ lwz r12, 0(r3) /* 80219F9C 00216EFC 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80219FA0 00216F00 7D 89 03 A6 */ mtctr r12 -/* 80219FA4 00216F04 4E 80 04 21 */ bctrl +/* 80219FA4 00216F04 4E 80 04 21 */ bctrl /* 80219FA8 00216F08 80 1F 05 20 */ lwz r0, 0x520(r31) /* 80219FAC 00216F0C 2C 00 00 0A */ cmpwi r0, 0xa /* 80219FB0 00216F10 41 82 00 0C */ beq lbl_80219FBC @@ -5100,7 +5100,7 @@ lbl_80219FBC: /* 80219FC4 00216F24 81 83 00 00 */ lwz r12, 0(r3) /* 80219FC8 00216F28 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80219FCC 00216F2C 7D 89 03 A6 */ mtctr r12 -/* 80219FD0 00216F30 4E 80 04 21 */ bctrl +/* 80219FD0 00216F30 4E 80 04 21 */ bctrl /* 80219FD4 00216F34 48 00 00 1C */ b lbl_80219FF0 lbl_80219FD8: /* 80219FD8 00216F38 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) @@ -5108,13 +5108,13 @@ lbl_80219FD8: /* 80219FE0 00216F40 81 83 00 00 */ lwz r12, 0(r3) /* 80219FE4 00216F44 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80219FE8 00216F48 7D 89 03 A6 */ mtctr r12 -/* 80219FEC 00216F4C 4E 80 04 21 */ bctrl +/* 80219FEC 00216F4C 4E 80 04 21 */ bctrl lbl_80219FF0: /* 80219FF0 00216F50 80 01 00 14 */ lwz r0, 0x14(r1) /* 80219FF4 00216F54 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80219FF8 00216F58 7C 08 03 A6 */ mtlr r0 /* 80219FFC 00216F5C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8021A000 00216F60 4E 80 00 20 */ blr +/* 8021A000 00216F60 4E 80 00 20 */ blr .global Render__16CScriptGunTurretCFRC13CStateManager Render__16CScriptGunTurretCFRC13CStateManager: @@ -5152,28 +5152,28 @@ lbl_8021A074: /* 8021A078 00216FD8 81 83 00 00 */ lwz r12, 0(r3) /* 8021A07C 00216FDC 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8021A080 00216FE0 7D 89 03 A6 */ mtctr r12 -/* 8021A084 00216FE4 4E 80 04 21 */ bctrl +/* 8021A084 00216FE4 4E 80 04 21 */ bctrl /* 8021A088 00216FE8 48 00 01 50 */ b lbl_8021A1D8 lbl_8021A08C: /* 8021A08C 00216FEC 80 7E 04 6C */ lwz r3, 0x46c(r30) /* 8021A090 00216FF0 81 83 00 00 */ lwz r12, 0(r3) /* 8021A094 00216FF4 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8021A098 00216FF8 7D 89 03 A6 */ mtctr r12 -/* 8021A09C 00216FFC 4E 80 04 21 */ bctrl +/* 8021A09C 00216FFC 4E 80 04 21 */ bctrl /* 8021A0A0 00217000 48 00 01 38 */ b lbl_8021A1D8 lbl_8021A0A4: /* 8021A0A4 00217004 80 7E 04 94 */ lwz r3, 0x494(r30) /* 8021A0A8 00217008 81 83 00 00 */ lwz r12, 0(r3) /* 8021A0AC 0021700C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8021A0B0 00217010 7D 89 03 A6 */ mtctr r12 -/* 8021A0B4 00217014 4E 80 04 21 */ bctrl +/* 8021A0B4 00217014 4E 80 04 21 */ bctrl /* 8021A0B8 00217018 48 00 01 20 */ b lbl_8021A1D8 lbl_8021A0BC: /* 8021A0BC 0021701C 80 7E 04 7C */ lwz r3, 0x47c(r30) /* 8021A0C0 00217020 81 83 00 00 */ lwz r12, 0(r3) /* 8021A0C4 00217024 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8021A0C8 00217028 7D 89 03 A6 */ mtctr r12 -/* 8021A0CC 0021702C 4E 80 04 21 */ bctrl +/* 8021A0CC 0021702C 4E 80 04 21 */ bctrl /* 8021A0D0 00217030 80 1E 05 20 */ lwz r0, 0x520(r30) /* 8021A0D4 00217034 2C 00 00 0A */ cmpwi r0, 0xa /* 8021A0D8 00217038 40 82 01 00 */ bne lbl_8021A1D8 @@ -5181,14 +5181,14 @@ lbl_8021A0BC: /* 8021A0E0 00217040 81 83 00 00 */ lwz r12, 0(r3) /* 8021A0E4 00217044 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8021A0E8 00217048 7D 89 03 A6 */ mtctr r12 -/* 8021A0EC 0021704C 4E 80 04 21 */ bctrl +/* 8021A0EC 0021704C 4E 80 04 21 */ bctrl /* 8021A0F0 00217050 48 00 00 E8 */ b lbl_8021A1D8 lbl_8021A0F4: /* 8021A0F4 00217054 80 7E 04 84 */ lwz r3, 0x484(r30) /* 8021A0F8 00217058 81 83 00 00 */ lwz r12, 0(r3) /* 8021A0FC 0021705C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8021A100 00217060 7D 89 03 A6 */ mtctr r12 -/* 8021A104 00217064 4E 80 04 21 */ bctrl +/* 8021A104 00217064 4E 80 04 21 */ bctrl /* 8021A108 00217068 48 00 00 D0 */ b lbl_8021A1D8 lbl_8021A10C: /* 8021A10C 0021706C 2C 00 00 00 */ cmpwi r0, 0 @@ -5248,7 +5248,7 @@ lbl_8021A1D8: /* 8021A1E0 00217140 83 C1 00 48 */ lwz r30, 0x48(r1) /* 8021A1E4 00217144 7C 08 03 A6 */ mtlr r0 /* 8021A1E8 00217148 38 21 00 50 */ addi r1, r1, 0x50 -/* 8021A1EC 0021714C 4E 80 00 20 */ blr +/* 8021A1EC 0021714C 4E 80 00 20 */ blr .global Accept__16CScriptGunTurretFR8IVisitor Accept__16CScriptGunTurretFR8IVisitor: @@ -5261,11 +5261,11 @@ Accept__16CScriptGunTurretFR8IVisitor: /* 8021A208 00217168 7C 04 03 78 */ mr r4, r0 /* 8021A20C 0021716C 81 8C 00 90 */ lwz r12, 0x90(r12) /* 8021A210 00217170 7D 89 03 A6 */ mtctr r12 -/* 8021A214 00217174 4E 80 04 21 */ bctrl +/* 8021A214 00217174 4E 80 04 21 */ bctrl /* 8021A218 00217178 80 01 00 14 */ lwz r0, 0x14(r1) /* 8021A21C 0021717C 7C 08 03 A6 */ mtlr r0 /* 8021A220 00217180 38 21 00 10 */ addi r1, r1, 0x10 -/* 8021A224 00217184 4E 80 00 20 */ blr +/* 8021A224 00217184 4E 80 00 20 */ blr .global AcceptScriptMsg__16CScriptGunTurretF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__16CScriptGunTurretF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -5288,7 +5288,7 @@ AcceptScriptMsg__16CScriptGunTurretF20EScriptObjectMessage9TUniqueIdR13CStateMan /* 8021A268 002171C8 38 63 72 A4 */ addi r3, r3, lbl_803E72A4@l /* 8021A26C 002171CC 7C 03 00 2E */ lwzx r0, r3, r0 /* 8021A270 002171D0 7C 09 03 A6 */ mtctr r0 -/* 8021A274 002171D4 4E 80 04 20 */ bctr +/* 8021A274 002171D4 4E 80 04 20 */ bctr .global lbl_8021A278 lbl_8021A278: /* 8021A278 002171D8 80 7E 04 9C */ lwz r3, 0x49c(r30) @@ -5316,7 +5316,7 @@ lbl_8021A2B0: /* 8021A2C0 00217220 81 83 00 00 */ lwz r12, 0(r3) /* 8021A2C4 00217224 81 8C 00 64 */ lwz r12, 0x64(r12) /* 8021A2C8 00217228 7D 89 03 A6 */ mtctr r12 -/* 8021A2CC 0021722C 4E 80 04 21 */ bctrl +/* 8021A2CC 0021722C 4E 80 04 21 */ bctrl /* 8021A2D0 00217230 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8021A2D4 00217234 41 82 01 28 */ beq lbl_8021A3FC /* 8021A2D8 00217238 7F E4 FB 78 */ mr r4, r31 @@ -5361,7 +5361,7 @@ lbl_8021A2B0: /* 8021A374 002172D4 81 84 00 00 */ lwz r12, 0(r4) /* 8021A378 002172D8 81 8C 00 68 */ lwz r12, 0x68(r12) /* 8021A37C 002172DC 7D 89 03 A6 */ mtctr r12 -/* 8021A380 002172E0 4E 80 04 21 */ bctrl +/* 8021A380 002172E0 4E 80 04 21 */ bctrl /* 8021A384 002172E4 38 60 00 00 */ li r3, 0 /* 8021A388 002172E8 38 00 00 01 */ li r0, 1 /* 8021A38C 002172EC 90 61 00 08 */ stw r3, 8(r1) @@ -5586,7 +5586,7 @@ lbl_8021A628: /* 8021A694 002175F4 81 83 00 00 */ lwz r12, 0(r3) /* 8021A698 002175F8 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8021A69C 002175FC 7D 89 03 A6 */ mtctr r12 -/* 8021A6A0 00217600 4E 80 04 21 */ bctrl +/* 8021A6A0 00217600 4E 80 04 21 */ bctrl /* 8021A6A4 00217604 C0 03 00 00 */ lfs f0, 0(r3) /* 8021A6A8 00217608 D0 1E 02 60 */ stfs f0, 0x260(r30) /* 8021A6AC 0021760C 48 00 00 DC */ b lbl_8021A788 @@ -5610,7 +5610,7 @@ lbl_8021A6D0: /* 8021A6E4 00217644 81 9E 00 00 */ lwz r12, 0(r30) /* 8021A6E8 00217648 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8021A6EC 0021764C 7D 89 03 A6 */ mtctr r12 -/* 8021A6F0 00217650 4E 80 04 21 */ bctrl +/* 8021A6F0 00217650 4E 80 04 21 */ bctrl /* 8021A6F4 00217654 C0 23 00 00 */ lfs f1, 0(r3) /* 8021A6F8 00217658 C0 02 B3 5C */ lfs f0, lbl_805AD07C@sda21(r2) /* 8021A6FC 0021765C FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -5654,7 +5654,7 @@ lbl_8021A788: /* 8021A78C 002176EC 80 01 01 C4 */ lwz r0, 0x1c4(r1) /* 8021A790 002176F0 7C 08 03 A6 */ mtlr r0 /* 8021A794 002176F4 38 21 01 C0 */ addi r1, r1, 0x1c0 -/* 8021A798 002176F8 4E 80 00 20 */ blr +/* 8021A798 002176F8 4E 80 00 20 */ blr .global Think__16CScriptGunTurretFfR13CStateManager Think__16CScriptGunTurretFfR13CStateManager: @@ -5812,7 +5812,7 @@ lbl_8021A9B4: /* 8021A9E0 00217940 83 A1 00 A4 */ lwz r29, 0xa4(r1) /* 8021A9E4 00217944 7C 08 03 A6 */ mtlr r0 /* 8021A9E8 00217948 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 8021A9EC 0021794C 4E 80 00 20 */ blr +/* 8021A9EC 0021794C 4E 80 00 20 */ blr .global __dt__16CScriptGunTurretFv __dt__16CScriptGunTurretFv: @@ -5857,7 +5857,7 @@ lbl_8021AA58: /* 8021AA7C 002179DC 38 80 00 01 */ li r4, 1 /* 8021AA80 002179E0 81 8C 00 08 */ lwz r12, 8(r12) /* 8021AA84 002179E4 7D 89 03 A6 */ mtctr r12 -/* 8021AA88 002179E8 4E 80 04 21 */ bctrl +/* 8021AA88 002179E8 4E 80 04 21 */ bctrl lbl_8021AA8C: /* 8021AA8C 002179EC 34 1E 04 88 */ addic. r0, r30, 0x488 /* 8021AA90 002179F0 41 82 00 30 */ beq lbl_8021AAC0 @@ -5871,7 +5871,7 @@ lbl_8021AA8C: /* 8021AAB0 00217A10 38 80 00 01 */ li r4, 1 /* 8021AAB4 00217A14 81 8C 00 08 */ lwz r12, 8(r12) /* 8021AAB8 00217A18 7D 89 03 A6 */ mtctr r12 -/* 8021AABC 00217A1C 4E 80 04 21 */ bctrl +/* 8021AABC 00217A1C 4E 80 04 21 */ bctrl lbl_8021AAC0: /* 8021AAC0 00217A20 34 1E 04 80 */ addic. r0, r30, 0x480 /* 8021AAC4 00217A24 41 82 00 30 */ beq lbl_8021AAF4 @@ -5885,7 +5885,7 @@ lbl_8021AAC0: /* 8021AAE4 00217A44 38 80 00 01 */ li r4, 1 /* 8021AAE8 00217A48 81 8C 00 08 */ lwz r12, 8(r12) /* 8021AAEC 00217A4C 7D 89 03 A6 */ mtctr r12 -/* 8021AAF0 00217A50 4E 80 04 21 */ bctrl +/* 8021AAF0 00217A50 4E 80 04 21 */ bctrl lbl_8021AAF4: /* 8021AAF4 00217A54 34 1E 04 78 */ addic. r0, r30, 0x478 /* 8021AAF8 00217A58 41 82 00 30 */ beq lbl_8021AB28 @@ -5899,7 +5899,7 @@ lbl_8021AAF4: /* 8021AB18 00217A78 38 80 00 01 */ li r4, 1 /* 8021AB1C 00217A7C 81 8C 00 08 */ lwz r12, 8(r12) /* 8021AB20 00217A80 7D 89 03 A6 */ mtctr r12 -/* 8021AB24 00217A84 4E 80 04 21 */ bctrl +/* 8021AB24 00217A84 4E 80 04 21 */ bctrl lbl_8021AB28: /* 8021AB28 00217A88 34 1E 04 70 */ addic. r0, r30, 0x470 /* 8021AB2C 00217A8C 41 82 00 30 */ beq lbl_8021AB5C @@ -5913,7 +5913,7 @@ lbl_8021AB28: /* 8021AB4C 00217AAC 38 80 00 01 */ li r4, 1 /* 8021AB50 00217AB0 81 8C 00 08 */ lwz r12, 8(r12) /* 8021AB54 00217AB4 7D 89 03 A6 */ mtctr r12 -/* 8021AB58 00217AB8 4E 80 04 21 */ bctrl +/* 8021AB58 00217AB8 4E 80 04 21 */ bctrl lbl_8021AB5C: /* 8021AB5C 00217ABC 34 1E 04 68 */ addic. r0, r30, 0x468 /* 8021AB60 00217AC0 41 82 00 30 */ beq lbl_8021AB90 @@ -5927,7 +5927,7 @@ lbl_8021AB5C: /* 8021AB80 00217AE0 38 80 00 01 */ li r4, 1 /* 8021AB84 00217AE4 81 8C 00 08 */ lwz r12, 8(r12) /* 8021AB88 00217AE8 7D 89 03 A6 */ mtctr r12 -/* 8021AB8C 00217AEC 4E 80 04 21 */ bctrl +/* 8021AB8C 00217AEC 4E 80 04 21 */ bctrl lbl_8021AB90: /* 8021AB90 00217AF0 34 1E 04 58 */ addic. r0, r30, 0x458 /* 8021AB94 00217AF4 41 82 00 30 */ beq lbl_8021ABC4 @@ -6046,7 +6046,7 @@ lbl_8021AD10: /* 8021AD1C 00217C7C 83 C1 00 08 */ lwz r30, 8(r1) /* 8021AD20 00217C80 7C 08 03 A6 */ mtlr r0 /* 8021AD24 00217C84 38 21 00 10 */ addi r1, r1, 0x10 -/* 8021AD28 00217C88 4E 80 00 20 */ blr +/* 8021AD28 00217C88 4E 80 00 20 */ blr .global "__ct__16CScriptGunTurretF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>Q216CScriptGunTurret16ETurretComponentRC11CEntityInfoRC12CTransform4fRC10CModelDataRC6CAABoxRC11CHealthInfoRC20CDamageVulnerabilityRC16CActorParametersRC20CScriptGunTurretData" "__ct__16CScriptGunTurretF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>Q216CScriptGunTurret16ETurretComponentRC11CEntityInfoRC12CTransform4fRC10CModelDataRC6CAABoxRC11CHealthInfoRC20CDamageVulnerabilityRC16CActorParametersRC20CScriptGunTurretData": @@ -6212,7 +6212,7 @@ lbl_8021ADF0: /* 8021AFA4 00217F04 81 84 00 00 */ lwz r12, 0(r4) /* 8021AFA8 00217F08 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8021AFAC 00217F0C 7D 89 03 A6 */ mtctr r12 -/* 8021AFB0 00217F10 4E 80 04 21 */ bctrl +/* 8021AFB0 00217F10 4E 80 04 21 */ bctrl /* 8021AFB4 00217F14 3A 5F 04 10 */ addi r18, r31, 0x410 /* 8021AFB8 00217F18 38 81 00 AC */ addi r4, r1, 0xac /* 8021AFBC 00217F1C 7E 43 93 78 */ mr r3, r18 @@ -6235,7 +6235,7 @@ lbl_8021ADF0: /* 8021B000 00217F60 81 84 00 00 */ lwz r12, 0(r4) /* 8021B004 00217F64 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8021B008 00217F68 7D 89 03 A6 */ mtctr r12 -/* 8021B00C 00217F6C 4E 80 04 21 */ bctrl +/* 8021B00C 00217F6C 4E 80 04 21 */ bctrl /* 8021B010 00217F70 3A 5F 04 1C */ addi r18, r31, 0x41c /* 8021B014 00217F74 38 81 00 9C */ addi r4, r1, 0x9c /* 8021B018 00217F78 7E 43 93 78 */ mr r3, r18 @@ -6258,7 +6258,7 @@ lbl_8021ADF0: /* 8021B05C 00217FBC 81 84 00 00 */ lwz r12, 0(r4) /* 8021B060 00217FC0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8021B064 00217FC4 7D 89 03 A6 */ mtctr r12 -/* 8021B068 00217FC8 4E 80 04 21 */ bctrl +/* 8021B068 00217FC8 4E 80 04 21 */ bctrl /* 8021B06C 00217FCC 3A 5F 04 28 */ addi r18, r31, 0x428 /* 8021B070 00217FD0 38 81 00 8C */ addi r4, r1, 0x8c /* 8021B074 00217FD4 7E 43 93 78 */ mr r3, r18 @@ -6281,7 +6281,7 @@ lbl_8021ADF0: /* 8021B0B8 00218018 81 84 00 00 */ lwz r12, 0(r4) /* 8021B0BC 0021801C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8021B0C0 00218020 7D 89 03 A6 */ mtctr r12 -/* 8021B0C4 00218024 4E 80 04 21 */ bctrl +/* 8021B0C4 00218024 4E 80 04 21 */ bctrl /* 8021B0C8 00218028 3A 5F 04 34 */ addi r18, r31, 0x434 /* 8021B0CC 0021802C 38 81 00 7C */ addi r4, r1, 0x7c /* 8021B0D0 00218030 7E 43 93 78 */ mr r3, r18 @@ -6304,7 +6304,7 @@ lbl_8021ADF0: /* 8021B114 00218074 81 84 00 00 */ lwz r12, 0(r4) /* 8021B118 00218078 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8021B11C 0021807C 7D 89 03 A6 */ mtctr r12 -/* 8021B120 00218080 4E 80 04 21 */ bctrl +/* 8021B120 00218080 4E 80 04 21 */ bctrl /* 8021B124 00218084 3A 5F 04 40 */ addi r18, r31, 0x440 /* 8021B128 00218088 38 81 00 6C */ addi r4, r1, 0x6c /* 8021B12C 0021808C 7E 43 93 78 */ mr r3, r18 @@ -6327,7 +6327,7 @@ lbl_8021ADF0: /* 8021B170 002180D0 81 84 00 00 */ lwz r12, 0(r4) /* 8021B174 002180D4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8021B178 002180D8 7D 89 03 A6 */ mtctr r12 -/* 8021B17C 002180DC 4E 80 04 21 */ bctrl +/* 8021B17C 002180DC 4E 80 04 21 */ bctrl /* 8021B180 002180E0 3A 5F 04 4C */ addi r18, r31, 0x44c /* 8021B184 002180E4 38 81 00 5C */ addi r4, r1, 0x5c /* 8021B188 002180E8 7E 43 93 78 */ mr r3, r18 @@ -6357,7 +6357,7 @@ lbl_8021ADF0: /* 8021B1E8 00218148 81 84 00 00 */ lwz r12, 0(r4) /* 8021B1EC 0021814C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8021B1F0 00218150 7D 89 03 A6 */ mtctr r12 -/* 8021B1F4 00218154 4E 80 04 21 */ bctrl +/* 8021B1F4 00218154 4E 80 04 21 */ bctrl /* 8021B1F8 00218158 3A 41 00 DC */ addi r18, r1, 0xdc /* 8021B1FC 0021815C 38 81 00 4C */ addi r4, r1, 0x4c /* 8021B200 00218160 7E 43 93 78 */ mr r3, r18 @@ -6740,7 +6740,7 @@ lbl_8021B770: /* 8021B780 002186E0 80 01 01 B4 */ lwz r0, 0x1b4(r1) /* 8021B784 002186E4 7C 08 03 A6 */ mtlr r0 /* 8021B788 002186E8 38 21 01 B0 */ addi r1, r1, 0x1b0 -/* 8021B78C 002186EC 4E 80 00 20 */ blr +/* 8021B78C 002186EC 4E 80 00 20 */ blr .global __ct__20CScriptGunTurretDataFRC20CScriptGunTurretData __ct__20CScriptGunTurretDataFRC20CScriptGunTurretData: @@ -6832,7 +6832,7 @@ __ct__20CScriptGunTurretDataFRC20CScriptGunTurretData: /* 8021B8E4 00218844 D0 03 00 9C */ stfs f0, 0x9c(r3) /* 8021B8E8 00218848 88 04 00 A0 */ lbz r0, 0xa0(r4) /* 8021B8EC 0021884C 98 03 00 A0 */ stb r0, 0xa0(r3) -/* 8021B8F0 00218850 4E 80 00 20 */ blr +/* 8021B8F0 00218850 4E 80 00 20 */ blr .global __ct__20CScriptGunTurretDataFR12CInputStreami __ct__20CScriptGunTurretDataFR12CInputStreami: @@ -7015,7 +7015,7 @@ lbl_8021BB78: /* 8021BB8C 00218AEC 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8021BB90 00218AF0 7C 08 03 A6 */ mtlr r0 /* 8021BB94 00218AF4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8021BB98 00218AF8 4E 80 00 20 */ blr +/* 8021BB98 00218AF8 4E 80 00 20 */ blr .global __sinit_CScriptGunTurret_cpp __sinit_CScriptGunTurret_cpp: diff --git a/asm/MetroidPrime/ScriptObjects/CScriptHUDMemo.s b/asm/MetroidPrime/ScriptObjects/CScriptHUDMemo.s index 1acfd86e..1e9cfc0a 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptHUDMemo.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptHUDMemo.s @@ -35,11 +35,11 @@ Accept__14CScriptHUDMemoFR8IVisitor: /* 800E8344 000E52A4 7C 04 03 78 */ mr r4, r0 /* 800E8348 000E52A8 81 8C 00 24 */ lwz r12, 0x24(r12) /* 800E834C 000E52AC 7D 89 03 A6 */ mtctr r12 -/* 800E8350 000E52B0 4E 80 04 21 */ bctrl +/* 800E8350 000E52B0 4E 80 04 21 */ bctrl /* 800E8354 000E52B4 80 01 00 14 */ lwz r0, 0x14(r1) /* 800E8358 000E52B8 7C 08 03 A6 */ mtlr r0 /* 800E835C 000E52BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E8360 000E52C0 4E 80 00 20 */ blr +/* 800E8360 000E52C0 4E 80 00 20 */ blr .global AcceptScriptMsg__14CScriptHUDMemoF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__14CScriptHUDMemoF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -137,7 +137,7 @@ lbl_800E8490: /* 800E84BC 000E541C 83 81 00 50 */ lwz r28, 0x50(r1) /* 800E84C0 000E5420 7C 08 03 A6 */ mtlr r0 /* 800E84C4 000E5424 38 21 00 60 */ addi r1, r1, 0x60 -/* 800E84C8 000E5428 4E 80 00 20 */ blr +/* 800E84C8 000E5428 4E 80 00 20 */ blr .global __dt__14CScriptHUDMemoFv __dt__14CScriptHUDMemoFv: @@ -181,7 +181,7 @@ lbl_800E8548: /* 800E8554 000E54B4 83 C1 00 08 */ lwz r30, 8(r1) /* 800E8558 000E54B8 7C 08 03 A6 */ mtlr r0 /* 800E855C 000E54BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E8560 000E54C0 4E 80 00 20 */ blr +/* 800E8560 000E54C0 4E 80 00 20 */ blr .global "__ct__14CScriptHUDMemoF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC13CHUDMemoParmsQ214CScriptHUDMemo12EDisplayTypeUib" "__ct__14CScriptHUDMemoF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC13CHUDMemoParmsQ214CScriptHUDMemo12EDisplayTypeUib": @@ -237,7 +237,7 @@ lbl_800E8608: /* 800E8624 000E5584 81 84 00 00 */ lwz r12, 0(r4) /* 800E8628 000E5588 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800E862C 000E558C 7D 89 03 A6 */ mtctr r12 -/* 800E8630 000E5590 4E 80 04 21 */ bctrl +/* 800E8630 000E5590 4E 80 04 21 */ bctrl /* 800E8634 000E5594 3B 01 00 2C */ addi r24, r1, 0x2c /* 800E8638 000E5598 38 81 00 0C */ addi r4, r1, 0xc /* 800E863C 000E559C 7F 03 C3 78 */ mr r3, r24 @@ -325,4 +325,4 @@ lbl_800E8758: /* 800E8760 000E56C0 80 01 00 74 */ lwz r0, 0x74(r1) /* 800E8764 000E56C4 7C 08 03 A6 */ mtlr r0 /* 800E8768 000E56C8 38 21 00 70 */ addi r1, r1, 0x70 -/* 800E876C 000E56CC 4E 80 00 20 */ blr +/* 800E876C 000E56CC 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/ScriptObjects/CScriptMazeNode.s b/asm/MetroidPrime/ScriptObjects/CScriptMazeNode.s index 3eb74513..a3ec2faa 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptMazeNode.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptMazeNode.s @@ -84,7 +84,7 @@ lbl_80288858: /* 80288864 002857C4 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80288868 002857C8 7C 08 03 A6 */ mtlr r0 /* 8028886C 002857CC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80288870 002857D0 4E 80 00 20 */ blr +/* 80288870 002857D0 4E 80 00 20 */ blr .global LoadMazeSeeds__15CScriptMazeNodeFv LoadMazeSeeds__15CScriptMazeNodeFv: @@ -99,7 +99,7 @@ LoadMazeSeeds__15CScriptMazeNodeFv: /* 80288894 002857F4 81 83 00 00 */ lwz r12, 0(r3) /* 80288898 002857F8 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 8028889C 002857FC 7D 89 03 A6 */ mtctr r12 -/* 802888A0 00285800 4E 80 04 21 */ bctrl +/* 802888A0 00285800 4E 80 04 21 */ bctrl /* 802888A4 00285804 80 CD A0 60 */ lwz r6, gpResourceFactory@sda21(r13) /* 802888A8 00285808 7C 64 1B 78 */ mr r4, r3 /* 802888AC 0028580C 38 A0 00 00 */ li r5, 0 @@ -131,14 +131,14 @@ lbl_802888D8: /* 80288910 00285870 38 80 00 01 */ li r4, 1 /* 80288914 00285874 81 8C 00 08 */ lwz r12, 8(r12) /* 80288918 00285878 7D 89 03 A6 */ mtctr r12 -/* 8028891C 0028587C 4E 80 04 21 */ bctrl +/* 8028891C 0028587C 4E 80 04 21 */ bctrl lbl_80288920: /* 80288920 00285880 80 01 00 24 */ lwz r0, 0x24(r1) /* 80288924 00285884 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80288928 00285888 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8028892C 0028588C 7C 08 03 A6 */ mtlr r0 /* 80288930 00285890 38 21 00 20 */ addi r1, r1, 0x20 -/* 80288934 00285894 4E 80 00 20 */ blr +/* 80288934 00285894 4E 80 00 20 */ blr .global Think__15CScriptMazeNodeFfR13CStateManager Think__15CScriptMazeNodeFfR13CStateManager: @@ -180,7 +180,7 @@ lbl_802889BC: /* 802889BC 0028591C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802889C0 00285920 7C 08 03 A6 */ mtlr r0 /* 802889C4 00285924 38 21 00 10 */ addi r1, r1, 0x10 -/* 802889C8 00285928 4E 80 00 20 */ blr +/* 802889C8 00285928 4E 80 00 20 */ blr .global AcceptScriptMsg__15CScriptMazeNodeF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__15CScriptMazeNodeF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -759,7 +759,7 @@ lbl_802891F0: /* 80289210 00286170 80 01 00 F4 */ lwz r0, 0xf4(r1) /* 80289214 00286174 7C 08 03 A6 */ mtlr r0 /* 80289218 00286178 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 8028921C 0028617C 4E 80 00 20 */ blr +/* 8028921C 0028617C 4E 80 00 20 */ blr .global sub_80289220 sub_80289220: @@ -834,7 +834,7 @@ sub_80289220: /* 80289330 00286290 83 A1 00 44 */ lwz r29, 0x44(r1) /* 80289334 00286294 7C 08 03 A6 */ mtlr r0 /* 80289338 00286298 38 21 00 50 */ addi r1, r1, 0x50 -/* 8028933C 0028629C 4E 80 00 20 */ blr +/* 8028933C 0028629C 4E 80 00 20 */ blr .global sub_80289340 sub_80289340: @@ -878,7 +878,7 @@ sub_80289340: /* 802893D4 00286334 80 01 00 24 */ lwz r0, 0x24(r1) /* 802893D8 00286338 7C 08 03 A6 */ mtlr r0 /* 802893DC 0028633C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802893E0 00286340 4E 80 00 20 */ blr +/* 802893E0 00286340 4E 80 00 20 */ blr .global sub_802893e4 sub_802893e4: @@ -1036,7 +1036,7 @@ lbl_80289608: /* 80289624 00286584 80 01 00 94 */ lwz r0, 0x94(r1) /* 80289628 00286588 7C 08 03 A6 */ mtlr r0 /* 8028962C 0028658C 38 21 00 90 */ addi r1, r1, 0x90 -/* 80289630 00286590 4E 80 00 20 */ blr +/* 80289630 00286590 4E 80 00 20 */ blr .global Accept__15CScriptMazeNodeFR8IVisitor Accept__15CScriptMazeNodeFR8IVisitor: @@ -1049,11 +1049,11 @@ Accept__15CScriptMazeNodeFR8IVisitor: /* 8028964C 002865AC 7C 04 03 78 */ mr r4, r0 /* 80289650 002865B0 81 8C 00 94 */ lwz r12, 0x94(r12) /* 80289654 002865B4 7D 89 03 A6 */ mtctr r12 -/* 80289658 002865B8 4E 80 04 21 */ bctrl +/* 80289658 002865B8 4E 80 04 21 */ bctrl /* 8028965C 002865BC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80289660 002865C0 7C 08 03 A6 */ mtlr r0 /* 80289664 002865C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80289668 002865C8 4E 80 00 20 */ blr +/* 80289668 002865C8 4E 80 00 20 */ blr .global "__ct__15CScriptMazeNodeF9TUniqueIdQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fbUiUiUiRC9CVector3fRC9CVector3fRC9CVector3f" "__ct__15CScriptMazeNodeF9TUniqueIdQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fbUiUiUiRC9CVector3fRC9CVector3fRC9CVector3f": @@ -1156,7 +1156,7 @@ Accept__15CScriptMazeNodeFR8IVisitor: /* 802897EC 0028674C 80 01 01 14 */ lwz r0, 0x114(r1) /* 802897F0 00286750 7C 08 03 A6 */ mtlr r0 /* 802897F4 00286754 38 21 01 10 */ addi r1, r1, 0x110 -/* 802897F8 00286758 4E 80 00 20 */ blr +/* 802897F8 00286758 4E 80 00 20 */ blr .global sub_802897fc sub_802897fc: @@ -1283,7 +1283,7 @@ lbl_802899A0: /* 802899B8 00286918 50 80 3E 30 */ rlwimi r0, r4, 7, 0x18, 0x18 /* 802899BC 0028691C 98 03 00 94 */ stb r0, 0x94(r3) /* 802899C0 00286920 38 21 01 10 */ addi r1, r1, 0x110 -/* 802899C4 00286924 4E 80 00 20 */ blr +/* 802899C4 00286924 4E 80 00 20 */ blr .global sub_802899c8 sub_802899c8: @@ -1643,7 +1643,7 @@ lbl_80289EE4: /* 80289EE8 00286E48 80 01 00 24 */ lwz r0, 0x24(r1) /* 80289EEC 00286E4C 7C 08 03 A6 */ mtlr r0 /* 80289EF0 00286E50 38 21 00 20 */ addi r1, r1, 0x20 -/* 80289EF4 00286E54 4E 80 00 20 */ blr +/* 80289EF4 00286E54 4E 80 00 20 */ blr .global sub_80289ef8 sub_80289ef8: @@ -1653,7 +1653,7 @@ sub_80289ef8: /* 80289F04 00286E64 54 03 08 3C */ slwi r3, r0, 1 /* 80289F08 00286E68 38 63 00 04 */ addi r3, r3, 4 /* 80289F0C 00286E6C 7C 65 1A 14 */ add r3, r5, r3 -/* 80289F10 00286E70 4E 80 00 20 */ blr +/* 80289F10 00286E70 4E 80 00 20 */ blr .global sub_80289f14 sub_80289f14: @@ -1663,7 +1663,7 @@ sub_80289f14: /* 80289F20 00286E80 54 03 08 3C */ slwi r3, r0, 1 /* 80289F24 00286E84 38 63 00 04 */ addi r3, r3, 4 /* 80289F28 00286E88 7C 65 1A 14 */ add r3, r5, r3 -/* 80289F2C 00286E8C 4E 80 00 20 */ blr +/* 80289F2C 00286E8C 4E 80 00 20 */ blr .global sub_80289f30 sub_80289f30: @@ -2288,7 +2288,7 @@ lbl_8028A870: /* 8028A888 002877E8 83 81 00 20 */ lwz r28, 0x20(r1) /* 8028A88C 002877EC 7C 08 03 A6 */ mtlr r0 /* 8028A890 002877F0 38 21 00 30 */ addi r1, r1, 0x30 -/* 8028A894 002877F4 4E 80 00 20 */ blr +/* 8028A894 002877F4 4E 80 00 20 */ blr .global sub_8028a898 sub_8028a898: @@ -2323,7 +2323,7 @@ sub_8028a898: /* 8028A908 00287868 80 01 00 24 */ lwz r0, 0x24(r1) /* 8028A90C 0028786C 7C 08 03 A6 */ mtlr r0 /* 8028A910 00287870 38 21 00 20 */ addi r1, r1, 0x20 -/* 8028A914 00287874 4E 80 00 20 */ blr +/* 8028A914 00287874 4E 80 00 20 */ blr .global sub_8028a918 sub_8028a918: @@ -2371,4 +2371,4 @@ sub_8028a918: /* 8028A9BC 0028791C 88 03 00 00 */ lbz r0, 0(r3) /* 8028A9C0 00287920 50 80 3E 30 */ rlwimi r0, r4, 7, 0x18, 0x18 /* 8028A9C4 00287924 98 03 00 00 */ stb r0, 0(r3) -/* 8028A9C8 00287928 4E 80 00 20 */ blr +/* 8028A9C8 00287928 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/ScriptObjects/CScriptMemoryRelay.s b/asm/MetroidPrime/ScriptObjects/CScriptMemoryRelay.s index 438ff308..d922a9ff 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptMemoryRelay.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptMemoryRelay.s @@ -27,11 +27,11 @@ Accept__18CScriptMemoryRelayFR8IVisitor: /* 80241908 0023E868 7C 04 03 78 */ mr r4, r0 /* 8024190C 0023E86C 81 8C 00 24 */ lwz r12, 0x24(r12) /* 80241910 0023E870 7D 89 03 A6 */ mtctr r12 -/* 80241914 0023E874 4E 80 04 21 */ bctrl +/* 80241914 0023E874 4E 80 04 21 */ bctrl /* 80241918 0023E878 80 01 00 14 */ lwz r0, 0x14(r1) /* 8024191C 0023E87C 7C 08 03 A6 */ mtlr r0 /* 80241920 0023E880 38 21 00 10 */ addi r1, r1, 0x10 -/* 80241924 0023E884 4E 80 00 20 */ blr +/* 80241924 0023E884 4E 80 00 20 */ blr .global AcceptScriptMsg__18CScriptMemoryRelayF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__18CScriptMemoryRelayF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -90,7 +90,7 @@ lbl_802419E0: /* 802419E8 0023E948 83 C1 00 28 */ lwz r30, 0x28(r1) /* 802419EC 0023E94C 7C 08 03 A6 */ mtlr r0 /* 802419F0 0023E950 38 21 00 30 */ addi r1, r1, 0x30 -/* 802419F4 0023E954 4E 80 00 20 */ blr +/* 802419F4 0023E954 4E 80 00 20 */ blr .global __dt__18CScriptMemoryRelayFv __dt__18CScriptMemoryRelayFv: @@ -118,7 +118,7 @@ lbl_80241A3C: /* 80241A48 0023E9A8 83 C1 00 08 */ lwz r30, 8(r1) /* 80241A4C 0023E9AC 7C 08 03 A6 */ mtlr r0 /* 80241A50 0023E9B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80241A54 0023E9B4 4E 80 00 20 */ blr +/* 80241A54 0023E9B4 4E 80 00 20 */ blr .global "__ct__18CScriptMemoryRelayF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfobbb" "__ct__18CScriptMemoryRelayF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfobbb": diff --git a/asm/MetroidPrime/ScriptObjects/CScriptMidi.s b/asm/MetroidPrime/ScriptObjects/CScriptMidi.s index d76e665d..5aa322c9 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptMidi.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptMidi.s @@ -39,7 +39,7 @@ lbl_8020B974: /* 8020B980 002088E0 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8020B984 002088E4 7C 08 03 A6 */ mtlr r0 /* 8020B988 002088E8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8020B98C 002088EC 4E 80 00 20 */ blr +/* 8020B98C 002088EC 4E 80 00 20 */ blr .global Stop__11CScriptMidiFR13CStateManagerf Stop__11CScriptMidiFR13CStateManagerf: @@ -90,7 +90,7 @@ lbl_8020BA1C: /* 8020BA3C 0020899C 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 8020BA40 002089A0 7C 08 03 A6 */ mtlr r0 /* 8020BA44 002089A4 38 21 00 50 */ addi r1, r1, 0x50 -/* 8020BA48 002089A8 4E 80 00 20 */ blr +/* 8020BA48 002089A8 4E 80 00 20 */ blr .global Play__11CScriptMidiFR13CStateManagerf Play__11CScriptMidiFR13CStateManagerf: @@ -145,7 +145,7 @@ Play__11CScriptMidiFR13CStateManagerf: /* 8020BB0C 00208A6C 81 84 00 00 */ lwz r12, 0(r4) /* 8020BB10 00208A70 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8020BB14 00208A74 7D 89 03 A6 */ mtctr r12 -/* 8020BB18 00208A78 4E 80 04 21 */ bctrl +/* 8020BB18 00208A78 4E 80 04 21 */ bctrl /* 8020BB1C 00208A7C 38 61 00 18 */ addi r3, r1, 0x18 /* 8020BB20 00208A80 38 81 00 20 */ addi r4, r1, 0x20 /* 8020BB24 00208A84 48 13 53 85 */ bl __ct__6CTokenFRC6CToken @@ -189,7 +189,7 @@ lbl_8020BB64: /* 8020BBB8 00208B18 83 C1 00 58 */ lwz r30, 0x58(r1) /* 8020BBBC 00208B1C 7C 08 03 A6 */ mtlr r0 /* 8020BBC0 00208B20 38 21 00 80 */ addi r1, r1, 0x80 -/* 8020BBC4 00208B24 4E 80 00 20 */ blr +/* 8020BBC4 00208B24 4E 80 00 20 */ blr .global __dt__11CScriptMidiFv __dt__11CScriptMidiFv: @@ -226,7 +226,7 @@ lbl_8020BC2C: /* 8020BC38 00208B98 83 C1 00 08 */ lwz r30, 8(r1) /* 8020BC3C 00208B9C 7C 08 03 A6 */ mtlr r0 /* 8020BC40 00208BA0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8020BC44 00208BA4 4E 80 00 20 */ blr +/* 8020BC44 00208BA4 4E 80 00 20 */ blr .global AcceptScriptMsg__11CScriptMidiF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__11CScriptMidiF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -282,7 +282,7 @@ lbl_8020BCEC: /* 8020BCF8 00208C58 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8020BCFC 00208C5C 7C 08 03 A6 */ mtlr r0 /* 8020BD00 00208C60 38 21 00 20 */ addi r1, r1, 0x20 -/* 8020BD04 00208C64 4E 80 00 20 */ blr +/* 8020BD04 00208C64 4E 80 00 20 */ blr .global Accept__11CScriptMidiFR8IVisitor Accept__11CScriptMidiFR8IVisitor: @@ -295,11 +295,11 @@ Accept__11CScriptMidiFR8IVisitor: /* 8020BD20 00208C80 7C 04 03 78 */ mr r4, r0 /* 8020BD24 00208C84 81 8C 00 24 */ lwz r12, 0x24(r12) /* 8020BD28 00208C88 7D 89 03 A6 */ mtctr r12 -/* 8020BD2C 00208C8C 4E 80 04 21 */ bctrl +/* 8020BD2C 00208C8C 4E 80 04 21 */ bctrl /* 8020BD30 00208C90 80 01 00 14 */ lwz r0, 0x14(r1) /* 8020BD34 00208C94 7C 08 03 A6 */ mtlr r0 /* 8020BD38 00208C98 38 21 00 10 */ addi r1, r1, 0x10 -/* 8020BD3C 00208C9C 4E 80 00 20 */ blr +/* 8020BD3C 00208C9C 4E 80 00 20 */ blr .global "__ct__11CScriptMidiF9TUniqueIdRC11CEntityInfoRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>bUiffi" "__ct__11CScriptMidiF9TUniqueIdRC11CEntityInfoRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>bUiffi": @@ -336,7 +336,7 @@ Accept__11CScriptMidiFR8IVisitor: /* 8020BDB8 00208D18 81 84 00 00 */ lwz r12, 0(r4) /* 8020BDBC 00208D1C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8020BDC0 00208D20 7D 89 03 A6 */ mtctr r12 -/* 8020BDC4 00208D24 4E 80 04 21 */ bctrl +/* 8020BDC4 00208D24 4E 80 04 21 */ bctrl /* 8020BDC8 00208D28 38 7D 00 34 */ addi r3, r29, 0x34 /* 8020BDCC 00208D2C 38 81 00 0C */ addi r4, r1, 0xc /* 8020BDD0 00208D30 48 13 50 D9 */ bl __ct__6CTokenFRC6CToken diff --git a/asm/MetroidPrime/ScriptObjects/CScriptPickup.s b/asm/MetroidPrime/ScriptObjects/CScriptPickup.s index 5ce4e67d..5e9562f5 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptPickup.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptPickup.s @@ -60,17 +60,17 @@ SetSpawned__13CScriptPickupFv: /* 800C25F4 000BF554 38 80 00 01 */ li r4, 1 /* 800C25F8 000BF558 50 80 3E 30 */ rlwimi r0, r4, 7, 0x18, 0x18 /* 800C25FC 000BF55C 98 03 02 8C */ stb r0, 0x28c(r3) -/* 800C2600 000BF560 4E 80 00 20 */ blr +/* 800C2600 000BF560 4E 80 00 20 */ blr .global GetPossibility__13CScriptPickupCFv GetPossibility__13CScriptPickupCFv: /* 800C2604 000BF564 C0 23 02 64 */ lfs f1, 0x264(r3) -/* 800C2608 000BF568 4E 80 00 20 */ blr +/* 800C2608 000BF568 4E 80 00 20 */ blr .global GetItem__13CScriptPickupCFv GetItem__13CScriptPickupCFv: /* 800C260C 000BF56C 80 63 02 58 */ lwz r3, 0x258(r3) -/* 800C2610 000BF570 4E 80 00 20 */ blr +/* 800C2610 000BF570 4E 80 00 20 */ blr .global Accept__13CScriptPickupFR8IVisitor Accept__13CScriptPickupFR8IVisitor: @@ -83,11 +83,11 @@ Accept__13CScriptPickupFR8IVisitor: /* 800C262C 000BF58C 7C 04 03 78 */ mr r4, r0 /* 800C2630 000BF590 81 8C 00 98 */ lwz r12, 0x98(r12) /* 800C2634 000BF594 7D 89 03 A6 */ mtctr r12 -/* 800C2638 000BF598 4E 80 04 21 */ bctrl +/* 800C2638 000BF598 4E 80 04 21 */ bctrl /* 800C263C 000BF59C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800C2640 000BF5A0 7C 08 03 A6 */ mtlr r0 /* 800C2644 000BF5A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C2648 000BF5A8 4E 80 00 20 */ blr +/* 800C2648 000BF5A8 4E 80 00 20 */ blr .global Render__13CScriptPickupCFRC13CStateManager Render__13CScriptPickupCFRC13CStateManager: @@ -98,7 +98,7 @@ Render__13CScriptPickupCFRC13CStateManager: /* 800C265C 000BF5BC 80 01 00 14 */ lwz r0, 0x14(r1) /* 800C2660 000BF5C0 7C 08 03 A6 */ mtlr r0 /* 800C2664 000BF5C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C2668 000BF5C8 4E 80 00 20 */ blr +/* 800C2668 000BF5C8 4E 80 00 20 */ blr .global AcceptScriptMsg__13CScriptPickupF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__13CScriptPickupF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -112,7 +112,7 @@ AcceptScriptMsg__13CScriptPickupF20EScriptObjectMessage9TUniqueIdR13CStateManage /* 800C2688 000BF5E8 80 01 00 14 */ lwz r0, 0x14(r1) /* 800C268C 000BF5EC 7C 08 03 A6 */ mtlr r0 /* 800C2690 000BF5F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C2694 000BF5F4 4E 80 00 20 */ blr +/* 800C2694 000BF5F4 4E 80 00 20 */ blr .global GetTouchBounds__13CScriptPickupCFv GetTouchBounds__13CScriptPickupCFv: @@ -144,7 +144,7 @@ lbl_800C26F4: /* 800C26F8 000BF658 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 800C26FC 000BF65C 7C 08 03 A6 */ mtlr r0 /* 800C2700 000BF660 38 21 00 30 */ addi r1, r1, 0x30 -/* 800C2704 000BF664 4E 80 00 20 */ blr +/* 800C2704 000BF664 4E 80 00 20 */ blr .global Touch__13CScriptPickupFR6CActorR13CStateManager Touch__13CScriptPickupFR6CActorR13CStateManager: @@ -335,7 +335,7 @@ lbl_800C29C8: /* 800C29C8 000BF928 81 83 00 00 */ lwz r12, 0(r3) /* 800C29CC 000BF92C 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 800C29D0 000BF930 7D 89 03 A6 */ mtctr r12 -/* 800C29D4 000BF934 4E 80 04 21 */ bctrl +/* 800C29D4 000BF934 4E 80 04 21 */ bctrl /* 800C29D8 000BF938 80 9E 0F 80 */ lwz r4, 0xf80(r30) /* 800C29DC 000BF93C 80 A3 00 04 */ lwz r5, 4(r3) /* 800C29E0 000BF940 7F C3 F3 78 */ mr r3, r30 @@ -379,7 +379,7 @@ lbl_800C2A6C: /* 800C2A70 000BF9D0 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 800C2A74 000BF9D4 7C 08 03 A6 */ mtlr r0 /* 800C2A78 000BF9D8 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 800C2A7C 000BF9DC 4E 80 00 20 */ blr +/* 800C2A7C 000BF9DC 4E 80 00 20 */ blr .global Think__13CScriptPickupFfR13CStateManager Think__13CScriptPickupFfR13CStateManager: @@ -779,7 +779,7 @@ lbl_800C3028: /* 800C304C 000BFFAC 83 A1 00 B4 */ lwz r29, 0xb4(r1) /* 800C3050 000BFFB0 7C 08 03 A6 */ mtlr r0 /* 800C3054 000BFFB4 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 800C3058 000BFFB8 4E 80 00 20 */ blr +/* 800C3058 000BFFB8 4E 80 00 20 */ blr .global __dt__13CScriptPickup __dt__13CScriptPickup: @@ -823,7 +823,7 @@ lbl_800C30D8: /* 800C30E4 000C0044 83 C1 00 08 */ lwz r30, 8(r1) /* 800C30E8 000C0048 7C 08 03 A6 */ mtlr r0 /* 800C30EC 000C004C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C30F0 000C0050 4E 80 00 20 */ blr +/* 800C30F0 000C0050 4E 80 00 20 */ blr .global "__ct__13CScriptPickupF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC16CActorParametersRC6CAABoxiiiiffffb" "__ct__13CScriptPickupF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC16CActorParametersRC6CAABoxiiiiffffb": @@ -939,7 +939,7 @@ lbl_800C30D8: /* 800C32A8 000C0208 81 84 00 00 */ lwz r12, 0(r4) /* 800C32AC 000C020C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800C32B0 000C0210 7D 89 03 A6 */ mtctr r12 -/* 800C32B4 000C0214 4E 80 04 21 */ bctrl +/* 800C32B4 000C0214 4E 80 04 21 */ bctrl /* 800C32B8 000C0218 38 61 00 40 */ addi r3, r1, 0x40 /* 800C32BC 000C021C 38 81 00 24 */ addi r4, r1, 0x24 /* 800C32C0 000C0220 48 27 DB E9 */ bl __ct__6CTokenFRC6CToken @@ -1046,4 +1046,4 @@ lbl_800C3410: /* 800C3438 000C0398 80 01 01 24 */ lwz r0, 0x124(r1) /* 800C343C 000C039C 7C 08 03 A6 */ mtlr r0 /* 800C3440 000C03A0 38 21 01 20 */ addi r1, r1, 0x120 -/* 800C3444 000C03A4 4E 80 00 20 */ blr +/* 800C3444 000C03A4 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/ScriptObjects/CScriptPickupGenerator.s b/asm/MetroidPrime/ScriptObjects/CScriptPickupGenerator.s index 8d984288..7ad13c8c 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptPickupGenerator.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptPickupGenerator.s @@ -35,11 +35,11 @@ Accept__22CScriptPickupGeneratorFR8IVisitor: /* 8015DEA0 0015AE00 7C 04 03 78 */ mr r4, r0 /* 8015DEA4 0015AE04 81 8C 00 24 */ lwz r12, 0x24(r12) /* 8015DEA8 0015AE08 7D 89 03 A6 */ mtctr r12 -/* 8015DEAC 0015AE0C 4E 80 04 21 */ bctrl +/* 8015DEAC 0015AE0C 4E 80 04 21 */ bctrl /* 8015DEB0 0015AE10 80 01 00 14 */ lwz r0, 0x14(r1) /* 8015DEB4 0015AE14 7C 08 03 A6 */ mtlr r0 /* 8015DEB8 0015AE18 38 21 00 10 */ addi r1, r1, 0x10 -/* 8015DEBC 0015AE1C 4E 80 00 20 */ blr +/* 8015DEBC 0015AE1C 4E 80 00 20 */ blr .global AcceptScriptMsg__22CScriptPickupGeneratorF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__22CScriptPickupGeneratorF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -281,7 +281,7 @@ lbl_8015E1F0: /* 8015E210 0015B170 80 01 00 D4 */ lwz r0, 0xd4(r1) /* 8015E214 0015B174 7C 08 03 A6 */ mtlr r0 /* 8015E218 0015B178 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 8015E21C 0015B17C 4E 80 00 20 */ blr +/* 8015E21C 0015B17C 4E 80 00 20 */ blr .global ResetDelayTimer__22CScriptPickupGeneratorFv ResetDelayTimer__22CScriptPickupGeneratorFv: @@ -294,11 +294,11 @@ ResetDelayTimer__22CScriptPickupGeneratorFv: /* 8015E238 0015B198 EC 00 10 24 */ fdivs f0, f0, f2 /* 8015E23C 0015B19C EC 01 00 2A */ fadds f0, f1, f0 /* 8015E240 0015B1A0 D0 03 00 44 */ stfs f0, 0x44(r3) -/* 8015E244 0015B1A4 4E 80 00 20 */ blr +/* 8015E244 0015B1A4 4E 80 00 20 */ blr lbl_8015E248: /* 8015E248 0015B1A8 C0 02 9F 48 */ lfs f0, lbl_805ABC68@sda21(r2) /* 8015E24C 0015B1AC D0 03 00 44 */ stfs f0, 0x44(r3) -/* 8015E250 0015B1B0 4E 80 00 20 */ blr +/* 8015E250 0015B1B0 4E 80 00 20 */ blr .global GeneratePickup__22CScriptPickupGeneratorFR13CStateManager9TUniqueId9TEditorId GeneratePickup__22CScriptPickupGeneratorFR13CStateManager9TUniqueId9TEditorId: @@ -435,7 +435,7 @@ lbl_8015E448: /* 8015E44C 0015B3AC 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 8015E450 0015B3B0 7C 08 03 A6 */ mtlr r0 /* 8015E454 0015B3B4 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8015E458 0015B3B8 4E 80 00 20 */ blr +/* 8015E458 0015B3B8 4E 80 00 20 */ blr .global "GetPickupTemplates__22CScriptPickupGeneratorFR13CStateManagerRQ24rstl35vector>" "GetPickupTemplates__22CScriptPickupGeneratorFR13CStateManagerRQ24rstl35vector>": @@ -641,7 +641,7 @@ lbl_8015E6F8: /* 8015E738 0015B698 80 01 00 84 */ lwz r0, 0x84(r1) /* 8015E73C 0015B69C 7C 08 03 A6 */ mtlr r0 /* 8015E740 0015B6A0 38 21 00 80 */ addi r1, r1, 0x80 -/* 8015E744 0015B6A4 4E 80 00 20 */ blr +/* 8015E744 0015B6A4 4E 80 00 20 */ blr .global "GetGeneratorIds__22CScriptPickupGeneratorFR13CStateManager9TUniqueIdRQ24rstl18vector<9TUniqueId>" "GetGeneratorIds__22CScriptPickupGeneratorFR13CStateManager9TUniqueIdRQ24rstl18vector<9TUniqueId>": @@ -755,7 +755,7 @@ lbl_8015E8C4: /* 8015E8C8 0015B828 80 01 00 44 */ lwz r0, 0x44(r1) /* 8015E8CC 0015B82C 7C 08 03 A6 */ mtlr r0 /* 8015E8D0 0015B830 38 21 00 40 */ addi r1, r1, 0x40 -/* 8015E8D4 0015B834 4E 80 00 20 */ blr +/* 8015E8D4 0015B834 4E 80 00 20 */ blr .global __dt__22CScriptPickupGeneratorFv __dt__22CScriptPickupGeneratorFv: @@ -783,7 +783,7 @@ lbl_8015E91C: /* 8015E928 0015B888 83 C1 00 08 */ lwz r30, 8(r1) /* 8015E92C 0015B88C 7C 08 03 A6 */ mtlr r0 /* 8015E930 0015B890 38 21 00 10 */ addi r1, r1, 0x10 -/* 8015E934 0015B894 4E 80 00 20 */ blr +/* 8015E934 0015B894 4E 80 00 20 */ blr .global "__ct__22CScriptPickupGeneratorF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC9CVector3ffb" "__ct__22CScriptPickupGeneratorF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC9CVector3ffb": @@ -827,7 +827,7 @@ lbl_8015E91C: /* 8015E9CC 0015B92C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8015E9D0 0015B930 7C 08 03 A6 */ mtlr r0 /* 8015E9D4 0015B934 38 21 00 30 */ addi r1, r1, 0x30 -/* 8015E9D8 0015B938 4E 80 00 20 */ blr +/* 8015E9D8 0015B938 4E 80 00 20 */ blr .global sub_8015e9dc sub_8015e9dc: diff --git a/asm/MetroidPrime/ScriptObjects/CScriptPlatform.s b/asm/MetroidPrime/ScriptObjects/CScriptPlatform.s index 6e237281..6ca5e64e 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptPlatform.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptPlatform.s @@ -150,7 +150,7 @@ Render__15CScriptPlatformCFRC13CStateManager: /* 800B0C78 000ADBD8 C0 42 8C B0 */ lfs f2, lbl_805AA9D0@sda21(r2) /* 800B0C7C 000ADBDC 81 8C 00 E0 */ lwz r12, 0xe0(r12) /* 800B0C80 000ADBE0 7D 89 03 A6 */ mtctr r12 -/* 800B0C84 000ADBE4 4E 80 04 21 */ bctrl +/* 800B0C84 000ADBE4 4E 80 04 21 */ bctrl lbl_800B0C88: /* 800B0C88 000ADBE8 7F A3 EB 78 */ mr r3, r29 /* 800B0C8C 000ADBEC 7F C4 F3 78 */ mr r4, r30 @@ -173,7 +173,7 @@ lbl_800B0CC0: /* 800B0CCC 000ADC2C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 800B0CD0 000ADC30 7C 08 03 A6 */ mtlr r0 /* 800B0CD4 000ADC34 38 21 00 20 */ addi r1, r1, 0x20 -/* 800B0CD8 000ADC38 4E 80 00 20 */ blr +/* 800B0CD8 000ADC38 4E 80 00 20 */ blr .global GetSortingBounds__15CScriptPlatformCFRC12CTransform4f GetSortingBounds__15CScriptPlatformCFRC12CTransform4f: @@ -211,7 +211,7 @@ lbl_800B0D44: /* 800B0D50 000ADCB0 83 A1 00 14 */ lwz r29, 0x14(r1) /* 800B0D54 000ADCB4 7C 08 03 A6 */ mtlr r0 /* 800B0D58 000ADCB8 38 21 00 20 */ addi r1, r1, 0x20 -/* 800B0D5C 000ADCBC 4E 80 00 20 */ blr +/* 800B0D5C 000ADCBC 4E 80 00 20 */ blr .global GetAimPosition__15CScriptPlatformCFRC13CStateManagerf GetAimPosition__15CScriptPlatformCFRC13CStateManagerf: @@ -230,7 +230,7 @@ GetAimPosition__15CScriptPlatformCFRC13CStateManagerf: /* 800B0D90 000ADCF0 81 84 00 00 */ lwz r12, 0(r4) /* 800B0D94 000ADCF4 81 8C 00 40 */ lwz r12, 0x40(r12) /* 800B0D98 000ADCF8 7D 89 03 A6 */ mtctr r12 -/* 800B0D9C 000ADCFC 4E 80 04 21 */ bctrl +/* 800B0D9C 000ADCFC 4E 80 04 21 */ bctrl /* 800B0DA0 000ADD00 88 61 00 3C */ lbz r3, 0x3c(r1) /* 800B0DA4 000ADD04 38 00 00 00 */ li r0, 0 /* 800B0DA8 000ADD08 28 03 00 00 */ cmplwi r3, 0 @@ -241,7 +241,7 @@ GetAimPosition__15CScriptPlatformCFRC13CStateManagerf: /* 800B0DBC 000ADD1C 81 9E 00 00 */ lwz r12, 0(r30) /* 800B0DC0 000ADD20 81 8C 00 40 */ lwz r12, 0x40(r12) /* 800B0DC4 000ADD24 7D 89 03 A6 */ mtctr r12 -/* 800B0DC8 000ADD28 4E 80 04 21 */ bctrl +/* 800B0DC8 000ADD28 4E 80 04 21 */ bctrl /* 800B0DCC 000ADD2C 7F A3 EB 78 */ mr r3, r29 /* 800B0DD0 000ADD30 38 81 00 08 */ addi r4, r1, 8 /* 800B0DD4 000ADD34 48 28 68 39 */ bl GetCenterPoint__6CAABoxCFv @@ -262,7 +262,7 @@ lbl_800B0DF8: /* 800B0E08 000ADD68 83 A1 00 4C */ lwz r29, 0x4c(r1) /* 800B0E0C 000ADD6C 7C 08 03 A6 */ mtlr r0 /* 800B0E10 000ADD70 38 21 00 60 */ addi r1, r1, 0x60 -/* 800B0E14 000ADD74 4E 80 00 20 */ blr +/* 800B0E14 000ADD74 4E 80 00 20 */ blr .global GetOrbitPosition__15CScriptPlatformCFRC13CStateManager GetOrbitPosition__15CScriptPlatformCFRC13CStateManager: @@ -275,12 +275,12 @@ GetOrbitPosition__15CScriptPlatformCFRC13CStateManager: /* 800B0E30 000ADD90 81 84 00 00 */ lwz r12, 0(r4) /* 800B0E34 000ADD94 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 800B0E38 000ADD98 7D 89 03 A6 */ mtctr r12 -/* 800B0E3C 000ADD9C 4E 80 04 21 */ bctrl +/* 800B0E3C 000ADD9C 4E 80 04 21 */ bctrl /* 800B0E40 000ADDA0 80 01 00 14 */ lwz r0, 0x14(r1) /* 800B0E44 000ADDA4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800B0E48 000ADDA8 7C 08 03 A6 */ mtlr r0 /* 800B0E4C 000ADDAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B0E50 000ADDB0 4E 80 00 20 */ blr +/* 800B0E50 000ADDB0 4E 80 00 20 */ blr .global sub_800b0e54 sub_800b0e54: @@ -336,7 +336,7 @@ sub_800b0e54: /* 800B0F18 000ADE78 90 03 02 FC */ stw r0, 0x2fc(r3) /* 800B0F1C 000ADE7C 80 04 00 64 */ lwz r0, 0x64(r4) /* 800B0F20 000ADE80 90 03 03 00 */ stw r0, 0x300(r3) -/* 800B0F24 000ADE84 4E 80 00 20 */ blr +/* 800B0F24 000ADE84 4E 80 00 20 */ blr .global PreRender__15CScriptPlatformFR13CStateManagerRC14CFrustumPlanes PreRender__15CScriptPlatformFR13CStateManagerRC14CFrustumPlanes: @@ -453,7 +453,7 @@ lbl_800B10CC: /* 800B10D0 000AE030 80 01 00 44 */ lwz r0, 0x44(r1) /* 800B10D4 000AE034 7C 08 03 A6 */ mtlr r0 /* 800B10D8 000AE038 38 21 00 40 */ addi r1, r1, 0x40 -/* 800B10DC 000AE03C 4E 80 00 20 */ blr +/* 800B10DC 000AE03C 4E 80 00 20 */ blr .global Move__15CScriptPlatformFR13CStateManager Move__15CScriptPlatformFR13CStateManager: @@ -838,12 +838,12 @@ lbl_800B15E0: /* 800B168C 000AE5EC 81 9F 00 00 */ lwz r12, 0(r31) /* 800B1690 000AE5F0 81 8C 00 70 */ lwz r12, 0x70(r12) /* 800B1694 000AE5F4 7D 89 03 A6 */ mtctr r12 -/* 800B1698 000AE5F8 4E 80 04 21 */ bctrl +/* 800B1698 000AE5F8 4E 80 04 21 */ bctrl /* 800B169C 000AE5FC 7F E3 FB 78 */ mr r3, r31 /* 800B16A0 000AE600 81 9F 00 00 */ lwz r12, 0(r31) /* 800B16A4 000AE604 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 800B16A8 000AE608 7D 89 03 A6 */ mtctr r12 -/* 800B16AC 000AE60C 4E 80 04 21 */ bctrl +/* 800B16AC 000AE60C 4E 80 04 21 */ bctrl /* 800B16B0 000AE610 7F 26 CB 78 */ mr r6, r25 /* 800B16B4 000AE614 38 81 00 DC */ addi r4, r1, 0xdc /* 800B16B8 000AE618 38 A1 01 74 */ addi r5, r1, 0x174 @@ -1239,7 +1239,7 @@ lbl_800B1BD8: /* 800B1BE8 000AEB48 80 01 11 B4 */ lwz r0, 0x11b4(r1) /* 800B1BEC 000AEB4C 7C 08 03 A6 */ mtlr r0 /* 800B1BF0 000AEB50 38 21 11 B0 */ addi r1, r1, 0x11b0 -/* 800B1BF4 000AEB54 4E 80 00 20 */ blr +/* 800B1BF4 000AEB54 4E 80 00 20 */ blr .global IsSlave__15CScriptPlatformCF9TUniqueId IsSlave__15CScriptPlatformCF9TUniqueId: @@ -1335,7 +1335,7 @@ lbl_800B1D34: /* 800B1D40 000AECA0 83 A1 00 A4 */ lwz r29, 0xa4(r1) /* 800B1D44 000AECA4 7C 08 03 A6 */ mtlr r0 /* 800B1D48 000AECA8 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 800B1D4C 000AECAC 4E 80 00 20 */ blr +/* 800B1D4C 000AECAC 4E 80 00 20 */ blr .global IsRider__15CScriptPlatformCF9TUniqueId IsRider__15CScriptPlatformCF9TUniqueId: @@ -1386,7 +1386,7 @@ lbl_800B1DDC: /* 800B1DF4 000AED54 80 01 00 64 */ lwz r0, 0x64(r1) /* 800B1DF8 000AED58 7C 08 03 A6 */ mtlr r0 /* 800B1DFC 000AED5C 38 21 00 60 */ addi r1, r1, 0x60 -/* 800B1E00 000AED60 4E 80 00 20 */ blr +/* 800B1E00 000AED60 4E 80 00 20 */ blr .global sub_800b1e04 sub_800b1e04: @@ -1408,7 +1408,7 @@ sub_800b1e04: /* 800B1E40 000AEDA0 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 800B1E44 000AEDA4 7C 08 03 A6 */ mtlr r0 /* 800B1E48 000AEDA8 38 21 00 20 */ addi r1, r1, 0x20 -/* 800B1E4C 000AEDAC 4E 80 00 20 */ blr +/* 800B1E4C 000AEDAC 4E 80 00 20 */ blr .global sub_800b1e50 sub_800b1e50: @@ -1472,7 +1472,7 @@ lbl_800B1EF8: /* 800B1F20 000AEE80 80 01 00 34 */ lwz r0, 0x34(r1) /* 800B1F24 000AEE84 7C 08 03 A6 */ mtlr r0 /* 800B1F28 000AEE88 38 21 00 30 */ addi r1, r1, 0x30 -/* 800B1F2C 000AEE8C 4E 80 00 20 */ blr +/* 800B1F2C 000AEE8C 4E 80 00 20 */ blr .global AddSlave__15CScriptPlatformF9TUniqueIdR13CStateManager AddSlave__15CScriptPlatformF9TUniqueIdR13CStateManager: @@ -1597,11 +1597,11 @@ lbl_800B20DC: /* 800B20EC 000AF04C 83 81 01 30 */ lwz r28, 0x130(r1) /* 800B20F0 000AF050 7C 08 03 A6 */ mtlr r0 /* 800B20F4 000AF054 38 21 01 40 */ addi r1, r1, 0x140 -/* 800B20F8 000AF058 4E 80 00 20 */ blr +/* 800B20F8 000AF058 4E 80 00 20 */ blr .global SplashThink__15CScriptPlatformCFRC6CAABoxRC11CFluidPlanefR13CStateManager SplashThink__15CScriptPlatformCFRC6CAABoxRC11CFluidPlanefR13CStateManager: -/* 800B20FC 000AF05C 4E 80 00 20 */ blr +/* 800B20FC 000AF05C 4E 80 00 20 */ blr .global GetPrimitiveTransform__15CScriptPlatformCFv GetPrimitiveTransform__15CScriptPlatformCFv: @@ -1638,7 +1638,7 @@ GetPrimitiveTransform__15CScriptPlatformCFv: /* 800B2178 000AF0D8 83 C1 00 48 */ lwz r30, 0x48(r1) /* 800B217C 000AF0DC 7C 08 03 A6 */ mtlr r0 /* 800B2180 000AF0E0 38 21 00 50 */ addi r1, r1, 0x50 -/* 800B2184 000AF0E4 4E 80 00 20 */ blr +/* 800B2184 000AF0E4 4E 80 00 20 */ blr .global GetCollisionPrimitive__15CScriptPlatformCFv GetCollisionPrimitive__15CScriptPlatformCFv: @@ -1656,7 +1656,7 @@ lbl_800B21AC: /* 800B21AC 000AF10C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800B21B0 000AF110 7C 08 03 A6 */ mtlr r0 /* 800B21B4 000AF114 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B21B8 000AF118 4E 80 00 20 */ blr +/* 800B21B8 000AF118 4E 80 00 20 */ blr .global Accept__15CScriptPlatformFR8IVisitor Accept__15CScriptPlatformFR8IVisitor: @@ -1669,11 +1669,11 @@ Accept__15CScriptPlatformFR8IVisitor: /* 800B21D4 000AF134 7C 04 03 78 */ mr r4, r0 /* 800B21D8 000AF138 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 800B21DC 000AF13C 7D 89 03 A6 */ mtctr r12 -/* 800B21E0 000AF140 4E 80 04 21 */ bctrl +/* 800B21E0 000AF140 4E 80 04 21 */ bctrl /* 800B21E4 000AF144 80 01 00 14 */ lwz r0, 0x14(r1) /* 800B21E8 000AF148 7C 08 03 A6 */ mtlr r0 /* 800B21EC 000AF14C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B21F0 000AF150 4E 80 00 20 */ blr +/* 800B21F0 000AF150 4E 80 00 20 */ blr .global AcceptScriptMsg__15CScriptPlatformF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__15CScriptPlatformF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -1693,7 +1693,7 @@ AcceptScriptMsg__15CScriptPlatformF20EScriptObjectMessage9TUniqueIdR13CStateMana /* 800B2228 000AF188 38 84 F2 AC */ addi r4, r4, lbl_803DF2AC@l /* 800B222C 000AF18C 7C 04 00 2E */ lwzx r0, r4, r0 /* 800B2230 000AF190 7C 09 03 A6 */ mtctr r0 -/* 800B2234 000AF194 4E 80 04 20 */ bctr +/* 800B2234 000AF194 4E 80 04 20 */ bctr .global lbl_800B2238 lbl_800B2238: /* 800B2238 000AF198 7F E4 FB 78 */ mr r4, r31 @@ -1943,17 +1943,17 @@ lbl_800B257C: /* 800B259C 000AF4FC 80 01 08 A4 */ lwz r0, 0x8a4(r1) /* 800B25A0 000AF500 7C 08 03 A6 */ mtlr r0 /* 800B25A4 000AF504 38 21 08 A0 */ addi r1, r1, 0x8a0 -/* 800B25A8 000AF508 4E 80 00 20 */ blr +/* 800B25A8 000AF508 4E 80 00 20 */ blr .global GetDamageVulnerability__15CScriptPlatformCFv GetDamageVulnerability__15CScriptPlatformCFv: /* 800B25AC 000AF50C 38 63 02 9C */ addi r3, r3, 0x29c -/* 800B25B0 000AF510 4E 80 00 20 */ blr +/* 800B25B0 000AF510 4E 80 00 20 */ blr .global HealthInfo__15CScriptPlatformFR13CStateManager HealthInfo__15CScriptPlatformFR13CStateManager: /* 800B25B4 000AF514 38 63 02 94 */ addi r3, r3, 0x294 -/* 800B25B8 000AF518 4E 80 00 20 */ blr +/* 800B25B8 000AF518 4E 80 00 20 */ blr .global sub_800b25bc sub_800b25bc: @@ -1970,14 +1970,14 @@ lbl_800B25DC: /* 800B25E0 000AF540 7C 03 00 40 */ cmplw r3, r0 /* 800B25E4 000AF544 40 82 00 0C */ bne lbl_800B25F0 /* 800B25E8 000AF548 38 60 00 01 */ li r3, 1 -/* 800B25EC 000AF54C 4E 80 00 20 */ blr +/* 800B25EC 000AF54C 4E 80 00 20 */ blr lbl_800B25F0: /* 800B25F0 000AF550 38 A5 00 02 */ addi r5, r5, 2 lbl_800B25F4: /* 800B25F4 000AF554 7C 05 20 40 */ cmplw r5, r4 /* 800B25F8 000AF558 40 82 FF E4 */ bne lbl_800B25DC /* 800B25FC 000AF55C 38 60 00 00 */ li r3, 0 -/* 800B2600 000AF560 4E 80 00 20 */ blr +/* 800B2600 000AF560 4E 80 00 20 */ blr .global Think__15CScriptPlatformFfR13CStateManager Think__15CScriptPlatformFfR13CStateManager: @@ -2093,7 +2093,7 @@ lbl_800B2778: /* 800B278C 000AF6EC 81 9E 00 00 */ lwz r12, 0(r30) /* 800B2790 000AF6F0 81 8C 00 34 */ lwz r12, 0x34(r12) /* 800B2794 000AF6F4 7D 89 03 A6 */ mtctr r12 -/* 800B2798 000AF6F8 4E 80 04 21 */ bctrl +/* 800B2798 000AF6F8 4E 80 04 21 */ bctrl /* 800B279C 000AF6FC C0 23 00 00 */ lfs f1, 0(r3) /* 800B27A0 000AF700 C0 02 8C AC */ lfs f0, lbl_805AA9CC@sda21(r2) /* 800B27A4 000AF704 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -2114,7 +2114,7 @@ lbl_800B27D4: /* 800B27DC 000AF73C 83 C1 08 28 */ lwz r30, 0x828(r1) /* 800B27E0 000AF740 7C 08 03 A6 */ mtlr r0 /* 800B27E4 000AF744 38 21 08 30 */ addi r1, r1, 0x830 -/* 800B27E8 000AF748 4E 80 00 20 */ blr +/* 800B27E8 000AF748 4E 80 00 20 */ blr .global "DragSlaves__15CScriptPlatformFR13CStateManagerRQ24rstl38bit_vectorRC9CVector3f" "DragSlaves__15CScriptPlatformFR13CStateManagerRQ24rstl38bit_vectorRC9CVector3f": @@ -2200,7 +2200,7 @@ lbl_800B28F0: /* 800B2910 000AF870 80 01 00 54 */ lwz r0, 0x54(r1) /* 800B2914 000AF874 7C 08 03 A6 */ mtlr r0 /* 800B2918 000AF878 38 21 00 50 */ addi r1, r1, 0x50 -/* 800B291C 000AF87C 4E 80 00 20 */ blr +/* 800B291C 000AF87C 4E 80 00 20 */ blr .global "DragSlave__15CScriptPlatformFR13CStateManagerRQ24rstl38bit_vectorP6CActorRC9CVector3f" "DragSlave__15CScriptPlatformFR13CStateManagerRQ24rstl38bit_vectorP6CActorRC9CVector3f": @@ -2281,7 +2281,7 @@ lbl_800B2A30: /* 800B2A40 000AF9A0 83 81 00 50 */ lwz r28, 0x50(r1) /* 800B2A44 000AF9A4 7C 08 03 A6 */ mtlr r0 /* 800B2A48 000AF9A8 38 21 00 60 */ addi r1, r1, 0x60 -/* 800B2A4C 000AF9AC 4E 80 00 20 */ blr +/* 800B2A4C 000AF9AC 4E 80 00 20 */ blr .global BuildSlaveList__15CScriptPlatformFR13CStateManager BuildSlaveList__15CScriptPlatformFR13CStateManager: @@ -2438,7 +2438,7 @@ lbl_800B2C5C: /* 800B2C78 000AFBD8 80 01 00 D4 */ lwz r0, 0xd4(r1) /* 800B2C7C 000AFBDC 7C 08 03 A6 */ mtlr r0 /* 800B2C80 000AFBE0 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 800B2C84 000AFBE4 4E 80 00 20 */ blr +/* 800B2C84 000AFBE4 4E 80 00 20 */ blr .global PreThink__15CScriptPlatformFfR13CStateManager PreThink__15CScriptPlatformFfR13CStateManager: @@ -2562,7 +2562,7 @@ lbl_800B2E28: /* 800B2E50 000AFDB0 38 61 00 6C */ addi r3, r1, 0x6c /* 800B2E54 000AFDB4 81 8C 00 88 */ lwz r12, 0x88(r12) /* 800B2E58 000AFDB8 7D 89 03 A6 */ mtctr r12 -/* 800B2E5C 000AFDBC 4E 80 04 21 */ bctrl +/* 800B2E5C 000AFDBC 4E 80 04 21 */ bctrl /* 800B2E60 000AFDC0 C0 01 00 6C */ lfs f0, 0x6c(r1) /* 800B2E64 000AFDC4 D0 1D 02 7C */ stfs f0, 0x27c(r29) /* 800B2E68 000AFDC8 80 61 00 70 */ lwz r3, 0x70(r1) @@ -2668,12 +2668,12 @@ lbl_800B2FC8: /* 800B2FD8 000AFF38 81 9D 00 00 */ lwz r12, 0(r29) /* 800B2FDC 000AFF3C 81 8C 00 70 */ lwz r12, 0x70(r12) /* 800B2FE0 000AFF40 7D 89 03 A6 */ mtctr r12 -/* 800B2FE4 000AFF44 4E 80 04 21 */ bctrl +/* 800B2FE4 000AFF44 4E 80 04 21 */ bctrl /* 800B2FE8 000AFF48 7F A3 EB 78 */ mr r3, r29 /* 800B2FEC 000AFF4C 81 9D 00 00 */ lwz r12, 0(r29) /* 800B2FF0 000AFF50 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 800B2FF4 000AFF54 7D 89 03 A6 */ mtctr r12 -/* 800B2FF8 000AFF58 4E 80 04 21 */ bctrl +/* 800B2FF8 000AFF58 4E 80 04 21 */ bctrl /* 800B2FFC 000AFF5C 7F C6 F3 78 */ mr r6, r30 /* 800B3000 000AFF60 38 81 00 A4 */ addi r4, r1, 0xa4 /* 800B3004 000AFF64 38 A1 09 A0 */ addi r5, r1, 0x9a0 @@ -2804,7 +2804,7 @@ lbl_800B31B8: /* 800B31D4 000B0134 83 81 11 B0 */ lwz r28, 0x11b0(r1) /* 800B31D8 000B0138 7C 08 03 A6 */ mtlr r0 /* 800B31DC 000B013C 38 21 11 D0 */ addi r1, r1, 0x11d0 -/* 800B31E0 000B0140 4E 80 00 20 */ blr +/* 800B31E0 000B0140 4E 80 00 20 */ blr .global "MoveRiders__15CScriptPlatformFR13CStateManagerfbRQ24rstl43vector<7SRiders,Q24rstl17rmemory_allocator>RQ24rstl43vector<7SRiders,Q24rstl17rmemory_allocator>RC12CTransform4fRC12CTransform4fRC9CVector3f11CQuaternion" "MoveRiders__15CScriptPlatformFR13CStateManagerfbRQ24rstl43vector<7SRiders,Q24rstl17rmemory_allocator>RQ24rstl43vector<7SRiders,Q24rstl17rmemory_allocator>RC12CTransform4fRC12CTransform4fRC9CVector3f11CQuaternion": @@ -2904,12 +2904,12 @@ lbl_800B3274: /* 800B334C 000B02AC 38 61 00 D4 */ addi r3, r1, 0xd4 /* 800B3350 000B02B0 81 8C 00 70 */ lwz r12, 0x70(r12) /* 800B3354 000B02B4 7D 89 03 A6 */ mtctr r12 -/* 800B3358 000B02B8 4E 80 04 21 */ bctrl +/* 800B3358 000B02B8 4E 80 04 21 */ bctrl /* 800B335C 000B02BC 7F C3 F3 78 */ mr r3, r30 /* 800B3360 000B02C0 81 9E 00 00 */ lwz r12, 0(r30) /* 800B3364 000B02C4 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 800B3368 000B02C8 7D 89 03 A6 */ mtctr r12 -/* 800B336C 000B02CC 4E 80 04 21 */ bctrl +/* 800B336C 000B02CC 4E 80 04 21 */ bctrl /* 800B3370 000B02D0 7C 64 1B 78 */ mr r4, r3 /* 800B3374 000B02D4 7E E3 BB 78 */ mr r3, r23 /* 800B3378 000B02D8 7E C6 B3 78 */ mr r6, r22 @@ -2997,7 +2997,7 @@ lbl_800B3490: /* 800B34B0 000B0410 80 01 01 34 */ lwz r0, 0x134(r1) /* 800B34B4 000B0414 7C 08 03 A6 */ mtlr r0 /* 800B34B8 000B0418 38 21 01 30 */ addi r1, r1, 0x130 -/* 800B34BC 000B041C 4E 80 00 20 */ blr +/* 800B34BC 000B041C 4E 80 00 20 */ blr .global __ct__13CPhysicsStateFRC13CPhysicsState __ct__13CPhysicsStateFRC13CPhysicsState: @@ -3057,7 +3057,7 @@ __ct__13CPhysicsStateFRC13CPhysicsState: /* 800B3594 000B04F4 D0 03 00 68 */ stfs f0, 0x68(r3) /* 800B3598 000B04F8 C0 04 00 6C */ lfs f0, 0x6c(r4) /* 800B359C 000B04FC D0 03 00 6C */ stfs f0, 0x6c(r3) -/* 800B35A0 000B0500 4E 80 00 20 */ blr +/* 800B35A0 000B0500 4E 80 00 20 */ blr .global "DecayRiders__15CScriptPlatformFRQ24rstl43vector<7SRiders,Q24rstl17rmemory_allocator>fR13CStateManager" "DecayRiders__15CScriptPlatformFRQ24rstl43vector<7SRiders,Q24rstl17rmemory_allocator>fR13CStateManager": @@ -3123,7 +3123,7 @@ lbl_800B3650: /* 800B3684 000B05E4 83 C1 00 28 */ lwz r30, 0x28(r1) /* 800B3688 000B05E8 7C 08 03 A6 */ mtlr r0 /* 800B368C 000B05EC 38 21 00 50 */ addi r1, r1, 0x50 -/* 800B3690 000B05F0 4E 80 00 20 */ blr +/* 800B3690 000B05F0 4E 80 00 20 */ blr .global "BuildNearListFromRiders__15CScriptPlatformFR13CStateManagerRCQ24rstl43vector<7SRiders,Q24rstl17rmemory_allocator>" "BuildNearListFromRiders__15CScriptPlatformFR13CStateManagerRCQ24rstl43vector<7SRiders,Q24rstl17rmemory_allocator>": @@ -3216,7 +3216,7 @@ lbl_800B37B4: /* 800B37C0 000B0720 80 01 08 34 */ lwz r0, 0x834(r1) /* 800B37C4 000B0724 7C 08 03 A6 */ mtlr r0 /* 800B37C8 000B0728 38 21 08 30 */ addi r1, r1, 0x830 -/* 800B37CC 000B072C 4E 80 00 20 */ blr +/* 800B37CC 000B072C 4E 80 00 20 */ blr .global "AddRider__15CScriptPlatformFRQ24rstl43vector<7SRiders,Q24rstl17rmemory_allocator>9TUniqueIdPC13CPhysicsActorR13CStateManager" "AddRider__15CScriptPlatformFRQ24rstl43vector<7SRiders,Q24rstl17rmemory_allocator>9TUniqueIdPC13CPhysicsActorR13CStateManager": @@ -3355,7 +3355,7 @@ lbl_800B39B8: /* 800B39BC 000B091C 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 800B39C0 000B0920 7C 08 03 A6 */ mtlr r0 /* 800B39C4 000B0924 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 800B39C8 000B0928 4E 80 00 20 */ blr +/* 800B39C8 000B0928 4E 80 00 20 */ blr .global GetNext__15CScriptPlatformF9TUniqueIdR13CStateManager GetNext__15CScriptPlatformF9TUniqueIdR13CStateManager: @@ -3412,7 +3412,7 @@ lbl_800B3A7C: /* 800B3A88 000B09E8 83 A1 00 34 */ lwz r29, 0x34(r1) /* 800B3A8C 000B09EC 7C 08 03 A6 */ mtlr r0 /* 800B3A90 000B09F0 38 21 00 40 */ addi r1, r1, 0x40 -/* 800B3A94 000B09F4 4E 80 00 20 */ blr +/* 800B3A94 000B09F4 4E 80 00 20 */ blr .global GetWaypoint__15CScriptPlatformFR13CStateManager GetWaypoint__15CScriptPlatformFR13CStateManager: @@ -3450,7 +3450,7 @@ lbl_800B3B00: /* 800B3B04 000B0A64 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 800B3B08 000B0A68 7C 08 03 A6 */ mtlr r0 /* 800B3B0C 000B0A6C 38 21 00 20 */ addi r1, r1, 0x20 -/* 800B3B10 000B0A70 4E 80 00 20 */ blr +/* 800B3B10 000B0A70 4E 80 00 20 */ blr .global GetTouchBounds__15CScriptPlatformCFv GetTouchBounds__15CScriptPlatformCFv: @@ -3472,7 +3472,7 @@ GetTouchBounds__15CScriptPlatformCFv: /* 800B3B50 000B0AB0 38 A5 00 34 */ addi r5, r5, 0x34 /* 800B3B54 000B0AB4 81 8C 00 14 */ lwz r12, 0x14(r12) /* 800B3B58 000B0AB8 7D 89 03 A6 */ mtctr r12 -/* 800B3B5C 000B0ABC 4E 80 04 21 */ bctrl +/* 800B3B5C 000B0ABC 4E 80 04 21 */ bctrl /* 800B3B60 000B0AC0 38 00 00 01 */ li r0, 1 /* 800B3B64 000B0AC4 28 1F 00 00 */ cmplwi r31, 0 /* 800B3B68 000B0AC8 98 1F 00 18 */ stb r0, 0x18(r31) @@ -3518,7 +3518,7 @@ lbl_800B3BF8: /* 800B3BFC 000B0B5C 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 800B3C00 000B0B60 7C 08 03 A6 */ mtlr r0 /* 800B3C04 000B0B64 38 21 00 40 */ addi r1, r1, 0x40 -/* 800B3C08 000B0B68 4E 80 00 20 */ blr +/* 800B3C08 000B0B68 4E 80 00 20 */ blr .global __dt__15CScriptPlatformFv __dt__15CScriptPlatformFv: @@ -3605,7 +3605,7 @@ lbl_800B3D10: /* 800B3D28 000B0C88 38 80 00 01 */ li r4, 1 /* 800B3D2C 000B0C8C 81 8C 00 20 */ lwz r12, 0x20(r12) /* 800B3D30 000B0C90 7D 89 03 A6 */ mtctr r12 -/* 800B3D34 000B0C94 4E 80 04 21 */ bctrl +/* 800B3D34 000B0C94 4E 80 04 21 */ bctrl lbl_800B3D38: /* 800B3D38 000B0C98 34 1E 03 04 */ addic. r0, r30, 0x304 /* 800B3D3C 000B0C9C 41 82 00 30 */ beq lbl_800B3D6C @@ -3636,7 +3636,7 @@ lbl_800B3D88: /* 800B3D94 000B0CF4 83 C1 00 38 */ lwz r30, 0x38(r1) /* 800B3D98 000B0CF8 7C 08 03 A6 */ mtlr r0 /* 800B3D9C 000B0CFC 38 21 00 40 */ addi r1, r1, 0x40 -/* 800B3DA0 000B0D00 4E 80 00 20 */ blr +/* 800B3DA0 000B0D00 4E 80 00 20 */ blr .global __dt__23CCollidableOBBTreeGroupFv __dt__23CCollidableOBBTreeGroupFv: @@ -3664,7 +3664,7 @@ lbl_800B3DE8: /* 800B3DF0 000B0D50 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800B3DF4 000B0D54 7C 08 03 A6 */ mtlr r0 /* 800B3DF8 000B0D58 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B3DFC 000B0D5C 4E 80 00 20 */ blr +/* 800B3DFC 000B0D5C 4E 80 00 20 */ blr .global "__ct__15CScriptPlatformF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC16CActorParametersRC6CAABoxfbbRC11CHealthInfoRC20CDamageVulnerabilityRCQ24rstl58optional_object<39TLockedToken<23CCollidableOBBTreeGroup>>bii" "__ct__15CScriptPlatformF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC16CActorParametersRC6CAABoxfbbRC11CHealthInfoRC20CDamageVulnerabilityRCQ24rstl58optional_object<39TLockedToken<23CCollidableOBBTreeGroup>>bii": @@ -4010,7 +4010,7 @@ lbl_800B432C: /* 800B433C 000B129C 38 80 00 01 */ li r4, 1 /* 800B4340 000B12A0 81 8C 00 20 */ lwz r12, 0x20(r12) /* 800B4344 000B12A4 7D 89 03 A6 */ mtctr r12 -/* 800B4348 000B12A8 4E 80 04 21 */ bctrl +/* 800B4348 000B12A8 4E 80 04 21 */ bctrl lbl_800B434C: /* 800B434C 000B12AC 91 DF 03 14 */ stw r14, 0x314(r31) lbl_800B4350: @@ -4031,12 +4031,12 @@ update_fog__3CGXFUi: /* 800B437C 000B12DC 38 A4 53 EC */ addi r5, r4, lbl_805A53EC@l /* 800B4380 000B12E0 88 05 00 53 */ lbz r0, 0x53(r5) /* 800B4384 000B12E4 28 00 00 00 */ cmplwi r0, 0 -/* 800B4388 000B12E8 4D 82 00 20 */ beqlr +/* 800B4388 000B12E8 4D 82 00 20 */ beqlr /* 800B438C 000B12EC A0 05 00 56 */ lhz r0, 0x56(r5) /* 800B4390 000B12F0 54 63 06 34 */ rlwinm r3, r3, 0, 0x18, 0x1a /* 800B4394 000B12F4 54 00 06 34 */ rlwinm r0, r0, 0, 0x18, 0x1a /* 800B4398 000B12F8 7C 00 18 40 */ cmplw r0, r3 -/* 800B439C 000B12FC 4D 82 00 20 */ beqlr +/* 800B439C 000B12FC 4D 82 00 20 */ beqlr /* 800B43A0 000B1300 28 03 00 20 */ cmplwi r3, 0x20 /* 800B43A4 000B1304 40 82 00 28 */ bne lbl_800B43CC /* 800B43A8 000B1308 38 00 00 61 */ li r0, 0x61 @@ -4047,7 +4047,7 @@ update_fog__3CGXFUi: /* 800B43BC 000B131C 90 64 80 00 */ stw r3, 0xCC008000@l(r4) /* 800B43C0 000B1320 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) /* 800B43C4 000B1324 B0 03 00 02 */ sth r0, 2(r3) -/* 800B43C8 000B1328 4E 80 00 20 */ blr +/* 800B43C8 000B1328 4E 80 00 20 */ blr lbl_800B43CC: /* 800B43CC 000B132C 38 00 00 61 */ li r0, 0x61 /* 800B43D0 000B1330 3C C0 CC 01 */ lis r6, 0xCC008000@ha @@ -4062,7 +4062,7 @@ lbl_800B43CC: /* 800B43F4 000B1354 90 66 80 00 */ stw r3, 0xCC008000@l(r6) /* 800B43F8 000B1358 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) /* 800B43FC 000B135C B0 03 00 02 */ sth r0, 2(r3) -/* 800B4400 000B1360 4E 80 00 20 */ blr +/* 800B4400 000B1360 4E 80 00 20 */ blr .global sub_800b4404 sub_800b4404: @@ -4135,4 +4135,4 @@ lbl_800B44E4: /* 800B44E8 000B1448 80 01 00 34 */ lwz r0, 0x34(r1) /* 800B44EC 000B144C 7C 08 03 A6 */ mtlr r0 /* 800B44F0 000B1450 38 21 00 30 */ addi r1, r1, 0x30 -/* 800B44F4 000B1454 4E 80 00 20 */ blr +/* 800B44F4 000B1454 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/ScriptObjects/CScriptPlayerActor.s b/asm/MetroidPrime/ScriptObjects/CScriptPlayerActor.s index 9c4cd79e..d7da48cb 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptPlayerActor.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptPlayerActor.s @@ -201,7 +201,7 @@ lbl_801AA3DC: /* 801AA3EC 001A734C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 801AA3F0 001A7350 7C 08 03 A6 */ mtlr r0 /* 801AA3F4 001A7354 38 21 00 20 */ addi r1, r1, 0x20 -/* 801AA3F8 001A7358 4E 80 00 20 */ blr +/* 801AA3F8 001A7358 4E 80 00 20 */ blr .global SetIntoStateManager__18CScriptPlayerActorFR13CStateManagerb SetIntoStateManager__18CScriptPlayerActorFR13CStateManagerb: @@ -290,7 +290,7 @@ lbl_801AA528: /* 801AA52C 001A748C 80 01 00 64 */ lwz r0, 0x64(r1) /* 801AA530 001A7490 7C 08 03 A6 */ mtlr r0 /* 801AA534 001A7494 38 21 00 60 */ addi r1, r1, 0x60 -/* 801AA538 001A7498 4E 80 00 20 */ blr +/* 801AA538 001A7498 4E 80 00 20 */ blr .global SetupEnvFx__18CScriptPlayerActorFRC13CStateManagerb SetupEnvFx__18CScriptPlayerActorFRC13CStateManagerb: @@ -340,7 +340,7 @@ lbl_801AA5D8: /* 801AA5D8 001A7538 80 01 00 14 */ lwz r0, 0x14(r1) /* 801AA5DC 001A753C 7C 08 03 A6 */ mtlr r0 /* 801AA5E0 001A7540 38 21 00 10 */ addi r1, r1, 0x10 -/* 801AA5E4 001A7544 4E 80 00 20 */ blr +/* 801AA5E4 001A7544 4E 80 00 20 */ blr .global SetActive__18CScriptPlayerActorFb SetActive__18CScriptPlayerActorFb: @@ -358,7 +358,7 @@ SetActive__18CScriptPlayerActorFb: /* 801AA614 001A7574 80 01 00 14 */ lwz r0, 0x14(r1) /* 801AA618 001A7578 7C 08 03 A6 */ mtlr r0 /* 801AA61C 001A757C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801AA620 001A7580 4E 80 00 20 */ blr +/* 801AA620 001A7580 4E 80 00 20 */ blr .global PreRender__18CScriptPlayerActorFR13CStateManagerRC14CFrustumPlanes PreRender__18CScriptPlayerActorFR13CStateManagerRC14CFrustumPlanes: @@ -455,7 +455,7 @@ lbl_801AA748: /* 801AA768 001A76C8 83 81 00 20 */ lwz r28, 0x20(r1) /* 801AA76C 001A76CC 7C 08 03 A6 */ mtlr r0 /* 801AA770 001A76D0 38 21 00 30 */ addi r1, r1, 0x30 -/* 801AA774 001A76D4 4E 80 00 20 */ blr +/* 801AA774 001A76D4 4E 80 00 20 */ blr .global GetSuitCharIdx__18CScriptPlayerActorCFRC13CStateManager11EPlayerSuit GetSuitCharIdx__18CScriptPlayerActorCFRC13CStateManager11EPlayerSuit: @@ -497,7 +497,7 @@ lbl_801AA7E4: /* 801AA7EC 001A774C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801AA7F0 001A7750 7C 08 03 A6 */ mtlr r0 /* 801AA7F4 001A7754 38 21 00 10 */ addi r1, r1, 0x10 -/* 801AA7F8 001A7758 4E 80 00 20 */ blr +/* 801AA7F8 001A7758 4E 80 00 20 */ blr .global GetNextSuitCharIdx__18CScriptPlayerActorFRC13CStateManager GetNextSuitCharIdx__18CScriptPlayerActorFRC13CStateManager: @@ -553,7 +553,7 @@ lbl_801AA894: /* 801AA898 001A77F8 80 01 00 14 */ lwz r0, 0x14(r1) /* 801AA89C 001A77FC 7C 08 03 A6 */ mtlr r0 /* 801AA8A0 001A7800 38 21 00 10 */ addi r1, r1, 0x10 -/* 801AA8A4 001A7804 4E 80 00 20 */ blr +/* 801AA8A4 001A7804 4E 80 00 20 */ blr .global PumpBeamModel__18CScriptPlayerActorFRC13CStateManager PumpBeamModel__18CScriptPlayerActorFRC13CStateManager: @@ -598,7 +598,7 @@ lbl_801AA930: /* 801AA938 001A7898 83 C1 00 08 */ lwz r30, 8(r1) /* 801AA93C 001A789C 7C 08 03 A6 */ mtlr r0 /* 801AA940 001A78A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801AA944 001A78A4 4E 80 00 20 */ blr +/* 801AA944 001A78A4 4E 80 00 20 */ blr .global PumpSuitModel__18CScriptPlayerActorFRC13CStateManager PumpSuitModel__18CScriptPlayerActorFRC13CStateManager: @@ -719,7 +719,7 @@ lbl_801AAAD8: /* 801AAAE4 001A7A44 83 A1 00 14 */ lwz r29, 0x14(r1) /* 801AAAE8 001A7A48 7C 08 03 A6 */ mtlr r0 /* 801AAAEC 001A7A4C 38 21 00 20 */ addi r1, r1, 0x20 -/* 801AAAF0 001A7A50 4E 80 00 20 */ blr +/* 801AAAF0 001A7A50 4E 80 00 20 */ blr .global LoadBeam__18CScriptPlayerActorF7EBeamId LoadBeam__18CScriptPlayerActorF7EBeamId: @@ -754,7 +754,7 @@ LoadBeam__18CScriptPlayerActorF7EBeamId: /* 801AAB64 001A7AC4 81 84 00 00 */ lwz r12, 0(r4) /* 801AAB68 001A7AC8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801AAB6C 001A7ACC 7D 89 03 A6 */ mtctr r12 -/* 801AAB70 001A7AD0 4E 80 04 21 */ bctrl +/* 801AAB70 001A7AD0 4E 80 04 21 */ bctrl /* 801AAB74 001A7AD4 7F C3 F3 78 */ mr r3, r30 /* 801AAB78 001A7AD8 38 81 00 08 */ addi r4, r1, 8 /* 801AAB7C 001A7ADC 3B 60 00 01 */ li r27, 1 @@ -788,7 +788,7 @@ lbl_801AABD8: /* 801AABDC 001A7B3C 80 01 00 34 */ lwz r0, 0x34(r1) /* 801AABE0 001A7B40 7C 08 03 A6 */ mtlr r0 /* 801AABE4 001A7B44 38 21 00 30 */ addi r1, r1, 0x30 -/* 801AABE8 001A7B48 4E 80 00 20 */ blr +/* 801AABE8 001A7B48 4E 80 00 20 */ blr .global LoadSuit__18CScriptPlayerActorFUi LoadSuit__18CScriptPlayerActorFUi: @@ -840,7 +840,7 @@ LoadSuit__18CScriptPlayerActorFUi: /* 801AACA0 001A7C00 81 84 00 00 */ lwz r12, 0(r4) /* 801AACA4 001A7C04 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801AACA8 001A7C08 7D 89 03 A6 */ mtctr r12 -/* 801AACAC 001A7C0C 4E 80 04 21 */ bctrl +/* 801AACAC 001A7C0C 4E 80 04 21 */ bctrl /* 801AACB0 001A7C10 7F 83 E3 78 */ mr r3, r28 /* 801AACB4 001A7C14 38 81 00 18 */ addi r4, r1, 0x18 /* 801AACB8 001A7C18 3B 40 00 01 */ li r26, 1 @@ -888,7 +888,7 @@ lbl_801AAD04: /* 801AAD50 001A7CB0 81 84 00 00 */ lwz r12, 0(r4) /* 801AAD54 001A7CB4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801AAD58 001A7CB8 7D 89 03 A6 */ mtctr r12 -/* 801AAD5C 001A7CBC 4E 80 04 21 */ bctrl +/* 801AAD5C 001A7CBC 4E 80 04 21 */ bctrl /* 801AAD60 001A7CC0 7F 63 DB 78 */ mr r3, r27 /* 801AAD64 001A7CC4 38 81 00 08 */ addi r4, r1, 8 /* 801AAD68 001A7CC8 3B 40 00 01 */ li r26, 1 @@ -925,7 +925,7 @@ lbl_801AADD0: /* 801AADD4 001A7D34 80 01 00 64 */ lwz r0, 0x64(r1) /* 801AADD8 001A7D38 7C 08 03 A6 */ mtlr r0 /* 801AADDC 001A7D3C 38 21 00 60 */ addi r1, r1, 0x60 -/* 801AADE0 001A7D40 4E 80 00 20 */ blr +/* 801AADE0 001A7D40 4E 80 00 20 */ blr .global SetupOfflineModelData__18CScriptPlayerActorFv SetupOfflineModelData__18CScriptPlayerActorFv: @@ -1022,7 +1022,7 @@ lbl_801AAF14: /* 801AAF38 001A7E98 83 A1 00 34 */ lwz r29, 0x34(r1) /* 801AAF3C 001A7E9C 7C 08 03 A6 */ mtlr r0 /* 801AAF40 001A7EA0 38 21 00 40 */ addi r1, r1, 0x40 -/* 801AAF44 001A7EA4 4E 80 00 20 */ blr +/* 801AAF44 001A7EA4 4E 80 00 20 */ blr .global SetupOnlineModelData__18CScriptPlayerActorFv SetupOnlineModelData__18CScriptPlayerActorFv: @@ -1128,7 +1128,7 @@ lbl_801AB0B8: /* 801AB0C0 001A8020 83 C1 00 E8 */ lwz r30, 0xe8(r1) /* 801AB0C4 001A8024 7C 08 03 A6 */ mtlr r0 /* 801AB0C8 001A8028 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 801AB0CC 001A802C 4E 80 00 20 */ blr +/* 801AB0CC 001A802C 4E 80 00 20 */ blr .global BuildBeamModelData__18CScriptPlayerActorFv BuildBeamModelData__18CScriptPlayerActorFv: @@ -1169,7 +1169,7 @@ lbl_801AB13C: /* 801AB154 001A80B4 83 C1 00 18 */ lwz r30, 0x18(r1) /* 801AB158 001A80B8 7C 08 03 A6 */ mtlr r0 /* 801AB15C 001A80BC 38 21 00 20 */ addi r1, r1, 0x20 -/* 801AB160 001A80C0 4E 80 00 20 */ blr +/* 801AB160 001A80C0 4E 80 00 20 */ blr .global AddToRenderer__18CScriptPlayerActorCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__18CScriptPlayerActorCFRC14CFrustumPlanesRC13CStateManager: @@ -1198,7 +1198,7 @@ lbl_801AB1AC: /* 801AB1B8 001A8118 83 A1 00 14 */ lwz r29, 0x14(r1) /* 801AB1BC 001A811C 7C 08 03 A6 */ mtlr r0 /* 801AB1C0 001A8120 38 21 00 20 */ addi r1, r1, 0x20 -/* 801AB1C4 001A8124 4E 80 00 20 */ blr +/* 801AB1C4 001A8124 4E 80 00 20 */ blr .global TouchModels_Internal__18CScriptPlayerActorFRC13CStateManager TouchModels_Internal__18CScriptPlayerActorFRC13CStateManager: @@ -1274,7 +1274,7 @@ lbl_801AB2B0: /* 801AB2B8 001A8218 83 C1 00 08 */ lwz r30, 8(r1) /* 801AB2BC 001A821C 7C 08 03 A6 */ mtlr r0 /* 801AB2C0 001A8220 38 21 00 10 */ addi r1, r1, 0x10 -/* 801AB2C4 001A8224 4E 80 00 20 */ blr +/* 801AB2C4 001A8224 4E 80 00 20 */ blr .global TouchModels__18CScriptPlayerActorFRC13CStateManager TouchModels__18CScriptPlayerActorFRC13CStateManager: @@ -1323,7 +1323,7 @@ lbl_801AB34C: /* 801AB364 001A82C4 83 C1 00 18 */ lwz r30, 0x18(r1) /* 801AB368 001A82C8 7C 08 03 A6 */ mtlr r0 /* 801AB36C 001A82CC 38 21 00 20 */ addi r1, r1, 0x20 -/* 801AB370 001A82D0 4E 80 00 20 */ blr +/* 801AB370 001A82D0 4E 80 00 20 */ blr .global Render__18CScriptPlayerActorCFRC13CStateManager Render__18CScriptPlayerActorCFRC13CStateManager: @@ -1517,7 +1517,7 @@ lbl_801AB628: /* 801AB644 001A85A4 80 01 01 84 */ lwz r0, 0x184(r1) /* 801AB648 001A85A8 7C 08 03 A6 */ mtlr r0 /* 801AB64C 001A85AC 38 21 01 80 */ addi r1, r1, 0x180 -/* 801AB650 001A85B0 4E 80 00 20 */ blr +/* 801AB650 001A85B0 4E 80 00 20 */ blr .global Think__18CScriptPlayerActorFfR13CStateManager Think__18CScriptPlayerActorFfR13CStateManager: @@ -1708,7 +1708,7 @@ lbl_801AB8D0: /* 801AB8FC 001A885C 38 A5 00 10 */ addi r5, r5, 0x10 /* 801AB900 001A8860 81 8C 00 10 */ lwz r12, 0x10(r12) /* 801AB904 001A8864 7D 89 03 A6 */ mtctr r12 -/* 801AB908 001A8868 4E 80 04 21 */ bctrl +/* 801AB908 001A8868 4E 80 04 21 */ bctrl /* 801AB90C 001A886C 38 61 00 28 */ addi r3, r1, 0x28 /* 801AB910 001A8870 38 81 00 10 */ addi r4, r1, 0x10 /* 801AB914 001A8874 48 19 55 95 */ bl __ct__6CTokenFRC6CToken @@ -1861,7 +1861,7 @@ lbl_801ABB00: /* 801ABB28 001A8A88 83 81 00 90 */ lwz r28, 0x90(r1) /* 801ABB2C 001A8A8C 7C 08 03 A6 */ mtlr r0 /* 801ABB30 001A8A90 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 801ABB34 001A8A94 4E 80 00 20 */ blr +/* 801ABB34 001A8A94 4E 80 00 20 */ blr .global AcceptScriptMsg__18CScriptPlayerActorF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__18CScriptPlayerActorF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -1880,7 +1880,7 @@ AcceptScriptMsg__18CScriptPlayerActorF20EScriptObjectMessage9TUniqueIdR13CStateM /* 801ABB68 001A8AC8 38 84 4C 64 */ addi r4, r4, lbl_803E4C64@l /* 801ABB6C 001A8ACC 7C 04 00 2E */ lwzx r0, r4, r0 /* 801ABB70 001A8AD0 7C 09 03 A6 */ mtctr r0 -/* 801ABB74 001A8AD4 4E 80 04 20 */ bctr +/* 801ABB74 001A8AD4 4E 80 04 20 */ bctr .global lbl_801ABB78 lbl_801ABB78: /* 801ABB78 001A8AD8 88 1C 03 54 */ lbz r0, 0x354(r28) @@ -2176,7 +2176,7 @@ lbl_801ABF10: /* 801ABF8C 001A8EEC 81 9C 00 00 */ lwz r12, 0(r28) /* 801ABF90 001A8EF0 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 801ABF94 001A8EF4 7D 89 03 A6 */ mtctr r12 -/* 801ABF98 001A8EF8 4E 80 04 21 */ bctrl +/* 801ABF98 001A8EF8 4E 80 04 21 */ bctrl /* 801ABF9C 001A8EFC 48 00 00 10 */ b lbl_801ABFAC .global lbl_801ABFA0 lbl_801ABFA0: @@ -2196,7 +2196,7 @@ lbl_801ABFAC: /* 801ABFCC 001A8F2C 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 801ABFD0 001A8F30 7C 08 03 A6 */ mtlr r0 /* 801ABFD4 001A8F34 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 801ABFD8 001A8F38 4E 80 00 20 */ blr +/* 801ABFD8 001A8F38 4E 80 00 20 */ blr .global "__ct__18CScriptPlayerActorF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC8CAnimResRC10CModelDataRC6CAABoxbRC13CMaterialListffRC11CHealthInfoRC20CDamageVulnerabilityRC16CActorParametersbb" "__ct__18CScriptPlayerActorF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC8CAnimResRC10CModelDataRC6CAABoxbRC13CMaterialListffRC11CHealthInfoRC20CDamageVulnerabilityRC16CActorParametersbb": diff --git a/asm/MetroidPrime/ScriptObjects/CScriptPlayerHint.s b/asm/MetroidPrime/ScriptObjects/CScriptPlayerHint.s index c110b4e1..32c3ad96 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptPlayerHint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptPlayerHint.s @@ -100,7 +100,7 @@ lbl_8015B8F8: /* 8015B904 00158864 83 C1 00 08 */ lwz r30, 8(r1) /* 8015B908 00158868 7C 08 03 A6 */ mtlr r0 /* 8015B90C 0015886C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8015B910 00158870 4E 80 00 20 */ blr +/* 8015B910 00158870 4E 80 00 20 */ blr .global Accept__17CScriptPlayerHintFR8IVisitor Accept__17CScriptPlayerHintFR8IVisitor: @@ -113,11 +113,11 @@ Accept__17CScriptPlayerHintFR8IVisitor: /* 8015B92C 0015888C 7C 04 03 78 */ mr r4, r0 /* 8015B930 00158890 81 8C 00 A0 */ lwz r12, 0xa0(r12) /* 8015B934 00158894 7D 89 03 A6 */ mtctr r12 -/* 8015B938 00158898 4E 80 04 21 */ bctrl +/* 8015B938 00158898 4E 80 04 21 */ bctrl /* 8015B93C 0015889C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8015B940 001588A0 7C 08 03 A6 */ mtlr r0 /* 8015B944 001588A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8015B948 001588A8 4E 80 00 20 */ blr +/* 8015B948 001588A8 4E 80 00 20 */ blr .global AcceptScriptMsg__17CScriptPlayerHintF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__17CScriptPlayerHintF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -254,13 +254,13 @@ lbl_8015BB0C: /* 8015BB2C 00158A8C 80 01 00 64 */ lwz r0, 0x64(r1) /* 8015BB30 00158A90 7C 08 03 A6 */ mtlr r0 /* 8015BB34 00158A94 38 21 00 60 */ addi r1, r1, 0x60 -/* 8015BB38 00158A98 4E 80 00 20 */ blr +/* 8015BB38 00158A98 4E 80 00 20 */ blr .global RemoveFromObjectList__17CScriptPlayerHintF9TUniqueIdR13CStateManager RemoveFromObjectList__17CScriptPlayerHintF9TUniqueIdR13CStateManager: /* 8015BB3C 00158A9C 80 03 00 E8 */ lwz r0, 0xe8(r3) /* 8015BB40 00158AA0 2C 00 00 00 */ cmpwi r0, 0 -/* 8015BB44 00158AA4 4D 82 00 20 */ beqlr +/* 8015BB44 00158AA4 4D 82 00 20 */ beqlr /* 8015BB48 00158AA8 38 E3 00 EC */ addi r7, r3, 0xec /* 8015BB4C 00158AAC 54 00 08 3C */ slwi r0, r0, 1 /* 8015BB50 00158AB0 7C E6 3B 78 */ mr r6, r7 @@ -279,9 +279,9 @@ lbl_8015BB78: /* 8015BB78 00158AD8 7C 06 40 40 */ cmplw r6, r8 /* 8015BB7C 00158ADC 40 82 00 4C */ bne lbl_8015BBC8 /* 8015BB80 00158AE0 7C 07 38 40 */ cmplw r7, r7 -/* 8015BB84 00158AE4 4D 80 00 20 */ bltlr +/* 8015BB84 00158AE4 4D 80 00 20 */ bltlr /* 8015BB88 00158AE8 7C 07 40 40 */ cmplw r7, r8 -/* 8015BB8C 00158AEC 4C 80 00 20 */ bgelr +/* 8015BB8C 00158AEC 4C 80 00 20 */ bgelr /* 8015BB90 00158AF0 7C E6 3B 78 */ mr r6, r7 /* 8015BB94 00158AF4 48 00 00 10 */ b lbl_8015BBA4 lbl_8015BB98: @@ -297,12 +297,12 @@ lbl_8015BBA4: /* 8015BBB8 00158B18 41 80 FF E0 */ blt lbl_8015BB98 /* 8015BBBC 00158B1C 38 05 FF FF */ addi r0, r5, -1 /* 8015BBC0 00158B20 90 03 00 E8 */ stw r0, 0xe8(r3) -/* 8015BBC4 00158B24 4E 80 00 20 */ blr +/* 8015BBC4 00158B24 4E 80 00 20 */ blr lbl_8015BBC8: /* 8015BBC8 00158B28 7C 06 38 40 */ cmplw r6, r7 -/* 8015BBCC 00158B2C 4D 80 00 20 */ bltlr +/* 8015BBCC 00158B2C 4D 80 00 20 */ bltlr /* 8015BBD0 00158B30 7C 06 40 40 */ cmplw r6, r8 -/* 8015BBD4 00158B34 4C 80 00 20 */ bgelr +/* 8015BBD4 00158B34 4C 80 00 20 */ bgelr /* 8015BBD8 00158B38 48 00 00 10 */ b lbl_8015BBE8 lbl_8015BBDC: /* 8015BBDC 00158B3C A0 06 00 02 */ lhz r0, 2(r6) @@ -317,7 +317,7 @@ lbl_8015BBE8: /* 8015BBFC 00158B5C 41 80 FF E0 */ blt lbl_8015BBDC /* 8015BC00 00158B60 38 05 FF FF */ addi r0, r5, -1 /* 8015BC04 00158B64 90 03 00 E8 */ stw r0, 0xe8(r3) -/* 8015BC08 00158B68 4E 80 00 20 */ blr +/* 8015BC08 00158B68 4E 80 00 20 */ blr .global AddToObjectList__17CScriptPlayerHintF9TUniqueIdR13CStateManager AddToObjectList__17CScriptPlayerHintF9TUniqueIdR13CStateManager: @@ -337,7 +337,7 @@ lbl_8015BC24: /* 8015BC38 00158B98 40 82 FF E8 */ bne lbl_8015BC20 lbl_8015BC3C: /* 8015BC3C 00158B9C 7C 06 38 40 */ cmplw r6, r7 -/* 8015BC40 00158BA0 4C 82 00 20 */ bnelr +/* 8015BC40 00158BA0 4C 82 00 20 */ bnelr /* 8015BC44 00158BA4 28 07 00 00 */ cmplwi r7, 0 /* 8015BC48 00158BA8 41 82 00 0C */ beq lbl_8015BC54 /* 8015BC4C 00158BAC A0 04 00 00 */ lhz r0, 0(r4) @@ -346,7 +346,7 @@ lbl_8015BC54: /* 8015BC54 00158BB4 80 83 00 E8 */ lwz r4, 0xe8(r3) /* 8015BC58 00158BB8 38 04 00 01 */ addi r0, r4, 1 /* 8015BC5C 00158BBC 90 03 00 E8 */ stw r0, 0xe8(r3) -/* 8015BC60 00158BC0 4E 80 00 20 */ blr +/* 8015BC60 00158BC0 4E 80 00 20 */ blr .global ClearObjectList__17CScriptPlayerHintFv ClearObjectList__17CScriptPlayerHintFv: @@ -375,7 +375,7 @@ lbl_8015BCAC: lbl_8015BCB0: /* 8015BCB0 00158C10 38 00 00 00 */ li r0, 0 /* 8015BCB4 00158C14 90 03 00 E8 */ stw r0, 0xe8(r3) -/* 8015BCB8 00158C18 4E 80 00 20 */ blr +/* 8015BCB8 00158C18 4E 80 00 20 */ blr .global "__ct__17CScriptPlayerHintF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fbii" "__ct__17CScriptPlayerHintF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fbii": diff --git a/asm/MetroidPrime/ScriptObjects/CScriptPlayerStateChange.s b/asm/MetroidPrime/ScriptObjects/CScriptPlayerStateChange.s index 37040c44..c5fcc134 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptPlayerStateChange.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptPlayerStateChange.s @@ -41,7 +41,7 @@ lbl_801DA4E4: /* 801DA4F0 001D7450 83 C1 00 08 */ lwz r30, 8(r1) /* 801DA4F4 001D7454 7C 08 03 A6 */ mtlr r0 /* 801DA4F8 001D7458 38 21 00 10 */ addi r1, r1, 0x10 -/* 801DA4FC 001D745C 4E 80 00 20 */ blr +/* 801DA4FC 001D745C 4E 80 00 20 */ blr .global AcceptScriptMsg__24CScriptPlayerStateChangeF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__24CScriptPlayerStateChangeF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -118,7 +118,7 @@ lbl_801DA5F0: /* 801DA610 001D7570 80 01 00 34 */ lwz r0, 0x34(r1) /* 801DA614 001D7574 7C 08 03 A6 */ mtlr r0 /* 801DA618 001D7578 38 21 00 30 */ addi r1, r1, 0x30 -/* 801DA61C 001D757C 4E 80 00 20 */ blr +/* 801DA61C 001D757C 4E 80 00 20 */ blr .global Accept__24CScriptPlayerStateChangeFR8IVisitor Accept__24CScriptPlayerStateChangeFR8IVisitor: @@ -131,11 +131,11 @@ Accept__24CScriptPlayerStateChangeFR8IVisitor: /* 801DA638 001D7598 7C 04 03 78 */ mr r4, r0 /* 801DA63C 001D759C 81 8C 00 24 */ lwz r12, 0x24(r12) /* 801DA640 001D75A0 7D 89 03 A6 */ mtctr r12 -/* 801DA644 001D75A4 4E 80 04 21 */ bctrl +/* 801DA644 001D75A4 4E 80 04 21 */ bctrl /* 801DA648 001D75A8 80 01 00 14 */ lwz r0, 0x14(r1) /* 801DA64C 001D75AC 7C 08 03 A6 */ mtlr r0 /* 801DA650 001D75B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801DA654 001D75B4 4E 80 00 20 */ blr +/* 801DA654 001D75B4 4E 80 00 20 */ blr .global "__ct__24CScriptPlayerStateChangeF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfobiiiQ224CScriptPlayerStateChange8EControlQ224CScriptPlayerStateChange21EControlCommandOption" "__ct__24CScriptPlayerStateChangeF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfobiiiQ224CScriptPlayerStateChange8EControlQ224CScriptPlayerStateChange21EControlCommandOption": diff --git a/asm/MetroidPrime/ScriptObjects/CScriptPointOfInterest.s b/asm/MetroidPrime/ScriptObjects/CScriptPointOfInterest.s index f75a7d7d..b6d3c1b7 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptPointOfInterest.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptPointOfInterest.s @@ -94,7 +94,7 @@ lbl_8015EB78: /* 8015EB7C 0015BADC 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 8015EB80 0015BAE0 7C 08 03 A6 */ mtlr r0 /* 8015EB84 0015BAE4 38 21 00 40 */ addi r1, r1, 0x40 -/* 8015EB88 0015BAE8 4E 80 00 20 */ blr +/* 8015EB88 0015BAE8 4E 80 00 20 */ blr .global Think__22CScriptPointOfInterestFfR13CStateManager Think__22CScriptPointOfInterestFfR13CStateManager: @@ -113,7 +113,7 @@ Think__22CScriptPointOfInterestFfR13CStateManager: /* 8015EBBC 0015BB1C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8015EBC0 0015BB20 7C 08 03 A6 */ mtlr r0 /* 8015EBC4 0015BB24 38 21 00 10 */ addi r1, r1, 0x10 -/* 8015EBC8 0015BB28 4E 80 00 20 */ blr +/* 8015EBC8 0015BB28 4E 80 00 20 */ blr .global Accept__22CScriptPointOfInterestFR8IVisitor Accept__22CScriptPointOfInterestFR8IVisitor: @@ -126,19 +126,19 @@ Accept__22CScriptPointOfInterestFR8IVisitor: /* 8015EBE4 0015BB44 7C 04 03 78 */ mr r4, r0 /* 8015EBE8 0015BB48 81 8C 00 A4 */ lwz r12, 0xa4(r12) /* 8015EBEC 0015BB4C 7D 89 03 A6 */ mtctr r12 -/* 8015EBF0 0015BB50 4E 80 04 21 */ bctrl +/* 8015EBF0 0015BB50 4E 80 04 21 */ bctrl /* 8015EBF4 0015BB54 80 01 00 14 */ lwz r0, 0x14(r1) /* 8015EBF8 0015BB58 7C 08 03 A6 */ mtlr r0 /* 8015EBFC 0015BB5C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8015EC00 0015BB60 4E 80 00 20 */ blr +/* 8015EC00 0015BB60 4E 80 00 20 */ blr .global AddToRenderer__22CScriptPointOfInterestCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__22CScriptPointOfInterestCFRC14CFrustumPlanesRC13CStateManager: -/* 8015EC04 0015BB64 4E 80 00 20 */ blr +/* 8015EC04 0015BB64 4E 80 00 20 */ blr .global Render__22CScriptPointOfInterestCFRC13CStateManager Render__22CScriptPointOfInterestCFRC13CStateManager: -/* 8015EC08 0015BB68 4E 80 00 20 */ blr +/* 8015EC08 0015BB68 4E 80 00 20 */ blr .global GetTouchBounds__22CScriptPointOfInterestCFv GetTouchBounds__22CScriptPointOfInterestCFv: @@ -181,7 +181,7 @@ lbl_8015EC94: /* 8015EC98 0015BBF8 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 8015EC9C 0015BBFC 7C 08 03 A6 */ mtlr r0 /* 8015ECA0 0015BC00 38 21 00 40 */ addi r1, r1, 0x40 -/* 8015ECA4 0015BC04 4E 80 00 20 */ blr +/* 8015ECA4 0015BC04 4E 80 00 20 */ blr .global AcceptScriptMsg__22CScriptPointOfInterestF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__22CScriptPointOfInterestF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -195,7 +195,7 @@ AcceptScriptMsg__22CScriptPointOfInterestF20EScriptObjectMessage9TUniqueIdR13CSt /* 8015ECC4 0015BC24 80 01 00 14 */ lwz r0, 0x14(r1) /* 8015ECC8 0015BC28 7C 08 03 A6 */ mtlr r0 /* 8015ECCC 0015BC2C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8015ECD0 0015BC30 4E 80 00 20 */ blr +/* 8015ECD0 0015BC30 4E 80 00 20 */ blr .global __dt__22CScriptPointOfInterestFv __dt__22CScriptPointOfInterestFv: @@ -223,7 +223,7 @@ lbl_8015ED18: /* 8015ED24 0015BC84 83 C1 00 08 */ lwz r30, 8(r1) /* 8015ED28 0015BC88 7C 08 03 A6 */ mtlr r0 /* 8015ED2C 0015BC8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8015ED30 0015BC90 4E 80 00 20 */ blr +/* 8015ED30 0015BC90 4E 80 00 20 */ blr .global "__ct__22CScriptPointOfInterestF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fbRC20CScannableParameters" "__ct__22CScriptPointOfInterestF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fbRC20CScannableParameters": diff --git a/asm/MetroidPrime/ScriptObjects/CScriptProjectedShadow.s b/asm/MetroidPrime/ScriptObjects/CScriptProjectedShadow.s index 7948547d..c526d6d0 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptProjectedShadow.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptProjectedShadow.s @@ -69,7 +69,7 @@ lbl_8029ED34: /* 8029ED40 0029BCA0 83 C1 00 08 */ lwz r30, 8(r1) /* 8029ED44 0029BCA4 7C 08 03 A6 */ mtlr r0 /* 8029ED48 0029BCA8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8029ED4C 0029BCAC 4E 80 00 20 */ blr +/* 8029ED4C 0029BCAC 4E 80 00 20 */ blr .global Think__22CScriptShadowProjectorFfR13CStateManager Think__22CScriptShadowProjectorFfR13CStateManager: @@ -115,7 +115,7 @@ lbl_8029EDE0: /* 8029EDE8 0029BD48 83 C1 00 08 */ lwz r30, 8(r1) /* 8029EDEC 0029BD4C 7C 08 03 A6 */ mtlr r0 /* 8029EDF0 0029BD50 38 21 00 10 */ addi r1, r1, 0x10 -/* 8029EDF4 0029BD54 4E 80 00 20 */ blr +/* 8029EDF4 0029BD54 4E 80 00 20 */ blr .global Accept__22CScriptShadowProjectorFR8IVisitor Accept__22CScriptShadowProjectorFR8IVisitor: @@ -128,11 +128,11 @@ Accept__22CScriptShadowProjectorFR8IVisitor: /* 8029EE10 0029BD70 7C 04 03 78 */ mr r4, r0 /* 8029EE14 0029BD74 81 8C 00 08 */ lwz r12, 8(r12) /* 8029EE18 0029BD78 7D 89 03 A6 */ mtctr r12 -/* 8029EE1C 0029BD7C 4E 80 04 21 */ bctrl +/* 8029EE1C 0029BD7C 4E 80 04 21 */ bctrl /* 8029EE20 0029BD80 80 01 00 14 */ lwz r0, 0x14(r1) /* 8029EE24 0029BD84 7C 08 03 A6 */ mtlr r0 /* 8029EE28 0029BD88 38 21 00 10 */ addi r1, r1, 0x10 -/* 8029EE2C 0029BD8C 4E 80 00 20 */ blr +/* 8029EE2C 0029BD8C 4E 80 00 20 */ blr .global PreRender__22CScriptShadowProjectorFR13CStateManagerRC14CFrustumPlanes PreRender__22CScriptShadowProjectorFR13CStateManagerRC14CFrustumPlanes: @@ -219,11 +219,11 @@ lbl_8029EF48: /* 8029EF54 0029BEB4 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8029EF58 0029BEB8 7C 08 03 A6 */ mtlr r0 /* 8029EF5C 0029BEBC 38 21 00 30 */ addi r1, r1, 0x30 -/* 8029EF60 0029BEC0 4E 80 00 20 */ blr +/* 8029EF60 0029BEC0 4E 80 00 20 */ blr .global AddToRenderer__22CScriptShadowProjectorCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__22CScriptShadowProjectorCFRC14CFrustumPlanesRC13CStateManager: -/* 8029EF64 0029BEC4 4E 80 00 20 */ blr +/* 8029EF64 0029BEC4 4E 80 00 20 */ blr .global AcceptScriptMsg__22CScriptShadowProjectorF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__22CScriptShadowProjectorF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -373,7 +373,7 @@ lbl_8029F164: /* 8029F170 0029C0D0 83 A1 00 34 */ lwz r29, 0x34(r1) /* 8029F174 0029C0D4 7C 08 03 A6 */ mtlr r0 /* 8029F178 0029C0D8 38 21 00 40 */ addi r1, r1, 0x40 -/* 8029F17C 0029C0DC 4E 80 00 20 */ blr +/* 8029F17C 0029C0DC 4E 80 00 20 */ blr .global "__ct__22CScriptShadowProjectorF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fbRC9CVector3fbffffi" "__ct__22CScriptShadowProjectorF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fbRC9CVector3fbffffi": @@ -480,4 +480,4 @@ lbl_8029F2B0: /* 8029F308 0029C268 80 01 01 44 */ lwz r0, 0x144(r1) /* 8029F30C 0029C26C 7C 08 03 A6 */ mtlr r0 /* 8029F310 0029C270 38 21 01 40 */ addi r1, r1, 0x140 -/* 8029F314 0029C274 4E 80 00 20 */ blr +/* 8029F314 0029C274 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/ScriptObjects/CScriptRandomRelay.s b/asm/MetroidPrime/ScriptObjects/CScriptRandomRelay.s index 0722760b..3fb62440 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptRandomRelay.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptRandomRelay.s @@ -40,11 +40,11 @@ Accept__18CScriptRandomRelayFR8IVisitor: /* 800E279C 000DF6FC 7C 04 03 78 */ mr r4, r0 /* 800E27A0 000DF700 81 8C 00 24 */ lwz r12, 0x24(r12) /* 800E27A4 000DF704 7D 89 03 A6 */ mtctr r12 -/* 800E27A8 000DF708 4E 80 04 21 */ bctrl +/* 800E27A8 000DF708 4E 80 04 21 */ bctrl /* 800E27AC 000DF70C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800E27B0 000DF710 7C 08 03 A6 */ mtlr r0 /* 800E27B4 000DF714 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E27B8 000DF718 4E 80 00 20 */ blr +/* 800E27B8 000DF718 4E 80 00 20 */ blr .global SendLocalScriptMsgs__18CScriptRandomRelayF18EScriptObjectStateR13CStateManager SendLocalScriptMsgs__18CScriptRandomRelayF18EScriptObjectStateR13CStateManager: @@ -316,7 +316,7 @@ lbl_800E2B60: /* 800E2B74 000DFAD4 80 01 00 D4 */ lwz r0, 0xd4(r1) /* 800E2B78 000DFAD8 7C 08 03 A6 */ mtlr r0 /* 800E2B7C 000DFADC 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 800E2B80 000DFAE0 4E 80 00 20 */ blr +/* 800E2B80 000DFAE0 4E 80 00 20 */ blr .global sub_800e2b84 sub_800e2b84: @@ -338,7 +338,7 @@ sub_800e2b84: /* 800E2BC0 000DFB20 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 800E2BC4 000DFB24 7C 08 03 A6 */ mtlr r0 /* 800E2BC8 000DFB28 38 21 00 20 */ addi r1, r1, 0x20 -/* 800E2BCC 000DFB2C 4E 80 00 20 */ blr +/* 800E2BCC 000DFB2C 4E 80 00 20 */ blr .global sub_800e2bd0 sub_800e2bd0: @@ -385,7 +385,7 @@ lbl_800E2C40: /* 800E2C5C 000DFBBC 80 05 00 00 */ lwz r0, 0(r5) /* 800E2C60 000DFBC0 90 03 00 00 */ stw r0, 0(r3) /* 800E2C64 000DFBC4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E2C68 000DFBC8 4E 80 00 20 */ blr +/* 800E2C68 000DFBC8 4E 80 00 20 */ blr .global AcceptScriptMsg__18CScriptRandomRelayF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__18CScriptRandomRelayF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -420,7 +420,7 @@ lbl_800E2CC8: /* 800E2CD4 000DFC34 83 A1 00 14 */ lwz r29, 0x14(r1) /* 800E2CD8 000DFC38 7C 08 03 A6 */ mtlr r0 /* 800E2CDC 000DFC3C 38 21 00 20 */ addi r1, r1, 0x20 -/* 800E2CE0 000DFC40 4E 80 00 20 */ blr +/* 800E2CE0 000DFC40 4E 80 00 20 */ blr .global __dt__18CScriptRandomRelayFv __dt__18CScriptRandomRelayFv: @@ -448,7 +448,7 @@ lbl_800E2D28: /* 800E2D34 000DFC94 83 C1 00 08 */ lwz r30, 8(r1) /* 800E2D38 000DFC98 7C 08 03 A6 */ mtlr r0 /* 800E2D3C 000DFC9C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E2D40 000DFCA0 4E 80 00 20 */ blr +/* 800E2D40 000DFCA0 4E 80 00 20 */ blr .global "__ct__18CScriptRandomRelayF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoiibb" "__ct__18CScriptRandomRelayF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoiibb": @@ -493,7 +493,7 @@ lbl_800E2DC4: /* 800E2DD8 000DFD38 83 81 00 10 */ lwz r28, 0x10(r1) /* 800E2DDC 000DFD3C 7C 08 03 A6 */ mtlr r0 /* 800E2DE0 000DFD40 38 21 00 20 */ addi r1, r1, 0x20 -/* 800E2DE4 000DFD44 4E 80 00 20 */ blr +/* 800E2DE4 000DFD44 4E 80 00 20 */ blr .global "reserve__Q24rstl82vector,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl82vector,Q24rstl17rmemory_allocator>Fi": @@ -566,4 +566,4 @@ lbl_800E2EC0: /* 800E2ECC 000DFE2C 83 A1 00 24 */ lwz r29, 0x24(r1) /* 800E2ED0 000DFE30 7C 08 03 A6 */ mtlr r0 /* 800E2ED4 000DFE34 38 21 00 30 */ addi r1, r1, 0x30 -/* 800E2ED8 000DFE38 4E 80 00 20 */ blr +/* 800E2ED8 000DFE38 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/ScriptObjects/CScriptRelay.s b/asm/MetroidPrime/ScriptObjects/CScriptRelay.s index a6ab3896..1b014c3a 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptRelay.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptRelay.s @@ -42,7 +42,7 @@ lbl_800E20AC: /* 800E20B8 000DF018 83 C1 00 08 */ lwz r30, 8(r1) /* 800E20BC 000DF01C 7C 08 03 A6 */ mtlr r0 /* 800E20C0 000DF020 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E20C4 000DF024 4E 80 00 20 */ blr +/* 800E20C4 000DF024 4E 80 00 20 */ blr .global Accept__12CScriptRelayFR8IVisitor Accept__12CScriptRelayFR8IVisitor: @@ -55,11 +55,11 @@ Accept__12CScriptRelayFR8IVisitor: /* 800E20E0 000DF040 7C 04 03 78 */ mr r4, r0 /* 800E20E4 000DF044 81 8C 00 24 */ lwz r12, 0x24(r12) /* 800E20E8 000DF048 7D 89 03 A6 */ mtctr r12 -/* 800E20EC 000DF04C 4E 80 04 21 */ bctrl +/* 800E20EC 000DF04C 4E 80 04 21 */ bctrl /* 800E20F0 000DF050 80 01 00 14 */ lwz r0, 0x14(r1) /* 800E20F4 000DF054 7C 08 03 A6 */ mtlr r0 /* 800E20F8 000DF058 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E20FC 000DF05C 4E 80 00 20 */ blr +/* 800E20FC 000DF05C 4E 80 00 20 */ blr .global Think__12CScriptRelayFfR13CStateManager Think__12CScriptRelayFfR13CStateManager: @@ -96,7 +96,7 @@ lbl_800E2164: /* 800E216C 000DF0CC 83 C1 00 08 */ lwz r30, 8(r1) /* 800E2170 000DF0D0 7C 08 03 A6 */ mtlr r0 /* 800E2174 000DF0D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E2178 000DF0D8 4E 80 00 20 */ blr +/* 800E2178 000DF0D8 4E 80 00 20 */ blr .global AcceptScriptMsg__12CScriptRelayF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__12CScriptRelayF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -172,7 +172,7 @@ lbl_800E2268: /* 800E2274 000DF1D4 83 A1 00 24 */ lwz r29, 0x24(r1) /* 800E2278 000DF1D8 7C 08 03 A6 */ mtlr r0 /* 800E227C 000DF1DC 38 21 00 30 */ addi r1, r1, 0x30 -/* 800E2280 000DF1E0 4E 80 00 20 */ blr +/* 800E2280 000DF1E0 4E 80 00 20 */ blr .global UpdateObjectRef__12CScriptRelayFR13CStateManager UpdateObjectRef__12CScriptRelayFR13CStateManager: @@ -214,7 +214,7 @@ lbl_800E22F8: /* 800E2300 000DF260 83 C1 00 18 */ lwz r30, 0x18(r1) /* 800E2304 000DF264 7C 08 03 A6 */ mtlr r0 /* 800E2308 000DF268 38 21 00 20 */ addi r1, r1, 0x20 -/* 800E230C 000DF26C 4E 80 00 20 */ blr +/* 800E230C 000DF26C 4E 80 00 20 */ blr .global "__ct__12CScriptRelayF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfofb" "__ct__12CScriptRelayF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfofb": diff --git a/asm/MetroidPrime/ScriptObjects/CScriptRipple.s b/asm/MetroidPrime/ScriptObjects/CScriptRipple.s index b546b247..0b44cc9b 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptRipple.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptRipple.s @@ -27,15 +27,15 @@ Accept__13CScriptRippleFR8IVisitor: /* 80174F2C 00171E8C 7C 04 03 78 */ mr r4, r0 /* 80174F30 00171E90 81 8C 00 24 */ lwz r12, 0x24(r12) /* 80174F34 00171E94 7D 89 03 A6 */ mtctr r12 -/* 80174F38 00171E98 4E 80 04 21 */ bctrl +/* 80174F38 00171E98 4E 80 04 21 */ bctrl /* 80174F3C 00171E9C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80174F40 00171EA0 7C 08 03 A6 */ mtlr r0 /* 80174F44 00171EA4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80174F48 00171EA8 4E 80 00 20 */ blr +/* 80174F48 00171EA8 4E 80 00 20 */ blr .global Think__13CScriptRippleFfR13CStateManager Think__13CScriptRippleFfR13CStateManager: -/* 80174F4C 00171EAC 4E 80 00 20 */ blr +/* 80174F4C 00171EAC 4E 80 00 20 */ blr .global AcceptScriptMsg__13CScriptRippleF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__13CScriptRippleF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -105,7 +105,7 @@ lbl_80174FE8: /* 8017503C 00171F9C C0 3E 00 34 */ lfs f1, 0x34(r30) /* 80175040 00171FA0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80175044 00171FA4 7D 89 03 A6 */ mtctr r12 -/* 80175048 00171FA8 4E 80 04 21 */ bctrl +/* 80175048 00171FA8 4E 80 04 21 */ bctrl lbl_8017504C: /* 8017504C 00171FAC 3B BD 00 0C */ addi r29, r29, 0xc lbl_80175050: @@ -128,7 +128,7 @@ lbl_8017507C: /* 80175088 00171FE8 83 A1 00 44 */ lwz r29, 0x44(r1) /* 8017508C 00171FEC 7C 08 03 A6 */ mtlr r0 /* 80175090 00171FF0 38 21 00 50 */ addi r1, r1, 0x50 -/* 80175094 00171FF4 4E 80 00 20 */ blr +/* 80175094 00171FF4 4E 80 00 20 */ blr .global __dt__13CScriptRippleFv __dt__13CScriptRippleFv: @@ -156,7 +156,7 @@ lbl_801750DC: /* 801750E8 00172048 83 C1 00 08 */ lwz r30, 8(r1) /* 801750EC 0017204C 7C 08 03 A6 */ mtlr r0 /* 801750F0 00172050 38 21 00 10 */ addi r1, r1, 0x10 -/* 801750F4 00172054 4E 80 00 20 */ blr +/* 801750F4 00172054 4E 80 00 20 */ blr .global "__ct__13CScriptRippleF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC9CVector3fbffff" "__ct__13CScriptRippleF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC9CVector3fbffff": diff --git a/asm/MetroidPrime/ScriptObjects/CScriptRoomAcoustics.s b/asm/MetroidPrime/ScriptObjects/CScriptRoomAcoustics.s index c15422a7..f5cc4d0c 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptRoomAcoustics.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptRoomAcoustics.s @@ -48,7 +48,7 @@ lbl_8019DD48: /* 8019DD54 0019ACB4 83 C1 00 08 */ lwz r30, 8(r1) /* 8019DD58 0019ACB8 7C 08 03 A6 */ mtlr r0 /* 8019DD5C 0019ACBC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8019DD60 0019ACC0 4E 80 00 20 */ blr +/* 8019DD60 0019ACC0 4E 80 00 20 */ blr .global DisableAuxCallbacks__20CScriptRoomAcousticsFv DisableAuxCallbacks__20CScriptRoomAcousticsFv: @@ -63,7 +63,7 @@ DisableAuxCallbacks__20CScriptRoomAcousticsFv: /* 8019DD84 0019ACE4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8019DD88 0019ACE8 7C 08 03 A6 */ mtlr r0 /* 8019DD8C 0019ACEC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8019DD90 0019ACF0 4E 80 00 20 */ blr +/* 8019DD90 0019ACF0 4E 80 00 20 */ blr .global EnableAuxCallbacks__20CScriptRoomAcousticsFv EnableAuxCallbacks__20CScriptRoomAcousticsFv: @@ -178,13 +178,13 @@ lbl_8019DF24: /* 8019DF2C 0019AE8C 83 C1 04 38 */ lwz r30, 0x438(r1) /* 8019DF30 0019AE90 7C 08 03 A6 */ mtlr r0 /* 8019DF34 0019AE94 38 21 04 40 */ addi r1, r1, 0x440 -/* 8019DF38 0019AE98 4E 80 00 20 */ blr +/* 8019DF38 0019AE98 4E 80 00 20 */ blr .global Think__20CScriptRoomAcousticsFfR13CStateManager Think__20CScriptRoomAcousticsFfR13CStateManager: /* 8019DF3C 0019AE9C 88 03 00 30 */ lbz r0, 0x30(r3) /* 8019DF40 0019AEA0 54 00 CF FF */ rlwinm. r0, r0, 0x19, 0x1f, 0x1f -/* 8019DF44 0019AEA4 4E 80 00 20 */ blr +/* 8019DF44 0019AEA4 4E 80 00 20 */ blr .global AcceptScriptMsg__20CScriptRoomAcousticsF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__20CScriptRoomAcousticsF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -225,7 +225,7 @@ lbl_8019DFBC: /* 8019DFC4 0019AF24 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8019DFC8 0019AF28 7C 08 03 A6 */ mtlr r0 /* 8019DFCC 0019AF2C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8019DFD0 0019AF30 4E 80 00 20 */ blr +/* 8019DFD0 0019AF30 4E 80 00 20 */ blr .global Accept__20CScriptRoomAcousticsFR8IVisitor Accept__20CScriptRoomAcousticsFR8IVisitor: @@ -238,11 +238,11 @@ Accept__20CScriptRoomAcousticsFR8IVisitor: /* 8019DFEC 0019AF4C 7C 04 03 78 */ mr r4, r0 /* 8019DFF0 0019AF50 81 8C 00 A8 */ lwz r12, 0xa8(r12) /* 8019DFF4 0019AF54 7D 89 03 A6 */ mtctr r12 -/* 8019DFF8 0019AF58 4E 80 04 21 */ bctrl +/* 8019DFF8 0019AF58 4E 80 04 21 */ bctrl /* 8019DFFC 0019AF5C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8019E000 0019AF60 7C 08 03 A6 */ mtlr r0 /* 8019E004 0019AF64 38 21 00 10 */ addi r1, r1, 0x10 -/* 8019E008 0019AF68 4E 80 00 20 */ blr +/* 8019E008 0019AF68 4E 80 00 20 */ blr .global "__ct__20CScriptRoomAcousticsF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfobbbfffffffbfffbbfffffbiiiiiiiii" "__ct__20CScriptRoomAcousticsF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfobbbfffffffbfffbbfffffbiiiiiiiii": @@ -383,7 +383,7 @@ Accept__20CScriptRoomAcousticsFR8IVisitor: /* 8019E224 0019B184 80 01 01 44 */ lwz r0, 0x144(r1) /* 8019E228 0019B188 7C 08 03 A6 */ mtlr r0 /* 8019E22C 0019B18C 38 21 01 40 */ addi r1, r1, 0x140 -/* 8019E230 0019B190 4E 80 00 20 */ blr +/* 8019E230 0019B190 4E 80 00 20 */ blr .global __sinit_CScriptRoomAcoustics_cpp __sinit_CScriptRoomAcoustics_cpp: diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSound.s b/asm/MetroidPrime/ScriptObjects/CScriptSound.s index 1f1b36c4..11c62eff 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptSound.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptSound.s @@ -357,7 +357,7 @@ lbl_800B0008: /* 800B00E0 000AD040 80 01 02 14 */ lwz r0, 0x214(r1) /* 800B00E4 000AD044 7C 08 03 A6 */ mtlr r0 /* 800B00E8 000AD048 38 21 02 10 */ addi r1, r1, 0x210 -/* 800B00EC 000AD04C 4E 80 00 20 */ blr +/* 800B00EC 000AD04C 4E 80 00 20 */ blr .global Accept__12CScriptSoundFR8IVisitor Accept__12CScriptSoundFR8IVisitor: @@ -370,15 +370,15 @@ Accept__12CScriptSoundFR8IVisitor: /* 800B0108 000AD068 7C 04 03 78 */ mr r4, r0 /* 800B010C 000AD06C 81 8C 00 AC */ lwz r12, 0xac(r12) /* 800B0110 000AD070 7D 89 03 A6 */ mtctr r12 -/* 800B0114 000AD074 4E 80 04 21 */ bctrl +/* 800B0114 000AD074 4E 80 04 21 */ bctrl /* 800B0118 000AD078 80 01 00 14 */ lwz r0, 0x14(r1) /* 800B011C 000AD07C 7C 08 03 A6 */ mtlr r0 /* 800B0120 000AD080 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B0124 000AD084 4E 80 00 20 */ blr +/* 800B0124 000AD084 4E 80 00 20 */ blr .global AddToRenderer__12CScriptSoundCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__12CScriptSoundCFRC14CFrustumPlanesRC13CStateManager: -/* 800B0128 000AD088 4E 80 00 20 */ blr +/* 800B0128 000AD088 4E 80 00 20 */ blr .global StopSound__12CScriptSoundFv StopSound__12CScriptSoundFv: @@ -418,7 +418,7 @@ lbl_800B01A4: /* 800B01A8 000AD108 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 800B01AC 000AD10C 7C 08 03 A6 */ mtlr r0 /* 800B01B0 000AD110 38 21 00 20 */ addi r1, r1, 0x20 -/* 800B01B4 000AD114 4E 80 00 20 */ blr +/* 800B01B4 000AD114 4E 80 00 20 */ blr .global PlaySound__12CScriptSoundFR13CStateManager PlaySound__12CScriptSoundFR13CStateManager: @@ -584,7 +584,7 @@ lbl_800B03FC: /* 800B0410 000AD370 83 A1 00 64 */ lwz r29, 0x64(r1) /* 800B0414 000AD374 7C 08 03 A6 */ mtlr r0 /* 800B0418 000AD378 38 21 00 80 */ addi r1, r1, 0x80 -/* 800B041C 000AD37C 4E 80 00 20 */ blr +/* 800B041C 000AD37C 4E 80 00 20 */ blr .global AcceptScriptMsg__12CScriptSoundF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__12CScriptSoundF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -608,7 +608,7 @@ AcceptScriptMsg__12CScriptSoundF20EScriptObjectMessage9TUniqueIdR13CStateManager /* 800B0464 000AD3C4 38 63 F1 94 */ addi r3, r3, lbl_803DF194@l /* 800B0468 000AD3C8 7C 03 00 2E */ lwzx r0, r3, r0 /* 800B046C 000AD3CC 7C 09 03 A6 */ mtctr r0 -/* 800B0470 000AD3D0 4E 80 04 20 */ bctr +/* 800B0470 000AD3D0 4E 80 04 20 */ bctr .global lbl_800B0474 lbl_800B0474: /* 800B0474 000AD3D4 88 1E 00 30 */ lbz r0, 0x30(r30) @@ -675,7 +675,7 @@ lbl_800B0528: /* 800B0534 000AD494 83 A1 00 14 */ lwz r29, 0x14(r1) /* 800B0538 000AD498 7C 08 03 A6 */ mtlr r0 /* 800B053C 000AD49C 38 21 00 20 */ addi r1, r1, 0x20 -/* 800B0540 000AD4A0 4E 80 00 20 */ blr +/* 800B0540 000AD4A0 4E 80 00 20 */ blr .global Think__12CScriptSoundFfR13CStateManager Think__12CScriptSoundFfR13CStateManager: @@ -932,7 +932,7 @@ lbl_800B08D8: /* 800B08F0 000AD850 83 C1 00 58 */ lwz r30, 0x58(r1) /* 800B08F4 000AD854 7C 08 03 A6 */ mtlr r0 /* 800B08F8 000AD858 38 21 00 80 */ addi r1, r1, 0x80 -/* 800B08FC 000AD85C 4E 80 00 20 */ blr +/* 800B08FC 000AD85C 4E 80 00 20 */ blr .global __dt__12CScriptSoundFv __dt__12CScriptSoundFv: @@ -960,7 +960,7 @@ lbl_800B0944: /* 800B0950 000AD8B0 83 C1 00 08 */ lwz r30, 8(r1) /* 800B0954 000AD8B4 7C 08 03 A6 */ mtlr r0 /* 800B0958 000AD8B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B095C 000AD8BC 4E 80 00 20 */ blr +/* 800B095C 000AD8BC 4E 80 00 20 */ blr .global PreThink__12CScriptSoundFfR13CStateManager PreThink__12CScriptSoundFfR13CStateManager: @@ -980,7 +980,7 @@ PreThink__12CScriptSoundFfR13CStateManager: /* 800B0994 000AD8F4 80 01 00 14 */ lwz r0, 0x14(r1) /* 800B0998 000AD8F8 7C 08 03 A6 */ mtlr r0 /* 800B099C 000AD8FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B09A0 000AD900 4E 80 00 20 */ blr +/* 800B09A0 000AD900 4E 80 00 20 */ blr .global "__ct__12CScriptSoundF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fUsbfffiiiibbbbbb" "__ct__12CScriptSoundF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fUsbfffiiiibbbbbb": @@ -1141,4 +1141,4 @@ lbl_800B0BE4: /* 800B0C04 000ADB64 80 01 01 54 */ lwz r0, 0x154(r1) /* 800B0C08 000ADB68 7C 08 03 A6 */ mtlr r0 /* 800B0C0C 000ADB6C 38 21 01 50 */ addi r1, r1, 0x150 -/* 800B0C10 000ADB70 4E 80 00 20 */ blr +/* 800B0C10 000ADB70 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSpawnPoint.s b/asm/MetroidPrime/ScriptObjects/CScriptSpawnPoint.s index 7c1a12ce..eda15627 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptSpawnPoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptSpawnPoint.s @@ -27,11 +27,11 @@ Accept__17CScriptSpawnPointFR8IVisitor: /* 800E2390 000DF2F0 7C 04 03 78 */ mr r4, r0 /* 800E2394 000DF2F4 81 8C 00 B0 */ lwz r12, 0xb0(r12) /* 800E2398 000DF2F8 7D 89 03 A6 */ mtctr r12 -/* 800E239C 000DF2FC 4E 80 04 21 */ bctrl +/* 800E239C 000DF2FC 4E 80 04 21 */ bctrl /* 800E23A0 000DF300 80 01 00 14 */ lwz r0, 0x14(r1) /* 800E23A4 000DF304 7C 08 03 A6 */ mtlr r0 /* 800E23A8 000DF308 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E23AC 000DF30C 4E 80 00 20 */ blr +/* 800E23AC 000DF30C 4E 80 00 20 */ blr .global AcceptScriptMsg__17CScriptSpawnPointF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__17CScriptSpawnPointF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -178,7 +178,7 @@ lbl_800E25B4: /* 800E25B8 000DF518 80 01 00 44 */ lwz r0, 0x44(r1) /* 800E25BC 000DF51C 7C 08 03 A6 */ mtlr r0 /* 800E25C0 000DF520 38 21 00 40 */ addi r1, r1, 0x40 -/* 800E25C4 000DF524 4E 80 00 20 */ blr +/* 800E25C4 000DF524 4E 80 00 20 */ blr .global GetPowerup__17CScriptSpawnPointCFRCQ212CPlayerState9EItemType GetPowerup__17CScriptSpawnPointCFRCQ212CPlayerState9EItemType: @@ -189,17 +189,17 @@ GetPowerup__17CScriptSpawnPointCFRCQ212CPlayerState9EItemType: /* 800E25D8 000DF538 40 80 00 0C */ bge lbl_800E25E4 lbl_800E25DC: /* 800E25DC 000DF53C 80 63 00 68 */ lwz r3, 0x68(r3) -/* 800E25E0 000DF540 4E 80 00 20 */ blr +/* 800E25E0 000DF540 4E 80 00 20 */ blr lbl_800E25E4: /* 800E25E4 000DF544 54 00 10 3A */ slwi r0, r0, 2 /* 800E25E8 000DF548 7C 63 02 14 */ add r3, r3, r0 /* 800E25EC 000DF54C 80 63 00 68 */ lwz r3, 0x68(r3) -/* 800E25F0 000DF550 4E 80 00 20 */ blr +/* 800E25F0 000DF550 4E 80 00 20 */ blr .global GetTransform__17CScriptSpawnPointCFv GetTransform__17CScriptSpawnPointCFv: /* 800E25F4 000DF554 38 63 00 34 */ addi r3, r3, 0x34 -/* 800E25F8 000DF558 4E 80 00 20 */ blr +/* 800E25F8 000DF558 4E 80 00 20 */ blr .global __dt__17CScriptSpawnPointFv __dt__17CScriptSpawnPointFv: @@ -256,7 +256,7 @@ lbl_800E26A0: /* 800E26AC 000DF60C 83 C1 00 08 */ lwz r30, 8(r1) /* 800E26B0 000DF610 7C 08 03 A6 */ mtlr r0 /* 800E26B4 000DF614 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E26B8 000DF618 4E 80 00 20 */ blr +/* 800E26B8 000DF618 4E 80 00 20 */ blr .global "__ct__17CScriptSpawnPointF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fQ24rstl21reserved_vectorbbb" "__ct__17CScriptSpawnPointF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fQ24rstl21reserved_vectorbbb": @@ -312,4 +312,4 @@ lbl_800E2754: /* 800E2774 000DF6D4 80 01 00 34 */ lwz r0, 0x34(r1) /* 800E2778 000DF6D8 7C 08 03 A6 */ mtlr r0 /* 800E277C 000DF6DC 38 21 00 30 */ addi r1, r1, 0x30 -/* 800E2780 000DF6E0 4E 80 00 20 */ blr +/* 800E2780 000DF6E0 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSpecialFunction.s b/asm/MetroidPrime/ScriptObjects/CScriptSpecialFunction.s index d4c7d38b..f117cabf 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptSpecialFunction.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptSpecialFunction.s @@ -265,7 +265,7 @@ lbl_8014F2C8: /* 8014F2D4 0014C234 83 C1 00 28 */ lwz r30, 0x28(r1) /* 8014F2D8 0014C238 7C 08 03 A6 */ mtlr r0 /* 8014F2DC 0014C23C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8014F2E0 0014C240 4E 80 00 20 */ blr +/* 8014F2E0 0014C240 4E 80 00 20 */ blr .global GetTouchBounds__22CScriptSpecialFunctionCFv GetTouchBounds__22CScriptSpecialFunctionCFv: @@ -273,9 +273,9 @@ GetTouchBounds__22CScriptSpecialFunctionCFv: /* 8014F2E8 0014C248 98 03 00 18 */ stb r0, 0x18(r3) /* 8014F2EC 0014C24C 88 04 01 E0 */ lbz r0, 0x1e0(r4) /* 8014F2F0 0014C250 28 00 00 00 */ cmplwi r0, 0 -/* 8014F2F4 0014C254 4D 82 00 20 */ beqlr +/* 8014F2F4 0014C254 4D 82 00 20 */ beqlr /* 8014F2F8 0014C258 28 03 00 00 */ cmplwi r3, 0 -/* 8014F2FC 0014C25C 4D 82 00 20 */ beqlr +/* 8014F2FC 0014C25C 4D 82 00 20 */ beqlr /* 8014F300 0014C260 C0 04 01 C8 */ lfs f0, 0x1c8(r4) /* 8014F304 0014C264 D0 03 00 00 */ stfs f0, 0(r3) /* 8014F308 0014C268 C0 04 01 CC */ lfs f0, 0x1cc(r4) @@ -288,7 +288,7 @@ GetTouchBounds__22CScriptSpecialFunctionCFv: /* 8014F324 0014C284 D0 03 00 10 */ stfs f0, 0x10(r3) /* 8014F328 0014C288 C0 04 01 DC */ lfs f0, 0x1dc(r4) /* 8014F32C 0014C28C D0 03 00 14 */ stfs f0, 0x14(r3) -/* 8014F330 0014C290 4E 80 00 20 */ blr +/* 8014F330 0014C290 4E 80 00 20 */ blr .global GetSpecialEnding__22CScriptSpecialFunctionCFv GetSpecialEnding__22CScriptSpecialFunctionCFv: @@ -321,7 +321,7 @@ lbl_8014F38C: /* 8014F394 0014C2F4 83 C1 00 08 */ lwz r30, 8(r1) /* 8014F398 0014C2F8 7C 08 03 A6 */ mtlr r0 /* 8014F39C 0014C2FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8014F3A0 0014C300 4E 80 00 20 */ blr +/* 8014F3A0 0014C300 4E 80 00 20 */ blr .global sub_8014f3a4 sub_8014f3a4: @@ -344,7 +344,7 @@ lbl_8014F3DC: /* 8014F3E0 0014C340 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8014F3E4 0014C344 7C 08 03 A6 */ mtlr r0 /* 8014F3E8 0014C348 38 21 00 20 */ addi r1, r1, 0x20 -/* 8014F3EC 0014C34C 4E 80 00 20 */ blr +/* 8014F3EC 0014C34C 4E 80 00 20 */ blr .global sub_8014f3f0 sub_8014f3f0: @@ -400,7 +400,7 @@ lbl_8014F4A0: /* 8014F4AC 0014C40C 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8014F4B0 0014C410 7C 08 03 A6 */ mtlr r0 /* 8014F4B4 0014C414 38 21 00 40 */ addi r1, r1, 0x40 -/* 8014F4B8 0014C418 4E 80 00 20 */ blr +/* 8014F4B8 0014C418 4E 80 00 20 */ blr .global ThinkPlayerInArea__22CScriptSpecialFunctionFfR13CStateManager ThinkPlayerInArea__22CScriptSpecialFunctionFfR13CStateManager: @@ -438,7 +438,7 @@ lbl_8014F530: /* 8014F530 0014C490 80 01 00 14 */ lwz r0, 0x14(r1) /* 8014F534 0014C494 7C 08 03 A6 */ mtlr r0 /* 8014F538 0014C498 38 21 00 10 */ addi r1, r1, 0x10 -/* 8014F53C 0014C49C 4E 80 00 20 */ blr +/* 8014F53C 0014C49C 4E 80 00 20 */ blr .global sub_8014f540 sub_8014f540: @@ -574,7 +574,7 @@ lbl_8014F6E8: /* 8014F728 0014C688 83 81 00 40 */ lwz r28, 0x40(r1) /* 8014F72C 0014C68C 7C 08 03 A6 */ mtlr r0 /* 8014F730 0014C690 38 21 00 80 */ addi r1, r1, 0x80 -/* 8014F734 0014C694 4E 80 00 20 */ blr +/* 8014F734 0014C694 4E 80 00 20 */ blr .global ThinkAreaDamage__22CScriptSpecialFunctionFfR13CStateManager ThinkAreaDamage__22CScriptSpecialFunctionFfR13CStateManager: @@ -710,7 +710,7 @@ lbl_8014F914: /* 8014F928 0014C888 83 A1 00 64 */ lwz r29, 0x64(r1) /* 8014F92C 0014C88C 7C 08 03 A6 */ mtlr r0 /* 8014F930 0014C890 38 21 00 80 */ addi r1, r1, 0x80 -/* 8014F934 0014C894 4E 80 00 20 */ blr +/* 8014F934 0014C894 4E 80 00 20 */ blr .global ThinkRainSimulator__22CScriptSpecialFunctionFfR13CStateManager ThinkRainSimulator__22CScriptSpecialFunctionFfR13CStateManager: @@ -749,7 +749,7 @@ lbl_8014F9B0: /* 8014F9B0 0014C910 80 01 00 14 */ lwz r0, 0x14(r1) /* 8014F9B4 0014C914 7C 08 03 A6 */ mtlr r0 /* 8014F9B8 0014C918 38 21 00 10 */ addi r1, r1, 0x10 -/* 8014F9BC 0014C91C 4E 80 00 20 */ blr +/* 8014F9BC 0014C91C 4E 80 00 20 */ blr .global ThinkChaffTarget__22CScriptSpecialFunctionFfR13CStateManager ThinkChaffTarget__22CScriptSpecialFunctionFfR13CStateManager: @@ -954,7 +954,7 @@ lbl_8014FC98: /* 8014FCAC 0014CC0C 80 01 08 B4 */ lwz r0, 0x8b4(r1) /* 8014FCB0 0014CC10 7C 08 03 A6 */ mtlr r0 /* 8014FCB4 0014CC14 38 21 08 B0 */ addi r1, r1, 0x8b0 -/* 8014FCB8 0014CC18 4E 80 00 20 */ blr +/* 8014FCB8 0014CC18 4E 80 00 20 */ blr .global Render__22CScriptSpecialFunctionCFRC13CStateManager Render__22CScriptSpecialFunctionCFRC13CStateManager: @@ -1058,7 +1058,7 @@ Render__22CScriptSpecialFunctionCFRC13CStateManager: /* 8014FE40 0014CDA0 81 83 00 00 */ lwz r12, 0(r3) /* 8014FE44 0014CDA4 81 8C 00 30 */ lwz r12, 0x30(r12) /* 8014FE48 0014CDA8 7D 89 03 A6 */ mtctr r12 -/* 8014FE4C 0014CDAC 4E 80 04 21 */ bctrl +/* 8014FE4C 0014CDAC 4E 80 04 21 */ bctrl /* 8014FE50 0014CDB0 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 8014FE54 0014CDB4 38 9E 01 18 */ addi r4, r30, 0x118 /* 8014FE58 0014CDB8 38 A1 00 5C */ addi r5, r1, 0x5c @@ -1067,7 +1067,7 @@ Render__22CScriptSpecialFunctionCFRC13CStateManager: /* 8014FE64 0014CDC4 38 E0 00 00 */ li r7, 0 /* 8014FE68 0014CDC8 81 8C 00 E4 */ lwz r12, 0xe4(r12) /* 8014FE6C 0014CDCC 7D 89 03 A6 */ mtctr r12 -/* 8014FE70 0014CDD0 4E 80 04 21 */ bctrl +/* 8014FE70 0014CDD0 4E 80 04 21 */ bctrl /* 8014FE74 0014CDD4 48 00 00 08 */ b lbl_8014FE7C lbl_8014FE78: /* 8014FE78 0014CDD8 4B F0 49 2D */ bl Render__6CActorCFRC13CStateManager @@ -1077,7 +1077,7 @@ lbl_8014FE7C: /* 8014FE84 0014CDE4 83 C1 01 58 */ lwz r30, 0x158(r1) /* 8014FE88 0014CDE8 7C 08 03 A6 */ mtlr r0 /* 8014FE8C 0014CDEC 38 21 01 60 */ addi r1, r1, 0x160 -/* 8014FE90 0014CDF0 4E 80 00 20 */ blr +/* 8014FE90 0014CDF0 4E 80 00 20 */ blr .global ThinkObjectFollowObject__22CScriptSpecialFunctionFfR13CStateManager ThinkObjectFollowObject__22CScriptSpecialFunctionFfR13CStateManager: @@ -1200,7 +1200,7 @@ lbl_8015003C: /* 80150048 0014CFA8 83 A1 00 54 */ lwz r29, 0x54(r1) /* 8015004C 0014CFAC 7C 08 03 A6 */ mtlr r0 /* 80150050 0014CFB0 38 21 00 60 */ addi r1, r1, 0x60 -/* 80150054 0014CFB4 4E 80 00 20 */ blr +/* 80150054 0014CFB4 4E 80 00 20 */ blr .global ThinkObjectFollowLocator__22CScriptSpecialFunctionFfR13CStateManager ThinkObjectFollowLocator__22CScriptSpecialFunctionFfR13CStateManager: @@ -1352,7 +1352,7 @@ lbl_80150270: /* 8015027C 0014D1DC 83 A1 00 E4 */ lwz r29, 0xe4(r1) /* 80150280 0014D1E0 7C 08 03 A6 */ mtlr r0 /* 80150284 0014D1E4 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 80150288 0014D1E8 4E 80 00 20 */ blr +/* 80150288 0014D1E8 4E 80 00 20 */ blr .global ThinkSpinnerController__22CScriptSpecialFunctionFfR13CStateManagerQ222CScriptSpecialFunction22ESpinnerControllerMode ThinkSpinnerController__22CScriptSpecialFunctionFfR13CStateManagerQ222CScriptSpecialFunction22ESpinnerControllerMode: @@ -1878,7 +1878,7 @@ lbl_801509C8: /* 80150A14 0014D974 80 01 01 E4 */ lwz r0, 0x1e4(r1) /* 80150A18 0014D978 7C 08 03 A6 */ mtlr r0 /* 80150A1C 0014D97C 38 21 01 E0 */ addi r1, r1, 0x1e0 -/* 80150A20 0014D980 4E 80 00 20 */ blr +/* 80150A20 0014D980 4E 80 00 20 */ blr .global sub_80150a24 sub_80150a24: @@ -1904,7 +1904,7 @@ lbl_80150A50: /* 80150A6C 0014D9CC 80 01 00 24 */ lwz r0, 0x24(r1) /* 80150A70 0014D9D0 7C 08 03 A6 */ mtlr r0 /* 80150A74 0014D9D4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80150A78 0014D9D8 4E 80 00 20 */ blr +/* 80150A78 0014D9D8 4E 80 00 20 */ blr .global sub_80150a7c sub_80150a7c: @@ -1942,7 +1942,7 @@ sub_80150a7c: /* 80150AF8 0014DA58 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80150AFC 0014DA5C 7C 08 03 A6 */ mtlr r0 /* 80150B00 0014DA60 38 21 00 30 */ addi r1, r1, 0x30 -/* 80150B04 0014DA64 4E 80 00 20 */ blr +/* 80150B04 0014DA64 4E 80 00 20 */ blr .global sub_80150b08 sub_80150b08: @@ -2110,7 +2110,7 @@ lbl_80150D24: /* 80150D28 0014DC88 80 01 00 34 */ lwz r0, 0x34(r1) /* 80150D2C 0014DC8C 7C 08 03 A6 */ mtlr r0 /* 80150D30 0014DC90 38 21 00 30 */ addi r1, r1, 0x30 -/* 80150D34 0014DC94 4E 80 00 20 */ blr +/* 80150D34 0014DC94 4E 80 00 20 */ blr .global sub_80150d38 sub_80150d38: @@ -2139,7 +2139,7 @@ lbl_80150D84: /* 80150D88 0014DCE8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80150D8C 0014DCEC 7C 08 03 A6 */ mtlr r0 /* 80150D90 0014DCF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80150D94 0014DCF4 4E 80 00 20 */ blr +/* 80150D94 0014DCF4 4E 80 00 20 */ blr .global sub_80150d98 sub_80150d98: @@ -2197,7 +2197,7 @@ lbl_80150E4C: /* 80150E54 0014DDB4 83 E1 00 5C */ lwz r31, 0x5c(r1) /* 80150E58 0014DDB8 7C 08 03 A6 */ mtlr r0 /* 80150E5C 0014DDBC 38 21 00 60 */ addi r1, r1, 0x60 -/* 80150E60 0014DDC0 4E 80 00 20 */ blr +/* 80150E60 0014DDC0 4E 80 00 20 */ blr .global sub_80150e64 sub_80150e64: @@ -2277,7 +2277,7 @@ lbl_80150F5C: /* 80150F60 0014DEC0 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80150F64 0014DEC4 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80150F68 0014DEC8 38 21 00 20 */ addi r1, r1, 0x20 -/* 80150F6C 0014DECC 4E 80 00 20 */ blr +/* 80150F6C 0014DECC 4E 80 00 20 */ blr .global ThinkPlayerFollowLocator__22CScriptSpecialFunctionFfR13CStateManager ThinkPlayerFollowLocator__22CScriptSpecialFunctionFfR13CStateManager: @@ -2393,7 +2393,7 @@ lbl_801510FC: /* 8015110C 0014E06C 83 81 00 C0 */ lwz r28, 0xc0(r1) /* 80151110 0014E070 7C 08 03 A6 */ mtlr r0 /* 80151114 0014E074 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 80151118 0014E078 4E 80 00 20 */ blr +/* 80151118 0014E078 4E 80 00 20 */ blr .global ThinkIntroBossRingController__22CScriptSpecialFunctionFfR13CStateManager ThinkIntroBossRingController__22CScriptSpecialFunctionFfR13CStateManager: @@ -2553,7 +2553,7 @@ lbl_80151348: /* 80151358 0014E2B8 81 9B 00 00 */ lwz r12, 0(r27) /* 8015135C 0014E2BC 81 8C 00 30 */ lwz r12, 0x30(r12) /* 80151360 0014E2C0 7D 89 03 A6 */ mtctr r12 -/* 80151364 0014E2C4 4E 80 04 21 */ bctrl +/* 80151364 0014E2C4 4E 80 04 21 */ bctrl /* 80151368 0014E2C8 C0 21 00 24 */ lfs f1, 0x24(r1) /* 8015136C 0014E2CC C0 02 9D 9C */ lfs f0, lbl_805ABABC@sda21(r2) /* 80151370 0014E2D0 FC 01 00 00 */ fcmpu cr0, f1, f0 @@ -2574,7 +2574,7 @@ lbl_80151384: /* 801513A8 0014E308 38 80 00 00 */ li r4, 0 /* 801513AC 0014E30C 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 801513B0 0014E310 7D 89 03 A6 */ mtctr r12 -/* 801513B4 0014E314 4E 80 04 21 */ bctrl +/* 801513B4 0014E314 4E 80 04 21 */ bctrl lbl_801513B8: /* 801513B8 0014E318 3B BD 00 18 */ addi r29, r29, 0x18 /* 801513BC 0014E31C 3B DE 00 01 */ addi r30, r30, 1 @@ -2587,7 +2587,7 @@ lbl_801513C0: /* 801513D4 0014E334 81 9B 00 00 */ lwz r12, 0(r27) /* 801513D8 0014E338 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 801513DC 0014E33C 7D 89 03 A6 */ mtctr r12 -/* 801513E0 0014E340 4E 80 04 21 */ bctrl +/* 801513E0 0014E340 4E 80 04 21 */ bctrl /* 801513E4 0014E344 48 00 02 AC */ b lbl_80151690 lbl_801513E8: /* 801513E8 0014E348 88 1B 01 B8 */ lbz r0, 0x1b8(r27) @@ -2779,7 +2779,7 @@ lbl_80151690: /* 8015169C 0014E5FC 80 01 01 84 */ lwz r0, 0x184(r1) /* 801516A0 0014E600 7C 08 03 A6 */ mtlr r0 /* 801516A4 0014E604 38 21 01 80 */ addi r1, r1, 0x180 -/* 801516A8 0014E608 4E 80 00 20 */ blr +/* 801516A8 0014E608 4E 80 00 20 */ blr .global ThinkSaveStation__22CScriptSpecialFunctionFfR13CStateManager ThinkSaveStation__22CScriptSpecialFunctionFfR13CStateManager: @@ -2812,7 +2812,7 @@ lbl_8015170C: /* 8015170C 0014E66C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80151710 0014E670 7C 08 03 A6 */ mtlr r0 /* 80151714 0014E674 38 21 00 10 */ addi r1, r1, 0x10 -/* 80151718 0014E678 4E 80 00 20 */ blr +/* 80151718 0014E678 4E 80 00 20 */ blr .global RingScramble__22CScriptSpecialFunctionFR13CStateManager RingScramble__22CScriptSpecialFunctionFR13CStateManager: @@ -2871,7 +2871,7 @@ lbl_801517C4: /* 801517DC 0014E73C 80 01 00 34 */ lwz r0, 0x34(r1) /* 801517E0 0014E740 7C 08 03 A6 */ mtlr r0 /* 801517E4 0014E744 38 21 00 30 */ addi r1, r1, 0x30 -/* 801517E8 0014E748 4E 80 00 20 */ blr +/* 801517E8 0014E748 4E 80 00 20 */ blr .global Accept__22CScriptSpecialFunctionFR8IVisitor Accept__22CScriptSpecialFunctionFR8IVisitor: @@ -2884,11 +2884,11 @@ Accept__22CScriptSpecialFunctionFR8IVisitor: /* 80151804 0014E764 7C 04 03 78 */ mr r4, r0 /* 80151808 0014E768 81 8C 00 B4 */ lwz r12, 0xb4(r12) /* 8015180C 0014E76C 7D 89 03 A6 */ mtctr r12 -/* 80151810 0014E770 4E 80 04 21 */ bctrl +/* 80151810 0014E770 4E 80 04 21 */ bctrl /* 80151814 0014E774 80 01 00 14 */ lwz r0, 0x14(r1) /* 80151818 0014E778 7C 08 03 A6 */ mtlr r0 /* 8015181C 0014E77C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80151820 0014E780 4E 80 00 20 */ blr +/* 80151820 0014E780 4E 80 00 20 */ blr .global SkipCinematic__22CScriptSpecialFunctionFR13CStateManager SkipCinematic__22CScriptSpecialFunctionFR13CStateManager: @@ -2908,7 +2908,7 @@ SkipCinematic__22CScriptSpecialFunctionFR13CStateManager: /* 80151858 0014E7B8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8015185C 0014E7BC 7C 08 03 A6 */ mtlr r0 /* 80151860 0014E7C0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80151864 0014E7C4 4E 80 00 20 */ blr +/* 80151864 0014E7C4 4E 80 00 20 */ blr .global ShouldSkipCinematic__22CScriptSpecialFunctionFR13CStateManager ShouldSkipCinematic__22CScriptSpecialFunctionFR13CStateManager: @@ -2929,7 +2929,7 @@ ShouldSkipCinematic__22CScriptSpecialFunctionFR13CStateManager: /* 801518A0 0014E800 80 01 00 24 */ lwz r0, 0x24(r1) /* 801518A4 0014E804 7C 08 03 A6 */ mtlr r0 /* 801518A8 0014E808 38 21 00 20 */ addi r1, r1, 0x20 -/* 801518AC 0014E80C 4E 80 00 20 */ blr +/* 801518AC 0014E80C 4E 80 00 20 */ blr .global AcceptScriptMsg__22CScriptSpecialFunctionF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__22CScriptSpecialFunctionF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -3041,7 +3041,7 @@ lbl_80151A14: /* 80151A34 0014E994 38 63 2B D4 */ addi r3, r3, lbl_803E2BD4@l /* 80151A38 0014E998 7C 03 00 2E */ lwzx r0, r3, r0 /* 80151A3C 0014E99C 7C 09 03 A6 */ mtctr r0 -/* 80151A40 0014E9A0 4E 80 04 20 */ bctr +/* 80151A40 0014E9A0 4E 80 04 20 */ bctr .global lbl_80151A44 lbl_80151A44: /* 80151A44 0014E9A4 2C 1C 00 13 */ cmpwi r28, 0x13 @@ -3858,7 +3858,7 @@ lbl_80152574: /* 80152584 0014F4E4 81 83 00 00 */ lwz r12, 0(r3) /* 80152588 0014F4E8 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 8015258C 0014F4EC 7D 89 03 A6 */ mtctr r12 -/* 80152590 0014F4F0 4E 80 04 21 */ bctrl +/* 80152590 0014F4F0 4E 80 04 21 */ bctrl /* 80152594 0014F4F4 7C 7C 1B 79 */ or. r28, r3, r3 /* 80152598 0014F4F8 41 82 00 0C */ beq lbl_801525A4 /* 8015259C 0014F4FC 83 BC 00 04 */ lwz r29, 4(r28) @@ -3900,7 +3900,7 @@ lbl_801525A8: /* 80152624 0014F584 81 84 00 00 */ lwz r12, 0(r4) /* 80152628 0014F588 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8015262C 0014F58C 7D 89 03 A6 */ mtctr r12 -/* 80152630 0014F590 4E 80 04 21 */ bctrl +/* 80152630 0014F590 4E 80 04 21 */ bctrl /* 80152634 0014F594 88 1F 01 F0 */ lbz r0, 0x1f0(r31) /* 80152638 0014F598 28 00 00 00 */ cmplwi r0, 0 /* 8015263C 0014F59C 40 82 00 20 */ bne lbl_8015265C @@ -4091,7 +4091,7 @@ lbl_801528A0: /* 801528BC 0014F81C 80 01 01 C4 */ lwz r0, 0x1c4(r1) /* 801528C0 0014F820 7C 08 03 A6 */ mtlr r0 /* 801528C4 0014F824 38 21 01 C0 */ addi r1, r1, 0x1c0 -/* 801528C8 0014F828 4E 80 00 20 */ blr +/* 801528C8 0014F828 4E 80 00 20 */ blr .global PreRender__22CScriptSpecialFunctionFR13CStateManagerRC14CFrustumPlanes PreRender__22CScriptSpecialFunctionFR13CStateManagerRC14CFrustumPlanes: @@ -4180,7 +4180,7 @@ lbl_801529F4: /* 801529FC 0014F95C 83 C1 00 48 */ lwz r30, 0x48(r1) /* 80152A00 0014F960 7C 08 03 A6 */ mtlr r0 /* 80152A04 0014F964 38 21 00 50 */ addi r1, r1, 0x50 -/* 80152A08 0014F968 4E 80 00 20 */ blr +/* 80152A08 0014F968 4E 80 00 20 */ blr .global AddToRenderer__22CScriptSpecialFunctionCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__22CScriptSpecialFunctionCFRC14CFrustumPlanesRC13CStateManager: @@ -4202,7 +4202,7 @@ lbl_80152A44: /* 80152A44 0014F9A4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80152A48 0014F9A8 7C 08 03 A6 */ mtlr r0 /* 80152A4C 0014F9AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80152A50 0014F9B0 4E 80 00 20 */ blr +/* 80152A50 0014F9B0 4E 80 00 20 */ blr .global Think__22CScriptSpecialFunctionFfR13CStateManager Think__22CScriptSpecialFunctionFfR13CStateManager: @@ -4224,7 +4224,7 @@ Think__22CScriptSpecialFunctionFfR13CStateManager: /* 80152A90 0014F9F0 38 A5 2C A0 */ addi r5, r5, lbl_803E2CA0@l /* 80152A94 0014F9F4 7C 05 00 2E */ lwzx r0, r5, r0 /* 80152A98 0014F9F8 7C 09 03 A6 */ mtctr r0 -/* 80152A9C 0014F9FC 4E 80 04 20 */ bctr +/* 80152A9C 0014F9FC 4E 80 04 20 */ bctr .global lbl_80152AA0 lbl_80152AA0: /* 80152AA0 0014FA00 4B FF E4 D1 */ bl ThinkPlayerFollowLocator__22CScriptSpecialFunctionFfR13CStateManager @@ -4327,7 +4327,7 @@ lbl_80152BA8: /* 80152BB0 0014FB10 83 C1 00 08 */ lwz r30, 8(r1) /* 80152BB4 0014FB14 7C 08 03 A6 */ mtlr r0 /* 80152BB8 0014FB18 38 21 00 10 */ addi r1, r1, 0x10 -/* 80152BBC 0014FB1C 4E 80 00 20 */ blr +/* 80152BBC 0014FB1C 4E 80 00 20 */ blr .global "__ct__22CScriptSpecialFunctionF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fQ222CScriptSpecialFunction16ESpecialFunctionRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>ffffRC9CVector3fRC6CColorbRC11CDamageInfoUiUiUiUsUsUs" "__ct__22CScriptSpecialFunctionF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fQ222CScriptSpecialFunction16ESpecialFunctionRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>ffffRC9CVector3fRC6CColorbRC11CDamageInfoUiUiUiUsUsUs": @@ -4562,7 +4562,7 @@ lbl_80152F1C: /* 80152F44 0014FEA4 80 01 01 94 */ lwz r0, 0x194(r1) /* 80152F48 0014FEA8 7C 08 03 A6 */ mtlr r0 /* 80152F4C 0014FEAC 38 21 01 90 */ addi r1, r1, 0x190 -/* 80152F50 0014FEB0 4E 80 00 20 */ blr +/* 80152F50 0014FEB0 4E 80 00 20 */ blr .global "__ct__Q24rstl36vectorFRCQ24rstl17rmemory_allocator" "__ct__Q24rstl36vectorFRCQ24rstl17rmemory_allocator": @@ -4581,7 +4581,7 @@ lbl_80152F1C: /* 80152F84 0014FEE4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80152F88 0014FEE8 7C 08 03 A6 */ mtlr r0 /* 80152F8C 0014FEEC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80152F90 0014FEF0 4E 80 00 20 */ blr +/* 80152F90 0014FEF0 4E 80 00 20 */ blr .global sub_80152f94 sub_80152f94: @@ -4641,7 +4641,7 @@ lbl_80153040: /* 8015304C 0014FFAC 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80153050 0014FFB0 7C 08 03 A6 */ mtlr r0 /* 80153054 0014FFB4 38 21 00 30 */ addi r1, r1, 0x30 -/* 80153058 0014FFB8 4E 80 00 20 */ blr +/* 80153058 0014FFB8 4E 80 00 20 */ blr .global "sort,Q24rstl17rmemory_allocator>,Q236@unnamed@CScriptSpecialFunction_cpp@11CRingSorter>__4rstlFQ24rstl176pointer_iterator,Q24rstl17rmemory_allocator>Q24rstl176pointer_iterator,Q24rstl17rmemory_allocator>,Q236@unnamed@CScriptSpecialFunction_cpp@11CRingSorter>__4rstlFQ24rstl176pointer_iterator,Q24rstl17rmemory_allocator>Q24rstl176pointer_iteratorFi" "reserve__Q24rstl78vectorFi": @@ -4962,7 +4962,7 @@ lbl_801534DC: /* 801534E8 00150448 83 A1 00 24 */ lwz r29, 0x24(r1) /* 801534EC 0015044C 7C 08 03 A6 */ mtlr r0 /* 801534F0 00150450 38 21 00 30 */ addi r1, r1, 0x30 -/* 801534F4 00150454 4E 80 00 20 */ blr +/* 801534F4 00150454 4E 80 00 20 */ blr .global sub_801534f8 sub_801534f8: @@ -5203,7 +5203,7 @@ lbl_80153878: /* 8015387C 001507DC 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 80153880 001507E0 7C 08 03 A6 */ mtlr r0 /* 80153884 001507E4 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 80153888 001507E8 4E 80 00 20 */ blr +/* 80153888 001507E8 4E 80 00 20 */ blr .global sub_8015388c sub_8015388c: diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallAttractionSurface.s b/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallAttractionSurface.s index ae141712..ba68a44f 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallAttractionSurface.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallAttractionSurface.s @@ -56,15 +56,15 @@ Accept__34CScriptSpiderBallAttractionSurfaceFR8IVisitor: /* 8014AD84 00147CE4 7C 04 03 78 */ mr r4, r0 /* 8014AD88 00147CE8 81 8C 00 B8 */ lwz r12, 0xb8(r12) /* 8014AD8C 00147CEC 7D 89 03 A6 */ mtctr r12 -/* 8014AD90 00147CF0 4E 80 04 21 */ bctrl +/* 8014AD90 00147CF0 4E 80 04 21 */ bctrl /* 8014AD94 00147CF4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8014AD98 00147CF8 7C 08 03 A6 */ mtlr r0 /* 8014AD9C 00147CFC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8014ADA0 00147D00 4E 80 00 20 */ blr +/* 8014ADA0 00147D00 4E 80 00 20 */ blr .global Think__34CScriptSpiderBallAttractionSurfaceFfR13CStateManager Think__34CScriptSpiderBallAttractionSurfaceFfR13CStateManager: -/* 8014ADA4 00147D04 4E 80 00 20 */ blr +/* 8014ADA4 00147D04 4E 80 00 20 */ blr .global AcceptScriptMsg__34CScriptSpiderBallAttractionSurfaceF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__34CScriptSpiderBallAttractionSurfaceF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -78,7 +78,7 @@ AcceptScriptMsg__34CScriptSpiderBallAttractionSurfaceF20EScriptObjectMessage9TUn /* 8014ADC4 00147D24 80 01 00 14 */ lwz r0, 0x14(r1) /* 8014ADC8 00147D28 7C 08 03 A6 */ mtlr r0 /* 8014ADCC 00147D2C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8014ADD0 00147D30 4E 80 00 20 */ blr +/* 8014ADD0 00147D30 4E 80 00 20 */ blr .global GetTouchBounds__34CScriptSpiderBallAttractionSurfaceCFv GetTouchBounds__34CScriptSpiderBallAttractionSurfaceCFv: @@ -140,11 +140,11 @@ lbl_8014AEA4: /* 8014AEA8 00147E08 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 8014AEAC 00147E0C 7C 08 03 A6 */ mtlr r0 /* 8014AEB0 00147E10 38 21 00 40 */ addi r1, r1, 0x40 -/* 8014AEB4 00147E14 4E 80 00 20 */ blr +/* 8014AEB4 00147E14 4E 80 00 20 */ blr .global Touch__34CScriptSpiderBallAttractionSurfaceFR6CActorR13CStateManager Touch__34CScriptSpiderBallAttractionSurfaceFR6CActorR13CStateManager: -/* 8014AEB8 00147E18 4E 80 00 20 */ blr +/* 8014AEB8 00147E18 4E 80 00 20 */ blr .global __dt__34CScriptSpiderBallAttractionSurfaceFv __dt__34CScriptSpiderBallAttractionSurfaceFv: @@ -172,7 +172,7 @@ lbl_8014AF00: /* 8014AF0C 00147E6C 83 C1 00 08 */ lwz r30, 8(r1) /* 8014AF10 00147E70 7C 08 03 A6 */ mtlr r0 /* 8014AF14 00147E74 38 21 00 10 */ addi r1, r1, 0x10 -/* 8014AF18 00147E78 4E 80 00 20 */ blr +/* 8014AF18 00147E78 4E 80 00 20 */ blr .global "__ct__34CScriptSpiderBallAttractionSurfaceF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC9CVector3fb" "__ct__34CScriptSpiderBallAttractionSurfaceF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC9CVector3fb": diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallWaypoint.s b/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallWaypoint.s index eb84c502..f364ce94 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallWaypoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallWaypoint.s @@ -50,9 +50,9 @@ GetTouchBounds__25CScriptSpiderBallWaypointCFv: /* 80117C74 00114BD4 98 03 00 18 */ stb r0, 0x18(r3) /* 80117C78 00114BD8 88 04 01 14 */ lbz r0, 0x114(r4) /* 80117C7C 00114BDC 28 00 00 00 */ cmplwi r0, 0 -/* 80117C80 00114BE0 4D 82 00 20 */ beqlr +/* 80117C80 00114BE0 4D 82 00 20 */ beqlr /* 80117C84 00114BE4 28 03 00 00 */ cmplwi r3, 0 -/* 80117C88 00114BE8 4D 82 00 20 */ beqlr +/* 80117C88 00114BE8 4D 82 00 20 */ beqlr /* 80117C8C 00114BEC C0 04 00 FC */ lfs f0, 0xfc(r4) /* 80117C90 00114BF0 D0 03 00 00 */ stfs f0, 0(r3) /* 80117C94 00114BF4 C0 04 01 00 */ lfs f0, 0x100(r4) @@ -65,7 +65,7 @@ GetTouchBounds__25CScriptSpiderBallWaypointCFv: /* 80117CB0 00114C10 D0 03 00 10 */ stfs f0, 0x10(r3) /* 80117CB4 00114C14 C0 04 01 10 */ lfs f0, 0x110(r4) /* 80117CB8 00114C18 D0 03 00 14 */ stfs f0, 0x14(r3) -/* 80117CBC 00114C1C 4E 80 00 20 */ blr +/* 80117CBC 00114C1C 4E 80 00 20 */ blr .global Accept__25CScriptSpiderBallWaypointFR8IVisitor Accept__25CScriptSpiderBallWaypointFR8IVisitor: @@ -78,11 +78,11 @@ Accept__25CScriptSpiderBallWaypointFR8IVisitor: /* 80117CD8 00114C38 7C 04 03 78 */ mr r4, r0 /* 80117CDC 00114C3C 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 80117CE0 00114C40 7D 89 03 A6 */ mtctr r12 -/* 80117CE4 00114C44 4E 80 04 21 */ bctrl +/* 80117CE4 00114C44 4E 80 04 21 */ bctrl /* 80117CE8 00114C48 80 01 00 14 */ lwz r0, 0x14(r1) /* 80117CEC 00114C4C 7C 08 03 A6 */ mtlr r0 /* 80117CF0 00114C50 38 21 00 10 */ addi r1, r1, 0x10 -/* 80117CF4 00114C54 4E 80 00 20 */ blr +/* 80117CF4 00114C54 4E 80 00 20 */ blr .global Render__25CScriptSpiderBallWaypointCFRC13CStateManager Render__25CScriptSpiderBallWaypointCFRC13CStateManager: @@ -93,11 +93,11 @@ Render__25CScriptSpiderBallWaypointCFRC13CStateManager: /* 80117D08 00114C68 80 01 00 14 */ lwz r0, 0x14(r1) /* 80117D0C 00114C6C 7C 08 03 A6 */ mtlr r0 /* 80117D10 00114C70 38 21 00 10 */ addi r1, r1, 0x10 -/* 80117D14 00114C74 4E 80 00 20 */ blr +/* 80117D14 00114C74 4E 80 00 20 */ blr .global AddToRenderer__25CScriptSpiderBallWaypointCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__25CScriptSpiderBallWaypointCFRC14CFrustumPlanesRC13CStateManager: -/* 80117D18 00114C78 4E 80 00 20 */ blr +/* 80117D18 00114C78 4E 80 00 20 */ blr .global GetClosestPointAlongWaypoints__25CScriptSpiderBallWaypointCFR13CStateManagerRC9CVector3ffPPC25CScriptSpiderBallWaypointR9CVector3fR9CVector3ffR9CVector3f GetClosestPointAlongWaypoints__25CScriptSpiderBallWaypointCFR13CStateManagerRC9CVector3ffPPC25CScriptSpiderBallWaypointR9CVector3fR9CVector3ffR9CVector3f: @@ -596,7 +596,7 @@ lbl_80118434: /* 80118498 001153F8 80 01 01 F4 */ lwz r0, 0x1f4(r1) /* 8011849C 001153FC 7C 08 03 A6 */ mtlr r0 /* 801184A0 00115400 38 21 01 F0 */ addi r1, r1, 0x1f0 -/* 801184A4 00115404 4E 80 00 20 */ blr +/* 801184A4 00115404 4E 80 00 20 */ blr .global AddPreviousWaypoint__25CScriptSpiderBallWaypointF9TUniqueId AddPreviousWaypoint__25CScriptSpiderBallWaypointF9TUniqueId: @@ -647,7 +647,7 @@ lbl_80118530: /* 80118544 001154A4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80118548 001154A8 7C 08 03 A6 */ mtlr r0 /* 8011854C 001154AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80118550 001154B0 4E 80 00 20 */ blr +/* 80118550 001154B0 4E 80 00 20 */ blr .global PreviousWaypoint__25CScriptSpiderBallWaypointCFRC13CStateManagerQ225CScriptSpiderBallWaypoint20ECheckActiveWaypoint PreviousWaypoint__25CScriptSpiderBallWaypointCFRC13CStateManagerQ225CScriptSpiderBallWaypoint20ECheckActiveWaypoint: @@ -701,7 +701,7 @@ lbl_801185F8: /* 801185FC 0011555C 80 01 00 34 */ lwz r0, 0x34(r1) /* 80118600 00115560 7C 08 03 A6 */ mtlr r0 /* 80118604 00115564 38 21 00 30 */ addi r1, r1, 0x30 -/* 80118608 00115568 4E 80 00 20 */ blr +/* 80118608 00115568 4E 80 00 20 */ blr .global NextWaypoint__25CScriptSpiderBallWaypointCFRC13CStateManagerQ225CScriptSpiderBallWaypoint20ECheckActiveWaypoint NextWaypoint__25CScriptSpiderBallWaypointCFRC13CStateManagerQ225CScriptSpiderBallWaypoint20ECheckActiveWaypoint: @@ -764,7 +764,7 @@ lbl_801186D4: /* 801186D8 00115638 80 01 00 34 */ lwz r0, 0x34(r1) /* 801186DC 0011563C 7C 08 03 A6 */ mtlr r0 /* 801186E0 00115640 38 21 00 30 */ addi r1, r1, 0x30 -/* 801186E4 00115644 4E 80 00 20 */ blr +/* 801186E4 00115644 4E 80 00 20 */ blr .global AddPointToTouchBounds__25CScriptSpiderBallWaypointFRC9CVector3f AddPointToTouchBounds__25CScriptSpiderBallWaypointFRC9CVector3f: @@ -822,7 +822,7 @@ lbl_801187A0: /* 801187A4 00115704 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 801187A8 00115708 7C 08 03 A6 */ mtlr r0 /* 801187AC 0011570C 38 21 00 30 */ addi r1, r1, 0x30 -/* 801187B0 00115710 4E 80 00 20 */ blr +/* 801187B0 00115710 4E 80 00 20 */ blr .global BuildWaypointListAndBounds__25CScriptSpiderBallWaypointFR13CStateManager BuildWaypointListAndBounds__25CScriptSpiderBallWaypointFR13CStateManager: @@ -929,7 +929,7 @@ lbl_80118918: /* 80118928 00115888 83 81 00 50 */ lwz r28, 0x50(r1) /* 8011892C 0011588C 7C 08 03 A6 */ mtlr r0 /* 80118930 00115890 38 21 00 60 */ addi r1, r1, 0x60 -/* 80118934 00115894 4E 80 00 20 */ blr +/* 80118934 00115894 4E 80 00 20 */ blr .global ClearWaypoints__25CScriptSpiderBallWaypointFv ClearWaypoints__25CScriptSpiderBallWaypointFv: @@ -953,7 +953,7 @@ lbl_8011896C: /* 80118974 001158D4 38 00 00 00 */ li r0, 0 /* 80118978 001158D8 90 03 00 F0 */ stw r0, 0xf0(r3) /* 8011897C 001158DC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80118980 001158E0 4E 80 00 20 */ blr +/* 80118980 001158E0 4E 80 00 20 */ blr .global AcceptScriptMsg__25CScriptSpiderBallWaypointF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__25CScriptSpiderBallWaypointF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -997,7 +997,7 @@ lbl_80118A00: /* 80118A0C 0011596C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80118A10 00115970 7C 08 03 A6 */ mtlr r0 /* 80118A14 00115974 38 21 00 20 */ addi r1, r1, 0x20 -/* 80118A18 00115978 4E 80 00 20 */ blr +/* 80118A18 00115978 4E 80 00 20 */ blr .global __dt__25CScriptSpiderBallWaypointFv __dt__25CScriptSpiderBallWaypointFv: @@ -1052,7 +1052,7 @@ lbl_80118ABC: /* 80118AC8 00115A28 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80118ACC 00115A2C 7C 08 03 A6 */ mtlr r0 /* 80118AD0 00115A30 38 21 00 20 */ addi r1, r1, 0x20 -/* 80118AD4 00115A34 4E 80 00 20 */ blr +/* 80118AD4 00115A34 4E 80 00 20 */ blr .global "__ct__25CScriptSpiderBallWaypointF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fbUi" "__ct__25CScriptSpiderBallWaypointF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fbUi": diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSpindleCamera.s b/asm/MetroidPrime/ScriptObjects/CScriptSpindleCamera.s index 86e1b11a..fa1c5f44 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptSpindleCamera.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptSpindleCamera.s @@ -113,11 +113,11 @@ AcceptScriptMsg__20CScriptSpindleCameraF20EScriptObjectMessage9TUniqueIdR13CStat /* 8023FC1C 0023CB7C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8023FC20 0023CB80 7C 08 03 A6 */ mtlr r0 /* 8023FC24 0023CB84 38 21 00 10 */ addi r1, r1, 0x10 -/* 8023FC28 0023CB88 4E 80 00 20 */ blr +/* 8023FC28 0023CB88 4E 80 00 20 */ blr .global Render__20CScriptSpindleCameraCFRC13CStateManager Render__20CScriptSpindleCameraCFRC13CStateManager: -/* 8023FC2C 0023CB8C 4E 80 00 20 */ blr +/* 8023FC2C 0023CB8C 4E 80 00 20 */ blr .global Accept__20CScriptSpindleCameraFR8IVisitor Accept__20CScriptSpindleCameraFR8IVisitor: @@ -130,15 +130,15 @@ Accept__20CScriptSpindleCameraFR8IVisitor: /* 8023FC48 0023CBA8 7C 04 03 78 */ mr r4, r0 /* 8023FC4C 0023CBAC 81 8C 00 E0 */ lwz r12, 0xe0(r12) /* 8023FC50 0023CBB0 7D 89 03 A6 */ mtctr r12 -/* 8023FC54 0023CBB4 4E 80 04 21 */ bctrl +/* 8023FC54 0023CBB4 4E 80 04 21 */ bctrl /* 8023FC58 0023CBB8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8023FC5C 0023CBBC 7C 08 03 A6 */ mtlr r0 /* 8023FC60 0023CBC0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8023FC64 0023CBC4 4E 80 00 20 */ blr +/* 8023FC64 0023CBC4 4E 80 00 20 */ blr .global ProcessInput__20CScriptSpindleCameraFRC11CFinalInputR13CStateManager ProcessInput__20CScriptSpindleCameraFRC11CFinalInputR13CStateManager: -/* 8023FC68 0023CBC8 4E 80 00 20 */ blr +/* 8023FC68 0023CBC8 4E 80 00 20 */ blr .global Think__20CScriptSpindleCameraFfR13CStateManager Think__20CScriptSpindleCameraFfR13CStateManager: @@ -1459,7 +1459,7 @@ lbl_80240F44: /* 80240FC4 0023DF24 83 81 02 70 */ lwz r28, 0x270(r1) /* 80240FC8 0023DF28 7C 08 03 A6 */ mtlr r0 /* 80240FCC 0023DF2C 38 21 03 60 */ addi r1, r1, 0x360 -/* 80240FD0 0023DF30 4E 80 00 20 */ blr +/* 80240FD0 0023DF30 4E 80 00 20 */ blr .global GetInVar__20CScriptSpindleCameraCFRC16SSpindleProperty GetInVar__20CScriptSpindleCameraCFRC16SSpindleProperty: @@ -1467,7 +1467,7 @@ GetInVar__20CScriptSpindleCameraCFRC16SSpindleProperty: /* 80240FD8 0023DF38 54 00 10 3A */ slwi r0, r0, 2 /* 80240FDC 0023DF3C 7C 63 02 14 */ add r3, r3, r0 /* 80240FE0 0023DF40 C0 23 01 90 */ lfs f1, 0x190(r3) -/* 80240FE4 0023DF44 4E 80 00 20 */ blr +/* 80240FE4 0023DF44 4E 80 00 20 */ blr .global Reset__20CScriptSpindleCameraFRC12CTransform4fR13CStateManager Reset__20CScriptSpindleCameraFRC12CTransform4fR13CStateManager: @@ -1503,7 +1503,7 @@ lbl_80241028: /* 80241058 0023DFB8 C0 22 B8 00 */ lfs f1, lbl_805AD520@sda21(r2) /* 8024105C 0023DFBC 81 8C 00 14 */ lwz r12, 0x14(r12) /* 80241060 0023DFC0 7D 89 03 A6 */ mtctr r12 -/* 80241064 0023DFC4 4E 80 04 21 */ bctrl +/* 80241064 0023DFC4 4E 80 04 21 */ bctrl /* 80241068 0023DFC8 88 1E 03 3C */ lbz r0, 0x33c(r30) /* 8024106C 0023DFCC 38 60 00 00 */ li r3, 0 /* 80241070 0023DFD0 50 60 3E 30 */ rlwimi r0, r3, 7, 0x18, 0x18 @@ -1514,7 +1514,7 @@ lbl_80241078: /* 80241080 0023DFE0 83 C1 00 08 */ lwz r30, 8(r1) /* 80241084 0023DFE4 7C 08 03 A6 */ mtlr r0 /* 80241088 0023DFE8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024108C 0023DFEC 4E 80 00 20 */ blr +/* 8024108C 0023DFEC 4E 80 00 20 */ blr .global __dt__20CScriptSpindleCameraFv __dt__20CScriptSpindleCameraFv: @@ -1571,7 +1571,7 @@ lbl_80241134: /* 80241140 0023E0A0 83 C1 00 08 */ lwz r30, 8(r1) /* 80241144 0023E0A4 7C 08 03 A6 */ mtlr r0 /* 80241148 0023E0A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024114C 0023E0AC 4E 80 00 20 */ blr +/* 8024114C 0023E0AC 4E 80 00 20 */ blr .global __ct__20CScriptSpindleCameraF9TUniqueIdRCQ24rstl12basic_stringRC11CEntityInfoRC12CTransform4fbiffffRC6CAABoxRC6CAABoxRC6CAABoxRC6CAABoxRC6CAABoxRC6CAABoxRC6CAABoxRC6CAABoxRC6CAABoxRC6CAABoxRC6CAABoxRC6CAABoxRC6CAABoxRC6CAABoxRC6CAABox __ct__20CScriptSpindleCameraF9TUniqueIdRCQ24rstl12basic_stringRC11CEntityInfoRC12CTransform4fbiffffRC6CAABoxRC6CAABoxRC6CAABoxRC6CAABoxRC6CAABoxRC6CAABoxRC6CAABoxRC6CAABoxRC6CAABoxRC6CAABoxRC6CAABoxRC6CAABoxRC6CAABoxRC6CAABoxRC6CAABox: @@ -1864,7 +1864,7 @@ __ct__20CScriptSpindleCameraF9TUniqueIdRCQ24rstl12basic_stringRC11CEntityInfoRC1 /* 802415C8 0023E528 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 802415CC 0023E52C 7C 08 03 A6 */ mtlr r0 /* 802415D0 0023E530 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 802415D4 0023E534 4E 80 00 20 */ blr +/* 802415D4 0023E534 4E 80 00 20 */ blr .global GetValue__16SSpindlePropertyCFf GetValue__16SSpindlePropertyCFf: @@ -1939,7 +1939,7 @@ lbl_802416CC: /* 802416CC 0023E62C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802416D0 0023E630 7C 08 03 A6 */ mtlr r0 /* 802416D4 0023E634 38 21 00 10 */ addi r1, r1, 0x10 -/* 802416D8 0023E638 4E 80 00 20 */ blr +/* 802416D8 0023E638 4E 80 00 20 */ blr .global FixupAngles__15SSpindleSegmentFv FixupAngles__15SSpindleSegmentFv: @@ -1950,7 +1950,7 @@ FixupAngles__15SSpindleSegmentFv: /* 802416EC 0023E64C C0 03 00 0C */ lfs f0, 0xc(r3) /* 802416F0 0023E650 EC 00 00 72 */ fmuls f0, f0, f1 /* 802416F4 0023E654 D0 03 00 0C */ stfs f0, 0xc(r3) -/* 802416F8 0023E658 4E 80 00 20 */ blr +/* 802416F8 0023E658 4E 80 00 20 */ blr .global LoadSpindleSegment__FR12CInputStream LoadSpindleSegment__FR12CInputStream: @@ -2019,7 +2019,7 @@ lbl_802417A8: /* 802417EC 0023E74C 83 81 00 10 */ lwz r28, 0x10(r1) /* 802417F0 0023E750 7C 08 03 A6 */ mtlr r0 /* 802417F4 0023E754 38 21 00 50 */ addi r1, r1, 0x50 -/* 802417F8 0023E758 4E 80 00 20 */ blr +/* 802417F8 0023E758 4E 80 00 20 */ blr .global sub_802417fc sub_802417fc: @@ -2029,7 +2029,7 @@ sub_802417fc: /* 80241808 0023E768 D0 43 00 0C */ stfs f2, 0xc(r3) /* 8024180C 0023E76C D0 63 00 10 */ stfs f3, 0x10(r3) /* 80241810 0023E770 D0 83 00 14 */ stfs f4, 0x14(r3) -/* 80241814 0023E774 4E 80 00 20 */ blr +/* 80241814 0023E774 4E 80 00 20 */ blr .global __sinit_CScriptSpindleCamera_cpp __sinit_CScriptSpindleCamera_cpp: diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSteam.s b/asm/MetroidPrime/ScriptObjects/CScriptSteam.s index 7b1719b8..edfebfeb 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptSteam.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptSteam.s @@ -51,11 +51,11 @@ Accept__12CScriptSteamFR8IVisitor: /* 80174B28 00171A88 7C 04 03 78 */ mr r4, r0 /* 80174B2C 00171A8C 81 8C 00 CC */ lwz r12, 0xcc(r12) /* 80174B30 00171A90 7D 89 03 A6 */ mtctr r12 -/* 80174B34 00171A94 4E 80 04 21 */ bctrl +/* 80174B34 00171A94 4E 80 04 21 */ bctrl /* 80174B38 00171A98 80 01 00 14 */ lwz r0, 0x14(r1) /* 80174B3C 00171A9C 7C 08 03 A6 */ mtlr r0 /* 80174B40 00171AA0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80174B44 00171AA4 4E 80 00 20 */ blr +/* 80174B44 00171AA4 4E 80 00 20 */ blr .global Think__12CScriptSteamFfR13CStateManager Think__12CScriptSteamFfR13CStateManager: @@ -146,7 +146,7 @@ lbl_80174C78: /* 80174C88 00171BE8 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80174C8C 00171BEC 7C 08 03 A6 */ mtlr r0 /* 80174C90 00171BF0 38 21 00 40 */ addi r1, r1, 0x40 -/* 80174C94 00171BF4 4E 80 00 20 */ blr +/* 80174C94 00171BF4 4E 80 00 20 */ blr .global AcceptScriptMsg__12CScriptSteamF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__12CScriptSteamF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -189,7 +189,7 @@ lbl_80174CF4: /* 80174D20 00171C80 83 81 00 10 */ lwz r28, 0x10(r1) /* 80174D24 00171C84 7C 08 03 A6 */ mtlr r0 /* 80174D28 00171C88 38 21 00 20 */ addi r1, r1, 0x20 -/* 80174D2C 00171C8C 4E 80 00 20 */ blr +/* 80174D2C 00171C8C 4E 80 00 20 */ blr .global __dt__12CScriptSteamFv __dt__12CScriptSteamFv: @@ -217,7 +217,7 @@ lbl_80174D74: /* 80174D80 00171CE0 83 C1 00 08 */ lwz r30, 8(r1) /* 80174D84 00171CE4 7C 08 03 A6 */ mtlr r0 /* 80174D88 00171CE8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80174D8C 00171CEC 4E 80 00 20 */ blr +/* 80174D8C 00171CEC 4E 80 00 20 */ blr .global "__ct__12CScriptSteamF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC9CVector3fRC6CAABoxRC11CDamageInfoRC9CVector3fUibUiffff" "__ct__12CScriptSteamF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC9CVector3fRC6CAABoxRC11CDamageInfoRC9CVector3fUibUiffff": diff --git a/asm/MetroidPrime/ScriptObjects/CScriptStreamedAudio.s b/asm/MetroidPrime/ScriptObjects/CScriptStreamedAudio.s index a95001d7..9af7513f 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptStreamedAudio.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptStreamedAudio.s @@ -70,7 +70,7 @@ lbl_8020BE74: /* 8020BE80 00208DE0 83 C1 00 08 */ lwz r30, 8(r1) /* 8020BE84 00208DE4 7C 08 03 A6 */ mtlr r0 /* 8020BE88 00208DE8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8020BE8C 00208DEC 4E 80 00 20 */ blr +/* 8020BE8C 00208DEC 4E 80 00 20 */ blr .global sub_8020be90 sub_8020be90: @@ -208,7 +208,7 @@ lbl_8020C07C: /* 8020C084 00208FE4 83 C1 00 B8 */ lwz r30, 0xb8(r1) /* 8020C088 00208FE8 7C 08 03 A6 */ mtlr r0 /* 8020C08C 00208FEC 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 8020C090 00208FF0 4E 80 00 20 */ blr +/* 8020C090 00208FF0 4E 80 00 20 */ blr .global "__pl__4rstlFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>c" "__pl__4rstlFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>c": @@ -235,7 +235,7 @@ lbl_8020C07C: /* 8020C0E4 00209044 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8020C0E8 00209048 7C 08 03 A6 */ mtlr r0 /* 8020C0EC 0020904C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8020C0F0 00209050 4E 80 00 20 */ blr +/* 8020C0F0 00209050 4E 80 00 20 */ blr .global "__pl__4rstlFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>PCc" "__pl__4rstlFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>PCc": @@ -262,7 +262,7 @@ lbl_8020C07C: /* 8020C144 002090A4 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8020C148 002090A8 7C 08 03 A6 */ mtlr r0 /* 8020C14C 002090AC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8020C150 002090B0 4E 80 00 20 */ blr +/* 8020C150 002090B0 4E 80 00 20 */ blr .global sub_8020c154 sub_8020c154: @@ -336,7 +336,7 @@ lbl_8020C22C: /* 8020C238 00209198 7D 03 43 78 */ mr r3, r8 lbl_8020C23C: /* 8020C23C 0020919C 38 21 00 40 */ addi r1, r1, 0x40 -/* 8020C240 002091A0 4E 80 00 20 */ blr +/* 8020C240 002091A0 4E 80 00 20 */ blr .global sub_8020c244 sub_8020c244: @@ -414,7 +414,7 @@ lbl_8020C33C: /* 8020C35C 002092BC 83 C1 00 48 */ lwz r30, 0x48(r1) /* 8020C360 002092C0 7C 08 03 A6 */ mtlr r0 /* 8020C364 002092C4 38 21 00 70 */ addi r1, r1, 0x70 -/* 8020C368 002092C8 4E 80 00 20 */ blr +/* 8020C368 002092C8 4E 80 00 20 */ blr .global StopStream__20CScriptStreamedMusicFR13CStateManager StopStream__20CScriptStreamedMusicFR13CStateManager: @@ -431,7 +431,7 @@ StopStream__20CScriptStreamedMusicFR13CStateManager: /* 8020C394 002092F4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8020C398 002092F8 7C 08 03 A6 */ mtlr r0 /* 8020C39C 002092FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8020C3A0 00209300 4E 80 00 20 */ blr +/* 8020C3A0 00209300 4E 80 00 20 */ blr .global StartStream__20CScriptStreamedMusicFR13CStateManager StartStream__20CScriptStreamedMusicFR13CStateManager: @@ -453,7 +453,7 @@ StartStream__20CScriptStreamedMusicFR13CStateManager: /* 8020C3E0 00209340 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8020C3E4 00209344 7C 08 03 A6 */ mtlr r0 /* 8020C3E8 00209348 38 21 00 10 */ addi r1, r1, 0x10 -/* 8020C3EC 0020934C 4E 80 00 20 */ blr +/* 8020C3EC 0020934C 4E 80 00 20 */ blr .global sub_8020c3f0 sub_8020c3f0: @@ -465,7 +465,7 @@ sub_8020c3f0: /* 8020C404 00209364 80 01 00 14 */ lwz r0, 0x14(r1) /* 8020C408 00209368 7C 08 03 A6 */ mtlr r0 /* 8020C40C 0020936C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8020C410 00209370 4E 80 00 20 */ blr +/* 8020C410 00209370 4E 80 00 20 */ blr .global sub_8020c414 sub_8020c414: @@ -494,7 +494,7 @@ lbl_8020C464: /* 8020C464 002093C4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8020C468 002093C8 7C 08 03 A6 */ mtlr r0 /* 8020C46C 002093CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8020C470 002093D0 4E 80 00 20 */ blr +/* 8020C470 002093D0 4E 80 00 20 */ blr .global Stop__20CScriptStreamedMusicFR13CStateManager Stop__20CScriptStreamedMusicFR13CStateManager: @@ -512,7 +512,7 @@ lbl_8020C498: /* 8020C498 002093F8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8020C49C 002093FC 7C 08 03 A6 */ mtlr r0 /* 8020C4A0 00209400 38 21 00 10 */ addi r1, r1, 0x10 -/* 8020C4A4 00209404 4E 80 00 20 */ blr +/* 8020C4A4 00209404 4E 80 00 20 */ blr .global Play__20CScriptStreamedMusicFR13CStateManager Play__20CScriptStreamedMusicFR13CStateManager: @@ -541,7 +541,7 @@ lbl_8020C4F0: /* 8020C4F8 00209458 83 C1 00 08 */ lwz r30, 8(r1) /* 8020C4FC 0020945C 7C 08 03 A6 */ mtlr r0 /* 8020C500 00209460 38 21 00 10 */ addi r1, r1, 0x10 -/* 8020C504 00209464 4E 80 00 20 */ blr +/* 8020C504 00209464 4E 80 00 20 */ blr .global Accept__20CScriptStreamedMusicFR8IVisitor Accept__20CScriptStreamedMusicFR8IVisitor: @@ -554,11 +554,11 @@ Accept__20CScriptStreamedMusicFR8IVisitor: /* 8020C520 00209480 7C 04 03 78 */ mr r4, r0 /* 8020C524 00209484 81 8C 00 24 */ lwz r12, 0x24(r12) /* 8020C528 00209488 7D 89 03 A6 */ mtctr r12 -/* 8020C52C 0020948C 4E 80 04 21 */ bctrl +/* 8020C52C 0020948C 4E 80 04 21 */ bctrl /* 8020C530 00209490 80 01 00 14 */ lwz r0, 0x14(r1) /* 8020C534 00209494 7C 08 03 A6 */ mtlr r0 /* 8020C538 00209498 38 21 00 10 */ addi r1, r1, 0x10 -/* 8020C53C 0020949C 4E 80 00 20 */ blr +/* 8020C53C 0020949C 4E 80 00 20 */ blr .global AcceptScriptMsg__20CScriptStreamedMusicF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__20CScriptStreamedMusicF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -583,7 +583,7 @@ AcceptScriptMsg__20CScriptStreamedMusicF20EScriptObjectMessage9TUniqueIdR13CStat /* 8020C588 002094E8 38 63 70 88 */ addi r3, r3, lbl_803E7088@l /* 8020C58C 002094EC 7C 03 00 2E */ lwzx r0, r3, r0 /* 8020C590 002094F0 7C 09 03 A6 */ mtctr r0 -/* 8020C594 002094F4 4E 80 04 20 */ bctr +/* 8020C594 002094F4 4E 80 04 20 */ bctr .global lbl_8020C598 lbl_8020C598: /* 8020C598 002094F8 88 1D 00 30 */ lbz r0, 0x30(r29) @@ -653,7 +653,7 @@ lbl_8020C654: /* 8020C660 002095C0 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8020C664 002095C4 7C 08 03 A6 */ mtlr r0 /* 8020C668 002095C8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8020C66C 002095CC 4E 80 00 20 */ blr +/* 8020C66C 002095CC 4E 80 00 20 */ blr .global IsDSPFile__20CScriptStreamedMusicFRCQ24rstl6string IsDSPFile__20CScriptStreamedMusicFRCQ24rstl6string: @@ -703,11 +703,11 @@ lbl_8020C6FC: /* 8020C714 00209674 83 A1 00 34 */ lwz r29, 0x34(r1) /* 8020C718 00209678 7C 08 03 A6 */ mtlr r0 /* 8020C71C 0020967C 38 21 00 40 */ addi r1, r1, 0x40 -/* 8020C720 00209680 4E 80 00 20 */ blr +/* 8020C720 00209680 4E 80 00 20 */ blr .global nullsub_42 nullsub_42: -/* 8020C724 00209684 4E 80 00 20 */ blr +/* 8020C724 00209684 4E 80 00 20 */ blr .global "__ct__20CScriptStreamedMusicF9TUniqueIdRC11CEntityInfoRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>bRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>bffi" "__ct__20CScriptStreamedMusicF9TUniqueIdRC11CEntityInfoRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>bRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>bffi": @@ -756,14 +756,14 @@ nullsub_42: /* 8020C7D0 00209730 80 01 00 44 */ lwz r0, 0x44(r1) /* 8020C7D4 00209734 7C 08 03 A6 */ mtlr r0 /* 8020C7D8 00209738 38 21 00 40 */ addi r1, r1, 0x40 -/* 8020C7DC 0020973C 4E 80 00 20 */ blr +/* 8020C7DC 0020973C 4E 80 00 20 */ blr .global IsOneShot__20CScriptStreamedMusicFb IsOneShot__20CScriptStreamedMusicFb: /* 8020C7E0 00209740 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8020C7E4 00209744 7C 00 00 34 */ cntlzw r0, r0 /* 8020C7E8 00209748 54 03 D9 7E */ srwi r3, r0, 5 -/* 8020C7EC 0020974C 4E 80 00 20 */ blr +/* 8020C7EC 0020974C 4E 80 00 20 */ blr .global sub_8020c7f0 sub_8020c7f0: @@ -787,7 +787,7 @@ sub_8020c7f0: /* 8020C834 00209794 80 01 00 24 */ lwz r0, 0x24(r1) /* 8020C838 00209798 7C 08 03 A6 */ mtlr r0 /* 8020C83C 0020979C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8020C840 002097A0 4E 80 00 20 */ blr +/* 8020C840 002097A0 4E 80 00 20 */ blr .global sub_8020c844 sub_8020c844: diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSwitch.s b/asm/MetroidPrime/ScriptObjects/CScriptSwitch.s index 7ef859d3..d0a19609 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptSwitch.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptSwitch.s @@ -42,7 +42,7 @@ lbl_801D9774: /* 801D9780 001D66E0 83 C1 00 08 */ lwz r30, 8(r1) /* 801D9784 001D66E4 7C 08 03 A6 */ mtlr r0 /* 801D9788 001D66E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D978C 001D66EC 4E 80 00 20 */ blr +/* 801D978C 001D66EC 4E 80 00 20 */ blr .global AcceptScriptMsg__13CScriptSwitchF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__13CScriptSwitchF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -112,7 +112,7 @@ lbl_801D9848: /* 801D9874 001D67D4 83 81 00 10 */ lwz r28, 0x10(r1) /* 801D9878 001D67D8 7C 08 03 A6 */ mtlr r0 /* 801D987C 001D67DC 38 21 00 20 */ addi r1, r1, 0x20 -/* 801D9880 001D67E0 4E 80 00 20 */ blr +/* 801D9880 001D67E0 4E 80 00 20 */ blr .global Accept__13CScriptSwitchFR8IVisitor Accept__13CScriptSwitchFR8IVisitor: @@ -125,11 +125,11 @@ Accept__13CScriptSwitchFR8IVisitor: /* 801D989C 001D67FC 7C 04 03 78 */ mr r4, r0 /* 801D98A0 001D6800 81 8C 00 24 */ lwz r12, 0x24(r12) /* 801D98A4 001D6804 7D 89 03 A6 */ mtctr r12 -/* 801D98A8 001D6808 4E 80 04 21 */ bctrl +/* 801D98A8 001D6808 4E 80 04 21 */ bctrl /* 801D98AC 001D680C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801D98B0 001D6810 7C 08 03 A6 */ mtlr r0 /* 801D98B4 001D6814 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D98B8 001D6818 4E 80 00 20 */ blr +/* 801D98B8 001D6818 4E 80 00 20 */ blr .global "__ct__13CScriptSwitchF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfobbb" "__ct__13CScriptSwitchF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfobbb": diff --git a/asm/MetroidPrime/ScriptObjects/CScriptTargetingPoint.s b/asm/MetroidPrime/ScriptObjects/CScriptTargetingPoint.s index c5ee5729..16b097b3 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptTargetingPoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptTargetingPoint.s @@ -71,25 +71,25 @@ lbl_8018D2A8: /* 8018D2B4 0018A214 83 C1 00 08 */ lwz r30, 8(r1) /* 8018D2B8 0018A218 7C 08 03 A6 */ mtlr r0 /* 8018D2BC 0018A21C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8018D2C0 0018A220 4E 80 00 20 */ blr +/* 8018D2C0 0018A220 4E 80 00 20 */ blr .global Render__21CScriptTargetingPointCFRC13CStateManager Render__21CScriptTargetingPointCFRC13CStateManager: -/* 8018D2C4 0018A224 4E 80 00 20 */ blr +/* 8018D2C4 0018A224 4E 80 00 20 */ blr .global AddToRenderer__21CScriptTargetingPointCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__21CScriptTargetingPointCFRC14CFrustumPlanesRC13CStateManager: -/* 8018D2C8 0018A228 4E 80 00 20 */ blr +/* 8018D2C8 0018A228 4E 80 00 20 */ blr .global Think__21CScriptTargetingPointFfR13CStateManager Think__21CScriptTargetingPointFfR13CStateManager: /* 8018D2CC 0018A22C C0 43 00 EC */ lfs f2, 0xec(r3) /* 8018D2D0 0018A230 C0 02 A4 60 */ lfs f0, lbl_805AC180@sda21(r2) /* 8018D2D4 0018A234 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8018D2D8 0018A238 4C 81 00 20 */ blelr +/* 8018D2D8 0018A238 4C 81 00 20 */ blelr /* 8018D2DC 0018A23C EC 02 08 28 */ fsubs f0, f2, f1 /* 8018D2E0 0018A240 D0 03 00 EC */ stfs f0, 0xec(r3) -/* 8018D2E4 0018A244 4E 80 00 20 */ blr +/* 8018D2E4 0018A244 4E 80 00 20 */ blr .global GetLocked__21CScriptTargetingPointCFv GetLocked__21CScriptTargetingPointCFv: @@ -97,7 +97,7 @@ GetLocked__21CScriptTargetingPointCFv: /* 8018D2EC 0018A24C 7C 03 00 D0 */ neg r0, r3 /* 8018D2F0 0018A250 7C 00 18 78 */ andc r0, r0, r3 /* 8018D2F4 0018A254 54 03 0F FE */ srwi r3, r0, 0x1f -/* 8018D2F8 0018A258 4E 80 00 20 */ blr +/* 8018D2F8 0018A258 4E 80 00 20 */ blr .global AcceptScriptMsg__21CScriptTargetingPointF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__21CScriptTargetingPointF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -133,7 +133,7 @@ lbl_8018D35C: /* 8018D368 0018A2C8 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8018D36C 0018A2CC 7C 08 03 A6 */ mtlr r0 /* 8018D370 0018A2D0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8018D374 0018A2D4 4E 80 00 20 */ blr +/* 8018D374 0018A2D4 4E 80 00 20 */ blr .global Accept__21CScriptTargetingPointFR8IVisitor Accept__21CScriptTargetingPointFR8IVisitor: @@ -146,11 +146,11 @@ Accept__21CScriptTargetingPointFR8IVisitor: /* 8018D390 0018A2F0 7C 04 03 78 */ mr r4, r0 /* 8018D394 0018A2F4 81 8C 00 C0 */ lwz r12, 0xc0(r12) /* 8018D398 0018A2F8 7D 89 03 A6 */ mtctr r12 -/* 8018D39C 0018A2FC 4E 80 04 21 */ bctrl +/* 8018D39C 0018A2FC 4E 80 04 21 */ bctrl /* 8018D3A0 0018A300 80 01 00 14 */ lwz r0, 0x14(r1) /* 8018D3A4 0018A304 7C 08 03 A6 */ mtlr r0 /* 8018D3A8 0018A308 38 21 00 10 */ addi r1, r1, 0x10 -/* 8018D3AC 0018A30C 4E 80 00 20 */ blr +/* 8018D3AC 0018A30C 4E 80 00 20 */ blr .global "__ct__21CScriptTargetingPointF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fb" "__ct__21CScriptTargetingPointF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fb": diff --git a/asm/MetroidPrime/ScriptObjects/CScriptTimer.s b/asm/MetroidPrime/ScriptObjects/CScriptTimer.s index c5f41b69..7aff737c 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptTimer.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptTimer.s @@ -13,7 +13,7 @@ lbl_803DADD8: .4byte Think__12CScriptTimerFfR13CStateManager .4byte AcceptScriptMsg__12CScriptTimerF20EScriptObjectMessage9TUniqueIdR13CStateManager .4byte SetActive__7CEntityFb - + .section .text, "ax" .global Accept__12CScriptTimerFR8IVisitor @@ -27,11 +27,11 @@ Accept__12CScriptTimerFR8IVisitor: /* 800927A8 0008F708 7C 04 03 78 */ mr r4, r0 /* 800927AC 0008F70C 81 8C 00 C8 */ lwz r12, 0xc8(r12) /* 800927B0 0008F710 7D 89 03 A6 */ mtctr r12 -/* 800927B4 0008F714 4E 80 04 21 */ bctrl +/* 800927B4 0008F714 4E 80 04 21 */ bctrl /* 800927B8 0008F718 80 01 00 14 */ lwz r0, 0x14(r1) /* 800927BC 0008F71C 7C 08 03 A6 */ mtlr r0 /* 800927C0 0008F720 38 21 00 10 */ addi r1, r1, 0x10 -/* 800927C4 0008F724 4E 80 00 20 */ blr +/* 800927C4 0008F724 4E 80 00 20 */ blr .global Think__12CScriptTimerFfR13CStateManager Think__12CScriptTimerFfR13CStateManager: @@ -56,7 +56,7 @@ lbl_80092808: /* 80092808 0008F768 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009280C 0008F76C 7C 08 03 A6 */ mtlr r0 /* 80092810 0008F770 38 21 00 10 */ addi r1, r1, 0x10 -/* 80092814 0008F774 4E 80 00 20 */ blr +/* 80092814 0008F774 4E 80 00 20 */ blr .global ApplyTime__12CScriptTimerFfR13CStateManager ApplyTime__12CScriptTimerFfR13CStateManager: @@ -103,7 +103,7 @@ lbl_800928AC: /* 800928B4 0008F814 83 C1 00 08 */ lwz r30, 8(r1) /* 800928B8 0008F818 7C 08 03 A6 */ mtlr r0 /* 800928BC 0008F81C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800928C0 0008F820 4E 80 00 20 */ blr +/* 800928C0 0008F820 4E 80 00 20 */ blr .global AcceptScriptMsg__12CScriptTimerF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__12CScriptTimerF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -190,7 +190,7 @@ lbl_800929BC: /* 800929E8 0008F948 83 81 00 10 */ lwz r28, 0x10(r1) /* 800929EC 0008F94C 7C 08 03 A6 */ mtlr r0 /* 800929F0 0008F950 38 21 00 20 */ addi r1, r1, 0x20 -/* 800929F4 0008F954 4E 80 00 20 */ blr +/* 800929F4 0008F954 4E 80 00 20 */ blr .global Reset__12CScriptTimerFR13CStateManager Reset__12CScriptTimerFR13CStateManager: @@ -209,7 +209,7 @@ Reset__12CScriptTimerFR13CStateManager: /* 80092A28 0008F988 80 01 00 14 */ lwz r0, 0x14(r1) /* 80092A2C 0008F98C 7C 08 03 A6 */ mtlr r0 /* 80092A30 0008F990 38 21 00 10 */ addi r1, r1, 0x10 -/* 80092A34 0008F994 4E 80 00 20 */ blr +/* 80092A34 0008F994 4E 80 00 20 */ blr .global __dt__12CScriptTimerFv __dt__12CScriptTimerFv: @@ -237,7 +237,7 @@ lbl_80092A7C: /* 80092A88 0008F9E8 83 C1 00 08 */ lwz r30, 8(r1) /* 80092A8C 0008F9EC 7C 08 03 A6 */ mtlr r0 /* 80092A90 0008F9F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80092A94 0008F9F4 4E 80 00 20 */ blr +/* 80092A94 0008F9F4 4E 80 00 20 */ blr .global "__ct__12CScriptTimerF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoffbbb" "__ct__12CScriptTimerF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoffbbb": @@ -280,4 +280,4 @@ lbl_80092A7C: /* 80092B28 0008FA88 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80092B2C 0008FA8C 7C 08 03 A6 */ mtlr r0 /* 80092B30 0008FA90 38 21 00 30 */ addi r1, r1, 0x30 -/* 80092B34 0008FA94 4E 80 00 20 */ blr +/* 80092B34 0008FA94 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/ScriptObjects/CScriptTrigger.s b/asm/MetroidPrime/ScriptObjects/CScriptTrigger.s index 36e47f71..f784f117 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptTrigger.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptTrigger.s @@ -64,19 +64,19 @@ lbl_805A8E04: .global InhabitantRejected__14CScriptTriggerFR6CActorR13CStateManager InhabitantRejected__14CScriptTriggerFR6CActorR13CStateManager: -/* 80075C60 00072BC0 4E 80 00 20 */ blr +/* 80075C60 00072BC0 4E 80 00 20 */ blr .global InhabitantExited__14CScriptTriggerFR6CActorR13CStateManager InhabitantExited__14CScriptTriggerFR6CActorR13CStateManager: -/* 80075C64 00072BC4 4E 80 00 20 */ blr +/* 80075C64 00072BC4 4E 80 00 20 */ blr .global InhabitantIdle__14CScriptTriggerFR6CActorR13CStateManager InhabitantIdle__14CScriptTriggerFR6CActorR13CStateManager: -/* 80075C68 00072BC8 4E 80 00 20 */ blr +/* 80075C68 00072BC8 4E 80 00 20 */ blr .global InhabitantAdded__14CScriptTriggerFR6CActorR13CStateManager InhabitantAdded__14CScriptTriggerFR6CActorR13CStateManager: -/* 80075C6C 00072BCC 4E 80 00 20 */ blr +/* 80075C6C 00072BCC 4E 80 00 20 */ blr .global Accept__14CScriptTriggerFR8IVisitor Accept__14CScriptTriggerFR8IVisitor: @@ -89,11 +89,11 @@ Accept__14CScriptTriggerFR8IVisitor: /* 80075C88 00072BE8 7C 04 03 78 */ mr r4, r0 /* 80075C8C 00072BEC 81 8C 00 CC */ lwz r12, 0xcc(r12) /* 80075C90 00072BF0 7D 89 03 A6 */ mtctr r12 -/* 80075C94 00072BF4 4E 80 04 21 */ bctrl +/* 80075C94 00072BF4 4E 80 04 21 */ bctrl /* 80075C98 00072BF8 80 01 00 14 */ lwz r0, 0x14(r1) /* 80075C9C 00072BFC 7C 08 03 A6 */ mtlr r0 /* 80075CA0 00072C00 38 21 00 10 */ addi r1, r1, 0x10 -/* 80075CA4 00072C04 4E 80 00 20 */ blr +/* 80075CA4 00072C04 4E 80 00 20 */ blr .global FindObject__14CScriptTriggerF9TUniqueId FindObject__14CScriptTriggerF9TUniqueId: @@ -131,12 +131,12 @@ lbl_80075D08: /* 80075D14 00072C74 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80075D18 00072C78 7C 08 03 A6 */ mtlr r0 /* 80075D1C 00072C7C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80075D20 00072C80 4E 80 00 20 */ blr +/* 80075D20 00072C80 4E 80 00 20 */ blr .global GetInhabitants__14CScriptTriggerCFv GetInhabitants__14CScriptTriggerCFv: /* 80075D24 00072C84 38 63 00 E8 */ addi r3, r3, 0xe8 -/* 80075D28 00072C88 4E 80 00 20 */ blr +/* 80075D28 00072C88 4E 80 00 20 */ blr .global UpdateInhabitants__14CScriptTriggerFR13CStateManager UpdateInhabitants__14CScriptTriggerFR13CStateManager: @@ -229,7 +229,7 @@ lbl_80075E64: /* 80075E70 00072DD0 7F C5 F3 78 */ mr r5, r30 /* 80075E74 00072DD4 81 8C 00 74 */ lwz r12, 0x74(r12) /* 80075E78 00072DD8 7D 89 03 A6 */ mtctr r12 -/* 80075E7C 00072DDC 4E 80 04 21 */ bctrl +/* 80075E7C 00072DDC 4E 80 04 21 */ bctrl lbl_80075E80: /* 80075E80 00072DE0 57 00 06 3F */ clrlwi. r0, r24, 0x18 /* 80075E84 00072DE4 41 82 04 58 */ beq lbl_800762DC @@ -238,7 +238,7 @@ lbl_80075E80: /* 80075E90 00072DF0 81 9D 00 00 */ lwz r12, 0(r29) /* 80075E94 00072DF4 81 8C 00 40 */ lwz r12, 0x40(r12) /* 80075E98 00072DF8 7D 89 03 A6 */ mtctr r12 -/* 80075E9C 00072DFC 4E 80 04 21 */ bctrl +/* 80075E9C 00072DFC 4E 80 04 21 */ bctrl /* 80075EA0 00072E00 88 01 01 10 */ lbz r0, 0x110(r1) /* 80075EA4 00072E04 28 00 00 00 */ cmplwi r0, 0 /* 80075EA8 00072E08 98 01 01 48 */ stb r0, 0x148(r1) @@ -265,7 +265,7 @@ lbl_80075EE8: /* 80075EF8 00072E58 81 9A 00 00 */ lwz r12, 0(r26) /* 80075EFC 00072E5C 81 8C 00 40 */ lwz r12, 0x40(r12) /* 80075F00 00072E60 7D 89 03 A6 */ mtctr r12 -/* 80075F04 00072E64 4E 80 04 21 */ bctrl +/* 80075F04 00072E64 4E 80 04 21 */ bctrl /* 80075F08 00072E68 88 01 00 F4 */ lbz r0, 0xf4(r1) /* 80075F0C 00072E6C 28 00 00 00 */ cmplwi r0, 0 /* 80075F10 00072E70 98 01 01 2C */ stb r0, 0x12c(r1) @@ -305,13 +305,13 @@ lbl_80075F50: /* 80075F94 00072EF4 3B 80 00 01 */ li r28, 1 /* 80075F98 00072EF8 81 8C 00 70 */ lwz r12, 0x70(r12) /* 80075F9C 00072EFC 7D 89 03 A6 */ mtctr r12 -/* 80075FA0 00072F00 4E 80 04 21 */ bctrl +/* 80075FA0 00072F00 4E 80 04 21 */ bctrl /* 80075FA4 00072F04 7F 43 D3 78 */ mr r3, r26 /* 80075FA8 00072F08 7F C4 F3 78 */ mr r4, r30 /* 80075FAC 00072F0C 81 9A 00 00 */ lwz r12, 0(r26) /* 80075FB0 00072F10 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80075FB4 00072F14 7D 89 03 A6 */ mtctr r12 -/* 80075FB8 00072F18 4E 80 04 21 */ bctrl +/* 80075FB8 00072F18 4E 80 04 21 */ bctrl /* 80075FBC 00072F1C 28 03 00 00 */ cmplwi r3, 0 /* 80075FC0 00072F20 41 82 01 34 */ beq lbl_800760F4 /* 80075FC4 00072F24 C0 3D 01 08 */ lfs f1, 0x108(r29) @@ -486,7 +486,7 @@ lbl_80076238: /* 80076244 000731A4 7F C5 F3 78 */ mr r5, r30 /* 80076248 000731A8 81 8C 00 74 */ lwz r12, 0x74(r12) /* 8007624C 000731AC 7D 89 03 A6 */ mtctr r12 -/* 80076250 000731B0 4E 80 04 21 */ bctrl +/* 80076250 000731B0 4E 80 04 21 */ bctrl lbl_80076254: /* 80076254 000731B4 38 00 00 00 */ li r0, 0 /* 80076258 000731B8 98 01 01 2C */ stb r0, 0x12c(r1) @@ -571,7 +571,7 @@ lbl_80076304: /* 80076380 000732E0 3B E0 00 01 */ li r31, 1 /* 80076384 000732E4 81 8C 00 74 */ lwz r12, 0x74(r12) /* 80076388 000732E8 7D 89 03 A6 */ mtctr r12 -/* 8007638C 000732EC 4E 80 04 21 */ bctrl +/* 8007638C 000732EC 4E 80 04 21 */ bctrl /* 80076390 000732F0 48 00 00 84 */ b lbl_80076414 lbl_80076394: /* 80076394 000732F4 80 1D 01 2C */ lwz r0, 0x12c(r29) @@ -583,7 +583,7 @@ lbl_80076394: /* 800763AC 0007330C 7F C5 F3 78 */ mr r5, r30 /* 800763B0 00073310 81 8C 00 70 */ lwz r12, 0x70(r12) /* 800763B4 00073314 7D 89 03 A6 */ mtctr r12 -/* 800763B8 00073318 4E 80 04 21 */ bctrl +/* 800763B8 00073318 4E 80 04 21 */ bctrl /* 800763BC 0007331C 3B 80 00 01 */ li r28, 1 /* 800763C0 00073320 48 00 00 54 */ b lbl_80076414 lbl_800763C4: @@ -601,7 +601,7 @@ lbl_800763C4: /* 800763F0 00073350 7F C5 F3 78 */ mr r5, r30 /* 800763F4 00073354 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 800763F8 00073358 7D 89 03 A6 */ mtctr r12 -/* 800763FC 0007335C 4E 80 04 21 */ bctrl +/* 800763FC 0007335C 4E 80 04 21 */ bctrl /* 80076400 00073360 7F A3 EB 78 */ mr r3, r29 /* 80076404 00073364 7F C5 F3 78 */ mr r5, r30 /* 80076408 00073368 38 80 00 03 */ li r4, 3 @@ -655,7 +655,7 @@ lbl_800764A0: /* 800764BC 0007341C 80 01 01 B4 */ lwz r0, 0x1b4(r1) /* 800764C0 00073420 7C 08 03 A6 */ mtlr r0 /* 800764C4 00073424 38 21 01 B0 */ addi r1, r1, 0x1b0 -/* 800764C8 00073428 4E 80 00 20 */ blr +/* 800764C8 00073428 4E 80 00 20 */ blr .global Think__14CScriptTriggerFfR13CStateManager Think__14CScriptTriggerFfR13CStateManager: @@ -670,7 +670,7 @@ lbl_800764E8: /* 800764E8 00073448 80 01 00 14 */ lwz r0, 0x14(r1) /* 800764EC 0007344C 7C 08 03 A6 */ mtlr r0 /* 800764F0 00073450 38 21 00 10 */ addi r1, r1, 0x10 -/* 800764F4 00073454 4E 80 00 20 */ blr +/* 800764F4 00073454 4E 80 00 20 */ blr .global AcceptScriptMsg__14CScriptTriggerF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__14CScriptTriggerF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -762,7 +762,7 @@ lbl_80076614: /* 80076634 00073594 80 01 00 34 */ lwz r0, 0x34(r1) /* 80076638 00073598 7C 08 03 A6 */ mtlr r0 /* 8007663C 0007359C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80076640 000735A0 4E 80 00 20 */ blr +/* 80076640 000735A0 4E 80 00 20 */ blr .global GetTouchBounds__14CScriptTriggerCFv GetTouchBounds__14CScriptTriggerCFv: @@ -801,7 +801,7 @@ lbl_800766B8: /* 800766BC 0007361C 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 800766C0 00073620 7C 08 03 A6 */ mtlr r0 /* 800766C4 00073624 38 21 00 30 */ addi r1, r1, 0x30 -/* 800766C8 00073628 4E 80 00 20 */ blr +/* 800766C8 00073628 4E 80 00 20 */ blr .global GetTriggerBoundsWR__14CScriptTriggerCFv GetTriggerBoundsWR__14CScriptTriggerCFv: @@ -835,7 +835,7 @@ GetTriggerBoundsWR__14CScriptTriggerCFv: /* 80076738 00073698 80 01 00 24 */ lwz r0, 0x24(r1) /* 8007673C 0007369C 7C 08 03 A6 */ mtlr r0 /* 80076740 000736A0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80076744 000736A4 4E 80 00 20 */ blr +/* 80076744 000736A4 4E 80 00 20 */ blr .global Touch__14CScriptTriggerFR6CActorR13CStateManager Touch__14CScriptTriggerFR6CActorR13CStateManager: @@ -975,7 +975,7 @@ lbl_8007690C: /* 80076934 00073894 81 9B 00 00 */ lwz r12, 0(r27) /* 80076938 00073898 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 8007693C 0007389C 7D 89 03 A6 */ mtctr r12 -/* 80076940 000738A0 4E 80 04 21 */ bctrl +/* 80076940 000738A0 4E 80 04 21 */ bctrl /* 80076944 000738A4 57 E0 07 FF */ clrlwi. r0, r31, 0x1f /* 80076948 000738A8 41 82 00 D0 */ beq lbl_80076A18 /* 8007694C 000738AC 28 1E 00 00 */ cmplwi r30, 0 @@ -1007,7 +1007,7 @@ lbl_80076998: /* 800769B0 00073910 81 99 00 00 */ lwz r12, 0(r25) /* 800769B4 00073914 81 8C 00 38 */ lwz r12, 0x38(r12) /* 800769B8 00073918 7D 89 03 A6 */ mtctr r12 -/* 800769BC 0007391C 4E 80 04 21 */ bctrl +/* 800769BC 0007391C 4E 80 04 21 */ bctrl /* 800769C0 00073920 38 9B 01 00 */ addi r4, r27, 0x100 /* 800769C4 00073924 38 A0 00 00 */ li r5, 0 /* 800769C8 00073928 48 08 BD 41 */ bl WeaponHurts__20CDamageVulnerabilityCFRC11CWeaponMode @@ -1063,7 +1063,7 @@ lbl_80076A18: /* 80076A88 000739E8 81 9C 00 00 */ lwz r12, 0(r28) /* 80076A8C 000739EC 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80076A90 000739F0 7D 89 03 A6 */ mtctr r12 -/* 80076A94 000739F4 4E 80 04 21 */ bctrl +/* 80076A94 000739F4 4E 80 04 21 */ bctrl /* 80076A98 000739F8 28 03 00 00 */ cmplwi r3, 0 /* 80076A9C 000739FC 41 82 00 88 */ beq lbl_80076B24 /* 80076AA0 00073A00 C0 3B 01 08 */ lfs f1, 0x108(r27) @@ -1108,7 +1108,7 @@ lbl_80076B24: /* 80076B38 00073A98 81 9C 00 00 */ lwz r12, 0(r28) /* 80076B3C 00073A9C 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80076B40 00073AA0 7D 89 03 A6 */ mtctr r12 -/* 80076B44 00073AA4 4E 80 04 21 */ bctrl +/* 80076B44 00073AA4 4E 80 04 21 */ bctrl /* 80076B48 00073AA8 28 03 00 00 */ cmplwi r3, 0 /* 80076B4C 00073AAC 41 82 01 20 */ beq lbl_80076C6C /* 80076B50 00073AB0 88 0D A2 40 */ lbz r0, lbl_805A8E00@sda21(r13) @@ -1183,13 +1183,13 @@ lbl_80076C50: /* 80076C5C 00073BBC 7F A5 EB 78 */ mr r5, r29 /* 80076C60 00073BC0 81 8C 00 78 */ lwz r12, 0x78(r12) /* 80076C64 00073BC4 7D 89 03 A6 */ mtctr r12 -/* 80076C68 00073BC8 4E 80 04 21 */ bctrl +/* 80076C68 00073BC8 4E 80 04 21 */ bctrl lbl_80076C6C: /* 80076C6C 00073BCC BB 21 00 E4 */ lmw r25, 0xe4(r1) /* 80076C70 00073BD0 80 01 01 04 */ lwz r0, 0x104(r1) /* 80076C74 00073BD4 7C 08 03 A6 */ mtlr r0 /* 80076C78 00073BD8 38 21 01 00 */ addi r1, r1, 0x100 -/* 80076C7C 00073BDC 4E 80 00 20 */ blr +/* 80076C7C 00073BDC 4E 80 00 20 */ blr .global __dt__14CScriptTriggerFv __dt__14CScriptTriggerFv: @@ -1250,7 +1250,7 @@ lbl_80076D34: /* 80076D48 00073CA8 83 81 00 10 */ lwz r28, 0x10(r1) /* 80076D4C 00073CAC 7C 08 03 A6 */ mtlr r0 /* 80076D50 00073CB0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80076D54 00073CB4 4E 80 00 20 */ blr +/* 80076D54 00073CB4 4E 80 00 20 */ blr .global "__ct__14CScriptTriggerF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC9CVector3fRC6CAABoxRC11CDamageInfoRC9CVector3fUibbb" "__ct__14CScriptTriggerF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC9CVector3fRC6CAABoxRC11CDamageInfoRC9CVector3fUibbb": @@ -1386,13 +1386,13 @@ lbl_80076D34: /* 80076F5C 00073EBC 80 01 01 44 */ lwz r0, 0x144(r1) /* 80076F60 00073EC0 7C 08 03 A6 */ mtlr r0 /* 80076F64 00073EC4 38 21 01 40 */ addi r1, r1, 0x140 -/* 80076F68 00073EC8 4E 80 00 20 */ blr +/* 80076F68 00073EC8 4E 80 00 20 */ blr .global "GetPtr__Q24rstl22rc_ptr<12CPlayerState>CFv" "GetPtr__Q24rstl22rc_ptr<12CPlayerState>CFv": /* 80076F6C 00073ECC 80 63 00 00 */ lwz r3, 0(r3) /* 80076F70 00073ED0 80 63 00 00 */ lwz r3, 0(r3) -/* 80076F74 00073ED4 4E 80 00 20 */ blr +/* 80076F74 00073ED4 4E 80 00 20 */ blr .global "erase__Q24rstl67listFRCQ34rstl67list8iteratorRCQ34rstl67list8iterator" "erase__Q24rstl67listFRCQ34rstl67list8iteratorRCQ34rstl67list8iterator": @@ -1428,7 +1428,7 @@ lbl_80076FCC: /* 80076FE4 00073F44 80 01 00 14 */ lwz r0, 0x14(r1) /* 80076FE8 00073F48 7C 08 03 A6 */ mtlr r0 /* 80076FEC 00073F4C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80076FF0 00073F50 4E 80 00 20 */ blr +/* 80076FF0 00073F50 4E 80 00 20 */ blr .global sub_80076ff4 sub_80076ff4: @@ -1464,4 +1464,4 @@ lbl_8007704C: /* 8007705C 00073FBC 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80077060 00073FC0 7C 08 03 A6 */ mtlr r0 /* 80077064 00073FC4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80077068 00073FC8 4E 80 00 20 */ blr +/* 80077068 00073FC8 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/ScriptObjects/CScriptVisorFlare.s b/asm/MetroidPrime/ScriptObjects/CScriptVisorFlare.s index 85221f1d..cd182a8e 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptVisorFlare.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptVisorFlare.s @@ -63,7 +63,7 @@ Render__17CScriptVisorFlareCFRC13CStateManager: /* 801D64C8 001D3428 80 01 00 24 */ lwz r0, 0x24(r1) /* 801D64CC 001D342C 7C 08 03 A6 */ mtlr r0 /* 801D64D0 001D3430 38 21 00 20 */ addi r1, r1, 0x20 -/* 801D64D4 001D3434 4E 80 00 20 */ blr +/* 801D64D4 001D3434 4E 80 00 20 */ blr .global AddToRenderer__17CScriptVisorFlareCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__17CScriptVisorFlareCFRC14CFrustumPlanesRC13CStateManager: @@ -89,7 +89,7 @@ AddToRenderer__17CScriptVisorFlareCFRC14CFrustumPlanesRC13CStateManager: /* 801D6524 001D3484 81 9E 00 00 */ lwz r12, 0(r30) /* 801D6528 001D3488 81 8C 00 64 */ lwz r12, 0x64(r12) /* 801D652C 001D348C 7D 89 03 A6 */ mtctr r12 -/* 801D6530 001D3490 4E 80 04 21 */ bctrl +/* 801D6530 001D3490 4E 80 04 21 */ bctrl /* 801D6534 001D3494 7F C3 F3 78 */ mr r3, r30 /* 801D6538 001D3498 7F E4 FB 78 */ mr r4, r31 /* 801D653C 001D349C 38 A1 00 08 */ addi r5, r1, 8 @@ -101,7 +101,7 @@ lbl_801D6548: /* 801D6550 001D34B0 83 C1 00 38 */ lwz r30, 0x38(r1) /* 801D6554 001D34B4 7C 08 03 A6 */ mtlr r0 /* 801D6558 001D34B8 38 21 00 40 */ addi r1, r1, 0x40 -/* 801D655C 001D34BC 4E 80 00 20 */ blr +/* 801D655C 001D34BC 4E 80 00 20 */ blr .global PreRender__17CScriptVisorFlareFR13CStateManagerRC14CFrustumPlanes PreRender__17CScriptVisorFlareFR13CStateManagerRC14CFrustumPlanes: @@ -123,7 +123,7 @@ PreRender__17CScriptVisorFlareFR13CStateManagerRC14CFrustumPlanes: /* 801D659C 001D34FC 80 01 00 24 */ lwz r0, 0x24(r1) /* 801D65A0 001D3500 7C 08 03 A6 */ mtlr r0 /* 801D65A4 001D3504 38 21 00 20 */ addi r1, r1, 0x20 -/* 801D65A8 001D3508 4E 80 00 20 */ blr +/* 801D65A8 001D3508 4E 80 00 20 */ blr .global AcceptScriptMsg__17CScriptVisorFlareF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__17CScriptVisorFlareF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -137,7 +137,7 @@ AcceptScriptMsg__17CScriptVisorFlareF20EScriptObjectMessage9TUniqueIdR13CStateMa /* 801D65C8 001D3528 80 01 00 14 */ lwz r0, 0x14(r1) /* 801D65CC 001D352C 7C 08 03 A6 */ mtlr r0 /* 801D65D0 001D3530 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D65D4 001D3534 4E 80 00 20 */ blr +/* 801D65D4 001D3534 4E 80 00 20 */ blr .global Think__17CScriptVisorFlareFfR13CStateManager Think__17CScriptVisorFlareFfR13CStateManager: @@ -162,7 +162,7 @@ lbl_801D661C: /* 801D661C 001D357C 80 01 00 24 */ lwz r0, 0x24(r1) /* 801D6620 001D3580 7C 08 03 A6 */ mtlr r0 /* 801D6624 001D3584 38 21 00 20 */ addi r1, r1, 0x20 -/* 801D6628 001D3588 4E 80 00 20 */ blr +/* 801D6628 001D3588 4E 80 00 20 */ blr .global Accept__17CScriptVisorFlareFR8IVisitor Accept__17CScriptVisorFlareFR8IVisitor: @@ -175,11 +175,11 @@ Accept__17CScriptVisorFlareFR8IVisitor: /* 801D6644 001D35A4 7C 04 03 78 */ mr r4, r0 /* 801D6648 001D35A8 81 8C 00 D0 */ lwz r12, 0xd0(r12) /* 801D664C 001D35AC 7D 89 03 A6 */ mtctr r12 -/* 801D6650 001D35B0 4E 80 04 21 */ bctrl +/* 801D6650 001D35B0 4E 80 04 21 */ bctrl /* 801D6654 001D35B4 80 01 00 14 */ lwz r0, 0x14(r1) /* 801D6658 001D35B8 7C 08 03 A6 */ mtlr r0 /* 801D665C 001D35BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D6660 001D35C0 4E 80 00 20 */ blr +/* 801D6660 001D35C0 4E 80 00 20 */ blr .global __dt__17CScriptVisorFlareFv __dt__17CScriptVisorFlareFv: @@ -211,7 +211,7 @@ lbl_801D66B8: /* 801D66C4 001D3624 83 C1 00 08 */ lwz r30, 8(r1) /* 801D66C8 001D3628 7C 08 03 A6 */ mtlr r0 /* 801D66CC 001D362C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D66D0 001D3630 4E 80 00 20 */ blr +/* 801D66D0 001D3630 4E 80 00 20 */ blr .global sub_801d66d4 sub_801d66d4: @@ -237,7 +237,7 @@ lbl_801D6710: /* 801D671C 001D367C 83 C1 00 08 */ lwz r30, 8(r1) /* 801D6720 001D3680 7C 08 03 A6 */ mtlr r0 /* 801D6724 001D3684 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D6728 001D3688 4E 80 00 20 */ blr +/* 801D6728 001D3688 4E 80 00 20 */ blr .global "__ct__17CScriptVisorFlareF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfobRC9CVector3fQ211CVisorFlare10EBlendModebfffRCQ24rstl60vector" "__ct__17CScriptVisorFlareF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfobRC9CVector3fQ211CVisorFlare10EBlendModebfffRCQ24rstl60vector": diff --git a/asm/MetroidPrime/ScriptObjects/CScriptVisorGoo.s b/asm/MetroidPrime/ScriptObjects/CScriptVisorGoo.s index 00d93459..79ee7343 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptVisorGoo.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptVisorGoo.s @@ -55,19 +55,19 @@ Accept__15CScriptVisorGooFR8IVisitor: /* 801D6FDC 001D3F3C 7C 04 03 78 */ mr r4, r0 /* 801D6FE0 001D3F40 81 8C 00 08 */ lwz r12, 8(r12) /* 801D6FE4 001D3F44 7D 89 03 A6 */ mtctr r12 -/* 801D6FE8 001D3F48 4E 80 04 21 */ bctrl +/* 801D6FE8 001D3F48 4E 80 04 21 */ bctrl /* 801D6FEC 001D3F4C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801D6FF0 001D3F50 7C 08 03 A6 */ mtlr r0 /* 801D6FF4 001D3F54 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D6FF8 001D3F58 4E 80 00 20 */ blr +/* 801D6FF8 001D3F58 4E 80 00 20 */ blr .global AddToRenderer__15CScriptVisorGooCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__15CScriptVisorGooCFRC14CFrustumPlanesRC13CStateManager: -/* 801D6FFC 001D3F5C 4E 80 00 20 */ blr +/* 801D6FFC 001D3F5C 4E 80 00 20 */ blr .global Render__15CScriptVisorGooCFRC13CStateManager Render__15CScriptVisorGooCFRC13CStateManager: -/* 801D7000 001D3F60 4E 80 00 20 */ blr +/* 801D7000 001D3F60 4E 80 00 20 */ blr .global AcceptScriptMsg__15CScriptVisorGooF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__15CScriptVisorGooF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -114,17 +114,17 @@ lbl_801D706C: /* 801D7098 001D3FF8 83 81 00 10 */ lwz r28, 0x10(r1) /* 801D709C 001D3FFC 7C 08 03 A6 */ mtlr r0 /* 801D70A0 001D4000 38 21 00 20 */ addi r1, r1, 0x20 -/* 801D70A4 001D4004 4E 80 00 20 */ blr +/* 801D70A4 001D4004 4E 80 00 20 */ blr .global GetTouchBounds__15CScriptVisorGooCFv GetTouchBounds__15CScriptVisorGooCFv: /* 801D70A8 001D4008 38 00 00 00 */ li r0, 0 /* 801D70AC 001D400C 98 03 00 18 */ stb r0, 0x18(r3) -/* 801D70B0 001D4010 4E 80 00 20 */ blr +/* 801D70B0 001D4010 4E 80 00 20 */ blr .global Touch__15CScriptVisorGooFR6CActorR13CStateManager Touch__15CScriptVisorGooFR6CActorR13CStateManager: -/* 801D70B4 001D4014 4E 80 00 20 */ blr +/* 801D70B4 001D4014 4E 80 00 20 */ blr .global Think__15CScriptVisorGooFfR13CStateManager Think__15CScriptVisorGooFfR13CStateManager: @@ -468,7 +468,7 @@ lbl_801D7570: /* 801D7594 001D44F4 80 01 01 64 */ lwz r0, 0x164(r1) /* 801D7598 001D44F8 7C 08 03 A6 */ mtlr r0 /* 801D759C 001D44FC 38 21 01 60 */ addi r1, r1, 0x160 -/* 801D75A0 001D4500 4E 80 00 20 */ blr +/* 801D75A0 001D4500 4E 80 00 20 */ blr .global __dt__15CScriptVisorGooFv __dt__15CScriptVisorGooFv: @@ -509,7 +509,7 @@ lbl_801D7614: /* 801D7620 001D4580 83 C1 00 08 */ lwz r30, 8(r1) /* 801D7624 001D4584 7C 08 03 A6 */ mtlr r0 /* 801D7628 001D4588 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D762C 001D458C 4E 80 00 20 */ blr +/* 801D762C 001D458C 4E 80 00 20 */ blr .global "__ct__15CScriptVisorGooF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fUiUiffffRC6CColoribb" "__ct__15CScriptVisorGooF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fUiUiffffRC6CColoribb": @@ -590,7 +590,7 @@ lbl_801D7614: /* 801D7758 001D46B8 38 80 00 01 */ li r4, 1 /* 801D775C 001D46BC 81 8C 00 08 */ lwz r12, 8(r12) /* 801D7760 001D46C0 7D 89 03 A6 */ mtctr r12 -/* 801D7764 001D46C4 4E 80 04 21 */ bctrl +/* 801D7764 001D46C4 4E 80 04 21 */ bctrl lbl_801D7768: /* 801D7768 001D46C8 3A BA 00 F0 */ addi r21, r26, 0xf0 /* 801D776C 001D46CC 38 61 00 20 */ addi r3, r1, 0x20 @@ -611,7 +611,7 @@ lbl_801D7768: /* 801D77A8 001D4708 38 80 00 01 */ li r4, 1 /* 801D77AC 001D470C 81 8C 00 08 */ lwz r12, 8(r12) /* 801D77B0 001D4710 7D 89 03 A6 */ mtctr r12 -/* 801D77B4 001D4714 4E 80 04 21 */ bctrl +/* 801D77B4 001D4714 4E 80 04 21 */ bctrl lbl_801D77B8: /* 801D77B8 001D4718 57 C3 04 3E */ clrlwi r3, r30, 0x10 /* 801D77BC 001D471C 48 11 11 F5 */ bl TranslateSFXID__11CSfxManagerFUs @@ -653,7 +653,7 @@ lbl_801D77F4: /* 801D7844 001D47A4 81 84 00 00 */ lwz r12, 0(r4) /* 801D7848 001D47A8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801D784C 001D47AC 7D 89 03 A6 */ mtctr r12 -/* 801D7850 001D47B0 4E 80 04 21 */ bctrl +/* 801D7850 001D47B0 4E 80 04 21 */ bctrl /* 801D7854 001D47B4 38 61 00 48 */ addi r3, r1, 0x48 /* 801D7858 001D47B8 38 81 00 50 */ addi r4, r1, 0x50 /* 801D785C 001D47BC 48 16 96 4D */ bl __ct__6CTokenFRC6CToken @@ -680,7 +680,7 @@ lbl_801D7884: /* 801D78AC 001D480C 81 84 00 00 */ lwz r12, 0(r4) /* 801D78B0 001D4810 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801D78B4 001D4814 7D 89 03 A6 */ mtctr r12 -/* 801D78B8 001D4818 4E 80 04 21 */ bctrl +/* 801D78B8 001D4818 4E 80 04 21 */ bctrl /* 801D78BC 001D481C 38 61 00 30 */ addi r3, r1, 0x30 /* 801D78C0 001D4820 38 81 00 38 */ addi r4, r1, 0x38 /* 801D78C4 001D4824 48 16 95 E5 */ bl __ct__6CTokenFRC6CToken diff --git a/asm/MetroidPrime/ScriptObjects/CScriptWater.s b/asm/MetroidPrime/ScriptObjects/CScriptWater.s index 36e57bbe..0baae544 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptWater.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptWater.s @@ -83,7 +83,7 @@ GetPatchRenderFlags__12CScriptWaterCFii: /* 800FECA0 000FBC00 7C 00 1A 14 */ add r0, r0, r3 /* 800FECA4 000FBC04 7C 64 00 AE */ lbzx r3, r4, r0 /* 800FECA8 000FBC08 7C 63 07 74 */ extsb r3, r3 -/* 800FECAC 000FBC0C 4E 80 00 20 */ blr +/* 800FECAC 000FBC0C 4E 80 00 20 */ blr .global CanRippleAtPoint__12CScriptWaterCFRC9CVector3f CanRippleAtPoint__12CScriptWaterCFRC9CVector3f: @@ -157,7 +157,7 @@ lbl_800FED98: /* 800FEDA4 000FBD04 83 A1 00 44 */ lwz r29, 0x44(r1) /* 800FEDA8 000FBD08 7C 08 03 A6 */ mtlr r0 /* 800FEDAC 000FBD0C 38 21 00 50 */ addi r1, r1, 0x50 -/* 800FEDB0 000FBD10 4E 80 00 20 */ blr +/* 800FEDB0 000FBD10 4E 80 00 20 */ blr .global SetupGrid__12CScriptWaterFb SetupGrid__12CScriptWaterFb: @@ -336,7 +336,7 @@ lbl_800FEF5C: /* 800FF040 000FBFA0 80 01 00 64 */ lwz r0, 0x64(r1) /* 800FF044 000FBFA4 7C 08 03 A6 */ mtlr r0 /* 800FF048 000FBFA8 38 21 00 60 */ addi r1, r1, 0x60 -/* 800FF04C 000FBFAC 4E 80 00 20 */ blr +/* 800FF04C 000FBFAC 4E 80 00 20 */ blr .global SetupGridClipping__12CScriptWaterFR13CStateManageri SetupGridClipping__12CScriptWaterFR13CStateManageri: @@ -730,7 +730,7 @@ lbl_800FF590: /* 800FF5C4 000FC524 80 01 01 44 */ lwz r0, 0x144(r1) /* 800FF5C8 000FC528 7C 08 03 A6 */ mtlr r0 /* 800FF5CC 000FC52C 38 21 01 40 */ addi r1, r1, 0x140 -/* 800FF5D0 000FC530 4E 80 00 20 */ blr +/* 800FF5D0 000FC530 4E 80 00 20 */ blr .global SetMorphing__12CScriptWaterFb SetMorphing__12CScriptWaterFb: @@ -751,12 +751,12 @@ lbl_800FF608: /* 800FF608 000FC568 80 01 00 14 */ lwz r0, 0x14(r1) /* 800FF60C 000FC56C 7C 08 03 A6 */ mtlr r0 /* 800FF610 000FC570 38 21 00 10 */ addi r1, r1, 0x10 -/* 800FF614 000FC574 4E 80 00 20 */ blr +/* 800FF614 000FC574 4E 80 00 20 */ blr .global GetCollisionResponseType__12CScriptWaterCFRC9CVector3fRC9CVector3fRC11CWeaponModei GetCollisionResponseType__12CScriptWaterCFRC9CVector3fRC9CVector3fRC11CWeaponModei: /* 800FF618 000FC578 38 60 00 08 */ li r3, 8 -/* 800FF61C 000FC57C 4E 80 00 20 */ blr +/* 800FF61C 000FC57C 4E 80 00 20 */ blr .global GetSplashEffectScale__12CScriptWaterCFf GetSplashEffectScale__12CScriptWaterCFf: @@ -802,7 +802,7 @@ lbl_800FF6A8: /* 800FF6B4 000FC614 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800FF6B8 000FC618 7C 08 03 A6 */ mtlr r0 /* 800FF6BC 000FC61C 38 21 00 20 */ addi r1, r1, 0x20 -/* 800FF6C0 000FC620 4E 80 00 20 */ blr +/* 800FF6C0 000FC620 4E 80 00 20 */ blr .global GetSplashSound__12CScriptWaterCFf GetSplashSound__12CScriptWaterCFf: @@ -819,7 +819,7 @@ GetSplashSound__12CScriptWaterCFf: /* 800FF6EC 000FC64C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800FF6F0 000FC650 7C 08 03 A6 */ mtlr r0 /* 800FF6F4 000FC654 38 21 00 10 */ addi r1, r1, 0x10 -/* 800FF6F8 000FC658 4E 80 00 20 */ blr +/* 800FF6F8 000FC658 4E 80 00 20 */ blr .global GetSplashEffect__12CScriptWaterCFf GetSplashEffect__12CScriptWaterCFf: @@ -836,7 +836,7 @@ GetSplashEffect__12CScriptWaterCFf: /* 800FF724 000FC684 80 01 00 14 */ lwz r0, 0x14(r1) /* 800FF728 000FC688 7C 08 03 A6 */ mtlr r0 /* 800FF72C 000FC68C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800FF730 000FC690 4E 80 00 20 */ blr +/* 800FF730 000FC690 4E 80 00 20 */ blr .global GetSplashIndex__12CScriptWaterCFf GetSplashIndex__12CScriptWaterCFf: @@ -851,7 +851,7 @@ GetSplashIndex__12CScriptWaterCFf: /* 800FF754 000FC6B4 38 63 FF FF */ addi r3, r3, -1 lbl_800FF758: /* 800FF758 000FC6B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800FF75C 000FC6BC 4E 80 00 20 */ blr +/* 800FF75C 000FC6BC 4E 80 00 20 */ blr .global Render__12CScriptWaterCFRC13CStateManager Render__12CScriptWaterCFRC13CStateManager: @@ -956,7 +956,7 @@ Render__12CScriptWaterCFRC13CStateManager: /* 800FF8E8 000FC848 C0 3E 02 BC */ lfs f1, 0x2bc(r30) /* 800FF8EC 000FC84C 38 E7 00 0C */ addi r7, r7, 0xc /* 800FF8F0 000FC850 7D 89 03 A6 */ mtctr r12 -/* 800FF8F4 000FC854 4E 80 04 21 */ bctrl +/* 800FF8F4 000FC854 4E 80 04 21 */ bctrl /* 800FF8F8 000FC858 38 61 00 C8 */ addi r3, r1, 0xc8 /* 800FF8FC 000FC85C 38 80 FF FF */ li r4, -1 /* 800FF900 000FC860 4B FF AF 41 */ bl sub_800fa840 @@ -1070,14 +1070,14 @@ Render__12CScriptWaterCFRC13CStateManager: /* 800FFAB0 000FCA10 81 83 00 00 */ lwz r12, 0(r3) /* 800FFAB4 000FCA14 81 8C 00 30 */ lwz r12, 0x30(r12) /* 800FFAB8 000FCA18 7D 89 03 A6 */ mtctr r12 -/* 800FFABC 000FCA1C 4E 80 04 21 */ bctrl +/* 800FFABC 000FCA1C 4E 80 04 21 */ bctrl /* 800FFAC0 000FCA20 48 24 A4 ED */ bl White__6CColorFv /* 800FFAC4 000FCA24 7C 64 1B 78 */ mr r4, r3 /* 800FFAC8 000FCA28 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 800FFACC 000FCA2C 81 83 00 00 */ lwz r12, 0(r3) /* 800FFAD0 000FCA30 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 800FFAD4 000FCA34 7D 89 03 A6 */ mtctr r12 -/* 800FFAD8 000FCA38 4E 80 04 21 */ bctrl +/* 800FFAD8 000FCA38 4E 80 04 21 */ bctrl /* 800FFADC 000FCA3C 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 800FFAE0 000FCA40 38 9E 02 28 */ addi r4, r30, 0x228 /* 800FFAE4 000FCA44 38 A1 00 FC */ addi r5, r1, 0xfc @@ -1086,7 +1086,7 @@ Render__12CScriptWaterCFRC13CStateManager: /* 800FFAF0 000FCA50 38 E0 00 00 */ li r7, 0 /* 800FFAF4 000FCA54 81 8C 00 E4 */ lwz r12, 0xe4(r12) /* 800FFAF8 000FCA58 7D 89 03 A6 */ mtctr r12 -/* 800FFAFC 000FCA5C 4E 80 04 21 */ bctrl +/* 800FFAFC 000FCA5C 4E 80 04 21 */ bctrl lbl_800FFB00: /* 800FFB00 000FCA60 48 20 CE 7D */ bl DisableAllLights__9CGraphicsFv lbl_800FFB04: @@ -1101,7 +1101,7 @@ lbl_800FFB04: /* 800FFB24 000FCA84 83 A1 02 84 */ lwz r29, 0x284(r1) /* 800FFB28 000FCA88 7C 08 03 A6 */ mtlr r0 /* 800FFB2C 000FCA8C 38 21 02 A0 */ addi r1, r1, 0x2a0 -/* 800FFB30 000FCA90 4E 80 00 20 */ blr +/* 800FFB30 000FCA90 4E 80 00 20 */ blr .global "__ct__Q24rstl33optional_object<14CRippleManager>FRC14CRippleManager" "__ct__Q24rstl33optional_object<14CRippleManager>FRC14CRippleManager": @@ -1118,7 +1118,7 @@ lbl_800FFB04: /* 800FFB5C 000FCABC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800FFB60 000FCAC0 7C 08 03 A6 */ mtlr r0 /* 800FFB64 000FCAC4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800FFB68 000FCAC8 4E 80 00 20 */ blr +/* 800FFB68 000FCAC8 4E 80 00 20 */ blr .global sub_800ffb6c sub_800ffb6c: @@ -1132,7 +1132,7 @@ lbl_800FFB84: /* 800FFB84 000FCAE4 80 01 00 14 */ lwz r0, 0x14(r1) /* 800FFB88 000FCAE8 7C 08 03 A6 */ mtlr r0 /* 800FFB8C 000FCAEC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800FFB90 000FCAF0 4E 80 00 20 */ blr +/* 800FFB90 000FCAF0 4E 80 00 20 */ blr .global __ct__14CRippleManagerFRC14CRippleManager __ct__14CRippleManagerFRC14CRippleManager: @@ -1156,7 +1156,7 @@ __ct__14CRippleManagerFRC14CRippleManager: /* 800FFBD8 000FCB38 80 01 00 14 */ lwz r0, 0x14(r1) /* 800FFBDC 000FCB3C 7C 08 03 A6 */ mtlr r0 /* 800FFBE0 000FCB40 38 21 00 10 */ addi r1, r1, 0x10 -/* 800FFBE4 000FCB44 4E 80 00 20 */ blr +/* 800FFBE4 000FCB44 4E 80 00 20 */ blr .global sub_800ffbe8 sub_800ffbe8: @@ -1205,7 +1205,7 @@ lbl_800FFC74: /* 800FFC80 000FCBE0 83 C1 00 08 */ lwz r30, 8(r1) /* 800FFC84 000FCBE4 7C 08 03 A6 */ mtlr r0 /* 800FFC88 000FCBE8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800FFC8C 000FCBEC 4E 80 00 20 */ blr +/* 800FFC8C 000FCBEC 4E 80 00 20 */ blr .global sub_800ffc90 sub_800ffc90: @@ -1253,7 +1253,7 @@ lbl_800FFD24: /* 800FFD2C 000FCC8C 42 00 FF 70 */ bdnz lbl_800FFC9C lbl_800FFD30: /* 800FFD30 000FCC90 7C A3 2B 78 */ mr r3, r5 -/* 800FFD34 000FCC94 4E 80 00 20 */ blr +/* 800FFD34 000FCC94 4E 80 00 20 */ blr .global PreRender__12CScriptWaterFR13CStateManagerRC14CFrustumPlanes PreRender__12CScriptWaterFR13CStateManagerRC14CFrustumPlanes: @@ -1273,7 +1273,7 @@ PreRender__12CScriptWaterFR13CStateManagerRC14CFrustumPlanes: /* 800FFD6C 000FCCCC 38 61 00 48 */ addi r3, r1, 0x48 /* 800FFD70 000FCCD0 81 8C 00 64 */ lwz r12, 0x64(r12) /* 800FFD74 000FCCD4 7D 89 03 A6 */ mtctr r12 -/* 800FFD78 000FCCD8 4E 80 04 21 */ bctrl +/* 800FFD78 000FCCD8 4E 80 04 21 */ bctrl /* 800FFD7C 000FCCDC 7F E3 FB 78 */ mr r3, r31 /* 800FFD80 000FCCE0 38 81 00 48 */ addi r4, r1, 0x48 /* 800FFD84 000FCCE4 48 24 54 4D */ bl BoxInFrustumPlanes__14CFrustumPlanesCFRC6CAABox @@ -1398,7 +1398,7 @@ lbl_800FFF2C: /* 800FFF30 000FCE90 80 01 00 84 */ lwz r0, 0x84(r1) /* 800FFF34 000FCE94 7C 08 03 A6 */ mtlr r0 /* 800FFF38 000FCE98 38 21 00 80 */ addi r1, r1, 0x80 -/* 800FFF3C 000FCE9C 4E 80 00 20 */ blr +/* 800FFF3C 000FCE9C 4E 80 00 20 */ blr .global AddToRenderer__12CScriptWaterCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__12CScriptWaterCFRC14CFrustumPlanesRC13CStateManager: @@ -1444,7 +1444,7 @@ AddToRenderer__12CScriptWaterCFRC14CFrustumPlanesRC13CStateManager: /* 800FFFDC 000FCF3C 81 9E 00 00 */ lwz r12, 0(r30) /* 800FFFE0 000FCF40 81 8C 00 64 */ lwz r12, 0x64(r12) /* 800FFFE4 000FCF44 7D 89 03 A6 */ mtctr r12 -/* 800FFFE8 000FCF48 4E 80 04 21 */ bctrl +/* 800FFFE8 000FCF48 4E 80 04 21 */ bctrl /* 800FFFEC 000FCF4C 7F E3 FB 78 */ mr r3, r31 /* 800FFFF0 000FCF50 7F C4 F3 78 */ mr r4, r30 /* 800FFFF4 000FCF54 38 A1 00 14 */ addi r5, r1, 0x14 @@ -1460,7 +1460,7 @@ lbl_80100000: /* 80100018 000FCF78 83 C1 00 48 */ lwz r30, 0x48(r1) /* 8010001C 000FCF7C 7C 08 03 A6 */ mtlr r0 /* 80100020 000FCF80 38 21 00 70 */ addi r1, r1, 0x70 -/* 80100024 000FCF84 4E 80 00 20 */ blr +/* 80100024 000FCF84 4E 80 00 20 */ blr .global GetRenderBounds__12CScriptWaterCFRC12CTransform4f GetRenderBounds__12CScriptWaterCFRC12CTransform4f: @@ -1490,7 +1490,7 @@ lbl_80100074: /* 80100080 000FCFE0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80100084 000FCFE4 7C 08 03 A6 */ mtlr r0 /* 80100088 000FCFE8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8010008C 000FCFEC 4E 80 00 20 */ blr +/* 8010008C 000FCFEC 4E 80 00 20 */ blr .global CalculateRenderBounds__12CScriptWaterFv CalculateRenderBounds__12CScriptWaterFv: @@ -1548,7 +1548,7 @@ CalculateRenderBounds__12CScriptWaterFv: /* 8010015C 000FD0BC 80 01 00 64 */ lwz r0, 0x64(r1) /* 80100160 000FD0C0 7C 08 03 A6 */ mtlr r0 /* 80100164 000FD0C4 38 21 00 60 */ addi r1, r1, 0x60 -/* 80100168 000FD0C8 4E 80 00 20 */ blr +/* 80100168 000FD0C8 4E 80 00 20 */ blr .global Accept__12CScriptWaterFR8IVisitor Accept__12CScriptWaterFR8IVisitor: @@ -1561,11 +1561,11 @@ Accept__12CScriptWaterFR8IVisitor: /* 80100184 000FD0E4 7C 04 03 78 */ mr r4, r0 /* 80100188 000FD0E8 81 8C 00 D4 */ lwz r12, 0xd4(r12) /* 8010018C 000FD0EC 7D 89 03 A6 */ mtctr r12 -/* 80100190 000FD0F0 4E 80 04 21 */ bctrl +/* 80100190 000FD0F0 4E 80 04 21 */ bctrl /* 80100194 000FD0F4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80100198 000FD0F8 7C 08 03 A6 */ mtlr r0 /* 8010019C 000FD0FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801001A0 000FD100 4E 80 00 20 */ blr +/* 801001A0 000FD100 4E 80 00 20 */ blr .global Think__12CScriptWaterFfR13CStateManager Think__12CScriptWaterFfR13CStateManager: @@ -1818,7 +1818,7 @@ lbl_801003F4: /* 80100564 000FD4C4 81 9E 00 00 */ lwz r12, 0(r30) /* 80100568 000FD4C8 81 8C 00 30 */ lwz r12, 0x30(r12) /* 8010056C 000FD4CC 7D 89 03 A6 */ mtctr r12 -/* 80100570 000FD4D0 4E 80 04 21 */ bctrl +/* 80100570 000FD4D0 4E 80 04 21 */ bctrl /* 80100574 000FD4D4 57 A0 06 3F */ clrlwi. r0, r29, 0x18 /* 80100578 000FD4D8 40 82 00 14 */ bne lbl_8010058C /* 8010057C 000FD4DC 7F C3 F3 78 */ mr r3, r30 @@ -1843,7 +1843,7 @@ lbl_801005A8: /* 801005BC 000FD51C 83 A1 00 74 */ lwz r29, 0x74(r1) /* 801005C0 000FD520 7C 08 03 A6 */ mtlr r0 /* 801005C4 000FD524 38 21 00 90 */ addi r1, r1, 0x90 -/* 801005C8 000FD528 4E 80 00 20 */ blr +/* 801005C8 000FD528 4E 80 00 20 */ blr .global UpdateSplashInhabitants__12CScriptWaterFR13CStateManager UpdateSplashInhabitants__12CScriptWaterFR13CStateManager: @@ -1874,7 +1874,7 @@ lbl_801005EC: /* 80100628 000FD588 81 9B 00 00 */ lwz r12, 0(r27) /* 8010062C 000FD58C 81 8C 00 40 */ lwz r12, 0x40(r12) /* 80100630 000FD590 7D 89 03 A6 */ mtctr r12 -/* 80100634 000FD594 4E 80 04 21 */ bctrl +/* 80100634 000FD594 4E 80 04 21 */ bctrl /* 80100638 000FD598 88 01 00 54 */ lbz r0, 0x54(r1) /* 8010063C 000FD59C 28 00 00 00 */ cmplwi r0, 0 /* 80100640 000FD5A0 98 01 00 70 */ stb r0, 0x70(r1) @@ -1930,7 +1930,7 @@ lbl_801006D0: /* 801006FC 000FD65C 38 80 00 01 */ li r4, 1 /* 80100700 000FD660 81 8C 00 5C */ lwz r12, 0x5c(r12) /* 80100704 000FD664 7D 89 03 A6 */ mtctr r12 -/* 80100708 000FD668 4E 80 04 21 */ bctrl +/* 80100708 000FD668 4E 80 04 21 */ bctrl lbl_8010070C: /* 8010070C 000FD66C A0 1E 00 08 */ lhz r0, 8(r30) /* 80100710 000FD670 7F E3 FB 78 */ mr r3, r31 @@ -1958,7 +1958,7 @@ lbl_80100738: /* 80100764 000FD6C4 38 80 00 02 */ li r4, 2 /* 80100768 000FD6C8 81 8C 00 5C */ lwz r12, 0x5c(r12) /* 8010076C 000FD6CC 7D 89 03 A6 */ mtctr r12 -/* 80100770 000FD6D0 4E 80 04 21 */ bctrl +/* 80100770 000FD6D0 4E 80 04 21 */ bctrl lbl_80100774: /* 80100774 000FD6D4 A0 1E 00 08 */ lhz r0, 8(r30) /* 80100778 000FD6D8 7F E3 FB 78 */ mr r3, r31 @@ -1978,7 +1978,7 @@ lbl_80100798: /* 801007A8 000FD708 80 01 00 94 */ lwz r0, 0x94(r1) /* 801007AC 000FD70C 7C 08 03 A6 */ mtlr r0 /* 801007B0 000FD710 38 21 00 90 */ addi r1, r1, 0x90 -/* 801007B4 000FD714 4E 80 00 20 */ blr +/* 801007B4 000FD714 4E 80 00 20 */ blr .global Touch__12CScriptWaterFR6CActorR13CStateManager Touch__12CScriptWaterFR6CActorR13CStateManager: @@ -2024,7 +2024,7 @@ lbl_80100838: /* 80100848 000FD7A8 81 9E 00 00 */ lwz r12, 0(r30) /* 8010084C 000FD7AC 81 8C 00 40 */ lwz r12, 0x40(r12) /* 80100850 000FD7B0 7D 89 03 A6 */ mtctr r12 -/* 80100854 000FD7B4 4E 80 04 21 */ bctrl +/* 80100854 000FD7B4 4E 80 04 21 */ bctrl /* 80100858 000FD7B8 88 01 00 40 */ lbz r0, 0x40(r1) /* 8010085C 000FD7BC 28 00 00 00 */ cmplwi r0, 0 /* 80100860 000FD7C0 40 82 00 10 */ bne lbl_80100870 @@ -2082,7 +2082,7 @@ lbl_801008C4: /* 80100920 000FD880 38 80 00 00 */ li r4, 0 /* 80100924 000FD884 81 8C 00 5C */ lwz r12, 0x5c(r12) /* 80100928 000FD888 7D 89 03 A6 */ mtctr r12 -/* 8010092C 000FD88C 4E 80 04 21 */ bctrl +/* 8010092C 000FD88C 4E 80 04 21 */ bctrl lbl_80100930: /* 80100930 000FD890 A0 1D 00 08 */ lhz r0, 8(r29) /* 80100934 000FD894 7F E3 FB 78 */ mr r3, r31 @@ -2099,7 +2099,7 @@ lbl_80100958: /* 8010095C 000FD8BC 80 01 00 74 */ lwz r0, 0x74(r1) /* 80100960 000FD8C0 7C 08 03 A6 */ mtlr r0 /* 80100964 000FD8C4 38 21 00 70 */ addi r1, r1, 0x70 -/* 80100968 000FD8C8 4E 80 00 20 */ blr +/* 80100968 000FD8C8 4E 80 00 20 */ blr .global GetNextConnectedWater__12CScriptWaterFR13CStateManager GetNextConnectedWater__12CScriptWaterFR13CStateManager: @@ -2169,7 +2169,7 @@ lbl_80100A44: /* 80100A50 000FD9B0 83 A1 00 34 */ lwz r29, 0x34(r1) /* 80100A54 000FD9B4 7C 08 03 A6 */ mtlr r0 /* 80100A58 000FD9B8 38 21 00 40 */ addi r1, r1, 0x40 -/* 80100A5C 000FD9BC 4E 80 00 20 */ blr +/* 80100A5C 000FD9BC 4E 80 00 20 */ blr .global AcceptScriptMsg__12CScriptWaterF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__12CScriptWaterF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -2357,7 +2357,7 @@ lbl_80100CE0: /* 80100D00 000FDC60 80 01 00 54 */ lwz r0, 0x54(r1) /* 80100D04 000FDC64 7C 08 03 A6 */ mtlr r0 /* 80100D08 000FDC68 38 21 00 50 */ addi r1, r1, 0x50 -/* 80100D0C 000FDC6C 4E 80 00 20 */ blr +/* 80100D0C 000FDC6C 4E 80 00 20 */ blr .global __dt__12CScriptWaterFv __dt__12CScriptWaterFv: @@ -2460,7 +2460,7 @@ lbl_80100E3C: /* 80100E60 000FDDC0 38 80 00 01 */ li r4, 1 /* 80100E64 000FDDC4 81 8C 00 08 */ lwz r12, 8(r12) /* 80100E68 000FDDC8 7D 89 03 A6 */ mtctr r12 -/* 80100E6C 000FDDCC 4E 80 04 21 */ bctrl +/* 80100E6C 000FDDCC 4E 80 04 21 */ bctrl lbl_80100E70: /* 80100E70 000FDDD0 34 1E 01 50 */ addic. r0, r30, 0x150 /* 80100E74 000FDDD4 41 82 00 60 */ beq lbl_80100ED4 @@ -2506,7 +2506,7 @@ lbl_80100EF0: /* 80100EFC 000FDE5C 83 C1 00 08 */ lwz r30, 8(r1) /* 80100F00 000FDE60 7C 08 03 A6 */ mtlr r0 /* 80100F04 000FDE64 38 21 00 10 */ addi r1, r1, 0x10 -/* 80100F08 000FDE68 4E 80 00 20 */ blr +/* 80100F08 000FDE68 4E 80 00 20 */ blr .global __dt__14CFluidPlaneCPUFv __dt__14CFluidPlaneCPUFv: @@ -2598,7 +2598,7 @@ lbl_80101030: /* 8010103C 000FDF9C 83 C1 00 08 */ lwz r30, 8(r1) /* 80101040 000FDFA0 7C 08 03 A6 */ mtlr r0 /* 80101044 000FDFA4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80101048 000FDFA8 4E 80 00 20 */ blr +/* 80101048 000FDFA8 4E 80 00 20 */ blr .global "clear__Q24rstl78reserved_vector>,3>Fv" "clear__Q24rstl78reserved_vector>,3>Fv": @@ -2646,7 +2646,7 @@ lbl_801010D4: /* 801010DC 000FE03C 80 01 00 24 */ lwz r0, 0x24(r1) /* 801010E0 000FE040 7C 08 03 A6 */ mtlr r0 /* 801010E4 000FE044 38 21 00 20 */ addi r1, r1, 0x20 -/* 801010E8 000FE048 4E 80 00 20 */ blr +/* 801010E8 000FE048 4E 80 00 20 */ blr .global "__ct__12CScriptWaterFR13CStateManager9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC9CVector3fRC6CAABoxRC11CDamageInfoRC9CVector3fUibbUiUiUiUiUiUiUiRC9CVector3fffbQ211CFluidPlane10EFluidTypebfRC14CFluidUVMotionffffffffRC6CColorRC6CColorUiUiUiUiUiiiiifUiffffffffRC6CColorUifffUiUibiiPCUi" "__ct__12CScriptWaterFR13CStateManager9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC9CVector3fRC6CAABoxRC11CDamageInfoRC9CVector3fUibbUiUiUiUiUiUiUiRC9CVector3fffbQ211CFluidPlane10EFluidTypebfRC14CFluidUVMotionffffffffRC6CColorRC6CColorUiUiUiUiUiiiiifUiffffffffRC6CColorUifffUiUibiiPCUi": @@ -2964,7 +2964,7 @@ lbl_801015AC: /* 801015BC 000FE51C 38 80 00 01 */ li r4, 1 /* 801015C0 000FE520 81 8C 00 08 */ lwz r12, 8(r12) /* 801015C4 000FE524 7D 89 03 A6 */ mtctr r12 -/* 801015C8 000FE528 4E 80 04 21 */ bctrl +/* 801015C8 000FE528 4E 80 04 21 */ bctrl lbl_801015CC: /* 801015CC 000FE52C 91 CF 01 B4 */ stw r14, 0x1b4(r15) /* 801015D0 000FE530 80 61 03 A8 */ lwz r3, 0x3a8(r1) @@ -3092,7 +3092,7 @@ lbl_8010176C: /* 801017A0 000FE700 81 84 00 00 */ lwz r12, 0(r4) /* 801017A4 000FE704 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801017A8 000FE708 7D 89 03 A6 */ mtctr r12 -/* 801017AC 000FE70C 4E 80 04 21 */ bctrl +/* 801017AC 000FE70C 4E 80 04 21 */ bctrl /* 801017B0 000FE710 38 61 00 A4 */ addi r3, r1, 0xa4 /* 801017B4 000FE714 38 81 00 AC */ addi r4, r1, 0xac /* 801017B8 000FE718 48 23 F6 F1 */ bl __ct__6CTokenFRC6CToken @@ -3152,7 +3152,7 @@ lbl_80101854: /* 80101880 000FE7E0 81 84 00 00 */ lwz r12, 0(r4) /* 80101884 000FE7E4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80101888 000FE7E8 7D 89 03 A6 */ mtctr r12 -/* 8010188C 000FE7EC 4E 80 04 21 */ bctrl +/* 8010188C 000FE7EC 4E 80 04 21 */ bctrl /* 80101890 000FE7F0 38 61 00 8C */ addi r3, r1, 0x8c /* 80101894 000FE7F4 38 81 00 94 */ addi r4, r1, 0x94 /* 80101898 000FE7F8 48 23 F6 11 */ bl __ct__6CTokenFRC6CToken @@ -3212,7 +3212,7 @@ lbl_80101934: /* 80101960 000FE8C0 81 84 00 00 */ lwz r12, 0(r4) /* 80101964 000FE8C4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80101968 000FE8C8 7D 89 03 A6 */ mtctr r12 -/* 8010196C 000FE8CC 4E 80 04 21 */ bctrl +/* 8010196C 000FE8CC 4E 80 04 21 */ bctrl /* 80101970 000FE8D0 38 61 00 74 */ addi r3, r1, 0x74 /* 80101974 000FE8D4 38 81 00 7C */ addi r4, r1, 0x7c /* 80101978 000FE8D8 48 23 F5 31 */ bl __ct__6CTokenFRC6CToken @@ -3272,7 +3272,7 @@ lbl_80101A14: /* 80101A40 000FE9A0 81 84 00 00 */ lwz r12, 0(r4) /* 80101A44 000FE9A4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80101A48 000FE9A8 7D 89 03 A6 */ mtctr r12 -/* 80101A4C 000FE9AC 4E 80 04 21 */ bctrl +/* 80101A4C 000FE9AC 4E 80 04 21 */ bctrl /* 80101A50 000FE9B0 38 61 00 5C */ addi r3, r1, 0x5c /* 80101A54 000FE9B4 38 81 00 64 */ addi r4, r1, 0x64 /* 80101A58 000FE9B8 48 23 F4 51 */ bl __ct__6CTokenFRC6CToken @@ -3332,7 +3332,7 @@ lbl_80101AF4: /* 80101B20 000FEA80 81 84 00 00 */ lwz r12, 0(r4) /* 80101B24 000FEA84 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80101B28 000FEA88 7D 89 03 A6 */ mtctr r12 -/* 80101B2C 000FEA8C 4E 80 04 21 */ bctrl +/* 80101B2C 000FEA8C 4E 80 04 21 */ bctrl /* 80101B30 000FEA90 38 61 00 44 */ addi r3, r1, 0x44 /* 80101B34 000FEA94 38 81 00 4C */ addi r4, r1, 0x4c /* 80101B38 000FEA98 48 23 F3 71 */ bl __ct__6CTokenFRC6CToken @@ -3462,7 +3462,7 @@ lbl_80101CBC: /* 80101D08 000FEC68 81 8F 00 00 */ lwz r12, 0(r15) /* 80101D0C 000FEC6C 81 8C 00 30 */ lwz r12, 0x30(r12) /* 80101D10 000FEC70 7D 89 03 A6 */ mtctr r12 -/* 80101D14 000FEC74 4E 80 04 21 */ bctrl +/* 80101D14 000FEC74 4E 80 04 21 */ bctrl /* 80101D18 000FEC78 88 01 02 E3 */ lbz r0, 0x2e3(r1) /* 80101D1C 000FEC7C 28 00 00 00 */ cmplwi r0, 0 /* 80101D20 000FEC80 38 00 00 01 */ li r0, 1 @@ -3525,7 +3525,7 @@ lbl_80101D58: /* 80101DFC 000FED5C 80 01 02 D4 */ lwz r0, 0x2d4(r1) /* 80101E00 000FED60 7C 08 03 A6 */ mtlr r0 /* 80101E04 000FED64 38 21 02 D0 */ addi r1, r1, 0x2d0 -/* 80101E08 000FED68 4E 80 00 20 */ blr +/* 80101E08 000FED68 4E 80 00 20 */ blr .global sub_80101e0c sub_80101e0c: @@ -3561,7 +3561,7 @@ lbl_80101E60: /* 80101E78 000FEDD8 80 01 00 14 */ lwz r0, 0x14(r1) /* 80101E7C 000FEDDC 7C 08 03 A6 */ mtlr r0 /* 80101E80 000FEDE0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80101E84 000FEDE4 4E 80 00 20 */ blr +/* 80101E84 000FEDE4 4E 80 00 20 */ blr .global sub_80101e88 sub_80101e88: @@ -3597,4 +3597,4 @@ lbl_80101EE0: /* 80101EF0 000FEE50 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80101EF4 000FEE54 7C 08 03 A6 */ mtlr r0 /* 80101EF8 000FEE58 38 21 00 20 */ addi r1, r1, 0x20 -/* 80101EFC 000FEE5C 4E 80 00 20 */ blr +/* 80101EFC 000FEE5C 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/ScriptObjects/CScriptWaypoint.s b/asm/MetroidPrime/ScriptObjects/CScriptWaypoint.s index 08e06ea4..7e8b910e 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptWaypoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptWaypoint.s @@ -55,19 +55,19 @@ Accept__15CScriptWaypointFR8IVisitor: /* 80077084 00073FE4 7C 04 03 78 */ mr r4, r0 /* 80077088 00073FE8 81 8C 00 D8 */ lwz r12, 0xd8(r12) /* 8007708C 00073FEC 7D 89 03 A6 */ mtctr r12 -/* 80077090 00073FF0 4E 80 04 21 */ bctrl +/* 80077090 00073FF0 4E 80 04 21 */ bctrl /* 80077094 00073FF4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80077098 00073FF8 7C 08 03 A6 */ mtlr r0 /* 8007709C 00073FFC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800770A0 00074000 4E 80 00 20 */ blr +/* 800770A0 00074000 4E 80 00 20 */ blr .global Render__15CScriptWaypointCFRC13CStateManager Render__15CScriptWaypointCFRC13CStateManager: -/* 800770A4 00074004 4E 80 00 20 */ blr +/* 800770A4 00074004 4E 80 00 20 */ blr .global AddToRenderer__15CScriptWaypointCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__15CScriptWaypointCFRC14CFrustumPlanesRC13CStateManager: -/* 800770A8 00074008 4E 80 00 20 */ blr +/* 800770A8 00074008 4E 80 00 20 */ blr .global FollowWaypoint__15CScriptWaypointCFR13CStateManager FollowWaypoint__15CScriptWaypointCFR13CStateManager: @@ -108,7 +108,7 @@ lbl_80077120: /* 80077124 00074084 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80077128 00074088 7C 08 03 A6 */ mtlr r0 /* 8007712C 0007408C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80077130 00074090 4E 80 00 20 */ blr +/* 80077130 00074090 4E 80 00 20 */ blr .global NextWaypoint__15CScriptWaypointCFR13CStateManager NextWaypoint__15CScriptWaypointCFR13CStateManager: @@ -254,7 +254,7 @@ lbl_80077324: /* 80077328 00074288 80 01 00 64 */ lwz r0, 0x64(r1) /* 8007732C 0007428C 7C 08 03 A6 */ mtlr r0 /* 80077330 00074290 38 21 00 60 */ addi r1, r1, 0x60 -/* 80077334 00074294 4E 80 00 20 */ blr +/* 80077334 00074294 4E 80 00 20 */ blr .global AcceptScriptMsg__15CScriptWaypointF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__15CScriptWaypointF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -290,7 +290,7 @@ lbl_80077398: /* 800773A4 00074304 83 A1 00 14 */ lwz r29, 0x14(r1) /* 800773A8 00074308 7C 08 03 A6 */ mtlr r0 /* 800773AC 0007430C 38 21 00 20 */ addi r1, r1, 0x20 -/* 800773B0 00074310 4E 80 00 20 */ blr +/* 800773B0 00074310 4E 80 00 20 */ blr .global __dt__15CScriptWaypointFv __dt__15CScriptWaypointFv: @@ -318,7 +318,7 @@ lbl_800773F8: /* 80077404 00074364 83 C1 00 08 */ lwz r30, 8(r1) /* 80077408 00074368 7C 08 03 A6 */ mtlr r0 /* 8007740C 0007436C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80077410 00074370 4E 80 00 20 */ blr +/* 80077410 00074370 4E 80 00 20 */ blr .global "__ct__15CScriptWaypointF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fbffiiiiiiUi" "__ct__15CScriptWaypointF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fbffiiiiiiUi": @@ -408,4 +408,4 @@ lbl_800773F8: /* 80077560 000744C0 80 01 01 24 */ lwz r0, 0x124(r1) /* 80077564 000744C4 7C 08 03 A6 */ mtlr r0 /* 80077568 000744C8 38 21 01 20 */ addi r1, r1, 0x120 -/* 8007756C 000744CC 4E 80 00 20 */ blr +/* 8007756C 000744CC 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.s b/asm/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.s index 6b57beae..fed99a8e 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.s @@ -87,7 +87,7 @@ lbl_801D6994: /* 801D6998 001D38F8 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 801D699C 001D38FC 7C 08 03 A6 */ mtlr r0 /* 801D69A0 001D3900 38 21 00 30 */ addi r1, r1, 0x30 -/* 801D69A4 001D3904 4E 80 00 20 */ blr +/* 801D69A4 001D3904 4E 80 00 20 */ blr .global AcceptScriptMsg__22CScriptWorldTeleporterF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__22CScriptWorldTeleporterF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -193,7 +193,7 @@ lbl_801D6AFC: /* 801D6B1C 001D3A7C 80 01 00 34 */ lwz r0, 0x34(r1) /* 801D6B20 001D3A80 7C 08 03 A6 */ mtlr r0 /* 801D6B24 001D3A84 38 21 00 30 */ addi r1, r1, 0x30 -/* 801D6B28 001D3A88 4E 80 00 20 */ blr +/* 801D6B28 001D3A88 4E 80 00 20 */ blr .global Accept__22CScriptWorldTeleporterFR8IVisitor Accept__22CScriptWorldTeleporterFR8IVisitor: @@ -206,11 +206,11 @@ Accept__22CScriptWorldTeleporterFR8IVisitor: /* 801D6B44 001D3AA4 7C 04 03 78 */ mr r4, r0 /* 801D6B48 001D3AA8 81 8C 00 24 */ lwz r12, 0x24(r12) /* 801D6B4C 001D3AAC 7D 89 03 A6 */ mtctr r12 -/* 801D6B50 001D3AB0 4E 80 04 21 */ bctrl +/* 801D6B50 001D3AB0 4E 80 04 21 */ bctrl /* 801D6B54 001D3AB4 80 01 00 14 */ lwz r0, 0x14(r1) /* 801D6B58 001D3AB8 7C 08 03 A6 */ mtlr r0 /* 801D6B5C 001D3ABC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D6B60 001D3AC0 4E 80 00 20 */ blr +/* 801D6B60 001D3AC0 4E 80 00 20 */ blr .global __dt__22CScriptWorldTeleporterFv __dt__22CScriptWorldTeleporterFv: @@ -238,7 +238,7 @@ lbl_801D6BA8: /* 801D6BB4 001D3B14 83 C1 00 08 */ lwz r30, 8(r1) /* 801D6BB8 001D3B18 7C 08 03 A6 */ mtlr r0 /* 801D6BBC 001D3B1C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D6BC0 001D3B20 4E 80 00 20 */ blr +/* 801D6BC0 001D3B20 4E 80 00 20 */ blr .global "__ct__22CScriptWorldTeleporterF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfobUiUiUiUiRC9CVector3fUiRC9CVector3fUiRC9CVector3fb" "__ct__22CScriptWorldTeleporterF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfobUiUiUiUiRC9CVector3fUiRC9CVector3fUiRC9CVector3fb": @@ -336,7 +336,7 @@ lbl_801D6BA8: /* 801D6D30 001D3C90 80 01 00 74 */ lwz r0, 0x74(r1) /* 801D6D34 001D3C94 7C 08 03 A6 */ mtlr r0 /* 801D6D38 001D3C98 38 21 00 70 */ addi r1, r1, 0x70 -/* 801D6D3C 001D3C9C 4E 80 00 20 */ blr +/* 801D6D3C 001D3C9C 4E 80 00 20 */ blr .global "__ct__22CScriptWorldTeleporterF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" "__ct__22CScriptWorldTeleporterF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>": @@ -423,7 +423,7 @@ lbl_801D6BA8: /* 801D6E80 001D3DE0 80 01 00 54 */ lwz r0, 0x54(r1) /* 801D6E84 001D3DE4 7C 08 03 A6 */ mtlr r0 /* 801D6E88 001D3DE8 38 21 00 50 */ addi r1, r1, 0x50 -/* 801D6E8C 001D3DEC 4E 80 00 20 */ blr +/* 801D6E8C 001D3DEC 4E 80 00 20 */ blr .global "__ct__22CScriptWorldTeleporterF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfobUiUi" "__ct__22CScriptWorldTeleporterF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfobUiUi": diff --git a/asm/MetroidPrime/TCastTo.s b/asm/MetroidPrime/TCastTo.s index 6380eec4..cbcccda1 100644 --- a/asm/MetroidPrime/TCastTo.s +++ b/asm/MetroidPrime/TCastTo.s @@ -3409,340 +3409,340 @@ lbl_803DF03C: .global "Visit__20TCastToPtr<7CWeapon>FR7CWeapon" "Visit__20TCastToPtr<7CWeapon>FR7CWeapon": /* 800A55FC 000A255C 90 83 00 04 */ stw r4, 4(r3) -/* 800A5600 000A2560 4E 80 00 20 */ blr +/* 800A5600 000A2560 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR17CWallCrawlerSwarm" "Visit__20TCastToPtr<7CWeapon>FR17CWallCrawlerSwarm": /* 800A5604 000A2564 38 00 00 00 */ li r0, 0 /* 800A5608 000A2568 90 03 00 04 */ stw r0, 4(r3) -/* 800A560C 000A256C 4E 80 00 20 */ blr +/* 800A560C 000A256C 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR20CScriptSpindleCamera" "Visit__20TCastToPtr<7CWeapon>FR20CScriptSpindleCamera": /* 800A5610 000A2570 38 00 00 00 */ li r0, 0 /* 800A5614 000A2574 90 03 00 04 */ stw r0, 4(r3) -/* 800A5618 000A2578 4E 80 00 20 */ blr +/* 800A5618 000A2578 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR15CSnakeWeedSwarm" "Visit__20TCastToPtr<7CWeapon>FR15CSnakeWeedSwarm": /* 800A561C 000A257C 38 00 00 00 */ li r0, 0 /* 800A5620 000A2580 90 03 00 04 */ stw r0, 4(r3) -/* 800A5624 000A2584 4E 80 00 20 */ blr +/* 800A5624 000A2584 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR15CScriptWaypoint" "Visit__20TCastToPtr<7CWeapon>FR15CScriptWaypoint": /* 800A5628 000A2588 38 00 00 00 */ li r0, 0 /* 800A562C 000A258C 90 03 00 04 */ stw r0, 4(r3) -/* 800A5630 000A2590 4E 80 00 20 */ blr +/* 800A5630 000A2590 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR12CScriptWater" "Visit__20TCastToPtr<7CWeapon>FR12CScriptWater": /* 800A5634 000A2594 38 00 00 00 */ li r0, 0 /* 800A5638 000A2598 90 03 00 04 */ stw r0, 4(r3) -/* 800A563C 000A259C 4E 80 00 20 */ blr +/* 800A563C 000A259C 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR17CScriptVisorFlare" "Visit__20TCastToPtr<7CWeapon>FR17CScriptVisorFlare": /* 800A5640 000A25A0 38 00 00 00 */ li r0, 0 /* 800A5644 000A25A4 90 03 00 04 */ stw r0, 4(r3) -/* 800A5648 000A25A8 4E 80 00 20 */ blr +/* 800A5648 000A25A8 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR14CScriptTrigger" "Visit__20TCastToPtr<7CWeapon>FR14CScriptTrigger": /* 800A564C 000A25AC 38 00 00 00 */ li r0, 0 /* 800A5650 000A25B0 90 03 00 04 */ stw r0, 4(r3) -/* 800A5654 000A25B4 4E 80 00 20 */ blr +/* 800A5654 000A25B4 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR12CScriptTimer" "Visit__20TCastToPtr<7CWeapon>FR12CScriptTimer": /* 800A5658 000A25B8 38 00 00 00 */ li r0, 0 /* 800A565C 000A25BC 90 03 00 04 */ stw r0, 4(r3) -/* 800A5660 000A25C0 4E 80 00 20 */ blr +/* 800A5660 000A25C0 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR10CTeamAiMgr" "Visit__20TCastToPtr<7CWeapon>FR10CTeamAiMgr": /* 800A5664 000A25C4 38 00 00 00 */ li r0, 0 /* 800A5668 000A25C8 90 03 00 04 */ stw r0, 4(r3) -/* 800A566C 000A25CC 4E 80 00 20 */ blr +/* 800A566C 000A25CC 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR21CScriptTargetingPoint" "Visit__20TCastToPtr<7CWeapon>FR21CScriptTargetingPoint": /* 800A5670 000A25D0 38 00 00 00 */ li r0, 0 /* 800A5674 000A25D4 90 03 00 04 */ stw r0, 4(r3) -/* 800A5678 000A25D8 4E 80 00 20 */ blr +/* 800A5678 000A25D8 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR25CScriptSpiderBallWaypoint" "Visit__20TCastToPtr<7CWeapon>FR25CScriptSpiderBallWaypoint": /* 800A567C 000A25DC 38 00 00 00 */ li r0, 0 /* 800A5680 000A25E0 90 03 00 04 */ stw r0, 4(r3) -/* 800A5684 000A25E4 4E 80 00 20 */ blr +/* 800A5684 000A25E4 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR34CScriptSpiderBallAttractionSurface" "Visit__20TCastToPtr<7CWeapon>FR34CScriptSpiderBallAttractionSurface": /* 800A5688 000A25E8 38 00 00 00 */ li r0, 0 /* 800A568C 000A25EC 90 03 00 04 */ stw r0, 4(r3) -/* 800A5690 000A25F0 4E 80 00 20 */ blr +/* 800A5690 000A25F0 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR22CScriptSpecialFunction" "Visit__20TCastToPtr<7CWeapon>FR22CScriptSpecialFunction": /* 800A5694 000A25F4 38 00 00 00 */ li r0, 0 /* 800A5698 000A25F8 90 03 00 04 */ stw r0, 4(r3) -/* 800A569C 000A25FC 4E 80 00 20 */ blr +/* 800A569C 000A25FC 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR17CScriptSpawnPoint" "Visit__20TCastToPtr<7CWeapon>FR17CScriptSpawnPoint": /* 800A56A0 000A2600 38 00 00 00 */ li r0, 0 /* 800A56A4 000A2604 90 03 00 04 */ stw r0, 4(r3) -/* 800A56A8 000A2608 4E 80 00 20 */ blr +/* 800A56A8 000A2608 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR12CScriptSound" "Visit__20TCastToPtr<7CWeapon>FR12CScriptSound": /* 800A56AC 000A260C 38 00 00 00 */ li r0, 0 /* 800A56B0 000A2610 90 03 00 04 */ stw r0, 4(r3) -/* 800A56B4 000A2614 4E 80 00 20 */ blr +/* 800A56B4 000A2614 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR20CScriptRoomAcoustics" "Visit__20TCastToPtr<7CWeapon>FR20CScriptRoomAcoustics": /* 800A56B8 000A2618 38 00 00 00 */ li r0, 0 /* 800A56BC 000A261C 90 03 00 04 */ stw r0, 4(r3) -/* 800A56C0 000A2620 4E 80 00 20 */ blr +/* 800A56C0 000A2620 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR22CScriptPointOfinterest" "Visit__20TCastToPtr<7CWeapon>FR22CScriptPointOfinterest": /* 800A56C4 000A2624 38 00 00 00 */ li r0, 0 /* 800A56C8 000A2628 90 03 00 04 */ stw r0, 4(r3) -/* 800A56CC 000A262C 4E 80 00 20 */ blr +/* 800A56CC 000A262C 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR17CScriptPlayerHint" "Visit__20TCastToPtr<7CWeapon>FR17CScriptPlayerHint": /* 800A56D0 000A2630 38 00 00 00 */ li r0, 0 /* 800A56D4 000A2634 90 03 00 04 */ stw r0, 4(r3) -/* 800A56D8 000A2638 4E 80 00 20 */ blr +/* 800A56D8 000A2638 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR15CScriptPlatform" "Visit__20TCastToPtr<7CWeapon>FR15CScriptPlatform": /* 800A56DC 000A263C 38 00 00 00 */ li r0, 0 /* 800A56E0 000A2640 90 03 00 04 */ stw r0, 4(r3) -/* 800A56E4 000A2644 4E 80 00 20 */ blr +/* 800A56E4 000A2644 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR13CScriptPickup" "Visit__20TCastToPtr<7CWeapon>FR13CScriptPickup": /* 800A56E8 000A2648 38 00 00 00 */ li r0, 0 /* 800A56EC 000A264C 90 03 00 04 */ stw r0, 4(r3) -/* 800A56F0 000A2650 4E 80 00 20 */ blr +/* 800A56F0 000A2650 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR15CScriptMazeNode" "Visit__20TCastToPtr<7CWeapon>FR15CScriptMazeNode": /* 800A56F4 000A2654 38 00 00 00 */ li r0, 0 /* 800A56F8 000A2658 90 03 00 04 */ stw r0, 4(r3) -/* 800A56FC 000A265C 4E 80 00 20 */ blr +/* 800A56FC 000A265C 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR16CScriptGunTurret" "Visit__20TCastToPtr<7CWeapon>FR16CScriptGunTurret": /* 800A5700 000A2660 38 00 00 00 */ li r0, 0 /* 800A5704 000A2664 90 03 00 04 */ stw r0, 4(r3) -/* 800A5708 000A2668 4E 80 00 20 */ blr +/* 800A5708 000A2668 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR19CScriptGrapplePoint" "Visit__20TCastToPtr<7CWeapon>FR19CScriptGrapplePoint": /* 800A570C 000A266C 38 00 00 00 */ li r0, 0 /* 800A5710 000A2670 90 03 00 04 */ stw r0, 4(r3) -/* 800A5714 000A2674 4E 80 00 20 */ blr +/* 800A5714 000A2674 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR13CScriptEffect" "Visit__20TCastToPtr<7CWeapon>FR13CScriptEffect": /* 800A5718 000A2678 38 00 00 00 */ li r0, 0 /* 800A571C 000A267C 90 03 00 04 */ stw r0, 4(r3) -/* 800A5720 000A2680 4E 80 00 20 */ blr +/* 800A5720 000A2680 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR11CScriptDoor" "Visit__20TCastToPtr<7CWeapon>FR11CScriptDoor": /* 800A5724 000A2684 38 00 00 00 */ li r0, 0 /* 800A5728 000A2688 90 03 00 04 */ stw r0, 4(r3) -/* 800A572C 000A268C 4E 80 00 20 */ blr +/* 800A572C 000A268C 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR11CScriptDock" "Visit__20TCastToPtr<7CWeapon>FR11CScriptDock": /* 800A5730 000A2690 38 00 00 00 */ li r0, 0 /* 800A5734 000A2694 90 03 00 04 */ stw r0, 4(r3) -/* 800A5738 000A2698 4E 80 00 20 */ blr +/* 800A5738 000A2698 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR18CScriptDistanceFog" "Visit__20TCastToPtr<7CWeapon>FR18CScriptDistanceFog": /* 800A573C 000A269C 38 00 00 00 */ li r0, 0 /* 800A5740 000A26A0 90 03 00 04 */ stw r0, 4(r3) -/* 800A5744 000A26A4 4E 80 00 20 */ blr +/* 800A5744 000A26A4 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR26CScriptDebugCameraWaypoint" "Visit__20TCastToPtr<7CWeapon>FR26CScriptDebugCameraWaypoint": /* 800A5748 000A26A8 38 00 00 00 */ li r0, 0 /* 800A574C 000A26AC 90 03 00 04 */ stw r0, 4(r3) -/* 800A5750 000A26B0 4E 80 00 20 */ blr +/* 800A5750 000A26B0 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR17CScriptCoverPoint" "Visit__20TCastToPtr<7CWeapon>FR17CScriptCoverPoint": /* 800A5754 000A26B4 38 00 00 00 */ li r0, 0 /* 800A5758 000A26B8 90 03 00 04 */ stw r0, 4(r3) -/* 800A575C 000A26BC 4E 80 00 20 */ blr +/* 800A575C 000A26BC 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR21CScriptCameraWaypoint" "Visit__20TCastToPtr<7CWeapon>FR21CScriptCameraWaypoint": /* 800A5760 000A26C0 38 00 00 00 */ li r0, 0 /* 800A5764 000A26C4 90 03 00 04 */ stw r0, 4(r3) -/* 800A5768 000A26C8 4E 80 00 20 */ blr +/* 800A5768 000A26C8 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR24CScriptCameraPitchVolume" "Visit__20TCastToPtr<7CWeapon>FR24CScriptCameraPitchVolume": /* 800A576C 000A26CC 38 00 00 00 */ li r0, 0 /* 800A5770 000A26D0 90 03 00 04 */ stw r0, 4(r3) -/* 800A5774 000A26D4 4E 80 00 20 */ blr +/* 800A5774 000A26D4 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR17CScriptCameraHint" "Visit__20TCastToPtr<7CWeapon>FR17CScriptCameraHint": /* 800A5778 000A26D8 38 00 00 00 */ li r0, 0 /* 800A577C 000A26DC 90 03 00 04 */ stw r0, 4(r3) -/* 800A5780 000A26E0 4E 80 00 20 */ blr +/* 800A5780 000A26E0 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR18CScriptAiJumpPoint" "Visit__20TCastToPtr<7CWeapon>FR18CScriptAiJumpPoint": /* 800A5784 000A26E4 38 00 00 00 */ li r0, 0 /* 800A5788 000A26E8 90 03 00 04 */ stw r0, 4(r3) -/* 800A578C 000A26EC 4E 80 00 20 */ blr +/* 800A578C 000A26EC 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR20CScriptActorKeyframe" "Visit__20TCastToPtr<7CWeapon>FR20CScriptActorKeyframe": /* 800A5790 000A26F0 38 00 00 00 */ li r0, 0 /* 800A5794 000A26F4 90 03 00 04 */ stw r0, 4(r3) -/* 800A5798 000A26F8 4E 80 00 20 */ blr +/* 800A5798 000A26F8 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR12CScriptActor" "Visit__20TCastToPtr<7CWeapon>FR12CScriptActor": /* 800A579C 000A26FC 38 00 00 00 */ li r0, 0 /* 800A57A0 000A2700 90 03 00 04 */ stw r0, 4(r3) -/* 800A57A4 000A2704 4E 80 00 20 */ blr +/* 800A57A4 000A2704 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR9CRepulsor" "Visit__20TCastToPtr<7CWeapon>FR9CRepulsor": /* 800A57A8 000A2708 38 00 00 00 */ li r0, 0 /* 800A57AC 000A270C 90 03 00 04 */ stw r0, 4(r3) -/* 800A57B0 000A2710 4E 80 00 20 */ blr +/* 800A57B0 000A2710 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR7CPlayer" "Visit__20TCastToPtr<7CWeapon>FR7CPlayer": /* 800A57B4 000A2714 38 00 00 00 */ li r0, 0 /* 800A57B8 000A2718 90 03 00 04 */ stw r0, 4(r3) -/* 800A57BC 000A271C 4E 80 00 20 */ blr +/* 800A57BC 000A271C 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR13CPhysicsActor" "Visit__20TCastToPtr<7CWeapon>FR13CPhysicsActor": /* 800A57C0 000A2720 38 00 00 00 */ li r0, 0 /* 800A57C4 000A2724 90 03 00 04 */ stw r0, 4(r3) -/* 800A57C8 000A2728 4E 80 00 20 */ blr +/* 800A57C8 000A2728 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR3CAi" "Visit__20TCastToPtr<7CWeapon>FR3CAi": /* 800A57CC 000A272C 38 00 00 00 */ li r0, 0 /* 800A57D0 000A2730 90 03 00 04 */ stw r0, 4(r3) -/* 800A57D4 000A2734 4E 80 00 20 */ blr +/* 800A57D4 000A2734 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR11CPathCamera" "Visit__20TCastToPtr<7CWeapon>FR11CPathCamera": /* 800A57D8 000A2738 38 00 00 00 */ li r0, 0 /* 800A57DC 000A273C 90 03 00 04 */ stw r0, 4(r3) -/* 800A57E0 000A2740 4E 80 00 20 */ blr +/* 800A57E0 000A2740 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR18CMetroidPrimeRelay" "Visit__20TCastToPtr<7CWeapon>FR18CMetroidPrimeRelay": /* 800A57E4 000A2744 38 00 00 00 */ li r0, 0 /* 800A57E8 000A2748 90 03 00 04 */ stw r0, 4(r3) -/* 800A57EC 000A274C 4E 80 00 20 */ blr +/* 800A57EC 000A274C 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR19CHUDBillboardEffect" "Visit__20TCastToPtr<7CWeapon>FR19CHUDBillboardEffect": /* 800A57F0 000A2750 38 00 00 00 */ li r0, 0 /* 800A57F4 000A2754 90 03 00 04 */ stw r0, 4(r3) -/* 800A57F8 000A2758 4E 80 00 20 */ blr +/* 800A57F8 000A2758 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR15CGameProjectile" "Visit__20TCastToPtr<7CWeapon>FR15CGameProjectile": /* 800A57FC 000A275C 90 83 00 04 */ stw r4, 4(r3) -/* 800A5800 000A2760 4E 80 00 20 */ blr +/* 800A5800 000A2760 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR10CGameLight" "Visit__20TCastToPtr<7CWeapon>FR10CGameLight": /* 800A5804 000A2764 38 00 00 00 */ li r0, 0 /* 800A5808 000A2768 90 03 00 04 */ stw r0, 4(r3) -/* 800A580C 000A276C 4E 80 00 20 */ blr +/* 800A580C 000A276C 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR11CGameCamera" "Visit__20TCastToPtr<7CWeapon>FR11CGameCamera": /* 800A5810 000A2770 38 00 00 00 */ li r0, 0 /* 800A5814 000A2774 90 03 00 04 */ stw r0, 4(r3) -/* 800A5818 000A2778 4E 80 00 20 */ blr +/* 800A5818 000A2778 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR10CFishCloud" "Visit__20TCastToPtr<7CWeapon>FR10CFishCloud": /* 800A581C 000A277C 38 00 00 00 */ li r0, 0 /* 800A5820 000A2780 90 03 00 04 */ stw r0, 4(r3) -/* 800A5824 000A2784 4E 80 00 20 */ blr +/* 800A5824 000A2784 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR18CFirstPersonCamera" "Visit__20TCastToPtr<7CWeapon>FR18CFirstPersonCamera": /* 800A5828 000A2788 38 00 00 00 */ li r0, 0 /* 800A582C 000A278C 90 03 00 04 */ stw r0, 4(r3) -/* 800A5830 000A2790 4E 80 00 20 */ blr +/* 800A5830 000A2790 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR10CExplosion" "Visit__20TCastToPtr<7CWeapon>FR10CExplosion": /* 800A5834 000A2794 38 00 00 00 */ li r0, 0 /* 800A5838 000A2798 90 03 00 04 */ stw r0, 4(r3) -/* 800A583C 000A279C 4E 80 00 20 */ blr +/* 800A583C 000A279C 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR7CEntity" "Visit__20TCastToPtr<7CWeapon>FR7CEntity": /* 800A5840 000A27A0 38 00 00 00 */ li r0, 0 /* 800A5844 000A27A4 90 03 00 04 */ stw r0, 4(r3) -/* 800A5848 000A27A8 4E 80 00 20 */ blr +/* 800A5848 000A27A8 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR17CEnergyProjectile" "Visit__20TCastToPtr<7CWeapon>FR17CEnergyProjectile": /* 800A584C 000A27AC 90 83 00 04 */ stw r4, 4(r3) -/* 800A5850 000A27B0 4E 80 00 20 */ blr +/* 800A5850 000A27B0 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR16CDestroyableRock" "Visit__20TCastToPtr<7CWeapon>FR16CDestroyableRock": /* 800A5854 000A27B4 38 00 00 00 */ li r0, 0 /* 800A5858 000A27B8 90 03 00 04 */ stw r0, 4(r3) -/* 800A585C 000A27BC 4E 80 00 20 */ blr +/* 800A585C 000A27BC 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR15CCollisionActor" "Visit__20TCastToPtr<7CWeapon>FR15CCollisionActor": /* 800A5860 000A27C0 38 00 00 00 */ li r0, 0 /* 800A5864 000A27C4 90 03 00 04 */ stw r0, 4(r3) -/* 800A5868 000A27C8 4E 80 00 20 */ blr +/* 800A5868 000A27C8 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR16CCinematicCamera" "Visit__20TCastToPtr<7CWeapon>FR16CCinematicCamera": /* 800A586C 000A27CC 38 00 00 00 */ li r0, 0 /* 800A5870 000A27D0 90 03 00 04 */ stw r0, 4(r3) -/* 800A5874 000A27D4 4E 80 00 20 */ blr +/* 800A5874 000A27D4 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR5CBomb" "Visit__20TCastToPtr<7CWeapon>FR5CBomb": /* 800A5878 000A27D8 90 83 00 04 */ stw r4, 4(r3) -/* 800A587C 000A27DC 4E 80 00 20 */ blr +/* 800A587C 000A27DC 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR11CBallCamera" "Visit__20TCastToPtr<7CWeapon>FR11CBallCamera": /* 800A5880 000A27E0 38 00 00 00 */ li r0, 0 /* 800A5884 000A27E4 90 03 00 04 */ stw r0, 4(r3) -/* 800A5888 000A27E8 4E 80 00 20 */ blr +/* 800A5888 000A27E8 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CWeapon>FR6CActor" "Visit__20TCastToPtr<7CWeapon>FR6CActor": /* 800A588C 000A27EC 38 00 00 00 */ li r0, 0 /* 800A5890 000A27F0 90 03 00 04 */ stw r0, 4(r3) -/* 800A5894 000A27F4 4E 80 00 20 */ blr +/* 800A5894 000A27F4 4E 80 00 20 */ blr .global "__ct__20TCastToPtr<7CWeapon>FP7CEntity" "__ct__20TCastToPtr<7CWeapon>FP7CEntity": @@ -3766,14 +3766,14 @@ lbl_803DF03C: /* 800A58DC 000A283C 81 83 00 00 */ lwz r12, 0(r3) /* 800A58E0 000A2840 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800A58E4 000A2844 7D 89 03 A6 */ mtctr r12 -/* 800A58E8 000A2848 4E 80 04 21 */ bctrl +/* 800A58E8 000A2848 4E 80 04 21 */ bctrl lbl_800A58EC: /* 800A58EC 000A284C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800A58F0 000A2850 7F E3 FB 78 */ mr r3, r31 /* 800A58F4 000A2854 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800A58F8 000A2858 7C 08 03 A6 */ mtlr r0 /* 800A58FC 000A285C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A5900 000A2860 4E 80 00 20 */ blr +/* 800A5900 000A2860 4E 80 00 20 */ blr .global "__ct__20TCastToPtr<7CWeapon>FR7CEntity" "__ct__20TCastToPtr<7CWeapon>FR7CEntity": @@ -3795,354 +3795,354 @@ lbl_800A58EC: /* 800A5940 000A28A0 81 83 00 00 */ lwz r12, 0(r3) /* 800A5944 000A28A4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800A5948 000A28A8 7D 89 03 A6 */ mtctr r12 -/* 800A594C 000A28AC 4E 80 04 21 */ bctrl +/* 800A594C 000A28AC 4E 80 04 21 */ bctrl /* 800A5950 000A28B0 80 01 00 14 */ lwz r0, 0x14(r1) /* 800A5954 000A28B4 7F E3 FB 78 */ mr r3, r31 /* 800A5958 000A28B8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800A595C 000A28BC 7C 08 03 A6 */ mtlr r0 /* 800A5960 000A28C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A5964 000A28C4 4E 80 00 20 */ blr +/* 800A5964 000A28C4 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR7CWeapon" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR7CWeapon": /* 800A5968 000A28C8 38 00 00 00 */ li r0, 0 /* 800A596C 000A28CC 90 03 00 04 */ stw r0, 4(r3) -/* 800A5970 000A28D0 4E 80 00 20 */ blr +/* 800A5970 000A28D0 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR17CWallCrawlerSwarm" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR17CWallCrawlerSwarm": /* 800A5974 000A28D4 90 83 00 04 */ stw r4, 4(r3) -/* 800A5978 000A28D8 4E 80 00 20 */ blr +/* 800A5978 000A28D8 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR20CScriptSpindleCamera" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR20CScriptSpindleCamera": /* 800A597C 000A28DC 38 00 00 00 */ li r0, 0 /* 800A5980 000A28E0 90 03 00 04 */ stw r0, 4(r3) -/* 800A5984 000A28E4 4E 80 00 20 */ blr +/* 800A5984 000A28E4 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR15CSnakeWeedSwarm" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR15CSnakeWeedSwarm": /* 800A5988 000A28E8 38 00 00 00 */ li r0, 0 /* 800A598C 000A28EC 90 03 00 04 */ stw r0, 4(r3) -/* 800A5990 000A28F0 4E 80 00 20 */ blr +/* 800A5990 000A28F0 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR15CScriptWaypoint" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR15CScriptWaypoint": /* 800A5994 000A28F4 38 00 00 00 */ li r0, 0 /* 800A5998 000A28F8 90 03 00 04 */ stw r0, 4(r3) -/* 800A599C 000A28FC 4E 80 00 20 */ blr +/* 800A599C 000A28FC 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR12CScriptWater" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR12CScriptWater": /* 800A59A0 000A2900 38 00 00 00 */ li r0, 0 /* 800A59A4 000A2904 90 03 00 04 */ stw r0, 4(r3) -/* 800A59A8 000A2908 4E 80 00 20 */ blr +/* 800A59A8 000A2908 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR17CScriptVisorFlare" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR17CScriptVisorFlare": /* 800A59AC 000A290C 38 00 00 00 */ li r0, 0 /* 800A59B0 000A2910 90 03 00 04 */ stw r0, 4(r3) -/* 800A59B4 000A2914 4E 80 00 20 */ blr +/* 800A59B4 000A2914 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR14CScriptTrigger" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR14CScriptTrigger": /* 800A59B8 000A2918 38 00 00 00 */ li r0, 0 /* 800A59BC 000A291C 90 03 00 04 */ stw r0, 4(r3) -/* 800A59C0 000A2920 4E 80 00 20 */ blr +/* 800A59C0 000A2920 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR12CScriptTimer" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR12CScriptTimer": /* 800A59C4 000A2924 38 00 00 00 */ li r0, 0 /* 800A59C8 000A2928 90 03 00 04 */ stw r0, 4(r3) -/* 800A59CC 000A292C 4E 80 00 20 */ blr +/* 800A59CC 000A292C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR10CTeamAiMgr" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR10CTeamAiMgr": /* 800A59D0 000A2930 38 00 00 00 */ li r0, 0 /* 800A59D4 000A2934 90 03 00 04 */ stw r0, 4(r3) -/* 800A59D8 000A2938 4E 80 00 20 */ blr +/* 800A59D8 000A2938 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR21CScriptTargetingPoint" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR21CScriptTargetingPoint": /* 800A59DC 000A293C 38 00 00 00 */ li r0, 0 /* 800A59E0 000A2940 90 03 00 04 */ stw r0, 4(r3) -/* 800A59E4 000A2944 4E 80 00 20 */ blr +/* 800A59E4 000A2944 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR25CScriptSpiderBallWaypoint" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR25CScriptSpiderBallWaypoint": /* 800A59E8 000A2948 38 00 00 00 */ li r0, 0 /* 800A59EC 000A294C 90 03 00 04 */ stw r0, 4(r3) -/* 800A59F0 000A2950 4E 80 00 20 */ blr +/* 800A59F0 000A2950 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR34CScriptSpiderBallAttractionSurface" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR34CScriptSpiderBallAttractionSurface": /* 800A59F4 000A2954 38 00 00 00 */ li r0, 0 /* 800A59F8 000A2958 90 03 00 04 */ stw r0, 4(r3) -/* 800A59FC 000A295C 4E 80 00 20 */ blr +/* 800A59FC 000A295C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR22CScriptSpecialFunction" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR22CScriptSpecialFunction": /* 800A5A00 000A2960 38 00 00 00 */ li r0, 0 /* 800A5A04 000A2964 90 03 00 04 */ stw r0, 4(r3) -/* 800A5A08 000A2968 4E 80 00 20 */ blr +/* 800A5A08 000A2968 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR17CScriptSpawnPoint" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR17CScriptSpawnPoint": /* 800A5A0C 000A296C 38 00 00 00 */ li r0, 0 /* 800A5A10 000A2970 90 03 00 04 */ stw r0, 4(r3) -/* 800A5A14 000A2974 4E 80 00 20 */ blr +/* 800A5A14 000A2974 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR12CScriptSound" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR12CScriptSound": /* 800A5A18 000A2978 38 00 00 00 */ li r0, 0 /* 800A5A1C 000A297C 90 03 00 04 */ stw r0, 4(r3) -/* 800A5A20 000A2980 4E 80 00 20 */ blr +/* 800A5A20 000A2980 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR20CScriptRoomAcoustics" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR20CScriptRoomAcoustics": /* 800A5A24 000A2984 38 00 00 00 */ li r0, 0 /* 800A5A28 000A2988 90 03 00 04 */ stw r0, 4(r3) -/* 800A5A2C 000A298C 4E 80 00 20 */ blr +/* 800A5A2C 000A298C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR22CScriptPointOfinterest" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR22CScriptPointOfinterest": /* 800A5A30 000A2990 38 00 00 00 */ li r0, 0 /* 800A5A34 000A2994 90 03 00 04 */ stw r0, 4(r3) -/* 800A5A38 000A2998 4E 80 00 20 */ blr +/* 800A5A38 000A2998 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR17CScriptPlayerHint" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR17CScriptPlayerHint": /* 800A5A3C 000A299C 38 00 00 00 */ li r0, 0 /* 800A5A40 000A29A0 90 03 00 04 */ stw r0, 4(r3) -/* 800A5A44 000A29A4 4E 80 00 20 */ blr +/* 800A5A44 000A29A4 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR15CScriptPlatform" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR15CScriptPlatform": /* 800A5A48 000A29A8 38 00 00 00 */ li r0, 0 /* 800A5A4C 000A29AC 90 03 00 04 */ stw r0, 4(r3) -/* 800A5A50 000A29B0 4E 80 00 20 */ blr +/* 800A5A50 000A29B0 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR13CScriptPickup" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR13CScriptPickup": /* 800A5A54 000A29B4 38 00 00 00 */ li r0, 0 /* 800A5A58 000A29B8 90 03 00 04 */ stw r0, 4(r3) -/* 800A5A5C 000A29BC 4E 80 00 20 */ blr +/* 800A5A5C 000A29BC 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR15CScriptMazeNode" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR15CScriptMazeNode": /* 800A5A60 000A29C0 38 00 00 00 */ li r0, 0 /* 800A5A64 000A29C4 90 03 00 04 */ stw r0, 4(r3) -/* 800A5A68 000A29C8 4E 80 00 20 */ blr +/* 800A5A68 000A29C8 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR16CScriptGunTurret" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR16CScriptGunTurret": /* 800A5A6C 000A29CC 38 00 00 00 */ li r0, 0 /* 800A5A70 000A29D0 90 03 00 04 */ stw r0, 4(r3) -/* 800A5A74 000A29D4 4E 80 00 20 */ blr +/* 800A5A74 000A29D4 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR19CScriptGrapplePoint" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR19CScriptGrapplePoint": /* 800A5A78 000A29D8 38 00 00 00 */ li r0, 0 /* 800A5A7C 000A29DC 90 03 00 04 */ stw r0, 4(r3) -/* 800A5A80 000A29E0 4E 80 00 20 */ blr +/* 800A5A80 000A29E0 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR13CScriptEffect" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR13CScriptEffect": /* 800A5A84 000A29E4 38 00 00 00 */ li r0, 0 /* 800A5A88 000A29E8 90 03 00 04 */ stw r0, 4(r3) -/* 800A5A8C 000A29EC 4E 80 00 20 */ blr +/* 800A5A8C 000A29EC 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR11CScriptDoor" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR11CScriptDoor": /* 800A5A90 000A29F0 38 00 00 00 */ li r0, 0 /* 800A5A94 000A29F4 90 03 00 04 */ stw r0, 4(r3) -/* 800A5A98 000A29F8 4E 80 00 20 */ blr +/* 800A5A98 000A29F8 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR11CScriptDock" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR11CScriptDock": /* 800A5A9C 000A29FC 38 00 00 00 */ li r0, 0 /* 800A5AA0 000A2A00 90 03 00 04 */ stw r0, 4(r3) -/* 800A5AA4 000A2A04 4E 80 00 20 */ blr +/* 800A5AA4 000A2A04 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR18CScriptDistanceFog" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR18CScriptDistanceFog": /* 800A5AA8 000A2A08 38 00 00 00 */ li r0, 0 /* 800A5AAC 000A2A0C 90 03 00 04 */ stw r0, 4(r3) -/* 800A5AB0 000A2A10 4E 80 00 20 */ blr +/* 800A5AB0 000A2A10 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR26CScriptDebugCameraWaypoint" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR26CScriptDebugCameraWaypoint": /* 800A5AB4 000A2A14 38 00 00 00 */ li r0, 0 /* 800A5AB8 000A2A18 90 03 00 04 */ stw r0, 4(r3) -/* 800A5ABC 000A2A1C 4E 80 00 20 */ blr +/* 800A5ABC 000A2A1C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR17CScriptCoverPoint" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR17CScriptCoverPoint": /* 800A5AC0 000A2A20 38 00 00 00 */ li r0, 0 /* 800A5AC4 000A2A24 90 03 00 04 */ stw r0, 4(r3) -/* 800A5AC8 000A2A28 4E 80 00 20 */ blr +/* 800A5AC8 000A2A28 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR21CScriptCameraWaypoint" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR21CScriptCameraWaypoint": /* 800A5ACC 000A2A2C 38 00 00 00 */ li r0, 0 /* 800A5AD0 000A2A30 90 03 00 04 */ stw r0, 4(r3) -/* 800A5AD4 000A2A34 4E 80 00 20 */ blr +/* 800A5AD4 000A2A34 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR24CScriptCameraPitchVolume" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR24CScriptCameraPitchVolume": /* 800A5AD8 000A2A38 38 00 00 00 */ li r0, 0 /* 800A5ADC 000A2A3C 90 03 00 04 */ stw r0, 4(r3) -/* 800A5AE0 000A2A40 4E 80 00 20 */ blr +/* 800A5AE0 000A2A40 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR17CScriptCameraHint" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR17CScriptCameraHint": /* 800A5AE4 000A2A44 38 00 00 00 */ li r0, 0 /* 800A5AE8 000A2A48 90 03 00 04 */ stw r0, 4(r3) -/* 800A5AEC 000A2A4C 4E 80 00 20 */ blr +/* 800A5AEC 000A2A4C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR18CScriptAiJumpPoint" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR18CScriptAiJumpPoint": /* 800A5AF0 000A2A50 38 00 00 00 */ li r0, 0 /* 800A5AF4 000A2A54 90 03 00 04 */ stw r0, 4(r3) -/* 800A5AF8 000A2A58 4E 80 00 20 */ blr +/* 800A5AF8 000A2A58 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR20CScriptActorKeyframe" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR20CScriptActorKeyframe": /* 800A5AFC 000A2A5C 38 00 00 00 */ li r0, 0 /* 800A5B00 000A2A60 90 03 00 04 */ stw r0, 4(r3) -/* 800A5B04 000A2A64 4E 80 00 20 */ blr +/* 800A5B04 000A2A64 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR12CScriptActor" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR12CScriptActor": /* 800A5B08 000A2A68 38 00 00 00 */ li r0, 0 /* 800A5B0C 000A2A6C 90 03 00 04 */ stw r0, 4(r3) -/* 800A5B10 000A2A70 4E 80 00 20 */ blr +/* 800A5B10 000A2A70 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR9CRepulsor" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR9CRepulsor": /* 800A5B14 000A2A74 38 00 00 00 */ li r0, 0 /* 800A5B18 000A2A78 90 03 00 04 */ stw r0, 4(r3) -/* 800A5B1C 000A2A7C 4E 80 00 20 */ blr +/* 800A5B1C 000A2A7C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR7CPlayer" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR7CPlayer": /* 800A5B20 000A2A80 38 00 00 00 */ li r0, 0 /* 800A5B24 000A2A84 90 03 00 04 */ stw r0, 4(r3) -/* 800A5B28 000A2A88 4E 80 00 20 */ blr +/* 800A5B28 000A2A88 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR13CPhysicsActor" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR13CPhysicsActor": /* 800A5B2C 000A2A8C 38 00 00 00 */ li r0, 0 /* 800A5B30 000A2A90 90 03 00 04 */ stw r0, 4(r3) -/* 800A5B34 000A2A94 4E 80 00 20 */ blr +/* 800A5B34 000A2A94 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR3CAi" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR3CAi": /* 800A5B38 000A2A98 38 00 00 00 */ li r0, 0 /* 800A5B3C 000A2A9C 90 03 00 04 */ stw r0, 4(r3) -/* 800A5B40 000A2AA0 4E 80 00 20 */ blr +/* 800A5B40 000A2AA0 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR11CPathCamera" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR11CPathCamera": /* 800A5B44 000A2AA4 38 00 00 00 */ li r0, 0 /* 800A5B48 000A2AA8 90 03 00 04 */ stw r0, 4(r3) -/* 800A5B4C 000A2AAC 4E 80 00 20 */ blr +/* 800A5B4C 000A2AAC 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR18CMetroidPrimeRelay" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR18CMetroidPrimeRelay": /* 800A5B50 000A2AB0 38 00 00 00 */ li r0, 0 /* 800A5B54 000A2AB4 90 03 00 04 */ stw r0, 4(r3) -/* 800A5B58 000A2AB8 4E 80 00 20 */ blr +/* 800A5B58 000A2AB8 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR19CHUDBillboardEffect" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR19CHUDBillboardEffect": /* 800A5B5C 000A2ABC 38 00 00 00 */ li r0, 0 /* 800A5B60 000A2AC0 90 03 00 04 */ stw r0, 4(r3) -/* 800A5B64 000A2AC4 4E 80 00 20 */ blr +/* 800A5B64 000A2AC4 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR15CGameProjectile" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR15CGameProjectile": /* 800A5B68 000A2AC8 38 00 00 00 */ li r0, 0 /* 800A5B6C 000A2ACC 90 03 00 04 */ stw r0, 4(r3) -/* 800A5B70 000A2AD0 4E 80 00 20 */ blr +/* 800A5B70 000A2AD0 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR10CGameLight" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR10CGameLight": /* 800A5B74 000A2AD4 38 00 00 00 */ li r0, 0 /* 800A5B78 000A2AD8 90 03 00 04 */ stw r0, 4(r3) -/* 800A5B7C 000A2ADC 4E 80 00 20 */ blr +/* 800A5B7C 000A2ADC 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR11CGameCamera" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR11CGameCamera": /* 800A5B80 000A2AE0 38 00 00 00 */ li r0, 0 /* 800A5B84 000A2AE4 90 03 00 04 */ stw r0, 4(r3) -/* 800A5B88 000A2AE8 4E 80 00 20 */ blr +/* 800A5B88 000A2AE8 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR10CFishCloud" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR10CFishCloud": /* 800A5B8C 000A2AEC 38 00 00 00 */ li r0, 0 /* 800A5B90 000A2AF0 90 03 00 04 */ stw r0, 4(r3) -/* 800A5B94 000A2AF4 4E 80 00 20 */ blr +/* 800A5B94 000A2AF4 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR18CFirstPersonCamera" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR18CFirstPersonCamera": /* 800A5B98 000A2AF8 38 00 00 00 */ li r0, 0 /* 800A5B9C 000A2AFC 90 03 00 04 */ stw r0, 4(r3) -/* 800A5BA0 000A2B00 4E 80 00 20 */ blr +/* 800A5BA0 000A2B00 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR10CExplosion" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR10CExplosion": /* 800A5BA4 000A2B04 38 00 00 00 */ li r0, 0 /* 800A5BA8 000A2B08 90 03 00 04 */ stw r0, 4(r3) -/* 800A5BAC 000A2B0C 4E 80 00 20 */ blr +/* 800A5BAC 000A2B0C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR7CEntity" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR7CEntity": /* 800A5BB0 000A2B10 38 00 00 00 */ li r0, 0 /* 800A5BB4 000A2B14 90 03 00 04 */ stw r0, 4(r3) -/* 800A5BB8 000A2B18 4E 80 00 20 */ blr +/* 800A5BB8 000A2B18 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR17CEnergyProjectile" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR17CEnergyProjectile": /* 800A5BBC 000A2B1C 38 00 00 00 */ li r0, 0 /* 800A5BC0 000A2B20 90 03 00 04 */ stw r0, 4(r3) -/* 800A5BC4 000A2B24 4E 80 00 20 */ blr +/* 800A5BC4 000A2B24 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR16CDestroyableRock" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR16CDestroyableRock": /* 800A5BC8 000A2B28 38 00 00 00 */ li r0, 0 /* 800A5BCC 000A2B2C 90 03 00 04 */ stw r0, 4(r3) -/* 800A5BD0 000A2B30 4E 80 00 20 */ blr +/* 800A5BD0 000A2B30 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR15CCollisionActor" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR15CCollisionActor": /* 800A5BD4 000A2B34 38 00 00 00 */ li r0, 0 /* 800A5BD8 000A2B38 90 03 00 04 */ stw r0, 4(r3) -/* 800A5BDC 000A2B3C 4E 80 00 20 */ blr +/* 800A5BDC 000A2B3C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR16CCinematicCamera" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR16CCinematicCamera": /* 800A5BE0 000A2B40 38 00 00 00 */ li r0, 0 /* 800A5BE4 000A2B44 90 03 00 04 */ stw r0, 4(r3) -/* 800A5BE8 000A2B48 4E 80 00 20 */ blr +/* 800A5BE8 000A2B48 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR5CBomb" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR5CBomb": /* 800A5BEC 000A2B4C 38 00 00 00 */ li r0, 0 /* 800A5BF0 000A2B50 90 03 00 04 */ stw r0, 4(r3) -/* 800A5BF4 000A2B54 4E 80 00 20 */ blr +/* 800A5BF4 000A2B54 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR11CBallCamera" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR11CBallCamera": /* 800A5BF8 000A2B58 38 00 00 00 */ li r0, 0 /* 800A5BFC 000A2B5C 90 03 00 04 */ stw r0, 4(r3) -/* 800A5C00 000A2B60 4E 80 00 20 */ blr +/* 800A5C00 000A2B60 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR6CActor" "Visit__31TCastToPtr<17CWallCrawlerSwarm>FR6CActor": /* 800A5C04 000A2B64 38 00 00 00 */ li r0, 0 /* 800A5C08 000A2B68 90 03 00 04 */ stw r0, 4(r3) -/* 800A5C0C 000A2B6C 4E 80 00 20 */ blr +/* 800A5C0C 000A2B6C 4E 80 00 20 */ blr .global "__ct__31TCastToPtr<17CWallCrawlerSwarm>FP7CEntity" "__ct__31TCastToPtr<17CWallCrawlerSwarm>FP7CEntity": @@ -4166,355 +4166,355 @@ lbl_800A58EC: /* 800A5C54 000A2BB4 81 83 00 00 */ lwz r12, 0(r3) /* 800A5C58 000A2BB8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800A5C5C 000A2BBC 7D 89 03 A6 */ mtctr r12 -/* 800A5C60 000A2BC0 4E 80 04 21 */ bctrl +/* 800A5C60 000A2BC0 4E 80 04 21 */ bctrl lbl_800A5C64: /* 800A5C64 000A2BC4 80 01 00 14 */ lwz r0, 0x14(r1) /* 800A5C68 000A2BC8 7F E3 FB 78 */ mr r3, r31 /* 800A5C6C 000A2BCC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800A5C70 000A2BD0 7C 08 03 A6 */ mtlr r0 /* 800A5C74 000A2BD4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A5C78 000A2BD8 4E 80 00 20 */ blr +/* 800A5C78 000A2BD8 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR7CWeapon" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR7CWeapon": /* 800A5C7C 000A2BDC 38 00 00 00 */ li r0, 0 /* 800A5C80 000A2BE0 90 03 00 04 */ stw r0, 4(r3) -/* 800A5C84 000A2BE4 4E 80 00 20 */ blr +/* 800A5C84 000A2BE4 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR17CWallCrawlerSwarm" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR17CWallCrawlerSwarm": /* 800A5C88 000A2BE8 38 00 00 00 */ li r0, 0 /* 800A5C8C 000A2BEC 90 03 00 04 */ stw r0, 4(r3) -/* 800A5C90 000A2BF0 4E 80 00 20 */ blr +/* 800A5C90 000A2BF0 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR20CScriptSpindleCamera" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR20CScriptSpindleCamera": /* 800A5C94 000A2BF4 90 83 00 04 */ stw r4, 4(r3) -/* 800A5C98 000A2BF8 4E 80 00 20 */ blr +/* 800A5C98 000A2BF8 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR15CSnakeWeedSwarm" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR15CSnakeWeedSwarm": /* 800A5C9C 000A2BFC 38 00 00 00 */ li r0, 0 /* 800A5CA0 000A2C00 90 03 00 04 */ stw r0, 4(r3) -/* 800A5CA4 000A2C04 4E 80 00 20 */ blr +/* 800A5CA4 000A2C04 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR15CScriptWaypoint" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR15CScriptWaypoint": /* 800A5CA8 000A2C08 38 00 00 00 */ li r0, 0 /* 800A5CAC 000A2C0C 90 03 00 04 */ stw r0, 4(r3) -/* 800A5CB0 000A2C10 4E 80 00 20 */ blr +/* 800A5CB0 000A2C10 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR12CScriptWater" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR12CScriptWater": /* 800A5CB4 000A2C14 38 00 00 00 */ li r0, 0 /* 800A5CB8 000A2C18 90 03 00 04 */ stw r0, 4(r3) -/* 800A5CBC 000A2C1C 4E 80 00 20 */ blr +/* 800A5CBC 000A2C1C 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR17CScriptVisorFlare" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR17CScriptVisorFlare": /* 800A5CC0 000A2C20 38 00 00 00 */ li r0, 0 /* 800A5CC4 000A2C24 90 03 00 04 */ stw r0, 4(r3) -/* 800A5CC8 000A2C28 4E 80 00 20 */ blr +/* 800A5CC8 000A2C28 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR14CScriptTrigger" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR14CScriptTrigger": /* 800A5CCC 000A2C2C 38 00 00 00 */ li r0, 0 /* 800A5CD0 000A2C30 90 03 00 04 */ stw r0, 4(r3) -/* 800A5CD4 000A2C34 4E 80 00 20 */ blr +/* 800A5CD4 000A2C34 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR12CScriptTimer" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR12CScriptTimer": /* 800A5CD8 000A2C38 38 00 00 00 */ li r0, 0 /* 800A5CDC 000A2C3C 90 03 00 04 */ stw r0, 4(r3) -/* 800A5CE0 000A2C40 4E 80 00 20 */ blr +/* 800A5CE0 000A2C40 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR10CTeamAiMgr" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR10CTeamAiMgr": /* 800A5CE4 000A2C44 38 00 00 00 */ li r0, 0 /* 800A5CE8 000A2C48 90 03 00 04 */ stw r0, 4(r3) -/* 800A5CEC 000A2C4C 4E 80 00 20 */ blr +/* 800A5CEC 000A2C4C 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR21CScriptTargetingPoint" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR21CScriptTargetingPoint": /* 800A5CF0 000A2C50 38 00 00 00 */ li r0, 0 /* 800A5CF4 000A2C54 90 03 00 04 */ stw r0, 4(r3) -/* 800A5CF8 000A2C58 4E 80 00 20 */ blr +/* 800A5CF8 000A2C58 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR25CScriptSpiderBallWaypoint" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR25CScriptSpiderBallWaypoint": /* 800A5CFC 000A2C5C 38 00 00 00 */ li r0, 0 /* 800A5D00 000A2C60 90 03 00 04 */ stw r0, 4(r3) -/* 800A5D04 000A2C64 4E 80 00 20 */ blr +/* 800A5D04 000A2C64 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR34CScriptSpiderBallAttractionSurface" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR34CScriptSpiderBallAttractionSurface": /* 800A5D08 000A2C68 38 00 00 00 */ li r0, 0 /* 800A5D0C 000A2C6C 90 03 00 04 */ stw r0, 4(r3) -/* 800A5D10 000A2C70 4E 80 00 20 */ blr +/* 800A5D10 000A2C70 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR22CScriptSpecialFunction" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR22CScriptSpecialFunction": /* 800A5D14 000A2C74 38 00 00 00 */ li r0, 0 /* 800A5D18 000A2C78 90 03 00 04 */ stw r0, 4(r3) -/* 800A5D1C 000A2C7C 4E 80 00 20 */ blr +/* 800A5D1C 000A2C7C 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR17CScriptSpawnPoint" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR17CScriptSpawnPoint": /* 800A5D20 000A2C80 38 00 00 00 */ li r0, 0 /* 800A5D24 000A2C84 90 03 00 04 */ stw r0, 4(r3) -/* 800A5D28 000A2C88 4E 80 00 20 */ blr +/* 800A5D28 000A2C88 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR12CScriptSound" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR12CScriptSound": /* 800A5D2C 000A2C8C 38 00 00 00 */ li r0, 0 /* 800A5D30 000A2C90 90 03 00 04 */ stw r0, 4(r3) -/* 800A5D34 000A2C94 4E 80 00 20 */ blr +/* 800A5D34 000A2C94 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR20CScriptRoomAcoustics" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR20CScriptRoomAcoustics": /* 800A5D38 000A2C98 38 00 00 00 */ li r0, 0 /* 800A5D3C 000A2C9C 90 03 00 04 */ stw r0, 4(r3) -/* 800A5D40 000A2CA0 4E 80 00 20 */ blr +/* 800A5D40 000A2CA0 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR22CScriptPointOfinterest" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR22CScriptPointOfinterest": /* 800A5D44 000A2CA4 38 00 00 00 */ li r0, 0 /* 800A5D48 000A2CA8 90 03 00 04 */ stw r0, 4(r3) -/* 800A5D4C 000A2CAC 4E 80 00 20 */ blr +/* 800A5D4C 000A2CAC 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR17CScriptPlayerHint" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR17CScriptPlayerHint": /* 800A5D50 000A2CB0 38 00 00 00 */ li r0, 0 /* 800A5D54 000A2CB4 90 03 00 04 */ stw r0, 4(r3) -/* 800A5D58 000A2CB8 4E 80 00 20 */ blr +/* 800A5D58 000A2CB8 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR15CScriptPlatform" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR15CScriptPlatform": /* 800A5D5C 000A2CBC 38 00 00 00 */ li r0, 0 /* 800A5D60 000A2CC0 90 03 00 04 */ stw r0, 4(r3) -/* 800A5D64 000A2CC4 4E 80 00 20 */ blr +/* 800A5D64 000A2CC4 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR13CScriptPickup" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR13CScriptPickup": /* 800A5D68 000A2CC8 38 00 00 00 */ li r0, 0 /* 800A5D6C 000A2CCC 90 03 00 04 */ stw r0, 4(r3) -/* 800A5D70 000A2CD0 4E 80 00 20 */ blr +/* 800A5D70 000A2CD0 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR15CScriptMazeNode" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR15CScriptMazeNode": /* 800A5D74 000A2CD4 38 00 00 00 */ li r0, 0 /* 800A5D78 000A2CD8 90 03 00 04 */ stw r0, 4(r3) -/* 800A5D7C 000A2CDC 4E 80 00 20 */ blr +/* 800A5D7C 000A2CDC 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR16CScriptGunTurret" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR16CScriptGunTurret": /* 800A5D80 000A2CE0 38 00 00 00 */ li r0, 0 /* 800A5D84 000A2CE4 90 03 00 04 */ stw r0, 4(r3) -/* 800A5D88 000A2CE8 4E 80 00 20 */ blr +/* 800A5D88 000A2CE8 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR19CScriptGrapplePoint" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR19CScriptGrapplePoint": /* 800A5D8C 000A2CEC 38 00 00 00 */ li r0, 0 /* 800A5D90 000A2CF0 90 03 00 04 */ stw r0, 4(r3) -/* 800A5D94 000A2CF4 4E 80 00 20 */ blr +/* 800A5D94 000A2CF4 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR13CScriptEffect" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR13CScriptEffect": /* 800A5D98 000A2CF8 38 00 00 00 */ li r0, 0 /* 800A5D9C 000A2CFC 90 03 00 04 */ stw r0, 4(r3) -/* 800A5DA0 000A2D00 4E 80 00 20 */ blr +/* 800A5DA0 000A2D00 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR11CScriptDoor" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR11CScriptDoor": /* 800A5DA4 000A2D04 38 00 00 00 */ li r0, 0 /* 800A5DA8 000A2D08 90 03 00 04 */ stw r0, 4(r3) -/* 800A5DAC 000A2D0C 4E 80 00 20 */ blr +/* 800A5DAC 000A2D0C 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR11CScriptDock" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR11CScriptDock": /* 800A5DB0 000A2D10 38 00 00 00 */ li r0, 0 /* 800A5DB4 000A2D14 90 03 00 04 */ stw r0, 4(r3) -/* 800A5DB8 000A2D18 4E 80 00 20 */ blr +/* 800A5DB8 000A2D18 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR18CScriptDistanceFog" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR18CScriptDistanceFog": /* 800A5DBC 000A2D1C 38 00 00 00 */ li r0, 0 /* 800A5DC0 000A2D20 90 03 00 04 */ stw r0, 4(r3) -/* 800A5DC4 000A2D24 4E 80 00 20 */ blr +/* 800A5DC4 000A2D24 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR26CScriptDebugCameraWaypoint" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR26CScriptDebugCameraWaypoint": /* 800A5DC8 000A2D28 38 00 00 00 */ li r0, 0 /* 800A5DCC 000A2D2C 90 03 00 04 */ stw r0, 4(r3) -/* 800A5DD0 000A2D30 4E 80 00 20 */ blr +/* 800A5DD0 000A2D30 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR17CScriptCoverPoint" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR17CScriptCoverPoint": /* 800A5DD4 000A2D34 38 00 00 00 */ li r0, 0 /* 800A5DD8 000A2D38 90 03 00 04 */ stw r0, 4(r3) -/* 800A5DDC 000A2D3C 4E 80 00 20 */ blr +/* 800A5DDC 000A2D3C 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR21CScriptCameraWaypoint" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR21CScriptCameraWaypoint": /* 800A5DE0 000A2D40 38 00 00 00 */ li r0, 0 /* 800A5DE4 000A2D44 90 03 00 04 */ stw r0, 4(r3) -/* 800A5DE8 000A2D48 4E 80 00 20 */ blr +/* 800A5DE8 000A2D48 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR24CScriptCameraPitchVolume" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR24CScriptCameraPitchVolume": /* 800A5DEC 000A2D4C 38 00 00 00 */ li r0, 0 /* 800A5DF0 000A2D50 90 03 00 04 */ stw r0, 4(r3) -/* 800A5DF4 000A2D54 4E 80 00 20 */ blr +/* 800A5DF4 000A2D54 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR17CScriptCameraHint" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR17CScriptCameraHint": /* 800A5DF8 000A2D58 38 00 00 00 */ li r0, 0 /* 800A5DFC 000A2D5C 90 03 00 04 */ stw r0, 4(r3) -/* 800A5E00 000A2D60 4E 80 00 20 */ blr +/* 800A5E00 000A2D60 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR18CScriptAiJumpPoint" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR18CScriptAiJumpPoint": /* 800A5E04 000A2D64 38 00 00 00 */ li r0, 0 /* 800A5E08 000A2D68 90 03 00 04 */ stw r0, 4(r3) -/* 800A5E0C 000A2D6C 4E 80 00 20 */ blr +/* 800A5E0C 000A2D6C 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR20CScriptActorKeyframe" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR20CScriptActorKeyframe": /* 800A5E10 000A2D70 38 00 00 00 */ li r0, 0 /* 800A5E14 000A2D74 90 03 00 04 */ stw r0, 4(r3) -/* 800A5E18 000A2D78 4E 80 00 20 */ blr +/* 800A5E18 000A2D78 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR12CScriptActor" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR12CScriptActor": /* 800A5E1C 000A2D7C 38 00 00 00 */ li r0, 0 /* 800A5E20 000A2D80 90 03 00 04 */ stw r0, 4(r3) -/* 800A5E24 000A2D84 4E 80 00 20 */ blr +/* 800A5E24 000A2D84 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR9CRepulsor" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR9CRepulsor": /* 800A5E28 000A2D88 38 00 00 00 */ li r0, 0 /* 800A5E2C 000A2D8C 90 03 00 04 */ stw r0, 4(r3) -/* 800A5E30 000A2D90 4E 80 00 20 */ blr +/* 800A5E30 000A2D90 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR7CPlayer" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR7CPlayer": /* 800A5E34 000A2D94 38 00 00 00 */ li r0, 0 /* 800A5E38 000A2D98 90 03 00 04 */ stw r0, 4(r3) -/* 800A5E3C 000A2D9C 4E 80 00 20 */ blr +/* 800A5E3C 000A2D9C 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR13CPhysicsActor" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR13CPhysicsActor": /* 800A5E40 000A2DA0 38 00 00 00 */ li r0, 0 /* 800A5E44 000A2DA4 90 03 00 04 */ stw r0, 4(r3) -/* 800A5E48 000A2DA8 4E 80 00 20 */ blr +/* 800A5E48 000A2DA8 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR3CAi" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR3CAi": /* 800A5E4C 000A2DAC 38 00 00 00 */ li r0, 0 /* 800A5E50 000A2DB0 90 03 00 04 */ stw r0, 4(r3) -/* 800A5E54 000A2DB4 4E 80 00 20 */ blr +/* 800A5E54 000A2DB4 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR11CPathCamera" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR11CPathCamera": /* 800A5E58 000A2DB8 38 00 00 00 */ li r0, 0 /* 800A5E5C 000A2DBC 90 03 00 04 */ stw r0, 4(r3) -/* 800A5E60 000A2DC0 4E 80 00 20 */ blr +/* 800A5E60 000A2DC0 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR18CMetroidPrimeRelay" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR18CMetroidPrimeRelay": /* 800A5E64 000A2DC4 38 00 00 00 */ li r0, 0 /* 800A5E68 000A2DC8 90 03 00 04 */ stw r0, 4(r3) -/* 800A5E6C 000A2DCC 4E 80 00 20 */ blr +/* 800A5E6C 000A2DCC 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR19CHUDBillboardEffect" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR19CHUDBillboardEffect": /* 800A5E70 000A2DD0 38 00 00 00 */ li r0, 0 /* 800A5E74 000A2DD4 90 03 00 04 */ stw r0, 4(r3) -/* 800A5E78 000A2DD8 4E 80 00 20 */ blr +/* 800A5E78 000A2DD8 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR15CGameProjectile" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR15CGameProjectile": /* 800A5E7C 000A2DDC 38 00 00 00 */ li r0, 0 /* 800A5E80 000A2DE0 90 03 00 04 */ stw r0, 4(r3) -/* 800A5E84 000A2DE4 4E 80 00 20 */ blr +/* 800A5E84 000A2DE4 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR10CGameLight" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR10CGameLight": /* 800A5E88 000A2DE8 38 00 00 00 */ li r0, 0 /* 800A5E8C 000A2DEC 90 03 00 04 */ stw r0, 4(r3) -/* 800A5E90 000A2DF0 4E 80 00 20 */ blr +/* 800A5E90 000A2DF0 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR11CGameCamera" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR11CGameCamera": /* 800A5E94 000A2DF4 38 00 00 00 */ li r0, 0 /* 800A5E98 000A2DF8 90 03 00 04 */ stw r0, 4(r3) -/* 800A5E9C 000A2DFC 4E 80 00 20 */ blr +/* 800A5E9C 000A2DFC 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR10CFishCloud" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR10CFishCloud": /* 800A5EA0 000A2E00 38 00 00 00 */ li r0, 0 /* 800A5EA4 000A2E04 90 03 00 04 */ stw r0, 4(r3) -/* 800A5EA8 000A2E08 4E 80 00 20 */ blr +/* 800A5EA8 000A2E08 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR18CFirstPersonCamera" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR18CFirstPersonCamera": /* 800A5EAC 000A2E0C 38 00 00 00 */ li r0, 0 /* 800A5EB0 000A2E10 90 03 00 04 */ stw r0, 4(r3) -/* 800A5EB4 000A2E14 4E 80 00 20 */ blr +/* 800A5EB4 000A2E14 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR10CExplosion" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR10CExplosion": /* 800A5EB8 000A2E18 38 00 00 00 */ li r0, 0 /* 800A5EBC 000A2E1C 90 03 00 04 */ stw r0, 4(r3) -/* 800A5EC0 000A2E20 4E 80 00 20 */ blr +/* 800A5EC0 000A2E20 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR7CEntity" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR7CEntity": /* 800A5EC4 000A2E24 38 00 00 00 */ li r0, 0 /* 800A5EC8 000A2E28 90 03 00 04 */ stw r0, 4(r3) -/* 800A5ECC 000A2E2C 4E 80 00 20 */ blr +/* 800A5ECC 000A2E2C 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR17CEnergyProjectile" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR17CEnergyProjectile": /* 800A5ED0 000A2E30 38 00 00 00 */ li r0, 0 /* 800A5ED4 000A2E34 90 03 00 04 */ stw r0, 4(r3) -/* 800A5ED8 000A2E38 4E 80 00 20 */ blr +/* 800A5ED8 000A2E38 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR16CDestroyableRock" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR16CDestroyableRock": /* 800A5EDC 000A2E3C 38 00 00 00 */ li r0, 0 /* 800A5EE0 000A2E40 90 03 00 04 */ stw r0, 4(r3) -/* 800A5EE4 000A2E44 4E 80 00 20 */ blr +/* 800A5EE4 000A2E44 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR15CCollisionActor" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR15CCollisionActor": /* 800A5EE8 000A2E48 38 00 00 00 */ li r0, 0 /* 800A5EEC 000A2E4C 90 03 00 04 */ stw r0, 4(r3) -/* 800A5EF0 000A2E50 4E 80 00 20 */ blr +/* 800A5EF0 000A2E50 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR16CCinematicCamera" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR16CCinematicCamera": /* 800A5EF4 000A2E54 38 00 00 00 */ li r0, 0 /* 800A5EF8 000A2E58 90 03 00 04 */ stw r0, 4(r3) -/* 800A5EFC 000A2E5C 4E 80 00 20 */ blr +/* 800A5EFC 000A2E5C 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR5CBomb" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR5CBomb": /* 800A5F00 000A2E60 38 00 00 00 */ li r0, 0 /* 800A5F04 000A2E64 90 03 00 04 */ stw r0, 4(r3) -/* 800A5F08 000A2E68 4E 80 00 20 */ blr +/* 800A5F08 000A2E68 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR11CBallCamera" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR11CBallCamera": /* 800A5F0C 000A2E6C 38 00 00 00 */ li r0, 0 /* 800A5F10 000A2E70 90 03 00 04 */ stw r0, 4(r3) -/* 800A5F14 000A2E74 4E 80 00 20 */ blr +/* 800A5F14 000A2E74 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptSpindleCamera>FR6CActor" "Visit__34TCastToPtr<20CScriptSpindleCamera>FR6CActor": /* 800A5F18 000A2E78 38 00 00 00 */ li r0, 0 /* 800A5F1C 000A2E7C 90 03 00 04 */ stw r0, 4(r3) -/* 800A5F20 000A2E80 4E 80 00 20 */ blr +/* 800A5F20 000A2E80 4E 80 00 20 */ blr .global "__ct__34TCastToPtr<20CScriptSpindleCamera>FP7CEntity" "__ct__34TCastToPtr<20CScriptSpindleCamera>FP7CEntity": @@ -4538,355 +4538,355 @@ lbl_800A5C64: /* 800A5F68 000A2EC8 81 83 00 00 */ lwz r12, 0(r3) /* 800A5F6C 000A2ECC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800A5F70 000A2ED0 7D 89 03 A6 */ mtctr r12 -/* 800A5F74 000A2ED4 4E 80 04 21 */ bctrl +/* 800A5F74 000A2ED4 4E 80 04 21 */ bctrl lbl_800A5F78: /* 800A5F78 000A2ED8 80 01 00 14 */ lwz r0, 0x14(r1) /* 800A5F7C 000A2EDC 7F E3 FB 78 */ mr r3, r31 /* 800A5F80 000A2EE0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800A5F84 000A2EE4 7C 08 03 A6 */ mtlr r0 /* 800A5F88 000A2EE8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A5F8C 000A2EEC 4E 80 00 20 */ blr +/* 800A5F8C 000A2EEC 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR7CWeapon" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR7CWeapon": /* 800A5F90 000A2EF0 38 00 00 00 */ li r0, 0 /* 800A5F94 000A2EF4 90 03 00 04 */ stw r0, 4(r3) -/* 800A5F98 000A2EF8 4E 80 00 20 */ blr +/* 800A5F98 000A2EF8 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR17CWallCrawlerSwarm" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR17CWallCrawlerSwarm": /* 800A5F9C 000A2EFC 38 00 00 00 */ li r0, 0 /* 800A5FA0 000A2F00 90 03 00 04 */ stw r0, 4(r3) -/* 800A5FA4 000A2F04 4E 80 00 20 */ blr +/* 800A5FA4 000A2F04 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR20CScriptSpindleCamera" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR20CScriptSpindleCamera": /* 800A5FA8 000A2F08 38 00 00 00 */ li r0, 0 /* 800A5FAC 000A2F0C 90 03 00 04 */ stw r0, 4(r3) -/* 800A5FB0 000A2F10 4E 80 00 20 */ blr +/* 800A5FB0 000A2F10 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR15CSnakeWeedSwarm" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR15CSnakeWeedSwarm": /* 800A5FB4 000A2F14 90 83 00 04 */ stw r4, 4(r3) -/* 800A5FB8 000A2F18 4E 80 00 20 */ blr +/* 800A5FB8 000A2F18 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR15CScriptWaypoint" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR15CScriptWaypoint": /* 800A5FBC 000A2F1C 38 00 00 00 */ li r0, 0 /* 800A5FC0 000A2F20 90 03 00 04 */ stw r0, 4(r3) -/* 800A5FC4 000A2F24 4E 80 00 20 */ blr +/* 800A5FC4 000A2F24 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR12CScriptWater" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR12CScriptWater": /* 800A5FC8 000A2F28 38 00 00 00 */ li r0, 0 /* 800A5FCC 000A2F2C 90 03 00 04 */ stw r0, 4(r3) -/* 800A5FD0 000A2F30 4E 80 00 20 */ blr +/* 800A5FD0 000A2F30 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR17CScriptVisorFlare" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR17CScriptVisorFlare": /* 800A5FD4 000A2F34 38 00 00 00 */ li r0, 0 /* 800A5FD8 000A2F38 90 03 00 04 */ stw r0, 4(r3) -/* 800A5FDC 000A2F3C 4E 80 00 20 */ blr +/* 800A5FDC 000A2F3C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR14CScriptTrigger" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR14CScriptTrigger": /* 800A5FE0 000A2F40 38 00 00 00 */ li r0, 0 /* 800A5FE4 000A2F44 90 03 00 04 */ stw r0, 4(r3) -/* 800A5FE8 000A2F48 4E 80 00 20 */ blr +/* 800A5FE8 000A2F48 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR12CScriptTimer" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR12CScriptTimer": /* 800A5FEC 000A2F4C 38 00 00 00 */ li r0, 0 /* 800A5FF0 000A2F50 90 03 00 04 */ stw r0, 4(r3) -/* 800A5FF4 000A2F54 4E 80 00 20 */ blr +/* 800A5FF4 000A2F54 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR10CTeamAiMgr" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR10CTeamAiMgr": /* 800A5FF8 000A2F58 38 00 00 00 */ li r0, 0 /* 800A5FFC 000A2F5C 90 03 00 04 */ stw r0, 4(r3) -/* 800A6000 000A2F60 4E 80 00 20 */ blr +/* 800A6000 000A2F60 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR21CScriptTargetingPoint" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR21CScriptTargetingPoint": /* 800A6004 000A2F64 38 00 00 00 */ li r0, 0 /* 800A6008 000A2F68 90 03 00 04 */ stw r0, 4(r3) -/* 800A600C 000A2F6C 4E 80 00 20 */ blr +/* 800A600C 000A2F6C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR25CScriptSpiderBallWaypoint" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR25CScriptSpiderBallWaypoint": /* 800A6010 000A2F70 38 00 00 00 */ li r0, 0 /* 800A6014 000A2F74 90 03 00 04 */ stw r0, 4(r3) -/* 800A6018 000A2F78 4E 80 00 20 */ blr +/* 800A6018 000A2F78 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR34CScriptSpiderBallAttractionSurface" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR34CScriptSpiderBallAttractionSurface": /* 800A601C 000A2F7C 38 00 00 00 */ li r0, 0 /* 800A6020 000A2F80 90 03 00 04 */ stw r0, 4(r3) -/* 800A6024 000A2F84 4E 80 00 20 */ blr +/* 800A6024 000A2F84 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR22CScriptSpecialFunction" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR22CScriptSpecialFunction": /* 800A6028 000A2F88 38 00 00 00 */ li r0, 0 /* 800A602C 000A2F8C 90 03 00 04 */ stw r0, 4(r3) -/* 800A6030 000A2F90 4E 80 00 20 */ blr +/* 800A6030 000A2F90 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR17CScriptSpawnPoint" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR17CScriptSpawnPoint": /* 800A6034 000A2F94 38 00 00 00 */ li r0, 0 /* 800A6038 000A2F98 90 03 00 04 */ stw r0, 4(r3) -/* 800A603C 000A2F9C 4E 80 00 20 */ blr +/* 800A603C 000A2F9C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR12CScriptSound" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR12CScriptSound": /* 800A6040 000A2FA0 38 00 00 00 */ li r0, 0 /* 800A6044 000A2FA4 90 03 00 04 */ stw r0, 4(r3) -/* 800A6048 000A2FA8 4E 80 00 20 */ blr +/* 800A6048 000A2FA8 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR20CScriptRoomAcoustics" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR20CScriptRoomAcoustics": /* 800A604C 000A2FAC 38 00 00 00 */ li r0, 0 /* 800A6050 000A2FB0 90 03 00 04 */ stw r0, 4(r3) -/* 800A6054 000A2FB4 4E 80 00 20 */ blr +/* 800A6054 000A2FB4 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR22CScriptPointOfinterest" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR22CScriptPointOfinterest": /* 800A6058 000A2FB8 38 00 00 00 */ li r0, 0 /* 800A605C 000A2FBC 90 03 00 04 */ stw r0, 4(r3) -/* 800A6060 000A2FC0 4E 80 00 20 */ blr +/* 800A6060 000A2FC0 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR17CScriptPlayerHint" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR17CScriptPlayerHint": /* 800A6064 000A2FC4 38 00 00 00 */ li r0, 0 /* 800A6068 000A2FC8 90 03 00 04 */ stw r0, 4(r3) -/* 800A606C 000A2FCC 4E 80 00 20 */ blr +/* 800A606C 000A2FCC 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR15CScriptPlatform" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR15CScriptPlatform": /* 800A6070 000A2FD0 38 00 00 00 */ li r0, 0 /* 800A6074 000A2FD4 90 03 00 04 */ stw r0, 4(r3) -/* 800A6078 000A2FD8 4E 80 00 20 */ blr +/* 800A6078 000A2FD8 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR13CScriptPickup" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR13CScriptPickup": /* 800A607C 000A2FDC 38 00 00 00 */ li r0, 0 /* 800A6080 000A2FE0 90 03 00 04 */ stw r0, 4(r3) -/* 800A6084 000A2FE4 4E 80 00 20 */ blr +/* 800A6084 000A2FE4 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR15CScriptMazeNode" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR15CScriptMazeNode": /* 800A6088 000A2FE8 38 00 00 00 */ li r0, 0 /* 800A608C 000A2FEC 90 03 00 04 */ stw r0, 4(r3) -/* 800A6090 000A2FF0 4E 80 00 20 */ blr +/* 800A6090 000A2FF0 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR16CScriptGunTurret" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR16CScriptGunTurret": /* 800A6094 000A2FF4 38 00 00 00 */ li r0, 0 /* 800A6098 000A2FF8 90 03 00 04 */ stw r0, 4(r3) -/* 800A609C 000A2FFC 4E 80 00 20 */ blr +/* 800A609C 000A2FFC 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR19CScriptGrapplePoint" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR19CScriptGrapplePoint": /* 800A60A0 000A3000 38 00 00 00 */ li r0, 0 /* 800A60A4 000A3004 90 03 00 04 */ stw r0, 4(r3) -/* 800A60A8 000A3008 4E 80 00 20 */ blr +/* 800A60A8 000A3008 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR13CScriptEffect" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR13CScriptEffect": /* 800A60AC 000A300C 38 00 00 00 */ li r0, 0 /* 800A60B0 000A3010 90 03 00 04 */ stw r0, 4(r3) -/* 800A60B4 000A3014 4E 80 00 20 */ blr +/* 800A60B4 000A3014 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR11CScriptDoor" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR11CScriptDoor": /* 800A60B8 000A3018 38 00 00 00 */ li r0, 0 /* 800A60BC 000A301C 90 03 00 04 */ stw r0, 4(r3) -/* 800A60C0 000A3020 4E 80 00 20 */ blr +/* 800A60C0 000A3020 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR11CScriptDock" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR11CScriptDock": /* 800A60C4 000A3024 38 00 00 00 */ li r0, 0 /* 800A60C8 000A3028 90 03 00 04 */ stw r0, 4(r3) -/* 800A60CC 000A302C 4E 80 00 20 */ blr +/* 800A60CC 000A302C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR18CScriptDistanceFog" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR18CScriptDistanceFog": /* 800A60D0 000A3030 38 00 00 00 */ li r0, 0 /* 800A60D4 000A3034 90 03 00 04 */ stw r0, 4(r3) -/* 800A60D8 000A3038 4E 80 00 20 */ blr +/* 800A60D8 000A3038 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR26CScriptDebugCameraWaypoint" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR26CScriptDebugCameraWaypoint": /* 800A60DC 000A303C 38 00 00 00 */ li r0, 0 /* 800A60E0 000A3040 90 03 00 04 */ stw r0, 4(r3) -/* 800A60E4 000A3044 4E 80 00 20 */ blr +/* 800A60E4 000A3044 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR17CScriptCoverPoint" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR17CScriptCoverPoint": /* 800A60E8 000A3048 38 00 00 00 */ li r0, 0 /* 800A60EC 000A304C 90 03 00 04 */ stw r0, 4(r3) -/* 800A60F0 000A3050 4E 80 00 20 */ blr +/* 800A60F0 000A3050 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR21CScriptCameraWaypoint" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR21CScriptCameraWaypoint": /* 800A60F4 000A3054 38 00 00 00 */ li r0, 0 /* 800A60F8 000A3058 90 03 00 04 */ stw r0, 4(r3) -/* 800A60FC 000A305C 4E 80 00 20 */ blr +/* 800A60FC 000A305C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR24CScriptCameraPitchVolume" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR24CScriptCameraPitchVolume": /* 800A6100 000A3060 38 00 00 00 */ li r0, 0 /* 800A6104 000A3064 90 03 00 04 */ stw r0, 4(r3) -/* 800A6108 000A3068 4E 80 00 20 */ blr +/* 800A6108 000A3068 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR17CScriptCameraHint" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR17CScriptCameraHint": /* 800A610C 000A306C 38 00 00 00 */ li r0, 0 /* 800A6110 000A3070 90 03 00 04 */ stw r0, 4(r3) -/* 800A6114 000A3074 4E 80 00 20 */ blr +/* 800A6114 000A3074 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR18CScriptAiJumpPoint" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR18CScriptAiJumpPoint": /* 800A6118 000A3078 38 00 00 00 */ li r0, 0 /* 800A611C 000A307C 90 03 00 04 */ stw r0, 4(r3) -/* 800A6120 000A3080 4E 80 00 20 */ blr +/* 800A6120 000A3080 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR20CScriptActorKeyframe" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR20CScriptActorKeyframe": /* 800A6124 000A3084 38 00 00 00 */ li r0, 0 /* 800A6128 000A3088 90 03 00 04 */ stw r0, 4(r3) -/* 800A612C 000A308C 4E 80 00 20 */ blr +/* 800A612C 000A308C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR12CScriptActor" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR12CScriptActor": /* 800A6130 000A3090 38 00 00 00 */ li r0, 0 /* 800A6134 000A3094 90 03 00 04 */ stw r0, 4(r3) -/* 800A6138 000A3098 4E 80 00 20 */ blr +/* 800A6138 000A3098 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR9CRepulsor" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR9CRepulsor": /* 800A613C 000A309C 38 00 00 00 */ li r0, 0 /* 800A6140 000A30A0 90 03 00 04 */ stw r0, 4(r3) -/* 800A6144 000A30A4 4E 80 00 20 */ blr +/* 800A6144 000A30A4 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR7CPlayer" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR7CPlayer": /* 800A6148 000A30A8 38 00 00 00 */ li r0, 0 /* 800A614C 000A30AC 90 03 00 04 */ stw r0, 4(r3) -/* 800A6150 000A30B0 4E 80 00 20 */ blr +/* 800A6150 000A30B0 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR13CPhysicsActor" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR13CPhysicsActor": /* 800A6154 000A30B4 38 00 00 00 */ li r0, 0 /* 800A6158 000A30B8 90 03 00 04 */ stw r0, 4(r3) -/* 800A615C 000A30BC 4E 80 00 20 */ blr +/* 800A615C 000A30BC 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR3CAi" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR3CAi": /* 800A6160 000A30C0 38 00 00 00 */ li r0, 0 /* 800A6164 000A30C4 90 03 00 04 */ stw r0, 4(r3) -/* 800A6168 000A30C8 4E 80 00 20 */ blr +/* 800A6168 000A30C8 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR11CPathCamera" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR11CPathCamera": /* 800A616C 000A30CC 38 00 00 00 */ li r0, 0 /* 800A6170 000A30D0 90 03 00 04 */ stw r0, 4(r3) -/* 800A6174 000A30D4 4E 80 00 20 */ blr +/* 800A6174 000A30D4 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR18CMetroidPrimeRelay" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR18CMetroidPrimeRelay": /* 800A6178 000A30D8 38 00 00 00 */ li r0, 0 /* 800A617C 000A30DC 90 03 00 04 */ stw r0, 4(r3) -/* 800A6180 000A30E0 4E 80 00 20 */ blr +/* 800A6180 000A30E0 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR19CHUDBillboardEffect" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR19CHUDBillboardEffect": /* 800A6184 000A30E4 38 00 00 00 */ li r0, 0 /* 800A6188 000A30E8 90 03 00 04 */ stw r0, 4(r3) -/* 800A618C 000A30EC 4E 80 00 20 */ blr +/* 800A618C 000A30EC 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR15CGameProjectile" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR15CGameProjectile": /* 800A6190 000A30F0 38 00 00 00 */ li r0, 0 /* 800A6194 000A30F4 90 03 00 04 */ stw r0, 4(r3) -/* 800A6198 000A30F8 4E 80 00 20 */ blr +/* 800A6198 000A30F8 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR10CGameLight" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR10CGameLight": /* 800A619C 000A30FC 38 00 00 00 */ li r0, 0 /* 800A61A0 000A3100 90 03 00 04 */ stw r0, 4(r3) -/* 800A61A4 000A3104 4E 80 00 20 */ blr +/* 800A61A4 000A3104 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR11CGameCamera" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR11CGameCamera": /* 800A61A8 000A3108 38 00 00 00 */ li r0, 0 /* 800A61AC 000A310C 90 03 00 04 */ stw r0, 4(r3) -/* 800A61B0 000A3110 4E 80 00 20 */ blr +/* 800A61B0 000A3110 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR10CFishCloud" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR10CFishCloud": /* 800A61B4 000A3114 38 00 00 00 */ li r0, 0 /* 800A61B8 000A3118 90 03 00 04 */ stw r0, 4(r3) -/* 800A61BC 000A311C 4E 80 00 20 */ blr +/* 800A61BC 000A311C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR18CFirstPersonCamera" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR18CFirstPersonCamera": /* 800A61C0 000A3120 38 00 00 00 */ li r0, 0 /* 800A61C4 000A3124 90 03 00 04 */ stw r0, 4(r3) -/* 800A61C8 000A3128 4E 80 00 20 */ blr +/* 800A61C8 000A3128 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR10CExplosion" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR10CExplosion": /* 800A61CC 000A312C 38 00 00 00 */ li r0, 0 /* 800A61D0 000A3130 90 03 00 04 */ stw r0, 4(r3) -/* 800A61D4 000A3134 4E 80 00 20 */ blr +/* 800A61D4 000A3134 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR7CEntity" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR7CEntity": /* 800A61D8 000A3138 38 00 00 00 */ li r0, 0 /* 800A61DC 000A313C 90 03 00 04 */ stw r0, 4(r3) -/* 800A61E0 000A3140 4E 80 00 20 */ blr +/* 800A61E0 000A3140 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR17CEnergyProjectile" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR17CEnergyProjectile": /* 800A61E4 000A3144 38 00 00 00 */ li r0, 0 /* 800A61E8 000A3148 90 03 00 04 */ stw r0, 4(r3) -/* 800A61EC 000A314C 4E 80 00 20 */ blr +/* 800A61EC 000A314C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR16CDestroyableRock" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR16CDestroyableRock": /* 800A61F0 000A3150 38 00 00 00 */ li r0, 0 /* 800A61F4 000A3154 90 03 00 04 */ stw r0, 4(r3) -/* 800A61F8 000A3158 4E 80 00 20 */ blr +/* 800A61F8 000A3158 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR15CCollisionActor" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR15CCollisionActor": /* 800A61FC 000A315C 38 00 00 00 */ li r0, 0 /* 800A6200 000A3160 90 03 00 04 */ stw r0, 4(r3) -/* 800A6204 000A3164 4E 80 00 20 */ blr +/* 800A6204 000A3164 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR16CCinematicCamera" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR16CCinematicCamera": /* 800A6208 000A3168 38 00 00 00 */ li r0, 0 /* 800A620C 000A316C 90 03 00 04 */ stw r0, 4(r3) -/* 800A6210 000A3170 4E 80 00 20 */ blr +/* 800A6210 000A3170 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR5CBomb" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR5CBomb": /* 800A6214 000A3174 38 00 00 00 */ li r0, 0 /* 800A6218 000A3178 90 03 00 04 */ stw r0, 4(r3) -/* 800A621C 000A317C 4E 80 00 20 */ blr +/* 800A621C 000A317C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR11CBallCamera" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR11CBallCamera": /* 800A6220 000A3180 38 00 00 00 */ li r0, 0 /* 800A6224 000A3184 90 03 00 04 */ stw r0, 4(r3) -/* 800A6228 000A3188 4E 80 00 20 */ blr +/* 800A6228 000A3188 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR6CActor" "Visit__29TCastToPtr<15CSnakeWeedSwarm>FR6CActor": /* 800A622C 000A318C 38 00 00 00 */ li r0, 0 /* 800A6230 000A3190 90 03 00 04 */ stw r0, 4(r3) -/* 800A6234 000A3194 4E 80 00 20 */ blr +/* 800A6234 000A3194 4E 80 00 20 */ blr .global "__ct__29TCastToPtr<15CSnakeWeedSwarm>FP7CEntity" "__ct__29TCastToPtr<15CSnakeWeedSwarm>FP7CEntity": @@ -4910,355 +4910,355 @@ lbl_800A5F78: /* 800A627C 000A31DC 81 83 00 00 */ lwz r12, 0(r3) /* 800A6280 000A31E0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800A6284 000A31E4 7D 89 03 A6 */ mtctr r12 -/* 800A6288 000A31E8 4E 80 04 21 */ bctrl +/* 800A6288 000A31E8 4E 80 04 21 */ bctrl lbl_800A628C: /* 800A628C 000A31EC 80 01 00 14 */ lwz r0, 0x14(r1) /* 800A6290 000A31F0 7F E3 FB 78 */ mr r3, r31 /* 800A6294 000A31F4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800A6298 000A31F8 7C 08 03 A6 */ mtlr r0 /* 800A629C 000A31FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A62A0 000A3200 4E 80 00 20 */ blr +/* 800A62A0 000A3200 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR7CWeapon" "Visit__29TCastToPtr<15CScriptWaypoint>FR7CWeapon": /* 800A62A4 000A3204 38 00 00 00 */ li r0, 0 /* 800A62A8 000A3208 90 03 00 04 */ stw r0, 4(r3) -/* 800A62AC 000A320C 4E 80 00 20 */ blr +/* 800A62AC 000A320C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR17CWallCrawlerSwarm" "Visit__29TCastToPtr<15CScriptWaypoint>FR17CWallCrawlerSwarm": /* 800A62B0 000A3210 38 00 00 00 */ li r0, 0 /* 800A62B4 000A3214 90 03 00 04 */ stw r0, 4(r3) -/* 800A62B8 000A3218 4E 80 00 20 */ blr +/* 800A62B8 000A3218 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR20CScriptSpindleCamera" "Visit__29TCastToPtr<15CScriptWaypoint>FR20CScriptSpindleCamera": /* 800A62BC 000A321C 38 00 00 00 */ li r0, 0 /* 800A62C0 000A3220 90 03 00 04 */ stw r0, 4(r3) -/* 800A62C4 000A3224 4E 80 00 20 */ blr +/* 800A62C4 000A3224 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR15CSnakeWeedSwarm" "Visit__29TCastToPtr<15CScriptWaypoint>FR15CSnakeWeedSwarm": /* 800A62C8 000A3228 38 00 00 00 */ li r0, 0 /* 800A62CC 000A322C 90 03 00 04 */ stw r0, 4(r3) -/* 800A62D0 000A3230 4E 80 00 20 */ blr +/* 800A62D0 000A3230 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR15CScriptWaypoint" "Visit__29TCastToPtr<15CScriptWaypoint>FR15CScriptWaypoint": /* 800A62D4 000A3234 90 83 00 04 */ stw r4, 4(r3) -/* 800A62D8 000A3238 4E 80 00 20 */ blr +/* 800A62D8 000A3238 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR12CScriptWater" "Visit__29TCastToPtr<15CScriptWaypoint>FR12CScriptWater": /* 800A62DC 000A323C 38 00 00 00 */ li r0, 0 /* 800A62E0 000A3240 90 03 00 04 */ stw r0, 4(r3) -/* 800A62E4 000A3244 4E 80 00 20 */ blr +/* 800A62E4 000A3244 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR17CScriptVisorFlare" "Visit__29TCastToPtr<15CScriptWaypoint>FR17CScriptVisorFlare": /* 800A62E8 000A3248 38 00 00 00 */ li r0, 0 /* 800A62EC 000A324C 90 03 00 04 */ stw r0, 4(r3) -/* 800A62F0 000A3250 4E 80 00 20 */ blr +/* 800A62F0 000A3250 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR14CScriptTrigger" "Visit__29TCastToPtr<15CScriptWaypoint>FR14CScriptTrigger": /* 800A62F4 000A3254 38 00 00 00 */ li r0, 0 /* 800A62F8 000A3258 90 03 00 04 */ stw r0, 4(r3) -/* 800A62FC 000A325C 4E 80 00 20 */ blr +/* 800A62FC 000A325C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR12CScriptTimer" "Visit__29TCastToPtr<15CScriptWaypoint>FR12CScriptTimer": /* 800A6300 000A3260 38 00 00 00 */ li r0, 0 /* 800A6304 000A3264 90 03 00 04 */ stw r0, 4(r3) -/* 800A6308 000A3268 4E 80 00 20 */ blr +/* 800A6308 000A3268 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR10CTeamAiMgr" "Visit__29TCastToPtr<15CScriptWaypoint>FR10CTeamAiMgr": /* 800A630C 000A326C 38 00 00 00 */ li r0, 0 /* 800A6310 000A3270 90 03 00 04 */ stw r0, 4(r3) -/* 800A6314 000A3274 4E 80 00 20 */ blr +/* 800A6314 000A3274 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR21CScriptTargetingPoint" "Visit__29TCastToPtr<15CScriptWaypoint>FR21CScriptTargetingPoint": /* 800A6318 000A3278 38 00 00 00 */ li r0, 0 /* 800A631C 000A327C 90 03 00 04 */ stw r0, 4(r3) -/* 800A6320 000A3280 4E 80 00 20 */ blr +/* 800A6320 000A3280 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR25CScriptSpiderBallWaypoint" "Visit__29TCastToPtr<15CScriptWaypoint>FR25CScriptSpiderBallWaypoint": /* 800A6324 000A3284 38 00 00 00 */ li r0, 0 /* 800A6328 000A3288 90 03 00 04 */ stw r0, 4(r3) -/* 800A632C 000A328C 4E 80 00 20 */ blr +/* 800A632C 000A328C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR34CScriptSpiderBallAttractionSurface" "Visit__29TCastToPtr<15CScriptWaypoint>FR34CScriptSpiderBallAttractionSurface": /* 800A6330 000A3290 38 00 00 00 */ li r0, 0 /* 800A6334 000A3294 90 03 00 04 */ stw r0, 4(r3) -/* 800A6338 000A3298 4E 80 00 20 */ blr +/* 800A6338 000A3298 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR22CScriptSpecialFunction" "Visit__29TCastToPtr<15CScriptWaypoint>FR22CScriptSpecialFunction": /* 800A633C 000A329C 38 00 00 00 */ li r0, 0 /* 800A6340 000A32A0 90 03 00 04 */ stw r0, 4(r3) -/* 800A6344 000A32A4 4E 80 00 20 */ blr +/* 800A6344 000A32A4 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR17CScriptSpawnPoint" "Visit__29TCastToPtr<15CScriptWaypoint>FR17CScriptSpawnPoint": /* 800A6348 000A32A8 38 00 00 00 */ li r0, 0 /* 800A634C 000A32AC 90 03 00 04 */ stw r0, 4(r3) -/* 800A6350 000A32B0 4E 80 00 20 */ blr +/* 800A6350 000A32B0 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR12CScriptSound" "Visit__29TCastToPtr<15CScriptWaypoint>FR12CScriptSound": /* 800A6354 000A32B4 38 00 00 00 */ li r0, 0 /* 800A6358 000A32B8 90 03 00 04 */ stw r0, 4(r3) -/* 800A635C 000A32BC 4E 80 00 20 */ blr +/* 800A635C 000A32BC 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR20CScriptRoomAcoustics" "Visit__29TCastToPtr<15CScriptWaypoint>FR20CScriptRoomAcoustics": /* 800A6360 000A32C0 38 00 00 00 */ li r0, 0 /* 800A6364 000A32C4 90 03 00 04 */ stw r0, 4(r3) -/* 800A6368 000A32C8 4E 80 00 20 */ blr +/* 800A6368 000A32C8 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR22CScriptPointOfinterest" "Visit__29TCastToPtr<15CScriptWaypoint>FR22CScriptPointOfinterest": /* 800A636C 000A32CC 38 00 00 00 */ li r0, 0 /* 800A6370 000A32D0 90 03 00 04 */ stw r0, 4(r3) -/* 800A6374 000A32D4 4E 80 00 20 */ blr +/* 800A6374 000A32D4 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR17CScriptPlayerHint" "Visit__29TCastToPtr<15CScriptWaypoint>FR17CScriptPlayerHint": /* 800A6378 000A32D8 38 00 00 00 */ li r0, 0 /* 800A637C 000A32DC 90 03 00 04 */ stw r0, 4(r3) -/* 800A6380 000A32E0 4E 80 00 20 */ blr +/* 800A6380 000A32E0 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR15CScriptPlatform" "Visit__29TCastToPtr<15CScriptWaypoint>FR15CScriptPlatform": /* 800A6384 000A32E4 38 00 00 00 */ li r0, 0 /* 800A6388 000A32E8 90 03 00 04 */ stw r0, 4(r3) -/* 800A638C 000A32EC 4E 80 00 20 */ blr +/* 800A638C 000A32EC 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR13CScriptPickup" "Visit__29TCastToPtr<15CScriptWaypoint>FR13CScriptPickup": /* 800A6390 000A32F0 38 00 00 00 */ li r0, 0 /* 800A6394 000A32F4 90 03 00 04 */ stw r0, 4(r3) -/* 800A6398 000A32F8 4E 80 00 20 */ blr +/* 800A6398 000A32F8 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR15CScriptMazeNode" "Visit__29TCastToPtr<15CScriptWaypoint>FR15CScriptMazeNode": /* 800A639C 000A32FC 38 00 00 00 */ li r0, 0 /* 800A63A0 000A3300 90 03 00 04 */ stw r0, 4(r3) -/* 800A63A4 000A3304 4E 80 00 20 */ blr +/* 800A63A4 000A3304 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR16CScriptGunTurret" "Visit__29TCastToPtr<15CScriptWaypoint>FR16CScriptGunTurret": /* 800A63A8 000A3308 38 00 00 00 */ li r0, 0 /* 800A63AC 000A330C 90 03 00 04 */ stw r0, 4(r3) -/* 800A63B0 000A3310 4E 80 00 20 */ blr +/* 800A63B0 000A3310 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR19CScriptGrapplePoint" "Visit__29TCastToPtr<15CScriptWaypoint>FR19CScriptGrapplePoint": /* 800A63B4 000A3314 38 00 00 00 */ li r0, 0 /* 800A63B8 000A3318 90 03 00 04 */ stw r0, 4(r3) -/* 800A63BC 000A331C 4E 80 00 20 */ blr +/* 800A63BC 000A331C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR13CScriptEffect" "Visit__29TCastToPtr<15CScriptWaypoint>FR13CScriptEffect": /* 800A63C0 000A3320 38 00 00 00 */ li r0, 0 /* 800A63C4 000A3324 90 03 00 04 */ stw r0, 4(r3) -/* 800A63C8 000A3328 4E 80 00 20 */ blr +/* 800A63C8 000A3328 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR11CScriptDoor" "Visit__29TCastToPtr<15CScriptWaypoint>FR11CScriptDoor": /* 800A63CC 000A332C 38 00 00 00 */ li r0, 0 /* 800A63D0 000A3330 90 03 00 04 */ stw r0, 4(r3) -/* 800A63D4 000A3334 4E 80 00 20 */ blr +/* 800A63D4 000A3334 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR11CScriptDock" "Visit__29TCastToPtr<15CScriptWaypoint>FR11CScriptDock": /* 800A63D8 000A3338 38 00 00 00 */ li r0, 0 /* 800A63DC 000A333C 90 03 00 04 */ stw r0, 4(r3) -/* 800A63E0 000A3340 4E 80 00 20 */ blr +/* 800A63E0 000A3340 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR18CScriptDistanceFog" "Visit__29TCastToPtr<15CScriptWaypoint>FR18CScriptDistanceFog": /* 800A63E4 000A3344 38 00 00 00 */ li r0, 0 /* 800A63E8 000A3348 90 03 00 04 */ stw r0, 4(r3) -/* 800A63EC 000A334C 4E 80 00 20 */ blr +/* 800A63EC 000A334C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR26CScriptDebugCameraWaypoint" "Visit__29TCastToPtr<15CScriptWaypoint>FR26CScriptDebugCameraWaypoint": /* 800A63F0 000A3350 38 00 00 00 */ li r0, 0 /* 800A63F4 000A3354 90 03 00 04 */ stw r0, 4(r3) -/* 800A63F8 000A3358 4E 80 00 20 */ blr +/* 800A63F8 000A3358 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR17CScriptCoverPoint" "Visit__29TCastToPtr<15CScriptWaypoint>FR17CScriptCoverPoint": /* 800A63FC 000A335C 38 00 00 00 */ li r0, 0 /* 800A6400 000A3360 90 03 00 04 */ stw r0, 4(r3) -/* 800A6404 000A3364 4E 80 00 20 */ blr +/* 800A6404 000A3364 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR21CScriptCameraWaypoint" "Visit__29TCastToPtr<15CScriptWaypoint>FR21CScriptCameraWaypoint": /* 800A6408 000A3368 38 00 00 00 */ li r0, 0 /* 800A640C 000A336C 90 03 00 04 */ stw r0, 4(r3) -/* 800A6410 000A3370 4E 80 00 20 */ blr +/* 800A6410 000A3370 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR24CScriptCameraPitchVolume" "Visit__29TCastToPtr<15CScriptWaypoint>FR24CScriptCameraPitchVolume": /* 800A6414 000A3374 38 00 00 00 */ li r0, 0 /* 800A6418 000A3378 90 03 00 04 */ stw r0, 4(r3) -/* 800A641C 000A337C 4E 80 00 20 */ blr +/* 800A641C 000A337C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR17CScriptCameraHint" "Visit__29TCastToPtr<15CScriptWaypoint>FR17CScriptCameraHint": /* 800A6420 000A3380 38 00 00 00 */ li r0, 0 /* 800A6424 000A3384 90 03 00 04 */ stw r0, 4(r3) -/* 800A6428 000A3388 4E 80 00 20 */ blr +/* 800A6428 000A3388 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR18CScriptAiJumpPoint" "Visit__29TCastToPtr<15CScriptWaypoint>FR18CScriptAiJumpPoint": /* 800A642C 000A338C 38 00 00 00 */ li r0, 0 /* 800A6430 000A3390 90 03 00 04 */ stw r0, 4(r3) -/* 800A6434 000A3394 4E 80 00 20 */ blr +/* 800A6434 000A3394 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR20CScriptActorKeyframe" "Visit__29TCastToPtr<15CScriptWaypoint>FR20CScriptActorKeyframe": /* 800A6438 000A3398 38 00 00 00 */ li r0, 0 /* 800A643C 000A339C 90 03 00 04 */ stw r0, 4(r3) -/* 800A6440 000A33A0 4E 80 00 20 */ blr +/* 800A6440 000A33A0 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR12CScriptActor" "Visit__29TCastToPtr<15CScriptWaypoint>FR12CScriptActor": /* 800A6444 000A33A4 38 00 00 00 */ li r0, 0 /* 800A6448 000A33A8 90 03 00 04 */ stw r0, 4(r3) -/* 800A644C 000A33AC 4E 80 00 20 */ blr +/* 800A644C 000A33AC 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR9CRepulsor" "Visit__29TCastToPtr<15CScriptWaypoint>FR9CRepulsor": /* 800A6450 000A33B0 38 00 00 00 */ li r0, 0 /* 800A6454 000A33B4 90 03 00 04 */ stw r0, 4(r3) -/* 800A6458 000A33B8 4E 80 00 20 */ blr +/* 800A6458 000A33B8 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR7CPlayer" "Visit__29TCastToPtr<15CScriptWaypoint>FR7CPlayer": /* 800A645C 000A33BC 38 00 00 00 */ li r0, 0 /* 800A6460 000A33C0 90 03 00 04 */ stw r0, 4(r3) -/* 800A6464 000A33C4 4E 80 00 20 */ blr +/* 800A6464 000A33C4 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR13CPhysicsActor" "Visit__29TCastToPtr<15CScriptWaypoint>FR13CPhysicsActor": /* 800A6468 000A33C8 38 00 00 00 */ li r0, 0 /* 800A646C 000A33CC 90 03 00 04 */ stw r0, 4(r3) -/* 800A6470 000A33D0 4E 80 00 20 */ blr +/* 800A6470 000A33D0 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR3CAi" "Visit__29TCastToPtr<15CScriptWaypoint>FR3CAi": /* 800A6474 000A33D4 38 00 00 00 */ li r0, 0 /* 800A6478 000A33D8 90 03 00 04 */ stw r0, 4(r3) -/* 800A647C 000A33DC 4E 80 00 20 */ blr +/* 800A647C 000A33DC 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR11CPathCamera" "Visit__29TCastToPtr<15CScriptWaypoint>FR11CPathCamera": /* 800A6480 000A33E0 38 00 00 00 */ li r0, 0 /* 800A6484 000A33E4 90 03 00 04 */ stw r0, 4(r3) -/* 800A6488 000A33E8 4E 80 00 20 */ blr +/* 800A6488 000A33E8 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR18CMetroidPrimeRelay" "Visit__29TCastToPtr<15CScriptWaypoint>FR18CMetroidPrimeRelay": /* 800A648C 000A33EC 38 00 00 00 */ li r0, 0 /* 800A6490 000A33F0 90 03 00 04 */ stw r0, 4(r3) -/* 800A6494 000A33F4 4E 80 00 20 */ blr +/* 800A6494 000A33F4 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR19CHUDBillboardEffect" "Visit__29TCastToPtr<15CScriptWaypoint>FR19CHUDBillboardEffect": /* 800A6498 000A33F8 38 00 00 00 */ li r0, 0 /* 800A649C 000A33FC 90 03 00 04 */ stw r0, 4(r3) -/* 800A64A0 000A3400 4E 80 00 20 */ blr +/* 800A64A0 000A3400 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR15CGameProjectile" "Visit__29TCastToPtr<15CScriptWaypoint>FR15CGameProjectile": /* 800A64A4 000A3404 38 00 00 00 */ li r0, 0 /* 800A64A8 000A3408 90 03 00 04 */ stw r0, 4(r3) -/* 800A64AC 000A340C 4E 80 00 20 */ blr +/* 800A64AC 000A340C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR10CGameLight" "Visit__29TCastToPtr<15CScriptWaypoint>FR10CGameLight": /* 800A64B0 000A3410 38 00 00 00 */ li r0, 0 /* 800A64B4 000A3414 90 03 00 04 */ stw r0, 4(r3) -/* 800A64B8 000A3418 4E 80 00 20 */ blr +/* 800A64B8 000A3418 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR11CGameCamera" "Visit__29TCastToPtr<15CScriptWaypoint>FR11CGameCamera": /* 800A64BC 000A341C 38 00 00 00 */ li r0, 0 /* 800A64C0 000A3420 90 03 00 04 */ stw r0, 4(r3) -/* 800A64C4 000A3424 4E 80 00 20 */ blr +/* 800A64C4 000A3424 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR10CFishCloud" "Visit__29TCastToPtr<15CScriptWaypoint>FR10CFishCloud": /* 800A64C8 000A3428 38 00 00 00 */ li r0, 0 /* 800A64CC 000A342C 90 03 00 04 */ stw r0, 4(r3) -/* 800A64D0 000A3430 4E 80 00 20 */ blr +/* 800A64D0 000A3430 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR18CFirstPersonCamera" "Visit__29TCastToPtr<15CScriptWaypoint>FR18CFirstPersonCamera": /* 800A64D4 000A3434 38 00 00 00 */ li r0, 0 /* 800A64D8 000A3438 90 03 00 04 */ stw r0, 4(r3) -/* 800A64DC 000A343C 4E 80 00 20 */ blr +/* 800A64DC 000A343C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR10CExplosion" "Visit__29TCastToPtr<15CScriptWaypoint>FR10CExplosion": /* 800A64E0 000A3440 38 00 00 00 */ li r0, 0 /* 800A64E4 000A3444 90 03 00 04 */ stw r0, 4(r3) -/* 800A64E8 000A3448 4E 80 00 20 */ blr +/* 800A64E8 000A3448 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR7CEntity" "Visit__29TCastToPtr<15CScriptWaypoint>FR7CEntity": /* 800A64EC 000A344C 38 00 00 00 */ li r0, 0 /* 800A64F0 000A3450 90 03 00 04 */ stw r0, 4(r3) -/* 800A64F4 000A3454 4E 80 00 20 */ blr +/* 800A64F4 000A3454 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR17CEnergyProjectile" "Visit__29TCastToPtr<15CScriptWaypoint>FR17CEnergyProjectile": /* 800A64F8 000A3458 38 00 00 00 */ li r0, 0 /* 800A64FC 000A345C 90 03 00 04 */ stw r0, 4(r3) -/* 800A6500 000A3460 4E 80 00 20 */ blr +/* 800A6500 000A3460 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR16CDestroyableRock" "Visit__29TCastToPtr<15CScriptWaypoint>FR16CDestroyableRock": /* 800A6504 000A3464 38 00 00 00 */ li r0, 0 /* 800A6508 000A3468 90 03 00 04 */ stw r0, 4(r3) -/* 800A650C 000A346C 4E 80 00 20 */ blr +/* 800A650C 000A346C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR15CCollisionActor" "Visit__29TCastToPtr<15CScriptWaypoint>FR15CCollisionActor": /* 800A6510 000A3470 38 00 00 00 */ li r0, 0 /* 800A6514 000A3474 90 03 00 04 */ stw r0, 4(r3) -/* 800A6518 000A3478 4E 80 00 20 */ blr +/* 800A6518 000A3478 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR16CCinematicCamera" "Visit__29TCastToPtr<15CScriptWaypoint>FR16CCinematicCamera": /* 800A651C 000A347C 38 00 00 00 */ li r0, 0 /* 800A6520 000A3480 90 03 00 04 */ stw r0, 4(r3) -/* 800A6524 000A3484 4E 80 00 20 */ blr +/* 800A6524 000A3484 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR5CBomb" "Visit__29TCastToPtr<15CScriptWaypoint>FR5CBomb": /* 800A6528 000A3488 38 00 00 00 */ li r0, 0 /* 800A652C 000A348C 90 03 00 04 */ stw r0, 4(r3) -/* 800A6530 000A3490 4E 80 00 20 */ blr +/* 800A6530 000A3490 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR11CBallCamera" "Visit__29TCastToPtr<15CScriptWaypoint>FR11CBallCamera": /* 800A6534 000A3494 38 00 00 00 */ li r0, 0 /* 800A6538 000A3498 90 03 00 04 */ stw r0, 4(r3) -/* 800A653C 000A349C 4E 80 00 20 */ blr +/* 800A653C 000A349C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptWaypoint>FR6CActor" "Visit__29TCastToPtr<15CScriptWaypoint>FR6CActor": /* 800A6540 000A34A0 38 00 00 00 */ li r0, 0 /* 800A6544 000A34A4 90 03 00 04 */ stw r0, 4(r3) -/* 800A6548 000A34A8 4E 80 00 20 */ blr +/* 800A6548 000A34A8 4E 80 00 20 */ blr .global "__ct__29TCastToPtr<15CScriptWaypoint>FP7CEntity" "__ct__29TCastToPtr<15CScriptWaypoint>FP7CEntity": @@ -5282,355 +5282,355 @@ lbl_800A628C: /* 800A6590 000A34F0 81 83 00 00 */ lwz r12, 0(r3) /* 800A6594 000A34F4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800A6598 000A34F8 7D 89 03 A6 */ mtctr r12 -/* 800A659C 000A34FC 4E 80 04 21 */ bctrl +/* 800A659C 000A34FC 4E 80 04 21 */ bctrl lbl_800A65A0: /* 800A65A0 000A3500 80 01 00 14 */ lwz r0, 0x14(r1) /* 800A65A4 000A3504 7F E3 FB 78 */ mr r3, r31 /* 800A65A8 000A3508 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800A65AC 000A350C 7C 08 03 A6 */ mtlr r0 /* 800A65B0 000A3510 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A65B4 000A3514 4E 80 00 20 */ blr +/* 800A65B4 000A3514 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR7CWeapon" "Visit__26TCastToPtr<12CScriptWater>FR7CWeapon": /* 800A65B8 000A3518 38 00 00 00 */ li r0, 0 /* 800A65BC 000A351C 90 03 00 04 */ stw r0, 4(r3) -/* 800A65C0 000A3520 4E 80 00 20 */ blr +/* 800A65C0 000A3520 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR17CWallCrawlerSwarm" "Visit__26TCastToPtr<12CScriptWater>FR17CWallCrawlerSwarm": /* 800A65C4 000A3524 38 00 00 00 */ li r0, 0 /* 800A65C8 000A3528 90 03 00 04 */ stw r0, 4(r3) -/* 800A65CC 000A352C 4E 80 00 20 */ blr +/* 800A65CC 000A352C 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR20CScriptSpindleCamera" "Visit__26TCastToPtr<12CScriptWater>FR20CScriptSpindleCamera": /* 800A65D0 000A3530 38 00 00 00 */ li r0, 0 /* 800A65D4 000A3534 90 03 00 04 */ stw r0, 4(r3) -/* 800A65D8 000A3538 4E 80 00 20 */ blr +/* 800A65D8 000A3538 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR15CSnakeWeedSwarm" "Visit__26TCastToPtr<12CScriptWater>FR15CSnakeWeedSwarm": /* 800A65DC 000A353C 38 00 00 00 */ li r0, 0 /* 800A65E0 000A3540 90 03 00 04 */ stw r0, 4(r3) -/* 800A65E4 000A3544 4E 80 00 20 */ blr +/* 800A65E4 000A3544 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR15CScriptWaypoint" "Visit__26TCastToPtr<12CScriptWater>FR15CScriptWaypoint": /* 800A65E8 000A3548 38 00 00 00 */ li r0, 0 /* 800A65EC 000A354C 90 03 00 04 */ stw r0, 4(r3) -/* 800A65F0 000A3550 4E 80 00 20 */ blr +/* 800A65F0 000A3550 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR12CScriptWater" "Visit__26TCastToPtr<12CScriptWater>FR12CScriptWater": /* 800A65F4 000A3554 90 83 00 04 */ stw r4, 4(r3) -/* 800A65F8 000A3558 4E 80 00 20 */ blr +/* 800A65F8 000A3558 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR17CScriptVisorFlare" "Visit__26TCastToPtr<12CScriptWater>FR17CScriptVisorFlare": /* 800A65FC 000A355C 38 00 00 00 */ li r0, 0 /* 800A6600 000A3560 90 03 00 04 */ stw r0, 4(r3) -/* 800A6604 000A3564 4E 80 00 20 */ blr +/* 800A6604 000A3564 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR14CScriptTrigger" "Visit__26TCastToPtr<12CScriptWater>FR14CScriptTrigger": /* 800A6608 000A3568 38 00 00 00 */ li r0, 0 /* 800A660C 000A356C 90 03 00 04 */ stw r0, 4(r3) -/* 800A6610 000A3570 4E 80 00 20 */ blr +/* 800A6610 000A3570 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR12CScriptTimer" "Visit__26TCastToPtr<12CScriptWater>FR12CScriptTimer": /* 800A6614 000A3574 38 00 00 00 */ li r0, 0 /* 800A6618 000A3578 90 03 00 04 */ stw r0, 4(r3) -/* 800A661C 000A357C 4E 80 00 20 */ blr +/* 800A661C 000A357C 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR10CTeamAiMgr" "Visit__26TCastToPtr<12CScriptWater>FR10CTeamAiMgr": /* 800A6620 000A3580 38 00 00 00 */ li r0, 0 /* 800A6624 000A3584 90 03 00 04 */ stw r0, 4(r3) -/* 800A6628 000A3588 4E 80 00 20 */ blr +/* 800A6628 000A3588 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR21CScriptTargetingPoint" "Visit__26TCastToPtr<12CScriptWater>FR21CScriptTargetingPoint": /* 800A662C 000A358C 38 00 00 00 */ li r0, 0 /* 800A6630 000A3590 90 03 00 04 */ stw r0, 4(r3) -/* 800A6634 000A3594 4E 80 00 20 */ blr +/* 800A6634 000A3594 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR25CScriptSpiderBallWaypoint" "Visit__26TCastToPtr<12CScriptWater>FR25CScriptSpiderBallWaypoint": /* 800A6638 000A3598 38 00 00 00 */ li r0, 0 /* 800A663C 000A359C 90 03 00 04 */ stw r0, 4(r3) -/* 800A6640 000A35A0 4E 80 00 20 */ blr +/* 800A6640 000A35A0 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR34CScriptSpiderBallAttractionSurface" "Visit__26TCastToPtr<12CScriptWater>FR34CScriptSpiderBallAttractionSurface": /* 800A6644 000A35A4 38 00 00 00 */ li r0, 0 /* 800A6648 000A35A8 90 03 00 04 */ stw r0, 4(r3) -/* 800A664C 000A35AC 4E 80 00 20 */ blr +/* 800A664C 000A35AC 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR22CScriptSpecialFunction" "Visit__26TCastToPtr<12CScriptWater>FR22CScriptSpecialFunction": /* 800A6650 000A35B0 38 00 00 00 */ li r0, 0 /* 800A6654 000A35B4 90 03 00 04 */ stw r0, 4(r3) -/* 800A6658 000A35B8 4E 80 00 20 */ blr +/* 800A6658 000A35B8 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR17CScriptSpawnPoint" "Visit__26TCastToPtr<12CScriptWater>FR17CScriptSpawnPoint": /* 800A665C 000A35BC 38 00 00 00 */ li r0, 0 /* 800A6660 000A35C0 90 03 00 04 */ stw r0, 4(r3) -/* 800A6664 000A35C4 4E 80 00 20 */ blr +/* 800A6664 000A35C4 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR12CScriptSound" "Visit__26TCastToPtr<12CScriptWater>FR12CScriptSound": /* 800A6668 000A35C8 38 00 00 00 */ li r0, 0 /* 800A666C 000A35CC 90 03 00 04 */ stw r0, 4(r3) -/* 800A6670 000A35D0 4E 80 00 20 */ blr +/* 800A6670 000A35D0 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR20CScriptRoomAcoustics" "Visit__26TCastToPtr<12CScriptWater>FR20CScriptRoomAcoustics": /* 800A6674 000A35D4 38 00 00 00 */ li r0, 0 /* 800A6678 000A35D8 90 03 00 04 */ stw r0, 4(r3) -/* 800A667C 000A35DC 4E 80 00 20 */ blr +/* 800A667C 000A35DC 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR22CScriptPointOfinterest" "Visit__26TCastToPtr<12CScriptWater>FR22CScriptPointOfinterest": /* 800A6680 000A35E0 38 00 00 00 */ li r0, 0 /* 800A6684 000A35E4 90 03 00 04 */ stw r0, 4(r3) -/* 800A6688 000A35E8 4E 80 00 20 */ blr +/* 800A6688 000A35E8 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR17CScriptPlayerHint" "Visit__26TCastToPtr<12CScriptWater>FR17CScriptPlayerHint": /* 800A668C 000A35EC 38 00 00 00 */ li r0, 0 /* 800A6690 000A35F0 90 03 00 04 */ stw r0, 4(r3) -/* 800A6694 000A35F4 4E 80 00 20 */ blr +/* 800A6694 000A35F4 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR15CScriptPlatform" "Visit__26TCastToPtr<12CScriptWater>FR15CScriptPlatform": /* 800A6698 000A35F8 38 00 00 00 */ li r0, 0 /* 800A669C 000A35FC 90 03 00 04 */ stw r0, 4(r3) -/* 800A66A0 000A3600 4E 80 00 20 */ blr +/* 800A66A0 000A3600 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR13CScriptPickup" "Visit__26TCastToPtr<12CScriptWater>FR13CScriptPickup": /* 800A66A4 000A3604 38 00 00 00 */ li r0, 0 /* 800A66A8 000A3608 90 03 00 04 */ stw r0, 4(r3) -/* 800A66AC 000A360C 4E 80 00 20 */ blr +/* 800A66AC 000A360C 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR15CScriptMazeNode" "Visit__26TCastToPtr<12CScriptWater>FR15CScriptMazeNode": /* 800A66B0 000A3610 38 00 00 00 */ li r0, 0 /* 800A66B4 000A3614 90 03 00 04 */ stw r0, 4(r3) -/* 800A66B8 000A3618 4E 80 00 20 */ blr +/* 800A66B8 000A3618 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR16CScriptGunTurret" "Visit__26TCastToPtr<12CScriptWater>FR16CScriptGunTurret": /* 800A66BC 000A361C 38 00 00 00 */ li r0, 0 /* 800A66C0 000A3620 90 03 00 04 */ stw r0, 4(r3) -/* 800A66C4 000A3624 4E 80 00 20 */ blr +/* 800A66C4 000A3624 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR19CScriptGrapplePoint" "Visit__26TCastToPtr<12CScriptWater>FR19CScriptGrapplePoint": /* 800A66C8 000A3628 38 00 00 00 */ li r0, 0 /* 800A66CC 000A362C 90 03 00 04 */ stw r0, 4(r3) -/* 800A66D0 000A3630 4E 80 00 20 */ blr +/* 800A66D0 000A3630 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR13CScriptEffect" "Visit__26TCastToPtr<12CScriptWater>FR13CScriptEffect": /* 800A66D4 000A3634 38 00 00 00 */ li r0, 0 /* 800A66D8 000A3638 90 03 00 04 */ stw r0, 4(r3) -/* 800A66DC 000A363C 4E 80 00 20 */ blr +/* 800A66DC 000A363C 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR11CScriptDoor" "Visit__26TCastToPtr<12CScriptWater>FR11CScriptDoor": /* 800A66E0 000A3640 38 00 00 00 */ li r0, 0 /* 800A66E4 000A3644 90 03 00 04 */ stw r0, 4(r3) -/* 800A66E8 000A3648 4E 80 00 20 */ blr +/* 800A66E8 000A3648 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR11CScriptDock" "Visit__26TCastToPtr<12CScriptWater>FR11CScriptDock": /* 800A66EC 000A364C 38 00 00 00 */ li r0, 0 /* 800A66F0 000A3650 90 03 00 04 */ stw r0, 4(r3) -/* 800A66F4 000A3654 4E 80 00 20 */ blr +/* 800A66F4 000A3654 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR18CScriptDistanceFog" "Visit__26TCastToPtr<12CScriptWater>FR18CScriptDistanceFog": /* 800A66F8 000A3658 38 00 00 00 */ li r0, 0 /* 800A66FC 000A365C 90 03 00 04 */ stw r0, 4(r3) -/* 800A6700 000A3660 4E 80 00 20 */ blr +/* 800A6700 000A3660 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR26CScriptDebugCameraWaypoint" "Visit__26TCastToPtr<12CScriptWater>FR26CScriptDebugCameraWaypoint": /* 800A6704 000A3664 38 00 00 00 */ li r0, 0 /* 800A6708 000A3668 90 03 00 04 */ stw r0, 4(r3) -/* 800A670C 000A366C 4E 80 00 20 */ blr +/* 800A670C 000A366C 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR17CScriptCoverPoint" "Visit__26TCastToPtr<12CScriptWater>FR17CScriptCoverPoint": /* 800A6710 000A3670 38 00 00 00 */ li r0, 0 /* 800A6714 000A3674 90 03 00 04 */ stw r0, 4(r3) -/* 800A6718 000A3678 4E 80 00 20 */ blr +/* 800A6718 000A3678 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR21CScriptCameraWaypoint" "Visit__26TCastToPtr<12CScriptWater>FR21CScriptCameraWaypoint": /* 800A671C 000A367C 38 00 00 00 */ li r0, 0 /* 800A6720 000A3680 90 03 00 04 */ stw r0, 4(r3) -/* 800A6724 000A3684 4E 80 00 20 */ blr +/* 800A6724 000A3684 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR24CScriptCameraPitchVolume" "Visit__26TCastToPtr<12CScriptWater>FR24CScriptCameraPitchVolume": /* 800A6728 000A3688 38 00 00 00 */ li r0, 0 /* 800A672C 000A368C 90 03 00 04 */ stw r0, 4(r3) -/* 800A6730 000A3690 4E 80 00 20 */ blr +/* 800A6730 000A3690 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR17CScriptCameraHint" "Visit__26TCastToPtr<12CScriptWater>FR17CScriptCameraHint": /* 800A6734 000A3694 38 00 00 00 */ li r0, 0 /* 800A6738 000A3698 90 03 00 04 */ stw r0, 4(r3) -/* 800A673C 000A369C 4E 80 00 20 */ blr +/* 800A673C 000A369C 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR18CScriptAiJumpPoint" "Visit__26TCastToPtr<12CScriptWater>FR18CScriptAiJumpPoint": /* 800A6740 000A36A0 38 00 00 00 */ li r0, 0 /* 800A6744 000A36A4 90 03 00 04 */ stw r0, 4(r3) -/* 800A6748 000A36A8 4E 80 00 20 */ blr +/* 800A6748 000A36A8 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR20CScriptActorKeyframe" "Visit__26TCastToPtr<12CScriptWater>FR20CScriptActorKeyframe": /* 800A674C 000A36AC 38 00 00 00 */ li r0, 0 /* 800A6750 000A36B0 90 03 00 04 */ stw r0, 4(r3) -/* 800A6754 000A36B4 4E 80 00 20 */ blr +/* 800A6754 000A36B4 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR12CScriptActor" "Visit__26TCastToPtr<12CScriptWater>FR12CScriptActor": /* 800A6758 000A36B8 38 00 00 00 */ li r0, 0 /* 800A675C 000A36BC 90 03 00 04 */ stw r0, 4(r3) -/* 800A6760 000A36C0 4E 80 00 20 */ blr +/* 800A6760 000A36C0 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR9CRepulsor" "Visit__26TCastToPtr<12CScriptWater>FR9CRepulsor": /* 800A6764 000A36C4 38 00 00 00 */ li r0, 0 /* 800A6768 000A36C8 90 03 00 04 */ stw r0, 4(r3) -/* 800A676C 000A36CC 4E 80 00 20 */ blr +/* 800A676C 000A36CC 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR7CPlayer" "Visit__26TCastToPtr<12CScriptWater>FR7CPlayer": /* 800A6770 000A36D0 38 00 00 00 */ li r0, 0 /* 800A6774 000A36D4 90 03 00 04 */ stw r0, 4(r3) -/* 800A6778 000A36D8 4E 80 00 20 */ blr +/* 800A6778 000A36D8 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR13CPhysicsActor" "Visit__26TCastToPtr<12CScriptWater>FR13CPhysicsActor": /* 800A677C 000A36DC 38 00 00 00 */ li r0, 0 /* 800A6780 000A36E0 90 03 00 04 */ stw r0, 4(r3) -/* 800A6784 000A36E4 4E 80 00 20 */ blr +/* 800A6784 000A36E4 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR3CAi" "Visit__26TCastToPtr<12CScriptWater>FR3CAi": /* 800A6788 000A36E8 38 00 00 00 */ li r0, 0 /* 800A678C 000A36EC 90 03 00 04 */ stw r0, 4(r3) -/* 800A6790 000A36F0 4E 80 00 20 */ blr +/* 800A6790 000A36F0 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR11CPathCamera" "Visit__26TCastToPtr<12CScriptWater>FR11CPathCamera": /* 800A6794 000A36F4 38 00 00 00 */ li r0, 0 /* 800A6798 000A36F8 90 03 00 04 */ stw r0, 4(r3) -/* 800A679C 000A36FC 4E 80 00 20 */ blr +/* 800A679C 000A36FC 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR18CMetroidPrimeRelay" "Visit__26TCastToPtr<12CScriptWater>FR18CMetroidPrimeRelay": /* 800A67A0 000A3700 38 00 00 00 */ li r0, 0 /* 800A67A4 000A3704 90 03 00 04 */ stw r0, 4(r3) -/* 800A67A8 000A3708 4E 80 00 20 */ blr +/* 800A67A8 000A3708 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR19CHUDBillboardEffect" "Visit__26TCastToPtr<12CScriptWater>FR19CHUDBillboardEffect": /* 800A67AC 000A370C 38 00 00 00 */ li r0, 0 /* 800A67B0 000A3710 90 03 00 04 */ stw r0, 4(r3) -/* 800A67B4 000A3714 4E 80 00 20 */ blr +/* 800A67B4 000A3714 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR15CGameProjectile" "Visit__26TCastToPtr<12CScriptWater>FR15CGameProjectile": /* 800A67B8 000A3718 38 00 00 00 */ li r0, 0 /* 800A67BC 000A371C 90 03 00 04 */ stw r0, 4(r3) -/* 800A67C0 000A3720 4E 80 00 20 */ blr +/* 800A67C0 000A3720 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR10CGameLight" "Visit__26TCastToPtr<12CScriptWater>FR10CGameLight": /* 800A67C4 000A3724 38 00 00 00 */ li r0, 0 /* 800A67C8 000A3728 90 03 00 04 */ stw r0, 4(r3) -/* 800A67CC 000A372C 4E 80 00 20 */ blr +/* 800A67CC 000A372C 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR11CGameCamera" "Visit__26TCastToPtr<12CScriptWater>FR11CGameCamera": /* 800A67D0 000A3730 38 00 00 00 */ li r0, 0 /* 800A67D4 000A3734 90 03 00 04 */ stw r0, 4(r3) -/* 800A67D8 000A3738 4E 80 00 20 */ blr +/* 800A67D8 000A3738 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR10CFishCloud" "Visit__26TCastToPtr<12CScriptWater>FR10CFishCloud": /* 800A67DC 000A373C 38 00 00 00 */ li r0, 0 /* 800A67E0 000A3740 90 03 00 04 */ stw r0, 4(r3) -/* 800A67E4 000A3744 4E 80 00 20 */ blr +/* 800A67E4 000A3744 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR18CFirstPersonCamera" "Visit__26TCastToPtr<12CScriptWater>FR18CFirstPersonCamera": /* 800A67E8 000A3748 38 00 00 00 */ li r0, 0 /* 800A67EC 000A374C 90 03 00 04 */ stw r0, 4(r3) -/* 800A67F0 000A3750 4E 80 00 20 */ blr +/* 800A67F0 000A3750 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR10CExplosion" "Visit__26TCastToPtr<12CScriptWater>FR10CExplosion": /* 800A67F4 000A3754 38 00 00 00 */ li r0, 0 /* 800A67F8 000A3758 90 03 00 04 */ stw r0, 4(r3) -/* 800A67FC 000A375C 4E 80 00 20 */ blr +/* 800A67FC 000A375C 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR7CEntity" "Visit__26TCastToPtr<12CScriptWater>FR7CEntity": /* 800A6800 000A3760 38 00 00 00 */ li r0, 0 /* 800A6804 000A3764 90 03 00 04 */ stw r0, 4(r3) -/* 800A6808 000A3768 4E 80 00 20 */ blr +/* 800A6808 000A3768 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR17CEnergyProjectile" "Visit__26TCastToPtr<12CScriptWater>FR17CEnergyProjectile": /* 800A680C 000A376C 38 00 00 00 */ li r0, 0 /* 800A6810 000A3770 90 03 00 04 */ stw r0, 4(r3) -/* 800A6814 000A3774 4E 80 00 20 */ blr +/* 800A6814 000A3774 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR16CDestroyableRock" "Visit__26TCastToPtr<12CScriptWater>FR16CDestroyableRock": /* 800A6818 000A3778 38 00 00 00 */ li r0, 0 /* 800A681C 000A377C 90 03 00 04 */ stw r0, 4(r3) -/* 800A6820 000A3780 4E 80 00 20 */ blr +/* 800A6820 000A3780 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR15CCollisionActor" "Visit__26TCastToPtr<12CScriptWater>FR15CCollisionActor": /* 800A6824 000A3784 38 00 00 00 */ li r0, 0 /* 800A6828 000A3788 90 03 00 04 */ stw r0, 4(r3) -/* 800A682C 000A378C 4E 80 00 20 */ blr +/* 800A682C 000A378C 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR16CCinematicCamera" "Visit__26TCastToPtr<12CScriptWater>FR16CCinematicCamera": /* 800A6830 000A3790 38 00 00 00 */ li r0, 0 /* 800A6834 000A3794 90 03 00 04 */ stw r0, 4(r3) -/* 800A6838 000A3798 4E 80 00 20 */ blr +/* 800A6838 000A3798 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR5CBomb" "Visit__26TCastToPtr<12CScriptWater>FR5CBomb": /* 800A683C 000A379C 38 00 00 00 */ li r0, 0 /* 800A6840 000A37A0 90 03 00 04 */ stw r0, 4(r3) -/* 800A6844 000A37A4 4E 80 00 20 */ blr +/* 800A6844 000A37A4 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR11CBallCamera" "Visit__26TCastToPtr<12CScriptWater>FR11CBallCamera": /* 800A6848 000A37A8 38 00 00 00 */ li r0, 0 /* 800A684C 000A37AC 90 03 00 04 */ stw r0, 4(r3) -/* 800A6850 000A37B0 4E 80 00 20 */ blr +/* 800A6850 000A37B0 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptWater>FR6CActor" "Visit__26TCastToPtr<12CScriptWater>FR6CActor": /* 800A6854 000A37B4 38 00 00 00 */ li r0, 0 /* 800A6858 000A37B8 90 03 00 04 */ stw r0, 4(r3) -/* 800A685C 000A37BC 4E 80 00 20 */ blr +/* 800A685C 000A37BC 4E 80 00 20 */ blr .global "__ct__26TCastToPtr<12CScriptWater>FP7CEntity" "__ct__26TCastToPtr<12CScriptWater>FP7CEntity": @@ -5654,14 +5654,14 @@ lbl_800A65A0: /* 800A68A4 000A3804 81 83 00 00 */ lwz r12, 0(r3) /* 800A68A8 000A3808 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800A68AC 000A380C 7D 89 03 A6 */ mtctr r12 -/* 800A68B0 000A3810 4E 80 04 21 */ bctrl +/* 800A68B0 000A3810 4E 80 04 21 */ bctrl lbl_800A68B4: /* 800A68B4 000A3814 80 01 00 14 */ lwz r0, 0x14(r1) /* 800A68B8 000A3818 7F E3 FB 78 */ mr r3, r31 /* 800A68BC 000A381C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800A68C0 000A3820 7C 08 03 A6 */ mtlr r0 /* 800A68C4 000A3824 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A68C8 000A3828 4E 80 00 20 */ blr +/* 800A68C8 000A3828 4E 80 00 20 */ blr .global "__ct__26TCastToPtr<12CScriptWater>FR7CEntity" "__ct__26TCastToPtr<12CScriptWater>FR7CEntity": @@ -5683,354 +5683,354 @@ lbl_800A68B4: /* 800A6908 000A3868 81 83 00 00 */ lwz r12, 0(r3) /* 800A690C 000A386C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800A6910 000A3870 7D 89 03 A6 */ mtctr r12 -/* 800A6914 000A3874 4E 80 04 21 */ bctrl +/* 800A6914 000A3874 4E 80 04 21 */ bctrl /* 800A6918 000A3878 80 01 00 14 */ lwz r0, 0x14(r1) /* 800A691C 000A387C 7F E3 FB 78 */ mr r3, r31 /* 800A6920 000A3880 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800A6924 000A3884 7C 08 03 A6 */ mtlr r0 /* 800A6928 000A3888 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A692C 000A388C 4E 80 00 20 */ blr +/* 800A692C 000A388C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR7CWeapon" "Visit__31TCastToPtr<17CScriptVisorFlare>FR7CWeapon": /* 800A6930 000A3890 38 00 00 00 */ li r0, 0 /* 800A6934 000A3894 90 03 00 04 */ stw r0, 4(r3) -/* 800A6938 000A3898 4E 80 00 20 */ blr +/* 800A6938 000A3898 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR17CWallCrawlerSwarm" "Visit__31TCastToPtr<17CScriptVisorFlare>FR17CWallCrawlerSwarm": /* 800A693C 000A389C 38 00 00 00 */ li r0, 0 /* 800A6940 000A38A0 90 03 00 04 */ stw r0, 4(r3) -/* 800A6944 000A38A4 4E 80 00 20 */ blr +/* 800A6944 000A38A4 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR20CScriptSpindleCamera" "Visit__31TCastToPtr<17CScriptVisorFlare>FR20CScriptSpindleCamera": /* 800A6948 000A38A8 38 00 00 00 */ li r0, 0 /* 800A694C 000A38AC 90 03 00 04 */ stw r0, 4(r3) -/* 800A6950 000A38B0 4E 80 00 20 */ blr +/* 800A6950 000A38B0 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR15CSnakeWeedSwarm" "Visit__31TCastToPtr<17CScriptVisorFlare>FR15CSnakeWeedSwarm": /* 800A6954 000A38B4 38 00 00 00 */ li r0, 0 /* 800A6958 000A38B8 90 03 00 04 */ stw r0, 4(r3) -/* 800A695C 000A38BC 4E 80 00 20 */ blr +/* 800A695C 000A38BC 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR15CScriptWaypoint" "Visit__31TCastToPtr<17CScriptVisorFlare>FR15CScriptWaypoint": /* 800A6960 000A38C0 38 00 00 00 */ li r0, 0 /* 800A6964 000A38C4 90 03 00 04 */ stw r0, 4(r3) -/* 800A6968 000A38C8 4E 80 00 20 */ blr +/* 800A6968 000A38C8 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR12CScriptWater" "Visit__31TCastToPtr<17CScriptVisorFlare>FR12CScriptWater": /* 800A696C 000A38CC 38 00 00 00 */ li r0, 0 /* 800A6970 000A38D0 90 03 00 04 */ stw r0, 4(r3) -/* 800A6974 000A38D4 4E 80 00 20 */ blr +/* 800A6974 000A38D4 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR17CScriptVisorFlare" "Visit__31TCastToPtr<17CScriptVisorFlare>FR17CScriptVisorFlare": /* 800A6978 000A38D8 90 83 00 04 */ stw r4, 4(r3) -/* 800A697C 000A38DC 4E 80 00 20 */ blr +/* 800A697C 000A38DC 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR14CScriptTrigger" "Visit__31TCastToPtr<17CScriptVisorFlare>FR14CScriptTrigger": /* 800A6980 000A38E0 38 00 00 00 */ li r0, 0 /* 800A6984 000A38E4 90 03 00 04 */ stw r0, 4(r3) -/* 800A6988 000A38E8 4E 80 00 20 */ blr +/* 800A6988 000A38E8 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR12CScriptTimer" "Visit__31TCastToPtr<17CScriptVisorFlare>FR12CScriptTimer": /* 800A698C 000A38EC 38 00 00 00 */ li r0, 0 /* 800A6990 000A38F0 90 03 00 04 */ stw r0, 4(r3) -/* 800A6994 000A38F4 4E 80 00 20 */ blr +/* 800A6994 000A38F4 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR10CTeamAiMgr" "Visit__31TCastToPtr<17CScriptVisorFlare>FR10CTeamAiMgr": /* 800A6998 000A38F8 38 00 00 00 */ li r0, 0 /* 800A699C 000A38FC 90 03 00 04 */ stw r0, 4(r3) -/* 800A69A0 000A3900 4E 80 00 20 */ blr +/* 800A69A0 000A3900 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR21CScriptTargetingPoint" "Visit__31TCastToPtr<17CScriptVisorFlare>FR21CScriptTargetingPoint": /* 800A69A4 000A3904 38 00 00 00 */ li r0, 0 /* 800A69A8 000A3908 90 03 00 04 */ stw r0, 4(r3) -/* 800A69AC 000A390C 4E 80 00 20 */ blr +/* 800A69AC 000A390C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR25CScriptSpiderBallWaypoint" "Visit__31TCastToPtr<17CScriptVisorFlare>FR25CScriptSpiderBallWaypoint": /* 800A69B0 000A3910 38 00 00 00 */ li r0, 0 /* 800A69B4 000A3914 90 03 00 04 */ stw r0, 4(r3) -/* 800A69B8 000A3918 4E 80 00 20 */ blr +/* 800A69B8 000A3918 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR34CScriptSpiderBallAttractionSurface" "Visit__31TCastToPtr<17CScriptVisorFlare>FR34CScriptSpiderBallAttractionSurface": /* 800A69BC 000A391C 38 00 00 00 */ li r0, 0 /* 800A69C0 000A3920 90 03 00 04 */ stw r0, 4(r3) -/* 800A69C4 000A3924 4E 80 00 20 */ blr +/* 800A69C4 000A3924 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR22CScriptSpecialFunction" "Visit__31TCastToPtr<17CScriptVisorFlare>FR22CScriptSpecialFunction": /* 800A69C8 000A3928 38 00 00 00 */ li r0, 0 /* 800A69CC 000A392C 90 03 00 04 */ stw r0, 4(r3) -/* 800A69D0 000A3930 4E 80 00 20 */ blr +/* 800A69D0 000A3930 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR17CScriptSpawnPoint" "Visit__31TCastToPtr<17CScriptVisorFlare>FR17CScriptSpawnPoint": /* 800A69D4 000A3934 38 00 00 00 */ li r0, 0 /* 800A69D8 000A3938 90 03 00 04 */ stw r0, 4(r3) -/* 800A69DC 000A393C 4E 80 00 20 */ blr +/* 800A69DC 000A393C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR12CScriptSound" "Visit__31TCastToPtr<17CScriptVisorFlare>FR12CScriptSound": /* 800A69E0 000A3940 38 00 00 00 */ li r0, 0 /* 800A69E4 000A3944 90 03 00 04 */ stw r0, 4(r3) -/* 800A69E8 000A3948 4E 80 00 20 */ blr +/* 800A69E8 000A3948 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR20CScriptRoomAcoustics" "Visit__31TCastToPtr<17CScriptVisorFlare>FR20CScriptRoomAcoustics": /* 800A69EC 000A394C 38 00 00 00 */ li r0, 0 /* 800A69F0 000A3950 90 03 00 04 */ stw r0, 4(r3) -/* 800A69F4 000A3954 4E 80 00 20 */ blr +/* 800A69F4 000A3954 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR22CScriptPointOfinterest" "Visit__31TCastToPtr<17CScriptVisorFlare>FR22CScriptPointOfinterest": /* 800A69F8 000A3958 38 00 00 00 */ li r0, 0 /* 800A69FC 000A395C 90 03 00 04 */ stw r0, 4(r3) -/* 800A6A00 000A3960 4E 80 00 20 */ blr +/* 800A6A00 000A3960 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR17CScriptPlayerHint" "Visit__31TCastToPtr<17CScriptVisorFlare>FR17CScriptPlayerHint": /* 800A6A04 000A3964 38 00 00 00 */ li r0, 0 /* 800A6A08 000A3968 90 03 00 04 */ stw r0, 4(r3) -/* 800A6A0C 000A396C 4E 80 00 20 */ blr +/* 800A6A0C 000A396C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR15CScriptPlatform" "Visit__31TCastToPtr<17CScriptVisorFlare>FR15CScriptPlatform": /* 800A6A10 000A3970 38 00 00 00 */ li r0, 0 /* 800A6A14 000A3974 90 03 00 04 */ stw r0, 4(r3) -/* 800A6A18 000A3978 4E 80 00 20 */ blr +/* 800A6A18 000A3978 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR13CScriptPickup" "Visit__31TCastToPtr<17CScriptVisorFlare>FR13CScriptPickup": /* 800A6A1C 000A397C 38 00 00 00 */ li r0, 0 /* 800A6A20 000A3980 90 03 00 04 */ stw r0, 4(r3) -/* 800A6A24 000A3984 4E 80 00 20 */ blr +/* 800A6A24 000A3984 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR15CScriptMazeNode" "Visit__31TCastToPtr<17CScriptVisorFlare>FR15CScriptMazeNode": /* 800A6A28 000A3988 38 00 00 00 */ li r0, 0 /* 800A6A2C 000A398C 90 03 00 04 */ stw r0, 4(r3) -/* 800A6A30 000A3990 4E 80 00 20 */ blr +/* 800A6A30 000A3990 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR16CScriptGunTurret" "Visit__31TCastToPtr<17CScriptVisorFlare>FR16CScriptGunTurret": /* 800A6A34 000A3994 38 00 00 00 */ li r0, 0 /* 800A6A38 000A3998 90 03 00 04 */ stw r0, 4(r3) -/* 800A6A3C 000A399C 4E 80 00 20 */ blr +/* 800A6A3C 000A399C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR19CScriptGrapplePoint" "Visit__31TCastToPtr<17CScriptVisorFlare>FR19CScriptGrapplePoint": /* 800A6A40 000A39A0 38 00 00 00 */ li r0, 0 /* 800A6A44 000A39A4 90 03 00 04 */ stw r0, 4(r3) -/* 800A6A48 000A39A8 4E 80 00 20 */ blr +/* 800A6A48 000A39A8 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR13CScriptEffect" "Visit__31TCastToPtr<17CScriptVisorFlare>FR13CScriptEffect": /* 800A6A4C 000A39AC 38 00 00 00 */ li r0, 0 /* 800A6A50 000A39B0 90 03 00 04 */ stw r0, 4(r3) -/* 800A6A54 000A39B4 4E 80 00 20 */ blr +/* 800A6A54 000A39B4 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR11CScriptDoor" "Visit__31TCastToPtr<17CScriptVisorFlare>FR11CScriptDoor": /* 800A6A58 000A39B8 38 00 00 00 */ li r0, 0 /* 800A6A5C 000A39BC 90 03 00 04 */ stw r0, 4(r3) -/* 800A6A60 000A39C0 4E 80 00 20 */ blr +/* 800A6A60 000A39C0 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR11CScriptDock" "Visit__31TCastToPtr<17CScriptVisorFlare>FR11CScriptDock": /* 800A6A64 000A39C4 38 00 00 00 */ li r0, 0 /* 800A6A68 000A39C8 90 03 00 04 */ stw r0, 4(r3) -/* 800A6A6C 000A39CC 4E 80 00 20 */ blr +/* 800A6A6C 000A39CC 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR18CScriptDistanceFog" "Visit__31TCastToPtr<17CScriptVisorFlare>FR18CScriptDistanceFog": /* 800A6A70 000A39D0 38 00 00 00 */ li r0, 0 /* 800A6A74 000A39D4 90 03 00 04 */ stw r0, 4(r3) -/* 800A6A78 000A39D8 4E 80 00 20 */ blr +/* 800A6A78 000A39D8 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR26CScriptDebugCameraWaypoint" "Visit__31TCastToPtr<17CScriptVisorFlare>FR26CScriptDebugCameraWaypoint": /* 800A6A7C 000A39DC 38 00 00 00 */ li r0, 0 /* 800A6A80 000A39E0 90 03 00 04 */ stw r0, 4(r3) -/* 800A6A84 000A39E4 4E 80 00 20 */ blr +/* 800A6A84 000A39E4 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR17CScriptCoverPoint" "Visit__31TCastToPtr<17CScriptVisorFlare>FR17CScriptCoverPoint": /* 800A6A88 000A39E8 38 00 00 00 */ li r0, 0 /* 800A6A8C 000A39EC 90 03 00 04 */ stw r0, 4(r3) -/* 800A6A90 000A39F0 4E 80 00 20 */ blr +/* 800A6A90 000A39F0 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR21CScriptCameraWaypoint" "Visit__31TCastToPtr<17CScriptVisorFlare>FR21CScriptCameraWaypoint": /* 800A6A94 000A39F4 38 00 00 00 */ li r0, 0 /* 800A6A98 000A39F8 90 03 00 04 */ stw r0, 4(r3) -/* 800A6A9C 000A39FC 4E 80 00 20 */ blr +/* 800A6A9C 000A39FC 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR24CScriptCameraPitchVolume" "Visit__31TCastToPtr<17CScriptVisorFlare>FR24CScriptCameraPitchVolume": /* 800A6AA0 000A3A00 38 00 00 00 */ li r0, 0 /* 800A6AA4 000A3A04 90 03 00 04 */ stw r0, 4(r3) -/* 800A6AA8 000A3A08 4E 80 00 20 */ blr +/* 800A6AA8 000A3A08 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR17CScriptCameraHint" "Visit__31TCastToPtr<17CScriptVisorFlare>FR17CScriptCameraHint": /* 800A6AAC 000A3A0C 38 00 00 00 */ li r0, 0 /* 800A6AB0 000A3A10 90 03 00 04 */ stw r0, 4(r3) -/* 800A6AB4 000A3A14 4E 80 00 20 */ blr +/* 800A6AB4 000A3A14 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR18CScriptAiJumpPoint" "Visit__31TCastToPtr<17CScriptVisorFlare>FR18CScriptAiJumpPoint": /* 800A6AB8 000A3A18 38 00 00 00 */ li r0, 0 /* 800A6ABC 000A3A1C 90 03 00 04 */ stw r0, 4(r3) -/* 800A6AC0 000A3A20 4E 80 00 20 */ blr +/* 800A6AC0 000A3A20 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR20CScriptActorKeyframe" "Visit__31TCastToPtr<17CScriptVisorFlare>FR20CScriptActorKeyframe": /* 800A6AC4 000A3A24 38 00 00 00 */ li r0, 0 /* 800A6AC8 000A3A28 90 03 00 04 */ stw r0, 4(r3) -/* 800A6ACC 000A3A2C 4E 80 00 20 */ blr +/* 800A6ACC 000A3A2C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR12CScriptActor" "Visit__31TCastToPtr<17CScriptVisorFlare>FR12CScriptActor": /* 800A6AD0 000A3A30 38 00 00 00 */ li r0, 0 /* 800A6AD4 000A3A34 90 03 00 04 */ stw r0, 4(r3) -/* 800A6AD8 000A3A38 4E 80 00 20 */ blr +/* 800A6AD8 000A3A38 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR9CRepulsor" "Visit__31TCastToPtr<17CScriptVisorFlare>FR9CRepulsor": /* 800A6ADC 000A3A3C 38 00 00 00 */ li r0, 0 /* 800A6AE0 000A3A40 90 03 00 04 */ stw r0, 4(r3) -/* 800A6AE4 000A3A44 4E 80 00 20 */ blr +/* 800A6AE4 000A3A44 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR7CPlayer" "Visit__31TCastToPtr<17CScriptVisorFlare>FR7CPlayer": /* 800A6AE8 000A3A48 38 00 00 00 */ li r0, 0 /* 800A6AEC 000A3A4C 90 03 00 04 */ stw r0, 4(r3) -/* 800A6AF0 000A3A50 4E 80 00 20 */ blr +/* 800A6AF0 000A3A50 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR13CPhysicsActor" "Visit__31TCastToPtr<17CScriptVisorFlare>FR13CPhysicsActor": /* 800A6AF4 000A3A54 38 00 00 00 */ li r0, 0 /* 800A6AF8 000A3A58 90 03 00 04 */ stw r0, 4(r3) -/* 800A6AFC 000A3A5C 4E 80 00 20 */ blr +/* 800A6AFC 000A3A5C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR3CAi" "Visit__31TCastToPtr<17CScriptVisorFlare>FR3CAi": /* 800A6B00 000A3A60 38 00 00 00 */ li r0, 0 /* 800A6B04 000A3A64 90 03 00 04 */ stw r0, 4(r3) -/* 800A6B08 000A3A68 4E 80 00 20 */ blr +/* 800A6B08 000A3A68 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR11CPathCamera" "Visit__31TCastToPtr<17CScriptVisorFlare>FR11CPathCamera": /* 800A6B0C 000A3A6C 38 00 00 00 */ li r0, 0 /* 800A6B10 000A3A70 90 03 00 04 */ stw r0, 4(r3) -/* 800A6B14 000A3A74 4E 80 00 20 */ blr +/* 800A6B14 000A3A74 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR18CMetroidPrimeRelay" "Visit__31TCastToPtr<17CScriptVisorFlare>FR18CMetroidPrimeRelay": /* 800A6B18 000A3A78 38 00 00 00 */ li r0, 0 /* 800A6B1C 000A3A7C 90 03 00 04 */ stw r0, 4(r3) -/* 800A6B20 000A3A80 4E 80 00 20 */ blr +/* 800A6B20 000A3A80 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR19CHUDBillboardEffect" "Visit__31TCastToPtr<17CScriptVisorFlare>FR19CHUDBillboardEffect": /* 800A6B24 000A3A84 38 00 00 00 */ li r0, 0 /* 800A6B28 000A3A88 90 03 00 04 */ stw r0, 4(r3) -/* 800A6B2C 000A3A8C 4E 80 00 20 */ blr +/* 800A6B2C 000A3A8C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR15CGameProjectile" "Visit__31TCastToPtr<17CScriptVisorFlare>FR15CGameProjectile": /* 800A6B30 000A3A90 38 00 00 00 */ li r0, 0 /* 800A6B34 000A3A94 90 03 00 04 */ stw r0, 4(r3) -/* 800A6B38 000A3A98 4E 80 00 20 */ blr +/* 800A6B38 000A3A98 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR10CGameLight" "Visit__31TCastToPtr<17CScriptVisorFlare>FR10CGameLight": /* 800A6B3C 000A3A9C 38 00 00 00 */ li r0, 0 /* 800A6B40 000A3AA0 90 03 00 04 */ stw r0, 4(r3) -/* 800A6B44 000A3AA4 4E 80 00 20 */ blr +/* 800A6B44 000A3AA4 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR11CGameCamera" "Visit__31TCastToPtr<17CScriptVisorFlare>FR11CGameCamera": /* 800A6B48 000A3AA8 38 00 00 00 */ li r0, 0 /* 800A6B4C 000A3AAC 90 03 00 04 */ stw r0, 4(r3) -/* 800A6B50 000A3AB0 4E 80 00 20 */ blr +/* 800A6B50 000A3AB0 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR10CFishCloud" "Visit__31TCastToPtr<17CScriptVisorFlare>FR10CFishCloud": /* 800A6B54 000A3AB4 38 00 00 00 */ li r0, 0 /* 800A6B58 000A3AB8 90 03 00 04 */ stw r0, 4(r3) -/* 800A6B5C 000A3ABC 4E 80 00 20 */ blr +/* 800A6B5C 000A3ABC 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR18CFirstPersonCamera" "Visit__31TCastToPtr<17CScriptVisorFlare>FR18CFirstPersonCamera": /* 800A6B60 000A3AC0 38 00 00 00 */ li r0, 0 /* 800A6B64 000A3AC4 90 03 00 04 */ stw r0, 4(r3) -/* 800A6B68 000A3AC8 4E 80 00 20 */ blr +/* 800A6B68 000A3AC8 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR10CExplosion" "Visit__31TCastToPtr<17CScriptVisorFlare>FR10CExplosion": /* 800A6B6C 000A3ACC 38 00 00 00 */ li r0, 0 /* 800A6B70 000A3AD0 90 03 00 04 */ stw r0, 4(r3) -/* 800A6B74 000A3AD4 4E 80 00 20 */ blr +/* 800A6B74 000A3AD4 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR7CEntity" "Visit__31TCastToPtr<17CScriptVisorFlare>FR7CEntity": /* 800A6B78 000A3AD8 38 00 00 00 */ li r0, 0 /* 800A6B7C 000A3ADC 90 03 00 04 */ stw r0, 4(r3) -/* 800A6B80 000A3AE0 4E 80 00 20 */ blr +/* 800A6B80 000A3AE0 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR17CEnergyProjectile" "Visit__31TCastToPtr<17CScriptVisorFlare>FR17CEnergyProjectile": /* 800A6B84 000A3AE4 38 00 00 00 */ li r0, 0 /* 800A6B88 000A3AE8 90 03 00 04 */ stw r0, 4(r3) -/* 800A6B8C 000A3AEC 4E 80 00 20 */ blr +/* 800A6B8C 000A3AEC 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR16CDestroyableRock" "Visit__31TCastToPtr<17CScriptVisorFlare>FR16CDestroyableRock": /* 800A6B90 000A3AF0 38 00 00 00 */ li r0, 0 /* 800A6B94 000A3AF4 90 03 00 04 */ stw r0, 4(r3) -/* 800A6B98 000A3AF8 4E 80 00 20 */ blr +/* 800A6B98 000A3AF8 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR15CCollisionActor" "Visit__31TCastToPtr<17CScriptVisorFlare>FR15CCollisionActor": /* 800A6B9C 000A3AFC 38 00 00 00 */ li r0, 0 /* 800A6BA0 000A3B00 90 03 00 04 */ stw r0, 4(r3) -/* 800A6BA4 000A3B04 4E 80 00 20 */ blr +/* 800A6BA4 000A3B04 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR16CCinematicCamera" "Visit__31TCastToPtr<17CScriptVisorFlare>FR16CCinematicCamera": /* 800A6BA8 000A3B08 38 00 00 00 */ li r0, 0 /* 800A6BAC 000A3B0C 90 03 00 04 */ stw r0, 4(r3) -/* 800A6BB0 000A3B10 4E 80 00 20 */ blr +/* 800A6BB0 000A3B10 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR5CBomb" "Visit__31TCastToPtr<17CScriptVisorFlare>FR5CBomb": /* 800A6BB4 000A3B14 38 00 00 00 */ li r0, 0 /* 800A6BB8 000A3B18 90 03 00 04 */ stw r0, 4(r3) -/* 800A6BBC 000A3B1C 4E 80 00 20 */ blr +/* 800A6BBC 000A3B1C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR11CBallCamera" "Visit__31TCastToPtr<17CScriptVisorFlare>FR11CBallCamera": /* 800A6BC0 000A3B20 38 00 00 00 */ li r0, 0 /* 800A6BC4 000A3B24 90 03 00 04 */ stw r0, 4(r3) -/* 800A6BC8 000A3B28 4E 80 00 20 */ blr +/* 800A6BC8 000A3B28 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptVisorFlare>FR6CActor" "Visit__31TCastToPtr<17CScriptVisorFlare>FR6CActor": /* 800A6BCC 000A3B2C 38 00 00 00 */ li r0, 0 /* 800A6BD0 000A3B30 90 03 00 04 */ stw r0, 4(r3) -/* 800A6BD4 000A3B34 4E 80 00 20 */ blr +/* 800A6BD4 000A3B34 4E 80 00 20 */ blr .global "__ct__31TCastToPtr<17CScriptVisorFlare>FP7CEntity" "__ct__31TCastToPtr<17CScriptVisorFlare>FP7CEntity": @@ -6054,354 +6054,354 @@ lbl_800A68B4: /* 800A6C1C 000A3B7C 81 83 00 00 */ lwz r12, 0(r3) /* 800A6C20 000A3B80 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800A6C24 000A3B84 7D 89 03 A6 */ mtctr r12 -/* 800A6C28 000A3B88 4E 80 04 21 */ bctrl +/* 800A6C28 000A3B88 4E 80 04 21 */ bctrl lbl_800A6C2C: /* 800A6C2C 000A3B8C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800A6C30 000A3B90 7F E3 FB 78 */ mr r3, r31 /* 800A6C34 000A3B94 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800A6C38 000A3B98 7C 08 03 A6 */ mtlr r0 /* 800A6C3C 000A3B9C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A6C40 000A3BA0 4E 80 00 20 */ blr +/* 800A6C40 000A3BA0 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR7CWeapon" "Visit__28TCastToPtr<14CScriptTrigger>FR7CWeapon": /* 800A6C44 000A3BA4 38 00 00 00 */ li r0, 0 /* 800A6C48 000A3BA8 90 03 00 04 */ stw r0, 4(r3) -/* 800A6C4C 000A3BAC 4E 80 00 20 */ blr +/* 800A6C4C 000A3BAC 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR17CWallCrawlerSwarm" "Visit__28TCastToPtr<14CScriptTrigger>FR17CWallCrawlerSwarm": /* 800A6C50 000A3BB0 38 00 00 00 */ li r0, 0 /* 800A6C54 000A3BB4 90 03 00 04 */ stw r0, 4(r3) -/* 800A6C58 000A3BB8 4E 80 00 20 */ blr +/* 800A6C58 000A3BB8 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR20CScriptSpindleCamera" "Visit__28TCastToPtr<14CScriptTrigger>FR20CScriptSpindleCamera": /* 800A6C5C 000A3BBC 38 00 00 00 */ li r0, 0 /* 800A6C60 000A3BC0 90 03 00 04 */ stw r0, 4(r3) -/* 800A6C64 000A3BC4 4E 80 00 20 */ blr +/* 800A6C64 000A3BC4 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR15CSnakeWeedSwarm" "Visit__28TCastToPtr<14CScriptTrigger>FR15CSnakeWeedSwarm": /* 800A6C68 000A3BC8 38 00 00 00 */ li r0, 0 /* 800A6C6C 000A3BCC 90 03 00 04 */ stw r0, 4(r3) -/* 800A6C70 000A3BD0 4E 80 00 20 */ blr +/* 800A6C70 000A3BD0 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR15CScriptWaypoint" "Visit__28TCastToPtr<14CScriptTrigger>FR15CScriptWaypoint": /* 800A6C74 000A3BD4 38 00 00 00 */ li r0, 0 /* 800A6C78 000A3BD8 90 03 00 04 */ stw r0, 4(r3) -/* 800A6C7C 000A3BDC 4E 80 00 20 */ blr +/* 800A6C7C 000A3BDC 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR12CScriptWater" "Visit__28TCastToPtr<14CScriptTrigger>FR12CScriptWater": /* 800A6C80 000A3BE0 90 83 00 04 */ stw r4, 4(r3) -/* 800A6C84 000A3BE4 4E 80 00 20 */ blr +/* 800A6C84 000A3BE4 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR17CScriptVisorFlare" "Visit__28TCastToPtr<14CScriptTrigger>FR17CScriptVisorFlare": /* 800A6C88 000A3BE8 38 00 00 00 */ li r0, 0 /* 800A6C8C 000A3BEC 90 03 00 04 */ stw r0, 4(r3) -/* 800A6C90 000A3BF0 4E 80 00 20 */ blr +/* 800A6C90 000A3BF0 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR14CScriptTrigger" "Visit__28TCastToPtr<14CScriptTrigger>FR14CScriptTrigger": /* 800A6C94 000A3BF4 90 83 00 04 */ stw r4, 4(r3) -/* 800A6C98 000A3BF8 4E 80 00 20 */ blr +/* 800A6C98 000A3BF8 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR12CScriptTimer" "Visit__28TCastToPtr<14CScriptTrigger>FR12CScriptTimer": /* 800A6C9C 000A3BFC 38 00 00 00 */ li r0, 0 /* 800A6CA0 000A3C00 90 03 00 04 */ stw r0, 4(r3) -/* 800A6CA4 000A3C04 4E 80 00 20 */ blr +/* 800A6CA4 000A3C04 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR10CTeamAiMgr" "Visit__28TCastToPtr<14CScriptTrigger>FR10CTeamAiMgr": /* 800A6CA8 000A3C08 38 00 00 00 */ li r0, 0 /* 800A6CAC 000A3C0C 90 03 00 04 */ stw r0, 4(r3) -/* 800A6CB0 000A3C10 4E 80 00 20 */ blr +/* 800A6CB0 000A3C10 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR21CScriptTargetingPoint" "Visit__28TCastToPtr<14CScriptTrigger>FR21CScriptTargetingPoint": /* 800A6CB4 000A3C14 38 00 00 00 */ li r0, 0 /* 800A6CB8 000A3C18 90 03 00 04 */ stw r0, 4(r3) -/* 800A6CBC 000A3C1C 4E 80 00 20 */ blr +/* 800A6CBC 000A3C1C 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR25CScriptSpiderBallWaypoint" "Visit__28TCastToPtr<14CScriptTrigger>FR25CScriptSpiderBallWaypoint": /* 800A6CC0 000A3C20 38 00 00 00 */ li r0, 0 /* 800A6CC4 000A3C24 90 03 00 04 */ stw r0, 4(r3) -/* 800A6CC8 000A3C28 4E 80 00 20 */ blr +/* 800A6CC8 000A3C28 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR34CScriptSpiderBallAttractionSurface" "Visit__28TCastToPtr<14CScriptTrigger>FR34CScriptSpiderBallAttractionSurface": /* 800A6CCC 000A3C2C 38 00 00 00 */ li r0, 0 /* 800A6CD0 000A3C30 90 03 00 04 */ stw r0, 4(r3) -/* 800A6CD4 000A3C34 4E 80 00 20 */ blr +/* 800A6CD4 000A3C34 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR22CScriptSpecialFunction" "Visit__28TCastToPtr<14CScriptTrigger>FR22CScriptSpecialFunction": /* 800A6CD8 000A3C38 38 00 00 00 */ li r0, 0 /* 800A6CDC 000A3C3C 90 03 00 04 */ stw r0, 4(r3) -/* 800A6CE0 000A3C40 4E 80 00 20 */ blr +/* 800A6CE0 000A3C40 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR17CScriptSpawnPoint" "Visit__28TCastToPtr<14CScriptTrigger>FR17CScriptSpawnPoint": /* 800A6CE4 000A3C44 38 00 00 00 */ li r0, 0 /* 800A6CE8 000A3C48 90 03 00 04 */ stw r0, 4(r3) -/* 800A6CEC 000A3C4C 4E 80 00 20 */ blr +/* 800A6CEC 000A3C4C 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR12CScriptSound" "Visit__28TCastToPtr<14CScriptTrigger>FR12CScriptSound": /* 800A6CF0 000A3C50 38 00 00 00 */ li r0, 0 /* 800A6CF4 000A3C54 90 03 00 04 */ stw r0, 4(r3) -/* 800A6CF8 000A3C58 4E 80 00 20 */ blr +/* 800A6CF8 000A3C58 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR20CScriptRoomAcoustics" "Visit__28TCastToPtr<14CScriptTrigger>FR20CScriptRoomAcoustics": /* 800A6CFC 000A3C5C 38 00 00 00 */ li r0, 0 /* 800A6D00 000A3C60 90 03 00 04 */ stw r0, 4(r3) -/* 800A6D04 000A3C64 4E 80 00 20 */ blr +/* 800A6D04 000A3C64 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR22CScriptPointOfinterest" "Visit__28TCastToPtr<14CScriptTrigger>FR22CScriptPointOfinterest": /* 800A6D08 000A3C68 38 00 00 00 */ li r0, 0 /* 800A6D0C 000A3C6C 90 03 00 04 */ stw r0, 4(r3) -/* 800A6D10 000A3C70 4E 80 00 20 */ blr +/* 800A6D10 000A3C70 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR17CScriptPlayerHint" "Visit__28TCastToPtr<14CScriptTrigger>FR17CScriptPlayerHint": /* 800A6D14 000A3C74 38 00 00 00 */ li r0, 0 /* 800A6D18 000A3C78 90 03 00 04 */ stw r0, 4(r3) -/* 800A6D1C 000A3C7C 4E 80 00 20 */ blr +/* 800A6D1C 000A3C7C 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR15CScriptPlatform" "Visit__28TCastToPtr<14CScriptTrigger>FR15CScriptPlatform": /* 800A6D20 000A3C80 38 00 00 00 */ li r0, 0 /* 800A6D24 000A3C84 90 03 00 04 */ stw r0, 4(r3) -/* 800A6D28 000A3C88 4E 80 00 20 */ blr +/* 800A6D28 000A3C88 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR13CScriptPickup" "Visit__28TCastToPtr<14CScriptTrigger>FR13CScriptPickup": /* 800A6D2C 000A3C8C 38 00 00 00 */ li r0, 0 /* 800A6D30 000A3C90 90 03 00 04 */ stw r0, 4(r3) -/* 800A6D34 000A3C94 4E 80 00 20 */ blr +/* 800A6D34 000A3C94 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR15CScriptMazeNode" "Visit__28TCastToPtr<14CScriptTrigger>FR15CScriptMazeNode": /* 800A6D38 000A3C98 38 00 00 00 */ li r0, 0 /* 800A6D3C 000A3C9C 90 03 00 04 */ stw r0, 4(r3) -/* 800A6D40 000A3CA0 4E 80 00 20 */ blr +/* 800A6D40 000A3CA0 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR16CScriptGunTurret" "Visit__28TCastToPtr<14CScriptTrigger>FR16CScriptGunTurret": /* 800A6D44 000A3CA4 38 00 00 00 */ li r0, 0 /* 800A6D48 000A3CA8 90 03 00 04 */ stw r0, 4(r3) -/* 800A6D4C 000A3CAC 4E 80 00 20 */ blr +/* 800A6D4C 000A3CAC 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR19CScriptGrapplePoint" "Visit__28TCastToPtr<14CScriptTrigger>FR19CScriptGrapplePoint": /* 800A6D50 000A3CB0 38 00 00 00 */ li r0, 0 /* 800A6D54 000A3CB4 90 03 00 04 */ stw r0, 4(r3) -/* 800A6D58 000A3CB8 4E 80 00 20 */ blr +/* 800A6D58 000A3CB8 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR13CScriptEffect" "Visit__28TCastToPtr<14CScriptTrigger>FR13CScriptEffect": /* 800A6D5C 000A3CBC 38 00 00 00 */ li r0, 0 /* 800A6D60 000A3CC0 90 03 00 04 */ stw r0, 4(r3) -/* 800A6D64 000A3CC4 4E 80 00 20 */ blr +/* 800A6D64 000A3CC4 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR11CScriptDoor" "Visit__28TCastToPtr<14CScriptTrigger>FR11CScriptDoor": /* 800A6D68 000A3CC8 38 00 00 00 */ li r0, 0 /* 800A6D6C 000A3CCC 90 03 00 04 */ stw r0, 4(r3) -/* 800A6D70 000A3CD0 4E 80 00 20 */ blr +/* 800A6D70 000A3CD0 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR11CScriptDock" "Visit__28TCastToPtr<14CScriptTrigger>FR11CScriptDock": /* 800A6D74 000A3CD4 38 00 00 00 */ li r0, 0 /* 800A6D78 000A3CD8 90 03 00 04 */ stw r0, 4(r3) -/* 800A6D7C 000A3CDC 4E 80 00 20 */ blr +/* 800A6D7C 000A3CDC 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR18CScriptDistanceFog" "Visit__28TCastToPtr<14CScriptTrigger>FR18CScriptDistanceFog": /* 800A6D80 000A3CE0 38 00 00 00 */ li r0, 0 /* 800A6D84 000A3CE4 90 03 00 04 */ stw r0, 4(r3) -/* 800A6D88 000A3CE8 4E 80 00 20 */ blr +/* 800A6D88 000A3CE8 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR26CScriptDebugCameraWaypoint" "Visit__28TCastToPtr<14CScriptTrigger>FR26CScriptDebugCameraWaypoint": /* 800A6D8C 000A3CEC 38 00 00 00 */ li r0, 0 /* 800A6D90 000A3CF0 90 03 00 04 */ stw r0, 4(r3) -/* 800A6D94 000A3CF4 4E 80 00 20 */ blr +/* 800A6D94 000A3CF4 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR17CScriptCoverPoint" "Visit__28TCastToPtr<14CScriptTrigger>FR17CScriptCoverPoint": /* 800A6D98 000A3CF8 38 00 00 00 */ li r0, 0 /* 800A6D9C 000A3CFC 90 03 00 04 */ stw r0, 4(r3) -/* 800A6DA0 000A3D00 4E 80 00 20 */ blr +/* 800A6DA0 000A3D00 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR21CScriptCameraWaypoint" "Visit__28TCastToPtr<14CScriptTrigger>FR21CScriptCameraWaypoint": /* 800A6DA4 000A3D04 38 00 00 00 */ li r0, 0 /* 800A6DA8 000A3D08 90 03 00 04 */ stw r0, 4(r3) -/* 800A6DAC 000A3D0C 4E 80 00 20 */ blr +/* 800A6DAC 000A3D0C 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR24CScriptCameraPitchVolume" "Visit__28TCastToPtr<14CScriptTrigger>FR24CScriptCameraPitchVolume": /* 800A6DB0 000A3D10 38 00 00 00 */ li r0, 0 /* 800A6DB4 000A3D14 90 03 00 04 */ stw r0, 4(r3) -/* 800A6DB8 000A3D18 4E 80 00 20 */ blr +/* 800A6DB8 000A3D18 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR17CScriptCameraHint" "Visit__28TCastToPtr<14CScriptTrigger>FR17CScriptCameraHint": /* 800A6DBC 000A3D1C 38 00 00 00 */ li r0, 0 /* 800A6DC0 000A3D20 90 03 00 04 */ stw r0, 4(r3) -/* 800A6DC4 000A3D24 4E 80 00 20 */ blr +/* 800A6DC4 000A3D24 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR18CScriptAiJumpPoint" "Visit__28TCastToPtr<14CScriptTrigger>FR18CScriptAiJumpPoint": /* 800A6DC8 000A3D28 38 00 00 00 */ li r0, 0 /* 800A6DCC 000A3D2C 90 03 00 04 */ stw r0, 4(r3) -/* 800A6DD0 000A3D30 4E 80 00 20 */ blr +/* 800A6DD0 000A3D30 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR20CScriptActorKeyframe" "Visit__28TCastToPtr<14CScriptTrigger>FR20CScriptActorKeyframe": /* 800A6DD4 000A3D34 38 00 00 00 */ li r0, 0 /* 800A6DD8 000A3D38 90 03 00 04 */ stw r0, 4(r3) -/* 800A6DDC 000A3D3C 4E 80 00 20 */ blr +/* 800A6DDC 000A3D3C 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR12CScriptActor" "Visit__28TCastToPtr<14CScriptTrigger>FR12CScriptActor": /* 800A6DE0 000A3D40 38 00 00 00 */ li r0, 0 /* 800A6DE4 000A3D44 90 03 00 04 */ stw r0, 4(r3) -/* 800A6DE8 000A3D48 4E 80 00 20 */ blr +/* 800A6DE8 000A3D48 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR9CRepulsor" "Visit__28TCastToPtr<14CScriptTrigger>FR9CRepulsor": /* 800A6DEC 000A3D4C 38 00 00 00 */ li r0, 0 /* 800A6DF0 000A3D50 90 03 00 04 */ stw r0, 4(r3) -/* 800A6DF4 000A3D54 4E 80 00 20 */ blr +/* 800A6DF4 000A3D54 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR7CPlayer" "Visit__28TCastToPtr<14CScriptTrigger>FR7CPlayer": /* 800A6DF8 000A3D58 38 00 00 00 */ li r0, 0 /* 800A6DFC 000A3D5C 90 03 00 04 */ stw r0, 4(r3) -/* 800A6E00 000A3D60 4E 80 00 20 */ blr +/* 800A6E00 000A3D60 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR13CPhysicsActor" "Visit__28TCastToPtr<14CScriptTrigger>FR13CPhysicsActor": /* 800A6E04 000A3D64 38 00 00 00 */ li r0, 0 /* 800A6E08 000A3D68 90 03 00 04 */ stw r0, 4(r3) -/* 800A6E0C 000A3D6C 4E 80 00 20 */ blr +/* 800A6E0C 000A3D6C 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR3CAi" "Visit__28TCastToPtr<14CScriptTrigger>FR3CAi": /* 800A6E10 000A3D70 38 00 00 00 */ li r0, 0 /* 800A6E14 000A3D74 90 03 00 04 */ stw r0, 4(r3) -/* 800A6E18 000A3D78 4E 80 00 20 */ blr +/* 800A6E18 000A3D78 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR11CPathCamera" "Visit__28TCastToPtr<14CScriptTrigger>FR11CPathCamera": /* 800A6E1C 000A3D7C 38 00 00 00 */ li r0, 0 /* 800A6E20 000A3D80 90 03 00 04 */ stw r0, 4(r3) -/* 800A6E24 000A3D84 4E 80 00 20 */ blr +/* 800A6E24 000A3D84 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR18CMetroidPrimeRelay" "Visit__28TCastToPtr<14CScriptTrigger>FR18CMetroidPrimeRelay": /* 800A6E28 000A3D88 38 00 00 00 */ li r0, 0 /* 800A6E2C 000A3D8C 90 03 00 04 */ stw r0, 4(r3) -/* 800A6E30 000A3D90 4E 80 00 20 */ blr +/* 800A6E30 000A3D90 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR19CHUDBillboardEffect" "Visit__28TCastToPtr<14CScriptTrigger>FR19CHUDBillboardEffect": /* 800A6E34 000A3D94 38 00 00 00 */ li r0, 0 /* 800A6E38 000A3D98 90 03 00 04 */ stw r0, 4(r3) -/* 800A6E3C 000A3D9C 4E 80 00 20 */ blr +/* 800A6E3C 000A3D9C 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR15CGameProjectile" "Visit__28TCastToPtr<14CScriptTrigger>FR15CGameProjectile": /* 800A6E40 000A3DA0 38 00 00 00 */ li r0, 0 /* 800A6E44 000A3DA4 90 03 00 04 */ stw r0, 4(r3) -/* 800A6E48 000A3DA8 4E 80 00 20 */ blr +/* 800A6E48 000A3DA8 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR10CGameLight" "Visit__28TCastToPtr<14CScriptTrigger>FR10CGameLight": /* 800A6E4C 000A3DAC 38 00 00 00 */ li r0, 0 /* 800A6E50 000A3DB0 90 03 00 04 */ stw r0, 4(r3) -/* 800A6E54 000A3DB4 4E 80 00 20 */ blr +/* 800A6E54 000A3DB4 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR11CGameCamera" "Visit__28TCastToPtr<14CScriptTrigger>FR11CGameCamera": /* 800A6E58 000A3DB8 38 00 00 00 */ li r0, 0 /* 800A6E5C 000A3DBC 90 03 00 04 */ stw r0, 4(r3) -/* 800A6E60 000A3DC0 4E 80 00 20 */ blr +/* 800A6E60 000A3DC0 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR10CFishCloud" "Visit__28TCastToPtr<14CScriptTrigger>FR10CFishCloud": /* 800A6E64 000A3DC4 38 00 00 00 */ li r0, 0 /* 800A6E68 000A3DC8 90 03 00 04 */ stw r0, 4(r3) -/* 800A6E6C 000A3DCC 4E 80 00 20 */ blr +/* 800A6E6C 000A3DCC 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR18CFirstPersonCamera" "Visit__28TCastToPtr<14CScriptTrigger>FR18CFirstPersonCamera": /* 800A6E70 000A3DD0 38 00 00 00 */ li r0, 0 /* 800A6E74 000A3DD4 90 03 00 04 */ stw r0, 4(r3) -/* 800A6E78 000A3DD8 4E 80 00 20 */ blr +/* 800A6E78 000A3DD8 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR10CExplosion" "Visit__28TCastToPtr<14CScriptTrigger>FR10CExplosion": /* 800A6E7C 000A3DDC 38 00 00 00 */ li r0, 0 /* 800A6E80 000A3DE0 90 03 00 04 */ stw r0, 4(r3) -/* 800A6E84 000A3DE4 4E 80 00 20 */ blr +/* 800A6E84 000A3DE4 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR7CEntity" "Visit__28TCastToPtr<14CScriptTrigger>FR7CEntity": /* 800A6E88 000A3DE8 38 00 00 00 */ li r0, 0 /* 800A6E8C 000A3DEC 90 03 00 04 */ stw r0, 4(r3) -/* 800A6E90 000A3DF0 4E 80 00 20 */ blr +/* 800A6E90 000A3DF0 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR17CEnergyProjectile" "Visit__28TCastToPtr<14CScriptTrigger>FR17CEnergyProjectile": /* 800A6E94 000A3DF4 38 00 00 00 */ li r0, 0 /* 800A6E98 000A3DF8 90 03 00 04 */ stw r0, 4(r3) -/* 800A6E9C 000A3DFC 4E 80 00 20 */ blr +/* 800A6E9C 000A3DFC 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR16CDestroyableRock" "Visit__28TCastToPtr<14CScriptTrigger>FR16CDestroyableRock": /* 800A6EA0 000A3E00 38 00 00 00 */ li r0, 0 /* 800A6EA4 000A3E04 90 03 00 04 */ stw r0, 4(r3) -/* 800A6EA8 000A3E08 4E 80 00 20 */ blr +/* 800A6EA8 000A3E08 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR15CCollisionActor" "Visit__28TCastToPtr<14CScriptTrigger>FR15CCollisionActor": /* 800A6EAC 000A3E0C 38 00 00 00 */ li r0, 0 /* 800A6EB0 000A3E10 90 03 00 04 */ stw r0, 4(r3) -/* 800A6EB4 000A3E14 4E 80 00 20 */ blr +/* 800A6EB4 000A3E14 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR16CCinematicCamera" "Visit__28TCastToPtr<14CScriptTrigger>FR16CCinematicCamera": /* 800A6EB8 000A3E18 38 00 00 00 */ li r0, 0 /* 800A6EBC 000A3E1C 90 03 00 04 */ stw r0, 4(r3) -/* 800A6EC0 000A3E20 4E 80 00 20 */ blr +/* 800A6EC0 000A3E20 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR5CBomb" "Visit__28TCastToPtr<14CScriptTrigger>FR5CBomb": /* 800A6EC4 000A3E24 38 00 00 00 */ li r0, 0 /* 800A6EC8 000A3E28 90 03 00 04 */ stw r0, 4(r3) -/* 800A6ECC 000A3E2C 4E 80 00 20 */ blr +/* 800A6ECC 000A3E2C 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR11CBallCamera" "Visit__28TCastToPtr<14CScriptTrigger>FR11CBallCamera": /* 800A6ED0 000A3E30 38 00 00 00 */ li r0, 0 /* 800A6ED4 000A3E34 90 03 00 04 */ stw r0, 4(r3) -/* 800A6ED8 000A3E38 4E 80 00 20 */ blr +/* 800A6ED8 000A3E38 4E 80 00 20 */ blr .global "Visit__28TCastToPtr<14CScriptTrigger>FR6CActor" "Visit__28TCastToPtr<14CScriptTrigger>FR6CActor": /* 800A6EDC 000A3E3C 38 00 00 00 */ li r0, 0 /* 800A6EE0 000A3E40 90 03 00 04 */ stw r0, 4(r3) -/* 800A6EE4 000A3E44 4E 80 00 20 */ blr +/* 800A6EE4 000A3E44 4E 80 00 20 */ blr .global "__ct__28TCastToPtr<14CScriptTrigger>FP7CEntity" "__ct__28TCastToPtr<14CScriptTrigger>FP7CEntity": @@ -6425,14 +6425,14 @@ lbl_800A6C2C: /* 800A6F2C 000A3E8C 81 83 00 00 */ lwz r12, 0(r3) /* 800A6F30 000A3E90 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800A6F34 000A3E94 7D 89 03 A6 */ mtctr r12 -/* 800A6F38 000A3E98 4E 80 04 21 */ bctrl +/* 800A6F38 000A3E98 4E 80 04 21 */ bctrl lbl_800A6F3C: /* 800A6F3C 000A3E9C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800A6F40 000A3EA0 7F E3 FB 78 */ mr r3, r31 /* 800A6F44 000A3EA4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800A6F48 000A3EA8 7C 08 03 A6 */ mtlr r0 /* 800A6F4C 000A3EAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A6F50 000A3EB0 4E 80 00 20 */ blr +/* 800A6F50 000A3EB0 4E 80 00 20 */ blr .global "__ct__28TCastToPtr<14CScriptTrigger>FR7CEntity" "__ct__28TCastToPtr<14CScriptTrigger>FR7CEntity": @@ -6454,354 +6454,354 @@ lbl_800A6F3C: /* 800A6F90 000A3EF0 81 83 00 00 */ lwz r12, 0(r3) /* 800A6F94 000A3EF4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800A6F98 000A3EF8 7D 89 03 A6 */ mtctr r12 -/* 800A6F9C 000A3EFC 4E 80 04 21 */ bctrl +/* 800A6F9C 000A3EFC 4E 80 04 21 */ bctrl /* 800A6FA0 000A3F00 80 01 00 14 */ lwz r0, 0x14(r1) /* 800A6FA4 000A3F04 7F E3 FB 78 */ mr r3, r31 /* 800A6FA8 000A3F08 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800A6FAC 000A3F0C 7C 08 03 A6 */ mtlr r0 /* 800A6FB0 000A3F10 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A6FB4 000A3F14 4E 80 00 20 */ blr +/* 800A6FB4 000A3F14 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR7CWeapon" "Visit__26TCastToPtr<12CScriptTimer>FR7CWeapon": /* 800A6FB8 000A3F18 38 00 00 00 */ li r0, 0 /* 800A6FBC 000A3F1C 90 03 00 04 */ stw r0, 4(r3) -/* 800A6FC0 000A3F20 4E 80 00 20 */ blr +/* 800A6FC0 000A3F20 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR17CWallCrawlerSwarm" "Visit__26TCastToPtr<12CScriptTimer>FR17CWallCrawlerSwarm": /* 800A6FC4 000A3F24 38 00 00 00 */ li r0, 0 /* 800A6FC8 000A3F28 90 03 00 04 */ stw r0, 4(r3) -/* 800A6FCC 000A3F2C 4E 80 00 20 */ blr +/* 800A6FCC 000A3F2C 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR20CScriptSpindleCamera" "Visit__26TCastToPtr<12CScriptTimer>FR20CScriptSpindleCamera": /* 800A6FD0 000A3F30 38 00 00 00 */ li r0, 0 /* 800A6FD4 000A3F34 90 03 00 04 */ stw r0, 4(r3) -/* 800A6FD8 000A3F38 4E 80 00 20 */ blr +/* 800A6FD8 000A3F38 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR15CSnakeWeedSwarm" "Visit__26TCastToPtr<12CScriptTimer>FR15CSnakeWeedSwarm": /* 800A6FDC 000A3F3C 38 00 00 00 */ li r0, 0 /* 800A6FE0 000A3F40 90 03 00 04 */ stw r0, 4(r3) -/* 800A6FE4 000A3F44 4E 80 00 20 */ blr +/* 800A6FE4 000A3F44 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR15CScriptWaypoint" "Visit__26TCastToPtr<12CScriptTimer>FR15CScriptWaypoint": /* 800A6FE8 000A3F48 38 00 00 00 */ li r0, 0 /* 800A6FEC 000A3F4C 90 03 00 04 */ stw r0, 4(r3) -/* 800A6FF0 000A3F50 4E 80 00 20 */ blr +/* 800A6FF0 000A3F50 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR12CScriptWater" "Visit__26TCastToPtr<12CScriptTimer>FR12CScriptWater": /* 800A6FF4 000A3F54 38 00 00 00 */ li r0, 0 /* 800A6FF8 000A3F58 90 03 00 04 */ stw r0, 4(r3) -/* 800A6FFC 000A3F5C 4E 80 00 20 */ blr +/* 800A6FFC 000A3F5C 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR17CScriptVisorFlare" "Visit__26TCastToPtr<12CScriptTimer>FR17CScriptVisorFlare": /* 800A7000 000A3F60 38 00 00 00 */ li r0, 0 /* 800A7004 000A3F64 90 03 00 04 */ stw r0, 4(r3) -/* 800A7008 000A3F68 4E 80 00 20 */ blr +/* 800A7008 000A3F68 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR14CScriptTrigger" "Visit__26TCastToPtr<12CScriptTimer>FR14CScriptTrigger": /* 800A700C 000A3F6C 38 00 00 00 */ li r0, 0 /* 800A7010 000A3F70 90 03 00 04 */ stw r0, 4(r3) -/* 800A7014 000A3F74 4E 80 00 20 */ blr +/* 800A7014 000A3F74 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR12CScriptTimer" "Visit__26TCastToPtr<12CScriptTimer>FR12CScriptTimer": /* 800A7018 000A3F78 90 83 00 04 */ stw r4, 4(r3) -/* 800A701C 000A3F7C 4E 80 00 20 */ blr +/* 800A701C 000A3F7C 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR10CTeamAiMgr" "Visit__26TCastToPtr<12CScriptTimer>FR10CTeamAiMgr": /* 800A7020 000A3F80 38 00 00 00 */ li r0, 0 /* 800A7024 000A3F84 90 03 00 04 */ stw r0, 4(r3) -/* 800A7028 000A3F88 4E 80 00 20 */ blr +/* 800A7028 000A3F88 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR21CScriptTargetingPoint" "Visit__26TCastToPtr<12CScriptTimer>FR21CScriptTargetingPoint": /* 800A702C 000A3F8C 38 00 00 00 */ li r0, 0 /* 800A7030 000A3F90 90 03 00 04 */ stw r0, 4(r3) -/* 800A7034 000A3F94 4E 80 00 20 */ blr +/* 800A7034 000A3F94 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR25CScriptSpiderBallWaypoint" "Visit__26TCastToPtr<12CScriptTimer>FR25CScriptSpiderBallWaypoint": /* 800A7038 000A3F98 38 00 00 00 */ li r0, 0 /* 800A703C 000A3F9C 90 03 00 04 */ stw r0, 4(r3) -/* 800A7040 000A3FA0 4E 80 00 20 */ blr +/* 800A7040 000A3FA0 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR34CScriptSpiderBallAttractionSurface" "Visit__26TCastToPtr<12CScriptTimer>FR34CScriptSpiderBallAttractionSurface": /* 800A7044 000A3FA4 38 00 00 00 */ li r0, 0 /* 800A7048 000A3FA8 90 03 00 04 */ stw r0, 4(r3) -/* 800A704C 000A3FAC 4E 80 00 20 */ blr +/* 800A704C 000A3FAC 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR22CScriptSpecialFunction" "Visit__26TCastToPtr<12CScriptTimer>FR22CScriptSpecialFunction": /* 800A7050 000A3FB0 38 00 00 00 */ li r0, 0 /* 800A7054 000A3FB4 90 03 00 04 */ stw r0, 4(r3) -/* 800A7058 000A3FB8 4E 80 00 20 */ blr +/* 800A7058 000A3FB8 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR17CScriptSpawnPoint" "Visit__26TCastToPtr<12CScriptTimer>FR17CScriptSpawnPoint": /* 800A705C 000A3FBC 38 00 00 00 */ li r0, 0 /* 800A7060 000A3FC0 90 03 00 04 */ stw r0, 4(r3) -/* 800A7064 000A3FC4 4E 80 00 20 */ blr +/* 800A7064 000A3FC4 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR12CScriptSound" "Visit__26TCastToPtr<12CScriptTimer>FR12CScriptSound": /* 800A7068 000A3FC8 38 00 00 00 */ li r0, 0 /* 800A706C 000A3FCC 90 03 00 04 */ stw r0, 4(r3) -/* 800A7070 000A3FD0 4E 80 00 20 */ blr +/* 800A7070 000A3FD0 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR20CScriptRoomAcoustics" "Visit__26TCastToPtr<12CScriptTimer>FR20CScriptRoomAcoustics": /* 800A7074 000A3FD4 38 00 00 00 */ li r0, 0 /* 800A7078 000A3FD8 90 03 00 04 */ stw r0, 4(r3) -/* 800A707C 000A3FDC 4E 80 00 20 */ blr +/* 800A707C 000A3FDC 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR22CScriptPointOfinterest" "Visit__26TCastToPtr<12CScriptTimer>FR22CScriptPointOfinterest": /* 800A7080 000A3FE0 38 00 00 00 */ li r0, 0 /* 800A7084 000A3FE4 90 03 00 04 */ stw r0, 4(r3) -/* 800A7088 000A3FE8 4E 80 00 20 */ blr +/* 800A7088 000A3FE8 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR17CScriptPlayerHint" "Visit__26TCastToPtr<12CScriptTimer>FR17CScriptPlayerHint": /* 800A708C 000A3FEC 38 00 00 00 */ li r0, 0 /* 800A7090 000A3FF0 90 03 00 04 */ stw r0, 4(r3) -/* 800A7094 000A3FF4 4E 80 00 20 */ blr +/* 800A7094 000A3FF4 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR15CScriptPlatform" "Visit__26TCastToPtr<12CScriptTimer>FR15CScriptPlatform": /* 800A7098 000A3FF8 38 00 00 00 */ li r0, 0 /* 800A709C 000A3FFC 90 03 00 04 */ stw r0, 4(r3) -/* 800A70A0 000A4000 4E 80 00 20 */ blr +/* 800A70A0 000A4000 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR13CScriptPickup" "Visit__26TCastToPtr<12CScriptTimer>FR13CScriptPickup": /* 800A70A4 000A4004 38 00 00 00 */ li r0, 0 /* 800A70A8 000A4008 90 03 00 04 */ stw r0, 4(r3) -/* 800A70AC 000A400C 4E 80 00 20 */ blr +/* 800A70AC 000A400C 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR15CScriptMazeNode" "Visit__26TCastToPtr<12CScriptTimer>FR15CScriptMazeNode": /* 800A70B0 000A4010 38 00 00 00 */ li r0, 0 /* 800A70B4 000A4014 90 03 00 04 */ stw r0, 4(r3) -/* 800A70B8 000A4018 4E 80 00 20 */ blr +/* 800A70B8 000A4018 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR16CScriptGunTurret" "Visit__26TCastToPtr<12CScriptTimer>FR16CScriptGunTurret": /* 800A70BC 000A401C 38 00 00 00 */ li r0, 0 /* 800A70C0 000A4020 90 03 00 04 */ stw r0, 4(r3) -/* 800A70C4 000A4024 4E 80 00 20 */ blr +/* 800A70C4 000A4024 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR19CScriptGrapplePoint" "Visit__26TCastToPtr<12CScriptTimer>FR19CScriptGrapplePoint": /* 800A70C8 000A4028 38 00 00 00 */ li r0, 0 /* 800A70CC 000A402C 90 03 00 04 */ stw r0, 4(r3) -/* 800A70D0 000A4030 4E 80 00 20 */ blr +/* 800A70D0 000A4030 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR13CScriptEffect" "Visit__26TCastToPtr<12CScriptTimer>FR13CScriptEffect": /* 800A70D4 000A4034 38 00 00 00 */ li r0, 0 /* 800A70D8 000A4038 90 03 00 04 */ stw r0, 4(r3) -/* 800A70DC 000A403C 4E 80 00 20 */ blr +/* 800A70DC 000A403C 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR11CScriptDoor" "Visit__26TCastToPtr<12CScriptTimer>FR11CScriptDoor": /* 800A70E0 000A4040 38 00 00 00 */ li r0, 0 /* 800A70E4 000A4044 90 03 00 04 */ stw r0, 4(r3) -/* 800A70E8 000A4048 4E 80 00 20 */ blr +/* 800A70E8 000A4048 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR11CScriptDock" "Visit__26TCastToPtr<12CScriptTimer>FR11CScriptDock": /* 800A70EC 000A404C 38 00 00 00 */ li r0, 0 /* 800A70F0 000A4050 90 03 00 04 */ stw r0, 4(r3) -/* 800A70F4 000A4054 4E 80 00 20 */ blr +/* 800A70F4 000A4054 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR18CScriptDistanceFog" "Visit__26TCastToPtr<12CScriptTimer>FR18CScriptDistanceFog": /* 800A70F8 000A4058 38 00 00 00 */ li r0, 0 /* 800A70FC 000A405C 90 03 00 04 */ stw r0, 4(r3) -/* 800A7100 000A4060 4E 80 00 20 */ blr +/* 800A7100 000A4060 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR26CScriptDebugCameraWaypoint" "Visit__26TCastToPtr<12CScriptTimer>FR26CScriptDebugCameraWaypoint": /* 800A7104 000A4064 38 00 00 00 */ li r0, 0 /* 800A7108 000A4068 90 03 00 04 */ stw r0, 4(r3) -/* 800A710C 000A406C 4E 80 00 20 */ blr +/* 800A710C 000A406C 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR17CScriptCoverPoint" "Visit__26TCastToPtr<12CScriptTimer>FR17CScriptCoverPoint": /* 800A7110 000A4070 38 00 00 00 */ li r0, 0 /* 800A7114 000A4074 90 03 00 04 */ stw r0, 4(r3) -/* 800A7118 000A4078 4E 80 00 20 */ blr +/* 800A7118 000A4078 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR21CScriptCameraWaypoint" "Visit__26TCastToPtr<12CScriptTimer>FR21CScriptCameraWaypoint": /* 800A711C 000A407C 38 00 00 00 */ li r0, 0 /* 800A7120 000A4080 90 03 00 04 */ stw r0, 4(r3) -/* 800A7124 000A4084 4E 80 00 20 */ blr +/* 800A7124 000A4084 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR24CScriptCameraPitchVolume" "Visit__26TCastToPtr<12CScriptTimer>FR24CScriptCameraPitchVolume": /* 800A7128 000A4088 38 00 00 00 */ li r0, 0 /* 800A712C 000A408C 90 03 00 04 */ stw r0, 4(r3) -/* 800A7130 000A4090 4E 80 00 20 */ blr +/* 800A7130 000A4090 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR17CScriptCameraHint" "Visit__26TCastToPtr<12CScriptTimer>FR17CScriptCameraHint": /* 800A7134 000A4094 38 00 00 00 */ li r0, 0 /* 800A7138 000A4098 90 03 00 04 */ stw r0, 4(r3) -/* 800A713C 000A409C 4E 80 00 20 */ blr +/* 800A713C 000A409C 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR18CScriptAiJumpPoint" "Visit__26TCastToPtr<12CScriptTimer>FR18CScriptAiJumpPoint": /* 800A7140 000A40A0 38 00 00 00 */ li r0, 0 /* 800A7144 000A40A4 90 03 00 04 */ stw r0, 4(r3) -/* 800A7148 000A40A8 4E 80 00 20 */ blr +/* 800A7148 000A40A8 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR20CScriptActorKeyframe" "Visit__26TCastToPtr<12CScriptTimer>FR20CScriptActorKeyframe": /* 800A714C 000A40AC 38 00 00 00 */ li r0, 0 /* 800A7150 000A40B0 90 03 00 04 */ stw r0, 4(r3) -/* 800A7154 000A40B4 4E 80 00 20 */ blr +/* 800A7154 000A40B4 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR12CScriptActor" "Visit__26TCastToPtr<12CScriptTimer>FR12CScriptActor": /* 800A7158 000A40B8 38 00 00 00 */ li r0, 0 /* 800A715C 000A40BC 90 03 00 04 */ stw r0, 4(r3) -/* 800A7160 000A40C0 4E 80 00 20 */ blr +/* 800A7160 000A40C0 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR9CRepulsor" "Visit__26TCastToPtr<12CScriptTimer>FR9CRepulsor": /* 800A7164 000A40C4 38 00 00 00 */ li r0, 0 /* 800A7168 000A40C8 90 03 00 04 */ stw r0, 4(r3) -/* 800A716C 000A40CC 4E 80 00 20 */ blr +/* 800A716C 000A40CC 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR7CPlayer" "Visit__26TCastToPtr<12CScriptTimer>FR7CPlayer": /* 800A7170 000A40D0 38 00 00 00 */ li r0, 0 /* 800A7174 000A40D4 90 03 00 04 */ stw r0, 4(r3) -/* 800A7178 000A40D8 4E 80 00 20 */ blr +/* 800A7178 000A40D8 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR13CPhysicsActor" "Visit__26TCastToPtr<12CScriptTimer>FR13CPhysicsActor": /* 800A717C 000A40DC 38 00 00 00 */ li r0, 0 /* 800A7180 000A40E0 90 03 00 04 */ stw r0, 4(r3) -/* 800A7184 000A40E4 4E 80 00 20 */ blr +/* 800A7184 000A40E4 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR3CAi" "Visit__26TCastToPtr<12CScriptTimer>FR3CAi": /* 800A7188 000A40E8 38 00 00 00 */ li r0, 0 /* 800A718C 000A40EC 90 03 00 04 */ stw r0, 4(r3) -/* 800A7190 000A40F0 4E 80 00 20 */ blr +/* 800A7190 000A40F0 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR11CPathCamera" "Visit__26TCastToPtr<12CScriptTimer>FR11CPathCamera": /* 800A7194 000A40F4 38 00 00 00 */ li r0, 0 /* 800A7198 000A40F8 90 03 00 04 */ stw r0, 4(r3) -/* 800A719C 000A40FC 4E 80 00 20 */ blr +/* 800A719C 000A40FC 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR18CMetroidPrimeRelay" "Visit__26TCastToPtr<12CScriptTimer>FR18CMetroidPrimeRelay": /* 800A71A0 000A4100 38 00 00 00 */ li r0, 0 /* 800A71A4 000A4104 90 03 00 04 */ stw r0, 4(r3) -/* 800A71A8 000A4108 4E 80 00 20 */ blr +/* 800A71A8 000A4108 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR19CHUDBillboardEffect" "Visit__26TCastToPtr<12CScriptTimer>FR19CHUDBillboardEffect": /* 800A71AC 000A410C 38 00 00 00 */ li r0, 0 /* 800A71B0 000A4110 90 03 00 04 */ stw r0, 4(r3) -/* 800A71B4 000A4114 4E 80 00 20 */ blr +/* 800A71B4 000A4114 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR15CGameProjectile" "Visit__26TCastToPtr<12CScriptTimer>FR15CGameProjectile": /* 800A71B8 000A4118 38 00 00 00 */ li r0, 0 /* 800A71BC 000A411C 90 03 00 04 */ stw r0, 4(r3) -/* 800A71C0 000A4120 4E 80 00 20 */ blr +/* 800A71C0 000A4120 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR10CGameLight" "Visit__26TCastToPtr<12CScriptTimer>FR10CGameLight": /* 800A71C4 000A4124 38 00 00 00 */ li r0, 0 /* 800A71C8 000A4128 90 03 00 04 */ stw r0, 4(r3) -/* 800A71CC 000A412C 4E 80 00 20 */ blr +/* 800A71CC 000A412C 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR11CGameCamera" "Visit__26TCastToPtr<12CScriptTimer>FR11CGameCamera": /* 800A71D0 000A4130 38 00 00 00 */ li r0, 0 /* 800A71D4 000A4134 90 03 00 04 */ stw r0, 4(r3) -/* 800A71D8 000A4138 4E 80 00 20 */ blr +/* 800A71D8 000A4138 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR10CFishCloud" "Visit__26TCastToPtr<12CScriptTimer>FR10CFishCloud": /* 800A71DC 000A413C 38 00 00 00 */ li r0, 0 /* 800A71E0 000A4140 90 03 00 04 */ stw r0, 4(r3) -/* 800A71E4 000A4144 4E 80 00 20 */ blr +/* 800A71E4 000A4144 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR18CFirstPersonCamera" "Visit__26TCastToPtr<12CScriptTimer>FR18CFirstPersonCamera": /* 800A71E8 000A4148 38 00 00 00 */ li r0, 0 /* 800A71EC 000A414C 90 03 00 04 */ stw r0, 4(r3) -/* 800A71F0 000A4150 4E 80 00 20 */ blr +/* 800A71F0 000A4150 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR10CExplosion" "Visit__26TCastToPtr<12CScriptTimer>FR10CExplosion": /* 800A71F4 000A4154 38 00 00 00 */ li r0, 0 /* 800A71F8 000A4158 90 03 00 04 */ stw r0, 4(r3) -/* 800A71FC 000A415C 4E 80 00 20 */ blr +/* 800A71FC 000A415C 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR7CEntity" "Visit__26TCastToPtr<12CScriptTimer>FR7CEntity": /* 800A7200 000A4160 38 00 00 00 */ li r0, 0 /* 800A7204 000A4164 90 03 00 04 */ stw r0, 4(r3) -/* 800A7208 000A4168 4E 80 00 20 */ blr +/* 800A7208 000A4168 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR17CEnergyProjectile" "Visit__26TCastToPtr<12CScriptTimer>FR17CEnergyProjectile": /* 800A720C 000A416C 38 00 00 00 */ li r0, 0 /* 800A7210 000A4170 90 03 00 04 */ stw r0, 4(r3) -/* 800A7214 000A4174 4E 80 00 20 */ blr +/* 800A7214 000A4174 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR16CDestroyableRock" "Visit__26TCastToPtr<12CScriptTimer>FR16CDestroyableRock": /* 800A7218 000A4178 38 00 00 00 */ li r0, 0 /* 800A721C 000A417C 90 03 00 04 */ stw r0, 4(r3) -/* 800A7220 000A4180 4E 80 00 20 */ blr +/* 800A7220 000A4180 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR15CCollisionActor" "Visit__26TCastToPtr<12CScriptTimer>FR15CCollisionActor": /* 800A7224 000A4184 38 00 00 00 */ li r0, 0 /* 800A7228 000A4188 90 03 00 04 */ stw r0, 4(r3) -/* 800A722C 000A418C 4E 80 00 20 */ blr +/* 800A722C 000A418C 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR16CCinematicCamera" "Visit__26TCastToPtr<12CScriptTimer>FR16CCinematicCamera": /* 800A7230 000A4190 38 00 00 00 */ li r0, 0 /* 800A7234 000A4194 90 03 00 04 */ stw r0, 4(r3) -/* 800A7238 000A4198 4E 80 00 20 */ blr +/* 800A7238 000A4198 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR5CBomb" "Visit__26TCastToPtr<12CScriptTimer>FR5CBomb": /* 800A723C 000A419C 38 00 00 00 */ li r0, 0 /* 800A7240 000A41A0 90 03 00 04 */ stw r0, 4(r3) -/* 800A7244 000A41A4 4E 80 00 20 */ blr +/* 800A7244 000A41A4 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR11CBallCamera" "Visit__26TCastToPtr<12CScriptTimer>FR11CBallCamera": /* 800A7248 000A41A8 38 00 00 00 */ li r0, 0 /* 800A724C 000A41AC 90 03 00 04 */ stw r0, 4(r3) -/* 800A7250 000A41B0 4E 80 00 20 */ blr +/* 800A7250 000A41B0 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptTimer>FR6CActor" "Visit__26TCastToPtr<12CScriptTimer>FR6CActor": /* 800A7254 000A41B4 38 00 00 00 */ li r0, 0 /* 800A7258 000A41B8 90 03 00 04 */ stw r0, 4(r3) -/* 800A725C 000A41BC 4E 80 00 20 */ blr +/* 800A725C 000A41BC 4E 80 00 20 */ blr .global "__ct__26TCastToPtr<12CScriptTimer>FP7CEntity" "__ct__26TCastToPtr<12CScriptTimer>FP7CEntity": @@ -6825,355 +6825,355 @@ lbl_800A6F3C: /* 800A72A4 000A4204 81 83 00 00 */ lwz r12, 0(r3) /* 800A72A8 000A4208 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800A72AC 000A420C 7D 89 03 A6 */ mtctr r12 -/* 800A72B0 000A4210 4E 80 04 21 */ bctrl +/* 800A72B0 000A4210 4E 80 04 21 */ bctrl lbl_800A72B4: /* 800A72B4 000A4214 80 01 00 14 */ lwz r0, 0x14(r1) /* 800A72B8 000A4218 7F E3 FB 78 */ mr r3, r31 /* 800A72BC 000A421C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800A72C0 000A4220 7C 08 03 A6 */ mtlr r0 /* 800A72C4 000A4224 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A72C8 000A4228 4E 80 00 20 */ blr +/* 800A72C8 000A4228 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR7CWeapon" "Visit__24TCastToPtr<10CTeamAiMgr>FR7CWeapon": /* 800A72CC 000A422C 38 00 00 00 */ li r0, 0 /* 800A72D0 000A4230 90 03 00 04 */ stw r0, 4(r3) -/* 800A72D4 000A4234 4E 80 00 20 */ blr +/* 800A72D4 000A4234 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR17CWallCrawlerSwarm" "Visit__24TCastToPtr<10CTeamAiMgr>FR17CWallCrawlerSwarm": /* 800A72D8 000A4238 38 00 00 00 */ li r0, 0 /* 800A72DC 000A423C 90 03 00 04 */ stw r0, 4(r3) -/* 800A72E0 000A4240 4E 80 00 20 */ blr +/* 800A72E0 000A4240 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR20CScriptSpindleCamera" "Visit__24TCastToPtr<10CTeamAiMgr>FR20CScriptSpindleCamera": /* 800A72E4 000A4244 38 00 00 00 */ li r0, 0 /* 800A72E8 000A4248 90 03 00 04 */ stw r0, 4(r3) -/* 800A72EC 000A424C 4E 80 00 20 */ blr +/* 800A72EC 000A424C 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR15CSnakeWeedSwarm" "Visit__24TCastToPtr<10CTeamAiMgr>FR15CSnakeWeedSwarm": /* 800A72F0 000A4250 38 00 00 00 */ li r0, 0 /* 800A72F4 000A4254 90 03 00 04 */ stw r0, 4(r3) -/* 800A72F8 000A4258 4E 80 00 20 */ blr +/* 800A72F8 000A4258 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR15CScriptWaypoint" "Visit__24TCastToPtr<10CTeamAiMgr>FR15CScriptWaypoint": /* 800A72FC 000A425C 38 00 00 00 */ li r0, 0 /* 800A7300 000A4260 90 03 00 04 */ stw r0, 4(r3) -/* 800A7304 000A4264 4E 80 00 20 */ blr +/* 800A7304 000A4264 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR12CScriptWater" "Visit__24TCastToPtr<10CTeamAiMgr>FR12CScriptWater": /* 800A7308 000A4268 38 00 00 00 */ li r0, 0 /* 800A730C 000A426C 90 03 00 04 */ stw r0, 4(r3) -/* 800A7310 000A4270 4E 80 00 20 */ blr +/* 800A7310 000A4270 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR17CScriptVisorFlare" "Visit__24TCastToPtr<10CTeamAiMgr>FR17CScriptVisorFlare": /* 800A7314 000A4274 38 00 00 00 */ li r0, 0 /* 800A7318 000A4278 90 03 00 04 */ stw r0, 4(r3) -/* 800A731C 000A427C 4E 80 00 20 */ blr +/* 800A731C 000A427C 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR14CScriptTrigger" "Visit__24TCastToPtr<10CTeamAiMgr>FR14CScriptTrigger": /* 800A7320 000A4280 38 00 00 00 */ li r0, 0 /* 800A7324 000A4284 90 03 00 04 */ stw r0, 4(r3) -/* 800A7328 000A4288 4E 80 00 20 */ blr +/* 800A7328 000A4288 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR12CScriptTimer" "Visit__24TCastToPtr<10CTeamAiMgr>FR12CScriptTimer": /* 800A732C 000A428C 38 00 00 00 */ li r0, 0 /* 800A7330 000A4290 90 03 00 04 */ stw r0, 4(r3) -/* 800A7334 000A4294 4E 80 00 20 */ blr +/* 800A7334 000A4294 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR10CTeamAiMgr" "Visit__24TCastToPtr<10CTeamAiMgr>FR10CTeamAiMgr": /* 800A7338 000A4298 90 83 00 04 */ stw r4, 4(r3) -/* 800A733C 000A429C 4E 80 00 20 */ blr +/* 800A733C 000A429C 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR21CScriptTargetingPoint" "Visit__24TCastToPtr<10CTeamAiMgr>FR21CScriptTargetingPoint": /* 800A7340 000A42A0 38 00 00 00 */ li r0, 0 /* 800A7344 000A42A4 90 03 00 04 */ stw r0, 4(r3) -/* 800A7348 000A42A8 4E 80 00 20 */ blr +/* 800A7348 000A42A8 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR25CScriptSpiderBallWaypoint" "Visit__24TCastToPtr<10CTeamAiMgr>FR25CScriptSpiderBallWaypoint": /* 800A734C 000A42AC 38 00 00 00 */ li r0, 0 /* 800A7350 000A42B0 90 03 00 04 */ stw r0, 4(r3) -/* 800A7354 000A42B4 4E 80 00 20 */ blr +/* 800A7354 000A42B4 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR34CScriptSpiderBallAttractionSurface" "Visit__24TCastToPtr<10CTeamAiMgr>FR34CScriptSpiderBallAttractionSurface": /* 800A7358 000A42B8 38 00 00 00 */ li r0, 0 /* 800A735C 000A42BC 90 03 00 04 */ stw r0, 4(r3) -/* 800A7360 000A42C0 4E 80 00 20 */ blr +/* 800A7360 000A42C0 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR22CScriptSpecialFunction" "Visit__24TCastToPtr<10CTeamAiMgr>FR22CScriptSpecialFunction": /* 800A7364 000A42C4 38 00 00 00 */ li r0, 0 /* 800A7368 000A42C8 90 03 00 04 */ stw r0, 4(r3) -/* 800A736C 000A42CC 4E 80 00 20 */ blr +/* 800A736C 000A42CC 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR17CScriptSpawnPoint" "Visit__24TCastToPtr<10CTeamAiMgr>FR17CScriptSpawnPoint": /* 800A7370 000A42D0 38 00 00 00 */ li r0, 0 /* 800A7374 000A42D4 90 03 00 04 */ stw r0, 4(r3) -/* 800A7378 000A42D8 4E 80 00 20 */ blr +/* 800A7378 000A42D8 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR12CScriptSound" "Visit__24TCastToPtr<10CTeamAiMgr>FR12CScriptSound": /* 800A737C 000A42DC 38 00 00 00 */ li r0, 0 /* 800A7380 000A42E0 90 03 00 04 */ stw r0, 4(r3) -/* 800A7384 000A42E4 4E 80 00 20 */ blr +/* 800A7384 000A42E4 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR20CScriptRoomAcoustics" "Visit__24TCastToPtr<10CTeamAiMgr>FR20CScriptRoomAcoustics": /* 800A7388 000A42E8 38 00 00 00 */ li r0, 0 /* 800A738C 000A42EC 90 03 00 04 */ stw r0, 4(r3) -/* 800A7390 000A42F0 4E 80 00 20 */ blr +/* 800A7390 000A42F0 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR22CScriptPointOfinterest" "Visit__24TCastToPtr<10CTeamAiMgr>FR22CScriptPointOfinterest": /* 800A7394 000A42F4 38 00 00 00 */ li r0, 0 /* 800A7398 000A42F8 90 03 00 04 */ stw r0, 4(r3) -/* 800A739C 000A42FC 4E 80 00 20 */ blr +/* 800A739C 000A42FC 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR17CScriptPlayerHint" "Visit__24TCastToPtr<10CTeamAiMgr>FR17CScriptPlayerHint": /* 800A73A0 000A4300 38 00 00 00 */ li r0, 0 /* 800A73A4 000A4304 90 03 00 04 */ stw r0, 4(r3) -/* 800A73A8 000A4308 4E 80 00 20 */ blr +/* 800A73A8 000A4308 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR15CScriptPlatform" "Visit__24TCastToPtr<10CTeamAiMgr>FR15CScriptPlatform": /* 800A73AC 000A430C 38 00 00 00 */ li r0, 0 /* 800A73B0 000A4310 90 03 00 04 */ stw r0, 4(r3) -/* 800A73B4 000A4314 4E 80 00 20 */ blr +/* 800A73B4 000A4314 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR13CScriptPickup" "Visit__24TCastToPtr<10CTeamAiMgr>FR13CScriptPickup": /* 800A73B8 000A4318 38 00 00 00 */ li r0, 0 /* 800A73BC 000A431C 90 03 00 04 */ stw r0, 4(r3) -/* 800A73C0 000A4320 4E 80 00 20 */ blr +/* 800A73C0 000A4320 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR15CScriptMazeNode" "Visit__24TCastToPtr<10CTeamAiMgr>FR15CScriptMazeNode": /* 800A73C4 000A4324 38 00 00 00 */ li r0, 0 /* 800A73C8 000A4328 90 03 00 04 */ stw r0, 4(r3) -/* 800A73CC 000A432C 4E 80 00 20 */ blr +/* 800A73CC 000A432C 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR16CScriptGunTurret" "Visit__24TCastToPtr<10CTeamAiMgr>FR16CScriptGunTurret": /* 800A73D0 000A4330 38 00 00 00 */ li r0, 0 /* 800A73D4 000A4334 90 03 00 04 */ stw r0, 4(r3) -/* 800A73D8 000A4338 4E 80 00 20 */ blr +/* 800A73D8 000A4338 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR19CScriptGrapplePoint" "Visit__24TCastToPtr<10CTeamAiMgr>FR19CScriptGrapplePoint": /* 800A73DC 000A433C 38 00 00 00 */ li r0, 0 /* 800A73E0 000A4340 90 03 00 04 */ stw r0, 4(r3) -/* 800A73E4 000A4344 4E 80 00 20 */ blr +/* 800A73E4 000A4344 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR13CScriptEffect" "Visit__24TCastToPtr<10CTeamAiMgr>FR13CScriptEffect": /* 800A73E8 000A4348 38 00 00 00 */ li r0, 0 /* 800A73EC 000A434C 90 03 00 04 */ stw r0, 4(r3) -/* 800A73F0 000A4350 4E 80 00 20 */ blr +/* 800A73F0 000A4350 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR11CScriptDoor" "Visit__24TCastToPtr<10CTeamAiMgr>FR11CScriptDoor": /* 800A73F4 000A4354 38 00 00 00 */ li r0, 0 /* 800A73F8 000A4358 90 03 00 04 */ stw r0, 4(r3) -/* 800A73FC 000A435C 4E 80 00 20 */ blr +/* 800A73FC 000A435C 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR11CScriptDock" "Visit__24TCastToPtr<10CTeamAiMgr>FR11CScriptDock": /* 800A7400 000A4360 38 00 00 00 */ li r0, 0 /* 800A7404 000A4364 90 03 00 04 */ stw r0, 4(r3) -/* 800A7408 000A4368 4E 80 00 20 */ blr +/* 800A7408 000A4368 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR18CScriptDistanceFog" "Visit__24TCastToPtr<10CTeamAiMgr>FR18CScriptDistanceFog": /* 800A740C 000A436C 38 00 00 00 */ li r0, 0 /* 800A7410 000A4370 90 03 00 04 */ stw r0, 4(r3) -/* 800A7414 000A4374 4E 80 00 20 */ blr +/* 800A7414 000A4374 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR26CScriptDebugCameraWaypoint" "Visit__24TCastToPtr<10CTeamAiMgr>FR26CScriptDebugCameraWaypoint": /* 800A7418 000A4378 38 00 00 00 */ li r0, 0 /* 800A741C 000A437C 90 03 00 04 */ stw r0, 4(r3) -/* 800A7420 000A4380 4E 80 00 20 */ blr +/* 800A7420 000A4380 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR17CScriptCoverPoint" "Visit__24TCastToPtr<10CTeamAiMgr>FR17CScriptCoverPoint": /* 800A7424 000A4384 38 00 00 00 */ li r0, 0 /* 800A7428 000A4388 90 03 00 04 */ stw r0, 4(r3) -/* 800A742C 000A438C 4E 80 00 20 */ blr +/* 800A742C 000A438C 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR21CScriptCameraWaypoint" "Visit__24TCastToPtr<10CTeamAiMgr>FR21CScriptCameraWaypoint": /* 800A7430 000A4390 38 00 00 00 */ li r0, 0 /* 800A7434 000A4394 90 03 00 04 */ stw r0, 4(r3) -/* 800A7438 000A4398 4E 80 00 20 */ blr +/* 800A7438 000A4398 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR24CScriptCameraPitchVolume" "Visit__24TCastToPtr<10CTeamAiMgr>FR24CScriptCameraPitchVolume": /* 800A743C 000A439C 38 00 00 00 */ li r0, 0 /* 800A7440 000A43A0 90 03 00 04 */ stw r0, 4(r3) -/* 800A7444 000A43A4 4E 80 00 20 */ blr +/* 800A7444 000A43A4 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR17CScriptCameraHint" "Visit__24TCastToPtr<10CTeamAiMgr>FR17CScriptCameraHint": /* 800A7448 000A43A8 38 00 00 00 */ li r0, 0 /* 800A744C 000A43AC 90 03 00 04 */ stw r0, 4(r3) -/* 800A7450 000A43B0 4E 80 00 20 */ blr +/* 800A7450 000A43B0 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR18CScriptAiJumpPoint" "Visit__24TCastToPtr<10CTeamAiMgr>FR18CScriptAiJumpPoint": /* 800A7454 000A43B4 38 00 00 00 */ li r0, 0 /* 800A7458 000A43B8 90 03 00 04 */ stw r0, 4(r3) -/* 800A745C 000A43BC 4E 80 00 20 */ blr +/* 800A745C 000A43BC 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR20CScriptActorKeyframe" "Visit__24TCastToPtr<10CTeamAiMgr>FR20CScriptActorKeyframe": /* 800A7460 000A43C0 38 00 00 00 */ li r0, 0 /* 800A7464 000A43C4 90 03 00 04 */ stw r0, 4(r3) -/* 800A7468 000A43C8 4E 80 00 20 */ blr +/* 800A7468 000A43C8 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR12CScriptActor" "Visit__24TCastToPtr<10CTeamAiMgr>FR12CScriptActor": /* 800A746C 000A43CC 38 00 00 00 */ li r0, 0 /* 800A7470 000A43D0 90 03 00 04 */ stw r0, 4(r3) -/* 800A7474 000A43D4 4E 80 00 20 */ blr +/* 800A7474 000A43D4 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR9CRepulsor" "Visit__24TCastToPtr<10CTeamAiMgr>FR9CRepulsor": /* 800A7478 000A43D8 38 00 00 00 */ li r0, 0 /* 800A747C 000A43DC 90 03 00 04 */ stw r0, 4(r3) -/* 800A7480 000A43E0 4E 80 00 20 */ blr +/* 800A7480 000A43E0 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR7CPlayer" "Visit__24TCastToPtr<10CTeamAiMgr>FR7CPlayer": /* 800A7484 000A43E4 38 00 00 00 */ li r0, 0 /* 800A7488 000A43E8 90 03 00 04 */ stw r0, 4(r3) -/* 800A748C 000A43EC 4E 80 00 20 */ blr +/* 800A748C 000A43EC 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR13CPhysicsActor" "Visit__24TCastToPtr<10CTeamAiMgr>FR13CPhysicsActor": /* 800A7490 000A43F0 38 00 00 00 */ li r0, 0 /* 800A7494 000A43F4 90 03 00 04 */ stw r0, 4(r3) -/* 800A7498 000A43F8 4E 80 00 20 */ blr +/* 800A7498 000A43F8 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR3CAi" "Visit__24TCastToPtr<10CTeamAiMgr>FR3CAi": /* 800A749C 000A43FC 38 00 00 00 */ li r0, 0 /* 800A74A0 000A4400 90 03 00 04 */ stw r0, 4(r3) -/* 800A74A4 000A4404 4E 80 00 20 */ blr +/* 800A74A4 000A4404 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR11CPathCamera" "Visit__24TCastToPtr<10CTeamAiMgr>FR11CPathCamera": /* 800A74A8 000A4408 38 00 00 00 */ li r0, 0 /* 800A74AC 000A440C 90 03 00 04 */ stw r0, 4(r3) -/* 800A74B0 000A4410 4E 80 00 20 */ blr +/* 800A74B0 000A4410 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR18CMetroidPrimeRelay" "Visit__24TCastToPtr<10CTeamAiMgr>FR18CMetroidPrimeRelay": /* 800A74B4 000A4414 38 00 00 00 */ li r0, 0 /* 800A74B8 000A4418 90 03 00 04 */ stw r0, 4(r3) -/* 800A74BC 000A441C 4E 80 00 20 */ blr +/* 800A74BC 000A441C 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR19CHUDBillboardEffect" "Visit__24TCastToPtr<10CTeamAiMgr>FR19CHUDBillboardEffect": /* 800A74C0 000A4420 38 00 00 00 */ li r0, 0 /* 800A74C4 000A4424 90 03 00 04 */ stw r0, 4(r3) -/* 800A74C8 000A4428 4E 80 00 20 */ blr +/* 800A74C8 000A4428 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR15CGameProjectile" "Visit__24TCastToPtr<10CTeamAiMgr>FR15CGameProjectile": /* 800A74CC 000A442C 38 00 00 00 */ li r0, 0 /* 800A74D0 000A4430 90 03 00 04 */ stw r0, 4(r3) -/* 800A74D4 000A4434 4E 80 00 20 */ blr +/* 800A74D4 000A4434 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR10CGameLight" "Visit__24TCastToPtr<10CTeamAiMgr>FR10CGameLight": /* 800A74D8 000A4438 38 00 00 00 */ li r0, 0 /* 800A74DC 000A443C 90 03 00 04 */ stw r0, 4(r3) -/* 800A74E0 000A4440 4E 80 00 20 */ blr +/* 800A74E0 000A4440 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR11CGameCamera" "Visit__24TCastToPtr<10CTeamAiMgr>FR11CGameCamera": /* 800A74E4 000A4444 38 00 00 00 */ li r0, 0 /* 800A74E8 000A4448 90 03 00 04 */ stw r0, 4(r3) -/* 800A74EC 000A444C 4E 80 00 20 */ blr +/* 800A74EC 000A444C 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR10CFishCloud" "Visit__24TCastToPtr<10CTeamAiMgr>FR10CFishCloud": /* 800A74F0 000A4450 38 00 00 00 */ li r0, 0 /* 800A74F4 000A4454 90 03 00 04 */ stw r0, 4(r3) -/* 800A74F8 000A4458 4E 80 00 20 */ blr +/* 800A74F8 000A4458 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR18CFirstPersonCamera" "Visit__24TCastToPtr<10CTeamAiMgr>FR18CFirstPersonCamera": /* 800A74FC 000A445C 38 00 00 00 */ li r0, 0 /* 800A7500 000A4460 90 03 00 04 */ stw r0, 4(r3) -/* 800A7504 000A4464 4E 80 00 20 */ blr +/* 800A7504 000A4464 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR10CExplosion" "Visit__24TCastToPtr<10CTeamAiMgr>FR10CExplosion": /* 800A7508 000A4468 38 00 00 00 */ li r0, 0 /* 800A750C 000A446C 90 03 00 04 */ stw r0, 4(r3) -/* 800A7510 000A4470 4E 80 00 20 */ blr +/* 800A7510 000A4470 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR7CEntity" "Visit__24TCastToPtr<10CTeamAiMgr>FR7CEntity": /* 800A7514 000A4474 38 00 00 00 */ li r0, 0 /* 800A7518 000A4478 90 03 00 04 */ stw r0, 4(r3) -/* 800A751C 000A447C 4E 80 00 20 */ blr +/* 800A751C 000A447C 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR17CEnergyProjectile" "Visit__24TCastToPtr<10CTeamAiMgr>FR17CEnergyProjectile": /* 800A7520 000A4480 38 00 00 00 */ li r0, 0 /* 800A7524 000A4484 90 03 00 04 */ stw r0, 4(r3) -/* 800A7528 000A4488 4E 80 00 20 */ blr +/* 800A7528 000A4488 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR16CDestroyableRock" "Visit__24TCastToPtr<10CTeamAiMgr>FR16CDestroyableRock": /* 800A752C 000A448C 38 00 00 00 */ li r0, 0 /* 800A7530 000A4490 90 03 00 04 */ stw r0, 4(r3) -/* 800A7534 000A4494 4E 80 00 20 */ blr +/* 800A7534 000A4494 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR15CCollisionActor" "Visit__24TCastToPtr<10CTeamAiMgr>FR15CCollisionActor": /* 800A7538 000A4498 38 00 00 00 */ li r0, 0 /* 800A753C 000A449C 90 03 00 04 */ stw r0, 4(r3) -/* 800A7540 000A44A0 4E 80 00 20 */ blr +/* 800A7540 000A44A0 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR16CCinematicCamera" "Visit__24TCastToPtr<10CTeamAiMgr>FR16CCinematicCamera": /* 800A7544 000A44A4 38 00 00 00 */ li r0, 0 /* 800A7548 000A44A8 90 03 00 04 */ stw r0, 4(r3) -/* 800A754C 000A44AC 4E 80 00 20 */ blr +/* 800A754C 000A44AC 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR5CBomb" "Visit__24TCastToPtr<10CTeamAiMgr>FR5CBomb": /* 800A7550 000A44B0 38 00 00 00 */ li r0, 0 /* 800A7554 000A44B4 90 03 00 04 */ stw r0, 4(r3) -/* 800A7558 000A44B8 4E 80 00 20 */ blr +/* 800A7558 000A44B8 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR11CBallCamera" "Visit__24TCastToPtr<10CTeamAiMgr>FR11CBallCamera": /* 800A755C 000A44BC 38 00 00 00 */ li r0, 0 /* 800A7560 000A44C0 90 03 00 04 */ stw r0, 4(r3) -/* 800A7564 000A44C4 4E 80 00 20 */ blr +/* 800A7564 000A44C4 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CTeamAiMgr>FR6CActor" "Visit__24TCastToPtr<10CTeamAiMgr>FR6CActor": /* 800A7568 000A44C8 38 00 00 00 */ li r0, 0 /* 800A756C 000A44CC 90 03 00 04 */ stw r0, 4(r3) -/* 800A7570 000A44D0 4E 80 00 20 */ blr +/* 800A7570 000A44D0 4E 80 00 20 */ blr .global "__ct__24TCastToPtr<10CTeamAiMgr>FP7CEntity" "__ct__24TCastToPtr<10CTeamAiMgr>FP7CEntity": @@ -7197,355 +7197,355 @@ lbl_800A72B4: /* 800A75B8 000A4518 81 83 00 00 */ lwz r12, 0(r3) /* 800A75BC 000A451C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800A75C0 000A4520 7D 89 03 A6 */ mtctr r12 -/* 800A75C4 000A4524 4E 80 04 21 */ bctrl +/* 800A75C4 000A4524 4E 80 04 21 */ bctrl lbl_800A75C8: /* 800A75C8 000A4528 80 01 00 14 */ lwz r0, 0x14(r1) /* 800A75CC 000A452C 7F E3 FB 78 */ mr r3, r31 /* 800A75D0 000A4530 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800A75D4 000A4534 7C 08 03 A6 */ mtlr r0 /* 800A75D8 000A4538 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A75DC 000A453C 4E 80 00 20 */ blr +/* 800A75DC 000A453C 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR7CWeapon" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR7CWeapon": /* 800A75E0 000A4540 38 00 00 00 */ li r0, 0 /* 800A75E4 000A4544 90 03 00 04 */ stw r0, 4(r3) -/* 800A75E8 000A4548 4E 80 00 20 */ blr +/* 800A75E8 000A4548 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR17CWallCrawlerSwarm" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR17CWallCrawlerSwarm": /* 800A75EC 000A454C 38 00 00 00 */ li r0, 0 /* 800A75F0 000A4550 90 03 00 04 */ stw r0, 4(r3) -/* 800A75F4 000A4554 4E 80 00 20 */ blr +/* 800A75F4 000A4554 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR20CScriptSpindleCamera" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR20CScriptSpindleCamera": /* 800A75F8 000A4558 38 00 00 00 */ li r0, 0 /* 800A75FC 000A455C 90 03 00 04 */ stw r0, 4(r3) -/* 800A7600 000A4560 4E 80 00 20 */ blr +/* 800A7600 000A4560 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR15CSnakeWeedSwarm" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR15CSnakeWeedSwarm": /* 800A7604 000A4564 38 00 00 00 */ li r0, 0 /* 800A7608 000A4568 90 03 00 04 */ stw r0, 4(r3) -/* 800A760C 000A456C 4E 80 00 20 */ blr +/* 800A760C 000A456C 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR15CScriptWaypoint" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR15CScriptWaypoint": /* 800A7610 000A4570 38 00 00 00 */ li r0, 0 /* 800A7614 000A4574 90 03 00 04 */ stw r0, 4(r3) -/* 800A7618 000A4578 4E 80 00 20 */ blr +/* 800A7618 000A4578 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR12CScriptWater" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR12CScriptWater": /* 800A761C 000A457C 38 00 00 00 */ li r0, 0 /* 800A7620 000A4580 90 03 00 04 */ stw r0, 4(r3) -/* 800A7624 000A4584 4E 80 00 20 */ blr +/* 800A7624 000A4584 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR17CScriptVisorFlare" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR17CScriptVisorFlare": /* 800A7628 000A4588 38 00 00 00 */ li r0, 0 /* 800A762C 000A458C 90 03 00 04 */ stw r0, 4(r3) -/* 800A7630 000A4590 4E 80 00 20 */ blr +/* 800A7630 000A4590 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR14CScriptTrigger" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR14CScriptTrigger": /* 800A7634 000A4594 38 00 00 00 */ li r0, 0 /* 800A7638 000A4598 90 03 00 04 */ stw r0, 4(r3) -/* 800A763C 000A459C 4E 80 00 20 */ blr +/* 800A763C 000A459C 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR12CScriptTimer" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR12CScriptTimer": /* 800A7640 000A45A0 38 00 00 00 */ li r0, 0 /* 800A7644 000A45A4 90 03 00 04 */ stw r0, 4(r3) -/* 800A7648 000A45A8 4E 80 00 20 */ blr +/* 800A7648 000A45A8 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR10CTeamAiMgr" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR10CTeamAiMgr": /* 800A764C 000A45AC 38 00 00 00 */ li r0, 0 /* 800A7650 000A45B0 90 03 00 04 */ stw r0, 4(r3) -/* 800A7654 000A45B4 4E 80 00 20 */ blr +/* 800A7654 000A45B4 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR21CScriptTargetingPoint" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR21CScriptTargetingPoint": /* 800A7658 000A45B8 90 83 00 04 */ stw r4, 4(r3) -/* 800A765C 000A45BC 4E 80 00 20 */ blr +/* 800A765C 000A45BC 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR25CScriptSpiderBallWaypoint" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR25CScriptSpiderBallWaypoint": /* 800A7660 000A45C0 38 00 00 00 */ li r0, 0 /* 800A7664 000A45C4 90 03 00 04 */ stw r0, 4(r3) -/* 800A7668 000A45C8 4E 80 00 20 */ blr +/* 800A7668 000A45C8 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR34CScriptSpiderBallAttractionSurface" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR34CScriptSpiderBallAttractionSurface": /* 800A766C 000A45CC 38 00 00 00 */ li r0, 0 /* 800A7670 000A45D0 90 03 00 04 */ stw r0, 4(r3) -/* 800A7674 000A45D4 4E 80 00 20 */ blr +/* 800A7674 000A45D4 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR22CScriptSpecialFunction" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR22CScriptSpecialFunction": /* 800A7678 000A45D8 38 00 00 00 */ li r0, 0 /* 800A767C 000A45DC 90 03 00 04 */ stw r0, 4(r3) -/* 800A7680 000A45E0 4E 80 00 20 */ blr +/* 800A7680 000A45E0 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR17CScriptSpawnPoint" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR17CScriptSpawnPoint": /* 800A7684 000A45E4 38 00 00 00 */ li r0, 0 /* 800A7688 000A45E8 90 03 00 04 */ stw r0, 4(r3) -/* 800A768C 000A45EC 4E 80 00 20 */ blr +/* 800A768C 000A45EC 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR12CScriptSound" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR12CScriptSound": /* 800A7690 000A45F0 38 00 00 00 */ li r0, 0 /* 800A7694 000A45F4 90 03 00 04 */ stw r0, 4(r3) -/* 800A7698 000A45F8 4E 80 00 20 */ blr +/* 800A7698 000A45F8 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR20CScriptRoomAcoustics" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR20CScriptRoomAcoustics": /* 800A769C 000A45FC 38 00 00 00 */ li r0, 0 /* 800A76A0 000A4600 90 03 00 04 */ stw r0, 4(r3) -/* 800A76A4 000A4604 4E 80 00 20 */ blr +/* 800A76A4 000A4604 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR22CScriptPointOfInterest" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR22CScriptPointOfInterest": /* 800A76A8 000A4608 38 00 00 00 */ li r0, 0 /* 800A76AC 000A460C 90 03 00 04 */ stw r0, 4(r3) -/* 800A76B0 000A4610 4E 80 00 20 */ blr +/* 800A76B0 000A4610 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR17CScriptPlayerHint" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR17CScriptPlayerHint": /* 800A76B4 000A4614 38 00 00 00 */ li r0, 0 /* 800A76B8 000A4618 90 03 00 04 */ stw r0, 4(r3) -/* 800A76BC 000A461C 4E 80 00 20 */ blr +/* 800A76BC 000A461C 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR15CScriptPlatform" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR15CScriptPlatform": /* 800A76C0 000A4620 38 00 00 00 */ li r0, 0 /* 800A76C4 000A4624 90 03 00 04 */ stw r0, 4(r3) -/* 800A76C8 000A4628 4E 80 00 20 */ blr +/* 800A76C8 000A4628 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR13CScriptPickup" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR13CScriptPickup": /* 800A76CC 000A462C 38 00 00 00 */ li r0, 0 /* 800A76D0 000A4630 90 03 00 04 */ stw r0, 4(r3) -/* 800A76D4 000A4634 4E 80 00 20 */ blr +/* 800A76D4 000A4634 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR15CScriptMazeNode" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR15CScriptMazeNode": /* 800A76D8 000A4638 38 00 00 00 */ li r0, 0 /* 800A76DC 000A463C 90 03 00 04 */ stw r0, 4(r3) -/* 800A76E0 000A4640 4E 80 00 20 */ blr +/* 800A76E0 000A4640 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR16CScriptGunTurret" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR16CScriptGunTurret": /* 800A76E4 000A4644 38 00 00 00 */ li r0, 0 /* 800A76E8 000A4648 90 03 00 04 */ stw r0, 4(r3) -/* 800A76EC 000A464C 4E 80 00 20 */ blr +/* 800A76EC 000A464C 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR19CScriptGrapplePoint" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR19CScriptGrapplePoint": /* 800A76F0 000A4650 38 00 00 00 */ li r0, 0 /* 800A76F4 000A4654 90 03 00 04 */ stw r0, 4(r3) -/* 800A76F8 000A4658 4E 80 00 20 */ blr +/* 800A76F8 000A4658 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR13CScriptEffect" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR13CScriptEffect": /* 800A76FC 000A465C 38 00 00 00 */ li r0, 0 /* 800A7700 000A4660 90 03 00 04 */ stw r0, 4(r3) -/* 800A7704 000A4664 4E 80 00 20 */ blr +/* 800A7704 000A4664 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR11CScriptDoor" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR11CScriptDoor": /* 800A7708 000A4668 38 00 00 00 */ li r0, 0 /* 800A770C 000A466C 90 03 00 04 */ stw r0, 4(r3) -/* 800A7710 000A4670 4E 80 00 20 */ blr +/* 800A7710 000A4670 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR11CScriptDock" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR11CScriptDock": /* 800A7714 000A4674 38 00 00 00 */ li r0, 0 /* 800A7718 000A4678 90 03 00 04 */ stw r0, 4(r3) -/* 800A771C 000A467C 4E 80 00 20 */ blr +/* 800A771C 000A467C 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR18CScriptDistanceFog" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR18CScriptDistanceFog": /* 800A7720 000A4680 38 00 00 00 */ li r0, 0 /* 800A7724 000A4684 90 03 00 04 */ stw r0, 4(r3) -/* 800A7728 000A4688 4E 80 00 20 */ blr +/* 800A7728 000A4688 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR26CScriptDebugCameraWaypoint" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR26CScriptDebugCameraWaypoint": /* 800A772C 000A468C 38 00 00 00 */ li r0, 0 /* 800A7730 000A4690 90 03 00 04 */ stw r0, 4(r3) -/* 800A7734 000A4694 4E 80 00 20 */ blr +/* 800A7734 000A4694 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR17CScriptCoverPoint" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR17CScriptCoverPoint": /* 800A7738 000A4698 38 00 00 00 */ li r0, 0 /* 800A773C 000A469C 90 03 00 04 */ stw r0, 4(r3) -/* 800A7740 000A46A0 4E 80 00 20 */ blr +/* 800A7740 000A46A0 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR21CScriptCameraWaypoint" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR21CScriptCameraWaypoint": /* 800A7744 000A46A4 38 00 00 00 */ li r0, 0 /* 800A7748 000A46A8 90 03 00 04 */ stw r0, 4(r3) -/* 800A774C 000A46AC 4E 80 00 20 */ blr +/* 800A774C 000A46AC 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR24CScriptCameraPitchVolume" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR24CScriptCameraPitchVolume": /* 800A7750 000A46B0 38 00 00 00 */ li r0, 0 /* 800A7754 000A46B4 90 03 00 04 */ stw r0, 4(r3) -/* 800A7758 000A46B8 4E 80 00 20 */ blr +/* 800A7758 000A46B8 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR17CScriptCameraHint" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR17CScriptCameraHint": /* 800A775C 000A46BC 38 00 00 00 */ li r0, 0 /* 800A7760 000A46C0 90 03 00 04 */ stw r0, 4(r3) -/* 800A7764 000A46C4 4E 80 00 20 */ blr +/* 800A7764 000A46C4 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR18CScriptAiJumpPoint" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR18CScriptAiJumpPoint": /* 800A7768 000A46C8 38 00 00 00 */ li r0, 0 /* 800A776C 000A46CC 90 03 00 04 */ stw r0, 4(r3) -/* 800A7770 000A46D0 4E 80 00 20 */ blr +/* 800A7770 000A46D0 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR20CScriptActorKeyframe" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR20CScriptActorKeyframe": /* 800A7774 000A46D4 38 00 00 00 */ li r0, 0 /* 800A7778 000A46D8 90 03 00 04 */ stw r0, 4(r3) -/* 800A777C 000A46DC 4E 80 00 20 */ blr +/* 800A777C 000A46DC 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR12CScriptActor" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR12CScriptActor": /* 800A7780 000A46E0 38 00 00 00 */ li r0, 0 /* 800A7784 000A46E4 90 03 00 04 */ stw r0, 4(r3) -/* 800A7788 000A46E8 4E 80 00 20 */ blr +/* 800A7788 000A46E8 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR9CRepulsor" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR9CRepulsor": /* 800A778C 000A46EC 38 00 00 00 */ li r0, 0 /* 800A7790 000A46F0 90 03 00 04 */ stw r0, 4(r3) -/* 800A7794 000A46F4 4E 80 00 20 */ blr +/* 800A7794 000A46F4 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR7CPlayer" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR7CPlayer": /* 800A7798 000A46F8 38 00 00 00 */ li r0, 0 /* 800A779C 000A46FC 90 03 00 04 */ stw r0, 4(r3) -/* 800A77A0 000A4700 4E 80 00 20 */ blr +/* 800A77A0 000A4700 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR13CPhysicsActor" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR13CPhysicsActor": /* 800A77A4 000A4704 38 00 00 00 */ li r0, 0 /* 800A77A8 000A4708 90 03 00 04 */ stw r0, 4(r3) -/* 800A77AC 000A470C 4E 80 00 20 */ blr +/* 800A77AC 000A470C 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR3CAi" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR3CAi": /* 800A77B0 000A4710 38 00 00 00 */ li r0, 0 /* 800A77B4 000A4714 90 03 00 04 */ stw r0, 4(r3) -/* 800A77B8 000A4718 4E 80 00 20 */ blr +/* 800A77B8 000A4718 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR11CPathCamera" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR11CPathCamera": /* 800A77BC 000A471C 38 00 00 00 */ li r0, 0 /* 800A77C0 000A4720 90 03 00 04 */ stw r0, 4(r3) -/* 800A77C4 000A4724 4E 80 00 20 */ blr +/* 800A77C4 000A4724 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR18CMetroidPrimeRelay" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR18CMetroidPrimeRelay": /* 800A77C8 000A4728 38 00 00 00 */ li r0, 0 /* 800A77CC 000A472C 90 03 00 04 */ stw r0, 4(r3) -/* 800A77D0 000A4730 4E 80 00 20 */ blr +/* 800A77D0 000A4730 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR19CHUDBillboardEffect" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR19CHUDBillboardEffect": /* 800A77D4 000A4734 38 00 00 00 */ li r0, 0 /* 800A77D8 000A4738 90 03 00 04 */ stw r0, 4(r3) -/* 800A77DC 000A473C 4E 80 00 20 */ blr +/* 800A77DC 000A473C 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR15CGameProjectile" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR15CGameProjectile": /* 800A77E0 000A4740 38 00 00 00 */ li r0, 0 /* 800A77E4 000A4744 90 03 00 04 */ stw r0, 4(r3) -/* 800A77E8 000A4748 4E 80 00 20 */ blr +/* 800A77E8 000A4748 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR10CGameLight" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR10CGameLight": /* 800A77EC 000A474C 38 00 00 00 */ li r0, 0 /* 800A77F0 000A4750 90 03 00 04 */ stw r0, 4(r3) -/* 800A77F4 000A4754 4E 80 00 20 */ blr +/* 800A77F4 000A4754 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR11CGameCamera" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR11CGameCamera": /* 800A77F8 000A4758 38 00 00 00 */ li r0, 0 /* 800A77FC 000A475C 90 03 00 04 */ stw r0, 4(r3) -/* 800A7800 000A4760 4E 80 00 20 */ blr +/* 800A7800 000A4760 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR10CFishCloud" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR10CFishCloud": /* 800A7804 000A4764 38 00 00 00 */ li r0, 0 /* 800A7808 000A4768 90 03 00 04 */ stw r0, 4(r3) -/* 800A780C 000A476C 4E 80 00 20 */ blr +/* 800A780C 000A476C 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR18CFirstPersonCamera" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR18CFirstPersonCamera": /* 800A7810 000A4770 38 00 00 00 */ li r0, 0 /* 800A7814 000A4774 90 03 00 04 */ stw r0, 4(r3) -/* 800A7818 000A4778 4E 80 00 20 */ blr +/* 800A7818 000A4778 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR10CExplosion" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR10CExplosion": /* 800A781C 000A477C 38 00 00 00 */ li r0, 0 /* 800A7820 000A4780 90 03 00 04 */ stw r0, 4(r3) -/* 800A7824 000A4784 4E 80 00 20 */ blr +/* 800A7824 000A4784 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR7CEntity" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR7CEntity": /* 800A7828 000A4788 38 00 00 00 */ li r0, 0 /* 800A782C 000A478C 90 03 00 04 */ stw r0, 4(r3) -/* 800A7830 000A4790 4E 80 00 20 */ blr +/* 800A7830 000A4790 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR17CEnergyProjectile" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR17CEnergyProjectile": /* 800A7834 000A4794 38 00 00 00 */ li r0, 0 /* 800A7838 000A4798 90 03 00 04 */ stw r0, 4(r3) -/* 800A783C 000A479C 4E 80 00 20 */ blr +/* 800A783C 000A479C 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR16CDestroyableRock" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR16CDestroyableRock": /* 800A7840 000A47A0 38 00 00 00 */ li r0, 0 /* 800A7844 000A47A4 90 03 00 04 */ stw r0, 4(r3) -/* 800A7848 000A47A8 4E 80 00 20 */ blr +/* 800A7848 000A47A8 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR15CCollisionActor" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR15CCollisionActor": /* 800A784C 000A47AC 38 00 00 00 */ li r0, 0 /* 800A7850 000A47B0 90 03 00 04 */ stw r0, 4(r3) -/* 800A7854 000A47B4 4E 80 00 20 */ blr +/* 800A7854 000A47B4 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR16CCinematicCamera" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR16CCinematicCamera": /* 800A7858 000A47B8 38 00 00 00 */ li r0, 0 /* 800A785C 000A47BC 90 03 00 04 */ stw r0, 4(r3) -/* 800A7860 000A47C0 4E 80 00 20 */ blr +/* 800A7860 000A47C0 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR5CBomb" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR5CBomb": /* 800A7864 000A47C4 38 00 00 00 */ li r0, 0 /* 800A7868 000A47C8 90 03 00 04 */ stw r0, 4(r3) -/* 800A786C 000A47CC 4E 80 00 20 */ blr +/* 800A786C 000A47CC 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR11CBallCamera" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR11CBallCamera": /* 800A7870 000A47D0 38 00 00 00 */ li r0, 0 /* 800A7874 000A47D4 90 03 00 04 */ stw r0, 4(r3) -/* 800A7878 000A47D8 4E 80 00 20 */ blr +/* 800A7878 000A47D8 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptTargetingPoint>FR6CActor" "Visit__35TCastToPtr<21CScriptTargetingPoint>FR6CActor": /* 800A787C 000A47DC 38 00 00 00 */ li r0, 0 /* 800A7880 000A47E0 90 03 00 04 */ stw r0, 4(r3) -/* 800A7884 000A47E4 4E 80 00 20 */ blr +/* 800A7884 000A47E4 4E 80 00 20 */ blr .global "__ct__35TCastToPtr<21CScriptTargetingPoint>FP7CEntity" "__ct__35TCastToPtr<21CScriptTargetingPoint>FP7CEntity": @@ -7569,355 +7569,355 @@ lbl_800A75C8: /* 800A78CC 000A482C 81 83 00 00 */ lwz r12, 0(r3) /* 800A78D0 000A4830 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800A78D4 000A4834 7D 89 03 A6 */ mtctr r12 -/* 800A78D8 000A4838 4E 80 04 21 */ bctrl +/* 800A78D8 000A4838 4E 80 04 21 */ bctrl lbl_800A78DC: /* 800A78DC 000A483C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800A78E0 000A4840 7F E3 FB 78 */ mr r3, r31 /* 800A78E4 000A4844 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800A78E8 000A4848 7C 08 03 A6 */ mtlr r0 /* 800A78EC 000A484C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A78F0 000A4850 4E 80 00 20 */ blr +/* 800A78F0 000A4850 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR7CWeapon" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR7CWeapon": /* 800A78F4 000A4854 38 00 00 00 */ li r0, 0 /* 800A78F8 000A4858 90 03 00 04 */ stw r0, 4(r3) -/* 800A78FC 000A485C 4E 80 00 20 */ blr +/* 800A78FC 000A485C 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR17CWallCrawlerSwarm" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR17CWallCrawlerSwarm": /* 800A7900 000A4860 38 00 00 00 */ li r0, 0 /* 800A7904 000A4864 90 03 00 04 */ stw r0, 4(r3) -/* 800A7908 000A4868 4E 80 00 20 */ blr +/* 800A7908 000A4868 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR20CScriptSpindleCamera" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR20CScriptSpindleCamera": /* 800A790C 000A486C 38 00 00 00 */ li r0, 0 /* 800A7910 000A4870 90 03 00 04 */ stw r0, 4(r3) -/* 800A7914 000A4874 4E 80 00 20 */ blr +/* 800A7914 000A4874 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR15CSnakeWeedSwarm" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR15CSnakeWeedSwarm": /* 800A7918 000A4878 38 00 00 00 */ li r0, 0 /* 800A791C 000A487C 90 03 00 04 */ stw r0, 4(r3) -/* 800A7920 000A4880 4E 80 00 20 */ blr +/* 800A7920 000A4880 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR15CScriptWaypoint" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR15CScriptWaypoint": /* 800A7924 000A4884 38 00 00 00 */ li r0, 0 /* 800A7928 000A4888 90 03 00 04 */ stw r0, 4(r3) -/* 800A792C 000A488C 4E 80 00 20 */ blr +/* 800A792C 000A488C 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR12CScriptWater" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR12CScriptWater": /* 800A7930 000A4890 38 00 00 00 */ li r0, 0 /* 800A7934 000A4894 90 03 00 04 */ stw r0, 4(r3) -/* 800A7938 000A4898 4E 80 00 20 */ blr +/* 800A7938 000A4898 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR17CScriptVisorFlare" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR17CScriptVisorFlare": /* 800A793C 000A489C 38 00 00 00 */ li r0, 0 /* 800A7940 000A48A0 90 03 00 04 */ stw r0, 4(r3) -/* 800A7944 000A48A4 4E 80 00 20 */ blr +/* 800A7944 000A48A4 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR14CScriptTrigger" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR14CScriptTrigger": /* 800A7948 000A48A8 38 00 00 00 */ li r0, 0 /* 800A794C 000A48AC 90 03 00 04 */ stw r0, 4(r3) -/* 800A7950 000A48B0 4E 80 00 20 */ blr +/* 800A7950 000A48B0 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR12CScriptTimer" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR12CScriptTimer": /* 800A7954 000A48B4 38 00 00 00 */ li r0, 0 /* 800A7958 000A48B8 90 03 00 04 */ stw r0, 4(r3) -/* 800A795C 000A48BC 4E 80 00 20 */ blr +/* 800A795C 000A48BC 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR10CTeamAiMgr" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR10CTeamAiMgr": /* 800A7960 000A48C0 38 00 00 00 */ li r0, 0 /* 800A7964 000A48C4 90 03 00 04 */ stw r0, 4(r3) -/* 800A7968 000A48C8 4E 80 00 20 */ blr +/* 800A7968 000A48C8 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR21CScriptTargetingPoint" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR21CScriptTargetingPoint": /* 800A796C 000A48CC 38 00 00 00 */ li r0, 0 /* 800A7970 000A48D0 90 03 00 04 */ stw r0, 4(r3) -/* 800A7974 000A48D4 4E 80 00 20 */ blr +/* 800A7974 000A48D4 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR25CScriptSpiderBallWaypoint" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR25CScriptSpiderBallWaypoint": /* 800A7978 000A48D8 90 83 00 04 */ stw r4, 4(r3) -/* 800A797C 000A48DC 4E 80 00 20 */ blr +/* 800A797C 000A48DC 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR34CScriptSpiderBallAttractionSurface" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR34CScriptSpiderBallAttractionSurface": /* 800A7980 000A48E0 38 00 00 00 */ li r0, 0 /* 800A7984 000A48E4 90 03 00 04 */ stw r0, 4(r3) -/* 800A7988 000A48E8 4E 80 00 20 */ blr +/* 800A7988 000A48E8 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR22CScriptSpecialFunction" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR22CScriptSpecialFunction": /* 800A798C 000A48EC 38 00 00 00 */ li r0, 0 /* 800A7990 000A48F0 90 03 00 04 */ stw r0, 4(r3) -/* 800A7994 000A48F4 4E 80 00 20 */ blr +/* 800A7994 000A48F4 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR17CScriptSpawnPoint" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR17CScriptSpawnPoint": /* 800A7998 000A48F8 38 00 00 00 */ li r0, 0 /* 800A799C 000A48FC 90 03 00 04 */ stw r0, 4(r3) -/* 800A79A0 000A4900 4E 80 00 20 */ blr +/* 800A79A0 000A4900 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR12CScriptSound" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR12CScriptSound": /* 800A79A4 000A4904 38 00 00 00 */ li r0, 0 /* 800A79A8 000A4908 90 03 00 04 */ stw r0, 4(r3) -/* 800A79AC 000A490C 4E 80 00 20 */ blr +/* 800A79AC 000A490C 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR20CScriptRoomAcoustics" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR20CScriptRoomAcoustics": /* 800A79B0 000A4910 38 00 00 00 */ li r0, 0 /* 800A79B4 000A4914 90 03 00 04 */ stw r0, 4(r3) -/* 800A79B8 000A4918 4E 80 00 20 */ blr +/* 800A79B8 000A4918 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR22CScriptPointOfinterest" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR22CScriptPointOfinterest": /* 800A79BC 000A491C 38 00 00 00 */ li r0, 0 /* 800A79C0 000A4920 90 03 00 04 */ stw r0, 4(r3) -/* 800A79C4 000A4924 4E 80 00 20 */ blr +/* 800A79C4 000A4924 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR17CScriptPlayerHint" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR17CScriptPlayerHint": /* 800A79C8 000A4928 38 00 00 00 */ li r0, 0 /* 800A79CC 000A492C 90 03 00 04 */ stw r0, 4(r3) -/* 800A79D0 000A4930 4E 80 00 20 */ blr +/* 800A79D0 000A4930 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR15CScriptPlatform" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR15CScriptPlatform": /* 800A79D4 000A4934 38 00 00 00 */ li r0, 0 /* 800A79D8 000A4938 90 03 00 04 */ stw r0, 4(r3) -/* 800A79DC 000A493C 4E 80 00 20 */ blr +/* 800A79DC 000A493C 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR13CScriptPickup" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR13CScriptPickup": /* 800A79E0 000A4940 38 00 00 00 */ li r0, 0 /* 800A79E4 000A4944 90 03 00 04 */ stw r0, 4(r3) -/* 800A79E8 000A4948 4E 80 00 20 */ blr +/* 800A79E8 000A4948 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR15CScriptMazeNode" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR15CScriptMazeNode": /* 800A79EC 000A494C 38 00 00 00 */ li r0, 0 /* 800A79F0 000A4950 90 03 00 04 */ stw r0, 4(r3) -/* 800A79F4 000A4954 4E 80 00 20 */ blr +/* 800A79F4 000A4954 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR16CScriptGunTurret" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR16CScriptGunTurret": /* 800A79F8 000A4958 38 00 00 00 */ li r0, 0 /* 800A79FC 000A495C 90 03 00 04 */ stw r0, 4(r3) -/* 800A7A00 000A4960 4E 80 00 20 */ blr +/* 800A7A00 000A4960 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR19CScriptGrapplePoint" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR19CScriptGrapplePoint": /* 800A7A04 000A4964 38 00 00 00 */ li r0, 0 /* 800A7A08 000A4968 90 03 00 04 */ stw r0, 4(r3) -/* 800A7A0C 000A496C 4E 80 00 20 */ blr +/* 800A7A0C 000A496C 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR13CScriptEffect" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR13CScriptEffect": /* 800A7A10 000A4970 38 00 00 00 */ li r0, 0 /* 800A7A14 000A4974 90 03 00 04 */ stw r0, 4(r3) -/* 800A7A18 000A4978 4E 80 00 20 */ blr +/* 800A7A18 000A4978 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR11CScriptDoor" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR11CScriptDoor": /* 800A7A1C 000A497C 38 00 00 00 */ li r0, 0 /* 800A7A20 000A4980 90 03 00 04 */ stw r0, 4(r3) -/* 800A7A24 000A4984 4E 80 00 20 */ blr +/* 800A7A24 000A4984 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR11CScriptDock" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR11CScriptDock": /* 800A7A28 000A4988 38 00 00 00 */ li r0, 0 /* 800A7A2C 000A498C 90 03 00 04 */ stw r0, 4(r3) -/* 800A7A30 000A4990 4E 80 00 20 */ blr +/* 800A7A30 000A4990 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR18CScriptDistanceFog" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR18CScriptDistanceFog": /* 800A7A34 000A4994 38 00 00 00 */ li r0, 0 /* 800A7A38 000A4998 90 03 00 04 */ stw r0, 4(r3) -/* 800A7A3C 000A499C 4E 80 00 20 */ blr +/* 800A7A3C 000A499C 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR26CScriptDebugCameraWaypoint" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR26CScriptDebugCameraWaypoint": /* 800A7A40 000A49A0 38 00 00 00 */ li r0, 0 /* 800A7A44 000A49A4 90 03 00 04 */ stw r0, 4(r3) -/* 800A7A48 000A49A8 4E 80 00 20 */ blr +/* 800A7A48 000A49A8 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR17CScriptCoverPoint" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR17CScriptCoverPoint": /* 800A7A4C 000A49AC 38 00 00 00 */ li r0, 0 /* 800A7A50 000A49B0 90 03 00 04 */ stw r0, 4(r3) -/* 800A7A54 000A49B4 4E 80 00 20 */ blr +/* 800A7A54 000A49B4 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR21CScriptCameraWaypoint" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR21CScriptCameraWaypoint": /* 800A7A58 000A49B8 38 00 00 00 */ li r0, 0 /* 800A7A5C 000A49BC 90 03 00 04 */ stw r0, 4(r3) -/* 800A7A60 000A49C0 4E 80 00 20 */ blr +/* 800A7A60 000A49C0 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR24CScriptCameraPitchVolume" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR24CScriptCameraPitchVolume": /* 800A7A64 000A49C4 38 00 00 00 */ li r0, 0 /* 800A7A68 000A49C8 90 03 00 04 */ stw r0, 4(r3) -/* 800A7A6C 000A49CC 4E 80 00 20 */ blr +/* 800A7A6C 000A49CC 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR17CScriptCameraHint" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR17CScriptCameraHint": /* 800A7A70 000A49D0 38 00 00 00 */ li r0, 0 /* 800A7A74 000A49D4 90 03 00 04 */ stw r0, 4(r3) -/* 800A7A78 000A49D8 4E 80 00 20 */ blr +/* 800A7A78 000A49D8 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR18CScriptAiJumpPoint" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR18CScriptAiJumpPoint": /* 800A7A7C 000A49DC 38 00 00 00 */ li r0, 0 /* 800A7A80 000A49E0 90 03 00 04 */ stw r0, 4(r3) -/* 800A7A84 000A49E4 4E 80 00 20 */ blr +/* 800A7A84 000A49E4 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR20CScriptActorKeyframe" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR20CScriptActorKeyframe": /* 800A7A88 000A49E8 38 00 00 00 */ li r0, 0 /* 800A7A8C 000A49EC 90 03 00 04 */ stw r0, 4(r3) -/* 800A7A90 000A49F0 4E 80 00 20 */ blr +/* 800A7A90 000A49F0 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR12CScriptActor" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR12CScriptActor": /* 800A7A94 000A49F4 38 00 00 00 */ li r0, 0 /* 800A7A98 000A49F8 90 03 00 04 */ stw r0, 4(r3) -/* 800A7A9C 000A49FC 4E 80 00 20 */ blr +/* 800A7A9C 000A49FC 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR9CRepulsor" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR9CRepulsor": /* 800A7AA0 000A4A00 38 00 00 00 */ li r0, 0 /* 800A7AA4 000A4A04 90 03 00 04 */ stw r0, 4(r3) -/* 800A7AA8 000A4A08 4E 80 00 20 */ blr +/* 800A7AA8 000A4A08 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR7CPlayer" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR7CPlayer": /* 800A7AAC 000A4A0C 38 00 00 00 */ li r0, 0 /* 800A7AB0 000A4A10 90 03 00 04 */ stw r0, 4(r3) -/* 800A7AB4 000A4A14 4E 80 00 20 */ blr +/* 800A7AB4 000A4A14 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR13CPhysicsActor" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR13CPhysicsActor": /* 800A7AB8 000A4A18 38 00 00 00 */ li r0, 0 /* 800A7ABC 000A4A1C 90 03 00 04 */ stw r0, 4(r3) -/* 800A7AC0 000A4A20 4E 80 00 20 */ blr +/* 800A7AC0 000A4A20 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR3CAi" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR3CAi": /* 800A7AC4 000A4A24 38 00 00 00 */ li r0, 0 /* 800A7AC8 000A4A28 90 03 00 04 */ stw r0, 4(r3) -/* 800A7ACC 000A4A2C 4E 80 00 20 */ blr +/* 800A7ACC 000A4A2C 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR11CPathCamera" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR11CPathCamera": /* 800A7AD0 000A4A30 38 00 00 00 */ li r0, 0 /* 800A7AD4 000A4A34 90 03 00 04 */ stw r0, 4(r3) -/* 800A7AD8 000A4A38 4E 80 00 20 */ blr +/* 800A7AD8 000A4A38 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR18CMetroidPrimeRelay" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR18CMetroidPrimeRelay": /* 800A7ADC 000A4A3C 38 00 00 00 */ li r0, 0 /* 800A7AE0 000A4A40 90 03 00 04 */ stw r0, 4(r3) -/* 800A7AE4 000A4A44 4E 80 00 20 */ blr +/* 800A7AE4 000A4A44 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR19CHUDBillboardEffect" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR19CHUDBillboardEffect": /* 800A7AE8 000A4A48 38 00 00 00 */ li r0, 0 /* 800A7AEC 000A4A4C 90 03 00 04 */ stw r0, 4(r3) -/* 800A7AF0 000A4A50 4E 80 00 20 */ blr +/* 800A7AF0 000A4A50 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR15CGameProjectile" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR15CGameProjectile": /* 800A7AF4 000A4A54 38 00 00 00 */ li r0, 0 /* 800A7AF8 000A4A58 90 03 00 04 */ stw r0, 4(r3) -/* 800A7AFC 000A4A5C 4E 80 00 20 */ blr +/* 800A7AFC 000A4A5C 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR10CGameLight" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR10CGameLight": /* 800A7B00 000A4A60 38 00 00 00 */ li r0, 0 /* 800A7B04 000A4A64 90 03 00 04 */ stw r0, 4(r3) -/* 800A7B08 000A4A68 4E 80 00 20 */ blr +/* 800A7B08 000A4A68 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR11CGameCamera" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR11CGameCamera": /* 800A7B0C 000A4A6C 38 00 00 00 */ li r0, 0 /* 800A7B10 000A4A70 90 03 00 04 */ stw r0, 4(r3) -/* 800A7B14 000A4A74 4E 80 00 20 */ blr +/* 800A7B14 000A4A74 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR10CFishCloud" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR10CFishCloud": /* 800A7B18 000A4A78 38 00 00 00 */ li r0, 0 /* 800A7B1C 000A4A7C 90 03 00 04 */ stw r0, 4(r3) -/* 800A7B20 000A4A80 4E 80 00 20 */ blr +/* 800A7B20 000A4A80 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR18CFirstPersonCamera" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR18CFirstPersonCamera": /* 800A7B24 000A4A84 38 00 00 00 */ li r0, 0 /* 800A7B28 000A4A88 90 03 00 04 */ stw r0, 4(r3) -/* 800A7B2C 000A4A8C 4E 80 00 20 */ blr +/* 800A7B2C 000A4A8C 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR10CExplosion" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR10CExplosion": /* 800A7B30 000A4A90 38 00 00 00 */ li r0, 0 /* 800A7B34 000A4A94 90 03 00 04 */ stw r0, 4(r3) -/* 800A7B38 000A4A98 4E 80 00 20 */ blr +/* 800A7B38 000A4A98 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR7CEntity" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR7CEntity": /* 800A7B3C 000A4A9C 38 00 00 00 */ li r0, 0 /* 800A7B40 000A4AA0 90 03 00 04 */ stw r0, 4(r3) -/* 800A7B44 000A4AA4 4E 80 00 20 */ blr +/* 800A7B44 000A4AA4 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR17CEnergyProjectile" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR17CEnergyProjectile": /* 800A7B48 000A4AA8 38 00 00 00 */ li r0, 0 /* 800A7B4C 000A4AAC 90 03 00 04 */ stw r0, 4(r3) -/* 800A7B50 000A4AB0 4E 80 00 20 */ blr +/* 800A7B50 000A4AB0 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR16CDestroyableRock" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR16CDestroyableRock": /* 800A7B54 000A4AB4 38 00 00 00 */ li r0, 0 /* 800A7B58 000A4AB8 90 03 00 04 */ stw r0, 4(r3) -/* 800A7B5C 000A4ABC 4E 80 00 20 */ blr +/* 800A7B5C 000A4ABC 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR15CCollisionActor" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR15CCollisionActor": /* 800A7B60 000A4AC0 38 00 00 00 */ li r0, 0 /* 800A7B64 000A4AC4 90 03 00 04 */ stw r0, 4(r3) -/* 800A7B68 000A4AC8 4E 80 00 20 */ blr +/* 800A7B68 000A4AC8 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR16CCinematicCamera" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR16CCinematicCamera": /* 800A7B6C 000A4ACC 38 00 00 00 */ li r0, 0 /* 800A7B70 000A4AD0 90 03 00 04 */ stw r0, 4(r3) -/* 800A7B74 000A4AD4 4E 80 00 20 */ blr +/* 800A7B74 000A4AD4 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR5CBomb" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR5CBomb": /* 800A7B78 000A4AD8 38 00 00 00 */ li r0, 0 /* 800A7B7C 000A4ADC 90 03 00 04 */ stw r0, 4(r3) -/* 800A7B80 000A4AE0 4E 80 00 20 */ blr +/* 800A7B80 000A4AE0 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR11CBallCamera" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR11CBallCamera": /* 800A7B84 000A4AE4 38 00 00 00 */ li r0, 0 /* 800A7B88 000A4AE8 90 03 00 04 */ stw r0, 4(r3) -/* 800A7B8C 000A4AEC 4E 80 00 20 */ blr +/* 800A7B8C 000A4AEC 4E 80 00 20 */ blr .global "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR6CActor" "Visit__39TCastToPtr<25CScriptSpiderBallWaypoint>FR6CActor": /* 800A7B90 000A4AF0 38 00 00 00 */ li r0, 0 /* 800A7B94 000A4AF4 90 03 00 04 */ stw r0, 4(r3) -/* 800A7B98 000A4AF8 4E 80 00 20 */ blr +/* 800A7B98 000A4AF8 4E 80 00 20 */ blr .global "__ct__39TCastToPtr<25CScriptSpiderBallWaypoint>FP7CEntity" "__ct__39TCastToPtr<25CScriptSpiderBallWaypoint>FP7CEntity": @@ -7941,355 +7941,355 @@ lbl_800A78DC: /* 800A7BE0 000A4B40 81 83 00 00 */ lwz r12, 0(r3) /* 800A7BE4 000A4B44 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800A7BE8 000A4B48 7D 89 03 A6 */ mtctr r12 -/* 800A7BEC 000A4B4C 4E 80 04 21 */ bctrl +/* 800A7BEC 000A4B4C 4E 80 04 21 */ bctrl lbl_800A7BF0: /* 800A7BF0 000A4B50 80 01 00 14 */ lwz r0, 0x14(r1) /* 800A7BF4 000A4B54 7F E3 FB 78 */ mr r3, r31 /* 800A7BF8 000A4B58 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800A7BFC 000A4B5C 7C 08 03 A6 */ mtlr r0 /* 800A7C00 000A4B60 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A7C04 000A4B64 4E 80 00 20 */ blr +/* 800A7C04 000A4B64 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR7CWeapon" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR7CWeapon": /* 800A7C08 000A4B68 38 00 00 00 */ li r0, 0 /* 800A7C0C 000A4B6C 90 03 00 04 */ stw r0, 4(r3) -/* 800A7C10 000A4B70 4E 80 00 20 */ blr +/* 800A7C10 000A4B70 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR17CWallCrawlerSwarm" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR17CWallCrawlerSwarm": /* 800A7C14 000A4B74 38 00 00 00 */ li r0, 0 /* 800A7C18 000A4B78 90 03 00 04 */ stw r0, 4(r3) -/* 800A7C1C 000A4B7C 4E 80 00 20 */ blr +/* 800A7C1C 000A4B7C 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR20CScriptSpindleCamera" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR20CScriptSpindleCamera": /* 800A7C20 000A4B80 38 00 00 00 */ li r0, 0 /* 800A7C24 000A4B84 90 03 00 04 */ stw r0, 4(r3) -/* 800A7C28 000A4B88 4E 80 00 20 */ blr +/* 800A7C28 000A4B88 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR15CSnakeWeedSwarm" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR15CSnakeWeedSwarm": /* 800A7C2C 000A4B8C 38 00 00 00 */ li r0, 0 /* 800A7C30 000A4B90 90 03 00 04 */ stw r0, 4(r3) -/* 800A7C34 000A4B94 4E 80 00 20 */ blr +/* 800A7C34 000A4B94 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR15CScriptWaypoint" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR15CScriptWaypoint": /* 800A7C38 000A4B98 38 00 00 00 */ li r0, 0 /* 800A7C3C 000A4B9C 90 03 00 04 */ stw r0, 4(r3) -/* 800A7C40 000A4BA0 4E 80 00 20 */ blr +/* 800A7C40 000A4BA0 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR12CScriptWater" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR12CScriptWater": /* 800A7C44 000A4BA4 38 00 00 00 */ li r0, 0 /* 800A7C48 000A4BA8 90 03 00 04 */ stw r0, 4(r3) -/* 800A7C4C 000A4BAC 4E 80 00 20 */ blr +/* 800A7C4C 000A4BAC 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR17CScriptVisorFlare" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR17CScriptVisorFlare": /* 800A7C50 000A4BB0 38 00 00 00 */ li r0, 0 /* 800A7C54 000A4BB4 90 03 00 04 */ stw r0, 4(r3) -/* 800A7C58 000A4BB8 4E 80 00 20 */ blr +/* 800A7C58 000A4BB8 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR14CScriptTrigger" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR14CScriptTrigger": /* 800A7C5C 000A4BBC 38 00 00 00 */ li r0, 0 /* 800A7C60 000A4BC0 90 03 00 04 */ stw r0, 4(r3) -/* 800A7C64 000A4BC4 4E 80 00 20 */ blr +/* 800A7C64 000A4BC4 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR12CScriptTimer" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR12CScriptTimer": /* 800A7C68 000A4BC8 38 00 00 00 */ li r0, 0 /* 800A7C6C 000A4BCC 90 03 00 04 */ stw r0, 4(r3) -/* 800A7C70 000A4BD0 4E 80 00 20 */ blr +/* 800A7C70 000A4BD0 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR10CTeamAiMgr" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR10CTeamAiMgr": /* 800A7C74 000A4BD4 38 00 00 00 */ li r0, 0 /* 800A7C78 000A4BD8 90 03 00 04 */ stw r0, 4(r3) -/* 800A7C7C 000A4BDC 4E 80 00 20 */ blr +/* 800A7C7C 000A4BDC 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR21CScriptTargetingPoint" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR21CScriptTargetingPoint": /* 800A7C80 000A4BE0 38 00 00 00 */ li r0, 0 /* 800A7C84 000A4BE4 90 03 00 04 */ stw r0, 4(r3) -/* 800A7C88 000A4BE8 4E 80 00 20 */ blr +/* 800A7C88 000A4BE8 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR25CScriptSpiderBallWaypoint" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR25CScriptSpiderBallWaypoint": /* 800A7C8C 000A4BEC 38 00 00 00 */ li r0, 0 /* 800A7C90 000A4BF0 90 03 00 04 */ stw r0, 4(r3) -/* 800A7C94 000A4BF4 4E 80 00 20 */ blr +/* 800A7C94 000A4BF4 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR34CScriptSpiderBallAttractionSurface" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR34CScriptSpiderBallAttractionSurface": /* 800A7C98 000A4BF8 90 83 00 04 */ stw r4, 4(r3) -/* 800A7C9C 000A4BFC 4E 80 00 20 */ blr +/* 800A7C9C 000A4BFC 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR22CScriptSpecialFunction" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR22CScriptSpecialFunction": /* 800A7CA0 000A4C00 38 00 00 00 */ li r0, 0 /* 800A7CA4 000A4C04 90 03 00 04 */ stw r0, 4(r3) -/* 800A7CA8 000A4C08 4E 80 00 20 */ blr +/* 800A7CA8 000A4C08 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR17CScriptSpawnPoint" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR17CScriptSpawnPoint": /* 800A7CAC 000A4C0C 38 00 00 00 */ li r0, 0 /* 800A7CB0 000A4C10 90 03 00 04 */ stw r0, 4(r3) -/* 800A7CB4 000A4C14 4E 80 00 20 */ blr +/* 800A7CB4 000A4C14 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR12CScriptSound" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR12CScriptSound": /* 800A7CB8 000A4C18 38 00 00 00 */ li r0, 0 /* 800A7CBC 000A4C1C 90 03 00 04 */ stw r0, 4(r3) -/* 800A7CC0 000A4C20 4E 80 00 20 */ blr +/* 800A7CC0 000A4C20 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR20CScriptRoomAcoustics" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR20CScriptRoomAcoustics": /* 800A7CC4 000A4C24 38 00 00 00 */ li r0, 0 /* 800A7CC8 000A4C28 90 03 00 04 */ stw r0, 4(r3) -/* 800A7CCC 000A4C2C 4E 80 00 20 */ blr +/* 800A7CCC 000A4C2C 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR22CScriptPointOfinterest" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR22CScriptPointOfinterest": /* 800A7CD0 000A4C30 38 00 00 00 */ li r0, 0 /* 800A7CD4 000A4C34 90 03 00 04 */ stw r0, 4(r3) -/* 800A7CD8 000A4C38 4E 80 00 20 */ blr +/* 800A7CD8 000A4C38 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR17CScriptPlayerHint" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR17CScriptPlayerHint": /* 800A7CDC 000A4C3C 38 00 00 00 */ li r0, 0 /* 800A7CE0 000A4C40 90 03 00 04 */ stw r0, 4(r3) -/* 800A7CE4 000A4C44 4E 80 00 20 */ blr +/* 800A7CE4 000A4C44 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR15CScriptPlatform" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR15CScriptPlatform": /* 800A7CE8 000A4C48 38 00 00 00 */ li r0, 0 /* 800A7CEC 000A4C4C 90 03 00 04 */ stw r0, 4(r3) -/* 800A7CF0 000A4C50 4E 80 00 20 */ blr +/* 800A7CF0 000A4C50 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR13CScriptPickup" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR13CScriptPickup": /* 800A7CF4 000A4C54 38 00 00 00 */ li r0, 0 /* 800A7CF8 000A4C58 90 03 00 04 */ stw r0, 4(r3) -/* 800A7CFC 000A4C5C 4E 80 00 20 */ blr +/* 800A7CFC 000A4C5C 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR15CScriptMazeNode" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR15CScriptMazeNode": /* 800A7D00 000A4C60 38 00 00 00 */ li r0, 0 /* 800A7D04 000A4C64 90 03 00 04 */ stw r0, 4(r3) -/* 800A7D08 000A4C68 4E 80 00 20 */ blr +/* 800A7D08 000A4C68 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR16CScriptGunTurret" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR16CScriptGunTurret": /* 800A7D0C 000A4C6C 38 00 00 00 */ li r0, 0 /* 800A7D10 000A4C70 90 03 00 04 */ stw r0, 4(r3) -/* 800A7D14 000A4C74 4E 80 00 20 */ blr +/* 800A7D14 000A4C74 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR19CScriptGrapplePoint" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR19CScriptGrapplePoint": /* 800A7D18 000A4C78 38 00 00 00 */ li r0, 0 /* 800A7D1C 000A4C7C 90 03 00 04 */ stw r0, 4(r3) -/* 800A7D20 000A4C80 4E 80 00 20 */ blr +/* 800A7D20 000A4C80 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR13CScriptEffect" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR13CScriptEffect": /* 800A7D24 000A4C84 38 00 00 00 */ li r0, 0 /* 800A7D28 000A4C88 90 03 00 04 */ stw r0, 4(r3) -/* 800A7D2C 000A4C8C 4E 80 00 20 */ blr +/* 800A7D2C 000A4C8C 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR11CScriptDoor" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR11CScriptDoor": /* 800A7D30 000A4C90 38 00 00 00 */ li r0, 0 /* 800A7D34 000A4C94 90 03 00 04 */ stw r0, 4(r3) -/* 800A7D38 000A4C98 4E 80 00 20 */ blr +/* 800A7D38 000A4C98 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR11CScriptDock" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR11CScriptDock": /* 800A7D3C 000A4C9C 38 00 00 00 */ li r0, 0 /* 800A7D40 000A4CA0 90 03 00 04 */ stw r0, 4(r3) -/* 800A7D44 000A4CA4 4E 80 00 20 */ blr +/* 800A7D44 000A4CA4 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR18CScriptDistanceFog" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR18CScriptDistanceFog": /* 800A7D48 000A4CA8 38 00 00 00 */ li r0, 0 /* 800A7D4C 000A4CAC 90 03 00 04 */ stw r0, 4(r3) -/* 800A7D50 000A4CB0 4E 80 00 20 */ blr +/* 800A7D50 000A4CB0 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR26CScriptDebugCameraWaypoint" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR26CScriptDebugCameraWaypoint": /* 800A7D54 000A4CB4 38 00 00 00 */ li r0, 0 /* 800A7D58 000A4CB8 90 03 00 04 */ stw r0, 4(r3) -/* 800A7D5C 000A4CBC 4E 80 00 20 */ blr +/* 800A7D5C 000A4CBC 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR17CScriptCoverPoint" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR17CScriptCoverPoint": /* 800A7D60 000A4CC0 38 00 00 00 */ li r0, 0 /* 800A7D64 000A4CC4 90 03 00 04 */ stw r0, 4(r3) -/* 800A7D68 000A4CC8 4E 80 00 20 */ blr +/* 800A7D68 000A4CC8 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR21CScriptCameraWaypoint" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR21CScriptCameraWaypoint": /* 800A7D6C 000A4CCC 38 00 00 00 */ li r0, 0 /* 800A7D70 000A4CD0 90 03 00 04 */ stw r0, 4(r3) -/* 800A7D74 000A4CD4 4E 80 00 20 */ blr +/* 800A7D74 000A4CD4 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR24CScriptCameraPitchVolume" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR24CScriptCameraPitchVolume": /* 800A7D78 000A4CD8 38 00 00 00 */ li r0, 0 /* 800A7D7C 000A4CDC 90 03 00 04 */ stw r0, 4(r3) -/* 800A7D80 000A4CE0 4E 80 00 20 */ blr +/* 800A7D80 000A4CE0 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR17CScriptCameraHint" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR17CScriptCameraHint": /* 800A7D84 000A4CE4 38 00 00 00 */ li r0, 0 /* 800A7D88 000A4CE8 90 03 00 04 */ stw r0, 4(r3) -/* 800A7D8C 000A4CEC 4E 80 00 20 */ blr +/* 800A7D8C 000A4CEC 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR18CScriptAiJumpPoint" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR18CScriptAiJumpPoint": /* 800A7D90 000A4CF0 38 00 00 00 */ li r0, 0 /* 800A7D94 000A4CF4 90 03 00 04 */ stw r0, 4(r3) -/* 800A7D98 000A4CF8 4E 80 00 20 */ blr +/* 800A7D98 000A4CF8 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR20CScriptActorKeyframe" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR20CScriptActorKeyframe": /* 800A7D9C 000A4CFC 38 00 00 00 */ li r0, 0 /* 800A7DA0 000A4D00 90 03 00 04 */ stw r0, 4(r3) -/* 800A7DA4 000A4D04 4E 80 00 20 */ blr +/* 800A7DA4 000A4D04 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR12CScriptActor" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR12CScriptActor": /* 800A7DA8 000A4D08 38 00 00 00 */ li r0, 0 /* 800A7DAC 000A4D0C 90 03 00 04 */ stw r0, 4(r3) -/* 800A7DB0 000A4D10 4E 80 00 20 */ blr +/* 800A7DB0 000A4D10 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR9CRepulsor" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR9CRepulsor": /* 800A7DB4 000A4D14 38 00 00 00 */ li r0, 0 /* 800A7DB8 000A4D18 90 03 00 04 */ stw r0, 4(r3) -/* 800A7DBC 000A4D1C 4E 80 00 20 */ blr +/* 800A7DBC 000A4D1C 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR7CPlayer" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR7CPlayer": /* 800A7DC0 000A4D20 38 00 00 00 */ li r0, 0 /* 800A7DC4 000A4D24 90 03 00 04 */ stw r0, 4(r3) -/* 800A7DC8 000A4D28 4E 80 00 20 */ blr +/* 800A7DC8 000A4D28 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR13CPhysicsActor" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR13CPhysicsActor": /* 800A7DCC 000A4D2C 38 00 00 00 */ li r0, 0 /* 800A7DD0 000A4D30 90 03 00 04 */ stw r0, 4(r3) -/* 800A7DD4 000A4D34 4E 80 00 20 */ blr +/* 800A7DD4 000A4D34 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR3CAi" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR3CAi": /* 800A7DD8 000A4D38 38 00 00 00 */ li r0, 0 /* 800A7DDC 000A4D3C 90 03 00 04 */ stw r0, 4(r3) -/* 800A7DE0 000A4D40 4E 80 00 20 */ blr +/* 800A7DE0 000A4D40 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR11CPathCamera" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR11CPathCamera": /* 800A7DE4 000A4D44 38 00 00 00 */ li r0, 0 /* 800A7DE8 000A4D48 90 03 00 04 */ stw r0, 4(r3) -/* 800A7DEC 000A4D4C 4E 80 00 20 */ blr +/* 800A7DEC 000A4D4C 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR18CMetroidPrimeRelay" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR18CMetroidPrimeRelay": /* 800A7DF0 000A4D50 38 00 00 00 */ li r0, 0 /* 800A7DF4 000A4D54 90 03 00 04 */ stw r0, 4(r3) -/* 800A7DF8 000A4D58 4E 80 00 20 */ blr +/* 800A7DF8 000A4D58 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR19CHUDBillboardEffect" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR19CHUDBillboardEffect": /* 800A7DFC 000A4D5C 38 00 00 00 */ li r0, 0 /* 800A7E00 000A4D60 90 03 00 04 */ stw r0, 4(r3) -/* 800A7E04 000A4D64 4E 80 00 20 */ blr +/* 800A7E04 000A4D64 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR15CGameProjectile" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR15CGameProjectile": /* 800A7E08 000A4D68 38 00 00 00 */ li r0, 0 /* 800A7E0C 000A4D6C 90 03 00 04 */ stw r0, 4(r3) -/* 800A7E10 000A4D70 4E 80 00 20 */ blr +/* 800A7E10 000A4D70 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR10CGameLight" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR10CGameLight": /* 800A7E14 000A4D74 38 00 00 00 */ li r0, 0 /* 800A7E18 000A4D78 90 03 00 04 */ stw r0, 4(r3) -/* 800A7E1C 000A4D7C 4E 80 00 20 */ blr +/* 800A7E1C 000A4D7C 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR11CGameCamera" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR11CGameCamera": /* 800A7E20 000A4D80 38 00 00 00 */ li r0, 0 /* 800A7E24 000A4D84 90 03 00 04 */ stw r0, 4(r3) -/* 800A7E28 000A4D88 4E 80 00 20 */ blr +/* 800A7E28 000A4D88 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR10CFishCloud" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR10CFishCloud": /* 800A7E2C 000A4D8C 38 00 00 00 */ li r0, 0 /* 800A7E30 000A4D90 90 03 00 04 */ stw r0, 4(r3) -/* 800A7E34 000A4D94 4E 80 00 20 */ blr +/* 800A7E34 000A4D94 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR18CFirstPersonCamera" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR18CFirstPersonCamera": /* 800A7E38 000A4D98 38 00 00 00 */ li r0, 0 /* 800A7E3C 000A4D9C 90 03 00 04 */ stw r0, 4(r3) -/* 800A7E40 000A4DA0 4E 80 00 20 */ blr +/* 800A7E40 000A4DA0 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR10CExplosion" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR10CExplosion": /* 800A7E44 000A4DA4 38 00 00 00 */ li r0, 0 /* 800A7E48 000A4DA8 90 03 00 04 */ stw r0, 4(r3) -/* 800A7E4C 000A4DAC 4E 80 00 20 */ blr +/* 800A7E4C 000A4DAC 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR7CEntity" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR7CEntity": /* 800A7E50 000A4DB0 38 00 00 00 */ li r0, 0 /* 800A7E54 000A4DB4 90 03 00 04 */ stw r0, 4(r3) -/* 800A7E58 000A4DB8 4E 80 00 20 */ blr +/* 800A7E58 000A4DB8 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR17CEnergyProjectile" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR17CEnergyProjectile": /* 800A7E5C 000A4DBC 38 00 00 00 */ li r0, 0 /* 800A7E60 000A4DC0 90 03 00 04 */ stw r0, 4(r3) -/* 800A7E64 000A4DC4 4E 80 00 20 */ blr +/* 800A7E64 000A4DC4 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR16CDestroyableRock" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR16CDestroyableRock": /* 800A7E68 000A4DC8 38 00 00 00 */ li r0, 0 /* 800A7E6C 000A4DCC 90 03 00 04 */ stw r0, 4(r3) -/* 800A7E70 000A4DD0 4E 80 00 20 */ blr +/* 800A7E70 000A4DD0 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR15CCollisionActor" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR15CCollisionActor": /* 800A7E74 000A4DD4 38 00 00 00 */ li r0, 0 /* 800A7E78 000A4DD8 90 03 00 04 */ stw r0, 4(r3) -/* 800A7E7C 000A4DDC 4E 80 00 20 */ blr +/* 800A7E7C 000A4DDC 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR16CCinematicCamera" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR16CCinematicCamera": /* 800A7E80 000A4DE0 38 00 00 00 */ li r0, 0 /* 800A7E84 000A4DE4 90 03 00 04 */ stw r0, 4(r3) -/* 800A7E88 000A4DE8 4E 80 00 20 */ blr +/* 800A7E88 000A4DE8 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR5CBomb" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR5CBomb": /* 800A7E8C 000A4DEC 38 00 00 00 */ li r0, 0 /* 800A7E90 000A4DF0 90 03 00 04 */ stw r0, 4(r3) -/* 800A7E94 000A4DF4 4E 80 00 20 */ blr +/* 800A7E94 000A4DF4 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR11CBallCamera" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR11CBallCamera": /* 800A7E98 000A4DF8 38 00 00 00 */ li r0, 0 /* 800A7E9C 000A4DFC 90 03 00 04 */ stw r0, 4(r3) -/* 800A7EA0 000A4E00 4E 80 00 20 */ blr +/* 800A7EA0 000A4E00 4E 80 00 20 */ blr .global "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR6CActor" "Visit__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FR6CActor": /* 800A7EA4 000A4E04 38 00 00 00 */ li r0, 0 /* 800A7EA8 000A4E08 90 03 00 04 */ stw r0, 4(r3) -/* 800A7EAC 000A4E0C 4E 80 00 20 */ blr +/* 800A7EAC 000A4E0C 4E 80 00 20 */ blr .global "__ct__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FP7CEntity" "__ct__48TCastToPtr<34CScriptSpiderBallAttractionSurface>FP7CEntity": @@ -8313,355 +8313,355 @@ lbl_800A7BF0: /* 800A7EF4 000A4E54 81 83 00 00 */ lwz r12, 0(r3) /* 800A7EF8 000A4E58 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800A7EFC 000A4E5C 7D 89 03 A6 */ mtctr r12 -/* 800A7F00 000A4E60 4E 80 04 21 */ bctrl +/* 800A7F00 000A4E60 4E 80 04 21 */ bctrl lbl_800A7F04: /* 800A7F04 000A4E64 80 01 00 14 */ lwz r0, 0x14(r1) /* 800A7F08 000A4E68 7F E3 FB 78 */ mr r3, r31 /* 800A7F0C 000A4E6C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800A7F10 000A4E70 7C 08 03 A6 */ mtlr r0 /* 800A7F14 000A4E74 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A7F18 000A4E78 4E 80 00 20 */ blr +/* 800A7F18 000A4E78 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR7CWeapon" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR7CWeapon": /* 800A7F1C 000A4E7C 38 00 00 00 */ li r0, 0 /* 800A7F20 000A4E80 90 03 00 04 */ stw r0, 4(r3) -/* 800A7F24 000A4E84 4E 80 00 20 */ blr +/* 800A7F24 000A4E84 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR17CWallCrawlerSwarm" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR17CWallCrawlerSwarm": /* 800A7F28 000A4E88 38 00 00 00 */ li r0, 0 /* 800A7F2C 000A4E8C 90 03 00 04 */ stw r0, 4(r3) -/* 800A7F30 000A4E90 4E 80 00 20 */ blr +/* 800A7F30 000A4E90 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR20CScriptSpindleCamera" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR20CScriptSpindleCamera": /* 800A7F34 000A4E94 38 00 00 00 */ li r0, 0 /* 800A7F38 000A4E98 90 03 00 04 */ stw r0, 4(r3) -/* 800A7F3C 000A4E9C 4E 80 00 20 */ blr +/* 800A7F3C 000A4E9C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR15CSnakeWeedSwarm" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR15CSnakeWeedSwarm": /* 800A7F40 000A4EA0 38 00 00 00 */ li r0, 0 /* 800A7F44 000A4EA4 90 03 00 04 */ stw r0, 4(r3) -/* 800A7F48 000A4EA8 4E 80 00 20 */ blr +/* 800A7F48 000A4EA8 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR15CScriptWaypoint" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR15CScriptWaypoint": /* 800A7F4C 000A4EAC 38 00 00 00 */ li r0, 0 /* 800A7F50 000A4EB0 90 03 00 04 */ stw r0, 4(r3) -/* 800A7F54 000A4EB4 4E 80 00 20 */ blr +/* 800A7F54 000A4EB4 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR12CScriptWater" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR12CScriptWater": /* 800A7F58 000A4EB8 38 00 00 00 */ li r0, 0 /* 800A7F5C 000A4EBC 90 03 00 04 */ stw r0, 4(r3) -/* 800A7F60 000A4EC0 4E 80 00 20 */ blr +/* 800A7F60 000A4EC0 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR17CScriptVisorFlare" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR17CScriptVisorFlare": /* 800A7F64 000A4EC4 38 00 00 00 */ li r0, 0 /* 800A7F68 000A4EC8 90 03 00 04 */ stw r0, 4(r3) -/* 800A7F6C 000A4ECC 4E 80 00 20 */ blr +/* 800A7F6C 000A4ECC 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR14CScriptTrigger" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR14CScriptTrigger": /* 800A7F70 000A4ED0 38 00 00 00 */ li r0, 0 /* 800A7F74 000A4ED4 90 03 00 04 */ stw r0, 4(r3) -/* 800A7F78 000A4ED8 4E 80 00 20 */ blr +/* 800A7F78 000A4ED8 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR12CScriptTimer" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR12CScriptTimer": /* 800A7F7C 000A4EDC 38 00 00 00 */ li r0, 0 /* 800A7F80 000A4EE0 90 03 00 04 */ stw r0, 4(r3) -/* 800A7F84 000A4EE4 4E 80 00 20 */ blr +/* 800A7F84 000A4EE4 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR10CTeamAiMgr" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR10CTeamAiMgr": /* 800A7F88 000A4EE8 38 00 00 00 */ li r0, 0 /* 800A7F8C 000A4EEC 90 03 00 04 */ stw r0, 4(r3) -/* 800A7F90 000A4EF0 4E 80 00 20 */ blr +/* 800A7F90 000A4EF0 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR21CScriptTargetingPoint" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR21CScriptTargetingPoint": /* 800A7F94 000A4EF4 38 00 00 00 */ li r0, 0 /* 800A7F98 000A4EF8 90 03 00 04 */ stw r0, 4(r3) -/* 800A7F9C 000A4EFC 4E 80 00 20 */ blr +/* 800A7F9C 000A4EFC 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR25CScriptSpiderBallWaypoint" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR25CScriptSpiderBallWaypoint": /* 800A7FA0 000A4F00 38 00 00 00 */ li r0, 0 /* 800A7FA4 000A4F04 90 03 00 04 */ stw r0, 4(r3) -/* 800A7FA8 000A4F08 4E 80 00 20 */ blr +/* 800A7FA8 000A4F08 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR34CScriptSpiderBallAttractionSurface" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR34CScriptSpiderBallAttractionSurface": /* 800A7FAC 000A4F0C 38 00 00 00 */ li r0, 0 /* 800A7FB0 000A4F10 90 03 00 04 */ stw r0, 4(r3) -/* 800A7FB4 000A4F14 4E 80 00 20 */ blr +/* 800A7FB4 000A4F14 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR22CScriptSpecialFunction" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR22CScriptSpecialFunction": /* 800A7FB8 000A4F18 38 00 00 00 */ li r0, 0 /* 800A7FBC 000A4F1C 90 03 00 04 */ stw r0, 4(r3) -/* 800A7FC0 000A4F20 4E 80 00 20 */ blr +/* 800A7FC0 000A4F20 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR17CScriptSpawnPoint" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR17CScriptSpawnPoint": /* 800A7FC4 000A4F24 90 83 00 04 */ stw r4, 4(r3) -/* 800A7FC8 000A4F28 4E 80 00 20 */ blr +/* 800A7FC8 000A4F28 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR12CScriptSound" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR12CScriptSound": /* 800A7FCC 000A4F2C 38 00 00 00 */ li r0, 0 /* 800A7FD0 000A4F30 90 03 00 04 */ stw r0, 4(r3) -/* 800A7FD4 000A4F34 4E 80 00 20 */ blr +/* 800A7FD4 000A4F34 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR20CScriptRoomAcoustics" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR20CScriptRoomAcoustics": /* 800A7FD8 000A4F38 38 00 00 00 */ li r0, 0 /* 800A7FDC 000A4F3C 90 03 00 04 */ stw r0, 4(r3) -/* 800A7FE0 000A4F40 4E 80 00 20 */ blr +/* 800A7FE0 000A4F40 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR22CScriptPointOfinterest" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR22CScriptPointOfinterest": /* 800A7FE4 000A4F44 38 00 00 00 */ li r0, 0 /* 800A7FE8 000A4F48 90 03 00 04 */ stw r0, 4(r3) -/* 800A7FEC 000A4F4C 4E 80 00 20 */ blr +/* 800A7FEC 000A4F4C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR17CScriptPlayerHint" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR17CScriptPlayerHint": /* 800A7FF0 000A4F50 38 00 00 00 */ li r0, 0 /* 800A7FF4 000A4F54 90 03 00 04 */ stw r0, 4(r3) -/* 800A7FF8 000A4F58 4E 80 00 20 */ blr +/* 800A7FF8 000A4F58 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR15CScriptPlatform" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR15CScriptPlatform": /* 800A7FFC 000A4F5C 38 00 00 00 */ li r0, 0 /* 800A8000 000A4F60 90 03 00 04 */ stw r0, 4(r3) -/* 800A8004 000A4F64 4E 80 00 20 */ blr +/* 800A8004 000A4F64 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR13CScriptPickup" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR13CScriptPickup": /* 800A8008 000A4F68 38 00 00 00 */ li r0, 0 /* 800A800C 000A4F6C 90 03 00 04 */ stw r0, 4(r3) -/* 800A8010 000A4F70 4E 80 00 20 */ blr +/* 800A8010 000A4F70 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR15CScriptMazeNode" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR15CScriptMazeNode": /* 800A8014 000A4F74 38 00 00 00 */ li r0, 0 /* 800A8018 000A4F78 90 03 00 04 */ stw r0, 4(r3) -/* 800A801C 000A4F7C 4E 80 00 20 */ blr +/* 800A801C 000A4F7C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR16CScriptGunTurret" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR16CScriptGunTurret": /* 800A8020 000A4F80 38 00 00 00 */ li r0, 0 /* 800A8024 000A4F84 90 03 00 04 */ stw r0, 4(r3) -/* 800A8028 000A4F88 4E 80 00 20 */ blr +/* 800A8028 000A4F88 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR19CScriptGrapplePoint" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR19CScriptGrapplePoint": /* 800A802C 000A4F8C 38 00 00 00 */ li r0, 0 /* 800A8030 000A4F90 90 03 00 04 */ stw r0, 4(r3) -/* 800A8034 000A4F94 4E 80 00 20 */ blr +/* 800A8034 000A4F94 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR13CScriptEffect" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR13CScriptEffect": /* 800A8038 000A4F98 38 00 00 00 */ li r0, 0 /* 800A803C 000A4F9C 90 03 00 04 */ stw r0, 4(r3) -/* 800A8040 000A4FA0 4E 80 00 20 */ blr +/* 800A8040 000A4FA0 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR11CScriptDoor" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR11CScriptDoor": /* 800A8044 000A4FA4 38 00 00 00 */ li r0, 0 /* 800A8048 000A4FA8 90 03 00 04 */ stw r0, 4(r3) -/* 800A804C 000A4FAC 4E 80 00 20 */ blr +/* 800A804C 000A4FAC 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR11CScriptDock" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR11CScriptDock": /* 800A8050 000A4FB0 38 00 00 00 */ li r0, 0 /* 800A8054 000A4FB4 90 03 00 04 */ stw r0, 4(r3) -/* 800A8058 000A4FB8 4E 80 00 20 */ blr +/* 800A8058 000A4FB8 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR18CScriptDistanceFog" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR18CScriptDistanceFog": /* 800A805C 000A4FBC 38 00 00 00 */ li r0, 0 /* 800A8060 000A4FC0 90 03 00 04 */ stw r0, 4(r3) -/* 800A8064 000A4FC4 4E 80 00 20 */ blr +/* 800A8064 000A4FC4 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR26CScriptDebugCameraWaypoint" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR26CScriptDebugCameraWaypoint": /* 800A8068 000A4FC8 38 00 00 00 */ li r0, 0 /* 800A806C 000A4FCC 90 03 00 04 */ stw r0, 4(r3) -/* 800A8070 000A4FD0 4E 80 00 20 */ blr +/* 800A8070 000A4FD0 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR17CScriptCoverPoint" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR17CScriptCoverPoint": /* 800A8074 000A4FD4 38 00 00 00 */ li r0, 0 /* 800A8078 000A4FD8 90 03 00 04 */ stw r0, 4(r3) -/* 800A807C 000A4FDC 4E 80 00 20 */ blr +/* 800A807C 000A4FDC 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR21CScriptCameraWaypoint" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR21CScriptCameraWaypoint": /* 800A8080 000A4FE0 38 00 00 00 */ li r0, 0 /* 800A8084 000A4FE4 90 03 00 04 */ stw r0, 4(r3) -/* 800A8088 000A4FE8 4E 80 00 20 */ blr +/* 800A8088 000A4FE8 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR24CScriptCameraPitchVolume" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR24CScriptCameraPitchVolume": /* 800A808C 000A4FEC 38 00 00 00 */ li r0, 0 /* 800A8090 000A4FF0 90 03 00 04 */ stw r0, 4(r3) -/* 800A8094 000A4FF4 4E 80 00 20 */ blr +/* 800A8094 000A4FF4 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR17CScriptCameraHint" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR17CScriptCameraHint": /* 800A8098 000A4FF8 38 00 00 00 */ li r0, 0 /* 800A809C 000A4FFC 90 03 00 04 */ stw r0, 4(r3) -/* 800A80A0 000A5000 4E 80 00 20 */ blr +/* 800A80A0 000A5000 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR18CScriptAiJumpPoint" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR18CScriptAiJumpPoint": /* 800A80A4 000A5004 38 00 00 00 */ li r0, 0 /* 800A80A8 000A5008 90 03 00 04 */ stw r0, 4(r3) -/* 800A80AC 000A500C 4E 80 00 20 */ blr +/* 800A80AC 000A500C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR20CScriptActorKeyframe" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR20CScriptActorKeyframe": /* 800A80B0 000A5010 38 00 00 00 */ li r0, 0 /* 800A80B4 000A5014 90 03 00 04 */ stw r0, 4(r3) -/* 800A80B8 000A5018 4E 80 00 20 */ blr +/* 800A80B8 000A5018 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR12CScriptActor" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR12CScriptActor": /* 800A80BC 000A501C 38 00 00 00 */ li r0, 0 /* 800A80C0 000A5020 90 03 00 04 */ stw r0, 4(r3) -/* 800A80C4 000A5024 4E 80 00 20 */ blr +/* 800A80C4 000A5024 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR9CRepulsor" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR9CRepulsor": /* 800A80C8 000A5028 38 00 00 00 */ li r0, 0 /* 800A80CC 000A502C 90 03 00 04 */ stw r0, 4(r3) -/* 800A80D0 000A5030 4E 80 00 20 */ blr +/* 800A80D0 000A5030 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR7CPlayer" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR7CPlayer": /* 800A80D4 000A5034 38 00 00 00 */ li r0, 0 /* 800A80D8 000A5038 90 03 00 04 */ stw r0, 4(r3) -/* 800A80DC 000A503C 4E 80 00 20 */ blr +/* 800A80DC 000A503C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR13CPhysicsActor" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR13CPhysicsActor": /* 800A80E0 000A5040 38 00 00 00 */ li r0, 0 /* 800A80E4 000A5044 90 03 00 04 */ stw r0, 4(r3) -/* 800A80E8 000A5048 4E 80 00 20 */ blr +/* 800A80E8 000A5048 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR3CAi" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR3CAi": /* 800A80EC 000A504C 38 00 00 00 */ li r0, 0 /* 800A80F0 000A5050 90 03 00 04 */ stw r0, 4(r3) -/* 800A80F4 000A5054 4E 80 00 20 */ blr +/* 800A80F4 000A5054 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR11CPathCamera" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR11CPathCamera": /* 800A80F8 000A5058 38 00 00 00 */ li r0, 0 /* 800A80FC 000A505C 90 03 00 04 */ stw r0, 4(r3) -/* 800A8100 000A5060 4E 80 00 20 */ blr +/* 800A8100 000A5060 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR18CMetroidPrimeRelay" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR18CMetroidPrimeRelay": /* 800A8104 000A5064 38 00 00 00 */ li r0, 0 /* 800A8108 000A5068 90 03 00 04 */ stw r0, 4(r3) -/* 800A810C 000A506C 4E 80 00 20 */ blr +/* 800A810C 000A506C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR19CHUDBillboardEffect" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR19CHUDBillboardEffect": /* 800A8110 000A5070 38 00 00 00 */ li r0, 0 /* 800A8114 000A5074 90 03 00 04 */ stw r0, 4(r3) -/* 800A8118 000A5078 4E 80 00 20 */ blr +/* 800A8118 000A5078 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR15CGameProjectile" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR15CGameProjectile": /* 800A811C 000A507C 38 00 00 00 */ li r0, 0 /* 800A8120 000A5080 90 03 00 04 */ stw r0, 4(r3) -/* 800A8124 000A5084 4E 80 00 20 */ blr +/* 800A8124 000A5084 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR10CGameLight" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR10CGameLight": /* 800A8128 000A5088 38 00 00 00 */ li r0, 0 /* 800A812C 000A508C 90 03 00 04 */ stw r0, 4(r3) -/* 800A8130 000A5090 4E 80 00 20 */ blr +/* 800A8130 000A5090 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR11CGameCamera" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR11CGameCamera": /* 800A8134 000A5094 38 00 00 00 */ li r0, 0 /* 800A8138 000A5098 90 03 00 04 */ stw r0, 4(r3) -/* 800A813C 000A509C 4E 80 00 20 */ blr +/* 800A813C 000A509C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR10CFishCloud" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR10CFishCloud": /* 800A8140 000A50A0 38 00 00 00 */ li r0, 0 /* 800A8144 000A50A4 90 03 00 04 */ stw r0, 4(r3) -/* 800A8148 000A50A8 4E 80 00 20 */ blr +/* 800A8148 000A50A8 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR18CFirstPersonCamera" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR18CFirstPersonCamera": /* 800A814C 000A50AC 38 00 00 00 */ li r0, 0 /* 800A8150 000A50B0 90 03 00 04 */ stw r0, 4(r3) -/* 800A8154 000A50B4 4E 80 00 20 */ blr +/* 800A8154 000A50B4 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR10CExplosion" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR10CExplosion": /* 800A8158 000A50B8 38 00 00 00 */ li r0, 0 /* 800A815C 000A50BC 90 03 00 04 */ stw r0, 4(r3) -/* 800A8160 000A50C0 4E 80 00 20 */ blr +/* 800A8160 000A50C0 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR7CEntity" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR7CEntity": /* 800A8164 000A50C4 38 00 00 00 */ li r0, 0 /* 800A8168 000A50C8 90 03 00 04 */ stw r0, 4(r3) -/* 800A816C 000A50CC 4E 80 00 20 */ blr +/* 800A816C 000A50CC 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR17CEnergyProjectile" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR17CEnergyProjectile": /* 800A8170 000A50D0 38 00 00 00 */ li r0, 0 /* 800A8174 000A50D4 90 03 00 04 */ stw r0, 4(r3) -/* 800A8178 000A50D8 4E 80 00 20 */ blr +/* 800A8178 000A50D8 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR16CDestroyableRock" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR16CDestroyableRock": /* 800A817C 000A50DC 38 00 00 00 */ li r0, 0 /* 800A8180 000A50E0 90 03 00 04 */ stw r0, 4(r3) -/* 800A8184 000A50E4 4E 80 00 20 */ blr +/* 800A8184 000A50E4 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR15CCollisionActor" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR15CCollisionActor": /* 800A8188 000A50E8 38 00 00 00 */ li r0, 0 /* 800A818C 000A50EC 90 03 00 04 */ stw r0, 4(r3) -/* 800A8190 000A50F0 4E 80 00 20 */ blr +/* 800A8190 000A50F0 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR16CCinematicCamera" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR16CCinematicCamera": /* 800A8194 000A50F4 38 00 00 00 */ li r0, 0 /* 800A8198 000A50F8 90 03 00 04 */ stw r0, 4(r3) -/* 800A819C 000A50FC 4E 80 00 20 */ blr +/* 800A819C 000A50FC 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR5CBomb" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR5CBomb": /* 800A81A0 000A5100 38 00 00 00 */ li r0, 0 /* 800A81A4 000A5104 90 03 00 04 */ stw r0, 4(r3) -/* 800A81A8 000A5108 4E 80 00 20 */ blr +/* 800A81A8 000A5108 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR11CBallCamera" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR11CBallCamera": /* 800A81AC 000A510C 38 00 00 00 */ li r0, 0 /* 800A81B0 000A5110 90 03 00 04 */ stw r0, 4(r3) -/* 800A81B4 000A5114 4E 80 00 20 */ blr +/* 800A81B4 000A5114 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptSpawnPoint>FR6CActor" "Visit__31TCastToPtr<17CScriptSpawnPoint>FR6CActor": /* 800A81B8 000A5118 38 00 00 00 */ li r0, 0 /* 800A81BC 000A511C 90 03 00 04 */ stw r0, 4(r3) -/* 800A81C0 000A5120 4E 80 00 20 */ blr +/* 800A81C0 000A5120 4E 80 00 20 */ blr .global "__ct__31TCastToPtr<17CScriptSpawnPoint>FP7CEntity" "__ct__31TCastToPtr<17CScriptSpawnPoint>FP7CEntity": @@ -8685,355 +8685,355 @@ lbl_800A7F04: /* 800A8208 000A5168 81 83 00 00 */ lwz r12, 0(r3) /* 800A820C 000A516C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800A8210 000A5170 7D 89 03 A6 */ mtctr r12 -/* 800A8214 000A5174 4E 80 04 21 */ bctrl +/* 800A8214 000A5174 4E 80 04 21 */ bctrl lbl_800A8218: /* 800A8218 000A5178 80 01 00 14 */ lwz r0, 0x14(r1) /* 800A821C 000A517C 7F E3 FB 78 */ mr r3, r31 /* 800A8220 000A5180 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800A8224 000A5184 7C 08 03 A6 */ mtlr r0 /* 800A8228 000A5188 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A822C 000A518C 4E 80 00 20 */ blr +/* 800A822C 000A518C 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR7CWeapon" "Visit__26TCastToPtr<12CScriptSound>FR7CWeapon": /* 800A8230 000A5190 38 00 00 00 */ li r0, 0 /* 800A8234 000A5194 90 03 00 04 */ stw r0, 4(r3) -/* 800A8238 000A5198 4E 80 00 20 */ blr +/* 800A8238 000A5198 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR17CWallCrawlerSwarm" "Visit__26TCastToPtr<12CScriptSound>FR17CWallCrawlerSwarm": /* 800A823C 000A519C 38 00 00 00 */ li r0, 0 /* 800A8240 000A51A0 90 03 00 04 */ stw r0, 4(r3) -/* 800A8244 000A51A4 4E 80 00 20 */ blr +/* 800A8244 000A51A4 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR20CScriptSpindleCamera" "Visit__26TCastToPtr<12CScriptSound>FR20CScriptSpindleCamera": /* 800A8248 000A51A8 38 00 00 00 */ li r0, 0 /* 800A824C 000A51AC 90 03 00 04 */ stw r0, 4(r3) -/* 800A8250 000A51B0 4E 80 00 20 */ blr +/* 800A8250 000A51B0 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR15CSnakeWeedSwarm" "Visit__26TCastToPtr<12CScriptSound>FR15CSnakeWeedSwarm": /* 800A8254 000A51B4 38 00 00 00 */ li r0, 0 /* 800A8258 000A51B8 90 03 00 04 */ stw r0, 4(r3) -/* 800A825C 000A51BC 4E 80 00 20 */ blr +/* 800A825C 000A51BC 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR15CScriptWaypoint" "Visit__26TCastToPtr<12CScriptSound>FR15CScriptWaypoint": /* 800A8260 000A51C0 38 00 00 00 */ li r0, 0 /* 800A8264 000A51C4 90 03 00 04 */ stw r0, 4(r3) -/* 800A8268 000A51C8 4E 80 00 20 */ blr +/* 800A8268 000A51C8 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR12CScriptWater" "Visit__26TCastToPtr<12CScriptSound>FR12CScriptWater": /* 800A826C 000A51CC 38 00 00 00 */ li r0, 0 /* 800A8270 000A51D0 90 03 00 04 */ stw r0, 4(r3) -/* 800A8274 000A51D4 4E 80 00 20 */ blr +/* 800A8274 000A51D4 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR17CScriptVisorFlare" "Visit__26TCastToPtr<12CScriptSound>FR17CScriptVisorFlare": /* 800A8278 000A51D8 38 00 00 00 */ li r0, 0 /* 800A827C 000A51DC 90 03 00 04 */ stw r0, 4(r3) -/* 800A8280 000A51E0 4E 80 00 20 */ blr +/* 800A8280 000A51E0 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR14CScriptTrigger" "Visit__26TCastToPtr<12CScriptSound>FR14CScriptTrigger": /* 800A8284 000A51E4 38 00 00 00 */ li r0, 0 /* 800A8288 000A51E8 90 03 00 04 */ stw r0, 4(r3) -/* 800A828C 000A51EC 4E 80 00 20 */ blr +/* 800A828C 000A51EC 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR12CScriptTimer" "Visit__26TCastToPtr<12CScriptSound>FR12CScriptTimer": /* 800A8290 000A51F0 38 00 00 00 */ li r0, 0 /* 800A8294 000A51F4 90 03 00 04 */ stw r0, 4(r3) -/* 800A8298 000A51F8 4E 80 00 20 */ blr +/* 800A8298 000A51F8 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR10CTeamAiMgr" "Visit__26TCastToPtr<12CScriptSound>FR10CTeamAiMgr": /* 800A829C 000A51FC 38 00 00 00 */ li r0, 0 /* 800A82A0 000A5200 90 03 00 04 */ stw r0, 4(r3) -/* 800A82A4 000A5204 4E 80 00 20 */ blr +/* 800A82A4 000A5204 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR21CScriptTargetingPoint" "Visit__26TCastToPtr<12CScriptSound>FR21CScriptTargetingPoint": /* 800A82A8 000A5208 38 00 00 00 */ li r0, 0 /* 800A82AC 000A520C 90 03 00 04 */ stw r0, 4(r3) -/* 800A82B0 000A5210 4E 80 00 20 */ blr +/* 800A82B0 000A5210 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR25CScriptSpiderBallWaypoint" "Visit__26TCastToPtr<12CScriptSound>FR25CScriptSpiderBallWaypoint": /* 800A82B4 000A5214 38 00 00 00 */ li r0, 0 /* 800A82B8 000A5218 90 03 00 04 */ stw r0, 4(r3) -/* 800A82BC 000A521C 4E 80 00 20 */ blr +/* 800A82BC 000A521C 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR34CScriptSpiderBallAttractionSurface" "Visit__26TCastToPtr<12CScriptSound>FR34CScriptSpiderBallAttractionSurface": /* 800A82C0 000A5220 38 00 00 00 */ li r0, 0 /* 800A82C4 000A5224 90 03 00 04 */ stw r0, 4(r3) -/* 800A82C8 000A5228 4E 80 00 20 */ blr +/* 800A82C8 000A5228 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR22CScriptSpecialFunction" "Visit__26TCastToPtr<12CScriptSound>FR22CScriptSpecialFunction": /* 800A82CC 000A522C 38 00 00 00 */ li r0, 0 /* 800A82D0 000A5230 90 03 00 04 */ stw r0, 4(r3) -/* 800A82D4 000A5234 4E 80 00 20 */ blr +/* 800A82D4 000A5234 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR17CScriptSpawnPoint" "Visit__26TCastToPtr<12CScriptSound>FR17CScriptSpawnPoint": /* 800A82D8 000A5238 38 00 00 00 */ li r0, 0 /* 800A82DC 000A523C 90 03 00 04 */ stw r0, 4(r3) -/* 800A82E0 000A5240 4E 80 00 20 */ blr +/* 800A82E0 000A5240 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR12CScriptSound" "Visit__26TCastToPtr<12CScriptSound>FR12CScriptSound": /* 800A82E4 000A5244 90 83 00 04 */ stw r4, 4(r3) -/* 800A82E8 000A5248 4E 80 00 20 */ blr +/* 800A82E8 000A5248 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR20CScriptRoomAcoustics" "Visit__26TCastToPtr<12CScriptSound>FR20CScriptRoomAcoustics": /* 800A82EC 000A524C 38 00 00 00 */ li r0, 0 /* 800A82F0 000A5250 90 03 00 04 */ stw r0, 4(r3) -/* 800A82F4 000A5254 4E 80 00 20 */ blr +/* 800A82F4 000A5254 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR22CScriptPointOfinterest" "Visit__26TCastToPtr<12CScriptSound>FR22CScriptPointOfinterest": /* 800A82F8 000A5258 38 00 00 00 */ li r0, 0 /* 800A82FC 000A525C 90 03 00 04 */ stw r0, 4(r3) -/* 800A8300 000A5260 4E 80 00 20 */ blr +/* 800A8300 000A5260 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR17CScriptPlayerHint" "Visit__26TCastToPtr<12CScriptSound>FR17CScriptPlayerHint": /* 800A8304 000A5264 38 00 00 00 */ li r0, 0 /* 800A8308 000A5268 90 03 00 04 */ stw r0, 4(r3) -/* 800A830C 000A526C 4E 80 00 20 */ blr +/* 800A830C 000A526C 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR15CScriptPlatform" "Visit__26TCastToPtr<12CScriptSound>FR15CScriptPlatform": /* 800A8310 000A5270 38 00 00 00 */ li r0, 0 /* 800A8314 000A5274 90 03 00 04 */ stw r0, 4(r3) -/* 800A8318 000A5278 4E 80 00 20 */ blr +/* 800A8318 000A5278 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR13CScriptPickup" "Visit__26TCastToPtr<12CScriptSound>FR13CScriptPickup": /* 800A831C 000A527C 38 00 00 00 */ li r0, 0 /* 800A8320 000A5280 90 03 00 04 */ stw r0, 4(r3) -/* 800A8324 000A5284 4E 80 00 20 */ blr +/* 800A8324 000A5284 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR15CScriptMazeNode" "Visit__26TCastToPtr<12CScriptSound>FR15CScriptMazeNode": /* 800A8328 000A5288 38 00 00 00 */ li r0, 0 /* 800A832C 000A528C 90 03 00 04 */ stw r0, 4(r3) -/* 800A8330 000A5290 4E 80 00 20 */ blr +/* 800A8330 000A5290 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR16CScriptGunTurret" "Visit__26TCastToPtr<12CScriptSound>FR16CScriptGunTurret": /* 800A8334 000A5294 38 00 00 00 */ li r0, 0 /* 800A8338 000A5298 90 03 00 04 */ stw r0, 4(r3) -/* 800A833C 000A529C 4E 80 00 20 */ blr +/* 800A833C 000A529C 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR19CScriptGrapplePoint" "Visit__26TCastToPtr<12CScriptSound>FR19CScriptGrapplePoint": /* 800A8340 000A52A0 38 00 00 00 */ li r0, 0 /* 800A8344 000A52A4 90 03 00 04 */ stw r0, 4(r3) -/* 800A8348 000A52A8 4E 80 00 20 */ blr +/* 800A8348 000A52A8 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR13CScriptEffect" "Visit__26TCastToPtr<12CScriptSound>FR13CScriptEffect": /* 800A834C 000A52AC 38 00 00 00 */ li r0, 0 /* 800A8350 000A52B0 90 03 00 04 */ stw r0, 4(r3) -/* 800A8354 000A52B4 4E 80 00 20 */ blr +/* 800A8354 000A52B4 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR11CScriptDoor" "Visit__26TCastToPtr<12CScriptSound>FR11CScriptDoor": /* 800A8358 000A52B8 38 00 00 00 */ li r0, 0 /* 800A835C 000A52BC 90 03 00 04 */ stw r0, 4(r3) -/* 800A8360 000A52C0 4E 80 00 20 */ blr +/* 800A8360 000A52C0 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR11CScriptDock" "Visit__26TCastToPtr<12CScriptSound>FR11CScriptDock": /* 800A8364 000A52C4 38 00 00 00 */ li r0, 0 /* 800A8368 000A52C8 90 03 00 04 */ stw r0, 4(r3) -/* 800A836C 000A52CC 4E 80 00 20 */ blr +/* 800A836C 000A52CC 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR18CScriptDistanceFog" "Visit__26TCastToPtr<12CScriptSound>FR18CScriptDistanceFog": /* 800A8370 000A52D0 38 00 00 00 */ li r0, 0 /* 800A8374 000A52D4 90 03 00 04 */ stw r0, 4(r3) -/* 800A8378 000A52D8 4E 80 00 20 */ blr +/* 800A8378 000A52D8 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR26CScriptDebugCameraWaypoint" "Visit__26TCastToPtr<12CScriptSound>FR26CScriptDebugCameraWaypoint": /* 800A837C 000A52DC 38 00 00 00 */ li r0, 0 /* 800A8380 000A52E0 90 03 00 04 */ stw r0, 4(r3) -/* 800A8384 000A52E4 4E 80 00 20 */ blr +/* 800A8384 000A52E4 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR17CScriptCoverPoint" "Visit__26TCastToPtr<12CScriptSound>FR17CScriptCoverPoint": /* 800A8388 000A52E8 38 00 00 00 */ li r0, 0 /* 800A838C 000A52EC 90 03 00 04 */ stw r0, 4(r3) -/* 800A8390 000A52F0 4E 80 00 20 */ blr +/* 800A8390 000A52F0 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR21CScriptCameraWaypoint" "Visit__26TCastToPtr<12CScriptSound>FR21CScriptCameraWaypoint": /* 800A8394 000A52F4 38 00 00 00 */ li r0, 0 /* 800A8398 000A52F8 90 03 00 04 */ stw r0, 4(r3) -/* 800A839C 000A52FC 4E 80 00 20 */ blr +/* 800A839C 000A52FC 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR24CScriptCameraPitchVolume" "Visit__26TCastToPtr<12CScriptSound>FR24CScriptCameraPitchVolume": /* 800A83A0 000A5300 38 00 00 00 */ li r0, 0 /* 800A83A4 000A5304 90 03 00 04 */ stw r0, 4(r3) -/* 800A83A8 000A5308 4E 80 00 20 */ blr +/* 800A83A8 000A5308 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR17CScriptCameraHint" "Visit__26TCastToPtr<12CScriptSound>FR17CScriptCameraHint": /* 800A83AC 000A530C 38 00 00 00 */ li r0, 0 /* 800A83B0 000A5310 90 03 00 04 */ stw r0, 4(r3) -/* 800A83B4 000A5314 4E 80 00 20 */ blr +/* 800A83B4 000A5314 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR18CScriptAiJumpPoint" "Visit__26TCastToPtr<12CScriptSound>FR18CScriptAiJumpPoint": /* 800A83B8 000A5318 38 00 00 00 */ li r0, 0 /* 800A83BC 000A531C 90 03 00 04 */ stw r0, 4(r3) -/* 800A83C0 000A5320 4E 80 00 20 */ blr +/* 800A83C0 000A5320 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR20CScriptActorKeyframe" "Visit__26TCastToPtr<12CScriptSound>FR20CScriptActorKeyframe": /* 800A83C4 000A5324 38 00 00 00 */ li r0, 0 /* 800A83C8 000A5328 90 03 00 04 */ stw r0, 4(r3) -/* 800A83CC 000A532C 4E 80 00 20 */ blr +/* 800A83CC 000A532C 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR12CScriptActor" "Visit__26TCastToPtr<12CScriptSound>FR12CScriptActor": /* 800A83D0 000A5330 38 00 00 00 */ li r0, 0 /* 800A83D4 000A5334 90 03 00 04 */ stw r0, 4(r3) -/* 800A83D8 000A5338 4E 80 00 20 */ blr +/* 800A83D8 000A5338 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR9CRepulsor" "Visit__26TCastToPtr<12CScriptSound>FR9CRepulsor": /* 800A83DC 000A533C 38 00 00 00 */ li r0, 0 /* 800A83E0 000A5340 90 03 00 04 */ stw r0, 4(r3) -/* 800A83E4 000A5344 4E 80 00 20 */ blr +/* 800A83E4 000A5344 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR7CPlayer" "Visit__26TCastToPtr<12CScriptSound>FR7CPlayer": /* 800A83E8 000A5348 38 00 00 00 */ li r0, 0 /* 800A83EC 000A534C 90 03 00 04 */ stw r0, 4(r3) -/* 800A83F0 000A5350 4E 80 00 20 */ blr +/* 800A83F0 000A5350 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR13CPhysicsActor" "Visit__26TCastToPtr<12CScriptSound>FR13CPhysicsActor": /* 800A83F4 000A5354 38 00 00 00 */ li r0, 0 /* 800A83F8 000A5358 90 03 00 04 */ stw r0, 4(r3) -/* 800A83FC 000A535C 4E 80 00 20 */ blr +/* 800A83FC 000A535C 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR3CAi" "Visit__26TCastToPtr<12CScriptSound>FR3CAi": /* 800A8400 000A5360 38 00 00 00 */ li r0, 0 /* 800A8404 000A5364 90 03 00 04 */ stw r0, 4(r3) -/* 800A8408 000A5368 4E 80 00 20 */ blr +/* 800A8408 000A5368 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR11CPathCamera" "Visit__26TCastToPtr<12CScriptSound>FR11CPathCamera": /* 800A840C 000A536C 38 00 00 00 */ li r0, 0 /* 800A8410 000A5370 90 03 00 04 */ stw r0, 4(r3) -/* 800A8414 000A5374 4E 80 00 20 */ blr +/* 800A8414 000A5374 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR18CMetroidPrimeRelay" "Visit__26TCastToPtr<12CScriptSound>FR18CMetroidPrimeRelay": /* 800A8418 000A5378 38 00 00 00 */ li r0, 0 /* 800A841C 000A537C 90 03 00 04 */ stw r0, 4(r3) -/* 800A8420 000A5380 4E 80 00 20 */ blr +/* 800A8420 000A5380 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR19CHUDBillboardEffect" "Visit__26TCastToPtr<12CScriptSound>FR19CHUDBillboardEffect": /* 800A8424 000A5384 38 00 00 00 */ li r0, 0 /* 800A8428 000A5388 90 03 00 04 */ stw r0, 4(r3) -/* 800A842C 000A538C 4E 80 00 20 */ blr +/* 800A842C 000A538C 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR15CGameProjectile" "Visit__26TCastToPtr<12CScriptSound>FR15CGameProjectile": /* 800A8430 000A5390 38 00 00 00 */ li r0, 0 /* 800A8434 000A5394 90 03 00 04 */ stw r0, 4(r3) -/* 800A8438 000A5398 4E 80 00 20 */ blr +/* 800A8438 000A5398 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR10CGameLight" "Visit__26TCastToPtr<12CScriptSound>FR10CGameLight": /* 800A843C 000A539C 38 00 00 00 */ li r0, 0 /* 800A8440 000A53A0 90 03 00 04 */ stw r0, 4(r3) -/* 800A8444 000A53A4 4E 80 00 20 */ blr +/* 800A8444 000A53A4 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR11CGameCamera" "Visit__26TCastToPtr<12CScriptSound>FR11CGameCamera": /* 800A8448 000A53A8 38 00 00 00 */ li r0, 0 /* 800A844C 000A53AC 90 03 00 04 */ stw r0, 4(r3) -/* 800A8450 000A53B0 4E 80 00 20 */ blr +/* 800A8450 000A53B0 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR10CFishCloud" "Visit__26TCastToPtr<12CScriptSound>FR10CFishCloud": /* 800A8454 000A53B4 38 00 00 00 */ li r0, 0 /* 800A8458 000A53B8 90 03 00 04 */ stw r0, 4(r3) -/* 800A845C 000A53BC 4E 80 00 20 */ blr +/* 800A845C 000A53BC 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR18CFirstPersonCamera" "Visit__26TCastToPtr<12CScriptSound>FR18CFirstPersonCamera": /* 800A8460 000A53C0 38 00 00 00 */ li r0, 0 /* 800A8464 000A53C4 90 03 00 04 */ stw r0, 4(r3) -/* 800A8468 000A53C8 4E 80 00 20 */ blr +/* 800A8468 000A53C8 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR10CExplosion" "Visit__26TCastToPtr<12CScriptSound>FR10CExplosion": /* 800A846C 000A53CC 38 00 00 00 */ li r0, 0 /* 800A8470 000A53D0 90 03 00 04 */ stw r0, 4(r3) -/* 800A8474 000A53D4 4E 80 00 20 */ blr +/* 800A8474 000A53D4 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR7CEntity" "Visit__26TCastToPtr<12CScriptSound>FR7CEntity": /* 800A8478 000A53D8 38 00 00 00 */ li r0, 0 /* 800A847C 000A53DC 90 03 00 04 */ stw r0, 4(r3) -/* 800A8480 000A53E0 4E 80 00 20 */ blr +/* 800A8480 000A53E0 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR17CEnergyProjectile" "Visit__26TCastToPtr<12CScriptSound>FR17CEnergyProjectile": /* 800A8484 000A53E4 38 00 00 00 */ li r0, 0 /* 800A8488 000A53E8 90 03 00 04 */ stw r0, 4(r3) -/* 800A848C 000A53EC 4E 80 00 20 */ blr +/* 800A848C 000A53EC 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR16CDestroyableRock" "Visit__26TCastToPtr<12CScriptSound>FR16CDestroyableRock": /* 800A8490 000A53F0 38 00 00 00 */ li r0, 0 /* 800A8494 000A53F4 90 03 00 04 */ stw r0, 4(r3) -/* 800A8498 000A53F8 4E 80 00 20 */ blr +/* 800A8498 000A53F8 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR15CCollisionActor" "Visit__26TCastToPtr<12CScriptSound>FR15CCollisionActor": /* 800A849C 000A53FC 38 00 00 00 */ li r0, 0 /* 800A84A0 000A5400 90 03 00 04 */ stw r0, 4(r3) -/* 800A84A4 000A5404 4E 80 00 20 */ blr +/* 800A84A4 000A5404 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR16CCinematicCamera" "Visit__26TCastToPtr<12CScriptSound>FR16CCinematicCamera": /* 800A84A8 000A5408 38 00 00 00 */ li r0, 0 /* 800A84AC 000A540C 90 03 00 04 */ stw r0, 4(r3) -/* 800A84B0 000A5410 4E 80 00 20 */ blr +/* 800A84B0 000A5410 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR5CBomb" "Visit__26TCastToPtr<12CScriptSound>FR5CBomb": /* 800A84B4 000A5414 38 00 00 00 */ li r0, 0 /* 800A84B8 000A5418 90 03 00 04 */ stw r0, 4(r3) -/* 800A84BC 000A541C 4E 80 00 20 */ blr +/* 800A84BC 000A541C 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR11CBallCamera" "Visit__26TCastToPtr<12CScriptSound>FR11CBallCamera": /* 800A84C0 000A5420 38 00 00 00 */ li r0, 0 /* 800A84C4 000A5424 90 03 00 04 */ stw r0, 4(r3) -/* 800A84C8 000A5428 4E 80 00 20 */ blr +/* 800A84C8 000A5428 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptSound>FR6CActor" "Visit__26TCastToPtr<12CScriptSound>FR6CActor": /* 800A84CC 000A542C 38 00 00 00 */ li r0, 0 /* 800A84D0 000A5430 90 03 00 04 */ stw r0, 4(r3) -/* 800A84D4 000A5434 4E 80 00 20 */ blr +/* 800A84D4 000A5434 4E 80 00 20 */ blr .global "__ct__26TCastToPtr<12CScriptSound>FP7CEntity" "__ct__26TCastToPtr<12CScriptSound>FP7CEntity": @@ -9057,355 +9057,355 @@ lbl_800A8218: /* 800A851C 000A547C 81 83 00 00 */ lwz r12, 0(r3) /* 800A8520 000A5480 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800A8524 000A5484 7D 89 03 A6 */ mtctr r12 -/* 800A8528 000A5488 4E 80 04 21 */ bctrl +/* 800A8528 000A5488 4E 80 04 21 */ bctrl lbl_800A852C: /* 800A852C 000A548C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800A8530 000A5490 7F E3 FB 78 */ mr r3, r31 /* 800A8534 000A5494 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800A8538 000A5498 7C 08 03 A6 */ mtlr r0 /* 800A853C 000A549C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A8540 000A54A0 4E 80 00 20 */ blr +/* 800A8540 000A54A0 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR7CWeapon" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR7CWeapon": /* 800A8544 000A54A4 38 00 00 00 */ li r0, 0 /* 800A8548 000A54A8 90 03 00 04 */ stw r0, 4(r3) -/* 800A854C 000A54AC 4E 80 00 20 */ blr +/* 800A854C 000A54AC 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR17CWallCrawlerSwarm" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR17CWallCrawlerSwarm": /* 800A8550 000A54B0 38 00 00 00 */ li r0, 0 /* 800A8554 000A54B4 90 03 00 04 */ stw r0, 4(r3) -/* 800A8558 000A54B8 4E 80 00 20 */ blr +/* 800A8558 000A54B8 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR20CScriptSpindleCamera" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR20CScriptSpindleCamera": /* 800A855C 000A54BC 38 00 00 00 */ li r0, 0 /* 800A8560 000A54C0 90 03 00 04 */ stw r0, 4(r3) -/* 800A8564 000A54C4 4E 80 00 20 */ blr +/* 800A8564 000A54C4 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR15CSnakeWeedSwarm" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR15CSnakeWeedSwarm": /* 800A8568 000A54C8 38 00 00 00 */ li r0, 0 /* 800A856C 000A54CC 90 03 00 04 */ stw r0, 4(r3) -/* 800A8570 000A54D0 4E 80 00 20 */ blr +/* 800A8570 000A54D0 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR15CScriptWaypoint" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR15CScriptWaypoint": /* 800A8574 000A54D4 38 00 00 00 */ li r0, 0 /* 800A8578 000A54D8 90 03 00 04 */ stw r0, 4(r3) -/* 800A857C 000A54DC 4E 80 00 20 */ blr +/* 800A857C 000A54DC 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR12CScriptWater" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR12CScriptWater": /* 800A8580 000A54E0 38 00 00 00 */ li r0, 0 /* 800A8584 000A54E4 90 03 00 04 */ stw r0, 4(r3) -/* 800A8588 000A54E8 4E 80 00 20 */ blr +/* 800A8588 000A54E8 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR17CScriptVisorFlare" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR17CScriptVisorFlare": /* 800A858C 000A54EC 38 00 00 00 */ li r0, 0 /* 800A8590 000A54F0 90 03 00 04 */ stw r0, 4(r3) -/* 800A8594 000A54F4 4E 80 00 20 */ blr +/* 800A8594 000A54F4 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR14CScriptTrigger" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR14CScriptTrigger": /* 800A8598 000A54F8 38 00 00 00 */ li r0, 0 /* 800A859C 000A54FC 90 03 00 04 */ stw r0, 4(r3) -/* 800A85A0 000A5500 4E 80 00 20 */ blr +/* 800A85A0 000A5500 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR12CScriptTimer" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR12CScriptTimer": /* 800A85A4 000A5504 38 00 00 00 */ li r0, 0 /* 800A85A8 000A5508 90 03 00 04 */ stw r0, 4(r3) -/* 800A85AC 000A550C 4E 80 00 20 */ blr +/* 800A85AC 000A550C 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR10CTeamAiMgr" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR10CTeamAiMgr": /* 800A85B0 000A5510 38 00 00 00 */ li r0, 0 /* 800A85B4 000A5514 90 03 00 04 */ stw r0, 4(r3) -/* 800A85B8 000A5518 4E 80 00 20 */ blr +/* 800A85B8 000A5518 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR21CScriptTargetingPoint" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR21CScriptTargetingPoint": /* 800A85BC 000A551C 38 00 00 00 */ li r0, 0 /* 800A85C0 000A5520 90 03 00 04 */ stw r0, 4(r3) -/* 800A85C4 000A5524 4E 80 00 20 */ blr +/* 800A85C4 000A5524 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR25CScriptSpiderBallWaypoint" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR25CScriptSpiderBallWaypoint": /* 800A85C8 000A5528 38 00 00 00 */ li r0, 0 /* 800A85CC 000A552C 90 03 00 04 */ stw r0, 4(r3) -/* 800A85D0 000A5530 4E 80 00 20 */ blr +/* 800A85D0 000A5530 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR34CScriptSpiderBallAttractionSurface" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR34CScriptSpiderBallAttractionSurface": /* 800A85D4 000A5534 38 00 00 00 */ li r0, 0 /* 800A85D8 000A5538 90 03 00 04 */ stw r0, 4(r3) -/* 800A85DC 000A553C 4E 80 00 20 */ blr +/* 800A85DC 000A553C 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR22CScriptSpecialFunction" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR22CScriptSpecialFunction": /* 800A85E0 000A5540 38 00 00 00 */ li r0, 0 /* 800A85E4 000A5544 90 03 00 04 */ stw r0, 4(r3) -/* 800A85E8 000A5548 4E 80 00 20 */ blr +/* 800A85E8 000A5548 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR17CScriptSpawnPoint" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR17CScriptSpawnPoint": /* 800A85EC 000A554C 38 00 00 00 */ li r0, 0 /* 800A85F0 000A5550 90 03 00 04 */ stw r0, 4(r3) -/* 800A85F4 000A5554 4E 80 00 20 */ blr +/* 800A85F4 000A5554 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR12CScriptSound" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR12CScriptSound": /* 800A85F8 000A5558 38 00 00 00 */ li r0, 0 /* 800A85FC 000A555C 90 03 00 04 */ stw r0, 4(r3) -/* 800A8600 000A5560 4E 80 00 20 */ blr +/* 800A8600 000A5560 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR20CScriptRoomAcoustics" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR20CScriptRoomAcoustics": /* 800A8604 000A5564 90 83 00 04 */ stw r4, 4(r3) -/* 800A8608 000A5568 4E 80 00 20 */ blr +/* 800A8608 000A5568 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR22CScriptPointOfinterest" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR22CScriptPointOfinterest": /* 800A860C 000A556C 38 00 00 00 */ li r0, 0 /* 800A8610 000A5570 90 03 00 04 */ stw r0, 4(r3) -/* 800A8614 000A5574 4E 80 00 20 */ blr +/* 800A8614 000A5574 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR17CScriptPlayerHint" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR17CScriptPlayerHint": /* 800A8618 000A5578 38 00 00 00 */ li r0, 0 /* 800A861C 000A557C 90 03 00 04 */ stw r0, 4(r3) -/* 800A8620 000A5580 4E 80 00 20 */ blr +/* 800A8620 000A5580 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR15CScriptPlatform" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR15CScriptPlatform": /* 800A8624 000A5584 38 00 00 00 */ li r0, 0 /* 800A8628 000A5588 90 03 00 04 */ stw r0, 4(r3) -/* 800A862C 000A558C 4E 80 00 20 */ blr +/* 800A862C 000A558C 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR13CScriptPickup" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR13CScriptPickup": /* 800A8630 000A5590 38 00 00 00 */ li r0, 0 /* 800A8634 000A5594 90 03 00 04 */ stw r0, 4(r3) -/* 800A8638 000A5598 4E 80 00 20 */ blr +/* 800A8638 000A5598 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR15CScriptMazeNode" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR15CScriptMazeNode": /* 800A863C 000A559C 38 00 00 00 */ li r0, 0 /* 800A8640 000A55A0 90 03 00 04 */ stw r0, 4(r3) -/* 800A8644 000A55A4 4E 80 00 20 */ blr +/* 800A8644 000A55A4 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR16CScriptGunTurret" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR16CScriptGunTurret": /* 800A8648 000A55A8 38 00 00 00 */ li r0, 0 /* 800A864C 000A55AC 90 03 00 04 */ stw r0, 4(r3) -/* 800A8650 000A55B0 4E 80 00 20 */ blr +/* 800A8650 000A55B0 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR19CScriptGrapplePoint" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR19CScriptGrapplePoint": /* 800A8654 000A55B4 38 00 00 00 */ li r0, 0 /* 800A8658 000A55B8 90 03 00 04 */ stw r0, 4(r3) -/* 800A865C 000A55BC 4E 80 00 20 */ blr +/* 800A865C 000A55BC 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR13CScriptEffect" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR13CScriptEffect": /* 800A8660 000A55C0 38 00 00 00 */ li r0, 0 /* 800A8664 000A55C4 90 03 00 04 */ stw r0, 4(r3) -/* 800A8668 000A55C8 4E 80 00 20 */ blr +/* 800A8668 000A55C8 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR11CScriptDoor" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR11CScriptDoor": /* 800A866C 000A55CC 38 00 00 00 */ li r0, 0 /* 800A8670 000A55D0 90 03 00 04 */ stw r0, 4(r3) -/* 800A8674 000A55D4 4E 80 00 20 */ blr +/* 800A8674 000A55D4 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR11CScriptDock" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR11CScriptDock": /* 800A8678 000A55D8 38 00 00 00 */ li r0, 0 /* 800A867C 000A55DC 90 03 00 04 */ stw r0, 4(r3) -/* 800A8680 000A55E0 4E 80 00 20 */ blr +/* 800A8680 000A55E0 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR18CScriptDistanceFog" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR18CScriptDistanceFog": /* 800A8684 000A55E4 38 00 00 00 */ li r0, 0 /* 800A8688 000A55E8 90 03 00 04 */ stw r0, 4(r3) -/* 800A868C 000A55EC 4E 80 00 20 */ blr +/* 800A868C 000A55EC 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR26CScriptDebugCameraWaypoint" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR26CScriptDebugCameraWaypoint": /* 800A8690 000A55F0 38 00 00 00 */ li r0, 0 /* 800A8694 000A55F4 90 03 00 04 */ stw r0, 4(r3) -/* 800A8698 000A55F8 4E 80 00 20 */ blr +/* 800A8698 000A55F8 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR17CScriptCoverPoint" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR17CScriptCoverPoint": /* 800A869C 000A55FC 38 00 00 00 */ li r0, 0 /* 800A86A0 000A5600 90 03 00 04 */ stw r0, 4(r3) -/* 800A86A4 000A5604 4E 80 00 20 */ blr +/* 800A86A4 000A5604 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR21CScriptCameraWaypoint" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR21CScriptCameraWaypoint": /* 800A86A8 000A5608 38 00 00 00 */ li r0, 0 /* 800A86AC 000A560C 90 03 00 04 */ stw r0, 4(r3) -/* 800A86B0 000A5610 4E 80 00 20 */ blr +/* 800A86B0 000A5610 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR24CScriptCameraPitchVolume" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR24CScriptCameraPitchVolume": /* 800A86B4 000A5614 38 00 00 00 */ li r0, 0 /* 800A86B8 000A5618 90 03 00 04 */ stw r0, 4(r3) -/* 800A86BC 000A561C 4E 80 00 20 */ blr +/* 800A86BC 000A561C 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR17CScriptCameraHint" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR17CScriptCameraHint": /* 800A86C0 000A5620 38 00 00 00 */ li r0, 0 /* 800A86C4 000A5624 90 03 00 04 */ stw r0, 4(r3) -/* 800A86C8 000A5628 4E 80 00 20 */ blr +/* 800A86C8 000A5628 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR18CScriptAiJumpPoint" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR18CScriptAiJumpPoint": /* 800A86CC 000A562C 38 00 00 00 */ li r0, 0 /* 800A86D0 000A5630 90 03 00 04 */ stw r0, 4(r3) -/* 800A86D4 000A5634 4E 80 00 20 */ blr +/* 800A86D4 000A5634 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR20CScriptActorKeyframe" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR20CScriptActorKeyframe": /* 800A86D8 000A5638 38 00 00 00 */ li r0, 0 /* 800A86DC 000A563C 90 03 00 04 */ stw r0, 4(r3) -/* 800A86E0 000A5640 4E 80 00 20 */ blr +/* 800A86E0 000A5640 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR12CScriptActor" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR12CScriptActor": /* 800A86E4 000A5644 38 00 00 00 */ li r0, 0 /* 800A86E8 000A5648 90 03 00 04 */ stw r0, 4(r3) -/* 800A86EC 000A564C 4E 80 00 20 */ blr +/* 800A86EC 000A564C 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR9CRepulsor" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR9CRepulsor": /* 800A86F0 000A5650 38 00 00 00 */ li r0, 0 /* 800A86F4 000A5654 90 03 00 04 */ stw r0, 4(r3) -/* 800A86F8 000A5658 4E 80 00 20 */ blr +/* 800A86F8 000A5658 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR7CPlayer" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR7CPlayer": /* 800A86FC 000A565C 38 00 00 00 */ li r0, 0 /* 800A8700 000A5660 90 03 00 04 */ stw r0, 4(r3) -/* 800A8704 000A5664 4E 80 00 20 */ blr +/* 800A8704 000A5664 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR13CPhysicsActor" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR13CPhysicsActor": /* 800A8708 000A5668 38 00 00 00 */ li r0, 0 /* 800A870C 000A566C 90 03 00 04 */ stw r0, 4(r3) -/* 800A8710 000A5670 4E 80 00 20 */ blr +/* 800A8710 000A5670 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR3CAi" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR3CAi": /* 800A8714 000A5674 38 00 00 00 */ li r0, 0 /* 800A8718 000A5678 90 03 00 04 */ stw r0, 4(r3) -/* 800A871C 000A567C 4E 80 00 20 */ blr +/* 800A871C 000A567C 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR11CPathCamera" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR11CPathCamera": /* 800A8720 000A5680 38 00 00 00 */ li r0, 0 /* 800A8724 000A5684 90 03 00 04 */ stw r0, 4(r3) -/* 800A8728 000A5688 4E 80 00 20 */ blr +/* 800A8728 000A5688 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR18CMetroidPrimeRelay" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR18CMetroidPrimeRelay": /* 800A872C 000A568C 38 00 00 00 */ li r0, 0 /* 800A8730 000A5690 90 03 00 04 */ stw r0, 4(r3) -/* 800A8734 000A5694 4E 80 00 20 */ blr +/* 800A8734 000A5694 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR19CHUDBillboardEffect" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR19CHUDBillboardEffect": /* 800A8738 000A5698 38 00 00 00 */ li r0, 0 /* 800A873C 000A569C 90 03 00 04 */ stw r0, 4(r3) -/* 800A8740 000A56A0 4E 80 00 20 */ blr +/* 800A8740 000A56A0 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR15CGameProjectile" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR15CGameProjectile": /* 800A8744 000A56A4 38 00 00 00 */ li r0, 0 /* 800A8748 000A56A8 90 03 00 04 */ stw r0, 4(r3) -/* 800A874C 000A56AC 4E 80 00 20 */ blr +/* 800A874C 000A56AC 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR10CGameLight" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR10CGameLight": /* 800A8750 000A56B0 38 00 00 00 */ li r0, 0 /* 800A8754 000A56B4 90 03 00 04 */ stw r0, 4(r3) -/* 800A8758 000A56B8 4E 80 00 20 */ blr +/* 800A8758 000A56B8 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR11CGameCamera" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR11CGameCamera": /* 800A875C 000A56BC 38 00 00 00 */ li r0, 0 /* 800A8760 000A56C0 90 03 00 04 */ stw r0, 4(r3) -/* 800A8764 000A56C4 4E 80 00 20 */ blr +/* 800A8764 000A56C4 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR10CFishCloud" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR10CFishCloud": /* 800A8768 000A56C8 38 00 00 00 */ li r0, 0 /* 800A876C 000A56CC 90 03 00 04 */ stw r0, 4(r3) -/* 800A8770 000A56D0 4E 80 00 20 */ blr +/* 800A8770 000A56D0 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR18CFirstPersonCamera" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR18CFirstPersonCamera": /* 800A8774 000A56D4 38 00 00 00 */ li r0, 0 /* 800A8778 000A56D8 90 03 00 04 */ stw r0, 4(r3) -/* 800A877C 000A56DC 4E 80 00 20 */ blr +/* 800A877C 000A56DC 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR10CExplosion" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR10CExplosion": /* 800A8780 000A56E0 38 00 00 00 */ li r0, 0 /* 800A8784 000A56E4 90 03 00 04 */ stw r0, 4(r3) -/* 800A8788 000A56E8 4E 80 00 20 */ blr +/* 800A8788 000A56E8 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR7CEntity" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR7CEntity": /* 800A878C 000A56EC 38 00 00 00 */ li r0, 0 /* 800A8790 000A56F0 90 03 00 04 */ stw r0, 4(r3) -/* 800A8794 000A56F4 4E 80 00 20 */ blr +/* 800A8794 000A56F4 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR17CEnergyProjectile" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR17CEnergyProjectile": /* 800A8798 000A56F8 38 00 00 00 */ li r0, 0 /* 800A879C 000A56FC 90 03 00 04 */ stw r0, 4(r3) -/* 800A87A0 000A5700 4E 80 00 20 */ blr +/* 800A87A0 000A5700 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR16CDestroyableRock" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR16CDestroyableRock": /* 800A87A4 000A5704 38 00 00 00 */ li r0, 0 /* 800A87A8 000A5708 90 03 00 04 */ stw r0, 4(r3) -/* 800A87AC 000A570C 4E 80 00 20 */ blr +/* 800A87AC 000A570C 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR15CCollisionActor" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR15CCollisionActor": /* 800A87B0 000A5710 38 00 00 00 */ li r0, 0 /* 800A87B4 000A5714 90 03 00 04 */ stw r0, 4(r3) -/* 800A87B8 000A5718 4E 80 00 20 */ blr +/* 800A87B8 000A5718 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR16CCinematicCamera" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR16CCinematicCamera": /* 800A87BC 000A571C 38 00 00 00 */ li r0, 0 /* 800A87C0 000A5720 90 03 00 04 */ stw r0, 4(r3) -/* 800A87C4 000A5724 4E 80 00 20 */ blr +/* 800A87C4 000A5724 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR5CBomb" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR5CBomb": /* 800A87C8 000A5728 38 00 00 00 */ li r0, 0 /* 800A87CC 000A572C 90 03 00 04 */ stw r0, 4(r3) -/* 800A87D0 000A5730 4E 80 00 20 */ blr +/* 800A87D0 000A5730 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR11CBallCamera" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR11CBallCamera": /* 800A87D4 000A5734 38 00 00 00 */ li r0, 0 /* 800A87D8 000A5738 90 03 00 04 */ stw r0, 4(r3) -/* 800A87DC 000A573C 4E 80 00 20 */ blr +/* 800A87DC 000A573C 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR6CActor" "Visit__34TCastToPtr<20CScriptRoomAcoustics>FR6CActor": /* 800A87E0 000A5740 38 00 00 00 */ li r0, 0 /* 800A87E4 000A5744 90 03 00 04 */ stw r0, 4(r3) -/* 800A87E8 000A5748 4E 80 00 20 */ blr +/* 800A87E8 000A5748 4E 80 00 20 */ blr .global "__ct__34TCastToPtr<20CScriptRoomAcoustics>FP7CEntity" "__ct__34TCastToPtr<20CScriptRoomAcoustics>FP7CEntity": @@ -9429,355 +9429,355 @@ lbl_800A852C: /* 800A8830 000A5790 81 83 00 00 */ lwz r12, 0(r3) /* 800A8834 000A5794 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800A8838 000A5798 7D 89 03 A6 */ mtctr r12 -/* 800A883C 000A579C 4E 80 04 21 */ bctrl +/* 800A883C 000A579C 4E 80 04 21 */ bctrl lbl_800A8840: /* 800A8840 000A57A0 80 01 00 14 */ lwz r0, 0x14(r1) /* 800A8844 000A57A4 7F E3 FB 78 */ mr r3, r31 /* 800A8848 000A57A8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800A884C 000A57AC 7C 08 03 A6 */ mtlr r0 /* 800A8850 000A57B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A8854 000A57B4 4E 80 00 20 */ blr +/* 800A8854 000A57B4 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR7CWeapon" "Visit__31TCastToPtr<17CScriptPlayerHint>FR7CWeapon": /* 800A8858 000A57B8 38 00 00 00 */ li r0, 0 /* 800A885C 000A57BC 90 03 00 04 */ stw r0, 4(r3) -/* 800A8860 000A57C0 4E 80 00 20 */ blr +/* 800A8860 000A57C0 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR17CWallCrawlerSwarm" "Visit__31TCastToPtr<17CScriptPlayerHint>FR17CWallCrawlerSwarm": /* 800A8864 000A57C4 38 00 00 00 */ li r0, 0 /* 800A8868 000A57C8 90 03 00 04 */ stw r0, 4(r3) -/* 800A886C 000A57CC 4E 80 00 20 */ blr +/* 800A886C 000A57CC 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR20CScriptSpindleCamera" "Visit__31TCastToPtr<17CScriptPlayerHint>FR20CScriptSpindleCamera": /* 800A8870 000A57D0 38 00 00 00 */ li r0, 0 /* 800A8874 000A57D4 90 03 00 04 */ stw r0, 4(r3) -/* 800A8878 000A57D8 4E 80 00 20 */ blr +/* 800A8878 000A57D8 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR15CSnakeWeedSwarm" "Visit__31TCastToPtr<17CScriptPlayerHint>FR15CSnakeWeedSwarm": /* 800A887C 000A57DC 38 00 00 00 */ li r0, 0 /* 800A8880 000A57E0 90 03 00 04 */ stw r0, 4(r3) -/* 800A8884 000A57E4 4E 80 00 20 */ blr +/* 800A8884 000A57E4 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR15CScriptWaypoint" "Visit__31TCastToPtr<17CScriptPlayerHint>FR15CScriptWaypoint": /* 800A8888 000A57E8 38 00 00 00 */ li r0, 0 /* 800A888C 000A57EC 90 03 00 04 */ stw r0, 4(r3) -/* 800A8890 000A57F0 4E 80 00 20 */ blr +/* 800A8890 000A57F0 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR12CScriptWater" "Visit__31TCastToPtr<17CScriptPlayerHint>FR12CScriptWater": /* 800A8894 000A57F4 38 00 00 00 */ li r0, 0 /* 800A8898 000A57F8 90 03 00 04 */ stw r0, 4(r3) -/* 800A889C 000A57FC 4E 80 00 20 */ blr +/* 800A889C 000A57FC 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR17CScriptVisorFlare" "Visit__31TCastToPtr<17CScriptPlayerHint>FR17CScriptVisorFlare": /* 800A88A0 000A5800 38 00 00 00 */ li r0, 0 /* 800A88A4 000A5804 90 03 00 04 */ stw r0, 4(r3) -/* 800A88A8 000A5808 4E 80 00 20 */ blr +/* 800A88A8 000A5808 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR14CScriptTrigger" "Visit__31TCastToPtr<17CScriptPlayerHint>FR14CScriptTrigger": /* 800A88AC 000A580C 38 00 00 00 */ li r0, 0 /* 800A88B0 000A5810 90 03 00 04 */ stw r0, 4(r3) -/* 800A88B4 000A5814 4E 80 00 20 */ blr +/* 800A88B4 000A5814 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR12CScriptTimer" "Visit__31TCastToPtr<17CScriptPlayerHint>FR12CScriptTimer": /* 800A88B8 000A5818 38 00 00 00 */ li r0, 0 /* 800A88BC 000A581C 90 03 00 04 */ stw r0, 4(r3) -/* 800A88C0 000A5820 4E 80 00 20 */ blr +/* 800A88C0 000A5820 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR10CTeamAiMgr" "Visit__31TCastToPtr<17CScriptPlayerHint>FR10CTeamAiMgr": /* 800A88C4 000A5824 38 00 00 00 */ li r0, 0 /* 800A88C8 000A5828 90 03 00 04 */ stw r0, 4(r3) -/* 800A88CC 000A582C 4E 80 00 20 */ blr +/* 800A88CC 000A582C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR21CScriptTargetingPoint" "Visit__31TCastToPtr<17CScriptPlayerHint>FR21CScriptTargetingPoint": /* 800A88D0 000A5830 38 00 00 00 */ li r0, 0 /* 800A88D4 000A5834 90 03 00 04 */ stw r0, 4(r3) -/* 800A88D8 000A5838 4E 80 00 20 */ blr +/* 800A88D8 000A5838 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR25CScriptSpiderBallWaypoint" "Visit__31TCastToPtr<17CScriptPlayerHint>FR25CScriptSpiderBallWaypoint": /* 800A88DC 000A583C 38 00 00 00 */ li r0, 0 /* 800A88E0 000A5840 90 03 00 04 */ stw r0, 4(r3) -/* 800A88E4 000A5844 4E 80 00 20 */ blr +/* 800A88E4 000A5844 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR34CScriptSpiderBallAttractionSurface" "Visit__31TCastToPtr<17CScriptPlayerHint>FR34CScriptSpiderBallAttractionSurface": /* 800A88E8 000A5848 38 00 00 00 */ li r0, 0 /* 800A88EC 000A584C 90 03 00 04 */ stw r0, 4(r3) -/* 800A88F0 000A5850 4E 80 00 20 */ blr +/* 800A88F0 000A5850 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR22CScriptSpecialFunction" "Visit__31TCastToPtr<17CScriptPlayerHint>FR22CScriptSpecialFunction": /* 800A88F4 000A5854 38 00 00 00 */ li r0, 0 /* 800A88F8 000A5858 90 03 00 04 */ stw r0, 4(r3) -/* 800A88FC 000A585C 4E 80 00 20 */ blr +/* 800A88FC 000A585C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR17CScriptSpawnPoint" "Visit__31TCastToPtr<17CScriptPlayerHint>FR17CScriptSpawnPoint": /* 800A8900 000A5860 38 00 00 00 */ li r0, 0 /* 800A8904 000A5864 90 03 00 04 */ stw r0, 4(r3) -/* 800A8908 000A5868 4E 80 00 20 */ blr +/* 800A8908 000A5868 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR12CScriptSound" "Visit__31TCastToPtr<17CScriptPlayerHint>FR12CScriptSound": /* 800A890C 000A586C 38 00 00 00 */ li r0, 0 /* 800A8910 000A5870 90 03 00 04 */ stw r0, 4(r3) -/* 800A8914 000A5874 4E 80 00 20 */ blr +/* 800A8914 000A5874 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR20CScriptRoomAcoustics" "Visit__31TCastToPtr<17CScriptPlayerHint>FR20CScriptRoomAcoustics": /* 800A8918 000A5878 38 00 00 00 */ li r0, 0 /* 800A891C 000A587C 90 03 00 04 */ stw r0, 4(r3) -/* 800A8920 000A5880 4E 80 00 20 */ blr +/* 800A8920 000A5880 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR22CScriptPointOfinterest" "Visit__31TCastToPtr<17CScriptPlayerHint>FR22CScriptPointOfinterest": /* 800A8924 000A5884 38 00 00 00 */ li r0, 0 /* 800A8928 000A5888 90 03 00 04 */ stw r0, 4(r3) -/* 800A892C 000A588C 4E 80 00 20 */ blr +/* 800A892C 000A588C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR17CScriptPlayerHint" "Visit__31TCastToPtr<17CScriptPlayerHint>FR17CScriptPlayerHint": /* 800A8930 000A5890 90 83 00 04 */ stw r4, 4(r3) -/* 800A8934 000A5894 4E 80 00 20 */ blr +/* 800A8934 000A5894 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR15CScriptPlatform" "Visit__31TCastToPtr<17CScriptPlayerHint>FR15CScriptPlatform": /* 800A8938 000A5898 38 00 00 00 */ li r0, 0 /* 800A893C 000A589C 90 03 00 04 */ stw r0, 4(r3) -/* 800A8940 000A58A0 4E 80 00 20 */ blr +/* 800A8940 000A58A0 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR13CScriptPickup" "Visit__31TCastToPtr<17CScriptPlayerHint>FR13CScriptPickup": /* 800A8944 000A58A4 38 00 00 00 */ li r0, 0 /* 800A8948 000A58A8 90 03 00 04 */ stw r0, 4(r3) -/* 800A894C 000A58AC 4E 80 00 20 */ blr +/* 800A894C 000A58AC 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR15CScriptMazeNode" "Visit__31TCastToPtr<17CScriptPlayerHint>FR15CScriptMazeNode": /* 800A8950 000A58B0 38 00 00 00 */ li r0, 0 /* 800A8954 000A58B4 90 03 00 04 */ stw r0, 4(r3) -/* 800A8958 000A58B8 4E 80 00 20 */ blr +/* 800A8958 000A58B8 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR16CScriptGunTurret" "Visit__31TCastToPtr<17CScriptPlayerHint>FR16CScriptGunTurret": /* 800A895C 000A58BC 38 00 00 00 */ li r0, 0 /* 800A8960 000A58C0 90 03 00 04 */ stw r0, 4(r3) -/* 800A8964 000A58C4 4E 80 00 20 */ blr +/* 800A8964 000A58C4 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR19CScriptGrapplePoint" "Visit__31TCastToPtr<17CScriptPlayerHint>FR19CScriptGrapplePoint": /* 800A8968 000A58C8 38 00 00 00 */ li r0, 0 /* 800A896C 000A58CC 90 03 00 04 */ stw r0, 4(r3) -/* 800A8970 000A58D0 4E 80 00 20 */ blr +/* 800A8970 000A58D0 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR13CScriptEffect" "Visit__31TCastToPtr<17CScriptPlayerHint>FR13CScriptEffect": /* 800A8974 000A58D4 38 00 00 00 */ li r0, 0 /* 800A8978 000A58D8 90 03 00 04 */ stw r0, 4(r3) -/* 800A897C 000A58DC 4E 80 00 20 */ blr +/* 800A897C 000A58DC 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR11CScriptDoor" "Visit__31TCastToPtr<17CScriptPlayerHint>FR11CScriptDoor": /* 800A8980 000A58E0 38 00 00 00 */ li r0, 0 /* 800A8984 000A58E4 90 03 00 04 */ stw r0, 4(r3) -/* 800A8988 000A58E8 4E 80 00 20 */ blr +/* 800A8988 000A58E8 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR11CScriptDock" "Visit__31TCastToPtr<17CScriptPlayerHint>FR11CScriptDock": /* 800A898C 000A58EC 38 00 00 00 */ li r0, 0 /* 800A8990 000A58F0 90 03 00 04 */ stw r0, 4(r3) -/* 800A8994 000A58F4 4E 80 00 20 */ blr +/* 800A8994 000A58F4 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR18CScriptDistanceFog" "Visit__31TCastToPtr<17CScriptPlayerHint>FR18CScriptDistanceFog": /* 800A8998 000A58F8 38 00 00 00 */ li r0, 0 /* 800A899C 000A58FC 90 03 00 04 */ stw r0, 4(r3) -/* 800A89A0 000A5900 4E 80 00 20 */ blr +/* 800A89A0 000A5900 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR26CScriptDebugCameraWaypoint" "Visit__31TCastToPtr<17CScriptPlayerHint>FR26CScriptDebugCameraWaypoint": /* 800A89A4 000A5904 38 00 00 00 */ li r0, 0 /* 800A89A8 000A5908 90 03 00 04 */ stw r0, 4(r3) -/* 800A89AC 000A590C 4E 80 00 20 */ blr +/* 800A89AC 000A590C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR17CScriptCoverPoint" "Visit__31TCastToPtr<17CScriptPlayerHint>FR17CScriptCoverPoint": /* 800A89B0 000A5910 38 00 00 00 */ li r0, 0 /* 800A89B4 000A5914 90 03 00 04 */ stw r0, 4(r3) -/* 800A89B8 000A5918 4E 80 00 20 */ blr +/* 800A89B8 000A5918 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR21CScriptCameraWaypoint" "Visit__31TCastToPtr<17CScriptPlayerHint>FR21CScriptCameraWaypoint": /* 800A89BC 000A591C 38 00 00 00 */ li r0, 0 /* 800A89C0 000A5920 90 03 00 04 */ stw r0, 4(r3) -/* 800A89C4 000A5924 4E 80 00 20 */ blr +/* 800A89C4 000A5924 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR24CScriptCameraPitchVolume" "Visit__31TCastToPtr<17CScriptPlayerHint>FR24CScriptCameraPitchVolume": /* 800A89C8 000A5928 38 00 00 00 */ li r0, 0 /* 800A89CC 000A592C 90 03 00 04 */ stw r0, 4(r3) -/* 800A89D0 000A5930 4E 80 00 20 */ blr +/* 800A89D0 000A5930 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR17CScriptCameraHint" "Visit__31TCastToPtr<17CScriptPlayerHint>FR17CScriptCameraHint": /* 800A89D4 000A5934 38 00 00 00 */ li r0, 0 /* 800A89D8 000A5938 90 03 00 04 */ stw r0, 4(r3) -/* 800A89DC 000A593C 4E 80 00 20 */ blr +/* 800A89DC 000A593C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR18CScriptAiJumpPoint" "Visit__31TCastToPtr<17CScriptPlayerHint>FR18CScriptAiJumpPoint": /* 800A89E0 000A5940 38 00 00 00 */ li r0, 0 /* 800A89E4 000A5944 90 03 00 04 */ stw r0, 4(r3) -/* 800A89E8 000A5948 4E 80 00 20 */ blr +/* 800A89E8 000A5948 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR20CScriptActorKeyframe" "Visit__31TCastToPtr<17CScriptPlayerHint>FR20CScriptActorKeyframe": /* 800A89EC 000A594C 38 00 00 00 */ li r0, 0 /* 800A89F0 000A5950 90 03 00 04 */ stw r0, 4(r3) -/* 800A89F4 000A5954 4E 80 00 20 */ blr +/* 800A89F4 000A5954 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR12CScriptActor" "Visit__31TCastToPtr<17CScriptPlayerHint>FR12CScriptActor": /* 800A89F8 000A5958 38 00 00 00 */ li r0, 0 /* 800A89FC 000A595C 90 03 00 04 */ stw r0, 4(r3) -/* 800A8A00 000A5960 4E 80 00 20 */ blr +/* 800A8A00 000A5960 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR9CRepulsor" "Visit__31TCastToPtr<17CScriptPlayerHint>FR9CRepulsor": /* 800A8A04 000A5964 38 00 00 00 */ li r0, 0 /* 800A8A08 000A5968 90 03 00 04 */ stw r0, 4(r3) -/* 800A8A0C 000A596C 4E 80 00 20 */ blr +/* 800A8A0C 000A596C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR7CPlayer" "Visit__31TCastToPtr<17CScriptPlayerHint>FR7CPlayer": /* 800A8A10 000A5970 38 00 00 00 */ li r0, 0 /* 800A8A14 000A5974 90 03 00 04 */ stw r0, 4(r3) -/* 800A8A18 000A5978 4E 80 00 20 */ blr +/* 800A8A18 000A5978 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR13CPhysicsActor" "Visit__31TCastToPtr<17CScriptPlayerHint>FR13CPhysicsActor": /* 800A8A1C 000A597C 38 00 00 00 */ li r0, 0 /* 800A8A20 000A5980 90 03 00 04 */ stw r0, 4(r3) -/* 800A8A24 000A5984 4E 80 00 20 */ blr +/* 800A8A24 000A5984 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR3CAi" "Visit__31TCastToPtr<17CScriptPlayerHint>FR3CAi": /* 800A8A28 000A5988 38 00 00 00 */ li r0, 0 /* 800A8A2C 000A598C 90 03 00 04 */ stw r0, 4(r3) -/* 800A8A30 000A5990 4E 80 00 20 */ blr +/* 800A8A30 000A5990 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR11CPathCamera" "Visit__31TCastToPtr<17CScriptPlayerHint>FR11CPathCamera": /* 800A8A34 000A5994 38 00 00 00 */ li r0, 0 /* 800A8A38 000A5998 90 03 00 04 */ stw r0, 4(r3) -/* 800A8A3C 000A599C 4E 80 00 20 */ blr +/* 800A8A3C 000A599C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR18CMetroidPrimeRelay" "Visit__31TCastToPtr<17CScriptPlayerHint>FR18CMetroidPrimeRelay": /* 800A8A40 000A59A0 38 00 00 00 */ li r0, 0 /* 800A8A44 000A59A4 90 03 00 04 */ stw r0, 4(r3) -/* 800A8A48 000A59A8 4E 80 00 20 */ blr +/* 800A8A48 000A59A8 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR19CHUDBillboardEffect" "Visit__31TCastToPtr<17CScriptPlayerHint>FR19CHUDBillboardEffect": /* 800A8A4C 000A59AC 38 00 00 00 */ li r0, 0 /* 800A8A50 000A59B0 90 03 00 04 */ stw r0, 4(r3) -/* 800A8A54 000A59B4 4E 80 00 20 */ blr +/* 800A8A54 000A59B4 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR15CGameProjectile" "Visit__31TCastToPtr<17CScriptPlayerHint>FR15CGameProjectile": /* 800A8A58 000A59B8 38 00 00 00 */ li r0, 0 /* 800A8A5C 000A59BC 90 03 00 04 */ stw r0, 4(r3) -/* 800A8A60 000A59C0 4E 80 00 20 */ blr +/* 800A8A60 000A59C0 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR10CGameLight" "Visit__31TCastToPtr<17CScriptPlayerHint>FR10CGameLight": /* 800A8A64 000A59C4 38 00 00 00 */ li r0, 0 /* 800A8A68 000A59C8 90 03 00 04 */ stw r0, 4(r3) -/* 800A8A6C 000A59CC 4E 80 00 20 */ blr +/* 800A8A6C 000A59CC 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR11CGameCamera" "Visit__31TCastToPtr<17CScriptPlayerHint>FR11CGameCamera": /* 800A8A70 000A59D0 38 00 00 00 */ li r0, 0 /* 800A8A74 000A59D4 90 03 00 04 */ stw r0, 4(r3) -/* 800A8A78 000A59D8 4E 80 00 20 */ blr +/* 800A8A78 000A59D8 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR10CFishCloud" "Visit__31TCastToPtr<17CScriptPlayerHint>FR10CFishCloud": /* 800A8A7C 000A59DC 38 00 00 00 */ li r0, 0 /* 800A8A80 000A59E0 90 03 00 04 */ stw r0, 4(r3) -/* 800A8A84 000A59E4 4E 80 00 20 */ blr +/* 800A8A84 000A59E4 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR18CFirstPersonCamera" "Visit__31TCastToPtr<17CScriptPlayerHint>FR18CFirstPersonCamera": /* 800A8A88 000A59E8 38 00 00 00 */ li r0, 0 /* 800A8A8C 000A59EC 90 03 00 04 */ stw r0, 4(r3) -/* 800A8A90 000A59F0 4E 80 00 20 */ blr +/* 800A8A90 000A59F0 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR10CExplosion" "Visit__31TCastToPtr<17CScriptPlayerHint>FR10CExplosion": /* 800A8A94 000A59F4 38 00 00 00 */ li r0, 0 /* 800A8A98 000A59F8 90 03 00 04 */ stw r0, 4(r3) -/* 800A8A9C 000A59FC 4E 80 00 20 */ blr +/* 800A8A9C 000A59FC 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR7CEntity" "Visit__31TCastToPtr<17CScriptPlayerHint>FR7CEntity": /* 800A8AA0 000A5A00 38 00 00 00 */ li r0, 0 /* 800A8AA4 000A5A04 90 03 00 04 */ stw r0, 4(r3) -/* 800A8AA8 000A5A08 4E 80 00 20 */ blr +/* 800A8AA8 000A5A08 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR17CEnergyProjectile" "Visit__31TCastToPtr<17CScriptPlayerHint>FR17CEnergyProjectile": /* 800A8AAC 000A5A0C 38 00 00 00 */ li r0, 0 /* 800A8AB0 000A5A10 90 03 00 04 */ stw r0, 4(r3) -/* 800A8AB4 000A5A14 4E 80 00 20 */ blr +/* 800A8AB4 000A5A14 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR16CDestroyableRock" "Visit__31TCastToPtr<17CScriptPlayerHint>FR16CDestroyableRock": /* 800A8AB8 000A5A18 38 00 00 00 */ li r0, 0 /* 800A8ABC 000A5A1C 90 03 00 04 */ stw r0, 4(r3) -/* 800A8AC0 000A5A20 4E 80 00 20 */ blr +/* 800A8AC0 000A5A20 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR15CCollisionActor" "Visit__31TCastToPtr<17CScriptPlayerHint>FR15CCollisionActor": /* 800A8AC4 000A5A24 38 00 00 00 */ li r0, 0 /* 800A8AC8 000A5A28 90 03 00 04 */ stw r0, 4(r3) -/* 800A8ACC 000A5A2C 4E 80 00 20 */ blr +/* 800A8ACC 000A5A2C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR16CCinematicCamera" "Visit__31TCastToPtr<17CScriptPlayerHint>FR16CCinematicCamera": /* 800A8AD0 000A5A30 38 00 00 00 */ li r0, 0 /* 800A8AD4 000A5A34 90 03 00 04 */ stw r0, 4(r3) -/* 800A8AD8 000A5A38 4E 80 00 20 */ blr +/* 800A8AD8 000A5A38 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR5CBomb" "Visit__31TCastToPtr<17CScriptPlayerHint>FR5CBomb": /* 800A8ADC 000A5A3C 38 00 00 00 */ li r0, 0 /* 800A8AE0 000A5A40 90 03 00 04 */ stw r0, 4(r3) -/* 800A8AE4 000A5A44 4E 80 00 20 */ blr +/* 800A8AE4 000A5A44 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR11CBallCamera" "Visit__31TCastToPtr<17CScriptPlayerHint>FR11CBallCamera": /* 800A8AE8 000A5A48 38 00 00 00 */ li r0, 0 /* 800A8AEC 000A5A4C 90 03 00 04 */ stw r0, 4(r3) -/* 800A8AF0 000A5A50 4E 80 00 20 */ blr +/* 800A8AF0 000A5A50 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptPlayerHint>FR6CActor" "Visit__31TCastToPtr<17CScriptPlayerHint>FR6CActor": /* 800A8AF4 000A5A54 38 00 00 00 */ li r0, 0 /* 800A8AF8 000A5A58 90 03 00 04 */ stw r0, 4(r3) -/* 800A8AFC 000A5A5C 4E 80 00 20 */ blr +/* 800A8AFC 000A5A5C 4E 80 00 20 */ blr .global "__ct__31TCastToPtr<17CScriptPlayerHint>FP7CEntity" "__ct__31TCastToPtr<17CScriptPlayerHint>FP7CEntity": @@ -9801,355 +9801,355 @@ lbl_800A8840: /* 800A8B44 000A5AA4 81 83 00 00 */ lwz r12, 0(r3) /* 800A8B48 000A5AA8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800A8B4C 000A5AAC 7D 89 03 A6 */ mtctr r12 -/* 800A8B50 000A5AB0 4E 80 04 21 */ bctrl +/* 800A8B50 000A5AB0 4E 80 04 21 */ bctrl lbl_800A8B54: /* 800A8B54 000A5AB4 80 01 00 14 */ lwz r0, 0x14(r1) /* 800A8B58 000A5AB8 7F E3 FB 78 */ mr r3, r31 /* 800A8B5C 000A5ABC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800A8B60 000A5AC0 7C 08 03 A6 */ mtlr r0 /* 800A8B64 000A5AC4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A8B68 000A5AC8 4E 80 00 20 */ blr +/* 800A8B68 000A5AC8 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR7CWeapon" "Visit__29TCastToPtr<15CScriptPlatform>FR7CWeapon": /* 800A8B6C 000A5ACC 38 00 00 00 */ li r0, 0 /* 800A8B70 000A5AD0 90 03 00 04 */ stw r0, 4(r3) -/* 800A8B74 000A5AD4 4E 80 00 20 */ blr +/* 800A8B74 000A5AD4 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR17CWallCrawlerSwarm" "Visit__29TCastToPtr<15CScriptPlatform>FR17CWallCrawlerSwarm": /* 800A8B78 000A5AD8 38 00 00 00 */ li r0, 0 /* 800A8B7C 000A5ADC 90 03 00 04 */ stw r0, 4(r3) -/* 800A8B80 000A5AE0 4E 80 00 20 */ blr +/* 800A8B80 000A5AE0 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR20CScriptSpindleCamera" "Visit__29TCastToPtr<15CScriptPlatform>FR20CScriptSpindleCamera": /* 800A8B84 000A5AE4 38 00 00 00 */ li r0, 0 /* 800A8B88 000A5AE8 90 03 00 04 */ stw r0, 4(r3) -/* 800A8B8C 000A5AEC 4E 80 00 20 */ blr +/* 800A8B8C 000A5AEC 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR15CSnakeWeedSwarm" "Visit__29TCastToPtr<15CScriptPlatform>FR15CSnakeWeedSwarm": /* 800A8B90 000A5AF0 38 00 00 00 */ li r0, 0 /* 800A8B94 000A5AF4 90 03 00 04 */ stw r0, 4(r3) -/* 800A8B98 000A5AF8 4E 80 00 20 */ blr +/* 800A8B98 000A5AF8 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR15CScriptWaypoint" "Visit__29TCastToPtr<15CScriptPlatform>FR15CScriptWaypoint": /* 800A8B9C 000A5AFC 38 00 00 00 */ li r0, 0 /* 800A8BA0 000A5B00 90 03 00 04 */ stw r0, 4(r3) -/* 800A8BA4 000A5B04 4E 80 00 20 */ blr +/* 800A8BA4 000A5B04 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR12CScriptWater" "Visit__29TCastToPtr<15CScriptPlatform>FR12CScriptWater": /* 800A8BA8 000A5B08 38 00 00 00 */ li r0, 0 /* 800A8BAC 000A5B0C 90 03 00 04 */ stw r0, 4(r3) -/* 800A8BB0 000A5B10 4E 80 00 20 */ blr +/* 800A8BB0 000A5B10 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR17CScriptVisorFlare" "Visit__29TCastToPtr<15CScriptPlatform>FR17CScriptVisorFlare": /* 800A8BB4 000A5B14 38 00 00 00 */ li r0, 0 /* 800A8BB8 000A5B18 90 03 00 04 */ stw r0, 4(r3) -/* 800A8BBC 000A5B1C 4E 80 00 20 */ blr +/* 800A8BBC 000A5B1C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR14CScriptTrigger" "Visit__29TCastToPtr<15CScriptPlatform>FR14CScriptTrigger": /* 800A8BC0 000A5B20 38 00 00 00 */ li r0, 0 /* 800A8BC4 000A5B24 90 03 00 04 */ stw r0, 4(r3) -/* 800A8BC8 000A5B28 4E 80 00 20 */ blr +/* 800A8BC8 000A5B28 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR12CScriptTimer" "Visit__29TCastToPtr<15CScriptPlatform>FR12CScriptTimer": /* 800A8BCC 000A5B2C 38 00 00 00 */ li r0, 0 /* 800A8BD0 000A5B30 90 03 00 04 */ stw r0, 4(r3) -/* 800A8BD4 000A5B34 4E 80 00 20 */ blr +/* 800A8BD4 000A5B34 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR10CTeamAiMgr" "Visit__29TCastToPtr<15CScriptPlatform>FR10CTeamAiMgr": /* 800A8BD8 000A5B38 38 00 00 00 */ li r0, 0 /* 800A8BDC 000A5B3C 90 03 00 04 */ stw r0, 4(r3) -/* 800A8BE0 000A5B40 4E 80 00 20 */ blr +/* 800A8BE0 000A5B40 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR21CScriptTargetingPoint" "Visit__29TCastToPtr<15CScriptPlatform>FR21CScriptTargetingPoint": /* 800A8BE4 000A5B44 38 00 00 00 */ li r0, 0 /* 800A8BE8 000A5B48 90 03 00 04 */ stw r0, 4(r3) -/* 800A8BEC 000A5B4C 4E 80 00 20 */ blr +/* 800A8BEC 000A5B4C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR25CScriptSpiderBallWaypoint" "Visit__29TCastToPtr<15CScriptPlatform>FR25CScriptSpiderBallWaypoint": /* 800A8BF0 000A5B50 38 00 00 00 */ li r0, 0 /* 800A8BF4 000A5B54 90 03 00 04 */ stw r0, 4(r3) -/* 800A8BF8 000A5B58 4E 80 00 20 */ blr +/* 800A8BF8 000A5B58 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR34CScriptSpiderBallAttractionSurface" "Visit__29TCastToPtr<15CScriptPlatform>FR34CScriptSpiderBallAttractionSurface": /* 800A8BFC 000A5B5C 38 00 00 00 */ li r0, 0 /* 800A8C00 000A5B60 90 03 00 04 */ stw r0, 4(r3) -/* 800A8C04 000A5B64 4E 80 00 20 */ blr +/* 800A8C04 000A5B64 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR22CScriptSpecialFunction" "Visit__29TCastToPtr<15CScriptPlatform>FR22CScriptSpecialFunction": /* 800A8C08 000A5B68 38 00 00 00 */ li r0, 0 /* 800A8C0C 000A5B6C 90 03 00 04 */ stw r0, 4(r3) -/* 800A8C10 000A5B70 4E 80 00 20 */ blr +/* 800A8C10 000A5B70 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR17CScriptSpawnPoint" "Visit__29TCastToPtr<15CScriptPlatform>FR17CScriptSpawnPoint": /* 800A8C14 000A5B74 38 00 00 00 */ li r0, 0 /* 800A8C18 000A5B78 90 03 00 04 */ stw r0, 4(r3) -/* 800A8C1C 000A5B7C 4E 80 00 20 */ blr +/* 800A8C1C 000A5B7C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR12CScriptSound" "Visit__29TCastToPtr<15CScriptPlatform>FR12CScriptSound": /* 800A8C20 000A5B80 38 00 00 00 */ li r0, 0 /* 800A8C24 000A5B84 90 03 00 04 */ stw r0, 4(r3) -/* 800A8C28 000A5B88 4E 80 00 20 */ blr +/* 800A8C28 000A5B88 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR20CScriptRoomAcoustics" "Visit__29TCastToPtr<15CScriptPlatform>FR20CScriptRoomAcoustics": /* 800A8C2C 000A5B8C 38 00 00 00 */ li r0, 0 /* 800A8C30 000A5B90 90 03 00 04 */ stw r0, 4(r3) -/* 800A8C34 000A5B94 4E 80 00 20 */ blr +/* 800A8C34 000A5B94 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR22CScriptPointOfinterest" "Visit__29TCastToPtr<15CScriptPlatform>FR22CScriptPointOfinterest": /* 800A8C38 000A5B98 38 00 00 00 */ li r0, 0 /* 800A8C3C 000A5B9C 90 03 00 04 */ stw r0, 4(r3) -/* 800A8C40 000A5BA0 4E 80 00 20 */ blr +/* 800A8C40 000A5BA0 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR17CScriptPlayerHint" "Visit__29TCastToPtr<15CScriptPlatform>FR17CScriptPlayerHint": /* 800A8C44 000A5BA4 38 00 00 00 */ li r0, 0 /* 800A8C48 000A5BA8 90 03 00 04 */ stw r0, 4(r3) -/* 800A8C4C 000A5BAC 4E 80 00 20 */ blr +/* 800A8C4C 000A5BAC 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR15CScriptPlatform" "Visit__29TCastToPtr<15CScriptPlatform>FR15CScriptPlatform": /* 800A8C50 000A5BB0 90 83 00 04 */ stw r4, 4(r3) -/* 800A8C54 000A5BB4 4E 80 00 20 */ blr +/* 800A8C54 000A5BB4 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR13CScriptPickup" "Visit__29TCastToPtr<15CScriptPlatform>FR13CScriptPickup": /* 800A8C58 000A5BB8 38 00 00 00 */ li r0, 0 /* 800A8C5C 000A5BBC 90 03 00 04 */ stw r0, 4(r3) -/* 800A8C60 000A5BC0 4E 80 00 20 */ blr +/* 800A8C60 000A5BC0 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR15CScriptMazeNode" "Visit__29TCastToPtr<15CScriptPlatform>FR15CScriptMazeNode": /* 800A8C64 000A5BC4 38 00 00 00 */ li r0, 0 /* 800A8C68 000A5BC8 90 03 00 04 */ stw r0, 4(r3) -/* 800A8C6C 000A5BCC 4E 80 00 20 */ blr +/* 800A8C6C 000A5BCC 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR16CScriptGunTurret" "Visit__29TCastToPtr<15CScriptPlatform>FR16CScriptGunTurret": /* 800A8C70 000A5BD0 38 00 00 00 */ li r0, 0 /* 800A8C74 000A5BD4 90 03 00 04 */ stw r0, 4(r3) -/* 800A8C78 000A5BD8 4E 80 00 20 */ blr +/* 800A8C78 000A5BD8 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR19CScriptGrapplePoint" "Visit__29TCastToPtr<15CScriptPlatform>FR19CScriptGrapplePoint": /* 800A8C7C 000A5BDC 38 00 00 00 */ li r0, 0 /* 800A8C80 000A5BE0 90 03 00 04 */ stw r0, 4(r3) -/* 800A8C84 000A5BE4 4E 80 00 20 */ blr +/* 800A8C84 000A5BE4 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR13CScriptEffect" "Visit__29TCastToPtr<15CScriptPlatform>FR13CScriptEffect": /* 800A8C88 000A5BE8 38 00 00 00 */ li r0, 0 /* 800A8C8C 000A5BEC 90 03 00 04 */ stw r0, 4(r3) -/* 800A8C90 000A5BF0 4E 80 00 20 */ blr +/* 800A8C90 000A5BF0 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR11CScriptDoor" "Visit__29TCastToPtr<15CScriptPlatform>FR11CScriptDoor": /* 800A8C94 000A5BF4 38 00 00 00 */ li r0, 0 /* 800A8C98 000A5BF8 90 03 00 04 */ stw r0, 4(r3) -/* 800A8C9C 000A5BFC 4E 80 00 20 */ blr +/* 800A8C9C 000A5BFC 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR11CScriptDock" "Visit__29TCastToPtr<15CScriptPlatform>FR11CScriptDock": /* 800A8CA0 000A5C00 38 00 00 00 */ li r0, 0 /* 800A8CA4 000A5C04 90 03 00 04 */ stw r0, 4(r3) -/* 800A8CA8 000A5C08 4E 80 00 20 */ blr +/* 800A8CA8 000A5C08 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR18CScriptDistanceFog" "Visit__29TCastToPtr<15CScriptPlatform>FR18CScriptDistanceFog": /* 800A8CAC 000A5C0C 38 00 00 00 */ li r0, 0 /* 800A8CB0 000A5C10 90 03 00 04 */ stw r0, 4(r3) -/* 800A8CB4 000A5C14 4E 80 00 20 */ blr +/* 800A8CB4 000A5C14 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR26CScriptDebugCameraWaypoint" "Visit__29TCastToPtr<15CScriptPlatform>FR26CScriptDebugCameraWaypoint": /* 800A8CB8 000A5C18 38 00 00 00 */ li r0, 0 /* 800A8CBC 000A5C1C 90 03 00 04 */ stw r0, 4(r3) -/* 800A8CC0 000A5C20 4E 80 00 20 */ blr +/* 800A8CC0 000A5C20 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR17CScriptCoverPoint" "Visit__29TCastToPtr<15CScriptPlatform>FR17CScriptCoverPoint": /* 800A8CC4 000A5C24 38 00 00 00 */ li r0, 0 /* 800A8CC8 000A5C28 90 03 00 04 */ stw r0, 4(r3) -/* 800A8CCC 000A5C2C 4E 80 00 20 */ blr +/* 800A8CCC 000A5C2C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR21CScriptCameraWaypoint" "Visit__29TCastToPtr<15CScriptPlatform>FR21CScriptCameraWaypoint": /* 800A8CD0 000A5C30 38 00 00 00 */ li r0, 0 /* 800A8CD4 000A5C34 90 03 00 04 */ stw r0, 4(r3) -/* 800A8CD8 000A5C38 4E 80 00 20 */ blr +/* 800A8CD8 000A5C38 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR24CScriptCameraPitchVolume" "Visit__29TCastToPtr<15CScriptPlatform>FR24CScriptCameraPitchVolume": /* 800A8CDC 000A5C3C 38 00 00 00 */ li r0, 0 /* 800A8CE0 000A5C40 90 03 00 04 */ stw r0, 4(r3) -/* 800A8CE4 000A5C44 4E 80 00 20 */ blr +/* 800A8CE4 000A5C44 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR17CScriptCameraHint" "Visit__29TCastToPtr<15CScriptPlatform>FR17CScriptCameraHint": /* 800A8CE8 000A5C48 38 00 00 00 */ li r0, 0 /* 800A8CEC 000A5C4C 90 03 00 04 */ stw r0, 4(r3) -/* 800A8CF0 000A5C50 4E 80 00 20 */ blr +/* 800A8CF0 000A5C50 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR18CScriptAiJumpPoint" "Visit__29TCastToPtr<15CScriptPlatform>FR18CScriptAiJumpPoint": /* 800A8CF4 000A5C54 38 00 00 00 */ li r0, 0 /* 800A8CF8 000A5C58 90 03 00 04 */ stw r0, 4(r3) -/* 800A8CFC 000A5C5C 4E 80 00 20 */ blr +/* 800A8CFC 000A5C5C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR20CScriptActorKeyframe" "Visit__29TCastToPtr<15CScriptPlatform>FR20CScriptActorKeyframe": /* 800A8D00 000A5C60 38 00 00 00 */ li r0, 0 /* 800A8D04 000A5C64 90 03 00 04 */ stw r0, 4(r3) -/* 800A8D08 000A5C68 4E 80 00 20 */ blr +/* 800A8D08 000A5C68 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR12CScriptActor" "Visit__29TCastToPtr<15CScriptPlatform>FR12CScriptActor": /* 800A8D0C 000A5C6C 38 00 00 00 */ li r0, 0 /* 800A8D10 000A5C70 90 03 00 04 */ stw r0, 4(r3) -/* 800A8D14 000A5C74 4E 80 00 20 */ blr +/* 800A8D14 000A5C74 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR9CRepulsor" "Visit__29TCastToPtr<15CScriptPlatform>FR9CRepulsor": /* 800A8D18 000A5C78 38 00 00 00 */ li r0, 0 /* 800A8D1C 000A5C7C 90 03 00 04 */ stw r0, 4(r3) -/* 800A8D20 000A5C80 4E 80 00 20 */ blr +/* 800A8D20 000A5C80 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR7CPlayer" "Visit__29TCastToPtr<15CScriptPlatform>FR7CPlayer": /* 800A8D24 000A5C84 38 00 00 00 */ li r0, 0 /* 800A8D28 000A5C88 90 03 00 04 */ stw r0, 4(r3) -/* 800A8D2C 000A5C8C 4E 80 00 20 */ blr +/* 800A8D2C 000A5C8C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR13CPhysicsActor" "Visit__29TCastToPtr<15CScriptPlatform>FR13CPhysicsActor": /* 800A8D30 000A5C90 38 00 00 00 */ li r0, 0 /* 800A8D34 000A5C94 90 03 00 04 */ stw r0, 4(r3) -/* 800A8D38 000A5C98 4E 80 00 20 */ blr +/* 800A8D38 000A5C98 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR3CAi" "Visit__29TCastToPtr<15CScriptPlatform>FR3CAi": /* 800A8D3C 000A5C9C 38 00 00 00 */ li r0, 0 /* 800A8D40 000A5CA0 90 03 00 04 */ stw r0, 4(r3) -/* 800A8D44 000A5CA4 4E 80 00 20 */ blr +/* 800A8D44 000A5CA4 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR11CPathCamera" "Visit__29TCastToPtr<15CScriptPlatform>FR11CPathCamera": /* 800A8D48 000A5CA8 38 00 00 00 */ li r0, 0 /* 800A8D4C 000A5CAC 90 03 00 04 */ stw r0, 4(r3) -/* 800A8D50 000A5CB0 4E 80 00 20 */ blr +/* 800A8D50 000A5CB0 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR18CMetroidPrimeRelay" "Visit__29TCastToPtr<15CScriptPlatform>FR18CMetroidPrimeRelay": /* 800A8D54 000A5CB4 38 00 00 00 */ li r0, 0 /* 800A8D58 000A5CB8 90 03 00 04 */ stw r0, 4(r3) -/* 800A8D5C 000A5CBC 4E 80 00 20 */ blr +/* 800A8D5C 000A5CBC 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR19CHUDBillboardEffect" "Visit__29TCastToPtr<15CScriptPlatform>FR19CHUDBillboardEffect": /* 800A8D60 000A5CC0 38 00 00 00 */ li r0, 0 /* 800A8D64 000A5CC4 90 03 00 04 */ stw r0, 4(r3) -/* 800A8D68 000A5CC8 4E 80 00 20 */ blr +/* 800A8D68 000A5CC8 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR15CGameProjectile" "Visit__29TCastToPtr<15CScriptPlatform>FR15CGameProjectile": /* 800A8D6C 000A5CCC 38 00 00 00 */ li r0, 0 /* 800A8D70 000A5CD0 90 03 00 04 */ stw r0, 4(r3) -/* 800A8D74 000A5CD4 4E 80 00 20 */ blr +/* 800A8D74 000A5CD4 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR10CGameLight" "Visit__29TCastToPtr<15CScriptPlatform>FR10CGameLight": /* 800A8D78 000A5CD8 38 00 00 00 */ li r0, 0 /* 800A8D7C 000A5CDC 90 03 00 04 */ stw r0, 4(r3) -/* 800A8D80 000A5CE0 4E 80 00 20 */ blr +/* 800A8D80 000A5CE0 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR11CGameCamera" "Visit__29TCastToPtr<15CScriptPlatform>FR11CGameCamera": /* 800A8D84 000A5CE4 38 00 00 00 */ li r0, 0 /* 800A8D88 000A5CE8 90 03 00 04 */ stw r0, 4(r3) -/* 800A8D8C 000A5CEC 4E 80 00 20 */ blr +/* 800A8D8C 000A5CEC 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR10CFishCloud" "Visit__29TCastToPtr<15CScriptPlatform>FR10CFishCloud": /* 800A8D90 000A5CF0 38 00 00 00 */ li r0, 0 /* 800A8D94 000A5CF4 90 03 00 04 */ stw r0, 4(r3) -/* 800A8D98 000A5CF8 4E 80 00 20 */ blr +/* 800A8D98 000A5CF8 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR18CFirstPersonCamera" "Visit__29TCastToPtr<15CScriptPlatform>FR18CFirstPersonCamera": /* 800A8D9C 000A5CFC 38 00 00 00 */ li r0, 0 /* 800A8DA0 000A5D00 90 03 00 04 */ stw r0, 4(r3) -/* 800A8DA4 000A5D04 4E 80 00 20 */ blr +/* 800A8DA4 000A5D04 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR10CExplosion" "Visit__29TCastToPtr<15CScriptPlatform>FR10CExplosion": /* 800A8DA8 000A5D08 38 00 00 00 */ li r0, 0 /* 800A8DAC 000A5D0C 90 03 00 04 */ stw r0, 4(r3) -/* 800A8DB0 000A5D10 4E 80 00 20 */ blr +/* 800A8DB0 000A5D10 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR7CEntity" "Visit__29TCastToPtr<15CScriptPlatform>FR7CEntity": /* 800A8DB4 000A5D14 38 00 00 00 */ li r0, 0 /* 800A8DB8 000A5D18 90 03 00 04 */ stw r0, 4(r3) -/* 800A8DBC 000A5D1C 4E 80 00 20 */ blr +/* 800A8DBC 000A5D1C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR17CEnergyProjectile" "Visit__29TCastToPtr<15CScriptPlatform>FR17CEnergyProjectile": /* 800A8DC0 000A5D20 38 00 00 00 */ li r0, 0 /* 800A8DC4 000A5D24 90 03 00 04 */ stw r0, 4(r3) -/* 800A8DC8 000A5D28 4E 80 00 20 */ blr +/* 800A8DC8 000A5D28 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR16CDestroyableRock" "Visit__29TCastToPtr<15CScriptPlatform>FR16CDestroyableRock": /* 800A8DCC 000A5D2C 38 00 00 00 */ li r0, 0 /* 800A8DD0 000A5D30 90 03 00 04 */ stw r0, 4(r3) -/* 800A8DD4 000A5D34 4E 80 00 20 */ blr +/* 800A8DD4 000A5D34 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR15CCollisionActor" "Visit__29TCastToPtr<15CScriptPlatform>FR15CCollisionActor": /* 800A8DD8 000A5D38 38 00 00 00 */ li r0, 0 /* 800A8DDC 000A5D3C 90 03 00 04 */ stw r0, 4(r3) -/* 800A8DE0 000A5D40 4E 80 00 20 */ blr +/* 800A8DE0 000A5D40 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR16CCinematicCamera" "Visit__29TCastToPtr<15CScriptPlatform>FR16CCinematicCamera": /* 800A8DE4 000A5D44 38 00 00 00 */ li r0, 0 /* 800A8DE8 000A5D48 90 03 00 04 */ stw r0, 4(r3) -/* 800A8DEC 000A5D4C 4E 80 00 20 */ blr +/* 800A8DEC 000A5D4C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR5CBomb" "Visit__29TCastToPtr<15CScriptPlatform>FR5CBomb": /* 800A8DF0 000A5D50 38 00 00 00 */ li r0, 0 /* 800A8DF4 000A5D54 90 03 00 04 */ stw r0, 4(r3) -/* 800A8DF8 000A5D58 4E 80 00 20 */ blr +/* 800A8DF8 000A5D58 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR11CBallCamera" "Visit__29TCastToPtr<15CScriptPlatform>FR11CBallCamera": /* 800A8DFC 000A5D5C 38 00 00 00 */ li r0, 0 /* 800A8E00 000A5D60 90 03 00 04 */ stw r0, 4(r3) -/* 800A8E04 000A5D64 4E 80 00 20 */ blr +/* 800A8E04 000A5D64 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptPlatform>FR6CActor" "Visit__29TCastToPtr<15CScriptPlatform>FR6CActor": /* 800A8E08 000A5D68 38 00 00 00 */ li r0, 0 /* 800A8E0C 000A5D6C 90 03 00 04 */ stw r0, 4(r3) -/* 800A8E10 000A5D70 4E 80 00 20 */ blr +/* 800A8E10 000A5D70 4E 80 00 20 */ blr .global "__ct__29TCastToPtr<15CScriptPlatform>FP7CEntity" "__ct__29TCastToPtr<15CScriptPlatform>FP7CEntity": @@ -10173,14 +10173,14 @@ lbl_800A8B54: /* 800A8E58 000A5DB8 81 83 00 00 */ lwz r12, 0(r3) /* 800A8E5C 000A5DBC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800A8E60 000A5DC0 7D 89 03 A6 */ mtctr r12 -/* 800A8E64 000A5DC4 4E 80 04 21 */ bctrl +/* 800A8E64 000A5DC4 4E 80 04 21 */ bctrl lbl_800A8E68: /* 800A8E68 000A5DC8 80 01 00 14 */ lwz r0, 0x14(r1) /* 800A8E6C 000A5DCC 7F E3 FB 78 */ mr r3, r31 /* 800A8E70 000A5DD0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800A8E74 000A5DD4 7C 08 03 A6 */ mtlr r0 /* 800A8E78 000A5DD8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A8E7C 000A5DDC 4E 80 00 20 */ blr +/* 800A8E7C 000A5DDC 4E 80 00 20 */ blr .global "__ct__29TCastToPtr<15CScriptPlatform>FR7CEntity" "__ct__29TCastToPtr<15CScriptPlatform>FR7CEntity": @@ -10202,354 +10202,354 @@ lbl_800A8E68: /* 800A8EBC 000A5E1C 81 83 00 00 */ lwz r12, 0(r3) /* 800A8EC0 000A5E20 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800A8EC4 000A5E24 7D 89 03 A6 */ mtctr r12 -/* 800A8EC8 000A5E28 4E 80 04 21 */ bctrl +/* 800A8EC8 000A5E28 4E 80 04 21 */ bctrl /* 800A8ECC 000A5E2C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800A8ED0 000A5E30 7F E3 FB 78 */ mr r3, r31 /* 800A8ED4 000A5E34 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800A8ED8 000A5E38 7C 08 03 A6 */ mtlr r0 /* 800A8EDC 000A5E3C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A8EE0 000A5E40 4E 80 00 20 */ blr +/* 800A8EE0 000A5E40 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR7CWeapon" "Visit__27TCastToPtr<13CScriptPickup>FR7CWeapon": /* 800A8EE4 000A5E44 38 00 00 00 */ li r0, 0 /* 800A8EE8 000A5E48 90 03 00 04 */ stw r0, 4(r3) -/* 800A8EEC 000A5E4C 4E 80 00 20 */ blr +/* 800A8EEC 000A5E4C 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR17CWallCrawlerSwarm" "Visit__27TCastToPtr<13CScriptPickup>FR17CWallCrawlerSwarm": /* 800A8EF0 000A5E50 38 00 00 00 */ li r0, 0 /* 800A8EF4 000A5E54 90 03 00 04 */ stw r0, 4(r3) -/* 800A8EF8 000A5E58 4E 80 00 20 */ blr +/* 800A8EF8 000A5E58 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR20CScriptSpindleCamera" "Visit__27TCastToPtr<13CScriptPickup>FR20CScriptSpindleCamera": /* 800A8EFC 000A5E5C 38 00 00 00 */ li r0, 0 /* 800A8F00 000A5E60 90 03 00 04 */ stw r0, 4(r3) -/* 800A8F04 000A5E64 4E 80 00 20 */ blr +/* 800A8F04 000A5E64 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR15CSnakeWeedSwarm" "Visit__27TCastToPtr<13CScriptPickup>FR15CSnakeWeedSwarm": /* 800A8F08 000A5E68 38 00 00 00 */ li r0, 0 /* 800A8F0C 000A5E6C 90 03 00 04 */ stw r0, 4(r3) -/* 800A8F10 000A5E70 4E 80 00 20 */ blr +/* 800A8F10 000A5E70 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR15CScriptWaypoint" "Visit__27TCastToPtr<13CScriptPickup>FR15CScriptWaypoint": /* 800A8F14 000A5E74 38 00 00 00 */ li r0, 0 /* 800A8F18 000A5E78 90 03 00 04 */ stw r0, 4(r3) -/* 800A8F1C 000A5E7C 4E 80 00 20 */ blr +/* 800A8F1C 000A5E7C 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR12CScriptWater" "Visit__27TCastToPtr<13CScriptPickup>FR12CScriptWater": /* 800A8F20 000A5E80 38 00 00 00 */ li r0, 0 /* 800A8F24 000A5E84 90 03 00 04 */ stw r0, 4(r3) -/* 800A8F28 000A5E88 4E 80 00 20 */ blr +/* 800A8F28 000A5E88 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR17CScriptVisorFlare" "Visit__27TCastToPtr<13CScriptPickup>FR17CScriptVisorFlare": /* 800A8F2C 000A5E8C 38 00 00 00 */ li r0, 0 /* 800A8F30 000A5E90 90 03 00 04 */ stw r0, 4(r3) -/* 800A8F34 000A5E94 4E 80 00 20 */ blr +/* 800A8F34 000A5E94 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR14CScriptTrigger" "Visit__27TCastToPtr<13CScriptPickup>FR14CScriptTrigger": /* 800A8F38 000A5E98 38 00 00 00 */ li r0, 0 /* 800A8F3C 000A5E9C 90 03 00 04 */ stw r0, 4(r3) -/* 800A8F40 000A5EA0 4E 80 00 20 */ blr +/* 800A8F40 000A5EA0 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR12CScriptTimer" "Visit__27TCastToPtr<13CScriptPickup>FR12CScriptTimer": /* 800A8F44 000A5EA4 38 00 00 00 */ li r0, 0 /* 800A8F48 000A5EA8 90 03 00 04 */ stw r0, 4(r3) -/* 800A8F4C 000A5EAC 4E 80 00 20 */ blr +/* 800A8F4C 000A5EAC 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR10CTeamAiMgr" "Visit__27TCastToPtr<13CScriptPickup>FR10CTeamAiMgr": /* 800A8F50 000A5EB0 38 00 00 00 */ li r0, 0 /* 800A8F54 000A5EB4 90 03 00 04 */ stw r0, 4(r3) -/* 800A8F58 000A5EB8 4E 80 00 20 */ blr +/* 800A8F58 000A5EB8 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR21CScriptTargetingPoint" "Visit__27TCastToPtr<13CScriptPickup>FR21CScriptTargetingPoint": /* 800A8F5C 000A5EBC 38 00 00 00 */ li r0, 0 /* 800A8F60 000A5EC0 90 03 00 04 */ stw r0, 4(r3) -/* 800A8F64 000A5EC4 4E 80 00 20 */ blr +/* 800A8F64 000A5EC4 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR25CScriptSpiderBallWaypoint" "Visit__27TCastToPtr<13CScriptPickup>FR25CScriptSpiderBallWaypoint": /* 800A8F68 000A5EC8 38 00 00 00 */ li r0, 0 /* 800A8F6C 000A5ECC 90 03 00 04 */ stw r0, 4(r3) -/* 800A8F70 000A5ED0 4E 80 00 20 */ blr +/* 800A8F70 000A5ED0 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR34CScriptSpiderBallAttractionSurface" "Visit__27TCastToPtr<13CScriptPickup>FR34CScriptSpiderBallAttractionSurface": /* 800A8F74 000A5ED4 38 00 00 00 */ li r0, 0 /* 800A8F78 000A5ED8 90 03 00 04 */ stw r0, 4(r3) -/* 800A8F7C 000A5EDC 4E 80 00 20 */ blr +/* 800A8F7C 000A5EDC 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR22CScriptSpecialFunction" "Visit__27TCastToPtr<13CScriptPickup>FR22CScriptSpecialFunction": /* 800A8F80 000A5EE0 38 00 00 00 */ li r0, 0 /* 800A8F84 000A5EE4 90 03 00 04 */ stw r0, 4(r3) -/* 800A8F88 000A5EE8 4E 80 00 20 */ blr +/* 800A8F88 000A5EE8 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR17CScriptSpawnPoint" "Visit__27TCastToPtr<13CScriptPickup>FR17CScriptSpawnPoint": /* 800A8F8C 000A5EEC 38 00 00 00 */ li r0, 0 /* 800A8F90 000A5EF0 90 03 00 04 */ stw r0, 4(r3) -/* 800A8F94 000A5EF4 4E 80 00 20 */ blr +/* 800A8F94 000A5EF4 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR12CScriptSound" "Visit__27TCastToPtr<13CScriptPickup>FR12CScriptSound": /* 800A8F98 000A5EF8 38 00 00 00 */ li r0, 0 /* 800A8F9C 000A5EFC 90 03 00 04 */ stw r0, 4(r3) -/* 800A8FA0 000A5F00 4E 80 00 20 */ blr +/* 800A8FA0 000A5F00 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR20CScriptRoomAcoustics" "Visit__27TCastToPtr<13CScriptPickup>FR20CScriptRoomAcoustics": /* 800A8FA4 000A5F04 38 00 00 00 */ li r0, 0 /* 800A8FA8 000A5F08 90 03 00 04 */ stw r0, 4(r3) -/* 800A8FAC 000A5F0C 4E 80 00 20 */ blr +/* 800A8FAC 000A5F0C 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR22CScriptPointOfinterest" "Visit__27TCastToPtr<13CScriptPickup>FR22CScriptPointOfinterest": /* 800A8FB0 000A5F10 38 00 00 00 */ li r0, 0 /* 800A8FB4 000A5F14 90 03 00 04 */ stw r0, 4(r3) -/* 800A8FB8 000A5F18 4E 80 00 20 */ blr +/* 800A8FB8 000A5F18 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR17CScriptPlayerHint" "Visit__27TCastToPtr<13CScriptPickup>FR17CScriptPlayerHint": /* 800A8FBC 000A5F1C 38 00 00 00 */ li r0, 0 /* 800A8FC0 000A5F20 90 03 00 04 */ stw r0, 4(r3) -/* 800A8FC4 000A5F24 4E 80 00 20 */ blr +/* 800A8FC4 000A5F24 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR15CScriptPlatform" "Visit__27TCastToPtr<13CScriptPickup>FR15CScriptPlatform": /* 800A8FC8 000A5F28 38 00 00 00 */ li r0, 0 /* 800A8FCC 000A5F2C 90 03 00 04 */ stw r0, 4(r3) -/* 800A8FD0 000A5F30 4E 80 00 20 */ blr +/* 800A8FD0 000A5F30 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR13CScriptPickup" "Visit__27TCastToPtr<13CScriptPickup>FR13CScriptPickup": /* 800A8FD4 000A5F34 90 83 00 04 */ stw r4, 4(r3) -/* 800A8FD8 000A5F38 4E 80 00 20 */ blr +/* 800A8FD8 000A5F38 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR15CScriptMazeNode" "Visit__27TCastToPtr<13CScriptPickup>FR15CScriptMazeNode": /* 800A8FDC 000A5F3C 38 00 00 00 */ li r0, 0 /* 800A8FE0 000A5F40 90 03 00 04 */ stw r0, 4(r3) -/* 800A8FE4 000A5F44 4E 80 00 20 */ blr +/* 800A8FE4 000A5F44 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR16CScriptGunTurret" "Visit__27TCastToPtr<13CScriptPickup>FR16CScriptGunTurret": /* 800A8FE8 000A5F48 38 00 00 00 */ li r0, 0 /* 800A8FEC 000A5F4C 90 03 00 04 */ stw r0, 4(r3) -/* 800A8FF0 000A5F50 4E 80 00 20 */ blr +/* 800A8FF0 000A5F50 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR19CScriptGrapplePoint" "Visit__27TCastToPtr<13CScriptPickup>FR19CScriptGrapplePoint": /* 800A8FF4 000A5F54 38 00 00 00 */ li r0, 0 /* 800A8FF8 000A5F58 90 03 00 04 */ stw r0, 4(r3) -/* 800A8FFC 000A5F5C 4E 80 00 20 */ blr +/* 800A8FFC 000A5F5C 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR13CScriptEffect" "Visit__27TCastToPtr<13CScriptPickup>FR13CScriptEffect": /* 800A9000 000A5F60 38 00 00 00 */ li r0, 0 /* 800A9004 000A5F64 90 03 00 04 */ stw r0, 4(r3) -/* 800A9008 000A5F68 4E 80 00 20 */ blr +/* 800A9008 000A5F68 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR11CScriptDoor" "Visit__27TCastToPtr<13CScriptPickup>FR11CScriptDoor": /* 800A900C 000A5F6C 38 00 00 00 */ li r0, 0 /* 800A9010 000A5F70 90 03 00 04 */ stw r0, 4(r3) -/* 800A9014 000A5F74 4E 80 00 20 */ blr +/* 800A9014 000A5F74 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR11CScriptDock" "Visit__27TCastToPtr<13CScriptPickup>FR11CScriptDock": /* 800A9018 000A5F78 38 00 00 00 */ li r0, 0 /* 800A901C 000A5F7C 90 03 00 04 */ stw r0, 4(r3) -/* 800A9020 000A5F80 4E 80 00 20 */ blr +/* 800A9020 000A5F80 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR18CScriptDistanceFog" "Visit__27TCastToPtr<13CScriptPickup>FR18CScriptDistanceFog": /* 800A9024 000A5F84 38 00 00 00 */ li r0, 0 /* 800A9028 000A5F88 90 03 00 04 */ stw r0, 4(r3) -/* 800A902C 000A5F8C 4E 80 00 20 */ blr +/* 800A902C 000A5F8C 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR26CScriptDebugCameraWaypoint" "Visit__27TCastToPtr<13CScriptPickup>FR26CScriptDebugCameraWaypoint": /* 800A9030 000A5F90 38 00 00 00 */ li r0, 0 /* 800A9034 000A5F94 90 03 00 04 */ stw r0, 4(r3) -/* 800A9038 000A5F98 4E 80 00 20 */ blr +/* 800A9038 000A5F98 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR17CScriptCoverPoint" "Visit__27TCastToPtr<13CScriptPickup>FR17CScriptCoverPoint": /* 800A903C 000A5F9C 38 00 00 00 */ li r0, 0 /* 800A9040 000A5FA0 90 03 00 04 */ stw r0, 4(r3) -/* 800A9044 000A5FA4 4E 80 00 20 */ blr +/* 800A9044 000A5FA4 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR21CScriptCameraWaypoint" "Visit__27TCastToPtr<13CScriptPickup>FR21CScriptCameraWaypoint": /* 800A9048 000A5FA8 38 00 00 00 */ li r0, 0 /* 800A904C 000A5FAC 90 03 00 04 */ stw r0, 4(r3) -/* 800A9050 000A5FB0 4E 80 00 20 */ blr +/* 800A9050 000A5FB0 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR24CScriptCameraPitchVolume" "Visit__27TCastToPtr<13CScriptPickup>FR24CScriptCameraPitchVolume": /* 800A9054 000A5FB4 38 00 00 00 */ li r0, 0 /* 800A9058 000A5FB8 90 03 00 04 */ stw r0, 4(r3) -/* 800A905C 000A5FBC 4E 80 00 20 */ blr +/* 800A905C 000A5FBC 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR17CScriptCameraHint" "Visit__27TCastToPtr<13CScriptPickup>FR17CScriptCameraHint": /* 800A9060 000A5FC0 38 00 00 00 */ li r0, 0 /* 800A9064 000A5FC4 90 03 00 04 */ stw r0, 4(r3) -/* 800A9068 000A5FC8 4E 80 00 20 */ blr +/* 800A9068 000A5FC8 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR18CScriptAiJumpPoint" "Visit__27TCastToPtr<13CScriptPickup>FR18CScriptAiJumpPoint": /* 800A906C 000A5FCC 38 00 00 00 */ li r0, 0 /* 800A9070 000A5FD0 90 03 00 04 */ stw r0, 4(r3) -/* 800A9074 000A5FD4 4E 80 00 20 */ blr +/* 800A9074 000A5FD4 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR20CScriptActorKeyframe" "Visit__27TCastToPtr<13CScriptPickup>FR20CScriptActorKeyframe": /* 800A9078 000A5FD8 38 00 00 00 */ li r0, 0 /* 800A907C 000A5FDC 90 03 00 04 */ stw r0, 4(r3) -/* 800A9080 000A5FE0 4E 80 00 20 */ blr +/* 800A9080 000A5FE0 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR12CScriptActor" "Visit__27TCastToPtr<13CScriptPickup>FR12CScriptActor": /* 800A9084 000A5FE4 38 00 00 00 */ li r0, 0 /* 800A9088 000A5FE8 90 03 00 04 */ stw r0, 4(r3) -/* 800A908C 000A5FEC 4E 80 00 20 */ blr +/* 800A908C 000A5FEC 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR9CRepulsor" "Visit__27TCastToPtr<13CScriptPickup>FR9CRepulsor": /* 800A9090 000A5FF0 38 00 00 00 */ li r0, 0 /* 800A9094 000A5FF4 90 03 00 04 */ stw r0, 4(r3) -/* 800A9098 000A5FF8 4E 80 00 20 */ blr +/* 800A9098 000A5FF8 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR7CPlayer" "Visit__27TCastToPtr<13CScriptPickup>FR7CPlayer": /* 800A909C 000A5FFC 38 00 00 00 */ li r0, 0 /* 800A90A0 000A6000 90 03 00 04 */ stw r0, 4(r3) -/* 800A90A4 000A6004 4E 80 00 20 */ blr +/* 800A90A4 000A6004 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR13CPhysicsActor" "Visit__27TCastToPtr<13CScriptPickup>FR13CPhysicsActor": /* 800A90A8 000A6008 38 00 00 00 */ li r0, 0 /* 800A90AC 000A600C 90 03 00 04 */ stw r0, 4(r3) -/* 800A90B0 000A6010 4E 80 00 20 */ blr +/* 800A90B0 000A6010 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR3CAi" "Visit__27TCastToPtr<13CScriptPickup>FR3CAi": /* 800A90B4 000A6014 38 00 00 00 */ li r0, 0 /* 800A90B8 000A6018 90 03 00 04 */ stw r0, 4(r3) -/* 800A90BC 000A601C 4E 80 00 20 */ blr +/* 800A90BC 000A601C 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR11CPathCamera" "Visit__27TCastToPtr<13CScriptPickup>FR11CPathCamera": /* 800A90C0 000A6020 38 00 00 00 */ li r0, 0 /* 800A90C4 000A6024 90 03 00 04 */ stw r0, 4(r3) -/* 800A90C8 000A6028 4E 80 00 20 */ blr +/* 800A90C8 000A6028 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR18CMetroidPrimeRelay" "Visit__27TCastToPtr<13CScriptPickup>FR18CMetroidPrimeRelay": /* 800A90CC 000A602C 38 00 00 00 */ li r0, 0 /* 800A90D0 000A6030 90 03 00 04 */ stw r0, 4(r3) -/* 800A90D4 000A6034 4E 80 00 20 */ blr +/* 800A90D4 000A6034 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR19CHUDBillboardEffect" "Visit__27TCastToPtr<13CScriptPickup>FR19CHUDBillboardEffect": /* 800A90D8 000A6038 38 00 00 00 */ li r0, 0 /* 800A90DC 000A603C 90 03 00 04 */ stw r0, 4(r3) -/* 800A90E0 000A6040 4E 80 00 20 */ blr +/* 800A90E0 000A6040 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR15CGameProjectile" "Visit__27TCastToPtr<13CScriptPickup>FR15CGameProjectile": /* 800A90E4 000A6044 38 00 00 00 */ li r0, 0 /* 800A90E8 000A6048 90 03 00 04 */ stw r0, 4(r3) -/* 800A90EC 000A604C 4E 80 00 20 */ blr +/* 800A90EC 000A604C 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR10CGameLight" "Visit__27TCastToPtr<13CScriptPickup>FR10CGameLight": /* 800A90F0 000A6050 38 00 00 00 */ li r0, 0 /* 800A90F4 000A6054 90 03 00 04 */ stw r0, 4(r3) -/* 800A90F8 000A6058 4E 80 00 20 */ blr +/* 800A90F8 000A6058 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR11CGameCamera" "Visit__27TCastToPtr<13CScriptPickup>FR11CGameCamera": /* 800A90FC 000A605C 38 00 00 00 */ li r0, 0 /* 800A9100 000A6060 90 03 00 04 */ stw r0, 4(r3) -/* 800A9104 000A6064 4E 80 00 20 */ blr +/* 800A9104 000A6064 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR10CFishCloud" "Visit__27TCastToPtr<13CScriptPickup>FR10CFishCloud": /* 800A9108 000A6068 38 00 00 00 */ li r0, 0 /* 800A910C 000A606C 90 03 00 04 */ stw r0, 4(r3) -/* 800A9110 000A6070 4E 80 00 20 */ blr +/* 800A9110 000A6070 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR18CFirstPersonCamera" "Visit__27TCastToPtr<13CScriptPickup>FR18CFirstPersonCamera": /* 800A9114 000A6074 38 00 00 00 */ li r0, 0 /* 800A9118 000A6078 90 03 00 04 */ stw r0, 4(r3) -/* 800A911C 000A607C 4E 80 00 20 */ blr +/* 800A911C 000A607C 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR10CExplosion" "Visit__27TCastToPtr<13CScriptPickup>FR10CExplosion": /* 800A9120 000A6080 38 00 00 00 */ li r0, 0 /* 800A9124 000A6084 90 03 00 04 */ stw r0, 4(r3) -/* 800A9128 000A6088 4E 80 00 20 */ blr +/* 800A9128 000A6088 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR7CEntity" "Visit__27TCastToPtr<13CScriptPickup>FR7CEntity": /* 800A912C 000A608C 38 00 00 00 */ li r0, 0 /* 800A9130 000A6090 90 03 00 04 */ stw r0, 4(r3) -/* 800A9134 000A6094 4E 80 00 20 */ blr +/* 800A9134 000A6094 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR17CEnergyProjectile" "Visit__27TCastToPtr<13CScriptPickup>FR17CEnergyProjectile": /* 800A9138 000A6098 38 00 00 00 */ li r0, 0 /* 800A913C 000A609C 90 03 00 04 */ stw r0, 4(r3) -/* 800A9140 000A60A0 4E 80 00 20 */ blr +/* 800A9140 000A60A0 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR16CDestroyableRock" "Visit__27TCastToPtr<13CScriptPickup>FR16CDestroyableRock": /* 800A9144 000A60A4 38 00 00 00 */ li r0, 0 /* 800A9148 000A60A8 90 03 00 04 */ stw r0, 4(r3) -/* 800A914C 000A60AC 4E 80 00 20 */ blr +/* 800A914C 000A60AC 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR15CCollisionActor" "Visit__27TCastToPtr<13CScriptPickup>FR15CCollisionActor": /* 800A9150 000A60B0 38 00 00 00 */ li r0, 0 /* 800A9154 000A60B4 90 03 00 04 */ stw r0, 4(r3) -/* 800A9158 000A60B8 4E 80 00 20 */ blr +/* 800A9158 000A60B8 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR16CCinematicCamera" "Visit__27TCastToPtr<13CScriptPickup>FR16CCinematicCamera": /* 800A915C 000A60BC 38 00 00 00 */ li r0, 0 /* 800A9160 000A60C0 90 03 00 04 */ stw r0, 4(r3) -/* 800A9164 000A60C4 4E 80 00 20 */ blr +/* 800A9164 000A60C4 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR5CBomb" "Visit__27TCastToPtr<13CScriptPickup>FR5CBomb": /* 800A9168 000A60C8 38 00 00 00 */ li r0, 0 /* 800A916C 000A60CC 90 03 00 04 */ stw r0, 4(r3) -/* 800A9170 000A60D0 4E 80 00 20 */ blr +/* 800A9170 000A60D0 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR11CBallCamera" "Visit__27TCastToPtr<13CScriptPickup>FR11CBallCamera": /* 800A9174 000A60D4 38 00 00 00 */ li r0, 0 /* 800A9178 000A60D8 90 03 00 04 */ stw r0, 4(r3) -/* 800A917C 000A60DC 4E 80 00 20 */ blr +/* 800A917C 000A60DC 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptPickup>FR6CActor" "Visit__27TCastToPtr<13CScriptPickup>FR6CActor": /* 800A9180 000A60E0 38 00 00 00 */ li r0, 0 /* 800A9184 000A60E4 90 03 00 04 */ stw r0, 4(r3) -/* 800A9188 000A60E8 4E 80 00 20 */ blr +/* 800A9188 000A60E8 4E 80 00 20 */ blr .global "__ct__27TCastToPtr<13CScriptPickup>FP7CEntity" "__ct__27TCastToPtr<13CScriptPickup>FP7CEntity": @@ -10573,355 +10573,355 @@ lbl_800A8E68: /* 800A91D0 000A6130 81 83 00 00 */ lwz r12, 0(r3) /* 800A91D4 000A6134 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800A91D8 000A6138 7D 89 03 A6 */ mtctr r12 -/* 800A91DC 000A613C 4E 80 04 21 */ bctrl +/* 800A91DC 000A613C 4E 80 04 21 */ bctrl lbl_800A91E0: /* 800A91E0 000A6140 80 01 00 14 */ lwz r0, 0x14(r1) /* 800A91E4 000A6144 7F E3 FB 78 */ mr r3, r31 /* 800A91E8 000A6148 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800A91EC 000A614C 7C 08 03 A6 */ mtlr r0 /* 800A91F0 000A6150 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A91F4 000A6154 4E 80 00 20 */ blr +/* 800A91F4 000A6154 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR7CWeapon" "Visit__29TCastToPtr<15CScriptMazeNode>FR7CWeapon": /* 800A91F8 000A6158 38 00 00 00 */ li r0, 0 /* 800A91FC 000A615C 90 03 00 04 */ stw r0, 4(r3) -/* 800A9200 000A6160 4E 80 00 20 */ blr +/* 800A9200 000A6160 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR17CWallCrawlerSwarm" "Visit__29TCastToPtr<15CScriptMazeNode>FR17CWallCrawlerSwarm": /* 800A9204 000A6164 38 00 00 00 */ li r0, 0 /* 800A9208 000A6168 90 03 00 04 */ stw r0, 4(r3) -/* 800A920C 000A616C 4E 80 00 20 */ blr +/* 800A920C 000A616C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR20CScriptSpindleCamera" "Visit__29TCastToPtr<15CScriptMazeNode>FR20CScriptSpindleCamera": /* 800A9210 000A6170 38 00 00 00 */ li r0, 0 /* 800A9214 000A6174 90 03 00 04 */ stw r0, 4(r3) -/* 800A9218 000A6178 4E 80 00 20 */ blr +/* 800A9218 000A6178 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR15CSnakeWeedSwarm" "Visit__29TCastToPtr<15CScriptMazeNode>FR15CSnakeWeedSwarm": /* 800A921C 000A617C 38 00 00 00 */ li r0, 0 /* 800A9220 000A6180 90 03 00 04 */ stw r0, 4(r3) -/* 800A9224 000A6184 4E 80 00 20 */ blr +/* 800A9224 000A6184 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR15CScriptWaypoint" "Visit__29TCastToPtr<15CScriptMazeNode>FR15CScriptWaypoint": /* 800A9228 000A6188 38 00 00 00 */ li r0, 0 /* 800A922C 000A618C 90 03 00 04 */ stw r0, 4(r3) -/* 800A9230 000A6190 4E 80 00 20 */ blr +/* 800A9230 000A6190 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR12CScriptWater" "Visit__29TCastToPtr<15CScriptMazeNode>FR12CScriptWater": /* 800A9234 000A6194 38 00 00 00 */ li r0, 0 /* 800A9238 000A6198 90 03 00 04 */ stw r0, 4(r3) -/* 800A923C 000A619C 4E 80 00 20 */ blr +/* 800A923C 000A619C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR17CScriptVisorFlare" "Visit__29TCastToPtr<15CScriptMazeNode>FR17CScriptVisorFlare": /* 800A9240 000A61A0 38 00 00 00 */ li r0, 0 /* 800A9244 000A61A4 90 03 00 04 */ stw r0, 4(r3) -/* 800A9248 000A61A8 4E 80 00 20 */ blr +/* 800A9248 000A61A8 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR14CScriptTrigger" "Visit__29TCastToPtr<15CScriptMazeNode>FR14CScriptTrigger": /* 800A924C 000A61AC 38 00 00 00 */ li r0, 0 /* 800A9250 000A61B0 90 03 00 04 */ stw r0, 4(r3) -/* 800A9254 000A61B4 4E 80 00 20 */ blr +/* 800A9254 000A61B4 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR12CScriptTimer" "Visit__29TCastToPtr<15CScriptMazeNode>FR12CScriptTimer": /* 800A9258 000A61B8 38 00 00 00 */ li r0, 0 /* 800A925C 000A61BC 90 03 00 04 */ stw r0, 4(r3) -/* 800A9260 000A61C0 4E 80 00 20 */ blr +/* 800A9260 000A61C0 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR10CTeamAiMgr" "Visit__29TCastToPtr<15CScriptMazeNode>FR10CTeamAiMgr": /* 800A9264 000A61C4 38 00 00 00 */ li r0, 0 /* 800A9268 000A61C8 90 03 00 04 */ stw r0, 4(r3) -/* 800A926C 000A61CC 4E 80 00 20 */ blr +/* 800A926C 000A61CC 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR21CScriptTargetingPoint" "Visit__29TCastToPtr<15CScriptMazeNode>FR21CScriptTargetingPoint": /* 800A9270 000A61D0 38 00 00 00 */ li r0, 0 /* 800A9274 000A61D4 90 03 00 04 */ stw r0, 4(r3) -/* 800A9278 000A61D8 4E 80 00 20 */ blr +/* 800A9278 000A61D8 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR25CScriptSpiderBallWaypoint" "Visit__29TCastToPtr<15CScriptMazeNode>FR25CScriptSpiderBallWaypoint": /* 800A927C 000A61DC 38 00 00 00 */ li r0, 0 /* 800A9280 000A61E0 90 03 00 04 */ stw r0, 4(r3) -/* 800A9284 000A61E4 4E 80 00 20 */ blr +/* 800A9284 000A61E4 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR34CScriptSpiderBallAttractionSurface" "Visit__29TCastToPtr<15CScriptMazeNode>FR34CScriptSpiderBallAttractionSurface": /* 800A9288 000A61E8 38 00 00 00 */ li r0, 0 /* 800A928C 000A61EC 90 03 00 04 */ stw r0, 4(r3) -/* 800A9290 000A61F0 4E 80 00 20 */ blr +/* 800A9290 000A61F0 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR22CScriptSpecialFunction" "Visit__29TCastToPtr<15CScriptMazeNode>FR22CScriptSpecialFunction": /* 800A9294 000A61F4 38 00 00 00 */ li r0, 0 /* 800A9298 000A61F8 90 03 00 04 */ stw r0, 4(r3) -/* 800A929C 000A61FC 4E 80 00 20 */ blr +/* 800A929C 000A61FC 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR17CScriptSpawnPoint" "Visit__29TCastToPtr<15CScriptMazeNode>FR17CScriptSpawnPoint": /* 800A92A0 000A6200 38 00 00 00 */ li r0, 0 /* 800A92A4 000A6204 90 03 00 04 */ stw r0, 4(r3) -/* 800A92A8 000A6208 4E 80 00 20 */ blr +/* 800A92A8 000A6208 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR12CScriptSound" "Visit__29TCastToPtr<15CScriptMazeNode>FR12CScriptSound": /* 800A92AC 000A620C 38 00 00 00 */ li r0, 0 /* 800A92B0 000A6210 90 03 00 04 */ stw r0, 4(r3) -/* 800A92B4 000A6214 4E 80 00 20 */ blr +/* 800A92B4 000A6214 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR20CScriptRoomAcoustics" "Visit__29TCastToPtr<15CScriptMazeNode>FR20CScriptRoomAcoustics": /* 800A92B8 000A6218 38 00 00 00 */ li r0, 0 /* 800A92BC 000A621C 90 03 00 04 */ stw r0, 4(r3) -/* 800A92C0 000A6220 4E 80 00 20 */ blr +/* 800A92C0 000A6220 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR22CScriptPointOfinterest" "Visit__29TCastToPtr<15CScriptMazeNode>FR22CScriptPointOfinterest": /* 800A92C4 000A6224 38 00 00 00 */ li r0, 0 /* 800A92C8 000A6228 90 03 00 04 */ stw r0, 4(r3) -/* 800A92CC 000A622C 4E 80 00 20 */ blr +/* 800A92CC 000A622C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR17CScriptPlayerHint" "Visit__29TCastToPtr<15CScriptMazeNode>FR17CScriptPlayerHint": /* 800A92D0 000A6230 38 00 00 00 */ li r0, 0 /* 800A92D4 000A6234 90 03 00 04 */ stw r0, 4(r3) -/* 800A92D8 000A6238 4E 80 00 20 */ blr +/* 800A92D8 000A6238 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR15CScriptPlatform" "Visit__29TCastToPtr<15CScriptMazeNode>FR15CScriptPlatform": /* 800A92DC 000A623C 38 00 00 00 */ li r0, 0 /* 800A92E0 000A6240 90 03 00 04 */ stw r0, 4(r3) -/* 800A92E4 000A6244 4E 80 00 20 */ blr +/* 800A92E4 000A6244 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR13CScriptPickup" "Visit__29TCastToPtr<15CScriptMazeNode>FR13CScriptPickup": /* 800A92E8 000A6248 38 00 00 00 */ li r0, 0 /* 800A92EC 000A624C 90 03 00 04 */ stw r0, 4(r3) -/* 800A92F0 000A6250 4E 80 00 20 */ blr +/* 800A92F0 000A6250 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR15CScriptMazeNode" "Visit__29TCastToPtr<15CScriptMazeNode>FR15CScriptMazeNode": /* 800A92F4 000A6254 90 83 00 04 */ stw r4, 4(r3) -/* 800A92F8 000A6258 4E 80 00 20 */ blr +/* 800A92F8 000A6258 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR16CScriptGunTurret" "Visit__29TCastToPtr<15CScriptMazeNode>FR16CScriptGunTurret": /* 800A92FC 000A625C 38 00 00 00 */ li r0, 0 /* 800A9300 000A6260 90 03 00 04 */ stw r0, 4(r3) -/* 800A9304 000A6264 4E 80 00 20 */ blr +/* 800A9304 000A6264 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR19CScriptGrapplePoint" "Visit__29TCastToPtr<15CScriptMazeNode>FR19CScriptGrapplePoint": /* 800A9308 000A6268 38 00 00 00 */ li r0, 0 /* 800A930C 000A626C 90 03 00 04 */ stw r0, 4(r3) -/* 800A9310 000A6270 4E 80 00 20 */ blr +/* 800A9310 000A6270 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR13CScriptEffect" "Visit__29TCastToPtr<15CScriptMazeNode>FR13CScriptEffect": /* 800A9314 000A6274 38 00 00 00 */ li r0, 0 /* 800A9318 000A6278 90 03 00 04 */ stw r0, 4(r3) -/* 800A931C 000A627C 4E 80 00 20 */ blr +/* 800A931C 000A627C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR11CScriptDoor" "Visit__29TCastToPtr<15CScriptMazeNode>FR11CScriptDoor": /* 800A9320 000A6280 38 00 00 00 */ li r0, 0 /* 800A9324 000A6284 90 03 00 04 */ stw r0, 4(r3) -/* 800A9328 000A6288 4E 80 00 20 */ blr +/* 800A9328 000A6288 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR11CScriptDock" "Visit__29TCastToPtr<15CScriptMazeNode>FR11CScriptDock": /* 800A932C 000A628C 38 00 00 00 */ li r0, 0 /* 800A9330 000A6290 90 03 00 04 */ stw r0, 4(r3) -/* 800A9334 000A6294 4E 80 00 20 */ blr +/* 800A9334 000A6294 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR18CScriptDistanceFog" "Visit__29TCastToPtr<15CScriptMazeNode>FR18CScriptDistanceFog": /* 800A9338 000A6298 38 00 00 00 */ li r0, 0 /* 800A933C 000A629C 90 03 00 04 */ stw r0, 4(r3) -/* 800A9340 000A62A0 4E 80 00 20 */ blr +/* 800A9340 000A62A0 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR26CScriptDebugCameraWaypoint" "Visit__29TCastToPtr<15CScriptMazeNode>FR26CScriptDebugCameraWaypoint": /* 800A9344 000A62A4 38 00 00 00 */ li r0, 0 /* 800A9348 000A62A8 90 03 00 04 */ stw r0, 4(r3) -/* 800A934C 000A62AC 4E 80 00 20 */ blr +/* 800A934C 000A62AC 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR17CScriptCoverPoint" "Visit__29TCastToPtr<15CScriptMazeNode>FR17CScriptCoverPoint": /* 800A9350 000A62B0 38 00 00 00 */ li r0, 0 /* 800A9354 000A62B4 90 03 00 04 */ stw r0, 4(r3) -/* 800A9358 000A62B8 4E 80 00 20 */ blr +/* 800A9358 000A62B8 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR21CScriptCameraWaypoint" "Visit__29TCastToPtr<15CScriptMazeNode>FR21CScriptCameraWaypoint": /* 800A935C 000A62BC 38 00 00 00 */ li r0, 0 /* 800A9360 000A62C0 90 03 00 04 */ stw r0, 4(r3) -/* 800A9364 000A62C4 4E 80 00 20 */ blr +/* 800A9364 000A62C4 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR24CScriptCameraPitchVolume" "Visit__29TCastToPtr<15CScriptMazeNode>FR24CScriptCameraPitchVolume": /* 800A9368 000A62C8 38 00 00 00 */ li r0, 0 /* 800A936C 000A62CC 90 03 00 04 */ stw r0, 4(r3) -/* 800A9370 000A62D0 4E 80 00 20 */ blr +/* 800A9370 000A62D0 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR17CScriptCameraHint" "Visit__29TCastToPtr<15CScriptMazeNode>FR17CScriptCameraHint": /* 800A9374 000A62D4 38 00 00 00 */ li r0, 0 /* 800A9378 000A62D8 90 03 00 04 */ stw r0, 4(r3) -/* 800A937C 000A62DC 4E 80 00 20 */ blr +/* 800A937C 000A62DC 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR18CScriptAiJumpPoint" "Visit__29TCastToPtr<15CScriptMazeNode>FR18CScriptAiJumpPoint": /* 800A9380 000A62E0 38 00 00 00 */ li r0, 0 /* 800A9384 000A62E4 90 03 00 04 */ stw r0, 4(r3) -/* 800A9388 000A62E8 4E 80 00 20 */ blr +/* 800A9388 000A62E8 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR20CScriptActorKeyframe" "Visit__29TCastToPtr<15CScriptMazeNode>FR20CScriptActorKeyframe": /* 800A938C 000A62EC 38 00 00 00 */ li r0, 0 /* 800A9390 000A62F0 90 03 00 04 */ stw r0, 4(r3) -/* 800A9394 000A62F4 4E 80 00 20 */ blr +/* 800A9394 000A62F4 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR12CScriptActor" "Visit__29TCastToPtr<15CScriptMazeNode>FR12CScriptActor": /* 800A9398 000A62F8 38 00 00 00 */ li r0, 0 /* 800A939C 000A62FC 90 03 00 04 */ stw r0, 4(r3) -/* 800A93A0 000A6300 4E 80 00 20 */ blr +/* 800A93A0 000A6300 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR9CRepulsor" "Visit__29TCastToPtr<15CScriptMazeNode>FR9CRepulsor": /* 800A93A4 000A6304 38 00 00 00 */ li r0, 0 /* 800A93A8 000A6308 90 03 00 04 */ stw r0, 4(r3) -/* 800A93AC 000A630C 4E 80 00 20 */ blr +/* 800A93AC 000A630C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR7CPlayer" "Visit__29TCastToPtr<15CScriptMazeNode>FR7CPlayer": /* 800A93B0 000A6310 38 00 00 00 */ li r0, 0 /* 800A93B4 000A6314 90 03 00 04 */ stw r0, 4(r3) -/* 800A93B8 000A6318 4E 80 00 20 */ blr +/* 800A93B8 000A6318 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR13CPhysicsActor" "Visit__29TCastToPtr<15CScriptMazeNode>FR13CPhysicsActor": /* 800A93BC 000A631C 38 00 00 00 */ li r0, 0 /* 800A93C0 000A6320 90 03 00 04 */ stw r0, 4(r3) -/* 800A93C4 000A6324 4E 80 00 20 */ blr +/* 800A93C4 000A6324 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR3CAi" "Visit__29TCastToPtr<15CScriptMazeNode>FR3CAi": /* 800A93C8 000A6328 38 00 00 00 */ li r0, 0 /* 800A93CC 000A632C 90 03 00 04 */ stw r0, 4(r3) -/* 800A93D0 000A6330 4E 80 00 20 */ blr +/* 800A93D0 000A6330 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR11CPathCamera" "Visit__29TCastToPtr<15CScriptMazeNode>FR11CPathCamera": /* 800A93D4 000A6334 38 00 00 00 */ li r0, 0 /* 800A93D8 000A6338 90 03 00 04 */ stw r0, 4(r3) -/* 800A93DC 000A633C 4E 80 00 20 */ blr +/* 800A93DC 000A633C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR18CMetroidPrimeRelay" "Visit__29TCastToPtr<15CScriptMazeNode>FR18CMetroidPrimeRelay": /* 800A93E0 000A6340 38 00 00 00 */ li r0, 0 /* 800A93E4 000A6344 90 03 00 04 */ stw r0, 4(r3) -/* 800A93E8 000A6348 4E 80 00 20 */ blr +/* 800A93E8 000A6348 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR19CHUDBillboardEffect" "Visit__29TCastToPtr<15CScriptMazeNode>FR19CHUDBillboardEffect": /* 800A93EC 000A634C 38 00 00 00 */ li r0, 0 /* 800A93F0 000A6350 90 03 00 04 */ stw r0, 4(r3) -/* 800A93F4 000A6354 4E 80 00 20 */ blr +/* 800A93F4 000A6354 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR15CGameProjectile" "Visit__29TCastToPtr<15CScriptMazeNode>FR15CGameProjectile": /* 800A93F8 000A6358 38 00 00 00 */ li r0, 0 /* 800A93FC 000A635C 90 03 00 04 */ stw r0, 4(r3) -/* 800A9400 000A6360 4E 80 00 20 */ blr +/* 800A9400 000A6360 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR10CGameLight" "Visit__29TCastToPtr<15CScriptMazeNode>FR10CGameLight": /* 800A9404 000A6364 38 00 00 00 */ li r0, 0 /* 800A9408 000A6368 90 03 00 04 */ stw r0, 4(r3) -/* 800A940C 000A636C 4E 80 00 20 */ blr +/* 800A940C 000A636C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR11CGameCamera" "Visit__29TCastToPtr<15CScriptMazeNode>FR11CGameCamera": /* 800A9410 000A6370 38 00 00 00 */ li r0, 0 /* 800A9414 000A6374 90 03 00 04 */ stw r0, 4(r3) -/* 800A9418 000A6378 4E 80 00 20 */ blr +/* 800A9418 000A6378 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR10CFishCloud" "Visit__29TCastToPtr<15CScriptMazeNode>FR10CFishCloud": /* 800A941C 000A637C 38 00 00 00 */ li r0, 0 /* 800A9420 000A6380 90 03 00 04 */ stw r0, 4(r3) -/* 800A9424 000A6384 4E 80 00 20 */ blr +/* 800A9424 000A6384 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR18CFirstPersonCamera" "Visit__29TCastToPtr<15CScriptMazeNode>FR18CFirstPersonCamera": /* 800A9428 000A6388 38 00 00 00 */ li r0, 0 /* 800A942C 000A638C 90 03 00 04 */ stw r0, 4(r3) -/* 800A9430 000A6390 4E 80 00 20 */ blr +/* 800A9430 000A6390 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR10CExplosion" "Visit__29TCastToPtr<15CScriptMazeNode>FR10CExplosion": /* 800A9434 000A6394 38 00 00 00 */ li r0, 0 /* 800A9438 000A6398 90 03 00 04 */ stw r0, 4(r3) -/* 800A943C 000A639C 4E 80 00 20 */ blr +/* 800A943C 000A639C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR7CEntity" "Visit__29TCastToPtr<15CScriptMazeNode>FR7CEntity": /* 800A9440 000A63A0 38 00 00 00 */ li r0, 0 /* 800A9444 000A63A4 90 03 00 04 */ stw r0, 4(r3) -/* 800A9448 000A63A8 4E 80 00 20 */ blr +/* 800A9448 000A63A8 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR17CEnergyProjectile" "Visit__29TCastToPtr<15CScriptMazeNode>FR17CEnergyProjectile": /* 800A944C 000A63AC 38 00 00 00 */ li r0, 0 /* 800A9450 000A63B0 90 03 00 04 */ stw r0, 4(r3) -/* 800A9454 000A63B4 4E 80 00 20 */ blr +/* 800A9454 000A63B4 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR16CDestroyableRock" "Visit__29TCastToPtr<15CScriptMazeNode>FR16CDestroyableRock": /* 800A9458 000A63B8 38 00 00 00 */ li r0, 0 /* 800A945C 000A63BC 90 03 00 04 */ stw r0, 4(r3) -/* 800A9460 000A63C0 4E 80 00 20 */ blr +/* 800A9460 000A63C0 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR15CCollisionActor" "Visit__29TCastToPtr<15CScriptMazeNode>FR15CCollisionActor": /* 800A9464 000A63C4 38 00 00 00 */ li r0, 0 /* 800A9468 000A63C8 90 03 00 04 */ stw r0, 4(r3) -/* 800A946C 000A63CC 4E 80 00 20 */ blr +/* 800A946C 000A63CC 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR16CCinematicCamera" "Visit__29TCastToPtr<15CScriptMazeNode>FR16CCinematicCamera": /* 800A9470 000A63D0 38 00 00 00 */ li r0, 0 /* 800A9474 000A63D4 90 03 00 04 */ stw r0, 4(r3) -/* 800A9478 000A63D8 4E 80 00 20 */ blr +/* 800A9478 000A63D8 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR5CBomb" "Visit__29TCastToPtr<15CScriptMazeNode>FR5CBomb": /* 800A947C 000A63DC 38 00 00 00 */ li r0, 0 /* 800A9480 000A63E0 90 03 00 04 */ stw r0, 4(r3) -/* 800A9484 000A63E4 4E 80 00 20 */ blr +/* 800A9484 000A63E4 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR11CBallCamera" "Visit__29TCastToPtr<15CScriptMazeNode>FR11CBallCamera": /* 800A9488 000A63E8 38 00 00 00 */ li r0, 0 /* 800A948C 000A63EC 90 03 00 04 */ stw r0, 4(r3) -/* 800A9490 000A63F0 4E 80 00 20 */ blr +/* 800A9490 000A63F0 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CScriptMazeNode>FR6CActor" "Visit__29TCastToPtr<15CScriptMazeNode>FR6CActor": /* 800A9494 000A63F4 38 00 00 00 */ li r0, 0 /* 800A9498 000A63F8 90 03 00 04 */ stw r0, 4(r3) -/* 800A949C 000A63FC 4E 80 00 20 */ blr +/* 800A949C 000A63FC 4E 80 00 20 */ blr .global "__ct__29TCastToPtr<15CScriptMazeNode>FP7CEntity" "__ct__29TCastToPtr<15CScriptMazeNode>FP7CEntity": @@ -10945,355 +10945,355 @@ lbl_800A91E0: /* 800A94E4 000A6444 81 83 00 00 */ lwz r12, 0(r3) /* 800A94E8 000A6448 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800A94EC 000A644C 7D 89 03 A6 */ mtctr r12 -/* 800A94F0 000A6450 4E 80 04 21 */ bctrl +/* 800A94F0 000A6450 4E 80 04 21 */ bctrl lbl_800A94F4: /* 800A94F4 000A6454 80 01 00 14 */ lwz r0, 0x14(r1) /* 800A94F8 000A6458 7F E3 FB 78 */ mr r3, r31 /* 800A94FC 000A645C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800A9500 000A6460 7C 08 03 A6 */ mtlr r0 /* 800A9504 000A6464 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A9508 000A6468 4E 80 00 20 */ blr +/* 800A9508 000A6468 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR7CWeapon" "Visit__30TCastToPtr<16CScriptGunTurret>FR7CWeapon": /* 800A950C 000A646C 38 00 00 00 */ li r0, 0 /* 800A9510 000A6470 90 03 00 04 */ stw r0, 4(r3) -/* 800A9514 000A6474 4E 80 00 20 */ blr +/* 800A9514 000A6474 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR17CWallCrawlerSwarm" "Visit__30TCastToPtr<16CScriptGunTurret>FR17CWallCrawlerSwarm": /* 800A9518 000A6478 38 00 00 00 */ li r0, 0 /* 800A951C 000A647C 90 03 00 04 */ stw r0, 4(r3) -/* 800A9520 000A6480 4E 80 00 20 */ blr +/* 800A9520 000A6480 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR20CScriptSpindleCamera" "Visit__30TCastToPtr<16CScriptGunTurret>FR20CScriptSpindleCamera": /* 800A9524 000A6484 38 00 00 00 */ li r0, 0 /* 800A9528 000A6488 90 03 00 04 */ stw r0, 4(r3) -/* 800A952C 000A648C 4E 80 00 20 */ blr +/* 800A952C 000A648C 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR15CSnakeWeedSwarm" "Visit__30TCastToPtr<16CScriptGunTurret>FR15CSnakeWeedSwarm": /* 800A9530 000A6490 38 00 00 00 */ li r0, 0 /* 800A9534 000A6494 90 03 00 04 */ stw r0, 4(r3) -/* 800A9538 000A6498 4E 80 00 20 */ blr +/* 800A9538 000A6498 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR15CScriptWaypoint" "Visit__30TCastToPtr<16CScriptGunTurret>FR15CScriptWaypoint": /* 800A953C 000A649C 38 00 00 00 */ li r0, 0 /* 800A9540 000A64A0 90 03 00 04 */ stw r0, 4(r3) -/* 800A9544 000A64A4 4E 80 00 20 */ blr +/* 800A9544 000A64A4 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR12CScriptWater" "Visit__30TCastToPtr<16CScriptGunTurret>FR12CScriptWater": /* 800A9548 000A64A8 38 00 00 00 */ li r0, 0 /* 800A954C 000A64AC 90 03 00 04 */ stw r0, 4(r3) -/* 800A9550 000A64B0 4E 80 00 20 */ blr +/* 800A9550 000A64B0 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR17CScriptVisorFlare" "Visit__30TCastToPtr<16CScriptGunTurret>FR17CScriptVisorFlare": /* 800A9554 000A64B4 38 00 00 00 */ li r0, 0 /* 800A9558 000A64B8 90 03 00 04 */ stw r0, 4(r3) -/* 800A955C 000A64BC 4E 80 00 20 */ blr +/* 800A955C 000A64BC 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR14CScriptTrigger" "Visit__30TCastToPtr<16CScriptGunTurret>FR14CScriptTrigger": /* 800A9560 000A64C0 38 00 00 00 */ li r0, 0 /* 800A9564 000A64C4 90 03 00 04 */ stw r0, 4(r3) -/* 800A9568 000A64C8 4E 80 00 20 */ blr +/* 800A9568 000A64C8 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR12CScriptTimer" "Visit__30TCastToPtr<16CScriptGunTurret>FR12CScriptTimer": /* 800A956C 000A64CC 38 00 00 00 */ li r0, 0 /* 800A9570 000A64D0 90 03 00 04 */ stw r0, 4(r3) -/* 800A9574 000A64D4 4E 80 00 20 */ blr +/* 800A9574 000A64D4 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR10CTeamAiMgr" "Visit__30TCastToPtr<16CScriptGunTurret>FR10CTeamAiMgr": /* 800A9578 000A64D8 38 00 00 00 */ li r0, 0 /* 800A957C 000A64DC 90 03 00 04 */ stw r0, 4(r3) -/* 800A9580 000A64E0 4E 80 00 20 */ blr +/* 800A9580 000A64E0 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR21CScriptTargetingPoint" "Visit__30TCastToPtr<16CScriptGunTurret>FR21CScriptTargetingPoint": /* 800A9584 000A64E4 38 00 00 00 */ li r0, 0 /* 800A9588 000A64E8 90 03 00 04 */ stw r0, 4(r3) -/* 800A958C 000A64EC 4E 80 00 20 */ blr +/* 800A958C 000A64EC 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR25CScriptSpiderBallWaypoint" "Visit__30TCastToPtr<16CScriptGunTurret>FR25CScriptSpiderBallWaypoint": /* 800A9590 000A64F0 38 00 00 00 */ li r0, 0 /* 800A9594 000A64F4 90 03 00 04 */ stw r0, 4(r3) -/* 800A9598 000A64F8 4E 80 00 20 */ blr +/* 800A9598 000A64F8 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR34CScriptSpiderBallAttractionSurface" "Visit__30TCastToPtr<16CScriptGunTurret>FR34CScriptSpiderBallAttractionSurface": /* 800A959C 000A64FC 38 00 00 00 */ li r0, 0 /* 800A95A0 000A6500 90 03 00 04 */ stw r0, 4(r3) -/* 800A95A4 000A6504 4E 80 00 20 */ blr +/* 800A95A4 000A6504 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR22CScriptSpecialFunction" "Visit__30TCastToPtr<16CScriptGunTurret>FR22CScriptSpecialFunction": /* 800A95A8 000A6508 38 00 00 00 */ li r0, 0 /* 800A95AC 000A650C 90 03 00 04 */ stw r0, 4(r3) -/* 800A95B0 000A6510 4E 80 00 20 */ blr +/* 800A95B0 000A6510 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR17CScriptSpawnPoint" "Visit__30TCastToPtr<16CScriptGunTurret>FR17CScriptSpawnPoint": /* 800A95B4 000A6514 38 00 00 00 */ li r0, 0 /* 800A95B8 000A6518 90 03 00 04 */ stw r0, 4(r3) -/* 800A95BC 000A651C 4E 80 00 20 */ blr +/* 800A95BC 000A651C 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR12CScriptSound" "Visit__30TCastToPtr<16CScriptGunTurret>FR12CScriptSound": /* 800A95C0 000A6520 38 00 00 00 */ li r0, 0 /* 800A95C4 000A6524 90 03 00 04 */ stw r0, 4(r3) -/* 800A95C8 000A6528 4E 80 00 20 */ blr +/* 800A95C8 000A6528 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR20CScriptRoomAcoustics" "Visit__30TCastToPtr<16CScriptGunTurret>FR20CScriptRoomAcoustics": /* 800A95CC 000A652C 38 00 00 00 */ li r0, 0 /* 800A95D0 000A6530 90 03 00 04 */ stw r0, 4(r3) -/* 800A95D4 000A6534 4E 80 00 20 */ blr +/* 800A95D4 000A6534 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR22CScriptPointOfinterest" "Visit__30TCastToPtr<16CScriptGunTurret>FR22CScriptPointOfinterest": /* 800A95D8 000A6538 38 00 00 00 */ li r0, 0 /* 800A95DC 000A653C 90 03 00 04 */ stw r0, 4(r3) -/* 800A95E0 000A6540 4E 80 00 20 */ blr +/* 800A95E0 000A6540 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR17CScriptPlayerHint" "Visit__30TCastToPtr<16CScriptGunTurret>FR17CScriptPlayerHint": /* 800A95E4 000A6544 38 00 00 00 */ li r0, 0 /* 800A95E8 000A6548 90 03 00 04 */ stw r0, 4(r3) -/* 800A95EC 000A654C 4E 80 00 20 */ blr +/* 800A95EC 000A654C 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR15CScriptPlatform" "Visit__30TCastToPtr<16CScriptGunTurret>FR15CScriptPlatform": /* 800A95F0 000A6550 38 00 00 00 */ li r0, 0 /* 800A95F4 000A6554 90 03 00 04 */ stw r0, 4(r3) -/* 800A95F8 000A6558 4E 80 00 20 */ blr +/* 800A95F8 000A6558 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR13CScriptPickup" "Visit__30TCastToPtr<16CScriptGunTurret>FR13CScriptPickup": /* 800A95FC 000A655C 38 00 00 00 */ li r0, 0 /* 800A9600 000A6560 90 03 00 04 */ stw r0, 4(r3) -/* 800A9604 000A6564 4E 80 00 20 */ blr +/* 800A9604 000A6564 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR15CScriptMazeNode" "Visit__30TCastToPtr<16CScriptGunTurret>FR15CScriptMazeNode": /* 800A9608 000A6568 38 00 00 00 */ li r0, 0 /* 800A960C 000A656C 90 03 00 04 */ stw r0, 4(r3) -/* 800A9610 000A6570 4E 80 00 20 */ blr +/* 800A9610 000A6570 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR16CScriptGunTurret" "Visit__30TCastToPtr<16CScriptGunTurret>FR16CScriptGunTurret": /* 800A9614 000A6574 90 83 00 04 */ stw r4, 4(r3) -/* 800A9618 000A6578 4E 80 00 20 */ blr +/* 800A9618 000A6578 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR19CScriptGrapplePoint" "Visit__30TCastToPtr<16CScriptGunTurret>FR19CScriptGrapplePoint": /* 800A961C 000A657C 38 00 00 00 */ li r0, 0 /* 800A9620 000A6580 90 03 00 04 */ stw r0, 4(r3) -/* 800A9624 000A6584 4E 80 00 20 */ blr +/* 800A9624 000A6584 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR13CScriptEffect" "Visit__30TCastToPtr<16CScriptGunTurret>FR13CScriptEffect": /* 800A9628 000A6588 38 00 00 00 */ li r0, 0 /* 800A962C 000A658C 90 03 00 04 */ stw r0, 4(r3) -/* 800A9630 000A6590 4E 80 00 20 */ blr +/* 800A9630 000A6590 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR11CScriptDoor" "Visit__30TCastToPtr<16CScriptGunTurret>FR11CScriptDoor": /* 800A9634 000A6594 38 00 00 00 */ li r0, 0 /* 800A9638 000A6598 90 03 00 04 */ stw r0, 4(r3) -/* 800A963C 000A659C 4E 80 00 20 */ blr +/* 800A963C 000A659C 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR11CScriptDock" "Visit__30TCastToPtr<16CScriptGunTurret>FR11CScriptDock": /* 800A9640 000A65A0 38 00 00 00 */ li r0, 0 /* 800A9644 000A65A4 90 03 00 04 */ stw r0, 4(r3) -/* 800A9648 000A65A8 4E 80 00 20 */ blr +/* 800A9648 000A65A8 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR18CScriptDistanceFog" "Visit__30TCastToPtr<16CScriptGunTurret>FR18CScriptDistanceFog": /* 800A964C 000A65AC 38 00 00 00 */ li r0, 0 /* 800A9650 000A65B0 90 03 00 04 */ stw r0, 4(r3) -/* 800A9654 000A65B4 4E 80 00 20 */ blr +/* 800A9654 000A65B4 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR26CScriptDebugCameraWaypoint" "Visit__30TCastToPtr<16CScriptGunTurret>FR26CScriptDebugCameraWaypoint": /* 800A9658 000A65B8 38 00 00 00 */ li r0, 0 /* 800A965C 000A65BC 90 03 00 04 */ stw r0, 4(r3) -/* 800A9660 000A65C0 4E 80 00 20 */ blr +/* 800A9660 000A65C0 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR17CScriptCoverPoint" "Visit__30TCastToPtr<16CScriptGunTurret>FR17CScriptCoverPoint": /* 800A9664 000A65C4 38 00 00 00 */ li r0, 0 /* 800A9668 000A65C8 90 03 00 04 */ stw r0, 4(r3) -/* 800A966C 000A65CC 4E 80 00 20 */ blr +/* 800A966C 000A65CC 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR21CScriptCameraWaypoint" "Visit__30TCastToPtr<16CScriptGunTurret>FR21CScriptCameraWaypoint": /* 800A9670 000A65D0 38 00 00 00 */ li r0, 0 /* 800A9674 000A65D4 90 03 00 04 */ stw r0, 4(r3) -/* 800A9678 000A65D8 4E 80 00 20 */ blr +/* 800A9678 000A65D8 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR24CScriptCameraPitchVolume" "Visit__30TCastToPtr<16CScriptGunTurret>FR24CScriptCameraPitchVolume": /* 800A967C 000A65DC 38 00 00 00 */ li r0, 0 /* 800A9680 000A65E0 90 03 00 04 */ stw r0, 4(r3) -/* 800A9684 000A65E4 4E 80 00 20 */ blr +/* 800A9684 000A65E4 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR17CScriptCameraHint" "Visit__30TCastToPtr<16CScriptGunTurret>FR17CScriptCameraHint": /* 800A9688 000A65E8 38 00 00 00 */ li r0, 0 /* 800A968C 000A65EC 90 03 00 04 */ stw r0, 4(r3) -/* 800A9690 000A65F0 4E 80 00 20 */ blr +/* 800A9690 000A65F0 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR18CScriptAiJumpPoint" "Visit__30TCastToPtr<16CScriptGunTurret>FR18CScriptAiJumpPoint": /* 800A9694 000A65F4 38 00 00 00 */ li r0, 0 /* 800A9698 000A65F8 90 03 00 04 */ stw r0, 4(r3) -/* 800A969C 000A65FC 4E 80 00 20 */ blr +/* 800A969C 000A65FC 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR20CScriptActorKeyframe" "Visit__30TCastToPtr<16CScriptGunTurret>FR20CScriptActorKeyframe": /* 800A96A0 000A6600 38 00 00 00 */ li r0, 0 /* 800A96A4 000A6604 90 03 00 04 */ stw r0, 4(r3) -/* 800A96A8 000A6608 4E 80 00 20 */ blr +/* 800A96A8 000A6608 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR12CScriptActor" "Visit__30TCastToPtr<16CScriptGunTurret>FR12CScriptActor": /* 800A96AC 000A660C 38 00 00 00 */ li r0, 0 /* 800A96B0 000A6610 90 03 00 04 */ stw r0, 4(r3) -/* 800A96B4 000A6614 4E 80 00 20 */ blr +/* 800A96B4 000A6614 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR9CRepulsor" "Visit__30TCastToPtr<16CScriptGunTurret>FR9CRepulsor": /* 800A96B8 000A6618 38 00 00 00 */ li r0, 0 /* 800A96BC 000A661C 90 03 00 04 */ stw r0, 4(r3) -/* 800A96C0 000A6620 4E 80 00 20 */ blr +/* 800A96C0 000A6620 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR7CPlayer" "Visit__30TCastToPtr<16CScriptGunTurret>FR7CPlayer": /* 800A96C4 000A6624 38 00 00 00 */ li r0, 0 /* 800A96C8 000A6628 90 03 00 04 */ stw r0, 4(r3) -/* 800A96CC 000A662C 4E 80 00 20 */ blr +/* 800A96CC 000A662C 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR13CPhysicsActor" "Visit__30TCastToPtr<16CScriptGunTurret>FR13CPhysicsActor": /* 800A96D0 000A6630 38 00 00 00 */ li r0, 0 /* 800A96D4 000A6634 90 03 00 04 */ stw r0, 4(r3) -/* 800A96D8 000A6638 4E 80 00 20 */ blr +/* 800A96D8 000A6638 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR3CAi" "Visit__30TCastToPtr<16CScriptGunTurret>FR3CAi": /* 800A96DC 000A663C 38 00 00 00 */ li r0, 0 /* 800A96E0 000A6640 90 03 00 04 */ stw r0, 4(r3) -/* 800A96E4 000A6644 4E 80 00 20 */ blr +/* 800A96E4 000A6644 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR11CPathCamera" "Visit__30TCastToPtr<16CScriptGunTurret>FR11CPathCamera": /* 800A96E8 000A6648 38 00 00 00 */ li r0, 0 /* 800A96EC 000A664C 90 03 00 04 */ stw r0, 4(r3) -/* 800A96F0 000A6650 4E 80 00 20 */ blr +/* 800A96F0 000A6650 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR18CMetroidPrimeRelay" "Visit__30TCastToPtr<16CScriptGunTurret>FR18CMetroidPrimeRelay": /* 800A96F4 000A6654 38 00 00 00 */ li r0, 0 /* 800A96F8 000A6658 90 03 00 04 */ stw r0, 4(r3) -/* 800A96FC 000A665C 4E 80 00 20 */ blr +/* 800A96FC 000A665C 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR19CHUDBillboardEffect" "Visit__30TCastToPtr<16CScriptGunTurret>FR19CHUDBillboardEffect": /* 800A9700 000A6660 38 00 00 00 */ li r0, 0 /* 800A9704 000A6664 90 03 00 04 */ stw r0, 4(r3) -/* 800A9708 000A6668 4E 80 00 20 */ blr +/* 800A9708 000A6668 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR15CGameProjectile" "Visit__30TCastToPtr<16CScriptGunTurret>FR15CGameProjectile": /* 800A970C 000A666C 38 00 00 00 */ li r0, 0 /* 800A9710 000A6670 90 03 00 04 */ stw r0, 4(r3) -/* 800A9714 000A6674 4E 80 00 20 */ blr +/* 800A9714 000A6674 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR10CGameLight" "Visit__30TCastToPtr<16CScriptGunTurret>FR10CGameLight": /* 800A9718 000A6678 38 00 00 00 */ li r0, 0 /* 800A971C 000A667C 90 03 00 04 */ stw r0, 4(r3) -/* 800A9720 000A6680 4E 80 00 20 */ blr +/* 800A9720 000A6680 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR11CGameCamera" "Visit__30TCastToPtr<16CScriptGunTurret>FR11CGameCamera": /* 800A9724 000A6684 38 00 00 00 */ li r0, 0 /* 800A9728 000A6688 90 03 00 04 */ stw r0, 4(r3) -/* 800A972C 000A668C 4E 80 00 20 */ blr +/* 800A972C 000A668C 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR10CFishCloud" "Visit__30TCastToPtr<16CScriptGunTurret>FR10CFishCloud": /* 800A9730 000A6690 38 00 00 00 */ li r0, 0 /* 800A9734 000A6694 90 03 00 04 */ stw r0, 4(r3) -/* 800A9738 000A6698 4E 80 00 20 */ blr +/* 800A9738 000A6698 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR18CFirstPersonCamera" "Visit__30TCastToPtr<16CScriptGunTurret>FR18CFirstPersonCamera": /* 800A973C 000A669C 38 00 00 00 */ li r0, 0 /* 800A9740 000A66A0 90 03 00 04 */ stw r0, 4(r3) -/* 800A9744 000A66A4 4E 80 00 20 */ blr +/* 800A9744 000A66A4 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR10CExplosion" "Visit__30TCastToPtr<16CScriptGunTurret>FR10CExplosion": /* 800A9748 000A66A8 38 00 00 00 */ li r0, 0 /* 800A974C 000A66AC 90 03 00 04 */ stw r0, 4(r3) -/* 800A9750 000A66B0 4E 80 00 20 */ blr +/* 800A9750 000A66B0 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR7CEntity" "Visit__30TCastToPtr<16CScriptGunTurret>FR7CEntity": /* 800A9754 000A66B4 38 00 00 00 */ li r0, 0 /* 800A9758 000A66B8 90 03 00 04 */ stw r0, 4(r3) -/* 800A975C 000A66BC 4E 80 00 20 */ blr +/* 800A975C 000A66BC 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR17CEnergyProjectile" "Visit__30TCastToPtr<16CScriptGunTurret>FR17CEnergyProjectile": /* 800A9760 000A66C0 38 00 00 00 */ li r0, 0 /* 800A9764 000A66C4 90 03 00 04 */ stw r0, 4(r3) -/* 800A9768 000A66C8 4E 80 00 20 */ blr +/* 800A9768 000A66C8 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR16CDestroyableRock" "Visit__30TCastToPtr<16CScriptGunTurret>FR16CDestroyableRock": /* 800A976C 000A66CC 38 00 00 00 */ li r0, 0 /* 800A9770 000A66D0 90 03 00 04 */ stw r0, 4(r3) -/* 800A9774 000A66D4 4E 80 00 20 */ blr +/* 800A9774 000A66D4 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR15CCollisionActor" "Visit__30TCastToPtr<16CScriptGunTurret>FR15CCollisionActor": /* 800A9778 000A66D8 38 00 00 00 */ li r0, 0 /* 800A977C 000A66DC 90 03 00 04 */ stw r0, 4(r3) -/* 800A9780 000A66E0 4E 80 00 20 */ blr +/* 800A9780 000A66E0 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR16CCinematicCamera" "Visit__30TCastToPtr<16CScriptGunTurret>FR16CCinematicCamera": /* 800A9784 000A66E4 38 00 00 00 */ li r0, 0 /* 800A9788 000A66E8 90 03 00 04 */ stw r0, 4(r3) -/* 800A978C 000A66EC 4E 80 00 20 */ blr +/* 800A978C 000A66EC 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR5CBomb" "Visit__30TCastToPtr<16CScriptGunTurret>FR5CBomb": /* 800A9790 000A66F0 38 00 00 00 */ li r0, 0 /* 800A9794 000A66F4 90 03 00 04 */ stw r0, 4(r3) -/* 800A9798 000A66F8 4E 80 00 20 */ blr +/* 800A9798 000A66F8 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR11CBallCamera" "Visit__30TCastToPtr<16CScriptGunTurret>FR11CBallCamera": /* 800A979C 000A66FC 38 00 00 00 */ li r0, 0 /* 800A97A0 000A6700 90 03 00 04 */ stw r0, 4(r3) -/* 800A97A4 000A6704 4E 80 00 20 */ blr +/* 800A97A4 000A6704 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CScriptGunTurret>FR6CActor" "Visit__30TCastToPtr<16CScriptGunTurret>FR6CActor": /* 800A97A8 000A6708 38 00 00 00 */ li r0, 0 /* 800A97AC 000A670C 90 03 00 04 */ stw r0, 4(r3) -/* 800A97B0 000A6710 4E 80 00 20 */ blr +/* 800A97B0 000A6710 4E 80 00 20 */ blr .global "__ct__30TCastToPtr<16CScriptGunTurret>FP7CEntity" "__ct__30TCastToPtr<16CScriptGunTurret>FP7CEntity": @@ -11317,355 +11317,355 @@ lbl_800A94F4: /* 800A97F8 000A6758 81 83 00 00 */ lwz r12, 0(r3) /* 800A97FC 000A675C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800A9800 000A6760 7D 89 03 A6 */ mtctr r12 -/* 800A9804 000A6764 4E 80 04 21 */ bctrl +/* 800A9804 000A6764 4E 80 04 21 */ bctrl lbl_800A9808: /* 800A9808 000A6768 80 01 00 14 */ lwz r0, 0x14(r1) /* 800A980C 000A676C 7F E3 FB 78 */ mr r3, r31 /* 800A9810 000A6770 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800A9814 000A6774 7C 08 03 A6 */ mtlr r0 /* 800A9818 000A6778 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A981C 000A677C 4E 80 00 20 */ blr +/* 800A981C 000A677C 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR7CWeapon" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR7CWeapon": /* 800A9820 000A6780 38 00 00 00 */ li r0, 0 /* 800A9824 000A6784 90 03 00 04 */ stw r0, 4(r3) -/* 800A9828 000A6788 4E 80 00 20 */ blr +/* 800A9828 000A6788 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR17CWallCrawlerSwarm" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR17CWallCrawlerSwarm": /* 800A982C 000A678C 38 00 00 00 */ li r0, 0 /* 800A9830 000A6790 90 03 00 04 */ stw r0, 4(r3) -/* 800A9834 000A6794 4E 80 00 20 */ blr +/* 800A9834 000A6794 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR20CScriptSpindleCamera" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR20CScriptSpindleCamera": /* 800A9838 000A6798 38 00 00 00 */ li r0, 0 /* 800A983C 000A679C 90 03 00 04 */ stw r0, 4(r3) -/* 800A9840 000A67A0 4E 80 00 20 */ blr +/* 800A9840 000A67A0 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR15CSnakeWeedSwarm" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR15CSnakeWeedSwarm": /* 800A9844 000A67A4 38 00 00 00 */ li r0, 0 /* 800A9848 000A67A8 90 03 00 04 */ stw r0, 4(r3) -/* 800A984C 000A67AC 4E 80 00 20 */ blr +/* 800A984C 000A67AC 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR15CScriptWaypoint" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR15CScriptWaypoint": /* 800A9850 000A67B0 38 00 00 00 */ li r0, 0 /* 800A9854 000A67B4 90 03 00 04 */ stw r0, 4(r3) -/* 800A9858 000A67B8 4E 80 00 20 */ blr +/* 800A9858 000A67B8 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR12CScriptWater" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR12CScriptWater": /* 800A985C 000A67BC 38 00 00 00 */ li r0, 0 /* 800A9860 000A67C0 90 03 00 04 */ stw r0, 4(r3) -/* 800A9864 000A67C4 4E 80 00 20 */ blr +/* 800A9864 000A67C4 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR17CScriptVisorFlare" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR17CScriptVisorFlare": /* 800A9868 000A67C8 38 00 00 00 */ li r0, 0 /* 800A986C 000A67CC 90 03 00 04 */ stw r0, 4(r3) -/* 800A9870 000A67D0 4E 80 00 20 */ blr +/* 800A9870 000A67D0 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR14CScriptTrigger" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR14CScriptTrigger": /* 800A9874 000A67D4 38 00 00 00 */ li r0, 0 /* 800A9878 000A67D8 90 03 00 04 */ stw r0, 4(r3) -/* 800A987C 000A67DC 4E 80 00 20 */ blr +/* 800A987C 000A67DC 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR12CScriptTimer" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR12CScriptTimer": /* 800A9880 000A67E0 38 00 00 00 */ li r0, 0 /* 800A9884 000A67E4 90 03 00 04 */ stw r0, 4(r3) -/* 800A9888 000A67E8 4E 80 00 20 */ blr +/* 800A9888 000A67E8 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR10CTeamAiMgr" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR10CTeamAiMgr": /* 800A988C 000A67EC 38 00 00 00 */ li r0, 0 /* 800A9890 000A67F0 90 03 00 04 */ stw r0, 4(r3) -/* 800A9894 000A67F4 4E 80 00 20 */ blr +/* 800A9894 000A67F4 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR21CScriptTargetingPoint" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR21CScriptTargetingPoint": /* 800A9898 000A67F8 38 00 00 00 */ li r0, 0 /* 800A989C 000A67FC 90 03 00 04 */ stw r0, 4(r3) -/* 800A98A0 000A6800 4E 80 00 20 */ blr +/* 800A98A0 000A6800 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR25CScriptSpiderBallWaypoint" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR25CScriptSpiderBallWaypoint": /* 800A98A4 000A6804 38 00 00 00 */ li r0, 0 /* 800A98A8 000A6808 90 03 00 04 */ stw r0, 4(r3) -/* 800A98AC 000A680C 4E 80 00 20 */ blr +/* 800A98AC 000A680C 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR34CScriptSpiderBallAttractionSurface" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR34CScriptSpiderBallAttractionSurface": /* 800A98B0 000A6810 38 00 00 00 */ li r0, 0 /* 800A98B4 000A6814 90 03 00 04 */ stw r0, 4(r3) -/* 800A98B8 000A6818 4E 80 00 20 */ blr +/* 800A98B8 000A6818 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR22CScriptSpecialFunction" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR22CScriptSpecialFunction": /* 800A98BC 000A681C 38 00 00 00 */ li r0, 0 /* 800A98C0 000A6820 90 03 00 04 */ stw r0, 4(r3) -/* 800A98C4 000A6824 4E 80 00 20 */ blr +/* 800A98C4 000A6824 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR17CScriptSpawnPoint" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR17CScriptSpawnPoint": /* 800A98C8 000A6828 38 00 00 00 */ li r0, 0 /* 800A98CC 000A682C 90 03 00 04 */ stw r0, 4(r3) -/* 800A98D0 000A6830 4E 80 00 20 */ blr +/* 800A98D0 000A6830 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR12CScriptSound" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR12CScriptSound": /* 800A98D4 000A6834 38 00 00 00 */ li r0, 0 /* 800A98D8 000A6838 90 03 00 04 */ stw r0, 4(r3) -/* 800A98DC 000A683C 4E 80 00 20 */ blr +/* 800A98DC 000A683C 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR20CScriptRoomAcoustics" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR20CScriptRoomAcoustics": /* 800A98E0 000A6840 38 00 00 00 */ li r0, 0 /* 800A98E4 000A6844 90 03 00 04 */ stw r0, 4(r3) -/* 800A98E8 000A6848 4E 80 00 20 */ blr +/* 800A98E8 000A6848 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR22CScriptPointOfinterest" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR22CScriptPointOfinterest": /* 800A98EC 000A684C 38 00 00 00 */ li r0, 0 /* 800A98F0 000A6850 90 03 00 04 */ stw r0, 4(r3) -/* 800A98F4 000A6854 4E 80 00 20 */ blr +/* 800A98F4 000A6854 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR17CScriptPlayerHint" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR17CScriptPlayerHint": /* 800A98F8 000A6858 38 00 00 00 */ li r0, 0 /* 800A98FC 000A685C 90 03 00 04 */ stw r0, 4(r3) -/* 800A9900 000A6860 4E 80 00 20 */ blr +/* 800A9900 000A6860 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR15CScriptPlatform" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR15CScriptPlatform": /* 800A9904 000A6864 38 00 00 00 */ li r0, 0 /* 800A9908 000A6868 90 03 00 04 */ stw r0, 4(r3) -/* 800A990C 000A686C 4E 80 00 20 */ blr +/* 800A990C 000A686C 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR13CScriptPickup" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR13CScriptPickup": /* 800A9910 000A6870 38 00 00 00 */ li r0, 0 /* 800A9914 000A6874 90 03 00 04 */ stw r0, 4(r3) -/* 800A9918 000A6878 4E 80 00 20 */ blr +/* 800A9918 000A6878 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR15CScriptMazeNode" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR15CScriptMazeNode": /* 800A991C 000A687C 38 00 00 00 */ li r0, 0 /* 800A9920 000A6880 90 03 00 04 */ stw r0, 4(r3) -/* 800A9924 000A6884 4E 80 00 20 */ blr +/* 800A9924 000A6884 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR16CScriptGunTurret" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR16CScriptGunTurret": /* 800A9928 000A6888 38 00 00 00 */ li r0, 0 /* 800A992C 000A688C 90 03 00 04 */ stw r0, 4(r3) -/* 800A9930 000A6890 4E 80 00 20 */ blr +/* 800A9930 000A6890 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR19CScriptGrapplePoint" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR19CScriptGrapplePoint": /* 800A9934 000A6894 90 83 00 04 */ stw r4, 4(r3) -/* 800A9938 000A6898 4E 80 00 20 */ blr +/* 800A9938 000A6898 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR13CScriptEffect" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR13CScriptEffect": /* 800A993C 000A689C 38 00 00 00 */ li r0, 0 /* 800A9940 000A68A0 90 03 00 04 */ stw r0, 4(r3) -/* 800A9944 000A68A4 4E 80 00 20 */ blr +/* 800A9944 000A68A4 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR11CScriptDoor" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR11CScriptDoor": /* 800A9948 000A68A8 38 00 00 00 */ li r0, 0 /* 800A994C 000A68AC 90 03 00 04 */ stw r0, 4(r3) -/* 800A9950 000A68B0 4E 80 00 20 */ blr +/* 800A9950 000A68B0 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR11CScriptDock" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR11CScriptDock": /* 800A9954 000A68B4 38 00 00 00 */ li r0, 0 /* 800A9958 000A68B8 90 03 00 04 */ stw r0, 4(r3) -/* 800A995C 000A68BC 4E 80 00 20 */ blr +/* 800A995C 000A68BC 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR18CScriptDistanceFog" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR18CScriptDistanceFog": /* 800A9960 000A68C0 38 00 00 00 */ li r0, 0 /* 800A9964 000A68C4 90 03 00 04 */ stw r0, 4(r3) -/* 800A9968 000A68C8 4E 80 00 20 */ blr +/* 800A9968 000A68C8 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR26CScriptDebugCameraWaypoint" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR26CScriptDebugCameraWaypoint": /* 800A996C 000A68CC 38 00 00 00 */ li r0, 0 /* 800A9970 000A68D0 90 03 00 04 */ stw r0, 4(r3) -/* 800A9974 000A68D4 4E 80 00 20 */ blr +/* 800A9974 000A68D4 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR17CScriptCoverPoint" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR17CScriptCoverPoint": /* 800A9978 000A68D8 38 00 00 00 */ li r0, 0 /* 800A997C 000A68DC 90 03 00 04 */ stw r0, 4(r3) -/* 800A9980 000A68E0 4E 80 00 20 */ blr +/* 800A9980 000A68E0 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR21CScriptCameraWaypoint" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR21CScriptCameraWaypoint": /* 800A9984 000A68E4 38 00 00 00 */ li r0, 0 /* 800A9988 000A68E8 90 03 00 04 */ stw r0, 4(r3) -/* 800A998C 000A68EC 4E 80 00 20 */ blr +/* 800A998C 000A68EC 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR24CScriptCameraPitchVolume" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR24CScriptCameraPitchVolume": /* 800A9990 000A68F0 38 00 00 00 */ li r0, 0 /* 800A9994 000A68F4 90 03 00 04 */ stw r0, 4(r3) -/* 800A9998 000A68F8 4E 80 00 20 */ blr +/* 800A9998 000A68F8 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR17CScriptCameraHint" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR17CScriptCameraHint": /* 800A999C 000A68FC 38 00 00 00 */ li r0, 0 /* 800A99A0 000A6900 90 03 00 04 */ stw r0, 4(r3) -/* 800A99A4 000A6904 4E 80 00 20 */ blr +/* 800A99A4 000A6904 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR18CScriptAiJumpPoint" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR18CScriptAiJumpPoint": /* 800A99A8 000A6908 38 00 00 00 */ li r0, 0 /* 800A99AC 000A690C 90 03 00 04 */ stw r0, 4(r3) -/* 800A99B0 000A6910 4E 80 00 20 */ blr +/* 800A99B0 000A6910 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR20CScriptActorKeyframe" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR20CScriptActorKeyframe": /* 800A99B4 000A6914 38 00 00 00 */ li r0, 0 /* 800A99B8 000A6918 90 03 00 04 */ stw r0, 4(r3) -/* 800A99BC 000A691C 4E 80 00 20 */ blr +/* 800A99BC 000A691C 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR12CScriptActor" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR12CScriptActor": /* 800A99C0 000A6920 38 00 00 00 */ li r0, 0 /* 800A99C4 000A6924 90 03 00 04 */ stw r0, 4(r3) -/* 800A99C8 000A6928 4E 80 00 20 */ blr +/* 800A99C8 000A6928 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR9CRepulsor" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR9CRepulsor": /* 800A99CC 000A692C 38 00 00 00 */ li r0, 0 /* 800A99D0 000A6930 90 03 00 04 */ stw r0, 4(r3) -/* 800A99D4 000A6934 4E 80 00 20 */ blr +/* 800A99D4 000A6934 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR7CPlayer" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR7CPlayer": /* 800A99D8 000A6938 38 00 00 00 */ li r0, 0 /* 800A99DC 000A693C 90 03 00 04 */ stw r0, 4(r3) -/* 800A99E0 000A6940 4E 80 00 20 */ blr +/* 800A99E0 000A6940 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR13CPhysicsActor" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR13CPhysicsActor": /* 800A99E4 000A6944 38 00 00 00 */ li r0, 0 /* 800A99E8 000A6948 90 03 00 04 */ stw r0, 4(r3) -/* 800A99EC 000A694C 4E 80 00 20 */ blr +/* 800A99EC 000A694C 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR3CAi" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR3CAi": /* 800A99F0 000A6950 38 00 00 00 */ li r0, 0 /* 800A99F4 000A6954 90 03 00 04 */ stw r0, 4(r3) -/* 800A99F8 000A6958 4E 80 00 20 */ blr +/* 800A99F8 000A6958 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR11CPathCamera" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR11CPathCamera": /* 800A99FC 000A695C 38 00 00 00 */ li r0, 0 /* 800A9A00 000A6960 90 03 00 04 */ stw r0, 4(r3) -/* 800A9A04 000A6964 4E 80 00 20 */ blr +/* 800A9A04 000A6964 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR18CMetroidPrimeRelay" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR18CMetroidPrimeRelay": /* 800A9A08 000A6968 38 00 00 00 */ li r0, 0 /* 800A9A0C 000A696C 90 03 00 04 */ stw r0, 4(r3) -/* 800A9A10 000A6970 4E 80 00 20 */ blr +/* 800A9A10 000A6970 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR19CHUDBillboardEffect" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR19CHUDBillboardEffect": /* 800A9A14 000A6974 38 00 00 00 */ li r0, 0 /* 800A9A18 000A6978 90 03 00 04 */ stw r0, 4(r3) -/* 800A9A1C 000A697C 4E 80 00 20 */ blr +/* 800A9A1C 000A697C 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR15CGameProjectile" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR15CGameProjectile": /* 800A9A20 000A6980 38 00 00 00 */ li r0, 0 /* 800A9A24 000A6984 90 03 00 04 */ stw r0, 4(r3) -/* 800A9A28 000A6988 4E 80 00 20 */ blr +/* 800A9A28 000A6988 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR10CGameLight" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR10CGameLight": /* 800A9A2C 000A698C 38 00 00 00 */ li r0, 0 /* 800A9A30 000A6990 90 03 00 04 */ stw r0, 4(r3) -/* 800A9A34 000A6994 4E 80 00 20 */ blr +/* 800A9A34 000A6994 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR11CGameCamera" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR11CGameCamera": /* 800A9A38 000A6998 38 00 00 00 */ li r0, 0 /* 800A9A3C 000A699C 90 03 00 04 */ stw r0, 4(r3) -/* 800A9A40 000A69A0 4E 80 00 20 */ blr +/* 800A9A40 000A69A0 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR10CFishCloud" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR10CFishCloud": /* 800A9A44 000A69A4 38 00 00 00 */ li r0, 0 /* 800A9A48 000A69A8 90 03 00 04 */ stw r0, 4(r3) -/* 800A9A4C 000A69AC 4E 80 00 20 */ blr +/* 800A9A4C 000A69AC 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR18CFirstPersonCamera" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR18CFirstPersonCamera": /* 800A9A50 000A69B0 38 00 00 00 */ li r0, 0 /* 800A9A54 000A69B4 90 03 00 04 */ stw r0, 4(r3) -/* 800A9A58 000A69B8 4E 80 00 20 */ blr +/* 800A9A58 000A69B8 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR10CExplosion" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR10CExplosion": /* 800A9A5C 000A69BC 38 00 00 00 */ li r0, 0 /* 800A9A60 000A69C0 90 03 00 04 */ stw r0, 4(r3) -/* 800A9A64 000A69C4 4E 80 00 20 */ blr +/* 800A9A64 000A69C4 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR7CEntity" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR7CEntity": /* 800A9A68 000A69C8 38 00 00 00 */ li r0, 0 /* 800A9A6C 000A69CC 90 03 00 04 */ stw r0, 4(r3) -/* 800A9A70 000A69D0 4E 80 00 20 */ blr +/* 800A9A70 000A69D0 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR17CEnergyProjectile" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR17CEnergyProjectile": /* 800A9A74 000A69D4 38 00 00 00 */ li r0, 0 /* 800A9A78 000A69D8 90 03 00 04 */ stw r0, 4(r3) -/* 800A9A7C 000A69DC 4E 80 00 20 */ blr +/* 800A9A7C 000A69DC 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR16CDestroyableRock" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR16CDestroyableRock": /* 800A9A80 000A69E0 38 00 00 00 */ li r0, 0 /* 800A9A84 000A69E4 90 03 00 04 */ stw r0, 4(r3) -/* 800A9A88 000A69E8 4E 80 00 20 */ blr +/* 800A9A88 000A69E8 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR15CCollisionActor" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR15CCollisionActor": /* 800A9A8C 000A69EC 38 00 00 00 */ li r0, 0 /* 800A9A90 000A69F0 90 03 00 04 */ stw r0, 4(r3) -/* 800A9A94 000A69F4 4E 80 00 20 */ blr +/* 800A9A94 000A69F4 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR16CCinematicCamera" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR16CCinematicCamera": /* 800A9A98 000A69F8 38 00 00 00 */ li r0, 0 /* 800A9A9C 000A69FC 90 03 00 04 */ stw r0, 4(r3) -/* 800A9AA0 000A6A00 4E 80 00 20 */ blr +/* 800A9AA0 000A6A00 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR5CBomb" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR5CBomb": /* 800A9AA4 000A6A04 38 00 00 00 */ li r0, 0 /* 800A9AA8 000A6A08 90 03 00 04 */ stw r0, 4(r3) -/* 800A9AAC 000A6A0C 4E 80 00 20 */ blr +/* 800A9AAC 000A6A0C 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR11CBallCamera" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR11CBallCamera": /* 800A9AB0 000A6A10 38 00 00 00 */ li r0, 0 /* 800A9AB4 000A6A14 90 03 00 04 */ stw r0, 4(r3) -/* 800A9AB8 000A6A18 4E 80 00 20 */ blr +/* 800A9AB8 000A6A18 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CScriptGrapplePoint>FR6CActor" "Visit__33TCastToPtr<19CScriptGrapplePoint>FR6CActor": /* 800A9ABC 000A6A1C 38 00 00 00 */ li r0, 0 /* 800A9AC0 000A6A20 90 03 00 04 */ stw r0, 4(r3) -/* 800A9AC4 000A6A24 4E 80 00 20 */ blr +/* 800A9AC4 000A6A24 4E 80 00 20 */ blr .global "__ct__33TCastToPtr<19CScriptGrapplePoint>FP7CEntity" "__ct__33TCastToPtr<19CScriptGrapplePoint>FP7CEntity": @@ -11689,355 +11689,355 @@ lbl_800A9808: /* 800A9B0C 000A6A6C 81 83 00 00 */ lwz r12, 0(r3) /* 800A9B10 000A6A70 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800A9B14 000A6A74 7D 89 03 A6 */ mtctr r12 -/* 800A9B18 000A6A78 4E 80 04 21 */ bctrl +/* 800A9B18 000A6A78 4E 80 04 21 */ bctrl lbl_800A9B1C: /* 800A9B1C 000A6A7C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800A9B20 000A6A80 7F E3 FB 78 */ mr r3, r31 /* 800A9B24 000A6A84 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800A9B28 000A6A88 7C 08 03 A6 */ mtlr r0 /* 800A9B2C 000A6A8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A9B30 000A6A90 4E 80 00 20 */ blr +/* 800A9B30 000A6A90 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR7CWeapon" "Visit__27TCastToPtr<13CScriptEffect>FR7CWeapon": /* 800A9B34 000A6A94 38 00 00 00 */ li r0, 0 /* 800A9B38 000A6A98 90 03 00 04 */ stw r0, 4(r3) -/* 800A9B3C 000A6A9C 4E 80 00 20 */ blr +/* 800A9B3C 000A6A9C 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR17CWallCrawlerSwarm" "Visit__27TCastToPtr<13CScriptEffect>FR17CWallCrawlerSwarm": /* 800A9B40 000A6AA0 38 00 00 00 */ li r0, 0 /* 800A9B44 000A6AA4 90 03 00 04 */ stw r0, 4(r3) -/* 800A9B48 000A6AA8 4E 80 00 20 */ blr +/* 800A9B48 000A6AA8 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR20CScriptSpindleCamera" "Visit__27TCastToPtr<13CScriptEffect>FR20CScriptSpindleCamera": /* 800A9B4C 000A6AAC 38 00 00 00 */ li r0, 0 /* 800A9B50 000A6AB0 90 03 00 04 */ stw r0, 4(r3) -/* 800A9B54 000A6AB4 4E 80 00 20 */ blr +/* 800A9B54 000A6AB4 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR15CSnakeWeedSwarm" "Visit__27TCastToPtr<13CScriptEffect>FR15CSnakeWeedSwarm": /* 800A9B58 000A6AB8 38 00 00 00 */ li r0, 0 /* 800A9B5C 000A6ABC 90 03 00 04 */ stw r0, 4(r3) -/* 800A9B60 000A6AC0 4E 80 00 20 */ blr +/* 800A9B60 000A6AC0 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR15CScriptWaypoint" "Visit__27TCastToPtr<13CScriptEffect>FR15CScriptWaypoint": /* 800A9B64 000A6AC4 38 00 00 00 */ li r0, 0 /* 800A9B68 000A6AC8 90 03 00 04 */ stw r0, 4(r3) -/* 800A9B6C 000A6ACC 4E 80 00 20 */ blr +/* 800A9B6C 000A6ACC 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR12CScriptWater" "Visit__27TCastToPtr<13CScriptEffect>FR12CScriptWater": /* 800A9B70 000A6AD0 38 00 00 00 */ li r0, 0 /* 800A9B74 000A6AD4 90 03 00 04 */ stw r0, 4(r3) -/* 800A9B78 000A6AD8 4E 80 00 20 */ blr +/* 800A9B78 000A6AD8 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR17CScriptVisorFlare" "Visit__27TCastToPtr<13CScriptEffect>FR17CScriptVisorFlare": /* 800A9B7C 000A6ADC 38 00 00 00 */ li r0, 0 /* 800A9B80 000A6AE0 90 03 00 04 */ stw r0, 4(r3) -/* 800A9B84 000A6AE4 4E 80 00 20 */ blr +/* 800A9B84 000A6AE4 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR14CScriptTrigger" "Visit__27TCastToPtr<13CScriptEffect>FR14CScriptTrigger": /* 800A9B88 000A6AE8 38 00 00 00 */ li r0, 0 /* 800A9B8C 000A6AEC 90 03 00 04 */ stw r0, 4(r3) -/* 800A9B90 000A6AF0 4E 80 00 20 */ blr +/* 800A9B90 000A6AF0 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR12CScriptTimer" "Visit__27TCastToPtr<13CScriptEffect>FR12CScriptTimer": /* 800A9B94 000A6AF4 38 00 00 00 */ li r0, 0 /* 800A9B98 000A6AF8 90 03 00 04 */ stw r0, 4(r3) -/* 800A9B9C 000A6AFC 4E 80 00 20 */ blr +/* 800A9B9C 000A6AFC 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR10CTeamAiMgr" "Visit__27TCastToPtr<13CScriptEffect>FR10CTeamAiMgr": /* 800A9BA0 000A6B00 38 00 00 00 */ li r0, 0 /* 800A9BA4 000A6B04 90 03 00 04 */ stw r0, 4(r3) -/* 800A9BA8 000A6B08 4E 80 00 20 */ blr +/* 800A9BA8 000A6B08 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR21CScriptTargetingPoint" "Visit__27TCastToPtr<13CScriptEffect>FR21CScriptTargetingPoint": /* 800A9BAC 000A6B0C 38 00 00 00 */ li r0, 0 /* 800A9BB0 000A6B10 90 03 00 04 */ stw r0, 4(r3) -/* 800A9BB4 000A6B14 4E 80 00 20 */ blr +/* 800A9BB4 000A6B14 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR25CScriptSpiderBallWaypoint" "Visit__27TCastToPtr<13CScriptEffect>FR25CScriptSpiderBallWaypoint": /* 800A9BB8 000A6B18 38 00 00 00 */ li r0, 0 /* 800A9BBC 000A6B1C 90 03 00 04 */ stw r0, 4(r3) -/* 800A9BC0 000A6B20 4E 80 00 20 */ blr +/* 800A9BC0 000A6B20 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR34CScriptSpiderBallAttractionSurface" "Visit__27TCastToPtr<13CScriptEffect>FR34CScriptSpiderBallAttractionSurface": /* 800A9BC4 000A6B24 38 00 00 00 */ li r0, 0 /* 800A9BC8 000A6B28 90 03 00 04 */ stw r0, 4(r3) -/* 800A9BCC 000A6B2C 4E 80 00 20 */ blr +/* 800A9BCC 000A6B2C 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR22CScriptSpecialFunction" "Visit__27TCastToPtr<13CScriptEffect>FR22CScriptSpecialFunction": /* 800A9BD0 000A6B30 38 00 00 00 */ li r0, 0 /* 800A9BD4 000A6B34 90 03 00 04 */ stw r0, 4(r3) -/* 800A9BD8 000A6B38 4E 80 00 20 */ blr +/* 800A9BD8 000A6B38 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR17CScriptSpawnPoint" "Visit__27TCastToPtr<13CScriptEffect>FR17CScriptSpawnPoint": /* 800A9BDC 000A6B3C 38 00 00 00 */ li r0, 0 /* 800A9BE0 000A6B40 90 03 00 04 */ stw r0, 4(r3) -/* 800A9BE4 000A6B44 4E 80 00 20 */ blr +/* 800A9BE4 000A6B44 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR12CScriptSound" "Visit__27TCastToPtr<13CScriptEffect>FR12CScriptSound": /* 800A9BE8 000A6B48 38 00 00 00 */ li r0, 0 /* 800A9BEC 000A6B4C 90 03 00 04 */ stw r0, 4(r3) -/* 800A9BF0 000A6B50 4E 80 00 20 */ blr +/* 800A9BF0 000A6B50 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR20CScriptRoomAcoustics" "Visit__27TCastToPtr<13CScriptEffect>FR20CScriptRoomAcoustics": /* 800A9BF4 000A6B54 38 00 00 00 */ li r0, 0 /* 800A9BF8 000A6B58 90 03 00 04 */ stw r0, 4(r3) -/* 800A9BFC 000A6B5C 4E 80 00 20 */ blr +/* 800A9BFC 000A6B5C 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR22CScriptPointOfinterest" "Visit__27TCastToPtr<13CScriptEffect>FR22CScriptPointOfinterest": /* 800A9C00 000A6B60 38 00 00 00 */ li r0, 0 /* 800A9C04 000A6B64 90 03 00 04 */ stw r0, 4(r3) -/* 800A9C08 000A6B68 4E 80 00 20 */ blr +/* 800A9C08 000A6B68 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR17CScriptPlayerHint" "Visit__27TCastToPtr<13CScriptEffect>FR17CScriptPlayerHint": /* 800A9C0C 000A6B6C 38 00 00 00 */ li r0, 0 /* 800A9C10 000A6B70 90 03 00 04 */ stw r0, 4(r3) -/* 800A9C14 000A6B74 4E 80 00 20 */ blr +/* 800A9C14 000A6B74 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR15CScriptPlatform" "Visit__27TCastToPtr<13CScriptEffect>FR15CScriptPlatform": /* 800A9C18 000A6B78 38 00 00 00 */ li r0, 0 /* 800A9C1C 000A6B7C 90 03 00 04 */ stw r0, 4(r3) -/* 800A9C20 000A6B80 4E 80 00 20 */ blr +/* 800A9C20 000A6B80 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR13CScriptPickup" "Visit__27TCastToPtr<13CScriptEffect>FR13CScriptPickup": /* 800A9C24 000A6B84 38 00 00 00 */ li r0, 0 /* 800A9C28 000A6B88 90 03 00 04 */ stw r0, 4(r3) -/* 800A9C2C 000A6B8C 4E 80 00 20 */ blr +/* 800A9C2C 000A6B8C 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR15CScriptMazeNode" "Visit__27TCastToPtr<13CScriptEffect>FR15CScriptMazeNode": /* 800A9C30 000A6B90 38 00 00 00 */ li r0, 0 /* 800A9C34 000A6B94 90 03 00 04 */ stw r0, 4(r3) -/* 800A9C38 000A6B98 4E 80 00 20 */ blr +/* 800A9C38 000A6B98 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR16CScriptGunTurret" "Visit__27TCastToPtr<13CScriptEffect>FR16CScriptGunTurret": /* 800A9C3C 000A6B9C 38 00 00 00 */ li r0, 0 /* 800A9C40 000A6BA0 90 03 00 04 */ stw r0, 4(r3) -/* 800A9C44 000A6BA4 4E 80 00 20 */ blr +/* 800A9C44 000A6BA4 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR19CScriptGrapplePoint" "Visit__27TCastToPtr<13CScriptEffect>FR19CScriptGrapplePoint": /* 800A9C48 000A6BA8 38 00 00 00 */ li r0, 0 /* 800A9C4C 000A6BAC 90 03 00 04 */ stw r0, 4(r3) -/* 800A9C50 000A6BB0 4E 80 00 20 */ blr +/* 800A9C50 000A6BB0 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR13CScriptEffect" "Visit__27TCastToPtr<13CScriptEffect>FR13CScriptEffect": /* 800A9C54 000A6BB4 90 83 00 04 */ stw r4, 4(r3) -/* 800A9C58 000A6BB8 4E 80 00 20 */ blr +/* 800A9C58 000A6BB8 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR11CScriptDoor" "Visit__27TCastToPtr<13CScriptEffect>FR11CScriptDoor": /* 800A9C5C 000A6BBC 38 00 00 00 */ li r0, 0 /* 800A9C60 000A6BC0 90 03 00 04 */ stw r0, 4(r3) -/* 800A9C64 000A6BC4 4E 80 00 20 */ blr +/* 800A9C64 000A6BC4 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR11CScriptDock" "Visit__27TCastToPtr<13CScriptEffect>FR11CScriptDock": /* 800A9C68 000A6BC8 38 00 00 00 */ li r0, 0 /* 800A9C6C 000A6BCC 90 03 00 04 */ stw r0, 4(r3) -/* 800A9C70 000A6BD0 4E 80 00 20 */ blr +/* 800A9C70 000A6BD0 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR18CScriptDistanceFog" "Visit__27TCastToPtr<13CScriptEffect>FR18CScriptDistanceFog": /* 800A9C74 000A6BD4 38 00 00 00 */ li r0, 0 /* 800A9C78 000A6BD8 90 03 00 04 */ stw r0, 4(r3) -/* 800A9C7C 000A6BDC 4E 80 00 20 */ blr +/* 800A9C7C 000A6BDC 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR26CScriptDebugCameraWaypoint" "Visit__27TCastToPtr<13CScriptEffect>FR26CScriptDebugCameraWaypoint": /* 800A9C80 000A6BE0 38 00 00 00 */ li r0, 0 /* 800A9C84 000A6BE4 90 03 00 04 */ stw r0, 4(r3) -/* 800A9C88 000A6BE8 4E 80 00 20 */ blr +/* 800A9C88 000A6BE8 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR17CScriptCoverPoint" "Visit__27TCastToPtr<13CScriptEffect>FR17CScriptCoverPoint": /* 800A9C8C 000A6BEC 38 00 00 00 */ li r0, 0 /* 800A9C90 000A6BF0 90 03 00 04 */ stw r0, 4(r3) -/* 800A9C94 000A6BF4 4E 80 00 20 */ blr +/* 800A9C94 000A6BF4 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR21CScriptCameraWaypoint" "Visit__27TCastToPtr<13CScriptEffect>FR21CScriptCameraWaypoint": /* 800A9C98 000A6BF8 38 00 00 00 */ li r0, 0 /* 800A9C9C 000A6BFC 90 03 00 04 */ stw r0, 4(r3) -/* 800A9CA0 000A6C00 4E 80 00 20 */ blr +/* 800A9CA0 000A6C00 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR24CScriptCameraPitchVolume" "Visit__27TCastToPtr<13CScriptEffect>FR24CScriptCameraPitchVolume": /* 800A9CA4 000A6C04 38 00 00 00 */ li r0, 0 /* 800A9CA8 000A6C08 90 03 00 04 */ stw r0, 4(r3) -/* 800A9CAC 000A6C0C 4E 80 00 20 */ blr +/* 800A9CAC 000A6C0C 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR17CScriptCameraHint" "Visit__27TCastToPtr<13CScriptEffect>FR17CScriptCameraHint": /* 800A9CB0 000A6C10 38 00 00 00 */ li r0, 0 /* 800A9CB4 000A6C14 90 03 00 04 */ stw r0, 4(r3) -/* 800A9CB8 000A6C18 4E 80 00 20 */ blr +/* 800A9CB8 000A6C18 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR18CScriptAiJumpPoint" "Visit__27TCastToPtr<13CScriptEffect>FR18CScriptAiJumpPoint": /* 800A9CBC 000A6C1C 38 00 00 00 */ li r0, 0 /* 800A9CC0 000A6C20 90 03 00 04 */ stw r0, 4(r3) -/* 800A9CC4 000A6C24 4E 80 00 20 */ blr +/* 800A9CC4 000A6C24 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR20CScriptActorKeyframe" "Visit__27TCastToPtr<13CScriptEffect>FR20CScriptActorKeyframe": /* 800A9CC8 000A6C28 38 00 00 00 */ li r0, 0 /* 800A9CCC 000A6C2C 90 03 00 04 */ stw r0, 4(r3) -/* 800A9CD0 000A6C30 4E 80 00 20 */ blr +/* 800A9CD0 000A6C30 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR12CScriptActor" "Visit__27TCastToPtr<13CScriptEffect>FR12CScriptActor": /* 800A9CD4 000A6C34 38 00 00 00 */ li r0, 0 /* 800A9CD8 000A6C38 90 03 00 04 */ stw r0, 4(r3) -/* 800A9CDC 000A6C3C 4E 80 00 20 */ blr +/* 800A9CDC 000A6C3C 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR9CRepulsor" "Visit__27TCastToPtr<13CScriptEffect>FR9CRepulsor": /* 800A9CE0 000A6C40 38 00 00 00 */ li r0, 0 /* 800A9CE4 000A6C44 90 03 00 04 */ stw r0, 4(r3) -/* 800A9CE8 000A6C48 4E 80 00 20 */ blr +/* 800A9CE8 000A6C48 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR7CPlayer" "Visit__27TCastToPtr<13CScriptEffect>FR7CPlayer": /* 800A9CEC 000A6C4C 38 00 00 00 */ li r0, 0 /* 800A9CF0 000A6C50 90 03 00 04 */ stw r0, 4(r3) -/* 800A9CF4 000A6C54 4E 80 00 20 */ blr +/* 800A9CF4 000A6C54 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR13CPhysicsActor" "Visit__27TCastToPtr<13CScriptEffect>FR13CPhysicsActor": /* 800A9CF8 000A6C58 38 00 00 00 */ li r0, 0 /* 800A9CFC 000A6C5C 90 03 00 04 */ stw r0, 4(r3) -/* 800A9D00 000A6C60 4E 80 00 20 */ blr +/* 800A9D00 000A6C60 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR3CAi" "Visit__27TCastToPtr<13CScriptEffect>FR3CAi": /* 800A9D04 000A6C64 38 00 00 00 */ li r0, 0 /* 800A9D08 000A6C68 90 03 00 04 */ stw r0, 4(r3) -/* 800A9D0C 000A6C6C 4E 80 00 20 */ blr +/* 800A9D0C 000A6C6C 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR11CPathCamera" "Visit__27TCastToPtr<13CScriptEffect>FR11CPathCamera": /* 800A9D10 000A6C70 38 00 00 00 */ li r0, 0 /* 800A9D14 000A6C74 90 03 00 04 */ stw r0, 4(r3) -/* 800A9D18 000A6C78 4E 80 00 20 */ blr +/* 800A9D18 000A6C78 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR18CMetroidPrimeRelay" "Visit__27TCastToPtr<13CScriptEffect>FR18CMetroidPrimeRelay": /* 800A9D1C 000A6C7C 38 00 00 00 */ li r0, 0 /* 800A9D20 000A6C80 90 03 00 04 */ stw r0, 4(r3) -/* 800A9D24 000A6C84 4E 80 00 20 */ blr +/* 800A9D24 000A6C84 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR19CHUDBillboardEffect" "Visit__27TCastToPtr<13CScriptEffect>FR19CHUDBillboardEffect": /* 800A9D28 000A6C88 38 00 00 00 */ li r0, 0 /* 800A9D2C 000A6C8C 90 03 00 04 */ stw r0, 4(r3) -/* 800A9D30 000A6C90 4E 80 00 20 */ blr +/* 800A9D30 000A6C90 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR15CGameProjectile" "Visit__27TCastToPtr<13CScriptEffect>FR15CGameProjectile": /* 800A9D34 000A6C94 38 00 00 00 */ li r0, 0 /* 800A9D38 000A6C98 90 03 00 04 */ stw r0, 4(r3) -/* 800A9D3C 000A6C9C 4E 80 00 20 */ blr +/* 800A9D3C 000A6C9C 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR10CGameLight" "Visit__27TCastToPtr<13CScriptEffect>FR10CGameLight": /* 800A9D40 000A6CA0 38 00 00 00 */ li r0, 0 /* 800A9D44 000A6CA4 90 03 00 04 */ stw r0, 4(r3) -/* 800A9D48 000A6CA8 4E 80 00 20 */ blr +/* 800A9D48 000A6CA8 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR11CGameCamera" "Visit__27TCastToPtr<13CScriptEffect>FR11CGameCamera": /* 800A9D4C 000A6CAC 38 00 00 00 */ li r0, 0 /* 800A9D50 000A6CB0 90 03 00 04 */ stw r0, 4(r3) -/* 800A9D54 000A6CB4 4E 80 00 20 */ blr +/* 800A9D54 000A6CB4 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR10CFishCloud" "Visit__27TCastToPtr<13CScriptEffect>FR10CFishCloud": /* 800A9D58 000A6CB8 38 00 00 00 */ li r0, 0 /* 800A9D5C 000A6CBC 90 03 00 04 */ stw r0, 4(r3) -/* 800A9D60 000A6CC0 4E 80 00 20 */ blr +/* 800A9D60 000A6CC0 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR18CFirstPersonCamera" "Visit__27TCastToPtr<13CScriptEffect>FR18CFirstPersonCamera": /* 800A9D64 000A6CC4 38 00 00 00 */ li r0, 0 /* 800A9D68 000A6CC8 90 03 00 04 */ stw r0, 4(r3) -/* 800A9D6C 000A6CCC 4E 80 00 20 */ blr +/* 800A9D6C 000A6CCC 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR10CExplosion" "Visit__27TCastToPtr<13CScriptEffect>FR10CExplosion": /* 800A9D70 000A6CD0 38 00 00 00 */ li r0, 0 /* 800A9D74 000A6CD4 90 03 00 04 */ stw r0, 4(r3) -/* 800A9D78 000A6CD8 4E 80 00 20 */ blr +/* 800A9D78 000A6CD8 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR7CEntity" "Visit__27TCastToPtr<13CScriptEffect>FR7CEntity": /* 800A9D7C 000A6CDC 38 00 00 00 */ li r0, 0 /* 800A9D80 000A6CE0 90 03 00 04 */ stw r0, 4(r3) -/* 800A9D84 000A6CE4 4E 80 00 20 */ blr +/* 800A9D84 000A6CE4 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR17CEnergyProjectile" "Visit__27TCastToPtr<13CScriptEffect>FR17CEnergyProjectile": /* 800A9D88 000A6CE8 38 00 00 00 */ li r0, 0 /* 800A9D8C 000A6CEC 90 03 00 04 */ stw r0, 4(r3) -/* 800A9D90 000A6CF0 4E 80 00 20 */ blr +/* 800A9D90 000A6CF0 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR16CDestroyableRock" "Visit__27TCastToPtr<13CScriptEffect>FR16CDestroyableRock": /* 800A9D94 000A6CF4 38 00 00 00 */ li r0, 0 /* 800A9D98 000A6CF8 90 03 00 04 */ stw r0, 4(r3) -/* 800A9D9C 000A6CFC 4E 80 00 20 */ blr +/* 800A9D9C 000A6CFC 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR15CCollisionActor" "Visit__27TCastToPtr<13CScriptEffect>FR15CCollisionActor": /* 800A9DA0 000A6D00 38 00 00 00 */ li r0, 0 /* 800A9DA4 000A6D04 90 03 00 04 */ stw r0, 4(r3) -/* 800A9DA8 000A6D08 4E 80 00 20 */ blr +/* 800A9DA8 000A6D08 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR16CCinematicCamera" "Visit__27TCastToPtr<13CScriptEffect>FR16CCinematicCamera": /* 800A9DAC 000A6D0C 38 00 00 00 */ li r0, 0 /* 800A9DB0 000A6D10 90 03 00 04 */ stw r0, 4(r3) -/* 800A9DB4 000A6D14 4E 80 00 20 */ blr +/* 800A9DB4 000A6D14 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR5CBomb" "Visit__27TCastToPtr<13CScriptEffect>FR5CBomb": /* 800A9DB8 000A6D18 38 00 00 00 */ li r0, 0 /* 800A9DBC 000A6D1C 90 03 00 04 */ stw r0, 4(r3) -/* 800A9DC0 000A6D20 4E 80 00 20 */ blr +/* 800A9DC0 000A6D20 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR11CBallCamera" "Visit__27TCastToPtr<13CScriptEffect>FR11CBallCamera": /* 800A9DC4 000A6D24 38 00 00 00 */ li r0, 0 /* 800A9DC8 000A6D28 90 03 00 04 */ stw r0, 4(r3) -/* 800A9DCC 000A6D2C 4E 80 00 20 */ blr +/* 800A9DCC 000A6D2C 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CScriptEffect>FR6CActor" "Visit__27TCastToPtr<13CScriptEffect>FR6CActor": /* 800A9DD0 000A6D30 38 00 00 00 */ li r0, 0 /* 800A9DD4 000A6D34 90 03 00 04 */ stw r0, 4(r3) -/* 800A9DD8 000A6D38 4E 80 00 20 */ blr +/* 800A9DD8 000A6D38 4E 80 00 20 */ blr .global "__ct__27TCastToPtr<13CScriptEffect>FP7CEntity" "__ct__27TCastToPtr<13CScriptEffect>FP7CEntity": @@ -12061,355 +12061,355 @@ lbl_800A9B1C: /* 800A9E20 000A6D80 81 83 00 00 */ lwz r12, 0(r3) /* 800A9E24 000A6D84 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800A9E28 000A6D88 7D 89 03 A6 */ mtctr r12 -/* 800A9E2C 000A6D8C 4E 80 04 21 */ bctrl +/* 800A9E2C 000A6D8C 4E 80 04 21 */ bctrl lbl_800A9E30: /* 800A9E30 000A6D90 80 01 00 14 */ lwz r0, 0x14(r1) /* 800A9E34 000A6D94 7F E3 FB 78 */ mr r3, r31 /* 800A9E38 000A6D98 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800A9E3C 000A6D9C 7C 08 03 A6 */ mtlr r0 /* 800A9E40 000A6DA0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A9E44 000A6DA4 4E 80 00 20 */ blr +/* 800A9E44 000A6DA4 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR7CWeapon" "Visit__25TCastToPtr<11CScriptDoor>FR7CWeapon": /* 800A9E48 000A6DA8 38 00 00 00 */ li r0, 0 /* 800A9E4C 000A6DAC 90 03 00 04 */ stw r0, 4(r3) -/* 800A9E50 000A6DB0 4E 80 00 20 */ blr +/* 800A9E50 000A6DB0 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR17CWallCrawlerSwarm" "Visit__25TCastToPtr<11CScriptDoor>FR17CWallCrawlerSwarm": /* 800A9E54 000A6DB4 38 00 00 00 */ li r0, 0 /* 800A9E58 000A6DB8 90 03 00 04 */ stw r0, 4(r3) -/* 800A9E5C 000A6DBC 4E 80 00 20 */ blr +/* 800A9E5C 000A6DBC 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR20CScriptSpindleCamera" "Visit__25TCastToPtr<11CScriptDoor>FR20CScriptSpindleCamera": /* 800A9E60 000A6DC0 38 00 00 00 */ li r0, 0 /* 800A9E64 000A6DC4 90 03 00 04 */ stw r0, 4(r3) -/* 800A9E68 000A6DC8 4E 80 00 20 */ blr +/* 800A9E68 000A6DC8 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR15CSnakeWeedSwarm" "Visit__25TCastToPtr<11CScriptDoor>FR15CSnakeWeedSwarm": /* 800A9E6C 000A6DCC 38 00 00 00 */ li r0, 0 /* 800A9E70 000A6DD0 90 03 00 04 */ stw r0, 4(r3) -/* 800A9E74 000A6DD4 4E 80 00 20 */ blr +/* 800A9E74 000A6DD4 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR15CScriptWaypoint" "Visit__25TCastToPtr<11CScriptDoor>FR15CScriptWaypoint": /* 800A9E78 000A6DD8 38 00 00 00 */ li r0, 0 /* 800A9E7C 000A6DDC 90 03 00 04 */ stw r0, 4(r3) -/* 800A9E80 000A6DE0 4E 80 00 20 */ blr +/* 800A9E80 000A6DE0 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR12CScriptWater" "Visit__25TCastToPtr<11CScriptDoor>FR12CScriptWater": /* 800A9E84 000A6DE4 38 00 00 00 */ li r0, 0 /* 800A9E88 000A6DE8 90 03 00 04 */ stw r0, 4(r3) -/* 800A9E8C 000A6DEC 4E 80 00 20 */ blr +/* 800A9E8C 000A6DEC 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR17CScriptVisorFlare" "Visit__25TCastToPtr<11CScriptDoor>FR17CScriptVisorFlare": /* 800A9E90 000A6DF0 38 00 00 00 */ li r0, 0 /* 800A9E94 000A6DF4 90 03 00 04 */ stw r0, 4(r3) -/* 800A9E98 000A6DF8 4E 80 00 20 */ blr +/* 800A9E98 000A6DF8 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR14CScriptTrigger" "Visit__25TCastToPtr<11CScriptDoor>FR14CScriptTrigger": /* 800A9E9C 000A6DFC 38 00 00 00 */ li r0, 0 /* 800A9EA0 000A6E00 90 03 00 04 */ stw r0, 4(r3) -/* 800A9EA4 000A6E04 4E 80 00 20 */ blr +/* 800A9EA4 000A6E04 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR12CScriptTimer" "Visit__25TCastToPtr<11CScriptDoor>FR12CScriptTimer": /* 800A9EA8 000A6E08 38 00 00 00 */ li r0, 0 /* 800A9EAC 000A6E0C 90 03 00 04 */ stw r0, 4(r3) -/* 800A9EB0 000A6E10 4E 80 00 20 */ blr +/* 800A9EB0 000A6E10 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR10CTeamAiMgr" "Visit__25TCastToPtr<11CScriptDoor>FR10CTeamAiMgr": /* 800A9EB4 000A6E14 38 00 00 00 */ li r0, 0 /* 800A9EB8 000A6E18 90 03 00 04 */ stw r0, 4(r3) -/* 800A9EBC 000A6E1C 4E 80 00 20 */ blr +/* 800A9EBC 000A6E1C 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR21CScriptTargetingPoint" "Visit__25TCastToPtr<11CScriptDoor>FR21CScriptTargetingPoint": /* 800A9EC0 000A6E20 38 00 00 00 */ li r0, 0 /* 800A9EC4 000A6E24 90 03 00 04 */ stw r0, 4(r3) -/* 800A9EC8 000A6E28 4E 80 00 20 */ blr +/* 800A9EC8 000A6E28 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR25CScriptSpiderBallWaypoint" "Visit__25TCastToPtr<11CScriptDoor>FR25CScriptSpiderBallWaypoint": /* 800A9ECC 000A6E2C 38 00 00 00 */ li r0, 0 /* 800A9ED0 000A6E30 90 03 00 04 */ stw r0, 4(r3) -/* 800A9ED4 000A6E34 4E 80 00 20 */ blr +/* 800A9ED4 000A6E34 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR34CScriptSpiderBallAttractionSurface" "Visit__25TCastToPtr<11CScriptDoor>FR34CScriptSpiderBallAttractionSurface": /* 800A9ED8 000A6E38 38 00 00 00 */ li r0, 0 /* 800A9EDC 000A6E3C 90 03 00 04 */ stw r0, 4(r3) -/* 800A9EE0 000A6E40 4E 80 00 20 */ blr +/* 800A9EE0 000A6E40 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR22CScriptSpecialFunction" "Visit__25TCastToPtr<11CScriptDoor>FR22CScriptSpecialFunction": /* 800A9EE4 000A6E44 38 00 00 00 */ li r0, 0 /* 800A9EE8 000A6E48 90 03 00 04 */ stw r0, 4(r3) -/* 800A9EEC 000A6E4C 4E 80 00 20 */ blr +/* 800A9EEC 000A6E4C 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR17CScriptSpawnPoint" "Visit__25TCastToPtr<11CScriptDoor>FR17CScriptSpawnPoint": /* 800A9EF0 000A6E50 38 00 00 00 */ li r0, 0 /* 800A9EF4 000A6E54 90 03 00 04 */ stw r0, 4(r3) -/* 800A9EF8 000A6E58 4E 80 00 20 */ blr +/* 800A9EF8 000A6E58 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR12CScriptSound" "Visit__25TCastToPtr<11CScriptDoor>FR12CScriptSound": /* 800A9EFC 000A6E5C 38 00 00 00 */ li r0, 0 /* 800A9F00 000A6E60 90 03 00 04 */ stw r0, 4(r3) -/* 800A9F04 000A6E64 4E 80 00 20 */ blr +/* 800A9F04 000A6E64 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR20CScriptRoomAcoustics" "Visit__25TCastToPtr<11CScriptDoor>FR20CScriptRoomAcoustics": /* 800A9F08 000A6E68 38 00 00 00 */ li r0, 0 /* 800A9F0C 000A6E6C 90 03 00 04 */ stw r0, 4(r3) -/* 800A9F10 000A6E70 4E 80 00 20 */ blr +/* 800A9F10 000A6E70 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR22CScriptPointOfinterest" "Visit__25TCastToPtr<11CScriptDoor>FR22CScriptPointOfinterest": /* 800A9F14 000A6E74 38 00 00 00 */ li r0, 0 /* 800A9F18 000A6E78 90 03 00 04 */ stw r0, 4(r3) -/* 800A9F1C 000A6E7C 4E 80 00 20 */ blr +/* 800A9F1C 000A6E7C 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR17CScriptPlayerHint" "Visit__25TCastToPtr<11CScriptDoor>FR17CScriptPlayerHint": /* 800A9F20 000A6E80 38 00 00 00 */ li r0, 0 /* 800A9F24 000A6E84 90 03 00 04 */ stw r0, 4(r3) -/* 800A9F28 000A6E88 4E 80 00 20 */ blr +/* 800A9F28 000A6E88 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR15CScriptPlatform" "Visit__25TCastToPtr<11CScriptDoor>FR15CScriptPlatform": /* 800A9F2C 000A6E8C 38 00 00 00 */ li r0, 0 /* 800A9F30 000A6E90 90 03 00 04 */ stw r0, 4(r3) -/* 800A9F34 000A6E94 4E 80 00 20 */ blr +/* 800A9F34 000A6E94 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR13CScriptPickup" "Visit__25TCastToPtr<11CScriptDoor>FR13CScriptPickup": /* 800A9F38 000A6E98 38 00 00 00 */ li r0, 0 /* 800A9F3C 000A6E9C 90 03 00 04 */ stw r0, 4(r3) -/* 800A9F40 000A6EA0 4E 80 00 20 */ blr +/* 800A9F40 000A6EA0 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR15CScriptMazeNode" "Visit__25TCastToPtr<11CScriptDoor>FR15CScriptMazeNode": /* 800A9F44 000A6EA4 38 00 00 00 */ li r0, 0 /* 800A9F48 000A6EA8 90 03 00 04 */ stw r0, 4(r3) -/* 800A9F4C 000A6EAC 4E 80 00 20 */ blr +/* 800A9F4C 000A6EAC 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR16CScriptGunTurret" "Visit__25TCastToPtr<11CScriptDoor>FR16CScriptGunTurret": /* 800A9F50 000A6EB0 38 00 00 00 */ li r0, 0 /* 800A9F54 000A6EB4 90 03 00 04 */ stw r0, 4(r3) -/* 800A9F58 000A6EB8 4E 80 00 20 */ blr +/* 800A9F58 000A6EB8 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR19CScriptGrapplePoint" "Visit__25TCastToPtr<11CScriptDoor>FR19CScriptGrapplePoint": /* 800A9F5C 000A6EBC 38 00 00 00 */ li r0, 0 /* 800A9F60 000A6EC0 90 03 00 04 */ stw r0, 4(r3) -/* 800A9F64 000A6EC4 4E 80 00 20 */ blr +/* 800A9F64 000A6EC4 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR13CScriptEffect" "Visit__25TCastToPtr<11CScriptDoor>FR13CScriptEffect": /* 800A9F68 000A6EC8 38 00 00 00 */ li r0, 0 /* 800A9F6C 000A6ECC 90 03 00 04 */ stw r0, 4(r3) -/* 800A9F70 000A6ED0 4E 80 00 20 */ blr +/* 800A9F70 000A6ED0 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR11CScriptDoor" "Visit__25TCastToPtr<11CScriptDoor>FR11CScriptDoor": /* 800A9F74 000A6ED4 90 83 00 04 */ stw r4, 4(r3) -/* 800A9F78 000A6ED8 4E 80 00 20 */ blr +/* 800A9F78 000A6ED8 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR11CScriptDock" "Visit__25TCastToPtr<11CScriptDoor>FR11CScriptDock": /* 800A9F7C 000A6EDC 38 00 00 00 */ li r0, 0 /* 800A9F80 000A6EE0 90 03 00 04 */ stw r0, 4(r3) -/* 800A9F84 000A6EE4 4E 80 00 20 */ blr +/* 800A9F84 000A6EE4 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR18CScriptDistanceFog" "Visit__25TCastToPtr<11CScriptDoor>FR18CScriptDistanceFog": /* 800A9F88 000A6EE8 38 00 00 00 */ li r0, 0 /* 800A9F8C 000A6EEC 90 03 00 04 */ stw r0, 4(r3) -/* 800A9F90 000A6EF0 4E 80 00 20 */ blr +/* 800A9F90 000A6EF0 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR26CScriptDebugCameraWaypoint" "Visit__25TCastToPtr<11CScriptDoor>FR26CScriptDebugCameraWaypoint": /* 800A9F94 000A6EF4 38 00 00 00 */ li r0, 0 /* 800A9F98 000A6EF8 90 03 00 04 */ stw r0, 4(r3) -/* 800A9F9C 000A6EFC 4E 80 00 20 */ blr +/* 800A9F9C 000A6EFC 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR17CScriptCoverPoint" "Visit__25TCastToPtr<11CScriptDoor>FR17CScriptCoverPoint": /* 800A9FA0 000A6F00 38 00 00 00 */ li r0, 0 /* 800A9FA4 000A6F04 90 03 00 04 */ stw r0, 4(r3) -/* 800A9FA8 000A6F08 4E 80 00 20 */ blr +/* 800A9FA8 000A6F08 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR21CScriptCameraWaypoint" "Visit__25TCastToPtr<11CScriptDoor>FR21CScriptCameraWaypoint": /* 800A9FAC 000A6F0C 38 00 00 00 */ li r0, 0 /* 800A9FB0 000A6F10 90 03 00 04 */ stw r0, 4(r3) -/* 800A9FB4 000A6F14 4E 80 00 20 */ blr +/* 800A9FB4 000A6F14 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR24CScriptCameraPitchVolume" "Visit__25TCastToPtr<11CScriptDoor>FR24CScriptCameraPitchVolume": /* 800A9FB8 000A6F18 38 00 00 00 */ li r0, 0 /* 800A9FBC 000A6F1C 90 03 00 04 */ stw r0, 4(r3) -/* 800A9FC0 000A6F20 4E 80 00 20 */ blr +/* 800A9FC0 000A6F20 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR17CScriptCameraHint" "Visit__25TCastToPtr<11CScriptDoor>FR17CScriptCameraHint": /* 800A9FC4 000A6F24 38 00 00 00 */ li r0, 0 /* 800A9FC8 000A6F28 90 03 00 04 */ stw r0, 4(r3) -/* 800A9FCC 000A6F2C 4E 80 00 20 */ blr +/* 800A9FCC 000A6F2C 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR18CScriptAiJumpPoint" "Visit__25TCastToPtr<11CScriptDoor>FR18CScriptAiJumpPoint": /* 800A9FD0 000A6F30 38 00 00 00 */ li r0, 0 /* 800A9FD4 000A6F34 90 03 00 04 */ stw r0, 4(r3) -/* 800A9FD8 000A6F38 4E 80 00 20 */ blr +/* 800A9FD8 000A6F38 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR20CScriptActorKeyframe" "Visit__25TCastToPtr<11CScriptDoor>FR20CScriptActorKeyframe": /* 800A9FDC 000A6F3C 38 00 00 00 */ li r0, 0 /* 800A9FE0 000A6F40 90 03 00 04 */ stw r0, 4(r3) -/* 800A9FE4 000A6F44 4E 80 00 20 */ blr +/* 800A9FE4 000A6F44 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR12CScriptActor" "Visit__25TCastToPtr<11CScriptDoor>FR12CScriptActor": /* 800A9FE8 000A6F48 38 00 00 00 */ li r0, 0 /* 800A9FEC 000A6F4C 90 03 00 04 */ stw r0, 4(r3) -/* 800A9FF0 000A6F50 4E 80 00 20 */ blr +/* 800A9FF0 000A6F50 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR9CRepulsor" "Visit__25TCastToPtr<11CScriptDoor>FR9CRepulsor": /* 800A9FF4 000A6F54 38 00 00 00 */ li r0, 0 /* 800A9FF8 000A6F58 90 03 00 04 */ stw r0, 4(r3) -/* 800A9FFC 000A6F5C 4E 80 00 20 */ blr +/* 800A9FFC 000A6F5C 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR7CPlayer" "Visit__25TCastToPtr<11CScriptDoor>FR7CPlayer": /* 800AA000 000A6F60 38 00 00 00 */ li r0, 0 /* 800AA004 000A6F64 90 03 00 04 */ stw r0, 4(r3) -/* 800AA008 000A6F68 4E 80 00 20 */ blr +/* 800AA008 000A6F68 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR13CPhysicsActor" "Visit__25TCastToPtr<11CScriptDoor>FR13CPhysicsActor": /* 800AA00C 000A6F6C 38 00 00 00 */ li r0, 0 /* 800AA010 000A6F70 90 03 00 04 */ stw r0, 4(r3) -/* 800AA014 000A6F74 4E 80 00 20 */ blr +/* 800AA014 000A6F74 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR3CAi" "Visit__25TCastToPtr<11CScriptDoor>FR3CAi": /* 800AA018 000A6F78 38 00 00 00 */ li r0, 0 /* 800AA01C 000A6F7C 90 03 00 04 */ stw r0, 4(r3) -/* 800AA020 000A6F80 4E 80 00 20 */ blr +/* 800AA020 000A6F80 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR11CPathCamera" "Visit__25TCastToPtr<11CScriptDoor>FR11CPathCamera": /* 800AA024 000A6F84 38 00 00 00 */ li r0, 0 /* 800AA028 000A6F88 90 03 00 04 */ stw r0, 4(r3) -/* 800AA02C 000A6F8C 4E 80 00 20 */ blr +/* 800AA02C 000A6F8C 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR18CMetroidPrimeRelay" "Visit__25TCastToPtr<11CScriptDoor>FR18CMetroidPrimeRelay": /* 800AA030 000A6F90 38 00 00 00 */ li r0, 0 /* 800AA034 000A6F94 90 03 00 04 */ stw r0, 4(r3) -/* 800AA038 000A6F98 4E 80 00 20 */ blr +/* 800AA038 000A6F98 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR19CHUDBillboardEffect" "Visit__25TCastToPtr<11CScriptDoor>FR19CHUDBillboardEffect": /* 800AA03C 000A6F9C 38 00 00 00 */ li r0, 0 /* 800AA040 000A6FA0 90 03 00 04 */ stw r0, 4(r3) -/* 800AA044 000A6FA4 4E 80 00 20 */ blr +/* 800AA044 000A6FA4 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR15CGameProjectile" "Visit__25TCastToPtr<11CScriptDoor>FR15CGameProjectile": /* 800AA048 000A6FA8 38 00 00 00 */ li r0, 0 /* 800AA04C 000A6FAC 90 03 00 04 */ stw r0, 4(r3) -/* 800AA050 000A6FB0 4E 80 00 20 */ blr +/* 800AA050 000A6FB0 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR10CGameLight" "Visit__25TCastToPtr<11CScriptDoor>FR10CGameLight": /* 800AA054 000A6FB4 38 00 00 00 */ li r0, 0 /* 800AA058 000A6FB8 90 03 00 04 */ stw r0, 4(r3) -/* 800AA05C 000A6FBC 4E 80 00 20 */ blr +/* 800AA05C 000A6FBC 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR11CGameCamera" "Visit__25TCastToPtr<11CScriptDoor>FR11CGameCamera": /* 800AA060 000A6FC0 38 00 00 00 */ li r0, 0 /* 800AA064 000A6FC4 90 03 00 04 */ stw r0, 4(r3) -/* 800AA068 000A6FC8 4E 80 00 20 */ blr +/* 800AA068 000A6FC8 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR10CFishCloud" "Visit__25TCastToPtr<11CScriptDoor>FR10CFishCloud": /* 800AA06C 000A6FCC 38 00 00 00 */ li r0, 0 /* 800AA070 000A6FD0 90 03 00 04 */ stw r0, 4(r3) -/* 800AA074 000A6FD4 4E 80 00 20 */ blr +/* 800AA074 000A6FD4 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR18CFirstPersonCamera" "Visit__25TCastToPtr<11CScriptDoor>FR18CFirstPersonCamera": /* 800AA078 000A6FD8 38 00 00 00 */ li r0, 0 /* 800AA07C 000A6FDC 90 03 00 04 */ stw r0, 4(r3) -/* 800AA080 000A6FE0 4E 80 00 20 */ blr +/* 800AA080 000A6FE0 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR10CExplosion" "Visit__25TCastToPtr<11CScriptDoor>FR10CExplosion": /* 800AA084 000A6FE4 38 00 00 00 */ li r0, 0 /* 800AA088 000A6FE8 90 03 00 04 */ stw r0, 4(r3) -/* 800AA08C 000A6FEC 4E 80 00 20 */ blr +/* 800AA08C 000A6FEC 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR7CEntity" "Visit__25TCastToPtr<11CScriptDoor>FR7CEntity": /* 800AA090 000A6FF0 38 00 00 00 */ li r0, 0 /* 800AA094 000A6FF4 90 03 00 04 */ stw r0, 4(r3) -/* 800AA098 000A6FF8 4E 80 00 20 */ blr +/* 800AA098 000A6FF8 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR17CEnergyProjectile" "Visit__25TCastToPtr<11CScriptDoor>FR17CEnergyProjectile": /* 800AA09C 000A6FFC 38 00 00 00 */ li r0, 0 /* 800AA0A0 000A7000 90 03 00 04 */ stw r0, 4(r3) -/* 800AA0A4 000A7004 4E 80 00 20 */ blr +/* 800AA0A4 000A7004 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR16CDestroyableRock" "Visit__25TCastToPtr<11CScriptDoor>FR16CDestroyableRock": /* 800AA0A8 000A7008 38 00 00 00 */ li r0, 0 /* 800AA0AC 000A700C 90 03 00 04 */ stw r0, 4(r3) -/* 800AA0B0 000A7010 4E 80 00 20 */ blr +/* 800AA0B0 000A7010 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR15CCollisionActor" "Visit__25TCastToPtr<11CScriptDoor>FR15CCollisionActor": /* 800AA0B4 000A7014 38 00 00 00 */ li r0, 0 /* 800AA0B8 000A7018 90 03 00 04 */ stw r0, 4(r3) -/* 800AA0BC 000A701C 4E 80 00 20 */ blr +/* 800AA0BC 000A701C 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR16CCinematicCamera" "Visit__25TCastToPtr<11CScriptDoor>FR16CCinematicCamera": /* 800AA0C0 000A7020 38 00 00 00 */ li r0, 0 /* 800AA0C4 000A7024 90 03 00 04 */ stw r0, 4(r3) -/* 800AA0C8 000A7028 4E 80 00 20 */ blr +/* 800AA0C8 000A7028 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR5CBomb" "Visit__25TCastToPtr<11CScriptDoor>FR5CBomb": /* 800AA0CC 000A702C 38 00 00 00 */ li r0, 0 /* 800AA0D0 000A7030 90 03 00 04 */ stw r0, 4(r3) -/* 800AA0D4 000A7034 4E 80 00 20 */ blr +/* 800AA0D4 000A7034 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR11CBallCamera" "Visit__25TCastToPtr<11CScriptDoor>FR11CBallCamera": /* 800AA0D8 000A7038 38 00 00 00 */ li r0, 0 /* 800AA0DC 000A703C 90 03 00 04 */ stw r0, 4(r3) -/* 800AA0E0 000A7040 4E 80 00 20 */ blr +/* 800AA0E0 000A7040 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDoor>FR6CActor" "Visit__25TCastToPtr<11CScriptDoor>FR6CActor": /* 800AA0E4 000A7044 38 00 00 00 */ li r0, 0 /* 800AA0E8 000A7048 90 03 00 04 */ stw r0, 4(r3) -/* 800AA0EC 000A704C 4E 80 00 20 */ blr +/* 800AA0EC 000A704C 4E 80 00 20 */ blr .global "__ct__25TCastToPtr<11CScriptDoor>FP7CEntity" "__ct__25TCastToPtr<11CScriptDoor>FP7CEntity": @@ -12433,355 +12433,355 @@ lbl_800A9E30: /* 800AA134 000A7094 81 83 00 00 */ lwz r12, 0(r3) /* 800AA138 000A7098 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800AA13C 000A709C 7D 89 03 A6 */ mtctr r12 -/* 800AA140 000A70A0 4E 80 04 21 */ bctrl +/* 800AA140 000A70A0 4E 80 04 21 */ bctrl lbl_800AA144: /* 800AA144 000A70A4 80 01 00 14 */ lwz r0, 0x14(r1) /* 800AA148 000A70A8 7F E3 FB 78 */ mr r3, r31 /* 800AA14C 000A70AC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800AA150 000A70B0 7C 08 03 A6 */ mtlr r0 /* 800AA154 000A70B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800AA158 000A70B8 4E 80 00 20 */ blr +/* 800AA158 000A70B8 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR7CWeapon" "Visit__25TCastToPtr<11CScriptDock>FR7CWeapon": /* 800AA15C 000A70BC 38 00 00 00 */ li r0, 0 /* 800AA160 000A70C0 90 03 00 04 */ stw r0, 4(r3) -/* 800AA164 000A70C4 4E 80 00 20 */ blr +/* 800AA164 000A70C4 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR17CWallCrawlerSwarm" "Visit__25TCastToPtr<11CScriptDock>FR17CWallCrawlerSwarm": /* 800AA168 000A70C8 38 00 00 00 */ li r0, 0 /* 800AA16C 000A70CC 90 03 00 04 */ stw r0, 4(r3) -/* 800AA170 000A70D0 4E 80 00 20 */ blr +/* 800AA170 000A70D0 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR20CScriptSpindleCamera" "Visit__25TCastToPtr<11CScriptDock>FR20CScriptSpindleCamera": /* 800AA174 000A70D4 38 00 00 00 */ li r0, 0 /* 800AA178 000A70D8 90 03 00 04 */ stw r0, 4(r3) -/* 800AA17C 000A70DC 4E 80 00 20 */ blr +/* 800AA17C 000A70DC 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR15CSnakeWeedSwarm" "Visit__25TCastToPtr<11CScriptDock>FR15CSnakeWeedSwarm": /* 800AA180 000A70E0 38 00 00 00 */ li r0, 0 /* 800AA184 000A70E4 90 03 00 04 */ stw r0, 4(r3) -/* 800AA188 000A70E8 4E 80 00 20 */ blr +/* 800AA188 000A70E8 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR15CScriptWaypoint" "Visit__25TCastToPtr<11CScriptDock>FR15CScriptWaypoint": /* 800AA18C 000A70EC 38 00 00 00 */ li r0, 0 /* 800AA190 000A70F0 90 03 00 04 */ stw r0, 4(r3) -/* 800AA194 000A70F4 4E 80 00 20 */ blr +/* 800AA194 000A70F4 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR12CScriptWater" "Visit__25TCastToPtr<11CScriptDock>FR12CScriptWater": /* 800AA198 000A70F8 38 00 00 00 */ li r0, 0 /* 800AA19C 000A70FC 90 03 00 04 */ stw r0, 4(r3) -/* 800AA1A0 000A7100 4E 80 00 20 */ blr +/* 800AA1A0 000A7100 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR17CScriptVisorFlare" "Visit__25TCastToPtr<11CScriptDock>FR17CScriptVisorFlare": /* 800AA1A4 000A7104 38 00 00 00 */ li r0, 0 /* 800AA1A8 000A7108 90 03 00 04 */ stw r0, 4(r3) -/* 800AA1AC 000A710C 4E 80 00 20 */ blr +/* 800AA1AC 000A710C 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR14CScriptTrigger" "Visit__25TCastToPtr<11CScriptDock>FR14CScriptTrigger": /* 800AA1B0 000A7110 38 00 00 00 */ li r0, 0 /* 800AA1B4 000A7114 90 03 00 04 */ stw r0, 4(r3) -/* 800AA1B8 000A7118 4E 80 00 20 */ blr +/* 800AA1B8 000A7118 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR12CScriptTimer" "Visit__25TCastToPtr<11CScriptDock>FR12CScriptTimer": /* 800AA1BC 000A711C 38 00 00 00 */ li r0, 0 /* 800AA1C0 000A7120 90 03 00 04 */ stw r0, 4(r3) -/* 800AA1C4 000A7124 4E 80 00 20 */ blr +/* 800AA1C4 000A7124 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR10CTeamAiMgr" "Visit__25TCastToPtr<11CScriptDock>FR10CTeamAiMgr": /* 800AA1C8 000A7128 38 00 00 00 */ li r0, 0 /* 800AA1CC 000A712C 90 03 00 04 */ stw r0, 4(r3) -/* 800AA1D0 000A7130 4E 80 00 20 */ blr +/* 800AA1D0 000A7130 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR21CScriptTargetingPoint" "Visit__25TCastToPtr<11CScriptDock>FR21CScriptTargetingPoint": /* 800AA1D4 000A7134 38 00 00 00 */ li r0, 0 /* 800AA1D8 000A7138 90 03 00 04 */ stw r0, 4(r3) -/* 800AA1DC 000A713C 4E 80 00 20 */ blr +/* 800AA1DC 000A713C 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR25CScriptSpiderBallWaypoint" "Visit__25TCastToPtr<11CScriptDock>FR25CScriptSpiderBallWaypoint": /* 800AA1E0 000A7140 38 00 00 00 */ li r0, 0 /* 800AA1E4 000A7144 90 03 00 04 */ stw r0, 4(r3) -/* 800AA1E8 000A7148 4E 80 00 20 */ blr +/* 800AA1E8 000A7148 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR34CScriptSpiderBallAttractionSurface" "Visit__25TCastToPtr<11CScriptDock>FR34CScriptSpiderBallAttractionSurface": /* 800AA1EC 000A714C 38 00 00 00 */ li r0, 0 /* 800AA1F0 000A7150 90 03 00 04 */ stw r0, 4(r3) -/* 800AA1F4 000A7154 4E 80 00 20 */ blr +/* 800AA1F4 000A7154 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR22CScriptSpecialFunction" "Visit__25TCastToPtr<11CScriptDock>FR22CScriptSpecialFunction": /* 800AA1F8 000A7158 38 00 00 00 */ li r0, 0 /* 800AA1FC 000A715C 90 03 00 04 */ stw r0, 4(r3) -/* 800AA200 000A7160 4E 80 00 20 */ blr +/* 800AA200 000A7160 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR17CScriptSpawnPoint" "Visit__25TCastToPtr<11CScriptDock>FR17CScriptSpawnPoint": /* 800AA204 000A7164 38 00 00 00 */ li r0, 0 /* 800AA208 000A7168 90 03 00 04 */ stw r0, 4(r3) -/* 800AA20C 000A716C 4E 80 00 20 */ blr +/* 800AA20C 000A716C 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR12CScriptSound" "Visit__25TCastToPtr<11CScriptDock>FR12CScriptSound": /* 800AA210 000A7170 38 00 00 00 */ li r0, 0 /* 800AA214 000A7174 90 03 00 04 */ stw r0, 4(r3) -/* 800AA218 000A7178 4E 80 00 20 */ blr +/* 800AA218 000A7178 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR20CScriptRoomAcoustics" "Visit__25TCastToPtr<11CScriptDock>FR20CScriptRoomAcoustics": /* 800AA21C 000A717C 38 00 00 00 */ li r0, 0 /* 800AA220 000A7180 90 03 00 04 */ stw r0, 4(r3) -/* 800AA224 000A7184 4E 80 00 20 */ blr +/* 800AA224 000A7184 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR22CScriptPointOfinterest" "Visit__25TCastToPtr<11CScriptDock>FR22CScriptPointOfinterest": /* 800AA228 000A7188 38 00 00 00 */ li r0, 0 /* 800AA22C 000A718C 90 03 00 04 */ stw r0, 4(r3) -/* 800AA230 000A7190 4E 80 00 20 */ blr +/* 800AA230 000A7190 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR17CScriptPlayerHint" "Visit__25TCastToPtr<11CScriptDock>FR17CScriptPlayerHint": /* 800AA234 000A7194 38 00 00 00 */ li r0, 0 /* 800AA238 000A7198 90 03 00 04 */ stw r0, 4(r3) -/* 800AA23C 000A719C 4E 80 00 20 */ blr +/* 800AA23C 000A719C 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR15CScriptPlatform" "Visit__25TCastToPtr<11CScriptDock>FR15CScriptPlatform": /* 800AA240 000A71A0 38 00 00 00 */ li r0, 0 /* 800AA244 000A71A4 90 03 00 04 */ stw r0, 4(r3) -/* 800AA248 000A71A8 4E 80 00 20 */ blr +/* 800AA248 000A71A8 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR13CScriptPickup" "Visit__25TCastToPtr<11CScriptDock>FR13CScriptPickup": /* 800AA24C 000A71AC 38 00 00 00 */ li r0, 0 /* 800AA250 000A71B0 90 03 00 04 */ stw r0, 4(r3) -/* 800AA254 000A71B4 4E 80 00 20 */ blr +/* 800AA254 000A71B4 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR15CScriptMazeNode" "Visit__25TCastToPtr<11CScriptDock>FR15CScriptMazeNode": /* 800AA258 000A71B8 38 00 00 00 */ li r0, 0 /* 800AA25C 000A71BC 90 03 00 04 */ stw r0, 4(r3) -/* 800AA260 000A71C0 4E 80 00 20 */ blr +/* 800AA260 000A71C0 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR16CScriptGunTurret" "Visit__25TCastToPtr<11CScriptDock>FR16CScriptGunTurret": /* 800AA264 000A71C4 38 00 00 00 */ li r0, 0 /* 800AA268 000A71C8 90 03 00 04 */ stw r0, 4(r3) -/* 800AA26C 000A71CC 4E 80 00 20 */ blr +/* 800AA26C 000A71CC 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR19CScriptGrapplePoint" "Visit__25TCastToPtr<11CScriptDock>FR19CScriptGrapplePoint": /* 800AA270 000A71D0 38 00 00 00 */ li r0, 0 /* 800AA274 000A71D4 90 03 00 04 */ stw r0, 4(r3) -/* 800AA278 000A71D8 4E 80 00 20 */ blr +/* 800AA278 000A71D8 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR13CScriptEffect" "Visit__25TCastToPtr<11CScriptDock>FR13CScriptEffect": /* 800AA27C 000A71DC 38 00 00 00 */ li r0, 0 /* 800AA280 000A71E0 90 03 00 04 */ stw r0, 4(r3) -/* 800AA284 000A71E4 4E 80 00 20 */ blr +/* 800AA284 000A71E4 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR11CScriptDoor" "Visit__25TCastToPtr<11CScriptDock>FR11CScriptDoor": /* 800AA288 000A71E8 38 00 00 00 */ li r0, 0 /* 800AA28C 000A71EC 90 03 00 04 */ stw r0, 4(r3) -/* 800AA290 000A71F0 4E 80 00 20 */ blr +/* 800AA290 000A71F0 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR11CScriptDock" "Visit__25TCastToPtr<11CScriptDock>FR11CScriptDock": /* 800AA294 000A71F4 90 83 00 04 */ stw r4, 4(r3) -/* 800AA298 000A71F8 4E 80 00 20 */ blr +/* 800AA298 000A71F8 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR18CScriptDistanceFog" "Visit__25TCastToPtr<11CScriptDock>FR18CScriptDistanceFog": /* 800AA29C 000A71FC 38 00 00 00 */ li r0, 0 /* 800AA2A0 000A7200 90 03 00 04 */ stw r0, 4(r3) -/* 800AA2A4 000A7204 4E 80 00 20 */ blr +/* 800AA2A4 000A7204 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR26CScriptDebugCameraWaypoint" "Visit__25TCastToPtr<11CScriptDock>FR26CScriptDebugCameraWaypoint": /* 800AA2A8 000A7208 38 00 00 00 */ li r0, 0 /* 800AA2AC 000A720C 90 03 00 04 */ stw r0, 4(r3) -/* 800AA2B0 000A7210 4E 80 00 20 */ blr +/* 800AA2B0 000A7210 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR17CScriptCoverPoint" "Visit__25TCastToPtr<11CScriptDock>FR17CScriptCoverPoint": /* 800AA2B4 000A7214 38 00 00 00 */ li r0, 0 /* 800AA2B8 000A7218 90 03 00 04 */ stw r0, 4(r3) -/* 800AA2BC 000A721C 4E 80 00 20 */ blr +/* 800AA2BC 000A721C 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR21CScriptCameraWaypoint" "Visit__25TCastToPtr<11CScriptDock>FR21CScriptCameraWaypoint": /* 800AA2C0 000A7220 38 00 00 00 */ li r0, 0 /* 800AA2C4 000A7224 90 03 00 04 */ stw r0, 4(r3) -/* 800AA2C8 000A7228 4E 80 00 20 */ blr +/* 800AA2C8 000A7228 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR24CScriptCameraPitchVolume" "Visit__25TCastToPtr<11CScriptDock>FR24CScriptCameraPitchVolume": /* 800AA2CC 000A722C 38 00 00 00 */ li r0, 0 /* 800AA2D0 000A7230 90 03 00 04 */ stw r0, 4(r3) -/* 800AA2D4 000A7234 4E 80 00 20 */ blr +/* 800AA2D4 000A7234 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR17CScriptCameraHint" "Visit__25TCastToPtr<11CScriptDock>FR17CScriptCameraHint": /* 800AA2D8 000A7238 38 00 00 00 */ li r0, 0 /* 800AA2DC 000A723C 90 03 00 04 */ stw r0, 4(r3) -/* 800AA2E0 000A7240 4E 80 00 20 */ blr +/* 800AA2E0 000A7240 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR18CScriptAiJumpPoint" "Visit__25TCastToPtr<11CScriptDock>FR18CScriptAiJumpPoint": /* 800AA2E4 000A7244 38 00 00 00 */ li r0, 0 /* 800AA2E8 000A7248 90 03 00 04 */ stw r0, 4(r3) -/* 800AA2EC 000A724C 4E 80 00 20 */ blr +/* 800AA2EC 000A724C 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR20CScriptActorKeyframe" "Visit__25TCastToPtr<11CScriptDock>FR20CScriptActorKeyframe": /* 800AA2F0 000A7250 38 00 00 00 */ li r0, 0 /* 800AA2F4 000A7254 90 03 00 04 */ stw r0, 4(r3) -/* 800AA2F8 000A7258 4E 80 00 20 */ blr +/* 800AA2F8 000A7258 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR12CScriptActor" "Visit__25TCastToPtr<11CScriptDock>FR12CScriptActor": /* 800AA2FC 000A725C 38 00 00 00 */ li r0, 0 /* 800AA300 000A7260 90 03 00 04 */ stw r0, 4(r3) -/* 800AA304 000A7264 4E 80 00 20 */ blr +/* 800AA304 000A7264 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR9CRepulsor" "Visit__25TCastToPtr<11CScriptDock>FR9CRepulsor": /* 800AA308 000A7268 38 00 00 00 */ li r0, 0 /* 800AA30C 000A726C 90 03 00 04 */ stw r0, 4(r3) -/* 800AA310 000A7270 4E 80 00 20 */ blr +/* 800AA310 000A7270 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR7CPlayer" "Visit__25TCastToPtr<11CScriptDock>FR7CPlayer": /* 800AA314 000A7274 38 00 00 00 */ li r0, 0 /* 800AA318 000A7278 90 03 00 04 */ stw r0, 4(r3) -/* 800AA31C 000A727C 4E 80 00 20 */ blr +/* 800AA31C 000A727C 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR13CPhysicsActor" "Visit__25TCastToPtr<11CScriptDock>FR13CPhysicsActor": /* 800AA320 000A7280 38 00 00 00 */ li r0, 0 /* 800AA324 000A7284 90 03 00 04 */ stw r0, 4(r3) -/* 800AA328 000A7288 4E 80 00 20 */ blr +/* 800AA328 000A7288 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR3CAi" "Visit__25TCastToPtr<11CScriptDock>FR3CAi": /* 800AA32C 000A728C 38 00 00 00 */ li r0, 0 /* 800AA330 000A7290 90 03 00 04 */ stw r0, 4(r3) -/* 800AA334 000A7294 4E 80 00 20 */ blr +/* 800AA334 000A7294 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR11CPathCamera" "Visit__25TCastToPtr<11CScriptDock>FR11CPathCamera": /* 800AA338 000A7298 38 00 00 00 */ li r0, 0 /* 800AA33C 000A729C 90 03 00 04 */ stw r0, 4(r3) -/* 800AA340 000A72A0 4E 80 00 20 */ blr +/* 800AA340 000A72A0 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR18CMetroidPrimeRelay" "Visit__25TCastToPtr<11CScriptDock>FR18CMetroidPrimeRelay": /* 800AA344 000A72A4 38 00 00 00 */ li r0, 0 /* 800AA348 000A72A8 90 03 00 04 */ stw r0, 4(r3) -/* 800AA34C 000A72AC 4E 80 00 20 */ blr +/* 800AA34C 000A72AC 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR19CHUDBillboardEffect" "Visit__25TCastToPtr<11CScriptDock>FR19CHUDBillboardEffect": /* 800AA350 000A72B0 38 00 00 00 */ li r0, 0 /* 800AA354 000A72B4 90 03 00 04 */ stw r0, 4(r3) -/* 800AA358 000A72B8 4E 80 00 20 */ blr +/* 800AA358 000A72B8 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR15CGameProjectile" "Visit__25TCastToPtr<11CScriptDock>FR15CGameProjectile": /* 800AA35C 000A72BC 38 00 00 00 */ li r0, 0 /* 800AA360 000A72C0 90 03 00 04 */ stw r0, 4(r3) -/* 800AA364 000A72C4 4E 80 00 20 */ blr +/* 800AA364 000A72C4 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR10CGameLight" "Visit__25TCastToPtr<11CScriptDock>FR10CGameLight": /* 800AA368 000A72C8 38 00 00 00 */ li r0, 0 /* 800AA36C 000A72CC 90 03 00 04 */ stw r0, 4(r3) -/* 800AA370 000A72D0 4E 80 00 20 */ blr +/* 800AA370 000A72D0 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR11CGameCamera" "Visit__25TCastToPtr<11CScriptDock>FR11CGameCamera": /* 800AA374 000A72D4 38 00 00 00 */ li r0, 0 /* 800AA378 000A72D8 90 03 00 04 */ stw r0, 4(r3) -/* 800AA37C 000A72DC 4E 80 00 20 */ blr +/* 800AA37C 000A72DC 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR10CFishCloud" "Visit__25TCastToPtr<11CScriptDock>FR10CFishCloud": /* 800AA380 000A72E0 38 00 00 00 */ li r0, 0 /* 800AA384 000A72E4 90 03 00 04 */ stw r0, 4(r3) -/* 800AA388 000A72E8 4E 80 00 20 */ blr +/* 800AA388 000A72E8 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR18CFirstPersonCamera" "Visit__25TCastToPtr<11CScriptDock>FR18CFirstPersonCamera": /* 800AA38C 000A72EC 38 00 00 00 */ li r0, 0 /* 800AA390 000A72F0 90 03 00 04 */ stw r0, 4(r3) -/* 800AA394 000A72F4 4E 80 00 20 */ blr +/* 800AA394 000A72F4 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR10CExplosion" "Visit__25TCastToPtr<11CScriptDock>FR10CExplosion": /* 800AA398 000A72F8 38 00 00 00 */ li r0, 0 /* 800AA39C 000A72FC 90 03 00 04 */ stw r0, 4(r3) -/* 800AA3A0 000A7300 4E 80 00 20 */ blr +/* 800AA3A0 000A7300 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR7CEntity" "Visit__25TCastToPtr<11CScriptDock>FR7CEntity": /* 800AA3A4 000A7304 38 00 00 00 */ li r0, 0 /* 800AA3A8 000A7308 90 03 00 04 */ stw r0, 4(r3) -/* 800AA3AC 000A730C 4E 80 00 20 */ blr +/* 800AA3AC 000A730C 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR17CEnergyProjectile" "Visit__25TCastToPtr<11CScriptDock>FR17CEnergyProjectile": /* 800AA3B0 000A7310 38 00 00 00 */ li r0, 0 /* 800AA3B4 000A7314 90 03 00 04 */ stw r0, 4(r3) -/* 800AA3B8 000A7318 4E 80 00 20 */ blr +/* 800AA3B8 000A7318 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR16CDestroyableRock" "Visit__25TCastToPtr<11CScriptDock>FR16CDestroyableRock": /* 800AA3BC 000A731C 38 00 00 00 */ li r0, 0 /* 800AA3C0 000A7320 90 03 00 04 */ stw r0, 4(r3) -/* 800AA3C4 000A7324 4E 80 00 20 */ blr +/* 800AA3C4 000A7324 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR15CCollisionActor" "Visit__25TCastToPtr<11CScriptDock>FR15CCollisionActor": /* 800AA3C8 000A7328 38 00 00 00 */ li r0, 0 /* 800AA3CC 000A732C 90 03 00 04 */ stw r0, 4(r3) -/* 800AA3D0 000A7330 4E 80 00 20 */ blr +/* 800AA3D0 000A7330 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR16CCinematicCamera" "Visit__25TCastToPtr<11CScriptDock>FR16CCinematicCamera": /* 800AA3D4 000A7334 38 00 00 00 */ li r0, 0 /* 800AA3D8 000A7338 90 03 00 04 */ stw r0, 4(r3) -/* 800AA3DC 000A733C 4E 80 00 20 */ blr +/* 800AA3DC 000A733C 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR5CBomb" "Visit__25TCastToPtr<11CScriptDock>FR5CBomb": /* 800AA3E0 000A7340 38 00 00 00 */ li r0, 0 /* 800AA3E4 000A7344 90 03 00 04 */ stw r0, 4(r3) -/* 800AA3E8 000A7348 4E 80 00 20 */ blr +/* 800AA3E8 000A7348 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR11CBallCamera" "Visit__25TCastToPtr<11CScriptDock>FR11CBallCamera": /* 800AA3EC 000A734C 38 00 00 00 */ li r0, 0 /* 800AA3F0 000A7350 90 03 00 04 */ stw r0, 4(r3) -/* 800AA3F4 000A7354 4E 80 00 20 */ blr +/* 800AA3F4 000A7354 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CScriptDock>FR6CActor" "Visit__25TCastToPtr<11CScriptDock>FR6CActor": /* 800AA3F8 000A7358 38 00 00 00 */ li r0, 0 /* 800AA3FC 000A735C 90 03 00 04 */ stw r0, 4(r3) -/* 800AA400 000A7360 4E 80 00 20 */ blr +/* 800AA400 000A7360 4E 80 00 20 */ blr .global "__ct__25TCastToPtr<11CScriptDock>FP7CEntity" "__ct__25TCastToPtr<11CScriptDock>FP7CEntity": @@ -12805,355 +12805,355 @@ lbl_800AA144: /* 800AA448 000A73A8 81 83 00 00 */ lwz r12, 0(r3) /* 800AA44C 000A73AC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800AA450 000A73B0 7D 89 03 A6 */ mtctr r12 -/* 800AA454 000A73B4 4E 80 04 21 */ bctrl +/* 800AA454 000A73B4 4E 80 04 21 */ bctrl lbl_800AA458: /* 800AA458 000A73B8 80 01 00 14 */ lwz r0, 0x14(r1) /* 800AA45C 000A73BC 7F E3 FB 78 */ mr r3, r31 /* 800AA460 000A73C0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800AA464 000A73C4 7C 08 03 A6 */ mtlr r0 /* 800AA468 000A73C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800AA46C 000A73CC 4E 80 00 20 */ blr +/* 800AA46C 000A73CC 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR7CWeapon" "Visit__32TCastToPtr<18CScriptDistanceFog>FR7CWeapon": /* 800AA470 000A73D0 38 00 00 00 */ li r0, 0 /* 800AA474 000A73D4 90 03 00 04 */ stw r0, 4(r3) -/* 800AA478 000A73D8 4E 80 00 20 */ blr +/* 800AA478 000A73D8 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR17CWallCrawlerSwarm" "Visit__32TCastToPtr<18CScriptDistanceFog>FR17CWallCrawlerSwarm": /* 800AA47C 000A73DC 38 00 00 00 */ li r0, 0 /* 800AA480 000A73E0 90 03 00 04 */ stw r0, 4(r3) -/* 800AA484 000A73E4 4E 80 00 20 */ blr +/* 800AA484 000A73E4 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR20CScriptSpindleCamera" "Visit__32TCastToPtr<18CScriptDistanceFog>FR20CScriptSpindleCamera": /* 800AA488 000A73E8 38 00 00 00 */ li r0, 0 /* 800AA48C 000A73EC 90 03 00 04 */ stw r0, 4(r3) -/* 800AA490 000A73F0 4E 80 00 20 */ blr +/* 800AA490 000A73F0 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR15CSnakeWeedSwarm" "Visit__32TCastToPtr<18CScriptDistanceFog>FR15CSnakeWeedSwarm": /* 800AA494 000A73F4 38 00 00 00 */ li r0, 0 /* 800AA498 000A73F8 90 03 00 04 */ stw r0, 4(r3) -/* 800AA49C 000A73FC 4E 80 00 20 */ blr +/* 800AA49C 000A73FC 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR15CScriptWaypoint" "Visit__32TCastToPtr<18CScriptDistanceFog>FR15CScriptWaypoint": /* 800AA4A0 000A7400 38 00 00 00 */ li r0, 0 /* 800AA4A4 000A7404 90 03 00 04 */ stw r0, 4(r3) -/* 800AA4A8 000A7408 4E 80 00 20 */ blr +/* 800AA4A8 000A7408 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR12CScriptWater" "Visit__32TCastToPtr<18CScriptDistanceFog>FR12CScriptWater": /* 800AA4AC 000A740C 38 00 00 00 */ li r0, 0 /* 800AA4B0 000A7410 90 03 00 04 */ stw r0, 4(r3) -/* 800AA4B4 000A7414 4E 80 00 20 */ blr +/* 800AA4B4 000A7414 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR17CScriptVisorFlare" "Visit__32TCastToPtr<18CScriptDistanceFog>FR17CScriptVisorFlare": /* 800AA4B8 000A7418 38 00 00 00 */ li r0, 0 /* 800AA4BC 000A741C 90 03 00 04 */ stw r0, 4(r3) -/* 800AA4C0 000A7420 4E 80 00 20 */ blr +/* 800AA4C0 000A7420 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR14CScriptTrigger" "Visit__32TCastToPtr<18CScriptDistanceFog>FR14CScriptTrigger": /* 800AA4C4 000A7424 38 00 00 00 */ li r0, 0 /* 800AA4C8 000A7428 90 03 00 04 */ stw r0, 4(r3) -/* 800AA4CC 000A742C 4E 80 00 20 */ blr +/* 800AA4CC 000A742C 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR12CScriptTimer" "Visit__32TCastToPtr<18CScriptDistanceFog>FR12CScriptTimer": /* 800AA4D0 000A7430 38 00 00 00 */ li r0, 0 /* 800AA4D4 000A7434 90 03 00 04 */ stw r0, 4(r3) -/* 800AA4D8 000A7438 4E 80 00 20 */ blr +/* 800AA4D8 000A7438 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR10CTeamAiMgr" "Visit__32TCastToPtr<18CScriptDistanceFog>FR10CTeamAiMgr": /* 800AA4DC 000A743C 38 00 00 00 */ li r0, 0 /* 800AA4E0 000A7440 90 03 00 04 */ stw r0, 4(r3) -/* 800AA4E4 000A7444 4E 80 00 20 */ blr +/* 800AA4E4 000A7444 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR21CScriptTargetingPoint" "Visit__32TCastToPtr<18CScriptDistanceFog>FR21CScriptTargetingPoint": /* 800AA4E8 000A7448 38 00 00 00 */ li r0, 0 /* 800AA4EC 000A744C 90 03 00 04 */ stw r0, 4(r3) -/* 800AA4F0 000A7450 4E 80 00 20 */ blr +/* 800AA4F0 000A7450 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR25CScriptSpiderBallWaypoint" "Visit__32TCastToPtr<18CScriptDistanceFog>FR25CScriptSpiderBallWaypoint": /* 800AA4F4 000A7454 38 00 00 00 */ li r0, 0 /* 800AA4F8 000A7458 90 03 00 04 */ stw r0, 4(r3) -/* 800AA4FC 000A745C 4E 80 00 20 */ blr +/* 800AA4FC 000A745C 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR34CScriptSpiderBallAttractionSurface" "Visit__32TCastToPtr<18CScriptDistanceFog>FR34CScriptSpiderBallAttractionSurface": /* 800AA500 000A7460 38 00 00 00 */ li r0, 0 /* 800AA504 000A7464 90 03 00 04 */ stw r0, 4(r3) -/* 800AA508 000A7468 4E 80 00 20 */ blr +/* 800AA508 000A7468 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR22CScriptSpecialFunction" "Visit__32TCastToPtr<18CScriptDistanceFog>FR22CScriptSpecialFunction": /* 800AA50C 000A746C 38 00 00 00 */ li r0, 0 /* 800AA510 000A7470 90 03 00 04 */ stw r0, 4(r3) -/* 800AA514 000A7474 4E 80 00 20 */ blr +/* 800AA514 000A7474 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR17CScriptSpawnPoint" "Visit__32TCastToPtr<18CScriptDistanceFog>FR17CScriptSpawnPoint": /* 800AA518 000A7478 38 00 00 00 */ li r0, 0 /* 800AA51C 000A747C 90 03 00 04 */ stw r0, 4(r3) -/* 800AA520 000A7480 4E 80 00 20 */ blr +/* 800AA520 000A7480 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR12CScriptSound" "Visit__32TCastToPtr<18CScriptDistanceFog>FR12CScriptSound": /* 800AA524 000A7484 38 00 00 00 */ li r0, 0 /* 800AA528 000A7488 90 03 00 04 */ stw r0, 4(r3) -/* 800AA52C 000A748C 4E 80 00 20 */ blr +/* 800AA52C 000A748C 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR20CScriptRoomAcoustics" "Visit__32TCastToPtr<18CScriptDistanceFog>FR20CScriptRoomAcoustics": /* 800AA530 000A7490 38 00 00 00 */ li r0, 0 /* 800AA534 000A7494 90 03 00 04 */ stw r0, 4(r3) -/* 800AA538 000A7498 4E 80 00 20 */ blr +/* 800AA538 000A7498 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR22CScriptPointOfinterest" "Visit__32TCastToPtr<18CScriptDistanceFog>FR22CScriptPointOfinterest": /* 800AA53C 000A749C 38 00 00 00 */ li r0, 0 /* 800AA540 000A74A0 90 03 00 04 */ stw r0, 4(r3) -/* 800AA544 000A74A4 4E 80 00 20 */ blr +/* 800AA544 000A74A4 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR17CScriptPlayerHint" "Visit__32TCastToPtr<18CScriptDistanceFog>FR17CScriptPlayerHint": /* 800AA548 000A74A8 38 00 00 00 */ li r0, 0 /* 800AA54C 000A74AC 90 03 00 04 */ stw r0, 4(r3) -/* 800AA550 000A74B0 4E 80 00 20 */ blr +/* 800AA550 000A74B0 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR15CScriptPlatform" "Visit__32TCastToPtr<18CScriptDistanceFog>FR15CScriptPlatform": /* 800AA554 000A74B4 38 00 00 00 */ li r0, 0 /* 800AA558 000A74B8 90 03 00 04 */ stw r0, 4(r3) -/* 800AA55C 000A74BC 4E 80 00 20 */ blr +/* 800AA55C 000A74BC 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR13CScriptPickup" "Visit__32TCastToPtr<18CScriptDistanceFog>FR13CScriptPickup": /* 800AA560 000A74C0 38 00 00 00 */ li r0, 0 /* 800AA564 000A74C4 90 03 00 04 */ stw r0, 4(r3) -/* 800AA568 000A74C8 4E 80 00 20 */ blr +/* 800AA568 000A74C8 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR15CScriptMazeNode" "Visit__32TCastToPtr<18CScriptDistanceFog>FR15CScriptMazeNode": /* 800AA56C 000A74CC 38 00 00 00 */ li r0, 0 /* 800AA570 000A74D0 90 03 00 04 */ stw r0, 4(r3) -/* 800AA574 000A74D4 4E 80 00 20 */ blr +/* 800AA574 000A74D4 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR16CScriptGunTurret" "Visit__32TCastToPtr<18CScriptDistanceFog>FR16CScriptGunTurret": /* 800AA578 000A74D8 38 00 00 00 */ li r0, 0 /* 800AA57C 000A74DC 90 03 00 04 */ stw r0, 4(r3) -/* 800AA580 000A74E0 4E 80 00 20 */ blr +/* 800AA580 000A74E0 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR19CScriptGrapplePoint" "Visit__32TCastToPtr<18CScriptDistanceFog>FR19CScriptGrapplePoint": /* 800AA584 000A74E4 38 00 00 00 */ li r0, 0 /* 800AA588 000A74E8 90 03 00 04 */ stw r0, 4(r3) -/* 800AA58C 000A74EC 4E 80 00 20 */ blr +/* 800AA58C 000A74EC 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR13CScriptEffect" "Visit__32TCastToPtr<18CScriptDistanceFog>FR13CScriptEffect": /* 800AA590 000A74F0 38 00 00 00 */ li r0, 0 /* 800AA594 000A74F4 90 03 00 04 */ stw r0, 4(r3) -/* 800AA598 000A74F8 4E 80 00 20 */ blr +/* 800AA598 000A74F8 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR11CScriptDoor" "Visit__32TCastToPtr<18CScriptDistanceFog>FR11CScriptDoor": /* 800AA59C 000A74FC 38 00 00 00 */ li r0, 0 /* 800AA5A0 000A7500 90 03 00 04 */ stw r0, 4(r3) -/* 800AA5A4 000A7504 4E 80 00 20 */ blr +/* 800AA5A4 000A7504 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR11CScriptDock" "Visit__32TCastToPtr<18CScriptDistanceFog>FR11CScriptDock": /* 800AA5A8 000A7508 38 00 00 00 */ li r0, 0 /* 800AA5AC 000A750C 90 03 00 04 */ stw r0, 4(r3) -/* 800AA5B0 000A7510 4E 80 00 20 */ blr +/* 800AA5B0 000A7510 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR18CScriptDistanceFog" "Visit__32TCastToPtr<18CScriptDistanceFog>FR18CScriptDistanceFog": /* 800AA5B4 000A7514 90 83 00 04 */ stw r4, 4(r3) -/* 800AA5B8 000A7518 4E 80 00 20 */ blr +/* 800AA5B8 000A7518 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR26CScriptDebugCameraWaypoint" "Visit__32TCastToPtr<18CScriptDistanceFog>FR26CScriptDebugCameraWaypoint": /* 800AA5BC 000A751C 38 00 00 00 */ li r0, 0 /* 800AA5C0 000A7520 90 03 00 04 */ stw r0, 4(r3) -/* 800AA5C4 000A7524 4E 80 00 20 */ blr +/* 800AA5C4 000A7524 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR17CScriptCoverPoint" "Visit__32TCastToPtr<18CScriptDistanceFog>FR17CScriptCoverPoint": /* 800AA5C8 000A7528 38 00 00 00 */ li r0, 0 /* 800AA5CC 000A752C 90 03 00 04 */ stw r0, 4(r3) -/* 800AA5D0 000A7530 4E 80 00 20 */ blr +/* 800AA5D0 000A7530 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR21CScriptCameraWaypoint" "Visit__32TCastToPtr<18CScriptDistanceFog>FR21CScriptCameraWaypoint": /* 800AA5D4 000A7534 38 00 00 00 */ li r0, 0 /* 800AA5D8 000A7538 90 03 00 04 */ stw r0, 4(r3) -/* 800AA5DC 000A753C 4E 80 00 20 */ blr +/* 800AA5DC 000A753C 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR24CScriptCameraPitchVolume" "Visit__32TCastToPtr<18CScriptDistanceFog>FR24CScriptCameraPitchVolume": /* 800AA5E0 000A7540 38 00 00 00 */ li r0, 0 /* 800AA5E4 000A7544 90 03 00 04 */ stw r0, 4(r3) -/* 800AA5E8 000A7548 4E 80 00 20 */ blr +/* 800AA5E8 000A7548 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR17CScriptCameraHint" "Visit__32TCastToPtr<18CScriptDistanceFog>FR17CScriptCameraHint": /* 800AA5EC 000A754C 38 00 00 00 */ li r0, 0 /* 800AA5F0 000A7550 90 03 00 04 */ stw r0, 4(r3) -/* 800AA5F4 000A7554 4E 80 00 20 */ blr +/* 800AA5F4 000A7554 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR18CScriptAiJumpPoint" "Visit__32TCastToPtr<18CScriptDistanceFog>FR18CScriptAiJumpPoint": /* 800AA5F8 000A7558 38 00 00 00 */ li r0, 0 /* 800AA5FC 000A755C 90 03 00 04 */ stw r0, 4(r3) -/* 800AA600 000A7560 4E 80 00 20 */ blr +/* 800AA600 000A7560 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR20CScriptActorKeyframe" "Visit__32TCastToPtr<18CScriptDistanceFog>FR20CScriptActorKeyframe": /* 800AA604 000A7564 38 00 00 00 */ li r0, 0 /* 800AA608 000A7568 90 03 00 04 */ stw r0, 4(r3) -/* 800AA60C 000A756C 4E 80 00 20 */ blr +/* 800AA60C 000A756C 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR12CScriptActor" "Visit__32TCastToPtr<18CScriptDistanceFog>FR12CScriptActor": /* 800AA610 000A7570 38 00 00 00 */ li r0, 0 /* 800AA614 000A7574 90 03 00 04 */ stw r0, 4(r3) -/* 800AA618 000A7578 4E 80 00 20 */ blr +/* 800AA618 000A7578 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR9CRepulsor" "Visit__32TCastToPtr<18CScriptDistanceFog>FR9CRepulsor": /* 800AA61C 000A757C 38 00 00 00 */ li r0, 0 /* 800AA620 000A7580 90 03 00 04 */ stw r0, 4(r3) -/* 800AA624 000A7584 4E 80 00 20 */ blr +/* 800AA624 000A7584 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR7CPlayer" "Visit__32TCastToPtr<18CScriptDistanceFog>FR7CPlayer": /* 800AA628 000A7588 38 00 00 00 */ li r0, 0 /* 800AA62C 000A758C 90 03 00 04 */ stw r0, 4(r3) -/* 800AA630 000A7590 4E 80 00 20 */ blr +/* 800AA630 000A7590 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR13CPhysicsActor" "Visit__32TCastToPtr<18CScriptDistanceFog>FR13CPhysicsActor": /* 800AA634 000A7594 38 00 00 00 */ li r0, 0 /* 800AA638 000A7598 90 03 00 04 */ stw r0, 4(r3) -/* 800AA63C 000A759C 4E 80 00 20 */ blr +/* 800AA63C 000A759C 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR3CAi" "Visit__32TCastToPtr<18CScriptDistanceFog>FR3CAi": /* 800AA640 000A75A0 38 00 00 00 */ li r0, 0 /* 800AA644 000A75A4 90 03 00 04 */ stw r0, 4(r3) -/* 800AA648 000A75A8 4E 80 00 20 */ blr +/* 800AA648 000A75A8 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR11CPathCamera" "Visit__32TCastToPtr<18CScriptDistanceFog>FR11CPathCamera": /* 800AA64C 000A75AC 38 00 00 00 */ li r0, 0 /* 800AA650 000A75B0 90 03 00 04 */ stw r0, 4(r3) -/* 800AA654 000A75B4 4E 80 00 20 */ blr +/* 800AA654 000A75B4 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR18CMetroidPrimeRelay" "Visit__32TCastToPtr<18CScriptDistanceFog>FR18CMetroidPrimeRelay": /* 800AA658 000A75B8 38 00 00 00 */ li r0, 0 /* 800AA65C 000A75BC 90 03 00 04 */ stw r0, 4(r3) -/* 800AA660 000A75C0 4E 80 00 20 */ blr +/* 800AA660 000A75C0 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR19CHUDBillboardEffect" "Visit__32TCastToPtr<18CScriptDistanceFog>FR19CHUDBillboardEffect": /* 800AA664 000A75C4 38 00 00 00 */ li r0, 0 /* 800AA668 000A75C8 90 03 00 04 */ stw r0, 4(r3) -/* 800AA66C 000A75CC 4E 80 00 20 */ blr +/* 800AA66C 000A75CC 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR15CGameProjectile" "Visit__32TCastToPtr<18CScriptDistanceFog>FR15CGameProjectile": /* 800AA670 000A75D0 38 00 00 00 */ li r0, 0 /* 800AA674 000A75D4 90 03 00 04 */ stw r0, 4(r3) -/* 800AA678 000A75D8 4E 80 00 20 */ blr +/* 800AA678 000A75D8 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR10CGameLight" "Visit__32TCastToPtr<18CScriptDistanceFog>FR10CGameLight": /* 800AA67C 000A75DC 38 00 00 00 */ li r0, 0 /* 800AA680 000A75E0 90 03 00 04 */ stw r0, 4(r3) -/* 800AA684 000A75E4 4E 80 00 20 */ blr +/* 800AA684 000A75E4 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR11CGameCamera" "Visit__32TCastToPtr<18CScriptDistanceFog>FR11CGameCamera": /* 800AA688 000A75E8 38 00 00 00 */ li r0, 0 /* 800AA68C 000A75EC 90 03 00 04 */ stw r0, 4(r3) -/* 800AA690 000A75F0 4E 80 00 20 */ blr +/* 800AA690 000A75F0 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR10CFishCloud" "Visit__32TCastToPtr<18CScriptDistanceFog>FR10CFishCloud": /* 800AA694 000A75F4 38 00 00 00 */ li r0, 0 /* 800AA698 000A75F8 90 03 00 04 */ stw r0, 4(r3) -/* 800AA69C 000A75FC 4E 80 00 20 */ blr +/* 800AA69C 000A75FC 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR18CFirstPersonCamera" "Visit__32TCastToPtr<18CScriptDistanceFog>FR18CFirstPersonCamera": /* 800AA6A0 000A7600 38 00 00 00 */ li r0, 0 /* 800AA6A4 000A7604 90 03 00 04 */ stw r0, 4(r3) -/* 800AA6A8 000A7608 4E 80 00 20 */ blr +/* 800AA6A8 000A7608 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR10CExplosion" "Visit__32TCastToPtr<18CScriptDistanceFog>FR10CExplosion": /* 800AA6AC 000A760C 38 00 00 00 */ li r0, 0 /* 800AA6B0 000A7610 90 03 00 04 */ stw r0, 4(r3) -/* 800AA6B4 000A7614 4E 80 00 20 */ blr +/* 800AA6B4 000A7614 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR7CEntity" "Visit__32TCastToPtr<18CScriptDistanceFog>FR7CEntity": /* 800AA6B8 000A7618 38 00 00 00 */ li r0, 0 /* 800AA6BC 000A761C 90 03 00 04 */ stw r0, 4(r3) -/* 800AA6C0 000A7620 4E 80 00 20 */ blr +/* 800AA6C0 000A7620 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR17CEnergyProjectile" "Visit__32TCastToPtr<18CScriptDistanceFog>FR17CEnergyProjectile": /* 800AA6C4 000A7624 38 00 00 00 */ li r0, 0 /* 800AA6C8 000A7628 90 03 00 04 */ stw r0, 4(r3) -/* 800AA6CC 000A762C 4E 80 00 20 */ blr +/* 800AA6CC 000A762C 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR16CDestroyableRock" "Visit__32TCastToPtr<18CScriptDistanceFog>FR16CDestroyableRock": /* 800AA6D0 000A7630 38 00 00 00 */ li r0, 0 /* 800AA6D4 000A7634 90 03 00 04 */ stw r0, 4(r3) -/* 800AA6D8 000A7638 4E 80 00 20 */ blr +/* 800AA6D8 000A7638 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR15CCollisionActor" "Visit__32TCastToPtr<18CScriptDistanceFog>FR15CCollisionActor": /* 800AA6DC 000A763C 38 00 00 00 */ li r0, 0 /* 800AA6E0 000A7640 90 03 00 04 */ stw r0, 4(r3) -/* 800AA6E4 000A7644 4E 80 00 20 */ blr +/* 800AA6E4 000A7644 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR16CCinematicCamera" "Visit__32TCastToPtr<18CScriptDistanceFog>FR16CCinematicCamera": /* 800AA6E8 000A7648 38 00 00 00 */ li r0, 0 /* 800AA6EC 000A764C 90 03 00 04 */ stw r0, 4(r3) -/* 800AA6F0 000A7650 4E 80 00 20 */ blr +/* 800AA6F0 000A7650 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR5CBomb" "Visit__32TCastToPtr<18CScriptDistanceFog>FR5CBomb": /* 800AA6F4 000A7654 38 00 00 00 */ li r0, 0 /* 800AA6F8 000A7658 90 03 00 04 */ stw r0, 4(r3) -/* 800AA6FC 000A765C 4E 80 00 20 */ blr +/* 800AA6FC 000A765C 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR11CBallCamera" "Visit__32TCastToPtr<18CScriptDistanceFog>FR11CBallCamera": /* 800AA700 000A7660 38 00 00 00 */ li r0, 0 /* 800AA704 000A7664 90 03 00 04 */ stw r0, 4(r3) -/* 800AA708 000A7668 4E 80 00 20 */ blr +/* 800AA708 000A7668 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptDistanceFog>FR6CActor" "Visit__32TCastToPtr<18CScriptDistanceFog>FR6CActor": /* 800AA70C 000A766C 38 00 00 00 */ li r0, 0 /* 800AA710 000A7670 90 03 00 04 */ stw r0, 4(r3) -/* 800AA714 000A7674 4E 80 00 20 */ blr +/* 800AA714 000A7674 4E 80 00 20 */ blr .global "__ct__32TCastToPtr<18CScriptDistanceFog>FP7CEntity" "__ct__32TCastToPtr<18CScriptDistanceFog>FP7CEntity": @@ -13177,355 +13177,355 @@ lbl_800AA458: /* 800AA75C 000A76BC 81 83 00 00 */ lwz r12, 0(r3) /* 800AA760 000A76C0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800AA764 000A76C4 7D 89 03 A6 */ mtctr r12 -/* 800AA768 000A76C8 4E 80 04 21 */ bctrl +/* 800AA768 000A76C8 4E 80 04 21 */ bctrl lbl_800AA76C: /* 800AA76C 000A76CC 80 01 00 14 */ lwz r0, 0x14(r1) /* 800AA770 000A76D0 7F E3 FB 78 */ mr r3, r31 /* 800AA774 000A76D4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800AA778 000A76D8 7C 08 03 A6 */ mtlr r0 /* 800AA77C 000A76DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800AA780 000A76E0 4E 80 00 20 */ blr +/* 800AA780 000A76E0 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR7CWeapon" "Visit__31TCastToPtr<17CScriptCoverPoint>FR7CWeapon": /* 800AA784 000A76E4 38 00 00 00 */ li r0, 0 /* 800AA788 000A76E8 90 03 00 04 */ stw r0, 4(r3) -/* 800AA78C 000A76EC 4E 80 00 20 */ blr +/* 800AA78C 000A76EC 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR17CWallCrawlerSwarm" "Visit__31TCastToPtr<17CScriptCoverPoint>FR17CWallCrawlerSwarm": /* 800AA790 000A76F0 38 00 00 00 */ li r0, 0 /* 800AA794 000A76F4 90 03 00 04 */ stw r0, 4(r3) -/* 800AA798 000A76F8 4E 80 00 20 */ blr +/* 800AA798 000A76F8 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR20CScriptSpindleCamera" "Visit__31TCastToPtr<17CScriptCoverPoint>FR20CScriptSpindleCamera": /* 800AA79C 000A76FC 38 00 00 00 */ li r0, 0 /* 800AA7A0 000A7700 90 03 00 04 */ stw r0, 4(r3) -/* 800AA7A4 000A7704 4E 80 00 20 */ blr +/* 800AA7A4 000A7704 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR15CSnakeWeedSwarm" "Visit__31TCastToPtr<17CScriptCoverPoint>FR15CSnakeWeedSwarm": /* 800AA7A8 000A7708 38 00 00 00 */ li r0, 0 /* 800AA7AC 000A770C 90 03 00 04 */ stw r0, 4(r3) -/* 800AA7B0 000A7710 4E 80 00 20 */ blr +/* 800AA7B0 000A7710 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR15CScriptWaypoint" "Visit__31TCastToPtr<17CScriptCoverPoint>FR15CScriptWaypoint": /* 800AA7B4 000A7714 38 00 00 00 */ li r0, 0 /* 800AA7B8 000A7718 90 03 00 04 */ stw r0, 4(r3) -/* 800AA7BC 000A771C 4E 80 00 20 */ blr +/* 800AA7BC 000A771C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR12CScriptWater" "Visit__31TCastToPtr<17CScriptCoverPoint>FR12CScriptWater": /* 800AA7C0 000A7720 38 00 00 00 */ li r0, 0 /* 800AA7C4 000A7724 90 03 00 04 */ stw r0, 4(r3) -/* 800AA7C8 000A7728 4E 80 00 20 */ blr +/* 800AA7C8 000A7728 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR17CScriptVisorFlare" "Visit__31TCastToPtr<17CScriptCoverPoint>FR17CScriptVisorFlare": /* 800AA7CC 000A772C 38 00 00 00 */ li r0, 0 /* 800AA7D0 000A7730 90 03 00 04 */ stw r0, 4(r3) -/* 800AA7D4 000A7734 4E 80 00 20 */ blr +/* 800AA7D4 000A7734 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR14CScriptTrigger" "Visit__31TCastToPtr<17CScriptCoverPoint>FR14CScriptTrigger": /* 800AA7D8 000A7738 38 00 00 00 */ li r0, 0 /* 800AA7DC 000A773C 90 03 00 04 */ stw r0, 4(r3) -/* 800AA7E0 000A7740 4E 80 00 20 */ blr +/* 800AA7E0 000A7740 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR12CScriptTimer" "Visit__31TCastToPtr<17CScriptCoverPoint>FR12CScriptTimer": /* 800AA7E4 000A7744 38 00 00 00 */ li r0, 0 /* 800AA7E8 000A7748 90 03 00 04 */ stw r0, 4(r3) -/* 800AA7EC 000A774C 4E 80 00 20 */ blr +/* 800AA7EC 000A774C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR10CTeamAiMgr" "Visit__31TCastToPtr<17CScriptCoverPoint>FR10CTeamAiMgr": /* 800AA7F0 000A7750 38 00 00 00 */ li r0, 0 /* 800AA7F4 000A7754 90 03 00 04 */ stw r0, 4(r3) -/* 800AA7F8 000A7758 4E 80 00 20 */ blr +/* 800AA7F8 000A7758 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR21CScriptTargetingPoint" "Visit__31TCastToPtr<17CScriptCoverPoint>FR21CScriptTargetingPoint": /* 800AA7FC 000A775C 38 00 00 00 */ li r0, 0 /* 800AA800 000A7760 90 03 00 04 */ stw r0, 4(r3) -/* 800AA804 000A7764 4E 80 00 20 */ blr +/* 800AA804 000A7764 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR25CScriptSpiderBallWaypoint" "Visit__31TCastToPtr<17CScriptCoverPoint>FR25CScriptSpiderBallWaypoint": /* 800AA808 000A7768 38 00 00 00 */ li r0, 0 /* 800AA80C 000A776C 90 03 00 04 */ stw r0, 4(r3) -/* 800AA810 000A7770 4E 80 00 20 */ blr +/* 800AA810 000A7770 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR34CScriptSpiderBallAttractionSurface" "Visit__31TCastToPtr<17CScriptCoverPoint>FR34CScriptSpiderBallAttractionSurface": /* 800AA814 000A7774 38 00 00 00 */ li r0, 0 /* 800AA818 000A7778 90 03 00 04 */ stw r0, 4(r3) -/* 800AA81C 000A777C 4E 80 00 20 */ blr +/* 800AA81C 000A777C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR22CScriptSpecialFunction" "Visit__31TCastToPtr<17CScriptCoverPoint>FR22CScriptSpecialFunction": /* 800AA820 000A7780 38 00 00 00 */ li r0, 0 /* 800AA824 000A7784 90 03 00 04 */ stw r0, 4(r3) -/* 800AA828 000A7788 4E 80 00 20 */ blr +/* 800AA828 000A7788 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR17CScriptSpawnPoint" "Visit__31TCastToPtr<17CScriptCoverPoint>FR17CScriptSpawnPoint": /* 800AA82C 000A778C 38 00 00 00 */ li r0, 0 /* 800AA830 000A7790 90 03 00 04 */ stw r0, 4(r3) -/* 800AA834 000A7794 4E 80 00 20 */ blr +/* 800AA834 000A7794 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR12CScriptSound" "Visit__31TCastToPtr<17CScriptCoverPoint>FR12CScriptSound": /* 800AA838 000A7798 38 00 00 00 */ li r0, 0 /* 800AA83C 000A779C 90 03 00 04 */ stw r0, 4(r3) -/* 800AA840 000A77A0 4E 80 00 20 */ blr +/* 800AA840 000A77A0 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR20CScriptRoomAcoustics" "Visit__31TCastToPtr<17CScriptCoverPoint>FR20CScriptRoomAcoustics": /* 800AA844 000A77A4 38 00 00 00 */ li r0, 0 /* 800AA848 000A77A8 90 03 00 04 */ stw r0, 4(r3) -/* 800AA84C 000A77AC 4E 80 00 20 */ blr +/* 800AA84C 000A77AC 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR22CScriptPointOfinterest" "Visit__31TCastToPtr<17CScriptCoverPoint>FR22CScriptPointOfinterest": /* 800AA850 000A77B0 38 00 00 00 */ li r0, 0 /* 800AA854 000A77B4 90 03 00 04 */ stw r0, 4(r3) -/* 800AA858 000A77B8 4E 80 00 20 */ blr +/* 800AA858 000A77B8 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR17CScriptPlayerHint" "Visit__31TCastToPtr<17CScriptCoverPoint>FR17CScriptPlayerHint": /* 800AA85C 000A77BC 38 00 00 00 */ li r0, 0 /* 800AA860 000A77C0 90 03 00 04 */ stw r0, 4(r3) -/* 800AA864 000A77C4 4E 80 00 20 */ blr +/* 800AA864 000A77C4 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR15CScriptPlatform" "Visit__31TCastToPtr<17CScriptCoverPoint>FR15CScriptPlatform": /* 800AA868 000A77C8 38 00 00 00 */ li r0, 0 /* 800AA86C 000A77CC 90 03 00 04 */ stw r0, 4(r3) -/* 800AA870 000A77D0 4E 80 00 20 */ blr +/* 800AA870 000A77D0 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR13CScriptPickup" "Visit__31TCastToPtr<17CScriptCoverPoint>FR13CScriptPickup": /* 800AA874 000A77D4 38 00 00 00 */ li r0, 0 /* 800AA878 000A77D8 90 03 00 04 */ stw r0, 4(r3) -/* 800AA87C 000A77DC 4E 80 00 20 */ blr +/* 800AA87C 000A77DC 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR15CScriptMazeNode" "Visit__31TCastToPtr<17CScriptCoverPoint>FR15CScriptMazeNode": /* 800AA880 000A77E0 38 00 00 00 */ li r0, 0 /* 800AA884 000A77E4 90 03 00 04 */ stw r0, 4(r3) -/* 800AA888 000A77E8 4E 80 00 20 */ blr +/* 800AA888 000A77E8 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR16CScriptGunTurret" "Visit__31TCastToPtr<17CScriptCoverPoint>FR16CScriptGunTurret": /* 800AA88C 000A77EC 38 00 00 00 */ li r0, 0 /* 800AA890 000A77F0 90 03 00 04 */ stw r0, 4(r3) -/* 800AA894 000A77F4 4E 80 00 20 */ blr +/* 800AA894 000A77F4 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR19CScriptGrapplePoint" "Visit__31TCastToPtr<17CScriptCoverPoint>FR19CScriptGrapplePoint": /* 800AA898 000A77F8 38 00 00 00 */ li r0, 0 /* 800AA89C 000A77FC 90 03 00 04 */ stw r0, 4(r3) -/* 800AA8A0 000A7800 4E 80 00 20 */ blr +/* 800AA8A0 000A7800 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR13CScriptEffect" "Visit__31TCastToPtr<17CScriptCoverPoint>FR13CScriptEffect": /* 800AA8A4 000A7804 38 00 00 00 */ li r0, 0 /* 800AA8A8 000A7808 90 03 00 04 */ stw r0, 4(r3) -/* 800AA8AC 000A780C 4E 80 00 20 */ blr +/* 800AA8AC 000A780C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR11CScriptDoor" "Visit__31TCastToPtr<17CScriptCoverPoint>FR11CScriptDoor": /* 800AA8B0 000A7810 38 00 00 00 */ li r0, 0 /* 800AA8B4 000A7814 90 03 00 04 */ stw r0, 4(r3) -/* 800AA8B8 000A7818 4E 80 00 20 */ blr +/* 800AA8B8 000A7818 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR11CScriptDock" "Visit__31TCastToPtr<17CScriptCoverPoint>FR11CScriptDock": /* 800AA8BC 000A781C 38 00 00 00 */ li r0, 0 /* 800AA8C0 000A7820 90 03 00 04 */ stw r0, 4(r3) -/* 800AA8C4 000A7824 4E 80 00 20 */ blr +/* 800AA8C4 000A7824 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR18CScriptDistanceFog" "Visit__31TCastToPtr<17CScriptCoverPoint>FR18CScriptDistanceFog": /* 800AA8C8 000A7828 38 00 00 00 */ li r0, 0 /* 800AA8CC 000A782C 90 03 00 04 */ stw r0, 4(r3) -/* 800AA8D0 000A7830 4E 80 00 20 */ blr +/* 800AA8D0 000A7830 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR26CScriptDebugCameraWaypoint" "Visit__31TCastToPtr<17CScriptCoverPoint>FR26CScriptDebugCameraWaypoint": /* 800AA8D4 000A7834 38 00 00 00 */ li r0, 0 /* 800AA8D8 000A7838 90 03 00 04 */ stw r0, 4(r3) -/* 800AA8DC 000A783C 4E 80 00 20 */ blr +/* 800AA8DC 000A783C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR17CScriptCoverPoint" "Visit__31TCastToPtr<17CScriptCoverPoint>FR17CScriptCoverPoint": /* 800AA8E0 000A7840 90 83 00 04 */ stw r4, 4(r3) -/* 800AA8E4 000A7844 4E 80 00 20 */ blr +/* 800AA8E4 000A7844 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR21CScriptCameraWaypoint" "Visit__31TCastToPtr<17CScriptCoverPoint>FR21CScriptCameraWaypoint": /* 800AA8E8 000A7848 38 00 00 00 */ li r0, 0 /* 800AA8EC 000A784C 90 03 00 04 */ stw r0, 4(r3) -/* 800AA8F0 000A7850 4E 80 00 20 */ blr +/* 800AA8F0 000A7850 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR24CScriptCameraPitchVolume" "Visit__31TCastToPtr<17CScriptCoverPoint>FR24CScriptCameraPitchVolume": /* 800AA8F4 000A7854 38 00 00 00 */ li r0, 0 /* 800AA8F8 000A7858 90 03 00 04 */ stw r0, 4(r3) -/* 800AA8FC 000A785C 4E 80 00 20 */ blr +/* 800AA8FC 000A785C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR17CScriptCameraHint" "Visit__31TCastToPtr<17CScriptCoverPoint>FR17CScriptCameraHint": /* 800AA900 000A7860 38 00 00 00 */ li r0, 0 /* 800AA904 000A7864 90 03 00 04 */ stw r0, 4(r3) -/* 800AA908 000A7868 4E 80 00 20 */ blr +/* 800AA908 000A7868 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR18CScriptAiJumpPoint" "Visit__31TCastToPtr<17CScriptCoverPoint>FR18CScriptAiJumpPoint": /* 800AA90C 000A786C 38 00 00 00 */ li r0, 0 /* 800AA910 000A7870 90 03 00 04 */ stw r0, 4(r3) -/* 800AA914 000A7874 4E 80 00 20 */ blr +/* 800AA914 000A7874 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR20CScriptActorKeyframe" "Visit__31TCastToPtr<17CScriptCoverPoint>FR20CScriptActorKeyframe": /* 800AA918 000A7878 38 00 00 00 */ li r0, 0 /* 800AA91C 000A787C 90 03 00 04 */ stw r0, 4(r3) -/* 800AA920 000A7880 4E 80 00 20 */ blr +/* 800AA920 000A7880 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR12CScriptActor" "Visit__31TCastToPtr<17CScriptCoverPoint>FR12CScriptActor": /* 800AA924 000A7884 38 00 00 00 */ li r0, 0 /* 800AA928 000A7888 90 03 00 04 */ stw r0, 4(r3) -/* 800AA92C 000A788C 4E 80 00 20 */ blr +/* 800AA92C 000A788C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR9CRepulsor" "Visit__31TCastToPtr<17CScriptCoverPoint>FR9CRepulsor": /* 800AA930 000A7890 38 00 00 00 */ li r0, 0 /* 800AA934 000A7894 90 03 00 04 */ stw r0, 4(r3) -/* 800AA938 000A7898 4E 80 00 20 */ blr +/* 800AA938 000A7898 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR7CPlayer" "Visit__31TCastToPtr<17CScriptCoverPoint>FR7CPlayer": /* 800AA93C 000A789C 38 00 00 00 */ li r0, 0 /* 800AA940 000A78A0 90 03 00 04 */ stw r0, 4(r3) -/* 800AA944 000A78A4 4E 80 00 20 */ blr +/* 800AA944 000A78A4 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR13CPhysicsActor" "Visit__31TCastToPtr<17CScriptCoverPoint>FR13CPhysicsActor": /* 800AA948 000A78A8 38 00 00 00 */ li r0, 0 /* 800AA94C 000A78AC 90 03 00 04 */ stw r0, 4(r3) -/* 800AA950 000A78B0 4E 80 00 20 */ blr +/* 800AA950 000A78B0 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR3CAi" "Visit__31TCastToPtr<17CScriptCoverPoint>FR3CAi": /* 800AA954 000A78B4 38 00 00 00 */ li r0, 0 /* 800AA958 000A78B8 90 03 00 04 */ stw r0, 4(r3) -/* 800AA95C 000A78BC 4E 80 00 20 */ blr +/* 800AA95C 000A78BC 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR11CPathCamera" "Visit__31TCastToPtr<17CScriptCoverPoint>FR11CPathCamera": /* 800AA960 000A78C0 38 00 00 00 */ li r0, 0 /* 800AA964 000A78C4 90 03 00 04 */ stw r0, 4(r3) -/* 800AA968 000A78C8 4E 80 00 20 */ blr +/* 800AA968 000A78C8 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR18CMetroidPrimeRelay" "Visit__31TCastToPtr<17CScriptCoverPoint>FR18CMetroidPrimeRelay": /* 800AA96C 000A78CC 38 00 00 00 */ li r0, 0 /* 800AA970 000A78D0 90 03 00 04 */ stw r0, 4(r3) -/* 800AA974 000A78D4 4E 80 00 20 */ blr +/* 800AA974 000A78D4 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR19CHUDBillboardEffect" "Visit__31TCastToPtr<17CScriptCoverPoint>FR19CHUDBillboardEffect": /* 800AA978 000A78D8 38 00 00 00 */ li r0, 0 /* 800AA97C 000A78DC 90 03 00 04 */ stw r0, 4(r3) -/* 800AA980 000A78E0 4E 80 00 20 */ blr +/* 800AA980 000A78E0 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR15CGameProjectile" "Visit__31TCastToPtr<17CScriptCoverPoint>FR15CGameProjectile": /* 800AA984 000A78E4 38 00 00 00 */ li r0, 0 /* 800AA988 000A78E8 90 03 00 04 */ stw r0, 4(r3) -/* 800AA98C 000A78EC 4E 80 00 20 */ blr +/* 800AA98C 000A78EC 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR10CGameLight" "Visit__31TCastToPtr<17CScriptCoverPoint>FR10CGameLight": /* 800AA990 000A78F0 38 00 00 00 */ li r0, 0 /* 800AA994 000A78F4 90 03 00 04 */ stw r0, 4(r3) -/* 800AA998 000A78F8 4E 80 00 20 */ blr +/* 800AA998 000A78F8 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR11CGameCamera" "Visit__31TCastToPtr<17CScriptCoverPoint>FR11CGameCamera": /* 800AA99C 000A78FC 38 00 00 00 */ li r0, 0 /* 800AA9A0 000A7900 90 03 00 04 */ stw r0, 4(r3) -/* 800AA9A4 000A7904 4E 80 00 20 */ blr +/* 800AA9A4 000A7904 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR10CFishCloud" "Visit__31TCastToPtr<17CScriptCoverPoint>FR10CFishCloud": /* 800AA9A8 000A7908 38 00 00 00 */ li r0, 0 /* 800AA9AC 000A790C 90 03 00 04 */ stw r0, 4(r3) -/* 800AA9B0 000A7910 4E 80 00 20 */ blr +/* 800AA9B0 000A7910 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR18CFirstPersonCamera" "Visit__31TCastToPtr<17CScriptCoverPoint>FR18CFirstPersonCamera": /* 800AA9B4 000A7914 38 00 00 00 */ li r0, 0 /* 800AA9B8 000A7918 90 03 00 04 */ stw r0, 4(r3) -/* 800AA9BC 000A791C 4E 80 00 20 */ blr +/* 800AA9BC 000A791C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR10CExplosion" "Visit__31TCastToPtr<17CScriptCoverPoint>FR10CExplosion": /* 800AA9C0 000A7920 38 00 00 00 */ li r0, 0 /* 800AA9C4 000A7924 90 03 00 04 */ stw r0, 4(r3) -/* 800AA9C8 000A7928 4E 80 00 20 */ blr +/* 800AA9C8 000A7928 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR7CEntity" "Visit__31TCastToPtr<17CScriptCoverPoint>FR7CEntity": /* 800AA9CC 000A792C 38 00 00 00 */ li r0, 0 /* 800AA9D0 000A7930 90 03 00 04 */ stw r0, 4(r3) -/* 800AA9D4 000A7934 4E 80 00 20 */ blr +/* 800AA9D4 000A7934 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR17CEnergyProjectile" "Visit__31TCastToPtr<17CScriptCoverPoint>FR17CEnergyProjectile": /* 800AA9D8 000A7938 38 00 00 00 */ li r0, 0 /* 800AA9DC 000A793C 90 03 00 04 */ stw r0, 4(r3) -/* 800AA9E0 000A7940 4E 80 00 20 */ blr +/* 800AA9E0 000A7940 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR16CDestroyableRock" "Visit__31TCastToPtr<17CScriptCoverPoint>FR16CDestroyableRock": /* 800AA9E4 000A7944 38 00 00 00 */ li r0, 0 /* 800AA9E8 000A7948 90 03 00 04 */ stw r0, 4(r3) -/* 800AA9EC 000A794C 4E 80 00 20 */ blr +/* 800AA9EC 000A794C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR15CCollisionActor" "Visit__31TCastToPtr<17CScriptCoverPoint>FR15CCollisionActor": /* 800AA9F0 000A7950 38 00 00 00 */ li r0, 0 /* 800AA9F4 000A7954 90 03 00 04 */ stw r0, 4(r3) -/* 800AA9F8 000A7958 4E 80 00 20 */ blr +/* 800AA9F8 000A7958 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR16CCinematicCamera" "Visit__31TCastToPtr<17CScriptCoverPoint>FR16CCinematicCamera": /* 800AA9FC 000A795C 38 00 00 00 */ li r0, 0 /* 800AAA00 000A7960 90 03 00 04 */ stw r0, 4(r3) -/* 800AAA04 000A7964 4E 80 00 20 */ blr +/* 800AAA04 000A7964 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR5CBomb" "Visit__31TCastToPtr<17CScriptCoverPoint>FR5CBomb": /* 800AAA08 000A7968 38 00 00 00 */ li r0, 0 /* 800AAA0C 000A796C 90 03 00 04 */ stw r0, 4(r3) -/* 800AAA10 000A7970 4E 80 00 20 */ blr +/* 800AAA10 000A7970 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR11CBallCamera" "Visit__31TCastToPtr<17CScriptCoverPoint>FR11CBallCamera": /* 800AAA14 000A7974 38 00 00 00 */ li r0, 0 /* 800AAA18 000A7978 90 03 00 04 */ stw r0, 4(r3) -/* 800AAA1C 000A797C 4E 80 00 20 */ blr +/* 800AAA1C 000A797C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCoverPoint>FR6CActor" "Visit__31TCastToPtr<17CScriptCoverPoint>FR6CActor": /* 800AAA20 000A7980 38 00 00 00 */ li r0, 0 /* 800AAA24 000A7984 90 03 00 04 */ stw r0, 4(r3) -/* 800AAA28 000A7988 4E 80 00 20 */ blr +/* 800AAA28 000A7988 4E 80 00 20 */ blr .global "__ct__31TCastToPtr<17CScriptCoverPoint>FP7CEntity" "__ct__31TCastToPtr<17CScriptCoverPoint>FP7CEntity": @@ -13549,14 +13549,14 @@ lbl_800AA76C: /* 800AAA70 000A79D0 81 83 00 00 */ lwz r12, 0(r3) /* 800AAA74 000A79D4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800AAA78 000A79D8 7D 89 03 A6 */ mtctr r12 -/* 800AAA7C 000A79DC 4E 80 04 21 */ bctrl +/* 800AAA7C 000A79DC 4E 80 04 21 */ bctrl lbl_800AAA80: /* 800AAA80 000A79E0 80 01 00 14 */ lwz r0, 0x14(r1) /* 800AAA84 000A79E4 7F E3 FB 78 */ mr r3, r31 /* 800AAA88 000A79E8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800AAA8C 000A79EC 7C 08 03 A6 */ mtlr r0 /* 800AAA90 000A79F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800AAA94 000A79F4 4E 80 00 20 */ blr +/* 800AAA94 000A79F4 4E 80 00 20 */ blr .global "__ct__31TCastToPtr<17CScriptCoverPoint>FR7CEntity" "__ct__31TCastToPtr<17CScriptCoverPoint>FR7CEntity": @@ -13578,354 +13578,354 @@ lbl_800AAA80: /* 800AAAD4 000A7A34 81 83 00 00 */ lwz r12, 0(r3) /* 800AAAD8 000A7A38 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800AAADC 000A7A3C 7D 89 03 A6 */ mtctr r12 -/* 800AAAE0 000A7A40 4E 80 04 21 */ bctrl +/* 800AAAE0 000A7A40 4E 80 04 21 */ bctrl /* 800AAAE4 000A7A44 80 01 00 14 */ lwz r0, 0x14(r1) /* 800AAAE8 000A7A48 7F E3 FB 78 */ mr r3, r31 /* 800AAAEC 000A7A4C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800AAAF0 000A7A50 7C 08 03 A6 */ mtlr r0 /* 800AAAF4 000A7A54 38 21 00 10 */ addi r1, r1, 0x10 -/* 800AAAF8 000A7A58 4E 80 00 20 */ blr +/* 800AAAF8 000A7A58 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR7CWeapon" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR7CWeapon": /* 800AAAFC 000A7A5C 38 00 00 00 */ li r0, 0 /* 800AAB00 000A7A60 90 03 00 04 */ stw r0, 4(r3) -/* 800AAB04 000A7A64 4E 80 00 20 */ blr +/* 800AAB04 000A7A64 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR17CWallCrawlerSwarm" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR17CWallCrawlerSwarm": /* 800AAB08 000A7A68 38 00 00 00 */ li r0, 0 /* 800AAB0C 000A7A6C 90 03 00 04 */ stw r0, 4(r3) -/* 800AAB10 000A7A70 4E 80 00 20 */ blr +/* 800AAB10 000A7A70 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR20CScriptSpindleCamera" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR20CScriptSpindleCamera": /* 800AAB14 000A7A74 38 00 00 00 */ li r0, 0 /* 800AAB18 000A7A78 90 03 00 04 */ stw r0, 4(r3) -/* 800AAB1C 000A7A7C 4E 80 00 20 */ blr +/* 800AAB1C 000A7A7C 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR15CSnakeWeedSwarm" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR15CSnakeWeedSwarm": /* 800AAB20 000A7A80 38 00 00 00 */ li r0, 0 /* 800AAB24 000A7A84 90 03 00 04 */ stw r0, 4(r3) -/* 800AAB28 000A7A88 4E 80 00 20 */ blr +/* 800AAB28 000A7A88 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR15CScriptWaypoint" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR15CScriptWaypoint": /* 800AAB2C 000A7A8C 38 00 00 00 */ li r0, 0 /* 800AAB30 000A7A90 90 03 00 04 */ stw r0, 4(r3) -/* 800AAB34 000A7A94 4E 80 00 20 */ blr +/* 800AAB34 000A7A94 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR12CScriptWater" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR12CScriptWater": /* 800AAB38 000A7A98 38 00 00 00 */ li r0, 0 /* 800AAB3C 000A7A9C 90 03 00 04 */ stw r0, 4(r3) -/* 800AAB40 000A7AA0 4E 80 00 20 */ blr +/* 800AAB40 000A7AA0 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR17CScriptVisorFlare" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR17CScriptVisorFlare": /* 800AAB44 000A7AA4 38 00 00 00 */ li r0, 0 /* 800AAB48 000A7AA8 90 03 00 04 */ stw r0, 4(r3) -/* 800AAB4C 000A7AAC 4E 80 00 20 */ blr +/* 800AAB4C 000A7AAC 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR14CScriptTrigger" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR14CScriptTrigger": /* 800AAB50 000A7AB0 38 00 00 00 */ li r0, 0 /* 800AAB54 000A7AB4 90 03 00 04 */ stw r0, 4(r3) -/* 800AAB58 000A7AB8 4E 80 00 20 */ blr +/* 800AAB58 000A7AB8 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR12CScriptTimer" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR12CScriptTimer": /* 800AAB5C 000A7ABC 38 00 00 00 */ li r0, 0 /* 800AAB60 000A7AC0 90 03 00 04 */ stw r0, 4(r3) -/* 800AAB64 000A7AC4 4E 80 00 20 */ blr +/* 800AAB64 000A7AC4 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR10CTeamAiMgr" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR10CTeamAiMgr": /* 800AAB68 000A7AC8 38 00 00 00 */ li r0, 0 /* 800AAB6C 000A7ACC 90 03 00 04 */ stw r0, 4(r3) -/* 800AAB70 000A7AD0 4E 80 00 20 */ blr +/* 800AAB70 000A7AD0 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR21CScriptTargetingPoint" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR21CScriptTargetingPoint": /* 800AAB74 000A7AD4 38 00 00 00 */ li r0, 0 /* 800AAB78 000A7AD8 90 03 00 04 */ stw r0, 4(r3) -/* 800AAB7C 000A7ADC 4E 80 00 20 */ blr +/* 800AAB7C 000A7ADC 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR25CScriptSpiderBallWaypoint" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR25CScriptSpiderBallWaypoint": /* 800AAB80 000A7AE0 38 00 00 00 */ li r0, 0 /* 800AAB84 000A7AE4 90 03 00 04 */ stw r0, 4(r3) -/* 800AAB88 000A7AE8 4E 80 00 20 */ blr +/* 800AAB88 000A7AE8 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR34CScriptSpiderBallAttractionSurface" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR34CScriptSpiderBallAttractionSurface": /* 800AAB8C 000A7AEC 38 00 00 00 */ li r0, 0 /* 800AAB90 000A7AF0 90 03 00 04 */ stw r0, 4(r3) -/* 800AAB94 000A7AF4 4E 80 00 20 */ blr +/* 800AAB94 000A7AF4 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR22CScriptSpecialFunction" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR22CScriptSpecialFunction": /* 800AAB98 000A7AF8 38 00 00 00 */ li r0, 0 /* 800AAB9C 000A7AFC 90 03 00 04 */ stw r0, 4(r3) -/* 800AABA0 000A7B00 4E 80 00 20 */ blr +/* 800AABA0 000A7B00 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR17CScriptSpawnPoint" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR17CScriptSpawnPoint": /* 800AABA4 000A7B04 38 00 00 00 */ li r0, 0 /* 800AABA8 000A7B08 90 03 00 04 */ stw r0, 4(r3) -/* 800AABAC 000A7B0C 4E 80 00 20 */ blr +/* 800AABAC 000A7B0C 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR12CScriptSound" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR12CScriptSound": /* 800AABB0 000A7B10 38 00 00 00 */ li r0, 0 /* 800AABB4 000A7B14 90 03 00 04 */ stw r0, 4(r3) -/* 800AABB8 000A7B18 4E 80 00 20 */ blr +/* 800AABB8 000A7B18 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR20CScriptRoomAcoustics" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR20CScriptRoomAcoustics": /* 800AABBC 000A7B1C 38 00 00 00 */ li r0, 0 /* 800AABC0 000A7B20 90 03 00 04 */ stw r0, 4(r3) -/* 800AABC4 000A7B24 4E 80 00 20 */ blr +/* 800AABC4 000A7B24 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR22CScriptPointOfinterest" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR22CScriptPointOfinterest": /* 800AABC8 000A7B28 38 00 00 00 */ li r0, 0 /* 800AABCC 000A7B2C 90 03 00 04 */ stw r0, 4(r3) -/* 800AABD0 000A7B30 4E 80 00 20 */ blr +/* 800AABD0 000A7B30 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR17CScriptPlayerHint" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR17CScriptPlayerHint": /* 800AABD4 000A7B34 38 00 00 00 */ li r0, 0 /* 800AABD8 000A7B38 90 03 00 04 */ stw r0, 4(r3) -/* 800AABDC 000A7B3C 4E 80 00 20 */ blr +/* 800AABDC 000A7B3C 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR15CScriptPlatform" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR15CScriptPlatform": /* 800AABE0 000A7B40 38 00 00 00 */ li r0, 0 /* 800AABE4 000A7B44 90 03 00 04 */ stw r0, 4(r3) -/* 800AABE8 000A7B48 4E 80 00 20 */ blr +/* 800AABE8 000A7B48 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR13CScriptPickup" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR13CScriptPickup": /* 800AABEC 000A7B4C 38 00 00 00 */ li r0, 0 /* 800AABF0 000A7B50 90 03 00 04 */ stw r0, 4(r3) -/* 800AABF4 000A7B54 4E 80 00 20 */ blr +/* 800AABF4 000A7B54 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR15CScriptMazeNode" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR15CScriptMazeNode": /* 800AABF8 000A7B58 38 00 00 00 */ li r0, 0 /* 800AABFC 000A7B5C 90 03 00 04 */ stw r0, 4(r3) -/* 800AAC00 000A7B60 4E 80 00 20 */ blr +/* 800AAC00 000A7B60 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR16CScriptGunTurret" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR16CScriptGunTurret": /* 800AAC04 000A7B64 38 00 00 00 */ li r0, 0 /* 800AAC08 000A7B68 90 03 00 04 */ stw r0, 4(r3) -/* 800AAC0C 000A7B6C 4E 80 00 20 */ blr +/* 800AAC0C 000A7B6C 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR19CScriptGrapplePoint" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR19CScriptGrapplePoint": /* 800AAC10 000A7B70 38 00 00 00 */ li r0, 0 /* 800AAC14 000A7B74 90 03 00 04 */ stw r0, 4(r3) -/* 800AAC18 000A7B78 4E 80 00 20 */ blr +/* 800AAC18 000A7B78 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR13CScriptEffect" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR13CScriptEffect": /* 800AAC1C 000A7B7C 38 00 00 00 */ li r0, 0 /* 800AAC20 000A7B80 90 03 00 04 */ stw r0, 4(r3) -/* 800AAC24 000A7B84 4E 80 00 20 */ blr +/* 800AAC24 000A7B84 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR11CScriptDoor" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR11CScriptDoor": /* 800AAC28 000A7B88 38 00 00 00 */ li r0, 0 /* 800AAC2C 000A7B8C 90 03 00 04 */ stw r0, 4(r3) -/* 800AAC30 000A7B90 4E 80 00 20 */ blr +/* 800AAC30 000A7B90 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR11CScriptDock" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR11CScriptDock": /* 800AAC34 000A7B94 38 00 00 00 */ li r0, 0 /* 800AAC38 000A7B98 90 03 00 04 */ stw r0, 4(r3) -/* 800AAC3C 000A7B9C 4E 80 00 20 */ blr +/* 800AAC3C 000A7B9C 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR18CScriptDistanceFog" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR18CScriptDistanceFog": /* 800AAC40 000A7BA0 38 00 00 00 */ li r0, 0 /* 800AAC44 000A7BA4 90 03 00 04 */ stw r0, 4(r3) -/* 800AAC48 000A7BA8 4E 80 00 20 */ blr +/* 800AAC48 000A7BA8 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR26CScriptDebugCameraWaypoint" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR26CScriptDebugCameraWaypoint": /* 800AAC4C 000A7BAC 38 00 00 00 */ li r0, 0 /* 800AAC50 000A7BB0 90 03 00 04 */ stw r0, 4(r3) -/* 800AAC54 000A7BB4 4E 80 00 20 */ blr +/* 800AAC54 000A7BB4 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR17CScriptCoverPoint" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR17CScriptCoverPoint": /* 800AAC58 000A7BB8 38 00 00 00 */ li r0, 0 /* 800AAC5C 000A7BBC 90 03 00 04 */ stw r0, 4(r3) -/* 800AAC60 000A7BC0 4E 80 00 20 */ blr +/* 800AAC60 000A7BC0 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR21CScriptCameraWaypoint" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR21CScriptCameraWaypoint": /* 800AAC64 000A7BC4 90 83 00 04 */ stw r4, 4(r3) -/* 800AAC68 000A7BC8 4E 80 00 20 */ blr +/* 800AAC68 000A7BC8 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR24CScriptCameraPitchVolume" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR24CScriptCameraPitchVolume": /* 800AAC6C 000A7BCC 38 00 00 00 */ li r0, 0 /* 800AAC70 000A7BD0 90 03 00 04 */ stw r0, 4(r3) -/* 800AAC74 000A7BD4 4E 80 00 20 */ blr +/* 800AAC74 000A7BD4 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR17CScriptCameraHint" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR17CScriptCameraHint": /* 800AAC78 000A7BD8 38 00 00 00 */ li r0, 0 /* 800AAC7C 000A7BDC 90 03 00 04 */ stw r0, 4(r3) -/* 800AAC80 000A7BE0 4E 80 00 20 */ blr +/* 800AAC80 000A7BE0 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR18CScriptAiJumpPoint" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR18CScriptAiJumpPoint": /* 800AAC84 000A7BE4 38 00 00 00 */ li r0, 0 /* 800AAC88 000A7BE8 90 03 00 04 */ stw r0, 4(r3) -/* 800AAC8C 000A7BEC 4E 80 00 20 */ blr +/* 800AAC8C 000A7BEC 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR20CScriptActorKeyframe" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR20CScriptActorKeyframe": /* 800AAC90 000A7BF0 38 00 00 00 */ li r0, 0 /* 800AAC94 000A7BF4 90 03 00 04 */ stw r0, 4(r3) -/* 800AAC98 000A7BF8 4E 80 00 20 */ blr +/* 800AAC98 000A7BF8 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR12CScriptActor" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR12CScriptActor": /* 800AAC9C 000A7BFC 38 00 00 00 */ li r0, 0 /* 800AACA0 000A7C00 90 03 00 04 */ stw r0, 4(r3) -/* 800AACA4 000A7C04 4E 80 00 20 */ blr +/* 800AACA4 000A7C04 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR9CRepulsor" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR9CRepulsor": /* 800AACA8 000A7C08 38 00 00 00 */ li r0, 0 /* 800AACAC 000A7C0C 90 03 00 04 */ stw r0, 4(r3) -/* 800AACB0 000A7C10 4E 80 00 20 */ blr +/* 800AACB0 000A7C10 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR7CPlayer" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR7CPlayer": /* 800AACB4 000A7C14 38 00 00 00 */ li r0, 0 /* 800AACB8 000A7C18 90 03 00 04 */ stw r0, 4(r3) -/* 800AACBC 000A7C1C 4E 80 00 20 */ blr +/* 800AACBC 000A7C1C 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR13CPhysicsActor" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR13CPhysicsActor": /* 800AACC0 000A7C20 38 00 00 00 */ li r0, 0 /* 800AACC4 000A7C24 90 03 00 04 */ stw r0, 4(r3) -/* 800AACC8 000A7C28 4E 80 00 20 */ blr +/* 800AACC8 000A7C28 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR3CAi" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR3CAi": /* 800AACCC 000A7C2C 38 00 00 00 */ li r0, 0 /* 800AACD0 000A7C30 90 03 00 04 */ stw r0, 4(r3) -/* 800AACD4 000A7C34 4E 80 00 20 */ blr +/* 800AACD4 000A7C34 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR11CPathCamera" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR11CPathCamera": /* 800AACD8 000A7C38 38 00 00 00 */ li r0, 0 /* 800AACDC 000A7C3C 90 03 00 04 */ stw r0, 4(r3) -/* 800AACE0 000A7C40 4E 80 00 20 */ blr +/* 800AACE0 000A7C40 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR18CMetroidPrimeRelay" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR18CMetroidPrimeRelay": /* 800AACE4 000A7C44 38 00 00 00 */ li r0, 0 /* 800AACE8 000A7C48 90 03 00 04 */ stw r0, 4(r3) -/* 800AACEC 000A7C4C 4E 80 00 20 */ blr +/* 800AACEC 000A7C4C 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR19CHUDBillboardEffect" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR19CHUDBillboardEffect": /* 800AACF0 000A7C50 38 00 00 00 */ li r0, 0 /* 800AACF4 000A7C54 90 03 00 04 */ stw r0, 4(r3) -/* 800AACF8 000A7C58 4E 80 00 20 */ blr +/* 800AACF8 000A7C58 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR15CGameProjectile" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR15CGameProjectile": /* 800AACFC 000A7C5C 38 00 00 00 */ li r0, 0 /* 800AAD00 000A7C60 90 03 00 04 */ stw r0, 4(r3) -/* 800AAD04 000A7C64 4E 80 00 20 */ blr +/* 800AAD04 000A7C64 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR10CGameLight" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR10CGameLight": /* 800AAD08 000A7C68 38 00 00 00 */ li r0, 0 /* 800AAD0C 000A7C6C 90 03 00 04 */ stw r0, 4(r3) -/* 800AAD10 000A7C70 4E 80 00 20 */ blr +/* 800AAD10 000A7C70 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR11CGameCamera" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR11CGameCamera": /* 800AAD14 000A7C74 38 00 00 00 */ li r0, 0 /* 800AAD18 000A7C78 90 03 00 04 */ stw r0, 4(r3) -/* 800AAD1C 000A7C7C 4E 80 00 20 */ blr +/* 800AAD1C 000A7C7C 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR10CFishCloud" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR10CFishCloud": /* 800AAD20 000A7C80 38 00 00 00 */ li r0, 0 /* 800AAD24 000A7C84 90 03 00 04 */ stw r0, 4(r3) -/* 800AAD28 000A7C88 4E 80 00 20 */ blr +/* 800AAD28 000A7C88 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR18CFirstPersonCamera" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR18CFirstPersonCamera": /* 800AAD2C 000A7C8C 38 00 00 00 */ li r0, 0 /* 800AAD30 000A7C90 90 03 00 04 */ stw r0, 4(r3) -/* 800AAD34 000A7C94 4E 80 00 20 */ blr +/* 800AAD34 000A7C94 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR10CExplosion" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR10CExplosion": /* 800AAD38 000A7C98 38 00 00 00 */ li r0, 0 /* 800AAD3C 000A7C9C 90 03 00 04 */ stw r0, 4(r3) -/* 800AAD40 000A7CA0 4E 80 00 20 */ blr +/* 800AAD40 000A7CA0 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR7CEntity" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR7CEntity": /* 800AAD44 000A7CA4 38 00 00 00 */ li r0, 0 /* 800AAD48 000A7CA8 90 03 00 04 */ stw r0, 4(r3) -/* 800AAD4C 000A7CAC 4E 80 00 20 */ blr +/* 800AAD4C 000A7CAC 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR17CEnergyProjectile" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR17CEnergyProjectile": /* 800AAD50 000A7CB0 38 00 00 00 */ li r0, 0 /* 800AAD54 000A7CB4 90 03 00 04 */ stw r0, 4(r3) -/* 800AAD58 000A7CB8 4E 80 00 20 */ blr +/* 800AAD58 000A7CB8 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR16CDestroyableRock" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR16CDestroyableRock": /* 800AAD5C 000A7CBC 38 00 00 00 */ li r0, 0 /* 800AAD60 000A7CC0 90 03 00 04 */ stw r0, 4(r3) -/* 800AAD64 000A7CC4 4E 80 00 20 */ blr +/* 800AAD64 000A7CC4 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR15CCollisionActor" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR15CCollisionActor": /* 800AAD68 000A7CC8 38 00 00 00 */ li r0, 0 /* 800AAD6C 000A7CCC 90 03 00 04 */ stw r0, 4(r3) -/* 800AAD70 000A7CD0 4E 80 00 20 */ blr +/* 800AAD70 000A7CD0 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR16CCinematicCamera" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR16CCinematicCamera": /* 800AAD74 000A7CD4 38 00 00 00 */ li r0, 0 /* 800AAD78 000A7CD8 90 03 00 04 */ stw r0, 4(r3) -/* 800AAD7C 000A7CDC 4E 80 00 20 */ blr +/* 800AAD7C 000A7CDC 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR5CBomb" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR5CBomb": /* 800AAD80 000A7CE0 38 00 00 00 */ li r0, 0 /* 800AAD84 000A7CE4 90 03 00 04 */ stw r0, 4(r3) -/* 800AAD88 000A7CE8 4E 80 00 20 */ blr +/* 800AAD88 000A7CE8 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR11CBallCamera" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR11CBallCamera": /* 800AAD8C 000A7CEC 38 00 00 00 */ li r0, 0 /* 800AAD90 000A7CF0 90 03 00 04 */ stw r0, 4(r3) -/* 800AAD94 000A7CF4 4E 80 00 20 */ blr +/* 800AAD94 000A7CF4 4E 80 00 20 */ blr .global "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR6CActor" "Visit__35TCastToPtr<21CScriptCameraWaypoint>FR6CActor": /* 800AAD98 000A7CF8 38 00 00 00 */ li r0, 0 /* 800AAD9C 000A7CFC 90 03 00 04 */ stw r0, 4(r3) -/* 800AADA0 000A7D00 4E 80 00 20 */ blr +/* 800AADA0 000A7D00 4E 80 00 20 */ blr .global "__ct__35TCastToPtr<21CScriptCameraWaypoint>FP7CEntity" "__ct__35TCastToPtr<21CScriptCameraWaypoint>FP7CEntity": @@ -13949,355 +13949,355 @@ lbl_800AAA80: /* 800AADE8 000A7D48 81 83 00 00 */ lwz r12, 0(r3) /* 800AADEC 000A7D4C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800AADF0 000A7D50 7D 89 03 A6 */ mtctr r12 -/* 800AADF4 000A7D54 4E 80 04 21 */ bctrl +/* 800AADF4 000A7D54 4E 80 04 21 */ bctrl lbl_800AADF8: /* 800AADF8 000A7D58 80 01 00 14 */ lwz r0, 0x14(r1) /* 800AADFC 000A7D5C 7F E3 FB 78 */ mr r3, r31 /* 800AAE00 000A7D60 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800AAE04 000A7D64 7C 08 03 A6 */ mtlr r0 /* 800AAE08 000A7D68 38 21 00 10 */ addi r1, r1, 0x10 -/* 800AAE0C 000A7D6C 4E 80 00 20 */ blr +/* 800AAE0C 000A7D6C 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR7CWeapon" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR7CWeapon": /* 800AAE10 000A7D70 38 00 00 00 */ li r0, 0 /* 800AAE14 000A7D74 90 03 00 04 */ stw r0, 4(r3) -/* 800AAE18 000A7D78 4E 80 00 20 */ blr +/* 800AAE18 000A7D78 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR17CWallCrawlerSwarm" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR17CWallCrawlerSwarm": /* 800AAE1C 000A7D7C 38 00 00 00 */ li r0, 0 /* 800AAE20 000A7D80 90 03 00 04 */ stw r0, 4(r3) -/* 800AAE24 000A7D84 4E 80 00 20 */ blr +/* 800AAE24 000A7D84 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR20CScriptSpindleCamera" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR20CScriptSpindleCamera": /* 800AAE28 000A7D88 38 00 00 00 */ li r0, 0 /* 800AAE2C 000A7D8C 90 03 00 04 */ stw r0, 4(r3) -/* 800AAE30 000A7D90 4E 80 00 20 */ blr +/* 800AAE30 000A7D90 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR15CSnakeWeedSwarm" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR15CSnakeWeedSwarm": /* 800AAE34 000A7D94 38 00 00 00 */ li r0, 0 /* 800AAE38 000A7D98 90 03 00 04 */ stw r0, 4(r3) -/* 800AAE3C 000A7D9C 4E 80 00 20 */ blr +/* 800AAE3C 000A7D9C 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR15CScriptWaypoint" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR15CScriptWaypoint": /* 800AAE40 000A7DA0 38 00 00 00 */ li r0, 0 /* 800AAE44 000A7DA4 90 03 00 04 */ stw r0, 4(r3) -/* 800AAE48 000A7DA8 4E 80 00 20 */ blr +/* 800AAE48 000A7DA8 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR12CScriptWater" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR12CScriptWater": /* 800AAE4C 000A7DAC 38 00 00 00 */ li r0, 0 /* 800AAE50 000A7DB0 90 03 00 04 */ stw r0, 4(r3) -/* 800AAE54 000A7DB4 4E 80 00 20 */ blr +/* 800AAE54 000A7DB4 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR17CScriptVisorFlare" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR17CScriptVisorFlare": /* 800AAE58 000A7DB8 38 00 00 00 */ li r0, 0 /* 800AAE5C 000A7DBC 90 03 00 04 */ stw r0, 4(r3) -/* 800AAE60 000A7DC0 4E 80 00 20 */ blr +/* 800AAE60 000A7DC0 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR14CScriptTrigger" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR14CScriptTrigger": /* 800AAE64 000A7DC4 38 00 00 00 */ li r0, 0 /* 800AAE68 000A7DC8 90 03 00 04 */ stw r0, 4(r3) -/* 800AAE6C 000A7DCC 4E 80 00 20 */ blr +/* 800AAE6C 000A7DCC 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR12CScriptTimer" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR12CScriptTimer": /* 800AAE70 000A7DD0 38 00 00 00 */ li r0, 0 /* 800AAE74 000A7DD4 90 03 00 04 */ stw r0, 4(r3) -/* 800AAE78 000A7DD8 4E 80 00 20 */ blr +/* 800AAE78 000A7DD8 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR10CTeamAiMgr" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR10CTeamAiMgr": /* 800AAE7C 000A7DDC 38 00 00 00 */ li r0, 0 /* 800AAE80 000A7DE0 90 03 00 04 */ stw r0, 4(r3) -/* 800AAE84 000A7DE4 4E 80 00 20 */ blr +/* 800AAE84 000A7DE4 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR21CScriptTargetingPoint" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR21CScriptTargetingPoint": /* 800AAE88 000A7DE8 38 00 00 00 */ li r0, 0 /* 800AAE8C 000A7DEC 90 03 00 04 */ stw r0, 4(r3) -/* 800AAE90 000A7DF0 4E 80 00 20 */ blr +/* 800AAE90 000A7DF0 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR25CScriptSpiderBallWaypoint" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR25CScriptSpiderBallWaypoint": /* 800AAE94 000A7DF4 38 00 00 00 */ li r0, 0 /* 800AAE98 000A7DF8 90 03 00 04 */ stw r0, 4(r3) -/* 800AAE9C 000A7DFC 4E 80 00 20 */ blr +/* 800AAE9C 000A7DFC 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR34CScriptSpiderBallAttractionSurface" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR34CScriptSpiderBallAttractionSurface": /* 800AAEA0 000A7E00 38 00 00 00 */ li r0, 0 /* 800AAEA4 000A7E04 90 03 00 04 */ stw r0, 4(r3) -/* 800AAEA8 000A7E08 4E 80 00 20 */ blr +/* 800AAEA8 000A7E08 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR22CScriptSpecialFunction" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR22CScriptSpecialFunction": /* 800AAEAC 000A7E0C 38 00 00 00 */ li r0, 0 /* 800AAEB0 000A7E10 90 03 00 04 */ stw r0, 4(r3) -/* 800AAEB4 000A7E14 4E 80 00 20 */ blr +/* 800AAEB4 000A7E14 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR17CScriptSpawnPoint" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR17CScriptSpawnPoint": /* 800AAEB8 000A7E18 38 00 00 00 */ li r0, 0 /* 800AAEBC 000A7E1C 90 03 00 04 */ stw r0, 4(r3) -/* 800AAEC0 000A7E20 4E 80 00 20 */ blr +/* 800AAEC0 000A7E20 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR12CScriptSound" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR12CScriptSound": /* 800AAEC4 000A7E24 38 00 00 00 */ li r0, 0 /* 800AAEC8 000A7E28 90 03 00 04 */ stw r0, 4(r3) -/* 800AAECC 000A7E2C 4E 80 00 20 */ blr +/* 800AAECC 000A7E2C 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR20CScriptRoomAcoustics" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR20CScriptRoomAcoustics": /* 800AAED0 000A7E30 38 00 00 00 */ li r0, 0 /* 800AAED4 000A7E34 90 03 00 04 */ stw r0, 4(r3) -/* 800AAED8 000A7E38 4E 80 00 20 */ blr +/* 800AAED8 000A7E38 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR22CScriptPointOfinterest" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR22CScriptPointOfinterest": /* 800AAEDC 000A7E3C 38 00 00 00 */ li r0, 0 /* 800AAEE0 000A7E40 90 03 00 04 */ stw r0, 4(r3) -/* 800AAEE4 000A7E44 4E 80 00 20 */ blr +/* 800AAEE4 000A7E44 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR17CScriptPlayerHint" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR17CScriptPlayerHint": /* 800AAEE8 000A7E48 38 00 00 00 */ li r0, 0 /* 800AAEEC 000A7E4C 90 03 00 04 */ stw r0, 4(r3) -/* 800AAEF0 000A7E50 4E 80 00 20 */ blr +/* 800AAEF0 000A7E50 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR15CScriptPlatform" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR15CScriptPlatform": /* 800AAEF4 000A7E54 38 00 00 00 */ li r0, 0 /* 800AAEF8 000A7E58 90 03 00 04 */ stw r0, 4(r3) -/* 800AAEFC 000A7E5C 4E 80 00 20 */ blr +/* 800AAEFC 000A7E5C 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR13CScriptPickup" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR13CScriptPickup": /* 800AAF00 000A7E60 38 00 00 00 */ li r0, 0 /* 800AAF04 000A7E64 90 03 00 04 */ stw r0, 4(r3) -/* 800AAF08 000A7E68 4E 80 00 20 */ blr +/* 800AAF08 000A7E68 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR15CScriptMazeNode" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR15CScriptMazeNode": /* 800AAF0C 000A7E6C 38 00 00 00 */ li r0, 0 /* 800AAF10 000A7E70 90 03 00 04 */ stw r0, 4(r3) -/* 800AAF14 000A7E74 4E 80 00 20 */ blr +/* 800AAF14 000A7E74 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR16CScriptGunTurret" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR16CScriptGunTurret": /* 800AAF18 000A7E78 38 00 00 00 */ li r0, 0 /* 800AAF1C 000A7E7C 90 03 00 04 */ stw r0, 4(r3) -/* 800AAF20 000A7E80 4E 80 00 20 */ blr +/* 800AAF20 000A7E80 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR19CScriptGrapplePoint" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR19CScriptGrapplePoint": /* 800AAF24 000A7E84 38 00 00 00 */ li r0, 0 /* 800AAF28 000A7E88 90 03 00 04 */ stw r0, 4(r3) -/* 800AAF2C 000A7E8C 4E 80 00 20 */ blr +/* 800AAF2C 000A7E8C 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR13CScriptEffect" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR13CScriptEffect": /* 800AAF30 000A7E90 38 00 00 00 */ li r0, 0 /* 800AAF34 000A7E94 90 03 00 04 */ stw r0, 4(r3) -/* 800AAF38 000A7E98 4E 80 00 20 */ blr +/* 800AAF38 000A7E98 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR11CScriptDoor" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR11CScriptDoor": /* 800AAF3C 000A7E9C 38 00 00 00 */ li r0, 0 /* 800AAF40 000A7EA0 90 03 00 04 */ stw r0, 4(r3) -/* 800AAF44 000A7EA4 4E 80 00 20 */ blr +/* 800AAF44 000A7EA4 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR11CScriptDock" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR11CScriptDock": /* 800AAF48 000A7EA8 38 00 00 00 */ li r0, 0 /* 800AAF4C 000A7EAC 90 03 00 04 */ stw r0, 4(r3) -/* 800AAF50 000A7EB0 4E 80 00 20 */ blr +/* 800AAF50 000A7EB0 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR18CScriptDistanceFog" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR18CScriptDistanceFog": /* 800AAF54 000A7EB4 38 00 00 00 */ li r0, 0 /* 800AAF58 000A7EB8 90 03 00 04 */ stw r0, 4(r3) -/* 800AAF5C 000A7EBC 4E 80 00 20 */ blr +/* 800AAF5C 000A7EBC 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR26CScriptDebugCameraWaypoint" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR26CScriptDebugCameraWaypoint": /* 800AAF60 000A7EC0 38 00 00 00 */ li r0, 0 /* 800AAF64 000A7EC4 90 03 00 04 */ stw r0, 4(r3) -/* 800AAF68 000A7EC8 4E 80 00 20 */ blr +/* 800AAF68 000A7EC8 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR17CScriptCoverPoint" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR17CScriptCoverPoint": /* 800AAF6C 000A7ECC 38 00 00 00 */ li r0, 0 /* 800AAF70 000A7ED0 90 03 00 04 */ stw r0, 4(r3) -/* 800AAF74 000A7ED4 4E 80 00 20 */ blr +/* 800AAF74 000A7ED4 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR21CScriptCameraWaypoint" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR21CScriptCameraWaypoint": /* 800AAF78 000A7ED8 38 00 00 00 */ li r0, 0 /* 800AAF7C 000A7EDC 90 03 00 04 */ stw r0, 4(r3) -/* 800AAF80 000A7EE0 4E 80 00 20 */ blr +/* 800AAF80 000A7EE0 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR24CScriptCameraPitchVolume" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR24CScriptCameraPitchVolume": /* 800AAF84 000A7EE4 90 83 00 04 */ stw r4, 4(r3) -/* 800AAF88 000A7EE8 4E 80 00 20 */ blr +/* 800AAF88 000A7EE8 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR17CScriptCameraHint" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR17CScriptCameraHint": /* 800AAF8C 000A7EEC 38 00 00 00 */ li r0, 0 /* 800AAF90 000A7EF0 90 03 00 04 */ stw r0, 4(r3) -/* 800AAF94 000A7EF4 4E 80 00 20 */ blr +/* 800AAF94 000A7EF4 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR18CScriptAiJumpPoint" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR18CScriptAiJumpPoint": /* 800AAF98 000A7EF8 38 00 00 00 */ li r0, 0 /* 800AAF9C 000A7EFC 90 03 00 04 */ stw r0, 4(r3) -/* 800AAFA0 000A7F00 4E 80 00 20 */ blr +/* 800AAFA0 000A7F00 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR20CScriptActorKeyframe" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR20CScriptActorKeyframe": /* 800AAFA4 000A7F04 38 00 00 00 */ li r0, 0 /* 800AAFA8 000A7F08 90 03 00 04 */ stw r0, 4(r3) -/* 800AAFAC 000A7F0C 4E 80 00 20 */ blr +/* 800AAFAC 000A7F0C 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR12CScriptActor" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR12CScriptActor": /* 800AAFB0 000A7F10 38 00 00 00 */ li r0, 0 /* 800AAFB4 000A7F14 90 03 00 04 */ stw r0, 4(r3) -/* 800AAFB8 000A7F18 4E 80 00 20 */ blr +/* 800AAFB8 000A7F18 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR9CRepulsor" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR9CRepulsor": /* 800AAFBC 000A7F1C 38 00 00 00 */ li r0, 0 /* 800AAFC0 000A7F20 90 03 00 04 */ stw r0, 4(r3) -/* 800AAFC4 000A7F24 4E 80 00 20 */ blr +/* 800AAFC4 000A7F24 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR7CPlayer" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR7CPlayer": /* 800AAFC8 000A7F28 38 00 00 00 */ li r0, 0 /* 800AAFCC 000A7F2C 90 03 00 04 */ stw r0, 4(r3) -/* 800AAFD0 000A7F30 4E 80 00 20 */ blr +/* 800AAFD0 000A7F30 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR13CPhysicsActor" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR13CPhysicsActor": /* 800AAFD4 000A7F34 38 00 00 00 */ li r0, 0 /* 800AAFD8 000A7F38 90 03 00 04 */ stw r0, 4(r3) -/* 800AAFDC 000A7F3C 4E 80 00 20 */ blr +/* 800AAFDC 000A7F3C 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR3CAi" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR3CAi": /* 800AAFE0 000A7F40 38 00 00 00 */ li r0, 0 /* 800AAFE4 000A7F44 90 03 00 04 */ stw r0, 4(r3) -/* 800AAFE8 000A7F48 4E 80 00 20 */ blr +/* 800AAFE8 000A7F48 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR11CPathCamera" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR11CPathCamera": /* 800AAFEC 000A7F4C 38 00 00 00 */ li r0, 0 /* 800AAFF0 000A7F50 90 03 00 04 */ stw r0, 4(r3) -/* 800AAFF4 000A7F54 4E 80 00 20 */ blr +/* 800AAFF4 000A7F54 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR18CMetroidPrimeRelay" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR18CMetroidPrimeRelay": /* 800AAFF8 000A7F58 38 00 00 00 */ li r0, 0 /* 800AAFFC 000A7F5C 90 03 00 04 */ stw r0, 4(r3) -/* 800AB000 000A7F60 4E 80 00 20 */ blr +/* 800AB000 000A7F60 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR19CHUDBillboardEffect" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR19CHUDBillboardEffect": /* 800AB004 000A7F64 38 00 00 00 */ li r0, 0 /* 800AB008 000A7F68 90 03 00 04 */ stw r0, 4(r3) -/* 800AB00C 000A7F6C 4E 80 00 20 */ blr +/* 800AB00C 000A7F6C 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR15CGameProjectile" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR15CGameProjectile": /* 800AB010 000A7F70 38 00 00 00 */ li r0, 0 /* 800AB014 000A7F74 90 03 00 04 */ stw r0, 4(r3) -/* 800AB018 000A7F78 4E 80 00 20 */ blr +/* 800AB018 000A7F78 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR10CGameLight" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR10CGameLight": /* 800AB01C 000A7F7C 38 00 00 00 */ li r0, 0 /* 800AB020 000A7F80 90 03 00 04 */ stw r0, 4(r3) -/* 800AB024 000A7F84 4E 80 00 20 */ blr +/* 800AB024 000A7F84 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR11CGameCamera" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR11CGameCamera": /* 800AB028 000A7F88 38 00 00 00 */ li r0, 0 /* 800AB02C 000A7F8C 90 03 00 04 */ stw r0, 4(r3) -/* 800AB030 000A7F90 4E 80 00 20 */ blr +/* 800AB030 000A7F90 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR10CFishCloud" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR10CFishCloud": /* 800AB034 000A7F94 38 00 00 00 */ li r0, 0 /* 800AB038 000A7F98 90 03 00 04 */ stw r0, 4(r3) -/* 800AB03C 000A7F9C 4E 80 00 20 */ blr +/* 800AB03C 000A7F9C 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR18CFirstPersonCamera" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR18CFirstPersonCamera": /* 800AB040 000A7FA0 38 00 00 00 */ li r0, 0 /* 800AB044 000A7FA4 90 03 00 04 */ stw r0, 4(r3) -/* 800AB048 000A7FA8 4E 80 00 20 */ blr +/* 800AB048 000A7FA8 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR10CExplosion" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR10CExplosion": /* 800AB04C 000A7FAC 38 00 00 00 */ li r0, 0 /* 800AB050 000A7FB0 90 03 00 04 */ stw r0, 4(r3) -/* 800AB054 000A7FB4 4E 80 00 20 */ blr +/* 800AB054 000A7FB4 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR7CEntity" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR7CEntity": /* 800AB058 000A7FB8 38 00 00 00 */ li r0, 0 /* 800AB05C 000A7FBC 90 03 00 04 */ stw r0, 4(r3) -/* 800AB060 000A7FC0 4E 80 00 20 */ blr +/* 800AB060 000A7FC0 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR17CEnergyProjectile" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR17CEnergyProjectile": /* 800AB064 000A7FC4 38 00 00 00 */ li r0, 0 /* 800AB068 000A7FC8 90 03 00 04 */ stw r0, 4(r3) -/* 800AB06C 000A7FCC 4E 80 00 20 */ blr +/* 800AB06C 000A7FCC 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR16CDestroyableRock" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR16CDestroyableRock": /* 800AB070 000A7FD0 38 00 00 00 */ li r0, 0 /* 800AB074 000A7FD4 90 03 00 04 */ stw r0, 4(r3) -/* 800AB078 000A7FD8 4E 80 00 20 */ blr +/* 800AB078 000A7FD8 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR15CCollisionActor" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR15CCollisionActor": /* 800AB07C 000A7FDC 38 00 00 00 */ li r0, 0 /* 800AB080 000A7FE0 90 03 00 04 */ stw r0, 4(r3) -/* 800AB084 000A7FE4 4E 80 00 20 */ blr +/* 800AB084 000A7FE4 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR16CCinematicCamera" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR16CCinematicCamera": /* 800AB088 000A7FE8 38 00 00 00 */ li r0, 0 /* 800AB08C 000A7FEC 90 03 00 04 */ stw r0, 4(r3) -/* 800AB090 000A7FF0 4E 80 00 20 */ blr +/* 800AB090 000A7FF0 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR5CBomb" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR5CBomb": /* 800AB094 000A7FF4 38 00 00 00 */ li r0, 0 /* 800AB098 000A7FF8 90 03 00 04 */ stw r0, 4(r3) -/* 800AB09C 000A7FFC 4E 80 00 20 */ blr +/* 800AB09C 000A7FFC 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR11CBallCamera" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR11CBallCamera": /* 800AB0A0 000A8000 38 00 00 00 */ li r0, 0 /* 800AB0A4 000A8004 90 03 00 04 */ stw r0, 4(r3) -/* 800AB0A8 000A8008 4E 80 00 20 */ blr +/* 800AB0A8 000A8008 4E 80 00 20 */ blr .global "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR6CActor" "Visit__38TCastToPtr<24CScriptCameraPitchVolume>FR6CActor": /* 800AB0AC 000A800C 38 00 00 00 */ li r0, 0 /* 800AB0B0 000A8010 90 03 00 04 */ stw r0, 4(r3) -/* 800AB0B4 000A8014 4E 80 00 20 */ blr +/* 800AB0B4 000A8014 4E 80 00 20 */ blr .global "__ct__38TCastToPtr<24CScriptCameraPitchVolume>FP7CEntity" "__ct__38TCastToPtr<24CScriptCameraPitchVolume>FP7CEntity": @@ -14321,355 +14321,355 @@ lbl_800AADF8: /* 800AB0FC 000A805C 81 83 00 00 */ lwz r12, 0(r3) /* 800AB100 000A8060 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800AB104 000A8064 7D 89 03 A6 */ mtctr r12 -/* 800AB108 000A8068 4E 80 04 21 */ bctrl +/* 800AB108 000A8068 4E 80 04 21 */ bctrl lbl_800AB10C: /* 800AB10C 000A806C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800AB110 000A8070 7F E3 FB 78 */ mr r3, r31 /* 800AB114 000A8074 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800AB118 000A8078 7C 08 03 A6 */ mtlr r0 /* 800AB11C 000A807C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800AB120 000A8080 4E 80 00 20 */ blr +/* 800AB120 000A8080 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR7CWeapon" "Visit__31TCastToPtr<17CScriptCameraHint>FR7CWeapon": /* 800AB124 000A8084 38 00 00 00 */ li r0, 0 /* 800AB128 000A8088 90 03 00 04 */ stw r0, 4(r3) -/* 800AB12C 000A808C 4E 80 00 20 */ blr +/* 800AB12C 000A808C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR17CWallCrawlerSwarm" "Visit__31TCastToPtr<17CScriptCameraHint>FR17CWallCrawlerSwarm": /* 800AB130 000A8090 38 00 00 00 */ li r0, 0 /* 800AB134 000A8094 90 03 00 04 */ stw r0, 4(r3) -/* 800AB138 000A8098 4E 80 00 20 */ blr +/* 800AB138 000A8098 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR20CScriptSpindleCamera" "Visit__31TCastToPtr<17CScriptCameraHint>FR20CScriptSpindleCamera": /* 800AB13C 000A809C 38 00 00 00 */ li r0, 0 /* 800AB140 000A80A0 90 03 00 04 */ stw r0, 4(r3) -/* 800AB144 000A80A4 4E 80 00 20 */ blr +/* 800AB144 000A80A4 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR15CSnakeWeedSwarm" "Visit__31TCastToPtr<17CScriptCameraHint>FR15CSnakeWeedSwarm": /* 800AB148 000A80A8 38 00 00 00 */ li r0, 0 /* 800AB14C 000A80AC 90 03 00 04 */ stw r0, 4(r3) -/* 800AB150 000A80B0 4E 80 00 20 */ blr +/* 800AB150 000A80B0 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR15CScriptWaypoint" "Visit__31TCastToPtr<17CScriptCameraHint>FR15CScriptWaypoint": /* 800AB154 000A80B4 38 00 00 00 */ li r0, 0 /* 800AB158 000A80B8 90 03 00 04 */ stw r0, 4(r3) -/* 800AB15C 000A80BC 4E 80 00 20 */ blr +/* 800AB15C 000A80BC 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR12CScriptWater" "Visit__31TCastToPtr<17CScriptCameraHint>FR12CScriptWater": /* 800AB160 000A80C0 38 00 00 00 */ li r0, 0 /* 800AB164 000A80C4 90 03 00 04 */ stw r0, 4(r3) -/* 800AB168 000A80C8 4E 80 00 20 */ blr +/* 800AB168 000A80C8 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR17CScriptVisorFlare" "Visit__31TCastToPtr<17CScriptCameraHint>FR17CScriptVisorFlare": /* 800AB16C 000A80CC 38 00 00 00 */ li r0, 0 /* 800AB170 000A80D0 90 03 00 04 */ stw r0, 4(r3) -/* 800AB174 000A80D4 4E 80 00 20 */ blr +/* 800AB174 000A80D4 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR14CScriptTrigger" "Visit__31TCastToPtr<17CScriptCameraHint>FR14CScriptTrigger": /* 800AB178 000A80D8 38 00 00 00 */ li r0, 0 /* 800AB17C 000A80DC 90 03 00 04 */ stw r0, 4(r3) -/* 800AB180 000A80E0 4E 80 00 20 */ blr +/* 800AB180 000A80E0 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR12CScriptTimer" "Visit__31TCastToPtr<17CScriptCameraHint>FR12CScriptTimer": /* 800AB184 000A80E4 38 00 00 00 */ li r0, 0 /* 800AB188 000A80E8 90 03 00 04 */ stw r0, 4(r3) -/* 800AB18C 000A80EC 4E 80 00 20 */ blr +/* 800AB18C 000A80EC 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR10CTeamAiMgr" "Visit__31TCastToPtr<17CScriptCameraHint>FR10CTeamAiMgr": /* 800AB190 000A80F0 38 00 00 00 */ li r0, 0 /* 800AB194 000A80F4 90 03 00 04 */ stw r0, 4(r3) -/* 800AB198 000A80F8 4E 80 00 20 */ blr +/* 800AB198 000A80F8 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR21CScriptTargetingPoint" "Visit__31TCastToPtr<17CScriptCameraHint>FR21CScriptTargetingPoint": /* 800AB19C 000A80FC 38 00 00 00 */ li r0, 0 /* 800AB1A0 000A8100 90 03 00 04 */ stw r0, 4(r3) -/* 800AB1A4 000A8104 4E 80 00 20 */ blr +/* 800AB1A4 000A8104 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR25CScriptSpiderBallWaypoint" "Visit__31TCastToPtr<17CScriptCameraHint>FR25CScriptSpiderBallWaypoint": /* 800AB1A8 000A8108 38 00 00 00 */ li r0, 0 /* 800AB1AC 000A810C 90 03 00 04 */ stw r0, 4(r3) -/* 800AB1B0 000A8110 4E 80 00 20 */ blr +/* 800AB1B0 000A8110 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR34CScriptSpiderBallAttractionSurface" "Visit__31TCastToPtr<17CScriptCameraHint>FR34CScriptSpiderBallAttractionSurface": /* 800AB1B4 000A8114 38 00 00 00 */ li r0, 0 /* 800AB1B8 000A8118 90 03 00 04 */ stw r0, 4(r3) -/* 800AB1BC 000A811C 4E 80 00 20 */ blr +/* 800AB1BC 000A811C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR22CScriptSpecialFunction" "Visit__31TCastToPtr<17CScriptCameraHint>FR22CScriptSpecialFunction": /* 800AB1C0 000A8120 38 00 00 00 */ li r0, 0 /* 800AB1C4 000A8124 90 03 00 04 */ stw r0, 4(r3) -/* 800AB1C8 000A8128 4E 80 00 20 */ blr +/* 800AB1C8 000A8128 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR17CScriptSpawnPoint" "Visit__31TCastToPtr<17CScriptCameraHint>FR17CScriptSpawnPoint": /* 800AB1CC 000A812C 38 00 00 00 */ li r0, 0 /* 800AB1D0 000A8130 90 03 00 04 */ stw r0, 4(r3) -/* 800AB1D4 000A8134 4E 80 00 20 */ blr +/* 800AB1D4 000A8134 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR12CScriptSound" "Visit__31TCastToPtr<17CScriptCameraHint>FR12CScriptSound": /* 800AB1D8 000A8138 38 00 00 00 */ li r0, 0 /* 800AB1DC 000A813C 90 03 00 04 */ stw r0, 4(r3) -/* 800AB1E0 000A8140 4E 80 00 20 */ blr +/* 800AB1E0 000A8140 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR20CScriptRoomAcoustics" "Visit__31TCastToPtr<17CScriptCameraHint>FR20CScriptRoomAcoustics": /* 800AB1E4 000A8144 38 00 00 00 */ li r0, 0 /* 800AB1E8 000A8148 90 03 00 04 */ stw r0, 4(r3) -/* 800AB1EC 000A814C 4E 80 00 20 */ blr +/* 800AB1EC 000A814C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR22CScriptPointOfinterest" "Visit__31TCastToPtr<17CScriptCameraHint>FR22CScriptPointOfinterest": /* 800AB1F0 000A8150 38 00 00 00 */ li r0, 0 /* 800AB1F4 000A8154 90 03 00 04 */ stw r0, 4(r3) -/* 800AB1F8 000A8158 4E 80 00 20 */ blr +/* 800AB1F8 000A8158 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR17CScriptPlayerHint" "Visit__31TCastToPtr<17CScriptCameraHint>FR17CScriptPlayerHint": /* 800AB1FC 000A815C 38 00 00 00 */ li r0, 0 /* 800AB200 000A8160 90 03 00 04 */ stw r0, 4(r3) -/* 800AB204 000A8164 4E 80 00 20 */ blr +/* 800AB204 000A8164 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR15CScriptPlatform" "Visit__31TCastToPtr<17CScriptCameraHint>FR15CScriptPlatform": /* 800AB208 000A8168 38 00 00 00 */ li r0, 0 /* 800AB20C 000A816C 90 03 00 04 */ stw r0, 4(r3) -/* 800AB210 000A8170 4E 80 00 20 */ blr +/* 800AB210 000A8170 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR13CScriptPickup" "Visit__31TCastToPtr<17CScriptCameraHint>FR13CScriptPickup": /* 800AB214 000A8174 38 00 00 00 */ li r0, 0 /* 800AB218 000A8178 90 03 00 04 */ stw r0, 4(r3) -/* 800AB21C 000A817C 4E 80 00 20 */ blr +/* 800AB21C 000A817C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR15CScriptMazeNode" "Visit__31TCastToPtr<17CScriptCameraHint>FR15CScriptMazeNode": /* 800AB220 000A8180 38 00 00 00 */ li r0, 0 /* 800AB224 000A8184 90 03 00 04 */ stw r0, 4(r3) -/* 800AB228 000A8188 4E 80 00 20 */ blr +/* 800AB228 000A8188 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR16CScriptGunTurret" "Visit__31TCastToPtr<17CScriptCameraHint>FR16CScriptGunTurret": /* 800AB22C 000A818C 38 00 00 00 */ li r0, 0 /* 800AB230 000A8190 90 03 00 04 */ stw r0, 4(r3) -/* 800AB234 000A8194 4E 80 00 20 */ blr +/* 800AB234 000A8194 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR19CScriptGrapplePoint" "Visit__31TCastToPtr<17CScriptCameraHint>FR19CScriptGrapplePoint": /* 800AB238 000A8198 38 00 00 00 */ li r0, 0 /* 800AB23C 000A819C 90 03 00 04 */ stw r0, 4(r3) -/* 800AB240 000A81A0 4E 80 00 20 */ blr +/* 800AB240 000A81A0 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR13CScriptEffect" "Visit__31TCastToPtr<17CScriptCameraHint>FR13CScriptEffect": /* 800AB244 000A81A4 38 00 00 00 */ li r0, 0 /* 800AB248 000A81A8 90 03 00 04 */ stw r0, 4(r3) -/* 800AB24C 000A81AC 4E 80 00 20 */ blr +/* 800AB24C 000A81AC 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR11CScriptDoor" "Visit__31TCastToPtr<17CScriptCameraHint>FR11CScriptDoor": /* 800AB250 000A81B0 38 00 00 00 */ li r0, 0 /* 800AB254 000A81B4 90 03 00 04 */ stw r0, 4(r3) -/* 800AB258 000A81B8 4E 80 00 20 */ blr +/* 800AB258 000A81B8 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR11CScriptDock" "Visit__31TCastToPtr<17CScriptCameraHint>FR11CScriptDock": /* 800AB25C 000A81BC 38 00 00 00 */ li r0, 0 /* 800AB260 000A81C0 90 03 00 04 */ stw r0, 4(r3) -/* 800AB264 000A81C4 4E 80 00 20 */ blr +/* 800AB264 000A81C4 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR18CScriptDistanceFog" "Visit__31TCastToPtr<17CScriptCameraHint>FR18CScriptDistanceFog": /* 800AB268 000A81C8 38 00 00 00 */ li r0, 0 /* 800AB26C 000A81CC 90 03 00 04 */ stw r0, 4(r3) -/* 800AB270 000A81D0 4E 80 00 20 */ blr +/* 800AB270 000A81D0 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR26CScriptDebugCameraWaypoint" "Visit__31TCastToPtr<17CScriptCameraHint>FR26CScriptDebugCameraWaypoint": /* 800AB274 000A81D4 38 00 00 00 */ li r0, 0 /* 800AB278 000A81D8 90 03 00 04 */ stw r0, 4(r3) -/* 800AB27C 000A81DC 4E 80 00 20 */ blr +/* 800AB27C 000A81DC 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR17CScriptCoverPoint" "Visit__31TCastToPtr<17CScriptCameraHint>FR17CScriptCoverPoint": /* 800AB280 000A81E0 38 00 00 00 */ li r0, 0 /* 800AB284 000A81E4 90 03 00 04 */ stw r0, 4(r3) -/* 800AB288 000A81E8 4E 80 00 20 */ blr +/* 800AB288 000A81E8 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR21CScriptCameraWaypoint" "Visit__31TCastToPtr<17CScriptCameraHint>FR21CScriptCameraWaypoint": /* 800AB28C 000A81EC 38 00 00 00 */ li r0, 0 /* 800AB290 000A81F0 90 03 00 04 */ stw r0, 4(r3) -/* 800AB294 000A81F4 4E 80 00 20 */ blr +/* 800AB294 000A81F4 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR24CScriptCameraPitchVolume" "Visit__31TCastToPtr<17CScriptCameraHint>FR24CScriptCameraPitchVolume": /* 800AB298 000A81F8 38 00 00 00 */ li r0, 0 /* 800AB29C 000A81FC 90 03 00 04 */ stw r0, 4(r3) -/* 800AB2A0 000A8200 4E 80 00 20 */ blr +/* 800AB2A0 000A8200 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR17CScriptCameraHint" "Visit__31TCastToPtr<17CScriptCameraHint>FR17CScriptCameraHint": /* 800AB2A4 000A8204 90 83 00 04 */ stw r4, 4(r3) -/* 800AB2A8 000A8208 4E 80 00 20 */ blr +/* 800AB2A8 000A8208 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR18CScriptAiJumpPoint" "Visit__31TCastToPtr<17CScriptCameraHint>FR18CScriptAiJumpPoint": /* 800AB2AC 000A820C 38 00 00 00 */ li r0, 0 /* 800AB2B0 000A8210 90 03 00 04 */ stw r0, 4(r3) -/* 800AB2B4 000A8214 4E 80 00 20 */ blr +/* 800AB2B4 000A8214 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR20CScriptActorKeyframe" "Visit__31TCastToPtr<17CScriptCameraHint>FR20CScriptActorKeyframe": /* 800AB2B8 000A8218 38 00 00 00 */ li r0, 0 /* 800AB2BC 000A821C 90 03 00 04 */ stw r0, 4(r3) -/* 800AB2C0 000A8220 4E 80 00 20 */ blr +/* 800AB2C0 000A8220 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR12CScriptActor" "Visit__31TCastToPtr<17CScriptCameraHint>FR12CScriptActor": /* 800AB2C4 000A8224 38 00 00 00 */ li r0, 0 /* 800AB2C8 000A8228 90 03 00 04 */ stw r0, 4(r3) -/* 800AB2CC 000A822C 4E 80 00 20 */ blr +/* 800AB2CC 000A822C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR9CRepulsor" "Visit__31TCastToPtr<17CScriptCameraHint>FR9CRepulsor": /* 800AB2D0 000A8230 38 00 00 00 */ li r0, 0 /* 800AB2D4 000A8234 90 03 00 04 */ stw r0, 4(r3) -/* 800AB2D8 000A8238 4E 80 00 20 */ blr +/* 800AB2D8 000A8238 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR7CPlayer" "Visit__31TCastToPtr<17CScriptCameraHint>FR7CPlayer": /* 800AB2DC 000A823C 38 00 00 00 */ li r0, 0 /* 800AB2E0 000A8240 90 03 00 04 */ stw r0, 4(r3) -/* 800AB2E4 000A8244 4E 80 00 20 */ blr +/* 800AB2E4 000A8244 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR13CPhysicsActor" "Visit__31TCastToPtr<17CScriptCameraHint>FR13CPhysicsActor": /* 800AB2E8 000A8248 38 00 00 00 */ li r0, 0 /* 800AB2EC 000A824C 90 03 00 04 */ stw r0, 4(r3) -/* 800AB2F0 000A8250 4E 80 00 20 */ blr +/* 800AB2F0 000A8250 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR3CAi" "Visit__31TCastToPtr<17CScriptCameraHint>FR3CAi": /* 800AB2F4 000A8254 38 00 00 00 */ li r0, 0 /* 800AB2F8 000A8258 90 03 00 04 */ stw r0, 4(r3) -/* 800AB2FC 000A825C 4E 80 00 20 */ blr +/* 800AB2FC 000A825C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR11CPathCamera" "Visit__31TCastToPtr<17CScriptCameraHint>FR11CPathCamera": /* 800AB300 000A8260 38 00 00 00 */ li r0, 0 /* 800AB304 000A8264 90 03 00 04 */ stw r0, 4(r3) -/* 800AB308 000A8268 4E 80 00 20 */ blr +/* 800AB308 000A8268 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR18CMetroidPrimeRelay" "Visit__31TCastToPtr<17CScriptCameraHint>FR18CMetroidPrimeRelay": /* 800AB30C 000A826C 38 00 00 00 */ li r0, 0 /* 800AB310 000A8270 90 03 00 04 */ stw r0, 4(r3) -/* 800AB314 000A8274 4E 80 00 20 */ blr +/* 800AB314 000A8274 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR19CHUDBillboardEffect" "Visit__31TCastToPtr<17CScriptCameraHint>FR19CHUDBillboardEffect": /* 800AB318 000A8278 38 00 00 00 */ li r0, 0 /* 800AB31C 000A827C 90 03 00 04 */ stw r0, 4(r3) -/* 800AB320 000A8280 4E 80 00 20 */ blr +/* 800AB320 000A8280 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR15CGameProjectile" "Visit__31TCastToPtr<17CScriptCameraHint>FR15CGameProjectile": /* 800AB324 000A8284 38 00 00 00 */ li r0, 0 /* 800AB328 000A8288 90 03 00 04 */ stw r0, 4(r3) -/* 800AB32C 000A828C 4E 80 00 20 */ blr +/* 800AB32C 000A828C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR10CGameLight" "Visit__31TCastToPtr<17CScriptCameraHint>FR10CGameLight": /* 800AB330 000A8290 38 00 00 00 */ li r0, 0 /* 800AB334 000A8294 90 03 00 04 */ stw r0, 4(r3) -/* 800AB338 000A8298 4E 80 00 20 */ blr +/* 800AB338 000A8298 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR11CGameCamera" "Visit__31TCastToPtr<17CScriptCameraHint>FR11CGameCamera": /* 800AB33C 000A829C 38 00 00 00 */ li r0, 0 /* 800AB340 000A82A0 90 03 00 04 */ stw r0, 4(r3) -/* 800AB344 000A82A4 4E 80 00 20 */ blr +/* 800AB344 000A82A4 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR10CFishCloud" "Visit__31TCastToPtr<17CScriptCameraHint>FR10CFishCloud": /* 800AB348 000A82A8 38 00 00 00 */ li r0, 0 /* 800AB34C 000A82AC 90 03 00 04 */ stw r0, 4(r3) -/* 800AB350 000A82B0 4E 80 00 20 */ blr +/* 800AB350 000A82B0 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR18CFirstPersonCamera" "Visit__31TCastToPtr<17CScriptCameraHint>FR18CFirstPersonCamera": /* 800AB354 000A82B4 38 00 00 00 */ li r0, 0 /* 800AB358 000A82B8 90 03 00 04 */ stw r0, 4(r3) -/* 800AB35C 000A82BC 4E 80 00 20 */ blr +/* 800AB35C 000A82BC 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR10CExplosion" "Visit__31TCastToPtr<17CScriptCameraHint>FR10CExplosion": /* 800AB360 000A82C0 38 00 00 00 */ li r0, 0 /* 800AB364 000A82C4 90 03 00 04 */ stw r0, 4(r3) -/* 800AB368 000A82C8 4E 80 00 20 */ blr +/* 800AB368 000A82C8 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR7CEntity" "Visit__31TCastToPtr<17CScriptCameraHint>FR7CEntity": /* 800AB36C 000A82CC 38 00 00 00 */ li r0, 0 /* 800AB370 000A82D0 90 03 00 04 */ stw r0, 4(r3) -/* 800AB374 000A82D4 4E 80 00 20 */ blr +/* 800AB374 000A82D4 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR17CEnergyProjectile" "Visit__31TCastToPtr<17CScriptCameraHint>FR17CEnergyProjectile": /* 800AB378 000A82D8 38 00 00 00 */ li r0, 0 /* 800AB37C 000A82DC 90 03 00 04 */ stw r0, 4(r3) -/* 800AB380 000A82E0 4E 80 00 20 */ blr +/* 800AB380 000A82E0 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR16CDestroyableRock" "Visit__31TCastToPtr<17CScriptCameraHint>FR16CDestroyableRock": /* 800AB384 000A82E4 38 00 00 00 */ li r0, 0 /* 800AB388 000A82E8 90 03 00 04 */ stw r0, 4(r3) -/* 800AB38C 000A82EC 4E 80 00 20 */ blr +/* 800AB38C 000A82EC 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR15CCollisionActor" "Visit__31TCastToPtr<17CScriptCameraHint>FR15CCollisionActor": /* 800AB390 000A82F0 38 00 00 00 */ li r0, 0 /* 800AB394 000A82F4 90 03 00 04 */ stw r0, 4(r3) -/* 800AB398 000A82F8 4E 80 00 20 */ blr +/* 800AB398 000A82F8 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR16CCinematicCamera" "Visit__31TCastToPtr<17CScriptCameraHint>FR16CCinematicCamera": /* 800AB39C 000A82FC 38 00 00 00 */ li r0, 0 /* 800AB3A0 000A8300 90 03 00 04 */ stw r0, 4(r3) -/* 800AB3A4 000A8304 4E 80 00 20 */ blr +/* 800AB3A4 000A8304 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR5CBomb" "Visit__31TCastToPtr<17CScriptCameraHint>FR5CBomb": /* 800AB3A8 000A8308 38 00 00 00 */ li r0, 0 /* 800AB3AC 000A830C 90 03 00 04 */ stw r0, 4(r3) -/* 800AB3B0 000A8310 4E 80 00 20 */ blr +/* 800AB3B0 000A8310 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR11CBallCamera" "Visit__31TCastToPtr<17CScriptCameraHint>FR11CBallCamera": /* 800AB3B4 000A8314 38 00 00 00 */ li r0, 0 /* 800AB3B8 000A8318 90 03 00 04 */ stw r0, 4(r3) -/* 800AB3BC 000A831C 4E 80 00 20 */ blr +/* 800AB3BC 000A831C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CScriptCameraHint>FR6CActor" "Visit__31TCastToPtr<17CScriptCameraHint>FR6CActor": /* 800AB3C0 000A8320 38 00 00 00 */ li r0, 0 /* 800AB3C4 000A8324 90 03 00 04 */ stw r0, 4(r3) -/* 800AB3C8 000A8328 4E 80 00 20 */ blr +/* 800AB3C8 000A8328 4E 80 00 20 */ blr .global "__ct__31TCastToPtr<17CScriptCameraHint>FP7CEntity" "__ct__31TCastToPtr<17CScriptCameraHint>FP7CEntity": @@ -14693,355 +14693,355 @@ lbl_800AB10C: /* 800AB410 000A8370 81 83 00 00 */ lwz r12, 0(r3) /* 800AB414 000A8374 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800AB418 000A8378 7D 89 03 A6 */ mtctr r12 -/* 800AB41C 000A837C 4E 80 04 21 */ bctrl +/* 800AB41C 000A837C 4E 80 04 21 */ bctrl lbl_800AB420: /* 800AB420 000A8380 80 01 00 14 */ lwz r0, 0x14(r1) /* 800AB424 000A8384 7F E3 FB 78 */ mr r3, r31 /* 800AB428 000A8388 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800AB42C 000A838C 7C 08 03 A6 */ mtlr r0 /* 800AB430 000A8390 38 21 00 10 */ addi r1, r1, 0x10 -/* 800AB434 000A8394 4E 80 00 20 */ blr +/* 800AB434 000A8394 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR7CWeapon" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR7CWeapon": /* 800AB438 000A8398 38 00 00 00 */ li r0, 0 /* 800AB43C 000A839C 90 03 00 04 */ stw r0, 4(r3) -/* 800AB440 000A83A0 4E 80 00 20 */ blr +/* 800AB440 000A83A0 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR17CWallCrawlerSwarm" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR17CWallCrawlerSwarm": /* 800AB444 000A83A4 38 00 00 00 */ li r0, 0 /* 800AB448 000A83A8 90 03 00 04 */ stw r0, 4(r3) -/* 800AB44C 000A83AC 4E 80 00 20 */ blr +/* 800AB44C 000A83AC 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR20CScriptSpindleCamera" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR20CScriptSpindleCamera": /* 800AB450 000A83B0 38 00 00 00 */ li r0, 0 /* 800AB454 000A83B4 90 03 00 04 */ stw r0, 4(r3) -/* 800AB458 000A83B8 4E 80 00 20 */ blr +/* 800AB458 000A83B8 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR15CSnakeWeedSwarm" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR15CSnakeWeedSwarm": /* 800AB45C 000A83BC 38 00 00 00 */ li r0, 0 /* 800AB460 000A83C0 90 03 00 04 */ stw r0, 4(r3) -/* 800AB464 000A83C4 4E 80 00 20 */ blr +/* 800AB464 000A83C4 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR15CScriptWaypoint" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR15CScriptWaypoint": /* 800AB468 000A83C8 38 00 00 00 */ li r0, 0 /* 800AB46C 000A83CC 90 03 00 04 */ stw r0, 4(r3) -/* 800AB470 000A83D0 4E 80 00 20 */ blr +/* 800AB470 000A83D0 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR12CScriptWater" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR12CScriptWater": /* 800AB474 000A83D4 38 00 00 00 */ li r0, 0 /* 800AB478 000A83D8 90 03 00 04 */ stw r0, 4(r3) -/* 800AB47C 000A83DC 4E 80 00 20 */ blr +/* 800AB47C 000A83DC 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR17CScriptVisorFlare" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR17CScriptVisorFlare": /* 800AB480 000A83E0 38 00 00 00 */ li r0, 0 /* 800AB484 000A83E4 90 03 00 04 */ stw r0, 4(r3) -/* 800AB488 000A83E8 4E 80 00 20 */ blr +/* 800AB488 000A83E8 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR14CScriptTrigger" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR14CScriptTrigger": /* 800AB48C 000A83EC 38 00 00 00 */ li r0, 0 /* 800AB490 000A83F0 90 03 00 04 */ stw r0, 4(r3) -/* 800AB494 000A83F4 4E 80 00 20 */ blr +/* 800AB494 000A83F4 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR12CScriptTimer" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR12CScriptTimer": /* 800AB498 000A83F8 38 00 00 00 */ li r0, 0 /* 800AB49C 000A83FC 90 03 00 04 */ stw r0, 4(r3) -/* 800AB4A0 000A8400 4E 80 00 20 */ blr +/* 800AB4A0 000A8400 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR10CTeamAiMgr" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR10CTeamAiMgr": /* 800AB4A4 000A8404 38 00 00 00 */ li r0, 0 /* 800AB4A8 000A8408 90 03 00 04 */ stw r0, 4(r3) -/* 800AB4AC 000A840C 4E 80 00 20 */ blr +/* 800AB4AC 000A840C 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR21CScriptTargetingPoint" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR21CScriptTargetingPoint": /* 800AB4B0 000A8410 38 00 00 00 */ li r0, 0 /* 800AB4B4 000A8414 90 03 00 04 */ stw r0, 4(r3) -/* 800AB4B8 000A8418 4E 80 00 20 */ blr +/* 800AB4B8 000A8418 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR25CScriptSpiderBallWaypoint" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR25CScriptSpiderBallWaypoint": /* 800AB4BC 000A841C 38 00 00 00 */ li r0, 0 /* 800AB4C0 000A8420 90 03 00 04 */ stw r0, 4(r3) -/* 800AB4C4 000A8424 4E 80 00 20 */ blr +/* 800AB4C4 000A8424 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR34CScriptSpiderBallAttractionSurface" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR34CScriptSpiderBallAttractionSurface": /* 800AB4C8 000A8428 38 00 00 00 */ li r0, 0 /* 800AB4CC 000A842C 90 03 00 04 */ stw r0, 4(r3) -/* 800AB4D0 000A8430 4E 80 00 20 */ blr +/* 800AB4D0 000A8430 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR22CScriptSpecialFunction" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR22CScriptSpecialFunction": /* 800AB4D4 000A8434 38 00 00 00 */ li r0, 0 /* 800AB4D8 000A8438 90 03 00 04 */ stw r0, 4(r3) -/* 800AB4DC 000A843C 4E 80 00 20 */ blr +/* 800AB4DC 000A843C 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR17CScriptSpawnPoint" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR17CScriptSpawnPoint": /* 800AB4E0 000A8440 38 00 00 00 */ li r0, 0 /* 800AB4E4 000A8444 90 03 00 04 */ stw r0, 4(r3) -/* 800AB4E8 000A8448 4E 80 00 20 */ blr +/* 800AB4E8 000A8448 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR12CScriptSound" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR12CScriptSound": /* 800AB4EC 000A844C 38 00 00 00 */ li r0, 0 /* 800AB4F0 000A8450 90 03 00 04 */ stw r0, 4(r3) -/* 800AB4F4 000A8454 4E 80 00 20 */ blr +/* 800AB4F4 000A8454 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR20CScriptRoomAcoustics" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR20CScriptRoomAcoustics": /* 800AB4F8 000A8458 38 00 00 00 */ li r0, 0 /* 800AB4FC 000A845C 90 03 00 04 */ stw r0, 4(r3) -/* 800AB500 000A8460 4E 80 00 20 */ blr +/* 800AB500 000A8460 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR22CScriptPointOfinterest" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR22CScriptPointOfinterest": /* 800AB504 000A8464 38 00 00 00 */ li r0, 0 /* 800AB508 000A8468 90 03 00 04 */ stw r0, 4(r3) -/* 800AB50C 000A846C 4E 80 00 20 */ blr +/* 800AB50C 000A846C 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR17CScriptPlayerHint" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR17CScriptPlayerHint": /* 800AB510 000A8470 38 00 00 00 */ li r0, 0 /* 800AB514 000A8474 90 03 00 04 */ stw r0, 4(r3) -/* 800AB518 000A8478 4E 80 00 20 */ blr +/* 800AB518 000A8478 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR15CScriptPlatform" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR15CScriptPlatform": /* 800AB51C 000A847C 38 00 00 00 */ li r0, 0 /* 800AB520 000A8480 90 03 00 04 */ stw r0, 4(r3) -/* 800AB524 000A8484 4E 80 00 20 */ blr +/* 800AB524 000A8484 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR13CScriptPickup" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR13CScriptPickup": /* 800AB528 000A8488 38 00 00 00 */ li r0, 0 /* 800AB52C 000A848C 90 03 00 04 */ stw r0, 4(r3) -/* 800AB530 000A8490 4E 80 00 20 */ blr +/* 800AB530 000A8490 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR15CScriptMazeNode" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR15CScriptMazeNode": /* 800AB534 000A8494 38 00 00 00 */ li r0, 0 /* 800AB538 000A8498 90 03 00 04 */ stw r0, 4(r3) -/* 800AB53C 000A849C 4E 80 00 20 */ blr +/* 800AB53C 000A849C 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR16CScriptGunTurret" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR16CScriptGunTurret": /* 800AB540 000A84A0 38 00 00 00 */ li r0, 0 /* 800AB544 000A84A4 90 03 00 04 */ stw r0, 4(r3) -/* 800AB548 000A84A8 4E 80 00 20 */ blr +/* 800AB548 000A84A8 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR19CScriptGrapplePoint" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR19CScriptGrapplePoint": /* 800AB54C 000A84AC 38 00 00 00 */ li r0, 0 /* 800AB550 000A84B0 90 03 00 04 */ stw r0, 4(r3) -/* 800AB554 000A84B4 4E 80 00 20 */ blr +/* 800AB554 000A84B4 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR13CScriptEffect" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR13CScriptEffect": /* 800AB558 000A84B8 38 00 00 00 */ li r0, 0 /* 800AB55C 000A84BC 90 03 00 04 */ stw r0, 4(r3) -/* 800AB560 000A84C0 4E 80 00 20 */ blr +/* 800AB560 000A84C0 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR11CScriptDoor" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR11CScriptDoor": /* 800AB564 000A84C4 38 00 00 00 */ li r0, 0 /* 800AB568 000A84C8 90 03 00 04 */ stw r0, 4(r3) -/* 800AB56C 000A84CC 4E 80 00 20 */ blr +/* 800AB56C 000A84CC 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR11CScriptDock" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR11CScriptDock": /* 800AB570 000A84D0 38 00 00 00 */ li r0, 0 /* 800AB574 000A84D4 90 03 00 04 */ stw r0, 4(r3) -/* 800AB578 000A84D8 4E 80 00 20 */ blr +/* 800AB578 000A84D8 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR18CScriptDistanceFog" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR18CScriptDistanceFog": /* 800AB57C 000A84DC 38 00 00 00 */ li r0, 0 /* 800AB580 000A84E0 90 03 00 04 */ stw r0, 4(r3) -/* 800AB584 000A84E4 4E 80 00 20 */ blr +/* 800AB584 000A84E4 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR26CScriptDebugCameraWaypoint" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR26CScriptDebugCameraWaypoint": /* 800AB588 000A84E8 38 00 00 00 */ li r0, 0 /* 800AB58C 000A84EC 90 03 00 04 */ stw r0, 4(r3) -/* 800AB590 000A84F0 4E 80 00 20 */ blr +/* 800AB590 000A84F0 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR17CScriptCoverPoint" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR17CScriptCoverPoint": /* 800AB594 000A84F4 38 00 00 00 */ li r0, 0 /* 800AB598 000A84F8 90 03 00 04 */ stw r0, 4(r3) -/* 800AB59C 000A84FC 4E 80 00 20 */ blr +/* 800AB59C 000A84FC 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR21CScriptCameraWaypoint" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR21CScriptCameraWaypoint": /* 800AB5A0 000A8500 38 00 00 00 */ li r0, 0 /* 800AB5A4 000A8504 90 03 00 04 */ stw r0, 4(r3) -/* 800AB5A8 000A8508 4E 80 00 20 */ blr +/* 800AB5A8 000A8508 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR24CScriptCameraPitchVolume" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR24CScriptCameraPitchVolume": /* 800AB5AC 000A850C 38 00 00 00 */ li r0, 0 /* 800AB5B0 000A8510 90 03 00 04 */ stw r0, 4(r3) -/* 800AB5B4 000A8514 4E 80 00 20 */ blr +/* 800AB5B4 000A8514 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR17CScriptCameraHint" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR17CScriptCameraHint": /* 800AB5B8 000A8518 38 00 00 00 */ li r0, 0 /* 800AB5BC 000A851C 90 03 00 04 */ stw r0, 4(r3) -/* 800AB5C0 000A8520 4E 80 00 20 */ blr +/* 800AB5C0 000A8520 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR18CScriptAiJumpPoint" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR18CScriptAiJumpPoint": /* 800AB5C4 000A8524 90 83 00 04 */ stw r4, 4(r3) -/* 800AB5C8 000A8528 4E 80 00 20 */ blr +/* 800AB5C8 000A8528 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR20CScriptActorKeyframe" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR20CScriptActorKeyframe": /* 800AB5CC 000A852C 38 00 00 00 */ li r0, 0 /* 800AB5D0 000A8530 90 03 00 04 */ stw r0, 4(r3) -/* 800AB5D4 000A8534 4E 80 00 20 */ blr +/* 800AB5D4 000A8534 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR12CScriptActor" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR12CScriptActor": /* 800AB5D8 000A8538 38 00 00 00 */ li r0, 0 /* 800AB5DC 000A853C 90 03 00 04 */ stw r0, 4(r3) -/* 800AB5E0 000A8540 4E 80 00 20 */ blr +/* 800AB5E0 000A8540 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR9CRepulsor" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR9CRepulsor": /* 800AB5E4 000A8544 38 00 00 00 */ li r0, 0 /* 800AB5E8 000A8548 90 03 00 04 */ stw r0, 4(r3) -/* 800AB5EC 000A854C 4E 80 00 20 */ blr +/* 800AB5EC 000A854C 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR7CPlayer" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR7CPlayer": /* 800AB5F0 000A8550 38 00 00 00 */ li r0, 0 /* 800AB5F4 000A8554 90 03 00 04 */ stw r0, 4(r3) -/* 800AB5F8 000A8558 4E 80 00 20 */ blr +/* 800AB5F8 000A8558 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR13CPhysicsActor" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR13CPhysicsActor": /* 800AB5FC 000A855C 38 00 00 00 */ li r0, 0 /* 800AB600 000A8560 90 03 00 04 */ stw r0, 4(r3) -/* 800AB604 000A8564 4E 80 00 20 */ blr +/* 800AB604 000A8564 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR3CAi" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR3CAi": /* 800AB608 000A8568 38 00 00 00 */ li r0, 0 /* 800AB60C 000A856C 90 03 00 04 */ stw r0, 4(r3) -/* 800AB610 000A8570 4E 80 00 20 */ blr +/* 800AB610 000A8570 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR11CPathCamera" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR11CPathCamera": /* 800AB614 000A8574 38 00 00 00 */ li r0, 0 /* 800AB618 000A8578 90 03 00 04 */ stw r0, 4(r3) -/* 800AB61C 000A857C 4E 80 00 20 */ blr +/* 800AB61C 000A857C 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR18CMetroidPrimeRelay" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR18CMetroidPrimeRelay": /* 800AB620 000A8580 38 00 00 00 */ li r0, 0 /* 800AB624 000A8584 90 03 00 04 */ stw r0, 4(r3) -/* 800AB628 000A8588 4E 80 00 20 */ blr +/* 800AB628 000A8588 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR19CHUDBillboardEffect" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR19CHUDBillboardEffect": /* 800AB62C 000A858C 38 00 00 00 */ li r0, 0 /* 800AB630 000A8590 90 03 00 04 */ stw r0, 4(r3) -/* 800AB634 000A8594 4E 80 00 20 */ blr +/* 800AB634 000A8594 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR15CGameProjectile" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR15CGameProjectile": /* 800AB638 000A8598 38 00 00 00 */ li r0, 0 /* 800AB63C 000A859C 90 03 00 04 */ stw r0, 4(r3) -/* 800AB640 000A85A0 4E 80 00 20 */ blr +/* 800AB640 000A85A0 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR10CGameLight" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR10CGameLight": /* 800AB644 000A85A4 38 00 00 00 */ li r0, 0 /* 800AB648 000A85A8 90 03 00 04 */ stw r0, 4(r3) -/* 800AB64C 000A85AC 4E 80 00 20 */ blr +/* 800AB64C 000A85AC 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR11CGameCamera" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR11CGameCamera": /* 800AB650 000A85B0 38 00 00 00 */ li r0, 0 /* 800AB654 000A85B4 90 03 00 04 */ stw r0, 4(r3) -/* 800AB658 000A85B8 4E 80 00 20 */ blr +/* 800AB658 000A85B8 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR10CFishCloud" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR10CFishCloud": /* 800AB65C 000A85BC 38 00 00 00 */ li r0, 0 /* 800AB660 000A85C0 90 03 00 04 */ stw r0, 4(r3) -/* 800AB664 000A85C4 4E 80 00 20 */ blr +/* 800AB664 000A85C4 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR18CFirstPersonCamera" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR18CFirstPersonCamera": /* 800AB668 000A85C8 38 00 00 00 */ li r0, 0 /* 800AB66C 000A85CC 90 03 00 04 */ stw r0, 4(r3) -/* 800AB670 000A85D0 4E 80 00 20 */ blr +/* 800AB670 000A85D0 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR10CExplosion" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR10CExplosion": /* 800AB674 000A85D4 38 00 00 00 */ li r0, 0 /* 800AB678 000A85D8 90 03 00 04 */ stw r0, 4(r3) -/* 800AB67C 000A85DC 4E 80 00 20 */ blr +/* 800AB67C 000A85DC 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR7CEntity" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR7CEntity": /* 800AB680 000A85E0 38 00 00 00 */ li r0, 0 /* 800AB684 000A85E4 90 03 00 04 */ stw r0, 4(r3) -/* 800AB688 000A85E8 4E 80 00 20 */ blr +/* 800AB688 000A85E8 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR17CEnergyProjectile" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR17CEnergyProjectile": /* 800AB68C 000A85EC 38 00 00 00 */ li r0, 0 /* 800AB690 000A85F0 90 03 00 04 */ stw r0, 4(r3) -/* 800AB694 000A85F4 4E 80 00 20 */ blr +/* 800AB694 000A85F4 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR16CDestroyableRock" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR16CDestroyableRock": /* 800AB698 000A85F8 38 00 00 00 */ li r0, 0 /* 800AB69C 000A85FC 90 03 00 04 */ stw r0, 4(r3) -/* 800AB6A0 000A8600 4E 80 00 20 */ blr +/* 800AB6A0 000A8600 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR15CCollisionActor" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR15CCollisionActor": /* 800AB6A4 000A8604 38 00 00 00 */ li r0, 0 /* 800AB6A8 000A8608 90 03 00 04 */ stw r0, 4(r3) -/* 800AB6AC 000A860C 4E 80 00 20 */ blr +/* 800AB6AC 000A860C 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR16CCinematicCamera" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR16CCinematicCamera": /* 800AB6B0 000A8610 38 00 00 00 */ li r0, 0 /* 800AB6B4 000A8614 90 03 00 04 */ stw r0, 4(r3) -/* 800AB6B8 000A8618 4E 80 00 20 */ blr +/* 800AB6B8 000A8618 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR5CBomb" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR5CBomb": /* 800AB6BC 000A861C 38 00 00 00 */ li r0, 0 /* 800AB6C0 000A8620 90 03 00 04 */ stw r0, 4(r3) -/* 800AB6C4 000A8624 4E 80 00 20 */ blr +/* 800AB6C4 000A8624 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR11CBallCamera" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR11CBallCamera": /* 800AB6C8 000A8628 38 00 00 00 */ li r0, 0 /* 800AB6CC 000A862C 90 03 00 04 */ stw r0, 4(r3) -/* 800AB6D0 000A8630 4E 80 00 20 */ blr +/* 800AB6D0 000A8630 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR6CActor" "Visit__32TCastToPtr<18CScriptAiJumpPoint>FR6CActor": /* 800AB6D4 000A8634 38 00 00 00 */ li r0, 0 /* 800AB6D8 000A8638 90 03 00 04 */ stw r0, 4(r3) -/* 800AB6DC 000A863C 4E 80 00 20 */ blr +/* 800AB6DC 000A863C 4E 80 00 20 */ blr .global "__ct__32TCastToPtr<18CScriptAiJumpPoint>FP7CEntity" "__ct__32TCastToPtr<18CScriptAiJumpPoint>FP7CEntity": @@ -15065,14 +15065,14 @@ lbl_800AB420: /* 800AB724 000A8684 81 83 00 00 */ lwz r12, 0(r3) /* 800AB728 000A8688 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800AB72C 000A868C 7D 89 03 A6 */ mtctr r12 -/* 800AB730 000A8690 4E 80 04 21 */ bctrl +/* 800AB730 000A8690 4E 80 04 21 */ bctrl lbl_800AB734: /* 800AB734 000A8694 80 01 00 14 */ lwz r0, 0x14(r1) /* 800AB738 000A8698 7F E3 FB 78 */ mr r3, r31 /* 800AB73C 000A869C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800AB740 000A86A0 7C 08 03 A6 */ mtlr r0 /* 800AB744 000A86A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800AB748 000A86A8 4E 80 00 20 */ blr +/* 800AB748 000A86A8 4E 80 00 20 */ blr .global "__ct__32TCastToPtr<18CScriptAiJumpPoint>FR7CEntity" "__ct__32TCastToPtr<18CScriptAiJumpPoint>FR7CEntity": @@ -15094,354 +15094,354 @@ lbl_800AB734: /* 800AB788 000A86E8 81 83 00 00 */ lwz r12, 0(r3) /* 800AB78C 000A86EC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800AB790 000A86F0 7D 89 03 A6 */ mtctr r12 -/* 800AB794 000A86F4 4E 80 04 21 */ bctrl +/* 800AB794 000A86F4 4E 80 04 21 */ bctrl /* 800AB798 000A86F8 80 01 00 14 */ lwz r0, 0x14(r1) /* 800AB79C 000A86FC 7F E3 FB 78 */ mr r3, r31 /* 800AB7A0 000A8700 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800AB7A4 000A8704 7C 08 03 A6 */ mtlr r0 /* 800AB7A8 000A8708 38 21 00 10 */ addi r1, r1, 0x10 -/* 800AB7AC 000A870C 4E 80 00 20 */ blr +/* 800AB7AC 000A870C 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR7CWeapon" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR7CWeapon": /* 800AB7B0 000A8710 38 00 00 00 */ li r0, 0 /* 800AB7B4 000A8714 90 03 00 04 */ stw r0, 4(r3) -/* 800AB7B8 000A8718 4E 80 00 20 */ blr +/* 800AB7B8 000A8718 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR17CWallCrawlerSwarm" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR17CWallCrawlerSwarm": /* 800AB7BC 000A871C 38 00 00 00 */ li r0, 0 /* 800AB7C0 000A8720 90 03 00 04 */ stw r0, 4(r3) -/* 800AB7C4 000A8724 4E 80 00 20 */ blr +/* 800AB7C4 000A8724 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR20CScriptSpindleCamera" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR20CScriptSpindleCamera": /* 800AB7C8 000A8728 38 00 00 00 */ li r0, 0 /* 800AB7CC 000A872C 90 03 00 04 */ stw r0, 4(r3) -/* 800AB7D0 000A8730 4E 80 00 20 */ blr +/* 800AB7D0 000A8730 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR15CSnakeWeedSwarm" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR15CSnakeWeedSwarm": /* 800AB7D4 000A8734 38 00 00 00 */ li r0, 0 /* 800AB7D8 000A8738 90 03 00 04 */ stw r0, 4(r3) -/* 800AB7DC 000A873C 4E 80 00 20 */ blr +/* 800AB7DC 000A873C 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR15CScriptWaypoint" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR15CScriptWaypoint": /* 800AB7E0 000A8740 38 00 00 00 */ li r0, 0 /* 800AB7E4 000A8744 90 03 00 04 */ stw r0, 4(r3) -/* 800AB7E8 000A8748 4E 80 00 20 */ blr +/* 800AB7E8 000A8748 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR12CScriptWater" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR12CScriptWater": /* 800AB7EC 000A874C 38 00 00 00 */ li r0, 0 /* 800AB7F0 000A8750 90 03 00 04 */ stw r0, 4(r3) -/* 800AB7F4 000A8754 4E 80 00 20 */ blr +/* 800AB7F4 000A8754 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR17CScriptVisorFlare" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR17CScriptVisorFlare": /* 800AB7F8 000A8758 38 00 00 00 */ li r0, 0 /* 800AB7FC 000A875C 90 03 00 04 */ stw r0, 4(r3) -/* 800AB800 000A8760 4E 80 00 20 */ blr +/* 800AB800 000A8760 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR14CScriptTrigger" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR14CScriptTrigger": /* 800AB804 000A8764 38 00 00 00 */ li r0, 0 /* 800AB808 000A8768 90 03 00 04 */ stw r0, 4(r3) -/* 800AB80C 000A876C 4E 80 00 20 */ blr +/* 800AB80C 000A876C 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR12CScriptTimer" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR12CScriptTimer": /* 800AB810 000A8770 38 00 00 00 */ li r0, 0 /* 800AB814 000A8774 90 03 00 04 */ stw r0, 4(r3) -/* 800AB818 000A8778 4E 80 00 20 */ blr +/* 800AB818 000A8778 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR10CTeamAiMgr" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR10CTeamAiMgr": /* 800AB81C 000A877C 38 00 00 00 */ li r0, 0 /* 800AB820 000A8780 90 03 00 04 */ stw r0, 4(r3) -/* 800AB824 000A8784 4E 80 00 20 */ blr +/* 800AB824 000A8784 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR21CScriptTargetingPoint" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR21CScriptTargetingPoint": /* 800AB828 000A8788 38 00 00 00 */ li r0, 0 /* 800AB82C 000A878C 90 03 00 04 */ stw r0, 4(r3) -/* 800AB830 000A8790 4E 80 00 20 */ blr +/* 800AB830 000A8790 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR25CScriptSpiderBallWaypoint" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR25CScriptSpiderBallWaypoint": /* 800AB834 000A8794 38 00 00 00 */ li r0, 0 /* 800AB838 000A8798 90 03 00 04 */ stw r0, 4(r3) -/* 800AB83C 000A879C 4E 80 00 20 */ blr +/* 800AB83C 000A879C 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR34CScriptSpiderBallAttractionSurface" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR34CScriptSpiderBallAttractionSurface": /* 800AB840 000A87A0 38 00 00 00 */ li r0, 0 /* 800AB844 000A87A4 90 03 00 04 */ stw r0, 4(r3) -/* 800AB848 000A87A8 4E 80 00 20 */ blr +/* 800AB848 000A87A8 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR22CScriptSpecialFunction" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR22CScriptSpecialFunction": /* 800AB84C 000A87AC 38 00 00 00 */ li r0, 0 /* 800AB850 000A87B0 90 03 00 04 */ stw r0, 4(r3) -/* 800AB854 000A87B4 4E 80 00 20 */ blr +/* 800AB854 000A87B4 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR17CScriptSpawnPoint" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR17CScriptSpawnPoint": /* 800AB858 000A87B8 38 00 00 00 */ li r0, 0 /* 800AB85C 000A87BC 90 03 00 04 */ stw r0, 4(r3) -/* 800AB860 000A87C0 4E 80 00 20 */ blr +/* 800AB860 000A87C0 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR12CScriptSound" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR12CScriptSound": /* 800AB864 000A87C4 38 00 00 00 */ li r0, 0 /* 800AB868 000A87C8 90 03 00 04 */ stw r0, 4(r3) -/* 800AB86C 000A87CC 4E 80 00 20 */ blr +/* 800AB86C 000A87CC 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR20CScriptRoomAcoustics" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR20CScriptRoomAcoustics": /* 800AB870 000A87D0 38 00 00 00 */ li r0, 0 /* 800AB874 000A87D4 90 03 00 04 */ stw r0, 4(r3) -/* 800AB878 000A87D8 4E 80 00 20 */ blr +/* 800AB878 000A87D8 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR22CScriptPointOfinterest" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR22CScriptPointOfinterest": /* 800AB87C 000A87DC 38 00 00 00 */ li r0, 0 /* 800AB880 000A87E0 90 03 00 04 */ stw r0, 4(r3) -/* 800AB884 000A87E4 4E 80 00 20 */ blr +/* 800AB884 000A87E4 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR17CScriptPlayerHint" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR17CScriptPlayerHint": /* 800AB888 000A87E8 38 00 00 00 */ li r0, 0 /* 800AB88C 000A87EC 90 03 00 04 */ stw r0, 4(r3) -/* 800AB890 000A87F0 4E 80 00 20 */ blr +/* 800AB890 000A87F0 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR15CScriptPlatform" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR15CScriptPlatform": /* 800AB894 000A87F4 38 00 00 00 */ li r0, 0 /* 800AB898 000A87F8 90 03 00 04 */ stw r0, 4(r3) -/* 800AB89C 000A87FC 4E 80 00 20 */ blr +/* 800AB89C 000A87FC 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR13CScriptPickup" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR13CScriptPickup": /* 800AB8A0 000A8800 38 00 00 00 */ li r0, 0 /* 800AB8A4 000A8804 90 03 00 04 */ stw r0, 4(r3) -/* 800AB8A8 000A8808 4E 80 00 20 */ blr +/* 800AB8A8 000A8808 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR15CScriptMazeNode" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR15CScriptMazeNode": /* 800AB8AC 000A880C 38 00 00 00 */ li r0, 0 /* 800AB8B0 000A8810 90 03 00 04 */ stw r0, 4(r3) -/* 800AB8B4 000A8814 4E 80 00 20 */ blr +/* 800AB8B4 000A8814 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR16CScriptGunTurret" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR16CScriptGunTurret": /* 800AB8B8 000A8818 38 00 00 00 */ li r0, 0 /* 800AB8BC 000A881C 90 03 00 04 */ stw r0, 4(r3) -/* 800AB8C0 000A8820 4E 80 00 20 */ blr +/* 800AB8C0 000A8820 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR19CScriptGrapplePoint" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR19CScriptGrapplePoint": /* 800AB8C4 000A8824 38 00 00 00 */ li r0, 0 /* 800AB8C8 000A8828 90 03 00 04 */ stw r0, 4(r3) -/* 800AB8CC 000A882C 4E 80 00 20 */ blr +/* 800AB8CC 000A882C 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR13CScriptEffect" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR13CScriptEffect": /* 800AB8D0 000A8830 38 00 00 00 */ li r0, 0 /* 800AB8D4 000A8834 90 03 00 04 */ stw r0, 4(r3) -/* 800AB8D8 000A8838 4E 80 00 20 */ blr +/* 800AB8D8 000A8838 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR11CScriptDoor" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR11CScriptDoor": /* 800AB8DC 000A883C 38 00 00 00 */ li r0, 0 /* 800AB8E0 000A8840 90 03 00 04 */ stw r0, 4(r3) -/* 800AB8E4 000A8844 4E 80 00 20 */ blr +/* 800AB8E4 000A8844 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR11CScriptDock" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR11CScriptDock": /* 800AB8E8 000A8848 38 00 00 00 */ li r0, 0 /* 800AB8EC 000A884C 90 03 00 04 */ stw r0, 4(r3) -/* 800AB8F0 000A8850 4E 80 00 20 */ blr +/* 800AB8F0 000A8850 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR18CScriptDistanceFog" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR18CScriptDistanceFog": /* 800AB8F4 000A8854 38 00 00 00 */ li r0, 0 /* 800AB8F8 000A8858 90 03 00 04 */ stw r0, 4(r3) -/* 800AB8FC 000A885C 4E 80 00 20 */ blr +/* 800AB8FC 000A885C 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR26CScriptDebugCameraWaypoint" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR26CScriptDebugCameraWaypoint": /* 800AB900 000A8860 38 00 00 00 */ li r0, 0 /* 800AB904 000A8864 90 03 00 04 */ stw r0, 4(r3) -/* 800AB908 000A8868 4E 80 00 20 */ blr +/* 800AB908 000A8868 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR17CScriptCoverPoint" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR17CScriptCoverPoint": /* 800AB90C 000A886C 38 00 00 00 */ li r0, 0 /* 800AB910 000A8870 90 03 00 04 */ stw r0, 4(r3) -/* 800AB914 000A8874 4E 80 00 20 */ blr +/* 800AB914 000A8874 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR21CScriptCameraWaypoint" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR21CScriptCameraWaypoint": /* 800AB918 000A8878 38 00 00 00 */ li r0, 0 /* 800AB91C 000A887C 90 03 00 04 */ stw r0, 4(r3) -/* 800AB920 000A8880 4E 80 00 20 */ blr +/* 800AB920 000A8880 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR24CScriptCameraPitchVolume" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR24CScriptCameraPitchVolume": /* 800AB924 000A8884 38 00 00 00 */ li r0, 0 /* 800AB928 000A8888 90 03 00 04 */ stw r0, 4(r3) -/* 800AB92C 000A888C 4E 80 00 20 */ blr +/* 800AB92C 000A888C 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR17CScriptCameraHint" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR17CScriptCameraHint": /* 800AB930 000A8890 38 00 00 00 */ li r0, 0 /* 800AB934 000A8894 90 03 00 04 */ stw r0, 4(r3) -/* 800AB938 000A8898 4E 80 00 20 */ blr +/* 800AB938 000A8898 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR18CScriptAiJumpPoint" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR18CScriptAiJumpPoint": /* 800AB93C 000A889C 38 00 00 00 */ li r0, 0 /* 800AB940 000A88A0 90 03 00 04 */ stw r0, 4(r3) -/* 800AB944 000A88A4 4E 80 00 20 */ blr +/* 800AB944 000A88A4 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR20CScriptActorKeyframe" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR20CScriptActorKeyframe": /* 800AB948 000A88A8 90 83 00 04 */ stw r4, 4(r3) -/* 800AB94C 000A88AC 4E 80 00 20 */ blr +/* 800AB94C 000A88AC 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR12CScriptActor" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR12CScriptActor": /* 800AB950 000A88B0 38 00 00 00 */ li r0, 0 /* 800AB954 000A88B4 90 03 00 04 */ stw r0, 4(r3) -/* 800AB958 000A88B8 4E 80 00 20 */ blr +/* 800AB958 000A88B8 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR9CRepulsor" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR9CRepulsor": /* 800AB95C 000A88BC 38 00 00 00 */ li r0, 0 /* 800AB960 000A88C0 90 03 00 04 */ stw r0, 4(r3) -/* 800AB964 000A88C4 4E 80 00 20 */ blr +/* 800AB964 000A88C4 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR7CPlayer" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR7CPlayer": /* 800AB968 000A88C8 38 00 00 00 */ li r0, 0 /* 800AB96C 000A88CC 90 03 00 04 */ stw r0, 4(r3) -/* 800AB970 000A88D0 4E 80 00 20 */ blr +/* 800AB970 000A88D0 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR13CPhysicsActor" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR13CPhysicsActor": /* 800AB974 000A88D4 38 00 00 00 */ li r0, 0 /* 800AB978 000A88D8 90 03 00 04 */ stw r0, 4(r3) -/* 800AB97C 000A88DC 4E 80 00 20 */ blr +/* 800AB97C 000A88DC 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR3CAi" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR3CAi": /* 800AB980 000A88E0 38 00 00 00 */ li r0, 0 /* 800AB984 000A88E4 90 03 00 04 */ stw r0, 4(r3) -/* 800AB988 000A88E8 4E 80 00 20 */ blr +/* 800AB988 000A88E8 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR11CPathCamera" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR11CPathCamera": /* 800AB98C 000A88EC 38 00 00 00 */ li r0, 0 /* 800AB990 000A88F0 90 03 00 04 */ stw r0, 4(r3) -/* 800AB994 000A88F4 4E 80 00 20 */ blr +/* 800AB994 000A88F4 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR18CMetroidPrimeRelay" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR18CMetroidPrimeRelay": /* 800AB998 000A88F8 38 00 00 00 */ li r0, 0 /* 800AB99C 000A88FC 90 03 00 04 */ stw r0, 4(r3) -/* 800AB9A0 000A8900 4E 80 00 20 */ blr +/* 800AB9A0 000A8900 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR19CHUDBillboardEffect" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR19CHUDBillboardEffect": /* 800AB9A4 000A8904 38 00 00 00 */ li r0, 0 /* 800AB9A8 000A8908 90 03 00 04 */ stw r0, 4(r3) -/* 800AB9AC 000A890C 4E 80 00 20 */ blr +/* 800AB9AC 000A890C 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR15CGameProjectile" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR15CGameProjectile": /* 800AB9B0 000A8910 38 00 00 00 */ li r0, 0 /* 800AB9B4 000A8914 90 03 00 04 */ stw r0, 4(r3) -/* 800AB9B8 000A8918 4E 80 00 20 */ blr +/* 800AB9B8 000A8918 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR10CGameLight" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR10CGameLight": /* 800AB9BC 000A891C 38 00 00 00 */ li r0, 0 /* 800AB9C0 000A8920 90 03 00 04 */ stw r0, 4(r3) -/* 800AB9C4 000A8924 4E 80 00 20 */ blr +/* 800AB9C4 000A8924 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR11CGameCamera" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR11CGameCamera": /* 800AB9C8 000A8928 38 00 00 00 */ li r0, 0 /* 800AB9CC 000A892C 90 03 00 04 */ stw r0, 4(r3) -/* 800AB9D0 000A8930 4E 80 00 20 */ blr +/* 800AB9D0 000A8930 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR10CFishCloud" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR10CFishCloud": /* 800AB9D4 000A8934 38 00 00 00 */ li r0, 0 /* 800AB9D8 000A8938 90 03 00 04 */ stw r0, 4(r3) -/* 800AB9DC 000A893C 4E 80 00 20 */ blr +/* 800AB9DC 000A893C 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR18CFirstPersonCamera" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR18CFirstPersonCamera": /* 800AB9E0 000A8940 38 00 00 00 */ li r0, 0 /* 800AB9E4 000A8944 90 03 00 04 */ stw r0, 4(r3) -/* 800AB9E8 000A8948 4E 80 00 20 */ blr +/* 800AB9E8 000A8948 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR10CExplosion" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR10CExplosion": /* 800AB9EC 000A894C 38 00 00 00 */ li r0, 0 /* 800AB9F0 000A8950 90 03 00 04 */ stw r0, 4(r3) -/* 800AB9F4 000A8954 4E 80 00 20 */ blr +/* 800AB9F4 000A8954 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR7CEntity" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR7CEntity": /* 800AB9F8 000A8958 38 00 00 00 */ li r0, 0 /* 800AB9FC 000A895C 90 03 00 04 */ stw r0, 4(r3) -/* 800ABA00 000A8960 4E 80 00 20 */ blr +/* 800ABA00 000A8960 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR17CEnergyProjectile" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR17CEnergyProjectile": /* 800ABA04 000A8964 38 00 00 00 */ li r0, 0 /* 800ABA08 000A8968 90 03 00 04 */ stw r0, 4(r3) -/* 800ABA0C 000A896C 4E 80 00 20 */ blr +/* 800ABA0C 000A896C 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR16CDestroyableRock" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR16CDestroyableRock": /* 800ABA10 000A8970 38 00 00 00 */ li r0, 0 /* 800ABA14 000A8974 90 03 00 04 */ stw r0, 4(r3) -/* 800ABA18 000A8978 4E 80 00 20 */ blr +/* 800ABA18 000A8978 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR15CCollisionActor" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR15CCollisionActor": /* 800ABA1C 000A897C 38 00 00 00 */ li r0, 0 /* 800ABA20 000A8980 90 03 00 04 */ stw r0, 4(r3) -/* 800ABA24 000A8984 4E 80 00 20 */ blr +/* 800ABA24 000A8984 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR16CCinematicCamera" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR16CCinematicCamera": /* 800ABA28 000A8988 38 00 00 00 */ li r0, 0 /* 800ABA2C 000A898C 90 03 00 04 */ stw r0, 4(r3) -/* 800ABA30 000A8990 4E 80 00 20 */ blr +/* 800ABA30 000A8990 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR5CBomb" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR5CBomb": /* 800ABA34 000A8994 38 00 00 00 */ li r0, 0 /* 800ABA38 000A8998 90 03 00 04 */ stw r0, 4(r3) -/* 800ABA3C 000A899C 4E 80 00 20 */ blr +/* 800ABA3C 000A899C 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR11CBallCamera" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR11CBallCamera": /* 800ABA40 000A89A0 38 00 00 00 */ li r0, 0 /* 800ABA44 000A89A4 90 03 00 04 */ stw r0, 4(r3) -/* 800ABA48 000A89A8 4E 80 00 20 */ blr +/* 800ABA48 000A89A8 4E 80 00 20 */ blr .global "Visit__34TCastToPtr<20CScriptActorKeyframe>FR6CActor" "Visit__34TCastToPtr<20CScriptActorKeyframe>FR6CActor": /* 800ABA4C 000A89AC 38 00 00 00 */ li r0, 0 /* 800ABA50 000A89B0 90 03 00 04 */ stw r0, 4(r3) -/* 800ABA54 000A89B4 4E 80 00 20 */ blr +/* 800ABA54 000A89B4 4E 80 00 20 */ blr .global "__ct__34TCastToPtr<20CScriptActorKeyframe>FP7CEntity" "__ct__34TCastToPtr<20CScriptActorKeyframe>FP7CEntity": @@ -15465,355 +15465,355 @@ lbl_800AB734: /* 800ABA9C 000A89FC 81 83 00 00 */ lwz r12, 0(r3) /* 800ABAA0 000A8A00 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800ABAA4 000A8A04 7D 89 03 A6 */ mtctr r12 -/* 800ABAA8 000A8A08 4E 80 04 21 */ bctrl +/* 800ABAA8 000A8A08 4E 80 04 21 */ bctrl lbl_800ABAAC: /* 800ABAAC 000A8A0C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800ABAB0 000A8A10 7F E3 FB 78 */ mr r3, r31 /* 800ABAB4 000A8A14 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800ABAB8 000A8A18 7C 08 03 A6 */ mtlr r0 /* 800ABABC 000A8A1C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800ABAC0 000A8A20 4E 80 00 20 */ blr +/* 800ABAC0 000A8A20 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR7CWeapon" "Visit__26TCastToPtr<12CScriptActor>FR7CWeapon": /* 800ABAC4 000A8A24 38 00 00 00 */ li r0, 0 /* 800ABAC8 000A8A28 90 03 00 04 */ stw r0, 4(r3) -/* 800ABACC 000A8A2C 4E 80 00 20 */ blr +/* 800ABACC 000A8A2C 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR17CWallCrawlerSwarm" "Visit__26TCastToPtr<12CScriptActor>FR17CWallCrawlerSwarm": /* 800ABAD0 000A8A30 38 00 00 00 */ li r0, 0 /* 800ABAD4 000A8A34 90 03 00 04 */ stw r0, 4(r3) -/* 800ABAD8 000A8A38 4E 80 00 20 */ blr +/* 800ABAD8 000A8A38 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR20CScriptSpindleCamera" "Visit__26TCastToPtr<12CScriptActor>FR20CScriptSpindleCamera": /* 800ABADC 000A8A3C 38 00 00 00 */ li r0, 0 /* 800ABAE0 000A8A40 90 03 00 04 */ stw r0, 4(r3) -/* 800ABAE4 000A8A44 4E 80 00 20 */ blr +/* 800ABAE4 000A8A44 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR15CSnakeWeedSwarm" "Visit__26TCastToPtr<12CScriptActor>FR15CSnakeWeedSwarm": /* 800ABAE8 000A8A48 38 00 00 00 */ li r0, 0 /* 800ABAEC 000A8A4C 90 03 00 04 */ stw r0, 4(r3) -/* 800ABAF0 000A8A50 4E 80 00 20 */ blr +/* 800ABAF0 000A8A50 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR15CScriptWaypoint" "Visit__26TCastToPtr<12CScriptActor>FR15CScriptWaypoint": /* 800ABAF4 000A8A54 38 00 00 00 */ li r0, 0 /* 800ABAF8 000A8A58 90 03 00 04 */ stw r0, 4(r3) -/* 800ABAFC 000A8A5C 4E 80 00 20 */ blr +/* 800ABAFC 000A8A5C 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR12CScriptWater" "Visit__26TCastToPtr<12CScriptActor>FR12CScriptWater": /* 800ABB00 000A8A60 38 00 00 00 */ li r0, 0 /* 800ABB04 000A8A64 90 03 00 04 */ stw r0, 4(r3) -/* 800ABB08 000A8A68 4E 80 00 20 */ blr +/* 800ABB08 000A8A68 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR17CScriptVisorFlare" "Visit__26TCastToPtr<12CScriptActor>FR17CScriptVisorFlare": /* 800ABB0C 000A8A6C 38 00 00 00 */ li r0, 0 /* 800ABB10 000A8A70 90 03 00 04 */ stw r0, 4(r3) -/* 800ABB14 000A8A74 4E 80 00 20 */ blr +/* 800ABB14 000A8A74 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR14CScriptTrigger" "Visit__26TCastToPtr<12CScriptActor>FR14CScriptTrigger": /* 800ABB18 000A8A78 38 00 00 00 */ li r0, 0 /* 800ABB1C 000A8A7C 90 03 00 04 */ stw r0, 4(r3) -/* 800ABB20 000A8A80 4E 80 00 20 */ blr +/* 800ABB20 000A8A80 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR12CScriptTimer" "Visit__26TCastToPtr<12CScriptActor>FR12CScriptTimer": /* 800ABB24 000A8A84 38 00 00 00 */ li r0, 0 /* 800ABB28 000A8A88 90 03 00 04 */ stw r0, 4(r3) -/* 800ABB2C 000A8A8C 4E 80 00 20 */ blr +/* 800ABB2C 000A8A8C 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR10CTeamAiMgr" "Visit__26TCastToPtr<12CScriptActor>FR10CTeamAiMgr": /* 800ABB30 000A8A90 38 00 00 00 */ li r0, 0 /* 800ABB34 000A8A94 90 03 00 04 */ stw r0, 4(r3) -/* 800ABB38 000A8A98 4E 80 00 20 */ blr +/* 800ABB38 000A8A98 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR21CScriptTargetingPoint" "Visit__26TCastToPtr<12CScriptActor>FR21CScriptTargetingPoint": /* 800ABB3C 000A8A9C 38 00 00 00 */ li r0, 0 /* 800ABB40 000A8AA0 90 03 00 04 */ stw r0, 4(r3) -/* 800ABB44 000A8AA4 4E 80 00 20 */ blr +/* 800ABB44 000A8AA4 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR25CScriptSpiderBallWaypoint" "Visit__26TCastToPtr<12CScriptActor>FR25CScriptSpiderBallWaypoint": /* 800ABB48 000A8AA8 38 00 00 00 */ li r0, 0 /* 800ABB4C 000A8AAC 90 03 00 04 */ stw r0, 4(r3) -/* 800ABB50 000A8AB0 4E 80 00 20 */ blr +/* 800ABB50 000A8AB0 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR34CScriptSpiderBallAttractionSurface" "Visit__26TCastToPtr<12CScriptActor>FR34CScriptSpiderBallAttractionSurface": /* 800ABB54 000A8AB4 38 00 00 00 */ li r0, 0 /* 800ABB58 000A8AB8 90 03 00 04 */ stw r0, 4(r3) -/* 800ABB5C 000A8ABC 4E 80 00 20 */ blr +/* 800ABB5C 000A8ABC 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR22CScriptSpecialFunction" "Visit__26TCastToPtr<12CScriptActor>FR22CScriptSpecialFunction": /* 800ABB60 000A8AC0 38 00 00 00 */ li r0, 0 /* 800ABB64 000A8AC4 90 03 00 04 */ stw r0, 4(r3) -/* 800ABB68 000A8AC8 4E 80 00 20 */ blr +/* 800ABB68 000A8AC8 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR17CScriptSpawnPoint" "Visit__26TCastToPtr<12CScriptActor>FR17CScriptSpawnPoint": /* 800ABB6C 000A8ACC 38 00 00 00 */ li r0, 0 /* 800ABB70 000A8AD0 90 03 00 04 */ stw r0, 4(r3) -/* 800ABB74 000A8AD4 4E 80 00 20 */ blr +/* 800ABB74 000A8AD4 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR12CScriptSound" "Visit__26TCastToPtr<12CScriptActor>FR12CScriptSound": /* 800ABB78 000A8AD8 38 00 00 00 */ li r0, 0 /* 800ABB7C 000A8ADC 90 03 00 04 */ stw r0, 4(r3) -/* 800ABB80 000A8AE0 4E 80 00 20 */ blr +/* 800ABB80 000A8AE0 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR20CScriptRoomAcoustics" "Visit__26TCastToPtr<12CScriptActor>FR20CScriptRoomAcoustics": /* 800ABB84 000A8AE4 38 00 00 00 */ li r0, 0 /* 800ABB88 000A8AE8 90 03 00 04 */ stw r0, 4(r3) -/* 800ABB8C 000A8AEC 4E 80 00 20 */ blr +/* 800ABB8C 000A8AEC 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR22CScriptPointOfinterest" "Visit__26TCastToPtr<12CScriptActor>FR22CScriptPointOfinterest": /* 800ABB90 000A8AF0 38 00 00 00 */ li r0, 0 /* 800ABB94 000A8AF4 90 03 00 04 */ stw r0, 4(r3) -/* 800ABB98 000A8AF8 4E 80 00 20 */ blr +/* 800ABB98 000A8AF8 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR17CScriptPlayerHint" "Visit__26TCastToPtr<12CScriptActor>FR17CScriptPlayerHint": /* 800ABB9C 000A8AFC 38 00 00 00 */ li r0, 0 /* 800ABBA0 000A8B00 90 03 00 04 */ stw r0, 4(r3) -/* 800ABBA4 000A8B04 4E 80 00 20 */ blr +/* 800ABBA4 000A8B04 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR15CScriptPlatform" "Visit__26TCastToPtr<12CScriptActor>FR15CScriptPlatform": /* 800ABBA8 000A8B08 38 00 00 00 */ li r0, 0 /* 800ABBAC 000A8B0C 90 03 00 04 */ stw r0, 4(r3) -/* 800ABBB0 000A8B10 4E 80 00 20 */ blr +/* 800ABBB0 000A8B10 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR13CScriptPickup" "Visit__26TCastToPtr<12CScriptActor>FR13CScriptPickup": /* 800ABBB4 000A8B14 38 00 00 00 */ li r0, 0 /* 800ABBB8 000A8B18 90 03 00 04 */ stw r0, 4(r3) -/* 800ABBBC 000A8B1C 4E 80 00 20 */ blr +/* 800ABBBC 000A8B1C 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR15CScriptMazeNode" "Visit__26TCastToPtr<12CScriptActor>FR15CScriptMazeNode": /* 800ABBC0 000A8B20 38 00 00 00 */ li r0, 0 /* 800ABBC4 000A8B24 90 03 00 04 */ stw r0, 4(r3) -/* 800ABBC8 000A8B28 4E 80 00 20 */ blr +/* 800ABBC8 000A8B28 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR16CScriptGunTurret" "Visit__26TCastToPtr<12CScriptActor>FR16CScriptGunTurret": /* 800ABBCC 000A8B2C 38 00 00 00 */ li r0, 0 /* 800ABBD0 000A8B30 90 03 00 04 */ stw r0, 4(r3) -/* 800ABBD4 000A8B34 4E 80 00 20 */ blr +/* 800ABBD4 000A8B34 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR19CScriptGrapplePoint" "Visit__26TCastToPtr<12CScriptActor>FR19CScriptGrapplePoint": /* 800ABBD8 000A8B38 38 00 00 00 */ li r0, 0 /* 800ABBDC 000A8B3C 90 03 00 04 */ stw r0, 4(r3) -/* 800ABBE0 000A8B40 4E 80 00 20 */ blr +/* 800ABBE0 000A8B40 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR13CScriptEffect" "Visit__26TCastToPtr<12CScriptActor>FR13CScriptEffect": /* 800ABBE4 000A8B44 38 00 00 00 */ li r0, 0 /* 800ABBE8 000A8B48 90 03 00 04 */ stw r0, 4(r3) -/* 800ABBEC 000A8B4C 4E 80 00 20 */ blr +/* 800ABBEC 000A8B4C 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR11CScriptDoor" "Visit__26TCastToPtr<12CScriptActor>FR11CScriptDoor": /* 800ABBF0 000A8B50 38 00 00 00 */ li r0, 0 /* 800ABBF4 000A8B54 90 03 00 04 */ stw r0, 4(r3) -/* 800ABBF8 000A8B58 4E 80 00 20 */ blr +/* 800ABBF8 000A8B58 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR11CScriptDock" "Visit__26TCastToPtr<12CScriptActor>FR11CScriptDock": /* 800ABBFC 000A8B5C 38 00 00 00 */ li r0, 0 /* 800ABC00 000A8B60 90 03 00 04 */ stw r0, 4(r3) -/* 800ABC04 000A8B64 4E 80 00 20 */ blr +/* 800ABC04 000A8B64 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR18CScriptDistanceFog" "Visit__26TCastToPtr<12CScriptActor>FR18CScriptDistanceFog": /* 800ABC08 000A8B68 38 00 00 00 */ li r0, 0 /* 800ABC0C 000A8B6C 90 03 00 04 */ stw r0, 4(r3) -/* 800ABC10 000A8B70 4E 80 00 20 */ blr +/* 800ABC10 000A8B70 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR26CScriptDebugCameraWaypoint" "Visit__26TCastToPtr<12CScriptActor>FR26CScriptDebugCameraWaypoint": /* 800ABC14 000A8B74 38 00 00 00 */ li r0, 0 /* 800ABC18 000A8B78 90 03 00 04 */ stw r0, 4(r3) -/* 800ABC1C 000A8B7C 4E 80 00 20 */ blr +/* 800ABC1C 000A8B7C 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR17CScriptCoverPoint" "Visit__26TCastToPtr<12CScriptActor>FR17CScriptCoverPoint": /* 800ABC20 000A8B80 38 00 00 00 */ li r0, 0 /* 800ABC24 000A8B84 90 03 00 04 */ stw r0, 4(r3) -/* 800ABC28 000A8B88 4E 80 00 20 */ blr +/* 800ABC28 000A8B88 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR21CScriptCameraWaypoint" "Visit__26TCastToPtr<12CScriptActor>FR21CScriptCameraWaypoint": /* 800ABC2C 000A8B8C 38 00 00 00 */ li r0, 0 /* 800ABC30 000A8B90 90 03 00 04 */ stw r0, 4(r3) -/* 800ABC34 000A8B94 4E 80 00 20 */ blr +/* 800ABC34 000A8B94 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR24CScriptCameraPitchVolume" "Visit__26TCastToPtr<12CScriptActor>FR24CScriptCameraPitchVolume": /* 800ABC38 000A8B98 38 00 00 00 */ li r0, 0 /* 800ABC3C 000A8B9C 90 03 00 04 */ stw r0, 4(r3) -/* 800ABC40 000A8BA0 4E 80 00 20 */ blr +/* 800ABC40 000A8BA0 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR17CScriptCameraHint" "Visit__26TCastToPtr<12CScriptActor>FR17CScriptCameraHint": /* 800ABC44 000A8BA4 38 00 00 00 */ li r0, 0 /* 800ABC48 000A8BA8 90 03 00 04 */ stw r0, 4(r3) -/* 800ABC4C 000A8BAC 4E 80 00 20 */ blr +/* 800ABC4C 000A8BAC 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR18CScriptAiJumpPoint" "Visit__26TCastToPtr<12CScriptActor>FR18CScriptAiJumpPoint": /* 800ABC50 000A8BB0 38 00 00 00 */ li r0, 0 /* 800ABC54 000A8BB4 90 03 00 04 */ stw r0, 4(r3) -/* 800ABC58 000A8BB8 4E 80 00 20 */ blr +/* 800ABC58 000A8BB8 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR20CScriptActorKeyframe" "Visit__26TCastToPtr<12CScriptActor>FR20CScriptActorKeyframe": /* 800ABC5C 000A8BBC 38 00 00 00 */ li r0, 0 /* 800ABC60 000A8BC0 90 03 00 04 */ stw r0, 4(r3) -/* 800ABC64 000A8BC4 4E 80 00 20 */ blr +/* 800ABC64 000A8BC4 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR12CScriptActor" "Visit__26TCastToPtr<12CScriptActor>FR12CScriptActor": /* 800ABC68 000A8BC8 90 83 00 04 */ stw r4, 4(r3) -/* 800ABC6C 000A8BCC 4E 80 00 20 */ blr +/* 800ABC6C 000A8BCC 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR9CRepulsor" "Visit__26TCastToPtr<12CScriptActor>FR9CRepulsor": /* 800ABC70 000A8BD0 38 00 00 00 */ li r0, 0 /* 800ABC74 000A8BD4 90 03 00 04 */ stw r0, 4(r3) -/* 800ABC78 000A8BD8 4E 80 00 20 */ blr +/* 800ABC78 000A8BD8 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR7CPlayer" "Visit__26TCastToPtr<12CScriptActor>FR7CPlayer": /* 800ABC7C 000A8BDC 38 00 00 00 */ li r0, 0 /* 800ABC80 000A8BE0 90 03 00 04 */ stw r0, 4(r3) -/* 800ABC84 000A8BE4 4E 80 00 20 */ blr +/* 800ABC84 000A8BE4 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR13CPhysicsActor" "Visit__26TCastToPtr<12CScriptActor>FR13CPhysicsActor": /* 800ABC88 000A8BE8 38 00 00 00 */ li r0, 0 /* 800ABC8C 000A8BEC 90 03 00 04 */ stw r0, 4(r3) -/* 800ABC90 000A8BF0 4E 80 00 20 */ blr +/* 800ABC90 000A8BF0 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR3CAi" "Visit__26TCastToPtr<12CScriptActor>FR3CAi": /* 800ABC94 000A8BF4 38 00 00 00 */ li r0, 0 /* 800ABC98 000A8BF8 90 03 00 04 */ stw r0, 4(r3) -/* 800ABC9C 000A8BFC 4E 80 00 20 */ blr +/* 800ABC9C 000A8BFC 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR11CPathCamera" "Visit__26TCastToPtr<12CScriptActor>FR11CPathCamera": /* 800ABCA0 000A8C00 38 00 00 00 */ li r0, 0 /* 800ABCA4 000A8C04 90 03 00 04 */ stw r0, 4(r3) -/* 800ABCA8 000A8C08 4E 80 00 20 */ blr +/* 800ABCA8 000A8C08 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR18CMetroidPrimeRelay" "Visit__26TCastToPtr<12CScriptActor>FR18CMetroidPrimeRelay": /* 800ABCAC 000A8C0C 38 00 00 00 */ li r0, 0 /* 800ABCB0 000A8C10 90 03 00 04 */ stw r0, 4(r3) -/* 800ABCB4 000A8C14 4E 80 00 20 */ blr +/* 800ABCB4 000A8C14 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR19CHUDBillboardEffect" "Visit__26TCastToPtr<12CScriptActor>FR19CHUDBillboardEffect": /* 800ABCB8 000A8C18 38 00 00 00 */ li r0, 0 /* 800ABCBC 000A8C1C 90 03 00 04 */ stw r0, 4(r3) -/* 800ABCC0 000A8C20 4E 80 00 20 */ blr +/* 800ABCC0 000A8C20 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR15CGameProjectile" "Visit__26TCastToPtr<12CScriptActor>FR15CGameProjectile": /* 800ABCC4 000A8C24 38 00 00 00 */ li r0, 0 /* 800ABCC8 000A8C28 90 03 00 04 */ stw r0, 4(r3) -/* 800ABCCC 000A8C2C 4E 80 00 20 */ blr +/* 800ABCCC 000A8C2C 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR10CGameLight" "Visit__26TCastToPtr<12CScriptActor>FR10CGameLight": /* 800ABCD0 000A8C30 38 00 00 00 */ li r0, 0 /* 800ABCD4 000A8C34 90 03 00 04 */ stw r0, 4(r3) -/* 800ABCD8 000A8C38 4E 80 00 20 */ blr +/* 800ABCD8 000A8C38 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR11CGameCamera" "Visit__26TCastToPtr<12CScriptActor>FR11CGameCamera": /* 800ABCDC 000A8C3C 38 00 00 00 */ li r0, 0 /* 800ABCE0 000A8C40 90 03 00 04 */ stw r0, 4(r3) -/* 800ABCE4 000A8C44 4E 80 00 20 */ blr +/* 800ABCE4 000A8C44 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR10CFishCloud" "Visit__26TCastToPtr<12CScriptActor>FR10CFishCloud": /* 800ABCE8 000A8C48 38 00 00 00 */ li r0, 0 /* 800ABCEC 000A8C4C 90 03 00 04 */ stw r0, 4(r3) -/* 800ABCF0 000A8C50 4E 80 00 20 */ blr +/* 800ABCF0 000A8C50 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR18CFirstPersonCamera" "Visit__26TCastToPtr<12CScriptActor>FR18CFirstPersonCamera": /* 800ABCF4 000A8C54 38 00 00 00 */ li r0, 0 /* 800ABCF8 000A8C58 90 03 00 04 */ stw r0, 4(r3) -/* 800ABCFC 000A8C5C 4E 80 00 20 */ blr +/* 800ABCFC 000A8C5C 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR10CExplosion" "Visit__26TCastToPtr<12CScriptActor>FR10CExplosion": /* 800ABD00 000A8C60 38 00 00 00 */ li r0, 0 /* 800ABD04 000A8C64 90 03 00 04 */ stw r0, 4(r3) -/* 800ABD08 000A8C68 4E 80 00 20 */ blr +/* 800ABD08 000A8C68 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR7CEntity" "Visit__26TCastToPtr<12CScriptActor>FR7CEntity": /* 800ABD0C 000A8C6C 38 00 00 00 */ li r0, 0 /* 800ABD10 000A8C70 90 03 00 04 */ stw r0, 4(r3) -/* 800ABD14 000A8C74 4E 80 00 20 */ blr +/* 800ABD14 000A8C74 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR17CEnergyProjectile" "Visit__26TCastToPtr<12CScriptActor>FR17CEnergyProjectile": /* 800ABD18 000A8C78 38 00 00 00 */ li r0, 0 /* 800ABD1C 000A8C7C 90 03 00 04 */ stw r0, 4(r3) -/* 800ABD20 000A8C80 4E 80 00 20 */ blr +/* 800ABD20 000A8C80 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR16CDestroyableRock" "Visit__26TCastToPtr<12CScriptActor>FR16CDestroyableRock": /* 800ABD24 000A8C84 38 00 00 00 */ li r0, 0 /* 800ABD28 000A8C88 90 03 00 04 */ stw r0, 4(r3) -/* 800ABD2C 000A8C8C 4E 80 00 20 */ blr +/* 800ABD2C 000A8C8C 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR15CCollisionActor" "Visit__26TCastToPtr<12CScriptActor>FR15CCollisionActor": /* 800ABD30 000A8C90 38 00 00 00 */ li r0, 0 /* 800ABD34 000A8C94 90 03 00 04 */ stw r0, 4(r3) -/* 800ABD38 000A8C98 4E 80 00 20 */ blr +/* 800ABD38 000A8C98 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR16CCinematicCamera" "Visit__26TCastToPtr<12CScriptActor>FR16CCinematicCamera": /* 800ABD3C 000A8C9C 38 00 00 00 */ li r0, 0 /* 800ABD40 000A8CA0 90 03 00 04 */ stw r0, 4(r3) -/* 800ABD44 000A8CA4 4E 80 00 20 */ blr +/* 800ABD44 000A8CA4 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR5CBomb" "Visit__26TCastToPtr<12CScriptActor>FR5CBomb": /* 800ABD48 000A8CA8 38 00 00 00 */ li r0, 0 /* 800ABD4C 000A8CAC 90 03 00 04 */ stw r0, 4(r3) -/* 800ABD50 000A8CB0 4E 80 00 20 */ blr +/* 800ABD50 000A8CB0 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR11CBallCamera" "Visit__26TCastToPtr<12CScriptActor>FR11CBallCamera": /* 800ABD54 000A8CB4 38 00 00 00 */ li r0, 0 /* 800ABD58 000A8CB8 90 03 00 04 */ stw r0, 4(r3) -/* 800ABD5C 000A8CBC 4E 80 00 20 */ blr +/* 800ABD5C 000A8CBC 4E 80 00 20 */ blr .global "Visit__26TCastToPtr<12CScriptActor>FR6CActor" "Visit__26TCastToPtr<12CScriptActor>FR6CActor": /* 800ABD60 000A8CC0 38 00 00 00 */ li r0, 0 /* 800ABD64 000A8CC4 90 03 00 04 */ stw r0, 4(r3) -/* 800ABD68 000A8CC8 4E 80 00 20 */ blr +/* 800ABD68 000A8CC8 4E 80 00 20 */ blr .global "__ct__26TCastToPtr<12CScriptActor>FP7CEntity" "__ct__26TCastToPtr<12CScriptActor>FP7CEntity": @@ -15837,355 +15837,355 @@ lbl_800ABAAC: /* 800ABDB0 000A8D10 81 83 00 00 */ lwz r12, 0(r3) /* 800ABDB4 000A8D14 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800ABDB8 000A8D18 7D 89 03 A6 */ mtctr r12 -/* 800ABDBC 000A8D1C 4E 80 04 21 */ bctrl +/* 800ABDBC 000A8D1C 4E 80 04 21 */ bctrl lbl_800ABDC0: /* 800ABDC0 000A8D20 80 01 00 14 */ lwz r0, 0x14(r1) /* 800ABDC4 000A8D24 7F E3 FB 78 */ mr r3, r31 /* 800ABDC8 000A8D28 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800ABDCC 000A8D2C 7C 08 03 A6 */ mtlr r0 /* 800ABDD0 000A8D30 38 21 00 10 */ addi r1, r1, 0x10 -/* 800ABDD4 000A8D34 4E 80 00 20 */ blr +/* 800ABDD4 000A8D34 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR7CWeapon" "Visit__22TCastToPtr<9CRepulsor>FR7CWeapon": /* 800ABDD8 000A8D38 38 00 00 00 */ li r0, 0 /* 800ABDDC 000A8D3C 90 03 00 04 */ stw r0, 4(r3) -/* 800ABDE0 000A8D40 4E 80 00 20 */ blr +/* 800ABDE0 000A8D40 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR17CWallCrawlerSwarm" "Visit__22TCastToPtr<9CRepulsor>FR17CWallCrawlerSwarm": /* 800ABDE4 000A8D44 38 00 00 00 */ li r0, 0 /* 800ABDE8 000A8D48 90 03 00 04 */ stw r0, 4(r3) -/* 800ABDEC 000A8D4C 4E 80 00 20 */ blr +/* 800ABDEC 000A8D4C 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR20CScriptSpindleCamera" "Visit__22TCastToPtr<9CRepulsor>FR20CScriptSpindleCamera": /* 800ABDF0 000A8D50 38 00 00 00 */ li r0, 0 /* 800ABDF4 000A8D54 90 03 00 04 */ stw r0, 4(r3) -/* 800ABDF8 000A8D58 4E 80 00 20 */ blr +/* 800ABDF8 000A8D58 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR15CSnakeWeedSwarm" "Visit__22TCastToPtr<9CRepulsor>FR15CSnakeWeedSwarm": /* 800ABDFC 000A8D5C 38 00 00 00 */ li r0, 0 /* 800ABE00 000A8D60 90 03 00 04 */ stw r0, 4(r3) -/* 800ABE04 000A8D64 4E 80 00 20 */ blr +/* 800ABE04 000A8D64 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR15CScriptWaypoint" "Visit__22TCastToPtr<9CRepulsor>FR15CScriptWaypoint": /* 800ABE08 000A8D68 38 00 00 00 */ li r0, 0 /* 800ABE0C 000A8D6C 90 03 00 04 */ stw r0, 4(r3) -/* 800ABE10 000A8D70 4E 80 00 20 */ blr +/* 800ABE10 000A8D70 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR12CScriptWater" "Visit__22TCastToPtr<9CRepulsor>FR12CScriptWater": /* 800ABE14 000A8D74 38 00 00 00 */ li r0, 0 /* 800ABE18 000A8D78 90 03 00 04 */ stw r0, 4(r3) -/* 800ABE1C 000A8D7C 4E 80 00 20 */ blr +/* 800ABE1C 000A8D7C 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR17CScriptVisorFlare" "Visit__22TCastToPtr<9CRepulsor>FR17CScriptVisorFlare": /* 800ABE20 000A8D80 38 00 00 00 */ li r0, 0 /* 800ABE24 000A8D84 90 03 00 04 */ stw r0, 4(r3) -/* 800ABE28 000A8D88 4E 80 00 20 */ blr +/* 800ABE28 000A8D88 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR14CScriptTrigger" "Visit__22TCastToPtr<9CRepulsor>FR14CScriptTrigger": /* 800ABE2C 000A8D8C 38 00 00 00 */ li r0, 0 /* 800ABE30 000A8D90 90 03 00 04 */ stw r0, 4(r3) -/* 800ABE34 000A8D94 4E 80 00 20 */ blr +/* 800ABE34 000A8D94 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR12CScriptTimer" "Visit__22TCastToPtr<9CRepulsor>FR12CScriptTimer": /* 800ABE38 000A8D98 38 00 00 00 */ li r0, 0 /* 800ABE3C 000A8D9C 90 03 00 04 */ stw r0, 4(r3) -/* 800ABE40 000A8DA0 4E 80 00 20 */ blr +/* 800ABE40 000A8DA0 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR10CTeamAiMgr" "Visit__22TCastToPtr<9CRepulsor>FR10CTeamAiMgr": /* 800ABE44 000A8DA4 38 00 00 00 */ li r0, 0 /* 800ABE48 000A8DA8 90 03 00 04 */ stw r0, 4(r3) -/* 800ABE4C 000A8DAC 4E 80 00 20 */ blr +/* 800ABE4C 000A8DAC 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR21CScriptTargetingPoint" "Visit__22TCastToPtr<9CRepulsor>FR21CScriptTargetingPoint": /* 800ABE50 000A8DB0 38 00 00 00 */ li r0, 0 /* 800ABE54 000A8DB4 90 03 00 04 */ stw r0, 4(r3) -/* 800ABE58 000A8DB8 4E 80 00 20 */ blr +/* 800ABE58 000A8DB8 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR25CScriptSpiderBallWaypoint" "Visit__22TCastToPtr<9CRepulsor>FR25CScriptSpiderBallWaypoint": /* 800ABE5C 000A8DBC 38 00 00 00 */ li r0, 0 /* 800ABE60 000A8DC0 90 03 00 04 */ stw r0, 4(r3) -/* 800ABE64 000A8DC4 4E 80 00 20 */ blr +/* 800ABE64 000A8DC4 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR34CScriptSpiderBallAttractionSurface" "Visit__22TCastToPtr<9CRepulsor>FR34CScriptSpiderBallAttractionSurface": /* 800ABE68 000A8DC8 38 00 00 00 */ li r0, 0 /* 800ABE6C 000A8DCC 90 03 00 04 */ stw r0, 4(r3) -/* 800ABE70 000A8DD0 4E 80 00 20 */ blr +/* 800ABE70 000A8DD0 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR22CScriptSpecialFunction" "Visit__22TCastToPtr<9CRepulsor>FR22CScriptSpecialFunction": /* 800ABE74 000A8DD4 38 00 00 00 */ li r0, 0 /* 800ABE78 000A8DD8 90 03 00 04 */ stw r0, 4(r3) -/* 800ABE7C 000A8DDC 4E 80 00 20 */ blr +/* 800ABE7C 000A8DDC 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR17CScriptSpawnPoint" "Visit__22TCastToPtr<9CRepulsor>FR17CScriptSpawnPoint": /* 800ABE80 000A8DE0 38 00 00 00 */ li r0, 0 /* 800ABE84 000A8DE4 90 03 00 04 */ stw r0, 4(r3) -/* 800ABE88 000A8DE8 4E 80 00 20 */ blr +/* 800ABE88 000A8DE8 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR12CScriptSound" "Visit__22TCastToPtr<9CRepulsor>FR12CScriptSound": /* 800ABE8C 000A8DEC 38 00 00 00 */ li r0, 0 /* 800ABE90 000A8DF0 90 03 00 04 */ stw r0, 4(r3) -/* 800ABE94 000A8DF4 4E 80 00 20 */ blr +/* 800ABE94 000A8DF4 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR20CScriptRoomAcoustics" "Visit__22TCastToPtr<9CRepulsor>FR20CScriptRoomAcoustics": /* 800ABE98 000A8DF8 38 00 00 00 */ li r0, 0 /* 800ABE9C 000A8DFC 90 03 00 04 */ stw r0, 4(r3) -/* 800ABEA0 000A8E00 4E 80 00 20 */ blr +/* 800ABEA0 000A8E00 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR22CScriptPointOfinterest" "Visit__22TCastToPtr<9CRepulsor>FR22CScriptPointOfinterest": /* 800ABEA4 000A8E04 38 00 00 00 */ li r0, 0 /* 800ABEA8 000A8E08 90 03 00 04 */ stw r0, 4(r3) -/* 800ABEAC 000A8E0C 4E 80 00 20 */ blr +/* 800ABEAC 000A8E0C 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR17CScriptPlayerHint" "Visit__22TCastToPtr<9CRepulsor>FR17CScriptPlayerHint": /* 800ABEB0 000A8E10 38 00 00 00 */ li r0, 0 /* 800ABEB4 000A8E14 90 03 00 04 */ stw r0, 4(r3) -/* 800ABEB8 000A8E18 4E 80 00 20 */ blr +/* 800ABEB8 000A8E18 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR15CScriptPlatform" "Visit__22TCastToPtr<9CRepulsor>FR15CScriptPlatform": /* 800ABEBC 000A8E1C 38 00 00 00 */ li r0, 0 /* 800ABEC0 000A8E20 90 03 00 04 */ stw r0, 4(r3) -/* 800ABEC4 000A8E24 4E 80 00 20 */ blr +/* 800ABEC4 000A8E24 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR13CScriptPickup" "Visit__22TCastToPtr<9CRepulsor>FR13CScriptPickup": /* 800ABEC8 000A8E28 38 00 00 00 */ li r0, 0 /* 800ABECC 000A8E2C 90 03 00 04 */ stw r0, 4(r3) -/* 800ABED0 000A8E30 4E 80 00 20 */ blr +/* 800ABED0 000A8E30 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR15CScriptMazeNode" "Visit__22TCastToPtr<9CRepulsor>FR15CScriptMazeNode": /* 800ABED4 000A8E34 38 00 00 00 */ li r0, 0 /* 800ABED8 000A8E38 90 03 00 04 */ stw r0, 4(r3) -/* 800ABEDC 000A8E3C 4E 80 00 20 */ blr +/* 800ABEDC 000A8E3C 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR16CScriptGunTurret" "Visit__22TCastToPtr<9CRepulsor>FR16CScriptGunTurret": /* 800ABEE0 000A8E40 38 00 00 00 */ li r0, 0 /* 800ABEE4 000A8E44 90 03 00 04 */ stw r0, 4(r3) -/* 800ABEE8 000A8E48 4E 80 00 20 */ blr +/* 800ABEE8 000A8E48 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR19CScriptGrapplePoint" "Visit__22TCastToPtr<9CRepulsor>FR19CScriptGrapplePoint": /* 800ABEEC 000A8E4C 38 00 00 00 */ li r0, 0 /* 800ABEF0 000A8E50 90 03 00 04 */ stw r0, 4(r3) -/* 800ABEF4 000A8E54 4E 80 00 20 */ blr +/* 800ABEF4 000A8E54 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR13CScriptEffect" "Visit__22TCastToPtr<9CRepulsor>FR13CScriptEffect": /* 800ABEF8 000A8E58 38 00 00 00 */ li r0, 0 /* 800ABEFC 000A8E5C 90 03 00 04 */ stw r0, 4(r3) -/* 800ABF00 000A8E60 4E 80 00 20 */ blr +/* 800ABF00 000A8E60 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR11CScriptDoor" "Visit__22TCastToPtr<9CRepulsor>FR11CScriptDoor": /* 800ABF04 000A8E64 38 00 00 00 */ li r0, 0 /* 800ABF08 000A8E68 90 03 00 04 */ stw r0, 4(r3) -/* 800ABF0C 000A8E6C 4E 80 00 20 */ blr +/* 800ABF0C 000A8E6C 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR11CScriptDock" "Visit__22TCastToPtr<9CRepulsor>FR11CScriptDock": /* 800ABF10 000A8E70 38 00 00 00 */ li r0, 0 /* 800ABF14 000A8E74 90 03 00 04 */ stw r0, 4(r3) -/* 800ABF18 000A8E78 4E 80 00 20 */ blr +/* 800ABF18 000A8E78 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR18CScriptDistanceFog" "Visit__22TCastToPtr<9CRepulsor>FR18CScriptDistanceFog": /* 800ABF1C 000A8E7C 38 00 00 00 */ li r0, 0 /* 800ABF20 000A8E80 90 03 00 04 */ stw r0, 4(r3) -/* 800ABF24 000A8E84 4E 80 00 20 */ blr +/* 800ABF24 000A8E84 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR26CScriptDebugCameraWaypoint" "Visit__22TCastToPtr<9CRepulsor>FR26CScriptDebugCameraWaypoint": /* 800ABF28 000A8E88 38 00 00 00 */ li r0, 0 /* 800ABF2C 000A8E8C 90 03 00 04 */ stw r0, 4(r3) -/* 800ABF30 000A8E90 4E 80 00 20 */ blr +/* 800ABF30 000A8E90 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR17CScriptCoverPoint" "Visit__22TCastToPtr<9CRepulsor>FR17CScriptCoverPoint": /* 800ABF34 000A8E94 38 00 00 00 */ li r0, 0 /* 800ABF38 000A8E98 90 03 00 04 */ stw r0, 4(r3) -/* 800ABF3C 000A8E9C 4E 80 00 20 */ blr +/* 800ABF3C 000A8E9C 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR21CScriptCameraWaypoint" "Visit__22TCastToPtr<9CRepulsor>FR21CScriptCameraWaypoint": /* 800ABF40 000A8EA0 38 00 00 00 */ li r0, 0 /* 800ABF44 000A8EA4 90 03 00 04 */ stw r0, 4(r3) -/* 800ABF48 000A8EA8 4E 80 00 20 */ blr +/* 800ABF48 000A8EA8 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR24CScriptCameraPitchVolume" "Visit__22TCastToPtr<9CRepulsor>FR24CScriptCameraPitchVolume": /* 800ABF4C 000A8EAC 38 00 00 00 */ li r0, 0 /* 800ABF50 000A8EB0 90 03 00 04 */ stw r0, 4(r3) -/* 800ABF54 000A8EB4 4E 80 00 20 */ blr +/* 800ABF54 000A8EB4 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR17CScriptCameraHint" "Visit__22TCastToPtr<9CRepulsor>FR17CScriptCameraHint": /* 800ABF58 000A8EB8 38 00 00 00 */ li r0, 0 /* 800ABF5C 000A8EBC 90 03 00 04 */ stw r0, 4(r3) -/* 800ABF60 000A8EC0 4E 80 00 20 */ blr +/* 800ABF60 000A8EC0 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR18CScriptAiJumpPoint" "Visit__22TCastToPtr<9CRepulsor>FR18CScriptAiJumpPoint": /* 800ABF64 000A8EC4 38 00 00 00 */ li r0, 0 /* 800ABF68 000A8EC8 90 03 00 04 */ stw r0, 4(r3) -/* 800ABF6C 000A8ECC 4E 80 00 20 */ blr +/* 800ABF6C 000A8ECC 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR20CScriptActorKeyframe" "Visit__22TCastToPtr<9CRepulsor>FR20CScriptActorKeyframe": /* 800ABF70 000A8ED0 38 00 00 00 */ li r0, 0 /* 800ABF74 000A8ED4 90 03 00 04 */ stw r0, 4(r3) -/* 800ABF78 000A8ED8 4E 80 00 20 */ blr +/* 800ABF78 000A8ED8 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR12CScriptActor" "Visit__22TCastToPtr<9CRepulsor>FR12CScriptActor": /* 800ABF7C 000A8EDC 38 00 00 00 */ li r0, 0 /* 800ABF80 000A8EE0 90 03 00 04 */ stw r0, 4(r3) -/* 800ABF84 000A8EE4 4E 80 00 20 */ blr +/* 800ABF84 000A8EE4 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR9CRepulsor" "Visit__22TCastToPtr<9CRepulsor>FR9CRepulsor": /* 800ABF88 000A8EE8 90 83 00 04 */ stw r4, 4(r3) -/* 800ABF8C 000A8EEC 4E 80 00 20 */ blr +/* 800ABF8C 000A8EEC 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR7CPlayer" "Visit__22TCastToPtr<9CRepulsor>FR7CPlayer": /* 800ABF90 000A8EF0 38 00 00 00 */ li r0, 0 /* 800ABF94 000A8EF4 90 03 00 04 */ stw r0, 4(r3) -/* 800ABF98 000A8EF8 4E 80 00 20 */ blr +/* 800ABF98 000A8EF8 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR13CPhysicsActor" "Visit__22TCastToPtr<9CRepulsor>FR13CPhysicsActor": /* 800ABF9C 000A8EFC 38 00 00 00 */ li r0, 0 /* 800ABFA0 000A8F00 90 03 00 04 */ stw r0, 4(r3) -/* 800ABFA4 000A8F04 4E 80 00 20 */ blr +/* 800ABFA4 000A8F04 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR3CAi" "Visit__22TCastToPtr<9CRepulsor>FR3CAi": /* 800ABFA8 000A8F08 38 00 00 00 */ li r0, 0 /* 800ABFAC 000A8F0C 90 03 00 04 */ stw r0, 4(r3) -/* 800ABFB0 000A8F10 4E 80 00 20 */ blr +/* 800ABFB0 000A8F10 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR11CPathCamera" "Visit__22TCastToPtr<9CRepulsor>FR11CPathCamera": /* 800ABFB4 000A8F14 38 00 00 00 */ li r0, 0 /* 800ABFB8 000A8F18 90 03 00 04 */ stw r0, 4(r3) -/* 800ABFBC 000A8F1C 4E 80 00 20 */ blr +/* 800ABFBC 000A8F1C 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR18CMetroidPrimeRelay" "Visit__22TCastToPtr<9CRepulsor>FR18CMetroidPrimeRelay": /* 800ABFC0 000A8F20 38 00 00 00 */ li r0, 0 /* 800ABFC4 000A8F24 90 03 00 04 */ stw r0, 4(r3) -/* 800ABFC8 000A8F28 4E 80 00 20 */ blr +/* 800ABFC8 000A8F28 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR19CHUDBillboardEffect" "Visit__22TCastToPtr<9CRepulsor>FR19CHUDBillboardEffect": /* 800ABFCC 000A8F2C 38 00 00 00 */ li r0, 0 /* 800ABFD0 000A8F30 90 03 00 04 */ stw r0, 4(r3) -/* 800ABFD4 000A8F34 4E 80 00 20 */ blr +/* 800ABFD4 000A8F34 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR15CGameProjectile" "Visit__22TCastToPtr<9CRepulsor>FR15CGameProjectile": /* 800ABFD8 000A8F38 38 00 00 00 */ li r0, 0 /* 800ABFDC 000A8F3C 90 03 00 04 */ stw r0, 4(r3) -/* 800ABFE0 000A8F40 4E 80 00 20 */ blr +/* 800ABFE0 000A8F40 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR10CGameLight" "Visit__22TCastToPtr<9CRepulsor>FR10CGameLight": /* 800ABFE4 000A8F44 38 00 00 00 */ li r0, 0 /* 800ABFE8 000A8F48 90 03 00 04 */ stw r0, 4(r3) -/* 800ABFEC 000A8F4C 4E 80 00 20 */ blr +/* 800ABFEC 000A8F4C 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR11CGameCamera" "Visit__22TCastToPtr<9CRepulsor>FR11CGameCamera": /* 800ABFF0 000A8F50 38 00 00 00 */ li r0, 0 /* 800ABFF4 000A8F54 90 03 00 04 */ stw r0, 4(r3) -/* 800ABFF8 000A8F58 4E 80 00 20 */ blr +/* 800ABFF8 000A8F58 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR10CFishCloud" "Visit__22TCastToPtr<9CRepulsor>FR10CFishCloud": /* 800ABFFC 000A8F5C 38 00 00 00 */ li r0, 0 /* 800AC000 000A8F60 90 03 00 04 */ stw r0, 4(r3) -/* 800AC004 000A8F64 4E 80 00 20 */ blr +/* 800AC004 000A8F64 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR18CFirstPersonCamera" "Visit__22TCastToPtr<9CRepulsor>FR18CFirstPersonCamera": /* 800AC008 000A8F68 38 00 00 00 */ li r0, 0 /* 800AC00C 000A8F6C 90 03 00 04 */ stw r0, 4(r3) -/* 800AC010 000A8F70 4E 80 00 20 */ blr +/* 800AC010 000A8F70 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR10CExplosion" "Visit__22TCastToPtr<9CRepulsor>FR10CExplosion": /* 800AC014 000A8F74 38 00 00 00 */ li r0, 0 /* 800AC018 000A8F78 90 03 00 04 */ stw r0, 4(r3) -/* 800AC01C 000A8F7C 4E 80 00 20 */ blr +/* 800AC01C 000A8F7C 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR7CEntity" "Visit__22TCastToPtr<9CRepulsor>FR7CEntity": /* 800AC020 000A8F80 38 00 00 00 */ li r0, 0 /* 800AC024 000A8F84 90 03 00 04 */ stw r0, 4(r3) -/* 800AC028 000A8F88 4E 80 00 20 */ blr +/* 800AC028 000A8F88 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR17CEnergyProjectile" "Visit__22TCastToPtr<9CRepulsor>FR17CEnergyProjectile": /* 800AC02C 000A8F8C 38 00 00 00 */ li r0, 0 /* 800AC030 000A8F90 90 03 00 04 */ stw r0, 4(r3) -/* 800AC034 000A8F94 4E 80 00 20 */ blr +/* 800AC034 000A8F94 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR16CDestroyableRock" "Visit__22TCastToPtr<9CRepulsor>FR16CDestroyableRock": /* 800AC038 000A8F98 38 00 00 00 */ li r0, 0 /* 800AC03C 000A8F9C 90 03 00 04 */ stw r0, 4(r3) -/* 800AC040 000A8FA0 4E 80 00 20 */ blr +/* 800AC040 000A8FA0 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR15CCollisionActor" "Visit__22TCastToPtr<9CRepulsor>FR15CCollisionActor": /* 800AC044 000A8FA4 38 00 00 00 */ li r0, 0 /* 800AC048 000A8FA8 90 03 00 04 */ stw r0, 4(r3) -/* 800AC04C 000A8FAC 4E 80 00 20 */ blr +/* 800AC04C 000A8FAC 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR16CCinematicCamera" "Visit__22TCastToPtr<9CRepulsor>FR16CCinematicCamera": /* 800AC050 000A8FB0 38 00 00 00 */ li r0, 0 /* 800AC054 000A8FB4 90 03 00 04 */ stw r0, 4(r3) -/* 800AC058 000A8FB8 4E 80 00 20 */ blr +/* 800AC058 000A8FB8 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR5CBomb" "Visit__22TCastToPtr<9CRepulsor>FR5CBomb": /* 800AC05C 000A8FBC 38 00 00 00 */ li r0, 0 /* 800AC060 000A8FC0 90 03 00 04 */ stw r0, 4(r3) -/* 800AC064 000A8FC4 4E 80 00 20 */ blr +/* 800AC064 000A8FC4 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR11CBallCamera" "Visit__22TCastToPtr<9CRepulsor>FR11CBallCamera": /* 800AC068 000A8FC8 38 00 00 00 */ li r0, 0 /* 800AC06C 000A8FCC 90 03 00 04 */ stw r0, 4(r3) -/* 800AC070 000A8FD0 4E 80 00 20 */ blr +/* 800AC070 000A8FD0 4E 80 00 20 */ blr .global "Visit__22TCastToPtr<9CRepulsor>FR6CActor" "Visit__22TCastToPtr<9CRepulsor>FR6CActor": /* 800AC074 000A8FD4 38 00 00 00 */ li r0, 0 /* 800AC078 000A8FD8 90 03 00 04 */ stw r0, 4(r3) -/* 800AC07C 000A8FDC 4E 80 00 20 */ blr +/* 800AC07C 000A8FDC 4E 80 00 20 */ blr .global "__ct__22TCastToPtr<9CRepulsor>FP7CEntity" "__ct__22TCastToPtr<9CRepulsor>FP7CEntity": @@ -16209,355 +16209,355 @@ lbl_800ABDC0: /* 800AC0C4 000A9024 81 83 00 00 */ lwz r12, 0(r3) /* 800AC0C8 000A9028 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800AC0CC 000A902C 7D 89 03 A6 */ mtctr r12 -/* 800AC0D0 000A9030 4E 80 04 21 */ bctrl +/* 800AC0D0 000A9030 4E 80 04 21 */ bctrl lbl_800AC0D4: /* 800AC0D4 000A9034 80 01 00 14 */ lwz r0, 0x14(r1) /* 800AC0D8 000A9038 7F E3 FB 78 */ mr r3, r31 /* 800AC0DC 000A903C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800AC0E0 000A9040 7C 08 03 A6 */ mtlr r0 /* 800AC0E4 000A9044 38 21 00 10 */ addi r1, r1, 0x10 -/* 800AC0E8 000A9048 4E 80 00 20 */ blr +/* 800AC0E8 000A9048 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR7CWeapon" "Visit__20TCastToPtr<7CPlayer>FR7CWeapon": /* 800AC0EC 000A904C 38 00 00 00 */ li r0, 0 /* 800AC0F0 000A9050 90 03 00 04 */ stw r0, 4(r3) -/* 800AC0F4 000A9054 4E 80 00 20 */ blr +/* 800AC0F4 000A9054 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR17CWallCrawlerSwarm" "Visit__20TCastToPtr<7CPlayer>FR17CWallCrawlerSwarm": /* 800AC0F8 000A9058 38 00 00 00 */ li r0, 0 /* 800AC0FC 000A905C 90 03 00 04 */ stw r0, 4(r3) -/* 800AC100 000A9060 4E 80 00 20 */ blr +/* 800AC100 000A9060 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR20CScriptSpindleCamera" "Visit__20TCastToPtr<7CPlayer>FR20CScriptSpindleCamera": /* 800AC104 000A9064 38 00 00 00 */ li r0, 0 /* 800AC108 000A9068 90 03 00 04 */ stw r0, 4(r3) -/* 800AC10C 000A906C 4E 80 00 20 */ blr +/* 800AC10C 000A906C 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR15CSnakeWeedSwarm" "Visit__20TCastToPtr<7CPlayer>FR15CSnakeWeedSwarm": /* 800AC110 000A9070 38 00 00 00 */ li r0, 0 /* 800AC114 000A9074 90 03 00 04 */ stw r0, 4(r3) -/* 800AC118 000A9078 4E 80 00 20 */ blr +/* 800AC118 000A9078 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR15CScriptWaypoint" "Visit__20TCastToPtr<7CPlayer>FR15CScriptWaypoint": /* 800AC11C 000A907C 38 00 00 00 */ li r0, 0 /* 800AC120 000A9080 90 03 00 04 */ stw r0, 4(r3) -/* 800AC124 000A9084 4E 80 00 20 */ blr +/* 800AC124 000A9084 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR12CScriptWater" "Visit__20TCastToPtr<7CPlayer>FR12CScriptWater": /* 800AC128 000A9088 38 00 00 00 */ li r0, 0 /* 800AC12C 000A908C 90 03 00 04 */ stw r0, 4(r3) -/* 800AC130 000A9090 4E 80 00 20 */ blr +/* 800AC130 000A9090 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR17CScriptVisorFlare" "Visit__20TCastToPtr<7CPlayer>FR17CScriptVisorFlare": /* 800AC134 000A9094 38 00 00 00 */ li r0, 0 /* 800AC138 000A9098 90 03 00 04 */ stw r0, 4(r3) -/* 800AC13C 000A909C 4E 80 00 20 */ blr +/* 800AC13C 000A909C 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR14CScriptTrigger" "Visit__20TCastToPtr<7CPlayer>FR14CScriptTrigger": /* 800AC140 000A90A0 38 00 00 00 */ li r0, 0 /* 800AC144 000A90A4 90 03 00 04 */ stw r0, 4(r3) -/* 800AC148 000A90A8 4E 80 00 20 */ blr +/* 800AC148 000A90A8 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR12CScriptTimer" "Visit__20TCastToPtr<7CPlayer>FR12CScriptTimer": /* 800AC14C 000A90AC 38 00 00 00 */ li r0, 0 /* 800AC150 000A90B0 90 03 00 04 */ stw r0, 4(r3) -/* 800AC154 000A90B4 4E 80 00 20 */ blr +/* 800AC154 000A90B4 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR10CTeamAiMgr" "Visit__20TCastToPtr<7CPlayer>FR10CTeamAiMgr": /* 800AC158 000A90B8 38 00 00 00 */ li r0, 0 /* 800AC15C 000A90BC 90 03 00 04 */ stw r0, 4(r3) -/* 800AC160 000A90C0 4E 80 00 20 */ blr +/* 800AC160 000A90C0 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR21CScriptTargetingPoint" "Visit__20TCastToPtr<7CPlayer>FR21CScriptTargetingPoint": /* 800AC164 000A90C4 38 00 00 00 */ li r0, 0 /* 800AC168 000A90C8 90 03 00 04 */ stw r0, 4(r3) -/* 800AC16C 000A90CC 4E 80 00 20 */ blr +/* 800AC16C 000A90CC 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR25CScriptSpiderBallWaypoint" "Visit__20TCastToPtr<7CPlayer>FR25CScriptSpiderBallWaypoint": /* 800AC170 000A90D0 38 00 00 00 */ li r0, 0 /* 800AC174 000A90D4 90 03 00 04 */ stw r0, 4(r3) -/* 800AC178 000A90D8 4E 80 00 20 */ blr +/* 800AC178 000A90D8 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR34CScriptSpiderBallAttractionSurface" "Visit__20TCastToPtr<7CPlayer>FR34CScriptSpiderBallAttractionSurface": /* 800AC17C 000A90DC 38 00 00 00 */ li r0, 0 /* 800AC180 000A90E0 90 03 00 04 */ stw r0, 4(r3) -/* 800AC184 000A90E4 4E 80 00 20 */ blr +/* 800AC184 000A90E4 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR22CScriptSpecialFunction" "Visit__20TCastToPtr<7CPlayer>FR22CScriptSpecialFunction": /* 800AC188 000A90E8 38 00 00 00 */ li r0, 0 /* 800AC18C 000A90EC 90 03 00 04 */ stw r0, 4(r3) -/* 800AC190 000A90F0 4E 80 00 20 */ blr +/* 800AC190 000A90F0 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR17CScriptSpawnPoint" "Visit__20TCastToPtr<7CPlayer>FR17CScriptSpawnPoint": /* 800AC194 000A90F4 38 00 00 00 */ li r0, 0 /* 800AC198 000A90F8 90 03 00 04 */ stw r0, 4(r3) -/* 800AC19C 000A90FC 4E 80 00 20 */ blr +/* 800AC19C 000A90FC 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR12CScriptSound" "Visit__20TCastToPtr<7CPlayer>FR12CScriptSound": /* 800AC1A0 000A9100 38 00 00 00 */ li r0, 0 /* 800AC1A4 000A9104 90 03 00 04 */ stw r0, 4(r3) -/* 800AC1A8 000A9108 4E 80 00 20 */ blr +/* 800AC1A8 000A9108 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR20CScriptRoomAcoustics" "Visit__20TCastToPtr<7CPlayer>FR20CScriptRoomAcoustics": /* 800AC1AC 000A910C 38 00 00 00 */ li r0, 0 /* 800AC1B0 000A9110 90 03 00 04 */ stw r0, 4(r3) -/* 800AC1B4 000A9114 4E 80 00 20 */ blr +/* 800AC1B4 000A9114 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR22CScriptPointOfinterest" "Visit__20TCastToPtr<7CPlayer>FR22CScriptPointOfinterest": /* 800AC1B8 000A9118 38 00 00 00 */ li r0, 0 /* 800AC1BC 000A911C 90 03 00 04 */ stw r0, 4(r3) -/* 800AC1C0 000A9120 4E 80 00 20 */ blr +/* 800AC1C0 000A9120 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR17CScriptPlayerHint" "Visit__20TCastToPtr<7CPlayer>FR17CScriptPlayerHint": /* 800AC1C4 000A9124 38 00 00 00 */ li r0, 0 /* 800AC1C8 000A9128 90 03 00 04 */ stw r0, 4(r3) -/* 800AC1CC 000A912C 4E 80 00 20 */ blr +/* 800AC1CC 000A912C 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR15CScriptPlatform" "Visit__20TCastToPtr<7CPlayer>FR15CScriptPlatform": /* 800AC1D0 000A9130 38 00 00 00 */ li r0, 0 /* 800AC1D4 000A9134 90 03 00 04 */ stw r0, 4(r3) -/* 800AC1D8 000A9138 4E 80 00 20 */ blr +/* 800AC1D8 000A9138 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR13CScriptPickup" "Visit__20TCastToPtr<7CPlayer>FR13CScriptPickup": /* 800AC1DC 000A913C 38 00 00 00 */ li r0, 0 /* 800AC1E0 000A9140 90 03 00 04 */ stw r0, 4(r3) -/* 800AC1E4 000A9144 4E 80 00 20 */ blr +/* 800AC1E4 000A9144 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR15CScriptMazeNode" "Visit__20TCastToPtr<7CPlayer>FR15CScriptMazeNode": /* 800AC1E8 000A9148 38 00 00 00 */ li r0, 0 /* 800AC1EC 000A914C 90 03 00 04 */ stw r0, 4(r3) -/* 800AC1F0 000A9150 4E 80 00 20 */ blr +/* 800AC1F0 000A9150 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR16CScriptGunTurret" "Visit__20TCastToPtr<7CPlayer>FR16CScriptGunTurret": /* 800AC1F4 000A9154 38 00 00 00 */ li r0, 0 /* 800AC1F8 000A9158 90 03 00 04 */ stw r0, 4(r3) -/* 800AC1FC 000A915C 4E 80 00 20 */ blr +/* 800AC1FC 000A915C 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR19CScriptGrapplePoint" "Visit__20TCastToPtr<7CPlayer>FR19CScriptGrapplePoint": /* 800AC200 000A9160 38 00 00 00 */ li r0, 0 /* 800AC204 000A9164 90 03 00 04 */ stw r0, 4(r3) -/* 800AC208 000A9168 4E 80 00 20 */ blr +/* 800AC208 000A9168 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR13CScriptEffect" "Visit__20TCastToPtr<7CPlayer>FR13CScriptEffect": /* 800AC20C 000A916C 38 00 00 00 */ li r0, 0 /* 800AC210 000A9170 90 03 00 04 */ stw r0, 4(r3) -/* 800AC214 000A9174 4E 80 00 20 */ blr +/* 800AC214 000A9174 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR11CScriptDoor" "Visit__20TCastToPtr<7CPlayer>FR11CScriptDoor": /* 800AC218 000A9178 38 00 00 00 */ li r0, 0 /* 800AC21C 000A917C 90 03 00 04 */ stw r0, 4(r3) -/* 800AC220 000A9180 4E 80 00 20 */ blr +/* 800AC220 000A9180 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR11CScriptDock" "Visit__20TCastToPtr<7CPlayer>FR11CScriptDock": /* 800AC224 000A9184 38 00 00 00 */ li r0, 0 /* 800AC228 000A9188 90 03 00 04 */ stw r0, 4(r3) -/* 800AC22C 000A918C 4E 80 00 20 */ blr +/* 800AC22C 000A918C 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR18CScriptDistanceFog" "Visit__20TCastToPtr<7CPlayer>FR18CScriptDistanceFog": /* 800AC230 000A9190 38 00 00 00 */ li r0, 0 /* 800AC234 000A9194 90 03 00 04 */ stw r0, 4(r3) -/* 800AC238 000A9198 4E 80 00 20 */ blr +/* 800AC238 000A9198 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR26CScriptDebugCameraWaypoint" "Visit__20TCastToPtr<7CPlayer>FR26CScriptDebugCameraWaypoint": /* 800AC23C 000A919C 38 00 00 00 */ li r0, 0 /* 800AC240 000A91A0 90 03 00 04 */ stw r0, 4(r3) -/* 800AC244 000A91A4 4E 80 00 20 */ blr +/* 800AC244 000A91A4 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR17CScriptCoverPoint" "Visit__20TCastToPtr<7CPlayer>FR17CScriptCoverPoint": /* 800AC248 000A91A8 38 00 00 00 */ li r0, 0 /* 800AC24C 000A91AC 90 03 00 04 */ stw r0, 4(r3) -/* 800AC250 000A91B0 4E 80 00 20 */ blr +/* 800AC250 000A91B0 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR21CScriptCameraWaypoint" "Visit__20TCastToPtr<7CPlayer>FR21CScriptCameraWaypoint": /* 800AC254 000A91B4 38 00 00 00 */ li r0, 0 /* 800AC258 000A91B8 90 03 00 04 */ stw r0, 4(r3) -/* 800AC25C 000A91BC 4E 80 00 20 */ blr +/* 800AC25C 000A91BC 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR24CScriptCameraPitchVolume" "Visit__20TCastToPtr<7CPlayer>FR24CScriptCameraPitchVolume": /* 800AC260 000A91C0 38 00 00 00 */ li r0, 0 /* 800AC264 000A91C4 90 03 00 04 */ stw r0, 4(r3) -/* 800AC268 000A91C8 4E 80 00 20 */ blr +/* 800AC268 000A91C8 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR17CScriptCameraHint" "Visit__20TCastToPtr<7CPlayer>FR17CScriptCameraHint": /* 800AC26C 000A91CC 38 00 00 00 */ li r0, 0 /* 800AC270 000A91D0 90 03 00 04 */ stw r0, 4(r3) -/* 800AC274 000A91D4 4E 80 00 20 */ blr +/* 800AC274 000A91D4 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR18CScriptAiJumpPoint" "Visit__20TCastToPtr<7CPlayer>FR18CScriptAiJumpPoint": /* 800AC278 000A91D8 38 00 00 00 */ li r0, 0 /* 800AC27C 000A91DC 90 03 00 04 */ stw r0, 4(r3) -/* 800AC280 000A91E0 4E 80 00 20 */ blr +/* 800AC280 000A91E0 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR20CScriptActorKeyframe" "Visit__20TCastToPtr<7CPlayer>FR20CScriptActorKeyframe": /* 800AC284 000A91E4 38 00 00 00 */ li r0, 0 /* 800AC288 000A91E8 90 03 00 04 */ stw r0, 4(r3) -/* 800AC28C 000A91EC 4E 80 00 20 */ blr +/* 800AC28C 000A91EC 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR12CScriptActor" "Visit__20TCastToPtr<7CPlayer>FR12CScriptActor": /* 800AC290 000A91F0 38 00 00 00 */ li r0, 0 /* 800AC294 000A91F4 90 03 00 04 */ stw r0, 4(r3) -/* 800AC298 000A91F8 4E 80 00 20 */ blr +/* 800AC298 000A91F8 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR9CRepulsor" "Visit__20TCastToPtr<7CPlayer>FR9CRepulsor": /* 800AC29C 000A91FC 38 00 00 00 */ li r0, 0 /* 800AC2A0 000A9200 90 03 00 04 */ stw r0, 4(r3) -/* 800AC2A4 000A9204 4E 80 00 20 */ blr +/* 800AC2A4 000A9204 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR7CPlayer" "Visit__20TCastToPtr<7CPlayer>FR7CPlayer": /* 800AC2A8 000A9208 90 83 00 04 */ stw r4, 4(r3) -/* 800AC2AC 000A920C 4E 80 00 20 */ blr +/* 800AC2AC 000A920C 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR13CPhysicsActor" "Visit__20TCastToPtr<7CPlayer>FR13CPhysicsActor": /* 800AC2B0 000A9210 38 00 00 00 */ li r0, 0 /* 800AC2B4 000A9214 90 03 00 04 */ stw r0, 4(r3) -/* 800AC2B8 000A9218 4E 80 00 20 */ blr +/* 800AC2B8 000A9218 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR3CAi" "Visit__20TCastToPtr<7CPlayer>FR3CAi": /* 800AC2BC 000A921C 38 00 00 00 */ li r0, 0 /* 800AC2C0 000A9220 90 03 00 04 */ stw r0, 4(r3) -/* 800AC2C4 000A9224 4E 80 00 20 */ blr +/* 800AC2C4 000A9224 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR11CPathCamera" "Visit__20TCastToPtr<7CPlayer>FR11CPathCamera": /* 800AC2C8 000A9228 38 00 00 00 */ li r0, 0 /* 800AC2CC 000A922C 90 03 00 04 */ stw r0, 4(r3) -/* 800AC2D0 000A9230 4E 80 00 20 */ blr +/* 800AC2D0 000A9230 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR18CMetroidPrimeRelay" "Visit__20TCastToPtr<7CPlayer>FR18CMetroidPrimeRelay": /* 800AC2D4 000A9234 38 00 00 00 */ li r0, 0 /* 800AC2D8 000A9238 90 03 00 04 */ stw r0, 4(r3) -/* 800AC2DC 000A923C 4E 80 00 20 */ blr +/* 800AC2DC 000A923C 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR19CHUDBillboardEffect" "Visit__20TCastToPtr<7CPlayer>FR19CHUDBillboardEffect": /* 800AC2E0 000A9240 38 00 00 00 */ li r0, 0 /* 800AC2E4 000A9244 90 03 00 04 */ stw r0, 4(r3) -/* 800AC2E8 000A9248 4E 80 00 20 */ blr +/* 800AC2E8 000A9248 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR15CGameProjectile" "Visit__20TCastToPtr<7CPlayer>FR15CGameProjectile": /* 800AC2EC 000A924C 38 00 00 00 */ li r0, 0 /* 800AC2F0 000A9250 90 03 00 04 */ stw r0, 4(r3) -/* 800AC2F4 000A9254 4E 80 00 20 */ blr +/* 800AC2F4 000A9254 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR10CGameLight" "Visit__20TCastToPtr<7CPlayer>FR10CGameLight": /* 800AC2F8 000A9258 38 00 00 00 */ li r0, 0 /* 800AC2FC 000A925C 90 03 00 04 */ stw r0, 4(r3) -/* 800AC300 000A9260 4E 80 00 20 */ blr +/* 800AC300 000A9260 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR11CGameCamera" "Visit__20TCastToPtr<7CPlayer>FR11CGameCamera": /* 800AC304 000A9264 38 00 00 00 */ li r0, 0 /* 800AC308 000A9268 90 03 00 04 */ stw r0, 4(r3) -/* 800AC30C 000A926C 4E 80 00 20 */ blr +/* 800AC30C 000A926C 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR10CFishCloud" "Visit__20TCastToPtr<7CPlayer>FR10CFishCloud": /* 800AC310 000A9270 38 00 00 00 */ li r0, 0 /* 800AC314 000A9274 90 03 00 04 */ stw r0, 4(r3) -/* 800AC318 000A9278 4E 80 00 20 */ blr +/* 800AC318 000A9278 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR18CFirstPersonCamera" "Visit__20TCastToPtr<7CPlayer>FR18CFirstPersonCamera": /* 800AC31C 000A927C 38 00 00 00 */ li r0, 0 /* 800AC320 000A9280 90 03 00 04 */ stw r0, 4(r3) -/* 800AC324 000A9284 4E 80 00 20 */ blr +/* 800AC324 000A9284 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR10CExplosion" "Visit__20TCastToPtr<7CPlayer>FR10CExplosion": /* 800AC328 000A9288 38 00 00 00 */ li r0, 0 /* 800AC32C 000A928C 90 03 00 04 */ stw r0, 4(r3) -/* 800AC330 000A9290 4E 80 00 20 */ blr +/* 800AC330 000A9290 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR7CEntity" "Visit__20TCastToPtr<7CPlayer>FR7CEntity": /* 800AC334 000A9294 38 00 00 00 */ li r0, 0 /* 800AC338 000A9298 90 03 00 04 */ stw r0, 4(r3) -/* 800AC33C 000A929C 4E 80 00 20 */ blr +/* 800AC33C 000A929C 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR17CEnergyProjectile" "Visit__20TCastToPtr<7CPlayer>FR17CEnergyProjectile": /* 800AC340 000A92A0 38 00 00 00 */ li r0, 0 /* 800AC344 000A92A4 90 03 00 04 */ stw r0, 4(r3) -/* 800AC348 000A92A8 4E 80 00 20 */ blr +/* 800AC348 000A92A8 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR16CDestroyableRock" "Visit__20TCastToPtr<7CPlayer>FR16CDestroyableRock": /* 800AC34C 000A92AC 38 00 00 00 */ li r0, 0 /* 800AC350 000A92B0 90 03 00 04 */ stw r0, 4(r3) -/* 800AC354 000A92B4 4E 80 00 20 */ blr +/* 800AC354 000A92B4 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR15CCollisionActor" "Visit__20TCastToPtr<7CPlayer>FR15CCollisionActor": /* 800AC358 000A92B8 38 00 00 00 */ li r0, 0 /* 800AC35C 000A92BC 90 03 00 04 */ stw r0, 4(r3) -/* 800AC360 000A92C0 4E 80 00 20 */ blr +/* 800AC360 000A92C0 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR16CCinematicCamera" "Visit__20TCastToPtr<7CPlayer>FR16CCinematicCamera": /* 800AC364 000A92C4 38 00 00 00 */ li r0, 0 /* 800AC368 000A92C8 90 03 00 04 */ stw r0, 4(r3) -/* 800AC36C 000A92CC 4E 80 00 20 */ blr +/* 800AC36C 000A92CC 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR5CBomb" "Visit__20TCastToPtr<7CPlayer>FR5CBomb": /* 800AC370 000A92D0 38 00 00 00 */ li r0, 0 /* 800AC374 000A92D4 90 03 00 04 */ stw r0, 4(r3) -/* 800AC378 000A92D8 4E 80 00 20 */ blr +/* 800AC378 000A92D8 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR11CBallCamera" "Visit__20TCastToPtr<7CPlayer>FR11CBallCamera": /* 800AC37C 000A92DC 38 00 00 00 */ li r0, 0 /* 800AC380 000A92E0 90 03 00 04 */ stw r0, 4(r3) -/* 800AC384 000A92E4 4E 80 00 20 */ blr +/* 800AC384 000A92E4 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CPlayer>FR6CActor" "Visit__20TCastToPtr<7CPlayer>FR6CActor": /* 800AC388 000A92E8 38 00 00 00 */ li r0, 0 /* 800AC38C 000A92EC 90 03 00 04 */ stw r0, 4(r3) -/* 800AC390 000A92F0 4E 80 00 20 */ blr +/* 800AC390 000A92F0 4E 80 00 20 */ blr .global "__ct__20TCastToPtr<7CPlayer>FP7CEntity" "__ct__20TCastToPtr<7CPlayer>FP7CEntity": @@ -16581,14 +16581,14 @@ lbl_800AC0D4: /* 800AC3D8 000A9338 81 83 00 00 */ lwz r12, 0(r3) /* 800AC3DC 000A933C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800AC3E0 000A9340 7D 89 03 A6 */ mtctr r12 -/* 800AC3E4 000A9344 4E 80 04 21 */ bctrl +/* 800AC3E4 000A9344 4E 80 04 21 */ bctrl lbl_800AC3E8: /* 800AC3E8 000A9348 80 01 00 14 */ lwz r0, 0x14(r1) /* 800AC3EC 000A934C 7F E3 FB 78 */ mr r3, r31 /* 800AC3F0 000A9350 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800AC3F4 000A9354 7C 08 03 A6 */ mtlr r0 /* 800AC3F8 000A9358 38 21 00 10 */ addi r1, r1, 0x10 -/* 800AC3FC 000A935C 4E 80 00 20 */ blr +/* 800AC3FC 000A935C 4E 80 00 20 */ blr .global "__ct__20TCastToPtr<7CPlayer>FR7CEntity" "__ct__20TCastToPtr<7CPlayer>FR7CEntity": @@ -16610,344 +16610,344 @@ lbl_800AC3E8: /* 800AC43C 000A939C 81 83 00 00 */ lwz r12, 0(r3) /* 800AC440 000A93A0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800AC444 000A93A4 7D 89 03 A6 */ mtctr r12 -/* 800AC448 000A93A8 4E 80 04 21 */ bctrl +/* 800AC448 000A93A8 4E 80 04 21 */ bctrl /* 800AC44C 000A93AC 80 01 00 14 */ lwz r0, 0x14(r1) /* 800AC450 000A93B0 7F E3 FB 78 */ mr r3, r31 /* 800AC454 000A93B4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800AC458 000A93B8 7C 08 03 A6 */ mtlr r0 /* 800AC45C 000A93BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800AC460 000A93C0 4E 80 00 20 */ blr +/* 800AC460 000A93C0 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR7CWeapon" "Visit__27TCastToPtr<13CPhysicsActor>FR7CWeapon": /* 800AC464 000A93C4 38 00 00 00 */ li r0, 0 /* 800AC468 000A93C8 90 03 00 04 */ stw r0, 4(r3) -/* 800AC46C 000A93CC 4E 80 00 20 */ blr +/* 800AC46C 000A93CC 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR17CWallCrawlerSwarm" "Visit__27TCastToPtr<13CPhysicsActor>FR17CWallCrawlerSwarm": /* 800AC470 000A93D0 38 00 00 00 */ li r0, 0 /* 800AC474 000A93D4 90 03 00 04 */ stw r0, 4(r3) -/* 800AC478 000A93D8 4E 80 00 20 */ blr +/* 800AC478 000A93D8 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR20CScriptSpindleCamera" "Visit__27TCastToPtr<13CPhysicsActor>FR20CScriptSpindleCamera": /* 800AC47C 000A93DC 38 00 00 00 */ li r0, 0 /* 800AC480 000A93E0 90 03 00 04 */ stw r0, 4(r3) -/* 800AC484 000A93E4 4E 80 00 20 */ blr +/* 800AC484 000A93E4 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR15CSnakeWeedSwarm" "Visit__27TCastToPtr<13CPhysicsActor>FR15CSnakeWeedSwarm": /* 800AC488 000A93E8 38 00 00 00 */ li r0, 0 /* 800AC48C 000A93EC 90 03 00 04 */ stw r0, 4(r3) -/* 800AC490 000A93F0 4E 80 00 20 */ blr +/* 800AC490 000A93F0 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR15CScriptWaypoint" "Visit__27TCastToPtr<13CPhysicsActor>FR15CScriptWaypoint": /* 800AC494 000A93F4 38 00 00 00 */ li r0, 0 /* 800AC498 000A93F8 90 03 00 04 */ stw r0, 4(r3) -/* 800AC49C 000A93FC 4E 80 00 20 */ blr +/* 800AC49C 000A93FC 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR12CScriptWater" "Visit__27TCastToPtr<13CPhysicsActor>FR12CScriptWater": /* 800AC4A0 000A9400 38 00 00 00 */ li r0, 0 /* 800AC4A4 000A9404 90 03 00 04 */ stw r0, 4(r3) -/* 800AC4A8 000A9408 4E 80 00 20 */ blr +/* 800AC4A8 000A9408 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR17CScriptVisorFlare" "Visit__27TCastToPtr<13CPhysicsActor>FR17CScriptVisorFlare": /* 800AC4AC 000A940C 38 00 00 00 */ li r0, 0 /* 800AC4B0 000A9410 90 03 00 04 */ stw r0, 4(r3) -/* 800AC4B4 000A9414 4E 80 00 20 */ blr +/* 800AC4B4 000A9414 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR14CScriptTrigger" "Visit__27TCastToPtr<13CPhysicsActor>FR14CScriptTrigger": /* 800AC4B8 000A9418 38 00 00 00 */ li r0, 0 /* 800AC4BC 000A941C 90 03 00 04 */ stw r0, 4(r3) -/* 800AC4C0 000A9420 4E 80 00 20 */ blr +/* 800AC4C0 000A9420 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR12CScriptTimer" "Visit__27TCastToPtr<13CPhysicsActor>FR12CScriptTimer": /* 800AC4C4 000A9424 38 00 00 00 */ li r0, 0 /* 800AC4C8 000A9428 90 03 00 04 */ stw r0, 4(r3) -/* 800AC4CC 000A942C 4E 80 00 20 */ blr +/* 800AC4CC 000A942C 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR10CTeamAiMgr" "Visit__27TCastToPtr<13CPhysicsActor>FR10CTeamAiMgr": /* 800AC4D0 000A9430 38 00 00 00 */ li r0, 0 /* 800AC4D4 000A9434 90 03 00 04 */ stw r0, 4(r3) -/* 800AC4D8 000A9438 4E 80 00 20 */ blr +/* 800AC4D8 000A9438 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR21CScriptTargetingPoint" "Visit__27TCastToPtr<13CPhysicsActor>FR21CScriptTargetingPoint": /* 800AC4DC 000A943C 38 00 00 00 */ li r0, 0 /* 800AC4E0 000A9440 90 03 00 04 */ stw r0, 4(r3) -/* 800AC4E4 000A9444 4E 80 00 20 */ blr +/* 800AC4E4 000A9444 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR25CScriptSpiderBallWaypoint" "Visit__27TCastToPtr<13CPhysicsActor>FR25CScriptSpiderBallWaypoint": /* 800AC4E8 000A9448 38 00 00 00 */ li r0, 0 /* 800AC4EC 000A944C 90 03 00 04 */ stw r0, 4(r3) -/* 800AC4F0 000A9450 4E 80 00 20 */ blr +/* 800AC4F0 000A9450 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR34CScriptSpiderBallAttractionSurface" "Visit__27TCastToPtr<13CPhysicsActor>FR34CScriptSpiderBallAttractionSurface": /* 800AC4F4 000A9454 38 00 00 00 */ li r0, 0 /* 800AC4F8 000A9458 90 03 00 04 */ stw r0, 4(r3) -/* 800AC4FC 000A945C 4E 80 00 20 */ blr +/* 800AC4FC 000A945C 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR22CScriptSpecialFunction" "Visit__27TCastToPtr<13CPhysicsActor>FR22CScriptSpecialFunction": /* 800AC500 000A9460 38 00 00 00 */ li r0, 0 /* 800AC504 000A9464 90 03 00 04 */ stw r0, 4(r3) -/* 800AC508 000A9468 4E 80 00 20 */ blr +/* 800AC508 000A9468 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR17CScriptSpawnPoint" "Visit__27TCastToPtr<13CPhysicsActor>FR17CScriptSpawnPoint": /* 800AC50C 000A946C 38 00 00 00 */ li r0, 0 /* 800AC510 000A9470 90 03 00 04 */ stw r0, 4(r3) -/* 800AC514 000A9474 4E 80 00 20 */ blr +/* 800AC514 000A9474 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR12CScriptSound" "Visit__27TCastToPtr<13CPhysicsActor>FR12CScriptSound": /* 800AC518 000A9478 38 00 00 00 */ li r0, 0 /* 800AC51C 000A947C 90 03 00 04 */ stw r0, 4(r3) -/* 800AC520 000A9480 4E 80 00 20 */ blr +/* 800AC520 000A9480 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR20CScriptRoomAcoustics" "Visit__27TCastToPtr<13CPhysicsActor>FR20CScriptRoomAcoustics": /* 800AC524 000A9484 38 00 00 00 */ li r0, 0 /* 800AC528 000A9488 90 03 00 04 */ stw r0, 4(r3) -/* 800AC52C 000A948C 4E 80 00 20 */ blr +/* 800AC52C 000A948C 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR22CScriptPointOfinterest" "Visit__27TCastToPtr<13CPhysicsActor>FR22CScriptPointOfinterest": /* 800AC530 000A9490 38 00 00 00 */ li r0, 0 /* 800AC534 000A9494 90 03 00 04 */ stw r0, 4(r3) -/* 800AC538 000A9498 4E 80 00 20 */ blr +/* 800AC538 000A9498 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR17CScriptPlayerHint" "Visit__27TCastToPtr<13CPhysicsActor>FR17CScriptPlayerHint": /* 800AC53C 000A949C 38 00 00 00 */ li r0, 0 /* 800AC540 000A94A0 90 03 00 04 */ stw r0, 4(r3) -/* 800AC544 000A94A4 4E 80 00 20 */ blr +/* 800AC544 000A94A4 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR15CScriptPlatform" "Visit__27TCastToPtr<13CPhysicsActor>FR15CScriptPlatform": /* 800AC548 000A94A8 90 83 00 04 */ stw r4, 4(r3) -/* 800AC54C 000A94AC 4E 80 00 20 */ blr +/* 800AC54C 000A94AC 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR13CScriptPickup" "Visit__27TCastToPtr<13CPhysicsActor>FR13CScriptPickup": /* 800AC550 000A94B0 90 83 00 04 */ stw r4, 4(r3) -/* 800AC554 000A94B4 4E 80 00 20 */ blr +/* 800AC554 000A94B4 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR15CScriptMazeNode" "Visit__27TCastToPtr<13CPhysicsActor>FR15CScriptMazeNode": /* 800AC558 000A94B8 38 00 00 00 */ li r0, 0 /* 800AC55C 000A94BC 90 03 00 04 */ stw r0, 4(r3) -/* 800AC560 000A94C0 4E 80 00 20 */ blr +/* 800AC560 000A94C0 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR16CScriptGunTurret" "Visit__27TCastToPtr<13CPhysicsActor>FR16CScriptGunTurret": /* 800AC564 000A94C4 90 83 00 04 */ stw r4, 4(r3) -/* 800AC568 000A94C8 4E 80 00 20 */ blr +/* 800AC568 000A94C8 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR19CScriptGrapplePoint" "Visit__27TCastToPtr<13CPhysicsActor>FR19CScriptGrapplePoint": /* 800AC56C 000A94CC 38 00 00 00 */ li r0, 0 /* 800AC570 000A94D0 90 03 00 04 */ stw r0, 4(r3) -/* 800AC574 000A94D4 4E 80 00 20 */ blr +/* 800AC574 000A94D4 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR13CScriptEffect" "Visit__27TCastToPtr<13CPhysicsActor>FR13CScriptEffect": /* 800AC578 000A94D8 38 00 00 00 */ li r0, 0 /* 800AC57C 000A94DC 90 03 00 04 */ stw r0, 4(r3) -/* 800AC580 000A94E0 4E 80 00 20 */ blr +/* 800AC580 000A94E0 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR11CScriptDoor" "Visit__27TCastToPtr<13CPhysicsActor>FR11CScriptDoor": /* 800AC584 000A94E4 90 83 00 04 */ stw r4, 4(r3) -/* 800AC588 000A94E8 4E 80 00 20 */ blr +/* 800AC588 000A94E8 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR11CScriptDock" "Visit__27TCastToPtr<13CPhysicsActor>FR11CScriptDock": /* 800AC58C 000A94EC 90 83 00 04 */ stw r4, 4(r3) -/* 800AC590 000A94F0 4E 80 00 20 */ blr +/* 800AC590 000A94F0 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR18CScriptDistanceFog" "Visit__27TCastToPtr<13CPhysicsActor>FR18CScriptDistanceFog": /* 800AC594 000A94F4 38 00 00 00 */ li r0, 0 /* 800AC598 000A94F8 90 03 00 04 */ stw r0, 4(r3) -/* 800AC59C 000A94FC 4E 80 00 20 */ blr +/* 800AC59C 000A94FC 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR26CScriptDebugCameraWaypoint" "Visit__27TCastToPtr<13CPhysicsActor>FR26CScriptDebugCameraWaypoint": /* 800AC5A0 000A9500 38 00 00 00 */ li r0, 0 /* 800AC5A4 000A9504 90 03 00 04 */ stw r0, 4(r3) -/* 800AC5A8 000A9508 4E 80 00 20 */ blr +/* 800AC5A8 000A9508 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR17CScriptCoverPoint" "Visit__27TCastToPtr<13CPhysicsActor>FR17CScriptCoverPoint": /* 800AC5AC 000A950C 38 00 00 00 */ li r0, 0 /* 800AC5B0 000A9510 90 03 00 04 */ stw r0, 4(r3) -/* 800AC5B4 000A9514 4E 80 00 20 */ blr +/* 800AC5B4 000A9514 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR21CScriptCameraWaypoint" "Visit__27TCastToPtr<13CPhysicsActor>FR21CScriptCameraWaypoint": /* 800AC5B8 000A9518 38 00 00 00 */ li r0, 0 /* 800AC5BC 000A951C 90 03 00 04 */ stw r0, 4(r3) -/* 800AC5C0 000A9520 4E 80 00 20 */ blr +/* 800AC5C0 000A9520 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR24CScriptCameraPitchVolume" "Visit__27TCastToPtr<13CPhysicsActor>FR24CScriptCameraPitchVolume": /* 800AC5C4 000A9524 38 00 00 00 */ li r0, 0 /* 800AC5C8 000A9528 90 03 00 04 */ stw r0, 4(r3) -/* 800AC5CC 000A952C 4E 80 00 20 */ blr +/* 800AC5CC 000A952C 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR17CScriptCameraHint" "Visit__27TCastToPtr<13CPhysicsActor>FR17CScriptCameraHint": /* 800AC5D0 000A9530 38 00 00 00 */ li r0, 0 /* 800AC5D4 000A9534 90 03 00 04 */ stw r0, 4(r3) -/* 800AC5D8 000A9538 4E 80 00 20 */ blr +/* 800AC5D8 000A9538 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR18CScriptAiJumpPoint" "Visit__27TCastToPtr<13CPhysicsActor>FR18CScriptAiJumpPoint": /* 800AC5DC 000A953C 38 00 00 00 */ li r0, 0 /* 800AC5E0 000A9540 90 03 00 04 */ stw r0, 4(r3) -/* 800AC5E4 000A9544 4E 80 00 20 */ blr +/* 800AC5E4 000A9544 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR20CScriptActorKeyframe" "Visit__27TCastToPtr<13CPhysicsActor>FR20CScriptActorKeyframe": /* 800AC5E8 000A9548 38 00 00 00 */ li r0, 0 /* 800AC5EC 000A954C 90 03 00 04 */ stw r0, 4(r3) -/* 800AC5F0 000A9550 4E 80 00 20 */ blr +/* 800AC5F0 000A9550 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR12CScriptActor" "Visit__27TCastToPtr<13CPhysicsActor>FR12CScriptActor": /* 800AC5F4 000A9554 90 83 00 04 */ stw r4, 4(r3) -/* 800AC5F8 000A9558 4E 80 00 20 */ blr +/* 800AC5F8 000A9558 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR9CRepulsor" "Visit__27TCastToPtr<13CPhysicsActor>FR9CRepulsor": /* 800AC5FC 000A955C 38 00 00 00 */ li r0, 0 /* 800AC600 000A9560 90 03 00 04 */ stw r0, 4(r3) -/* 800AC604 000A9564 4E 80 00 20 */ blr +/* 800AC604 000A9564 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR7CPlayer" "Visit__27TCastToPtr<13CPhysicsActor>FR7CPlayer": /* 800AC608 000A9568 90 83 00 04 */ stw r4, 4(r3) -/* 800AC60C 000A956C 4E 80 00 20 */ blr +/* 800AC60C 000A956C 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR13CPhysicsActor" "Visit__27TCastToPtr<13CPhysicsActor>FR13CPhysicsActor": /* 800AC610 000A9570 90 83 00 04 */ stw r4, 4(r3) -/* 800AC614 000A9574 4E 80 00 20 */ blr +/* 800AC614 000A9574 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR3CAi" "Visit__27TCastToPtr<13CPhysicsActor>FR3CAi": /* 800AC618 000A9578 90 83 00 04 */ stw r4, 4(r3) -/* 800AC61C 000A957C 4E 80 00 20 */ blr +/* 800AC61C 000A957C 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR11CPathCamera" "Visit__27TCastToPtr<13CPhysicsActor>FR11CPathCamera": /* 800AC620 000A9580 38 00 00 00 */ li r0, 0 /* 800AC624 000A9584 90 03 00 04 */ stw r0, 4(r3) -/* 800AC628 000A9588 4E 80 00 20 */ blr +/* 800AC628 000A9588 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR18CMetroidPrimeRelay" "Visit__27TCastToPtr<13CPhysicsActor>FR18CMetroidPrimeRelay": /* 800AC62C 000A958C 38 00 00 00 */ li r0, 0 /* 800AC630 000A9590 90 03 00 04 */ stw r0, 4(r3) -/* 800AC634 000A9594 4E 80 00 20 */ blr +/* 800AC634 000A9594 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR19CHUDBillboardEffect" "Visit__27TCastToPtr<13CPhysicsActor>FR19CHUDBillboardEffect": /* 800AC638 000A9598 38 00 00 00 */ li r0, 0 /* 800AC63C 000A959C 90 03 00 04 */ stw r0, 4(r3) -/* 800AC640 000A95A0 4E 80 00 20 */ blr +/* 800AC640 000A95A0 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR15CGameProjectile" "Visit__27TCastToPtr<13CPhysicsActor>FR15CGameProjectile": /* 800AC644 000A95A4 38 00 00 00 */ li r0, 0 /* 800AC648 000A95A8 90 03 00 04 */ stw r0, 4(r3) -/* 800AC64C 000A95AC 4E 80 00 20 */ blr +/* 800AC64C 000A95AC 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR10CGameLight" "Visit__27TCastToPtr<13CPhysicsActor>FR10CGameLight": /* 800AC650 000A95B0 38 00 00 00 */ li r0, 0 /* 800AC654 000A95B4 90 03 00 04 */ stw r0, 4(r3) -/* 800AC658 000A95B8 4E 80 00 20 */ blr +/* 800AC658 000A95B8 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR11CGameCamera" "Visit__27TCastToPtr<13CPhysicsActor>FR11CGameCamera": /* 800AC65C 000A95BC 38 00 00 00 */ li r0, 0 /* 800AC660 000A95C0 90 03 00 04 */ stw r0, 4(r3) -/* 800AC664 000A95C4 4E 80 00 20 */ blr +/* 800AC664 000A95C4 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR10CFishCloud" "Visit__27TCastToPtr<13CPhysicsActor>FR10CFishCloud": /* 800AC668 000A95C8 38 00 00 00 */ li r0, 0 /* 800AC66C 000A95CC 90 03 00 04 */ stw r0, 4(r3) -/* 800AC670 000A95D0 4E 80 00 20 */ blr +/* 800AC670 000A95D0 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR18CFirstPersonCamera" "Visit__27TCastToPtr<13CPhysicsActor>FR18CFirstPersonCamera": /* 800AC674 000A95D4 38 00 00 00 */ li r0, 0 /* 800AC678 000A95D8 90 03 00 04 */ stw r0, 4(r3) -/* 800AC67C 000A95DC 4E 80 00 20 */ blr +/* 800AC67C 000A95DC 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR10CExplosion" "Visit__27TCastToPtr<13CPhysicsActor>FR10CExplosion": /* 800AC680 000A95E0 38 00 00 00 */ li r0, 0 /* 800AC684 000A95E4 90 03 00 04 */ stw r0, 4(r3) -/* 800AC688 000A95E8 4E 80 00 20 */ blr +/* 800AC688 000A95E8 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR7CEntity" "Visit__27TCastToPtr<13CPhysicsActor>FR7CEntity": /* 800AC68C 000A95EC 38 00 00 00 */ li r0, 0 /* 800AC690 000A95F0 90 03 00 04 */ stw r0, 4(r3) -/* 800AC694 000A95F4 4E 80 00 20 */ blr +/* 800AC694 000A95F4 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR17CEnergyProjectile" "Visit__27TCastToPtr<13CPhysicsActor>FR17CEnergyProjectile": /* 800AC698 000A95F8 38 00 00 00 */ li r0, 0 /* 800AC69C 000A95FC 90 03 00 04 */ stw r0, 4(r3) -/* 800AC6A0 000A9600 4E 80 00 20 */ blr +/* 800AC6A0 000A9600 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR16CDestroyableRock" "Visit__27TCastToPtr<13CPhysicsActor>FR16CDestroyableRock": /* 800AC6A4 000A9604 90 83 00 04 */ stw r4, 4(r3) -/* 800AC6A8 000A9608 4E 80 00 20 */ blr +/* 800AC6A8 000A9608 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR15CCollisionActor" "Visit__27TCastToPtr<13CPhysicsActor>FR15CCollisionActor": /* 800AC6AC 000A960C 90 83 00 04 */ stw r4, 4(r3) -/* 800AC6B0 000A9610 4E 80 00 20 */ blr +/* 800AC6B0 000A9610 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR16CCinematicCamera" "Visit__27TCastToPtr<13CPhysicsActor>FR16CCinematicCamera": /* 800AC6B4 000A9614 38 00 00 00 */ li r0, 0 /* 800AC6B8 000A9618 90 03 00 04 */ stw r0, 4(r3) -/* 800AC6BC 000A961C 4E 80 00 20 */ blr +/* 800AC6BC 000A961C 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR5CBomb" "Visit__27TCastToPtr<13CPhysicsActor>FR5CBomb": /* 800AC6C0 000A9620 38 00 00 00 */ li r0, 0 /* 800AC6C4 000A9624 90 03 00 04 */ stw r0, 4(r3) -/* 800AC6C8 000A9628 4E 80 00 20 */ blr +/* 800AC6C8 000A9628 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR11CBallCamera" "Visit__27TCastToPtr<13CPhysicsActor>FR11CBallCamera": /* 800AC6CC 000A962C 38 00 00 00 */ li r0, 0 /* 800AC6D0 000A9630 90 03 00 04 */ stw r0, 4(r3) -/* 800AC6D4 000A9634 4E 80 00 20 */ blr +/* 800AC6D4 000A9634 4E 80 00 20 */ blr .global "Visit__27TCastToPtr<13CPhysicsActor>FR6CActor" "Visit__27TCastToPtr<13CPhysicsActor>FR6CActor": /* 800AC6D8 000A9638 38 00 00 00 */ li r0, 0 /* 800AC6DC 000A963C 90 03 00 04 */ stw r0, 4(r3) -/* 800AC6E0 000A9640 4E 80 00 20 */ blr +/* 800AC6E0 000A9640 4E 80 00 20 */ blr .global "__ct__27TCastToPtr<13CPhysicsActor>FP7CEntity" "__ct__27TCastToPtr<13CPhysicsActor>FP7CEntity": @@ -16971,14 +16971,14 @@ lbl_800AC3E8: /* 800AC728 000A9688 81 83 00 00 */ lwz r12, 0(r3) /* 800AC72C 000A968C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800AC730 000A9690 7D 89 03 A6 */ mtctr r12 -/* 800AC734 000A9694 4E 80 04 21 */ bctrl +/* 800AC734 000A9694 4E 80 04 21 */ bctrl lbl_800AC738: /* 800AC738 000A9698 80 01 00 14 */ lwz r0, 0x14(r1) /* 800AC73C 000A969C 7F E3 FB 78 */ mr r3, r31 /* 800AC740 000A96A0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800AC744 000A96A4 7C 08 03 A6 */ mtlr r0 /* 800AC748 000A96A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800AC74C 000A96AC 4E 80 00 20 */ blr +/* 800AC74C 000A96AC 4E 80 00 20 */ blr .global "__ct__27TCastToPtr<13CPhysicsActor>FR7CEntity" "__ct__27TCastToPtr<13CPhysicsActor>FR7CEntity": @@ -17000,354 +17000,354 @@ lbl_800AC738: /* 800AC78C 000A96EC 81 83 00 00 */ lwz r12, 0(r3) /* 800AC790 000A96F0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800AC794 000A96F4 7D 89 03 A6 */ mtctr r12 -/* 800AC798 000A96F8 4E 80 04 21 */ bctrl +/* 800AC798 000A96F8 4E 80 04 21 */ bctrl /* 800AC79C 000A96FC 80 01 00 14 */ lwz r0, 0x14(r1) /* 800AC7A0 000A9700 7F E3 FB 78 */ mr r3, r31 /* 800AC7A4 000A9704 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800AC7A8 000A9708 7C 08 03 A6 */ mtlr r0 /* 800AC7AC 000A970C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800AC7B0 000A9710 4E 80 00 20 */ blr +/* 800AC7B0 000A9710 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR7CWeapon" "Visit__16TCastToPtr<3CAi>FR7CWeapon": /* 800AC7B4 000A9714 38 00 00 00 */ li r0, 0 /* 800AC7B8 000A9718 90 03 00 04 */ stw r0, 4(r3) -/* 800AC7BC 000A971C 4E 80 00 20 */ blr +/* 800AC7BC 000A971C 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR17CWallCrawlerSwarm" "Visit__16TCastToPtr<3CAi>FR17CWallCrawlerSwarm": /* 800AC7C0 000A9720 38 00 00 00 */ li r0, 0 /* 800AC7C4 000A9724 90 03 00 04 */ stw r0, 4(r3) -/* 800AC7C8 000A9728 4E 80 00 20 */ blr +/* 800AC7C8 000A9728 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR20CScriptSpindleCamera" "Visit__16TCastToPtr<3CAi>FR20CScriptSpindleCamera": /* 800AC7CC 000A972C 38 00 00 00 */ li r0, 0 /* 800AC7D0 000A9730 90 03 00 04 */ stw r0, 4(r3) -/* 800AC7D4 000A9734 4E 80 00 20 */ blr +/* 800AC7D4 000A9734 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR15CSnakeWeedSwarm" "Visit__16TCastToPtr<3CAi>FR15CSnakeWeedSwarm": /* 800AC7D8 000A9738 38 00 00 00 */ li r0, 0 /* 800AC7DC 000A973C 90 03 00 04 */ stw r0, 4(r3) -/* 800AC7E0 000A9740 4E 80 00 20 */ blr +/* 800AC7E0 000A9740 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR15CScriptWaypoint" "Visit__16TCastToPtr<3CAi>FR15CScriptWaypoint": /* 800AC7E4 000A9744 38 00 00 00 */ li r0, 0 /* 800AC7E8 000A9748 90 03 00 04 */ stw r0, 4(r3) -/* 800AC7EC 000A974C 4E 80 00 20 */ blr +/* 800AC7EC 000A974C 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR12CScriptWater" "Visit__16TCastToPtr<3CAi>FR12CScriptWater": /* 800AC7F0 000A9750 38 00 00 00 */ li r0, 0 /* 800AC7F4 000A9754 90 03 00 04 */ stw r0, 4(r3) -/* 800AC7F8 000A9758 4E 80 00 20 */ blr +/* 800AC7F8 000A9758 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR17CScriptVisorFlare" "Visit__16TCastToPtr<3CAi>FR17CScriptVisorFlare": /* 800AC7FC 000A975C 38 00 00 00 */ li r0, 0 /* 800AC800 000A9760 90 03 00 04 */ stw r0, 4(r3) -/* 800AC804 000A9764 4E 80 00 20 */ blr +/* 800AC804 000A9764 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR14CScriptTrigger" "Visit__16TCastToPtr<3CAi>FR14CScriptTrigger": /* 800AC808 000A9768 38 00 00 00 */ li r0, 0 /* 800AC80C 000A976C 90 03 00 04 */ stw r0, 4(r3) -/* 800AC810 000A9770 4E 80 00 20 */ blr +/* 800AC810 000A9770 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR12CScriptTimer" "Visit__16TCastToPtr<3CAi>FR12CScriptTimer": /* 800AC814 000A9774 38 00 00 00 */ li r0, 0 /* 800AC818 000A9778 90 03 00 04 */ stw r0, 4(r3) -/* 800AC81C 000A977C 4E 80 00 20 */ blr +/* 800AC81C 000A977C 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR10CTeamAiMgr" "Visit__16TCastToPtr<3CAi>FR10CTeamAiMgr": /* 800AC820 000A9780 38 00 00 00 */ li r0, 0 /* 800AC824 000A9784 90 03 00 04 */ stw r0, 4(r3) -/* 800AC828 000A9788 4E 80 00 20 */ blr +/* 800AC828 000A9788 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR21CScriptTargetingPoint" "Visit__16TCastToPtr<3CAi>FR21CScriptTargetingPoint": /* 800AC82C 000A978C 38 00 00 00 */ li r0, 0 /* 800AC830 000A9790 90 03 00 04 */ stw r0, 4(r3) -/* 800AC834 000A9794 4E 80 00 20 */ blr +/* 800AC834 000A9794 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR25CScriptSpiderBallWaypoint" "Visit__16TCastToPtr<3CAi>FR25CScriptSpiderBallWaypoint": /* 800AC838 000A9798 38 00 00 00 */ li r0, 0 /* 800AC83C 000A979C 90 03 00 04 */ stw r0, 4(r3) -/* 800AC840 000A97A0 4E 80 00 20 */ blr +/* 800AC840 000A97A0 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR34CScriptSpiderBallAttractionSurface" "Visit__16TCastToPtr<3CAi>FR34CScriptSpiderBallAttractionSurface": /* 800AC844 000A97A4 38 00 00 00 */ li r0, 0 /* 800AC848 000A97A8 90 03 00 04 */ stw r0, 4(r3) -/* 800AC84C 000A97AC 4E 80 00 20 */ blr +/* 800AC84C 000A97AC 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR22CScriptSpecialFunction" "Visit__16TCastToPtr<3CAi>FR22CScriptSpecialFunction": /* 800AC850 000A97B0 38 00 00 00 */ li r0, 0 /* 800AC854 000A97B4 90 03 00 04 */ stw r0, 4(r3) -/* 800AC858 000A97B8 4E 80 00 20 */ blr +/* 800AC858 000A97B8 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR17CScriptSpawnPoint" "Visit__16TCastToPtr<3CAi>FR17CScriptSpawnPoint": /* 800AC85C 000A97BC 38 00 00 00 */ li r0, 0 /* 800AC860 000A97C0 90 03 00 04 */ stw r0, 4(r3) -/* 800AC864 000A97C4 4E 80 00 20 */ blr +/* 800AC864 000A97C4 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR12CScriptSound" "Visit__16TCastToPtr<3CAi>FR12CScriptSound": /* 800AC868 000A97C8 38 00 00 00 */ li r0, 0 /* 800AC86C 000A97CC 90 03 00 04 */ stw r0, 4(r3) -/* 800AC870 000A97D0 4E 80 00 20 */ blr +/* 800AC870 000A97D0 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR20CScriptRoomAcoustics" "Visit__16TCastToPtr<3CAi>FR20CScriptRoomAcoustics": /* 800AC874 000A97D4 38 00 00 00 */ li r0, 0 /* 800AC878 000A97D8 90 03 00 04 */ stw r0, 4(r3) -/* 800AC87C 000A97DC 4E 80 00 20 */ blr +/* 800AC87C 000A97DC 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR22CScriptPointOfinterest" "Visit__16TCastToPtr<3CAi>FR22CScriptPointOfinterest": /* 800AC880 000A97E0 38 00 00 00 */ li r0, 0 /* 800AC884 000A97E4 90 03 00 04 */ stw r0, 4(r3) -/* 800AC888 000A97E8 4E 80 00 20 */ blr +/* 800AC888 000A97E8 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR17CScriptPlayerHint" "Visit__16TCastToPtr<3CAi>FR17CScriptPlayerHint": /* 800AC88C 000A97EC 38 00 00 00 */ li r0, 0 /* 800AC890 000A97F0 90 03 00 04 */ stw r0, 4(r3) -/* 800AC894 000A97F4 4E 80 00 20 */ blr +/* 800AC894 000A97F4 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR15CScriptPlatform" "Visit__16TCastToPtr<3CAi>FR15CScriptPlatform": /* 800AC898 000A97F8 38 00 00 00 */ li r0, 0 /* 800AC89C 000A97FC 90 03 00 04 */ stw r0, 4(r3) -/* 800AC8A0 000A9800 4E 80 00 20 */ blr +/* 800AC8A0 000A9800 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR13CScriptPickup" "Visit__16TCastToPtr<3CAi>FR13CScriptPickup": /* 800AC8A4 000A9804 38 00 00 00 */ li r0, 0 /* 800AC8A8 000A9808 90 03 00 04 */ stw r0, 4(r3) -/* 800AC8AC 000A980C 4E 80 00 20 */ blr +/* 800AC8AC 000A980C 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR15CScriptMazeNode" "Visit__16TCastToPtr<3CAi>FR15CScriptMazeNode": /* 800AC8B0 000A9810 38 00 00 00 */ li r0, 0 /* 800AC8B4 000A9814 90 03 00 04 */ stw r0, 4(r3) -/* 800AC8B8 000A9818 4E 80 00 20 */ blr +/* 800AC8B8 000A9818 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR16CScriptGunTurret" "Visit__16TCastToPtr<3CAi>FR16CScriptGunTurret": /* 800AC8BC 000A981C 38 00 00 00 */ li r0, 0 /* 800AC8C0 000A9820 90 03 00 04 */ stw r0, 4(r3) -/* 800AC8C4 000A9824 4E 80 00 20 */ blr +/* 800AC8C4 000A9824 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR19CScriptGrapplePoint" "Visit__16TCastToPtr<3CAi>FR19CScriptGrapplePoint": /* 800AC8C8 000A9828 38 00 00 00 */ li r0, 0 /* 800AC8CC 000A982C 90 03 00 04 */ stw r0, 4(r3) -/* 800AC8D0 000A9830 4E 80 00 20 */ blr +/* 800AC8D0 000A9830 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR13CScriptEffect" "Visit__16TCastToPtr<3CAi>FR13CScriptEffect": /* 800AC8D4 000A9834 38 00 00 00 */ li r0, 0 /* 800AC8D8 000A9838 90 03 00 04 */ stw r0, 4(r3) -/* 800AC8DC 000A983C 4E 80 00 20 */ blr +/* 800AC8DC 000A983C 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR11CScriptDoor" "Visit__16TCastToPtr<3CAi>FR11CScriptDoor": /* 800AC8E0 000A9840 38 00 00 00 */ li r0, 0 /* 800AC8E4 000A9844 90 03 00 04 */ stw r0, 4(r3) -/* 800AC8E8 000A9848 4E 80 00 20 */ blr +/* 800AC8E8 000A9848 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR11CScriptDock" "Visit__16TCastToPtr<3CAi>FR11CScriptDock": /* 800AC8EC 000A984C 38 00 00 00 */ li r0, 0 /* 800AC8F0 000A9850 90 03 00 04 */ stw r0, 4(r3) -/* 800AC8F4 000A9854 4E 80 00 20 */ blr +/* 800AC8F4 000A9854 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR18CScriptDistanceFog" "Visit__16TCastToPtr<3CAi>FR18CScriptDistanceFog": /* 800AC8F8 000A9858 38 00 00 00 */ li r0, 0 /* 800AC8FC 000A985C 90 03 00 04 */ stw r0, 4(r3) -/* 800AC900 000A9860 4E 80 00 20 */ blr +/* 800AC900 000A9860 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR26CScriptDebugCameraWaypoint" "Visit__16TCastToPtr<3CAi>FR26CScriptDebugCameraWaypoint": /* 800AC904 000A9864 38 00 00 00 */ li r0, 0 /* 800AC908 000A9868 90 03 00 04 */ stw r0, 4(r3) -/* 800AC90C 000A986C 4E 80 00 20 */ blr +/* 800AC90C 000A986C 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR17CScriptCoverPoint" "Visit__16TCastToPtr<3CAi>FR17CScriptCoverPoint": /* 800AC910 000A9870 38 00 00 00 */ li r0, 0 /* 800AC914 000A9874 90 03 00 04 */ stw r0, 4(r3) -/* 800AC918 000A9878 4E 80 00 20 */ blr +/* 800AC918 000A9878 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR21CScriptCameraWaypoint" "Visit__16TCastToPtr<3CAi>FR21CScriptCameraWaypoint": /* 800AC91C 000A987C 38 00 00 00 */ li r0, 0 /* 800AC920 000A9880 90 03 00 04 */ stw r0, 4(r3) -/* 800AC924 000A9884 4E 80 00 20 */ blr +/* 800AC924 000A9884 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR24CScriptCameraPitchVolume" "Visit__16TCastToPtr<3CAi>FR24CScriptCameraPitchVolume": /* 800AC928 000A9888 38 00 00 00 */ li r0, 0 /* 800AC92C 000A988C 90 03 00 04 */ stw r0, 4(r3) -/* 800AC930 000A9890 4E 80 00 20 */ blr +/* 800AC930 000A9890 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR17CScriptCameraHint" "Visit__16TCastToPtr<3CAi>FR17CScriptCameraHint": /* 800AC934 000A9894 38 00 00 00 */ li r0, 0 /* 800AC938 000A9898 90 03 00 04 */ stw r0, 4(r3) -/* 800AC93C 000A989C 4E 80 00 20 */ blr +/* 800AC93C 000A989C 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR18CScriptAiJumpPoint" "Visit__16TCastToPtr<3CAi>FR18CScriptAiJumpPoint": /* 800AC940 000A98A0 38 00 00 00 */ li r0, 0 /* 800AC944 000A98A4 90 03 00 04 */ stw r0, 4(r3) -/* 800AC948 000A98A8 4E 80 00 20 */ blr +/* 800AC948 000A98A8 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR20CScriptActorKeyframe" "Visit__16TCastToPtr<3CAi>FR20CScriptActorKeyframe": /* 800AC94C 000A98AC 38 00 00 00 */ li r0, 0 /* 800AC950 000A98B0 90 03 00 04 */ stw r0, 4(r3) -/* 800AC954 000A98B4 4E 80 00 20 */ blr +/* 800AC954 000A98B4 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR12CScriptActor" "Visit__16TCastToPtr<3CAi>FR12CScriptActor": /* 800AC958 000A98B8 38 00 00 00 */ li r0, 0 /* 800AC95C 000A98BC 90 03 00 04 */ stw r0, 4(r3) -/* 800AC960 000A98C0 4E 80 00 20 */ blr +/* 800AC960 000A98C0 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR9CRepulsor" "Visit__16TCastToPtr<3CAi>FR9CRepulsor": /* 800AC964 000A98C4 38 00 00 00 */ li r0, 0 /* 800AC968 000A98C8 90 03 00 04 */ stw r0, 4(r3) -/* 800AC96C 000A98CC 4E 80 00 20 */ blr +/* 800AC96C 000A98CC 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR7CPlayer" "Visit__16TCastToPtr<3CAi>FR7CPlayer": /* 800AC970 000A98D0 38 00 00 00 */ li r0, 0 /* 800AC974 000A98D4 90 03 00 04 */ stw r0, 4(r3) -/* 800AC978 000A98D8 4E 80 00 20 */ blr +/* 800AC978 000A98D8 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR13CPhysicsActor" "Visit__16TCastToPtr<3CAi>FR13CPhysicsActor": /* 800AC97C 000A98DC 38 00 00 00 */ li r0, 0 /* 800AC980 000A98E0 90 03 00 04 */ stw r0, 4(r3) -/* 800AC984 000A98E4 4E 80 00 20 */ blr +/* 800AC984 000A98E4 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR3CAi" "Visit__16TCastToPtr<3CAi>FR3CAi": /* 800AC988 000A98E8 90 83 00 04 */ stw r4, 4(r3) -/* 800AC98C 000A98EC 4E 80 00 20 */ blr +/* 800AC98C 000A98EC 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR11CPathCamera" "Visit__16TCastToPtr<3CAi>FR11CPathCamera": /* 800AC990 000A98F0 38 00 00 00 */ li r0, 0 /* 800AC994 000A98F4 90 03 00 04 */ stw r0, 4(r3) -/* 800AC998 000A98F8 4E 80 00 20 */ blr +/* 800AC998 000A98F8 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR18CMetroidPrimeRelay" "Visit__16TCastToPtr<3CAi>FR18CMetroidPrimeRelay": /* 800AC99C 000A98FC 38 00 00 00 */ li r0, 0 /* 800AC9A0 000A9900 90 03 00 04 */ stw r0, 4(r3) -/* 800AC9A4 000A9904 4E 80 00 20 */ blr +/* 800AC9A4 000A9904 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR19CHUDBillboardEffect" "Visit__16TCastToPtr<3CAi>FR19CHUDBillboardEffect": /* 800AC9A8 000A9908 38 00 00 00 */ li r0, 0 /* 800AC9AC 000A990C 90 03 00 04 */ stw r0, 4(r3) -/* 800AC9B0 000A9910 4E 80 00 20 */ blr +/* 800AC9B0 000A9910 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR15CGameProjectile" "Visit__16TCastToPtr<3CAi>FR15CGameProjectile": /* 800AC9B4 000A9914 38 00 00 00 */ li r0, 0 /* 800AC9B8 000A9918 90 03 00 04 */ stw r0, 4(r3) -/* 800AC9BC 000A991C 4E 80 00 20 */ blr +/* 800AC9BC 000A991C 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR10CGameLight" "Visit__16TCastToPtr<3CAi>FR10CGameLight": /* 800AC9C0 000A9920 38 00 00 00 */ li r0, 0 /* 800AC9C4 000A9924 90 03 00 04 */ stw r0, 4(r3) -/* 800AC9C8 000A9928 4E 80 00 20 */ blr +/* 800AC9C8 000A9928 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR11CGameCamera" "Visit__16TCastToPtr<3CAi>FR11CGameCamera": /* 800AC9CC 000A992C 38 00 00 00 */ li r0, 0 /* 800AC9D0 000A9930 90 03 00 04 */ stw r0, 4(r3) -/* 800AC9D4 000A9934 4E 80 00 20 */ blr +/* 800AC9D4 000A9934 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR10CFishCloud" "Visit__16TCastToPtr<3CAi>FR10CFishCloud": /* 800AC9D8 000A9938 38 00 00 00 */ li r0, 0 /* 800AC9DC 000A993C 90 03 00 04 */ stw r0, 4(r3) -/* 800AC9E0 000A9940 4E 80 00 20 */ blr +/* 800AC9E0 000A9940 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR18CFirstPersonCamera" "Visit__16TCastToPtr<3CAi>FR18CFirstPersonCamera": /* 800AC9E4 000A9944 38 00 00 00 */ li r0, 0 /* 800AC9E8 000A9948 90 03 00 04 */ stw r0, 4(r3) -/* 800AC9EC 000A994C 4E 80 00 20 */ blr +/* 800AC9EC 000A994C 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR10CExplosion" "Visit__16TCastToPtr<3CAi>FR10CExplosion": /* 800AC9F0 000A9950 38 00 00 00 */ li r0, 0 /* 800AC9F4 000A9954 90 03 00 04 */ stw r0, 4(r3) -/* 800AC9F8 000A9958 4E 80 00 20 */ blr +/* 800AC9F8 000A9958 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR7CEntity" "Visit__16TCastToPtr<3CAi>FR7CEntity": /* 800AC9FC 000A995C 38 00 00 00 */ li r0, 0 /* 800ACA00 000A9960 90 03 00 04 */ stw r0, 4(r3) -/* 800ACA04 000A9964 4E 80 00 20 */ blr +/* 800ACA04 000A9964 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR17CEnergyProjectile" "Visit__16TCastToPtr<3CAi>FR17CEnergyProjectile": /* 800ACA08 000A9968 38 00 00 00 */ li r0, 0 /* 800ACA0C 000A996C 90 03 00 04 */ stw r0, 4(r3) -/* 800ACA10 000A9970 4E 80 00 20 */ blr +/* 800ACA10 000A9970 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR16CDestroyableRock" "Visit__16TCastToPtr<3CAi>FR16CDestroyableRock": /* 800ACA14 000A9974 38 00 00 00 */ li r0, 0 /* 800ACA18 000A9978 90 03 00 04 */ stw r0, 4(r3) -/* 800ACA1C 000A997C 4E 80 00 20 */ blr +/* 800ACA1C 000A997C 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR15CCollisionActor" "Visit__16TCastToPtr<3CAi>FR15CCollisionActor": /* 800ACA20 000A9980 38 00 00 00 */ li r0, 0 /* 800ACA24 000A9984 90 03 00 04 */ stw r0, 4(r3) -/* 800ACA28 000A9988 4E 80 00 20 */ blr +/* 800ACA28 000A9988 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR16CCinematicCamera" "Visit__16TCastToPtr<3CAi>FR16CCinematicCamera": /* 800ACA2C 000A998C 38 00 00 00 */ li r0, 0 /* 800ACA30 000A9990 90 03 00 04 */ stw r0, 4(r3) -/* 800ACA34 000A9994 4E 80 00 20 */ blr +/* 800ACA34 000A9994 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR5CBomb" "Visit__16TCastToPtr<3CAi>FR5CBomb": /* 800ACA38 000A9998 38 00 00 00 */ li r0, 0 /* 800ACA3C 000A999C 90 03 00 04 */ stw r0, 4(r3) -/* 800ACA40 000A99A0 4E 80 00 20 */ blr +/* 800ACA40 000A99A0 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR11CBallCamera" "Visit__16TCastToPtr<3CAi>FR11CBallCamera": /* 800ACA44 000A99A4 38 00 00 00 */ li r0, 0 /* 800ACA48 000A99A8 90 03 00 04 */ stw r0, 4(r3) -/* 800ACA4C 000A99AC 4E 80 00 20 */ blr +/* 800ACA4C 000A99AC 4E 80 00 20 */ blr .global "Visit__16TCastToPtr<3CAi>FR6CActor" "Visit__16TCastToPtr<3CAi>FR6CActor": /* 800ACA50 000A99B0 38 00 00 00 */ li r0, 0 /* 800ACA54 000A99B4 90 03 00 04 */ stw r0, 4(r3) -/* 800ACA58 000A99B8 4E 80 00 20 */ blr +/* 800ACA58 000A99B8 4E 80 00 20 */ blr .global "__ct__16TCastToPtr<3CAi>FP7CEntity" "__ct__16TCastToPtr<3CAi>FP7CEntity": @@ -17371,14 +17371,14 @@ lbl_800AC738: /* 800ACAA0 000A9A00 81 83 00 00 */ lwz r12, 0(r3) /* 800ACAA4 000A9A04 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800ACAA8 000A9A08 7D 89 03 A6 */ mtctr r12 -/* 800ACAAC 000A9A0C 4E 80 04 21 */ bctrl +/* 800ACAAC 000A9A0C 4E 80 04 21 */ bctrl lbl_800ACAB0: /* 800ACAB0 000A9A10 80 01 00 14 */ lwz r0, 0x14(r1) /* 800ACAB4 000A9A14 7F E3 FB 78 */ mr r3, r31 /* 800ACAB8 000A9A18 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800ACABC 000A9A1C 7C 08 03 A6 */ mtlr r0 /* 800ACAC0 000A9A20 38 21 00 10 */ addi r1, r1, 0x10 -/* 800ACAC4 000A9A24 4E 80 00 20 */ blr +/* 800ACAC4 000A9A24 4E 80 00 20 */ blr .global "__ct__16TCastToPtr<10CPatterned>FR7CEntity" "__ct__16TCastToPtr<10CPatterned>FR7CEntity": @@ -17400,354 +17400,354 @@ lbl_800ACAB0: /* 800ACB04 000A9A64 81 83 00 00 */ lwz r12, 0(r3) /* 800ACB08 000A9A68 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800ACB0C 000A9A6C 7D 89 03 A6 */ mtctr r12 -/* 800ACB10 000A9A70 4E 80 04 21 */ bctrl +/* 800ACB10 000A9A70 4E 80 04 21 */ bctrl /* 800ACB14 000A9A74 80 01 00 14 */ lwz r0, 0x14(r1) /* 800ACB18 000A9A78 7F E3 FB 78 */ mr r3, r31 /* 800ACB1C 000A9A7C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800ACB20 000A9A80 7C 08 03 A6 */ mtlr r0 /* 800ACB24 000A9A84 38 21 00 10 */ addi r1, r1, 0x10 -/* 800ACB28 000A9A88 4E 80 00 20 */ blr +/* 800ACB28 000A9A88 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR7CWeapon" "Visit__25TCastToPtr<11CPathCamera>FR7CWeapon": /* 800ACB2C 000A9A8C 38 00 00 00 */ li r0, 0 /* 800ACB30 000A9A90 90 03 00 04 */ stw r0, 4(r3) -/* 800ACB34 000A9A94 4E 80 00 20 */ blr +/* 800ACB34 000A9A94 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR17CWallCrawlerSwarm" "Visit__25TCastToPtr<11CPathCamera>FR17CWallCrawlerSwarm": /* 800ACB38 000A9A98 38 00 00 00 */ li r0, 0 /* 800ACB3C 000A9A9C 90 03 00 04 */ stw r0, 4(r3) -/* 800ACB40 000A9AA0 4E 80 00 20 */ blr +/* 800ACB40 000A9AA0 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR20CScriptSpindleCamera" "Visit__25TCastToPtr<11CPathCamera>FR20CScriptSpindleCamera": /* 800ACB44 000A9AA4 38 00 00 00 */ li r0, 0 /* 800ACB48 000A9AA8 90 03 00 04 */ stw r0, 4(r3) -/* 800ACB4C 000A9AAC 4E 80 00 20 */ blr +/* 800ACB4C 000A9AAC 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR15CSnakeWeedSwarm" "Visit__25TCastToPtr<11CPathCamera>FR15CSnakeWeedSwarm": /* 800ACB50 000A9AB0 38 00 00 00 */ li r0, 0 /* 800ACB54 000A9AB4 90 03 00 04 */ stw r0, 4(r3) -/* 800ACB58 000A9AB8 4E 80 00 20 */ blr +/* 800ACB58 000A9AB8 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR15CScriptWaypoint" "Visit__25TCastToPtr<11CPathCamera>FR15CScriptWaypoint": /* 800ACB5C 000A9ABC 38 00 00 00 */ li r0, 0 /* 800ACB60 000A9AC0 90 03 00 04 */ stw r0, 4(r3) -/* 800ACB64 000A9AC4 4E 80 00 20 */ blr +/* 800ACB64 000A9AC4 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR12CScriptWater" "Visit__25TCastToPtr<11CPathCamera>FR12CScriptWater": /* 800ACB68 000A9AC8 38 00 00 00 */ li r0, 0 /* 800ACB6C 000A9ACC 90 03 00 04 */ stw r0, 4(r3) -/* 800ACB70 000A9AD0 4E 80 00 20 */ blr +/* 800ACB70 000A9AD0 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR17CScriptVisorFlare" "Visit__25TCastToPtr<11CPathCamera>FR17CScriptVisorFlare": /* 800ACB74 000A9AD4 38 00 00 00 */ li r0, 0 /* 800ACB78 000A9AD8 90 03 00 04 */ stw r0, 4(r3) -/* 800ACB7C 000A9ADC 4E 80 00 20 */ blr +/* 800ACB7C 000A9ADC 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR14CScriptTrigger" "Visit__25TCastToPtr<11CPathCamera>FR14CScriptTrigger": /* 800ACB80 000A9AE0 38 00 00 00 */ li r0, 0 /* 800ACB84 000A9AE4 90 03 00 04 */ stw r0, 4(r3) -/* 800ACB88 000A9AE8 4E 80 00 20 */ blr +/* 800ACB88 000A9AE8 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR12CScriptTimer" "Visit__25TCastToPtr<11CPathCamera>FR12CScriptTimer": /* 800ACB8C 000A9AEC 38 00 00 00 */ li r0, 0 /* 800ACB90 000A9AF0 90 03 00 04 */ stw r0, 4(r3) -/* 800ACB94 000A9AF4 4E 80 00 20 */ blr +/* 800ACB94 000A9AF4 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR10CTeamAiMgr" "Visit__25TCastToPtr<11CPathCamera>FR10CTeamAiMgr": /* 800ACB98 000A9AF8 38 00 00 00 */ li r0, 0 /* 800ACB9C 000A9AFC 90 03 00 04 */ stw r0, 4(r3) -/* 800ACBA0 000A9B00 4E 80 00 20 */ blr +/* 800ACBA0 000A9B00 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR21CScriptTargetingPoint" "Visit__25TCastToPtr<11CPathCamera>FR21CScriptTargetingPoint": /* 800ACBA4 000A9B04 38 00 00 00 */ li r0, 0 /* 800ACBA8 000A9B08 90 03 00 04 */ stw r0, 4(r3) -/* 800ACBAC 000A9B0C 4E 80 00 20 */ blr +/* 800ACBAC 000A9B0C 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR25CScriptSpiderBallWaypoint" "Visit__25TCastToPtr<11CPathCamera>FR25CScriptSpiderBallWaypoint": /* 800ACBB0 000A9B10 38 00 00 00 */ li r0, 0 /* 800ACBB4 000A9B14 90 03 00 04 */ stw r0, 4(r3) -/* 800ACBB8 000A9B18 4E 80 00 20 */ blr +/* 800ACBB8 000A9B18 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR34CScriptSpiderBallAttractionSurface" "Visit__25TCastToPtr<11CPathCamera>FR34CScriptSpiderBallAttractionSurface": /* 800ACBBC 000A9B1C 38 00 00 00 */ li r0, 0 /* 800ACBC0 000A9B20 90 03 00 04 */ stw r0, 4(r3) -/* 800ACBC4 000A9B24 4E 80 00 20 */ blr +/* 800ACBC4 000A9B24 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR22CScriptSpecialFunction" "Visit__25TCastToPtr<11CPathCamera>FR22CScriptSpecialFunction": /* 800ACBC8 000A9B28 38 00 00 00 */ li r0, 0 /* 800ACBCC 000A9B2C 90 03 00 04 */ stw r0, 4(r3) -/* 800ACBD0 000A9B30 4E 80 00 20 */ blr +/* 800ACBD0 000A9B30 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR17CScriptSpawnPoint" "Visit__25TCastToPtr<11CPathCamera>FR17CScriptSpawnPoint": /* 800ACBD4 000A9B34 38 00 00 00 */ li r0, 0 /* 800ACBD8 000A9B38 90 03 00 04 */ stw r0, 4(r3) -/* 800ACBDC 000A9B3C 4E 80 00 20 */ blr +/* 800ACBDC 000A9B3C 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR12CScriptSound" "Visit__25TCastToPtr<11CPathCamera>FR12CScriptSound": /* 800ACBE0 000A9B40 38 00 00 00 */ li r0, 0 /* 800ACBE4 000A9B44 90 03 00 04 */ stw r0, 4(r3) -/* 800ACBE8 000A9B48 4E 80 00 20 */ blr +/* 800ACBE8 000A9B48 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR20CScriptRoomAcoustics" "Visit__25TCastToPtr<11CPathCamera>FR20CScriptRoomAcoustics": /* 800ACBEC 000A9B4C 38 00 00 00 */ li r0, 0 /* 800ACBF0 000A9B50 90 03 00 04 */ stw r0, 4(r3) -/* 800ACBF4 000A9B54 4E 80 00 20 */ blr +/* 800ACBF4 000A9B54 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR22CScriptPointOfinterest" "Visit__25TCastToPtr<11CPathCamera>FR22CScriptPointOfinterest": /* 800ACBF8 000A9B58 38 00 00 00 */ li r0, 0 /* 800ACBFC 000A9B5C 90 03 00 04 */ stw r0, 4(r3) -/* 800ACC00 000A9B60 4E 80 00 20 */ blr +/* 800ACC00 000A9B60 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR17CScriptPlayerHint" "Visit__25TCastToPtr<11CPathCamera>FR17CScriptPlayerHint": /* 800ACC04 000A9B64 38 00 00 00 */ li r0, 0 /* 800ACC08 000A9B68 90 03 00 04 */ stw r0, 4(r3) -/* 800ACC0C 000A9B6C 4E 80 00 20 */ blr +/* 800ACC0C 000A9B6C 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR15CScriptPlatform" "Visit__25TCastToPtr<11CPathCamera>FR15CScriptPlatform": /* 800ACC10 000A9B70 38 00 00 00 */ li r0, 0 /* 800ACC14 000A9B74 90 03 00 04 */ stw r0, 4(r3) -/* 800ACC18 000A9B78 4E 80 00 20 */ blr +/* 800ACC18 000A9B78 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR13CScriptPickup" "Visit__25TCastToPtr<11CPathCamera>FR13CScriptPickup": /* 800ACC1C 000A9B7C 38 00 00 00 */ li r0, 0 /* 800ACC20 000A9B80 90 03 00 04 */ stw r0, 4(r3) -/* 800ACC24 000A9B84 4E 80 00 20 */ blr +/* 800ACC24 000A9B84 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR15CScriptMazeNode" "Visit__25TCastToPtr<11CPathCamera>FR15CScriptMazeNode": /* 800ACC28 000A9B88 38 00 00 00 */ li r0, 0 /* 800ACC2C 000A9B8C 90 03 00 04 */ stw r0, 4(r3) -/* 800ACC30 000A9B90 4E 80 00 20 */ blr +/* 800ACC30 000A9B90 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR16CScriptGunTurret" "Visit__25TCastToPtr<11CPathCamera>FR16CScriptGunTurret": /* 800ACC34 000A9B94 38 00 00 00 */ li r0, 0 /* 800ACC38 000A9B98 90 03 00 04 */ stw r0, 4(r3) -/* 800ACC3C 000A9B9C 4E 80 00 20 */ blr +/* 800ACC3C 000A9B9C 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR19CScriptGrapplePoint" "Visit__25TCastToPtr<11CPathCamera>FR19CScriptGrapplePoint": /* 800ACC40 000A9BA0 38 00 00 00 */ li r0, 0 /* 800ACC44 000A9BA4 90 03 00 04 */ stw r0, 4(r3) -/* 800ACC48 000A9BA8 4E 80 00 20 */ blr +/* 800ACC48 000A9BA8 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR13CScriptEffect" "Visit__25TCastToPtr<11CPathCamera>FR13CScriptEffect": /* 800ACC4C 000A9BAC 38 00 00 00 */ li r0, 0 /* 800ACC50 000A9BB0 90 03 00 04 */ stw r0, 4(r3) -/* 800ACC54 000A9BB4 4E 80 00 20 */ blr +/* 800ACC54 000A9BB4 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR11CScriptDoor" "Visit__25TCastToPtr<11CPathCamera>FR11CScriptDoor": /* 800ACC58 000A9BB8 38 00 00 00 */ li r0, 0 /* 800ACC5C 000A9BBC 90 03 00 04 */ stw r0, 4(r3) -/* 800ACC60 000A9BC0 4E 80 00 20 */ blr +/* 800ACC60 000A9BC0 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR11CScriptDock" "Visit__25TCastToPtr<11CPathCamera>FR11CScriptDock": /* 800ACC64 000A9BC4 38 00 00 00 */ li r0, 0 /* 800ACC68 000A9BC8 90 03 00 04 */ stw r0, 4(r3) -/* 800ACC6C 000A9BCC 4E 80 00 20 */ blr +/* 800ACC6C 000A9BCC 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR18CScriptDistanceFog" "Visit__25TCastToPtr<11CPathCamera>FR18CScriptDistanceFog": /* 800ACC70 000A9BD0 38 00 00 00 */ li r0, 0 /* 800ACC74 000A9BD4 90 03 00 04 */ stw r0, 4(r3) -/* 800ACC78 000A9BD8 4E 80 00 20 */ blr +/* 800ACC78 000A9BD8 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR26CScriptDebugCameraWaypoint" "Visit__25TCastToPtr<11CPathCamera>FR26CScriptDebugCameraWaypoint": /* 800ACC7C 000A9BDC 38 00 00 00 */ li r0, 0 /* 800ACC80 000A9BE0 90 03 00 04 */ stw r0, 4(r3) -/* 800ACC84 000A9BE4 4E 80 00 20 */ blr +/* 800ACC84 000A9BE4 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR17CScriptCoverPoint" "Visit__25TCastToPtr<11CPathCamera>FR17CScriptCoverPoint": /* 800ACC88 000A9BE8 38 00 00 00 */ li r0, 0 /* 800ACC8C 000A9BEC 90 03 00 04 */ stw r0, 4(r3) -/* 800ACC90 000A9BF0 4E 80 00 20 */ blr +/* 800ACC90 000A9BF0 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR21CScriptCameraWaypoint" "Visit__25TCastToPtr<11CPathCamera>FR21CScriptCameraWaypoint": /* 800ACC94 000A9BF4 38 00 00 00 */ li r0, 0 /* 800ACC98 000A9BF8 90 03 00 04 */ stw r0, 4(r3) -/* 800ACC9C 000A9BFC 4E 80 00 20 */ blr +/* 800ACC9C 000A9BFC 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR24CScriptCameraPitchVolume" "Visit__25TCastToPtr<11CPathCamera>FR24CScriptCameraPitchVolume": /* 800ACCA0 000A9C00 38 00 00 00 */ li r0, 0 /* 800ACCA4 000A9C04 90 03 00 04 */ stw r0, 4(r3) -/* 800ACCA8 000A9C08 4E 80 00 20 */ blr +/* 800ACCA8 000A9C08 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR17CScriptCameraHint" "Visit__25TCastToPtr<11CPathCamera>FR17CScriptCameraHint": /* 800ACCAC 000A9C0C 38 00 00 00 */ li r0, 0 /* 800ACCB0 000A9C10 90 03 00 04 */ stw r0, 4(r3) -/* 800ACCB4 000A9C14 4E 80 00 20 */ blr +/* 800ACCB4 000A9C14 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR18CScriptAiJumpPoint" "Visit__25TCastToPtr<11CPathCamera>FR18CScriptAiJumpPoint": /* 800ACCB8 000A9C18 38 00 00 00 */ li r0, 0 /* 800ACCBC 000A9C1C 90 03 00 04 */ stw r0, 4(r3) -/* 800ACCC0 000A9C20 4E 80 00 20 */ blr +/* 800ACCC0 000A9C20 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR20CScriptActorKeyframe" "Visit__25TCastToPtr<11CPathCamera>FR20CScriptActorKeyframe": /* 800ACCC4 000A9C24 38 00 00 00 */ li r0, 0 /* 800ACCC8 000A9C28 90 03 00 04 */ stw r0, 4(r3) -/* 800ACCCC 000A9C2C 4E 80 00 20 */ blr +/* 800ACCCC 000A9C2C 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR12CScriptActor" "Visit__25TCastToPtr<11CPathCamera>FR12CScriptActor": /* 800ACCD0 000A9C30 38 00 00 00 */ li r0, 0 /* 800ACCD4 000A9C34 90 03 00 04 */ stw r0, 4(r3) -/* 800ACCD8 000A9C38 4E 80 00 20 */ blr +/* 800ACCD8 000A9C38 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR9CRepulsor" "Visit__25TCastToPtr<11CPathCamera>FR9CRepulsor": /* 800ACCDC 000A9C3C 38 00 00 00 */ li r0, 0 /* 800ACCE0 000A9C40 90 03 00 04 */ stw r0, 4(r3) -/* 800ACCE4 000A9C44 4E 80 00 20 */ blr +/* 800ACCE4 000A9C44 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR7CPlayer" "Visit__25TCastToPtr<11CPathCamera>FR7CPlayer": /* 800ACCE8 000A9C48 38 00 00 00 */ li r0, 0 /* 800ACCEC 000A9C4C 90 03 00 04 */ stw r0, 4(r3) -/* 800ACCF0 000A9C50 4E 80 00 20 */ blr +/* 800ACCF0 000A9C50 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR13CPhysicsActor" "Visit__25TCastToPtr<11CPathCamera>FR13CPhysicsActor": /* 800ACCF4 000A9C54 38 00 00 00 */ li r0, 0 /* 800ACCF8 000A9C58 90 03 00 04 */ stw r0, 4(r3) -/* 800ACCFC 000A9C5C 4E 80 00 20 */ blr +/* 800ACCFC 000A9C5C 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR3CAi" "Visit__25TCastToPtr<11CPathCamera>FR3CAi": /* 800ACD00 000A9C60 38 00 00 00 */ li r0, 0 /* 800ACD04 000A9C64 90 03 00 04 */ stw r0, 4(r3) -/* 800ACD08 000A9C68 4E 80 00 20 */ blr +/* 800ACD08 000A9C68 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR11CPathCamera" "Visit__25TCastToPtr<11CPathCamera>FR11CPathCamera": /* 800ACD0C 000A9C6C 90 83 00 04 */ stw r4, 4(r3) -/* 800ACD10 000A9C70 4E 80 00 20 */ blr +/* 800ACD10 000A9C70 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR18CMetroidPrimeRelay" "Visit__25TCastToPtr<11CPathCamera>FR18CMetroidPrimeRelay": /* 800ACD14 000A9C74 38 00 00 00 */ li r0, 0 /* 800ACD18 000A9C78 90 03 00 04 */ stw r0, 4(r3) -/* 800ACD1C 000A9C7C 4E 80 00 20 */ blr +/* 800ACD1C 000A9C7C 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR19CHUDBillboardEffect" "Visit__25TCastToPtr<11CPathCamera>FR19CHUDBillboardEffect": /* 800ACD20 000A9C80 38 00 00 00 */ li r0, 0 /* 800ACD24 000A9C84 90 03 00 04 */ stw r0, 4(r3) -/* 800ACD28 000A9C88 4E 80 00 20 */ blr +/* 800ACD28 000A9C88 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR15CGameProjectile" "Visit__25TCastToPtr<11CPathCamera>FR15CGameProjectile": /* 800ACD2C 000A9C8C 38 00 00 00 */ li r0, 0 /* 800ACD30 000A9C90 90 03 00 04 */ stw r0, 4(r3) -/* 800ACD34 000A9C94 4E 80 00 20 */ blr +/* 800ACD34 000A9C94 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR10CGameLight" "Visit__25TCastToPtr<11CPathCamera>FR10CGameLight": /* 800ACD38 000A9C98 38 00 00 00 */ li r0, 0 /* 800ACD3C 000A9C9C 90 03 00 04 */ stw r0, 4(r3) -/* 800ACD40 000A9CA0 4E 80 00 20 */ blr +/* 800ACD40 000A9CA0 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR11CGameCamera" "Visit__25TCastToPtr<11CPathCamera>FR11CGameCamera": /* 800ACD44 000A9CA4 38 00 00 00 */ li r0, 0 /* 800ACD48 000A9CA8 90 03 00 04 */ stw r0, 4(r3) -/* 800ACD4C 000A9CAC 4E 80 00 20 */ blr +/* 800ACD4C 000A9CAC 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR10CFishCloud" "Visit__25TCastToPtr<11CPathCamera>FR10CFishCloud": /* 800ACD50 000A9CB0 38 00 00 00 */ li r0, 0 /* 800ACD54 000A9CB4 90 03 00 04 */ stw r0, 4(r3) -/* 800ACD58 000A9CB8 4E 80 00 20 */ blr +/* 800ACD58 000A9CB8 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR18CFirstPersonCamera" "Visit__25TCastToPtr<11CPathCamera>FR18CFirstPersonCamera": /* 800ACD5C 000A9CBC 38 00 00 00 */ li r0, 0 /* 800ACD60 000A9CC0 90 03 00 04 */ stw r0, 4(r3) -/* 800ACD64 000A9CC4 4E 80 00 20 */ blr +/* 800ACD64 000A9CC4 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR10CExplosion" "Visit__25TCastToPtr<11CPathCamera>FR10CExplosion": /* 800ACD68 000A9CC8 38 00 00 00 */ li r0, 0 /* 800ACD6C 000A9CCC 90 03 00 04 */ stw r0, 4(r3) -/* 800ACD70 000A9CD0 4E 80 00 20 */ blr +/* 800ACD70 000A9CD0 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR7CEntity" "Visit__25TCastToPtr<11CPathCamera>FR7CEntity": /* 800ACD74 000A9CD4 38 00 00 00 */ li r0, 0 /* 800ACD78 000A9CD8 90 03 00 04 */ stw r0, 4(r3) -/* 800ACD7C 000A9CDC 4E 80 00 20 */ blr +/* 800ACD7C 000A9CDC 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR17CEnergyProjectile" "Visit__25TCastToPtr<11CPathCamera>FR17CEnergyProjectile": /* 800ACD80 000A9CE0 38 00 00 00 */ li r0, 0 /* 800ACD84 000A9CE4 90 03 00 04 */ stw r0, 4(r3) -/* 800ACD88 000A9CE8 4E 80 00 20 */ blr +/* 800ACD88 000A9CE8 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR16CDestroyableRock" "Visit__25TCastToPtr<11CPathCamera>FR16CDestroyableRock": /* 800ACD8C 000A9CEC 38 00 00 00 */ li r0, 0 /* 800ACD90 000A9CF0 90 03 00 04 */ stw r0, 4(r3) -/* 800ACD94 000A9CF4 4E 80 00 20 */ blr +/* 800ACD94 000A9CF4 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR15CCollisionActor" "Visit__25TCastToPtr<11CPathCamera>FR15CCollisionActor": /* 800ACD98 000A9CF8 38 00 00 00 */ li r0, 0 /* 800ACD9C 000A9CFC 90 03 00 04 */ stw r0, 4(r3) -/* 800ACDA0 000A9D00 4E 80 00 20 */ blr +/* 800ACDA0 000A9D00 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR16CCinematicCamera" "Visit__25TCastToPtr<11CPathCamera>FR16CCinematicCamera": /* 800ACDA4 000A9D04 38 00 00 00 */ li r0, 0 /* 800ACDA8 000A9D08 90 03 00 04 */ stw r0, 4(r3) -/* 800ACDAC 000A9D0C 4E 80 00 20 */ blr +/* 800ACDAC 000A9D0C 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR5CBomb" "Visit__25TCastToPtr<11CPathCamera>FR5CBomb": /* 800ACDB0 000A9D10 38 00 00 00 */ li r0, 0 /* 800ACDB4 000A9D14 90 03 00 04 */ stw r0, 4(r3) -/* 800ACDB8 000A9D18 4E 80 00 20 */ blr +/* 800ACDB8 000A9D18 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR11CBallCamera" "Visit__25TCastToPtr<11CPathCamera>FR11CBallCamera": /* 800ACDBC 000A9D1C 38 00 00 00 */ li r0, 0 /* 800ACDC0 000A9D20 90 03 00 04 */ stw r0, 4(r3) -/* 800ACDC4 000A9D24 4E 80 00 20 */ blr +/* 800ACDC4 000A9D24 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CPathCamera>FR6CActor" "Visit__25TCastToPtr<11CPathCamera>FR6CActor": /* 800ACDC8 000A9D28 38 00 00 00 */ li r0, 0 /* 800ACDCC 000A9D2C 90 03 00 04 */ stw r0, 4(r3) -/* 800ACDD0 000A9D30 4E 80 00 20 */ blr +/* 800ACDD0 000A9D30 4E 80 00 20 */ blr .global "__ct__25TCastToPtr<11CPathCamera>FP7CEntity" "__ct__25TCastToPtr<11CPathCamera>FP7CEntity": @@ -17771,355 +17771,355 @@ lbl_800ACAB0: /* 800ACE18 000A9D78 81 83 00 00 */ lwz r12, 0(r3) /* 800ACE1C 000A9D7C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800ACE20 000A9D80 7D 89 03 A6 */ mtctr r12 -/* 800ACE24 000A9D84 4E 80 04 21 */ bctrl +/* 800ACE24 000A9D84 4E 80 04 21 */ bctrl lbl_800ACE28: /* 800ACE28 000A9D88 80 01 00 14 */ lwz r0, 0x14(r1) /* 800ACE2C 000A9D8C 7F E3 FB 78 */ mr r3, r31 /* 800ACE30 000A9D90 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800ACE34 000A9D94 7C 08 03 A6 */ mtlr r0 /* 800ACE38 000A9D98 38 21 00 10 */ addi r1, r1, 0x10 -/* 800ACE3C 000A9D9C 4E 80 00 20 */ blr +/* 800ACE3C 000A9D9C 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR7CWeapon" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR7CWeapon": /* 800ACE40 000A9DA0 38 00 00 00 */ li r0, 0 /* 800ACE44 000A9DA4 90 03 00 04 */ stw r0, 4(r3) -/* 800ACE48 000A9DA8 4E 80 00 20 */ blr +/* 800ACE48 000A9DA8 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR17CWallCrawlerSwarm" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR17CWallCrawlerSwarm": /* 800ACE4C 000A9DAC 38 00 00 00 */ li r0, 0 /* 800ACE50 000A9DB0 90 03 00 04 */ stw r0, 4(r3) -/* 800ACE54 000A9DB4 4E 80 00 20 */ blr +/* 800ACE54 000A9DB4 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR20CScriptSpindleCamera" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR20CScriptSpindleCamera": /* 800ACE58 000A9DB8 38 00 00 00 */ li r0, 0 /* 800ACE5C 000A9DBC 90 03 00 04 */ stw r0, 4(r3) -/* 800ACE60 000A9DC0 4E 80 00 20 */ blr +/* 800ACE60 000A9DC0 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR15CSnakeWeedSwarm" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR15CSnakeWeedSwarm": /* 800ACE64 000A9DC4 38 00 00 00 */ li r0, 0 /* 800ACE68 000A9DC8 90 03 00 04 */ stw r0, 4(r3) -/* 800ACE6C 000A9DCC 4E 80 00 20 */ blr +/* 800ACE6C 000A9DCC 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR15CScriptWaypoint" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR15CScriptWaypoint": /* 800ACE70 000A9DD0 38 00 00 00 */ li r0, 0 /* 800ACE74 000A9DD4 90 03 00 04 */ stw r0, 4(r3) -/* 800ACE78 000A9DD8 4E 80 00 20 */ blr +/* 800ACE78 000A9DD8 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR12CScriptWater" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR12CScriptWater": /* 800ACE7C 000A9DDC 38 00 00 00 */ li r0, 0 /* 800ACE80 000A9DE0 90 03 00 04 */ stw r0, 4(r3) -/* 800ACE84 000A9DE4 4E 80 00 20 */ blr +/* 800ACE84 000A9DE4 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR17CScriptVisorFlare" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR17CScriptVisorFlare": /* 800ACE88 000A9DE8 38 00 00 00 */ li r0, 0 /* 800ACE8C 000A9DEC 90 03 00 04 */ stw r0, 4(r3) -/* 800ACE90 000A9DF0 4E 80 00 20 */ blr +/* 800ACE90 000A9DF0 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR14CScriptTrigger" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR14CScriptTrigger": /* 800ACE94 000A9DF4 38 00 00 00 */ li r0, 0 /* 800ACE98 000A9DF8 90 03 00 04 */ stw r0, 4(r3) -/* 800ACE9C 000A9DFC 4E 80 00 20 */ blr +/* 800ACE9C 000A9DFC 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR12CScriptTimer" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR12CScriptTimer": /* 800ACEA0 000A9E00 38 00 00 00 */ li r0, 0 /* 800ACEA4 000A9E04 90 03 00 04 */ stw r0, 4(r3) -/* 800ACEA8 000A9E08 4E 80 00 20 */ blr +/* 800ACEA8 000A9E08 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR10CTeamAiMgr" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR10CTeamAiMgr": /* 800ACEAC 000A9E0C 38 00 00 00 */ li r0, 0 /* 800ACEB0 000A9E10 90 03 00 04 */ stw r0, 4(r3) -/* 800ACEB4 000A9E14 4E 80 00 20 */ blr +/* 800ACEB4 000A9E14 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR21CScriptTargetingPoint" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR21CScriptTargetingPoint": /* 800ACEB8 000A9E18 38 00 00 00 */ li r0, 0 /* 800ACEBC 000A9E1C 90 03 00 04 */ stw r0, 4(r3) -/* 800ACEC0 000A9E20 4E 80 00 20 */ blr +/* 800ACEC0 000A9E20 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR25CScriptSpiderBallWaypoint" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR25CScriptSpiderBallWaypoint": /* 800ACEC4 000A9E24 38 00 00 00 */ li r0, 0 /* 800ACEC8 000A9E28 90 03 00 04 */ stw r0, 4(r3) -/* 800ACECC 000A9E2C 4E 80 00 20 */ blr +/* 800ACECC 000A9E2C 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR34CScriptSpiderBallAttractionSurface" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR34CScriptSpiderBallAttractionSurface": /* 800ACED0 000A9E30 38 00 00 00 */ li r0, 0 /* 800ACED4 000A9E34 90 03 00 04 */ stw r0, 4(r3) -/* 800ACED8 000A9E38 4E 80 00 20 */ blr +/* 800ACED8 000A9E38 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR22CScriptSpecialFunction" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR22CScriptSpecialFunction": /* 800ACEDC 000A9E3C 38 00 00 00 */ li r0, 0 /* 800ACEE0 000A9E40 90 03 00 04 */ stw r0, 4(r3) -/* 800ACEE4 000A9E44 4E 80 00 20 */ blr +/* 800ACEE4 000A9E44 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR17CScriptSpawnPoint" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR17CScriptSpawnPoint": /* 800ACEE8 000A9E48 38 00 00 00 */ li r0, 0 /* 800ACEEC 000A9E4C 90 03 00 04 */ stw r0, 4(r3) -/* 800ACEF0 000A9E50 4E 80 00 20 */ blr +/* 800ACEF0 000A9E50 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR12CScriptSound" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR12CScriptSound": /* 800ACEF4 000A9E54 38 00 00 00 */ li r0, 0 /* 800ACEF8 000A9E58 90 03 00 04 */ stw r0, 4(r3) -/* 800ACEFC 000A9E5C 4E 80 00 20 */ blr +/* 800ACEFC 000A9E5C 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR20CScriptRoomAcoustics" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR20CScriptRoomAcoustics": /* 800ACF00 000A9E60 38 00 00 00 */ li r0, 0 /* 800ACF04 000A9E64 90 03 00 04 */ stw r0, 4(r3) -/* 800ACF08 000A9E68 4E 80 00 20 */ blr +/* 800ACF08 000A9E68 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR22CScriptPointOfinterest" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR22CScriptPointOfinterest": /* 800ACF0C 000A9E6C 38 00 00 00 */ li r0, 0 /* 800ACF10 000A9E70 90 03 00 04 */ stw r0, 4(r3) -/* 800ACF14 000A9E74 4E 80 00 20 */ blr +/* 800ACF14 000A9E74 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR17CScriptPlayerHint" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR17CScriptPlayerHint": /* 800ACF18 000A9E78 38 00 00 00 */ li r0, 0 /* 800ACF1C 000A9E7C 90 03 00 04 */ stw r0, 4(r3) -/* 800ACF20 000A9E80 4E 80 00 20 */ blr +/* 800ACF20 000A9E80 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR15CScriptPlatform" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR15CScriptPlatform": /* 800ACF24 000A9E84 38 00 00 00 */ li r0, 0 /* 800ACF28 000A9E88 90 03 00 04 */ stw r0, 4(r3) -/* 800ACF2C 000A9E8C 4E 80 00 20 */ blr +/* 800ACF2C 000A9E8C 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR13CScriptPickup" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR13CScriptPickup": /* 800ACF30 000A9E90 38 00 00 00 */ li r0, 0 /* 800ACF34 000A9E94 90 03 00 04 */ stw r0, 4(r3) -/* 800ACF38 000A9E98 4E 80 00 20 */ blr +/* 800ACF38 000A9E98 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR15CScriptMazeNode" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR15CScriptMazeNode": /* 800ACF3C 000A9E9C 38 00 00 00 */ li r0, 0 /* 800ACF40 000A9EA0 90 03 00 04 */ stw r0, 4(r3) -/* 800ACF44 000A9EA4 4E 80 00 20 */ blr +/* 800ACF44 000A9EA4 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR16CScriptGunTurret" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR16CScriptGunTurret": /* 800ACF48 000A9EA8 38 00 00 00 */ li r0, 0 /* 800ACF4C 000A9EAC 90 03 00 04 */ stw r0, 4(r3) -/* 800ACF50 000A9EB0 4E 80 00 20 */ blr +/* 800ACF50 000A9EB0 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR19CScriptGrapplePoint" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR19CScriptGrapplePoint": /* 800ACF54 000A9EB4 38 00 00 00 */ li r0, 0 /* 800ACF58 000A9EB8 90 03 00 04 */ stw r0, 4(r3) -/* 800ACF5C 000A9EBC 4E 80 00 20 */ blr +/* 800ACF5C 000A9EBC 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR13CScriptEffect" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR13CScriptEffect": /* 800ACF60 000A9EC0 38 00 00 00 */ li r0, 0 /* 800ACF64 000A9EC4 90 03 00 04 */ stw r0, 4(r3) -/* 800ACF68 000A9EC8 4E 80 00 20 */ blr +/* 800ACF68 000A9EC8 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR11CScriptDoor" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR11CScriptDoor": /* 800ACF6C 000A9ECC 38 00 00 00 */ li r0, 0 /* 800ACF70 000A9ED0 90 03 00 04 */ stw r0, 4(r3) -/* 800ACF74 000A9ED4 4E 80 00 20 */ blr +/* 800ACF74 000A9ED4 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR11CScriptDock" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR11CScriptDock": /* 800ACF78 000A9ED8 38 00 00 00 */ li r0, 0 /* 800ACF7C 000A9EDC 90 03 00 04 */ stw r0, 4(r3) -/* 800ACF80 000A9EE0 4E 80 00 20 */ blr +/* 800ACF80 000A9EE0 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR18CScriptDistanceFog" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR18CScriptDistanceFog": /* 800ACF84 000A9EE4 38 00 00 00 */ li r0, 0 /* 800ACF88 000A9EE8 90 03 00 04 */ stw r0, 4(r3) -/* 800ACF8C 000A9EEC 4E 80 00 20 */ blr +/* 800ACF8C 000A9EEC 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR26CScriptDebugCameraWaypoint" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR26CScriptDebugCameraWaypoint": /* 800ACF90 000A9EF0 38 00 00 00 */ li r0, 0 /* 800ACF94 000A9EF4 90 03 00 04 */ stw r0, 4(r3) -/* 800ACF98 000A9EF8 4E 80 00 20 */ blr +/* 800ACF98 000A9EF8 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR17CScriptCoverPoint" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR17CScriptCoverPoint": /* 800ACF9C 000A9EFC 38 00 00 00 */ li r0, 0 /* 800ACFA0 000A9F00 90 03 00 04 */ stw r0, 4(r3) -/* 800ACFA4 000A9F04 4E 80 00 20 */ blr +/* 800ACFA4 000A9F04 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR21CScriptCameraWaypoint" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR21CScriptCameraWaypoint": /* 800ACFA8 000A9F08 38 00 00 00 */ li r0, 0 /* 800ACFAC 000A9F0C 90 03 00 04 */ stw r0, 4(r3) -/* 800ACFB0 000A9F10 4E 80 00 20 */ blr +/* 800ACFB0 000A9F10 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR24CScriptCameraPitchVolume" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR24CScriptCameraPitchVolume": /* 800ACFB4 000A9F14 38 00 00 00 */ li r0, 0 /* 800ACFB8 000A9F18 90 03 00 04 */ stw r0, 4(r3) -/* 800ACFBC 000A9F1C 4E 80 00 20 */ blr +/* 800ACFBC 000A9F1C 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR17CScriptCameraHint" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR17CScriptCameraHint": /* 800ACFC0 000A9F20 38 00 00 00 */ li r0, 0 /* 800ACFC4 000A9F24 90 03 00 04 */ stw r0, 4(r3) -/* 800ACFC8 000A9F28 4E 80 00 20 */ blr +/* 800ACFC8 000A9F28 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR18CScriptAiJumpPoint" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR18CScriptAiJumpPoint": /* 800ACFCC 000A9F2C 38 00 00 00 */ li r0, 0 /* 800ACFD0 000A9F30 90 03 00 04 */ stw r0, 4(r3) -/* 800ACFD4 000A9F34 4E 80 00 20 */ blr +/* 800ACFD4 000A9F34 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR20CScriptActorKeyframe" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR20CScriptActorKeyframe": /* 800ACFD8 000A9F38 38 00 00 00 */ li r0, 0 /* 800ACFDC 000A9F3C 90 03 00 04 */ stw r0, 4(r3) -/* 800ACFE0 000A9F40 4E 80 00 20 */ blr +/* 800ACFE0 000A9F40 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR12CScriptActor" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR12CScriptActor": /* 800ACFE4 000A9F44 38 00 00 00 */ li r0, 0 /* 800ACFE8 000A9F48 90 03 00 04 */ stw r0, 4(r3) -/* 800ACFEC 000A9F4C 4E 80 00 20 */ blr +/* 800ACFEC 000A9F4C 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR9CRepulsor" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR9CRepulsor": /* 800ACFF0 000A9F50 38 00 00 00 */ li r0, 0 /* 800ACFF4 000A9F54 90 03 00 04 */ stw r0, 4(r3) -/* 800ACFF8 000A9F58 4E 80 00 20 */ blr +/* 800ACFF8 000A9F58 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR7CPlayer" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR7CPlayer": /* 800ACFFC 000A9F5C 38 00 00 00 */ li r0, 0 /* 800AD000 000A9F60 90 03 00 04 */ stw r0, 4(r3) -/* 800AD004 000A9F64 4E 80 00 20 */ blr +/* 800AD004 000A9F64 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR13CPhysicsActor" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR13CPhysicsActor": /* 800AD008 000A9F68 38 00 00 00 */ li r0, 0 /* 800AD00C 000A9F6C 90 03 00 04 */ stw r0, 4(r3) -/* 800AD010 000A9F70 4E 80 00 20 */ blr +/* 800AD010 000A9F70 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR3CAi" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR3CAi": /* 800AD014 000A9F74 38 00 00 00 */ li r0, 0 /* 800AD018 000A9F78 90 03 00 04 */ stw r0, 4(r3) -/* 800AD01C 000A9F7C 4E 80 00 20 */ blr +/* 800AD01C 000A9F7C 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR11CPathCamera" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR11CPathCamera": /* 800AD020 000A9F80 38 00 00 00 */ li r0, 0 /* 800AD024 000A9F84 90 03 00 04 */ stw r0, 4(r3) -/* 800AD028 000A9F88 4E 80 00 20 */ blr +/* 800AD028 000A9F88 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR18CMetroidPrimeRelay" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR18CMetroidPrimeRelay": /* 800AD02C 000A9F8C 90 83 00 04 */ stw r4, 4(r3) -/* 800AD030 000A9F90 4E 80 00 20 */ blr +/* 800AD030 000A9F90 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR19CHUDBillboardEffect" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR19CHUDBillboardEffect": /* 800AD034 000A9F94 38 00 00 00 */ li r0, 0 /* 800AD038 000A9F98 90 03 00 04 */ stw r0, 4(r3) -/* 800AD03C 000A9F9C 4E 80 00 20 */ blr +/* 800AD03C 000A9F9C 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR15CGameProjectile" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR15CGameProjectile": /* 800AD040 000A9FA0 38 00 00 00 */ li r0, 0 /* 800AD044 000A9FA4 90 03 00 04 */ stw r0, 4(r3) -/* 800AD048 000A9FA8 4E 80 00 20 */ blr +/* 800AD048 000A9FA8 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR10CGameLight" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR10CGameLight": /* 800AD04C 000A9FAC 38 00 00 00 */ li r0, 0 /* 800AD050 000A9FB0 90 03 00 04 */ stw r0, 4(r3) -/* 800AD054 000A9FB4 4E 80 00 20 */ blr +/* 800AD054 000A9FB4 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR11CGameCamera" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR11CGameCamera": /* 800AD058 000A9FB8 38 00 00 00 */ li r0, 0 /* 800AD05C 000A9FBC 90 03 00 04 */ stw r0, 4(r3) -/* 800AD060 000A9FC0 4E 80 00 20 */ blr +/* 800AD060 000A9FC0 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR10CFishCloud" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR10CFishCloud": /* 800AD064 000A9FC4 38 00 00 00 */ li r0, 0 /* 800AD068 000A9FC8 90 03 00 04 */ stw r0, 4(r3) -/* 800AD06C 000A9FCC 4E 80 00 20 */ blr +/* 800AD06C 000A9FCC 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR18CFirstPersonCamera" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR18CFirstPersonCamera": /* 800AD070 000A9FD0 38 00 00 00 */ li r0, 0 /* 800AD074 000A9FD4 90 03 00 04 */ stw r0, 4(r3) -/* 800AD078 000A9FD8 4E 80 00 20 */ blr +/* 800AD078 000A9FD8 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR10CExplosion" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR10CExplosion": /* 800AD07C 000A9FDC 38 00 00 00 */ li r0, 0 /* 800AD080 000A9FE0 90 03 00 04 */ stw r0, 4(r3) -/* 800AD084 000A9FE4 4E 80 00 20 */ blr +/* 800AD084 000A9FE4 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR7CEntity" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR7CEntity": /* 800AD088 000A9FE8 38 00 00 00 */ li r0, 0 /* 800AD08C 000A9FEC 90 03 00 04 */ stw r0, 4(r3) -/* 800AD090 000A9FF0 4E 80 00 20 */ blr +/* 800AD090 000A9FF0 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR17CEnergyProjectile" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR17CEnergyProjectile": /* 800AD094 000A9FF4 38 00 00 00 */ li r0, 0 /* 800AD098 000A9FF8 90 03 00 04 */ stw r0, 4(r3) -/* 800AD09C 000A9FFC 4E 80 00 20 */ blr +/* 800AD09C 000A9FFC 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR16CDestroyableRock" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR16CDestroyableRock": /* 800AD0A0 000AA000 38 00 00 00 */ li r0, 0 /* 800AD0A4 000AA004 90 03 00 04 */ stw r0, 4(r3) -/* 800AD0A8 000AA008 4E 80 00 20 */ blr +/* 800AD0A8 000AA008 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR15CCollisionActor" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR15CCollisionActor": /* 800AD0AC 000AA00C 38 00 00 00 */ li r0, 0 /* 800AD0B0 000AA010 90 03 00 04 */ stw r0, 4(r3) -/* 800AD0B4 000AA014 4E 80 00 20 */ blr +/* 800AD0B4 000AA014 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR16CCinematicCamera" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR16CCinematicCamera": /* 800AD0B8 000AA018 38 00 00 00 */ li r0, 0 /* 800AD0BC 000AA01C 90 03 00 04 */ stw r0, 4(r3) -/* 800AD0C0 000AA020 4E 80 00 20 */ blr +/* 800AD0C0 000AA020 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR5CBomb" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR5CBomb": /* 800AD0C4 000AA024 38 00 00 00 */ li r0, 0 /* 800AD0C8 000AA028 90 03 00 04 */ stw r0, 4(r3) -/* 800AD0CC 000AA02C 4E 80 00 20 */ blr +/* 800AD0CC 000AA02C 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR11CBallCamera" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR11CBallCamera": /* 800AD0D0 000AA030 38 00 00 00 */ li r0, 0 /* 800AD0D4 000AA034 90 03 00 04 */ stw r0, 4(r3) -/* 800AD0D8 000AA038 4E 80 00 20 */ blr +/* 800AD0D8 000AA038 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR6CActor" "Visit__32TCastToPtr<18CMetroidPrimeRelay>FR6CActor": /* 800AD0DC 000AA03C 38 00 00 00 */ li r0, 0 /* 800AD0E0 000AA040 90 03 00 04 */ stw r0, 4(r3) -/* 800AD0E4 000AA044 4E 80 00 20 */ blr +/* 800AD0E4 000AA044 4E 80 00 20 */ blr .global "__ct__32TCastToPtr<18CMetroidPrimeRelay>FP7CEntity" "__ct__32TCastToPtr<18CMetroidPrimeRelay>FP7CEntity": @@ -18143,355 +18143,355 @@ lbl_800ACE28: /* 800AD12C 000AA08C 81 83 00 00 */ lwz r12, 0(r3) /* 800AD130 000AA090 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800AD134 000AA094 7D 89 03 A6 */ mtctr r12 -/* 800AD138 000AA098 4E 80 04 21 */ bctrl +/* 800AD138 000AA098 4E 80 04 21 */ bctrl lbl_800AD13C: /* 800AD13C 000AA09C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800AD140 000AA0A0 7F E3 FB 78 */ mr r3, r31 /* 800AD144 000AA0A4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800AD148 000AA0A8 7C 08 03 A6 */ mtlr r0 /* 800AD14C 000AA0AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800AD150 000AA0B0 4E 80 00 20 */ blr +/* 800AD150 000AA0B0 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR7CWeapon" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR7CWeapon": /* 800AD154 000AA0B4 38 00 00 00 */ li r0, 0 /* 800AD158 000AA0B8 90 03 00 04 */ stw r0, 4(r3) -/* 800AD15C 000AA0BC 4E 80 00 20 */ blr +/* 800AD15C 000AA0BC 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR17CWallCrawlerSwarm" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR17CWallCrawlerSwarm": /* 800AD160 000AA0C0 38 00 00 00 */ li r0, 0 /* 800AD164 000AA0C4 90 03 00 04 */ stw r0, 4(r3) -/* 800AD168 000AA0C8 4E 80 00 20 */ blr +/* 800AD168 000AA0C8 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR20CScriptSpindleCamera" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR20CScriptSpindleCamera": /* 800AD16C 000AA0CC 38 00 00 00 */ li r0, 0 /* 800AD170 000AA0D0 90 03 00 04 */ stw r0, 4(r3) -/* 800AD174 000AA0D4 4E 80 00 20 */ blr +/* 800AD174 000AA0D4 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR15CSnakeWeedSwarm" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR15CSnakeWeedSwarm": /* 800AD178 000AA0D8 38 00 00 00 */ li r0, 0 /* 800AD17C 000AA0DC 90 03 00 04 */ stw r0, 4(r3) -/* 800AD180 000AA0E0 4E 80 00 20 */ blr +/* 800AD180 000AA0E0 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR15CScriptWaypoint" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR15CScriptWaypoint": /* 800AD184 000AA0E4 38 00 00 00 */ li r0, 0 /* 800AD188 000AA0E8 90 03 00 04 */ stw r0, 4(r3) -/* 800AD18C 000AA0EC 4E 80 00 20 */ blr +/* 800AD18C 000AA0EC 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR12CScriptWater" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR12CScriptWater": /* 800AD190 000AA0F0 38 00 00 00 */ li r0, 0 /* 800AD194 000AA0F4 90 03 00 04 */ stw r0, 4(r3) -/* 800AD198 000AA0F8 4E 80 00 20 */ blr +/* 800AD198 000AA0F8 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR17CScriptVisorFlare" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR17CScriptVisorFlare": /* 800AD19C 000AA0FC 38 00 00 00 */ li r0, 0 /* 800AD1A0 000AA100 90 03 00 04 */ stw r0, 4(r3) -/* 800AD1A4 000AA104 4E 80 00 20 */ blr +/* 800AD1A4 000AA104 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR14CScriptTrigger" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR14CScriptTrigger": /* 800AD1A8 000AA108 38 00 00 00 */ li r0, 0 /* 800AD1AC 000AA10C 90 03 00 04 */ stw r0, 4(r3) -/* 800AD1B0 000AA110 4E 80 00 20 */ blr +/* 800AD1B0 000AA110 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR12CScriptTimer" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR12CScriptTimer": /* 800AD1B4 000AA114 38 00 00 00 */ li r0, 0 /* 800AD1B8 000AA118 90 03 00 04 */ stw r0, 4(r3) -/* 800AD1BC 000AA11C 4E 80 00 20 */ blr +/* 800AD1BC 000AA11C 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR10CTeamAiMgr" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR10CTeamAiMgr": /* 800AD1C0 000AA120 38 00 00 00 */ li r0, 0 /* 800AD1C4 000AA124 90 03 00 04 */ stw r0, 4(r3) -/* 800AD1C8 000AA128 4E 80 00 20 */ blr +/* 800AD1C8 000AA128 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR21CScriptTargetingPoint" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR21CScriptTargetingPoint": /* 800AD1CC 000AA12C 38 00 00 00 */ li r0, 0 /* 800AD1D0 000AA130 90 03 00 04 */ stw r0, 4(r3) -/* 800AD1D4 000AA134 4E 80 00 20 */ blr +/* 800AD1D4 000AA134 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR25CScriptSpiderBallWaypoint" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR25CScriptSpiderBallWaypoint": /* 800AD1D8 000AA138 38 00 00 00 */ li r0, 0 /* 800AD1DC 000AA13C 90 03 00 04 */ stw r0, 4(r3) -/* 800AD1E0 000AA140 4E 80 00 20 */ blr +/* 800AD1E0 000AA140 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR34CScriptSpiderBallAttractionSurface" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR34CScriptSpiderBallAttractionSurface": /* 800AD1E4 000AA144 38 00 00 00 */ li r0, 0 /* 800AD1E8 000AA148 90 03 00 04 */ stw r0, 4(r3) -/* 800AD1EC 000AA14C 4E 80 00 20 */ blr +/* 800AD1EC 000AA14C 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR22CScriptSpecialFunction" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR22CScriptSpecialFunction": /* 800AD1F0 000AA150 38 00 00 00 */ li r0, 0 /* 800AD1F4 000AA154 90 03 00 04 */ stw r0, 4(r3) -/* 800AD1F8 000AA158 4E 80 00 20 */ blr +/* 800AD1F8 000AA158 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR17CScriptSpawnPoint" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR17CScriptSpawnPoint": /* 800AD1FC 000AA15C 38 00 00 00 */ li r0, 0 /* 800AD200 000AA160 90 03 00 04 */ stw r0, 4(r3) -/* 800AD204 000AA164 4E 80 00 20 */ blr +/* 800AD204 000AA164 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR12CScriptSound" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR12CScriptSound": /* 800AD208 000AA168 38 00 00 00 */ li r0, 0 /* 800AD20C 000AA16C 90 03 00 04 */ stw r0, 4(r3) -/* 800AD210 000AA170 4E 80 00 20 */ blr +/* 800AD210 000AA170 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR20CScriptRoomAcoustics" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR20CScriptRoomAcoustics": /* 800AD214 000AA174 38 00 00 00 */ li r0, 0 /* 800AD218 000AA178 90 03 00 04 */ stw r0, 4(r3) -/* 800AD21C 000AA17C 4E 80 00 20 */ blr +/* 800AD21C 000AA17C 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR22CScriptPointOfinterest" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR22CScriptPointOfinterest": /* 800AD220 000AA180 38 00 00 00 */ li r0, 0 /* 800AD224 000AA184 90 03 00 04 */ stw r0, 4(r3) -/* 800AD228 000AA188 4E 80 00 20 */ blr +/* 800AD228 000AA188 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR17CScriptPlayerHint" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR17CScriptPlayerHint": /* 800AD22C 000AA18C 38 00 00 00 */ li r0, 0 /* 800AD230 000AA190 90 03 00 04 */ stw r0, 4(r3) -/* 800AD234 000AA194 4E 80 00 20 */ blr +/* 800AD234 000AA194 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR15CScriptPlatform" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR15CScriptPlatform": /* 800AD238 000AA198 38 00 00 00 */ li r0, 0 /* 800AD23C 000AA19C 90 03 00 04 */ stw r0, 4(r3) -/* 800AD240 000AA1A0 4E 80 00 20 */ blr +/* 800AD240 000AA1A0 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR13CScriptPickup" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR13CScriptPickup": /* 800AD244 000AA1A4 38 00 00 00 */ li r0, 0 /* 800AD248 000AA1A8 90 03 00 04 */ stw r0, 4(r3) -/* 800AD24C 000AA1AC 4E 80 00 20 */ blr +/* 800AD24C 000AA1AC 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR15CScriptMazeNode" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR15CScriptMazeNode": /* 800AD250 000AA1B0 38 00 00 00 */ li r0, 0 /* 800AD254 000AA1B4 90 03 00 04 */ stw r0, 4(r3) -/* 800AD258 000AA1B8 4E 80 00 20 */ blr +/* 800AD258 000AA1B8 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR16CScriptGunTurret" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR16CScriptGunTurret": /* 800AD25C 000AA1BC 38 00 00 00 */ li r0, 0 /* 800AD260 000AA1C0 90 03 00 04 */ stw r0, 4(r3) -/* 800AD264 000AA1C4 4E 80 00 20 */ blr +/* 800AD264 000AA1C4 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR19CScriptGrapplePoint" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR19CScriptGrapplePoint": /* 800AD268 000AA1C8 38 00 00 00 */ li r0, 0 /* 800AD26C 000AA1CC 90 03 00 04 */ stw r0, 4(r3) -/* 800AD270 000AA1D0 4E 80 00 20 */ blr +/* 800AD270 000AA1D0 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR13CScriptEffect" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR13CScriptEffect": /* 800AD274 000AA1D4 38 00 00 00 */ li r0, 0 /* 800AD278 000AA1D8 90 03 00 04 */ stw r0, 4(r3) -/* 800AD27C 000AA1DC 4E 80 00 20 */ blr +/* 800AD27C 000AA1DC 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR11CScriptDoor" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR11CScriptDoor": /* 800AD280 000AA1E0 38 00 00 00 */ li r0, 0 /* 800AD284 000AA1E4 90 03 00 04 */ stw r0, 4(r3) -/* 800AD288 000AA1E8 4E 80 00 20 */ blr +/* 800AD288 000AA1E8 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR11CScriptDock" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR11CScriptDock": /* 800AD28C 000AA1EC 38 00 00 00 */ li r0, 0 /* 800AD290 000AA1F0 90 03 00 04 */ stw r0, 4(r3) -/* 800AD294 000AA1F4 4E 80 00 20 */ blr +/* 800AD294 000AA1F4 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR18CScriptDistanceFog" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR18CScriptDistanceFog": /* 800AD298 000AA1F8 38 00 00 00 */ li r0, 0 /* 800AD29C 000AA1FC 90 03 00 04 */ stw r0, 4(r3) -/* 800AD2A0 000AA200 4E 80 00 20 */ blr +/* 800AD2A0 000AA200 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR26CScriptDebugCameraWaypoint" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR26CScriptDebugCameraWaypoint": /* 800AD2A4 000AA204 38 00 00 00 */ li r0, 0 /* 800AD2A8 000AA208 90 03 00 04 */ stw r0, 4(r3) -/* 800AD2AC 000AA20C 4E 80 00 20 */ blr +/* 800AD2AC 000AA20C 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR17CScriptCoverPoint" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR17CScriptCoverPoint": /* 800AD2B0 000AA210 38 00 00 00 */ li r0, 0 /* 800AD2B4 000AA214 90 03 00 04 */ stw r0, 4(r3) -/* 800AD2B8 000AA218 4E 80 00 20 */ blr +/* 800AD2B8 000AA218 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR21CScriptCameraWaypoint" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR21CScriptCameraWaypoint": /* 800AD2BC 000AA21C 38 00 00 00 */ li r0, 0 /* 800AD2C0 000AA220 90 03 00 04 */ stw r0, 4(r3) -/* 800AD2C4 000AA224 4E 80 00 20 */ blr +/* 800AD2C4 000AA224 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR24CScriptCameraPitchVolume" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR24CScriptCameraPitchVolume": /* 800AD2C8 000AA228 38 00 00 00 */ li r0, 0 /* 800AD2CC 000AA22C 90 03 00 04 */ stw r0, 4(r3) -/* 800AD2D0 000AA230 4E 80 00 20 */ blr +/* 800AD2D0 000AA230 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR17CScriptCameraHint" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR17CScriptCameraHint": /* 800AD2D4 000AA234 38 00 00 00 */ li r0, 0 /* 800AD2D8 000AA238 90 03 00 04 */ stw r0, 4(r3) -/* 800AD2DC 000AA23C 4E 80 00 20 */ blr +/* 800AD2DC 000AA23C 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR18CScriptAiJumpPoint" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR18CScriptAiJumpPoint": /* 800AD2E0 000AA240 38 00 00 00 */ li r0, 0 /* 800AD2E4 000AA244 90 03 00 04 */ stw r0, 4(r3) -/* 800AD2E8 000AA248 4E 80 00 20 */ blr +/* 800AD2E8 000AA248 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR20CScriptActorKeyframe" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR20CScriptActorKeyframe": /* 800AD2EC 000AA24C 38 00 00 00 */ li r0, 0 /* 800AD2F0 000AA250 90 03 00 04 */ stw r0, 4(r3) -/* 800AD2F4 000AA254 4E 80 00 20 */ blr +/* 800AD2F4 000AA254 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR12CScriptActor" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR12CScriptActor": /* 800AD2F8 000AA258 38 00 00 00 */ li r0, 0 /* 800AD2FC 000AA25C 90 03 00 04 */ stw r0, 4(r3) -/* 800AD300 000AA260 4E 80 00 20 */ blr +/* 800AD300 000AA260 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR9CRepulsor" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR9CRepulsor": /* 800AD304 000AA264 38 00 00 00 */ li r0, 0 /* 800AD308 000AA268 90 03 00 04 */ stw r0, 4(r3) -/* 800AD30C 000AA26C 4E 80 00 20 */ blr +/* 800AD30C 000AA26C 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR7CPlayer" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR7CPlayer": /* 800AD310 000AA270 38 00 00 00 */ li r0, 0 /* 800AD314 000AA274 90 03 00 04 */ stw r0, 4(r3) -/* 800AD318 000AA278 4E 80 00 20 */ blr +/* 800AD318 000AA278 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR13CPhysicsActor" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR13CPhysicsActor": /* 800AD31C 000AA27C 38 00 00 00 */ li r0, 0 /* 800AD320 000AA280 90 03 00 04 */ stw r0, 4(r3) -/* 800AD324 000AA284 4E 80 00 20 */ blr +/* 800AD324 000AA284 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR3CAi" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR3CAi": /* 800AD328 000AA288 38 00 00 00 */ li r0, 0 /* 800AD32C 000AA28C 90 03 00 04 */ stw r0, 4(r3) -/* 800AD330 000AA290 4E 80 00 20 */ blr +/* 800AD330 000AA290 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR11CPathCamera" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR11CPathCamera": /* 800AD334 000AA294 38 00 00 00 */ li r0, 0 /* 800AD338 000AA298 90 03 00 04 */ stw r0, 4(r3) -/* 800AD33C 000AA29C 4E 80 00 20 */ blr +/* 800AD33C 000AA29C 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR18CMetroidPrimeRelay" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR18CMetroidPrimeRelay": /* 800AD340 000AA2A0 38 00 00 00 */ li r0, 0 /* 800AD344 000AA2A4 90 03 00 04 */ stw r0, 4(r3) -/* 800AD348 000AA2A8 4E 80 00 20 */ blr +/* 800AD348 000AA2A8 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR19CHUDBillboardEffect" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR19CHUDBillboardEffect": /* 800AD34C 000AA2AC 90 83 00 04 */ stw r4, 4(r3) -/* 800AD350 000AA2B0 4E 80 00 20 */ blr +/* 800AD350 000AA2B0 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR15CGameProjectile" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR15CGameProjectile": /* 800AD354 000AA2B4 38 00 00 00 */ li r0, 0 /* 800AD358 000AA2B8 90 03 00 04 */ stw r0, 4(r3) -/* 800AD35C 000AA2BC 4E 80 00 20 */ blr +/* 800AD35C 000AA2BC 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR10CGameLight" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR10CGameLight": /* 800AD360 000AA2C0 38 00 00 00 */ li r0, 0 /* 800AD364 000AA2C4 90 03 00 04 */ stw r0, 4(r3) -/* 800AD368 000AA2C8 4E 80 00 20 */ blr +/* 800AD368 000AA2C8 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR11CGameCamera" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR11CGameCamera": /* 800AD36C 000AA2CC 38 00 00 00 */ li r0, 0 /* 800AD370 000AA2D0 90 03 00 04 */ stw r0, 4(r3) -/* 800AD374 000AA2D4 4E 80 00 20 */ blr +/* 800AD374 000AA2D4 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR10CFishCloud" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR10CFishCloud": /* 800AD378 000AA2D8 38 00 00 00 */ li r0, 0 /* 800AD37C 000AA2DC 90 03 00 04 */ stw r0, 4(r3) -/* 800AD380 000AA2E0 4E 80 00 20 */ blr +/* 800AD380 000AA2E0 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR18CFirstPersonCamera" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR18CFirstPersonCamera": /* 800AD384 000AA2E4 38 00 00 00 */ li r0, 0 /* 800AD388 000AA2E8 90 03 00 04 */ stw r0, 4(r3) -/* 800AD38C 000AA2EC 4E 80 00 20 */ blr +/* 800AD38C 000AA2EC 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR10CExplosion" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR10CExplosion": /* 800AD390 000AA2F0 38 00 00 00 */ li r0, 0 /* 800AD394 000AA2F4 90 03 00 04 */ stw r0, 4(r3) -/* 800AD398 000AA2F8 4E 80 00 20 */ blr +/* 800AD398 000AA2F8 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR7CEntity" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR7CEntity": /* 800AD39C 000AA2FC 38 00 00 00 */ li r0, 0 /* 800AD3A0 000AA300 90 03 00 04 */ stw r0, 4(r3) -/* 800AD3A4 000AA304 4E 80 00 20 */ blr +/* 800AD3A4 000AA304 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR17CEnergyProjectile" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR17CEnergyProjectile": /* 800AD3A8 000AA308 38 00 00 00 */ li r0, 0 /* 800AD3AC 000AA30C 90 03 00 04 */ stw r0, 4(r3) -/* 800AD3B0 000AA310 4E 80 00 20 */ blr +/* 800AD3B0 000AA310 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR16CDestroyableRock" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR16CDestroyableRock": /* 800AD3B4 000AA314 38 00 00 00 */ li r0, 0 /* 800AD3B8 000AA318 90 03 00 04 */ stw r0, 4(r3) -/* 800AD3BC 000AA31C 4E 80 00 20 */ blr +/* 800AD3BC 000AA31C 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR15CCollisionActor" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR15CCollisionActor": /* 800AD3C0 000AA320 38 00 00 00 */ li r0, 0 /* 800AD3C4 000AA324 90 03 00 04 */ stw r0, 4(r3) -/* 800AD3C8 000AA328 4E 80 00 20 */ blr +/* 800AD3C8 000AA328 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR16CCinematicCamera" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR16CCinematicCamera": /* 800AD3CC 000AA32C 38 00 00 00 */ li r0, 0 /* 800AD3D0 000AA330 90 03 00 04 */ stw r0, 4(r3) -/* 800AD3D4 000AA334 4E 80 00 20 */ blr +/* 800AD3D4 000AA334 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR5CBomb" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR5CBomb": /* 800AD3D8 000AA338 38 00 00 00 */ li r0, 0 /* 800AD3DC 000AA33C 90 03 00 04 */ stw r0, 4(r3) -/* 800AD3E0 000AA340 4E 80 00 20 */ blr +/* 800AD3E0 000AA340 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR11CBallCamera" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR11CBallCamera": /* 800AD3E4 000AA344 38 00 00 00 */ li r0, 0 /* 800AD3E8 000AA348 90 03 00 04 */ stw r0, 4(r3) -/* 800AD3EC 000AA34C 4E 80 00 20 */ blr +/* 800AD3EC 000AA34C 4E 80 00 20 */ blr .global "Visit__33TCastToPtr<19CHUDBillboardEffect>FR6CActor" "Visit__33TCastToPtr<19CHUDBillboardEffect>FR6CActor": /* 800AD3F0 000AA350 38 00 00 00 */ li r0, 0 /* 800AD3F4 000AA354 90 03 00 04 */ stw r0, 4(r3) -/* 800AD3F8 000AA358 4E 80 00 20 */ blr +/* 800AD3F8 000AA358 4E 80 00 20 */ blr .global "__ct__33TCastToPtr<19CHUDBillboardEffect>FP7CEntity" "__ct__33TCastToPtr<19CHUDBillboardEffect>FP7CEntity": @@ -18515,354 +18515,354 @@ lbl_800AD13C: /* 800AD440 000AA3A0 81 83 00 00 */ lwz r12, 0(r3) /* 800AD444 000AA3A4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800AD448 000AA3A8 7D 89 03 A6 */ mtctr r12 -/* 800AD44C 000AA3AC 4E 80 04 21 */ bctrl +/* 800AD44C 000AA3AC 4E 80 04 21 */ bctrl lbl_800AD450: /* 800AD450 000AA3B0 80 01 00 14 */ lwz r0, 0x14(r1) /* 800AD454 000AA3B4 7F E3 FB 78 */ mr r3, r31 /* 800AD458 000AA3B8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800AD45C 000AA3BC 7C 08 03 A6 */ mtlr r0 /* 800AD460 000AA3C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800AD464 000AA3C4 4E 80 00 20 */ blr +/* 800AD464 000AA3C4 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR7CWeapon" "Visit__29TCastToPtr<15CGameProjectile>FR7CWeapon": /* 800AD468 000AA3C8 38 00 00 00 */ li r0, 0 /* 800AD46C 000AA3CC 90 03 00 04 */ stw r0, 4(r3) -/* 800AD470 000AA3D0 4E 80 00 20 */ blr +/* 800AD470 000AA3D0 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR17CWallCrawlerSwarm" "Visit__29TCastToPtr<15CGameProjectile>FR17CWallCrawlerSwarm": /* 800AD474 000AA3D4 38 00 00 00 */ li r0, 0 /* 800AD478 000AA3D8 90 03 00 04 */ stw r0, 4(r3) -/* 800AD47C 000AA3DC 4E 80 00 20 */ blr +/* 800AD47C 000AA3DC 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR20CScriptSpindleCamera" "Visit__29TCastToPtr<15CGameProjectile>FR20CScriptSpindleCamera": /* 800AD480 000AA3E0 38 00 00 00 */ li r0, 0 /* 800AD484 000AA3E4 90 03 00 04 */ stw r0, 4(r3) -/* 800AD488 000AA3E8 4E 80 00 20 */ blr +/* 800AD488 000AA3E8 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR15CSnakeWeedSwarm" "Visit__29TCastToPtr<15CGameProjectile>FR15CSnakeWeedSwarm": /* 800AD48C 000AA3EC 38 00 00 00 */ li r0, 0 /* 800AD490 000AA3F0 90 03 00 04 */ stw r0, 4(r3) -/* 800AD494 000AA3F4 4E 80 00 20 */ blr +/* 800AD494 000AA3F4 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR15CScriptWaypoint" "Visit__29TCastToPtr<15CGameProjectile>FR15CScriptWaypoint": /* 800AD498 000AA3F8 38 00 00 00 */ li r0, 0 /* 800AD49C 000AA3FC 90 03 00 04 */ stw r0, 4(r3) -/* 800AD4A0 000AA400 4E 80 00 20 */ blr +/* 800AD4A0 000AA400 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR12CScriptWater" "Visit__29TCastToPtr<15CGameProjectile>FR12CScriptWater": /* 800AD4A4 000AA404 38 00 00 00 */ li r0, 0 /* 800AD4A8 000AA408 90 03 00 04 */ stw r0, 4(r3) -/* 800AD4AC 000AA40C 4E 80 00 20 */ blr +/* 800AD4AC 000AA40C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR17CScriptVisorFlare" "Visit__29TCastToPtr<15CGameProjectile>FR17CScriptVisorFlare": /* 800AD4B0 000AA410 38 00 00 00 */ li r0, 0 /* 800AD4B4 000AA414 90 03 00 04 */ stw r0, 4(r3) -/* 800AD4B8 000AA418 4E 80 00 20 */ blr +/* 800AD4B8 000AA418 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR14CScriptTrigger" "Visit__29TCastToPtr<15CGameProjectile>FR14CScriptTrigger": /* 800AD4BC 000AA41C 38 00 00 00 */ li r0, 0 /* 800AD4C0 000AA420 90 03 00 04 */ stw r0, 4(r3) -/* 800AD4C4 000AA424 4E 80 00 20 */ blr +/* 800AD4C4 000AA424 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR12CScriptTimer" "Visit__29TCastToPtr<15CGameProjectile>FR12CScriptTimer": /* 800AD4C8 000AA428 38 00 00 00 */ li r0, 0 /* 800AD4CC 000AA42C 90 03 00 04 */ stw r0, 4(r3) -/* 800AD4D0 000AA430 4E 80 00 20 */ blr +/* 800AD4D0 000AA430 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR10CTeamAiMgr" "Visit__29TCastToPtr<15CGameProjectile>FR10CTeamAiMgr": /* 800AD4D4 000AA434 38 00 00 00 */ li r0, 0 /* 800AD4D8 000AA438 90 03 00 04 */ stw r0, 4(r3) -/* 800AD4DC 000AA43C 4E 80 00 20 */ blr +/* 800AD4DC 000AA43C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR21CScriptTargetingPoint" "Visit__29TCastToPtr<15CGameProjectile>FR21CScriptTargetingPoint": /* 800AD4E0 000AA440 38 00 00 00 */ li r0, 0 /* 800AD4E4 000AA444 90 03 00 04 */ stw r0, 4(r3) -/* 800AD4E8 000AA448 4E 80 00 20 */ blr +/* 800AD4E8 000AA448 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR25CScriptSpiderBallWaypoint" "Visit__29TCastToPtr<15CGameProjectile>FR25CScriptSpiderBallWaypoint": /* 800AD4EC 000AA44C 38 00 00 00 */ li r0, 0 /* 800AD4F0 000AA450 90 03 00 04 */ stw r0, 4(r3) -/* 800AD4F4 000AA454 4E 80 00 20 */ blr +/* 800AD4F4 000AA454 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR34CScriptSpiderBallAttractionSurface" "Visit__29TCastToPtr<15CGameProjectile>FR34CScriptSpiderBallAttractionSurface": /* 800AD4F8 000AA458 38 00 00 00 */ li r0, 0 /* 800AD4FC 000AA45C 90 03 00 04 */ stw r0, 4(r3) -/* 800AD500 000AA460 4E 80 00 20 */ blr +/* 800AD500 000AA460 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR22CScriptSpecialFunction" "Visit__29TCastToPtr<15CGameProjectile>FR22CScriptSpecialFunction": /* 800AD504 000AA464 38 00 00 00 */ li r0, 0 /* 800AD508 000AA468 90 03 00 04 */ stw r0, 4(r3) -/* 800AD50C 000AA46C 4E 80 00 20 */ blr +/* 800AD50C 000AA46C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR17CScriptSpawnPoint" "Visit__29TCastToPtr<15CGameProjectile>FR17CScriptSpawnPoint": /* 800AD510 000AA470 38 00 00 00 */ li r0, 0 /* 800AD514 000AA474 90 03 00 04 */ stw r0, 4(r3) -/* 800AD518 000AA478 4E 80 00 20 */ blr +/* 800AD518 000AA478 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR12CScriptSound" "Visit__29TCastToPtr<15CGameProjectile>FR12CScriptSound": /* 800AD51C 000AA47C 38 00 00 00 */ li r0, 0 /* 800AD520 000AA480 90 03 00 04 */ stw r0, 4(r3) -/* 800AD524 000AA484 4E 80 00 20 */ blr +/* 800AD524 000AA484 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR20CScriptRoomAcoustics" "Visit__29TCastToPtr<15CGameProjectile>FR20CScriptRoomAcoustics": /* 800AD528 000AA488 38 00 00 00 */ li r0, 0 /* 800AD52C 000AA48C 90 03 00 04 */ stw r0, 4(r3) -/* 800AD530 000AA490 4E 80 00 20 */ blr +/* 800AD530 000AA490 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR22CScriptPointOfinterest" "Visit__29TCastToPtr<15CGameProjectile>FR22CScriptPointOfinterest": /* 800AD534 000AA494 38 00 00 00 */ li r0, 0 /* 800AD538 000AA498 90 03 00 04 */ stw r0, 4(r3) -/* 800AD53C 000AA49C 4E 80 00 20 */ blr +/* 800AD53C 000AA49C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR17CScriptPlayerHint" "Visit__29TCastToPtr<15CGameProjectile>FR17CScriptPlayerHint": /* 800AD540 000AA4A0 38 00 00 00 */ li r0, 0 /* 800AD544 000AA4A4 90 03 00 04 */ stw r0, 4(r3) -/* 800AD548 000AA4A8 4E 80 00 20 */ blr +/* 800AD548 000AA4A8 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR15CScriptPlatform" "Visit__29TCastToPtr<15CGameProjectile>FR15CScriptPlatform": /* 800AD54C 000AA4AC 38 00 00 00 */ li r0, 0 /* 800AD550 000AA4B0 90 03 00 04 */ stw r0, 4(r3) -/* 800AD554 000AA4B4 4E 80 00 20 */ blr +/* 800AD554 000AA4B4 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR13CScriptPickup" "Visit__29TCastToPtr<15CGameProjectile>FR13CScriptPickup": /* 800AD558 000AA4B8 38 00 00 00 */ li r0, 0 /* 800AD55C 000AA4BC 90 03 00 04 */ stw r0, 4(r3) -/* 800AD560 000AA4C0 4E 80 00 20 */ blr +/* 800AD560 000AA4C0 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR15CScriptMazeNode" "Visit__29TCastToPtr<15CGameProjectile>FR15CScriptMazeNode": /* 800AD564 000AA4C4 38 00 00 00 */ li r0, 0 /* 800AD568 000AA4C8 90 03 00 04 */ stw r0, 4(r3) -/* 800AD56C 000AA4CC 4E 80 00 20 */ blr +/* 800AD56C 000AA4CC 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR16CScriptGunTurret" "Visit__29TCastToPtr<15CGameProjectile>FR16CScriptGunTurret": /* 800AD570 000AA4D0 38 00 00 00 */ li r0, 0 /* 800AD574 000AA4D4 90 03 00 04 */ stw r0, 4(r3) -/* 800AD578 000AA4D8 4E 80 00 20 */ blr +/* 800AD578 000AA4D8 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR19CScriptGrapplePoint" "Visit__29TCastToPtr<15CGameProjectile>FR19CScriptGrapplePoint": /* 800AD57C 000AA4DC 38 00 00 00 */ li r0, 0 /* 800AD580 000AA4E0 90 03 00 04 */ stw r0, 4(r3) -/* 800AD584 000AA4E4 4E 80 00 20 */ blr +/* 800AD584 000AA4E4 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR13CScriptEffect" "Visit__29TCastToPtr<15CGameProjectile>FR13CScriptEffect": /* 800AD588 000AA4E8 38 00 00 00 */ li r0, 0 /* 800AD58C 000AA4EC 90 03 00 04 */ stw r0, 4(r3) -/* 800AD590 000AA4F0 4E 80 00 20 */ blr +/* 800AD590 000AA4F0 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR11CScriptDoor" "Visit__29TCastToPtr<15CGameProjectile>FR11CScriptDoor": /* 800AD594 000AA4F4 38 00 00 00 */ li r0, 0 /* 800AD598 000AA4F8 90 03 00 04 */ stw r0, 4(r3) -/* 800AD59C 000AA4FC 4E 80 00 20 */ blr +/* 800AD59C 000AA4FC 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR11CScriptDock" "Visit__29TCastToPtr<15CGameProjectile>FR11CScriptDock": /* 800AD5A0 000AA500 38 00 00 00 */ li r0, 0 /* 800AD5A4 000AA504 90 03 00 04 */ stw r0, 4(r3) -/* 800AD5A8 000AA508 4E 80 00 20 */ blr +/* 800AD5A8 000AA508 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR18CScriptDistanceFog" "Visit__29TCastToPtr<15CGameProjectile>FR18CScriptDistanceFog": /* 800AD5AC 000AA50C 38 00 00 00 */ li r0, 0 /* 800AD5B0 000AA510 90 03 00 04 */ stw r0, 4(r3) -/* 800AD5B4 000AA514 4E 80 00 20 */ blr +/* 800AD5B4 000AA514 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR26CScriptDebugCameraWaypoint" "Visit__29TCastToPtr<15CGameProjectile>FR26CScriptDebugCameraWaypoint": /* 800AD5B8 000AA518 38 00 00 00 */ li r0, 0 /* 800AD5BC 000AA51C 90 03 00 04 */ stw r0, 4(r3) -/* 800AD5C0 000AA520 4E 80 00 20 */ blr +/* 800AD5C0 000AA520 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR17CScriptCoverPoint" "Visit__29TCastToPtr<15CGameProjectile>FR17CScriptCoverPoint": /* 800AD5C4 000AA524 38 00 00 00 */ li r0, 0 /* 800AD5C8 000AA528 90 03 00 04 */ stw r0, 4(r3) -/* 800AD5CC 000AA52C 4E 80 00 20 */ blr +/* 800AD5CC 000AA52C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR21CScriptCameraWaypoint" "Visit__29TCastToPtr<15CGameProjectile>FR21CScriptCameraWaypoint": /* 800AD5D0 000AA530 38 00 00 00 */ li r0, 0 /* 800AD5D4 000AA534 90 03 00 04 */ stw r0, 4(r3) -/* 800AD5D8 000AA538 4E 80 00 20 */ blr +/* 800AD5D8 000AA538 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR24CScriptCameraPitchVolume" "Visit__29TCastToPtr<15CGameProjectile>FR24CScriptCameraPitchVolume": /* 800AD5DC 000AA53C 38 00 00 00 */ li r0, 0 /* 800AD5E0 000AA540 90 03 00 04 */ stw r0, 4(r3) -/* 800AD5E4 000AA544 4E 80 00 20 */ blr +/* 800AD5E4 000AA544 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR17CScriptCameraHint" "Visit__29TCastToPtr<15CGameProjectile>FR17CScriptCameraHint": /* 800AD5E8 000AA548 38 00 00 00 */ li r0, 0 /* 800AD5EC 000AA54C 90 03 00 04 */ stw r0, 4(r3) -/* 800AD5F0 000AA550 4E 80 00 20 */ blr +/* 800AD5F0 000AA550 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR18CScriptAiJumpPoint" "Visit__29TCastToPtr<15CGameProjectile>FR18CScriptAiJumpPoint": /* 800AD5F4 000AA554 38 00 00 00 */ li r0, 0 /* 800AD5F8 000AA558 90 03 00 04 */ stw r0, 4(r3) -/* 800AD5FC 000AA55C 4E 80 00 20 */ blr +/* 800AD5FC 000AA55C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR20CScriptActorKeyframe" "Visit__29TCastToPtr<15CGameProjectile>FR20CScriptActorKeyframe": /* 800AD600 000AA560 38 00 00 00 */ li r0, 0 /* 800AD604 000AA564 90 03 00 04 */ stw r0, 4(r3) -/* 800AD608 000AA568 4E 80 00 20 */ blr +/* 800AD608 000AA568 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR12CScriptActor" "Visit__29TCastToPtr<15CGameProjectile>FR12CScriptActor": /* 800AD60C 000AA56C 38 00 00 00 */ li r0, 0 /* 800AD610 000AA570 90 03 00 04 */ stw r0, 4(r3) -/* 800AD614 000AA574 4E 80 00 20 */ blr +/* 800AD614 000AA574 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR9CRepulsor" "Visit__29TCastToPtr<15CGameProjectile>FR9CRepulsor": /* 800AD618 000AA578 38 00 00 00 */ li r0, 0 /* 800AD61C 000AA57C 90 03 00 04 */ stw r0, 4(r3) -/* 800AD620 000AA580 4E 80 00 20 */ blr +/* 800AD620 000AA580 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR7CPlayer" "Visit__29TCastToPtr<15CGameProjectile>FR7CPlayer": /* 800AD624 000AA584 38 00 00 00 */ li r0, 0 /* 800AD628 000AA588 90 03 00 04 */ stw r0, 4(r3) -/* 800AD62C 000AA58C 4E 80 00 20 */ blr +/* 800AD62C 000AA58C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR13CPhysicsActor" "Visit__29TCastToPtr<15CGameProjectile>FR13CPhysicsActor": /* 800AD630 000AA590 38 00 00 00 */ li r0, 0 /* 800AD634 000AA594 90 03 00 04 */ stw r0, 4(r3) -/* 800AD638 000AA598 4E 80 00 20 */ blr +/* 800AD638 000AA598 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR3CAi" "Visit__29TCastToPtr<15CGameProjectile>FR3CAi": /* 800AD63C 000AA59C 38 00 00 00 */ li r0, 0 /* 800AD640 000AA5A0 90 03 00 04 */ stw r0, 4(r3) -/* 800AD644 000AA5A4 4E 80 00 20 */ blr +/* 800AD644 000AA5A4 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR11CPathCamera" "Visit__29TCastToPtr<15CGameProjectile>FR11CPathCamera": /* 800AD648 000AA5A8 38 00 00 00 */ li r0, 0 /* 800AD64C 000AA5AC 90 03 00 04 */ stw r0, 4(r3) -/* 800AD650 000AA5B0 4E 80 00 20 */ blr +/* 800AD650 000AA5B0 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR18CMetroidPrimeRelay" "Visit__29TCastToPtr<15CGameProjectile>FR18CMetroidPrimeRelay": /* 800AD654 000AA5B4 38 00 00 00 */ li r0, 0 /* 800AD658 000AA5B8 90 03 00 04 */ stw r0, 4(r3) -/* 800AD65C 000AA5BC 4E 80 00 20 */ blr +/* 800AD65C 000AA5BC 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR19CHUDBillboardEffect" "Visit__29TCastToPtr<15CGameProjectile>FR19CHUDBillboardEffect": /* 800AD660 000AA5C0 38 00 00 00 */ li r0, 0 /* 800AD664 000AA5C4 90 03 00 04 */ stw r0, 4(r3) -/* 800AD668 000AA5C8 4E 80 00 20 */ blr +/* 800AD668 000AA5C8 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR15CGameProjectile" "Visit__29TCastToPtr<15CGameProjectile>FR15CGameProjectile": /* 800AD66C 000AA5CC 90 83 00 04 */ stw r4, 4(r3) -/* 800AD670 000AA5D0 4E 80 00 20 */ blr +/* 800AD670 000AA5D0 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR10CGameLight" "Visit__29TCastToPtr<15CGameProjectile>FR10CGameLight": /* 800AD674 000AA5D4 38 00 00 00 */ li r0, 0 /* 800AD678 000AA5D8 90 03 00 04 */ stw r0, 4(r3) -/* 800AD67C 000AA5DC 4E 80 00 20 */ blr +/* 800AD67C 000AA5DC 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR11CGameCamera" "Visit__29TCastToPtr<15CGameProjectile>FR11CGameCamera": /* 800AD680 000AA5E0 38 00 00 00 */ li r0, 0 /* 800AD684 000AA5E4 90 03 00 04 */ stw r0, 4(r3) -/* 800AD688 000AA5E8 4E 80 00 20 */ blr +/* 800AD688 000AA5E8 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR10CFishCloud" "Visit__29TCastToPtr<15CGameProjectile>FR10CFishCloud": /* 800AD68C 000AA5EC 38 00 00 00 */ li r0, 0 /* 800AD690 000AA5F0 90 03 00 04 */ stw r0, 4(r3) -/* 800AD694 000AA5F4 4E 80 00 20 */ blr +/* 800AD694 000AA5F4 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR18CFirstPersonCamera" "Visit__29TCastToPtr<15CGameProjectile>FR18CFirstPersonCamera": /* 800AD698 000AA5F8 38 00 00 00 */ li r0, 0 /* 800AD69C 000AA5FC 90 03 00 04 */ stw r0, 4(r3) -/* 800AD6A0 000AA600 4E 80 00 20 */ blr +/* 800AD6A0 000AA600 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR10CExplosion" "Visit__29TCastToPtr<15CGameProjectile>FR10CExplosion": /* 800AD6A4 000AA604 38 00 00 00 */ li r0, 0 /* 800AD6A8 000AA608 90 03 00 04 */ stw r0, 4(r3) -/* 800AD6AC 000AA60C 4E 80 00 20 */ blr +/* 800AD6AC 000AA60C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR7CEntity" "Visit__29TCastToPtr<15CGameProjectile>FR7CEntity": /* 800AD6B0 000AA610 38 00 00 00 */ li r0, 0 /* 800AD6B4 000AA614 90 03 00 04 */ stw r0, 4(r3) -/* 800AD6B8 000AA618 4E 80 00 20 */ blr +/* 800AD6B8 000AA618 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR17CEnergyProjectile" "Visit__29TCastToPtr<15CGameProjectile>FR17CEnergyProjectile": /* 800AD6BC 000AA61C 90 83 00 04 */ stw r4, 4(r3) -/* 800AD6C0 000AA620 4E 80 00 20 */ blr +/* 800AD6C0 000AA620 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR16CDestroyableRock" "Visit__29TCastToPtr<15CGameProjectile>FR16CDestroyableRock": /* 800AD6C4 000AA624 38 00 00 00 */ li r0, 0 /* 800AD6C8 000AA628 90 03 00 04 */ stw r0, 4(r3) -/* 800AD6CC 000AA62C 4E 80 00 20 */ blr +/* 800AD6CC 000AA62C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR15CCollisionActor" "Visit__29TCastToPtr<15CGameProjectile>FR15CCollisionActor": /* 800AD6D0 000AA630 38 00 00 00 */ li r0, 0 /* 800AD6D4 000AA634 90 03 00 04 */ stw r0, 4(r3) -/* 800AD6D8 000AA638 4E 80 00 20 */ blr +/* 800AD6D8 000AA638 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR16CCinematicCamera" "Visit__29TCastToPtr<15CGameProjectile>FR16CCinematicCamera": /* 800AD6DC 000AA63C 38 00 00 00 */ li r0, 0 /* 800AD6E0 000AA640 90 03 00 04 */ stw r0, 4(r3) -/* 800AD6E4 000AA644 4E 80 00 20 */ blr +/* 800AD6E4 000AA644 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR5CBomb" "Visit__29TCastToPtr<15CGameProjectile>FR5CBomb": /* 800AD6E8 000AA648 38 00 00 00 */ li r0, 0 /* 800AD6EC 000AA64C 90 03 00 04 */ stw r0, 4(r3) -/* 800AD6F0 000AA650 4E 80 00 20 */ blr +/* 800AD6F0 000AA650 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR11CBallCamera" "Visit__29TCastToPtr<15CGameProjectile>FR11CBallCamera": /* 800AD6F4 000AA654 38 00 00 00 */ li r0, 0 /* 800AD6F8 000AA658 90 03 00 04 */ stw r0, 4(r3) -/* 800AD6FC 000AA65C 4E 80 00 20 */ blr +/* 800AD6FC 000AA65C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CGameProjectile>FR6CActor" "Visit__29TCastToPtr<15CGameProjectile>FR6CActor": /* 800AD700 000AA660 38 00 00 00 */ li r0, 0 /* 800AD704 000AA664 90 03 00 04 */ stw r0, 4(r3) -/* 800AD708 000AA668 4E 80 00 20 */ blr +/* 800AD708 000AA668 4E 80 00 20 */ blr .global "__ct__29TCastToPtr<15CGameProjectile>FP7CEntity" "__ct__29TCastToPtr<15CGameProjectile>FP7CEntity": @@ -18886,14 +18886,14 @@ lbl_800AD450: /* 800AD750 000AA6B0 81 83 00 00 */ lwz r12, 0(r3) /* 800AD754 000AA6B4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800AD758 000AA6B8 7D 89 03 A6 */ mtctr r12 -/* 800AD75C 000AA6BC 4E 80 04 21 */ bctrl +/* 800AD75C 000AA6BC 4E 80 04 21 */ bctrl lbl_800AD760: /* 800AD760 000AA6C0 80 01 00 14 */ lwz r0, 0x14(r1) /* 800AD764 000AA6C4 7F E3 FB 78 */ mr r3, r31 /* 800AD768 000AA6C8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800AD76C 000AA6CC 7C 08 03 A6 */ mtlr r0 /* 800AD770 000AA6D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800AD774 000AA6D4 4E 80 00 20 */ blr +/* 800AD774 000AA6D4 4E 80 00 20 */ blr .global "__ct__29TCastToPtr<15CGameProjectile>FR7CEntity" "__ct__29TCastToPtr<15CGameProjectile>FR7CEntity": @@ -18915,354 +18915,354 @@ lbl_800AD760: /* 800AD7B4 000AA714 81 83 00 00 */ lwz r12, 0(r3) /* 800AD7B8 000AA718 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800AD7BC 000AA71C 7D 89 03 A6 */ mtctr r12 -/* 800AD7C0 000AA720 4E 80 04 21 */ bctrl +/* 800AD7C0 000AA720 4E 80 04 21 */ bctrl /* 800AD7C4 000AA724 80 01 00 14 */ lwz r0, 0x14(r1) /* 800AD7C8 000AA728 7F E3 FB 78 */ mr r3, r31 /* 800AD7CC 000AA72C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800AD7D0 000AA730 7C 08 03 A6 */ mtlr r0 /* 800AD7D4 000AA734 38 21 00 10 */ addi r1, r1, 0x10 -/* 800AD7D8 000AA738 4E 80 00 20 */ blr +/* 800AD7D8 000AA738 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR7CWeapon" "Visit__24TCastToPtr<10CGameLight>FR7CWeapon": /* 800AD7DC 000AA73C 38 00 00 00 */ li r0, 0 /* 800AD7E0 000AA740 90 03 00 04 */ stw r0, 4(r3) -/* 800AD7E4 000AA744 4E 80 00 20 */ blr +/* 800AD7E4 000AA744 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR17CWallCrawlerSwarm" "Visit__24TCastToPtr<10CGameLight>FR17CWallCrawlerSwarm": /* 800AD7E8 000AA748 38 00 00 00 */ li r0, 0 /* 800AD7EC 000AA74C 90 03 00 04 */ stw r0, 4(r3) -/* 800AD7F0 000AA750 4E 80 00 20 */ blr +/* 800AD7F0 000AA750 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR20CScriptSpindleCamera" "Visit__24TCastToPtr<10CGameLight>FR20CScriptSpindleCamera": /* 800AD7F4 000AA754 38 00 00 00 */ li r0, 0 /* 800AD7F8 000AA758 90 03 00 04 */ stw r0, 4(r3) -/* 800AD7FC 000AA75C 4E 80 00 20 */ blr +/* 800AD7FC 000AA75C 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR15CSnakeWeedSwarm" "Visit__24TCastToPtr<10CGameLight>FR15CSnakeWeedSwarm": /* 800AD800 000AA760 38 00 00 00 */ li r0, 0 /* 800AD804 000AA764 90 03 00 04 */ stw r0, 4(r3) -/* 800AD808 000AA768 4E 80 00 20 */ blr +/* 800AD808 000AA768 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR15CScriptWaypoint" "Visit__24TCastToPtr<10CGameLight>FR15CScriptWaypoint": /* 800AD80C 000AA76C 38 00 00 00 */ li r0, 0 /* 800AD810 000AA770 90 03 00 04 */ stw r0, 4(r3) -/* 800AD814 000AA774 4E 80 00 20 */ blr +/* 800AD814 000AA774 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR12CScriptWater" "Visit__24TCastToPtr<10CGameLight>FR12CScriptWater": /* 800AD818 000AA778 38 00 00 00 */ li r0, 0 /* 800AD81C 000AA77C 90 03 00 04 */ stw r0, 4(r3) -/* 800AD820 000AA780 4E 80 00 20 */ blr +/* 800AD820 000AA780 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR17CScriptVisorFlare" "Visit__24TCastToPtr<10CGameLight>FR17CScriptVisorFlare": /* 800AD824 000AA784 38 00 00 00 */ li r0, 0 /* 800AD828 000AA788 90 03 00 04 */ stw r0, 4(r3) -/* 800AD82C 000AA78C 4E 80 00 20 */ blr +/* 800AD82C 000AA78C 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR14CScriptTrigger" "Visit__24TCastToPtr<10CGameLight>FR14CScriptTrigger": /* 800AD830 000AA790 38 00 00 00 */ li r0, 0 /* 800AD834 000AA794 90 03 00 04 */ stw r0, 4(r3) -/* 800AD838 000AA798 4E 80 00 20 */ blr +/* 800AD838 000AA798 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR12CScriptTimer" "Visit__24TCastToPtr<10CGameLight>FR12CScriptTimer": /* 800AD83C 000AA79C 38 00 00 00 */ li r0, 0 /* 800AD840 000AA7A0 90 03 00 04 */ stw r0, 4(r3) -/* 800AD844 000AA7A4 4E 80 00 20 */ blr +/* 800AD844 000AA7A4 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR10CTeamAiMgr" "Visit__24TCastToPtr<10CGameLight>FR10CTeamAiMgr": /* 800AD848 000AA7A8 38 00 00 00 */ li r0, 0 /* 800AD84C 000AA7AC 90 03 00 04 */ stw r0, 4(r3) -/* 800AD850 000AA7B0 4E 80 00 20 */ blr +/* 800AD850 000AA7B0 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR21CScriptTargetingPoint" "Visit__24TCastToPtr<10CGameLight>FR21CScriptTargetingPoint": /* 800AD854 000AA7B4 38 00 00 00 */ li r0, 0 /* 800AD858 000AA7B8 90 03 00 04 */ stw r0, 4(r3) -/* 800AD85C 000AA7BC 4E 80 00 20 */ blr +/* 800AD85C 000AA7BC 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR25CScriptSpiderBallWaypoint" "Visit__24TCastToPtr<10CGameLight>FR25CScriptSpiderBallWaypoint": /* 800AD860 000AA7C0 38 00 00 00 */ li r0, 0 /* 800AD864 000AA7C4 90 03 00 04 */ stw r0, 4(r3) -/* 800AD868 000AA7C8 4E 80 00 20 */ blr +/* 800AD868 000AA7C8 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR34CScriptSpiderBallAttractionSurface" "Visit__24TCastToPtr<10CGameLight>FR34CScriptSpiderBallAttractionSurface": /* 800AD86C 000AA7CC 38 00 00 00 */ li r0, 0 /* 800AD870 000AA7D0 90 03 00 04 */ stw r0, 4(r3) -/* 800AD874 000AA7D4 4E 80 00 20 */ blr +/* 800AD874 000AA7D4 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR22CScriptSpecialFunction" "Visit__24TCastToPtr<10CGameLight>FR22CScriptSpecialFunction": /* 800AD878 000AA7D8 38 00 00 00 */ li r0, 0 /* 800AD87C 000AA7DC 90 03 00 04 */ stw r0, 4(r3) -/* 800AD880 000AA7E0 4E 80 00 20 */ blr +/* 800AD880 000AA7E0 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR17CScriptSpawnPoint" "Visit__24TCastToPtr<10CGameLight>FR17CScriptSpawnPoint": /* 800AD884 000AA7E4 38 00 00 00 */ li r0, 0 /* 800AD888 000AA7E8 90 03 00 04 */ stw r0, 4(r3) -/* 800AD88C 000AA7EC 4E 80 00 20 */ blr +/* 800AD88C 000AA7EC 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR12CScriptSound" "Visit__24TCastToPtr<10CGameLight>FR12CScriptSound": /* 800AD890 000AA7F0 38 00 00 00 */ li r0, 0 /* 800AD894 000AA7F4 90 03 00 04 */ stw r0, 4(r3) -/* 800AD898 000AA7F8 4E 80 00 20 */ blr +/* 800AD898 000AA7F8 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR20CScriptRoomAcoustics" "Visit__24TCastToPtr<10CGameLight>FR20CScriptRoomAcoustics": /* 800AD89C 000AA7FC 38 00 00 00 */ li r0, 0 /* 800AD8A0 000AA800 90 03 00 04 */ stw r0, 4(r3) -/* 800AD8A4 000AA804 4E 80 00 20 */ blr +/* 800AD8A4 000AA804 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR22CScriptPointOfinterest" "Visit__24TCastToPtr<10CGameLight>FR22CScriptPointOfinterest": /* 800AD8A8 000AA808 38 00 00 00 */ li r0, 0 /* 800AD8AC 000AA80C 90 03 00 04 */ stw r0, 4(r3) -/* 800AD8B0 000AA810 4E 80 00 20 */ blr +/* 800AD8B0 000AA810 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR17CScriptPlayerHint" "Visit__24TCastToPtr<10CGameLight>FR17CScriptPlayerHint": /* 800AD8B4 000AA814 38 00 00 00 */ li r0, 0 /* 800AD8B8 000AA818 90 03 00 04 */ stw r0, 4(r3) -/* 800AD8BC 000AA81C 4E 80 00 20 */ blr +/* 800AD8BC 000AA81C 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR15CScriptPlatform" "Visit__24TCastToPtr<10CGameLight>FR15CScriptPlatform": /* 800AD8C0 000AA820 38 00 00 00 */ li r0, 0 /* 800AD8C4 000AA824 90 03 00 04 */ stw r0, 4(r3) -/* 800AD8C8 000AA828 4E 80 00 20 */ blr +/* 800AD8C8 000AA828 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR13CScriptPickup" "Visit__24TCastToPtr<10CGameLight>FR13CScriptPickup": /* 800AD8CC 000AA82C 38 00 00 00 */ li r0, 0 /* 800AD8D0 000AA830 90 03 00 04 */ stw r0, 4(r3) -/* 800AD8D4 000AA834 4E 80 00 20 */ blr +/* 800AD8D4 000AA834 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR15CScriptMazeNode" "Visit__24TCastToPtr<10CGameLight>FR15CScriptMazeNode": /* 800AD8D8 000AA838 38 00 00 00 */ li r0, 0 /* 800AD8DC 000AA83C 90 03 00 04 */ stw r0, 4(r3) -/* 800AD8E0 000AA840 4E 80 00 20 */ blr +/* 800AD8E0 000AA840 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR16CScriptGunTurret" "Visit__24TCastToPtr<10CGameLight>FR16CScriptGunTurret": /* 800AD8E4 000AA844 38 00 00 00 */ li r0, 0 /* 800AD8E8 000AA848 90 03 00 04 */ stw r0, 4(r3) -/* 800AD8EC 000AA84C 4E 80 00 20 */ blr +/* 800AD8EC 000AA84C 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR19CScriptGrapplePoint" "Visit__24TCastToPtr<10CGameLight>FR19CScriptGrapplePoint": /* 800AD8F0 000AA850 38 00 00 00 */ li r0, 0 /* 800AD8F4 000AA854 90 03 00 04 */ stw r0, 4(r3) -/* 800AD8F8 000AA858 4E 80 00 20 */ blr +/* 800AD8F8 000AA858 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR13CScriptEffect" "Visit__24TCastToPtr<10CGameLight>FR13CScriptEffect": /* 800AD8FC 000AA85C 38 00 00 00 */ li r0, 0 /* 800AD900 000AA860 90 03 00 04 */ stw r0, 4(r3) -/* 800AD904 000AA864 4E 80 00 20 */ blr +/* 800AD904 000AA864 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR11CScriptDoor" "Visit__24TCastToPtr<10CGameLight>FR11CScriptDoor": /* 800AD908 000AA868 38 00 00 00 */ li r0, 0 /* 800AD90C 000AA86C 90 03 00 04 */ stw r0, 4(r3) -/* 800AD910 000AA870 4E 80 00 20 */ blr +/* 800AD910 000AA870 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR11CScriptDock" "Visit__24TCastToPtr<10CGameLight>FR11CScriptDock": /* 800AD914 000AA874 38 00 00 00 */ li r0, 0 /* 800AD918 000AA878 90 03 00 04 */ stw r0, 4(r3) -/* 800AD91C 000AA87C 4E 80 00 20 */ blr +/* 800AD91C 000AA87C 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR18CScriptDistanceFog" "Visit__24TCastToPtr<10CGameLight>FR18CScriptDistanceFog": /* 800AD920 000AA880 38 00 00 00 */ li r0, 0 /* 800AD924 000AA884 90 03 00 04 */ stw r0, 4(r3) -/* 800AD928 000AA888 4E 80 00 20 */ blr +/* 800AD928 000AA888 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR26CScriptDebugCameraWaypoint" "Visit__24TCastToPtr<10CGameLight>FR26CScriptDebugCameraWaypoint": /* 800AD92C 000AA88C 38 00 00 00 */ li r0, 0 /* 800AD930 000AA890 90 03 00 04 */ stw r0, 4(r3) -/* 800AD934 000AA894 4E 80 00 20 */ blr +/* 800AD934 000AA894 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR17CScriptCoverPoint" "Visit__24TCastToPtr<10CGameLight>FR17CScriptCoverPoint": /* 800AD938 000AA898 38 00 00 00 */ li r0, 0 /* 800AD93C 000AA89C 90 03 00 04 */ stw r0, 4(r3) -/* 800AD940 000AA8A0 4E 80 00 20 */ blr +/* 800AD940 000AA8A0 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR21CScriptCameraWaypoint" "Visit__24TCastToPtr<10CGameLight>FR21CScriptCameraWaypoint": /* 800AD944 000AA8A4 38 00 00 00 */ li r0, 0 /* 800AD948 000AA8A8 90 03 00 04 */ stw r0, 4(r3) -/* 800AD94C 000AA8AC 4E 80 00 20 */ blr +/* 800AD94C 000AA8AC 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR24CScriptCameraPitchVolume" "Visit__24TCastToPtr<10CGameLight>FR24CScriptCameraPitchVolume": /* 800AD950 000AA8B0 38 00 00 00 */ li r0, 0 /* 800AD954 000AA8B4 90 03 00 04 */ stw r0, 4(r3) -/* 800AD958 000AA8B8 4E 80 00 20 */ blr +/* 800AD958 000AA8B8 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR17CScriptCameraHint" "Visit__24TCastToPtr<10CGameLight>FR17CScriptCameraHint": /* 800AD95C 000AA8BC 38 00 00 00 */ li r0, 0 /* 800AD960 000AA8C0 90 03 00 04 */ stw r0, 4(r3) -/* 800AD964 000AA8C4 4E 80 00 20 */ blr +/* 800AD964 000AA8C4 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR18CScriptAiJumpPoint" "Visit__24TCastToPtr<10CGameLight>FR18CScriptAiJumpPoint": /* 800AD968 000AA8C8 38 00 00 00 */ li r0, 0 /* 800AD96C 000AA8CC 90 03 00 04 */ stw r0, 4(r3) -/* 800AD970 000AA8D0 4E 80 00 20 */ blr +/* 800AD970 000AA8D0 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR20CScriptActorKeyframe" "Visit__24TCastToPtr<10CGameLight>FR20CScriptActorKeyframe": /* 800AD974 000AA8D4 38 00 00 00 */ li r0, 0 /* 800AD978 000AA8D8 90 03 00 04 */ stw r0, 4(r3) -/* 800AD97C 000AA8DC 4E 80 00 20 */ blr +/* 800AD97C 000AA8DC 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR12CScriptActor" "Visit__24TCastToPtr<10CGameLight>FR12CScriptActor": /* 800AD980 000AA8E0 38 00 00 00 */ li r0, 0 /* 800AD984 000AA8E4 90 03 00 04 */ stw r0, 4(r3) -/* 800AD988 000AA8E8 4E 80 00 20 */ blr +/* 800AD988 000AA8E8 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR9CRepulsor" "Visit__24TCastToPtr<10CGameLight>FR9CRepulsor": /* 800AD98C 000AA8EC 38 00 00 00 */ li r0, 0 /* 800AD990 000AA8F0 90 03 00 04 */ stw r0, 4(r3) -/* 800AD994 000AA8F4 4E 80 00 20 */ blr +/* 800AD994 000AA8F4 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR7CPlayer" "Visit__24TCastToPtr<10CGameLight>FR7CPlayer": /* 800AD998 000AA8F8 38 00 00 00 */ li r0, 0 /* 800AD99C 000AA8FC 90 03 00 04 */ stw r0, 4(r3) -/* 800AD9A0 000AA900 4E 80 00 20 */ blr +/* 800AD9A0 000AA900 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR13CPhysicsActor" "Visit__24TCastToPtr<10CGameLight>FR13CPhysicsActor": /* 800AD9A4 000AA904 38 00 00 00 */ li r0, 0 /* 800AD9A8 000AA908 90 03 00 04 */ stw r0, 4(r3) -/* 800AD9AC 000AA90C 4E 80 00 20 */ blr +/* 800AD9AC 000AA90C 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR3CAi" "Visit__24TCastToPtr<10CGameLight>FR3CAi": /* 800AD9B0 000AA910 38 00 00 00 */ li r0, 0 /* 800AD9B4 000AA914 90 03 00 04 */ stw r0, 4(r3) -/* 800AD9B8 000AA918 4E 80 00 20 */ blr +/* 800AD9B8 000AA918 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR11CPathCamera" "Visit__24TCastToPtr<10CGameLight>FR11CPathCamera": /* 800AD9BC 000AA91C 38 00 00 00 */ li r0, 0 /* 800AD9C0 000AA920 90 03 00 04 */ stw r0, 4(r3) -/* 800AD9C4 000AA924 4E 80 00 20 */ blr +/* 800AD9C4 000AA924 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR18CMetroidPrimeRelay" "Visit__24TCastToPtr<10CGameLight>FR18CMetroidPrimeRelay": /* 800AD9C8 000AA928 38 00 00 00 */ li r0, 0 /* 800AD9CC 000AA92C 90 03 00 04 */ stw r0, 4(r3) -/* 800AD9D0 000AA930 4E 80 00 20 */ blr +/* 800AD9D0 000AA930 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR19CHUDBillboardEffect" "Visit__24TCastToPtr<10CGameLight>FR19CHUDBillboardEffect": /* 800AD9D4 000AA934 38 00 00 00 */ li r0, 0 /* 800AD9D8 000AA938 90 03 00 04 */ stw r0, 4(r3) -/* 800AD9DC 000AA93C 4E 80 00 20 */ blr +/* 800AD9DC 000AA93C 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR15CGameProjectile" "Visit__24TCastToPtr<10CGameLight>FR15CGameProjectile": /* 800AD9E0 000AA940 38 00 00 00 */ li r0, 0 /* 800AD9E4 000AA944 90 03 00 04 */ stw r0, 4(r3) -/* 800AD9E8 000AA948 4E 80 00 20 */ blr +/* 800AD9E8 000AA948 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR10CGameLight" "Visit__24TCastToPtr<10CGameLight>FR10CGameLight": /* 800AD9EC 000AA94C 90 83 00 04 */ stw r4, 4(r3) -/* 800AD9F0 000AA950 4E 80 00 20 */ blr +/* 800AD9F0 000AA950 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR11CGameCamera" "Visit__24TCastToPtr<10CGameLight>FR11CGameCamera": /* 800AD9F4 000AA954 38 00 00 00 */ li r0, 0 /* 800AD9F8 000AA958 90 03 00 04 */ stw r0, 4(r3) -/* 800AD9FC 000AA95C 4E 80 00 20 */ blr +/* 800AD9FC 000AA95C 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR10CFishCloud" "Visit__24TCastToPtr<10CGameLight>FR10CFishCloud": /* 800ADA00 000AA960 38 00 00 00 */ li r0, 0 /* 800ADA04 000AA964 90 03 00 04 */ stw r0, 4(r3) -/* 800ADA08 000AA968 4E 80 00 20 */ blr +/* 800ADA08 000AA968 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR18CFirstPersonCamera" "Visit__24TCastToPtr<10CGameLight>FR18CFirstPersonCamera": /* 800ADA0C 000AA96C 38 00 00 00 */ li r0, 0 /* 800ADA10 000AA970 90 03 00 04 */ stw r0, 4(r3) -/* 800ADA14 000AA974 4E 80 00 20 */ blr +/* 800ADA14 000AA974 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR10CExplosion" "Visit__24TCastToPtr<10CGameLight>FR10CExplosion": /* 800ADA18 000AA978 38 00 00 00 */ li r0, 0 /* 800ADA1C 000AA97C 90 03 00 04 */ stw r0, 4(r3) -/* 800ADA20 000AA980 4E 80 00 20 */ blr +/* 800ADA20 000AA980 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR7CEntity" "Visit__24TCastToPtr<10CGameLight>FR7CEntity": /* 800ADA24 000AA984 38 00 00 00 */ li r0, 0 /* 800ADA28 000AA988 90 03 00 04 */ stw r0, 4(r3) -/* 800ADA2C 000AA98C 4E 80 00 20 */ blr +/* 800ADA2C 000AA98C 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR17CEnergyProjectile" "Visit__24TCastToPtr<10CGameLight>FR17CEnergyProjectile": /* 800ADA30 000AA990 38 00 00 00 */ li r0, 0 /* 800ADA34 000AA994 90 03 00 04 */ stw r0, 4(r3) -/* 800ADA38 000AA998 4E 80 00 20 */ blr +/* 800ADA38 000AA998 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR16CDestroyableRock" "Visit__24TCastToPtr<10CGameLight>FR16CDestroyableRock": /* 800ADA3C 000AA99C 38 00 00 00 */ li r0, 0 /* 800ADA40 000AA9A0 90 03 00 04 */ stw r0, 4(r3) -/* 800ADA44 000AA9A4 4E 80 00 20 */ blr +/* 800ADA44 000AA9A4 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR15CCollisionActor" "Visit__24TCastToPtr<10CGameLight>FR15CCollisionActor": /* 800ADA48 000AA9A8 38 00 00 00 */ li r0, 0 /* 800ADA4C 000AA9AC 90 03 00 04 */ stw r0, 4(r3) -/* 800ADA50 000AA9B0 4E 80 00 20 */ blr +/* 800ADA50 000AA9B0 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR16CCinematicCamera" "Visit__24TCastToPtr<10CGameLight>FR16CCinematicCamera": /* 800ADA54 000AA9B4 38 00 00 00 */ li r0, 0 /* 800ADA58 000AA9B8 90 03 00 04 */ stw r0, 4(r3) -/* 800ADA5C 000AA9BC 4E 80 00 20 */ blr +/* 800ADA5C 000AA9BC 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR5CBomb" "Visit__24TCastToPtr<10CGameLight>FR5CBomb": /* 800ADA60 000AA9C0 38 00 00 00 */ li r0, 0 /* 800ADA64 000AA9C4 90 03 00 04 */ stw r0, 4(r3) -/* 800ADA68 000AA9C8 4E 80 00 20 */ blr +/* 800ADA68 000AA9C8 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR11CBallCamera" "Visit__24TCastToPtr<10CGameLight>FR11CBallCamera": /* 800ADA6C 000AA9CC 38 00 00 00 */ li r0, 0 /* 800ADA70 000AA9D0 90 03 00 04 */ stw r0, 4(r3) -/* 800ADA74 000AA9D4 4E 80 00 20 */ blr +/* 800ADA74 000AA9D4 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CGameLight>FR6CActor" "Visit__24TCastToPtr<10CGameLight>FR6CActor": /* 800ADA78 000AA9D8 38 00 00 00 */ li r0, 0 /* 800ADA7C 000AA9DC 90 03 00 04 */ stw r0, 4(r3) -/* 800ADA80 000AA9E0 4E 80 00 20 */ blr +/* 800ADA80 000AA9E0 4E 80 00 20 */ blr .global "__ct__24TCastToPtr<10CGameLight>FP7CEntity" "__ct__24TCastToPtr<10CGameLight>FP7CEntity": @@ -19286,14 +19286,14 @@ lbl_800AD760: /* 800ADAC8 000AAA28 81 83 00 00 */ lwz r12, 0(r3) /* 800ADACC 000AAA2C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800ADAD0 000AAA30 7D 89 03 A6 */ mtctr r12 -/* 800ADAD4 000AAA34 4E 80 04 21 */ bctrl +/* 800ADAD4 000AAA34 4E 80 04 21 */ bctrl lbl_800ADAD8: /* 800ADAD8 000AAA38 80 01 00 14 */ lwz r0, 0x14(r1) /* 800ADADC 000AAA3C 7F E3 FB 78 */ mr r3, r31 /* 800ADAE0 000AAA40 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800ADAE4 000AAA44 7C 08 03 A6 */ mtlr r0 /* 800ADAE8 000AAA48 38 21 00 10 */ addi r1, r1, 0x10 -/* 800ADAEC 000AAA4C 4E 80 00 20 */ blr +/* 800ADAEC 000AAA4C 4E 80 00 20 */ blr .global "__ct__24TCastToPtr<10CGameLight>FR7CEntity" "__ct__24TCastToPtr<10CGameLight>FR7CEntity": @@ -19315,349 +19315,349 @@ lbl_800ADAD8: /* 800ADB2C 000AAA8C 81 83 00 00 */ lwz r12, 0(r3) /* 800ADB30 000AAA90 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800ADB34 000AAA94 7D 89 03 A6 */ mtctr r12 -/* 800ADB38 000AAA98 4E 80 04 21 */ bctrl +/* 800ADB38 000AAA98 4E 80 04 21 */ bctrl /* 800ADB3C 000AAA9C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800ADB40 000AAAA0 7F E3 FB 78 */ mr r3, r31 /* 800ADB44 000AAAA4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800ADB48 000AAAA8 7C 08 03 A6 */ mtlr r0 /* 800ADB4C 000AAAAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800ADB50 000AAAB0 4E 80 00 20 */ blr +/* 800ADB50 000AAAB0 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR7CWeapon" "Visit__25TCastToPtr<11CGameCamera>FR7CWeapon": /* 800ADB54 000AAAB4 38 00 00 00 */ li r0, 0 /* 800ADB58 000AAAB8 90 03 00 04 */ stw r0, 4(r3) -/* 800ADB5C 000AAABC 4E 80 00 20 */ blr +/* 800ADB5C 000AAABC 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR17CWallCrawlerSwarm" "Visit__25TCastToPtr<11CGameCamera>FR17CWallCrawlerSwarm": /* 800ADB60 000AAAC0 38 00 00 00 */ li r0, 0 /* 800ADB64 000AAAC4 90 03 00 04 */ stw r0, 4(r3) -/* 800ADB68 000AAAC8 4E 80 00 20 */ blr +/* 800ADB68 000AAAC8 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR20CScriptSpindleCamera" "Visit__25TCastToPtr<11CGameCamera>FR20CScriptSpindleCamera": /* 800ADB6C 000AAACC 90 83 00 04 */ stw r4, 4(r3) -/* 800ADB70 000AAAD0 4E 80 00 20 */ blr +/* 800ADB70 000AAAD0 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR15CSnakeWeedSwarm" "Visit__25TCastToPtr<11CGameCamera>FR15CSnakeWeedSwarm": /* 800ADB74 000AAAD4 38 00 00 00 */ li r0, 0 /* 800ADB78 000AAAD8 90 03 00 04 */ stw r0, 4(r3) -/* 800ADB7C 000AAADC 4E 80 00 20 */ blr +/* 800ADB7C 000AAADC 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR15CScriptWaypoint" "Visit__25TCastToPtr<11CGameCamera>FR15CScriptWaypoint": /* 800ADB80 000AAAE0 38 00 00 00 */ li r0, 0 /* 800ADB84 000AAAE4 90 03 00 04 */ stw r0, 4(r3) -/* 800ADB88 000AAAE8 4E 80 00 20 */ blr +/* 800ADB88 000AAAE8 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR12CScriptWater" "Visit__25TCastToPtr<11CGameCamera>FR12CScriptWater": /* 800ADB8C 000AAAEC 38 00 00 00 */ li r0, 0 /* 800ADB90 000AAAF0 90 03 00 04 */ stw r0, 4(r3) -/* 800ADB94 000AAAF4 4E 80 00 20 */ blr +/* 800ADB94 000AAAF4 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR17CScriptVisorFlare" "Visit__25TCastToPtr<11CGameCamera>FR17CScriptVisorFlare": /* 800ADB98 000AAAF8 38 00 00 00 */ li r0, 0 /* 800ADB9C 000AAAFC 90 03 00 04 */ stw r0, 4(r3) -/* 800ADBA0 000AAB00 4E 80 00 20 */ blr +/* 800ADBA0 000AAB00 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR14CScriptTrigger" "Visit__25TCastToPtr<11CGameCamera>FR14CScriptTrigger": /* 800ADBA4 000AAB04 38 00 00 00 */ li r0, 0 /* 800ADBA8 000AAB08 90 03 00 04 */ stw r0, 4(r3) -/* 800ADBAC 000AAB0C 4E 80 00 20 */ blr +/* 800ADBAC 000AAB0C 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR12CScriptTimer" "Visit__25TCastToPtr<11CGameCamera>FR12CScriptTimer": /* 800ADBB0 000AAB10 38 00 00 00 */ li r0, 0 /* 800ADBB4 000AAB14 90 03 00 04 */ stw r0, 4(r3) -/* 800ADBB8 000AAB18 4E 80 00 20 */ blr +/* 800ADBB8 000AAB18 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR10CTeamAiMgr" "Visit__25TCastToPtr<11CGameCamera>FR10CTeamAiMgr": /* 800ADBBC 000AAB1C 38 00 00 00 */ li r0, 0 /* 800ADBC0 000AAB20 90 03 00 04 */ stw r0, 4(r3) -/* 800ADBC4 000AAB24 4E 80 00 20 */ blr +/* 800ADBC4 000AAB24 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR21CScriptTargetingPoint" "Visit__25TCastToPtr<11CGameCamera>FR21CScriptTargetingPoint": /* 800ADBC8 000AAB28 38 00 00 00 */ li r0, 0 /* 800ADBCC 000AAB2C 90 03 00 04 */ stw r0, 4(r3) -/* 800ADBD0 000AAB30 4E 80 00 20 */ blr +/* 800ADBD0 000AAB30 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR25CScriptSpiderBallWaypoint" "Visit__25TCastToPtr<11CGameCamera>FR25CScriptSpiderBallWaypoint": /* 800ADBD4 000AAB34 38 00 00 00 */ li r0, 0 /* 800ADBD8 000AAB38 90 03 00 04 */ stw r0, 4(r3) -/* 800ADBDC 000AAB3C 4E 80 00 20 */ blr +/* 800ADBDC 000AAB3C 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR34CScriptSpiderBallAttractionSurface" "Visit__25TCastToPtr<11CGameCamera>FR34CScriptSpiderBallAttractionSurface": /* 800ADBE0 000AAB40 38 00 00 00 */ li r0, 0 /* 800ADBE4 000AAB44 90 03 00 04 */ stw r0, 4(r3) -/* 800ADBE8 000AAB48 4E 80 00 20 */ blr +/* 800ADBE8 000AAB48 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR22CScriptSpecialFunction" "Visit__25TCastToPtr<11CGameCamera>FR22CScriptSpecialFunction": /* 800ADBEC 000AAB4C 38 00 00 00 */ li r0, 0 /* 800ADBF0 000AAB50 90 03 00 04 */ stw r0, 4(r3) -/* 800ADBF4 000AAB54 4E 80 00 20 */ blr +/* 800ADBF4 000AAB54 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR17CScriptSpawnPoint" "Visit__25TCastToPtr<11CGameCamera>FR17CScriptSpawnPoint": /* 800ADBF8 000AAB58 38 00 00 00 */ li r0, 0 /* 800ADBFC 000AAB5C 90 03 00 04 */ stw r0, 4(r3) -/* 800ADC00 000AAB60 4E 80 00 20 */ blr +/* 800ADC00 000AAB60 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR12CScriptSound" "Visit__25TCastToPtr<11CGameCamera>FR12CScriptSound": /* 800ADC04 000AAB64 38 00 00 00 */ li r0, 0 /* 800ADC08 000AAB68 90 03 00 04 */ stw r0, 4(r3) -/* 800ADC0C 000AAB6C 4E 80 00 20 */ blr +/* 800ADC0C 000AAB6C 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR20CScriptRoomAcoustics" "Visit__25TCastToPtr<11CGameCamera>FR20CScriptRoomAcoustics": /* 800ADC10 000AAB70 38 00 00 00 */ li r0, 0 /* 800ADC14 000AAB74 90 03 00 04 */ stw r0, 4(r3) -/* 800ADC18 000AAB78 4E 80 00 20 */ blr +/* 800ADC18 000AAB78 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR22CScriptPointOfinterest" "Visit__25TCastToPtr<11CGameCamera>FR22CScriptPointOfinterest": /* 800ADC1C 000AAB7C 38 00 00 00 */ li r0, 0 /* 800ADC20 000AAB80 90 03 00 04 */ stw r0, 4(r3) -/* 800ADC24 000AAB84 4E 80 00 20 */ blr +/* 800ADC24 000AAB84 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR17CScriptPlayerHint" "Visit__25TCastToPtr<11CGameCamera>FR17CScriptPlayerHint": /* 800ADC28 000AAB88 38 00 00 00 */ li r0, 0 /* 800ADC2C 000AAB8C 90 03 00 04 */ stw r0, 4(r3) -/* 800ADC30 000AAB90 4E 80 00 20 */ blr +/* 800ADC30 000AAB90 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR15CScriptPlatform" "Visit__25TCastToPtr<11CGameCamera>FR15CScriptPlatform": /* 800ADC34 000AAB94 38 00 00 00 */ li r0, 0 /* 800ADC38 000AAB98 90 03 00 04 */ stw r0, 4(r3) -/* 800ADC3C 000AAB9C 4E 80 00 20 */ blr +/* 800ADC3C 000AAB9C 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR13CScriptPickup" "Visit__25TCastToPtr<11CGameCamera>FR13CScriptPickup": /* 800ADC40 000AABA0 38 00 00 00 */ li r0, 0 /* 800ADC44 000AABA4 90 03 00 04 */ stw r0, 4(r3) -/* 800ADC48 000AABA8 4E 80 00 20 */ blr +/* 800ADC48 000AABA8 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR15CScriptMazeNode" "Visit__25TCastToPtr<11CGameCamera>FR15CScriptMazeNode": /* 800ADC4C 000AABAC 38 00 00 00 */ li r0, 0 /* 800ADC50 000AABB0 90 03 00 04 */ stw r0, 4(r3) -/* 800ADC54 000AABB4 4E 80 00 20 */ blr +/* 800ADC54 000AABB4 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR16CScriptGunTurret" "Visit__25TCastToPtr<11CGameCamera>FR16CScriptGunTurret": /* 800ADC58 000AABB8 38 00 00 00 */ li r0, 0 /* 800ADC5C 000AABBC 90 03 00 04 */ stw r0, 4(r3) -/* 800ADC60 000AABC0 4E 80 00 20 */ blr +/* 800ADC60 000AABC0 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR19CScriptGrapplePoint" "Visit__25TCastToPtr<11CGameCamera>FR19CScriptGrapplePoint": /* 800ADC64 000AABC4 38 00 00 00 */ li r0, 0 /* 800ADC68 000AABC8 90 03 00 04 */ stw r0, 4(r3) -/* 800ADC6C 000AABCC 4E 80 00 20 */ blr +/* 800ADC6C 000AABCC 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR13CScriptEffect" "Visit__25TCastToPtr<11CGameCamera>FR13CScriptEffect": /* 800ADC70 000AABD0 38 00 00 00 */ li r0, 0 /* 800ADC74 000AABD4 90 03 00 04 */ stw r0, 4(r3) -/* 800ADC78 000AABD8 4E 80 00 20 */ blr +/* 800ADC78 000AABD8 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR11CScriptDoor" "Visit__25TCastToPtr<11CGameCamera>FR11CScriptDoor": /* 800ADC7C 000AABDC 38 00 00 00 */ li r0, 0 /* 800ADC80 000AABE0 90 03 00 04 */ stw r0, 4(r3) -/* 800ADC84 000AABE4 4E 80 00 20 */ blr +/* 800ADC84 000AABE4 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR11CScriptDock" "Visit__25TCastToPtr<11CGameCamera>FR11CScriptDock": /* 800ADC88 000AABE8 38 00 00 00 */ li r0, 0 /* 800ADC8C 000AABEC 90 03 00 04 */ stw r0, 4(r3) -/* 800ADC90 000AABF0 4E 80 00 20 */ blr +/* 800ADC90 000AABF0 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR18CScriptDistanceFog" "Visit__25TCastToPtr<11CGameCamera>FR18CScriptDistanceFog": /* 800ADC94 000AABF4 38 00 00 00 */ li r0, 0 /* 800ADC98 000AABF8 90 03 00 04 */ stw r0, 4(r3) -/* 800ADC9C 000AABFC 4E 80 00 20 */ blr +/* 800ADC9C 000AABFC 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR26CScriptDebugCameraWaypoint" "Visit__25TCastToPtr<11CGameCamera>FR26CScriptDebugCameraWaypoint": /* 800ADCA0 000AAC00 38 00 00 00 */ li r0, 0 /* 800ADCA4 000AAC04 90 03 00 04 */ stw r0, 4(r3) -/* 800ADCA8 000AAC08 4E 80 00 20 */ blr +/* 800ADCA8 000AAC08 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR17CScriptCoverPoint" "Visit__25TCastToPtr<11CGameCamera>FR17CScriptCoverPoint": /* 800ADCAC 000AAC0C 38 00 00 00 */ li r0, 0 /* 800ADCB0 000AAC10 90 03 00 04 */ stw r0, 4(r3) -/* 800ADCB4 000AAC14 4E 80 00 20 */ blr +/* 800ADCB4 000AAC14 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR21CScriptCameraWaypoint" "Visit__25TCastToPtr<11CGameCamera>FR21CScriptCameraWaypoint": /* 800ADCB8 000AAC18 38 00 00 00 */ li r0, 0 /* 800ADCBC 000AAC1C 90 03 00 04 */ stw r0, 4(r3) -/* 800ADCC0 000AAC20 4E 80 00 20 */ blr +/* 800ADCC0 000AAC20 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR24CScriptCameraPitchVolume" "Visit__25TCastToPtr<11CGameCamera>FR24CScriptCameraPitchVolume": /* 800ADCC4 000AAC24 38 00 00 00 */ li r0, 0 /* 800ADCC8 000AAC28 90 03 00 04 */ stw r0, 4(r3) -/* 800ADCCC 000AAC2C 4E 80 00 20 */ blr +/* 800ADCCC 000AAC2C 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR17CScriptCameraHint" "Visit__25TCastToPtr<11CGameCamera>FR17CScriptCameraHint": /* 800ADCD0 000AAC30 38 00 00 00 */ li r0, 0 /* 800ADCD4 000AAC34 90 03 00 04 */ stw r0, 4(r3) -/* 800ADCD8 000AAC38 4E 80 00 20 */ blr +/* 800ADCD8 000AAC38 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR18CScriptAiJumpPoint" "Visit__25TCastToPtr<11CGameCamera>FR18CScriptAiJumpPoint": /* 800ADCDC 000AAC3C 38 00 00 00 */ li r0, 0 /* 800ADCE0 000AAC40 90 03 00 04 */ stw r0, 4(r3) -/* 800ADCE4 000AAC44 4E 80 00 20 */ blr +/* 800ADCE4 000AAC44 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR20CScriptActorKeyframe" "Visit__25TCastToPtr<11CGameCamera>FR20CScriptActorKeyframe": /* 800ADCE8 000AAC48 38 00 00 00 */ li r0, 0 /* 800ADCEC 000AAC4C 90 03 00 04 */ stw r0, 4(r3) -/* 800ADCF0 000AAC50 4E 80 00 20 */ blr +/* 800ADCF0 000AAC50 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR12CScriptActor" "Visit__25TCastToPtr<11CGameCamera>FR12CScriptActor": /* 800ADCF4 000AAC54 38 00 00 00 */ li r0, 0 /* 800ADCF8 000AAC58 90 03 00 04 */ stw r0, 4(r3) -/* 800ADCFC 000AAC5C 4E 80 00 20 */ blr +/* 800ADCFC 000AAC5C 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR9CRepulsor" "Visit__25TCastToPtr<11CGameCamera>FR9CRepulsor": /* 800ADD00 000AAC60 38 00 00 00 */ li r0, 0 /* 800ADD04 000AAC64 90 03 00 04 */ stw r0, 4(r3) -/* 800ADD08 000AAC68 4E 80 00 20 */ blr +/* 800ADD08 000AAC68 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR7CPlayer" "Visit__25TCastToPtr<11CGameCamera>FR7CPlayer": /* 800ADD0C 000AAC6C 38 00 00 00 */ li r0, 0 /* 800ADD10 000AAC70 90 03 00 04 */ stw r0, 4(r3) -/* 800ADD14 000AAC74 4E 80 00 20 */ blr +/* 800ADD14 000AAC74 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR13CPhysicsActor" "Visit__25TCastToPtr<11CGameCamera>FR13CPhysicsActor": /* 800ADD18 000AAC78 38 00 00 00 */ li r0, 0 /* 800ADD1C 000AAC7C 90 03 00 04 */ stw r0, 4(r3) -/* 800ADD20 000AAC80 4E 80 00 20 */ blr +/* 800ADD20 000AAC80 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR3CAi" "Visit__25TCastToPtr<11CGameCamera>FR3CAi": /* 800ADD24 000AAC84 38 00 00 00 */ li r0, 0 /* 800ADD28 000AAC88 90 03 00 04 */ stw r0, 4(r3) -/* 800ADD2C 000AAC8C 4E 80 00 20 */ blr +/* 800ADD2C 000AAC8C 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR11CPathCamera" "Visit__25TCastToPtr<11CGameCamera>FR11CPathCamera": /* 800ADD30 000AAC90 90 83 00 04 */ stw r4, 4(r3) -/* 800ADD34 000AAC94 4E 80 00 20 */ blr +/* 800ADD34 000AAC94 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR18CMetroidPrimeRelay" "Visit__25TCastToPtr<11CGameCamera>FR18CMetroidPrimeRelay": /* 800ADD38 000AAC98 38 00 00 00 */ li r0, 0 /* 800ADD3C 000AAC9C 90 03 00 04 */ stw r0, 4(r3) -/* 800ADD40 000AACA0 4E 80 00 20 */ blr +/* 800ADD40 000AACA0 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR19CHUDBillboardEffect" "Visit__25TCastToPtr<11CGameCamera>FR19CHUDBillboardEffect": /* 800ADD44 000AACA4 38 00 00 00 */ li r0, 0 /* 800ADD48 000AACA8 90 03 00 04 */ stw r0, 4(r3) -/* 800ADD4C 000AACAC 4E 80 00 20 */ blr +/* 800ADD4C 000AACAC 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR15CGameProjectile" "Visit__25TCastToPtr<11CGameCamera>FR15CGameProjectile": /* 800ADD50 000AACB0 38 00 00 00 */ li r0, 0 /* 800ADD54 000AACB4 90 03 00 04 */ stw r0, 4(r3) -/* 800ADD58 000AACB8 4E 80 00 20 */ blr +/* 800ADD58 000AACB8 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR10CGameLight" "Visit__25TCastToPtr<11CGameCamera>FR10CGameLight": /* 800ADD5C 000AACBC 38 00 00 00 */ li r0, 0 /* 800ADD60 000AACC0 90 03 00 04 */ stw r0, 4(r3) -/* 800ADD64 000AACC4 4E 80 00 20 */ blr +/* 800ADD64 000AACC4 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR11CGameCamera" "Visit__25TCastToPtr<11CGameCamera>FR11CGameCamera": /* 800ADD68 000AACC8 90 83 00 04 */ stw r4, 4(r3) -/* 800ADD6C 000AACCC 4E 80 00 20 */ blr +/* 800ADD6C 000AACCC 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR10CFishCloud" "Visit__25TCastToPtr<11CGameCamera>FR10CFishCloud": /* 800ADD70 000AACD0 38 00 00 00 */ li r0, 0 /* 800ADD74 000AACD4 90 03 00 04 */ stw r0, 4(r3) -/* 800ADD78 000AACD8 4E 80 00 20 */ blr +/* 800ADD78 000AACD8 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR18CFirstPersonCamera" "Visit__25TCastToPtr<11CGameCamera>FR18CFirstPersonCamera": /* 800ADD7C 000AACDC 90 83 00 04 */ stw r4, 4(r3) -/* 800ADD80 000AACE0 4E 80 00 20 */ blr +/* 800ADD80 000AACE0 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR10CExplosion" "Visit__25TCastToPtr<11CGameCamera>FR10CExplosion": /* 800ADD84 000AACE4 38 00 00 00 */ li r0, 0 /* 800ADD88 000AACE8 90 03 00 04 */ stw r0, 4(r3) -/* 800ADD8C 000AACEC 4E 80 00 20 */ blr +/* 800ADD8C 000AACEC 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR7CEntity" "Visit__25TCastToPtr<11CGameCamera>FR7CEntity": /* 800ADD90 000AACF0 38 00 00 00 */ li r0, 0 /* 800ADD94 000AACF4 90 03 00 04 */ stw r0, 4(r3) -/* 800ADD98 000AACF8 4E 80 00 20 */ blr +/* 800ADD98 000AACF8 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR17CEnergyProjectile" "Visit__25TCastToPtr<11CGameCamera>FR17CEnergyProjectile": /* 800ADD9C 000AACFC 38 00 00 00 */ li r0, 0 /* 800ADDA0 000AAD00 90 03 00 04 */ stw r0, 4(r3) -/* 800ADDA4 000AAD04 4E 80 00 20 */ blr +/* 800ADDA4 000AAD04 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR16CDestroyableRock" "Visit__25TCastToPtr<11CGameCamera>FR16CDestroyableRock": /* 800ADDA8 000AAD08 38 00 00 00 */ li r0, 0 /* 800ADDAC 000AAD0C 90 03 00 04 */ stw r0, 4(r3) -/* 800ADDB0 000AAD10 4E 80 00 20 */ blr +/* 800ADDB0 000AAD10 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR15CCollisionActor" "Visit__25TCastToPtr<11CGameCamera>FR15CCollisionActor": /* 800ADDB4 000AAD14 38 00 00 00 */ li r0, 0 /* 800ADDB8 000AAD18 90 03 00 04 */ stw r0, 4(r3) -/* 800ADDBC 000AAD1C 4E 80 00 20 */ blr +/* 800ADDBC 000AAD1C 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR16CCinematicCamera" "Visit__25TCastToPtr<11CGameCamera>FR16CCinematicCamera": /* 800ADDC0 000AAD20 90 83 00 04 */ stw r4, 4(r3) -/* 800ADDC4 000AAD24 4E 80 00 20 */ blr +/* 800ADDC4 000AAD24 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR5CBomb" "Visit__25TCastToPtr<11CGameCamera>FR5CBomb": /* 800ADDC8 000AAD28 38 00 00 00 */ li r0, 0 /* 800ADDCC 000AAD2C 90 03 00 04 */ stw r0, 4(r3) -/* 800ADDD0 000AAD30 4E 80 00 20 */ blr +/* 800ADDD0 000AAD30 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR11CBallCamera" "Visit__25TCastToPtr<11CGameCamera>FR11CBallCamera": /* 800ADDD4 000AAD34 90 83 00 04 */ stw r4, 4(r3) -/* 800ADDD8 000AAD38 4E 80 00 20 */ blr +/* 800ADDD8 000AAD38 4E 80 00 20 */ blr .global "Visit__25TCastToPtr<11CGameCamera>FR6CActor" "Visit__25TCastToPtr<11CGameCamera>FR6CActor": /* 800ADDDC 000AAD3C 38 00 00 00 */ li r0, 0 /* 800ADDE0 000AAD40 90 03 00 04 */ stw r0, 4(r3) -/* 800ADDE4 000AAD44 4E 80 00 20 */ blr +/* 800ADDE4 000AAD44 4E 80 00 20 */ blr .global "__ct__25TCastToPtr<11CGameCamera>FP7CEntity" "__ct__25TCastToPtr<11CGameCamera>FP7CEntity": @@ -19681,14 +19681,14 @@ lbl_800ADAD8: /* 800ADE2C 000AAD8C 81 83 00 00 */ lwz r12, 0(r3) /* 800ADE30 000AAD90 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800ADE34 000AAD94 7D 89 03 A6 */ mtctr r12 -/* 800ADE38 000AAD98 4E 80 04 21 */ bctrl +/* 800ADE38 000AAD98 4E 80 04 21 */ bctrl lbl_800ADE3C: /* 800ADE3C 000AAD9C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800ADE40 000AADA0 7F E3 FB 78 */ mr r3, r31 /* 800ADE44 000AADA4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800ADE48 000AADA8 7C 08 03 A6 */ mtlr r0 /* 800ADE4C 000AADAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800ADE50 000AADB0 4E 80 00 20 */ blr +/* 800ADE50 000AADB0 4E 80 00 20 */ blr .global "__ct__25TCastToPtr<11CGameCamera>FR7CEntity" "__ct__25TCastToPtr<11CGameCamera>FR7CEntity": @@ -19710,354 +19710,354 @@ lbl_800ADE3C: /* 800ADE90 000AADF0 81 83 00 00 */ lwz r12, 0(r3) /* 800ADE94 000AADF4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800ADE98 000AADF8 7D 89 03 A6 */ mtctr r12 -/* 800ADE9C 000AADFC 4E 80 04 21 */ bctrl +/* 800ADE9C 000AADFC 4E 80 04 21 */ bctrl /* 800ADEA0 000AAE00 80 01 00 14 */ lwz r0, 0x14(r1) /* 800ADEA4 000AAE04 7F E3 FB 78 */ mr r3, r31 /* 800ADEA8 000AAE08 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800ADEAC 000AAE0C 7C 08 03 A6 */ mtlr r0 /* 800ADEB0 000AAE10 38 21 00 10 */ addi r1, r1, 0x10 -/* 800ADEB4 000AAE14 4E 80 00 20 */ blr +/* 800ADEB4 000AAE14 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR7CWeapon" "Visit__24TCastToPtr<10CFishCloud>FR7CWeapon": /* 800ADEB8 000AAE18 38 00 00 00 */ li r0, 0 /* 800ADEBC 000AAE1C 90 03 00 04 */ stw r0, 4(r3) -/* 800ADEC0 000AAE20 4E 80 00 20 */ blr +/* 800ADEC0 000AAE20 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR17CWallCrawlerSwarm" "Visit__24TCastToPtr<10CFishCloud>FR17CWallCrawlerSwarm": /* 800ADEC4 000AAE24 38 00 00 00 */ li r0, 0 /* 800ADEC8 000AAE28 90 03 00 04 */ stw r0, 4(r3) -/* 800ADECC 000AAE2C 4E 80 00 20 */ blr +/* 800ADECC 000AAE2C 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR20CScriptSpindleCamera" "Visit__24TCastToPtr<10CFishCloud>FR20CScriptSpindleCamera": /* 800ADED0 000AAE30 38 00 00 00 */ li r0, 0 /* 800ADED4 000AAE34 90 03 00 04 */ stw r0, 4(r3) -/* 800ADED8 000AAE38 4E 80 00 20 */ blr +/* 800ADED8 000AAE38 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR15CSnakeWeedSwarm" "Visit__24TCastToPtr<10CFishCloud>FR15CSnakeWeedSwarm": /* 800ADEDC 000AAE3C 38 00 00 00 */ li r0, 0 /* 800ADEE0 000AAE40 90 03 00 04 */ stw r0, 4(r3) -/* 800ADEE4 000AAE44 4E 80 00 20 */ blr +/* 800ADEE4 000AAE44 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR15CScriptWaypoint" "Visit__24TCastToPtr<10CFishCloud>FR15CScriptWaypoint": /* 800ADEE8 000AAE48 38 00 00 00 */ li r0, 0 /* 800ADEEC 000AAE4C 90 03 00 04 */ stw r0, 4(r3) -/* 800ADEF0 000AAE50 4E 80 00 20 */ blr +/* 800ADEF0 000AAE50 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR12CScriptWater" "Visit__24TCastToPtr<10CFishCloud>FR12CScriptWater": /* 800ADEF4 000AAE54 38 00 00 00 */ li r0, 0 /* 800ADEF8 000AAE58 90 03 00 04 */ stw r0, 4(r3) -/* 800ADEFC 000AAE5C 4E 80 00 20 */ blr +/* 800ADEFC 000AAE5C 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR17CScriptVisorFlare" "Visit__24TCastToPtr<10CFishCloud>FR17CScriptVisorFlare": /* 800ADF00 000AAE60 38 00 00 00 */ li r0, 0 /* 800ADF04 000AAE64 90 03 00 04 */ stw r0, 4(r3) -/* 800ADF08 000AAE68 4E 80 00 20 */ blr +/* 800ADF08 000AAE68 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR14CScriptTrigger" "Visit__24TCastToPtr<10CFishCloud>FR14CScriptTrigger": /* 800ADF0C 000AAE6C 38 00 00 00 */ li r0, 0 /* 800ADF10 000AAE70 90 03 00 04 */ stw r0, 4(r3) -/* 800ADF14 000AAE74 4E 80 00 20 */ blr +/* 800ADF14 000AAE74 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR12CScriptTimer" "Visit__24TCastToPtr<10CFishCloud>FR12CScriptTimer": /* 800ADF18 000AAE78 38 00 00 00 */ li r0, 0 /* 800ADF1C 000AAE7C 90 03 00 04 */ stw r0, 4(r3) -/* 800ADF20 000AAE80 4E 80 00 20 */ blr +/* 800ADF20 000AAE80 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR10CTeamAiMgr" "Visit__24TCastToPtr<10CFishCloud>FR10CTeamAiMgr": /* 800ADF24 000AAE84 38 00 00 00 */ li r0, 0 /* 800ADF28 000AAE88 90 03 00 04 */ stw r0, 4(r3) -/* 800ADF2C 000AAE8C 4E 80 00 20 */ blr +/* 800ADF2C 000AAE8C 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR21CScriptTargetingPoint" "Visit__24TCastToPtr<10CFishCloud>FR21CScriptTargetingPoint": /* 800ADF30 000AAE90 38 00 00 00 */ li r0, 0 /* 800ADF34 000AAE94 90 03 00 04 */ stw r0, 4(r3) -/* 800ADF38 000AAE98 4E 80 00 20 */ blr +/* 800ADF38 000AAE98 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR25CScriptSpiderBallWaypoint" "Visit__24TCastToPtr<10CFishCloud>FR25CScriptSpiderBallWaypoint": /* 800ADF3C 000AAE9C 38 00 00 00 */ li r0, 0 /* 800ADF40 000AAEA0 90 03 00 04 */ stw r0, 4(r3) -/* 800ADF44 000AAEA4 4E 80 00 20 */ blr +/* 800ADF44 000AAEA4 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR34CScriptSpiderBallAttractionSurface" "Visit__24TCastToPtr<10CFishCloud>FR34CScriptSpiderBallAttractionSurface": /* 800ADF48 000AAEA8 38 00 00 00 */ li r0, 0 /* 800ADF4C 000AAEAC 90 03 00 04 */ stw r0, 4(r3) -/* 800ADF50 000AAEB0 4E 80 00 20 */ blr +/* 800ADF50 000AAEB0 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR22CScriptSpecialFunction" "Visit__24TCastToPtr<10CFishCloud>FR22CScriptSpecialFunction": /* 800ADF54 000AAEB4 38 00 00 00 */ li r0, 0 /* 800ADF58 000AAEB8 90 03 00 04 */ stw r0, 4(r3) -/* 800ADF5C 000AAEBC 4E 80 00 20 */ blr +/* 800ADF5C 000AAEBC 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR17CScriptSpawnPoint" "Visit__24TCastToPtr<10CFishCloud>FR17CScriptSpawnPoint": /* 800ADF60 000AAEC0 38 00 00 00 */ li r0, 0 /* 800ADF64 000AAEC4 90 03 00 04 */ stw r0, 4(r3) -/* 800ADF68 000AAEC8 4E 80 00 20 */ blr +/* 800ADF68 000AAEC8 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR12CScriptSound" "Visit__24TCastToPtr<10CFishCloud>FR12CScriptSound": /* 800ADF6C 000AAECC 38 00 00 00 */ li r0, 0 /* 800ADF70 000AAED0 90 03 00 04 */ stw r0, 4(r3) -/* 800ADF74 000AAED4 4E 80 00 20 */ blr +/* 800ADF74 000AAED4 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR20CScriptRoomAcoustics" "Visit__24TCastToPtr<10CFishCloud>FR20CScriptRoomAcoustics": /* 800ADF78 000AAED8 38 00 00 00 */ li r0, 0 /* 800ADF7C 000AAEDC 90 03 00 04 */ stw r0, 4(r3) -/* 800ADF80 000AAEE0 4E 80 00 20 */ blr +/* 800ADF80 000AAEE0 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR22CScriptPointOfinterest" "Visit__24TCastToPtr<10CFishCloud>FR22CScriptPointOfinterest": /* 800ADF84 000AAEE4 38 00 00 00 */ li r0, 0 /* 800ADF88 000AAEE8 90 03 00 04 */ stw r0, 4(r3) -/* 800ADF8C 000AAEEC 4E 80 00 20 */ blr +/* 800ADF8C 000AAEEC 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR17CScriptPlayerHint" "Visit__24TCastToPtr<10CFishCloud>FR17CScriptPlayerHint": /* 800ADF90 000AAEF0 38 00 00 00 */ li r0, 0 /* 800ADF94 000AAEF4 90 03 00 04 */ stw r0, 4(r3) -/* 800ADF98 000AAEF8 4E 80 00 20 */ blr +/* 800ADF98 000AAEF8 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR15CScriptPlatform" "Visit__24TCastToPtr<10CFishCloud>FR15CScriptPlatform": /* 800ADF9C 000AAEFC 38 00 00 00 */ li r0, 0 /* 800ADFA0 000AAF00 90 03 00 04 */ stw r0, 4(r3) -/* 800ADFA4 000AAF04 4E 80 00 20 */ blr +/* 800ADFA4 000AAF04 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR13CScriptPickup" "Visit__24TCastToPtr<10CFishCloud>FR13CScriptPickup": /* 800ADFA8 000AAF08 38 00 00 00 */ li r0, 0 /* 800ADFAC 000AAF0C 90 03 00 04 */ stw r0, 4(r3) -/* 800ADFB0 000AAF10 4E 80 00 20 */ blr +/* 800ADFB0 000AAF10 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR15CScriptMazeNode" "Visit__24TCastToPtr<10CFishCloud>FR15CScriptMazeNode": /* 800ADFB4 000AAF14 38 00 00 00 */ li r0, 0 /* 800ADFB8 000AAF18 90 03 00 04 */ stw r0, 4(r3) -/* 800ADFBC 000AAF1C 4E 80 00 20 */ blr +/* 800ADFBC 000AAF1C 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR16CScriptGunTurret" "Visit__24TCastToPtr<10CFishCloud>FR16CScriptGunTurret": /* 800ADFC0 000AAF20 38 00 00 00 */ li r0, 0 /* 800ADFC4 000AAF24 90 03 00 04 */ stw r0, 4(r3) -/* 800ADFC8 000AAF28 4E 80 00 20 */ blr +/* 800ADFC8 000AAF28 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR19CScriptGrapplePoint" "Visit__24TCastToPtr<10CFishCloud>FR19CScriptGrapplePoint": /* 800ADFCC 000AAF2C 38 00 00 00 */ li r0, 0 /* 800ADFD0 000AAF30 90 03 00 04 */ stw r0, 4(r3) -/* 800ADFD4 000AAF34 4E 80 00 20 */ blr +/* 800ADFD4 000AAF34 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR13CScriptEffect" "Visit__24TCastToPtr<10CFishCloud>FR13CScriptEffect": /* 800ADFD8 000AAF38 38 00 00 00 */ li r0, 0 /* 800ADFDC 000AAF3C 90 03 00 04 */ stw r0, 4(r3) -/* 800ADFE0 000AAF40 4E 80 00 20 */ blr +/* 800ADFE0 000AAF40 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR11CScriptDoor" "Visit__24TCastToPtr<10CFishCloud>FR11CScriptDoor": /* 800ADFE4 000AAF44 38 00 00 00 */ li r0, 0 /* 800ADFE8 000AAF48 90 03 00 04 */ stw r0, 4(r3) -/* 800ADFEC 000AAF4C 4E 80 00 20 */ blr +/* 800ADFEC 000AAF4C 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR11CScriptDock" "Visit__24TCastToPtr<10CFishCloud>FR11CScriptDock": /* 800ADFF0 000AAF50 38 00 00 00 */ li r0, 0 /* 800ADFF4 000AAF54 90 03 00 04 */ stw r0, 4(r3) -/* 800ADFF8 000AAF58 4E 80 00 20 */ blr +/* 800ADFF8 000AAF58 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR18CScriptDistanceFog" "Visit__24TCastToPtr<10CFishCloud>FR18CScriptDistanceFog": /* 800ADFFC 000AAF5C 38 00 00 00 */ li r0, 0 /* 800AE000 000AAF60 90 03 00 04 */ stw r0, 4(r3) -/* 800AE004 000AAF64 4E 80 00 20 */ blr +/* 800AE004 000AAF64 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR26CScriptDebugCameraWaypoint" "Visit__24TCastToPtr<10CFishCloud>FR26CScriptDebugCameraWaypoint": /* 800AE008 000AAF68 38 00 00 00 */ li r0, 0 /* 800AE00C 000AAF6C 90 03 00 04 */ stw r0, 4(r3) -/* 800AE010 000AAF70 4E 80 00 20 */ blr +/* 800AE010 000AAF70 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR17CScriptCoverPoint" "Visit__24TCastToPtr<10CFishCloud>FR17CScriptCoverPoint": /* 800AE014 000AAF74 38 00 00 00 */ li r0, 0 /* 800AE018 000AAF78 90 03 00 04 */ stw r0, 4(r3) -/* 800AE01C 000AAF7C 4E 80 00 20 */ blr +/* 800AE01C 000AAF7C 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR21CScriptCameraWaypoint" "Visit__24TCastToPtr<10CFishCloud>FR21CScriptCameraWaypoint": /* 800AE020 000AAF80 38 00 00 00 */ li r0, 0 /* 800AE024 000AAF84 90 03 00 04 */ stw r0, 4(r3) -/* 800AE028 000AAF88 4E 80 00 20 */ blr +/* 800AE028 000AAF88 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR24CScriptCameraPitchVolume" "Visit__24TCastToPtr<10CFishCloud>FR24CScriptCameraPitchVolume": /* 800AE02C 000AAF8C 38 00 00 00 */ li r0, 0 /* 800AE030 000AAF90 90 03 00 04 */ stw r0, 4(r3) -/* 800AE034 000AAF94 4E 80 00 20 */ blr +/* 800AE034 000AAF94 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR17CScriptCameraHint" "Visit__24TCastToPtr<10CFishCloud>FR17CScriptCameraHint": /* 800AE038 000AAF98 38 00 00 00 */ li r0, 0 /* 800AE03C 000AAF9C 90 03 00 04 */ stw r0, 4(r3) -/* 800AE040 000AAFA0 4E 80 00 20 */ blr +/* 800AE040 000AAFA0 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR18CScriptAiJumpPoint" "Visit__24TCastToPtr<10CFishCloud>FR18CScriptAiJumpPoint": /* 800AE044 000AAFA4 38 00 00 00 */ li r0, 0 /* 800AE048 000AAFA8 90 03 00 04 */ stw r0, 4(r3) -/* 800AE04C 000AAFAC 4E 80 00 20 */ blr +/* 800AE04C 000AAFAC 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR20CScriptActorKeyframe" "Visit__24TCastToPtr<10CFishCloud>FR20CScriptActorKeyframe": /* 800AE050 000AAFB0 38 00 00 00 */ li r0, 0 /* 800AE054 000AAFB4 90 03 00 04 */ stw r0, 4(r3) -/* 800AE058 000AAFB8 4E 80 00 20 */ blr +/* 800AE058 000AAFB8 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR12CScriptActor" "Visit__24TCastToPtr<10CFishCloud>FR12CScriptActor": /* 800AE05C 000AAFBC 38 00 00 00 */ li r0, 0 /* 800AE060 000AAFC0 90 03 00 04 */ stw r0, 4(r3) -/* 800AE064 000AAFC4 4E 80 00 20 */ blr +/* 800AE064 000AAFC4 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR9CRepulsor" "Visit__24TCastToPtr<10CFishCloud>FR9CRepulsor": /* 800AE068 000AAFC8 38 00 00 00 */ li r0, 0 /* 800AE06C 000AAFCC 90 03 00 04 */ stw r0, 4(r3) -/* 800AE070 000AAFD0 4E 80 00 20 */ blr +/* 800AE070 000AAFD0 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR7CPlayer" "Visit__24TCastToPtr<10CFishCloud>FR7CPlayer": /* 800AE074 000AAFD4 38 00 00 00 */ li r0, 0 /* 800AE078 000AAFD8 90 03 00 04 */ stw r0, 4(r3) -/* 800AE07C 000AAFDC 4E 80 00 20 */ blr +/* 800AE07C 000AAFDC 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR13CPhysicsActor" "Visit__24TCastToPtr<10CFishCloud>FR13CPhysicsActor": /* 800AE080 000AAFE0 38 00 00 00 */ li r0, 0 /* 800AE084 000AAFE4 90 03 00 04 */ stw r0, 4(r3) -/* 800AE088 000AAFE8 4E 80 00 20 */ blr +/* 800AE088 000AAFE8 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR3CAi" "Visit__24TCastToPtr<10CFishCloud>FR3CAi": /* 800AE08C 000AAFEC 38 00 00 00 */ li r0, 0 /* 800AE090 000AAFF0 90 03 00 04 */ stw r0, 4(r3) -/* 800AE094 000AAFF4 4E 80 00 20 */ blr +/* 800AE094 000AAFF4 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR11CPathCamera" "Visit__24TCastToPtr<10CFishCloud>FR11CPathCamera": /* 800AE098 000AAFF8 38 00 00 00 */ li r0, 0 /* 800AE09C 000AAFFC 90 03 00 04 */ stw r0, 4(r3) -/* 800AE0A0 000AB000 4E 80 00 20 */ blr +/* 800AE0A0 000AB000 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR18CMetroidPrimeRelay" "Visit__24TCastToPtr<10CFishCloud>FR18CMetroidPrimeRelay": /* 800AE0A4 000AB004 38 00 00 00 */ li r0, 0 /* 800AE0A8 000AB008 90 03 00 04 */ stw r0, 4(r3) -/* 800AE0AC 000AB00C 4E 80 00 20 */ blr +/* 800AE0AC 000AB00C 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR19CHUDBillboardEffect" "Visit__24TCastToPtr<10CFishCloud>FR19CHUDBillboardEffect": /* 800AE0B0 000AB010 38 00 00 00 */ li r0, 0 /* 800AE0B4 000AB014 90 03 00 04 */ stw r0, 4(r3) -/* 800AE0B8 000AB018 4E 80 00 20 */ blr +/* 800AE0B8 000AB018 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR15CGameProjectile" "Visit__24TCastToPtr<10CFishCloud>FR15CGameProjectile": /* 800AE0BC 000AB01C 38 00 00 00 */ li r0, 0 /* 800AE0C0 000AB020 90 03 00 04 */ stw r0, 4(r3) -/* 800AE0C4 000AB024 4E 80 00 20 */ blr +/* 800AE0C4 000AB024 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR10CGameLight" "Visit__24TCastToPtr<10CFishCloud>FR10CGameLight": /* 800AE0C8 000AB028 38 00 00 00 */ li r0, 0 /* 800AE0CC 000AB02C 90 03 00 04 */ stw r0, 4(r3) -/* 800AE0D0 000AB030 4E 80 00 20 */ blr +/* 800AE0D0 000AB030 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR11CGameCamera" "Visit__24TCastToPtr<10CFishCloud>FR11CGameCamera": /* 800AE0D4 000AB034 38 00 00 00 */ li r0, 0 /* 800AE0D8 000AB038 90 03 00 04 */ stw r0, 4(r3) -/* 800AE0DC 000AB03C 4E 80 00 20 */ blr +/* 800AE0DC 000AB03C 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR10CFishCloud" "Visit__24TCastToPtr<10CFishCloud>FR10CFishCloud": /* 800AE0E0 000AB040 90 83 00 04 */ stw r4, 4(r3) -/* 800AE0E4 000AB044 4E 80 00 20 */ blr +/* 800AE0E4 000AB044 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR18CFirstPersonCamera" "Visit__24TCastToPtr<10CFishCloud>FR18CFirstPersonCamera": /* 800AE0E8 000AB048 38 00 00 00 */ li r0, 0 /* 800AE0EC 000AB04C 90 03 00 04 */ stw r0, 4(r3) -/* 800AE0F0 000AB050 4E 80 00 20 */ blr +/* 800AE0F0 000AB050 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR10CExplosion" "Visit__24TCastToPtr<10CFishCloud>FR10CExplosion": /* 800AE0F4 000AB054 38 00 00 00 */ li r0, 0 /* 800AE0F8 000AB058 90 03 00 04 */ stw r0, 4(r3) -/* 800AE0FC 000AB05C 4E 80 00 20 */ blr +/* 800AE0FC 000AB05C 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR7CEntity" "Visit__24TCastToPtr<10CFishCloud>FR7CEntity": /* 800AE100 000AB060 38 00 00 00 */ li r0, 0 /* 800AE104 000AB064 90 03 00 04 */ stw r0, 4(r3) -/* 800AE108 000AB068 4E 80 00 20 */ blr +/* 800AE108 000AB068 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR17CEnergyProjectile" "Visit__24TCastToPtr<10CFishCloud>FR17CEnergyProjectile": /* 800AE10C 000AB06C 38 00 00 00 */ li r0, 0 /* 800AE110 000AB070 90 03 00 04 */ stw r0, 4(r3) -/* 800AE114 000AB074 4E 80 00 20 */ blr +/* 800AE114 000AB074 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR16CDestroyableRock" "Visit__24TCastToPtr<10CFishCloud>FR16CDestroyableRock": /* 800AE118 000AB078 38 00 00 00 */ li r0, 0 /* 800AE11C 000AB07C 90 03 00 04 */ stw r0, 4(r3) -/* 800AE120 000AB080 4E 80 00 20 */ blr +/* 800AE120 000AB080 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR15CCollisionActor" "Visit__24TCastToPtr<10CFishCloud>FR15CCollisionActor": /* 800AE124 000AB084 38 00 00 00 */ li r0, 0 /* 800AE128 000AB088 90 03 00 04 */ stw r0, 4(r3) -/* 800AE12C 000AB08C 4E 80 00 20 */ blr +/* 800AE12C 000AB08C 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR16CCinematicCamera" "Visit__24TCastToPtr<10CFishCloud>FR16CCinematicCamera": /* 800AE130 000AB090 38 00 00 00 */ li r0, 0 /* 800AE134 000AB094 90 03 00 04 */ stw r0, 4(r3) -/* 800AE138 000AB098 4E 80 00 20 */ blr +/* 800AE138 000AB098 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR5CBomb" "Visit__24TCastToPtr<10CFishCloud>FR5CBomb": /* 800AE13C 000AB09C 38 00 00 00 */ li r0, 0 /* 800AE140 000AB0A0 90 03 00 04 */ stw r0, 4(r3) -/* 800AE144 000AB0A4 4E 80 00 20 */ blr +/* 800AE144 000AB0A4 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR11CBallCamera" "Visit__24TCastToPtr<10CFishCloud>FR11CBallCamera": /* 800AE148 000AB0A8 38 00 00 00 */ li r0, 0 /* 800AE14C 000AB0AC 90 03 00 04 */ stw r0, 4(r3) -/* 800AE150 000AB0B0 4E 80 00 20 */ blr +/* 800AE150 000AB0B0 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CFishCloud>FR6CActor" "Visit__24TCastToPtr<10CFishCloud>FR6CActor": /* 800AE154 000AB0B4 38 00 00 00 */ li r0, 0 /* 800AE158 000AB0B8 90 03 00 04 */ stw r0, 4(r3) -/* 800AE15C 000AB0BC 4E 80 00 20 */ blr +/* 800AE15C 000AB0BC 4E 80 00 20 */ blr .global "__ct__24TCastToPtr<10CFishCloud>FP7CEntity" "__ct__24TCastToPtr<10CFishCloud>FP7CEntity": @@ -20081,355 +20081,355 @@ lbl_800ADE3C: /* 800AE1A4 000AB104 81 83 00 00 */ lwz r12, 0(r3) /* 800AE1A8 000AB108 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800AE1AC 000AB10C 7D 89 03 A6 */ mtctr r12 -/* 800AE1B0 000AB110 4E 80 04 21 */ bctrl +/* 800AE1B0 000AB110 4E 80 04 21 */ bctrl lbl_800AE1B4: /* 800AE1B4 000AB114 80 01 00 14 */ lwz r0, 0x14(r1) /* 800AE1B8 000AB118 7F E3 FB 78 */ mr r3, r31 /* 800AE1BC 000AB11C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800AE1C0 000AB120 7C 08 03 A6 */ mtlr r0 /* 800AE1C4 000AB124 38 21 00 10 */ addi r1, r1, 0x10 -/* 800AE1C8 000AB128 4E 80 00 20 */ blr +/* 800AE1C8 000AB128 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR7CWeapon" "Visit__32TCastToPtr<18CFirstPersonCamera>FR7CWeapon": /* 800AE1CC 000AB12C 38 00 00 00 */ li r0, 0 /* 800AE1D0 000AB130 90 03 00 04 */ stw r0, 4(r3) -/* 800AE1D4 000AB134 4E 80 00 20 */ blr +/* 800AE1D4 000AB134 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR17CWallCrawlerSwarm" "Visit__32TCastToPtr<18CFirstPersonCamera>FR17CWallCrawlerSwarm": /* 800AE1D8 000AB138 38 00 00 00 */ li r0, 0 /* 800AE1DC 000AB13C 90 03 00 04 */ stw r0, 4(r3) -/* 800AE1E0 000AB140 4E 80 00 20 */ blr +/* 800AE1E0 000AB140 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR20CScriptSpindleCamera" "Visit__32TCastToPtr<18CFirstPersonCamera>FR20CScriptSpindleCamera": /* 800AE1E4 000AB144 38 00 00 00 */ li r0, 0 /* 800AE1E8 000AB148 90 03 00 04 */ stw r0, 4(r3) -/* 800AE1EC 000AB14C 4E 80 00 20 */ blr +/* 800AE1EC 000AB14C 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR15CSnakeWeedSwarm" "Visit__32TCastToPtr<18CFirstPersonCamera>FR15CSnakeWeedSwarm": /* 800AE1F0 000AB150 38 00 00 00 */ li r0, 0 /* 800AE1F4 000AB154 90 03 00 04 */ stw r0, 4(r3) -/* 800AE1F8 000AB158 4E 80 00 20 */ blr +/* 800AE1F8 000AB158 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR15CScriptWaypoint" "Visit__32TCastToPtr<18CFirstPersonCamera>FR15CScriptWaypoint": /* 800AE1FC 000AB15C 38 00 00 00 */ li r0, 0 /* 800AE200 000AB160 90 03 00 04 */ stw r0, 4(r3) -/* 800AE204 000AB164 4E 80 00 20 */ blr +/* 800AE204 000AB164 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR12CScriptWater" "Visit__32TCastToPtr<18CFirstPersonCamera>FR12CScriptWater": /* 800AE208 000AB168 38 00 00 00 */ li r0, 0 /* 800AE20C 000AB16C 90 03 00 04 */ stw r0, 4(r3) -/* 800AE210 000AB170 4E 80 00 20 */ blr +/* 800AE210 000AB170 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR17CScriptVisorFlare" "Visit__32TCastToPtr<18CFirstPersonCamera>FR17CScriptVisorFlare": /* 800AE214 000AB174 38 00 00 00 */ li r0, 0 /* 800AE218 000AB178 90 03 00 04 */ stw r0, 4(r3) -/* 800AE21C 000AB17C 4E 80 00 20 */ blr +/* 800AE21C 000AB17C 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR14CScriptTrigger" "Visit__32TCastToPtr<18CFirstPersonCamera>FR14CScriptTrigger": /* 800AE220 000AB180 38 00 00 00 */ li r0, 0 /* 800AE224 000AB184 90 03 00 04 */ stw r0, 4(r3) -/* 800AE228 000AB188 4E 80 00 20 */ blr +/* 800AE228 000AB188 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR12CScriptTimer" "Visit__32TCastToPtr<18CFirstPersonCamera>FR12CScriptTimer": /* 800AE22C 000AB18C 38 00 00 00 */ li r0, 0 /* 800AE230 000AB190 90 03 00 04 */ stw r0, 4(r3) -/* 800AE234 000AB194 4E 80 00 20 */ blr +/* 800AE234 000AB194 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR10CTeamAiMgr" "Visit__32TCastToPtr<18CFirstPersonCamera>FR10CTeamAiMgr": /* 800AE238 000AB198 38 00 00 00 */ li r0, 0 /* 800AE23C 000AB19C 90 03 00 04 */ stw r0, 4(r3) -/* 800AE240 000AB1A0 4E 80 00 20 */ blr +/* 800AE240 000AB1A0 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR21CScriptTargetingPoint" "Visit__32TCastToPtr<18CFirstPersonCamera>FR21CScriptTargetingPoint": /* 800AE244 000AB1A4 38 00 00 00 */ li r0, 0 /* 800AE248 000AB1A8 90 03 00 04 */ stw r0, 4(r3) -/* 800AE24C 000AB1AC 4E 80 00 20 */ blr +/* 800AE24C 000AB1AC 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR25CScriptSpiderBallWaypoint" "Visit__32TCastToPtr<18CFirstPersonCamera>FR25CScriptSpiderBallWaypoint": /* 800AE250 000AB1B0 38 00 00 00 */ li r0, 0 /* 800AE254 000AB1B4 90 03 00 04 */ stw r0, 4(r3) -/* 800AE258 000AB1B8 4E 80 00 20 */ blr +/* 800AE258 000AB1B8 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR34CScriptSpiderBallAttractionSurface" "Visit__32TCastToPtr<18CFirstPersonCamera>FR34CScriptSpiderBallAttractionSurface": /* 800AE25C 000AB1BC 38 00 00 00 */ li r0, 0 /* 800AE260 000AB1C0 90 03 00 04 */ stw r0, 4(r3) -/* 800AE264 000AB1C4 4E 80 00 20 */ blr +/* 800AE264 000AB1C4 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR22CScriptSpecialFunction" "Visit__32TCastToPtr<18CFirstPersonCamera>FR22CScriptSpecialFunction": /* 800AE268 000AB1C8 38 00 00 00 */ li r0, 0 /* 800AE26C 000AB1CC 90 03 00 04 */ stw r0, 4(r3) -/* 800AE270 000AB1D0 4E 80 00 20 */ blr +/* 800AE270 000AB1D0 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR17CScriptSpawnPoint" "Visit__32TCastToPtr<18CFirstPersonCamera>FR17CScriptSpawnPoint": /* 800AE274 000AB1D4 38 00 00 00 */ li r0, 0 /* 800AE278 000AB1D8 90 03 00 04 */ stw r0, 4(r3) -/* 800AE27C 000AB1DC 4E 80 00 20 */ blr +/* 800AE27C 000AB1DC 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR12CScriptSound" "Visit__32TCastToPtr<18CFirstPersonCamera>FR12CScriptSound": /* 800AE280 000AB1E0 38 00 00 00 */ li r0, 0 /* 800AE284 000AB1E4 90 03 00 04 */ stw r0, 4(r3) -/* 800AE288 000AB1E8 4E 80 00 20 */ blr +/* 800AE288 000AB1E8 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR20CScriptRoomAcoustics" "Visit__32TCastToPtr<18CFirstPersonCamera>FR20CScriptRoomAcoustics": /* 800AE28C 000AB1EC 38 00 00 00 */ li r0, 0 /* 800AE290 000AB1F0 90 03 00 04 */ stw r0, 4(r3) -/* 800AE294 000AB1F4 4E 80 00 20 */ blr +/* 800AE294 000AB1F4 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR22CScriptPointOfinterest" "Visit__32TCastToPtr<18CFirstPersonCamera>FR22CScriptPointOfinterest": /* 800AE298 000AB1F8 38 00 00 00 */ li r0, 0 /* 800AE29C 000AB1FC 90 03 00 04 */ stw r0, 4(r3) -/* 800AE2A0 000AB200 4E 80 00 20 */ blr +/* 800AE2A0 000AB200 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR17CScriptPlayerHint" "Visit__32TCastToPtr<18CFirstPersonCamera>FR17CScriptPlayerHint": /* 800AE2A4 000AB204 38 00 00 00 */ li r0, 0 /* 800AE2A8 000AB208 90 03 00 04 */ stw r0, 4(r3) -/* 800AE2AC 000AB20C 4E 80 00 20 */ blr +/* 800AE2AC 000AB20C 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR15CScriptPlatform" "Visit__32TCastToPtr<18CFirstPersonCamera>FR15CScriptPlatform": /* 800AE2B0 000AB210 38 00 00 00 */ li r0, 0 /* 800AE2B4 000AB214 90 03 00 04 */ stw r0, 4(r3) -/* 800AE2B8 000AB218 4E 80 00 20 */ blr +/* 800AE2B8 000AB218 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR13CScriptPickup" "Visit__32TCastToPtr<18CFirstPersonCamera>FR13CScriptPickup": /* 800AE2BC 000AB21C 38 00 00 00 */ li r0, 0 /* 800AE2C0 000AB220 90 03 00 04 */ stw r0, 4(r3) -/* 800AE2C4 000AB224 4E 80 00 20 */ blr +/* 800AE2C4 000AB224 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR15CScriptMazeNode" "Visit__32TCastToPtr<18CFirstPersonCamera>FR15CScriptMazeNode": /* 800AE2C8 000AB228 38 00 00 00 */ li r0, 0 /* 800AE2CC 000AB22C 90 03 00 04 */ stw r0, 4(r3) -/* 800AE2D0 000AB230 4E 80 00 20 */ blr +/* 800AE2D0 000AB230 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR16CScriptGunTurret" "Visit__32TCastToPtr<18CFirstPersonCamera>FR16CScriptGunTurret": /* 800AE2D4 000AB234 38 00 00 00 */ li r0, 0 /* 800AE2D8 000AB238 90 03 00 04 */ stw r0, 4(r3) -/* 800AE2DC 000AB23C 4E 80 00 20 */ blr +/* 800AE2DC 000AB23C 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR19CScriptGrapplePoint" "Visit__32TCastToPtr<18CFirstPersonCamera>FR19CScriptGrapplePoint": /* 800AE2E0 000AB240 38 00 00 00 */ li r0, 0 /* 800AE2E4 000AB244 90 03 00 04 */ stw r0, 4(r3) -/* 800AE2E8 000AB248 4E 80 00 20 */ blr +/* 800AE2E8 000AB248 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR13CScriptEffect" "Visit__32TCastToPtr<18CFirstPersonCamera>FR13CScriptEffect": /* 800AE2EC 000AB24C 38 00 00 00 */ li r0, 0 /* 800AE2F0 000AB250 90 03 00 04 */ stw r0, 4(r3) -/* 800AE2F4 000AB254 4E 80 00 20 */ blr +/* 800AE2F4 000AB254 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR11CScriptDoor" "Visit__32TCastToPtr<18CFirstPersonCamera>FR11CScriptDoor": /* 800AE2F8 000AB258 38 00 00 00 */ li r0, 0 /* 800AE2FC 000AB25C 90 03 00 04 */ stw r0, 4(r3) -/* 800AE300 000AB260 4E 80 00 20 */ blr +/* 800AE300 000AB260 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR11CScriptDock" "Visit__32TCastToPtr<18CFirstPersonCamera>FR11CScriptDock": /* 800AE304 000AB264 38 00 00 00 */ li r0, 0 /* 800AE308 000AB268 90 03 00 04 */ stw r0, 4(r3) -/* 800AE30C 000AB26C 4E 80 00 20 */ blr +/* 800AE30C 000AB26C 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR18CScriptDistanceFog" "Visit__32TCastToPtr<18CFirstPersonCamera>FR18CScriptDistanceFog": /* 800AE310 000AB270 38 00 00 00 */ li r0, 0 /* 800AE314 000AB274 90 03 00 04 */ stw r0, 4(r3) -/* 800AE318 000AB278 4E 80 00 20 */ blr +/* 800AE318 000AB278 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR26CScriptDebugCameraWaypoint" "Visit__32TCastToPtr<18CFirstPersonCamera>FR26CScriptDebugCameraWaypoint": /* 800AE31C 000AB27C 38 00 00 00 */ li r0, 0 /* 800AE320 000AB280 90 03 00 04 */ stw r0, 4(r3) -/* 800AE324 000AB284 4E 80 00 20 */ blr +/* 800AE324 000AB284 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR17CScriptCoverPoint" "Visit__32TCastToPtr<18CFirstPersonCamera>FR17CScriptCoverPoint": /* 800AE328 000AB288 38 00 00 00 */ li r0, 0 /* 800AE32C 000AB28C 90 03 00 04 */ stw r0, 4(r3) -/* 800AE330 000AB290 4E 80 00 20 */ blr +/* 800AE330 000AB290 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR21CScriptCameraWaypoint" "Visit__32TCastToPtr<18CFirstPersonCamera>FR21CScriptCameraWaypoint": /* 800AE334 000AB294 38 00 00 00 */ li r0, 0 /* 800AE338 000AB298 90 03 00 04 */ stw r0, 4(r3) -/* 800AE33C 000AB29C 4E 80 00 20 */ blr +/* 800AE33C 000AB29C 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR24CScriptCameraPitchVolume" "Visit__32TCastToPtr<18CFirstPersonCamera>FR24CScriptCameraPitchVolume": /* 800AE340 000AB2A0 38 00 00 00 */ li r0, 0 /* 800AE344 000AB2A4 90 03 00 04 */ stw r0, 4(r3) -/* 800AE348 000AB2A8 4E 80 00 20 */ blr +/* 800AE348 000AB2A8 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR17CScriptCameraHint" "Visit__32TCastToPtr<18CFirstPersonCamera>FR17CScriptCameraHint": /* 800AE34C 000AB2AC 38 00 00 00 */ li r0, 0 /* 800AE350 000AB2B0 90 03 00 04 */ stw r0, 4(r3) -/* 800AE354 000AB2B4 4E 80 00 20 */ blr +/* 800AE354 000AB2B4 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR18CScriptAiJumpPoint" "Visit__32TCastToPtr<18CFirstPersonCamera>FR18CScriptAiJumpPoint": /* 800AE358 000AB2B8 38 00 00 00 */ li r0, 0 /* 800AE35C 000AB2BC 90 03 00 04 */ stw r0, 4(r3) -/* 800AE360 000AB2C0 4E 80 00 20 */ blr +/* 800AE360 000AB2C0 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR20CScriptActorKeyframe" "Visit__32TCastToPtr<18CFirstPersonCamera>FR20CScriptActorKeyframe": /* 800AE364 000AB2C4 38 00 00 00 */ li r0, 0 /* 800AE368 000AB2C8 90 03 00 04 */ stw r0, 4(r3) -/* 800AE36C 000AB2CC 4E 80 00 20 */ blr +/* 800AE36C 000AB2CC 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR12CScriptActor" "Visit__32TCastToPtr<18CFirstPersonCamera>FR12CScriptActor": /* 800AE370 000AB2D0 38 00 00 00 */ li r0, 0 /* 800AE374 000AB2D4 90 03 00 04 */ stw r0, 4(r3) -/* 800AE378 000AB2D8 4E 80 00 20 */ blr +/* 800AE378 000AB2D8 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR9CRepulsor" "Visit__32TCastToPtr<18CFirstPersonCamera>FR9CRepulsor": /* 800AE37C 000AB2DC 38 00 00 00 */ li r0, 0 /* 800AE380 000AB2E0 90 03 00 04 */ stw r0, 4(r3) -/* 800AE384 000AB2E4 4E 80 00 20 */ blr +/* 800AE384 000AB2E4 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR7CPlayer" "Visit__32TCastToPtr<18CFirstPersonCamera>FR7CPlayer": /* 800AE388 000AB2E8 38 00 00 00 */ li r0, 0 /* 800AE38C 000AB2EC 90 03 00 04 */ stw r0, 4(r3) -/* 800AE390 000AB2F0 4E 80 00 20 */ blr +/* 800AE390 000AB2F0 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR13CPhysicsActor" "Visit__32TCastToPtr<18CFirstPersonCamera>FR13CPhysicsActor": /* 800AE394 000AB2F4 38 00 00 00 */ li r0, 0 /* 800AE398 000AB2F8 90 03 00 04 */ stw r0, 4(r3) -/* 800AE39C 000AB2FC 4E 80 00 20 */ blr +/* 800AE39C 000AB2FC 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR3CAi" "Visit__32TCastToPtr<18CFirstPersonCamera>FR3CAi": /* 800AE3A0 000AB300 38 00 00 00 */ li r0, 0 /* 800AE3A4 000AB304 90 03 00 04 */ stw r0, 4(r3) -/* 800AE3A8 000AB308 4E 80 00 20 */ blr +/* 800AE3A8 000AB308 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR11CPathCamera" "Visit__32TCastToPtr<18CFirstPersonCamera>FR11CPathCamera": /* 800AE3AC 000AB30C 38 00 00 00 */ li r0, 0 /* 800AE3B0 000AB310 90 03 00 04 */ stw r0, 4(r3) -/* 800AE3B4 000AB314 4E 80 00 20 */ blr +/* 800AE3B4 000AB314 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR18CMetroidPrimeRelay" "Visit__32TCastToPtr<18CFirstPersonCamera>FR18CMetroidPrimeRelay": /* 800AE3B8 000AB318 38 00 00 00 */ li r0, 0 /* 800AE3BC 000AB31C 90 03 00 04 */ stw r0, 4(r3) -/* 800AE3C0 000AB320 4E 80 00 20 */ blr +/* 800AE3C0 000AB320 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR19CHUDBillboardEffect" "Visit__32TCastToPtr<18CFirstPersonCamera>FR19CHUDBillboardEffect": /* 800AE3C4 000AB324 38 00 00 00 */ li r0, 0 /* 800AE3C8 000AB328 90 03 00 04 */ stw r0, 4(r3) -/* 800AE3CC 000AB32C 4E 80 00 20 */ blr +/* 800AE3CC 000AB32C 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR15CGameProjectile" "Visit__32TCastToPtr<18CFirstPersonCamera>FR15CGameProjectile": /* 800AE3D0 000AB330 38 00 00 00 */ li r0, 0 /* 800AE3D4 000AB334 90 03 00 04 */ stw r0, 4(r3) -/* 800AE3D8 000AB338 4E 80 00 20 */ blr +/* 800AE3D8 000AB338 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR10CGameLight" "Visit__32TCastToPtr<18CFirstPersonCamera>FR10CGameLight": /* 800AE3DC 000AB33C 38 00 00 00 */ li r0, 0 /* 800AE3E0 000AB340 90 03 00 04 */ stw r0, 4(r3) -/* 800AE3E4 000AB344 4E 80 00 20 */ blr +/* 800AE3E4 000AB344 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR11CGameCamera" "Visit__32TCastToPtr<18CFirstPersonCamera>FR11CGameCamera": /* 800AE3E8 000AB348 38 00 00 00 */ li r0, 0 /* 800AE3EC 000AB34C 90 03 00 04 */ stw r0, 4(r3) -/* 800AE3F0 000AB350 4E 80 00 20 */ blr +/* 800AE3F0 000AB350 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR10CFishCloud" "Visit__32TCastToPtr<18CFirstPersonCamera>FR10CFishCloud": /* 800AE3F4 000AB354 38 00 00 00 */ li r0, 0 /* 800AE3F8 000AB358 90 03 00 04 */ stw r0, 4(r3) -/* 800AE3FC 000AB35C 4E 80 00 20 */ blr +/* 800AE3FC 000AB35C 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR18CFirstPersonCamera" "Visit__32TCastToPtr<18CFirstPersonCamera>FR18CFirstPersonCamera": /* 800AE400 000AB360 90 83 00 04 */ stw r4, 4(r3) -/* 800AE404 000AB364 4E 80 00 20 */ blr +/* 800AE404 000AB364 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR10CExplosion" "Visit__32TCastToPtr<18CFirstPersonCamera>FR10CExplosion": /* 800AE408 000AB368 38 00 00 00 */ li r0, 0 /* 800AE40C 000AB36C 90 03 00 04 */ stw r0, 4(r3) -/* 800AE410 000AB370 4E 80 00 20 */ blr +/* 800AE410 000AB370 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR7CEntity" "Visit__32TCastToPtr<18CFirstPersonCamera>FR7CEntity": /* 800AE414 000AB374 38 00 00 00 */ li r0, 0 /* 800AE418 000AB378 90 03 00 04 */ stw r0, 4(r3) -/* 800AE41C 000AB37C 4E 80 00 20 */ blr +/* 800AE41C 000AB37C 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR17CEnergyProjectile" "Visit__32TCastToPtr<18CFirstPersonCamera>FR17CEnergyProjectile": /* 800AE420 000AB380 38 00 00 00 */ li r0, 0 /* 800AE424 000AB384 90 03 00 04 */ stw r0, 4(r3) -/* 800AE428 000AB388 4E 80 00 20 */ blr +/* 800AE428 000AB388 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR16CDestroyableRock" "Visit__32TCastToPtr<18CFirstPersonCamera>FR16CDestroyableRock": /* 800AE42C 000AB38C 38 00 00 00 */ li r0, 0 /* 800AE430 000AB390 90 03 00 04 */ stw r0, 4(r3) -/* 800AE434 000AB394 4E 80 00 20 */ blr +/* 800AE434 000AB394 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR15CCollisionActor" "Visit__32TCastToPtr<18CFirstPersonCamera>FR15CCollisionActor": /* 800AE438 000AB398 38 00 00 00 */ li r0, 0 /* 800AE43C 000AB39C 90 03 00 04 */ stw r0, 4(r3) -/* 800AE440 000AB3A0 4E 80 00 20 */ blr +/* 800AE440 000AB3A0 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR16CCinematicCamera" "Visit__32TCastToPtr<18CFirstPersonCamera>FR16CCinematicCamera": /* 800AE444 000AB3A4 38 00 00 00 */ li r0, 0 /* 800AE448 000AB3A8 90 03 00 04 */ stw r0, 4(r3) -/* 800AE44C 000AB3AC 4E 80 00 20 */ blr +/* 800AE44C 000AB3AC 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR5CBomb" "Visit__32TCastToPtr<18CFirstPersonCamera>FR5CBomb": /* 800AE450 000AB3B0 38 00 00 00 */ li r0, 0 /* 800AE454 000AB3B4 90 03 00 04 */ stw r0, 4(r3) -/* 800AE458 000AB3B8 4E 80 00 20 */ blr +/* 800AE458 000AB3B8 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR11CBallCamera" "Visit__32TCastToPtr<18CFirstPersonCamera>FR11CBallCamera": /* 800AE45C 000AB3BC 38 00 00 00 */ li r0, 0 /* 800AE460 000AB3C0 90 03 00 04 */ stw r0, 4(r3) -/* 800AE464 000AB3C4 4E 80 00 20 */ blr +/* 800AE464 000AB3C4 4E 80 00 20 */ blr .global "Visit__32TCastToPtr<18CFirstPersonCamera>FR6CActor" "Visit__32TCastToPtr<18CFirstPersonCamera>FR6CActor": /* 800AE468 000AB3C8 38 00 00 00 */ li r0, 0 /* 800AE46C 000AB3CC 90 03 00 04 */ stw r0, 4(r3) -/* 800AE470 000AB3D0 4E 80 00 20 */ blr +/* 800AE470 000AB3D0 4E 80 00 20 */ blr .global "__ct__32TCastToPtr<18CFirstPersonCamera>FR7CEntity" "__ct__32TCastToPtr<18CFirstPersonCamera>FR7CEntity": @@ -20451,354 +20451,354 @@ lbl_800AE1B4: /* 800AE4B0 000AB410 81 83 00 00 */ lwz r12, 0(r3) /* 800AE4B4 000AB414 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800AE4B8 000AB418 7D 89 03 A6 */ mtctr r12 -/* 800AE4BC 000AB41C 4E 80 04 21 */ bctrl +/* 800AE4BC 000AB41C 4E 80 04 21 */ bctrl /* 800AE4C0 000AB420 80 01 00 14 */ lwz r0, 0x14(r1) /* 800AE4C4 000AB424 7F E3 FB 78 */ mr r3, r31 /* 800AE4C8 000AB428 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800AE4CC 000AB42C 7C 08 03 A6 */ mtlr r0 /* 800AE4D0 000AB430 38 21 00 10 */ addi r1, r1, 0x10 -/* 800AE4D4 000AB434 4E 80 00 20 */ blr +/* 800AE4D4 000AB434 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR7CWeapon" "Visit__24TCastToPtr<10CExplosion>FR7CWeapon": /* 800AE4D8 000AB438 38 00 00 00 */ li r0, 0 /* 800AE4DC 000AB43C 90 03 00 04 */ stw r0, 4(r3) -/* 800AE4E0 000AB440 4E 80 00 20 */ blr +/* 800AE4E0 000AB440 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR17CWallCrawlerSwarm" "Visit__24TCastToPtr<10CExplosion>FR17CWallCrawlerSwarm": /* 800AE4E4 000AB444 38 00 00 00 */ li r0, 0 /* 800AE4E8 000AB448 90 03 00 04 */ stw r0, 4(r3) -/* 800AE4EC 000AB44C 4E 80 00 20 */ blr +/* 800AE4EC 000AB44C 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR20CScriptSpindleCamera" "Visit__24TCastToPtr<10CExplosion>FR20CScriptSpindleCamera": /* 800AE4F0 000AB450 38 00 00 00 */ li r0, 0 /* 800AE4F4 000AB454 90 03 00 04 */ stw r0, 4(r3) -/* 800AE4F8 000AB458 4E 80 00 20 */ blr +/* 800AE4F8 000AB458 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR15CSnakeWeedSwarm" "Visit__24TCastToPtr<10CExplosion>FR15CSnakeWeedSwarm": /* 800AE4FC 000AB45C 38 00 00 00 */ li r0, 0 /* 800AE500 000AB460 90 03 00 04 */ stw r0, 4(r3) -/* 800AE504 000AB464 4E 80 00 20 */ blr +/* 800AE504 000AB464 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR15CScriptWaypoint" "Visit__24TCastToPtr<10CExplosion>FR15CScriptWaypoint": /* 800AE508 000AB468 38 00 00 00 */ li r0, 0 /* 800AE50C 000AB46C 90 03 00 04 */ stw r0, 4(r3) -/* 800AE510 000AB470 4E 80 00 20 */ blr +/* 800AE510 000AB470 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR12CScriptWater" "Visit__24TCastToPtr<10CExplosion>FR12CScriptWater": /* 800AE514 000AB474 38 00 00 00 */ li r0, 0 /* 800AE518 000AB478 90 03 00 04 */ stw r0, 4(r3) -/* 800AE51C 000AB47C 4E 80 00 20 */ blr +/* 800AE51C 000AB47C 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR17CScriptVisorFlare" "Visit__24TCastToPtr<10CExplosion>FR17CScriptVisorFlare": /* 800AE520 000AB480 38 00 00 00 */ li r0, 0 /* 800AE524 000AB484 90 03 00 04 */ stw r0, 4(r3) -/* 800AE528 000AB488 4E 80 00 20 */ blr +/* 800AE528 000AB488 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR14CScriptTrigger" "Visit__24TCastToPtr<10CExplosion>FR14CScriptTrigger": /* 800AE52C 000AB48C 38 00 00 00 */ li r0, 0 /* 800AE530 000AB490 90 03 00 04 */ stw r0, 4(r3) -/* 800AE534 000AB494 4E 80 00 20 */ blr +/* 800AE534 000AB494 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR12CScriptTimer" "Visit__24TCastToPtr<10CExplosion>FR12CScriptTimer": /* 800AE538 000AB498 38 00 00 00 */ li r0, 0 /* 800AE53C 000AB49C 90 03 00 04 */ stw r0, 4(r3) -/* 800AE540 000AB4A0 4E 80 00 20 */ blr +/* 800AE540 000AB4A0 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR10CTeamAiMgr" "Visit__24TCastToPtr<10CExplosion>FR10CTeamAiMgr": /* 800AE544 000AB4A4 38 00 00 00 */ li r0, 0 /* 800AE548 000AB4A8 90 03 00 04 */ stw r0, 4(r3) -/* 800AE54C 000AB4AC 4E 80 00 20 */ blr +/* 800AE54C 000AB4AC 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR21CScriptTargetingPoint" "Visit__24TCastToPtr<10CExplosion>FR21CScriptTargetingPoint": /* 800AE550 000AB4B0 38 00 00 00 */ li r0, 0 /* 800AE554 000AB4B4 90 03 00 04 */ stw r0, 4(r3) -/* 800AE558 000AB4B8 4E 80 00 20 */ blr +/* 800AE558 000AB4B8 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR25CScriptSpiderBallWaypoint" "Visit__24TCastToPtr<10CExplosion>FR25CScriptSpiderBallWaypoint": /* 800AE55C 000AB4BC 38 00 00 00 */ li r0, 0 /* 800AE560 000AB4C0 90 03 00 04 */ stw r0, 4(r3) -/* 800AE564 000AB4C4 4E 80 00 20 */ blr +/* 800AE564 000AB4C4 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR34CScriptSpiderBallAttractionSurface" "Visit__24TCastToPtr<10CExplosion>FR34CScriptSpiderBallAttractionSurface": /* 800AE568 000AB4C8 38 00 00 00 */ li r0, 0 /* 800AE56C 000AB4CC 90 03 00 04 */ stw r0, 4(r3) -/* 800AE570 000AB4D0 4E 80 00 20 */ blr +/* 800AE570 000AB4D0 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR22CScriptSpecialFunction" "Visit__24TCastToPtr<10CExplosion>FR22CScriptSpecialFunction": /* 800AE574 000AB4D4 38 00 00 00 */ li r0, 0 /* 800AE578 000AB4D8 90 03 00 04 */ stw r0, 4(r3) -/* 800AE57C 000AB4DC 4E 80 00 20 */ blr +/* 800AE57C 000AB4DC 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR17CScriptSpawnPoint" "Visit__24TCastToPtr<10CExplosion>FR17CScriptSpawnPoint": /* 800AE580 000AB4E0 38 00 00 00 */ li r0, 0 /* 800AE584 000AB4E4 90 03 00 04 */ stw r0, 4(r3) -/* 800AE588 000AB4E8 4E 80 00 20 */ blr +/* 800AE588 000AB4E8 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR12CScriptSound" "Visit__24TCastToPtr<10CExplosion>FR12CScriptSound": /* 800AE58C 000AB4EC 38 00 00 00 */ li r0, 0 /* 800AE590 000AB4F0 90 03 00 04 */ stw r0, 4(r3) -/* 800AE594 000AB4F4 4E 80 00 20 */ blr +/* 800AE594 000AB4F4 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR20CScriptRoomAcoustics" "Visit__24TCastToPtr<10CExplosion>FR20CScriptRoomAcoustics": /* 800AE598 000AB4F8 38 00 00 00 */ li r0, 0 /* 800AE59C 000AB4FC 90 03 00 04 */ stw r0, 4(r3) -/* 800AE5A0 000AB500 4E 80 00 20 */ blr +/* 800AE5A0 000AB500 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR22CScriptPointOfinterest" "Visit__24TCastToPtr<10CExplosion>FR22CScriptPointOfinterest": /* 800AE5A4 000AB504 38 00 00 00 */ li r0, 0 /* 800AE5A8 000AB508 90 03 00 04 */ stw r0, 4(r3) -/* 800AE5AC 000AB50C 4E 80 00 20 */ blr +/* 800AE5AC 000AB50C 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR17CScriptPlayerHint" "Visit__24TCastToPtr<10CExplosion>FR17CScriptPlayerHint": /* 800AE5B0 000AB510 38 00 00 00 */ li r0, 0 /* 800AE5B4 000AB514 90 03 00 04 */ stw r0, 4(r3) -/* 800AE5B8 000AB518 4E 80 00 20 */ blr +/* 800AE5B8 000AB518 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR15CScriptPlatform" "Visit__24TCastToPtr<10CExplosion>FR15CScriptPlatform": /* 800AE5BC 000AB51C 38 00 00 00 */ li r0, 0 /* 800AE5C0 000AB520 90 03 00 04 */ stw r0, 4(r3) -/* 800AE5C4 000AB524 4E 80 00 20 */ blr +/* 800AE5C4 000AB524 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR13CScriptPickup" "Visit__24TCastToPtr<10CExplosion>FR13CScriptPickup": /* 800AE5C8 000AB528 38 00 00 00 */ li r0, 0 /* 800AE5CC 000AB52C 90 03 00 04 */ stw r0, 4(r3) -/* 800AE5D0 000AB530 4E 80 00 20 */ blr +/* 800AE5D0 000AB530 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR15CScriptMazeNode" "Visit__24TCastToPtr<10CExplosion>FR15CScriptMazeNode": /* 800AE5D4 000AB534 38 00 00 00 */ li r0, 0 /* 800AE5D8 000AB538 90 03 00 04 */ stw r0, 4(r3) -/* 800AE5DC 000AB53C 4E 80 00 20 */ blr +/* 800AE5DC 000AB53C 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR16CScriptGunTurret" "Visit__24TCastToPtr<10CExplosion>FR16CScriptGunTurret": /* 800AE5E0 000AB540 38 00 00 00 */ li r0, 0 /* 800AE5E4 000AB544 90 03 00 04 */ stw r0, 4(r3) -/* 800AE5E8 000AB548 4E 80 00 20 */ blr +/* 800AE5E8 000AB548 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR19CScriptGrapplePoint" "Visit__24TCastToPtr<10CExplosion>FR19CScriptGrapplePoint": /* 800AE5EC 000AB54C 38 00 00 00 */ li r0, 0 /* 800AE5F0 000AB550 90 03 00 04 */ stw r0, 4(r3) -/* 800AE5F4 000AB554 4E 80 00 20 */ blr +/* 800AE5F4 000AB554 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR13CScriptEffect" "Visit__24TCastToPtr<10CExplosion>FR13CScriptEffect": /* 800AE5F8 000AB558 38 00 00 00 */ li r0, 0 /* 800AE5FC 000AB55C 90 03 00 04 */ stw r0, 4(r3) -/* 800AE600 000AB560 4E 80 00 20 */ blr +/* 800AE600 000AB560 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR11CScriptDoor" "Visit__24TCastToPtr<10CExplosion>FR11CScriptDoor": /* 800AE604 000AB564 38 00 00 00 */ li r0, 0 /* 800AE608 000AB568 90 03 00 04 */ stw r0, 4(r3) -/* 800AE60C 000AB56C 4E 80 00 20 */ blr +/* 800AE60C 000AB56C 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR11CScriptDock" "Visit__24TCastToPtr<10CExplosion>FR11CScriptDock": /* 800AE610 000AB570 38 00 00 00 */ li r0, 0 /* 800AE614 000AB574 90 03 00 04 */ stw r0, 4(r3) -/* 800AE618 000AB578 4E 80 00 20 */ blr +/* 800AE618 000AB578 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR18CScriptDistanceFog" "Visit__24TCastToPtr<10CExplosion>FR18CScriptDistanceFog": /* 800AE61C 000AB57C 38 00 00 00 */ li r0, 0 /* 800AE620 000AB580 90 03 00 04 */ stw r0, 4(r3) -/* 800AE624 000AB584 4E 80 00 20 */ blr +/* 800AE624 000AB584 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR26CScriptDebugCameraWaypoint" "Visit__24TCastToPtr<10CExplosion>FR26CScriptDebugCameraWaypoint": /* 800AE628 000AB588 38 00 00 00 */ li r0, 0 /* 800AE62C 000AB58C 90 03 00 04 */ stw r0, 4(r3) -/* 800AE630 000AB590 4E 80 00 20 */ blr +/* 800AE630 000AB590 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR17CScriptCoverPoint" "Visit__24TCastToPtr<10CExplosion>FR17CScriptCoverPoint": /* 800AE634 000AB594 38 00 00 00 */ li r0, 0 /* 800AE638 000AB598 90 03 00 04 */ stw r0, 4(r3) -/* 800AE63C 000AB59C 4E 80 00 20 */ blr +/* 800AE63C 000AB59C 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR21CScriptCameraWaypoint" "Visit__24TCastToPtr<10CExplosion>FR21CScriptCameraWaypoint": /* 800AE640 000AB5A0 38 00 00 00 */ li r0, 0 /* 800AE644 000AB5A4 90 03 00 04 */ stw r0, 4(r3) -/* 800AE648 000AB5A8 4E 80 00 20 */ blr +/* 800AE648 000AB5A8 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR24CScriptCameraPitchVolume" "Visit__24TCastToPtr<10CExplosion>FR24CScriptCameraPitchVolume": /* 800AE64C 000AB5AC 38 00 00 00 */ li r0, 0 /* 800AE650 000AB5B0 90 03 00 04 */ stw r0, 4(r3) -/* 800AE654 000AB5B4 4E 80 00 20 */ blr +/* 800AE654 000AB5B4 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR17CScriptCameraHint" "Visit__24TCastToPtr<10CExplosion>FR17CScriptCameraHint": /* 800AE658 000AB5B8 38 00 00 00 */ li r0, 0 /* 800AE65C 000AB5BC 90 03 00 04 */ stw r0, 4(r3) -/* 800AE660 000AB5C0 4E 80 00 20 */ blr +/* 800AE660 000AB5C0 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR18CScriptAiJumpPoint" "Visit__24TCastToPtr<10CExplosion>FR18CScriptAiJumpPoint": /* 800AE664 000AB5C4 38 00 00 00 */ li r0, 0 /* 800AE668 000AB5C8 90 03 00 04 */ stw r0, 4(r3) -/* 800AE66C 000AB5CC 4E 80 00 20 */ blr +/* 800AE66C 000AB5CC 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR20CScriptActorKeyframe" "Visit__24TCastToPtr<10CExplosion>FR20CScriptActorKeyframe": /* 800AE670 000AB5D0 38 00 00 00 */ li r0, 0 /* 800AE674 000AB5D4 90 03 00 04 */ stw r0, 4(r3) -/* 800AE678 000AB5D8 4E 80 00 20 */ blr +/* 800AE678 000AB5D8 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR12CScriptActor" "Visit__24TCastToPtr<10CExplosion>FR12CScriptActor": /* 800AE67C 000AB5DC 38 00 00 00 */ li r0, 0 /* 800AE680 000AB5E0 90 03 00 04 */ stw r0, 4(r3) -/* 800AE684 000AB5E4 4E 80 00 20 */ blr +/* 800AE684 000AB5E4 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR9CRepulsor" "Visit__24TCastToPtr<10CExplosion>FR9CRepulsor": /* 800AE688 000AB5E8 38 00 00 00 */ li r0, 0 /* 800AE68C 000AB5EC 90 03 00 04 */ stw r0, 4(r3) -/* 800AE690 000AB5F0 4E 80 00 20 */ blr +/* 800AE690 000AB5F0 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR7CPlayer" "Visit__24TCastToPtr<10CExplosion>FR7CPlayer": /* 800AE694 000AB5F4 38 00 00 00 */ li r0, 0 /* 800AE698 000AB5F8 90 03 00 04 */ stw r0, 4(r3) -/* 800AE69C 000AB5FC 4E 80 00 20 */ blr +/* 800AE69C 000AB5FC 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR13CPhysicsActor" "Visit__24TCastToPtr<10CExplosion>FR13CPhysicsActor": /* 800AE6A0 000AB600 38 00 00 00 */ li r0, 0 /* 800AE6A4 000AB604 90 03 00 04 */ stw r0, 4(r3) -/* 800AE6A8 000AB608 4E 80 00 20 */ blr +/* 800AE6A8 000AB608 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR3CAi" "Visit__24TCastToPtr<10CExplosion>FR3CAi": /* 800AE6AC 000AB60C 38 00 00 00 */ li r0, 0 /* 800AE6B0 000AB610 90 03 00 04 */ stw r0, 4(r3) -/* 800AE6B4 000AB614 4E 80 00 20 */ blr +/* 800AE6B4 000AB614 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR11CPathCamera" "Visit__24TCastToPtr<10CExplosion>FR11CPathCamera": /* 800AE6B8 000AB618 38 00 00 00 */ li r0, 0 /* 800AE6BC 000AB61C 90 03 00 04 */ stw r0, 4(r3) -/* 800AE6C0 000AB620 4E 80 00 20 */ blr +/* 800AE6C0 000AB620 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR18CMetroidPrimeRelay" "Visit__24TCastToPtr<10CExplosion>FR18CMetroidPrimeRelay": /* 800AE6C4 000AB624 38 00 00 00 */ li r0, 0 /* 800AE6C8 000AB628 90 03 00 04 */ stw r0, 4(r3) -/* 800AE6CC 000AB62C 4E 80 00 20 */ blr +/* 800AE6CC 000AB62C 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR19CHUDBillboardEffect" "Visit__24TCastToPtr<10CExplosion>FR19CHUDBillboardEffect": /* 800AE6D0 000AB630 38 00 00 00 */ li r0, 0 /* 800AE6D4 000AB634 90 03 00 04 */ stw r0, 4(r3) -/* 800AE6D8 000AB638 4E 80 00 20 */ blr +/* 800AE6D8 000AB638 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR15CGameProjectile" "Visit__24TCastToPtr<10CExplosion>FR15CGameProjectile": /* 800AE6DC 000AB63C 38 00 00 00 */ li r0, 0 /* 800AE6E0 000AB640 90 03 00 04 */ stw r0, 4(r3) -/* 800AE6E4 000AB644 4E 80 00 20 */ blr +/* 800AE6E4 000AB644 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR10CGameLight" "Visit__24TCastToPtr<10CExplosion>FR10CGameLight": /* 800AE6E8 000AB648 38 00 00 00 */ li r0, 0 /* 800AE6EC 000AB64C 90 03 00 04 */ stw r0, 4(r3) -/* 800AE6F0 000AB650 4E 80 00 20 */ blr +/* 800AE6F0 000AB650 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR11CGameCamera" "Visit__24TCastToPtr<10CExplosion>FR11CGameCamera": /* 800AE6F4 000AB654 38 00 00 00 */ li r0, 0 /* 800AE6F8 000AB658 90 03 00 04 */ stw r0, 4(r3) -/* 800AE6FC 000AB65C 4E 80 00 20 */ blr +/* 800AE6FC 000AB65C 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR10CFishCloud" "Visit__24TCastToPtr<10CExplosion>FR10CFishCloud": /* 800AE700 000AB660 38 00 00 00 */ li r0, 0 /* 800AE704 000AB664 90 03 00 04 */ stw r0, 4(r3) -/* 800AE708 000AB668 4E 80 00 20 */ blr +/* 800AE708 000AB668 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR18CFirstPersonCamera" "Visit__24TCastToPtr<10CExplosion>FR18CFirstPersonCamera": /* 800AE70C 000AB66C 38 00 00 00 */ li r0, 0 /* 800AE710 000AB670 90 03 00 04 */ stw r0, 4(r3) -/* 800AE714 000AB674 4E 80 00 20 */ blr +/* 800AE714 000AB674 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR10CExplosion" "Visit__24TCastToPtr<10CExplosion>FR10CExplosion": /* 800AE718 000AB678 90 83 00 04 */ stw r4, 4(r3) -/* 800AE71C 000AB67C 4E 80 00 20 */ blr +/* 800AE71C 000AB67C 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR7CEntity" "Visit__24TCastToPtr<10CExplosion>FR7CEntity": /* 800AE720 000AB680 38 00 00 00 */ li r0, 0 /* 800AE724 000AB684 90 03 00 04 */ stw r0, 4(r3) -/* 800AE728 000AB688 4E 80 00 20 */ blr +/* 800AE728 000AB688 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR17CEnergyProjectile" "Visit__24TCastToPtr<10CExplosion>FR17CEnergyProjectile": /* 800AE72C 000AB68C 38 00 00 00 */ li r0, 0 /* 800AE730 000AB690 90 03 00 04 */ stw r0, 4(r3) -/* 800AE734 000AB694 4E 80 00 20 */ blr +/* 800AE734 000AB694 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR16CDestroyableRock" "Visit__24TCastToPtr<10CExplosion>FR16CDestroyableRock": /* 800AE738 000AB698 38 00 00 00 */ li r0, 0 /* 800AE73C 000AB69C 90 03 00 04 */ stw r0, 4(r3) -/* 800AE740 000AB6A0 4E 80 00 20 */ blr +/* 800AE740 000AB6A0 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR15CCollisionActor" "Visit__24TCastToPtr<10CExplosion>FR15CCollisionActor": /* 800AE744 000AB6A4 38 00 00 00 */ li r0, 0 /* 800AE748 000AB6A8 90 03 00 04 */ stw r0, 4(r3) -/* 800AE74C 000AB6AC 4E 80 00 20 */ blr +/* 800AE74C 000AB6AC 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR16CCinematicCamera" "Visit__24TCastToPtr<10CExplosion>FR16CCinematicCamera": /* 800AE750 000AB6B0 38 00 00 00 */ li r0, 0 /* 800AE754 000AB6B4 90 03 00 04 */ stw r0, 4(r3) -/* 800AE758 000AB6B8 4E 80 00 20 */ blr +/* 800AE758 000AB6B8 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR5CBomb" "Visit__24TCastToPtr<10CExplosion>FR5CBomb": /* 800AE75C 000AB6BC 38 00 00 00 */ li r0, 0 /* 800AE760 000AB6C0 90 03 00 04 */ stw r0, 4(r3) -/* 800AE764 000AB6C4 4E 80 00 20 */ blr +/* 800AE764 000AB6C4 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR11CBallCamera" "Visit__24TCastToPtr<10CExplosion>FR11CBallCamera": /* 800AE768 000AB6C8 38 00 00 00 */ li r0, 0 /* 800AE76C 000AB6CC 90 03 00 04 */ stw r0, 4(r3) -/* 800AE770 000AB6D0 4E 80 00 20 */ blr +/* 800AE770 000AB6D0 4E 80 00 20 */ blr .global "Visit__24TCastToPtr<10CExplosion>FR6CActor" "Visit__24TCastToPtr<10CExplosion>FR6CActor": /* 800AE774 000AB6D4 38 00 00 00 */ li r0, 0 /* 800AE778 000AB6D8 90 03 00 04 */ stw r0, 4(r3) -/* 800AE77C 000AB6DC 4E 80 00 20 */ blr +/* 800AE77C 000AB6DC 4E 80 00 20 */ blr .global "__ct__24TCastToPtr<10CExplosion>FP7CEntity" "__ct__24TCastToPtr<10CExplosion>FP7CEntity": @@ -20822,299 +20822,299 @@ lbl_800AE1B4: /* 800AE7C4 000AB724 81 83 00 00 */ lwz r12, 0(r3) /* 800AE7C8 000AB728 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800AE7CC 000AB72C 7D 89 03 A6 */ mtctr r12 -/* 800AE7D0 000AB730 4E 80 04 21 */ bctrl +/* 800AE7D0 000AB730 4E 80 04 21 */ bctrl lbl_800AE7D4: /* 800AE7D4 000AB734 80 01 00 14 */ lwz r0, 0x14(r1) /* 800AE7D8 000AB738 7F E3 FB 78 */ mr r3, r31 /* 800AE7DC 000AB73C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800AE7E0 000AB740 7C 08 03 A6 */ mtlr r0 /* 800AE7E4 000AB744 38 21 00 10 */ addi r1, r1, 0x10 -/* 800AE7E8 000AB748 4E 80 00 20 */ blr +/* 800AE7E8 000AB748 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR7CWeapon" "Visit__20TCastToPtr<7CEntity>FR7CWeapon": /* 800AE7EC 000AB74C 90 83 00 04 */ stw r4, 4(r3) -/* 800AE7F0 000AB750 4E 80 00 20 */ blr +/* 800AE7F0 000AB750 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR17CWallCrawlerSwarm" "Visit__20TCastToPtr<7CEntity>FR17CWallCrawlerSwarm": /* 800AE7F4 000AB754 90 83 00 04 */ stw r4, 4(r3) -/* 800AE7F8 000AB758 4E 80 00 20 */ blr +/* 800AE7F8 000AB758 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR20CScriptSpindleCamera" "Visit__20TCastToPtr<7CEntity>FR20CScriptSpindleCamera": /* 800AE7FC 000AB75C 90 83 00 04 */ stw r4, 4(r3) -/* 800AE800 000AB760 4E 80 00 20 */ blr +/* 800AE800 000AB760 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR15CSnakeWeedSwarm" "Visit__20TCastToPtr<7CEntity>FR15CSnakeWeedSwarm": /* 800AE804 000AB764 90 83 00 04 */ stw r4, 4(r3) -/* 800AE808 000AB768 4E 80 00 20 */ blr +/* 800AE808 000AB768 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR15CScriptWaypoint" "Visit__20TCastToPtr<7CEntity>FR15CScriptWaypoint": /* 800AE80C 000AB76C 90 83 00 04 */ stw r4, 4(r3) -/* 800AE810 000AB770 4E 80 00 20 */ blr +/* 800AE810 000AB770 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR12CScriptWater" "Visit__20TCastToPtr<7CEntity>FR12CScriptWater": /* 800AE814 000AB774 90 83 00 04 */ stw r4, 4(r3) -/* 800AE818 000AB778 4E 80 00 20 */ blr +/* 800AE818 000AB778 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR17CScriptVisorFlare" "Visit__20TCastToPtr<7CEntity>FR17CScriptVisorFlare": /* 800AE81C 000AB77C 90 83 00 04 */ stw r4, 4(r3) -/* 800AE820 000AB780 4E 80 00 20 */ blr +/* 800AE820 000AB780 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR14CScriptTrigger" "Visit__20TCastToPtr<7CEntity>FR14CScriptTrigger": /* 800AE824 000AB784 90 83 00 04 */ stw r4, 4(r3) -/* 800AE828 000AB788 4E 80 00 20 */ blr +/* 800AE828 000AB788 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR12CScriptTimer" "Visit__20TCastToPtr<7CEntity>FR12CScriptTimer": /* 800AE82C 000AB78C 90 83 00 04 */ stw r4, 4(r3) -/* 800AE830 000AB790 4E 80 00 20 */ blr +/* 800AE830 000AB790 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR10CTeamAiMgr" "Visit__20TCastToPtr<7CEntity>FR10CTeamAiMgr": /* 800AE834 000AB794 90 83 00 04 */ stw r4, 4(r3) -/* 800AE838 000AB798 4E 80 00 20 */ blr +/* 800AE838 000AB798 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR21CScriptTargetingPoint" "Visit__20TCastToPtr<7CEntity>FR21CScriptTargetingPoint": /* 800AE83C 000AB79C 90 83 00 04 */ stw r4, 4(r3) -/* 800AE840 000AB7A0 4E 80 00 20 */ blr +/* 800AE840 000AB7A0 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR25CScriptSpiderBallWaypoint" "Visit__20TCastToPtr<7CEntity>FR25CScriptSpiderBallWaypoint": /* 800AE844 000AB7A4 90 83 00 04 */ stw r4, 4(r3) -/* 800AE848 000AB7A8 4E 80 00 20 */ blr +/* 800AE848 000AB7A8 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR34CScriptSpiderBallAttractionSurface" "Visit__20TCastToPtr<7CEntity>FR34CScriptSpiderBallAttractionSurface": /* 800AE84C 000AB7AC 90 83 00 04 */ stw r4, 4(r3) -/* 800AE850 000AB7B0 4E 80 00 20 */ blr +/* 800AE850 000AB7B0 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR22CScriptSpecialFunction" "Visit__20TCastToPtr<7CEntity>FR22CScriptSpecialFunction": /* 800AE854 000AB7B4 90 83 00 04 */ stw r4, 4(r3) -/* 800AE858 000AB7B8 4E 80 00 20 */ blr +/* 800AE858 000AB7B8 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR17CScriptSpawnPoint" "Visit__20TCastToPtr<7CEntity>FR17CScriptSpawnPoint": /* 800AE85C 000AB7BC 90 83 00 04 */ stw r4, 4(r3) -/* 800AE860 000AB7C0 4E 80 00 20 */ blr +/* 800AE860 000AB7C0 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR12CScriptSound" "Visit__20TCastToPtr<7CEntity>FR12CScriptSound": /* 800AE864 000AB7C4 90 83 00 04 */ stw r4, 4(r3) -/* 800AE868 000AB7C8 4E 80 00 20 */ blr +/* 800AE868 000AB7C8 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR20CScriptRoomAcoustics" "Visit__20TCastToPtr<7CEntity>FR20CScriptRoomAcoustics": /* 800AE86C 000AB7CC 90 83 00 04 */ stw r4, 4(r3) -/* 800AE870 000AB7D0 4E 80 00 20 */ blr +/* 800AE870 000AB7D0 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR22CScriptPointOfinterest" "Visit__20TCastToPtr<7CEntity>FR22CScriptPointOfinterest": /* 800AE874 000AB7D4 90 83 00 04 */ stw r4, 4(r3) -/* 800AE878 000AB7D8 4E 80 00 20 */ blr +/* 800AE878 000AB7D8 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR17CScriptPlayerHint" "Visit__20TCastToPtr<7CEntity>FR17CScriptPlayerHint": /* 800AE87C 000AB7DC 90 83 00 04 */ stw r4, 4(r3) -/* 800AE880 000AB7E0 4E 80 00 20 */ blr +/* 800AE880 000AB7E0 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR15CScriptPlatform" "Visit__20TCastToPtr<7CEntity>FR15CScriptPlatform": /* 800AE884 000AB7E4 90 83 00 04 */ stw r4, 4(r3) -/* 800AE888 000AB7E8 4E 80 00 20 */ blr +/* 800AE888 000AB7E8 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR13CScriptPickup" "Visit__20TCastToPtr<7CEntity>FR13CScriptPickup": /* 800AE88C 000AB7EC 90 83 00 04 */ stw r4, 4(r3) -/* 800AE890 000AB7F0 4E 80 00 20 */ blr +/* 800AE890 000AB7F0 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR15CScriptMazeNode" "Visit__20TCastToPtr<7CEntity>FR15CScriptMazeNode": /* 800AE894 000AB7F4 90 83 00 04 */ stw r4, 4(r3) -/* 800AE898 000AB7F8 4E 80 00 20 */ blr +/* 800AE898 000AB7F8 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR16CScriptGunTurret" "Visit__20TCastToPtr<7CEntity>FR16CScriptGunTurret": /* 800AE89C 000AB7FC 90 83 00 04 */ stw r4, 4(r3) -/* 800AE8A0 000AB800 4E 80 00 20 */ blr +/* 800AE8A0 000AB800 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR19CScriptGrapplePoint" "Visit__20TCastToPtr<7CEntity>FR19CScriptGrapplePoint": /* 800AE8A4 000AB804 90 83 00 04 */ stw r4, 4(r3) -/* 800AE8A8 000AB808 4E 80 00 20 */ blr +/* 800AE8A8 000AB808 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR13CScriptEffect" "Visit__20TCastToPtr<7CEntity>FR13CScriptEffect": /* 800AE8AC 000AB80C 90 83 00 04 */ stw r4, 4(r3) -/* 800AE8B0 000AB810 4E 80 00 20 */ blr +/* 800AE8B0 000AB810 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR11CScriptDoor" "Visit__20TCastToPtr<7CEntity>FR11CScriptDoor": /* 800AE8B4 000AB814 90 83 00 04 */ stw r4, 4(r3) -/* 800AE8B8 000AB818 4E 80 00 20 */ blr +/* 800AE8B8 000AB818 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR11CScriptDock" "Visit__20TCastToPtr<7CEntity>FR11CScriptDock": /* 800AE8BC 000AB81C 90 83 00 04 */ stw r4, 4(r3) -/* 800AE8C0 000AB820 4E 80 00 20 */ blr +/* 800AE8C0 000AB820 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR18CScriptDistanceFog" "Visit__20TCastToPtr<7CEntity>FR18CScriptDistanceFog": /* 800AE8C4 000AB824 90 83 00 04 */ stw r4, 4(r3) -/* 800AE8C8 000AB828 4E 80 00 20 */ blr +/* 800AE8C8 000AB828 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR26CScriptDebugCameraWaypoint" "Visit__20TCastToPtr<7CEntity>FR26CScriptDebugCameraWaypoint": /* 800AE8CC 000AB82C 90 83 00 04 */ stw r4, 4(r3) -/* 800AE8D0 000AB830 4E 80 00 20 */ blr +/* 800AE8D0 000AB830 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR17CScriptCoverPoint" "Visit__20TCastToPtr<7CEntity>FR17CScriptCoverPoint": /* 800AE8D4 000AB834 90 83 00 04 */ stw r4, 4(r3) -/* 800AE8D8 000AB838 4E 80 00 20 */ blr +/* 800AE8D8 000AB838 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR21CScriptCameraWaypoint" "Visit__20TCastToPtr<7CEntity>FR21CScriptCameraWaypoint": /* 800AE8DC 000AB83C 90 83 00 04 */ stw r4, 4(r3) -/* 800AE8E0 000AB840 4E 80 00 20 */ blr +/* 800AE8E0 000AB840 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR24CScriptCameraPitchVolume" "Visit__20TCastToPtr<7CEntity>FR24CScriptCameraPitchVolume": /* 800AE8E4 000AB844 90 83 00 04 */ stw r4, 4(r3) -/* 800AE8E8 000AB848 4E 80 00 20 */ blr +/* 800AE8E8 000AB848 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR17CScriptCameraHint" "Visit__20TCastToPtr<7CEntity>FR17CScriptCameraHint": /* 800AE8EC 000AB84C 90 83 00 04 */ stw r4, 4(r3) -/* 800AE8F0 000AB850 4E 80 00 20 */ blr +/* 800AE8F0 000AB850 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR18CScriptAiJumpPoint" "Visit__20TCastToPtr<7CEntity>FR18CScriptAiJumpPoint": /* 800AE8F4 000AB854 90 83 00 04 */ stw r4, 4(r3) -/* 800AE8F8 000AB858 4E 80 00 20 */ blr +/* 800AE8F8 000AB858 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR20CScriptActorKeyframe" "Visit__20TCastToPtr<7CEntity>FR20CScriptActorKeyframe": /* 800AE8FC 000AB85C 90 83 00 04 */ stw r4, 4(r3) -/* 800AE900 000AB860 4E 80 00 20 */ blr +/* 800AE900 000AB860 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR12CScriptActor" "Visit__20TCastToPtr<7CEntity>FR12CScriptActor": /* 800AE904 000AB864 90 83 00 04 */ stw r4, 4(r3) -/* 800AE908 000AB868 4E 80 00 20 */ blr +/* 800AE908 000AB868 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR9CRepulsor" "Visit__20TCastToPtr<7CEntity>FR9CRepulsor": /* 800AE90C 000AB86C 90 83 00 04 */ stw r4, 4(r3) -/* 800AE910 000AB870 4E 80 00 20 */ blr +/* 800AE910 000AB870 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR7CPlayer" "Visit__20TCastToPtr<7CEntity>FR7CPlayer": /* 800AE914 000AB874 90 83 00 04 */ stw r4, 4(r3) -/* 800AE918 000AB878 4E 80 00 20 */ blr +/* 800AE918 000AB878 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR13CPhysicsActor" "Visit__20TCastToPtr<7CEntity>FR13CPhysicsActor": /* 800AE91C 000AB87C 90 83 00 04 */ stw r4, 4(r3) -/* 800AE920 000AB880 4E 80 00 20 */ blr +/* 800AE920 000AB880 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR3CAi" "Visit__20TCastToPtr<7CEntity>FR3CAi": /* 800AE924 000AB884 90 83 00 04 */ stw r4, 4(r3) -/* 800AE928 000AB888 4E 80 00 20 */ blr +/* 800AE928 000AB888 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR11CPathCamera" "Visit__20TCastToPtr<7CEntity>FR11CPathCamera": /* 800AE92C 000AB88C 90 83 00 04 */ stw r4, 4(r3) -/* 800AE930 000AB890 4E 80 00 20 */ blr +/* 800AE930 000AB890 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR18CMetroidPrimeRelay" "Visit__20TCastToPtr<7CEntity>FR18CMetroidPrimeRelay": /* 800AE934 000AB894 90 83 00 04 */ stw r4, 4(r3) -/* 800AE938 000AB898 4E 80 00 20 */ blr +/* 800AE938 000AB898 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR19CHUDBillboardEffect" "Visit__20TCastToPtr<7CEntity>FR19CHUDBillboardEffect": /* 800AE93C 000AB89C 90 83 00 04 */ stw r4, 4(r3) -/* 800AE940 000AB8A0 4E 80 00 20 */ blr +/* 800AE940 000AB8A0 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR15CGameProjectile" "Visit__20TCastToPtr<7CEntity>FR15CGameProjectile": /* 800AE944 000AB8A4 90 83 00 04 */ stw r4, 4(r3) -/* 800AE948 000AB8A8 4E 80 00 20 */ blr +/* 800AE948 000AB8A8 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR10CGameLight" "Visit__20TCastToPtr<7CEntity>FR10CGameLight": /* 800AE94C 000AB8AC 90 83 00 04 */ stw r4, 4(r3) -/* 800AE950 000AB8B0 4E 80 00 20 */ blr +/* 800AE950 000AB8B0 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR11CGameCamera" "Visit__20TCastToPtr<7CEntity>FR11CGameCamera": /* 800AE954 000AB8B4 90 83 00 04 */ stw r4, 4(r3) -/* 800AE958 000AB8B8 4E 80 00 20 */ blr +/* 800AE958 000AB8B8 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR10CFishCloud" "Visit__20TCastToPtr<7CEntity>FR10CFishCloud": /* 800AE95C 000AB8BC 90 83 00 04 */ stw r4, 4(r3) -/* 800AE960 000AB8C0 4E 80 00 20 */ blr +/* 800AE960 000AB8C0 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR18CFirstPersonCamera" "Visit__20TCastToPtr<7CEntity>FR18CFirstPersonCamera": /* 800AE964 000AB8C4 90 83 00 04 */ stw r4, 4(r3) -/* 800AE968 000AB8C8 4E 80 00 20 */ blr +/* 800AE968 000AB8C8 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR10CExplosion" "Visit__20TCastToPtr<7CEntity>FR10CExplosion": /* 800AE96C 000AB8CC 90 83 00 04 */ stw r4, 4(r3) -/* 800AE970 000AB8D0 4E 80 00 20 */ blr +/* 800AE970 000AB8D0 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR7CEntity" "Visit__20TCastToPtr<7CEntity>FR7CEntity": /* 800AE974 000AB8D4 90 83 00 04 */ stw r4, 4(r3) -/* 800AE978 000AB8D8 4E 80 00 20 */ blr +/* 800AE978 000AB8D8 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR17CEnergyProjectile" "Visit__20TCastToPtr<7CEntity>FR17CEnergyProjectile": /* 800AE97C 000AB8DC 90 83 00 04 */ stw r4, 4(r3) -/* 800AE980 000AB8E0 4E 80 00 20 */ blr +/* 800AE980 000AB8E0 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR16CDestroyableRock" "Visit__20TCastToPtr<7CEntity>FR16CDestroyableRock": /* 800AE984 000AB8E4 90 83 00 04 */ stw r4, 4(r3) -/* 800AE988 000AB8E8 4E 80 00 20 */ blr +/* 800AE988 000AB8E8 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR15CCollisionActor" "Visit__20TCastToPtr<7CEntity>FR15CCollisionActor": /* 800AE98C 000AB8EC 90 83 00 04 */ stw r4, 4(r3) -/* 800AE990 000AB8F0 4E 80 00 20 */ blr +/* 800AE990 000AB8F0 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR16CCinematicCamera" "Visit__20TCastToPtr<7CEntity>FR16CCinematicCamera": /* 800AE994 000AB8F4 90 83 00 04 */ stw r4, 4(r3) -/* 800AE998 000AB8F8 4E 80 00 20 */ blr +/* 800AE998 000AB8F8 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR5CBomb" "Visit__20TCastToPtr<7CEntity>FR5CBomb": /* 800AE99C 000AB8FC 90 83 00 04 */ stw r4, 4(r3) -/* 800AE9A0 000AB900 4E 80 00 20 */ blr +/* 800AE9A0 000AB900 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR11CBallCamera" "Visit__20TCastToPtr<7CEntity>FR11CBallCamera": /* 800AE9A4 000AB904 90 83 00 04 */ stw r4, 4(r3) -/* 800AE9A8 000AB908 4E 80 00 20 */ blr +/* 800AE9A8 000AB908 4E 80 00 20 */ blr .global "Visit__20TCastToPtr<7CEntity>FR6CActor" "Visit__20TCastToPtr<7CEntity>FR6CActor": /* 800AE9AC 000AB90C 90 83 00 04 */ stw r4, 4(r3) -/* 800AE9B0 000AB910 4E 80 00 20 */ blr +/* 800AE9B0 000AB910 4E 80 00 20 */ blr .global "__ct__20TCastToPtr<7CEntity>FP7CEntity" "__ct__20TCastToPtr<7CEntity>FP7CEntity": @@ -21138,355 +21138,355 @@ lbl_800AE7D4: /* 800AE9F8 000AB958 81 83 00 00 */ lwz r12, 0(r3) /* 800AE9FC 000AB95C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800AEA00 000AB960 7D 89 03 A6 */ mtctr r12 -/* 800AEA04 000AB964 4E 80 04 21 */ bctrl +/* 800AEA04 000AB964 4E 80 04 21 */ bctrl lbl_800AEA08: /* 800AEA08 000AB968 80 01 00 14 */ lwz r0, 0x14(r1) /* 800AEA0C 000AB96C 7F E3 FB 78 */ mr r3, r31 /* 800AEA10 000AB970 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800AEA14 000AB974 7C 08 03 A6 */ mtlr r0 /* 800AEA18 000AB978 38 21 00 10 */ addi r1, r1, 0x10 -/* 800AEA1C 000AB97C 4E 80 00 20 */ blr +/* 800AEA1C 000AB97C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR7CWeapon" "Visit__31TCastToPtr<17CEnergyProjectile>FR7CWeapon": /* 800AEA20 000AB980 38 00 00 00 */ li r0, 0 /* 800AEA24 000AB984 90 03 00 04 */ stw r0, 4(r3) -/* 800AEA28 000AB988 4E 80 00 20 */ blr +/* 800AEA28 000AB988 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR17CWallCrawlerSwarm" "Visit__31TCastToPtr<17CEnergyProjectile>FR17CWallCrawlerSwarm": /* 800AEA2C 000AB98C 38 00 00 00 */ li r0, 0 /* 800AEA30 000AB990 90 03 00 04 */ stw r0, 4(r3) -/* 800AEA34 000AB994 4E 80 00 20 */ blr +/* 800AEA34 000AB994 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR20CScriptSpindleCamera" "Visit__31TCastToPtr<17CEnergyProjectile>FR20CScriptSpindleCamera": /* 800AEA38 000AB998 38 00 00 00 */ li r0, 0 /* 800AEA3C 000AB99C 90 03 00 04 */ stw r0, 4(r3) -/* 800AEA40 000AB9A0 4E 80 00 20 */ blr +/* 800AEA40 000AB9A0 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR15CSnakeWeedSwarm" "Visit__31TCastToPtr<17CEnergyProjectile>FR15CSnakeWeedSwarm": /* 800AEA44 000AB9A4 38 00 00 00 */ li r0, 0 /* 800AEA48 000AB9A8 90 03 00 04 */ stw r0, 4(r3) -/* 800AEA4C 000AB9AC 4E 80 00 20 */ blr +/* 800AEA4C 000AB9AC 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR15CScriptWaypoint" "Visit__31TCastToPtr<17CEnergyProjectile>FR15CScriptWaypoint": /* 800AEA50 000AB9B0 38 00 00 00 */ li r0, 0 /* 800AEA54 000AB9B4 90 03 00 04 */ stw r0, 4(r3) -/* 800AEA58 000AB9B8 4E 80 00 20 */ blr +/* 800AEA58 000AB9B8 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR12CScriptWater" "Visit__31TCastToPtr<17CEnergyProjectile>FR12CScriptWater": /* 800AEA5C 000AB9BC 38 00 00 00 */ li r0, 0 /* 800AEA60 000AB9C0 90 03 00 04 */ stw r0, 4(r3) -/* 800AEA64 000AB9C4 4E 80 00 20 */ blr +/* 800AEA64 000AB9C4 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR17CScriptVisorFlare" "Visit__31TCastToPtr<17CEnergyProjectile>FR17CScriptVisorFlare": /* 800AEA68 000AB9C8 38 00 00 00 */ li r0, 0 /* 800AEA6C 000AB9CC 90 03 00 04 */ stw r0, 4(r3) -/* 800AEA70 000AB9D0 4E 80 00 20 */ blr +/* 800AEA70 000AB9D0 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR14CScriptTrigger" "Visit__31TCastToPtr<17CEnergyProjectile>FR14CScriptTrigger": /* 800AEA74 000AB9D4 38 00 00 00 */ li r0, 0 /* 800AEA78 000AB9D8 90 03 00 04 */ stw r0, 4(r3) -/* 800AEA7C 000AB9DC 4E 80 00 20 */ blr +/* 800AEA7C 000AB9DC 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR12CScriptTimer" "Visit__31TCastToPtr<17CEnergyProjectile>FR12CScriptTimer": /* 800AEA80 000AB9E0 38 00 00 00 */ li r0, 0 /* 800AEA84 000AB9E4 90 03 00 04 */ stw r0, 4(r3) -/* 800AEA88 000AB9E8 4E 80 00 20 */ blr +/* 800AEA88 000AB9E8 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR10CTeamAiMgr" "Visit__31TCastToPtr<17CEnergyProjectile>FR10CTeamAiMgr": /* 800AEA8C 000AB9EC 38 00 00 00 */ li r0, 0 /* 800AEA90 000AB9F0 90 03 00 04 */ stw r0, 4(r3) -/* 800AEA94 000AB9F4 4E 80 00 20 */ blr +/* 800AEA94 000AB9F4 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR21CScriptTargetingPoint" "Visit__31TCastToPtr<17CEnergyProjectile>FR21CScriptTargetingPoint": /* 800AEA98 000AB9F8 38 00 00 00 */ li r0, 0 /* 800AEA9C 000AB9FC 90 03 00 04 */ stw r0, 4(r3) -/* 800AEAA0 000ABA00 4E 80 00 20 */ blr +/* 800AEAA0 000ABA00 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR25CScriptSpiderBallWaypoint" "Visit__31TCastToPtr<17CEnergyProjectile>FR25CScriptSpiderBallWaypoint": /* 800AEAA4 000ABA04 38 00 00 00 */ li r0, 0 /* 800AEAA8 000ABA08 90 03 00 04 */ stw r0, 4(r3) -/* 800AEAAC 000ABA0C 4E 80 00 20 */ blr +/* 800AEAAC 000ABA0C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR34CScriptSpiderBallAttractionSurface" "Visit__31TCastToPtr<17CEnergyProjectile>FR34CScriptSpiderBallAttractionSurface": /* 800AEAB0 000ABA10 38 00 00 00 */ li r0, 0 /* 800AEAB4 000ABA14 90 03 00 04 */ stw r0, 4(r3) -/* 800AEAB8 000ABA18 4E 80 00 20 */ blr +/* 800AEAB8 000ABA18 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR22CScriptSpecialFunction" "Visit__31TCastToPtr<17CEnergyProjectile>FR22CScriptSpecialFunction": /* 800AEABC 000ABA1C 38 00 00 00 */ li r0, 0 /* 800AEAC0 000ABA20 90 03 00 04 */ stw r0, 4(r3) -/* 800AEAC4 000ABA24 4E 80 00 20 */ blr +/* 800AEAC4 000ABA24 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR17CScriptSpawnPoint" "Visit__31TCastToPtr<17CEnergyProjectile>FR17CScriptSpawnPoint": /* 800AEAC8 000ABA28 38 00 00 00 */ li r0, 0 /* 800AEACC 000ABA2C 90 03 00 04 */ stw r0, 4(r3) -/* 800AEAD0 000ABA30 4E 80 00 20 */ blr +/* 800AEAD0 000ABA30 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR12CScriptSound" "Visit__31TCastToPtr<17CEnergyProjectile>FR12CScriptSound": /* 800AEAD4 000ABA34 38 00 00 00 */ li r0, 0 /* 800AEAD8 000ABA38 90 03 00 04 */ stw r0, 4(r3) -/* 800AEADC 000ABA3C 4E 80 00 20 */ blr +/* 800AEADC 000ABA3C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR20CScriptRoomAcoustics" "Visit__31TCastToPtr<17CEnergyProjectile>FR20CScriptRoomAcoustics": /* 800AEAE0 000ABA40 38 00 00 00 */ li r0, 0 /* 800AEAE4 000ABA44 90 03 00 04 */ stw r0, 4(r3) -/* 800AEAE8 000ABA48 4E 80 00 20 */ blr +/* 800AEAE8 000ABA48 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR22CScriptPointOfinterest" "Visit__31TCastToPtr<17CEnergyProjectile>FR22CScriptPointOfinterest": /* 800AEAEC 000ABA4C 38 00 00 00 */ li r0, 0 /* 800AEAF0 000ABA50 90 03 00 04 */ stw r0, 4(r3) -/* 800AEAF4 000ABA54 4E 80 00 20 */ blr +/* 800AEAF4 000ABA54 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR17CScriptPlayerHint" "Visit__31TCastToPtr<17CEnergyProjectile>FR17CScriptPlayerHint": /* 800AEAF8 000ABA58 38 00 00 00 */ li r0, 0 /* 800AEAFC 000ABA5C 90 03 00 04 */ stw r0, 4(r3) -/* 800AEB00 000ABA60 4E 80 00 20 */ blr +/* 800AEB00 000ABA60 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR15CScriptPlatform" "Visit__31TCastToPtr<17CEnergyProjectile>FR15CScriptPlatform": /* 800AEB04 000ABA64 38 00 00 00 */ li r0, 0 /* 800AEB08 000ABA68 90 03 00 04 */ stw r0, 4(r3) -/* 800AEB0C 000ABA6C 4E 80 00 20 */ blr +/* 800AEB0C 000ABA6C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR13CScriptPickup" "Visit__31TCastToPtr<17CEnergyProjectile>FR13CScriptPickup": /* 800AEB10 000ABA70 38 00 00 00 */ li r0, 0 /* 800AEB14 000ABA74 90 03 00 04 */ stw r0, 4(r3) -/* 800AEB18 000ABA78 4E 80 00 20 */ blr +/* 800AEB18 000ABA78 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR15CScriptMazeNode" "Visit__31TCastToPtr<17CEnergyProjectile>FR15CScriptMazeNode": /* 800AEB1C 000ABA7C 38 00 00 00 */ li r0, 0 /* 800AEB20 000ABA80 90 03 00 04 */ stw r0, 4(r3) -/* 800AEB24 000ABA84 4E 80 00 20 */ blr +/* 800AEB24 000ABA84 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR16CScriptGunTurret" "Visit__31TCastToPtr<17CEnergyProjectile>FR16CScriptGunTurret": /* 800AEB28 000ABA88 38 00 00 00 */ li r0, 0 /* 800AEB2C 000ABA8C 90 03 00 04 */ stw r0, 4(r3) -/* 800AEB30 000ABA90 4E 80 00 20 */ blr +/* 800AEB30 000ABA90 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR19CScriptGrapplePoint" "Visit__31TCastToPtr<17CEnergyProjectile>FR19CScriptGrapplePoint": /* 800AEB34 000ABA94 38 00 00 00 */ li r0, 0 /* 800AEB38 000ABA98 90 03 00 04 */ stw r0, 4(r3) -/* 800AEB3C 000ABA9C 4E 80 00 20 */ blr +/* 800AEB3C 000ABA9C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR13CScriptEffect" "Visit__31TCastToPtr<17CEnergyProjectile>FR13CScriptEffect": /* 800AEB40 000ABAA0 38 00 00 00 */ li r0, 0 /* 800AEB44 000ABAA4 90 03 00 04 */ stw r0, 4(r3) -/* 800AEB48 000ABAA8 4E 80 00 20 */ blr +/* 800AEB48 000ABAA8 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR11CScriptDoor" "Visit__31TCastToPtr<17CEnergyProjectile>FR11CScriptDoor": /* 800AEB4C 000ABAAC 38 00 00 00 */ li r0, 0 /* 800AEB50 000ABAB0 90 03 00 04 */ stw r0, 4(r3) -/* 800AEB54 000ABAB4 4E 80 00 20 */ blr +/* 800AEB54 000ABAB4 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR11CScriptDock" "Visit__31TCastToPtr<17CEnergyProjectile>FR11CScriptDock": /* 800AEB58 000ABAB8 38 00 00 00 */ li r0, 0 /* 800AEB5C 000ABABC 90 03 00 04 */ stw r0, 4(r3) -/* 800AEB60 000ABAC0 4E 80 00 20 */ blr +/* 800AEB60 000ABAC0 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR18CScriptDistanceFog" "Visit__31TCastToPtr<17CEnergyProjectile>FR18CScriptDistanceFog": /* 800AEB64 000ABAC4 38 00 00 00 */ li r0, 0 /* 800AEB68 000ABAC8 90 03 00 04 */ stw r0, 4(r3) -/* 800AEB6C 000ABACC 4E 80 00 20 */ blr +/* 800AEB6C 000ABACC 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR26CScriptDebugCameraWaypoint" "Visit__31TCastToPtr<17CEnergyProjectile>FR26CScriptDebugCameraWaypoint": /* 800AEB70 000ABAD0 38 00 00 00 */ li r0, 0 /* 800AEB74 000ABAD4 90 03 00 04 */ stw r0, 4(r3) -/* 800AEB78 000ABAD8 4E 80 00 20 */ blr +/* 800AEB78 000ABAD8 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR17CScriptCoverPoint" "Visit__31TCastToPtr<17CEnergyProjectile>FR17CScriptCoverPoint": /* 800AEB7C 000ABADC 38 00 00 00 */ li r0, 0 /* 800AEB80 000ABAE0 90 03 00 04 */ stw r0, 4(r3) -/* 800AEB84 000ABAE4 4E 80 00 20 */ blr +/* 800AEB84 000ABAE4 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR21CScriptCameraWaypoint" "Visit__31TCastToPtr<17CEnergyProjectile>FR21CScriptCameraWaypoint": /* 800AEB88 000ABAE8 38 00 00 00 */ li r0, 0 /* 800AEB8C 000ABAEC 90 03 00 04 */ stw r0, 4(r3) -/* 800AEB90 000ABAF0 4E 80 00 20 */ blr +/* 800AEB90 000ABAF0 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR24CScriptCameraPitchVolume" "Visit__31TCastToPtr<17CEnergyProjectile>FR24CScriptCameraPitchVolume": /* 800AEB94 000ABAF4 38 00 00 00 */ li r0, 0 /* 800AEB98 000ABAF8 90 03 00 04 */ stw r0, 4(r3) -/* 800AEB9C 000ABAFC 4E 80 00 20 */ blr +/* 800AEB9C 000ABAFC 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR17CScriptCameraHint" "Visit__31TCastToPtr<17CEnergyProjectile>FR17CScriptCameraHint": /* 800AEBA0 000ABB00 38 00 00 00 */ li r0, 0 /* 800AEBA4 000ABB04 90 03 00 04 */ stw r0, 4(r3) -/* 800AEBA8 000ABB08 4E 80 00 20 */ blr +/* 800AEBA8 000ABB08 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR18CScriptAiJumpPoint" "Visit__31TCastToPtr<17CEnergyProjectile>FR18CScriptAiJumpPoint": /* 800AEBAC 000ABB0C 38 00 00 00 */ li r0, 0 /* 800AEBB0 000ABB10 90 03 00 04 */ stw r0, 4(r3) -/* 800AEBB4 000ABB14 4E 80 00 20 */ blr +/* 800AEBB4 000ABB14 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR20CScriptActorKeyframe" "Visit__31TCastToPtr<17CEnergyProjectile>FR20CScriptActorKeyframe": /* 800AEBB8 000ABB18 38 00 00 00 */ li r0, 0 /* 800AEBBC 000ABB1C 90 03 00 04 */ stw r0, 4(r3) -/* 800AEBC0 000ABB20 4E 80 00 20 */ blr +/* 800AEBC0 000ABB20 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR12CScriptActor" "Visit__31TCastToPtr<17CEnergyProjectile>FR12CScriptActor": /* 800AEBC4 000ABB24 38 00 00 00 */ li r0, 0 /* 800AEBC8 000ABB28 90 03 00 04 */ stw r0, 4(r3) -/* 800AEBCC 000ABB2C 4E 80 00 20 */ blr +/* 800AEBCC 000ABB2C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR9CRepulsor" "Visit__31TCastToPtr<17CEnergyProjectile>FR9CRepulsor": /* 800AEBD0 000ABB30 38 00 00 00 */ li r0, 0 /* 800AEBD4 000ABB34 90 03 00 04 */ stw r0, 4(r3) -/* 800AEBD8 000ABB38 4E 80 00 20 */ blr +/* 800AEBD8 000ABB38 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR7CPlayer" "Visit__31TCastToPtr<17CEnergyProjectile>FR7CPlayer": /* 800AEBDC 000ABB3C 38 00 00 00 */ li r0, 0 /* 800AEBE0 000ABB40 90 03 00 04 */ stw r0, 4(r3) -/* 800AEBE4 000ABB44 4E 80 00 20 */ blr +/* 800AEBE4 000ABB44 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR13CPhysicsActor" "Visit__31TCastToPtr<17CEnergyProjectile>FR13CPhysicsActor": /* 800AEBE8 000ABB48 38 00 00 00 */ li r0, 0 /* 800AEBEC 000ABB4C 90 03 00 04 */ stw r0, 4(r3) -/* 800AEBF0 000ABB50 4E 80 00 20 */ blr +/* 800AEBF0 000ABB50 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR3CAi" "Visit__31TCastToPtr<17CEnergyProjectile>FR3CAi": /* 800AEBF4 000ABB54 38 00 00 00 */ li r0, 0 /* 800AEBF8 000ABB58 90 03 00 04 */ stw r0, 4(r3) -/* 800AEBFC 000ABB5C 4E 80 00 20 */ blr +/* 800AEBFC 000ABB5C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR11CPathCamera" "Visit__31TCastToPtr<17CEnergyProjectile>FR11CPathCamera": /* 800AEC00 000ABB60 38 00 00 00 */ li r0, 0 /* 800AEC04 000ABB64 90 03 00 04 */ stw r0, 4(r3) -/* 800AEC08 000ABB68 4E 80 00 20 */ blr +/* 800AEC08 000ABB68 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR18CMetroidPrimeRelay" "Visit__31TCastToPtr<17CEnergyProjectile>FR18CMetroidPrimeRelay": /* 800AEC0C 000ABB6C 38 00 00 00 */ li r0, 0 /* 800AEC10 000ABB70 90 03 00 04 */ stw r0, 4(r3) -/* 800AEC14 000ABB74 4E 80 00 20 */ blr +/* 800AEC14 000ABB74 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR19CHUDBillboardEffect" "Visit__31TCastToPtr<17CEnergyProjectile>FR19CHUDBillboardEffect": /* 800AEC18 000ABB78 38 00 00 00 */ li r0, 0 /* 800AEC1C 000ABB7C 90 03 00 04 */ stw r0, 4(r3) -/* 800AEC20 000ABB80 4E 80 00 20 */ blr +/* 800AEC20 000ABB80 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR15CGameProjectile" "Visit__31TCastToPtr<17CEnergyProjectile>FR15CGameProjectile": /* 800AEC24 000ABB84 38 00 00 00 */ li r0, 0 /* 800AEC28 000ABB88 90 03 00 04 */ stw r0, 4(r3) -/* 800AEC2C 000ABB8C 4E 80 00 20 */ blr +/* 800AEC2C 000ABB8C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR10CGameLight" "Visit__31TCastToPtr<17CEnergyProjectile>FR10CGameLight": /* 800AEC30 000ABB90 38 00 00 00 */ li r0, 0 /* 800AEC34 000ABB94 90 03 00 04 */ stw r0, 4(r3) -/* 800AEC38 000ABB98 4E 80 00 20 */ blr +/* 800AEC38 000ABB98 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR11CGameCamera" "Visit__31TCastToPtr<17CEnergyProjectile>FR11CGameCamera": /* 800AEC3C 000ABB9C 38 00 00 00 */ li r0, 0 /* 800AEC40 000ABBA0 90 03 00 04 */ stw r0, 4(r3) -/* 800AEC44 000ABBA4 4E 80 00 20 */ blr +/* 800AEC44 000ABBA4 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR10CFishCloud" "Visit__31TCastToPtr<17CEnergyProjectile>FR10CFishCloud": /* 800AEC48 000ABBA8 38 00 00 00 */ li r0, 0 /* 800AEC4C 000ABBAC 90 03 00 04 */ stw r0, 4(r3) -/* 800AEC50 000ABBB0 4E 80 00 20 */ blr +/* 800AEC50 000ABBB0 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR18CFirstPersonCamera" "Visit__31TCastToPtr<17CEnergyProjectile>FR18CFirstPersonCamera": /* 800AEC54 000ABBB4 38 00 00 00 */ li r0, 0 /* 800AEC58 000ABBB8 90 03 00 04 */ stw r0, 4(r3) -/* 800AEC5C 000ABBBC 4E 80 00 20 */ blr +/* 800AEC5C 000ABBBC 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR10CExplosion" "Visit__31TCastToPtr<17CEnergyProjectile>FR10CExplosion": /* 800AEC60 000ABBC0 38 00 00 00 */ li r0, 0 /* 800AEC64 000ABBC4 90 03 00 04 */ stw r0, 4(r3) -/* 800AEC68 000ABBC8 4E 80 00 20 */ blr +/* 800AEC68 000ABBC8 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR7CEntity" "Visit__31TCastToPtr<17CEnergyProjectile>FR7CEntity": /* 800AEC6C 000ABBCC 38 00 00 00 */ li r0, 0 /* 800AEC70 000ABBD0 90 03 00 04 */ stw r0, 4(r3) -/* 800AEC74 000ABBD4 4E 80 00 20 */ blr +/* 800AEC74 000ABBD4 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR17CEnergyProjectile" "Visit__31TCastToPtr<17CEnergyProjectile>FR17CEnergyProjectile": /* 800AEC78 000ABBD8 90 83 00 04 */ stw r4, 4(r3) -/* 800AEC7C 000ABBDC 4E 80 00 20 */ blr +/* 800AEC7C 000ABBDC 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR16CDestroyableRock" "Visit__31TCastToPtr<17CEnergyProjectile>FR16CDestroyableRock": /* 800AEC80 000ABBE0 38 00 00 00 */ li r0, 0 /* 800AEC84 000ABBE4 90 03 00 04 */ stw r0, 4(r3) -/* 800AEC88 000ABBE8 4E 80 00 20 */ blr +/* 800AEC88 000ABBE8 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR15CCollisionActor" "Visit__31TCastToPtr<17CEnergyProjectile>FR15CCollisionActor": /* 800AEC8C 000ABBEC 38 00 00 00 */ li r0, 0 /* 800AEC90 000ABBF0 90 03 00 04 */ stw r0, 4(r3) -/* 800AEC94 000ABBF4 4E 80 00 20 */ blr +/* 800AEC94 000ABBF4 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR16CCinematicCamera" "Visit__31TCastToPtr<17CEnergyProjectile>FR16CCinematicCamera": /* 800AEC98 000ABBF8 38 00 00 00 */ li r0, 0 /* 800AEC9C 000ABBFC 90 03 00 04 */ stw r0, 4(r3) -/* 800AECA0 000ABC00 4E 80 00 20 */ blr +/* 800AECA0 000ABC00 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR5CBomb" "Visit__31TCastToPtr<17CEnergyProjectile>FR5CBomb": /* 800AECA4 000ABC04 38 00 00 00 */ li r0, 0 /* 800AECA8 000ABC08 90 03 00 04 */ stw r0, 4(r3) -/* 800AECAC 000ABC0C 4E 80 00 20 */ blr +/* 800AECAC 000ABC0C 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR11CBallCamera" "Visit__31TCastToPtr<17CEnergyProjectile>FR11CBallCamera": /* 800AECB0 000ABC10 38 00 00 00 */ li r0, 0 /* 800AECB4 000ABC14 90 03 00 04 */ stw r0, 4(r3) -/* 800AECB8 000ABC18 4E 80 00 20 */ blr +/* 800AECB8 000ABC18 4E 80 00 20 */ blr .global "Visit__31TCastToPtr<17CEnergyProjectile>FR6CActor" "Visit__31TCastToPtr<17CEnergyProjectile>FR6CActor": /* 800AECBC 000ABC1C 38 00 00 00 */ li r0, 0 /* 800AECC0 000ABC20 90 03 00 04 */ stw r0, 4(r3) -/* 800AECC4 000ABC24 4E 80 00 20 */ blr +/* 800AECC4 000ABC24 4E 80 00 20 */ blr .global "__ct__31TCastToPtr<17CEnergyProjectile>FP7CEntity" "__ct__31TCastToPtr<17CEnergyProjectile>FP7CEntity": @@ -21510,14 +21510,14 @@ lbl_800AEA08: /* 800AED0C 000ABC6C 81 83 00 00 */ lwz r12, 0(r3) /* 800AED10 000ABC70 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800AED14 000ABC74 7D 89 03 A6 */ mtctr r12 -/* 800AED18 000ABC78 4E 80 04 21 */ bctrl +/* 800AED18 000ABC78 4E 80 04 21 */ bctrl lbl_800AED1C: /* 800AED1C 000ABC7C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800AED20 000ABC80 7F E3 FB 78 */ mr r3, r31 /* 800AED24 000ABC84 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800AED28 000ABC88 7C 08 03 A6 */ mtlr r0 /* 800AED2C 000ABC8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800AED30 000ABC90 4E 80 00 20 */ blr +/* 800AED30 000ABC90 4E 80 00 20 */ blr .global "__ct__31TCastToPtr<17CEnergyProjectile>FR7CEntity" "__ct__31TCastToPtr<17CEnergyProjectile>FR7CEntity": @@ -21539,354 +21539,354 @@ lbl_800AED1C: /* 800AED70 000ABCD0 81 83 00 00 */ lwz r12, 0(r3) /* 800AED74 000ABCD4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800AED78 000ABCD8 7D 89 03 A6 */ mtctr r12 -/* 800AED7C 000ABCDC 4E 80 04 21 */ bctrl +/* 800AED7C 000ABCDC 4E 80 04 21 */ bctrl /* 800AED80 000ABCE0 80 01 00 14 */ lwz r0, 0x14(r1) /* 800AED84 000ABCE4 7F E3 FB 78 */ mr r3, r31 /* 800AED88 000ABCE8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800AED8C 000ABCEC 7C 08 03 A6 */ mtlr r0 /* 800AED90 000ABCF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800AED94 000ABCF4 4E 80 00 20 */ blr +/* 800AED94 000ABCF4 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR7CWeapon" "Visit__30TCastToPtr<16CDestroyableRock>FR7CWeapon": /* 800AED98 000ABCF8 38 00 00 00 */ li r0, 0 /* 800AED9C 000ABCFC 90 03 00 04 */ stw r0, 4(r3) -/* 800AEDA0 000ABD00 4E 80 00 20 */ blr +/* 800AEDA0 000ABD00 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR17CWallCrawlerSwarm" "Visit__30TCastToPtr<16CDestroyableRock>FR17CWallCrawlerSwarm": /* 800AEDA4 000ABD04 38 00 00 00 */ li r0, 0 /* 800AEDA8 000ABD08 90 03 00 04 */ stw r0, 4(r3) -/* 800AEDAC 000ABD0C 4E 80 00 20 */ blr +/* 800AEDAC 000ABD0C 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR20CScriptSpindleCamera" "Visit__30TCastToPtr<16CDestroyableRock>FR20CScriptSpindleCamera": /* 800AEDB0 000ABD10 38 00 00 00 */ li r0, 0 /* 800AEDB4 000ABD14 90 03 00 04 */ stw r0, 4(r3) -/* 800AEDB8 000ABD18 4E 80 00 20 */ blr +/* 800AEDB8 000ABD18 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR15CSnakeWeedSwarm" "Visit__30TCastToPtr<16CDestroyableRock>FR15CSnakeWeedSwarm": /* 800AEDBC 000ABD1C 38 00 00 00 */ li r0, 0 /* 800AEDC0 000ABD20 90 03 00 04 */ stw r0, 4(r3) -/* 800AEDC4 000ABD24 4E 80 00 20 */ blr +/* 800AEDC4 000ABD24 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR15CScriptWaypoint" "Visit__30TCastToPtr<16CDestroyableRock>FR15CScriptWaypoint": /* 800AEDC8 000ABD28 38 00 00 00 */ li r0, 0 /* 800AEDCC 000ABD2C 90 03 00 04 */ stw r0, 4(r3) -/* 800AEDD0 000ABD30 4E 80 00 20 */ blr +/* 800AEDD0 000ABD30 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR12CScriptWater" "Visit__30TCastToPtr<16CDestroyableRock>FR12CScriptWater": /* 800AEDD4 000ABD34 38 00 00 00 */ li r0, 0 /* 800AEDD8 000ABD38 90 03 00 04 */ stw r0, 4(r3) -/* 800AEDDC 000ABD3C 4E 80 00 20 */ blr +/* 800AEDDC 000ABD3C 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR17CScriptVisorFlare" "Visit__30TCastToPtr<16CDestroyableRock>FR17CScriptVisorFlare": /* 800AEDE0 000ABD40 38 00 00 00 */ li r0, 0 /* 800AEDE4 000ABD44 90 03 00 04 */ stw r0, 4(r3) -/* 800AEDE8 000ABD48 4E 80 00 20 */ blr +/* 800AEDE8 000ABD48 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR14CScriptTrigger" "Visit__30TCastToPtr<16CDestroyableRock>FR14CScriptTrigger": /* 800AEDEC 000ABD4C 38 00 00 00 */ li r0, 0 /* 800AEDF0 000ABD50 90 03 00 04 */ stw r0, 4(r3) -/* 800AEDF4 000ABD54 4E 80 00 20 */ blr +/* 800AEDF4 000ABD54 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR12CScriptTimer" "Visit__30TCastToPtr<16CDestroyableRock>FR12CScriptTimer": /* 800AEDF8 000ABD58 38 00 00 00 */ li r0, 0 /* 800AEDFC 000ABD5C 90 03 00 04 */ stw r0, 4(r3) -/* 800AEE00 000ABD60 4E 80 00 20 */ blr +/* 800AEE00 000ABD60 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR10CTeamAiMgr" "Visit__30TCastToPtr<16CDestroyableRock>FR10CTeamAiMgr": /* 800AEE04 000ABD64 38 00 00 00 */ li r0, 0 /* 800AEE08 000ABD68 90 03 00 04 */ stw r0, 4(r3) -/* 800AEE0C 000ABD6C 4E 80 00 20 */ blr +/* 800AEE0C 000ABD6C 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR21CScriptTargetingPoint" "Visit__30TCastToPtr<16CDestroyableRock>FR21CScriptTargetingPoint": /* 800AEE10 000ABD70 38 00 00 00 */ li r0, 0 /* 800AEE14 000ABD74 90 03 00 04 */ stw r0, 4(r3) -/* 800AEE18 000ABD78 4E 80 00 20 */ blr +/* 800AEE18 000ABD78 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR25CScriptSpiderBallWaypoint" "Visit__30TCastToPtr<16CDestroyableRock>FR25CScriptSpiderBallWaypoint": /* 800AEE1C 000ABD7C 38 00 00 00 */ li r0, 0 /* 800AEE20 000ABD80 90 03 00 04 */ stw r0, 4(r3) -/* 800AEE24 000ABD84 4E 80 00 20 */ blr +/* 800AEE24 000ABD84 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR34CScriptSpiderBallAttractionSurface" "Visit__30TCastToPtr<16CDestroyableRock>FR34CScriptSpiderBallAttractionSurface": /* 800AEE28 000ABD88 38 00 00 00 */ li r0, 0 /* 800AEE2C 000ABD8C 90 03 00 04 */ stw r0, 4(r3) -/* 800AEE30 000ABD90 4E 80 00 20 */ blr +/* 800AEE30 000ABD90 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR22CScriptSpecialFunction" "Visit__30TCastToPtr<16CDestroyableRock>FR22CScriptSpecialFunction": /* 800AEE34 000ABD94 38 00 00 00 */ li r0, 0 /* 800AEE38 000ABD98 90 03 00 04 */ stw r0, 4(r3) -/* 800AEE3C 000ABD9C 4E 80 00 20 */ blr +/* 800AEE3C 000ABD9C 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR17CScriptSpawnPoint" "Visit__30TCastToPtr<16CDestroyableRock>FR17CScriptSpawnPoint": /* 800AEE40 000ABDA0 38 00 00 00 */ li r0, 0 /* 800AEE44 000ABDA4 90 03 00 04 */ stw r0, 4(r3) -/* 800AEE48 000ABDA8 4E 80 00 20 */ blr +/* 800AEE48 000ABDA8 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR12CScriptSound" "Visit__30TCastToPtr<16CDestroyableRock>FR12CScriptSound": /* 800AEE4C 000ABDAC 38 00 00 00 */ li r0, 0 /* 800AEE50 000ABDB0 90 03 00 04 */ stw r0, 4(r3) -/* 800AEE54 000ABDB4 4E 80 00 20 */ blr +/* 800AEE54 000ABDB4 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR20CScriptRoomAcoustics" "Visit__30TCastToPtr<16CDestroyableRock>FR20CScriptRoomAcoustics": /* 800AEE58 000ABDB8 38 00 00 00 */ li r0, 0 /* 800AEE5C 000ABDBC 90 03 00 04 */ stw r0, 4(r3) -/* 800AEE60 000ABDC0 4E 80 00 20 */ blr +/* 800AEE60 000ABDC0 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR22CScriptPointOfinterest" "Visit__30TCastToPtr<16CDestroyableRock>FR22CScriptPointOfinterest": /* 800AEE64 000ABDC4 38 00 00 00 */ li r0, 0 /* 800AEE68 000ABDC8 90 03 00 04 */ stw r0, 4(r3) -/* 800AEE6C 000ABDCC 4E 80 00 20 */ blr +/* 800AEE6C 000ABDCC 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR17CScriptPlayerHint" "Visit__30TCastToPtr<16CDestroyableRock>FR17CScriptPlayerHint": /* 800AEE70 000ABDD0 38 00 00 00 */ li r0, 0 /* 800AEE74 000ABDD4 90 03 00 04 */ stw r0, 4(r3) -/* 800AEE78 000ABDD8 4E 80 00 20 */ blr +/* 800AEE78 000ABDD8 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR15CScriptPlatform" "Visit__30TCastToPtr<16CDestroyableRock>FR15CScriptPlatform": /* 800AEE7C 000ABDDC 38 00 00 00 */ li r0, 0 /* 800AEE80 000ABDE0 90 03 00 04 */ stw r0, 4(r3) -/* 800AEE84 000ABDE4 4E 80 00 20 */ blr +/* 800AEE84 000ABDE4 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR13CScriptPickup" "Visit__30TCastToPtr<16CDestroyableRock>FR13CScriptPickup": /* 800AEE88 000ABDE8 38 00 00 00 */ li r0, 0 /* 800AEE8C 000ABDEC 90 03 00 04 */ stw r0, 4(r3) -/* 800AEE90 000ABDF0 4E 80 00 20 */ blr +/* 800AEE90 000ABDF0 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR15CScriptMazeNode" "Visit__30TCastToPtr<16CDestroyableRock>FR15CScriptMazeNode": /* 800AEE94 000ABDF4 38 00 00 00 */ li r0, 0 /* 800AEE98 000ABDF8 90 03 00 04 */ stw r0, 4(r3) -/* 800AEE9C 000ABDFC 4E 80 00 20 */ blr +/* 800AEE9C 000ABDFC 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR16CScriptGunTurret" "Visit__30TCastToPtr<16CDestroyableRock>FR16CScriptGunTurret": /* 800AEEA0 000ABE00 38 00 00 00 */ li r0, 0 /* 800AEEA4 000ABE04 90 03 00 04 */ stw r0, 4(r3) -/* 800AEEA8 000ABE08 4E 80 00 20 */ blr +/* 800AEEA8 000ABE08 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR19CScriptGrapplePoint" "Visit__30TCastToPtr<16CDestroyableRock>FR19CScriptGrapplePoint": /* 800AEEAC 000ABE0C 38 00 00 00 */ li r0, 0 /* 800AEEB0 000ABE10 90 03 00 04 */ stw r0, 4(r3) -/* 800AEEB4 000ABE14 4E 80 00 20 */ blr +/* 800AEEB4 000ABE14 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR13CScriptEffect" "Visit__30TCastToPtr<16CDestroyableRock>FR13CScriptEffect": /* 800AEEB8 000ABE18 38 00 00 00 */ li r0, 0 /* 800AEEBC 000ABE1C 90 03 00 04 */ stw r0, 4(r3) -/* 800AEEC0 000ABE20 4E 80 00 20 */ blr +/* 800AEEC0 000ABE20 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR11CScriptDoor" "Visit__30TCastToPtr<16CDestroyableRock>FR11CScriptDoor": /* 800AEEC4 000ABE24 38 00 00 00 */ li r0, 0 /* 800AEEC8 000ABE28 90 03 00 04 */ stw r0, 4(r3) -/* 800AEECC 000ABE2C 4E 80 00 20 */ blr +/* 800AEECC 000ABE2C 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR11CScriptDock" "Visit__30TCastToPtr<16CDestroyableRock>FR11CScriptDock": /* 800AEED0 000ABE30 38 00 00 00 */ li r0, 0 /* 800AEED4 000ABE34 90 03 00 04 */ stw r0, 4(r3) -/* 800AEED8 000ABE38 4E 80 00 20 */ blr +/* 800AEED8 000ABE38 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR18CScriptDistanceFog" "Visit__30TCastToPtr<16CDestroyableRock>FR18CScriptDistanceFog": /* 800AEEDC 000ABE3C 38 00 00 00 */ li r0, 0 /* 800AEEE0 000ABE40 90 03 00 04 */ stw r0, 4(r3) -/* 800AEEE4 000ABE44 4E 80 00 20 */ blr +/* 800AEEE4 000ABE44 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR26CScriptDebugCameraWaypoint" "Visit__30TCastToPtr<16CDestroyableRock>FR26CScriptDebugCameraWaypoint": /* 800AEEE8 000ABE48 38 00 00 00 */ li r0, 0 /* 800AEEEC 000ABE4C 90 03 00 04 */ stw r0, 4(r3) -/* 800AEEF0 000ABE50 4E 80 00 20 */ blr +/* 800AEEF0 000ABE50 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR17CScriptCoverPoint" "Visit__30TCastToPtr<16CDestroyableRock>FR17CScriptCoverPoint": /* 800AEEF4 000ABE54 38 00 00 00 */ li r0, 0 /* 800AEEF8 000ABE58 90 03 00 04 */ stw r0, 4(r3) -/* 800AEEFC 000ABE5C 4E 80 00 20 */ blr +/* 800AEEFC 000ABE5C 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR21CScriptCameraWaypoint" "Visit__30TCastToPtr<16CDestroyableRock>FR21CScriptCameraWaypoint": /* 800AEF00 000ABE60 38 00 00 00 */ li r0, 0 /* 800AEF04 000ABE64 90 03 00 04 */ stw r0, 4(r3) -/* 800AEF08 000ABE68 4E 80 00 20 */ blr +/* 800AEF08 000ABE68 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR24CScriptCameraPitchVolume" "Visit__30TCastToPtr<16CDestroyableRock>FR24CScriptCameraPitchVolume": /* 800AEF0C 000ABE6C 38 00 00 00 */ li r0, 0 /* 800AEF10 000ABE70 90 03 00 04 */ stw r0, 4(r3) -/* 800AEF14 000ABE74 4E 80 00 20 */ blr +/* 800AEF14 000ABE74 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR17CScriptCameraHint" "Visit__30TCastToPtr<16CDestroyableRock>FR17CScriptCameraHint": /* 800AEF18 000ABE78 38 00 00 00 */ li r0, 0 /* 800AEF1C 000ABE7C 90 03 00 04 */ stw r0, 4(r3) -/* 800AEF20 000ABE80 4E 80 00 20 */ blr +/* 800AEF20 000ABE80 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR18CScriptAiJumpPoint" "Visit__30TCastToPtr<16CDestroyableRock>FR18CScriptAiJumpPoint": /* 800AEF24 000ABE84 38 00 00 00 */ li r0, 0 /* 800AEF28 000ABE88 90 03 00 04 */ stw r0, 4(r3) -/* 800AEF2C 000ABE8C 4E 80 00 20 */ blr +/* 800AEF2C 000ABE8C 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR20CScriptActorKeyframe" "Visit__30TCastToPtr<16CDestroyableRock>FR20CScriptActorKeyframe": /* 800AEF30 000ABE90 38 00 00 00 */ li r0, 0 /* 800AEF34 000ABE94 90 03 00 04 */ stw r0, 4(r3) -/* 800AEF38 000ABE98 4E 80 00 20 */ blr +/* 800AEF38 000ABE98 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR12CScriptActor" "Visit__30TCastToPtr<16CDestroyableRock>FR12CScriptActor": /* 800AEF3C 000ABE9C 38 00 00 00 */ li r0, 0 /* 800AEF40 000ABEA0 90 03 00 04 */ stw r0, 4(r3) -/* 800AEF44 000ABEA4 4E 80 00 20 */ blr +/* 800AEF44 000ABEA4 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR9CRepulsor" "Visit__30TCastToPtr<16CDestroyableRock>FR9CRepulsor": /* 800AEF48 000ABEA8 38 00 00 00 */ li r0, 0 /* 800AEF4C 000ABEAC 90 03 00 04 */ stw r0, 4(r3) -/* 800AEF50 000ABEB0 4E 80 00 20 */ blr +/* 800AEF50 000ABEB0 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR7CPlayer" "Visit__30TCastToPtr<16CDestroyableRock>FR7CPlayer": /* 800AEF54 000ABEB4 38 00 00 00 */ li r0, 0 /* 800AEF58 000ABEB8 90 03 00 04 */ stw r0, 4(r3) -/* 800AEF5C 000ABEBC 4E 80 00 20 */ blr +/* 800AEF5C 000ABEBC 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR13CPhysicsActor" "Visit__30TCastToPtr<16CDestroyableRock>FR13CPhysicsActor": /* 800AEF60 000ABEC0 38 00 00 00 */ li r0, 0 /* 800AEF64 000ABEC4 90 03 00 04 */ stw r0, 4(r3) -/* 800AEF68 000ABEC8 4E 80 00 20 */ blr +/* 800AEF68 000ABEC8 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR3CAi" "Visit__30TCastToPtr<16CDestroyableRock>FR3CAi": /* 800AEF6C 000ABECC 38 00 00 00 */ li r0, 0 /* 800AEF70 000ABED0 90 03 00 04 */ stw r0, 4(r3) -/* 800AEF74 000ABED4 4E 80 00 20 */ blr +/* 800AEF74 000ABED4 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR11CPathCamera" "Visit__30TCastToPtr<16CDestroyableRock>FR11CPathCamera": /* 800AEF78 000ABED8 38 00 00 00 */ li r0, 0 /* 800AEF7C 000ABEDC 90 03 00 04 */ stw r0, 4(r3) -/* 800AEF80 000ABEE0 4E 80 00 20 */ blr +/* 800AEF80 000ABEE0 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR18CMetroidPrimeRelay" "Visit__30TCastToPtr<16CDestroyableRock>FR18CMetroidPrimeRelay": /* 800AEF84 000ABEE4 38 00 00 00 */ li r0, 0 /* 800AEF88 000ABEE8 90 03 00 04 */ stw r0, 4(r3) -/* 800AEF8C 000ABEEC 4E 80 00 20 */ blr +/* 800AEF8C 000ABEEC 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR19CHUDBillboardEffect" "Visit__30TCastToPtr<16CDestroyableRock>FR19CHUDBillboardEffect": /* 800AEF90 000ABEF0 38 00 00 00 */ li r0, 0 /* 800AEF94 000ABEF4 90 03 00 04 */ stw r0, 4(r3) -/* 800AEF98 000ABEF8 4E 80 00 20 */ blr +/* 800AEF98 000ABEF8 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR15CGameProjectile" "Visit__30TCastToPtr<16CDestroyableRock>FR15CGameProjectile": /* 800AEF9C 000ABEFC 38 00 00 00 */ li r0, 0 /* 800AEFA0 000ABF00 90 03 00 04 */ stw r0, 4(r3) -/* 800AEFA4 000ABF04 4E 80 00 20 */ blr +/* 800AEFA4 000ABF04 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR10CGameLight" "Visit__30TCastToPtr<16CDestroyableRock>FR10CGameLight": /* 800AEFA8 000ABF08 38 00 00 00 */ li r0, 0 /* 800AEFAC 000ABF0C 90 03 00 04 */ stw r0, 4(r3) -/* 800AEFB0 000ABF10 4E 80 00 20 */ blr +/* 800AEFB0 000ABF10 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR11CGameCamera" "Visit__30TCastToPtr<16CDestroyableRock>FR11CGameCamera": /* 800AEFB4 000ABF14 38 00 00 00 */ li r0, 0 /* 800AEFB8 000ABF18 90 03 00 04 */ stw r0, 4(r3) -/* 800AEFBC 000ABF1C 4E 80 00 20 */ blr +/* 800AEFBC 000ABF1C 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR10CFishCloud" "Visit__30TCastToPtr<16CDestroyableRock>FR10CFishCloud": /* 800AEFC0 000ABF20 38 00 00 00 */ li r0, 0 /* 800AEFC4 000ABF24 90 03 00 04 */ stw r0, 4(r3) -/* 800AEFC8 000ABF28 4E 80 00 20 */ blr +/* 800AEFC8 000ABF28 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR18CFirstPersonCamera" "Visit__30TCastToPtr<16CDestroyableRock>FR18CFirstPersonCamera": /* 800AEFCC 000ABF2C 38 00 00 00 */ li r0, 0 /* 800AEFD0 000ABF30 90 03 00 04 */ stw r0, 4(r3) -/* 800AEFD4 000ABF34 4E 80 00 20 */ blr +/* 800AEFD4 000ABF34 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR10CExplosion" "Visit__30TCastToPtr<16CDestroyableRock>FR10CExplosion": /* 800AEFD8 000ABF38 38 00 00 00 */ li r0, 0 /* 800AEFDC 000ABF3C 90 03 00 04 */ stw r0, 4(r3) -/* 800AEFE0 000ABF40 4E 80 00 20 */ blr +/* 800AEFE0 000ABF40 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR7CEntity" "Visit__30TCastToPtr<16CDestroyableRock>FR7CEntity": /* 800AEFE4 000ABF44 38 00 00 00 */ li r0, 0 /* 800AEFE8 000ABF48 90 03 00 04 */ stw r0, 4(r3) -/* 800AEFEC 000ABF4C 4E 80 00 20 */ blr +/* 800AEFEC 000ABF4C 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR17CEnergyProjectile" "Visit__30TCastToPtr<16CDestroyableRock>FR17CEnergyProjectile": /* 800AEFF0 000ABF50 38 00 00 00 */ li r0, 0 /* 800AEFF4 000ABF54 90 03 00 04 */ stw r0, 4(r3) -/* 800AEFF8 000ABF58 4E 80 00 20 */ blr +/* 800AEFF8 000ABF58 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR16CDestroyableRock" "Visit__30TCastToPtr<16CDestroyableRock>FR16CDestroyableRock": /* 800AEFFC 000ABF5C 90 83 00 04 */ stw r4, 4(r3) -/* 800AF000 000ABF60 4E 80 00 20 */ blr +/* 800AF000 000ABF60 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR15CCollisionActor" "Visit__30TCastToPtr<16CDestroyableRock>FR15CCollisionActor": /* 800AF004 000ABF64 38 00 00 00 */ li r0, 0 /* 800AF008 000ABF68 90 03 00 04 */ stw r0, 4(r3) -/* 800AF00C 000ABF6C 4E 80 00 20 */ blr +/* 800AF00C 000ABF6C 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR16CCinematicCamera" "Visit__30TCastToPtr<16CDestroyableRock>FR16CCinematicCamera": /* 800AF010 000ABF70 38 00 00 00 */ li r0, 0 /* 800AF014 000ABF74 90 03 00 04 */ stw r0, 4(r3) -/* 800AF018 000ABF78 4E 80 00 20 */ blr +/* 800AF018 000ABF78 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR5CBomb" "Visit__30TCastToPtr<16CDestroyableRock>FR5CBomb": /* 800AF01C 000ABF7C 38 00 00 00 */ li r0, 0 /* 800AF020 000ABF80 90 03 00 04 */ stw r0, 4(r3) -/* 800AF024 000ABF84 4E 80 00 20 */ blr +/* 800AF024 000ABF84 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR11CBallCamera" "Visit__30TCastToPtr<16CDestroyableRock>FR11CBallCamera": /* 800AF028 000ABF88 38 00 00 00 */ li r0, 0 /* 800AF02C 000ABF8C 90 03 00 04 */ stw r0, 4(r3) -/* 800AF030 000ABF90 4E 80 00 20 */ blr +/* 800AF030 000ABF90 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CDestroyableRock>FR6CActor" "Visit__30TCastToPtr<16CDestroyableRock>FR6CActor": /* 800AF034 000ABF94 38 00 00 00 */ li r0, 0 /* 800AF038 000ABF98 90 03 00 04 */ stw r0, 4(r3) -/* 800AF03C 000ABF9C 4E 80 00 20 */ blr +/* 800AF03C 000ABF9C 4E 80 00 20 */ blr .global "__ct__30TCastToPtr<16CDestroyableRock>FP7CEntity" "__ct__30TCastToPtr<16CDestroyableRock>FP7CEntity": @@ -21908,354 +21908,354 @@ lbl_800AED1C: /* 800AF07C 000ABFDC 81 83 00 00 */ lwz r12, 0(r3) /* 800AF080 000ABFE0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800AF084 000ABFE4 7D 89 03 A6 */ mtctr r12 -/* 800AF088 000ABFE8 4E 80 04 21 */ bctrl +/* 800AF088 000ABFE8 4E 80 04 21 */ bctrl /* 800AF08C 000ABFEC 80 01 00 14 */ lwz r0, 0x14(r1) /* 800AF090 000ABFF0 7F E3 FB 78 */ mr r3, r31 /* 800AF094 000ABFF4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800AF098 000ABFF8 7C 08 03 A6 */ mtlr r0 /* 800AF09C 000ABFFC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800AF0A0 000AC000 4E 80 00 20 */ blr +/* 800AF0A0 000AC000 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR7CWeapon" "Visit__29TCastToPtr<15CCollisionActor>FR7CWeapon": /* 800AF0A4 000AC004 38 00 00 00 */ li r0, 0 /* 800AF0A8 000AC008 90 03 00 04 */ stw r0, 4(r3) -/* 800AF0AC 000AC00C 4E 80 00 20 */ blr +/* 800AF0AC 000AC00C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR17CWallCrawlerSwarm" "Visit__29TCastToPtr<15CCollisionActor>FR17CWallCrawlerSwarm": /* 800AF0B0 000AC010 38 00 00 00 */ li r0, 0 /* 800AF0B4 000AC014 90 03 00 04 */ stw r0, 4(r3) -/* 800AF0B8 000AC018 4E 80 00 20 */ blr +/* 800AF0B8 000AC018 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR20CScriptSpindleCamera" "Visit__29TCastToPtr<15CCollisionActor>FR20CScriptSpindleCamera": /* 800AF0BC 000AC01C 38 00 00 00 */ li r0, 0 /* 800AF0C0 000AC020 90 03 00 04 */ stw r0, 4(r3) -/* 800AF0C4 000AC024 4E 80 00 20 */ blr +/* 800AF0C4 000AC024 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR15CSnakeWeedSwarm" "Visit__29TCastToPtr<15CCollisionActor>FR15CSnakeWeedSwarm": /* 800AF0C8 000AC028 38 00 00 00 */ li r0, 0 /* 800AF0CC 000AC02C 90 03 00 04 */ stw r0, 4(r3) -/* 800AF0D0 000AC030 4E 80 00 20 */ blr +/* 800AF0D0 000AC030 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR15CScriptWaypoint" "Visit__29TCastToPtr<15CCollisionActor>FR15CScriptWaypoint": /* 800AF0D4 000AC034 38 00 00 00 */ li r0, 0 /* 800AF0D8 000AC038 90 03 00 04 */ stw r0, 4(r3) -/* 800AF0DC 000AC03C 4E 80 00 20 */ blr +/* 800AF0DC 000AC03C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR12CScriptWater" "Visit__29TCastToPtr<15CCollisionActor>FR12CScriptWater": /* 800AF0E0 000AC040 38 00 00 00 */ li r0, 0 /* 800AF0E4 000AC044 90 03 00 04 */ stw r0, 4(r3) -/* 800AF0E8 000AC048 4E 80 00 20 */ blr +/* 800AF0E8 000AC048 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR17CScriptVisorFlare" "Visit__29TCastToPtr<15CCollisionActor>FR17CScriptVisorFlare": /* 800AF0EC 000AC04C 38 00 00 00 */ li r0, 0 /* 800AF0F0 000AC050 90 03 00 04 */ stw r0, 4(r3) -/* 800AF0F4 000AC054 4E 80 00 20 */ blr +/* 800AF0F4 000AC054 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR14CScriptTrigger" "Visit__29TCastToPtr<15CCollisionActor>FR14CScriptTrigger": /* 800AF0F8 000AC058 38 00 00 00 */ li r0, 0 /* 800AF0FC 000AC05C 90 03 00 04 */ stw r0, 4(r3) -/* 800AF100 000AC060 4E 80 00 20 */ blr +/* 800AF100 000AC060 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR12CScriptTimer" "Visit__29TCastToPtr<15CCollisionActor>FR12CScriptTimer": /* 800AF104 000AC064 38 00 00 00 */ li r0, 0 /* 800AF108 000AC068 90 03 00 04 */ stw r0, 4(r3) -/* 800AF10C 000AC06C 4E 80 00 20 */ blr +/* 800AF10C 000AC06C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR10CTeamAiMgr" "Visit__29TCastToPtr<15CCollisionActor>FR10CTeamAiMgr": /* 800AF110 000AC070 38 00 00 00 */ li r0, 0 /* 800AF114 000AC074 90 03 00 04 */ stw r0, 4(r3) -/* 800AF118 000AC078 4E 80 00 20 */ blr +/* 800AF118 000AC078 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR21CScriptTargetingPoint" "Visit__29TCastToPtr<15CCollisionActor>FR21CScriptTargetingPoint": /* 800AF11C 000AC07C 38 00 00 00 */ li r0, 0 /* 800AF120 000AC080 90 03 00 04 */ stw r0, 4(r3) -/* 800AF124 000AC084 4E 80 00 20 */ blr +/* 800AF124 000AC084 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR25CScriptSpiderBallWaypoint" "Visit__29TCastToPtr<15CCollisionActor>FR25CScriptSpiderBallWaypoint": /* 800AF128 000AC088 38 00 00 00 */ li r0, 0 /* 800AF12C 000AC08C 90 03 00 04 */ stw r0, 4(r3) -/* 800AF130 000AC090 4E 80 00 20 */ blr +/* 800AF130 000AC090 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR34CScriptSpiderBallAttractionSurface" "Visit__29TCastToPtr<15CCollisionActor>FR34CScriptSpiderBallAttractionSurface": /* 800AF134 000AC094 38 00 00 00 */ li r0, 0 /* 800AF138 000AC098 90 03 00 04 */ stw r0, 4(r3) -/* 800AF13C 000AC09C 4E 80 00 20 */ blr +/* 800AF13C 000AC09C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR22CScriptSpecialFunction" "Visit__29TCastToPtr<15CCollisionActor>FR22CScriptSpecialFunction": /* 800AF140 000AC0A0 38 00 00 00 */ li r0, 0 /* 800AF144 000AC0A4 90 03 00 04 */ stw r0, 4(r3) -/* 800AF148 000AC0A8 4E 80 00 20 */ blr +/* 800AF148 000AC0A8 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR17CScriptSpawnPoint" "Visit__29TCastToPtr<15CCollisionActor>FR17CScriptSpawnPoint": /* 800AF14C 000AC0AC 38 00 00 00 */ li r0, 0 /* 800AF150 000AC0B0 90 03 00 04 */ stw r0, 4(r3) -/* 800AF154 000AC0B4 4E 80 00 20 */ blr +/* 800AF154 000AC0B4 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR12CScriptSound" "Visit__29TCastToPtr<15CCollisionActor>FR12CScriptSound": /* 800AF158 000AC0B8 38 00 00 00 */ li r0, 0 /* 800AF15C 000AC0BC 90 03 00 04 */ stw r0, 4(r3) -/* 800AF160 000AC0C0 4E 80 00 20 */ blr +/* 800AF160 000AC0C0 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR20CScriptRoomAcoustics" "Visit__29TCastToPtr<15CCollisionActor>FR20CScriptRoomAcoustics": /* 800AF164 000AC0C4 38 00 00 00 */ li r0, 0 /* 800AF168 000AC0C8 90 03 00 04 */ stw r0, 4(r3) -/* 800AF16C 000AC0CC 4E 80 00 20 */ blr +/* 800AF16C 000AC0CC 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR22CScriptPointOfinterest" "Visit__29TCastToPtr<15CCollisionActor>FR22CScriptPointOfinterest": /* 800AF170 000AC0D0 38 00 00 00 */ li r0, 0 /* 800AF174 000AC0D4 90 03 00 04 */ stw r0, 4(r3) -/* 800AF178 000AC0D8 4E 80 00 20 */ blr +/* 800AF178 000AC0D8 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR17CScriptPlayerHint" "Visit__29TCastToPtr<15CCollisionActor>FR17CScriptPlayerHint": /* 800AF17C 000AC0DC 38 00 00 00 */ li r0, 0 /* 800AF180 000AC0E0 90 03 00 04 */ stw r0, 4(r3) -/* 800AF184 000AC0E4 4E 80 00 20 */ blr +/* 800AF184 000AC0E4 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR15CScriptPlatform" "Visit__29TCastToPtr<15CCollisionActor>FR15CScriptPlatform": /* 800AF188 000AC0E8 38 00 00 00 */ li r0, 0 /* 800AF18C 000AC0EC 90 03 00 04 */ stw r0, 4(r3) -/* 800AF190 000AC0F0 4E 80 00 20 */ blr +/* 800AF190 000AC0F0 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR13CScriptPickup" "Visit__29TCastToPtr<15CCollisionActor>FR13CScriptPickup": /* 800AF194 000AC0F4 38 00 00 00 */ li r0, 0 /* 800AF198 000AC0F8 90 03 00 04 */ stw r0, 4(r3) -/* 800AF19C 000AC0FC 4E 80 00 20 */ blr +/* 800AF19C 000AC0FC 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR15CScriptMazeNode" "Visit__29TCastToPtr<15CCollisionActor>FR15CScriptMazeNode": /* 800AF1A0 000AC100 38 00 00 00 */ li r0, 0 /* 800AF1A4 000AC104 90 03 00 04 */ stw r0, 4(r3) -/* 800AF1A8 000AC108 4E 80 00 20 */ blr +/* 800AF1A8 000AC108 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR16CScriptGunTurret" "Visit__29TCastToPtr<15CCollisionActor>FR16CScriptGunTurret": /* 800AF1AC 000AC10C 38 00 00 00 */ li r0, 0 /* 800AF1B0 000AC110 90 03 00 04 */ stw r0, 4(r3) -/* 800AF1B4 000AC114 4E 80 00 20 */ blr +/* 800AF1B4 000AC114 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR19CScriptGrapplePoint" "Visit__29TCastToPtr<15CCollisionActor>FR19CScriptGrapplePoint": /* 800AF1B8 000AC118 38 00 00 00 */ li r0, 0 /* 800AF1BC 000AC11C 90 03 00 04 */ stw r0, 4(r3) -/* 800AF1C0 000AC120 4E 80 00 20 */ blr +/* 800AF1C0 000AC120 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR13CScriptEffect" "Visit__29TCastToPtr<15CCollisionActor>FR13CScriptEffect": /* 800AF1C4 000AC124 38 00 00 00 */ li r0, 0 /* 800AF1C8 000AC128 90 03 00 04 */ stw r0, 4(r3) -/* 800AF1CC 000AC12C 4E 80 00 20 */ blr +/* 800AF1CC 000AC12C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR11CScriptDoor" "Visit__29TCastToPtr<15CCollisionActor>FR11CScriptDoor": /* 800AF1D0 000AC130 38 00 00 00 */ li r0, 0 /* 800AF1D4 000AC134 90 03 00 04 */ stw r0, 4(r3) -/* 800AF1D8 000AC138 4E 80 00 20 */ blr +/* 800AF1D8 000AC138 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR11CScriptDock" "Visit__29TCastToPtr<15CCollisionActor>FR11CScriptDock": /* 800AF1DC 000AC13C 38 00 00 00 */ li r0, 0 /* 800AF1E0 000AC140 90 03 00 04 */ stw r0, 4(r3) -/* 800AF1E4 000AC144 4E 80 00 20 */ blr +/* 800AF1E4 000AC144 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR18CScriptDistanceFog" "Visit__29TCastToPtr<15CCollisionActor>FR18CScriptDistanceFog": /* 800AF1E8 000AC148 38 00 00 00 */ li r0, 0 /* 800AF1EC 000AC14C 90 03 00 04 */ stw r0, 4(r3) -/* 800AF1F0 000AC150 4E 80 00 20 */ blr +/* 800AF1F0 000AC150 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR26CScriptDebugCameraWaypoint" "Visit__29TCastToPtr<15CCollisionActor>FR26CScriptDebugCameraWaypoint": /* 800AF1F4 000AC154 38 00 00 00 */ li r0, 0 /* 800AF1F8 000AC158 90 03 00 04 */ stw r0, 4(r3) -/* 800AF1FC 000AC15C 4E 80 00 20 */ blr +/* 800AF1FC 000AC15C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR17CScriptCoverPoint" "Visit__29TCastToPtr<15CCollisionActor>FR17CScriptCoverPoint": /* 800AF200 000AC160 38 00 00 00 */ li r0, 0 /* 800AF204 000AC164 90 03 00 04 */ stw r0, 4(r3) -/* 800AF208 000AC168 4E 80 00 20 */ blr +/* 800AF208 000AC168 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR21CScriptCameraWaypoint" "Visit__29TCastToPtr<15CCollisionActor>FR21CScriptCameraWaypoint": /* 800AF20C 000AC16C 38 00 00 00 */ li r0, 0 /* 800AF210 000AC170 90 03 00 04 */ stw r0, 4(r3) -/* 800AF214 000AC174 4E 80 00 20 */ blr +/* 800AF214 000AC174 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR24CScriptCameraPitchVolume" "Visit__29TCastToPtr<15CCollisionActor>FR24CScriptCameraPitchVolume": /* 800AF218 000AC178 38 00 00 00 */ li r0, 0 /* 800AF21C 000AC17C 90 03 00 04 */ stw r0, 4(r3) -/* 800AF220 000AC180 4E 80 00 20 */ blr +/* 800AF220 000AC180 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR17CScriptCameraHint" "Visit__29TCastToPtr<15CCollisionActor>FR17CScriptCameraHint": /* 800AF224 000AC184 38 00 00 00 */ li r0, 0 /* 800AF228 000AC188 90 03 00 04 */ stw r0, 4(r3) -/* 800AF22C 000AC18C 4E 80 00 20 */ blr +/* 800AF22C 000AC18C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR18CScriptAiJumpPoint" "Visit__29TCastToPtr<15CCollisionActor>FR18CScriptAiJumpPoint": /* 800AF230 000AC190 38 00 00 00 */ li r0, 0 /* 800AF234 000AC194 90 03 00 04 */ stw r0, 4(r3) -/* 800AF238 000AC198 4E 80 00 20 */ blr +/* 800AF238 000AC198 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR20CScriptActorKeyframe" "Visit__29TCastToPtr<15CCollisionActor>FR20CScriptActorKeyframe": /* 800AF23C 000AC19C 38 00 00 00 */ li r0, 0 /* 800AF240 000AC1A0 90 03 00 04 */ stw r0, 4(r3) -/* 800AF244 000AC1A4 4E 80 00 20 */ blr +/* 800AF244 000AC1A4 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR12CScriptActor" "Visit__29TCastToPtr<15CCollisionActor>FR12CScriptActor": /* 800AF248 000AC1A8 38 00 00 00 */ li r0, 0 /* 800AF24C 000AC1AC 90 03 00 04 */ stw r0, 4(r3) -/* 800AF250 000AC1B0 4E 80 00 20 */ blr +/* 800AF250 000AC1B0 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR9CRepulsor" "Visit__29TCastToPtr<15CCollisionActor>FR9CRepulsor": /* 800AF254 000AC1B4 38 00 00 00 */ li r0, 0 /* 800AF258 000AC1B8 90 03 00 04 */ stw r0, 4(r3) -/* 800AF25C 000AC1BC 4E 80 00 20 */ blr +/* 800AF25C 000AC1BC 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR7CPlayer" "Visit__29TCastToPtr<15CCollisionActor>FR7CPlayer": /* 800AF260 000AC1C0 38 00 00 00 */ li r0, 0 /* 800AF264 000AC1C4 90 03 00 04 */ stw r0, 4(r3) -/* 800AF268 000AC1C8 4E 80 00 20 */ blr +/* 800AF268 000AC1C8 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR13CPhysicsActor" "Visit__29TCastToPtr<15CCollisionActor>FR13CPhysicsActor": /* 800AF26C 000AC1CC 38 00 00 00 */ li r0, 0 /* 800AF270 000AC1D0 90 03 00 04 */ stw r0, 4(r3) -/* 800AF274 000AC1D4 4E 80 00 20 */ blr +/* 800AF274 000AC1D4 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR3CAi" "Visit__29TCastToPtr<15CCollisionActor>FR3CAi": /* 800AF278 000AC1D8 38 00 00 00 */ li r0, 0 /* 800AF27C 000AC1DC 90 03 00 04 */ stw r0, 4(r3) -/* 800AF280 000AC1E0 4E 80 00 20 */ blr +/* 800AF280 000AC1E0 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR11CPathCamera" "Visit__29TCastToPtr<15CCollisionActor>FR11CPathCamera": /* 800AF284 000AC1E4 38 00 00 00 */ li r0, 0 /* 800AF288 000AC1E8 90 03 00 04 */ stw r0, 4(r3) -/* 800AF28C 000AC1EC 4E 80 00 20 */ blr +/* 800AF28C 000AC1EC 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR18CMetroidPrimeRelay" "Visit__29TCastToPtr<15CCollisionActor>FR18CMetroidPrimeRelay": /* 800AF290 000AC1F0 38 00 00 00 */ li r0, 0 /* 800AF294 000AC1F4 90 03 00 04 */ stw r0, 4(r3) -/* 800AF298 000AC1F8 4E 80 00 20 */ blr +/* 800AF298 000AC1F8 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR19CHUDBillboardEffect" "Visit__29TCastToPtr<15CCollisionActor>FR19CHUDBillboardEffect": /* 800AF29C 000AC1FC 38 00 00 00 */ li r0, 0 /* 800AF2A0 000AC200 90 03 00 04 */ stw r0, 4(r3) -/* 800AF2A4 000AC204 4E 80 00 20 */ blr +/* 800AF2A4 000AC204 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR15CGameProjectile" "Visit__29TCastToPtr<15CCollisionActor>FR15CGameProjectile": /* 800AF2A8 000AC208 38 00 00 00 */ li r0, 0 /* 800AF2AC 000AC20C 90 03 00 04 */ stw r0, 4(r3) -/* 800AF2B0 000AC210 4E 80 00 20 */ blr +/* 800AF2B0 000AC210 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR10CGameLight" "Visit__29TCastToPtr<15CCollisionActor>FR10CGameLight": /* 800AF2B4 000AC214 38 00 00 00 */ li r0, 0 /* 800AF2B8 000AC218 90 03 00 04 */ stw r0, 4(r3) -/* 800AF2BC 000AC21C 4E 80 00 20 */ blr +/* 800AF2BC 000AC21C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR11CGameCamera" "Visit__29TCastToPtr<15CCollisionActor>FR11CGameCamera": /* 800AF2C0 000AC220 38 00 00 00 */ li r0, 0 /* 800AF2C4 000AC224 90 03 00 04 */ stw r0, 4(r3) -/* 800AF2C8 000AC228 4E 80 00 20 */ blr +/* 800AF2C8 000AC228 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR10CFishCloud" "Visit__29TCastToPtr<15CCollisionActor>FR10CFishCloud": /* 800AF2CC 000AC22C 38 00 00 00 */ li r0, 0 /* 800AF2D0 000AC230 90 03 00 04 */ stw r0, 4(r3) -/* 800AF2D4 000AC234 4E 80 00 20 */ blr +/* 800AF2D4 000AC234 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR18CFirstPersonCamera" "Visit__29TCastToPtr<15CCollisionActor>FR18CFirstPersonCamera": /* 800AF2D8 000AC238 38 00 00 00 */ li r0, 0 /* 800AF2DC 000AC23C 90 03 00 04 */ stw r0, 4(r3) -/* 800AF2E0 000AC240 4E 80 00 20 */ blr +/* 800AF2E0 000AC240 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR10CExplosion" "Visit__29TCastToPtr<15CCollisionActor>FR10CExplosion": /* 800AF2E4 000AC244 38 00 00 00 */ li r0, 0 /* 800AF2E8 000AC248 90 03 00 04 */ stw r0, 4(r3) -/* 800AF2EC 000AC24C 4E 80 00 20 */ blr +/* 800AF2EC 000AC24C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR7CEntity" "Visit__29TCastToPtr<15CCollisionActor>FR7CEntity": /* 800AF2F0 000AC250 38 00 00 00 */ li r0, 0 /* 800AF2F4 000AC254 90 03 00 04 */ stw r0, 4(r3) -/* 800AF2F8 000AC258 4E 80 00 20 */ blr +/* 800AF2F8 000AC258 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR17CEnergyProjectile" "Visit__29TCastToPtr<15CCollisionActor>FR17CEnergyProjectile": /* 800AF2FC 000AC25C 38 00 00 00 */ li r0, 0 /* 800AF300 000AC260 90 03 00 04 */ stw r0, 4(r3) -/* 800AF304 000AC264 4E 80 00 20 */ blr +/* 800AF304 000AC264 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR16CDestroyableRock" "Visit__29TCastToPtr<15CCollisionActor>FR16CDestroyableRock": /* 800AF308 000AC268 38 00 00 00 */ li r0, 0 /* 800AF30C 000AC26C 90 03 00 04 */ stw r0, 4(r3) -/* 800AF310 000AC270 4E 80 00 20 */ blr +/* 800AF310 000AC270 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR15CCollisionActor" "Visit__29TCastToPtr<15CCollisionActor>FR15CCollisionActor": /* 800AF314 000AC274 90 83 00 04 */ stw r4, 4(r3) -/* 800AF318 000AC278 4E 80 00 20 */ blr +/* 800AF318 000AC278 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR16CCinematicCamera" "Visit__29TCastToPtr<15CCollisionActor>FR16CCinematicCamera": /* 800AF31C 000AC27C 38 00 00 00 */ li r0, 0 /* 800AF320 000AC280 90 03 00 04 */ stw r0, 4(r3) -/* 800AF324 000AC284 4E 80 00 20 */ blr +/* 800AF324 000AC284 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR5CBomb" "Visit__29TCastToPtr<15CCollisionActor>FR5CBomb": /* 800AF328 000AC288 38 00 00 00 */ li r0, 0 /* 800AF32C 000AC28C 90 03 00 04 */ stw r0, 4(r3) -/* 800AF330 000AC290 4E 80 00 20 */ blr +/* 800AF330 000AC290 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR11CBallCamera" "Visit__29TCastToPtr<15CCollisionActor>FR11CBallCamera": /* 800AF334 000AC294 38 00 00 00 */ li r0, 0 /* 800AF338 000AC298 90 03 00 04 */ stw r0, 4(r3) -/* 800AF33C 000AC29C 4E 80 00 20 */ blr +/* 800AF33C 000AC29C 4E 80 00 20 */ blr .global "Visit__29TCastToPtr<15CCollisionActor>FR6CActor" "Visit__29TCastToPtr<15CCollisionActor>FR6CActor": /* 800AF340 000AC2A0 38 00 00 00 */ li r0, 0 /* 800AF344 000AC2A4 90 03 00 04 */ stw r0, 4(r3) -/* 800AF348 000AC2A8 4E 80 00 20 */ blr +/* 800AF348 000AC2A8 4E 80 00 20 */ blr .global "__ct__29TCastToPtr<15CCollisionActor>FP7CEntity" "__ct__29TCastToPtr<15CCollisionActor>FP7CEntity": @@ -22279,14 +22279,14 @@ lbl_800AED1C: /* 800AF390 000AC2F0 81 83 00 00 */ lwz r12, 0(r3) /* 800AF394 000AC2F4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800AF398 000AC2F8 7D 89 03 A6 */ mtctr r12 -/* 800AF39C 000AC2FC 4E 80 04 21 */ bctrl +/* 800AF39C 000AC2FC 4E 80 04 21 */ bctrl lbl_800AF3A0: /* 800AF3A0 000AC300 80 01 00 14 */ lwz r0, 0x14(r1) /* 800AF3A4 000AC304 7F E3 FB 78 */ mr r3, r31 /* 800AF3A8 000AC308 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800AF3AC 000AC30C 7C 08 03 A6 */ mtlr r0 /* 800AF3B0 000AC310 38 21 00 10 */ addi r1, r1, 0x10 -/* 800AF3B4 000AC314 4E 80 00 20 */ blr +/* 800AF3B4 000AC314 4E 80 00 20 */ blr .global "__ct__29TCastToPtr<15CCollisionActor>FR7CEntity" "__ct__29TCastToPtr<15CCollisionActor>FR7CEntity": @@ -22308,354 +22308,354 @@ lbl_800AF3A0: /* 800AF3F4 000AC354 81 83 00 00 */ lwz r12, 0(r3) /* 800AF3F8 000AC358 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800AF3FC 000AC35C 7D 89 03 A6 */ mtctr r12 -/* 800AF400 000AC360 4E 80 04 21 */ bctrl +/* 800AF400 000AC360 4E 80 04 21 */ bctrl /* 800AF404 000AC364 80 01 00 14 */ lwz r0, 0x14(r1) /* 800AF408 000AC368 7F E3 FB 78 */ mr r3, r31 /* 800AF40C 000AC36C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800AF410 000AC370 7C 08 03 A6 */ mtlr r0 /* 800AF414 000AC374 38 21 00 10 */ addi r1, r1, 0x10 -/* 800AF418 000AC378 4E 80 00 20 */ blr +/* 800AF418 000AC378 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR7CWeapon" "Visit__30TCastToPtr<16CCinematicCamera>FR7CWeapon": /* 800AF41C 000AC37C 38 00 00 00 */ li r0, 0 /* 800AF420 000AC380 90 03 00 04 */ stw r0, 4(r3) -/* 800AF424 000AC384 4E 80 00 20 */ blr +/* 800AF424 000AC384 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR17CWallCrawlerSwarm" "Visit__30TCastToPtr<16CCinematicCamera>FR17CWallCrawlerSwarm": /* 800AF428 000AC388 38 00 00 00 */ li r0, 0 /* 800AF42C 000AC38C 90 03 00 04 */ stw r0, 4(r3) -/* 800AF430 000AC390 4E 80 00 20 */ blr +/* 800AF430 000AC390 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR20CScriptSpindleCamera" "Visit__30TCastToPtr<16CCinematicCamera>FR20CScriptSpindleCamera": /* 800AF434 000AC394 38 00 00 00 */ li r0, 0 /* 800AF438 000AC398 90 03 00 04 */ stw r0, 4(r3) -/* 800AF43C 000AC39C 4E 80 00 20 */ blr +/* 800AF43C 000AC39C 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR15CSnakeWeedSwarm" "Visit__30TCastToPtr<16CCinematicCamera>FR15CSnakeWeedSwarm": /* 800AF440 000AC3A0 38 00 00 00 */ li r0, 0 /* 800AF444 000AC3A4 90 03 00 04 */ stw r0, 4(r3) -/* 800AF448 000AC3A8 4E 80 00 20 */ blr +/* 800AF448 000AC3A8 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR15CScriptWaypoint" "Visit__30TCastToPtr<16CCinematicCamera>FR15CScriptWaypoint": /* 800AF44C 000AC3AC 38 00 00 00 */ li r0, 0 /* 800AF450 000AC3B0 90 03 00 04 */ stw r0, 4(r3) -/* 800AF454 000AC3B4 4E 80 00 20 */ blr +/* 800AF454 000AC3B4 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR12CScriptWater" "Visit__30TCastToPtr<16CCinematicCamera>FR12CScriptWater": /* 800AF458 000AC3B8 38 00 00 00 */ li r0, 0 /* 800AF45C 000AC3BC 90 03 00 04 */ stw r0, 4(r3) -/* 800AF460 000AC3C0 4E 80 00 20 */ blr +/* 800AF460 000AC3C0 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR17CScriptVisorFlare" "Visit__30TCastToPtr<16CCinematicCamera>FR17CScriptVisorFlare": /* 800AF464 000AC3C4 38 00 00 00 */ li r0, 0 /* 800AF468 000AC3C8 90 03 00 04 */ stw r0, 4(r3) -/* 800AF46C 000AC3CC 4E 80 00 20 */ blr +/* 800AF46C 000AC3CC 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR14CScriptTrigger" "Visit__30TCastToPtr<16CCinematicCamera>FR14CScriptTrigger": /* 800AF470 000AC3D0 38 00 00 00 */ li r0, 0 /* 800AF474 000AC3D4 90 03 00 04 */ stw r0, 4(r3) -/* 800AF478 000AC3D8 4E 80 00 20 */ blr +/* 800AF478 000AC3D8 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR12CScriptTimer" "Visit__30TCastToPtr<16CCinematicCamera>FR12CScriptTimer": /* 800AF47C 000AC3DC 38 00 00 00 */ li r0, 0 /* 800AF480 000AC3E0 90 03 00 04 */ stw r0, 4(r3) -/* 800AF484 000AC3E4 4E 80 00 20 */ blr +/* 800AF484 000AC3E4 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR10CTeamAiMgr" "Visit__30TCastToPtr<16CCinematicCamera>FR10CTeamAiMgr": /* 800AF488 000AC3E8 38 00 00 00 */ li r0, 0 /* 800AF48C 000AC3EC 90 03 00 04 */ stw r0, 4(r3) -/* 800AF490 000AC3F0 4E 80 00 20 */ blr +/* 800AF490 000AC3F0 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR21CScriptTargetingPoint" "Visit__30TCastToPtr<16CCinematicCamera>FR21CScriptTargetingPoint": /* 800AF494 000AC3F4 38 00 00 00 */ li r0, 0 /* 800AF498 000AC3F8 90 03 00 04 */ stw r0, 4(r3) -/* 800AF49C 000AC3FC 4E 80 00 20 */ blr +/* 800AF49C 000AC3FC 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR25CScriptSpiderBallWaypoint" "Visit__30TCastToPtr<16CCinematicCamera>FR25CScriptSpiderBallWaypoint": /* 800AF4A0 000AC400 38 00 00 00 */ li r0, 0 /* 800AF4A4 000AC404 90 03 00 04 */ stw r0, 4(r3) -/* 800AF4A8 000AC408 4E 80 00 20 */ blr +/* 800AF4A8 000AC408 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR34CScriptSpiderBallAttractionSurface" "Visit__30TCastToPtr<16CCinematicCamera>FR34CScriptSpiderBallAttractionSurface": /* 800AF4AC 000AC40C 38 00 00 00 */ li r0, 0 /* 800AF4B0 000AC410 90 03 00 04 */ stw r0, 4(r3) -/* 800AF4B4 000AC414 4E 80 00 20 */ blr +/* 800AF4B4 000AC414 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR22CScriptSpecialFunction" "Visit__30TCastToPtr<16CCinematicCamera>FR22CScriptSpecialFunction": /* 800AF4B8 000AC418 38 00 00 00 */ li r0, 0 /* 800AF4BC 000AC41C 90 03 00 04 */ stw r0, 4(r3) -/* 800AF4C0 000AC420 4E 80 00 20 */ blr +/* 800AF4C0 000AC420 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR17CScriptSpawnPoint" "Visit__30TCastToPtr<16CCinematicCamera>FR17CScriptSpawnPoint": /* 800AF4C4 000AC424 38 00 00 00 */ li r0, 0 /* 800AF4C8 000AC428 90 03 00 04 */ stw r0, 4(r3) -/* 800AF4CC 000AC42C 4E 80 00 20 */ blr +/* 800AF4CC 000AC42C 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR12CScriptSound" "Visit__30TCastToPtr<16CCinematicCamera>FR12CScriptSound": /* 800AF4D0 000AC430 38 00 00 00 */ li r0, 0 /* 800AF4D4 000AC434 90 03 00 04 */ stw r0, 4(r3) -/* 800AF4D8 000AC438 4E 80 00 20 */ blr +/* 800AF4D8 000AC438 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR20CScriptRoomAcoustics" "Visit__30TCastToPtr<16CCinematicCamera>FR20CScriptRoomAcoustics": /* 800AF4DC 000AC43C 38 00 00 00 */ li r0, 0 /* 800AF4E0 000AC440 90 03 00 04 */ stw r0, 4(r3) -/* 800AF4E4 000AC444 4E 80 00 20 */ blr +/* 800AF4E4 000AC444 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR22CScriptPointOfinterest" "Visit__30TCastToPtr<16CCinematicCamera>FR22CScriptPointOfinterest": /* 800AF4E8 000AC448 38 00 00 00 */ li r0, 0 /* 800AF4EC 000AC44C 90 03 00 04 */ stw r0, 4(r3) -/* 800AF4F0 000AC450 4E 80 00 20 */ blr +/* 800AF4F0 000AC450 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR17CScriptPlayerHint" "Visit__30TCastToPtr<16CCinematicCamera>FR17CScriptPlayerHint": /* 800AF4F4 000AC454 38 00 00 00 */ li r0, 0 /* 800AF4F8 000AC458 90 03 00 04 */ stw r0, 4(r3) -/* 800AF4FC 000AC45C 4E 80 00 20 */ blr +/* 800AF4FC 000AC45C 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR15CScriptPlatform" "Visit__30TCastToPtr<16CCinematicCamera>FR15CScriptPlatform": /* 800AF500 000AC460 38 00 00 00 */ li r0, 0 /* 800AF504 000AC464 90 03 00 04 */ stw r0, 4(r3) -/* 800AF508 000AC468 4E 80 00 20 */ blr +/* 800AF508 000AC468 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR13CScriptPickup" "Visit__30TCastToPtr<16CCinematicCamera>FR13CScriptPickup": /* 800AF50C 000AC46C 38 00 00 00 */ li r0, 0 /* 800AF510 000AC470 90 03 00 04 */ stw r0, 4(r3) -/* 800AF514 000AC474 4E 80 00 20 */ blr +/* 800AF514 000AC474 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR15CScriptMazeNode" "Visit__30TCastToPtr<16CCinematicCamera>FR15CScriptMazeNode": /* 800AF518 000AC478 38 00 00 00 */ li r0, 0 /* 800AF51C 000AC47C 90 03 00 04 */ stw r0, 4(r3) -/* 800AF520 000AC480 4E 80 00 20 */ blr +/* 800AF520 000AC480 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR16CScriptGunTurret" "Visit__30TCastToPtr<16CCinematicCamera>FR16CScriptGunTurret": /* 800AF524 000AC484 38 00 00 00 */ li r0, 0 /* 800AF528 000AC488 90 03 00 04 */ stw r0, 4(r3) -/* 800AF52C 000AC48C 4E 80 00 20 */ blr +/* 800AF52C 000AC48C 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR19CScriptGrapplePoint" "Visit__30TCastToPtr<16CCinematicCamera>FR19CScriptGrapplePoint": /* 800AF530 000AC490 38 00 00 00 */ li r0, 0 /* 800AF534 000AC494 90 03 00 04 */ stw r0, 4(r3) -/* 800AF538 000AC498 4E 80 00 20 */ blr +/* 800AF538 000AC498 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR13CScriptEffect" "Visit__30TCastToPtr<16CCinematicCamera>FR13CScriptEffect": /* 800AF53C 000AC49C 38 00 00 00 */ li r0, 0 /* 800AF540 000AC4A0 90 03 00 04 */ stw r0, 4(r3) -/* 800AF544 000AC4A4 4E 80 00 20 */ blr +/* 800AF544 000AC4A4 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR11CScriptDoor" "Visit__30TCastToPtr<16CCinematicCamera>FR11CScriptDoor": /* 800AF548 000AC4A8 38 00 00 00 */ li r0, 0 /* 800AF54C 000AC4AC 90 03 00 04 */ stw r0, 4(r3) -/* 800AF550 000AC4B0 4E 80 00 20 */ blr +/* 800AF550 000AC4B0 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR11CScriptDock" "Visit__30TCastToPtr<16CCinematicCamera>FR11CScriptDock": /* 800AF554 000AC4B4 38 00 00 00 */ li r0, 0 /* 800AF558 000AC4B8 90 03 00 04 */ stw r0, 4(r3) -/* 800AF55C 000AC4BC 4E 80 00 20 */ blr +/* 800AF55C 000AC4BC 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR18CScriptDistanceFog" "Visit__30TCastToPtr<16CCinematicCamera>FR18CScriptDistanceFog": /* 800AF560 000AC4C0 38 00 00 00 */ li r0, 0 /* 800AF564 000AC4C4 90 03 00 04 */ stw r0, 4(r3) -/* 800AF568 000AC4C8 4E 80 00 20 */ blr +/* 800AF568 000AC4C8 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR26CScriptDebugCameraWaypoint" "Visit__30TCastToPtr<16CCinematicCamera>FR26CScriptDebugCameraWaypoint": /* 800AF56C 000AC4CC 38 00 00 00 */ li r0, 0 /* 800AF570 000AC4D0 90 03 00 04 */ stw r0, 4(r3) -/* 800AF574 000AC4D4 4E 80 00 20 */ blr +/* 800AF574 000AC4D4 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR17CScriptCoverPoint" "Visit__30TCastToPtr<16CCinematicCamera>FR17CScriptCoverPoint": /* 800AF578 000AC4D8 38 00 00 00 */ li r0, 0 /* 800AF57C 000AC4DC 90 03 00 04 */ stw r0, 4(r3) -/* 800AF580 000AC4E0 4E 80 00 20 */ blr +/* 800AF580 000AC4E0 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR21CScriptCameraWaypoint" "Visit__30TCastToPtr<16CCinematicCamera>FR21CScriptCameraWaypoint": /* 800AF584 000AC4E4 38 00 00 00 */ li r0, 0 /* 800AF588 000AC4E8 90 03 00 04 */ stw r0, 4(r3) -/* 800AF58C 000AC4EC 4E 80 00 20 */ blr +/* 800AF58C 000AC4EC 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR24CScriptCameraPitchVolume" "Visit__30TCastToPtr<16CCinematicCamera>FR24CScriptCameraPitchVolume": /* 800AF590 000AC4F0 38 00 00 00 */ li r0, 0 /* 800AF594 000AC4F4 90 03 00 04 */ stw r0, 4(r3) -/* 800AF598 000AC4F8 4E 80 00 20 */ blr +/* 800AF598 000AC4F8 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR17CScriptCameraHint" "Visit__30TCastToPtr<16CCinematicCamera>FR17CScriptCameraHint": /* 800AF59C 000AC4FC 38 00 00 00 */ li r0, 0 /* 800AF5A0 000AC500 90 03 00 04 */ stw r0, 4(r3) -/* 800AF5A4 000AC504 4E 80 00 20 */ blr +/* 800AF5A4 000AC504 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR18CScriptAiJumpPoint" "Visit__30TCastToPtr<16CCinematicCamera>FR18CScriptAiJumpPoint": /* 800AF5A8 000AC508 38 00 00 00 */ li r0, 0 /* 800AF5AC 000AC50C 90 03 00 04 */ stw r0, 4(r3) -/* 800AF5B0 000AC510 4E 80 00 20 */ blr +/* 800AF5B0 000AC510 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR20CScriptActorKeyframe" "Visit__30TCastToPtr<16CCinematicCamera>FR20CScriptActorKeyframe": /* 800AF5B4 000AC514 38 00 00 00 */ li r0, 0 /* 800AF5B8 000AC518 90 03 00 04 */ stw r0, 4(r3) -/* 800AF5BC 000AC51C 4E 80 00 20 */ blr +/* 800AF5BC 000AC51C 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR12CScriptActor" "Visit__30TCastToPtr<16CCinematicCamera>FR12CScriptActor": /* 800AF5C0 000AC520 38 00 00 00 */ li r0, 0 /* 800AF5C4 000AC524 90 03 00 04 */ stw r0, 4(r3) -/* 800AF5C8 000AC528 4E 80 00 20 */ blr +/* 800AF5C8 000AC528 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR9CRepulsor" "Visit__30TCastToPtr<16CCinematicCamera>FR9CRepulsor": /* 800AF5CC 000AC52C 38 00 00 00 */ li r0, 0 /* 800AF5D0 000AC530 90 03 00 04 */ stw r0, 4(r3) -/* 800AF5D4 000AC534 4E 80 00 20 */ blr +/* 800AF5D4 000AC534 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR7CPlayer" "Visit__30TCastToPtr<16CCinematicCamera>FR7CPlayer": /* 800AF5D8 000AC538 38 00 00 00 */ li r0, 0 /* 800AF5DC 000AC53C 90 03 00 04 */ stw r0, 4(r3) -/* 800AF5E0 000AC540 4E 80 00 20 */ blr +/* 800AF5E0 000AC540 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR13CPhysicsActor" "Visit__30TCastToPtr<16CCinematicCamera>FR13CPhysicsActor": /* 800AF5E4 000AC544 38 00 00 00 */ li r0, 0 /* 800AF5E8 000AC548 90 03 00 04 */ stw r0, 4(r3) -/* 800AF5EC 000AC54C 4E 80 00 20 */ blr +/* 800AF5EC 000AC54C 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR3CAi" "Visit__30TCastToPtr<16CCinematicCamera>FR3CAi": /* 800AF5F0 000AC550 38 00 00 00 */ li r0, 0 /* 800AF5F4 000AC554 90 03 00 04 */ stw r0, 4(r3) -/* 800AF5F8 000AC558 4E 80 00 20 */ blr +/* 800AF5F8 000AC558 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR11CPathCamera" "Visit__30TCastToPtr<16CCinematicCamera>FR11CPathCamera": /* 800AF5FC 000AC55C 38 00 00 00 */ li r0, 0 /* 800AF600 000AC560 90 03 00 04 */ stw r0, 4(r3) -/* 800AF604 000AC564 4E 80 00 20 */ blr +/* 800AF604 000AC564 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR18CMetroidPrimeRelay" "Visit__30TCastToPtr<16CCinematicCamera>FR18CMetroidPrimeRelay": /* 800AF608 000AC568 38 00 00 00 */ li r0, 0 /* 800AF60C 000AC56C 90 03 00 04 */ stw r0, 4(r3) -/* 800AF610 000AC570 4E 80 00 20 */ blr +/* 800AF610 000AC570 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR19CHUDBillboardEffect" "Visit__30TCastToPtr<16CCinematicCamera>FR19CHUDBillboardEffect": /* 800AF614 000AC574 38 00 00 00 */ li r0, 0 /* 800AF618 000AC578 90 03 00 04 */ stw r0, 4(r3) -/* 800AF61C 000AC57C 4E 80 00 20 */ blr +/* 800AF61C 000AC57C 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR15CGameProjectile" "Visit__30TCastToPtr<16CCinematicCamera>FR15CGameProjectile": /* 800AF620 000AC580 38 00 00 00 */ li r0, 0 /* 800AF624 000AC584 90 03 00 04 */ stw r0, 4(r3) -/* 800AF628 000AC588 4E 80 00 20 */ blr +/* 800AF628 000AC588 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR10CGameLight" "Visit__30TCastToPtr<16CCinematicCamera>FR10CGameLight": /* 800AF62C 000AC58C 38 00 00 00 */ li r0, 0 /* 800AF630 000AC590 90 03 00 04 */ stw r0, 4(r3) -/* 800AF634 000AC594 4E 80 00 20 */ blr +/* 800AF634 000AC594 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR11CGameCamera" "Visit__30TCastToPtr<16CCinematicCamera>FR11CGameCamera": /* 800AF638 000AC598 38 00 00 00 */ li r0, 0 /* 800AF63C 000AC59C 90 03 00 04 */ stw r0, 4(r3) -/* 800AF640 000AC5A0 4E 80 00 20 */ blr +/* 800AF640 000AC5A0 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR10CFishCloud" "Visit__30TCastToPtr<16CCinematicCamera>FR10CFishCloud": /* 800AF644 000AC5A4 38 00 00 00 */ li r0, 0 /* 800AF648 000AC5A8 90 03 00 04 */ stw r0, 4(r3) -/* 800AF64C 000AC5AC 4E 80 00 20 */ blr +/* 800AF64C 000AC5AC 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR18CFirstPersonCamera" "Visit__30TCastToPtr<16CCinematicCamera>FR18CFirstPersonCamera": /* 800AF650 000AC5B0 38 00 00 00 */ li r0, 0 /* 800AF654 000AC5B4 90 03 00 04 */ stw r0, 4(r3) -/* 800AF658 000AC5B8 4E 80 00 20 */ blr +/* 800AF658 000AC5B8 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR10CExplosion" "Visit__30TCastToPtr<16CCinematicCamera>FR10CExplosion": /* 800AF65C 000AC5BC 38 00 00 00 */ li r0, 0 /* 800AF660 000AC5C0 90 03 00 04 */ stw r0, 4(r3) -/* 800AF664 000AC5C4 4E 80 00 20 */ blr +/* 800AF664 000AC5C4 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR7CEntity" "Visit__30TCastToPtr<16CCinematicCamera>FR7CEntity": /* 800AF668 000AC5C8 38 00 00 00 */ li r0, 0 /* 800AF66C 000AC5CC 90 03 00 04 */ stw r0, 4(r3) -/* 800AF670 000AC5D0 4E 80 00 20 */ blr +/* 800AF670 000AC5D0 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR17CEnergyProjectile" "Visit__30TCastToPtr<16CCinematicCamera>FR17CEnergyProjectile": /* 800AF674 000AC5D4 38 00 00 00 */ li r0, 0 /* 800AF678 000AC5D8 90 03 00 04 */ stw r0, 4(r3) -/* 800AF67C 000AC5DC 4E 80 00 20 */ blr +/* 800AF67C 000AC5DC 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR16CDestroyableRock" "Visit__30TCastToPtr<16CCinematicCamera>FR16CDestroyableRock": /* 800AF680 000AC5E0 38 00 00 00 */ li r0, 0 /* 800AF684 000AC5E4 90 03 00 04 */ stw r0, 4(r3) -/* 800AF688 000AC5E8 4E 80 00 20 */ blr +/* 800AF688 000AC5E8 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR15CCollisionActor" "Visit__30TCastToPtr<16CCinematicCamera>FR15CCollisionActor": /* 800AF68C 000AC5EC 38 00 00 00 */ li r0, 0 /* 800AF690 000AC5F0 90 03 00 04 */ stw r0, 4(r3) -/* 800AF694 000AC5F4 4E 80 00 20 */ blr +/* 800AF694 000AC5F4 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR16CCinematicCamera" "Visit__30TCastToPtr<16CCinematicCamera>FR16CCinematicCamera": /* 800AF698 000AC5F8 90 83 00 04 */ stw r4, 4(r3) -/* 800AF69C 000AC5FC 4E 80 00 20 */ blr +/* 800AF69C 000AC5FC 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR5CBomb" "Visit__30TCastToPtr<16CCinematicCamera>FR5CBomb": /* 800AF6A0 000AC600 38 00 00 00 */ li r0, 0 /* 800AF6A4 000AC604 90 03 00 04 */ stw r0, 4(r3) -/* 800AF6A8 000AC608 4E 80 00 20 */ blr +/* 800AF6A8 000AC608 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR11CBallCamera" "Visit__30TCastToPtr<16CCinematicCamera>FR11CBallCamera": /* 800AF6AC 000AC60C 38 00 00 00 */ li r0, 0 /* 800AF6B0 000AC610 90 03 00 04 */ stw r0, 4(r3) -/* 800AF6B4 000AC614 4E 80 00 20 */ blr +/* 800AF6B4 000AC614 4E 80 00 20 */ blr .global "Visit__30TCastToPtr<16CCinematicCamera>FR6CActor" "Visit__30TCastToPtr<16CCinematicCamera>FR6CActor": /* 800AF6B8 000AC618 38 00 00 00 */ li r0, 0 /* 800AF6BC 000AC61C 90 03 00 04 */ stw r0, 4(r3) -/* 800AF6C0 000AC620 4E 80 00 20 */ blr +/* 800AF6C0 000AC620 4E 80 00 20 */ blr .global "__ct__30TCastToPtr<16CCinematicCamera>FP7CEntity" "__ct__30TCastToPtr<16CCinematicCamera>FP7CEntity": @@ -22679,14 +22679,14 @@ lbl_800AF3A0: /* 800AF708 000AC668 81 83 00 00 */ lwz r12, 0(r3) /* 800AF70C 000AC66C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800AF710 000AC670 7D 89 03 A6 */ mtctr r12 -/* 800AF714 000AC674 4E 80 04 21 */ bctrl +/* 800AF714 000AC674 4E 80 04 21 */ bctrl lbl_800AF718: /* 800AF718 000AC678 80 01 00 14 */ lwz r0, 0x14(r1) /* 800AF71C 000AC67C 7F E3 FB 78 */ mr r3, r31 /* 800AF720 000AC680 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800AF724 000AC684 7C 08 03 A6 */ mtlr r0 /* 800AF728 000AC688 38 21 00 10 */ addi r1, r1, 0x10 -/* 800AF72C 000AC68C 4E 80 00 20 */ blr +/* 800AF72C 000AC68C 4E 80 00 20 */ blr .global "__ct__30TCastToPtr<16CCinematicCamera>FR7CEntity" "__ct__30TCastToPtr<16CCinematicCamera>FR7CEntity": @@ -22708,354 +22708,354 @@ lbl_800AF718: /* 800AF76C 000AC6CC 81 83 00 00 */ lwz r12, 0(r3) /* 800AF770 000AC6D0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800AF774 000AC6D4 7D 89 03 A6 */ mtctr r12 -/* 800AF778 000AC6D8 4E 80 04 21 */ bctrl +/* 800AF778 000AC6D8 4E 80 04 21 */ bctrl /* 800AF77C 000AC6DC 80 01 00 14 */ lwz r0, 0x14(r1) /* 800AF780 000AC6E0 7F E3 FB 78 */ mr r3, r31 /* 800AF784 000AC6E4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800AF788 000AC6E8 7C 08 03 A6 */ mtlr r0 /* 800AF78C 000AC6EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800AF790 000AC6F0 4E 80 00 20 */ blr +/* 800AF790 000AC6F0 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR7CWeapon" "Visit__18TCastToPtr<5CBomb>FR7CWeapon": /* 800AF794 000AC6F4 38 00 00 00 */ li r0, 0 /* 800AF798 000AC6F8 90 03 00 04 */ stw r0, 4(r3) -/* 800AF79C 000AC6FC 4E 80 00 20 */ blr +/* 800AF79C 000AC6FC 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR17CWallCrawlerSwarm" "Visit__18TCastToPtr<5CBomb>FR17CWallCrawlerSwarm": /* 800AF7A0 000AC700 38 00 00 00 */ li r0, 0 /* 800AF7A4 000AC704 90 03 00 04 */ stw r0, 4(r3) -/* 800AF7A8 000AC708 4E 80 00 20 */ blr +/* 800AF7A8 000AC708 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR20CScriptSpindleCamera" "Visit__18TCastToPtr<5CBomb>FR20CScriptSpindleCamera": /* 800AF7AC 000AC70C 38 00 00 00 */ li r0, 0 /* 800AF7B0 000AC710 90 03 00 04 */ stw r0, 4(r3) -/* 800AF7B4 000AC714 4E 80 00 20 */ blr +/* 800AF7B4 000AC714 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR15CSnakeWeedSwarm" "Visit__18TCastToPtr<5CBomb>FR15CSnakeWeedSwarm": /* 800AF7B8 000AC718 38 00 00 00 */ li r0, 0 /* 800AF7BC 000AC71C 90 03 00 04 */ stw r0, 4(r3) -/* 800AF7C0 000AC720 4E 80 00 20 */ blr +/* 800AF7C0 000AC720 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR15CScriptWaypoint" "Visit__18TCastToPtr<5CBomb>FR15CScriptWaypoint": /* 800AF7C4 000AC724 38 00 00 00 */ li r0, 0 /* 800AF7C8 000AC728 90 03 00 04 */ stw r0, 4(r3) -/* 800AF7CC 000AC72C 4E 80 00 20 */ blr +/* 800AF7CC 000AC72C 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR12CScriptWater" "Visit__18TCastToPtr<5CBomb>FR12CScriptWater": /* 800AF7D0 000AC730 38 00 00 00 */ li r0, 0 /* 800AF7D4 000AC734 90 03 00 04 */ stw r0, 4(r3) -/* 800AF7D8 000AC738 4E 80 00 20 */ blr +/* 800AF7D8 000AC738 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR17CScriptVisorFlare" "Visit__18TCastToPtr<5CBomb>FR17CScriptVisorFlare": /* 800AF7DC 000AC73C 38 00 00 00 */ li r0, 0 /* 800AF7E0 000AC740 90 03 00 04 */ stw r0, 4(r3) -/* 800AF7E4 000AC744 4E 80 00 20 */ blr +/* 800AF7E4 000AC744 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR14CScriptTrigger" "Visit__18TCastToPtr<5CBomb>FR14CScriptTrigger": /* 800AF7E8 000AC748 38 00 00 00 */ li r0, 0 /* 800AF7EC 000AC74C 90 03 00 04 */ stw r0, 4(r3) -/* 800AF7F0 000AC750 4E 80 00 20 */ blr +/* 800AF7F0 000AC750 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR12CScriptTimer" "Visit__18TCastToPtr<5CBomb>FR12CScriptTimer": /* 800AF7F4 000AC754 38 00 00 00 */ li r0, 0 /* 800AF7F8 000AC758 90 03 00 04 */ stw r0, 4(r3) -/* 800AF7FC 000AC75C 4E 80 00 20 */ blr +/* 800AF7FC 000AC75C 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR10CTeamAiMgr" "Visit__18TCastToPtr<5CBomb>FR10CTeamAiMgr": /* 800AF800 000AC760 38 00 00 00 */ li r0, 0 /* 800AF804 000AC764 90 03 00 04 */ stw r0, 4(r3) -/* 800AF808 000AC768 4E 80 00 20 */ blr +/* 800AF808 000AC768 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR21CScriptTargetingPoint" "Visit__18TCastToPtr<5CBomb>FR21CScriptTargetingPoint": /* 800AF80C 000AC76C 38 00 00 00 */ li r0, 0 /* 800AF810 000AC770 90 03 00 04 */ stw r0, 4(r3) -/* 800AF814 000AC774 4E 80 00 20 */ blr +/* 800AF814 000AC774 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR25CScriptSpiderBallWaypoint" "Visit__18TCastToPtr<5CBomb>FR25CScriptSpiderBallWaypoint": /* 800AF818 000AC778 38 00 00 00 */ li r0, 0 /* 800AF81C 000AC77C 90 03 00 04 */ stw r0, 4(r3) -/* 800AF820 000AC780 4E 80 00 20 */ blr +/* 800AF820 000AC780 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR34CScriptSpiderBallAttractionSurface" "Visit__18TCastToPtr<5CBomb>FR34CScriptSpiderBallAttractionSurface": /* 800AF824 000AC784 38 00 00 00 */ li r0, 0 /* 800AF828 000AC788 90 03 00 04 */ stw r0, 4(r3) -/* 800AF82C 000AC78C 4E 80 00 20 */ blr +/* 800AF82C 000AC78C 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR22CScriptSpecialFunction" "Visit__18TCastToPtr<5CBomb>FR22CScriptSpecialFunction": /* 800AF830 000AC790 38 00 00 00 */ li r0, 0 /* 800AF834 000AC794 90 03 00 04 */ stw r0, 4(r3) -/* 800AF838 000AC798 4E 80 00 20 */ blr +/* 800AF838 000AC798 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR17CScriptSpawnPoint" "Visit__18TCastToPtr<5CBomb>FR17CScriptSpawnPoint": /* 800AF83C 000AC79C 38 00 00 00 */ li r0, 0 /* 800AF840 000AC7A0 90 03 00 04 */ stw r0, 4(r3) -/* 800AF844 000AC7A4 4E 80 00 20 */ blr +/* 800AF844 000AC7A4 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR12CScriptSound" "Visit__18TCastToPtr<5CBomb>FR12CScriptSound": /* 800AF848 000AC7A8 38 00 00 00 */ li r0, 0 /* 800AF84C 000AC7AC 90 03 00 04 */ stw r0, 4(r3) -/* 800AF850 000AC7B0 4E 80 00 20 */ blr +/* 800AF850 000AC7B0 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR20CScriptRoomAcoustics" "Visit__18TCastToPtr<5CBomb>FR20CScriptRoomAcoustics": /* 800AF854 000AC7B4 38 00 00 00 */ li r0, 0 /* 800AF858 000AC7B8 90 03 00 04 */ stw r0, 4(r3) -/* 800AF85C 000AC7BC 4E 80 00 20 */ blr +/* 800AF85C 000AC7BC 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR22CScriptPointOfinterest" "Visit__18TCastToPtr<5CBomb>FR22CScriptPointOfinterest": /* 800AF860 000AC7C0 38 00 00 00 */ li r0, 0 /* 800AF864 000AC7C4 90 03 00 04 */ stw r0, 4(r3) -/* 800AF868 000AC7C8 4E 80 00 20 */ blr +/* 800AF868 000AC7C8 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR17CScriptPlayerHint" "Visit__18TCastToPtr<5CBomb>FR17CScriptPlayerHint": /* 800AF86C 000AC7CC 38 00 00 00 */ li r0, 0 /* 800AF870 000AC7D0 90 03 00 04 */ stw r0, 4(r3) -/* 800AF874 000AC7D4 4E 80 00 20 */ blr +/* 800AF874 000AC7D4 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR15CScriptPlatform" "Visit__18TCastToPtr<5CBomb>FR15CScriptPlatform": /* 800AF878 000AC7D8 38 00 00 00 */ li r0, 0 /* 800AF87C 000AC7DC 90 03 00 04 */ stw r0, 4(r3) -/* 800AF880 000AC7E0 4E 80 00 20 */ blr +/* 800AF880 000AC7E0 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR13CScriptPickup" "Visit__18TCastToPtr<5CBomb>FR13CScriptPickup": /* 800AF884 000AC7E4 38 00 00 00 */ li r0, 0 /* 800AF888 000AC7E8 90 03 00 04 */ stw r0, 4(r3) -/* 800AF88C 000AC7EC 4E 80 00 20 */ blr +/* 800AF88C 000AC7EC 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR15CScriptMazeNode" "Visit__18TCastToPtr<5CBomb>FR15CScriptMazeNode": /* 800AF890 000AC7F0 38 00 00 00 */ li r0, 0 /* 800AF894 000AC7F4 90 03 00 04 */ stw r0, 4(r3) -/* 800AF898 000AC7F8 4E 80 00 20 */ blr +/* 800AF898 000AC7F8 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR16CScriptGunTurret" "Visit__18TCastToPtr<5CBomb>FR16CScriptGunTurret": /* 800AF89C 000AC7FC 38 00 00 00 */ li r0, 0 /* 800AF8A0 000AC800 90 03 00 04 */ stw r0, 4(r3) -/* 800AF8A4 000AC804 4E 80 00 20 */ blr +/* 800AF8A4 000AC804 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR19CScriptGrapplePoint" "Visit__18TCastToPtr<5CBomb>FR19CScriptGrapplePoint": /* 800AF8A8 000AC808 38 00 00 00 */ li r0, 0 /* 800AF8AC 000AC80C 90 03 00 04 */ stw r0, 4(r3) -/* 800AF8B0 000AC810 4E 80 00 20 */ blr +/* 800AF8B0 000AC810 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR13CScriptEffect" "Visit__18TCastToPtr<5CBomb>FR13CScriptEffect": /* 800AF8B4 000AC814 38 00 00 00 */ li r0, 0 /* 800AF8B8 000AC818 90 03 00 04 */ stw r0, 4(r3) -/* 800AF8BC 000AC81C 4E 80 00 20 */ blr +/* 800AF8BC 000AC81C 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR11CScriptDoor" "Visit__18TCastToPtr<5CBomb>FR11CScriptDoor": /* 800AF8C0 000AC820 38 00 00 00 */ li r0, 0 /* 800AF8C4 000AC824 90 03 00 04 */ stw r0, 4(r3) -/* 800AF8C8 000AC828 4E 80 00 20 */ blr +/* 800AF8C8 000AC828 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR11CScriptDock" "Visit__18TCastToPtr<5CBomb>FR11CScriptDock": /* 800AF8CC 000AC82C 38 00 00 00 */ li r0, 0 /* 800AF8D0 000AC830 90 03 00 04 */ stw r0, 4(r3) -/* 800AF8D4 000AC834 4E 80 00 20 */ blr +/* 800AF8D4 000AC834 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR18CScriptDistanceFog" "Visit__18TCastToPtr<5CBomb>FR18CScriptDistanceFog": /* 800AF8D8 000AC838 38 00 00 00 */ li r0, 0 /* 800AF8DC 000AC83C 90 03 00 04 */ stw r0, 4(r3) -/* 800AF8E0 000AC840 4E 80 00 20 */ blr +/* 800AF8E0 000AC840 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR26CScriptDebugCameraWaypoint" "Visit__18TCastToPtr<5CBomb>FR26CScriptDebugCameraWaypoint": /* 800AF8E4 000AC844 38 00 00 00 */ li r0, 0 /* 800AF8E8 000AC848 90 03 00 04 */ stw r0, 4(r3) -/* 800AF8EC 000AC84C 4E 80 00 20 */ blr +/* 800AF8EC 000AC84C 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR17CScriptCoverPoint" "Visit__18TCastToPtr<5CBomb>FR17CScriptCoverPoint": /* 800AF8F0 000AC850 38 00 00 00 */ li r0, 0 /* 800AF8F4 000AC854 90 03 00 04 */ stw r0, 4(r3) -/* 800AF8F8 000AC858 4E 80 00 20 */ blr +/* 800AF8F8 000AC858 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR21CScriptCameraWaypoint" "Visit__18TCastToPtr<5CBomb>FR21CScriptCameraWaypoint": /* 800AF8FC 000AC85C 38 00 00 00 */ li r0, 0 /* 800AF900 000AC860 90 03 00 04 */ stw r0, 4(r3) -/* 800AF904 000AC864 4E 80 00 20 */ blr +/* 800AF904 000AC864 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR24CScriptCameraPitchVolume" "Visit__18TCastToPtr<5CBomb>FR24CScriptCameraPitchVolume": /* 800AF908 000AC868 38 00 00 00 */ li r0, 0 /* 800AF90C 000AC86C 90 03 00 04 */ stw r0, 4(r3) -/* 800AF910 000AC870 4E 80 00 20 */ blr +/* 800AF910 000AC870 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR17CScriptCameraHint" "Visit__18TCastToPtr<5CBomb>FR17CScriptCameraHint": /* 800AF914 000AC874 38 00 00 00 */ li r0, 0 /* 800AF918 000AC878 90 03 00 04 */ stw r0, 4(r3) -/* 800AF91C 000AC87C 4E 80 00 20 */ blr +/* 800AF91C 000AC87C 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR18CScriptAiJumpPoint" "Visit__18TCastToPtr<5CBomb>FR18CScriptAiJumpPoint": /* 800AF920 000AC880 38 00 00 00 */ li r0, 0 /* 800AF924 000AC884 90 03 00 04 */ stw r0, 4(r3) -/* 800AF928 000AC888 4E 80 00 20 */ blr +/* 800AF928 000AC888 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR20CScriptActorKeyframe" "Visit__18TCastToPtr<5CBomb>FR20CScriptActorKeyframe": /* 800AF92C 000AC88C 38 00 00 00 */ li r0, 0 /* 800AF930 000AC890 90 03 00 04 */ stw r0, 4(r3) -/* 800AF934 000AC894 4E 80 00 20 */ blr +/* 800AF934 000AC894 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR12CScriptActor" "Visit__18TCastToPtr<5CBomb>FR12CScriptActor": /* 800AF938 000AC898 38 00 00 00 */ li r0, 0 /* 800AF93C 000AC89C 90 03 00 04 */ stw r0, 4(r3) -/* 800AF940 000AC8A0 4E 80 00 20 */ blr +/* 800AF940 000AC8A0 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR9CRepulsor" "Visit__18TCastToPtr<5CBomb>FR9CRepulsor": /* 800AF944 000AC8A4 38 00 00 00 */ li r0, 0 /* 800AF948 000AC8A8 90 03 00 04 */ stw r0, 4(r3) -/* 800AF94C 000AC8AC 4E 80 00 20 */ blr +/* 800AF94C 000AC8AC 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR7CPlayer" "Visit__18TCastToPtr<5CBomb>FR7CPlayer": /* 800AF950 000AC8B0 38 00 00 00 */ li r0, 0 /* 800AF954 000AC8B4 90 03 00 04 */ stw r0, 4(r3) -/* 800AF958 000AC8B8 4E 80 00 20 */ blr +/* 800AF958 000AC8B8 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR13CPhysicsActor" "Visit__18TCastToPtr<5CBomb>FR13CPhysicsActor": /* 800AF95C 000AC8BC 38 00 00 00 */ li r0, 0 /* 800AF960 000AC8C0 90 03 00 04 */ stw r0, 4(r3) -/* 800AF964 000AC8C4 4E 80 00 20 */ blr +/* 800AF964 000AC8C4 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR3CAi" "Visit__18TCastToPtr<5CBomb>FR3CAi": /* 800AF968 000AC8C8 38 00 00 00 */ li r0, 0 /* 800AF96C 000AC8CC 90 03 00 04 */ stw r0, 4(r3) -/* 800AF970 000AC8D0 4E 80 00 20 */ blr +/* 800AF970 000AC8D0 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR11CPathCamera" "Visit__18TCastToPtr<5CBomb>FR11CPathCamera": /* 800AF974 000AC8D4 38 00 00 00 */ li r0, 0 /* 800AF978 000AC8D8 90 03 00 04 */ stw r0, 4(r3) -/* 800AF97C 000AC8DC 4E 80 00 20 */ blr +/* 800AF97C 000AC8DC 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR18CMetroidPrimeRelay" "Visit__18TCastToPtr<5CBomb>FR18CMetroidPrimeRelay": /* 800AF980 000AC8E0 38 00 00 00 */ li r0, 0 /* 800AF984 000AC8E4 90 03 00 04 */ stw r0, 4(r3) -/* 800AF988 000AC8E8 4E 80 00 20 */ blr +/* 800AF988 000AC8E8 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR19CHUDBillboardEffect" "Visit__18TCastToPtr<5CBomb>FR19CHUDBillboardEffect": /* 800AF98C 000AC8EC 38 00 00 00 */ li r0, 0 /* 800AF990 000AC8F0 90 03 00 04 */ stw r0, 4(r3) -/* 800AF994 000AC8F4 4E 80 00 20 */ blr +/* 800AF994 000AC8F4 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR15CGameProjectile" "Visit__18TCastToPtr<5CBomb>FR15CGameProjectile": /* 800AF998 000AC8F8 38 00 00 00 */ li r0, 0 /* 800AF99C 000AC8FC 90 03 00 04 */ stw r0, 4(r3) -/* 800AF9A0 000AC900 4E 80 00 20 */ blr +/* 800AF9A0 000AC900 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR10CGameLight" "Visit__18TCastToPtr<5CBomb>FR10CGameLight": /* 800AF9A4 000AC904 38 00 00 00 */ li r0, 0 /* 800AF9A8 000AC908 90 03 00 04 */ stw r0, 4(r3) -/* 800AF9AC 000AC90C 4E 80 00 20 */ blr +/* 800AF9AC 000AC90C 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR11CGameCamera" "Visit__18TCastToPtr<5CBomb>FR11CGameCamera": /* 800AF9B0 000AC910 38 00 00 00 */ li r0, 0 /* 800AF9B4 000AC914 90 03 00 04 */ stw r0, 4(r3) -/* 800AF9B8 000AC918 4E 80 00 20 */ blr +/* 800AF9B8 000AC918 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR10CFishCloud" "Visit__18TCastToPtr<5CBomb>FR10CFishCloud": /* 800AF9BC 000AC91C 38 00 00 00 */ li r0, 0 /* 800AF9C0 000AC920 90 03 00 04 */ stw r0, 4(r3) -/* 800AF9C4 000AC924 4E 80 00 20 */ blr +/* 800AF9C4 000AC924 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR18CFirstPersonCamera" "Visit__18TCastToPtr<5CBomb>FR18CFirstPersonCamera": /* 800AF9C8 000AC928 38 00 00 00 */ li r0, 0 /* 800AF9CC 000AC92C 90 03 00 04 */ stw r0, 4(r3) -/* 800AF9D0 000AC930 4E 80 00 20 */ blr +/* 800AF9D0 000AC930 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR10CExplosion" "Visit__18TCastToPtr<5CBomb>FR10CExplosion": /* 800AF9D4 000AC934 38 00 00 00 */ li r0, 0 /* 800AF9D8 000AC938 90 03 00 04 */ stw r0, 4(r3) -/* 800AF9DC 000AC93C 4E 80 00 20 */ blr +/* 800AF9DC 000AC93C 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR7CEntity" "Visit__18TCastToPtr<5CBomb>FR7CEntity": /* 800AF9E0 000AC940 38 00 00 00 */ li r0, 0 /* 800AF9E4 000AC944 90 03 00 04 */ stw r0, 4(r3) -/* 800AF9E8 000AC948 4E 80 00 20 */ blr +/* 800AF9E8 000AC948 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR17CEnergyProjectile" "Visit__18TCastToPtr<5CBomb>FR17CEnergyProjectile": /* 800AF9EC 000AC94C 38 00 00 00 */ li r0, 0 /* 800AF9F0 000AC950 90 03 00 04 */ stw r0, 4(r3) -/* 800AF9F4 000AC954 4E 80 00 20 */ blr +/* 800AF9F4 000AC954 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR16CDestroyableRock" "Visit__18TCastToPtr<5CBomb>FR16CDestroyableRock": /* 800AF9F8 000AC958 38 00 00 00 */ li r0, 0 /* 800AF9FC 000AC95C 90 03 00 04 */ stw r0, 4(r3) -/* 800AFA00 000AC960 4E 80 00 20 */ blr +/* 800AFA00 000AC960 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR15CCollisionActor" "Visit__18TCastToPtr<5CBomb>FR15CCollisionActor": /* 800AFA04 000AC964 38 00 00 00 */ li r0, 0 /* 800AFA08 000AC968 90 03 00 04 */ stw r0, 4(r3) -/* 800AFA0C 000AC96C 4E 80 00 20 */ blr +/* 800AFA0C 000AC96C 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR16CCinematicCamera" "Visit__18TCastToPtr<5CBomb>FR16CCinematicCamera": /* 800AFA10 000AC970 38 00 00 00 */ li r0, 0 /* 800AFA14 000AC974 90 03 00 04 */ stw r0, 4(r3) -/* 800AFA18 000AC978 4E 80 00 20 */ blr +/* 800AFA18 000AC978 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR5CBomb" "Visit__18TCastToPtr<5CBomb>FR5CBomb": /* 800AFA1C 000AC97C 90 83 00 04 */ stw r4, 4(r3) -/* 800AFA20 000AC980 4E 80 00 20 */ blr +/* 800AFA20 000AC980 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR11CBallCamera" "Visit__18TCastToPtr<5CBomb>FR11CBallCamera": /* 800AFA24 000AC984 38 00 00 00 */ li r0, 0 /* 800AFA28 000AC988 90 03 00 04 */ stw r0, 4(r3) -/* 800AFA2C 000AC98C 4E 80 00 20 */ blr +/* 800AFA2C 000AC98C 4E 80 00 20 */ blr .global "Visit__18TCastToPtr<5CBomb>FR6CActor" "Visit__18TCastToPtr<5CBomb>FR6CActor": /* 800AFA30 000AC990 38 00 00 00 */ li r0, 0 /* 800AFA34 000AC994 90 03 00 04 */ stw r0, 4(r3) -/* 800AFA38 000AC998 4E 80 00 20 */ blr +/* 800AFA38 000AC998 4E 80 00 20 */ blr .global "__ct__18TCastToPtr<5CBomb>FP7CEntity" "__ct__18TCastToPtr<5CBomb>FP7CEntity": @@ -23079,307 +23079,307 @@ lbl_800AF718: /* 800AFA80 000AC9E0 81 83 00 00 */ lwz r12, 0(r3) /* 800AFA84 000AC9E4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800AFA88 000AC9E8 7D 89 03 A6 */ mtctr r12 -/* 800AFA8C 000AC9EC 4E 80 04 21 */ bctrl +/* 800AFA8C 000AC9EC 4E 80 04 21 */ bctrl lbl_800AFA90: /* 800AFA90 000AC9F0 80 01 00 14 */ lwz r0, 0x14(r1) /* 800AFA94 000AC9F4 7F E3 FB 78 */ mr r3, r31 /* 800AFA98 000AC9F8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800AFA9C 000AC9FC 7C 08 03 A6 */ mtlr r0 /* 800AFAA0 000ACA00 38 21 00 10 */ addi r1, r1, 0x10 -/* 800AFAA4 000ACA04 4E 80 00 20 */ blr +/* 800AFAA4 000ACA04 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR7CWeapon" "Visit__19TCastToPtr<6CActor>FR7CWeapon": /* 800AFAA8 000ACA08 90 83 00 04 */ stw r4, 4(r3) -/* 800AFAAC 000ACA0C 4E 80 00 20 */ blr +/* 800AFAAC 000ACA0C 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR17CWallCrawlerSwarm" "Visit__19TCastToPtr<6CActor>FR17CWallCrawlerSwarm": /* 800AFAB0 000ACA10 90 83 00 04 */ stw r4, 4(r3) -/* 800AFAB4 000ACA14 4E 80 00 20 */ blr +/* 800AFAB4 000ACA14 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR20CScriptSpindleCamera" "Visit__19TCastToPtr<6CActor>FR20CScriptSpindleCamera": /* 800AFAB8 000ACA18 90 83 00 04 */ stw r4, 4(r3) -/* 800AFABC 000ACA1C 4E 80 00 20 */ blr +/* 800AFABC 000ACA1C 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR15CSnakeWeedSwarm" "Visit__19TCastToPtr<6CActor>FR15CSnakeWeedSwarm": /* 800AFAC0 000ACA20 90 83 00 04 */ stw r4, 4(r3) -/* 800AFAC4 000ACA24 4E 80 00 20 */ blr +/* 800AFAC4 000ACA24 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR15CScriptWaypoint" "Visit__19TCastToPtr<6CActor>FR15CScriptWaypoint": /* 800AFAC8 000ACA28 90 83 00 04 */ stw r4, 4(r3) -/* 800AFACC 000ACA2C 4E 80 00 20 */ blr +/* 800AFACC 000ACA2C 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR12CScriptWater" "Visit__19TCastToPtr<6CActor>FR12CScriptWater": /* 800AFAD0 000ACA30 90 83 00 04 */ stw r4, 4(r3) -/* 800AFAD4 000ACA34 4E 80 00 20 */ blr +/* 800AFAD4 000ACA34 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR17CScriptVisorFlare" "Visit__19TCastToPtr<6CActor>FR17CScriptVisorFlare": /* 800AFAD8 000ACA38 90 83 00 04 */ stw r4, 4(r3) -/* 800AFADC 000ACA3C 4E 80 00 20 */ blr +/* 800AFADC 000ACA3C 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR14CScriptTrigger" "Visit__19TCastToPtr<6CActor>FR14CScriptTrigger": /* 800AFAE0 000ACA40 90 83 00 04 */ stw r4, 4(r3) -/* 800AFAE4 000ACA44 4E 80 00 20 */ blr +/* 800AFAE4 000ACA44 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR12CScriptTimer" "Visit__19TCastToPtr<6CActor>FR12CScriptTimer": /* 800AFAE8 000ACA48 38 00 00 00 */ li r0, 0 /* 800AFAEC 000ACA4C 90 03 00 04 */ stw r0, 4(r3) -/* 800AFAF0 000ACA50 4E 80 00 20 */ blr +/* 800AFAF0 000ACA50 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR10CTeamAiMgr" "Visit__19TCastToPtr<6CActor>FR10CTeamAiMgr": /* 800AFAF4 000ACA54 38 00 00 00 */ li r0, 0 /* 800AFAF8 000ACA58 90 03 00 04 */ stw r0, 4(r3) -/* 800AFAFC 000ACA5C 4E 80 00 20 */ blr +/* 800AFAFC 000ACA5C 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR21CScriptTargetingPoint" "Visit__19TCastToPtr<6CActor>FR21CScriptTargetingPoint": /* 800AFB00 000ACA60 90 83 00 04 */ stw r4, 4(r3) -/* 800AFB04 000ACA64 4E 80 00 20 */ blr +/* 800AFB04 000ACA64 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR25CScriptSpiderBallWaypoint" "Visit__19TCastToPtr<6CActor>FR25CScriptSpiderBallWaypoint": /* 800AFB08 000ACA68 90 83 00 04 */ stw r4, 4(r3) -/* 800AFB0C 000ACA6C 4E 80 00 20 */ blr +/* 800AFB0C 000ACA6C 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR34CScriptSpiderBallAttractionSurface" "Visit__19TCastToPtr<6CActor>FR34CScriptSpiderBallAttractionSurface": /* 800AFB10 000ACA70 90 83 00 04 */ stw r4, 4(r3) -/* 800AFB14 000ACA74 4E 80 00 20 */ blr +/* 800AFB14 000ACA74 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR22CScriptSpecialFunction" "Visit__19TCastToPtr<6CActor>FR22CScriptSpecialFunction": /* 800AFB18 000ACA78 90 83 00 04 */ stw r4, 4(r3) -/* 800AFB1C 000ACA7C 4E 80 00 20 */ blr +/* 800AFB1C 000ACA7C 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR17CScriptSpawnPoint" "Visit__19TCastToPtr<6CActor>FR17CScriptSpawnPoint": /* 800AFB20 000ACA80 38 00 00 00 */ li r0, 0 /* 800AFB24 000ACA84 90 03 00 04 */ stw r0, 4(r3) -/* 800AFB28 000ACA88 4E 80 00 20 */ blr +/* 800AFB28 000ACA88 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR12CScriptSound" "Visit__19TCastToPtr<6CActor>FR12CScriptSound": /* 800AFB2C 000ACA8C 90 83 00 04 */ stw r4, 4(r3) -/* 800AFB30 000ACA90 4E 80 00 20 */ blr +/* 800AFB30 000ACA90 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR20CScriptRoomAcoustics" "Visit__19TCastToPtr<6CActor>FR20CScriptRoomAcoustics": /* 800AFB34 000ACA94 38 00 00 00 */ li r0, 0 /* 800AFB38 000ACA98 90 03 00 04 */ stw r0, 4(r3) -/* 800AFB3C 000ACA9C 4E 80 00 20 */ blr +/* 800AFB3C 000ACA9C 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR22CScriptPointOfInterest" "Visit__19TCastToPtr<6CActor>FR22CScriptPointOfInterest": /* 800AFB40 000ACAA0 90 83 00 04 */ stw r4, 4(r3) -/* 800AFB44 000ACAA4 4E 80 00 20 */ blr +/* 800AFB44 000ACAA4 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR17CScriptPlayerHint" "Visit__19TCastToPtr<6CActor>FR17CScriptPlayerHint": /* 800AFB48 000ACAA8 90 83 00 04 */ stw r4, 4(r3) -/* 800AFB4C 000ACAAC 4E 80 00 20 */ blr +/* 800AFB4C 000ACAAC 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR15CScriptPlatform" "Visit__19TCastToPtr<6CActor>FR15CScriptPlatform": /* 800AFB50 000ACAB0 90 83 00 04 */ stw r4, 4(r3) -/* 800AFB54 000ACAB4 4E 80 00 20 */ blr +/* 800AFB54 000ACAB4 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR13CScriptPickup" "Visit__19TCastToPtr<6CActor>FR13CScriptPickup": /* 800AFB58 000ACAB8 90 83 00 04 */ stw r4, 4(r3) -/* 800AFB5C 000ACABC 4E 80 00 20 */ blr +/* 800AFB5C 000ACABC 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR15CScriptMazeNode" "Visit__19TCastToPtr<6CActor>FR15CScriptMazeNode": /* 800AFB60 000ACAC0 90 83 00 04 */ stw r4, 4(r3) -/* 800AFB64 000ACAC4 4E 80 00 20 */ blr +/* 800AFB64 000ACAC4 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR16CScriptGunTurret" "Visit__19TCastToPtr<6CActor>FR16CScriptGunTurret": /* 800AFB68 000ACAC8 90 83 00 04 */ stw r4, 4(r3) -/* 800AFB6C 000ACACC 4E 80 00 20 */ blr +/* 800AFB6C 000ACACC 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR19CScriptGrapplePoint" "Visit__19TCastToPtr<6CActor>FR19CScriptGrapplePoint": /* 800AFB70 000ACAD0 90 83 00 04 */ stw r4, 4(r3) -/* 800AFB74 000ACAD4 4E 80 00 20 */ blr +/* 800AFB74 000ACAD4 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR13CScriptEffect" "Visit__19TCastToPtr<6CActor>FR13CScriptEffect": /* 800AFB78 000ACAD8 90 83 00 04 */ stw r4, 4(r3) -/* 800AFB7C 000ACADC 4E 80 00 20 */ blr +/* 800AFB7C 000ACADC 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR11CScriptDoor" "Visit__19TCastToPtr<6CActor>FR11CScriptDoor": /* 800AFB80 000ACAE0 90 83 00 04 */ stw r4, 4(r3) -/* 800AFB84 000ACAE4 4E 80 00 20 */ blr +/* 800AFB84 000ACAE4 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR11CScriptDock" "Visit__19TCastToPtr<6CActor>FR11CScriptDock": /* 800AFB88 000ACAE8 90 83 00 04 */ stw r4, 4(r3) -/* 800AFB8C 000ACAEC 4E 80 00 20 */ blr +/* 800AFB8C 000ACAEC 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR18CScriptDistanceFog" "Visit__19TCastToPtr<6CActor>FR18CScriptDistanceFog": /* 800AFB90 000ACAF0 38 00 00 00 */ li r0, 0 /* 800AFB94 000ACAF4 90 03 00 04 */ stw r0, 4(r3) -/* 800AFB98 000ACAF8 4E 80 00 20 */ blr +/* 800AFB98 000ACAF8 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR26CScriptDebugCameraWaypoint" "Visit__19TCastToPtr<6CActor>FR26CScriptDebugCameraWaypoint": /* 800AFB9C 000ACAFC 90 83 00 04 */ stw r4, 4(r3) -/* 800AFBA0 000ACB00 4E 80 00 20 */ blr +/* 800AFBA0 000ACB00 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR17CScriptCoverPoint" "Visit__19TCastToPtr<6CActor>FR17CScriptCoverPoint": /* 800AFBA4 000ACB04 90 83 00 04 */ stw r4, 4(r3) -/* 800AFBA8 000ACB08 4E 80 00 20 */ blr +/* 800AFBA8 000ACB08 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR21CScriptCameraWaypoint" "Visit__19TCastToPtr<6CActor>FR21CScriptCameraWaypoint": /* 800AFBAC 000ACB0C 90 83 00 04 */ stw r4, 4(r3) -/* 800AFBB0 000ACB10 4E 80 00 20 */ blr +/* 800AFBB0 000ACB10 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR24CScriptCameraPitchVolume" "Visit__19TCastToPtr<6CActor>FR24CScriptCameraPitchVolume": /* 800AFBB4 000ACB14 90 83 00 04 */ stw r4, 4(r3) -/* 800AFBB8 000ACB18 4E 80 00 20 */ blr +/* 800AFBB8 000ACB18 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR17CScriptCameraHint" "Visit__19TCastToPtr<6CActor>FR17CScriptCameraHint": /* 800AFBBC 000ACB1C 90 83 00 04 */ stw r4, 4(r3) -/* 800AFBC0 000ACB20 4E 80 00 20 */ blr +/* 800AFBC0 000ACB20 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR18CScriptAiJumpPoint" "Visit__19TCastToPtr<6CActor>FR18CScriptAiJumpPoint": /* 800AFBC4 000ACB24 90 83 00 04 */ stw r4, 4(r3) -/* 800AFBC8 000ACB28 4E 80 00 20 */ blr +/* 800AFBC8 000ACB28 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR20CScriptActorKeyframe" "Visit__19TCastToPtr<6CActor>FR20CScriptActorKeyframe": /* 800AFBCC 000ACB2C 38 00 00 00 */ li r0, 0 /* 800AFBD0 000ACB30 90 03 00 04 */ stw r0, 4(r3) -/* 800AFBD4 000ACB34 4E 80 00 20 */ blr +/* 800AFBD4 000ACB34 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR12CScriptActor" "Visit__19TCastToPtr<6CActor>FR12CScriptActor": /* 800AFBD8 000ACB38 90 83 00 04 */ stw r4, 4(r3) -/* 800AFBDC 000ACB3C 4E 80 00 20 */ blr +/* 800AFBDC 000ACB3C 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR9CRepulsor" "Visit__19TCastToPtr<6CActor>FR9CRepulsor": /* 800AFBE0 000ACB40 90 83 00 04 */ stw r4, 4(r3) -/* 800AFBE4 000ACB44 4E 80 00 20 */ blr +/* 800AFBE4 000ACB44 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR7CPlayer" "Visit__19TCastToPtr<6CActor>FR7CPlayer": /* 800AFBE8 000ACB48 90 83 00 04 */ stw r4, 4(r3) -/* 800AFBEC 000ACB4C 4E 80 00 20 */ blr +/* 800AFBEC 000ACB4C 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR13CPhysicsActor" "Visit__19TCastToPtr<6CActor>FR13CPhysicsActor": /* 800AFBF0 000ACB50 90 83 00 04 */ stw r4, 4(r3) -/* 800AFBF4 000ACB54 4E 80 00 20 */ blr +/* 800AFBF4 000ACB54 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR3CAi" "Visit__19TCastToPtr<6CActor>FR3CAi": /* 800AFBF8 000ACB58 90 83 00 04 */ stw r4, 4(r3) -/* 800AFBFC 000ACB5C 4E 80 00 20 */ blr +/* 800AFBFC 000ACB5C 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR11CPathCamera" "Visit__19TCastToPtr<6CActor>FR11CPathCamera": /* 800AFC00 000ACB60 90 83 00 04 */ stw r4, 4(r3) -/* 800AFC04 000ACB64 4E 80 00 20 */ blr +/* 800AFC04 000ACB64 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR18CMetroidPrimeRelay" "Visit__19TCastToPtr<6CActor>FR18CMetroidPrimeRelay": /* 800AFC08 000ACB68 38 00 00 00 */ li r0, 0 /* 800AFC0C 000ACB6C 90 03 00 04 */ stw r0, 4(r3) -/* 800AFC10 000ACB70 4E 80 00 20 */ blr +/* 800AFC10 000ACB70 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR19CHUDBillboardEffect" "Visit__19TCastToPtr<6CActor>FR19CHUDBillboardEffect": /* 800AFC14 000ACB74 90 83 00 04 */ stw r4, 4(r3) -/* 800AFC18 000ACB78 4E 80 00 20 */ blr +/* 800AFC18 000ACB78 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR15CGameProjectile" "Visit__19TCastToPtr<6CActor>FR15CGameProjectile": /* 800AFC1C 000ACB7C 90 83 00 04 */ stw r4, 4(r3) -/* 800AFC20 000ACB80 4E 80 00 20 */ blr +/* 800AFC20 000ACB80 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR10CGameLight" "Visit__19TCastToPtr<6CActor>FR10CGameLight": /* 800AFC24 000ACB84 90 83 00 04 */ stw r4, 4(r3) -/* 800AFC28 000ACB88 4E 80 00 20 */ blr +/* 800AFC28 000ACB88 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR11CGameCamera" "Visit__19TCastToPtr<6CActor>FR11CGameCamera": /* 800AFC2C 000ACB8C 90 83 00 04 */ stw r4, 4(r3) -/* 800AFC30 000ACB90 4E 80 00 20 */ blr +/* 800AFC30 000ACB90 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR10CFishCloud" "Visit__19TCastToPtr<6CActor>FR10CFishCloud": /* 800AFC34 000ACB94 90 83 00 04 */ stw r4, 4(r3) -/* 800AFC38 000ACB98 4E 80 00 20 */ blr +/* 800AFC38 000ACB98 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR18CFirstPersonCamera" "Visit__19TCastToPtr<6CActor>FR18CFirstPersonCamera": /* 800AFC3C 000ACB9C 90 83 00 04 */ stw r4, 4(r3) -/* 800AFC40 000ACBA0 4E 80 00 20 */ blr +/* 800AFC40 000ACBA0 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR10CExplosion" "Visit__19TCastToPtr<6CActor>FR10CExplosion": /* 800AFC44 000ACBA4 90 83 00 04 */ stw r4, 4(r3) -/* 800AFC48 000ACBA8 4E 80 00 20 */ blr +/* 800AFC48 000ACBA8 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR7CEntity" "Visit__19TCastToPtr<6CActor>FR7CEntity": /* 800AFC4C 000ACBAC 38 00 00 00 */ li r0, 0 /* 800AFC50 000ACBB0 90 03 00 04 */ stw r0, 4(r3) -/* 800AFC54 000ACBB4 4E 80 00 20 */ blr +/* 800AFC54 000ACBB4 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR17CEnergyProjectile" "Visit__19TCastToPtr<6CActor>FR17CEnergyProjectile": /* 800AFC58 000ACBB8 90 83 00 04 */ stw r4, 4(r3) -/* 800AFC5C 000ACBBC 4E 80 00 20 */ blr +/* 800AFC5C 000ACBBC 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR16CDestroyableRock" "Visit__19TCastToPtr<6CActor>FR16CDestroyableRock": /* 800AFC60 000ACBC0 90 83 00 04 */ stw r4, 4(r3) -/* 800AFC64 000ACBC4 4E 80 00 20 */ blr +/* 800AFC64 000ACBC4 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR15CCollisionActor" "Visit__19TCastToPtr<6CActor>FR15CCollisionActor": /* 800AFC68 000ACBC8 90 83 00 04 */ stw r4, 4(r3) -/* 800AFC6C 000ACBCC 4E 80 00 20 */ blr +/* 800AFC6C 000ACBCC 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR16CCinematicCamera" "Visit__19TCastToPtr<6CActor>FR16CCinematicCamera": /* 800AFC70 000ACBD0 90 83 00 04 */ stw r4, 4(r3) -/* 800AFC74 000ACBD4 4E 80 00 20 */ blr +/* 800AFC74 000ACBD4 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR5CBomb" "Visit__19TCastToPtr<6CActor>FR5CBomb": /* 800AFC78 000ACBD8 90 83 00 04 */ stw r4, 4(r3) -/* 800AFC7C 000ACBDC 4E 80 00 20 */ blr +/* 800AFC7C 000ACBDC 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR11CBallCamera" "Visit__19TCastToPtr<6CActor>FR11CBallCamera": /* 800AFC80 000ACBE0 90 83 00 04 */ stw r4, 4(r3) -/* 800AFC84 000ACBE4 4E 80 00 20 */ blr +/* 800AFC84 000ACBE4 4E 80 00 20 */ blr .global "Visit__19TCastToPtr<6CActor>FR6CActor" "Visit__19TCastToPtr<6CActor>FR6CActor": /* 800AFC88 000ACBE8 90 83 00 04 */ stw r4, 4(r3) -/* 800AFC8C 000ACBEC 4E 80 00 20 */ blr +/* 800AFC8C 000ACBEC 4E 80 00 20 */ blr .global "__ct__19TCastToPtr<6CActor>FP7CEntity" "__ct__19TCastToPtr<6CActor>FP7CEntity": @@ -23403,14 +23403,14 @@ lbl_800AFA90: /* 800AFCD4 000ACC34 81 83 00 00 */ lwz r12, 0(r3) /* 800AFCD8 000ACC38 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800AFCDC 000ACC3C 7D 89 03 A6 */ mtctr r12 -/* 800AFCE0 000ACC40 4E 80 04 21 */ bctrl +/* 800AFCE0 000ACC40 4E 80 04 21 */ bctrl lbl_800AFCE4: /* 800AFCE4 000ACC44 80 01 00 14 */ lwz r0, 0x14(r1) /* 800AFCE8 000ACC48 7F E3 FB 78 */ mr r3, r31 /* 800AFCEC 000ACC4C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800AFCF0 000ACC50 7C 08 03 A6 */ mtlr r0 /* 800AFCF4 000ACC54 38 21 00 10 */ addi r1, r1, 0x10 -/* 800AFCF8 000ACC58 4E 80 00 20 */ blr +/* 800AFCF8 000ACC58 4E 80 00 20 */ blr .global "__ct__19TCastToPtr<6CActor>FR7CEntity" "__ct__19TCastToPtr<6CActor>FR7CEntity": @@ -23432,7 +23432,7 @@ lbl_800AFCE4: /* 800AFD38 000ACC98 81 83 00 00 */ lwz r12, 0(r3) /* 800AFD3C 000ACC9C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800AFD40 000ACCA0 7D 89 03 A6 */ mtctr r12 -/* 800AFD44 000ACCA4 4E 80 04 21 */ bctrl +/* 800AFD44 000ACCA4 4E 80 04 21 */ bctrl /* 800AFD48 000ACCA8 80 01 00 14 */ lwz r0, 0x14(r1) /* 800AFD4C 000ACCAC 7F E3 FB 78 */ mr r3, r31 /* 800AFD50 000ACCB0 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/MetroidPrime/TGameTypes.s b/asm/MetroidPrime/TGameTypes.s index 2a34978a..5b2b1266 100644 --- a/asm/MetroidPrime/TGameTypes.s +++ b/asm/MetroidPrime/TGameTypes.s @@ -33,7 +33,7 @@ __ct__9TEditorIdFR12CInputStream: /* 8011A488 001173E8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8011A48C 001173EC 7C 08 03 A6 */ mtlr r0 /* 8011A490 001173F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011A494 001173F4 4E 80 00 20 */ blr +/* 8011A494 001173F4 4E 80 00 20 */ blr .global __sinit_TGameTypes_cpp __sinit_TGameTypes_cpp: diff --git a/asm/MetroidPrime/Tweaks/CTweakAutoMapper.s b/asm/MetroidPrime/Tweaks/CTweakAutoMapper.s index 2075b584..c024121e 100644 --- a/asm/MetroidPrime/Tweaks/CTweakAutoMapper.s +++ b/asm/MetroidPrime/Tweaks/CTweakAutoMapper.s @@ -289,7 +289,7 @@ lbl_800B6D60: /* 800B6DD4 000B3D34 83 81 00 10 */ lwz r28, 0x10(r1) /* 800B6DD8 000B3D38 7C 08 03 A6 */ mtlr r0 /* 800B6DDC 000B3D3C 38 21 00 30 */ addi r1, r1, 0x30 -/* 800B6DE0 000B3D40 4E 80 00 20 */ blr +/* 800B6DE0 000B3D40 4E 80 00 20 */ blr .global __dt__16CTweakAutoMapperFv __dt__16CTweakAutoMapperFv: @@ -346,7 +346,7 @@ lbl_800B6E88: /* 800B6E90 000B3DF0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800B6E94 000B3DF4 7C 08 03 A6 */ mtlr r0 /* 800B6E98 000B3DF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B6E9C 000B3DFC 4E 80 00 20 */ blr +/* 800B6E9C 000B3DFC 4E 80 00 20 */ blr .global "__dl__30TOneStatic<16CTweakAutoMapper>FPv" "__dl__30TOneStatic<16CTweakAutoMapper>FPv": @@ -360,4 +360,4 @@ lbl_800B6E88: /* 800B6EBC 000B3E1C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800B6EC0 000B3E20 7C 08 03 A6 */ mtlr r0 /* 800B6EC4 000B3E24 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B6EC8 000B3E28 4E 80 00 20 */ blr +/* 800B6EC8 000B3E28 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/Tweaks/CTweakBall.s b/asm/MetroidPrime/Tweaks/CTweakBall.s index 818940e9..0022a2a4 100644 --- a/asm/MetroidPrime/Tweaks/CTweakBall.s +++ b/asm/MetroidPrime/Tweaks/CTweakBall.s @@ -409,7 +409,7 @@ lbl_80090CA0: /* 80091164 0008E0C4 83 81 00 30 */ lwz r28, 0x30(r1) /* 80091168 0008E0C8 7C 08 03 A6 */ mtlr r0 /* 8009116C 0008E0CC 38 21 00 40 */ addi r1, r1, 0x40 -/* 80091170 0008E0D0 4E 80 00 20 */ blr +/* 80091170 0008E0D0 4E 80 00 20 */ blr .global __dt__10CTweakBallFv __dt__10CTweakBallFv: @@ -437,7 +437,7 @@ lbl_800911B8: /* 800911C0 0008E120 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800911C4 0008E124 7C 08 03 A6 */ mtlr r0 /* 800911C8 0008E128 38 21 00 10 */ addi r1, r1, 0x10 -/* 800911CC 0008E12C 4E 80 00 20 */ blr +/* 800911CC 0008E12C 4E 80 00 20 */ blr .global "__dl__24TOneStatic<10CTweakBall>FPv" "__dl__24TOneStatic<10CTweakBall>FPv": @@ -451,4 +451,4 @@ lbl_800911B8: /* 800911EC 0008E14C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800911F0 0008E150 7C 08 03 A6 */ mtlr r0 /* 800911F4 0008E154 38 21 00 10 */ addi r1, r1, 0x10 -/* 800911F8 0008E158 4E 80 00 20 */ blr +/* 800911F8 0008E158 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/Tweaks/CTweakGame.s b/asm/MetroidPrime/Tweaks/CTweakGame.s index a93e8835..170a17d7 100644 --- a/asm/MetroidPrime/Tweaks/CTweakGame.s +++ b/asm/MetroidPrime/Tweaks/CTweakGame.s @@ -8,7 +8,7 @@ lbl_803D9CD0: .4byte 0 .4byte __dt__10CTweakGameFv .4byte 0 - + .section .text, "ax" .global __ct__10CTweakGameFR12CInputStream @@ -101,7 +101,7 @@ __ct__10CTweakGameFR12CInputStream: /* 80037338 00034298 80 01 00 24 */ lwz r0, 0x24(r1) /* 8003733C 0003429C 7C 08 03 A6 */ mtlr r0 /* 80037340 000342A0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80037344 000342A4 4E 80 00 20 */ blr +/* 80037344 000342A4 4E 80 00 20 */ blr .global __dt__10CTweakGameFv __dt__10CTweakGameFv: @@ -143,7 +143,7 @@ lbl_800373B8: /* 800373C4 00034324 83 C1 00 08 */ lwz r30, 8(r1) /* 800373C8 00034328 7C 08 03 A6 */ mtlr r0 /* 800373CC 0003432C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800373D0 00034330 4E 80 00 20 */ blr +/* 800373D0 00034330 4E 80 00 20 */ blr .global "__dl__24TOneStatic<10CTweakGame>FPv" "__dl__24TOneStatic<10CTweakGame>FPv": @@ -157,4 +157,4 @@ lbl_800373B8: /* 800373F0 00034350 80 01 00 14 */ lwz r0, 0x14(r1) /* 800373F4 00034354 7C 08 03 A6 */ mtlr r0 /* 800373F8 00034358 38 21 00 10 */ addi r1, r1, 0x10 -/* 800373FC 0003435C 4E 80 00 20 */ blr +/* 800373FC 0003435C 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/Tweaks/CTweakGui.s b/asm/MetroidPrime/Tweaks/CTweakGui.s index cbadd0a6..e20323e3 100644 --- a/asm/MetroidPrime/Tweaks/CTweakGui.s +++ b/asm/MetroidPrime/Tweaks/CTweakGui.s @@ -9,7 +9,7 @@ lbl_803DA440: .4byte 0 .4byte __dt__9CTweakGuiFv .4byte 0 - + .section .text, "ax" .global FaceReflectionOrthoHeightDebugValueToActualValue__9CTweakGuiFf @@ -17,35 +17,35 @@ FaceReflectionOrthoHeightDebugValueToActualValue__9CTweakGuiFf: /* 80074310 00071270 C0 42 88 74 */ lfs f2, lbl_805AA594@sda21(r2) /* 80074314 00071274 C0 02 88 70 */ lfs f0, lbl_805AA590@sda21(r2) /* 80074318 00071278 EC 22 00 7A */ fmadds f1, f2, f1, f0 -/* 8007431C 0007127C 4E 80 00 20 */ blr +/* 8007431C 0007127C 4E 80 00 20 */ blr .global FaceReflectionOrthoWidthDebugValueToActualValue__9CTweakGuiFf FaceReflectionOrthoWidthDebugValueToActualValue__9CTweakGuiFf: /* 80074320 00071280 C0 42 88 74 */ lfs f2, lbl_805AA594@sda21(r2) /* 80074324 00071284 C0 02 88 70 */ lfs f0, lbl_805AA590@sda21(r2) /* 80074328 00071288 EC 22 00 7A */ fmadds f1, f2, f1, f0 -/* 8007432C 0007128C 4E 80 00 20 */ blr +/* 8007432C 0007128C 4E 80 00 20 */ blr .global FaceReflectionAspectDebugValueToActualValue__9CTweakGuiFf FaceReflectionAspectDebugValueToActualValue__9CTweakGuiFf: /* 80074330 00071290 C0 42 88 7C */ lfs f2, lbl_805AA59C@sda21(r2) /* 80074334 00071294 C0 02 88 78 */ lfs f0, lbl_805AA598@sda21(r2) /* 80074338 00071298 EC 22 00 7A */ fmadds f1, f2, f1, f0 -/* 8007433C 0007129C 4E 80 00 20 */ blr +/* 8007433C 0007129C 4E 80 00 20 */ blr .global FaceReflectionHeightDebugValueToActualValue__9CTweakGuiFf FaceReflectionHeightDebugValueToActualValue__9CTweakGuiFf: /* 80074340 000712A0 C0 42 88 80 */ lfs f2, lbl_805AA5A0@sda21(r2) /* 80074344 000712A4 C0 02 88 7C */ lfs f0, lbl_805AA59C@sda21(r2) /* 80074348 000712A8 EC 22 00 78 */ fmsubs f1, f2, f1, f0 -/* 8007434C 000712AC 4E 80 00 20 */ blr +/* 8007434C 000712AC 4E 80 00 20 */ blr .global FaceReflectionDistanceDebugValueToActualValue__9CTweakGuiFf FaceReflectionDistanceDebugValueToActualValue__9CTweakGuiFf: /* 80074350 000712B0 C0 42 88 88 */ lfs f2, lbl_805AA5A8@sda21(r2) /* 80074354 000712B4 C0 02 88 84 */ lfs f0, lbl_805AA5A4@sda21(r2) /* 80074358 000712B8 EC 22 00 7A */ fmadds f1, f2, f1, f0 -/* 8007435C 000712BC 4E 80 00 20 */ blr +/* 8007435C 000712BC 4E 80 00 20 */ blr .global __ct__9CTweakGuiFR12CInputStream __ct__9CTweakGuiFR12CInputStream: @@ -721,7 +721,7 @@ lbl_80074C74: /* 80074DAC 00071D0C 80 01 00 74 */ lwz r0, 0x74(r1) /* 80074DB0 00071D10 7C 08 03 A6 */ mtlr r0 /* 80074DB4 00071D14 38 21 00 70 */ addi r1, r1, 0x70 -/* 80074DB8 00071D18 4E 80 00 20 */ blr +/* 80074DB8 00071D18 4E 80 00 20 */ blr .global __dt__9CTweakGuiFv __dt__9CTweakGuiFv: @@ -836,7 +836,7 @@ lbl_80074F18: /* 80074F24 00071E84 83 C1 00 08 */ lwz r30, 8(r1) /* 80074F28 00071E88 7C 08 03 A6 */ mtlr r0 /* 80074F2C 00071E8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80074F30 00071E90 4E 80 00 20 */ blr +/* 80074F30 00071E90 4E 80 00 20 */ blr .global "__dl__22TOneStatic<9CTweakGui>FPv" "__dl__22TOneStatic<9CTweakGui>FPv": @@ -850,4 +850,4 @@ lbl_80074F18: /* 80074F50 00071EB0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80074F54 00071EB4 7C 08 03 A6 */ mtlr r0 /* 80074F58 00071EB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80074F5C 00071EBC 4E 80 00 20 */ blr +/* 80074F5C 00071EBC 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/Tweaks/CTweakGuiColors.s b/asm/MetroidPrime/Tweaks/CTweakGuiColors.s index 75cd1ade..ccf6615d 100644 --- a/asm/MetroidPrime/Tweaks/CTweakGuiColors.s +++ b/asm/MetroidPrime/Tweaks/CTweakGuiColors.s @@ -371,7 +371,7 @@ __ct__15CTweakGuiColorsFR12CInputStream: /* 801CDFB4 001CAF14 83 C1 00 08 */ lwz r30, 8(r1) /* 801CDFB8 001CAF18 7C 08 03 A6 */ mtlr r0 /* 801CDFBC 001CAF1C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CDFC0 001CAF20 4E 80 00 20 */ blr +/* 801CDFC0 001CAF20 4E 80 00 20 */ blr .global sub_801cdfc4 sub_801cdfc4: @@ -443,7 +443,7 @@ lbl_801CE0A8: /* 801CE0BC 001CB01C 80 01 00 54 */ lwz r0, 0x54(r1) /* 801CE0C0 001CB020 7C 08 03 A6 */ mtlr r0 /* 801CE0C4 001CB024 38 21 00 50 */ addi r1, r1, 0x50 -/* 801CE0C8 001CB028 4E 80 00 20 */ blr +/* 801CE0C8 001CB028 4E 80 00 20 */ blr .global __dt__15CTweakGuiColorsFv __dt__15CTweakGuiColorsFv: @@ -500,7 +500,7 @@ lbl_801CE170: /* 801CE178 001CB0D8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801CE17C 001CB0DC 7C 08 03 A6 */ mtlr r0 /* 801CE180 001CB0E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CE184 001CB0E4 4E 80 00 20 */ blr +/* 801CE184 001CB0E4 4E 80 00 20 */ blr .global "__dl__29TOneStatic<15CTweakGuiColors>FPv" "__dl__29TOneStatic<15CTweakGuiColors>FPv": diff --git a/asm/MetroidPrime/Tweaks/CTweakGunRes.s b/asm/MetroidPrime/Tweaks/CTweakGunRes.s index 58451039..a60f86cc 100644 --- a/asm/MetroidPrime/Tweaks/CTweakGunRes.s +++ b/asm/MetroidPrime/Tweaks/CTweakGunRes.s @@ -52,7 +52,7 @@ lbl_800BB9D0: lbl_800BB9DC: /* 800BB9DC 000B893C 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 800BB9E0 000B8940 38 21 00 30 */ addi r1, r1, 0x30 -/* 800BB9E4 000B8944 4E 80 00 20 */ blr +/* 800BB9E4 000B8944 4E 80 00 20 */ blr .global __ct__12CTweakGunResFR12CInputStream __ct__12CTweakGunResFR12CInputStream: @@ -452,7 +452,7 @@ lbl_800BBE8C: /* 800BBFC8 000B8F28 80 01 01 E4 */ lwz r0, 0x1e4(r1) /* 800BBFCC 000B8F2C 7C 08 03 A6 */ mtlr r0 /* 800BBFD0 000B8F30 38 21 01 E0 */ addi r1, r1, 0x1e0 -/* 800BBFD4 000B8F34 4E 80 00 20 */ blr +/* 800BBFD4 000B8F34 4E 80 00 20 */ blr .global __dt__12CTweakGunResFv __dt__12CTweakGunResFv: @@ -652,7 +652,7 @@ lbl_800BC268: /* 800BC274 000B91D4 83 C1 00 88 */ lwz r30, 0x88(r1) /* 800BC278 000B91D8 7C 08 03 A6 */ mtlr r0 /* 800BC27C 000B91DC 38 21 00 90 */ addi r1, r1, 0x90 -/* 800BC280 000B91E0 4E 80 00 20 */ blr +/* 800BC280 000B91E0 4E 80 00 20 */ blr .global "__dl__26TOneStatic<12CTweakGunRes>FPv" "__dl__26TOneStatic<12CTweakGunRes>FPv": @@ -666,4 +666,4 @@ lbl_800BC268: /* 800BC2A0 000B9200 80 01 00 14 */ lwz r0, 0x14(r1) /* 800BC2A4 000B9204 7C 08 03 A6 */ mtlr r0 /* 800BC2A8 000B9208 38 21 00 10 */ addi r1, r1, 0x10 -/* 800BC2AC 000B920C 4E 80 00 20 */ blr +/* 800BC2AC 000B920C 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/Tweaks/CTweakParticle.s b/asm/MetroidPrime/Tweaks/CTweakParticle.s index bc5e73a8..07ff16f6 100644 --- a/asm/MetroidPrime/Tweaks/CTweakParticle.s +++ b/asm/MetroidPrime/Tweaks/CTweakParticle.s @@ -9,7 +9,7 @@ lbl_803DA088: .4byte 0 .4byte __dt__14CTweakParticleFv .4byte 0 - + .section .text, "ax" .global __ct__14CTweakParticleFR12CInputStream @@ -44,7 +44,7 @@ __ct__14CTweakParticleFR12CInputStream: /* 80059F8C 00056EEC 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80059F90 00056EF0 7C 08 03 A6 */ mtlr r0 /* 80059F94 00056EF4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80059F98 00056EF8 4E 80 00 20 */ blr +/* 80059F98 00056EF8 4E 80 00 20 */ blr .global __dt__14CTweakParticleFv __dt__14CTweakParticleFv: @@ -91,7 +91,7 @@ lbl_8005A01C: /* 8005A028 00056F88 83 C1 00 08 */ lwz r30, 8(r1) /* 8005A02C 00056F8C 7C 08 03 A6 */ mtlr r0 /* 8005A030 00056F90 38 21 00 10 */ addi r1, r1, 0x10 -/* 8005A034 00056F94 4E 80 00 20 */ blr +/* 8005A034 00056F94 4E 80 00 20 */ blr .global "__dl__28TOneStatic<14CTweakParticle>FPv" "__dl__28TOneStatic<14CTweakParticle>FPv": @@ -105,4 +105,4 @@ lbl_8005A01C: /* 8005A054 00056FB4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8005A058 00056FB8 7C 08 03 A6 */ mtlr r0 /* 8005A05C 00056FBC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8005A060 00056FC0 4E 80 00 20 */ blr +/* 8005A060 00056FC0 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/Tweaks/CTweakPlayer.s b/asm/MetroidPrime/Tweaks/CTweakPlayer.s index 8b23d424..fbb76112 100644 --- a/asm/MetroidPrime/Tweaks/CTweakPlayer.s +++ b/asm/MetroidPrime/Tweaks/CTweakPlayer.s @@ -732,7 +732,7 @@ lbl_800354E0: /* 800358CC 0003282C 83 81 00 10 */ lwz r28, 0x10(r1) /* 800358D0 00032830 7C 08 03 A6 */ mtlr r0 /* 800358D4 00032834 38 21 00 20 */ addi r1, r1, 0x20 -/* 800358D8 00032838 4E 80 00 20 */ blr +/* 800358D8 00032838 4E 80 00 20 */ blr .global __dt__12CTweakPlayerFv __dt__12CTweakPlayerFv: @@ -760,7 +760,7 @@ lbl_80035920: /* 80035928 00032888 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8003592C 0003288C 7C 08 03 A6 */ mtlr r0 /* 80035930 00032890 38 21 00 10 */ addi r1, r1, 0x10 -/* 80035934 00032894 4E 80 00 20 */ blr +/* 80035934 00032894 4E 80 00 20 */ blr .global "__dl__26TOneStatic<12CTweakPlayer>FPv" "__dl__26TOneStatic<12CTweakPlayer>FPv": @@ -774,7 +774,7 @@ lbl_80035920: /* 80035954 000328B4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80035958 000328B8 7C 08 03 A6 */ mtlr r0 /* 8003595C 000328BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80035960 000328C0 4E 80 00 20 */ blr +/* 80035960 000328C0 4E 80 00 20 */ blr .global "ReferenceCount__26TOneStatic<12CTweakPlayer>Fv" "ReferenceCount__26TOneStatic<12CTweakPlayer>Fv": @@ -787,4 +787,4 @@ lbl_80035920: /* 8003597C 000328DC 98 0D A1 14 */ stb r0, lbl_805A8CD4@sda21(r13) lbl_80035980: /* 80035980 000328E0 38 6D A1 10 */ addi r3, r13, lbl_805A8CD0@sda21 -/* 80035984 000328E4 4E 80 00 20 */ blr +/* 80035984 000328E4 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/Tweaks/CTweakPlayerControl.s b/asm/MetroidPrime/Tweaks/CTweakPlayerControl.s index 58e84c83..38171228 100644 --- a/asm/MetroidPrime/Tweaks/CTweakPlayerControl.s +++ b/asm/MetroidPrime/Tweaks/CTweakPlayerControl.s @@ -9,7 +9,7 @@ lbl_803DA350: .4byte 0 .4byte __dt__19CTweakPlayerControlFv .4byte 0 - + .section .text, "ax" .global GetMapping__19CTweakPlayerControlCFQ213ControlMapper9ECommands @@ -20,12 +20,12 @@ GetMapping__19CTweakPlayerControlCFQ213ControlMapper9ECommands: /* 8006F960 0006C8C0 40 81 00 0C */ ble lbl_8006F96C lbl_8006F964: /* 8006F964 0006C8C4 80 63 00 08 */ lwz r3, 8(r3) -/* 8006F968 0006C8C8 4E 80 00 20 */ blr +/* 8006F968 0006C8C8 4E 80 00 20 */ blr lbl_8006F96C: /* 8006F96C 0006C8CC 54 80 10 3A */ slwi r0, r4, 2 /* 8006F970 0006C8D0 7C 63 02 14 */ add r3, r3, r0 /* 8006F974 0006C8D4 80 63 00 08 */ lwz r3, 8(r3) -/* 8006F978 0006C8D8 4E 80 00 20 */ blr +/* 8006F978 0006C8D8 4E 80 00 20 */ blr .global __ct__19CTweakPlayerControlFR12CInputStream __ct__19CTweakPlayerControlFR12CInputStream: @@ -90,7 +90,7 @@ lbl_8006FA38: /* 8006FA48 0006C9A8 80 01 01 24 */ lwz r0, 0x124(r1) /* 8006FA4C 0006C9AC 7C 08 03 A6 */ mtlr r0 /* 8006FA50 0006C9B0 38 21 01 20 */ addi r1, r1, 0x120 -/* 8006FA54 0006C9B4 4E 80 00 20 */ blr +/* 8006FA54 0006C9B4 4E 80 00 20 */ blr .global LoadMappings__FR12CInputStream LoadMappings__FR12CInputStream: @@ -170,7 +170,7 @@ lbl_8006FB40: /* 8006FB58 0006CAB8 83 81 01 20 */ lwz r28, 0x120(r1) /* 8006FB5C 0006CABC 7C 08 03 A6 */ mtlr r0 /* 8006FB60 0006CAC0 38 21 01 30 */ addi r1, r1, 0x130 -/* 8006FB64 0006CAC4 4E 80 00 20 */ blr +/* 8006FB64 0006CAC4 4E 80 00 20 */ blr .global __dt__19CTweakPlayerControlFv __dt__19CTweakPlayerControlFv: @@ -227,4 +227,4 @@ lbl_8006FC0C: /* 8006FC14 0006CB74 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8006FC18 0006CB78 7C 08 03 A6 */ mtlr r0 /* 8006FC1C 0006CB7C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8006FC20 0006CB80 4E 80 00 20 */ blr +/* 8006FC20 0006CB80 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/Tweaks/CTweakPlayerGun.s b/asm/MetroidPrime/Tweaks/CTweakPlayerGun.s index 83278767..b3a82541 100644 --- a/asm/MetroidPrime/Tweaks/CTweakPlayerGun.s +++ b/asm/MetroidPrime/Tweaks/CTweakPlayerGun.s @@ -39,28 +39,28 @@ GetRichochetDamage__15CTweakPlayerGunCF11EWeaponType: /* 8006FC34 0006CB94 38 85 A3 60 */ addi r4, r5, lbl_803DA360@l /* 8006FC38 0006CB98 7C 04 00 2E */ lwzx r0, r4, r0 /* 8006FC3C 0006CB9C 7C 09 03 A6 */ mtctr r0 -/* 8006FC40 0006CBA0 4E 80 04 20 */ bctr +/* 8006FC40 0006CBA0 4E 80 04 20 */ bctr lbl_8006FC44: /* 8006FC44 0006CBA4 C0 23 02 84 */ lfs f1, 0x284(r3) -/* 8006FC48 0006CBA8 4E 80 00 20 */ blr +/* 8006FC48 0006CBA8 4E 80 00 20 */ blr lbl_8006FC4C: /* 8006FC4C 0006CBAC C0 23 02 88 */ lfs f1, 0x288(r3) -/* 8006FC50 0006CBB0 4E 80 00 20 */ blr +/* 8006FC50 0006CBB0 4E 80 00 20 */ blr lbl_8006FC54: /* 8006FC54 0006CBB4 C0 23 02 8C */ lfs f1, 0x28c(r3) -/* 8006FC58 0006CBB8 4E 80 00 20 */ blr +/* 8006FC58 0006CBB8 4E 80 00 20 */ blr lbl_8006FC5C: /* 8006FC5C 0006CBBC C0 23 02 90 */ lfs f1, 0x290(r3) -/* 8006FC60 0006CBC0 4E 80 00 20 */ blr +/* 8006FC60 0006CBC0 4E 80 00 20 */ blr lbl_8006FC64: /* 8006FC64 0006CBC4 C0 23 02 94 */ lfs f1, 0x294(r3) -/* 8006FC68 0006CBC8 4E 80 00 20 */ blr +/* 8006FC68 0006CBC8 4E 80 00 20 */ blr lbl_8006FC6C: /* 8006FC6C 0006CBCC C0 23 02 98 */ lfs f1, 0x298(r3) -/* 8006FC70 0006CBD0 4E 80 00 20 */ blr +/* 8006FC70 0006CBD0 4E 80 00 20 */ blr lbl_8006FC74: /* 8006FC74 0006CBD4 C0 22 88 18 */ lfs f1, lbl_805AA538@sda21(r2) -/* 8006FC78 0006CBD8 4E 80 00 20 */ blr +/* 8006FC78 0006CBD8 4E 80 00 20 */ blr .global GetBeamInfo__15CTweakPlayerGunCFi GetBeamInfo__15CTweakPlayerGunCFi: @@ -102,7 +102,7 @@ lbl_8006FCF4: lbl_8006FD00: /* 8006FD00 0006CC60 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8006FD04 0006CC64 38 21 00 30 */ addi r1, r1, 0x30 -/* 8006FD08 0006CC68 4E 80 00 20 */ blr +/* 8006FD08 0006CC68 4E 80 00 20 */ blr .global sub_8006fd0c sub_8006fd0c: @@ -269,7 +269,7 @@ lbl_8006FD98: /* 8006FF88 0006CEE8 80 01 00 F4 */ lwz r0, 0xf4(r1) /* 8006FF8C 0006CEEC 7C 08 03 A6 */ mtlr r0 /* 8006FF90 0006CEF0 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 8006FF94 0006CEF4 4E 80 00 20 */ blr +/* 8006FF94 0006CEF4 4E 80 00 20 */ blr .global __ct__15CTweakPlayerGunFR12CInputStream __ct__15CTweakPlayerGunFR12CInputStream: @@ -907,7 +907,7 @@ lbl_80070904: /* 80070944 0006D8A4 80 01 01 D4 */ lwz r0, 0x1d4(r1) /* 80070948 0006D8A8 7C 08 03 A6 */ mtlr r0 /* 8007094C 0006D8AC 38 21 01 D0 */ addi r1, r1, 0x1d0 -/* 80070950 0006D8B0 4E 80 00 20 */ blr +/* 80070950 0006D8B0 4E 80 00 20 */ blr .global __dt__15CTweakPlayerGunFv __dt__15CTweakPlayerGunFv: @@ -992,7 +992,7 @@ lbl_80070A54: /* 80070A5C 0006D9BC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80070A60 0006D9C0 7C 08 03 A6 */ mtlr r0 /* 80070A64 0006D9C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80070A68 0006D9C8 4E 80 00 20 */ blr +/* 80070A68 0006D9C8 4E 80 00 20 */ blr .global "__dl__29TOneStatic<15CTweakPlayerGun>FPv" "__dl__29TOneStatic<15CTweakPlayerGun>FPv": @@ -1006,4 +1006,4 @@ lbl_80070A54: /* 80070A88 0006D9E8 80 01 00 14 */ lwz r0, 0x14(r1) /* 80070A8C 0006D9EC 7C 08 03 A6 */ mtlr r0 /* 80070A90 0006D9F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80070A94 0006D9F4 4E 80 00 20 */ blr +/* 80070A94 0006D9F4 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/Tweaks/CTweakPlayerRes.s b/asm/MetroidPrime/Tweaks/CTweakPlayerRes.s index e77563f7..364f9edc 100644 --- a/asm/MetroidPrime/Tweaks/CTweakPlayerRes.s +++ b/asm/MetroidPrime/Tweaks/CTweakPlayerRes.s @@ -20,12 +20,12 @@ GetCinematicBeamResId__15CTweakPlayerResCFQ212CPlayerState7EBeamId: /* 801AC21C 001A917C 40 81 00 0C */ ble lbl_801AC228 lbl_801AC220: /* 801AC220 001A9180 80 63 00 DC */ lwz r3, 0xdc(r3) -/* 801AC224 001A9184 4E 80 00 20 */ blr +/* 801AC224 001A9184 4E 80 00 20 */ blr lbl_801AC228: /* 801AC228 001A9188 54 80 10 3A */ slwi r0, r4, 2 /* 801AC22C 001A918C 7C 63 02 14 */ add r3, r3, r0 /* 801AC230 001A9190 80 63 00 DC */ lwz r3, 0xdc(r3) -/* 801AC234 001A9194 4E 80 00 20 */ blr +/* 801AC234 001A9194 4E 80 00 20 */ blr .global GetBallTransitionBeamResId__15CTweakPlayerResCFQ212CPlayerState7EBeamId GetBallTransitionBeamResId__15CTweakPlayerResCFQ212CPlayerState7EBeamId: @@ -35,12 +35,12 @@ GetBallTransitionBeamResId__15CTweakPlayerResCFQ212CPlayerState7EBeamId: /* 801AC244 001A91A4 40 81 00 0C */ ble lbl_801AC250 lbl_801AC248: /* 801AC248 001A91A8 80 63 00 C8 */ lwz r3, 0xc8(r3) -/* 801AC24C 001A91AC 4E 80 00 20 */ blr +/* 801AC24C 001A91AC 4E 80 00 20 */ blr lbl_801AC250: /* 801AC250 001A91B0 54 80 10 3A */ slwi r0, r4, 2 /* 801AC254 001A91B4 7C 63 02 14 */ add r3, r3, r0 /* 801AC258 001A91B8 80 63 00 C8 */ lwz r3, 0xc8(r3) -/* 801AC25C 001A91BC 4E 80 00 20 */ blr +/* 801AC25C 001A91BC 4E 80 00 20 */ blr .global __ct__15CTweakPlayerResFR12CInputStream __ct__15CTweakPlayerResFR12CInputStream: @@ -67,7 +67,7 @@ __ct__15CTweakPlayerResFR12CInputStream: /* 801AC2B0 001A9210 81 83 00 00 */ lwz r12, 0(r3) /* 801AC2B4 001A9214 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 801AC2B8 001A9218 7D 89 03 A6 */ mtctr r12 -/* 801AC2BC 001A921C 4E 80 04 21 */ bctrl +/* 801AC2BC 001A921C 4E 80 04 21 */ bctrl /* 801AC2C0 001A9220 80 03 00 04 */ lwz r0, 4(r3) /* 801AC2C4 001A9224 38 61 00 E4 */ addi r3, r1, 0xe4 /* 801AC2C8 001A9228 90 1E 00 04 */ stw r0, 4(r30) @@ -81,7 +81,7 @@ __ct__15CTweakPlayerResFR12CInputStream: /* 801AC2E8 001A9248 81 83 00 00 */ lwz r12, 0(r3) /* 801AC2EC 001A924C 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 801AC2F0 001A9250 7D 89 03 A6 */ mtctr r12 -/* 801AC2F4 001A9254 4E 80 04 21 */ bctrl +/* 801AC2F4 001A9254 4E 80 04 21 */ bctrl /* 801AC2F8 001A9258 80 03 00 04 */ lwz r0, 4(r3) /* 801AC2FC 001A925C 38 61 00 D4 */ addi r3, r1, 0xd4 /* 801AC300 001A9260 90 1E 00 08 */ stw r0, 8(r30) @@ -95,7 +95,7 @@ __ct__15CTweakPlayerResFR12CInputStream: /* 801AC320 001A9280 81 83 00 00 */ lwz r12, 0(r3) /* 801AC324 001A9284 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 801AC328 001A9288 7D 89 03 A6 */ mtctr r12 -/* 801AC32C 001A928C 4E 80 04 21 */ bctrl +/* 801AC32C 001A928C 4E 80 04 21 */ bctrl /* 801AC330 001A9290 80 03 00 04 */ lwz r0, 4(r3) /* 801AC334 001A9294 38 61 00 C4 */ addi r3, r1, 0xc4 /* 801AC338 001A9298 90 1E 00 0C */ stw r0, 0xc(r30) @@ -109,7 +109,7 @@ __ct__15CTweakPlayerResFR12CInputStream: /* 801AC358 001A92B8 81 83 00 00 */ lwz r12, 0(r3) /* 801AC35C 001A92BC 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 801AC360 001A92C0 7D 89 03 A6 */ mtctr r12 -/* 801AC364 001A92C4 4E 80 04 21 */ bctrl +/* 801AC364 001A92C4 4E 80 04 21 */ bctrl /* 801AC368 001A92C8 80 03 00 04 */ lwz r0, 4(r3) /* 801AC36C 001A92CC 38 61 00 B4 */ addi r3, r1, 0xb4 /* 801AC370 001A92D0 90 1E 00 10 */ stw r0, 0x10(r30) @@ -123,7 +123,7 @@ __ct__15CTweakPlayerResFR12CInputStream: /* 801AC390 001A92F0 81 83 00 00 */ lwz r12, 0(r3) /* 801AC394 001A92F4 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 801AC398 001A92F8 7D 89 03 A6 */ mtctr r12 -/* 801AC39C 001A92FC 4E 80 04 21 */ bctrl +/* 801AC39C 001A92FC 4E 80 04 21 */ bctrl /* 801AC3A0 001A9300 80 03 00 04 */ lwz r0, 4(r3) /* 801AC3A4 001A9304 38 61 00 A4 */ addi r3, r1, 0xa4 /* 801AC3A8 001A9308 90 1E 00 14 */ stw r0, 0x14(r30) @@ -137,7 +137,7 @@ __ct__15CTweakPlayerResFR12CInputStream: /* 801AC3C8 001A9328 81 83 00 00 */ lwz r12, 0(r3) /* 801AC3CC 001A932C 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 801AC3D0 001A9330 7D 89 03 A6 */ mtctr r12 -/* 801AC3D4 001A9334 4E 80 04 21 */ bctrl +/* 801AC3D4 001A9334 4E 80 04 21 */ bctrl /* 801AC3D8 001A9338 80 03 00 04 */ lwz r0, 4(r3) /* 801AC3DC 001A933C 38 61 00 94 */ addi r3, r1, 0x94 /* 801AC3E0 001A9340 90 1E 00 18 */ stw r0, 0x18(r30) @@ -151,7 +151,7 @@ __ct__15CTweakPlayerResFR12CInputStream: /* 801AC400 001A9360 81 83 00 00 */ lwz r12, 0(r3) /* 801AC404 001A9364 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 801AC408 001A9368 7D 89 03 A6 */ mtctr r12 -/* 801AC40C 001A936C 4E 80 04 21 */ bctrl +/* 801AC40C 001A936C 4E 80 04 21 */ bctrl /* 801AC410 001A9370 80 03 00 04 */ lwz r0, 4(r3) /* 801AC414 001A9374 38 61 00 84 */ addi r3, r1, 0x84 /* 801AC418 001A9378 90 1E 00 1C */ stw r0, 0x1c(r30) @@ -590,7 +590,7 @@ lbl_801AC994: /* 801AC9E0 001A9940 81 83 00 00 */ lwz r12, 0(r3) /* 801AC9E4 001A9944 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 801AC9E8 001A9948 7D 89 03 A6 */ mtctr r12 -/* 801AC9EC 001A994C 4E 80 04 21 */ bctrl +/* 801AC9EC 001A994C 4E 80 04 21 */ bctrl /* 801AC9F0 001A9950 80 03 00 04 */ lwz r0, 4(r3) /* 801AC9F4 001A9954 3B 80 00 00 */ li r28, 0 /* 801AC9F8 001A9958 3B A0 00 00 */ li r29, 0 @@ -605,7 +605,7 @@ lbl_801ACA00: /* 801ACA18 001A9978 81 83 00 00 */ lwz r12, 0(r3) /* 801ACA1C 001A997C 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 801ACA20 001A9980 7D 89 03 A6 */ mtctr r12 -/* 801ACA24 001A9984 4E 80 04 21 */ bctrl +/* 801ACA24 001A9984 4E 80 04 21 */ bctrl /* 801ACA28 001A9988 80 83 00 04 */ lwz r4, 4(r3) /* 801ACA2C 001A998C 38 1D 00 C8 */ addi r0, r29, 0xc8 /* 801ACA30 001A9990 38 61 01 04 */ addi r3, r1, 0x104 @@ -627,7 +627,7 @@ lbl_801ACA54: /* 801ACA6C 001A99CC 81 83 00 00 */ lwz r12, 0(r3) /* 801ACA70 001A99D0 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 801ACA74 001A99D4 7D 89 03 A6 */ mtctr r12 -/* 801ACA78 001A99D8 4E 80 04 21 */ bctrl +/* 801ACA78 001A99D8 4E 80 04 21 */ bctrl /* 801ACA7C 001A99DC 80 83 00 04 */ lwz r4, 4(r3) /* 801ACA80 001A99E0 38 1D 00 DC */ addi r0, r29, 0xdc /* 801ACA84 001A99E4 38 61 00 F4 */ addi r3, r1, 0xf4 @@ -650,7 +650,7 @@ lbl_801ACA54: /* 801ACAC8 001A9A28 83 81 01 80 */ lwz r28, 0x180(r1) /* 801ACACC 001A9A2C 7C 08 03 A6 */ mtlr r0 /* 801ACAD0 001A9A30 38 21 01 90 */ addi r1, r1, 0x190 -/* 801ACAD4 001A9A34 4E 80 00 20 */ blr +/* 801ACAD4 001A9A34 4E 80 00 20 */ blr .global sub_801acad8 sub_801acad8: @@ -677,7 +677,7 @@ lbl_801ACB0C: /* 801ACB24 001A9A84 81 83 00 00 */ lwz r12, 0(r3) /* 801ACB28 001A9A88 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 801ACB2C 001A9A8C 7D 89 03 A6 */ mtctr r12 -/* 801ACB30 001A9A90 4E 80 04 21 */ bctrl +/* 801ACB30 001A9A90 4E 80 04 21 */ bctrl /* 801ACB34 001A9A94 80 01 00 1C */ lwz r0, 0x1c(r1) /* 801ACB38 001A9A98 80 63 00 04 */ lwz r3, 4(r3) /* 801ACB3C 001A9A9C 54 00 10 3A */ slwi r0, r0, 2 @@ -742,7 +742,7 @@ lbl_801ACBF0: /* 801ACC08 001A9B68 83 81 00 30 */ lwz r28, 0x30(r1) /* 801ACC0C 001A9B6C 7C 08 03 A6 */ mtlr r0 /* 801ACC10 001A9B70 38 21 00 40 */ addi r1, r1, 0x40 -/* 801ACC14 001A9B74 4E 80 00 20 */ blr +/* 801ACC14 001A9B74 4E 80 00 20 */ blr .global sub_801acc18 sub_801acc18: @@ -769,7 +769,7 @@ lbl_801ACC4C: /* 801ACC64 001A9BC4 81 83 00 00 */ lwz r12, 0(r3) /* 801ACC68 001A9BC8 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 801ACC6C 001A9BCC 7D 89 03 A6 */ mtctr r12 -/* 801ACC70 001A9BD0 4E 80 04 21 */ bctrl +/* 801ACC70 001A9BD0 4E 80 04 21 */ bctrl /* 801ACC74 001A9BD4 80 01 00 1C */ lwz r0, 0x1c(r1) /* 801ACC78 001A9BD8 80 63 00 04 */ lwz r3, 4(r3) /* 801ACC7C 001A9BDC 54 00 10 3A */ slwi r0, r0, 2 @@ -834,7 +834,7 @@ lbl_801ACD30: /* 801ACD48 001A9CA8 83 81 00 50 */ lwz r28, 0x50(r1) /* 801ACD4C 001A9CAC 7C 08 03 A6 */ mtlr r0 /* 801ACD50 001A9CB0 38 21 00 60 */ addi r1, r1, 0x60 -/* 801ACD54 001A9CB4 4E 80 00 20 */ blr +/* 801ACD54 001A9CB4 4E 80 00 20 */ blr .global __dt__15CTweakPlayerResFv __dt__15CTweakPlayerResFv: @@ -1115,7 +1115,7 @@ lbl_801AD0DC: /* 801AD0E4 001AA044 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801AD0E8 001AA048 7C 08 03 A6 */ mtlr r0 /* 801AD0EC 001AA04C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801AD0F0 001AA050 4E 80 00 20 */ blr +/* 801AD0F0 001AA050 4E 80 00 20 */ blr .global "__dl__29TOneStatic<15CTweakPlayerRes>FPv" "__dl__29TOneStatic<15CTweakPlayerRes>FPv": diff --git a/asm/MetroidPrime/Tweaks/CTweakSlideShow.s b/asm/MetroidPrime/Tweaks/CTweakSlideShow.s index 870e85ce..030fb527 100644 --- a/asm/MetroidPrime/Tweaks/CTweakSlideShow.s +++ b/asm/MetroidPrime/Tweaks/CTweakSlideShow.s @@ -130,7 +130,7 @@ __ct__15CTweakSlideShowFR12CInputStream: /* 8029C7BC 0029971C 83 C1 00 48 */ lwz r30, 0x48(r1) /* 8029C7C0 00299720 7C 08 03 A6 */ mtlr r0 /* 8029C7C4 00299724 38 21 00 50 */ addi r1, r1, 0x50 -/* 8029C7C8 00299728 4E 80 00 20 */ blr +/* 8029C7C8 00299728 4E 80 00 20 */ blr .global sub_8029c7cc sub_8029c7cc: @@ -172,7 +172,7 @@ lbl_8029C83C: /* 8029C848 002997A8 83 C1 00 08 */ lwz r30, 8(r1) /* 8029C84C 002997AC 7C 08 03 A6 */ mtlr r0 /* 8029C850 002997B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8029C854 002997B4 4E 80 00 20 */ blr +/* 8029C854 002997B4 4E 80 00 20 */ blr .global sub_8029c858 sub_8029c858: diff --git a/asm/MetroidPrime/Tweaks/CTweakTargeting.s b/asm/MetroidPrime/Tweaks/CTweakTargeting.s index c85955f3..1e269ddf 100644 --- a/asm/MetroidPrime/Tweaks/CTweakTargeting.s +++ b/asm/MetroidPrime/Tweaks/CTweakTargeting.s @@ -597,7 +597,7 @@ lbl_800B609C: /* 800B6298 000B31F8 83 81 00 10 */ lwz r28, 0x10(r1) /* 800B629C 000B31FC 7C 08 03 A6 */ mtlr r0 /* 800B62A0 000B3200 38 21 00 30 */ addi r1, r1, 0x30 -/* 800B62A4 000B3204 4E 80 00 20 */ blr +/* 800B62A4 000B3204 4E 80 00 20 */ blr .global sub_800b62a8 sub_800b62a8: @@ -637,7 +637,7 @@ lbl_800B6318: /* 800B6324 000B3284 83 C1 00 18 */ lwz r30, 0x18(r1) /* 800B6328 000B3288 7C 08 03 A6 */ mtlr r0 /* 800B632C 000B328C 38 21 00 20 */ addi r1, r1, 0x20 -/* 800B6330 000B3290 4E 80 00 20 */ blr +/* 800B6330 000B3290 4E 80 00 20 */ blr .global sub_800b6334 sub_800b6334: @@ -681,7 +681,7 @@ lbl_800B63A0: /* 800B63B4 000B3314 83 C1 00 18 */ lwz r30, 0x18(r1) /* 800B63B8 000B3318 7C 08 03 A6 */ mtlr r0 /* 800B63BC 000B331C 38 21 00 20 */ addi r1, r1, 0x20 -/* 800B63C0 000B3320 4E 80 00 20 */ blr +/* 800B63C0 000B3320 4E 80 00 20 */ blr .global sub_800b63c4 sub_800b63c4: @@ -742,7 +742,7 @@ lbl_800B6478: /* 800B6488 000B33E8 80 01 00 54 */ lwz r0, 0x54(r1) /* 800B648C 000B33EC 7C 08 03 A6 */ mtlr r0 /* 800B6490 000B33F0 38 21 00 50 */ addi r1, r1, 0x50 -/* 800B6494 000B33F4 4E 80 00 20 */ blr +/* 800B6494 000B33F4 4E 80 00 20 */ blr .global sub_800b6498 sub_800b6498: @@ -822,7 +822,7 @@ lbl_800B6584: /* 800B659C 000B34FC 80 01 00 24 */ lwz r0, 0x24(r1) /* 800B65A0 000B3500 7C 08 03 A6 */ mtlr r0 /* 800B65A4 000B3504 38 21 00 20 */ addi r1, r1, 0x20 -/* 800B65A8 000B3508 4E 80 00 20 */ blr +/* 800B65A8 000B3508 4E 80 00 20 */ blr .global sub_800b65ac sub_800b65ac: @@ -840,7 +840,7 @@ sub_800b65ac: /* 800B65D8 000B3538 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 800B65DC 000B353C 7C 08 03 A6 */ mtlr r0 /* 800B65E0 000B3540 38 21 00 20 */ addi r1, r1, 0x20 -/* 800B65E4 000B3544 4E 80 00 20 */ blr +/* 800B65E4 000B3544 4E 80 00 20 */ blr .global sub_800b65e8 sub_800b65e8: @@ -904,7 +904,7 @@ lbl_800B669C: /* 800B66B8 000B3618 83 81 00 08 */ lwz r28, 8(r1) /* 800B66BC 000B361C 7C 08 03 A6 */ mtlr r0 /* 800B66C0 000B3620 38 21 00 20 */ addi r1, r1, 0x20 -/* 800B66C4 000B3624 4E 80 00 20 */ blr +/* 800B66C4 000B3624 4E 80 00 20 */ blr .global __dt__15CTweakTargetingFv __dt__15CTweakTargetingFv: @@ -960,7 +960,7 @@ lbl_800B676C: /* 800B6778 000B36D8 83 C1 00 18 */ lwz r30, 0x18(r1) /* 800B677C 000B36DC 7C 08 03 A6 */ mtlr r0 /* 800B6780 000B36E0 38 21 00 20 */ addi r1, r1, 0x20 -/* 800B6784 000B36E4 4E 80 00 20 */ blr +/* 800B6784 000B36E4 4E 80 00 20 */ blr .global "__dl__29TOneStatic<15CTweakTargeting>FPvPCcPCc" "__dl__29TOneStatic<15CTweakTargeting>FPvPCcPCc": @@ -974,7 +974,7 @@ lbl_800B676C: /* 800B67A4 000B3704 80 01 00 14 */ lwz r0, 0x14(r1) /* 800B67A8 000B3708 7C 08 03 A6 */ mtlr r0 /* 800B67AC 000B370C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B67B0 000B3710 4E 80 00 20 */ blr +/* 800B67B0 000B3710 4E 80 00 20 */ blr .global sub_800b67b4 sub_800b67b4: @@ -1054,7 +1054,7 @@ lbl_800B68B0: /* 800B68B4 000B3814 80 01 00 44 */ lwz r0, 0x44(r1) /* 800B68B8 000B3818 7C 08 03 A6 */ mtlr r0 /* 800B68BC 000B381C 38 21 00 40 */ addi r1, r1, 0x40 -/* 800B68C0 000B3820 4E 80 00 20 */ blr +/* 800B68C0 000B3820 4E 80 00 20 */ blr .global sub_800b68c4 sub_800b68c4: @@ -1127,4 +1127,4 @@ lbl_800B6990: /* 800B69AC 000B390C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 800B69B0 000B3910 7C 08 03 A6 */ mtlr r0 /* 800B69B4 000B3914 38 21 00 20 */ addi r1, r1, 0x20 -/* 800B69B8 000B3918 4E 80 00 20 */ blr +/* 800B69B8 000B3918 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/Tweaks/CTweaks.s b/asm/MetroidPrime/Tweaks/CTweaks.s index 916b7be2..5dc9e661 100644 --- a/asm/MetroidPrime/Tweaks/CTweaks.s +++ b/asm/MetroidPrime/Tweaks/CTweaks.s @@ -240,7 +240,7 @@ lbl_80035A24: /* 80035A68 000329C8 38 80 00 01 */ li r4, 1 /* 80035A6C 000329CC 81 8C 00 08 */ lwz r12, 8(r12) /* 80035A70 000329D0 7D 89 03 A6 */ mtctr r12 -/* 80035A74 000329D4 4E 80 04 21 */ bctrl +/* 80035A74 000329D4 4E 80 04 21 */ bctrl lbl_80035A78: /* 80035A78 000329D8 88 61 00 18 */ lbz r3, 0x18(r1) /* 80035A7C 000329DC 38 00 00 00 */ li r0, 0 @@ -259,7 +259,7 @@ lbl_80035A90: /* 80035AAC 00032A0C 38 80 00 01 */ li r4, 1 /* 80035AB0 00032A10 81 8C 00 08 */ lwz r12, 8(r12) /* 80035AB4 00032A14 7D 89 03 A6 */ mtctr r12 -/* 80035AB8 00032A18 4E 80 04 21 */ bctrl +/* 80035AB8 00032A18 4E 80 04 21 */ bctrl lbl_80035ABC: /* 80035ABC 00032A1C 88 01 00 30 */ lbz r0, 0x30(r1) /* 80035AC0 00032A20 28 00 00 00 */ cmplwi r0, 0 @@ -271,7 +271,7 @@ lbl_80035ABC: /* 80035AD8 00032A38 38 80 00 01 */ li r4, 1 /* 80035ADC 00032A3C 81 8C 00 08 */ lwz r12, 8(r12) /* 80035AE0 00032A40 7D 89 03 A6 */ mtctr r12 -/* 80035AE4 00032A44 4E 80 04 21 */ bctrl +/* 80035AE4 00032A44 4E 80 04 21 */ bctrl lbl_80035AE8: /* 80035AE8 00032A48 80 0D A1 4C */ lwz r0, gpTweakPlayerRes@sda21(r13) /* 80035AEC 00032A4C 28 00 00 00 */ cmplwi r0, 0 @@ -326,7 +326,7 @@ lbl_80035B68: /* 80035BAC 00032B0C 38 80 00 01 */ li r4, 1 /* 80035BB0 00032B10 81 8C 00 08 */ lwz r12, 8(r12) /* 80035BB4 00032B14 7D 89 03 A6 */ mtctr r12 -/* 80035BB8 00032B18 4E 80 04 21 */ bctrl +/* 80035BB8 00032B18 4E 80 04 21 */ bctrl lbl_80035BBC: /* 80035BBC 00032B1C 88 61 00 08 */ lbz r3, 8(r1) /* 80035BC0 00032B20 38 00 00 00 */ li r0, 0 @@ -345,7 +345,7 @@ lbl_80035BD4: /* 80035BF0 00032B50 38 80 00 01 */ li r4, 1 /* 80035BF4 00032B54 81 8C 00 08 */ lwz r12, 8(r12) /* 80035BF8 00032B58 7D 89 03 A6 */ mtctr r12 -/* 80035BFC 00032B5C 4E 80 04 21 */ bctrl +/* 80035BFC 00032B5C 4E 80 04 21 */ bctrl lbl_80035C00: /* 80035C00 00032B60 88 01 00 28 */ lbz r0, 0x28(r1) /* 80035C04 00032B64 28 00 00 00 */ cmplwi r0, 0 @@ -357,7 +357,7 @@ lbl_80035C00: /* 80035C1C 00032B7C 38 80 00 01 */ li r4, 1 /* 80035C20 00032B80 81 8C 00 08 */ lwz r12, 8(r12) /* 80035C24 00032B84 7D 89 03 A6 */ mtctr r12 -/* 80035C28 00032B88 4E 80 04 21 */ bctrl +/* 80035C28 00032B88 4E 80 04 21 */ bctrl lbl_80035C2C: /* 80035C2C 00032B8C 80 01 00 54 */ lwz r0, 0x54(r1) /* 80035C30 00032B90 83 E1 00 4C */ lwz r31, 0x4c(r1) @@ -365,7 +365,7 @@ lbl_80035C2C: /* 80035C38 00032B98 83 A1 00 44 */ lwz r29, 0x44(r1) /* 80035C3C 00032B9C 7C 08 03 A6 */ mtlr r0 /* 80035C40 00032BA0 38 21 00 50 */ addi r1, r1, 0x50 -/* 80035C44 00032BA4 4E 80 00 20 */ blr +/* 80035C44 00032BA4 4E 80 00 20 */ blr .global RegisterTweaks__7CTweaksFv RegisterTweaks__7CTweaksFv: @@ -428,7 +428,7 @@ lbl_80035CE0: /* 80035D24 00032C84 38 80 00 01 */ li r4, 1 /* 80035D28 00032C88 81 8C 00 08 */ lwz r12, 8(r12) /* 80035D2C 00032C8C 7D 89 03 A6 */ mtctr r12 -/* 80035D30 00032C90 4E 80 04 21 */ bctrl +/* 80035D30 00032C90 4E 80 04 21 */ bctrl lbl_80035D34: /* 80035D34 00032C94 88 61 00 C0 */ lbz r3, 0xc0(r1) /* 80035D38 00032C98 38 00 00 00 */ li r0, 0 @@ -447,7 +447,7 @@ lbl_80035D4C: /* 80035D68 00032CC8 38 80 00 01 */ li r4, 1 /* 80035D6C 00032CCC 81 8C 00 08 */ lwz r12, 8(r12) /* 80035D70 00032CD0 7D 89 03 A6 */ mtctr r12 -/* 80035D74 00032CD4 4E 80 04 21 */ bctrl +/* 80035D74 00032CD4 4E 80 04 21 */ bctrl lbl_80035D78: /* 80035D78 00032CD8 88 01 01 30 */ lbz r0, 0x130(r1) /* 80035D7C 00032CDC 28 00 00 00 */ cmplwi r0, 0 @@ -459,7 +459,7 @@ lbl_80035D78: /* 80035D94 00032CF4 38 80 00 01 */ li r4, 1 /* 80035D98 00032CF8 81 8C 00 08 */ lwz r12, 8(r12) /* 80035D9C 00032CFC 7D 89 03 A6 */ mtctr r12 -/* 80035DA0 00032D00 4E 80 04 21 */ bctrl +/* 80035DA0 00032D00 4E 80 04 21 */ bctrl lbl_80035DA4: /* 80035DA4 00032D04 3C 80 80 3D */ lis r4, lbl_803CCD88@ha /* 80035DA8 00032D08 7F E3 FB 78 */ mr r3, r31 @@ -511,7 +511,7 @@ lbl_80035E18: /* 80035E5C 00032DBC 38 80 00 01 */ li r4, 1 /* 80035E60 00032DC0 81 8C 00 08 */ lwz r12, 8(r12) /* 80035E64 00032DC4 7D 89 03 A6 */ mtctr r12 -/* 80035E68 00032DC8 4E 80 04 21 */ bctrl +/* 80035E68 00032DC8 4E 80 04 21 */ bctrl lbl_80035E6C: /* 80035E6C 00032DCC 88 61 00 B0 */ lbz r3, 0xb0(r1) /* 80035E70 00032DD0 38 00 00 00 */ li r0, 0 @@ -530,7 +530,7 @@ lbl_80035E84: /* 80035EA0 00032E00 38 80 00 01 */ li r4, 1 /* 80035EA4 00032E04 81 8C 00 08 */ lwz r12, 8(r12) /* 80035EA8 00032E08 7D 89 03 A6 */ mtctr r12 -/* 80035EAC 00032E0C 4E 80 04 21 */ bctrl +/* 80035EAC 00032E0C 4E 80 04 21 */ bctrl lbl_80035EB0: /* 80035EB0 00032E10 88 01 01 28 */ lbz r0, 0x128(r1) /* 80035EB4 00032E14 28 00 00 00 */ cmplwi r0, 0 @@ -542,7 +542,7 @@ lbl_80035EB0: /* 80035ECC 00032E2C 38 80 00 01 */ li r4, 1 /* 80035ED0 00032E30 81 8C 00 08 */ lwz r12, 8(r12) /* 80035ED4 00032E34 7D 89 03 A6 */ mtctr r12 -/* 80035ED8 00032E38 4E 80 04 21 */ bctrl +/* 80035ED8 00032E38 4E 80 04 21 */ bctrl lbl_80035EDC: /* 80035EDC 00032E3C 3C 80 80 3D */ lis r4, lbl_803CCD88@ha /* 80035EE0 00032E40 7F E3 FB 78 */ mr r3, r31 @@ -573,7 +573,7 @@ lbl_80035EDC: /* 80035F44 00032EA4 38 80 00 01 */ li r4, 1 /* 80035F48 00032EA8 81 8C 00 08 */ lwz r12, 8(r12) /* 80035F4C 00032EAC 7D 89 03 A6 */ mtctr r12 -/* 80035F50 00032EB0 4E 80 04 21 */ bctrl +/* 80035F50 00032EB0 4E 80 04 21 */ bctrl lbl_80035F54: /* 80035F54 00032EB4 3C 80 80 3D */ lis r4, lbl_803CCD88@ha /* 80035F58 00032EB8 7F E3 FB 78 */ mr r3, r31 @@ -625,7 +625,7 @@ lbl_80035FC8: /* 8003600C 00032F6C 38 80 00 01 */ li r4, 1 /* 80036010 00032F70 81 8C 00 08 */ lwz r12, 8(r12) /* 80036014 00032F74 7D 89 03 A6 */ mtctr r12 -/* 80036018 00032F78 4E 80 04 21 */ bctrl +/* 80036018 00032F78 4E 80 04 21 */ bctrl lbl_8003601C: /* 8003601C 00032F7C 88 61 00 98 */ lbz r3, 0x98(r1) /* 80036020 00032F80 38 00 00 00 */ li r0, 0 @@ -644,7 +644,7 @@ lbl_80036034: /* 80036050 00032FB0 38 80 00 01 */ li r4, 1 /* 80036054 00032FB4 81 8C 00 08 */ lwz r12, 8(r12) /* 80036058 00032FB8 7D 89 03 A6 */ mtctr r12 -/* 8003605C 00032FBC 4E 80 04 21 */ bctrl +/* 8003605C 00032FBC 4E 80 04 21 */ bctrl lbl_80036060: /* 80036060 00032FC0 88 01 01 18 */ lbz r0, 0x118(r1) /* 80036064 00032FC4 28 00 00 00 */ cmplwi r0, 0 @@ -656,7 +656,7 @@ lbl_80036060: /* 8003607C 00032FDC 38 80 00 01 */ li r4, 1 /* 80036080 00032FE0 81 8C 00 08 */ lwz r12, 8(r12) /* 80036084 00032FE4 7D 89 03 A6 */ mtctr r12 -/* 80036088 00032FE8 4E 80 04 21 */ bctrl +/* 80036088 00032FE8 4E 80 04 21 */ bctrl lbl_8003608C: /* 8003608C 00032FEC 3C 80 80 3D */ lis r4, lbl_803CCD88@ha /* 80036090 00032FF0 7F E3 FB 78 */ mr r3, r31 @@ -708,7 +708,7 @@ lbl_80036100: /* 80036144 000330A4 38 80 00 01 */ li r4, 1 /* 80036148 000330A8 81 8C 00 08 */ lwz r12, 8(r12) /* 8003614C 000330AC 7D 89 03 A6 */ mtctr r12 -/* 80036150 000330B0 4E 80 04 21 */ bctrl +/* 80036150 000330B0 4E 80 04 21 */ bctrl lbl_80036154: /* 80036154 000330B4 88 61 00 88 */ lbz r3, 0x88(r1) /* 80036158 000330B8 38 00 00 00 */ li r0, 0 @@ -727,7 +727,7 @@ lbl_8003616C: /* 80036188 000330E8 38 80 00 01 */ li r4, 1 /* 8003618C 000330EC 81 8C 00 08 */ lwz r12, 8(r12) /* 80036190 000330F0 7D 89 03 A6 */ mtctr r12 -/* 80036194 000330F4 4E 80 04 21 */ bctrl +/* 80036194 000330F4 4E 80 04 21 */ bctrl lbl_80036198: /* 80036198 000330F8 88 01 01 10 */ lbz r0, 0x110(r1) /* 8003619C 000330FC 28 00 00 00 */ cmplwi r0, 0 @@ -739,7 +739,7 @@ lbl_80036198: /* 800361B4 00033114 38 80 00 01 */ li r4, 1 /* 800361B8 00033118 81 8C 00 08 */ lwz r12, 8(r12) /* 800361BC 0003311C 7D 89 03 A6 */ mtctr r12 -/* 800361C0 00033120 4E 80 04 21 */ bctrl +/* 800361C0 00033120 4E 80 04 21 */ bctrl lbl_800361C4: /* 800361C4 00033124 3C 80 80 3D */ lis r4, lbl_803CCD88@ha /* 800361C8 00033128 7F E3 FB 78 */ mr r3, r31 @@ -791,7 +791,7 @@ lbl_80036238: /* 8003627C 000331DC 38 80 00 01 */ li r4, 1 /* 80036280 000331E0 81 8C 00 08 */ lwz r12, 8(r12) /* 80036284 000331E4 7D 89 03 A6 */ mtctr r12 -/* 80036288 000331E8 4E 80 04 21 */ bctrl +/* 80036288 000331E8 4E 80 04 21 */ bctrl lbl_8003628C: /* 8003628C 000331EC 88 61 00 78 */ lbz r3, 0x78(r1) /* 80036290 000331F0 38 00 00 00 */ li r0, 0 @@ -810,7 +810,7 @@ lbl_800362A4: /* 800362C0 00033220 38 80 00 01 */ li r4, 1 /* 800362C4 00033224 81 8C 00 08 */ lwz r12, 8(r12) /* 800362C8 00033228 7D 89 03 A6 */ mtctr r12 -/* 800362CC 0003322C 4E 80 04 21 */ bctrl +/* 800362CC 0003322C 4E 80 04 21 */ bctrl lbl_800362D0: /* 800362D0 00033230 88 01 01 08 */ lbz r0, 0x108(r1) /* 800362D4 00033234 28 00 00 00 */ cmplwi r0, 0 @@ -822,7 +822,7 @@ lbl_800362D0: /* 800362EC 0003324C 38 80 00 01 */ li r4, 1 /* 800362F0 00033250 81 8C 00 08 */ lwz r12, 8(r12) /* 800362F4 00033254 7D 89 03 A6 */ mtctr r12 -/* 800362F8 00033258 4E 80 04 21 */ bctrl +/* 800362F8 00033258 4E 80 04 21 */ bctrl lbl_800362FC: /* 800362FC 0003325C 3C 80 80 3D */ lis r4, lbl_803CCD88@ha /* 80036300 00033260 7F E3 FB 78 */ mr r3, r31 @@ -874,7 +874,7 @@ lbl_80036370: /* 800363B4 00033314 38 80 00 01 */ li r4, 1 /* 800363B8 00033318 81 8C 00 08 */ lwz r12, 8(r12) /* 800363BC 0003331C 7D 89 03 A6 */ mtctr r12 -/* 800363C0 00033320 4E 80 04 21 */ bctrl +/* 800363C0 00033320 4E 80 04 21 */ bctrl lbl_800363C4: /* 800363C4 00033324 88 61 00 68 */ lbz r3, 0x68(r1) /* 800363C8 00033328 38 00 00 00 */ li r0, 0 @@ -893,7 +893,7 @@ lbl_800363DC: /* 800363F8 00033358 38 80 00 01 */ li r4, 1 /* 800363FC 0003335C 81 8C 00 08 */ lwz r12, 8(r12) /* 80036400 00033360 7D 89 03 A6 */ mtctr r12 -/* 80036404 00033364 4E 80 04 21 */ bctrl +/* 80036404 00033364 4E 80 04 21 */ bctrl lbl_80036408: /* 80036408 00033368 88 01 01 00 */ lbz r0, 0x100(r1) /* 8003640C 0003336C 28 00 00 00 */ cmplwi r0, 0 @@ -905,7 +905,7 @@ lbl_80036408: /* 80036424 00033384 38 80 00 01 */ li r4, 1 /* 80036428 00033388 81 8C 00 08 */ lwz r12, 8(r12) /* 8003642C 0003338C 7D 89 03 A6 */ mtctr r12 -/* 80036430 00033390 4E 80 04 21 */ bctrl +/* 80036430 00033390 4E 80 04 21 */ bctrl lbl_80036434: /* 80036434 00033394 3C 80 80 3D */ lis r4, lbl_803CCD88@ha /* 80036438 00033398 7F E3 FB 78 */ mr r3, r31 @@ -957,7 +957,7 @@ lbl_800364A8: /* 800364EC 0003344C 38 80 00 01 */ li r4, 1 /* 800364F0 00033450 81 8C 00 08 */ lwz r12, 8(r12) /* 800364F4 00033454 7D 89 03 A6 */ mtctr r12 -/* 800364F8 00033458 4E 80 04 21 */ bctrl +/* 800364F8 00033458 4E 80 04 21 */ bctrl lbl_800364FC: /* 800364FC 0003345C 88 61 00 58 */ lbz r3, 0x58(r1) /* 80036500 00033460 38 00 00 00 */ li r0, 0 @@ -976,7 +976,7 @@ lbl_80036514: /* 80036530 00033490 38 80 00 01 */ li r4, 1 /* 80036534 00033494 81 8C 00 08 */ lwz r12, 8(r12) /* 80036538 00033498 7D 89 03 A6 */ mtctr r12 -/* 8003653C 0003349C 4E 80 04 21 */ bctrl +/* 8003653C 0003349C 4E 80 04 21 */ bctrl lbl_80036540: /* 80036540 000334A0 88 01 00 F8 */ lbz r0, 0xf8(r1) /* 80036544 000334A4 28 00 00 00 */ cmplwi r0, 0 @@ -988,7 +988,7 @@ lbl_80036540: /* 8003655C 000334BC 38 80 00 01 */ li r4, 1 /* 80036560 000334C0 81 8C 00 08 */ lwz r12, 8(r12) /* 80036564 000334C4 7D 89 03 A6 */ mtctr r12 -/* 80036568 000334C8 4E 80 04 21 */ bctrl +/* 80036568 000334C8 4E 80 04 21 */ bctrl lbl_8003656C: /* 8003656C 000334CC 3C 80 80 3D */ lis r4, lbl_803CCD88@ha /* 80036570 000334D0 7F E3 FB 78 */ mr r3, r31 @@ -1040,7 +1040,7 @@ lbl_800365E0: /* 80036624 00033584 38 80 00 01 */ li r4, 1 /* 80036628 00033588 81 8C 00 08 */ lwz r12, 8(r12) /* 8003662C 0003358C 7D 89 03 A6 */ mtctr r12 -/* 80036630 00033590 4E 80 04 21 */ bctrl +/* 80036630 00033590 4E 80 04 21 */ bctrl lbl_80036634: /* 80036634 00033594 88 61 00 48 */ lbz r3, 0x48(r1) /* 80036638 00033598 38 00 00 00 */ li r0, 0 @@ -1059,7 +1059,7 @@ lbl_8003664C: /* 80036668 000335C8 38 80 00 01 */ li r4, 1 /* 8003666C 000335CC 81 8C 00 08 */ lwz r12, 8(r12) /* 80036670 000335D0 7D 89 03 A6 */ mtctr r12 -/* 80036674 000335D4 4E 80 04 21 */ bctrl +/* 80036674 000335D4 4E 80 04 21 */ bctrl lbl_80036678: /* 80036678 000335D8 80 6D A1 44 */ lwz r3, gpTweakAutoMapper@sda21(r13) /* 8003667C 000335DC 48 0B 2D ED */ bl ReadAutomapperTweaks__15CMappableObjectFRC16CTweakAutoMapper @@ -1073,7 +1073,7 @@ lbl_80036678: /* 8003669C 000335FC 38 80 00 01 */ li r4, 1 /* 800366A0 00033600 81 8C 00 08 */ lwz r12, 8(r12) /* 800366A4 00033604 7D 89 03 A6 */ mtctr r12 -/* 800366A8 00033608 4E 80 04 21 */ bctrl +/* 800366A8 00033608 4E 80 04 21 */ bctrl lbl_800366AC: /* 800366AC 0003360C 3C 80 80 3D */ lis r4, lbl_803CCD88@ha /* 800366B0 00033610 7F E3 FB 78 */ mr r3, r31 @@ -1125,7 +1125,7 @@ lbl_80036720: /* 80036764 000336C4 38 80 00 01 */ li r4, 1 /* 80036768 000336C8 81 8C 00 08 */ lwz r12, 8(r12) /* 8003676C 000336CC 7D 89 03 A6 */ mtctr r12 -/* 80036770 000336D0 4E 80 04 21 */ bctrl +/* 80036770 000336D0 4E 80 04 21 */ bctrl lbl_80036774: /* 80036774 000336D4 88 61 00 38 */ lbz r3, 0x38(r1) /* 80036778 000336D8 38 00 00 00 */ li r0, 0 @@ -1144,7 +1144,7 @@ lbl_8003678C: /* 800367A8 00033708 38 80 00 01 */ li r4, 1 /* 800367AC 0003370C 81 8C 00 08 */ lwz r12, 8(r12) /* 800367B0 00033710 7D 89 03 A6 */ mtctr r12 -/* 800367B4 00033714 4E 80 04 21 */ bctrl +/* 800367B4 00033714 4E 80 04 21 */ bctrl lbl_800367B8: /* 800367B8 00033718 88 01 00 E8 */ lbz r0, 0xe8(r1) /* 800367BC 0003371C 28 00 00 00 */ cmplwi r0, 0 @@ -1156,7 +1156,7 @@ lbl_800367B8: /* 800367D4 00033734 38 80 00 01 */ li r4, 1 /* 800367D8 00033738 81 8C 00 08 */ lwz r12, 8(r12) /* 800367DC 0003373C 7D 89 03 A6 */ mtctr r12 -/* 800367E0 00033740 4E 80 04 21 */ bctrl +/* 800367E0 00033740 4E 80 04 21 */ bctrl lbl_800367E4: /* 800367E4 00033744 3C 80 80 3D */ lis r4, lbl_803CCD88@ha /* 800367E8 00033748 7F E3 FB 78 */ mr r3, r31 @@ -1208,7 +1208,7 @@ lbl_80036858: /* 8003689C 000337FC 38 80 00 01 */ li r4, 1 /* 800368A0 00033800 81 8C 00 08 */ lwz r12, 8(r12) /* 800368A4 00033804 7D 89 03 A6 */ mtctr r12 -/* 800368A8 00033808 4E 80 04 21 */ bctrl +/* 800368A8 00033808 4E 80 04 21 */ bctrl lbl_800368AC: /* 800368AC 0003380C 88 61 00 28 */ lbz r3, 0x28(r1) /* 800368B0 00033810 38 00 00 00 */ li r0, 0 @@ -1227,7 +1227,7 @@ lbl_800368C4: /* 800368E0 00033840 38 80 00 01 */ li r4, 1 /* 800368E4 00033844 81 8C 00 08 */ lwz r12, 8(r12) /* 800368E8 00033848 7D 89 03 A6 */ mtctr r12 -/* 800368EC 0003384C 4E 80 04 21 */ bctrl +/* 800368EC 0003384C 4E 80 04 21 */ bctrl lbl_800368F0: /* 800368F0 00033850 88 01 00 E0 */ lbz r0, 0xe0(r1) /* 800368F4 00033854 80 6D A1 28 */ lwz r3, gpTweakPlayerControlCurrent@sda21(r13) @@ -1241,7 +1241,7 @@ lbl_800368F0: /* 80036914 00033874 38 80 00 01 */ li r4, 1 /* 80036918 00033878 81 8C 00 08 */ lwz r12, 8(r12) /* 8003691C 0003387C 7D 89 03 A6 */ mtctr r12 -/* 80036920 00033880 4E 80 04 21 */ bctrl +/* 80036920 00033880 4E 80 04 21 */ bctrl lbl_80036924: /* 80036924 00033884 3C 80 80 3D */ lis r4, lbl_803CCD88@ha /* 80036928 00033888 7F E3 FB 78 */ mr r3, r31 @@ -1293,7 +1293,7 @@ lbl_80036998: /* 800369DC 0003393C 38 80 00 01 */ li r4, 1 /* 800369E0 00033940 81 8C 00 08 */ lwz r12, 8(r12) /* 800369E4 00033944 7D 89 03 A6 */ mtctr r12 -/* 800369E8 00033948 4E 80 04 21 */ bctrl +/* 800369E8 00033948 4E 80 04 21 */ bctrl lbl_800369EC: /* 800369EC 0003394C 88 61 00 18 */ lbz r3, 0x18(r1) /* 800369F0 00033950 38 00 00 00 */ li r0, 0 @@ -1312,7 +1312,7 @@ lbl_80036A04: /* 80036A20 00033980 38 80 00 01 */ li r4, 1 /* 80036A24 00033984 81 8C 00 08 */ lwz r12, 8(r12) /* 80036A28 00033988 7D 89 03 A6 */ mtctr r12 -/* 80036A2C 0003398C 4E 80 04 21 */ bctrl +/* 80036A2C 0003398C 4E 80 04 21 */ bctrl lbl_80036A30: /* 80036A30 00033990 88 01 00 D8 */ lbz r0, 0xd8(r1) /* 80036A34 00033994 28 00 00 00 */ cmplwi r0, 0 @@ -1324,7 +1324,7 @@ lbl_80036A30: /* 80036A4C 000339AC 38 80 00 01 */ li r4, 1 /* 80036A50 000339B0 81 8C 00 08 */ lwz r12, 8(r12) /* 80036A54 000339B4 7D 89 03 A6 */ mtctr r12 -/* 80036A58 000339B8 4E 80 04 21 */ bctrl +/* 80036A58 000339B8 4E 80 04 21 */ bctrl lbl_80036A5C: /* 80036A5C 000339BC 3C 80 80 3D */ lis r4, lbl_803CCD88@ha /* 80036A60 000339C0 7F E3 FB 78 */ mr r3, r31 @@ -1376,7 +1376,7 @@ lbl_80036AD0: /* 80036B14 00033A74 38 80 00 01 */ li r4, 1 /* 80036B18 00033A78 81 8C 00 08 */ lwz r12, 8(r12) /* 80036B1C 00033A7C 7D 89 03 A6 */ mtctr r12 -/* 80036B20 00033A80 4E 80 04 21 */ bctrl +/* 80036B20 00033A80 4E 80 04 21 */ bctrl lbl_80036B24: /* 80036B24 00033A84 88 61 00 08 */ lbz r3, 8(r1) /* 80036B28 00033A88 38 00 00 00 */ li r0, 0 @@ -1395,7 +1395,7 @@ lbl_80036B3C: /* 80036B58 00033AB8 38 80 00 01 */ li r4, 1 /* 80036B5C 00033ABC 81 8C 00 08 */ lwz r12, 8(r12) /* 80036B60 00033AC0 7D 89 03 A6 */ mtctr r12 -/* 80036B64 00033AC4 4E 80 04 21 */ bctrl +/* 80036B64 00033AC4 4E 80 04 21 */ bctrl lbl_80036B68: /* 80036B68 00033AC8 88 01 00 D0 */ lbz r0, 0xd0(r1) /* 80036B6C 00033ACC 28 00 00 00 */ cmplwi r0, 0 @@ -1407,7 +1407,7 @@ lbl_80036B68: /* 80036B84 00033AE4 38 80 00 01 */ li r4, 1 /* 80036B88 00033AE8 81 8C 00 08 */ lwz r12, 8(r12) /* 80036B8C 00033AEC 7D 89 03 A6 */ mtctr r12 -/* 80036B90 00033AF0 4E 80 04 21 */ bctrl +/* 80036B90 00033AF0 4E 80 04 21 */ bctrl lbl_80036B94: /* 80036B94 00033AF4 80 01 01 54 */ lwz r0, 0x154(r1) /* 80036B98 00033AF8 83 E1 01 4C */ lwz r31, 0x14c(r1) @@ -1415,7 +1415,7 @@ lbl_80036B94: /* 80036BA0 00033B00 83 A1 01 44 */ lwz r29, 0x144(r1) /* 80036BA4 00033B04 7C 08 03 A6 */ mtlr r0 /* 80036BA8 00033B08 38 21 01 50 */ addi r1, r1, 0x150 -/* 80036BAC 00033B0C 4E 80 00 20 */ blr +/* 80036BAC 00033B0C 4E 80 00 20 */ blr .global sub_80036bb0 sub_80036bb0: @@ -1459,7 +1459,7 @@ lbl_80036C1C: /* 80036C40 00033BA0 38 80 00 01 */ li r4, 1 /* 80036C44 00033BA4 81 8C 00 08 */ lwz r12, 8(r12) /* 80036C48 00033BA8 7D 89 03 A6 */ mtctr r12 -/* 80036C4C 00033BAC 4E 80 04 21 */ bctrl +/* 80036C4C 00033BAC 4E 80 04 21 */ bctrl lbl_80036C50: /* 80036C50 00033BB0 3B DE 00 08 */ addi r30, r30, 8 /* 80036C54 00033BB4 3B FF 00 01 */ addi r31, r31, 1 @@ -1483,7 +1483,7 @@ lbl_80036C7C: /* 80036C90 00033BF0 83 81 00 10 */ lwz r28, 0x10(r1) /* 80036C94 00033BF4 7C 08 03 A6 */ mtlr r0 /* 80036C98 00033BF8 38 21 00 20 */ addi r1, r1, 0x20 -/* 80036C9C 00033BFC 4E 80 00 20 */ blr +/* 80036C9C 00033BFC 4E 80 00 20 */ blr .global __ct__7CTweaksFv __ct__7CTweaksFv: @@ -1530,14 +1530,14 @@ lbl_80036D14: /* 80036D30 00033C90 38 80 00 01 */ li r4, 1 /* 80036D34 00033C94 81 8C 00 08 */ lwz r12, 8(r12) /* 80036D38 00033C98 7D 89 03 A6 */ mtctr r12 -/* 80036D3C 00033C9C 4E 80 04 21 */ bctrl +/* 80036D3C 00033C9C 4E 80 04 21 */ bctrl lbl_80036D40: /* 80036D40 00033CA0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80036D44 00033CA4 7F E3 FB 78 */ mr r3, r31 /* 80036D48 00033CA8 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80036D4C 00033CAC 7C 08 03 A6 */ mtlr r0 /* 80036D50 00033CB0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80036D54 00033CB4 4E 80 00 20 */ blr +/* 80036D54 00033CB4 4E 80 00 20 */ blr .global IDFromFactory__FR11CResFactoryPCc IDFromFactory__FR11CResFactoryPCc: @@ -1547,12 +1547,12 @@ IDFromFactory__FR11CResFactoryPCc: /* 80036D64 00033CC4 81 83 00 00 */ lwz r12, 0(r3) /* 80036D68 00033CC8 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80036D6C 00033CCC 7D 89 03 A6 */ mtctr r12 -/* 80036D70 00033CD0 4E 80 04 21 */ bctrl +/* 80036D70 00033CD0 4E 80 04 21 */ bctrl /* 80036D74 00033CD4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80036D78 00033CD8 80 63 00 04 */ lwz r3, 4(r3) /* 80036D7C 00033CDC 7C 08 03 A6 */ mtlr r0 /* 80036D80 00033CE0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80036D84 00033CE4 4E 80 00 20 */ blr +/* 80036D84 00033CE4 4E 80 00 20 */ blr .global "__nw__29TOneStatic<15CTweakSlideShow>FUlPCcPCc" "__nw__29TOneStatic<15CTweakSlideShow>FUlPCcPCc": @@ -1567,13 +1567,13 @@ IDFromFactory__FR11CResFactoryPCc: /* 80036DA8 00033D08 80 01 00 14 */ lwz r0, 0x14(r1) /* 80036DAC 00033D0C 7C 08 03 A6 */ mtlr r0 /* 80036DB0 00033D10 38 21 00 10 */ addi r1, r1, 0x10 -/* 80036DB4 00033D14 4E 80 00 20 */ blr +/* 80036DB4 00033D14 4E 80 00 20 */ blr .global "GetAllocSpace__29TOneStatic<15CTweakSlideShow>FUlPCcPCc" "GetAllocSpace__29TOneStatic<15CTweakSlideShow>FUlPCcPCc": /* 80036DB8 00033D18 3C 60 80 46 */ lis r3, lbl_8045B180@ha /* 80036DBC 00033D1C 38 63 B1 80 */ addi r3, r3, lbl_8045B180@l -/* 80036DC0 00033D20 4E 80 00 20 */ blr +/* 80036DC0 00033D20 4E 80 00 20 */ blr .global "ReferenceCount__29TOneStatic<15CTweakSlideShow>Fv" "ReferenceCount__29TOneStatic<15CTweakSlideShow>Fv": @@ -1586,7 +1586,7 @@ IDFromFactory__FR11CResFactoryPCc: /* 80036DDC 00033D3C 98 0D A1 58 */ stb r0, lbl_805A8D18@sda21(r13) lbl_80036DE0: /* 80036DE0 00033D40 38 6D A1 54 */ addi r3, r13, lbl_805A8D14@sda21 -/* 80036DE4 00033D44 4E 80 00 20 */ blr +/* 80036DE4 00033D44 4E 80 00 20 */ blr .global sub_80036de8 sub_80036de8: @@ -1601,13 +1601,13 @@ sub_80036de8: /* 80036E08 00033D68 80 01 00 14 */ lwz r0, 0x14(r1) /* 80036E0C 00033D6C 7C 08 03 A6 */ mtlr r0 /* 80036E10 00033D70 38 21 00 10 */ addi r1, r1, 0x10 -/* 80036E14 00033D74 4E 80 00 20 */ blr +/* 80036E14 00033D74 4E 80 00 20 */ blr .global sub_80036e18 sub_80036e18: /* 80036E18 00033D78 3C 60 80 46 */ lis r3, lbl_8045B1DC@ha /* 80036E1C 00033D7C 38 63 B1 DC */ addi r3, r3, lbl_8045B1DC@l -/* 80036E20 00033D80 4E 80 00 20 */ blr +/* 80036E20 00033D80 4E 80 00 20 */ blr .global "ReferenceCount__29TOneStatic<15CTweakPlayerRes>Fv" "ReferenceCount__29TOneStatic<15CTweakPlayerRes>Fv": @@ -1620,7 +1620,7 @@ sub_80036e18: /* 80036E3C 00033D9C 98 0D A1 60 */ stb r0, lbl_805A8D20@sda21(r13) lbl_80036E40: /* 80036E40 00033DA0 38 6D A1 5C */ addi r3, r13, lbl_805A8D1C@sda21 -/* 80036E44 00033DA4 4E 80 00 20 */ blr +/* 80036E44 00033DA4 4E 80 00 20 */ blr .global sub_80036e48 sub_80036e48: @@ -1635,13 +1635,13 @@ sub_80036e48: /* 80036E68 00033DC8 80 01 00 14 */ lwz r0, 0x14(r1) /* 80036E6C 00033DCC 7C 08 03 A6 */ mtlr r0 /* 80036E70 00033DD0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80036E74 00033DD4 4E 80 00 20 */ blr +/* 80036E74 00033DD4 4E 80 00 20 */ blr .global sub_80036e78 sub_80036e78: /* 80036E78 00033DD8 3C 60 80 46 */ lis r3, lbl_8045B2D0@ha /* 80036E7C 00033DDC 38 63 B2 D0 */ addi r3, r3, lbl_8045B2D0@l -/* 80036E80 00033DE0 4E 80 00 20 */ blr +/* 80036E80 00033DE0 4E 80 00 20 */ blr .global "ReferenceCount__26TOneStatic<12CTweakGunRes>Fv" "ReferenceCount__26TOneStatic<12CTweakGunRes>Fv": @@ -1654,7 +1654,7 @@ sub_80036e78: /* 80036E9C 00033DFC 98 0D A1 68 */ stb r0, lbl_805A8D28@sda21(r13) lbl_80036EA0: /* 80036EA0 00033E00 38 6D A1 64 */ addi r3, r13, lbl_805A8D24@sda21 -/* 80036EA4 00033E04 4E 80 00 20 */ blr +/* 80036EA4 00033E04 4E 80 00 20 */ blr .global "__nw__30TOneStatic<16CTweakAutoMapper>FUlPCcPCc" "__nw__30TOneStatic<16CTweakAutoMapper>FUlPCcPCc": @@ -1669,13 +1669,13 @@ lbl_80036EA0: /* 80036EC8 00033E28 80 01 00 14 */ lwz r0, 0x14(r1) /* 80036ECC 00033E2C 7C 08 03 A6 */ mtlr r0 /* 80036ED0 00033E30 38 21 00 10 */ addi r1, r1, 0x10 -/* 80036ED4 00033E34 4E 80 00 20 */ blr +/* 80036ED4 00033E34 4E 80 00 20 */ blr .global "GetAllocSpace__30TOneStatic<16CTweakAutoMapper>Fv" "GetAllocSpace__30TOneStatic<16CTweakAutoMapper>Fv": /* 80036ED8 00033E38 3C 60 80 46 */ lis r3, lbl_8045B398@ha /* 80036EDC 00033E3C 38 63 B3 98 */ addi r3, r3, lbl_8045B398@l -/* 80036EE0 00033E40 4E 80 00 20 */ blr +/* 80036EE0 00033E40 4E 80 00 20 */ blr .global "ReferenceCount__30TOneStatic<16CTweakAutoMapper>Fv" "ReferenceCount__30TOneStatic<16CTweakAutoMapper>Fv": @@ -1688,7 +1688,7 @@ lbl_80036EA0: /* 80036EFC 00033E5C 98 0D A1 70 */ stb r0, lbl_805A8D30@sda21(r13) lbl_80036F00: /* 80036F00 00033E60 38 6D A1 6C */ addi r3, r13, lbl_805A8D2C@sda21 -/* 80036F04 00033E64 4E 80 00 20 */ blr +/* 80036F04 00033E64 4E 80 00 20 */ blr .global "__nw__29TOneStatic<15CTweakTargeting>FUlPCcPCc" "__nw__29TOneStatic<15CTweakTargeting>FUlPCcPCc": @@ -1703,13 +1703,13 @@ lbl_80036F00: /* 80036F28 00033E88 80 01 00 14 */ lwz r0, 0x14(r1) /* 80036F2C 00033E8C 7C 08 03 A6 */ mtlr r0 /* 80036F30 00033E90 38 21 00 10 */ addi r1, r1, 0x10 -/* 80036F34 00033E94 4E 80 00 20 */ blr +/* 80036F34 00033E94 4E 80 00 20 */ blr .global "GetAllocSpace__29TOneStatic<15CTweakTargeting>Fv" "GetAllocSpace__29TOneStatic<15CTweakTargeting>Fv": /* 80036F38 00033E98 3C 60 80 46 */ lis r3, lbl_8045B4B8@ha /* 80036F3C 00033E9C 38 63 B4 B8 */ addi r3, r3, lbl_8045B4B8@l -/* 80036F40 00033EA0 4E 80 00 20 */ blr +/* 80036F40 00033EA0 4E 80 00 20 */ blr .global "ReferenceCount__29TOneStatic<15CTweakTargeting>Fv" "ReferenceCount__29TOneStatic<15CTweakTargeting>Fv": @@ -1722,7 +1722,7 @@ lbl_80036F00: /* 80036F5C 00033EBC 98 0D A1 78 */ stb r0, lbl_805A8D38@sda21(r13) lbl_80036F60: /* 80036F60 00033EC0 38 6D A1 74 */ addi r3, r13, lbl_805A8D34@sda21 -/* 80036F64 00033EC4 4E 80 00 20 */ blr +/* 80036F64 00033EC4 4E 80 00 20 */ blr .global "__nw__29TOneStatic<15CTweakGuiColors>FUlPCcPCc" "__nw__29TOneStatic<15CTweakGuiColors>FUlPCcPCc": @@ -1737,13 +1737,13 @@ lbl_80036F60: /* 80036F88 00033EE8 80 01 00 14 */ lwz r0, 0x14(r1) /* 80036F8C 00033EEC 7C 08 03 A6 */ mtlr r0 /* 80036F90 00033EF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80036F94 00033EF4 4E 80 00 20 */ blr +/* 80036F94 00033EF4 4E 80 00 20 */ blr .global "GetAllocSpace__29TOneStatic<15CTweakGuiColors>Fv" "GetAllocSpace__29TOneStatic<15CTweakGuiColors>Fv": /* 80036F98 00033EF8 3C 60 80 46 */ lis r3, lbl_8045B6E0@ha /* 80036F9C 00033EFC 38 63 B6 E0 */ addi r3, r3, lbl_8045B6E0@l -/* 80036FA0 00033F00 4E 80 00 20 */ blr +/* 80036FA0 00033F00 4E 80 00 20 */ blr .global "ReferenceCount__29TOneStatic<15CTweakGuiColors>Fv" "ReferenceCount__29TOneStatic<15CTweakGuiColors>Fv": @@ -1756,7 +1756,7 @@ lbl_80036F60: /* 80036FBC 00033F1C 98 0D A1 80 */ stb r0, lbl_805A8D40@sda21(r13) lbl_80036FC0: /* 80036FC0 00033F20 38 6D A1 7C */ addi r3, r13, lbl_805A8D3C@sda21 -/* 80036FC4 00033F24 4E 80 00 20 */ blr +/* 80036FC4 00033F24 4E 80 00 20 */ blr .global "__nw__22TOneStatic<9CTweakGui>FUlPCcPCc" "__nw__22TOneStatic<9CTweakGui>FUlPCcPCc": @@ -1771,13 +1771,13 @@ lbl_80036FC0: /* 80036FE8 00033F48 80 01 00 14 */ lwz r0, 0x14(r1) /* 80036FEC 00033F4C 7C 08 03 A6 */ mtlr r0 /* 80036FF0 00033F50 38 21 00 10 */ addi r1, r1, 0x10 -/* 80036FF4 00033F54 4E 80 00 20 */ blr +/* 80036FF4 00033F54 4E 80 00 20 */ blr .global "GetAllocSpace__22TOneStatic<9CTweakGui>Fv" "GetAllocSpace__22TOneStatic<9CTweakGui>Fv": /* 80036FF8 00033F58 3C 60 80 46 */ lis r3, lbl_8045B934@ha /* 80036FFC 00033F5C 38 63 B9 34 */ addi r3, r3, lbl_8045B934@l -/* 80037000 00033F60 4E 80 00 20 */ blr +/* 80037000 00033F60 4E 80 00 20 */ blr .global "ReferenceCount__22TOneStatic<9CTweakGui>Fv" "ReferenceCount__22TOneStatic<9CTweakGui>Fv": @@ -1790,7 +1790,7 @@ lbl_80036FC0: /* 8003701C 00033F7C 98 0D A1 88 */ stb r0, lbl_805A8D48@sda21(r13) lbl_80037020: /* 80037020 00033F80 38 6D A1 84 */ addi r3, r13, lbl_805A8D44@sda21 -/* 80037024 00033F84 4E 80 00 20 */ blr +/* 80037024 00033F84 4E 80 00 20 */ blr .global "__nw__29TOneStatic<15CTweakPlayerGun>FUlPCcPCc" "__nw__29TOneStatic<15CTweakPlayerGun>FUlPCcPCc": @@ -1805,13 +1805,13 @@ lbl_80037020: /* 80037048 00033FA8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8003704C 00033FAC 7C 08 03 A6 */ mtlr r0 /* 80037050 00033FB0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80037054 00033FB4 4E 80 00 20 */ blr +/* 80037054 00033FB4 4E 80 00 20 */ blr .global "GetAllocSpace__29TOneStatic<15CTweakPlayerGun>Fv" "GetAllocSpace__29TOneStatic<15CTweakPlayerGun>Fv": /* 80037058 00033FB8 3C 60 80 46 */ lis r3, lbl_8045BC9C@ha /* 8003705C 00033FBC 38 63 BC 9C */ addi r3, r3, lbl_8045BC9C@l -/* 80037060 00033FC0 4E 80 00 20 */ blr +/* 80037060 00033FC0 4E 80 00 20 */ blr .global "ReferenceCount__29TOneStatic<15CTweakPlayerGun>Fv" "ReferenceCount__29TOneStatic<15CTweakPlayerGun>Fv": @@ -1824,7 +1824,7 @@ lbl_80037020: /* 8003707C 00033FDC 98 0D A1 90 */ stb r0, lbl_805A8D50@sda21(r13) lbl_80037080: /* 80037080 00033FE0 38 6D A1 8C */ addi r3, r13, lbl_805A8D4C@sda21 -/* 80037084 00033FE4 4E 80 00 20 */ blr +/* 80037084 00033FE4 4E 80 00 20 */ blr .global "__nw__28TOneStatic<14CTweakParticle>FUlPCcPCc" "__nw__28TOneStatic<14CTweakParticle>FUlPCcPCc": @@ -1839,13 +1839,13 @@ lbl_80037080: /* 800370A8 00034008 80 01 00 14 */ lwz r0, 0x14(r1) /* 800370AC 0003400C 7C 08 03 A6 */ mtlr r0 /* 800370B0 00034010 38 21 00 10 */ addi r1, r1, 0x10 -/* 800370B4 00034014 4E 80 00 20 */ blr +/* 800370B4 00034014 4E 80 00 20 */ blr .global "GetAllocSpace__28TOneStatic<14CTweakParticle>Fv" "GetAllocSpace__28TOneStatic<14CTweakParticle>Fv": /* 800370B8 00034018 3C 60 80 46 */ lis r3, lbl_8045BF34@ha /* 800370BC 0003401C 38 63 BF 34 */ addi r3, r3, lbl_8045BF34@l -/* 800370C0 00034020 4E 80 00 20 */ blr +/* 800370C0 00034020 4E 80 00 20 */ blr .global "ReferenceCount__28TOneStatic<14CTweakParticle>Fv" "ReferenceCount__28TOneStatic<14CTweakParticle>Fv": @@ -1858,7 +1858,7 @@ lbl_80037080: /* 800370DC 0003403C 98 0D A1 98 */ stb r0, lbl_805A8D58@sda21(r13) lbl_800370E0: /* 800370E0 00034040 38 6D A1 94 */ addi r3, r13, lbl_805A8D54@sda21 -/* 800370E4 00034044 4E 80 00 20 */ blr +/* 800370E4 00034044 4E 80 00 20 */ blr .global "__nw__24TOneStatic<10CTweakGame>FUlPCcPCc" "__nw__24TOneStatic<10CTweakGame>FUlPCcPCc": @@ -1873,13 +1873,13 @@ lbl_800370E0: /* 80037108 00034068 80 01 00 14 */ lwz r0, 0x14(r1) /* 8003710C 0003406C 7C 08 03 A6 */ mtlr r0 /* 80037110 00034070 38 21 00 10 */ addi r1, r1, 0x10 -/* 80037114 00034074 4E 80 00 20 */ blr +/* 80037114 00034074 4E 80 00 20 */ blr .global "GetAllocSpace__24TOneStatic<10CTweakGame>Fv" "GetAllocSpace__24TOneStatic<10CTweakGame>Fv": /* 80037118 00034078 3C 60 80 46 */ lis r3, lbl_8045BF68@ha /* 8003711C 0003407C 38 63 BF 68 */ addi r3, r3, lbl_8045BF68@l -/* 80037120 00034080 4E 80 00 20 */ blr +/* 80037120 00034080 4E 80 00 20 */ blr .global "ReferenceCount__24TOneStatic<10CTweakGame>Fv" "ReferenceCount__24TOneStatic<10CTweakGame>Fv": @@ -1892,7 +1892,7 @@ lbl_800370E0: /* 8003713C 0003409C 98 0D A1 A0 */ stb r0, lbl_805A8D60@sda21(r13) lbl_80037140: /* 80037140 000340A0 38 6D A1 9C */ addi r3, r13, lbl_805A8D5C@sda21 -/* 80037144 000340A4 4E 80 00 20 */ blr +/* 80037144 000340A4 4E 80 00 20 */ blr .global "__nw__24TOneStatic<10CTweakBall>FUlPCcPCc" "__nw__24TOneStatic<10CTweakBall>FUlPCcPCc": @@ -1907,13 +1907,13 @@ lbl_80037140: /* 80037168 000340C8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8003716C 000340CC 7C 08 03 A6 */ mtlr r0 /* 80037170 000340D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80037174 000340D4 4E 80 00 20 */ blr +/* 80037174 000340D4 4E 80 00 20 */ blr .global "GetAllocSpace__24TOneStatic<10CTweakBall>Fv" "GetAllocSpace__24TOneStatic<10CTweakBall>Fv": /* 80037178 000340D8 3C 60 80 46 */ lis r3, lbl_8045BFD0@ha /* 8003717C 000340DC 38 63 BF D0 */ addi r3, r3, lbl_8045BFD0@l -/* 80037180 000340E0 4E 80 00 20 */ blr +/* 80037180 000340E0 4E 80 00 20 */ blr .global "ReferenceCount__24TOneStatic<10CTweakBall>Fv" "ReferenceCount__24TOneStatic<10CTweakBall>Fv": @@ -1926,7 +1926,7 @@ lbl_80037140: /* 8003719C 000340FC 98 0D A1 A8 */ stb r0, lbl_805A8D68@sda21(r13) lbl_800371A0: /* 800371A0 00034100 38 6D A1 A4 */ addi r3, r13, lbl_805A8D64@sda21 -/* 800371A4 00034104 4E 80 00 20 */ blr +/* 800371A4 00034104 4E 80 00 20 */ blr .global "__nw__26TOneStatic<12CTweakPlayer>FUlPCcPCc" "__nw__26TOneStatic<12CTweakPlayer>FUlPCcPCc": @@ -1941,10 +1941,10 @@ lbl_800371A0: /* 800371C8 00034128 80 01 00 14 */ lwz r0, 0x14(r1) /* 800371CC 0003412C 7C 08 03 A6 */ mtlr r0 /* 800371D0 00034130 38 21 00 10 */ addi r1, r1, 0x10 -/* 800371D4 00034134 4E 80 00 20 */ blr +/* 800371D4 00034134 4E 80 00 20 */ blr .global "GetAllocSpace__26TOneStatic<12CTweakPlayer>Fv" "GetAllocSpace__26TOneStatic<12CTweakPlayer>Fv": /* 800371D8 00034138 3C 60 80 46 */ lis r3, lbl_8045C208@ha /* 800371DC 0003413C 38 63 C2 08 */ addi r3, r3, lbl_8045C208@l -/* 800371E0 00034140 4E 80 00 20 */ blr +/* 800371E0 00034140 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/Weapons/CAuxWeapon.s b/asm/MetroidPrime/Weapons/CAuxWeapon.s index b227d172..59bc65dc 100644 --- a/asm/MetroidPrime/Weapons/CAuxWeapon.s +++ b/asm/MetroidPrime/Weapons/CAuxWeapon.s @@ -44,7 +44,7 @@ lbl_801B8918: /* 801B892C 001B588C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801B8930 001B5890 7C 08 03 A6 */ mtlr r0 /* 801B8934 001B5894 38 21 00 10 */ addi r1, r1, 0x10 -/* 801B8938 001B5898 4E 80 00 20 */ blr +/* 801B8938 001B5898 4E 80 00 20 */ blr .global Load__10CAuxWeaponFiR13CStateManager Load__10CAuxWeaponFiR13CStateManager: @@ -94,7 +94,7 @@ lbl_801B899C: /* 801B89DC 001B593C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 801B89E0 001B5940 7C 08 03 A6 */ mtlr r0 /* 801B89E4 001B5944 38 21 00 20 */ addi r1, r1, 0x20 -/* 801B89E8 001B5948 4E 80 00 20 */ blr +/* 801B89E8 001B5948 4E 80 00 20 */ blr .global FreeComboVoiceId__10CAuxWeaponFv FreeComboVoiceId__10CAuxWeaponFv: @@ -113,7 +113,7 @@ FreeComboVoiceId__10CAuxWeaponFv: /* 801B8A1C 001B597C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801B8A20 001B5980 7C 08 03 A6 */ mtlr r0 /* 801B8A24 001B5984 38 21 00 20 */ addi r1, r1, 0x20 -/* 801B8A28 001B5988 4E 80 00 20 */ blr +/* 801B8A28 001B5988 4E 80 00 20 */ blr .global AcceptScriptMsg__10CAuxWeaponF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__10CAuxWeaponF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -140,7 +140,7 @@ lbl_801B8A6C: /* 801B8A74 001B59D4 83 C1 00 08 */ lwz r30, 8(r1) /* 801B8A78 001B59D8 7C 08 03 A6 */ mtlr r0 /* 801B8A7C 001B59DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801B8A80 001B59E0 4E 80 00 20 */ blr +/* 801B8A80 001B59E0 4E 80 00 20 */ blr .global DeleteWaveBusterBeam__10CAuxWeaponFR13CStateManager DeleteWaveBusterBeam__10CAuxWeaponFR13CStateManager: @@ -180,7 +180,7 @@ lbl_801B8AFC: /* 801B8B04 001B5A64 83 C1 00 18 */ lwz r30, 0x18(r1) /* 801B8B08 001B5A68 7C 08 03 A6 */ mtlr r0 /* 801B8B0C 001B5A6C 38 21 00 20 */ addi r1, r1, 0x20 -/* 801B8B10 001B5A70 4E 80 00 20 */ blr +/* 801B8B10 001B5A70 4E 80 00 20 */ blr .global DeleteFlameThrower__10CAuxWeaponFR13CStateManager DeleteFlameThrower__10CAuxWeaponFR13CStateManager: @@ -220,7 +220,7 @@ lbl_801B8B8C: /* 801B8B94 001B5AF4 83 C1 00 18 */ lwz r30, 0x18(r1) /* 801B8B98 001B5AF8 7C 08 03 A6 */ mtlr r0 /* 801B8B9C 001B5AFC 38 21 00 20 */ addi r1, r1, 0x20 -/* 801B8BA0 001B5B00 4E 80 00 20 */ blr +/* 801B8BA0 001B5B00 4E 80 00 20 */ blr .global CreateWaveBusterBeam__10CAuxWeaponFUi9TUniqueIdRC12CTransform4fR13CStateManager CreateWaveBusterBeam__10CAuxWeaponFUi9TUniqueIdRC12CTransform4fR13CStateManager: @@ -311,7 +311,7 @@ lbl_801B8CDC: /* 801B8CEC 001B5C4C 38 80 00 01 */ li r4, 1 /* 801B8CF0 001B5C50 81 8C 00 08 */ lwz r12, 8(r12) /* 801B8CF4 001B5C54 7D 89 03 A6 */ mtctr r12 -/* 801B8CF8 001B5C58 4E 80 04 21 */ bctrl +/* 801B8CF8 001B5C58 4E 80 04 21 */ bctrl lbl_801B8CFC: /* 801B8CFC 001B5C5C 7F 40 07 75 */ extsb. r0, r26 /* 801B8D00 001B5C60 93 BC 00 24 */ stw r29, 0x24(r28) @@ -346,7 +346,7 @@ lbl_801B8D68: /* 801B8D6C 001B5CCC 80 01 00 74 */ lwz r0, 0x74(r1) /* 801B8D70 001B5CD0 7C 08 03 A6 */ mtlr r0 /* 801B8D74 001B5CD4 38 21 00 70 */ addi r1, r1, 0x70 -/* 801B8D78 001B5CD8 4E 80 00 20 */ blr +/* 801B8D78 001B5CD8 4E 80 00 20 */ blr .global CreateFlameThrower__10CAuxWeaponFRC12CTransform4fR13CStateManagerf CreateFlameThrower__10CAuxWeaponFRC12CTransform4fR13CStateManagerf: @@ -475,7 +475,7 @@ lbl_801B8F44: /* 801B8F5C 001B5EBC 7F 84 E3 78 */ mr r4, r28 /* 801B8F60 001B5EC0 81 8C 00 14 */ lwz r12, 0x14(r12) /* 801B8F64 001B5EC4 7D 89 03 A6 */ mtctr r12 -/* 801B8F68 001B5EC8 4E 80 04 21 */ bctrl +/* 801B8F68 001B5EC8 4E 80 04 21 */ bctrl /* 801B8F6C 001B5ECC 7E E3 BB 78 */ mr r3, r23 /* 801B8F70 001B5ED0 7F 64 DB 78 */ mr r4, r27 /* 801B8F74 001B5ED4 7F 85 E3 78 */ mr r5, r28 @@ -508,7 +508,7 @@ lbl_801B8FCC: /* 801B8FDC 001B5F3C 38 80 00 01 */ li r4, 1 /* 801B8FE0 001B5F40 81 8C 00 08 */ lwz r12, 8(r12) /* 801B8FE4 001B5F44 7D 89 03 A6 */ mtctr r12 -/* 801B8FE8 001B5F48 4E 80 04 21 */ bctrl +/* 801B8FE8 001B5F48 4E 80 04 21 */ bctrl lbl_801B8FEC: /* 801B8FEC 001B5F4C 7F 00 07 75 */ extsb. r0, r24 /* 801B8FF0 001B5F50 92 FA 00 24 */ stw r23, 0x24(r26) @@ -544,7 +544,7 @@ lbl_801B9058: /* 801B9060 001B5FC0 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 801B9064 001B5FC4 7C 08 03 A6 */ mtlr r0 /* 801B9068 001B5FC8 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 801B906C 001B5FCC 4E 80 00 20 */ blr +/* 801B906C 001B5FCC 4E 80 00 20 */ blr .global LaunchMissile__10CAuxWeaponFbbiUiRC12CTransform4f9TUniqueIdR13CStateManager LaunchMissile__10CAuxWeaponFbbiUiRC12CTransform4f9TUniqueIdR13CStateManager: @@ -684,7 +684,7 @@ lbl_801B923C: /* 801B925C 001B61BC 7F C4 F3 78 */ mr r4, r30 /* 801B9260 001B61C0 81 8C 00 14 */ lwz r12, 0x14(r12) /* 801B9264 001B61C4 7D 89 03 A6 */ mtctr r12 -/* 801B9268 001B61C8 4E 80 04 21 */ bctrl +/* 801B9268 001B61C8 4E 80 04 21 */ bctrl lbl_801B926C: /* 801B926C 001B61CC 57 60 06 3F */ clrlwi. r0, r27, 0x18 /* 801B9270 001B61D0 41 82 00 AC */ beq lbl_801B931C @@ -755,7 +755,7 @@ lbl_801B9334: /* 801B9360 001B62C0 80 01 01 D4 */ lwz r0, 0x1d4(r1) /* 801B9364 001B62C4 7C 08 03 A6 */ mtlr r0 /* 801B9368 001B62C8 38 21 01 D0 */ addi r1, r1, 0x1d0 -/* 801B936C 001B62CC 4E 80 00 20 */ blr +/* 801B936C 001B62CC 4E 80 00 20 */ blr .global InitComboData__10CAuxWeaponFv InitComboData__10CAuxWeaponFv: @@ -775,7 +775,7 @@ lbl_801B9394: /* 801B93A0 001B6300 81 84 00 00 */ lwz r12, 0(r4) /* 801B93A4 001B6304 81 8C 00 10 */ lwz r12, 0x10(r12) /* 801B93A8 001B6308 7D 89 03 A6 */ mtctr r12 -/* 801B93AC 001B630C 4E 80 04 21 */ bctrl +/* 801B93AC 001B630C 4E 80 04 21 */ bctrl /* 801B93B0 001B6310 38 61 00 10 */ addi r3, r1, 0x10 /* 801B93B4 001B6314 38 81 00 08 */ addi r4, r1, 8 /* 801B93B8 001B6318 48 18 7A F1 */ bl __ct__6CTokenFRC6CToken @@ -808,7 +808,7 @@ lbl_801B93E8: /* 801B9420 001B6380 80 01 00 44 */ lwz r0, 0x44(r1) /* 801B9424 001B6384 7C 08 03 A6 */ mtlr r0 /* 801B9428 001B6388 38 21 00 40 */ addi r1, r1, 0x40 -/* 801B942C 001B638C 4E 80 00 20 */ blr +/* 801B942C 001B638C 4E 80 00 20 */ blr .global IsComboFxActive__10CAuxWeaponCFRC13CStateManager IsComboFxActive__10CAuxWeaponCFRC13CStateManager: @@ -850,7 +850,7 @@ lbl_801B94AC: /* 801B94AC 001B640C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801B94B0 001B6410 7C 08 03 A6 */ mtlr r0 /* 801B94B4 001B6414 38 21 00 10 */ addi r1, r1, 0x10 -/* 801B94B8 001B6418 4E 80 00 20 */ blr +/* 801B94B8 001B6418 4E 80 00 20 */ blr .global StopComboFx__10CAuxWeaponFR13CStateManagerb StopComboFx__10CAuxWeaponFR13CStateManagerb: @@ -930,7 +930,7 @@ lbl_801B95C0: /* 801B95CC 001B652C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 801B95D0 001B6530 7C 08 03 A6 */ mtlr r0 /* 801B95D4 001B6534 38 21 00 20 */ addi r1, r1, 0x20 -/* 801B95D8 001B6538 4E 80 00 20 */ blr +/* 801B95D8 001B6538 4E 80 00 20 */ blr .global UpdateComboFx__10CAuxWeaponFfRC9CVector3fRC9CVector3fRC12CTransform4fR13CStateManager UpdateComboFx__10CAuxWeaponFfRC9CVector3fRC9CVector3fRC12CTransform4fR13CStateManager: @@ -1083,25 +1083,25 @@ lbl_801B97F0: /* 801B97F8 001B6758 81 83 00 00 */ lwz r12, 0(r3) /* 801B97FC 001B675C 81 8C 00 20 */ lwz r12, 0x20(r12) /* 801B9800 001B6760 7D 89 03 A6 */ mtctr r12 -/* 801B9804 001B6764 4E 80 04 21 */ bctrl +/* 801B9804 001B6764 4E 80 04 21 */ bctrl /* 801B9808 001B6768 80 78 00 24 */ lwz r3, 0x24(r24) /* 801B980C 001B676C 7F 24 CB 78 */ mr r4, r25 /* 801B9810 001B6770 81 83 00 00 */ lwz r12, 0(r3) /* 801B9814 001B6774 81 8C 00 24 */ lwz r12, 0x24(r12) /* 801B9818 001B6778 7D 89 03 A6 */ mtctr r12 -/* 801B981C 001B677C 4E 80 04 21 */ bctrl +/* 801B981C 001B677C 4E 80 04 21 */ bctrl /* 801B9820 001B6780 80 78 00 24 */ lwz r3, 0x24(r24) /* 801B9824 001B6784 57 A4 06 3E */ clrlwi r4, r29, 0x18 /* 801B9828 001B6788 81 83 00 00 */ lwz r12, 0(r3) /* 801B982C 001B678C 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 801B9830 001B6790 7D 89 03 A6 */ mtctr r12 -/* 801B9834 001B6794 4E 80 04 21 */ bctrl +/* 801B9834 001B6794 4E 80 04 21 */ bctrl /* 801B9838 001B6798 80 78 00 24 */ lwz r3, 0x24(r24) /* 801B983C 001B679C FC 20 F8 90 */ fmr f1, f31 /* 801B9840 001B67A0 81 83 00 00 */ lwz r12, 0(r3) /* 801B9844 001B67A4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801B9848 001B67A8 7D 89 03 A6 */ mtctr r12 -/* 801B984C 001B67AC 4E 80 04 21 */ bctrl +/* 801B984C 001B67AC 4E 80 04 21 */ bctrl lbl_801B9850: /* 801B9850 001B67B0 57 C3 06 3E */ clrlwi r3, r30, 0x18 lbl_801B9854: @@ -1111,7 +1111,7 @@ lbl_801B9854: /* 801B9860 001B67C0 80 01 00 54 */ lwz r0, 0x54(r1) /* 801B9864 001B67C4 7C 08 03 A6 */ mtlr r0 /* 801B9868 001B67C8 38 21 00 50 */ addi r1, r1, 0x50 -/* 801B986C 001B67CC 4E 80 00 20 */ blr +/* 801B986C 001B67CC 4E 80 00 20 */ blr .global RenderMuzzleFx__10CAuxWeaponCFv RenderMuzzleFx__10CAuxWeaponCFv: @@ -1129,12 +1129,12 @@ lbl_801B9894: /* 801B9898 001B67F8 81 83 00 00 */ lwz r12, 0(r3) /* 801B989C 001B67FC 81 8C 00 10 */ lwz r12, 0x10(r12) /* 801B98A0 001B6800 7D 89 03 A6 */ mtctr r12 -/* 801B98A4 001B6804 4E 80 04 21 */ bctrl +/* 801B98A4 001B6804 4E 80 04 21 */ bctrl lbl_801B98A8: /* 801B98A8 001B6808 80 01 00 14 */ lwz r0, 0x14(r1) /* 801B98AC 001B680C 7C 08 03 A6 */ mtlr r0 /* 801B98B0 001B6810 38 21 00 10 */ addi r1, r1, 0x10 -/* 801B98B4 001B6814 4E 80 00 20 */ blr +/* 801B98B4 001B6814 4E 80 00 20 */ blr .global HasTarget__10CAuxWeaponCFRC13CStateManager HasTarget__10CAuxWeaponCFRC13CStateManager: @@ -1166,7 +1166,7 @@ lbl_801B990C: /* 801B9910 001B6870 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801B9914 001B6874 7C 08 03 A6 */ mtlr r0 /* 801B9918 001B6878 38 21 00 20 */ addi r1, r1, 0x20 -/* 801B991C 001B687C 4E 80 00 20 */ blr +/* 801B991C 001B687C 4E 80 00 20 */ blr .global SetNewTarget__10CAuxWeaponF9TUniqueIdR13CStateManager SetNewTarget__10CAuxWeaponF9TUniqueIdR13CStateManager: @@ -1200,7 +1200,7 @@ lbl_801B997C: /* 801B9984 001B68E4 83 C1 00 18 */ lwz r30, 0x18(r1) /* 801B9988 001B68E8 7C 08 03 A6 */ mtlr r0 /* 801B998C 001B68EC 38 21 00 20 */ addi r1, r1, 0x20 -/* 801B9990 001B68F0 4E 80 00 20 */ blr +/* 801B9990 001B68F0 4E 80 00 20 */ blr .global Fire__10CAuxWeaponFfbiQ212CPlayerState12EChargeStageRC12CTransform4fR13CStateManager11EWeaponType9TUniqueId Fire__10CAuxWeaponFfbiQ212CPlayerState12EChargeStageRC12CTransform4fR13CStateManager11EWeaponType9TUniqueId: @@ -1290,7 +1290,7 @@ lbl_801B9AB8: /* 801B9AC0 001B6A20 80 01 00 44 */ lwz r0, 0x44(r1) /* 801B9AC4 001B6A24 7C 08 03 A6 */ mtlr r0 /* 801B9AC8 001B6A28 38 21 00 40 */ addi r1, r1, 0x40 -/* 801B9ACC 001B6A2C 4E 80 00 20 */ blr +/* 801B9ACC 001B6A2C 4E 80 00 20 */ blr .global __ct__10CAuxWeaponF9TUniqueId __ct__10CAuxWeaponF9TUniqueId: @@ -1310,7 +1310,7 @@ __ct__10CAuxWeaponF9TUniqueId: /* 801B9B04 001B6A64 81 84 00 00 */ lwz r12, 0(r4) /* 801B9B08 001B6A68 81 8C 00 10 */ lwz r12, 0x10(r12) /* 801B9B0C 001B6A6C 7D 89 03 A6 */ mtctr r12 -/* 801B9B10 001B6A70 4E 80 04 21 */ bctrl +/* 801B9B10 001B6A70 4E 80 04 21 */ bctrl /* 801B9B14 001B6A74 7F C3 F3 78 */ mr r3, r30 /* 801B9B18 001B6A78 38 81 00 18 */ addi r4, r1, 0x18 /* 801B9B1C 001B6A7C 48 18 73 8D */ bl __ct__6CTokenFRC6CToken @@ -1329,7 +1329,7 @@ __ct__10CAuxWeaponF9TUniqueId: /* 801B9B50 001B6AB0 38 A5 00 BE */ addi r5, r5, 0xbe /* 801B9B54 001B6AB4 81 8C 00 10 */ lwz r12, 0x10(r12) /* 801B9B58 001B6AB8 7D 89 03 A6 */ mtctr r12 -/* 801B9B5C 001B6ABC 4E 80 04 21 */ bctrl +/* 801B9B5C 001B6ABC 4E 80 04 21 */ bctrl /* 801B9B60 001B6AC0 3B BE 00 0C */ addi r29, r30, 0xc /* 801B9B64 001B6AC4 38 81 00 10 */ addi r4, r1, 0x10 /* 801B9B68 001B6AC8 7F A3 EB 78 */ mr r3, r29 @@ -1349,7 +1349,7 @@ __ct__10CAuxWeaponF9TUniqueId: /* 801B9BA0 001B6B00 38 A5 00 CA */ addi r5, r5, 0xca /* 801B9BA4 001B6B04 81 8C 00 10 */ lwz r12, 0x10(r12) /* 801B9BA8 001B6B08 7D 89 03 A6 */ mtctr r12 -/* 801B9BAC 001B6B0C 4E 80 04 21 */ bctrl +/* 801B9BAC 001B6B0C 4E 80 04 21 */ bctrl /* 801B9BB0 001B6B10 3B BE 00 18 */ addi r29, r30, 0x18 /* 801B9BB4 001B6B14 38 81 00 08 */ addi r4, r1, 8 /* 801B9BB8 001B6B18 7F A3 EB 78 */ mr r3, r29 diff --git a/asm/MetroidPrime/Weapons/CBeamProjectile.s b/asm/MetroidPrime/Weapons/CBeamProjectile.s index 33dd1e5a..53c3707a 100644 --- a/asm/MetroidPrime/Weapons/CBeamProjectile.s +++ b/asm/MetroidPrime/Weapons/CBeamProjectile.s @@ -371,7 +371,7 @@ lbl_80199298: /* 801992B0 00196210 83 81 09 D0 */ lwz r28, 0x9d0(r1) /* 801992B4 00196214 7C 08 03 A6 */ mtlr r0 /* 801992B8 00196218 38 21 09 F0 */ addi r1, r1, 0x9f0 -/* 801992BC 0019621C 4E 80 00 20 */ blr +/* 801992BC 0019621C 4E 80 00 20 */ blr .global SetCollisionResultData__15CBeamProjectileFQ215CBeamProjectile11EDamageTypeRC14CRayCastResult SetCollisionResultData__15CBeamProjectileFQ215CBeamProjectile11EDamageTypeRC14CRayCastResult: @@ -406,20 +406,20 @@ lbl_80199318: /* 80199328 00196288 80 01 00 14 */ lwz r0, 0x14(r1) /* 8019932C 0019628C 7C 08 03 A6 */ mtlr r0 /* 80199330 00196290 38 21 00 10 */ addi r1, r1, 0x10 -/* 80199334 00196294 4E 80 00 20 */ blr +/* 80199334 00196294 4E 80 00 20 */ blr .global ResetBeam__15CBeamProjectileFR13CStateManagerb ResetBeam__15CBeamProjectileFR13CStateManagerb: /* 80199338 00196298 88 03 04 64 */ lbz r0, 0x464(r3) /* 8019933C 0019629C 54 00 CF FF */ rlwinm. r0, r0, 0x19, 0x1f, 0x1f -/* 80199340 001962A0 4D 82 00 20 */ beqlr +/* 80199340 001962A0 4D 82 00 20 */ beqlr /* 80199344 001962A4 C0 02 A6 C8 */ lfs f0, lbl_805AC3E8@sda21(r2) /* 80199348 001962A8 D0 03 03 00 */ stfs f0, 0x300(r3) -/* 8019934C 001962AC 4E 80 00 20 */ blr +/* 8019934C 001962AC 4E 80 00 20 */ blr .global nullsub_142 nullsub_142: -/* 80199350 001962B0 4E 80 00 20 */ blr +/* 80199350 001962B0 4E 80 00 20 */ blr .global Accept__15CBeamProjectileFR8IVisitor Accept__15CBeamProjectileFR8IVisitor: @@ -432,11 +432,11 @@ Accept__15CBeamProjectileFR8IVisitor: /* 8019936C 001962CC 7C 04 03 78 */ mr r4, r0 /* 80199370 001962D0 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 80199374 001962D4 7D 89 03 A6 */ mtctr r12 -/* 80199378 001962D8 4E 80 04 21 */ bctrl +/* 80199378 001962D8 4E 80 04 21 */ bctrl /* 8019937C 001962DC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80199380 001962E0 7C 08 03 A6 */ mtlr r0 /* 80199384 001962E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80199388 001962E8 4E 80 00 20 */ blr +/* 80199388 001962E8 4E 80 00 20 */ blr .global CalculateRenderBounds__15CBeamProjectileFv CalculateRenderBounds__15CBeamProjectileFv: @@ -465,7 +465,7 @@ CalculateRenderBounds__15CBeamProjectileFv: /* 801993E4 00196344 80 01 00 34 */ lwz r0, 0x34(r1) /* 801993E8 00196348 7C 08 03 A6 */ mtlr r0 /* 801993EC 0019634C 38 21 00 30 */ addi r1, r1, 0x30 -/* 801993F0 00196350 4E 80 00 20 */ blr +/* 801993F0 00196350 4E 80 00 20 */ blr .global GetTouchBounds__15CBeamProjectileCFv GetTouchBounds__15CBeamProjectileCFv: @@ -509,7 +509,7 @@ lbl_8019941C: /* 80199480 001963E0 D0 03 00 14 */ stfs f0, 0x14(r3) lbl_80199484: /* 80199484 001963E4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80199488 001963E8 4E 80 00 20 */ blr +/* 80199488 001963E8 4E 80 00 20 */ blr .global "__ct__15CBeamProjectileFRC28TToken<18CWeaponDescription>RCQ24rstl66basic_string,Q24rstl17rmemory_allocator>11EWeaponTypeRC12CTransform4fiff14EMaterialTypesRC11CDamageInfo9TUniqueId9TUniqueIdUib" "__ct__15CBeamProjectileFRC28TToken<18CWeaponDescription>RCQ24rstl66basic_string,Q24rstl17rmemory_allocator>11EWeaponTypeRC12CTransform4fiff14EMaterialTypesRC11CDamageInfo9TUniqueId9TUniqueIdUib": diff --git a/asm/MetroidPrime/Weapons/CBomb.s b/asm/MetroidPrime/Weapons/CBomb.s index 7af9f5e9..178292b5 100644 --- a/asm/MetroidPrime/Weapons/CBomb.s +++ b/asm/MetroidPrime/Weapons/CBomb.s @@ -124,7 +124,7 @@ sub_8008faf0: /* 8008FB10 0008CA70 81 83 00 00 */ lwz r12, 0(r3) /* 8008FB14 0008CA74 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8008FB18 0008CA78 7D 89 03 A6 */ mtctr r12 -/* 8008FB1C 0008CA7C 4E 80 04 21 */ bctrl +/* 8008FB1C 0008CA7C 4E 80 04 21 */ bctrl /* 8008FB20 0008CA80 A0 7E 01 88 */ lhz r3, 0x188(r30) /* 8008FB24 0008CA84 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8008FB28 0008CA88 7C 03 00 40 */ cmplw r3, r0 @@ -148,7 +148,7 @@ sub_8008faf0: /* 8008FB70 0008CAD0 81 84 00 00 */ lwz r12, 0(r4) /* 8008FB74 0008CAD4 81 8C 00 68 */ lwz r12, 0x68(r12) /* 8008FB78 0008CAD8 7D 89 03 A6 */ mtctr r12 -/* 8008FB7C 0008CADC 4E 80 04 21 */ bctrl +/* 8008FB7C 0008CADC 4E 80 04 21 */ bctrl /* 8008FB80 0008CAE0 7F E3 FB 78 */ mr r3, r31 /* 8008FB84 0008CAE4 38 81 00 14 */ addi r4, r1, 0x14 /* 8008FB88 0008CAE8 48 02 5B BD */ bl SetLight__10CGameLightFRC6CLight @@ -158,7 +158,7 @@ lbl_8008FB8C: /* 8008FB94 0008CAF4 83 C1 00 68 */ lwz r30, 0x68(r1) /* 8008FB98 0008CAF8 7C 08 03 A6 */ mtlr r0 /* 8008FB9C 0008CAFC 38 21 00 70 */ addi r1, r1, 0x70 -/* 8008FBA0 0008CB00 4E 80 00 20 */ blr +/* 8008FBA0 0008CB00 4E 80 00 20 */ blr .global GetTouchBounds__5CBombCFv GetTouchBounds__5CBombCFv: @@ -287,7 +287,7 @@ lbl_8008FD10: /* 8008FD54 0008CCB4 D0 A3 00 14 */ stfs f5, 0x14(r3) lbl_8008FD58: /* 8008FD58 0008CCB8 38 21 00 80 */ addi r1, r1, 0x80 -/* 8008FD5C 0008CCBC 4E 80 00 20 */ blr +/* 8008FD5C 0008CCBC 4E 80 00 20 */ blr .global AcceptScriptMsg__5CBombF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__5CBombF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -310,7 +310,7 @@ lbl_8008FD98: /* 8008FD9C 0008CCFC 81 83 00 00 */ lwz r12, 0(r3) /* 8008FDA0 0008CD00 81 8C 00 64 */ lwz r12, 0x64(r12) /* 8008FDA4 0008CD04 7D 89 03 A6 */ mtctr r12 -/* 8008FDA8 0008CD08 4E 80 04 21 */ bctrl +/* 8008FDA8 0008CD08 4E 80 04 21 */ bctrl /* 8008FDAC 0008CD0C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8008FDB0 0008CD10 41 82 01 0C */ beq lbl_8008FEBC /* 8008FDB4 0008CD14 7F E4 FB 78 */ mr r4, r31 @@ -353,7 +353,7 @@ lbl_8008FD98: /* 8008FE48 0008CDA8 81 84 00 00 */ lwz r12, 0(r4) /* 8008FE4C 0008CDAC 81 8C 00 68 */ lwz r12, 0x68(r12) /* 8008FE50 0008CDB0 7D 89 03 A6 */ mtctr r12 -/* 8008FE54 0008CDB4 4E 80 04 21 */ bctrl +/* 8008FE54 0008CDB4 4E 80 04 21 */ bctrl /* 8008FE58 0008CDB8 93 21 00 08 */ stw r25, 8(r1) /* 8008FE5C 0008CDBC 38 00 00 01 */ li r0, 1 /* 8008FE60 0008CDC0 C0 22 8A E0 */ lfs f1, lbl_805AA800@sda21(r2) @@ -449,7 +449,7 @@ lbl_8008FF90: /* 8008FFB0 0008CF10 80 01 00 F4 */ lwz r0, 0xf4(r1) /* 8008FFB4 0008CF14 7C 08 03 A6 */ mtlr r0 /* 8008FFB8 0008CF18 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 8008FFBC 0008CF1C 4E 80 00 20 */ blr +/* 8008FFBC 0008CF1C 4E 80 00 20 */ blr .global Accept__5CBombFR8IVisitor Accept__5CBombFR8IVisitor: @@ -462,11 +462,11 @@ Accept__5CBombFR8IVisitor: /* 8008FFD8 0008CF38 7C 04 03 78 */ mr r4, r0 /* 8008FFDC 0008CF3C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8008FFE0 0008CF40 7D 89 03 A6 */ mtctr r12 -/* 8008FFE4 0008CF44 4E 80 04 21 */ bctrl +/* 8008FFE4 0008CF44 4E 80 04 21 */ bctrl /* 8008FFE8 0008CF48 80 01 00 14 */ lwz r0, 0x14(r1) /* 8008FFEC 0008CF4C 7C 08 03 A6 */ mtlr r0 /* 8008FFF0 0008CF50 38 21 00 10 */ addi r1, r1, 0x10 -/* 8008FFF4 0008CF54 4E 80 00 20 */ blr +/* 8008FFF4 0008CF54 4E 80 00 20 */ blr .global Think__5CBombFfR13CStateManager Think__5CBombFfR13CStateManager: @@ -516,7 +516,7 @@ Think__5CBombFfR13CStateManager: /* 800900A4 0008D004 38 80 00 01 */ li r4, 1 /* 800900A8 0008D008 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 800900AC 0008D00C 7D 89 03 A6 */ mtctr r12 -/* 800900B0 0008D010 4E 80 04 21 */ bctrl +/* 800900B0 0008D010 4E 80 04 21 */ bctrl lbl_800900B4: /* 800900B4 0008D014 C0 3E 01 7C */ lfs f1, 0x17c(r30) /* 800900B8 0008D018 C0 02 8A E4 */ lfs f0, lbl_805AA804@sda21(r2) @@ -527,7 +527,7 @@ lbl_800900B4: /* 800900CC 0008D02C 81 83 00 00 */ lwz r12, 0(r3) /* 800900D0 0008D030 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800900D4 0008D034 7D 89 03 A6 */ mtctr r12 -/* 800900D8 0008D038 4E 80 04 21 */ bctrl +/* 800900D8 0008D038 4E 80 04 21 */ bctrl /* 800900DC 0008D03C 48 00 00 14 */ b lbl_800900F0 lbl_800900E0: /* 800900E0 0008D040 FC 20 F8 90 */ fmr f1, f31 @@ -551,7 +551,7 @@ lbl_8009010C: /* 80090120 0008D080 81 83 00 00 */ lwz r12, 0(r3) /* 80090124 0008D084 81 8C 00 58 */ lwz r12, 0x58(r12) /* 80090128 0008D088 7D 89 03 A6 */ mtctr r12 -/* 8009012C 0008D08C 4E 80 04 21 */ bctrl +/* 8009012C 0008D08C 4E 80 04 21 */ bctrl /* 80090130 0008D090 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80090134 0008D094 41 82 00 1C */ beq lbl_80090150 /* 80090138 0008D098 A0 1E 00 08 */ lhz r0, 8(r30) @@ -734,7 +734,7 @@ lbl_800903C8: /* 800903E8 0008D348 81 83 00 00 */ lwz r12, 0(r3) /* 800903EC 0008D34C 81 8C 00 20 */ lwz r12, 0x20(r12) /* 800903F0 0008D350 7D 89 03 A6 */ mtctr r12 -/* 800903F4 0008D354 4E 80 04 21 */ bctrl +/* 800903F4 0008D354 4E 80 04 21 */ bctrl /* 800903F8 0008D358 C0 5E 00 60 */ lfs f2, 0x60(r30) /* 800903FC 0008D35C 38 81 00 28 */ addi r4, r1, 0x28 /* 80090400 0008D360 C0 3E 00 50 */ lfs f1, 0x50(r30) @@ -746,7 +746,7 @@ lbl_800903C8: /* 80090418 0008D378 81 83 00 00 */ lwz r12, 0(r3) /* 8009041C 0008D37C 81 8C 00 20 */ lwz r12, 0x20(r12) /* 80090420 0008D380 7D 89 03 A6 */ mtctr r12 -/* 80090424 0008D384 4E 80 04 21 */ bctrl +/* 80090424 0008D384 4E 80 04 21 */ bctrl /* 80090428 0008D388 E3 E1 00 E8 */ psq_l f31, 232(r1), 0, qr0 /* 8009042C 0008D38C 80 01 00 F4 */ lwz r0, 0xf4(r1) /* 80090430 0008D390 CB E1 00 E0 */ lfd f31, 0xe0(r1) @@ -756,11 +756,11 @@ lbl_800903C8: /* 80090440 0008D3A0 83 81 00 D0 */ lwz r28, 0xd0(r1) /* 80090444 0008D3A4 7C 08 03 A6 */ mtlr r0 /* 80090448 0008D3A8 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 8009044C 0008D3AC 4E 80 00 20 */ blr +/* 8009044C 0008D3AC 4E 80 00 20 */ blr .global nullsub_99 nullsub_99: -/* 80090450 0008D3B0 4E 80 00 20 */ blr +/* 80090450 0008D3B0 4E 80 00 20 */ blr .global AddToRenderer__5CBombCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__5CBombCFRC14CFrustumPlanesRC13CStateManager: @@ -831,7 +831,7 @@ AddToRenderer__5CBombCFRC14CFrustumPlanesRC13CStateManager: /* 80090554 0008D4B4 81 83 00 00 */ lwz r12, 0(r3) /* 80090558 0008D4B8 81 8C 00 38 */ lwz r12, 0x38(r12) /* 8009055C 0008D4BC 7D 89 03 A6 */ mtctr r12 -/* 80090560 0008D4C0 4E 80 04 21 */ bctrl +/* 80090560 0008D4C0 4E 80 04 21 */ bctrl /* 80090564 0008D4C4 48 00 00 48 */ b lbl_800905AC lbl_80090568: /* 80090568 0008D4C8 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) @@ -841,7 +841,7 @@ lbl_80090568: /* 80090578 0008D4D8 81 83 00 00 */ lwz r12, 0(r3) /* 8009057C 0008D4DC 81 8C 00 38 */ lwz r12, 0x38(r12) /* 80090580 0008D4E0 7D 89 03 A6 */ mtctr r12 -/* 80090584 0008D4E4 4E 80 04 21 */ bctrl +/* 80090584 0008D4E4 4E 80 04 21 */ bctrl /* 80090588 0008D4E8 48 00 00 24 */ b lbl_800905AC lbl_8009058C: /* 8009058C 0008D4EC 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) @@ -851,7 +851,7 @@ lbl_8009058C: /* 8009059C 0008D4FC 81 83 00 00 */ lwz r12, 0(r3) /* 800905A0 0008D500 81 8C 00 38 */ lwz r12, 0x38(r12) /* 800905A4 0008D504 7D 89 03 A6 */ mtctr r12 -/* 800905A8 0008D508 4E 80 04 21 */ bctrl +/* 800905A8 0008D508 4E 80 04 21 */ bctrl lbl_800905AC: /* 800905AC 0008D50C E3 E1 00 98 */ psq_l f31, 152(r1), 0, qr0 /* 800905B0 0008D510 CB E1 00 90 */ lfd f31, 0x90(r1) @@ -863,13 +863,13 @@ lbl_800905AC: /* 800905C8 0008D528 83 E1 00 6C */ lwz r31, 0x6c(r1) /* 800905CC 0008D52C 7C 08 03 A6 */ mtlr r0 /* 800905D0 0008D530 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 800905D4 0008D534 4E 80 00 20 */ blr +/* 800905D4 0008D534 4E 80 00 20 */ blr .global Touch__5CBombFR6CActorR13CStateManager Touch__5CBombFR6CActorR13CStateManager: /* 800905D8 0008D538 88 03 01 90 */ lbz r0, 0x190(r3) /* 800905DC 0008D53C 54 00 CF FF */ rlwinm. r0, r0, 0x19, 0x1f, 0x1f -/* 800905E0 0008D540 4E 80 00 20 */ blr +/* 800905E0 0008D540 4E 80 00 20 */ blr .global Explode__5CBombFRC9CVector3fR13CStateManager Explode__5CBombFRC9CVector3fR13CStateManager: @@ -939,7 +939,7 @@ Explode__5CBombFRC9CVector3fR13CStateManager: /* 800906E0 0008D640 80 01 00 54 */ lwz r0, 0x54(r1) /* 800906E4 0008D644 7C 08 03 A6 */ mtlr r0 /* 800906E8 0008D648 38 21 00 50 */ addi r1, r1, 0x50 -/* 800906EC 0008D64C 4E 80 00 20 */ blr +/* 800906EC 0008D64C 4E 80 00 20 */ blr .global __dt__5CBombFv __dt__5CBombFv: @@ -963,7 +963,7 @@ __dt__5CBombFv: /* 80090734 0008D694 38 80 00 01 */ li r4, 1 /* 80090738 0008D698 81 8C 00 08 */ lwz r12, 8(r12) /* 8009073C 0008D69C 7D 89 03 A6 */ mtctr r12 -/* 80090740 0008D6A0 4E 80 04 21 */ bctrl +/* 80090740 0008D6A0 4E 80 04 21 */ bctrl lbl_80090744: /* 80090744 0008D6A4 34 1E 01 80 */ addic. r0, r30, 0x180 /* 80090748 0008D6A8 41 82 00 24 */ beq lbl_8009076C @@ -974,7 +974,7 @@ lbl_80090744: /* 8009075C 0008D6BC 38 80 00 01 */ li r4, 1 /* 80090760 0008D6C0 81 8C 00 08 */ lwz r12, 8(r12) /* 80090764 0008D6C4 7D 89 03 A6 */ mtctr r12 -/* 80090768 0008D6C8 4E 80 04 21 */ bctrl +/* 80090768 0008D6C8 4E 80 04 21 */ bctrl lbl_8009076C: /* 8009076C 0008D6CC 7F C3 F3 78 */ mr r3, r30 /* 80090770 0008D6D0 38 80 00 00 */ li r4, 0 @@ -990,7 +990,7 @@ lbl_80090788: /* 80090794 0008D6F4 83 C1 00 08 */ lwz r30, 8(r1) /* 80090798 0008D6F8 7C 08 03 A6 */ mtlr r0 /* 8009079C 0008D6FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800907A0 0008D700 4E 80 00 20 */ blr +/* 800907A0 0008D700 4E 80 00 20 */ blr .global "__ct__5CBombF25TToken<15CGenDescription>25TToken<15CGenDescription>9TUniqueId7TAreaId9TUniqueIdfRC12CTransform4fRC11CDamageInfo" "__ct__5CBombF25TToken<15CGenDescription>25TToken<15CGenDescription>9TUniqueId7TAreaId9TUniqueIdfRC12CTransform4fRC11CDamageInfo": @@ -1213,7 +1213,7 @@ lbl_80090A7C: /* 80090AF4 0008DA54 81 83 00 00 */ lwz r12, 0(r3) /* 80090AF8 0008DA58 81 8C 00 20 */ lwz r12, 0x20(r12) /* 80090AFC 0008DA5C 7D 89 03 A6 */ mtctr r12 -/* 80090B00 0008DA60 4E 80 04 21 */ bctrl +/* 80090B00 0008DA60 4E 80 04 21 */ bctrl /* 80090B04 0008DA64 C0 5C 00 2C */ lfs f2, 0x2c(r28) /* 80090B08 0008DA68 38 81 00 50 */ addi r4, r1, 0x50 /* 80090B0C 0008DA6C C0 3C 00 1C */ lfs f1, 0x1c(r28) @@ -1225,7 +1225,7 @@ lbl_80090A7C: /* 80090B24 0008DA84 81 83 00 00 */ lwz r12, 0(r3) /* 80090B28 0008DA88 81 8C 00 20 */ lwz r12, 0x20(r12) /* 80090B2C 0008DA8C 7D 89 03 A6 */ mtctr r12 -/* 80090B30 0008DA90 4E 80 04 21 */ bctrl +/* 80090B30 0008DA90 4E 80 04 21 */ bctrl /* 80090B34 0008DA94 7F C3 F3 78 */ mr r3, r30 /* 80090B38 0008DA98 E3 E1 01 28 */ psq_l f31, 296(r1), 0, qr0 /* 80090B3C 0008DA9C CB E1 01 20 */ lfd f31, 0x120(r1) @@ -1233,4 +1233,4 @@ lbl_80090A7C: /* 80090B44 0008DAA4 80 01 01 34 */ lwz r0, 0x134(r1) /* 80090B48 0008DAA8 7C 08 03 A6 */ mtlr r0 /* 80090B4C 0008DAAC 38 21 01 30 */ addi r1, r1, 0x130 -/* 80090B50 0008DAB0 4E 80 00 20 */ blr +/* 80090B50 0008DAB0 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/Weapons/CElectricBeamProjectile.s b/asm/MetroidPrime/Weapons/CElectricBeamProjectile.s index b01dec6e..d04e19fe 100644 --- a/asm/MetroidPrime/Weapons/CElectricBeamProjectile.s +++ b/asm/MetroidPrime/Weapons/CElectricBeamProjectile.s @@ -70,7 +70,7 @@ __dt__23CElectricBeamProjectileFv: /* 80251BF4 0024EB54 38 80 00 01 */ li r4, 1 /* 80251BF8 0024EB58 81 8C 00 08 */ lwz r12, 8(r12) /* 80251BFC 0024EB5C 7D 89 03 A6 */ mtctr r12 -/* 80251C00 0024EB60 4E 80 04 21 */ bctrl +/* 80251C00 0024EB60 4E 80 04 21 */ bctrl lbl_80251C04: /* 80251C04 0024EB64 34 1E 04 6C */ addic. r0, r30, 0x46c /* 80251C08 0024EB68 41 82 00 18 */ beq lbl_80251C20 @@ -89,7 +89,7 @@ lbl_80251C20: /* 80251C38 0024EB98 38 80 00 01 */ li r4, 1 /* 80251C3C 0024EB9C 81 8C 00 08 */ lwz r12, 8(r12) /* 80251C40 0024EBA0 7D 89 03 A6 */ mtctr r12 -/* 80251C44 0024EBA4 4E 80 04 21 */ bctrl +/* 80251C44 0024EBA4 4E 80 04 21 */ bctrl lbl_80251C48: /* 80251C48 0024EBA8 7F C3 F3 78 */ mr r3, r30 /* 80251C4C 0024EBAC 38 80 00 00 */ li r4, 0 @@ -105,7 +105,7 @@ lbl_80251C64: /* 80251C70 0024EBD0 83 C1 00 08 */ lwz r30, 8(r1) /* 80251C74 0024EBD4 7C 08 03 A6 */ mtlr r0 /* 80251C78 0024EBD8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80251C7C 0024EBDC 4E 80 00 20 */ blr +/* 80251C7C 0024EBDC 4E 80 00 20 */ blr .global AcceptScriptMsg__23CElectricBeamProjectileF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__23CElectricBeamProjectileF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -157,7 +157,7 @@ lbl_80251CFC: /* 80251D28 0024EC88 83 81 00 20 */ lwz r28, 0x20(r1) /* 80251D2C 0024EC8C 7C 08 03 A6 */ mtlr r0 /* 80251D30 0024EC90 38 21 00 30 */ addi r1, r1, 0x30 -/* 80251D34 0024EC94 4E 80 00 20 */ blr +/* 80251D34 0024EC94 4E 80 00 20 */ blr .global sub_80251d38 sub_80251d38: @@ -174,19 +174,19 @@ sub_80251d38: /* 80251D60 0024ECC0 38 80 00 00 */ li r4, 0 /* 80251D64 0024ECC4 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80251D68 0024ECC8 7D 89 03 A6 */ mtctr r12 -/* 80251D6C 0024ECCC 4E 80 04 21 */ bctrl +/* 80251D6C 0024ECCC 4E 80 04 21 */ bctrl /* 80251D70 0024ECD0 80 7E 04 78 */ lwz r3, 0x478(r30) /* 80251D74 0024ECD4 38 80 00 00 */ li r4, 0 /* 80251D78 0024ECD8 81 83 00 00 */ lwz r12, 0(r3) /* 80251D7C 0024ECDC 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80251D80 0024ECE0 7D 89 03 A6 */ mtctr r12 -/* 80251D84 0024ECE4 4E 80 04 21 */ bctrl +/* 80251D84 0024ECE4 4E 80 04 21 */ bctrl /* 80251D88 0024ECE8 80 7E 04 68 */ lwz r3, 0x468(r30) /* 80251D8C 0024ECEC 38 80 00 00 */ li r4, 0 /* 80251D90 0024ECF0 81 83 00 00 */ lwz r12, 0(r3) /* 80251D94 0024ECF4 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80251D98 0024ECF8 7D 89 03 A6 */ mtctr r12 -/* 80251D9C 0024ECFC 4E 80 04 21 */ bctrl +/* 80251D9C 0024ECFC 4E 80 04 21 */ bctrl /* 80251DA0 0024ED00 7F C3 F3 78 */ mr r3, r30 /* 80251DA4 0024ED04 7F E4 FB 78 */ mr r4, r31 /* 80251DA8 0024ED08 38 A0 00 01 */ li r5, 1 @@ -201,7 +201,7 @@ lbl_80251DBC: /* 80251DC4 0024ED24 83 C1 00 08 */ lwz r30, 8(r1) /* 80251DC8 0024ED28 7C 08 03 A6 */ mtlr r0 /* 80251DCC 0024ED2C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80251DD0 0024ED30 4E 80 00 20 */ blr +/* 80251DD0 0024ED30 4E 80 00 20 */ blr .global sub_80251dd4 sub_80251dd4: @@ -216,14 +216,14 @@ sub_80251dd4: /* 80251DF4 0024ED54 81 83 00 00 */ lwz r12, 0(r3) /* 80251DF8 0024ED58 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80251DFC 0024ED5C 7D 89 03 A6 */ mtctr r12 -/* 80251E00 0024ED60 4E 80 04 21 */ bctrl +/* 80251E00 0024ED60 4E 80 04 21 */ bctrl /* 80251E04 0024ED64 C0 02 B8 F0 */ lfs f0, lbl_805AD610@sda21(r2) /* 80251E08 0024ED68 D0 1F 04 80 */ stfs f0, 0x480(r31) /* 80251E0C 0024ED6C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80251E10 0024ED70 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80251E14 0024ED74 7C 08 03 A6 */ mtlr r0 /* 80251E18 0024ED78 38 21 00 10 */ addi r1, r1, 0x10 -/* 80251E1C 0024ED7C 4E 80 00 20 */ blr +/* 80251E1C 0024ED7C 4E 80 00 20 */ blr .global AddToRenderer__23CElectricBeamProjectileCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__23CElectricBeamProjectileCFRC14CFrustumPlanesRC13CStateManager: @@ -240,19 +240,19 @@ AddToRenderer__23CElectricBeamProjectileCFRC14CFrustumPlanesRC13CStateManager: /* 80251E48 0024EDA8 81 83 00 00 */ lwz r12, 0(r3) /* 80251E4C 0024EDAC 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80251E50 0024EDB0 7D 89 03 A6 */ mtctr r12 -/* 80251E54 0024EDB4 4E 80 04 21 */ bctrl +/* 80251E54 0024EDB4 4E 80 04 21 */ bctrl /* 80251E58 0024EDB8 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 80251E5C 0024EDBC 80 9F 04 68 */ lwz r4, 0x468(r31) /* 80251E60 0024EDC0 81 83 00 00 */ lwz r12, 0(r3) /* 80251E64 0024EDC4 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80251E68 0024EDC8 7D 89 03 A6 */ mtctr r12 -/* 80251E6C 0024EDCC 4E 80 04 21 */ bctrl +/* 80251E6C 0024EDCC 4E 80 04 21 */ bctrl lbl_80251E70: /* 80251E70 0024EDD0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80251E74 0024EDD4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80251E78 0024EDD8 7C 08 03 A6 */ mtlr r0 /* 80251E7C 0024EDDC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80251E80 0024EDE0 4E 80 00 20 */ blr +/* 80251E80 0024EDE0 4E 80 00 20 */ blr .global sub_80251e84 sub_80251e84: @@ -334,7 +334,7 @@ lbl_80251F74: /* 80251F98 0024EEF8 38 A0 00 01 */ li r5, 1 /* 80251F9C 0024EEFC 81 8C 00 74 */ lwz r12, 0x74(r12) /* 80251FA0 0024EF00 7D 89 03 A6 */ mtctr r12 -/* 80251FA4 0024EF04 4E 80 04 21 */ bctrl +/* 80251FA4 0024EF04 4E 80 04 21 */ bctrl /* 80251FA8 0024EF08 48 00 00 0C */ b lbl_80251FB4 lbl_80251FAC: /* 80251FAC 0024EF0C C0 02 B8 F8 */ lfs f0, lbl_805AD618@sda21(r2) @@ -359,7 +359,7 @@ lbl_80251FB4: /* 80251FF4 0024EF54 81 9D 00 00 */ lwz r12, 0(r29) /* 80251FF8 0024EF58 81 8C 00 30 */ lwz r12, 0x30(r12) /* 80251FFC 0024EF5C 7D 89 03 A6 */ mtctr r12 -/* 80252000 0024EF60 4E 80 04 21 */ bctrl +/* 80252000 0024EF60 4E 80 04 21 */ bctrl /* 80252004 0024EF64 80 7F 02 F8 */ lwz r3, 0x2f8(r31) /* 80252008 0024EF68 7C 03 00 D0 */ neg r0, r3 /* 8025200C 0024EF6C 7C 00 1B 78 */ or r0, r0, r3 @@ -378,7 +378,7 @@ lbl_80251FB4: /* 80252040 0024EFA0 81 9D 00 00 */ lwz r12, 0(r29) /* 80252044 0024EFA4 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80252048 0024EFA8 7D 89 03 A6 */ mtctr r12 -/* 8025204C 0024EFAC 4E 80 04 21 */ bctrl +/* 8025204C 0024EFAC 4E 80 04 21 */ bctrl /* 80252050 0024EFB0 C0 62 B9 00 */ lfs f3, lbl_805AD620@sda21(r2) /* 80252054 0024EFB4 38 81 00 20 */ addi r4, r1, 0x20 /* 80252058 0024EFB8 C0 5F 03 10 */ lfs f2, 0x310(r31) @@ -403,20 +403,20 @@ lbl_80251FB4: /* 802520A4 0024F004 D0 81 00 1C */ stfs f4, 0x1c(r1) /* 802520A8 0024F008 81 8C 00 20 */ lwz r12, 0x20(r12) /* 802520AC 0024F00C 7D 89 03 A6 */ mtctr r12 -/* 802520B0 0024F010 4E 80 04 21 */ bctrl +/* 802520B0 0024F010 4E 80 04 21 */ bctrl lbl_802520B4: /* 802520B4 0024F014 80 7F 04 78 */ lwz r3, 0x478(r31) /* 802520B8 0024F018 7F C4 F3 78 */ mr r4, r30 /* 802520BC 0024F01C 81 83 00 00 */ lwz r12, 0(r3) /* 802520C0 0024F020 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 802520C4 0024F024 7D 89 03 A6 */ mtctr r12 -/* 802520C8 0024F028 4E 80 04 21 */ bctrl +/* 802520C8 0024F028 4E 80 04 21 */ bctrl /* 802520CC 0024F02C 80 7F 04 78 */ lwz r3, 0x478(r31) /* 802520D0 0024F030 FC 20 F8 90 */ fmr f1, f31 /* 802520D4 0024F034 81 83 00 00 */ lwz r12, 0(r3) /* 802520D8 0024F038 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802520DC 0024F03C 7D 89 03 A6 */ mtctr r12 -/* 802520E0 0024F040 4E 80 04 21 */ bctrl +/* 802520E0 0024F040 4E 80 04 21 */ bctrl /* 802520E4 0024F044 83 BF 04 68 */ lwz r29, 0x468(r31) /* 802520E8 0024F048 48 0F 7E C5 */ bl White__6CColorFv /* 802520EC 0024F04C 7C 7E 1B 78 */ mr r30, r3 @@ -431,13 +431,13 @@ lbl_802520B4: /* 80252110 0024F070 81 9D 00 00 */ lwz r12, 0(r29) /* 80252114 0024F074 81 8C 00 30 */ lwz r12, 0x30(r12) /* 80252118 0024F078 7D 89 03 A6 */ mtctr r12 -/* 8025211C 0024F07C 4E 80 04 21 */ bctrl +/* 8025211C 0024F07C 4E 80 04 21 */ bctrl /* 80252120 0024F080 80 7F 04 68 */ lwz r3, 0x468(r31) /* 80252124 0024F084 38 80 00 01 */ li r4, 1 /* 80252128 0024F088 81 83 00 00 */ lwz r12, 0(r3) /* 8025212C 0024F08C 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80252130 0024F090 7D 89 03 A6 */ mtctr r12 -/* 80252134 0024F094 4E 80 04 21 */ bctrl +/* 80252134 0024F094 4E 80 04 21 */ bctrl /* 80252138 0024F098 C0 3F 03 1C */ lfs f1, 0x31c(r31) /* 8025213C 0024F09C 38 61 00 2C */ addi r3, r1, 0x2c /* 80252140 0024F0A0 C0 1F 03 40 */ lfs f0, 0x340(r31) @@ -555,7 +555,7 @@ lbl_802522C4: /* 802522CC 0024F22C 81 83 00 00 */ lwz r12, 0(r3) /* 802522D0 0024F230 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802522D4 0024F234 7D 89 03 A6 */ mtctr r12 -/* 802522D8 0024F238 4E 80 04 21 */ bctrl +/* 802522D8 0024F238 4E 80 04 21 */ bctrl lbl_802522DC: /* 802522DC 0024F23C E3 E1 00 88 */ psq_l f31, 136(r1), 0, qr0 /* 802522E0 0024F240 80 01 00 94 */ lwz r0, 0x94(r1) @@ -565,11 +565,11 @@ lbl_802522DC: /* 802522F0 0024F250 83 A1 00 74 */ lwz r29, 0x74(r1) /* 802522F4 0024F254 7C 08 03 A6 */ mtlr r0 /* 802522F8 0024F258 38 21 00 90 */ addi r1, r1, 0x90 -/* 802522FC 0024F25C 4E 80 00 20 */ blr +/* 802522FC 0024F25C 4E 80 00 20 */ blr .global nullsub_65 nullsub_65: -/* 80252300 0024F260 4E 80 00 20 */ blr +/* 80252300 0024F260 4E 80 00 20 */ blr .global Accept__23CElectricBeamProjectileFR8IVisitor Accept__23CElectricBeamProjectileFR8IVisitor: @@ -582,11 +582,11 @@ Accept__23CElectricBeamProjectileFR8IVisitor: /* 8025231C 0024F27C 7C 04 03 78 */ mr r4, r0 /* 80252320 0024F280 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 80252324 0024F284 7D 89 03 A6 */ mtctr r12 -/* 80252328 0024F288 4E 80 04 21 */ bctrl +/* 80252328 0024F288 4E 80 04 21 */ bctrl /* 8025232C 0024F28C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80252330 0024F290 7C 08 03 A6 */ mtlr r0 /* 80252334 0024F294 38 21 00 10 */ addi r1, r1, 0x10 -/* 80252338 0024F298 4E 80 00 20 */ blr +/* 80252338 0024F298 4E 80 00 20 */ blr .global __ct__23CElectricBeamProjectile __ct__23CElectricBeamProjectile: @@ -680,7 +680,7 @@ lbl_80252470: /* 80252490 0024F3F0 81 84 00 00 */ lwz r12, 0(r4) /* 80252494 0024F3F4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80252498 0024F3F8 7D 89 03 A6 */ mtctr r12 -/* 8025249C 0024F3FC 4E 80 04 21 */ bctrl +/* 8025249C 0024F3FC 4E 80 04 21 */ bctrl /* 802524A0 0024F400 3A B8 04 6C */ addi r21, r24, 0x46c /* 802524A4 0024F404 38 81 00 34 */ addi r4, r1, 0x34 /* 802524A8 0024F408 7E A3 AB 78 */ mr r3, r21 @@ -732,13 +732,13 @@ lbl_80252530: /* 80252558 0024F4B8 81 83 00 00 */ lwz r12, 0(r3) /* 8025255C 0024F4BC 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80252560 0024F4C0 7D 89 03 A6 */ mtctr r12 -/* 80252564 0024F4C4 4E 80 04 21 */ bctrl +/* 80252564 0024F4C4 4E 80 04 21 */ bctrl /* 80252568 0024F4C8 80 78 04 68 */ lwz r3, 0x468(r24) /* 8025256C 0024F4CC 38 80 00 00 */ li r4, 0 /* 80252570 0024F4D0 81 83 00 00 */ lwz r12, 0(r3) /* 80252574 0024F4D4 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80252578 0024F4D8 7D 89 03 A6 */ mtctr r12 -/* 8025257C 0024F4DC 4E 80 04 21 */ bctrl +/* 8025257C 0024F4DC 4E 80 04 21 */ bctrl /* 80252580 0024F4E0 7F 03 C3 78 */ mr r3, r24 /* 80252584 0024F4E4 BA A1 00 74 */ lmw r21, 0x74(r1) /* 80252588 0024F4E8 80 01 00 A4 */ lwz r0, 0xa4(r1) diff --git a/asm/MetroidPrime/Weapons/CEnergyProjectile.s b/asm/MetroidPrime/Weapons/CEnergyProjectile.s index cfaa6db2..13100101 100644 --- a/asm/MetroidPrime/Weapons/CEnergyProjectile.s +++ b/asm/MetroidPrime/Weapons/CEnergyProjectile.s @@ -153,7 +153,7 @@ SetCameraShake__17CEnergyProjectileFRC16CCameraShakeData: /* 80213C60 00210BC0 88 03 03 D0 */ lbz r0, 0x3d0(r3) /* 80213C64 00210BC4 50 A0 26 F6 */ rlwimi r0, r5, 4, 0x1b, 0x1b /* 80213C68 00210BC8 98 03 03 D0 */ stb r0, 0x3d0(r3) -/* 80213C6C 00210BCC 4E 80 00 20 */ blr +/* 80213C6C 00210BCC 4E 80 00 20 */ blr .global PlayImpactSound__17CEnergyProjectileFRC9CVector3f29EWeaponCollisionResponseTypes PlayImpactSound__17CEnergyProjectileFRC9CVector3f29EWeaponCollisionResponseTypes: @@ -234,7 +234,7 @@ lbl_80213D7C: /* 80213D94 00210CF4 83 81 00 40 */ lwz r28, 0x40(r1) /* 80213D98 00210CF8 7C 08 03 A6 */ mtlr r0 /* 80213D9C 00210CFC 38 21 00 60 */ addi r1, r1, 0x60 -/* 80213DA0 00210D00 4E 80 00 20 */ blr +/* 80213DA0 00210D00 4E 80 00 20 */ blr .global ChangeProjectileOwner__17CEnergyProjectileF9TUniqueIdR13CStateManager ChangeProjectileOwner__17CEnergyProjectileF9TUniqueIdR13CStateManager: @@ -322,7 +322,7 @@ lbl_80213ED8: /* 80213EE4 00210E44 83 A1 00 64 */ lwz r29, 0x64(r1) /* 80213EE8 00210E48 7C 08 03 A6 */ mtlr r0 /* 80213EEC 00210E4C 38 21 00 70 */ addi r1, r1, 0x70 -/* 80213EF0 00210E50 4E 80 00 20 */ blr +/* 80213EF0 00210E50 4E 80 00 20 */ blr .global AcceptScriptMsg__17CEnergyProjectileF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__17CEnergyProjectileF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -370,7 +370,7 @@ lbl_80213F7C: /* 80213F8C 00210EEC 81 83 00 00 */ lwz r12, 0(r3) /* 80213F90 00210EF0 81 8C 00 64 */ lwz r12, 0x64(r12) /* 80213F94 00210EF4 7D 89 03 A6 */ mtctr r12 -/* 80213F98 00210EF8 4E 80 04 21 */ bctrl +/* 80213F98 00210EF8 4E 80 04 21 */ bctrl /* 80213F9C 00210EFC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80213FA0 00210F00 41 82 00 48 */ beq lbl_80213FE8 /* 80213FA4 00210F04 3C 80 80 3D */ lis r4, lbl_803D2890@ha @@ -382,7 +382,7 @@ lbl_80213F7C: /* 80213FBC 00210F1C 81 84 00 00 */ lwz r12, 0(r4) /* 80213FC0 00210F20 81 8C 00 68 */ lwz r12, 0x68(r12) /* 80213FC4 00210F24 7D 89 03 A6 */ mtctr r12 -/* 80213FC8 00210F28 4E 80 04 21 */ bctrl +/* 80213FC8 00210F28 4E 80 04 21 */ bctrl /* 80213FCC 00210F2C 7F 63 DB 78 */ mr r3, r27 /* 80213FD0 00210F30 7F C6 F3 78 */ mr r6, r30 /* 80213FD4 00210F34 38 81 00 80 */ addi r4, r1, 0x80 @@ -427,7 +427,7 @@ lbl_80213FE8: /* 8021406C 00210FCC 81 83 00 00 */ lwz r12, 0(r3) /* 80214070 00210FD0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80214074 00210FD4 7D 89 03 A6 */ mtctr r12 -/* 80214078 00210FD8 4E 80 04 21 */ bctrl +/* 80214078 00210FD8 4E 80 04 21 */ bctrl /* 8021407C 00210FDC 38 61 00 5C */ addi r3, r1, 0x5c /* 80214080 00210FE0 38 80 00 00 */ li r4, 0 /* 80214084 00210FE4 48 12 CD BD */ bl __dt__6CTokenFv @@ -452,7 +452,7 @@ lbl_80214088: /* 802140CC 0021102C 81 83 00 00 */ lwz r12, 0(r3) /* 802140D0 00211030 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802140D4 00211034 7D 89 03 A6 */ mtctr r12 -/* 802140D8 00211038 4E 80 04 21 */ bctrl +/* 802140D8 00211038 4E 80 04 21 */ bctrl /* 802140DC 0021103C 38 61 00 44 */ addi r3, r1, 0x44 /* 802140E0 00211040 38 80 00 00 */ li r4, 0 /* 802140E4 00211044 48 12 CD 5D */ bl __dt__6CTokenFv @@ -484,7 +484,7 @@ lbl_802140E8: /* 80214148 002110A8 81 9B 01 70 */ lwz r12, 0x170(r27) /* 8021414C 002110AC 81 8C 00 18 */ lwz r12, 0x18(r12) /* 80214150 002110B0 7D 89 03 A6 */ mtctr r12 -/* 80214154 002110B4 4E 80 04 21 */ bctrl +/* 80214154 002110B4 4E 80 04 21 */ bctrl /* 80214158 002110B8 C0 41 00 38 */ lfs f2, 0x38(r1) /* 8021415C 002110BC 38 7B 01 70 */ addi r3, r27, 0x170 /* 80214160 002110C0 C0 21 00 3C */ lfs f1, 0x3c(r1) @@ -539,7 +539,7 @@ lbl_802141FC: /* 8021421C 0021117C 80 01 01 34 */ lwz r0, 0x134(r1) /* 80214220 00211180 7C 08 03 A6 */ mtlr r0 /* 80214224 00211184 38 21 01 30 */ addi r1, r1, 0x130 -/* 80214228 00211188 4E 80 00 20 */ blr +/* 80214228 00211188 4E 80 00 20 */ blr .global Accept__17CEnergyProjectileFR8IVisitor Accept__17CEnergyProjectileFR8IVisitor: @@ -552,11 +552,11 @@ Accept__17CEnergyProjectileFR8IVisitor: /* 80214244 002111A4 7C 04 03 78 */ mr r4, r0 /* 80214248 002111A8 81 8C 00 20 */ lwz r12, 0x20(r12) /* 8021424C 002111AC 7D 89 03 A6 */ mtctr r12 -/* 80214250 002111B0 4E 80 04 21 */ bctrl +/* 80214250 002111B0 4E 80 04 21 */ bctrl /* 80214254 002111B4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80214258 002111B8 7C 08 03 A6 */ mtlr r0 /* 8021425C 002111BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80214260 002111C0 4E 80 00 20 */ blr +/* 80214260 002111C0 4E 80 00 20 */ blr .global ResolveCollisionWithWorld__17CEnergyProjectileFRC14CRayCastResultR13CStateManager ResolveCollisionWithWorld__17CEnergyProjectileFRC14CRayCastResultR13CStateManager: @@ -598,7 +598,7 @@ ResolveCollisionWithWorld__17CEnergyProjectileFRC14CRayCastResultR13CStateManage /* 802142F0 00211250 39 21 00 14 */ addi r9, r1, 0x14 /* 802142F4 00211254 81 8C 00 70 */ lwz r12, 0x70(r12) /* 802142F8 00211258 7D 89 03 A6 */ mtctr r12 -/* 802142FC 0021125C 4E 80 04 21 */ bctrl +/* 802142FC 0021125C 4E 80 04 21 */ bctrl /* 80214300 00211260 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80214304 00211264 41 82 00 54 */ beq lbl_80214358 /* 80214308 00211268 80 1D 00 F8 */ lwz r0, 0xf8(r29) @@ -632,7 +632,7 @@ lbl_80214364: /* 80214370 002112D0 83 A1 00 34 */ lwz r29, 0x34(r1) /* 80214374 002112D4 7C 08 03 A6 */ mtlr r0 /* 80214378 002112D8 38 21 00 40 */ addi r1, r1, 0x40 -/* 8021437C 002112DC 4E 80 00 20 */ blr +/* 8021437C 002112DC 4E 80 00 20 */ blr .global ResolveCollisionWithActor__17CEnergyProjectileFRC14CRayCastResultR6CActorR13CStateManager ResolveCollisionWithActor__17CEnergyProjectileFRC14CRayCastResultR6CActorR13CStateManager: @@ -666,7 +666,7 @@ ResolveCollisionWithActor__17CEnergyProjectileFRC14CRayCastResultR6CActorR13CSta /* 802143EC 0021134C 38 DB 01 2C */ addi r6, r27, 0x12c /* 802143F0 00211350 81 8C 00 58 */ lwz r12, 0x58(r12) /* 802143F4 00211354 7D 89 03 A6 */ mtctr r12 -/* 802143F8 00211358 4E 80 04 21 */ bctrl +/* 802143F8 00211358 4E 80 04 21 */ bctrl /* 802143FC 0021135C 7C 60 1B 78 */ mr r0, r3 /* 80214400 00211360 7F A3 EB 78 */ mr r3, r29 /* 80214404 00211364 81 9D 00 00 */ lwz r12, 0(r29) @@ -675,7 +675,7 @@ ResolveCollisionWithActor__17CEnergyProjectileFRC14CRayCastResultR6CActorR13CSta /* 80214410 00211370 7F C5 F3 78 */ mr r5, r30 /* 80214414 00211374 81 8C 00 44 */ lwz r12, 0x44(r12) /* 80214418 00211378 7D 89 03 A6 */ mtctr r12 -/* 8021441C 0021137C 4E 80 04 21 */ bctrl +/* 8021441C 0021137C 4E 80 04 21 */ bctrl /* 80214420 00211380 A0 1D 00 08 */ lhz r0, 8(r29) /* 80214424 00211384 7F A3 EB 78 */ mr r3, r29 /* 80214428 00211388 B0 01 00 24 */ sth r0, 0x24(r1) @@ -683,7 +683,7 @@ ResolveCollisionWithActor__17CEnergyProjectileFRC14CRayCastResultR6CActorR13CSta /* 80214430 00211390 B0 01 00 20 */ sth r0, 0x20(r1) /* 80214434 00211394 81 8C 00 38 */ lwz r12, 0x38(r12) /* 80214438 00211398 7D 89 03 A6 */ mtctr r12 -/* 8021443C 0021139C 4E 80 04 21 */ bctrl +/* 8021443C 0021139C 4E 80 04 21 */ bctrl /* 80214440 002113A0 81 9B 00 00 */ lwz r12, 0(r27) /* 80214444 002113A4 7C 68 1B 78 */ mr r8, r3 /* 80214448 002113A8 7F 63 DB 78 */ mr r3, r27 @@ -694,7 +694,7 @@ ResolveCollisionWithActor__17CEnergyProjectileFRC14CRayCastResultR6CActorR13CSta /* 8021445C 002113BC 38 BC 00 10 */ addi r5, r28, 0x10 /* 80214460 002113C0 39 21 00 24 */ addi r9, r1, 0x24 /* 80214464 002113C4 7D 89 03 A6 */ mtctr r12 -/* 80214468 002113C8 4E 80 04 21 */ bctrl +/* 80214468 002113C8 4E 80 04 21 */ bctrl /* 8021446C 002113CC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80214470 002113D0 40 82 00 3C */ bne lbl_802144AC /* 80214474 002113D4 A0 1B 00 08 */ lhz r0, 8(r27) @@ -751,7 +751,7 @@ lbl_802144D0: /* 80214538 00211498 81 9B 00 00 */ lwz r12, 0(r27) /* 8021453C 0021149C 81 8C 00 38 */ lwz r12, 0x38(r12) /* 80214540 002114A0 7D 89 03 A6 */ mtctr r12 -/* 80214544 002114A4 4E 80 04 21 */ bctrl +/* 80214544 002114A4 4E 80 04 21 */ bctrl /* 80214548 002114A8 81 9F 00 00 */ lwz r12, 0(r31) /* 8021454C 002114AC 7C 68 1B 78 */ mr r8, r3 /* 80214550 002114B0 7F E3 FB 78 */ mr r3, r31 @@ -762,13 +762,13 @@ lbl_802144D0: /* 80214564 002114C4 39 21 00 0C */ addi r9, r1, 0xc /* 80214568 002114C8 38 C0 00 0D */ li r6, 0xd /* 8021456C 002114CC 7D 89 03 A6 */ mtctr r12 -/* 80214570 002114D0 4E 80 04 21 */ bctrl +/* 80214570 002114D0 4E 80 04 21 */ bctrl lbl_80214574: /* 80214574 002114D4 BB 61 00 6C */ lmw r27, 0x6c(r1) /* 80214578 002114D8 80 01 00 84 */ lwz r0, 0x84(r1) /* 8021457C 002114DC 7C 08 03 A6 */ mtlr r0 /* 80214580 002114E0 38 21 00 80 */ addi r1, r1, 0x80 -/* 80214584 002114E4 4E 80 00 20 */ blr +/* 80214584 002114E4 4E 80 00 20 */ blr .global Think__17CEnergyProjectileFfR13CStateManager Think__17CEnergyProjectileFfR13CStateManager: @@ -853,7 +853,7 @@ lbl_802145F8: /* 802146BC 0021161C 38 81 00 A0 */ addi r4, r1, 0xa0 /* 802146C0 00211620 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 802146C4 00211624 7D 89 03 A6 */ mtctr r12 -/* 802146C8 00211628 4E 80 04 21 */ bctrl +/* 802146C8 00211628 4E 80 04 21 */ bctrl /* 802146CC 0021162C 48 00 00 14 */ b lbl_802146E0 lbl_802146D0: /* 802146D0 00211630 7F A3 EB 78 */ mr r3, r29 @@ -890,7 +890,7 @@ lbl_802146E0: /* 80214748 002116A8 81 9D 00 00 */ lwz r12, 0(r29) /* 8021474C 002116AC 81 8C 00 70 */ lwz r12, 0x70(r12) /* 80214750 002116B0 7D 89 03 A6 */ mtctr r12 -/* 80214754 002116B4 4E 80 04 21 */ bctrl +/* 80214754 002116B4 4E 80 04 21 */ bctrl lbl_80214758: /* 80214758 002116B8 A0 BD 02 C8 */ lhz r5, 0x2c8(r29) /* 8021475C 002116BC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) @@ -935,7 +935,7 @@ lbl_80214758: /* 802147F8 00211758 81 83 00 00 */ lwz r12, 0(r3) /* 802147FC 0021175C 81 8C 00 64 */ lwz r12, 0x64(r12) /* 80214800 00211760 7D 89 03 A6 */ mtctr r12 -/* 80214804 00211764 4E 80 04 21 */ bctrl +/* 80214804 00211764 4E 80 04 21 */ bctrl /* 80214808 00211768 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8021480C 0021176C 41 82 00 28 */ beq lbl_80214834 /* 80214810 00211770 80 9F 00 FC */ lwz r4, 0xfc(r31) @@ -943,7 +943,7 @@ lbl_80214758: /* 80214818 00211778 81 84 00 00 */ lwz r12, 0(r4) /* 8021481C 0021177C 81 8C 00 68 */ lwz r12, 0x68(r12) /* 80214820 00211780 7D 89 03 A6 */ mtctr r12 -/* 80214824 00211784 4E 80 04 21 */ bctrl +/* 80214824 00211784 4E 80 04 21 */ bctrl /* 80214828 00211788 7F 83 E3 78 */ mr r3, r28 /* 8021482C 0021178C 38 81 00 D0 */ addi r4, r1, 0xd0 /* 80214830 00211790 4B EA 0F 15 */ bl SetLight__10CGameLightFRC6CLight @@ -961,7 +961,7 @@ lbl_80214834: /* 8021485C 002117BC 38 61 00 4C */ addi r3, r1, 0x4c /* 80214860 002117C0 81 8C 00 18 */ lwz r12, 0x18(r12) /* 80214864 002117C4 7D 89 03 A6 */ mtctr r12 -/* 80214868 002117C8 4E 80 04 21 */ bctrl +/* 80214868 002117C8 4E 80 04 21 */ bctrl /* 8021486C 002117CC 7F 85 E3 78 */ mr r5, r28 /* 80214870 002117D0 38 61 00 30 */ addi r3, r1, 0x30 /* 80214874 002117D4 38 81 00 4C */ addi r4, r1, 0x4c @@ -1018,7 +1018,7 @@ lbl_80214918: /* 80214930 00211890 83 81 01 20 */ lwz r28, 0x120(r1) /* 80214934 00211894 7C 08 03 A6 */ mtlr r0 /* 80214938 00211898 38 21 01 40 */ addi r1, r1, 0x140 -/* 8021493C 0021189C 4E 80 00 20 */ blr +/* 8021493C 0021189C 4E 80 00 20 */ blr .global Render__17CEnergyProjectileCFRC13CStateManager Render__17CEnergyProjectileCFRC13CStateManager: @@ -1126,7 +1126,7 @@ lbl_80214AB4: /* 80214AC0 00211A20 83 A1 00 34 */ lwz r29, 0x34(r1) /* 80214AC4 00211A24 7C 08 03 A6 */ mtlr r0 /* 80214AC8 00211A28 38 21 00 40 */ addi r1, r1, 0x40 -/* 80214ACC 00211A2C 4E 80 00 20 */ blr +/* 80214ACC 00211A2C 4E 80 00 20 */ blr .global AddToRenderer__17CEnergyProjectileCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__17CEnergyProjectileCFRC14CFrustumPlanesRC13CStateManager: @@ -1193,7 +1193,7 @@ lbl_80214BB0: /* 80214BB4 00211B14 81 9D 01 70 */ lwz r12, 0x170(r29) /* 80214BB8 00211B18 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80214BBC 00211B1C 7D 89 03 A6 */ mtctr r12 -/* 80214BC0 00211B20 4E 80 04 21 */ bctrl +/* 80214BC0 00211B20 4E 80 04 21 */ bctrl lbl_80214BC4: /* 80214BC4 00211B24 7F A3 EB 78 */ mr r3, r29 /* 80214BC8 00211B28 7F E4 FB 78 */ mr r4, r31 @@ -1207,11 +1207,11 @@ lbl_80214BD8: /* 80214BE4 00211B44 83 A1 00 44 */ lwz r29, 0x44(r1) /* 80214BE8 00211B48 7C 08 03 A6 */ mtlr r0 /* 80214BEC 00211B4C 38 21 00 50 */ addi r1, r1, 0x50 -/* 80214BF0 00211B50 4E 80 00 20 */ blr +/* 80214BF0 00211B50 4E 80 00 20 */ blr .global Touch__17CEnergyProjectileFR6CActorR13CStateManager Touch__17CEnergyProjectileFR6CActorR13CStateManager: -/* 80214BF4 00211B54 4E 80 00 20 */ blr +/* 80214BF4 00211B54 4E 80 00 20 */ blr .global Explode__17CEnergyProjectileFRC9CVector3fRC9CVector3f29EWeaponCollisionResponseTypesR13CStateManagerRC20CDamageVulnerability9TUniqueId Explode__17CEnergyProjectileFRC9CVector3fRC9CVector3f29EWeaponCollisionResponseTypesR13CStateManagerRC20CDamageVulnerability9TUniqueId: @@ -1337,7 +1337,7 @@ lbl_80214D7C: /* 80214DBC 00211D1C C0 22 B3 10 */ lfs f1, lbl_805AD030@sda21(r2) /* 80214DC0 00211D20 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 80214DC4 00211D24 7D 89 03 A6 */ mtctr r12 -/* 80214DC8 00211D28 4E 80 04 21 */ bctrl +/* 80214DC8 00211D28 4E 80 04 21 */ bctrl /* 80214DCC 00211D2C C0 01 00 E0 */ lfs f0, 0xe0(r1) /* 80214DD0 00211D30 7F E3 FB 78 */ mr r3, r31 /* 80214DD4 00211D34 C0 41 00 D8 */ lfs f2, 0xd8(r1) @@ -1802,7 +1802,7 @@ lbl_80215458: /* 8021547C 002123DC 38 A5 00 44 */ addi r5, r5, 0x44 /* 80215480 002123E0 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80215484 002123E4 7D 89 03 A6 */ mtctr r12 -/* 80215488 002123E8 4E 80 04 21 */ bctrl +/* 80215488 002123E8 4E 80 04 21 */ bctrl /* 8021548C 002123EC 3A A1 00 E4 */ addi r21, r1, 0xe4 /* 80215490 002123F0 38 81 00 60 */ addi r4, r1, 0x60 /* 80215494 002123F4 7E A3 AB 78 */ mr r3, r21 @@ -1898,7 +1898,7 @@ lbl_802155CC: /* 802155EC 0021254C 80 01 02 44 */ lwz r0, 0x244(r1) /* 802155F0 00212550 7C 08 03 A6 */ mtlr r0 /* 802155F4 00212554 38 21 02 40 */ addi r1, r1, 0x240 -/* 802155F8 00212558 4E 80 00 20 */ blr +/* 802155F8 00212558 4E 80 00 20 */ blr .global StopProjectile__17CEnergyProjectileFR13CStateManager StopProjectile__17CEnergyProjectileFR13CStateManager: @@ -1941,7 +1941,7 @@ lbl_80215680: /* 80215688 002125E8 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8021568C 002125EC 7C 08 03 A6 */ mtlr r0 /* 80215690 002125F0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80215694 002125F4 4E 80 00 20 */ blr +/* 80215694 002125F4 4E 80 00 20 */ blr .global "__ct__17CEnergyProjectileFbRC28TToken<18CWeaponDescription>11EWeaponTypeRC12CTransform4f14EMaterialTypesRC11CDamageInfo9TUniqueId7TAreaId9TUniqueId9TUniqueIdUibRC9CVector3fRCQ24rstl50optional_object<31TLockedToken<15CGenDescription>>sb" "__ct__17CEnergyProjectileFbRC28TToken<18CWeaponDescription>11EWeaponTypeRC12CTransform4f14EMaterialTypesRC11CDamageInfo9TUniqueId7TAreaId9TUniqueId9TUniqueIdUibRC9CVector3fRCQ24rstl50optional_object<31TLockedToken<15CGenDescription>>sb": @@ -2067,7 +2067,7 @@ lbl_80215814: /* 80215868 002127C8 80 01 01 74 */ lwz r0, 0x174(r1) /* 8021586C 002127CC 7C 08 03 A6 */ mtlr r0 /* 80215870 002127D0 38 21 01 70 */ addi r1, r1, 0x170 -/* 80215874 002127D4 4E 80 00 20 */ blr +/* 80215874 002127D4 4E 80 00 20 */ blr .global __sinit_CEnergyProjectile_cpp __sinit_CEnergyProjectile_cpp: diff --git a/asm/MetroidPrime/Weapons/CFlameThrower.s b/asm/MetroidPrime/Weapons/CFlameThrower.s index 0f84b28e..1de8b11c 100644 --- a/asm/MetroidPrime/Weapons/CFlameThrower.s +++ b/asm/MetroidPrime/Weapons/CFlameThrower.s @@ -61,7 +61,7 @@ __dt__13CFlameThrowerFv: /* 8019750C 0019446C 38 80 00 01 */ li r4, 1 /* 80197510 00194470 81 8C 00 08 */ lwz r12, 8(r12) /* 80197514 00194474 7D 89 03 A6 */ mtctr r12 -/* 80197518 00194478 4E 80 04 21 */ bctrl +/* 80197518 00194478 4E 80 04 21 */ bctrl lbl_8019751C: /* 8019751C 0019447C 34 1E 03 3C */ addic. r0, r30, 0x33c /* 80197520 00194480 41 82 00 18 */ beq lbl_80197538 @@ -85,7 +85,7 @@ lbl_80197554: /* 80197560 001944C0 83 C1 00 08 */ lwz r30, 8(r1) /* 80197564 001944C4 7C 08 03 A6 */ mtlr r0 /* 80197568 001944C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8019756C 001944CC 4E 80 00 20 */ blr +/* 8019756C 001944CC 4E 80 00 20 */ blr .global sub_80197570 sub_80197570: @@ -129,7 +129,7 @@ lbl_801975D4: /* 80197600 00194560 83 C1 00 30 */ lwz r30, 0x30(r1) /* 80197604 00194564 7C 08 03 A6 */ mtlr r0 /* 80197608 00194568 38 21 00 40 */ addi r1, r1, 0x40 -/* 8019760C 0019456C 4E 80 00 20 */ blr +/* 8019760C 0019456C 4E 80 00 20 */ blr .global SetFlameLightActive__13CFlameThrowerFbR13CStateManager SetFlameLightActive__13CFlameThrowerFbR13CStateManager: @@ -157,13 +157,13 @@ SetFlameLightActive__13CFlameThrowerFbR13CStateManager: /* 80197664 001945C4 57 E4 06 3E */ clrlwi r4, r31, 0x18 /* 80197668 001945C8 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 8019766C 001945CC 7D 89 03 A6 */ mtctr r12 -/* 80197670 001945D0 4E 80 04 21 */ bctrl +/* 80197670 001945D0 4E 80 04 21 */ bctrl lbl_80197674: /* 80197674 001945D4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80197678 001945D8 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8019767C 001945DC 7C 08 03 A6 */ mtlr r0 /* 80197680 001945E0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80197684 001945E4 4E 80 00 20 */ blr +/* 80197684 001945E4 4E 80 00 20 */ blr .global DoCollisionCheck__13CFlameThrowerFR9TUniqueIdRC6CAABoxR13CStateManager DoCollisionCheck__13CFlameThrowerFR9TUniqueIdRC6CAABoxR13CStateManager: @@ -365,7 +365,7 @@ lbl_80197978: /* 80197980 001948E0 81 94 00 00 */ lwz r12, 0(r20) /* 80197984 001948E4 81 8C 00 40 */ lwz r12, 0x40(r12) /* 80197988 001948E8 7D 89 03 A6 */ mtctr r12 -/* 8019798C 001948EC 4E 80 04 21 */ bctrl +/* 8019798C 001948EC 4E 80 04 21 */ bctrl /* 80197990 001948F0 88 01 00 84 */ lbz r0, 0x84(r1) /* 80197994 001948F4 28 00 00 00 */ cmplwi r0, 0 /* 80197998 001948F8 98 01 00 A0 */ stb r0, 0xa0(r1) @@ -445,7 +445,7 @@ lbl_80197A00: /* 80197AB8 00194A18 C3 7F 03 04 */ lfs f27, 0x304(r31) /* 80197ABC 00194A1C C3 9F 02 F4 */ lfs f28, 0x2f4(r31) /* 80197AC0 00194A20 7D 89 03 A6 */ mtctr r12 -/* 80197AC4 00194A24 4E 80 04 21 */ bctrl +/* 80197AC4 00194A24 4E 80 04 21 */ bctrl /* 80197AC8 00194A28 C0 41 00 40 */ lfs f2, 0x40(r1) /* 80197ACC 00194A2C 38 61 00 54 */ addi r3, r1, 0x54 /* 80197AD0 00194A30 C0 21 00 44 */ lfs f1, 0x44(r1) @@ -486,7 +486,7 @@ lbl_80197A00: /* 80197B5C 00194ABC 38 A1 02 98 */ addi r5, r1, 0x298 /* 80197B60 00194AC0 81 8C 00 24 */ lwz r12, 0x24(r12) /* 80197B64 00194AC4 7D 89 03 A6 */ mtctr r12 -/* 80197B68 00194AC8 4E 80 04 21 */ bctrl +/* 80197B68 00194AC8 4E 80 04 21 */ bctrl /* 80197B6C 00194ACC 88 E1 00 F8 */ lbz r7, 0xf8(r1) /* 80197B70 00194AD0 C0 21 00 D8 */ lfs f1, 0xd8(r1) /* 80197B74 00194AD4 80 81 00 DC */ lwz r4, 0xdc(r1) @@ -769,7 +769,7 @@ lbl_80197F34: /* 80197F68 00194EC8 80 01 0B B4 */ lwz r0, 0xbb4(r1) /* 80197F6C 00194ECC 7C 08 03 A6 */ mtlr r0 /* 80197F70 00194ED0 38 21 0B B0 */ addi r1, r1, 0xbb0 -/* 80197F74 00194ED4 4E 80 00 20 */ blr +/* 80197F74 00194ED4 4E 80 00 20 */ blr .global AcceptScriptMsg__13CFlameThrowerF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__13CFlameThrowerF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -829,7 +829,7 @@ lbl_80198014: /* 80198040 00194FA0 83 81 00 20 */ lwz r28, 0x20(r1) /* 80198044 00194FA4 7C 08 03 A6 */ mtlr r0 /* 80198048 00194FA8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8019804C 00194FAC 4E 80 00 20 */ blr +/* 8019804C 00194FAC 4E 80 00 20 */ blr .global CreateFlameParticles__13CFlameThrowerFR13CStateManager CreateFlameParticles__13CFlameThrowerFR13CStateManager: @@ -869,7 +869,7 @@ lbl_801980C0: /* 801980D0 00195030 38 80 00 01 */ li r4, 1 /* 801980D4 00195034 81 8C 00 08 */ lwz r12, 8(r12) /* 801980D8 00195038 7D 89 03 A6 */ mtctr r12 -/* 801980DC 0019503C 4E 80 04 21 */ bctrl +/* 801980DC 0019503C 4E 80 04 21 */ bctrl lbl_801980E0: /* 801980E0 00195040 7F 80 07 75 */ extsb. r0, r28 /* 801980E4 00195044 93 BE 03 48 */ stw r29, 0x348(r30) @@ -890,12 +890,12 @@ lbl_801980F8: /* 8019811C 0019507C 81 83 00 00 */ lwz r12, 0(r3) /* 80198120 00195080 81 8C 00 70 */ lwz r12, 0x70(r12) /* 80198124 00195084 7D 89 03 A6 */ mtctr r12 -/* 80198128 00195088 4E 80 04 21 */ bctrl +/* 80198128 00195088 4E 80 04 21 */ bctrl /* 8019812C 0019508C 80 7E 03 48 */ lwz r3, 0x348(r30) /* 80198130 00195090 81 83 00 00 */ lwz r12, 0(r3) /* 80198134 00195094 81 8C 00 64 */ lwz r12, 0x64(r12) /* 80198138 00195098 7D 89 03 A6 */ mtctr r12 -/* 8019813C 0019509C 4E 80 04 21 */ bctrl +/* 8019813C 0019509C 4E 80 04 21 */ bctrl /* 80198140 001950A0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80198144 001950A4 41 82 00 5C */ beq lbl_801981A0 /* 80198148 001950A8 A0 7E 02 C8 */ lhz r3, 0x2c8(r30) @@ -912,7 +912,7 @@ lbl_801980F8: /* 80198174 001950D4 81 84 00 00 */ lwz r12, 0(r4) /* 80198178 001950D8 81 8C 00 68 */ lwz r12, 0x68(r12) /* 8019817C 001950DC 7D 89 03 A6 */ mtctr r12 -/* 80198180 001950E0 4E 80 04 21 */ bctrl +/* 80198180 001950E0 4E 80 04 21 */ bctrl /* 80198184 001950E4 7F C3 F3 78 */ mr r3, r30 /* 80198188 001950E8 7F E6 FB 78 */ mr r6, r31 /* 8019818C 001950EC 38 81 00 10 */ addi r4, r1, 0x10 @@ -928,7 +928,7 @@ lbl_801981A0: /* 801981B0 00195110 83 81 00 70 */ lwz r28, 0x70(r1) /* 801981B4 00195114 7C 08 03 A6 */ mtlr r0 /* 801981B8 00195118 38 21 00 80 */ addi r1, r1, 0x80 -/* 801981BC 0019511C 4E 80 00 20 */ blr +/* 801981BC 0019511C 4E 80 00 20 */ blr .global Reset__13CFlameThrowerFR13CStateManagerb Reset__13CFlameThrowerFR13CStateManagerb: @@ -950,7 +950,7 @@ Reset__13CFlameThrowerFR13CStateManagerb: /* 801981FC 0019515C 81 9E 00 00 */ lwz r12, 0(r30) /* 80198200 00195160 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80198204 00195164 7D 89 03 A6 */ mtctr r12 -/* 80198208 00195168 4E 80 04 21 */ bctrl +/* 80198208 00195168 4E 80 04 21 */ bctrl /* 8019820C 0019516C 88 1E 04 00 */ lbz r0, 0x400(r30) /* 80198210 00195170 38 C0 00 00 */ li r6, 0 /* 80198214 00195174 50 C0 36 72 */ rlwimi r0, r6, 6, 0x19, 0x19 @@ -978,7 +978,7 @@ Reset__13CFlameThrowerFR13CStateManagerb: /* 8019826C 001951CC 81 83 00 00 */ lwz r12, 0(r3) /* 80198270 001951D0 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80198274 001951D4 7D 89 03 A6 */ mtctr r12 -/* 80198278 001951D8 4E 80 04 21 */ bctrl +/* 80198278 001951D8 4E 80 04 21 */ bctrl /* 8019827C 001951DC C0 5E 03 14 */ lfs f2, 0x314(r30) /* 80198280 001951E0 38 7E 03 4C */ addi r3, r30, 0x34c /* 80198284 001951E4 C0 3E 03 04 */ lfs f1, 0x304(r30) @@ -995,7 +995,7 @@ lbl_801982A4: /* 801982AC 0019520C 81 83 00 00 */ lwz r12, 0(r3) /* 801982B0 00195210 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 801982B4 00195214 7D 89 03 A6 */ mtctr r12 -/* 801982B8 00195218 4E 80 04 21 */ bctrl +/* 801982B8 00195218 4E 80 04 21 */ bctrl /* 801982BC 0019521C 88 7E 04 00 */ lbz r3, 0x400(r30) /* 801982C0 00195220 38 00 00 00 */ li r0, 0 /* 801982C4 00195224 50 03 36 72 */ rlwimi r3, r0, 6, 0x19, 0x19 @@ -1008,7 +1008,7 @@ lbl_801982D4: /* 801982DC 0019523C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 801982E0 00195240 7C 08 03 A6 */ mtlr r0 /* 801982E4 00195244 38 21 00 20 */ addi r1, r1, 0x20 -/* 801982E8 00195248 4E 80 00 20 */ blr +/* 801982E8 00195248 4E 80 00 20 */ blr .global Fire__13CFlameThrowerFRC12CTransform4fR13CStateManagerb Fire__13CFlameThrowerFRC12CTransform4fR13CStateManagerb: @@ -1023,7 +1023,7 @@ Fire__13CFlameThrowerFRC12CTransform4fR13CStateManagerb: /* 8019830C 0019526C 81 83 00 00 */ lwz r12, 0(r3) /* 80198310 00195270 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80198314 00195274 7D 89 03 A6 */ mtctr r12 -/* 80198318 00195278 4E 80 04 21 */ bctrl +/* 80198318 00195278 4E 80 04 21 */ bctrl /* 8019831C 0019527C 88 1E 04 00 */ lbz r0, 0x400(r30) /* 80198320 00195280 38 A0 00 01 */ li r5, 1 /* 80198324 00195284 50 A0 36 72 */ rlwimi r0, r5, 6, 0x19, 0x19 @@ -1040,13 +1040,13 @@ Fire__13CFlameThrowerFRC12CTransform4fR13CStateManagerb: /* 80198350 001952B0 83 C1 00 08 */ lwz r30, 8(r1) /* 80198354 001952B4 7C 08 03 A6 */ mtlr r0 /* 80198358 001952B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8019835C 001952BC 4E 80 00 20 */ blr +/* 8019835C 001952BC 4E 80 00 20 */ blr .global Render__13CFlameThrowerCFRC13CStateManager Render__13CFlameThrowerCFRC13CStateManager: /* 80198360 001952C0 88 03 00 30 */ lbz r0, 0x30(r3) /* 80198364 001952C4 54 00 CF FF */ rlwinm. r0, r0, 0x19, 0x1f, 0x1f -/* 80198368 001952C8 4E 80 00 20 */ blr +/* 80198368 001952C8 4E 80 00 20 */ blr .global AddToRenderer__13CFlameThrowerCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__13CFlameThrowerCFRC14CFrustumPlanesRC13CStateManager: @@ -1062,7 +1062,7 @@ AddToRenderer__13CFlameThrowerCFRC14CFrustumPlanesRC13CStateManager: /* 80198390 001952F0 81 83 00 00 */ lwz r12, 0(r3) /* 80198394 001952F4 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80198398 001952F8 7D 89 03 A6 */ mtctr r12 -/* 8019839C 001952FC 4E 80 04 21 */ bctrl +/* 8019839C 001952FC 4E 80 04 21 */ bctrl /* 801983A0 00195300 C0 5E 03 14 */ lfs f2, 0x314(r30) /* 801983A4 00195304 7F C4 F3 78 */ mr r4, r30 /* 801983A8 00195308 C0 3E 03 04 */ lfs f1, 0x304(r30) @@ -1075,7 +1075,7 @@ AddToRenderer__13CFlameThrowerCFRC14CFrustumPlanesRC13CStateManager: /* 801983C4 00195324 81 9E 00 00 */ lwz r12, 0(r30) /* 801983C8 00195328 81 8C 00 64 */ lwz r12, 0x64(r12) /* 801983CC 0019532C 7D 89 03 A6 */ mtctr r12 -/* 801983D0 00195330 4E 80 04 21 */ bctrl +/* 801983D0 00195330 4E 80 04 21 */ bctrl /* 801983D4 00195334 7F C3 F3 78 */ mr r3, r30 /* 801983D8 00195338 7F E4 FB 78 */ mr r4, r31 /* 801983DC 0019533C 38 A1 00 08 */ addi r5, r1, 8 @@ -1086,7 +1086,7 @@ AddToRenderer__13CFlameThrowerCFRC14CFrustumPlanesRC13CStateManager: /* 801983F0 00195350 83 C1 00 38 */ lwz r30, 0x38(r1) /* 801983F4 00195354 7C 08 03 A6 */ mtlr r0 /* 801983F8 00195358 38 21 00 40 */ addi r1, r1, 0x40 -/* 801983FC 0019535C 4E 80 00 20 */ blr +/* 801983FC 0019535C 4E 80 00 20 */ blr .global SetTransform__13CFlameThrowerFRC12CTransform4f SetTransform__13CFlameThrowerFRC12CTransform4f: @@ -1098,7 +1098,7 @@ SetTransform__13CFlameThrowerFRC12CTransform4f: /* 80198414 00195374 80 01 00 14 */ lwz r0, 0x14(r1) /* 80198418 00195378 7C 08 03 A6 */ mtlr r0 /* 8019841C 0019537C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80198420 00195380 4E 80 00 20 */ blr +/* 80198420 00195380 4E 80 00 20 */ blr .global UpdateFlameState__13CFlameThrowerFfR13CStateManager UpdateFlameState__13CFlameThrowerFfR13CStateManager: @@ -1168,7 +1168,7 @@ lbl_80198500: /* 8019850C 0019546C 83 C1 00 08 */ lwz r30, 8(r1) /* 80198510 00195470 7C 08 03 A6 */ mtlr r0 /* 80198514 00195474 38 21 00 10 */ addi r1, r1, 0x10 -/* 80198518 00195478 4E 80 00 20 */ blr +/* 80198518 00195478 4E 80 00 20 */ blr .global Think__13CFlameThrowerFfR13CStateManager Think__13CFlameThrowerFfR13CStateManager: @@ -1215,7 +1215,7 @@ lbl_801985AC: /* 801985B4 00195514 81 9D 03 4C */ lwz r12, 0x34c(r29) /* 801985B8 00195518 81 8C 00 14 */ lwz r12, 0x14(r12) /* 801985BC 0019551C 7D 89 03 A6 */ mtctr r12 -/* 801985C0 00195520 4E 80 04 21 */ bctrl +/* 801985C0 00195520 4E 80 04 21 */ bctrl /* 801985C4 00195524 C0 01 00 58 */ lfs f0, 0x58(r1) /* 801985C8 00195528 38 81 00 58 */ addi r4, r1, 0x58 /* 801985CC 0019552C D0 1D 03 C0 */ stfs f0, 0x3c0(r29) @@ -1228,7 +1228,7 @@ lbl_801985AC: /* 801985E8 00195548 81 83 00 00 */ lwz r12, 0(r3) /* 801985EC 0019554C 81 8C 00 18 */ lwz r12, 0x18(r12) /* 801985F0 00195550 7D 89 03 A6 */ mtctr r12 -/* 801985F4 00195554 4E 80 04 21 */ bctrl +/* 801985F4 00195554 4E 80 04 21 */ bctrl /* 801985F8 00195558 83 7D 03 48 */ lwz r27, 0x348(r29) /* 801985FC 0019555C 7F E4 FB 78 */ mr r4, r31 /* 80198600 00195560 38 61 01 18 */ addi r3, r1, 0x118 @@ -1238,7 +1238,7 @@ lbl_801985AC: /* 80198610 00195570 81 9B 00 00 */ lwz r12, 0(r27) /* 80198614 00195574 81 8C 00 14 */ lwz r12, 0x14(r12) /* 80198618 00195578 7D 89 03 A6 */ mtctr r12 -/* 8019861C 0019557C 4E 80 04 21 */ bctrl +/* 8019861C 0019557C 4E 80 04 21 */ bctrl /* 80198620 00195580 48 00 00 1C */ b lbl_8019863C lbl_80198624: /* 80198624 00195584 38 7D 03 4C */ addi r3, r29, 0x34c @@ -1246,14 +1246,14 @@ lbl_80198624: /* 8019862C 0019558C 81 9D 03 4C */ lwz r12, 0x34c(r29) /* 80198630 00195590 81 8C 00 14 */ lwz r12, 0x14(r12) /* 80198634 00195594 7D 89 03 A6 */ mtctr r12 -/* 80198638 00195598 4E 80 04 21 */ bctrl +/* 80198638 00195598 4E 80 04 21 */ bctrl lbl_8019863C: /* 8019863C 0019559C 80 7D 03 48 */ lwz r3, 0x348(r29) /* 80198640 001955A0 FC 20 F8 90 */ fmr f1, f31 /* 80198644 001955A4 81 83 00 00 */ lwz r12, 0(r3) /* 80198648 001955A8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8019864C 001955AC 7D 89 03 A6 */ mtctr r12 -/* 80198650 001955B0 4E 80 04 21 */ bctrl +/* 80198650 001955B0 4E 80 04 21 */ bctrl /* 80198654 001955B4 C0 02 A6 A4 */ lfs f0, lbl_805AC3C4@sda21(r2) /* 80198658 001955B8 57 80 06 3F */ clrlwi. r0, r28, 0x18 /* 8019865C 001955BC D0 1D 03 D8 */ stfs f0, 0x3d8(r29) @@ -1481,7 +1481,7 @@ lbl_801988C0: /* 801989AC 0019590C 81 83 00 00 */ lwz r12, 0(r3) /* 801989B0 00195910 81 8C 00 64 */ lwz r12, 0x64(r12) /* 801989B4 00195914 7D 89 03 A6 */ mtctr r12 -/* 801989B8 00195918 4E 80 04 21 */ bctrl +/* 801989B8 00195918 4E 80 04 21 */ bctrl /* 801989BC 0019591C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801989C0 00195920 41 82 00 28 */ beq lbl_801989E8 /* 801989C4 00195924 80 9D 03 48 */ lwz r4, 0x348(r29) @@ -1489,7 +1489,7 @@ lbl_801988C0: /* 801989CC 0019592C 81 84 00 00 */ lwz r12, 0(r4) /* 801989D0 00195930 81 8C 00 68 */ lwz r12, 0x68(r12) /* 801989D4 00195934 7D 89 03 A6 */ mtctr r12 -/* 801989D8 00195938 4E 80 04 21 */ bctrl +/* 801989D8 00195938 4E 80 04 21 */ bctrl /* 801989DC 0019593C 7F 63 DB 78 */ mr r3, r27 /* 801989E0 00195940 38 81 01 78 */ addi r4, r1, 0x178 /* 801989E4 00195944 4B F1 CD 61 */ bl SetLight__10CGameLightFRC6CLight @@ -1500,18 +1500,18 @@ lbl_801989E8: /* 801989F4 00195954 80 01 01 F4 */ lwz r0, 0x1f4(r1) /* 801989F8 00195958 7C 08 03 A6 */ mtlr r0 /* 801989FC 0019595C 38 21 01 F0 */ addi r1, r1, 0x1f0 -/* 80198A00 00195960 4E 80 00 20 */ blr +/* 80198A00 00195960 4E 80 00 20 */ blr .global Activate__10CFlameWarpFb Activate__10CFlameWarpFb: /* 80198A04 00195964 88 03 00 A0 */ lbz r0, 0xa0(r3) /* 80198A08 00195968 50 80 3E 30 */ rlwimi r0, r4, 7, 0x18, 0x18 /* 80198A0C 0019596C 98 03 00 A0 */ stb r0, 0xa0(r3) -/* 80198A10 00195970 4E 80 00 20 */ blr +/* 80198A10 00195970 4E 80 00 20 */ blr .global nullsub_141 nullsub_141: -/* 80198A14 00195974 4E 80 00 20 */ blr +/* 80198A14 00195974 4E 80 00 20 */ blr .global Accept__13CFlameThrowerFR8IVisitor Accept__13CFlameThrowerFR8IVisitor: @@ -1524,11 +1524,11 @@ Accept__13CFlameThrowerFR8IVisitor: /* 80198A30 00195990 7C 04 03 78 */ mr r4, r0 /* 80198A34 00195994 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 80198A38 00195998 7D 89 03 A6 */ mtctr r12 -/* 80198A3C 0019599C 4E 80 04 21 */ bctrl +/* 80198A3C 0019599C 4E 80 04 21 */ bctrl /* 80198A40 001959A0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80198A44 001959A4 7C 08 03 A6 */ mtlr r0 /* 80198A48 001959A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80198A4C 001959AC 4E 80 00 20 */ blr +/* 80198A4C 001959AC 4E 80 00 20 */ blr .global GetTouchBounds__13CFlameThrowerCFv GetTouchBounds__13CFlameThrowerCFv: @@ -1574,7 +1574,7 @@ lbl_80198A80: /* 80198AE4 00195A44 D0 03 00 14 */ stfs f0, 0x14(r3) lbl_80198AE8: /* 80198AE8 00195A48 38 21 00 20 */ addi r1, r1, 0x20 -/* 80198AEC 00195A4C 4E 80 00 20 */ blr +/* 80198AEC 00195A4C 4E 80 00 20 */ blr .global "__ct__13CFlameThrowerFRC28TToken<18CWeaponDescription>RCQ24rstl66basic_string,Q24rstl17rmemory_allocator>11EWeaponTypeRC10CFlameInfoRC12CTransform4f14EMaterialTypesRC11CDamageInfo9TUniqueId9TUniqueIdUi" "__ct__13CFlameThrowerFRC28TToken<18CWeaponDescription>RCQ24rstl66basic_string,Q24rstl17rmemory_allocator>11EWeaponTypeRC10CFlameInfoRC12CTransform4f14EMaterialTypesRC11CDamageInfo9TUniqueId9TUniqueIdUi": @@ -1677,7 +1677,7 @@ lbl_80198BE4: /* 80198C6C 00195BCC 81 84 00 00 */ lwz r12, 0(r4) /* 80198C70 00195BD0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80198C74 00195BD4 7D 89 03 A6 */ mtctr r12 -/* 80198C78 00195BD8 4E 80 04 21 */ bctrl +/* 80198C78 00195BD8 4E 80 04 21 */ bctrl /* 80198C7C 00195BDC 3A 5A 03 3C */ addi r18, r26, 0x33c /* 80198C80 00195BE0 38 81 00 48 */ addi r4, r1, 0x48 /* 80198C84 00195BE4 7E 43 93 78 */ mr r3, r18 @@ -1760,7 +1760,7 @@ lbl_80198D08: /* 80198DB0 00195D10 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 80198DB4 00195D14 7C 08 03 A6 */ mtlr r0 /* 80198DB8 00195D18 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 80198DBC 00195D1C 4E 80 00 20 */ blr +/* 80198DBC 00195D1C 4E 80 00 20 */ blr .global __sinit_CFlameThrower_cpp __sinit_CFlameThrower_cpp: diff --git a/asm/MetroidPrime/Weapons/CIceBeam.s b/asm/MetroidPrime/Weapons/CIceBeam.s index eefda8b5..1f956f2f 100644 --- a/asm/MetroidPrime/Weapons/CIceBeam.s +++ b/asm/MetroidPrime/Weapons/CIceBeam.s @@ -37,12 +37,12 @@ EnableFx__8CIceBeamFb: /* 800E0EF8 000DDE58 81 83 00 00 */ lwz r12, 0(r3) /* 800E0EFC 000DDE5C 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 800E0F00 000DDE60 7D 89 03 A6 */ mtctr r12 -/* 800E0F04 000DDE64 4E 80 04 21 */ bctrl +/* 800E0F04 000DDE64 4E 80 04 21 */ bctrl lbl_800E0F08: /* 800E0F08 000DDE68 80 01 00 14 */ lwz r0, 0x14(r1) /* 800E0F0C 000DDE6C 7C 08 03 A6 */ mtlr r0 /* 800E0F10 000DDE70 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E0F14 000DDE74 4E 80 00 20 */ blr +/* 800E0F14 000DDE74 4E 80 00 20 */ blr .global EnableSecondaryFx__8CIceBeamFQ210CGunWeapon16ESecondaryFxType EnableSecondaryFx__8CIceBeamFQ210CGunWeapon16ESecondaryFxType: @@ -105,7 +105,7 @@ lbl_800E0FD4: /* 800E0FE4 000DDF44 38 80 00 01 */ li r4, 1 /* 800E0FE8 000DDF48 81 8C 00 08 */ lwz r12, 8(r12) /* 800E0FEC 000DDF4C 7D 89 03 A6 */ mtctr r12 -/* 800E0FF0 000DDF50 4E 80 04 21 */ bctrl +/* 800E0FF0 000DDF50 4E 80 04 21 */ bctrl lbl_800E0FF4: /* 800E0FF4 000DDF54 7F A0 07 75 */ extsb. r0, r29 /* 800E0FF8 000DDF58 93 DF 02 44 */ stw r30, 0x244(r31) @@ -119,7 +119,7 @@ lbl_800E100C: /* 800E1014 000DDF74 81 83 00 00 */ lwz r12, 0(r3) /* 800E1018 000DDF78 81 8C 00 24 */ lwz r12, 0x24(r12) /* 800E101C 000DDF7C 7D 89 03 A6 */ mtctr r12 -/* 800E1020 000DDF80 4E 80 04 21 */ bctrl +/* 800E1020 000DDF80 4E 80 04 21 */ bctrl /* 800E1024 000DDF84 88 7F 02 48 */ lbz r3, 0x248(r31) /* 800E1028 000DDF88 38 00 00 01 */ li r0, 1 /* 800E102C 000DDF8C 50 03 36 72 */ rlwimi r3, r0, 6, 0x19, 0x19 @@ -154,7 +154,7 @@ lbl_800E1088: /* 800E1098 000DDFF8 38 80 00 01 */ li r4, 1 /* 800E109C 000DDFFC 81 8C 00 08 */ lwz r12, 8(r12) /* 800E10A0 000DE000 7D 89 03 A6 */ mtctr r12 -/* 800E10A4 000DE004 4E 80 04 21 */ bctrl +/* 800E10A4 000DE004 4E 80 04 21 */ bctrl lbl_800E10A8: /* 800E10A8 000DE008 7F 80 07 75 */ extsb. r0, r28 /* 800E10AC 000DE00C 93 DF 02 44 */ stw r30, 0x244(r31) @@ -168,7 +168,7 @@ lbl_800E10C0: /* 800E10C8 000DE028 81 83 00 00 */ lwz r12, 0(r3) /* 800E10CC 000DE02C 81 8C 00 24 */ lwz r12, 0x24(r12) /* 800E10D0 000DE030 7D 89 03 A6 */ mtctr r12 -/* 800E10D4 000DE034 4E 80 04 21 */ bctrl +/* 800E10D4 000DE034 4E 80 04 21 */ bctrl /* 800E10D8 000DE038 93 BF 01 CC */ stw r29, 0x1cc(r31) /* 800E10DC 000DE03C 38 60 00 00 */ li r3, 0 /* 800E10E0 000DE040 88 1F 02 48 */ lbz r0, 0x248(r31) @@ -182,7 +182,7 @@ lbl_800E10EC: /* 800E10FC 000DE05C 83 81 00 20 */ lwz r28, 0x20(r1) /* 800E1100 000DE060 7C 08 03 A6 */ mtlr r0 /* 800E1104 000DE064 38 21 00 30 */ addi r1, r1, 0x30 -/* 800E1108 000DE068 4E 80 00 20 */ blr +/* 800E1108 000DE068 4E 80 00 20 */ blr .global IsLoaded__8CIceBeamCFv IsLoaded__8CIceBeamCFv: @@ -207,7 +207,7 @@ lbl_800E1144: /* 800E1150 000DE0B0 83 C1 00 08 */ lwz r30, 8(r1) /* 800E1154 000DE0B4 7C 08 03 A6 */ mtlr r0 /* 800E1158 000DE0B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E115C 000DE0BC 4E 80 00 20 */ blr +/* 800E115C 000DE0BC 4E 80 00 20 */ blr .global Unload__8CIceBeamFR13CStateManager Unload__8CIceBeamFR13CStateManager: @@ -235,7 +235,7 @@ Unload__8CIceBeamFR13CStateManager: /* 800E11B4 000DE114 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800E11B8 000DE118 7C 08 03 A6 */ mtlr r0 /* 800E11BC 000DE11C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E11C0 000DE120 4E 80 00 20 */ blr +/* 800E11C0 000DE120 4E 80 00 20 */ blr .global Load__8CIceBeamFb Load__8CIceBeamFb: @@ -259,7 +259,7 @@ Load__8CIceBeamFb: /* 800E1208 000DE168 80 01 00 14 */ lwz r0, 0x14(r1) /* 800E120C 000DE16C 7C 08 03 A6 */ mtlr r0 /* 800E1210 000DE170 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E1214 000DE174 4E 80 00 20 */ blr +/* 800E1214 000DE174 4E 80 00 20 */ blr .global Fire__8CIceBeamFbfQ212CPlayerState12EChargeStageRC12CTransform4fR13CStateManager9TUniqueId Fire__8CIceBeamFbfQ212CPlayerState12EChargeStageRC12CTransform4fR13CStateManager9TUniqueId: @@ -287,7 +287,7 @@ Fire__8CIceBeamFbfQ212CPlayerState12EChargeStageRC12CTransform4fR13CStateManager /* 800E126C 000DE1CC 83 C1 00 18 */ lwz r30, 0x18(r1) /* 800E1270 000DE1D0 7C 08 03 A6 */ mtlr r0 /* 800E1274 000DE1D4 38 21 00 20 */ addi r1, r1, 0x20 -/* 800E1278 000DE1D8 4E 80 00 20 */ blr +/* 800E1278 000DE1D8 4E 80 00 20 */ blr .global Update__8CIceBeamFfR13CStateManager Update__8CIceBeamFfR13CStateManager: @@ -404,7 +404,7 @@ lbl_800E13FC: /* 800E140C 000DE36C 38 80 00 01 */ li r4, 1 /* 800E1410 000DE370 81 8C 00 08 */ lwz r12, 8(r12) /* 800E1414 000DE374 7D 89 03 A6 */ mtctr r12 -/* 800E1418 000DE378 4E 80 04 21 */ bctrl +/* 800E1418 000DE378 4E 80 04 21 */ bctrl lbl_800E141C: /* 800E141C 000DE37C 7F A0 07 75 */ extsb. r0, r29 /* 800E1420 000DE380 93 DF 02 40 */ stw r30, 0x240(r31) @@ -418,13 +418,13 @@ lbl_800E1434: /* 800E143C 000DE39C 81 83 00 00 */ lwz r12, 0(r3) /* 800E1440 000DE3A0 81 8C 00 24 */ lwz r12, 0x24(r12) /* 800E1444 000DE3A4 7D 89 03 A6 */ mtctr r12 -/* 800E1448 000DE3A8 4E 80 04 21 */ bctrl +/* 800E1448 000DE3A8 4E 80 04 21 */ bctrl /* 800E144C 000DE3AC 80 7F 02 40 */ lwz r3, 0x240(r31) /* 800E1450 000DE3B0 38 80 00 00 */ li r4, 0 /* 800E1454 000DE3B4 81 83 00 00 */ lwz r12, 0(r3) /* 800E1458 000DE3B8 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 800E145C 000DE3BC 7D 89 03 A6 */ mtctr r12 -/* 800E1460 000DE3C0 4E 80 04 21 */ bctrl +/* 800E1460 000DE3C0 4E 80 04 21 */ bctrl lbl_800E1464: /* 800E1464 000DE3C4 80 01 00 24 */ lwz r0, 0x24(r1) /* 800E1468 000DE3C8 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -432,7 +432,7 @@ lbl_800E1464: /* 800E1470 000DE3D0 83 A1 00 14 */ lwz r29, 0x14(r1) /* 800E1474 000DE3D4 7C 08 03 A6 */ mtlr r0 /* 800E1478 000DE3D8 38 21 00 20 */ addi r1, r1, 0x20 -/* 800E147C 000DE3DC 4E 80 00 20 */ blr +/* 800E147C 000DE3DC 4E 80 00 20 */ blr .global UpdateGunFx__8CIceBeamFbfRC13CStateManagerRC12CTransform4f UpdateGunFx__8CIceBeamFbfRC13CStateManagerRC12CTransform4f: @@ -473,7 +473,7 @@ UpdateGunFx__8CIceBeamFbfRC13CStateManagerRC12CTransform4f: /* 800E1508 000DE468 81 83 00 00 */ lwz r12, 0(r3) /* 800E150C 000DE46C 81 8C 00 18 */ lwz r12, 0x18(r12) /* 800E1510 000DE470 7D 89 03 A6 */ mtctr r12 -/* 800E1514 000DE474 4E 80 04 21 */ bctrl +/* 800E1514 000DE474 4E 80 04 21 */ bctrl /* 800E1518 000DE478 83 FB 02 40 */ lwz r31, 0x240(r27) /* 800E151C 000DE47C 38 61 00 60 */ addi r3, r1, 0x60 /* 800E1520 000DE480 38 81 00 C0 */ addi r4, r1, 0xc0 @@ -483,13 +483,13 @@ UpdateGunFx__8CIceBeamFbfRC13CStateManagerRC12CTransform4f: /* 800E1530 000DE490 81 9F 00 00 */ lwz r12, 0(r31) /* 800E1534 000DE494 81 8C 00 14 */ lwz r12, 0x14(r12) /* 800E1538 000DE498 7D 89 03 A6 */ mtctr r12 -/* 800E153C 000DE49C 4E 80 04 21 */ bctrl +/* 800E153C 000DE49C 4E 80 04 21 */ bctrl /* 800E1540 000DE4A0 80 7B 02 40 */ lwz r3, 0x240(r27) /* 800E1544 000DE4A4 FC 20 F8 90 */ fmr f1, f31 /* 800E1548 000DE4A8 81 83 00 00 */ lwz r12, 0(r3) /* 800E154C 000DE4AC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800E1550 000DE4B0 7D 89 03 A6 */ mtctr r12 -/* 800E1554 000DE4B4 4E 80 04 21 */ bctrl +/* 800E1554 000DE4B4 4E 80 04 21 */ bctrl lbl_800E1558: /* 800E1558 000DE4B8 80 7B 02 44 */ lwz r3, 0x244(r27) /* 800E155C 000DE4BC 28 03 00 00 */ cmplwi r3, 0 @@ -500,7 +500,7 @@ lbl_800E1558: /* 800E1570 000DE4D0 81 83 00 00 */ lwz r12, 0(r3) /* 800E1574 000DE4D4 81 8C 00 58 */ lwz r12, 0x58(r12) /* 800E1578 000DE4D8 7D 89 03 A6 */ mtctr r12 -/* 800E157C 000DE4DC 4E 80 04 21 */ bctrl +/* 800E157C 000DE4DC 4E 80 04 21 */ bctrl /* 800E1580 000DE4E0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E1584 000DE4E4 41 82 00 34 */ beq lbl_800E15B8 /* 800E1588 000DE4E8 38 00 00 00 */ li r0, 0 @@ -512,7 +512,7 @@ lbl_800E1558: /* 800E15A0 000DE500 38 80 00 01 */ li r4, 1 /* 800E15A4 000DE504 81 8C 00 08 */ lwz r12, 8(r12) /* 800E15A8 000DE508 7D 89 03 A6 */ mtctr r12 -/* 800E15AC 000DE50C 4E 80 04 21 */ bctrl +/* 800E15AC 000DE50C 4E 80 04 21 */ bctrl lbl_800E15B0: /* 800E15B0 000DE510 38 00 00 00 */ li r0, 0 /* 800E15B4 000DE514 90 1B 02 44 */ stw r0, 0x244(r27) @@ -534,7 +534,7 @@ lbl_800E15B8: /* 800E15F0 000DE550 81 83 00 00 */ lwz r12, 0(r3) /* 800E15F4 000DE554 81 8C 00 18 */ lwz r12, 0x18(r12) /* 800E15F8 000DE558 7D 89 03 A6 */ mtctr r12 -/* 800E15FC 000DE55C 4E 80 04 21 */ bctrl +/* 800E15FC 000DE55C 4E 80 04 21 */ bctrl /* 800E1600 000DE560 83 FB 02 44 */ lwz r31, 0x244(r27) /* 800E1604 000DE564 7F C4 F3 78 */ mr r4, r30 /* 800E1608 000DE568 38 61 00 30 */ addi r3, r1, 0x30 @@ -544,7 +544,7 @@ lbl_800E15B8: /* 800E1618 000DE578 81 9F 00 00 */ lwz r12, 0(r31) /* 800E161C 000DE57C 81 8C 00 14 */ lwz r12, 0x14(r12) /* 800E1620 000DE580 7D 89 03 A6 */ mtctr r12 -/* 800E1624 000DE584 4E 80 04 21 */ bctrl +/* 800E1624 000DE584 4E 80 04 21 */ bctrl /* 800E1628 000DE588 48 00 00 10 */ b lbl_800E1638 lbl_800E162C: /* 800E162C 000DE58C 80 7B 02 44 */ lwz r3, 0x244(r27) @@ -556,7 +556,7 @@ lbl_800E1638: /* 800E1640 000DE5A0 81 83 00 00 */ lwz r12, 0(r3) /* 800E1644 000DE5A4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800E1648 000DE5A8 7D 89 03 A6 */ mtctr r12 -/* 800E164C 000DE5AC 4E 80 04 21 */ bctrl +/* 800E164C 000DE5AC 4E 80 04 21 */ bctrl lbl_800E1650: /* 800E1650 000DE5B0 FC 20 F8 90 */ fmr f1, f31 /* 800E1654 000DE5B4 7F 63 DB 78 */ mr r3, r27 @@ -570,7 +570,7 @@ lbl_800E1650: /* 800E1674 000DE5D4 80 01 01 24 */ lwz r0, 0x124(r1) /* 800E1678 000DE5D8 7C 08 03 A6 */ mtlr r0 /* 800E167C 000DE5DC 38 21 01 20 */ addi r1, r1, 0x120 -/* 800E1680 000DE5E0 4E 80 00 20 */ blr +/* 800E1680 000DE5E0 4E 80 00 20 */ blr .global PostRenderGunFx__8CIceBeamFRC13CStateManagerRC12CTransform4f PostRenderGunFx__8CIceBeamFRC13CStateManagerRC12CTransform4f: @@ -598,7 +598,7 @@ lbl_800E16C8: /* 800E16D4 000DE634 81 83 00 00 */ lwz r12, 0(r3) /* 800E16D8 000DE638 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800E16DC 000DE63C 7D 89 03 A6 */ mtctr r12 -/* 800E16E0 000DE640 4E 80 04 21 */ bctrl +/* 800E16E0 000DE640 4E 80 04 21 */ bctrl lbl_800E16E4: /* 800E16E4 000DE644 80 1C 01 CC */ lwz r0, 0x1cc(r28) /* 800E16E8 000DE648 2C 00 00 00 */ cmpwi r0, 0 @@ -609,7 +609,7 @@ lbl_800E16E4: /* 800E16FC 000DE65C 81 83 00 00 */ lwz r12, 0(r3) /* 800E1700 000DE660 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800E1704 000DE664 7D 89 03 A6 */ mtctr r12 -/* 800E1708 000DE668 4E 80 04 21 */ bctrl +/* 800E1708 000DE668 4E 80 04 21 */ bctrl lbl_800E170C: /* 800E170C 000DE66C 7F 83 E3 78 */ mr r3, r28 /* 800E1710 000DE670 7F A4 EB 78 */ mr r4, r29 @@ -627,11 +627,11 @@ lbl_800E172C: /* 800E173C 000DE69C 83 81 00 10 */ lwz r28, 0x10(r1) /* 800E1740 000DE6A0 7C 08 03 A6 */ mtlr r0 /* 800E1744 000DE6A4 38 21 00 20 */ addi r1, r1, 0x20 -/* 800E1748 000DE6A8 4E 80 00 20 */ blr +/* 800E1748 000DE6A8 4E 80 00 20 */ blr .global PreRenderGunFx__8CIceBeamFRC13CStateManagerRC12CTransform4f PreRenderGunFx__8CIceBeamFRC13CStateManagerRC12CTransform4f: -/* 800E174C 000DE6AC 4E 80 00 20 */ blr +/* 800E174C 000DE6AC 4E 80 00 20 */ blr .global ReInitVariables__8CIceBeamFv ReInitVariables__8CIceBeamFv: @@ -647,7 +647,7 @@ ReInitVariables__8CIceBeamFv: /* 800E1774 000DE6D4 38 80 00 01 */ li r4, 1 /* 800E1778 000DE6D8 81 8C 00 08 */ lwz r12, 8(r12) /* 800E177C 000DE6DC 7D 89 03 A6 */ mtctr r12 -/* 800E1780 000DE6E0 4E 80 04 21 */ bctrl +/* 800E1780 000DE6E0 4E 80 04 21 */ bctrl lbl_800E1784: /* 800E1784 000DE6E4 38 00 00 00 */ li r0, 0 /* 800E1788 000DE6E8 90 1F 02 40 */ stw r0, 0x240(r31) @@ -658,7 +658,7 @@ lbl_800E1784: /* 800E179C 000DE6FC 38 80 00 01 */ li r4, 1 /* 800E17A0 000DE700 81 8C 00 08 */ lwz r12, 8(r12) /* 800E17A4 000DE704 7D 89 03 A6 */ mtctr r12 -/* 800E17A8 000DE708 4E 80 04 21 */ bctrl +/* 800E17A8 000DE708 4E 80 04 21 */ bctrl lbl_800E17AC: /* 800E17AC 000DE70C 38 60 00 00 */ li r3, 0 /* 800E17B0 000DE710 90 7F 02 44 */ stw r3, 0x244(r31) @@ -673,7 +673,7 @@ lbl_800E17AC: /* 800E17D4 000DE734 80 01 00 14 */ lwz r0, 0x14(r1) /* 800E17D8 000DE738 7C 08 03 A6 */ mtlr r0 /* 800E17DC 000DE73C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E17E0 000DE740 4E 80 00 20 */ blr +/* 800E17E0 000DE740 4E 80 00 20 */ blr .global __dt__8CIceBeamFv __dt__8CIceBeamFv: @@ -697,7 +697,7 @@ __dt__8CIceBeamFv: /* 800E1828 000DE788 38 80 00 01 */ li r4, 1 /* 800E182C 000DE78C 81 8C 00 08 */ lwz r12, 8(r12) /* 800E1830 000DE790 7D 89 03 A6 */ mtctr r12 -/* 800E1834 000DE794 4E 80 04 21 */ bctrl +/* 800E1834 000DE794 4E 80 04 21 */ bctrl lbl_800E1838: /* 800E1838 000DE798 34 1E 02 40 */ addic. r0, r30, 0x240 /* 800E183C 000DE79C 41 82 00 24 */ beq lbl_800E1860 @@ -708,7 +708,7 @@ lbl_800E1838: /* 800E1850 000DE7B0 38 80 00 01 */ li r4, 1 /* 800E1854 000DE7B4 81 8C 00 08 */ lwz r12, 8(r12) /* 800E1858 000DE7B8 7D 89 03 A6 */ mtctr r12 -/* 800E185C 000DE7BC 4E 80 04 21 */ bctrl +/* 800E185C 000DE7BC 4E 80 04 21 */ bctrl lbl_800E1860: /* 800E1860 000DE7C0 34 1E 02 34 */ addic. r0, r30, 0x234 /* 800E1864 000DE7C4 41 82 00 18 */ beq lbl_800E187C @@ -748,7 +748,7 @@ lbl_800E18D0: /* 800E18DC 000DE83C 83 C1 00 08 */ lwz r30, 8(r1) /* 800E18E0 000DE840 7C 08 03 A6 */ mtlr r0 /* 800E18E4 000DE844 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E18E8 000DE848 4E 80 00 20 */ blr +/* 800E18E8 000DE848 4E 80 00 20 */ blr .global __ct__8CIceBeamFUi11EWeaponType9TUniqueId14EMaterialTypesRC9CVector3f __ct__8CIceBeamFUi11EWeaponType9TUniqueId14EMaterialTypesRC9CVector3f: @@ -773,7 +773,7 @@ __ct__8CIceBeamFUi11EWeaponType9TUniqueId14EMaterialTypesRC9CVector3f: /* 800E1934 000DE894 81 84 00 00 */ lwz r12, 0(r4) /* 800E1938 000DE898 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800E193C 000DE89C 7D 89 03 A6 */ mtctr r12 -/* 800E1940 000DE8A0 4E 80 04 21 */ bctrl +/* 800E1940 000DE8A0 4E 80 04 21 */ bctrl /* 800E1944 000DE8A4 3B DF 02 1C */ addi r30, r31, 0x21c /* 800E1948 000DE8A8 38 81 00 1C */ addi r4, r1, 0x1c /* 800E194C 000DE8AC 7F C3 F3 78 */ mr r3, r30 @@ -791,7 +791,7 @@ __ct__8CIceBeamFUi11EWeaponType9TUniqueId14EMaterialTypesRC9CVector3f: /* 800E197C 000DE8DC 38 A5 00 10 */ addi r5, r5, 0x10 /* 800E1980 000DE8E0 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800E1984 000DE8E4 7D 89 03 A6 */ mtctr r12 -/* 800E1988 000DE8E8 4E 80 04 21 */ bctrl +/* 800E1988 000DE8E8 4E 80 04 21 */ bctrl /* 800E198C 000DE8EC 3B DF 02 28 */ addi r30, r31, 0x228 /* 800E1990 000DE8F0 38 81 00 14 */ addi r4, r1, 0x14 /* 800E1994 000DE8F4 7F C3 F3 78 */ mr r3, r30 @@ -809,7 +809,7 @@ __ct__8CIceBeamFUi11EWeaponType9TUniqueId14EMaterialTypesRC9CVector3f: /* 800E19C4 000DE924 38 A5 00 19 */ addi r5, r5, 0x19 /* 800E19C8 000DE928 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800E19CC 000DE92C 7D 89 03 A6 */ mtctr r12 -/* 800E19D0 000DE930 4E 80 04 21 */ bctrl +/* 800E19D0 000DE930 4E 80 04 21 */ bctrl /* 800E19D4 000DE934 3B DF 02 34 */ addi r30, r31, 0x234 /* 800E19D8 000DE938 38 81 00 0C */ addi r4, r1, 0xc /* 800E19DC 000DE93C 7F C3 F3 78 */ mr r3, r30 diff --git a/asm/MetroidPrime/Weapons/CIceImpact.s b/asm/MetroidPrime/Weapons/CIceImpact.s index 86dabfe1..de02a287 100644 --- a/asm/MetroidPrime/Weapons/CIceImpact.s +++ b/asm/MetroidPrime/Weapons/CIceImpact.s @@ -461,13 +461,13 @@ lbl_801B6064: /* 801B6150 001B30B0 81 83 00 00 */ lwz r12, 0(r3) /* 801B6154 001B30B4 81 8C 00 14 */ lwz r12, 0x14(r12) /* 801B6158 001B30B8 7D 89 03 A6 */ mtctr r12 -/* 801B615C 001B30BC 4E 80 04 21 */ bctrl +/* 801B615C 001B30BC 4E 80 04 21 */ bctrl /* 801B6160 001B30C0 80 76 00 E8 */ lwz r3, 0xe8(r22) /* 801B6164 001B30C4 38 81 00 98 */ addi r4, r1, 0x98 /* 801B6168 001B30C8 81 83 00 00 */ lwz r12, 0(r3) /* 801B616C 001B30CC 81 8C 00 18 */ lwz r12, 0x18(r12) /* 801B6170 001B30D0 7D 89 03 A6 */ mtctr r12 -/* 801B6174 001B30D4 4E 80 04 21 */ bctrl +/* 801B6174 001B30D4 4E 80 04 21 */ bctrl /* 801B6178 001B30D8 80 76 00 E8 */ lwz r3, 0xe8(r22) /* 801B617C 001B30DC 38 80 00 01 */ li r4, 1 /* 801B6180 001B30E0 48 16 67 41 */ bl ForceParticleCreation__11CElementGenFi @@ -476,7 +476,7 @@ lbl_801B6064: /* 801B618C 001B30EC 82 A3 00 90 */ lwz r21, 0x90(r3) /* 801B6190 001B30F0 81 8C 00 60 */ lwz r12, 0x60(r12) /* 801B6194 001B30F4 7D 89 03 A6 */ mtctr r12 -/* 801B6198 001B30F8 4E 80 04 21 */ bctrl +/* 801B6198 001B30F8 4E 80 04 21 */ bctrl /* 801B619C 001B30FC 7C 03 A8 00 */ cmpw r3, r21 /* 801B61A0 001B3100 40 82 00 0C */ bne lbl_801B61AC /* 801B61A4 001B3104 38 60 00 01 */ li r3, 1 @@ -505,7 +505,7 @@ lbl_801B61BC: /* 801B61F0 001B3150 80 01 01 B4 */ lwz r0, 0x1b4(r1) /* 801B61F4 001B3154 7C 08 03 A6 */ mtlr r0 /* 801B61F8 001B3158 38 21 01 B0 */ addi r1, r1, 0x1b0 -/* 801B61FC 001B315C 4E 80 00 20 */ blr +/* 801B61FC 001B315C 4E 80 00 20 */ blr .global GenerateParticlesAgainstOBBTree__10CIceImpactFR13CStateManagerRC8COBBTreeRC12CTransform4fRC7CSphereRC7CSphere GenerateParticlesAgainstOBBTree__10CIceImpactFR13CStateManagerRC8COBBTreeRC12CTransform4fRC7CSphereRC7CSphere: @@ -594,7 +594,7 @@ lbl_801B6330: /* 801B6338 001B3298 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 801B633C 001B329C 7C 08 03 A6 */ mtlr r0 /* 801B6340 001B32A0 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 801B6344 001B32A4 4E 80 00 20 */ blr +/* 801B6344 001B32A4 4E 80 00 20 */ blr .global GenerateParticlesAgainstAABox__10CIceImpactFR13CStateManagerRC6CAABoxRC7CSphereRC7CSphere GenerateParticlesAgainstAABox__10CIceImpactFR13CStateManagerRC6CAABoxRC7CSphereRC7CSphere: @@ -664,7 +664,7 @@ lbl_801B6434: /* 801B643C 001B339C 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 801B6440 001B33A0 7C 08 03 A6 */ mtlr r0 /* 801B6444 001B33A4 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 801B6448 001B33A8 4E 80 00 20 */ blr +/* 801B6448 001B33A8 4E 80 00 20 */ blr .global GenerateParticlesAgainstActors__10CIceImpactFR13CStateManagerRC6CAABoxRC7CSphereRC7CSphere GenerateParticlesAgainstActors__10CIceImpactFR13CStateManagerRC6CAABoxRC7CSphereRC7CSphere: @@ -745,11 +745,11 @@ lbl_801B6538: /* 801B6570 001B34D0 81 98 00 00 */ lwz r12, 0(r24) /* 801B6574 001B34D4 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 801B6578 001B34D8 7D 89 03 A6 */ mtctr r12 -/* 801B657C 001B34DC 4E 80 04 21 */ bctrl +/* 801B657C 001B34DC 4E 80 04 21 */ bctrl /* 801B6580 001B34E0 81 83 00 00 */ lwz r12, 0(r3) /* 801B6584 001B34E4 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 801B6588 001B34E8 7D 89 03 A6 */ mtctr r12 -/* 801B658C 001B34EC 4E 80 04 21 */ bctrl +/* 801B658C 001B34EC 4E 80 04 21 */ bctrl /* 801B6590 001B34F0 3C 03 B0 BE */ addis r0, r3, 0xb0be /* 801B6594 001B34F4 28 00 54 47 */ cmplwi r0, 0x5447 /* 801B6598 001B34F8 40 82 00 7C */ bne lbl_801B6614 @@ -757,7 +757,7 @@ lbl_801B6538: /* 801B65A0 001B3500 81 98 00 00 */ lwz r12, 0(r24) /* 801B65A4 001B3504 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 801B65A8 001B3508 7D 89 03 A6 */ mtctr r12 -/* 801B65AC 001B350C 4E 80 04 21 */ bctrl +/* 801B65AC 001B350C 4E 80 04 21 */ bctrl /* 801B65B0 001B3510 3A E0 00 00 */ li r23, 0 /* 801B65B4 001B3514 7C 79 1B 78 */ mr r25, r3 /* 801B65B8 001B3518 48 00 00 48 */ b lbl_801B6600 @@ -767,7 +767,7 @@ lbl_801B65BC: /* 801B65C4 001B3524 81 98 00 00 */ lwz r12, 0(r24) /* 801B65C8 001B3528 81 8C 00 70 */ lwz r12, 0x70(r12) /* 801B65CC 001B352C 7D 89 03 A6 */ mtctr r12 -/* 801B65D0 001B3530 4E 80 04 21 */ bctrl +/* 801B65D0 001B3530 4E 80 04 21 */ bctrl /* 801B65D4 001B3534 7F 23 CB 78 */ mr r3, r25 /* 801B65D8 001B3538 7E E4 BB 78 */ mr r4, r23 /* 801B65DC 001B353C 48 0F 73 71 */ bl GetOBBTreeAABox__23CCollidableOBBTreeGroupCFi @@ -810,7 +810,7 @@ lbl_801B665C: /* 801B6664 001B35C4 81 99 00 00 */ lwz r12, 0(r25) /* 801B6668 001B35C8 81 8C 00 40 */ lwz r12, 0x40(r12) /* 801B666C 001B35CC 7D 89 03 A6 */ mtctr r12 -/* 801B6670 001B35D0 4E 80 04 21 */ bctrl +/* 801B6670 001B35D0 4E 80 04 21 */ bctrl /* 801B6674 001B35D4 88 01 00 34 */ lbz r0, 0x34(r1) /* 801B6678 001B35D8 28 00 00 00 */ cmplwi r0, 0 /* 801B667C 001B35DC 98 01 00 68 */ stb r0, 0x68(r1) @@ -881,7 +881,7 @@ lbl_801B6750: /* 801B6760 001B36C0 80 01 08 D4 */ lwz r0, 0x8d4(r1) /* 801B6764 001B36C4 7C 08 03 A6 */ mtlr r0 /* 801B6768 001B36C8 38 21 08 D0 */ addi r1, r1, 0x8d0 -/* 801B676C 001B36CC 4E 80 00 20 */ blr +/* 801B676C 001B36CC 4E 80 00 20 */ blr .global GenerateParticlesAgainstWorld__10CIceImpactFR13CStateManagerRCQ220CMetroidAreaCollider16COctreeLeafCacheRC7CSphereRC7CSphere GenerateParticlesAgainstWorld__10CIceImpactFR13CStateManagerRCQ220CMetroidAreaCollider16COctreeLeafCacheRC7CSphereRC7CSphere: @@ -1009,7 +1009,7 @@ lbl_801B6928: /* 801B693C 001B389C 80 01 01 04 */ lwz r0, 0x104(r1) /* 801B6940 001B38A0 7C 08 03 A6 */ mtlr r0 /* 801B6944 001B38A4 38 21 01 00 */ addi r1, r1, 0x100 -/* 801B6948 001B38A8 4E 80 00 20 */ blr +/* 801B6948 001B38A8 4E 80 00 20 */ blr .global GenerateNewSphere__10CIceImpactFv GenerateNewSphere__10CIceImpactFv: @@ -1187,7 +1187,7 @@ lbl_801B6BB0: /* 801B6BB4 001B3B14 80 01 00 74 */ lwz r0, 0x74(r1) /* 801B6BB8 001B3B18 7C 08 03 A6 */ mtlr r0 /* 801B6BBC 001B3B1C 38 21 00 70 */ addi r1, r1, 0x70 -/* 801B6BC0 001B3B20 4E 80 00 20 */ blr +/* 801B6BC0 001B3B20 4E 80 00 20 */ blr .global pointInSphere__FRC7CSphereRC9CVector3f pointInSphere__FRC7CSphereRC9CVector3f: @@ -1216,7 +1216,7 @@ pointInSphere__FRC7CSphereRC9CVector3f: /* 801B6C1C 001B3B7C 7C 00 00 26 */ mfcr r0 /* 801B6C20 001B3B80 54 03 1F FE */ rlwinm r3, r0, 3, 0x1f, 0x1f /* 801B6C24 001B3B84 38 21 00 20 */ addi r1, r1, 0x20 -/* 801B6C28 001B3B88 4E 80 00 20 */ blr +/* 801B6C28 001B3B88 4E 80 00 20 */ blr .global Touch__10CIceImpactFR6CActorR13CStateManager Touch__10CIceImpactFR6CActorR13CStateManager: @@ -1238,7 +1238,7 @@ Touch__10CIceImpactFR6CActorR13CStateManager: /* 801B6C68 001B3BC8 38 61 00 98 */ addi r3, r1, 0x98 /* 801B6C6C 001B3BCC 81 8C 00 40 */ lwz r12, 0x40(r12) /* 801B6C70 001B3BD0 7D 89 03 A6 */ mtctr r12 -/* 801B6C74 001B3BD4 4E 80 04 21 */ bctrl +/* 801B6C74 001B3BD4 4E 80 04 21 */ bctrl /* 801B6C78 001B3BD8 88 01 00 B0 */ lbz r0, 0xb0(r1) /* 801B6C7C 001B3BDC 28 00 00 00 */ cmplwi r0, 0 /* 801B6C80 001B3BE0 98 01 01 00 */ stb r0, 0x100(r1) @@ -1338,7 +1338,7 @@ lbl_801B6CC0: /* 801B6DF4 001B3D54 81 9C 00 00 */ lwz r12, 0(r28) /* 801B6DF8 001B3D58 81 8C 00 38 */ lwz r12, 0x38(r12) /* 801B6DFC 001B3D5C 7D 89 03 A6 */ mtctr r12 -/* 801B6E00 001B3D60 4E 80 04 21 */ bctrl +/* 801B6E00 001B3D60 4E 80 04 21 */ bctrl /* 801B6E04 001B3D64 38 81 00 38 */ addi r4, r1, 0x38 /* 801B6E08 001B3D68 38 A0 00 00 */ li r5, 0 /* 801B6E0C 001B3D6C 4B F4 B7 79 */ bl WeaponHits__20CDamageVulnerabilityCFRC11CWeaponModei @@ -1460,14 +1460,14 @@ lbl_801B6FBC: /* 801B6FCC 001B3F2C 83 81 01 10 */ lwz r28, 0x110(r1) /* 801B6FD0 001B3F30 7C 08 03 A6 */ mtlr r0 /* 801B6FD4 001B3F34 38 21 01 20 */ addi r1, r1, 0x120 -/* 801B6FD8 001B3F38 4E 80 00 20 */ blr +/* 801B6FD8 001B3F38 4E 80 00 20 */ blr .global GetTouchBounds__10CIceImpactCFv GetTouchBounds__10CIceImpactCFv: /* 801B6FDC 001B3F3C 38 00 00 01 */ li r0, 1 /* 801B6FE0 001B3F40 28 03 00 00 */ cmplwi r3, 0 /* 801B6FE4 001B3F44 98 03 00 18 */ stb r0, 0x18(r3) -/* 801B6FE8 001B3F48 4D 82 00 20 */ beqlr +/* 801B6FE8 001B3F48 4D 82 00 20 */ beqlr /* 801B6FEC 001B3F4C C0 04 01 18 */ lfs f0, 0x118(r4) /* 801B6FF0 001B3F50 D0 03 00 00 */ stfs f0, 0(r3) /* 801B6FF4 001B3F54 C0 04 01 1C */ lfs f0, 0x11c(r4) @@ -1480,7 +1480,7 @@ GetTouchBounds__10CIceImpactCFv: /* 801B7010 001B3F70 D0 03 00 10 */ stfs f0, 0x10(r3) /* 801B7014 001B3F74 C0 04 01 2C */ lfs f0, 0x12c(r4) /* 801B7018 001B3F78 D0 03 00 14 */ stfs f0, 0x14(r3) -/* 801B701C 001B3F7C 4E 80 00 20 */ blr +/* 801B701C 001B3F7C 4E 80 00 20 */ blr .global AcceptScriptMsg__10CIceImpactF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__10CIceImpactF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -1503,7 +1503,7 @@ lbl_801B7058: /* 801B705C 001B3FBC 81 83 00 00 */ lwz r12, 0(r3) /* 801B7060 001B3FC0 81 8C 00 64 */ lwz r12, 0x64(r12) /* 801B7064 001B3FC4 7D 89 03 A6 */ mtctr r12 -/* 801B7068 001B3FC8 4E 80 04 21 */ bctrl +/* 801B7068 001B3FC8 4E 80 04 21 */ bctrl /* 801B706C 001B3FCC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801B7070 001B3FD0 41 82 01 44 */ beq lbl_801B71B4 /* 801B7074 001B3FD4 7F E4 FB 78 */ mr r4, r31 @@ -1548,7 +1548,7 @@ lbl_801B7058: /* 801B7110 001B4070 81 84 00 00 */ lwz r12, 0(r4) /* 801B7114 001B4074 81 8C 00 68 */ lwz r12, 0x68(r12) /* 801B7118 001B4078 7D 89 03 A6 */ mtctr r12 -/* 801B711C 001B407C 4E 80 04 21 */ bctrl +/* 801B711C 001B407C 4E 80 04 21 */ bctrl /* 801B7120 001B4080 93 01 00 08 */ stw r24, 8(r1) /* 801B7124 001B4084 38 00 00 01 */ li r0, 1 /* 801B7128 001B4088 C0 22 A9 84 */ lfs f1, lbl_805AC6A4@sda21(r2) @@ -1615,7 +1615,7 @@ lbl_801B7204: /* 801B7208 001B4168 80 01 00 D4 */ lwz r0, 0xd4(r1) /* 801B720C 001B416C 7C 08 03 A6 */ mtlr r0 /* 801B7210 001B4170 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 801B7214 001B4174 4E 80 00 20 */ blr +/* 801B7214 001B4174 4E 80 00 20 */ blr .global Accept__10CIceImpactFR8IVisitor Accept__10CIceImpactFR8IVisitor: @@ -1628,11 +1628,11 @@ Accept__10CIceImpactFR8IVisitor: /* 801B7230 001B4190 7C 04 03 78 */ mr r4, r0 /* 801B7234 001B4194 81 8C 00 08 */ lwz r12, 8(r12) /* 801B7238 001B4198 7D 89 03 A6 */ mtctr r12 -/* 801B723C 001B419C 4E 80 04 21 */ bctrl +/* 801B723C 001B419C 4E 80 04 21 */ bctrl /* 801B7240 001B41A0 80 01 00 14 */ lwz r0, 0x14(r1) /* 801B7244 001B41A4 7C 08 03 A6 */ mtlr r0 /* 801B7248 001B41A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801B724C 001B41AC 4E 80 00 20 */ blr +/* 801B724C 001B41AC 4E 80 00 20 */ blr .global Think__10CIceImpactFfR13CStateManager Think__10CIceImpactFfR13CStateManager: @@ -1657,7 +1657,7 @@ Think__10CIceImpactFfR13CStateManager: /* 801B7298 001B41F8 81 83 00 00 */ lwz r12, 0(r3) /* 801B729C 001B41FC 81 8C 00 60 */ lwz r12, 0x60(r12) /* 801B72A0 001B4200 7D 89 03 A6 */ mtctr r12 -/* 801B72A4 001B4204 4E 80 04 21 */ bctrl +/* 801B72A4 001B4204 4E 80 04 21 */ bctrl /* 801B72A8 001B4208 2C 03 01 90 */ cmpwi r3, 0x190 /* 801B72AC 001B420C 40 80 02 AC */ bge lbl_801B7558 /* 801B72B0 001B4210 3B DA 05 44 */ addi r30, r26, 0x544 @@ -1854,13 +1854,13 @@ lbl_801B7558: /* 801B7564 001B44C4 81 83 00 00 */ lwz r12, 0(r3) /* 801B7568 001B44C8 81 8C 00 14 */ lwz r12, 0x14(r12) /* 801B756C 001B44CC 7D 89 03 A6 */ mtctr r12 -/* 801B7570 001B44D0 4E 80 04 21 */ bctrl +/* 801B7570 001B44D0 4E 80 04 21 */ bctrl /* 801B7574 001B44D4 80 7A 00 E8 */ lwz r3, 0xe8(r26) /* 801B7578 001B44D8 FC 20 F8 90 */ fmr f1, f31 /* 801B757C 001B44DC 81 83 00 00 */ lwz r12, 0(r3) /* 801B7580 001B44E0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801B7584 001B44E4 7D 89 03 A6 */ mtctr r12 -/* 801B7588 001B44E8 4E 80 04 21 */ bctrl +/* 801B7588 001B44E8 4E 80 04 21 */ bctrl /* 801B758C 001B44EC A0 7A 00 EC */ lhz r3, 0xec(r26) /* 801B7590 001B44F0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801B7594 001B44F4 7C 03 00 40 */ cmplw r3, r0 @@ -1884,7 +1884,7 @@ lbl_801B7558: /* 801B75DC 001B453C 81 84 00 00 */ lwz r12, 0(r4) /* 801B75E0 001B4540 81 8C 00 68 */ lwz r12, 0x68(r12) /* 801B75E4 001B4544 7D 89 03 A6 */ mtctr r12 -/* 801B75E8 001B4548 4E 80 04 21 */ bctrl +/* 801B75E8 001B4548 4E 80 04 21 */ bctrl /* 801B75EC 001B454C 7F 83 E3 78 */ mr r3, r28 /* 801B75F0 001B4550 38 81 00 B4 */ addi r4, r1, 0xb4 /* 801B75F4 001B4554 4B EF E1 51 */ bl SetLight__10CGameLightFRC6CLight @@ -1906,7 +1906,7 @@ lbl_801B7628: /* 801B762C 001B458C 81 83 00 00 */ lwz r12, 0(r3) /* 801B7630 001B4590 81 8C 00 58 */ lwz r12, 0x58(r12) /* 801B7634 001B4594 7D 89 03 A6 */ mtctr r12 -/* 801B7638 001B4598 4E 80 04 21 */ bctrl +/* 801B7638 001B4598 4E 80 04 21 */ bctrl /* 801B763C 001B459C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801B7640 001B45A0 41 82 00 1C */ beq lbl_801B765C /* 801B7644 001B45A4 A0 1A 00 08 */ lhz r0, 8(r26) @@ -1923,7 +1923,7 @@ lbl_801B765C: /* 801B766C 001B45CC 80 01 1C 84 */ lwz r0, 0x1c84(r1) /* 801B7670 001B45D0 7C 08 03 A6 */ mtlr r0 /* 801B7674 001B45D4 38 21 1C 80 */ addi r1, r1, 0x1c80 -/* 801B7678 001B45D8 4E 80 00 20 */ blr +/* 801B7678 001B45D8 4E 80 00 20 */ blr .global Render__10CIceImpactCFRC13CStateManager Render__10CIceImpactCFRC13CStateManager: @@ -1940,7 +1940,7 @@ Render__10CIceImpactCFRC13CStateManager: /* 801B76A4 001B4604 81 83 00 00 */ lwz r12, 0(r3) /* 801B76A8 001B4608 81 8C 00 10 */ lwz r12, 0x10(r12) /* 801B76AC 001B460C 7D 89 03 A6 */ mtctr r12 -/* 801B76B0 001B4610 4E 80 04 21 */ bctrl +/* 801B76B0 001B4610 4E 80 04 21 */ bctrl /* 801B76B4 001B4614 38 00 00 00 */ li r0, 0 /* 801B76B8 001B4618 38 60 00 00 */ li r3, 0 /* 801B76BC 001B461C 98 0D A8 B9 */ stb r0, lbl_805A9479@sda21(r13) @@ -1949,7 +1949,7 @@ Render__10CIceImpactCFRC13CStateManager: /* 801B76C8 001B4628 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801B76CC 001B462C 7C 08 03 A6 */ mtlr r0 /* 801B76D0 001B4630 38 21 00 10 */ addi r1, r1, 0x10 -/* 801B76D4 001B4634 4E 80 00 20 */ blr +/* 801B76D4 001B4634 4E 80 00 20 */ blr .global AddToRenderer__10CIceImpactCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__10CIceImpactCFRC14CFrustumPlanesRC13CStateManager: @@ -1972,12 +1972,12 @@ lbl_801B770C: /* 801B7714 001B4674 81 83 00 00 */ lwz r12, 0(r3) /* 801B7718 001B4678 81 8C 00 34 */ lwz r12, 0x34(r12) /* 801B771C 001B467C 7D 89 03 A6 */ mtctr r12 -/* 801B7720 001B4680 4E 80 04 21 */ bctrl +/* 801B7720 001B4680 4E 80 04 21 */ bctrl lbl_801B7724: /* 801B7724 001B4684 80 01 00 14 */ lwz r0, 0x14(r1) /* 801B7728 001B4688 7C 08 03 A6 */ mtlr r0 /* 801B772C 001B468C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801B7730 001B4690 4E 80 00 20 */ blr +/* 801B7730 001B4690 4E 80 00 20 */ blr .global PreRender__10CIceImpactFR13CStateManagerRC14CFrustumPlanes PreRender__10CIceImpactFR13CStateManagerRC14CFrustumPlanes: @@ -2011,7 +2011,7 @@ lbl_801B7780: /* 801B7798 001B46F8 83 A1 00 14 */ lwz r29, 0x14(r1) /* 801B779C 001B46FC 7C 08 03 A6 */ mtlr r0 /* 801B77A0 001B4700 38 21 00 20 */ addi r1, r1, 0x20 -/* 801B77A4 001B4704 4E 80 00 20 */ blr +/* 801B77A4 001B4704 4E 80 00 20 */ blr .global CalculateRenderBounds__10CIceImpactFv CalculateRenderBounds__10CIceImpactFv: @@ -2025,7 +2025,7 @@ CalculateRenderBounds__10CIceImpactFv: /* 801B77C4 001B4724 81 84 00 00 */ lwz r12, 0(r4) /* 801B77C8 001B4728 81 8C 00 5C */ lwz r12, 0x5c(r12) /* 801B77CC 001B472C 7D 89 03 A6 */ mtctr r12 -/* 801B77D0 001B4730 4E 80 04 21 */ bctrl +/* 801B77D0 001B4730 4E 80 04 21 */ bctrl /* 801B77D4 001B4734 88 01 00 44 */ lbz r0, 0x44(r1) /* 801B77D8 001B4738 28 00 00 00 */ cmplwi r0, 0 /* 801B77DC 001B473C 98 01 00 60 */ stb r0, 0x60(r1) @@ -2100,7 +2100,7 @@ lbl_801B78D8: /* 801B78E4 001B4844 80 01 00 74 */ lwz r0, 0x74(r1) /* 801B78E8 001B4848 7C 08 03 A6 */ mtlr r0 /* 801B78EC 001B484C 38 21 00 70 */ addi r1, r1, 0x70 -/* 801B78F0 001B4850 4E 80 00 20 */ blr +/* 801B78F0 001B4850 4E 80 00 20 */ blr .global __dt__10CIceImpactFv __dt__10CIceImpactFv: @@ -2182,7 +2182,7 @@ lbl_801B79E0: /* 801B79F8 001B4958 38 80 00 01 */ li r4, 1 /* 801B79FC 001B495C 81 8C 00 08 */ lwz r12, 8(r12) /* 801B7A00 001B4960 7D 89 03 A6 */ mtctr r12 -/* 801B7A04 001B4964 4E 80 04 21 */ bctrl +/* 801B7A04 001B4964 4E 80 04 21 */ bctrl lbl_801B7A08: /* 801B7A08 001B4968 28 1E 00 00 */ cmplwi r30, 0 /* 801B7A0C 001B496C 41 82 00 1C */ beq lbl_801B7A28 @@ -2204,7 +2204,7 @@ lbl_801B7A38: /* 801B7A44 001B49A4 83 C1 00 08 */ lwz r30, 8(r1) /* 801B7A48 001B49A8 7C 08 03 A6 */ mtlr r0 /* 801B7A4C 001B49AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801B7A50 001B49B0 4E 80 00 20 */ blr +/* 801B7A50 001B49B0 4E 80 00 20 */ blr .global "__ct__10CIceImpactFRC31TLockedToken<15CGenDescription>9TUniqueIdbRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC12CTransform4fUiRC9CVector3fRC6CColor" "__ct__10CIceImpactFRC31TLockedToken<15CGenDescription>9TUniqueIdbRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC12CTransform4fUiRC9CVector3fRC6CColor": @@ -2453,7 +2453,7 @@ lbl_801B7DA0: /* 801B7DFC 001B4D5C 80 01 00 D4 */ lwz r0, 0xd4(r1) /* 801B7E00 001B4D60 7C 08 03 A6 */ mtlr r0 /* 801B7E04 001B4D64 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 801B7E08 001B4D68 4E 80 00 20 */ blr +/* 801B7E08 001B4D68 4E 80 00 20 */ blr .global GetWorldPositionForCell__11CMarkerGridCFUiUiUi GetWorldPositionForCell__11CMarkerGridCFUiUiUi: @@ -2495,7 +2495,7 @@ GetWorldPositionForCell__11CMarkerGridCFUiUiUi: /* 801B7E98 001B4DF8 EC 00 08 2A */ fadds f0, f0, f1 /* 801B7E9C 001B4DFC D0 03 00 08 */ stfs f0, 8(r3) /* 801B7EA0 001B4E00 38 21 00 20 */ addi r1, r1, 0x20 -/* 801B7EA4 001B4E04 4E 80 00 20 */ blr +/* 801B7EA4 001B4E04 4E 80 00 20 */ blr .global MarkCells__11CMarkerGridFRC7CSphereUi MarkCells__11CMarkerGridFRC7CSphereUi: @@ -2575,7 +2575,7 @@ lbl_801B7FAC: /* 801B7FB0 001B4F10 80 01 00 54 */ lwz r0, 0x54(r1) /* 801B7FB4 001B4F14 7C 08 03 A6 */ mtlr r0 /* 801B7FB8 001B4F18 38 21 00 50 */ addi r1, r1, 0x50 -/* 801B7FBC 001B4F1C 4E 80 00 20 */ blr +/* 801B7FBC 001B4F1C 4E 80 00 20 */ blr .global AABoxTouchesData__11CMarkerGridCFRC6CAABoxUi AABoxTouchesData__11CMarkerGridCFRC6CAABoxUi: @@ -2759,7 +2759,7 @@ lbl_801B8228: /* 801B822C 001B518C 80 01 00 84 */ lwz r0, 0x84(r1) /* 801B8230 001B5190 7C 08 03 A6 */ mtlr r0 /* 801B8234 001B5194 38 21 00 80 */ addi r1, r1, 0x80 -/* 801B8238 001B5198 4E 80 00 20 */ blr +/* 801B8238 001B5198 4E 80 00 20 */ blr .global SetValue__11CMarkerGridFUiUiUiUi SetValue__11CMarkerGridFUiUiUiUi: @@ -2777,7 +2777,7 @@ SetValue__11CMarkerGridFUiUiUiUi: /* 801B8268 001B51C8 7C 60 00 78 */ andc r0, r3, r0 /* 801B826C 001B51CC 7C 80 03 78 */ or r0, r4, r0 /* 801B8270 001B51D0 98 05 00 28 */ stb r0, 0x28(r5) -/* 801B8274 001B51D4 4E 80 00 20 */ blr +/* 801B8274 001B51D4 4E 80 00 20 */ blr .global GetCoords__11CMarkerGridCFRC9CVector3fRUiRUiRUi GetCoords__11CMarkerGridCFRC9CVector3fRUiRUiRUi: @@ -2828,7 +2828,7 @@ lbl_801B831C: /* 801B8320 001B5280 80 01 00 34 */ lwz r0, 0x34(r1) /* 801B8324 001B5284 7C 08 03 A6 */ mtlr r0 /* 801B8328 001B5288 38 21 00 30 */ addi r1, r1, 0x30 -/* 801B832C 001B528C 4E 80 00 20 */ blr +/* 801B832C 001B528C 4E 80 00 20 */ blr .global GetValue__11CMarkerGridCFUiUiUi GetValue__11CMarkerGridCFUiUiUi: @@ -2844,7 +2844,7 @@ GetValue__11CMarkerGridCFUiUiUi: /* 801B8354 001B52B4 88 04 00 28 */ lbz r0, 0x28(r4) /* 801B8358 001B52B8 7C 60 00 38 */ and r0, r3, r0 /* 801B835C 001B52BC 7C 03 44 30 */ srw r3, r0, r8 -/* 801B8360 001B52C0 4E 80 00 20 */ blr +/* 801B8360 001B52C0 4E 80 00 20 */ blr .global __ct__11CMarkerGridFRC6CAABox __ct__11CMarkerGridFRC6CAABox: diff --git a/asm/MetroidPrime/Weapons/CIceProjectile.s b/asm/MetroidPrime/Weapons/CIceProjectile.s index 6616fb95..8218eb87 100644 --- a/asm/MetroidPrime/Weapons/CIceProjectile.s +++ b/asm/MetroidPrime/Weapons/CIceProjectile.s @@ -90,7 +90,7 @@ ExplosionFinished__Q220CIceAttackProjectile12CTrailObjectCFv: /* 801F1A80 001EE9E0 81 83 00 00 */ lwz r12, 0(r3) /* 801F1A84 001EE9E4 81 8C 00 58 */ lwz r12, 0x58(r12) /* 801F1A88 001EE9E8 7D 89 03 A6 */ mtctr r12 -/* 801F1A8C 001EE9EC 4E 80 04 21 */ bctrl +/* 801F1A8C 001EE9EC 4E 80 04 21 */ bctrl /* 801F1A90 001EE9F0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801F1A94 001EE9F4 41 82 00 0C */ beq lbl_801F1AA0 /* 801F1A98 001EE9F8 38 60 00 01 */ li r3, 1 @@ -101,7 +101,7 @@ lbl_801F1AA4: /* 801F1AA4 001EEA04 80 01 00 14 */ lwz r0, 0x14(r1) /* 801F1AA8 001EEA08 7C 08 03 A6 */ mtlr r0 /* 801F1AAC 001EEA0C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F1AB0 001EEA10 4E 80 00 20 */ blr +/* 801F1AB0 001EEA10 4E 80 00 20 */ blr .global ExplosionStarted__Q220CIceAttackProjectile12CTrailObjectCFv ExplosionStarted__Q220CIceAttackProjectile12CTrailObjectCFv: @@ -109,7 +109,7 @@ ExplosionStarted__Q220CIceAttackProjectile12CTrailObjectCFv: /* 801F1AB8 001EEA18 7C 03 00 D0 */ neg r0, r3 /* 801F1ABC 001EEA1C 7C 00 1B 78 */ or r0, r0, r3 /* 801F1AC0 001EEA20 54 03 0F FE */ srwi r3, r0, 0x1f -/* 801F1AC4 001EEA24 4E 80 00 20 */ blr +/* 801F1AC4 001EEA24 4E 80 00 20 */ blr .global AddToRenderer__Q220CIceAttackProjectile12CTrailObjectCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__Q220CIceAttackProjectile12CTrailObjectCFRC14CFrustumPlanesRC13CStateManager: @@ -127,7 +127,7 @@ AddToRenderer__Q220CIceAttackProjectile12CTrailObjectCFRC14CFrustumPlanesRC13CSt /* 801F1AF4 001EEA54 81 83 00 00 */ lwz r12, 0(r3) /* 801F1AF8 001EEA58 81 8C 00 10 */ lwz r12, 0x10(r12) /* 801F1AFC 001EEA5C 7D 89 03 A6 */ mtctr r12 -/* 801F1B00 001EEA60 4E 80 04 21 */ bctrl +/* 801F1B00 001EEA60 4E 80 04 21 */ bctrl lbl_801F1B04: /* 801F1B04 001EEA64 80 7F 00 0C */ lwz r3, 0xc(r31) /* 801F1B08 001EEA68 28 03 00 00 */ cmplwi r3, 0 @@ -135,13 +135,13 @@ lbl_801F1B04: /* 801F1B10 001EEA70 81 83 00 00 */ lwz r12, 0(r3) /* 801F1B14 001EEA74 81 8C 00 10 */ lwz r12, 0x10(r12) /* 801F1B18 001EEA78 7D 89 03 A6 */ mtctr r12 -/* 801F1B1C 001EEA7C 4E 80 04 21 */ bctrl +/* 801F1B1C 001EEA7C 4E 80 04 21 */ bctrl lbl_801F1B20: /* 801F1B20 001EEA80 80 01 00 14 */ lwz r0, 0x14(r1) /* 801F1B24 001EEA84 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801F1B28 001EEA88 7C 08 03 A6 */ mtlr r0 /* 801F1B2C 001EEA8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F1B30 001EEA90 4E 80 00 20 */ blr +/* 801F1B30 001EEA90 4E 80 00 20 */ blr .global Update__Q220CIceAttackProjectile12CTrailObjectFfR13CStateManagerPC13CPhysicsActor Update__Q220CIceAttackProjectile12CTrailObjectFfR13CStateManagerPC13CPhysicsActor: @@ -179,12 +179,12 @@ Update__Q220CIceAttackProjectile12CTrailObjectFfR13CStateManagerPC13CPhysicsActo /* 801F1BB0 001EEB10 81 9D 00 00 */ lwz r12, 0(r29) /* 801F1BB4 001EEB14 81 8C 00 70 */ lwz r12, 0x70(r12) /* 801F1BB8 001EEB18 7D 89 03 A6 */ mtctr r12 -/* 801F1BBC 001EEB1C 4E 80 04 21 */ bctrl +/* 801F1BBC 001EEB1C 4E 80 04 21 */ bctrl /* 801F1BC0 001EEB20 7F A3 EB 78 */ mr r3, r29 /* 801F1BC4 001EEB24 81 9D 00 00 */ lwz r12, 0(r29) /* 801F1BC8 001EEB28 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 801F1BCC 001EEB2C 7D 89 03 A6 */ mtctr r12 -/* 801F1BD0 001EEB30 4E 80 04 21 */ bctrl +/* 801F1BD0 001EEB30 4E 80 04 21 */ bctrl /* 801F1BD4 001EEB34 3C 80 80 5A */ lis r4, lbl_8059FD18@ha /* 801F1BD8 001EEB38 90 61 00 F0 */ stw r3, 0xf0(r1) /* 801F1BDC 001EEB3C 38 04 FD 18 */ addi r0, r4, lbl_8059FD18@l @@ -197,12 +197,12 @@ Update__Q220CIceAttackProjectile12CTrailObjectFfR13CStateManagerPC13CPhysicsActo /* 801F1BF8 001EEB58 81 9E 00 00 */ lwz r12, 0(r30) /* 801F1BFC 001EEB5C 81 8C 00 70 */ lwz r12, 0x70(r12) /* 801F1C00 001EEB60 7D 89 03 A6 */ mtctr r12 -/* 801F1C04 001EEB64 4E 80 04 21 */ bctrl +/* 801F1C04 001EEB64 4E 80 04 21 */ bctrl /* 801F1C08 001EEB68 7F C3 F3 78 */ mr r3, r30 /* 801F1C0C 001EEB6C 81 9E 00 00 */ lwz r12, 0(r30) /* 801F1C10 001EEB70 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 801F1C14 001EEB74 7D 89 03 A6 */ mtctr r12 -/* 801F1C18 001EEB78 4E 80 04 21 */ bctrl +/* 801F1C18 001EEB78 4E 80 04 21 */ bctrl /* 801F1C1C 001EEB7C 3C 80 80 5A */ lis r4, lbl_8059FD18@ha /* 801F1C20 001EEB80 90 61 01 58 */ stw r3, 0x158(r1) /* 801F1C24 001EEB84 38 04 FD 18 */ addi r0, r4, lbl_8059FD18@l @@ -220,7 +220,7 @@ Update__Q220CIceAttackProjectile12CTrailObjectFfR13CStateManagerPC13CPhysicsActo /* 801F1C54 001EEBB4 81 9E 00 00 */ lwz r12, 0(r30) /* 801F1C58 001EEBB8 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 801F1C5C 001EEBBC 7D 89 03 A6 */ mtctr r12 -/* 801F1C60 001EEBC0 4E 80 04 21 */ bctrl +/* 801F1C60 001EEBC0 4E 80 04 21 */ bctrl /* 801F1C64 001EEBC4 38 00 00 01 */ li r0, 1 /* 801F1C68 001EEBC8 98 1F 03 20 */ stb r0, 0x320(r31) lbl_801F1C6C: @@ -322,13 +322,13 @@ lbl_801F1C6C: /* 801F1DE8 001EED48 81 83 00 00 */ lwz r12, 0(r3) /* 801F1DEC 001EED4C 81 8C 00 18 */ lwz r12, 0x18(r12) /* 801F1DF0 001EED50 7D 89 03 A6 */ mtctr r12 -/* 801F1DF4 001EED54 4E 80 04 21 */ bctrl +/* 801F1DF4 001EED54 4E 80 04 21 */ bctrl /* 801F1DF8 001EED58 80 7F 00 04 */ lwz r3, 4(r31) /* 801F1DFC 001EED5C 38 81 01 90 */ addi r4, r1, 0x190 /* 801F1E00 001EED60 81 83 00 00 */ lwz r12, 0(r3) /* 801F1E04 001EED64 81 8C 00 14 */ lwz r12, 0x14(r12) /* 801F1E08 001EED68 7D 89 03 A6 */ mtctr r12 -/* 801F1E0C 001EED6C 4E 80 04 21 */ bctrl +/* 801F1E0C 001EED6C 4E 80 04 21 */ bctrl /* 801F1E10 001EED70 80 7F 00 04 */ lwz r3, 4(r31) /* 801F1E14 001EED74 38 80 00 01 */ li r4, 1 /* 801F1E18 001EED78 48 12 AA A9 */ bl ForceParticleCreation__11CElementGenFi @@ -338,7 +338,7 @@ lbl_801F1C6C: /* 801F1E28 001EED88 81 83 00 00 */ lwz r12, 0(r3) /* 801F1E2C 001EED8C 81 8C 00 14 */ lwz r12, 0x14(r12) /* 801F1E30 001EED90 7D 89 03 A6 */ mtctr r12 -/* 801F1E34 001EED94 4E 80 04 21 */ bctrl +/* 801F1E34 001EED94 4E 80 04 21 */ bctrl /* 801F1E38 001EED98 80 7F 03 1C */ lwz r3, 0x31c(r31) /* 801F1E3C 001EED9C 38 03 00 01 */ addi r0, r3, 1 /* 801F1E40 001EEDA0 90 1F 03 1C */ stw r0, 0x31c(r31) @@ -370,7 +370,7 @@ lbl_801F1E9C: /* 801F1EA0 001EEE00 FC 20 F8 90 */ fmr f1, f31 /* 801F1EA4 001EEE04 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801F1EA8 001EEE08 7D 89 03 A6 */ mtctr r12 -/* 801F1EAC 001EEE0C 4E 80 04 21 */ bctrl +/* 801F1EAC 001EEE0C 4E 80 04 21 */ bctrl lbl_801F1EB0: /* 801F1EB0 001EEE10 C0 1F 00 14 */ lfs f0, 0x14(r31) /* 801F1EB4 001EEE14 EC 00 F8 2A */ fadds f0, f0, f31 @@ -382,14 +382,14 @@ lbl_801F1EB0: /* 801F1ECC 001EEE2C FC 20 F8 90 */ fmr f1, f31 /* 801F1ED0 001EEE30 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801F1ED4 001EEE34 7D 89 03 A6 */ mtctr r12 -/* 801F1ED8 001EEE38 4E 80 04 21 */ bctrl +/* 801F1ED8 001EEE38 4E 80 04 21 */ bctrl /* 801F1EDC 001EEE3C 80 7F 00 04 */ lwz r3, 4(r31) /* 801F1EE0 001EEE40 28 03 00 00 */ cmplwi r3, 0 /* 801F1EE4 001EEE44 41 82 00 CC */ beq lbl_801F1FB0 /* 801F1EE8 001EEE48 81 83 00 00 */ lwz r12, 0(r3) /* 801F1EEC 001EEE4C 81 8C 00 58 */ lwz r12, 0x58(r12) /* 801F1EF0 001EEE50 7D 89 03 A6 */ mtctr r12 -/* 801F1EF4 001EEE54 4E 80 04 21 */ bctrl +/* 801F1EF4 001EEE54 4E 80 04 21 */ bctrl /* 801F1EF8 001EEE58 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801F1EFC 001EEE5C 41 82 00 B4 */ beq lbl_801F1FB0 /* 801F1F00 001EEE60 38 00 00 00 */ li r0, 0 @@ -401,7 +401,7 @@ lbl_801F1EB0: /* 801F1F18 001EEE78 38 80 00 01 */ li r4, 1 /* 801F1F1C 001EEE7C 81 8C 00 08 */ lwz r12, 8(r12) /* 801F1F20 001EEE80 7D 89 03 A6 */ mtctr r12 -/* 801F1F24 001EEE84 4E 80 04 21 */ bctrl +/* 801F1F24 001EEE84 4E 80 04 21 */ bctrl lbl_801F1F28: /* 801F1F28 001EEE88 38 01 00 10 */ addi r0, r1, 0x10 /* 801F1F2C 001EEE8C 38 60 00 00 */ li r3, 0 @@ -419,7 +419,7 @@ lbl_801F1F28: /* 801F1F5C 001EEEBC 38 80 00 01 */ li r4, 1 /* 801F1F60 001EEEC0 81 8C 00 08 */ lwz r12, 8(r12) /* 801F1F64 001EEEC4 7D 89 03 A6 */ mtctr r12 -/* 801F1F68 001EEEC8 4E 80 04 21 */ bctrl +/* 801F1F68 001EEEC8 4E 80 04 21 */ bctrl lbl_801F1F6C: /* 801F1F6C 001EEECC 88 61 00 10 */ lbz r3, 0x10(r1) /* 801F1F70 001EEED0 38 00 00 00 */ li r0, 0 @@ -438,7 +438,7 @@ lbl_801F1F84: /* 801F1FA0 001EEF00 38 80 00 01 */ li r4, 1 /* 801F1FA4 001EEF04 81 8C 00 08 */ lwz r12, 8(r12) /* 801F1FA8 001EEF08 7D 89 03 A6 */ mtctr r12 -/* 801F1FAC 001EEF0C 4E 80 04 21 */ bctrl +/* 801F1FAC 001EEF0C 4E 80 04 21 */ bctrl lbl_801F1FB0: /* 801F1FB0 001EEF10 E3 E1 02 08 */ psq_l f31, 520(r1), 0, qr0 /* 801F1FB4 001EEF14 CB E1 02 00 */ lfd f31, 0x200(r1) @@ -455,7 +455,7 @@ lbl_801F1FB0: /* 801F1FE0 001EEF40 83 81 01 C0 */ lwz r28, 0x1c0(r1) /* 801F1FE4 001EEF44 7C 08 03 A6 */ mtlr r0 /* 801F1FE8 001EEF48 38 21 02 10 */ addi r1, r1, 0x210 -/* 801F1FEC 001EEF4C 4E 80 00 20 */ blr +/* 801F1FEC 001EEF4C 4E 80 00 20 */ blr .global DeleteCollisionObject__Q220CIceAttackProjectile12CTrailObjectFR13CStateManager DeleteCollisionObject__Q220CIceAttackProjectile12CTrailObjectFR13CStateManager: @@ -480,7 +480,7 @@ lbl_801F2030: /* 801F2034 001EEF94 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801F2038 001EEF98 7C 08 03 A6 */ mtlr r0 /* 801F203C 001EEF9C 38 21 00 20 */ addi r1, r1, 0x20 -/* 801F2040 001EEFA0 4E 80 00 20 */ blr +/* 801F2040 001EEFA0 4E 80 00 20 */ blr .global StartExplosion__Q220CIceAttackProjectile12CTrailObjectFP11CElementGenR13CStateManager StartExplosion__Q220CIceAttackProjectile12CTrailObjectFP11CElementGenR13CStateManager: @@ -511,7 +511,7 @@ StartExplosion__Q220CIceAttackProjectile12CTrailObjectFP11CElementGenR13CStateMa /* 801F20A4 001EF004 38 80 00 01 */ li r4, 1 /* 801F20A8 001EF008 81 8C 00 08 */ lwz r12, 8(r12) /* 801F20AC 001EF00C 7D 89 03 A6 */ mtctr r12 -/* 801F20B0 001EF010 4E 80 04 21 */ bctrl +/* 801F20B0 001EF010 4E 80 04 21 */ bctrl lbl_801F20B4: /* 801F20B4 001EF014 88 61 00 08 */ lbz r3, 8(r1) /* 801F20B8 001EF018 38 00 00 00 */ li r0, 0 @@ -530,25 +530,25 @@ lbl_801F20CC: /* 801F20E8 001EF048 38 80 00 01 */ li r4, 1 /* 801F20EC 001EF04C 81 8C 00 08 */ lwz r12, 8(r12) /* 801F20F0 001EF050 7D 89 03 A6 */ mtctr r12 -/* 801F20F4 001EF054 4E 80 04 21 */ bctrl +/* 801F20F4 001EF054 4E 80 04 21 */ bctrl lbl_801F20F8: /* 801F20F8 001EF058 80 7D 00 04 */ lwz r3, 4(r29) /* 801F20FC 001EF05C 83 FD 00 0C */ lwz r31, 0xc(r29) /* 801F2100 001EF060 81 83 00 00 */ lwz r12, 0(r3) /* 801F2104 001EF064 81 8C 00 38 */ lwz r12, 0x38(r12) /* 801F2108 001EF068 7D 89 03 A6 */ mtctr r12 -/* 801F210C 001EF06C 4E 80 04 21 */ bctrl +/* 801F210C 001EF06C 4E 80 04 21 */ bctrl /* 801F2110 001EF070 81 9F 00 00 */ lwz r12, 0(r31) /* 801F2114 001EF074 7C 64 1B 78 */ mr r4, r3 /* 801F2118 001EF078 7F E3 FB 78 */ mr r3, r31 /* 801F211C 001EF07C 81 8C 00 14 */ lwz r12, 0x14(r12) /* 801F2120 001EF080 7D 89 03 A6 */ mtctr r12 -/* 801F2124 001EF084 4E 80 04 21 */ bctrl +/* 801F2124 001EF084 4E 80 04 21 */ bctrl /* 801F2128 001EF088 80 7D 00 04 */ lwz r3, 4(r29) /* 801F212C 001EF08C 81 83 00 00 */ lwz r12, 0(r3) /* 801F2130 001EF090 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 801F2134 001EF094 7D 89 03 A6 */ mtctr r12 -/* 801F2138 001EF098 4E 80 04 21 */ bctrl +/* 801F2138 001EF098 4E 80 04 21 */ bctrl /* 801F213C 001EF09C C0 23 00 04 */ lfs f1, 4(r3) /* 801F2140 001EF0A0 38 81 00 10 */ addi r4, r1, 0x10 /* 801F2144 001EF0A4 C0 62 AE E8 */ lfs f3, lbl_805ACC08@sda21(r2) @@ -565,13 +565,13 @@ lbl_801F20F8: /* 801F2170 001EF0D0 81 83 00 00 */ lwz r12, 0(r3) /* 801F2174 001EF0D4 81 8C 00 18 */ lwz r12, 0x18(r12) /* 801F2178 001EF0D8 7D 89 03 A6 */ mtctr r12 -/* 801F217C 001EF0DC 4E 80 04 21 */ bctrl +/* 801F217C 001EF0DC 4E 80 04 21 */ bctrl /* 801F2180 001EF0E0 80 7D 00 0C */ lwz r3, 0xc(r29) /* 801F2184 001EF0E4 38 80 00 01 */ li r4, 1 /* 801F2188 001EF0E8 81 83 00 00 */ lwz r12, 0(r3) /* 801F218C 001EF0EC 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 801F2190 001EF0F0 7D 89 03 A6 */ mtctr r12 -/* 801F2194 001EF0F4 4E 80 04 21 */ bctrl +/* 801F2194 001EF0F4 4E 80 04 21 */ bctrl /* 801F2198 001EF0F8 7F A3 EB 78 */ mr r3, r29 /* 801F219C 001EF0FC 7F C4 F3 78 */ mr r4, r30 /* 801F21A0 001EF100 4B FF FE 51 */ bl DeleteCollisionObject__Q220CIceAttackProjectile12CTrailObjectFR13CStateManager @@ -581,17 +581,17 @@ lbl_801F20F8: /* 801F21B0 001EF110 83 A1 00 24 */ lwz r29, 0x24(r1) /* 801F21B4 001EF114 7C 08 03 A6 */ mtlr r0 /* 801F21B8 001EF118 38 21 00 30 */ addi r1, r1, 0x30 -/* 801F21BC 001EF11C 4E 80 00 20 */ blr +/* 801F21BC 001EF11C 4E 80 00 20 */ blr .global GetTranslation__11CElementGenCFv GetTranslation__11CElementGenCFv: /* 801F21C0 001EF120 38 63 00 DC */ addi r3, r3, 0xdc -/* 801F21C4 001EF124 4E 80 00 20 */ blr +/* 801F21C4 001EF124 4E 80 00 20 */ blr .global GetOrientation__11CElementGenCFv GetOrientation__11CElementGenCFv: /* 801F21C8 001EF128 38 63 01 D8 */ addi r3, r3, 0x1d8 -/* 801F21CC 001EF12C 4E 80 00 20 */ blr +/* 801F21CC 001EF12C 4E 80 00 20 */ blr .global __ct__Q220CIceAttackProjectile12CTrailObjectFP11CElementGen9TUniqueIdRC9CVector3fRC9CVector3fRC9CVector3f __ct__Q220CIceAttackProjectile12CTrailObjectFP11CElementGen9TUniqueIdRC9CVector3fRC9CVector3fRC9CVector3f: @@ -667,7 +667,7 @@ __ct__Q220CIceAttackProjectile12CTrailObjectFP11CElementGen9TUniqueIdRC9CVector3 /* 801F22E4 001EF244 80 01 00 34 */ lwz r0, 0x34(r1) /* 801F22E8 001EF248 7C 08 03 A6 */ mtlr r0 /* 801F22EC 001EF24C 38 21 00 30 */ addi r1, r1, 0x30 -/* 801F22F0 001EF250 4E 80 00 20 */ blr +/* 801F22F0 001EF250 4E 80 00 20 */ blr .global AcceptScriptMsg__20CIceAttackProjectileF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__20CIceAttackProjectileF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -698,7 +698,7 @@ lbl_801F2348: /* 801F2350 001EF2B0 81 9C 00 00 */ lwz r12, 0(r28) /* 801F2354 001EF2B4 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 801F2358 001EF2B8 7D 89 03 A6 */ mtctr r12 -/* 801F235C 001EF2BC 4E 80 04 21 */ bctrl +/* 801F235C 001EF2BC 4E 80 04 21 */ bctrl /* 801F2360 001EF2C0 48 00 00 44 */ b lbl_801F23A4 lbl_801F2364: /* 801F2364 001EF2C4 A0 7E 00 00 */ lhz r3, 0(r30) @@ -727,7 +727,7 @@ lbl_801F23A4: /* 801F23B4 001EF314 83 81 00 10 */ lwz r28, 0x10(r1) /* 801F23B8 001EF318 7C 08 03 A6 */ mtlr r0 /* 801F23BC 001EF31C 38 21 00 20 */ addi r1, r1, 0x20 -/* 801F23C0 001EF320 4E 80 00 20 */ blr +/* 801F23C0 001EF320 4E 80 00 20 */ blr .global Think__20CIceAttackProjectileFfR13CStateManager Think__20CIceAttackProjectileFfR13CStateManager: @@ -1138,7 +1138,7 @@ lbl_801F29B8: /* 801F29E0 001EF940 81 9D 00 00 */ lwz r12, 0(r29) /* 801F29E4 001EF944 81 8C 00 14 */ lwz r12, 0x14(r12) /* 801F29E8 001EF948 7D 89 03 A6 */ mtctr r12 -/* 801F29EC 001EF94C 4E 80 04 21 */ bctrl +/* 801F29EC 001EF94C 4E 80 04 21 */ bctrl /* 801F29F0 001EF950 C3 9B 00 58 */ lfs f28, 0x58(r27) /* 801F29F4 001EF954 38 81 00 88 */ addi r4, r1, 0x88 /* 801F29F8 001EF958 C0 02 AE EC */ lfs f0, lbl_805ACC0C@sda21(r2) @@ -1187,13 +1187,13 @@ lbl_801F29B8: /* 801F2AA4 001EFA04 D1 21 00 80 */ stfs f9, 0x80(r1) /* 801F2AA8 001EFA08 D1 01 00 84 */ stfs f8, 0x84(r1) /* 801F2AAC 001EFA0C 7D 89 03 A6 */ mtctr r12 -/* 801F2AB0 001EFA10 4E 80 04 21 */ bctrl +/* 801F2AB0 001EFA10 4E 80 04 21 */ bctrl /* 801F2AB4 001EFA14 80 7B 01 04 */ lwz r3, 0x104(r27) /* 801F2AB8 001EFA18 FC 20 F8 90 */ fmr f1, f31 /* 801F2ABC 001EFA1C 81 83 00 00 */ lwz r12, 0(r3) /* 801F2AC0 001EFA20 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801F2AC4 001EFA24 7D 89 03 A6 */ mtctr r12 -/* 801F2AC8 001EFA28 4E 80 04 21 */ bctrl +/* 801F2AC8 001EFA28 4E 80 04 21 */ bctrl /* 801F2ACC 001EFA2C 88 1B 01 90 */ lbz r0, 0x190(r27) /* 801F2AD0 001EFA30 28 00 00 00 */ cmplwi r0, 0 /* 801F2AD4 001EFA34 41 82 00 B8 */ beq lbl_801F2B8C @@ -1202,12 +1202,12 @@ lbl_801F29B8: /* 801F2AE0 001EFA40 81 83 00 00 */ lwz r12, 0(r3) /* 801F2AE4 001EFA44 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 801F2AE8 001EFA48 7D 89 03 A6 */ mtctr r12 -/* 801F2AEC 001EFA4C 4E 80 04 21 */ bctrl +/* 801F2AEC 001EFA4C 4E 80 04 21 */ bctrl /* 801F2AF0 001EFA50 80 7B 01 04 */ lwz r3, 0x104(r27) /* 801F2AF4 001EFA54 81 83 00 00 */ lwz r12, 0(r3) /* 801F2AF8 001EFA58 81 8C 00 60 */ lwz r12, 0x60(r12) /* 801F2AFC 001EFA5C 7D 89 03 A6 */ mtctr r12 -/* 801F2B00 001EFA60 4E 80 04 21 */ bctrl +/* 801F2B00 001EFA60 4E 80 04 21 */ bctrl /* 801F2B04 001EFA64 7C 60 00 34 */ cntlzw r0, r3 /* 801F2B08 001EFA68 3B C0 00 00 */ li r30, 0 /* 801F2B0C 001EFA6C 54 1A D9 7E */ srwi r26, r0, 5 @@ -1283,7 +1283,7 @@ lbl_801F2BD4: /* 801F2C08 001EFB68 80 01 0B 44 */ lwz r0, 0xb44(r1) /* 801F2C0C 001EFB6C 7C 08 03 A6 */ mtlr r0 /* 801F2C10 001EFB70 38 21 0B 40 */ addi r1, r1, 0xb40 -/* 801F2C14 001EFB74 4E 80 00 20 */ blr +/* 801F2C14 001EFB74 4E 80 00 20 */ blr .global UpdateTrailObjects__20CIceAttackProjectileFfR13CStateManager UpdateTrailObjects__20CIceAttackProjectileFfR13CStateManager: @@ -1402,7 +1402,7 @@ lbl_801F2DA0: /* 801F2DB8 001EFD18 80 01 00 44 */ lwz r0, 0x44(r1) /* 801F2DBC 001EFD1C 7C 08 03 A6 */ mtlr r0 /* 801F2DC0 001EFD20 38 21 00 40 */ addi r1, r1, 0x40 -/* 801F2DC4 001EFD24 4E 80 00 20 */ blr +/* 801F2DC4 001EFD24 4E 80 00 20 */ blr .global CreateTrailObject__20CIceAttackProjectileFR13CStateManagerRC9CVector3ff CreateTrailObject__20CIceAttackProjectileFR13CStateManagerRC9CVector3ff: @@ -1633,7 +1633,7 @@ lbl_801F30FC: /* 801F3138 001F0098 38 80 00 01 */ li r4, 1 /* 801F313C 001F009C 81 8C 00 08 */ lwz r12, 8(r12) /* 801F3140 001F00A0 7D 89 03 A6 */ mtctr r12 -/* 801F3144 001F00A4 4E 80 04 21 */ bctrl +/* 801F3144 001F00A4 4E 80 04 21 */ bctrl lbl_801F3148: /* 801F3148 001F00A8 88 01 00 C0 */ lbz r0, 0xc0(r1) /* 801F314C 001F00AC 28 00 00 00 */ cmplwi r0, 0 @@ -1645,7 +1645,7 @@ lbl_801F3148: /* 801F3164 001F00C4 38 80 00 01 */ li r4, 1 /* 801F3168 001F00C8 81 8C 00 08 */ lwz r12, 8(r12) /* 801F316C 001F00CC 7D 89 03 A6 */ mtctr r12 -/* 801F3170 001F00D0 4E 80 04 21 */ bctrl +/* 801F3170 001F00D0 4E 80 04 21 */ bctrl lbl_801F3174: /* 801F3174 001F00D4 E3 E1 04 08 */ psq_l f31, 1032(r1), 0, qr0 /* 801F3178 001F00D8 CB E1 04 00 */ lfd f31, 0x400(r1) @@ -1653,7 +1653,7 @@ lbl_801F3174: /* 801F3180 001F00E0 80 01 04 14 */ lwz r0, 0x414(r1) /* 801F3184 001F00E4 7C 08 03 A6 */ mtlr r0 /* 801F3188 001F00E8 38 21 04 10 */ addi r1, r1, 0x410 -/* 801F318C 001F00EC 4E 80 00 20 */ blr +/* 801F318C 001F00EC 4E 80 00 20 */ blr .global sub_801f3190 sub_801f3190: @@ -1689,7 +1689,7 @@ lbl_801F31D0: /* 801F31FC 001F015C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801F3200 001F0160 7C 08 03 A6 */ mtlr r0 /* 801F3204 001F0164 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F3208 001F0168 4E 80 00 20 */ blr +/* 801F3208 001F0168 4E 80 00 20 */ blr .global sub_801f320c sub_801f320c: @@ -1703,7 +1703,7 @@ lbl_801F3224: /* 801F3224 001F0184 80 01 00 14 */ lwz r0, 0x14(r1) /* 801F3228 001F0188 7C 08 03 A6 */ mtlr r0 /* 801F322C 001F018C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F3230 001F0190 4E 80 00 20 */ blr +/* 801F3230 001F0190 4E 80 00 20 */ blr .global sub_801f3234 sub_801f3234: @@ -1760,7 +1760,7 @@ sub_801f3234: /* 801F32FC 001F025C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801F3300 001F0260 7C 08 03 A6 */ mtlr r0 /* 801F3304 001F0264 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F3308 001F0268 4E 80 00 20 */ blr +/* 801F3308 001F0268 4E 80 00 20 */ blr .global sub_801f330c sub_801f330c: @@ -1829,7 +1829,7 @@ sub_801f330c: /* 801F3404 001F0364 80 01 00 14 */ lwz r0, 0x14(r1) /* 801F3408 001F0368 7C 08 03 A6 */ mtlr r0 /* 801F340C 001F036C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F3410 001F0370 4E 80 00 20 */ blr +/* 801F3410 001F0370 4E 80 00 20 */ blr .global sub_801f3414 sub_801f3414: @@ -1849,7 +1849,7 @@ sub_801f3414: /* 801F3448 001F03A8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801F344C 001F03AC 7C 08 03 A6 */ mtlr r0 /* 801F3450 001F03B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F3454 001F03B4 4E 80 00 20 */ blr +/* 801F3454 001F03B4 4E 80 00 20 */ blr .global sub_801f3458 sub_801f3458: @@ -1883,7 +1883,7 @@ lbl_801F34A0: /* 801F34BC 001F041C 83 81 00 10 */ lwz r28, 0x10(r1) /* 801F34C0 001F0420 7C 08 03 A6 */ mtlr r0 /* 801F34C4 001F0424 38 21 00 20 */ addi r1, r1, 0x20 -/* 801F34C8 001F0428 4E 80 00 20 */ blr +/* 801F34C8 001F0428 4E 80 00 20 */ blr .global sub_801f34cc sub_801f34cc: @@ -1897,7 +1897,7 @@ lbl_801F34E4: /* 801F34E4 001F0444 80 01 00 14 */ lwz r0, 0x14(r1) /* 801F34E8 001F0448 7C 08 03 A6 */ mtlr r0 /* 801F34EC 001F044C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F34F0 001F0450 4E 80 00 20 */ blr +/* 801F34F0 001F0450 4E 80 00 20 */ blr .global Accept__20CIceAttackProjectileFR8IVisitor Accept__20CIceAttackProjectileFR8IVisitor: @@ -1910,11 +1910,11 @@ Accept__20CIceAttackProjectileFR8IVisitor: /* 801F350C 001F046C 7C 04 03 78 */ mr r4, r0 /* 801F3510 001F0470 81 8C 00 08 */ lwz r12, 8(r12) /* 801F3514 001F0474 7D 89 03 A6 */ mtctr r12 -/* 801F3518 001F0478 4E 80 04 21 */ bctrl +/* 801F3518 001F0478 4E 80 04 21 */ bctrl /* 801F351C 001F047C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801F3520 001F0480 7C 08 03 A6 */ mtlr r0 /* 801F3524 001F0484 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F3528 001F0488 4E 80 00 20 */ blr +/* 801F3528 001F0488 4E 80 00 20 */ blr .global Render__20CIceAttackProjectileCFRC13CStateManager Render__20CIceAttackProjectileCFRC13CStateManager: @@ -1947,7 +1947,7 @@ lbl_801F357C: /* 801F358C 001F04EC 81 83 00 00 */ lwz r12, 0(r3) /* 801F3590 001F04F0 81 8C 00 10 */ lwz r12, 0x10(r12) /* 801F3594 001F04F4 7D 89 03 A6 */ mtctr r12 -/* 801F3598 001F04F8 4E 80 04 21 */ bctrl +/* 801F3598 001F04F8 4E 80 04 21 */ bctrl /* 801F359C 001F04FC 80 A1 00 08 */ lwz r5, 8(r1) /* 801F35A0 001F0500 38 60 00 00 */ li r3, 0 /* 801F35A4 001F0504 2C 05 00 00 */ cmpwi r5, 0 @@ -1980,7 +1980,7 @@ lbl_801F35E8: /* 801F3600 001F0560 83 81 00 70 */ lwz r28, 0x70(r1) /* 801F3604 001F0564 7C 08 03 A6 */ mtlr r0 /* 801F3608 001F0568 38 21 00 80 */ addi r1, r1, 0x80 -/* 801F360C 001F056C 4E 80 00 20 */ blr +/* 801F360C 001F056C 4E 80 00 20 */ blr .global AddToRenderer__20CIceAttackProjectileCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__20CIceAttackProjectileCFRC14CFrustumPlanesRC13CStateManager: @@ -2007,7 +2007,7 @@ AddToRenderer__20CIceAttackProjectileCFRC14CFrustumPlanesRC13CStateManager: /* 801F3660 001F05C0 80 01 00 24 */ lwz r0, 0x24(r1) /* 801F3664 001F05C4 7C 08 03 A6 */ mtlr r0 /* 801F3668 001F05C8 38 21 00 20 */ addi r1, r1, 0x20 -/* 801F366C 001F05CC 4E 80 00 20 */ blr +/* 801F366C 001F05CC 4E 80 00 20 */ blr .global GetTouchBounds__20CIceAttackProjectileCFv GetTouchBounds__20CIceAttackProjectileCFv: @@ -2049,7 +2049,7 @@ lbl_801F36F0: /* 801F36F4 001F0654 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 801F36F8 001F0658 7C 08 03 A6 */ mtlr r0 /* 801F36FC 001F065C 38 21 00 30 */ addi r1, r1, 0x30 -/* 801F3700 001F0660 4E 80 00 20 */ blr +/* 801F3700 001F0660 4E 80 00 20 */ blr .global Touch__20CIceAttackProjectileFR6CActorR13CStateManager Touch__20CIceAttackProjectileFR6CActorR13CStateManager: @@ -2112,7 +2112,7 @@ lbl_801F37D4: /* 801F37E0 001F0740 83 A1 00 44 */ lwz r29, 0x44(r1) /* 801F37E4 001F0744 7C 08 03 A6 */ mtlr r0 /* 801F37E8 001F0748 38 21 00 50 */ addi r1, r1, 0x50 -/* 801F37EC 001F074C 4E 80 00 20 */ blr +/* 801F37EC 001F074C 4E 80 00 20 */ blr .global __dt__20CIceAttackProjectileFv __dt__20CIceAttackProjectileFv: @@ -2147,7 +2147,7 @@ lbl_801F382C: /* 801F385C 001F07BC 38 80 00 01 */ li r4, 1 /* 801F3860 001F07C0 81 8C 00 08 */ lwz r12, 8(r12) /* 801F3864 001F07C4 7D 89 03 A6 */ mtctr r12 -/* 801F3868 001F07C8 4E 80 04 21 */ bctrl +/* 801F3868 001F07C8 4E 80 04 21 */ bctrl lbl_801F386C: /* 801F386C 001F07CC 34 1E 00 F8 */ addic. r0, r30, 0xf8 /* 801F3870 001F07D0 41 82 00 10 */ beq lbl_801F3880 @@ -2181,7 +2181,7 @@ lbl_801F38C4: /* 801F38D0 001F0830 83 C1 00 08 */ lwz r30, 8(r1) /* 801F38D4 001F0834 7C 08 03 A6 */ mtlr r0 /* 801F38D8 001F0838 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F38DC 001F083C 4E 80 00 20 */ blr +/* 801F38DC 001F083C 4E 80 00 20 */ blr .global sub_801f38e0 sub_801f38e0: @@ -2222,7 +2222,7 @@ lbl_801F392C: /* 801F3964 001F08C4 38 80 00 01 */ li r4, 1 /* 801F3968 001F08C8 81 8C 00 08 */ lwz r12, 8(r12) /* 801F396C 001F08CC 7D 89 03 A6 */ mtctr r12 -/* 801F3970 001F08D0 4E 80 04 21 */ bctrl +/* 801F3970 001F08D0 4E 80 04 21 */ bctrl lbl_801F3974: /* 801F3974 001F08D4 28 1E 00 00 */ cmplwi r30, 0 /* 801F3978 001F08D8 41 82 00 30 */ beq lbl_801F39A8 @@ -2236,7 +2236,7 @@ lbl_801F3974: /* 801F3998 001F08F8 38 80 00 01 */ li r4, 1 /* 801F399C 001F08FC 81 8C 00 08 */ lwz r12, 8(r12) /* 801F39A0 001F0900 7D 89 03 A6 */ mtctr r12 -/* 801F39A4 001F0904 4E 80 04 21 */ bctrl +/* 801F39A4 001F0904 4E 80 04 21 */ bctrl lbl_801F39A8: /* 801F39A8 001F0908 3B DE 03 24 */ addi r30, r30, 0x324 lbl_801F39AC: @@ -2260,7 +2260,7 @@ lbl_801F39D4: /* 801F39E8 001F0948 83 81 00 20 */ lwz r28, 0x20(r1) /* 801F39EC 001F094C 7C 08 03 A6 */ mtlr r0 /* 801F39F0 001F0950 38 21 00 30 */ addi r1, r1, 0x30 -/* 801F39F4 001F0954 4E 80 00 20 */ blr +/* 801F39F4 001F0954 4E 80 00 20 */ blr .global "__ct__20CIceAttackProjectileF25TToken<15CGenDescription>25TToken<15CGenDescription>9TUniqueId9TUniqueIdbRC12CTransform4fRC11CDamageInfoRC6CAABoxff" "__ct__20CIceAttackProjectileF25TToken<15CGenDescription>25TToken<15CGenDescription>9TUniqueId9TUniqueIdbRC12CTransform4fRC11CDamageInfoRC6CAABoxff": @@ -2564,7 +2564,7 @@ lbl_801F3E48: /* 801F3E88 001F0DE8 38 80 00 01 */ li r4, 1 /* 801F3E8C 001F0DEC 81 8C 00 08 */ lwz r12, 8(r12) /* 801F3E90 001F0DF0 7D 89 03 A6 */ mtctr r12 -/* 801F3E94 001F0DF4 4E 80 04 21 */ bctrl +/* 801F3E94 001F0DF4 4E 80 04 21 */ bctrl lbl_801F3E98: /* 801F3E98 001F0DF8 88 61 00 30 */ lbz r3, 0x30(r1) /* 801F3E9C 001F0DFC 38 00 00 00 */ li r0, 0 @@ -2583,7 +2583,7 @@ lbl_801F3EB0: /* 801F3ECC 001F0E2C 38 80 00 01 */ li r4, 1 /* 801F3ED0 001F0E30 81 8C 00 08 */ lwz r12, 8(r12) /* 801F3ED4 001F0E34 7D 89 03 A6 */ mtctr r12 -/* 801F3ED8 001F0E38 4E 80 04 21 */ bctrl +/* 801F3ED8 001F0E38 4E 80 04 21 */ bctrl lbl_801F3EDC: /* 801F3EDC 001F0E3C 7E 20 07 75 */ extsb. r0, r17 /* 801F3EE0 001F0E40 41 82 00 10 */ beq lbl_801F3EF0 @@ -2600,7 +2600,7 @@ lbl_801F3EF0: /* 801F3F08 001F0E68 80 01 02 24 */ lwz r0, 0x224(r1) /* 801F3F0C 001F0E6C 7C 08 03 A6 */ mtlr r0 /* 801F3F10 001F0E70 38 21 02 20 */ addi r1, r1, 0x220 -/* 801F3F14 001F0E74 4E 80 00 20 */ blr +/* 801F3F14 001F0E74 4E 80 00 20 */ blr .global sub_801f3f18 sub_801f3f18: @@ -2661,7 +2661,7 @@ lbl_801F3FAC: /* 801F3FE4 001F0F44 38 80 00 01 */ li r4, 1 /* 801F3FE8 001F0F48 81 8C 00 08 */ lwz r12, 8(r12) /* 801F3FEC 001F0F4C 7D 89 03 A6 */ mtctr r12 -/* 801F3FF0 001F0F50 4E 80 04 21 */ bctrl +/* 801F3FF0 001F0F50 4E 80 04 21 */ bctrl lbl_801F3FF4: /* 801F3FF4 001F0F54 28 1B 00 00 */ cmplwi r27, 0 /* 801F3FF8 001F0F58 41 82 00 30 */ beq lbl_801F4028 @@ -2675,7 +2675,7 @@ lbl_801F3FF4: /* 801F4018 001F0F78 38 80 00 01 */ li r4, 1 /* 801F401C 001F0F7C 81 8C 00 08 */ lwz r12, 8(r12) /* 801F4020 001F0F80 7D 89 03 A6 */ mtctr r12 -/* 801F4024 001F0F84 4E 80 04 21 */ bctrl +/* 801F4024 001F0F84 4E 80 04 21 */ bctrl lbl_801F4028: /* 801F4028 001F0F88 3B 7B 03 24 */ addi r27, r27, 0x324 lbl_801F402C: @@ -2693,7 +2693,7 @@ lbl_801F404C: /* 801F4050 001F0FB0 80 01 00 34 */ lwz r0, 0x34(r1) /* 801F4054 001F0FB4 7C 08 03 A6 */ mtlr r0 /* 801F4058 001F0FB8 38 21 00 30 */ addi r1, r1, 0x30 -/* 801F405C 001F0FBC 4E 80 00 20 */ blr +/* 801F405C 001F0FBC 4E 80 00 20 */ blr .global sub_801f4060 sub_801f4060: diff --git a/asm/MetroidPrime/Weapons/CNewFlameThrower.s b/asm/MetroidPrime/Weapons/CNewFlameThrower.s index 8dd2582f..ef927283 100644 --- a/asm/MetroidPrime/Weapons/CNewFlameThrower.s +++ b/asm/MetroidPrime/Weapons/CNewFlameThrower.s @@ -97,7 +97,7 @@ lbl_805A83F0: .global lbl_8046DCA8 lbl_8046DCA8: .skip 0x18 - + .section .text, "ax" .global __dt__16CNewFlameThrowerFv @@ -153,7 +153,7 @@ lbl_80261108: /* 8026112C 0025E08C 38 80 00 01 */ li r4, 1 /* 80261130 0025E090 81 8C 00 08 */ lwz r12, 8(r12) /* 80261134 0025E094 7D 89 03 A6 */ mtctr r12 -/* 80261138 0025E098 4E 80 04 21 */ bctrl +/* 80261138 0025E098 4E 80 04 21 */ bctrl lbl_8026113C: /* 8026113C 0025E09C 34 1E 03 6C */ addic. r0, r30, 0x36c /* 80261140 0025E0A0 41 82 00 24 */ beq lbl_80261164 @@ -164,7 +164,7 @@ lbl_8026113C: /* 80261154 0025E0B4 38 80 00 01 */ li r4, 1 /* 80261158 0025E0B8 81 8C 00 08 */ lwz r12, 8(r12) /* 8026115C 0025E0BC 7D 89 03 A6 */ mtctr r12 -/* 80261160 0025E0C0 4E 80 04 21 */ bctrl +/* 80261160 0025E0C0 4E 80 04 21 */ bctrl lbl_80261164: /* 80261164 0025E0C4 34 1E 03 68 */ addic. r0, r30, 0x368 /* 80261168 0025E0C8 41 82 00 24 */ beq lbl_8026118C @@ -175,7 +175,7 @@ lbl_80261164: /* 8026117C 0025E0DC 38 80 00 01 */ li r4, 1 /* 80261180 0025E0E0 81 8C 00 08 */ lwz r12, 8(r12) /* 80261184 0025E0E4 7D 89 03 A6 */ mtctr r12 -/* 80261188 0025E0E8 4E 80 04 21 */ bctrl +/* 80261188 0025E0E8 4E 80 04 21 */ bctrl lbl_8026118C: /* 8026118C 0025E0EC 34 1E 03 64 */ addic. r0, r30, 0x364 /* 80261190 0025E0F0 41 82 00 24 */ beq lbl_802611B4 @@ -186,7 +186,7 @@ lbl_8026118C: /* 802611A4 0025E104 38 80 00 01 */ li r4, 1 /* 802611A8 0025E108 81 8C 00 08 */ lwz r12, 8(r12) /* 802611AC 0025E10C 7D 89 03 A6 */ mtctr r12 -/* 802611B0 0025E110 4E 80 04 21 */ bctrl +/* 802611B0 0025E110 4E 80 04 21 */ bctrl lbl_802611B4: /* 802611B4 0025E114 34 1E 03 60 */ addic. r0, r30, 0x360 /* 802611B8 0025E118 41 82 00 24 */ beq lbl_802611DC @@ -197,7 +197,7 @@ lbl_802611B4: /* 802611CC 0025E12C 38 80 00 01 */ li r4, 1 /* 802611D0 0025E130 81 8C 00 08 */ lwz r12, 8(r12) /* 802611D4 0025E134 7D 89 03 A6 */ mtctr r12 -/* 802611D8 0025E138 4E 80 04 21 */ bctrl +/* 802611D8 0025E138 4E 80 04 21 */ bctrl lbl_802611DC: /* 802611DC 0025E13C 34 1E 03 5C */ addic. r0, r30, 0x35c /* 802611E0 0025E140 41 82 00 24 */ beq lbl_80261204 @@ -208,7 +208,7 @@ lbl_802611DC: /* 802611F4 0025E154 38 80 00 01 */ li r4, 1 /* 802611F8 0025E158 81 8C 00 08 */ lwz r12, 8(r12) /* 802611FC 0025E15C 7D 89 03 A6 */ mtctr r12 -/* 80261200 0025E160 4E 80 04 21 */ bctrl +/* 80261200 0025E160 4E 80 04 21 */ bctrl lbl_80261204: /* 80261204 0025E164 34 1E 03 58 */ addic. r0, r30, 0x358 /* 80261208 0025E168 41 82 00 24 */ beq lbl_8026122C @@ -219,7 +219,7 @@ lbl_80261204: /* 8026121C 0025E17C 38 80 00 01 */ li r4, 1 /* 80261220 0025E180 81 8C 00 08 */ lwz r12, 8(r12) /* 80261224 0025E184 7D 89 03 A6 */ mtctr r12 -/* 80261228 0025E188 4E 80 04 21 */ bctrl +/* 80261228 0025E188 4E 80 04 21 */ bctrl lbl_8026122C: /* 8026122C 0025E18C 34 1E 03 4C */ addic. r0, r30, 0x34c /* 80261230 0025E190 41 82 00 18 */ beq lbl_80261248 @@ -296,7 +296,7 @@ lbl_8026131C: /* 80261328 0025E288 83 C1 00 08 */ lwz r30, 8(r1) /* 8026132C 0025E28C 7C 08 03 A6 */ mtlr r0 /* 80261330 0025E290 38 21 00 10 */ addi r1, r1, 0x10 -/* 80261334 0025E294 4E 80 00 20 */ blr +/* 80261334 0025E294 4E 80 00 20 */ blr .global sub_80261338 sub_80261338: @@ -320,7 +320,7 @@ lbl_8026136C: /* 80261378 0025E2D8 83 C1 00 08 */ lwz r30, 8(r1) /* 8026137C 0025E2DC 7C 08 03 A6 */ mtlr r0 /* 80261380 0025E2E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80261384 0025E2E4 4E 80 00 20 */ blr +/* 80261384 0025E2E4 4E 80 00 20 */ blr .global sub_80261388 sub_80261388: @@ -370,7 +370,7 @@ lbl_80261400: /* 80261420 0025E380 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80261424 0025E384 7C 08 03 A6 */ mtlr r0 /* 80261428 0025E388 38 21 00 30 */ addi r1, r1, 0x30 -/* 8026142C 0025E38C 4E 80 00 20 */ blr +/* 8026142C 0025E38C 4E 80 00 20 */ blr .global sub_80261430 sub_80261430: @@ -387,7 +387,7 @@ sub_80261430: /* 80261458 0025E3B8 81 9E 00 00 */ lwz r12, 0(r30) /* 8026145C 0025E3BC 81 8C 00 38 */ lwz r12, 0x38(r12) /* 80261460 0025E3C0 7D 89 03 A6 */ mtctr r12 -/* 80261464 0025E3C4 4E 80 04 21 */ bctrl +/* 80261464 0025E3C4 4E 80 04 21 */ bctrl /* 80261468 0025E3C8 38 9D 01 2C */ addi r4, r29, 0x12c /* 8026146C 0025E3CC 38 A0 00 00 */ li r5, 0 /* 80261470 0025E3D0 4B EA 10 4D */ bl GetVulnerability__20CDamageVulnerabilityCFRC11CWeaponMode @@ -459,7 +459,7 @@ lbl_80261558: /* 80261564 0025E4C4 83 A1 00 A4 */ lwz r29, 0xa4(r1) /* 80261568 0025E4C8 7C 08 03 A6 */ mtlr r0 /* 8026156C 0025E4CC 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 80261570 0025E4D0 4E 80 00 20 */ blr +/* 80261570 0025E4D0 4E 80 00 20 */ blr .global SetWorldLighting__16CNewFlameThrowerFR13CStateManager7TAreaIdff SetWorldLighting__16CNewFlameThrowerFR13CStateManager7TAreaIdff: @@ -540,7 +540,7 @@ lbl_80261678: /* 80261694 0025E5F4 83 A1 00 14 */ lwz r29, 0x14(r1) /* 80261698 0025E5F8 7C 08 03 A6 */ mtlr r0 /* 8026169C 0025E5FC 38 21 00 40 */ addi r1, r1, 0x40 -/* 802616A0 0025E600 4E 80 00 20 */ blr +/* 802616A0 0025E600 4E 80 00 20 */ blr .global sub_802616a4 sub_802616a4: @@ -586,7 +586,7 @@ lbl_8026171C: .global sub_80261730 sub_80261730: -/* 80261730 0025E690 4E 80 00 20 */ blr +/* 80261730 0025E690 4E 80 00 20 */ blr .global sub_80261734 sub_80261734: @@ -700,7 +700,7 @@ lbl_802618B8: /* 802618C8 0025E828 83 81 00 60 */ lwz r28, 0x60(r1) /* 802618CC 0025E82C 7C 08 03 A6 */ mtlr r0 /* 802618D0 0025E830 38 21 00 70 */ addi r1, r1, 0x70 -/* 802618D4 0025E834 4E 80 00 20 */ blr +/* 802618D4 0025E834 4E 80 00 20 */ blr .global sub_802618d8 sub_802618d8: @@ -767,7 +767,7 @@ lbl_80261974: /* 802619B0 0025E910 80 01 00 34 */ lwz r0, 0x34(r1) /* 802619B4 0025E914 7C 08 03 A6 */ mtlr r0 /* 802619B8 0025E918 38 21 00 30 */ addi r1, r1, 0x30 -/* 802619BC 0025E91C 4E 80 00 20 */ blr +/* 802619BC 0025E91C 4E 80 00 20 */ blr .global sub_802619c0 sub_802619c0: @@ -797,7 +797,7 @@ lbl_802619E8: /* 80261A18 0025E978 7F C4 F3 78 */ mr r4, r30 /* 80261A1C 0025E97C 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80261A20 0025E980 7D 89 03 A6 */ mtctr r12 -/* 80261A24 0025E984 4E 80 04 21 */ bctrl +/* 80261A24 0025E984 4E 80 04 21 */ bctrl lbl_80261A28: /* 80261A28 0025E988 3B FF 00 02 */ addi r31, r31, 2 /* 80261A2C 0025E98C 3B BD 00 01 */ addi r29, r29, 1 @@ -809,7 +809,7 @@ lbl_80261A30: /* 80261A40 0025E9A0 80 01 00 34 */ lwz r0, 0x34(r1) /* 80261A44 0025E9A4 7C 08 03 A6 */ mtlr r0 /* 80261A48 0025E9A8 38 21 00 30 */ addi r1, r1, 0x30 -/* 80261A4C 0025E9AC 4E 80 00 20 */ blr +/* 80261A4C 0025E9AC 4E 80 00 20 */ blr .global DeleteLightObjects__16CNewFlameThrowerFR13CStateManager DeleteLightObjects__16CNewFlameThrowerFR13CStateManager: @@ -868,7 +868,7 @@ lbl_80261AF0: /* 80261B08 0025EA68 83 81 00 10 */ lwz r28, 0x10(r1) /* 80261B0C 0025EA6C 7C 08 03 A6 */ mtlr r0 /* 80261B10 0025EA70 38 21 00 20 */ addi r1, r1, 0x20 -/* 80261B14 0025EA74 4E 80 00 20 */ blr +/* 80261B14 0025EA74 4E 80 00 20 */ blr .global sub_80261b18 sub_80261b18: @@ -938,7 +938,7 @@ lbl_80261BFC: /* 80261C04 0025EB64 81 98 00 00 */ lwz r12, 0(r24) /* 80261C08 0025EB68 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80261C0C 0025EB6C 7D 89 03 A6 */ mtctr r12 -/* 80261C10 0025EB70 4E 80 04 21 */ bctrl +/* 80261C10 0025EB70 4E 80 04 21 */ bctrl /* 80261C14 0025EB74 56 E0 06 3F */ clrlwi. r0, r23, 0x18 /* 80261C18 0025EB78 41 82 00 FC */ beq lbl_80261D14 /* 80261C1C 0025EB7C 80 95 03 58 */ lwz r4, 0x358(r21) @@ -946,7 +946,7 @@ lbl_80261BFC: /* 80261C24 0025EB84 81 84 00 00 */ lwz r12, 0(r4) /* 80261C28 0025EB88 81 8C 00 68 */ lwz r12, 0x68(r12) /* 80261C2C 0025EB8C 7D 89 03 A6 */ mtctr r12 -/* 80261C30 0025EB90 4E 80 04 21 */ bctrl +/* 80261C30 0025EB90 4E 80 04 21 */ bctrl /* 80261C34 0025EB94 38 61 00 7C */ addi r3, r1, 0x7c /* 80261C38 0025EB98 38 81 00 2C */ addi r4, r1, 0x2c /* 80261C3C 0025EB9C 4B DD 99 35 */ bl __ct__6CLightFCR6CLight @@ -969,7 +969,7 @@ lbl_80261BFC: /* 80261C80 0025EBE0 81 97 00 00 */ lwz r12, 0(r23) /* 80261C84 0025EBE4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80261C88 0025EBE8 7D 89 03 A6 */ mtctr r12 -/* 80261C8C 0025EBEC 4E 80 04 21 */ bctrl +/* 80261C8C 0025EBEC 4E 80 04 21 */ bctrl /* 80261C90 0025EBF0 38 61 00 7C */ addi r3, r1, 0x7c /* 80261C94 0025EBF4 38 81 00 14 */ addi r4, r1, 0x14 /* 80261C98 0025EBF8 48 0A 46 C5 */ bl SetColor__6CLightFRC6CColor @@ -992,7 +992,7 @@ lbl_80261C9C: /* 80261CD8 0025EC38 81 94 00 00 */ lwz r12, 0(r20) /* 80261CDC 0025EC3C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80261CE0 0025EC40 7D 89 03 A6 */ mtctr r12 -/* 80261CE4 0025EC44 4E 80 04 21 */ bctrl +/* 80261CE4 0025EC44 4E 80 04 21 */ bctrl /* 80261CE8 0025EC48 C0 42 BA 6C */ lfs f2, lbl_805AD78C@sda21(r2) /* 80261CEC 0025EC4C 38 61 00 7C */ addi r3, r1, 0x7c /* 80261CF0 0025EC50 C0 21 00 10 */ lfs f1, 0x10(r1) @@ -1020,7 +1020,7 @@ lbl_80261D20: /* 80261D3C 0025EC9C 80 01 01 04 */ lwz r0, 0x104(r1) /* 80261D40 0025ECA0 7C 08 03 A6 */ mtlr r0 /* 80261D44 0025ECA4 38 21 01 00 */ addi r1, r1, 0x100 -/* 80261D48 0025ECA8 4E 80 00 20 */ blr +/* 80261D48 0025ECA8 4E 80 00 20 */ blr .global CreateLightObjects__16CNewFlameThrowerFR13CStateManager CreateLightObjects__16CNewFlameThrowerFR13CStateManager: @@ -1074,7 +1074,7 @@ lbl_80261D70: /* 80261E04 0025ED64 81 9A 00 00 */ lwz r12, 0(r26) /* 80261E08 0025ED68 81 8C 00 68 */ lwz r12, 0x68(r12) /* 80261E0C 0025ED6C 7D 89 03 A6 */ mtctr r12 -/* 80261E10 0025ED70 4E 80 04 21 */ bctrl +/* 80261E10 0025ED70 4E 80 04 21 */ bctrl /* 80261E14 0025ED74 93 21 00 08 */ stw r25, 8(r1) /* 80261E18 0025ED78 38 00 00 00 */ li r0, 0 /* 80261E1C 0025ED7C 3C 60 80 5A */ lis r3, skIdentity4f@ha @@ -1118,7 +1118,7 @@ lbl_80261E94: /* 80261EA4 0025EE04 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 80261EA8 0025EE08 7C 08 03 A6 */ mtlr r0 /* 80261EAC 0025EE0C 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 80261EB0 0025EE10 4E 80 00 20 */ blr +/* 80261EB0 0025EE10 4E 80 00 20 */ blr .global AreParticlesDoneEmitting__16CNewFlameThrowerCFv AreParticlesDoneEmitting__16CNewFlameThrowerCFv: @@ -1134,7 +1134,7 @@ AreParticlesDoneEmitting__16CNewFlameThrowerCFv: /* 80261ED8 0025EE38 81 83 00 00 */ lwz r12, 0(r3) /* 80261EDC 0025EE3C 81 8C 00 60 */ lwz r12, 0x60(r12) /* 80261EE0 0025EE40 7D 89 03 A6 */ mtctr r12 -/* 80261EE4 0025EE44 4E 80 04 21 */ bctrl +/* 80261EE4 0025EE44 4E 80 04 21 */ bctrl /* 80261EE8 0025EE48 7C 60 00 34 */ cntlzw r0, r3 /* 80261EEC 0025EE4C 54 04 D9 7E */ srwi r4, r0, 5 lbl_80261EF0: @@ -1146,7 +1146,7 @@ lbl_80261EF0: /* 80261F04 0025EE64 81 83 00 00 */ lwz r12, 0(r3) /* 80261F08 0025EE68 81 8C 00 60 */ lwz r12, 0x60(r12) /* 80261F0C 0025EE6C 7D 89 03 A6 */ mtctr r12 -/* 80261F10 0025EE70 4E 80 04 21 */ bctrl +/* 80261F10 0025EE70 4E 80 04 21 */ bctrl /* 80261F14 0025EE74 7C 60 00 34 */ cntlzw r0, r3 /* 80261F18 0025EE78 54 04 D9 7E */ srwi r4, r0, 5 lbl_80261F1C: @@ -1158,7 +1158,7 @@ lbl_80261F1C: /* 80261F30 0025EE90 81 83 00 00 */ lwz r12, 0(r3) /* 80261F34 0025EE94 81 8C 00 60 */ lwz r12, 0x60(r12) /* 80261F38 0025EE98 7D 89 03 A6 */ mtctr r12 -/* 80261F3C 0025EE9C 4E 80 04 21 */ bctrl +/* 80261F3C 0025EE9C 4E 80 04 21 */ bctrl /* 80261F40 0025EEA0 7C 60 00 34 */ cntlzw r0, r3 /* 80261F44 0025EEA4 54 04 D9 7E */ srwi r4, r0, 5 lbl_80261F48: @@ -1170,7 +1170,7 @@ lbl_80261F48: /* 80261F5C 0025EEBC 81 83 00 00 */ lwz r12, 0(r3) /* 80261F60 0025EEC0 81 8C 00 60 */ lwz r12, 0x60(r12) /* 80261F64 0025EEC4 7D 89 03 A6 */ mtctr r12 -/* 80261F68 0025EEC8 4E 80 04 21 */ bctrl +/* 80261F68 0025EEC8 4E 80 04 21 */ bctrl /* 80261F6C 0025EECC 7C 60 00 34 */ cntlzw r0, r3 /* 80261F70 0025EED0 54 04 D9 7E */ srwi r4, r0, 5 lbl_80261F74: @@ -1182,7 +1182,7 @@ lbl_80261F74: /* 80261F88 0025EEE8 81 83 00 00 */ lwz r12, 0(r3) /* 80261F8C 0025EEEC 81 8C 00 60 */ lwz r12, 0x60(r12) /* 80261F90 0025EEF0 7D 89 03 A6 */ mtctr r12 -/* 80261F94 0025EEF4 4E 80 04 21 */ bctrl +/* 80261F94 0025EEF4 4E 80 04 21 */ bctrl /* 80261F98 0025EEF8 7C 60 00 34 */ cntlzw r0, r3 /* 80261F9C 0025EEFC 54 04 D9 7E */ srwi r4, r0, 5 lbl_80261FA0: @@ -1191,7 +1191,7 @@ lbl_80261FA0: /* 80261FA8 0025EF08 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80261FAC 0025EF0C 7C 08 03 A6 */ mtlr r0 /* 80261FB0 0025EF10 38 21 00 10 */ addi r1, r1, 0x10 -/* 80261FB4 0025EF14 4E 80 00 20 */ blr +/* 80261FB4 0025EF14 4E 80 00 20 */ blr .global sub_80261fb8 sub_80261fb8: @@ -1233,7 +1233,7 @@ lbl_80261FF4: /* 80262040 0025EFA0 81 94 00 00 */ lwz r12, 0(r20) /* 80262044 0025EFA4 81 8C 00 70 */ lwz r12, 0x70(r12) /* 80262048 0025EFA8 7D 89 03 A6 */ mtctr r12 -/* 8026204C 0025EFAC 4E 80 04 21 */ bctrl +/* 8026204C 0025EFAC 4E 80 04 21 */ bctrl /* 80262050 0025EFB0 7E 83 A3 78 */ mr r3, r20 /* 80262054 0025EFB4 4B DF 18 69 */ bl GetMaterialFilter__6CActorCFv /* 80262058 0025EFB8 7C 75 1B 78 */ mr r21, r3 @@ -1241,7 +1241,7 @@ lbl_80261FF4: /* 80262060 0025EFC0 81 94 00 00 */ lwz r12, 0(r20) /* 80262064 0025EFC4 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 80262068 0025EFC8 7D 89 03 A6 */ mtctr r12 -/* 8026206C 0025EFCC 4E 80 04 21 */ bctrl +/* 8026206C 0025EFCC 4E 80 04 21 */ bctrl /* 80262070 0025EFD0 90 61 01 28 */ stw r3, 0x128(r1) /* 80262074 0025EFD4 7F E3 FB 78 */ mr r3, r31 /* 80262078 0025EFD8 38 81 00 F8 */ addi r4, r1, 0xf8 @@ -1271,7 +1271,7 @@ lbl_802620CC: /* 802620D4 0025F034 81 95 00 00 */ lwz r12, 0(r21) /* 802620D8 0025F038 81 8C 00 40 */ lwz r12, 0x40(r12) /* 802620DC 0025F03C 7D 89 03 A6 */ mtctr r12 -/* 802620E0 0025F040 4E 80 04 21 */ bctrl +/* 802620E0 0025F040 4E 80 04 21 */ bctrl /* 802620E4 0025F044 88 01 00 40 */ lbz r0, 0x40(r1) /* 802620E8 0025F048 28 00 00 00 */ cmplwi r0, 0 /* 802620EC 0025F04C 98 01 00 5C */ stb r0, 0x5c(r1) @@ -1379,7 +1379,7 @@ lbl_8026226C: /* 80262270 0025F1D0 80 01 01 D4 */ lwz r0, 0x1d4(r1) /* 80262274 0025F1D4 7C 08 03 A6 */ mtlr r0 /* 80262278 0025F1D8 38 21 01 D0 */ addi r1, r1, 0x1d0 -/* 8026227C 0025F1DC 4E 80 00 20 */ blr +/* 8026227C 0025F1DC 4E 80 00 20 */ blr .global sub_80262280 sub_80262280: @@ -1794,37 +1794,37 @@ lbl_802627FC: /* 80262884 0025F7E4 81 83 00 00 */ lwz r12, 0(r3) /* 80262888 0025F7E8 81 8C 00 14 */ lwz r12, 0x14(r12) /* 8026288C 0025F7EC 7D 89 03 A6 */ mtctr r12 -/* 80262890 0025F7F0 4E 80 04 21 */ bctrl +/* 80262890 0025F7F0 4E 80 04 21 */ bctrl /* 80262894 0025F7F4 80 7D 03 64 */ lwz r3, 0x364(r29) /* 80262898 0025F7F8 38 81 02 74 */ addi r4, r1, 0x274 /* 8026289C 0025F7FC 81 83 00 00 */ lwz r12, 0(r3) /* 802628A0 0025F800 81 8C 00 14 */ lwz r12, 0x14(r12) /* 802628A4 0025F804 7D 89 03 A6 */ mtctr r12 -/* 802628A8 0025F808 4E 80 04 21 */ bctrl +/* 802628A8 0025F808 4E 80 04 21 */ bctrl /* 802628AC 0025F80C 80 7D 03 68 */ lwz r3, 0x368(r29) /* 802628B0 0025F810 38 81 02 74 */ addi r4, r1, 0x274 /* 802628B4 0025F814 81 83 00 00 */ lwz r12, 0(r3) /* 802628B8 0025F818 81 8C 00 14 */ lwz r12, 0x14(r12) /* 802628BC 0025F81C 7D 89 03 A6 */ mtctr r12 -/* 802628C0 0025F820 4E 80 04 21 */ bctrl +/* 802628C0 0025F820 4E 80 04 21 */ bctrl /* 802628C4 0025F824 80 7D 03 60 */ lwz r3, 0x360(r29) /* 802628C8 0025F828 7F 04 C3 78 */ mr r4, r24 /* 802628CC 0025F82C 81 83 00 00 */ lwz r12, 0(r3) /* 802628D0 0025F830 81 8C 00 18 */ lwz r12, 0x18(r12) /* 802628D4 0025F834 7D 89 03 A6 */ mtctr r12 -/* 802628D8 0025F838 4E 80 04 21 */ bctrl +/* 802628D8 0025F838 4E 80 04 21 */ bctrl /* 802628DC 0025F83C 80 7D 03 64 */ lwz r3, 0x364(r29) /* 802628E0 0025F840 7F 04 C3 78 */ mr r4, r24 /* 802628E4 0025F844 81 83 00 00 */ lwz r12, 0(r3) /* 802628E8 0025F848 81 8C 00 18 */ lwz r12, 0x18(r12) /* 802628EC 0025F84C 7D 89 03 A6 */ mtctr r12 -/* 802628F0 0025F850 4E 80 04 21 */ bctrl +/* 802628F0 0025F850 4E 80 04 21 */ bctrl /* 802628F4 0025F854 80 7D 03 68 */ lwz r3, 0x368(r29) /* 802628F8 0025F858 7F 04 C3 78 */ mr r4, r24 /* 802628FC 0025F85C 81 83 00 00 */ lwz r12, 0(r3) /* 80262900 0025F860 81 8C 00 18 */ lwz r12, 0x18(r12) /* 80262904 0025F864 7D 89 03 A6 */ mtctr r12 -/* 80262908 0025F868 4E 80 04 21 */ bctrl +/* 80262908 0025F868 4E 80 04 21 */ bctrl /* 8026290C 0025F86C 80 7D 03 60 */ lwz r3, 0x360(r29) /* 80262910 0025F870 38 80 00 01 */ li r4, 1 /* 80262914 0025F874 48 0B 9F AD */ bl ForceParticleCreation__11CElementGenFi @@ -1903,7 +1903,7 @@ lbl_802629E8: /* 80262A24 0025F984 81 83 00 00 */ lwz r12, 0(r3) /* 80262A28 0025F988 81 8C 00 18 */ lwz r12, 0x18(r12) /* 80262A2C 0025F98C 7D 89 03 A6 */ mtctr r12 -/* 80262A30 0025F990 4E 80 04 21 */ bctrl +/* 80262A30 0025F990 4E 80 04 21 */ bctrl /* 80262A34 0025F994 80 7D 03 64 */ lwz r3, 0x364(r29) /* 80262A38 0025F998 38 80 00 02 */ li r4, 2 /* 80262A3C 0025F99C 48 0B 9E 85 */ bl ForceParticleCreation__11CElementGenFi @@ -2579,7 +2579,7 @@ lbl_80263318: /* 80263394 002602F4 80 01 4A F4 */ lwz r0, 0x4af4(r1) /* 80263398 002602F8 7C 08 03 A6 */ mtlr r0 /* 8026339C 002602FC 38 21 4A F0 */ addi r1, r1, 0x4af0 -/* 802633A0 00260300 4E 80 00 20 */ blr +/* 802633A0 00260300 4E 80 00 20 */ blr .global AcceptScriptMsg__16CNewFlameThrowerF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__16CNewFlameThrowerF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -2610,7 +2610,7 @@ lbl_802633E8: /* 80263400 00260360 81 83 00 00 */ lwz r12, 0(r3) /* 80263404 00260364 81 8C 00 14 */ lwz r12, 0x14(r12) /* 80263408 00260368 7D 89 03 A6 */ mtctr r12 -/* 8026340C 0026036C 4E 80 04 21 */ bctrl +/* 8026340C 0026036C 4E 80 04 21 */ bctrl /* 80263410 00260370 A0 1C 00 EC */ lhz r0, 0xec(r28) /* 80263414 00260374 7F E3 FB 78 */ mr r3, r31 /* 80263418 00260378 80 BC 00 F0 */ lwz r5, 0xf0(r28) @@ -2655,7 +2655,7 @@ lbl_80263480: /* 802634AC 0026040C 83 81 00 30 */ lwz r28, 0x30(r1) /* 802634B0 00260410 7C 08 03 A6 */ mtlr r0 /* 802634B4 00260414 38 21 00 40 */ addi r1, r1, 0x40 -/* 802634B8 00260418 4E 80 00 20 */ blr +/* 802634B8 00260418 4E 80 00 20 */ blr .global EnableFx__16CNewFlameThrowerFRC13CStateManager EnableFx__16CNewFlameThrowerFRC13CStateManager: @@ -2695,7 +2695,7 @@ lbl_8026352C: /* 8026353C 0026049C 38 80 00 01 */ li r4, 1 /* 80263540 002604A0 81 8C 00 08 */ lwz r12, 8(r12) /* 80263544 002604A4 7D 89 03 A6 */ mtctr r12 -/* 80263548 002604A8 4E 80 04 21 */ bctrl +/* 80263548 002604A8 4E 80 04 21 */ bctrl lbl_8026354C: /* 8026354C 002604AC 7F 80 07 75 */ extsb. r0, r28 /* 80263550 002604B0 93 BF 03 58 */ stw r29, 0x358(r31) @@ -2730,7 +2730,7 @@ lbl_802635AC: /* 802635BC 0026051C 38 80 00 01 */ li r4, 1 /* 802635C0 00260520 81 8C 00 08 */ lwz r12, 8(r12) /* 802635C4 00260524 7D 89 03 A6 */ mtctr r12 -/* 802635C8 00260528 4E 80 04 21 */ bctrl +/* 802635C8 00260528 4E 80 04 21 */ bctrl lbl_802635CC: /* 802635CC 0026052C 7F 80 07 75 */ extsb. r0, r28 /* 802635D0 00260530 93 BF 03 5C */ stw r29, 0x35c(r31) @@ -2765,7 +2765,7 @@ lbl_8026362C: /* 8026363C 0026059C 38 80 00 01 */ li r4, 1 /* 80263640 002605A0 81 8C 00 08 */ lwz r12, 8(r12) /* 80263644 002605A4 7D 89 03 A6 */ mtctr r12 -/* 80263648 002605A8 4E 80 04 21 */ bctrl +/* 80263648 002605A8 4E 80 04 21 */ bctrl lbl_8026364C: /* 8026364C 002605AC 7F 80 07 75 */ extsb. r0, r28 /* 80263650 002605B0 93 BF 03 60 */ stw r29, 0x360(r31) @@ -2800,7 +2800,7 @@ lbl_802636AC: /* 802636BC 0026061C 38 80 00 01 */ li r4, 1 /* 802636C0 00260620 81 8C 00 08 */ lwz r12, 8(r12) /* 802636C4 00260624 7D 89 03 A6 */ mtctr r12 -/* 802636C8 00260628 4E 80 04 21 */ bctrl +/* 802636C8 00260628 4E 80 04 21 */ bctrl lbl_802636CC: /* 802636CC 0026062C 7F 80 07 75 */ extsb. r0, r28 /* 802636D0 00260630 93 BF 03 64 */ stw r29, 0x364(r31) @@ -2835,7 +2835,7 @@ lbl_8026372C: /* 8026373C 0026069C 38 80 00 01 */ li r4, 1 /* 80263740 002606A0 81 8C 00 08 */ lwz r12, 8(r12) /* 80263744 002606A4 7D 89 03 A6 */ mtctr r12 -/* 80263748 002606A8 4E 80 04 21 */ bctrl +/* 80263748 002606A8 4E 80 04 21 */ bctrl lbl_8026374C: /* 8026374C 002606AC 7F 80 07 75 */ extsb. r0, r28 /* 80263750 002606B0 93 BF 03 68 */ stw r29, 0x368(r31) @@ -2869,7 +2869,7 @@ lbl_802637A8: /* 802637B8 00260718 38 80 00 01 */ li r4, 1 /* 802637BC 0026071C 81 8C 00 08 */ lwz r12, 8(r12) /* 802637C0 00260720 7D 89 03 A6 */ mtctr r12 -/* 802637C4 00260724 4E 80 04 21 */ bctrl +/* 802637C4 00260724 4E 80 04 21 */ bctrl lbl_802637C8: /* 802637C8 00260728 7F 80 07 75 */ extsb. r0, r28 /* 802637CC 0026072C 93 BF 03 6C */ stw r29, 0x36c(r31) @@ -2908,7 +2908,7 @@ lbl_80263838: /* 80263848 002607A8 38 80 00 01 */ li r4, 1 /* 8026384C 002607AC 81 8C 00 08 */ lwz r12, 8(r12) /* 80263850 002607B0 7D 89 03 A6 */ mtctr r12 -/* 80263854 002607B4 4E 80 04 21 */ bctrl +/* 80263854 002607B4 4E 80 04 21 */ bctrl lbl_80263858: /* 80263858 002607B8 7F 80 07 75 */ extsb. r0, r28 /* 8026385C 002607BC 93 BF 03 70 */ stw r29, 0x370(r31) @@ -2928,7 +2928,7 @@ lbl_80263870: /* 80263890 002607F0 81 83 00 00 */ lwz r12, 0(r3) /* 80263894 002607F4 81 8C 00 64 */ lwz r12, 0x64(r12) /* 80263898 002607F8 7D 89 03 A6 */ mtctr r12 -/* 8026389C 002607FC 4E 80 04 21 */ bctrl +/* 8026389C 002607FC 4E 80 04 21 */ bctrl /* 802638A0 00260800 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802638A4 00260804 41 82 00 1C */ beq lbl_802638C0 /* 802638A8 00260808 80 1F 03 B8 */ lwz r0, 0x3b8(r31) @@ -2945,7 +2945,7 @@ lbl_802638C0: /* 802638D0 00260830 83 81 00 40 */ lwz r28, 0x40(r1) /* 802638D4 00260834 7C 08 03 A6 */ mtlr r0 /* 802638D8 00260838 38 21 00 50 */ addi r1, r1, 0x50 -/* 802638DC 0026083C 4E 80 00 20 */ blr +/* 802638DC 0026083C 4E 80 00 20 */ blr .global Reset__16CFlameNewThrowerFR13CStateManagerb Reset__16CFlameNewThrowerFR13CStateManagerb: @@ -2963,7 +2963,7 @@ Reset__16CFlameNewThrowerFR13CStateManagerb: /* 8026390C 0026086C 81 9F 00 00 */ lwz r12, 0(r31) /* 80263910 00260870 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80263914 00260874 7D 89 03 A6 */ mtctr r12 -/* 80263918 00260878 4E 80 04 21 */ bctrl +/* 80263918 00260878 4E 80 04 21 */ bctrl /* 8026391C 0026087C 38 00 00 00 */ li r0, 0 /* 80263920 00260880 C0 02 BA 6C */ lfs f0, lbl_805AD78C@sda21(r2) /* 80263924 00260884 90 1F 03 74 */ stw r0, 0x374(r31) @@ -2983,30 +2983,30 @@ lbl_8026393C: /* 80263954 002608B4 81 83 00 00 */ lwz r12, 0(r3) /* 80263958 002608B8 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8026395C 002608BC 7D 89 03 A6 */ mtctr r12 -/* 80263960 002608C0 4E 80 04 21 */ bctrl +/* 80263960 002608C0 4E 80 04 21 */ bctrl /* 80263964 002608C4 80 7F 03 5C */ lwz r3, 0x35c(r31) /* 80263968 002608C8 38 80 00 00 */ li r4, 0 /* 8026396C 002608CC 81 83 00 00 */ lwz r12, 0(r3) /* 80263970 002608D0 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80263974 002608D4 7D 89 03 A6 */ mtctr r12 -/* 80263978 002608D8 4E 80 04 21 */ bctrl +/* 80263978 002608D8 4E 80 04 21 */ bctrl /* 8026397C 002608DC 80 7F 03 6C */ lwz r3, 0x36c(r31) /* 80263980 002608E0 38 80 00 00 */ li r4, 0 /* 80263984 002608E4 81 83 00 00 */ lwz r12, 0(r3) /* 80263988 002608E8 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8026398C 002608EC 7D 89 03 A6 */ mtctr r12 -/* 80263990 002608F0 4E 80 04 21 */ bctrl +/* 80263990 002608F0 4E 80 04 21 */ bctrl /* 80263994 002608F4 80 7F 03 70 */ lwz r3, 0x370(r31) /* 80263998 002608F8 38 80 00 00 */ li r4, 0 /* 8026399C 002608FC 81 83 00 00 */ lwz r12, 0(r3) /* 802639A0 00260900 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 802639A4 00260904 7D 89 03 A6 */ mtctr r12 -/* 802639A8 00260908 4E 80 04 21 */ bctrl +/* 802639A8 00260908 4E 80 04 21 */ bctrl /* 802639AC 0026090C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802639B0 00260910 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802639B4 00260914 7C 08 03 A6 */ mtlr r0 /* 802639B8 00260918 38 21 00 10 */ addi r1, r1, 0x10 -/* 802639BC 0026091C 4E 80 00 20 */ blr +/* 802639BC 0026091C 4E 80 00 20 */ blr .global StartFiring__16CNewFlameThrowerFRC12CTransform4fRC13CStateManager StartFiring__16CNewFlameThrowerFRC12CTransform4fRC13CStateManager: @@ -3021,7 +3021,7 @@ StartFiring__16CNewFlameThrowerFRC12CTransform4fRC13CStateManager: /* 802639E0 00260940 81 83 00 00 */ lwz r12, 0(r3) /* 802639E4 00260944 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 802639E8 00260948 7D 89 03 A6 */ mtctr r12 -/* 802639EC 0026094C 4E 80 04 21 */ bctrl +/* 802639EC 0026094C 4E 80 04 21 */ bctrl /* 802639F0 00260950 88 1E 03 7C */ lbz r0, 0x37c(r30) /* 802639F4 00260954 38 A0 00 01 */ li r5, 1 /* 802639F8 00260958 50 A0 36 72 */ rlwimi r0, r5, 6, 0x19, 0x19 @@ -3038,7 +3038,7 @@ StartFiring__16CNewFlameThrowerFRC12CTransform4fRC13CStateManager: /* 80263A24 00260984 83 C1 00 08 */ lwz r30, 8(r1) /* 80263A28 00260988 7C 08 03 A6 */ mtlr r0 /* 80263A2C 0026098C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80263A30 00260990 4E 80 00 20 */ blr +/* 80263A30 00260990 4E 80 00 20 */ blr .global Render__16CNewFlameThrowerCFRC13CStateManager Render__16CNewFlameThrowerCFRC13CStateManager: @@ -3054,12 +3054,12 @@ Render__16CNewFlameThrowerCFRC13CStateManager: /* 80263A58 002609B8 81 83 00 00 */ lwz r12, 0(r3) /* 80263A5C 002609BC 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80263A60 002609C0 7D 89 03 A6 */ mtctr r12 -/* 80263A64 002609C4 4E 80 04 21 */ bctrl +/* 80263A64 002609C4 4E 80 04 21 */ bctrl /* 80263A68 002609C8 80 7F 03 70 */ lwz r3, 0x370(r31) /* 80263A6C 002609CC 81 83 00 00 */ lwz r12, 0(r3) /* 80263A70 002609D0 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80263A74 002609D4 7D 89 03 A6 */ mtctr r12 -/* 80263A78 002609D8 4E 80 04 21 */ bctrl +/* 80263A78 002609D8 4E 80 04 21 */ bctrl /* 80263A7C 002609DC 81 1F 03 58 */ lwz r8, 0x358(r31) /* 80263A80 002609E0 38 61 00 08 */ addi r3, r1, 8 /* 80263A84 002609E4 80 FF 03 5C */ lwz r7, 0x35c(r31) @@ -3078,7 +3078,7 @@ lbl_80263AB0: /* 80263AB4 00260A14 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 80263AB8 00260A18 7C 08 03 A6 */ mtlr r0 /* 80263ABC 00260A1C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80263AC0 00260A20 4E 80 00 20 */ blr +/* 80263AC0 00260A20 4E 80 00 20 */ blr .global AddToRenderer__16CNewFlameThrowerCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__16CNewFlameThrowerCFRC14CFrustumPlanesRC13CStateManager: @@ -3100,7 +3100,7 @@ AddToRenderer__16CNewFlameThrowerCFRC14CFrustumPlanesRC13CStateManager: /* 80263B00 00260A60 81 9E 00 00 */ lwz r12, 0(r30) /* 80263B04 00260A64 81 8C 00 64 */ lwz r12, 0x64(r12) /* 80263B08 00260A68 7D 89 03 A6 */ mtctr r12 -/* 80263B0C 00260A6C 4E 80 04 21 */ bctrl +/* 80263B0C 00260A6C 4E 80 04 21 */ bctrl /* 80263B10 00260A70 7F C3 F3 78 */ mr r3, r30 /* 80263B14 00260A74 7F E4 FB 78 */ mr r4, r31 /* 80263B18 00260A78 38 A1 00 08 */ addi r5, r1, 8 @@ -3111,7 +3111,7 @@ AddToRenderer__16CNewFlameThrowerCFRC14CFrustumPlanesRC13CStateManager: /* 80263B2C 00260A8C 83 C1 00 38 */ lwz r30, 0x38(r1) /* 80263B30 00260A90 7C 08 03 A6 */ mtlr r0 /* 80263B34 00260A94 38 21 00 40 */ addi r1, r1, 0x40 -/* 80263B38 00260A98 4E 80 00 20 */ blr +/* 80263B38 00260A98 4E 80 00 20 */ blr .global UpdateFx__16CNewFlameThrowerFRC12CTransform4ffR13CStateManager UpdateFx__16CNewFlameThrowerFRC12CTransform4ffR13CStateManager: @@ -3158,37 +3158,37 @@ UpdateFx__16CNewFlameThrowerFRC12CTransform4ffR13CStateManager: /* 80263BDC 00260B3C 81 83 00 00 */ lwz r12, 0(r3) /* 80263BE0 00260B40 81 8C 00 18 */ lwz r12, 0x18(r12) /* 80263BE4 00260B44 7D 89 03 A6 */ mtctr r12 -/* 80263BE8 00260B48 4E 80 04 21 */ bctrl +/* 80263BE8 00260B48 4E 80 04 21 */ bctrl /* 80263BEC 00260B4C 80 7C 03 58 */ lwz r3, 0x358(r28) /* 80263BF0 00260B50 38 81 00 84 */ addi r4, r1, 0x84 /* 80263BF4 00260B54 81 83 00 00 */ lwz r12, 0(r3) /* 80263BF8 00260B58 81 8C 00 14 */ lwz r12, 0x14(r12) /* 80263BFC 00260B5C 7D 89 03 A6 */ mtctr r12 -/* 80263C00 00260B60 4E 80 04 21 */ bctrl +/* 80263C00 00260B60 4E 80 04 21 */ bctrl /* 80263C04 00260B64 80 7C 03 6C */ lwz r3, 0x36c(r28) /* 80263C08 00260B68 38 81 00 48 */ addi r4, r1, 0x48 /* 80263C0C 00260B6C 81 83 00 00 */ lwz r12, 0(r3) /* 80263C10 00260B70 81 8C 00 18 */ lwz r12, 0x18(r12) /* 80263C14 00260B74 7D 89 03 A6 */ mtctr r12 -/* 80263C18 00260B78 4E 80 04 21 */ bctrl +/* 80263C18 00260B78 4E 80 04 21 */ bctrl /* 80263C1C 00260B7C 80 7C 03 6C */ lwz r3, 0x36c(r28) /* 80263C20 00260B80 38 81 00 84 */ addi r4, r1, 0x84 /* 80263C24 00260B84 81 83 00 00 */ lwz r12, 0(r3) /* 80263C28 00260B88 81 8C 00 14 */ lwz r12, 0x14(r12) /* 80263C2C 00260B8C 7D 89 03 A6 */ mtctr r12 -/* 80263C30 00260B90 4E 80 04 21 */ bctrl +/* 80263C30 00260B90 4E 80 04 21 */ bctrl /* 80263C34 00260B94 80 7C 03 70 */ lwz r3, 0x370(r28) /* 80263C38 00260B98 38 81 00 48 */ addi r4, r1, 0x48 /* 80263C3C 00260B9C 81 83 00 00 */ lwz r12, 0(r3) /* 80263C40 00260BA0 81 8C 00 18 */ lwz r12, 0x18(r12) /* 80263C44 00260BA4 7D 89 03 A6 */ mtctr r12 -/* 80263C48 00260BA8 4E 80 04 21 */ bctrl +/* 80263C48 00260BA8 4E 80 04 21 */ bctrl /* 80263C4C 00260BAC 80 7C 03 70 */ lwz r3, 0x370(r28) /* 80263C50 00260BB0 38 81 00 84 */ addi r4, r1, 0x84 /* 80263C54 00260BB4 81 83 00 00 */ lwz r12, 0(r3) /* 80263C58 00260BB8 81 8C 00 14 */ lwz r12, 0x14(r12) /* 80263C5C 00260BBC 7D 89 03 A6 */ mtctr r12 -/* 80263C60 00260BC0 4E 80 04 21 */ bctrl +/* 80263C60 00260BC0 4E 80 04 21 */ bctrl /* 80263C64 00260BC4 88 1C 03 7C */ lbz r0, 0x37c(r28) /* 80263C68 00260BC8 80 7C 03 58 */ lwz r3, 0x358(r28) /* 80263C6C 00260BCC 54 00 DF FF */ rlwinm. r0, r0, 0x1b, 0x1f, 0x1f @@ -3201,49 +3201,49 @@ lbl_80263C80: /* 80263C80 00260BE0 81 83 00 00 */ lwz r12, 0(r3) /* 80263C84 00260BE4 81 8C 00 34 */ lwz r12, 0x34(r12) /* 80263C88 00260BE8 7D 89 03 A6 */ mtctr r12 -/* 80263C8C 00260BEC 4E 80 04 21 */ bctrl +/* 80263C8C 00260BEC 4E 80 04 21 */ bctrl /* 80263C90 00260BF0 80 7C 03 58 */ lwz r3, 0x358(r28) /* 80263C94 00260BF4 FC 20 F8 90 */ fmr f1, f31 /* 80263C98 00260BF8 81 83 00 00 */ lwz r12, 0(r3) /* 80263C9C 00260BFC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80263CA0 00260C00 7D 89 03 A6 */ mtctr r12 -/* 80263CA4 00260C04 4E 80 04 21 */ bctrl +/* 80263CA4 00260C04 4E 80 04 21 */ bctrl /* 80263CA8 00260C08 80 7C 03 5C */ lwz r3, 0x35c(r28) /* 80263CAC 00260C0C FC 20 F8 90 */ fmr f1, f31 /* 80263CB0 00260C10 81 83 00 00 */ lwz r12, 0(r3) /* 80263CB4 00260C14 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80263CB8 00260C18 7D 89 03 A6 */ mtctr r12 -/* 80263CBC 00260C1C 4E 80 04 21 */ bctrl +/* 80263CBC 00260C1C 4E 80 04 21 */ bctrl /* 80263CC0 00260C20 80 7C 03 60 */ lwz r3, 0x360(r28) /* 80263CC4 00260C24 FC 20 F8 90 */ fmr f1, f31 /* 80263CC8 00260C28 81 83 00 00 */ lwz r12, 0(r3) /* 80263CCC 00260C2C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80263CD0 00260C30 7D 89 03 A6 */ mtctr r12 -/* 80263CD4 00260C34 4E 80 04 21 */ bctrl +/* 80263CD4 00260C34 4E 80 04 21 */ bctrl /* 80263CD8 00260C38 80 7C 03 64 */ lwz r3, 0x364(r28) /* 80263CDC 00260C3C FC 20 F8 90 */ fmr f1, f31 /* 80263CE0 00260C40 81 83 00 00 */ lwz r12, 0(r3) /* 80263CE4 00260C44 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80263CE8 00260C48 7D 89 03 A6 */ mtctr r12 -/* 80263CEC 00260C4C 4E 80 04 21 */ bctrl +/* 80263CEC 00260C4C 4E 80 04 21 */ bctrl /* 80263CF0 00260C50 80 7C 03 68 */ lwz r3, 0x368(r28) /* 80263CF4 00260C54 FC 20 F8 90 */ fmr f1, f31 /* 80263CF8 00260C58 81 83 00 00 */ lwz r12, 0(r3) /* 80263CFC 00260C5C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80263D00 00260C60 7D 89 03 A6 */ mtctr r12 -/* 80263D04 00260C64 4E 80 04 21 */ bctrl +/* 80263D04 00260C64 4E 80 04 21 */ bctrl /* 80263D08 00260C68 80 7C 03 6C */ lwz r3, 0x36c(r28) /* 80263D0C 00260C6C FC 20 F8 90 */ fmr f1, f31 /* 80263D10 00260C70 81 83 00 00 */ lwz r12, 0(r3) /* 80263D14 00260C74 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80263D18 00260C78 7D 89 03 A6 */ mtctr r12 -/* 80263D1C 00260C7C 4E 80 04 21 */ bctrl +/* 80263D1C 00260C7C 4E 80 04 21 */ bctrl /* 80263D20 00260C80 80 7C 03 70 */ lwz r3, 0x370(r28) /* 80263D24 00260C84 FC 20 F8 90 */ fmr f1, f31 /* 80263D28 00260C88 81 83 00 00 */ lwz r12, 0(r3) /* 80263D2C 00260C8C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80263D30 00260C90 7D 89 03 A6 */ mtctr r12 -/* 80263D34 00260C94 4E 80 04 21 */ bctrl +/* 80263D34 00260C94 4E 80 04 21 */ bctrl /* 80263D38 00260C98 38 00 00 00 */ li r0, 0 /* 80263D3C 00260C9C FC 20 F8 90 */ fmr f1, f31 /* 80263D40 00260CA0 90 01 00 B4 */ stw r0, 0xb4(r1) @@ -3354,7 +3354,7 @@ lbl_80263EB4: /* 80263EB8 00260E18 81 83 00 00 */ lwz r12, 0(r3) /* 80263EBC 00260E1C 81 8C 00 60 */ lwz r12, 0x60(r12) /* 80263EC0 00260E20 7D 89 03 A6 */ mtctr r12 -/* 80263EC4 00260E24 4E 80 04 21 */ bctrl +/* 80263EC4 00260E24 4E 80 04 21 */ bctrl /* 80263EC8 00260E28 7C 1B 18 00 */ cmpw r27, r3 /* 80263ECC 00260E2C 41 80 FF 58 */ blt lbl_80263E24 /* 80263ED0 00260E30 3B 60 00 00 */ li r27, 0 @@ -3405,7 +3405,7 @@ lbl_80263F6C: /* 80263F70 00260ED0 81 83 00 00 */ lwz r12, 0(r3) /* 80263F74 00260ED4 81 8C 00 60 */ lwz r12, 0x60(r12) /* 80263F78 00260ED8 7D 89 03 A6 */ mtctr r12 -/* 80263F7C 00260EDC 4E 80 04 21 */ bctrl +/* 80263F7C 00260EDC 4E 80 04 21 */ bctrl /* 80263F80 00260EE0 7C 1B 18 00 */ cmpw r27, r3 /* 80263F84 00260EE4 41 80 FF 58 */ blt lbl_80263EDC lbl_80263F88: @@ -3519,13 +3519,13 @@ lbl_8026410C: /* 8026411C 0026107C 81 83 00 00 */ lwz r12, 0(r3) /* 80264120 00261080 81 8C 00 18 */ lwz r12, 0x18(r12) /* 80264124 00261084 7D 89 03 A6 */ mtctr r12 -/* 80264128 00261088 4E 80 04 21 */ bctrl +/* 80264128 00261088 4E 80 04 21 */ bctrl /* 8026412C 0026108C 80 7C 03 5C */ lwz r3, 0x35c(r28) /* 80264130 00261090 7F C4 F3 78 */ mr r4, r30 /* 80264134 00261094 81 83 00 00 */ lwz r12, 0(r3) /* 80264138 00261098 81 8C 00 14 */ lwz r12, 0x14(r12) /* 8026413C 0026109C 7D 89 03 A6 */ mtctr r12 -/* 80264140 002610A0 4E 80 04 21 */ bctrl +/* 80264140 002610A0 4E 80 04 21 */ bctrl /* 80264144 002610A4 80 7C 03 5C */ lwz r3, 0x35c(r28) /* 80264148 002610A8 80 9C 03 B4 */ lwz r4, 0x3b4(r28) /* 8026414C 002610AC 48 0B 87 75 */ bl ForceParticleCreation__11CElementGenFi @@ -3565,7 +3565,7 @@ lbl_802641B0: /* 802641BC 0026111C 80 01 02 F4 */ lwz r0, 0x2f4(r1) /* 802641C0 00261120 7C 08 03 A6 */ mtlr r0 /* 802641C4 00261124 38 21 02 F0 */ addi r1, r1, 0x2f0 -/* 802641C8 00261128 4E 80 00 20 */ blr +/* 802641C8 00261128 4E 80 00 20 */ blr .global sub_802641cc sub_802641cc: @@ -3665,7 +3665,7 @@ lbl_80264310: /* 80264320 00261280 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80264324 00261284 7C 08 03 A6 */ mtlr r0 /* 80264328 00261288 38 21 00 30 */ addi r1, r1, 0x30 -/* 8026432C 0026128C 4E 80 00 20 */ blr +/* 8026432C 0026128C 4E 80 00 20 */ blr .global Think__16CNewFlameThrowerFfR13CStateManager Think__16CNewFlameThrowerFfR13CStateManager: @@ -3715,11 +3715,11 @@ lbl_802643BC: /* 802643CC 0026132C 80 01 00 34 */ lwz r0, 0x34(r1) /* 802643D0 00261330 7C 08 03 A6 */ mtlr r0 /* 802643D4 00261334 38 21 00 30 */ addi r1, r1, 0x30 -/* 802643D8 00261338 4E 80 00 20 */ blr +/* 802643D8 00261338 4E 80 00 20 */ blr .global nullsub_66 nullsub_66: -/* 802643DC 0026133C 4E 80 00 20 */ blr +/* 802643DC 0026133C 4E 80 00 20 */ blr .global Accept__16CNewFlameThrowerFR8IVisitor Accept__16CNewFlameThrowerFR8IVisitor: @@ -3732,17 +3732,17 @@ Accept__16CNewFlameThrowerFR8IVisitor: /* 802643F8 00261358 7C 04 03 78 */ mr r4, r0 /* 802643FC 0026135C 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 80264400 00261360 7D 89 03 A6 */ mtctr r12 -/* 80264404 00261364 4E 80 04 21 */ bctrl +/* 80264404 00261364 4E 80 04 21 */ bctrl /* 80264408 00261368 80 01 00 14 */ lwz r0, 0x14(r1) /* 8026440C 0026136C 7C 08 03 A6 */ mtlr r0 /* 80264410 00261370 38 21 00 10 */ addi r1, r1, 0x10 -/* 80264414 00261374 4E 80 00 20 */ blr +/* 80264414 00261374 4E 80 00 20 */ blr .global GetTouchBounds__16CNewFlameThrowerCFv GetTouchBounds__16CNewFlameThrowerCFv: /* 80264418 00261378 38 00 00 00 */ li r0, 0 /* 8026441C 0026137C 98 03 00 18 */ stb r0, 0x18(r3) -/* 80264420 00261380 4E 80 00 20 */ blr +/* 80264420 00261380 4E 80 00 20 */ blr .global "__ct__16CNewFlameThrowerbRC28TToken<18CWeaponDescription>RCQ24rstl66basic_string,Q24rstl17rmemory_allocator>11EWeaponTypeRCQ24rstl21reserved_vectorRC12CTransform4f14EMaterialTypesRC11CDamageInfo9TUniqueId7TAreaId9TUniqueIdUi" "__ct__16CNewFlameThrowerbRC28TToken<18CWeaponDescription>RCQ24rstl66basic_string,Q24rstl17rmemory_allocator>11EWeaponTypeRCQ24rstl21reserved_vectorRC12CTransform4f14EMaterialTypesRC11CDamageInfo9TUniqueId7TAreaId9TUniqueIdUi": @@ -3828,7 +3828,7 @@ lbl_80264508: /* 8026455C 002614BC 81 84 00 00 */ lwz r12, 0(r4) /* 80264560 002614C0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80264564 002614C4 7D 89 03 A6 */ mtctr r12 -/* 80264568 002614C8 4E 80 04 21 */ bctrl +/* 80264568 002614C8 4E 80 04 21 */ bctrl /* 8026456C 002614CC 3A 7E 03 04 */ addi r19, r30, 0x304 /* 80264570 002614D0 38 81 00 B0 */ addi r4, r1, 0xb0 /* 80264574 002614D4 7E 63 9B 78 */ mr r3, r19 @@ -3851,7 +3851,7 @@ lbl_80264508: /* 802645B8 00261518 81 84 00 00 */ lwz r12, 0(r4) /* 802645BC 0026151C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802645C0 00261520 7D 89 03 A6 */ mtctr r12 -/* 802645C4 00261524 4E 80 04 21 */ bctrl +/* 802645C4 00261524 4E 80 04 21 */ bctrl /* 802645C8 00261528 3A 7E 03 10 */ addi r19, r30, 0x310 /* 802645CC 0026152C 38 81 00 A0 */ addi r4, r1, 0xa0 /* 802645D0 00261530 7E 63 9B 78 */ mr r3, r19 @@ -3874,7 +3874,7 @@ lbl_80264508: /* 80264614 00261574 81 84 00 00 */ lwz r12, 0(r4) /* 80264618 00261578 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8026461C 0026157C 7D 89 03 A6 */ mtctr r12 -/* 80264620 00261580 4E 80 04 21 */ bctrl +/* 80264620 00261580 4E 80 04 21 */ bctrl /* 80264624 00261584 3A 7E 03 1C */ addi r19, r30, 0x31c /* 80264628 00261588 38 81 00 90 */ addi r4, r1, 0x90 /* 8026462C 0026158C 7E 63 9B 78 */ mr r3, r19 @@ -3897,7 +3897,7 @@ lbl_80264508: /* 80264670 002615D0 81 84 00 00 */ lwz r12, 0(r4) /* 80264674 002615D4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80264678 002615D8 7D 89 03 A6 */ mtctr r12 -/* 8026467C 002615DC 4E 80 04 21 */ bctrl +/* 8026467C 002615DC 4E 80 04 21 */ bctrl /* 80264680 002615E0 3A 7E 03 28 */ addi r19, r30, 0x328 /* 80264684 002615E4 38 81 00 80 */ addi r4, r1, 0x80 /* 80264688 002615E8 7E 63 9B 78 */ mr r3, r19 @@ -3920,7 +3920,7 @@ lbl_80264508: /* 802646CC 0026162C 81 84 00 00 */ lwz r12, 0(r4) /* 802646D0 00261630 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802646D4 00261634 7D 89 03 A6 */ mtctr r12 -/* 802646D8 00261638 4E 80 04 21 */ bctrl +/* 802646D8 00261638 4E 80 04 21 */ bctrl /* 802646DC 0026163C 3A 7E 03 34 */ addi r19, r30, 0x334 /* 802646E0 00261640 38 81 00 70 */ addi r4, r1, 0x70 /* 802646E4 00261644 7E 63 9B 78 */ mr r3, r19 @@ -3943,7 +3943,7 @@ lbl_80264508: /* 80264728 00261688 81 84 00 00 */ lwz r12, 0(r4) /* 8026472C 0026168C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80264730 00261690 7D 89 03 A6 */ mtctr r12 -/* 80264734 00261694 4E 80 04 21 */ bctrl +/* 80264734 00261694 4E 80 04 21 */ bctrl /* 80264738 00261698 3A 7E 03 40 */ addi r19, r30, 0x340 /* 8026473C 0026169C 38 81 00 60 */ addi r4, r1, 0x60 /* 80264740 002616A0 7E 63 9B 78 */ mr r3, r19 @@ -3966,7 +3966,7 @@ lbl_80264508: /* 80264784 002616E4 81 84 00 00 */ lwz r12, 0(r4) /* 80264788 002616E8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8026478C 002616EC 7D 89 03 A6 */ mtctr r12 -/* 80264790 002616F0 4E 80 04 21 */ bctrl +/* 80264790 002616F0 4E 80 04 21 */ bctrl /* 80264794 002616F4 3A 7E 03 4C */ addi r19, r30, 0x34c /* 80264798 002616F8 38 81 00 50 */ addi r4, r1, 0x50 /* 8026479C 002616FC 7E 63 9B 78 */ mr r3, r19 @@ -4039,7 +4039,7 @@ lbl_80264888: /* 8026489C 002617FC 80 01 01 34 */ lwz r0, 0x134(r1) /* 802648A0 00261800 7C 08 03 A6 */ mtlr r0 /* 802648A4 00261804 38 21 01 30 */ addi r1, r1, 0x130 -/* 802648A8 00261808 4E 80 00 20 */ blr +/* 802648A8 00261808 4E 80 00 20 */ blr .global sub_802648ac sub_802648ac: @@ -4056,7 +4056,7 @@ sub_802648ac: /* 802648D4 00261834 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802648D8 00261838 7C 08 03 A6 */ mtlr r0 /* 802648DC 0026183C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802648E0 00261840 4E 80 00 20 */ blr +/* 802648E0 00261840 4E 80 00 20 */ blr .global sub_802648e4 sub_802648e4: @@ -4132,7 +4132,7 @@ lbl_802649C0: /* 802649D8 00261938 83 81 00 10 */ lwz r28, 0x10(r1) /* 802649DC 0026193C 7C 08 03 A6 */ mtlr r0 /* 802649E0 00261940 38 21 00 20 */ addi r1, r1, 0x20 -/* 802649E4 00261944 4E 80 00 20 */ blr +/* 802649E4 00261944 4E 80 00 20 */ blr .global sub_802649e8 sub_802649e8: @@ -4240,7 +4240,7 @@ lbl_80264B54: /* 80264B60 00261AC0 83 A1 00 34 */ lwz r29, 0x34(r1) /* 80264B64 00261AC4 7C 08 03 A6 */ mtlr r0 /* 80264B68 00261AC8 38 21 00 40 */ addi r1, r1, 0x40 -/* 80264B6C 00261ACC 4E 80 00 20 */ blr +/* 80264B6C 00261ACC 4E 80 00 20 */ blr .global sub_80264b70 sub_80264b70: @@ -4294,7 +4294,7 @@ lbl_80264C0C: /* 80264C20 00261B80 80 01 00 34 */ lwz r0, 0x34(r1) /* 80264C24 00261B84 7C 08 03 A6 */ mtlr r0 /* 80264C28 00261B88 38 21 00 30 */ addi r1, r1, 0x30 -/* 80264C2C 00261B8C 4E 80 00 20 */ blr +/* 80264C2C 00261B8C 4E 80 00 20 */ blr .global sub_80264c30 sub_80264c30: @@ -4348,7 +4348,7 @@ lbl_80264CCC: /* 80264CE0 00261C40 80 01 00 34 */ lwz r0, 0x34(r1) /* 80264CE4 00261C44 7C 08 03 A6 */ mtlr r0 /* 80264CE8 00261C48 38 21 00 30 */ addi r1, r1, 0x30 -/* 80264CEC 00261C4C 4E 80 00 20 */ blr +/* 80264CEC 00261C4C 4E 80 00 20 */ blr .global sub_80264cf0 sub_80264cf0: @@ -4421,7 +4421,7 @@ lbl_80264DC8: /* 80264DD4 00261D34 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80264DD8 00261D38 7C 08 03 A6 */ mtlr r0 /* 80264DDC 00261D3C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80264DE0 00261D40 4E 80 00 20 */ blr +/* 80264DE0 00261D40 4E 80 00 20 */ blr .global sub_80264de4 sub_80264de4: @@ -4435,7 +4435,7 @@ sub_80264de4: /* 80264E00 00261D60 80 01 00 14 */ lwz r0, 0x14(r1) /* 80264E04 00261D64 7C 08 03 A6 */ mtlr r0 /* 80264E08 00261D68 38 21 00 10 */ addi r1, r1, 0x10 -/* 80264E0C 00261D6C 4E 80 00 20 */ blr +/* 80264E0C 00261D6C 4E 80 00 20 */ blr .global sub_80264e10 sub_80264e10: @@ -4443,7 +4443,7 @@ sub_80264e10: /* 80264E14 00261D74 54 80 18 38 */ slwi r0, r4, 3 /* 80264E18 00261D78 7C 05 02 14 */ add r0, r5, r0 /* 80264E1C 00261D7C 90 03 00 00 */ stw r0, 0(r3) -/* 80264E20 00261D80 4E 80 00 20 */ blr +/* 80264E20 00261D80 4E 80 00 20 */ blr .global sub_80264e24 sub_80264e24: @@ -4463,7 +4463,7 @@ sub_80264e24: /* 80264E58 00261DB8 80 01 00 24 */ lwz r0, 0x24(r1) /* 80264E5C 00261DBC 7C 08 03 A6 */ mtlr r0 /* 80264E60 00261DC0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80264E64 00261DC4 4E 80 00 20 */ blr +/* 80264E64 00261DC4 4E 80 00 20 */ blr .global sub_80264e68 sub_80264e68: @@ -4472,7 +4472,7 @@ sub_80264e68: /* 80264E70 00261DD0 7C 03 00 50 */ subf r0, r3, r0 /* 80264E74 00261DD4 7C 00 1E 70 */ srawi r0, r0, 3 /* 80264E78 00261DD8 7C 60 01 94 */ addze r3, r0 -/* 80264E7C 00261DDC 4E 80 00 20 */ blr +/* 80264E7C 00261DDC 4E 80 00 20 */ blr .global sub_80264e80 sub_80264e80: @@ -4490,7 +4490,7 @@ lbl_80264EA8: /* 80264EA8 00261E08 C0 05 00 00 */ lfs f0, 0(r5) /* 80264EAC 00261E0C C0 24 00 00 */ lfs f1, 0(r4) /* 80264EB0 00261E10 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 80264EB4 00261E14 4C 80 00 20 */ bgelr +/* 80264EB4 00261E14 4C 80 00 20 */ bgelr /* 80264EB8 00261E18 80 C5 00 04 */ lwz r6, 4(r5) /* 80264EBC 00261E1C D0 25 00 00 */ stfs f1, 0(r5) /* 80264EC0 00261E20 80 04 00 04 */ lwz r0, 4(r4) @@ -4503,11 +4503,11 @@ lbl_80264EA8: /* 80264EDC 00261E3C 90 04 00 04 */ stw r0, 4(r4) /* 80264EE0 00261E40 D0 03 00 00 */ stfs f0, 0(r3) /* 80264EE4 00261E44 90 C3 00 04 */ stw r6, 4(r3) -/* 80264EE8 00261E48 4E 80 00 20 */ blr +/* 80264EE8 00261E48 4E 80 00 20 */ blr lbl_80264EEC: /* 80264EEC 00261E4C D0 04 00 00 */ stfs f0, 0(r4) /* 80264EF0 00261E50 90 C4 00 04 */ stw r6, 4(r4) -/* 80264EF4 00261E54 4E 80 00 20 */ blr +/* 80264EF4 00261E54 4E 80 00 20 */ blr .global sub_80264ef8 sub_80264ef8: @@ -4545,7 +4545,7 @@ lbl_80264F54: .global sub_80264f60 sub_80264f60: -/* 80264F60 00261EC0 4E 80 00 20 */ blr +/* 80264F60 00261EC0 4E 80 00 20 */ blr .global __sinit_CNewFlameThrower_cpp __sinit_CNewFlameThrower_cpp: diff --git a/asm/MetroidPrime/Weapons/CPhazonBeam.s b/asm/MetroidPrime/Weapons/CPhazonBeam.s index 37498c47..136fc98d 100644 --- a/asm/MetroidPrime/Weapons/CPhazonBeam.s +++ b/asm/MetroidPrime/Weapons/CPhazonBeam.s @@ -54,7 +54,7 @@ lbl_8018C27C: /* 8018C27C 001891DC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8018C280 001891E0 7C 08 03 A6 */ mtlr r0 /* 8018C284 001891E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8018C288 001891E8 4E 80 00 20 */ blr +/* 8018C288 001891E8 4E 80 00 20 */ blr .global CreateBeam__11CPhazonBeamFR13CStateManager CreateBeam__11CPhazonBeamFR13CStateManager: @@ -92,7 +92,7 @@ lbl_8018C2F4: /* 8018C304 00189264 38 80 00 01 */ li r4, 1 /* 8018C308 00189268 81 8C 00 08 */ lwz r12, 8(r12) /* 8018C30C 0018926C 7D 89 03 A6 */ mtctr r12 -/* 8018C310 00189270 4E 80 04 21 */ bctrl +/* 8018C310 00189270 4E 80 04 21 */ bctrl lbl_8018C314: /* 8018C314 00189274 7F A0 07 75 */ extsb. r0, r29 /* 8018C318 00189278 93 FE 02 34 */ stw r31, 0x234(r30) @@ -108,13 +108,13 @@ lbl_8018C32C: /* 8018C33C 0018929C 38 9E 00 04 */ addi r4, r30, 4 /* 8018C340 001892A0 81 8C 00 24 */ lwz r12, 0x24(r12) /* 8018C344 001892A4 7D 89 03 A6 */ mtctr r12 -/* 8018C348 001892A8 4E 80 04 21 */ bctrl +/* 8018C348 001892A8 4E 80 04 21 */ bctrl /* 8018C34C 001892AC 80 7E 02 34 */ lwz r3, 0x234(r30) /* 8018C350 001892B0 38 80 00 00 */ li r4, 0 /* 8018C354 001892B4 81 83 00 00 */ lwz r12, 0(r3) /* 8018C358 001892B8 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8018C35C 001892BC 7D 89 03 A6 */ mtctr r12 -/* 8018C360 001892C0 4E 80 04 21 */ bctrl +/* 8018C360 001892C0 4E 80 04 21 */ bctrl lbl_8018C364: /* 8018C364 001892C4 80 01 00 24 */ lwz r0, 0x24(r1) /* 8018C368 001892C8 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -122,7 +122,7 @@ lbl_8018C364: /* 8018C370 001892D0 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8018C374 001892D4 7C 08 03 A6 */ mtlr r0 /* 8018C378 001892D8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8018C37C 001892DC 4E 80 00 20 */ blr +/* 8018C37C 001892DC 4E 80 00 20 */ blr .global IsLoaded__11CPhazonBeamCFv IsLoaded__11CPhazonBeamCFv: @@ -147,7 +147,7 @@ lbl_8018C3B8: /* 8018C3C4 00189324 83 C1 00 08 */ lwz r30, 8(r1) /* 8018C3C8 00189328 7C 08 03 A6 */ mtlr r0 /* 8018C3CC 0018932C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8018C3D0 00189330 4E 80 00 20 */ blr +/* 8018C3D0 00189330 4E 80 00 20 */ blr .global Unload__11CPhazonBeamFR13CStateManager Unload__11CPhazonBeamFR13CStateManager: @@ -169,7 +169,7 @@ Unload__11CPhazonBeamFR13CStateManager: /* 8018C410 00189370 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8018C414 00189374 7C 08 03 A6 */ mtlr r0 /* 8018C418 00189378 38 21 00 10 */ addi r1, r1, 0x10 -/* 8018C41C 0018937C 4E 80 00 20 */ blr +/* 8018C41C 0018937C 4E 80 00 20 */ blr .global Load__11CPhazonBeamFb Load__11CPhazonBeamFb: @@ -201,7 +201,7 @@ lbl_8018C47C: /* 8018C47C 001893DC 81 84 00 00 */ lwz r12, 0(r4) /* 8018C480 001893E0 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8018C484 001893E4 7D 89 03 A6 */ mtctr r12 -/* 8018C488 001893E8 4E 80 04 21 */ bctrl +/* 8018C488 001893E8 4E 80 04 21 */ bctrl /* 8018C48C 001893EC 38 61 00 08 */ addi r3, r1, 8 /* 8018C490 001893F0 38 81 00 10 */ addi r4, r1, 0x10 /* 8018C494 001893F4 48 1B 4A 15 */ bl __ct__6CTokenFRC6CToken @@ -221,7 +221,7 @@ lbl_8018C47C: /* 8018C4CC 0018942C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8018C4D0 00189430 7C 08 03 A6 */ mtlr r0 /* 8018C4D4 00189434 38 21 00 20 */ addi r1, r1, 0x20 -/* 8018C4D8 00189438 4E 80 00 20 */ blr +/* 8018C4D8 00189438 4E 80 00 20 */ blr .global StopBeam__11CPhazonBeamFR13CStateManagerb StopBeam__11CPhazonBeamFR13CStateManagerb: @@ -235,12 +235,12 @@ StopBeam__11CPhazonBeamFR13CStateManagerb: /* 8018C4F8 00189458 38 80 00 00 */ li r4, 0 /* 8018C4FC 0018945C 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8018C500 00189460 7D 89 03 A6 */ mtctr r12 -/* 8018C504 00189464 4E 80 04 21 */ bctrl +/* 8018C504 00189464 4E 80 04 21 */ bctrl lbl_8018C508: /* 8018C508 00189468 80 01 00 14 */ lwz r0, 0x14(r1) /* 8018C50C 0018946C 7C 08 03 A6 */ mtlr r0 /* 8018C510 00189470 38 21 00 10 */ addi r1, r1, 0x10 -/* 8018C514 00189474 4E 80 00 20 */ blr +/* 8018C514 00189474 4E 80 00 20 */ blr .global UpdateBeam__11CPhazonBeamFfRC12CTransform4fRC9CVector3fR13CStateManager UpdateBeam__11CPhazonBeamFfRC12CTransform4fRC9CVector3fR13CStateManager: @@ -266,7 +266,7 @@ UpdateBeam__11CPhazonBeamFfRC12CTransform4fRC9CVector3fR13CStateManager: /* 8018C564 001894C4 7F E3 FB 78 */ mr r3, r31 /* 8018C568 001894C8 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 8018C56C 001894CC 7D 89 03 A6 */ mtctr r12 -/* 8018C570 001894D0 4E 80 04 21 */ bctrl +/* 8018C570 001894D0 4E 80 04 21 */ bctrl lbl_8018C574: /* 8018C574 001894D4 7F 83 E3 78 */ mr r3, r28 /* 8018C578 001894D8 7F C4 F3 78 */ mr r4, r30 @@ -285,7 +285,7 @@ lbl_8018C574: /* 8018C5AC 0018950C 83 81 00 08 */ lwz r28, 8(r1) /* 8018C5B0 00189510 7C 08 03 A6 */ mtlr r0 /* 8018C5B4 00189514 38 21 00 20 */ addi r1, r1, 0x20 -/* 8018C5B8 00189518 4E 80 00 20 */ blr +/* 8018C5B8 00189518 4E 80 00 20 */ blr .global Update__11CPhazonBeamFfR13CStateManager Update__11CPhazonBeamFfR13CStateManager: @@ -332,7 +332,7 @@ lbl_8018C650: /* 8018C654 001895B4 81 9E 00 00 */ lwz r12, 0(r30) /* 8018C658 001895B8 81 8C 00 40 */ lwz r12, 0x40(r12) /* 8018C65C 001895BC 7D 89 03 A6 */ mtctr r12 -/* 8018C660 001895C0 4E 80 04 21 */ bctrl +/* 8018C660 001895C0 4E 80 04 21 */ bctrl /* 8018C664 001895C4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8018C668 001895C8 40 82 01 44 */ bne lbl_8018C7AC /* 8018C66C 001895CC 7F C3 F3 78 */ mr r3, r30 @@ -484,7 +484,7 @@ lbl_8018C874: /* 8018C884 001897E4 83 C1 00 A8 */ lwz r30, 0xa8(r1) /* 8018C888 001897E8 7C 08 03 A6 */ mtlr r0 /* 8018C88C 001897EC 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 8018C890 001897F0 4E 80 00 20 */ blr +/* 8018C890 001897F0 4E 80 00 20 */ blr .global Fire__11CPhazonBeamFbfQ212CPlayerState12EChargeStageRC12CTransform4fR13CStateManager9TUniqueId Fire__11CPhazonBeamFbfQ212CPlayerState12EChargeStageRC12CTransform4fR13CStateManager9TUniqueId: @@ -578,7 +578,7 @@ lbl_8018C9B8: /* 8018C9D4 00189934 80 01 00 74 */ lwz r0, 0x74(r1) /* 8018C9D8 00189938 7C 08 03 A6 */ mtlr r0 /* 8018C9DC 0018993C 38 21 00 70 */ addi r1, r1, 0x70 -/* 8018C9E0 00189940 4E 80 00 20 */ blr +/* 8018C9E0 00189940 4E 80 00 20 */ blr .global Draw__11CPhazonBeamCFbRC13CStateManagerRC12CTransform4fRC11CModelFlagsPC12CActorLights Draw__11CPhazonBeamCFbRC13CStateManagerRC12CTransform4fRC11CModelFlagsPC12CActorLights: @@ -700,7 +700,7 @@ lbl_8018CB10: /* 8018CB9C 00189AFC 81 83 00 00 */ lwz r12, 0(r3) /* 8018CBA0 00189B00 81 8C 00 30 */ lwz r12, 0x30(r12) /* 8018CBA4 00189B04 7D 89 03 A6 */ mtctr r12 -/* 8018CBA8 00189B08 4E 80 04 21 */ bctrl +/* 8018CBA8 00189B08 4E 80 04 21 */ bctrl /* 8018CBAC 00189B0C 38 7C 02 38 */ addi r3, r28, 0x238 /* 8018CBB0 00189B10 48 02 D0 9D */ bl DrawClipCube__FRC6CAABox /* 8018CBB4 00189B14 C0 22 A4 28 */ lfs f1, lbl_805AC148@sda21(r2) @@ -718,7 +718,7 @@ lbl_8018CB10: /* 8018CBE4 00189B44 81 83 00 00 */ lwz r12, 0(r3) /* 8018CBE8 00189B48 81 8C 00 30 */ lwz r12, 0x30(r12) /* 8018CBEC 00189B4C 7D 89 03 A6 */ mtctr r12 -/* 8018CBF0 00189B50 4E 80 04 21 */ bctrl +/* 8018CBF0 00189B50 4E 80 04 21 */ bctrl /* 8018CBF4 00189B54 38 7C 02 50 */ addi r3, r28, 0x250 /* 8018CBF8 00189B58 48 02 D0 55 */ bl DrawClipCube__FRC6CAABox lbl_8018CBFC: @@ -768,7 +768,7 @@ lbl_8018CC9C: /* 8018CCA0 00189C00 80 01 02 14 */ lwz r0, 0x214(r1) /* 8018CCA4 00189C04 7C 08 03 A6 */ mtlr r0 /* 8018CCA8 00189C08 38 21 02 10 */ addi r1, r1, 0x210 -/* 8018CCAC 00189C0C 4E 80 00 20 */ blr +/* 8018CCAC 00189C0C 4E 80 00 20 */ blr .global DrawMuzzleFx__11CPhazonBeamCFRC13CStateManager DrawMuzzleFx__11CPhazonBeamCFRC13CStateManager: @@ -791,7 +791,7 @@ lbl_8018CCE4: /* 8018CCEC 00189C4C 83 C1 00 08 */ lwz r30, 8(r1) /* 8018CCF0 00189C50 7C 08 03 A6 */ mtlr r0 /* 8018CCF4 00189C54 38 21 00 10 */ addi r1, r1, 0x10 -/* 8018CCF8 00189C58 4E 80 00 20 */ blr +/* 8018CCF8 00189C58 4E 80 00 20 */ blr .global UpdateGunFx__11CPhazonBeamFbfRC13CStateManagerRC12CTransform4f UpdateGunFx__11CPhazonBeamFbfRC13CStateManagerRC12CTransform4f: @@ -818,7 +818,7 @@ UpdateGunFx__11CPhazonBeamFbfRC13CStateManagerRC12CTransform4f: /* 8018CD4C 00189CAC 81 83 00 00 */ lwz r12, 0(r3) /* 8018CD50 00189CB0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8018CD54 00189CB4 7D 89 03 A6 */ mtctr r12 -/* 8018CD58 00189CB8 4E 80 04 21 */ bctrl +/* 8018CD58 00189CB8 4E 80 04 21 */ bctrl lbl_8018CD5C: /* 8018CD5C 00189CBC FC 20 F8 90 */ fmr f1, f31 /* 8018CD60 00189CC0 7F 83 E3 78 */ mr r3, r28 @@ -834,7 +834,7 @@ lbl_8018CD5C: /* 8018CD88 00189CE8 83 81 00 08 */ lwz r28, 8(r1) /* 8018CD8C 00189CEC 7C 08 03 A6 */ mtlr r0 /* 8018CD90 00189CF0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8018CD94 00189CF4 4E 80 00 20 */ blr +/* 8018CD94 00189CF4 4E 80 00 20 */ blr .global PostRenderGunFx__11CPhazonBeamFRC13CStateManagerRC12CTransform4f PostRenderGunFx__11CPhazonBeamFRC13CStateManagerRC12CTransform4f: @@ -853,7 +853,7 @@ PostRenderGunFx__11CPhazonBeamFRC13CStateManagerRC12CTransform4f: /* 8018CDC8 00189D28 81 83 00 00 */ lwz r12, 0(r3) /* 8018CDCC 00189D2C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8018CDD0 00189D30 7D 89 03 A6 */ mtctr r12 -/* 8018CDD4 00189D34 4E 80 04 21 */ bctrl +/* 8018CDD4 00189D34 4E 80 04 21 */ bctrl lbl_8018CDD8: /* 8018CDD8 00189D38 7F A3 EB 78 */ mr r3, r29 /* 8018CDDC 00189D3C 7F C4 F3 78 */ mr r4, r30 @@ -865,7 +865,7 @@ lbl_8018CDD8: /* 8018CDF4 00189D54 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8018CDF8 00189D58 7C 08 03 A6 */ mtlr r0 /* 8018CDFC 00189D5C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8018CE00 00189D60 4E 80 00 20 */ blr +/* 8018CE00 00189D60 4E 80 00 20 */ blr .global PreRenderGunFx__11CPhazonBeamFRC13CStateManagerRC12CTransform4f PreRenderGunFx__11CPhazonBeamFRC13CStateManagerRC12CTransform4f: @@ -900,7 +900,7 @@ PreRenderGunFx__11CPhazonBeamFRC13CStateManagerRC12CTransform4f: /* 8018CE74 00189DD4 81 83 00 00 */ lwz r12, 0(r3) /* 8018CE78 00189DD8 81 8C 00 30 */ lwz r12, 0x30(r12) /* 8018CE7C 00189DDC 7D 89 03 A6 */ mtctr r12 -/* 8018CE80 00189DE0 4E 80 04 21 */ bctrl +/* 8018CE80 00189DE0 4E 80 04 21 */ bctrl /* 8018CE84 00189DE4 7F A3 EB 78 */ mr r3, r29 /* 8018CE88 00189DE8 7F C4 F3 78 */ mr r4, r30 /* 8018CE8C 00189DEC 48 02 F2 95 */ bl DrawMuzzleFx__10CGunWeaponCFRC13CStateManager @@ -913,7 +913,7 @@ lbl_8018CE98: /* 8018CEA4 00189E04 83 A1 00 A4 */ lwz r29, 0xa4(r1) /* 8018CEA8 00189E08 7C 08 03 A6 */ mtlr r0 /* 8018CEAC 00189E0C 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 8018CEB0 00189E10 4E 80 00 20 */ blr +/* 8018CEB0 00189E10 4E 80 00 20 */ blr .global IsFiring__11CPhazonBeamCFRC13CStateManager IsFiring__11CPhazonBeamCFRC13CStateManager: @@ -922,7 +922,7 @@ IsFiring__11CPhazonBeamCFRC13CStateManager: /* 8018CEBC 00189E1C FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8018CEC0 00189E20 7C 00 00 26 */ mfcr r0 /* 8018CEC4 00189E24 54 03 0F FE */ srwi r3, r0, 0x1f -/* 8018CEC8 00189E28 4E 80 00 20 */ blr +/* 8018CEC8 00189E28 4E 80 00 20 */ blr .global ReInitVariables__11CPhazonBeamFv ReInitVariables__11CPhazonBeamFv: @@ -943,7 +943,7 @@ ReInitVariables__11CPhazonBeamFv: /* 8018CF04 00189E64 38 80 00 01 */ li r4, 1 /* 8018CF08 00189E68 81 8C 00 08 */ lwz r12, 8(r12) /* 8018CF0C 00189E6C 7D 89 03 A6 */ mtctr r12 -/* 8018CF10 00189E70 4E 80 04 21 */ bctrl +/* 8018CF10 00189E70 4E 80 04 21 */ bctrl lbl_8018CF14: /* 8018CF14 00189E74 38 00 00 00 */ li r0, 0 /* 8018CF18 00189E78 38 80 00 01 */ li r4, 1 @@ -967,7 +967,7 @@ lbl_8018CF14: /* 8018CF60 00189EC0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8018CF64 00189EC4 7C 08 03 A6 */ mtlr r0 /* 8018CF68 00189EC8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8018CF6C 00189ECC 4E 80 00 20 */ blr +/* 8018CF6C 00189ECC 4E 80 00 20 */ blr .global __dt__11CPhazonBeamFv __dt__11CPhazonBeamFv: @@ -991,7 +991,7 @@ __dt__11CPhazonBeamFv: /* 8018CFB4 00189F14 38 80 00 01 */ li r4, 1 /* 8018CFB8 00189F18 81 8C 00 08 */ lwz r12, 8(r12) /* 8018CFBC 00189F1C 7D 89 03 A6 */ mtctr r12 -/* 8018CFC0 00189F20 4E 80 04 21 */ bctrl +/* 8018CFC0 00189F20 4E 80 04 21 */ bctrl lbl_8018CFC4: /* 8018CFC4 00189F24 34 1E 02 28 */ addic. r0, r30, 0x228 /* 8018CFC8 00189F28 41 82 00 18 */ beq lbl_8018CFE0 @@ -1027,7 +1027,7 @@ lbl_8018D024: /* 8018D030 00189F90 83 C1 00 08 */ lwz r30, 8(r1) /* 8018D034 00189F94 7C 08 03 A6 */ mtlr r0 /* 8018D038 00189F98 38 21 00 10 */ addi r1, r1, 0x10 -/* 8018D03C 00189F9C 4E 80 00 20 */ blr +/* 8018D03C 00189F9C 4E 80 00 20 */ blr .global __ct__11CPhazonBeamFUi11EWeaponType9TUniqueId14EMaterialTypesRC9CVector3f __ct__11CPhazonBeamFUi11EWeaponType9TUniqueId14EMaterialTypesRC9CVector3f: @@ -1052,7 +1052,7 @@ __ct__11CPhazonBeamFUi11EWeaponType9TUniqueId14EMaterialTypesRC9CVector3f: /* 8018D088 00189FE8 81 84 00 00 */ lwz r12, 0(r4) /* 8018D08C 00189FEC 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8018D090 00189FF0 7D 89 03 A6 */ mtctr r12 -/* 8018D094 00189FF4 4E 80 04 21 */ bctrl +/* 8018D094 00189FF4 4E 80 04 21 */ bctrl /* 8018D098 00189FF8 38 7E 02 1C */ addi r3, r30, 0x21c /* 8018D09C 00189FFC 38 81 00 14 */ addi r4, r1, 0x14 /* 8018D0A0 0018A000 48 1B 3E 09 */ bl __ct__6CTokenFRC6CToken @@ -1069,7 +1069,7 @@ __ct__11CPhazonBeamFUi11EWeaponType9TUniqueId14EMaterialTypesRC9CVector3f: /* 8018D0CC 0018A02C 81 84 00 00 */ lwz r12, 0(r4) /* 8018D0D0 0018A030 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8018D0D4 0018A034 7D 89 03 A6 */ mtctr r12 -/* 8018D0D8 0018A038 4E 80 04 21 */ bctrl +/* 8018D0D8 0018A038 4E 80 04 21 */ bctrl /* 8018D0DC 0018A03C 3B BE 02 28 */ addi r29, r30, 0x228 /* 8018D0E0 0018A040 38 81 00 0C */ addi r4, r1, 0xc /* 8018D0E4 0018A044 7F A3 EB 78 */ mr r3, r29 diff --git a/asm/MetroidPrime/Weapons/CPlasmaBeam.s b/asm/MetroidPrime/Weapons/CPlasmaBeam.s index c15bddf2..350c998f 100644 --- a/asm/MetroidPrime/Weapons/CPlasmaBeam.s +++ b/asm/MetroidPrime/Weapons/CPlasmaBeam.s @@ -38,7 +38,7 @@ lbl_805A7320: .global lbl_8046C488 lbl_8046C488: .skip 0x10 - + .section .text, "ax" .global SetWorldLighting__11CPlasmaBeamFR13CStateManager7TAreaIdff @@ -120,7 +120,7 @@ lbl_800DECA0: /* 800DECBC 000DBC1C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 800DECC0 000DBC20 7C 08 03 A6 */ mtlr r0 /* 800DECC4 000DBC24 38 21 00 40 */ addi r1, r1, 0x40 -/* 800DECC8 000DBC28 4E 80 00 20 */ blr +/* 800DECC8 000DBC28 4E 80 00 20 */ blr .global EnableSecondaryFx__11CPlasmaBeamFQ210CGunWeapon16ESecondaryFxType EnableSecondaryFx__11CPlasmaBeamFQ210CGunWeapon16ESecondaryFxType: @@ -152,7 +152,7 @@ lbl_800DED08: /* 800DED2C 000DBC8C 38 80 00 00 */ li r4, 0 /* 800DED30 000DBC90 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 800DED34 000DBC94 7D 89 03 A6 */ mtctr r12 -/* 800DED38 000DBC98 4E 80 04 21 */ bctrl +/* 800DED38 000DBC98 4E 80 04 21 */ bctrl /* 800DED3C 000DBC9C 48 00 00 A0 */ b lbl_800DEDDC /* 800DED40 000DBCA0 48 00 00 A0 */ b lbl_800DEDE0 lbl_800DED44: @@ -182,7 +182,7 @@ lbl_800DED8C: /* 800DED9C 000DBCFC 38 80 00 01 */ li r4, 1 /* 800DEDA0 000DBD00 81 8C 00 08 */ lwz r12, 8(r12) /* 800DEDA4 000DBD04 7D 89 03 A6 */ mtctr r12 -/* 800DEDA8 000DBD08 4E 80 04 21 */ bctrl +/* 800DEDA8 000DBD08 4E 80 04 21 */ bctrl lbl_800DEDAC: /* 800DEDAC 000DBD0C 7F 80 07 75 */ extsb. r0, r28 /* 800DEDB0 000DBD10 93 FD 02 28 */ stw r31, 0x228(r29) @@ -196,7 +196,7 @@ lbl_800DEDC4: /* 800DEDCC 000DBD2C 81 83 00 00 */ lwz r12, 0(r3) /* 800DEDD0 000DBD30 81 8C 00 24 */ lwz r12, 0x24(r12) /* 800DEDD4 000DBD34 7D 89 03 A6 */ mtctr r12 -/* 800DEDD8 000DBD38 4E 80 04 21 */ bctrl +/* 800DEDD8 000DBD38 4E 80 04 21 */ bctrl lbl_800DEDDC: /* 800DEDDC 000DBD3C 93 DD 01 CC */ stw r30, 0x1cc(r29) lbl_800DEDE0: @@ -207,7 +207,7 @@ lbl_800DEDE0: /* 800DEDF0 000DBD50 83 81 00 10 */ lwz r28, 0x10(r1) /* 800DEDF4 000DBD54 7C 08 03 A6 */ mtlr r0 /* 800DEDF8 000DBD58 38 21 00 20 */ addi r1, r1, 0x20 -/* 800DEDFC 000DBD5C 4E 80 00 20 */ blr +/* 800DEDFC 000DBD5C 4E 80 00 20 */ blr .global IsLoaded__11CPlasmaBeamCFv IsLoaded__11CPlasmaBeamCFv: @@ -232,7 +232,7 @@ lbl_800DEE38: /* 800DEE44 000DBDA4 83 C1 00 08 */ lwz r30, 8(r1) /* 800DEE48 000DBDA8 7C 08 03 A6 */ mtlr r0 /* 800DEE4C 000DBDAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800DEE50 000DBDB0 4E 80 00 20 */ blr +/* 800DEE50 000DBDB0 4E 80 00 20 */ blr .global Unload__11CPlasmaBeamFR13CStateManager Unload__11CPlasmaBeamFR13CStateManager: @@ -258,7 +258,7 @@ Unload__11CPlasmaBeamFR13CStateManager: /* 800DEEA0 000DBE00 83 C1 00 08 */ lwz r30, 8(r1) /* 800DEEA4 000DBE04 7C 08 03 A6 */ mtlr r0 /* 800DEEA8 000DBE08 38 21 00 10 */ addi r1, r1, 0x10 -/* 800DEEAC 000DBE0C 4E 80 00 20 */ blr +/* 800DEEAC 000DBE0C 4E 80 00 20 */ blr .global Load__11CPlasmaBeamFb Load__11CPlasmaBeamFb: @@ -274,7 +274,7 @@ Load__11CPlasmaBeamFb: /* 800DEED4 000DBE34 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800DEED8 000DBE38 7C 08 03 A6 */ mtlr r0 /* 800DEEDC 000DBE3C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800DEEE0 000DBE40 4E 80 00 20 */ blr +/* 800DEEE0 000DBE40 4E 80 00 20 */ blr .global AcceptScriptMsg__11CPlasmaBeamF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__11CPlasmaBeamF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -292,7 +292,7 @@ lbl_800DEF08: /* 800DEF08 000DBE68 80 01 00 14 */ lwz r0, 0x14(r1) /* 800DEF0C 000DBE6C 7C 08 03 A6 */ mtlr r0 /* 800DEF10 000DBE70 38 21 00 10 */ addi r1, r1, 0x10 -/* 800DEF14 000DBE74 4E 80 00 20 */ blr +/* 800DEF14 000DBE74 4E 80 00 20 */ blr .global DeleteBeam__11CPlasmaBeamFR13CStateManager DeleteBeam__11CPlasmaBeamFR13CStateManager: @@ -314,19 +314,19 @@ lbl_800DEF50: /* 800DEF50 000DBEB0 80 01 00 14 */ lwz r0, 0x14(r1) /* 800DEF54 000DBEB4 7C 08 03 A6 */ mtlr r0 /* 800DEF58 000DBEB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800DEF5C 000DBEBC 4E 80 00 20 */ blr +/* 800DEF5C 000DBEBC 4E 80 00 20 */ blr .global CreateBeam__11CPlasmaBeamFR13CStateManager CreateBeam__11CPlasmaBeamFR13CStateManager: -/* 800DEF60 000DBEC0 4E 80 00 20 */ blr +/* 800DEF60 000DBEC0 4E 80 00 20 */ blr .global StopBeam__11CPlasmaBeamFR13CStateManagerb StopBeam__11CPlasmaBeamFR13CStateManagerb: -/* 800DEF64 000DBEC4 4E 80 00 20 */ blr +/* 800DEF64 000DBEC4 4E 80 00 20 */ blr .global UpdateBeam__11CPlasmaBeamFfRC12CTransform4fRC9CVector3fR13CStateManager UpdateBeam__11CPlasmaBeamFfRC12CTransform4fRC9CVector3fR13CStateManager: -/* 800DEF68 000DBEC8 4E 80 00 20 */ blr +/* 800DEF68 000DBEC8 4E 80 00 20 */ blr .global Fire__11CPlasmaBeamFbfQ212CPlayerState12EChargeStageRC12CTransform4fR13CStateManager9TUniqueId Fire__11CPlasmaBeamFbfQ212CPlayerState12EChargeStageRC12CTransform4fR13CStateManager9TUniqueId: @@ -423,7 +423,7 @@ lbl_800DF0AC: /* 800DF0C8 000DC028 80 01 00 74 */ lwz r0, 0x74(r1) /* 800DF0CC 000DC02C 7C 08 03 A6 */ mtlr r0 /* 800DF0D0 000DC030 38 21 00 70 */ addi r1, r1, 0x70 -/* 800DF0D4 000DC034 4E 80 00 20 */ blr +/* 800DF0D4 000DC034 4E 80 00 20 */ blr .global Update__11CPlasmaBeamFfR13CStateManager Update__11CPlasmaBeamFfR13CStateManager: @@ -500,7 +500,7 @@ lbl_800DF1D4: /* 800DF1D8 000DC138 81 9E 00 00 */ lwz r12, 0(r30) /* 800DF1DC 000DC13C 81 8C 00 40 */ lwz r12, 0x40(r12) /* 800DF1E0 000DC140 7D 89 03 A6 */ mtctr r12 -/* 800DF1E4 000DC144 4E 80 04 21 */ bctrl +/* 800DF1E4 000DC144 4E 80 04 21 */ bctrl /* 800DF1E8 000DC148 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800DF1EC 000DC14C 40 82 00 90 */ bne lbl_800DF27C /* 800DF1F0 000DC150 7F C3 F3 78 */ mr r3, r30 @@ -549,7 +549,7 @@ lbl_800DF27C: /* 800DF28C 000DC1EC 83 C1 00 18 */ lwz r30, 0x18(r1) /* 800DF290 000DC1F0 7C 08 03 A6 */ mtlr r0 /* 800DF294 000DC1F4 38 21 00 30 */ addi r1, r1, 0x30 -/* 800DF298 000DC1F8 4E 80 00 20 */ blr +/* 800DF298 000DC1F8 4E 80 00 20 */ blr .global UpdateGunFx__11CPlasmaBeamFbfRC13CStateManagerRC12CTransform4f UpdateGunFx__11CPlasmaBeamFbfRC13CStateManagerRC12CTransform4f: @@ -573,7 +573,7 @@ UpdateGunFx__11CPlasmaBeamFbfRC13CStateManagerRC12CTransform4f: /* 800DF2E0 000DC240 81 83 00 00 */ lwz r12, 0(r3) /* 800DF2E4 000DC244 81 8C 00 58 */ lwz r12, 0x58(r12) /* 800DF2E8 000DC248 7D 89 03 A6 */ mtctr r12 -/* 800DF2EC 000DC24C 4E 80 04 21 */ bctrl +/* 800DF2EC 000DC24C 4E 80 04 21 */ bctrl /* 800DF2F0 000DC250 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800DF2F4 000DC254 41 82 00 0C */ beq lbl_800DF300 /* 800DF2F8 000DC258 38 00 00 00 */ li r0, 0 @@ -590,7 +590,7 @@ lbl_800DF300: /* 800DF320 000DC280 81 83 00 00 */ lwz r12, 0(r3) /* 800DF324 000DC284 81 8C 00 18 */ lwz r12, 0x18(r12) /* 800DF328 000DC288 7D 89 03 A6 */ mtctr r12 -/* 800DF32C 000DC28C 4E 80 04 21 */ bctrl +/* 800DF32C 000DC28C 4E 80 04 21 */ bctrl /* 800DF330 000DC290 83 FB 02 28 */ lwz r31, 0x228(r27) /* 800DF334 000DC294 7F C4 F3 78 */ mr r4, r30 /* 800DF338 000DC298 38 61 00 14 */ addi r3, r1, 0x14 @@ -600,13 +600,13 @@ lbl_800DF300: /* 800DF348 000DC2A8 81 9F 00 00 */ lwz r12, 0(r31) /* 800DF34C 000DC2AC 81 8C 00 14 */ lwz r12, 0x14(r12) /* 800DF350 000DC2B0 7D 89 03 A6 */ mtctr r12 -/* 800DF354 000DC2B4 4E 80 04 21 */ bctrl +/* 800DF354 000DC2B4 4E 80 04 21 */ bctrl /* 800DF358 000DC2B8 80 7B 02 28 */ lwz r3, 0x228(r27) /* 800DF35C 000DC2BC FC 20 F8 90 */ fmr f1, f31 /* 800DF360 000DC2C0 81 83 00 00 */ lwz r12, 0(r3) /* 800DF364 000DC2C4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800DF368 000DC2C8 7D 89 03 A6 */ mtctr r12 -/* 800DF36C 000DC2CC 4E 80 04 21 */ bctrl +/* 800DF36C 000DC2CC 4E 80 04 21 */ bctrl lbl_800DF370: /* 800DF370 000DC2D0 FC 20 F8 90 */ fmr f1, f31 /* 800DF374 000DC2D4 7F 63 DB 78 */ mr r3, r27 @@ -620,7 +620,7 @@ lbl_800DF370: /* 800DF394 000DC2F4 80 01 00 74 */ lwz r0, 0x74(r1) /* 800DF398 000DC2F8 7C 08 03 A6 */ mtlr r0 /* 800DF39C 000DC2FC 38 21 00 70 */ addi r1, r1, 0x70 -/* 800DF3A0 000DC300 4E 80 00 20 */ blr +/* 800DF3A0 000DC300 4E 80 00 20 */ blr .global PostRenderGunFx__11CPlasmaBeamFRC13CStateManagerRC12CTransform4f PostRenderGunFx__11CPlasmaBeamFRC13CStateManagerRC12CTransform4f: @@ -642,7 +642,7 @@ PostRenderGunFx__11CPlasmaBeamFRC13CStateManagerRC12CTransform4f: /* 800DF3E0 000DC340 81 83 00 00 */ lwz r12, 0(r3) /* 800DF3E4 000DC344 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800DF3E8 000DC348 7D 89 03 A6 */ mtctr r12 -/* 800DF3EC 000DC34C 4E 80 04 21 */ bctrl +/* 800DF3EC 000DC34C 4E 80 04 21 */ bctrl lbl_800DF3F0: /* 800DF3F0 000DC350 7F A3 EB 78 */ mr r3, r29 /* 800DF3F4 000DC354 7F C4 F3 78 */ mr r4, r30 @@ -654,7 +654,7 @@ lbl_800DF3F0: /* 800DF40C 000DC36C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 800DF410 000DC370 7C 08 03 A6 */ mtlr r0 /* 800DF414 000DC374 38 21 00 20 */ addi r1, r1, 0x20 -/* 800DF418 000DC378 4E 80 00 20 */ blr +/* 800DF418 000DC378 4E 80 00 20 */ blr .global IsFiring__11CPlasmaBeamCFRC13CStateManager IsFiring__11CPlasmaBeamCFRC13CStateManager: @@ -663,7 +663,7 @@ IsFiring__11CPlasmaBeamCFRC13CStateManager: /* 800DF424 000DC384 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800DF428 000DC388 7C 00 00 26 */ mfcr r0 /* 800DF42C 000DC38C 54 03 17 FE */ rlwinm r3, r0, 2, 0x1f, 0x1f -/* 800DF430 000DC390 4E 80 00 20 */ blr +/* 800DF430 000DC390 4E 80 00 20 */ blr .global ReInitVariables__11CPlasmaBeamFv ReInitVariables__11CPlasmaBeamFv: @@ -679,7 +679,7 @@ ReInitVariables__11CPlasmaBeamFv: /* 800DF458 000DC3B8 38 80 00 01 */ li r4, 1 /* 800DF45C 000DC3BC 81 8C 00 08 */ lwz r12, 8(r12) /* 800DF460 000DC3C0 7D 89 03 A6 */ mtctr r12 -/* 800DF464 000DC3C4 4E 80 04 21 */ bctrl +/* 800DF464 000DC3C4 4E 80 04 21 */ bctrl lbl_800DF468: /* 800DF468 000DC3C8 38 60 00 00 */ li r3, 0 /* 800DF46C 000DC3CC 90 7F 02 28 */ stw r3, 0x228(r31) @@ -694,7 +694,7 @@ lbl_800DF468: .global sub_800df490 sub_800df490: -/* 800DF490 000DC3F0 4E 80 00 20 */ blr +/* 800DF490 000DC3F0 4E 80 00 20 */ blr .global __dt__11CPlasmaBeamFv __dt__11CPlasmaBeamFv: @@ -718,7 +718,7 @@ __dt__11CPlasmaBeamFv: /* 800DF4D8 000DC438 38 80 00 01 */ li r4, 1 /* 800DF4DC 000DC43C 81 8C 00 08 */ lwz r12, 8(r12) /* 800DF4E0 000DC440 7D 89 03 A6 */ mtctr r12 -/* 800DF4E4 000DC444 4E 80 04 21 */ bctrl +/* 800DF4E4 000DC444 4E 80 04 21 */ bctrl lbl_800DF4E8: /* 800DF4E8 000DC448 34 1E 02 1C */ addic. r0, r30, 0x21c /* 800DF4EC 000DC44C 41 82 00 18 */ beq lbl_800DF504 @@ -742,7 +742,7 @@ lbl_800DF520: /* 800DF52C 000DC48C 83 C1 00 08 */ lwz r30, 8(r1) /* 800DF530 000DC490 7C 08 03 A6 */ mtlr r0 /* 800DF534 000DC494 38 21 00 10 */ addi r1, r1, 0x10 -/* 800DF538 000DC498 4E 80 00 20 */ blr +/* 800DF538 000DC498 4E 80 00 20 */ blr .global __ct__11CPlasmaBeamFUi11EWeaponType9TUniqueId14EMaterialTypesRC9CVector3f __ct__11CPlasmaBeamFUi11EWeaponType9TUniqueId14EMaterialTypesRC9CVector3f: @@ -767,7 +767,7 @@ __ct__11CPlasmaBeamFUi11EWeaponType9TUniqueId14EMaterialTypesRC9CVector3f: /* 800DF584 000DC4E4 81 84 00 00 */ lwz r12, 0(r4) /* 800DF588 000DC4E8 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800DF58C 000DC4EC 7D 89 03 A6 */ mtctr r12 -/* 800DF590 000DC4F0 4E 80 04 21 */ bctrl +/* 800DF590 000DC4F0 4E 80 04 21 */ bctrl /* 800DF594 000DC4F4 3B DF 02 1C */ addi r30, r31, 0x21c /* 800DF598 000DC4F8 38 81 00 0C */ addi r4, r1, 0xc /* 800DF59C 000DC4FC 7F C3 F3 78 */ mr r3, r30 @@ -797,7 +797,7 @@ __ct__11CPlasmaBeamFUi11EWeaponType9TUniqueId14EMaterialTypesRC9CVector3f: /* 800DF5FC 000DC55C 80 01 00 24 */ lwz r0, 0x24(r1) /* 800DF600 000DC560 7C 08 03 A6 */ mtlr r0 /* 800DF604 000DC564 38 21 00 20 */ addi r1, r1, 0x20 -/* 800DF608 000DC568 4E 80 00 20 */ blr +/* 800DF608 000DC568 4E 80 00 20 */ blr .global __sinit_CPlasmaBeam_cpp __sinit_CPlasmaBeam_cpp: @@ -838,4 +838,4 @@ lbl_800DF688: /* 800DF688 000DC5E8 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 800DF68C 000DC5EC 7C 08 03 A6 */ mtlr r0 /* 800DF690 000DC5F0 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 800DF694 000DC5F4 4E 80 00 20 */ blr +/* 800DF694 000DC5F4 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/Weapons/CPlasmaProjectile.s b/asm/MetroidPrime/Weapons/CPlasmaProjectile.s index d7a9739e..6549204b 100644 --- a/asm/MetroidPrime/Weapons/CPlasmaProjectile.s +++ b/asm/MetroidPrime/Weapons/CPlasmaProjectile.s @@ -94,7 +94,7 @@ lbl_80176BB0: /* 80176BC8 00173B28 38 80 00 01 */ li r4, 1 /* 80176BCC 00173B2C 81 8C 00 08 */ lwz r12, 8(r12) /* 80176BD0 00173B30 7D 89 03 A6 */ mtctr r12 -/* 80176BD4 00173B34 4E 80 04 21 */ bctrl +/* 80176BD4 00173B34 4E 80 04 21 */ bctrl lbl_80176BD8: /* 80176BD8 00173B38 34 1E 05 1C */ addic. r0, r30, 0x51c /* 80176BDC 00173B3C 41 82 00 24 */ beq lbl_80176C00 @@ -105,7 +105,7 @@ lbl_80176BD8: /* 80176BF0 00173B50 38 80 00 01 */ li r4, 1 /* 80176BF4 00173B54 81 8C 00 08 */ lwz r12, 8(r12) /* 80176BF8 00173B58 7D 89 03 A6 */ mtctr r12 -/* 80176BFC 00173B5C 4E 80 04 21 */ bctrl +/* 80176BFC 00173B5C 4E 80 04 21 */ bctrl lbl_80176C00: /* 80176C00 00173B60 34 1E 05 18 */ addic. r0, r30, 0x518 /* 80176C04 00173B64 41 82 00 24 */ beq lbl_80176C28 @@ -116,7 +116,7 @@ lbl_80176C00: /* 80176C18 00173B78 38 80 00 01 */ li r4, 1 /* 80176C1C 00173B7C 81 8C 00 08 */ lwz r12, 8(r12) /* 80176C20 00173B80 7D 89 03 A6 */ mtctr r12 -/* 80176C24 00173B84 4E 80 04 21 */ bctrl +/* 80176C24 00173B84 4E 80 04 21 */ bctrl lbl_80176C28: /* 80176C28 00173B88 34 1E 05 0C */ addic. r0, r30, 0x50c /* 80176C2C 00173B8C 41 82 00 18 */ beq lbl_80176C44 @@ -185,7 +185,7 @@ lbl_80176CFC: /* 80176D08 00173C68 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80176D0C 00173C6C 7C 08 03 A6 */ mtlr r0 /* 80176D10 00173C70 38 21 00 20 */ addi r1, r1, 0x20 -/* 80176D14 00173C74 4E 80 00 20 */ blr +/* 80176D14 00173C74 4E 80 00 20 */ blr .global __dt__15CBeamProjectileFv __dt__15CBeamProjectileFv: @@ -270,7 +270,7 @@ lbl_80176E18: /* 80176E24 00173D84 83 C1 00 08 */ lwz r30, 8(r1) /* 80176E28 00173D88 7C 08 03 A6 */ mtlr r0 /* 80176E2C 00173D8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80176E30 00173D90 4E 80 00 20 */ blr +/* 80176E30 00173D90 4E 80 00 20 */ blr .global sub_80176e34 sub_80176e34: @@ -295,12 +295,12 @@ sub_80176e34: /* 80176E7C 00173DDC D0 03 04 AC */ stfs f0, 0x4ac(r3) /* 80176E80 00173DE0 88 04 00 18 */ lbz r0, 0x18(r4) /* 80176E84 00173DE4 98 03 04 B0 */ stb r0, 0x4b0(r3) -/* 80176E88 00173DE8 4E 80 00 20 */ blr +/* 80176E88 00173DE8 4E 80 00 20 */ blr lbl_80176E8C: /* 80176E8C 00173DEC 80 03 04 78 */ lwz r0, 0x478(r3) /* 80176E90 00173DF0 54 00 07 76 */ rlwinm r0, r0, 0, 0x1d, 0x1b /* 80176E94 00173DF4 90 03 04 78 */ stw r0, 0x478(r3) -/* 80176E98 00173DF8 4E 80 00 20 */ blr +/* 80176E98 00173DF8 4E 80 00 20 */ blr .global UpdateLights__17CPlasmaProjectileFffR13CStateManager UpdateLights__17CPlasmaProjectileFffR13CStateManager: @@ -325,7 +325,7 @@ UpdateLights__17CPlasmaProjectileFffR13CStateManager: /* 80176EE4 00173E44 81 83 00 00 */ lwz r12, 0(r3) /* 80176EE8 00173E48 81 8C 00 64 */ lwz r12, 0x64(r12) /* 80176EEC 00173E4C 7D 89 03 A6 */ mtctr r12 -/* 80176EF0 00173E50 4E 80 04 21 */ bctrl +/* 80176EF0 00173E50 4E 80 04 21 */ bctrl /* 80176EF4 00173E54 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80176EF8 00173E58 41 82 01 34 */ beq lbl_8017702C /* 80176EFC 00173E5C 80 7E 05 20 */ lwz r3, 0x520(r30) @@ -333,13 +333,13 @@ UpdateLights__17CPlasmaProjectileFffR13CStateManager: /* 80176F04 00173E64 81 83 00 00 */ lwz r12, 0(r3) /* 80176F08 00173E68 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80176F0C 00173E6C 7D 89 03 A6 */ mtctr r12 -/* 80176F10 00173E70 4E 80 04 21 */ bctrl +/* 80176F10 00173E70 4E 80 04 21 */ bctrl /* 80176F14 00173E74 80 9E 05 20 */ lwz r4, 0x520(r30) /* 80176F18 00173E78 38 61 00 30 */ addi r3, r1, 0x30 /* 80176F1C 00173E7C 81 84 00 00 */ lwz r12, 0(r4) /* 80176F20 00173E80 81 8C 00 68 */ lwz r12, 0x68(r12) /* 80176F24 00173E84 7D 89 03 A6 */ mtctr r12 -/* 80176F28 00173E88 4E 80 04 21 */ bctrl +/* 80176F28 00173E88 4E 80 04 21 */ bctrl /* 80176F2C 00173E8C 38 61 00 80 */ addi r3, r1, 0x80 /* 80176F30 00173E90 38 81 00 30 */ addi r4, r1, 0x30 /* 80176F34 00173E94 4B EC 46 3D */ bl __ct__6CLightFCR6CLight @@ -419,7 +419,7 @@ lbl_8017702C: /* 8017704C 00173FAC 83 81 00 D0 */ lwz r28, 0xd0(r1) /* 80177050 00173FB0 7C 08 03 A6 */ mtlr r0 /* 80177054 00173FB4 38 21 01 00 */ addi r1, r1, 0x100 -/* 80177058 00173FB8 4E 80 00 20 */ blr +/* 80177058 00173FB8 4E 80 00 20 */ blr .global DeletePlasmaLights__17CPlasmaProjectileFR13CStateManager DeletePlasmaLights__17CPlasmaProjectileFR13CStateManager: @@ -483,7 +483,7 @@ lbl_8017711C: /* 80177128 00174088 83 A1 00 34 */ lwz r29, 0x34(r1) /* 8017712C 0017408C 7C 08 03 A6 */ mtlr r0 /* 80177130 00174090 38 21 00 40 */ addi r1, r1, 0x40 -/* 80177134 00174094 4E 80 00 20 */ blr +/* 80177134 00174094 4E 80 00 20 */ blr .global CreatePlasmaLights__17CPlasmaProjectileFUiRC6CLightR13CStateManager CreatePlasmaLights__17CPlasmaProjectileFUiRC6CLightR13CStateManager: @@ -582,7 +582,7 @@ lbl_80177270: /* 80177294 001741F4 80 01 00 64 */ lwz r0, 0x64(r1) /* 80177298 001741F8 7C 08 03 A6 */ mtlr r0 /* 8017729C 001741FC 38 21 00 60 */ addi r1, r1, 0x60 -/* 801772A0 00174200 4E 80 00 20 */ blr +/* 801772A0 00174200 4E 80 00 20 */ blr .global SetLightsActive__17CPlasmaProjectileFbR13CStateManager SetLightsActive__17CPlasmaProjectileFbR13CStateManager: @@ -617,7 +617,7 @@ lbl_801772D4: /* 80177310 00174270 7F C4 F3 78 */ mr r4, r30 /* 80177314 00174274 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80177318 00174278 7D 89 03 A6 */ mtctr r12 -/* 8017731C 0017427C 4E 80 04 21 */ bctrl +/* 8017731C 0017427C 4E 80 04 21 */ bctrl lbl_80177320: /* 80177320 00174280 3B FF 00 02 */ addi r31, r31, 2 lbl_80177324: @@ -634,7 +634,7 @@ lbl_80177324: /* 8017734C 001742AC 83 81 00 20 */ lwz r28, 0x20(r1) /* 80177350 001742B0 7C 08 03 A6 */ mtlr r0 /* 80177354 001742B4 38 21 00 30 */ addi r1, r1, 0x30 -/* 80177358 001742B8 4E 80 00 20 */ blr +/* 80177358 001742B8 4E 80 00 20 */ blr .global AcceptScriptMsg__17CPlasmaProjectileF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__17CPlasmaProjectileF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -691,7 +691,7 @@ lbl_8017740C: /* 8017741C 0017437C 38 80 00 01 */ li r4, 1 /* 80177420 00174380 81 8C 00 08 */ lwz r12, 8(r12) /* 80177424 00174384 7D 89 03 A6 */ mtctr r12 -/* 80177428 00174388 4E 80 04 21 */ bctrl +/* 80177428 00174388 4E 80 04 21 */ bctrl lbl_8017742C: /* 8017742C 0017438C 7F 40 07 75 */ extsb. r0, r26 /* 80177430 00174390 93 7C 05 20 */ stw r27, 0x520(r28) @@ -706,7 +706,7 @@ lbl_80177444: /* 80177450 001743B0 81 83 00 00 */ lwz r12, 0(r3) /* 80177454 001743B4 81 8C 00 64 */ lwz r12, 0x64(r12) /* 80177458 001743B8 7D 89 03 A6 */ mtctr r12 -/* 8017745C 001743BC 4E 80 04 21 */ bctrl +/* 8017745C 001743BC 4E 80 04 21 */ bctrl /* 80177460 001743C0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80177464 001743C4 41 82 00 3C */ beq lbl_801774A0 /* 80177468 001743C8 80 9C 05 20 */ lwz r4, 0x520(r28) @@ -716,7 +716,7 @@ lbl_80177444: /* 80177478 001743D8 83 65 00 08 */ lwz r27, 8(r5) /* 8017747C 001743DC 81 8C 00 68 */ lwz r12, 0x68(r12) /* 80177480 001743E0 7D 89 03 A6 */ mtctr r12 -/* 80177484 001743E4 4E 80 04 21 */ bctrl +/* 80177484 001743E4 4E 80 04 21 */ bctrl /* 80177488 001743E8 7F 83 E3 78 */ mr r3, r28 /* 8017748C 001743EC 7F 64 DB 78 */ mr r4, r27 /* 80177490 001743F0 7F E6 FB 78 */ mr r6, r31 @@ -731,7 +731,7 @@ lbl_801774A0: /* 801774B0 00174410 38 80 00 01 */ li r4, 1 /* 801774B4 00174414 81 8C 00 08 */ lwz r12, 8(r12) /* 801774B8 00174418 7D 89 03 A6 */ mtctr r12 -/* 801774BC 0017441C 4E 80 04 21 */ bctrl +/* 801774BC 0017441C 4E 80 04 21 */ bctrl lbl_801774C0: /* 801774C0 00174420 38 00 00 00 */ li r0, 0 /* 801774C4 00174424 90 1C 05 20 */ stw r0, 0x520(r28) @@ -787,7 +787,7 @@ lbl_8017755C: /* 8017757C 001744DC 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 80177580 001744E0 7C 08 03 A6 */ mtlr r0 /* 80177584 001744E4 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 80177588 001744E8 4E 80 00 20 */ blr +/* 80177588 001744E8 4E 80 00 20 */ blr .global RenderMotionBlur__17CPlasmaProjectileCFv RenderMotionBlur__17CPlasmaProjectileCFv: @@ -814,12 +814,12 @@ RenderMotionBlur__17CPlasmaProjectileCFv: /* 801775DC 0017453C 81 83 00 00 */ lwz r12, 0(r3) /* 801775E0 00174540 81 8C 00 30 */ lwz r12, 0x30(r12) /* 801775E4 00174544 7D 89 03 A6 */ mtctr r12 -/* 801775E8 00174548 4E 80 04 21 */ bctrl +/* 801775E8 00174548 4E 80 04 21 */ bctrl /* 801775EC 0017454C 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 801775F0 00174550 81 83 00 00 */ lwz r12, 0(r3) /* 801775F4 00174554 81 8C 00 68 */ lwz r12, 0x68(r12) /* 801775F8 00174558 7D 89 03 A6 */ mtctr r12 -/* 801775FC 0017455C 4E 80 04 21 */ bctrl +/* 801775FC 0017455C 4E 80 04 21 */ bctrl /* 80177600 00174560 C0 22 A1 C4 */ lfs f1, lbl_805ABEE4@sda21(r2) /* 80177604 00174564 C0 1A 04 C4 */ lfs f0, 0x4c4(r26) /* 80177608 00174568 80 1A 04 94 */ lwz r0, 0x494(r26) @@ -914,7 +914,7 @@ lbl_801776D0: /* 80177768 001746C8 80 01 00 84 */ lwz r0, 0x84(r1) /* 8017776C 001746CC 7C 08 03 A6 */ mtlr r0 /* 80177770 001746D0 38 21 00 80 */ addi r1, r1, 0x80 -/* 80177774 001746D4 4E 80 00 20 */ blr +/* 80177774 001746D4 4E 80 00 20 */ blr .global UpdateEnergyPulse__17CPlasmaProjectileFf UpdateEnergyPulse__17CPlasmaProjectileFf: @@ -961,7 +961,7 @@ lbl_801777D4: /* 80177810 00174770 81 83 00 00 */ lwz r12, 0(r3) /* 80177814 00174774 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80177818 00174778 7D 89 03 A6 */ mtctr r12 -/* 8017781C 0017477C 4E 80 04 21 */ bctrl +/* 8017781C 0017477C 4E 80 04 21 */ bctrl /* 80177820 00174780 C0 3F 03 04 */ lfs f1, 0x304(r31) /* 80177824 00174784 C0 1F 02 EC */ lfs f0, 0x2ec(r31) /* 80177828 00174788 C3 82 A1 C0 */ lfs f28, lbl_805ABEE0@sda21(r2) @@ -984,7 +984,7 @@ lbl_8017783C: /* 80177868 001747C8 81 83 00 00 */ lwz r12, 0(r3) /* 8017786C 001747CC 81 8C 00 18 */ lwz r12, 0x18(r12) /* 80177870 001747D0 7D 89 03 A6 */ mtctr r12 -/* 80177874 001747D4 4E 80 04 21 */ bctrl +/* 80177874 001747D4 4E 80 04 21 */ bctrl /* 80177878 001747D8 80 7F 05 1C */ lwz r3, 0x51c(r31) /* 8017787C 001747DC 38 80 00 01 */ li r4, 1 /* 80177880 001747E0 48 1A 50 41 */ bl ForceParticleCreation__11CElementGenFi @@ -1002,14 +1002,14 @@ lbl_80177888: /* 801778A8 00174808 81 83 00 00 */ lwz r12, 0(r3) /* 801778AC 0017480C 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 801778B0 00174810 7D 89 03 A6 */ mtctr r12 -/* 801778B4 00174814 4E 80 04 21 */ bctrl +/* 801778B4 00174814 4E 80 04 21 */ bctrl lbl_801778B8: /* 801778B8 00174818 80 7F 05 1C */ lwz r3, 0x51c(r31) /* 801778BC 0017481C FC 20 D8 90 */ fmr f1, f27 /* 801778C0 00174820 81 83 00 00 */ lwz r12, 0(r3) /* 801778C4 00174824 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801778C8 00174828 7D 89 03 A6 */ mtctr r12 -/* 801778CC 0017482C 4E 80 04 21 */ bctrl +/* 801778CC 0017482C 4E 80 04 21 */ bctrl /* 801778D0 00174830 E3 E1 00 68 */ psq_l f31, 104(r1), 0, qr0 /* 801778D4 00174834 CB E1 00 60 */ lfd f31, 0x60(r1) /* 801778D8 00174838 E3 C1 00 58 */ psq_l f30, 88(r1), 0, qr0 @@ -1024,7 +1024,7 @@ lbl_801778B8: /* 801778FC 0017485C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80177900 00174860 7C 08 03 A6 */ mtlr r0 /* 80177904 00174864 38 21 00 70 */ addi r1, r1, 0x70 -/* 80177908 00174868 4E 80 00 20 */ blr +/* 80177908 00174868 4E 80 00 20 */ blr .global RenderBeam__17CPlasmaProjectileCFifRC6CColori RenderBeam__17CPlasmaProjectileCFifRC6CColori: @@ -1284,7 +1284,7 @@ lbl_80177C7C: /* 80177CC0 00174C20 80 01 00 D4 */ lwz r0, 0xd4(r1) /* 80177CC4 00174C24 7C 08 03 A6 */ mtlr r0 /* 80177CC8 00174C28 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 80177CCC 00174C2C 4E 80 00 20 */ blr +/* 80177CCC 00174C2C 4E 80 00 20 */ blr .global ResetBeam__17CPlasmaProjectileFR13CStateManagerb ResetBeam__17CPlasmaProjectileFR13CStateManagerb: @@ -1301,7 +1301,7 @@ ResetBeam__17CPlasmaProjectileFR13CStateManagerb: /* 80177CF8 00174C58 38 80 00 00 */ li r4, 0 /* 80177CFC 00174C5C 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80177D00 00174C60 7D 89 03 A6 */ mtctr r12 -/* 80177D04 00174C64 4E 80 04 21 */ bctrl +/* 80177D04 00174C64 4E 80 04 21 */ bctrl /* 80177D08 00174C68 7F C3 F3 78 */ mr r3, r30 /* 80177D0C 00174C6C 7F E5 FB 78 */ mr r5, r31 /* 80177D10 00174C70 38 80 00 00 */ li r4, 0 @@ -1325,13 +1325,13 @@ ResetBeam__17CPlasmaProjectileFR13CStateManagerb: /* 80177D58 00174CB8 81 83 00 00 */ lwz r12, 0(r3) /* 80177D5C 00174CBC 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80177D60 00174CC0 7D 89 03 A6 */ mtctr r12 -/* 80177D64 00174CC4 4E 80 04 21 */ bctrl +/* 80177D64 00174CC4 4E 80 04 21 */ bctrl /* 80177D68 00174CC8 80 7E 05 1C */ lwz r3, 0x51c(r30) /* 80177D6C 00174CCC 38 80 00 00 */ li r4, 0 /* 80177D70 00174CD0 81 83 00 00 */ lwz r12, 0(r3) /* 80177D74 00174CD4 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80177D78 00174CD8 7D 89 03 A6 */ mtctr r12 -/* 80177D7C 00174CDC 4E 80 04 21 */ bctrl +/* 80177D7C 00174CDC 4E 80 04 21 */ bctrl /* 80177D80 00174CE0 48 00 00 4C */ b lbl_80177DCC lbl_80177D84: /* 80177D84 00174CE4 88 7E 05 48 */ lbz r3, 0x548(r30) @@ -1345,20 +1345,20 @@ lbl_80177D84: /* 80177DA4 00174D04 81 83 00 00 */ lwz r12, 0(r3) /* 80177DA8 00174D08 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80177DAC 00174D0C 7D 89 03 A6 */ mtctr r12 -/* 80177DB0 00174D10 4E 80 04 21 */ bctrl +/* 80177DB0 00174D10 4E 80 04 21 */ bctrl /* 80177DB4 00174D14 80 7E 05 1C */ lwz r3, 0x51c(r30) /* 80177DB8 00174D18 38 80 00 00 */ li r4, 0 /* 80177DBC 00174D1C 81 83 00 00 */ lwz r12, 0(r3) /* 80177DC0 00174D20 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80177DC4 00174D24 7D 89 03 A6 */ mtctr r12 -/* 80177DC8 00174D28 4E 80 04 21 */ bctrl +/* 80177DC8 00174D28 4E 80 04 21 */ bctrl lbl_80177DCC: /* 80177DCC 00174D2C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80177DD0 00174D30 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80177DD4 00174D34 83 C1 00 08 */ lwz r30, 8(r1) /* 80177DD8 00174D38 7C 08 03 A6 */ mtlr r0 /* 80177DDC 00174D3C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80177DE0 00174D40 4E 80 00 20 */ blr +/* 80177DE0 00174D40 4E 80 00 20 */ blr .global Fire__17CPlasmaProjectileFRC12CTransform4fR13CStateManagerb Fire__17CPlasmaProjectileFRC12CTransform4fR13CStateManagerb: @@ -1377,7 +1377,7 @@ Fire__17CPlasmaProjectileFRC12CTransform4fR13CStateManagerb: /* 80177E14 00174D74 81 83 00 00 */ lwz r12, 0(r3) /* 80177E18 00174D78 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 80177E1C 00174D7C 7D 89 03 A6 */ mtctr r12 -/* 80177E20 00174D80 4E 80 04 21 */ bctrl +/* 80177E20 00174D80 4E 80 04 21 */ bctrl /* 80177E24 00174D84 7F 83 E3 78 */ mr r3, r28 /* 80177E28 00174D88 7F C5 F3 78 */ mr r5, r30 /* 80177E2C 00174D8C 38 80 00 01 */ li r4, 1 @@ -1452,7 +1452,7 @@ lbl_80177F2C: /* 80177F3C 00174E9C 83 81 00 10 */ lwz r28, 0x10(r1) /* 80177F40 00174EA0 7C 08 03 A6 */ mtlr r0 /* 80177F44 00174EA4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80177F48 00174EA8 4E 80 00 20 */ blr +/* 80177F48 00174EA8 4E 80 00 20 */ blr .global Render__17CPlasmaProjectileCFRC13CStateManager Render__17CPlasmaProjectileCFRC13CStateManager: @@ -1505,7 +1505,7 @@ lbl_80177FF0: /* 80177FFC 00174F5C 81 83 00 00 */ lwz r12, 0(r3) /* 80178000 00174F60 81 8C 00 60 */ lwz r12, 0x60(r12) /* 80178004 00174F64 7D 89 03 A6 */ mtctr r12 -/* 80178008 00174F68 4E 80 04 21 */ bctrl +/* 80178008 00174F68 4E 80 04 21 */ bctrl /* 8017800C 00174F6C 80 1D 04 78 */ lwz r0, 0x478(r29) /* 80178010 00174F70 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 80178014 00174F74 41 82 00 24 */ beq lbl_80178038 @@ -1523,7 +1523,7 @@ lbl_80178038: /* 80178040 00174FA0 81 83 00 00 */ lwz r12, 0(r3) /* 80178044 00174FA4 81 8C 00 30 */ lwz r12, 0x30(r12) /* 80178048 00174FA8 7D 89 03 A6 */ mtctr r12 -/* 8017804C 00174FAC 4E 80 04 21 */ bctrl +/* 8017804C 00174FAC 4E 80 04 21 */ bctrl /* 80178050 00174FB0 C0 22 A1 FC */ lfs f1, lbl_805ABF1C@sda21(r2) /* 80178054 00174FB4 38 61 00 10 */ addi r3, r1, 0x10 /* 80178058 00174FB8 C0 82 A2 00 */ lfs f4, lbl_805ABF20@sda21(r2) @@ -1554,7 +1554,7 @@ lbl_80178038: /* 801780BC 0017501C 81 83 00 00 */ lwz r12, 0(r3) /* 801780C0 00175020 81 8C 00 30 */ lwz r12, 0x30(r12) /* 801780C4 00175024 7D 89 03 A6 */ mtctr r12 -/* 801780C8 00175028 4E 80 04 21 */ bctrl +/* 801780C8 00175028 4E 80 04 21 */ bctrl /* 801780CC 0017502C C0 22 A1 E8 */ lfs f1, lbl_805ABF08@sda21(r2) /* 801780D0 00175030 7F A3 EB 78 */ mr r3, r29 /* 801780D4 00175034 C0 1D 04 B8 */ lfs f0, 0x4b8(r29) @@ -1580,7 +1580,7 @@ lbl_80178038: /* 80178124 00175084 81 83 00 00 */ lwz r12, 0(r3) /* 80178128 00175088 81 8C 00 30 */ lwz r12, 0x30(r12) /* 8017812C 0017508C 7D 89 03 A6 */ mtctr r12 -/* 80178130 00175090 4E 80 04 21 */ bctrl +/* 80178130 00175090 4E 80 04 21 */ bctrl /* 80178134 00175094 C0 3D 04 B8 */ lfs f1, 0x4b8(r29) /* 80178138 00175098 7F A3 EB 78 */ mr r3, r29 /* 8017813C 0017509C 38 BD 04 94 */ addi r5, r29, 0x494 @@ -1592,7 +1592,7 @@ lbl_80178038: /* 80178154 001750B4 81 83 00 00 */ lwz r12, 0(r3) /* 80178158 001750B8 81 8C 00 30 */ lwz r12, 0x30(r12) /* 8017815C 001750BC 7D 89 03 A6 */ mtctr r12 -/* 80178160 001750C0 4E 80 04 21 */ bctrl +/* 80178160 001750C0 4E 80 04 21 */ bctrl /* 80178164 001750C4 C0 22 A2 08 */ lfs f1, lbl_805ABF28@sda21(r2) /* 80178168 001750C8 7F A3 EB 78 */ mr r3, r29 /* 8017816C 001750CC C0 1D 04 B8 */ lfs f0, 0x4b8(r29) @@ -1608,7 +1608,7 @@ lbl_80178184: /* 80178190 001750F0 83 A1 01 14 */ lwz r29, 0x114(r1) /* 80178194 001750F4 7C 08 03 A6 */ mtlr r0 /* 80178198 001750F8 38 21 01 20 */ addi r1, r1, 0x120 -/* 8017819C 001750FC 4E 80 00 20 */ blr +/* 8017819C 001750FC 4E 80 00 20 */ blr .global AddToRenderer__17CPlasmaProjectileCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__17CPlasmaProjectileCFRC14CFrustumPlanesRC13CStateManager: @@ -1627,7 +1627,7 @@ AddToRenderer__17CPlasmaProjectileCFRC14CFrustumPlanesRC13CStateManager: /* 801781D0 00175130 81 83 00 00 */ lwz r12, 0(r3) /* 801781D4 00175134 81 8C 00 34 */ lwz r12, 0x34(r12) /* 801781D8 00175138 7D 89 03 A6 */ mtctr r12 -/* 801781DC 0017513C 4E 80 04 21 */ bctrl +/* 801781DC 0017513C 4E 80 04 21 */ bctrl /* 801781E0 00175140 80 1E 04 78 */ lwz r0, 0x478(r30) /* 801781E4 00175144 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 801781E8 00175148 41 82 00 1C */ beq lbl_80178204 @@ -1636,7 +1636,7 @@ AddToRenderer__17CPlasmaProjectileCFRC14CFrustumPlanesRC13CStateManager: /* 801781F4 00175154 81 83 00 00 */ lwz r12, 0(r3) /* 801781F8 00175158 81 8C 00 34 */ lwz r12, 0x34(r12) /* 801781FC 0017515C 7D 89 03 A6 */ mtctr r12 -/* 80178200 00175160 4E 80 04 21 */ bctrl +/* 80178200 00175160 4E 80 04 21 */ bctrl lbl_80178204: /* 80178204 00175164 C0 5E 03 50 */ lfs f2, 0x350(r30) /* 80178208 00175168 7F C4 F3 78 */ mr r4, r30 @@ -1650,7 +1650,7 @@ lbl_80178204: /* 80178228 00175188 81 9E 00 00 */ lwz r12, 0(r30) /* 8017822C 0017518C 81 8C 00 64 */ lwz r12, 0x64(r12) /* 80178230 00175190 7D 89 03 A6 */ mtctr r12 -/* 80178234 00175194 4E 80 04 21 */ bctrl +/* 80178234 00175194 4E 80 04 21 */ bctrl /* 80178238 00175198 7F C3 F3 78 */ mr r3, r30 /* 8017823C 0017519C 7F E4 FB 78 */ mr r4, r31 /* 80178240 001751A0 38 A1 00 08 */ addi r5, r1, 8 @@ -1661,12 +1661,12 @@ lbl_80178204: /* 80178254 001751B4 83 C1 00 38 */ lwz r30, 0x38(r1) /* 80178258 001751B8 7C 08 03 A6 */ mtlr r0 /* 8017825C 001751BC 38 21 00 40 */ addi r1, r1, 0x40 -/* 80178260 001751C0 4E 80 00 20 */ blr +/* 80178260 001751C0 4E 80 00 20 */ blr .global CanRenderUnsorted__17CPlasmaProjectileCFRC13CStateManager CanRenderUnsorted__17CPlasmaProjectileCFRC13CStateManager: /* 80178264 001751C4 38 60 00 00 */ li r3, 0 -/* 80178268 001751C8 4E 80 00 20 */ blr +/* 80178268 001751C8 4E 80 00 20 */ blr .global UpdateFx__17CPlasmaProjectileFRC12CTransform4ffR13CStateManager UpdateFx__17CPlasmaProjectileFRC12CTransform4ffR13CStateManager: @@ -1822,7 +1822,7 @@ lbl_80178434: /* 80178490 001753F0 81 9E 00 00 */ lwz r12, 0(r30) /* 80178494 001753F4 81 8C 00 14 */ lwz r12, 0x14(r12) /* 80178498 001753F8 7D 89 03 A6 */ mtctr r12 -/* 8017849C 001753FC 4E 80 04 21 */ bctrl +/* 8017849C 001753FC 4E 80 04 21 */ bctrl /* 801784A0 00175400 C0 62 A2 0C */ lfs f3, lbl_805ABF2C@sda21(r2) /* 801784A4 00175404 38 81 00 14 */ addi r4, r1, 0x14 /* 801784A8 00175408 C0 5D 03 10 */ lfs f2, 0x310(r29) @@ -1847,13 +1847,13 @@ lbl_80178434: /* 801784F4 00175454 D0 81 00 10 */ stfs f4, 0x10(r1) /* 801784F8 00175458 81 8C 00 18 */ lwz r12, 0x18(r12) /* 801784FC 0017545C 7D 89 03 A6 */ mtctr r12 -/* 80178500 00175460 4E 80 04 21 */ bctrl +/* 80178500 00175460 4E 80 04 21 */ bctrl /* 80178504 00175464 80 7D 05 18 */ lwz r3, 0x518(r29) /* 80178508 00175468 38 80 00 01 */ li r4, 1 /* 8017850C 0017546C 81 83 00 00 */ lwz r12, 0(r3) /* 80178510 00175470 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80178514 00175474 7D 89 03 A6 */ mtctr r12 -/* 80178518 00175478 4E 80 04 21 */ bctrl +/* 80178518 00175478 4E 80 04 21 */ bctrl /* 8017851C 0017547C C0 02 A1 E4 */ lfs f0, lbl_805ABF04@sda21(r2) /* 80178520 00175480 D0 1D 04 D4 */ stfs f0, 0x4d4(r29) /* 80178524 00175484 48 00 00 1C */ b lbl_80178540 @@ -1863,14 +1863,14 @@ lbl_80178528: /* 80178530 00175490 81 83 00 00 */ lwz r12, 0(r3) /* 80178534 00175494 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80178538 00175498 7D 89 03 A6 */ mtctr r12 -/* 8017853C 0017549C 4E 80 04 21 */ bctrl +/* 8017853C 0017549C 4E 80 04 21 */ bctrl lbl_80178540: /* 80178540 001754A0 80 7D 05 18 */ lwz r3, 0x518(r29) /* 80178544 001754A4 FC 20 F8 90 */ fmr f1, f31 /* 80178548 001754A8 81 83 00 00 */ lwz r12, 0(r3) /* 8017854C 001754AC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80178550 001754B0 7D 89 03 A6 */ mtctr r12 -/* 80178554 001754B4 4E 80 04 21 */ bctrl +/* 80178554 001754B4 4E 80 04 21 */ bctrl lbl_80178558: /* 80178558 001754B8 FC 20 F8 90 */ fmr f1, f31 /* 8017855C 001754BC 7F A3 EB 78 */ mr r3, r29 @@ -1923,7 +1923,7 @@ lbl_801785F0: /* 8017860C 0017556C 83 A1 00 54 */ lwz r29, 0x54(r1) /* 80178610 00175570 7C 08 03 A6 */ mtlr r0 /* 80178614 00175574 38 21 00 80 */ addi r1, r1, 0x80 -/* 80178618 00175578 4E 80 00 20 */ blr +/* 80178618 00175578 4E 80 00 20 */ blr .global UpdatePlayerEffects__17CPlasmaProjectileFfR13CStateManager UpdatePlayerEffects__17CPlasmaProjectileFfR13CStateManager: @@ -2149,7 +2149,7 @@ lbl_80178948: /* 8017895C 001758BC 83 A1 00 B4 */ lwz r29, 0xb4(r1) /* 80178960 001758C0 7C 08 03 A6 */ mtlr r0 /* 80178964 001758C4 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 80178968 001758C8 4E 80 00 20 */ blr +/* 80178968 001758C8 4E 80 00 20 */ blr .global "MakeBillboardEffect__17CPlasmaProjectileFRCQ24rstl44optional_object<25TToken<15CGenDescription>>RCQ24rstl49optional_object<30TToken<20CElectricDescription>>RCQ24rstl66basic_string,Q24rstl17rmemory_allocator>R13CStateManager" "MakeBillboardEffect__17CPlasmaProjectileFRCQ24rstl44optional_object<25TToken<15CGenDescription>>RCQ24rstl49optional_object<30TToken<20CElectricDescription>>RCQ24rstl66basic_string,Q24rstl17rmemory_allocator>R13CStateManager": @@ -2216,7 +2216,7 @@ lbl_80178A48: /* 80178A58 001759B8 80 01 00 64 */ lwz r0, 0x64(r1) /* 80178A5C 001759BC 7C 08 03 A6 */ mtlr r0 /* 80178A60 001759C0 38 21 00 60 */ addi r1, r1, 0x60 -/* 80178A64 001759C4 4E 80 00 20 */ blr +/* 80178A64 001759C4 4E 80 00 20 */ blr .global UpdateBeamState__17CPlasmaProjectileFfR13CStateManager UpdateBeamState__17CPlasmaProjectileFfR13CStateManager: @@ -2313,7 +2313,7 @@ lbl_80178B90: /* 80178BAC 00175B0C 81 9E 00 00 */ lwz r12, 0(r30) /* 80178BB0 00175B10 81 8C 00 74 */ lwz r12, 0x74(r12) /* 80178BB4 00175B14 7D 89 03 A6 */ mtctr r12 -/* 80178BB8 00175B18 4E 80 04 21 */ bctrl +/* 80178BB8 00175B18 4E 80 04 21 */ bctrl lbl_80178BBC: /* 80178BBC 00175B1C C0 5E 04 C0 */ lfs f2, 0x4c0(r30) /* 80178BC0 00175B20 C0 22 A2 28 */ lfs f1, lbl_805ABF48@sda21(r2) @@ -2326,11 +2326,11 @@ lbl_80178BBC: /* 80178BDC 00175B3C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80178BE0 00175B40 7C 08 03 A6 */ mtlr r0 /* 80178BE4 00175B44 38 21 00 10 */ addi r1, r1, 0x10 -/* 80178BE8 00175B48 4E 80 00 20 */ blr +/* 80178BE8 00175B48 4E 80 00 20 */ blr .global Touch__17CPlasmaProjectileFR6CActorR13CStateManager Touch__17CPlasmaProjectileFR6CActorR13CStateManager: -/* 80178BEC 00175B4C 4E 80 00 20 */ blr +/* 80178BEC 00175B4C 4E 80 00 20 */ blr .global Accept__17CPlasmaProjectileFR8IVisitor Accept__17CPlasmaProjectileFR8IVisitor: @@ -2343,11 +2343,11 @@ Accept__17CPlasmaProjectileFR8IVisitor: /* 80178C08 00175B68 7C 04 03 78 */ mr r4, r0 /* 80178C0C 00175B6C 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 80178C10 00175B70 7D 89 03 A6 */ mtctr r12 -/* 80178C14 00175B74 4E 80 04 21 */ bctrl +/* 80178C14 00175B74 4E 80 04 21 */ bctrl /* 80178C18 00175B78 80 01 00 14 */ lwz r0, 0x14(r1) /* 80178C1C 00175B7C 7C 08 03 A6 */ mtlr r0 /* 80178C20 00175B80 38 21 00 10 */ addi r1, r1, 0x10 -/* 80178C24 00175B84 4E 80 00 20 */ blr +/* 80178C24 00175B84 4E 80 00 20 */ blr .global "__ct__17CPlasmaProjectileFRC28TToken<18CWeaponDescription>RCQ24rstl66basic_string,Q24rstl17rmemory_allocator>11EWeaponTypeRC9CBeamInfoRC12CTransform4f14EMaterialTypesRC11CDamageInfo9TUniqueId9TUniqueIdbUi" "__ct__17CPlasmaProjectileFRC28TToken<18CWeaponDescription>RCQ24rstl66basic_string,Q24rstl17rmemory_allocator>11EWeaponTypeRC9CBeamInfoRC12CTransform4f14EMaterialTypesRC11CDamageInfo9TUniqueId9TUniqueIdbUi": @@ -2467,7 +2467,7 @@ Accept__17CPlasmaProjectileFR8IVisitor: /* 80178DEC 00175D4C 81 84 00 00 */ lwz r12, 0(r4) /* 80178DF0 00175D50 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80178DF4 00175D54 7D 89 03 A6 */ mtctr r12 -/* 80178DF8 00175D58 4E 80 04 21 */ bctrl +/* 80178DF8 00175D58 4E 80 04 21 */ bctrl /* 80178DFC 00175D5C 3B 1F 04 E8 */ addi r24, r31, 0x4e8 /* 80178E00 00175D60 38 81 00 A4 */ addi r4, r1, 0xa4 /* 80178E04 00175D64 7F 03 C3 78 */ mr r3, r24 @@ -2488,7 +2488,7 @@ Accept__17CPlasmaProjectileFR8IVisitor: /* 80178E40 00175DA0 81 84 00 00 */ lwz r12, 0(r4) /* 80178E44 00175DA4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80178E48 00175DA8 7D 89 03 A6 */ mtctr r12 -/* 80178E4C 00175DAC 4E 80 04 21 */ bctrl +/* 80178E4C 00175DAC 4E 80 04 21 */ bctrl /* 80178E50 00175DB0 3B 1F 04 F4 */ addi r24, r31, 0x4f4 /* 80178E54 00175DB4 38 81 00 94 */ addi r4, r1, 0x94 /* 80178E58 00175DB8 7F 03 C3 78 */ mr r3, r24 @@ -2509,7 +2509,7 @@ Accept__17CPlasmaProjectileFR8IVisitor: /* 80178E94 00175DF4 81 84 00 00 */ lwz r12, 0(r4) /* 80178E98 00175DF8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80178E9C 00175DFC 7D 89 03 A6 */ mtctr r12 -/* 80178EA0 00175E00 4E 80 04 21 */ bctrl +/* 80178EA0 00175E00 4E 80 04 21 */ bctrl /* 80178EA4 00175E04 3B 1F 05 00 */ addi r24, r31, 0x500 /* 80178EA8 00175E08 38 81 00 84 */ addi r4, r1, 0x84 /* 80178EAC 00175E0C 7F 03 C3 78 */ mr r3, r24 @@ -2532,7 +2532,7 @@ Accept__17CPlasmaProjectileFR8IVisitor: /* 80178EF0 00175E50 81 84 00 00 */ lwz r12, 0(r4) /* 80178EF4 00175E54 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80178EF8 00175E58 7D 89 03 A6 */ mtctr r12 -/* 80178EFC 00175E5C 4E 80 04 21 */ bctrl +/* 80178EFC 00175E5C 4E 80 04 21 */ bctrl /* 80178F00 00175E60 3B 1F 05 0C */ addi r24, r31, 0x50c /* 80178F04 00175E64 38 81 00 74 */ addi r4, r1, 0x74 /* 80178F08 00175E68 7F 03 C3 78 */ mr r3, r24 @@ -2620,7 +2620,7 @@ lbl_80178FEC: /* 80179040 00175FA0 81 84 00 00 */ lwz r12, 0(r4) /* 80179044 00175FA4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80179048 00175FA8 7D 89 03 A6 */ mtctr r12 -/* 8017904C 00175FAC 4E 80 04 21 */ bctrl +/* 8017904C 00175FAC 4E 80 04 21 */ bctrl /* 80179050 00175FB0 38 61 00 4C */ addi r3, r1, 0x4c /* 80179054 00175FB4 38 81 00 54 */ addi r4, r1, 0x54 /* 80179058 00175FB8 3B 60 00 01 */ li r27, 1 @@ -2706,7 +2706,7 @@ lbl_80179134: /* 80179170 001760D0 81 84 00 00 */ lwz r12, 0(r4) /* 80179174 001760D4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80179178 001760D8 7D 89 03 A6 */ mtctr r12 -/* 8017917C 001760DC 4E 80 04 21 */ bctrl +/* 8017917C 001760DC 4E 80 04 21 */ bctrl /* 80179180 001760E0 38 61 00 34 */ addi r3, r1, 0x34 /* 80179184 001760E4 38 81 00 3C */ addi r4, r1, 0x3c /* 80179188 001760E8 3B 00 00 01 */ li r24, 1 @@ -2816,7 +2816,7 @@ lbl_80179268: /* 80179300 00176260 81 83 00 00 */ lwz r12, 0(r3) /* 80179304 00176264 81 8C 00 24 */ lwz r12, 0x24(r12) /* 80179308 00176268 7D 89 03 A6 */ mtctr r12 -/* 8017930C 0017626C 4E 80 04 21 */ bctrl +/* 8017930C 0017626C 4E 80 04 21 */ bctrl /* 80179310 00176270 C0 1E 00 34 */ lfs f0, 0x34(r30) /* 80179314 00176274 38 81 00 B4 */ addi r4, r1, 0xb4 /* 80179318 00176278 D0 01 00 B4 */ stfs f0, 0xb4(r1) @@ -2826,25 +2826,25 @@ lbl_80179268: /* 80179328 00176288 81 83 00 00 */ lwz r12, 0(r3) /* 8017932C 0017628C 81 8C 00 24 */ lwz r12, 0x24(r12) /* 80179330 00176290 7D 89 03 A6 */ mtctr r12 -/* 80179334 00176294 4E 80 04 21 */ bctrl +/* 80179334 00176294 4E 80 04 21 */ bctrl /* 80179338 00176298 80 7F 05 18 */ lwz r3, 0x518(r31) /* 8017933C 0017629C 38 80 00 00 */ li r4, 0 /* 80179340 001762A0 81 83 00 00 */ lwz r12, 0(r3) /* 80179344 001762A4 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80179348 001762A8 7D 89 03 A6 */ mtctr r12 -/* 8017934C 001762AC 4E 80 04 21 */ bctrl +/* 8017934C 001762AC 4E 80 04 21 */ bctrl /* 80179350 001762B0 80 7F 05 1C */ lwz r3, 0x51c(r31) /* 80179354 001762B4 38 80 00 00 */ li r4, 0 /* 80179358 001762B8 81 83 00 00 */ lwz r12, 0(r3) /* 8017935C 001762BC 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80179360 001762C0 7D 89 03 A6 */ mtctr r12 -/* 80179364 001762C4 4E 80 04 21 */ bctrl +/* 80179364 001762C4 4E 80 04 21 */ bctrl /* 80179368 001762C8 7F E3 FB 78 */ mr r3, r31 /* 8017936C 001762CC BB 01 01 20 */ lmw r24, 0x120(r1) /* 80179370 001762D0 80 01 01 44 */ lwz r0, 0x144(r1) /* 80179374 001762D4 7C 08 03 A6 */ mtlr r0 /* 80179378 001762D8 38 21 01 40 */ addi r1, r1, 0x140 -/* 8017937C 001762DC 4E 80 00 20 */ blr +/* 8017937C 001762DC 4E 80 00 20 */ blr .global __sinit_CPlasmaProjectile_cpp __sinit_CPlasmaProjectile_cpp: diff --git a/asm/MetroidPrime/Weapons/CPlayerGun.s b/asm/MetroidPrime/Weapons/CPlayerGun.s index 193e1273..4544a64b 100644 --- a/asm/MetroidPrime/Weapons/CPlayerGun.s +++ b/asm/MetroidPrime/Weapons/CPlayerGun.s @@ -43,7 +43,7 @@ DrawClipCube__FRC6CAABox: /* 801B9C7C 001B6BDC 81 83 00 00 */ lwz r12, 0(r3) /* 801B9C80 001B6BE0 81 8C 00 68 */ lwz r12, 0x68(r12) /* 801B9C84 001B6BE4 7D 89 03 A6 */ mtctr r12 -/* 801B9C88 001B6BE8 4E 80 04 21 */ bctrl +/* 801B9C88 001B6BE8 4E 80 04 21 */ bctrl /* 801B9C8C 001B6BEC 38 60 00 00 */ li r3, 0 /* 801B9C90 001B6BF0 48 15 1D E1 */ bl SetCullMode__9CGraphicsF12ERglCullMode /* 801B9C94 001B6BF4 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) @@ -51,13 +51,13 @@ DrawClipCube__FRC6CAABox: /* 801B9C9C 001B6BFC 81 83 00 00 */ lwz r12, 0(r3) /* 801B9CA0 001B6C00 81 8C 00 A0 */ lwz r12, 0xa0(r12) /* 801B9CA4 001B6C04 7D 89 03 A6 */ mtctr r12 -/* 801B9CA8 001B6C08 4E 80 04 21 */ bctrl +/* 801B9CA8 001B6C08 4E 80 04 21 */ bctrl /* 801B9CAC 001B6C0C 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 801B9CB0 001B6C10 38 81 00 08 */ addi r4, r1, 8 /* 801B9CB4 001B6C14 81 83 00 00 */ lwz r12, 0(r3) /* 801B9CB8 001B6C18 81 8C 00 B4 */ lwz r12, 0xb4(r12) /* 801B9CBC 001B6C1C 7D 89 03 A6 */ mtctr r12 -/* 801B9CC0 001B6C20 4E 80 04 21 */ bctrl +/* 801B9CC0 001B6C20 4E 80 04 21 */ bctrl /* 801B9CC4 001B6C24 C0 3F 00 08 */ lfs f1, 8(r31) /* 801B9CC8 001B6C28 38 81 01 20 */ addi r4, r1, 0x120 /* 801B9CCC 001B6C2C C0 5F 00 10 */ lfs f2, 0x10(r31) @@ -69,7 +69,7 @@ DrawClipCube__FRC6CAABox: /* 801B9CE4 001B6C44 81 83 00 00 */ lwz r12, 0(r3) /* 801B9CE8 001B6C48 81 8C 00 A8 */ lwz r12, 0xa8(r12) /* 801B9CEC 001B6C4C 7D 89 03 A6 */ mtctr r12 -/* 801B9CF0 001B6C50 4E 80 04 21 */ bctrl +/* 801B9CF0 001B6C50 4E 80 04 21 */ bctrl /* 801B9CF4 001B6C54 C0 3F 00 08 */ lfs f1, 8(r31) /* 801B9CF8 001B6C58 38 81 01 14 */ addi r4, r1, 0x114 /* 801B9CFC 001B6C5C C0 5F 00 04 */ lfs f2, 4(r31) @@ -81,7 +81,7 @@ DrawClipCube__FRC6CAABox: /* 801B9D14 001B6C74 81 83 00 00 */ lwz r12, 0(r3) /* 801B9D18 001B6C78 81 8C 00 A8 */ lwz r12, 0xa8(r12) /* 801B9D1C 001B6C7C 7D 89 03 A6 */ mtctr r12 -/* 801B9D20 001B6C80 4E 80 04 21 */ bctrl +/* 801B9D20 001B6C80 4E 80 04 21 */ bctrl /* 801B9D24 001B6C84 C0 3F 00 14 */ lfs f1, 0x14(r31) /* 801B9D28 001B6C88 38 81 01 08 */ addi r4, r1, 0x108 /* 801B9D2C 001B6C8C C0 5F 00 10 */ lfs f2, 0x10(r31) @@ -93,7 +93,7 @@ DrawClipCube__FRC6CAABox: /* 801B9D44 001B6CA4 81 83 00 00 */ lwz r12, 0(r3) /* 801B9D48 001B6CA8 81 8C 00 A8 */ lwz r12, 0xa8(r12) /* 801B9D4C 001B6CAC 7D 89 03 A6 */ mtctr r12 -/* 801B9D50 001B6CB0 4E 80 04 21 */ bctrl +/* 801B9D50 001B6CB0 4E 80 04 21 */ bctrl /* 801B9D54 001B6CB4 C0 3F 00 14 */ lfs f1, 0x14(r31) /* 801B9D58 001B6CB8 38 81 00 FC */ addi r4, r1, 0xfc /* 801B9D5C 001B6CBC C0 5F 00 04 */ lfs f2, 4(r31) @@ -105,24 +105,24 @@ DrawClipCube__FRC6CAABox: /* 801B9D74 001B6CD4 81 83 00 00 */ lwz r12, 0(r3) /* 801B9D78 001B6CD8 81 8C 00 A8 */ lwz r12, 0xa8(r12) /* 801B9D7C 001B6CDC 7D 89 03 A6 */ mtctr r12 -/* 801B9D80 001B6CE0 4E 80 04 21 */ bctrl +/* 801B9D80 001B6CE0 4E 80 04 21 */ bctrl /* 801B9D84 001B6CE4 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 801B9D88 001B6CE8 81 83 00 00 */ lwz r12, 0(r3) /* 801B9D8C 001B6CEC 81 8C 00 B8 */ lwz r12, 0xb8(r12) /* 801B9D90 001B6CF0 7D 89 03 A6 */ mtctr r12 -/* 801B9D94 001B6CF4 4E 80 04 21 */ bctrl +/* 801B9D94 001B6CF4 4E 80 04 21 */ bctrl /* 801B9D98 001B6CF8 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 801B9D9C 001B6CFC 38 80 00 04 */ li r4, 4 /* 801B9DA0 001B6D00 81 83 00 00 */ lwz r12, 0(r3) /* 801B9DA4 001B6D04 81 8C 00 A0 */ lwz r12, 0xa0(r12) /* 801B9DA8 001B6D08 7D 89 03 A6 */ mtctr r12 -/* 801B9DAC 001B6D0C 4E 80 04 21 */ bctrl +/* 801B9DAC 001B6D0C 4E 80 04 21 */ bctrl /* 801B9DB0 001B6D10 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 801B9DB4 001B6D14 38 81 00 08 */ addi r4, r1, 8 /* 801B9DB8 001B6D18 81 83 00 00 */ lwz r12, 0(r3) /* 801B9DBC 001B6D1C 81 8C 00 B4 */ lwz r12, 0xb4(r12) /* 801B9DC0 001B6D20 7D 89 03 A6 */ mtctr r12 -/* 801B9DC4 001B6D24 4E 80 04 21 */ bctrl +/* 801B9DC4 001B6D24 4E 80 04 21 */ bctrl /* 801B9DC8 001B6D28 C0 3F 00 08 */ lfs f1, 8(r31) /* 801B9DCC 001B6D2C 38 81 00 F0 */ addi r4, r1, 0xf0 /* 801B9DD0 001B6D30 C0 5F 00 10 */ lfs f2, 0x10(r31) @@ -134,7 +134,7 @@ DrawClipCube__FRC6CAABox: /* 801B9DE8 001B6D48 81 83 00 00 */ lwz r12, 0(r3) /* 801B9DEC 001B6D4C 81 8C 00 A8 */ lwz r12, 0xa8(r12) /* 801B9DF0 001B6D50 7D 89 03 A6 */ mtctr r12 -/* 801B9DF4 001B6D54 4E 80 04 21 */ bctrl +/* 801B9DF4 001B6D54 4E 80 04 21 */ bctrl /* 801B9DF8 001B6D58 C0 3F 00 08 */ lfs f1, 8(r31) /* 801B9DFC 001B6D5C 38 81 00 E4 */ addi r4, r1, 0xe4 /* 801B9E00 001B6D60 C0 5F 00 10 */ lfs f2, 0x10(r31) @@ -146,7 +146,7 @@ DrawClipCube__FRC6CAABox: /* 801B9E18 001B6D78 81 83 00 00 */ lwz r12, 0(r3) /* 801B9E1C 001B6D7C 81 8C 00 A8 */ lwz r12, 0xa8(r12) /* 801B9E20 001B6D80 7D 89 03 A6 */ mtctr r12 -/* 801B9E24 001B6D84 4E 80 04 21 */ bctrl +/* 801B9E24 001B6D84 4E 80 04 21 */ bctrl /* 801B9E28 001B6D88 C0 3F 00 14 */ lfs f1, 0x14(r31) /* 801B9E2C 001B6D8C 38 81 00 D8 */ addi r4, r1, 0xd8 /* 801B9E30 001B6D90 C0 5F 00 10 */ lfs f2, 0x10(r31) @@ -158,7 +158,7 @@ DrawClipCube__FRC6CAABox: /* 801B9E48 001B6DA8 81 83 00 00 */ lwz r12, 0(r3) /* 801B9E4C 001B6DAC 81 8C 00 A8 */ lwz r12, 0xa8(r12) /* 801B9E50 001B6DB0 7D 89 03 A6 */ mtctr r12 -/* 801B9E54 001B6DB4 4E 80 04 21 */ bctrl +/* 801B9E54 001B6DB4 4E 80 04 21 */ bctrl /* 801B9E58 001B6DB8 C0 3F 00 14 */ lfs f1, 0x14(r31) /* 801B9E5C 001B6DBC 38 81 00 CC */ addi r4, r1, 0xcc /* 801B9E60 001B6DC0 C0 5F 00 10 */ lfs f2, 0x10(r31) @@ -170,24 +170,24 @@ DrawClipCube__FRC6CAABox: /* 801B9E78 001B6DD8 81 83 00 00 */ lwz r12, 0(r3) /* 801B9E7C 001B6DDC 81 8C 00 A8 */ lwz r12, 0xa8(r12) /* 801B9E80 001B6DE0 7D 89 03 A6 */ mtctr r12 -/* 801B9E84 001B6DE4 4E 80 04 21 */ bctrl +/* 801B9E84 001B6DE4 4E 80 04 21 */ bctrl /* 801B9E88 001B6DE8 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 801B9E8C 001B6DEC 81 83 00 00 */ lwz r12, 0(r3) /* 801B9E90 001B6DF0 81 8C 00 B8 */ lwz r12, 0xb8(r12) /* 801B9E94 001B6DF4 7D 89 03 A6 */ mtctr r12 -/* 801B9E98 001B6DF8 4E 80 04 21 */ bctrl +/* 801B9E98 001B6DF8 4E 80 04 21 */ bctrl /* 801B9E9C 001B6DFC 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 801B9EA0 001B6E00 38 80 00 04 */ li r4, 4 /* 801B9EA4 001B6E04 81 83 00 00 */ lwz r12, 0(r3) /* 801B9EA8 001B6E08 81 8C 00 A0 */ lwz r12, 0xa0(r12) /* 801B9EAC 001B6E0C 7D 89 03 A6 */ mtctr r12 -/* 801B9EB0 001B6E10 4E 80 04 21 */ bctrl +/* 801B9EB0 001B6E10 4E 80 04 21 */ bctrl /* 801B9EB4 001B6E14 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 801B9EB8 001B6E18 38 81 00 08 */ addi r4, r1, 8 /* 801B9EBC 001B6E1C 81 83 00 00 */ lwz r12, 0(r3) /* 801B9EC0 001B6E20 81 8C 00 B4 */ lwz r12, 0xb4(r12) /* 801B9EC4 001B6E24 7D 89 03 A6 */ mtctr r12 -/* 801B9EC8 001B6E28 4E 80 04 21 */ bctrl +/* 801B9EC8 001B6E28 4E 80 04 21 */ bctrl /* 801B9ECC 001B6E2C C0 3F 00 08 */ lfs f1, 8(r31) /* 801B9ED0 001B6E30 38 81 00 C0 */ addi r4, r1, 0xc0 /* 801B9ED4 001B6E34 C0 5F 00 10 */ lfs f2, 0x10(r31) @@ -199,7 +199,7 @@ DrawClipCube__FRC6CAABox: /* 801B9EEC 001B6E4C 81 83 00 00 */ lwz r12, 0(r3) /* 801B9EF0 001B6E50 81 8C 00 A8 */ lwz r12, 0xa8(r12) /* 801B9EF4 001B6E54 7D 89 03 A6 */ mtctr r12 -/* 801B9EF8 001B6E58 4E 80 04 21 */ bctrl +/* 801B9EF8 001B6E58 4E 80 04 21 */ bctrl /* 801B9EFC 001B6E5C C0 3F 00 08 */ lfs f1, 8(r31) /* 801B9F00 001B6E60 38 81 00 B4 */ addi r4, r1, 0xb4 /* 801B9F04 001B6E64 C0 5F 00 04 */ lfs f2, 4(r31) @@ -211,7 +211,7 @@ DrawClipCube__FRC6CAABox: /* 801B9F1C 001B6E7C 81 83 00 00 */ lwz r12, 0(r3) /* 801B9F20 001B6E80 81 8C 00 A8 */ lwz r12, 0xa8(r12) /* 801B9F24 001B6E84 7D 89 03 A6 */ mtctr r12 -/* 801B9F28 001B6E88 4E 80 04 21 */ bctrl +/* 801B9F28 001B6E88 4E 80 04 21 */ bctrl /* 801B9F2C 001B6E8C C0 3F 00 14 */ lfs f1, 0x14(r31) /* 801B9F30 001B6E90 38 81 00 A8 */ addi r4, r1, 0xa8 /* 801B9F34 001B6E94 C0 5F 00 10 */ lfs f2, 0x10(r31) @@ -223,7 +223,7 @@ DrawClipCube__FRC6CAABox: /* 801B9F4C 001B6EAC 81 83 00 00 */ lwz r12, 0(r3) /* 801B9F50 001B6EB0 81 8C 00 A8 */ lwz r12, 0xa8(r12) /* 801B9F54 001B6EB4 7D 89 03 A6 */ mtctr r12 -/* 801B9F58 001B6EB8 4E 80 04 21 */ bctrl +/* 801B9F58 001B6EB8 4E 80 04 21 */ bctrl /* 801B9F5C 001B6EBC C0 3F 00 14 */ lfs f1, 0x14(r31) /* 801B9F60 001B6EC0 38 81 00 9C */ addi r4, r1, 0x9c /* 801B9F64 001B6EC4 C0 5F 00 04 */ lfs f2, 4(r31) @@ -235,24 +235,24 @@ DrawClipCube__FRC6CAABox: /* 801B9F7C 001B6EDC 81 83 00 00 */ lwz r12, 0(r3) /* 801B9F80 001B6EE0 81 8C 00 A8 */ lwz r12, 0xa8(r12) /* 801B9F84 001B6EE4 7D 89 03 A6 */ mtctr r12 -/* 801B9F88 001B6EE8 4E 80 04 21 */ bctrl +/* 801B9F88 001B6EE8 4E 80 04 21 */ bctrl /* 801B9F8C 001B6EEC 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 801B9F90 001B6EF0 81 83 00 00 */ lwz r12, 0(r3) /* 801B9F94 001B6EF4 81 8C 00 B8 */ lwz r12, 0xb8(r12) /* 801B9F98 001B6EF8 7D 89 03 A6 */ mtctr r12 -/* 801B9F9C 001B6EFC 4E 80 04 21 */ bctrl +/* 801B9F9C 001B6EFC 4E 80 04 21 */ bctrl /* 801B9FA0 001B6F00 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 801B9FA4 001B6F04 38 80 00 04 */ li r4, 4 /* 801B9FA8 001B6F08 81 83 00 00 */ lwz r12, 0(r3) /* 801B9FAC 001B6F0C 81 8C 00 A0 */ lwz r12, 0xa0(r12) /* 801B9FB0 001B6F10 7D 89 03 A6 */ mtctr r12 -/* 801B9FB4 001B6F14 4E 80 04 21 */ bctrl +/* 801B9FB4 001B6F14 4E 80 04 21 */ bctrl /* 801B9FB8 001B6F18 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 801B9FBC 001B6F1C 38 81 00 08 */ addi r4, r1, 8 /* 801B9FC0 001B6F20 81 83 00 00 */ lwz r12, 0(r3) /* 801B9FC4 001B6F24 81 8C 00 B4 */ lwz r12, 0xb4(r12) /* 801B9FC8 001B6F28 7D 89 03 A6 */ mtctr r12 -/* 801B9FCC 001B6F2C 4E 80 04 21 */ bctrl +/* 801B9FCC 001B6F2C 4E 80 04 21 */ bctrl /* 801B9FD0 001B6F30 C0 3F 00 08 */ lfs f1, 8(r31) /* 801B9FD4 001B6F34 38 81 00 90 */ addi r4, r1, 0x90 /* 801B9FD8 001B6F38 C0 5F 00 04 */ lfs f2, 4(r31) @@ -264,7 +264,7 @@ DrawClipCube__FRC6CAABox: /* 801B9FF0 001B6F50 81 83 00 00 */ lwz r12, 0(r3) /* 801B9FF4 001B6F54 81 8C 00 A8 */ lwz r12, 0xa8(r12) /* 801B9FF8 001B6F58 7D 89 03 A6 */ mtctr r12 -/* 801B9FFC 001B6F5C 4E 80 04 21 */ bctrl +/* 801B9FFC 001B6F5C 4E 80 04 21 */ bctrl /* 801BA000 001B6F60 C0 3F 00 08 */ lfs f1, 8(r31) /* 801BA004 001B6F64 38 81 00 84 */ addi r4, r1, 0x84 /* 801BA008 001B6F68 C0 5F 00 04 */ lfs f2, 4(r31) @@ -276,7 +276,7 @@ DrawClipCube__FRC6CAABox: /* 801BA020 001B6F80 81 83 00 00 */ lwz r12, 0(r3) /* 801BA024 001B6F84 81 8C 00 A8 */ lwz r12, 0xa8(r12) /* 801BA028 001B6F88 7D 89 03 A6 */ mtctr r12 -/* 801BA02C 001B6F8C 4E 80 04 21 */ bctrl +/* 801BA02C 001B6F8C 4E 80 04 21 */ bctrl /* 801BA030 001B6F90 C0 3F 00 14 */ lfs f1, 0x14(r31) /* 801BA034 001B6F94 38 81 00 78 */ addi r4, r1, 0x78 /* 801BA038 001B6F98 C0 5F 00 04 */ lfs f2, 4(r31) @@ -288,7 +288,7 @@ DrawClipCube__FRC6CAABox: /* 801BA050 001B6FB0 81 83 00 00 */ lwz r12, 0(r3) /* 801BA054 001B6FB4 81 8C 00 A8 */ lwz r12, 0xa8(r12) /* 801BA058 001B6FB8 7D 89 03 A6 */ mtctr r12 -/* 801BA05C 001B6FBC 4E 80 04 21 */ bctrl +/* 801BA05C 001B6FBC 4E 80 04 21 */ bctrl /* 801BA060 001B6FC0 C0 3F 00 14 */ lfs f1, 0x14(r31) /* 801BA064 001B6FC4 38 81 00 6C */ addi r4, r1, 0x6c /* 801BA068 001B6FC8 C0 5F 00 04 */ lfs f2, 4(r31) @@ -300,24 +300,24 @@ DrawClipCube__FRC6CAABox: /* 801BA080 001B6FE0 81 83 00 00 */ lwz r12, 0(r3) /* 801BA084 001B6FE4 81 8C 00 A8 */ lwz r12, 0xa8(r12) /* 801BA088 001B6FE8 7D 89 03 A6 */ mtctr r12 -/* 801BA08C 001B6FEC 4E 80 04 21 */ bctrl +/* 801BA08C 001B6FEC 4E 80 04 21 */ bctrl /* 801BA090 001B6FF0 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 801BA094 001B6FF4 81 83 00 00 */ lwz r12, 0(r3) /* 801BA098 001B6FF8 81 8C 00 B8 */ lwz r12, 0xb8(r12) /* 801BA09C 001B6FFC 7D 89 03 A6 */ mtctr r12 -/* 801BA0A0 001B7000 4E 80 04 21 */ bctrl +/* 801BA0A0 001B7000 4E 80 04 21 */ bctrl /* 801BA0A4 001B7004 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 801BA0A8 001B7008 38 80 00 04 */ li r4, 4 /* 801BA0AC 001B700C 81 83 00 00 */ lwz r12, 0(r3) /* 801BA0B0 001B7010 81 8C 00 A0 */ lwz r12, 0xa0(r12) /* 801BA0B4 001B7014 7D 89 03 A6 */ mtctr r12 -/* 801BA0B8 001B7018 4E 80 04 21 */ bctrl +/* 801BA0B8 001B7018 4E 80 04 21 */ bctrl /* 801BA0BC 001B701C 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 801BA0C0 001B7020 38 81 00 08 */ addi r4, r1, 8 /* 801BA0C4 001B7024 81 83 00 00 */ lwz r12, 0(r3) /* 801BA0C8 001B7028 81 8C 00 B4 */ lwz r12, 0xb4(r12) /* 801BA0CC 001B702C 7D 89 03 A6 */ mtctr r12 -/* 801BA0D0 001B7030 4E 80 04 21 */ bctrl +/* 801BA0D0 001B7030 4E 80 04 21 */ bctrl /* 801BA0D4 001B7034 C0 3F 00 14 */ lfs f1, 0x14(r31) /* 801BA0D8 001B7038 38 81 00 60 */ addi r4, r1, 0x60 /* 801BA0DC 001B703C C0 5F 00 04 */ lfs f2, 4(r31) @@ -329,7 +329,7 @@ DrawClipCube__FRC6CAABox: /* 801BA0F4 001B7054 81 83 00 00 */ lwz r12, 0(r3) /* 801BA0F8 001B7058 81 8C 00 A8 */ lwz r12, 0xa8(r12) /* 801BA0FC 001B705C 7D 89 03 A6 */ mtctr r12 -/* 801BA100 001B7060 4E 80 04 21 */ bctrl +/* 801BA100 001B7060 4E 80 04 21 */ bctrl /* 801BA104 001B7064 C0 3F 00 14 */ lfs f1, 0x14(r31) /* 801BA108 001B7068 38 81 00 54 */ addi r4, r1, 0x54 /* 801BA10C 001B706C C0 5F 00 04 */ lfs f2, 4(r31) @@ -341,7 +341,7 @@ DrawClipCube__FRC6CAABox: /* 801BA124 001B7084 81 83 00 00 */ lwz r12, 0(r3) /* 801BA128 001B7088 81 8C 00 A8 */ lwz r12, 0xa8(r12) /* 801BA12C 001B708C 7D 89 03 A6 */ mtctr r12 -/* 801BA130 001B7090 4E 80 04 21 */ bctrl +/* 801BA130 001B7090 4E 80 04 21 */ bctrl /* 801BA134 001B7094 C0 3F 00 14 */ lfs f1, 0x14(r31) /* 801BA138 001B7098 38 81 00 48 */ addi r4, r1, 0x48 /* 801BA13C 001B709C C0 5F 00 10 */ lfs f2, 0x10(r31) @@ -353,7 +353,7 @@ DrawClipCube__FRC6CAABox: /* 801BA154 001B70B4 81 83 00 00 */ lwz r12, 0(r3) /* 801BA158 001B70B8 81 8C 00 A8 */ lwz r12, 0xa8(r12) /* 801BA15C 001B70BC 7D 89 03 A6 */ mtctr r12 -/* 801BA160 001B70C0 4E 80 04 21 */ bctrl +/* 801BA160 001B70C0 4E 80 04 21 */ bctrl /* 801BA164 001B70C4 C0 3F 00 14 */ lfs f1, 0x14(r31) /* 801BA168 001B70C8 38 81 00 3C */ addi r4, r1, 0x3c /* 801BA16C 001B70CC C0 5F 00 10 */ lfs f2, 0x10(r31) @@ -365,24 +365,24 @@ DrawClipCube__FRC6CAABox: /* 801BA184 001B70E4 81 83 00 00 */ lwz r12, 0(r3) /* 801BA188 001B70E8 81 8C 00 A8 */ lwz r12, 0xa8(r12) /* 801BA18C 001B70EC 7D 89 03 A6 */ mtctr r12 -/* 801BA190 001B70F0 4E 80 04 21 */ bctrl +/* 801BA190 001B70F0 4E 80 04 21 */ bctrl /* 801BA194 001B70F4 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 801BA198 001B70F8 81 83 00 00 */ lwz r12, 0(r3) /* 801BA19C 001B70FC 81 8C 00 B8 */ lwz r12, 0xb8(r12) /* 801BA1A0 001B7100 7D 89 03 A6 */ mtctr r12 -/* 801BA1A4 001B7104 4E 80 04 21 */ bctrl +/* 801BA1A4 001B7104 4E 80 04 21 */ bctrl /* 801BA1A8 001B7108 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 801BA1AC 001B710C 38 80 00 04 */ li r4, 4 /* 801BA1B0 001B7110 81 83 00 00 */ lwz r12, 0(r3) /* 801BA1B4 001B7114 81 8C 00 A0 */ lwz r12, 0xa0(r12) /* 801BA1B8 001B7118 7D 89 03 A6 */ mtctr r12 -/* 801BA1BC 001B711C 4E 80 04 21 */ bctrl +/* 801BA1BC 001B711C 4E 80 04 21 */ bctrl /* 801BA1C0 001B7120 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 801BA1C4 001B7124 38 81 00 08 */ addi r4, r1, 8 /* 801BA1C8 001B7128 81 83 00 00 */ lwz r12, 0(r3) /* 801BA1CC 001B712C 81 8C 00 B4 */ lwz r12, 0xb4(r12) /* 801BA1D0 001B7130 7D 89 03 A6 */ mtctr r12 -/* 801BA1D4 001B7134 4E 80 04 21 */ bctrl +/* 801BA1D4 001B7134 4E 80 04 21 */ bctrl /* 801BA1D8 001B7138 C0 3F 00 08 */ lfs f1, 8(r31) /* 801BA1DC 001B713C 38 81 00 30 */ addi r4, r1, 0x30 /* 801BA1E0 001B7140 C0 5F 00 04 */ lfs f2, 4(r31) @@ -394,7 +394,7 @@ DrawClipCube__FRC6CAABox: /* 801BA1F8 001B7158 81 83 00 00 */ lwz r12, 0(r3) /* 801BA1FC 001B715C 81 8C 00 A8 */ lwz r12, 0xa8(r12) /* 801BA200 001B7160 7D 89 03 A6 */ mtctr r12 -/* 801BA204 001B7164 4E 80 04 21 */ bctrl +/* 801BA204 001B7164 4E 80 04 21 */ bctrl /* 801BA208 001B7168 C0 3F 00 08 */ lfs f1, 8(r31) /* 801BA20C 001B716C 38 81 00 24 */ addi r4, r1, 0x24 /* 801BA210 001B7170 C0 5F 00 04 */ lfs f2, 4(r31) @@ -406,7 +406,7 @@ DrawClipCube__FRC6CAABox: /* 801BA228 001B7188 81 83 00 00 */ lwz r12, 0(r3) /* 801BA22C 001B718C 81 8C 00 A8 */ lwz r12, 0xa8(r12) /* 801BA230 001B7190 7D 89 03 A6 */ mtctr r12 -/* 801BA234 001B7194 4E 80 04 21 */ bctrl +/* 801BA234 001B7194 4E 80 04 21 */ bctrl /* 801BA238 001B7198 C0 3F 00 08 */ lfs f1, 8(r31) /* 801BA23C 001B719C 38 81 00 18 */ addi r4, r1, 0x18 /* 801BA240 001B71A0 C0 5F 00 10 */ lfs f2, 0x10(r31) @@ -418,7 +418,7 @@ DrawClipCube__FRC6CAABox: /* 801BA258 001B71B8 81 83 00 00 */ lwz r12, 0(r3) /* 801BA25C 001B71BC 81 8C 00 A8 */ lwz r12, 0xa8(r12) /* 801BA260 001B71C0 7D 89 03 A6 */ mtctr r12 -/* 801BA264 001B71C4 4E 80 04 21 */ bctrl +/* 801BA264 001B71C4 4E 80 04 21 */ bctrl /* 801BA268 001B71C8 C0 3F 00 08 */ lfs f1, 8(r31) /* 801BA26C 001B71CC 38 81 00 0C */ addi r4, r1, 0xc /* 801BA270 001B71D0 C0 5F 00 10 */ lfs f2, 0x10(r31) @@ -430,19 +430,19 @@ DrawClipCube__FRC6CAABox: /* 801BA288 001B71E8 81 83 00 00 */ lwz r12, 0(r3) /* 801BA28C 001B71EC 81 8C 00 A8 */ lwz r12, 0xa8(r12) /* 801BA290 001B71F0 7D 89 03 A6 */ mtctr r12 -/* 801BA294 001B71F4 4E 80 04 21 */ bctrl +/* 801BA294 001B71F4 4E 80 04 21 */ bctrl /* 801BA298 001B71F8 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 801BA29C 001B71FC 81 83 00 00 */ lwz r12, 0(r3) /* 801BA2A0 001B7200 81 8C 00 B8 */ lwz r12, 0xb8(r12) /* 801BA2A4 001B7204 7D 89 03 A6 */ mtctr r12 -/* 801BA2A8 001B7208 4E 80 04 21 */ bctrl +/* 801BA2A8 001B7208 4E 80 04 21 */ bctrl /* 801BA2AC 001B720C 38 60 00 01 */ li r3, 1 /* 801BA2B0 001B7210 48 15 17 C1 */ bl SetCullMode__9CGraphicsF12ERglCullMode /* 801BA2B4 001B7214 80 01 01 44 */ lwz r0, 0x144(r1) /* 801BA2B8 001B7218 83 E1 01 3C */ lwz r31, 0x13c(r1) /* 801BA2BC 001B721C 7C 08 03 A6 */ mtlr r0 /* 801BA2C0 001B7220 38 21 01 40 */ addi r1, r1, 0x140 -/* 801BA2C4 001B7224 4E 80 00 20 */ blr +/* 801BA2C4 001B7224 4E 80 00 20 */ blr .global EnableFrozenEffect__10CGunWeaponF13EFrozenFxType EnableFrozenEffect__10CGunWeaponF13EFrozenFxType: @@ -492,7 +492,7 @@ lbl_801BA35C: /* 801BA36C 001B72CC 38 80 00 01 */ li r4, 1 /* 801BA370 001B72D0 81 8C 00 08 */ lwz r12, 8(r12) /* 801BA374 001B72D4 7D 89 03 A6 */ mtctr r12 -/* 801BA378 001B72D8 4E 80 04 21 */ bctrl +/* 801BA378 001B72D8 4E 80 04 21 */ bctrl lbl_801BA37C: /* 801BA37C 001B72DC 7F 80 07 75 */ extsb. r0, r28 /* 801BA380 001B72E0 93 BE 01 B8 */ stw r29, 0x1b8(r30) @@ -506,7 +506,7 @@ lbl_801BA394: /* 801BA39C 001B72FC 81 83 00 00 */ lwz r12, 0(r3) /* 801BA3A0 001B7300 81 8C 00 24 */ lwz r12, 0x24(r12) /* 801BA3A4 001B7304 7D 89 03 A6 */ mtctr r12 -/* 801BA3A8 001B7308 4E 80 04 21 */ bctrl +/* 801BA3A8 001B7308 4E 80 04 21 */ bctrl /* 801BA3AC 001B730C 48 00 00 AC */ b lbl_801BA458 lbl_801BA3B0: /* 801BA3B0 001B7310 80 1E 02 04 */ lwz r0, 0x204(r30) @@ -539,7 +539,7 @@ lbl_801BA408: /* 801BA418 001B7378 38 80 00 01 */ li r4, 1 /* 801BA41C 001B737C 81 8C 00 08 */ lwz r12, 8(r12) /* 801BA420 001B7380 7D 89 03 A6 */ mtctr r12 -/* 801BA424 001B7384 4E 80 04 21 */ bctrl +/* 801BA424 001B7384 4E 80 04 21 */ bctrl lbl_801BA428: /* 801BA428 001B7388 7F 80 07 75 */ extsb. r0, r28 /* 801BA42C 001B738C 93 BE 01 B8 */ stw r29, 0x1b8(r30) @@ -553,7 +553,7 @@ lbl_801BA440: /* 801BA448 001B73A8 81 83 00 00 */ lwz r12, 0(r3) /* 801BA44C 001B73AC 81 8C 00 24 */ lwz r12, 0x24(r12) /* 801BA450 001B73B0 7D 89 03 A6 */ mtctr r12 -/* 801BA454 001B73B4 4E 80 04 21 */ bctrl +/* 801BA454 001B73B4 4E 80 04 21 */ bctrl lbl_801BA458: /* 801BA458 001B73B8 93 FE 02 04 */ stw r31, 0x204(r30) /* 801BA45C 001B73BC 80 01 00 34 */ lwz r0, 0x34(r1) @@ -563,7 +563,7 @@ lbl_801BA458: /* 801BA46C 001B73CC 83 81 00 20 */ lwz r28, 0x20(r1) /* 801BA470 001B73D0 7C 08 03 A6 */ mtlr r0 /* 801BA474 001B73D4 38 21 00 30 */ addi r1, r1, 0x30 -/* 801BA478 001B73D8 4E 80 00 20 */ blr +/* 801BA478 001B73D8 4E 80 00 20 */ blr .global PointGenerator__10CGunWeaponFPvPC9CVector3fPC9CVector3fi PointGenerator__10CGunWeaponFPvPC9CVector3fPC9CVector3fi: @@ -574,7 +574,7 @@ PointGenerator__10CGunWeaponFPvPC9CVector3fPC9CVector3fi: /* 801BA48C 001B73EC 80 01 00 14 */ lwz r0, 0x14(r1) /* 801BA490 001B73F0 7C 08 03 A6 */ mtlr r0 /* 801BA494 001B73F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801BA498 001B73F8 4E 80 00 20 */ blr +/* 801BA498 001B73F8 4E 80 00 20 */ blr .global LoadSuitArm__10CGunWeaponFR13CStateManager LoadSuitArm__10CGunWeaponFR13CStateManager: @@ -625,7 +625,7 @@ lbl_801BA544: /* 801BA548 001B74A8 83 E1 00 6C */ lwz r31, 0x6c(r1) /* 801BA54C 001B74AC 7C 08 03 A6 */ mtlr r0 /* 801BA550 001B74B0 38 21 00 70 */ addi r1, r1, 0x70 -/* 801BA554 001B74B4 4E 80 00 20 */ blr +/* 801BA554 001B74B4 4E 80 00 20 */ blr .global AsyncLoadSuitArm__10CGunWeaponFR13CStateManager AsyncLoadSuitArm__10CGunWeaponFR13CStateManager: @@ -661,7 +661,7 @@ lbl_801BA5A8: /* 801BA5C8 001B7528 81 84 00 00 */ lwz r12, 0(r4) /* 801BA5CC 001B752C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 801BA5D0 001B7530 7D 89 03 A6 */ mtctr r12 -/* 801BA5D4 001B7534 4E 80 04 21 */ bctrl +/* 801BA5D4 001B7534 4E 80 04 21 */ bctrl /* 801BA5D8 001B7538 38 61 00 08 */ addi r3, r1, 8 /* 801BA5DC 001B753C 38 81 00 10 */ addi r4, r1, 0x10 /* 801BA5E0 001B7540 48 18 68 C9 */ bl __ct__6CTokenFRC6CToken @@ -685,7 +685,7 @@ lbl_801BA5A8: /* 801BA628 001B7588 80 01 00 74 */ lwz r0, 0x74(r1) /* 801BA62C 001B758C 7C 08 03 A6 */ mtlr r0 /* 801BA630 001B7590 38 21 00 70 */ addi r1, r1, 0x70 -/* 801BA634 001B7594 4E 80 00 20 */ blr +/* 801BA634 001B7594 4E 80 00 20 */ blr .global IsFidgetLoaded__10CGunWeaponFv IsFidgetLoaded__10CGunWeaponFv: @@ -698,7 +698,7 @@ IsFidgetLoaded__10CGunWeaponFv: /* 801BA650 001B75B0 80 01 00 14 */ lwz r0, 0x14(r1) /* 801BA654 001B75B4 7C 08 03 A6 */ mtlr r0 /* 801BA658 001B75B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801BA65C 001B75BC 4E 80 00 20 */ blr +/* 801BA65C 001B75BC 4E 80 00 20 */ blr .global UnLoadFidget__10CGunWeaponFv UnLoadFidget__10CGunWeaponFv: @@ -711,7 +711,7 @@ UnLoadFidget__10CGunWeaponFv: /* 801BA678 001B75D8 80 01 00 14 */ lwz r0, 0x14(r1) /* 801BA67C 001B75DC 7C 08 03 A6 */ mtlr r0 /* 801BA680 001B75E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801BA684 001B75E4 4E 80 00 20 */ blr +/* 801BA684 001B75E4 4E 80 00 20 */ blr .global AsyncLoadFidget__10CGunWeaponFR13CStateManagerQ28SamusGun11EFidgetTypei AsyncLoadFidget__10CGunWeaponFR13CStateManagerQ28SamusGun11EFidgetTypei: @@ -726,7 +726,7 @@ AsyncLoadFidget__10CGunWeaponFR13CStateManagerQ28SamusGun11EFidgetTypei: /* 801BA6A8 001B7608 80 01 00 14 */ lwz r0, 0x14(r1) /* 801BA6AC 001B760C 7C 08 03 A6 */ mtlr r0 /* 801BA6B0 001B7610 38 21 00 10 */ addi r1, r1, 0x10 -/* 801BA6B4 001B7614 4E 80 00 20 */ blr +/* 801BA6B4 001B7614 4E 80 00 20 */ blr .global BuildDependencyList__10CGunWeaponFQ212CPlayerState7EBeamId BuildDependencyList__10CGunWeaponFQ212CPlayerState7EBeamId: @@ -747,7 +747,7 @@ BuildDependencyList__10CGunWeaponFQ212CPlayerState7EBeamId: /* 801BA6F0 001B7650 81 84 00 00 */ lwz r12, 0(r4) /* 801BA6F4 001B7654 81 8C 00 10 */ lwz r12, 0x10(r12) /* 801BA6F8 001B7658 7D 89 03 A6 */ mtctr r12 -/* 801BA6FC 001B765C 4E 80 04 21 */ bctrl +/* 801BA6FC 001B765C 4E 80 04 21 */ bctrl /* 801BA700 001B7660 3B E1 00 24 */ addi r31, r1, 0x24 /* 801BA704 001B7664 38 81 00 10 */ addi r4, r1, 0x10 /* 801BA708 001B7668 7F E3 FB 78 */ mr r3, r31 @@ -767,7 +767,7 @@ BuildDependencyList__10CGunWeaponFQ212CPlayerState7EBeamId: /* 801BA740 001B76A0 7C A5 F0 2E */ lwzx r5, r5, r30 /* 801BA744 001B76A4 81 8C 00 10 */ lwz r12, 0x10(r12) /* 801BA748 001B76A8 7D 89 03 A6 */ mtctr r12 -/* 801BA74C 001B76AC 4E 80 04 21 */ bctrl +/* 801BA74C 001B76AC 4E 80 04 21 */ bctrl /* 801BA750 001B76B0 3B C1 00 18 */ addi r30, r1, 0x18 /* 801BA754 001B76B4 38 81 00 08 */ addi r4, r1, 8 /* 801BA758 001B76B8 7F C3 F3 78 */ mr r3, r30 @@ -806,7 +806,7 @@ BuildDependencyList__10CGunWeaponFQ212CPlayerState7EBeamId: /* 801BA7DC 001B773C 83 A1 00 34 */ lwz r29, 0x34(r1) /* 801BA7E0 001B7740 7C 08 03 A6 */ mtlr r0 /* 801BA7E4 001B7744 38 21 00 40 */ addi r1, r1, 0x40 -/* 801BA7E8 001B7748 4E 80 00 20 */ blr +/* 801BA7E8 001B7748 4E 80 00 20 */ blr .global "FillTokenVector__10CGunWeaponFRCQ24rstl47vector<10SObjectTag,Q24rstl17rmemory_allocator>RQ24rstl42vector<6CToken,Q24rstl17rmemory_allocator>" "FillTokenVector__10CGunWeaponFRCQ24rstl47vector<10SObjectTag,Q24rstl17rmemory_allocator>RQ24rstl42vector<6CToken,Q24rstl17rmemory_allocator>": @@ -829,7 +829,7 @@ lbl_801BA81C: /* 801BA828 001B7788 81 84 00 00 */ lwz r12, 0(r4) /* 801BA82C 001B778C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801BA830 001B7790 7D 89 03 A6 */ mtctr r12 -/* 801BA834 001B7794 4E 80 04 21 */ bctrl +/* 801BA834 001B7794 4E 80 04 21 */ bctrl /* 801BA838 001B7798 38 61 00 10 */ addi r3, r1, 0x10 /* 801BA83C 001B779C 38 81 00 08 */ addi r4, r1, 8 /* 801BA840 001B77A0 48 18 66 69 */ bl __ct__6CTokenFRC6CToken @@ -890,7 +890,7 @@ lbl_801BA8DC: /* 801BA904 001B7864 83 81 00 20 */ lwz r28, 0x20(r1) /* 801BA908 001B7868 7C 08 03 A6 */ mtlr r0 /* 801BA90C 001B786C 38 21 00 30 */ addi r1, r1, 0x30 -/* 801BA910 001B7870 4E 80 00 20 */ blr +/* 801BA910 001B7870 4E 80 00 20 */ blr .global UnlockTokens__10CGunWeaponFv UnlockTokens__10CGunWeaponFv: @@ -907,7 +907,7 @@ UnlockTokens__10CGunWeaponFv: /* 801BA93C 001B789C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801BA940 001B78A0 7C 08 03 A6 */ mtlr r0 /* 801BA944 001B78A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801BA948 001B78A8 4E 80 00 20 */ blr +/* 801BA948 001B78A8 4E 80 00 20 */ blr .global LockTokens__10CGunWeaponFR13CStateManager LockTokens__10CGunWeaponFR13CStateManager: @@ -923,7 +923,7 @@ LockTokens__10CGunWeaponFR13CStateManager: /* 801BA970 001B78D0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801BA974 001B78D4 7C 08 03 A6 */ mtlr r0 /* 801BA978 001B78D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801BA97C 001B78DC 4E 80 00 20 */ blr +/* 801BA97C 001B78DC 4E 80 00 20 */ blr .global IsAnimsLoaded__10CGunWeaponCFv IsAnimsLoaded__10CGunWeaponCFv: @@ -938,14 +938,14 @@ lbl_801BA994: /* 801BA99C 001B78FC 28 00 00 00 */ cmplwi r0, 0 /* 801BA9A0 001B7900 40 82 00 0C */ bne lbl_801BA9AC /* 801BA9A4 001B7904 38 60 00 00 */ li r3, 0 -/* 801BA9A8 001B7908 4E 80 00 20 */ blr +/* 801BA9A8 001B7908 4E 80 00 20 */ blr lbl_801BA9AC: /* 801BA9AC 001B790C 38 A5 00 08 */ addi r5, r5, 8 lbl_801BA9B0: /* 801BA9B0 001B7910 7C 05 20 40 */ cmplw r5, r4 /* 801BA9B4 001B7914 40 82 FF E0 */ bne lbl_801BA994 /* 801BA9B8 001B7918 38 60 00 01 */ li r3, 1 -/* 801BA9BC 001B791C 4E 80 00 20 */ blr +/* 801BA9BC 001B791C 4E 80 00 20 */ blr .global LoadAnimations__10CGunWeaponFv LoadAnimations__10CGunWeaponFv: @@ -962,7 +962,7 @@ LoadAnimations__10CGunWeaponFv: /* 801BA9E8 001B7948 80 01 00 14 */ lwz r0, 0x14(r1) /* 801BA9EC 001B794C 7C 08 03 A6 */ mtlr r0 /* 801BA9F0 001B7950 38 21 00 10 */ addi r1, r1, 0x10 -/* 801BA9F4 001B7954 4E 80 00 20 */ blr +/* 801BA9F4 001B7954 4E 80 00 20 */ blr .global LoadFxIdle__10CGunWeaponFfR13CStateManager LoadFxIdle__10CGunWeaponFfR13CStateManager: @@ -1144,7 +1144,7 @@ lbl_801BAC50: /* 801BAC58 001B7BB8 80 01 00 34 */ lwz r0, 0x34(r1) /* 801BAC5C 001B7BBC 7C 08 03 A6 */ mtlr r0 /* 801BAC60 001B7BC0 38 21 00 30 */ addi r1, r1, 0x30 -/* 801BAC64 001B7BC4 4E 80 00 20 */ blr +/* 801BAC64 001B7BC4 4E 80 00 20 */ blr .global FreeResPools__10CGunWeaponFv FreeResPools__10CGunWeaponFv: @@ -1235,7 +1235,7 @@ lbl_801BAD7C: /* 801BADA0 001B7D00 38 80 00 01 */ li r4, 1 /* 801BADA4 001B7D04 81 8C 00 08 */ lwz r12, 8(r12) /* 801BADA8 001B7D08 7D 89 03 A6 */ mtctr r12 -/* 801BADAC 001B7D0C 4E 80 04 21 */ bctrl +/* 801BADAC 001B7D0C 4E 80 04 21 */ bctrl lbl_801BADB0: /* 801BADB0 001B7D10 3B 9C 00 08 */ addi r28, r28, 8 /* 801BADB4 001B7D14 3B DE 00 01 */ addi r30, r30, 1 @@ -1283,7 +1283,7 @@ lbl_801BAE20: /* 801BAE44 001B7DA4 38 80 00 01 */ li r4, 1 /* 801BAE48 001B7DA8 81 8C 00 08 */ lwz r12, 8(r12) /* 801BAE4C 001B7DAC 7D 89 03 A6 */ mtctr r12 -/* 801BAE50 001B7DB0 4E 80 04 21 */ bctrl +/* 801BAE50 001B7DB0 4E 80 04 21 */ bctrl lbl_801BAE54: /* 801BAE54 001B7DB4 3B 9C 00 08 */ addi r28, r28, 8 /* 801BAE58 001B7DB8 3B DE 00 01 */ addi r30, r30, 1 @@ -1299,7 +1299,7 @@ lbl_801BAE5C: /* 801BAE7C 001B7DDC 80 01 00 64 */ lwz r0, 0x64(r1) /* 801BAE80 001B7DE0 7C 08 03 A6 */ mtlr r0 /* 801BAE84 001B7DE4 38 21 00 60 */ addi r1, r1, 0x60 -/* 801BAE88 001B7DE8 4E 80 00 20 */ blr +/* 801BAE88 001B7DE8 4E 80 00 20 */ blr .global Clear__13CVelocityInfoFv Clear__13CVelocityInfoFv: @@ -1532,7 +1532,7 @@ lbl_801BB184: /* 801BB184 001B80E4 38 00 00 00 */ li r0, 0 /* 801BB188 001B80E8 90 01 00 10 */ stw r0, 0x10(r1) /* 801BB18C 001B80EC 38 21 00 40 */ addi r1, r1, 0x40 -/* 801BB190 001B80F0 4E 80 00 20 */ blr +/* 801BB190 001B80F0 4E 80 00 20 */ blr .global AllocResPools__10CGunWeaponFQ212CPlayerState7EBeamId AllocResPools__10CGunWeaponFQ212CPlayerState7EBeamId: @@ -1562,7 +1562,7 @@ lbl_801BB1E0: /* 801BB1EC 001B814C 81 84 00 00 */ lwz r12, 0(r4) /* 801BB1F0 001B8150 81 8C 00 10 */ lwz r12, 0x10(r12) /* 801BB1F4 001B8154 7D 89 03 A6 */ mtctr r12 -/* 801BB1F8 001B8158 4E 80 04 21 */ bctrl +/* 801BB1F8 001B8158 4E 80 04 21 */ bctrl /* 801BB1FC 001B815C 38 61 00 40 */ addi r3, r1, 0x40 /* 801BB200 001B8160 38 81 00 20 */ addi r4, r1, 0x20 /* 801BB204 001B8164 48 18 5C A5 */ bl __ct__6CTokenFRC6CToken @@ -1597,7 +1597,7 @@ lbl_801BB234: /* 801BB274 001B81D4 81 84 00 00 */ lwz r12, 0(r4) /* 801BB278 001B81D8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801BB27C 001B81DC 7D 89 03 A6 */ mtctr r12 -/* 801BB280 001B81E0 4E 80 04 21 */ bctrl +/* 801BB280 001B81E0 4E 80 04 21 */ bctrl /* 801BB284 001B81E4 38 61 00 34 */ addi r3, r1, 0x34 /* 801BB288 001B81E8 38 81 00 10 */ addi r4, r1, 0x10 /* 801BB28C 001B81EC 48 18 5C 1D */ bl __ct__6CTokenFRC6CToken @@ -1639,7 +1639,7 @@ lbl_801BB308: /* 801BB314 001B8274 81 84 00 00 */ lwz r12, 0(r4) /* 801BB318 001B8278 81 8C 00 10 */ lwz r12, 0x10(r12) /* 801BB31C 001B827C 7D 89 03 A6 */ mtctr r12 -/* 801BB320 001B8280 4E 80 04 21 */ bctrl +/* 801BB320 001B8280 4E 80 04 21 */ bctrl /* 801BB324 001B8284 38 61 00 28 */ addi r3, r1, 0x28 /* 801BB328 001B8288 38 81 00 08 */ addi r4, r1, 8 /* 801BB32C 001B828C 48 18 5B 7D */ bl __ct__6CTokenFRC6CToken @@ -1672,13 +1672,13 @@ lbl_801BB35C: /* 801BB394 001B82F4 80 01 00 84 */ lwz r0, 0x84(r1) /* 801BB398 001B82F8 7C 08 03 A6 */ mtlr r0 /* 801BB39C 001B82FC 38 21 00 80 */ addi r1, r1, 0x80 -/* 801BB3A0 001B8300 4E 80 00 20 */ blr +/* 801BB3A0 001B8300 4E 80 00 20 */ blr .global IsLoaded__10CGunWeaponCFv IsLoaded__10CGunWeaponCFv: /* 801BB3A4 001B8304 88 03 02 18 */ lbz r0, 0x218(r3) /* 801BB3A8 001B8308 54 03 DF FE */ rlwinm r3, r0, 0x1b, 0x1f, 0x1f -/* 801BB3AC 001B830C 4E 80 00 20 */ blr +/* 801BB3AC 001B830C 4E 80 00 20 */ blr .global Unload__10CGunWeaponFR13CStateManager Unload__10CGunWeaponFR13CStateManager: @@ -1742,7 +1742,7 @@ lbl_801BB45C: /* 801BB488 001B83E8 38 80 00 01 */ li r4, 1 /* 801BB48C 001B83EC 81 8C 00 08 */ lwz r12, 8(r12) /* 801BB490 001B83F0 7D 89 03 A6 */ mtctr r12 -/* 801BB494 001B83F4 4E 80 04 21 */ bctrl +/* 801BB494 001B83F4 4E 80 04 21 */ bctrl lbl_801BB498: /* 801BB498 001B83F8 38 00 00 00 */ li r0, 0 /* 801BB49C 001B83FC 7F E3 FB 78 */ mr r3, r31 @@ -1758,7 +1758,7 @@ lbl_801BB498: /* 801BB4C4 001B8424 80 01 01 04 */ lwz r0, 0x104(r1) /* 801BB4C8 001B8428 7C 08 03 A6 */ mtlr r0 /* 801BB4CC 001B842C 38 21 01 00 */ addi r1, r1, 0x100 -/* 801BB4D0 001B8430 4E 80 00 20 */ blr +/* 801BB4D0 001B8430 4E 80 00 20 */ blr .global Load__10CGunWeaponFR13CStateManagerb Load__10CGunWeaponFR13CStateManagerb: @@ -1784,7 +1784,7 @@ Load__10CGunWeaponFR13CStateManagerb: /* 801BB520 001B8480 38 80 00 01 */ li r4, 1 /* 801BB524 001B8484 81 8C 00 08 */ lwz r12, 8(r12) /* 801BB528 001B8488 7D 89 03 A6 */ mtctr r12 -/* 801BB52C 001B848C 4E 80 04 21 */ bctrl +/* 801BB52C 001B848C 4E 80 04 21 */ bctrl lbl_801BB530: /* 801BB530 001B8490 38 00 00 00 */ li r0, 0 /* 801BB534 001B8494 38 7C 01 04 */ addi r3, r28, 0x104 @@ -1821,7 +1821,7 @@ lbl_801BB580: /* 801BB5A8 001B8508 83 81 00 10 */ lwz r28, 0x10(r1) /* 801BB5AC 001B850C 7C 08 03 A6 */ mtlr r0 /* 801BB5B0 001B8510 38 21 00 20 */ addi r1, r1, 0x20 -/* 801BB5B4 001B8514 4E 80 00 20 */ blr +/* 801BB5B4 001B8514 4E 80 00 20 */ blr .global TouchHolo__10CGunWeaponFRC13CStateManager TouchHolo__10CGunWeaponFRC13CStateManager: @@ -1838,7 +1838,7 @@ lbl_801BB5DC: /* 801BB5DC 001B853C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801BB5E0 001B8540 7C 08 03 A6 */ mtlr r0 /* 801BB5E4 001B8544 38 21 00 10 */ addi r1, r1, 0x10 -/* 801BB5E8 001B8548 4E 80 00 20 */ blr +/* 801BB5E8 001B8548 4E 80 00 20 */ blr .global Touch__10CGunWeaponFRC13CStateManager Touch__10CGunWeaponFRC13CStateManager: @@ -1868,7 +1868,7 @@ lbl_801BB63C: /* 801BB644 001B85A4 83 C1 00 08 */ lwz r30, 8(r1) /* 801BB648 001B85A8 7C 08 03 A6 */ mtlr r0 /* 801BB64C 001B85AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801BB650 001B85B0 4E 80 00 20 */ blr +/* 801BB650 001B85B0 4E 80 00 20 */ blr .global GetBounds__10CGunWeaponCFRC12CTransform4f GetBounds__10CGunWeaponCFRC12CTransform4f: @@ -1902,7 +1902,7 @@ lbl_801BB6B4: /* 801BB6B8 001B8618 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801BB6BC 001B861C 7C 08 03 A6 */ mtlr r0 /* 801BB6C0 001B8620 38 21 00 10 */ addi r1, r1, 0x10 -/* 801BB6C4 001B8624 4E 80 00 20 */ blr +/* 801BB6C4 001B8624 4E 80 00 20 */ blr .global GetBounds__10CGunWeaponCFv GetBounds__10CGunWeaponCFv: @@ -1936,7 +1936,7 @@ lbl_801BB728: /* 801BB72C 001B868C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801BB730 001B8690 7C 08 03 A6 */ mtlr r0 /* 801BB734 001B8694 38 21 00 10 */ addi r1, r1, 0x10 -/* 801BB738 001B8698 4E 80 00 20 */ blr +/* 801BB738 001B8698 4E 80 00 20 */ blr .global GetDamageInfo__10CGunWeaponFR13CStateManagerQ212CPlayerState12EChargeStagef GetDamageInfo__10CGunWeaponFR13CStateManagerQ212CPlayerState12EChargeStagef: @@ -1997,7 +1997,7 @@ lbl_801BB7F8: /* 801BB80C 001B876C 83 A1 00 34 */ lwz r29, 0x34(r1) /* 801BB810 001B8770 7C 08 03 A6 */ mtlr r0 /* 801BB814 001B8774 38 21 00 50 */ addi r1, r1, 0x50 -/* 801BB818 001B8778 4E 80 00 20 */ blr +/* 801BB818 001B8778 4E 80 00 20 */ blr .global EnterFidget__10CGunWeaponFR13CStateManagerQ28SamusGun11EFidgetTypei EnterFidget__10CGunWeaponFR13CStateManagerQ28SamusGun11EFidgetTypei: @@ -2012,14 +2012,14 @@ EnterFidget__10CGunWeaponFR13CStateManagerQ28SamusGun11EFidgetTypei: /* 801BB83C 001B879C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801BB840 001B87A0 7C 08 03 A6 */ mtlr r0 /* 801BB844 001B87A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801BB848 001B87A8 4E 80 00 20 */ blr +/* 801BB848 001B87A8 4E 80 00 20 */ blr .global ComboFireOver__10CGunWeaponCFv ComboFireOver__10CGunWeaponCFv: /* 801BB84C 001B87AC 80 63 01 00 */ lwz r3, 0x100(r3) /* 801BB850 001B87B0 88 03 00 2C */ lbz r0, 0x2c(r3) /* 801BB854 001B87B4 54 03 CF FE */ rlwinm r3, r0, 0x19, 0x1f, 0x1f -/* 801BB858 001B87B8 4E 80 00 20 */ blr +/* 801BB858 001B87B8 4E 80 00 20 */ blr .global ReturnToDefault__10CGunWeaponFR13CStateManager ReturnToDefault__10CGunWeaponFR13CStateManager: @@ -2033,7 +2033,7 @@ ReturnToDefault__10CGunWeaponFR13CStateManager: /* 801BB878 001B87D8 80 01 00 14 */ lwz r0, 0x14(r1) /* 801BB87C 001B87DC 7C 08 03 A6 */ mtlr r0 /* 801BB880 001B87E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801BB884 001B87E4 4E 80 00 20 */ blr +/* 801BB884 001B87E4 4E 80 00 20 */ blr .global Fire__10CGunWeaponFbfQ212CPlayerState12EChargeStageRC12CTransform4fR13CStateManager9TUniqueId Fire__10CGunWeaponFbfQ212CPlayerState12EChargeStageRC12CTransform4fR13CStateManager9TUniqueId: @@ -2209,7 +2209,7 @@ lbl_801BBAD8: /* 801BBAF8 001B8A58 7F 64 DB 78 */ mr r4, r27 /* 801BBAFC 001B8A5C 81 8C 00 14 */ lwz r12, 0x14(r12) /* 801BBB00 001B8A60 7D 89 03 A6 */ mtctr r12 -/* 801BBB04 001B8A64 4E 80 04 21 */ bctrl +/* 801BBB04 001B8A64 4E 80 04 21 */ bctrl lbl_801BBB08: /* 801BBB08 001B8A68 2C 19 00 00 */ cmpwi r25, 0 /* 801BBB0C 001B8A6C 41 82 00 28 */ beq lbl_801BBB34 @@ -2260,7 +2260,7 @@ lbl_801BBB34: /* 801BBBBC 001B8B1C 80 01 01 24 */ lwz r0, 0x124(r1) /* 801BBBC0 001B8B20 7C 08 03 A6 */ mtlr r0 /* 801BBBC4 001B8B24 38 21 01 20 */ addi r1, r1, 0x120 -/* 801BBBC8 001B8B28 4E 80 00 20 */ blr +/* 801BBBC8 001B8B28 4E 80 00 20 */ blr .global DrawHologram__10CGunWeaponCFRC13CStateManagerRC12CTransform4fRC11CModelFlags DrawHologram__10CGunWeaponCFRC13CStateManagerRC12CTransform4fRC11CModelFlags: @@ -2309,7 +2309,7 @@ lbl_801BBC14: /* 801BBC70 001B8BD0 81 83 00 00 */ lwz r12, 0(r3) /* 801BBC74 001B8BD4 81 8C 00 30 */ lwz r12, 0x30(r12) /* 801BBC78 001B8BD8 7D 89 03 A6 */ mtctr r12 -/* 801BBC7C 001B8BDC 4E 80 04 21 */ bctrl +/* 801BBC7C 001B8BDC 4E 80 04 21 */ bctrl /* 801BBC80 001B8BE0 48 15 0C FD */ bl DisableAllLights__9CGraphicsFv /* 801BBC84 001B8BE4 48 18 E3 29 */ bl White__6CColorFv /* 801BBC88 001B8BE8 7C 64 1B 78 */ mr r4, r3 @@ -2317,7 +2317,7 @@ lbl_801BBC14: /* 801BBC90 001B8BF0 81 83 00 00 */ lwz r12, 0(r3) /* 801BBC94 001B8BF4 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 801BBC98 001B8BF8 7D 89 03 A6 */ mtctr r12 -/* 801BBC9C 001B8BFC 4E 80 04 21 */ bctrl +/* 801BBC9C 001B8BFC 4E 80 04 21 */ bctrl /* 801BBCA0 001B8C00 38 00 00 00 */ li r0, 0 /* 801BBCA4 001B8C04 80 9E 00 70 */ lwz r4, 0x70(r30) /* 801BBCA8 001B8C08 98 01 00 EC */ stb r0, 0xec(r1) @@ -2336,7 +2336,7 @@ lbl_801BBC14: /* 801BBCDC 001B8C3C 81 83 00 00 */ lwz r12, 0(r3) /* 801BBCE0 001B8C40 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 801BBCE4 001B8C44 7D 89 03 A6 */ mtctr r12 -/* 801BBCE8 001B8C48 4E 80 04 21 */ bctrl +/* 801BBCE8 001B8C48 4E 80 04 21 */ bctrl /* 801BBCEC 001B8C4C 48 15 0C 91 */ bl DisableAllLights__9CGraphicsFv lbl_801BBCF0: /* 801BBCF0 001B8C50 80 01 01 04 */ lwz r0, 0x104(r1) @@ -2344,7 +2344,7 @@ lbl_801BBCF0: /* 801BBCF8 001B8C58 83 C1 00 F8 */ lwz r30, 0xf8(r1) /* 801BBCFC 001B8C5C 7C 08 03 A6 */ mtlr r0 /* 801BBD00 001B8C60 38 21 01 00 */ addi r1, r1, 0x100 -/* 801BBD04 001B8C64 4E 80 00 20 */ blr +/* 801BBD04 001B8C64 4E 80 00 20 */ blr .global Draw__10CGunWeaponCFbRC13CStateManagerRC12CTransform4fRC11CModelFlagsPC12CActorLights Draw__10CGunWeaponCFbRC13CStateManagerRC12CTransform4fRC11CModelFlagsPC12CActorLights: @@ -2515,7 +2515,7 @@ lbl_801BBF74: /* 801BBF78 001B8ED8 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 801BBF7C 001B8EDC 7C 08 03 A6 */ mtlr r0 /* 801BBF80 001B8EE0 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 801BBF84 001B8EE4 4E 80 00 20 */ blr +/* 801BBF84 001B8EE4 4E 80 00 20 */ blr .global ActivateCharge__10CGunWeaponFbb ActivateCharge__10CGunWeaponFbb: @@ -2538,7 +2538,7 @@ ActivateCharge__10CGunWeaponFbb: /* 801BBFC8 001B8F28 81 83 00 00 */ lwz r12, 0(r3) /* 801BBFCC 001B8F2C 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 801BBFD0 001B8F30 7D 89 03 A6 */ mtctr r12 -/* 801BBFD4 001B8F34 4E 80 04 21 */ bctrl +/* 801BBFD4 001B8F34 4E 80 04 21 */ bctrl /* 801BBFD8 001B8F38 57 A3 06 3F */ clrlwi. r3, r29, 0x18 /* 801BBFDC 001B8F3C 7C 03 00 D0 */ neg r0, r3 /* 801BBFE0 001B8F40 7C 00 1B 78 */ or r0, r0, r3 @@ -2592,7 +2592,7 @@ lbl_801BC050: /* 801BC098 001B8FF8 38 80 00 01 */ li r4, 1 /* 801BC09C 001B8FFC 81 8C 00 08 */ lwz r12, 8(r12) /* 801BC0A0 001B9000 7D 89 03 A6 */ mtctr r12 -/* 801BC0A4 001B9004 4E 80 04 21 */ bctrl +/* 801BC0A4 001B9004 4E 80 04 21 */ bctrl lbl_801BC0A8: /* 801BC0A8 001B9008 88 61 00 08 */ lbz r3, 8(r1) /* 801BC0AC 001B900C 38 00 00 00 */ li r0, 0 @@ -2611,7 +2611,7 @@ lbl_801BC0C0: /* 801BC0DC 001B903C 38 80 00 01 */ li r4, 1 /* 801BC0E0 001B9040 81 8C 00 08 */ lwz r12, 8(r12) /* 801BC0E4 001B9044 7D 89 03 A6 */ mtctr r12 -/* 801BC0E8 001B9048 4E 80 04 21 */ bctrl +/* 801BC0E8 001B9048 4E 80 04 21 */ bctrl lbl_801BC0EC: /* 801BC0EC 001B904C 7F A0 07 75 */ extsb. r0, r29 /* 801BC0F0 001B9050 41 82 00 10 */ beq lbl_801BC100 @@ -2626,7 +2626,7 @@ lbl_801BC100: /* 801BC110 001B9070 83 81 00 20 */ lwz r28, 0x20(r1) /* 801BC114 001B9074 7C 08 03 A6 */ mtlr r0 /* 801BC118 001B9078 38 21 00 30 */ addi r1, r1, 0x30 -/* 801BC11C 001B907C 4E 80 00 20 */ blr +/* 801BC11C 001B907C 4E 80 00 20 */ blr .global DrawMuzzleFx__10CGunWeaponCFRC13CStateManager DrawMuzzleFx__10CGunWeaponCFRC13CStateManager: @@ -2660,7 +2660,7 @@ DrawMuzzleFx__10CGunWeaponCFRC13CStateManager: /* 801BC18C 001B90EC 81 83 00 00 */ lwz r12, 0(r3) /* 801BC190 001B90F0 81 8C 00 10 */ lwz r12, 0x10(r12) /* 801BC194 001B90F4 7D 89 03 A6 */ mtctr r12 -/* 801BC198 001B90F8 4E 80 04 21 */ bctrl +/* 801BC198 001B90F8 4E 80 04 21 */ bctrl /* 801BC19C 001B90FC 38 00 00 00 */ li r0, 0 /* 801BC1A0 001B9100 98 0D A8 B9 */ stb r0, lbl_805A9479@sda21(r13) /* 801BC1A4 001B9104 48 00 00 24 */ b lbl_801BC1C8 @@ -2672,22 +2672,22 @@ lbl_801BC1A8: /* 801BC1B8 001B9118 81 83 00 00 */ lwz r12, 0(r3) /* 801BC1BC 001B911C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 801BC1C0 001B9120 7D 89 03 A6 */ mtctr r12 -/* 801BC1C4 001B9124 4E 80 04 21 */ bctrl +/* 801BC1C4 001B9124 4E 80 04 21 */ bctrl lbl_801BC1C8: /* 801BC1C8 001B9128 80 01 00 14 */ lwz r0, 0x14(r1) /* 801BC1CC 001B912C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801BC1D0 001B9130 83 C1 00 08 */ lwz r30, 8(r1) /* 801BC1D4 001B9134 7C 08 03 A6 */ mtlr r0 /* 801BC1D8 001B9138 38 21 00 10 */ addi r1, r1, 0x10 -/* 801BC1DC 001B913C 4E 80 00 20 */ blr +/* 801BC1DC 001B913C 4E 80 00 20 */ blr .global GetChargeMuzzleFx__10CGunWeaponCFv GetChargeMuzzleFx__10CGunWeaponCFv: /* 801BC1E0 001B9140 80 63 01 B4 */ lwz r3, 0x1b4(r3) /* 801BC1E4 001B9144 28 03 00 00 */ cmplwi r3, 0 -/* 801BC1E8 001B9148 4C 82 00 20 */ bnelr +/* 801BC1E8 001B9148 4C 82 00 20 */ bnelr /* 801BC1EC 001B914C 38 60 00 00 */ li r3, 0 -/* 801BC1F0 001B9150 4E 80 00 20 */ blr +/* 801BC1F0 001B9150 4E 80 00 20 */ blr .global UpdateMuzzleFx__10CGunWeaponFfRC9CVector3fRC9CVector3fb UpdateMuzzleFx__10CGunWeaponFfRC9CVector3fRC9CVector3fb: @@ -2712,7 +2712,7 @@ UpdateMuzzleFx__10CGunWeaponFfRC9CVector3fRC9CVector3fb: /* 801BC23C 001B919C 81 83 00 00 */ lwz r12, 0(r3) /* 801BC240 001B91A0 81 8C 00 20 */ lwz r12, 0x20(r12) /* 801BC244 001B91A4 7D 89 03 A6 */ mtctr r12 -/* 801BC248 001B91A8 4E 80 04 21 */ bctrl +/* 801BC248 001B91A8 4E 80 04 21 */ bctrl /* 801BC24C 001B91AC 80 1C 02 08 */ lwz r0, 0x208(r28) /* 801BC250 001B91B0 7F A4 EB 78 */ mr r4, r29 /* 801BC254 001B91B4 54 03 18 38 */ slwi r3, r0, 3 @@ -2721,7 +2721,7 @@ UpdateMuzzleFx__10CGunWeaponFfRC9CVector3fRC9CVector3fb: /* 801BC260 001B91C0 81 83 00 00 */ lwz r12, 0(r3) /* 801BC264 001B91C4 81 8C 00 24 */ lwz r12, 0x24(r12) /* 801BC268 001B91C8 7D 89 03 A6 */ mtctr r12 -/* 801BC26C 001B91CC 4E 80 04 21 */ bctrl +/* 801BC26C 001B91CC 4E 80 04 21 */ bctrl /* 801BC270 001B91D0 80 1C 02 08 */ lwz r0, 0x208(r28) /* 801BC274 001B91D4 7F C4 F3 78 */ mr r4, r30 /* 801BC278 001B91D8 54 03 18 38 */ slwi r3, r0, 3 @@ -2730,7 +2730,7 @@ UpdateMuzzleFx__10CGunWeaponFfRC9CVector3fRC9CVector3fb: /* 801BC284 001B91E4 81 83 00 00 */ lwz r12, 0(r3) /* 801BC288 001B91E8 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 801BC28C 001B91EC 7D 89 03 A6 */ mtctr r12 -/* 801BC290 001B91F0 4E 80 04 21 */ bctrl +/* 801BC290 001B91F0 4E 80 04 21 */ bctrl /* 801BC294 001B91F4 80 1C 02 08 */ lwz r0, 0x208(r28) /* 801BC298 001B91F8 FC 20 F8 90 */ fmr f1, f31 /* 801BC29C 001B91FC 54 03 18 38 */ slwi r3, r0, 3 @@ -2739,7 +2739,7 @@ UpdateMuzzleFx__10CGunWeaponFfRC9CVector3fRC9CVector3fb: /* 801BC2A8 001B9208 81 83 00 00 */ lwz r12, 0(r3) /* 801BC2AC 001B920C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801BC2B0 001B9210 7D 89 03 A6 */ mtctr r12 -/* 801BC2B4 001B9214 4E 80 04 21 */ bctrl +/* 801BC2B4 001B9214 4E 80 04 21 */ bctrl /* 801BC2B8 001B9218 80 01 00 24 */ lwz r0, 0x24(r1) /* 801BC2BC 001B921C CB E1 00 18 */ lfd f31, 0x18(r1) /* 801BC2C0 001B9220 83 E1 00 14 */ lwz r31, 0x14(r1) @@ -2748,7 +2748,7 @@ UpdateMuzzleFx__10CGunWeaponFfRC9CVector3fRC9CVector3fb: /* 801BC2CC 001B922C 83 81 00 08 */ lwz r28, 8(r1) /* 801BC2D0 001B9230 7C 08 03 A6 */ mtlr r0 /* 801BC2D4 001B9234 38 21 00 20 */ addi r1, r1, 0x20 -/* 801BC2D8 001B9238 4E 80 00 20 */ blr +/* 801BC2D8 001B9238 4E 80 00 20 */ blr .global UpdateGunFx__10CGunWeaponFbfRC13CStateManagerRC12CTransform4f UpdateGunFx__10CGunWeaponFbfRC13CStateManagerRC12CTransform4f: @@ -2775,7 +2775,7 @@ UpdateGunFx__10CGunWeaponFbfRC13CStateManagerRC12CTransform4f: /* 801BC32C 001B928C 81 83 00 00 */ lwz r12, 0(r3) /* 801BC330 001B9290 81 8C 00 58 */ lwz r12, 0x58(r12) /* 801BC334 001B9294 7D 89 03 A6 */ mtctr r12 -/* 801BC338 001B9298 4E 80 04 21 */ bctrl +/* 801BC338 001B9298 4E 80 04 21 */ bctrl /* 801BC33C 001B929C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801BC340 001B92A0 41 82 00 38 */ beq lbl_801BC378 /* 801BC344 001B92A4 38 00 00 00 */ li r0, 0 @@ -2787,7 +2787,7 @@ UpdateGunFx__10CGunWeaponFbfRC13CStateManagerRC12CTransform4f: /* 801BC35C 001B92BC 38 80 00 01 */ li r4, 1 /* 801BC360 001B92C0 81 8C 00 08 */ lwz r12, 8(r12) /* 801BC364 001B92C4 7D 89 03 A6 */ mtctr r12 -/* 801BC368 001B92C8 4E 80 04 21 */ bctrl +/* 801BC368 001B92C8 4E 80 04 21 */ bctrl lbl_801BC36C: /* 801BC36C 001B92CC 38 00 00 00 */ li r0, 0 /* 801BC370 001B92D0 90 1D 01 B8 */ stw r0, 0x1b8(r29) @@ -2804,7 +2804,7 @@ lbl_801BC378: /* 801BC398 001B92F8 81 83 00 00 */ lwz r12, 0(r3) /* 801BC39C 001B92FC 81 8C 00 18 */ lwz r12, 0x18(r12) /* 801BC3A0 001B9300 7D 89 03 A6 */ mtctr r12 -/* 801BC3A4 001B9304 4E 80 04 21 */ bctrl +/* 801BC3A4 001B9304 4E 80 04 21 */ bctrl /* 801BC3A8 001B9308 83 FD 01 B8 */ lwz r31, 0x1b8(r29) /* 801BC3AC 001B930C 7F C4 F3 78 */ mr r4, r30 /* 801BC3B0 001B9310 38 61 00 14 */ addi r3, r1, 0x14 @@ -2814,7 +2814,7 @@ lbl_801BC378: /* 801BC3C0 001B9320 81 9F 00 00 */ lwz r12, 0(r31) /* 801BC3C4 001B9324 81 8C 00 14 */ lwz r12, 0x14(r12) /* 801BC3C8 001B9328 7D 89 03 A6 */ mtctr r12 -/* 801BC3CC 001B932C 4E 80 04 21 */ bctrl +/* 801BC3CC 001B932C 4E 80 04 21 */ bctrl /* 801BC3D0 001B9330 48 00 00 10 */ b lbl_801BC3E0 lbl_801BC3D4: /* 801BC3D4 001B9334 80 7D 01 B8 */ lwz r3, 0x1b8(r29) @@ -2828,7 +2828,7 @@ lbl_801BC3E0: /* 801BC3F0 001B9350 FC 20 F8 90 */ fmr f1, f31 /* 801BC3F4 001B9354 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801BC3F8 001B9358 7D 89 03 A6 */ mtctr r12 -/* 801BC3FC 001B935C 4E 80 04 21 */ bctrl +/* 801BC3FC 001B935C 4E 80 04 21 */ bctrl lbl_801BC400: /* 801BC400 001B9360 E3 E1 00 68 */ psq_l f31, 104(r1), 0, qr0 /* 801BC404 001B9364 80 01 00 74 */ lwz r0, 0x74(r1) @@ -2838,7 +2838,7 @@ lbl_801BC400: /* 801BC414 001B9374 83 A1 00 54 */ lwz r29, 0x54(r1) /* 801BC418 001B9378 7C 08 03 A6 */ mtlr r0 /* 801BC41C 001B937C 38 21 00 70 */ addi r1, r1, 0x70 -/* 801BC420 001B9380 4E 80 00 20 */ blr +/* 801BC420 001B9380 4E 80 00 20 */ blr .global PostRenderGunFx__10CGunWeaponFRC13CStateManagerRC12CTransform4f PostRenderGunFx__10CGunWeaponFRC13CStateManagerRC12CTransform4f: @@ -2858,12 +2858,12 @@ PostRenderGunFx__10CGunWeaponFRC13CStateManagerRC12CTransform4f: /* 801BC458 001B93B8 81 84 00 00 */ lwz r12, 0(r4) /* 801BC45C 001B93BC 81 8C 00 10 */ lwz r12, 0x10(r12) /* 801BC460 001B93C0 7D 89 03 A6 */ mtctr r12 -/* 801BC464 001B93C4 4E 80 04 21 */ bctrl +/* 801BC464 001B93C4 4E 80 04 21 */ bctrl lbl_801BC468: /* 801BC468 001B93C8 80 01 00 14 */ lwz r0, 0x14(r1) /* 801BC46C 001B93CC 7C 08 03 A6 */ mtlr r0 /* 801BC470 001B93D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801BC474 001B93D4 4E 80 00 20 */ blr +/* 801BC474 001B93D4 4E 80 00 20 */ blr .global Update__10CGunWeaponFfR13CStateManager Update__10CGunWeaponFfR13CStateManager: @@ -2962,7 +2962,7 @@ lbl_801BC5CC: /* 801BC5D8 001B9538 83 C1 00 30 */ lwz r30, 0x30(r1) /* 801BC5DC 001B953C 7C 08 03 A6 */ mtlr r0 /* 801BC5E0 001B9540 38 21 00 40 */ addi r1, r1, 0x40 -/* 801BC5E4 001B9544 4E 80 00 20 */ blr +/* 801BC5E4 001B9544 4E 80 00 20 */ blr .global Reset__10CGunWeaponFR13CStateManager Reset__10CGunWeaponFR13CStateManager: @@ -2995,7 +2995,7 @@ lbl_801BC648: /* 801BC648 001B95A8 80 01 00 14 */ lwz r0, 0x14(r1) /* 801BC64C 001B95AC 7C 08 03 A6 */ mtlr r0 /* 801BC650 001B95B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801BC654 001B95B4 4E 80 00 20 */ blr +/* 801BC654 001B95B4 4E 80 00 20 */ blr .global PlayAnim__10CGunWeaponFQ212NWeaponTypes12EGunAnimTypeb PlayAnim__10CGunWeaponFQ212NWeaponTypes12EGunAnimTypeb: @@ -3044,7 +3044,7 @@ lbl_801BC6F8: /* 801BC6F8 001B9658 80 01 00 34 */ lwz r0, 0x34(r1) /* 801BC6FC 001B965C 7C 08 03 A6 */ mtlr r0 /* 801BC700 001B9660 38 21 00 30 */ addi r1, r1, 0x30 -/* 801BC704 001B9664 4E 80 00 20 */ blr +/* 801BC704 001B9664 4E 80 00 20 */ blr .global IsChargeAnimOver__10CGunWeaponCFv IsChargeAnimOver__10CGunWeaponCFv: @@ -3079,7 +3079,7 @@ lbl_801BC76C: /* 801BC770 001B96D0 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801BC774 001B96D4 7C 08 03 A6 */ mtlr r0 /* 801BC778 001B96D8 38 21 00 20 */ addi r1, r1, 0x20 -/* 801BC77C 001B96DC 4E 80 00 20 */ blr +/* 801BC77C 001B96DC 4E 80 00 20 */ blr .global PlayPasAnim__10CGunWeaponFQ28SamusGun15EAnimationStateR13CStateManagerf PlayPasAnim__10CGunWeaponFQ28SamusGun15EAnimationStateR13CStateManagerf: @@ -3108,7 +3108,7 @@ lbl_801BC7C8: /* 801BC7C8 001B9728 80 01 00 14 */ lwz r0, 0x14(r1) /* 801BC7CC 001B972C 7C 08 03 A6 */ mtlr r0 /* 801BC7D0 001B9730 38 21 00 10 */ addi r1, r1, 0x10 -/* 801BC7D4 001B9734 4E 80 00 20 */ blr +/* 801BC7D4 001B9734 4E 80 00 20 */ blr .global LoadProjectileData__10CGunWeaponFR13CStateManager LoadProjectileData__10CGunWeaponFR13CStateManager: @@ -3152,7 +3152,7 @@ lbl_801BC838: /* 801BC868 001B97C8 38 80 00 00 */ li r4, 0 /* 801BC86C 001B97CC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801BC870 001B97D0 7D 89 03 A6 */ mtctr r12 -/* 801BC874 001B97D4 4E 80 04 21 */ bctrl +/* 801BC874 001B97D4 4E 80 04 21 */ bctrl lbl_801BC878: /* 801BC878 001B97D8 80 16 01 D0 */ lwz r0, 0x1d0(r22) /* 801BC87C 001B97DC 1C 00 00 0C */ mulli r0, r0, 0xc @@ -3177,7 +3177,7 @@ lbl_801BC8A0: /* 801BC8C4 001B9824 38 80 00 00 */ li r4, 0 /* 801BC8C8 001B9828 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801BC8CC 001B982C 7D 89 03 A6 */ mtctr r12 -/* 801BC8D0 001B9830 4E 80 04 21 */ bctrl +/* 801BC8D0 001B9830 4E 80 04 21 */ bctrl lbl_801BC8D4: /* 801BC8D4 001B9834 80 16 01 F4 */ lwz r0, 0x1f4(r22) /* 801BC8D8 001B9838 54 00 10 3A */ slwi r0, r0, 2 @@ -3235,7 +3235,7 @@ lbl_801BC96C: /* 801BC998 001B98F8 80 01 00 64 */ lwz r0, 0x64(r1) /* 801BC99C 001B98FC 7C 08 03 A6 */ mtlr r0 /* 801BC9A0 001B9900 38 21 00 60 */ addi r1, r1, 0x60 -/* 801BC9A4 001B9904 4E 80 00 20 */ blr +/* 801BC9A4 001B9904 4E 80 00 20 */ blr .global LoadGunModels__10CGunWeaponFR13CStateManager LoadGunModels__10CGunWeaponFR13CStateManager: @@ -3344,7 +3344,7 @@ lbl_801BCB24: /* 801BCB38 001B9A98 83 A1 01 04 */ lwz r29, 0x104(r1) /* 801BCB3C 001B9A9C 7C 08 03 A6 */ mtlr r0 /* 801BCB40 001B9AA0 38 21 01 10 */ addi r1, r1, 0x110 -/* 801BCB44 001B9AA4 4E 80 00 20 */ blr +/* 801BCB44 001B9AA4 4E 80 00 20 */ blr .global LoadMuzzleFx__10CGunWeaponFf LoadMuzzleFx__10CGunWeaponFf: @@ -3390,13 +3390,13 @@ lbl_801BCBD0: /* 801BCBD8 001B9B38 81 9A 00 00 */ lwz r12, 0(r26) /* 801BCBDC 001B9B3C 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 801BCBE0 001B9B40 7D 89 03 A6 */ mtctr r12 -/* 801BCBE4 001B9B44 4E 80 04 21 */ bctrl +/* 801BCBE4 001B9B44 4E 80 04 21 */ bctrl /* 801BCBE8 001B9B48 7F 43 D3 78 */ mr r3, r26 /* 801BCBEC 001B9B4C FC 20 F8 90 */ fmr f1, f31 /* 801BCBF0 001B9B50 81 9A 00 00 */ lwz r12, 0(r26) /* 801BCBF4 001B9B54 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801BCBF8 001B9B58 7D 89 03 A6 */ mtctr r12 -/* 801BCBFC 001B9B5C 4E 80 04 21 */ bctrl +/* 801BCBFC 001B9B5C 4E 80 04 21 */ bctrl /* 801BCC00 001B9B60 80 1B 01 A4 */ lwz r0, 0x1a4(r27) /* 801BCC04 001B9B64 7C 7A 00 D0 */ neg r3, r26 /* 801BCC08 001B9B68 7C 63 D3 78 */ or r3, r3, r26 @@ -3424,7 +3424,7 @@ lbl_801BCC34: /* 801BCC5C 001B9BBC 38 80 00 01 */ li r4, 1 /* 801BCC60 001B9BC0 81 8C 00 08 */ lwz r12, 8(r12) /* 801BCC64 001B9BC4 7D 89 03 A6 */ mtctr r12 -/* 801BCC68 001B9BC8 4E 80 04 21 */ bctrl +/* 801BCC68 001B9BC8 4E 80 04 21 */ bctrl lbl_801BCC6C: /* 801BCC6C 001B9BCC 3B 9C 00 01 */ addi r28, r28, 1 /* 801BCC70 001B9BD0 3B DE 00 0C */ addi r30, r30, 0xc @@ -3435,7 +3435,7 @@ lbl_801BCC6C: /* 801BCC84 001B9BE4 80 01 00 44 */ lwz r0, 0x44(r1) /* 801BCC88 001B9BE8 7C 08 03 A6 */ mtlr r0 /* 801BCC8C 001B9BEC 38 21 00 40 */ addi r1, r1, 0x40 -/* 801BCC90 001B9BF0 4E 80 00 20 */ blr +/* 801BCC90 001B9BF0 4E 80 00 20 */ blr .global GetWeaponInfo__10CGunWeaponCFv GetWeaponInfo__10CGunWeaponCFv: @@ -3449,7 +3449,7 @@ GetWeaponInfo__10CGunWeaponCFv: /* 801BCCB0 001B9C10 80 01 00 14 */ lwz r0, 0x14(r1) /* 801BCCB4 001B9C14 7C 08 03 A6 */ mtlr r0 /* 801BCCB8 001B9C18 38 21 00 10 */ addi r1, r1, 0x10 -/* 801BCCBC 001B9C1C 4E 80 00 20 */ blr +/* 801BCCBC 001B9C1C 4E 80 00 20 */ blr .global __dt__10CGunWeaponFv __dt__10CGunWeaponFv: @@ -3478,7 +3478,7 @@ __dt__10CGunWeaponFv: /* 801BCD18 001B9C78 38 80 00 01 */ li r4, 1 /* 801BCD1C 001B9C7C 81 8C 00 08 */ lwz r12, 8(r12) /* 801BCD20 001B9C80 7D 89 03 A6 */ mtctr r12 -/* 801BCD24 001B9C84 4E 80 04 21 */ bctrl +/* 801BCD24 001B9C84 4E 80 04 21 */ bctrl lbl_801BCD28: /* 801BCD28 001B9C88 34 1E 01 A4 */ addic. r0, r30, 0x1a4 /* 801BCD2C 001B9C8C 41 82 00 60 */ beq lbl_801BCD8C @@ -3498,7 +3498,7 @@ lbl_801BCD3C: /* 801BCD60 001B9CC0 38 80 00 01 */ li r4, 1 /* 801BCD64 001B9CC4 81 8C 00 08 */ lwz r12, 8(r12) /* 801BCD68 001B9CC8 7D 89 03 A6 */ mtctr r12 -/* 801BCD6C 001B9CCC 4E 80 04 21 */ bctrl +/* 801BCD6C 001B9CCC 4E 80 04 21 */ bctrl lbl_801BCD70: /* 801BCD70 001B9CD0 3B 9C 00 08 */ addi r28, r28, 8 /* 801BCD74 001B9CD4 3B BD 00 01 */ addi r29, r29, 1 @@ -3719,7 +3719,7 @@ lbl_801BD038: /* 801BD04C 001B9FAC 83 81 00 40 */ lwz r28, 0x40(r1) /* 801BD050 001B9FB0 7C 08 03 A6 */ mtlr r0 /* 801BD054 001B9FB4 38 21 00 50 */ addi r1, r1, 0x50 -/* 801BD058 001B9FB8 4E 80 00 20 */ blr +/* 801BD058 001B9FB8 4E 80 00 20 */ blr .global sub_801bd05c sub_801bd05c: @@ -3823,7 +3823,7 @@ lbl_801BD198: /* 801BD1A0 001BA100 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801BD1A4 001BA104 7C 08 03 A6 */ mtlr r0 /* 801BD1A8 001BA108 38 21 00 10 */ addi r1, r1, 0x10 -/* 801BD1AC 001BA10C 4E 80 00 20 */ blr +/* 801BD1AC 001BA10C 4E 80 00 20 */ blr .global __ct__10CGunWeaponFUi11EWeaponType9TUniqueId14EMaterialTypesRC9CVector3f __ct__10CGunWeaponFUi11EWeaponType9TUniqueId14EMaterialTypesRC9CVector3f: @@ -3860,7 +3860,7 @@ __ct__10CGunWeaponFUi11EWeaponType9TUniqueId14EMaterialTypesRC9CVector3f: /* 801BD228 001BA188 81 84 00 00 */ lwz r12, 0(r4) /* 801BD22C 001BA18C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801BD230 001BA190 7D 89 03 A6 */ mtctr r12 -/* 801BD234 001BA194 4E 80 04 21 */ bctrl +/* 801BD234 001BA194 4E 80 04 21 */ bctrl /* 801BD238 001BA198 38 7E 01 04 */ addi r3, r30, 0x104 /* 801BD23C 001BA19C 38 81 00 18 */ addi r4, r1, 0x18 /* 801BD240 001BA1A0 48 18 3C 69 */ bl __ct__6CTokenFRC6CToken @@ -3885,7 +3885,7 @@ __ct__10CGunWeaponFUi11EWeaponType9TUniqueId14EMaterialTypesRC9CVector3f: /* 801BD28C 001BA1EC 81 84 00 00 */ lwz r12, 0(r4) /* 801BD290 001BA1F0 81 8C 00 10 */ lwz r12, 0x10(r12) /* 801BD294 001BA1F4 7D 89 03 A6 */ mtctr r12 -/* 801BD298 001BA1F8 4E 80 04 21 */ bctrl +/* 801BD298 001BA1F8 4E 80 04 21 */ bctrl /* 801BD29C 001BA1FC 38 7E 01 3C */ addi r3, r30, 0x13c /* 801BD2A0 001BA200 38 81 00 10 */ addi r4, r1, 0x10 /* 801BD2A4 001BA204 48 18 3C 05 */ bl __ct__6CTokenFRC6CToken @@ -3905,7 +3905,7 @@ __ct__10CGunWeaponFUi11EWeaponType9TUniqueId14EMaterialTypesRC9CVector3f: /* 801BD2DC 001BA23C 7C A5 00 2E */ lwzx r5, r5, r0 /* 801BD2E0 001BA240 81 8C 00 10 */ lwz r12, 0x10(r12) /* 801BD2E4 001BA244 7D 89 03 A6 */ mtctr r12 -/* 801BD2E8 001BA248 4E 80 04 21 */ bctrl +/* 801BD2E8 001BA248 4E 80 04 21 */ bctrl /* 801BD2EC 001BA24C 3B 5E 01 60 */ addi r26, r30, 0x160 /* 801BD2F0 001BA250 38 81 00 08 */ addi r4, r1, 8 /* 801BD2F4 001BA254 7F 43 D3 78 */ mr r3, r26 @@ -3968,7 +3968,7 @@ __ct__10CGunWeaponFUi11EWeaponType9TUniqueId14EMaterialTypesRC9CVector3f: /* 801BD3D8 001BA338 80 01 00 44 */ lwz r0, 0x44(r1) /* 801BD3DC 001BA33C 7C 08 03 A6 */ mtlr r0 /* 801BD3E0 001BA340 38 21 00 40 */ addi r1, r1, 0x40 -/* 801BD3E4 001BA344 4E 80 00 20 */ blr +/* 801BD3E4 001BA344 4E 80 00 20 */ blr .global GetWeaponIndex__F11EWeaponType GetWeaponIndex__F11EWeaponType: @@ -3987,19 +3987,19 @@ lbl_801BD40C: /* 801BD414 001BA374 48 00 00 2C */ b lbl_801BD440 lbl_801BD418: /* 801BD418 001BA378 38 60 00 00 */ li r3, 0 -/* 801BD41C 001BA37C 4E 80 00 20 */ blr +/* 801BD41C 001BA37C 4E 80 00 20 */ blr lbl_801BD420: /* 801BD420 001BA380 38 60 00 01 */ li r3, 1 -/* 801BD424 001BA384 4E 80 00 20 */ blr +/* 801BD424 001BA384 4E 80 00 20 */ blr lbl_801BD428: /* 801BD428 001BA388 38 60 00 02 */ li r3, 2 -/* 801BD42C 001BA38C 4E 80 00 20 */ blr +/* 801BD42C 001BA38C 4E 80 00 20 */ blr lbl_801BD430: /* 801BD430 001BA390 38 60 00 03 */ li r3, 3 -/* 801BD434 001BA394 4E 80 00 20 */ blr +/* 801BD434 001BA394 4E 80 00 20 */ blr lbl_801BD438: /* 801BD438 001BA398 38 60 00 04 */ li r3, 4 -/* 801BD43C 001BA39C 4E 80 00 20 */ blr +/* 801BD43C 001BA39C 4E 80 00 20 */ blr lbl_801BD440: /* 801BD440 001BA3A0 38 60 00 00 */ li r3, 0 /* 801BD444 001BA3A4 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/Weapons/CPowerBeam.s b/asm/MetroidPrime/Weapons/CPowerBeam.s index f9add2d3..468855fb 100644 --- a/asm/MetroidPrime/Weapons/CPowerBeam.s +++ b/asm/MetroidPrime/Weapons/CPowerBeam.s @@ -57,7 +57,7 @@ lbl_800DF6DC: /* 800DF6F8 000DC658 38 80 00 00 */ li r4, 0 /* 800DF6FC 000DC65C 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 800DF700 000DC660 7D 89 03 A6 */ mtctr r12 -/* 800DF704 000DC664 4E 80 04 21 */ bctrl +/* 800DF704 000DC664 4E 80 04 21 */ bctrl lbl_800DF708: /* 800DF708 000DC668 38 00 00 00 */ li r0, 0 /* 800DF70C 000DC66C 90 1D 01 CC */ stw r0, 0x1cc(r29) @@ -89,7 +89,7 @@ lbl_800DF75C: /* 800DF76C 000DC6CC 38 80 00 01 */ li r4, 1 /* 800DF770 000DC6D0 81 8C 00 08 */ lwz r12, 8(r12) /* 800DF774 000DC6D4 7D 89 03 A6 */ mtctr r12 -/* 800DF778 000DC6D8 4E 80 04 21 */ bctrl +/* 800DF778 000DC6D8 4E 80 04 21 */ bctrl lbl_800DF77C: /* 800DF77C 000DC6DC 7F 80 07 75 */ extsb. r0, r28 /* 800DF780 000DC6E0 93 FD 02 38 */ stw r31, 0x238(r29) @@ -103,7 +103,7 @@ lbl_800DF794: /* 800DF79C 000DC6FC 81 83 00 00 */ lwz r12, 0(r3) /* 800DF7A0 000DC700 81 8C 00 24 */ lwz r12, 0x24(r12) /* 800DF7A4 000DC704 7D 89 03 A6 */ mtctr r12 -/* 800DF7A8 000DC708 4E 80 04 21 */ bctrl +/* 800DF7A8 000DC708 4E 80 04 21 */ bctrl /* 800DF7AC 000DC70C 93 DD 01 CC */ stw r30, 0x1cc(r29) lbl_800DF7B0: /* 800DF7B0 000DC710 80 01 00 24 */ lwz r0, 0x24(r1) @@ -113,7 +113,7 @@ lbl_800DF7B0: /* 800DF7C0 000DC720 83 81 00 10 */ lwz r28, 0x10(r1) /* 800DF7C4 000DC724 7C 08 03 A6 */ mtlr r0 /* 800DF7C8 000DC728 38 21 00 20 */ addi r1, r1, 0x20 -/* 800DF7CC 000DC72C 4E 80 00 20 */ blr +/* 800DF7CC 000DC72C 4E 80 00 20 */ blr .global IsLoaded__10CPowerBeamCFv IsLoaded__10CPowerBeamCFv: @@ -138,7 +138,7 @@ lbl_800DF808: /* 800DF814 000DC774 83 C1 00 08 */ lwz r30, 8(r1) /* 800DF818 000DC778 7C 08 03 A6 */ mtlr r0 /* 800DF81C 000DC77C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800DF820 000DC780 4E 80 00 20 */ blr +/* 800DF820 000DC780 4E 80 00 20 */ blr .global Unload__10CPowerBeamFR13CStateManager Unload__10CPowerBeamFR13CStateManager: @@ -162,7 +162,7 @@ Unload__10CPowerBeamFR13CStateManager: /* 800DF868 000DC7C8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800DF86C 000DC7CC 7C 08 03 A6 */ mtlr r0 /* 800DF870 000DC7D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800DF874 000DC7D4 4E 80 00 20 */ blr +/* 800DF874 000DC7D4 4E 80 00 20 */ blr .global Load__10CPowerBeamFR13CStateManagerb Load__10CPowerBeamFR13CStateManagerb: @@ -180,7 +180,7 @@ Load__10CPowerBeamFR13CStateManagerb: /* 800DF8A4 000DC804 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800DF8A8 000DC808 7C 08 03 A6 */ mtlr r0 /* 800DF8AC 000DC80C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800DF8B0 000DC810 4E 80 00 20 */ blr +/* 800DF8B0 000DC810 4E 80 00 20 */ blr .global Fire__10CPowerBeamFbfQ212CPlayerState12EChargeStageRC12CTransform4fR13CStateManager9TUniqueId Fire__10CPowerBeamFbfQ212CPlayerState12EChargeStageRC12CTransform4fR13CStateManager9TUniqueId: @@ -208,7 +208,7 @@ Fire__10CPowerBeamFbfQ212CPlayerState12EChargeStageRC12CTransform4fR13CStateMana /* 800DF908 000DC868 83 C1 00 18 */ lwz r30, 0x18(r1) /* 800DF90C 000DC86C 7C 08 03 A6 */ mtlr r0 /* 800DF910 000DC870 38 21 00 20 */ addi r1, r1, 0x20 -/* 800DF914 000DC874 4E 80 00 20 */ blr +/* 800DF914 000DC874 4E 80 00 20 */ blr .global Update__10CPowerBeamFfR13CStateManager Update__10CPowerBeamFfR13CStateManager: @@ -224,7 +224,7 @@ Update__10CPowerBeamFfR13CStateManager: /* 800DF93C 000DC89C 81 9F 00 00 */ lwz r12, 0(r31) /* 800DF940 000DC8A0 81 8C 00 40 */ lwz r12, 0x40(r12) /* 800DF944 000DC8A4 7D 89 03 A6 */ mtctr r12 -/* 800DF948 000DC8A8 4E 80 04 21 */ bctrl +/* 800DF948 000DC8A8 4E 80 04 21 */ bctrl /* 800DF94C 000DC8AC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800DF950 000DC8B0 40 82 01 70 */ bne lbl_800DFAC0 /* 800DF954 000DC8B4 7F E3 FB 78 */ mr r3, r31 @@ -312,7 +312,7 @@ lbl_800DFA70: /* 800DFA80 000DC9E0 38 80 00 01 */ li r4, 1 /* 800DFA84 000DC9E4 81 8C 00 08 */ lwz r12, 8(r12) /* 800DFA88 000DC9E8 7D 89 03 A6 */ mtctr r12 -/* 800DFA8C 000DC9EC 4E 80 04 21 */ bctrl +/* 800DFA8C 000DC9EC 4E 80 04 21 */ bctrl lbl_800DFA90: /* 800DFA90 000DC9F0 7F A0 07 75 */ extsb. r0, r29 /* 800DFA94 000DC9F4 93 DF 02 34 */ stw r30, 0x234(r31) @@ -326,7 +326,7 @@ lbl_800DFAA8: /* 800DFAB0 000DCA10 81 83 00 00 */ lwz r12, 0(r3) /* 800DFAB4 000DCA14 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 800DFAB8 000DCA18 7D 89 03 A6 */ mtctr r12 -/* 800DFABC 000DCA1C 4E 80 04 21 */ bctrl +/* 800DFABC 000DCA1C 4E 80 04 21 */ bctrl lbl_800DFAC0: /* 800DFAC0 000DCA20 80 01 00 24 */ lwz r0, 0x24(r1) /* 800DFAC4 000DCA24 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -334,7 +334,7 @@ lbl_800DFAC0: /* 800DFACC 000DCA2C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 800DFAD0 000DCA30 7C 08 03 A6 */ mtlr r0 /* 800DFAD4 000DCA34 38 21 00 20 */ addi r1, r1, 0x20 -/* 800DFAD8 000DCA38 4E 80 00 20 */ blr +/* 800DFAD8 000DCA38 4E 80 00 20 */ blr .global UpdateGunFx__10CPowerBeamFbfRC13CStateManagerRC12CTransform4f UpdateGunFx__10CPowerBeamFbfRC13CStateManagerRC12CTransform4f: @@ -373,7 +373,7 @@ lbl_800DFB3C: /* 800DFB54 000DCAB4 38 80 00 01 */ li r4, 1 /* 800DFB58 000DCAB8 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 800DFB5C 000DCABC 7D 89 03 A6 */ mtctr r12 -/* 800DFB60 000DCAC0 4E 80 04 21 */ bctrl +/* 800DFB60 000DCAC0 4E 80 04 21 */ bctrl lbl_800DFB64: /* 800DFB64 000DCAC4 C0 02 8F 6C */ lfs f0, lbl_805AAC8C@sda21(r2) /* 800DFB68 000DCAC8 38 00 00 01 */ li r0, 1 @@ -396,7 +396,7 @@ lbl_800DFB94: /* 800DFBA4 000DCB04 38 80 00 00 */ li r4, 0 /* 800DFBA8 000DCB08 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 800DFBAC 000DCB0C 7D 89 03 A6 */ mtctr r12 -/* 800DFBB0 000DCB10 4E 80 04 21 */ bctrl +/* 800DFBB0 000DCB10 4E 80 04 21 */ bctrl lbl_800DFBB4: /* 800DFBB4 000DCB14 38 00 00 02 */ li r0, 2 /* 800DFBB8 000DCB18 90 1C 02 40 */ stw r0, 0x240(r28) @@ -427,13 +427,13 @@ lbl_800DFBBC: /* 800DFC18 000DCB78 81 83 00 00 */ lwz r12, 0(r3) /* 800DFC1C 000DCB7C 81 8C 00 20 */ lwz r12, 0x20(r12) /* 800DFC20 000DCB80 7D 89 03 A6 */ mtctr r12 -/* 800DFC24 000DCB84 4E 80 04 21 */ bctrl +/* 800DFC24 000DCB84 4E 80 04 21 */ bctrl /* 800DFC28 000DCB88 80 7C 02 34 */ lwz r3, 0x234(r28) /* 800DFC2C 000DCB8C FC 20 F8 90 */ fmr f1, f31 /* 800DFC30 000DCB90 81 83 00 00 */ lwz r12, 0(r3) /* 800DFC34 000DCB94 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800DFC38 000DCB98 7D 89 03 A6 */ mtctr r12 -/* 800DFC3C 000DCB9C 4E 80 04 21 */ bctrl +/* 800DFC3C 000DCB9C 4E 80 04 21 */ bctrl /* 800DFC40 000DCBA0 80 1C 02 40 */ lwz r0, 0x240(r28) /* 800DFC44 000DCBA4 2C 00 00 02 */ cmpwi r0, 2 /* 800DFC48 000DCBA8 40 82 00 28 */ bne lbl_800DFC70 @@ -461,7 +461,7 @@ lbl_800DFC70: /* 800DFC98 000DCBF8 81 83 00 00 */ lwz r12, 0(r3) /* 800DFC9C 000DCBFC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800DFCA0 000DCC00 7D 89 03 A6 */ mtctr r12 -/* 800DFCA4 000DCC04 4E 80 04 21 */ bctrl +/* 800DFCA4 000DCC04 4E 80 04 21 */ bctrl lbl_800DFCA8: /* 800DFCA8 000DCC08 FC 20 F8 90 */ fmr f1, f31 /* 800DFCAC 000DCC0C 7F 83 E3 78 */ mr r3, r28 @@ -478,7 +478,7 @@ lbl_800DFCA8: /* 800DFCD8 000DCC38 83 81 00 90 */ lwz r28, 0x90(r1) /* 800DFCDC 000DCC3C 7C 08 03 A6 */ mtlr r0 /* 800DFCE0 000DCC40 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 800DFCE4 000DCC44 4E 80 00 20 */ blr +/* 800DFCE4 000DCC44 4E 80 00 20 */ blr .global PostRenderGunFx__10CPowerBeamFRC13CStateManagerRC12CTransform4f PostRenderGunFx__10CPowerBeamFRC13CStateManagerRC12CTransform4f: @@ -500,7 +500,7 @@ PostRenderGunFx__10CPowerBeamFRC13CStateManagerRC12CTransform4f: /* 800DFD24 000DCC84 81 83 00 00 */ lwz r12, 0(r3) /* 800DFD28 000DCC88 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800DFD2C 000DCC8C 7D 89 03 A6 */ mtctr r12 -/* 800DFD30 000DCC90 4E 80 04 21 */ bctrl +/* 800DFD30 000DCC90 4E 80 04 21 */ bctrl lbl_800DFD34: /* 800DFD34 000DCC94 7F A3 EB 78 */ mr r3, r29 /* 800DFD38 000DCC98 7F C4 F3 78 */ mr r4, r30 @@ -512,7 +512,7 @@ lbl_800DFD34: /* 800DFD50 000DCCB0 83 A1 00 14 */ lwz r29, 0x14(r1) /* 800DFD54 000DCCB4 7C 08 03 A6 */ mtlr r0 /* 800DFD58 000DCCB8 38 21 00 20 */ addi r1, r1, 0x20 -/* 800DFD5C 000DCCBC 4E 80 00 20 */ blr +/* 800DFD5C 000DCCBC 4E 80 00 20 */ blr .global PreRenderGunFx__10CPowerBeamFRC13CStateManagerRC12CTransform4f PreRenderGunFx__10CPowerBeamFRC13CStateManagerRC12CTransform4f: @@ -542,7 +542,7 @@ PreRenderGunFx__10CPowerBeamFRC13CStateManagerRC12CTransform4f: /* 800DFDBC 000DCD1C 81 83 00 00 */ lwz r12, 0(r3) /* 800DFDC0 000DCD20 81 8C 00 30 */ lwz r12, 0x30(r12) /* 800DFDC4 000DCD24 7D 89 03 A6 */ mtctr r12 -/* 800DFDC8 000DCD28 4E 80 04 21 */ bctrl +/* 800DFDC8 000DCD28 4E 80 04 21 */ bctrl /* 800DFDCC 000DCD2C 80 7E 02 34 */ lwz r3, 0x234(r30) /* 800DFDD0 000DCD30 28 03 00 00 */ cmplwi r3, 0 /* 800DFDD4 000DCD34 41 82 00 20 */ beq lbl_800DFDF4 @@ -552,7 +552,7 @@ PreRenderGunFx__10CPowerBeamFRC13CStateManagerRC12CTransform4f: /* 800DFDE4 000DCD44 81 83 00 00 */ lwz r12, 0(r3) /* 800DFDE8 000DCD48 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800DFDEC 000DCD4C 7D 89 03 A6 */ mtctr r12 -/* 800DFDF0 000DCD50 4E 80 04 21 */ bctrl +/* 800DFDF0 000DCD50 4E 80 04 21 */ bctrl lbl_800DFDF4: /* 800DFDF4 000DCD54 38 61 00 68 */ addi r3, r1, 0x68 /* 800DFDF8 000DCD58 48 22 C9 55 */ bl SetViewPointMatrix__9CGraphicsFRC12CTransform4f @@ -561,7 +561,7 @@ lbl_800DFDF4: /* 800DFE04 000DCD64 83 C1 00 98 */ lwz r30, 0x98(r1) /* 800DFE08 000DCD68 7C 08 03 A6 */ mtlr r0 /* 800DFE0C 000DCD6C 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 800DFE10 000DCD70 4E 80 00 20 */ blr +/* 800DFE10 000DCD70 4E 80 00 20 */ blr .global ReInitVariables__10CPowerBeamFv ReInitVariables__10CPowerBeamFv: @@ -577,7 +577,7 @@ ReInitVariables__10CPowerBeamFv: /* 800DFE38 000DCD98 38 80 00 01 */ li r4, 1 /* 800DFE3C 000DCD9C 81 8C 00 08 */ lwz r12, 8(r12) /* 800DFE40 000DCDA0 7D 89 03 A6 */ mtctr r12 -/* 800DFE44 000DCDA4 4E 80 04 21 */ bctrl +/* 800DFE44 000DCDA4 4E 80 04 21 */ bctrl lbl_800DFE48: /* 800DFE48 000DCDA8 38 00 00 00 */ li r0, 0 /* 800DFE4C 000DCDAC 90 1F 02 34 */ stw r0, 0x234(r31) @@ -588,7 +588,7 @@ lbl_800DFE48: /* 800DFE60 000DCDC0 38 80 00 01 */ li r4, 1 /* 800DFE64 000DCDC4 81 8C 00 08 */ lwz r12, 8(r12) /* 800DFE68 000DCDC8 7D 89 03 A6 */ mtctr r12 -/* 800DFE6C 000DCDCC 4E 80 04 21 */ bctrl +/* 800DFE6C 000DCDCC 4E 80 04 21 */ bctrl lbl_800DFE70: /* 800DFE70 000DCDD0 38 60 00 00 */ li r3, 0 /* 800DFE74 000DCDD4 C0 02 8F 70 */ lfs f0, lbl_805AAC90@sda21(r2) @@ -606,7 +606,7 @@ lbl_800DFE70: /* 800DFEA4 000DCE04 80 01 00 14 */ lwz r0, 0x14(r1) /* 800DFEA8 000DCE08 7C 08 03 A6 */ mtlr r0 /* 800DFEAC 000DCE0C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800DFEB0 000DCE10 4E 80 00 20 */ blr +/* 800DFEB0 000DCE10 4E 80 00 20 */ blr .global __dt__10CPowerBeamFv __dt__10CPowerBeamFv: @@ -630,7 +630,7 @@ __dt__10CPowerBeamFv: /* 800DFEF8 000DCE58 38 80 00 01 */ li r4, 1 /* 800DFEFC 000DCE5C 81 8C 00 08 */ lwz r12, 8(r12) /* 800DFF00 000DCE60 7D 89 03 A6 */ mtctr r12 -/* 800DFF04 000DCE64 4E 80 04 21 */ bctrl +/* 800DFF04 000DCE64 4E 80 04 21 */ bctrl lbl_800DFF08: /* 800DFF08 000DCE68 34 1E 02 34 */ addic. r0, r30, 0x234 /* 800DFF0C 000DCE6C 41 82 00 24 */ beq lbl_800DFF30 @@ -641,7 +641,7 @@ lbl_800DFF08: /* 800DFF20 000DCE80 38 80 00 01 */ li r4, 1 /* 800DFF24 000DCE84 81 8C 00 08 */ lwz r12, 8(r12) /* 800DFF28 000DCE88 7D 89 03 A6 */ mtctr r12 -/* 800DFF2C 000DCE8C 4E 80 04 21 */ bctrl +/* 800DFF2C 000DCE8C 4E 80 04 21 */ bctrl lbl_800DFF30: /* 800DFF30 000DCE90 34 1E 02 28 */ addic. r0, r30, 0x228 /* 800DFF34 000DCE94 41 82 00 18 */ beq lbl_800DFF4C @@ -673,7 +673,7 @@ lbl_800DFF84: /* 800DFF90 000DCEF0 83 C1 00 08 */ lwz r30, 8(r1) /* 800DFF94 000DCEF4 7C 08 03 A6 */ mtlr r0 /* 800DFF98 000DCEF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800DFF9C 000DCEFC 4E 80 00 20 */ blr +/* 800DFF9C 000DCEFC 4E 80 00 20 */ blr .global __ct__10CPowerBeamFUi11EWeaponType9TUniqueId14EMaterialTypesRC9CVector3f __ct__10CPowerBeamFUi11EWeaponType9TUniqueId14EMaterialTypesRC9CVector3f: @@ -698,7 +698,7 @@ __ct__10CPowerBeamFUi11EWeaponType9TUniqueId14EMaterialTypesRC9CVector3f: /* 800DFFE8 000DCF48 81 84 00 00 */ lwz r12, 0(r4) /* 800DFFEC 000DCF4C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800DFFF0 000DCF50 7D 89 03 A6 */ mtctr r12 -/* 800DFFF4 000DCF54 4E 80 04 21 */ bctrl +/* 800DFFF4 000DCF54 4E 80 04 21 */ bctrl /* 800DFFF8 000DCF58 3B DF 02 1C */ addi r30, r31, 0x21c /* 800DFFFC 000DCF5C 38 81 00 14 */ addi r4, r1, 0x14 /* 800E0000 000DCF60 7F C3 F3 78 */ mr r3, r30 @@ -716,7 +716,7 @@ __ct__10CPowerBeamFUi11EWeaponType9TUniqueId14EMaterialTypesRC9CVector3f: /* 800E0030 000DCF90 38 A5 00 11 */ addi r5, r5, 0x11 /* 800E0034 000DCF94 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800E0038 000DCF98 7D 89 03 A6 */ mtctr r12 -/* 800E003C 000DCF9C 4E 80 04 21 */ bctrl +/* 800E003C 000DCF9C 4E 80 04 21 */ bctrl /* 800E0040 000DCFA0 3B DF 02 28 */ addi r30, r31, 0x228 /* 800E0044 000DCFA4 38 81 00 0C */ addi r4, r1, 0xc /* 800E0048 000DCFA8 7F C3 F3 78 */ mr r3, r30 @@ -744,4 +744,4 @@ __ct__10CPowerBeamFUi11EWeaponType9TUniqueId14EMaterialTypesRC9CVector3f: /* 800E00A0 000DD000 80 01 00 34 */ lwz r0, 0x34(r1) /* 800E00A4 000DD004 7C 08 03 A6 */ mtlr r0 /* 800E00A8 000DD008 38 21 00 30 */ addi r1, r1, 0x30 -/* 800E00AC 000DD00C 4E 80 00 20 */ blr +/* 800E00AC 000DD00C 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/Weapons/CPowerBomb.s b/asm/MetroidPrime/Weapons/CPowerBomb.s index 241089df..a1ef47d7 100644 --- a/asm/MetroidPrime/Weapons/CPowerBomb.s +++ b/asm/MetroidPrime/Weapons/CPowerBomb.s @@ -190,7 +190,7 @@ lbl_8014DAA8: /* 8014DAD4 0014AA34 83 81 00 40 */ lwz r28, 0x40(r1) /* 8014DAD8 0014AA38 7C 08 03 A6 */ mtlr r0 /* 8014DADC 0014AA3C 38 21 00 50 */ addi r1, r1, 0x50 -/* 8014DAE0 0014AA40 4E 80 00 20 */ blr +/* 8014DAE0 0014AA40 4E 80 00 20 */ blr .global Accept__10CPowerBombFR8IVisitor Accept__10CPowerBombFR8IVisitor: @@ -203,11 +203,11 @@ Accept__10CPowerBombFR8IVisitor: /* 8014DAFC 0014AA5C 7C 04 03 78 */ mr r4, r0 /* 8014DB00 0014AA60 81 8C 00 E8 */ lwz r12, 0xe8(r12) /* 8014DB04 0014AA64 7D 89 03 A6 */ mtctr r12 -/* 8014DB08 0014AA68 4E 80 04 21 */ bctrl +/* 8014DB08 0014AA68 4E 80 04 21 */ bctrl /* 8014DB0C 0014AA6C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8014DB10 0014AA70 7C 08 03 A6 */ mtlr r0 /* 8014DB14 0014AA74 38 21 00 10 */ addi r1, r1, 0x10 -/* 8014DB18 0014AA78 4E 80 00 20 */ blr +/* 8014DB18 0014AA78 4E 80 00 20 */ blr .global Think__10CPowerBombFfR13CStateManager Think__10CPowerBombFfR13CStateManager: @@ -276,7 +276,7 @@ lbl_8014DBF4: /* 8014DC08 0014AB68 81 83 00 00 */ lwz r12, 0(r3) /* 8014DC0C 0014AB6C 81 8C 00 58 */ lwz r12, 0x58(r12) /* 8014DC10 0014AB70 7D 89 03 A6 */ mtctr r12 -/* 8014DC14 0014AB74 4E 80 04 21 */ bctrl +/* 8014DC14 0014AB74 4E 80 04 21 */ bctrl /* 8014DC18 0014AB78 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8014DC1C 0014AB7C 41 82 00 1C */ beq lbl_8014DC38 /* 8014DC20 0014AB80 A0 1E 00 08 */ lhz r0, 8(r30) @@ -327,7 +327,7 @@ lbl_8014DCC0: /* 8014DCC8 0014AC28 81 83 00 00 */ lwz r12, 0(r3) /* 8014DCCC 0014AC2C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8014DCD0 0014AC30 7D 89 03 A6 */ mtctr r12 -/* 8014DCD4 0014AC34 4E 80 04 21 */ bctrl +/* 8014DCD4 0014AC34 4E 80 04 21 */ bctrl /* 8014DCD8 0014AC38 C0 1E 01 5C */ lfs f0, 0x15c(r30) /* 8014DCDC 0014AC3C EC 00 F8 2A */ fadds f0, f0, f31 /* 8014DCE0 0014AC40 D0 1E 01 5C */ stfs f0, 0x15c(r30) @@ -339,11 +339,11 @@ lbl_8014DCE4: /* 8014DCF4 0014AC54 83 C1 00 28 */ lwz r30, 0x28(r1) /* 8014DCF8 0014AC58 7C 08 03 A6 */ mtlr r0 /* 8014DCFC 0014AC5C 38 21 00 40 */ addi r1, r1, 0x40 -/* 8014DD00 0014AC60 4E 80 00 20 */ blr +/* 8014DD00 0014AC60 4E 80 00 20 */ blr .global nullsub_228 nullsub_228: -/* 8014DD04 0014AC64 4E 80 00 20 */ blr +/* 8014DD04 0014AC64 4E 80 00 20 */ blr .global AddToRenderer__10CPowerBombCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__10CPowerBombCFRC14CFrustumPlanesRC13CStateManager: @@ -356,23 +356,23 @@ AddToRenderer__10CPowerBombCFRC14CFrustumPlanesRC13CStateManager: /* 8014DD20 0014AC80 81 83 00 00 */ lwz r12, 0(r3) /* 8014DD24 0014AC84 81 8C 00 34 */ lwz r12, 0x34(r12) /* 8014DD28 0014AC88 7D 89 03 A6 */ mtctr r12 -/* 8014DD2C 0014AC8C 4E 80 04 21 */ bctrl +/* 8014DD2C 0014AC8C 4E 80 04 21 */ bctrl /* 8014DD30 0014AC90 80 01 00 14 */ lwz r0, 0x14(r1) /* 8014DD34 0014AC94 7C 08 03 A6 */ mtlr r0 /* 8014DD38 0014AC98 38 21 00 10 */ addi r1, r1, 0x10 -/* 8014DD3C 0014AC9C 4E 80 00 20 */ blr +/* 8014DD3C 0014AC9C 4E 80 00 20 */ blr .global GetTouchBounds__10CPowerBombCFv GetTouchBounds__10CPowerBombCFv: /* 8014DD40 0014ACA0 38 00 00 00 */ li r0, 0 /* 8014DD44 0014ACA4 98 03 00 18 */ stb r0, 0x18(r3) -/* 8014DD48 0014ACA8 4E 80 00 20 */ blr +/* 8014DD48 0014ACA8 4E 80 00 20 */ blr .global Touch__10CPowerBombFR6CActorR13CStateManager Touch__10CPowerBombFR6CActorR13CStateManager: /* 8014DD4C 0014ACAC 88 03 01 58 */ lbz r0, 0x158(r3) /* 8014DD50 0014ACB0 54 00 CF FF */ rlwinm. r0, r0, 0x19, 0x1f, 0x1f -/* 8014DD54 0014ACB4 4E 80 00 20 */ blr +/* 8014DD54 0014ACB4 4E 80 00 20 */ blr .global sub_8014dd58 sub_8014dd58: @@ -403,7 +403,7 @@ sub_8014dd58: /* 8014DDB8 0014AD18 80 01 00 34 */ lwz r0, 0x34(r1) /* 8014DDBC 0014AD1C 7C 08 03 A6 */ mtlr r0 /* 8014DDC0 0014AD20 38 21 00 30 */ addi r1, r1, 0x30 -/* 8014DDC4 0014AD24 4E 80 00 20 */ blr +/* 8014DDC4 0014AD24 4E 80 00 20 */ blr .global __dt__10CPowerBombFv __dt__10CPowerBombFv: @@ -427,7 +427,7 @@ __dt__10CPowerBombFv: /* 8014DE0C 0014AD6C 38 80 00 01 */ li r4, 1 /* 8014DE10 0014AD70 81 8C 00 08 */ lwz r12, 8(r12) /* 8014DE14 0014AD74 7D 89 03 A6 */ mtctr r12 -/* 8014DE18 0014AD78 4E 80 04 21 */ bctrl +/* 8014DE18 0014AD78 4E 80 04 21 */ bctrl lbl_8014DE1C: /* 8014DE1C 0014AD7C 7F C3 F3 78 */ mr r3, r30 /* 8014DE20 0014AD80 38 80 00 00 */ li r4, 0 @@ -443,7 +443,7 @@ lbl_8014DE38: /* 8014DE44 0014ADA4 83 C1 00 08 */ lwz r30, 8(r1) /* 8014DE48 0014ADA8 7C 08 03 A6 */ mtlr r0 /* 8014DE4C 0014ADAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8014DE50 0014ADB0 4E 80 00 20 */ blr +/* 8014DE50 0014ADB0 4E 80 00 20 */ blr .global "__ct__10CPowerBombF25TToken<15CGenDescription>9TUniqueId7TAreaId9TUniqueIdRC12CTransform4fRC11CDamageInfo" "__ct__10CPowerBombF25TToken<15CGenDescription>9TUniqueId7TAreaId9TUniqueIdRC12CTransform4fRC11CDamageInfo": @@ -611,13 +611,13 @@ lbl_8014E0A8: /* 8014E0D0 0014B030 81 83 00 00 */ lwz r12, 0(r3) /* 8014E0D4 0014B034 81 8C 00 20 */ lwz r12, 0x20(r12) /* 8014E0D8 0014B038 7D 89 03 A6 */ mtctr r12 -/* 8014E0DC 0014B03C 4E 80 04 21 */ bctrl +/* 8014E0DC 0014B03C 4E 80 04 21 */ bctrl /* 8014E0E0 0014B040 7F C3 F3 78 */ mr r3, r30 /* 8014E0E4 0014B044 BA 61 00 CC */ lmw r19, 0xcc(r1) /* 8014E0E8 0014B048 80 01 01 04 */ lwz r0, 0x104(r1) /* 8014E0EC 0014B04C 7C 08 03 A6 */ mtlr r0 /* 8014E0F0 0014B050 38 21 01 00 */ addi r1, r1, 0x100 -/* 8014E0F4 0014B054 4E 80 00 20 */ blr +/* 8014E0F4 0014B054 4E 80 00 20 */ blr .global __sinit_CPowerBomb_cpp __sinit_CPowerBomb_cpp: diff --git a/asm/MetroidPrime/Weapons/CProjectileInfo.s b/asm/MetroidPrime/Weapons/CProjectileInfo.s index 9b84a89e..6065283d 100644 --- a/asm/MetroidPrime/Weapons/CProjectileInfo.s +++ b/asm/MetroidPrime/Weapons/CProjectileInfo.s @@ -159,7 +159,7 @@ lbl_8021BEB0: /* 8021BEDC 00218E3C 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 8021BEE0 00218E40 7C 08 03 A6 */ mtlr r0 /* 8021BEE4 00218E44 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8021BEE8 00218E48 4E 80 00 20 */ blr +/* 8021BEE8 00218E48 4E 80 00 20 */ blr .global PredictInterceptPos__15CProjectileInfoFRC9CVector3fRC9CVector3fRC7CPlayerbf PredictInterceptPos__15CProjectileInfoFRC9CVector3fRC9CVector3fRC7CPlayerbf: @@ -188,7 +188,7 @@ PredictInterceptPos__15CProjectileInfoFRC9CVector3fRC9CVector3fRC7CPlayerbf: /* 8021BF44 00218EA4 80 01 00 34 */ lwz r0, 0x34(r1) /* 8021BF48 00218EA8 7C 08 03 A6 */ mtlr r0 /* 8021BF4C 00218EAC 38 21 00 30 */ addi r1, r1, 0x30 -/* 8021BF50 00218EB0 4E 80 00 20 */ blr +/* 8021BF50 00218EB0 4E 80 00 20 */ blr .global GetProjectileSpeed__15CProjectileInfoCFv GetProjectileSpeed__15CProjectileInfoCFv: @@ -223,7 +223,7 @@ GetProjectileSpeed__15CProjectileInfoCFv: /* 8021BFC4 00218F24 81 83 00 00 */ lwz r12, 0(r3) /* 8021BFC8 00218F28 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8021BFCC 00218F2C 7D 89 03 A6 */ mtctr r12 -/* 8021BFD0 00218F30 4E 80 04 21 */ bctrl +/* 8021BFD0 00218F30 4E 80 04 21 */ bctrl /* 8021BFD4 00218F34 48 09 51 69 */ bl GetTickPeriod__17CProjectileWeaponFv /* 8021BFD8 00218F38 FF E0 08 90 */ fmr f31, f1 /* 8021BFDC 00218F3C 38 61 00 10 */ addi r3, r1, 0x10 @@ -239,7 +239,7 @@ lbl_8021BFE8: /* 8021C000 00218F60 CB E1 00 20 */ lfd f31, 0x20(r1) /* 8021C004 00218F64 7C 08 03 A6 */ mtlr r0 /* 8021C008 00218F68 38 21 00 30 */ addi r1, r1, 0x30 -/* 8021C00C 00218F6C 4E 80 00 20 */ blr +/* 8021C00C 00218F6C 4E 80 00 20 */ blr .global sub_8021c010 sub_8021c010: @@ -262,7 +262,7 @@ sub_8021c010: /* 8021C050 00218FB0 81 84 00 00 */ lwz r12, 0(r4) /* 8021C054 00218FB4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8021C058 00218FB8 7D 89 03 A6 */ mtctr r12 -/* 8021C05C 00218FBC 4E 80 04 21 */ bctrl +/* 8021C05C 00218FBC 4E 80 04 21 */ bctrl /* 8021C060 00218FC0 7F C3 F3 78 */ mr r3, r30 /* 8021C064 00218FC4 38 81 00 08 */ addi r4, r1, 8 /* 8021C068 00218FC8 48 12 4E 41 */ bl __ct__6CTokenFRC6CToken @@ -280,7 +280,7 @@ sub_8021c010: /* 8021C098 00218FF8 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8021C09C 00218FFC 7C 08 03 A6 */ mtlr r0 /* 8021C0A0 00219000 38 21 00 20 */ addi r1, r1, 0x20 -/* 8021C0A4 00219004 4E 80 00 20 */ blr +/* 8021C0A4 00219004 4E 80 00 20 */ blr .global __ct__15CProjectileInfoFUiRC11CDamageInfo __ct__15CProjectileInfoFUiRC11CDamageInfo: @@ -301,7 +301,7 @@ __ct__15CProjectileInfoFUiRC11CDamageInfo: /* 8021C0E0 00219040 81 84 00 00 */ lwz r12, 0(r4) /* 8021C0E4 00219044 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8021C0E8 00219048 7D 89 03 A6 */ mtctr r12 -/* 8021C0EC 0021904C 4E 80 04 21 */ bctrl +/* 8021C0EC 0021904C 4E 80 04 21 */ bctrl /* 8021C0F0 00219050 7F C3 F3 78 */ mr r3, r30 /* 8021C0F4 00219054 38 81 00 08 */ addi r4, r1, 8 /* 8021C0F8 00219058 48 12 4D B1 */ bl __ct__6CTokenFRC6CToken diff --git a/asm/MetroidPrime/Weapons/CShockWave.s b/asm/MetroidPrime/Weapons/CShockWave.s index 3af0b5c4..9ebbf219 100644 --- a/asm/MetroidPrime/Weapons/CShockWave.s +++ b/asm/MetroidPrime/Weapons/CShockWave.s @@ -118,7 +118,7 @@ lbl_80231728: /* 80231740 0022E6A0 38 80 00 01 */ li r4, 1 /* 80231744 0022E6A4 81 8C 00 08 */ lwz r12, 8(r12) /* 80231748 0022E6A8 7D 89 03 A6 */ mtctr r12 -/* 8023174C 0022E6AC 4E 80 04 21 */ bctrl +/* 8023174C 0022E6AC 4E 80 04 21 */ bctrl lbl_80231750: /* 80231750 0022E6B0 34 1F 01 08 */ addic. r0, r31, 0x108 /* 80231754 0022E6B4 41 82 00 10 */ beq lbl_80231764 @@ -140,7 +140,7 @@ lbl_80231780: /* 8023178C 0022E6EC 83 C1 00 08 */ lwz r30, 8(r1) /* 80231790 0022E6F0 7C 08 03 A6 */ mtlr r0 /* 80231794 0022E6F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80231798 0022E6F8 4E 80 00 20 */ blr +/* 80231798 0022E6F8 4E 80 00 20 */ blr .global AcceptScriptMsg__10CShockwaveF20EScriptObjectMessage9TUniqueIdR13CStateManager AcceptScriptMsg__10CShockwaveF20EScriptObjectMessage9TUniqueIdR13CStateManager: @@ -163,7 +163,7 @@ lbl_802317D4: /* 802317D8 0022E738 81 83 00 00 */ lwz r12, 0(r3) /* 802317DC 0022E73C 81 8C 00 64 */ lwz r12, 0x64(r12) /* 802317E0 0022E740 7D 89 03 A6 */ mtctr r12 -/* 802317E4 0022E744 4E 80 04 21 */ bctrl +/* 802317E4 0022E744 4E 80 04 21 */ bctrl /* 802317E8 0022E748 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802317EC 0022E74C 41 82 01 44 */ beq lbl_80231930 /* 802317F0 0022E750 7F E4 FB 78 */ mr r4, r31 @@ -208,7 +208,7 @@ lbl_802317D4: /* 8023188C 0022E7EC 81 84 00 00 */ lwz r12, 0(r4) /* 80231890 0022E7F0 81 8C 00 68 */ lwz r12, 0x68(r12) /* 80231894 0022E7F4 7D 89 03 A6 */ mtctr r12 -/* 80231898 0022E7F8 4E 80 04 21 */ bctrl +/* 80231898 0022E7F8 4E 80 04 21 */ bctrl /* 8023189C 0022E7FC 93 01 00 08 */ stw r24, 8(r1) /* 802318A0 0022E800 38 00 00 01 */ li r0, 1 /* 802318A4 0022E804 C0 22 B6 A8 */ lfs f1, lbl_805AD3C8@sda21(r2) @@ -270,7 +270,7 @@ lbl_80231930: /* 80231974 0022E8D4 80 01 00 D4 */ lwz r0, 0xd4(r1) /* 80231978 0022E8D8 7C 08 03 A6 */ mtlr r0 /* 8023197C 0022E8DC 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 80231980 0022E8E0 4E 80 00 20 */ blr +/* 80231980 0022E8E0 4E 80 00 20 */ blr .global sub_80231984 sub_80231984: @@ -286,14 +286,14 @@ lbl_8023199C: /* 802319A4 0022E904 7C 03 00 40 */ cmplw r3, r0 /* 802319A8 0022E908 40 82 00 0C */ bne lbl_802319B4 /* 802319AC 0022E90C 38 60 00 01 */ li r3, 1 -/* 802319B0 0022E910 4E 80 00 20 */ blr +/* 802319B0 0022E910 4E 80 00 20 */ blr lbl_802319B4: /* 802319B4 0022E914 38 C6 00 02 */ addi r6, r6, 2 lbl_802319B8: /* 802319B8 0022E918 7C 06 28 40 */ cmplw r6, r5 /* 802319BC 0022E91C 40 82 FF E0 */ bne lbl_8023199C /* 802319C0 0022E920 38 60 00 00 */ li r3, 0 -/* 802319C4 0022E924 4E 80 00 20 */ blr +/* 802319C4 0022E924 4E 80 00 20 */ blr .global GetTouchBounds__10CShockwaveCFv GetTouchBounds__10CShockwaveCFv: @@ -350,7 +350,7 @@ lbl_80231A80: /* 80231A88 0022E9E8 83 C1 00 58 */ lwz r30, 0x58(r1) /* 80231A8C 0022E9EC 7C 08 03 A6 */ mtlr r0 /* 80231A90 0022E9F0 38 21 00 60 */ addi r1, r1, 0x60 -/* 80231A94 0022E9F4 4E 80 00 20 */ blr +/* 80231A94 0022E9F4 4E 80 00 20 */ blr .global Touch__10CShockwaveFR6CActorR13CStateManager Touch__10CShockwaveFR6CActorR13CStateManager: @@ -754,7 +754,7 @@ lbl_80232050: /* 8023207C 0022EFDC 80 01 01 C4 */ lwz r0, 0x1c4(r1) /* 80232080 0022EFE0 7C 08 03 A6 */ mtlr r0 /* 80232084 0022EFE4 38 21 01 C0 */ addi r1, r1, 0x1c0 -/* 80232088 0022EFE8 4E 80 00 20 */ blr +/* 80232088 0022EFE8 4E 80 00 20 */ blr .global AddToRenderer__10CShockwaveCFRC14CFrustumPlanesRC13CStateManager AddToRenderer__10CShockwaveCFRC14CFrustumPlanesRC13CStateManager: @@ -769,12 +769,12 @@ AddToRenderer__10CShockwaveCFRC14CFrustumPlanesRC13CStateManager: /* 802320AC 0022F00C 81 83 00 00 */ lwz r12, 0(r3) /* 802320B0 0022F010 81 8C 00 34 */ lwz r12, 0x34(r12) /* 802320B4 0022F014 7D 89 03 A6 */ mtctr r12 -/* 802320B8 0022F018 4E 80 04 21 */ bctrl +/* 802320B8 0022F018 4E 80 04 21 */ bctrl /* 802320BC 0022F01C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802320C0 0022F020 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802320C4 0022F024 7C 08 03 A6 */ mtlr r0 /* 802320C8 0022F028 38 21 00 10 */ addi r1, r1, 0x10 -/* 802320CC 0022F02C 4E 80 00 20 */ blr +/* 802320CC 0022F02C 4E 80 00 20 */ blr .global Render__10CShockwaveCFRC13CStateManager Render__10CShockwaveCFRC13CStateManager: @@ -788,12 +788,12 @@ Render__10CShockwaveCFRC13CStateManager: /* 802320EC 0022F04C 81 83 00 00 */ lwz r12, 0(r3) /* 802320F0 0022F050 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802320F4 0022F054 7D 89 03 A6 */ mtctr r12 -/* 802320F8 0022F058 4E 80 04 21 */ bctrl +/* 802320F8 0022F058 4E 80 04 21 */ bctrl /* 802320FC 0022F05C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80232100 0022F060 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80232104 0022F064 7C 08 03 A6 */ mtlr r0 /* 80232108 0022F068 38 21 00 10 */ addi r1, r1, 0x10 -/* 8023210C 0022F06C 4E 80 00 20 */ blr +/* 8023210C 0022F06C 4E 80 00 20 */ blr .global Think__10CShockwaveFfR13CStateManager Think__10CShockwaveFfR13CStateManager: @@ -816,7 +816,7 @@ Think__10CShockwaveFfR13CStateManager: /* 80232150 0022F0B0 81 83 00 00 */ lwz r12, 0(r3) /* 80232154 0022F0B4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80232158 0022F0B8 7D 89 03 A6 */ mtctr r12 -/* 8023215C 0022F0BC 4E 80 04 21 */ bctrl +/* 8023215C 0022F0BC 4E 80 04 21 */ bctrl /* 80232160 0022F0C0 C0 1F 01 58 */ lfs f0, 0x158(r31) /* 80232164 0022F0C4 38 80 00 00 */ li r4, 0 /* 80232168 0022F0C8 EC 00 F8 2A */ fadds f0, f0, f31 @@ -842,7 +842,7 @@ lbl_802321A4: /* 802321B4 0022F114 7C 7D 1B 78 */ mr r29, r3 /* 802321B8 0022F118 81 8C 00 74 */ lwz r12, 0x74(r12) /* 802321BC 0022F11C 7D 89 03 A6 */ mtctr r12 -/* 802321C0 0022F120 4E 80 04 21 */ bctrl +/* 802321C0 0022F120 4E 80 04 21 */ bctrl /* 802321C4 0022F124 3C 03 AF BF */ addis r0, r3, 0xafbf /* 802321C8 0022F128 28 00 52 54 */ cmplwi r0, 0x5254 /* 802321CC 0022F12C 40 82 00 14 */ bne lbl_802321E0 @@ -879,7 +879,7 @@ lbl_80232234: /* 80232238 0022F198 81 83 00 00 */ lwz r12, 0(r3) /* 8023223C 0022F19C 81 8C 00 58 */ lwz r12, 0x58(r12) /* 80232240 0022F1A0 7D 89 03 A6 */ mtctr r12 -/* 80232244 0022F1A4 4E 80 04 21 */ bctrl +/* 80232244 0022F1A4 4E 80 04 21 */ bctrl /* 80232248 0022F1A8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8023224C 0022F1AC 41 82 00 40 */ beq lbl_8023228C /* 80232250 0022F1B0 C0 3F 01 5C */ lfs f1, 0x15c(r31) @@ -921,7 +921,7 @@ lbl_8023228C: /* 802322DC 0022F23C 81 84 00 00 */ lwz r12, 0(r4) /* 802322E0 0022F240 81 8C 00 68 */ lwz r12, 0x68(r12) /* 802322E4 0022F244 7D 89 03 A6 */ mtctr r12 -/* 802322E8 0022F248 4E 80 04 21 */ bctrl +/* 802322E8 0022F248 4E 80 04 21 */ bctrl /* 802322EC 0022F24C 7F C3 F3 78 */ mr r3, r30 /* 802322F0 0022F250 38 81 00 1C */ addi r4, r1, 0x1c /* 802322F4 0022F254 4B E8 34 51 */ bl SetLight__10CGameLightFRC6CLight @@ -935,7 +935,7 @@ lbl_802322F8: /* 80232310 0022F270 83 81 00 70 */ lwz r28, 0x70(r1) /* 80232314 0022F274 7C 08 03 A6 */ mtlr r0 /* 80232318 0022F278 38 21 00 90 */ addi r1, r1, 0x90 -/* 8023231C 0022F27C 4E 80 00 20 */ blr +/* 8023231C 0022F27C 4E 80 00 20 */ blr .global Accept__10CShockwaveFR8IVisitor Accept__10CShockwaveFR8IVisitor: @@ -948,11 +948,11 @@ Accept__10CShockwaveFR8IVisitor: /* 80232338 0022F298 7C 04 03 78 */ mr r4, r0 /* 8023233C 0022F29C 81 8C 00 08 */ lwz r12, 8(r12) /* 80232340 0022F2A0 7D 89 03 A6 */ mtctr r12 -/* 80232344 0022F2A4 4E 80 04 21 */ bctrl +/* 80232344 0022F2A4 4E 80 04 21 */ bctrl /* 80232348 0022F2A8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8023234C 0022F2AC 7C 08 03 A6 */ mtlr r0 /* 80232350 0022F2B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80232354 0022F2B4 4E 80 00 20 */ blr +/* 80232354 0022F2B4 4E 80 00 20 */ blr .global __ct__10CShockWaveFv __ct__10CShockWaveFv: @@ -1043,7 +1043,7 @@ __ct__10CShockWaveFv: /* 802324A8 0022F408 81 84 00 00 */ lwz r12, 0(r4) /* 802324AC 0022F40C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802324B0 0022F410 7D 89 03 A6 */ mtctr r12 -/* 802324B4 0022F414 4E 80 04 21 */ bctrl +/* 802324B4 0022F414 4E 80 04 21 */ bctrl /* 802324B8 0022F418 38 7E 01 08 */ addi r3, r30, 0x108 /* 802324BC 0022F41C 38 81 00 38 */ addi r4, r1, 0x38 /* 802324C0 0022F420 48 10 E9 E9 */ bl __ct__6CTokenFRC6CToken @@ -1138,7 +1138,7 @@ lbl_80232530: /* 8023261C 0022F57C 81 84 00 00 */ lwz r12, 0(r4) /* 80232620 0022F580 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80232624 0022F584 7D 89 03 A6 */ mtctr r12 -/* 80232628 0022F588 4E 80 04 21 */ bctrl +/* 80232628 0022F588 4E 80 04 21 */ bctrl /* 8023262C 0022F58C 38 61 00 18 */ addi r3, r1, 0x18 /* 80232630 0022F590 38 81 00 20 */ addi r4, r1, 0x20 /* 80232634 0022F594 3B A0 00 01 */ li r29, 1 @@ -1213,7 +1213,7 @@ lbl_80232710: /* 80232720 0022F680 81 83 00 00 */ lwz r12, 0(r3) /* 80232724 0022F684 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 80232728 0022F688 7D 89 03 A6 */ mtctr r12 -/* 8023272C 0022F68C 4E 80 04 21 */ bctrl +/* 8023272C 0022F68C 4E 80 04 21 */ bctrl /* 80232730 0022F690 83 5E 01 10 */ lwz r26, 0x110(r30) /* 80232734 0022F694 38 61 00 74 */ addi r3, r1, 0x74 /* 80232738 0022F698 38 9E 00 34 */ addi r4, r30, 0x34 @@ -1223,7 +1223,7 @@ lbl_80232710: /* 80232748 0022F6A8 81 9A 00 00 */ lwz r12, 0(r26) /* 8023274C 0022F6AC 81 8C 00 14 */ lwz r12, 0x14(r12) /* 80232750 0022F6B0 7D 89 03 A6 */ mtctr r12 -/* 80232754 0022F6B4 4E 80 04 21 */ bctrl +/* 80232754 0022F6B4 4E 80 04 21 */ bctrl /* 80232758 0022F6B8 C0 5E 00 60 */ lfs f2, 0x60(r30) /* 8023275C 0022F6BC 38 81 00 50 */ addi r4, r1, 0x50 /* 80232760 0022F6C0 C0 3E 00 50 */ lfs f1, 0x50(r30) @@ -1235,7 +1235,7 @@ lbl_80232710: /* 80232778 0022F6D8 81 83 00 00 */ lwz r12, 0(r3) /* 8023277C 0022F6DC 81 8C 00 20 */ lwz r12, 0x20(r12) /* 80232780 0022F6E0 7D 89 03 A6 */ mtctr r12 -/* 80232784 0022F6E4 4E 80 04 21 */ bctrl +/* 80232784 0022F6E4 4E 80 04 21 */ bctrl /* 80232788 0022F6E8 88 1E 00 E6 */ lbz r0, 0xe6(r30) /* 8023278C 0022F6EC 38 60 00 02 */ li r3, 2 /* 80232790 0022F6F0 50 60 1E F8 */ rlwimi r0, r3, 3, 0x1b, 0x1c diff --git a/asm/MetroidPrime/Weapons/CTargetableProjectile.s b/asm/MetroidPrime/Weapons/CTargetableProjectile.s index 8f15c397..e7937a10 100644 --- a/asm/MetroidPrime/Weapons/CTargetableProjectile.s +++ b/asm/MetroidPrime/Weapons/CTargetableProjectile.s @@ -82,7 +82,7 @@ lbl_8013B8D8: /* 8013B8E4 00138844 83 C1 00 08 */ lwz r30, 8(r1) /* 8013B8E8 00138848 7C 08 03 A6 */ mtlr r0 /* 8013B8EC 0013884C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8013B8F0 00138850 4E 80 00 20 */ blr +/* 8013B8F0 00138850 4E 80 00 20 */ blr .global __dt__17CEnergyProjectileFv __dt__17CEnergyProjectileFv: @@ -131,7 +131,7 @@ lbl_8013B980: /* 8013B98C 001388EC 83 C1 00 08 */ lwz r30, 8(r1) /* 8013B990 001388F0 7C 08 03 A6 */ mtlr r0 /* 8013B994 001388F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8013B998 001388F8 4E 80 00 20 */ blr +/* 8013B998 001388F8 4E 80 00 20 */ blr .global ResolveCollisionWithActor__21CTargetableProjectileFRC14CRayCastResultR6CActorR13CStateManager ResolveCollisionWithActor__21CTargetableProjectileFRC14CRayCastResultR6CActorR13CStateManager: @@ -153,7 +153,7 @@ ResolveCollisionWithActor__21CTargetableProjectileFRC14CRayCastResultR6CActorR13 /* 8013B9D8 00138938 81 9C 00 00 */ lwz r12, 0(r28) /* 8013B9DC 0013893C 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 8013B9E0 00138940 7D 89 03 A6 */ mtctr r12 -/* 8013B9E4 00138944 4E 80 04 21 */ bctrl +/* 8013B9E4 00138944 4E 80 04 21 */ bctrl /* 8013B9E8 00138948 C0 41 00 14 */ lfs f2, 0x14(r1) /* 8013B9EC 0013894C 3C 60 80 5A */ lis r3, lbl_805A66F4@ha /* 8013B9F0 00138950 C0 21 00 18 */ lfs f1, 0x18(r1) @@ -206,7 +206,7 @@ ResolveCollisionWithActor__21CTargetableProjectileFRC14CRayCastResultR6CActorR13 /* 8013BAAC 00138A0C 83 81 00 90 */ lwz r28, 0x90(r1) /* 8013BAB0 00138A10 7C 08 03 A6 */ mtlr r0 /* 8013BAB4 00138A14 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8013BAB8 00138A18 4E 80 00 20 */ blr +/* 8013BAB8 00138A18 4E 80 00 20 */ blr .global GetAimPosition__21CTargetableProjectileCFRC13CStateManagerf GetAimPosition__21CTargetableProjectileCFRC13CStateManagerf: @@ -307,7 +307,7 @@ lbl_8013BB3C: /* 8013BC30 00138B90 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8013BC34 00138B94 7C 08 03 A6 */ mtlr r0 /* 8013BC38 00138B98 38 21 00 90 */ addi r1, r1, 0x90 -/* 8013BC3C 00138B9C 4E 80 00 20 */ blr +/* 8013BC3C 00138B9C 4E 80 00 20 */ blr .global Think__21CTargetableProjectileFfR13CStateManager Think__21CTargetableProjectileFfR13CStateManager: @@ -359,7 +359,7 @@ Think__21CTargetableProjectileFfR13CStateManager: /* 8013BCF4 00138C54 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 8013BCF8 00138C58 C0 22 9A A4 */ lfs f1, lbl_805AB7C4@sda21(r2) /* 8013BCFC 00138C5C 7D 89 03 A6 */ mtctr r12 -/* 8013BD00 00138C60 4E 80 04 21 */ bctrl +/* 8013BD00 00138C60 4E 80 04 21 */ bctrl /* 8013BD04 00138C64 C0 41 00 9C */ lfs f2, 0x9c(r1) /* 8013BD08 00138C68 3C 60 80 3D */ lis r3, lbl_803D0070@ha /* 8013BD0C 00138C6C C0 21 00 A0 */ lfs f1, 0xa0(r1) @@ -397,7 +397,7 @@ Think__21CTargetableProjectileFfR13CStateManager: /* 8013BD8C 00138CEC 81 8C 00 18 */ lwz r12, 0x18(r12) /* 8013BD90 00138CF0 83 3C 00 F0 */ lwz r25, 0xf0(r28) /* 8013BD94 00138CF4 7D 89 03 A6 */ mtctr r12 -/* 8013BD98 00138CF8 4E 80 04 21 */ bctrl +/* 8013BD98 00138CF8 4E 80 04 21 */ bctrl /* 8013BD9C 00138CFC 3C 80 80 5A */ lis r4, lbl_805A66F4@ha /* 8013BDA0 00138D00 38 61 00 B4 */ addi r3, r1, 0xb4 /* 8013BDA4 00138D04 38 C4 66 F4 */ addi r6, r4, lbl_805A66F4@l @@ -473,7 +473,7 @@ lbl_8013BEA4: /* 8013BEAC 00138E0C 80 01 01 14 */ lwz r0, 0x114(r1) /* 8013BEB0 00138E10 7C 08 03 A6 */ mtlr r0 /* 8013BEB4 00138E14 38 21 01 10 */ addi r1, r1, 0x110 -/* 8013BEB8 00138E18 4E 80 00 20 */ blr +/* 8013BEB8 00138E18 4E 80 00 20 */ blr .global Accept__21CTargetableProjectileFR8IVisitor Accept__21CTargetableProjectileFR8IVisitor: @@ -486,11 +486,11 @@ Accept__21CTargetableProjectileFR8IVisitor: /* 8013BED4 00138E34 7C 04 03 78 */ mr r4, r0 /* 8013BED8 00138E38 81 8C 00 20 */ lwz r12, 0x20(r12) /* 8013BEDC 00138E3C 7D 89 03 A6 */ mtctr r12 -/* 8013BEE0 00138E40 4E 80 04 21 */ bctrl +/* 8013BEE0 00138E40 4E 80 04 21 */ bctrl /* 8013BEE4 00138E44 80 01 00 14 */ lwz r0, 0x14(r1) /* 8013BEE8 00138E48 7C 08 03 A6 */ mtlr r0 /* 8013BEEC 00138E4C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8013BEF0 00138E50 4E 80 00 20 */ blr +/* 8013BEF0 00138E50 4E 80 00 20 */ blr .global "__ct__21CTargetableProjectileFRC28TToken<18CWeaponDescription>11EWeaponTypeRC12CTransform4f14EMaterialTypesRC11CDamageInfoRC11CDamageInfo9TUniqueId9TUniqueIdRC28TToken<18CWeaponDescription>9TUniqueIdUi" "__ct__21CTargetableProjectileFRC28TToken<18CWeaponDescription>11EWeaponTypeRC12CTransform4f14EMaterialTypesRC11CDamageInfoRC11CDamageInfo9TUniqueId9TUniqueIdRC28TToken<18CWeaponDescription>9TUniqueIdUi": diff --git a/asm/MetroidPrime/Weapons/CWaveBeam.s b/asm/MetroidPrime/Weapons/CWaveBeam.s index 4bbb519a..8c7db5cd 100644 --- a/asm/MetroidPrime/Weapons/CWaveBeam.s +++ b/asm/MetroidPrime/Weapons/CWaveBeam.s @@ -93,7 +93,7 @@ lbl_800E0164: /* 800E0174 000DD0D4 38 80 00 01 */ li r4, 1 /* 800E0178 000DD0D8 81 8C 00 08 */ lwz r12, 8(r12) /* 800E017C 000DD0DC 7D 89 03 A6 */ mtctr r12 -/* 800E0180 000DD0E0 4E 80 04 21 */ bctrl +/* 800E0180 000DD0E0 4E 80 04 21 */ bctrl lbl_800E0184: /* 800E0184 000DD0E4 7F 60 07 75 */ extsb. r0, r27 /* 800E0188 000DD0E8 93 9E 02 50 */ stw r28, 0x250(r30) @@ -107,7 +107,7 @@ lbl_800E019C: /* 800E01A4 000DD104 81 83 00 00 */ lwz r12, 0(r3) /* 800E01A8 000DD108 81 8C 00 24 */ lwz r12, 0x24(r12) /* 800E01AC 000DD10C 7D 89 03 A6 */ mtctr r12 -/* 800E01B0 000DD110 4E 80 04 21 */ bctrl +/* 800E01B0 000DD110 4E 80 04 21 */ bctrl /* 800E01B4 000DD114 38 61 00 18 */ addi r3, r1, 0x18 /* 800E01B8 000DD118 38 80 00 00 */ li r4, 0 /* 800E01BC 000DD11C 48 26 0C 85 */ bl __dt__6CTokenFv @@ -130,7 +130,7 @@ lbl_800E01E4: /* 800E01F4 000DD154 38 80 00 01 */ li r4, 1 /* 800E01F8 000DD158 81 8C 00 08 */ lwz r12, 8(r12) /* 800E01FC 000DD15C 7D 89 03 A6 */ mtctr r12 -/* 800E0200 000DD160 4E 80 04 21 */ bctrl +/* 800E0200 000DD160 4E 80 04 21 */ bctrl lbl_800E0204: /* 800E0204 000DD164 38 00 00 00 */ li r0, 0 /* 800E0208 000DD168 90 1E 02 54 */ stw r0, 0x254(r30) @@ -152,7 +152,7 @@ lbl_800E0210: /* 800E0244 000DD1A4 38 80 00 00 */ li r4, 0 /* 800E0248 000DD1A8 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 800E024C 000DD1AC 7D 89 03 A6 */ mtctr r12 -/* 800E0250 000DD1B0 4E 80 04 21 */ bctrl +/* 800E0250 000DD1B0 4E 80 04 21 */ bctrl /* 800E0254 000DD1B4 48 00 00 B4 */ b lbl_800E0308 lbl_800E0258: /* 800E0258 000DD1B8 3C 60 80 3D */ lis r3, lbl_803CE568@ha @@ -181,7 +181,7 @@ lbl_800E02A0: /* 800E02B0 000DD210 38 80 00 01 */ li r4, 1 /* 800E02B4 000DD214 81 8C 00 08 */ lwz r12, 8(r12) /* 800E02B8 000DD218 7D 89 03 A6 */ mtctr r12 -/* 800E02BC 000DD21C 4E 80 04 21 */ bctrl +/* 800E02BC 000DD21C 4E 80 04 21 */ bctrl lbl_800E02C0: /* 800E02C0 000DD220 7F 60 07 75 */ extsb. r0, r27 /* 800E02C4 000DD224 93 9E 02 54 */ stw r28, 0x254(r30) @@ -195,7 +195,7 @@ lbl_800E02D8: /* 800E02E0 000DD240 81 83 00 00 */ lwz r12, 0(r3) /* 800E02E4 000DD244 81 8C 00 24 */ lwz r12, 0x24(r12) /* 800E02E8 000DD248 7D 89 03 A6 */ mtctr r12 -/* 800E02EC 000DD24C 4E 80 04 21 */ bctrl +/* 800E02EC 000DD24C 4E 80 04 21 */ bctrl /* 800E02F0 000DD250 C0 02 8F 80 */ lfs f0, lbl_805AACA0@sda21(r2) /* 800E02F4 000DD254 38 60 00 01 */ li r3, 1 /* 800E02F8 000DD258 D0 1E 02 4C */ stfs f0, 0x24c(r30) @@ -209,7 +209,7 @@ lbl_800E030C: /* 800E0310 000DD270 80 01 00 44 */ lwz r0, 0x44(r1) /* 800E0314 000DD274 7C 08 03 A6 */ mtlr r0 /* 800E0318 000DD278 38 21 00 40 */ addi r1, r1, 0x40 -/* 800E031C 000DD27C 4E 80 00 20 */ blr +/* 800E031C 000DD27C 4E 80 00 20 */ blr .global IsLoaded__9CWaveBeamCFv IsLoaded__9CWaveBeamCFv: @@ -234,7 +234,7 @@ lbl_800E0358: /* 800E0364 000DD2C4 83 C1 00 08 */ lwz r30, 8(r1) /* 800E0368 000DD2C8 7C 08 03 A6 */ mtlr r0 /* 800E036C 000DD2CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E0370 000DD2D0 4E 80 00 20 */ blr +/* 800E0370 000DD2D0 4E 80 00 20 */ blr .global Unload__9CWaveBeamFR13CStateManager Unload__9CWaveBeamFR13CStateManager: @@ -266,7 +266,7 @@ Unload__9CWaveBeamFR13CStateManager: /* 800E03D8 000DD338 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800E03DC 000DD33C 7C 08 03 A6 */ mtlr r0 /* 800E03E0 000DD340 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E03E4 000DD344 4E 80 00 20 */ blr +/* 800E03E4 000DD344 4E 80 00 20 */ blr .global Load__9CWaveBeamFb Load__9CWaveBeamFb: @@ -288,7 +288,7 @@ Load__9CWaveBeamFb: /* 800E0424 000DD384 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800E0428 000DD388 7C 08 03 A6 */ mtlr r0 /* 800E042C 000DD38C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E0430 000DD390 4E 80 00 20 */ blr +/* 800E0430 000DD390 4E 80 00 20 */ blr .global Fire__9CWaveBeamFbfQ212CPlayerState12EChargeStageRC12CTransform4fR13CStateManager9TUniqueId Fire__9CWaveBeamFbfQ212CPlayerState12EChargeStageRC12CTransform4fR13CStateManager9TUniqueId: @@ -443,7 +443,7 @@ lbl_800E0658: /* 800E0670 000DD5D0 7E E4 BB 78 */ mr r4, r23 /* 800E0674 000DD5D4 81 8C 00 14 */ lwz r12, 0x14(r12) /* 800E0678 000DD5D8 7D 89 03 A6 */ mtctr r12 -/* 800E067C 000DD5DC 4E 80 04 21 */ bctrl +/* 800E067C 000DD5DC 4E 80 04 21 */ bctrl /* 800E0680 000DD5E0 3B 39 00 01 */ addi r25, r25, 1 /* 800E0684 000DD5E4 2C 19 00 03 */ cmpwi r25, 3 /* 800E0688 000DD5E8 41 80 FE 5C */ blt lbl_800E04E4 @@ -506,7 +506,7 @@ lbl_800E06A4: /* 800E0764 000DD6C4 80 01 01 F4 */ lwz r0, 0x1f4(r1) /* 800E0768 000DD6C8 7C 08 03 A6 */ mtlr r0 /* 800E076C 000DD6CC 38 21 01 F0 */ addi r1, r1, 0x1f0 -/* 800E0770 000DD6D0 4E 80 00 20 */ blr +/* 800E0770 000DD6D0 4E 80 00 20 */ blr .global Update__9CWaveBeamFfR13CStateManager Update__9CWaveBeamFfR13CStateManager: @@ -520,7 +520,7 @@ Update__9CWaveBeamFfR13CStateManager: /* 800E0790 000DD6F0 81 9F 00 00 */ lwz r12, 0(r31) /* 800E0794 000DD6F4 81 8C 00 40 */ lwz r12, 0x40(r12) /* 800E0798 000DD6F8 7D 89 03 A6 */ mtctr r12 -/* 800E079C 000DD6FC 4E 80 04 21 */ bctrl +/* 800E079C 000DD6FC 4E 80 04 21 */ bctrl /* 800E07A0 000DD700 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E07A4 000DD704 40 82 01 74 */ bne lbl_800E0918 /* 800E07A8 000DD708 7F E3 FB 78 */ mr r3, r31 @@ -632,7 +632,7 @@ lbl_800E0918: /* 800E091C 000DD87C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800E0920 000DD880 7C 08 03 A6 */ mtlr r0 /* 800E0924 000DD884 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E0928 000DD888 4E 80 00 20 */ blr +/* 800E0928 000DD888 4E 80 00 20 */ blr .global UpdateGunFx__9CWaveBeamFbfRC13CStateManagerRC12CTransform4f UpdateGunFx__9CWaveBeamFbfRC13CStateManagerRC12CTransform4f: @@ -678,7 +678,7 @@ lbl_800E099C: /* 800E09C4 000DD924 81 83 00 00 */ lwz r12, 0(r3) /* 800E09C8 000DD928 81 8C 00 20 */ lwz r12, 0x20(r12) /* 800E09CC 000DD92C 7D 89 03 A6 */ mtctr r12 -/* 800E09D0 000DD930 4E 80 04 21 */ bctrl +/* 800E09D0 000DD930 4E 80 04 21 */ bctrl /* 800E09D4 000DD934 83 FB 02 54 */ lwz r31, 0x254(r27) /* 800E09D8 000DD938 7F C4 F3 78 */ mr r4, r30 /* 800E09DC 000DD93C 38 61 00 50 */ addi r3, r1, 0x50 @@ -688,13 +688,13 @@ lbl_800E099C: /* 800E09EC 000DD94C 81 9F 00 00 */ lwz r12, 0(r31) /* 800E09F0 000DD950 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 800E09F4 000DD954 7D 89 03 A6 */ mtctr r12 -/* 800E09F8 000DD958 4E 80 04 21 */ bctrl +/* 800E09F8 000DD958 4E 80 04 21 */ bctrl /* 800E09FC 000DD95C 80 7B 02 54 */ lwz r3, 0x254(r27) /* 800E0A00 000DD960 FC 20 F8 90 */ fmr f1, f31 /* 800E0A04 000DD964 81 83 00 00 */ lwz r12, 0(r3) /* 800E0A08 000DD968 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800E0A0C 000DD96C 7D 89 03 A6 */ mtctr r12 -/* 800E0A10 000DD970 4E 80 04 21 */ bctrl +/* 800E0A10 000DD970 4E 80 04 21 */ bctrl lbl_800E0A14: /* 800E0A14 000DD974 80 7B 02 50 */ lwz r3, 0x250(r27) /* 800E0A18 000DD978 28 03 00 00 */ cmplwi r3, 0 @@ -709,7 +709,7 @@ lbl_800E0A14: /* 800E0A3C 000DD99C 81 83 00 00 */ lwz r12, 0(r3) /* 800E0A40 000DD9A0 81 8C 00 20 */ lwz r12, 0x20(r12) /* 800E0A44 000DD9A4 7D 89 03 A6 */ mtctr r12 -/* 800E0A48 000DD9A8 4E 80 04 21 */ bctrl +/* 800E0A48 000DD9A8 4E 80 04 21 */ bctrl /* 800E0A4C 000DD9AC 83 FB 02 50 */ lwz r31, 0x250(r27) /* 800E0A50 000DD9B0 7F C4 F3 78 */ mr r4, r30 /* 800E0A54 000DD9B4 38 61 00 20 */ addi r3, r1, 0x20 @@ -719,13 +719,13 @@ lbl_800E0A14: /* 800E0A64 000DD9C4 81 9F 00 00 */ lwz r12, 0(r31) /* 800E0A68 000DD9C8 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 800E0A6C 000DD9CC 7D 89 03 A6 */ mtctr r12 -/* 800E0A70 000DD9D0 4E 80 04 21 */ bctrl +/* 800E0A70 000DD9D0 4E 80 04 21 */ bctrl /* 800E0A74 000DD9D4 80 7B 02 50 */ lwz r3, 0x250(r27) /* 800E0A78 000DD9D8 FC 20 F8 90 */ fmr f1, f31 /* 800E0A7C 000DD9DC 81 83 00 00 */ lwz r12, 0(r3) /* 800E0A80 000DD9E0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 800E0A84 000DD9E4 7D 89 03 A6 */ mtctr r12 -/* 800E0A88 000DD9E8 4E 80 04 21 */ bctrl +/* 800E0A88 000DD9E8 4E 80 04 21 */ bctrl lbl_800E0A8C: /* 800E0A8C 000DD9EC 88 1B 02 58 */ lbz r0, 0x258(r27) /* 800E0A90 000DD9F0 54 00 D7 FF */ rlwinm. r0, r0, 0x1a, 0x1f, 0x1f @@ -749,7 +749,7 @@ lbl_800E0AB0: /* 800E0AD4 000DDA34 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 800E0AD8 000DDA38 7C 08 03 A6 */ mtlr r0 /* 800E0ADC 000DDA3C 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 800E0AE0 000DDA40 4E 80 00 20 */ blr +/* 800E0AE0 000DDA40 4E 80 00 20 */ blr .global PostRenderGunFx__9CWaveBeamFRC13CStateManagerRC12CTransform4f PostRenderGunFx__9CWaveBeamFRC13CStateManagerRC12CTransform4f: @@ -771,7 +771,7 @@ PostRenderGunFx__9CWaveBeamFRC13CStateManagerRC12CTransform4f: /* 800E0B20 000DDA80 81 83 00 00 */ lwz r12, 0(r3) /* 800E0B24 000DDA84 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800E0B28 000DDA88 7D 89 03 A6 */ mtctr r12 -/* 800E0B2C 000DDA8C 4E 80 04 21 */ bctrl +/* 800E0B2C 000DDA8C 4E 80 04 21 */ bctrl lbl_800E0B30: /* 800E0B30 000DDA90 80 7D 02 50 */ lwz r3, 0x250(r29) /* 800E0B34 000DDA94 28 03 00 00 */ cmplwi r3, 0 @@ -779,7 +779,7 @@ lbl_800E0B30: /* 800E0B3C 000DDA9C 81 83 00 00 */ lwz r12, 0(r3) /* 800E0B40 000DDAA0 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800E0B44 000DDAA4 7D 89 03 A6 */ mtctr r12 -/* 800E0B48 000DDAA8 4E 80 04 21 */ bctrl +/* 800E0B48 000DDAA8 4E 80 04 21 */ bctrl lbl_800E0B4C: /* 800E0B4C 000DDAAC 7F A3 EB 78 */ mr r3, r29 /* 800E0B50 000DDAB0 7F C4 F3 78 */ mr r4, r30 @@ -791,7 +791,7 @@ lbl_800E0B4C: /* 800E0B68 000DDAC8 83 A1 00 14 */ lwz r29, 0x14(r1) /* 800E0B6C 000DDACC 7C 08 03 A6 */ mtlr r0 /* 800E0B70 000DDAD0 38 21 00 20 */ addi r1, r1, 0x20 -/* 800E0B74 000DDAD4 4E 80 00 20 */ blr +/* 800E0B74 000DDAD4 4E 80 00 20 */ blr .global ReInitVariables__9CWaveBeamFv ReInitVariables__9CWaveBeamFv: @@ -809,7 +809,7 @@ ReInitVariables__9CWaveBeamFv: /* 800E0BA4 000DDB04 38 80 00 01 */ li r4, 1 /* 800E0BA8 000DDB08 81 8C 00 08 */ lwz r12, 8(r12) /* 800E0BAC 000DDB0C 7D 89 03 A6 */ mtctr r12 -/* 800E0BB0 000DDB10 4E 80 04 21 */ bctrl +/* 800E0BB0 000DDB10 4E 80 04 21 */ bctrl lbl_800E0BB4: /* 800E0BB4 000DDB14 38 00 00 00 */ li r0, 0 /* 800E0BB8 000DDB18 90 1F 02 50 */ stw r0, 0x250(r31) @@ -820,7 +820,7 @@ lbl_800E0BB4: /* 800E0BCC 000DDB2C 38 80 00 01 */ li r4, 1 /* 800E0BD0 000DDB30 81 8C 00 08 */ lwz r12, 8(r12) /* 800E0BD4 000DDB34 7D 89 03 A6 */ mtctr r12 -/* 800E0BD8 000DDB38 4E 80 04 21 */ bctrl +/* 800E0BD8 000DDB38 4E 80 04 21 */ bctrl lbl_800E0BDC: /* 800E0BDC 000DDB3C 38 60 00 00 */ li r3, 0 /* 800E0BE0 000DDB40 90 7F 02 54 */ stw r3, 0x254(r31) @@ -835,7 +835,7 @@ lbl_800E0BDC: /* 800E0C04 000DDB64 80 01 00 14 */ lwz r0, 0x14(r1) /* 800E0C08 000DDB68 7C 08 03 A6 */ mtlr r0 /* 800E0C0C 000DDB6C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E0C10 000DDB70 4E 80 00 20 */ blr +/* 800E0C10 000DDB70 4E 80 00 20 */ blr .global __dt__9CWaveBeamFv __dt__9CWaveBeamFv: @@ -859,7 +859,7 @@ __dt__9CWaveBeamFv: /* 800E0C58 000DDBB8 38 80 00 01 */ li r4, 1 /* 800E0C5C 000DDBBC 81 8C 00 08 */ lwz r12, 8(r12) /* 800E0C60 000DDBC0 7D 89 03 A6 */ mtctr r12 -/* 800E0C64 000DDBC4 4E 80 04 21 */ bctrl +/* 800E0C64 000DDBC4 4E 80 04 21 */ bctrl lbl_800E0C68: /* 800E0C68 000DDBC8 34 1E 02 50 */ addic. r0, r30, 0x250 /* 800E0C6C 000DDBCC 41 82 00 24 */ beq lbl_800E0C90 @@ -870,7 +870,7 @@ lbl_800E0C68: /* 800E0C80 000DDBE0 38 80 00 01 */ li r4, 1 /* 800E0C84 000DDBE4 81 8C 00 08 */ lwz r12, 8(r12) /* 800E0C88 000DDBE8 7D 89 03 A6 */ mtctr r12 -/* 800E0C8C 000DDBEC 4E 80 04 21 */ bctrl +/* 800E0C8C 000DDBEC 4E 80 04 21 */ bctrl lbl_800E0C90: /* 800E0C90 000DDBF0 34 1E 02 40 */ addic. r0, r30, 0x240 /* 800E0C94 000DDBF4 41 82 00 18 */ beq lbl_800E0CAC @@ -918,7 +918,7 @@ lbl_800E0D1C: /* 800E0D28 000DDC88 83 C1 00 08 */ lwz r30, 8(r1) /* 800E0D2C 000DDC8C 7C 08 03 A6 */ mtlr r0 /* 800E0D30 000DDC90 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E0D34 000DDC94 4E 80 00 20 */ blr +/* 800E0D34 000DDC94 4E 80 00 20 */ blr .global __ct__9CWaveBeamFUi11EWeaponType9TUniqueId14EMaterialTypesRC9CVector3f __ct__9CWaveBeamFUi11EWeaponType9TUniqueId14EMaterialTypesRC9CVector3f: @@ -943,7 +943,7 @@ __ct__9CWaveBeamFUi11EWeaponType9TUniqueId14EMaterialTypesRC9CVector3f: /* 800E0D80 000DDCE0 81 84 00 00 */ lwz r12, 0(r4) /* 800E0D84 000DDCE4 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800E0D88 000DDCE8 7D 89 03 A6 */ mtctr r12 -/* 800E0D8C 000DDCEC 4E 80 04 21 */ bctrl +/* 800E0D8C 000DDCEC 4E 80 04 21 */ bctrl /* 800E0D90 000DDCF0 3B DF 02 1C */ addi r30, r31, 0x21c /* 800E0D94 000DDCF4 38 81 00 24 */ addi r4, r1, 0x24 /* 800E0D98 000DDCF8 7F C3 F3 78 */ mr r3, r30 @@ -961,7 +961,7 @@ __ct__9CWaveBeamFUi11EWeaponType9TUniqueId14EMaterialTypesRC9CVector3f: /* 800E0DC8 000DDD28 38 A5 00 10 */ addi r5, r5, 0x10 /* 800E0DCC 000DDD2C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800E0DD0 000DDD30 7D 89 03 A6 */ mtctr r12 -/* 800E0DD4 000DDD34 4E 80 04 21 */ bctrl +/* 800E0DD4 000DDD34 4E 80 04 21 */ bctrl /* 800E0DD8 000DDD38 3B DF 02 28 */ addi r30, r31, 0x228 /* 800E0DDC 000DDD3C 38 81 00 1C */ addi r4, r1, 0x1c /* 800E0DE0 000DDD40 7F C3 F3 78 */ mr r3, r30 @@ -979,7 +979,7 @@ __ct__9CWaveBeamFUi11EWeaponType9TUniqueId14EMaterialTypesRC9CVector3f: /* 800E0E10 000DDD70 38 A5 00 1A */ addi r5, r5, 0x1a /* 800E0E14 000DDD74 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800E0E18 000DDD78 7D 89 03 A6 */ mtctr r12 -/* 800E0E1C 000DDD7C 4E 80 04 21 */ bctrl +/* 800E0E1C 000DDD7C 4E 80 04 21 */ bctrl /* 800E0E20 000DDD80 3B DF 02 34 */ addi r30, r31, 0x234 /* 800E0E24 000DDD84 38 81 00 14 */ addi r4, r1, 0x14 /* 800E0E28 000DDD88 7F C3 F3 78 */ mr r3, r30 @@ -997,7 +997,7 @@ __ct__9CWaveBeamFUi11EWeaponType9TUniqueId14EMaterialTypesRC9CVector3f: /* 800E0E58 000DDDB8 38 A5 00 24 */ addi r5, r5, 0x24 /* 800E0E5C 000DDDBC 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800E0E60 000DDDC0 7D 89 03 A6 */ mtctr r12 -/* 800E0E64 000DDDC4 4E 80 04 21 */ bctrl +/* 800E0E64 000DDDC4 4E 80 04 21 */ bctrl /* 800E0E68 000DDDC8 3B DF 02 40 */ addi r30, r31, 0x240 /* 800E0E6C 000DDDCC 38 81 00 0C */ addi r4, r1, 0xc /* 800E0E70 000DDDD0 7F C3 F3 78 */ mr r3, r30 @@ -1024,7 +1024,7 @@ __ct__9CWaveBeamFUi11EWeaponType9TUniqueId14EMaterialTypesRC9CVector3f: /* 800E0EC4 000DDE24 80 01 00 44 */ lwz r0, 0x44(r1) /* 800E0EC8 000DDE28 7C 08 03 A6 */ mtlr r0 /* 800E0ECC 000DDE2C 38 21 00 40 */ addi r1, r1, 0x40 -/* 800E0ED0 000DDE30 4E 80 00 20 */ blr +/* 800E0ED0 000DDE30 4E 80 00 20 */ blr .global __sinit_CWaveBeam_cpp __sinit_CWaveBeam_cpp: diff --git a/asm/MetroidPrime/Weapons/CWaveBuster.s b/asm/MetroidPrime/Weapons/CWaveBuster.s index 67bcc138..b82c05b8 100644 --- a/asm/MetroidPrime/Weapons/CWaveBuster.s +++ b/asm/MetroidPrime/Weapons/CWaveBuster.s @@ -69,7 +69,7 @@ lbl_8046C908: .global lbl_8046C914 lbl_8046C914: .skip 0xC - + .section .text, "ax" .global sub_801bd69c @@ -94,7 +94,7 @@ sub_801bd69c: /* 801BD6E0 001BA640 38 80 00 01 */ li r4, 1 /* 801BD6E4 001BA644 81 8C 00 08 */ lwz r12, 8(r12) /* 801BD6E8 001BA648 7D 89 03 A6 */ mtctr r12 -/* 801BD6EC 001BA64C 4E 80 04 21 */ bctrl +/* 801BD6EC 001BA64C 4E 80 04 21 */ bctrl lbl_801BD6F0: /* 801BD6F0 001BA650 34 1E 03 8C */ addic. r0, r30, 0x38c /* 801BD6F4 001BA654 41 82 00 24 */ beq lbl_801BD718 @@ -105,7 +105,7 @@ lbl_801BD6F0: /* 801BD708 001BA668 38 80 00 01 */ li r4, 1 /* 801BD70C 001BA66C 81 8C 00 08 */ lwz r12, 8(r12) /* 801BD710 001BA670 7D 89 03 A6 */ mtctr r12 -/* 801BD714 001BA674 4E 80 04 21 */ bctrl +/* 801BD714 001BA674 4E 80 04 21 */ bctrl lbl_801BD718: /* 801BD718 001BA678 34 1E 03 88 */ addic. r0, r30, 0x388 /* 801BD71C 001BA67C 41 82 00 24 */ beq lbl_801BD740 @@ -116,7 +116,7 @@ lbl_801BD718: /* 801BD730 001BA690 38 80 00 01 */ li r4, 1 /* 801BD734 001BA694 81 8C 00 08 */ lwz r12, 8(r12) /* 801BD738 001BA698 7D 89 03 A6 */ mtctr r12 -/* 801BD73C 001BA69C 4E 80 04 21 */ bctrl +/* 801BD73C 001BA69C 4E 80 04 21 */ bctrl lbl_801BD740: /* 801BD740 001BA6A0 34 1E 03 84 */ addic. r0, r30, 0x384 /* 801BD744 001BA6A4 41 82 00 24 */ beq lbl_801BD768 @@ -127,7 +127,7 @@ lbl_801BD740: /* 801BD758 001BA6B8 38 80 00 01 */ li r4, 1 /* 801BD75C 001BA6BC 81 8C 00 08 */ lwz r12, 8(r12) /* 801BD760 001BA6C0 7D 89 03 A6 */ mtctr r12 -/* 801BD764 001BA6C4 4E 80 04 21 */ bctrl +/* 801BD764 001BA6C4 4E 80 04 21 */ bctrl lbl_801BD768: /* 801BD768 001BA6C8 34 1E 03 78 */ addic. r0, r30, 0x378 /* 801BD76C 001BA6CC 41 82 00 18 */ beq lbl_801BD784 @@ -175,7 +175,7 @@ lbl_801BD7F4: /* 801BD800 001BA760 83 C1 00 08 */ lwz r30, 8(r1) /* 801BD804 001BA764 7C 08 03 A6 */ mtlr r0 /* 801BD808 001BA768 38 21 00 10 */ addi r1, r1, 0x10 -/* 801BD80C 001BA76C 4E 80 00 20 */ blr +/* 801BD80C 001BA76C 4E 80 00 20 */ blr .global sub_801bd810 sub_801bd810: @@ -214,7 +214,7 @@ lbl_801BD884: /* 801BD888 001BA7E8 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 801BD88C 001BA7EC 7C 08 03 A6 */ mtlr r0 /* 801BD890 001BA7F0 38 21 00 30 */ addi r1, r1, 0x30 -/* 801BD894 001BA7F4 4E 80 00 20 */ blr +/* 801BD894 001BA7F4 4E 80 00 20 */ blr .global sub_801bd898 sub_801bd898: @@ -265,7 +265,7 @@ lbl_801BD8F4: /* 801BD940 001BA8A0 7F C5 F3 78 */ mr r5, r30 /* 801BD944 001BA8A4 81 8C 00 44 */ lwz r12, 0x44(r12) /* 801BD948 001BA8A8 7D 89 03 A6 */ mtctr r12 -/* 801BD94C 001BA8AC 4E 80 04 21 */ bctrl +/* 801BD94C 001BA8AC 4E 80 04 21 */ bctrl /* 801BD950 001BA8B0 C0 7D 00 58 */ lfs f3, 0x58(r29) /* 801BD954 001BA8B4 FC 20 F8 90 */ fmr f1, f31 /* 801BD958 001BA8B8 C0 5D 00 48 */ lfs f2, 0x48(r29) @@ -317,7 +317,7 @@ lbl_801BD9F0: /* 801BDA04 001BA964 83 A1 00 74 */ lwz r29, 0x74(r1) /* 801BDA08 001BA968 7C 08 03 A6 */ mtlr r0 /* 801BDA0C 001BA96C 38 21 00 90 */ addi r1, r1, 0x90 -/* 801BDA10 001BA970 4E 80 00 20 */ blr +/* 801BDA10 001BA970 4E 80 00 20 */ blr .global sub_801bda14 sub_801bda14: @@ -428,7 +428,7 @@ lbl_801BDB74: /* 801BDBA8 001BAB08 81 93 00 00 */ lwz r12, 0(r19) /* 801BDBAC 001BAB0C 81 8C 00 70 */ lwz r12, 0x70(r12) /* 801BDBB0 001BAB10 7D 89 03 A6 */ mtctr r12 -/* 801BDBB4 001BAB14 4E 80 04 21 */ bctrl +/* 801BDBB4 001BAB14 4E 80 04 21 */ bctrl /* 801BDBB8 001BAB18 80 18 00 F8 */ lwz r0, 0xf8(r24) /* 801BDBBC 001BAB1C 7E 63 9B 78 */ mr r3, r19 /* 801BDBC0 001BAB20 80 98 00 FC */ lwz r4, 0xfc(r24) @@ -443,7 +443,7 @@ lbl_801BDB74: /* 801BDBE4 001BAB44 81 93 00 00 */ lwz r12, 0(r19) /* 801BDBE8 001BAB48 81 8C 00 6C */ lwz r12, 0x6c(r12) /* 801BDBEC 001BAB4C 7D 89 03 A6 */ mtctr r12 -/* 801BDBF0 001BAB50 4E 80 04 21 */ bctrl +/* 801BDBF0 001BAB50 4E 80 04 21 */ bctrl /* 801BDBF4 001BAB54 FC 20 F8 90 */ fmr f1, f31 /* 801BDBF8 001BAB58 7C 72 1B 78 */ mr r18, r3 /* 801BDBFC 001BAB5C 7F 84 E3 78 */ mr r4, r28 @@ -462,7 +462,7 @@ lbl_801BDB74: /* 801BDC30 001BAB90 81 92 00 00 */ lwz r12, 0(r18) /* 801BDC34 001BAB94 81 8C 00 24 */ lwz r12, 0x24(r12) /* 801BDC38 001BAB98 7D 89 03 A6 */ mtctr r12 -/* 801BDC3C 001BAB9C 4E 80 04 21 */ bctrl +/* 801BDC3C 001BAB9C 4E 80 04 21 */ bctrl /* 801BDC40 001BABA0 88 81 01 B0 */ lbz r4, 0x1b0(r1) /* 801BDC44 001BABA4 C0 E1 01 90 */ lfs f7, 0x190(r1) /* 801BDC48 001BABA8 C0 C1 01 94 */ lfs f6, 0x194(r1) @@ -524,7 +524,7 @@ lbl_801BDCF0: /* 801BDD24 001BAC84 81 93 00 00 */ lwz r12, 0(r19) /* 801BDD28 001BAC88 81 8C 00 40 */ lwz r12, 0x40(r12) /* 801BDD2C 001BAC8C 7D 89 03 A6 */ mtctr r12 -/* 801BDD30 001BAC90 4E 80 04 21 */ bctrl +/* 801BDD30 001BAC90 4E 80 04 21 */ bctrl /* 801BDD34 001BAC94 88 01 00 68 */ lbz r0, 0x68(r1) /* 801BDD38 001BAC98 28 00 00 00 */ cmplwi r0, 0 /* 801BDD3C 001BAC9C 98 01 00 E8 */ stb r0, 0xe8(r1) @@ -614,7 +614,7 @@ lbl_801BDD98: /* 801BDE84 001BADE4 38 A1 02 48 */ addi r5, r1, 0x248 /* 801BDE88 001BADE8 81 8C 00 24 */ lwz r12, 0x24(r12) /* 801BDE8C 001BADEC 7D 89 03 A6 */ mtctr r12 -/* 801BDE90 001BADF0 4E 80 04 21 */ bctrl +/* 801BDE90 001BADF0 4E 80 04 21 */ bctrl /* 801BDE94 001BADF4 88 81 01 28 */ lbz r4, 0x128(r1) /* 801BDE98 001BADF8 C0 E1 01 08 */ lfs f7, 0x108(r1) /* 801BDE9C 001BADFC C0 C1 01 0C */ lfs f6, 0x10c(r1) @@ -717,7 +717,7 @@ lbl_801BDFE4: /* 801BE000 001BAF60 80 01 0B 94 */ lwz r0, 0xb94(r1) /* 801BE004 001BAF64 7C 08 03 A6 */ mtlr r0 /* 801BE008 001BAF68 38 21 0B 90 */ addi r1, r1, 0xb90 -/* 801BE00C 001BAF6C 4E 80 00 20 */ blr +/* 801BE00C 001BAF6C 4E 80 00 20 */ blr .global sub_801be010 sub_801be010: @@ -931,7 +931,7 @@ lbl_801BE334: /* 801BE340 001BB2A0 80 01 01 24 */ lwz r0, 0x124(r1) /* 801BE344 001BB2A4 7C 08 03 A6 */ mtlr r0 /* 801BE348 001BB2A8 38 21 01 20 */ addi r1, r1, 0x120 -/* 801BE34C 001BB2AC 4E 80 00 20 */ blr +/* 801BE34C 001BB2AC 4E 80 00 20 */ blr .global sub_801be350 sub_801be350: @@ -965,7 +965,7 @@ sub_801be350: /* 801BE3BC 001BB31C 81 83 00 00 */ lwz r12, 0(r3) /* 801BE3C0 001BB320 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 801BE3C4 001BB324 7D 89 03 A6 */ mtctr r12 -/* 801BE3C8 001BB328 4E 80 04 21 */ bctrl +/* 801BE3C8 001BB328 4E 80 04 21 */ bctrl /* 801BE3CC 001BB32C 80 1A 03 CC */ lwz r0, 0x3cc(r26) /* 801BE3D0 001BB330 3C 60 80 3D */ lis r3, lbl_803D19F8@ha /* 801BE3D4 001BB334 38 63 19 F8 */ addi r3, r3, lbl_803D19F8@l @@ -1048,7 +1048,7 @@ lbl_801BE440: /* 801BE504 001BB464 81 83 00 00 */ lwz r12, 0(r3) /* 801BE508 001BB468 81 8C 00 18 */ lwz r12, 0x18(r12) /* 801BE50C 001BB46C 7D 89 03 A6 */ mtctr r12 -/* 801BE510 001BB470 4E 80 04 21 */ bctrl +/* 801BE510 001BB470 4E 80 04 21 */ bctrl /* 801BE514 001BB474 80 7A 03 8C */ lwz r3, 0x38c(r26) /* 801BE518 001BB478 38 80 00 01 */ li r4, 1 /* 801BE51C 001BB47C 48 15 E3 A5 */ bl ForceParticleCreation__11CElementGenFi @@ -1064,22 +1064,22 @@ lbl_801BE52C: /* 801BE540 001BB4A0 81 83 00 00 */ lwz r12, 0(r3) /* 801BE544 001BB4A4 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 801BE548 001BB4A8 7D 89 03 A6 */ mtctr r12 -/* 801BE54C 001BB4AC 4E 80 04 21 */ bctrl +/* 801BE54C 001BB4AC 4E 80 04 21 */ bctrl /* 801BE550 001BB4B0 80 7A 03 84 */ lwz r3, 0x384(r26) /* 801BE554 001BB4B4 81 83 00 00 */ lwz r12, 0(r3) /* 801BE558 001BB4B8 81 8C 00 10 */ lwz r12, 0x10(r12) /* 801BE55C 001BB4BC 7D 89 03 A6 */ mtctr r12 -/* 801BE560 001BB4C0 4E 80 04 21 */ bctrl +/* 801BE560 001BB4C0 4E 80 04 21 */ bctrl /* 801BE564 001BB4C4 80 7A 03 88 */ lwz r3, 0x388(r26) /* 801BE568 001BB4C8 81 83 00 00 */ lwz r12, 0(r3) /* 801BE56C 001BB4CC 81 8C 00 10 */ lwz r12, 0x10(r12) /* 801BE570 001BB4D0 7D 89 03 A6 */ mtctr r12 -/* 801BE574 001BB4D4 4E 80 04 21 */ bctrl +/* 801BE574 001BB4D4 4E 80 04 21 */ bctrl /* 801BE578 001BB4D8 80 7A 03 8C */ lwz r3, 0x38c(r26) /* 801BE57C 001BB4DC 81 83 00 00 */ lwz r12, 0(r3) /* 801BE580 001BB4E0 81 8C 00 10 */ lwz r12, 0x10(r12) /* 801BE584 001BB4E4 7D 89 03 A6 */ mtctr r12 -/* 801BE588 001BB4E8 4E 80 04 21 */ bctrl +/* 801BE588 001BB4E8 4E 80 04 21 */ bctrl /* 801BE58C 001BB4EC E3 E1 00 F8 */ psq_l f31, 248(r1), 0, qr0 /* 801BE590 001BB4F0 CB E1 00 F0 */ lfd f31, 0xf0(r1) /* 801BE594 001BB4F4 E3 C1 00 E8 */ psq_l f30, 232(r1), 0, qr0 @@ -1092,7 +1092,7 @@ lbl_801BE52C: /* 801BE5B0 001BB510 80 01 01 04 */ lwz r0, 0x104(r1) /* 801BE5B4 001BB514 7C 08 03 A6 */ mtlr r0 /* 801BE5B8 001BB518 38 21 01 00 */ addi r1, r1, 0x100 -/* 801BE5BC 001BB51C 4E 80 00 20 */ blr +/* 801BE5BC 001BB51C 4E 80 00 20 */ blr .global sub_801be5c0 sub_801be5c0: @@ -1316,7 +1316,7 @@ lbl_801BE84C: /* 801BE918 001BB878 81 83 00 00 */ lwz r12, 0(r3) /* 801BE91C 001BB87C 81 8C 00 30 */ lwz r12, 0x30(r12) /* 801BE920 001BB880 7D 89 03 A6 */ mtctr r12 -/* 801BE924 001BB884 4E 80 04 21 */ bctrl +/* 801BE924 001BB884 4E 80 04 21 */ bctrl /* 801BE928 001BB888 48 18 B6 85 */ bl White__6CColorFv /* 801BE92C 001BB88C 7C 7F 1B 78 */ mr r31, r3 /* 801BE930 001BB890 38 60 00 0C */ li r3, 0xc @@ -1487,7 +1487,7 @@ lbl_801BEA70: /* 801BEBBC 001BBB1C 83 A1 01 14 */ lwz r29, 0x114(r1) /* 801BEBC0 001BBB20 7C 08 03 A6 */ mtlr r0 /* 801BEBC4 001BBB24 38 21 02 20 */ addi r1, r1, 0x220 -/* 801BEBC8 001BBB28 4E 80 00 20 */ blr +/* 801BEBC8 001BBB28 4E 80 00 20 */ blr .global sub_801bebcc sub_801bebcc: @@ -1515,7 +1515,7 @@ lbl_801BEC10: /* 801BEC1C 001BBB7C 81 83 00 00 */ lwz r12, 0(r3) /* 801BEC20 001BBB80 81 8C 00 64 */ lwz r12, 0x64(r12) /* 801BEC24 001BBB84 7D 89 03 A6 */ mtctr r12 -/* 801BEC28 001BBB88 4E 80 04 21 */ bctrl +/* 801BEC28 001BBB88 4E 80 04 21 */ bctrl /* 801BEC2C 001BBB8C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801BEC30 001BBB90 41 82 00 48 */ beq lbl_801BEC78 /* 801BEC34 001BBB94 3C 80 80 3D */ lis r4, lbl_803D1A20@ha @@ -1527,7 +1527,7 @@ lbl_801BEC10: /* 801BEC4C 001BBBAC 81 84 00 00 */ lwz r12, 0(r4) /* 801BEC50 001BBBB0 81 8C 00 68 */ lwz r12, 0x68(r12) /* 801BEC54 001BBBB4 7D 89 03 A6 */ mtctr r12 -/* 801BEC58 001BBBB8 4E 80 04 21 */ bctrl +/* 801BEC58 001BBBB8 4E 80 04 21 */ bctrl /* 801BEC5C 001BBBBC 7F 83 E3 78 */ mr r3, r28 /* 801BEC60 001BBBC0 7F E6 FB 78 */ mr r6, r31 /* 801BEC64 001BBBC4 38 81 00 0C */ addi r4, r1, 0xc @@ -1577,7 +1577,7 @@ lbl_801BECDC: /* 801BED08 001BBC68 83 81 00 70 */ lwz r28, 0x70(r1) /* 801BED0C 001BBC6C 7C 08 03 A6 */ mtlr r0 /* 801BED10 001BBC70 38 21 00 80 */ addi r1, r1, 0x80 -/* 801BED14 001BBC74 4E 80 00 20 */ blr +/* 801BED14 001BBC74 4E 80 00 20 */ blr .global ResetBeam__11CWaveBusterFb ResetBeam__11CWaveBusterFb: @@ -1592,7 +1592,7 @@ ResetBeam__11CWaveBusterFb: /* 801BED38 001BBC98 38 80 00 00 */ li r4, 0 /* 801BED3C 001BBC9C 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 801BED40 001BBCA0 7D 89 03 A6 */ mtctr r12 -/* 801BED44 001BBCA4 4E 80 04 21 */ bctrl +/* 801BED44 001BBCA4 4E 80 04 21 */ bctrl /* 801BED48 001BBCA8 88 1F 03 D0 */ lbz r0, 0x3d0(r31) /* 801BED4C 001BBCAC 38 60 00 00 */ li r3, 0 /* 801BED50 001BBCB0 50 60 3E 30 */ rlwimi r0, r3, 7, 0x18, 0x18 @@ -1602,7 +1602,7 @@ ResetBeam__11CWaveBusterFb: /* 801BED60 001BBCC0 81 83 00 00 */ lwz r12, 0(r3) /* 801BED64 001BBCC4 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 801BED68 001BBCC8 7D 89 03 A6 */ mtctr r12 -/* 801BED6C 001BBCCC 4E 80 04 21 */ bctrl +/* 801BED6C 001BBCCC 4E 80 04 21 */ bctrl /* 801BED70 001BBCD0 C0 02 AA 20 */ lfs f0, lbl_805AC740@sda21(r2) /* 801BED74 001BBCD4 D0 1F 03 98 */ stfs f0, 0x398(r31) /* 801BED78 001BBCD8 48 00 00 2C */ b lbl_801BEDA4 @@ -1612,7 +1612,7 @@ lbl_801BED7C: /* 801BED84 001BBCE4 81 83 00 00 */ lwz r12, 0(r3) /* 801BED88 001BBCE8 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 801BED8C 001BBCEC 7D 89 03 A6 */ mtctr r12 -/* 801BED90 001BBCF0 4E 80 04 21 */ bctrl +/* 801BED90 001BBCF0 4E 80 04 21 */ bctrl /* 801BED94 001BBCF4 88 1F 03 D0 */ lbz r0, 0x3d0(r31) /* 801BED98 001BBCF8 38 60 00 00 */ li r3, 0 /* 801BED9C 001BBCFC 50 60 3E 30 */ rlwimi r0, r3, 7, 0x18, 0x18 @@ -1622,7 +1622,7 @@ lbl_801BEDA4: /* 801BEDA8 001BBD08 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801BEDAC 001BBD0C 7C 08 03 A6 */ mtlr r0 /* 801BEDB0 001BBD10 38 21 00 10 */ addi r1, r1, 0x10 -/* 801BEDB4 001BBD14 4E 80 00 20 */ blr +/* 801BEDB4 001BBD14 4E 80 00 20 */ blr .global sub_801bedb8 sub_801bedb8: @@ -1644,7 +1644,7 @@ sub_801bedb8: /* 801BEDF4 001BBD54 83 C1 00 08 */ lwz r30, 8(r1) /* 801BEDF8 001BBD58 7C 08 03 A6 */ mtlr r0 /* 801BEDFC 001BBD5C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801BEE00 001BBD60 4E 80 00 20 */ blr +/* 801BEE00 001BBD60 4E 80 00 20 */ blr .global sub_801bee04 sub_801bee04: @@ -1666,7 +1666,7 @@ sub_801bee04: /* 801BEE40 001BBDA0 81 9E 00 00 */ lwz r12, 0(r30) /* 801BEE44 001BBDA4 81 8C 00 64 */ lwz r12, 0x64(r12) /* 801BEE48 001BBDA8 7D 89 03 A6 */ mtctr r12 -/* 801BEE4C 001BBDAC 4E 80 04 21 */ bctrl +/* 801BEE4C 001BBDAC 4E 80 04 21 */ bctrl /* 801BEE50 001BBDB0 7F C3 F3 78 */ mr r3, r30 /* 801BEE54 001BBDB4 7F E4 FB 78 */ mr r4, r31 /* 801BEE58 001BBDB8 38 A1 00 08 */ addi r5, r1, 8 @@ -1677,7 +1677,7 @@ sub_801bee04: /* 801BEE6C 001BBDCC 83 C1 00 38 */ lwz r30, 0x38(r1) /* 801BEE70 001BBDD0 7C 08 03 A6 */ mtlr r0 /* 801BEE74 001BBDD4 38 21 00 40 */ addi r1, r1, 0x40 -/* 801BEE78 001BBDD8 4E 80 00 20 */ blr +/* 801BEE78 001BBDD8 4E 80 00 20 */ blr .global UpdateFx__11CWaveBusterFRC12CTransform4ffR13CStateManager UpdateFx__11CWaveBusterFRC12CTransform4ffR13CStateManager: @@ -1727,7 +1727,7 @@ lbl_801BEF0C: /* 801BEF18 001BBE78 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801BEF1C 001BBE7C 7C 08 03 A6 */ mtlr r0 /* 801BEF20 001BBE80 38 21 00 30 */ addi r1, r1, 0x30 -/* 801BEF24 001BBE84 4E 80 00 20 */ blr +/* 801BEF24 001BBE84 4E 80 00 20 */ blr .global sub_801bef28 sub_801bef28: @@ -1829,7 +1829,7 @@ lbl_801BEF98: /* 801BF0A0 001BC000 7F E5 FB 78 */ mr r5, r31 /* 801BF0A4 001BC004 81 8C 00 44 */ lwz r12, 0x44(r12) /* 801BF0A8 001BC008 7D 89 03 A6 */ mtctr r12 -/* 801BF0AC 001BC00C 4E 80 04 21 */ bctrl +/* 801BF0AC 001BC00C 4E 80 04 21 */ bctrl /* 801BF0B0 001BC010 C0 7E 00 58 */ lfs f3, 0x58(r30) /* 801BF0B4 001BC014 FC 20 F0 90 */ fmr f1, f30 /* 801BF0B8 001BC018 C0 5E 00 48 */ lfs f2, 0x48(r30) @@ -2068,7 +2068,7 @@ lbl_801BF414: /* 801BF42C 001BC38C 81 83 00 00 */ lwz r12, 0(r3) /* 801BF430 001BC390 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801BF434 001BC394 7D 89 03 A6 */ mtctr r12 -/* 801BF438 001BC398 4E 80 04 21 */ bctrl +/* 801BF438 001BC398 4E 80 04 21 */ bctrl /* 801BF43C 001BC39C A0 1E 02 C8 */ lhz r0, 0x2c8(r30) /* 801BF440 001BC3A0 7F E3 FB 78 */ mr r3, r31 /* 801BF444 001BC3A4 38 81 00 0C */ addi r4, r1, 0xc @@ -2109,7 +2109,7 @@ lbl_801BF414: /* 801BF4D0 001BC430 81 83 00 00 */ lwz r12, 0(r3) /* 801BF4D4 001BC434 81 8C 00 64 */ lwz r12, 0x64(r12) /* 801BF4D8 001BC438 7D 89 03 A6 */ mtctr r12 -/* 801BF4DC 001BC43C 4E 80 04 21 */ bctrl +/* 801BF4DC 001BC43C 4E 80 04 21 */ bctrl /* 801BF4E0 001BC440 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801BF4E4 001BC444 41 82 00 28 */ beq lbl_801BF50C /* 801BF4E8 001BC448 80 9E 03 90 */ lwz r4, 0x390(r30) @@ -2117,7 +2117,7 @@ lbl_801BF414: /* 801BF4F0 001BC450 81 84 00 00 */ lwz r12, 0(r4) /* 801BF4F4 001BC454 81 8C 00 68 */ lwz r12, 0x68(r12) /* 801BF4F8 001BC458 7D 89 03 A6 */ mtctr r12 -/* 801BF4FC 001BC45C 4E 80 04 21 */ bctrl +/* 801BF4FC 001BC45C 4E 80 04 21 */ bctrl /* 801BF500 001BC460 7F E3 FB 78 */ mr r3, r31 /* 801BF504 001BC464 38 81 01 A8 */ addi r4, r1, 0x1a8 /* 801BF508 001BC468 4B EF 62 3D */ bl SetLight__10CGameLightFRC6CLight @@ -2147,7 +2147,7 @@ lbl_801BF554: /* 801BF55C 001BC4BC 81 83 00 00 */ lwz r12, 0(r3) /* 801BF560 001BC4C0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801BF564 001BC4C4 7D 89 03 A6 */ mtctr r12 -/* 801BF568 001BC4C8 4E 80 04 21 */ bctrl +/* 801BF568 001BC4C8 4E 80 04 21 */ bctrl lbl_801BF56C: /* 801BF56C 001BC4CC E3 E1 02 28 */ psq_l f31, 552(r1), 0, qr0 /* 801BF570 001BC4D0 CB E1 02 20 */ lfd f31, 0x220(r1) @@ -2159,7 +2159,7 @@ lbl_801BF56C: /* 801BF588 001BC4E8 83 A1 02 04 */ lwz r29, 0x204(r1) /* 801BF58C 001BC4EC 7C 08 03 A6 */ mtlr r0 /* 801BF590 001BC4F0 38 21 02 30 */ addi r1, r1, 0x230 -/* 801BF594 001BC4F4 4E 80 00 20 */ blr +/* 801BF594 001BC4F4 4E 80 00 20 */ blr .global sub_801bf598 sub_801bf598: @@ -2250,7 +2250,7 @@ lbl_801BF6D4: /* 801BF6DC 001BC63C 83 C1 00 68 */ lwz r30, 0x68(r1) /* 801BF6E0 001BC640 7C 08 03 A6 */ mtlr r0 /* 801BF6E4 001BC644 38 21 00 70 */ addi r1, r1, 0x70 -/* 801BF6E8 001BC648 4E 80 00 20 */ blr +/* 801BF6E8 001BC648 4E 80 00 20 */ blr .global sub_801bf6ec sub_801bf6ec: @@ -2440,7 +2440,7 @@ lbl_801BF998: /* 801BF9AC 001BC90C 80 01 08 F4 */ lwz r0, 0x8f4(r1) /* 801BF9B0 001BC910 7C 08 03 A6 */ mtlr r0 /* 801BF9B4 001BC914 38 21 08 F0 */ addi r1, r1, 0x8f0 -/* 801BF9B8 001BC918 4E 80 00 20 */ blr +/* 801BF9B8 001BC918 4E 80 00 20 */ blr .global sub_801bf9bc sub_801bf9bc: @@ -2472,7 +2472,7 @@ sub_801bf9bc: /* 801BFA20 001BC980 81 9E 00 00 */ lwz r12, 0(r30) /* 801BFA24 001BC984 81 8C 00 34 */ lwz r12, 0x34(r12) /* 801BFA28 001BC988 7D 89 03 A6 */ mtctr r12 -/* 801BFA2C 001BC98C 4E 80 04 21 */ bctrl +/* 801BFA2C 001BC98C 4E 80 04 21 */ bctrl /* 801BFA30 001BC990 28 03 00 00 */ cmplwi r3, 0 /* 801BFA34 001BC994 41 82 00 F0 */ beq lbl_801BFB24 /* 801BFA38 001BC998 7F C3 F3 78 */ mr r3, r30 @@ -2480,7 +2480,7 @@ sub_801bf9bc: /* 801BFA40 001BC9A0 81 9E 00 00 */ lwz r12, 0(r30) /* 801BFA44 001BC9A4 81 8C 00 34 */ lwz r12, 0x34(r12) /* 801BFA48 001BC9A8 7D 89 03 A6 */ mtctr r12 -/* 801BFA4C 001BC9AC 4E 80 04 21 */ bctrl +/* 801BFA4C 001BC9AC 4E 80 04 21 */ bctrl /* 801BFA50 001BC9B0 C0 03 00 00 */ lfs f0, 0(r3) /* 801BFA54 001BC9B4 C0 22 AA 04 */ lfs f1, lbl_805AC724@sda21(r2) /* 801BFA58 001BC9B8 FC 00 08 40 */ fcmpo cr0, f0, f1 @@ -2491,7 +2491,7 @@ sub_801bf9bc: /* 801BFA6C 001BC9CC 38 61 00 70 */ addi r3, r1, 0x70 /* 801BFA70 001BC9D0 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 801BFA74 001BC9D4 7D 89 03 A6 */ mtctr r12 -/* 801BFA78 001BC9D8 4E 80 04 21 */ bctrl +/* 801BFA78 001BC9D8 4E 80 04 21 */ bctrl /* 801BFA7C 001BC9DC C0 01 00 70 */ lfs f0, 0x70(r1) /* 801BFA80 001BC9E0 7F E3 FB 78 */ mr r3, r31 /* 801BFA84 001BC9E4 38 9F 03 3C */ addi r4, r31, 0x33c @@ -2603,7 +2603,7 @@ lbl_801BFC10: /* 801BFC24 001BCB84 83 A1 00 F4 */ lwz r29, 0xf4(r1) /* 801BFC28 001BCB88 7C 08 03 A6 */ mtlr r0 /* 801BFC2C 001BCB8C 38 21 01 10 */ addi r1, r1, 0x110 -/* 801BFC30 001BCB90 4E 80 00 20 */ blr +/* 801BFC30 001BCB90 4E 80 00 20 */ blr .global sub_801bfc34 sub_801bfc34: @@ -2648,7 +2648,7 @@ sub_801bfc34: /* 801BFCCC 001BCC2C 81 9F 00 00 */ lwz r12, 0(r31) /* 801BFCD0 001BCC30 81 8C 00 34 */ lwz r12, 0x34(r12) /* 801BFCD4 001BCC34 7D 89 03 A6 */ mtctr r12 -/* 801BFCD8 001BCC38 4E 80 04 21 */ bctrl +/* 801BFCD8 001BCC38 4E 80 04 21 */ bctrl /* 801BFCDC 001BCC3C 28 03 00 00 */ cmplwi r3, 0 /* 801BFCE0 001BCC40 41 82 00 84 */ beq lbl_801BFD64 /* 801BFCE4 001BCC44 7F E3 FB 78 */ mr r3, r31 @@ -2656,7 +2656,7 @@ sub_801bfc34: /* 801BFCEC 001BCC4C 81 9F 00 00 */ lwz r12, 0(r31) /* 801BFCF0 001BCC50 81 8C 00 34 */ lwz r12, 0x34(r12) /* 801BFCF4 001BCC54 7D 89 03 A6 */ mtctr r12 -/* 801BFCF8 001BCC58 4E 80 04 21 */ bctrl +/* 801BFCF8 001BCC58 4E 80 04 21 */ bctrl /* 801BFCFC 001BCC5C C0 23 00 00 */ lfs f1, 0(r3) /* 801BFD00 001BCC60 C0 02 AA 04 */ lfs f0, lbl_805AC724@sda21(r2) /* 801BFD04 001BCC64 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -2827,7 +2827,7 @@ lbl_801BFF54: /* 801BFF78 001BCED8 83 A1 00 A4 */ lwz r29, 0xa4(r1) /* 801BFF7C 001BCEDC 7C 08 03 A6 */ mtlr r0 /* 801BFF80 001BCEE0 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 801BFF84 001BCEE4 4E 80 00 20 */ blr +/* 801BFF84 001BCEE4 4E 80 00 20 */ blr .global sub_801bff88 sub_801bff88: @@ -2888,7 +2888,7 @@ lbl_801C0008: .global sub_801c0058 sub_801c0058: -/* 801C0058 001BCFB8 4E 80 00 20 */ blr +/* 801C0058 001BCFB8 4E 80 00 20 */ blr .global SetNewTarget__11CWaveBusterF9TUniqueId SetNewTarget__11CWaveBusterF9TUniqueId: @@ -2943,7 +2943,7 @@ lbl_801C0110: /* 801C0114 001BD074 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 801C0118 001BD078 7C 08 03 A6 */ mtlr r0 /* 801C011C 001BD07C 38 21 00 30 */ addi r1, r1, 0x30 -/* 801C0120 001BD080 4E 80 00 20 */ blr +/* 801C0120 001BD080 4E 80 00 20 */ blr .global sub_801c0124 sub_801c0124: @@ -2957,7 +2957,7 @@ sub_801c0124: .global sub_801c0140 sub_801c0140: -/* 801C0140 001BD0A0 4E 80 00 20 */ blr +/* 801C0140 001BD0A0 4E 80 00 20 */ blr .global sub_801c0144 sub_801c0144: @@ -2970,11 +2970,11 @@ sub_801c0144: /* 801C015C 001BD0BC 7C 04 03 78 */ mr r4, r0 /* 801C0160 001BD0C0 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 801C0164 001BD0C4 7D 89 03 A6 */ mtctr r12 -/* 801C0168 001BD0C8 4E 80 04 21 */ bctrl +/* 801C0168 001BD0C8 4E 80 04 21 */ bctrl /* 801C016C 001BD0CC 80 01 00 14 */ lwz r0, 0x14(r1) /* 801C0170 001BD0D0 7C 08 03 A6 */ mtlr r0 /* 801C0174 001BD0D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801C0178 001BD0D8 4E 80 00 20 */ blr +/* 801C0178 001BD0D8 4E 80 00 20 */ blr .global "__ct__11CWaveBusterFRC28TToken<18CWeaponDescription>11EWeaponTypeRC12CTransform4f14EMaterialTypesRC11CDamageInfo9TUniqueId7TAreaId9TUniqueId9TUniqueIdUi" "__ct__11CWaveBusterFRC28TToken<18CWeaponDescription>11EWeaponTypeRC12CTransform4f14EMaterialTypesRC11CDamageInfo9TUniqueId7TAreaId9TUniqueId9TUniqueIdUi": @@ -3117,7 +3117,7 @@ lbl_801C0290: /* 801C0398 001BD2F8 81 84 00 00 */ lwz r12, 0(r4) /* 801C039C 001BD2FC 81 8C 00 10 */ lwz r12, 0x10(r12) /* 801C03A0 001BD300 7D 89 03 A6 */ mtctr r12 -/* 801C03A4 001BD304 4E 80 04 21 */ bctrl +/* 801C03A4 001BD304 4E 80 04 21 */ bctrl /* 801C03A8 001BD308 3A 1F 03 54 */ addi r16, r31, 0x354 /* 801C03AC 001BD30C 38 81 00 78 */ addi r4, r1, 0x78 /* 801C03B0 001BD310 7E 03 83 78 */ mr r3, r16 @@ -3137,7 +3137,7 @@ lbl_801C0290: /* 801C03E8 001BD348 38 A5 00 2A */ addi r5, r5, 0x2a /* 801C03EC 001BD34C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 801C03F0 001BD350 7D 89 03 A6 */ mtctr r12 -/* 801C03F4 001BD354 4E 80 04 21 */ bctrl +/* 801C03F4 001BD354 4E 80 04 21 */ bctrl /* 801C03F8 001BD358 3A 1F 03 60 */ addi r16, r31, 0x360 /* 801C03FC 001BD35C 38 81 00 70 */ addi r4, r1, 0x70 /* 801C0400 001BD360 7E 03 83 78 */ mr r3, r16 @@ -3157,7 +3157,7 @@ lbl_801C0290: /* 801C0438 001BD398 38 A5 00 38 */ addi r5, r5, 0x38 /* 801C043C 001BD39C 81 8C 00 10 */ lwz r12, 0x10(r12) /* 801C0440 001BD3A0 7D 89 03 A6 */ mtctr r12 -/* 801C0444 001BD3A4 4E 80 04 21 */ bctrl +/* 801C0444 001BD3A4 4E 80 04 21 */ bctrl /* 801C0448 001BD3A8 3A 1F 03 6C */ addi r16, r31, 0x36c /* 801C044C 001BD3AC 38 81 00 68 */ addi r4, r1, 0x68 /* 801C0450 001BD3B0 7E 03 83 78 */ mr r3, r16 @@ -3177,7 +3177,7 @@ lbl_801C0290: /* 801C0488 001BD3E8 38 A5 00 45 */ addi r5, r5, 0x45 /* 801C048C 001BD3EC 81 8C 00 10 */ lwz r12, 0x10(r12) /* 801C0490 001BD3F0 7D 89 03 A6 */ mtctr r12 -/* 801C0494 001BD3F4 4E 80 04 21 */ bctrl +/* 801C0494 001BD3F4 4E 80 04 21 */ bctrl /* 801C0498 001BD3F8 3A 1F 03 78 */ addi r16, r31, 0x378 /* 801C049C 001BD3FC 38 81 00 60 */ addi r4, r1, 0x60 /* 801C04A0 001BD400 7E 03 83 78 */ mr r3, r16 @@ -3346,7 +3346,7 @@ lbl_801C06EC: /* 801C0708 001BD668 81 83 00 00 */ lwz r12, 0(r3) /* 801C070C 001BD66C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801C0710 001BD670 7D 89 03 A6 */ mtctr r12 -/* 801C0714 001BD674 4E 80 04 21 */ bctrl +/* 801C0714 001BD674 4E 80 04 21 */ bctrl /* 801C0718 001BD678 80 7F 03 88 */ lwz r3, 0x388(r31) /* 801C071C 001BD67C 38 80 00 01 */ li r4, 1 /* 801C0720 001BD680 C8 22 AA 60 */ lfd f1, lbl_805AC780@sda21(r2) @@ -3357,7 +3357,7 @@ lbl_801C06EC: /* 801C0734 001BD694 81 83 00 00 */ lwz r12, 0(r3) /* 801C0738 001BD698 81 8C 00 0C */ lwz r12, 0xc(r12) /* 801C073C 001BD69C 7D 89 03 A6 */ mtctr r12 -/* 801C0740 001BD6A0 4E 80 04 21 */ bctrl +/* 801C0740 001BD6A0 4E 80 04 21 */ bctrl /* 801C0744 001BD6A4 3A 10 00 01 */ addi r16, r16, 1 lbl_801C0748: /* 801C0748 001BD6A8 80 77 01 60 */ lwz r3, 0x160(r23) @@ -3369,7 +3369,7 @@ lbl_801C0748: /* 801C0760 001BD6C0 80 01 01 14 */ lwz r0, 0x114(r1) /* 801C0764 001BD6C4 7C 08 03 A6 */ mtlr r0 /* 801C0768 001BD6C8 38 21 01 10 */ addi r1, r1, 0x110 -/* 801C076C 001BD6CC 4E 80 00 20 */ blr +/* 801C076C 001BD6CC 4E 80 00 20 */ blr .global __sinit_CWaveBuster_cpp __sinit_CWaveBuster_cpp: diff --git a/asm/MetroidPrime/Weapons/CWeapon.s b/asm/MetroidPrime/Weapons/CWeapon.s index d70be3b7..2f973cb7 100644 --- a/asm/MetroidPrime/Weapons/CWeapon.s +++ b/asm/MetroidPrime/Weapons/CWeapon.s @@ -60,11 +60,11 @@ lbl_805A7558: .global GetCollisionResponseType__7CWeaponCFRC9CVector3fRC9CVector3fRC11CWeaponModei GetCollisionResponseType__7CWeaponCFRC9CVector3fRC9CVector3fRC11CWeaponModei: /* 80101F00 000FEE60 38 60 00 0C */ li r3, 0xc -/* 80101F04 000FEE64 4E 80 00 20 */ blr +/* 80101F04 000FEE64 4E 80 00 20 */ blr .global Render__7CWeaponCFRC13CStateManager Render__7CWeaponCFRC13CStateManager: -/* 80101F08 000FEE68 4E 80 00 20 */ blr +/* 80101F08 000FEE68 4E 80 00 20 */ blr .global FluidFXThink__7CWeaponFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager FluidFXThink__7CWeaponFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager: @@ -88,7 +88,7 @@ FluidFXThink__7CWeaponFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager: /* 80101F50 000FEEB0 38 63 FF 5C */ addi r3, r3, lbl_803DFF5C@l /* 80101F54 000FEEB4 7C 03 00 2E */ lwzx r0, r3, r0 /* 80101F58 000FEEB8 7C 09 03 A6 */ mtctr r0 -/* 80101F5C 000FEEBC 4E 80 04 20 */ bctr +/* 80101F5C 000FEEBC 4E 80 04 20 */ bctr .global lbl_80101F60 lbl_80101F60: /* 80101F60 000FEEC0 C3 E2 93 EC */ lfs f31, lbl_805AB10C@sda21(r2) @@ -186,7 +186,7 @@ lbl_8010205C: /* 80102080 000FEFE0 81 83 00 00 */ lwz r12, 0(r3) /* 80102084 000FEFE4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80102088 000FEFE8 7D 89 03 A6 */ mtctr r12 -/* 8010208C 000FEFEC 4E 80 04 21 */ bctrl +/* 8010208C 000FEFEC 4E 80 04 21 */ bctrl /* 80102090 000FEFF0 A0 1C 00 08 */ lhz r0, 8(r28) /* 80102094 000FEFF4 FC 20 F8 90 */ fmr f1, f31 /* 80102098 000FEFF8 7F E5 FB 78 */ mr r5, r31 @@ -205,7 +205,7 @@ lbl_801020BC: /* 801020C8 000FF028 80 01 00 74 */ lwz r0, 0x74(r1) /* 801020CC 000FF02C 7C 08 03 A6 */ mtlr r0 /* 801020D0 000FF030 38 21 00 70 */ addi r1, r1, 0x70 -/* 801020D4 000FF034 4E 80 00 20 */ blr +/* 801020D4 000FF034 4E 80 00 20 */ blr .global Think__7CWeaponFfR13CStateManager Think__7CWeaponFfR13CStateManager: @@ -290,17 +290,17 @@ lbl_801021E8: /* 80102208 000FF168 83 C1 00 28 */ lwz r30, 0x28(r1) /* 8010220C 000FF16C 7C 08 03 A6 */ mtlr r0 /* 80102210 000FF170 38 21 00 40 */ addi r1, r1, 0x40 -/* 80102214 000FF174 4E 80 00 20 */ blr +/* 80102214 000FF174 4E 80 00 20 */ blr .global sub_80102218 sub_80102218: /* 80102218 000FF178 C0 02 93 E8 */ lfs f0, lbl_805AB108@sda21(r2) /* 8010221C 000FF17C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80102220 000FF180 4C 81 00 20 */ blelr +/* 80102220 000FF180 4C 81 00 20 */ blelr /* 80102224 000FF184 C0 02 93 FC */ lfs f0, lbl_805AB11C@sda21(r2) /* 80102228 000FF188 EC 00 08 24 */ fdivs f0, f0, f1 /* 8010222C 000FF18C D0 03 01 4C */ stfs f0, 0x14c(r3) -/* 80102230 000FF190 4E 80 00 20 */ blr +/* 80102230 000FF190 4E 80 00 20 */ blr .global __dt__7CWeaponFv __dt__7CWeaponFv: @@ -328,7 +328,7 @@ lbl_80102278: /* 80102284 000FF1E4 83 C1 00 08 */ lwz r30, 8(r1) /* 80102288 000FF1E8 7C 08 03 A6 */ mtlr r0 /* 8010228C 000FF1EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80102290 000FF1F0 4E 80 00 20 */ blr +/* 80102290 000FF1F0 4E 80 00 20 */ blr .global "__ct__7CWeaponF9TUniqueIdb9TUniqueId11EWeaponTypeRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC12CTransform4fRC15CMaterialFilterRC13CMaterialListRC11CDamageInfoiRC10CModelData" "__ct__7CWeaponF9TUniqueIdb9TUniqueId11EWeaponTypeRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC12CTransform4fRC15CMaterialFilterRC13CMaterialListRC11CDamageInfoiRC10CModelData": diff --git a/asm/MetroidPrime/Weapons/GunController/CGSComboFire.s b/asm/MetroidPrime/Weapons/GunController/CGSComboFire.s index b21c4b31..45fb9d68 100644 --- a/asm/MetroidPrime/Weapons/GunController/CGSComboFire.s +++ b/asm/MetroidPrime/Weapons/GunController/CGSComboFire.s @@ -137,7 +137,7 @@ lbl_801CD278: /* 801CD288 001CA1E8 80 01 00 F4 */ lwz r0, 0xf4(r1) /* 801CD28C 001CA1EC 7C 08 03 A6 */ mtlr r0 /* 801CD290 001CA1F0 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 801CD294 001CA1F4 4E 80 00 20 */ blr +/* 801CD294 001CA1F4 4E 80 00 20 */ blr .global Update__12CGSComboFireFR9CAnimDatafR13CStateManager Update__12CGSComboFireFR9CAnimDatafR13CStateManager: @@ -259,7 +259,7 @@ lbl_801CD438: /* 801CD448 001CA3A8 83 81 00 40 */ lwz r28, 0x40(r1) /* 801CD44C 001CA3AC 7C 08 03 A6 */ mtlr r0 /* 801CD450 001CA3B0 38 21 00 50 */ addi r1, r1, 0x50 -/* 801CD454 001CA3B4 4E 80 00 20 */ blr +/* 801CD454 001CA3B4 4E 80 00 20 */ blr .global __ct__12CGSComboFireFv __ct__12CGSComboFireFv: diff --git a/asm/MetroidPrime/Weapons/GunController/CGSFidget.s b/asm/MetroidPrime/Weapons/GunController/CGSFidget.s index eb8e67cc..cf806bf5 100644 --- a/asm/MetroidPrime/Weapons/GunController/CGSFidget.s +++ b/asm/MetroidPrime/Weapons/GunController/CGSFidget.s @@ -11,7 +11,7 @@ IsAnimLoaded__9CGSFidgetCFv: /* 801F10D8 001EE038 80 01 00 14 */ lwz r0, 0x14(r1) /* 801F10DC 001EE03C 7C 08 03 A6 */ mtlr r0 /* 801F10E0 001EE040 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F10E4 001EE044 4E 80 00 20 */ blr +/* 801F10E4 001EE044 4E 80 00 20 */ blr .global UnLoadAnim__9CGSFidgetFv UnLoadAnim__9CGSFidgetFv: @@ -56,7 +56,7 @@ lbl_801F116C: /* 801F1174 001EE0D4 83 C1 00 28 */ lwz r30, 0x28(r1) /* 801F1178 001EE0D8 7C 08 03 A6 */ mtlr r0 /* 801F117C 001EE0DC 38 21 00 30 */ addi r1, r1, 0x30 -/* 801F1180 001EE0E0 4E 80 00 20 */ blr +/* 801F1180 001EE0E0 4E 80 00 20 */ blr .global LoadAnimAsync__9CGSFidgetFR9CAnimDataiiiR13CStateManager LoadAnimAsync__9CGSFidgetFR9CAnimDataiiiR13CStateManager: @@ -148,7 +148,7 @@ lbl_801F12BC: /* 801F12C0 001EE220 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 801F12C4 001EE224 7C 08 03 A6 */ mtlr r0 /* 801F12C8 001EE228 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 801F12CC 001EE22C 4E 80 00 20 */ blr +/* 801F12CC 001EE22C 4E 80 00 20 */ blr .global SetAnim__9CGSFidgetFR9CAnimDataiiiR13CStateManager SetAnim__9CGSFidgetFR9CAnimDataiiiR13CStateManager: @@ -280,7 +280,7 @@ lbl_801F14A4: /* 801F14AC 001EE40C 80 01 01 04 */ lwz r0, 0x104(r1) /* 801F14B0 001EE410 7C 08 03 A6 */ mtlr r0 /* 801F14B4 001EE414 38 21 01 00 */ addi r1, r1, 0x100 -/* 801F14B8 001EE418 4E 80 00 20 */ blr +/* 801F14B8 001EE418 4E 80 00 20 */ blr .global Update__9CGSFidgetFR9CAnimDatafR13CStateManager Update__9CGSFidgetFR9CAnimDatafR13CStateManager: @@ -307,7 +307,7 @@ Update__9CGSFidgetFR9CAnimDatafR13CStateManager: /* 801F150C 001EE46C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801F1510 001EE470 7C 08 03 A6 */ mtlr r0 /* 801F1514 001EE474 38 21 00 20 */ addi r1, r1, 0x20 -/* 801F1518 001EE478 4E 80 00 20 */ blr +/* 801F1518 001EE478 4E 80 00 20 */ blr .global __ct__9CGSFidgetFv __ct__9CGSFidgetFv: diff --git a/asm/MetroidPrime/Weapons/GunController/CGSFreeLook.s b/asm/MetroidPrime/Weapons/GunController/CGSFreeLook.s index 5ace179a..08ab56b1 100644 --- a/asm/MetroidPrime/Weapons/GunController/CGSFreeLook.s +++ b/asm/MetroidPrime/Weapons/GunController/CGSFreeLook.s @@ -153,7 +153,7 @@ lbl_801CCEC0: /* 801CCED0 001C9E30 80 01 01 14 */ lwz r0, 0x114(r1) /* 801CCED4 001C9E34 7C 08 03 A6 */ mtlr r0 /* 801CCED8 001C9E38 38 21 01 10 */ addi r1, r1, 0x110 -/* 801CCEDC 001C9E3C 4E 80 00 20 */ blr +/* 801CCEDC 001C9E3C 4E 80 00 20 */ blr .global Update__11CGSFreeLookFR9CAnimDatafR13CStateManager Update__11CGSFreeLookFR9CAnimDatafR13CStateManager: @@ -262,7 +262,7 @@ lbl_801CD050: /* 801CD060 001C9FC0 83 81 00 40 */ lwz r28, 0x40(r1) /* 801CD064 001C9FC4 7C 08 03 A6 */ mtlr r0 /* 801CD068 001C9FC8 38 21 00 50 */ addi r1, r1, 0x50 -/* 801CD06C 001C9FCC 4E 80 00 20 */ blr +/* 801CD06C 001C9FCC 4E 80 00 20 */ blr .global __ct__11CGSFreeLookFv __ct__11CGSFreeLookFv: @@ -277,4 +277,4 @@ __ct__11CGSFreeLookFv: /* 801CD090 001C9FF0 88 03 00 14 */ lbz r0, 0x14(r3) /* 801CD094 001C9FF4 50 80 3E 30 */ rlwimi r0, r4, 7, 0x18, 0x18 /* 801CD098 001C9FF8 98 03 00 14 */ stb r0, 0x14(r3) -/* 801CD09C 001C9FFC 4E 80 00 20 */ blr +/* 801CD09C 001C9FFC 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/Weapons/GunController/CGunController.s b/asm/MetroidPrime/Weapons/GunController/CGunController.s index e47973ad..e9523586 100644 --- a/asm/MetroidPrime/Weapons/GunController/CGunController.s +++ b/asm/MetroidPrime/Weapons/GunController/CGunController.s @@ -127,7 +127,7 @@ lbl_801CC240: /* 801CC2C0 001C9220 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 801CC2C4 001C9224 7C 08 03 A6 */ mtlr r0 /* 801CC2C8 001C9228 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 801CC2CC 001C922C 4E 80 00 20 */ blr +/* 801CC2CC 001C922C 4E 80 00 20 */ blr .global Reset__14CGunControllerFv Reset__14CGunControllerFv: @@ -140,7 +140,7 @@ Reset__14CGunControllerFv: /* 801CC2E8 001C9248 50 80 36 72 */ rlwimi r0, r4, 6, 0x19, 0x19 /* 801CC2EC 001C924C 98 03 00 58 */ stb r0, 0x58(r3) /* 801CC2F0 001C9250 90 83 00 50 */ stw r4, 0x50(r3) -/* 801CC2F4 001C9254 4E 80 00 20 */ blr +/* 801CC2F4 001C9254 4E 80 00 20 */ blr .global ReturnToDefault__14CGunControllerFR13CStateManagerf ReturnToDefault__14CGunControllerFR13CStateManagerf: @@ -218,7 +218,7 @@ lbl_801CC3EC: /* 801CC3F4 001C9354 83 C1 00 08 */ lwz r30, 8(r1) /* 801CC3F8 001C9358 7C 08 03 A6 */ mtlr r0 /* 801CC3FC 001C935C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CC400 001C9360 4E 80 00 20 */ blr +/* 801CC400 001C9360 4E 80 00 20 */ blr .global EnterIdle__14CGunControllerFR13CStateManager EnterIdle__14CGunControllerFR13CStateManager: @@ -373,7 +373,7 @@ lbl_801CC624: /* 801CC630 001C9590 83 A1 00 E4 */ lwz r29, 0xe4(r1) /* 801CC634 001C9594 7C 08 03 A6 */ mtlr r0 /* 801CC638 001C9598 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 801CC63C 001C959C 4E 80 00 20 */ blr +/* 801CC63C 001C959C 4E 80 00 20 */ blr .global Update__14CGunControllerFfR13CStateManager Update__14CGunControllerFfR13CStateManager: @@ -399,7 +399,7 @@ Update__14CGunControllerFfR13CStateManager: /* 801CC68C 001C95EC 38 63 57 28 */ addi r3, r3, lbl_803E5728@l /* 801CC690 001C95F0 7C 03 00 2E */ lwzx r0, r3, r0 /* 801CC694 001C95F4 7C 09 03 A6 */ mtctr r0 -/* 801CC698 001C95F8 4E 80 04 20 */ bctr +/* 801CC698 001C95F8 4E 80 04 20 */ bctr .global lbl_801CC69C lbl_801CC69C: /* 801CC69C 001C95FC 7F A4 EB 78 */ mr r4, r29 @@ -509,7 +509,7 @@ lbl_801CC800: /* 801CC80C 001C976C 83 A1 00 34 */ lwz r29, 0x34(r1) /* 801CC810 001C9770 7C 08 03 A6 */ mtlr r0 /* 801CC814 001C9774 38 21 00 40 */ addi r1, r1, 0x40 -/* 801CC818 001C9778 4E 80 00 20 */ blr +/* 801CC818 001C9778 4E 80 00 20 */ blr .global LoadFidgetAnimAsync__14CGunControllerFR13CStateManageriii LoadFidgetAnimAsync__14CGunControllerFR13CStateManageriii: @@ -524,7 +524,7 @@ LoadFidgetAnimAsync__14CGunControllerFR13CStateManageriii: /* 801CC83C 001C979C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801CC840 001C97A0 7C 08 03 A6 */ mtlr r0 /* 801CC844 001C97A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CC848 001C97A8 4E 80 00 20 */ blr +/* 801CC848 001C97A8 4E 80 00 20 */ blr .global EnterStruck__14CGunControllerFR13CStateManagerf EnterStruck__14CGunControllerFR13CStateManagerf: @@ -717,7 +717,7 @@ lbl_801CCAE4: /* 801CCAF0 001C9A50 80 01 01 44 */ lwz r0, 0x144(r1) /* 801CCAF4 001C9A54 7C 08 03 A6 */ mtlr r0 /* 801CCAF8 001C9A58 38 21 01 40 */ addi r1, r1, 0x140 -/* 801CCAFC 001C9A5C 4E 80 00 20 */ blr +/* 801CCAFC 001C9A5C 4E 80 00 20 */ blr .global EnterFidget__14CGunControllerFR13CStateManageriii EnterFidget__14CGunControllerFR13CStateManageriii: @@ -738,7 +738,7 @@ EnterFidget__14CGunControllerFR13CStateManageriii: /* 801CCB38 001C9A98 80 01 00 14 */ lwz r0, 0x14(r1) /* 801CCB3C 001C9A9C 7C 08 03 A6 */ mtlr r0 /* 801CCB40 001C9AA0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CCB44 001C9AA4 4E 80 00 20 */ blr +/* 801CCB44 001C9AA4 4E 80 00 20 */ blr .global EnterComboFire__14CGunControllerFR13CStateManageri EnterComboFire__14CGunControllerFR13CStateManageri: @@ -773,7 +773,7 @@ lbl_801CCB94: /* 801CCBB0 001C9B10 80 01 00 14 */ lwz r0, 0x14(r1) /* 801CCBB4 001C9B14 7C 08 03 A6 */ mtlr r0 /* 801CCBB8 001C9B18 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CCBBC 001C9B1C 4E 80 00 20 */ blr +/* 801CCBBC 001C9B1C 4E 80 00 20 */ blr .global EnterFreeLook__14CGunControllerFR13CStateManagerii EnterFreeLook__14CGunControllerFR13CStateManagerii: @@ -807,7 +807,7 @@ lbl_801CCC18: /* 801CCC24 001C9B84 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801CCC28 001C9B88 7C 08 03 A6 */ mtlr r0 /* 801CCC2C 001C9B8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801CCC30 001C9B90 4E 80 00 20 */ blr +/* 801CCC30 001C9B90 4E 80 00 20 */ blr .global __ct__14CGunControllerFR10CModelData __ct__14CGunControllerFR10CModelData: diff --git a/asm/MetroidPrime/Weapons/GunController/CGunMotion.s b/asm/MetroidPrime/Weapons/GunController/CGunMotion.s index 3e6568bf..0cb366cd 100644 --- a/asm/MetroidPrime/Weapons/GunController/CGunMotion.s +++ b/asm/MetroidPrime/Weapons/GunController/CGunMotion.s @@ -17,7 +17,7 @@ LoadAnimations__10CGunMotionFv: /* 801D8F9C 001D5EFC 80 01 00 14 */ lwz r0, 0x14(r1) /* 801D8FA0 001D5F00 7C 08 03 A6 */ mtlr r0 /* 801D8FA4 001D5F04 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D8FA8 001D5F08 4E 80 00 20 */ blr +/* 801D8FA8 001D5F08 4E 80 00 20 */ blr .global EnterFidget__10CGunMotionFR13CStateManagerQ28SamusGun11EFidgetTypei EnterFidget__10CGunMotionFR13CStateManagerQ28SamusGun11EFidgetTypei: @@ -35,7 +35,7 @@ EnterFidget__10CGunMotionFR13CStateManagerQ28SamusGun11EFidgetTypei: /* 801D8FD8 001D5F38 80 01 00 14 */ lwz r0, 0x14(r1) /* 801D8FDC 001D5F3C 7C 08 03 A6 */ mtlr r0 /* 801D8FE0 001D5F40 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D8FE4 001D5F44 4E 80 00 20 */ blr +/* 801D8FE4 001D5F44 4E 80 00 20 */ blr .global BasePosition__10CGunMotionFb BasePosition__10CGunMotionFb: @@ -75,12 +75,12 @@ lbl_801D9024: /* 801D9068 001D5FC8 80 01 00 34 */ lwz r0, 0x34(r1) /* 801D906C 001D5FCC 7C 08 03 A6 */ mtlr r0 /* 801D9070 001D5FD0 38 21 00 30 */ addi r1, r1, 0x30 -/* 801D9074 001D5FD4 4E 80 00 20 */ blr +/* 801D9074 001D5FD4 4E 80 00 20 */ blr .global GetFreeLookSetId__10CGunMotionCFv GetFreeLookSetId__10CGunMotionCFv: /* 801D9078 001D5FD8 80 63 00 60 */ lwz r3, 0x60(r3) -/* 801D907C 001D5FDC 4E 80 00 20 */ blr +/* 801D907C 001D5FDC 4E 80 00 20 */ blr .global ReturnToDefault__10CGunMotionFR13CStateManager ReturnToDefault__10CGunMotionFR13CStateManager: @@ -93,7 +93,7 @@ ReturnToDefault__10CGunMotionFR13CStateManager: /* 801D9098 001D5FF8 80 01 00 14 */ lwz r0, 0x14(r1) /* 801D909C 001D5FFC 7C 08 03 A6 */ mtlr r0 /* 801D90A0 001D6000 38 21 00 10 */ addi r1, r1, 0x10 -/* 801D90A4 001D6004 4E 80 00 20 */ blr +/* 801D90A4 001D6004 4E 80 00 20 */ blr .global Draw__10CGunMotionCFRC13CStateManagerRC12CTransform4f Draw__10CGunMotionCFRC13CStateManagerRC12CTransform4f: @@ -129,7 +129,7 @@ Draw__10CGunMotionCFRC13CStateManagerRC12CTransform4f: /* 801D911C 001D607C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 801D9120 001D6080 7C 08 03 A6 */ mtlr r0 /* 801D9124 001D6084 38 21 00 20 */ addi r1, r1, 0x20 -/* 801D9128 001D6088 4E 80 00 20 */ blr +/* 801D9128 001D6088 4E 80 00 20 */ blr .global Update__10CGunMotionFfR13CStateManager Update__10CGunMotionFfR13CStateManager: @@ -169,7 +169,7 @@ lbl_801D919C: /* 801D91A8 001D6108 83 C1 00 30 */ lwz r30, 0x30(r1) /* 801D91AC 001D610C 7C 08 03 A6 */ mtlr r0 /* 801D91B0 001D6110 38 21 00 40 */ addi r1, r1, 0x40 -/* 801D91B4 001D6114 4E 80 00 20 */ blr +/* 801D91B4 001D6114 4E 80 00 20 */ blr .global PlayPasAnim__10CGunMotionFQ28SamusGun15EAnimationStateR13CStateManagerfb PlayPasAnim__10CGunMotionFQ28SamusGun15EAnimationStateR13CStateManagerfb: @@ -459,7 +459,7 @@ lbl_801D95B8: /* 801D95C8 001D6528 80 01 02 24 */ lwz r0, 0x224(r1) /* 801D95CC 001D652C 7C 08 03 A6 */ mtlr r0 /* 801D95D0 001D6530 38 21 02 20 */ addi r1, r1, 0x220 -/* 801D95D4 001D6534 4E 80 00 20 */ blr +/* 801D95D4 001D6534 4E 80 00 20 */ blr .global __dt__10CGunMotionFv __dt__10CGunMotionFv: @@ -516,7 +516,7 @@ lbl_801D967C: /* 801D9690 001D65F0 83 81 00 20 */ lwz r28, 0x20(r1) /* 801D9694 001D65F4 7C 08 03 A6 */ mtlr r0 /* 801D9698 001D65F8 38 21 00 30 */ addi r1, r1, 0x30 -/* 801D969C 001D65FC 4E 80 00 20 */ blr +/* 801D969C 001D65FC 4E 80 00 20 */ blr .global __ct__10CGunMotionFUiRC9CVector3f __ct__10CGunMotionFUiRC9CVector3f: diff --git a/asm/MetroidPrime/Weapons/WeaponTypes.s b/asm/MetroidPrime/Weapons/WeaponTypes.s index 7df6dfcc..aa6c795c 100644 --- a/asm/MetroidPrime/Weapons/WeaponTypes.s +++ b/asm/MetroidPrime/Weapons/WeaponTypes.s @@ -28,7 +28,7 @@ lbl_8028AA10: /* 8028AA14 00287974 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8028AA18 00287978 7C 08 03 A6 */ mtlr r0 /* 8028AA1C 0028797C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028AA20 00287980 4E 80 00 20 */ blr +/* 8028AA20 00287980 4E 80 00 20 */ blr .global GetShotDamageInfo__10CGunWeaponCFRC10SShotParamR13CStateManager GetShotDamageInfo__10CGunWeaponCFRC10SShotParamR13CStateManager: @@ -85,7 +85,7 @@ lbl_8028AAAC: /* 8028AAE8 00287A48 80 01 00 34 */ lwz r0, 0x34(r1) /* 8028AAEC 00287A4C 7C 08 03 A6 */ mtlr r0 /* 8028AAF0 00287A50 38 21 00 30 */ addi r1, r1, 0x30 -/* 8028AAF4 00287A54 4E 80 00 20 */ blr +/* 8028AAF4 00287A54 4E 80 00 20 */ blr .global play_sfx__12NWeaponTypesFUsbbs play_sfx__12NWeaponTypesFUsbbs: @@ -125,7 +125,7 @@ lbl_8028AB68: /* 8028AB78 00287AD8 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8028AB7C 00287ADC 7C 08 03 A6 */ mtlr r0 /* 8028AB80 00287AE0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8028AB84 00287AE4 4E 80 00 20 */ blr +/* 8028AB84 00287AE4 4E 80 00 20 */ blr .global "do_sound_event__12NWeaponTypesFRQ24rstl21pairRibUifUiffUcRC9CVector3fRC9CVector3f7TAreaId" "do_sound_event__12NWeaponTypesFRQ24rstl21pairRibUifUiffUcRC9CVector3fRC9CVector3f7TAreaId": @@ -342,7 +342,7 @@ lbl_8028AE90: /* 8028AEAC 00287E0C 80 01 00 E4 */ lwz r0, 0xe4(r1) /* 8028AEB0 00287E10 7C 08 03 A6 */ mtlr r0 /* 8028AEB4 00287E14 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 8028AEB8 00287E18 4E 80 00 20 */ blr +/* 8028AEB8 00287E18 4E 80 00 20 */ blr .global "primitive_set_to_token_vector__12NWeaponTypesFRC9CAnimDataRCQ24rstl72set<10CPrimitive,Q24rstl18less<10CPrimitive>,Q24rstl17rmemory_allocator>RQ24rstl42vector<6CToken,Q24rstl17rmemory_allocator>b" "primitive_set_to_token_vector__12NWeaponTypesFRC9CAnimDataRCQ24rstl72set<10CPrimitive,Q24rstl18less<10CPrimitive>,Q24rstl17rmemory_allocator>RQ24rstl42vector<6CToken,Q24rstl17rmemory_allocator>b": @@ -436,7 +436,7 @@ lbl_8028AFC0: /* 8028AFF4 00287F54 81 84 00 00 */ lwz r12, 0(r4) /* 8028AFF8 00287F58 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8028AFFC 00287F5C 7D 89 03 A6 */ mtctr r12 -/* 8028B000 00287F60 4E 80 04 21 */ bctrl +/* 8028B000 00287F60 4E 80 04 21 */ bctrl /* 8028B004 00287F64 38 61 00 40 */ addi r3, r1, 0x40 /* 8028B008 00287F68 38 81 00 28 */ addi r4, r1, 0x28 /* 8028B00C 00287F6C 48 0B 5E 9D */ bl __ct__6CTokenFRC6CToken @@ -483,7 +483,7 @@ lbl_8028B088: /* 8028B09C 00287FFC 81 84 00 00 */ lwz r12, 0(r4) /* 8028B0A0 00288000 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8028B0A4 00288004 7D 89 03 A6 */ mtctr r12 -/* 8028B0A8 00288008 4E 80 04 21 */ bctrl +/* 8028B0A8 00288008 4E 80 04 21 */ bctrl /* 8028B0AC 0028800C 38 61 00 38 */ addi r3, r1, 0x38 /* 8028B0B0 00288010 38 81 00 18 */ addi r4, r1, 0x18 /* 8028B0B4 00288014 48 0B 5D F5 */ bl __ct__6CTokenFRC6CToken @@ -540,7 +540,7 @@ lbl_8028B158: /* 8028B164 002880C4 80 01 00 84 */ lwz r0, 0x84(r1) /* 8028B168 002880C8 7C 08 03 A6 */ mtlr r0 /* 8028B16C 002880CC 38 21 00 80 */ addi r1, r1, 0x80 -/* 8028B170 002880D0 4E 80 00 20 */ blr +/* 8028B170 002880D0 4E 80 00 20 */ blr .global "unlock_tokens__12NWeaponTypesFRQ24rstl42vector<6CToken,Q24rstl17rmemory_allocator>" "unlock_tokens__12NWeaponTypesFRQ24rstl42vector<6CToken,Q24rstl17rmemory_allocator>": @@ -568,7 +568,7 @@ lbl_8028B1A0: /* 8028B1C0 00288120 83 C1 00 08 */ lwz r30, 8(r1) /* 8028B1C4 00288124 7C 08 03 A6 */ mtlr r0 /* 8028B1C8 00288128 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028B1CC 0028812C 4E 80 00 20 */ blr +/* 8028B1CC 0028812C 4E 80 00 20 */ blr .global "lock_tokens__12NWeaponTypesFRQ24rstl42vector<6CToken,Q24rstl17rmemory_allocator>" "lock_tokens__12NWeaponTypesFRQ24rstl42vector<6CToken,Q24rstl17rmemory_allocator>": @@ -596,7 +596,7 @@ lbl_8028B1FC: /* 8028B21C 0028817C 83 C1 00 08 */ lwz r30, 8(r1) /* 8028B220 00288180 7C 08 03 A6 */ mtlr r0 /* 8028B224 00288184 38 21 00 10 */ addi r1, r1, 0x10 -/* 8028B228 00288188 4E 80 00 20 */ blr +/* 8028B228 00288188 4E 80 00 20 */ blr .global "are_tokens_ready__12NWeaponTypesFRCQ24rstl42vector<6CToken,Q24rstl17rmemory_allocator>" "are_tokens_ready__12NWeaponTypesFRCQ24rstl42vector<6CToken,Q24rstl17rmemory_allocator>": @@ -611,14 +611,14 @@ lbl_8028B240: /* 8028B248 002881A8 28 00 00 00 */ cmplwi r0, 0 /* 8028B24C 002881AC 40 82 00 0C */ bne lbl_8028B258 /* 8028B250 002881B0 38 60 00 00 */ li r3, 0 -/* 8028B254 002881B4 4E 80 00 20 */ blr +/* 8028B254 002881B4 4E 80 00 20 */ blr lbl_8028B258: /* 8028B258 002881B8 38 A5 00 08 */ addi r5, r5, 8 lbl_8028B25C: /* 8028B25C 002881BC 7C 05 20 40 */ cmplw r5, r4 /* 8028B260 002881C0 40 82 FF E0 */ bne lbl_8028B240 /* 8028B264 002881C4 38 60 00 01 */ li r3, 1 -/* 8028B268 002881C8 4E 80 00 20 */ blr +/* 8028B268 002881C8 4E 80 00 20 */ blr .global "get_token_vector__12NWeaponTypesFR9CAnimDataiiRQ24rstl42vector<6CToken,Q24rstl17rmemory_allocator>b" "get_token_vector__12NWeaponTypesFR9CAnimDataiiRQ24rstl42vector<6CToken,Q24rstl17rmemory_allocator>b": @@ -687,7 +687,7 @@ lbl_8028B338: /* 8028B358 002882B8 80 01 00 84 */ lwz r0, 0x84(r1) /* 8028B35C 002882BC 7C 08 03 A6 */ mtlr r0 /* 8028B360 002882C0 38 21 00 80 */ addi r1, r1, 0x80 -/* 8028B364 002882C4 4E 80 00 20 */ blr +/* 8028B364 002882C4 4E 80 00 20 */ blr .global "get_token_vector__12NWeaponTypesFR9CAnimDataiRQ24rstl42vector<6CToken,Q24rstl17rmemory_allocator>b" "get_token_vector__12NWeaponTypesFR9CAnimDataiRQ24rstl42vector<6CToken,Q24rstl17rmemory_allocator>b": @@ -747,7 +747,7 @@ lbl_8028B418: /* 8028B438 00288398 80 01 00 64 */ lwz r0, 0x64(r1) /* 8028B43C 0028839C 7C 08 03 A6 */ mtlr r0 /* 8028B440 002883A0 38 21 00 60 */ addi r1, r1, 0x60 -/* 8028B444 002883A4 4E 80 00 20 */ blr +/* 8028B444 002883A4 4E 80 00 20 */ blr .global get_asset_id_from_name__12NWeaponTypesFPCc get_asset_id_from_name__12NWeaponTypesFPCc: @@ -759,7 +759,7 @@ get_asset_id_from_name__12NWeaponTypesFPCc: /* 8028B45C 002883BC 81 83 00 00 */ lwz r12, 0(r3) /* 8028B460 002883C0 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 8028B464 002883C4 7D 89 03 A6 */ mtctr r12 -/* 8028B468 002883C8 4E 80 04 21 */ bctrl +/* 8028B468 002883C8 4E 80 04 21 */ bctrl /* 8028B46C 002883CC 28 03 00 00 */ cmplwi r3, 0 /* 8028B470 002883D0 41 82 00 0C */ beq lbl_8028B47C /* 8028B474 002883D4 80 63 00 04 */ lwz r3, 4(r3) diff --git a/asm/MetroidPrime/main.s b/asm/MetroidPrime/main.s index af8cd37b..6b2de4cb 100644 --- a/asm/MetroidPrime/main.s +++ b/asm/MetroidPrime/main.s @@ -5,18 +5,18 @@ .global sGraphicsFifo sGraphicsFifo: .skip 0x60000 - + .global sMainSpace sMainSpace: .skip 0x168 - + .global lbl_804576C8 lbl_804576C8: .skip 0xD0 .global lbl_80457798 lbl_80457798: .skip 0x160 - + .section .data, "wa" .global lbl_803D8D60 lbl_803D8D60: @@ -6964,7 +6964,7 @@ lbl_8000892C: /* 8000894C 000058AC EC 02 00 24 */ fdivs f0, f2, f0 /* 80008950 000058B0 EC 23 00 32 */ fmuls f1, f3, f0 /* 80008954 000058B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80008958 000058B8 4E 80 00 20 */ blr +/* 80008958 000058B8 4E 80 00 20 */ blr .global "reserve__Q24rstl42vector<6CToken,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl42vector<6CToken,Q24rstl17rmemory_allocator>Fi": @@ -7036,7 +7036,7 @@ lbl_80008A38: /* 80008A3C 0000599C 80 01 00 34 */ lwz r0, 0x34(r1) /* 80008A40 000059A0 7C 08 03 A6 */ mtlr r0 /* 80008A44 000059A4 38 21 00 30 */ addi r1, r1, 0x30 -/* 80008A48 000059A8 4E 80 00 20 */ blr +/* 80008A48 000059A8 4E 80 00 20 */ blr .global "reserve__Q24rstl55vector,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl55vector,Q24rstl17rmemory_allocator>Fi": @@ -7110,4 +7110,4 @@ lbl_80008B28: /* 80008B34 00005A94 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80008B38 00005A98 7C 08 03 A6 */ mtlr r0 /* 80008B3C 00005A9C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80008B40 00005AA0 4E 80 00 20 */ blr +/* 80008B40 00005AA0 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/text_80008894_80009144.s b/asm/MetroidPrime/text_80008894_80009144.s index 64c94933..5c02a6e3 100644 --- a/asm/MetroidPrime/text_80008894_80009144.s +++ b/asm/MetroidPrime/text_80008894_80009144.s @@ -12,7 +12,7 @@ lbl_805A9D80: # ROM: 0x3F6620 .4byte 0x43300000 .4byte 0x80000000 - + .section .text, "ax" @@ -89,7 +89,7 @@ lbl_80008C20: /* 80008C2C 00005B8C 83 A1 00 24 */ lwz r29, 0x24(r1) /* 80008C30 00005B90 7C 08 03 A6 */ mtlr r0 /* 80008C34 00005B94 38 21 00 30 */ addi r1, r1, 0x30 -/* 80008C38 00005B98 4E 80 00 20 */ blr +/* 80008C38 00005B98 4E 80 00 20 */ blr .global sub_80008c3c sub_80008c3c: @@ -116,7 +116,7 @@ lbl_80008C84: /* 80008C88 00005BE8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80008C8C 00005BEC 7C 08 03 A6 */ mtlr r0 /* 80008C90 00005BF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80008C94 00005BF4 4E 80 00 20 */ blr +/* 80008C94 00005BF4 4E 80 00 20 */ blr .global sub_80008c98 sub_80008c98: @@ -206,7 +206,7 @@ lbl_80008DB0: /* 80008DBC 00005D1C 83 C1 00 38 */ lwz r30, 0x38(r1) /* 80008DC0 00005D20 7C 08 03 A6 */ mtlr r0 /* 80008DC4 00005D24 38 21 00 40 */ addi r1, r1, 0x40 -/* 80008DC8 00005D28 4E 80 00 20 */ blr +/* 80008DC8 00005D28 4E 80 00 20 */ blr .global sub_80008dcc sub_80008dcc: @@ -233,7 +233,7 @@ lbl_80008E14: /* 80008E18 00005D78 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80008E1C 00005D7C 7C 08 03 A6 */ mtlr r0 /* 80008E20 00005D80 38 21 00 10 */ addi r1, r1, 0x10 -/* 80008E24 00005D84 4E 80 00 20 */ blr +/* 80008E24 00005D84 4E 80 00 20 */ blr .global sub_80008e28 sub_80008e28: @@ -300,7 +300,7 @@ lbl_80008EF0: /* 80008EFC 00005E5C 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80008F00 00005E60 7C 08 03 A6 */ mtlr r0 /* 80008F04 00005E64 38 21 00 30 */ addi r1, r1, 0x30 -/* 80008F08 00005E68 4E 80 00 20 */ blr +/* 80008F08 00005E68 4E 80 00 20 */ blr .global sub_80008f0c sub_80008f0c: @@ -327,7 +327,7 @@ lbl_80008F54: /* 80008F58 00005EB8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80008F5C 00005EBC 7C 08 03 A6 */ mtlr r0 /* 80008F60 00005EC0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80008F64 00005EC4 4E 80 00 20 */ blr +/* 80008F64 00005EC4 4E 80 00 20 */ blr .global __dt__12CPlayerStateFv __dt__12CPlayerStateFv: @@ -422,7 +422,7 @@ lbl_8000908C: /* 80009098 00005FF8 83 C1 00 28 */ lwz r30, 0x28(r1) /* 8000909C 00005FFC 7C 08 03 A6 */ mtlr r0 /* 800090A0 00006000 38 21 00 30 */ addi r1, r1, 0x30 -/* 800090A4 00006004 4E 80 00 20 */ blr +/* 800090A4 00006004 4E 80 00 20 */ blr .global sub_800090a8 sub_800090a8: @@ -469,4 +469,4 @@ lbl_80009124: /* 80009138 00006098 83 81 00 10 */ lwz r28, 0x10(r1) /* 8000913C 0000609C 7C 08 03 A6 */ mtlr r0 /* 80009140 000060A0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80009144 000060A4 4E 80 00 20 */ blr +/* 80009144 000060A4 4E 80 00 20 */ blr diff --git a/asm/Runtime/CPlusLibPPC.s b/asm/Runtime/CPlusLibPPC.s index 777758b9..5908d6f7 100644 --- a/asm/Runtime/CPlusLibPPC.s +++ b/asm/Runtime/CPlusLibPPC.s @@ -5,9 +5,9 @@ .global __copy __copy: /* 803896A4 00386604 28 03 00 00 */ cmplwi r3, 0 -/* 803896A8 00386608 4D 82 00 20 */ beqlr +/* 803896A8 00386608 4D 82 00 20 */ beqlr /* 803896AC 0038660C 28 05 00 00 */ cmplwi r5, 0 -/* 803896B0 00386610 4D 82 00 20 */ beqlr +/* 803896B0 00386610 4D 82 00 20 */ beqlr /* 803896B4 00386614 7C 66 1B 78 */ mr r6, r3 lbl_803896B8: /* 803896B8 00386618 88 04 00 00 */ lbz r0, 0(r4) @@ -16,4 +16,4 @@ lbl_803896B8: /* 803896C4 00386624 98 06 00 00 */ stb r0, 0(r6) /* 803896C8 00386628 38 C6 00 01 */ addi r6, r6, 1 /* 803896CC 0038662C 40 82 FF EC */ bne lbl_803896B8 -/* 803896D0 00386630 4E 80 00 20 */ blr +/* 803896D0 00386630 4E 80 00 20 */ blr diff --git a/asm/Runtime/FILE_POS.s b/asm/Runtime/FILE_POS.s index ddc0312f..0abad394 100644 --- a/asm/Runtime/FILE_POS.s +++ b/asm/Runtime/FILE_POS.s @@ -5,7 +5,7 @@ .global lbl_805A99D0 lbl_805A99D0: .skip 0x8 - + .section .text, "ax" .global fseek @@ -17,7 +17,7 @@ fseek: /* 8038D47C 0038A3DC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8038D480 0038A3E0 7C 08 03 A6 */ mtlr r0 /* 8038D484 0038A3E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8038D488 0038A3E8 4E 80 00 20 */ blr +/* 8038D488 0038A3E8 4E 80 00 20 */ blr .global _fseek _fseek: @@ -155,7 +155,7 @@ lbl_8038D640: /* 8038D660 0038A5C0 80 7E 00 00 */ lwz r3, 0(r30) /* 8038D664 0038A5C4 80 DE 00 48 */ lwz r6, 0x48(r30) /* 8038D668 0038A5C8 7D 89 03 A6 */ mtctr r12 -/* 8038D66C 0038A5CC 4E 80 04 21 */ bctrl +/* 8038D66C 0038A5CC 4E 80 04 21 */ bctrl /* 8038D670 0038A5D0 2C 03 00 00 */ cmpwi r3, 0 /* 8038D674 0038A5D4 41 82 00 24 */ beq lbl_8038D698 /* 8038D678 0038A5D8 38 00 00 01 */ li r0, 1 @@ -180,7 +180,7 @@ lbl_8038D6B0: /* 8038D6B8 0038A618 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8038D6BC 0038A61C 7C 08 03 A6 */ mtlr r0 /* 8038D6C0 0038A620 38 21 00 20 */ addi r1, r1, 0x20 -/* 8038D6C4 0038A624 4E 80 00 20 */ blr +/* 8038D6C4 0038A624 4E 80 00 20 */ blr .global ftell ftell: @@ -198,13 +198,13 @@ lbl_8038D6EC: /* 8038D6EC 0038A64C 38 00 00 28 */ li r0, 0x28 /* 8038D6F0 0038A650 38 60 FF FF */ li r3, -1 /* 8038D6F4 0038A654 90 0D AE 10 */ stw r0, lbl_805A99D0@sda21(r13) -/* 8038D6F8 0038A658 4E 80 00 20 */ blr +/* 8038D6F8 0038A658 4E 80 00 20 */ blr lbl_8038D6FC: /* 8038D6FC 0038A65C 88 03 00 08 */ lbz r0, 8(r3) /* 8038D700 0038A660 54 05 DF 7F */ rlwinm. r5, r0, 0x1b, 0x1d, 0x1f /* 8038D704 0038A664 40 82 00 0C */ bne lbl_8038D710 /* 8038D708 0038A668 80 63 00 18 */ lwz r3, 0x18(r3) -/* 8038D70C 0038A66C 4E 80 00 20 */ blr +/* 8038D70C 0038A66C 4E 80 00 20 */ blr lbl_8038D710: /* 8038D710 0038A670 80 83 00 1C */ lwz r4, 0x1c(r3) /* 8038D714 0038A674 28 05 00 03 */ cmplwi r5, 3 @@ -212,7 +212,7 @@ lbl_8038D710: /* 8038D71C 0038A67C 80 63 00 34 */ lwz r3, 0x34(r3) /* 8038D720 0038A680 7C 04 00 50 */ subf r0, r4, r0 /* 8038D724 0038A684 7C 63 02 14 */ add r3, r3, r0 -/* 8038D728 0038A688 4D 80 00 20 */ bltlr +/* 8038D728 0038A688 4D 80 00 20 */ bltlr /* 8038D72C 0038A68C 38 05 FF FE */ addi r0, r5, -2 /* 8038D730 0038A690 7C 60 18 50 */ subf r3, r0, r3 -/* 8038D734 0038A694 4E 80 00 20 */ blr +/* 8038D734 0038A694 4E 80 00 20 */ blr diff --git a/asm/Runtime/Gecko_ExceptionPPC.s b/asm/Runtime/Gecko_ExceptionPPC.s index 31bd24df..62056171 100644 --- a/asm/Runtime/Gecko_ExceptionPPC.s +++ b/asm/Runtime/Gecko_ExceptionPPC.s @@ -3,15 +3,15 @@ .section .bss lbl_80542188: .skip 0x10 - + .section .text, "ax" .global __unregister_fragment __unregister_fragment: /* 8038A160 003870C0 2C 03 00 00 */ cmpwi r3, 0 -/* 8038A164 003870C4 4D 80 00 20 */ bltlr +/* 8038A164 003870C4 4D 80 00 20 */ bltlr /* 8038A168 003870C8 2C 03 00 01 */ cmpwi r3, 1 -/* 8038A16C 003870CC 4C 80 00 20 */ bgelr +/* 8038A16C 003870CC 4C 80 00 20 */ bgelr /* 8038A170 003870D0 1C 83 00 0C */ mulli r4, r3, 0xc /* 8038A174 003870D4 3C 60 80 54 */ lis r3, lbl_80542188@ha /* 8038A178 003870D8 38 00 00 00 */ li r0, 0 @@ -20,7 +20,7 @@ __unregister_fragment: /* 8038A184 003870E4 90 03 00 00 */ stw r0, 0(r3) /* 8038A188 003870E8 90 03 00 04 */ stw r0, 4(r3) /* 8038A18C 003870EC 90 03 00 08 */ stw r0, 8(r3) -/* 8038A190 003870F0 4E 80 00 20 */ blr +/* 8038A190 003870F0 4E 80 00 20 */ blr .global __register_fragment __register_fragment: @@ -34,7 +34,7 @@ __register_fragment: /* 8038A1B0 00387110 38 60 00 00 */ li r3, 0 /* 8038A1B4 00387114 90 85 00 04 */ stw r4, 4(r5) /* 8038A1B8 00387118 90 05 00 08 */ stw r0, 8(r5) -/* 8038A1BC 0038711C 4E 80 00 20 */ blr +/* 8038A1BC 0038711C 4E 80 00 20 */ blr lbl_8038A1C0: /* 8038A1C0 00387120 38 60 FF FF */ li r3, -1 -/* 8038A1C4 00387124 4E 80 00 20 */ blr +/* 8038A1C4 00387124 4E 80 00 20 */ blr diff --git a/asm/Runtime/NMWException.s b/asm/Runtime/NMWException.s index dab5ee0e..0a453725 100644 --- a/asm/Runtime/NMWException.s +++ b/asm/Runtime/NMWException.s @@ -23,7 +23,7 @@ lbl_80389708: /* 80389710 00386670 7F E3 FB 78 */ mr r3, r31 /* 80389714 00386674 38 80 FF FF */ li r4, -1 /* 80389718 00386678 7D 89 03 A6 */ mtctr r12 -/* 8038971C 0038667C 4E 80 04 21 */ bctrl +/* 8038971C 0038667C 4E 80 04 21 */ bctrl /* 80389720 00386680 3B DE FF FF */ addi r30, r30, -1 lbl_80389724: /* 80389724 00386684 28 1E 00 00 */ cmplwi r30, 0 @@ -35,7 +35,7 @@ lbl_80389724: /* 8038973C 0038669C 83 81 00 10 */ lwz r28, 0x10(r1) /* 80389740 003866A0 7C 08 03 A6 */ mtlr r0 /* 80389744 003866A4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80389748 003866A8 4E 80 00 20 */ blr +/* 80389748 003866A8 4E 80 00 20 */ blr .global __construct_array @@ -64,7 +64,7 @@ lbl_80389798: /* 8038979C 003866FC 7F C3 F3 78 */ mr r3, r30 /* 803897A0 00386700 38 80 00 01 */ li r4, 1 /* 803897A4 00386704 7D 89 03 A6 */ mtctr r12 -/* 803897A8 00386708 4E 80 04 21 */ bctrl +/* 803897A8 00386708 4E 80 04 21 */ bctrl /* 803897AC 0038670C 80 61 00 18 */ lwz r3, 0x18(r1) /* 803897B0 00386710 7F DE EA 14 */ add r30, r30, r29 /* 803897B4 00386714 38 03 00 01 */ addi r0, r3, 1 @@ -90,7 +90,7 @@ lbl_803897F4: /* 803897FC 0038675C 7F C3 F3 78 */ mr r3, r30 /* 80389800 00386760 38 80 FF FF */ li r4, -1 /* 80389804 00386764 7D 89 03 A6 */ mtctr r12 -/* 80389808 00386768 4E 80 04 21 */ bctrl +/* 80389808 00386768 4E 80 04 21 */ bctrl /* 8038980C 0038676C 80 61 00 18 */ lwz r3, 0x18(r1) /* 80389810 00386770 38 03 FF FF */ addi r0, r3, -1 /* 80389814 00386774 90 01 00 18 */ stw r0, 0x18(r1) @@ -106,7 +106,7 @@ lbl_80389824: /* 80389834 00386794 83 81 00 20 */ lwz r28, 0x20(r1) /* 80389838 00386798 7C 08 03 A6 */ mtlr r0 /* 8038983C 0038679C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80389840 003867A0 4E 80 00 20 */ blr +/* 80389840 003867A0 4E 80 00 20 */ blr .global __dt__26__partial_array_destructorFv __dt__26__partial_array_destructorFv: @@ -138,7 +138,7 @@ lbl_80389898: /* 803898A4 00386804 7F E0 F8 50 */ subf r31, r0, r31 /* 803898A8 00386808 7F E3 FB 78 */ mr r3, r31 /* 803898AC 0038680C 7D 89 03 A6 */ mtctr r12 -/* 803898B0 00386810 4E 80 04 21 */ bctrl +/* 803898B0 00386810 4E 80 04 21 */ bctrl /* 803898B4 00386814 80 7D 00 10 */ lwz r3, 0x10(r29) /* 803898B8 00386818 38 03 FF FF */ addi r0, r3, -1 /* 803898BC 0038681C 90 1D 00 10 */ stw r0, 0x10(r29) @@ -159,4 +159,4 @@ lbl_803898DC: /* 803898EC 0038684C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 803898F0 00386850 7C 08 03 A6 */ mtlr r0 /* 803898F4 00386854 38 21 00 20 */ addi r1, r1, 0x20 -/* 803898F8 00386858 4E 80 00 20 */ blr +/* 803898F8 00386858 4E 80 00 20 */ blr diff --git a/asm/Runtime/__init_cpp_exceptions.s b/asm/Runtime/__init_cpp_exceptions.s index 70c418c1..0641604a 100644 --- a/asm/Runtime/__init_cpp_exceptions.s +++ b/asm/Runtime/__init_cpp_exceptions.s @@ -5,7 +5,7 @@ .global GetR2__Fv GetR2__Fv: /* 8038A0E4 00387044 7C 43 13 78 */ mr r3, r2 -/* 8038A0E8 00387048 4E 80 00 20 */ blr +/* 8038A0E8 00387048 4E 80 00 20 */ blr .global __fini_cpp_exceptions __fini_cpp_exceptions: @@ -22,7 +22,7 @@ lbl_8038A110: /* 8038A110 00387070 80 01 00 14 */ lwz r0, 0x14(r1) /* 8038A114 00387074 7C 08 03 A6 */ mtlr r0 /* 8038A118 00387078 38 21 00 10 */ addi r1, r1, 0x10 -/* 8038A11C 0038707C 4E 80 00 20 */ blr +/* 8038A11C 0038707C 4E 80 00 20 */ blr .global __init_cpp_exceptions __init_cpp_exceptions: @@ -42,4 +42,4 @@ lbl_8038A150: /* 8038A150 003870B0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8038A154 003870B4 7C 08 03 A6 */ mtlr r0 /* 8038A158 003870B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8038A15C 003870BC 4E 80 00 20 */ blr +/* 8038A15C 003870BC 4E 80 00 20 */ blr diff --git a/asm/Runtime/__mem.s b/asm/Runtime/__mem.s index 906dcfc4..874b1afe 100644 --- a/asm/Runtime/__mem.s +++ b/asm/Runtime/__mem.s @@ -15,7 +15,7 @@ memset: /* 800033C8 000003C8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800033CC 000003CC 7C 08 03 A6 */ mtlr r0 /* 800033D0 000003D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800033D4 000003D4 4E 80 00 20 */ blr +/* 800033D4 000003D4 4E 80 00 20 */ blr .global __fill_mem __fill_mem: @@ -68,12 +68,12 @@ lbl_80003470: /* 80003474 00000474 54 A5 07 BE */ clrlwi r5, r5, 0x1e lbl_80003478: /* 80003478 00000478 28 05 00 00 */ cmplwi r5, 0 -/* 8000347C 0000047C 4D 82 00 20 */ beqlr +/* 8000347C 0000047C 4D 82 00 20 */ beqlr lbl_80003480: /* 80003480 00000480 34 A5 FF FF */ addic. r5, r5, -1 /* 80003484 00000484 9C E6 00 01 */ stbu r7, 1(r6) /* 80003488 00000488 40 82 FF F8 */ bne lbl_80003480 -/* 8000348C 0000048C 4E 80 00 20 */ blr +/* 8000348C 0000048C 4E 80 00 20 */ blr .global memcpy memcpy: @@ -89,7 +89,7 @@ lbl_800034A8: lbl_800034B0: /* 800034B0 000004B0 34 A5 FF FF */ addic. r5, r5, -1 /* 800034B4 000004B4 40 82 FF F4 */ bne lbl_800034A8 -/* 800034B8 000004B8 4E 80 00 20 */ blr +/* 800034B8 000004B8 4E 80 00 20 */ blr lbl_800034BC: /* 800034BC 000004BC 7C 84 2A 14 */ add r4, r4, r5 /* 800034C0 000004C0 7C C3 2A 14 */ add r6, r3, r5 @@ -101,4 +101,4 @@ lbl_800034CC: lbl_800034D4: /* 800034D4 000004D4 34 A5 FF FF */ addic. r5, r5, -1 /* 800034D8 000004D8 40 82 FF F4 */ bne lbl_800034CC -/* 800034DC 000004DC 4E 80 00 20 */ blr +/* 800034DC 000004DC 4E 80 00 20 */ blr diff --git a/asm/Runtime/__va_arg.s b/asm/Runtime/__va_arg.s index ec1d8616..e2247acb 100644 --- a/asm/Runtime/__va_arg.s +++ b/asm/Runtime/__va_arg.s @@ -59,4 +59,4 @@ lbl_80389630: /* 80389638 00386598 80 C6 00 00 */ lwz r6, 0(r6) lbl_8038963C: /* 8038963C 0038659C 7C C3 33 78 */ mr r3, r6 -/* 80389640 003865A0 4E 80 00 20 */ blr +/* 80389640 003865A0 4E 80 00 20 */ blr diff --git a/asm/Runtime/abort_exit.s b/asm/Runtime/abort_exit.s index 7fda6f54..f6d91d73 100644 --- a/asm/Runtime/abort_exit.s +++ b/asm/Runtime/abort_exit.s @@ -3,7 +3,7 @@ .section .bss lbl_80542198: .skip 0x100 - + .section .sbss .balign 4 .global lbl_805A99B8 @@ -18,7 +18,7 @@ lbl_805A99C0: .global lbl_805A99C4 lbl_805A99C4: .skip 0x4 - + .section .text, "ax" .global exit @@ -37,7 +37,7 @@ exit: /* 8038A1F4 00387154 48 00 00 10 */ b lbl_8038A204 lbl_8038A1F8: /* 8038A1F8 00387158 7D 89 03 A6 */ mtctr r12 -/* 8038A1FC 0038715C 4E 80 04 21 */ bctrl +/* 8038A1FC 0038715C 4E 80 04 21 */ bctrl /* 8038A200 00387160 3B FF 00 04 */ addi r31, r31, 4 lbl_8038A204: /* 8038A204 00387164 81 9F 00 00 */ lwz r12, 0(r31) @@ -47,7 +47,7 @@ lbl_8038A204: /* 8038A214 00387174 28 0C 00 00 */ cmplwi r12, 0 /* 8038A218 00387178 41 82 00 14 */ beq lbl_8038A22C /* 8038A21C 0038717C 7D 89 03 A6 */ mtctr r12 -/* 8038A220 00387180 4E 80 04 21 */ bctrl +/* 8038A220 00387180 4E 80 04 21 */ bctrl /* 8038A224 00387184 38 00 00 00 */ li r0, 0 /* 8038A228 00387188 90 0D AE 00 */ stw r0, lbl_805A99C0@sda21(r13) lbl_8038A22C: @@ -61,7 +61,7 @@ lbl_8038A238: /* 8038A244 003871A4 90 6D AD FC */ stw r3, lbl_805A99BC@sda21(r13) /* 8038A248 003871A8 7D 9F 00 2E */ lwzx r12, r31, r0 /* 8038A24C 003871AC 7D 89 03 A6 */ mtctr r12 -/* 8038A250 003871B0 4E 80 04 21 */ bctrl +/* 8038A250 003871B0 4E 80 04 21 */ bctrl lbl_8038A254: /* 8038A254 003871B4 80 0D AD FC */ lwz r0, lbl_805A99BC@sda21(r13) /* 8038A258 003871B8 2C 00 00 00 */ cmpwi r0, 0 @@ -70,7 +70,7 @@ lbl_8038A254: /* 8038A264 003871C4 28 0C 00 00 */ cmplwi r12, 0 /* 8038A268 003871C8 41 82 00 14 */ beq lbl_8038A27C /* 8038A26C 003871CC 7D 89 03 A6 */ mtctr r12 -/* 8038A270 003871D0 4E 80 04 21 */ bctrl +/* 8038A270 003871D0 4E 80 04 21 */ bctrl /* 8038A274 003871D4 38 00 00 00 */ li r0, 0 /* 8038A278 003871D8 90 0D AE 04 */ stw r0, lbl_805A99C4@sda21(r13) lbl_8038A27C: @@ -79,4 +79,4 @@ lbl_8038A27C: /* 8038A284 003871E4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8038A288 003871E8 7C 08 03 A6 */ mtlr r0 /* 8038A28C 003871EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8038A290 003871F0 4E 80 00 20 */ blr +/* 8038A290 003871F0 4E 80 00 20 */ blr diff --git a/asm/Runtime/alloc.s b/asm/Runtime/alloc.s index 2364d70b..51050739 100644 --- a/asm/Runtime/alloc.s +++ b/asm/Runtime/alloc.s @@ -3,11 +3,18 @@ .section .bss "protopool$192": .skip 0x338 - + .section .rodata .global lbl_803D85C0 lbl_803D85C0: - .incbin "baserom.dol", 0x3D55C0, 0x18 + # ROM: 0x3D55C0 + .4byte 0x00000004 + .4byte 0x0000000C + .4byte 0x00000014 + .4byte 0x00000024 + .4byte 0x00000034 + .4byte 0x00000044 + .section .sbss .balign 4 @@ -74,7 +81,7 @@ lbl_8038A33C: /* 8038A348 003872A8 83 C1 00 08 */ lwz r30, 8(r1) /* 8038A34C 003872AC 7C 08 03 A6 */ mtlr r0 /* 8038A350 003872B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8038A354 003872B4 4E 80 00 20 */ blr +/* 8038A354 003872B4 4E 80 00 20 */ blr .global sub_8038a358 sub_8038a358: @@ -163,7 +170,7 @@ lbl_8038A474: /* 8038A47C 003873DC 83 C1 00 08 */ lwz r30, 8(r1) /* 8038A480 003873E0 7C 08 03 A6 */ mtlr r0 /* 8038A484 003873E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8038A488 003873E8 4E 80 00 20 */ blr +/* 8038A488 003873E8 4E 80 00 20 */ blr .global sub_8038a48c sub_8038a48c: @@ -306,7 +313,7 @@ lbl_8038A670: /* 8038A678 003875D8 83 C1 00 08 */ lwz r30, 8(r1) /* 8038A67C 003875DC 7C 08 03 A6 */ mtlr r0 /* 8038A680 003875E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8038A684 003875E4 4E 80 00 20 */ blr +/* 8038A684 003875E4 4E 80 00 20 */ blr .global sub_8038a688 sub_8038a688: @@ -437,7 +444,7 @@ lbl_8038A838: /* 8038A83C 0038779C 80 01 00 34 */ lwz r0, 0x34(r1) /* 8038A840 003877A0 7C 08 03 A6 */ mtlr r0 /* 8038A844 003877A4 38 21 00 30 */ addi r1, r1, 0x30 -/* 8038A848 003877A8 4E 80 00 20 */ blr +/* 8038A848 003877A8 4E 80 00 20 */ blr .global sub_8038a84c sub_8038a84c: @@ -518,7 +525,7 @@ lbl_8038A95C: /* 8038A964 003878C4 90 09 00 04 */ stw r0, 4(r9) /* 8038A968 003878C8 90 E3 00 0C */ stw r7, 0xc(r3) /* 8038A96C 003878CC 90 03 00 10 */ stw r0, 0x10(r3) -/* 8038A970 003878D0 4E 80 00 20 */ blr +/* 8038A970 003878D0 4E 80 00 20 */ blr .global soft_allocate_from_var_pools soft_allocate_from_var_pools: @@ -581,7 +588,7 @@ lbl_8038AA2C: /* 8038AA3C 0038799C 83 81 00 10 */ lwz r28, 0x10(r1) /* 8038AA40 003879A0 7C 08 03 A6 */ mtlr r0 /* 8038AA44 003879A4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8038AA48 003879A8 4E 80 00 20 */ blr +/* 8038AA48 003879A8 4E 80 00 20 */ blr .global sub_8038aa4c sub_8038aa4c: @@ -745,7 +752,7 @@ lbl_8038AC74: /* 8038AC84 00387BE4 83 81 00 10 */ lwz r28, 0x10(r1) /* 8038AC88 00387BE8 7C 08 03 A6 */ mtlr r0 /* 8038AC8C 00387BEC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8038AC90 00387BF0 4E 80 00 20 */ blr +/* 8038AC90 00387BF0 4E 80 00 20 */ blr .global sub_8038ac94 sub_8038ac94: @@ -754,7 +761,7 @@ sub_8038ac94: /* 8038AC9C 00387BFC 7C A3 42 14 */ add r5, r3, r8 /* 8038ACA0 00387C00 80 E5 00 00 */ lwz r7, 0(r5) /* 8038ACA4 00387C04 54 E0 07 BD */ rlwinm. r0, r7, 0, 0x1e, 0x1e -/* 8038ACA8 00387C08 4C 82 00 20 */ bnelr +/* 8038ACA8 00387C08 4C 82 00 20 */ bnelr /* 8038ACAC 00387C0C 54 C0 07 7E */ clrlwi r0, r6, 0x1d /* 8038ACB0 00387C10 54 E6 00 38 */ rlwinm r6, r7, 0, 0, 0x1c /* 8038ACB4 00387C14 90 03 00 00 */ stw r0, 0(r3) @@ -800,7 +807,7 @@ lbl_8038AD34: /* 8038AD40 00387CA0 80 05 00 0C */ lwz r0, 0xc(r5) /* 8038AD44 00387CA4 80 65 00 08 */ lwz r3, 8(r5) /* 8038AD48 00387CA8 90 03 00 0C */ stw r0, 0xc(r3) -/* 8038AD4C 00387CAC 4E 80 00 20 */ blr +/* 8038AD4C 00387CAC 4E 80 00 20 */ blr .global sub_8038ad50 sub_8038ad50: @@ -906,7 +913,7 @@ lbl_8038AEB4: /* 8038AEBC 00387E1C 83 C1 00 08 */ lwz r30, 8(r1) /* 8038AEC0 00387E20 7C 08 03 A6 */ mtlr r0 /* 8038AEC4 00387E24 38 21 00 10 */ addi r1, r1, 0x10 -/* 8038AEC8 00387E28 4E 80 00 20 */ blr +/* 8038AEC8 00387E28 4E 80 00 20 */ blr .global sub_8038aecc sub_8038aecc: @@ -917,7 +924,7 @@ sub_8038aecc: /* 8038AEDC 00387E3C 28 05 00 00 */ cmplwi r5, 0 /* 8038AEE0 00387E40 40 82 00 0C */ bne lbl_8038AEEC /* 8038AEE4 00387E44 38 60 00 00 */ li r3, 0 -/* 8038AEE8 00387E48 4E 80 00 20 */ blr +/* 8038AEE8 00387E48 4E 80 00 20 */ blr lbl_8038AEEC: /* 8038AEEC 00387E4C 80 05 00 00 */ lwz r0, 0(r5) /* 8038AEF0 00387E50 7C A6 2B 78 */ mr r6, r5 @@ -936,7 +943,7 @@ lbl_8038AF18: /* 8038AF1C 00387E7C 40 82 00 10 */ bne lbl_8038AF2C /* 8038AF20 00387E80 90 E3 00 08 */ stw r7, 8(r3) /* 8038AF24 00387E84 38 60 00 00 */ li r3, 0 -/* 8038AF28 00387E88 4E 80 00 20 */ blr +/* 8038AF28 00387E88 4E 80 00 20 */ blr lbl_8038AF2C: /* 8038AF2C 00387E8C 7C 00 20 40 */ cmplw r0, r4 /* 8038AF30 00387E90 41 80 FF D0 */ blt lbl_8038AF00 @@ -1042,4 +1049,4 @@ lbl_8038B088: /* 8038B09C 00387FFC 90 03 00 0C */ stw r0, 0xc(r3) lbl_8038B0A0: /* 8038B0A0 00388000 7C C3 33 78 */ mr r3, r6 -/* 8038B0A4 00388004 4E 80 00 20 */ blr +/* 8038B0A4 00388004 4E 80 00 20 */ blr diff --git a/asm/Runtime/ansi_files.s b/asm/Runtime/ansi_files.s index cd2c86a5..8c2d93ab 100644 --- a/asm/Runtime/ansi_files.s +++ b/asm/Runtime/ansi_files.s @@ -34,7 +34,7 @@ lbl_8038B0F4: /* 8038B108 00388068 83 C1 00 08 */ lwz r30, 8(r1) /* 8038B10C 0038806C 7C 08 03 A6 */ mtlr r0 /* 8038B110 00388070 38 21 00 10 */ addi r1, r1, 0x10 -/* 8038B114 00388074 4E 80 00 20 */ blr +/* 8038B114 00388074 4E 80 00 20 */ blr .global __close_all __close_all: @@ -79,4 +79,4 @@ lbl_8038B194: /* 8038B1A0 00388100 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8038B1A4 00388104 7C 08 03 A6 */ mtlr r0 /* 8038B1A8 00388108 38 21 00 10 */ addi r1, r1, 0x10 -/* 8038B1AC 0038810C 4E 80 00 20 */ blr +/* 8038B1AC 0038810C 4E 80 00 20 */ blr diff --git a/asm/Runtime/ansi_fp.s b/asm/Runtime/ansi_fp.s index 02944270..efbb8f1d 100644 --- a/asm/Runtime/ansi_fp.s +++ b/asm/Runtime/ansi_fp.s @@ -3,8 +3,37 @@ .section .rodata .global lbl_803D85D8 lbl_803D85D8: - .incbin "baserom.dol", 0x3D55D8, 0xE8 - + # ROM: 0x3D55D8 + .asciz "179769313486231580793729011405303420" + .byte 0x35, 0x34, 0x32 + .asciz "101086242752217003726400434970855712890625" + .byte 0x31 + .asciz "1102230246251565404236316680908203125" + .byte 0x32, 0x33 + .asciz "283064365386962890625" + .byte 0x31, 0x35 + .asciz "2587890625" + .byte 0x33 + .asciz "90625" + .byte 0x37, 0x38 + .4byte 0x31323500 + .asciz "15625" + .byte 0x33, 0x31 + .4byte 0x32350036 + .4byte 0x32350031 + .4byte 0x32350032 + .4byte 0x35003500 + .4byte 0x31003200 + .4byte 0x34003800 + .4byte 0x31360033 + .4byte 0x32003634 + .4byte 0x00313238 + .4byte 0x00323536 + .4byte 0 + .4byte 0x2E000043 + .4byte 0 + + .section .text, "ax" .global __dec2num __dec2num: @@ -681,7 +710,7 @@ lbl_8038BAE4: /* 8038BAF4 00388A54 83 C1 01 D8 */ lwz r30, 0x1d8(r1) /* 8038BAF8 00388A58 7C 08 03 A6 */ mtlr r0 /* 8038BAFC 00388A5C 38 21 01 F0 */ addi r1, r1, 0x1f0 -/* 8038BB00 00388A60 4E 80 00 20 */ blr +/* 8038BB00 00388A60 4E 80 00 20 */ blr .global __num2dec __num2dec: @@ -806,7 +835,7 @@ lbl_8038BC90: /* 8038BC98 00388BF8 83 C1 00 08 */ lwz r30, 8(r1) /* 8038BC9C 00388BFC 7C 08 03 A6 */ mtlr r0 /* 8038BCA0 00388C00 38 21 00 10 */ addi r1, r1, 0x10 -/* 8038BCA4 00388C04 4E 80 00 20 */ blr +/* 8038BCA4 00388C04 4E 80 00 20 */ blr .global __num2dec_internal __num2dec_internal: @@ -975,7 +1004,7 @@ lbl_8038BEC4: /* 8038BED4 00388E34 83 A1 00 9C */ lwz r29, 0x9c(r1) /* 8038BED8 00388E38 7C 08 03 A6 */ mtlr r0 /* 8038BEDC 00388E3C 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 8038BEE0 00388E40 4E 80 00 20 */ blr +/* 8038BEE0 00388E40 4E 80 00 20 */ blr .global __minus_dec __minus_dec: @@ -1003,7 +1032,7 @@ __minus_dec: /* 8038BF38 00388E98 B0 03 00 28 */ sth r0, 0x28(r3) /* 8038BF3C 00388E9C 88 05 00 05 */ lbz r0, 5(r5) /* 8038BF40 00388EA0 28 00 00 00 */ cmplwi r0, 0 -/* 8038BF44 00388EA4 4D 82 00 20 */ beqlr +/* 8038BF44 00388EA4 4D 82 00 20 */ beqlr /* 8038BF48 00388EA8 88 83 00 04 */ lbz r4, 4(r3) /* 8038BF4C 00388EAC 88 05 00 04 */ lbz r0, 4(r5) /* 8038BF50 00388EB0 7C 88 23 78 */ mr r8, r4 @@ -1331,7 +1360,7 @@ lbl_8038C3D0: /* 8038C3D0 00389330 7C 84 28 50 */ subf r4, r4, r5 /* 8038C3D4 00389334 38 04 00 01 */ addi r0, r4, 1 /* 8038C3D8 00389338 98 03 00 04 */ stb r0, 4(r3) -/* 8038C3DC 0038933C 4E 80 00 20 */ blr +/* 8038C3DC 0038933C 4E 80 00 20 */ blr .global __less_dec __less_dec: @@ -1342,13 +1371,13 @@ __less_dec: /* 8038C3F0 00389350 7C 03 00 D0 */ neg r0, r3 /* 8038C3F4 00389354 7C 00 1B 78 */ or r0, r0, r3 /* 8038C3F8 00389358 54 03 0F FE */ srwi r3, r0, 0x1f -/* 8038C3FC 0038935C 4E 80 00 20 */ blr +/* 8038C3FC 0038935C 4E 80 00 20 */ blr lbl_8038C400: /* 8038C400 00389360 88 04 00 05 */ lbz r0, 5(r4) /* 8038C404 00389364 28 00 00 00 */ cmplwi r0, 0 /* 8038C408 00389368 40 82 00 0C */ bne lbl_8038C414 /* 8038C40C 0038936C 38 60 00 00 */ li r3, 0 -/* 8038C410 00389370 4E 80 00 20 */ blr +/* 8038C410 00389370 4E 80 00 20 */ blr lbl_8038C414: /* 8038C414 00389374 A8 03 00 02 */ lha r0, 2(r3) /* 8038C418 00389378 A8 A4 00 02 */ lha r5, 2(r4) @@ -1372,12 +1401,12 @@ lbl_8038C44C: /* 8038C458 003893B8 7C 06 00 40 */ cmplw r6, r0 /* 8038C45C 003893BC 40 80 00 0C */ bge lbl_8038C468 /* 8038C460 003893C0 38 60 00 01 */ li r3, 1 -/* 8038C464 003893C4 4E 80 00 20 */ blr +/* 8038C464 003893C4 4E 80 00 20 */ blr lbl_8038C468: /* 8038C468 003893C8 7C 00 30 40 */ cmplw r0, r6 /* 8038C46C 003893CC 40 80 00 0C */ bge lbl_8038C478 /* 8038C470 003893D0 38 60 00 00 */ li r3, 0 -/* 8038C474 003893D4 4E 80 00 20 */ blr +/* 8038C474 003893D4 4E 80 00 20 */ blr lbl_8038C478: /* 8038C478 003893D8 39 08 00 01 */ addi r8, r8, 1 /* 8038C47C 003893DC 42 00 FF D0 */ bdnz lbl_8038C44C @@ -1394,20 +1423,20 @@ lbl_8038C498: /* 8038C4A0 00389400 28 00 00 00 */ cmplwi r0, 0 /* 8038C4A4 00389404 41 82 00 0C */ beq lbl_8038C4B0 /* 8038C4A8 00389408 38 60 00 01 */ li r3, 1 -/* 8038C4AC 0038940C 4E 80 00 20 */ blr +/* 8038C4AC 0038940C 4E 80 00 20 */ blr lbl_8038C4B0: /* 8038C4B0 00389410 39 08 00 01 */ addi r8, r8, 1 /* 8038C4B4 00389414 42 00 FF E4 */ bdnz lbl_8038C498 lbl_8038C4B8: /* 8038C4B8 00389418 38 60 00 00 */ li r3, 0 -/* 8038C4BC 0038941C 4E 80 00 20 */ blr +/* 8038C4BC 0038941C 4E 80 00 20 */ blr lbl_8038C4C0: /* 8038C4C0 00389420 7C A0 02 78 */ xor r0, r5, r0 /* 8038C4C4 00389424 7C 03 0E 70 */ srawi r3, r0, 1 /* 8038C4C8 00389428 7C 00 28 38 */ and r0, r0, r5 /* 8038C4CC 0038942C 7C 00 18 50 */ subf r0, r0, r3 /* 8038C4D0 00389430 54 03 0F FE */ srwi r3, r0, 0x1f -/* 8038C4D4 00389434 4E 80 00 20 */ blr +/* 8038C4D4 00389434 4E 80 00 20 */ blr .global __equals_dec __equals_dec: @@ -1417,14 +1446,14 @@ __equals_dec: /* 8038C4E4 00389444 88 04 00 05 */ lbz r0, 5(r4) /* 8038C4E8 00389448 7C 00 00 34 */ cntlzw r0, r0 /* 8038C4EC 0038944C 54 03 D9 7E */ srwi r3, r0, 5 -/* 8038C4F0 00389450 4E 80 00 20 */ blr +/* 8038C4F0 00389450 4E 80 00 20 */ blr lbl_8038C4F4: /* 8038C4F4 00389454 88 04 00 05 */ lbz r0, 5(r4) /* 8038C4F8 00389458 28 00 00 00 */ cmplwi r0, 0 /* 8038C4FC 0038945C 40 82 00 10 */ bne lbl_8038C50C /* 8038C500 00389460 7C A0 00 34 */ cntlzw r0, r5 /* 8038C504 00389464 54 03 D9 7E */ srwi r3, r0, 5 -/* 8038C508 00389468 4E 80 00 20 */ blr +/* 8038C508 00389468 4E 80 00 20 */ blr lbl_8038C50C: /* 8038C50C 0038946C A8 A3 00 02 */ lha r5, 2(r3) /* 8038C510 00389470 A8 04 00 02 */ lha r0, 2(r4) @@ -1448,7 +1477,7 @@ lbl_8038C544: /* 8038C550 003894B0 7C 05 00 40 */ cmplw r5, r0 /* 8038C554 003894B4 41 82 00 0C */ beq lbl_8038C560 /* 8038C558 003894B8 38 60 00 00 */ li r3, 0 -/* 8038C55C 003894BC 4E 80 00 20 */ blr +/* 8038C55C 003894BC 4E 80 00 20 */ blr lbl_8038C560: /* 8038C560 003894C0 39 08 00 01 */ addi r8, r8, 1 /* 8038C564 003894C4 42 00 FF E0 */ bdnz lbl_8038C544 @@ -1465,7 +1494,7 @@ lbl_8038C580: /* 8038C588 003894E8 28 00 00 00 */ cmplwi r0, 0 /* 8038C58C 003894EC 41 82 00 0C */ beq lbl_8038C598 /* 8038C590 003894F0 38 60 00 00 */ li r3, 0 -/* 8038C594 003894F4 4E 80 00 20 */ blr +/* 8038C594 003894F4 4E 80 00 20 */ blr lbl_8038C598: /* 8038C598 003894F8 39 08 00 01 */ addi r8, r8, 1 /* 8038C59C 003894FC 42 00 FF E4 */ bdnz lbl_8038C580 @@ -1481,16 +1510,16 @@ lbl_8038C5B4: /* 8038C5BC 0038951C 28 00 00 00 */ cmplwi r0, 0 /* 8038C5C0 00389520 41 82 00 0C */ beq lbl_8038C5CC /* 8038C5C4 00389524 38 60 00 00 */ li r3, 0 -/* 8038C5C8 00389528 4E 80 00 20 */ blr +/* 8038C5C8 00389528 4E 80 00 20 */ blr lbl_8038C5CC: /* 8038C5CC 0038952C 39 08 00 01 */ addi r8, r8, 1 /* 8038C5D0 00389530 42 00 FF E4 */ bdnz lbl_8038C5B4 lbl_8038C5D4: /* 8038C5D4 00389534 38 60 00 01 */ li r3, 1 -/* 8038C5D8 00389538 4E 80 00 20 */ blr +/* 8038C5D8 00389538 4E 80 00 20 */ blr lbl_8038C5DC: /* 8038C5DC 0038953C 38 60 00 00 */ li r3, 0 -/* 8038C5E0 00389540 4E 80 00 20 */ blr +/* 8038C5E0 00389540 4E 80 00 20 */ blr .global __two_exp __two_exp: @@ -1511,7 +1540,7 @@ __two_exp: /* 8038C61C 0038957C 38 84 28 F8 */ addi r4, r4, lbl_803F28F8@l /* 8038C620 00389580 7C 04 00 2E */ lwzx r0, r4, r0 /* 8038C624 00389584 7C 09 03 A6 */ mtctr r0 -/* 8038C628 00389588 4E 80 04 20 */ bctr +/* 8038C628 00389588 4E 80 04 20 */ bctr /* 8038C62C 0038958C 3C 80 80 3E */ lis r4, lbl_803D85D8@ha /* 8038C630 00389590 38 A0 FF EC */ li r5, -20 /* 8038C634 00389594 38 84 85 D8 */ addi r4, r4, lbl_803D85D8@l @@ -1704,7 +1733,7 @@ lbl_8038C908: /* 8038C914 00389874 83 A1 00 C4 */ lwz r29, 0xc4(r1) /* 8038C918 00389878 7C 08 03 A6 */ mtlr r0 /* 8038C91C 0038987C 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 8038C920 00389880 4E 80 00 20 */ blr +/* 8038C920 00389880 4E 80 00 20 */ blr .global __str2dec __str2dec: @@ -1730,10 +1759,10 @@ lbl_8038C964: /* 8038C964 003898C4 98 C3 00 04 */ stb r6, 4(r3) /* 8038C968 003898C8 88 A4 00 00 */ lbz r5, 0(r4) /* 8038C96C 003898CC 7C A0 07 75 */ extsb. r0, r5 -/* 8038C970 003898D0 4D 82 00 20 */ beqlr +/* 8038C970 003898D0 4D 82 00 20 */ beqlr /* 8038C974 003898D4 7C A0 07 74 */ extsb r0, r5 /* 8038C978 003898D8 2C 00 00 05 */ cmpwi r0, 5 -/* 8038C97C 003898DC 4D 80 00 20 */ bltlr +/* 8038C97C 003898DC 4D 80 00 20 */ bltlr /* 8038C980 003898E0 38 A4 00 01 */ addi r5, r4, 1 /* 8038C984 003898E4 48 00 00 14 */ b lbl_8038C998 lbl_8038C988: @@ -1748,7 +1777,7 @@ lbl_8038C998: /* 8038C9A4 00389904 7C 83 32 14 */ add r4, r3, r6 /* 8038C9A8 00389908 88 04 00 04 */ lbz r0, 4(r4) /* 8038C9AC 0038990C 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 8038C9B0 00389910 4D 82 00 20 */ beqlr +/* 8038C9B0 00389910 4D 82 00 20 */ beqlr lbl_8038C9B4: /* 8038C9B4 00389914 88 83 00 04 */ lbz r4, 4(r3) /* 8038C9B8 00389918 38 C3 00 05 */ addi r6, r3, 5 @@ -1761,7 +1790,7 @@ lbl_8038C9C8: /* 8038C9D0 00389930 40 80 00 10 */ bge lbl_8038C9E0 /* 8038C9D4 00389934 38 04 00 01 */ addi r0, r4, 1 /* 8038C9D8 00389938 98 05 00 00 */ stb r0, 0(r5) -/* 8038C9DC 0038993C 4E 80 00 20 */ blr +/* 8038C9DC 0038993C 4E 80 00 20 */ blr lbl_8038C9E0: /* 8038C9E0 00389940 7C 05 30 40 */ cmplw r5, r6 /* 8038C9E4 00389944 40 82 00 1C */ bne lbl_8038CA00 @@ -1770,12 +1799,12 @@ lbl_8038C9E0: /* 8038C9F0 00389950 A8 83 00 02 */ lha r4, 2(r3) /* 8038C9F4 00389954 38 04 00 01 */ addi r0, r4, 1 /* 8038C9F8 00389958 B0 03 00 02 */ sth r0, 2(r3) -/* 8038C9FC 0038995C 4E 80 00 20 */ blr +/* 8038C9FC 0038995C 4E 80 00 20 */ blr lbl_8038CA00: /* 8038CA00 00389960 98 05 00 00 */ stb r0, 0(r5) /* 8038CA04 00389964 38 A5 FF FF */ addi r5, r5, -1 /* 8038CA08 00389968 4B FF FF C0 */ b lbl_8038C9C8 -/* 8038CA0C 0038996C 4E 80 00 20 */ blr +/* 8038CA0C 0038996C 4E 80 00 20 */ blr .global __timesdec __timesdec: @@ -1960,7 +1989,7 @@ lbl_8038CC88: /* 8038CC8C 00389BEC 83 C1 00 58 */ lwz r30, 0x58(r1) /* 8038CC90 00389BF0 83 A1 00 54 */ lwz r29, 0x54(r1) /* 8038CC94 00389BF4 38 21 00 60 */ addi r1, r1, 0x60 -/* 8038CC98 00389BF8 4E 80 00 20 */ blr +/* 8038CC98 00389BF8 4E 80 00 20 */ blr .global __ull2dec __ull2dec: @@ -2037,7 +2066,7 @@ lbl_8038CD8C: /* 8038CD9C 00389CFC 83 81 00 10 */ lwz r28, 0x10(r1) /* 8038CDA0 00389D00 7C 08 03 A6 */ mtlr r0 /* 8038CDA4 00389D04 38 21 00 20 */ addi r1, r1, 0x20 -/* 8038CDA8 00389D08 4E 80 00 20 */ blr +/* 8038CDA8 00389D08 4E 80 00 20 */ blr .global __count_trailing_zerol __count_trailing_zerol: @@ -2074,7 +2103,7 @@ lbl_8038CE0C: /* 8038CE10 00389D70 40 82 FF B8 */ bne lbl_8038CDC8 lbl_8038CE14: /* 8038CE14 00389D74 7C 83 23 78 */ mr r3, r4 -/* 8038CE18 00389D78 4E 80 00 20 */ blr +/* 8038CE18 00389D78 4E 80 00 20 */ blr .if 1 .global abs diff --git a/asm/Runtime/buffer_io.s b/asm/Runtime/buffer_io.s index 79222d6b..c475b593 100644 --- a/asm/Runtime/buffer_io.s +++ b/asm/Runtime/buffer_io.s @@ -22,7 +22,7 @@ __flush_buffer: /* 8038CE68 00389DC8 80 9F 00 1C */ lwz r4, 0x1c(r31) /* 8038CE6C 00389DCC 80 DF 00 48 */ lwz r6, 0x48(r31) /* 8038CE70 00389DD0 7D 89 03 A6 */ mtctr r12 -/* 8038CE74 00389DD4 4E 80 04 21 */ bctrl +/* 8038CE74 00389DD4 4E 80 04 21 */ bctrl /* 8038CE78 00389DD8 28 1E 00 00 */ cmplwi r30, 0 /* 8038CE7C 00389DDC 41 82 00 0C */ beq lbl_8038CE88 /* 8038CE80 00389DE0 80 1F 00 28 */ lwz r0, 0x28(r31) @@ -56,7 +56,7 @@ lbl_8038CED8: /* 8038CEE0 00389E40 83 C1 00 08 */ lwz r30, 8(r1) /* 8038CEE4 00389E44 7C 08 03 A6 */ mtlr r0 /* 8038CEE8 00389E48 38 21 00 10 */ addi r1, r1, 0x10 -/* 8038CEEC 00389E4C 4E 80 00 20 */ blr +/* 8038CEEC 00389E4C 4E 80 00 20 */ blr .global __prep_buffer __prep_buffer: @@ -72,4 +72,4 @@ __prep_buffer: /* 8038CF14 00389E74 90 03 00 28 */ stw r0, 0x28(r3) /* 8038CF18 00389E78 80 03 00 18 */ lwz r0, 0x18(r3) /* 8038CF1C 00389E7C 90 03 00 34 */ stw r0, 0x34(r3) -/* 8038CF20 00389E80 4E 80 00 20 */ blr +/* 8038CF20 00389E80 4E 80 00 20 */ blr diff --git a/asm/Runtime/ctype.s b/asm/Runtime/ctype.s index 40da7587..55bc826e 100644 --- a/asm/Runtime/ctype.s +++ b/asm/Runtime/ctype.s @@ -7,10 +7,10 @@ tolower: /* 8038CF24 00389E84 2C 03 FF FF */ cmpwi r3, -1 /* 8038CF28 00389E88 40 82 00 0C */ bne lbl_8038CF34 /* 8038CF2C 00389E8C 38 60 FF FF */ li r3, -1 -/* 8038CF30 00389E90 4E 80 00 20 */ blr +/* 8038CF30 00389E90 4E 80 00 20 */ blr lbl_8038CF34: /* 8038CF34 00389E94 3C 80 80 3F */ lis r4, lbl_803F2B20@ha /* 8038CF38 00389E98 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8038CF3C 00389E9C 38 64 2B 20 */ addi r3, r4, lbl_803F2B20@l /* 8038CF40 00389EA0 7C 63 00 AE */ lbzx r3, r3, r0 -/* 8038CF44 00389EA4 4E 80 00 20 */ blr +/* 8038CF44 00389EA4 4E 80 00 20 */ blr diff --git a/asm/Runtime/direct_io.s b/asm/Runtime/direct_io.s index 9dfcd7f6..923dba5e 100644 --- a/asm/Runtime/direct_io.s +++ b/asm/Runtime/direct_io.s @@ -220,7 +220,7 @@ lbl_8038D240: /* 8038D244 0038A1A4 80 01 00 34 */ lwz r0, 0x34(r1) /* 8038D248 0038A1A8 7C 08 03 A6 */ mtlr r0 /* 8038D24C 0038A1AC 38 21 00 30 */ addi r1, r1, 0x30 -/* 8038D250 0038A1B0 4E 80 00 20 */ blr +/* 8038D250 0038A1B0 4E 80 00 20 */ blr .global fwrite fwrite: @@ -231,4 +231,4 @@ fwrite: /* 8038D264 0038A1C4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8038D268 0038A1C8 7C 08 03 A6 */ mtlr r0 /* 8038D26C 0038A1CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8038D270 0038A1D0 4E 80 00 20 */ blr +/* 8038D270 0038A1D0 4E 80 00 20 */ blr diff --git a/asm/Runtime/e_acos.s b/asm/Runtime/e_acos.s index 58c325c3..b50fa6d3 100644 --- a/asm/Runtime/e_acos.s +++ b/asm/Runtime/e_acos.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text, "ax" +.section .text, "ax" .global __ieee754_acos __ieee754_acos: diff --git a/asm/Runtime/e_asin.s b/asm/Runtime/e_asin.s index 9002d12a..7fa8ff33 100644 --- a/asm/Runtime/e_asin.s +++ b/asm/Runtime/e_asin.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text, "ax" +.section .text, "ax" .global __ieee754_asin __ieee754_asin: @@ -169,4 +169,4 @@ lbl_80391930: /* 80391930 0038E890 FC 20 08 50 */ fneg f1, f1 lbl_80391934: /* 80391934 0038E894 38 21 00 20 */ addi r1, r1, 0x20 -/* 80391938 0038E898 4E 80 00 20 */ blr +/* 80391938 0038E898 4E 80 00 20 */ blr diff --git a/asm/Runtime/e_atan2.s b/asm/Runtime/e_atan2.s index f3d952f5..55051861 100644 --- a/asm/Runtime/e_atan2.s +++ b/asm/Runtime/e_atan2.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text, "ax" +.section .text, "ax" .global __ieee754_atan2 __ieee754_atan2: diff --git a/asm/Runtime/e_exp.s b/asm/Runtime/e_exp.s index 1165c474..25ae9daa 100644 --- a/asm/Runtime/e_exp.s +++ b/asm/Runtime/e_exp.s @@ -3,9 +3,22 @@ .section .rodata .global lbl_803D8720 lbl_803D8720: - .incbin "baserom.dol", 0x3D5720, 0x30 - -.section .text, "ax" + # ROM: 0x3D5720 + .4byte 0x3FE00000 + .4byte 0 + .4byte 0xBFE00000 + .4byte 0 + .4byte 0x3FE62E42 + .4byte 0xFEE00000 + .4byte 0xBFE62E42 + .4byte 0xFEE00000 + .4byte 0x3DEA39EF + .4byte 0x35793C76 + .4byte 0xBDEA39EF + .4byte 0x35793C76 + + +.section .text, "ax" .global __ieee754_exp __ieee754_exp: @@ -156,4 +169,4 @@ lbl_80391DC0: /* 80391DDC 0038ED3C FC 21 00 32 */ fmul f1, f1, f0 lbl_80391DE0: /* 80391DE0 0038ED40 38 21 00 30 */ addi r1, r1, 0x30 -/* 80391DE4 0038ED44 4E 80 00 20 */ blr +/* 80391DE4 0038ED44 4E 80 00 20 */ blr diff --git a/asm/Runtime/e_fmod.s b/asm/Runtime/e_fmod.s index 3b658d3d..865acb4c 100644 --- a/asm/Runtime/e_fmod.s +++ b/asm/Runtime/e_fmod.s @@ -3,9 +3,14 @@ .section .rodata .global lbl_803D8750 lbl_803D8750: - .incbin "baserom.dol", 0x3D5750, 0x10 - -.section .text, "ax" + # ROM: 0x3D5750 + .4byte 0 + .4byte 0 + .4byte 0x80000000 + .4byte 0 + + +.section .text, "ax" .global __ieee754_fmod __ieee754_fmod: @@ -257,4 +262,4 @@ lbl_80392118: /* 80392118 0038F078 C8 21 00 08 */ lfd f1, 8(r1) lbl_8039211C: /* 8039211C 0038F07C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80392120 0038F080 4E 80 00 20 */ blr +/* 80392120 0038F080 4E 80 00 20 */ blr diff --git a/asm/Runtime/e_log.s b/asm/Runtime/e_log.s index 261e1904..18359b0b 100644 --- a/asm/Runtime/e_log.s +++ b/asm/Runtime/e_log.s @@ -5,8 +5,8 @@ .global lbl_805A99E0 lbl_805A99E0: .skip 0x8 - -.section .text, "ax" + +.section .text, "ax" .global __ieee754_log __ieee754_log: @@ -180,4 +180,4 @@ lbl_8039237C: /* 80392394 0038F2F4 FC 24 01 78 */ fmsub f1, f4, f5, f0 lbl_80392398: /* 80392398 0038F2F8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8039239C 0038F2FC 4E 80 00 20 */ blr +/* 8039239C 0038F2FC 4E 80 00 20 */ blr diff --git a/asm/Runtime/e_pow.s b/asm/Runtime/e_pow.s index 7c1bc5c8..4b68120a 100644 --- a/asm/Runtime/e_pow.s +++ b/asm/Runtime/e_pow.s @@ -3,9 +3,22 @@ .section .rodata .global lbl_803D8760 lbl_803D8760: - .incbin "baserom.dol", 0x3D5760, 0x30 + # ROM: 0x3D5760 + .4byte 0x3FF00000 + .4byte 0 + .4byte 0x3FF80000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3FE2B803 + .4byte 0x40000000 + .4byte 0 + .4byte 0 + .4byte 0x3E4CFDEB + .4byte 0x43CFD006 -.section .text, "ax" + +.section .text, "ax" .global __ieee754_pow __ieee754_pow: @@ -604,4 +617,4 @@ lbl_80392C04: /* 80392C1C 0038FB7C CB A1 00 60 */ lfd f29, 0x60(r1) /* 80392C20 0038FB80 7C 08 03 A6 */ mtlr r0 /* 80392C24 0038FB84 38 21 00 90 */ addi r1, r1, 0x90 -/* 80392C28 0038FB88 4E 80 00 20 */ blr +/* 80392C28 0038FB88 4E 80 00 20 */ blr diff --git a/asm/Runtime/e_rem_pio2.s b/asm/Runtime/e_rem_pio2.s index 8f33461f..4f619f2f 100644 --- a/asm/Runtime/e_rem_pio2.s +++ b/asm/Runtime/e_rem_pio2.s @@ -3,13 +3,113 @@ .section .rodata .global lbl_803D8790 lbl_803D8790: - .incbin "baserom.dol", 0x3D5790, 0x108 + # ROM: 0x3D5790 + .4byte 0x00A2F983 + .4byte 0x006E4E44 + .4byte 0x001529FC + .4byte 0x002757D1 + .4byte 0x00F534DD + .4byte 0x00C0DB62 + .4byte 0x0095993C + .4byte 0x00439041 + .4byte 0x00FE5163 + .4byte 0x00ABDEBB + .4byte 0x00C561B7 + .4byte 0x00246E3A + .4byte 0x00424DD2 + .4byte 0x00E00649 + .4byte 0x002EEA09 + .4byte 0x00D1921C + .4byte 0x00FE1DEB + .4byte 0x001CB129 + .4byte 0x00A73EE8 + .4byte 0x008235F5 + .4byte 0x002EBB44 + .4byte 0x0084E99C + .4byte 0x007026B4 + .4byte 0x005F7E41 + .4byte 0x003991D6 + .4byte 0x00398353 + .4byte 0x0039F49C + .4byte 0x00845F8B + .4byte 0x00BDF928 + .4byte 0x003B1FF8 + .4byte 0x0097FFDE + .4byte 0x0005980F + .4byte 0x00EF2F11 + .4byte 0x008B5A0A + .4byte 0x006D1F6D + .4byte 0x00367ECF + .4byte 0x0027CB09 + .4byte 0x00B74F46 + .4byte 0x003F669E + .4byte 0x005FEA2D + .4byte 0x007527BA + .4byte 0x00C7EBE5 + .4byte 0x00F17B3D + .4byte 0x000739F7 + .4byte 0x008A5292 + .4byte 0x00EA6BFB + .4byte 0x005FB11F + .4byte 0x008D5D08 + .4byte 0x00560330 + .4byte 0x0046FC7B + .4byte 0x006BABF0 + .4byte 0x00CFBC20 + .4byte 0x009AF436 + .4byte 0x001DA9E3 + .4byte 0x0091615E + .4byte 0x00E61B08 + .4byte 0x00659985 + .4byte 0x005F14A0 + .4byte 0x0068408D + .4byte 0x00FFD880 + .4byte 0x004D7327 + .4byte 0x00310606 + .4byte 0x001556CA + .4byte 0x0073A8C9 + .4byte 0x0060E27B + .4byte 0x00C08C6B + .global lbl_803D8898 lbl_803D8898: - .incbin "baserom.dol", 0x3D5898, 0x80 + # ROM: 0x3D5898 + .4byte 0x3FF921FB + .4byte 0x400921FB + .4byte 0x4012D97C + .4byte 0x401921FB + .4byte 0x401F6A7A + .4byte 0x4022D97C + .4byte 0x4025FDBB + .4byte 0x402921FB + .4byte 0x402C463A + .4byte 0x402F6A7A + .4byte 0x4031475C + .4byte 0x4032D97C + .4byte 0x40346B9C + .4byte 0x4035FDBB + .4byte 0x40378FDB + .4byte 0x403921FB + .4byte 0x403AB41B + .4byte 0x403C463A + .4byte 0x403DD85A + .4byte 0x403F6A7A + .4byte 0x40407E4C + .4byte 0x4041475C + .4byte 0x4042106C + .4byte 0x4042D97C + .4byte 0x4043A28C + .4byte 0x40446B9C + .4byte 0x404534AC + .4byte 0x4045FDBB + .4byte 0x4046C6CB + .4byte 0x40478FDB + .4byte 0x404858EB + .4byte 0x404921FB -.section .text, "ax" + +.section .text, "ax" .global __ieee754_rem_pio2 __ieee754_rem_pio2: @@ -258,4 +358,4 @@ lbl_80392FB4: /* 80392FBC 0038FF1C 83 C1 00 58 */ lwz r30, 0x58(r1) /* 80392FC0 0038FF20 7C 08 03 A6 */ mtlr r0 /* 80392FC4 0038FF24 38 21 00 60 */ addi r1, r1, 0x60 -/* 80392FC8 0038FF28 4E 80 00 20 */ blr +/* 80392FC8 0038FF28 4E 80 00 20 */ blr diff --git a/asm/Runtime/file_io.s b/asm/Runtime/file_io.s index b8a9433a..d3c7e744 100644 --- a/asm/Runtime/file_io.s +++ b/asm/Runtime/file_io.s @@ -92,7 +92,7 @@ lbl_8038D394: /* 8038D39C 0038A2FC 83 C1 00 08 */ lwz r30, 8(r1) /* 8038D3A0 0038A300 7C 08 03 A6 */ mtlr r0 /* 8038D3A4 0038A304 38 21 00 10 */ addi r1, r1, 0x10 -/* 8038D3A8 0038A308 4E 80 00 20 */ blr +/* 8038D3A8 0038A308 4E 80 00 20 */ blr .global fclose fclose: @@ -118,7 +118,7 @@ lbl_8038D3E8: /* 8038D3F0 0038A350 7C 7E 1B 78 */ mr r30, r3 /* 8038D3F4 0038A354 80 7D 00 00 */ lwz r3, 0(r29) /* 8038D3F8 0038A358 7D 89 03 A6 */ mtctr r12 -/* 8038D3FC 0038A35C 4E 80 04 21 */ bctrl +/* 8038D3FC 0038A35C 4E 80 04 21 */ bctrl /* 8038D400 0038A360 A0 1D 00 04 */ lhz r0, 4(r29) /* 8038D404 0038A364 38 80 00 00 */ li r4, 0 /* 8038D408 0038A368 50 80 35 F2 */ rlwimi r0, r4, 6, 0x17, 0x19 @@ -149,4 +149,4 @@ lbl_8038D450: /* 8038D45C 0038A3BC 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8038D460 0038A3C0 7C 08 03 A6 */ mtlr r0 /* 8038D464 0038A3C4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8038D468 0038A3C8 4E 80 00 20 */ blr +/* 8038D468 0038A3C8 4E 80 00 20 */ blr diff --git a/asm/Runtime/global_destructor_chain.s b/asm/Runtime/global_destructor_chain.s index 129e4aaa..79f05329 100644 --- a/asm/Runtime/global_destructor_chain.s +++ b/asm/Runtime/global_destructor_chain.s @@ -5,7 +5,7 @@ .global lbl_805A99B0 lbl_805A99B0: .skip 0x8 - + .section .text, "ax" .global __destroy_global_chain @@ -21,7 +21,7 @@ lbl_80389654: /* 80389660 003865C0 81 83 00 04 */ lwz r12, 4(r3) /* 80389664 003865C4 80 63 00 08 */ lwz r3, 8(r3) /* 80389668 003865C8 7D 89 03 A6 */ mtctr r12 -/* 8038966C 003865CC 4E 80 04 21 */ bctrl +/* 8038966C 003865CC 4E 80 04 21 */ bctrl lbl_80389670: /* 80389670 003865D0 80 6D AD F0 */ lwz r3, lbl_805A99B0@sda21(r13) /* 80389674 003865D4 28 03 00 00 */ cmplwi r3, 0 @@ -29,7 +29,7 @@ lbl_80389670: /* 8038967C 003865DC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80389680 003865E0 7C 08 03 A6 */ mtlr r0 /* 80389684 003865E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80389688 003865E8 4E 80 00 20 */ blr +/* 80389688 003865E8 4E 80 00 20 */ blr .global __register_global_object __register_global_object: @@ -38,4 +38,4 @@ __register_global_object: /* 80389694 003865F4 90 85 00 04 */ stw r4, 4(r5) /* 80389698 003865F8 90 65 00 08 */ stw r3, 8(r5) /* 8038969C 003865FC 90 AD AD F0 */ stw r5, lbl_805A99B0@sda21(r13) -/* 803896A0 00386600 4E 80 00 20 */ blr +/* 803896A0 00386600 4E 80 00 20 */ blr diff --git a/asm/Runtime/k_cos.s b/asm/Runtime/k_cos.s index a6ee9aae..2e5300ed 100644 --- a/asm/Runtime/k_cos.s +++ b/asm/Runtime/k_cos.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text, "ax" +.section .text, "ax" .global __kernel_cos __kernel_cos: @@ -69,4 +69,4 @@ lbl_80393090: /* 803930B4 00390014 FC 22 00 28 */ fsub f1, f2, f0 lbl_803930B8: /* 803930B8 00390018 38 21 00 20 */ addi r1, r1, 0x20 -/* 803930BC 0039001C 4E 80 00 20 */ blr +/* 803930BC 0039001C 4E 80 00 20 */ blr diff --git a/asm/Runtime/k_rem_pio2.s b/asm/Runtime/k_rem_pio2.s index 356439dc..c558cf3e 100644 --- a/asm/Runtime/k_rem_pio2.s +++ b/asm/Runtime/k_rem_pio2.s @@ -3,12 +3,34 @@ .section .rodata .global lbl_803D8918 lbl_803D8918: - .incbin "baserom.dol", 0x3D5918, 0x10 + # ROM: 0x3D5918 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000006 + .global lbl_803D8928 lbl_803D8928: - .incbin "baserom.dol", 0x3D5928, 0x40 - -.section .text, "ax" + # ROM: 0x3D5928 + .4byte 0x3FF921FB + .4byte 0x40000000 + .asciz ">tD-" + .balign 4 + .4byte 0x3CF84698 + .4byte 0x80000000 + .4byte 0x3B78CC51 + .4byte 0x60000000 + .4byte 0x39F01B83 + .4byte 0x80000000 + .asciz "8z% @" + .balign 4 + .4byte 0x36E38222 + .4byte 0x80000000 + .4byte 0x3569F31D + .4byte 0 + + +.section .text, "ax" .global __kernel_rem_pio2 __kernel_rem_pio2: @@ -1017,4 +1039,4 @@ lbl_80393EF4: /* 80393F04 00390E64 80 01 02 D4 */ lwz r0, 0x2d4(r1) /* 80393F08 00390E68 7C 08 03 A6 */ mtlr r0 /* 80393F0C 00390E6C 38 21 02 D0 */ addi r1, r1, 0x2d0 -/* 80393F10 00390E70 4E 80 00 20 */ blr +/* 80393F10 00390E70 4E 80 00 20 */ blr diff --git a/asm/Runtime/k_sin.s b/asm/Runtime/k_sin.s index 83a00700..488d9420 100644 --- a/asm/Runtime/k_sin.s +++ b/asm/Runtime/k_sin.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text, "ax" +.section .text, "ax" .global __kernel_sin __kernel_sin: @@ -46,4 +46,4 @@ lbl_80393F90: /* 80393FA8 00390F08 FC 26 00 28 */ fsub f1, f6, f0 lbl_80393FAC: /* 80393FAC 00390F0C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80393FB0 00390F10 4E 80 00 20 */ blr +/* 80393FB0 00390F10 4E 80 00 20 */ blr diff --git a/asm/Runtime/k_tan.s b/asm/Runtime/k_tan.s index e49b0269..fe28edff 100644 --- a/asm/Runtime/k_tan.s +++ b/asm/Runtime/k_tan.s @@ -3,9 +3,36 @@ .section .rodata .global lbl_803D8968 lbl_803D8968: - .incbin "baserom.dol", 0x3D5968, 0x68 - -.section .text, "ax" + # ROM: 0x3D5968 + .4byte 0x3FD55555 + .4byte 0x55555563 + .4byte 0x3FC11111 + .4byte 0x1110FE7A + .4byte 0x3FABA1BA + .4byte 0x1BB341FE + .4byte 0x3F9664F4 + .4byte 0x8406D637 + .4byte 0x3F8226E3 + .4byte 0xE96E8493 + .4byte 0x3F6D6D22 + .4byte 0xC9560328 + .4byte 0x3F57DBC8 + .4byte 0xFEE08315 + .4byte 0x3F4344D8 + .4byte 0xF2F26501 + .4byte 0x3F3026F7 + .4byte 0x1A8D1068 + .4byte 0x3F147E88 + .4byte 0xA03792A6 + .4byte 0x3F12B80F + .4byte 0x32F0A7E9 + .4byte 0xBEF375CB + .4byte 0xDB605373 + .4byte 0x3EFB2A70 + .4byte 0x74BF7AD4 + + +.section .text, "ax" .global __kernel_tan __kernel_tan: diff --git a/asm/Runtime/mbstring.s b/asm/Runtime/mbstring.s index a08c251c..f917fe0d 100644 --- a/asm/Runtime/mbstring.s +++ b/asm/Runtime/mbstring.s @@ -50,7 +50,7 @@ lbl_8038D7C4: /* 8038D7C8 0038A728 80 01 00 34 */ lwz r0, 0x34(r1) /* 8038D7CC 0038A72C 7C 08 03 A6 */ mtlr r0 /* 8038D7D0 0038A730 38 21 00 30 */ addi r1, r1, 0x30 -/* 8038D7D4 0038A734 4E 80 00 20 */ blr +/* 8038D7D4 0038A734 4E 80 00 20 */ blr .global unicode_to_UTF8 unicode_to_UTF8: @@ -103,4 +103,4 @@ lbl_8038D870: /* 8038D870 0038A7D0 7C A3 2B 78 */ mr r3, r5 lbl_8038D874: /* 8038D874 0038A7D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8038D878 0038A7D8 4E 80 00 20 */ blr +/* 8038D878 0038A7D8 4E 80 00 20 */ blr diff --git a/asm/Runtime/mem.s b/asm/Runtime/mem.s index 54e8aaca..58e7d0be 100644 --- a/asm/Runtime/mem.s +++ b/asm/Runtime/mem.s @@ -17,14 +17,14 @@ lbl_8038D88C: /* 8038D8A0 0038A800 38 60 00 01 */ li r3, 1 /* 8038D8A4 0038A804 88 07 00 00 */ lbz r0, 0(r7) /* 8038D8A8 0038A808 7C 04 00 40 */ cmplw r4, r0 -/* 8038D8AC 0038A80C 4C 80 00 20 */ bgelr +/* 8038D8AC 0038A80C 4C 80 00 20 */ bgelr /* 8038D8B0 0038A810 38 60 FF FF */ li r3, -1 -/* 8038D8B4 0038A814 4E 80 00 20 */ blr +/* 8038D8B4 0038A814 4E 80 00 20 */ blr lbl_8038D8B8: /* 8038D8B8 0038A818 34 84 FF FF */ addic. r4, r4, -1 /* 8038D8BC 0038A81C 40 82 FF D0 */ bne lbl_8038D88C /* 8038D8C0 0038A820 38 60 00 00 */ li r3, 0 -/* 8038D8C4 0038A824 4E 80 00 20 */ blr +/* 8038D8C4 0038A824 4E 80 00 20 */ blr .global __memrchr __memrchr: @@ -35,12 +35,12 @@ __memrchr: lbl_8038D8D8: /* 8038D8D8 0038A838 8C 03 FF FF */ lbzu r0, -1(r3) /* 8038D8DC 0038A83C 7C 00 20 40 */ cmplw r0, r4 -/* 8038D8E0 0038A840 4D 82 00 20 */ beqlr +/* 8038D8E0 0038A840 4D 82 00 20 */ beqlr lbl_8038D8E4: /* 8038D8E4 0038A844 34 A5 FF FF */ addic. r5, r5, -1 /* 8038D8E8 0038A848 40 82 FF F0 */ bne lbl_8038D8D8 /* 8038D8EC 0038A84C 38 60 00 00 */ li r3, 0 -/* 8038D8F0 0038A850 4E 80 00 20 */ blr +/* 8038D8F0 0038A850 4E 80 00 20 */ blr .global memchr memchr: @@ -51,12 +51,12 @@ memchr: lbl_8038D904: /* 8038D904 0038A864 8C 03 00 01 */ lbzu r0, 1(r3) /* 8038D908 0038A868 7C 00 20 40 */ cmplw r0, r4 -/* 8038D90C 0038A86C 4D 82 00 20 */ beqlr +/* 8038D90C 0038A86C 4D 82 00 20 */ beqlr lbl_8038D910: /* 8038D910 0038A870 34 A5 FF FF */ addic. r5, r5, -1 /* 8038D914 0038A874 40 82 FF F0 */ bne lbl_8038D904 /* 8038D918 0038A878 38 60 00 00 */ li r3, 0 -/* 8038D91C 0038A87C 4E 80 00 20 */ blr +/* 8038D91C 0038A87C 4E 80 00 20 */ blr .global memmove memmove: @@ -122,4 +122,4 @@ lbl_8038D9D8: /* 8038D9DC 0038A93C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8038D9E0 0038A940 7C 08 03 A6 */ mtlr r0 /* 8038D9E4 0038A944 38 21 00 10 */ addi r1, r1, 0x10 -/* 8038D9E8 0038A948 4E 80 00 20 */ blr +/* 8038D9E8 0038A948 4E 80 00 20 */ blr diff --git a/asm/Runtime/mem_funcs.s b/asm/Runtime/mem_funcs.s index c6c37ef6..df525972 100644 --- a/asm/Runtime/mem_funcs.s +++ b/asm/Runtime/mem_funcs.s @@ -45,14 +45,14 @@ lbl_8038DA2C: lbl_8038DA78: /* 8038DA78 0038A9D8 38 00 00 03 */ li r0, 3 /* 8038DA7C 0038A9DC 7C A5 00 39 */ and. r5, r5, r0 -/* 8038DA80 0038A9E0 4D 82 00 20 */ beqlr +/* 8038DA80 0038A9E0 4D 82 00 20 */ beqlr /* 8038DA84 0038A9E4 7D 4A 3A 14 */ add r10, r10, r7 lbl_8038DA88: /* 8038DA88 0038A9E8 8C 0A FF FF */ lbzu r0, -1(r10) /* 8038DA8C 0038A9EC 34 A5 FF FF */ addic. r5, r5, -1 /* 8038DA90 0038A9F0 9C 0B FF FF */ stbu r0, -1(r11) /* 8038DA94 0038A9F4 40 82 FF F4 */ bne lbl_8038DA88 -/* 8038DA98 0038A9F8 4E 80 00 20 */ blr +/* 8038DA98 0038A9F8 4E 80 00 20 */ blr .global __copy_longs_unaligned __copy_longs_unaligned: @@ -101,7 +101,7 @@ lbl_8038DB30: /* 8038DB34 0038AA94 38 88 00 03 */ addi r4, r8, 3 /* 8038DB38 0038AA98 7C A5 00 39 */ and. r5, r5, r0 /* 8038DB3C 0038AA9C 38 66 00 03 */ addi r3, r6, 3 -/* 8038DB40 0038AAA0 4D 82 00 20 */ beqlr +/* 8038DB40 0038AAA0 4D 82 00 20 */ beqlr /* 8038DB44 0038AAA4 20 09 00 04 */ subfic r0, r9, 4 /* 8038DB48 0038AAA8 7C 80 20 50 */ subf r4, r0, r4 lbl_8038DB4C: @@ -109,7 +109,7 @@ lbl_8038DB4C: /* 8038DB50 0038AAB0 34 A5 FF FF */ addic. r5, r5, -1 /* 8038DB54 0038AAB4 9C 03 00 01 */ stbu r0, 1(r3) /* 8038DB58 0038AAB8 40 82 FF F4 */ bne lbl_8038DB4C -/* 8038DB5C 0038AABC 4E 80 00 20 */ blr +/* 8038DB5C 0038AABC 4E 80 00 20 */ blr .global __copy_longs_rev_aligned __copy_longs_rev_aligned: @@ -156,13 +156,13 @@ lbl_8038DBDC: lbl_8038DBEC: /* 8038DBEC 0038AB4C 38 00 00 03 */ li r0, 3 /* 8038DBF0 0038AB50 7C A5 00 39 */ and. r5, r5, r0 -/* 8038DBF4 0038AB54 4D 82 00 20 */ beqlr +/* 8038DBF4 0038AB54 4D 82 00 20 */ beqlr lbl_8038DBF8: /* 8038DBF8 0038AB58 8C 04 FF FF */ lbzu r0, -1(r4) /* 8038DBFC 0038AB5C 34 A5 FF FF */ addic. r5, r5, -1 /* 8038DC00 0038AB60 9C 06 FF FF */ stbu r0, -1(r6) /* 8038DC04 0038AB64 40 82 FF F4 */ bne lbl_8038DBF8 -/* 8038DC08 0038AB68 4E 80 00 20 */ blr +/* 8038DC08 0038AB68 4E 80 00 20 */ blr .global __copy_longs_aligned __copy_longs_aligned: @@ -214,10 +214,10 @@ lbl_8038DCA4: /* 8038DCA8 0038AC08 38 86 00 03 */ addi r4, r6, 3 /* 8038DCAC 0038AC0C 7C A5 00 39 */ and. r5, r5, r0 /* 8038DCB0 0038AC10 38 63 00 03 */ addi r3, r3, 3 -/* 8038DCB4 0038AC14 4D 82 00 20 */ beqlr +/* 8038DCB4 0038AC14 4D 82 00 20 */ beqlr lbl_8038DCB8: /* 8038DCB8 0038AC18 8C 04 00 01 */ lbzu r0, 1(r4) /* 8038DCBC 0038AC1C 34 A5 FF FF */ addic. r5, r5, -1 /* 8038DCC0 0038AC20 9C 03 00 01 */ stbu r0, 1(r3) /* 8038DCC4 0038AC24 40 82 FF F4 */ bne lbl_8038DCB8 -/* 8038DCC8 0038AC28 4E 80 00 20 */ blr +/* 8038DCC8 0038AC28 4E 80 00 20 */ blr diff --git a/asm/Runtime/misc_io.s b/asm/Runtime/misc_io.s index e0197ab1..f68e8132 100644 --- a/asm/Runtime/misc_io.s +++ b/asm/Runtime/misc_io.s @@ -8,5 +8,5 @@ __stdio_atexit: /* 8038DCCC 0038AC2C 3C 60 80 39 */ lis r3, __close_all@ha /* 8038DCD0 0038AC30 38 03 B1 18 */ addi r0, r3, __close_all@l /* 8038DCD4 0038AC34 90 0D AE 00 */ stw r0, lbl_805A99C0@sda21(r13) -/* 8038DCD8 0038AC38 4E 80 00 20 */ blr +/* 8038DCD8 0038AC38 4E 80 00 20 */ blr .endif diff --git a/asm/Runtime/printf.s b/asm/Runtime/printf.s index 4a340f9c..d5a55bfc 100644 --- a/asm/Runtime/printf.s +++ b/asm/Runtime/printf.s @@ -3,55 +3,593 @@ .section .rodata .global lbl_803D86C0 lbl_803D86C0: - .incbin "baserom.dol", 0x3D56C0, 0x28 - + # ROM: 0x3D56C0 + .4byte 0x002D494E + .4byte 0x46002D69 + .4byte 0x6E660049 + .4byte 0x4E460069 + .4byte 0x6E66002D + .4byte 0x4E414E00 + .asciz "-nan" + .byte 0x4E, 0x41, 0x4E + .4byte 0x006E616E + .4byte 0 + + .section .data, "wa" # TODO: Move these where they actually belong .global lbl_803F2778 lbl_803F2778: - .incbin "baserom.dol", 0x3EF778, 0x140 + # ROM: 0x3EF778 + .4byte 0 + .4byte 0x0A800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x805424D0 + .4byte 0x00000100 + .4byte 0x805424D0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80003648 ;# ptr + .4byte 0x8039127C + .4byte 0x80391274 + .4byte 0 + .4byte 0x803F27C8 + .4byte 0x00000001 + .4byte 0x12800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x805423D0 + .4byte 0x00000100 + .4byte 0x805423D0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80003648 ;# ptr + .4byte 0x8039127C + .4byte 0x80391274 + .4byte 0 + .4byte 0x803F2818 + .4byte 0x00000002 + .4byte 0x10800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x805422D0 + .4byte 0x00000100 + .4byte 0x805422D0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x80003648 ;# ptr + .4byte 0x8039127C + .4byte 0x80391274 + .4byte 0 + .4byte 0x803F2868 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .global lbl_803F28B8 lbl_803F28B8: - .incbin "baserom.dol", 0x3EF8B8, 0x40 + # ROM: 0x3EF8B8 + .4byte 0x40240000 + .4byte 0 + .4byte 0x40590000 + .4byte 0 + .4byte 0x408F4000 + .4byte 0 + .4byte 0x40C38800 + .4byte 0 + .4byte 0x40F86A00 + .4byte 0 + .4byte 0x412E8480 + .4byte 0 + .4byte 0x416312D0 + .4byte 0 + .4byte 0x4197D784 + .4byte 0 + .global lbl_803F28F8 lbl_803F28F8: - .incbin "baserom.dol", 0x3EF8F8, 0x128 + # ROM: 0x3EF8F8 + .4byte 0x8038C62C + .4byte 0x8038C824 + .4byte 0x8038C824 + .4byte 0x8038C824 + .4byte 0x8038C824 + .4byte 0x8038C824 + .4byte 0x8038C824 + .4byte 0x8038C824 + .4byte 0x8038C824 + .4byte 0x8038C824 + .4byte 0x8038C824 + .4byte 0x8038C644 + .4byte 0x8038C824 + .4byte 0x8038C824 + .4byte 0x8038C824 + .4byte 0x8038C824 + .4byte 0x8038C824 + .4byte 0x8038C824 + .4byte 0x8038C824 + .4byte 0x8038C824 + .4byte 0x8038C824 + .4byte 0x8038C824 + .4byte 0x8038C824 + .4byte 0x8038C824 + .4byte 0x8038C824 + .4byte 0x8038C824 + .4byte 0x8038C824 + .4byte 0x8038C824 + .4byte 0x8038C824 + .4byte 0x8038C824 + .4byte 0x8038C824 + .4byte 0x8038C824 + .4byte 0x8038C65C + .4byte 0x8038C824 + .4byte 0x8038C824 + .4byte 0x8038C824 + .4byte 0x8038C824 + .4byte 0x8038C824 + .4byte 0x8038C824 + .4byte 0x8038C824 + .4byte 0x8038C824 + .4byte 0x8038C824 + .4byte 0x8038C824 + .4byte 0x8038C824 + .4byte 0x8038C824 + .4byte 0x8038C824 + .4byte 0x8038C824 + .4byte 0x8038C824 + .4byte 0x8038C674 + .4byte 0x8038C824 + .4byte 0x8038C824 + .4byte 0x8038C824 + .4byte 0x8038C824 + .4byte 0x8038C824 + .4byte 0x8038C824 + .4byte 0x8038C824 + .4byte 0x8038C68C + .4byte 0x8038C6A4 + .4byte 0x8038C6BC + .4byte 0x8038C6D4 + .4byte 0x8038C6EC + .4byte 0x8038C704 + .4byte 0x8038C71C + .4byte 0x8038C734 + .4byte 0x8038C74C + .4byte 0x8038C764 + .4byte 0x8038C77C + .4byte 0x8038C794 + .4byte 0x8038C7AC + .4byte 0x8038C7C4 + .4byte 0x8038C7DC + .4byte 0x8038C7F4 + .4byte 0x8038C80C + .4byte 0 + .global lbl_803F2A20 lbl_803F2A20: - .incbin "baserom.dol", 0x3EFA20, 0x100 + # ROM: 0x3EFA20 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01020202 + .4byte 0x02020101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x04080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x30303030 + .4byte 0x30303030 + .4byte 0x30300808 + .4byte 0x08080808 + .4byte 0x08A0A0A0 + .4byte 0xA0A0A080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808008 + .4byte 0x08080808 + .4byte 0x08606060 + .4byte 0x60606040 + .4byte 0x40404040 + .4byte 0x40404040 + .4byte 0x40404040 + .4byte 0x40404040 + .4byte 0x40404008 + .4byte 0x08080801 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .global lbl_803F2B20 lbl_803F2B20: - .incbin "baserom.dol", 0x3EFB20, 0x100 + # ROM: 0x3EFB20 + .4byte 0x00010203 + .4byte 0x04050607 + .4byte 0x08090A0B + .4byte 0x0C0D0E0F + .4byte 0x10111213 + .4byte 0x14151617 + .4byte 0x18191A1B + .4byte 0x1C1D1E1F + .4byte 0x20212223 + .4byte 0x24252627 + .4byte 0x28292A2B + .4byte 0x2C2D2E2F + .4byte 0x30313233 + .4byte 0x34353637 + .4byte 0x38393A3B + .4byte 0x3C3D3E3F + .4byte 0x40616263 + .4byte 0x64656667 + .4byte 0x68696A6B + .4byte 0x6C6D6E6F + .4byte 0x70717273 + .4byte 0x74757677 + .4byte 0x78797A5B + .4byte 0x5C5D5E5F + .4byte 0x60616263 + .4byte 0x64656667 + .4byte 0x68696A6B + .4byte 0x6C6D6E6F + .4byte 0x70717273 + .4byte 0x74757677 + .4byte 0x78797A7B + .4byte 0x7C7D7E7F + .4byte 0x80818283 + .4byte 0x84858687 + .4byte 0x88898A8B + .4byte 0x8C8D8E8F + .4byte 0x90919293 + .4byte 0x94959697 + .4byte 0x98999A9B + .4byte 0x9C9D9E9F + .4byte 0xA0A1A2A3 + .4byte 0xA4A5A6A7 + .4byte 0xA8A9AAAB + .4byte 0xACADAEAF + .4byte 0xB0B1B2B3 + .4byte 0xB4B5B6B7 + .4byte 0xB8B9BABB + .4byte 0xBCBDBEBF + .4byte 0xC0C1C2C3 + .4byte 0xC4C5C6C7 + .4byte 0xC8C9CACB + .4byte 0xCCCDCECF + .4byte 0xD0D1D2D3 + .4byte 0xD4D5D6D7 + .4byte 0xD8D9DADB + .4byte 0xDCDDDEDF + .4byte 0xE0E1E2E3 + .4byte 0xE4E5E6E7 + .4byte 0xE8E9EAEB + .4byte 0xECEDEEEF + .4byte 0xF0F1F2F3 + .4byte 0xF4F5F6F7 + .4byte 0xF8F9FAFB + .4byte 0xFCFDFEFF + .global lbl_803F2C20 lbl_803F2C20: - .incbin "baserom.dol", 0x3EFC20, 0x100 + # ROM: 0x3EFC20 + .4byte 0x00010203 + .4byte 0x04050607 + .4byte 0x08090A0B + .4byte 0x0C0D0E0F + .4byte 0x10111213 + .4byte 0x14151617 + .4byte 0x18191A1B + .4byte 0x1C1D1E1F + .4byte 0x20212223 + .4byte 0x24252627 + .4byte 0x28292A2B + .4byte 0x2C2D2E2F + .4byte 0x30313233 + .4byte 0x34353637 + .4byte 0x38393A3B + .4byte 0x3C3D3E3F + .4byte 0x40414243 + .4byte 0x44454647 + .4byte 0x48494A4B + .4byte 0x4C4D4E4F + .4byte 0x50515253 + .4byte 0x54555657 + .4byte 0x58595A5B + .4byte 0x5C5D5E5F + .4byte 0x60414243 + .4byte 0x44454647 + .4byte 0x48494A4B + .4byte 0x4C4D4E4F + .4byte 0x50515253 + .4byte 0x54555657 + .4byte 0x58595A7B + .4byte 0x7C7D7E7F + .4byte 0x80818283 + .4byte 0x84858687 + .4byte 0x88898A8B + .4byte 0x8C8D8E8F + .4byte 0x90919293 + .4byte 0x94959697 + .4byte 0x98999A9B + .4byte 0x9C9D9E9F + .4byte 0xA0A1A2A3 + .4byte 0xA4A5A6A7 + .4byte 0xA8A9AAAB + .4byte 0xACADAEAF + .4byte 0xB0B1B2B3 + .4byte 0xB4B5B6B7 + .4byte 0xB8B9BABB + .4byte 0xBCBDBEBF + .4byte 0xC0C1C2C3 + .4byte 0xC4C5C6C7 + .4byte 0xC8C9CACB + .4byte 0xCCCDCECF + .4byte 0xD0D1D2D3 + .4byte 0xD4D5D6D7 + .4byte 0xD8D9DADB + .4byte 0xDCDDDEDF + .4byte 0xE0E1E2E3 + .4byte 0xE4E5E6E7 + .4byte 0xE8E9EAEB + .4byte 0xECEDEEEF + .4byte 0xF0F1F2F3 + .4byte 0xF4F5F6F7 + .4byte 0xF8F9FAFB + .4byte 0xFCFDFEFF + .global lbl_803F2D20 lbl_803F2D20: - .incbin "baserom.dol", 0x3EFD20, 0x38 + # ROM: 0x3EFD20 + .4byte 0x803D86B8 + .4byte 0x803D86BA + .4byte 0x803D86BA + .4byte 0x803D86BA + .4byte 0x803D86BA + .4byte 0x803D86BA + .4byte 0x803D86BA + .4byte 0x803D86BA + .4byte 0x803D86BA + .4byte 0x7F7F7F7F + .4byte 0x7F7F7F00 + .4byte 0x803D86BA + .4byte 0x7F7F7F7F + .4byte 0x7F7F7F00 + .global lbl_803F2D58 lbl_803F2D58: - .incbin "baserom.dol", 0x3EFD58, 0x84 + # ROM: 0x3EFD58 + .4byte 0x8038F3FC + .4byte 0x8038F40C + .4byte 0x8038F40C + .4byte 0x8038F40C + .4byte 0x8038F40C + .4byte 0x8038F40C + .4byte 0x8038F40C + .4byte 0x8038F40C + .4byte 0x8038F40C + .4byte 0x8038F40C + .4byte 0x8038F40C + .4byte 0x8038F40C + .4byte 0x8038F39C + .4byte 0x8038F40C + .4byte 0x8038F40C + .4byte 0x8038F40C + .4byte 0x8038F40C + .4byte 0x8038F39C + .4byte 0x8038F40C + .4byte 0x8038F40C + .4byte 0x8038F40C + .4byte 0x8038F40C + .4byte 0x8038F40C + .4byte 0x8038F3D4 + .4byte 0x8038F40C + .4byte 0x8038F40C + .4byte 0x8038F40C + .4byte 0x8038F40C + .4byte 0x8038F40C + .4byte 0x8038F3E8 + .4byte 0x8038F40C + .4byte 0x8038F40C + .4byte 0x8038F3FC + .global lbl_803F2DDC lbl_803F2DDC: - .incbin "baserom.dol", 0x3EFDDC, 0x84 + # ROM: 0x3EFDDC + .4byte 0x8038F688 + .4byte 0x8038F694 + .4byte 0x8038F694 + .4byte 0x8038F694 + .4byte 0x8038F694 + .4byte 0x8038F694 + .4byte 0x8038F694 + .4byte 0x8038F694 + .4byte 0x8038F694 + .4byte 0x8038F694 + .4byte 0x8038F694 + .4byte 0x8038F694 + .4byte 0x8038F650 + .4byte 0x8038F694 + .4byte 0x8038F694 + .4byte 0x8038F694 + .4byte 0x8038F694 + .4byte 0x8038F650 + .4byte 0x8038F694 + .4byte 0x8038F694 + .4byte 0x8038F694 + .4byte 0x8038F694 + .4byte 0x8038F694 + .4byte 0x8038F668 + .4byte 0x8038F694 + .4byte 0x8038F694 + .4byte 0x8038F694 + .4byte 0x8038F694 + .4byte 0x8038F694 + .4byte 0x8038F678 + .4byte 0x8038F694 + .4byte 0x8038F694 + .4byte 0x8038F688 + .global lbl_803F2E60 lbl_803F2E60: - .incbin "baserom.dol", 0x3EFE60, 0xE0 + # ROM: 0x3EFE60 + .4byte 0x8038FB8C + .4byte 0x8038FCBC + .4byte 0x8038FCBC + .4byte 0x8038FCBC + .4byte 0x8038FBDC + .4byte 0x8038FB54 + .4byte 0x8038FBC8 + .4byte 0x8038FCBC + .4byte 0x8038FCBC + .4byte 0x8038FCBC + .4byte 0x8038FCBC + .4byte 0x8038FCBC + .4byte 0x8038FCBC + .4byte 0x8038FCBC + .4byte 0x8038FCBC + .4byte 0x8038FCBC + .4byte 0x8038FCBC + .4byte 0x8038FCBC + .4byte 0x8038FCBC + .4byte 0x8038FCBC + .4byte 0x8038FCBC + .4byte 0x8038FCBC + .4byte 0x8038FCBC + .4byte 0x8038FB0C + .4byte 0x8038FCBC + .4byte 0x8038FCBC + .4byte 0x8038FCBC + .4byte 0x8038FCBC + .4byte 0x8038FCBC + .4byte 0x8038FCBC + .4byte 0x8038FCBC + .4byte 0x8038FCBC + .4byte 0x8038FB8C + .4byte 0x8038FCBC + .4byte 0x8038FC40 + .4byte 0x8038FB0C + .4byte 0x8038FBDC + .4byte 0x8038FB54 + .4byte 0x8038FBC8 + .4byte 0x8038FCBC + .4byte 0x8038FB0C + .4byte 0x8038FCBC + .4byte 0x8038FCBC + .4byte 0x8038FCBC + .4byte 0x8038FCBC + .4byte 0x8038FCA4 + .4byte 0x8038FB0C + .4byte 0x8038FC1C + .4byte 0x8038FCBC + .4byte 0x8038FCBC + .4byte 0x8038FC78 + .4byte 0x8038FCBC + .4byte 0x8038FB0C + .4byte 0x8038FCBC + .4byte 0x8038FCBC + .4byte 0x8038FB0C + .global lbl_803F2F40 lbl_803F2F40: - .incbin "baserom.dol", 0x3EFF40, 0x48 - + # ROM: 0x3EFF40 + .4byte 0x8038F8BC + .4byte 0x8038F8F8 + .4byte 0x8038F8F8 + .4byte 0x8038F8D4 + .4byte 0x8038F8F8 + .4byte 0x8038F8F8 + .4byte 0x8038F8F8 + .4byte 0x8038F8F8 + .4byte 0x8038F8F8 + .4byte 0x8038F8F8 + .4byte 0x8038F8F8 + .4byte 0x8038F8B0 + .4byte 0x8038F8F8 + .4byte 0x8038F8A4 + .4byte 0x8038F8F8 + .4byte 0x8038F8F8 + .4byte 0x8038F8E0 + .4byte 0 + + .section .text, "ax" .if 1 -/* TODO: Move __stdio_atexit to its own file (misc_io), - * it's here to work around a bug with CW +/* TODO: Move __stdio_atexit to its own file (misc_io), + * it's here to work around a bug with CW */ .global __stdio_atexit __stdio_atexit: /* 8038DCCC 0038AC2C 3C 60 80 39 */ lis r3, __close_all@ha /* 8038DCD0 0038AC30 38 03 B1 18 */ addi r0, r3, __close_all@l /* 8038DCD4 0038AC34 90 0D AE 00 */ stw r0, lbl_805A99C0@sda21(r13) -/* 8038DCD8 0038AC38 4E 80 00 20 */ blr +/* 8038DCD8 0038AC38 4E 80 00 20 */ blr .endif .global sprintf @@ -114,7 +652,7 @@ lbl_8038DDA8: /* 8038DDAC 0038AD0C 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 8038DDB0 0038AD10 7C 08 03 A6 */ mtlr r0 /* 8038DDB4 0038AD14 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8038DDB8 0038AD18 4E 80 00 20 */ blr +/* 8038DDB8 0038AD18 4E 80 00 20 */ blr .global vsprintf vsprintf: @@ -149,7 +687,7 @@ lbl_8038DE20: /* 8038DE24 0038AD84 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8038DE28 0038AD88 7C 08 03 A6 */ mtlr r0 /* 8038DE2C 0038AD8C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8038DE30 0038AD90 4E 80 00 20 */ blr +/* 8038DE30 0038AD90 4E 80 00 20 */ blr .global vprintf vprintf: @@ -185,7 +723,7 @@ lbl_8038DE94: /* 8038DEA0 0038AE00 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8038DEA4 0038AE04 7C 08 03 A6 */ mtlr r0 /* 8038DEA8 0038AE08 38 21 00 20 */ addi r1, r1, 0x20 -/* 8038DEAC 0038AE0C 4E 80 00 20 */ blr +/* 8038DEAC 0038AE0C 4E 80 00 20 */ blr .global printf printf: @@ -242,7 +780,7 @@ lbl_8038DF64: /* 8038DF6C 0038AECC 83 C1 00 78 */ lwz r30, 0x78(r1) /* 8038DF70 0038AED0 7C 08 03 A6 */ mtlr r0 /* 8038DF74 0038AED4 38 21 00 80 */ addi r1, r1, 0x80 -/* 8038DF78 0038AED8 4E 80 00 20 */ blr +/* 8038DF78 0038AED8 4E 80 00 20 */ blr .global __StringWrite __StringWrite: @@ -273,7 +811,7 @@ lbl_8038DFB0: /* 8038DFD8 0038AF38 80 01 00 14 */ lwz r0, 0x14(r1) /* 8038DFDC 0038AF3C 7C 08 03 A6 */ mtlr r0 /* 8038DFE0 0038AF40 38 21 00 10 */ addi r1, r1, 0x10 -/* 8038DFE4 0038AF44 4E 80 00 20 */ blr +/* 8038DFE4 0038AF44 4E 80 00 20 */ blr .global __FileWrite __FileWrite: @@ -300,7 +838,7 @@ lbl_8038E028: /* 8038E030 0038AF90 83 C1 00 08 */ lwz r30, 8(r1) /* 8038E034 0038AF94 7C 08 03 A6 */ mtlr r0 /* 8038E038 0038AF98 38 21 00 10 */ addi r1, r1, 0x10 -/* 8038E03C 0038AF9C 4E 80 00 20 */ blr +/* 8038E03C 0038AF9C 4E 80 00 20 */ blr .global __pformatter __pformatter: @@ -333,7 +871,7 @@ lbl_8038E078: /* 8038E0A4 0038B004 7F C3 F3 78 */ mr r3, r30 /* 8038E0A8 0038B008 7F 44 D3 78 */ mr r4, r26 /* 8038E0AC 0038B00C 7D 89 03 A6 */ mtctr r12 -/* 8038E0B0 0038B010 4E 80 04 21 */ bctrl +/* 8038E0B0 0038B010 4E 80 04 21 */ bctrl /* 8038E0B4 0038B014 28 03 00 00 */ cmplwi r3, 0 /* 8038E0B8 0038B018 40 82 06 E4 */ bne lbl_8038E79C /* 8038E0BC 0038B01C 38 60 FF FF */ li r3, -1 @@ -346,7 +884,7 @@ lbl_8038E0C4: /* 8038E0D4 0038B034 7F C3 F3 78 */ mr r3, r30 /* 8038E0D8 0038B038 7F 44 D3 78 */ mr r4, r26 /* 8038E0DC 0038B03C 7D 89 03 A6 */ mtctr r12 -/* 8038E0E0 0038B040 4E 80 04 21 */ bctrl +/* 8038E0E0 0038B040 4E 80 04 21 */ bctrl /* 8038E0E4 0038B044 28 03 00 00 */ cmplwi r3, 0 /* 8038E0E8 0038B048 40 82 00 0C */ bne lbl_8038E0F4 /* 8038E0EC 0038B04C 38 60 FF FF */ li r3, -1 @@ -733,7 +1271,7 @@ lbl_8038E610: /* 8038E628 0038B588 7F C3 F3 78 */ mr r3, r30 /* 8038E62C 0038B58C 7F 24 CB 78 */ mr r4, r25 /* 8038E630 0038B590 7D 89 03 A6 */ mtctr r12 -/* 8038E634 0038B594 4E 80 04 21 */ bctrl +/* 8038E634 0038B594 4E 80 04 21 */ bctrl /* 8038E638 0038B598 28 03 00 00 */ cmplwi r3, 0 /* 8038E63C 0038B59C 40 82 00 0C */ bne lbl_8038E648 /* 8038E640 0038B5A0 38 60 FF FF */ li r3, -1 @@ -769,7 +1307,7 @@ lbl_8038E694: /* 8038E6A8 0038B608 7E 84 A3 78 */ mr r4, r20 /* 8038E6AC 0038B60C 38 A0 00 01 */ li r5, 1 /* 8038E6B0 0038B610 7D 89 03 A6 */ mtctr r12 -/* 8038E6B4 0038B614 4E 80 04 21 */ bctrl +/* 8038E6B4 0038B614 4E 80 04 21 */ bctrl /* 8038E6B8 0038B618 28 03 00 00 */ cmplwi r3, 0 /* 8038E6BC 0038B61C 40 82 00 0C */ bne lbl_8038E6C8 /* 8038E6C0 0038B620 38 60 FF FF */ li r3, -1 @@ -784,7 +1322,7 @@ lbl_8038E6D4: /* 8038E6DC 0038B63C 38 81 00 09 */ addi r4, r1, 9 /* 8038E6E0 0038B640 38 A0 00 01 */ li r5, 1 /* 8038E6E4 0038B644 7D 89 03 A6 */ mtctr r12 -/* 8038E6E8 0038B648 4E 80 04 21 */ bctrl +/* 8038E6E8 0038B648 4E 80 04 21 */ bctrl /* 8038E6EC 0038B64C 28 03 00 00 */ cmplwi r3, 0 /* 8038E6F0 0038B650 40 82 00 0C */ bne lbl_8038E6FC /* 8038E6F4 0038B654 38 60 FF FF */ li r3, -1 @@ -803,7 +1341,7 @@ lbl_8038E70C: /* 8038E71C 0038B67C 7E 84 A3 78 */ mr r4, r20 /* 8038E720 0038B680 7F 25 CB 78 */ mr r5, r25 /* 8038E724 0038B684 7D 89 03 A6 */ mtctr r12 -/* 8038E728 0038B688 4E 80 04 21 */ bctrl +/* 8038E728 0038B688 4E 80 04 21 */ bctrl /* 8038E72C 0038B68C 28 03 00 00 */ cmplwi r3, 0 /* 8038E730 0038B690 40 82 00 0C */ bne lbl_8038E73C /* 8038E734 0038B694 38 60 FF FF */ li r3, -1 @@ -821,7 +1359,7 @@ lbl_8038E750: /* 8038E75C 0038B6BC 38 81 00 08 */ addi r4, r1, 8 /* 8038E760 0038B6C0 38 A0 00 01 */ li r5, 1 /* 8038E764 0038B6C4 7D 89 03 A6 */ mtctr r12 -/* 8038E768 0038B6C8 4E 80 04 21 */ bctrl +/* 8038E768 0038B6C8 4E 80 04 21 */ bctrl /* 8038E76C 0038B6CC 28 03 00 00 */ cmplwi r3, 0 /* 8038E770 0038B6D0 40 82 00 0C */ bne lbl_8038E77C /* 8038E774 0038B6D4 38 60 FF FF */ li r3, -1 @@ -845,7 +1383,7 @@ lbl_8038E7A0: /* 8038E7A4 0038B704 80 01 02 C4 */ lwz r0, 0x2c4(r1) /* 8038E7A8 0038B708 7C 08 03 A6 */ mtlr r0 /* 8038E7AC 0038B70C 38 21 02 C0 */ addi r1, r1, 0x2c0 -/* 8038E7B0 0038B710 4E 80 00 20 */ blr +/* 8038E7B0 0038B710 4E 80 00 20 */ blr .global float2str float2str: @@ -1360,7 +1898,7 @@ lbl_8038EE7C: /* 8038EE90 0038BDF0 83 81 00 38 */ lwz r28, 0x38(r1) /* 8038EE94 0038BDF4 7C 08 03 A6 */ mtlr r0 /* 8038EE98 0038BDF8 38 21 00 50 */ addi r1, r1, 0x50 -/* 8038EE9C 0038BDFC 4E 80 00 20 */ blr +/* 8038EE9C 0038BDFC 4E 80 00 20 */ blr .global round_decimal round_decimal: @@ -1373,11 +1911,11 @@ lbl_8038EEA8: /* 8038EEB4 0038BE14 38 00 00 30 */ li r0, 0x30 /* 8038EEB8 0038BE18 98 83 00 04 */ stb r4, 4(r3) /* 8038EEBC 0038BE1C 98 03 00 05 */ stb r0, 5(r3) -/* 8038EEC0 0038BE20 4E 80 00 20 */ blr +/* 8038EEC0 0038BE20 4E 80 00 20 */ blr lbl_8038EEC4: /* 8038EEC4 0038BE24 88 E3 00 04 */ lbz r7, 4(r3) /* 8038EEC8 0038BE28 7C 04 38 00 */ cmpw r4, r7 -/* 8038EECC 0038BE2C 4C 80 00 20 */ bgelr +/* 8038EECC 0038BE2C 4C 80 00 20 */ bgelr /* 8038EED0 0038BE30 7C C3 22 14 */ add r6, r3, r4 /* 8038EED4 0038BE34 88 A6 00 05 */ lbz r5, 5(r6) /* 8038EED8 0038BE38 39 06 00 05 */ addi r8, r6, 5 @@ -1446,12 +1984,12 @@ lbl_8038EF94: /* 8038EFAC 0038BF0C B0 A3 00 02 */ sth r5, 2(r3) /* 8038EFB0 0038BF10 98 83 00 04 */ stb r4, 4(r3) /* 8038EFB4 0038BF14 98 03 00 05 */ stb r0, 5(r3) -/* 8038EFB8 0038BF18 4E 80 00 20 */ blr +/* 8038EFB8 0038BF18 4E 80 00 20 */ blr lbl_8038EFBC: /* 8038EFBC 0038BF1C 2C 04 00 00 */ cmpwi r4, 0 /* 8038EFC0 0038BF20 41 82 FE E8 */ beq lbl_8038EEA8 /* 8038EFC4 0038BF24 98 83 00 04 */ stb r4, 4(r3) -/* 8038EFC8 0038BF28 4E 80 00 20 */ blr +/* 8038EFC8 0038BF28 4E 80 00 20 */ blr .global double2hex double2hex: @@ -1687,7 +2225,7 @@ lbl_8038F2EC: /* 8038F2F4 0038C254 83 C1 00 78 */ lwz r30, 0x78(r1) /* 8038F2F8 0038C258 7C 08 03 A6 */ mtlr r0 /* 8038F2FC 0038C25C 38 21 00 80 */ addi r1, r1, 0x80 -/* 8038F300 0038C260 4E 80 00 20 */ blr +/* 8038F300 0038C260 4E 80 00 20 */ blr .global longlong2str longlong2str: @@ -1730,7 +2268,7 @@ lbl_8038F374: /* 8038F38C 0038C2EC 38 A5 2D 58 */ addi r5, r5, lbl_803F2D58@l /* 8038F390 0038C2F0 7C 05 00 2E */ lwzx r0, r5, r0 /* 8038F394 0038C2F4 7C 09 03 A6 */ mtctr r0 -/* 8038F398 0038C2F8 4E 80 04 20 */ bctr +/* 8038F398 0038C2F8 4E 80 04 20 */ bctr /* 8038F39C 0038C2FC 38 00 00 00 */ li r0, 0 /* 8038F3A0 0038C300 6C 65 80 00 */ xoris r5, r3, 0x8000 /* 8038F3A4 0038C304 6C 03 80 00 */ xoris r3, r0, 0x8000 @@ -1891,7 +2429,7 @@ lbl_8038F5CC: /* 8038F5D0 0038C530 80 01 00 34 */ lwz r0, 0x34(r1) /* 8038F5D4 0038C534 7C 08 03 A6 */ mtlr r0 /* 8038F5D8 0038C538 38 21 00 30 */ addi r1, r1, 0x30 -/* 8038F5DC 0038C53C 4E 80 00 20 */ blr +/* 8038F5DC 0038C53C 4E 80 00 20 */ blr .global long2str long2str: @@ -1913,7 +2451,7 @@ long2str: /* 8038F61C 0038C57C 41 82 00 0C */ beq lbl_8038F628 lbl_8038F620: /* 8038F620 0038C580 7C C3 33 78 */ mr r3, r6 -/* 8038F624 0038C584 4E 80 00 20 */ blr +/* 8038F624 0038C584 4E 80 00 20 */ blr lbl_8038F628: /* 8038F628 0038C588 89 25 00 05 */ lbz r9, 5(r5) /* 8038F62C 0038C58C 39 49 FF A8 */ addi r10, r9, -88 @@ -1924,7 +2462,7 @@ lbl_8038F628: /* 8038F640 0038C5A0 39 29 2D DC */ addi r9, r9, lbl_803F2DDC@l /* 8038F644 0038C5A4 7D 29 50 2E */ lwzx r9, r9, r10 /* 8038F648 0038C5A8 7D 29 03 A6 */ mtctr r9 -/* 8038F64C 0038C5AC 4E 80 04 20 */ bctr +/* 8038F64C 0038C5AC 4E 80 04 20 */ bctr /* 8038F650 0038C5B0 2C 03 00 00 */ cmpwi r3, 0 /* 8038F654 0038C5B4 38 00 00 0A */ li r0, 0xa /* 8038F658 0038C5B8 40 80 00 3C */ bge lbl_8038F694 @@ -2007,7 +2545,7 @@ lbl_8038F760: /* 8038F76C 0038C6CC 2C 03 01 FD */ cmpwi r3, 0x1fd /* 8038F770 0038C6D0 40 81 00 0C */ ble lbl_8038F77C /* 8038F774 0038C6D4 38 60 00 00 */ li r3, 0 -/* 8038F778 0038C6D8 4E 80 00 20 */ blr +/* 8038F778 0038C6D8 4E 80 00 20 */ blr lbl_8038F77C: /* 8038F77C 0038C6DC 38 80 00 30 */ li r4, 0x30 /* 8038F780 0038C6E0 48 00 00 0C */ b lbl_8038F78C @@ -2047,7 +2585,7 @@ lbl_8038F7E8: /* 8038F7F4 0038C754 9C 06 FF FF */ stbu r0, -1(r6) lbl_8038F7F8: /* 8038F7F8 0038C758 7C C3 33 78 */ mr r3, r6 -/* 8038F7FC 0038C75C 4E 80 00 20 */ blr +/* 8038F7FC 0038C75C 4E 80 00 20 */ blr .global parse_format parse_format: @@ -2092,7 +2630,7 @@ lbl_8038F87C: /* 8038F894 0038C7F4 38 63 2F 40 */ addi r3, r3, lbl_803F2F40@l /* 8038F898 0038C7F8 7C 03 00 2E */ lwzx r0, r3, r0 /* 8038F89C 0038C7FC 7C 09 03 A6 */ mtctr r0 -/* 8038F8A0 0038C800 4E 80 04 20 */ bctr +/* 8038F8A0 0038C800 4E 80 04 20 */ bctr /* 8038F8A4 0038C804 38 00 00 00 */ li r0, 0 /* 8038F8A8 0038C808 98 01 00 08 */ stb r0, 8(r1) /* 8038F8AC 0038C80C 48 00 00 50 */ b lbl_8038F8FC @@ -2267,7 +2805,7 @@ lbl_8038FAE4: /* 8038FAFC 0038CA5C 38 63 2E 60 */ addi r3, r3, lbl_803F2E60@l /* 8038FB00 0038CA60 7C 03 00 2E */ lwzx r0, r3, r0 /* 8038FB04 0038CA64 7C 09 03 A6 */ mtctr r0 -/* 8038FB08 0038CA68 4E 80 04 20 */ bctr +/* 8038FB08 0038CA68 4E 80 04 20 */ bctr /* 8038FB0C 0038CA6C 88 01 00 0C */ lbz r0, 0xc(r1) /* 8038FB10 0038CA70 28 00 00 05 */ cmplwi r0, 5 /* 8038FB14 0038CA74 40 82 00 10 */ bne lbl_8038FB24 @@ -2408,4 +2946,4 @@ lbl_8038FCE8: /* 8038FCF4 0038CC54 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8038FCF8 0038CC58 7C 08 03 A6 */ mtlr r0 /* 8038FCFC 0038CC5C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8038FD00 0038CC60 4E 80 00 20 */ blr +/* 8038FD00 0038CC60 4E 80 00 20 */ blr diff --git a/asm/Runtime/ptmf.s b/asm/Runtime/ptmf.s index 0ca684b4..1fc7bdc9 100644 --- a/asm/Runtime/ptmf.s +++ b/asm/Runtime/ptmf.s @@ -17,11 +17,11 @@ __ptmf_test: /* 8038990C 0038686C 2C 05 00 00 */ cmpwi r5, 0 /* 80389910 00386870 2F 06 00 00 */ cmpwi cr6, r6, 0 /* 80389914 00386874 2F 87 00 00 */ cmpwi cr7, r7, 0 -/* 80389918 00386878 4C 82 00 20 */ bnelr +/* 80389918 00386878 4C 82 00 20 */ bnelr /* 8038991C 0038687C 4C 9A 00 20 */ bnelr cr6 /* 80389920 00386880 4C 9E 00 20 */ bnelr cr7 /* 80389924 00386884 38 60 00 00 */ li r3, 0 -/* 80389928 00386888 4E 80 00 20 */ blr +/* 80389928 00386888 4E 80 00 20 */ blr .global __ptmf_scall __ptmf_scall: @@ -35,4 +35,4 @@ __ptmf_scall: /* 80389948 003868A8 7D 8C 58 2E */ lwzx r12, r12, r11 lbl_8038994C: /* 8038994C 003868AC 7D 89 03 A6 */ mtctr r12 -/* 80389950 003868B0 4E 80 04 20 */ bctr +/* 80389950 003868B0 4E 80 04 20 */ bctr diff --git a/asm/Runtime/qsort.s b/asm/Runtime/qsort.s index 51e02968..cbc27026 100644 --- a/asm/Runtime/qsort.s +++ b/asm/Runtime/qsort.s @@ -68,7 +68,7 @@ lbl_8038FDB8: /* 8038FDE0 0038CD40 7E C3 B3 78 */ mr r3, r22 /* 8038FDE4 0038CD44 7E A4 AB 78 */ mr r4, r21 /* 8038FDE8 0038CD48 7D 89 03 A6 */ mtctr r12 -/* 8038FDEC 0038CD4C 4E 80 04 21 */ bctrl +/* 8038FDEC 0038CD4C 4E 80 04 21 */ bctrl /* 8038FDF0 0038CD50 2C 03 00 00 */ cmpwi r3, 0 /* 8038FDF4 0038CD54 40 80 00 0C */ bge lbl_8038FE00 /* 8038FDF8 0038CD58 7E B6 AB 78 */ mr r22, r21 @@ -78,7 +78,7 @@ lbl_8038FE00: /* 8038FE04 0038CD64 7E E3 BB 78 */ mr r3, r23 /* 8038FE08 0038CD68 7E C4 B3 78 */ mr r4, r22 /* 8038FE0C 0038CD6C 7D 89 03 A6 */ mtctr r12 -/* 8038FE10 0038CD70 4E 80 04 21 */ bctrl +/* 8038FE10 0038CD70 4E 80 04 21 */ bctrl /* 8038FE14 0038CD74 2C 03 00 00 */ cmpwi r3, 0 /* 8038FE18 0038CD78 40 80 FF 34 */ bge lbl_8038FD4C /* 8038FE1C 0038CD7C 38 76 FF FF */ addi r3, r22, -1 @@ -106,4 +106,4 @@ lbl_8038FE60: /* 8038FE64 0038CDC4 80 01 00 44 */ lwz r0, 0x44(r1) /* 8038FE68 0038CDC8 7C 08 03 A6 */ mtlr r0 /* 8038FE6C 0038CDCC 38 21 00 40 */ addi r1, r1, 0x40 -/* 8038FE70 0038CDD0 4E 80 00 20 */ blr +/* 8038FE70 0038CDD0 4E 80 00 20 */ blr diff --git a/asm/Runtime/rand.s b/asm/Runtime/rand.s index c80a0c3c..6d800928 100644 --- a/asm/Runtime/rand.s +++ b/asm/Runtime/rand.s @@ -5,7 +5,7 @@ .global srand srand: /* 8038FE74 0038CDD4 90 6D 9F D8 */ stw r3, lbl_805A8B98@sda21(r13) -/* 8038FE78 0038CDD8 4E 80 00 20 */ blr +/* 8038FE78 0038CDD8 4E 80 00 20 */ blr .global rand rand: @@ -16,4 +16,4 @@ rand: /* 8038FE8C 0038CDEC 38 03 30 39 */ addi r0, r3, 0x3039 /* 8038FE90 0038CDF0 90 0D 9F D8 */ stw r0, lbl_805A8B98@sda21(r13) /* 8038FE94 0038CDF4 54 03 84 7E */ rlwinm r3, r0, 0x10, 0x11, 0x1f -/* 8038FE98 0038CDF8 4E 80 00 20 */ blr +/* 8038FE98 0038CDF8 4E 80 00 20 */ blr diff --git a/asm/Runtime/runtime.s b/asm/Runtime/runtime.s index e4a9a54e..30f82608 100644 --- a/asm/Runtime/runtime.s +++ b/asm/Runtime/runtime.s @@ -3,8 +3,15 @@ .section .rodata .global lbl_803D85A8 lbl_803D85A8: - .incbin "baserom.dol", 0x3D55A8, 0x18 - + # ROM: 0x3D55A8 + .4byte 0 + .4byte 0 + .4byte 0x41F00000 + .4byte 0 + .4byte 0x41E00000 + .4byte 0 + + .section .text, "ax" .global __cvt_fp2unsigned @@ -33,7 +40,7 @@ lbl_80389994: /* 803899A4 00386904 3C 63 80 00 */ addis r3, r3, 0x8000 lbl_803899A8: /* 803899A8 00386908 38 21 00 10 */ addi r1, r1, 0x10 -/* 803899AC 0038690C 4E 80 00 20 */ blr +/* 803899AC 0038690C 4E 80 00 20 */ blr .global __save_fpr __save_fpr: @@ -73,7 +80,7 @@ _savefpr_28: /* 803899EC 0038694C DB AB FF E8 */ stfd f29, -0x18(r11) /* 803899F0 00386950 DB CB FF F0 */ stfd f30, -0x10(r11) /* 803899F4 00386954 DB EB FF F8 */ stfd f31, -8(r11) -/* 803899F8 00386958 4E 80 00 20 */ blr +/* 803899F8 00386958 4E 80 00 20 */ blr .global __restore_fpr __restore_fpr: @@ -146,7 +153,7 @@ _restfpr_30: .global _restfpr_31 _restfpr_31: /* 80389A40 003869A0 CB EB FF F8 */ lfd f31, -8(r11) -/* 80389A44 003869A4 4E 80 00 20 */ blr +/* 80389A44 003869A4 4E 80 00 20 */ blr .global __save_gpr __save_gpr: @@ -215,7 +222,7 @@ _savegpr_30: .global _savegpr_31 _savegpr_31: /* 80389A8C 003869EC 93 EB FF FC */ stw r31, -4(r11) -/* 80389A90 003869F0 4E 80 00 20 */ blr +/* 80389A90 003869F0 4E 80 00 20 */ blr .global __restore_gpr __restore_gpr: @@ -288,7 +295,7 @@ _restgpr_30: .global _restgpr_31 _restgpr_13: /* 80389AD8 00386A38 83 EB FF FC */ lwz r31, -4(r11) -/* 80389ADC 00386A3C 4E 80 00 20 */ blr +/* 80389ADC 00386A3C 4E 80 00 20 */ blr .global __div2u __div2u: @@ -355,11 +362,11 @@ lbl_80389BB0: /* 80389BB0 00386B10 42 00 FF D8 */ bdnz lbl_80389B88 /* 80389BB4 00386B14 7C 84 21 14 */ adde r4, r4, r4 /* 80389BB8 00386B18 7C 63 19 14 */ adde r3, r3, r3 -/* 80389BBC 00386B1C 4E 80 00 20 */ blr +/* 80389BBC 00386B1C 4E 80 00 20 */ blr lbl_80389BC0: /* 80389BC0 00386B20 38 80 00 00 */ li r4, 0 /* 80389BC4 00386B24 38 60 00 00 */ li r3, 0 -/* 80389BC8 00386B28 4E 80 00 20 */ blr +/* 80389BC8 00386B28 4E 80 00 20 */ blr .global __div2i __div2i: @@ -452,7 +459,7 @@ lbl_80389CF4: /* 80389CF8 00386C58 38 60 00 00 */ li r3, 0 lbl_80389CFC: /* 80389CFC 00386C5C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80389D00 00386C60 4E 80 00 20 */ blr +/* 80389D00 00386C60 4E 80 00 20 */ blr .global __mod2u __mod2u: @@ -470,7 +477,7 @@ lbl_80389D18: lbl_80389D2C: /* 80389D2C 00386C8C 7C 00 48 00 */ cmpw r0, r9 /* 80389D30 00386C90 21 40 00 40 */ subfic r10, r0, 0x40 -/* 80389D34 00386C94 4D 81 00 20 */ bgtlr +/* 80389D34 00386C94 4D 81 00 20 */ bgtlr /* 80389D38 00386C98 39 29 00 01 */ addi r9, r9, 1 /* 80389D3C 00386C9C 21 29 00 40 */ subfic r9, r9, 0x40 /* 80389D40 00386CA0 7C 00 4A 14 */ add r0, r0, r9 @@ -519,11 +526,11 @@ lbl_80389DD4: /* 80389DD4 00386D34 42 00 FF D8 */ bdnz lbl_80389DAC /* 80389DD8 00386D38 7D 04 43 78 */ mr r4, r8 /* 80389DDC 00386D3C 7C E3 3B 78 */ mr r3, r7 -/* 80389DE0 00386D40 4E 80 00 20 */ blr +/* 80389DE0 00386D40 4E 80 00 20 */ blr .global sub_80389de4 sub_80389de4: -/* 80389DE4 00386D44 4E 80 00 20 */ blr +/* 80389DE4 00386D44 4E 80 00 20 */ blr .global __mod2i __mod2i: @@ -604,7 +611,7 @@ lbl_80389EE4: /* 80389EE4 00386E44 4C 9C 00 20 */ bgelr cr7 /* 80389EE8 00386E48 20 84 00 00 */ subfic r4, r4, 0 /* 80389EEC 00386E4C 7C 63 01 90 */ subfze r3, r3 -/* 80389EF0 00386E50 4E 80 00 20 */ blr +/* 80389EF0 00386E50 4E 80 00 20 */ blr .global __shl2i __shl2i: @@ -616,7 +623,7 @@ __shl2i: /* 80389F08 00386E68 7C 8A 48 30 */ slw r10, r4, r9 /* 80389F0C 00386E6C 7C 63 53 78 */ or r3, r3, r10 /* 80389F10 00386E70 7C 84 28 30 */ slw r4, r4, r5 -/* 80389F14 00386E74 4E 80 00 20 */ blr +/* 80389F14 00386E74 4E 80 00 20 */ blr .global __shr2u __shr2u: @@ -628,7 +635,7 @@ __shr2u: /* 80389F2C 00386E8C 7C 6A 4C 30 */ srw r10, r3, r9 /* 80389F30 00386E90 7C 84 53 78 */ or r4, r4, r10 /* 80389F34 00386E94 7C 63 2C 30 */ srw r3, r3, r5 -/* 80389F38 00386E98 4E 80 00 20 */ blr +/* 80389F38 00386E98 4E 80 00 20 */ blr .global __shr2i __shr2i: @@ -642,7 +649,7 @@ __shr2i: /* 80389F58 00386EB8 7C 84 53 78 */ or r4, r4, r10 lbl_80389F5C: /* 80389F5C 00386EBC 7C 63 2E 30 */ sraw r3, r3, r5 -/* 80389F60 00386EC0 4E 80 00 20 */ blr +/* 80389F60 00386EC0 4E 80 00 20 */ blr .global __cvt_sll_flt __cvt_sll_flt: @@ -694,7 +701,7 @@ lbl_8038A000: /* 8038A008 00386F68 C8 21 00 08 */ lfd f1, 8(r1) /* 8038A00C 00386F6C FC 20 08 18 */ frsp f1, f1 /* 8038A010 00386F70 38 21 00 10 */ addi r1, r1, 0x10 -/* 8038A014 00386F74 4E 80 00 20 */ blr +/* 8038A014 00386F74 4E 80 00 20 */ blr .global __cvt_dbl_usll __cvt_dbl_usll: @@ -754,4 +761,4 @@ lbl_8038A0CC: /* 8038A0D8 00387038 7C 63 01 90 */ subfze r3, r3 lbl_8038A0DC: /* 8038A0DC 0038703C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8038A0E0 00387040 4E 80 00 20 */ blr +/* 8038A0E0 00387040 4E 80 00 20 */ blr diff --git a/asm/Runtime/s_acos.s b/asm/Runtime/s_acos.s index 9091b401..1859f6f5 100644 --- a/asm/Runtime/s_acos.s +++ b/asm/Runtime/s_acos.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text, "ax" +.section .text, "ax" .global acos acos: @@ -11,4 +11,4 @@ acos: /* 80394C3C 00391B9C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80394C40 00391BA0 7C 08 03 A6 */ mtlr r0 /* 80394C44 00391BA4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80394C48 00391BA8 4E 80 00 20 */ blr \ No newline at end of file +/* 80394C48 00391BA8 4E 80 00 20 */ blr diff --git a/asm/Runtime/s_asin.s b/asm/Runtime/s_asin.s index 0792f28e..f1119c2e 100644 --- a/asm/Runtime/s_asin.s +++ b/asm/Runtime/s_asin.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text, "ax" +.section .text, "ax" .global asin asin: @@ -11,4 +11,4 @@ asin: /* 80394C5C 00391BBC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80394C60 00391BC0 7C 08 03 A6 */ mtlr r0 /* 80394C64 00391BC4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80394C68 00391BC8 4E 80 00 20 */ blr \ No newline at end of file +/* 80394C68 00391BC8 4E 80 00 20 */ blr diff --git a/asm/Runtime/s_atan.s b/asm/Runtime/s_atan.s index 24409b37..1da4f8e8 100644 --- a/asm/Runtime/s_atan.s +++ b/asm/Runtime/s_atan.s @@ -1,11 +1,50 @@ .include "macros.inc" -.section .rodata +.section .rodata .global lbl_803D89D0 lbl_803D89D0: - .incbin "baserom.dol", 0x3D59D0, 0x98 - -.section .text, "ax" + # ROM: 0x3D59D0 + .4byte 0x3FDDAC67 + .4byte 0x0561BB4F + .4byte 0x3FE921FB + .4byte 0x54442D18 + .4byte 0x3FEF730B + .4byte 0xD281F69B + .4byte 0x3FF921FB + .4byte 0x54442D18 + .4byte 0x3C7A2B7F + .4byte 0x222F65E2 + .4byte 0x3C81A626 + .4byte 0x33145C07 + .4byte 0x3C700788 + .4byte 0x7AF0CBBD + .4byte 0x3C91A626 + .4byte 0x33145C07 + .4byte 0x3FD55555 + .4byte 0x5555550D + .4byte 0xBFC99999 + .4byte 0x9998EBC4 + .4byte 0x3FC24924 + .4byte 0x920083FF + .4byte 0xBFBC71C6 + .4byte 0xFE231671 + .4byte 0x3FB745CD + .4byte 0xC54C206E + .4byte 0xBFB3B0F2 + .4byte 0xAF749A6D + .4byte 0x3FB10D66 + .4byte 0xA0D03D51 + .4byte 0xBFADDE2D + .4byte 0x52DEFD9A + .4byte 0x3FA97B4B + .4byte 0x24760DEB + .4byte 0xBFA2B444 + .4byte 0x2C6A6C2F + .4byte 0x3F90AD3A + .4byte 0xE322DA11 + + +.section .text, "ax" .global atan atan: diff --git a/asm/Runtime/s_atan2.s b/asm/Runtime/s_atan2.s index b33360ef..9b325850 100644 --- a/asm/Runtime/s_atan2.s +++ b/asm/Runtime/s_atan2.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text, "ax" +.section .text, "ax" .global atan2 atan2: @@ -11,4 +11,4 @@ atan2: /* 80394C7C 00391BDC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80394C80 00391BE0 7C 08 03 A6 */ mtlr r0 /* 80394C84 00391BE4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80394C88 00391BE8 4E 80 00 20 */ blr \ No newline at end of file +/* 80394C88 00391BE8 4E 80 00 20 */ blr diff --git a/asm/Runtime/s_copysign.s b/asm/Runtime/s_copysign.s index e53087e2..07825ef2 100644 --- a/asm/Runtime/s_copysign.s +++ b/asm/Runtime/s_copysign.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text, "ax" +.section .text, "ax" .global copysign copysign: @@ -13,4 +13,4 @@ copysign: /* 803943E0 00391340 90 01 00 08 */ stw r0, 8(r1) /* 803943E4 00391344 C8 21 00 08 */ lfd f1, 8(r1) /* 803943E8 00391348 38 21 00 20 */ addi r1, r1, 0x20 -/* 803943EC 0039134C 4E 80 00 20 */ blr +/* 803943EC 0039134C 4E 80 00 20 */ blr diff --git a/asm/Runtime/s_cos.s b/asm/Runtime/s_cos.s index ec7b5c8e..7fab60d3 100644 --- a/asm/Runtime/s_cos.s +++ b/asm/Runtime/s_cos.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text, "ax" +.section .text, "ax" .global cos cos: @@ -64,4 +64,4 @@ lbl_803944B4: /* 803944B4 00391414 80 01 00 24 */ lwz r0, 0x24(r1) /* 803944B8 00391418 7C 08 03 A6 */ mtlr r0 /* 803944BC 0039141C 38 21 00 20 */ addi r1, r1, 0x20 -/* 803944C0 00391420 4E 80 00 20 */ blr \ No newline at end of file +/* 803944C0 00391420 4E 80 00 20 */ blr diff --git a/asm/Runtime/s_cosf.s b/asm/Runtime/s_cosf.s index 7189d65b..bc2fe653 100644 --- a/asm/Runtime/s_cosf.s +++ b/asm/Runtime/s_cosf.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text, "ax" +.section .text, "ax" .global cosf cosf: @@ -12,4 +12,4 @@ cosf: /* 80394D20 00391C80 FC 20 08 18 */ frsp f1, f1 /* 80394D24 00391C84 7C 08 03 A6 */ mtlr r0 /* 80394D28 00391C88 38 21 00 10 */ addi r1, r1, 0x10 -/* 80394D2C 00391C8C 4E 80 00 20 */ blr +/* 80394D2C 00391C8C 4E 80 00 20 */ blr diff --git a/asm/Runtime/s_exp.s b/asm/Runtime/s_exp.s index 9ae4edb6..85374679 100644 --- a/asm/Runtime/s_exp.s +++ b/asm/Runtime/s_exp.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text, "ax" +.section .text, "ax" .global exp exp: @@ -11,4 +11,4 @@ exp: /* 80394C9C 00391BFC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80394CA0 00391C00 7C 08 03 A6 */ mtlr r0 /* 80394CA4 00391C04 38 21 00 10 */ addi r1, r1, 0x10 -/* 80394CA8 00391C08 4E 80 00 20 */ blr \ No newline at end of file +/* 80394CA8 00391C08 4E 80 00 20 */ blr diff --git a/asm/Runtime/s_floor.s b/asm/Runtime/s_floor.s index 39f7ce0f..41a14d7e 100644 --- a/asm/Runtime/s_floor.s +++ b/asm/Runtime/s_floor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text, "ax" +.section .text, "ax" .global floor floor: @@ -97,4 +97,4 @@ lbl_803945F8: /* 80394600 00391560 C8 21 00 08 */ lfd f1, 8(r1) lbl_80394604: /* 80394604 00391564 38 21 00 10 */ addi r1, r1, 0x10 -/* 80394608 00391568 4E 80 00 20 */ blr \ No newline at end of file +/* 80394608 00391568 4E 80 00 20 */ blr diff --git a/asm/Runtime/s_fmod.s b/asm/Runtime/s_fmod.s index 19a69d5b..85188da1 100644 --- a/asm/Runtime/s_fmod.s +++ b/asm/Runtime/s_fmod.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text, "ax" +.section .text, "ax" .global fmod fmod: @@ -11,4 +11,4 @@ fmod: /* 80394CBC 00391C1C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80394CC0 00391C20 7C 08 03 A6 */ mtlr r0 /* 80394CC4 00391C24 38 21 00 10 */ addi r1, r1, 0x10 -/* 80394CC8 00391C28 4E 80 00 20 */ blr \ No newline at end of file +/* 80394CC8 00391C28 4E 80 00 20 */ blr diff --git a/asm/Runtime/s_frexp.s b/asm/Runtime/s_frexp.s index fddf0c95..387bb0f6 100644 --- a/asm/Runtime/s_frexp.s +++ b/asm/Runtime/s_frexp.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text, "ax" +.section .text, "ax" .global frexp frexp: @@ -42,4 +42,4 @@ lbl_8039466C: /* 8039468C 003915EC C8 21 00 08 */ lfd f1, 8(r1) lbl_80394690: /* 80394690 003915F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80394694 003915F4 4E 80 00 20 */ blr +/* 80394694 003915F4 4E 80 00 20 */ blr diff --git a/asm/Runtime/s_ldexp.s b/asm/Runtime/s_ldexp.s index 80d88dd5..c867eb34 100644 --- a/asm/Runtime/s_ldexp.s +++ b/asm/Runtime/s_ldexp.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text, "ax" +.section .text, "ax" .global ldexp ldexp: @@ -133,4 +133,4 @@ lbl_8039484C: /* 8039484C 003917AC 80 01 00 24 */ lwz r0, 0x24(r1) /* 80394850 003917B0 7C 08 03 A6 */ mtlr r0 /* 80394854 003917B4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80394858 003917B8 4E 80 00 20 */ blr +/* 80394858 003917B8 4E 80 00 20 */ blr diff --git a/asm/Runtime/s_log.s b/asm/Runtime/s_log.s index 11ee4207..33d1a3df 100644 --- a/asm/Runtime/s_log.s +++ b/asm/Runtime/s_log.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text, "ax" +.section .text, "ax" .global log log: @@ -11,4 +11,4 @@ log: /* 80394CDC 00391C3C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80394CE0 00391C40 7C 08 03 A6 */ mtlr r0 /* 80394CE4 00391C44 38 21 00 10 */ addi r1, r1, 0x10 -/* 80394CE8 00391C48 4E 80 00 20 */ blr \ No newline at end of file +/* 80394CE8 00391C48 4E 80 00 20 */ blr diff --git a/asm/Runtime/s_modf.s b/asm/Runtime/s_modf.s index 3543c6c2..aef3435d 100644 --- a/asm/Runtime/s_modf.s +++ b/asm/Runtime/s_modf.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text, "ax" +.section .text, "ax" .global modf modf: @@ -72,4 +72,4 @@ lbl_8039493C: /* 8039494C 003918AC FC 21 00 28 */ fsub f1, f1, f0 lbl_80394950: /* 80394950 003918B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80394954 003918B4 4E 80 00 20 */ blr +/* 80394954 003918B4 4E 80 00 20 */ blr diff --git a/asm/Runtime/s_nextafter.s b/asm/Runtime/s_nextafter.s index 0aae013f..08779e73 100644 --- a/asm/Runtime/s_nextafter.s +++ b/asm/Runtime/s_nextafter.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text, "ax" +.section .text, "ax" .global nextafter nextafter: @@ -117,4 +117,4 @@ lbl_80394AC8: /* 80394AD0 00391A30 C8 21 00 08 */ lfd f1, 8(r1) lbl_80394AD4: /* 80394AD4 00391A34 38 21 00 20 */ addi r1, r1, 0x20 -/* 80394AD8 00391A38 4E 80 00 20 */ blr +/* 80394AD8 00391A38 4E 80 00 20 */ blr diff --git a/asm/Runtime/s_pow.s b/asm/Runtime/s_pow.s index 3223f3c4..5d80711c 100644 --- a/asm/Runtime/s_pow.s +++ b/asm/Runtime/s_pow.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text, "ax" +.section .text, "ax" .global pow pow: @@ -11,4 +11,4 @@ pow: /* 80394CFC 00391C5C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80394D00 00391C60 7C 08 03 A6 */ mtlr r0 /* 80394D04 00391C64 38 21 00 10 */ addi r1, r1, 0x10 -/* 80394D08 00391C68 4E 80 00 20 */ blr \ No newline at end of file +/* 80394D08 00391C68 4E 80 00 20 */ blr diff --git a/asm/Runtime/s_sin.s b/asm/Runtime/s_sin.s index 59518e28..cd798d7a 100644 --- a/asm/Runtime/s_sin.s +++ b/asm/Runtime/s_sin.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text, "ax" +.section .text, "ax" .global sin sin: @@ -65,4 +65,4 @@ lbl_80394BA4: /* 80394BA4 00391B04 80 01 00 24 */ lwz r0, 0x24(r1) /* 80394BA8 00391B08 7C 08 03 A6 */ mtlr r0 /* 80394BAC 00391B0C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80394BB0 00391B10 4E 80 00 20 */ blr +/* 80394BB0 00391B10 4E 80 00 20 */ blr diff --git a/asm/Runtime/s_tan.s b/asm/Runtime/s_tan.s index 9b14ad28..2cdb10a9 100644 --- a/asm/Runtime/s_tan.s +++ b/asm/Runtime/s_tan.s @@ -3,9 +3,12 @@ .section .sdata2 .global lbl_805AF208 lbl_805AF208: - .incbin "baserom.dol", 0x3FBAA8, 0x8 - -.section .text, "ax" + # ROM: 0x3FBAA8 + .4byte 0 + .4byte 0 + + +.section .text, "ax" .global tan tan: @@ -41,4 +44,4 @@ lbl_80394C1C: /* 80394C1C 00391B7C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80394C20 00391B80 7C 08 03 A6 */ mtlr r0 /* 80394C24 00391B84 38 21 00 20 */ addi r1, r1, 0x20 -/* 80394C28 00391B88 4E 80 00 20 */ blr +/* 80394C28 00391B88 4E 80 00 20 */ blr diff --git a/asm/Runtime/sdata.s b/asm/Runtime/sdata.s index 1e107f3b..c81019ea 100644 --- a/asm/Runtime/sdata.s +++ b/asm/Runtime/sdata.s @@ -3,32 +3,60 @@ # TODO: Split this .global lbl_805A8B88 lbl_805A8B88: - .incbin "baserom.dol", 0x3F6528, 0x8 + # ROM: 0x3F6528 + .4byte 0xFFFFFFFE + .4byte 0 + .global lbl_805A8B90 lbl_805A8B90: - .incbin "baserom.dol", 0x3F6530, 0x8 + # ROM: 0x3F6530 + .4byte 0 + .4byte 0 + .global lbl_805A8B98 lbl_805A8B98: - .incbin "baserom.dol", 0x3F6538, 0x8 + # ROM: 0x3F6538 + .4byte 0x00000001 + .4byte 0 + .global lbl_805A8BA0 lbl_805A8BA0: - .incbin "baserom.dol", 0x3F6540, 0x4 + # ROM: 0x3F6540 + .4byte 0x7FFFFFFF + .global lbl_805A8BA4 lbl_805A8BA4: - .incbin "baserom.dol", 0x3F6544, 0x4 + # ROM: 0x3F6544 + .4byte 0x7F800000 + .global lbl_805A8BA8 lbl_805A8BA8: - .incbin "baserom.dol", 0x3F6548, 0x8 + # ROM: 0x3F6548 + .4byte 0x00100000 + .4byte 0 + .global lbl_805A8BB0 lbl_805A8BB0: - .incbin "baserom.dol", 0x3F6550, 0x8 + # ROM: 0x3F6550 + .4byte 0x7FEFFFFF + .4byte 0xFFFFFFFF + .global lbl_805A8BB8 lbl_805A8BB8: - .incbin "baserom.dol", 0x3F6558, 0x8 + # ROM: 0x3F6558 + .4byte 0x7FF00000 + .4byte 0 + .global lbl_805A8BC0 lbl_805A8BC0: - .incbin "baserom.dol", 0x3F6560, 0x8 + # ROM: 0x3F6560 + .4byte 0x00100000 + .4byte 0 + .global lbl_805A8BC8 lbl_805A8BC8: - .incbin "baserom.dol", 0x3F6568, 0x8 + # ROM: 0x3F6568 + .4byte 0x7FEFFFFF + .4byte 0xFFFFFFFF + diff --git a/asm/Runtime/sdata2.s b/asm/Runtime/sdata2.s index 074b2f41..8b8649e9 100644 --- a/asm/Runtime/sdata2.s +++ b/asm/Runtime/sdata2.s @@ -3,547 +3,1091 @@ # TODO: Split this .global lbl_805AEC60 lbl_805AEC60: - .incbin "baserom.dol", 0x3FB500, 0x8 + # ROM: 0x3FB500 + .4byte 0 + .4byte 0 + .global lbl_805AEC68 lbl_805AEC68: - .incbin "baserom.dol", 0x3FB508, 0x8 + # ROM: 0x3FB508 + .4byte 0x3FF00000 + .4byte 0 + .global lbl_805AEC70 lbl_805AEC70: - .incbin "baserom.dol", 0x3FB510, 0x8 + # ROM: 0x3FB510 + .4byte 0xBFF00000 + .4byte 0 + .global lbl_805AEC78 lbl_805AEC78: - .incbin "baserom.dol", 0x3FB518, 0x8 + # ROM: 0x3FB518 + .4byte 0x40140000 + .4byte 0 + .global lbl_805AEC80 lbl_805AEC80: - .incbin "baserom.dol", 0x3FB520, 0x8 + # ROM: 0x3FB520 + .4byte 0x43300000 + .4byte 0 + .global lbl_805AEC88 lbl_805AEC88: - .incbin "baserom.dol", 0x3FB528, 0x8 + # ROM: 0x3FB528 + .4byte 0x43300000 + .4byte 0x80000000 + .global lbl_805AEC90 lbl_805AEC90: - .incbin "baserom.dol", 0x3FB530, 0x8 + # ROM: 0x3FB530 + .4byte 0x0000C0E0 + .4byte 0 + .global lbl_805AEC98 lbl_805AEC98: - .incbin "baserom.dol", 0x3FB538, 0x8 + # ROM: 0x3FB538 + .4byte 0 + .4byte 0 + .global lbl_805AECA0 lbl_805AECA0: - .incbin "baserom.dol", 0x3FB540, 0x4 + # ROM: 0x3FB540 + .4byte 0x4E414E28 + .global lbl_805AECA4 lbl_805AECA4: - .incbin "baserom.dol", 0x3FB544, 0x4 + # ROM: 0x3FB544 + .4byte 0 + .global lbl_805AECA8 lbl_805AECA8: - .incbin "baserom.dol", 0x3FB548, 0x8 + # ROM: 0x3FB548 + .4byte 0 + .4byte 0 + .global lbl_805AECB0 lbl_805AECB0: - .incbin "baserom.dol", 0x3FB550, 0x8 + # ROM: 0x3FB550 + .4byte 0 + .4byte 0 + .global lbl_805AECB8 lbl_805AECB8: - .incbin "baserom.dol", 0x3FB558, 0x8 + # ROM: 0x3FB558 + .4byte 0 + .4byte 0 + .global lbl_805AECC0 lbl_805AECC0: - .incbin "baserom.dol", 0x3FB560, 0x8 + # ROM: 0x3FB560 + .4byte 0x400921FB + .4byte 0x54442D18 + .global lbl_805AECC8 lbl_805AECC8: - .incbin "baserom.dol", 0x3FB568, 0x8 + # ROM: 0x3FB568 + .4byte 0x3FF921FB + .4byte 0x54442D18 + .global lbl_805AECD0 lbl_805AECD0: - .incbin "baserom.dol", 0x3FB570, 0x8 + # ROM: 0x3FB570 + .4byte 0x3C91A626 + .4byte 0x33145C07 + .global lbl_805AECD8 lbl_805AECD8: - .incbin "baserom.dol", 0x3FB578, 0x8 + # ROM: 0x3FB578 + .4byte 0x3FC55555 + .4byte 0x55555555 + .global lbl_805AECE0 lbl_805AECE0: - .incbin "baserom.dol", 0x3FB580, 0x8 + # ROM: 0x3FB580 + .4byte 0xBFD4D612 + .4byte 0x03EB6F7D + .global lbl_805AECE8 lbl_805AECE8: - .incbin "baserom.dol", 0x3FB588, 0x8 + # ROM: 0x3FB588 + .4byte 0x3FC9C155 + .4byte 0x0E884455 + .global lbl_805AECF0 lbl_805AECF0: - .incbin "baserom.dol", 0x3FB590, 0x8 + # ROM: 0x3FB590 + .4byte 0xBFA48228 + .4byte 0xB5688F3B + .global lbl_805AECF8 lbl_805AECF8: - .incbin "baserom.dol", 0x3FB598, 0x8 + # ROM: 0x3FB598 + .4byte 0x3F49EFE0 + .4byte 0x7501B288 + .global lbl_805AED00 lbl_805AED00: - .incbin "baserom.dol", 0x3FB5A0, 0x8 + # ROM: 0x3FB5A0 + .4byte 0x3F023DE1 + .4byte 0x0DFDF709 + .global lbl_805AED08 lbl_805AED08: - .incbin "baserom.dol", 0x3FB5A8, 0x8 + # ROM: 0x3FB5A8 + .4byte 0x3FF00000 + .4byte 0 + .global lbl_805AED10 lbl_805AED10: - .incbin "baserom.dol", 0x3FB5B0, 0x8 + # ROM: 0x3FB5B0 + .4byte 0xC0033A27 + .4byte 0x1C8A2D4B + .global lbl_805AED18 lbl_805AED18: - .incbin "baserom.dol", 0x3FB5B8, 0x8 + # ROM: 0x3FB5B8 + .4byte 0x40002AE5 + .4byte 0x9C598AC8 + .global lbl_805AED20 lbl_805AED20: - .incbin "baserom.dol", 0x3FB5C0, 0x8 + # ROM: 0x3FB5C0 + .4byte 0xBFE6066C + .4byte 0x1B8D0159 + .global lbl_805AED28 lbl_805AED28: - .incbin "baserom.dol", 0x3FB5C8, 0x8 + # ROM: 0x3FB5C8 + .4byte 0x3FB3B8C5 + .4byte 0xB12E9282 + .global lbl_805AED30 lbl_805AED30: - .incbin "baserom.dol", 0x3FB5D0, 0x8 + # ROM: 0x3FB5D0 + .4byte 0x3FE00000 + .4byte 0 + .global lbl_805AED38 lbl_805AED38: - .incbin "baserom.dol", 0x3FB5D8, 0x8 + # ROM: 0x3FB5D8 + .4byte 0x40080000 + .4byte 0 + .global lbl_805AED40 lbl_805AED40: - .incbin "baserom.dol", 0x3FB5E0, 0x8 + # ROM: 0x3FB5E0 + .4byte 0x40000000 + .4byte 0 + .global lbl_805AED48 lbl_805AED48: - .incbin "baserom.dol", 0x3FB5E8, 0x8 + # ROM: 0x3FB5E8 + .4byte 0x3FF921FB + .4byte 0x54442D18 + .global lbl_805AED50 lbl_805AED50: - .incbin "baserom.dol", 0x3FB5F0, 0x8 + # ROM: 0x3FB5F0 + .4byte 0x3C91A626 + .4byte 0x33145C07 + .global lbl_805AED58 lbl_805AED58: - .incbin "baserom.dol", 0x3FB5F8, 0x8 + # ROM: 0x3FB5F8 + .4byte 0x7E37E43C + .4byte 0x8800759C + .global lbl_805AED60 lbl_805AED60: - .incbin "baserom.dol", 0x3FB600, 0x8 + # ROM: 0x3FB600 + .4byte 0x3FF00000 + .4byte 0 + .global lbl_805AED68 lbl_805AED68: - .incbin "baserom.dol", 0x3FB608, 0x8 + # ROM: 0x3FB608 + .4byte 0x3FC55555 + .4byte 0x55555555 + .global lbl_805AED70 lbl_805AED70: - .incbin "baserom.dol", 0x3FB610, 0x8 + # ROM: 0x3FB610 + .4byte 0xBFD4D612 + .4byte 0x03EB6F7D + .global lbl_805AED78 lbl_805AED78: - .incbin "baserom.dol", 0x3FB618, 0x8 + # ROM: 0x3FB618 + .4byte 0x3FC9C155 + .4byte 0x0E884455 + .global lbl_805AED80 lbl_805AED80: - .incbin "baserom.dol", 0x3FB620, 0x8 + # ROM: 0x3FB620 + .4byte 0xBFA48228 + .4byte 0xB5688F3B + .global lbl_805AED88 lbl_805AED88: - .incbin "baserom.dol", 0x3FB628, 0x8 + # ROM: 0x3FB628 + .4byte 0x3F49EFE0 + .4byte 0x7501B288 + .global lbl_805AED90 lbl_805AED90: - .incbin "baserom.dol", 0x3FB630, 0x8 + # ROM: 0x3FB630 + .4byte 0x3F023DE1 + .4byte 0x0DFDF709 + .global lbl_805AED98 lbl_805AED98: - .incbin "baserom.dol", 0x3FB638, 0x8 + # ROM: 0x3FB638 + .4byte 0xC0033A27 + .4byte 0x1C8A2D4B + .global lbl_805AEDA0 lbl_805AEDA0: - .incbin "baserom.dol", 0x3FB640, 0x8 + # ROM: 0x3FB640 + .4byte 0x40002AE5 + .4byte 0x9C598AC8 + .global lbl_805AEDA8 lbl_805AEDA8: - .incbin "baserom.dol", 0x3FB648, 0x8 + # ROM: 0x3FB648 + .4byte 0xBFE6066C + .4byte 0x1B8D0159 + .global lbl_805AEDB0 lbl_805AEDB0: - .incbin "baserom.dol", 0x3FB650, 0x8 + # ROM: 0x3FB650 + .4byte 0x3FB3B8C5 + .4byte 0xB12E9282 + .global lbl_805AEDB8 lbl_805AEDB8: - .incbin "baserom.dol", 0x3FB658, 0x8 + # ROM: 0x3FB658 + .4byte 0x3FE00000 + .4byte 0 + .global lbl_805AEDC0 lbl_805AEDC0: - .incbin "baserom.dol", 0x3FB660, 0x8 + # ROM: 0x3FB660 + .4byte 0 + .4byte 0 + .global lbl_805AEDC8 lbl_805AEDC8: - .incbin "baserom.dol", 0x3FB668, 0x8 + # ROM: 0x3FB668 + .4byte 0x40080000 + .4byte 0 + .global lbl_805AEDD0 lbl_805AEDD0: - .incbin "baserom.dol", 0x3FB670, 0x8 + # ROM: 0x3FB670 + .4byte 0x40000000 + .4byte 0 + .global lbl_805AEDD8 lbl_805AEDD8: - .incbin "baserom.dol", 0x3FB678, 0x8 + # ROM: 0x3FB678 + .4byte 0x3FE921FB + .4byte 0x54442D18 + .global lbl_805AEDE0 lbl_805AEDE0: - .incbin "baserom.dol", 0x3FB680, 0x8 + # ROM: 0x3FB680 + .4byte 0x400921FB + .4byte 0x54442D18 + .global lbl_805AEDE8 lbl_805AEDE8: - .incbin "baserom.dol", 0x3FB688, 0x8 + # ROM: 0x3FB688 + .4byte 0xC00921FB + .4byte 0x54442D18 + .global lbl_805AEDF0 lbl_805AEDF0: - .incbin "baserom.dol", 0x3FB690, 0x8 + # ROM: 0x3FB690 + .4byte 0xBFF921FB + .4byte 0x54442D18 + .global lbl_805AEDF8 lbl_805AEDF8: - .incbin "baserom.dol", 0x3FB698, 0x8 + # ROM: 0x3FB698 + .4byte 0x3FF921FB + .4byte 0x54442D18 + .global lbl_805AEE00 lbl_805AEE00: - .incbin "baserom.dol", 0x3FB6A0, 0x8 + # ROM: 0x3FB6A0 + .4byte 0x3FE921FB + .4byte 0x54442D18 + .global lbl_805AEE08 lbl_805AEE08: - .incbin "baserom.dol", 0x3FB6A8, 0x8 + # ROM: 0x3FB6A8 + .4byte 0xBFE921FB + .4byte 0x54442D18 + .global lbl_805AEE10 lbl_805AEE10: - .incbin "baserom.dol", 0x3FB6B0, 0x8 + # ROM: 0x3FB6B0 + .4byte 0x4002D97C + .4byte 0x7F3321D2 + .global lbl_805AEE18 lbl_805AEE18: - .incbin "baserom.dol", 0x3FB6B8, 0x8 + # ROM: 0x3FB6B8 + .4byte 0xC002D97C + .4byte 0x7F3321D2 + .global lbl_805AEE20 lbl_805AEE20: - .incbin "baserom.dol", 0x3FB6C0, 0x8 + # ROM: 0x3FB6C0 + .4byte 0 + .4byte 0 + .global lbl_805AEE28 lbl_805AEE28: - .incbin "baserom.dol", 0x3FB6C8, 0x8 + # ROM: 0x3FB6C8 + .4byte 0x80000000 + .4byte 0 + .global lbl_805AEE30 lbl_805AEE30: - .incbin "baserom.dol", 0x3FB6D0, 0x8 + # ROM: 0x3FB6D0 + .4byte 0x3CA1A626 + .4byte 0x33145C07 + .global lbl_805AEE38 lbl_805AEE38: - .incbin "baserom.dol", 0x3FB6D8, 0x8 + # ROM: 0x3FB6D8 + .4byte 0 + .4byte 0 + .global lbl_805AEE40 lbl_805AEE40: - .incbin "baserom.dol", 0x3FB6E0, 0x8 + # ROM: 0x3FB6E0 + .4byte 0x40862E42 + .4byte 0xFEFA39EF + .global lbl_805AEE48 lbl_805AEE48: - .incbin "baserom.dol", 0x3FB6E8, 0x8 + # ROM: 0x3FB6E8 + .4byte 0x7FF00000 + .4byte 0 + .global lbl_805AEE50 lbl_805AEE50: - .incbin "baserom.dol", 0x3FB6F0, 0x8 + # ROM: 0x3FB6F0 + .4byte 0xC0874910 + .4byte 0xD52D3051 + .global lbl_805AEE58 lbl_805AEE58: - .incbin "baserom.dol", 0x3FB6F8, 0x8 + # ROM: 0x3FB6F8 + .4byte 0x3FF71547 + .4byte 0x652B82FE + .global lbl_805AEE60 lbl_805AEE60: - .incbin "baserom.dol", 0x3FB700, 0x8 + # ROM: 0x3FB700 + .4byte 0x7E37E43C + .4byte 0x8800759C + .global lbl_805AEE68 lbl_805AEE68: - .incbin "baserom.dol", 0x3FB708, 0x8 + # ROM: 0x3FB708 + .4byte 0x3FF00000 + .4byte 0 + .global lbl_805AEE70 lbl_805AEE70: - .incbin "baserom.dol", 0x3FB710, 0x8 + # ROM: 0x3FB710 + .4byte 0x3FC55555 + .4byte 0x5555553E + .global lbl_805AEE78 lbl_805AEE78: - .incbin "baserom.dol", 0x3FB718, 0x8 + # ROM: 0x3FB718 + .4byte 0xBF66C16C + .4byte 0x16BEBD93 + .global lbl_805AEE80 lbl_805AEE80: - .incbin "baserom.dol", 0x3FB720, 0x8 + # ROM: 0x3FB720 + .4byte 0x3F11566A + .4byte 0xAF25DE2C + .global lbl_805AEE88 lbl_805AEE88: - .incbin "baserom.dol", 0x3FB728, 0x8 + # ROM: 0x3FB728 + .4byte 0xBEBBBD41 + .4byte 0xC5D26BF1 + .global lbl_805AEE90 lbl_805AEE90: - .incbin "baserom.dol", 0x3FB730, 0x8 + # ROM: 0x3FB730 + .4byte 0x3E663769 + .4byte 0x72BEA4D0 + .global lbl_805AEE98 lbl_805AEE98: - .incbin "baserom.dol", 0x3FB738, 0x8 + # ROM: 0x3FB738 + .4byte 0x40000000 + .4byte 0 + .global lbl_805AEEA0 lbl_805AEEA0: - .incbin "baserom.dol", 0x3FB740, 0x8 + # ROM: 0x3FB740 + .4byte 0x01700000 + .4byte 0 + .global lbl_805AEEA8 lbl_805AEEA8: - .incbin "baserom.dol", 0x3FB748, 0x8 + # ROM: 0x3FB748 + .4byte 0x43300000 + .4byte 0x80000000 + .global lbl_805AEEB0 lbl_805AEEB0: - .incbin "baserom.dol", 0x3FB750, 0x8 + # ROM: 0x3FB750 + .4byte 0xC3500000 + .4byte 0 + .global lbl_805AEEB8 lbl_805AEEB8: - .incbin "baserom.dol", 0x3FB758, 0x8 + # ROM: 0x3FB758 + .4byte 0x43500000 + .4byte 0 + .global lbl_805AEEC0 lbl_805AEEC0: - .incbin "baserom.dol", 0x3FB760, 0x8 + # ROM: 0x3FB760 + .4byte 0x3FF00000 + .4byte 0 + .global lbl_805AEEC8 lbl_805AEEC8: - .incbin "baserom.dol", 0x3FB768, 0x8 + # ROM: 0x3FB768 + .4byte 0x3FE62E42 + .4byte 0xFEE00000 + .global lbl_805AEED0 lbl_805AEED0: - .incbin "baserom.dol", 0x3FB770, 0x8 + # ROM: 0x3FB770 + .4byte 0x3DEA39EF + .4byte 0x35793C76 + .global lbl_805AEED8 lbl_805AEED8: - .incbin "baserom.dol", 0x3FB778, 0x8 + # ROM: 0x3FB778 + .4byte 0x3FE00000 + .4byte 0 + .global lbl_805AEEE0 lbl_805AEEE0: - .incbin "baserom.dol", 0x3FB780, 0x8 + # ROM: 0x3FB780 + .4byte 0x3FD55555 + .4byte 0x55555555 + .global lbl_805AEEE8 lbl_805AEEE8: - .incbin "baserom.dol", 0x3FB788, 0x8 + # ROM: 0x3FB788 + .4byte 0x40000000 + .4byte 0 + .global lbl_805AEEF0 lbl_805AEEF0: - .incbin "baserom.dol", 0x3FB790, 0x8 + # ROM: 0x3FB790 + .4byte 0x3FE55555 + .4byte 0x55555593 + .global lbl_805AEEF8 lbl_805AEEF8: - .incbin "baserom.dol", 0x3FB798, 0x8 + # ROM: 0x3FB798 + .4byte 0x3FD24924 + .4byte 0x94229359 + .global lbl_805AEF00 lbl_805AEF00: - .incbin "baserom.dol", 0x3FB7A0, 0x8 + # ROM: 0x3FB7A0 + .4byte 0x3FC74664 + .4byte 0x96CB03DE + .global lbl_805AEF08 lbl_805AEF08: - .incbin "baserom.dol", 0x3FB7A8, 0x8 + # ROM: 0x3FB7A8 + .4byte 0x3FC2F112 + .4byte 0xDF3E5244 + .global lbl_805AEF10 lbl_805AEF10: - .incbin "baserom.dol", 0x3FB7B0, 0x8 + # ROM: 0x3FB7B0 + .4byte 0x3FD99999 + .4byte 0x9997FA04 + .global lbl_805AEF18 lbl_805AEF18: - .incbin "baserom.dol", 0x3FB7B8, 0x8 + # ROM: 0x3FB7B8 + .4byte 0x3FCC71C5 + .4byte 0x1D8E78AF + .global lbl_805AEF20 lbl_805AEF20: - .incbin "baserom.dol", 0x3FB7C0, 0x8 + # ROM: 0x3FB7C0 + .4byte 0x3FC39A09 + .4byte 0xD078C69F + .global lbl_805AEF28 lbl_805AEF28: - .incbin "baserom.dol", 0x3FB7C8, 0x8 + # ROM: 0x3FB7C8 + .4byte 0x43300000 + .4byte 0x80000000 + .global lbl_805AEF30 lbl_805AEF30: - .incbin "baserom.dol", 0x3FB7D0, 0x8 + # ROM: 0x3FB7D0 + .4byte 0x3FF00000 + .4byte 0 + .global lbl_805AEF38 lbl_805AEF38: - .incbin "baserom.dol", 0x3FB7D8, 0x8 + # ROM: 0x3FB7D8 + .4byte 0 + .4byte 0 + .global lbl_805AEF40 lbl_805AEF40: - .incbin "baserom.dol", 0x3FB7E0, 0x8 + # ROM: 0x3FB7E0 + .4byte 0x3FE00000 + .4byte 0 + .global lbl_805AEF48 lbl_805AEF48: - .incbin "baserom.dol", 0x3FB7E8, 0x8 + # ROM: 0x3FB7E8 + .4byte 0x40080000 + .4byte 0 + .global lbl_805AEF50 lbl_805AEF50: - .incbin "baserom.dol", 0x3FB7F0, 0x8 + # ROM: 0x3FB7F0 + .4byte 0x7FF00000 + .4byte 0 + .global lbl_805AEF58 lbl_805AEF58: - .incbin "baserom.dol", 0x3FB7F8, 0x8 + # ROM: 0x3FB7F8 + .4byte 0x3FD55555 + .4byte 0x55555555 + .global lbl_805AEF60 lbl_805AEF60: - .incbin "baserom.dol", 0x3FB800, 0x8 + # ROM: 0x3FB800 + .4byte 0x3FD00000 + .4byte 0 + .global lbl_805AEF68 lbl_805AEF68: - .incbin "baserom.dol", 0x3FB808, 0x8 + # ROM: 0x3FB808 + .4byte 0x3FF71547 + .4byte 0x60000000 + .global lbl_805AEF70 lbl_805AEF70: - .incbin "baserom.dol", 0x3FB810, 0x8 + # ROM: 0x3FB810 + .4byte 0x3E54AE0B + .4byte 0xF85DDF44 + .global lbl_805AEF78 lbl_805AEF78: - .incbin "baserom.dol", 0x3FB818, 0x8 + # ROM: 0x3FB818 + .4byte 0x3FF71547 + .4byte 0x652B82FE + .global lbl_805AEF80 lbl_805AEF80: - .incbin "baserom.dol", 0x3FB820, 0x8 + # ROM: 0x3FB820 + .4byte 0x43400000 + .4byte 0 + .global lbl_805AEF88 lbl_805AEF88: - .incbin "baserom.dol", 0x3FB828, 0x8 + # ROM: 0x3FB828 + .4byte 0x3FE33333 + .4byte 0x33333303 + .global lbl_805AEF90 lbl_805AEF90: - .incbin "baserom.dol", 0x3FB830, 0x8 + # ROM: 0x3FB830 + .4byte 0x3FDB6DB6 + .4byte 0xDB6FABFF + .global lbl_805AEF98 lbl_805AEF98: - .incbin "baserom.dol", 0x3FB838, 0x8 + # ROM: 0x3FB838 + .4byte 0x3FD55555 + .4byte 0x518F264D + .global lbl_805AEFA0 lbl_805AEFA0: - .incbin "baserom.dol", 0x3FB840, 0x8 + # ROM: 0x3FB840 + .4byte 0x3FD17460 + .4byte 0xA91D4101 + .global lbl_805AEFA8 lbl_805AEFA8: - .incbin "baserom.dol", 0x3FB848, 0x8 + # ROM: 0x3FB848 + .4byte 0x3FCD864A + .4byte 0x93C9DB65 + .global lbl_805AEFB0 lbl_805AEFB0: - .incbin "baserom.dol", 0x3FB850, 0x8 + # ROM: 0x3FB850 + .4byte 0x3FCA7E28 + .4byte 0x4A454EEF + .global lbl_805AEFB8 lbl_805AEFB8: - .incbin "baserom.dol", 0x3FB858, 0x8 + # ROM: 0x3FB858 + .4byte 0x3FEEC709 + .4byte 0xE0000000 + .global lbl_805AEFC0 lbl_805AEFC0: - .incbin "baserom.dol", 0x3FB860, 0x8 + # ROM: 0x3FB860 + .4byte 0xBE3E2FE0 + .4byte 0x145B01F5 + .global lbl_805AEFC8 lbl_805AEFC8: - .incbin "baserom.dol", 0x3FB868, 0x8 + # ROM: 0x3FB868 + .4byte 0x3FEEC709 + .4byte 0xDC3A03FD + .global lbl_805AEFD0 lbl_805AEFD0: - .incbin "baserom.dol", 0x3FB870, 0x8 + # ROM: 0x3FB870 + .4byte 0xBFF00000 + .4byte 0 + .global lbl_805AEFD8 lbl_805AEFD8: - .incbin "baserom.dol", 0x3FB878, 0x8 + # ROM: 0x3FB878 + .4byte 0x7E37E43C + .4byte 0x8800759C + .global lbl_805AEFE0 lbl_805AEFE0: - .incbin "baserom.dol", 0x3FB880, 0x8 + # ROM: 0x3FB880 + .4byte 0x3C971547 + .4byte 0x652B82FE + .global lbl_805AEFE8 lbl_805AEFE8: - .incbin "baserom.dol", 0x3FB888, 0x8 + # ROM: 0x3FB888 + .4byte 0x01A56E1F + .4byte 0xC2F8F359 + .global lbl_805AEFF0 lbl_805AEFF0: - .incbin "baserom.dol", 0x3FB890, 0x8 + # ROM: 0x3FB890 + .4byte 0x3FE62E43 + .4byte 0 + .global lbl_805AEFF8 lbl_805AEFF8: - .incbin "baserom.dol", 0x3FB898, 0x8 + # ROM: 0x3FB898 + .4byte 0x3FE62E42 + .4byte 0xFEFA39EF + .global lbl_805AF000 lbl_805AF000: - .incbin "baserom.dol", 0x3FB8A0, 0x8 + # ROM: 0x3FB8A0 + .4byte 0xBE205C61 + .4byte 0x0CA86C39 + .global lbl_805AF008 lbl_805AF008: - .incbin "baserom.dol", 0x3FB8A8, 0x8 + # ROM: 0x3FB8A8 + .4byte 0x3FC55555 + .4byte 0x5555553E + .global lbl_805AF010 lbl_805AF010: - .incbin "baserom.dol", 0x3FB8B0, 0x8 + # ROM: 0x3FB8B0 + .4byte 0xBF66C16C + .4byte 0x16BEBD93 + .global lbl_805AF018 lbl_805AF018: - .incbin "baserom.dol", 0x3FB8B8, 0x8 + # ROM: 0x3FB8B8 + .4byte 0x3F11566A + .4byte 0xAF25DE2C + .global lbl_805AF020 lbl_805AF020: - .incbin "baserom.dol", 0x3FB8C0, 0x8 + # ROM: 0x3FB8C0 + .4byte 0xBEBBBD41 + .4byte 0xC5D26BF1 + .global lbl_805AF028 lbl_805AF028: - .incbin "baserom.dol", 0x3FB8C8, 0x8 + # ROM: 0x3FB8C8 + .4byte 0x3E663769 + .4byte 0x72BEA4D0 + .global lbl_805AF030 lbl_805AF030: - .incbin "baserom.dol", 0x3FB8D0, 0x8 + # ROM: 0x3FB8D0 + .4byte 0x40000000 + .4byte 0 + .global lbl_805AF038 lbl_805AF038: - .incbin "baserom.dol", 0x3FB8D8, 0x8 + # ROM: 0x3FB8D8 + .4byte 0x43300000 + .4byte 0x80000000 + .global lbl_805AF040 lbl_805AF040: - .incbin "baserom.dol", 0x3FB8E0, 0x8 + # ROM: 0x3FB8E0 + .4byte 0 + .4byte 0 + .global lbl_805AF048 lbl_805AF048: - .incbin "baserom.dol", 0x3FB8E8, 0x8 + # ROM: 0x3FB8E8 + .4byte 0x3FF921FB + .4byte 0x54400000 + .global lbl_805AF050 lbl_805AF050: - .incbin "baserom.dol", 0x3FB8F0, 0x8 + # ROM: 0x3FB8F0 + .4byte 0x3DD0B461 + .4byte 0x1A626331 + .global lbl_805AF058 lbl_805AF058: - .incbin "baserom.dol", 0x3FB8F8, 0x8 + # ROM: 0x3FB8F8 + .4byte 0x3DD0B461 + .4byte 0x1A600000 + .global lbl_805AF060 lbl_805AF060: - .incbin "baserom.dol", 0x3FB900, 0x8 + # ROM: 0x3FB900 + .4byte 0x3BA3198A + .4byte 0x2E037073 + .global lbl_805AF068 lbl_805AF068: - .incbin "baserom.dol", 0x3FB908, 0x8 + # ROM: 0x3FB908 + .4byte 0x3FE00000 + .4byte 0 + .global lbl_805AF070 lbl_805AF070: - .incbin "baserom.dol", 0x3FB910, 0x8 + # ROM: 0x3FB910 + .4byte 0x3FE45F30 + .4byte 0x6DC9C883 + .global lbl_805AF078 lbl_805AF078: - .incbin "baserom.dol", 0x3FB918, 0x8 + # ROM: 0x3FB918 + .4byte 0x3BA3198A + .4byte 0x2E000000 + .global lbl_805AF080 lbl_805AF080: - .incbin "baserom.dol", 0x3FB920, 0x8 + # ROM: 0x3FB920 + .4byte 0x397B839A + .4byte 0x252049C1 + .global lbl_805AF088 lbl_805AF088: - .incbin "baserom.dol", 0x3FB928, 0x8 + # ROM: 0x3FB928 + .4byte 0x41700000 + .4byte 0 + .global lbl_805AF090 lbl_805AF090: - .incbin "baserom.dol", 0x3FB930, 0x8 + # ROM: 0x3FB930 + .4byte 0x43300000 + .4byte 0x80000000 + .global lbl_805AF098 lbl_805AF098: - .incbin "baserom.dol", 0x3FB938, 0x8 + # ROM: 0x3FB938 + .4byte 0x3FF00000 + .4byte 0 + .global lbl_805AF0A0 lbl_805AF0A0: - .incbin "baserom.dol", 0x3FB940, 0x8 + # ROM: 0x3FB940 + .4byte 0x3FA55555 + .4byte 0x5555554C + .global lbl_805AF0A8 lbl_805AF0A8: - .incbin "baserom.dol", 0x3FB948, 0x8 + # ROM: 0x3FB948 + .4byte 0xBF56C16C + .4byte 0x16C15177 + .global lbl_805AF0B0 lbl_805AF0B0: - .incbin "baserom.dol", 0x3FB950, 0x8 + # ROM: 0x3FB950 + .4byte 0x3EFA01A0 + .4byte 0x19CB1590 + .global lbl_805AF0B8 lbl_805AF0B8: - .incbin "baserom.dol", 0x3FB958, 0x8 + # ROM: 0x3FB958 + .4byte 0xBE927E4F + .4byte 0x809C52AD + .global lbl_805AF0C0 lbl_805AF0C0: - .incbin "baserom.dol", 0x3FB960, 0x8 + # ROM: 0x3FB960 + .4byte 0x3E21EE9E + .4byte 0xBDB4B1C4 + .global lbl_805AF0C8 lbl_805AF0C8: - .incbin "baserom.dol", 0x3FB968, 0x8 + # ROM: 0x3FB968 + .4byte 0xBDA8FAE9 + .4byte 0xBE8838D4 + .global lbl_805AF0D0 lbl_805AF0D0: - .incbin "baserom.dol", 0x3FB970, 0x8 + # ROM: 0x3FB970 + .4byte 0x3FE00000 + .4byte 0 + .global lbl_805AF0D8 lbl_805AF0D8: - .incbin "baserom.dol", 0x3FB978, 0x8 + # ROM: 0x3FB978 + .4byte 0x3FD20000 + .4byte 0 + .global lbl_805AF0E0 lbl_805AF0E0: - .incbin "baserom.dol", 0x3FB980, 0x8 + # ROM: 0x3FB980 + .4byte 0 + .4byte 0 + .global lbl_805AF0E8 lbl_805AF0E8: - .incbin "baserom.dol", 0x3FB988, 0x8 + # ROM: 0x3FB988 + .4byte 0x3E700000 + .4byte 0 + .global lbl_805AF0F0 lbl_805AF0F0: - .incbin "baserom.dol", 0x3FB990, 0x8 + # ROM: 0x3FB990 + .4byte 0x41700000 + .4byte 0 + .global lbl_805AF0F8 lbl_805AF0F8: - .incbin "baserom.dol", 0x3FB998, 0x8 + # ROM: 0x3FB998 + .4byte 0x40200000 + .4byte 0 + .global lbl_805AF100 lbl_805AF100: - .incbin "baserom.dol", 0x3FB9A0, 0x8 + # ROM: 0x3FB9A0 + .4byte 0x3FC00000 + .4byte 0 + .global lbl_805AF108 lbl_805AF108: - .incbin "baserom.dol", 0x3FB9A8, 0x8 + # ROM: 0x3FB9A8 + .4byte 0x3FE00000 + .4byte 0 + .global lbl_805AF110 lbl_805AF110: - .incbin "baserom.dol", 0x3FB9B0, 0x8 + # ROM: 0x3FB9B0 + .4byte 0x3FF00000 + .4byte 0 + .global lbl_805AF118 lbl_805AF118: - .incbin "baserom.dol", 0x3FB9B8, 0x8 + # ROM: 0x3FB9B8 + .4byte 0x43300000 + .4byte 0x80000000 + .global lbl_805AF120 lbl_805AF120: - .incbin "baserom.dol", 0x3FB9C0, 0x8 + # ROM: 0x3FB9C0 + .4byte 0x3F811111 + .4byte 0x1110F8A6 + .global lbl_805AF128 lbl_805AF128: - .incbin "baserom.dol", 0x3FB9C8, 0x8 + # ROM: 0x3FB9C8 + .4byte 0xBF2A01A0 + .4byte 0x19C161D5 + .global lbl_805AF130 lbl_805AF130: - .incbin "baserom.dol", 0x3FB9D0, 0x8 + # ROM: 0x3FB9D0 + .4byte 0x3EC71DE3 + .4byte 0x57B1FE7D + .global lbl_805AF138 lbl_805AF138: - .incbin "baserom.dol", 0x3FB9D8, 0x8 + # ROM: 0x3FB9D8 + .4byte 0xBE5AE5E6 + .4byte 0x8A2B9CEB + .global lbl_805AF140 lbl_805AF140: - .incbin "baserom.dol", 0x3FB9E0, 0x8 + # ROM: 0x3FB9E0 + .4byte 0x3DE5D93A + .4byte 0x5ACFD57C + .global lbl_805AF148 lbl_805AF148: - .incbin "baserom.dol", 0x3FB9E8, 0x8 + # ROM: 0x3FB9E8 + .4byte 0xBFC55555 + .4byte 0x55555549 + .global lbl_805AF150 lbl_805AF150: - .incbin "baserom.dol", 0x3FB9F0, 0x8 + # ROM: 0x3FB9F0 + .4byte 0x3FE00000 + .4byte 0 + .global lbl_805AF158 lbl_805AF158: - .incbin "baserom.dol", 0x3FB9F8, 0x8 + # ROM: 0x3FB9F8 + .4byte 0x3FF00000 + .4byte 0 + .global lbl_805AF160 lbl_805AF160: - .incbin "baserom.dol", 0x3FBA00, 0x8 + # ROM: 0x3FBA00 + .4byte 0xBFF00000 + .4byte 0 + .global lbl_805AF168 lbl_805AF168: - .incbin "baserom.dol", 0x3FBA08, 0x8 + # ROM: 0x3FBA08 + .4byte 0x3FE921FB + .4byte 0x54442D18 + .global lbl_805AF170 lbl_805AF170: - .incbin "baserom.dol", 0x3FBA10, 0x8 + # ROM: 0x3FBA10 + .4byte 0x3C81A626 + .4byte 0x33145C07 + .global lbl_805AF178 lbl_805AF178: - .incbin "baserom.dol", 0x3FBA18, 0x8 + # ROM: 0x3FBA18 + .4byte 0 + .4byte 0 + .global lbl_805AF180 lbl_805AF180: - .incbin "baserom.dol", 0x3FBA20, 0x8 + # ROM: 0x3FBA20 + .4byte 0x40000000 + .4byte 0 + .global lbl_805AF188 lbl_805AF188: - .incbin "baserom.dol", 0x3FBA28, 0x8 + # ROM: 0x3FBA28 + .4byte 0x43300000 + .4byte 0x80000000 + .global lbl_805AF190 lbl_805AF190: - .incbin "baserom.dol", 0x3FBA30, 0x8 + # ROM: 0x3FBA30 + .4byte 0x7E37E43C + .4byte 0x8800759C + .global lbl_805AF198 lbl_805AF198: - .incbin "baserom.dol", 0x3FBA38, 0x8 + # ROM: 0x3FBA38 + .4byte 0x3FF00000 + .4byte 0 + .global lbl_805AF1A0 lbl_805AF1A0: - .incbin "baserom.dol", 0x3FBA40, 0x8 + # ROM: 0x3FBA40 + .4byte 0x40000000 + .4byte 0 + .global lbl_805AF1A8 lbl_805AF1A8: - .incbin "baserom.dol", 0x3FBA48, 0x8 + # ROM: 0x3FBA48 + .4byte 0x3FF80000 + .4byte 0 + .global lbl_805AF1B0 lbl_805AF1B0: - .incbin "baserom.dol", 0x3FBA50, 0x8 + # ROM: 0x3FBA50 + .4byte 0xBFF00000 + .4byte 0 + .global lbl_805AF1B8 lbl_805AF1B8: - .incbin "baserom.dol", 0x3FBA58, 0x8 + # ROM: 0x3FBA58 + .4byte 0 + .4byte 0 + .global lbl_805AF1C0 lbl_805AF1C0: - .incbin "baserom.dol", 0x3FBA60, 0x8 + # ROM: 0x3FBA60 + .4byte 0x7E37E43C + .4byte 0x8800759C + .global lbl_805AF1C8 lbl_805AF1C8: - .incbin "baserom.dol", 0x3FBA68, 0x8 + # ROM: 0x3FBA68 + .4byte 0 + .4byte 0 + .global lbl_805AF1D0 lbl_805AF1D0: - .incbin "baserom.dol", 0x3FBA70, 0x8 + # ROM: 0x3FBA70 + .4byte 0x43500000 + .4byte 0 + .global lbl_805AF1D8 lbl_805AF1D8: - .incbin "baserom.dol", 0x3FBA78, 0x8 + # ROM: 0x3FBA78 + .4byte 0 + .4byte 0 + .global lbl_805AF1E0 lbl_805AF1E0: - .incbin "baserom.dol", 0x3FBA80, 0x8 + # ROM: 0x3FBA80 + .4byte 0x43500000 + .4byte 0 + .global lbl_805AF1E8 lbl_805AF1E8: - .incbin "baserom.dol", 0x3FBA88, 0x8 + # ROM: 0x3FBA88 + .4byte 0x01A56E1F + .4byte 0xC2F8F359 + .global lbl_805AF1F0 lbl_805AF1F0: - .incbin "baserom.dol", 0x3FBA90, 0x8 + # ROM: 0x3FBA90 + .4byte 0x7E37E43C + .4byte 0x8800759C + .global lbl_805AF1F8 lbl_805AF1F8: - .incbin "baserom.dol", 0x3FBA98, 0x8 + # ROM: 0x3FBA98 + .4byte 0x3C900000 + .4byte 0 + .global lbl_805AF200 lbl_805AF200: - .incbin "baserom.dol", 0x3FBAA0, 0x8 + # ROM: 0x3FBAA0 + .4byte 0 + .4byte 0 + diff --git a/asm/Runtime/sscanf.s b/asm/Runtime/sscanf.s index 93f80c25..bcbcae65 100644 --- a/asm/Runtime/sscanf.s +++ b/asm/Runtime/sscanf.s @@ -23,11 +23,11 @@ lbl_8038FEC4: /* 8038FED4 0038CE34 38 00 00 01 */ li r0, 1 /* 8038FED8 0038CE38 38 60 FF FF */ li r3, -1 /* 8038FEDC 0038CE3C 90 06 00 04 */ stw r0, 4(r6) -/* 8038FEE0 0038CE40 4E 80 00 20 */ blr +/* 8038FEE0 0038CE40 4E 80 00 20 */ blr lbl_8038FEE4: /* 8038FEE4 0038CE44 38 04 00 01 */ addi r0, r4, 1 /* 8038FEE8 0038CE48 90 06 00 00 */ stw r0, 0(r6) -/* 8038FEEC 0038CE4C 4E 80 00 20 */ blr +/* 8038FEEC 0038CE4C 4E 80 00 20 */ blr lbl_8038FEF0: /* 8038FEF0 0038CE50 80 06 00 04 */ lwz r0, 4(r6) /* 8038FEF4 0038CE54 2C 00 00 00 */ cmpwi r0, 0 @@ -41,10 +41,10 @@ lbl_8038FF0C: /* 8038FF10 0038CE70 90 06 00 04 */ stw r0, 4(r6) lbl_8038FF14: /* 8038FF14 0038CE74 7C 83 23 78 */ mr r3, r4 -/* 8038FF18 0038CE78 4E 80 00 20 */ blr +/* 8038FF18 0038CE78 4E 80 00 20 */ blr lbl_8038FF1C: /* 8038FF1C 0038CE7C 80 66 00 04 */ lwz r3, 4(r6) -/* 8038FF20 0038CE80 4E 80 00 20 */ blr +/* 8038FF20 0038CE80 4E 80 00 20 */ blr lbl_8038FF24: /* 8038FF24 0038CE84 38 60 00 00 */ li r3, 0 -/* 8038FF28 0038CE88 4E 80 00 20 */ blr +/* 8038FF28 0038CE88 4E 80 00 20 */ blr diff --git a/asm/Runtime/string.s b/asm/Runtime/string.s index 8acffcd0..864d3bb2 100644 --- a/asm/Runtime/string.s +++ b/asm/Runtime/string.s @@ -9,15 +9,15 @@ strchr: /* 8038FF34 0038CE94 48 00 00 0C */ b lbl_8038FF40 lbl_8038FF38: /* 8038FF38 0038CE98 7C 04 00 40 */ cmplw r4, r0 -/* 8038FF3C 0038CE9C 4D 82 00 20 */ beqlr +/* 8038FF3C 0038CE9C 4D 82 00 20 */ beqlr lbl_8038FF40: /* 8038FF40 0038CEA0 8C 83 00 01 */ lbzu r4, 1(r3) /* 8038FF44 0038CEA4 28 04 00 00 */ cmplwi r4, 0 /* 8038FF48 0038CEA8 40 82 FF F0 */ bne lbl_8038FF38 /* 8038FF4C 0038CEAC 28 00 00 00 */ cmplwi r0, 0 -/* 8038FF50 0038CEB0 4D 82 00 20 */ beqlr +/* 8038FF50 0038CEB0 4D 82 00 20 */ beqlr /* 8038FF54 0038CEB4 38 60 00 00 */ li r3, 0 -/* 8038FF58 0038CEB8 4E 80 00 20 */ blr +/* 8038FF58 0038CEB8 4E 80 00 20 */ blr .global strncmp strncmp: @@ -31,7 +31,7 @@ lbl_8038FF6C: /* 8038FF74 0038CED4 7C 00 28 40 */ cmplw r0, r5 /* 8038FF78 0038CED8 41 82 00 0C */ beq lbl_8038FF84 /* 8038FF7C 0038CEDC 7C 65 00 50 */ subf r3, r5, r0 -/* 8038FF80 0038CEE0 4E 80 00 20 */ blr +/* 8038FF80 0038CEE0 4E 80 00 20 */ blr lbl_8038FF84: /* 8038FF84 0038CEE4 28 00 00 00 */ cmplwi r0, 0 /* 8038FF88 0038CEE8 41 82 00 0C */ beq lbl_8038FF94 @@ -40,7 +40,7 @@ lbl_8038FF8C: /* 8038FF90 0038CEF0 40 82 FF DC */ bne lbl_8038FF6C lbl_8038FF94: /* 8038FF94 0038CEF4 38 60 00 00 */ li r3, 0 -/* 8038FF98 0038CEF8 4E 80 00 20 */ blr +/* 8038FF98 0038CEF8 4E 80 00 20 */ blr .global strcmp strcmp: @@ -49,7 +49,7 @@ strcmp: /* 8038FFA4 0038CF04 7C 00 28 51 */ subf. r0, r0, r5 /* 8038FFA8 0038CF08 41 82 00 0C */ beq lbl_8038FFB4 /* 8038FFAC 0038CF0C 7C 03 03 78 */ mr r3, r0 -/* 8038FFB0 0038CF10 4E 80 00 20 */ blr +/* 8038FFB0 0038CF10 4E 80 00 20 */ blr lbl_8038FFB4: /* 8038FFB4 0038CF14 54 80 07 BE */ clrlwi r0, r4, 0x1e /* 8038FFB8 0038CF18 54 66 07 BE */ clrlwi r6, r3, 0x1e @@ -60,7 +60,7 @@ lbl_8038FFB4: /* 8038FFCC 0038CF2C 28 05 00 00 */ cmplwi r5, 0 /* 8038FFD0 0038CF30 40 82 00 0C */ bne lbl_8038FFDC /* 8038FFD4 0038CF34 38 60 00 00 */ li r3, 0 -/* 8038FFD8 0038CF38 4E 80 00 20 */ blr +/* 8038FFD8 0038CF38 4E 80 00 20 */ blr lbl_8038FFDC: /* 8038FFDC 0038CF3C 20 06 00 03 */ subfic r0, r6, 3 /* 8038FFE0 0038CF40 7C 09 03 A6 */ mtctr r0 @@ -72,12 +72,12 @@ lbl_8038FFEC: /* 8038FFF4 0038CF54 7C 00 28 51 */ subf. r0, r0, r5 /* 8038FFF8 0038CF58 41 82 00 0C */ beq lbl_80390004 /* 8038FFFC 0038CF5C 7C 03 03 78 */ mr r3, r0 -/* 80390000 0038CF60 4E 80 00 20 */ blr +/* 80390000 0038CF60 4E 80 00 20 */ blr lbl_80390004: /* 80390004 0038CF64 28 05 00 00 */ cmplwi r5, 0 /* 80390008 0038CF68 40 82 00 0C */ bne lbl_80390014 /* 8039000C 0038CF6C 38 60 00 00 */ li r3, 0 -/* 80390010 0038CF70 4E 80 00 20 */ blr +/* 80390010 0038CF70 4E 80 00 20 */ blr lbl_80390014: /* 80390014 0038CF74 42 00 FF D8 */ bdnz lbl_8038FFEC lbl_80390018: @@ -104,33 +104,33 @@ lbl_8039005C: /* 8039005C 0038CFBC 7C 07 40 40 */ cmplw r7, r8 /* 80390060 0038CFC0 41 82 FF E4 */ beq lbl_80390044 /* 80390064 0038CFC4 38 60 FF FF */ li r3, -1 -/* 80390068 0038CFC8 4C 81 00 20 */ blelr +/* 80390068 0038CFC8 4C 81 00 20 */ blelr /* 8039006C 0038CFCC 38 60 00 01 */ li r3, 1 -/* 80390070 0038CFD0 4E 80 00 20 */ blr +/* 80390070 0038CFD0 4E 80 00 20 */ blr lbl_80390074: /* 80390074 0038CFD4 88 A3 00 00 */ lbz r5, 0(r3) /* 80390078 0038CFD8 88 04 00 00 */ lbz r0, 0(r4) /* 8039007C 0038CFDC 7C 00 28 51 */ subf. r0, r0, r5 /* 80390080 0038CFE0 41 82 00 0C */ beq lbl_8039008C /* 80390084 0038CFE4 7C 03 03 78 */ mr r3, r0 -/* 80390088 0038CFE8 4E 80 00 20 */ blr +/* 80390088 0038CFE8 4E 80 00 20 */ blr lbl_8039008C: /* 8039008C 0038CFEC 28 05 00 00 */ cmplwi r5, 0 /* 80390090 0038CFF0 40 82 00 0C */ bne lbl_8039009C /* 80390094 0038CFF4 38 60 00 00 */ li r3, 0 -/* 80390098 0038CFF8 4E 80 00 20 */ blr +/* 80390098 0038CFF8 4E 80 00 20 */ blr lbl_8039009C: /* 8039009C 0038CFFC 8C A3 00 01 */ lbzu r5, 1(r3) /* 803900A0 0038D000 8C 04 00 01 */ lbzu r0, 1(r4) /* 803900A4 0038D004 7C 00 28 51 */ subf. r0, r0, r5 /* 803900A8 0038D008 41 82 00 0C */ beq lbl_803900B4 /* 803900AC 0038D00C 7C 03 03 78 */ mr r3, r0 -/* 803900B0 0038D010 4E 80 00 20 */ blr +/* 803900B0 0038D010 4E 80 00 20 */ blr lbl_803900B4: /* 803900B4 0038D014 28 05 00 00 */ cmplwi r5, 0 /* 803900B8 0038D018 40 82 FF E4 */ bne lbl_8039009C /* 803900BC 0038D01C 38 60 00 00 */ li r3, 0 -/* 803900C0 0038D020 4E 80 00 20 */ blr +/* 803900C0 0038D020 4E 80 00 20 */ blr .global strncpy strncpy: @@ -150,11 +150,11 @@ lbl_803900EC: lbl_803900F0: /* 803900F0 0038D050 34 A5 FF FF */ addic. r5, r5, -1 /* 803900F4 0038D054 40 82 FF F8 */ bne lbl_803900EC -/* 803900F8 0038D058 4E 80 00 20 */ blr +/* 803900F8 0038D058 4E 80 00 20 */ blr lbl_803900FC: /* 803900FC 0038D05C 34 A5 FF FF */ addic. r5, r5, -1 /* 80390100 0038D060 40 82 FF D4 */ bne lbl_803900D4 -/* 80390104 0038D064 4E 80 00 20 */ blr +/* 80390104 0038D064 4E 80 00 20 */ blr .global strcpy strcpy: @@ -168,7 +168,7 @@ strcpy: /* 80390124 0038D084 88 04 00 00 */ lbz r0, 0(r4) /* 80390128 0038D088 28 00 00 00 */ cmplwi r0, 0 /* 8039012C 0038D08C 98 07 00 00 */ stb r0, 0(r7) -/* 80390130 0038D090 4D 82 00 20 */ beqlr +/* 80390130 0038D090 4D 82 00 20 */ beqlr /* 80390134 0038D094 20 05 00 03 */ subfic r0, r5, 3 /* 80390138 0038D098 7C 09 03 A6 */ mtctr r0 /* 8039013C 0038D09C 28 00 00 00 */ cmplwi r0, 0 @@ -177,7 +177,7 @@ lbl_80390144: /* 80390144 0038D0A4 8C 04 00 01 */ lbzu r0, 1(r4) /* 80390148 0038D0A8 28 00 00 00 */ cmplwi r0, 0 /* 8039014C 0038D0AC 9C 07 00 01 */ stbu r0, 1(r7) -/* 80390150 0038D0B0 4D 82 00 20 */ beqlr +/* 80390150 0038D0B0 4D 82 00 20 */ beqlr /* 80390154 0038D0B4 42 00 FF F0 */ bdnz lbl_80390144 lbl_80390158: /* 80390158 0038D0B8 38 E7 00 01 */ addi r7, r7, 1 @@ -203,13 +203,13 @@ lbl_8039019C: /* 8039019C 0038D0FC 88 04 00 00 */ lbz r0, 0(r4) /* 803901A0 0038D100 28 00 00 00 */ cmplwi r0, 0 /* 803901A4 0038D104 98 07 00 00 */ stb r0, 0(r7) -/* 803901A8 0038D108 4D 82 00 20 */ beqlr +/* 803901A8 0038D108 4D 82 00 20 */ beqlr lbl_803901AC: /* 803901AC 0038D10C 8C 04 00 01 */ lbzu r0, 1(r4) /* 803901B0 0038D110 28 00 00 00 */ cmplwi r0, 0 /* 803901B4 0038D114 9C 07 00 01 */ stbu r0, 1(r7) /* 803901B8 0038D118 40 82 FF F4 */ bne lbl_803901AC -/* 803901BC 0038D11C 4E 80 00 20 */ blr +/* 803901BC 0038D11C 4E 80 00 20 */ blr .global strlen strlen: @@ -220,4 +220,4 @@ lbl_803901C8: /* 803901CC 0038D12C 38 63 00 01 */ addi r3, r3, 1 /* 803901D0 0038D130 28 00 00 00 */ cmplwi r0, 0 /* 803901D4 0038D134 40 82 FF F4 */ bne lbl_803901C8 -/* 803901D8 0038D138 4E 80 00 20 */ blr +/* 803901D8 0038D138 4E 80 00 20 */ blr diff --git a/asm/Runtime/strtold.s b/asm/Runtime/strtold.s index 67032f50..43e752ac 100644 --- a/asm/Runtime/strtold.s +++ b/asm/Runtime/strtold.s @@ -3,12 +3,27 @@ .section .rodata .global lbl_803D86E8 lbl_803D86E8: - .incbin "baserom.dol", 0x3D56E8, 0x2C - + # ROM: 0x3D56E8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + + .global lbl_803D8714 lbl_803D8714: - .incbin "baserom.dol", 0x3D5714, 0xC - + # ROM: 0x3D5714 + .asciz "INFINITY" + .balign 4 + + .section .text, "ax" .global atof @@ -49,7 +64,7 @@ lbl_80390258: /* 80390258 0038D1B8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8039025C 0038D1BC 7C 08 03 A6 */ mtlr r0 /* 80390260 0038D1C0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80390264 0038D1C4 4E 80 00 20 */ blr +/* 80390264 0038D1C4 4E 80 00 20 */ blr .global __strtold __strtold: @@ -114,7 +129,7 @@ __strtold: /* 80390350 0038D2B0 90 12 00 00 */ stw r0, 0(r18) /* 80390354 0038D2B4 7D 89 03 A6 */ mtctr r12 /* 80390358 0038D2B8 3B C0 00 01 */ li r30, 1 -/* 8039035C 0038D2BC 4E 80 04 21 */ bctrl +/* 8039035C 0038D2BC 4E 80 04 21 */ bctrl /* 80390360 0038D2C0 7C 64 1B 78 */ mr r4, r3 /* 80390364 0038D2C4 48 00 0C 48 */ b lbl_80390FAC lbl_80390368: @@ -181,7 +196,7 @@ lbl_8039041C: /* 8039043C 0038D39C 38 80 00 00 */ li r4, 0 /* 80390440 0038D3A0 38 A0 00 00 */ li r5, 0 /* 80390444 0038D3A4 7D 89 03 A6 */ mtctr r12 -/* 80390448 0038D3A8 4E 80 04 21 */ bctrl +/* 80390448 0038D3A8 4E 80 04 21 */ bctrl /* 8039044C 0038D3AC 7C 64 1B 78 */ mr r4, r3 /* 80390450 0038D3B0 3B BD 00 01 */ addi r29, r29, 1 /* 80390454 0038D3B4 48 00 0B 58 */ b lbl_80390FAC @@ -221,7 +236,7 @@ lbl_803904B4: /* 803904C0 0038D420 38 A0 00 00 */ li r5, 0 /* 803904C4 0038D424 7D 89 03 A6 */ mtctr r12 /* 803904C8 0038D428 3B DE 00 01 */ addi r30, r30, 1 -/* 803904CC 0038D42C 4E 80 04 21 */ bctrl +/* 803904CC 0038D42C 4E 80 04 21 */ bctrl /* 803904D0 0038D430 38 00 00 01 */ li r0, 1 /* 803904D4 0038D434 7C 64 1B 78 */ mr r4, r3 /* 803904D8 0038D438 90 01 00 5C */ stw r0, 0x5c(r1) @@ -233,7 +248,7 @@ lbl_803904E0: /* 803904EC 0038D44C 38 A0 00 00 */ li r5, 0 /* 803904F0 0038D450 7D 89 03 A6 */ mtctr r12 /* 803904F4 0038D454 3B DE 00 01 */ addi r30, r30, 1 -/* 803904F8 0038D458 4E 80 04 21 */ bctrl +/* 803904F8 0038D458 4E 80 04 21 */ bctrl /* 803904FC 0038D45C 39 E0 40 00 */ li r15, 0x4000 /* 80390500 0038D460 7C 64 1B 78 */ mr r4, r3 /* 80390504 0038D464 48 00 0A A8 */ b lbl_80390FAC @@ -244,7 +259,7 @@ lbl_80390508: /* 80390514 0038D474 38 A0 00 00 */ li r5, 0 /* 80390518 0038D478 7D 89 03 A6 */ mtctr r12 /* 8039051C 0038D47C 3B DE 00 01 */ addi r30, r30, 1 -/* 80390520 0038D480 4E 80 04 21 */ bctrl +/* 80390520 0038D480 4E 80 04 21 */ bctrl /* 80390524 0038D484 39 E0 20 00 */ li r15, 0x2000 /* 80390528 0038D488 7C 64 1B 78 */ mr r4, r3 /* 8039052C 0038D48C 48 00 0A 80 */ b lbl_80390FAC @@ -272,7 +287,7 @@ lbl_80390564: /* 80390578 0038D4D8 39 EF 00 01 */ addi r15, r15, 1 /* 8039057C 0038D4DC 3A 73 00 01 */ addi r19, r19, 1 /* 80390580 0038D4E0 3B DE 00 01 */ addi r30, r30, 1 -/* 80390584 0038D4E4 4E 80 04 21 */ bctrl +/* 80390584 0038D4E4 4E 80 04 21 */ bctrl /* 80390588 0038D4E8 7C 64 1B 78 */ mr r4, r3 lbl_8039058C: /* 8039058C 0038D4EC 2C 13 00 08 */ cmpwi r19, 8 @@ -335,7 +350,7 @@ lbl_80390638: /* 8039064C 0038D5AC 39 EF 00 01 */ addi r15, r15, 1 /* 80390650 0038D5B0 3A 94 00 01 */ addi r20, r20, 1 /* 80390654 0038D5B4 3B DE 00 01 */ addi r30, r30, 1 -/* 80390658 0038D5B8 4E 80 04 21 */ bctrl +/* 80390658 0038D5B8 4E 80 04 21 */ bctrl /* 8039065C 0038D5BC 7C 64 1B 78 */ mr r4, r3 lbl_80390660: /* 80390660 0038D5C0 2C 14 00 04 */ cmpwi r20, 4 @@ -373,7 +388,7 @@ lbl_803906BC: /* 803906CC 0038D62C 7D 89 03 A6 */ mtctr r12 /* 803906D0 0038D630 3A 73 00 01 */ addi r19, r19, 1 /* 803906D4 0038D634 3B DE 00 01 */ addi r30, r30, 1 -/* 803906D8 0038D638 4E 80 04 21 */ bctrl +/* 803906D8 0038D638 4E 80 04 21 */ bctrl /* 803906DC 0038D63C 7C 64 1B 78 */ mr r4, r3 lbl_803906E0: /* 803906E0 0038D640 2C 13 00 20 */ cmpwi r19, 0x20 @@ -423,7 +438,7 @@ lbl_8039075C: /* 80390774 0038D6D4 38 A0 00 00 */ li r5, 0 /* 80390778 0038D6D8 7D 89 03 A6 */ mtctr r12 /* 8039077C 0038D6DC 3B DE 00 01 */ addi r30, r30, 1 -/* 80390780 0038D6E0 4E 80 04 21 */ bctrl +/* 80390780 0038D6E0 4E 80 04 21 */ bctrl /* 80390784 0038D6E4 7C 64 1B 78 */ mr r4, r3 /* 80390788 0038D6E8 48 00 08 24 */ b lbl_80390FAC lbl_8039078C: @@ -444,7 +459,7 @@ lbl_803907AC: /* 803907C0 0038D720 38 A0 00 00 */ li r5, 0 /* 803907C4 0038D724 7D 89 03 A6 */ mtctr r12 /* 803907C8 0038D728 3B DE 00 01 */ addi r30, r30, 1 -/* 803907CC 0038D72C 4E 80 04 21 */ bctrl +/* 803907CC 0038D72C 4E 80 04 21 */ bctrl /* 803907D0 0038D730 2C 03 FF FF */ cmpwi r3, -1 /* 803907D4 0038D734 7C 64 1B 78 */ mr r4, r3 /* 803907D8 0038D738 40 82 00 0C */ bne lbl_803907E4 @@ -477,7 +492,7 @@ lbl_8039081C: /* 80390830 0038D790 38 A0 00 00 */ li r5, 0 /* 80390834 0038D794 7D 89 03 A6 */ mtctr r12 /* 80390838 0038D798 3B DE 00 01 */ addi r30, r30, 1 -/* 8039083C 0038D79C 4E 80 04 21 */ bctrl +/* 8039083C 0038D79C 4E 80 04 21 */ bctrl /* 80390840 0038D7A0 7C 64 1B 78 */ mr r4, r3 /* 80390844 0038D7A4 48 00 07 68 */ b lbl_80390FAC lbl_80390848: @@ -499,7 +514,7 @@ lbl_80390850: /* 80390880 0038D7E0 38 A0 00 00 */ li r5, 0 /* 80390884 0038D7E4 7D 89 03 A6 */ mtctr r12 /* 80390888 0038D7E8 3B DE 00 01 */ addi r30, r30, 1 -/* 8039088C 0038D7EC 4E 80 04 21 */ bctrl +/* 8039088C 0038D7EC 4E 80 04 21 */ bctrl /* 80390890 0038D7F0 7C 64 1B 78 */ mr r4, r3 /* 80390894 0038D7F4 48 00 07 18 */ b lbl_80390FAC lbl_80390898: @@ -524,7 +539,7 @@ lbl_803908C8: /* 803908D4 0038D834 38 A0 00 00 */ li r5, 0 /* 803908D8 0038D838 7D 89 03 A6 */ mtctr r12 /* 803908DC 0038D83C 3B DE 00 01 */ addi r30, r30, 1 -/* 803908E0 0038D840 4E 80 04 21 */ bctrl +/* 803908E0 0038D840 4E 80 04 21 */ bctrl /* 803908E4 0038D844 7C 64 1B 78 */ mr r4, r3 /* 803908E8 0038D848 48 00 06 C4 */ b lbl_80390FAC lbl_803908EC: @@ -572,7 +587,7 @@ lbl_8039096C: /* 80390978 0038D8D8 38 A0 00 00 */ li r5, 0 /* 8039097C 0038D8DC 7D 89 03 A6 */ mtctr r12 /* 80390980 0038D8E0 3B DE 00 01 */ addi r30, r30, 1 -/* 80390984 0038D8E4 4E 80 04 21 */ bctrl +/* 80390984 0038D8E4 4E 80 04 21 */ bctrl /* 80390988 0038D8E8 7C 64 1B 78 */ mr r4, r3 /* 8039098C 0038D8EC 48 00 06 20 */ b lbl_80390FAC lbl_80390990: @@ -595,7 +610,7 @@ lbl_803909B0: /* 803909C8 0038D928 38 A0 00 00 */ li r5, 0 /* 803909CC 0038D92C 7D 89 03 A6 */ mtctr r12 /* 803909D0 0038D930 3B DE 00 01 */ addi r30, r30, 1 -/* 803909D4 0038D934 4E 80 04 21 */ bctrl +/* 803909D4 0038D934 4E 80 04 21 */ bctrl /* 803909D8 0038D938 7C 64 1B 78 */ mr r4, r3 /* 803909DC 0038D93C 48 00 05 D0 */ b lbl_80390FAC lbl_803909E0: @@ -610,7 +625,7 @@ lbl_803909E8: /* 803909FC 0038D95C 38 A0 00 00 */ li r5, 0 /* 80390A00 0038D960 7D 89 03 A6 */ mtctr r12 /* 80390A04 0038D964 3B DE 00 01 */ addi r30, r30, 1 -/* 80390A08 0038D968 4E 80 04 21 */ bctrl +/* 80390A08 0038D968 4E 80 04 21 */ bctrl /* 80390A0C 0038D96C 7C 64 1B 78 */ mr r4, r3 /* 80390A10 0038D970 48 00 00 34 */ b lbl_80390A44 lbl_80390A14: @@ -622,7 +637,7 @@ lbl_80390A14: /* 80390A28 0038D988 38 A0 00 00 */ li r5, 0 /* 80390A2C 0038D98C 7D 89 03 A6 */ mtctr r12 /* 80390A30 0038D990 3B DE 00 01 */ addi r30, r30, 1 -/* 80390A34 0038D994 4E 80 04 21 */ bctrl +/* 80390A34 0038D994 4E 80 04 21 */ bctrl /* 80390A38 0038D998 38 00 00 01 */ li r0, 1 /* 80390A3C 0038D99C 7C 64 1B 78 */ mr r4, r3 /* 80390A40 0038D9A0 90 01 00 60 */ stw r0, 0x60(r1) @@ -648,7 +663,7 @@ lbl_80390A6C: /* 80390A84 0038D9E4 38 A0 00 00 */ li r5, 0 /* 80390A88 0038D9E8 7D 89 03 A6 */ mtctr r12 /* 80390A8C 0038D9EC 3B DE 00 01 */ addi r30, r30, 1 -/* 80390A90 0038D9F0 4E 80 04 21 */ bctrl +/* 80390A90 0038D9F0 4E 80 04 21 */ bctrl /* 80390A94 0038D9F4 7C 64 1B 78 */ mr r4, r3 /* 80390A98 0038D9F8 48 00 05 14 */ b lbl_80390FAC lbl_80390A9C: @@ -663,7 +678,7 @@ lbl_80390AA4: /* 80390AB8 0038DA18 38 A0 00 00 */ li r5, 0 /* 80390ABC 0038DA1C 7D 89 03 A6 */ mtctr r12 /* 80390AC0 0038DA20 3B DE 00 01 */ addi r30, r30, 1 -/* 80390AC4 0038DA24 4E 80 04 21 */ bctrl +/* 80390AC4 0038DA24 4E 80 04 21 */ bctrl /* 80390AC8 0038DA28 7C 64 1B 78 */ mr r4, r3 /* 80390ACC 0038DA2C 48 00 04 E0 */ b lbl_80390FAC lbl_80390AD0: @@ -693,7 +708,7 @@ lbl_80390B14: /* 80390B20 0038DA80 38 A0 00 00 */ li r5, 0 /* 80390B24 0038DA84 7D 89 03 A6 */ mtctr r12 /* 80390B28 0038DA88 3B DE 00 01 */ addi r30, r30, 1 -/* 80390B2C 0038DA8C 4E 80 04 21 */ bctrl +/* 80390B2C 0038DA8C 4E 80 04 21 */ bctrl /* 80390B30 0038DA90 7C 64 1B 78 */ mr r4, r3 /* 80390B34 0038DA94 48 00 04 78 */ b lbl_80390FAC lbl_80390B38: @@ -742,7 +757,7 @@ lbl_80390B98: /* 80390BD0 0038DB30 98 01 00 1F */ stb r0, 0x1f(r1) /* 80390BD4 0038DB34 7D 89 03 A6 */ mtctr r12 /* 80390BD8 0038DB38 3B DE 00 01 */ addi r30, r30, 1 -/* 80390BDC 0038DB3C 4E 80 04 21 */ bctrl +/* 80390BDC 0038DB3C 4E 80 04 21 */ bctrl /* 80390BE0 0038DB40 7C 64 1B 78 */ mr r4, r3 /* 80390BE4 0038DB44 48 00 03 C8 */ b lbl_80390FAC lbl_80390BE8: @@ -754,7 +769,7 @@ lbl_80390BE8: /* 80390BFC 0038DB5C 38 A0 00 00 */ li r5, 0 /* 80390C00 0038DB60 7D 89 03 A6 */ mtctr r12 /* 80390C04 0038DB64 3B DE 00 01 */ addi r30, r30, 1 -/* 80390C08 0038DB68 4E 80 04 21 */ bctrl +/* 80390C08 0038DB68 4E 80 04 21 */ bctrl /* 80390C0C 0038DB6C 7C 64 1B 78 */ mr r4, r3 /* 80390C10 0038DB70 48 00 03 9C */ b lbl_80390FAC lbl_80390C14: @@ -776,7 +791,7 @@ lbl_80390C1C: /* 80390C4C 0038DBAC 38 A0 00 00 */ li r5, 0 /* 80390C50 0038DBB0 7D 89 03 A6 */ mtctr r12 /* 80390C54 0038DBB4 3B DE 00 01 */ addi r30, r30, 1 -/* 80390C58 0038DBB8 4E 80 04 21 */ bctrl +/* 80390C58 0038DBB8 4E 80 04 21 */ bctrl /* 80390C5C 0038DBBC 7C 64 1B 78 */ mr r4, r3 /* 80390C60 0038DBC0 48 00 03 4C */ b lbl_80390FAC lbl_80390C64: @@ -829,7 +844,7 @@ lbl_80390CE4: /* 80390D04 0038DC64 7D 89 03 A6 */ mtctr r12 /* 80390D08 0038DC68 3B 39 00 01 */ addi r25, r25, 1 /* 80390D0C 0038DC6C 3B DE 00 01 */ addi r30, r30, 1 -/* 80390D10 0038DC70 4E 80 04 21 */ bctrl +/* 80390D10 0038DC70 4E 80 04 21 */ bctrl /* 80390D14 0038DC74 7C 64 1B 78 */ mr r4, r3 /* 80390D18 0038DC78 48 00 02 94 */ b lbl_80390FAC lbl_80390D1C: @@ -839,7 +854,7 @@ lbl_80390D1C: /* 80390D28 0038DC88 38 A0 00 00 */ li r5, 0 /* 80390D2C 0038DC8C 7D 89 03 A6 */ mtctr r12 /* 80390D30 0038DC90 3B DE 00 01 */ addi r30, r30, 1 -/* 80390D34 0038DC94 4E 80 04 21 */ bctrl +/* 80390D34 0038DC94 4E 80 04 21 */ bctrl /* 80390D38 0038DC98 7C 64 1B 78 */ mr r4, r3 /* 80390D3C 0038DC9C 48 00 02 70 */ b lbl_80390FAC lbl_80390D40: @@ -897,7 +912,7 @@ lbl_80390DD4: /* 80390DF4 0038DD54 7D 89 03 A6 */ mtctr r12 /* 80390DF8 0038DD58 3B 39 00 01 */ addi r25, r25, 1 /* 80390DFC 0038DD5C 3B DE 00 01 */ addi r30, r30, 1 -/* 80390E00 0038DD60 4E 80 04 21 */ bctrl +/* 80390E00 0038DD60 4E 80 04 21 */ bctrl /* 80390E04 0038DD64 7C 64 1B 78 */ mr r4, r3 /* 80390E08 0038DD68 48 00 01 A4 */ b lbl_80390FAC lbl_80390E0C: @@ -907,7 +922,7 @@ lbl_80390E0C: /* 80390E18 0038DD78 38 A0 00 00 */ li r5, 0 /* 80390E1C 0038DD7C 7D 89 03 A6 */ mtctr r12 /* 80390E20 0038DD80 3B DE 00 01 */ addi r30, r30, 1 -/* 80390E24 0038DD84 4E 80 04 21 */ bctrl +/* 80390E24 0038DD84 4E 80 04 21 */ bctrl /* 80390E28 0038DD88 7C 64 1B 78 */ mr r4, r3 /* 80390E2C 0038DD8C 48 00 01 80 */ b lbl_80390FAC lbl_80390E30: @@ -931,7 +946,7 @@ lbl_80390E50: /* 80390E6C 0038DDCC 7D 89 03 A6 */ mtctr r12 /* 80390E70 0038DDD0 3B 18 00 01 */ addi r24, r24, 1 /* 80390E74 0038DDD4 3B DE 00 01 */ addi r30, r30, 1 -/* 80390E78 0038DDD8 4E 80 04 21 */ bctrl +/* 80390E78 0038DDD8 4E 80 04 21 */ bctrl /* 80390E7C 0038DDDC 7C 64 1B 78 */ mr r4, r3 /* 80390E80 0038DDE0 48 00 01 2C */ b lbl_80390FAC lbl_80390E84: @@ -951,7 +966,7 @@ lbl_80390EA4: /* 80390EB0 0038DE10 7E 23 8B 78 */ mr r3, r17 /* 80390EB4 0038DE14 38 A0 00 01 */ li r5, 1 /* 80390EB8 0038DE18 7D 89 03 A6 */ mtctr r12 -/* 80390EBC 0038DE1C 4E 80 04 21 */ bctrl +/* 80390EBC 0038DE1C 4E 80 04 21 */ bctrl /* 80390EC0 0038DE20 3B 18 FF FF */ addi r24, r24, -1 lbl_80390EC4: /* 80390EC4 0038DE24 7E 0C 83 78 */ mr r12, r16 @@ -961,7 +976,7 @@ lbl_80390EC4: /* 80390ED4 0038DE34 38 A0 00 00 */ li r5, 0 /* 80390ED8 0038DE38 7D 89 03 A6 */ mtctr r12 /* 80390EDC 0038DE3C 3B DE 00 01 */ addi r30, r30, 1 -/* 80390EE0 0038DE40 4E 80 04 21 */ bctrl +/* 80390EE0 0038DE40 4E 80 04 21 */ bctrl /* 80390EE4 0038DE44 7C 64 1B 78 */ mr r4, r3 /* 80390EE8 0038DE48 48 00 00 C4 */ b lbl_80390FAC lbl_80390EEC: @@ -984,7 +999,7 @@ lbl_80390F0C: /* 80390F28 0038DE88 7D 89 03 A6 */ mtctr r12 /* 80390F2C 0038DE8C 3B 18 00 01 */ addi r24, r24, 1 /* 80390F30 0038DE90 3B DE 00 01 */ addi r30, r30, 1 -/* 80390F34 0038DE94 4E 80 04 21 */ bctrl +/* 80390F34 0038DE94 4E 80 04 21 */ bctrl /* 80390F38 0038DE98 7C 64 1B 78 */ mr r4, r3 /* 80390F3C 0038DE9C 48 00 00 70 */ b lbl_80390FAC lbl_80390F40: @@ -1016,7 +1031,7 @@ lbl_80390F88: /* 80390F98 0038DEF8 7D 89 03 A6 */ mtctr r12 /* 80390F9C 0038DEFC 3B 18 00 01 */ addi r24, r24, 1 /* 80390FA0 0038DF00 3B DE 00 01 */ addi r30, r30, 1 -/* 80390FA4 0038DF04 4E 80 04 21 */ bctrl +/* 80390FA4 0038DF04 4E 80 04 21 */ bctrl /* 80390FA8 0038DF08 7C 64 1B 78 */ mr r4, r3 lbl_80390FAC: /* 80390FAC 0038DF0C 80 01 00 08 */ lwz r0, 8(r1) @@ -1043,7 +1058,7 @@ lbl_80390FF0: /* 80390FF4 0038DF54 7E 23 8B 78 */ mr r3, r17 /* 80390FF8 0038DF58 38 A0 00 01 */ li r5, 1 /* 80390FFC 0038DF5C 7D 89 03 A6 */ mtctr r12 -/* 80391000 0038DF60 4E 80 04 21 */ bctrl +/* 80391000 0038DF60 4E 80 04 21 */ bctrl /* 80391004 0038DF64 2C 1F 00 00 */ cmpwi r31, 0 /* 80391008 0038DF68 40 82 01 48 */ bne lbl_80391150 /* 8039100C 0038DF6C 80 01 00 60 */ lwz r0, 0x60(r1) @@ -1220,4 +1235,4 @@ lbl_80391260: /* 80391264 0038E1C4 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 80391268 0038E1C8 7C 08 03 A6 */ mtlr r0 /* 8039126C 0038E1CC 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 80391270 0038E1D0 4E 80 00 20 */ blr +/* 80391270 0038E1D0 4E 80 00 20 */ blr diff --git a/asm/Runtime/uart_console_io.s b/asm/Runtime/uart_console_io.s index 57764873..89bde9c2 100644 --- a/asm/Runtime/uart_console_io.s +++ b/asm/Runtime/uart_console_io.s @@ -11,7 +11,7 @@ lbl_805A99D8: .global __close_console __close_console: /* 80391274 0038E1D4 38 60 00 00 */ li r3, 0 -/* 80391278 0038E1D8 4E 80 00 20 */ blr +/* 80391278 0038E1D8 4E 80 00 20 */ blr .global __write_console __write_console: @@ -67,4 +67,4 @@ lbl_80391320: /* 80391330 0038E290 83 81 00 10 */ lwz r28, 0x10(r1) /* 80391334 0038E294 7C 08 03 A6 */ mtlr r0 /* 80391338 0038E298 38 21 00 20 */ addi r1, r1, 0x20 -/* 8039133C 0038E29C 4E 80 00 20 */ blr +/* 8039133C 0038E29C 4E 80 00 20 */ blr diff --git a/asm/Runtime/widechar_io.s b/asm/Runtime/widechar_io.s index def7eeb9..3229bb3e 100644 --- a/asm/Runtime/widechar_io.s +++ b/asm/Runtime/widechar_io.s @@ -11,7 +11,7 @@ fwide: /* 80391350 0038E2B0 40 82 00 0C */ bne lbl_8039135C lbl_80391354: /* 80391354 0038E2B4 38 60 00 00 */ li r3, 0 -/* 80391358 0038E2B8 4E 80 00 20 */ blr +/* 80391358 0038E2B8 4E 80 00 20 */ blr lbl_8039135C: /* 8039135C 0038E2BC 88 A3 00 05 */ lbz r5, 5(r3) /* 80391360 0038E2C0 54 A0 E7 BE */ rlwinm r0, r5, 0x1c, 0x1e, 0x1f @@ -20,10 +20,10 @@ lbl_8039135C: /* 8039136C 0038E2CC 40 80 00 10 */ bge lbl_8039137C /* 80391370 0038E2D0 2C 00 00 00 */ cmpwi r0, 0 /* 80391374 0038E2D4 40 80 00 14 */ bge lbl_80391388 -/* 80391378 0038E2D8 4E 80 00 20 */ blr +/* 80391378 0038E2D8 4E 80 00 20 */ blr lbl_8039137C: /* 8039137C 0038E2DC 2C 00 00 03 */ cmpwi r0, 3 -/* 80391380 0038E2E0 4C 80 00 20 */ bgelr +/* 80391380 0038E2E0 4C 80 00 20 */ bgelr /* 80391384 0038E2E4 48 00 00 34 */ b lbl_803913B8 lbl_80391388: /* 80391388 0038E2E8 2C 04 00 00 */ cmpwi r4, 0 @@ -39,10 +39,10 @@ lbl_803913A0: /* 803913AC 0038E30C 98 A3 00 05 */ stb r5, 5(r3) lbl_803913B0: /* 803913B0 0038E310 7C 83 23 78 */ mr r3, r4 -/* 803913B4 0038E314 4E 80 00 20 */ blr +/* 803913B4 0038E314 4E 80 00 20 */ blr lbl_803913B8: /* 803913B8 0038E318 38 60 00 01 */ li r3, 1 -/* 803913BC 0038E31C 4E 80 00 20 */ blr +/* 803913BC 0038E31C 4E 80 00 20 */ blr lbl_803913C0: /* 803913C0 0038E320 38 60 FF FF */ li r3, -1 /* 803913C4 0038E324 4E 80 00 20 */ blr diff --git a/asm/Weapons/CCollisionResponseData.s b/asm/Weapons/CCollisionResponseData.s index 99857256..1200b8de 100644 --- a/asm/Weapons/CCollisionResponseData.s +++ b/asm/Weapons/CCollisionResponseData.s @@ -68,7 +68,7 @@ lbl_802B21C4: /* 802B2220 002AF180 38 80 00 01 */ li r4, 1 /* 802B2224 002AF184 81 8C 00 08 */ lwz r12, 8(r12) /* 802B2228 002AF188 7D 89 03 A6 */ mtctr r12 -/* 802B222C 002AF18C 4E 80 04 21 */ bctrl +/* 802B222C 002AF18C 4E 80 04 21 */ bctrl lbl_802B2230: /* 802B2230 002AF190 88 01 00 0C */ lbz r0, 0xc(r1) /* 802B2234 002AF194 28 00 00 00 */ cmplwi r0, 0 @@ -85,7 +85,7 @@ lbl_802B2248: /* 802B225C 002AF1BC 83 A1 00 24 */ lwz r29, 0x24(r1) /* 802B2260 002AF1C0 7C 08 03 A6 */ mtlr r0 /* 802B2264 002AF1C4 38 21 00 30 */ addi r1, r1, 0x30 -/* 802B2268 002AF1C8 4E 80 00 20 */ blr +/* 802B2268 002AF1C8 4E 80 00 20 */ blr .global "__dt__50TObjOwnerDerivedFromIObj<22CCollisionResponseData>Fv" "__dt__50TObjOwnerDerivedFromIObj<22CCollisionResponseData>Fv": @@ -127,7 +127,7 @@ lbl_802B22E0: /* 802B22EC 002AF24C 83 C1 00 08 */ lwz r30, 8(r1) /* 802B22F0 002AF250 7C 08 03 A6 */ mtlr r0 /* 802B22F4 002AF254 38 21 00 10 */ addi r1, r1, 0x10 -/* 802B22F8 002AF258 4E 80 00 20 */ blr +/* 802B22F8 002AF258 4E 80 00 20 */ blr .global "GetIObjObjectFor__32TToken<22CCollisionResponseData>FRCQ24rstl34auto_ptr<22CCollisionResponseData>" "GetIObjObjectFor__32TToken<22CCollisionResponseData>FRCQ24rstl34auto_ptr<22CCollisionResponseData>": @@ -141,7 +141,7 @@ lbl_802B22E0: /* 802B2318 002AF278 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802B231C 002AF27C 7C 08 03 A6 */ mtlr r0 /* 802B2320 002AF280 38 21 00 10 */ addi r1, r1, 0x10 -/* 802B2324 002AF284 4E 80 00 20 */ blr +/* 802B2324 002AF284 4E 80 00 20 */ blr .global "GetNewDerivedObject__50TObjOwnerDerivedFromIObj<22CCollisionResponseData>FRCQ24rstl34auto_ptr<22CCollisionResponseData>" "GetNewDerivedObject__50TObjOwnerDerivedFromIObj<22CCollisionResponseData>FRCQ24rstl34auto_ptr<22CCollisionResponseData>": @@ -184,7 +184,7 @@ lbl_802B2398: /* 802B23B4 002AF314 80 01 00 14 */ lwz r0, 0x14(r1) /* 802B23B8 002AF318 7C 08 03 A6 */ mtlr r0 /* 802B23BC 002AF31C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802B23C0 002AF320 4E 80 00 20 */ blr +/* 802B23C0 002AF320 4E 80 00 20 */ blr .global GetWorldCollisionResponseType__22CCollisionResponseDataFi GetWorldCollisionResponseType__22CCollisionResponseDataFi: @@ -196,20 +196,20 @@ GetWorldCollisionResponseType__22CCollisionResponseDataFi: /* 802B23D8 002AF338 54 60 10 3A */ slwi r0, r3, 2 /* 802B23DC 002AF33C 38 64 61 98 */ addi r3, r4, lbl_803D6198@l /* 802B23E0 002AF340 7C 63 00 2E */ lwzx r3, r3, r0 -/* 802B23E4 002AF344 4E 80 00 20 */ blr +/* 802B23E4 002AF344 4E 80 00 20 */ blr lbl_802B23E8: /* 802B23E8 002AF348 38 60 00 01 */ li r3, 1 -/* 802B23EC 002AF34C 4E 80 00 20 */ blr +/* 802B23EC 002AF34C 4E 80 00 20 */ blr .global GetAudibleFallOff__22CCollisionResponseDataCFv GetAudibleFallOff__22CCollisionResponseDataCFv: /* 802B23F0 002AF350 C0 23 00 34 */ lfs f1, 0x34(r3) -/* 802B23F4 002AF354 4E 80 00 20 */ blr +/* 802B23F4 002AF354 4E 80 00 20 */ blr .global GetAudibleRange__22CCollisionResponseDataCFv GetAudibleRange__22CCollisionResponseDataCFv: /* 802B23F8 002AF358 C0 23 00 30 */ lfs f1, 0x30(r3) -/* 802B23FC 002AF35C 4E 80 00 20 */ blr +/* 802B23FC 002AF35C 4E 80 00 20 */ blr .global ResponseTypeIsEnemySpecial__22CCollisionResponseDataF29EWeaponCollisionResponseTypes ResponseTypeIsEnemySpecial__22CCollisionResponseDataF29EWeaponCollisionResponseTypes: @@ -218,10 +218,10 @@ ResponseTypeIsEnemySpecial__22CCollisionResponseDataF29EWeaponCollisionResponseT /* 802B2408 002AF368 2C 03 00 44 */ cmpwi r3, 0x44 /* 802B240C 002AF36C 41 81 00 0C */ bgt lbl_802B2418 /* 802B2410 002AF370 38 60 00 01 */ li r3, 1 -/* 802B2414 002AF374 4E 80 00 20 */ blr +/* 802B2414 002AF374 4E 80 00 20 */ blr lbl_802B2418: /* 802B2418 002AF378 38 60 00 00 */ li r3, 0 -/* 802B241C 002AF37C 4E 80 00 20 */ blr +/* 802B241C 002AF37C 4E 80 00 20 */ blr .global ResponseTypeIsEnemyNormal__22CCollisionResponseDataF29EWeaponCollisionResponseTypes ResponseTypeIsEnemyNormal__22CCollisionResponseDataF29EWeaponCollisionResponseTypes: @@ -230,10 +230,10 @@ ResponseTypeIsEnemyNormal__22CCollisionResponseDataF29EWeaponCollisionResponseTy /* 802B2428 002AF388 2C 03 00 2B */ cmpwi r3, 0x2b /* 802B242C 002AF38C 41 81 00 0C */ bgt lbl_802B2438 /* 802B2430 002AF390 38 60 00 01 */ li r3, 1 -/* 802B2434 002AF394 4E 80 00 20 */ blr +/* 802B2434 002AF394 4E 80 00 20 */ blr lbl_802B2438: /* 802B2438 002AF398 38 60 00 00 */ li r3, 0 -/* 802B243C 002AF39C 4E 80 00 20 */ blr +/* 802B243C 002AF39C 4E 80 00 20 */ blr .global ResponseTypeIsEnemyShielded__22CCollisionResponseDataF29EWeaponCollisionResponseTypes ResponseTypeIsEnemyShielded__22CCollisionResponseDataF29EWeaponCollisionResponseTypes: @@ -242,10 +242,10 @@ ResponseTypeIsEnemyShielded__22CCollisionResponseDataF29EWeaponCollisionResponse /* 802B2448 002AF3A8 2C 03 00 5D */ cmpwi r3, 0x5d /* 802B244C 002AF3AC 41 81 00 0C */ bgt lbl_802B2458 /* 802B2450 002AF3B0 38 60 00 01 */ li r3, 1 -/* 802B2454 002AF3B4 4E 80 00 20 */ blr +/* 802B2454 002AF3B4 4E 80 00 20 */ blr lbl_802B2458: /* 802B2458 002AF3B8 38 60 00 00 */ li r3, 0 -/* 802B245C 002AF3BC 4E 80 00 20 */ blr +/* 802B245C 002AF3BC 4E 80 00 20 */ blr .global GetDecalDescription__22CCollisionResponseDataCF29EWeaponCollisionResponseTypes GetDecalDescription__22CCollisionResponseDataCF29EWeaponCollisionResponseTypes: @@ -277,7 +277,7 @@ lbl_802B24B8: /* 802B24C0 002AF420 83 C1 00 08 */ lwz r30, 8(r1) /* 802B24C4 002AF424 7C 08 03 A6 */ mtlr r0 /* 802B24C8 002AF428 38 21 00 10 */ addi r1, r1, 0x10 -/* 802B24CC 002AF42C 4E 80 00 20 */ blr +/* 802B24CC 002AF42C 4E 80 00 20 */ blr .global GetSoundEffectId__22CCollisionResponseDataCF29EWeaponCollisionResponseTypes GetSoundEffectId__22CCollisionResponseDataCF29EWeaponCollisionResponseTypes: @@ -345,7 +345,7 @@ lbl_802B2598: /* 802B25B0 002AF510 80 01 00 24 */ lwz r0, 0x24(r1) /* 802B25B4 002AF514 7C 08 03 A6 */ mtlr r0 /* 802B25B8 002AF518 38 21 00 20 */ addi r1, r1, 0x20 -/* 802B25BC 002AF51C 4E 80 00 20 */ blr +/* 802B25BC 002AF51C 4E 80 00 20 */ blr .global GetParticleDescription__22CCollisionResponseDataCF29EWeaponCollisionResponseTypes GetParticleDescription__22CCollisionResponseDataCF29EWeaponCollisionResponseTypes: @@ -434,7 +434,7 @@ lbl_802B26E0: /* 802B26F0 002AF650 83 81 00 10 */ lwz r28, 0x10(r1) /* 802B26F4 002AF654 7C 08 03 A6 */ mtlr r0 /* 802B26F8 002AF658 38 21 00 20 */ addi r1, r1, 0x20 -/* 802B26FC 002AF65C 4E 80 00 20 */ blr +/* 802B26FC 002AF65C 4E 80 00 20 */ blr .global sub_802b2700 sub_802b2700: @@ -484,7 +484,7 @@ lbl_802B2790: /* 802B279C 002AF6FC 83 C1 00 18 */ lwz r30, 0x18(r1) /* 802B27A0 002AF700 7C 08 03 A6 */ mtlr r0 /* 802B27A4 002AF704 38 21 00 20 */ addi r1, r1, 0x20 -/* 802B27A8 002AF708 4E 80 00 20 */ blr +/* 802B27A8 002AF708 4E 80 00 20 */ blr .global sub_802b27ac sub_802b27ac: @@ -539,7 +539,7 @@ lbl_802B284C: /* 802B2854 002AF7B4 80 01 00 34 */ lwz r0, 0x34(r1) /* 802B2858 002AF7B8 7C 08 03 A6 */ mtlr r0 /* 802B285C 002AF7BC 38 21 00 30 */ addi r1, r1, 0x30 -/* 802B2860 002AF7C0 4E 80 00 20 */ blr +/* 802B2860 002AF7C0 4E 80 00 20 */ blr .global sub_802b2864 sub_802b2864: @@ -594,7 +594,7 @@ lbl_802B2904: /* 802B290C 002AF86C 80 01 00 34 */ lwz r0, 0x34(r1) /* 802B2910 002AF870 7C 08 03 A6 */ mtlr r0 /* 802B2914 002AF874 38 21 00 30 */ addi r1, r1, 0x30 -/* 802B2918 002AF878 4E 80 00 20 */ blr +/* 802B2918 002AF878 4E 80 00 20 */ blr .global AddParticleSystemToResponse__22CCollisionResponseDataF29EWeaponCollisionResponseTypesR12CInputStreamP11CSimplePool AddParticleSystemToResponse__22CCollisionResponseDataF29EWeaponCollisionResponseTypesR12CInputStreamP11CSimplePool: @@ -742,7 +742,7 @@ lbl_802B2B08: /* 802B2B14 002AFA74 83 A1 00 64 */ lwz r29, 0x64(r1) /* 802B2B18 002AFA78 7C 08 03 A6 */ mtlr r0 /* 802B2B1C 002AFA7C 38 21 00 70 */ addi r1, r1, 0x70 -/* 802B2B20 002AFA80 4E 80 00 20 */ blr +/* 802B2B20 002AFA80 4E 80 00 20 */ blr .global CheckAndAddDecalToResponse__22CCollisionResponseDataFUiR12CInputStreamP11CSimplePool CheckAndAddDecalToResponse__22CCollisionResponseDataFUiR12CInputStreamP11CSimplePool: @@ -782,7 +782,7 @@ lbl_802B2B60: /* 802B2BA4 002AFB04 81 9E 00 00 */ lwz r12, 0(r30) /* 802B2BA8 002AFB08 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802B2BAC 002AFB0C 7D 89 03 A6 */ mtctr r12 -/* 802B2BB0 002AFB10 4E 80 04 21 */ bctrl +/* 802B2BB0 002AFB10 4E 80 04 21 */ bctrl /* 802B2BB4 002AFB14 38 61 00 08 */ addi r3, r1, 8 /* 802B2BB8 002AFB18 38 81 00 10 */ addi r4, r1, 0x10 /* 802B2BBC 002AFB1C 48 08 E2 ED */ bl __ct__6CTokenFRC6CToken @@ -846,7 +846,7 @@ lbl_802B2C7C: /* 802B2C8C 002AFBEC 83 81 00 30 */ lwz r28, 0x30(r1) /* 802B2C90 002AFBF0 7C 08 03 A6 */ mtlr r0 /* 802B2C94 002AFBF4 38 21 00 40 */ addi r1, r1, 0x40 -/* 802B2C98 002AFBF8 4E 80 00 20 */ blr +/* 802B2C98 002AFBF8 4E 80 00 20 */ blr .global CheckAndAddSoundFXToResponse__22CCollisionResponseDataFUiR12CInputStream CheckAndAddSoundFXToResponse__22CCollisionResponseDataFUiR12CInputStream: @@ -892,7 +892,7 @@ lbl_802B2D1C: /* 802B2D28 002AFC88 83 A1 00 14 */ lwz r29, 0x14(r1) /* 802B2D2C 002AFC8C 7C 08 03 A6 */ mtlr r0 /* 802B2D30 002AFC90 38 21 00 20 */ addi r1, r1, 0x20 -/* 802B2D34 002AFC94 4E 80 00 20 */ blr +/* 802B2D34 002AFC94 4E 80 00 20 */ blr .global CheckAndAddParticleSystemToResponse__22CCollisionResponseDataFUiR12CInputStreamP11CSimplePool CheckAndAddParticleSystemToResponse__22CCollisionResponseDataFUiR12CInputStreamP11CSimplePool: @@ -921,7 +921,7 @@ lbl_802B2D84: /* 802B2D84 002AFCE4 80 01 00 14 */ lwz r0, 0x14(r1) /* 802B2D88 002AFCE8 7C 08 03 A6 */ mtlr r0 /* 802B2D8C 002AFCEC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802B2D90 002AFCF0 4E 80 00 20 */ blr +/* 802B2D90 002AFCF0 4E 80 00 20 */ blr .global CheckAndAddResourcesToResponse__22CCollisionResponseDataFUiR12CInputStreamP11CSimplePool CheckAndAddResourcesToResponse__22CCollisionResponseDataFUiR12CInputStreamP11CSimplePool: @@ -968,7 +968,7 @@ lbl_802B2E18: /* 802B2E28 002AFD88 83 81 00 10 */ lwz r28, 0x10(r1) /* 802B2E2C 002AFD8C 7C 08 03 A6 */ mtlr r0 /* 802B2E30 002AFD90 38 21 00 20 */ addi r1, r1, 0x20 -/* 802B2E34 002AFD94 4E 80 00 20 */ blr +/* 802B2E34 002AFD94 4E 80 00 20 */ blr .global __ct__22CCollisionResponseDataFR12CInputStreamP11CSimplePool __ct__22CCollisionResponseDataFR12CInputStreamP11CSimplePool: @@ -1110,7 +1110,7 @@ lbl_802B3024: /* 802B3028 002AFF88 80 01 00 54 */ lwz r0, 0x54(r1) /* 802B302C 002AFF8C 7C 08 03 A6 */ mtlr r0 /* 802B3030 002AFF90 38 21 00 50 */ addi r1, r1, 0x50 -/* 802B3034 002AFF94 4E 80 00 20 */ blr +/* 802B3034 002AFF94 4E 80 00 20 */ blr .global "resize__Q24rstl96vector>,Q24rstl17rmemory_allocator>Fi" "resize__Q24rstl96vector>,Q24rstl17rmemory_allocator>Fi": @@ -1171,7 +1171,7 @@ lbl_802B30F0: /* 802B30FC 002B005C 80 01 00 24 */ lwz r0, 0x24(r1) /* 802B3100 002B0060 7C 08 03 A6 */ mtlr r0 /* 802B3104 002B0064 38 21 00 20 */ addi r1, r1, 0x20 -/* 802B3108 002B0068 4E 80 00 20 */ blr +/* 802B3108 002B0068 4E 80 00 20 */ blr .global sub_802b310c sub_802b310c: @@ -1221,7 +1221,7 @@ lbl_802B3188: /* 802B31A8 002B0108 83 81 00 20 */ lwz r28, 0x20(r1) /* 802B31AC 002B010C 7C 08 03 A6 */ mtlr r0 /* 802B31B0 002B0110 38 21 00 30 */ addi r1, r1, 0x30 -/* 802B31B4 002B0114 4E 80 00 20 */ blr +/* 802B31B4 002B0114 4E 80 00 20 */ blr .global "resize__Q24rstl36vectorFi" "resize__Q24rstl36vectorFi": @@ -1291,7 +1291,7 @@ lbl_802B3280: /* 802B3298 002B01F8 83 81 00 20 */ lwz r28, 0x20(r1) /* 802B329C 002B01FC 7C 08 03 A6 */ mtlr r0 /* 802B32A0 002B0200 38 21 00 30 */ addi r1, r1, 0x30 -/* 802B32A4 002B0204 4E 80 00 20 */ blr +/* 802B32A4 002B0204 4E 80 00 20 */ blr .global "resize__Q24rstl94vector>,Q24rstl17rmemory_allocator>Fi" "resize__Q24rstl94vector>,Q24rstl17rmemory_allocator>Fi": @@ -1352,7 +1352,7 @@ lbl_802B3360: /* 802B336C 002B02CC 80 01 00 24 */ lwz r0, 0x24(r1) /* 802B3370 002B02D0 7C 08 03 A6 */ mtlr r0 /* 802B3374 002B02D4 38 21 00 20 */ addi r1, r1, 0x20 -/* 802B3378 002B02D8 4E 80 00 20 */ blr +/* 802B3378 002B02D8 4E 80 00 20 */ blr .global "clear__Q24rstl94vector>,Q24rstl17rmemory_allocator>Fv" "clear__Q24rstl94vector>,Q24rstl17rmemory_allocator>Fv": @@ -1402,7 +1402,7 @@ lbl_802B33F8: /* 802B3418 002B0378 83 81 00 20 */ lwz r28, 0x20(r1) /* 802B341C 002B037C 7C 08 03 A6 */ mtlr r0 /* 802B3420 002B0380 38 21 00 30 */ addi r1, r1, 0x30 -/* 802B3424 002B0384 4E 80 00 20 */ blr +/* 802B3424 002B0384 4E 80 00 20 */ blr .global "reserve__Q24rstl94vector>,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl94vector>,Q24rstl17rmemory_allocator>Fi": @@ -1496,7 +1496,7 @@ lbl_802B3554: /* 802B3558 002B04B8 80 01 00 34 */ lwz r0, 0x34(r1) /* 802B355C 002B04BC 7C 08 03 A6 */ mtlr r0 /* 802B3560 002B04C0 38 21 00 30 */ addi r1, r1, 0x30 -/* 802B3564 002B04C4 4E 80 00 20 */ blr +/* 802B3564 002B04C4 4E 80 00 20 */ blr .global "reserve__Q24rstl96vector>,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl96vector>,Q24rstl17rmemory_allocator>Fi": diff --git a/asm/Weapons/CDecal.s b/asm/Weapons/CDecal.s index 2cc46409..ac16b44e 100644 --- a/asm/Weapons/CDecal.s +++ b/asm/Weapons/CDecal.s @@ -40,7 +40,7 @@ lbl_802B487C: /* 802B487C 002B17DC 80 83 00 58 */ lwz r4, 0x58(r3) /* 802B4880 002B17E0 38 04 00 01 */ addi r0, r4, 1 /* 802B4884 002B17E4 90 03 00 58 */ stw r0, 0x58(r3) -/* 802B4888 002B17E8 4E 80 00 20 */ blr +/* 802B4888 002B17E8 4E 80 00 20 */ blr .global Render__6CDecalCFv Render__6CDecalCFv: @@ -120,7 +120,7 @@ lbl_802B4994: /* 802B499C 002B18FC 83 C1 00 18 */ lwz r30, 0x18(r1) /* 802B49A0 002B1900 7C 08 03 A6 */ mtlr r0 /* 802B49A4 002B1904 38 21 00 20 */ addi r1, r1, 0x20 -/* 802B49A8 002B1908 4E 80 00 20 */ blr +/* 802B49A8 002B1908 4E 80 00 20 */ blr .global RenderMdl__6CDecalCFv RenderMdl__6CDecalCFv: @@ -164,7 +164,7 @@ lbl_802B4A28: /* 802B4A3C 002B199C 81 83 00 00 */ lwz r12, 0(r3) /* 802B4A40 002B19A0 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802B4A44 002B19A4 7D 89 03 A6 */ mtctr r12 -/* 802B4A48 002B19A8 4E 80 04 21 */ bctrl +/* 802B4A48 002B19A8 4E 80 04 21 */ bctrl /* 802B4A4C 002B19AC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802B4A50 002B19B0 41 82 00 08 */ beq lbl_802B4A58 /* 802B4A54 002B19B4 3B C0 00 01 */ li r30, 1 @@ -182,7 +182,7 @@ lbl_802B4A58: /* 802B4A80 002B19E0 81 83 00 00 */ lwz r12, 0(r3) /* 802B4A84 002B19E4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802B4A88 002B19E8 7D 89 03 A6 */ mtctr r12 -/* 802B4A8C 002B19EC 4E 80 04 21 */ bctrl +/* 802B4A8C 002B19EC 4E 80 04 21 */ bctrl /* 802B4A90 002B19F0 C0 22 C2 50 */ lfs f1, lbl_805ADF70@sda21(r2) /* 802B4A94 002B19F4 38 61 02 44 */ addi r3, r1, 0x244 /* 802B4A98 002B19F8 C0 1F 00 68 */ lfs f0, 0x68(r31) @@ -224,7 +224,7 @@ lbl_802B4AF0: /* 802B4B24 002B1A84 80 9F 00 58 */ lwz r4, 0x58(r31) /* 802B4B28 002B1A88 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802B4B2C 002B1A8C 7D 89 03 A6 */ mtctr r12 -/* 802B4B30 002B1A90 4E 80 04 21 */ bctrl +/* 802B4B30 002B1A90 4E 80 04 21 */ bctrl lbl_802B4B34: /* 802B4B34 002B1A94 38 61 00 4C */ addi r3, r1, 0x4c /* 802B4B38 002B1A98 38 81 03 04 */ addi r4, r1, 0x304 @@ -275,7 +275,7 @@ lbl_802B4BC0: /* 802B4BE8 002B1B48 81 83 00 00 */ lwz r12, 0(r3) /* 802B4BEC 002B1B4C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802B4BF0 002B1B50 7D 89 03 A6 */ mtctr r12 -/* 802B4BF4 002B1B54 4E 80 04 21 */ bctrl +/* 802B4BF4 002B1B54 4E 80 04 21 */ bctrl /* 802B4BF8 002B1B58 C0 22 C2 50 */ lfs f1, lbl_805ADF70@sda21(r2) /* 802B4BFC 002B1B5C 38 61 01 B4 */ addi r3, r1, 0x1b4 /* 802B4C00 002B1B60 C0 01 00 84 */ lfs f0, 0x84(r1) @@ -334,7 +334,7 @@ lbl_802B4CA4: /* 802B4CCC 002B1C2C 81 83 00 00 */ lwz r12, 0(r3) /* 802B4CD0 002B1C30 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802B4CD4 002B1C34 7D 89 03 A6 */ mtctr r12 -/* 802B4CD8 002B1C38 4E 80 04 21 */ bctrl +/* 802B4CD8 002B1C38 4E 80 04 21 */ bctrl /* 802B4CDC 002B1C3C C0 21 00 70 */ lfs f1, 0x70(r1) /* 802B4CE0 002B1C40 38 61 01 54 */ addi r3, r1, 0x154 /* 802B4CE4 002B1C44 C0 41 00 74 */ lfs f2, 0x74(r1) @@ -357,7 +357,7 @@ lbl_802B4D0C: /* 802B4D24 002B1C84 80 9F 00 58 */ lwz r4, 0x58(r31) /* 802B4D28 002B1C88 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802B4D2C 002B1C8C 7D 89 03 A6 */ mtctr r12 -/* 802B4D30 002B1C90 4E 80 04 21 */ bctrl +/* 802B4D30 002B1C90 4E 80 04 21 */ bctrl lbl_802B4D34: /* 802B4D34 002B1C94 38 61 02 A4 */ addi r3, r1, 0x2a4 /* 802B4D38 002B1C98 48 05 78 A9 */ bl SetModelMatrix__9CGraphicsFRC12CTransform4f @@ -432,7 +432,7 @@ lbl_802B4E2C: /* 802B4E40 002B1DA0 83 C1 03 38 */ lwz r30, 0x338(r1) /* 802B4E44 002B1DA4 7C 08 03 A6 */ mtlr r0 /* 802B4E48 002B1DA8 38 21 03 40 */ addi r1, r1, 0x340 -/* 802B4E4C 002B1DAC 4E 80 00 20 */ blr +/* 802B4E4C 002B1DAC 4E 80 00 20 */ blr .global RenderQuad__6CDecalCFRQ26CDecal10CQuadDecalRCQ217CDecalDescription10SQuadDescr RenderQuad__6CDecalCFRQ26CDecal10CQuadDecalRCQ217CDecalDescription10SQuadDescr: @@ -469,7 +469,7 @@ RenderQuad__6CDecalCFRQ26CDecal10CQuadDecalRCQ217CDecalDescription10SQuadDescr: /* 802B4EC8 002B1E28 80 9C 00 58 */ lwz r4, 0x58(r28) /* 802B4ECC 002B1E2C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802B4ED0 002B1E30 7D 89 03 A6 */ mtctr r12 -/* 802B4ED4 002B1E34 4E 80 04 21 */ bctrl +/* 802B4ED4 002B1E34 4E 80 04 21 */ bctrl lbl_802B4ED8: /* 802B4ED8 002B1E38 80 7E 00 04 */ lwz r3, 4(r30) /* 802B4EDC 002B1E3C 28 03 00 00 */ cmplwi r3, 0 @@ -479,7 +479,7 @@ lbl_802B4ED8: /* 802B4EEC 002B1E4C 80 9C 00 58 */ lwz r4, 0x58(r28) /* 802B4EF0 002B1E50 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802B4EF4 002B1E54 7D 89 03 A6 */ mtctr r12 -/* 802B4EF8 002B1E58 4E 80 04 21 */ bctrl +/* 802B4EF8 002B1E58 4E 80 04 21 */ bctrl /* 802B4EFC 002B1E5C C0 21 00 08 */ lfs f1, 8(r1) /* 802B4F00 002B1E60 C0 02 C2 60 */ lfs f0, lbl_805ADF80@sda21(r2) /* 802B4F04 002B1E64 EC 01 00 32 */ fmuls f0, f1, f0 @@ -493,7 +493,7 @@ lbl_802B4F0C: /* 802B4F20 002B1E80 80 9C 00 58 */ lwz r4, 0x58(r28) /* 802B4F24 002B1E84 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802B4F28 002B1E88 7D 89 03 A6 */ mtctr r12 -/* 802B4F2C 002B1E8C 4E 80 04 21 */ bctrl +/* 802B4F2C 002B1E8C 4E 80 04 21 */ bctrl lbl_802B4F30: /* 802B4F30 002B1E90 80 7E 00 0C */ lwz r3, 0xc(r30) /* 802B4F34 002B1E94 28 03 00 00 */ cmplwi r3, 0 @@ -503,7 +503,7 @@ lbl_802B4F30: /* 802B4F44 002B1EA4 80 9C 00 58 */ lwz r4, 0x58(r28) /* 802B4F48 002B1EA8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802B4F4C 002B1EAC 7D 89 03 A6 */ mtctr r12 -/* 802B4F50 002B1EB0 4E 80 04 21 */ bctrl +/* 802B4F50 002B1EB0 4E 80 04 21 */ bctrl /* 802B4F54 002B1EB4 C0 02 C2 54 */ lfs f0, lbl_805ADF74@sda21(r2) /* 802B4F58 002B1EB8 D0 01 00 38 */ stfs f0, 0x38(r1) lbl_802B4F5C: @@ -594,7 +594,7 @@ lbl_802B506C: /* 802B5098 002B1FF8 80 BC 00 58 */ lwz r5, 0x58(r28) /* 802B509C 002B1FFC 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802B50A0 002B2000 7D 89 03 A6 */ mtctr r12 -/* 802B50A4 002B2004 4E 80 04 21 */ bctrl +/* 802B50A4 002B2004 4E 80 04 21 */ bctrl /* 802B50A8 002B2008 38 61 00 10 */ addi r3, r1, 0x10 /* 802B50AC 002B200C 38 81 00 18 */ addi r4, r1, 0x18 /* 802B50B0 002B2010 48 08 BD F9 */ bl __ct__6CTokenFRC6CToken @@ -628,7 +628,7 @@ lbl_802B50E0: /* 802B511C 002B207C 81 83 00 00 */ lwz r12, 0(r3) /* 802B5120 002B2080 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802B5124 002B2084 7D 89 03 A6 */ mtctr r12 -/* 802B5128 002B2088 4E 80 04 21 */ bctrl +/* 802B5128 002B2088 4E 80 04 21 */ bctrl /* 802B512C 002B208C 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 802B5130 002B2090 41 82 00 70 */ beq lbl_802B51A0 /* 802B5134 002B2094 38 60 00 02 */ li r3, 2 @@ -828,7 +828,7 @@ lbl_802B5408: /* 802B5420 002B2380 83 81 00 70 */ lwz r28, 0x70(r1) /* 802B5424 002B2384 7C 08 03 A6 */ mtlr r0 /* 802B5428 002B2388 38 21 00 90 */ addi r1, r1, 0x90 -/* 802B542C 002B238C 4E 80 00 20 */ blr +/* 802B542C 002B238C 4E 80 00 20 */ blr .global "__ct__6CDecalFRC27TToken<17CDecalDescription>RC12CTransform4f" "__ct__6CDecalFRC27TToken<17CDecalDescription>RC12CTransform4f": @@ -889,7 +889,7 @@ lbl_802B5408: /* 802B5508 002B2468 38 80 00 00 */ li r4, 0 /* 802B550C 002B246C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802B5510 002B2470 7D 89 03 A6 */ mtctr r12 -/* 802B5514 002B2474 4E 80 04 21 */ bctrl +/* 802B5514 002B2474 4E 80 04 21 */ bctrl /* 802B5518 002B2478 48 00 00 10 */ b lbl_802B5528 lbl_802B551C: /* 802B551C 002B247C 3C 60 00 80 */ lis r3, 0x007FFFFF@ha @@ -904,12 +904,12 @@ lbl_802B5528: /* 802B553C 002B249C 38 80 00 00 */ li r4, 0 /* 802B5540 002B24A0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802B5544 002B24A4 7D 89 03 A6 */ mtctr r12 -/* 802B5548 002B24A8 4E 80 04 21 */ bctrl +/* 802B5548 002B24A8 4E 80 04 21 */ bctrl /* 802B554C 002B24AC 80 7E 00 08 */ lwz r3, 8(r30) /* 802B5550 002B24B0 81 83 00 00 */ lwz r12, 0(r3) /* 802B5554 002B24B4 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802B5558 002B24B8 7D 89 03 A6 */ mtctr r12 -/* 802B555C 002B24BC 4E 80 04 21 */ bctrl +/* 802B555C 002B24BC 4E 80 04 21 */ bctrl /* 802B5560 002B24C0 88 9F 00 3C */ lbz r4, 0x3c(r31) /* 802B5564 002B24C4 54 80 CF FE */ rlwinm r0, r4, 0x19, 0x1f, 0x1f /* 802B5568 002B24C8 7C 00 18 38 */ and r0, r0, r3 @@ -922,7 +922,7 @@ lbl_802B5574: /* 802B5580 002B24E0 81 83 00 00 */ lwz r12, 0(r3) /* 802B5584 002B24E4 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802B5588 002B24E8 7D 89 03 A6 */ mtctr r12 -/* 802B558C 002B24EC 4E 80 04 21 */ bctrl +/* 802B558C 002B24EC 4E 80 04 21 */ bctrl /* 802B5590 002B24F0 88 9F 00 3C */ lbz r4, 0x3c(r31) /* 802B5594 002B24F4 54 80 CF FE */ rlwinm r0, r4, 0x19, 0x1f, 0x1f /* 802B5598 002B24F8 7C 00 18 38 */ and r0, r0, r3 @@ -939,7 +939,7 @@ lbl_802B5574: /* 802B55C4 002B2524 81 83 00 00 */ lwz r12, 0(r3) /* 802B55C8 002B2528 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802B55CC 002B252C 7D 89 03 A6 */ mtctr r12 -/* 802B55D0 002B2530 4E 80 04 21 */ bctrl +/* 802B55D0 002B2530 4E 80 04 21 */ bctrl /* 802B55D4 002B2534 C0 21 00 0C */ lfs f1, 0xc(r1) /* 802B55D8 002B2538 C0 02 C2 58 */ lfs f0, lbl_805ADF78@sda21(r2) /* 802B55DC 002B253C FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -955,7 +955,7 @@ lbl_802B55F4: /* 802B5600 002B2560 81 83 00 00 */ lwz r12, 0(r3) /* 802B5604 002B2564 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802B5608 002B2568 7D 89 03 A6 */ mtctr r12 -/* 802B560C 002B256C 4E 80 04 21 */ bctrl +/* 802B560C 002B256C 4E 80 04 21 */ bctrl /* 802B5610 002B2570 88 9F 00 3C */ lbz r4, 0x3c(r31) /* 802B5614 002B2574 54 80 CF FE */ rlwinm r0, r4, 0x19, 0x1f, 0x1f /* 802B5618 002B2578 7C 00 18 38 */ and r0, r0, r3 @@ -983,7 +983,7 @@ lbl_802B5644: /* 802B5668 002B25C8 38 80 00 00 */ li r4, 0 /* 802B566C 002B25CC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802B5670 002B25D0 7D 89 03 A6 */ mtctr r12 -/* 802B5674 002B25D4 4E 80 04 21 */ bctrl +/* 802B5674 002B25D4 4E 80 04 21 */ bctrl /* 802B5678 002B25D8 48 00 00 10 */ b lbl_802B5688 lbl_802B567C: /* 802B567C 002B25DC 3C 60 00 80 */ lis r3, 0x007FFFFF@ha @@ -998,12 +998,12 @@ lbl_802B5688: /* 802B569C 002B25FC 38 80 00 00 */ li r4, 0 /* 802B56A0 002B2600 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802B56A4 002B2604 7D 89 03 A6 */ mtctr r12 -/* 802B56A8 002B2608 4E 80 04 21 */ bctrl +/* 802B56A8 002B2608 4E 80 04 21 */ bctrl /* 802B56AC 002B260C 80 7E 00 24 */ lwz r3, 0x24(r30) /* 802B56B0 002B2610 81 83 00 00 */ lwz r12, 0(r3) /* 802B56B4 002B2614 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802B56B8 002B2618 7D 89 03 A6 */ mtctr r12 -/* 802B56BC 002B261C 4E 80 04 21 */ bctrl +/* 802B56BC 002B261C 4E 80 04 21 */ bctrl /* 802B56C0 002B2620 88 9F 00 48 */ lbz r4, 0x48(r31) /* 802B56C4 002B2624 54 80 CF FE */ rlwinm r0, r4, 0x19, 0x1f, 0x1f /* 802B56C8 002B2628 7C 00 18 38 */ and r0, r0, r3 @@ -1016,7 +1016,7 @@ lbl_802B56D4: /* 802B56E0 002B2640 81 83 00 00 */ lwz r12, 0(r3) /* 802B56E4 002B2644 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802B56E8 002B2648 7D 89 03 A6 */ mtctr r12 -/* 802B56EC 002B264C 4E 80 04 21 */ bctrl +/* 802B56EC 002B264C 4E 80 04 21 */ bctrl /* 802B56F0 002B2650 88 9F 00 48 */ lbz r4, 0x48(r31) /* 802B56F4 002B2654 54 80 CF FE */ rlwinm r0, r4, 0x19, 0x1f, 0x1f /* 802B56F8 002B2658 7C 00 18 38 */ and r0, r0, r3 @@ -1033,7 +1033,7 @@ lbl_802B56D4: /* 802B5724 002B2684 81 83 00 00 */ lwz r12, 0(r3) /* 802B5728 002B2688 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802B572C 002B268C 7D 89 03 A6 */ mtctr r12 -/* 802B5730 002B2690 4E 80 04 21 */ bctrl +/* 802B5730 002B2690 4E 80 04 21 */ bctrl /* 802B5734 002B2694 C0 21 00 08 */ lfs f1, 8(r1) /* 802B5738 002B2698 C0 02 C2 58 */ lfs f0, lbl_805ADF78@sda21(r2) /* 802B573C 002B269C FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -1049,7 +1049,7 @@ lbl_802B5754: /* 802B5760 002B26C0 81 83 00 00 */ lwz r12, 0(r3) /* 802B5764 002B26C4 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802B5768 002B26C8 7D 89 03 A6 */ mtctr r12 -/* 802B576C 002B26CC 4E 80 04 21 */ bctrl +/* 802B576C 002B26CC 4E 80 04 21 */ bctrl /* 802B5770 002B26D0 88 9F 00 48 */ lbz r4, 0x48(r31) /* 802B5774 002B26D4 54 80 CF FE */ rlwinm r0, r4, 0x19, 0x1f, 0x1f /* 802B5778 002B26D8 7C 00 18 38 */ and r0, r0, r3 @@ -1077,7 +1077,7 @@ lbl_802B57A4: /* 802B57C8 002B2728 38 80 00 00 */ li r4, 0 /* 802B57CC 002B272C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802B57D0 002B2730 7D 89 03 A6 */ mtctr r12 -/* 802B57D4 002B2734 4E 80 04 21 */ bctrl +/* 802B57D4 002B2734 4E 80 04 21 */ bctrl /* 802B57D8 002B2738 48 00 00 10 */ b lbl_802B57E8 lbl_802B57DC: /* 802B57DC 002B273C 3C 60 00 80 */ lis r3, 0x007FFFFF@ha @@ -1093,7 +1093,7 @@ lbl_802B57E8: /* 802B5800 002B2760 38 80 00 00 */ li r4, 0 /* 802B5804 002B2764 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802B5808 002B2768 7D 89 03 A6 */ mtctr r12 -/* 802B580C 002B276C 4E 80 04 21 */ bctrl +/* 802B580C 002B276C 4E 80 04 21 */ bctrl /* 802B5810 002B2770 48 00 00 10 */ b lbl_802B5820 lbl_802B5814: /* 802B5814 002B2774 80 1F 00 5C */ lwz r0, 0x5c(r31) @@ -1110,7 +1110,7 @@ lbl_802B5820: /* 802B583C 002B279C 83 A1 00 24 */ lwz r29, 0x24(r1) /* 802B5840 002B27A0 7C 08 03 A6 */ mtlr r0 /* 802B5844 002B27A4 38 21 00 30 */ addi r1, r1, 0x30 -/* 802B5848 002B27A8 4E 80 00 20 */ blr +/* 802B5848 002B27A8 4E 80 00 20 */ blr .global SetGlobalSeed__6CDecalFUs SetGlobalSeed__6CDecalFUs: @@ -1124,7 +1124,7 @@ SetGlobalSeed__6CDecalFUs: /* 802B5868 002B27C8 80 01 00 14 */ lwz r0, 0x14(r1) /* 802B586C 002B27CC 7C 08 03 A6 */ mtlr r0 /* 802B5870 002B27D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802B5874 002B27D4 4E 80 00 20 */ blr +/* 802B5874 002B27D4 4E 80 00 20 */ blr .global __sinit_CDecal_cpp __sinit_CDecal_cpp: @@ -1137,4 +1137,4 @@ __sinit_CDecal_cpp: /* 802B5890 002B27F0 80 01 00 14 */ lwz r0, 0x14(r1) /* 802B5894 002B27F4 7C 08 03 A6 */ mtlr r0 /* 802B5898 002B27F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802B589C 002B27FC 4E 80 00 20 */ blr +/* 802B589C 002B27FC 4E 80 00 20 */ blr diff --git a/asm/Weapons/CDecalDataFactory.s b/asm/Weapons/CDecalDataFactory.s index 2aa3e35f..1505f788 100644 --- a/asm/Weapons/CDecalDataFactory.s +++ b/asm/Weapons/CDecalDataFactory.s @@ -358,7 +358,7 @@ lbl_802B3B74: /* 802B3B94 002B0AF4 81 83 00 00 */ lwz r12, 0(r3) /* 802B3B98 002B0AF8 81 8C 00 08 */ lwz r12, 8(r12) /* 802B3B9C 002B0AFC 7D 89 03 A6 */ mtctr r12 -/* 802B3BA0 002B0B00 4E 80 04 21 */ bctrl +/* 802B3BA0 002B0B00 4E 80 04 21 */ bctrl lbl_802B3BA4: /* 802B3BA4 002B0B04 93 5B 00 48 */ stw r26, 0x48(r27) /* 802B3BA8 002B0B08 48 00 01 30 */ b lbl_802B3CD8 @@ -374,7 +374,7 @@ lbl_802B3BAC: /* 802B3BCC 002B0B2C 81 83 00 00 */ lwz r12, 0(r3) /* 802B3BD0 002B0B30 81 8C 00 08 */ lwz r12, 8(r12) /* 802B3BD4 002B0B34 7D 89 03 A6 */ mtctr r12 -/* 802B3BD8 002B0B38 4E 80 04 21 */ bctrl +/* 802B3BD8 002B0B38 4E 80 04 21 */ bctrl lbl_802B3BDC: /* 802B3BDC 002B0B3C 93 5B 00 4C */ stw r26, 0x4c(r27) /* 802B3BE0 002B0B40 48 00 00 F8 */ b lbl_802B3CD8 @@ -390,7 +390,7 @@ lbl_802B3BE4: /* 802B3C04 002B0B64 81 83 00 00 */ lwz r12, 0(r3) /* 802B3C08 002B0B68 81 8C 00 08 */ lwz r12, 8(r12) /* 802B3C0C 002B0B6C 7D 89 03 A6 */ mtctr r12 -/* 802B3C10 002B0B70 4E 80 04 21 */ bctrl +/* 802B3C10 002B0B70 4E 80 04 21 */ bctrl lbl_802B3C14: /* 802B3C14 002B0B74 93 5B 00 50 */ stw r26, 0x50(r27) /* 802B3C18 002B0B78 48 00 00 C0 */ b lbl_802B3CD8 @@ -406,7 +406,7 @@ lbl_802B3C1C: /* 802B3C3C 002B0B9C 81 83 00 00 */ lwz r12, 0(r3) /* 802B3C40 002B0BA0 81 8C 00 08 */ lwz r12, 8(r12) /* 802B3C44 002B0BA4 7D 89 03 A6 */ mtctr r12 -/* 802B3C48 002B0BA8 4E 80 04 21 */ bctrl +/* 802B3C48 002B0BA8 4E 80 04 21 */ bctrl lbl_802B3C4C: /* 802B3C4C 002B0BAC 93 5B 00 54 */ stw r26, 0x54(r27) /* 802B3C50 002B0BB0 48 00 00 88 */ b lbl_802B3CD8 @@ -422,7 +422,7 @@ lbl_802B3C54: /* 802B3C74 002B0BD4 81 83 00 00 */ lwz r12, 0(r3) /* 802B3C78 002B0BD8 81 8C 00 08 */ lwz r12, 8(r12) /* 802B3C7C 002B0BDC 7D 89 03 A6 */ mtctr r12 -/* 802B3C80 002B0BE0 4E 80 04 21 */ bctrl +/* 802B3C80 002B0BE0 4E 80 04 21 */ bctrl lbl_802B3C84: /* 802B3C84 002B0BE4 93 5B 00 58 */ stw r26, 0x58(r27) /* 802B3C88 002B0BE8 48 00 00 50 */ b lbl_802B3CD8 @@ -462,7 +462,7 @@ lbl_802B3CF0: /* 802B3CF4 002B0C54 80 01 00 74 */ lwz r0, 0x74(r1) /* 802B3CF8 002B0C58 7C 08 03 A6 */ mtlr r0 /* 802B3CFC 002B0C5C 38 21 00 70 */ addi r1, r1, 0x70 -/* 802B3D00 002B0C60 4E 80 00 20 */ blr +/* 802B3D00 002B0C60 4E 80 00 20 */ blr .global __dt__13CColorElement __dt__13CColorElement: @@ -491,7 +491,7 @@ lbl_802B3D4C: /* 802B3D54 002B0CB4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802B3D58 002B0CB8 7C 08 03 A6 */ mtlr r0 /* 802B3D5C 002B0CBC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802B3D60 002B0CC0 4E 80 00 20 */ blr +/* 802B3D60 002B0CC0 4E 80 00 20 */ blr .global __dt__14CVectorElement __dt__14CVectorElement: @@ -520,7 +520,7 @@ lbl_802B3DAC: /* 802B3DB4 002B0D14 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802B3DB8 002B0D18 7C 08 03 A6 */ mtlr r0 /* 802B3DBC 002B0D1C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802B3DC0 002B0D20 4E 80 00 20 */ blr +/* 802B3DC0 002B0D20 4E 80 00 20 */ blr .global __dt__11CIntElement __dt__11CIntElement: @@ -549,7 +549,7 @@ lbl_802B3E0C: /* 802B3E14 002B0D74 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802B3E18 002B0D78 7C 08 03 A6 */ mtlr r0 /* 802B3E1C 002B0D7C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802B3E20 002B0D80 4E 80 00 20 */ blr +/* 802B3E20 002B0D80 4E 80 00 20 */ blr .global GetQuadDecalInfo__17CDecalDataFactoryFR12CInputStreamP11CSimplePoolUiRQ217CDecalDescription10SQuadDescr GetQuadDecalInfo__17CDecalDataFactoryFR12CInputStreamP11CSimplePoolUiRQ217CDecalDescription10SQuadDescr: @@ -646,7 +646,7 @@ lbl_802B3F54: /* 802B3F70 002B0ED0 81 83 00 00 */ lwz r12, 0(r3) /* 802B3F74 002B0ED4 81 8C 00 08 */ lwz r12, 8(r12) /* 802B3F78 002B0ED8 7D 89 03 A6 */ mtctr r12 -/* 802B3F7C 002B0EDC 4E 80 04 21 */ bctrl +/* 802B3F7C 002B0EDC 4E 80 04 21 */ bctrl lbl_802B3F80: /* 802B3F80 002B0EE0 93 DF 00 00 */ stw r30, 0(r31) /* 802B3F84 002B0EE4 48 00 01 10 */ b lbl_802B4094 @@ -661,7 +661,7 @@ lbl_802B3F88: /* 802B3FA4 002B0F04 81 83 00 00 */ lwz r12, 0(r3) /* 802B3FA8 002B0F08 81 8C 00 08 */ lwz r12, 8(r12) /* 802B3FAC 002B0F0C 7D 89 03 A6 */ mtctr r12 -/* 802B3FB0 002B0F10 4E 80 04 21 */ bctrl +/* 802B3FB0 002B0F10 4E 80 04 21 */ bctrl lbl_802B3FB4: /* 802B3FB4 002B0F14 93 DF 00 04 */ stw r30, 4(r31) /* 802B3FB8 002B0F18 48 00 00 DC */ b lbl_802B4094 @@ -676,7 +676,7 @@ lbl_802B3FBC: /* 802B3FD8 002B0F38 81 83 00 00 */ lwz r12, 0(r3) /* 802B3FDC 002B0F3C 81 8C 00 08 */ lwz r12, 8(r12) /* 802B3FE0 002B0F40 7D 89 03 A6 */ mtctr r12 -/* 802B3FE4 002B0F44 4E 80 04 21 */ bctrl +/* 802B3FE4 002B0F44 4E 80 04 21 */ bctrl lbl_802B3FE8: /* 802B3FE8 002B0F48 93 DF 00 08 */ stw r30, 8(r31) /* 802B3FEC 002B0F4C 48 00 00 A8 */ b lbl_802B4094 @@ -691,7 +691,7 @@ lbl_802B3FF0: /* 802B400C 002B0F6C 81 83 00 00 */ lwz r12, 0(r3) /* 802B4010 002B0F70 81 8C 00 08 */ lwz r12, 8(r12) /* 802B4014 002B0F74 7D 89 03 A6 */ mtctr r12 -/* 802B4018 002B0F78 4E 80 04 21 */ bctrl +/* 802B4018 002B0F78 4E 80 04 21 */ bctrl lbl_802B401C: /* 802B401C 002B0F7C 93 DF 00 0C */ stw r30, 0xc(r31) /* 802B4020 002B0F80 48 00 00 74 */ b lbl_802B4094 @@ -706,7 +706,7 @@ lbl_802B4024: /* 802B4040 002B0FA0 81 83 00 00 */ lwz r12, 0(r3) /* 802B4044 002B0FA4 81 8C 00 08 */ lwz r12, 8(r12) /* 802B4048 002B0FA8 7D 89 03 A6 */ mtctr r12 -/* 802B404C 002B0FAC 4E 80 04 21 */ bctrl +/* 802B404C 002B0FAC 4E 80 04 21 */ bctrl lbl_802B4050: /* 802B4050 002B0FB0 93 DF 00 10 */ stw r30, 0x10(r31) /* 802B4054 002B0FB4 48 00 00 40 */ b lbl_802B4094 @@ -721,7 +721,7 @@ lbl_802B4058: /* 802B4074 002B0FD4 81 83 00 00 */ lwz r12, 0(r3) /* 802B4078 002B0FD8 81 8C 00 08 */ lwz r12, 8(r12) /* 802B407C 002B0FDC 7D 89 03 A6 */ mtctr r12 -/* 802B4080 002B0FE0 4E 80 04 21 */ bctrl +/* 802B4080 002B0FE0 4E 80 04 21 */ bctrl lbl_802B4084: /* 802B4084 002B0FE4 93 DF 00 14 */ stw r30, 0x14(r31) /* 802B4088 002B0FE8 48 00 00 0C */ b lbl_802B4094 @@ -734,7 +734,7 @@ lbl_802B4094: /* 802B409C 002B0FFC 83 C1 00 08 */ lwz r30, 8(r1) /* 802B40A0 002B1000 7C 08 03 A6 */ mtlr r0 /* 802B40A4 002B1004 38 21 00 10 */ addi r1, r1, 0x10 -/* 802B40A8 002B1008 4E 80 00 20 */ blr +/* 802B40A8 002B1008 4E 80 00 20 */ blr .global __dt__10CUVElementFv __dt__10CUVElementFv: @@ -763,7 +763,7 @@ lbl_802B40F4: /* 802B40FC 002B105C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802B4100 002B1060 7C 08 03 A6 */ mtlr r0 /* 802B4104 002B1064 38 21 00 10 */ addi r1, r1, 0x10 -/* 802B4108 002B1068 4E 80 00 20 */ blr +/* 802B4108 002B1068 4E 80 00 20 */ blr .global __dt__12CRealElementFv __dt__12CRealElementFv: @@ -792,7 +792,7 @@ lbl_802B4154: /* 802B415C 002B10BC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802B4160 002B10C0 7C 08 03 A6 */ mtlr r0 /* 802B4164 002B10C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802B4168 002B10C8 4E 80 00 20 */ blr +/* 802B4168 002B10C8 4E 80 00 20 */ blr .global CreateGeneratorDescription__17CDecalDataFactoryFR12CInputStreamP11CSimplePool CreateGeneratorDescription__17CDecalDataFactoryFR12CInputStreamP11CSimplePool: @@ -833,7 +833,7 @@ lbl_802B41DC: /* 802B41E8 002B1148 83 A1 00 14 */ lwz r29, 0x14(r1) /* 802B41EC 002B114C 7C 08 03 A6 */ mtlr r0 /* 802B41F0 002B1150 38 21 00 20 */ addi r1, r1, 0x20 -/* 802B41F4 002B1154 4E 80 00 20 */ blr +/* 802B41F4 002B1154 4E 80 00 20 */ blr .global GetGeneratorDesc__17CDecalDataFactoryFR12CInputStreamP11CSimplePool GetGeneratorDesc__17CDecalDataFactoryFR12CInputStreamP11CSimplePool: @@ -844,7 +844,7 @@ GetGeneratorDesc__17CDecalDataFactoryFR12CInputStreamP11CSimplePool: /* 802B4208 002B1168 80 01 00 14 */ lwz r0, 0x14(r1) /* 802B420C 002B116C 7C 08 03 A6 */ mtlr r0 /* 802B4210 002B1170 38 21 00 10 */ addi r1, r1, 0x10 -/* 802B4214 002B1174 4E 80 00 20 */ blr +/* 802B4214 002B1174 4E 80 00 20 */ blr .global sub_802b4218 sub_802b4218: @@ -886,7 +886,7 @@ lbl_802B428C: /* 802B4298 002B11F8 83 C1 00 08 */ lwz r30, 8(r1) /* 802B429C 002B11FC 7C 08 03 A6 */ mtlr r0 /* 802B42A0 002B1200 38 21 00 10 */ addi r1, r1, 0x10 -/* 802B42A4 002B1204 4E 80 00 20 */ blr +/* 802B42A4 002B1204 4E 80 00 20 */ blr .global sub_802b42a8 sub_802b42a8: @@ -907,7 +907,7 @@ sub_802b42a8: /* 802B42E0 002B1240 38 80 00 01 */ li r4, 1 /* 802B42E4 002B1244 81 8C 00 08 */ lwz r12, 8(r12) /* 802B42E8 002B1248 7D 89 03 A6 */ mtctr r12 -/* 802B42EC 002B124C 4E 80 04 21 */ bctrl +/* 802B42EC 002B124C 4E 80 04 21 */ bctrl lbl_802B42F0: /* 802B42F0 002B1250 34 1F 00 54 */ addic. r0, r31, 0x54 /* 802B42F4 002B1254 41 82 00 24 */ beq lbl_802B4318 @@ -918,7 +918,7 @@ lbl_802B42F0: /* 802B4308 002B1268 38 80 00 01 */ li r4, 1 /* 802B430C 002B126C 81 8C 00 08 */ lwz r12, 8(r12) /* 802B4310 002B1270 7D 89 03 A6 */ mtctr r12 -/* 802B4314 002B1274 4E 80 04 21 */ bctrl +/* 802B4314 002B1274 4E 80 04 21 */ bctrl lbl_802B4318: /* 802B4318 002B1278 34 1F 00 50 */ addic. r0, r31, 0x50 /* 802B431C 002B127C 41 82 00 24 */ beq lbl_802B4340 @@ -929,7 +929,7 @@ lbl_802B4318: /* 802B4330 002B1290 38 80 00 01 */ li r4, 1 /* 802B4334 002B1294 81 8C 00 08 */ lwz r12, 8(r12) /* 802B4338 002B1298 7D 89 03 A6 */ mtctr r12 -/* 802B433C 002B129C 4E 80 04 21 */ bctrl +/* 802B433C 002B129C 4E 80 04 21 */ bctrl lbl_802B4340: /* 802B4340 002B12A0 34 1F 00 4C */ addic. r0, r31, 0x4c /* 802B4344 002B12A4 41 82 00 24 */ beq lbl_802B4368 @@ -940,7 +940,7 @@ lbl_802B4340: /* 802B4358 002B12B8 38 80 00 01 */ li r4, 1 /* 802B435C 002B12BC 81 8C 00 08 */ lwz r12, 8(r12) /* 802B4360 002B12C0 7D 89 03 A6 */ mtctr r12 -/* 802B4364 002B12C4 4E 80 04 21 */ bctrl +/* 802B4364 002B12C4 4E 80 04 21 */ bctrl lbl_802B4368: /* 802B4368 002B12C8 34 1F 00 48 */ addic. r0, r31, 0x48 /* 802B436C 002B12CC 41 82 00 24 */ beq lbl_802B4390 @@ -951,7 +951,7 @@ lbl_802B4368: /* 802B4380 002B12E0 38 80 00 01 */ li r4, 1 /* 802B4384 002B12E4 81 8C 00 08 */ lwz r12, 8(r12) /* 802B4388 002B12E8 7D 89 03 A6 */ mtctr r12 -/* 802B438C 002B12EC 4E 80 04 21 */ bctrl +/* 802B438C 002B12EC 4E 80 04 21 */ bctrl lbl_802B4390: /* 802B4390 002B12F0 34 1F 00 38 */ addic. r0, r31, 0x38 /* 802B4394 002B12F4 41 82 00 30 */ beq lbl_802B43C4 @@ -979,7 +979,7 @@ lbl_802B43C4: /* 802B43E4 002B1344 38 80 00 01 */ li r4, 1 /* 802B43E8 002B1348 81 8C 00 08 */ lwz r12, 8(r12) /* 802B43EC 002B134C 7D 89 03 A6 */ mtctr r12 -/* 802B43F0 002B1350 4E 80 04 21 */ bctrl +/* 802B43F0 002B1350 4E 80 04 21 */ bctrl lbl_802B43F4: /* 802B43F4 002B1354 34 1F 00 2C */ addic. r0, r31, 0x2c /* 802B43F8 002B1358 41 82 00 24 */ beq lbl_802B441C @@ -990,7 +990,7 @@ lbl_802B43F4: /* 802B440C 002B136C 38 80 00 01 */ li r4, 1 /* 802B4410 002B1370 81 8C 00 08 */ lwz r12, 8(r12) /* 802B4414 002B1374 7D 89 03 A6 */ mtctr r12 -/* 802B4418 002B1378 4E 80 04 21 */ bctrl +/* 802B4418 002B1378 4E 80 04 21 */ bctrl lbl_802B441C: /* 802B441C 002B137C 34 1F 00 28 */ addic. r0, r31, 0x28 /* 802B4420 002B1380 41 82 00 24 */ beq lbl_802B4444 @@ -1001,7 +1001,7 @@ lbl_802B441C: /* 802B4434 002B1394 38 80 00 01 */ li r4, 1 /* 802B4438 002B1398 81 8C 00 08 */ lwz r12, 8(r12) /* 802B443C 002B139C 7D 89 03 A6 */ mtctr r12 -/* 802B4440 002B13A0 4E 80 04 21 */ bctrl +/* 802B4440 002B13A0 4E 80 04 21 */ bctrl lbl_802B4444: /* 802B4444 002B13A4 34 1F 00 24 */ addic. r0, r31, 0x24 /* 802B4448 002B13A8 41 82 00 24 */ beq lbl_802B446C @@ -1012,7 +1012,7 @@ lbl_802B4444: /* 802B445C 002B13BC 38 80 00 01 */ li r4, 1 /* 802B4460 002B13C0 81 8C 00 08 */ lwz r12, 8(r12) /* 802B4464 002B13C4 7D 89 03 A6 */ mtctr r12 -/* 802B4468 002B13C8 4E 80 04 21 */ bctrl +/* 802B4468 002B13C8 4E 80 04 21 */ bctrl lbl_802B446C: /* 802B446C 002B13CC 34 1F 00 20 */ addic. r0, r31, 0x20 /* 802B4470 002B13D0 41 82 00 24 */ beq lbl_802B4494 @@ -1023,7 +1023,7 @@ lbl_802B446C: /* 802B4484 002B13E4 38 80 00 01 */ li r4, 1 /* 802B4488 002B13E8 81 8C 00 08 */ lwz r12, 8(r12) /* 802B448C 002B13EC 7D 89 03 A6 */ mtctr r12 -/* 802B4490 002B13F0 4E 80 04 21 */ bctrl +/* 802B4490 002B13F0 4E 80 04 21 */ bctrl lbl_802B4494: /* 802B4494 002B13F4 34 1F 00 1C */ addic. r0, r31, 0x1c /* 802B4498 002B13F8 41 82 00 24 */ beq lbl_802B44BC @@ -1034,7 +1034,7 @@ lbl_802B4494: /* 802B44AC 002B140C 38 80 00 01 */ li r4, 1 /* 802B44B0 002B1410 81 8C 00 08 */ lwz r12, 8(r12) /* 802B44B4 002B1414 7D 89 03 A6 */ mtctr r12 -/* 802B44B8 002B1418 4E 80 04 21 */ bctrl +/* 802B44B8 002B1418 4E 80 04 21 */ bctrl lbl_802B44BC: /* 802B44BC 002B141C 28 1F 00 00 */ cmplwi r31, 0 /* 802B44C0 002B1420 41 82 00 F4 */ beq lbl_802B45B4 @@ -1047,7 +1047,7 @@ lbl_802B44BC: /* 802B44DC 002B143C 38 80 00 01 */ li r4, 1 /* 802B44E0 002B1440 81 8C 00 08 */ lwz r12, 8(r12) /* 802B44E4 002B1444 7D 89 03 A6 */ mtctr r12 -/* 802B44E8 002B1448 4E 80 04 21 */ bctrl +/* 802B44E8 002B1448 4E 80 04 21 */ bctrl lbl_802B44EC: /* 802B44EC 002B144C 34 1F 00 10 */ addic. r0, r31, 0x10 /* 802B44F0 002B1450 41 82 00 24 */ beq lbl_802B4514 @@ -1058,7 +1058,7 @@ lbl_802B44EC: /* 802B4504 002B1464 38 80 00 01 */ li r4, 1 /* 802B4508 002B1468 81 8C 00 08 */ lwz r12, 8(r12) /* 802B450C 002B146C 7D 89 03 A6 */ mtctr r12 -/* 802B4510 002B1470 4E 80 04 21 */ bctrl +/* 802B4510 002B1470 4E 80 04 21 */ bctrl lbl_802B4514: /* 802B4514 002B1474 34 1F 00 0C */ addic. r0, r31, 0xc /* 802B4518 002B1478 41 82 00 24 */ beq lbl_802B453C @@ -1069,7 +1069,7 @@ lbl_802B4514: /* 802B452C 002B148C 38 80 00 01 */ li r4, 1 /* 802B4530 002B1490 81 8C 00 08 */ lwz r12, 8(r12) /* 802B4534 002B1494 7D 89 03 A6 */ mtctr r12 -/* 802B4538 002B1498 4E 80 04 21 */ bctrl +/* 802B4538 002B1498 4E 80 04 21 */ bctrl lbl_802B453C: /* 802B453C 002B149C 34 1F 00 08 */ addic. r0, r31, 8 /* 802B4540 002B14A0 41 82 00 24 */ beq lbl_802B4564 @@ -1080,7 +1080,7 @@ lbl_802B453C: /* 802B4554 002B14B4 38 80 00 01 */ li r4, 1 /* 802B4558 002B14B8 81 8C 00 08 */ lwz r12, 8(r12) /* 802B455C 002B14BC 7D 89 03 A6 */ mtctr r12 -/* 802B4560 002B14C0 4E 80 04 21 */ bctrl +/* 802B4560 002B14C0 4E 80 04 21 */ bctrl lbl_802B4564: /* 802B4564 002B14C4 34 1F 00 04 */ addic. r0, r31, 4 /* 802B4568 002B14C8 41 82 00 24 */ beq lbl_802B458C @@ -1091,7 +1091,7 @@ lbl_802B4564: /* 802B457C 002B14DC 38 80 00 01 */ li r4, 1 /* 802B4580 002B14E0 81 8C 00 08 */ lwz r12, 8(r12) /* 802B4584 002B14E4 7D 89 03 A6 */ mtctr r12 -/* 802B4588 002B14E8 4E 80 04 21 */ bctrl +/* 802B4588 002B14E8 4E 80 04 21 */ bctrl lbl_802B458C: /* 802B458C 002B14EC 28 1F 00 00 */ cmplwi r31, 0 /* 802B4590 002B14F0 41 82 00 24 */ beq lbl_802B45B4 @@ -1102,7 +1102,7 @@ lbl_802B458C: /* 802B45A4 002B1504 38 80 00 01 */ li r4, 1 /* 802B45A8 002B1508 81 8C 00 08 */ lwz r12, 8(r12) /* 802B45AC 002B150C 7D 89 03 A6 */ mtctr r12 -/* 802B45B0 002B1510 4E 80 04 21 */ bctrl +/* 802B45B0 002B1510 4E 80 04 21 */ bctrl lbl_802B45B4: /* 802B45B4 002B1514 7F C0 07 35 */ extsh. r0, r30 /* 802B45B8 002B1518 40 81 00 0C */ ble lbl_802B45C4 @@ -1115,7 +1115,7 @@ lbl_802B45C4: /* 802B45D0 002B1530 83 C1 00 08 */ lwz r30, 8(r1) /* 802B45D4 002B1534 7C 08 03 A6 */ mtlr r0 /* 802B45D8 002B1538 38 21 00 10 */ addi r1, r1, 0x10 -/* 802B45DC 002B153C 4E 80 00 20 */ blr +/* 802B45DC 002B153C 4E 80 00 20 */ blr .global FDecalDataFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer FDecalDataFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer: @@ -1144,7 +1144,7 @@ FDecalDataFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer: /* 802B4638 002B1598 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802B463C 002B159C 7C 08 03 A6 */ mtlr r0 /* 802B4640 002B15A0 38 21 00 20 */ addi r1, r1, 0x20 -/* 802B4644 002B15A4 4E 80 00 20 */ blr +/* 802B4644 002B15A4 4E 80 00 20 */ blr .global "__ct__Q24rstl29auto_ptr<17CDecalDescription>FP17CDecalDescription" "__ct__Q24rstl29auto_ptr<17CDecalDescription>FP17CDecalDescription": @@ -1179,7 +1179,7 @@ FDecalDataFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer: /* 802B46B8 002B1618 38 80 00 01 */ li r4, 1 /* 802B46BC 002B161C 81 8C 00 08 */ lwz r12, 8(r12) /* 802B46C0 002B1620 7D 89 03 A6 */ mtctr r12 -/* 802B46C4 002B1624 4E 80 04 21 */ bctrl +/* 802B46C4 002B1624 4E 80 04 21 */ bctrl lbl_802B46C8: /* 802B46C8 002B1628 38 61 00 10 */ addi r3, r1, 0x10 /* 802B46CC 002B162C 38 80 FF FF */ li r4, -1 @@ -1189,7 +1189,7 @@ lbl_802B46C8: /* 802B46DC 002B163C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802B46E0 002B1640 7C 08 03 A6 */ mtlr r0 /* 802B46E4 002B1644 38 21 00 20 */ addi r1, r1, 0x20 -/* 802B46E8 002B1648 4E 80 00 20 */ blr +/* 802B46E8 002B1648 4E 80 00 20 */ blr .global "GetIObjObjectFor__27TToken<17CDecalDescription>FRCQ24rstl29auto_ptr<17CDecalDescription>" "GetIObjObjectFor__27TToken<17CDecalDescription>FRCQ24rstl29auto_ptr<17CDecalDescription>": @@ -1203,7 +1203,7 @@ lbl_802B46C8: /* 802B4708 002B1668 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802B470C 002B166C 7C 08 03 A6 */ mtlr r0 /* 802B4710 002B1670 38 21 00 10 */ addi r1, r1, 0x10 -/* 802B4714 002B1674 4E 80 00 20 */ blr +/* 802B4714 002B1674 4E 80 00 20 */ blr .global "GetNewDerivedObject__45TObjOwnerDerivedFromIObj<17CDecalDescription>FRCQ24rstl29auto_ptr<17CDecalDescription>" "GetNewDerivedObject__45TObjOwnerDerivedFromIObj<17CDecalDescription>FRCQ24rstl29auto_ptr<17CDecalDescription>": @@ -1246,7 +1246,7 @@ lbl_802B4788: /* 802B47A4 002B1704 80 01 00 14 */ lwz r0, 0x14(r1) /* 802B47A8 002B1708 7C 08 03 A6 */ mtlr r0 /* 802B47AC 002B170C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802B47B0 002B1710 4E 80 00 20 */ blr +/* 802B47B0 002B1710 4E 80 00 20 */ blr .global sub_802b47b4 sub_802b47b4: @@ -1276,12 +1276,12 @@ lbl_802B47FC: /* 802B4808 002B1768 83 C1 00 08 */ lwz r30, 8(r1) /* 802B480C 002B176C 7C 08 03 A6 */ mtlr r0 /* 802B4810 002B1770 38 21 00 10 */ addi r1, r1, 0x10 -/* 802B4814 002B1774 4E 80 00 20 */ blr +/* 802B4814 002B1774 4E 80 00 20 */ blr .global IsConstant__12CRealElementCFv IsConstant__12CRealElementCFv: /* 802B4818 002B1778 38 60 00 00 */ li r3, 0 -/* 802B481C 002B177C 4E 80 00 20 */ blr +/* 802B481C 002B177C 4E 80 00 20 */ blr .global IsFastConstant__14CVectorElementCFv IsFastConstant__14CVectorElementCFv: diff --git a/asm/Weapons/CDecalDescription.s b/asm/Weapons/CDecalDescription.s index 3f65ac04..5f9c4bec 100644 --- a/asm/Weapons/CDecalDescription.s +++ b/asm/Weapons/CDecalDescription.s @@ -30,4 +30,4 @@ __ct__17CDecalDescriptionFv: /* 802B5D40 002B2CA0 80 01 00 14 */ lwz r0, 0x14(r1) /* 802B5D44 002B2CA4 7C 08 03 A6 */ mtlr r0 /* 802B5D48 002B2CA8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802B5D4C 002B2CAC 4E 80 00 20 */ blr +/* 802B5D4C 002B2CAC 4E 80 00 20 */ blr diff --git a/asm/Weapons/CProjectileWeapon.s b/asm/Weapons/CProjectileWeapon.s index 12dcec53..7dc4deac 100644 --- a/asm/Weapons/CProjectileWeapon.s +++ b/asm/Weapons/CProjectileWeapon.s @@ -68,7 +68,7 @@ GetBounds__17CProjectileWeaponCFv: /* 802AED74 002ABCD4 38 61 00 78 */ addi r3, r1, 0x78 /* 802AED78 002ABCD8 81 8C 00 5C */ lwz r12, 0x5c(r12) /* 802AED7C 002ABCDC 7D 89 03 A6 */ mtctr r12 -/* 802AED80 002ABCE0 4E 80 04 21 */ bctrl +/* 802AED80 002ABCE0 4E 80 04 21 */ bctrl /* 802AED84 002ABCE4 88 01 00 90 */ lbz r0, 0x90(r1) /* 802AED88 002ABCE8 28 00 00 00 */ cmplwi r0, 0 /* 802AED8C 002ABCEC 98 01 01 1C */ stb r0, 0x11c(r1) @@ -112,7 +112,7 @@ lbl_802AEE08: /* 802AEE18 002ABD78 38 61 00 5C */ addi r3, r1, 0x5c /* 802AEE1C 002ABD7C 81 8C 00 5C */ lwz r12, 0x5c(r12) /* 802AEE20 002ABD80 7D 89 03 A6 */ mtctr r12 -/* 802AEE24 002ABD84 4E 80 04 21 */ bctrl +/* 802AEE24 002ABD84 4E 80 04 21 */ bctrl /* 802AEE28 002ABD88 88 01 00 74 */ lbz r0, 0x74(r1) /* 802AEE2C 002ABD8C 28 00 00 00 */ cmplwi r0, 0 /* 802AEE30 002ABD90 98 01 01 00 */ stb r0, 0x100(r1) @@ -156,7 +156,7 @@ lbl_802AEEAC: /* 802AEEBC 002ABE1C 38 61 00 40 */ addi r3, r1, 0x40 /* 802AEEC0 002ABE20 81 8C 00 5C */ lwz r12, 0x5c(r12) /* 802AEEC4 002ABE24 7D 89 03 A6 */ mtctr r12 -/* 802AEEC8 002ABE28 4E 80 04 21 */ bctrl +/* 802AEEC8 002ABE28 4E 80 04 21 */ bctrl /* 802AEECC 002ABE2C 88 01 00 58 */ lbz r0, 0x58(r1) /* 802AEED0 002ABE30 28 00 00 00 */ cmplwi r0, 0 /* 802AEED4 002ABE34 98 01 00 E4 */ stb r0, 0xe4(r1) @@ -200,7 +200,7 @@ lbl_802AEF50: /* 802AEF60 002ABEC0 38 61 00 24 */ addi r3, r1, 0x24 /* 802AEF64 002ABEC4 81 8C 00 5C */ lwz r12, 0x5c(r12) /* 802AEF68 002ABEC8 7D 89 03 A6 */ mtctr r12 -/* 802AEF6C 002ABECC 4E 80 04 21 */ bctrl +/* 802AEF6C 002ABECC 4E 80 04 21 */ bctrl /* 802AEF70 002ABED0 88 01 00 3C */ lbz r0, 0x3c(r1) /* 802AEF74 002ABED4 28 00 00 00 */ cmplwi r0, 0 /* 802AEF78 002ABED8 98 01 00 C8 */ stb r0, 0xc8(r1) @@ -244,7 +244,7 @@ lbl_802AEFF4: /* 802AF004 002ABF64 38 61 00 08 */ addi r3, r1, 8 /* 802AF008 002ABF68 81 8C 00 5C */ lwz r12, 0x5c(r12) /* 802AF00C 002ABF6C 7D 89 03 A6 */ mtctr r12 -/* 802AF010 002ABF70 4E 80 04 21 */ bctrl +/* 802AF010 002ABF70 4E 80 04 21 */ bctrl /* 802AF014 002ABF74 88 01 00 20 */ lbz r0, 0x20(r1) /* 802AF018 002ABF78 28 00 00 00 */ cmplwi r0, 0 /* 802AF01C 002ABF7C 98 01 00 AC */ stb r0, 0xac(r1) @@ -310,17 +310,17 @@ lbl_802AF0EC: /* 802AF0F8 002AC058 83 A1 01 44 */ lwz r29, 0x144(r1) /* 802AF0FC 002AC05C 7C 08 03 A6 */ mtlr r0 /* 802AF100 002AC060 38 21 01 50 */ addi r1, r1, 0x150 -/* 802AF104 002AC064 4E 80 00 20 */ blr +/* 802AF104 002AC064 4E 80 00 20 */ blr .global SetGlobalSeed__17CProjectileWeaponFUs SetGlobalSeed__17CProjectileWeaponFUs: /* 802AF108 002AC068 90 6D 9A 88 */ stw r3, lbl_805A8648@sda21(r13) -/* 802AF10C 002AC06C 4E 80 00 20 */ blr +/* 802AF10C 002AC06C 4E 80 00 20 */ blr .global sub_802af110 sub_802af110: /* 802AF110 002AC070 38 63 00 BC */ addi r3, r3, 0xbc -/* 802AF114 002AC074 4E 80 00 20 */ blr +/* 802AF114 002AC074 4E 80 00 20 */ blr .global SetGravity__17CProjectileWeaponFRC9CVector3f SetGravity__17CProjectileWeaponFRC9CVector3f: @@ -330,12 +330,12 @@ SetGravity__17CProjectileWeaponFRC9CVector3f: /* 802AF124 002AC084 D0 03 00 C0 */ stfs f0, 0xc0(r3) /* 802AF128 002AC088 C0 04 00 08 */ lfs f0, 8(r4) /* 802AF12C 002AC08C D0 03 00 C4 */ stfs f0, 0xc4(r3) -/* 802AF130 002AC090 4E 80 00 20 */ blr +/* 802AF130 002AC090 4E 80 00 20 */ blr .global GetVelocity__17CProjectileWeaponCFv GetVelocity__17CProjectileWeaponCFv: /* 802AF134 002AC094 38 63 00 B0 */ addi r3, r3, 0xb0 -/* 802AF138 002AC098 4E 80 00 20 */ blr +/* 802AF138 002AC098 4E 80 00 20 */ blr .global SetVelocity__17CProjectileWeaponFRC9CVector3f SetVelocity__17CProjectileWeaponFRC9CVector3f: @@ -345,12 +345,12 @@ SetVelocity__17CProjectileWeaponFRC9CVector3f: /* 802AF148 002AC0A8 D0 03 00 B4 */ stfs f0, 0xb4(r3) /* 802AF14C 002AC0AC C0 04 00 08 */ lfs f0, 8(r4) /* 802AF150 002AC0B0 D0 03 00 B8 */ stfs f0, 0xb8(r3) -/* 802AF154 002AC0B4 4E 80 00 20 */ blr +/* 802AF154 002AC0B4 4E 80 00 20 */ blr .global GetMaxTurnRate__17CProjectileWeaponCFv GetMaxTurnRate__17CProjectileWeaponCFv: /* 802AF158 002AC0B8 C0 23 00 E0 */ lfs f1, 0xe0(r3) -/* 802AF15C 002AC0BC 4E 80 00 20 */ blr +/* 802AF15C 002AC0BC 4E 80 00 20 */ blr .global GetAudibleFallOff__17CProjectileWeaponCFv GetAudibleFallOff__17CProjectileWeaponCFv: @@ -384,7 +384,7 @@ lbl_802AF1BC: /* 802AF1C4 002AC124 CB E1 00 10 */ lfd f31, 0x10(r1) /* 802AF1C8 002AC128 7C 08 03 A6 */ mtlr r0 /* 802AF1CC 002AC12C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802AF1D0 002AC130 4E 80 00 20 */ blr +/* 802AF1D0 002AC130 4E 80 00 20 */ blr .global GetAudibleRange__17CProjectileWeaponCFv GetAudibleRange__17CProjectileWeaponCFv: @@ -418,7 +418,7 @@ lbl_802AF230: /* 802AF238 002AC198 CB E1 00 10 */ lfd f31, 0x10(r1) /* 802AF23C 002AC19C 7C 08 03 A6 */ mtlr r0 /* 802AF240 002AC1A0 38 21 00 20 */ addi r1, r1, 0x20 -/* 802AF244 002AC1A4 4E 80 00 20 */ blr +/* 802AF244 002AC1A4 4E 80 00 20 */ blr .global GetDecalForCollision__17CProjectileWeaponCF29EWeaponCollisionResponseTypes GetDecalForCollision__17CProjectileWeaponCF29EWeaponCollisionResponseTypes: @@ -456,7 +456,7 @@ lbl_802AF2B4: /* 802AF2BC 002AC21C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 802AF2C0 002AC220 7C 08 03 A6 */ mtlr r0 /* 802AF2C4 002AC224 38 21 00 20 */ addi r1, r1, 0x20 -/* 802AF2C8 002AC228 4E 80 00 20 */ blr +/* 802AF2C8 002AC228 4E 80 00 20 */ blr .global GetSoundIdForCollision__17CProjectileWeaponCF29EWeaponCollisionResponseTypes GetSoundIdForCollision__17CProjectileWeaponCF29EWeaponCollisionResponseTypes: @@ -490,7 +490,7 @@ lbl_802AF32C: /* 802AF330 002AC290 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802AF334 002AC294 7C 08 03 A6 */ mtlr r0 /* 802AF338 002AC298 38 21 00 20 */ addi r1, r1, 0x20 -/* 802AF33C 002AC29C 4E 80 00 20 */ blr +/* 802AF33C 002AC29C 4E 80 00 20 */ blr .global CollisionOccured__17CProjectileWeaponF29EWeaponCollisionResponseTypesbbRC9CVector3fRC9CVector3fRC9CVector3f CollisionOccured__17CProjectileWeaponF29EWeaponCollisionResponseTypesbbRC9CVector3fRC9CVector3fRC9CVector3f: @@ -540,7 +540,7 @@ CollisionOccured__17CProjectileWeaponF29EWeaponCollisionResponseTypesbbRC9CVecto /* 802AF3EC 002AC34C 81 9E 00 00 */ lwz r12, 0(r30) /* 802AF3F0 002AC350 81 8C 00 18 */ lwz r12, 0x18(r12) /* 802AF3F4 002AC354 7D 89 03 A6 */ mtctr r12 -/* 802AF3F8 002AC358 4E 80 04 21 */ bctrl +/* 802AF3F8 002AC358 4E 80 04 21 */ bctrl /* 802AF3FC 002AC35C C0 3C 00 04 */ lfs f1, 4(r28) /* 802AF400 002AC360 57 40 06 3F */ clrlwi. r0, r26, 0x18 /* 802AF404 002AC364 C0 01 00 44 */ lfs f0, 0x44(r1) @@ -631,7 +631,7 @@ lbl_802AF52C: /* 802AF54C 002AC4AC 38 80 00 00 */ li r4, 0 /* 802AF550 002AC4B0 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 802AF554 002AC4B4 7D 89 03 A6 */ mtctr r12 -/* 802AF558 002AC4B8 4E 80 04 21 */ bctrl +/* 802AF558 002AC4B8 4E 80 04 21 */ bctrl lbl_802AF55C: /* 802AF55C 002AC4BC 80 7E 01 00 */ lwz r3, 0x100(r30) /* 802AF560 002AC4C0 28 03 00 00 */ cmplwi r3, 0 @@ -640,7 +640,7 @@ lbl_802AF55C: /* 802AF56C 002AC4CC 38 80 00 00 */ li r4, 0 /* 802AF570 002AC4D0 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 802AF574 002AC4D4 7D 89 03 A6 */ mtctr r12 -/* 802AF578 002AC4D8 4E 80 04 21 */ bctrl +/* 802AF578 002AC4D8 4E 80 04 21 */ bctrl lbl_802AF57C: /* 802AF57C 002AC4DC 80 7E 01 18 */ lwz r3, 0x118(r30) /* 802AF580 002AC4E0 28 03 00 00 */ cmplwi r3, 0 @@ -649,7 +649,7 @@ lbl_802AF57C: /* 802AF58C 002AC4EC 38 80 00 00 */ li r4, 0 /* 802AF590 002AC4F0 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 802AF594 002AC4F4 7D 89 03 A6 */ mtctr r12 -/* 802AF598 002AC4F8 4E 80 04 21 */ bctrl +/* 802AF598 002AC4F8 4E 80 04 21 */ bctrl lbl_802AF59C: /* 802AF59C 002AC4FC 80 7E 01 1C */ lwz r3, 0x11c(r30) /* 802AF5A0 002AC500 28 03 00 00 */ cmplwi r3, 0 @@ -658,7 +658,7 @@ lbl_802AF59C: /* 802AF5AC 002AC50C 38 80 00 00 */ li r4, 0 /* 802AF5B0 002AC510 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 802AF5B4 002AC514 7D 89 03 A6 */ mtctr r12 -/* 802AF5B8 002AC518 4E 80 04 21 */ bctrl +/* 802AF5B8 002AC518 4E 80 04 21 */ bctrl lbl_802AF5BC: /* 802AF5BC 002AC51C 80 7E 01 20 */ lwz r3, 0x120(r30) /* 802AF5C0 002AC520 28 03 00 00 */ cmplwi r3, 0 @@ -667,7 +667,7 @@ lbl_802AF5BC: /* 802AF5CC 002AC52C 38 80 00 00 */ li r4, 0 /* 802AF5D0 002AC530 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 802AF5D4 002AC534 7D 89 03 A6 */ mtctr r12 -/* 802AF5D8 002AC538 4E 80 04 21 */ bctrl +/* 802AF5D8 002AC538 4E 80 04 21 */ bctrl lbl_802AF5DC: /* 802AF5DC 002AC53C 80 9E 00 0C */ lwz r4, 0xc(r30) /* 802AF5E0 002AC540 88 04 00 A0 */ lbz r0, 0xa0(r4) @@ -695,7 +695,7 @@ lbl_802AF62C: /* 802AF630 002AC590 80 01 01 54 */ lwz r0, 0x154(r1) /* 802AF634 002AC594 7C 08 03 A6 */ mtlr r0 /* 802AF638 002AC598 38 21 01 50 */ addi r1, r1, 0x150 -/* 802AF63C 002AC59C 4E 80 00 20 */ blr +/* 802AF63C 002AC59C 4E 80 00 20 */ blr .global RenderParticles__17CProjectileWeaponCFv RenderParticles__17CProjectileWeaponCFv: @@ -710,7 +710,7 @@ RenderParticles__17CProjectileWeaponCFv: /* 802AF660 002AC5C0 81 83 00 00 */ lwz r12, 0(r3) /* 802AF664 002AC5C4 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802AF668 002AC5C8 7D 89 03 A6 */ mtctr r12 -/* 802AF66C 002AC5CC 4E 80 04 21 */ bctrl +/* 802AF66C 002AC5CC 4E 80 04 21 */ bctrl lbl_802AF670: /* 802AF670 002AC5D0 80 7F 01 00 */ lwz r3, 0x100(r31) /* 802AF674 002AC5D4 28 03 00 00 */ cmplwi r3, 0 @@ -718,7 +718,7 @@ lbl_802AF670: /* 802AF67C 002AC5DC 81 83 00 00 */ lwz r12, 0(r3) /* 802AF680 002AC5E0 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802AF684 002AC5E4 7D 89 03 A6 */ mtctr r12 -/* 802AF688 002AC5E8 4E 80 04 21 */ bctrl +/* 802AF688 002AC5E8 4E 80 04 21 */ bctrl lbl_802AF68C: /* 802AF68C 002AC5EC 80 7F 01 18 */ lwz r3, 0x118(r31) /* 802AF690 002AC5F0 28 03 00 00 */ cmplwi r3, 0 @@ -726,7 +726,7 @@ lbl_802AF68C: /* 802AF698 002AC5F8 81 83 00 00 */ lwz r12, 0(r3) /* 802AF69C 002AC5FC 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802AF6A0 002AC600 7D 89 03 A6 */ mtctr r12 -/* 802AF6A4 002AC604 4E 80 04 21 */ bctrl +/* 802AF6A4 002AC604 4E 80 04 21 */ bctrl lbl_802AF6A8: /* 802AF6A8 002AC608 80 7F 01 1C */ lwz r3, 0x11c(r31) /* 802AF6AC 002AC60C 28 03 00 00 */ cmplwi r3, 0 @@ -734,7 +734,7 @@ lbl_802AF6A8: /* 802AF6B4 002AC614 81 83 00 00 */ lwz r12, 0(r3) /* 802AF6B8 002AC618 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802AF6BC 002AC61C 7D 89 03 A6 */ mtctr r12 -/* 802AF6C0 002AC620 4E 80 04 21 */ bctrl +/* 802AF6C0 002AC620 4E 80 04 21 */ bctrl lbl_802AF6C4: /* 802AF6C4 002AC624 80 7F 01 20 */ lwz r3, 0x120(r31) /* 802AF6C8 002AC628 28 03 00 00 */ cmplwi r3, 0 @@ -742,7 +742,7 @@ lbl_802AF6C4: /* 802AF6D0 002AC630 81 83 00 00 */ lwz r12, 0(r3) /* 802AF6D4 002AC634 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802AF6D8 002AC638 7D 89 03 A6 */ mtctr r12 -/* 802AF6DC 002AC63C 4E 80 04 21 */ bctrl +/* 802AF6DC 002AC63C 4E 80 04 21 */ bctrl lbl_802AF6E0: /* 802AF6E0 002AC640 80 7F 01 04 */ lwz r3, 0x104(r31) /* 802AF6E4 002AC644 28 03 00 00 */ cmplwi r3, 0 @@ -750,13 +750,13 @@ lbl_802AF6E0: /* 802AF6EC 002AC64C 81 83 00 00 */ lwz r12, 0(r3) /* 802AF6F0 002AC650 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802AF6F4 002AC654 7D 89 03 A6 */ mtctr r12 -/* 802AF6F8 002AC658 4E 80 04 21 */ bctrl +/* 802AF6F8 002AC658 4E 80 04 21 */ bctrl lbl_802AF6FC: /* 802AF6FC 002AC65C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802AF700 002AC660 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802AF704 002AC664 7C 08 03 A6 */ mtlr r0 /* 802AF708 002AC668 38 21 00 10 */ addi r1, r1, 0x10 -/* 802AF70C 002AC66C 4E 80 00 20 */ blr +/* 802AF70C 002AC66C 4E 80 00 20 */ blr .global AddToRenderer__17CProjectileWeaponCFv AddToRenderer__17CProjectileWeaponCFv: @@ -772,7 +772,7 @@ AddToRenderer__17CProjectileWeaponCFv: /* 802AF734 002AC694 81 83 00 00 */ lwz r12, 0(r3) /* 802AF738 002AC698 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802AF73C 002AC69C 7D 89 03 A6 */ mtctr r12 -/* 802AF740 002AC6A0 4E 80 04 21 */ bctrl +/* 802AF740 002AC6A0 4E 80 04 21 */ bctrl lbl_802AF744: /* 802AF744 002AC6A4 80 9F 01 00 */ lwz r4, 0x100(r31) /* 802AF748 002AC6A8 28 04 00 00 */ cmplwi r4, 0 @@ -781,7 +781,7 @@ lbl_802AF744: /* 802AF754 002AC6B4 81 83 00 00 */ lwz r12, 0(r3) /* 802AF758 002AC6B8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802AF75C 002AC6BC 7D 89 03 A6 */ mtctr r12 -/* 802AF760 002AC6C0 4E 80 04 21 */ bctrl +/* 802AF760 002AC6C0 4E 80 04 21 */ bctrl lbl_802AF764: /* 802AF764 002AC6C4 80 9F 01 18 */ lwz r4, 0x118(r31) /* 802AF768 002AC6C8 28 04 00 00 */ cmplwi r4, 0 @@ -790,7 +790,7 @@ lbl_802AF764: /* 802AF774 002AC6D4 81 83 00 00 */ lwz r12, 0(r3) /* 802AF778 002AC6D8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802AF77C 002AC6DC 7D 89 03 A6 */ mtctr r12 -/* 802AF780 002AC6E0 4E 80 04 21 */ bctrl +/* 802AF780 002AC6E0 4E 80 04 21 */ bctrl lbl_802AF784: /* 802AF784 002AC6E4 80 9F 01 1C */ lwz r4, 0x11c(r31) /* 802AF788 002AC6E8 28 04 00 00 */ cmplwi r4, 0 @@ -799,7 +799,7 @@ lbl_802AF784: /* 802AF794 002AC6F4 81 83 00 00 */ lwz r12, 0(r3) /* 802AF798 002AC6F8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802AF79C 002AC6FC 7D 89 03 A6 */ mtctr r12 -/* 802AF7A0 002AC700 4E 80 04 21 */ bctrl +/* 802AF7A0 002AC700 4E 80 04 21 */ bctrl lbl_802AF7A4: /* 802AF7A4 002AC704 80 9F 01 20 */ lwz r4, 0x120(r31) /* 802AF7A8 002AC708 28 04 00 00 */ cmplwi r4, 0 @@ -808,7 +808,7 @@ lbl_802AF7A4: /* 802AF7B4 002AC714 81 83 00 00 */ lwz r12, 0(r3) /* 802AF7B8 002AC718 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802AF7BC 002AC71C 7D 89 03 A6 */ mtctr r12 -/* 802AF7C0 002AC720 4E 80 04 21 */ bctrl +/* 802AF7C0 002AC720 4E 80 04 21 */ bctrl lbl_802AF7C4: /* 802AF7C4 002AC724 80 9F 01 04 */ lwz r4, 0x104(r31) /* 802AF7C8 002AC728 28 04 00 00 */ cmplwi r4, 0 @@ -817,13 +817,13 @@ lbl_802AF7C4: /* 802AF7D4 002AC734 81 83 00 00 */ lwz r12, 0(r3) /* 802AF7D8 002AC738 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802AF7DC 002AC73C 7D 89 03 A6 */ mtctr r12 -/* 802AF7E0 002AC740 4E 80 04 21 */ bctrl +/* 802AF7E0 002AC740 4E 80 04 21 */ bctrl lbl_802AF7E4: /* 802AF7E4 002AC744 80 01 00 14 */ lwz r0, 0x14(r1) /* 802AF7E8 002AC748 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802AF7EC 002AC74C 7C 08 03 A6 */ mtlr r0 /* 802AF7F0 002AC750 38 21 00 10 */ addi r1, r1, 0x10 -/* 802AF7F4 002AC754 4E 80 00 20 */ blr +/* 802AF7F4 002AC754 4E 80 00 20 */ blr .global Render__17CProjectileWeaponCFv Render__17CProjectileWeaponCFv: @@ -932,7 +932,7 @@ lbl_802AF988: /* 802AF98C 002AC8EC 83 E1 02 BC */ lwz r31, 0x2bc(r1) /* 802AF990 002AC8F0 7C 08 03 A6 */ mtlr r0 /* 802AF994 002AC8F4 38 21 02 C0 */ addi r1, r1, 0x2c0 -/* 802AF998 002AC8F8 4E 80 00 20 */ blr +/* 802AF998 002AC8F8 4E 80 00 20 */ blr .global IsSystemDeletable__17CProjectileWeaponCFv IsSystemDeletable__17CProjectileWeaponCFv: @@ -949,7 +949,7 @@ IsSystemDeletable__17CProjectileWeaponCFv: /* 802AF9C4 002AC924 81 83 00 00 */ lwz r12, 0(r3) /* 802AF9C8 002AC928 81 8C 00 58 */ lwz r12, 0x58(r12) /* 802AF9CC 002AC92C 7D 89 03 A6 */ mtctr r12 -/* 802AF9D0 002AC930 4E 80 04 21 */ bctrl +/* 802AF9D0 002AC930 4E 80 04 21 */ bctrl /* 802AF9D4 002AC934 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802AF9D8 002AC938 40 82 00 0C */ bne lbl_802AF9E4 /* 802AF9DC 002AC93C 3B E0 00 00 */ li r31, 0 @@ -961,7 +961,7 @@ lbl_802AF9E4: /* 802AF9F0 002AC950 81 83 00 00 */ lwz r12, 0(r3) /* 802AF9F4 002AC954 81 8C 00 58 */ lwz r12, 0x58(r12) /* 802AF9F8 002AC958 7D 89 03 A6 */ mtctr r12 -/* 802AF9FC 002AC95C 4E 80 04 21 */ bctrl +/* 802AF9FC 002AC95C 4E 80 04 21 */ bctrl /* 802AFA00 002AC960 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802AFA04 002AC964 40 82 00 0C */ bne lbl_802AFA10 /* 802AFA08 002AC968 3B E0 00 00 */ li r31, 0 @@ -973,7 +973,7 @@ lbl_802AFA10: /* 802AFA1C 002AC97C 81 83 00 00 */ lwz r12, 0(r3) /* 802AFA20 002AC980 81 8C 00 58 */ lwz r12, 0x58(r12) /* 802AFA24 002AC984 7D 89 03 A6 */ mtctr r12 -/* 802AFA28 002AC988 4E 80 04 21 */ bctrl +/* 802AFA28 002AC988 4E 80 04 21 */ bctrl /* 802AFA2C 002AC98C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802AFA30 002AC990 40 82 00 0C */ bne lbl_802AFA3C /* 802AFA34 002AC994 3B E0 00 00 */ li r31, 0 @@ -985,7 +985,7 @@ lbl_802AFA3C: /* 802AFA48 002AC9A8 81 83 00 00 */ lwz r12, 0(r3) /* 802AFA4C 002AC9AC 81 8C 00 58 */ lwz r12, 0x58(r12) /* 802AFA50 002AC9B0 7D 89 03 A6 */ mtctr r12 -/* 802AFA54 002AC9B4 4E 80 04 21 */ bctrl +/* 802AFA54 002AC9B4 4E 80 04 21 */ bctrl /* 802AFA58 002AC9B8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802AFA5C 002AC9BC 40 82 00 0C */ bne lbl_802AFA68 /* 802AFA60 002AC9C0 3B E0 00 00 */ li r31, 0 @@ -997,7 +997,7 @@ lbl_802AFA68: /* 802AFA74 002AC9D4 81 83 00 00 */ lwz r12, 0(r3) /* 802AFA78 002AC9D8 81 8C 00 58 */ lwz r12, 0x58(r12) /* 802AFA7C 002AC9DC 7D 89 03 A6 */ mtctr r12 -/* 802AFA80 002AC9E0 4E 80 04 21 */ bctrl +/* 802AFA80 002AC9E0 4E 80 04 21 */ bctrl /* 802AFA84 002AC9E4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802AFA88 002AC9E8 40 82 00 0C */ bne lbl_802AFA94 /* 802AFA8C 002AC9EC 3B E0 00 00 */ li r31, 0 @@ -1009,7 +1009,7 @@ lbl_802AFA94: /* 802AFAA0 002ACA00 81 83 00 00 */ lwz r12, 0(r3) /* 802AFAA4 002ACA04 81 8C 00 58 */ lwz r12, 0x58(r12) /* 802AFAA8 002ACA08 7D 89 03 A6 */ mtctr r12 -/* 802AFAAC 002ACA0C 4E 80 04 21 */ bctrl +/* 802AFAAC 002ACA0C 4E 80 04 21 */ bctrl /* 802AFAB0 002ACA10 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802AFAB4 002ACA14 40 82 00 0C */ bne lbl_802AFAC0 /* 802AFAB8 002ACA18 3B E0 00 00 */ li r31, 0 @@ -1031,7 +1031,7 @@ lbl_802AFAE4: /* 802AFAF0 002ACA50 83 C1 00 08 */ lwz r30, 8(r1) /* 802AFAF4 002ACA54 7C 08 03 A6 */ mtlr r0 /* 802AFAF8 002ACA58 38 21 00 10 */ addi r1, r1, 0x10 -/* 802AFAFC 002ACA5C 4E 80 00 20 */ blr +/* 802AFAFC 002ACA5C 4E 80 00 20 */ blr .global UpdateChildParticleSystems__17CProjectileWeaponFf UpdateChildParticleSystems__17CProjectileWeaponFf: @@ -1067,7 +1067,7 @@ lbl_802AFB40: /* 802AFB6C 002ACACC 38 80 00 00 */ li r4, 0 /* 802AFB70 002ACAD0 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 802AFB74 002ACAD4 7D 89 03 A6 */ mtctr r12 -/* 802AFB78 002ACAD8 4E 80 04 21 */ bctrl +/* 802AFB78 002ACAD8 4E 80 04 21 */ bctrl /* 802AFB7C 002ACADC 80 7F 00 FC */ lwz r3, 0xfc(r31) /* 802AFB80 002ACAE0 48 06 CC 95 */ bl EndLifetime__11CElementGenFv /* 802AFB84 002ACAE4 48 00 00 A4 */ b lbl_802AFC28 @@ -1080,13 +1080,13 @@ lbl_802AFB88: /* 802AFB9C 002ACAFC 81 9F 00 00 */ lwz r12, 0(r31) /* 802AFBA0 002ACB00 81 8C 00 18 */ lwz r12, 0x18(r12) /* 802AFBA4 002ACB04 7D 89 03 A6 */ mtctr r12 -/* 802AFBA8 002ACB08 4E 80 04 21 */ bctrl +/* 802AFBA8 002ACB08 4E 80 04 21 */ bctrl /* 802AFBAC 002ACB0C 80 7F 00 FC */ lwz r3, 0xfc(r31) /* 802AFBB0 002ACB10 38 81 00 74 */ addi r4, r1, 0x74 /* 802AFBB4 002ACB14 81 83 00 00 */ lwz r12, 0(r3) /* 802AFBB8 002ACB18 81 8C 00 20 */ lwz r12, 0x20(r12) /* 802AFBBC 002ACB1C 7D 89 03 A6 */ mtctr r12 -/* 802AFBC0 002ACB20 4E 80 04 21 */ bctrl +/* 802AFBC0 002ACB20 4E 80 04 21 */ bctrl /* 802AFBC4 002ACB24 48 00 00 34 */ b lbl_802AFBF8 lbl_802AFBC8: /* 802AFBC8 002ACB28 7F E4 FB 78 */ mr r4, r31 @@ -1094,13 +1094,13 @@ lbl_802AFBC8: /* 802AFBD0 002ACB30 81 9F 00 00 */ lwz r12, 0(r31) /* 802AFBD4 002ACB34 81 8C 00 18 */ lwz r12, 0x18(r12) /* 802AFBD8 002ACB38 7D 89 03 A6 */ mtctr r12 -/* 802AFBDC 002ACB3C 4E 80 04 21 */ bctrl +/* 802AFBDC 002ACB3C 4E 80 04 21 */ bctrl /* 802AFBE0 002ACB40 80 7F 00 FC */ lwz r3, 0xfc(r31) /* 802AFBE4 002ACB44 38 81 00 68 */ addi r4, r1, 0x68 /* 802AFBE8 002ACB48 81 83 00 00 */ lwz r12, 0(r3) /* 802AFBEC 002ACB4C 81 8C 00 18 */ lwz r12, 0x18(r12) /* 802AFBF0 002ACB50 7D 89 03 A6 */ mtctr r12 -/* 802AFBF4 002ACB54 4E 80 04 21 */ bctrl +/* 802AFBF4 002ACB54 4E 80 04 21 */ bctrl lbl_802AFBF8: /* 802AFBF8 002ACB58 88 1F 01 24 */ lbz r0, 0x124(r31) /* 802AFBFC 002ACB5C 54 00 D7 FF */ rlwinm. r0, r0, 0x1a, 0x1f, 0x1f @@ -1113,19 +1113,19 @@ lbl_802AFBF8: /* 802AFC18 002ACB78 81 83 00 00 */ lwz r12, 0(r3) /* 802AFC1C 002ACB7C 81 8C 00 14 */ lwz r12, 0x14(r12) /* 802AFC20 002ACB80 7D 89 03 A6 */ mtctr r12 -/* 802AFC24 002ACB84 4E 80 04 21 */ bctrl +/* 802AFC24 002ACB84 4E 80 04 21 */ bctrl lbl_802AFC28: /* 802AFC28 002ACB88 80 7F 00 FC */ lwz r3, 0xfc(r31) /* 802AFC2C 002ACB8C FC 20 F8 90 */ fmr f1, f31 /* 802AFC30 002ACB90 81 83 00 00 */ lwz r12, 0(r3) /* 802AFC34 002ACB94 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802AFC38 002ACB98 7D 89 03 A6 */ mtctr r12 -/* 802AFC3C 002ACB9C 4E 80 04 21 */ bctrl +/* 802AFC3C 002ACB9C 4E 80 04 21 */ bctrl /* 802AFC40 002ACBA0 80 7F 00 FC */ lwz r3, 0xfc(r31) /* 802AFC44 002ACBA4 81 83 00 00 */ lwz r12, 0(r3) /* 802AFC48 002ACBA8 81 8C 00 58 */ lwz r12, 0x58(r12) /* 802AFC4C 002ACBAC 7D 89 03 A6 */ mtctr r12 -/* 802AFC50 002ACBB0 4E 80 04 21 */ bctrl +/* 802AFC50 002ACBB0 4E 80 04 21 */ bctrl /* 802AFC54 002ACBB4 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 802AFC58 002ACBB8 28 00 00 01 */ cmplwi r0, 1 /* 802AFC5C 002ACBBC 40 82 00 2C */ bne lbl_802AFC88 @@ -1136,7 +1136,7 @@ lbl_802AFC28: /* 802AFC70 002ACBD0 38 80 00 01 */ li r4, 1 /* 802AFC74 002ACBD4 81 8C 00 08 */ lwz r12, 8(r12) /* 802AFC78 002ACBD8 7D 89 03 A6 */ mtctr r12 -/* 802AFC7C 002ACBDC 4E 80 04 21 */ bctrl +/* 802AFC7C 002ACBDC 4E 80 04 21 */ bctrl lbl_802AFC80: /* 802AFC80 002ACBE0 38 00 00 00 */ li r0, 0 /* 802AFC84 002ACBE4 90 1F 00 FC */ stw r0, 0xfc(r31) @@ -1155,7 +1155,7 @@ lbl_802AFC88: /* 802AFCB4 002ACC14 38 80 00 00 */ li r4, 0 /* 802AFCB8 002ACC18 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 802AFCBC 002ACC1C 7D 89 03 A6 */ mtctr r12 -/* 802AFCC0 002ACC20 4E 80 04 21 */ bctrl +/* 802AFCC0 002ACC20 4E 80 04 21 */ bctrl /* 802AFCC4 002ACC24 80 7F 01 00 */ lwz r3, 0x100(r31) /* 802AFCC8 002ACC28 48 06 CB 4D */ bl EndLifetime__11CElementGenFv /* 802AFCCC 002ACC2C 48 00 00 A4 */ b lbl_802AFD70 @@ -1168,13 +1168,13 @@ lbl_802AFCD0: /* 802AFCE4 002ACC44 81 9F 00 00 */ lwz r12, 0(r31) /* 802AFCE8 002ACC48 81 8C 00 18 */ lwz r12, 0x18(r12) /* 802AFCEC 002ACC4C 7D 89 03 A6 */ mtctr r12 -/* 802AFCF0 002ACC50 4E 80 04 21 */ bctrl +/* 802AFCF0 002ACC50 4E 80 04 21 */ bctrl /* 802AFCF4 002ACC54 80 7F 01 00 */ lwz r3, 0x100(r31) /* 802AFCF8 002ACC58 38 81 00 5C */ addi r4, r1, 0x5c /* 802AFCFC 002ACC5C 81 83 00 00 */ lwz r12, 0(r3) /* 802AFD00 002ACC60 81 8C 00 20 */ lwz r12, 0x20(r12) /* 802AFD04 002ACC64 7D 89 03 A6 */ mtctr r12 -/* 802AFD08 002ACC68 4E 80 04 21 */ bctrl +/* 802AFD08 002ACC68 4E 80 04 21 */ bctrl /* 802AFD0C 002ACC6C 48 00 00 34 */ b lbl_802AFD40 lbl_802AFD10: /* 802AFD10 002ACC70 7F E4 FB 78 */ mr r4, r31 @@ -1182,13 +1182,13 @@ lbl_802AFD10: /* 802AFD18 002ACC78 81 9F 00 00 */ lwz r12, 0(r31) /* 802AFD1C 002ACC7C 81 8C 00 18 */ lwz r12, 0x18(r12) /* 802AFD20 002ACC80 7D 89 03 A6 */ mtctr r12 -/* 802AFD24 002ACC84 4E 80 04 21 */ bctrl +/* 802AFD24 002ACC84 4E 80 04 21 */ bctrl /* 802AFD28 002ACC88 80 7F 01 00 */ lwz r3, 0x100(r31) /* 802AFD2C 002ACC8C 38 81 00 50 */ addi r4, r1, 0x50 /* 802AFD30 002ACC90 81 83 00 00 */ lwz r12, 0(r3) /* 802AFD34 002ACC94 81 8C 00 18 */ lwz r12, 0x18(r12) /* 802AFD38 002ACC98 7D 89 03 A6 */ mtctr r12 -/* 802AFD3C 002ACC9C 4E 80 04 21 */ bctrl +/* 802AFD3C 002ACC9C 4E 80 04 21 */ bctrl lbl_802AFD40: /* 802AFD40 002ACCA0 88 1F 01 24 */ lbz r0, 0x124(r31) /* 802AFD44 002ACCA4 54 00 D7 FF */ rlwinm. r0, r0, 0x1a, 0x1f, 0x1f @@ -1201,19 +1201,19 @@ lbl_802AFD40: /* 802AFD60 002ACCC0 81 83 00 00 */ lwz r12, 0(r3) /* 802AFD64 002ACCC4 81 8C 00 14 */ lwz r12, 0x14(r12) /* 802AFD68 002ACCC8 7D 89 03 A6 */ mtctr r12 -/* 802AFD6C 002ACCCC 4E 80 04 21 */ bctrl +/* 802AFD6C 002ACCCC 4E 80 04 21 */ bctrl lbl_802AFD70: /* 802AFD70 002ACCD0 80 7F 01 00 */ lwz r3, 0x100(r31) /* 802AFD74 002ACCD4 FC 20 F8 90 */ fmr f1, f31 /* 802AFD78 002ACCD8 81 83 00 00 */ lwz r12, 0(r3) /* 802AFD7C 002ACCDC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802AFD80 002ACCE0 7D 89 03 A6 */ mtctr r12 -/* 802AFD84 002ACCE4 4E 80 04 21 */ bctrl +/* 802AFD84 002ACCE4 4E 80 04 21 */ bctrl /* 802AFD88 002ACCE8 80 7F 01 00 */ lwz r3, 0x100(r31) /* 802AFD8C 002ACCEC 81 83 00 00 */ lwz r12, 0(r3) /* 802AFD90 002ACCF0 81 8C 00 58 */ lwz r12, 0x58(r12) /* 802AFD94 002ACCF4 7D 89 03 A6 */ mtctr r12 -/* 802AFD98 002ACCF8 4E 80 04 21 */ bctrl +/* 802AFD98 002ACCF8 4E 80 04 21 */ bctrl /* 802AFD9C 002ACCFC 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 802AFDA0 002ACD00 28 00 00 01 */ cmplwi r0, 1 /* 802AFDA4 002ACD04 40 82 00 2C */ bne lbl_802AFDD0 @@ -1224,7 +1224,7 @@ lbl_802AFD70: /* 802AFDB8 002ACD18 38 80 00 01 */ li r4, 1 /* 802AFDBC 002ACD1C 81 8C 00 08 */ lwz r12, 8(r12) /* 802AFDC0 002ACD20 7D 89 03 A6 */ mtctr r12 -/* 802AFDC4 002ACD24 4E 80 04 21 */ bctrl +/* 802AFDC4 002ACD24 4E 80 04 21 */ bctrl lbl_802AFDC8: /* 802AFDC8 002ACD28 38 00 00 00 */ li r0, 0 /* 802AFDCC 002ACD2C 90 1F 01 00 */ stw r0, 0x100(r31) @@ -1243,7 +1243,7 @@ lbl_802AFDD0: /* 802AFDFC 002ACD5C 38 80 00 00 */ li r4, 0 /* 802AFE00 002ACD60 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 802AFE04 002ACD64 7D 89 03 A6 */ mtctr r12 -/* 802AFE08 002ACD68 4E 80 04 21 */ bctrl +/* 802AFE08 002ACD68 4E 80 04 21 */ bctrl /* 802AFE0C 002ACD6C 48 00 00 98 */ b lbl_802AFEA4 lbl_802AFE10: /* 802AFE10 002ACD70 88 1F 01 24 */ lbz r0, 0x124(r31) @@ -1254,13 +1254,13 @@ lbl_802AFE10: /* 802AFE24 002ACD84 81 9F 00 00 */ lwz r12, 0(r31) /* 802AFE28 002ACD88 81 8C 00 18 */ lwz r12, 0x18(r12) /* 802AFE2C 002ACD8C 7D 89 03 A6 */ mtctr r12 -/* 802AFE30 002ACD90 4E 80 04 21 */ bctrl +/* 802AFE30 002ACD90 4E 80 04 21 */ bctrl /* 802AFE34 002ACD94 80 7F 01 18 */ lwz r3, 0x118(r31) /* 802AFE38 002ACD98 38 81 00 44 */ addi r4, r1, 0x44 /* 802AFE3C 002ACD9C 81 83 00 00 */ lwz r12, 0(r3) /* 802AFE40 002ACDA0 81 8C 00 20 */ lwz r12, 0x20(r12) /* 802AFE44 002ACDA4 7D 89 03 A6 */ mtctr r12 -/* 802AFE48 002ACDA8 4E 80 04 21 */ bctrl +/* 802AFE48 002ACDA8 4E 80 04 21 */ bctrl /* 802AFE4C 002ACDAC 48 00 00 34 */ b lbl_802AFE80 lbl_802AFE50: /* 802AFE50 002ACDB0 7F E4 FB 78 */ mr r4, r31 @@ -1268,13 +1268,13 @@ lbl_802AFE50: /* 802AFE58 002ACDB8 81 9F 00 00 */ lwz r12, 0(r31) /* 802AFE5C 002ACDBC 81 8C 00 18 */ lwz r12, 0x18(r12) /* 802AFE60 002ACDC0 7D 89 03 A6 */ mtctr r12 -/* 802AFE64 002ACDC4 4E 80 04 21 */ bctrl +/* 802AFE64 002ACDC4 4E 80 04 21 */ bctrl /* 802AFE68 002ACDC8 80 7F 01 18 */ lwz r3, 0x118(r31) /* 802AFE6C 002ACDCC 38 81 00 38 */ addi r4, r1, 0x38 /* 802AFE70 002ACDD0 81 83 00 00 */ lwz r12, 0(r3) /* 802AFE74 002ACDD4 81 8C 00 18 */ lwz r12, 0x18(r12) /* 802AFE78 002ACDD8 7D 89 03 A6 */ mtctr r12 -/* 802AFE7C 002ACDDC 4E 80 04 21 */ bctrl +/* 802AFE7C 002ACDDC 4E 80 04 21 */ bctrl lbl_802AFE80: /* 802AFE80 002ACDE0 7F E4 FB 78 */ mr r4, r31 /* 802AFE84 002ACDE4 38 61 00 E0 */ addi r3, r1, 0xe0 @@ -1284,7 +1284,7 @@ lbl_802AFE80: /* 802AFE94 002ACDF4 81 83 00 00 */ lwz r12, 0(r3) /* 802AFE98 002ACDF8 81 8C 00 14 */ lwz r12, 0x14(r12) /* 802AFE9C 002ACDFC 7D 89 03 A6 */ mtctr r12 -/* 802AFEA0 002ACE00 4E 80 04 21 */ bctrl +/* 802AFEA0 002ACE00 4E 80 04 21 */ bctrl lbl_802AFEA4: /* 802AFEA4 002ACE04 80 7F 01 18 */ lwz r3, 0x118(r31) /* 802AFEA8 002ACE08 38 80 00 01 */ li r4, 1 @@ -1296,12 +1296,12 @@ lbl_802AFEA4: /* 802AFEC0 002ACE20 81 83 00 00 */ lwz r12, 0(r3) /* 802AFEC4 002ACE24 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802AFEC8 002ACE28 7D 89 03 A6 */ mtctr r12 -/* 802AFECC 002ACE2C 4E 80 04 21 */ bctrl +/* 802AFECC 002ACE2C 4E 80 04 21 */ bctrl /* 802AFED0 002ACE30 80 7F 01 18 */ lwz r3, 0x118(r31) /* 802AFED4 002ACE34 81 83 00 00 */ lwz r12, 0(r3) /* 802AFED8 002ACE38 81 8C 00 58 */ lwz r12, 0x58(r12) /* 802AFEDC 002ACE3C 7D 89 03 A6 */ mtctr r12 -/* 802AFEE0 002ACE40 4E 80 04 21 */ bctrl +/* 802AFEE0 002ACE40 4E 80 04 21 */ bctrl /* 802AFEE4 002ACE44 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 802AFEE8 002ACE48 28 00 00 01 */ cmplwi r0, 1 /* 802AFEEC 002ACE4C 40 82 00 2C */ bne lbl_802AFF18 @@ -1312,7 +1312,7 @@ lbl_802AFEA4: /* 802AFF00 002ACE60 38 80 00 01 */ li r4, 1 /* 802AFF04 002ACE64 81 8C 00 08 */ lwz r12, 8(r12) /* 802AFF08 002ACE68 7D 89 03 A6 */ mtctr r12 -/* 802AFF0C 002ACE6C 4E 80 04 21 */ bctrl +/* 802AFF0C 002ACE6C 4E 80 04 21 */ bctrl lbl_802AFF10: /* 802AFF10 002ACE70 38 00 00 00 */ li r0, 0 /* 802AFF14 002ACE74 90 1F 01 18 */ stw r0, 0x118(r31) @@ -1331,7 +1331,7 @@ lbl_802AFF18: /* 802AFF44 002ACEA4 38 80 00 00 */ li r4, 0 /* 802AFF48 002ACEA8 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 802AFF4C 002ACEAC 7D 89 03 A6 */ mtctr r12 -/* 802AFF50 002ACEB0 4E 80 04 21 */ bctrl +/* 802AFF50 002ACEB0 4E 80 04 21 */ bctrl /* 802AFF54 002ACEB4 48 00 00 98 */ b lbl_802AFFEC lbl_802AFF58: /* 802AFF58 002ACEB8 88 1F 01 24 */ lbz r0, 0x124(r31) @@ -1342,13 +1342,13 @@ lbl_802AFF58: /* 802AFF6C 002ACECC 81 9F 00 00 */ lwz r12, 0(r31) /* 802AFF70 002ACED0 81 8C 00 18 */ lwz r12, 0x18(r12) /* 802AFF74 002ACED4 7D 89 03 A6 */ mtctr r12 -/* 802AFF78 002ACED8 4E 80 04 21 */ bctrl +/* 802AFF78 002ACED8 4E 80 04 21 */ bctrl /* 802AFF7C 002ACEDC 80 7F 01 1C */ lwz r3, 0x11c(r31) /* 802AFF80 002ACEE0 38 81 00 2C */ addi r4, r1, 0x2c /* 802AFF84 002ACEE4 81 83 00 00 */ lwz r12, 0(r3) /* 802AFF88 002ACEE8 81 8C 00 20 */ lwz r12, 0x20(r12) /* 802AFF8C 002ACEEC 7D 89 03 A6 */ mtctr r12 -/* 802AFF90 002ACEF0 4E 80 04 21 */ bctrl +/* 802AFF90 002ACEF0 4E 80 04 21 */ bctrl /* 802AFF94 002ACEF4 48 00 00 34 */ b lbl_802AFFC8 lbl_802AFF98: /* 802AFF98 002ACEF8 7F E4 FB 78 */ mr r4, r31 @@ -1356,13 +1356,13 @@ lbl_802AFF98: /* 802AFFA0 002ACF00 81 9F 00 00 */ lwz r12, 0(r31) /* 802AFFA4 002ACF04 81 8C 00 18 */ lwz r12, 0x18(r12) /* 802AFFA8 002ACF08 7D 89 03 A6 */ mtctr r12 -/* 802AFFAC 002ACF0C 4E 80 04 21 */ bctrl +/* 802AFFAC 002ACF0C 4E 80 04 21 */ bctrl /* 802AFFB0 002ACF10 80 7F 01 1C */ lwz r3, 0x11c(r31) /* 802AFFB4 002ACF14 38 81 00 20 */ addi r4, r1, 0x20 /* 802AFFB8 002ACF18 81 83 00 00 */ lwz r12, 0(r3) /* 802AFFBC 002ACF1C 81 8C 00 18 */ lwz r12, 0x18(r12) /* 802AFFC0 002ACF20 7D 89 03 A6 */ mtctr r12 -/* 802AFFC4 002ACF24 4E 80 04 21 */ bctrl +/* 802AFFC4 002ACF24 4E 80 04 21 */ bctrl lbl_802AFFC8: /* 802AFFC8 002ACF28 7F E4 FB 78 */ mr r4, r31 /* 802AFFCC 002ACF2C 38 61 00 B0 */ addi r3, r1, 0xb0 @@ -1372,7 +1372,7 @@ lbl_802AFFC8: /* 802AFFDC 002ACF3C 81 83 00 00 */ lwz r12, 0(r3) /* 802AFFE0 002ACF40 81 8C 00 14 */ lwz r12, 0x14(r12) /* 802AFFE4 002ACF44 7D 89 03 A6 */ mtctr r12 -/* 802AFFE8 002ACF48 4E 80 04 21 */ bctrl +/* 802AFFE8 002ACF48 4E 80 04 21 */ bctrl lbl_802AFFEC: /* 802AFFEC 002ACF4C 80 7F 01 1C */ lwz r3, 0x11c(r31) /* 802AFFF0 002ACF50 38 80 00 01 */ li r4, 1 @@ -1384,12 +1384,12 @@ lbl_802AFFEC: /* 802B0008 002ACF68 81 83 00 00 */ lwz r12, 0(r3) /* 802B000C 002ACF6C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802B0010 002ACF70 7D 89 03 A6 */ mtctr r12 -/* 802B0014 002ACF74 4E 80 04 21 */ bctrl +/* 802B0014 002ACF74 4E 80 04 21 */ bctrl /* 802B0018 002ACF78 80 7F 01 1C */ lwz r3, 0x11c(r31) /* 802B001C 002ACF7C 81 83 00 00 */ lwz r12, 0(r3) /* 802B0020 002ACF80 81 8C 00 58 */ lwz r12, 0x58(r12) /* 802B0024 002ACF84 7D 89 03 A6 */ mtctr r12 -/* 802B0028 002ACF88 4E 80 04 21 */ bctrl +/* 802B0028 002ACF88 4E 80 04 21 */ bctrl /* 802B002C 002ACF8C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 802B0030 002ACF90 28 00 00 01 */ cmplwi r0, 1 /* 802B0034 002ACF94 40 82 00 2C */ bne lbl_802B0060 @@ -1400,7 +1400,7 @@ lbl_802AFFEC: /* 802B0048 002ACFA8 38 80 00 01 */ li r4, 1 /* 802B004C 002ACFAC 81 8C 00 08 */ lwz r12, 8(r12) /* 802B0050 002ACFB0 7D 89 03 A6 */ mtctr r12 -/* 802B0054 002ACFB4 4E 80 04 21 */ bctrl +/* 802B0054 002ACFB4 4E 80 04 21 */ bctrl lbl_802B0058: /* 802B0058 002ACFB8 38 00 00 00 */ li r0, 0 /* 802B005C 002ACFBC 90 1F 01 1C */ stw r0, 0x11c(r31) @@ -1419,7 +1419,7 @@ lbl_802B0060: /* 802B008C 002ACFEC 38 80 00 00 */ li r4, 0 /* 802B0090 002ACFF0 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 802B0094 002ACFF4 7D 89 03 A6 */ mtctr r12 -/* 802B0098 002ACFF8 4E 80 04 21 */ bctrl +/* 802B0098 002ACFF8 4E 80 04 21 */ bctrl /* 802B009C 002ACFFC 48 00 00 98 */ b lbl_802B0134 lbl_802B00A0: /* 802B00A0 002AD000 88 1F 01 24 */ lbz r0, 0x124(r31) @@ -1430,13 +1430,13 @@ lbl_802B00A0: /* 802B00B4 002AD014 81 9F 00 00 */ lwz r12, 0(r31) /* 802B00B8 002AD018 81 8C 00 18 */ lwz r12, 0x18(r12) /* 802B00BC 002AD01C 7D 89 03 A6 */ mtctr r12 -/* 802B00C0 002AD020 4E 80 04 21 */ bctrl +/* 802B00C0 002AD020 4E 80 04 21 */ bctrl /* 802B00C4 002AD024 80 7F 01 20 */ lwz r3, 0x120(r31) /* 802B00C8 002AD028 38 81 00 14 */ addi r4, r1, 0x14 /* 802B00CC 002AD02C 81 83 00 00 */ lwz r12, 0(r3) /* 802B00D0 002AD030 81 8C 00 20 */ lwz r12, 0x20(r12) /* 802B00D4 002AD034 7D 89 03 A6 */ mtctr r12 -/* 802B00D8 002AD038 4E 80 04 21 */ bctrl +/* 802B00D8 002AD038 4E 80 04 21 */ bctrl /* 802B00DC 002AD03C 48 00 00 34 */ b lbl_802B0110 lbl_802B00E0: /* 802B00E0 002AD040 7F E4 FB 78 */ mr r4, r31 @@ -1444,13 +1444,13 @@ lbl_802B00E0: /* 802B00E8 002AD048 81 9F 00 00 */ lwz r12, 0(r31) /* 802B00EC 002AD04C 81 8C 00 18 */ lwz r12, 0x18(r12) /* 802B00F0 002AD050 7D 89 03 A6 */ mtctr r12 -/* 802B00F4 002AD054 4E 80 04 21 */ bctrl +/* 802B00F4 002AD054 4E 80 04 21 */ bctrl /* 802B00F8 002AD058 80 7F 01 20 */ lwz r3, 0x120(r31) /* 802B00FC 002AD05C 38 81 00 08 */ addi r4, r1, 8 /* 802B0100 002AD060 81 83 00 00 */ lwz r12, 0(r3) /* 802B0104 002AD064 81 8C 00 18 */ lwz r12, 0x18(r12) /* 802B0108 002AD068 7D 89 03 A6 */ mtctr r12 -/* 802B010C 002AD06C 4E 80 04 21 */ bctrl +/* 802B010C 002AD06C 4E 80 04 21 */ bctrl lbl_802B0110: /* 802B0110 002AD070 7F E4 FB 78 */ mr r4, r31 /* 802B0114 002AD074 38 61 00 80 */ addi r3, r1, 0x80 @@ -1460,7 +1460,7 @@ lbl_802B0110: /* 802B0124 002AD084 81 83 00 00 */ lwz r12, 0(r3) /* 802B0128 002AD088 81 8C 00 14 */ lwz r12, 0x14(r12) /* 802B012C 002AD08C 7D 89 03 A6 */ mtctr r12 -/* 802B0130 002AD090 4E 80 04 21 */ bctrl +/* 802B0130 002AD090 4E 80 04 21 */ bctrl lbl_802B0134: /* 802B0134 002AD094 80 7F 01 20 */ lwz r3, 0x120(r31) /* 802B0138 002AD098 38 80 00 01 */ li r4, 1 @@ -1472,12 +1472,12 @@ lbl_802B0134: /* 802B0150 002AD0B0 81 83 00 00 */ lwz r12, 0(r3) /* 802B0154 002AD0B4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802B0158 002AD0B8 7D 89 03 A6 */ mtctr r12 -/* 802B015C 002AD0BC 4E 80 04 21 */ bctrl +/* 802B015C 002AD0BC 4E 80 04 21 */ bctrl /* 802B0160 002AD0C0 80 7F 01 20 */ lwz r3, 0x120(r31) /* 802B0164 002AD0C4 81 83 00 00 */ lwz r12, 0(r3) /* 802B0168 002AD0C8 81 8C 00 58 */ lwz r12, 0x58(r12) /* 802B016C 002AD0CC 7D 89 03 A6 */ mtctr r12 -/* 802B0170 002AD0D0 4E 80 04 21 */ bctrl +/* 802B0170 002AD0D0 4E 80 04 21 */ bctrl /* 802B0174 002AD0D4 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 802B0178 002AD0D8 28 00 00 01 */ cmplwi r0, 1 /* 802B017C 002AD0DC 40 82 00 2C */ bne lbl_802B01A8 @@ -1488,7 +1488,7 @@ lbl_802B0134: /* 802B0190 002AD0F0 38 80 00 01 */ li r4, 1 /* 802B0194 002AD0F4 81 8C 00 08 */ lwz r12, 8(r12) /* 802B0198 002AD0F8 7D 89 03 A6 */ mtctr r12 -/* 802B019C 002AD0FC 4E 80 04 21 */ bctrl +/* 802B019C 002AD0FC 4E 80 04 21 */ bctrl lbl_802B01A0: /* 802B01A0 002AD100 38 00 00 00 */ li r0, 0 /* 802B01A4 002AD104 90 1F 01 20 */ stw r0, 0x120(r31) @@ -1500,12 +1500,12 @@ lbl_802B01A8: /* 802B01B8 002AD118 FC 20 F8 90 */ fmr f1, f31 /* 802B01BC 002AD11C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802B01C0 002AD120 7D 89 03 A6 */ mtctr r12 -/* 802B01C4 002AD124 4E 80 04 21 */ bctrl +/* 802B01C4 002AD124 4E 80 04 21 */ bctrl /* 802B01C8 002AD128 80 7F 01 04 */ lwz r3, 0x104(r31) /* 802B01CC 002AD12C 81 83 00 00 */ lwz r12, 0(r3) /* 802B01D0 002AD130 81 8C 00 58 */ lwz r12, 0x58(r12) /* 802B01D4 002AD134 7D 89 03 A6 */ mtctr r12 -/* 802B01D8 002AD138 4E 80 04 21 */ bctrl +/* 802B01D8 002AD138 4E 80 04 21 */ bctrl /* 802B01DC 002AD13C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 802B01E0 002AD140 28 00 00 01 */ cmplwi r0, 1 /* 802B01E4 002AD144 40 82 00 2C */ bne lbl_802B0210 @@ -1516,7 +1516,7 @@ lbl_802B01A8: /* 802B01F8 002AD158 38 80 00 01 */ li r4, 1 /* 802B01FC 002AD15C 81 8C 00 08 */ lwz r12, 8(r12) /* 802B0200 002AD160 7D 89 03 A6 */ mtctr r12 -/* 802B0204 002AD164 4E 80 04 21 */ bctrl +/* 802B0204 002AD164 4E 80 04 21 */ bctrl lbl_802B0208: /* 802B0208 002AD168 38 00 00 00 */ li r0, 0 /* 802B020C 002AD16C 90 1F 01 04 */ stw r0, 0x104(r31) @@ -1529,7 +1529,7 @@ lbl_802B0210: /* 802B0224 002AD184 83 E1 01 7C */ lwz r31, 0x17c(r1) /* 802B0228 002AD188 7C 08 03 A6 */ mtlr r0 /* 802B022C 002AD18C 38 21 01 90 */ addi r1, r1, 0x190 -/* 802B0230 002AD190 4E 80 00 20 */ blr +/* 802B0230 002AD190 4E 80 00 20 */ blr .global UpdatePSTranslationAndOrientation__17CProjectileWeaponFv UpdatePSTranslationAndOrientation__17CProjectileWeaponFv: @@ -1554,7 +1554,7 @@ UpdatePSTranslationAndOrientation__17CProjectileWeaponFv: /* 802B027C 002AD1DC 38 DF 00 80 */ addi r6, r31, 0x80 /* 802B0280 002AD1E0 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802B0284 002AD1E4 7D 89 03 A6 */ mtctr r12 -/* 802B0288 002AD1E8 4E 80 04 21 */ bctrl +/* 802B0288 002AD1E8 4E 80 04 21 */ bctrl lbl_802B028C: /* 802B028C 002AD1EC 88 1F 01 24 */ lbz r0, 0x124(r31) /* 802B0290 002AD1F0 54 00 07 FF */ clrlwi. r0, r0, 0x1f @@ -1619,7 +1619,7 @@ lbl_802B030C: /* 802B0374 002AD2D4 80 9F 00 F4 */ lwz r4, 0xf4(r31) /* 802B0378 002AD2D8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802B037C 002AD2DC 7D 89 03 A6 */ mtctr r12 -/* 802B0380 002AD2E0 4E 80 04 21 */ bctrl +/* 802B0380 002AD2E0 4E 80 04 21 */ bctrl /* 802B0384 002AD2E4 38 61 00 2C */ addi r3, r1, 0x2c /* 802B0388 002AD2E8 38 9F 00 44 */ addi r4, r31, 0x44 /* 802B038C 002AD2EC 48 06 27 E9 */ bl __ct__12CTransform4fFRC12CTransform4f @@ -1657,7 +1657,7 @@ lbl_802B03F0: /* 802B0408 002AD368 80 9F 00 F4 */ lwz r4, 0xf4(r31) /* 802B040C 002AD36C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802B0410 002AD370 7D 89 03 A6 */ mtctr r12 -/* 802B0414 002AD374 4E 80 04 21 */ bctrl +/* 802B0414 002AD374 4E 80 04 21 */ bctrl lbl_802B0418: /* 802B0418 002AD378 80 7F 00 0C */ lwz r3, 0xc(r31) /* 802B041C 002AD37C 80 63 00 1C */ lwz r3, 0x1c(r3) @@ -1668,7 +1668,7 @@ lbl_802B0418: /* 802B0430 002AD390 80 9F 00 F4 */ lwz r4, 0xf4(r31) /* 802B0434 002AD394 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802B0438 002AD398 7D 89 03 A6 */ mtctr r12 -/* 802B043C 002AD39C 4E 80 04 21 */ bctrl +/* 802B043C 002AD39C 4E 80 04 21 */ bctrl lbl_802B0440: /* 802B0440 002AD3A0 80 7F 00 0C */ lwz r3, 0xc(r31) /* 802B0444 002AD3A4 80 63 00 20 */ lwz r3, 0x20(r3) @@ -1679,7 +1679,7 @@ lbl_802B0440: /* 802B0458 002AD3B8 80 9F 00 F4 */ lwz r4, 0xf4(r31) /* 802B045C 002AD3BC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802B0460 002AD3C0 7D 89 03 A6 */ mtctr r12 -/* 802B0464 002AD3C4 4E 80 04 21 */ bctrl +/* 802B0464 002AD3C4 4E 80 04 21 */ bctrl lbl_802B0468: /* 802B0468 002AD3C8 80 7F 00 0C */ lwz r3, 0xc(r31) /* 802B046C 002AD3CC 80 63 00 24 */ lwz r3, 0x24(r3) @@ -1690,13 +1690,13 @@ lbl_802B0468: /* 802B0480 002AD3E0 80 9F 00 F4 */ lwz r4, 0xf4(r31) /* 802B0484 002AD3E4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802B0488 002AD3E8 7D 89 03 A6 */ mtctr r12 -/* 802B048C 002AD3EC 4E 80 04 21 */ bctrl +/* 802B048C 002AD3EC 4E 80 04 21 */ bctrl lbl_802B0490: /* 802B0490 002AD3F0 80 01 00 74 */ lwz r0, 0x74(r1) /* 802B0494 002AD3F4 83 E1 00 6C */ lwz r31, 0x6c(r1) /* 802B0498 002AD3F8 7C 08 03 A6 */ mtlr r0 /* 802B049C 002AD3FC 38 21 00 70 */ addi r1, r1, 0x70 -/* 802B04A0 002AD400 4E 80 00 20 */ blr +/* 802B04A0 002AD400 4E 80 00 20 */ blr .global SetWorldSpaceOrientation__17CProjectileWeaponFRC12CTransform4f SetWorldSpaceOrientation__17CProjectileWeaponFRC12CTransform4f: @@ -1722,7 +1722,7 @@ SetWorldSpaceOrientation__17CProjectileWeaponFRC12CTransform4f: /* 802B04F0 002AD450 83 C1 00 68 */ lwz r30, 0x68(r1) /* 802B04F4 002AD454 7C 08 03 A6 */ mtlr r0 /* 802B04F8 002AD458 38 21 00 70 */ addi r1, r1, 0x70 -/* 802B04FC 002AD45C 4E 80 00 20 */ blr +/* 802B04FC 002AD45C 4E 80 00 20 */ blr .global SetRelativeOrientation__17CProjectileWeaponFRC12CTransform4f SetRelativeOrientation__17CProjectileWeaponFRC12CTransform4f: @@ -1734,7 +1734,7 @@ SetRelativeOrientation__17CProjectileWeaponFRC12CTransform4f: /* 802B0514 002AD474 80 01 00 14 */ lwz r0, 0x14(r1) /* 802B0518 002AD478 7C 08 03 A6 */ mtlr r0 /* 802B051C 002AD47C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802B0520 002AD480 4E 80 00 20 */ blr +/* 802B0520 002AD480 4E 80 00 20 */ blr .global GetTranslation__17CProjectileWeaponCFv GetTranslation__17CProjectileWeaponCFv: @@ -1782,7 +1782,7 @@ GetTranslation__17CProjectileWeaponCFv: /* 802B05C8 002AD528 83 C1 00 38 */ lwz r30, 0x38(r1) /* 802B05CC 002AD52C 7C 08 03 A6 */ mtlr r0 /* 802B05D0 002AD530 38 21 00 40 */ addi r1, r1, 0x40 -/* 802B05D4 002AD534 4E 80 00 20 */ blr +/* 802B05D4 002AD534 4E 80 00 20 */ blr .global GetTransform__17CProjectileWeaponFv GetTransform__17CProjectileWeaponFv: @@ -1799,7 +1799,7 @@ GetTransform__17CProjectileWeaponFv: /* 802B0600 002AD560 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802B0604 002AD564 7C 08 03 A6 */ mtlr r0 /* 802B0608 002AD568 38 21 00 10 */ addi r1, r1, 0x10 -/* 802B060C 002AD56C 4E 80 00 20 */ blr +/* 802B060C 002AD56C 4E 80 00 20 */ blr .global GetTransform__17CProjectileWeaponCFv GetTransform__17CProjectileWeaponCFv: @@ -1816,7 +1816,7 @@ GetTransform__17CProjectileWeaponCFv: /* 802B0638 002AD598 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802B063C 002AD59C 7C 08 03 A6 */ mtlr r0 /* 802B0640 002AD5A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802B0644 002AD5A4 4E 80 00 20 */ blr +/* 802B0644 002AD5A4 4E 80 00 20 */ blr .global UpdateParticleFX__17CProjectileWeaponFv UpdateParticleFX__17CProjectileWeaponFv: @@ -1842,7 +1842,7 @@ lbl_802B0678: /* 802B068C 002AD5EC 83 C1 00 08 */ lwz r30, 8(r1) /* 802B0690 002AD5F0 7C 08 03 A6 */ mtlr r0 /* 802B0694 002AD5F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802B0698 002AD5F8 4E 80 00 20 */ blr +/* 802B0698 002AD5F8 4E 80 00 20 */ blr .global Update__17CProjectileWeaponFf Update__17CProjectileWeaponFf: @@ -1955,7 +1955,7 @@ lbl_802B07DC: /* 802B0824 002AD784 38 80 00 00 */ li r4, 0 /* 802B0828 002AD788 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802B082C 002AD78C 7D 89 03 A6 */ mtctr r12 -/* 802B0830 002AD790 4E 80 04 21 */ bctrl +/* 802B0830 002AD790 4E 80 04 21 */ bctrl lbl_802B0834: /* 802B0834 002AD794 38 61 00 08 */ addi r3, r1, 8 /* 802B0838 002AD798 38 80 FF FF */ li r4, -1 @@ -1971,7 +1971,7 @@ lbl_802B0834: /* 802B0860 002AD7C0 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 802B0864 002AD7C4 7C 08 03 A6 */ mtlr r0 /* 802B0868 002AD7C8 38 21 00 60 */ addi r1, r1, 0x60 -/* 802B086C 002AD7CC 4E 80 00 20 */ blr +/* 802B086C 002AD7CC 4E 80 00 20 */ blr .global __dt__17CProjectileWeaponFv __dt__17CProjectileWeaponFv: @@ -1993,7 +1993,7 @@ __dt__17CProjectileWeaponFv: /* 802B08AC 002AD80C 38 80 00 01 */ li r4, 1 /* 802B08B0 002AD810 81 8C 00 08 */ lwz r12, 8(r12) /* 802B08B4 002AD814 7D 89 03 A6 */ mtctr r12 -/* 802B08B8 002AD818 4E 80 04 21 */ bctrl +/* 802B08B8 002AD818 4E 80 04 21 */ bctrl lbl_802B08BC: /* 802B08BC 002AD81C 80 7F 01 00 */ lwz r3, 0x100(r31) /* 802B08C0 002AD820 28 03 00 00 */ cmplwi r3, 0 @@ -2002,7 +2002,7 @@ lbl_802B08BC: /* 802B08CC 002AD82C 38 80 00 01 */ li r4, 1 /* 802B08D0 002AD830 81 8C 00 08 */ lwz r12, 8(r12) /* 802B08D4 002AD834 7D 89 03 A6 */ mtctr r12 -/* 802B08D8 002AD838 4E 80 04 21 */ bctrl +/* 802B08D8 002AD838 4E 80 04 21 */ bctrl lbl_802B08DC: /* 802B08DC 002AD83C 80 7F 01 04 */ lwz r3, 0x104(r31) /* 802B08E0 002AD840 28 03 00 00 */ cmplwi r3, 0 @@ -2011,7 +2011,7 @@ lbl_802B08DC: /* 802B08EC 002AD84C 38 80 00 01 */ li r4, 1 /* 802B08F0 002AD850 81 8C 00 08 */ lwz r12, 8(r12) /* 802B08F4 002AD854 7D 89 03 A6 */ mtctr r12 -/* 802B08F8 002AD858 4E 80 04 21 */ bctrl +/* 802B08F8 002AD858 4E 80 04 21 */ bctrl lbl_802B08FC: /* 802B08FC 002AD85C 80 7F 01 18 */ lwz r3, 0x118(r31) /* 802B0900 002AD860 28 03 00 00 */ cmplwi r3, 0 @@ -2020,7 +2020,7 @@ lbl_802B08FC: /* 802B090C 002AD86C 38 80 00 01 */ li r4, 1 /* 802B0910 002AD870 81 8C 00 08 */ lwz r12, 8(r12) /* 802B0914 002AD874 7D 89 03 A6 */ mtctr r12 -/* 802B0918 002AD878 4E 80 04 21 */ bctrl +/* 802B0918 002AD878 4E 80 04 21 */ bctrl lbl_802B091C: /* 802B091C 002AD87C 80 7F 01 1C */ lwz r3, 0x11c(r31) /* 802B0920 002AD880 28 03 00 00 */ cmplwi r3, 0 @@ -2029,7 +2029,7 @@ lbl_802B091C: /* 802B092C 002AD88C 38 80 00 01 */ li r4, 1 /* 802B0930 002AD890 81 8C 00 08 */ lwz r12, 8(r12) /* 802B0934 002AD894 7D 89 03 A6 */ mtctr r12 -/* 802B0938 002AD898 4E 80 04 21 */ bctrl +/* 802B0938 002AD898 4E 80 04 21 */ bctrl lbl_802B093C: /* 802B093C 002AD89C 80 7F 01 20 */ lwz r3, 0x120(r31) /* 802B0940 002AD8A0 28 03 00 00 */ cmplwi r3, 0 @@ -2038,7 +2038,7 @@ lbl_802B093C: /* 802B094C 002AD8AC 38 80 00 01 */ li r4, 1 /* 802B0950 002AD8B0 81 8C 00 08 */ lwz r12, 8(r12) /* 802B0954 002AD8B4 7D 89 03 A6 */ mtctr r12 -/* 802B0958 002AD8B8 4E 80 04 21 */ bctrl +/* 802B0958 002AD8B8 4E 80 04 21 */ bctrl lbl_802B095C: /* 802B095C 002AD8BC 34 1F 01 08 */ addic. r0, r31, 0x108 /* 802B0960 002AD8C0 41 82 00 30 */ beq lbl_802B0990 @@ -2080,7 +2080,7 @@ lbl_802B09D0: /* 802B09DC 002AD93C 83 C1 00 08 */ lwz r30, 8(r1) /* 802B09E0 002AD940 7C 08 03 A6 */ mtlr r0 /* 802B09E4 002AD944 38 21 00 10 */ addi r1, r1, 0x10 -/* 802B09E8 002AD948 4E 80 00 20 */ blr +/* 802B09E8 002AD948 4E 80 00 20 */ blr .global "__ct__17CProjectileWeaponFRC28TToken<18CWeaponDescription>RC9CVector3fRC12CTransform4fRC9CVector3f" "__ct__17CProjectileWeaponFRC28TToken<18CWeaponDescription>RC9CVector3fRC12CTransform4fRC9CVector3f": @@ -2260,7 +2260,7 @@ lbl_802B0C8C: /* 802B0C94 002ADBF4 81 83 00 00 */ lwz r12, 0(r3) /* 802B0C98 002ADBF8 81 8C 00 24 */ lwz r12, 0x24(r12) /* 802B0C9C 002ADBFC 7D 89 03 A6 */ mtctr r12 -/* 802B0CA0 002ADC00 4E 80 04 21 */ bctrl +/* 802B0CA0 002ADC00 4E 80 04 21 */ bctrl lbl_802B0CA4: /* 802B0CA4 002ADC04 80 7F 00 0C */ lwz r3, 0xc(r31) /* 802B0CA8 002ADC08 88 03 00 50 */ lbz r0, 0x50(r3) @@ -2302,7 +2302,7 @@ lbl_802B0D24: /* 802B0D2C 002ADC8C 81 83 00 00 */ lwz r12, 0(r3) /* 802B0D30 002ADC90 81 8C 00 24 */ lwz r12, 0x24(r12) /* 802B0D34 002ADC94 7D 89 03 A6 */ mtctr r12 -/* 802B0D38 002ADC98 4E 80 04 21 */ bctrl +/* 802B0D38 002ADC98 4E 80 04 21 */ bctrl lbl_802B0D3C: /* 802B0D3C 002ADC9C 80 7F 00 0C */ lwz r3, 0xc(r31) /* 802B0D40 002ADCA0 88 03 00 60 */ lbz r0, 0x60(r3) @@ -2339,7 +2339,7 @@ lbl_802B0DAC: /* 802B0DB4 002ADD14 81 83 00 00 */ lwz r12, 0(r3) /* 802B0DB8 002ADD18 81 8C 00 24 */ lwz r12, 0x24(r12) /* 802B0DBC 002ADD1C 7D 89 03 A6 */ mtctr r12 -/* 802B0DC0 002ADD20 4E 80 04 21 */ bctrl +/* 802B0DC0 002ADD20 4E 80 04 21 */ bctrl lbl_802B0DC4: /* 802B0DC4 002ADD24 80 7F 00 0C */ lwz r3, 0xc(r31) /* 802B0DC8 002ADD28 88 03 00 70 */ lbz r0, 0x70(r3) @@ -2376,7 +2376,7 @@ lbl_802B0E34: /* 802B0E3C 002ADD9C 81 83 00 00 */ lwz r12, 0(r3) /* 802B0E40 002ADDA0 81 8C 00 24 */ lwz r12, 0x24(r12) /* 802B0E44 002ADDA4 7D 89 03 A6 */ mtctr r12 -/* 802B0E48 002ADDA8 4E 80 04 21 */ bctrl +/* 802B0E48 002ADDA8 4E 80 04 21 */ bctrl lbl_802B0E4C: /* 802B0E4C 002ADDAC 80 7F 00 0C */ lwz r3, 0xc(r31) /* 802B0E50 002ADDB0 88 03 00 80 */ lbz r0, 0x80(r3) @@ -2413,7 +2413,7 @@ lbl_802B0EBC: /* 802B0EC4 002ADE24 81 83 00 00 */ lwz r12, 0(r3) /* 802B0EC8 002ADE28 81 8C 00 24 */ lwz r12, 0x24(r12) /* 802B0ECC 002ADE2C 7D 89 03 A6 */ mtctr r12 -/* 802B0ED0 002ADE30 4E 80 04 21 */ bctrl +/* 802B0ED0 002ADE30 4E 80 04 21 */ bctrl lbl_802B0ED4: /* 802B0ED4 002ADE34 80 7F 00 0C */ lwz r3, 0xc(r31) /* 802B0ED8 002ADE38 80 63 00 14 */ lwz r3, 0x14(r3) @@ -2424,7 +2424,7 @@ lbl_802B0ED4: /* 802B0EEC 002ADE4C 38 80 00 00 */ li r4, 0 /* 802B0EF0 002ADE50 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802B0EF4 002ADE54 7D 89 03 A6 */ mtctr r12 -/* 802B0EF8 002ADE58 4E 80 04 21 */ bctrl +/* 802B0EF8 002ADE58 4E 80 04 21 */ bctrl /* 802B0EFC 002ADE5C 48 00 00 10 */ b lbl_802B0F0C lbl_802B0F00: /* 802B0F00 002ADE60 3C 60 00 80 */ lis r3, 0x007FFFFF@ha @@ -2440,7 +2440,7 @@ lbl_802B0F0C: /* 802B0F24 002ADE84 38 80 00 00 */ li r4, 0 /* 802B0F28 002ADE88 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802B0F2C 002ADE8C 7D 89 03 A6 */ mtctr r12 -/* 802B0F30 002ADE90 4E 80 04 21 */ bctrl +/* 802B0F30 002ADE90 4E 80 04 21 */ bctrl lbl_802B0F34: /* 802B0F34 002ADE94 80 7F 00 0C */ lwz r3, 0xc(r31) /* 802B0F38 002ADE98 80 03 00 00 */ lwz r0, 0(r3) @@ -2461,7 +2461,7 @@ lbl_802B0F34: /* 802B0F74 002ADED4 81 83 00 00 */ lwz r12, 0(r3) /* 802B0F78 002ADED8 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802B0F7C 002ADEDC 7D 89 03 A6 */ mtctr r12 -/* 802B0F80 002ADEE0 4E 80 04 21 */ bctrl +/* 802B0F80 002ADEE0 4E 80 04 21 */ bctrl /* 802B0F84 002ADEE4 C0 22 C2 18 */ lfs f1, lbl_805ADF38@sda21(r2) /* 802B0F88 002ADEE8 38 61 00 54 */ addi r3, r1, 0x54 /* 802B0F8C 002ADEEC C0 01 00 3C */ lfs f0, 0x3c(r1) @@ -2558,7 +2558,7 @@ lbl_802B1060: /* 802B10E4 002AE044 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 802B10E8 002AE048 7C 08 03 A6 */ mtlr r0 /* 802B10EC 002AE04C 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 802B10F0 002AE050 4E 80 00 20 */ blr +/* 802B10F0 002AE050 4E 80 00 20 */ blr .global __dt__17IWeaponProjectileFv __dt__17IWeaponProjectileFv: @@ -2580,7 +2580,7 @@ lbl_802B1124: /* 802B112C 002AE08C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802B1130 002AE090 7C 08 03 A6 */ mtlr r0 /* 802B1134 002AE094 38 21 00 10 */ addi r1, r1, 0x10 -/* 802B1138 002AE098 4E 80 00 20 */ blr +/* 802B1138 002AE098 4E 80 00 20 */ blr .global GetTickPeriod__17CProjectileWeaponFv GetTickPeriod__17CProjectileWeaponFv: diff --git a/asm/Weapons/CProjectileWeaponDataFactory.s b/asm/Weapons/CProjectileWeaponDataFactory.s index f5c0c951..75aafbf2 100644 --- a/asm/Weapons/CProjectileWeaponDataFactory.s +++ b/asm/Weapons/CProjectileWeaponDataFactory.s @@ -555,7 +555,7 @@ lbl_802B1888: /* 802B18C0 002AE820 81 9D 00 00 */ lwz r12, 0(r29) /* 802B18C4 002AE824 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802B18C8 002AE828 7D 89 03 A6 */ mtctr r12 -/* 802B18CC 002AE82C 4E 80 04 21 */ bctrl +/* 802B18CC 002AE82C 4E 80 04 21 */ bctrl /* 802B18D0 002AE830 3B 41 00 AC */ addi r26, r1, 0xac /* 802B18D4 002AE834 38 81 00 6C */ addi r4, r1, 0x6c /* 802B18D8 002AE838 7F 43 D3 78 */ mr r3, r26 @@ -618,7 +618,7 @@ lbl_802B1970: /* 802B19A8 002AE908 81 9D 00 00 */ lwz r12, 0(r29) /* 802B19AC 002AE90C 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802B19B0 002AE910 7D 89 03 A6 */ mtctr r12 -/* 802B19B4 002AE914 4E 80 04 21 */ bctrl +/* 802B19B4 002AE914 4E 80 04 21 */ bctrl /* 802B19B8 002AE918 3B 41 00 A0 */ addi r26, r1, 0xa0 /* 802B19BC 002AE91C 38 81 00 5C */ addi r4, r1, 0x5c /* 802B19C0 002AE920 7F 43 D3 78 */ mr r3, r26 @@ -681,7 +681,7 @@ lbl_802B1A58: /* 802B1A90 002AE9F0 81 9D 00 00 */ lwz r12, 0(r29) /* 802B1A94 002AE9F4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802B1A98 002AE9F8 7D 89 03 A6 */ mtctr r12 -/* 802B1A9C 002AE9FC 4E 80 04 21 */ bctrl +/* 802B1A9C 002AE9FC 4E 80 04 21 */ bctrl /* 802B1AA0 002AEA00 3B 41 00 94 */ addi r26, r1, 0x94 /* 802B1AA4 002AEA04 38 81 00 4C */ addi r4, r1, 0x4c /* 802B1AA8 002AEA08 7F 43 D3 78 */ mr r3, r26 @@ -744,7 +744,7 @@ lbl_802B1B40: /* 802B1B78 002AEAD8 81 9D 00 00 */ lwz r12, 0(r29) /* 802B1B7C 002AEADC 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802B1B80 002AEAE0 7D 89 03 A6 */ mtctr r12 -/* 802B1B84 002AEAE4 4E 80 04 21 */ bctrl +/* 802B1B84 002AEAE4 4E 80 04 21 */ bctrl /* 802B1B88 002AEAE8 3B 41 00 88 */ addi r26, r1, 0x88 /* 802B1B8C 002AEAEC 38 81 00 3C */ addi r4, r1, 0x3c /* 802B1B90 002AEAF0 7F 43 D3 78 */ mr r3, r26 @@ -812,7 +812,7 @@ lbl_802B1C38: /* 802B1C70 002AEBD0 81 9D 00 00 */ lwz r12, 0(r29) /* 802B1C74 002AEBD4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 802B1C78 002AEBD8 7D 89 03 A6 */ mtctr r12 -/* 802B1C7C 002AEBDC 4E 80 04 21 */ bctrl +/* 802B1C7C 002AEBDC 4E 80 04 21 */ bctrl /* 802B1C80 002AEBE0 3B 41 00 7C */ addi r26, r1, 0x7c /* 802B1C84 002AEBE4 38 81 00 2C */ addi r4, r1, 0x2c /* 802B1C88 002AEBE8 7F 43 D3 78 */ mr r3, r26 @@ -931,7 +931,7 @@ lbl_802B1E00: /* 802B1E04 002AED64 80 01 01 74 */ lwz r0, 0x174(r1) /* 802B1E08 002AED68 7C 08 03 A6 */ mtlr r0 /* 802B1E0C 002AED6C 38 21 01 70 */ addi r1, r1, 0x170 -/* 802B1E10 002AED70 4E 80 00 20 */ blr +/* 802B1E10 002AED70 4E 80 00 20 */ blr .global CreateGeneratorDescription__28CProjectileWeaponDataFactoryFR12CInputStreamP11CSimplePool CreateGeneratorDescription__28CProjectileWeaponDataFactoryFR12CInputStreamP11CSimplePool: @@ -972,7 +972,7 @@ lbl_802B1E84: /* 802B1E90 002AEDF0 83 A1 00 14 */ lwz r29, 0x14(r1) /* 802B1E94 002AEDF4 7C 08 03 A6 */ mtlr r0 /* 802B1E98 002AEDF8 38 21 00 20 */ addi r1, r1, 0x20 -/* 802B1E9C 002AEDFC 4E 80 00 20 */ blr +/* 802B1E9C 002AEDFC 4E 80 00 20 */ blr .global GetGeneratorDesc__28CProjectileWeaponDataFactoryFR12CInputStreamP11CSimplePool GetGeneratorDesc__28CProjectileWeaponDataFactoryFR12CInputStreamP11CSimplePool: @@ -1011,7 +1011,7 @@ lbl_802B1F0C: /* 802B1F14 002AEE74 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 802B1F18 002AEE78 7C 08 03 A6 */ mtlr r0 /* 802B1F1C 002AEE7C 38 21 00 30 */ addi r1, r1, 0x30 -/* 802B1F20 002AEE80 4E 80 00 20 */ blr +/* 802B1F20 002AEE80 4E 80 00 20 */ blr .global "__dt__46TObjOwnerDerivedFromIObj<18CWeaponDescription>Fv" "__dt__46TObjOwnerDerivedFromIObj<18CWeaponDescription>Fv": @@ -1053,7 +1053,7 @@ lbl_802B1F98: /* 802B1FA4 002AEF04 83 C1 00 08 */ lwz r30, 8(r1) /* 802B1FA8 002AEF08 7C 08 03 A6 */ mtlr r0 /* 802B1FAC 002AEF0C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802B1FB0 002AEF10 4E 80 00 20 */ blr +/* 802B1FB0 002AEF10 4E 80 00 20 */ blr .global FProjectileWeaponDataFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer FProjectileWeaponDataFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer: @@ -1098,7 +1098,7 @@ FProjectileWeaponDataFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer: /* 802B204C 002AEFAC 38 80 00 01 */ li r4, 1 /* 802B2050 002AEFB0 81 8C 00 08 */ lwz r12, 8(r12) /* 802B2054 002AEFB4 7D 89 03 A6 */ mtctr r12 -/* 802B2058 002AEFB8 4E 80 04 21 */ bctrl +/* 802B2058 002AEFB8 4E 80 04 21 */ bctrl lbl_802B205C: /* 802B205C 002AEFBC 88 01 00 0C */ lbz r0, 0xc(r1) /* 802B2060 002AEFC0 28 00 00 00 */ cmplwi r0, 0 @@ -1113,7 +1113,7 @@ lbl_802B2074: /* 802B2080 002AEFE0 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 802B2084 002AEFE4 7C 08 03 A6 */ mtlr r0 /* 802B2088 002AEFE8 38 21 00 30 */ addi r1, r1, 0x30 -/* 802B208C 002AEFEC 4E 80 00 20 */ blr +/* 802B208C 002AEFEC 4E 80 00 20 */ blr .global "GetIObjObjectFor__28TToken<18CWeaponDescription>FRCQ24rstl30auto_ptr<18CWeaponDescription>" "GetIObjObjectFor__28TToken<18CWeaponDescription>FRCQ24rstl30auto_ptr<18CWeaponDescription>": @@ -1127,7 +1127,7 @@ lbl_802B2074: /* 802B20AC 002AF00C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802B20B0 002AF010 7C 08 03 A6 */ mtlr r0 /* 802B20B4 002AF014 38 21 00 10 */ addi r1, r1, 0x10 -/* 802B20B8 002AF018 4E 80 00 20 */ blr +/* 802B20B8 002AF018 4E 80 00 20 */ blr .global "GetNewDerivedObject__46TObjOwnerDerivedFromIObj<18CWeaponDescription>FRCQ24rstl30auto_ptr<18CWeaponDescription>" "GetNewDerivedObject__46TObjOwnerDerivedFromIObj<18CWeaponDescription>FRCQ24rstl30auto_ptr<18CWeaponDescription>": diff --git a/asm/Weapons/CWeaponDescription.s b/asm/Weapons/CWeaponDescription.s index bbb7eb40..7b3b59b5 100644 --- a/asm/Weapons/CWeaponDescription.s +++ b/asm/Weapons/CWeaponDescription.s @@ -9,7 +9,7 @@ lbl_803EC5C8: .4byte 0 .4byte __dt__17CModVectorElement .4byte 0 - + .section .text, "ax" .global __dt__18CWeaponDescriptionFv @@ -29,7 +29,7 @@ __dt__18CWeaponDescriptionFv: /* 802B58D0 002B2830 38 80 00 01 */ li r4, 1 /* 802B58D4 002B2834 81 8C 00 08 */ lwz r12, 8(r12) /* 802B58D8 002B2838 7D 89 03 A6 */ mtctr r12 -/* 802B58DC 002B283C 4E 80 04 21 */ bctrl +/* 802B58DC 002B283C 4E 80 04 21 */ bctrl lbl_802B58E0: /* 802B58E0 002B2840 80 7F 00 00 */ lwz r3, 0(r31) /* 802B58E4 002B2844 28 03 00 00 */ cmplwi r3, 0 @@ -38,7 +38,7 @@ lbl_802B58E0: /* 802B58F0 002B2850 38 80 00 01 */ li r4, 1 /* 802B58F4 002B2854 81 8C 00 08 */ lwz r12, 8(r12) /* 802B58F8 002B2858 7D 89 03 A6 */ mtctr r12 -/* 802B58FC 002B285C 4E 80 04 21 */ bctrl +/* 802B58FC 002B285C 4E 80 04 21 */ bctrl lbl_802B5900: /* 802B5900 002B2860 80 7F 00 0C */ lwz r3, 0xc(r31) /* 802B5904 002B2864 28 03 00 00 */ cmplwi r3, 0 @@ -47,7 +47,7 @@ lbl_802B5900: /* 802B5910 002B2870 38 80 00 01 */ li r4, 1 /* 802B5914 002B2874 81 8C 00 08 */ lwz r12, 8(r12) /* 802B5918 002B2878 7D 89 03 A6 */ mtctr r12 -/* 802B591C 002B287C 4E 80 04 21 */ bctrl +/* 802B591C 002B287C 4E 80 04 21 */ bctrl lbl_802B5920: /* 802B5920 002B2880 80 7F 00 08 */ lwz r3, 8(r31) /* 802B5924 002B2884 28 03 00 00 */ cmplwi r3, 0 @@ -56,7 +56,7 @@ lbl_802B5920: /* 802B5930 002B2890 38 80 00 01 */ li r4, 1 /* 802B5934 002B2894 81 8C 00 08 */ lwz r12, 8(r12) /* 802B5938 002B2898 7D 89 03 A6 */ mtctr r12 -/* 802B593C 002B289C 4E 80 04 21 */ bctrl +/* 802B593C 002B289C 4E 80 04 21 */ bctrl lbl_802B5940: /* 802B5940 002B28A0 80 7F 00 14 */ lwz r3, 0x14(r31) /* 802B5944 002B28A4 28 03 00 00 */ cmplwi r3, 0 @@ -65,7 +65,7 @@ lbl_802B5940: /* 802B5950 002B28B0 38 80 00 01 */ li r4, 1 /* 802B5954 002B28B4 81 8C 00 08 */ lwz r12, 8(r12) /* 802B5958 002B28B8 7D 89 03 A6 */ mtctr r12 -/* 802B595C 002B28BC 4E 80 04 21 */ bctrl +/* 802B595C 002B28BC 4E 80 04 21 */ bctrl lbl_802B5960: /* 802B5960 002B28C0 80 7F 00 18 */ lwz r3, 0x18(r31) /* 802B5964 002B28C4 28 03 00 00 */ cmplwi r3, 0 @@ -74,7 +74,7 @@ lbl_802B5960: /* 802B5970 002B28D0 38 80 00 01 */ li r4, 1 /* 802B5974 002B28D4 81 8C 00 08 */ lwz r12, 8(r12) /* 802B5978 002B28D8 7D 89 03 A6 */ mtctr r12 -/* 802B597C 002B28DC 4E 80 04 21 */ bctrl +/* 802B597C 002B28DC 4E 80 04 21 */ bctrl lbl_802B5980: /* 802B5980 002B28E0 80 7F 00 1C */ lwz r3, 0x1c(r31) /* 802B5984 002B28E4 28 03 00 00 */ cmplwi r3, 0 @@ -83,7 +83,7 @@ lbl_802B5980: /* 802B5990 002B28F0 38 80 00 01 */ li r4, 1 /* 802B5994 002B28F4 81 8C 00 08 */ lwz r12, 8(r12) /* 802B5998 002B28F8 7D 89 03 A6 */ mtctr r12 -/* 802B599C 002B28FC 4E 80 04 21 */ bctrl +/* 802B599C 002B28FC 4E 80 04 21 */ bctrl lbl_802B59A0: /* 802B59A0 002B2900 80 7F 00 20 */ lwz r3, 0x20(r31) /* 802B59A4 002B2904 28 03 00 00 */ cmplwi r3, 0 @@ -92,7 +92,7 @@ lbl_802B59A0: /* 802B59B0 002B2910 38 80 00 01 */ li r4, 1 /* 802B59B4 002B2914 81 8C 00 08 */ lwz r12, 8(r12) /* 802B59B8 002B2918 7D 89 03 A6 */ mtctr r12 -/* 802B59BC 002B291C 4E 80 04 21 */ bctrl +/* 802B59BC 002B291C 4E 80 04 21 */ bctrl lbl_802B59C0: /* 802B59C0 002B2920 80 7F 00 24 */ lwz r3, 0x24(r31) /* 802B59C4 002B2924 28 03 00 00 */ cmplwi r3, 0 @@ -101,7 +101,7 @@ lbl_802B59C0: /* 802B59D0 002B2930 38 80 00 01 */ li r4, 1 /* 802B59D4 002B2934 81 8C 00 08 */ lwz r12, 8(r12) /* 802B59D8 002B2938 7D 89 03 A6 */ mtctr r12 -/* 802B59DC 002B293C 4E 80 04 21 */ bctrl +/* 802B59DC 002B293C 4E 80 04 21 */ bctrl lbl_802B59E0: /* 802B59E0 002B2940 80 7F 00 30 */ lwz r3, 0x30(r31) /* 802B59E4 002B2944 28 03 00 00 */ cmplwi r3, 0 @@ -110,7 +110,7 @@ lbl_802B59E0: /* 802B59F0 002B2950 38 80 00 01 */ li r4, 1 /* 802B59F4 002B2954 81 8C 00 08 */ lwz r12, 8(r12) /* 802B59F8 002B2958 7D 89 03 A6 */ mtctr r12 -/* 802B59FC 002B295C 4E 80 04 21 */ bctrl +/* 802B59FC 002B295C 4E 80 04 21 */ bctrl lbl_802B5A00: /* 802B5A00 002B2960 80 7F 00 AC */ lwz r3, 0xac(r31) /* 802B5A04 002B2964 28 03 00 00 */ cmplwi r3, 0 @@ -119,7 +119,7 @@ lbl_802B5A00: /* 802B5A10 002B2970 38 80 00 01 */ li r4, 1 /* 802B5A14 002B2974 81 8C 00 08 */ lwz r12, 8(r12) /* 802B5A18 002B2978 7D 89 03 A6 */ mtctr r12 -/* 802B5A1C 002B297C 4E 80 04 21 */ bctrl +/* 802B5A1C 002B297C 4E 80 04 21 */ bctrl lbl_802B5A20: /* 802B5A20 002B2980 80 7F 00 B0 */ lwz r3, 0xb0(r31) /* 802B5A24 002B2984 28 03 00 00 */ cmplwi r3, 0 @@ -128,7 +128,7 @@ lbl_802B5A20: /* 802B5A30 002B2990 38 80 00 01 */ li r4, 1 /* 802B5A34 002B2994 81 8C 00 08 */ lwz r12, 8(r12) /* 802B5A38 002B2998 7D 89 03 A6 */ mtctr r12 -/* 802B5A3C 002B299C 4E 80 04 21 */ bctrl +/* 802B5A3C 002B299C 4E 80 04 21 */ bctrl lbl_802B5A40: /* 802B5A40 002B29A0 34 1F 00 94 */ addic. r0, r31, 0x94 /* 802B5A44 002B29A4 41 82 00 30 */ beq lbl_802B5A74 @@ -246,7 +246,7 @@ lbl_802B5BBC: /* 802B5BC8 002B2B28 83 C1 00 08 */ lwz r30, 8(r1) /* 802B5BCC 002B2B2C 7C 08 03 A6 */ mtlr r0 /* 802B5BD0 002B2B30 38 21 00 10 */ addi r1, r1, 0x10 -/* 802B5BD4 002B2B34 4E 80 00 20 */ blr +/* 802B5BD4 002B2B34 4E 80 00 20 */ blr .global __dt__17CModVectorElement __dt__17CModVectorElement: @@ -275,7 +275,7 @@ lbl_802B5C20: /* 802B5C28 002B2B88 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802B5C2C 002B2B8C 7C 08 03 A6 */ mtlr r0 /* 802B5C30 002B2B90 38 21 00 10 */ addi r1, r1, 0x10 -/* 802B5C34 002B2B94 4E 80 00 20 */ blr +/* 802B5C34 002B2B94 4E 80 00 20 */ blr .global __ct__18CWeaponDescriptionFv __ct__18CWeaponDescriptionFv: @@ -312,7 +312,7 @@ __ct__18CWeaponDescriptionFv: /* 802B5CB0 002B2C10 90 03 00 A8 */ stw r0, 0xa8(r3) /* 802B5CB4 002B2C14 90 A3 00 AC */ stw r5, 0xac(r3) /* 802B5CB8 002B2C18 90 A3 00 B0 */ stw r5, 0xb0(r3) -/* 802B5CBC 002B2C1C 4E 80 00 20 */ blr +/* 802B5CBC 002B2C1C 4E 80 00 20 */ blr .global sub_802b5cc0 sub_802b5cc0: diff --git a/asm/Weapons/IWeaponRenderer.s b/asm/Weapons/IWeaponRenderer.s index 67e3b2ee..4923d517 100644 --- a/asm/Weapons/IWeaponRenderer.s +++ b/asm/Weapons/IWeaponRenderer.s @@ -38,7 +38,7 @@ lbl_8046E1F0: .global lbl_805A91A0 lbl_805A91A0: .skip 0x8 - + .section .text, "ax" .global __sinit_IWeaponRenderer_cpp @@ -61,7 +61,7 @@ __sinit_IWeaponRenderer_cpp: /* 802B36E4 002B0644 80 01 00 14 */ lwz r0, 0x14(r1) /* 802B36E8 002B0648 7C 08 03 A6 */ mtlr r0 /* 802B36EC 002B064C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802B36F0 002B0650 4E 80 00 20 */ blr +/* 802B36F0 002B0650 4E 80 00 20 */ blr .global AddParticleGen__22CDefaultWeaponRendererFRC12CParticleGen AddParticleGen__22CDefaultWeaponRendererFRC12CParticleGen: @@ -72,11 +72,11 @@ AddParticleGen__22CDefaultWeaponRendererFRC12CParticleGen: /* 802B3704 002B0664 81 84 00 00 */ lwz r12, 0(r4) /* 802B3708 002B0668 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802B370C 002B066C 7D 89 03 A6 */ mtctr r12 -/* 802B3710 002B0670 4E 80 04 21 */ bctrl +/* 802B3710 002B0670 4E 80 04 21 */ bctrl /* 802B3714 002B0674 80 01 00 14 */ lwz r0, 0x14(r1) /* 802B3718 002B0678 7C 08 03 A6 */ mtlr r0 /* 802B371C 002B067C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802B3720 002B0680 4E 80 00 20 */ blr +/* 802B3720 002B0680 4E 80 00 20 */ blr .global __dt__22CDefaultWeaponRendererFv __dt__22CDefaultWeaponRendererFv: @@ -104,4 +104,4 @@ lbl_802B3768: /* 802B3770 002B06D0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802B3774 002B06D4 7C 08 03 A6 */ mtlr r0 /* 802B3778 002B06D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802B377C 002B06DC 4E 80 00 20 */ blr +/* 802B377C 002B06DC 4E 80 00 20 */ blr diff --git a/asm/WorldFormat/CAreaBspTree.s b/asm/WorldFormat/CAreaBspTree.s index 3cef94d1..b5ee11da 100644 --- a/asm/WorldFormat/CAreaBspTree.s +++ b/asm/WorldFormat/CAreaBspTree.s @@ -23,4 +23,4 @@ __ct__12CAreaBspTreeFR12CInputStreamRC12CTransform4f: /* 802A2960 0029F8C0 83 C1 00 08 */ lwz r30, 8(r1) /* 802A2964 0029F8C4 7C 08 03 A6 */ mtlr r0 /* 802A2968 0029F8C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802A296C 0029F8CC 4E 80 00 20 */ blr +/* 802A296C 0029F8CC 4E 80 00 20 */ blr diff --git a/asm/WorldFormat/CAreaOctTree.s b/asm/WorldFormat/CAreaOctTree.s index bf54724c..8b9a0a8d 100644 --- a/asm/WorldFormat/CAreaOctTree.s +++ b/asm/WorldFormat/CAreaOctTree.s @@ -22,7 +22,7 @@ GetTriangleEdgeIndices__12CAreaOctTreeCFUs: /* 802A2974 0029F8D4 80 63 00 44 */ lwz r3, 0x44(r3) /* 802A2978 0029F8D8 1C 00 00 06 */ mulli r0, r0, 6 /* 802A297C 0029F8DC 7C 63 02 14 */ add r3, r3, r0 -/* 802A2980 0029F8E0 4E 80 00 20 */ blr +/* 802A2980 0029F8E0 4E 80 00 20 */ blr .global GetTriangleVertexIndices__12CAreaOctTreeCFUsPUs GetTriangleVertexIndices__12CAreaOctTreeCFUsPUs: @@ -67,13 +67,13 @@ lbl_802A29E8: /* 802A2A10 0029F970 B0 05 00 00 */ sth r0, 0(r5) /* 802A2A14 0029F974 A0 08 00 00 */ lhz r0, 0(r8) /* 802A2A18 0029F978 B0 05 00 02 */ sth r0, 2(r5) -/* 802A2A1C 0029F97C 4E 80 00 20 */ blr +/* 802A2A1C 0029F97C 4E 80 00 20 */ blr lbl_802A2A20: /* 802A2A20 0029F980 A0 08 00 00 */ lhz r0, 0(r8) /* 802A2A24 0029F984 B0 05 00 00 */ sth r0, 0(r5) /* 802A2A28 0029F988 A0 08 00 02 */ lhz r0, 2(r8) /* 802A2A2C 0029F98C B0 05 00 02 */ sth r0, 2(r5) -/* 802A2A30 0029F990 4E 80 00 20 */ blr +/* 802A2A30 0029F990 4E 80 00 20 */ blr .global GetMasterListTriangle__12CAreaOctTreeCFUs GetMasterListTriangle__12CAreaOctTreeCFUs: @@ -142,7 +142,7 @@ lbl_802A2B18: /* 802A2B18 0029FA78 80 01 00 14 */ lwz r0, 0x14(r1) /* 802A2B1C 0029FA7C 7C 08 03 A6 */ mtlr r0 /* 802A2B20 0029FA80 38 21 00 10 */ addi r1, r1, 0x10 -/* 802A2B24 0029FA84 4E 80 00 20 */ blr +/* 802A2B24 0029FA84 4E 80 00 20 */ blr .global MakeFromMemory__12CAreaOctTreeFPvUiPP12CAreaOctTreePb MakeFromMemory__12CAreaOctTreeFPvUiPP12CAreaOctTreePb: @@ -240,7 +240,7 @@ lbl_802A2C68: /* 802A2C90 0029FBF0 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 802A2C94 0029FBF4 7C 08 03 A6 */ mtlr r0 /* 802A2C98 0029FBF8 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 802A2C9C 0029FBFC 4E 80 00 20 */ blr +/* 802A2C9C 0029FBFC 4E 80 00 20 */ blr .global __ct__12CAreaOctTreeFRC6CAABoxQ312CAreaOctTree4Node9ETreeTypePUcPvUiPUiPUcPUcPUcUiP14CCollisionEdgeUiPUsUiP9CVector3f __ct__12CAreaOctTreeFRC6CAABoxQ312CAreaOctTree4Node9ETreeTypePUcPvUiPUiPUcPUcPUcUiP14CCollisionEdgeUiPUsUiP9CVector3f: @@ -282,7 +282,7 @@ __ct__12CAreaOctTreeFRC6CAABoxQ312CAreaOctTree4Node9ETreeTypePUcPvUiPUiPUcPUcPUc /* 802A2D2C 0029FC8C 90 03 00 4C */ stw r0, 0x4c(r3) /* 802A2D30 0029FC90 BB 61 00 0C */ lmw r27, 0xc(r1) /* 802A2D34 0029FC94 38 21 00 20 */ addi r1, r1, 0x20 -/* 802A2D38 0029FC98 4E 80 00 20 */ blr +/* 802A2D38 0029FC98 4E 80 00 20 */ blr .global GetTriangleArray__Q212CAreaOctTree4NodeCFv GetTriangleArray__Q212CAreaOctTree4NodeCFv: @@ -291,11 +291,11 @@ GetTriangleArray__Q212CAreaOctTree4NodeCFv: /* 802A2D44 0029FCA4 41 82 00 10 */ beq lbl_802A2D54 /* 802A2D48 0029FCA8 38 02 C1 40 */ addi r0, r2, lbl_805ADE60@sda21 /* 802A2D4C 0029FCAC 90 03 00 00 */ stw r0, 0(r3) -/* 802A2D50 0029FCB0 4E 80 00 20 */ blr +/* 802A2D50 0029FCB0 4E 80 00 20 */ blr lbl_802A2D54: /* 802A2D54 0029FCB4 80 04 00 18 */ lwz r0, 0x18(r4) /* 802A2D58 0029FCB8 90 03 00 00 */ stw r0, 0(r3) -/* 802A2D5C 0029FCBC 4E 80 00 20 */ blr +/* 802A2D5C 0029FCBC 4E 80 00 20 */ blr .global GetChild__Q212CAreaOctTree4NodeCFi GetChild__Q212CAreaOctTree4NodeCFi: @@ -384,7 +384,7 @@ lbl_802A2E90: /* 802A2EA0 0029FE00 83 81 00 30 */ lwz r28, 0x30(r1) /* 802A2EA4 0029FE04 7C 08 03 A6 */ mtlr r0 /* 802A2EA8 0029FE08 38 21 00 40 */ addi r1, r1, 0x40 -/* 802A2EAC 0029FE0C 4E 80 00 20 */ blr +/* 802A2EAC 0029FE0C 4E 80 00 20 */ blr .global BoxFromIndex__FiRC9CVector3fRC9CVector3fRC9CVector3f BoxFromIndex__FiRC9CVector3fRC9CVector3fRC9CVector3f: @@ -399,7 +399,7 @@ BoxFromIndex__FiRC9CVector3fRC9CVector3fRC9CVector3f: /* 802A2ED0 0029FE30 38 85 C4 08 */ addi r4, r5, lbl_803EC408@l /* 802A2ED4 0029FE34 7C 04 00 2E */ lwzx r0, r4, r0 /* 802A2ED8 0029FE38 7C 09 03 A6 */ mtctr r0 -/* 802A2EDC 0029FE3C 4E 80 04 20 */ bctr +/* 802A2EDC 0029FE3C 4E 80 04 20 */ bctr .global lbl_802A2EE0 lbl_802A2EE0: /* 802A2EE0 0029FE40 7D 04 43 78 */ mr r4, r8 diff --git a/asm/WorldFormat/CAreaOctTree_Tests.s b/asm/WorldFormat/CAreaOctTree_Tests.s index 91855c73..acc8a980 100644 --- a/asm/WorldFormat/CAreaOctTree_Tests.s +++ b/asm/WorldFormat/CAreaOctTree_Tests.s @@ -814,7 +814,7 @@ lbl_802A156C: /* 802A15C8 0029E528 80 01 04 64 */ lwz r0, 0x464(r1) /* 802A15CC 0029E52C 7C 08 03 A6 */ mtlr r0 /* 802A15D0 0029E530 38 21 04 60 */ addi r1, r1, 0x460 -/* 802A15D4 0029E534 4E 80 00 20 */ blr +/* 802A15D4 0029E534 4E 80 00 20 */ blr .global __as__Q212CAreaOctTree10SRayResultFRCQ212CAreaOctTree10SRayResult __as__Q212CAreaOctTree10SRayResultFRCQ212CAreaOctTree10SRayResult: @@ -844,12 +844,12 @@ __as__Q212CAreaOctTree10SRayResultFRCQ212CAreaOctTree10SRayResult: /* 802A1634 0029E594 80 01 00 14 */ lwz r0, 0x14(r1) /* 802A1638 0029E598 7C 08 03 A6 */ mtlr r0 /* 802A163C 0029E59C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802A1640 0029E5A0 4E 80 00 20 */ blr +/* 802A1640 0029E5A0 4E 80 00 20 */ blr .global "__as__Q24rstl36optional_object<17CCollisionSurface>FRCQ24rstl36optional_object<17CCollisionSurface>" "__as__Q24rstl36optional_object<17CCollisionSurface>FRCQ24rstl36optional_object<17CCollisionSurface>": /* 802A1644 0029E5A4 7C 03 20 40 */ cmplw r3, r4 -/* 802A1648 0029E5A8 4D 82 00 20 */ beqlr +/* 802A1648 0029E5A8 4D 82 00 20 */ beqlr /* 802A164C 0029E5AC 88 04 00 28 */ lbz r0, 0x28(r4) /* 802A1650 0029E5B0 28 00 00 00 */ cmplwi r0, 0 /* 802A1654 0029E5B4 41 82 00 C8 */ beq lbl_802A171C @@ -881,7 +881,7 @@ __as__Q212CAreaOctTree10SRayResultFRCQ212CAreaOctTree10SRayResult: lbl_802A16BC: /* 802A16BC 0029E61C 38 00 00 01 */ li r0, 1 /* 802A16C0 0029E620 98 03 00 28 */ stb r0, 0x28(r3) -/* 802A16C4 0029E624 4E 80 00 20 */ blr +/* 802A16C4 0029E624 4E 80 00 20 */ blr lbl_802A16C8: /* 802A16C8 0029E628 80 A4 00 00 */ lwz r5, 0(r4) /* 802A16CC 0029E62C 80 04 00 04 */ lwz r0, 4(r4) @@ -903,11 +903,11 @@ lbl_802A16C8: /* 802A170C 0029E66C 90 03 00 20 */ stw r0, 0x20(r3) /* 802A1710 0029E670 80 04 00 24 */ lwz r0, 0x24(r4) /* 802A1714 0029E674 90 03 00 24 */ stw r0, 0x24(r3) -/* 802A1718 0029E678 4E 80 00 20 */ blr +/* 802A1718 0029E678 4E 80 00 20 */ blr lbl_802A171C: /* 802A171C 0029E67C 38 00 00 00 */ li r0, 0 /* 802A1720 0029E680 98 03 00 28 */ stb r0, 0x28(r3) -/* 802A1724 0029E684 4E 80 00 20 */ blr +/* 802A1724 0029E684 4E 80 00 20 */ blr .global LineTestInternal__Q212CAreaOctTree4NodeCFRC5CLineRC15CMaterialFilterfffC9CVector3f LineTestInternal__Q212CAreaOctTree4NodeCFRC5CLineRC15CMaterialFilterfffC9CVector3f: @@ -1670,7 +1670,7 @@ lbl_802A2240: /* 802A229C 0029F1FC 80 01 03 94 */ lwz r0, 0x394(r1) /* 802A22A0 0029F200 7C 08 03 A6 */ mtlr r0 /* 802A22A4 0029F204 38 21 03 90 */ addi r1, r1, 0x390 -/* 802A22A8 0029F208 4E 80 00 20 */ blr +/* 802A22A8 0029F208 4E 80 00 20 */ blr .global LineTest__Q212CAreaOctTree4NodeCFRC5CLineRC15CMaterialFilterf LineTest__Q212CAreaOctTree4NodeCFRC5CLineRC15CMaterialFilterf: @@ -1733,7 +1733,7 @@ lbl_802A236C: /* 802A2380 0029F2E0 83 A1 00 24 */ lwz r29, 0x24(r1) /* 802A2384 0029F2E4 7C 08 03 A6 */ mtlr r0 /* 802A2388 0029F2E8 38 21 00 40 */ addi r1, r1, 0x40 -/* 802A238C 0029F2EC 4E 80 00 20 */ blr +/* 802A238C 0029F2EC 4E 80 00 20 */ blr .global LineTestEx__Q212CAreaOctTree4NodeCFRC5CLineRC15CMaterialFilterRQ212CAreaOctTree10SRayResultf LineTestEx__Q212CAreaOctTree4NodeCFRC5CLineRC15CMaterialFilterRQ212CAreaOctTree10SRayResultf: @@ -1794,7 +1794,7 @@ lbl_802A244C: /* 802A2464 0029F3C4 83 81 00 20 */ lwz r28, 0x20(r1) /* 802A2468 0029F3C8 7C 08 03 A6 */ mtlr r0 /* 802A246C 0029F3CC 38 21 00 40 */ addi r1, r1, 0x40 -/* 802A2470 0029F3D0 4E 80 00 20 */ blr +/* 802A2470 0029F3D0 4E 80 00 20 */ blr .global BoxLineTest__FRC6CAABoxRC5CLineRfRf BoxLineTest__FRC6CAABoxRC5CLineRfRf: @@ -1910,7 +1910,7 @@ lbl_802A2604: /* 802A2608 0029F568 80 01 00 44 */ lwz r0, 0x44(r1) /* 802A260C 0029F56C 7C 08 03 A6 */ mtlr r0 /* 802A2610 0029F570 38 21 00 40 */ addi r1, r1, 0x40 -/* 802A2614 0029F574 4E 80 00 20 */ blr +/* 802A2614 0029F574 4E 80 00 20 */ blr .global _close_enough__Ffff _close_enough__Ffff: diff --git a/asm/WorldFormat/CAreaRenderOctTree.s b/asm/WorldFormat/CAreaRenderOctTree.s index 422b3b25..ce3bc64c 100644 --- a/asm/WorldFormat/CAreaRenderOctTree.s +++ b/asm/WorldFormat/CAreaRenderOctTree.s @@ -36,7 +36,7 @@ TestBit__13CCubeRendererFPCUii: /* 802AE6E0 002AB640 7C 03 00 D0 */ neg r0, r3 /* 802AE6E4 002AB644 7C 00 1B 78 */ or r0, r0, r3 /* 802AE6E8 002AB648 54 03 0F FE */ srwi r3, r0, 0x1f -/* 802AE6EC 002AB64C 4E 80 00 20 */ blr +/* 802AE6EC 002AB64C 4E 80 00 20 */ blr .global RecursiveBuildOverlaps__18CAreaRenderOctTreeFPUiRC18CAreaRenderOctTreeRC6CAABoxRC6CAABox RecursiveBuildOverlaps__18CAreaRenderOctTreeFPUiRC18CAreaRenderOctTreeRC6CAABoxRC6CAABox: @@ -120,7 +120,7 @@ lbl_802AE804: /* 802AE808 002AB768 80 01 00 54 */ lwz r0, 0x54(r1) /* 802AE80C 002AB76C 7C 08 03 A6 */ mtlr r0 /* 802AE810 002AB770 38 21 00 50 */ addi r1, r1, 0x50 -/* 802AE814 002AB774 4E 80 00 20 */ blr +/* 802AE814 002AB774 4E 80 00 20 */ blr .global FindOverlappingModels__18CAreaRenderOctTreeFPUiRC6CAABox FindOverlappingModels__18CAreaRenderOctTreeFPUiRC6CAABox: @@ -138,7 +138,7 @@ FindOverlappingModels__18CAreaRenderOctTreeFPUiRC6CAABox: /* 802AE844 002AB7A4 80 01 00 14 */ lwz r0, 0x14(r1) /* 802AE848 002AB7A8 7C 08 03 A6 */ mtlr r0 /* 802AE84C 002AB7AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802AE850 002AB7B0 4E 80 00 20 */ blr +/* 802AE850 002AB7B0 4E 80 00 20 */ blr .global "FindOverlappingModels__18CAreaRenderOctTreeFRQ24rstl10vectorRC6CAABox" "FindOverlappingModels__18CAreaRenderOctTreeFRQ24rstl10vectorRC6CAABox": @@ -170,7 +170,7 @@ FindOverlappingModels__18CAreaRenderOctTreeFPUiRC6CAABox: /* 802AE8B8 002AB818 83 A1 00 14 */ lwz r29, 0x14(r1) /* 802AE8BC 002AB81C 7C 08 03 A6 */ mtlr r0 /* 802AE8C0 002AB820 38 21 00 20 */ addi r1, r1, 0x20 -/* 802AE8C4 002AB824 4E 80 00 20 */ blr +/* 802AE8C4 002AB824 4E 80 00 20 */ blr .global sub_802ae8c8 sub_802ae8c8: @@ -230,7 +230,7 @@ lbl_802AE974: /* 802AE980 002AB8E0 83 A1 00 24 */ lwz r29, 0x24(r1) /* 802AE984 002AB8E4 7C 08 03 A6 */ mtlr r0 /* 802AE988 002AB8E8 38 21 00 30 */ addi r1, r1, 0x30 -/* 802AE98C 002AB8EC 4E 80 00 20 */ blr +/* 802AE98C 002AB8EC 4E 80 00 20 */ blr .global sub_802ae990 sub_802ae990: @@ -262,7 +262,7 @@ sub_802ae990: /* 802AE9F4 002AB954 38 63 C4 A8 */ addi r3, r3, lbl_803EC4A8@l /* 802AE9F8 002AB958 7C 03 00 2E */ lwzx r0, r3, r0 /* 802AE9FC 002AB95C 7C 09 03 A6 */ mtctr r0 -/* 802AEA00 002AB960 4E 80 04 20 */ bctr +/* 802AEA00 002AB960 4E 80 04 20 */ bctr .global lbl_802AEA04 lbl_802AEA04: /* 802AEA04 002AB964 EC 02 28 2A */ fadds f0, f2, f5 @@ -426,7 +426,7 @@ lbl_802AEC04: /* 802AEC20 002ABB80 83 A1 00 54 */ lwz r29, 0x54(r1) /* 802AEC24 002ABB84 7C 08 03 A6 */ mtlr r0 /* 802AEC28 002ABB88 38 21 00 60 */ addi r1, r1, 0x60 -/* 802AEC2C 002ABB8C 4E 80 00 20 */ blr +/* 802AEC2C 002ABB8C 4E 80 00 20 */ blr .global sub_802aec30 sub_802aec30: @@ -435,7 +435,7 @@ sub_802aec30: /* 802AEC38 002ABB98 38 63 61 18 */ addi r3, r3, lbl_803D6118@l /* 802AEC3C 002ABB9C 54 00 10 3A */ slwi r0, r0, 2 /* 802AEC40 002ABBA0 7C 63 00 2E */ lwzx r3, r3, r0 -/* 802AEC44 002ABBA4 4E 80 00 20 */ blr +/* 802AEC44 002ABBA4 4E 80 00 20 */ blr .global sub_802aec48 sub_802aec48: diff --git a/asm/WorldFormat/CCollidableOBBTree.s b/asm/WorldFormat/CCollidableOBBTree.s index 8a8eef5a..34ede85d 100644 --- a/asm/WorldFormat/CCollidableOBBTree.s +++ b/asm/WorldFormat/CCollidableOBBTree.s @@ -60,12 +60,12 @@ lbl_802A9930: /* 802A9938 002A6898 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802A993C 002A689C 7C 08 03 A6 */ mtlr r0 /* 802A9940 002A68A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802A9944 002A68A4 4E 80 00 20 */ blr +/* 802A9944 002A68A4 4E 80 00 20 */ blr .global GetTableIndex__18CCollidableOBBTreeCFv GetTableIndex__18CCollidableOBBTreeCFv: /* 802A9948 002A68A8 80 6D 9A 70 */ lwz r3, lbl_805A8630@sda21(r13) -/* 802A994C 002A68AC 4E 80 00 20 */ blr +/* 802A994C 002A68AC 4E 80 00 20 */ blr .global LineIntersectsLeaf__18CCollidableOBBTreeCFRCQ28COBBTree9CLeafDataR12CRayCastInfo LineIntersectsLeaf__18CCollidableOBBTreeCFRCQ28COBBTree9CLeafDataR12CRayCastInfo: @@ -94,7 +94,7 @@ lbl_802A9988: /* 802A99A4 002A6904 81 97 00 00 */ lwz r12, 0(r23) /* 802A99A8 002A6908 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802A99AC 002A690C 7D 89 03 A6 */ mtctr r12 -/* 802A99B0 002A6910 4E 80 04 21 */ bctrl +/* 802A99B0 002A6910 4E 80 04 21 */ bctrl /* 802A99B4 002A6914 80 C1 00 6C */ lwz r6, 0x6c(r1) /* 802A99B8 002A6918 38 81 00 08 */ addi r4, r1, 8 /* 802A99BC 002A691C 80 03 00 04 */ lwz r0, 4(r3) @@ -150,7 +150,7 @@ lbl_802A9A70: /* 802A9A78 002A69D8 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 802A9A7C 002A69DC 7C 08 03 A6 */ mtlr r0 /* 802A9A80 002A69E0 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 802A9A84 002A69E4 4E 80 00 20 */ blr +/* 802A9A84 002A69E4 4E 80 00 20 */ blr .global LineIntersectsOBBTree__18CCollidableOBBTreeCFPCQ28COBBTree5CNodePCQ28COBBTree5CNodeR12CRayCastInfo LineIntersectsOBBTree__18CCollidableOBBTreeCFPCQ28COBBTree5CNodePCQ28COBBTree5CNodeR12CRayCastInfo: @@ -358,7 +358,7 @@ lbl_802A9D5C: /* 802A9D60 002A6CC0 80 01 00 34 */ lwz r0, 0x34(r1) /* 802A9D64 002A6CC4 7C 08 03 A6 */ mtlr r0 /* 802A9D68 002A6CC8 38 21 00 30 */ addi r1, r1, 0x30 -/* 802A9D6C 002A6CCC 4E 80 00 20 */ blr +/* 802A9D6C 002A6CCC 4E 80 00 20 */ blr .global LineIntersectsOBBTree__18CCollidableOBBTreeCFPCQ28COBBTree5CNodeR12CRayCastInfo LineIntersectsOBBTree__18CCollidableOBBTreeCFPCQ28COBBTree5CNodeR12CRayCastInfo: @@ -425,7 +425,7 @@ lbl_802A9E3C: /* 802A9E50 002A6DB0 83 81 00 10 */ lwz r28, 0x10(r1) /* 802A9E54 002A6DB4 7C 08 03 A6 */ mtlr r0 /* 802A9E58 002A6DB8 38 21 00 20 */ addi r1, r1, 0x20 -/* 802A9E5C 002A6DBC 4E 80 00 20 */ blr +/* 802A9E5C 002A6DBC 4E 80 00 20 */ blr .global LineIntersectsTree__18CCollidableOBBTreeCFRC5CMRayRC15CMaterialFilterfRC12CTransform4f LineIntersectsTree__18CCollidableOBBTreeCFRC5CMRayRC15CMaterialFilterfRC12CTransform4f: @@ -585,7 +585,7 @@ lbl_802AA0A0: /* 802AA0BC 002A701C 80 01 01 14 */ lwz r0, 0x114(r1) /* 802AA0C0 002A7020 7C 08 03 A6 */ mtlr r0 /* 802AA0C4 002A7024 38 21 01 10 */ addi r1, r1, 0x110 -/* 802AA0C8 002A7028 4E 80 00 20 */ blr +/* 802AA0C8 002A7028 4E 80 00 20 */ blr .global TransformPlane__FRC6CPlaneRC12CTransform4f TransformPlane__FRC6CPlaneRC12CTransform4f: @@ -647,7 +647,7 @@ TransformPlane__FRC6CPlaneRC12CTransform4f: /* 802AA1A8 002A7108 83 A1 00 34 */ lwz r29, 0x34(r1) /* 802AA1AC 002A710C 7C 08 03 A6 */ mtlr r0 /* 802AA1B0 002A7110 38 21 00 70 */ addi r1, r1, 0x70 -/* 802AA1B4 002A7114 4E 80 00 20 */ blr +/* 802AA1B4 002A7114 4E 80 00 20 */ blr .global CastRayInternal__18CCollidableOBBTreeCFRC25CInternalRayCastStructure CastRayInternal__18CCollidableOBBTreeCFRC25CInternalRayCastStructure: @@ -664,7 +664,7 @@ CastRayInternal__18CCollidableOBBTreeCFRC25CInternalRayCastStructure: /* 802AA1E0 002A7140 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802AA1E4 002A7144 7C 08 03 A6 */ mtlr r0 /* 802AA1E8 002A7148 38 21 00 10 */ addi r1, r1, 0x10 -/* 802AA1EC 002A714C 4E 80 00 20 */ blr +/* 802AA1EC 002A714C 4E 80 00 20 */ blr .global SphereCollideWithLeafMoving__18CCollidableOBBTreeCFRCQ28COBBTree9CLeafDataRC12CTransform4fRC7CSphereRC13CMaterialListRC15CMaterialFilterRC9CVector3fRdR14CCollisionInfo SphereCollideWithLeafMoving__18CCollidableOBBTreeCFRCQ28COBBTree9CLeafDataRC12CTransform4fRC7CSphereRC13CMaterialListRC15CMaterialFilterRC9CVector3fRdR14CCollisionInfo: @@ -838,7 +838,7 @@ lbl_802AA410: /* 802AA488 002A73E8 81 8F 00 00 */ lwz r12, 0(r15) /* 802AA48C 002A73EC 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802AA490 002A73F0 7D 89 03 A6 */ mtctr r12 -/* 802AA494 002A73F4 4E 80 04 21 */ bctrl +/* 802AA494 002A73F4 4E 80 04 21 */ bctrl /* 802AA498 002A73F8 80 C1 02 74 */ lwz r6, 0x274(r1) /* 802AA49C 002A73FC 38 81 00 48 */ addi r4, r1, 0x48 /* 802AA4A0 002A7400 80 03 00 04 */ lwz r0, 4(r3) @@ -1666,7 +1666,7 @@ lbl_802AB0AC: /* 802AB134 002A8094 80 01 04 D4 */ lwz r0, 0x4d4(r1) /* 802AB138 002A8098 7C 08 03 A6 */ mtlr r0 /* 802AB13C 002A809C 38 21 04 D0 */ addi r1, r1, 0x4d0 -/* 802AB140 002A80A0 4E 80 00 20 */ blr +/* 802AB140 002A80A0 4E 80 00 20 */ blr .global SphereCollisionMoving__18CCollidableOBBTreeCFRCQ28COBBTree5CNodeRC12CTransform4fRC7CSphereRC6COBBoxRC13CMaterialListRC15CMaterialFilterRC9CVector3fRdR14CCollisionInfo SphereCollisionMoving__18CCollidableOBBTreeCFRCQ28COBBTree5CNodeRC12CTransform4fRC7CSphereRC6COBBoxRC13CMaterialListRC15CMaterialFilterRC9CVector3fRdR14CCollisionInfo: @@ -1752,7 +1752,7 @@ lbl_802AB268: /* 802AB270 002A81D0 80 01 00 44 */ lwz r0, 0x44(r1) /* 802AB274 002A81D4 7C 08 03 A6 */ mtlr r0 /* 802AB278 002A81D8 38 21 00 40 */ addi r1, r1, 0x40 -/* 802AB27C 002A81DC 4E 80 00 20 */ blr +/* 802AB27C 002A81DC 4E 80 00 20 */ blr .global AABoxCollideWithLeafMoving__18CCollidableOBBTreeCFRCQ28COBBTree9CLeafDataRC12CTransform4fRC6CAABoxRC13CMaterialListRC15CMaterialFilterRCQ220CMetroidAreaCollider22CMovingAABoxComponentsRC9CVector3fRdR14CCollisionInfo AABoxCollideWithLeafMoving__18CCollidableOBBTreeCFRCQ28COBBTree9CLeafDataRC12CTransform4fRC6CAABoxRC13CMaterialListRC15CMaterialFilterRCQ220CMetroidAreaCollider22CMovingAABoxComponentsRC9CVector3fRdR14CCollisionInfo: @@ -1894,7 +1894,7 @@ lbl_802AB428: /* 802AB498 002A83F8 81 8F 00 00 */ lwz r12, 0(r15) /* 802AB49C 002A83FC 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802AB4A0 002A8400 7D 89 03 A6 */ mtctr r12 -/* 802AB4A4 002A8404 4E 80 04 21 */ bctrl +/* 802AB4A4 002A8404 4E 80 04 21 */ bctrl /* 802AB4A8 002A8408 80 C1 01 1C */ lwz r6, 0x11c(r1) /* 802AB4AC 002A840C 38 81 00 38 */ addi r4, r1, 0x38 /* 802AB4B0 002A8410 80 03 00 04 */ lwz r0, 4(r3) @@ -2271,7 +2271,7 @@ lbl_802ABA30: /* 802ABA5C 002A89BC 80 01 02 C4 */ lwz r0, 0x2c4(r1) /* 802ABA60 002A89C0 7C 08 03 A6 */ mtlr r0 /* 802ABA64 002A89C4 38 21 02 C0 */ addi r1, r1, 0x2c0 -/* 802ABA68 002A89C8 4E 80 00 20 */ blr +/* 802ABA68 002A89C8 4E 80 00 20 */ blr .global AABoxCollisionMoving__18CCollidableOBBTreeCFRCQ28COBBTree5CNodeRC12CTransform4fRC6CAABoxRC6COBBoxRC13CMaterialListRC15CMaterialFilterRCQ220CMetroidAreaCollider22CMovingAABoxComponentsRC9CVector3fRdR14CCollisionInfo AABoxCollisionMoving__18CCollidableOBBTreeCFRCQ28COBBTree5CNodeRC12CTransform4fRC6CAABoxRC6COBBoxRC13CMaterialListRC15CMaterialFilterRCQ220CMetroidAreaCollider22CMovingAABoxComponentsRC9CVector3fRdR14CCollisionInfo: @@ -2361,7 +2361,7 @@ lbl_802ABBA0: /* 802ABBA8 002A8B08 80 01 00 54 */ lwz r0, 0x54(r1) /* 802ABBAC 002A8B0C 7C 08 03 A6 */ mtlr r0 /* 802ABBB0 002A8B10 38 21 00 50 */ addi r1, r1, 0x50 -/* 802ABBB4 002A8B14 4E 80 00 20 */ blr +/* 802ABBB4 002A8B14 4E 80 00 20 */ blr .global SphereCollisionBoolean__18CCollidableOBBTreeCFRCQ28COBBTree5CNodeRC12CTransform4fRC7CSphereRC6COBBoxRC15CMaterialFilter SphereCollisionBoolean__18CCollidableOBBTreeCFRCQ28COBBTree5CNodeRC12CTransform4fRC7CSphereRC6COBBoxRC15CMaterialFilter: @@ -2425,7 +2425,7 @@ lbl_802ABC2C: /* 802ABC98 002A8BF8 81 96 00 00 */ lwz r12, 0(r22) /* 802ABC9C 002A8BFC 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802ABCA0 002A8C00 7D 89 03 A6 */ mtctr r12 -/* 802ABCA4 002A8C04 4E 80 04 21 */ bctrl +/* 802ABCA4 002A8C04 4E 80 04 21 */ bctrl /* 802ABCA8 002A8C08 80 C1 00 5C */ lwz r6, 0x5c(r1) /* 802ABCAC 002A8C0C 38 81 00 08 */ addi r4, r1, 8 /* 802ABCB0 002A8C10 80 03 00 04 */ lwz r0, 4(r3) @@ -2488,7 +2488,7 @@ lbl_802ABD74: /* 802ABD78 002A8CD8 80 01 00 94 */ lwz r0, 0x94(r1) /* 802ABD7C 002A8CDC 7C 08 03 A6 */ mtlr r0 /* 802ABD80 002A8CE0 38 21 00 90 */ addi r1, r1, 0x90 -/* 802ABD84 002A8CE4 4E 80 00 20 */ blr +/* 802ABD84 002A8CE4 4E 80 00 20 */ blr .global AABoxCollisionBoolean__18CCollidableOBBTreeCFRCQ28COBBTree5CNodeRC12CTransform4fRC6CAABoxRC6COBBoxRC15CMaterialFilter AABoxCollisionBoolean__18CCollidableOBBTreeCFRCQ28COBBTree5CNodeRC12CTransform4fRC6CAABoxRC6COBBoxRC15CMaterialFilter: @@ -2578,7 +2578,7 @@ lbl_802ABE64: /* 802ABED0 002A8E30 81 98 00 00 */ lwz r12, 0(r24) /* 802ABED4 002A8E34 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802ABED8 002A8E38 7D 89 03 A6 */ mtctr r12 -/* 802ABEDC 002A8E3C 4E 80 04 21 */ bctrl +/* 802ABEDC 002A8E3C 4E 80 04 21 */ bctrl /* 802ABEE0 002A8E40 80 C1 00 80 */ lwz r6, 0x80(r1) /* 802ABEE4 002A8E44 38 81 00 08 */ addi r4, r1, 8 /* 802ABEE8 002A8E48 80 03 00 04 */ lwz r0, 4(r3) @@ -2642,7 +2642,7 @@ lbl_802ABFB0: /* 802ABFB4 002A8F14 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 802ABFB8 002A8F18 7C 08 03 A6 */ mtlr r0 /* 802ABFBC 002A8F1C 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 802ABFC0 002A8F20 4E 80 00 20 */ blr +/* 802ABFC0 002A8F20 4E 80 00 20 */ blr .global SphereCollideWithLeaf__18CCollidableOBBTreeCFRCQ28COBBTree9CLeafDataRC12CTransform4fRC7CSphereRC13CMaterialListRC15CMaterialFilterR18CCollisionInfoList SphereCollideWithLeaf__18CCollidableOBBTreeCFRCQ28COBBTree9CLeafDataRC12CTransform4fRC7CSphereRC13CMaterialListRC15CMaterialFilterR18CCollisionInfoList: @@ -2706,7 +2706,7 @@ lbl_802AC038: /* 802AC0A4 002A9004 81 93 00 00 */ lwz r12, 0(r19) /* 802AC0A8 002A9008 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802AC0AC 002A900C 7D 89 03 A6 */ mtctr r12 -/* 802AC0B0 002A9010 4E 80 04 21 */ bctrl +/* 802AC0B0 002A9010 4E 80 04 21 */ bctrl /* 802AC0B4 002A9014 80 C1 00 74 */ lwz r6, 0x74(r1) /* 802AC0B8 002A9018 38 81 00 08 */ addi r4, r1, 8 /* 802AC0BC 002A901C 80 03 00 04 */ lwz r0, 4(r3) @@ -2752,7 +2752,7 @@ lbl_802AC144: /* 802AC154 002A90B4 80 01 01 14 */ lwz r0, 0x114(r1) /* 802AC158 002A90B8 7C 08 03 A6 */ mtlr r0 /* 802AC15C 002A90BC 38 21 01 10 */ addi r1, r1, 0x110 -/* 802AC160 002A90C0 4E 80 00 20 */ blr +/* 802AC160 002A90C0 4E 80 00 20 */ blr .global SphereCollision__18CCollidableOBBTreeCFRCQ28COBBTree5CNodeRC12CTransform4fRC7CSphereRC6COBBoxRC13CMaterialListRC15CMaterialFilterR18CCollisionInfoList SphereCollision__18CCollidableOBBTreeCFRCQ28COBBTree5CNodeRC12CTransform4fRC7CSphereRC6COBBoxRC13CMaterialListRC15CMaterialFilterR18CCollisionInfoList: @@ -2830,7 +2830,7 @@ lbl_802AC268: /* 802AC270 002A91D0 80 01 00 34 */ lwz r0, 0x34(r1) /* 802AC274 002A91D4 7C 08 03 A6 */ mtlr r0 /* 802AC278 002A91D8 38 21 00 30 */ addi r1, r1, 0x30 -/* 802AC27C 002A91DC 4E 80 00 20 */ blr +/* 802AC27C 002A91DC 4E 80 00 20 */ blr .global AABoxCollideWithLeaf__18CCollidableOBBTreeCFRCQ28COBBTree9CLeafDataRC12CTransform4fRC6CAABoxRC13CMaterialListRC15CMaterialFilterPC6CPlaneR18CCollisionInfoList AABoxCollideWithLeaf__18CCollidableOBBTreeCFRCQ28COBBTree9CLeafDataRC12CTransform4fRC6CAABoxRC13CMaterialListRC15CMaterialFilterPC6CPlaneR18CCollisionInfoList: @@ -2911,7 +2911,7 @@ lbl_802AC338: /* 802AC3A4 002A9304 81 92 00 00 */ lwz r12, 0(r18) /* 802AC3A8 002A9308 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802AC3AC 002A930C 7D 89 03 A6 */ mtctr r12 -/* 802AC3B0 002A9310 4E 80 04 21 */ bctrl +/* 802AC3B0 002A9310 4E 80 04 21 */ bctrl /* 802AC3B4 002A9314 80 C1 00 C4 */ lwz r6, 0xc4(r1) /* 802AC3B8 002A9318 38 81 00 08 */ addi r4, r1, 8 /* 802AC3BC 002A931C 80 03 00 04 */ lwz r0, 4(r3) @@ -2993,7 +2993,7 @@ lbl_802AC4D4: /* 802AC4E4 002A9444 80 01 01 64 */ lwz r0, 0x164(r1) /* 802AC4E8 002A9448 7C 08 03 A6 */ mtlr r0 /* 802AC4EC 002A944C 38 21 01 60 */ addi r1, r1, 0x160 -/* 802AC4F0 002A9450 4E 80 00 20 */ blr +/* 802AC4F0 002A9450 4E 80 00 20 */ blr .global AABoxCollision__18CCollidableOBBTreeCFRCQ28COBBTree5CNodeRC12CTransform4fRC6CAABoxRC6COBBoxRC13CMaterialListRC15CMaterialFilterPC6CPlaneR18CCollisionInfoList AABoxCollision__18CCollidableOBBTreeCFRCQ28COBBTree5CNodeRC12CTransform4fRC6CAABoxRC6COBBoxRC13CMaterialListRC15CMaterialFilterPC6CPlaneR18CCollisionInfoList: @@ -3075,13 +3075,13 @@ lbl_802AC608: /* 802AC610 002A9570 80 01 00 44 */ lwz r0, 0x44(r1) /* 802AC614 002A9574 7C 08 03 A6 */ mtlr r0 /* 802AC618 002A9578 38 21 00 40 */ addi r1, r1, 0x40 -/* 802AC61C 002A957C 4E 80 00 20 */ blr +/* 802AC61C 002A957C 4E 80 00 20 */ blr .global GetPrimType__18CCollidableOBBTreeCFv GetPrimType__18CCollidableOBBTreeCFv: /* 802AC620 002A9580 3C 60 4F 42 */ lis r3, 0x4F424254@ha /* 802AC624 002A9584 38 63 42 54 */ addi r3, r3, 0x4F424254@l -/* 802AC628 002A9588 4E 80 00 20 */ blr +/* 802AC628 002A9588 4E 80 00 20 */ blr .global CalculateLocalAABox__18CCollidableOBBTreeCFv CalculateLocalAABox__18CCollidableOBBTreeCFv: @@ -3096,7 +3096,7 @@ CalculateLocalAABox__18CCollidableOBBTreeCFv: /* 802AC64C 002A95AC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802AC650 002A95B0 7C 08 03 A6 */ mtlr r0 /* 802AC654 002A95B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802AC658 002A95B8 4E 80 00 20 */ blr +/* 802AC658 002A95B8 4E 80 00 20 */ blr .global CalculateAABox__18CCollidableOBBTreeCFRC12CTransform4f CalculateAABox__18CCollidableOBBTreeCFRC12CTransform4f: @@ -3133,7 +3133,7 @@ CalculateAABox__18CCollidableOBBTreeCFRC12CTransform4f: /* 802AC6D4 002A9634 83 C1 00 98 */ lwz r30, 0x98(r1) /* 802AC6D8 002A9638 7C 08 03 A6 */ mtlr r0 /* 802AC6DC 002A963C 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 802AC6E0 002A9640 4E 80 00 20 */ blr +/* 802AC6E0 002A9640 4E 80 00 20 */ blr .global __ct__18CCollidableOBBTreeFP8COBBTreeRC13CMaterialList __ct__18CCollidableOBBTreeFP8COBBTreeRC13CMaterialList: diff --git a/asm/WorldFormat/CCollidableOBBTreeGroup.s b/asm/WorldFormat/CCollidableOBBTreeGroup.s index dcd74638..522dd4e0 100644 --- a/asm/WorldFormat/CCollidableOBBTreeGroup.s +++ b/asm/WorldFormat/CCollidableOBBTreeGroup.s @@ -37,13 +37,13 @@ lbl_805A8638: .global GetTableIndex__23CCollidableOBBTreeGroupCFv GetTableIndex__23CCollidableOBBTreeGroupCFv: /* 802AC744 002A96A4 80 6D 9A 78 */ lwz r3, lbl_805A8638@sda21(r13) -/* 802AC748 002A96A8 4E 80 00 20 */ blr +/* 802AC748 002A96A8 4E 80 00 20 */ blr .global GetPrimType__23CCollidableOBBTreeGroupCFv GetPrimType__23CCollidableOBBTreeGroupCFv: /* 802AC74C 002A96AC 3C 60 4F 42 */ lis r3, 0x4F425447@ha /* 802AC750 002A96B0 38 63 54 47 */ addi r3, r3, 0x4F425447@l -/* 802AC754 002A96B4 4E 80 00 20 */ blr +/* 802AC754 002A96B4 4E 80 00 20 */ blr .global CalculateLocalAABox__23CCollidableOBBTreeGroupCFv CalculateLocalAABox__23CCollidableOBBTreeGroupCFv: @@ -60,7 +60,7 @@ CalculateLocalAABox__23CCollidableOBBTreeGroupCFv: /* 802AC780 002A96E0 D0 03 00 10 */ stfs f0, 0x10(r3) /* 802AC784 002A96E4 C0 04 00 34 */ lfs f0, 0x34(r4) /* 802AC788 002A96E8 D0 03 00 14 */ stfs f0, 0x14(r3) -/* 802AC78C 002A96EC 4E 80 00 20 */ blr +/* 802AC78C 002A96EC 4E 80 00 20 */ blr .global CalculateAABox__23CCollidableOBBTreeGroupCFRC12CTransform4f CalculateAABox__23CCollidableOBBTreeGroupCFRC12CTransform4f: @@ -76,7 +76,7 @@ CalculateAABox__23CCollidableOBBTreeGroupCFRC12CTransform4f: /* 802AC7B4 002A9714 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802AC7B8 002A9718 7C 08 03 A6 */ mtlr r0 /* 802AC7BC 002A971C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802AC7C0 002A9720 4E 80 00 20 */ blr +/* 802AC7C0 002A9720 4E 80 00 20 */ blr .global CollideMovingSphere__23CCollidableOBBTreeGroupFRC27CInternalCollisionStructureRC9CVector3fRdR14CCollisionInfo CollideMovingSphere__23CCollidableOBBTreeGroupFRC27CInternalCollisionStructureRC9CVector3fRdR14CCollisionInfo: @@ -125,7 +125,7 @@ CollideMovingSphere__23CCollidableOBBTreeGroupFRC27CInternalCollisionStructureRC /* 802AC86C 002A97CC 81 84 00 00 */ lwz r12, 0(r4) /* 802AC870 002A97D0 81 8C 00 18 */ lwz r12, 0x18(r12) /* 802AC874 002A97D4 7D 89 03 A6 */ mtctr r12 -/* 802AC878 002A97D8 4E 80 04 21 */ bctrl +/* 802AC878 002A97D8 4E 80 04 21 */ bctrl /* 802AC87C 002A97DC C0 41 00 48 */ lfs f2, 0x48(r1) /* 802AC880 002A97E0 38 61 00 80 */ addi r3, r1, 0x80 /* 802AC884 002A97E4 C0 21 00 4C */ lfs f1, 0x4c(r1) @@ -192,7 +192,7 @@ lbl_802AC970: /* 802AC974 002A98D4 81 98 00 00 */ lwz r12, 0(r24) /* 802AC978 002A98D8 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802AC97C 002A98DC 7D 89 03 A6 */ mtctr r12 -/* 802AC980 002A98E0 4E 80 04 21 */ bctrl +/* 802AC980 002A98E0 4E 80 04 21 */ bctrl /* 802AC984 002A98E4 7C 79 1B 78 */ mr r25, r3 /* 802AC988 002A98E8 7F 03 C3 78 */ mr r3, r24 /* 802AC98C 002A98EC 7E C4 B3 78 */ mr r4, r22 @@ -208,7 +208,7 @@ lbl_802AC970: /* 802AC9B4 002A9914 83 24 00 88 */ lwz r25, 0x88(r4) /* 802AC9B8 002A9918 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802AC9BC 002A991C 7D 89 03 A6 */ mtctr r12 -/* 802AC9C0 002A9920 4E 80 04 21 */ bctrl +/* 802AC9C0 002A9920 4E 80 04 21 */ bctrl /* 802AC9C4 002A9924 93 C1 00 08 */ stw r30, 8(r1) /* 802AC9C8 002A9928 7C 68 1B 78 */ mr r8, r3 /* 802AC9CC 002A992C 7F 24 CB 78 */ mr r4, r25 @@ -243,7 +243,7 @@ lbl_802ACA08: /* 802ACA38 002A9998 80 01 02 34 */ lwz r0, 0x234(r1) /* 802ACA3C 002A999C 7C 08 03 A6 */ mtlr r0 /* 802ACA40 002A99A0 38 21 02 30 */ addi r1, r1, 0x230 -/* 802ACA44 002A99A4 4E 80 00 20 */ blr +/* 802ACA44 002A99A4 4E 80 00 20 */ blr .global CollideMovingAABox__23CCollidableOBBTreeGroupFRC27CInternalCollisionStructureRC9CVector3fRdR14CCollisionInfo CollideMovingAABox__23CCollidableOBBTreeGroupFRC27CInternalCollisionStructureRC9CVector3fRdR14CCollisionInfo: @@ -268,7 +268,7 @@ CollideMovingAABox__23CCollidableOBBTreeGroupFRC27CInternalCollisionStructureRC9 /* 802ACA90 002A99F0 83 FA 00 38 */ lwz r31, 0x38(r26) /* 802ACA94 002A99F4 81 8C 00 14 */ lwz r12, 0x14(r12) /* 802ACA98 002A99F8 7D 89 03 A6 */ mtctr r12 -/* 802ACA9C 002A99FC 4E 80 04 21 */ bctrl +/* 802ACA9C 002A99FC 4E 80 04 21 */ bctrl /* 802ACAA0 002A9A00 C0 A1 00 48 */ lfs f5, 0x48(r1) /* 802ACAA4 002A9A04 38 61 01 B8 */ addi r3, r1, 0x1b8 /* 802ACAA8 002A9A08 C0 81 00 4C */ lfs f4, 0x4c(r1) @@ -303,7 +303,7 @@ CollideMovingAABox__23CCollidableOBBTreeGroupFRC27CInternalCollisionStructureRC9 /* 802ACB1C 002A9A7C 81 84 00 00 */ lwz r12, 0(r4) /* 802ACB20 002A9A80 81 8C 00 18 */ lwz r12, 0x18(r12) /* 802ACB24 002A9A84 7D 89 03 A6 */ mtctr r12 -/* 802ACB28 002A9A88 4E 80 04 21 */ bctrl +/* 802ACB28 002A9A88 4E 80 04 21 */ bctrl /* 802ACB2C 002A9A8C C0 41 00 30 */ lfs f2, 0x30(r1) /* 802ACB30 002A9A90 38 61 00 80 */ addi r3, r1, 0x80 /* 802ACB34 002A9A94 C0 21 00 34 */ lfs f1, 0x34(r1) @@ -370,7 +370,7 @@ lbl_802ACC20: /* 802ACC24 002A9B84 81 9F 00 00 */ lwz r12, 0(r31) /* 802ACC28 002A9B88 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802ACC2C 002A9B8C 7D 89 03 A6 */ mtctr r12 -/* 802ACC30 002A9B90 4E 80 04 21 */ bctrl +/* 802ACC30 002A9B90 4E 80 04 21 */ bctrl /* 802ACC34 002A9B94 7C 77 1B 78 */ mr r23, r3 /* 802ACC38 002A9B98 7F E3 FB 78 */ mr r3, r31 /* 802ACC3C 002A9B9C 7E C4 B3 78 */ mr r4, r22 @@ -386,7 +386,7 @@ lbl_802ACC20: /* 802ACC64 002A9BC4 82 E4 00 88 */ lwz r23, 0x88(r4) /* 802ACC68 002A9BC8 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802ACC6C 002A9BCC 7D 89 03 A6 */ mtctr r12 -/* 802ACC70 002A9BD0 4E 80 04 21 */ bctrl +/* 802ACC70 002A9BD0 4E 80 04 21 */ bctrl /* 802ACC74 002A9BD4 93 61 00 08 */ stw r27, 8(r1) /* 802ACC78 002A9BD8 7C 68 1B 78 */ mr r8, r3 /* 802ACC7C 002A9BDC 7E E4 BB 78 */ mr r4, r23 @@ -475,7 +475,7 @@ lbl_802ACD74: /* 802ACD9C 002A9CFC 80 01 09 44 */ lwz r0, 0x944(r1) /* 802ACDA0 002A9D00 7C 08 03 A6 */ mtlr r0 /* 802ACDA4 002A9D04 38 21 09 40 */ addi r1, r1, 0x940 -/* 802ACDA8 002A9D08 4E 80 00 20 */ blr +/* 802ACDA8 002A9D08 4E 80 00 20 */ blr .global SphereCollideBoolean__23CCollidableOBBTreeGroupFRC27CInternalCollisionStructure SphereCollideBoolean__23CCollidableOBBTreeGroupFRC27CInternalCollisionStructure: @@ -516,7 +516,7 @@ SphereCollideBoolean__23CCollidableOBBTreeGroupFRC27CInternalCollisionStructure: /* 802ACE34 002A9D94 81 9D 00 00 */ lwz r12, 0(r29) /* 802ACE38 002A9D98 81 8C 00 18 */ lwz r12, 0x18(r12) /* 802ACE3C 002A9D9C 7D 89 03 A6 */ mtctr r12 -/* 802ACE40 002A9DA0 4E 80 04 21 */ bctrl +/* 802ACE40 002A9DA0 4E 80 04 21 */ bctrl /* 802ACE44 002A9DA4 38 61 00 60 */ addi r3, r1, 0x60 /* 802ACE48 002A9DA8 38 81 00 28 */ addi r4, r1, 0x28 /* 802ACE4C 002A9DAC 38 A1 01 38 */ addi r5, r1, 0x138 @@ -541,7 +541,7 @@ lbl_802ACE90: /* 802ACE94 002A9DF4 81 9C 00 00 */ lwz r12, 0(r28) /* 802ACE98 002A9DF8 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802ACE9C 002A9DFC 7D 89 03 A6 */ mtctr r12 -/* 802ACEA0 002A9E00 4E 80 04 21 */ bctrl +/* 802ACEA0 002A9E00 4E 80 04 21 */ bctrl /* 802ACEA4 002A9E04 7C 7D 1B 78 */ mr r29, r3 /* 802ACEA8 002A9E08 7F 83 E3 78 */ mr r3, r28 /* 802ACEAC 002A9E0C 7F 64 DB 78 */ mr r4, r27 @@ -583,7 +583,7 @@ lbl_802ACF2C: /* 802ACF30 002A9E90 80 01 01 B4 */ lwz r0, 0x1b4(r1) /* 802ACF34 002A9E94 7C 08 03 A6 */ mtlr r0 /* 802ACF38 002A9E98 38 21 01 B0 */ addi r1, r1, 0x1b0 -/* 802ACF3C 002A9E9C 4E 80 00 20 */ blr +/* 802ACF3C 002A9E9C 4E 80 00 20 */ blr .global SphereCollide__23CCollidableOBBTreeGroupFRC27CInternalCollisionStructureR18CCollisionInfoList SphereCollide__23CCollidableOBBTreeGroupFRC27CInternalCollisionStructureR18CCollisionInfoList: @@ -625,7 +625,7 @@ SphereCollide__23CCollidableOBBTreeGroupFRC27CInternalCollisionStructureR18CColl /* 802ACFCC 002A9F2C 81 99 00 00 */ lwz r12, 0(r25) /* 802ACFD0 002A9F30 81 8C 00 18 */ lwz r12, 0x18(r12) /* 802ACFD4 002A9F34 7D 89 03 A6 */ mtctr r12 -/* 802ACFD8 002A9F38 4E 80 04 21 */ bctrl +/* 802ACFD8 002A9F38 4E 80 04 21 */ bctrl /* 802ACFDC 002A9F3C 38 61 00 60 */ addi r3, r1, 0x60 /* 802ACFE0 002A9F40 38 81 00 28 */ addi r4, r1, 0x28 /* 802ACFE4 002A9F44 38 A1 01 38 */ addi r5, r1, 0x138 @@ -651,7 +651,7 @@ lbl_802AD02C: /* 802AD030 002A9F90 81 9A 00 00 */ lwz r12, 0(r26) /* 802AD034 002A9F94 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802AD038 002A9F98 7D 89 03 A6 */ mtctr r12 -/* 802AD03C 002A9F9C 4E 80 04 21 */ bctrl +/* 802AD03C 002A9F9C 4E 80 04 21 */ bctrl /* 802AD040 002A9FA0 7C 7B 1B 78 */ mr r27, r3 /* 802AD044 002A9FA4 7F 43 D3 78 */ mr r3, r26 /* 802AD048 002A9FA8 7E E4 BB 78 */ mr r4, r23 @@ -666,7 +666,7 @@ lbl_802AD02C: /* 802AD06C 002A9FCC 83 64 00 88 */ lwz r27, 0x88(r4) /* 802AD070 002A9FD0 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802AD074 002A9FD4 7D 89 03 A6 */ mtctr r12 -/* 802AD078 002A9FD8 4E 80 04 21 */ bctrl +/* 802AD078 002A9FD8 4E 80 04 21 */ bctrl /* 802AD07C 002A9FDC 81 3E 00 04 */ lwz r9, 4(r30) /* 802AD080 002A9FE0 7C 68 1B 78 */ mr r8, r3 /* 802AD084 002A9FE4 7F 64 DB 78 */ mr r4, r27 @@ -693,7 +693,7 @@ lbl_802AD0B8: /* 802AD0D0 002AA030 80 01 01 C4 */ lwz r0, 0x1c4(r1) /* 802AD0D4 002AA034 7C 08 03 A6 */ mtlr r0 /* 802AD0D8 002AA038 38 21 01 C0 */ addi r1, r1, 0x1c0 -/* 802AD0DC 002AA03C 4E 80 00 20 */ blr +/* 802AD0DC 002AA03C 4E 80 00 20 */ blr .global AABoxCollideBoolean__23CCollidableOBBTreeGroupFRC27CInternalCollisionStructure AABoxCollideBoolean__23CCollidableOBBTreeGroupFRC27CInternalCollisionStructure: @@ -709,7 +709,7 @@ AABoxCollideBoolean__23CCollidableOBBTreeGroupFRC27CInternalCollisionStructure: /* 802AD104 002AA064 81 84 00 00 */ lwz r12, 0(r4) /* 802AD108 002AA068 81 8C 00 14 */ lwz r12, 0x14(r12) /* 802AD10C 002AA06C 7D 89 03 A6 */ mtctr r12 -/* 802AD110 002AA070 4E 80 04 21 */ bctrl +/* 802AD110 002AA070 4E 80 04 21 */ bctrl /* 802AD114 002AA074 C0 A1 00 20 */ lfs f5, 0x20(r1) /* 802AD118 002AA078 38 61 01 78 */ addi r3, r1, 0x178 /* 802AD11C 002AA07C C0 81 00 24 */ lfs f4, 0x24(r1) @@ -740,7 +740,7 @@ AABoxCollideBoolean__23CCollidableOBBTreeGroupFRC27CInternalCollisionStructure: /* 802AD180 002AA0E0 81 84 00 00 */ lwz r12, 0(r4) /* 802AD184 002AA0E4 81 8C 00 18 */ lwz r12, 0x18(r12) /* 802AD188 002AA0E8 7D 89 03 A6 */ mtctr r12 -/* 802AD18C 002AA0EC 4E 80 04 21 */ bctrl +/* 802AD18C 002AA0EC 4E 80 04 21 */ bctrl /* 802AD190 002AA0F0 38 61 00 70 */ addi r3, r1, 0x70 /* 802AD194 002AA0F4 38 81 00 08 */ addi r4, r1, 8 /* 802AD198 002AA0F8 38 A1 01 48 */ addi r5, r1, 0x148 @@ -765,7 +765,7 @@ lbl_802AD1DC: /* 802AD1E0 002AA140 81 9C 00 00 */ lwz r12, 0(r28) /* 802AD1E4 002AA144 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802AD1E8 002AA148 7D 89 03 A6 */ mtctr r12 -/* 802AD1EC 002AA14C 4E 80 04 21 */ bctrl +/* 802AD1EC 002AA14C 4E 80 04 21 */ bctrl /* 802AD1F0 002AA150 7C 7D 1B 78 */ mr r29, r3 /* 802AD1F4 002AA154 7F 83 E3 78 */ mr r3, r28 /* 802AD1F8 002AA158 7F 64 DB 78 */ mr r4, r27 @@ -807,7 +807,7 @@ lbl_802AD278: /* 802AD27C 002AA1DC 80 01 01 C4 */ lwz r0, 0x1c4(r1) /* 802AD280 002AA1E0 7C 08 03 A6 */ mtlr r0 /* 802AD284 002AA1E4 38 21 01 C0 */ addi r1, r1, 0x1c0 -/* 802AD288 002AA1E8 4E 80 00 20 */ blr +/* 802AD288 002AA1E8 4E 80 00 20 */ blr .global AABoxCollide__23CCollidableOBBTreeGroupFRC27CInternalCollisionStructureR18CCollisionInfoList AABoxCollide__23CCollidableOBBTreeGroupFRC27CInternalCollisionStructureR18CCollisionInfoList: @@ -834,7 +834,7 @@ AABoxCollide__23CCollidableOBBTreeGroupFRC27CInternalCollisionStructureR18CColli /* 802AD2DC 002AA23C 81 84 00 00 */ lwz r12, 0(r4) /* 802AD2E0 002AA240 81 8C 00 14 */ lwz r12, 0x14(r12) /* 802AD2E4 002AA244 7D 89 03 A6 */ mtctr r12 -/* 802AD2E8 002AA248 4E 80 04 21 */ bctrl +/* 802AD2E8 002AA248 4E 80 04 21 */ bctrl /* 802AD2EC 002AA24C C0 A1 00 28 */ lfs f5, 0x28(r1) /* 802AD2F0 002AA250 38 61 01 80 */ addi r3, r1, 0x180 /* 802AD2F4 002AA254 C0 81 00 2C */ lfs f4, 0x2c(r1) @@ -865,7 +865,7 @@ AABoxCollide__23CCollidableOBBTreeGroupFRC27CInternalCollisionStructureR18CColli /* 802AD358 002AA2B8 81 84 00 00 */ lwz r12, 0(r4) /* 802AD35C 002AA2BC 81 8C 00 18 */ lwz r12, 0x18(r12) /* 802AD360 002AA2C0 7D 89 03 A6 */ mtctr r12 -/* 802AD364 002AA2C4 4E 80 04 21 */ bctrl +/* 802AD364 002AA2C4 4E 80 04 21 */ bctrl /* 802AD368 002AA2C8 38 61 00 78 */ addi r3, r1, 0x78 /* 802AD36C 002AA2CC 38 81 00 10 */ addi r4, r1, 0x10 /* 802AD370 002AA2D0 38 A1 01 50 */ addi r5, r1, 0x150 @@ -942,7 +942,7 @@ lbl_802AD484: /* 802AD488 002AA3E8 81 9C 00 00 */ lwz r12, 0(r28) /* 802AD48C 002AA3EC 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802AD490 002AA3F0 7D 89 03 A6 */ mtctr r12 -/* 802AD494 002AA3F4 4E 80 04 21 */ bctrl +/* 802AD494 002AA3F4 4E 80 04 21 */ bctrl /* 802AD498 002AA3F8 7C 7D 1B 78 */ mr r29, r3 /* 802AD49C 002AA3FC 7F 83 E3 78 */ mr r3, r28 /* 802AD4A0 002AA400 7F 44 D3 78 */ mr r4, r26 @@ -957,7 +957,7 @@ lbl_802AD484: /* 802AD4C4 002AA424 83 A4 00 88 */ lwz r29, 0x88(r4) /* 802AD4C8 002AA428 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802AD4CC 002AA42C 7D 89 03 A6 */ mtctr r12 -/* 802AD4D0 002AA430 4E 80 04 21 */ bctrl +/* 802AD4D0 002AA430 4E 80 04 21 */ bctrl /* 802AD4D4 002AA434 93 21 00 08 */ stw r25, 8(r1) /* 802AD4D8 002AA438 7C 68 1B 78 */ mr r8, r3 /* 802AD4DC 002AA43C 7F A4 EB 78 */ mr r4, r29 @@ -995,7 +995,7 @@ lbl_802AD514: /* 802AD554 002AA4B4 80 01 02 84 */ lwz r0, 0x284(r1) /* 802AD558 002AA4B8 7C 08 03 A6 */ mtlr r0 /* 802AD55C 002AA4BC 38 21 02 80 */ addi r1, r1, 0x280 -/* 802AD560 002AA4C0 4E 80 00 20 */ blr +/* 802AD560 002AA4C0 4E 80 00 20 */ blr .global CastRayInternal__23CCollidableOBBTreeGroupCFRC25CInternalRayCastStructure CastRayInternal__23CCollidableOBBTreeGroupCFRC25CInternalRayCastStructure: @@ -1083,7 +1083,7 @@ lbl_802AD69C: /* 802AD6A4 002AA604 81 9A 00 00 */ lwz r12, 0(r26) /* 802AD6A8 002AA608 81 8C 00 10 */ lwz r12, 0x10(r12) /* 802AD6AC 002AA60C 7D 89 03 A6 */ mtctr r12 -/* 802AD6B0 002AA610 4E 80 04 21 */ bctrl +/* 802AD6B0 002AA610 4E 80 04 21 */ bctrl /* 802AD6B4 002AA614 7C 65 1B 78 */ mr r5, r3 /* 802AD6B8 002AA618 7E C4 B3 78 */ mr r4, r22 /* 802AD6BC 002AA61C 38 61 00 20 */ addi r3, r1, 0x20 @@ -1115,7 +1115,7 @@ lbl_802AD69C: /* 802AD724 002AA684 38 A1 01 10 */ addi r5, r1, 0x110 /* 802AD728 002AA688 81 8C 00 24 */ lwz r12, 0x24(r12) /* 802AD72C 002AA68C 7D 89 03 A6 */ mtctr r12 -/* 802AD730 002AA690 4E 80 04 21 */ bctrl +/* 802AD730 002AA690 4E 80 04 21 */ bctrl /* 802AD734 002AA694 88 A1 00 60 */ lbz r5, 0x60(r1) /* 802AD738 002AA698 28 05 00 00 */ cmplwi r5, 0 /* 802AD73C 002AA69C 41 82 00 C0 */ beq lbl_802AD7FC @@ -1213,7 +1213,7 @@ lbl_802AD80C: /* 802AD8A0 002AA800 80 01 01 D4 */ lwz r0, 0x1d4(r1) /* 802AD8A4 002AA804 7C 08 03 A6 */ mtlr r0 /* 802AD8A8 002AA808 38 21 01 D0 */ addi r1, r1, 0x1d0 -/* 802AD8AC 002AA80C 4E 80 00 20 */ blr +/* 802AD8AC 002AA80C 4E 80 00 20 */ blr .global Transform__14CRayCastResultFRC12CTransform4f Transform__14CRayCastResultFRC12CTransform4f: @@ -1255,7 +1255,7 @@ Transform__14CRayCastResultFRC12CTransform4f: /* 802AD93C 002AA89C 80 01 00 34 */ lwz r0, 0x34(r1) /* 802AD940 002AA8A0 7C 08 03 A6 */ mtlr r0 /* 802AD944 002AA8A4 38 21 00 30 */ addi r1, r1, 0x30 -/* 802AD948 002AA8A8 4E 80 00 20 */ blr +/* 802AD948 002AA8A8 4E 80 00 20 */ blr .global GetOBBTreeAABox__23CCollidableOBBTreeGroupCFi GetOBBTreeAABox__23CCollidableOBBTreeGroupCFi: @@ -1264,7 +1264,7 @@ GetOBBTreeAABox__23CCollidableOBBTreeGroupCFi: /* 802AD954 002AA8B4 38 03 00 04 */ addi r0, r3, 4 /* 802AD958 002AA8B8 80 65 00 0C */ lwz r3, 0xc(r5) /* 802AD95C 002AA8BC 7C 63 00 2E */ lwzx r3, r3, r0 -/* 802AD960 002AA8C0 4E 80 00 20 */ blr +/* 802AD960 002AA8C0 4E 80 00 20 */ blr .global "__ct__23CCollidableOBBTreeGroupFRCQ24rstl42vector<6CAABox,Q24rstl17rmemory_allocator>R14CCMaterialList" "__ct__23CCollidableOBBTreeGroupFRCQ24rstl42vector<6CAABox,Q24rstl17rmemory_allocator>R14CCMaterialList": @@ -1287,7 +1287,7 @@ GetOBBTreeAABox__23CCollidableOBBTreeGroupCFi: /* 802AD9A4 002AA904 80 01 00 14 */ lwz r0, 0x14(r1) /* 802AD9A8 002AA908 7C 08 03 A6 */ mtlr r0 /* 802AD9AC 002AA90C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802AD9B0 002AA910 4E 80 00 20 */ blr +/* 802AD9B0 002AA910 4E 80 00 20 */ blr .global GetType__23CCollidableOBBTreeGroupFv GetType__23CCollidableOBBTreeGroupFv: @@ -1297,12 +1297,12 @@ GetType__23CCollidableOBBTreeGroupFv: /* 802AD9C0 002AA920 90 03 00 00 */ stw r0, 0(r3) /* 802AD9C4 002AA924 38 04 60 F0 */ addi r0, r4, lbl_803D60F0@l /* 802AD9C8 002AA928 90 03 00 04 */ stw r0, 4(r3) -/* 802AD9CC 002AA92C 4E 80 00 20 */ blr +/* 802AD9CC 002AA92C 4E 80 00 20 */ blr .global SetStaticTableIndex__23CCollidableOBBTreeGroupFUi SetStaticTableIndex__23CCollidableOBBTreeGroupFUi: /* 802AD9D0 002AA930 90 6D 9A 78 */ stw r3, lbl_805A8638@sda21(r13) -/* 802AD9D4 002AA934 4E 80 00 20 */ blr +/* 802AD9D4 002AA934 4E 80 00 20 */ blr .global __ct__23CCollidableOBBTreeGroupFRC9CVector3fRC9CVector3f __ct__23CCollidableOBBTreeGroupFRC9CVector3fRC9CVector3f: @@ -1474,7 +1474,7 @@ lbl_802ADC24: /* 802ADC44 002AABA4 80 01 00 94 */ lwz r0, 0x94(r1) /* 802ADC48 002AABA8 7C 08 03 A6 */ mtlr r0 /* 802ADC4C 002AABAC 38 21 00 90 */ addi r1, r1, 0x90 -/* 802ADC50 002AABB0 4E 80 00 20 */ blr +/* 802ADC50 002AABB0 4E 80 00 20 */ blr .global __ct__23CCollidableOBBTreeGroupFR12CInputStream __ct__23CCollidableOBBTreeGroupFR12CInputStream: @@ -1656,7 +1656,7 @@ lbl_802ADEC0: /* 802ADEE0 002AAE40 80 01 00 84 */ lwz r0, 0x84(r1) /* 802ADEE4 002AAE44 7C 08 03 A6 */ mtlr r0 /* 802ADEE8 002AAE48 38 21 00 80 */ addi r1, r1, 0x80 -/* 802ADEEC 002AAE4C 4E 80 00 20 */ blr +/* 802ADEEC 002AAE4C 4E 80 00 20 */ blr .global FCollidableOBBTreeGroupFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer FCollidableOBBTreeGroupFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer: @@ -1686,7 +1686,7 @@ lbl_802ADF38: /* 802ADF48 002AAEA8 83 C1 00 08 */ lwz r30, 8(r1) /* 802ADF4C 002AAEAC 7C 08 03 A6 */ mtlr r0 /* 802ADF50 002AAEB0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802ADF54 002AAEB4 4E 80 00 20 */ blr +/* 802ADF54 002AAEB4 4E 80 00 20 */ blr .global "__ct<23CCollidableOBBTreeGroup>__16CFactoryFnReturnFP23CCollidableOBBTreeGroup" "__ct<23CCollidableOBBTreeGroup>__16CFactoryFnReturnFP23CCollidableOBBTreeGroup": @@ -1721,7 +1721,7 @@ lbl_802ADF38: /* 802ADFC8 002AAF28 38 80 00 01 */ li r4, 1 /* 802ADFCC 002AAF2C 81 8C 00 08 */ lwz r12, 8(r12) /* 802ADFD0 002AAF30 7D 89 03 A6 */ mtctr r12 -/* 802ADFD4 002AAF34 4E 80 04 21 */ bctrl +/* 802ADFD4 002AAF34 4E 80 04 21 */ bctrl lbl_802ADFD8: /* 802ADFD8 002AAF38 38 61 00 10 */ addi r3, r1, 0x10 /* 802ADFDC 002AAF3C 38 80 FF FF */ li r4, -1 @@ -1731,7 +1731,7 @@ lbl_802ADFD8: /* 802ADFEC 002AAF4C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802ADFF0 002AAF50 7C 08 03 A6 */ mtlr r0 /* 802ADFF4 002AAF54 38 21 00 20 */ addi r1, r1, 0x20 -/* 802ADFF8 002AAF58 4E 80 00 20 */ blr +/* 802ADFF8 002AAF58 4E 80 00 20 */ blr .global "__dt__51TObjOwnerDerivedFromIObj<23CCollidableOBBTreeGroup>Fv" "__dt__51TObjOwnerDerivedFromIObj<23CCollidableOBBTreeGroup>Fv": @@ -1773,7 +1773,7 @@ lbl_802AE070: /* 802AE07C 002AAFDC 83 C1 00 08 */ lwz r30, 8(r1) /* 802AE080 002AAFE0 7C 08 03 A6 */ mtlr r0 /* 802AE084 002AAFE4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802AE088 002AAFE8 4E 80 00 20 */ blr +/* 802AE088 002AAFE8 4E 80 00 20 */ blr .global "GetIObjObjectFor__33TToken<23CCollidableOBBTreeGroup>FRCQ24rstl35auto_ptr<23CCollidableOBBTreeGroup>" "GetIObjObjectFor__33TToken<23CCollidableOBBTreeGroup>FRCQ24rstl35auto_ptr<23CCollidableOBBTreeGroup>": @@ -1787,7 +1787,7 @@ lbl_802AE070: /* 802AE0A8 002AB008 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802AE0AC 002AB00C 7C 08 03 A6 */ mtlr r0 /* 802AE0B0 002AB010 38 21 00 10 */ addi r1, r1, 0x10 -/* 802AE0B4 002AB014 4E 80 00 20 */ blr +/* 802AE0B4 002AB014 4E 80 00 20 */ blr .global "GetNewDerivedObject__51TObjOwnerDerivedFromIObj<23CCollidableOBBTreeGroup>FRCQ24rstl35auto_ptr<23CCollidableOBBTreeGroup>" "GetNewDerivedObject__51TObjOwnerDerivedFromIObj<23CCollidableOBBTreeGroup>FRCQ24rstl35auto_ptr<23CCollidableOBBTreeGroup>": @@ -1830,7 +1830,7 @@ lbl_802AE128: /* 802AE144 002AB0A4 80 01 00 14 */ lwz r0, 0x14(r1) /* 802AE148 002AB0A8 7C 08 03 A6 */ mtlr r0 /* 802AE14C 002AB0AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802AE150 002AB0B0 4E 80 00 20 */ blr +/* 802AE150 002AB0B0 4E 80 00 20 */ blr .global sub_802ae154 sub_802ae154: @@ -1860,7 +1860,7 @@ lbl_802AE19C: /* 802AE1A8 002AB108 83 C1 00 08 */ lwz r30, 8(r1) /* 802AE1AC 002AB10C 7C 08 03 A6 */ mtlr r0 /* 802AE1B0 002AB110 38 21 00 10 */ addi r1, r1, 0x10 -/* 802AE1B4 002AB114 4E 80 00 20 */ blr +/* 802AE1B4 002AB114 4E 80 00 20 */ blr .global "reserve__Q24rstl44vector<8COBBTree,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl44vector<8COBBTree,Q24rstl17rmemory_allocator>Fi": @@ -1941,7 +1941,7 @@ lbl_802AE2B4: /* 802AE2B8 002AB218 80 01 00 34 */ lwz r0, 0x34(r1) /* 802AE2BC 002AB21C 7C 08 03 A6 */ mtlr r0 /* 802AE2C0 002AB220 38 21 00 30 */ addi r1, r1, 0x30 -/* 802AE2C4 002AB224 4E 80 00 20 */ blr +/* 802AE2C4 002AB224 4E 80 00 20 */ blr .global "reserve__Q24rstl42vector<6CAABox,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl42vector<6CAABox,Q24rstl17rmemory_allocator>Fi": diff --git a/asm/WorldFormat/CCollisionSurface.s b/asm/WorldFormat/CCollisionSurface.s index 94fa4cc2..3af10256 100644 --- a/asm/WorldFormat/CCollisionSurface.s +++ b/asm/WorldFormat/CCollisionSurface.s @@ -31,7 +31,7 @@ GetPlane__17CCollisionSurfaceCFv: /* 802A2694 0029F5F4 83 C1 00 18 */ lwz r30, 0x18(r1) /* 802A2698 0029F5F8 7C 08 03 A6 */ mtlr r0 /* 802A269C 0029F5FC 38 21 00 20 */ addi r1, r1, 0x20 -/* 802A26A0 0029F600 4E 80 00 20 */ blr +/* 802A26A0 0029F600 4E 80 00 20 */ blr .global GetNormal__17CCollisionSurfaceCFv GetNormal__17CCollisionSurfaceCFv: @@ -67,7 +67,7 @@ GetNormal__17CCollisionSurfaceCFv: /* 802A2718 0029F678 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A271C 0029F67C 7C 08 03 A6 */ mtlr r0 /* 802A2720 0029F680 38 21 00 20 */ addi r1, r1, 0x20 -/* 802A2724 0029F684 4E 80 00 20 */ blr +/* 802A2724 0029F684 4E 80 00 20 */ blr .global __ct__17CCollisionSurfaceFRC9CVector3fRC9CVector3fRC9CVector3fUi __ct__17CCollisionSurfaceFRC9CVector3fRC9CVector3fRC9CVector3fUi: diff --git a/asm/WorldFormat/CMetroidAreaCollider.s b/asm/WorldFormat/CMetroidAreaCollider.s index 8d0d3eb1..d30767d7 100644 --- a/asm/WorldFormat/CMetroidAreaCollider.s +++ b/asm/WorldFormat/CMetroidAreaCollider.s @@ -240,7 +240,7 @@ lbl_802A3364: /* 802A3374 002A02D4 80 01 01 14 */ lwz r0, 0x114(r1) /* 802A3378 002A02D8 7C 08 03 A6 */ mtlr r0 /* 802A337C 002A02DC 38 21 01 10 */ addi r1, r1, 0x110 -/* 802A3380 002A02E0 4E 80 00 20 */ blr +/* 802A3380 002A02E0 4E 80 00 20 */ blr .global sub_802a3384 sub_802a3384: @@ -261,7 +261,7 @@ sub_802a3384: /* 802A33BC 002A031C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802A33C0 002A0320 7C 08 03 A6 */ mtlr r0 /* 802A33C4 002A0324 38 21 00 10 */ addi r1, r1, 0x10 -/* 802A33C8 002A0328 4E 80 00 20 */ blr +/* 802A33C8 002A0328 4E 80 00 20 */ blr .global sub_802a33cc sub_802a33cc: @@ -275,7 +275,7 @@ lbl_802A33E4: /* 802A33E4 002A0344 80 01 00 14 */ lwz r0, 0x14(r1) /* 802A33E8 002A0348 7C 08 03 A6 */ mtlr r0 /* 802A33EC 002A034C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802A33F0 002A0350 4E 80 00 20 */ blr +/* 802A33F0 002A0350 4E 80 00 20 */ blr .global sub_802a33f4 sub_802a33f4: @@ -323,7 +323,7 @@ sub_802a33f4: /* 802A3498 002A03F8 D8 03 00 80 */ stfd f0, 0x80(r3) /* 802A349C 002A03FC C8 04 00 88 */ lfd f0, 0x88(r4) /* 802A34A0 002A0400 D8 03 00 88 */ stfd f0, 0x88(r3) -/* 802A34A4 002A0404 4E 80 00 20 */ blr +/* 802A34A4 002A0404 4E 80 00 20 */ blr .global __ct__Q220CMetroidAreaCollider8SBoxEdgeFRC6CAABoxiRC9CVector3f __ct__Q220CMetroidAreaCollider8SBoxEdgeFRC6CAABoxiRC9CVector3f: @@ -396,7 +396,7 @@ __ct__Q220CMetroidAreaCollider8SBoxEdgeFRC6CAABoxiRC9CVector3f: /* 802A35B0 002A0510 83 C1 00 98 */ lwz r30, 0x98(r1) /* 802A35B4 002A0514 7C 08 03 A6 */ mtlr r0 /* 802A35B8 002A0518 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 802A35BC 002A051C 4E 80 00 20 */ blr +/* 802A35BC 002A051C 4E 80 00 20 */ blr .global FlagVertexIndicesForFace__FUiPb FlagVertexIndicesForFace__FUiPb: @@ -408,11 +408,11 @@ FlagVertexIndicesForFace__FUiPb: /* 802A35D4 002A0534 40 80 00 50 */ bge lbl_802A3624 /* 802A35D8 002A0538 2C 03 00 00 */ cmpwi r3, 0 /* 802A35DC 002A053C 40 80 00 18 */ bge lbl_802A35F4 -/* 802A35E0 002A0540 4E 80 00 20 */ blr +/* 802A35E0 002A0540 4E 80 00 20 */ blr lbl_802A35E4: /* 802A35E4 002A0544 2C 03 00 05 */ cmpwi r3, 5 /* 802A35E8 002A0548 41 82 00 84 */ beq lbl_802A366C -/* 802A35EC 002A054C 4C 80 00 20 */ bgelr +/* 802A35EC 002A054C 4C 80 00 20 */ bgelr /* 802A35F0 002A0550 48 00 00 64 */ b lbl_802A3654 lbl_802A35F4: /* 802A35F4 002A0554 38 00 00 01 */ li r0, 1 @@ -420,42 +420,42 @@ lbl_802A35F4: /* 802A35FC 002A055C 98 04 00 03 */ stb r0, 3(r4) /* 802A3600 002A0560 98 04 00 05 */ stb r0, 5(r4) /* 802A3604 002A0564 98 04 00 07 */ stb r0, 7(r4) -/* 802A3608 002A0568 4E 80 00 20 */ blr +/* 802A3608 002A0568 4E 80 00 20 */ blr lbl_802A360C: /* 802A360C 002A056C 38 00 00 01 */ li r0, 1 /* 802A3610 002A0570 98 04 00 00 */ stb r0, 0(r4) /* 802A3614 002A0574 98 04 00 02 */ stb r0, 2(r4) /* 802A3618 002A0578 98 04 00 04 */ stb r0, 4(r4) /* 802A361C 002A057C 98 04 00 06 */ stb r0, 6(r4) -/* 802A3620 002A0580 4E 80 00 20 */ blr +/* 802A3620 002A0580 4E 80 00 20 */ blr lbl_802A3624: /* 802A3624 002A0584 38 00 00 01 */ li r0, 1 /* 802A3628 002A0588 98 04 00 02 */ stb r0, 2(r4) /* 802A362C 002A058C 98 04 00 03 */ stb r0, 3(r4) /* 802A3630 002A0590 98 04 00 06 */ stb r0, 6(r4) /* 802A3634 002A0594 98 04 00 07 */ stb r0, 7(r4) -/* 802A3638 002A0598 4E 80 00 20 */ blr +/* 802A3638 002A0598 4E 80 00 20 */ blr lbl_802A363C: /* 802A363C 002A059C 38 00 00 01 */ li r0, 1 /* 802A3640 002A05A0 98 04 00 00 */ stb r0, 0(r4) /* 802A3644 002A05A4 98 04 00 01 */ stb r0, 1(r4) /* 802A3648 002A05A8 98 04 00 04 */ stb r0, 4(r4) /* 802A364C 002A05AC 98 04 00 05 */ stb r0, 5(r4) -/* 802A3650 002A05B0 4E 80 00 20 */ blr +/* 802A3650 002A05B0 4E 80 00 20 */ blr lbl_802A3654: /* 802A3654 002A05B4 38 00 00 01 */ li r0, 1 /* 802A3658 002A05B8 98 04 00 04 */ stb r0, 4(r4) /* 802A365C 002A05BC 98 04 00 05 */ stb r0, 5(r4) /* 802A3660 002A05C0 98 04 00 06 */ stb r0, 6(r4) /* 802A3664 002A05C4 98 04 00 07 */ stb r0, 7(r4) -/* 802A3668 002A05C8 4E 80 00 20 */ blr +/* 802A3668 002A05C8 4E 80 00 20 */ blr lbl_802A366C: /* 802A366C 002A05CC 38 00 00 01 */ li r0, 1 /* 802A3670 002A05D0 98 04 00 00 */ stb r0, 0(r4) /* 802A3674 002A05D4 98 04 00 01 */ stb r0, 1(r4) /* 802A3678 002A05D8 98 04 00 02 */ stb r0, 2(r4) /* 802A367C 002A05DC 98 04 00 03 */ stb r0, 3(r4) -/* 802A3680 002A05E0 4E 80 00 20 */ blr +/* 802A3680 002A05E0 4E 80 00 20 */ blr .global FlagEdgeIndicesForFace__FUiPb FlagEdgeIndicesForFace__FUiPb: @@ -467,11 +467,11 @@ FlagEdgeIndicesForFace__FUiPb: /* 802A3698 002A05F8 40 80 00 50 */ bge lbl_802A36E8 /* 802A369C 002A05FC 2C 03 00 00 */ cmpwi r3, 0 /* 802A36A0 002A0600 40 80 00 18 */ bge lbl_802A36B8 -/* 802A36A4 002A0604 4E 80 00 20 */ blr +/* 802A36A4 002A0604 4E 80 00 20 */ blr lbl_802A36A8: /* 802A36A8 002A0608 2C 03 00 05 */ cmpwi r3, 5 /* 802A36AC 002A060C 41 82 00 84 */ beq lbl_802A3730 -/* 802A36B0 002A0610 4C 80 00 20 */ bgelr +/* 802A36B0 002A0610 4C 80 00 20 */ bgelr /* 802A36B4 002A0614 48 00 00 64 */ b lbl_802A3718 lbl_802A36B8: /* 802A36B8 002A0618 38 00 00 01 */ li r0, 1 @@ -479,42 +479,42 @@ lbl_802A36B8: /* 802A36C0 002A0620 98 04 00 0B */ stb r0, 0xb(r4) /* 802A36C4 002A0624 98 04 00 02 */ stb r0, 2(r4) /* 802A36C8 002A0628 98 04 00 04 */ stb r0, 4(r4) -/* 802A36CC 002A062C 4E 80 00 20 */ blr +/* 802A36CC 002A062C 4E 80 00 20 */ blr lbl_802A36D0: /* 802A36D0 002A0630 38 00 00 01 */ li r0, 1 /* 802A36D4 002A0634 98 04 00 08 */ stb r0, 8(r4) /* 802A36D8 002A0638 98 04 00 09 */ stb r0, 9(r4) /* 802A36DC 002A063C 98 04 00 00 */ stb r0, 0(r4) /* 802A36E0 002A0640 98 04 00 06 */ stb r0, 6(r4) -/* 802A36E4 002A0644 4E 80 00 20 */ blr +/* 802A36E4 002A0644 4E 80 00 20 */ blr lbl_802A36E8: /* 802A36E8 002A0648 38 00 00 01 */ li r0, 1 /* 802A36EC 002A064C 98 04 00 04 */ stb r0, 4(r4) /* 802A36F0 002A0650 98 04 00 05 */ stb r0, 5(r4) /* 802A36F4 002A0654 98 04 00 06 */ stb r0, 6(r4) /* 802A36F8 002A0658 98 04 00 07 */ stb r0, 7(r4) -/* 802A36FC 002A065C 4E 80 00 20 */ blr +/* 802A36FC 002A065C 4E 80 00 20 */ blr lbl_802A3700: /* 802A3700 002A0660 38 00 00 01 */ li r0, 1 /* 802A3704 002A0664 98 04 00 00 */ stb r0, 0(r4) /* 802A3708 002A0668 98 04 00 01 */ stb r0, 1(r4) /* 802A370C 002A066C 98 04 00 02 */ stb r0, 2(r4) /* 802A3710 002A0670 98 04 00 03 */ stb r0, 3(r4) -/* 802A3714 002A0674 4E 80 00 20 */ blr +/* 802A3714 002A0674 4E 80 00 20 */ blr lbl_802A3718: /* 802A3718 002A0678 38 00 00 01 */ li r0, 1 /* 802A371C 002A067C 98 04 00 07 */ stb r0, 7(r4) /* 802A3720 002A0680 98 04 00 08 */ stb r0, 8(r4) /* 802A3724 002A0684 98 04 00 03 */ stb r0, 3(r4) /* 802A3728 002A0688 98 04 00 0B */ stb r0, 0xb(r4) -/* 802A372C 002A068C 4E 80 00 20 */ blr +/* 802A372C 002A068C 4E 80 00 20 */ blr lbl_802A3730: /* 802A3730 002A0690 38 00 00 01 */ li r0, 1 /* 802A3734 002A0694 98 04 00 01 */ stb r0, 1(r4) /* 802A3738 002A0698 98 04 00 05 */ stb r0, 5(r4) /* 802A373C 002A069C 98 04 00 09 */ stb r0, 9(r4) /* 802A3740 002A06A0 98 04 00 0A */ stb r0, 0xa(r4) -/* 802A3744 002A06A4 4E 80 00 20 */ blr +/* 802A3744 002A06A4 4E 80 00 20 */ blr .global BuildOctreeLeafCache__20CMetroidAreaColliderFRCQ212CAreaOctTree4NodeRC6CAABoxRQ220CMetroidAreaCollider16COctreeLeafCache BuildOctreeLeafCache__20CMetroidAreaColliderFRCQ212CAreaOctTree4NodeRC6CAABoxRQ220CMetroidAreaCollider16COctreeLeafCache: @@ -580,7 +580,7 @@ lbl_802A3814: /* 802A3828 002A0788 80 01 00 74 */ lwz r0, 0x74(r1) /* 802A382C 002A078C 7C 08 03 A6 */ mtlr r0 /* 802A3830 002A0790 38 21 00 70 */ addi r1, r1, 0x70 -/* 802A3834 002A0794 4E 80 00 20 */ blr +/* 802A3834 002A0794 4E 80 00 20 */ blr .global ClearCache__19CAreaCollisionCacheFv ClearCache__19CAreaCollisionCacheFv: @@ -633,7 +633,7 @@ lbl_802A38B4: /* 802A38D4 002A0834 88 03 1B 40 */ lbz r0, 0x1b40(r3) /* 802A38D8 002A0838 50 80 36 72 */ rlwimi r0, r4, 6, 0x19, 0x19 /* 802A38DC 002A083C 98 03 1B 40 */ stb r0, 0x1b40(r3) -/* 802A38E0 002A0840 4E 80 00 20 */ blr +/* 802A38E0 002A0840 4E 80 00 20 */ blr .global SetCacheBounds__19CAreaCollisionCacheFRC6CAABox SetCacheBounds__19CAreaCollisionCacheFRC6CAABox: @@ -649,7 +649,7 @@ SetCacheBounds__19CAreaCollisionCacheFRC6CAABox: /* 802A3908 002A0868 90 03 00 10 */ stw r0, 0x10(r3) /* 802A390C 002A086C 80 04 00 14 */ lwz r0, 0x14(r4) /* 802A3910 002A0870 90 03 00 14 */ stw r0, 0x14(r3) -/* 802A3914 002A0874 4E 80 00 20 */ blr +/* 802A3914 002A0874 4E 80 00 20 */ blr .global AddOctreeLeafCache__19CAreaCollisionCacheFRCQ220CMetroidAreaCollider16COctreeLeafCache AddOctreeLeafCache__19CAreaCollisionCacheFRCQ220CMetroidAreaCollider16COctreeLeafCache: @@ -685,7 +685,7 @@ lbl_802A3980: /* 802A3980 002A08E0 80 01 00 14 */ lwz r0, 0x14(r1) /* 802A3984 002A08E4 7C 08 03 A6 */ mtlr r0 /* 802A3988 002A08E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802A398C 002A08EC 4E 80 00 20 */ blr +/* 802A398C 002A08EC 4E 80 00 20 */ blr .global sub_802a3990 sub_802a3990: @@ -706,7 +706,7 @@ sub_802a3990: /* 802A39C8 002A0928 80 01 00 14 */ lwz r0, 0x14(r1) /* 802A39CC 002A092C 7C 08 03 A6 */ mtlr r0 /* 802A39D0 002A0930 38 21 00 10 */ addi r1, r1, 0x10 -/* 802A39D4 002A0934 4E 80 00 20 */ blr +/* 802A39D4 002A0934 4E 80 00 20 */ blr .global sub_802a39d8 sub_802a39d8: @@ -720,7 +720,7 @@ lbl_802A39F0: /* 802A39F0 002A0950 80 01 00 14 */ lwz r0, 0x14(r1) /* 802A39F4 002A0954 7C 08 03 A6 */ mtlr r0 /* 802A39F8 002A0958 38 21 00 10 */ addi r1, r1, 0x10 -/* 802A39FC 002A095C 4E 80 00 20 */ blr +/* 802A39FC 002A095C 4E 80 00 20 */ blr .global sub_802a3a00 sub_802a3a00: @@ -762,7 +762,7 @@ lbl_802A3A78: lbl_802A3A84: /* 802A3A84 002A09E4 88 04 09 08 */ lbz r0, 0x908(r4) /* 802A3A88 002A09E8 98 03 09 08 */ stb r0, 0x908(r3) -/* 802A3A8C 002A09EC 4E 80 00 20 */ blr +/* 802A3A8C 002A09EC 4E 80 00 20 */ blr .global __ct__19CAreaCollisionCacheFRC6CAABox __ct__19CAreaCollisionCacheFRC6CAABox: @@ -786,7 +786,7 @@ __ct__19CAreaCollisionCacheFRC6CAABox: /* 802A3AD4 002A0A34 88 03 1B 40 */ lbz r0, 0x1b40(r3) /* 802A3AD8 002A0A38 50 A0 36 72 */ rlwimi r0, r5, 6, 0x19, 0x19 /* 802A3ADC 002A0A3C 98 03 1B 40 */ stb r0, 0x1b40(r3) -/* 802A3AE0 002A0A40 4E 80 00 20 */ blr +/* 802A3AE0 002A0A40 4E 80 00 20 */ blr .global AddLeaf__Q220CMetroidAreaCollider16COctreeLeafCacheFRCQ212CAreaOctTree4Node AddLeaf__Q220CMetroidAreaCollider16COctreeLeafCacheFRCQ212CAreaOctTree4Node: @@ -797,7 +797,7 @@ AddLeaf__Q220CMetroidAreaCollider16COctreeLeafCacheFRCQ212CAreaOctTree4Node: /* 802A3AF4 002A0A54 38 80 00 01 */ li r4, 1 /* 802A3AF8 002A0A58 50 80 3E 30 */ rlwimi r0, r4, 7, 0x18, 0x18 /* 802A3AFC 002A0A5C 98 03 09 08 */ stb r0, 0x908(r3) -/* 802A3B00 002A0A60 4E 80 00 20 */ blr +/* 802A3B00 002A0A60 4E 80 00 20 */ blr lbl_802A3B04: /* 802A3B04 002A0A64 1C 00 00 24 */ mulli r0, r0, 0x24 /* 802A3B08 002A0A68 7C A3 02 14 */ add r5, r3, r0 @@ -825,7 +825,7 @@ lbl_802A3B5C: /* 802A3B5C 002A0ABC 80 83 00 04 */ lwz r4, 4(r3) /* 802A3B60 002A0AC0 38 04 00 01 */ addi r0, r4, 1 /* 802A3B64 002A0AC4 90 03 00 04 */ stw r0, 4(r3) -/* 802A3B68 002A0AC8 4E 80 00 20 */ blr +/* 802A3B68 002A0AC8 4E 80 00 20 */ blr .global __ct__Q220CMetroidAreaCollider16COctreeLeafCacheFRC12CAreaOctTree __ct__Q220CMetroidAreaCollider16COctreeLeafCacheFRC12CAreaOctTree: @@ -835,7 +835,7 @@ __ct__Q220CMetroidAreaCollider16COctreeLeafCacheFRC12CAreaOctTree: /* 802A3B78 002A0AD8 88 03 09 08 */ lbz r0, 0x908(r3) /* 802A3B7C 002A0ADC 50 A0 3E 30 */ rlwimi r0, r5, 7, 0x18, 0x18 /* 802A3B80 002A0AE0 98 03 09 08 */ stb r0, 0x908(r3) -/* 802A3B84 002A0AE4 4E 80 00 20 */ blr +/* 802A3B84 002A0AE4 4E 80 00 20 */ blr .global "MovingAABoxCollisionCheck_Edge__20CMetroidAreaColliderFRC9CVector3fRC9CVector3fRCQ24rstl53reserved_vector9CVector3fRdR9CVector3fR9CVector3f" "MovingAABoxCollisionCheck_Edge__20CMetroidAreaColliderFRC9CVector3fRC9CVector3fRCQ24rstl53reserved_vector9CVector3fRdR9CVector3fR9CVector3f": @@ -1131,7 +1131,7 @@ lbl_802A3FC8: /* 802A3FE4 002A0F44 80 01 02 44 */ lwz r0, 0x244(r1) /* 802A3FE8 002A0F48 7C 08 03 A6 */ mtlr r0 /* 802A3FEC 002A0F4C 38 21 02 40 */ addi r1, r1, 0x240 -/* 802A3FF0 002A0F50 4E 80 00 20 */ blr +/* 802A3FF0 002A0F50 4E 80 00 20 */ blr .global "MovingAABoxCollisionCheck_BoxVertexTri__20CMetroidAreaColliderFRC17CCollisionSurfaceRC6CAABoxRCQ24rstl21reserved_vector9CVector3fRdR9CVector3fR9CVector3f" "MovingAABoxCollisionCheck_BoxVertexTri__20CMetroidAreaColliderFRC17CCollisionSurfaceRC6CAABoxRCQ24rstl21reserved_vector9CVector3fRdR9CVector3fR9CVector3f": @@ -1207,7 +1207,7 @@ lbl_802A40E8: /* 802A40FC 002A105C 80 01 00 64 */ lwz r0, 0x64(r1) /* 802A4100 002A1060 7C 08 03 A6 */ mtlr r0 /* 802A4104 002A1064 38 21 00 60 */ addi r1, r1, 0x60 -/* 802A4108 002A1068 4E 80 00 20 */ blr +/* 802A4108 002A1068 4E 80 00 20 */ blr .global MovingAABoxCollisionCheck_TriVertexBox__20CMetroidAreaColliderFRC9CVector3fRC6CAABox9CVector3fRdR9CVector3fR9CVector3f MovingAABoxCollisionCheck_TriVertexBox__20CMetroidAreaColliderFRC9CVector3fRC6CAABox9CVector3fRdR9CVector3fR9CVector3f: @@ -1279,7 +1279,7 @@ lbl_802A4204: /* 802A420C 002A116C 80 01 00 84 */ lwz r0, 0x84(r1) /* 802A4210 002A1170 7C 08 03 A6 */ mtlr r0 /* 802A4214 002A1174 38 21 00 80 */ addi r1, r1, 0x80 -/* 802A4218 002A1178 4E 80 00 20 */ blr +/* 802A4218 002A1178 4E 80 00 20 */ blr .global MovingAABoxCollisionCheck_Cached__20CMetroidAreaColliderFRCQ220CMetroidAreaCollider16COctreeLeafCacheRC6CAABoxRC15CMaterialFilterRC13CMaterialList9CVector3ffR14CCollisionInfoRd MovingAABoxCollisionCheck_Cached__20CMetroidAreaColliderFRCQ220CMetroidAreaCollider16COctreeLeafCacheRC6CAABoxRC15CMaterialFilterRC13CMaterialList9CVector3ffR14CCollisionInfoRd: @@ -1943,7 +1943,7 @@ lbl_802A4BE4: /* 802A4C0C 002A1B6C 80 01 09 D4 */ lwz r0, 0x9d4(r1) /* 802A4C10 002A1B70 7C 08 03 A6 */ mtlr r0 /* 802A4C14 002A1B74 38 21 09 D0 */ addi r1, r1, 0x9d0 -/* 802A4C18 002A1B78 4E 80 00 20 */ blr +/* 802A4C18 002A1B78 4E 80 00 20 */ blr .global MovingSphereCollisionCheck_Cached__20CMetroidAreaColliderFRCQ220CMetroidAreaCollider16COctreeLeafCacheRC6CAABoxRC7CSphereRC15CMaterialFilterRC13CMaterialList9CVector3ffR14CCollisionInfoRd MovingSphereCollisionCheck_Cached__20CMetroidAreaColliderFRCQ220CMetroidAreaCollider16COctreeLeafCacheRC6CAABoxRC7CSphereRC15CMaterialFilterRC13CMaterialList9CVector3ffR14CCollisionInfoRd: @@ -3021,7 +3021,7 @@ lbl_802A5BF8: /* 802A5C84 002A2BE4 80 01 04 B4 */ lwz r0, 0x4b4(r1) /* 802A5C88 002A2BE8 7C 08 03 A6 */ mtlr r0 /* 802A5C8C 002A2BEC 38 21 04 B0 */ addi r1, r1, 0x4b0 -/* 802A5C90 002A2BF0 4E 80 00 20 */ blr +/* 802A5C90 002A2BF0 4E 80 00 20 */ blr .global SphereCollisionCheckBoolean__20CMetroidAreaColliderFRC12CAreaOctTreeRC6CAABoxRC7CSphereRC15CMaterialFilter SphereCollisionCheckBoolean__20CMetroidAreaColliderFRC12CAreaOctTreeRC6CAABoxRC7CSphereRC15CMaterialFilter: @@ -3054,7 +3054,7 @@ SphereCollisionCheckBoolean__20CMetroidAreaColliderFRC12CAreaOctTreeRC6CAABoxRC7 /* 802A5CFC 002A2C5C 80 01 00 44 */ lwz r0, 0x44(r1) /* 802A5D00 002A2C60 7C 08 03 A6 */ mtlr r0 /* 802A5D04 002A2C64 38 21 00 40 */ addi r1, r1, 0x40 -/* 802A5D08 002A2C68 4E 80 00 20 */ blr +/* 802A5D08 002A2C68 4E 80 00 20 */ blr .global SphereCollisionCheckBoolean_Cached__20CMetroidAreaColliderFRCQ220CMetroidAreaCollider16COctreeLeafCacheRC6CAABoxRC7CSphereRC15CMaterialFilter SphereCollisionCheckBoolean_Cached__20CMetroidAreaColliderFRCQ220CMetroidAreaCollider16COctreeLeafCacheRC6CAABoxRC7CSphereRC15CMaterialFilter: @@ -3130,7 +3130,7 @@ lbl_802A5E00: /* 802A5E04 002A2D64 80 01 00 74 */ lwz r0, 0x74(r1) /* 802A5E08 002A2D68 7C 08 03 A6 */ mtlr r0 /* 802A5E0C 002A2D6C 38 21 00 70 */ addi r1, r1, 0x70 -/* 802A5E10 002A2D70 4E 80 00 20 */ blr +/* 802A5E10 002A2D70 4E 80 00 20 */ blr .global SphereCollisionCheckBoolean_Internal__20CMetroidAreaColliderFRCQ212CAreaOctTree4NodeRC23CBooleanSphereAreaCache SphereCollisionCheckBoolean_Internal__20CMetroidAreaColliderFRCQ212CAreaOctTree4NodeRC23CBooleanSphereAreaCache: @@ -3240,7 +3240,7 @@ lbl_802A5F90: /* 802A5F94 002A2EF4 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 802A5F98 002A2EF8 7C 08 03 A6 */ mtlr r0 /* 802A5F9C 002A2EFC 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 802A5FA0 002A2F00 4E 80 00 20 */ blr +/* 802A5FA0 002A2F00 4E 80 00 20 */ blr .global SphereCollisionCheck__20CMetroidAreaColliderFRC12CAreaOctTreeRC6CAABoxRC7CSphereRC13CMaterialListRC15CMaterialFilterR18CCollisionInfoList SphereCollisionCheck__20CMetroidAreaColliderFRC12CAreaOctTreeRC6CAABoxRC7CSphereRC13CMaterialListRC15CMaterialFilterR18CCollisionInfoList: @@ -3279,7 +3279,7 @@ SphereCollisionCheck__20CMetroidAreaColliderFRC12CAreaOctTreeRC6CAABoxRC7CSphere /* 802A6024 002A2F84 83 E1 00 4C */ lwz r31, 0x4c(r1) /* 802A6028 002A2F88 7C 08 03 A6 */ mtlr r0 /* 802A602C 002A2F8C 38 21 00 50 */ addi r1, r1, 0x50 -/* 802A6030 002A2F90 4E 80 00 20 */ blr +/* 802A6030 002A2F90 4E 80 00 20 */ blr .global SphereCollisionCheck_Cached__20CMetroidAreaColliderFRCQ220CMetroidAreaCollider16COctreeLeafCacheRC6CAABoxRC7CSphereRC13CMaterialListRC15CMaterialFilterR18CCollisionInfoList SphereCollisionCheck_Cached__20CMetroidAreaColliderFRCQ220CMetroidAreaCollider16COctreeLeafCacheRC6CAABoxRC7CSphereRC13CMaterialListRC15CMaterialFilterR18CCollisionInfoList: @@ -3391,7 +3391,7 @@ lbl_802A61A8: /* 802A61BC 002A311C 80 01 01 04 */ lwz r0, 0x104(r1) /* 802A61C0 002A3120 7C 08 03 A6 */ mtlr r0 /* 802A61C4 002A3124 38 21 01 00 */ addi r1, r1, 0x100 -/* 802A61C8 002A3128 4E 80 00 20 */ blr +/* 802A61C8 002A3128 4E 80 00 20 */ blr .global SphereCollisionCheck_Internal__20CMetroidAreaColliderFRCQ212CAreaOctTree4NodeR16CSphereAreaCache SphereCollisionCheck_Internal__20CMetroidAreaColliderFRCQ212CAreaOctTree4NodeR16CSphereAreaCache: @@ -3534,7 +3534,7 @@ lbl_802A63B8: /* 802A63D0 002A3330 80 01 01 34 */ lwz r0, 0x134(r1) /* 802A63D4 002A3334 7C 08 03 A6 */ mtlr r0 /* 802A63D8 002A3338 38 21 01 30 */ addi r1, r1, 0x130 -/* 802A63DC 002A333C 4E 80 00 20 */ blr +/* 802A63DC 002A333C 4E 80 00 20 */ blr .global AABoxCollisionCheckBoolean__20CMetroidAreaColliderFRC12CAreaOctTreeRC6CAABoxRC15CMaterialFilter AABoxCollisionCheckBoolean__20CMetroidAreaColliderFRC12CAreaOctTreeRC6CAABoxRC15CMaterialFilter: @@ -3569,7 +3569,7 @@ AABoxCollisionCheckBoolean__20CMetroidAreaColliderFRC12CAreaOctTreeRC6CAABoxRC15 /* 802A6450 002A33B0 83 E1 00 5C */ lwz r31, 0x5c(r1) /* 802A6454 002A33B4 7C 08 03 A6 */ mtlr r0 /* 802A6458 002A33B8 38 21 00 60 */ addi r1, r1, 0x60 -/* 802A645C 002A33BC 4E 80 00 20 */ blr +/* 802A645C 002A33BC 4E 80 00 20 */ blr .global __ct__22CBooleanAABoxAreaCacheFRC6CAABoxRC15CMaterialFilter __ct__22CBooleanAABoxAreaCacheFRC6CAABoxRC15CMaterialFilter: @@ -3612,7 +3612,7 @@ __ct__22CBooleanAABoxAreaCacheFRC6CAABoxRC15CMaterialFilter: /* 802A64F0 002A3450 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A64F4 002A3454 7C 08 03 A6 */ mtlr r0 /* 802A64F8 002A3458 38 21 00 20 */ addi r1, r1, 0x20 -/* 802A64FC 002A345C 4E 80 00 20 */ blr +/* 802A64FC 002A345C 4E 80 00 20 */ blr .global AABoxCollisionCheckBoolean_Cached__20CMetroidAreaColliderFRCQ220CMetroidAreaCollider16COctreeLeafCacheRC6CAABoxRC15CMaterialFilter AABoxCollisionCheckBoolean_Cached__20CMetroidAreaColliderFRCQ220CMetroidAreaCollider16COctreeLeafCacheRC6CAABoxRC15CMaterialFilter: @@ -3712,7 +3712,7 @@ lbl_802A6654: /* 802A6658 002A35B8 80 01 00 94 */ lwz r0, 0x94(r1) /* 802A665C 002A35BC 7C 08 03 A6 */ mtlr r0 /* 802A6660 002A35C0 38 21 00 90 */ addi r1, r1, 0x90 -/* 802A6664 002A35C4 4E 80 00 20 */ blr +/* 802A6664 002A35C4 4E 80 00 20 */ blr .global AABoxCollisionCheckBoolean_Internal__20CMetroidAreaColliderFRCQ212CAreaOctTree4NodeRC22CBooleanAABoxAreaCache AABoxCollisionCheckBoolean_Internal__20CMetroidAreaColliderFRCQ212CAreaOctTree4NodeRC22CBooleanAABoxAreaCache: @@ -3823,7 +3823,7 @@ lbl_802A67E8: /* 802A67EC 002A374C 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 802A67F0 002A3750 7C 08 03 A6 */ mtlr r0 /* 802A67F4 002A3754 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 802A67F8 002A3758 4E 80 00 20 */ blr +/* 802A67F8 002A3758 4E 80 00 20 */ blr .global AABoxCollisionCheck__20CMetroidAreaColliderFRC12CAreaOctTreeRC6CAABoxRC15CMaterialFilterRC13CMaterialListR18CCollisionInfoList AABoxCollisionCheck__20CMetroidAreaColliderFRC12CAreaOctTreeRC6CAABoxRC15CMaterialFilterRC13CMaterialListR18CCollisionInfoList: @@ -3927,7 +3927,7 @@ AABoxCollisionCheck__20CMetroidAreaColliderFRC12CAreaOctTreeRC6CAABoxRC15CMateri /* 802A6980 002A38E0 83 E1 00 BC */ lwz r31, 0xbc(r1) /* 802A6984 002A38E4 7C 08 03 A6 */ mtlr r0 /* 802A6988 002A38E8 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 802A698C 002A38EC 4E 80 00 20 */ blr +/* 802A698C 002A38EC 4E 80 00 20 */ blr .global __ct__15CAABoxAreaCacheFRC6CAABoxPC6CPlaneRC15CMaterialFilterRC13CMaterialListR18CCollisionInfoList __ct__15CAABoxAreaCacheFRC6CAABoxPC6CPlaneRC15CMaterialFilterRC13CMaterialListR18CCollisionInfoList: @@ -3973,7 +3973,7 @@ __ct__15CAABoxAreaCacheFRC6CAABoxPC6CPlaneRC15CMaterialFilterRC13CMaterialListR1 /* 802A6A2C 002A398C 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A6A30 002A3990 7C 08 03 A6 */ mtlr r0 /* 802A6A34 002A3994 38 21 00 20 */ addi r1, r1, 0x20 -/* 802A6A38 002A3998 4E 80 00 20 */ blr +/* 802A6A38 002A3998 4E 80 00 20 */ blr .global AABoxCollisionCheck_Cached__20CMetroidAreaColliderFRCQ220CMetroidAreaCollider16COctreeLeafCacheRC6CAABoxRC15CMaterialFilterRC13CMaterialListR18CCollisionInfoList AABoxCollisionCheck_Cached__20CMetroidAreaColliderFRCQ220CMetroidAreaCollider16COctreeLeafCacheRC6CAABoxRC15CMaterialFilterRC13CMaterialListR18CCollisionInfoList: @@ -4197,7 +4197,7 @@ lbl_802A6D60: /* 802A6D84 002A3CE4 80 01 01 D4 */ lwz r0, 0x1d4(r1) /* 802A6D88 002A3CE8 7C 08 03 A6 */ mtlr r0 /* 802A6D8C 002A3CEC 38 21 01 D0 */ addi r1, r1, 0x1d0 -/* 802A6D90 002A3CF0 4E 80 00 20 */ blr +/* 802A6D90 002A3CF0 4E 80 00 20 */ blr .global AABoxCollisionCheck_Internal__20CMetroidAreaColliderFRCQ212CAreaOctTree4NodeR15CAABoxAreaCache AABoxCollisionCheck_Internal__20CMetroidAreaColliderFRCQ212CAreaOctTree4NodeR15CAABoxAreaCache: @@ -4383,7 +4383,7 @@ lbl_802A702C: /* 802A7030 002A3F90 80 01 01 84 */ lwz r0, 0x184(r1) /* 802A7034 002A3F94 7C 08 03 A6 */ mtlr r0 /* 802A7038 002A3F98 38 21 01 80 */ addi r1, r1, 0x180 -/* 802A703C 002A3F9C 4E 80 00 20 */ blr +/* 802A703C 002A3F9C 4E 80 00 20 */ blr .global ResetInternalCounters__20CMetroidAreaColliderFv ResetInternalCounters__20CMetroidAreaColliderFv: @@ -4425,7 +4425,7 @@ lbl_802A70BC: /* 802A70C8 002A4028 80 01 00 14 */ lwz r0, 0x14(r1) /* 802A70CC 002A402C 7C 08 03 A6 */ mtlr r0 /* 802A70D0 002A4030 38 21 00 10 */ addi r1, r1, 0x10 -/* 802A70D4 002A4034 4E 80 00 20 */ blr +/* 802A70D4 002A4034 4E 80 00 20 */ blr .global ConvexPolyCollision__20CMetroidAreaColliderFPC6CPlanePC9CVector3fR6CAABox ConvexPolyCollision__20CMetroidAreaColliderFPC6CPlanePC9CVector3fR6CAABox: diff --git a/asm/WorldFormat/CMetroidModelInstance.s b/asm/WorldFormat/CMetroidModelInstance.s index e9bf6bc5..b62d7db5 100644 --- a/asm/WorldFormat/CMetroidModelInstance.s +++ b/asm/WorldFormat/CMetroidModelInstance.s @@ -93,7 +93,7 @@ lbl_802A289C: /* 802A28B8 0029F818 80 01 00 54 */ lwz r0, 0x54(r1) /* 802A28BC 0029F81C 7C 08 03 A6 */ mtlr r0 /* 802A28C0 0029F820 38 21 00 50 */ addi r1, r1, 0x50 -/* 802A28C4 0029F824 4E 80 00 20 */ blr +/* 802A28C4 0029F824 4E 80 00 20 */ blr .global sub_802a28c8 sub_802a28c8: @@ -120,4 +120,4 @@ sub_802a28c8: /* 802A2918 0029F878 4E 80 00 20 */ blr nullsub_30: -/* 802A291C 0029F87C 4E 80 00 20 */ blr +/* 802A291C 0029F87C 4E 80 00 20 */ blr diff --git a/asm/WorldFormat/COBBTree.s b/asm/WorldFormat/COBBTree.s index e99670ec..3c9ec7a8 100644 --- a/asm/WorldFormat/COBBTree.s +++ b/asm/WorldFormat/COBBTree.s @@ -45,7 +45,7 @@ Alloc__Q28COBBTree16CSimpleAllocatorFUl: /* 802A799C 002A48FC 90 03 00 08 */ stw r0, 8(r3) lbl_802A79A0: /* 802A79A0 002A4900 7C A3 2B 78 */ mr r3, r5 -/* 802A79A4 002A4904 4E 80 00 20 */ blr +/* 802A79A4 002A4904 4E 80 00 20 */ blr .global __dt__Q28COBBTree16CSimpleAllocatorFv __dt__Q28COBBTree16CSimpleAllocatorFv: @@ -73,7 +73,7 @@ lbl_802A79E8: /* 802A79F4 002A4954 83 C1 00 08 */ lwz r30, 8(r1) /* 802A79F8 002A4958 7C 08 03 A6 */ mtlr r0 /* 802A79FC 002A495C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802A7A00 002A4960 4E 80 00 20 */ blr +/* 802A7A00 002A4960 4E 80 00 20 */ blr .global __ct__Q28COBBTree16CSimpleAllocatorFUi __ct__Q28COBBTree16CSimpleAllocatorFUi: @@ -99,7 +99,7 @@ __ct__Q28COBBTree16CSimpleAllocatorFUi: /* 802A7A50 002A49B0 80 01 00 14 */ lwz r0, 0x14(r1) /* 802A7A54 002A49B4 7C 08 03 A6 */ mtlr r0 /* 802A7A58 002A49B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802A7A5C 002A49BC 4E 80 00 20 */ blr +/* 802A7A5C 002A49BC 4E 80 00 20 */ blr .global GetMemoryUsage__Q28COBBTree9CLeafDataCFv GetMemoryUsage__Q28COBBTree9CLeafDataCFv: @@ -107,10 +107,10 @@ GetMemoryUsage__Q28COBBTree9CLeafDataCFv: /* 802A7A64 002A49C4 54 03 08 3C */ slwi r3, r0, 1 /* 802A7A68 002A49C8 38 63 00 10 */ addi r3, r3, 0x10 /* 802A7A6C 002A49CC 54 60 07 BF */ clrlwi. r0, r3, 0x1e -/* 802A7A70 002A49D0 4D 82 00 20 */ beqlr +/* 802A7A70 002A49D0 4D 82 00 20 */ beqlr /* 802A7A74 002A49D4 20 00 00 04 */ subfic r0, r0, 4 /* 802A7A78 002A49D8 7C 63 02 14 */ add r3, r3, r0 -/* 802A7A7C 002A49DC 4E 80 00 20 */ blr +/* 802A7A7C 002A49DC 4E 80 00 20 */ blr .global __ct__Q28COBBTree9CLeafDataFR12CInputStream __ct__Q28COBBTree9CLeafDataFR12CInputStream: @@ -167,7 +167,7 @@ lbl_802A7B24: /* 802A7B34 002A4A94 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A7B38 002A4A98 7C 08 03 A6 */ mtlr r0 /* 802A7B3C 002A4A9C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802A7B40 002A4AA0 4E 80 00 20 */ blr +/* 802A7B40 002A4AA0 4E 80 00 20 */ blr .global "__ct__Q28COBBTree9CLeafDataFRCQ24rstl37vector" "__ct__Q28COBBTree9CLeafDataFRCQ24rstl37vector": @@ -227,7 +227,7 @@ lbl_802A7BF4: /* 802A7C00 002A4B60 83 C1 00 08 */ lwz r30, 8(r1) /* 802A7C04 002A4B64 7C 08 03 A6 */ mtlr r0 /* 802A7C08 002A4B68 38 21 00 10 */ addi r1, r1, 0x10 -/* 802A7C0C 002A4B6C 4E 80 00 20 */ blr +/* 802A7C0C 002A4B6C 4E 80 00 20 */ blr .global __dl__Q28COBBTree5CNodeFPvUl __dl__Q28COBBTree5CNodeFPvUl: @@ -244,7 +244,7 @@ lbl_802A7C34: /* 802A7C34 002A4B94 80 01 00 14 */ lwz r0, 0x14(r1) /* 802A7C38 002A4B98 7C 08 03 A6 */ mtlr r0 /* 802A7C3C 002A4B9C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802A7C40 002A4BA0 4E 80 00 20 */ blr +/* 802A7C40 002A4BA0 4E 80 00 20 */ blr .global __nw__Q28COBBTree5CNodeFUlPCci __nw__Q28COBBTree5CNodeFUlPCci: @@ -267,12 +267,12 @@ lbl_802A7C7C: /* 802A7C7C 002A4BDC 80 01 00 14 */ lwz r0, 0x14(r1) /* 802A7C80 002A4BE0 7C 08 03 A6 */ mtlr r0 /* 802A7C84 002A4BE4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802A7C88 002A4BE8 4E 80 00 20 */ blr +/* 802A7C88 002A4BE8 4E 80 00 20 */ blr .global SetAllocator__Q28COBBTree5CNodeFPQ28COBBTree16CSimpleAllocator SetAllocator__Q28COBBTree5CNodeFPQ28COBBTree16CSimpleAllocator: /* 802A7C8C 002A4BEC 90 6D A5 D8 */ stw r3, lbl_805A9198@sda21(r13) -/* 802A7C90 002A4BF0 4E 80 00 20 */ blr +/* 802A7C90 002A4BF0 4E 80 00 20 */ blr .global GetMemoryUsage__Q28COBBTree5CNodeCFv GetMemoryUsage__Q28COBBTree5CNodeCFv: @@ -308,7 +308,7 @@ lbl_802A7CF0: /* 802A7CFC 002A4C5C 83 C1 00 08 */ lwz r30, 8(r1) /* 802A7D00 002A4C60 7C 08 03 A6 */ mtlr r0 /* 802A7D04 002A4C64 38 21 00 10 */ addi r1, r1, 0x10 -/* 802A7D08 002A4C68 4E 80 00 20 */ blr +/* 802A7D08 002A4C68 4E 80 00 20 */ blr .global __dt__Q28COBBTree5CNodeFv __dt__Q28COBBTree5CNodeFv: @@ -366,7 +366,7 @@ lbl_802A7DB4: /* 802A7DC4 002A4D24 83 A1 00 24 */ lwz r29, 0x24(r1) /* 802A7DC8 002A4D28 7C 08 03 A6 */ mtlr r0 /* 802A7DCC 002A4D2C 38 21 00 30 */ addi r1, r1, 0x30 -/* 802A7DD0 002A4D30 4E 80 00 20 */ blr +/* 802A7DD0 002A4D30 4E 80 00 20 */ blr .global __ct__Q28COBBTree5CNodeFR12CInputStream __ct__Q28COBBTree5CNodeFR12CInputStream: @@ -441,7 +441,7 @@ lbl_802A7EBC: /* 802A7ECC 002A4E2C 83 C1 00 08 */ lwz r30, 8(r1) /* 802A7ED0 002A4E30 7C 08 03 A6 */ mtlr r0 /* 802A7ED4 002A4E34 38 21 00 10 */ addi r1, r1, 0x10 -/* 802A7ED8 002A4E38 4E 80 00 20 */ blr +/* 802A7ED8 002A4E38 4E 80 00 20 */ blr .global __ct__Q28COBBTree5CNodeFRC12CTransform4fRC9CVector3fPCQ28COBBTree5CNodePCQ28COBBTree5CNodePCQ28COBBTree9CLeafData __ct__Q28COBBTree5CNodeFRC12CTransform4fRC9CVector3fPCQ28COBBTree5CNodePCQ28COBBTree5CNodePCQ28COBBTree9CLeafData: @@ -472,7 +472,7 @@ __ct__Q28COBBTree5CNodeFRC12CTransform4fRC9CVector3fPCQ28COBBTree5CNodePCQ28COBB /* 802A7F3C 002A4E9C 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A7F40 002A4EA0 7C 08 03 A6 */ mtlr r0 /* 802A7F44 002A4EA4 38 21 00 20 */ addi r1, r1, 0x20 -/* 802A7F48 002A4EA8 4E 80 00 20 */ blr +/* 802A7F48 002A4EA8 4E 80 00 20 */ blr .global GetTriangleEdgeIndices__8COBBTreeCFUs GetTriangleEdgeIndices__8COBBTreeCFUs: @@ -480,7 +480,7 @@ GetTriangleEdgeIndices__8COBBTreeCFUs: /* 802A7F50 002A4EB0 80 63 00 74 */ lwz r3, 0x74(r3) /* 802A7F54 002A4EB4 1C 00 00 06 */ mulli r0, r0, 6 /* 802A7F58 002A4EB8 7C 63 02 14 */ add r3, r3, r0 -/* 802A7F5C 002A4EBC 4E 80 00 20 */ blr +/* 802A7F5C 002A4EBC 4E 80 00 20 */ blr .global GetTriangleVertexIndices__8COBBTreeCFUsPUs GetTriangleVertexIndices__8COBBTreeCFUsPUs: @@ -525,13 +525,13 @@ lbl_802A7FC8: /* 802A7FEC 002A4F4C B0 05 00 00 */ sth r0, 0(r5) /* 802A7FF0 002A4F50 A0 06 00 00 */ lhz r0, 0(r6) /* 802A7FF4 002A4F54 B0 05 00 02 */ sth r0, 2(r5) -/* 802A7FF8 002A4F58 4E 80 00 20 */ blr +/* 802A7FF8 002A4F58 4E 80 00 20 */ blr lbl_802A7FFC: /* 802A7FFC 002A4F5C A0 06 00 00 */ lhz r0, 0(r6) /* 802A8000 002A4F60 B0 05 00 00 */ sth r0, 0(r5) /* 802A8004 002A4F64 A0 06 00 02 */ lhz r0, 2(r6) /* 802A8008 002A4F68 B0 05 00 02 */ sth r0, 2(r5) -/* 802A800C 002A4F6C 4E 80 00 20 */ blr +/* 802A800C 002A4F6C 4E 80 00 20 */ blr .global BuildOrientedBoundingBoxTree__8COBBTreeFRC9CVector3fRC9CVector3f BuildOrientedBoundingBoxTree__8COBBTreeFRC9CVector3fRC9CVector3f: @@ -1012,7 +1012,7 @@ lbl_802A8694: /* 802A86A4 002A5604 80 01 01 54 */ lwz r0, 0x154(r1) /* 802A86A8 002A5608 7C 08 03 A6 */ mtlr r0 /* 802A86AC 002A560C 38 21 01 50 */ addi r1, r1, 0x150 -/* 802A86B0 002A5610 4E 80 00 20 */ blr +/* 802A86B0 002A5610 4E 80 00 20 */ blr .global sub_802a86b4 sub_802a86b4: @@ -1087,7 +1087,7 @@ lbl_802A8794: /* 802A879C 002A56FC 83 C1 00 18 */ lwz r30, 0x18(r1) /* 802A87A0 002A5700 7C 08 03 A6 */ mtlr r0 /* 802A87A4 002A5704 38 21 00 20 */ addi r1, r1, 0x20 -/* 802A87A8 002A5708 4E 80 00 20 */ blr +/* 802A87A8 002A5708 4E 80 00 20 */ blr .global sub_802a87ac sub_802a87ac: @@ -1254,7 +1254,7 @@ lbl_802A89C8: /* 802A89D4 002A5934 83 C1 00 78 */ lwz r30, 0x78(r1) /* 802A89D8 002A5938 7C 08 03 A6 */ mtlr r0 /* 802A89DC 002A593C 38 21 00 80 */ addi r1, r1, 0x80 -/* 802A89E0 002A5940 4E 80 00 20 */ blr +/* 802A89E0 002A5940 4E 80 00 20 */ blr .global __ct__Q28COBBTree10SIndexDataFv __ct__Q28COBBTree10SIndexDataFv: @@ -1280,7 +1280,7 @@ __ct__Q28COBBTree10SIndexDataFv: /* 802A8A30 002A5990 90 03 00 64 */ stw r0, 0x64(r3) /* 802A8A34 002A5994 90 03 00 68 */ stw r0, 0x68(r3) /* 802A8A38 002A5998 90 03 00 6C */ stw r0, 0x6c(r3) -/* 802A8A3C 002A599C 4E 80 00 20 */ blr +/* 802A8A3C 002A599C 4E 80 00 20 */ blr .global GetTransformedSurface__8COBBTreeCFUsRC12CTransform4f GetTransformedSurface__8COBBTreeCFUsRC12CTransform4f: @@ -1383,7 +1383,7 @@ lbl_802A8BA8: /* 802A8BAC 002A5B0C 80 01 00 74 */ lwz r0, 0x74(r1) /* 802A8BB0 002A5B10 7C 08 03 A6 */ mtlr r0 /* 802A8BB4 002A5B14 38 21 00 70 */ addi r1, r1, 0x70 -/* 802A8BB8 002A5B18 4E 80 00 20 */ blr +/* 802A8BB8 002A5B18 4E 80 00 20 */ blr .global GetSurface__8COBBTreeCFUs GetSurface__8COBBTreeCFUs: @@ -1452,7 +1452,7 @@ lbl_802A8CA0: /* 802A8CA0 002A5C00 80 01 00 14 */ lwz r0, 0x14(r1) /* 802A8CA4 002A5C04 7C 08 03 A6 */ mtlr r0 /* 802A8CA8 002A5C08 38 21 00 10 */ addi r1, r1, 0x10 -/* 802A8CAC 002A5C0C 4E 80 00 20 */ blr +/* 802A8CAC 002A5C0C 4E 80 00 20 */ blr .global CalculateLocalAABox__8COBBTreeCFv CalculateLocalAABox__8COBBTreeCFv: @@ -1481,7 +1481,7 @@ lbl_802A8CFC: /* 802A8D00 002A5C60 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802A8D04 002A5C64 7C 08 03 A6 */ mtlr r0 /* 802A8D08 002A5C68 38 21 00 10 */ addi r1, r1, 0x10 -/* 802A8D0C 002A5C6C 4E 80 00 20 */ blr +/* 802A8D0C 002A5C6C 4E 80 00 20 */ blr .global __dt__8COBBTreeFv __dt__8COBBTreeFv: @@ -1523,7 +1523,7 @@ lbl_802A8D84: /* 802A8D90 002A5CF0 83 C1 00 08 */ lwz r30, 8(r1) /* 802A8D94 002A5CF4 7C 08 03 A6 */ mtlr r0 /* 802A8D98 002A5CF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802A8D9C 002A5CFC 4E 80 00 20 */ blr +/* 802A8D9C 002A5CFC 4E 80 00 20 */ blr .global __ct__8COBBTreeFR12CInputStream __ct__8COBBTreeFR12CInputStream: @@ -1571,7 +1571,7 @@ lbl_802A8E30: /* 802A8E40 002A5DA0 83 C1 00 08 */ lwz r30, 8(r1) /* 802A8E44 002A5DA4 7C 08 03 A6 */ mtlr r0 /* 802A8E48 002A5DA8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802A8E4C 002A5DAC 4E 80 00 20 */ blr +/* 802A8E4C 002A5DAC 4E 80 00 20 */ blr .global verify_version__FR12CInputStream verify_version__FR12CInputStream: @@ -1582,7 +1582,7 @@ verify_version__FR12CInputStream: /* 802A8E60 002A5DC0 80 01 00 14 */ lwz r0, 0x14(r1) /* 802A8E64 002A5DC4 7C 08 03 A6 */ mtlr r0 /* 802A8E68 002A5DC8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802A8E6C 002A5DCC 4E 80 00 20 */ blr +/* 802A8E6C 002A5DCC 4E 80 00 20 */ blr .global verify_deaf_babe__FR12CInputStream verify_deaf_babe__FR12CInputStream: @@ -1593,7 +1593,7 @@ verify_deaf_babe__FR12CInputStream: /* 802A8E80 002A5DE0 80 01 00 14 */ lwz r0, 0x14(r1) /* 802A8E84 002A5DE4 7C 08 03 A6 */ mtlr r0 /* 802A8E88 002A5DE8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802A8E8C 002A5DEC 4E 80 00 20 */ blr +/* 802A8E8C 002A5DEC 4E 80 00 20 */ blr .global __ct__8COBBTreeFRCQ28COBBTree10SIndexDataPCQ28COBBTree5CNode __ct__8COBBTreeFRCQ28COBBTree10SIndexDataPCQ28COBBTree5CNode: @@ -1625,7 +1625,7 @@ __ct__8COBBTreeFRCQ28COBBTree10SIndexDataPCQ28COBBTree5CNode: /* 802A8EF4 002A5E54 83 A1 00 14 */ lwz r29, 0x14(r1) /* 802A8EF8 002A5E58 7C 08 03 A6 */ mtlr r0 /* 802A8EFC 002A5E5C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802A8F00 002A5E60 4E 80 00 20 */ blr +/* 802A8F00 002A5E60 4E 80 00 20 */ blr .global __ct__Q28COBBTree10SIndexDataFRCQ28COBBTree10SIndexData __ct__Q28COBBTree10SIndexDataFRCQ28COBBTree10SIndexData: @@ -1950,7 +1950,7 @@ lbl_802A9348: /* 802A9354 002A62B4 83 C1 00 08 */ lwz r30, 8(r1) /* 802A9358 002A62B8 7C 08 03 A6 */ mtlr r0 /* 802A935C 002A62BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802A9360 002A62C0 4E 80 00 20 */ blr +/* 802A9360 002A62C0 4E 80 00 20 */ blr .global __ct__Q28COBBTree10SIndexDataFR12CInputStream __ct__Q28COBBTree10SIndexDataFR12CInputStream: @@ -2223,7 +2223,7 @@ lbl_802A9704: /* 802A9714 002A6674 80 01 00 34 */ lwz r0, 0x34(r1) /* 802A9718 002A6678 7C 08 03 A6 */ mtlr r0 /* 802A971C 002A667C 38 21 00 30 */ addi r1, r1, 0x30 -/* 802A9720 002A6680 4E 80 00 20 */ blr +/* 802A9720 002A6680 4E 80 00 20 */ blr .global "__ct__Q24rstl51vector<14CCollisionEdge,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl17rmemory_allocator" "__ct__Q24rstl51vector<14CCollisionEdge,Q24rstl17rmemory_allocator>FR12CInputStreamRCQ24rstl17rmemory_allocator": @@ -2284,7 +2284,7 @@ lbl_802A97D8: /* 802A97E8 002A6748 80 01 00 24 */ lwz r0, 0x24(r1) /* 802A97EC 002A674C 7C 08 03 A6 */ mtlr r0 /* 802A97F0 002A6750 38 21 00 20 */ addi r1, r1, 0x20 -/* 802A97F4 002A6754 4E 80 00 20 */ blr +/* 802A97F4 002A6754 4E 80 00 20 */ blr .global "reserve__Q24rstl51vector<14CCollisionEdge,Q24rstl17rmemory_allocator>Fi" "reserve__Q24rstl51vector<14CCollisionEdge,Q24rstl17rmemory_allocator>Fi": diff --git a/asm/WorldFormat/CPVSVisOctree.s b/asm/WorldFormat/CPVSVisOctree.s index d20202e0..832614ca 100644 --- a/asm/WorldFormat/CPVSVisOctree.s +++ b/asm/WorldFormat/CPVSVisOctree.s @@ -7,7 +7,7 @@ GetEntityIdByIndex__13CPVSVisOctreeFi: /* 802AE3E4 002AB344 80 63 00 18 */ lwz r3, 0x18(r3) /* 802AE3E8 002AB348 54 80 10 3A */ slwi r0, r4, 2 /* 802AE3EC 002AB34C 7C 63 00 2E */ lwzx r3, r3, r0 -/* 802AE3F0 002AB350 4E 80 00 20 */ blr +/* 802AE3F0 002AB350 4E 80 00 20 */ blr .global GetLightSet__11CPVSAreaSetCFi GetLightSet__11CPVSAreaSetCFi: @@ -48,12 +48,12 @@ lbl_802AE474: /* 802AE474 002AB3D4 80 01 00 24 */ lwz r0, 0x24(r1) /* 802AE478 002AB3D8 7C 08 03 A6 */ mtlr r0 /* 802AE47C 002AB3DC 38 21 00 20 */ addi r1, r1, 0x20 -/* 802AE480 002AB3E0 4E 80 00 20 */ blr +/* 802AE480 002AB3E0 4E 80 00 20 */ blr .global GetVisOctree__13CPVSVisOctreeFv GetVisOctree__13CPVSVisOctreeFv: /* 802AE484 002AB3E4 38 63 00 20 */ addi r3, r3, 0x20 -/* 802AE488 002AB3E8 4E 80 00 20 */ blr +/* 802AE488 002AB3E8 4E 80 00 20 */ blr .global __ct__11CPVSAreaSetFPCci __ct__11CPVSAreaSetFPCci: @@ -128,7 +128,7 @@ lbl_802AE568: /* 802AE598 002AB4F8 80 01 00 64 */ lwz r0, 0x64(r1) /* 802AE59C 002AB4FC 7C 08 03 A6 */ mtlr r0 /* 802AE5A0 002AB500 38 21 00 60 */ addi r1, r1, 0x60 -/* 802AE5A4 002AB504 4E 80 00 20 */ blr +/* 802AE5A4 002AB504 4E 80 00 20 */ blr .global __ct__Q211CPVSAreaSet14CPVSAreaHolderFiiiiiiii __ct__Q211CPVSAreaSet14CPVSAreaHolderFiiiiiiii: @@ -166,7 +166,7 @@ lbl_802AE618: /* 802AE620 002AB580 83 E1 00 5C */ lwz r31, 0x5c(r1) /* 802AE624 002AB584 7C 08 03 A6 */ mtlr r0 /* 802AE628 002AB588 38 21 00 60 */ addi r1, r1, 0x60 -/* 802AE62C 002AB58C 4E 80 00 20 */ blr +/* 802AE62C 002AB58C 4E 80 00 20 */ blr .global sub_802ae630 sub_802ae630: diff --git a/asm/WorldFormat/CWorldLight.s b/asm/WorldFormat/CWorldLight.s index 34a587f3..c2b16b82 100644 --- a/asm/WorldFormat/CWorldLight.s +++ b/asm/WorldFormat/CWorldLight.s @@ -208,7 +208,7 @@ lbl_802A7864: /* 802A787C 002A47DC 83 81 00 E0 */ lwz r28, 0xe0(r1) /* 802A7880 002A47E0 7C 08 03 A6 */ mtlr r0 /* 802A7884 002A47E4 38 21 01 00 */ addi r1, r1, 0x100 -/* 802A7888 002A47E8 4E 80 00 20 */ blr +/* 802A7888 002A47E8 4E 80 00 20 */ blr .global __ct__11CWorldLightFR12CInputStream __ct__11CWorldLightFR12CInputStream: @@ -258,7 +258,7 @@ __ct__11CWorldLightFR12CInputStream: /* 802A7938 002A4898 83 C1 00 08 */ lwz r30, 8(r1) /* 802A793C 002A489C 7C 08 03 A6 */ mtlr r0 /* 802A7940 002A48A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802A7944 002A48A4 4E 80 00 20 */ blr +/* 802A7944 002A48A4 4E 80 00 20 */ blr .global __sinit_CWorldLight_cpp __sinit_CWorldLight_cpp: diff --git a/asm/musyx/creverb_fx.s b/asm/musyx/creverb_fx.s index 3c53158f..7e905da8 100644 --- a/asm/musyx/creverb_fx.s +++ b/asm/musyx/creverb_fx.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text, "ax" +.section .text, "ax" .global sndAuxCallbackReverbSTD sndAuxCallbackReverbSTD: @@ -28,7 +28,7 @@ lbl_803B51D4: /* 803B51D4 003B2134 80 01 00 14 */ lwz r0, 0x14(r1) /* 803B51D8 003B2138 7C 08 03 A6 */ mtlr r0 /* 803B51DC 003B213C 38 21 00 10 */ addi r1, r1, 0x10 -/* 803B51E0 003B2140 4E 80 00 20 */ blr +/* 803B51E0 003B2140 4E 80 00 20 */ blr .global sndAuxCallbackPrepareReverbSTD sndAuxCallbackPrepareReverbSTD: @@ -46,7 +46,7 @@ sndAuxCallbackPrepareReverbSTD: /* 803B5210 003B2170 80 01 00 14 */ lwz r0, 0x14(r1) /* 803B5214 003B2174 7C 08 03 A6 */ mtlr r0 /* 803B5218 003B2178 38 21 00 10 */ addi r1, r1, 0x10 -/* 803B521C 003B217C 4E 80 00 20 */ blr +/* 803B521C 003B217C 4E 80 00 20 */ blr .global sndAuxCallbackShutdownReverbSTD sndAuxCallbackShutdownReverbSTD: @@ -58,4 +58,4 @@ sndAuxCallbackShutdownReverbSTD: /* 803B5234 003B2194 38 60 00 01 */ li r3, 1 /* 803B5238 003B2198 7C 08 03 A6 */ mtlr r0 /* 803B523C 003B219C 38 21 00 10 */ addi r1, r1, 0x10 -/* 803B5240 003B21A0 4E 80 00 20 */ blr +/* 803B5240 003B21A0 4E 80 00 20 */ blr diff --git a/asm/musyx/delay_fx.s b/asm/musyx/delay_fx.s index 196154ea..57ef4565 100644 --- a/asm/musyx/delay_fx.s +++ b/asm/musyx/delay_fx.s @@ -96,7 +96,7 @@ lbl_803B696C: lbl_803B6A60: /* 803B6A60 003B39C0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803B6A64 003B39C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 803B6A68 003B39C8 4E 80 00 20 */ blr +/* 803B6A68 003B39C8 4E 80 00 20 */ blr .global sndAuxCallbackUpdateSettingsDelay sndAuxCallbackUpdateSettingsDelay: @@ -221,7 +221,7 @@ lbl_803B6C14: /* 803B6C2C 003B3B8C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803B6C30 003B3B90 7C 08 03 A6 */ mtlr r0 /* 803B6C34 003B3B94 38 21 00 10 */ addi r1, r1, 0x10 -/* 803B6C38 003B3B98 4E 80 00 20 */ blr +/* 803B6C38 003B3B98 4E 80 00 20 */ blr .global sndAuxCallbackPrepareDelay sndAuxCallbackPrepareDelay: @@ -234,7 +234,7 @@ sndAuxCallbackPrepareDelay: /* 803B6C54 003B3BB4 80 01 00 14 */ lwz r0, 0x14(r1) /* 803B6C58 003B3BB8 7C 08 03 A6 */ mtlr r0 /* 803B6C5C 003B3BBC 38 21 00 10 */ addi r1, r1, 0x10 -/* 803B6C60 003B3BC0 4E 80 00 20 */ blr +/* 803B6C60 003B3BC0 4E 80 00 20 */ blr .global sndAuxCallbackShutdownDelay sndAuxCallbackShutdownDelay: @@ -257,4 +257,4 @@ lbl_803B6C98: /* 803B6CA0 003B3C00 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803B6CA4 003B3C04 7C 08 03 A6 */ mtlr r0 /* 803B6CA8 003B3C08 38 21 00 10 */ addi r1, r1, 0x10 -/* 803B6CAC 003B3C0C 4E 80 00 20 */ blr +/* 803B6CAC 003B3C0C 4E 80 00 20 */ blr diff --git a/asm/musyx/hw_aramdma.s b/asm/musyx/hw_aramdma.s index 2af15917..81f5ddc5 100644 --- a/asm/musyx/hw_aramdma.s +++ b/asm/musyx/hw_aramdma.s @@ -34,7 +34,7 @@ aramWrite: .global aramTop aramTop: .skip 0x4 -.section .text, "ax" +.section .text, "ax" .global aramQueueCallback aramQueueCallback: @@ -64,7 +64,7 @@ lbl_803B3FB4: /* 803B3FC4 003B0F24 41 82 00 10 */ beq lbl_803B3FD4 /* 803B3FC8 003B0F28 80 7E 00 24 */ lwz r3, 0x24(r30) /* 803B3FCC 003B0F2C 7D 89 03 A6 */ mtctr r12 -/* 803B3FD0 003B0F30 4E 80 04 21 */ bctrl +/* 803B3FD0 003B0F30 4E 80 04 21 */ bctrl lbl_803B3FD4: /* 803B3FD4 003B0F34 3B BD 00 01 */ addi r29, r29, 1 /* 803B3FD8 003B0F38 3B DE 00 28 */ addi r30, r30, 0x28 @@ -80,7 +80,7 @@ lbl_803B3FD4: /* 803B4000 003B0F60 80 01 00 24 */ lwz r0, 0x24(r1) /* 803B4004 003B0F64 7C 08 03 A6 */ mtlr r0 /* 803B4008 003B0F68 38 21 00 20 */ addi r1, r1, 0x20 -/* 803B400C 003B0F6C 4E 80 00 20 */ blr +/* 803B400C 003B0F6C 4E 80 00 20 */ blr .global aramUploadData aramUploadData: @@ -206,7 +206,7 @@ lbl_803B41D4: /* 803B41DC 003B113C 80 01 00 34 */ lwz r0, 0x34(r1) /* 803B41E0 003B1140 7C 08 03 A6 */ mtlr r0 /* 803B41E4 003B1144 38 21 00 30 */ addi r1, r1, 0x30 -/* 803B41E8 003B1148 4E 80 00 20 */ blr +/* 803B41E8 003B1148 4E 80 00 20 */ blr .global aramSyncTransferQueue aramSyncTransferQueue: @@ -411,11 +411,11 @@ lbl_803B44C4: /* 803B44E0 003B1440 80 01 00 24 */ lwz r0, 0x24(r1) /* 803B44E4 003B1444 7C 08 03 A6 */ mtlr r0 /* 803B44E8 003B1448 38 21 00 20 */ addi r1, r1, 0x20 -/* 803B44EC 003B144C 4E 80 00 20 */ blr +/* 803B44EC 003B144C 4E 80 00 20 */ blr .global aramExit aramExit: -/* 803B44F0 003B1450 4E 80 00 20 */ blr +/* 803B44F0 003B1450 4E 80 00 20 */ blr .global aramGetZeroBuffer aramGetZeroBuffer: @@ -426,7 +426,7 @@ aramGetZeroBuffer: /* 803B4504 003B1464 80 01 00 14 */ lwz r0, 0x14(r1) /* 803B4508 003B1468 7C 08 03 A6 */ mtlr r0 /* 803B450C 003B146C 38 21 00 10 */ addi r1, r1, 0x10 -/* 803B4510 003B1470 4E 80 00 20 */ blr +/* 803B4510 003B1470 4E 80 00 20 */ blr .global aramSetUploadCallback aramSetUploadCallback: @@ -453,7 +453,7 @@ lbl_803B4550: /* 803B455C 003B14BC 83 C1 00 08 */ lwz r30, 8(r1) /* 803B4560 003B14C0 7C 08 03 A6 */ mtlr r0 /* 803B4564 003B14C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 803B4568 003B14C8 4E 80 00 20 */ blr +/* 803B4568 003B14C8 4E 80 00 20 */ blr .global aramStoreData aramStoreData: @@ -592,7 +592,7 @@ lbl_803B4760: /* 803B4764 003B16C4 7F 23 CB 78 */ mr r3, r25 /* 803B4768 003B16C8 7F 84 E3 78 */ mr r4, r28 /* 803B476C 003B16CC 7D 89 03 A6 */ mtctr r12 -/* 803B4770 003B16D0 4E 80 04 21 */ bctrl +/* 803B4770 003B16D0 4E 80 04 21 */ bctrl /* 803B4774 003B16D4 7C 7D 1B 78 */ mr r29, r3 /* 803B4778 003B16D8 7F 84 E3 78 */ mr r4, r28 /* 803B477C 003B16DC 4B FC A3 35 */ bl DCFlushRange @@ -706,7 +706,7 @@ lbl_803B4910: /* 803B4918 003B1878 80 01 00 34 */ lwz r0, 0x34(r1) /* 803B491C 003B187C 7C 08 03 A6 */ mtlr r0 /* 803B4920 003B1880 38 21 00 30 */ addi r1, r1, 0x30 -/* 803B4924 003B1884 4E 80 00 20 */ blr +/* 803B4924 003B1884 4E 80 00 20 */ blr .global aramRemoveData aramRemoveData: @@ -715,7 +715,7 @@ aramRemoveData: /* 803B4930 003B1890 54 63 00 34 */ rlwinm r3, r3, 0, 0, 0x1a /* 803B4934 003B1894 7C 03 00 50 */ subf r0, r3, r0 /* 803B4938 003B1898 90 0D AF A8 */ stw r0, aramWrite@sda21(r13) -/* 803B493C 003B189C 4E 80 00 20 */ blr +/* 803B493C 003B189C 4E 80 00 20 */ blr .global InitStreamBuffers InitStreamBuffers: @@ -770,7 +770,7 @@ lbl_803B49E0: /* 803B49F4 003B1954 38 80 00 00 */ li r4, 0 /* 803B49F8 003B1958 90 83 FF F0 */ stw r4, -0x10(r3) /* 803B49FC 003B195C 90 0D AF A4 */ stw r0, aramStream@sda21(r13) -/* 803B4A00 003B1960 4E 80 00 20 */ blr +/* 803B4A00 003B1960 4E 80 00 20 */ blr .global aramAllocateStreamBuffer aramAllocateStreamBuffer: @@ -841,7 +841,7 @@ lbl_803B4AE0: /* 803B4AE0 003B1A40 28 05 00 00 */ cmplwi r5, 0 /* 803B4AE4 003B1A44 40 82 00 0C */ bne lbl_803B4AF0 /* 803B4AE8 003B1A48 38 60 00 FF */ li r3, 0xff -/* 803B4AEC 003B1A4C 4E 80 00 20 */ blr +/* 803B4AEC 003B1A4C 4E 80 00 20 */ blr lbl_803B4AF0: /* 803B4AF0 003B1A50 3C 60 80 56 */ lis r3, aramStreamBuffers@ha /* 803B4AF4 003B1A54 38 03 74 98 */ addi r0, r3, aramStreamBuffers@l @@ -849,7 +849,7 @@ lbl_803B4AF0: /* 803B4AFC 003B1A5C 7C 00 26 70 */ srawi r0, r0, 4 /* 803B4B00 003B1A60 7C 00 01 94 */ addze r0, r0 /* 803B4B04 003B1A64 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 803B4B08 003B1A68 4E 80 00 20 */ blr +/* 803B4B08 003B1A68 4E 80 00 20 */ blr .global aramGetStreamBufferAddress aramGetStreamBufferAddress: @@ -867,7 +867,7 @@ lbl_803B4B2C: /* 803B4B34 003B1A94 38 64 74 98 */ addi r3, r4, aramStreamBuffers@l /* 803B4B38 003B1A98 7C 63 02 14 */ add r3, r3, r0 /* 803B4B3C 003B1A9C 80 63 00 04 */ lwz r3, 4(r3) -/* 803B4B40 003B1AA0 4E 80 00 20 */ blr +/* 803B4B40 003B1AA0 4E 80 00 20 */ blr .global aramFreeStreamBuffer aramFreeStreamBuffer: @@ -940,9 +940,9 @@ lbl_803B4C08: /* 803B4C20 003B1B80 7C A3 2B 78 */ mr r3, r5 lbl_803B4C24: /* 803B4C24 003B1B84 90 6D AF A4 */ stw r3, aramStream@sda21(r13) -/* 803B4C28 003B1B88 4E 80 00 20 */ blr +/* 803B4C28 003B1B88 4E 80 00 20 */ blr lbl_803B4C2C: /* 803B4C2C 003B1B8C 80 0D AF 94 */ lwz r0, aramFreeStreamBuffers@sda21(r13) /* 803B4C30 003B1B90 90 04 00 00 */ stw r0, 0(r4) /* 803B4C34 003B1B94 90 8D AF 94 */ stw r4, aramFreeStreamBuffers@sda21(r13) -/* 803B4C38 003B1B98 4E 80 00 20 */ blr +/* 803B4C38 003B1B98 4E 80 00 20 */ blr diff --git a/asm/musyx/hw_dolphin.s b/asm/musyx/hw_dolphin.s index 7cc9f4f9..7524d7c9 100644 --- a/asm/musyx/hw_dolphin.s +++ b/asm/musyx/hw_dolphin.s @@ -5,7 +5,7 @@ dsp_task: .skip 0x60 dram_image: .skip 0x2008 - + .section .sbss, "wa" .balign 4 .global oldState @@ -38,8 +38,8 @@ salAIBufferIndex: .global userCallback userCallback: .skip 0x4 - -.section .text, "ax" + +.section .text, "ax" .global salCallback salCallback: @@ -74,7 +74,7 @@ salCallback: /* 803B4CAC 003B1C0C 4B FC C9 C9 */ bl OSEnableInterrupts /* 803B4CB0 003B1C10 81 8D AF D4 */ lwz r12, userCallback@sda21(r13) /* 803B4CB4 003B1C14 7D 89 03 A6 */ mtctr r12 -/* 803B4CB8 003B1C18 4E 80 04 21 */ bctrl +/* 803B4CB8 003B1C18 4E 80 04 21 */ bctrl /* 803B4CBC 003B1C1C 4B FC C9 A5 */ bl OSDisableInterrupts /* 803B4CC0 003B1C20 38 00 00 00 */ li r0, 0 /* 803B4CC4 003B1C24 90 0D AF C0 */ stw r0, salLogicActive@sda21(r13) @@ -86,14 +86,14 @@ lbl_803B4CD4: /* 803B4CD4 003B1C34 80 01 00 14 */ lwz r0, 0x14(r1) /* 803B4CD8 003B1C38 7C 08 03 A6 */ mtlr r0 /* 803B4CDC 003B1C3C 38 21 00 10 */ addi r1, r1, 0x10 -/* 803B4CE0 003B1C40 4E 80 00 20 */ blr +/* 803B4CE0 003B1C40 4E 80 00 20 */ blr .global dspInitCallback dspInitCallback: /* 803B4CE4 003B1C44 38 00 00 01 */ li r0, 1 /* 803B4CE8 003B1C48 90 0D AF C8 */ stw r0, salDspIsDone@sda21(r13) /* 803B4CEC 003B1C4C 90 0D AF B8 */ stw r0, salDspInitIsDone@sda21(r13) -/* 803B4CF0 003B1C50 4E 80 00 20 */ blr +/* 803B4CF0 003B1C50 4E 80 00 20 */ blr .global dspResumeCallback dspResumeCallback: @@ -114,7 +114,7 @@ dspResumeCallback: /* 803B4D2C 003B1C8C 4B FC C9 49 */ bl OSEnableInterrupts /* 803B4D30 003B1C90 81 8D AF D4 */ lwz r12, userCallback@sda21(r13) /* 803B4D34 003B1C94 7D 89 03 A6 */ mtctr r12 -/* 803B4D38 003B1C98 4E 80 04 21 */ bctrl +/* 803B4D38 003B1C98 4E 80 04 21 */ bctrl /* 803B4D3C 003B1C9C 4B FC C9 25 */ bl OSDisableInterrupts /* 803B4D40 003B1CA0 38 00 00 00 */ li r0, 0 /* 803B4D44 003B1CA4 90 0D AF C0 */ stw r0, salLogicActive@sda21(r13) @@ -122,7 +122,7 @@ lbl_803B4D48: /* 803B4D48 003B1CA8 80 01 00 14 */ lwz r0, 0x14(r1) /* 803B4D4C 003B1CAC 7C 08 03 A6 */ mtlr r0 /* 803B4D50 003B1CB0 38 21 00 10 */ addi r1, r1, 0x10 -/* 803B4D54 003B1CB4 4E 80 00 20 */ blr +/* 803B4D54 003B1CB4 4E 80 00 20 */ blr .global salInitAi salInitAi: @@ -177,7 +177,7 @@ lbl_803B4E08: /* 803B4E10 003B1D70 83 C1 00 08 */ lwz r30, 8(r1) /* 803B4E14 003B1D74 7C 08 03 A6 */ mtlr r0 /* 803B4E18 003B1D78 38 21 00 10 */ addi r1, r1, 0x10 -/* 803B4E1C 003B1D7C 4E 80 00 20 */ blr +/* 803B4E1C 003B1D7C 4E 80 00 20 */ blr .global salStartAi salStartAi: @@ -188,7 +188,7 @@ salStartAi: /* 803B4E30 003B1D90 80 01 00 14 */ lwz r0, 0x14(r1) /* 803B4E34 003B1D94 7C 08 03 A6 */ mtlr r0 /* 803B4E38 003B1D98 38 21 00 10 */ addi r1, r1, 0x10 -/* 803B4E3C 003B1D9C 4E 80 00 20 */ blr +/* 803B4E3C 003B1D9C 4E 80 00 20 */ blr .global salExitAi salExitAi: @@ -204,7 +204,7 @@ salExitAi: /* 803B4E64 003B1DC4 38 60 00 01 */ li r3, 1 /* 803B4E68 003B1DC8 7C 08 03 A6 */ mtlr r0 /* 803B4E6C 003B1DCC 38 21 00 10 */ addi r1, r1, 0x10 -/* 803B4E70 003B1DD0 4E 80 00 20 */ blr +/* 803B4E70 003B1DD0 4E 80 00 20 */ blr .global salAiGetDest salAiGetDest: @@ -219,7 +219,7 @@ salAiGetDest: /* 803B4E94 003B1DF4 54 00 06 3E */ clrlwi r0, r0, 0x18 /* 803B4E98 003B1DF8 1C 00 02 80 */ mulli r0, r0, 0x280 /* 803B4E9C 003B1DFC 7C 64 02 14 */ add r3, r4, r0 -/* 803B4EA0 003B1E00 4E 80 00 20 */ blr +/* 803B4EA0 003B1E00 4E 80 00 20 */ blr .global salInitDsp salInitDsp: @@ -270,7 +270,7 @@ lbl_803B4F3C: /* 803B4F50 003B1EB0 38 60 00 01 */ li r3, 1 /* 803B4F54 003B1EB4 7C 08 03 A6 */ mtlr r0 /* 803B4F58 003B1EB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 803B4F5C 003B1EBC 4E 80 00 20 */ blr +/* 803B4F5C 003B1EBC 4E 80 00 20 */ blr .global salExitDsp salExitDsp: @@ -287,7 +287,7 @@ lbl_803B4F70: /* 803B4F84 003B1EE4 38 60 00 01 */ li r3, 1 /* 803B4F88 003B1EE8 7C 08 03 A6 */ mtlr r0 /* 803B4F8C 003B1EEC 38 21 00 10 */ addi r1, r1, 0x10 -/* 803B4F90 003B1EF0 4E 80 00 20 */ blr +/* 803B4F90 003B1EF0 4E 80 00 20 */ blr .global salCtrlDsp salCtrlDsp: @@ -321,7 +321,7 @@ lbl_803B4FE8: /* 803B4FF8 003B1F58 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803B4FFC 003B1F5C 7C 08 03 A6 */ mtlr r0 /* 803B5000 003B1F60 38 21 00 10 */ addi r1, r1, 0x10 -/* 803B5004 003B1F64 4E 80 00 20 */ blr +/* 803B5004 003B1F64 4E 80 00 20 */ blr .global salGetStartDelay salGetStartDelay: @@ -343,7 +343,7 @@ salGetStartDelay: /* 803B5044 003B1FA4 80 01 00 14 */ lwz r0, 0x14(r1) /* 803B5048 003B1FA8 7C 08 03 A6 */ mtlr r0 /* 803B504C 003B1FAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 803B5050 003B1FB0 4E 80 00 20 */ blr +/* 803B5050 003B1FB0 4E 80 00 20 */ blr .global hwInitIrq hwInitIrq: @@ -357,11 +357,11 @@ hwInitIrq: /* 803B5070 003B1FD0 80 01 00 14 */ lwz r0, 0x14(r1) /* 803B5074 003B1FD4 7C 08 03 A6 */ mtlr r0 /* 803B5078 003B1FD8 38 21 00 10 */ addi r1, r1, 0x10 -/* 803B507C 003B1FDC 4E 80 00 20 */ blr +/* 803B507C 003B1FDC 4E 80 00 20 */ blr .global hwExitIrq hwExitIrq: -/* 803B5080 003B1FE0 4E 80 00 20 */ blr +/* 803B5080 003B1FE0 4E 80 00 20 */ blr .global hwEnableIrq hwEnableIrq: @@ -379,7 +379,7 @@ lbl_803B50AC: /* 803B50AC 003B200C 80 01 00 14 */ lwz r0, 0x14(r1) /* 803B50B0 003B2010 7C 08 03 A6 */ mtlr r0 /* 803B50B4 003B2014 38 21 00 10 */ addi r1, r1, 0x10 -/* 803B50B8 003B2018 4E 80 00 20 */ blr +/* 803B50B8 003B2018 4E 80 00 20 */ blr .global hwDisableIrq hwDisableIrq: @@ -397,7 +397,7 @@ lbl_803B50E4: /* 803B50E4 003B2044 80 01 00 14 */ lwz r0, 0x14(r1) /* 803B50E8 003B2048 7C 08 03 A6 */ mtlr r0 /* 803B50EC 003B204C 38 21 00 10 */ addi r1, r1, 0x10 -/* 803B50F0 003B2050 4E 80 00 20 */ blr +/* 803B50F0 003B2050 4E 80 00 20 */ blr .global hwIRQEnterCritical hwIRQEnterCritical: @@ -408,7 +408,7 @@ hwIRQEnterCritical: /* 803B5104 003B2064 80 01 00 14 */ lwz r0, 0x14(r1) /* 803B5108 003B2068 7C 08 03 A6 */ mtlr r0 /* 803B510C 003B206C 38 21 00 10 */ addi r1, r1, 0x10 -/* 803B5110 003B2070 4E 80 00 20 */ blr +/* 803B5110 003B2070 4E 80 00 20 */ blr .global hwIRQLeaveCritical hwIRQLeaveCritical: @@ -419,4 +419,4 @@ hwIRQLeaveCritical: /* 803B5124 003B2084 80 01 00 14 */ lwz r0, 0x14(r1) /* 803B5128 003B2088 7C 08 03 A6 */ mtlr r0 /* 803B512C 003B208C 38 21 00 10 */ addi r1, r1, 0x10 -/* 803B5130 003B2090 4E 80 00 20 */ blr +/* 803B5130 003B2090 4E 80 00 20 */ blr diff --git a/asm/musyx/hw_memory.s b/asm/musyx/hw_memory.s index 895f0b73..65b43cc6 100644 --- a/asm/musyx/hw_memory.s +++ b/asm/musyx/hw_memory.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text, "ax" +.section .text, "ax" .global salMalloc salMalloc: @@ -9,11 +9,11 @@ salMalloc: /* 803B513C 003B209C 90 01 00 14 */ stw r0, 0x14(r1) /* 803B5140 003B20A0 81 8D AF 84 */ lwz r12, salHooks@sda21(r13) /* 803B5144 003B20A4 7D 89 03 A6 */ mtctr r12 -/* 803B5148 003B20A8 4E 80 04 21 */ bctrl +/* 803B5148 003B20A8 4E 80 04 21 */ bctrl /* 803B514C 003B20AC 80 01 00 14 */ lwz r0, 0x14(r1) /* 803B5150 003B20B0 7C 08 03 A6 */ mtlr r0 /* 803B5154 003B20B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 803B5158 003B20B8 4E 80 00 20 */ blr +/* 803B5158 003B20B8 4E 80 00 20 */ blr .global salFree salFree: @@ -23,8 +23,8 @@ salFree: /* 803B5168 003B20C8 90 01 00 14 */ stw r0, 0x14(r1) /* 803B516C 003B20CC 81 84 00 04 */ lwz r12, 4(r4) /* 803B5170 003B20D0 7D 89 03 A6 */ mtctr r12 -/* 803B5174 003B20D4 4E 80 04 21 */ bctrl +/* 803B5174 003B20D4 4E 80 04 21 */ bctrl /* 803B5178 003B20D8 80 01 00 14 */ lwz r0, 0x14(r1) /* 803B517C 003B20DC 7C 08 03 A6 */ mtlr r0 /* 803B5180 003B20E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 803B5184 003B20E4 4E 80 00 20 */ blr +/* 803B5184 003B20E4 4E 80 00 20 */ blr diff --git a/asm/musyx/reverb_fx.s b/asm/musyx/reverb_fx.s index c7b74edc..95b8c951 100644 --- a/asm/musyx/reverb_fx.s +++ b/asm/musyx/reverb_fx.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text, "ax" +.section .text, "ax" .global sndAuxCallbackReverbHI sndAuxCallbackReverbHI: @@ -28,7 +28,7 @@ lbl_803B5B4C: /* 803B5B4C 003B2AAC 80 01 00 14 */ lwz r0, 0x14(r1) /* 803B5B50 003B2AB0 7C 08 03 A6 */ mtlr r0 /* 803B5B54 003B2AB4 38 21 00 10 */ addi r1, r1, 0x10 -/* 803B5B58 003B2AB8 4E 80 00 20 */ blr +/* 803B5B58 003B2AB8 4E 80 00 20 */ blr .global sndAuxCallbackPrepareReverbHI sndAuxCallbackPrepareReverbHI: @@ -47,7 +47,7 @@ sndAuxCallbackPrepareReverbHI: /* 803B5B8C 003B2AEC 80 01 00 14 */ lwz r0, 0x14(r1) /* 803B5B90 003B2AF0 7C 08 03 A6 */ mtlr r0 /* 803B5B94 003B2AF4 38 21 00 10 */ addi r1, r1, 0x10 -/* 803B5B98 003B2AF8 4E 80 00 20 */ blr +/* 803B5B98 003B2AF8 4E 80 00 20 */ blr .global sndAuxCallbackShutdownReverbHI sndAuxCallbackShutdownReverbHI: @@ -59,4 +59,4 @@ sndAuxCallbackShutdownReverbHI: /* 803B5BB0 003B2B10 38 60 00 01 */ li r3, 1 /* 803B5BB4 003B2B14 7C 08 03 A6 */ mtlr r0 /* 803B5BB8 003B2B18 38 21 00 10 */ addi r1, r1, 0x10 -/* 803B5BBC 003B2B1C 4E 80 00 20 */ blr +/* 803B5BBC 003B2B1C 4E 80 00 20 */ blr diff --git a/asm/musyx/s_data.s b/asm/musyx/s_data.s index fc5e5cc0..0e05e2f9 100644 --- a/asm/musyx/s_data.s +++ b/asm/musyx/s_data.s @@ -5,8 +5,8 @@ .global sp sp: .skip 0x8 - -.section .text, "ax" + +.section .text, "ax" .global vsUpdateBuffer vsUpdateBuffer: @@ -45,7 +45,7 @@ lbl_803A9DB4: /* 803A9DF8 003A6D58 90 1F 00 20 */ stw r0, 0x20(r31) /* 803A9DFC 003A6D5C 81 85 09 4C */ lwz r12, 0x94c(r5) /* 803A9E00 003A6D60 7D 89 03 A6 */ mtctr r12 -/* 803A9E04 003A6D64 4E 80 04 21 */ bctrl +/* 803A9E04 003A6D64 4E 80 04 21 */ bctrl /* 803A9E08 003A6D68 28 03 00 00 */ cmplwi r3, 0 /* 803A9E0C 003A6D6C 41 82 01 50 */ beq lbl_803A9F5C /* 803A9E10 003A6D70 3C 80 80 56 */ lis r4, vs@ha @@ -87,7 +87,7 @@ lbl_803A9E50: /* 803A9E98 003A6DF8 90 1F 00 20 */ stw r0, 0x20(r31) /* 803A9E9C 003A6DFC 81 9E 09 4C */ lwz r12, 0x94c(r30) /* 803A9EA0 003A6E00 7D 89 03 A6 */ mtctr r12 -/* 803A9EA4 003A6E04 4E 80 04 21 */ bctrl +/* 803A9EA4 003A6E04 4E 80 04 21 */ bctrl /* 803A9EA8 003A6E08 28 03 00 00 */ cmplwi r3, 0 /* 803A9EAC 003A6E0C 41 82 00 B0 */ beq lbl_803A9F5C /* 803A9EB0 003A6E10 80 1F 00 04 */ lwz r0, 4(r31) @@ -125,7 +125,7 @@ lbl_803A9EE0: /* 803A9F28 003A6E88 38 9F 00 10 */ addi r4, r31, 0x10 /* 803A9F2C 003A6E8C 81 9E 09 4C */ lwz r12, 0x94c(r30) /* 803A9F30 003A6E90 7D 89 03 A6 */ mtctr r12 -/* 803A9F34 003A6E94 4E 80 04 21 */ bctrl +/* 803A9F34 003A6E94 4E 80 04 21 */ bctrl /* 803A9F38 003A6E98 28 03 00 00 */ cmplwi r3, 0 /* 803A9F3C 003A6E9C 41 82 00 20 */ beq lbl_803A9F5C /* 803A9F40 003A6EA0 80 1F 00 04 */ lwz r0, 4(r31) @@ -141,7 +141,7 @@ lbl_803A9F5C: /* 803A9F64 003A6EC4 83 C1 00 08 */ lwz r30, 8(r1) /* 803A9F68 003A6EC8 7C 08 03 A6 */ mtlr r0 /* 803A9F6C 003A6ECC 38 21 00 10 */ addi r1, r1, 0x10 -/* 803A9F70 003A6ED0 4E 80 00 20 */ blr +/* 803A9F70 003A6ED0 4E 80 00 20 */ blr .global vsSampleUpdates vsSampleUpdates: @@ -288,13 +288,13 @@ lbl_803AA16C: /* 803AA174 003A70D4 80 01 00 24 */ lwz r0, 0x24(r1) /* 803AA178 003A70D8 7C 08 03 A6 */ mtlr r0 /* 803AA17C 003A70DC 38 21 00 20 */ addi r1, r1, 0x20 -/* 803AA180 003A70E0 4E 80 00 20 */ blr +/* 803AA180 003A70E0 4E 80 00 20 */ blr .global dataInitStack dataInitStack: /* 803AA184 003A70E4 38 00 00 00 */ li r0, 0 /* 803AA188 003A70E8 B0 0D AF 18 */ sth r0, sp@sda21(r13) -/* 803AA18C 003A70EC 4E 80 00 20 */ blr +/* 803AA18C 003A70EC 4E 80 00 20 */ blr .global ScanIDList ScanIDList: @@ -492,7 +492,7 @@ lbl_803AA3FC: /* 803AA3FC 003A735C 80 01 00 14 */ lwz r0, 0x14(r1) /* 803AA400 003A7360 7C 08 03 A6 */ mtlr r0 /* 803AA404 003A7364 38 21 00 10 */ addi r1, r1, 0x10 -/* 803AA408 003A7368 4E 80 00 20 */ blr +/* 803AA408 003A7368 4E 80 00 20 */ blr .global sndSetSampleDataUploadCallback sndSetSampleDataUploadCallback: @@ -503,7 +503,7 @@ sndSetSampleDataUploadCallback: /* 803AA41C 003A737C 80 01 00 14 */ lwz r0, 0x14(r1) /* 803AA420 003A7380 7C 08 03 A6 */ mtlr r0 /* 803AA424 003A7384 38 21 00 10 */ addi r1, r1, 0x10 -/* 803AA428 003A7388 4E 80 00 20 */ blr +/* 803AA428 003A7388 4E 80 00 20 */ blr .global sndPushGroup sndPushGroup: @@ -741,7 +741,7 @@ lbl_803AA740: /* 803AA748 003A76A8 80 01 00 34 */ lwz r0, 0x34(r1) /* 803AA74C 003A76AC 7C 08 03 A6 */ mtlr r0 /* 803AA750 003A76B0 38 21 00 30 */ addi r1, r1, 0x30 -/* 803AA754 003A76B4 4E 80 00 20 */ blr +/* 803AA754 003A76B4 4E 80 00 20 */ blr .global sndPopGroup sndPopGroup: @@ -983,7 +983,7 @@ lbl_803AAA78: /* 803AAA84 003A79E4 80 01 00 24 */ lwz r0, 0x24(r1) /* 803AAA88 003A79E8 7C 08 03 A6 */ mtlr r0 /* 803AAA8C 003A79EC 38 21 00 20 */ addi r1, r1, 0x20 -/* 803AAA90 003A79F0 4E 80 00 20 */ blr +/* 803AAA90 003A79F0 4E 80 00 20 */ blr .global sndSeqPlaySong sndSeqPlaySong: @@ -1079,7 +1079,7 @@ lbl_803AABC8: /* 803AABD0 003A7B30 80 01 00 34 */ lwz r0, 0x34(r1) /* 803AABD4 003A7B34 7C 08 03 A6 */ mtlr r0 /* 803AABD8 003A7B38 38 21 00 30 */ addi r1, r1, 0x30 -/* 803AABDC 003A7B3C 4E 80 00 20 */ blr +/* 803AABDC 003A7B3C 4E 80 00 20 */ blr .global sndSeqPlayEx sndSeqPlayEx: @@ -1161,4 +1161,4 @@ lbl_803AACE0: /* 803AACEC 003A7C4C 80 01 00 34 */ lwz r0, 0x34(r1) /* 803AACF0 003A7C50 7C 08 03 A6 */ mtlr r0 /* 803AACF4 003A7C54 38 21 00 30 */ addi r1, r1, 0x30 -/* 803AACF8 003A7C58 4E 80 00 20 */ blr +/* 803AACF8 003A7C58 4E 80 00 20 */ blr diff --git a/asm/musyx/seq_api.s b/asm/musyx/seq_api.s index e9b9a85e..6d5d94b1 100644 --- a/asm/musyx/seq_api.s +++ b/asm/musyx/seq_api.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text, "ax" +.section .text, "ax" .global sndSeqStop sndSeqStop: @@ -17,7 +17,7 @@ sndSeqStop: /* 8039C024 00398F84 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8039C028 00398F88 7C 08 03 A6 */ mtlr r0 /* 8039C02C 00398F8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8039C030 00398F90 4E 80 00 20 */ blr +/* 8039C030 00398F90 4E 80 00 20 */ blr .global sndSeqSpeed sndSeqSpeed: @@ -38,7 +38,7 @@ sndSeqSpeed: /* 8039C06C 00398FCC 83 C1 00 08 */ lwz r30, 8(r1) /* 8039C070 00398FD0 7C 08 03 A6 */ mtlr r0 /* 8039C074 00398FD4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8039C078 00398FD8 4E 80 00 20 */ blr +/* 8039C078 00398FD8 4E 80 00 20 */ blr .global sndSeqContinue sndSeqContinue: @@ -55,7 +55,7 @@ sndSeqContinue: /* 8039C0A4 00399004 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8039C0A8 00399008 7C 08 03 A6 */ mtlr r0 /* 8039C0AC 0039900C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8039C0B0 00399010 4E 80 00 20 */ blr +/* 8039C0B0 00399010 4E 80 00 20 */ blr .global sndSeqMute sndSeqMute: @@ -80,7 +80,7 @@ sndSeqMute: /* 8039C0FC 0039905C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8039C100 00399060 7C 08 03 A6 */ mtlr r0 /* 8039C104 00399064 38 21 00 20 */ addi r1, r1, 0x20 -/* 8039C108 00399068 4E 80 00 20 */ blr +/* 8039C108 00399068 4E 80 00 20 */ blr .global sndSeqVolume sndSeqVolume: @@ -109,7 +109,7 @@ sndSeqVolume: /* 8039C164 003990C4 83 81 00 10 */ lwz r28, 0x10(r1) /* 8039C168 003990C8 7C 08 03 A6 */ mtlr r0 /* 8039C16C 003990CC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8039C170 003990D0 4E 80 00 20 */ blr +/* 8039C170 003990D0 4E 80 00 20 */ blr .global seqGetMIDIPriority seqGetMIDIPriority: @@ -119,4 +119,4 @@ seqGetMIDIPriority: /* 8039C180 003990E0 54 80 0D FC */ rlwinm r0, r4, 1, 0x17, 0x1e /* 8039C184 003990E4 7C 63 32 14 */ add r3, r3, r6 /* 8039C188 003990E8 7C 63 02 2E */ lhzx r3, r3, r0 -/* 8039C18C 003990EC 4E 80 00 20 */ blr +/* 8039C18C 003990EC 4E 80 00 20 */ blr diff --git a/asm/musyx/snd_midictrl.s b/asm/musyx/snd_midictrl.s index 029f9f51..b1c81ff4 100644 --- a/asm/musyx/snd_midictrl.s +++ b/asm/musyx/snd_midictrl.s @@ -15,7 +15,7 @@ midi_lastNote: .skip 0x80 fx_lastNote: .skip 0x40 - + .section .data, "wa" .global lbl_803F41E8 diff --git a/asm/musyx/snd_service.s b/asm/musyx/snd_service.s index 92a78ac5..4e853500 100644 --- a/asm/musyx/snd_service.s +++ b/asm/musyx/snd_service.s @@ -69,14 +69,14 @@ sndSintab: .2byte 4091, 4091, 4091, 4091, 4092, 4092, 4092, 4092, 4093, 4093, 4093, 4093, 4094, 4094, 4094, 4094 .2byte 4094, 4094, 4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095 .skip 8 - + .section .sdata, "wa" .global last_rnd last_rnd: .4byte 1 .skip 4 - -.section .text, "ax" + +.section .text, "ax" .global sndRand sndRand: @@ -86,7 +86,7 @@ sndRand: /* 803B2DAC 003AFD0C 7C 04 01 D6 */ mullw r0, r4, r0 /* 803B2DB0 003AFD10 90 0D A0 10 */ stw r0, last_rnd@sda21(r13) /* 803B2DB4 003AFD14 54 03 D4 3E */ rlwinm r3, r0, 0x1a, 0x10, 0x1f -/* 803B2DB8 003AFD18 4E 80 00 20 */ blr +/* 803B2DB8 003AFD18 4E 80 00 20 */ blr .global sndSin sndSin: @@ -97,7 +97,7 @@ sndSin: /* 803B2DCC 003AFD2C 54 00 0B FC */ rlwinm r0, r0, 1, 0xf, 0x1e /* 803B2DD0 003AFD30 38 63 42 78 */ addi r3, r3, sndSintab@l /* 803B2DD4 003AFD34 7C 63 02 AE */ lhax r3, r3, r0 -/* 803B2DD8 003AFD38 4E 80 00 20 */ blr +/* 803B2DD8 003AFD38 4E 80 00 20 */ blr lbl_803B2DDC: /* 803B2DDC 003AFD3C 28 00 08 00 */ cmplwi r0, 0x800 /* 803B2DE0 003AFD40 40 80 00 20 */ bge lbl_803B2E00 @@ -107,7 +107,7 @@ lbl_803B2DDC: /* 803B2DF0 003AFD50 54 00 08 3C */ slwi r0, r0, 1 /* 803B2DF4 003AFD54 38 63 42 78 */ addi r3, r3, sndSintab@l /* 803B2DF8 003AFD58 7C 63 02 AE */ lhax r3, r3, r0 -/* 803B2DFC 003AFD5C 4E 80 00 20 */ blr +/* 803B2DFC 003AFD5C 4E 80 00 20 */ blr lbl_803B2E00: /* 803B2E00 003AFD60 28 00 0C 00 */ cmplwi r0, 0xc00 /* 803B2E04 003AFD64 40 80 00 20 */ bge lbl_803B2E24 @@ -117,7 +117,7 @@ lbl_803B2E00: /* 803B2E14 003AFD74 7C 03 02 AE */ lhax r0, r3, r0 /* 803B2E18 003AFD78 7C 00 00 D0 */ neg r0, r0 /* 803B2E1C 003AFD7C 7C 03 07 34 */ extsh r3, r0 -/* 803B2E20 003AFD80 4E 80 00 20 */ blr +/* 803B2E20 003AFD80 4E 80 00 20 */ blr lbl_803B2E24: /* 803B2E24 003AFD84 54 00 05 BE */ clrlwi r0, r0, 0x16 /* 803B2E28 003AFD88 3C 60 80 3F */ lis r3, sndSintab@ha @@ -127,7 +127,7 @@ lbl_803B2E24: /* 803B2E38 003AFD98 7C 03 02 AE */ lhax r0, r3, r0 /* 803B2E3C 003AFD9C 7C 00 00 D0 */ neg r0, r0 /* 803B2E40 003AFDA0 7C 03 07 34 */ extsh r3, r0 -/* 803B2E44 003AFDA4 4E 80 00 20 */ blr +/* 803B2E44 003AFDA4 4E 80 00 20 */ blr .global sndBSearch sndBSearch: @@ -154,7 +154,7 @@ lbl_803B2E7C: /* 803B2E94 003AFDF4 7F 99 02 14 */ add r28, r25, r0 /* 803B2E98 003AFDF8 7F 84 E3 78 */ mr r4, r28 /* 803B2E9C 003AFDFC 7D 89 03 A6 */ mtctr r12 -/* 803B2EA0 003AFE00 4E 80 04 21 */ bctrl +/* 803B2EA0 003AFE00 4E 80 04 21 */ bctrl /* 803B2EA4 003AFE04 2C 03 00 00 */ cmpwi r3, 0 /* 803B2EA8 003AFE08 40 82 00 0C */ bne lbl_803B2EB4 /* 803B2EAC 003AFE0C 7F 83 E3 78 */ mr r3, r28 @@ -177,14 +177,14 @@ lbl_803B2ED4: /* 803B2EDC 003AFE3C 80 01 00 34 */ lwz r0, 0x34(r1) /* 803B2EE0 003AFE40 7C 08 03 A6 */ mtlr r0 /* 803B2EE4 003AFE44 38 21 00 30 */ addi r1, r1, 0x30 -/* 803B2EE8 003AFE48 4E 80 00 20 */ blr +/* 803B2EE8 003AFE48 4E 80 00 20 */ blr .global sndConvertMs sndConvertMs: /* 803B2EEC 003AFE4C 80 03 00 00 */ lwz r0, 0(r3) /* 803B2EF0 003AFE50 54 00 40 2E */ slwi r0, r0, 8 /* 803B2EF4 003AFE54 90 03 00 00 */ stw r0, 0(r3) -/* 803B2EF8 003AFE58 4E 80 00 20 */ blr +/* 803B2EF8 003AFE58 4E 80 00 20 */ blr .global sndConvertTicks sndConvertTicks: @@ -205,9 +205,9 @@ sndConvertTicks: /* 803B2F34 003AFE94 80 01 00 14 */ lwz r0, 0x14(r1) /* 803B2F38 003AFE98 7C 08 03 A6 */ mtlr r0 /* 803B2F3C 003AFE9C 38 21 00 10 */ addi r1, r1, 0x10 -/* 803B2F40 003AFEA0 4E 80 00 20 */ blr +/* 803B2F40 003AFEA0 4E 80 00 20 */ blr .global sndConvert2Ms sndConvert2Ms: /* 803B2F44 003AFEA4 54 63 C2 3E */ srwi r3, r3, 8 -/* 803B2F48 003AFEA8 4E 80 00 20 */ blr +/* 803B2F48 003AFEA8 4E 80 00 20 */ blr diff --git a/asm/musyx/snd_synthapi.s b/asm/musyx/snd_synthapi.s index 84f10a1e..86f34e0c 100644 --- a/asm/musyx/snd_synthapi.s +++ b/asm/musyx/snd_synthapi.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text, "ax" +.section .text, "ax" .global sndFXCtrl sndFXCtrl: @@ -27,7 +27,7 @@ sndFXCtrl: /* 8039C1E0 00399140 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8039C1E4 00399144 7C 08 03 A6 */ mtlr r0 /* 8039C1E8 00399148 38 21 00 20 */ addi r1, r1, 0x20 -/* 8039C1EC 0039914C 4E 80 00 20 */ blr +/* 8039C1EC 0039914C 4E 80 00 20 */ blr .global sndFXCtrl14 sndFXCtrl14: @@ -54,7 +54,7 @@ sndFXCtrl14: /* 8039C240 003991A0 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8039C244 003991A4 7C 08 03 A6 */ mtlr r0 /* 8039C248 003991A8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8039C24C 003991AC 4E 80 00 20 */ blr +/* 8039C24C 003991AC 4E 80 00 20 */ blr .global sndFXKeyOff sndFXKeyOff: @@ -73,7 +73,7 @@ sndFXKeyOff: /* 8039C280 003991E0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8039C284 003991E4 7C 08 03 A6 */ mtlr r0 /* 8039C288 003991E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8039C28C 003991EC 4E 80 00 20 */ blr +/* 8039C28C 003991EC 4E 80 00 20 */ blr .global sndFXStartEx sndFXStartEx: @@ -109,7 +109,7 @@ sndFXStartEx: /* 8039C304 00399264 83 81 00 10 */ lwz r28, 0x10(r1) /* 8039C308 00399268 7C 08 03 A6 */ mtlr r0 /* 8039C30C 0039926C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8039C310 00399270 4E 80 00 20 */ blr +/* 8039C310 00399270 4E 80 00 20 */ blr .global sndFXCheck sndFXCheck: @@ -129,7 +129,7 @@ lbl_8039C340: /* 8039C344 003992A4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8039C348 003992A8 7C 08 03 A6 */ mtlr r0 /* 8039C34C 003992AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8039C350 003992B0 4E 80 00 20 */ blr +/* 8039C350 003992B0 4E 80 00 20 */ blr .global sndVolume sndVolume: @@ -156,7 +156,7 @@ sndVolume: /* 8039C3A4 00399304 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8039C3A8 00399308 7C 08 03 A6 */ mtlr r0 /* 8039C3AC 0039930C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8039C3B0 00399310 4E 80 00 20 */ blr +/* 8039C3B0 00399310 4E 80 00 20 */ blr .global sndMasterVolume sndMasterVolume: @@ -198,7 +198,7 @@ lbl_8039C424: /* 8039C438 00399398 83 81 00 10 */ lwz r28, 0x10(r1) /* 8039C43C 0039939C 7C 08 03 A6 */ mtlr r0 /* 8039C440 003993A0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8039C444 003993A4 4E 80 00 20 */ blr +/* 8039C444 003993A4 4E 80 00 20 */ blr .global sndOutputMode sndOutputMode: @@ -268,7 +268,7 @@ lbl_8039C520: /* 8039C524 00399484 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8039C528 00399488 7C 08 03 A6 */ mtlr r0 /* 8039C52C 0039948C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8039C530 00399490 4E 80 00 20 */ blr +/* 8039C530 00399490 4E 80 00 20 */ blr .global sndSetAuxProcessingCallbacks sndSetAuxProcessingCallbacks: @@ -361,7 +361,7 @@ lbl_8039C658: /* 8039C67C 003995DC 80 01 00 34 */ lwz r0, 0x34(r1) /* 8039C680 003995E0 7C 08 03 A6 */ mtlr r0 /* 8039C684 003995E4 38 21 00 30 */ addi r1, r1, 0x30 -/* 8039C688 003995E8 4E 80 00 20 */ blr +/* 8039C688 003995E8 4E 80 00 20 */ blr .global synthActivateStudio synthActivateStudio: @@ -406,7 +406,7 @@ synthActivateStudio: /* 8039C724 00399684 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8039C728 00399688 7C 08 03 A6 */ mtlr r0 /* 8039C72C 0039968C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8039C730 00399690 4E 80 00 20 */ blr +/* 8039C730 00399690 4E 80 00 20 */ blr .global synthDeactivateStudio synthDeactivateStudio: @@ -473,7 +473,7 @@ lbl_8039C7B8: /* 8039C814 00399774 80 01 00 24 */ lwz r0, 0x24(r1) /* 8039C818 00399778 7C 08 03 A6 */ mtlr r0 /* 8039C81C 0039977C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8039C820 00399780 4E 80 00 20 */ blr +/* 8039C820 00399780 4E 80 00 20 */ blr .global synthAddStudioInput synthAddStudioInput: @@ -484,7 +484,7 @@ synthAddStudioInput: /* 8039C834 00399794 80 01 00 14 */ lwz r0, 0x14(r1) /* 8039C838 00399798 7C 08 03 A6 */ mtlr r0 /* 8039C83C 0039979C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8039C840 003997A0 4E 80 00 20 */ blr +/* 8039C840 003997A0 4E 80 00 20 */ blr .global synthRemoveStudioInput synthRemoveStudioInput: @@ -495,4 +495,4 @@ synthRemoveStudioInput: /* 8039C854 003997B4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8039C858 003997B8 7C 08 03 A6 */ mtlr r0 /* 8039C85C 003997BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8039C860 003997C0 4E 80 00 20 */ blr +/* 8039C860 003997C0 4E 80 00 20 */ blr diff --git a/asm/musyx/synth_vsamples.s b/asm/musyx/synth_vsamples.s index 15a7cf50..a6d7729e 100644 --- a/asm/musyx/synth_vsamples.s +++ b/asm/musyx/synth_vsamples.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text, "ax" +.section .text, "ax" .global vsInit vsInit: @@ -51,7 +51,7 @@ lbl_803A99EC: /* 803A9A7C 003A69DC 38 63 E3 10 */ addi r3, r3, vs@l /* 803A9A80 003A69E0 B0 03 09 48 */ sth r0, 0x948(r3) /* 803A9A84 003A69E4 90 03 09 4C */ stw r0, 0x94c(r3) -/* 803A9A88 003A69E8 4E 80 00 20 */ blr +/* 803A9A88 003A69E8 4E 80 00 20 */ blr .global vsSampleStartNotify vsSampleStartNotify: @@ -190,7 +190,7 @@ lbl_803A9C28: /* 803A9C6C 003A6BCC 38 84 00 18 */ addi r4, r4, 0x18 /* 803A9C70 003A6BD0 38 60 00 00 */ li r3, 0 /* 803A9C74 003A6BD4 7D 89 03 A6 */ mtctr r12 -/* 803A9C78 003A6BD8 4E 80 04 21 */ bctrl +/* 803A9C78 003A6BD8 4E 80 04 21 */ bctrl /* 803A9C7C 003A6BDC A0 1C 00 00 */ lhz r0, 0(r28) /* 803A9C80 003A6BE0 7F A3 EB 78 */ mr r3, r29 /* 803A9C84 003A6BE4 50 03 42 2E */ rlwimi r3, r0, 8, 8, 0x17 @@ -216,7 +216,7 @@ lbl_803A9CB4: /* 803A9CC4 003A6C24 83 81 00 10 */ lwz r28, 0x10(r1) /* 803A9CC8 003A6C28 7C 08 03 A6 */ mtlr r0 /* 803A9CCC 003A6C2C 38 21 00 20 */ addi r1, r1, 0x20 -/* 803A9CD0 003A6C30 4E 80 00 20 */ blr +/* 803A9CD0 003A6C30 4E 80 00 20 */ blr .global vsSampleEndNotify vsSampleEndNotify: @@ -247,7 +247,7 @@ vsSampleEndNotify: /* 803A9D34 003A6C94 38 84 00 18 */ addi r4, r4, 0x18 /* 803A9D38 003A6C98 38 60 00 02 */ li r3, 2 /* 803A9D3C 003A6C9C 7D 89 03 A6 */ mtctr r12 -/* 803A9D40 003A6CA0 4E 80 04 21 */ bctrl +/* 803A9D40 003A6CA0 4E 80 04 21 */ bctrl lbl_803A9D44: /* 803A9D44 003A6CA4 3C 60 80 56 */ lis r3, vs@ha /* 803A9D48 003A6CA8 38 A0 00 00 */ li r5, 0 @@ -263,4 +263,4 @@ lbl_803A9D64: /* 803A9D6C 003A6CCC 83 C1 00 08 */ lwz r30, 8(r1) /* 803A9D70 003A6CD0 7C 08 03 A6 */ mtlr r0 /* 803A9D74 003A6CD4 38 21 00 10 */ addi r1, r1, 0x10 -/* 803A9D78 003A6CD8 4E 80 00 20 */ blr +/* 803A9D78 003A6CD8 4E 80 00 20 */ blr diff --git a/asm/musyx/synthdata.s b/asm/musyx/synthdata.s index c799e660..0fba0e3c 100644 --- a/asm/musyx/synthdata.s +++ b/asm/musyx/synthdata.s @@ -31,7 +31,7 @@ dataMacSubTabmem: .global "key$487" "key$487": .skip 0xC - + .section .sbss .balign 4 "result$494": diff --git a/asm/musyx/synthvoice.s b/asm/musyx/synthvoice.s index 126ba28e..995054e9 100644 --- a/asm/musyx/synthvoice.s +++ b/asm/musyx/synthvoice.s @@ -40,8 +40,8 @@ voiceListInsert: .global voiceListRoot voiceListRoot: .skip 0x7 - -.section .text, "ax" + +.section .text, "ax" .global vidInit vidInit: @@ -109,7 +109,7 @@ lbl_803A7724: /* 803A7730 003A4690 42 00 FF 58 */ bdnz lbl_803A7688 /* 803A7734 003A4694 38 00 00 00 */ li r0, 0 /* 803A7738 003A4698 90 06 00 00 */ stw r0, 0(r6) -/* 803A773C 003A469C 4E 80 00 20 */ blr +/* 803A773C 003A469C 4E 80 00 20 */ blr .global vidRemoveVoiceReferences vidRemoveVoiceReferences: @@ -350,7 +350,7 @@ lbl_803A7A7C: /* 803A7A80 003A49E0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803A7A84 003A49E4 7C 08 03 A6 */ mtlr r0 /* 803A7A88 003A49E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 803A7A8C 003A49EC 4E 80 00 20 */ blr +/* 803A7A8C 003A49EC 4E 80 00 20 */ blr .global vidMakeRoot vidMakeRoot: @@ -358,7 +358,7 @@ vidMakeRoot: /* 803A7A94 003A49F4 90 03 00 FC */ stw r0, 0xfc(r3) /* 803A7A98 003A49F8 80 63 00 F8 */ lwz r3, 0xf8(r3) /* 803A7A9C 003A49FC 80 63 00 08 */ lwz r3, 8(r3) -/* 803A7AA0 003A4A00 4E 80 00 20 */ blr +/* 803A7AA0 003A4A00 4E 80 00 20 */ blr .global vidMakeNew vidMakeNew: @@ -400,7 +400,7 @@ lbl_803A7B10: /* 803A7B18 003A4A78 7C A9 2B 78 */ mr r9, r5 /* 803A7B1C 003A4A7C 40 82 00 0C */ bne lbl_803A7B28 /* 803A7B20 003A4A80 38 60 FF FF */ li r3, -1 -/* 803A7B24 003A4A84 4E 80 00 20 */ blr +/* 803A7B24 003A4A84 4E 80 00 20 */ blr lbl_803A7B28: /* 803A7B28 003A4A88 80 A5 00 00 */ lwz r5, 0(r5) /* 803A7B2C 003A4A8C 28 05 00 00 */ cmplwi r5, 0 @@ -437,10 +437,10 @@ lbl_803A7B88: /* 803A7B90 003A4AF0 91 23 00 F8 */ stw r9, 0xf8(r3) /* 803A7B94 003A4AF4 41 82 00 0C */ beq lbl_803A7BA0 /* 803A7B98 003A4AF8 7C C3 33 78 */ mr r3, r6 -/* 803A7B9C 003A4AFC 4E 80 00 20 */ blr +/* 803A7B9C 003A4AFC 4E 80 00 20 */ blr lbl_803A7BA0: /* 803A7BA0 003A4B00 80 63 00 F4 */ lwz r3, 0xf4(r3) -/* 803A7BA4 003A4B04 4E 80 00 20 */ blr +/* 803A7BA4 003A4B04 4E 80 00 20 */ blr .global vidGetInternalId vidGetInternalId: @@ -466,10 +466,10 @@ lbl_803A7BE0: /* 803A7BE0 003A4B40 28 04 00 00 */ cmplwi r4, 0 /* 803A7BE4 003A4B44 41 82 00 0C */ beq lbl_803A7BF0 /* 803A7BE8 003A4B48 80 64 00 0C */ lwz r3, 0xc(r4) -/* 803A7BEC 003A4B4C 4E 80 00 20 */ blr +/* 803A7BEC 003A4B4C 4E 80 00 20 */ blr lbl_803A7BF0: /* 803A7BF0 003A4B50 38 60 FF FF */ li r3, -1 -/* 803A7BF4 003A4B54 4E 80 00 20 */ blr +/* 803A7BF4 003A4B54 4E 80 00 20 */ blr .global voiceSetPriority voiceSetPriority: @@ -634,7 +634,7 @@ lbl_803A7E30: /* 803A7E34 003A4D94 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803A7E38 003A4D98 7C 08 03 A6 */ mtlr r0 /* 803A7E3C 003A4D9C 38 21 00 10 */ addi r1, r1, 0x10 -/* 803A7E40 003A4DA0 4E 80 00 20 */ blr +/* 803A7E40 003A4DA0 4E 80 00 20 */ blr .global voiceAllocateFind voiceAllocateFind: @@ -959,7 +959,7 @@ lbl_803A828C: /* 803A8294 003A51F4 80 01 00 34 */ lwz r0, 0x34(r1) /* 803A8298 003A51F8 7C 08 03 A6 */ mtlr r0 /* 803A829C 003A51FC 38 21 00 30 */ addi r1, r1, 0x30 -/* 803A82A0 003A5200 4E 80 00 20 */ blr +/* 803A82A0 003A5200 4E 80 00 20 */ blr .global voiceFree voiceFree: @@ -1086,7 +1086,7 @@ lbl_803A8448: /* 803A8458 003A53B8 83 C1 00 08 */ lwz r30, 8(r1) /* 803A845C 003A53BC 7C 08 03 A6 */ mtlr r0 /* 803A8460 003A53C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 803A8464 003A53C4 4E 80 00 20 */ blr +/* 803A8464 003A53C4 4E 80 00 20 */ blr .global synthInitAllocationAids synthInitAllocationAids: @@ -1266,7 +1266,7 @@ lbl_803A8658: /* 803A86F8 003A5658 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803A86FC 003A565C 83 C1 00 08 */ lwz r30, 8(r1) /* 803A8700 003A5660 38 21 00 10 */ addi r1, r1, 0x10 -/* 803A8704 003A5664 4E 80 00 20 */ blr +/* 803A8704 003A5664 4E 80 00 20 */ blr .global voiceBlock voiceBlock: @@ -1334,7 +1334,7 @@ lbl_803A87E4: /* 803A87F4 003A5754 83 A1 00 14 */ lwz r29, 0x14(r1) /* 803A87F8 003A5758 7C 08 03 A6 */ mtlr r0 /* 803A87FC 003A575C 38 21 00 20 */ addi r1, r1, 0x20 -/* 803A8800 003A5760 4E 80 00 20 */ blr +/* 803A8800 003A5760 4E 80 00 20 */ blr .global voiceUnblock voiceUnblock: @@ -1484,7 +1484,7 @@ lbl_803A8A00: /* 803A8A0C 003A596C 83 A1 00 14 */ lwz r29, 0x14(r1) /* 803A8A10 003A5970 7C 08 03 A6 */ mtlr r0 /* 803A8A14 003A5974 38 21 00 20 */ addi r1, r1, 0x20 -/* 803A8A18 003A5978 4E 80 00 20 */ blr +/* 803A8A18 003A5978 4E 80 00 20 */ blr .global voiceKill voiceKill: @@ -1641,7 +1641,7 @@ lbl_803A8C2C: /* 803A8C40 003A5BA0 83 A1 00 14 */ lwz r29, 0x14(r1) /* 803A8C44 003A5BA4 7C 08 03 A6 */ mtlr r0 /* 803A8C48 003A5BA8 38 21 00 20 */ addi r1, r1, 0x20 -/* 803A8C4C 003A5BAC 4E 80 00 20 */ blr +/* 803A8C4C 003A5BAC 4E 80 00 20 */ blr .global voiceKillSound voiceKillSound: @@ -1704,7 +1704,7 @@ lbl_803A8CFC: /* 803A8D04 003A5C64 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803A8D08 003A5C68 7C 08 03 A6 */ mtlr r0 /* 803A8D0C 003A5C6C 38 21 00 10 */ addi r1, r1, 0x10 -/* 803A8D10 003A5C70 4E 80 00 20 */ blr +/* 803A8D10 003A5C70 4E 80 00 20 */ blr .global synthKillVoicesByMacroReferences synthKillVoicesByMacroReferences: @@ -1808,7 +1808,7 @@ lbl_803A8E4C: /* 803A8E60 003A5DC0 80 01 00 24 */ lwz r0, 0x24(r1) /* 803A8E64 003A5DC4 7C 08 03 A6 */ mtlr r0 /* 803A8E68 003A5DC8 38 21 00 20 */ addi r1, r1, 0x20 -/* 803A8E6C 003A5DCC 4E 80 00 20 */ blr +/* 803A8E6C 003A5DCC 4E 80 00 20 */ blr .global voiceIsLastStarted voiceIsLastStarted: @@ -1829,7 +1829,7 @@ voiceIsLastStarted: /* 803A8EA8 003A5E08 7C 00 30 40 */ cmplw r0, r6 /* 803A8EAC 003A5E0C 40 82 00 30 */ bne lbl_803A8EDC /* 803A8EB0 003A5E10 38 60 00 01 */ li r3, 1 -/* 803A8EB4 003A5E14 4E 80 00 20 */ blr +/* 803A8EB4 003A5E14 4E 80 00 20 */ blr lbl_803A8EB8: /* 803A8EB8 003A5E18 3C 60 80 56 */ lis r3, synth_last_started@ha /* 803A8EBC 003A5E1C 54 04 25 36 */ rlwinm r4, r0, 4, 0x14, 0x1b @@ -1839,20 +1839,20 @@ lbl_803A8EB8: /* 803A8ECC 003A5E2C 7C 06 00 40 */ cmplw r6, r0 /* 803A8ED0 003A5E30 40 82 00 0C */ bne lbl_803A8EDC /* 803A8ED4 003A5E34 38 60 00 01 */ li r3, 1 -/* 803A8ED8 003A5E38 4E 80 00 20 */ blr +/* 803A8ED8 003A5E38 4E 80 00 20 */ blr lbl_803A8EDC: /* 803A8EDC 003A5E3C 38 60 00 00 */ li r3, 0 -/* 803A8EE0 003A5E40 4E 80 00 20 */ blr +/* 803A8EE0 003A5E40 4E 80 00 20 */ blr .global voiceSetLastStarted voiceSetLastStarted: /* 803A8EE4 003A5E44 80 83 00 F4 */ lwz r4, 0xf4(r3) /* 803A8EE8 003A5E48 3C 04 00 01 */ addis r0, r4, 1 /* 803A8EEC 003A5E4C 28 00 FF FF */ cmplwi r0, 0xffff -/* 803A8EF0 003A5E50 4D 82 00 20 */ beqlr +/* 803A8EF0 003A5E50 4D 82 00 20 */ beqlr /* 803A8EF4 003A5E54 88 A3 01 21 */ lbz r5, 0x121(r3) /* 803A8EF8 003A5E58 28 05 00 FF */ cmplwi r5, 0xff -/* 803A8EFC 003A5E5C 4D 82 00 20 */ beqlr +/* 803A8EFC 003A5E5C 4D 82 00 20 */ beqlr /* 803A8F00 003A5E60 88 03 01 22 */ lbz r0, 0x122(r3) /* 803A8F04 003A5E64 54 86 06 3E */ clrlwi r6, r4, 0x18 /* 803A8F08 003A5E68 28 00 00 FF */ cmplwi r0, 0xff @@ -1860,24 +1860,24 @@ voiceSetLastStarted: /* 803A8F10 003A5E70 3C 60 80 56 */ lis r3, synth_last_fxstarted@ha /* 803A8F14 003A5E74 38 63 E2 50 */ addi r3, r3, synth_last_fxstarted@l /* 803A8F18 003A5E78 7C C3 31 AE */ stbx r6, r3, r6 -/* 803A8F1C 003A5E7C 4E 80 00 20 */ blr +/* 803A8F1C 003A5E7C 4E 80 00 20 */ blr lbl_803A8F20: /* 803A8F20 003A5E80 3C 60 80 56 */ lis r3, synth_last_started@ha /* 803A8F24 003A5E84 54 04 25 36 */ rlwinm r4, r0, 4, 0x14, 0x1b /* 803A8F28 003A5E88 38 03 E2 90 */ addi r0, r3, synth_last_started@l /* 803A8F2C 003A5E8C 7C 60 22 14 */ add r3, r0, r4 /* 803A8F30 003A5E90 7C C3 29 AE */ stbx r6, r3, r5 -/* 803A8F34 003A5E94 4E 80 00 20 */ blr +/* 803A8F34 003A5E94 4E 80 00 20 */ blr .global voiceResetLastStarted voiceResetLastStarted: /* 803A8F38 003A5E98 80 83 00 F4 */ lwz r4, 0xf4(r3) /* 803A8F3C 003A5E9C 3C 04 00 01 */ addis r0, r4, 1 /* 803A8F40 003A5EA0 28 00 FF FF */ cmplwi r0, 0xffff -/* 803A8F44 003A5EA4 4D 82 00 20 */ beqlr +/* 803A8F44 003A5EA4 4D 82 00 20 */ beqlr /* 803A8F48 003A5EA8 88 A3 01 21 */ lbz r5, 0x121(r3) /* 803A8F4C 003A5EAC 28 05 00 FF */ cmplwi r5, 0xff -/* 803A8F50 003A5EB0 4D 82 00 20 */ beqlr +/* 803A8F50 003A5EB0 4D 82 00 20 */ beqlr /* 803A8F54 003A5EB4 88 03 01 22 */ lbz r0, 0x122(r3) /* 803A8F58 003A5EB8 54 86 06 3E */ clrlwi r6, r4, 0x18 /* 803A8F5C 003A5EBC 28 00 00 FF */ cmplwi r0, 0xff @@ -1886,10 +1886,10 @@ voiceResetLastStarted: /* 803A8F68 003A5EC8 38 63 E2 50 */ addi r3, r3, synth_last_fxstarted@l /* 803A8F6C 003A5ECC 7C 03 30 AE */ lbzx r0, r3, r6 /* 803A8F70 003A5ED0 7C 00 30 40 */ cmplw r0, r6 -/* 803A8F74 003A5ED4 4C 82 00 20 */ bnelr +/* 803A8F74 003A5ED4 4C 82 00 20 */ bnelr /* 803A8F78 003A5ED8 38 00 00 FF */ li r0, 0xff /* 803A8F7C 003A5EDC 7C 03 31 AE */ stbx r0, r3, r6 -/* 803A8F80 003A5EE0 4E 80 00 20 */ blr +/* 803A8F80 003A5EE0 4E 80 00 20 */ blr lbl_803A8F84: /* 803A8F84 003A5EE4 3C 60 80 56 */ lis r3, synth_last_started@ha /* 803A8F88 003A5EE8 54 04 25 36 */ rlwinm r4, r0, 4, 0x14, 0x1b @@ -1897,10 +1897,10 @@ lbl_803A8F84: /* 803A8F90 003A5EF0 7C 60 22 14 */ add r3, r0, r4 /* 803A8F94 003A5EF4 7C 03 28 AE */ lbzx r0, r3, r5 /* 803A8F98 003A5EF8 7C 06 00 40 */ cmplw r6, r0 -/* 803A8F9C 003A5EFC 4C 82 00 20 */ bnelr +/* 803A8F9C 003A5EFC 4C 82 00 20 */ bnelr /* 803A8FA0 003A5F00 38 00 00 FF */ li r0, 0xff /* 803A8FA4 003A5F04 7C 03 29 AE */ stbx r0, r3, r5 -/* 803A8FA8 003A5F08 4E 80 00 20 */ blr +/* 803A8FA8 003A5F08 4E 80 00 20 */ blr .global voiceInitLastStarted voiceInitLastStarted: @@ -1986,4 +1986,4 @@ lbl_803A9064: /* 803A90E0 003A6040 98 83 00 1F */ stb r4, 0x1f(r3) /* 803A90E4 003A6044 38 63 00 20 */ addi r3, r3, 0x20 /* 803A90E8 003A6048 42 00 FF 7C */ bdnz lbl_803A9064 -/* 803A90EC 003A604C 4E 80 00 20 */ blr +/* 803A90EC 003A604C 4E 80 00 20 */ blr diff --git a/asm/os/__ppc_eabi_init.s b/asm/os/__ppc_eabi_init.s index ad81ee64..2d229aed 100644 --- a/asm/os/__ppc_eabi_init.s +++ b/asm/os/__ppc_eabi_init.s @@ -11,7 +11,7 @@ __init_hardware: /* 80003364 00000364 48 0B 19 49 */ bl __OSPSInit /* 80003368 00000368 48 0B 32 8D */ bl __OSCacheInit /* 8000336C 0000036C 7F E8 03 A6 */ mtlr r31 -/* 80003370 00000370 4E 80 00 20 */ blr +/* 80003370 00000370 4E 80 00 20 */ blr .global __flush_cache __flush_cache: @@ -27,5 +27,5 @@ lbl_80003388: /* 80003394 00000394 30 A5 00 08 */ addic r5, r5, 8 /* 80003398 00000398 34 84 FF F8 */ addic. r4, r4, -8 /* 8000339C 0000039C 40 80 FF EC */ bge lbl_80003388 -/* 800033A0 000003A0 4C 00 01 2C */ isync -/* 800033A4 000003A4 4E 80 00 20 */ blr +/* 800033A0 000003A0 4C 00 01 2C */ isync +/* 800033A4 000003A4 4E 80 00 20 */ blr diff --git a/asm/os/__ppc_eabi_init_text.s b/asm/os/__ppc_eabi_init_text.s index dbaa08dd..3484b277 100644 --- a/asm/os/__ppc_eabi_init_text.s +++ b/asm/os/__ppc_eabi_init_text.s @@ -12,7 +12,7 @@ __init_user: /* 80385834 00382794 80 01 00 0C */ lwz r0, 0xc(r1) /* 80385838 00382798 38 21 00 08 */ addi r1, r1, 8 /* 8038583C 0038279C 7C 08 03 A6 */ mtlr r0 -/* 80385840 003827A0 4E 80 00 20 */ blr +/* 80385840 003827A0 4E 80 00 20 */ blr .endif .global __init_cpp @@ -31,7 +31,7 @@ lbl_80385868: /* 80385868 003827C8 48 00 00 10 */ b lbl_80385878 lbl_8038586C: /* 8038586C 003827CC 7D 88 03 A6 */ mtlr r12 -/* 80385870 003827D0 4E 80 00 21 */ blrl +/* 80385870 003827D0 4E 80 00 21 */ blrl /* 80385874 003827D4 3B FF 00 04 */ addi r31, r31, 4 lbl_80385878: /* 80385878 003827D8 81 9F 00 00 */ lwz r12, 0(r31) @@ -41,7 +41,7 @@ lbl_80385878: /* 80385888 003827E8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8038588C 003827EC 38 21 00 10 */ addi r1, r1, 0x10 /* 80385890 003827F0 7C 08 03 A6 */ mtlr r0 -/* 80385894 003827F4 4E 80 00 20 */ blr +/* 80385894 003827F4 4E 80 00 20 */ blr .global _ExitProcess _ExitProcess: @@ -52,4 +52,4 @@ _ExitProcess: /* 803858A8 00382808 80 01 00 0C */ lwz r0, 0xc(r1) /* 803858AC 0038280C 38 21 00 08 */ addi r1, r1, 8 /* 803858B0 00382810 7C 08 03 A6 */ mtlr r0 -/* 803858B4 00382814 4E 80 00 20 */ blr +/* 803858B4 00382814 4E 80 00 20 */ blr diff --git a/asm/rodata.s b/asm/rodata.s index b0492c51..e91bbcc0 100644 --- a/asm/rodata.s +++ b/asm/rodata.s @@ -4,1639 +4,11153 @@ .global lbl_803CCB18 lbl_803CCB18: - .incbin "baserom.dol", 0x3C9B18, 0x20 + # ROM: 0x3C9B18 + .4byte 0x803CCB50 + .4byte 0x803CCB62 + .4byte 0x803CCB62 + .4byte 0x803CCB79 + .4byte 0x803CCB8C + .4byte 0x803CCBA4 + .4byte 0x803CCBBB + .4byte 0x803CCBD3 + .global lbl_803CCB38 lbl_803CCB38: - .incbin "baserom.dol", 0x3C9B38, 0x18 + # ROM: 0x3C9B38 + .4byte 0x803CCBE6 + .4byte 0x803CCBFE + .4byte 0x803CCC15 + .4byte 0x803CCC2B + .4byte 0x803CCC44 + .4byte 0x803CCC5C + .global lbl_803CCB50 lbl_803CCB50: - .incbin "baserom.dol", 0x3C9B50, 0x180 + # ROM: 0x3C9B50 + .asciz "Video/wingame.thp" + .byte 0x56, 0x69 + .asciz "deo/wingame_best.thp" + .byte 0x56, 0x69, 0x64 + .asciz "eo/losegame.thp" + .asciz "Video/05_tallonText.thp" + .asciz "Video/AfterCredits.thp" + .byte 0x56 + .asciz "ideo/SpecialEnding.thp" + .byte 0x56 + .asciz "ideo/creditBG.thp" + .byte 0x56, 0x69 + .asciz "deo/win_bad_begin.thp" + .byte 0x56, 0x69 + .asciz "deo/win_bad_loop.thp" + .byte 0x56, 0x69, 0x64 + .asciz "eo/win_bad_end.thp" + .byte 0x56 + .asciz "ideo/win_good_begin.thp" + .asciz "Video/win_good_loop.thp" + .asciz "Video/win_good_end.thp" + .byte 0x41 + .asciz "udio/ending3.rsf" + .byte 0x41, 0x75, 0x64 + .asciz "io/samusjak.rsf" + .asciz "AutoSave" + .byte 0x3F, 0x3F, 0x28 + .4byte 0x3F3F2900 + .asciz "Credits" + .asciz " %d%%\n" + .byte 0x20 + .asciz "%02d:%02d\n" + .byte 0x50 + .asciz "layMovie" + .balign 4 + .global lbl_803CCCD0 lbl_803CCCD0: - .incbin "baserom.dol", 0x3C9CD0, 0xC + # ROM: 0x3C9CD0 + .4byte 0x803CCCDC + .4byte 0x803CCCEE + .4byte 0x803CCCFD + .global lbl_803CCCDC lbl_803CCCDC: - .incbin "baserom.dol", 0x3C9CDC, 0x44 + # ROM: 0x3C9CDC + .asciz "TXTR_NintendoLogo" + .byte 0x54, 0x58 + .asciz "TR_RetroLogo" + .byte 0x54, 0x58, 0x54 + .asciz "R_DolbyLogo" + .asciz "??(??)" + .byte 0x53 + .asciz "plashScreen" + .global lbl_803CCD20 lbl_803CCD20: - .incbin "baserom.dol", 0x3C9D20, 0x58 + # ROM: 0x3C9D20 + .asciz "??(??)" + .balign 4 + .asciz "root" + .byte 0x43, 0x68, 0x61 + .asciz "racter " + .asciz " has invalid initial animation, so defaulting to first.\n" + .balign 4 + .4byte 0 + .global lbl_803CCD78 lbl_803CCD78: - .incbin "baserom.dol", 0x3C9D78, 0x8 + # ROM: 0x3C9D78 + .asciz "??(??)" + .balign 4 + .global lbl_803CCD80 lbl_803CCD80: - .incbin "baserom.dol", 0x3C9D80, 0x8 + # ROM: 0x3C9D80 + .asciz "??(??)" + .balign 4 + .global lbl_803CCD88 lbl_803CCD88: - .incbin "baserom.dol", 0x3C9D88, 0x98 + # ROM: 0x3C9D88 + .asciz "GunRes" + .byte 0x3F + .asciz "?(??)" + .byte 0x50, 0x6C + .asciz "ayerRes" + .asciz "Particle" + .byte 0x50, 0x6C, 0x61 + .4byte 0x79657200 + .asciz "CameraBob" + .byte 0x42, 0x61 + .4byte 0x6C6C0050 + .asciz "layerGun" + .byte 0x54, 0x61, 0x72 + .asciz "geting" + .byte 0x47 + .4byte 0x616D6500 + .asciz "GuiColors" + .byte 0x41, 0x75 + .asciz "toMapper" + .byte 0x47, 0x75, 0x69 + .4byte 0x00506C61 + .asciz "yerControls" + .asciz "PlayerControls2" + .asciz "SlideShow" + .balign 4 + .4byte 0 + .global lbl_803CCE20 lbl_803CCE20: - .incbin "baserom.dol", 0x3C9E20, 0x18 + # ROM: 0x3C9E20 + .asciz "??(??)" + .byte 0x56 + .asciz "isorAcid" + .balign 4 + .4byte 0 + .global lbl_803CCE38 lbl_803CCE38: - .incbin "baserom.dol", 0x3C9E38, 0xC + # ROM: 0x3C9E38 + .4byte 0xBA83126F + .4byte 0 + .4byte 0x3A83126F + .global lbl_803CCE44 lbl_803CCE44: - .incbin "baserom.dol", 0x3C9E44, 0x10 + # ROM: 0x3C9E44 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000001 + .global lbl_803CCE54 lbl_803CCE54: - .incbin "baserom.dol", 0x3C9E54, 0x10 + # ROM: 0x3C9E54 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000003 + .global lbl_803CCE64 lbl_803CCE64: - .incbin "baserom.dol", 0x3C9E64, 0x10 + # ROM: 0x3C9E64 + .4byte 0x0000000B + .4byte 0x0000000E + .4byte 0x0000001C + .4byte 0x00000008 + .global lbl_803CCE74 lbl_803CCE74: - .incbin "baserom.dol", 0x3C9E74, 0x10 + # ROM: 0x3C9E74 + .4byte 0x00000013 + .4byte 0x00000014 + .4byte 0x00000015 + .4byte 0x00000016 + .global lbl_803CCE84 lbl_803CCE84: - .incbin "baserom.dol", 0x3C9E84, 0x14 + # ROM: 0x3C9E84 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0 + .global lbl_803CCE98 lbl_803CCE98: - .incbin "baserom.dol", 0x3C9E98, 0x18 + # ROM: 0x3C9E98 + .4byte 0x00000009 + .4byte 0x00000001 + .4byte 0x0000000D + .4byte 0x00000001 + .4byte 0x000000FF + .4byte 0 + .global lbl_803CCEB0 lbl_803CCEB0: - .incbin "baserom.dol", 0x3C9EB0, 0x30 + # ROM: 0x3C9EB0 + .asciz "GBSE_SDK" + .byte 0x3F, 0x3F, 0x28 + .4byte 0x3F3F2900 + .asciz "GunLite" + .asciz "elbow" + .byte 0x57, 0x68 + .asciz "ole Body" + .balign 4 + .4byte 0 + .global lbl_803CCEE0 lbl_803CCEE0: - .incbin "baserom.dol", 0x3C9EE0, 0x38 + # ROM: 0x3C9EE0 + .asciz "??(??)" + .byte 0x50 + .asciz "roj col resp" + .byte 0x00, 0x4F, 0x62 + .asciz "ject list full!" + .asciz "DefaultShadow" + .balign 4 + .global lbl_803CCF18 lbl_803CCF18: - .incbin "baserom.dol", 0x3C9F18, 0x8 + # ROM: 0x3C9F18 + .asciz "??(??)" + .balign 4 + .global lbl_803CCF20 lbl_803CCF20: - .incbin "baserom.dol", 0x3C9F20, 0x8 + # ROM: 0x3C9F20 + .asciz "??(??)" + .balign 4 + .global lbl_803CCF28 lbl_803CCF28: - .incbin "baserom.dol", 0x3C9F28, 0x40 + # ROM: 0x3C9F28 + .asciz "Msg[%3d] %s" + .asciz "-------------------------" + .byte 0x44, 0x72 + .asciz "aw[%3d] %s" + .byte 0x3F + .asciz "?(??)" + .balign 4 + .4byte 0 + .global lbl_803CCF68 lbl_803CCF68: - .incbin "baserom.dol", 0x3C9F68, 0x8 + # ROM: 0x3C9F68 + .asciz "??(??)" + .balign 4 + .global lbl_803CCF70 lbl_803CCF70: - .incbin "baserom.dol", 0x3C9F70, 0x8 + # ROM: 0x3C9F70 + .4byte 0x003F3F28 + .4byte 0x3F3F2900 + .global lbl_803CCF78 lbl_803CCF78: - .incbin "baserom.dol", 0x3C9F78, 0x18 + # ROM: 0x3C9F78 + .asciz "??(??)" + .byte 0x45 + .asciz "xplodePLight_" + .balign 4 + .global lbl_803CCF90 lbl_803CCF90: - .incbin "baserom.dol", 0x3C9F90, 0x1C + # ROM: 0x3C9F90 + .asciz "??(??)" + .balign 4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .global lbl_803CCFAC lbl_803CCFAC: - .incbin "baserom.dol", 0x3C9FAC, 0xC + # ROM: 0x3C9FAC + .asciz "??(??)" + .balign 4 + .4byte 0 + .global lbl_803CCFB8 lbl_803CCFB8: - .incbin "baserom.dol", 0x3C9FB8, 0x10 + # ROM: 0x3C9FB8 + .asciz "FRME_BaseHud" + .balign 4 + .global lbl_803CCFC8 lbl_803CCFC8: - .incbin "baserom.dol", 0x3C9FC8, 0x5C + # ROM: 0x3C9FC8 + .asciz "FRME_Helmet" + .asciz "FRME_CombatHud" + .balign 4 + .asciz "FRME_XRayHudNew" + .asciz "FRME_ScanHud" + .balign 4 + .asciz "FRME_ThermalHud" + .asciz "FRME_BallHud" + .balign 4 + .global lbl_803CD024 lbl_803CD024: - .incbin "baserom.dol", 0x3CA024, 0x9C + # ROM: 0x3CA024 + .asciz "basewidget_pivot" + .balign 4 + .asciz "Model_AutoMapper" + .balign 4 + .asciz "textpane_counter" + .balign 4 + .asciz "model_videoband" + .asciz "textpane_message" + .balign 4 + .4byte 0x803CD0C0 + .4byte 0x803CD0D4 + .4byte 0x803CD0E8 + .4byte 0x803CD0FC + .4byte 0x803CD110 + .4byte 0x803CD124 + .4byte 0x803CD138 + .4byte 0x803CD14C + .4byte 0x803CD160 + .4byte 0x803CD174 + .4byte 0x803CD188 + .4byte 0x803CD19C + .4byte 0x803CD1B0 + .4byte 0x803CD1C4 + .4byte 0x803CD1D8 + .global lbl_803CD0C0 lbl_803CD0C0: - .incbin "baserom.dol", 0x3CA0C0, 0x190 + # ROM: 0x3CA0C0 + .asciz " Radar" + .asciz " Lag" + .asciz " Lights" + .asciz " Targeting" + .asciz " Damage" + .asciz " FrameGlue" + .asciz " BaseFrame" + .asciz " EnergyGroup" + .asciz " ThreatGroup" + .asciz " MissileGroup" + .asciz " FreeLookGroup" + .asciz " HelmetGroup" + .asciz " DecoGroup" + .asciz " CamDebug" + .asciz " Total" + .asciz "%02d:%02d:%02d" + .byte 0x3F + .asciz "?(??)" + .byte 0x44, 0x61 + .asciz "mageSpotLight" + .byte 0x42, 0x61 + .asciz "seWidget_Pivot" + .byte 0x62 + .asciz "asewidget_message" + .byte 0x6D, 0x6F + .asciz "del_abutton" + .asciz "%s%d" + .balign 4 + .4byte 0 + .global lbl_803CD250 lbl_803CD250: - .incbin "baserom.dol", 0x3CA250, 0x38 + # ROM: 0x3CA250 + .asciz "??(??)" + .byte 0x4D + .asciz "eta-animation name unavailable in Release mode." + .global lbl_803CD288 lbl_803CD288: - .incbin "baserom.dol", 0x3CA288, 0x8 + # ROM: 0x3CA288 + .asciz "??(??)" + .balign 4 + .global lbl_803CD290 lbl_803CD290: - .incbin "baserom.dol", 0x3CA290, 0x14 + # ROM: 0x3CA290 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .global lbl_803CD2A4 lbl_803CD2A4: - .incbin "baserom.dol", 0x3CA2A4, 0x14 + # ROM: 0x3CA2A4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .global lbl_803CD2B8 lbl_803CD2B8: - .incbin "baserom.dol", 0x3CA2B8, 0x10 + # ROM: 0x3CA2B8 + .4byte 0x00260069 + .4byte 0x006D0061 + .4byte 0x00670065 + .4byte 0x003D0000 + .global lbl_803CD2C8 lbl_803CD2C8: - .incbin "baserom.dol", 0x3CA2C8, 0x10 + # ROM: 0x3CA2C8 + .4byte 0x00260069 + .4byte 0x006D0061 + .4byte 0x00670065 + .4byte 0x003D0000 + .global lbl_803CD2D8 lbl_803CD2D8: - .incbin "baserom.dol", 0x3CA2D8, 0x310 + # ROM: 0x3CA2D8 + .asciz "basewidget_pivot" + .byte 0x62, 0x61, 0x73 + .asciz "ewidget_bgframe" + .asciz "basewidget_leftside" + .asciz "basewidget_leftlog" + .byte 0x74 + .asciz "ablegroup_leftlog" + .byte 0x62, 0x61 + .asciz "sewidget_leftguages" + .asciz "model_lefthighlight" + .asciz "basewidget_rightside" + .byte 0x62, 0x61, 0x73 + .asciz "ewidget_rightlog" + .byte 0x74, 0x61, 0x62 + .asciz "legroup_rightlog" + .byte 0x62, 0x61, 0x73 + .asciz "ewidget_rightguages" + .asciz "model_righthighlight" + .byte 0x6D, 0x6F, 0x64 + .asciz "el_textarrowtop" + .asciz "model_textarrowbottom" + .byte 0x6D, 0x6F + .asciz "del_scrollleftup" + .byte 0x6D, 0x6F, 0x64 + .asciz "el_scrollleftdown" + .byte 0x6D, 0x6F + .asciz "del_scrollrightup" + .byte 0x6D, 0x6F + .asciz "del_scrollrightdown" + .asciz "textpane_title" + .byte 0x74 + .asciz "extpane_body" + .byte 0x62, 0x61, 0x73 + .asciz "ewidget_yicon" + .byte 0x6D, 0x6F + .asciz "del_textalpha" + .byte 0x74, 0x65 + .asciz "xtpane_yicon" + .byte 0x74, 0x65, 0x78 + .asciz "tpane_ytext" + .asciz "%8.8X" + .byte 0x73, 0x6C + .asciz "idergroup_slider" + .byte 0x74, 0x61, 0x62 + .asciz "legroup_double" + .byte 0x74 + .asciz "ablegroup_triple" + .byte 0x74, 0x65, 0x78 + .asciz "tpane_title%d" + .byte 0x6D, 0x6F + .asciz "del_title%d" + .asciz "model_righttitledeco%d" + .byte 0x74 + .asciz "extpane_category%d" + .byte 0x6D + .asciz "odel_category%d" + .asciz "??(??)" + .byte 0x74 + .asciz "extpane_l1" + .byte 0x74 + .asciz "extpane_r" + .byte 0x74, 0x65 + .asciz "xtpane_a" + .byte 0x74, 0x65, 0x78 + .asciz "tpane_b" + .asciz "textpane_return" + .asciz "textpane_next" + .byte 0x74, 0x65 + .asciz "xtpane_back" + .asciz "basewidget_deco" + .asciz "STRG_PauseScreen" + .byte 0x46, 0x52, 0x4D + .asciz "E_PauseScreenInstructions" + .byte 0x46, 0x52 + .asciz "ME_PauseScreen" + .balign 4 + .global lbl_803CD5E8 lbl_803CD5E8: - .incbin "baserom.dol", 0x3CA5E8, 0x10 + # ROM: 0x3CA5E8 + .asciz "Whole Body" + .balign 4 + .4byte 0 + .global lbl_803CD5F8 lbl_803CD5F8: - .incbin "baserom.dol", 0x3CA5F8, 0x8 + # ROM: 0x3CA5F8 + .asciz "??(??)" + .balign 4 + .global lbl_803CD600 lbl_803CD600: - .incbin "baserom.dol", 0x3CA600, 0x28 + # ROM: 0x3CA600 + .asciz "??(??)" + .byte 0x6C + .asciz "ockon_target_LCTR" + .byte 0x44, 0x65 + .4byte 0x61640053 + .asciz "tart" + .balign 4 + .global lbl_803CD628 lbl_803CD628: - .incbin "baserom.dol", 0x3CA628, 0x8 + # ROM: 0x3CA628 + .asciz "??(??)" + .balign 4 + .global lbl_803CD630 lbl_803CD630: - .incbin "baserom.dol", 0x3CA630, 0x10 + # ROM: 0x3CA630 + .4byte 0x00000009 + .4byte 0x00000002 + .4byte 0x000000FF + .4byte 0 + .global lbl_803CD640 lbl_803CD640: - .incbin "baserom.dol", 0x3CA640, 0x2C + # ROM: 0x3CA640 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x01010102 + .4byte 0x01020201 + .4byte 0x01020201 + .4byte 0x02010102 + .4byte 0x01020201 + .4byte 0x02010202 + .4byte 0x02020000 + .global lbl_803CD66C lbl_803CD66C: - .incbin "baserom.dol", 0x3CA66C, 0xC + # ROM: 0x3CA66C + .asciz "??(??)" + .balign 4 + .4byte 0 + .global lbl_803CD678 lbl_803CD678: - .incbin "baserom.dol", 0x3CA678, 0x18 + # ROM: 0x3CA678 + .asciz "??(??)" + .byte 0x42 + .asciz "all Camera" + .balign 4 + .4byte 0 + .global lbl_803CD690 lbl_803CD690: - .incbin "baserom.dol", 0x3CA690, 0x18 + # ROM: 0x3CA690 + .asciz "??(??)" + .byte 0x45 + .asciz "ffectPLight_" + .balign 4 + .global lbl_803CD6A8 lbl_803CD6A8: - .incbin "baserom.dol", 0x3CA6A8, 0x18 + # ROM: 0x3CA6A8 + .asciz "??(??)" + .byte 0x42 + .asciz "ombPLight_" + .byte 0x42 + .4byte 0x6F6D6200 + .global lbl_803CD6C0 lbl_803CD6C0: - .incbin "baserom.dol", 0x3CA6C0, 0xA4 + # ROM: 0x3CA6C0 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x000000FA + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000008 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x0000000E + .4byte 0x00000001 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .global lbl_803CD764 lbl_803CD764: - .incbin "baserom.dol", 0x3CA764, 0x14 + # ROM: 0x3CA764 + .4byte 0x00000005 + .4byte 0x0000000A + .4byte 0x0000000A + .4byte 0x0000000A + .4byte 0x00000001 + .global lbl_803CD778 lbl_803CD778: - .incbin "baserom.dol", 0x3CA778, 0x14 + # ROM: 0x3CA778 + .4byte 0x3E4CCCCD + .4byte 0x3DCCCCCD + .4byte 0x3E4CCCCD + .4byte 0x3E4CCCCD + .4byte 0x3F800000 + .global lbl_803CD78C lbl_803CD78C: - .incbin "baserom.dol", 0x3CA78C, 0x34 + # ROM: 0x3CA78C + .asciz "CombatVisor" + .asciz "XRayVisor" + .byte 0x53, 0x63 + .asciz "anVisor" + .asciz "ThermalVisor" + .byte 0x3F, 0x3F, 0x28 + .4byte 0x3F3F2900 + .global lbl_803CD7C0 lbl_803CD7C0: - .incbin "baserom.dol", 0x3CA7C0, 0x18 + # ROM: 0x3CA7C0 + .asciz "L_eye" + .byte 0x52, 0x5F + .4byte 0x65796500 + .asciz "??(??)" + .balign 4 + .4byte 0 + .global lbl_803CD7D8 lbl_803CD7D8: - .incbin "baserom.dol", 0x3CA7D8, 0x14 + # ROM: 0x3CA7D8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .global lbl_803CD7EC lbl_803CD7EC: - .incbin "baserom.dol", 0x3CA7EC, 0x10 + # ROM: 0x3CA7EC + .4byte 0x00260069 + .4byte 0x006D0061 + .4byte 0x00670065 + .4byte 0x003D0000 + .global lbl_803CD7FC lbl_803CD7FC: - .incbin "baserom.dol", 0x3CA7FC, 0x10 + # ROM: 0x3CA7FC + .4byte 0x00260069 + .4byte 0x006D0061 + .4byte 0x00670065 + .4byte 0x003D0000 + .global lbl_803CD80C lbl_803CD80C: - .incbin "baserom.dol", 0x3CA80C, 0x154 + # ROM: 0x3CA80C + .asciz "FRME_MapScreen" + .byte 0x3F + .asciz "?(??)" + .byte 0x74, 0x65 + .asciz "xtpane_left" + .asciz "textpane_yicon" + .byte 0x74 + .asciz "extpane_hint" + .byte 0x74, 0x65, 0x78 + .asciz "tpane_instructions" + .byte 0x74 + .asciz "extpane_instructions1" + .byte 0x74, 0x65 + .asciz "xtpane_instructions2" + .byte 0x74, 0x65, 0x78 + .asciz "tpane_mapLegend" + .asciz "basewidget_leftPane" + .asciz "basewidget_yButtonPane" + .byte 0x62 + .asciz "asewidget_bottomPane" + .byte 0x74, 0x65, 0x78 + .asciz "tpane_areaname" + .byte 0x74 + .asciz "extpane_right1" + .byte 0x25 + .asciz "8.8X" + .byte 0x74, 0x65, 0x78 + .asciz "tpane_right" + .asciz "SI,0.6,1.0,%8.8X" + .byte 0x4D, 0x41, 0x50 + .asciz "U_MapUniverse" + .byte 0x43, 0x4D + .asciz "DL_MiniMapSamus" + .asciz "TXTR_HintBeacon" + .global lbl_803CD960 lbl_803CD960: - .incbin "baserom.dol", 0x3CA960, 0x8 + # ROM: 0x3CA960 + .asciz "??(??)" + .balign 4 + .global lbl_803CD968 lbl_803CD968: - .incbin "baserom.dol", 0x3CA968, 0x508 + # ROM: 0x3CA968 + .asciz "Patrol" + .byte 0x46 + .asciz "ollowPattern" + .byte 0x44, 0x65, 0x61 + .4byte 0x64005061 + .asciz "thFind" + .byte 0x53 + .asciz "tart" + .byte 0x53, 0x65, 0x6C + .asciz "ectTarget" + .byte 0x54, 0x61 + .asciz "rgetPatrol" + .byte 0x54 + .asciz "argetPlayer" + .asciz "TargetCover" + .asciz "Halt" + .byte 0x57, 0x61, 0x6C + .4byte 0x6B005275 + .4byte 0x6E004765 + .asciz "nerate" + .byte 0x44 + .asciz "eactivate" + .byte 0x41, 0x74 + .asciz "tack" + .byte 0x4C, 0x6F, 0x6F + .asciz "pedAttack" + .byte 0x4A, 0x75 + .asciz "mpBack" + .byte 0x44 + .asciz "oubleSnap" + .byte 0x53, 0x68 + .asciz "uffle" + .byte 0x54, 0x75 + .asciz "rnAround" + .byte 0x53, 0x6B, 0x69 + .4byte 0x64004163 + .asciz "tive" + .byte 0x49, 0x6E, 0x41 + .asciz "ctive" + .byte 0x43, 0x6F + .asciz "verAttack" + .byte 0x43, 0x72 + .asciz "ouch" + .byte 0x46, 0x61, 0x64 + .4byte 0x65496E00 + .asciz "FadeOut" + .asciz "GetUp" + .byte 0x54, 0x61 + .4byte 0x756E7400 + .asciz "Suck" + .byte 0x46, 0x6C, 0x65 + .4byte 0x65004C75 + .4byte 0x726B0050 + .asciz "rojectileAttack" + .asciz "Flinch" + .byte 0x48 + .asciz "urled" + .byte 0x54, 0x65 + .asciz "legraphAttack" + .byte 0x4A, 0x75 + .4byte 0x6D700045 + .asciz "xplode" + .byte 0x44 + .asciz "odge" + .byte 0x52, 0x65, 0x74 + .asciz "reat" + .byte 0x43, 0x6F, 0x76 + .4byte 0x65720041 + .asciz "pproach" + .asciz "WallHang" + .byte 0x57, 0x61, 0x6C + .asciz "lDetach" + .asciz "Enraged" + .asciz "SpecialAttack" + .byte 0x47, 0x72 + .asciz "owth" + .byte 0x46, 0x61, 0x69 + .4byte 0x6E74004C + .4byte 0x616E6400 + .asciz "Bounce" + .byte 0x50 + .asciz "athFindEx" + .byte 0x44, 0x69 + .4byte 0x7A7A7900 + .asciz "CallForBackup" + .byte 0x42, 0x75 + .asciz "lbAttack" + .byte 0x50, 0x6F, 0x64 + .asciz "Attack" + .byte 0x49 + .asciz "nAttackPosition" + .asciz "Leash" + .byte 0x4F, 0x66 + .asciz "fLine" + .byte 0x41, 0x74 + .asciz "tacked" + .byte 0x50 + .asciz "athShagged" + .byte 0x50 + .asciz "athOver" + .asciz "PathFound" + .byte 0x54, 0x6F + .asciz "oClose" + .byte 0x49 + .asciz "nRange" + .byte 0x49 + .asciz "nMaxRange" + .byte 0x49, 0x6E + .asciz "DetectionRange" + .byte 0x53 + .asciz "potPlayer" + .byte 0x50, 0x6C + .asciz "ayerSpot" + .byte 0x50, 0x61, 0x74 + .asciz "ternOver" + .byte 0x50, 0x61, 0x74 + .asciz "ternShagged" + .asciz "HasAttackPattern" + .byte 0x48, 0x61, 0x73 + .asciz "PatrolPath" + .byte 0x48 + .asciz "asRetreatPattern" + .byte 0x44, 0x65, 0x6C + .4byte 0x61790052 + .asciz "andomDelay" + .byte 0x46 + .asciz "ixedDelay" + .byte 0x44, 0x65 + .asciz "fault" + .byte 0x41, 0x6E + .asciz "imOver" + .byte 0x53 + .asciz "houldAttack" + .asciz "ShouldDoubleSnap" + .byte 0x49, 0x6E, 0x50 + .asciz "osition" + .asciz "ShouldTurn" + .byte 0x48 + .asciz "itSomething" + .asciz "ShouldJumpBack" + .byte 0x53 + .asciz "tuck" + .byte 0x4E, 0x6F, 0x50 + .asciz "athNodes" + .byte 0x4C, 0x61, 0x6E + .4byte 0x64656400 + .asciz "HearShot" + .byte 0x48, 0x65, 0x61 + .asciz "rPlayer" + .asciz "CoverCheck" + .byte 0x43 + .asciz "overFind" + .byte 0x43, 0x6F, 0x76 + .asciz "erBlown" + .asciz "CoverNearlyBlown" + .byte 0x43, 0x6F, 0x76 + .asciz "eringFire" + .byte 0x47, 0x6F + .4byte 0x74557000 + .asciz "LineOfSight" + .asciz "AggressionCheck" + .asciz "AttackOver" + .byte 0x53 + .asciz "houldTaunt" + .byte 0x49 + .asciz "nside" + .byte 0x53, 0x68 + .asciz "ouldFire" + .byte 0x53, 0x68, 0x6F + .asciz "uldFlinch" + .byte 0x50, 0x61 + .asciz "trolPathOver" + .byte 0x53, 0x68, 0x6F + .asciz "uldDodge" + .byte 0x53, 0x68, 0x6F + .asciz "uldRetreat" + .byte 0x53 + .asciz "houldCrouch" + .asciz "ShouldMove" + .byte 0x53 + .asciz "hotAt" + .byte 0x48, 0x61 + .asciz "sTargetingPoint" + .asciz "ShouldWallHang" + .byte 0x53 + .asciz "etAIStage" + .byte 0x41, 0x49 + .asciz "Stage" + .byte 0x53, 0x74 + .asciz "artAttack" + .byte 0x42, 0x72 + .asciz "eakAttack" + .byte 0x53, 0x68 + .asciz "ouldStrafe" + .byte 0x53 + .asciz "houldSpecialAttack" + .byte 0x4C + .asciz "ostInterest" + .asciz "CodeTrigger" + .asciz "BounceFind" + .byte 0x52 + .asciz "andom" + .byte 0x46, 0x69 + .asciz "xedRandom" + .byte 0x49, 0x73 + .asciz "Dizzy" + .byte 0x53, 0x68 + .asciz "ouldCallForBackup" + .byte 0x3F, 0x3F + .asciz "(??)" + .balign 4 + .4byte 0 + .global lbl_803CDE70 lbl_803CDE70: - .incbin "baserom.dol", 0x3CAE70, 0x8 + # ROM: 0x3CAE70 + .asciz "??(??)" + .balign 4 + .global lbl_803CDE78 lbl_803CDE78: - .incbin "baserom.dol", 0x3CAE78, 0x8 + # ROM: 0x3CAE78 + .asciz "??(??)" + .balign 4 + .global lbl_803CDE80 lbl_803CDE80: - .incbin "baserom.dol", 0x3CAE80, 0x8 + # ROM: 0x3CAE80 + .asciz "??(??)" + .balign 4 + .global lbl_803CDE88 lbl_803CDE88: - .incbin "baserom.dol", 0x3CAE88, 0x18 + # ROM: 0x3CAE88 + .asciz "??(??)" + .byte 0x50 + .asciz "articleLight" + .balign 4 + .global lbl_803CDEA0 lbl_803CDEA0: - .incbin "baserom.dol", 0x3CAEA0, 0x20 + # ROM: 0x3CAEA0 + .asciz "??(??)" + .byte 0x4E + .asciz "OT_A_VALID_LOCATOR" + .balign 4 + .4byte 0 + .global lbl_803CDEC0 lbl_803CDEC0: - .incbin "baserom.dol", 0x3CAEC0, 0x14 + # ROM: 0x3CAEC0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .global lbl_803CDED4 lbl_803CDED4: - .incbin "baserom.dol", 0x3CAED4, 0x14 + # ROM: 0x3CAED4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .global lbl_803CDEE8 lbl_803CDEE8: - .incbin "baserom.dol", 0x3CAEE8, 0x110 + # ROM: 0x3CAEE8 + .asciz "CMDL_Crosshairs" + .asciz "CMDL_OrbitZone" + .balign 4 + .asciz "CMDL_Seeker" + .asciz "CMDL_LockConfirm" + .balign 4 + .asciz "CMDL_TargetFlower" + .balign 4 + .asciz "CMDL_MissileBracket" + .asciz "CMDL_ChargeGauge" + .balign 4 + .asciz "CMDL_ChargeTickFirst" + .balign 4 + .asciz "CMDL_BeamSquare" + .asciz "CMDL_InnerBeamIcon" + .balign 4 + .asciz "CMDL_LockFire" + .balign 4 + .asciz "CMDL_LockDagger0" + .balign 4 + .asciz "CMDL_Grapple" + .balign 4 + .asciz "CMDL_XRayRetRing" + .balign 4 + .asciz "CMDL_ThermalRet" + .global lbl_803CDFF8 lbl_803CDFF8: - .incbin "baserom.dol", 0x3CAFF8, 0x10 + # ROM: 0x3CAFF8 + .asciz "CMDL_OrbitPoint" + .global lbl_803CE008 lbl_803CE008: - .incbin "baserom.dol", 0x3CB008, 0x10 + # ROM: 0x3CB008 + .asciz "%s%d" + .byte 0x3F, 0x3F, 0x28 + .4byte 0x3F3F2900 + .4byte 0 + .global lbl_803CE018 lbl_803CE018: - .incbin "baserom.dol", 0x3CB018, 0x8 + # ROM: 0x3CB018 + .asciz "??(??)" + .balign 4 + .global lbl_803CE020 lbl_803CE020: - .incbin "baserom.dol", 0x3CB020, 0x5C + # ROM: 0x3CB020 + .asciz "??(??)" + .byte 0x45 + .asciz "xplosion - Pickup Effect" + .byte 0x53, 0x54, 0x52 + .asciz "G_AllPickupsFound_2" + .asciz "STRG_AllPickupsFound_1" + .balign 4 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000002 + .global lbl_803CE07C lbl_803CE07C: - .incbin "baserom.dol", 0x3CB07C, 0x25C + # ROM: 0x3CB07C + .asciz "Atomic Alpha" + .byte 0x3F, 0x3F, 0x28 + .4byte 0x3F3F2900 + .asciz "PhazonHealingNodule" + .asciz "Omega Pirate" + .byte 0x42, 0x75, 0x72 + .asciz "rower" + .byte 0x53, 0x65 + .asciz "edling" + .byte 0x54 + .asciz "ryclops" + .asciz "Puffer" + .byte 0x52 + .asciz "idley" + .byte 0x49, 0x63 + .asciz "eZoomer" + .asciz "Atomic Beta" + .4byte 0x00476565 + .4byte 0x6D657200 + .asciz "Oculus" + .byte 0x4D + .asciz "agdolite" + .byte 0x45, 0x6C, 0x69 + .asciz "te Pirate" + .byte 0x45, 0x79 + .asciz "eball" + .byte 0x42, 0x61 + .asciz "bygoth" + .byte 0x54 + .asciz "hardus Rock Projectile" + .byte 0x46 + .asciz "laahgra Tenticle" + .byte 0x54, 0x68, 0x61 + .asciz "rdus" + .byte 0x4A, 0x65, 0x6C + .asciz "lyZap" + .byte 0x44, 0x72 + .4byte 0x6F6E6500 + .asciz "Ice Sheegoth" + .byte 0x4D, 0x65, 0x74 + .asciz "roid" + .byte 0x52, 0x69, 0x70 + .4byte 0x70657200 + .asciz "Parasite" + .byte 0x46, 0x6C, 0x61 + .asciz "ahgra" + .byte 0x4E, 0x65 + .asciz "wIntroBoss" + .byte 0x4D + .asciz "etaree" + .byte 0x53 + .asciz "pankWeed" + .byte 0x46, 0x69, 0x72 + .asciz "eFlea" + .byte 0x47, 0x61 + .asciz "mma Puddle Toad" + .asciz "Puddle Spore" + .byte 0x43, 0x68, 0x6F + .asciz "zo Ghost" + .byte 0x46, 0x6C, 0x69 + .asciz "ckerBat" + .asciz "Blood Flower" + .byte 0x46, 0x6C, 0x79 + .asciz "ingPirate" + .byte 0x53, 0x70 + .asciz "ace Pirate" + .byte 0x53 + .asciz "pace pirate <" + .byte 0x3E, 0x20 + .asciz "has AnimationInformation property with invalid character selected.\n" + .asciz "ERROR: Actor/Ai keyframe '" + .byte 0x27 + .asciz " not loaded because it has no valid animation selected.\n" + .byte 0x57, 0x61, 0x72 + .asciz "wasp" + .byte 0x42, 0x65, 0x65 + .4byte 0x746C6500 + .4byte 0 + .global lbl_803CE2D8 lbl_803CE2D8: - .incbin "baserom.dol", 0x3CB2D8, 0x20 + # ROM: 0x3CB2D8 + .4byte 0 + .4byte 0x00000006 + .4byte 0x00000002 + .4byte 0x0000000A + .4byte 0x00000010 + .4byte 0x00000018 + .4byte 0x00000014 + .4byte 0x0000001C + .global lbl_803CE2F8 lbl_803CE2F8: - .incbin "baserom.dol", 0x3CB2F8, 0x40 + # ROM: 0x3CB2F8 + .4byte 0x0000000E + .4byte 0x0000000F + .4byte 0x00000008 + .4byte 0x00000009 + .4byte 0x00000004 + .4byte 0x00000005 + .4byte 0x0000000C + .4byte 0x0000000D + .4byte 0x00000012 + .4byte 0x00000013 + .4byte 0x0000001A + .4byte 0x0000001B + .4byte 0x00000016 + .4byte 0x00000017 + .4byte 0x0000001E + .4byte 0x0000001F + .global lbl_803CE338 lbl_803CE338: - .incbin "baserom.dol", 0x3CB338, 0x74 + # ROM: 0x3CB338 + .4byte 0x00000001 + .4byte 0x00000007 + .4byte 0x00000003 + .4byte 0x0000000B + .4byte 0x00000011 + .4byte 0x00000019 + .4byte 0x00000015 + .4byte 0x0000001D + .4byte 0x803CE3AC + .4byte 0x803CE3BE + .4byte 0x803CE3CE + .4byte 0x803CE3DF + .4byte 0x803CE3AC + .4byte 0x803CE3F2 + .4byte 0x803CE400 + .4byte 0x803CE3F2 + .4byte 0x803CE415 + .4byte 0x803CE429 + .4byte 0x803CE429 + .4byte 0x803CE429 + .4byte 0x803CE429 + .4byte 0x803CE43D + .4byte 0x803CE43D + .4byte 0x803CE43D + .4byte 0x803CE43D + .4byte 0x803CE43D + .4byte 0x803CE44F + .4byte 0x803CE461 + .4byte 0x803CE475 + .global lbl_803CE3AC lbl_803CE3AC: - .incbin "baserom.dol", 0x3CB3AC, 0x17C + # ROM: 0x3CB3AC + .asciz "CMDL_InvPowerBeam" + .byte 0x43, 0x4D + .asciz "DL_InvIceBeam" + .byte 0x43, 0x4D + .asciz "DL_InvWaveBeam" + .byte 0x43 + .asciz "MDL_InvPlasmaBeam" + .byte 0x43, 0x4D + .asciz "DL_InvVisor" + .asciz "CMDL_InvGravityVisor" + .byte 0x43, 0x4D, 0x44 + .asciz "L_InvPhazonVisor" + .byte 0x43, 0x4D, 0x44 + .asciz "L_InvFusionVisor" + .byte 0x43, 0x4D, 0x44 + .asciz "L_InvPowerFins" + .byte 0x43 + .asciz "MDL_InvVariaFins" + .byte 0x43, 0x4D, 0x44 + .asciz "L_InvGravityFins" + .byte 0x43, 0x4D, 0x44 + .asciz "L_InvPhazonFins" + .asciz "CMDL_InvGrappleBeam" + .asciz "GUN_LCTR" + .byte 0x47, 0x52, 0x41 + .asciz "PPLE_LCTR" + .byte 0x56, 0x49 + .asciz "SOR_LCTR" + .byte 0x53, 0x61, 0x6D + .asciz "usBallANCS" + .byte 0x3F + .asciz "?(??)" + .byte 0x50, 0x68 + .asciz "azonIndirectTexture" + .asciz "ANCS_ItemScreenSamus" + .byte 0x42, 0x61, 0x6C + .asciz "lInnerGlow" + .byte 0x4D + .asciz "orphBallTransitionFlash" + .4byte 0 + .global lbl_803CE528 lbl_803CE528: - .incbin "baserom.dol", 0x3CB528, 0x8 + # ROM: 0x3CB528 + .asciz "??(??)" + .balign 4 + .global lbl_803CE530 lbl_803CE530: - .incbin "baserom.dol", 0x3CB530, 0x18 + # ROM: 0x3CB530 + .asciz "??(??)" + .byte 0x50 + .asciz "lasma2nd_1" + .balign 4 + .4byte 0 + .global lbl_803CE548 lbl_803CE548: - .incbin "baserom.dol", 0x3CB548, 0x20 + # ROM: 0x3CB548 + .asciz "??(??)" + .byte 0x53 + .asciz "hotSmoke" + .byte 0x50, 0x6F, 0x77 + .asciz "er2nd_1" + .4byte 0 + .global lbl_803CE568 lbl_803CE568: - .incbin "baserom.dol", 0x3CB568, 0x30 + # ROM: 0x3CB568 + .asciz "??(??)" + .byte 0x57 + .asciz "aveBeam" + .asciz "Wave2nd_1" + .byte 0x57, 0x61 + .asciz "ve2nd_2" + .asciz "Wave2nd_3" + .balign 4 + .global lbl_803CE598 lbl_803CE598: - .incbin "baserom.dol", 0x3CB598, 0x28 + # ROM: 0x3CB598 + .asciz "??(??)" + .byte 0x49 + .asciz "ceSmoke" + .asciz "Ice2nd_1" + .byte 0x49, 0x63, 0x65 + .asciz "2nd_2" + .balign 4 + .4byte 0 + .global lbl_803CE5C0 lbl_803CE5C0: - .incbin "baserom.dol", 0x3CB5C0, 0x8 + # ROM: 0x3CB5C0 + .asciz "??(??)" + .balign 4 + .global lbl_803CE5C8 lbl_803CE5C8: - .incbin "baserom.dol", 0x3CB5C8, 0x28 + # ROM: 0x3CB5C8 + .asciz "??(??)" + .balign 4 + .asciz "LCTR_GARMOUTH" + .byte 0x54, 0x61 + .asciz "rget_Tail" + .balign 4 + .4byte 0 + .global lbl_803CE5F0 lbl_803CE5F0: - .incbin "baserom.dol", 0x3CB5F0, 0x60 + # ROM: 0x3CB5F0 + .4byte 0 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x06040200 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x03010705 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x3F800000 + .4byte 0x01000504 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x07060302 + .4byte 0xBF800000 + .4byte 0 + .4byte 0 + .4byte 0x03020100 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x05040706 + .global lbl_803CE650 lbl_803CE650: - .incbin "baserom.dol", 0x3CB650, 0x58 + # ROM: 0x3CB650 + .4byte 0x803CE738 + .4byte 0x803CE744 + .4byte 0x803CE750 + .4byte 0x803CE75C + .4byte 0x803CE768 + .4byte 0x803CE774 + .4byte 0x803CE780 + .4byte 0x803CE78C + .4byte 0x803CE798 + .4byte 0x803CE7A4 + .4byte 0x803CE7C5 + .4byte 0x803CE7E6 + .4byte 0x803CE807 + .4byte 0x803CE828 + .4byte 0x803CE849 + .4byte 0x803CE86A + .4byte 0x803CE88B + .4byte 0x803CE8AC + .4byte 0x803CE8CD + .4byte 0x803CE8D6 + .4byte 0x803CE8DF + .4byte 0x803CE8E8 + .global lbl_803CE6A8 lbl_803CE6A8: - .incbin "baserom.dol", 0x3CB6A8, 0x90 + # ROM: 0x3CB6A8 + .4byte 0x803CE8F1 + .4byte 0x803CE8F1 + .4byte 0x803CE8F1 + .4byte 0x803CE8F2 + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0x00000001 + .4byte 0x00000009 + .4byte 0x00000001 + .4byte 0x0000000D + .4byte 0x00000001 + .4byte 0x000000FF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000009 + .4byte 0x00000001 + .4byte 0x0000000D + .4byte 0x00000001 + .4byte 0x000000FF + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .global lbl_803CE738 lbl_803CE738: - .incbin "baserom.dol", 0x3CB738, 0x1D8 + # ROM: 0x3CB738 + .asciz "PassThru " + .asciz "Multiply " + .asciz "Invert " + .asciz "Add " + .asciz "Subtract " + .asciz "Blend " + .asciz "WideScreen " + .asciz "SceneAdd " + .asciz "NoColor " + .asciz "FullScreen " + .byte 0x46, 0x75, 0x6C + .asciz "lScreenHalvesLeftRight " + .byte 0x46, 0x75 + .asciz "llScreenHalvesTopBottom " + .byte 0x46 + .asciz "ullScreenQuarters " + .asciz "CinemaBars " + .byte 0x53, 0x63, 0x61 + .asciz "nLinesEven " + .byte 0x53, 0x63 + .asciz "anLinesOdd " + .byte 0x52 + .asciz "andomStatic " + .asciz "CookieCutterDepthRandomStatic " + .byte 0x4E, 0x6F, 0x42 + .asciz "lur " + .byte 0x4C, 0x6F + .asciz "Blur " + .byte 0x48 + .asciz "iBlur " + .asciz "XRay " + .byte 0x00, 0x54, 0x58 + .asciz "TR_XRayPalette" + .byte 0x3F + .asciz "?(??)" + .balign 4 + .4byte 0 + .global lbl_803CE910 lbl_803CE910: - .incbin "baserom.dol", 0x3CB910, 0xC0 + # ROM: 0x3CB910 + .4byte 0x803CEBF4 + .4byte 0 + .4byte 0x803CEBF4 + .4byte 0 + .4byte 0x803CEBF4 + .4byte 0x00000001 + .4byte 0x803CEBF4 + .4byte 0 + .4byte 0x803CEC02 + .4byte 0 + .4byte 0x803CEC02 + .4byte 0x00000002 + .4byte 0x803CEC02 + .4byte 0x00000001 + .4byte 0x803CEC02 + .4byte 0x00000003 + .4byte 0x803CEC16 + .4byte 0 + .4byte 0x803CEC16 + .4byte 0 + .4byte 0x803CEC16 + .4byte 0x00000001 + .4byte 0x803CEC16 + .4byte 0 + .4byte 0x803CEC2B + .4byte 0 + .4byte 0x803CEC2B + .4byte 0x00000002 + .4byte 0x803CEC2B + .4byte 0x00000001 + .4byte 0x803CEC2B + .4byte 0x00000003 + .4byte 0x803CEC46 + .4byte 0 + .4byte 0x803CEC46 + .4byte 0 + .4byte 0x803CEC46 + .4byte 0x00000001 + .4byte 0x803CEC46 + .4byte 0x00000002 + .4byte 0x803CEC2B + .4byte 0 + .4byte 0x803CEC2B + .4byte 0x00000002 + .4byte 0x803CEC2B + .4byte 0x00000001 + .4byte 0x803CEC2B + .4byte 0x00000003 + .global lbl_803CE9D0 lbl_803CE9D0: - .incbin "baserom.dol", 0x3CB9D0, 0x40 + # ROM: 0x3CB9D0 + .4byte 0x803CEC61 + .4byte 0 + .4byte 0x803CEC61 + .4byte 0 + .4byte 0x803CEC61 + .4byte 0x00000001 + .4byte 0x803CEC75 + .4byte 0 + .4byte 0x803CEC02 + .4byte 0 + .4byte 0x803CEC02 + .4byte 0x00000002 + .4byte 0x803CEC02 + .4byte 0x00000001 + .4byte 0x803CEC02 + .4byte 0x00000003 + .global lbl_803CEA10 lbl_803CEA10: - .incbin "baserom.dol", 0x3CBA10, 0x80 + # ROM: 0x3CBA10 + .4byte 0x803CEC89 + .4byte 0 + .4byte 0x803CEC89 + .4byte 0 + .4byte 0x803CEC89 + .4byte 0x00000001 + .4byte 0x803CECA2 + .4byte 0 + .4byte 0x803CEC89 + .4byte 0 + .4byte 0x803CEC89 + .4byte 0 + .4byte 0x803CEC89 + .4byte 0x00000001 + .4byte 0x803CECA2 + .4byte 0 + .4byte 0x803CECBB + .4byte 0 + .4byte 0x803CECBB + .4byte 0 + .4byte 0x803CECBB + .4byte 0 + .4byte 0x803CECBB + .4byte 0 + .4byte 0x803CECBB + .4byte 0 + .4byte 0x803CECBB + .4byte 0 + .4byte 0x803CECBB + .4byte 0 + .4byte 0x803CECBB + .4byte 0 + .global lbl_803CEA90 lbl_803CEA90: - .incbin "baserom.dol", 0x3CBA90, 0x20 + # ROM: 0x3CBA90 + .4byte 0x00000003 + .4byte 0x00000003 + .4byte 0x00000002 + .4byte 0x00000004 + .4byte 0x00000005 + .4byte 0x00000007 + .4byte 0x00000006 + .4byte 0x00000008 + .global lbl_803CEAB0 lbl_803CEAB0: - .incbin "baserom.dol", 0x3CBAB0, 0x20 + # ROM: 0x3CBAB0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0x00000005 + .4byte 0x00000007 + .4byte 0x00000006 + .4byte 0x00000008 + .global lbl_803CEAD0 lbl_803CEAD0: - .incbin "baserom.dol", 0x3CBAD0, 0x1C + # ROM: 0x3CBAD0 + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFD519FF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFF00 + .global lbl_803CEAEC lbl_803CEAEC: - .incbin "baserom.dol", 0x3CBAEC, 0x1C + # ROM: 0x3CBAEC + .4byte 0xC27E1066 + .4byte 0xC4FF60FF + .4byte 0x903333FF + .4byte 0xFF202000 + .4byte 0x9DB6D3F1 + .4byte 0x00A686D8 + .4byte 0xFB982100 + .global lbl_803CEB08 lbl_803CEB08: - .incbin "baserom.dol", 0x3CBB08, 0x70 + # ROM: 0x3CBB08 + .4byte 0xC27E1066 + .4byte 0xC4FF6CFF + .4byte 0x613333FF + .4byte 0xFF202000 + .4byte 0x9DB6D3F1 + .4byte 0x00A686D8 + .4byte 0xFB982100 + .4byte 0xC28F1770 + .4byte 0xD4FF6AFF + .4byte 0x8A3D4DFF + .4byte 0xC0000000 + .4byte 0xBEDCDFFF + .4byte 0x00C49EFF + .4byte 0xFF9A2200 + .4byte 0xFFE600FF + .4byte 0xE600FFE6 + .4byte 0x00FFE600 + .4byte 0xFF8020FF + .4byte 0xE600FFE6 + .4byte 0x00FFE600 + .4byte 0xFFE60000 + .4byte 0xFFCC00FF + .4byte 0xCC00FFCC + .4byte 0x00FFCC00 + .4byte 0xFFD519FF + .4byte 0xCC00FFCC + .4byte 0x00FFCC00 + .4byte 0xFFCC0000 + .global lbl_803CEB78 lbl_803CEB78: - .incbin "baserom.dol", 0x3CBB78, 0x1C + # ROM: 0x3CBB78 + .4byte 0xC27E1066 + .4byte 0xC4FF60FF + .4byte 0x903333FF + .4byte 0xFF808000 + .4byte 0x9DB6D3F1 + .4byte 0x006033FF + .4byte 0xFB982100 + .global lbl_803CEB94 lbl_803CEB94: - .incbin "baserom.dol", 0x3CBB94, 0x30 + # ROM: 0x3CBB94 + .4byte 0xFFFF05DE + .4byte 0x05DD062F + .4byte 0x0786FFFF + .4byte 0x05DC060B + .4byte 0x05C8088A + .4byte 0x06980787 + .4byte 0x0630FFFF + .4byte 0x062805DD + .4byte 0x05DD05C8 + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0x05FE0628 + .global lbl_803CEBC4 lbl_803CEBC4: - .incbin "baserom.dol", 0x3CBBC4, 0x30 + # ROM: 0x3CBBC4 + .4byte 0xFFFF05C3 + .4byte 0x05E0062C + .4byte 0x065BFFFF + .4byte 0x05DA0609 + .4byte 0x05C00697 + .4byte 0x0697065C + .4byte 0x062DFFFF + .4byte 0x062705E0 + .4byte 0x05E005C0 + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0x05FD0627 + .global lbl_803CEBF4 lbl_803CEBF4: - .incbin "baserom.dol", 0x3CBBF4, 0x204 + # ROM: 0x3CBBF4 + .asciz "SamusBallANCS" + .byte 0x53, 0x61 + .asciz "musFusionBallANCS" + .byte 0x53, 0x61 + .asciz "musBallLowPolyCMDL" + .byte 0x53 + .asciz "amusBallFusionLowPolyCMDL" + .byte 0x53, 0x61 + .asciz "musSpiderBallLowPolyCMDL" + .byte 0x53, 0x61, 0x6D + .asciz "usSpiderBallANCS" + .byte 0x53, 0x61, 0x6D + .asciz "usPhazonBallANCS" + .byte 0x53, 0x61, 0x6D + .asciz "usSpiderBallGlassCMDL" + .byte 0x53, 0x61 + .asciz "musPhazonBallGlassCMDL" + .byte 0x53 + .asciz "amusBallFrozenCMDL" + .balign 4 + .asciz "??(??)" + .byte 0x54 + .asciz "XTR_BallFade" + .byte 0x44, 0x69, 0x72 + .asciz "tWake" + .byte 0x50, 0x68 + .asciz "azonWake" + .byte 0x50, 0x68, 0x61 + .asciz "zonWakeOrange" + .byte 0x4C, 0x61 + .asciz "vaWake" + .byte 0x53 + .asciz "nowWake" + .asciz "MudWake" + .asciz "SandWake" + .byte 0x52, 0x61, 0x69 + .asciz "nWake" + .byte 0x5F, 0x44 + .4byte 0x47525000 + .asciz "BallLight" + .byte 0x53, 0x6C + .asciz "owBlueTailSwoosh" + .byte 0x53, 0x6C, 0x6F + .asciz "wBlueTailSwoosh2" + .byte 0x4A, 0x61, 0x67 + .asciz "gyTrail" + .asciz "WallSpark" + .byte 0x42, 0x61 + .asciz "llInnerGlow" + .asciz "SpiderBallMagnetEffect" + .byte 0x42 + .asciz "oostBallGlow" + .byte 0x53, 0x70, 0x69 + .asciz "derElectric" + .asciz "MorphBallTransitionFlash" + .byte 0x45, 0x66, 0x66 + .asciz "ect_MorphBallIceBreak" + .balign 4 + .global lbl_803CEDF8 lbl_803CEDF8: - .incbin "baserom.dol", 0x3CBDF8, 0x8 + # ROM: 0x3CBDF8 + .asciz "??(??)" + .balign 4 + .global lbl_803CEE00 lbl_803CEE00: - .incbin "baserom.dol", 0x3CBE00, 0x20 + # ROM: 0x3CBE00 + .asciz "ConsoleOutputWindow" + .4byte 0x003F3F28 + .4byte 0x3F3F2900 + .4byte 0 + .global lbl_803CEE20 lbl_803CEE20: - .incbin "baserom.dol", 0x3CBE20, 0x18 + # ROM: 0x3CBE20 + .4byte 0x3F800000 + .4byte 0x40400000 + .4byte 0x3F35C28F + .4byte 0x3F9851EC + .4byte 0x3F35C28F + .4byte 0x3F800000 + .global lbl_803CEE38 lbl_803CEE38: - .incbin "baserom.dol", 0x3CBE38, 0x8 + # ROM: 0x3CBE38 + .asciz "??(??)" + .balign 4 + .global lbl_803CEE40 lbl_803CEE40: - .incbin "baserom.dol", 0x3CBE40, 0x10 + # ROM: 0x3CBE40 + .4byte 0xBF800000 + .4byte 0xBF800000 + .4byte 0xBF800000 + .4byte 0xBF800000 + .global lbl_803CEE50 lbl_803CEE50: - .incbin "baserom.dol", 0x3CBE50, 0x8 + # ROM: 0x3CBE50 + .asciz "??(??)" + .balign 4 + .global lbl_803CEE58 lbl_803CEE58: - .incbin "baserom.dol", 0x3CBE58, 0x38 + # ROM: 0x3CBE58 + .4byte 0x803CEF50 + .4byte 0x803CEF5F + .4byte 0x803CEF68 + .4byte 0x803CEF74 + .4byte 0x803CEF80 + .4byte 0x803CEF8B + .4byte 0x803CEF95 + .4byte 0x803CEFA9 + .4byte 0x803CEFBA + .4byte 0x803CEFC8 + .4byte 0x803CEFD9 + .4byte 0x803CEFE8 + .4byte 0x803CEFF8 + .4byte 0x803CF007 + .global lbl_803CEE90 lbl_803CEE90: - .incbin "baserom.dol", 0x3CBE90, 0x34 + # ROM: 0x3CBE90 + .4byte 0x803CF016 + .4byte 0x803CF02E + .4byte 0x803CF046 + .4byte 0x803CF060 + .4byte 0x803CF079 + .4byte 0x803CF097 + .4byte 0x803CF0B5 + .4byte 0x803CF0D5 + .4byte 0x803CF0F4 + .4byte 0x803CF107 + .4byte 0x803CF120 + .4byte 0x803CF139 + .4byte 0x803CF159 + .global lbl_803CEEC4 lbl_803CEEC4: - .incbin "baserom.dol", 0x3CBEC4, 0x314 + # ROM: 0x3CBEC4 + .asciz "FaceplateDecoration" + .asciz " FaceReflection" + .asciz " PlayerVisor" + .asciz " Hud" + .asciz " AutoMapper" + .asciz " PauseScreen" + .asciz " Total" + .asciz "InGameGui_DGRP" + .byte 0x49 + .asciz "ce_DGRP" + .asciz "Phazon_DGRP" + .asciz "Plasma_DGRP" + .asciz "Power_DGRP" + .byte 0x57 + .asciz "ave_DGRP" + .byte 0x42, 0x61, 0x6C + .asciz "lTransition_DGRP" + .byte 0x47, 0x72, 0x61 + .asciz "vitySuit_DGRP" + .byte 0x49, 0x63 + .asciz "e_Anim_DGRP" + .asciz "Plasma_Anim_DGRP" + .byte 0x50, 0x6F, 0x77 + .asciz "erSuit_DGRP" + .asciz "Power_Anim_DGRP" + .asciz "VariaSuit_DGRP" + .byte 0x57 + .asciz "ave_Anim_DGRP" + .byte 0x49, 0x6E + .asciz "ventorySuitPower_DGRP" + .byte 0x49, 0x6E + .asciz "ventorySuitVaria_DGRP" + .byte 0x49, 0x6E + .asciz "ventorySuitGravity_DGRP" + .asciz "InventorySuitPhazon_DGRP" + .byte 0x49, 0x6E, 0x76 + .asciz "entorySuitFusionPower_DGRP" + .byte 0x49 + .asciz "nventorySuitFusionVaria_DGRP" + .byte 0x49, 0x6E, 0x76 + .asciz "entorySuitFusionGravity_DGRP" + .byte 0x49, 0x6E, 0x76 + .asciz "entorySuitFusionPhazon_DGRP" + .asciz "SamusBallANCS_DGRP" + .byte 0x53 + .asciz "amusSpiderBallANCS_DGRP" + .asciz "PauseScreenDontDump_DGRP" + .byte 0x50, 0x61, 0x75 + .asciz "seScreenDontDump_NoARAM_DGRP" + .byte 0x50, 0x61, 0x75 + .asciz "seScreenTokens_DGRP" + .asciz "??(??)" + .byte 0x42 + .asciz "aseWidget_AutoMapper" + .byte 0x4D, 0x6F, 0x64 + .asciz "el_AutoMapper" + .byte 0x42, 0x61 + .asciz "seWidget_Functional" + .asciz "PreLoadIGGM_DGRP" + .byte 0x54, 0x58, 0x54 + .asciz "R_DeathDot" + .balign 4 + .4byte 0 + .global lbl_803CF1D8 lbl_803CF1D8: - .incbin "baserom.dol", 0x3CC1D8, 0x20 + # ROM: 0x3CC1D8 + .4byte 0x3ECCCCCD + .4byte 0x3F19999A + .4byte 0x3F800000 + .asciz "LCTR_WARTAIL" + .balign 4 + .4byte 0 + .global lbl_803CF1F8 lbl_803CF1F8: - .incbin "baserom.dol", 0x3CC1F8, 0x8 + # ROM: 0x3CC1F8 + .asciz "??(??)" + .balign 4 + .global lbl_803CF200 lbl_803CF200: - .incbin "baserom.dol", 0x3CC200, 0x10 + # ROM: 0x3CC200 + .asciz "CAudioStateWin" + .balign 4 + .global lbl_803CF210 lbl_803CF210: - .incbin "baserom.dol", 0x3CC210, 0xE0 + # ROM: 0x3CC210 + .asciz "CMDL_ScanFrameCorner" + .byte 0x43, 0x4D, 0x44 + .asciz "L_ScanFrameCenterSide" + .byte 0x43, 0x4D + .asciz "DL_ScanFrameCenterTop" + .byte 0x43, 0x4D + .asciz "DL_ScanFrameStretchSide" + .asciz "CMDL_ScanFrameStretchTop" + .byte 0x43, 0x4D, 0x44 + .asciz "L_NewScanPane" + .byte 0x43, 0x4D + .asciz "DL_ScanShield" + .byte 0x43, 0x4D + .asciz "DL_ScanIconNoncritical" + .byte 0x43 + .asciz "MDL_ScanIconCritical" + .byte 0x54, 0x58, 0x54 + .asciz "R_XRayPalette" + .balign 4 + .4byte 0 + .global lbl_803CF2F0 lbl_803CF2F0: - .incbin "baserom.dol", 0x3CC2F0, 0x28 + # ROM: 0x3CC2F0 + .asciz "LCTR_FLOFLOWER" + .byte 0x46 + .asciz "ire1" + .byte 0x46, 0x69, 0x72 + .4byte 0x65320046 + .asciz "ire3" + .byte 0x3F, 0x3F, 0x28 + .4byte 0x3F3F2900 + .global lbl_803CF318 lbl_803CF318: - .incbin "baserom.dol", 0x3CC318, 0x8 + # ROM: 0x3CC318 + .asciz "??(??)" + .balign 4 + .global lbl_803CF320 lbl_803CF320: - .incbin "baserom.dol", 0x3CC320, 0x20 + # ROM: 0x3CC320 + .4byte 0x803CF3A2 + .4byte 0x803CF3B1 + .4byte 0x803CF3C2 + .4byte 0x803CF3D1 + .4byte 0x803CF3E1 + .4byte 0x803CF3F1 + .4byte 0x803CF402 + .4byte 0x803CF413 + .global lbl_803CF340 lbl_803CF340: - .incbin "baserom.dol", 0x3CC340, 0x20 + # ROM: 0x3CC340 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000005 + .4byte 0x00000006 + .4byte 0x00000007 + .global lbl_803CF360 lbl_803CF360: - .incbin "baserom.dol", 0x3CC360, 0xD8 + # ROM: 0x3CC360 + .asciz "GrappleGear" + .asciz "GrapNoz1" + .byte 0x47, 0x72, 0x61 + .asciz "pNoz2" + .byte 0x67, 0x72 + .asciz "apLocator_SDK" + .byte 0x67, 0x4E + .asciz "ozLoc1_SDK" + .byte 0x4C + .asciz "GBeam" + .byte 0x50, 0x6F + .asciz "werSuit_DGRP" + .byte 0x47, 0x72, 0x61 + .asciz "vitySuit_DGRP" + .byte 0x56, 0x61 + .asciz "riaSuit_DGRP" + .byte 0x50, 0x68, 0x61 + .asciz "zonSuit_DGRP" + .byte 0x46, 0x75, 0x73 + .asciz "ionSuit_DGRP" + .byte 0x46, 0x75, 0x73 + .asciz "ionSuitG_DGRP" + .byte 0x46, 0x75 + .asciz "sionSuitV_DGRP" + .byte 0x46 + .asciz "usionSuitP_DGRP" + .asciz "??(??)" + .byte 0x57 + .asciz "hole Body" + .balign 4 + .global lbl_803CF438 lbl_803CF438: - .incbin "baserom.dol", 0x3CC438, 0xB38 + # ROM: 0x3CC438 + .4byte 0x3EE66666 + .4byte 0x3F051EB8 + .4byte 0x3EB33333 + .4byte 0x3DCCCCCD + .4byte 0x3E19999A + .4byte 0x3EB33333 + .4byte 0x3DCCCCCD + .4byte 0x3E19999A + .4byte 0x3E19999A + .4byte 0x3E19999A + .4byte 0x3E19999A + .4byte 0x3E19999A + .4byte 0x3E19999A + .4byte 0x3E19999A + .4byte 0x00000014 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000005 + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0x00000014 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0x00000014 + .4byte 0x00000006 + .4byte 0x00000005 + .4byte 0x00000004 + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0x00000014 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0x00000014 + .4byte 0x00000007 + .4byte 0x00000006 + .4byte 0x00000005 + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000000F + .4byte 0x00000005 + .4byte 0x00000003 + .4byte 0x00000002 + .4byte 0x00000001 + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0x00000014 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0x00000014 + .4byte 0x00000007 + .4byte 0x00000006 + .4byte 0x00000005 + .4byte 0x00000004 + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0x0000000F + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000005 + .4byte 0x00000006 + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0x0000000F + .4byte 0x00000006 + .4byte 0x00000005 + .4byte 0x00000004 + .4byte 0x00000003 + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0x0000000F + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000005 + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000028 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000005 + .4byte 0x00000006 + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0x00000028 + .4byte 0x00000007 + .4byte 0x00000006 + .4byte 0x00000005 + .4byte 0x00000004 + .4byte 0x00000003 + .4byte 0x00000002 + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0x0000000A + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000005 + .4byte 0x00000004 + .4byte 0x00000003 + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0x0000000A + .4byte 0x00000006 + .4byte 0x00000005 + .4byte 0x00000004 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000005 + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000014 + .4byte 0x00000010 + .4byte 0x00000004 + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0x00000028 + .4byte 0x00000005 + .4byte 0x00000007 + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0x00000028 + .4byte 0x00000001 + .4byte 0x0000000A + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000000F + .4byte 0x00000010 + .4byte 0x00000001 + .4byte 0x00000003 + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0x00000014 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000006 + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0x00000019 + .4byte 0x00000007 + .4byte 0x00000005 + .4byte 0x00000004 + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0x00000019 + .4byte 0x00000002 + .4byte 0x00000006 + .4byte 0x00000004 + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0x0000000F + .4byte 0x00000007 + .4byte 0x00000005 + .4byte 0x00000003 + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000023 + .4byte 0x00000007 + .4byte 0x0000000D + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0x00000023 + .4byte 0x00000009 + .4byte 0x00000001 + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0x0000001E + .4byte 0x00000010 + .4byte 0x0000000C + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000000A + .4byte 0x00000010 + .4byte 0x0000000F + .4byte 0x0000000D + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0x00000014 + .4byte 0x0000000D + .4byte 0x0000000C + .4byte 0x0000000A + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0x0000001E + .4byte 0x00000009 + .4byte 0x0000000B + .4byte 0x0000000C + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0x0000001E + .4byte 0x0000000E + .4byte 0x0000000A + .4byte 0x0000000C + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0x0000000A + .4byte 0x00000009 + .4byte 0x0000000B + .4byte 0x0000000D + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000001A + .4byte 0x00000010 + .4byte 0x00000008 + .4byte 0x0000000B + .4byte 0x0000000E + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0x0000001A + .4byte 0x00000010 + .4byte 0x0000000D + .4byte 0x0000000B + .4byte 0x0000000C + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0x00000010 + .4byte 0x00000009 + .4byte 0x0000000B + .4byte 0x0000000D + .4byte 0x0000000A + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0x00000010 + .4byte 0x0000000E + .4byte 0x0000000D + .4byte 0x0000000C + .4byte 0x0000000B + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0x00000008 + .4byte 0x0000000A + .4byte 0x0000000B + .4byte 0x0000000C + .4byte 0x0000000D + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0x00000008 + .4byte 0x00000006 + .4byte 0x00000008 + .4byte 0x0000000B + .4byte 0x0000000D + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000028 + .4byte 0x00000001 + .4byte 0x00000010 + .4byte 0x0000000E + .4byte 0x0000000C + .4byte 0x0000000A + .4byte 0x0000000B + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0x00000028 + .4byte 0x00000009 + .4byte 0x0000000B + .4byte 0x0000000C + .4byte 0x0000000D + .4byte 0x0000000B + .4byte 0x00000007 + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0x0000000A + .4byte 0x00000008 + .4byte 0x0000000A + .4byte 0x0000000B + .4byte 0x0000000C + .4byte 0x0000000D + .4byte 0x0000000C + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0x0000000A + .4byte 0x0000000F + .4byte 0x0000000D + .4byte 0x0000000C + .4byte 0x0000000A + .4byte 0x0000000C + .4byte 0x00000009 + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000028 + .4byte 0x00000007 + .4byte 0x0000000D + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0x00000028 + .4byte 0x00000009 + .4byte 0x00000001 + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0x00000014 + .4byte 0x00000010 + .4byte 0x0000000C + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000001E + .4byte 0x00000009 + .4byte 0x0000000B + .4byte 0x0000000D + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0x0000000A + .4byte 0x0000000D + .4byte 0x0000000C + .4byte 0x0000000A + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0x0000000F + .4byte 0x00000009 + .4byte 0x0000000B + .4byte 0x0000000C + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0x0000000F + .4byte 0x0000000E + .4byte 0x0000000A + .4byte 0x0000000C + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0x0000001E + .4byte 0x00000010 + .4byte 0x0000000F + .4byte 0x0000000D + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000023 + .4byte 0x00000007 + .4byte 0x0000000D + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0x00000023 + .4byte 0x00000009 + .4byte 0x00000001 + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0x0000001E + .4byte 0x00000010 + .4byte 0x0000000C + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .global lbl_803CFF70 lbl_803CFF70: - .incbin "baserom.dol", 0x3CCF70, 0x94 + # ROM: 0x3CCF70 + .asciz "Ambushing" + .byte 0x3F, 0x3F + .asciz "(??)" + .byte 0x47, 0x65, 0x74 + .asciz "UpNow" + .byte 0x48, 0x65 + .asciz "ad_1" + .byte 0x52, 0x5F, 0x67 + .asciz "un_LCTR" + .asciz "R_elbow" + .asciz "R_wrist" + .asciz "Swoosh_LCTR" + .asciz "Skeleton_Root" + .byte 0x43, 0x6F + .asciz "llar" + .byte 0x4E, 0x65, 0x63 + .4byte 0x6B5F3100 + .asciz "R_shoulder" + .byte 0x4C + .asciz "_shoulder" + .byte 0x4C, 0x5F + .asciz "elbow" + .byte 0x4C, 0x5F + .asciz "wrist" + .byte 0x52, 0x5F + .4byte 0x68697000 + .4byte 0x525F6B6E + .global lbl_803D0004 lbl_803D0004: - .incbin "baserom.dol", 0x3CD004, 0x4 + # ROM: 0x3CD004 + .4byte 0x65650052 + .global lbl_803D0008 lbl_803D0008: - .incbin "baserom.dol", 0x3CD008, 0x30 + # ROM: 0x3CD008 + .asciz "_ankle" + .byte 0x4C + .asciz "_hip" + .byte 0x4C, 0x5F, 0x6B + .4byte 0x6E656500 + .asciz "L_ankle" + .asciz "OneEye" + .byte 0x54 + .asciz "woEyes" + .balign 4 + .4byte 0 + .global lbl_803D0038 lbl_803D0038: - .incbin "baserom.dol", 0x3CD038, 0x10 + # ROM: 0x3CD038 + .asciz "??(??)" + .byte 0x53 + .asciz "plash" + .balign 4 + .global lbl_803D0048 lbl_803D0048: - .incbin "baserom.dol", 0x3CD048, 0x8 + # ROM: 0x3CD048 + .asciz "??(??)" + .balign 4 + .global lbl_803D0050 lbl_803D0050: - .incbin "baserom.dol", 0x3CD050, 0x8 + # ROM: 0x3CD050 + .asciz "??(??)" + .balign 4 + .global lbl_803D0058 lbl_803D0058: - .incbin "baserom.dol", 0x3CD058, 0x8 + # ROM: 0x3CD058 + .asciz "??(??)" + .balign 4 + .global lbl_803D0060 lbl_803D0060: - .incbin "baserom.dol", 0x3CD060, 0x10 + # ROM: 0x3CD060 + .asciz "Whole Body" + .balign 4 + .4byte 0 + .global lbl_803D0070 lbl_803D0070: - .incbin "baserom.dol", 0x3CD070, 0x8 + # ROM: 0x3CD070 + .asciz "??(??)" + .balign 4 + .global lbl_803D0078 lbl_803D0078: - .incbin "baserom.dol", 0x3CD078, 0x20 + # ROM: 0x3CD078 + .asciz "Hurled" + .byte 0x48 + .asciz "ead_1" + .byte 0x53, 0x70 + .asciz "eedSwoosh" + .balign 4 + .4byte 0 + .global lbl_803D0098 lbl_803D0098: - .incbin "baserom.dol", 0x3CD098, 0x8 + # ROM: 0x3CD098 + .4byte 0x003F3F28 + .4byte 0x3F3F2900 + .global lbl_803D00A0 lbl_803D00A0: - .incbin "baserom.dol", 0x3CD0A0, 0xD0 + # ROM: 0x3CD0A0 + .asciz "Glow_1_LCTR" + .asciz "Glow_2_LCTR" + .asciz "Glow_3_LCTR" + .asciz "Glow_4_LCTR" + .asciz "Glow_5_LCTR" + .asciz "Glow_6_LCTR" + .asciz "Glow_7_LCTR" + .asciz "Glow_8_LCTR" + .asciz "Glow_9_LCTR" + .asciz "Glow_10_LCTR" + .byte 0x47, 0x6C, 0x6F + .asciz "w_11_LCTR" + .byte 0x47, 0x6C + .asciz "ow_12_LCTR" + .byte 0x47 + .asciz "low_13_LCTR" + .asciz "Glow_14_LCTR" + .byte 0x47, 0x6C, 0x6F + .asciz "w_15_LCTR" + .byte 0x47, 0x6C + .asciz "ow_16_LCTR" + .byte 0x3F + .asciz "?(??)" + .balign 4 + .global lbl_803D0170 lbl_803D0170: - .incbin "baserom.dol", 0x3CD170, 0x30 + # ROM: 0x3CD170 + .asciz "MOUTH_LCTR_SDK" + .byte 0x53 + .asciz "AMUS_POS_LCTR_SDK" + .byte 0x3F, 0x3F + .asciz "(??)" + .balign 4 + .4byte 0 + .global lbl_803D01A0 lbl_803D01A0: - .incbin "baserom.dol", 0x3CD1A0, 0x18 + # ROM: 0x3CD1A0 + .asciz "PowerBomb" + .byte 0x3F, 0x3F + .asciz "(??)" + .balign 4 + .4byte 0 + .global lbl_803D01B8 lbl_803D01B8: - .incbin "baserom.dol", 0x3CD1B8, 0x18 + # ROM: 0x3CD1B8 + .4byte 0x00000014 + .4byte 0x00000001 + .4byte 0x00000015 + .4byte 0x00000016 + .4byte 0x00000017 + .4byte 0 + .global lbl_803D01D0 lbl_803D01D0: - .incbin "baserom.dol", 0x3CD1D0, 0x20 + # ROM: 0x3CD1D0 + .asciz "AllowWrap" + .byte 0x4E, 0x6F + .asciz "Backward" + .byte 0x3F, 0x3F, 0x28 + .4byte 0x3F3F2900 + .4byte 0 + .global lbl_803D01F0 lbl_803D01F0: - .incbin "baserom.dol", 0x3CD1F0, 0x8 + # ROM: 0x3CD1F0 + .asciz "??(??)" + .balign 4 + .global lbl_803D01F8 lbl_803D01F8: - .incbin "baserom.dol", 0x3CD1F8, 0x38 + # ROM: 0x3CD1F8 + .4byte 0x803D023C + .4byte 0x3FC00000 + .4byte 0x803D0248 + .4byte 0x3F800000 + .4byte 0x803D024E + .4byte 0x3F800000 + .4byte 0x803D0254 + .4byte 0x3F800000 + .4byte 0x803D025A + .4byte 0x3F800000 + .4byte 0x803D0267 + .4byte 0x3F800000 + .4byte 0x803D027D + .4byte 0x3FC00000 + .global lbl_803D0230 lbl_803D0230: - .incbin "baserom.dol", 0x3CD230, 0x100 + # ROM: 0x3CD230 + .asciz "Arm_2" + .byte 0x41, 0x72 + .4byte 0x6D5F3300 + .asciz "Arm_4" + .byte 0x41, 0x72 + .4byte 0x6D5F3500 + .asciz "Arm_6" + .byte 0x41, 0x72 + .4byte 0x6D5F3700 + .asciz "Arm_8" + .byte 0x41, 0x72 + .4byte 0x6D5F3900 + .asciz "Arm_10" + .byte 0x41 + .asciz "rm_11" + .byte 0x41, 0x72 + .asciz "m_12" + .byte 0x41, 0x72, 0x6D + .asciz "_end" + .byte 0x73, 0x77, 0x6F + .asciz "osh_LCTR" + .byte 0x6C, 0x6F, 0x63 + .asciz "kon_target_LCTR" + .4byte 0x45796500 + .asciz "??(??)" + .byte 0x57 + .asciz "ARNING: Non-uniform scale (%.2f, %.2f, %.2f) applied to Spank Weed...changing scale to (%.2f, %.2f, %.2f)\n" + .byte 0x53 + .asciz "pank Weed Collision " + .balign 4 + .4byte 0 + .global lbl_803D0330 lbl_803D0330: - .incbin "baserom.dol", 0x3CD330, 0x10 + # ROM: 0x3CD330 + .asciz "Ice_LCTR" + .byte 0x3F, 0x3F, 0x28 + .4byte 0x3F3F2900 + .global lbl_803D0340 lbl_803D0340: - .incbin "baserom.dol", 0x3CD340, 0x18 + # ROM: 0x3CD340 + .asciz "ACS_SamusFace" + .byte 0x3F, 0x3F + .asciz "(??)" + .balign 4 + .global lbl_803D0358 lbl_803D0358: - .incbin "baserom.dol", 0x3CD358, 0x38 + # ROM: 0x3CD358 + .asciz "??(??)" + .byte 0x52 + .asciz "ipper Controlled Platform" + .byte 0x52, 0x69 + .asciz "pperGrapplePoint" + .balign 4 + .global lbl_803D0390 lbl_803D0390: - .incbin "baserom.dol", 0x3CD390, 0x8 + # ROM: 0x3CD390 + .asciz "??(??)" + .balign 4 + .global lbl_803D0398 lbl_803D0398: - .incbin "baserom.dol", 0x3CD398, 0x90 + # ROM: 0x3CD398 + .asciz "Beacon_LCTR" + .asciz "R_GUN_TOP_LCTR" + .byte 0x4C + .asciz "_GUN_TOP_LCTR" + .byte 0x53, 0x68 + .asciz "ield_LCTR" + .byte 0x44, 0x65 + .4byte 0x6164003F + .asciz "?(??)" + .byte 0x57, 0x68 + .asciz "ole Body" + .byte 0x53, 0x6B, 0x65 + .asciz "leton_Root" + .byte 0x44 + .asciz "roneVisorFlare" + .byte 0x4C + .asciz "aserLight" + .byte 0x4C, 0x61 + .asciz "serScanner" + .byte 0x44 + .asciz "roneLaser" + .balign 4 + .global lbl_803D0428 lbl_803D0428: - .incbin "baserom.dol", 0x3CD428, 0x8 + # ROM: 0x3CD428 + .asciz "??(??)" + .balign 4 + .global lbl_803D0430 lbl_803D0430: - .incbin "baserom.dol", 0x3CD430, 0x10 + # ROM: 0x3CD430 + .asciz "imagepane_pane" + .balign 4 + .global lbl_803D0440 lbl_803D0440: - .incbin "baserom.dol", 0x3CD440, 0x50 + # ROM: 0x3CD440 + .4byte 0x803D0490 + .4byte 0x803D0492 + .4byte 0x803D0494 + .4byte 0x803D0496 + .4byte 0x803D0498 + .4byte 0x803D049B + .4byte 0x803D049E + .4byte 0x803D04A1 + .4byte 0x803D04A5 + .4byte 0x803D04A9 + .4byte 0x803D04AE + .4byte 0x803D04B0 + .4byte 0x803D04B2 + .4byte 0x803D04B4 + .4byte 0x803D04B6 + .4byte 0x803D04B9 + .4byte 0x803D04BC + .4byte 0x803D04BF + .4byte 0x803D04C3 + .4byte 0x803D04C7 + .global lbl_803D0490 lbl_803D0490: - .incbin "baserom.dol", 0x3CD490, 0x48 + # ROM: 0x3CD490 + .4byte 0x30003100 + .4byte 0x32003300 + .4byte 0x30310031 + .4byte 0x32003233 + .4byte 0x00303132 + .4byte 0x00313233 + .4byte 0x00303132 + .4byte 0x33003400 + .4byte 0x35003600 + .4byte 0x37003435 + .4byte 0x00353600 + .4byte 0x36370034 + .4byte 0x35360035 + .4byte 0x36370034 + .4byte 0x35363700 + .asciz "??(??)" + .byte 0x25 + .4byte 0x73257300 + .global lbl_803D04D8 lbl_803D04D8: - .incbin "baserom.dol", 0x3CD4D8, 0x44 + # ROM: 0x3CD4D8 + .4byte 0x803D0550 + .4byte 0x803D0557 + .4byte 0x803D055F + .4byte 0x803D0567 + .4byte 0x803D056D + .4byte 0x803D0574 + .4byte 0x803D057F + .4byte 0x803D058D + .4byte 0x803D0595 + .4byte 0x803D059C + .4byte 0x803D05A4 + .4byte 0x803D05AC + .4byte 0x803D05B2 + .4byte 0x803D05B9 + .4byte 0x803D05C4 + .4byte 0x803D05D2 + .4byte 0x803D05DA + .global lbl_803D051C lbl_803D051C: - .incbin "baserom.dol", 0x3CD51C, 0x14 + # ROM: 0x3CD51C + .4byte 0x42B40000 + .4byte 0x433E0000 + .4byte 0x43160000 + .4byte 0x42B40000 + .4byte 0x42C80000 + .global lbl_803D0530 lbl_803D0530: - .incbin "baserom.dol", 0x3CD530, 0x20 + # ROM: 0x3CD530 + .4byte 0x42B40000 + .4byte 0x43070000 + .4byte 0x42340000 + .4byte 0x43340000 + .4byte 0 + .4byte 0x43610000 + .4byte 0x439D8000 + .4byte 0x43870000 + .global lbl_803D0550 lbl_803D0550: - .incbin "baserom.dol", 0x3CD550, 0xD0 + # ROM: 0x3CD550 + .asciz "Head_1" + .byte 0x4C + .asciz "_ankle" + .byte 0x4C + .asciz "_elbow" + .byte 0x4C + .asciz "_hip" + .byte 0x4C, 0x5F, 0x6B + .4byte 0x6E656500 + .asciz "L_shoulder" + .byte 0x4C + .asciz "_varias2_SDK" + .byte 0x4C, 0x5F, 0x77 + .asciz "rist" + .byte 0x50, 0x65, 0x6C + .4byte 0x76697300 + .asciz "R_ankle" + .asciz "R_elbow" + .asciz "R_hip" + .byte 0x52, 0x5F + .asciz "knee" + .byte 0x52, 0x5F, 0x73 + .asciz "houlder" + .asciz "R_varias2_SDK" + .byte 0x53, 0x70 + .asciz "ine_1" + .byte 0x53, 0x70 + .asciz "ine_2" + .byte 0x6C, 0x6F + .asciz "ckon_target_LCTR" + .byte 0x53, 0x6B, 0x65 + .asciz "leton_Root" + .byte 0x3F + .asciz "?(??)" + .byte 0x53, 0x70 + .asciz "awned Metroid" + .balign 4 + .4byte 0 + .global lbl_803D0620 lbl_803D0620: - .incbin "baserom.dol", 0x3CD620, 0x10 + # ROM: 0x3CD620 + .asciz "TXTR_DataDot" + .balign 4 + .global lbl_803D0630 lbl_803D0630: - .incbin "baserom.dol", 0x3CD630, 0x20 + # ROM: 0x3CD630 + .4byte 0x00000009 + .4byte 0x00000001 + .4byte 0x0000000B + .4byte 0x00000001 + .4byte 0x0000000D + .4byte 0x00000001 + .4byte 0x000000FF + .4byte 0 + .global lbl_803D0650 lbl_803D0650: - .incbin "baserom.dol", 0x3CD650, 0x18 + # ROM: 0x3CD650 + .4byte 0x00000009 + .4byte 0x00000001 + .4byte 0x0000000B + .4byte 0x00000001 + .4byte 0x000000FF + .4byte 0 + .global lbl_803D0668 lbl_803D0668: - .incbin "baserom.dol", 0x3CD668, 0x28 + # ROM: 0x3CD668 + .asciz "??(??)" + .byte 0x50 + .asciz "lasmaElectricFx" + .asciz "PlasmaVisorFx" + .balign 4 + .global lbl_803D0690 lbl_803D0690: - .incbin "baserom.dol", 0x3CD690, 0x40 + # ROM: 0x3CD690 + .asciz "CCollidableSphere" + .byte 0x43, 0x43 + .asciz "ollidableOBBTreeGroup" + .byte 0x43, 0x43 + .asciz "ollidableAABox" + .balign 4 + .4byte 0 + .global lbl_803D06D0 lbl_803D06D0: - .incbin "baserom.dol", 0x3CD6D0, 0x104 + # ROM: 0x3CD6D0 + .4byte 0x803D07E4 + .4byte 0x803D07EB + .4byte 0x40800000 + .4byte 0x3F800000 + .4byte 0x40800000 + .4byte 0x803D07EB + .4byte 0x803D07F3 + .4byte 0x40000000 + .4byte 0x3F800000 + .4byte 0x40000000 + .4byte 0x803D07F3 + .4byte 0x803D07FA + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x803D07FA + .4byte 0x803D0801 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x803D0801 + .4byte 0x803D0808 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x803D080F + .4byte 0x803D0820 + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0x803D0820 + .4byte 0x803D082E + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0x803D083C + .4byte 0x803D084D + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0x803D084D + .4byte 0x803D085B + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0x803D0869 + .4byte 0x803D0879 + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0x803D0879 + .4byte 0x803D0886 + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0x803D0893 + .4byte 0x803D08A3 + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0x803D08A3 + .4byte 0x803D08B0 + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0x3F000000 + .global lbl_803D07D4 lbl_803D07D4: - .incbin "baserom.dol", 0x3CD7D4, 0x10 + # ROM: 0x3CD7D4 + .4byte 0x803D08BD + .4byte 0x3FC00000 + .4byte 0x803D08C4 + .4byte 0x3FC00000 + .global lbl_803D07E4 lbl_803D07E4: - .incbin "baserom.dol", 0x3CD7E4, 0x114 + # ROM: 0x3CD7E4 + .asciz "Pelvis" + .byte 0x53 + .asciz "pine_3" + .byte 0x54 + .asciz "ail_1" + .byte 0x54, 0x61 + .asciz "il_2" + .byte 0x54, 0x61, 0x69 + .4byte 0x6C5F3300 + .asciz "Tail_4" + .byte 0x52 + .asciz "_shoulder_front" + .asciz "R_elbow_front" + .byte 0x52, 0x5F + .asciz "wrist_front" + .asciz "L_shoulder_front" + .byte 0x4C, 0x5F, 0x65 + .asciz "lbow_front" + .byte 0x4C + .asciz "_wrist_front" + .byte 0x52, 0x5F, 0x73 + .asciz "houlder_back" + .byte 0x52, 0x5F, 0x65 + .asciz "lbow_back" + .byte 0x52, 0x5F + .asciz "wrist_back" + .byte 0x4C + .asciz "_shoulder_back" + .byte 0x4C + .asciz "_elbow_back" + .asciz "L_wrist_back" + .byte 0x48, 0x65, 0x61 + .4byte 0x645F3100 + .asciz "Tail_5" + .byte 0x3F + .asciz "?(??)" + .byte 0x49, 0x6E + .asciz "troBoss_Beam" + .byte 0x49, 0x6E, 0x74 + .asciz "roBoss_Beam_Stage2" + .balign 4 + .global lbl_803D08F8 lbl_803D08F8: - .incbin "baserom.dol", 0x3CD8F8, 0x48 + # ROM: 0x3CD8F8 + .asciz "PhazonVeins" + .asciz "PhazonVeins_2" + .byte 0x70, 0x68 + .asciz "azonScale_LCTR_SDK" + .byte 0x3F + .asciz "?(??)" + .byte 0x50, 0x68 + .asciz "azon2nd_1" + .balign 4 + .4byte 0 + .global lbl_803D0940 lbl_803D0940: - .incbin "baserom.dol", 0x3CD940, 0x8 + # ROM: 0x3CD940 + .asciz "??(??)" + .balign 4 + .global lbl_803D0948 lbl_803D0948: - .incbin "baserom.dol", 0x3CD948, 0x8C + # ROM: 0x3CD948 + .asciz "basewidget_energystuff" + .balign 4 + .asciz "textpane_energydigits" + .balign 4 + .asciz "meter_energytanks" + .balign 4 + .asciz "textpane_energywarning" + .balign 4 + .asciz "energybart01_energybar" + .balign 4 + .asciz "basewidget_energydeco0" + .balign 4 + .global lbl_803D09D4 lbl_803D09D4: - .incbin "baserom.dol", 0x3CD9D4, 0x1C + # ROM: 0x3CD9D4 + .asciz "basewidget_bossenergystuff" + .balign 4 + .global lbl_803D09F0 lbl_803D09F0: - .incbin "baserom.dol", 0x3CD9F0, 0x40 + # ROM: 0x3CD9F0 + .asciz "energybart01_bossbar" + .balign 4 + .4byte 0x8018FFA0 ;# ptr + .4byte 0x8018FFA0 ;# ptr + .4byte 0x8018FE7C ;# ptr + .4byte 0x8018FF18 ;# ptr + .4byte 0x8018FF44 ;# ptr + .4byte 0x3E4CCCCD + .4byte 0x3E4CCCCD + .4byte 0x3DCCCCCD + .4byte 0x3E4CCCCD + .4byte 0x3F800000 + .global lbl_803D0A30 lbl_803D0A30: - .incbin "baserom.dol", 0x3CDA30, 0x18 + # ROM: 0x3CDA30 + .asciz "textpane_boss" + .byte 0x25, 0x30 + .4byte 0x32640000 + .4byte 0 + .global lbl_803D0A48 lbl_803D0A48: - .incbin "baserom.dol", 0x3CDA48, 0x16C + # ROM: 0x3CDA48 + .asciz "basewidget_freelook" + .asciz "model_freelookleft" + .balign 4 + .asciz "model_freelookright" + .asciz "basewidget_freelookleft" + .asciz "model_shieldleft" + .balign 4 + .asciz "model_freetickaleft" + .asciz "model_freetickbleft" + .asciz "textpane_freelookleftdigits" + .asciz "basewidget_freelookleftdeco0" + .balign 4 + .asciz "basewidget_freelookright" + .balign 4 + .asciz "model_shieldright" + .balign 4 + .asciz "model_freetickaright" + .balign 4 + .asciz "model_freetickbright" + .balign 4 + .asciz "textpane_freelookrightdigits" + .balign 4 + .asciz "basewidget_freelookrightdeco0" + .balign 4 + .global lbl_803D0BB4 lbl_803D0BB4: - .incbin "baserom.dol", 0x3CDBB4, 0x24 + # ROM: 0x3CDBB4 + .asciz "basewidget_outlinesb" + .byte 0x6D, 0x6F, 0x64 + .asciz "el_shield" + .balign 4 + .global lbl_803D0BD8 lbl_803D0BD8: - .incbin "baserom.dol", 0x3CDBD8, 0x50 + # ROM: 0x3CDBD8 + .asciz "BaseWidget_Pivot" + .balign 4 + .asciz "BaseWidget_Helmet" + .balign 4 + .asciz "BaseWidget_Glow" + .asciz "BaseWidget_HelmetLight" + .balign 4 + .global lbl_803D0C28 lbl_803D0C28: - .incbin "baserom.dol", 0x3CDC28, 0xE0 + # ROM: 0x3CDC28 + .asciz "basewidget_missileicon" + .balign 4 + .asciz "textpane_missiledigits" + .balign 4 + .asciz "energybart01_missilebar" + .asciz "textpane_missilewarning" + .asciz "model_missilearrowup" + .balign 4 + .asciz "model_missilearrowdown" + .balign 4 + .asciz "basewidget_missileicon" + .balign 4 + .asciz "basewidget_missilestuff" + .asciz "meter_mistop" + .balign 4 + .asciz "meter_misbot" + .balign 4 + .global lbl_803D0D08 lbl_803D0D08: - .incbin "baserom.dol", 0x3CDD08, 0x28 + # ROM: 0x3CDD08 + .4byte 0x40C1999A + .4byte 0 + .4byte 0 + .4byte 0x41066666 + .4byte 0 + .4byte 0x80191EB0 ;# ptr + .4byte 0 + .4byte 0x80191D98 ;# ptr + .4byte 0x80191E34 ;# ptr + .4byte 0 + .global lbl_803D0D30 lbl_803D0D30: - .incbin "baserom.dol", 0x3CDD30, 0x8 + # ROM: 0x3CDD30 + .4byte 0x25336400 + .4byte 0 + .global lbl_803D0D38 lbl_803D0D38: - .incbin "baserom.dol", 0x3CDD38, 0x18 + # ROM: 0x3CDD38 + .asciz "BaseWidget_RadarStuff" + .balign 4 + .global lbl_803D0D50 lbl_803D0D50: - .incbin "baserom.dol", 0x3CDD50, 0x10 + # ROM: 0x3CDD50 + .asciz "TXTR_RadarPaint" + .global lbl_803D0D60 lbl_803D0D60: - .incbin "baserom.dol", 0x3CDD60, 0xA4 + # ROM: 0x3CDD60 + .asciz "basewidget_threatstuff" + .balign 4 + .asciz "basewidget_threaticon" + .balign 4 + .asciz "model_threatarrowup" + .asciz "model_threatarrowdown" + .balign 4 + .asciz "textpane_threatwarning" + .balign 4 + .asciz "energybart01_threatbar" + .balign 4 + .asciz "textpane_threatdigits" + .balign 4 + .global lbl_803D0E04 lbl_803D0E04: - .incbin "baserom.dol", 0x3CDE04, 0x28 + # ROM: 0x3CDE04 + .4byte 0x40C1999A + .4byte 0 + .4byte 0 + .4byte 0x41066666 + .4byte 0 + .4byte 0x80193788 ;# ptr + .4byte 0 + .4byte 0x8019367C ;# ptr + .4byte 0x80193710 ;# ptr + .4byte 0 + .global lbl_803D0E2C lbl_803D0E2C: - .incbin "baserom.dol", 0x3CDE2C, 0xC + # ROM: 0x3CDE2C + .asciz "%01.1f" + .balign 4 + .4byte 0 + .global lbl_803D0E38 lbl_803D0E38: - .incbin "baserom.dol", 0x3CDE38, 0x20 + # ROM: 0x3CDE38 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000001 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000005 + .4byte 0x00000006 + .4byte 0x00000007 + .global lbl_803D0E58 lbl_803D0E58: - .incbin "baserom.dol", 0x3CDE58, 0xB8 + # ROM: 0x3CDE58 + .asciz "BaseWidget_VisorMenu" + .byte 0x42, 0x61, 0x73 + .asciz "eWidget_BeamMenu" + .byte 0x54, 0x65, 0x78 + .asciz "tPane_VisorMenu" + .asciz "TextPane_BeamMenu" + .byte 0x62, 0x61 + .asciz "sewidget_visormenutitle" + .asciz "basewidget_beammenutitle" + .byte 0x6D, 0x6F, 0x64 + .asciz "el_visor" + .byte 0x6D, 0x6F, 0x64 + .asciz "el_beam" + .4byte 0x6C6F7A00 + .asciz "icon" + .byte 0x67, 0x68, 0x6F + .4byte 0x73740025 + .4byte 0x73257300 + .asciz "%s%s%c" + .balign 4 + .4byte 0 + .global lbl_803D0F10 lbl_803D0F10: - .incbin "baserom.dol", 0x3CDF10, 0x28 + # ROM: 0x3CDF10 + .asciz "basewidget_deco" + .asciz "basewidget_tickdeco0" + .balign 4 + .global lbl_803D0F38 lbl_803D0F38: - .incbin "baserom.dol", 0x3CDF38, 0x28 + # ROM: 0x3CDF38 + .asciz "basewidget_pivot" + .balign 4 + .asciz "basewidget_frame" + .balign 4 + .global lbl_803D0F60 lbl_803D0F60: - .incbin "baserom.dol", 0x3CDF60, 0x184 + # ROM: 0x3CDF60 + .asciz "basewidget_seeker" + .balign 4 + .asciz "basewidget_leftside" + .asciz "basewidget_leftguages" + .balign 4 + .asciz "basewidget_databankl" + .balign 4 + .asciz "basewidget_rightside" + .balign 4 + .asciz "basewidget_rightguages" + .balign 4 + .asciz "basewidget_databankr" + .balign 4 + .asciz "basewidget_leftsidedeco" + .asciz "basewidget_rightsidedeco" + .balign 4 + .asciz "textpane_scanning" + .balign 4 + .asciz "energybart01_scanbar" + .balign 4 + .asciz "basewidget_scanguage" + .balign 4 + .asciz "basewidget_textgroup" + .balign 4 + .asciz "textpane_message" + .balign 4 + .asciz "textpane_scrollmessage" + .balign 4 + .asciz "model_xmark" + .asciz "model_abutton" + .balign 4 + .asciz "model_dash" + .balign 4 + .global lbl_803D10E4 lbl_803D10E4: - .incbin "baserom.dol", 0x3CE0E4, 0x12C + # ROM: 0x3CE0E4 + .asciz "basewidget_reticle" + .byte 0x6D + .asciz "odel_retflash" + .byte 0x62, 0x61 + .asciz "sewidget_lock" + .byte 0x62, 0x61 + .asciz "sewidget_lockon" + .asciz "basewidget_deco" + .asciz "basewidget_oultlinesa" + .byte 0x6D, 0x6F + .asciz "del_threaticon" + .byte 0x6D + .asciz "odel_missileicon" + .byte 0x46, 0x52, 0x4D + .asciz "E_ScanHudFlat" + .byte 0x62, 0x61 + .asciz "sewidget_rotate" + .asciz "basewidget_energydeco" + .byte 0x6D, 0x6F + .asciz "del_frame" + .byte 0x6D, 0x6F + .asciz "del_frame1" + .byte 0x6D + .asciz "odel_frame2" + .asciz "model_frame3" + .byte 0x6D, 0x6F, 0x64 + .asciz "el_misslieslider" + .byte 0x6D, 0x6F, 0x64 + .asciz "el_threatslider" + .asciz "??(??)" + .balign 4 + .4byte 0 + .global lbl_803D1210 lbl_803D1210: - .incbin "baserom.dol", 0x3CE210, 0x20 + # ROM: 0x3CE210 + .asciz "??(??)" + .byte 0x46 + .asciz "lameThrower_Light" + .balign 4 + .4byte 0 + .global lbl_803D1230 lbl_803D1230: - .incbin "baserom.dol", 0x3CE230, 0xC8 + # ROM: 0x3CE230 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .global lbl_803D12F8 lbl_803D12F8: - .incbin "baserom.dol", 0x3CE2F8, 0x8 + # ROM: 0x3CE2F8 + .asciz "??(??)" + .balign 4 + .global lbl_803D1300 lbl_803D1300: - .incbin "baserom.dol", 0x3CE300, 0x60 + # ROM: 0x3CE300 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .global lbl_803D1360 lbl_803D1360: - .incbin "baserom.dol", 0x3CE360, 0x78 + # ROM: 0x3CE360 + .4byte 0x803D13D8 + .4byte 0x803D13DE + .4byte 0x3ECCCCCD + .4byte 0x3F400000 + .4byte 0x803D13E5 + .4byte 0x803D13ED + .4byte 0x3ECCCCCD + .4byte 0x3F400000 + .4byte 0x803D13F5 + .4byte 0x803D13FB + .4byte 0x3ECCCCCD + .4byte 0x3F400000 + .4byte 0x803D1402 + .4byte 0x803D140A + .4byte 0x3ECCCCCD + .4byte 0x3F400000 + .4byte 0x803D1412 + .4byte 0x3F0CCCCD + .4byte 0x803D141F + .4byte 0x3F8CCCCD + .4byte 0x803D1426 + .4byte 0x3F8CCCCD + .4byte 0x803D1434 + .4byte 0x3F333333 + .4byte 0x803D143E + .4byte 0x3F99999A + .4byte 0x803D144E + .4byte 0x3F19999A + .4byte 0x803D1459 + .4byte 0x3F19999A + .global lbl_803D13D8 lbl_803D13D8: - .incbin "baserom.dol", 0x3CE3D8, 0xC0 + # ROM: 0x3CE3D8 + .asciz "L_hip" + .byte 0x4C, 0x5F + .asciz "knee" + .byte 0x4C, 0x5F, 0x61 + .asciz "nkle" + .byte 0x4C, 0x5F, 0x54 + .asciz "oe_3" + .byte 0x52, 0x5F, 0x68 + .4byte 0x69700052 + .asciz "_knee" + .byte 0x52, 0x5F + .asciz "ankle" + .byte 0x52, 0x5F + .asciz "Toe_3" + .byte 0x4A, 0x61 + .asciz "w_end_LCTR" + .byte 0x50 + .asciz "elvis" + .byte 0x4C, 0x43 + .asciz "TR_SHEMOUTH" + .asciz "butt_LCTR" + .byte 0x49, 0x63 + .asciz "e_Shards_LCTR" + .byte 0x47, 0x69 + .asciz "llL_LCTR" + .byte 0x47, 0x69, 0x6C + .asciz "lR_LCTR" + .asciz "??(??)" + .byte 0x49 + .asciz "ceSheegoth_Flame" + .byte 0x48, 0x65, 0x61 + .4byte 0x645F3100 + .asciz "FlameThrower" + .balign 4 + .4byte 0 + .global lbl_803D1498 lbl_803D1498: - .incbin "baserom.dol", 0x3CE498, 0x8 + # ROM: 0x3CE498 + .asciz "??(??)" + .balign 4 + .global lbl_803D14A0 lbl_803D14A0: - .incbin "baserom.dol", 0x3CE4A0, 0x18 + # ROM: 0x3CE4A0 + .asciz "CollisionActor" + .byte 0x3F + .asciz "?(??)" + .balign 4 + .global lbl_803D14B8 lbl_803D14B8: - .incbin "baserom.dol", 0x3CE4B8, 0x28 + # ROM: 0x3CE4B8 + .asciz "GUN_LCTR" + .byte 0x3F, 0x3F, 0x28 + .4byte 0x3F3F2900 + .asciz "PhazonIndirectTexture" + .balign 4 + .global lbl_803D14E0 lbl_803D14E0: - .incbin "baserom.dol", 0x3CE4E0, 0x88 + # ROM: 0x3CE4E0 + .4byte 0x803D1590 + .4byte 0x803D1598 + .4byte 0x3F19999A + .4byte 0x3F800000 + .4byte 0x803D1598 + .4byte 0x803D15A0 + .4byte 0x3F19999A + .4byte 0x3F800000 + .4byte 0x803D15A0 + .4byte 0x803D15AC + .4byte 0x3F19999A + .4byte 0x3F800000 + .4byte 0x803D15BC + .4byte 0x803D15C4 + .4byte 0x3F19999A + .4byte 0x3F800000 + .4byte 0x803D15C4 + .4byte 0x803D15CC + .4byte 0x3F19999A + .4byte 0x3F800000 + .4byte 0x803D15CC + .4byte 0x803D15D8 + .4byte 0x3F19999A + .4byte 0x3F800000 + .4byte 0x803D15E8 + .4byte 0x3FC00000 + .4byte 0x803D15EF + .4byte 0x3FC00000 + .4byte 0x803D15F7 + .4byte 0x3FC00000 + .4byte 0x803D15FF + .4byte 0x3FC00000 + .4byte 0x803D1607 + .4byte 0x3FC00000 + .global lbl_803D1568 lbl_803D1568: - .incbin "baserom.dol", 0x3CE568, 0x14 + # ROM: 0x3CE568 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000001 + .4byte 0 + .4byte 0xFFFFFFFF + .global lbl_803D157C lbl_803D157C: - .incbin "baserom.dol", 0x3CE57C, 0x14 + # ROM: 0x3CE57C + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0x00000002 + .4byte 0xFFFFFFFF + .global lbl_803D1590 lbl_803D1590: - .incbin "baserom.dol", 0x3CE590, 0xA0 + # ROM: 0x3CE590 + .asciz "L_elbow" + .asciz "L_blade" + .asciz "L_CLAW_LCTR" + .asciz "L_CLAW_END_LCTR" + .asciz "R_elbow" + .asciz "R_blade" + .asciz "R_CLAW_LCTR" + .asciz "R_CLAW_END_LCTR" + .asciz "Head_1" + .byte 0x53 + .asciz "pine_2" + .byte 0x53 + .asciz "pine_4" + .byte 0x53 + .asciz "pine_6" + .byte 0x43 + .asciz "ollar" + .byte 0x3F, 0x3F + .asciz "(??)" + .byte 0x44, 0x65, 0x61 + .4byte 0x6400466C + .asciz "aahgra Renderer" + .4byte 0 + .global lbl_803D1630 lbl_803D1630: - .incbin "baserom.dol", 0x3CE630, 0x8 + # ROM: 0x3CE630 + .asciz "??(??)" + .balign 4 + .global lbl_803D1638 lbl_803D1638: - .incbin "baserom.dol", 0x3CE638, 0x8 + # ROM: 0x3CE638 + .asciz "??(??)" + .balign 4 + .global lbl_803D1640 lbl_803D1640: - .incbin "baserom.dol", 0x3CE640, 0x18 + # ROM: 0x3CE640 + .asciz "??(??)" + .byte 0x49 + .asciz "cePLight_" + .balign 4 + .4byte 0 + .global lbl_803D1658 lbl_803D1658: - .incbin "baserom.dol", 0x3CE658, 0xC + # ROM: 0x3CE658 + .4byte 0x0712072D + .4byte 0x07370732 + .4byte 0x07120000 + .global lbl_803D1664 lbl_803D1664: - .incbin "baserom.dol", 0x3CE664, 0x14 + # ROM: 0x3CE664 + .4byte 0x803D1678 + .4byte 0x803D1685 + .4byte 0x803D168E + .4byte 0x803D1699 + .4byte 0x803D1678 + .global lbl_803D1678 lbl_803D1678: - .incbin "baserom.dol", 0x3CE678, 0xD8 + # ROM: 0x3CE678 + .asciz "SuperMissile" + .byte 0x49, 0x63, 0x65 + .asciz "Combo" + .byte 0x57, 0x61 + .asciz "veBuster" + .byte 0x46, 0x6C, 0x61 + .asciz "meThrower" + .byte 0x3F, 0x3F + .asciz "(??)" + .byte 0x4E, 0x46, 0x54 + .asciz "SecondarySparks" + .asciz "NFTSecondaryFire" + .byte 0x4E, 0x46, 0x54 + .asciz "SecondarySmoke" + .byte 0x4E + .asciz "FTSwooshFire" + .byte 0x4E, 0x46, 0x54 + .asciz "SwooshCenter" + .byte 0x4E, 0x46, 0x54 + .asciz "MainSmoke" + .byte 0x4E, 0x46 + .asciz "TMainFire" + .byte 0x50, 0x6C + .asciz "ayer_FlameThrower" + .byte 0x4D, 0x69 + .asciz "ssile" + .byte 0x46, 0x6C + .asciz "ameMuzzle" + .byte 0x42, 0x75 + .asciz "sterMuzzle" + .balign 4 + .global lbl_803D1750 lbl_803D1750: - .incbin "baserom.dol", 0x3CE750, 0x28 + # ROM: 0x3CE750 + .4byte 0x803D1828 + .4byte 0x803D1834 + .4byte 0x803D1840 + .4byte 0x803D184A + .4byte 0x803D1828 + .4byte 0x803D1854 + .4byte 0x803D185F + .4byte 0x803D186C + .4byte 0x803D1879 + .4byte 0x803D1886 + .global lbl_803D1778 lbl_803D1778: - .incbin "baserom.dol", 0x3CE778, 0x28 + # ROM: 0x3CE778 + .4byte 0x803D1892 + .4byte 0x803D189E + .4byte 0x803D18A7 + .4byte 0x803D189E + .4byte 0x803D18B1 + .4byte 0x803D189E + .4byte 0x803D18BC + .4byte 0x803D189E + .4byte 0x803D18A7 + .4byte 0x803D189E + .global lbl_803D17A0 lbl_803D17A0: - .incbin "baserom.dol", 0x3CE7A0, 0x14 + # ROM: 0x3CE7A0 + .4byte 0x803D18C9 + .4byte 0x803D18D3 + .4byte 0x803D18DB + .4byte 0x803D18E4 + .4byte 0x803D18EF + .global lbl_803D17B4 lbl_803D17B4: - .incbin "baserom.dol", 0x3CE7B4, 0x14 + # ROM: 0x3CE7B4 + .4byte 0x803D18FA + .4byte 0x803D190A + .4byte 0x803D1918 + .4byte 0x803D1927 + .4byte 0x803D1938 + .global lbl_803D17C8 lbl_803D17C8: - .incbin "baserom.dol", 0x3CE7C8, 0x14 + # ROM: 0x3CE7C8 + .4byte 0x803D1949 + .4byte 0x803D1954 + .4byte 0x803D195D + .4byte 0x803D1967 + .4byte 0x803D1973 + .global lbl_803D17DC lbl_803D17DC: - .incbin "baserom.dol", 0x3CE7DC, 0x20 + # ROM: 0x3CE7DC + .4byte 0x803D197F + .4byte 0x803D1988 + .4byte 0x803D1993 + .4byte 0x803D199C + .4byte 0x803D19A6 + .4byte 0x803D19B0 + .4byte 0x803D19BB + .4byte 0x803D19C6 + .global lbl_803D17FC lbl_803D17FC: - .incbin "baserom.dol", 0x3CE7FC, 0x2C + # ROM: 0x3CE7FC + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000005 + .4byte 0x00000006 + .4byte 0x00000007 + .4byte 0x00000008 + .4byte 0x00000009 + .4byte 0x0000000A + .global lbl_803D1828 lbl_803D1828: - .incbin "baserom.dol", 0x3CE828, 0x1C8 + # ROM: 0x3CE828 + .asciz "PowerMuzzle" + .asciz "PowerCharge" + .asciz "IceMuzzle" + .byte 0x49, 0x63 + .asciz "eCharge" + .asciz "WaveCharge" + .byte 0x50 + .asciz "lasmaMuzzle" + .asciz "PlasmaCharge" + .byte 0x50, 0x68, 0x61 + .asciz "zonMuzzle" + .byte 0x45, 0x6D + .asciz "ptyMuzzle" + .byte 0x70, 0x6F + .asciz "werFrozen" + .byte 0x49, 0x63 + .asciz "e2nd_2" + .byte 0x69 + .asciz "ceFrozen" + .byte 0x77, 0x61, 0x76 + .asciz "eFrozen" + .asciz "plasmaFrozen" + .byte 0x50, 0x6F, 0x77 + .asciz "erXfer" + .byte 0x49 + .asciz "ceXfer" + .byte 0x57 + .asciz "aveXfer" + .asciz "PlasmaXfer" + .byte 0x50 + .asciz "hazonXfer" + .byte 0x50, 0x6F + .asciz "wer_Anim_DGRP" + .byte 0x49, 0x63 + .asciz "e_Anim_DGRP" + .asciz "Wave_Anim_DGRP" + .byte 0x50 + .asciz "lasma_Anim_DGRP" + .asciz "Phazon_Anim_DGRP" + .byte 0x50, 0x6F, 0x77 + .asciz "er_DGRP" + .asciz "Ice_DGRP" + .byte 0x57, 0x61, 0x76 + .asciz "e_DGRP" + .byte 0x50 + .asciz "lasma_DGRP" + .byte 0x50 + .asciz "hazon_DGRP" + .byte 0x50 + .asciz "owerArm" + .asciz "GravityArm" + .byte 0x56 + .asciz "ariaArm" + .asciz "PhazonArm" + .byte 0x46, 0x75 + .asciz "sionArm" + .asciz "FusionArmG" + .byte 0x46 + .asciz "usionArmV" + .byte 0x46, 0x75 + .asciz "sionArmP" + .byte 0x4C, 0x42, 0x45 + .4byte 0x414D0065 + .asciz "lbow" + .byte 0x3F, 0x3F, 0x28 + .4byte 0x3F3F2900 + .asciz "Whole Body" + .balign 4 + .global lbl_803D19F0 lbl_803D19F0: - .incbin "baserom.dol", 0x3CE9F0, 0x8 + # ROM: 0x3CE9F0 + .4byte 0 + .4byte 0 + .global lbl_803D19F8 lbl_803D19F8: - .incbin "baserom.dol", 0x3CE9F8, 0x10 + # ROM: 0x3CE9F8 + .4byte 0xFFFFFFFF + .4byte 0xFF00FFFF + .4byte 0xFF0000FF + .4byte 0x0000FFFF + .global lbl_803D1A08 lbl_803D1A08: - .incbin "baserom.dol", 0x3CEA08, 0x18 + # ROM: 0x3CEA08 + .4byte 0x00000009 + .4byte 0x00000001 + .4byte 0x0000000B + .4byte 0x00000001 + .4byte 0x000000FF + .4byte 0 + .global lbl_803D1A20 lbl_803D1A20: - .incbin "baserom.dol", 0x3CEA20, 0x58 + # ROM: 0x3CEA20 + .asciz "WaveBuster_Light" + .byte 0x57, 0x61, 0x76 + .asciz "eBuster" + .asciz "BusterSwoosh1" + .byte 0x42, 0x75 + .asciz "sterSwoosh2" + .asciz "BusterSparks" + .byte 0x42, 0x75, 0x73 + .asciz "terLight" + .byte 0x3F, 0x3F, 0x28 + .4byte 0x3F3F2900 + .global lbl_803D1A78 lbl_803D1A78: - .incbin "baserom.dol", 0x3CEA78, 0x8 + # ROM: 0x3CEA78 + .asciz "??(??)" + .balign 4 + .global lbl_803D1A80 lbl_803D1A80: - .incbin "baserom.dol", 0x3CEA80, 0x20 + # ROM: 0x3CEA80 + .asciz "Pelvis" + .byte 0x4C + .asciz "_Claw_1" + .asciz "R_Claw_1" + .byte 0x3F, 0x3F, 0x28 + .4byte 0x3F3F2900 + .global lbl_803D1AA0 lbl_803D1AA0: - .incbin "baserom.dol", 0x3CEAA0, 0x8 + # ROM: 0x3CEAA0 + .asciz "??(??)" + .balign 4 + .global lbl_803D1AA8 lbl_803D1AA8: - .incbin "baserom.dol", 0x3CEAA8, 0x10 + # ROM: 0x3CEAA8 + .asciz "Whole Body" + .balign 4 + .4byte 0 + .global lbl_803D1AB8 lbl_803D1AB8: - .incbin "baserom.dol", 0x3CEAB8, 0x10 + # ROM: 0x3CEAB8 + .asciz "Whole Body" + .balign 4 + .4byte 0 + .global lbl_803D1AC8 lbl_803D1AC8: - .incbin "baserom.dol", 0x3CEAC8, 0x10 + # ROM: 0x3CEAC8 + .asciz "Whole Body" + .balign 4 + .4byte 0 + .global lbl_803D1AD8 lbl_803D1AD8: - .incbin "baserom.dol", 0x3CEAD8, 0x88 + # ROM: 0x3CEAD8 + .asciz "basewidget_bombstuff" + .balign 4 + .asciz "textpane_bombdigits" + .asciz "group_bombcount" + .asciz "model_bomb_text" + .asciz "model_bombicon" + .balign 4 + .asciz "basewidget_energydeco" + .balign 4 + .asciz "basewidget_bombdeco" + .global lbl_803D1B60 lbl_803D1B60: - .incbin "baserom.dol", 0x3CEB60, 0x10 + # ROM: 0x3CEB60 + .asciz "%02d" + .byte 0x25, 0x73, 0x25 + .4byte 0x64000000 + .4byte 0 + .global lbl_803D1B70 lbl_803D1B70: - .incbin "baserom.dol", 0x3CEB70, 0x18 + # ROM: 0x3CEB70 + .asciz "??(??)" + .byte 0x57 + .asciz "hole Body" + .balign 4 + .4byte 0 + .global lbl_803D1B88 lbl_803D1B88: - .incbin "baserom.dol", 0x3CEB88, 0x8 + # ROM: 0x3CEB88 + .asciz "??(??)" + .balign 4 + .global lbl_803D1B90 lbl_803D1B90: - .incbin "baserom.dol", 0x3CEB90, 0x10 + # ROM: 0x3CEB90 + .asciz "??(??)" + .byte 0x56 + .asciz "isorGoo" + .global lbl_803D1BA0 lbl_803D1BA0: - .incbin "baserom.dol", 0x3CEBA0, 0x1C + # ROM: 0x3CEBA0 + .4byte 0x803D1CBF + .4byte 0x803D1CC6 + .4byte 0x803D1CD0 + .4byte 0x803D1CD8 + .4byte 0x803D1CDE + .4byte 0x803D1CF3 + .4byte 0x803D1CB8 + .global lbl_803D1BBC lbl_803D1BBC: - .incbin "baserom.dol", 0x3CEBBC, 0x1C + # ROM: 0x3CEBBC + .4byte 0x803D1CBF + .4byte 0x803D1D04 + .4byte 0x803D1D1B + .4byte 0x803D1D32 + .4byte 0x803D1D48 + .4byte 0x803D1D63 + .4byte 0x803D1D7E + .global lbl_803D1BD8 lbl_803D1BD8: - .incbin "baserom.dol", 0x3CEBD8, 0xE0 + # ROM: 0x3CEBD8 + .4byte 0x803D1D92 + .4byte 0 + .4byte 0x41300000 + .4byte 0 + .4byte 0x803D1D92 + .4byte 0 + .4byte 0x41100000 + .4byte 0 + .4byte 0x803D1D92 + .4byte 0 + .4byte 0x40E00000 + .4byte 0 + .4byte 0x803D1D92 + .4byte 0xC0400000 + .4byte 0x41100000 + .4byte 0 + .4byte 0x803D1D92 + .4byte 0x40800000 + .4byte 0x40E00000 + .4byte 0 + .4byte 0x803D1D92 + .4byte 0xC0800000 + .4byte 0x41000000 + .4byte 0 + .4byte 0x803D1CBF + .4byte 0x3F800000 + .4byte 0x803D1D04 + .4byte 0x3FC00000 + .4byte 0x803D1D1B + .4byte 0x3FC00000 + .4byte 0x803D1D32 + .4byte 0x3F800000 + .4byte 0x803D1D48 + .4byte 0x40200000 + .4byte 0x803D1D63 + .4byte 0x3FC00000 + .4byte 0x803D1D7E + .4byte 0x3FC00000 + .4byte 0x803D1D93 + .4byte 0x3F400000 + .4byte 0x803D1DAD + .4byte 0x3F400000 + .4byte 0x803D1DC7 + .4byte 0x3F400000 + .4byte 0x803D1DDC + .4byte 0x40100000 + .4byte 0x803D1DF2 + .4byte 0x40000000 + .4byte 0x803D1E08 + .4byte 0x40400000 + .4byte 0x40400000 + .4byte 0x3F800000 + .4byte 0x803D1E1E + .4byte 0x40400000 + .4byte 0x40000000 + .4byte 0x40400000 + .global lbl_803D1CB8 lbl_803D1CB8: - .incbin "baserom.dol", 0x3CECB8, 0x1E0 + # ROM: 0x3CECB8 + .asciz "Neck_1" + .byte 0x52 + .asciz "_knee" + .byte 0x52, 0x5F + .asciz "forearm" + .asciz "L_elbow" + .asciz "L_hip" + .byte 0x52, 0x5F + .asciz "collar_BigRock_SDK" + .byte 0x63 + .asciz "ollar_rock4_SDK" + .asciz "R_Elbow_Collision_LCTR" + .byte 0x4C + .asciz "_Elbow_Collision_LCTR" + .byte 0x4C, 0x5F + .asciz "Knee_Collision_LCTR" + .asciz "R_Back_Rock_Collision_LCTR" + .byte 0x4C + .asciz "_Back_Rock_Collision_LCTR" + .byte 0x48, 0x65 + .asciz "ad_Collision_LCTR" + .byte 0x00, 0x52 + .asciz "_Shoulder_Collision_LCTR" + .byte 0x4C, 0x5F, 0x53 + .asciz "houlder_Collision_LCTR" + .byte 0x53 + .asciz "pine_Collision_LCTR" + .asciz "R_Hand_Collision_LCTR" + .byte 0x4C, 0x5F + .asciz "Hand_Collision_LCTR" + .asciz "R_Foot_Collision_LCTR" + .byte 0x4C, 0x5F + .asciz "Foot_Collision_LCTR" + .asciz "center_LCTR" + .asciz "ROCK_EFFECT" + .4byte 0x2D005375 + .4byte 0x636B0044 + .asciz "oubleSnap" + .byte 0x46, 0x6C + .asciz "inch" + .byte 0x46, 0x61, 0x69 + .4byte 0x6E74003F + .asciz "?(??)" + .byte 0x4C, 0x5F + .asciz "wrist" + .byte 0x52, 0x5F + .asciz "ankle" + .byte 0x54, 0x68 + .asciz "ermal_Spot_2" + .balign 4 + .4byte 0 + .global lbl_803D1E98 lbl_803D1E98: - .incbin "baserom.dol", 0x3CEE98, 0x18 + # ROM: 0x3CEE98 + .4byte 0x803D1EB0 + .4byte 0x803D1EBE + .4byte 0x803D1ECE + .4byte 0x803D1ED9 + .4byte 0x803D1EE8 + .4byte 0x803D1EF8 + .global lbl_803D1EB0 lbl_803D1EB0: - .incbin "baserom.dol", 0x3CEEB0, 0x70 + # ROM: 0x3CEEB0 + .asciz "Effect_OnFire" + .byte 0x45, 0x66 + .asciz "fect_IceBreak" + .byte 0x45, 0x66 + .asciz "fect_Ash" + .byte 0x45, 0x66, 0x66 + .asciz "ect_FirePop" + .asciz "Effect_Electric" + .asciz "Effect_IcePop" + .byte 0x5F, 0x44 + .4byte 0x47525000 + .asciz "??(??)" + .byte 0x54 + .asciz "XTR_Ashy" + .balign 4 + .global lbl_803D1F20 lbl_803D1F20: - .incbin "baserom.dol", 0x3CEF20, 0x10 + # ROM: 0x3CEF20 + .4byte 0x00000008 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .global lbl_803D1F30 lbl_803D1F30: - .incbin "baserom.dol", 0x3CEF30, 0x18 + # ROM: 0x3CEF30 + .asciz "Whole Body" + .byte 0x3F + .asciz "?(??)" + .balign 4 + .4byte 0 + .global lbl_803D1F48 lbl_803D1F48: - .incbin "baserom.dol", 0x3CEF48, 0xB8 + # ROM: 0x3CEF48 + .asciz "textpane_message" + .byte 0x62, 0x61, 0x73 + .asciz "ewidget_top" + .asciz "basewidget_center" + .byte 0x62, 0x61 + .asciz "sewidget_bottom" + .asciz "model_abutton" + .byte 0x6D, 0x6F + .asciz "del_top" + .asciz "model_bottom" + .byte 0x6D, 0x6F, 0x64 + .asciz "el_center" + .byte 0x6D, 0x6F + .asciz "del_bg" + .byte 0x6D + .asciz "odel_videoband" + .byte 0x62 + .asciz "asewidget_centerdeco" + .byte 0x46, 0x52, 0x4D + .asciz "E_MsgScreen" + .4byte 0 + .global lbl_803D2000 lbl_803D2000: - .incbin "baserom.dol", 0x3CF000, 0x18 + # ROM: 0x3CF000 + .4byte 0x803D2018 + .4byte 0x40000000 + .4byte 0x803D201E + .4byte 0x3F99999A + .4byte 0x803D2025 + .4byte 0x3F99999A + .global lbl_803D2018 lbl_803D2018: - .incbin "baserom.dol", 0x3CF018, 0x20 + # ROM: 0x3CF018 + .asciz "Arm_8" + .byte 0x41, 0x72 + .asciz "m_10" + .byte 0x41, 0x72, 0x6D + .4byte 0x5F313200 + .asciz "??(??)" + .byte 0x44 + .4byte 0x65616400 + .global lbl_803D2038 lbl_803D2038: - .incbin "baserom.dol", 0x3CF038, 0x18 + # ROM: 0x3CF038 + .asciz "Whole Body" + .byte 0x3F + .asciz "?(??)" + .balign 4 + .4byte 0 + .global lbl_803D2050 lbl_803D2050: - .incbin "baserom.dol", 0x3CF050, 0x20 + # ROM: 0x3CF050 + .asciz "??(??)" + .byte 0x49 + .asciz "ceAttackProjectile" + .balign 4 + .4byte 0 + .global lbl_803D2070 lbl_803D2070: - .incbin "baserom.dol", 0x3CF070, 0x3D0 + # ROM: 0x3CF070 + .asciz "??(??)" + .balign 4 + .4byte 0x0000000A + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x0000000B + .4byte 0x0000000C + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0x00000014 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000005 + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0x00000014 + .4byte 0x0000000A + .4byte 0x0000000B + .4byte 0x0000000C + .4byte 0x0000000D + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0x00000019 + .4byte 0x0000000F + .4byte 0x00000010 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0x00000019 + .4byte 0x00000005 + .4byte 0x00000006 + .4byte 0x00000007 + .4byte 0x00000008 + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000005 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x0000000B + .4byte 0x0000000C + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0x0000000A + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000005 + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0x0000000A + .4byte 0x0000000A + .4byte 0x0000000B + .4byte 0x0000000C + .4byte 0x0000000D + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0x00000028 + .4byte 0x0000000F + .4byte 0x00000010 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0x00000023 + .4byte 0x00000005 + .4byte 0x00000006 + .4byte 0x00000007 + .4byte 0x00000008 + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000001E + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000005 + .4byte 0x0000000B + .4byte 0x0000000C + .4byte 0x00000004 + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0x00000014 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000005 + .4byte 0x00000004 + .4byte 0x00000003 + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0x00000014 + .4byte 0x00000005 + .4byte 0x00000004 + .4byte 0x00000003 + .4byte 0x0000000D + .4byte 0x0000000C + .4byte 0x0000000B + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0x0000001E + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000005 + .4byte 0x00000006 + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000000A + .4byte 0x00000006 + .4byte 0x00000005 + .4byte 0x00000004 + .4byte 0x0000000E + .4byte 0x0000000D + .4byte 0x0000000C + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0x00000014 + .4byte 0x0000000E + .4byte 0x0000000D + .4byte 0x0000000C + .4byte 0x0000000B + .4byte 0x0000000A + .4byte 0x00000009 + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0x00000014 + .4byte 0x0000000E + .4byte 0x0000000F + .4byte 0x00000010 + .4byte 0x0000000B + .4byte 0x0000000A + .4byte 0x00000009 + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0x00000032 + .4byte 0x0000000B + .4byte 0x0000000A + .4byte 0x00000009 + .4byte 0x00000008 + .4byte 0x00000007 + .4byte 0x00000006 + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0x3DCCCCCD + .4byte 0x3D4CCCCD + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .global lbl_803D2440 lbl_803D2440: - .incbin "baserom.dol", 0x3CF440, 0x3C + # ROM: 0x3CF440 + .4byte 0x3EE66666 + .4byte 0x3F051EB8 + .4byte 0x3EB33333 + .4byte 0x3DCCCCCD + .4byte 0x3E19999A + .4byte 0x3EB33333 + .4byte 0x3DCCCCCD + .4byte 0x3E19999A + .4byte 0x3E19999A + .4byte 0x3E19999A + .4byte 0x3E19999A + .4byte 0x3E19999A + .4byte 0x3E19999A + .4byte 0x3E19999A + .4byte 0x3EB33333 + .global lbl_803D247C lbl_803D247C: - .incbin "baserom.dol", 0x3CF47C, 0x104 + # ROM: 0x3CF47C + .asciz "Explode" + .asciz "??(??)" + .balign 4 + .asciz "GetUpNow" + .byte 0x48, 0x65, 0x61 + .4byte 0x645F3100 + .asciz "L_gun_LCTR" + .byte 0x4C + .asciz "_Missile_LCTR" + .byte 0x52, 0x5F + .asciz "Missile_LCTR" + .byte 0x53, 0x6B, 0x65 + .asciz "leton_Root" + .byte 0x4A + .asciz "etPack" + .byte 0x53 + .asciz "cubaGear" + .byte 0x53, 0x63, 0x75 + .asciz "baBubbles" + .byte 0x53, 0x70 + .asciz "arks" + .byte 0x4C, 0x61, 0x6E + .asciz "dingSmoke" + .byte 0x45, 0x79 + .4byte 0x65730043 + .asciz "ollar" + .byte 0x52, 0x5F + .asciz "shoulder" + .byte 0x52, 0x5F, 0x65 + .asciz "lbow" + .byte 0x52, 0x5F, 0x77 + .asciz "rist" + .byte 0x4C, 0x5F, 0x73 + .asciz "houlder" + .asciz "L_elbow" + .asciz "L_wrist" + .asciz "R_hip" + .byte 0x52, 0x5F + .asciz "knee" + .byte 0x52, 0x5F, 0x61 + .asciz "nkle" + .byte 0x4C, 0x5F, 0x68 + .4byte 0x6970004C + .asciz "_knee" + .byte 0x4C, 0x5F + .asciz "ankle" + .byte 0x72, 0x6F + .asciz "cket_LCTR" + .balign 4 + .global lbl_803D2580 lbl_803D2580: - .incbin "baserom.dol", 0x3CF580, 0x8 + # ROM: 0x3CF580 + .asciz "??(??)" + .balign 4 + .global lbl_803D2588 lbl_803D2588: - .incbin "baserom.dol", 0x3CF588, 0x8 + # ROM: 0x3CF588 + .asciz "??(??)" + .balign 4 + .global lbl_803D2590 lbl_803D2590: - .incbin "baserom.dol", 0x3CF590, 0x124 + # ROM: 0x3CF590 + .asciz "Rock_01_Collision_LCTR" + .byte 0x52 + .asciz "OCK_PROJECTILE_EFFECT-%u-%i" + .asciz "??(??)" + .balign 4 + .4byte 0 + .4byte 0 + .4byte 0x00000024 + .4byte 0x00000046 + .4byte 0x00000001 + .4byte 0x00000025 + .4byte 0x00000048 + .4byte 0x00000002 + .4byte 0x00000026 + .4byte 0x0000004A + .4byte 0x00000003 + .4byte 0x00000027 + .4byte 0x0000004C + .4byte 0x00000004 + .4byte 0x00000028 + .4byte 0x0000004E + .4byte 0x00000005 + .4byte 0x0000002E + .4byte 0x00000057 + .4byte 0x00000006 + .4byte 0x0000002F + .4byte 0x00000058 + .4byte 0x00000007 + .4byte 0x00000030 + .4byte 0x00000059 + .4byte 0x00000008 + .4byte 0x00000031 + .4byte 0x0000005A + .4byte 0x00000009 + .4byte 0x00000032 + .4byte 0x0000005B + .4byte 0x0000000A + .4byte 0x00000033 + .4byte 0x00000052 + .4byte 0x0000000B + .4byte 0x00000034 + .4byte 0x00000053 + .4byte 0x0000000C + .4byte 0x00000035 + .4byte 0x00000054 + .4byte 0x0000000D + .4byte 0x00000036 + .4byte 0x00000055 + .4byte 0x0000000E + .4byte 0x00000037 + .4byte 0x00000056 + .4byte 0x0000000F + .4byte 0x00000038 + .4byte 0x00000042 + .4byte 0x00000010 + .4byte 0x00000039 + .4byte 0x00000043 + .4byte 0x00000011 + .4byte 0x0000003A + .4byte 0x00000044 + .4byte 0x00000012 + .4byte 0x0000003B + .4byte 0x00000045 + .global lbl_803D26B4 lbl_803D26B4: - .incbin "baserom.dol", 0x3CF6B4, 0x3C + # ROM: 0x3CF6B4 + .4byte 0x00000013 + .4byte 0x0000003C + .4byte 0x0000004F + .4byte 0x00000014 + .4byte 0x0000003D + .4byte 0x00000050 + .4byte 0x00000015 + .4byte 0x0000003E + .4byte 0x00000051 + .4byte 0x00000016 + .4byte 0x0000003F + .4byte 0x0000005C + .4byte 0x00000017 + .4byte 0x00000040 + .4byte 0x0000005D + .global lbl_803D26F0 lbl_803D26F0: - .incbin "baserom.dol", 0x3CF6F0, 0x28 + # ROM: 0x3CF6F0 + .4byte 0x00000005 + .4byte 0x803D25D0 + .4byte 0x00000005 + .4byte 0x803D260C + .4byte 0x00000005 + .4byte 0x803D2648 + .4byte 0x00000004 + .4byte 0x803D2684 + .4byte 0x00000005 + .4byte 0x803D26B4 + .global lbl_803D2718 lbl_803D2718: - .incbin "baserom.dol", 0x3CF718, 0x8 + # ROM: 0x3CF718 + .asciz "??(??)" + .balign 4 + .global lbl_803D2720 lbl_803D2720: - .incbin "baserom.dol", 0x3CF720, 0x18 + # ROM: 0x3CF720 + .4byte 0x00000009 + .4byte 0x00000001 + .4byte 0x0000000D + .4byte 0x00000001 + .4byte 0x000000FF + .4byte 0 + .global lbl_803D2738 lbl_803D2738: - .incbin "baserom.dol", 0x3CF738, 0x18 + # ROM: 0x3CF738 + .asciz "??(??)" + .byte 0x46 + .asciz "laahgra Plants" + .balign 4 + .global lbl_803D2750 lbl_803D2750: - .incbin "baserom.dol", 0x3CF750, 0x18 + # ROM: 0x3CF750 + .4byte 0x00000009 + .4byte 0x00000001 + .4byte 0x0000000D + .4byte 0x00000001 + .4byte 0x000000FF + .4byte 0 + .global lbl_803D2768 lbl_803D2768: - .incbin "baserom.dol", 0x3CF768, 0x10 + # ROM: 0x3CF768 + .asciz "??(??)" + .byte 0x47 + .asciz "UN_LCTR" + .global lbl_803D2778 lbl_803D2778: - .incbin "baserom.dol", 0x3CF778, 0x18 + # ROM: 0x3CF778 + .asciz "L.dsp" + .byte 0x52, 0x2E + .4byte 0x64737000 + .4byte 0x7377002E + .4byte 0x64737000 + .4byte 0 + .global lbl_803D2790 lbl_803D2790: - .incbin "baserom.dol", 0x3CF790, 0x20 + # ROM: 0x3CF790 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x41200000 + .4byte 0 + .global lbl_803D27B0 lbl_803D27B0: - .incbin "baserom.dol", 0x3CF7B0, 0x18 + # ROM: 0x3CF7B0 + .4byte 0x00000009 + .4byte 0x00000001 + .4byte 0x0000000D + .4byte 0x00000001 + .4byte 0x000000FF + .4byte 0 + .global lbl_803D27C8 lbl_803D27C8: - .incbin "baserom.dol", 0x3CF7C8, 0x18 + # ROM: 0x3CF7C8 + .4byte 0x00000009 + .4byte 0x00000001 + .4byte 0x0000000D + .4byte 0x00000001 + .4byte 0x000000FF + .4byte 0 + .global lbl_803D27E0 lbl_803D27E0: - .incbin "baserom.dol", 0x3CF7E0, 0x20 + # ROM: 0x3CF7E0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xC1200000 + .4byte 0 + .global lbl_803D2800 lbl_803D2800: - .incbin "baserom.dol", 0x3CF800, 0x18 + # ROM: 0x3CF800 + .4byte 0x00000009 + .4byte 0x00000001 + .4byte 0x0000000B + .4byte 0x00000001 + .4byte 0x000000FF + .4byte 0 + .global lbl_803D2818 lbl_803D2818: - .incbin "baserom.dol", 0x3CF818, 0x78 + # ROM: 0x3CF818 + .asciz "DUMB_SnowForces" + .asciz "??(??)" + .byte 0x56 + .asciz "isorRainSplashes" + .byte 0x54, 0x58, 0x54 + .asciz "R_EnvGradient" + .byte 0x50, 0x41 + .asciz "RT_EnvRainSplash" + .byte 0x54, 0x58, 0x54 + .asciz "R_SnowFlake" + .asciz "TXTR_UnderwaterFlake" + .balign 4 + .4byte 0 + .global lbl_803D2890 lbl_803D2890: - .incbin "baserom.dol", 0x3CF890, 0x78 + # ROM: 0x3CF890 + .asciz "ProjectileLight_GameProjectile" + .byte 0x3F + .asciz "?(??)" + .byte 0x50, 0x72 + .asciz "ojectile collision response" + .asciz "IceSpread1" + .byte 0x49 + .asciz "ce spread explosion" + .asciz "GameProjectile" + .balign 4 + .4byte 0 + .global lbl_803D2908 lbl_803D2908: - .incbin "baserom.dol", 0x3CF908, 0x6E8 + # ROM: 0x3CF908 + .4byte 0x00000005 + .4byte 0x00000007 + .4byte 0x00000009 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000003 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3E19999A + .4byte 0x3D4CCCCD + .4byte 0x00000003 + .4byte 0x00000007 + .4byte 0x00000006 + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3E19999A + .4byte 0x3D4CCCCD + .4byte 0x00000004 + .4byte 0x00000003 + .4byte 0x00000005 + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3E19999A + .4byte 0x3D4CCCCD + .4byte 0x0000003C + .4byte 0x00000010 + .4byte 0x00000004 + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3E19999A + .4byte 0x3D4CCCCD + .4byte 0x0000001E + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3E19999A + .4byte 0x3D4CCCCD + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000001E + .4byte 0x00000004 + .4byte 0x00000005 + .4byte 0x00000004 + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3E19999A + .4byte 0x3D4CCCCD + .4byte 0x0000001E + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3E19999A + .4byte 0x3D4CCCCD + .4byte 0x0000001E + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000005 + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3E19999A + .4byte 0x3D4CCCCD + .4byte 0x00000005 + .4byte 0x00000010 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3E19999A + .4byte 0x3D4CCCCD + .4byte 0x00000005 + .4byte 0x00000008 + .4byte 0x00000007 + .4byte 0x00000006 + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3E19999A + .4byte 0x3D4CCCCD + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000005 + .4byte 0x00000010 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3E19999A + .4byte 0x3D4CCCCD + .4byte 0x00000005 + .4byte 0x00000009 + .4byte 0x00000008 + .4byte 0x00000007 + .4byte 0x00000006 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3E19999A + .4byte 0x3D4CCCCD + .4byte 0x0000000F + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000005 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3E19999A + .4byte 0x3D4CCCCD + .4byte 0x0000000F + .4byte 0x00000005 + .4byte 0x00000004 + .4byte 0x00000003 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3E19999A + .4byte 0x3D4CCCCD + .4byte 0x0000000F + .4byte 0x0000000A + .4byte 0x0000000B + .4byte 0x00000004 + .4byte 0x0000000D + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3E19999A + .4byte 0x3D4CCCCD + .4byte 0x0000000F + .4byte 0x0000000E + .4byte 0x0000000D + .4byte 0x00000004 + .4byte 0x0000000B + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3E19999A + .4byte 0x3D4CCCCD + .4byte 0x0000001E + .4byte 0x00000002 + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0x00000006 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3E19999A + .4byte 0x3D4CCCCD + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000014 + .4byte 0x00000010 + .4byte 0x0000000F + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3E19999A + .4byte 0x3D4CCCCD + .4byte 0x00000014 + .4byte 0x00000008 + .4byte 0x00000009 + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3E19999A + .4byte 0x3D4CCCCD + .4byte 0x00000014 + .4byte 0x0000000D + .4byte 0x0000000B + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3E19999A + .4byte 0x3D4CCCCD + .4byte 0x00000014 + .4byte 0x00000002 + .4byte 0x00000006 + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3E19999A + .4byte 0x3D4CCCCD + .4byte 0x00000014 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3E19999A + .4byte 0x3D4CCCCD + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000000A + .4byte 0x0000000E + .4byte 0x00000004 + .4byte 0x0000000A + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3E19999A + .4byte 0x3D4CCCCD + .4byte 0x0000000A + .4byte 0x0000000F + .4byte 0x0000000D + .4byte 0x00000004 + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3E19999A + .4byte 0x3D4CCCCD + .4byte 0x0000000A + .4byte 0x00000009 + .4byte 0x0000000B + .4byte 0x00000004 + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3E19999A + .4byte 0x3D4CCCCD + .4byte 0x00000023 + .4byte 0x0000000F + .4byte 0x0000000D + .4byte 0x0000000B + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3E19999A + .4byte 0x3D4CCCCD + .4byte 0x00000023 + .4byte 0x00000009 + .4byte 0x0000000B + .4byte 0x0000000D + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3E19999A + .4byte 0x3D4CCCCD + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x0000000A + .4byte 0x0000000E + .4byte 0x0000000D + .4byte 0x00000004 + .4byte 0x0000000B + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3E19999A + .4byte 0x3D4CCCCD + .4byte 0x0000001E + .4byte 0x00000001 + .4byte 0x0000000F + .4byte 0x0000000D + .4byte 0x0000000B + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3E19999A + .4byte 0x3D4CCCCD + .4byte 0x00000014 + .4byte 0x00000010 + .4byte 0x0000000F + .4byte 0x0000000E + .4byte 0x0000000D + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3E19999A + .4byte 0x3D4CCCCD + .4byte 0x0000000A + .4byte 0x00000008 + .4byte 0x00000009 + .4byte 0x0000000B + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3E19999A + .4byte 0x3D4CCCCD + .4byte 0x0000000A + .4byte 0x00000001 + .4byte 0x0000000F + .4byte 0x0000000D + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3E19999A + .4byte 0x3D4CCCCD + .4byte 0x00000014 + .4byte 0x00000008 + .4byte 0x00000009 + .4byte 0x0000000A + .4byte 0x0000000B + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3E19999A + .4byte 0x3D4CCCCD + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .global lbl_803D2FF0 lbl_803D2FF0: - .incbin "baserom.dol", 0x3CFFF0, 0x48 + # ROM: 0x3CFFF0 + .asciz "Gun_SDK" + .asciz "Blast_LCTR" + .byte 0x6C + .asciz "ight_LCTR" + .byte 0x6C, 0x6F + .asciz "ckon_target_LCTR" + .byte 0x3F, 0x3F, 0x28 + .4byte 0x3F3F2900 + .asciz "ParticleLight_" + .balign 4 + .global lbl_803D3038 lbl_803D3038: - .incbin "baserom.dol", 0x3D0038, 0x170 + # ROM: 0x3D0038 + .asciz "String" + .byte 0x49 + .4byte 0x6E740052 + .4byte 0x65616C00 + .asciz "Bool" + .byte 0x41, 0x75, 0x64 + .4byte 0x696F003F + .asciz "?(??)" + .byte 0x4D, 0x69 + .asciz "diObject" + .byte 0x57, 0x6F, 0x72 + .asciz "ld %8.8x" + .byte 0x41, 0x72, 0x65 + .asciz "a %8.8x MusicObject: %s" + .asciz "World %8.8x Area %8.8x MidiObject: %s" + .byte 0x57, 0x6F + .asciz "rldDefault: %8.8x" + .byte 0x2E, 0x61 + .4byte 0x64700041 + .asciz "udio/" + .byte 0x4D, 0x49 + .asciz "DI: " + .byte 0x54, 0x77, 0x65 + .asciz "akFile\n" + .asciz "Version %d\n" + .asciz "Value Count: %d\n" + .byte 0x5F, 0x5F, 0x42 + .asciz "AD_TOKEN__" + .byte 0x56 + .asciz "alue\n{\n Name: %s\n Type: %s\n Value: %s\n}\n" + .byte 0x54 + .asciz "weakFile" + .byte 0x56, 0x65, 0x72 + .asciz "sion %d" + .asciz "Value Count: %d" + .4byte 0x00547275 + .4byte 0x65003B00 + .4byte 0x25640025 + .4byte 0x66004661 + .4byte 0x6C736500 + .asciz "%f;%f;%f;%s;%d" + .byte 0x56 + .asciz "alue" + .byte 0x7B, 0x00, 0x4E + .asciz "ame:" + .byte 0x54, 0x79, 0x70 + .4byte 0x653A0056 + .asciz "alue:" + .byte 0x20, 0x09 + .4byte 0x0A0D2200 + .global lbl_803D31A8 lbl_803D31A8: - .incbin "baserom.dol", 0x3D01A8, 0x28 + # ROM: 0x3D01A8 + .4byte 0x803D31D0 + .4byte 0x3F99999A + .4byte 0x803D31D7 + .4byte 0x3F99999A + .4byte 0x803D31DE + .4byte 0x3FD9999A + .4byte 0x803D31EC + .4byte 0x3F99999A + .4byte 0x803D31F3 + .4byte 0x3F666666 + .global lbl_803D31D0 lbl_803D31D0: - .incbin "baserom.dol", 0x3D01D0, 0x78 + # ROM: 0x3D01D0 + .asciz "L_knee" + .byte 0x52 + .asciz "_knee" + .byte 0x4C, 0x43 + .asciz "TR_SHEMOUTH" + .asciz "Pelvis" + .byte 0x62 + .asciz "utt_LCTR" + .byte 0x3F, 0x3F, 0x28 + .4byte 0x3F3F2900 + .asciz "Babygoth Shell Crack Fx" + .asciz "GetUp" + .byte 0x49, 0x63 + .asciz "eSheegoth_Flame" + .asciz "Head_1" + .byte 0x46 + .asciz "lameThrower" + .global lbl_803D3248 lbl_803D3248: - .incbin "baserom.dol", 0x3D0248, 0x30 + # ROM: 0x3D0248 + .asciz "Laser_LCTR" + .byte 0x57 + .asciz "hole Body" + .byte 0x3F, 0x3F + .asciz "(??)" + .byte 0x45, 0x79, 0x65 + .asciz "Ball_Beam" + .byte 0x45, 0x79 + .4byte 0x65000000 + .global lbl_803D3278 lbl_803D3278: - .incbin "baserom.dol", 0x3D0278, 0x30 + # ROM: 0x3D0278 + .4byte 0x803D3310 + .4byte 0x803D331B + .4byte 0x3F800000 + .4byte 0x3FC00000 + .4byte 0x803D331B + .4byte 0x803D3323 + .4byte 0x3F666666 + .4byte 0x3FA66666 + .4byte 0x803D332B + .4byte 0x803D3332 + .4byte 0x3F666666 + .4byte 0x3FA66666 + .global lbl_803D32A8 lbl_803D32A8: - .incbin "baserom.dol", 0x3D02A8, 0x68 + # ROM: 0x3D02A8 + .4byte 0x803D333A + .4byte 0x803D3345 + .4byte 0x3F800000 + .4byte 0x3FC00000 + .4byte 0x803D3345 + .4byte 0x803D334D + .4byte 0x3F666666 + .4byte 0x3FA66666 + .4byte 0x803D3355 + .4byte 0x803D335C + .4byte 0x3F666666 + .4byte 0x3FA66666 + .4byte 0x803D3364 + .4byte 0x3F99999A + .4byte 0x803D336B + .4byte 0x3FC00000 + .4byte 0x803D3377 + .4byte 0x3FC00000 + .4byte 0x803D3383 + .4byte 0x3FC00000 + .4byte 0x803D338B + .4byte 0x3F99999A + .4byte 0x803D3392 + .4byte 0x3F4CCCCD + .4byte 0x803D3399 + .4byte 0x3F4CCCCD + .global lbl_803D3310 lbl_803D3310: - .incbin "baserom.dol", 0x3D0310, 0xF8 + # ROM: 0x3D0310 + .asciz "L_shoulder" + .byte 0x4C + .asciz "_elbow" + .byte 0x4C + .asciz "_wrist" + .byte 0x4C + .asciz "_knee" + .byte 0x4C, 0x5F + .asciz "ankle" + .byte 0x52, 0x5F + .asciz "shoulder" + .byte 0x52, 0x5F, 0x65 + .asciz "lbow" + .byte 0x52, 0x5F, 0x77 + .asciz "rist" + .byte 0x52, 0x5F, 0x6B + .4byte 0x6E656500 + .asciz "R_ankle" + .asciz "Head_1" + .byte 0x4C + .asciz "_Palm_LCTR" + .byte 0x52 + .asciz "_Palm_LCTR" + .byte 0x53 + .asciz "pine_1" + .byte 0x43 + .asciz "ollar" + .byte 0x4C, 0x5F + .asciz "ball" + .byte 0x52, 0x5F, 0x62 + .4byte 0x616C6C00 + .asciz "grenadeLauncher_LCTR" + .byte 0x6C, 0x6F, 0x63 + .asciz "kon_target_LCTR" + .asciz "??(??)" + .byte 0x41 + .asciz "bsorb energy Fx" + .asciz "Grenade Launcher" + .byte 0x53, 0x68, 0x69 + .4byte 0x656C6400 + .asciz "Shock Wave" + .balign 4 + .4byte 0 + .global lbl_803D3408 lbl_803D3408: - .incbin "baserom.dol", 0x3D0408, 0x8 + # ROM: 0x3D0408 + .asciz "??(??)" + .balign 4 + .global lbl_803D3410 lbl_803D3410: - .incbin "baserom.dol", 0x3D0410, 0x58 + # ROM: 0x3D0410 + .asciz "grenade_LCTR" + .byte 0x6C, 0x6F, 0x63 + .asciz "kon_target_LCTR" + .asciz "??(??)" + .byte 0x47 + .asciz "renade Launcher Explode Fx" + .byte 0x42 + .asciz "ouncy Grenade" + .balign 4 + .4byte 0 + .global lbl_803D3468 lbl_803D3468: - .incbin "baserom.dol", 0x3D0468, 0x28 + # ROM: 0x3D0468 + .asciz "??(??)" + .byte 0x53 + .asciz "hockWaveLight_" + .byte 0x56 + .asciz "isorElectricFx" + .balign 4 + .global lbl_803D3490 lbl_803D3490: - .incbin "baserom.dol", 0x3D0490, 0x10 + # ROM: 0x3D0490 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .global lbl_803D34A0 lbl_803D34A0: - .incbin "baserom.dol", 0x3D04A0, 0xE40 + # ROM: 0x3D04A0 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000006 + .4byte 0 + .4byte 0xBF800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000006 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000003 + .4byte 0x00000007 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000003 + .4byte 0x00000006 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000006 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000003 + .4byte 0x00000007 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000003 + .4byte 0x00000006 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000006 + .4byte 0 + .4byte 0xBF800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000006 + .4byte 0 + .4byte 0xBF800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x00000003 + .4byte 0x00000002 + .4byte 0x40000000 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000006 + .4byte 0 + .4byte 0xBF800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0x40000000 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x40800000 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000006 + .4byte 0x40800000 + .4byte 0xBF800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0x00000003 + .4byte 0x00000002 + .4byte 0x40800000 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000006 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000003 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0 + .4byte 0x00000001 + .4byte 0x40200000 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0 + .4byte 0x00000001 + .4byte 0x40200000 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0 + .4byte 0x00000001 + .4byte 0x40B00000 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0 + .4byte 0x00000001 + .4byte 0x40B00000 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0 + .4byte 0x00000001 + .4byte 0x41080000 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000003 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0 + .4byte 0x00000001 + .4byte 0x40900000 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000003 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000003 + .4byte 0x00000006 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000006 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000003 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000003 + .4byte 0x00000006 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000006 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000003 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000003 + .4byte 0x00000006 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000006 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000003 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000003 + .4byte 0x00000006 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000006 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000003 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000006 + .4byte 0 + .4byte 0xBF800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000003 + .4byte 0x00000006 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000006 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000003 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000001 + .4byte 0x00000006 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000006 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000003 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0xBF800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000003 + .4byte 0x00000007 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000003 + .4byte 0 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000003 + .4byte 0 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000003 + .4byte 0x00000007 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000003 + .4byte 0 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000003 + .4byte 0 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000003 + .4byte 0x00000007 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0x40000000 + .4byte 0xBF800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x40000000 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0x40000000 + .4byte 0xBF800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0x40000000 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x40800000 + .4byte 0xBF800000 + .4byte 0x00000003 + .4byte 0x00000002 + .4byte 0x40800000 + .4byte 0xBF800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0x00000003 + .4byte 0x00000002 + .4byte 0x40800000 + .4byte 0xBF800000 + .4byte 0x00000003 + .4byte 0x00000002 + .4byte 0x40800000 + .4byte 0xBF800000 + .4byte 0x00000003 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0 + .4byte 0x00000001 + .4byte 0x40200000 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0xBF800000 + .4byte 0 + .4byte 0x00000001 + .4byte 0x40200000 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x40B00000 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0 + .4byte 0x00000001 + .4byte 0x40B00000 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0 + .4byte 0x00000001 + .4byte 0x41080000 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0 + .4byte 0x00000001 + .4byte 0x41080000 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0 + .4byte 0x00000001 + .4byte 0x40900000 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0 + .4byte 0x00000001 + .4byte 0x40900000 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x40C00000 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000008 + .4byte 0x40C00000 + .4byte 0xBF800000 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x40C00000 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000002 + .4byte 0x00000008 + .4byte 0x40C00000 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000008 + .4byte 0x40C00000 + .4byte 0xBF800000 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x40C00000 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0 + .4byte 0x00000003 + .4byte 0x40C00000 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000008 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x40C00000 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000003 + .4byte 0 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000002 + .4byte 0x00000007 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0xBF800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000003 + .4byte 0x00000009 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000009 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000003 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000003 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0xBF800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0xBF800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000003 + .4byte 0 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000003 + .4byte 0 + .4byte 0 + .4byte 0xBF800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000003 + .4byte 0 + .4byte 0 + .4byte 0xBF800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0x40000000 + .4byte 0xBF800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x40000000 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0x40000000 + .4byte 0xBF800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0x40000000 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x40800000 + .4byte 0xBF800000 + .4byte 0x00000003 + .4byte 0x00000002 + .4byte 0x40800000 + .4byte 0xBF800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0x40800000 + .4byte 0 + .4byte 0x00000003 + .4byte 0x00000002 + .4byte 0x40800000 + .4byte 0xBF800000 + .4byte 0x00000003 + .4byte 0x00000002 + .4byte 0x40800000 + .4byte 0xBF800000 + .4byte 0x00000003 + .4byte 0x00000002 + .4byte 0x40800000 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0 + .4byte 0x00000001 + .4byte 0x40200000 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x40200000 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x40200000 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x40200000 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x40900000 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x40900000 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0 + .4byte 0x00000001 + .4byte 0x40200000 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x40200000 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000001 + .4byte 0x00000003 + .4byte 0x40C00000 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000003 + .4byte 0x40C00000 + .4byte 0xBF800000 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x40C00000 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x40C00000 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000003 + .4byte 0x40C00000 + .4byte 0xBF800000 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x40C00000 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0 + .4byte 0x00000003 + .4byte 0x40C00000 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000008 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x40C00000 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000003 + .4byte 0 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000002 + .4byte 0x00000007 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0 + .4byte 0 + .4byte 0xBF800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000003 + .4byte 0x00000009 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000003 + .4byte 0x00000009 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000003 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000003 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0 + .4byte 0xBF800000 + .global lbl_803D42E0 lbl_803D42E0: - .incbin "baserom.dol", 0x3D12E0, 0x8 + # ROM: 0x3D12E0 + .asciz "??(??)" + .balign 4 + .global lbl_803D42E8 lbl_803D42E8: - .incbin "baserom.dol", 0x3D12E8, 0x28 + # ROM: 0x3D12E8 + .4byte 0x803D4338 + .4byte 0x3F400000 + .4byte 0x803D433F + .4byte 0x3F400000 + .4byte 0x803D4346 + .4byte 0x3F400000 + .4byte 0x803D434D + .4byte 0x3F400000 + .4byte 0x803D4354 + .4byte 0x3F400000 + .global lbl_803D4310 lbl_803D4310: - .incbin "baserom.dol", 0x3D1310, 0x70 + # ROM: 0x3D1310 + .asciz "LCTR_MAGMOUTH" + .byte 0x68, 0x65 + .4byte 0x61640054 + .asciz "op_LCTR" + .asciz "Bottom_LCTR" + .asciz "spine1" + .byte 0x73 + .asciz "pine3" + .byte 0x73, 0x70 + .asciz "ine5" + .byte 0x73, 0x70, 0x69 + .4byte 0x6E653700 + .asciz "spine9" + .byte 0x3F + .asciz "?(??)" + .byte 0x4D, 0x61 + .asciz "gdolite_Flame" + .byte 0x46, 0x6C + .asciz "ameThrower" + .balign 4 + .global lbl_803D4380 lbl_803D4380: - .incbin "baserom.dol", 0x3D1380, 0x8 + # ROM: 0x3D1380 + .asciz "??(??)" + .balign 4 + .global lbl_803D4388 lbl_803D4388: - .incbin "baserom.dol", 0x3D1388, 0x18 + # ROM: 0x3D1388 + .asciz "Whole Body" + .byte 0x3F + .asciz "?(??)" + .balign 4 + .4byte 0 + .global lbl_803D43A0 lbl_803D43A0: - .incbin "baserom.dol", 0x3D13A0, 0x28 + # ROM: 0x3D13A0 + .asciz "??(??)" + .byte 0x43 + .asciz "ontraption_Flame" + .byte 0x46, 0x6C, 0x61 + .asciz "meThrower" + .balign 4 + .global lbl_803D43C8 lbl_803D43C8: - .incbin "baserom.dol", 0x3D13C8, 0x14 + # ROM: 0x3D13C8 + .4byte 0x00000018 + .4byte 0x00000019 + .4byte 0x0000001A + .4byte 0x0000001B + .4byte 0x0000001C + .global lbl_803D43DC lbl_803D43DC: - .incbin "baserom.dol", 0x3D13DC, 0x14 + # ROM: 0x3D13DC + .4byte 0 + .4byte 0x3FCCCCCD + .4byte 0x3F800000 + .4byte 0 + .4byte 0x3F800000 + .global lbl_803D43F0 lbl_803D43F0: - .incbin "baserom.dol", 0x3D13F0, 0x1C4 + # ROM: 0x3D13F0 + .4byte 0x00000001 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0x00000015 + .4byte 0 + .4byte 0x437F0000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000016 + .4byte 0 + .4byte 0x437F0000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000017 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x00000001 + .4byte 0x00000003 + .4byte 0x00000018 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x00000001 + .4byte 0x0000000E + .4byte 0x00000023 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000019 + .4byte 0 + .4byte 0x41000000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x00000005 + .4byte 0x0000001A + .4byte 0xC1F00000 + .4byte 0x41F00000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x00000006 + .4byte 0x0000001B + .4byte 0xC1F00000 + .4byte 0x41F00000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x00000007 + .4byte 0x0000001C + .4byte 0xC1200000 + .4byte 0x41200000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x0000000E + .4byte 0x00000023 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x00000003 + .4byte 0x00000008 + .4byte 0x0000001D + .4byte 0 + .4byte 0x42FE0000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x00000009 + .4byte 0x0000001E + .4byte 0 + .4byte 0x42FE0000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x0000000A + .4byte 0x0000001F + .4byte 0 + .4byte 0x40000000 + .4byte 0x3F800000 + .4byte 0x00000002 + .4byte 0x0000000E + .4byte 0x00000023 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x00000003 + .4byte 0x0000000B + .4byte 0x00000020 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x00000001 + .4byte 0x0000000C + .4byte 0x00000021 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x00000001 + .4byte 0x0000000D + .4byte 0x00000022 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x00000001 + .4byte 0x0000000E + .4byte 0x00000023 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x00000003 + .global lbl_803D45B4 lbl_803D45B4: - .incbin "baserom.dol", 0x3D15B4, 0x17C + # ROM: 0x3D15B4 + .asciz "textpane_right%d" + .byte 0x74, 0x61, 0x62 + .asciz "legroup_leftmenu" + .byte 0x74, 0x61, 0x62 + .asciz "legroup_rightmenu" + .byte 0x74, 0x61 + .asciz "blegroup_double" + .asciz "tablegroup_triple" + .byte 0x73, 0x6C + .asciz "idergroup_slider" + .byte 0x74, 0x65, 0x78 + .asciz "tpane_double0" + .byte 0x74, 0x65 + .asciz "xtpane_double1" + .byte 0x74 + .asciz "extpane_triple0" + .asciz "textpane_triple1" + .byte 0x74, 0x65, 0x78 + .asciz "tpane_triple2" + .byte 0x74, 0x65 + .asciz "xtpane_title" + .byte 0x74, 0x65, 0x78 + .asciz "tpane_proceed" + .byte 0x74, 0x65 + .asciz "xtpane_cancel" + .byte 0x74, 0x65 + .asciz "xtpane_filename%d" + .byte 0x46, 0x52 + .asciz "ME_OptionsFrontEnd" + .byte 0x53 + .asciz "TRG_PauseScreen" + .asciz "??(??)" + .byte 0x25 + .4byte 0x73620074 + .asciz "ablegroup_quitgame" + .byte 0x74 + .asciz "extpane_yes" + .asciz "textpane_no" + .asciz "FRME_QuitScreen" + .4byte 0 + .global lbl_803D4730 lbl_803D4730: - .incbin "baserom.dol", 0x3D1730, 0x30 + # ROM: 0x3D1730 + .asciz "bomb1_LCTR" + .byte 0x62 + .asciz "omb2_LCTR" + .byte 0x62, 0x6F + .asciz "mb3_LCTR" + .byte 0x62, 0x6F, 0x6D + .asciz "b4_LCTR" + .4byte 0 + .global lbl_803D4760 lbl_803D4760: - .incbin "baserom.dol", 0x3D1760, 0x8 + # ROM: 0x3D1760 + .asciz "??(??)" + .balign 4 + .global lbl_803D4768 lbl_803D4768: - .incbin "baserom.dol", 0x3D1768, 0x18 + # ROM: 0x3D1768 + .asciz "client_pad.bin" + .byte 0x3F + .asciz "?(??)" + .balign 4 + .global lbl_803D4780 lbl_803D4780: - .incbin "baserom.dol", 0x3D1780, 0x18 + # ROM: 0x3D1780 + .asciz "??(??)" + .byte 0x48 + .asciz "INT_Hints" + .balign 4 + .4byte 0 + .global lbl_803D4798 lbl_803D4798: - .incbin "baserom.dol", 0x3D1798, 0x10 + # ROM: 0x3D1798 + .asciz "Whole Body" + .balign 4 + .4byte 0 + .global lbl_803D47A8 lbl_803D47A8: - .incbin "baserom.dol", 0x3D17A8, 0x24 + # ROM: 0x3D17A8 + .asciz "Metroid Prime " + .balign 4 + .global lbl_803D47CC lbl_803D47CC: - .incbin "baserom.dol", 0x3D17CC, 0x2C4 + # ROM: 0x3D17CC + .asciz "MetroidPrime A" + .byte 0x4D + .asciz "etroidPrime B" + .byte 0x4E, 0x6F + .asciz "tLoaded" + .asciz "Loaded" + .byte 0x4E + .asciz "oCard" + .byte 0x53, 0x61 + .4byte 0x76656400 + .asciz "Formatted" + .byte 0x50, 0x72 + .asciz "obed" + .byte 0x4D, 0x6F, 0x75 + .asciz "nted" + .byte 0x43, 0x68, 0x65 + .asciz "ckedCard" + .byte 0x43, 0x72, 0x65 + .asciz "atedInitial" + .asciz "CreatedCopy" + .asciz "WroteCopy" + .byte 0x44, 0x65 + .asciz "letedOriginal" + .byte 0x46, 0x61 + .asciz "iledProbe" + .byte 0x46, 0x61 + .asciz "iledMount" + .byte 0x46, 0x61 + .asciz "iledCheck" + .byte 0x46, 0x61 + .asciz "iledDeleteCorruptedFile" + .asciz "FailedDeleteDuplicateFile" + .byte 0x46, 0x61 + .asciz "iledLoad" + .byte 0x46, 0x61, 0x69 + .asciz "ledCreateInitial" + .byte 0x46, 0x61, 0x69 + .asciz "ledWriteInitial" + .asciz "FailedCreateCopy" + .byte 0x46, 0x61, 0x69 + .asciz "ledWriteCopy" + .byte 0x46, 0x61, 0x69 + .asciz "ledDeleteOriginal" + .byte 0x46, 0x61 + .asciz "iledRenameCopy" + .byte 0x46 + .asciz "ailedFormat" + .asciz "Probing" + .asciz "Mounting" + .byte 0x43, 0x68, 0x65 + .asciz "ckingCard" + .byte 0x44, 0x65 + .asciz "letingCorruptedFile" + .asciz "Reading" + .asciz "DeletingDuplicateFile" + .byte 0x43, 0x72 + .asciz "eatingInitial" + .byte 0x57, 0x72 + .asciz "itingInitial" + .byte 0x43, 0x72, 0x65 + .asciz "atingCopy" + .byte 0x57, 0x72 + .asciz "itingCopy" + .byte 0x44, 0x65 + .asciz "letingOriginal" + .byte 0x52 + .asciz "enamingCopy" + .asciz "Formatting" + .byte 0x4E + .asciz "oError" + .byte 0x43 + .asciz "orruptedFile" + .byte 0x45, 0x6E, 0x63 + .asciz "odingMismatch" + .byte 0x44, 0x61 + .asciz "maged" + .byte 0x57, 0x72 + .asciz "ongDevice" + .byte 0x49, 0x6E + .asciz "sufficientSpace" + .asciz "InsufficientBackupSpace" + .asciz "BadSectorSize" + .byte 0x4E, 0x6F + .asciz "File" + .byte 0x3F, 0x3F, 0x28 + .4byte 0x3F3F2900 + .asciz "%02d.%02d.%02d %02d:%02d" + .balign 4 + .global lbl_803D4A90 lbl_803D4A90: - .incbin "baserom.dol", 0x3D1A90, 0xC0 + # ROM: 0x3D1A90 + .asciz "TXTR_SaveBanner" + .asciz "TXTR_SaveIcon0" + .byte 0x54 + .asciz "XTR_SaveIcon1" + .byte 0x53, 0x54 + .asciz "RG_MemoryCard" + .byte 0x46, 0x52 + .asciz "ME_GenericMenu" + .byte 0x74 + .asciz "extpane_message" + .asciz "tablegroup_choices" + .byte 0x74 + .asciz "extpane_choice0" + .asciz "textpane_choice1" + .byte 0x74, 0x65, 0x78 + .asciz "tpane_choice2" + .byte 0x74, 0x65 + .asciz "xtpane_choice3" + .byte 0x3F + .asciz "?(??)" + .balign 4 + .global lbl_803D4B50 lbl_803D4B50: - .incbin "baserom.dol", 0x3D1B50, 0x28 + # ROM: 0x3D1B50 + .asciz "bomb2_LCTR" + .byte 0x62 + .asciz "omb3_LCTR" + .byte 0x62, 0x6F + .asciz "mb4_LCTR" + .byte 0x3F, 0x3F, 0x28 + .4byte 0x3F3F2900 + .global lbl_803D4B78 lbl_803D4B78: - .incbin "baserom.dol", 0x3D1B78, 0x20 + # ROM: 0x3D1B78 + .asciz "ElectricBeamProjectile" + .byte 0x3F + .asciz "?(??)" + .balign 4 + .global lbl_803D4B98 lbl_803D4B98: - .incbin "baserom.dol", 0x3D1B98, 0x30 + # ROM: 0x3D1B98 + .4byte 0x803D4D5C + .4byte 0x803D4D63 + .4byte 0x3F28F5C3 + .4byte 0x803D4D63 + .4byte 0x803D4D6A + .4byte 0x3F28F5C3 + .4byte 0x803D4D6A + .4byte 0x803D4D71 + .4byte 0x3F28F5C3 + .4byte 0x803D4D71 + .4byte 0x803D4D78 + .4byte 0x3F28F5C3 + .global lbl_803D4BC8 lbl_803D4BC8: - .incbin "baserom.dol", 0x3D1BC8, 0x50 + # ROM: 0x3D1BC8 + .4byte 0x803D4D7F + .4byte 0x3F19999A + .4byte 0x803D4D8D + .4byte 0x3F19999A + .4byte 0x803D4D95 + .4byte 0x3E99999A + .4byte 0x803D4DA6 + .4byte 0x3F19999A + .4byte 0x803D4DAD + .4byte 0x3F000000 + .4byte 0x803D4DB5 + .4byte 0x3F000000 + .4byte 0x803D4DBD + .4byte 0x3F19999A + .4byte 0x803D4DC5 + .4byte 0x3F19999A + .4byte 0x803D4DCD + .4byte 0x3ECCCCCD + .4byte 0x803D4DD7 + .4byte 0x3ECCCCCD + .global lbl_803D4C18 lbl_803D4C18: - .incbin "baserom.dol", 0x3D1C18, 0xB4 + # ROM: 0x3D1C18 + .4byte 0x00000004 + .4byte 0x00000006 + .4byte 0x42480000 + .4byte 0x42480000 + .4byte 0 + .4byte 0x42040000 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000006 + .4byte 0x41A00000 + .4byte 0x41A00000 + .4byte 0x42700000 + .4byte 0x42480000 + .4byte 0 + .4byte 0x00000002 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000006 + .4byte 0x42200000 + .4byte 0x42200000 + .4byte 0x41A00000 + .4byte 0x42480000 + .4byte 0x42480000 + .4byte 0x00000002 + .4byte 0x01000000 + .4byte 0x00000003 + .4byte 0x00000005 + .4byte 0x41200000 + .4byte 0x41700000 + .4byte 0x42960000 + .4byte 0x42C80000 + .4byte 0x41C80000 + .4byte 0x00000002 + .4byte 0 + .4byte 0x00000003 + .4byte 0x00000005 + .4byte 0x41F00000 + .4byte 0x41F00000 + .4byte 0x42200000 + .4byte 0x42480000 + .4byte 0x42480000 + .4byte 0x00000002 + .4byte 0x01000000 + .global lbl_803D4CCC lbl_803D4CCC: - .incbin "baserom.dol", 0x3D1CCC, 0x90 + # ROM: 0x3D1CCC + .4byte 0 + .4byte 0x41A00000 + .4byte 0x42200000 + .4byte 0 + .4byte 0 + .4byte 0x42200000 + .4byte 0 + .4byte 0 + .4byte 0x428C0000 + .4byte 0 + .4byte 0 + .4byte 0x41F00000 + .4byte 0 + .4byte 0x42700000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x42200000 + .4byte 0 + .4byte 0x42200000 + .4byte 0x41F00000 + .4byte 0 + .4byte 0 + .4byte 0x41F00000 + .4byte 0 + .4byte 0 + .4byte 0x42480000 + .4byte 0 + .4byte 0 + .4byte 0x42480000 + .4byte 0 + .4byte 0x42200000 + .4byte 0x42700000 + .4byte 0 + .4byte 0 + .4byte 0 + .global lbl_803D4D5C lbl_803D4D5C: - .incbin "baserom.dol", 0x3D1D5C, 0x3A4 + # ROM: 0x3D1D5C + .asciz "Tail_1" + .byte 0x54 + .asciz "ail_3" + .byte 0x54, 0x61 + .asciz "il_5" + .byte 0x54, 0x61, 0x69 + .4byte 0x6C5F3700 + .asciz "Tail_9" + .byte 0x53 + .asciz "keleton_Root" + .byte 0x53, 0x70, 0x69 + .asciz "ne_2" + .byte 0x62, 0x72, 0x65 + .asciz "astPlate_LCTR" + .byte 0x48, 0x65 + .asciz "ad_1" + .byte 0x4C, 0x5F, 0x77 + .asciz "rist" + .byte 0x52, 0x5F, 0x77 + .asciz "rist" + .byte 0x4C, 0x5F, 0x61 + .asciz "nkle" + .byte 0x52, 0x5F, 0x61 + .asciz "nkle" + .byte 0x4C, 0x5F, 0x70 + .asciz "inky_1" + .byte 0x52 + .asciz "_pinky_1" + .byte 0x3F, 0x3F, 0x28 + .4byte 0x3F3F2900 + .4byte 0x00202D20 + .asciz "Collision Actor " + .byte 0x6D, 0x6F, 0x75 + .asciz "th_LCTR" + .asciz "WingSmokeSmall1" + .asciz "WingSmokeSmall2" + .asciz "WingSmokeSmall3" + .asciz "WingSmokeSmall4" + .asciz "WingSmokeSmall5" + .asciz "WingSmokeSmall6" + .asciz "WingSmokeSmall7" + .asciz "WingSmokeSmall8" + .asciz "WingFire1" + .byte 0x57, 0x69 + .asciz "ngFire2" + .asciz "WingFire3" + .byte 0x57, 0x69 + .asciz "ngFire4" + .asciz "WingFire5" + .byte 0x57, 0x69 + .asciz "ngFire6" + .asciz "WingFire7" + .byte 0x57, 0x69 + .asciz "ngFire8" + .asciz "WingSparks1" + .asciz "WingSparks2" + .asciz "WingSparks3" + .asciz "WingSparks4" + .asciz "WingSparks5" + .asciz "WingSparks6" + .asciz "WingSparks7" + .asciz "WingSparks8" + .asciz "L_wingBone1_1" + .byte 0x4C, 0x5F + .asciz "wingBone1_2" + .asciz "L_wingBone2_1" + .byte 0x4C, 0x5F + .asciz "wingBone2_2" + .asciz "L_wingBone3_1" + .byte 0x4C, 0x5F + .asciz "wingBone3_2" + .asciz "L_wingFlesh1_1" + .byte 0x4C + .asciz "_wingFlesh1_2" + .byte 0x4C, 0x5F + .asciz "wingFlesh2_1" + .byte 0x4C, 0x5F, 0x77 + .asciz "ingFlesh2_2" + .asciz "L_wingFlesh3_1" + .byte 0x4C + .asciz "_wingFlesh3_2" + .byte 0x52, 0x5F + .asciz "wingBone1_1" + .asciz "R_wingBone1_2" + .byte 0x52, 0x5F + .asciz "wingBone2_1" + .asciz "R_wingBone2_2" + .byte 0x52, 0x5F + .asciz "wingBone3_1" + .asciz "R_wingBone3_2" + .byte 0x52, 0x5F + .asciz "wingFlesh1_1" + .byte 0x52, 0x5F, 0x77 + .asciz "ingFlesh1_2" + .asciz "R_wingFlesh2_1" + .byte 0x52 + .asciz "_wingFlesh2_2" + .byte 0x52, 0x5F + .asciz "wingFlesh3_1" + .byte 0x52, 0x5F, 0x77 + .asciz "ingFlesh3_2" + .asciz "L_wingtip_1_LCTR" + .byte 0x4C, 0x5F, 0x77 + .asciz "ingtip_2_LCTR" + .byte 0x4C, 0x5F + .asciz "wingtip_3_LCTR" + .byte 0x52 + .asciz "_wingtip_1_LCTR" + .asciz "R_wingtip_2_LCTR" + .byte 0x52, 0x5F, 0x77 + .asciz "ingtip_3_LCTR" + .balign 4 + .4byte 0 + .global lbl_803D5100 lbl_803D5100: - .incbin "baserom.dol", 0x3D2100, 0x130 + # ROM: 0x3D2100 + .asciz "GasJet01" + .byte 0x47, 0x61, 0x73 + .asciz "Jet02" + .byte 0x47, 0x61 + .asciz "sJet03" + .byte 0x47 + .asciz "asJet04" + .asciz "GasJet05" + .byte 0x47, 0x61, 0x73 + .asciz "Jet06" + .byte 0x47, 0x61 + .asciz "sJet07" + .byte 0x47 + .asciz "asJet08" + .asciz "GasJet09" + .byte 0x47, 0x61, 0x73 + .asciz "Jet10" + .byte 0x47, 0x61 + .asciz "sJet11" + .byte 0x47 + .asciz "asJet12" + .asciz "GasJet13" + .byte 0x47, 0x61, 0x73 + .asciz "Jet14" + .byte 0x47, 0x61 + .asciz "s_01_LCTR" + .byte 0x47, 0x61 + .asciz "s_02_LCTR" + .byte 0x47, 0x61 + .asciz "s_03_LCTR" + .byte 0x47, 0x61 + .asciz "s_04_LCTR" + .byte 0x47, 0x61 + .asciz "s_05_LCTR" + .byte 0x47, 0x61 + .asciz "s_06_LCTR" + .byte 0x47, 0x61 + .asciz "s_07_LCTR" + .byte 0x47, 0x61 + .asciz "s_08_LCTR" + .byte 0x47, 0x61 + .asciz "s_09_LCTR" + .byte 0x47, 0x61 + .asciz "s_10_LCTR" + .byte 0x47, 0x61 + .asciz "s_11_LCTR" + .byte 0x47, 0x61 + .asciz "s_12_LCTR" + .byte 0x47, 0x61 + .asciz "s_13_LCTR" + .byte 0x47, 0x61 + .asciz "s_14_LCTR" + .byte 0x3F, 0x3F + .asciz "(??)" + .balign 4 + .global lbl_803D5230 lbl_803D5230: - .incbin "baserom.dol", 0x3D2230, 0x10 + # ROM: 0x3D2230 + .asciz "Fire" + .byte 0x3F, 0x3F, 0x28 + .4byte 0x3F3F2900 + .4byte 0 + .global lbl_803D5240 lbl_803D5240: - .incbin "baserom.dol", 0x3D2240, 0x38 + # ROM: 0x3D2240 + .asciz "TXTR_MapLightQuarter" + .balign 4 + .asciz "ballGrab_locator" + .byte 0x53, 0x6B, 0x65 + .asciz "leton_Root" + .balign 4 + .global lbl_803D5278 lbl_803D5278: - .incbin "baserom.dol", 0x3D2278, 0x20 + # ROM: 0x3D2278 + .asciz "??(??)" + .byte 0x46 + .asciz "lamethrowerLight" + .balign 4 + .4byte 0 + .global lbl_803D5298 lbl_803D5298: - .incbin "baserom.dol", 0x3D2298, 0x18 + # ROM: 0x3D2298 + .asciz "Interpolation Camera" + .balign 4 + .global lbl_803D52B0 lbl_803D52B0: - .incbin "baserom.dol", 0x3D22B0, 0x30 + # ROM: 0x3D22B0 + .4byte 0x803D52E0 + .4byte 0x803D52F2 + .4byte 0x803D5304 + .4byte 0x803D5316 + .4byte 0x803D5328 + .4byte 0x803D533A + .4byte 0x803D534C + .4byte 0x803D535E + .4byte 0x803D5370 + .4byte 0x803D5382 + .4byte 0x803D5394 + .4byte 0x803D53A6 + .global lbl_803D52E0 lbl_803D52E0: - .incbin "baserom.dol", 0x3D22E0, 0xE0 + # ROM: 0x3D22E0 + .asciz "A_spike1_LCTR_SDK" + .byte 0x41, 0x5F + .asciz "spike2_LCTR_SDK" + .asciz "A_spike3_LCTR_SDK" + .byte 0x41, 0x5F + .asciz "spike4_LCTR_SDK" + .asciz "A_spike5_LCTR_SDK" + .byte 0x41, 0x5F + .asciz "spike6_LCTR_SDK" + .asciz "B_spike1_LCTR_SDK" + .byte 0x42, 0x5F + .asciz "spike2_LCTR_SDK" + .asciz "B_spike3_LCTR_SDK" + .byte 0x42, 0x5F + .asciz "spike4_LCTR_SDK" + .asciz "B_spike5_LCTR_SDK" + .byte 0x42, 0x5F + .asciz "spike6_LCTR_SDK" + .asciz "??(??)" + .balign 4 + .global lbl_803D53C0 lbl_803D53C0: - .incbin "baserom.dol", 0x3D23C0, 0x20 + # ROM: 0x3D23C0 + .asciz "??(??)" + .balign 4 + .asciz "BendingAnimationHack" + .balign 4 + .global lbl_803D53E0 lbl_803D53E0: - .incbin "baserom.dol", 0x3D23E0, 0x18 + # ROM: 0x3D23E0 + .asciz "Error output window" + .4byte 0 + .global lbl_803D53F8 lbl_803D53F8: - .incbin "baserom.dol", 0x3D23F8, 0x18 + # ROM: 0x3D23F8 + .4byte 0x00000009 + .4byte 0x00000001 + .4byte 0x0000000B + .4byte 0x00000001 + .4byte 0x000000FF + .4byte 0 + .global lbl_803D5410 lbl_803D5410: - .incbin "baserom.dol", 0x3D2410, 0x8 + # ROM: 0x3D2410 + .asciz "??(??)" + .balign 4 + .global lbl_803D5418 lbl_803D5418: - .incbin "baserom.dol", 0x3D2418, 0x8 + # ROM: 0x3D2418 + .asciz "??(??)" + .balign 4 + .global lbl_803D5420 lbl_803D5420: - .incbin "baserom.dol", 0x3D2420, 0x8 + # ROM: 0x3D2420 + .asciz "??(??)" + .balign 4 + .global lbl_803D5428 lbl_803D5428: - .incbin "baserom.dol", 0x3D2428, 0xC + # ROM: 0x3D2428 + .4byte 0x40400000 + .4byte 0x40E00000 + .4byte 0x41700000 + .global lbl_803D5434 lbl_803D5434: - .incbin "baserom.dol", 0x3D2434, 0x10 + # ROM: 0x3D2434 + .4byte 0x45174000 + .4byte 0x44DC0000 + .4byte 0x445C0000 + .4byte 0 + .global lbl_803D5444 lbl_803D5444: - .incbin "baserom.dol", 0x3D2444, 0x10 + # ROM: 0x3D2444 + .4byte 0x803D5644 + .4byte 0x803D564F + .4byte 0x803D5660 + .4byte 0x803D5670 + .global lbl_803D5454 lbl_803D5454: - .incbin "baserom.dol", 0x3D2454, 0x18 + # ROM: 0x3D2454 + .4byte 0x803D56BB + .4byte 0x803D56C3 + .4byte 0x803D5634 + .4byte 0x803D56CB + .4byte 0x803D56D3 + .4byte 0x803D563C + .global lbl_803D546C lbl_803D546C: - .incbin "baserom.dol", 0x3D246C, 0xC + # ROM: 0x3D246C + .4byte 0x0000000A + .4byte 0x0000000B + .4byte 0x0000000C + .global lbl_803D5478 lbl_803D5478: - .incbin "baserom.dol", 0x3D2478, 0x50 + # ROM: 0x3D2478 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0 + .4byte 0x00000007 + .4byte 0x00000005 + .4byte 0x00000012 + .4byte 0x00000012 + .4byte 0x00000012 + .4byte 0x00000012 + .4byte 0x00000012 + .4byte 0x00000012 + .4byte 0x00000012 + .4byte 0x00000007 + .4byte 0x00000005 + .4byte 0x00000007 + .4byte 0x00000011 + .4byte 0x00000012 + .4byte 0x00000009 + .4byte 0x00000002 + .4byte 0x0000000B + .global lbl_803D54C8 lbl_803D54C8: - .incbin "baserom.dol", 0x3D24C8, 0xA8 + # ROM: 0x3D24C8 + .4byte 0x00000003 + .4byte 0x00000003 + .4byte 0x00000003 + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000005 + .4byte 0x00000005 + .4byte 0x00000005 + .4byte 0x00000008 + .4byte 0x00000008 + .4byte 0x00000008 + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0x00000007 + .4byte 0x00000007 + .4byte 0x00000004 + .4byte 0x00000007 + .4byte 0x00000001 + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0x00000002 + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0 + .global lbl_803D5570 lbl_803D5570: - .incbin "baserom.dol", 0x3D2570, 0xA8 + # ROM: 0x3D2570 + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0x0000000A + .4byte 0x0000000B + .4byte 0x0000000C + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0x00000008 + .4byte 0x00000008 + .4byte 0x00000008 + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .global lbl_803D5618 lbl_803D5618: - .incbin "baserom.dol", 0x3D2618, 0x250 + # ROM: 0x3D2618 + .asciz "driller_LCTR1" + .byte 0x64, 0x72 + .asciz "iller_LCTR2" + .asciz "L_eye_3" + .asciz "R_eye_3" + .asciz "Flame_Head" + .byte 0x46 + .asciz "lame_HeadLockOn" + .asciz "Flame_Lshoulder" + .asciz "Flame_Rshoulder" + .asciz "Head_LockON_SDK" + .asciz "Jaw_1" + .byte 0x43, 0x5F + .asciz "bottomtooth" + .asciz "B_headup_additive_body" + .byte 0x4C + .asciz "_eye_1" + .byte 0x4C + .asciz "_eye_2" + .byte 0x52 + .asciz "_eye_1" + .byte 0x52 + .asciz "_eye_2" + .byte 0x53 + .asciz "phere_LCTR" + .byte 0x53 + .asciz "keleton_Root" + .byte 0x52, 0x5F, 0x73 + .asciz "houlder" + .asciz "R_elbow" + .asciz "R_wrist" + .asciz "R_hand_LCTR" + .asciz "R_leg_LCTR" + .byte 0x52 + .asciz "_front_1" + .byte 0x52, 0x5F, 0x66 + .asciz "ront_2" + .byte 0x52 + .asciz "_front_3" + .byte 0x46, 0x5F, 0x52 + .asciz "_leg_LCTR" + .byte 0x52, 0x5F + .asciz "stinger_1" + .byte 0x52, 0x5F + .asciz "stinger_2" + .byte 0x52, 0x5F + .asciz "spike_LCTR" + .byte 0x4C + .asciz "_shoulder" + .byte 0x4C, 0x5F + .asciz "elbow" + .byte 0x4C, 0x5F + .asciz "wrist" + .byte 0x4C, 0x5F + .asciz "hand_LCTR" + .byte 0x4C, 0x5F + .asciz "leg_LCTR" + .byte 0x4C, 0x5F, 0x66 + .asciz "ront_1" + .byte 0x4C + .asciz "_front_2" + .byte 0x4C, 0x5F, 0x66 + .asciz "ront_3" + .byte 0x46 + .asciz "_L_leg_LCTR" + .asciz "L_stinger_1" + .asciz "L_stinger_2" + .asciz "L_spike_LCTR" + .byte 0x42, 0x5F, 0x73 + .asciz "houlder" + .asciz "B_elbow" + .asciz "B_wrist" + .asciz "B_leg_LCTR" + .byte 0x48 + .asciz "ead_LCTR" + .byte 0x48, 0x6F, 0x72 + .asciz "n_LCTR" + .byte 0x48 + .4byte 0x65616400 + .asciz "??(??)" + .balign 4 + .asciz "ColorChange" + .asciz "Eyes" + .byte 0x45, 0x66, 0x66 + .asciz "ect_Electric" + .balign 4 + .4byte 0 + .global lbl_803D5868 lbl_803D5868: - .incbin "baserom.dol", 0x3D2868, 0x18 + # ROM: 0x3D2868 + .asciz "??(??)" + .byte 0x2D + .asciz "Projectile" + .balign 4 + .4byte 0 + .global lbl_803D5880 lbl_803D5880: - .incbin "baserom.dol", 0x3D2880, 0x10 + # ROM: 0x3D2880 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0x00000002 + .global lbl_803D5890 lbl_803D5890: - .incbin "baserom.dol", 0x3D2890, 0xC + # ROM: 0x3D2890 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000003 + .global lbl_803D589C lbl_803D589C: - .incbin "baserom.dol", 0x3D289C, 0x3C + # ROM: 0x3D289C + .asciz "lockon_target_LCTR" + .byte 0x45 + .4byte 0x79657300 + .asciz "Head" + .byte 0x3F, 0x3F, 0x28 + .4byte 0x3F3F2900 + .asciz "Shockwave" + .byte 0x57, 0x68 + .asciz "ole Body" + .balign 4 + .global lbl_803D58D8 lbl_803D58D8: - .incbin "baserom.dol", 0x3D28D8, 0x30 + # ROM: 0x3D28D8 + .asciz "??(??)" + .byte 0x4D + .asciz "etroid Prime! (Stage 1)" + .asciz "Metroid Prime" + .balign 4 + .global lbl_803D5908 lbl_803D5908: - .incbin "baserom.dol", 0x3D2908, 0x60 + # ROM: 0x3D2908 + .4byte 0x413CCCCD + .4byte 0x413CCCCD + .4byte 0x413CCCCD + .4byte 0x40A00000 + .4byte 0x40C00000 + .4byte 0x40A00000 + .4byte 0x40A00000 + .4byte 0x40C00000 + .4byte 0x413CCCCD + .4byte 0x41F00000 + .4byte 0x41B4CCCD + .4byte 0x41200000 + .4byte 0x41200000 + .4byte 0x41200000 + .4byte 0x41200000 + .4byte 0x41200000 + .4byte 0x413CCCCD + .4byte 0x413CCCCD + .4byte 0x413CCCCD + .4byte 0x40A00000 + .4byte 0x40C00000 + .4byte 0x40A00000 + .4byte 0x40A00000 + .4byte 0x40C00000 + .global lbl_803D5968 lbl_803D5968: - .incbin "baserom.dol", 0x3D2968, 0x18 + # ROM: 0x3D2968 + .asciz "Whole Body" + .byte 0x3F + .asciz "?(??)" + .balign 4 + .4byte 0 + .global lbl_803D5980 lbl_803D5980: - .incbin "baserom.dol", 0x3D2980, 0x18 + # ROM: 0x3D2980 + .asciz "DUMB_MazeSeeds" + .byte 0x3F + .asciz "?(??)" + .balign 4 + .global lbl_803D5998 lbl_803D5998: - .incbin "baserom.dol", 0x3D2998, 0xDC + # ROM: 0x3D2998 + .4byte 0x803D5A9D + .4byte 0x803D5AA5 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x803D5AAC + .4byte 0x803D5AB4 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x803D5ABC + .4byte 0x803D5AC4 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x803D5ACC + .4byte 0x803D5AAC + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x803D5AD3 + .4byte 0x803D5ABC + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x803D5ADA + .4byte 0x803D5AE2 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x803D5AEA + .4byte 0x803D5AF2 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x803D5AE2 + .4byte 0x803D5AFA + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x803D5AF2 + .4byte 0x803D5B04 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x803D5AFA + .4byte 0x803D5B0E + .4byte 0x40000000 + .4byte 0x40000000 + .4byte 0x40000000 + .4byte 0x803D5B04 + .4byte 0x803D5B1C + .4byte 0x40000000 + .4byte 0x40000000 + .4byte 0x40000000 + .global lbl_803D5A74 lbl_803D5A74: - .incbin "baserom.dol", 0x3D2A74, 0x104 + # ROM: 0x3D2A74 + .asciz "grenadeLauncher2_LCTR" + .byte 0x6C, 0x6F + .asciz "ckon_target_LCTR" + .byte 0x53, 0x70, 0x69 + .asciz "ne_2" + .byte 0x43, 0x6F, 0x6C + .4byte 0x6C617200 + .asciz "R_ankle" + .asciz "R_toe_1" + .asciz "L_ankle" + .asciz "L_toe_1" + .asciz "R_knee" + .byte 0x4C + .asciz "_knee" + .byte 0x52, 0x5F + .asciz "elbow" + .byte 0x52, 0x5F + .asciz "wrist" + .byte 0x4C, 0x5F + .asciz "elbow" + .byte 0x4C, 0x5F + .asciz "wrist" + .byte 0x52, 0x5F + .asciz "index_1" + .asciz "L_index_1" + .byte 0x52, 0x5F + .asciz "index_3_SDK" + .asciz "L_index_3_SDK" + .byte 0x4F, 0x6D + .asciz "ega Pirate Flash" + .byte 0x3F, 0x3F, 0x28 + .4byte 0x3F3F2900 + .asciz "Omega_Pirate_OBB_" + .byte 0x4A, 0x75 + .asciz "mpBack" + .balign 4 + .asciz "root" + .byte 0x54, 0x68, 0x65 + .asciz "rmal_Spot_2" + .4byte 0 + .global lbl_803D5B78 lbl_803D5B78: - .incbin "baserom.dol", 0x3D2B78, 0x8 + # ROM: 0x3D2B78 + .asciz "??(??)" + .balign 4 + .global lbl_803D5B80 lbl_803D5B80: - .incbin "baserom.dol", 0x3D2B80, 0xC + # ROM: 0x3D2B80 + .asciz "NESemuP.rel" + .global lbl_803D5B8C lbl_803D5B8C: - .incbin "baserom.dol", 0x3D2B8C, 0x18 + # ROM: 0x3D2B8C + .4byte 0x00000009 + .4byte 0x00000001 + .4byte 0x0000000D + .4byte 0x00000001 + .4byte 0x000000FF + .4byte 0 + .global lbl_803D5BA4 lbl_803D5BA4: - .incbin "baserom.dol", 0x3D2BA4, 0xC + # ROM: 0x3D2BA4 + .asciz "??(??)" + .balign 4 + .4byte 0 + .global lbl_803D5BB0 lbl_803D5BB0: - .incbin "baserom.dol", 0x3D2BB0, 0x20 + # ROM: 0x3D2BB0 + .asciz "Electricity_LCTR" + .byte 0x50, 0x61, 0x74 + .4byte 0x726F6C00 + .asciz "??(??)" + .balign 4 + .global lbl_803D5BD0 lbl_803D5BD0: - .incbin "baserom.dol", 0x3D2BD0, 0x30 + # ROM: 0x3D2BD0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xBF800000 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .global lbl_803D5C00 lbl_803D5C00: - .incbin "baserom.dol", 0x3D2C00, 0x30 + # ROM: 0x3D2C00 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0xBD800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .global lbl_803D5C30 lbl_803D5C30: - .incbin "baserom.dol", 0x3D2C30, 0x8 + # ROM: 0x3D2C30 + .asciz "??(??)" + .balign 4 + .global lbl_803D5C38 lbl_803D5C38: - .incbin "baserom.dol", 0x3D2C38, 0x10 + # ROM: 0x3D2C38 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .global lbl_803D5C48 lbl_803D5C48: - .incbin "baserom.dol", 0x3D2C48, 0x108 + # ROM: 0x3D2C48 + .asciz "slideshow" + .byte 0x47, 0x61 + .asciz "llery" + .byte 0x47, 0x61 + .asciz "lleryAssets_DGRP" + .byte 0x54, 0x58, 0x54 + .asciz "R_GalleryTag" + .byte 0x43, 0x4D, 0x44 + .asciz "L_GalleryBorder" + .asciz "Audio/frontend_1.rsf" + .byte 0x53, 0x54, 0x52 + .asciz "G_SlideShow_Unlock1_" + .byte 0x53, 0x54, 0x52 + .asciz "G_SlideShow_Unlock2_" + .byte 0x25, 0x64, 0x2F + .4byte 0x25640025 + .asciz "sSI,0.6,1.0,%8.8X%s" + .4byte 0x20202000 + .asciz "%s%8.8X%s" + .byte 0x20, 0x00 + .4byte 0x20200025 + .asciz "sSI,1.0,1.0,%8.8X%s" + .asciz "??(??)" + .byte 0x31 + .4byte 0x00320025 + .asciz "s%02d_DGRP" + .byte 0x25 + .asciz "s%02d" + .byte 0x25, 0x73 + .asciz "_%02d_%03d" + .byte 0x53 + .asciz "lideShow" + .balign 4 + .global lbl_803D5D50 lbl_803D5D50: - .incbin "baserom.dol", 0x3D2D50, 0x30 + # ROM: 0x3D2D50 + .4byte 0x803D5DB0 + .4byte 0x803D5DBC + .4byte 0x803D5DC8 + .4byte 0x803D5DD4 + .4byte 0x803D5DE0 + .4byte 0x803D5DEC + .4byte 0x803D5DF8 + .4byte 0x803D5E04 + .4byte 0x803D5E10 + .4byte 0x803D5E1C + .4byte 0x803D5E29 + .4byte 0x803D5E36 + .global lbl_803D5D80 lbl_803D5D80: - .incbin "baserom.dol", 0x3D2D80, 0x30 + # ROM: 0x3D2D80 + .4byte 0x32C9DDCE + .4byte 0xB45DAF60 + .4byte 0x7F017CC5 + .4byte 0x62044C7D + .4byte 0xA9589FD8 + .4byte 0x2FCCED76 + .4byte 0xE4903ED3 + .4byte 0x15C68C06 + .4byte 0xDE9A5FA3 + .4byte 0xFBBE9D9A + .4byte 0x30E24E3F + .4byte 0xB6763C91 + .global lbl_803D5DB0 lbl_803D5DB0: - .incbin "baserom.dol", 0x3D2DB0, 0xA0 + # ROM: 0x3D2DB0 + .asciz "CMDL_Piece1" + .asciz "CMDL_Piece2" + .asciz "CMDL_Piece3" + .asciz "CMDL_Piece4" + .asciz "CMDL_Piece5" + .asciz "CMDL_Piece6" + .asciz "CMDL_Piece7" + .asciz "CMDL_Piece8" + .asciz "CMDL_Piece9" + .asciz "CMDL_Piece10" + .byte 0x43, 0x4D, 0x44 + .asciz "L_Piece11" + .byte 0x43, 0x4D + .asciz "DL_Piece12" + .byte 0x3F + .asciz "?(??)" + .balign 4 + .4byte 0 + .global lbl_803D5E50 lbl_803D5E50: - .incbin "baserom.dol", 0x3D2E50, 0x30 + # ROM: 0x3D2E50 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xBF800000 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .global lbl_803D5E80 lbl_803D5E80: - .incbin "baserom.dol", 0x3D2E80, 0x18 + # ROM: 0x3D2E80 + .asciz "Pre front-end window" + .balign 4 + .global lbl_803D5E98 lbl_803D5E98: - .incbin "baserom.dol", 0x3D2E98, 0x18 + # ROM: 0x3D2E98 + .asciz "CMDL_GameCube" + .byte 0x3F, 0x3F + .asciz "(??)" + .balign 4 + .global lbl_803D5EB0 lbl_803D5EB0: - .incbin "baserom.dol", 0x3D2EB0, 0x8 + # ROM: 0x3D2EB0 + .asciz "??(??)" + .balign 4 + .global lbl_803D5EB8 lbl_803D5EB8: - .incbin "baserom.dol", 0x3D2EB8, 0x30 + # ROM: 0x3D2EB8 + .asciz "??(??)" + .byte 0x50 + .asciz "lasmaElectricFx" + .asciz "PlasmaVisorFx" + .byte 0x53, 0x75 + .asciz "sDamage" + .global lbl_803D5EE8 lbl_803D5EE8: - .incbin "baserom.dol", 0x3D2EE8, 0x8 + # ROM: 0x3D2EE8 + .asciz "??(??)" + .balign 4 + .global lbl_803D5EF0 lbl_803D5EF0: - .incbin "baserom.dol", 0x3D2EF0, 0x118 + # ROM: 0x3D2EF0 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000004 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000004 + .4byte 0x00000005 + .4byte 0x00000006 + .4byte 0x00000008 + .4byte 0x0000000A + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000005 + .4byte 0x00000006 + .4byte 0x00000008 + .4byte 0x0000000A + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000004 + .4byte 0x00000005 + .4byte 0x00000006 + .4byte 0x00000009 + .4byte 0x0000000B + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000005 + .4byte 0x00000006 + .4byte 0x00000009 + .4byte 0x0000000C + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000004 + .4byte 0x00000005 + .4byte 0x00000007 + .4byte 0x00000008 + .4byte 0x0000000D + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000005 + .4byte 0x00000007 + .4byte 0x00000008 + .4byte 0x0000000E + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000004 + .4byte 0x00000005 + .4byte 0x00000007 + .4byte 0x00000009 + .4byte 0x0000000F + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000005 + .4byte 0x00000007 + .4byte 0x00000009 + .4byte 0x0000000F + .global lbl_803D6008 lbl_803D6008: - .incbin "baserom.dol", 0x3D3008, 0x10 + # ROM: 0x3D3008 + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0 + .global lbl_803D6018 lbl_803D6018: - .incbin "baserom.dol", 0x3D3018, 0x8 + # ROM: 0x3D3018 + .asciz "??(??)" + .balign 4 + .global lbl_803D6020 lbl_803D6020: - .incbin "baserom.dol", 0x3D3020, 0x18 + # ROM: 0x3D3020 + .asciz "??(??)" + .balign 4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .global lbl_803D6038 lbl_803D6038: - .incbin "baserom.dol", 0x3D3038, 0xB0 + # ROM: 0x3D3038 + .4byte 0x02000000 + .4byte 0x00020000 + .4byte 0x00000200 + .4byte 0x00020000 + .4byte 0x02020000 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00040001 + .4byte 0x00010005 + .4byte 0x00050004 + .4byte 0x00040000 + .4byte 0x00000001 + .4byte 0x00070002 + .4byte 0x00020006 + .4byte 0x00060007 + .4byte 0x00070003 + .4byte 0x00030002 + .4byte 0x00060000 + .4byte 0x00040006 + .4byte 0x00020000 + .4byte 0x00050003 + .4byte 0x00070005 + .4byte 0x00010003 + .4byte 0x00060005 + .4byte 0x00000003 + .4byte 0x00000001 + .4byte 0x00020000 + .4byte 0x00030004 + .4byte 0x00050006 + .4byte 0x00070005 + .4byte 0x00080009 + .4byte 0x000A0003 + .4byte 0x000B000A + .4byte 0x0006000C + .4byte 0x000D0008 + .4byte 0x000E000D + .4byte 0x0001000F + .4byte 0x0010000E + .4byte 0x00070010 + .4byte 0x000B0002 + .4byte 0x0011000F + .4byte 0x00040011 + .4byte 0x000C0009 + .global lbl_803D60E8 lbl_803D60E8: - .incbin "baserom.dol", 0x3D30E8, 0x8 + # ROM: 0x3D30E8 + .asciz "??(??)" + .balign 4 + .global lbl_803D60F0 lbl_803D60F0: - .incbin "baserom.dol", 0x3D30F0, 0x20 + # ROM: 0x3D30F0 + .asciz "CCollidableOBBTreeGroup" + .asciz "??(??)" + .balign 4 + .global lbl_803D6110 lbl_803D6110: - .incbin "baserom.dol", 0x3D3110, 0x8 + # ROM: 0x3D3110 + .asciz "??(??)" + .balign 4 + .global lbl_803D6118 lbl_803D6118: - .incbin "baserom.dol", 0x3D3118, 0x20 + # ROM: 0x3D3118 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0x00000008 + .global lbl_803D6138 lbl_803D6138: - .incbin "baserom.dol", 0x3D3138, 0x50 + # ROM: 0x3D3138 + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0 + .4byte 0x00000001 + .global lbl_803D6188 lbl_803D6188: - .incbin "baserom.dol", 0x3D3188, 0x8 + # ROM: 0x3D3188 + .asciz "??(??)" + .balign 4 + .global lbl_803D6190 lbl_803D6190: - .incbin "baserom.dol", 0x3D3190, 0x8 + # ROM: 0x3D3190 + .asciz "??(??)" + .balign 4 + .global lbl_803D6198 lbl_803D6198: - .incbin "baserom.dol", 0x3D3198, 0x80 + # ROM: 0x3D3198 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000005 + .4byte 0x00000006 + .4byte 0x00000003 + .4byte 0x00000007 + .4byte 0x00000004 + .4byte 0x0000000A + .4byte 0x0000000A + .4byte 0x00000005 + .4byte 0x00000009 + .4byte 0x00000003 + .4byte 0x00000001 + .4byte 0x00000006 + .4byte 0x00000006 + .4byte 0x0000000B + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000003 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .global lbl_803D6218 lbl_803D6218: - .incbin "baserom.dol", 0x3D3218, 0x178 + # ROM: 0x3D3218 + .4byte 0x4E4F4450 + .4byte 0x44454653 + .4byte 0x43525453 + .4byte 0x4D544C53 + .4byte 0x47524153 + .4byte 0x49434545 + .4byte 0x474F4F4F + .4byte 0x574F4453 + .4byte 0x57415452 + .4byte 0x314D5544 + .4byte 0x314C4156 + .4byte 0x3153414E + .4byte 0x3150524A + .4byte 0x44434852 + .4byte 0x44434853 + .4byte 0x44435348 + .4byte 0x44454E4D + .4byte 0x44455350 + .4byte 0x44455348 + .4byte 0x42544C45 + .4byte 0x57415350 + .4byte 0x54414C50 + .4byte 0x5054474D + .4byte 0x53504952 + .4byte 0x46504952 + .4byte 0x46464C45 + .4byte 0x50415241 + .4byte 0x424D4F4E + .4byte 0x42464C52 + .4byte 0x50424F53 + .4byte 0x49424F53 + .4byte 0x31535641 + .4byte 0x31525052 + .4byte 0x314D5452 + .4byte 0x31504453 + .4byte 0x31464C42 + .4byte 0x3144524E + .4byte 0x314D5245 + .4byte 0x43484F5A + .4byte 0x4A5A4150 + .4byte 0x31495345 + .4byte 0x31425345 + .4byte 0x31415442 + .4byte 0x31415441 + .4byte 0x42545350 + .4byte 0x57575350 + .4byte 0x54415350 + .4byte 0x54475350 + .4byte 0x53505350 + .4byte 0x46505350 + .4byte 0x46465350 + .4byte 0x50535350 + .4byte 0x424D5350 + .4byte 0x42465350 + .4byte 0x50425350 + .4byte 0x49425350 + .4byte 0x32535641 + .4byte 0x32525052 + .4byte 0x324D5452 + .4byte 0x32504453 + .4byte 0x32464C42 + .4byte 0x3244524E + .4byte 0x324D5245 + .4byte 0x43485350 + .4byte 0x4A5A5350 + .4byte 0x33495345 + .4byte 0x33425345 + .4byte 0x33415442 + .4byte 0x33415441 + .4byte 0x42545348 + .4byte 0x57575348 + .4byte 0x54415348 + .4byte 0x54475348 + .4byte 0x53505348 + .4byte 0x46505348 + .4byte 0x46465348 + .4byte 0x50535348 + .4byte 0x424D5348 + .4byte 0x42465348 + .4byte 0x50425348 + .4byte 0x49425348 + .4byte 0x33535641 + .4byte 0x33525052 + .4byte 0x334D5452 + .4byte 0x33504453 + .4byte 0x33464C42 + .4byte 0x3344524E + .4byte 0x334D5245 + .4byte 0x43485348 + .4byte 0x4A5A5348 + .4byte 0x35495345 + .4byte 0x35425345 + .4byte 0x35415442 + .4byte 0x35415441 + .global lbl_803D6390 lbl_803D6390: - .incbin "baserom.dol", 0x3D3390, 0x178 + # ROM: 0x3D3390 + .4byte 0x4E534658 + .4byte 0x44534658 + .4byte 0x43534658 + .4byte 0x4D534658 + .4byte 0x47524658 + .4byte 0x49434658 + .4byte 0x474F4658 + .4byte 0x57534658 + .4byte 0x57544658 + .4byte 0x324D5544 + .4byte 0x324C4156 + .4byte 0x3253414E + .4byte 0x3250524A + .4byte 0x44434658 + .4byte 0x44534658 + .4byte 0x44534858 + .4byte 0x44454658 + .4byte 0x45534658 + .4byte 0x53484658 + .4byte 0x42454658 + .4byte 0x57574658 + .4byte 0x54414658 + .4byte 0x47544658 + .4byte 0x53504658 + .4byte 0x46504658 + .4byte 0x46464658 + .4byte 0x50414658 + .4byte 0x424D4658 + .4byte 0x42464658 + .4byte 0x50424658 + .4byte 0x49424658 + .4byte 0x34535641 + .4byte 0x34525052 + .4byte 0x344D5452 + .4byte 0x34504453 + .4byte 0x34464C42 + .4byte 0x3444524E + .4byte 0x344D5245 + .4byte 0x435A4658 + .4byte 0x4A5A4153 + .4byte 0x32495345 + .4byte 0x32425345 + .4byte 0x32415442 + .4byte 0x32415441 + .4byte 0x42534658 + .4byte 0x57534658 + .4byte 0x54534658 + .4byte 0x47534658 + .4byte 0x53534658 + .4byte 0x46534658 + .4byte 0x53464658 + .4byte 0x50534658 + .4byte 0x4D534658 + .4byte 0x53424658 + .4byte 0x50425358 + .4byte 0x49425358 + .4byte 0x35535641 + .4byte 0x35525052 + .4byte 0x354D5452 + .4byte 0x35504453 + .4byte 0x35464C42 + .4byte 0x3544524E + .4byte 0x354D5245 + .4byte 0x43534658 + .4byte 0x4A5A5053 + .4byte 0x34495345 + .4byte 0x34425345 + .4byte 0x34415442 + .4byte 0x34415441 + .4byte 0x42484658 + .4byte 0x57484658 + .4byte 0x54484658 + .4byte 0x47484658 + .4byte 0x53484658 + .4byte 0x46484658 + .4byte 0x48464658 + .4byte 0x50484658 + .4byte 0x4D484658 + .4byte 0x48424658 + .4byte 0x50424858 + .4byte 0x49424858 + .4byte 0x36535641 + .4byte 0x36525052 + .4byte 0x364D5452 + .4byte 0x36504453 + .4byte 0x36464C42 + .4byte 0x3644524E + .4byte 0x364D5245 + .4byte 0x43484658 + .4byte 0x4A5A4853 + .4byte 0x36495345 + .4byte 0x36425345 + .4byte 0x36415442 + .4byte 0x36415441 + .global lbl_803D6508 lbl_803D6508: - .incbin "baserom.dol", 0x3D3508, 0x38 + # ROM: 0x3D3508 + .4byte 0x4E44434C + .4byte 0x4444434C + .4byte 0x434F444C + .4byte 0x4D45444C + .4byte 0x4752444C + .4byte 0x4943444C + .4byte 0x474F444C + .4byte 0x574F444C + .4byte 0x5754444C + .4byte 0x334D5544 + .4byte 0x334C4156 + .4byte 0x3353414E + .4byte 0x4348444C + .4byte 0x454E444C + .global lbl_803D6540 lbl_803D6540: - .incbin "baserom.dol", 0x3D3540, 0x8 + # ROM: 0x3D3540 + .asciz "??(??)" + .balign 4 + .global lbl_803D6548 lbl_803D6548: - .incbin "baserom.dol", 0x3D3548, 0x8 + # ROM: 0x3D3548 + .asciz "??(??)" + .balign 4 + .global lbl_803D6550 lbl_803D6550: - .incbin "baserom.dol", 0x3D3550, 0x20 + # ROM: 0x3D3550 + .4byte 0x00000009 + .4byte 0x00000001 + .4byte 0x0000000B + .4byte 0x00000001 + .4byte 0x0000000D + .4byte 0x00000001 + .4byte 0x000000FF + .4byte 0 + .global lbl_803D6570 lbl_803D6570: - .incbin "baserom.dol", 0x3D3570, 0x10 + # ROM: 0x3D3570 + .4byte 0xBF800000 + .4byte 0xBF800000 + .4byte 0xBF800000 + .4byte 0xBF800000 + .global lbl_803D6580 lbl_803D6580: - .incbin "baserom.dol", 0x3D3580, 0x20 + # ROM: 0x3D3580 + .4byte 0x00000009 + .4byte 0x00000001 + .4byte 0x0000000A + .4byte 0x00000001 + .4byte 0x0000000B + .4byte 0x00000001 + .4byte 0x000000FF + .4byte 0 + .global lbl_803D65A0 lbl_803D65A0: - .incbin "baserom.dol", 0x3D35A0, 0x18 + # ROM: 0x3D35A0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .global lbl_803D65B8 lbl_803D65B8: - .incbin "baserom.dol", 0x3D35B8, 0x44 + # ROM: 0x3D35B8 + .4byte 0x00000009 + .4byte 0x00000001 + .4byte 0x0000000D + .4byte 0x00000001 + .4byte 0x0000000E + .4byte 0x00000001 + .4byte 0x000000FF + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .global lbl_803D65FC lbl_803D65FC: - .incbin "baserom.dol", 0x3D35FC, 0x18 + # ROM: 0x3D35FC + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0 + .4byte 0x00000002 + .4byte 0 + .4byte 0x00000001 + .global lbl_803D6614 lbl_803D6614: - .incbin "baserom.dol", 0x3D3614, 0x10 + # ROM: 0x3D3614 + .4byte 0x00000009 + .4byte 0x00000001 + .4byte 0x000000FF + .4byte 0 + .global lbl_803D6624 lbl_803D6624: - .incbin "baserom.dol", 0x3D3624, 0x18 + # ROM: 0x3D3624 + .4byte 0x00000009 + .4byte 0x00000001 + .4byte 0x0000000D + .4byte 0x00000001 + .4byte 0x000000FF + .4byte 0 + .global lbl_803D663C lbl_803D663C: - .incbin "baserom.dol", 0x3D363C, 0x18 + # ROM: 0x3D363C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .global lbl_803D6654 lbl_803D6654: - .incbin "baserom.dol", 0x3D3654, 0xB0 + # ROM: 0x3D3654 + .4byte 0x00000009 + .4byte 0x00000001 + .4byte 0x0000000D + .4byte 0x00000001 + .4byte 0x000000FF + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000003 + .4byte 0x00000003 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000005 + .4byte 0x00000005 + .4byte 0x00000007 + .4byte 0x00000007 + .4byte 0x00000006 + .4byte 0x00000006 + .4byte 0x00000004 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000001 + .4byte 0x00000005 + .4byte 0x00000003 + .4byte 0x00000007 + .4byte 0x00000002 + .4byte 0x00000006 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000009 + .4byte 0x00000001 + .4byte 0x0000000D + .4byte 0x00000001 + .4byte 0x000000FF + .4byte 0 + .global lbl_803D6704 lbl_803D6704: - .incbin "baserom.dol", 0x3D3704, 0x30 + # ROM: 0x3D3704 + .4byte 0x3F000000 + .4byte 0 + .4byte 0 + .4byte 0x3F000000 + .4byte 0 + .4byte 0 + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .global lbl_803D6734 lbl_803D6734: - .incbin "baserom.dol", 0x3D3734, 0x30 + # ROM: 0x3D3734 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .global lbl_803D6764 lbl_803D6764: - .incbin "baserom.dol", 0x3D3764, 0x30 + # ROM: 0x3D3764 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .global lbl_803D6794 lbl_803D6794: - .incbin "baserom.dol", 0x3D3794, 0x20 + # ROM: 0x3D3794 + .4byte 0x00000009 + .4byte 0x00000001 + .4byte 0x0000000B + .4byte 0x00000001 + .4byte 0x0000000D + .4byte 0x00000001 + .4byte 0x000000FF + .4byte 0 + .global lbl_803D67B4 lbl_803D67B4: - .incbin "baserom.dol", 0x3D37B4, 0x40 + # ROM: 0x3D37B4 + .4byte 0xBF800000 + .4byte 0xBF800000 + .4byte 0x3F800000 + .4byte 0xBF800000 + .4byte 0xBF800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0xBF800000 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0xBF800000 + .global lbl_803D67F4 lbl_803D67F4: - .incbin "baserom.dol", 0x3D37F4, 0x20 + # ROM: 0x3D37F4 + .4byte 0x00000009 + .4byte 0x00000001 + .4byte 0x0000000B + .4byte 0x00000001 + .4byte 0x0000000D + .4byte 0x00000001 + .4byte 0x000000FF + .4byte 0 + .global lbl_803D6814 lbl_803D6814: - .incbin "baserom.dol", 0x3D3814, 0x18 + # ROM: 0x3D3814 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .global lbl_803D682C lbl_803D682C: - .incbin "baserom.dol", 0x3D382C, 0x30 + # ROM: 0x3D382C + .4byte 0x00000009 + .4byte 0x00000001 + .4byte 0x0000000B + .4byte 0x00000001 + .4byte 0x0000000D + .4byte 0x00000001 + .4byte 0x0000000E + .4byte 0x00000001 + .4byte 0x0000000F + .4byte 0x00000001 + .4byte 0x000000FF + .4byte 0 + .global lbl_803D685C lbl_803D685C: - .incbin "baserom.dol", 0x3D385C, 0x1C + # ROM: 0x3D385C + .asciz "??(??)" + .byte 0x54 + .asciz "XTR_ThermoPalette" + .balign 4 + .global lbl_803D6878 lbl_803D6878: - .incbin "baserom.dol", 0x3D3878, 0x8 + # ROM: 0x3D3878 + .asciz "??(??)" + .balign 4 + .global lbl_803D6880 lbl_803D6880: - .incbin "baserom.dol", 0x3D3880, 0x8 + # ROM: 0x3D3880 + .asciz "??(??)" + .balign 4 + .global lbl_803D6888 lbl_803D6888: - .incbin "baserom.dol", 0x3D3888, 0x8 + # ROM: 0x3D3888 + .asciz "??(??)" + .balign 4 + .global lbl_803D6890 lbl_803D6890: - .incbin "baserom.dol", 0x3D3890, 0x8 + # ROM: 0x3D3890 + .asciz "??(??)" + .balign 4 + .global lbl_803D6898 lbl_803D6898: - .incbin "baserom.dol", 0x3D3898, 0x8 + # ROM: 0x3D3898 + .asciz "??(??)" + .balign 4 + .global lbl_803D68A0 lbl_803D68A0: - .incbin "baserom.dol", 0x3D38A0, 0x8 + # ROM: 0x3D38A0 + .asciz "??(??)" + .balign 4 + .global lbl_803D68A8 lbl_803D68A8: - .incbin "baserom.dol", 0x3D38A8, 0x8 + # ROM: 0x3D38A8 + .asciz "??(??)" + .balign 4 + .global lbl_803D68B0 lbl_803D68B0: - .incbin "baserom.dol", 0x3D38B0, 0x8 + # ROM: 0x3D38B0 + .asciz "??(??)" + .balign 4 + .global lbl_803D68B8 lbl_803D68B8: - .incbin "baserom.dol", 0x3D38B8, 0x8 + # ROM: 0x3D38B8 + .asciz "??(??)" + .balign 4 + .global lbl_803D68C0 lbl_803D68C0: - .incbin "baserom.dol", 0x3D38C0, 0x8 + # ROM: 0x3D38C0 + .asciz "??(??)" + .balign 4 + .global lbl_803D68C8 lbl_803D68C8: - .incbin "baserom.dol", 0x3D38C8, 0x8 + # ROM: 0x3D38C8 + .asciz "??(??)" + .balign 4 + .global lbl_803D68D0 lbl_803D68D0: - .incbin "baserom.dol", 0x3D38D0, 0x8 + # ROM: 0x3D38D0 + .asciz "??(??)" + .balign 4 + .global lbl_803D68D8 lbl_803D68D8: - .incbin "baserom.dol", 0x3D38D8, 0x8 + # ROM: 0x3D38D8 + .asciz "??(??)" + .balign 4 + .global lbl_803D68E0 lbl_803D68E0: - .incbin "baserom.dol", 0x3D38E0, 0x18 + # ROM: 0x3D38E0 + .asciz "??(??)" + .byte 0x26 + .asciz "font=%8.8X;" + .4byte 0 + .global lbl_803D68F8 lbl_803D68F8: - .incbin "baserom.dol", 0x3D38F8, 0x50 + # ROM: 0x3D38F8 + .asciz "Warning: Discarding useless worker id. Parent is not a compound widget." + .byte 0x3F, 0x3F, 0x28 + .4byte 0x3F3F2900 + .global lbl_803D6948 lbl_803D6948: - .incbin "baserom.dol", 0x3D3948, 0x68 + # ROM: 0x3D3948 + .asciz "not found" + .byte 0x6B, 0x47 + .asciz "SYS_DummyWidgetID" + .byte 0x6B, 0x47 + .asciz "SYS_HeadWidgetID" + .byte 0x6B, 0x47, 0x53 + .asciz "YS_DefaultCameraID" + .byte 0x6B + .asciz "GSYS_DefaultLightID" + .asciz "??(??)" + .balign 4 + .4byte 0 + .global lbl_803D69B0 lbl_803D69B0: - .incbin "baserom.dol", 0x3D39B0, 0x18 + # ROM: 0x3D39B0 + .asciz "TextureId" + .byte 0x3F, 0x3F + .asciz "(??)" + .balign 4 + .4byte 0 + .global lbl_803D69C8 lbl_803D69C8: - .incbin "baserom.dol", 0x3D39C8, 0x18 + # ROM: 0x3D39C8 + .4byte 0x00000009 + .4byte 0x00000001 + .4byte 0x0000000D + .4byte 0x00000001 + .4byte 0x000000FF + .4byte 0 + .global lbl_803D69E0 lbl_803D69E0: - .incbin "baserom.dol", 0x3D39E0, 0x8 + # ROM: 0x3D39E0 + .asciz "??(??)" + .balign 4 + .global lbl_803D69E8 lbl_803D69E8: - .incbin "baserom.dol", 0x3D39E8, 0x18 + # ROM: 0x3D39E8 + .asciz "CCollidableAABox" + .balign 4 + .4byte 0 + .global lbl_803D6A00 lbl_803D6A00: - .incbin "baserom.dol", 0x3D3A00, 0x20 + # ROM: 0x3D3A00 + .asciz "CCollidableCollisionSurface" + .4byte 0 + .global lbl_803D6A20 lbl_803D6A20: - .incbin "baserom.dol", 0x3D3A20, 0x28 + # ROM: 0x3D3A20 + .asciz "CCollidableAABox" + .byte 0x43, 0x43, 0x6F + .asciz "llidableSphere" + .balign 4 + .4byte 0 + .global lbl_803D6A48 lbl_803D6A48: - .incbin "baserom.dol", 0x3D3A48, 0x8 + # ROM: 0x3D3A48 + .asciz "??(??)" + .balign 4 + .global lbl_803D6A50 lbl_803D6A50: - .incbin "baserom.dol", 0x3D3A50, 0xC + # ROM: 0x3D3A50 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .global lbl_803D6A5C lbl_803D6A5C: - .incbin "baserom.dol", 0x3D3A5C, 0x1C + # ROM: 0x3D3A5C + .4byte 0xBF800000 + .4byte 0xBF800000 + .4byte 0xBF800000 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0 + .global lbl_803D6A78 lbl_803D6A78: - .incbin "baserom.dol", 0x3D3A78, 0x18 + # ROM: 0x3D3A78 + .4byte 0xBFF00000 + .4byte 0 + .4byte 0xBFF00000 + .4byte 0 + .4byte 0xBFF00000 + .4byte 0 + .global lbl_803D6A90 lbl_803D6A90: - .incbin "baserom.dol", 0x3D3A90, 0x18 + # ROM: 0x3D3A90 + .asciz "CCollidableSphere" + .balign 4 + .4byte 0 + .global lbl_803D6AA8 lbl_803D6AA8: - .incbin "baserom.dol", 0x3D3AA8, 0x10 + # ROM: 0x3D3AA8 + .asciz "UnknownType" + .4byte 0 + .global lbl_803D6AB8 lbl_803D6AB8: - .incbin "baserom.dol", 0x3D3AB8, 0x270 + # ROM: 0x3D3AB8 + .asciz "Unhandled exception %d - Production\n" + .byte 0x25, 0x73, 0x0A + .4byte 0x002D2D2D + .asciz "---------------------- Context 0x%08x -------------------------\n" + .byte 0x72, 0x25, 0x2D + .asciz "2d = 0x%08x (%14d) r%-2d = 0x%08x (%14d)\n" + .byte 0x4C, 0x52, 0x20 + .asciz " = 0x%08x CR = 0x%08x\n" + .asciz "SRR0 = 0x%08x SRR1 = 0x%08x\n" + .byte 0x44 + .asciz "SISR= 0x%08x DAR = 0x%08x\n" + .byte 0x20, 0x2D + .asciz " Production\n" + .byte 0x45, 0x78, 0x63 + .asciz "eption %d - Production\n" + .asciz "IP: 0x%8.8x Mem: 0x%8.8x" + .byte 0x20, 0x2D + .4byte 0x20256400 + .4byte 0x0A0A000A + .asciz "Address: Back Chain LR Save\n" + .byte 0x30, 0x78, 0x25 + .asciz "08x: 0x%08x 0x%08x\n" + .byte 0x30, 0x78, 0x25 + .asciz "08x: 0x%08x 0x%08x\n" + .asciz "0x%08x: BAD PTR\n" + .byte 0x30 + .asciz "x%08x: BAD PTR\n" + .asciz "\nInstruction at 0x%x (read from SRR0) attempted to access invalid address 0x%x (read from DAR)\n" + .4byte 0x2573000A + .4byte 0x00307825 + .asciz "08x: 0x%08x 0x%08x" + .balign 4 + .global lbl_803D6D28 lbl_803D6D28: - .incbin "baserom.dol", 0x3D3D28, 0x8 + # ROM: 0x3D3D28 + .asciz "??(??)" + .balign 4 + .global lbl_803D6D30 lbl_803D6D30: - .incbin "baserom.dol", 0x3D3D30, 0x8 + # ROM: 0x3D3D30 + .asciz "??(??)" + .balign 4 + .global lbl_803D6D38 lbl_803D6D38: - .incbin "baserom.dol", 0x3D3D38, 0x8 + # ROM: 0x3D3D38 + .4byte 0x003F3F28 + .4byte 0x3F3F2900 + .global lbl_803D6D40 lbl_803D6D40: - .incbin "baserom.dol", 0x3D3D40, 0x8 + # ROM: 0x3D3D40 + .4byte 0x003F3F28 + .4byte 0x3F3F2900 + .global lbl_803D6D48 lbl_803D6D48: - .incbin "baserom.dol", 0x3D3D48, 0x8 + # ROM: 0x3D3D48 + .asciz "??(??)" + .balign 4 + .global lbl_803D6D50 lbl_803D6D50: - .incbin "baserom.dol", 0x3D3D50, 0x8 + # ROM: 0x3D3D50 + .asciz "??(??)" + .balign 4 + .global lbl_803D6D58 lbl_803D6D58: - .incbin "baserom.dol", 0x3D3D58, 0x8 + # ROM: 0x3D3D58 + .asciz "??(??)" + .balign 4 + .global lbl_803D6D60 lbl_803D6D60: - .incbin "baserom.dol", 0x3D3D60, 0x8 + # ROM: 0x3D3D60 + .asciz "??(??)" + .balign 4 + .global lbl_803D6D68 lbl_803D6D68: - .incbin "baserom.dol", 0x3D3D68, 0x8 + # ROM: 0x3D3D68 + .asciz "??(??)" + .balign 4 + .global lbl_803D6D70 lbl_803D6D70: - .incbin "baserom.dol", 0x3D3D70, 0x8 + # ROM: 0x3D3D70 + .asciz "??(??)" + .balign 4 + .global lbl_803D6D78 lbl_803D6D78: - .incbin "baserom.dol", 0x3D3D78, 0x8 + # ROM: 0x3D3D78 + .asciz "??(??)" + .balign 4 + .global lbl_803D6D80 lbl_803D6D80: - .incbin "baserom.dol", 0x3D3D80, 0x8 + # ROM: 0x3D3D80 + .asciz "??(??)" + .balign 4 + .global lbl_803D6D88 lbl_803D6D88: - .incbin "baserom.dol", 0x3D3D88, 0x8 + # ROM: 0x3D3D88 + .asciz "??(??)" + .balign 4 + .global lbl_803D6D90 lbl_803D6D90: - .incbin "baserom.dol", 0x3D3D90, 0x8 + # ROM: 0x3D3D90 + .asciz "??(??)" + .balign 4 + .global lbl_803D6D98 lbl_803D6D98: - .incbin "baserom.dol", 0x3D3D98, 0x8 + # ROM: 0x3D3D98 + .asciz "??(??)" + .balign 4 + .global lbl_803D6DA0 lbl_803D6DA0: - .incbin "baserom.dol", 0x3D3DA0, 0x8 + # ROM: 0x3D3DA0 + .asciz "??(??)" + .balign 4 + .global lbl_803D6DA8 lbl_803D6DA8: - .incbin "baserom.dol", 0x3D3DA8, 0x8 + # ROM: 0x3D3DA8 + .asciz "??(??)" + .balign 4 + .global lbl_803D6DB0 lbl_803D6DB0: - .incbin "baserom.dol", 0x3D3DB0, 0x8 + # ROM: 0x3D3DB0 + .asciz "??(??)" + .balign 4 + .global lbl_803D6DB8 lbl_803D6DB8: - .incbin "baserom.dol", 0x3D3DB8, 0x10 + # ROM: 0x3D3DB8 + .asciz "??(??)" + .balign 4 + .asciz "root" + .balign 4 + .global lbl_803D6DC8 lbl_803D6DC8: - .incbin "baserom.dol", 0x3D3DC8, 0x8 + # ROM: 0x3D3DC8 + .asciz "??(??)" + .balign 4 + .global lbl_803D6DD0 lbl_803D6DD0: - .incbin "baserom.dol", 0x3D3DD0, 0x8 + # ROM: 0x3D3DD0 + .asciz "??(??)" + .balign 4 + .global lbl_803D6DD8 lbl_803D6DD8: - .incbin "baserom.dol", 0x3D3DD8, 0x8 + # ROM: 0x3D3DD8 + .asciz "??(??)" + .balign 4 + .global lbl_803D6DE0 lbl_803D6DE0: - .incbin "baserom.dol", 0x3D3DE0, 0x8 + # ROM: 0x3D3DE0 + .asciz "??(??)" + .balign 4 + .global lbl_803D6DE8 lbl_803D6DE8: - .incbin "baserom.dol", 0x3D3DE8, 0x8 + # ROM: 0x3D3DE8 + .4byte 0x003F3F28 + .4byte 0x3F3F2900 + .global lbl_803D6DF0 lbl_803D6DF0: - .incbin "baserom.dol", 0x3D3DF0, 0x8 + # ROM: 0x3D3DF0 + .asciz "??(??)" + .balign 4 + .global lbl_803D6DF8 lbl_803D6DF8: - .incbin "baserom.dol", 0x3D3DF8, 0x8 + # ROM: 0x3D3DF8 + .4byte 0x003F3F28 + .4byte 0x3F3F2900 + .global lbl_803D6E00 lbl_803D6E00: - .incbin "baserom.dol", 0x3D3E00, 0x8 + # ROM: 0x3D3E00 + .asciz "??(??)" + .balign 4 + .global lbl_803D6E08 lbl_803D6E08: - .incbin "baserom.dol", 0x3D3E08, 0x8 + # ROM: 0x3D3E08 + .4byte 0x003F3F28 + .4byte 0x3F3F2900 + .global lbl_803D6E10 lbl_803D6E10: - .incbin "baserom.dol", 0x3D3E10, 0x10 + # ROM: 0x3D3E10 + .4byte 0x003F3F28 + .4byte 0x3F3F2900 + .asciz "Loop" + .balign 4 + .global lbl_803D6E20 lbl_803D6E20: - .incbin "baserom.dol", 0x3D3E20, 0x8 + # ROM: 0x3D3E20 + .asciz "??(??)" + .balign 4 + .global lbl_803D6E28 lbl_803D6E28: - .incbin "baserom.dol", 0x3D3E28, 0x8 + # ROM: 0x3D3E28 + .asciz "??(??)" + .balign 4 + .global lbl_803D6E30 lbl_803D6E30: - .incbin "baserom.dol", 0x3D3E30, 0x8 + # ROM: 0x3D3E30 + .asciz "??(??)" + .balign 4 + .global lbl_803D6E38 lbl_803D6E38: - .incbin "baserom.dol", 0x3D3E38, 0x8 + # ROM: 0x3D3E38 + .asciz "??(??)" + .balign 4 + .global lbl_803D6E40 lbl_803D6E40: - .incbin "baserom.dol", 0x3D3E40, 0x8 + # ROM: 0x3D3E40 + .asciz "??(??)" + .balign 4 + .global lbl_803D6E48 lbl_803D6E48: - .incbin "baserom.dol", 0x3D3E48, 0x8 + # ROM: 0x3D3E48 + .asciz "??(??)" + .balign 4 + .global lbl_803D6E50 lbl_803D6E50: - .incbin "baserom.dol", 0x3D3E50, 0x8 + # ROM: 0x3D3E50 + .asciz "??(??)" + .balign 4 + .global lbl_803D6E58 lbl_803D6E58: - .incbin "baserom.dol", 0x3D3E58, 0x8 + # ROM: 0x3D3E58 + .asciz "??(??)" + .balign 4 + .global lbl_803D6E60 lbl_803D6E60: - .incbin "baserom.dol", 0x3D3E60, 0x8 + # ROM: 0x3D3E60 + .asciz "??(??)" + .balign 4 + .global lbl_803D6E68 lbl_803D6E68: - .incbin "baserom.dol", 0x3D3E68, 0x18 + # ROM: 0x3D3E68 + .4byte 0x00000009 + .4byte 0x00000001 + .4byte 0x0000000D + .4byte 0x00000001 + .4byte 0x000000FF + .4byte 0 + .global lbl_803D6E80 lbl_803D6E80: - .incbin "baserom.dol", 0x3D3E80, 0x8 + # ROM: 0x3D3E80 + .asciz "??(??)" + .balign 4 + .global lbl_803D6E88 lbl_803D6E88: - .incbin "baserom.dol", 0x3D3E88, 0x8 + # ROM: 0x3D3E88 + .asciz "??(??)" + .balign 4 + .global lbl_803D6E90 lbl_803D6E90: - .incbin "baserom.dol", 0x3D3E90, 0x8 + # ROM: 0x3D3E90 + .asciz "??(??)" + .balign 4 + .global lbl_803D6E98 lbl_803D6E98: - .incbin "baserom.dol", 0x3D3E98, 0x8 + # ROM: 0x3D3E98 + .asciz "??(??)" + .balign 4 + .global lbl_803D6EA0 lbl_803D6EA0: - .incbin "baserom.dol", 0x3D3EA0, 0x28 + # ROM: 0x3D3EA0 + .asciz "%02x%02x%02x%02x" + .byte 0x3F, 0x3F, 0x28 + .4byte 0x3F3F2900 + .4byte 0x2C004100 + .4byte 0x53410053 + .4byte 0x49000000 + .4byte 0 + .global lbl_803D6EC8 lbl_803D6EC8: - .incbin "baserom.dol", 0x3D3EC8, 0x1F8 + # ROM: 0x3D3EC8 + .4byte 0x00210000 + .4byte 0x00000001 + .4byte 0x00290000 + .4byte 0x00000001 + .4byte 0x002C0000 + .4byte 0x00000001 + .4byte 0x002D0000 + .4byte 0x00000001 + .4byte 0x002E0000 + .4byte 0x00000001 + .4byte 0x003A0000 + .4byte 0x00000001 + .4byte 0x003B0000 + .4byte 0x00000001 + .4byte 0x003F0000 + .4byte 0x00000001 + .4byte 0x005D0000 + .4byte 0x00000001 + .4byte 0x007D0000 + .4byte 0x00000001 + .4byte 0x00920000 + .4byte 0x00000001 + .4byte 0x00940000 + .4byte 0x00000001 + .4byte 0x00BB0000 + .4byte 0x00000001 + .4byte 0x30010000 + .4byte 0x00000001 + .4byte 0x30020000 + .4byte 0x00000001 + .4byte 0x30050000 + .4byte 0x00000001 + .4byte 0x300D0000 + .4byte 0x00000001 + .4byte 0x300F0000 + .4byte 0x00000001 + .4byte 0x30110000 + .4byte 0x00000001 + .4byte 0x30150000 + .4byte 0x00000001 + .4byte 0x30170000 + .4byte 0x00000001 + .4byte 0x30190000 + .4byte 0x00000001 + .4byte 0x301B0000 + .4byte 0x00000001 + .4byte 0x301C0000 + .4byte 0x00000003 + .4byte 0x301E0000 + .4byte 0x00000001 + .4byte 0x302B0000 + .4byte 0x00000003 + .4byte 0x30410000 + .4byte 0x00000002 + .4byte 0x30430000 + .4byte 0x00000002 + .4byte 0x30450000 + .4byte 0x00000002 + .4byte 0x30470000 + .4byte 0x00000002 + .4byte 0x30490000 + .4byte 0x00000002 + .4byte 0x30630000 + .4byte 0x00000002 + .4byte 0x30830000 + .4byte 0x00000002 + .4byte 0x30850000 + .4byte 0x00000002 + .4byte 0x30870000 + .4byte 0x00000002 + .4byte 0x308E0000 + .4byte 0x00000002 + .4byte 0x309D0000 + .4byte 0x00000003 + .4byte 0x309E0000 + .4byte 0x00000003 + .4byte 0x30A10000 + .4byte 0x00000002 + .4byte 0x30A30000 + .4byte 0x00000002 + .4byte 0x30A50000 + .4byte 0x00000002 + .4byte 0x30A70000 + .4byte 0x00000002 + .4byte 0x30A90000 + .4byte 0x00000002 + .4byte 0x30C30000 + .4byte 0x00000002 + .4byte 0x30E30000 + .4byte 0x00000002 + .4byte 0x30E50000 + .4byte 0x00000002 + .4byte 0x30E70000 + .4byte 0x00000002 + .4byte 0x30EE0000 + .4byte 0x00000002 + .4byte 0x30F50000 + .4byte 0x00000002 + .4byte 0x30F60000 + .4byte 0x00000002 + .4byte 0x30FC0000 + .4byte 0x00000002 + .4byte 0x30FD0000 + .4byte 0x00000003 + .4byte 0x30FE0000 + .4byte 0x00000003 + .4byte 0xFF010000 + .4byte 0x00000001 + .4byte 0xFF050000 + .4byte 0x00000003 + .4byte 0xFF090000 + .4byte 0x00000001 + .4byte 0xFF0D0000 + .4byte 0x00000001 + .4byte 0xFF3D0000 + .4byte 0x00000001 + .4byte 0xFF5D0000 + .4byte 0x00000001 + .4byte 0xFF610000 + .4byte 0x00000001 + .4byte 0xFF630000 + .4byte 0x00000001 + .4byte 0xFF640000 + .4byte 0x00000001 + .4byte 0xFF1F0000 + .4byte 0x00000001 + .global lbl_803D70C0 lbl_803D70C0: - .incbin "baserom.dol", 0x3D40C0, 0x2C8 + # ROM: 0x3D40C0 + .4byte 0x00230000 + .4byte 0x00000002 + .4byte 0x00240000 + .4byte 0x00000002 + .4byte 0x00280000 + .4byte 0x00000001 + .4byte 0x00400000 + .4byte 0x00000002 + .4byte 0x00420000 + .4byte 0x00000004 + .4byte 0x00430000 + .4byte 0x00000004 + .4byte 0x00440000 + .4byte 0x00000004 + .4byte 0x00460000 + .4byte 0x00000004 + .4byte 0x00470000 + .4byte 0x00000004 + .4byte 0x00480000 + .4byte 0x00000004 + .4byte 0x004A0000 + .4byte 0x00000004 + .4byte 0x004B0000 + .4byte 0x00000004 + .4byte 0x004C0000 + .4byte 0x00000004 + .4byte 0x004D0000 + .4byte 0x00000004 + .4byte 0x004E0000 + .4byte 0x00000004 + .4byte 0x00500000 + .4byte 0x00000004 + .4byte 0x00510000 + .4byte 0x00000004 + .4byte 0x00520000 + .4byte 0x00000004 + .4byte 0x00530000 + .4byte 0x00000004 + .4byte 0x00540000 + .4byte 0x00000004 + .4byte 0x00560000 + .4byte 0x00000004 + .4byte 0x00570000 + .4byte 0x00000004 + .4byte 0x00580000 + .4byte 0x00000004 + .4byte 0x00590000 + .4byte 0x00000004 + .4byte 0x005A0000 + .4byte 0x00000004 + .4byte 0x00620000 + .4byte 0x00000004 + .4byte 0x00630000 + .4byte 0x00000004 + .4byte 0x00640000 + .4byte 0x00000004 + .4byte 0x00660000 + .4byte 0x00000004 + .4byte 0x00670000 + .4byte 0x00000004 + .4byte 0x00680000 + .4byte 0x00000004 + .4byte 0x006A0000 + .4byte 0x00000004 + .4byte 0x006B0000 + .4byte 0x00000004 + .4byte 0x006C0000 + .4byte 0x00000004 + .4byte 0x006D0000 + .4byte 0x00000004 + .4byte 0x006E0000 + .4byte 0x00000004 + .4byte 0x00700000 + .4byte 0x00000004 + .4byte 0x00710000 + .4byte 0x00000004 + .4byte 0x00720000 + .4byte 0x00000004 + .4byte 0x00730000 + .4byte 0x00000004 + .4byte 0x00740000 + .4byte 0x00000004 + .4byte 0x00760000 + .4byte 0x00000004 + .4byte 0x00770000 + .4byte 0x00000004 + .4byte 0x00780000 + .4byte 0x00000004 + .4byte 0x00790000 + .4byte 0x00000004 + .4byte 0x007A0000 + .4byte 0x00000004 + .4byte 0x00D10000 + .4byte 0x00000004 + .4byte 0x00F10000 + .4byte 0x00000004 + .4byte 0x005B0000 + .4byte 0x00000001 + .4byte 0x007B0000 + .4byte 0x00000001 + .4byte 0x00910000 + .4byte 0x00000001 + .4byte 0x00930000 + .4byte 0x00000001 + .4byte 0x00910000 + .4byte 0x00000001 + .4byte 0x00930000 + .4byte 0x00000001 + .4byte 0x00A20000 + .4byte 0x00000002 + .4byte 0x00A30000 + .4byte 0x00000002 + .4byte 0x00A50000 + .4byte 0x00000002 + .4byte 0x00A70000 + .4byte 0x00000002 + .4byte 0x00A90000 + .4byte 0x00000002 + .4byte 0x00AB0000 + .4byte 0x00000001 + .4byte 0x20A00000 + .4byte 0x00000002 + .4byte 0x20A10000 + .4byte 0x00000002 + .4byte 0x20A20000 + .4byte 0x00000002 + .4byte 0x20A30000 + .4byte 0x00000002 + .4byte 0x20A40000 + .4byte 0x00000002 + .4byte 0x20A50000 + .4byte 0x00000002 + .4byte 0x20A60000 + .4byte 0x00000002 + .4byte 0x20A70000 + .4byte 0x00000002 + .4byte 0x20A80000 + .4byte 0x00000002 + .4byte 0x20A90000 + .4byte 0x00000002 + .4byte 0x20AA0000 + .4byte 0x00000002 + .4byte 0x20AB0000 + .4byte 0x00000002 + .4byte 0x20AC0000 + .4byte 0x00000002 + .4byte 0x300C0000 + .4byte 0x00000001 + .4byte 0x300E0000 + .4byte 0x00000001 + .4byte 0x30100000 + .4byte 0x00000001 + .4byte 0x30120000 + .4byte 0x00000002 + .4byte 0x30140000 + .4byte 0x00000001 + .4byte 0x30160000 + .4byte 0x00000001 + .4byte 0x30180000 + .4byte 0x00000001 + .4byte 0x301A0000 + .4byte 0x00000001 + .4byte 0xFF030000 + .4byte 0x00000002 + .4byte 0xFF040000 + .4byte 0x00000002 + .4byte 0xFF200000 + .4byte 0x00000002 + .4byte 0xFF3C0000 + .4byte 0x00000001 + .4byte 0xFF5C0000 + .4byte 0x00000001 + .4byte 0xFFE00000 + .4byte 0x00000002 + .4byte 0xFFE10000 + .4byte 0x00000002 + .4byte 0xFFEF0000 + .4byte 0x00000002 + .global lbl_803D7388 lbl_803D7388: - .incbin "baserom.dol", 0x3D4388, 0x10 + # ROM: 0x3D4388 + .4byte 0x00000009 + .4byte 0x00000003 + .4byte 0x000000FF + .4byte 0 + .global lbl_803D7398 lbl_803D7398: - .incbin "baserom.dol", 0x3D4398, 0x8 + # ROM: 0x3D4398 + .asciz "??(??)" + .balign 4 + .global lbl_803D73A0 lbl_803D73A0: - .incbin "baserom.dol", 0x3D43A0, 0x18 + # ROM: 0x3D43A0 + .4byte 0x3F000000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F000000 + .4byte 0 + .global lbl_803D73B8 lbl_803D73B8: - .incbin "baserom.dol", 0x3D43B8, 0x10 + # ROM: 0x3D43B8 + .4byte 0x00000009 + .4byte 0x00000003 + .4byte 0x000000FF + .4byte 0 + .global lbl_803D73C8 lbl_803D73C8: - .incbin "baserom.dol", 0x3D43C8, 0x20 + # ROM: 0x3D43C8 + .4byte 0x00000009 + .4byte 0x00000001 + .4byte 0x0000000B + .4byte 0x00000001 + .4byte 0x0000000D + .4byte 0x00000001 + .4byte 0x000000FF + .4byte 0 + .global lbl_803D73E8 lbl_803D73E8: - .incbin "baserom.dol", 0x3D43E8, 0x8 + # ROM: 0x3D43E8 + .asciz "??(??)" + .balign 4 + .global lbl_803D73F0 lbl_803D73F0: - .incbin "baserom.dol", 0x3D43F0, 0x10 + # ROM: 0x3D43F0 + .4byte 0x000000FF + .4byte 0x0000FF00 + .4byte 0x00FF0000 + .4byte 0x0000FFFF + .global lbl_803D7400 lbl_803D7400: - .incbin "baserom.dol", 0x3D4400, 0x8 + # ROM: 0x3D4400 + .asciz "??(??)" + .balign 4 + .global gkCRC32Table gkCRC32Table: - .incbin "baserom.dol", 0x3D4408, 0x400 + # ROM: 0x3D4408 + .4byte 0 + .4byte 0x77073096 + .4byte 0xEE0E612C + .4byte 0x990951BA + .4byte 0x076DC419 + .4byte 0x706AF48F + .4byte 0xE963A535 + .4byte 0x9E6495A3 + .4byte 0x0EDB8832 + .4byte 0x79DCB8A4 + .4byte 0xE0D5E91E + .4byte 0x97D2D988 + .4byte 0x09B64C2B + .4byte 0x7EB17CBD + .4byte 0xE7B82D07 + .4byte 0x90BF1D91 + .4byte 0x1DB71064 + .4byte 0x6AB020F2 + .4byte 0xF3B97148 + .4byte 0x84BE41DE + .4byte 0x1ADAD47D + .4byte 0x6DDDE4EB + .4byte 0xF4D4B551 + .4byte 0x83D385C7 + .4byte 0x136C9856 + .4byte 0x646BA8C0 + .4byte 0xFD62F97A + .4byte 0x8A65C9EC + .4byte 0x14015C4F + .4byte 0x63066CD9 + .4byte 0xFA0F3D63 + .4byte 0x8D080DF5 + .4byte 0x3B6E20C8 + .4byte 0x4C69105E + .4byte 0xD56041E4 + .4byte 0xA2677172 + .4byte 0x3C03E4D1 + .4byte 0x4B04D447 + .4byte 0xD20D85FD + .4byte 0xA50AB56B + .4byte 0x35B5A8FA + .4byte 0x42B2986C + .4byte 0xDBBBC9D6 + .4byte 0xACBCF940 + .4byte 0x32D86CE3 + .4byte 0x45DF5C75 + .4byte 0xDCD60DCF + .4byte 0xABD13D59 + .4byte 0x26D930AC + .4byte 0x51DE003A + .4byte 0xC8D75180 + .4byte 0xBFD06116 + .4byte 0x21B4F4B5 + .4byte 0x56B3C423 + .4byte 0xCFBA9599 + .4byte 0xB8BDA50F + .4byte 0x2802B89E + .4byte 0x5F058808 + .4byte 0xC60CD9B2 + .4byte 0xB10BE924 + .4byte 0x2F6F7C87 + .4byte 0x58684C11 + .4byte 0xC1611DAB + .4byte 0xB6662D3D + .4byte 0x76DC4190 + .4byte 0x01DB7106 + .4byte 0x98D220BC + .4byte 0xEFD5102A + .4byte 0x71B18589 + .4byte 0x06B6B51F + .4byte 0x9FBFE4A5 + .4byte 0xE8B8D433 + .4byte 0x7807C9A2 + .4byte 0x0F00F934 + .4byte 0x9609A88E + .4byte 0xE10E9818 + .4byte 0x7F6A0DBB + .4byte 0x086D3D2D + .4byte 0x91646C97 + .4byte 0xE6635C01 + .4byte 0x6B6B51F4 + .4byte 0x1C6C6162 + .4byte 0x856530D8 + .4byte 0xF262004E + .4byte 0x6C0695ED + .4byte 0x1B01A57B + .4byte 0x8208F4C1 + .4byte 0xF50FC457 + .4byte 0x65B0D9C6 + .4byte 0x12B7E950 + .4byte 0x8BBEB8EA + .4byte 0xFCB9887C + .4byte 0x62DD1DDF + .4byte 0x15DA2D49 + .4byte 0x8CD37CF3 + .4byte 0xFBD44C65 + .4byte 0x4DB26158 + .4byte 0x3AB551CE + .4byte 0xA3BC0074 + .4byte 0xD4BB30E2 + .4byte 0x4ADFA541 + .4byte 0x3DD895D7 + .4byte 0xA4D1C46D + .4byte 0xD3D6F4FB + .4byte 0x4369E96A + .4byte 0x346ED9FC + .4byte 0xAD678846 + .4byte 0xDA60B8D0 + .4byte 0x44042D73 + .4byte 0x33031DE5 + .4byte 0xAA0A4C5F + .4byte 0xDD0D7CC9 + .4byte 0x5005713C + .4byte 0x270241AA + .4byte 0xBE0B1010 + .4byte 0xC90C2086 + .4byte 0x5768B525 + .4byte 0x206F85B3 + .4byte 0xB966D409 + .4byte 0xCE61E49F + .4byte 0x5EDEF90E + .4byte 0x29D9C998 + .4byte 0xB0D09822 + .4byte 0xC7D7A8B4 + .4byte 0x59B33D17 + .4byte 0x2EB40D81 + .4byte 0xB7BD5C3B + .4byte 0xC0BA6CAD + .4byte 0xEDB88320 + .4byte 0x9ABFB3B6 + .4byte 0x03B6E20C + .4byte 0x74B1D29A + .4byte 0xEAD54739 + .4byte 0x9DD277AF + .4byte 0x04DB2615 + .4byte 0x73DC1683 + .4byte 0xE3630B12 + .4byte 0x94643B84 + .4byte 0x0D6D6A3E + .4byte 0x7A6A5AA8 + .4byte 0xE40ECF0B + .4byte 0x9309FF9D + .4byte 0x0A00AE27 + .4byte 0x7D079EB1 + .4byte 0xF00F9344 + .4byte 0x8708A3D2 + .4byte 0x1E01F268 + .4byte 0x6906C2FE + .4byte 0xF762575D + .4byte 0x806567CB + .4byte 0x196C3671 + .4byte 0x6E6B06E7 + .4byte 0xFED41B76 + .4byte 0x89D32BE0 + .4byte 0x10DA7A5A + .4byte 0x67DD4ACC + .4byte 0xF9B9DF6F + .4byte 0x8EBEEFF9 + .4byte 0x17B7BE43 + .4byte 0x60B08ED5 + .4byte 0xD6D6A3E8 + .4byte 0xA1D1937E + .4byte 0x38D8C2C4 + .4byte 0x4FDFF252 + .4byte 0xD1BB67F1 + .4byte 0xA6BC5767 + .4byte 0x3FB506DD + .4byte 0x48B2364B + .4byte 0xD80D2BDA + .4byte 0xAF0A1B4C + .4byte 0x36034AF6 + .4byte 0x41047A60 + .4byte 0xDF60EFC3 + .4byte 0xA867DF55 + .4byte 0x316E8EEF + .4byte 0x4669BE79 + .4byte 0xCB61B38C + .4byte 0xBC66831A + .4byte 0x256FD2A0 + .4byte 0x5268E236 + .4byte 0xCC0C7795 + .4byte 0xBB0B4703 + .4byte 0x220216B9 + .4byte 0x5505262F + .4byte 0xC5BA3BBE + .4byte 0xB2BD0B28 + .4byte 0x2BB45A92 + .4byte 0x5CB36A04 + .4byte 0xC2D7FFA7 + .4byte 0xB5D0CF31 + .4byte 0x2CD99E8B + .4byte 0x5BDEAE1D + .4byte 0x9B64C2B0 + .4byte 0xEC63F226 + .4byte 0x756AA39C + .4byte 0x026D930A + .4byte 0x9C0906A9 + .4byte 0xEB0E363F + .4byte 0x72076785 + .4byte 0x05005713 + .4byte 0x95BF4A82 + .4byte 0xE2B87A14 + .4byte 0x7BB12BAE + .4byte 0x0CB61B38 + .4byte 0x92D28E9B + .4byte 0xE5D5BE0D + .4byte 0x7CDCEFB7 + .4byte 0x0BDBDF21 + .4byte 0x86D3D2D4 + .4byte 0xF1D4E242 + .4byte 0x68DDB3F8 + .4byte 0x1FDA836E + .4byte 0x81BE16CD + .4byte 0xF6B9265B + .4byte 0x6FB077E1 + .4byte 0x18B74777 + .4byte 0x88085AE6 + .4byte 0xFF0F6A70 + .4byte 0x66063BCA + .4byte 0x11010B5C + .4byte 0x8F659EFF + .4byte 0xF862AE69 + .4byte 0x616BFFD3 + .4byte 0x166CCF45 + .4byte 0xA00AE278 + .4byte 0xD70DD2EE + .4byte 0x4E048354 + .4byte 0x3903B3C2 + .4byte 0xA7672661 + .4byte 0xD06016F7 + .4byte 0x4969474D + .4byte 0x3E6E77DB + .4byte 0xAED16A4A + .4byte 0xD9D65ADC + .4byte 0x40DF0B66 + .4byte 0x37D83BF0 + .4byte 0xA9BCAE53 + .4byte 0xDEBB9EC5 + .4byte 0x47B2CF7F + .4byte 0x30B5FFE9 + .4byte 0xBDBDF21C + .4byte 0xCABAC28A + .4byte 0x53B39330 + .4byte 0x24B4A3A6 + .4byte 0xBAD03605 + .4byte 0xCDD70693 + .4byte 0x54DE5729 + .4byte 0x23D967BF + .4byte 0xB3667A2E + .4byte 0xC4614AB8 + .4byte 0x5D681B02 + .4byte 0x2A6F2B94 + .4byte 0xB40BBE37 + .4byte 0xC30C8EA1 + .4byte 0x5A05DF1B + .4byte 0x2D02EF8D + .global lbl_803D7808 lbl_803D7808: - .incbin "baserom.dol", 0x3D4808, 0x18 + # ROM: 0x3D4808 + .asciz "Alloc failed - Size: %d" + .global lbl_803D7820 lbl_803D7820: - .incbin "baserom.dol", 0x3D4820, 0x20 + # ROM: 0x3D4820 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000004 + .4byte 0x00000002 + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0x00000008 + .global lbl_803D7840 lbl_803D7840: - .incbin "baserom.dol", 0x3D4840, 0x8 + # ROM: 0x3D4840 + .asciz "??(??)" + .balign 4 + .global lbl_803D7848 lbl_803D7848: - .incbin "baserom.dol", 0x3D4848, 0x20 + # ROM: 0x3D4848 + .4byte 0x00000009 + .4byte 0x00000001 + .4byte 0x0000000B + .4byte 0x00000001 + .4byte 0x0000000D + .4byte 0x00000001 + .4byte 0x000000FF + .4byte 0 + .global lbl_803D7868 lbl_803D7868: - .incbin "baserom.dol", 0x3D4868, 0x20 + # ROM: 0x3D4868 + .4byte 0x00000009 + .4byte 0x00000001 + .4byte 0x0000000B + .4byte 0x00000001 + .4byte 0x0000000D + .4byte 0x00000001 + .4byte 0x000000FF + .4byte 0 + .global lbl_803D7888 lbl_803D7888: - .incbin "baserom.dol", 0x3D4888, 0x18 + # ROM: 0x3D4888 + .4byte 0x3F000000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F000000 + .4byte 0 + .global lbl_803D78A0 lbl_803D78A0: - .incbin "baserom.dol", 0x3D48A0, 0x30 + # ROM: 0x3D48A0 + .4byte 0x00000009 + .4byte 0x00000001 + .4byte 0x0000000B + .4byte 0x00000001 + .4byte 0x0000000D + .4byte 0x00000001 + .4byte 0x0000000E + .4byte 0x00000001 + .4byte 0x0000000F + .4byte 0x00000001 + .4byte 0x000000FF + .4byte 0 + .global lbl_803D78D0 lbl_803D78D0: - .incbin "baserom.dol", 0x3D48D0, 0x20 + # ROM: 0x3D48D0 + .4byte 0x00000009 + .4byte 0x00000001 + .4byte 0x0000000B + .4byte 0x00000001 + .4byte 0x0000000D + .4byte 0x00000001 + .4byte 0x000000FF + .4byte 0 + .global lbl_803D78F0 lbl_803D78F0: - .incbin "baserom.dol", 0x3D48F0, 0x20 + # ROM: 0x3D48F0 + .4byte 0x00000009 + .4byte 0x00000001 + .4byte 0x0000000B + .4byte 0x00000001 + .4byte 0x0000000D + .4byte 0x00000001 + .4byte 0x000000FF + .4byte 0 + .global lbl_803D7910 lbl_803D7910: - .incbin "baserom.dol", 0x3D4910, 0x8 + # ROM: 0x3D4910 + .asciz "??(??)" + .balign 4 + .global lbl_803D7918 lbl_803D7918: - .incbin "baserom.dol", 0x3D4918, 0x8 + # ROM: 0x3D4918 + .asciz "??(??)" + .balign 4 + .global lbl_803D7920 lbl_803D7920: - .incbin "baserom.dol", 0x3D4920, 0x8 + # ROM: 0x3D4920 + .asciz "??(??)" + .balign 4 + .global lbl_803D7928 lbl_803D7928: - .incbin "baserom.dol", 0x3D4928, 0x20 + # ROM: 0x3D4928 + .4byte 0x00000009 + .4byte 0x00000001 + .4byte 0x0000000B + .4byte 0x00000001 + .4byte 0x0000000D + .4byte 0x00000001 + .4byte 0x000000FF + .4byte 0 + .global lbl_803D7948 lbl_803D7948: - .incbin "baserom.dol", 0x3D4948, 0x20 + # ROM: 0x3D4948 + .4byte 0x00000009 + .4byte 0x00000001 + .4byte 0x0000000B + .4byte 0x00000001 + .4byte 0x0000000D + .4byte 0x00000001 + .4byte 0x000000FF + .4byte 0 + .global lbl_803D7968 lbl_803D7968: - .incbin "baserom.dol", 0x3D4968, 0x8 + # ROM: 0x3D4968 + .asciz "??(??)" + .balign 4 + .global lbl_803D7970 lbl_803D7970: - .incbin "baserom.dol", 0x3D4970, 0x8 + # ROM: 0x3D4970 + .asciz "??(??)" + .balign 4 + .global lbl_803D7978 lbl_803D7978: - .incbin "baserom.dol", 0x3D4978, 0x8 + # ROM: 0x3D4978 + .asciz "??(??)" + .balign 4 + .global lbl_803D7980 lbl_803D7980: - .incbin "baserom.dol", 0x3D4980, 0x8 + # ROM: 0x3D4980 + .asciz "??(??)" + .balign 4 + .global lbl_803D7988 lbl_803D7988: - .incbin "baserom.dol", 0x3D4988, 0x98 + # ROM: 0x3D4988 + .4byte 0x434C534E + .4byte 0x434D444C + .4byte 0x43534B52 + .4byte 0x414E494D + .4byte 0x43494E46 + .4byte 0x54585452 + .4byte 0x504C5454 + .4byte 0x464F4E54 + .4byte 0x414E4353 + .4byte 0x45564E54 + .4byte 0x4D414446 + .4byte 0x4D4C564C + .4byte 0x4D524541 + .4byte 0x4D415057 + .4byte 0x4D415041 + .4byte 0x53415657 + .4byte 0x53415641 + .4byte 0x50415254 + .4byte 0x57505343 + .4byte 0x53574843 + .4byte 0x44505343 + .4byte 0x454C5343 + .4byte 0x43525343 + .4byte 0x4146534D + .4byte 0x44434C4E + .4byte 0x41475343 + .4byte 0x4154424C + .4byte 0x43534E47 + .4byte 0x53545247 + .4byte 0x5343414E + .4byte 0x50415448 + .4byte 0x44475250 + .4byte 0x484D4150 + .4byte 0x4354574B + .4byte 0x46524D45 + .4byte 0x48494E54 + .4byte 0x4D415055 + .4byte 0x44554D42 + .global lbl_803D7A20 lbl_803D7A20: - .incbin "baserom.dol", 0x3D4A20, 0x8 + # ROM: 0x3D4A20 + .asciz "??(??)" + .balign 4 + .global lbl_803D7A28 lbl_803D7A28: - .incbin "baserom.dol", 0x3D4A28, 0x10 + # ROM: 0x3D4A28 + .asciz "??(??)" + .byte 0x31 + .asciz ".1.3" + .balign 4 + .global lbl_803D7A38 lbl_803D7A38: - .incbin "baserom.dol", 0x3D4A38, 0x10 + # ROM: 0x3D4A38 + .asciz "??(??)" + .byte 0x2E + .4byte 0x70616B00 + .4byte 0 + .global lbl_803D7A48 lbl_803D7A48: - .incbin "baserom.dol", 0x3D4A48, 0x8 + # ROM: 0x3D4A48 + .asciz "??(??)" + .balign 4 + .global lbl_803D7A50 lbl_803D7A50: - .incbin "baserom.dol", 0x3D4A50, 0x18 + # ROM: 0x3D4A50 + .asciz "??(??)" + .byte 0x25 + .asciz "%.%df" + .byte 0x30, 0x00 + .4byte 0x2D000000 + .4byte 0 + .global lbl_803D7A68 lbl_803D7A68: - .incbin "baserom.dol", 0x3D4A68, 0x8 + # ROM: 0x3D4A68 + .asciz "??(??)" + .balign 4 + .global lbl_803D7A70 lbl_803D7A70: - .incbin "baserom.dol", 0x3D4A70, 0x8 + # ROM: 0x3D4A70 + .asciz "??(??)" + .balign 4 + .global lbl_803D7A78 lbl_803D7A78: - .incbin "baserom.dol", 0x3D4A78, 0x10 + # ROM: 0x3D4A78 + .asciz "??(??)" + .byte 0x31 + .asciz ".1.3" + .balign 4 + .global lbl_803D7A88 lbl_803D7A88: - .incbin "baserom.dol", 0x3D4A88, 0x10 + # ROM: 0x3D4A88 + .asciz "??(??)" + .byte 0x31 + .asciz ".1.3" + .balign 4 + .global lbl_803D7A98 lbl_803D7A98: - .incbin "baserom.dol", 0x3D4A98, 0x8 + # ROM: 0x3D4A98 + .asciz "??(??)" + .balign 4 + .global lbl_803D7AA0 lbl_803D7AA0: - .incbin "baserom.dol", 0x3D4AA0, 0x8 + # ROM: 0x3D4AA0 + .asciz "??(??)" + .balign 4 + .global lbl_803D7AA8 lbl_803D7AA8: - .incbin "baserom.dol", 0x3D4AA8, 0x4C + # ROM: 0x3D4AA8 + .4byte 0x00000010 + .4byte 0x00000011 + .4byte 0x00000012 + .4byte 0 + .4byte 0x00000008 + .4byte 0x00000007 + .4byte 0x00000009 + .4byte 0x00000006 + .4byte 0x0000000A + .4byte 0x00000005 + .4byte 0x0000000B + .4byte 0x00000004 + .4byte 0x0000000C + .4byte 0x00000003 + .4byte 0x0000000D + .4byte 0x00000002 + .4byte 0x0000000E + .4byte 0x00000001 + .4byte 0x0000000F + .global lbl_803D7AF4 lbl_803D7AF4: - .incbin "baserom.dol", 0x3D4AF4, 0x74 + # ROM: 0x3D4AF4 + .asciz "invalid block type" + .byte 0x69 + .asciz "nvalid stored block lengths" + .asciz "too many length or distance symbols" + .asciz "invalid bit length repeat" + .balign 4 + .4byte 0 + .global lbl_803D7B68 lbl_803D7B68: - .incbin "baserom.dol", 0x3D4B68, 0x38 + # ROM: 0x3D4B68 + .asciz "invalid literal/length code" + .asciz "invalid distance code" + .balign 4 + .4byte 0 + .global lbl_803D7BA0 lbl_803D7BA0: - .incbin "baserom.dol", 0x3D4BA0, 0x38 + # ROM: 0x3D4BA0 + .asciz "invalid distance code" + .byte 0x69, 0x6E + .asciz "valid literal/length code" + .balign 4 + .4byte 0 + .global lbl_803D7BD8 lbl_803D7BD8: - .incbin "baserom.dol", 0x3D4BD8, 0x78 + # ROM: 0x3D4BD8 + .asciz "unknown compression method" + .byte 0x69 + .asciz "nvalid window size" + .byte 0x69 + .asciz "ncorrect header check" + .byte 0x6E, 0x65 + .asciz "ed dictionary" + .byte 0x69, 0x6E + .asciz "correct data check" + .byte 0x31 + .asciz ".1.3" + .balign 4 + .4byte 0 + .global lbl_803D7C50 lbl_803D7C50: - .incbin "baserom.dol", 0x3D4C50, 0x218 + # ROM: 0x3D4C50 + .asciz " inflate 1.1.3 Copyright 1995-1998 Mark Adler " + .balign 4 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000005 + .4byte 0x00000006 + .4byte 0x00000007 + .4byte 0x00000008 + .4byte 0x00000009 + .4byte 0x0000000A + .4byte 0x0000000B + .4byte 0x0000000D + .4byte 0x0000000F + .4byte 0x00000011 + .4byte 0x00000013 + .4byte 0x00000017 + .4byte 0x0000001B + .4byte 0x0000001F + .4byte 0x00000023 + .4byte 0x0000002B + .4byte 0x00000033 + .4byte 0x0000003B + .4byte 0x00000043 + .4byte 0x00000053 + .4byte 0x00000063 + .4byte 0x00000073 + .4byte 0x00000083 + .4byte 0x000000A3 + .4byte 0x000000C3 + .4byte 0x000000E3 + .4byte 0x00000102 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000003 + .4byte 0x00000003 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0x00000005 + .4byte 0x00000005 + .4byte 0x00000005 + .4byte 0x00000005 + .4byte 0 + .4byte 0x00000070 + .4byte 0x00000070 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000005 + .4byte 0x00000007 + .4byte 0x00000009 + .4byte 0x0000000D + .4byte 0x00000011 + .4byte 0x00000019 + .4byte 0x00000021 + .4byte 0x00000031 + .4byte 0x00000041 + .4byte 0x00000061 + .4byte 0x00000081 + .4byte 0x000000C1 + .4byte 0x00000101 + .4byte 0x00000181 + .4byte 0x00000201 + .4byte 0x00000301 + .4byte 0x00000401 + .4byte 0x00000601 + .4byte 0x00000801 + .4byte 0x00000C01 + .4byte 0x00001001 + .4byte 0x00001801 + .4byte 0x00002001 + .4byte 0x00003001 + .4byte 0x00004001 + .4byte 0x00006001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000003 + .4byte 0x00000003 + .4byte 0x00000004 + .4byte 0x00000004 + .4byte 0x00000005 + .4byte 0x00000005 + .4byte 0x00000006 + .4byte 0x00000006 + .4byte 0x00000007 + .4byte 0x00000007 + .4byte 0x00000008 + .4byte 0x00000008 + .4byte 0x00000009 + .4byte 0x00000009 + .4byte 0x0000000A + .4byte 0x0000000A + .4byte 0x0000000B + .4byte 0x0000000B + .4byte 0x0000000C + .4byte 0x0000000C + .4byte 0x0000000D + .4byte 0x0000000D + .global lbl_803D7E68 lbl_803D7E68: - .incbin "baserom.dol", 0x3D4E68, 0xE8 + # ROM: 0x3D4E68 + .asciz "oversubscribed literal/length tree" + .byte 0x69 + .asciz "ncomplete literal/length tree" + .byte 0x6F, 0x76 + .asciz "ersubscribed distance tree" + .byte 0x69 + .asciz "ncomplete distance tree" + .asciz "empty distance tree with lengths" + .byte 0x6F, 0x76, 0x65 + .asciz "rsubscribed dynamic bit lengths tree" + .byte 0x69, 0x6E, 0x63 + .asciz "omplete dynamic bit lengths tree" + .balign 4 + .global lbl_803D7F50 lbl_803D7F50: - .incbin "baserom.dol", 0x3D4F50, 0x8 + # ROM: 0x3D4F50 + .asciz "??(??)" + .balign 4 + .global lbl_803D7F58 lbl_803D7F58: - .incbin "baserom.dol", 0x3D4F58, 0xF0 + # ROM: 0x3D4F58 + .4byte 0x3F000000 + .4byte 0 + .4byte 0 + .4byte 0x3F000000 + .4byte 0 + .4byte 0 + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F000000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F000000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .global lbl_803D8048 lbl_803D8048: - .incbin "baserom.dol", 0x3D5048, 0x30 + # ROM: 0x3D5048 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .global lbl_803D8078 lbl_803D8078: - .incbin "baserom.dol", 0x3D5078, 0x30 + # ROM: 0x3D5078 + .4byte 0x3F000000 + .4byte 0 + .4byte 0 + .4byte 0x3F000000 + .4byte 0 + .4byte 0 + .4byte 0x3F000000 + .4byte 0x3F000000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .global lbl_803D80A8 lbl_803D80A8: - .incbin "baserom.dol", 0x3D50A8, 0x60 + # ROM: 0x3D50A8 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 + .global lbl_803D8108 lbl_803D8108: - .incbin "baserom.dol", 0x3D5108, 0x8 + # ROM: 0x3D5108 + .asciz "??(??)" + .balign 4 + .global lbl_803D8110 lbl_803D8110: - .incbin "baserom.dol", 0x3D5110, 0x100 + # ROM: 0x3D5110 + .4byte 0x00000002 + .4byte 0x00080012 + .4byte 0x00200032 + .4byte 0x00490063 + .4byte 0x008200A4 + .4byte 0x00CB00F5 + .4byte 0x01240157 + .4byte 0x018E01C9 + .4byte 0x0208024B + .4byte 0x029202DD + .4byte 0x032C037F + .4byte 0x03D70432 + .4byte 0x049204F5 + .4byte 0x055D05C9 + .4byte 0x063806AC + .4byte 0x072407A0 + .4byte 0x082008A4 + .4byte 0x092C09B8 + .4byte 0x0A480ADD + .4byte 0x0B750C12 + .4byte 0x0CB20D57 + .4byte 0x0DFF0EAC + .4byte 0x0F5D1012 + .4byte 0x10CA1187 + .4byte 0x1248130D + .4byte 0x13D714A4 + .4byte 0x1575164A + .4byte 0x17241801 + .4byte 0x18E319C8 + .4byte 0x1AB21BA0 + .4byte 0x1C911D87 + .4byte 0x1E811F7F + .4byte 0x20812187 + .4byte 0x2291239F + .4byte 0x24B225C8 + .4byte 0x26E22801 + .4byte 0x29232A4A + .4byte 0x2B752CA3 + .4byte 0x2DD62F0D + .4byte 0x30483187 + .4byte 0x32CA3411 + .4byte 0x355C36AB + .4byte 0x37FF3956 + .4byte 0x3AB13C11 + .4byte 0x3D743EDC + .4byte 0x404841B7 + .4byte 0x432B44A3 + .4byte 0x461F479F + .4byte 0x49234AAB + .4byte 0x4C374DC7 + .4byte 0x4F5C50F4 + .4byte 0x52905431 + .4byte 0x55D6577E + .4byte 0x592B5ADC + .4byte 0x5C905E49 + .4byte 0x600661C7 + .4byte 0x638C6555 + .4byte 0x672268F4 + .4byte 0x6AC96CA2 + .4byte 0x6E807061 + .4byte 0x72477430 + .4byte 0x761E7810 + .4byte 0x7A067C00 + .4byte 0x7DFE8000 + .global lbl_803D8210 lbl_803D8210: - .incbin "baserom.dol", 0x3D5210, 0x10 + # ROM: 0x3D5210 + .asciz "??(??)" + .byte 0x4E + .4byte 0x554C4C00 + .4byte 0 + .global lbl_803D8220 lbl_803D8220: - .incbin "baserom.dol", 0x3D5220, 0x8 + # ROM: 0x3D5220 + .asciz "??(??)" + .balign 4 + .global lbl_803D8228 lbl_803D8228: - .incbin "baserom.dol", 0x3D5228, 0x8 + # ROM: 0x3D5228 + .asciz "??(??)" + .balign 4 + .global lbl_803D8230 lbl_803D8230: - .incbin "baserom.dol", 0x3D5230, 0x10 + # ROM: 0x3D5230 + .asciz "??(??)" + .byte 0x61 + .asciz "ram:" + .balign 4 + .global lbl_803D8240 lbl_803D8240: - .incbin "baserom.dol", 0x3D5240, 0x8 + # ROM: 0x3D5240 + .asciz "??(??)" + .balign 4 + .global lbl_803D8248 lbl_803D8248: - .incbin "baserom.dol", 0x3D5248, 0xB0 + # ROM: 0x3D5248 + .asciz "" + .byte 0x3C + .asciz "SOURCE MODULE UNLOADED>" + .4byte 0x004D6564 + .asciz "iumAllocMainData " + .asciz " - Ignore" + .byte 0x4D, 0x65 + .asciz "mHead" + .byte 0x4D, 0x65 + .asciz "mTail" + .byte 0x53, 0x6D + .asciz "allAllocMainData " + .asciz "SmallAllocBookKeeping" + .byte 0x53, 0x6D + .asciz "allAllocClass " + .asciz "MediumAllocClass " + .balign 4 + .4byte 0 + .global lbl_803D82F8 lbl_803D82F8: - .incbin "baserom.dol", 0x3D52F8, 0x8 + # ROM: 0x3D52F8 + .asciz "??(??)" + .balign 4 + .global lbl_803D8300 lbl_803D8300: - .incbin "baserom.dol", 0x3D5300, 0x8 + # ROM: 0x3D5300 + .asciz "??(??)" + .balign 4 + .global lbl_803D8308 lbl_803D8308: - .incbin "baserom.dol", 0x3D5308, 0x8 + # ROM: 0x3D5308 + .asciz "??(??)" + .balign 4 + .global lbl_803D8310 lbl_803D8310: - .incbin "baserom.dol", 0x3D5310, 0x10 + # ROM: 0x3D5310 + .4byte 0x0049006E + .4byte 0x00760061 + .4byte 0x006C0069 + .4byte 0x00640000 + .global lbl_803D8320 lbl_803D8320: - .incbin "baserom.dol", 0x3D5320, 0x8 + # ROM: 0x3D5320 + .asciz "??(??)" + .balign 4 + .global lbl_803D8328 lbl_803D8328: - .incbin "baserom.dol", 0x3D5328, 0x8 + # ROM: 0x3D5328 + .asciz "??(??)" + .balign 4 + .global lbl_803D8330 lbl_803D8330: - .incbin "baserom.dol", 0x3D5330, 0x8 + # ROM: 0x3D5330 + .asciz "??(??)" + .balign 4 + .global lbl_803D8338 lbl_803D8338: - .incbin "baserom.dol", 0x3D5338, 0x8 + # ROM: 0x3D5338 + .asciz "??(??)" + .balign 4 + .global lbl_803D8340 lbl_803D8340: - .incbin "baserom.dol", 0x3D5340, 0x8 + # ROM: 0x3D5340 + .asciz "??(??)" + .balign 4 + .global lbl_803D8348 lbl_803D8348: - .incbin "baserom.dol", 0x3D5348, 0x8 + # ROM: 0x3D5348 + .asciz "??(??)" + .balign 4 + .global lbl_803D8350 lbl_803D8350: - .incbin "baserom.dol", 0x3D5350, 0x18 + # ROM: 0x3D5350 + .4byte 0x00000009 + .4byte 0x00000001 + .4byte 0x0000000D + .4byte 0x00000001 + .4byte 0x000000FF + .4byte 0 + .global lbl_803D8368 lbl_803D8368: - .incbin "baserom.dol", 0x3D5368, 0x18 + # ROM: 0x3D5368 + .asciz "??(??)" + .balign 4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .global lbl_803D8380 lbl_803D8380: - .incbin "baserom.dol", 0x3D5380, 0x58 + # ROM: 0x3D5380 + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0 + .4byte 0 + .4byte 0x00000009 + .4byte 0x00000001 + .4byte 0x0000000D + .4byte 0x00000001 + .4byte 0x000000FF + .4byte 0 + .4byte 0x3E000000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3E800000 + .4byte 0 + .global lbl_803D83D8 lbl_803D83D8: - .incbin "baserom.dol", 0x3D53D8, 0x8 + # ROM: 0x3D53D8 + .asciz "??(??)" + .balign 4 + .global lbl_803D83E0 lbl_803D83E0: - .incbin "baserom.dol", 0x3D53E0, 0x8 + # ROM: 0x3D53E0 + .asciz "??(??)" + .balign 4 + .global lbl_803D83E8 lbl_803D83E8: - .incbin "baserom.dol", 0x3D53E8, 0x10 + # ROM: 0x3D53E8 + .4byte 0x00000009 + .4byte 0x00000001 + .4byte 0x000000FF + .4byte 0 + .global lbl_803D83F8 lbl_803D83F8: - .incbin "baserom.dol", 0x3D53F8, 0x8 + # ROM: 0x3D53F8 + .asciz "??(??)" + .balign 4 + .global lbl_803D8400 lbl_803D8400: - .incbin "baserom.dol", 0x3D5400, 0x8 + # ROM: 0x3D5400 + .4byte 0 + .4byte 0 + .global lbl_803D8408 lbl_803D8408: - .incbin "baserom.dol", 0x3D5408, 0x8 + # ROM: 0x3D5408 + .asciz "??(??)" + .balign 4 + .global lbl_803D8410 lbl_803D8410: - .incbin "baserom.dol", 0x3D5410, 0x8 + # ROM: 0x3D5410 + .4byte 0 + .4byte 0 + .global lbl_803D8418 lbl_803D8418: - .incbin "baserom.dol", 0x3D5418, 0xC8 + # ROM: 0x3D5418 + .4byte 0 + .4byte 0x00000004 + .4byte 0x00000008 + .4byte 0x0000000C + .4byte 0x00000010 + .4byte 0x00000014 + .4byte 0x00000018 + .4byte 0x0000001C + .4byte 0x00000020 + .4byte 0x00000024 + .4byte 0x00000028 + .4byte 0x0000002C + .4byte 0x00000034 + .4byte 0x00000038 + .4byte 0x0000003C + .4byte 0x00000040 + .4byte 0x00000044 + .4byte 0x00000058 + .4byte 0x0000005C + .4byte 0x00000060 + .4byte 0x00000064 + .4byte 0x00000068 + .4byte 0x0000006C + .4byte 0x00000070 + .4byte 0x00000074 + .4byte 0x00000088 + .4byte 0x0000008C + .4byte 0x000000A0 + .4byte 0x000000B4 + .4byte 0x000000B8 + .4byte 0x000000D0 + .4byte 0x000000D4 + .4byte 0x000000E4 + .4byte 0x000000E8 + .4byte 0x000000EC + .4byte 0x000000F0 + .4byte 0x000000F4 + .4byte 0x000000F8 + .4byte 0x000000FC + .4byte 0x00000100 + .4byte 0x00000104 + .4byte 0x00000108 + .4byte 0x0000010C + .4byte 0x00000110 + .4byte 0x00000114 + .4byte 0x00000118 + .4byte 0x0000011C + .4byte 0x00000120 + .4byte 0x00000124 + .4byte 0x00000128 + .global lbl_803D84E0 lbl_803D84E0: - .incbin "baserom.dol", 0x3D54E0, 0x58 + # ROM: 0x3D54E0 + .asciz "%s: Incompatible pak file version -- Current version is %x, you're using %x" + .asciz "??(??)" + .balign 4 + .4byte 0 + .global lbl_803D8538 lbl_803D8538: - .incbin "baserom.dol", 0x3D5538, 0x8 + # ROM: 0x3D5538 + .asciz "??(??)" + .balign 4 + .global lbl_803D8540 lbl_803D8540: - .incbin "baserom.dol", 0x3D5540, 0x8 + # ROM: 0x3D5540 + .asciz "??(??)" + .balign 4 + .global lbl_803D8548 lbl_803D8548: - .incbin "baserom.dol", 0x3D5548, 0x10 + # ROM: 0x3D5548 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .global lbl_803D8558 lbl_803D8558: - .incbin "baserom.dol", 0x3D5558, 0x8 + # ROM: 0x3D5558 + .asciz "??(??)" + .balign 4 + .global lbl_803D8560 lbl_803D8560: - .incbin "baserom.dol", 0x3D5560, 0x8 + # ROM: 0x3D5560 + .asciz "??(??)" + .balign 4 + .global lbl_803D8568 lbl_803D8568: - .incbin "baserom.dol", 0x3D5568, 0x8 + # ROM: 0x3D5568 + .asciz "??(??)" + .balign 4 +